diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-21 20:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 20:47:58 +0200 |
| commit | c84bb67156d6ab822b6ff1b508e9fae73f054675 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/battle_6.c | |
| parent | 11ad653b57d811dbe8df831d4987128da39bdcb5 (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'src/battle_6.c')
| -rw-r--r-- | src/battle_6.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_6.c b/src/battle_6.c index 866a66ae3..df2419f70 100644 --- a/src/battle_6.c +++ b/src/battle_6.c @@ -9,11 +9,11 @@ extern u16 gUnknown_030042A0; extern struct Window gUnknown_03004210; -extern void (*gUnknown_03004330[])(void); +extern void (*gBattleBankFunc[])(void); -extern u8 gUnknown_02024A60; -extern u8 gUnknown_02024E60[]; -extern u8 gUnknown_020238CC[]; +extern u8 gActiveBank; +extern u8 gActionSelectionCursor[]; +extern u8 gDisplayedStringBattle[]; extern u16 gUnknown_030042C0; extern u16 gUnknown_030041B4; @@ -39,7 +39,7 @@ void sub_803037C(void) { FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38); - gUnknown_03004330[gUnknown_02024A60] = sub_802C098; + gBattleBankFunc[gActiveBank] = sub_802C098; InitWindow(&gUnknown_03004210, gUnknown_08400CF3, 400, 18, 35); sub_8002F44(&gUnknown_03004210); @@ -50,9 +50,9 @@ void sub_803037C(void) { nullsub_8(r4); } - sub_802E3E4(gUnknown_02024E60[gUnknown_02024A60], 0); + sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); - get_battle_strings_((u8 *) gUnknown_08400CA8); - InitWindow(&gUnknown_03004210, gUnknown_020238CC, SUB_803037C_TILE_DATA_OFFSET, 2, 35); + StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CA8); + InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35); sub_8002F44(&gUnknown_03004210); } |