dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

GetWordPhonemes; assign names and improve guess of types

Browse Source
This commit is contained in:
PikalaxALT
2017-10-28 09:45:44 -04:00
parent 002b394855
commit 5da296e94e
8 changed files with 86 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/bard_music.c
View File

@@ -1,42 +1,41 @@
// Includes
#include "global.h"
#include "bard_music.h"
#include "text.h"
#include "easy_chat.h"
// Static type declarations
// Static RAM declarations
struct UnkStruct_817C7F4 {
u8 unk_00[48];
};
// Static ROM declarations
// .rodata
extern const struct UnkStruct_817C7F4 gUnknown_085F5494[];
extern const struct UnkStruct_817C7F4 gUnknown_085FA1D8[];
extern const struct UnkStruct_817C7F4 *const gUnknown_0860A168[];
extern const struct BardSound gBardSounds_Pokemon[][6];
extern const struct BardSound gBardSounds_Moves[][6];
extern const struct BardSound (*const gBardSoundsTable[])[6];
extern const s16 *const gUnknown_0860A320[];
extern const struct UnkStruct_817C7F4 gUnknown_0860A3AC;
extern const int gUnknown_0860A3DC[];
extern const struct BardSound gBardSound_InvalidWord[6];
// .text
s16 sub_817C7DC(int x, int y)
s16 CalcWordPitch(int arg0, int songPos)
{
return gUnknown_0860A320[x][y];
return gUnknown_0860A320[arg0][songPos];
}
const struct UnkStruct_817C7F4 *sub_817C7F4(u16 word)
const struct BardSound *GetWordSounds(u16 word)
{
u32 category;
u32 subword;
const struct UnkStruct_817C7F4 *ptr;
const struct BardSound (*ptr)[6];
if (sub_811EB10(word))
if (IsECWordInValidRange(word))
{
return &gUnknown_0860A3AC;
return gBardSound_InvalidWord;
}
category = word >> 9;
subword = word & 0x1ff;
@@ -44,18 +43,36 @@ const struct UnkStruct_817C7F4 *sub_817C7F4(u16 word)
{
case EC_GROUP_POKEMON:
case EC_GROUP_POKEMON_2:
ptr = gUnknown_085F5494;
ptr = gBardSounds_Pokemon;
break;
case EC_GROUP_MOVE_1:
case EC_GROUP_MOVE_2:
ptr = gUnknown_085FA1D8;
ptr = gBardSounds_Moves;
break;
default:
ptr = gUnknown_0860A168[category];
ptr = gBardSoundsTable[category];
break;
}
ptr += subword;
return ptr;
return *ptr;
}
void GetWordPhonemes(struct BardSong *song, u16 word)
{
int i;
const struct BardSound *sound;
song->length = 0;
for (i = 0; i < 6; i ++)
{
sound = &song->sound[i];
if (sound->var00 != 0xFF)
{
song->phonemes[i].length = sound->var01 + gUnknown_0860A3DC[sound->var00];
song->phonemes[i].pitch = CalcWordPitch(word + 30, i);
song->length += song->phonemes[i].length;
}
}
song->currPhoneme = 0;
song->voiceInflection = 0;
}