diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-18 09:30:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 09:30:04 -0800 |
| commit | 8edb453c9de6459f4da78522b248a2e507ba1f08 (patch) | |
| tree | b0f8d934094b4e2aed8fa3ab536784dba7594627 /src/battle/battle_controller_safari.c | |
| parent | ef165d397727f46e81d1e60991e10e379969b776 (diff) | |
| parent | 016b2d16bcc735053267b3b5e8cd597807db4055 (diff) | |
Merge pull request #461 from ProjectRevoTPP/data
migrate data
Diffstat (limited to 'src/battle/battle_controller_safari.c')
| -rw-r--r-- | src/battle/battle_controller_safari.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 5b89cf9ba..8a8515fc7 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -18,9 +18,9 @@ extern struct Window gUnknown_03004210; extern u8 gDisplayedStringBattle[]; extern u8 gActionSelectionCursor[]; -extern const u8 gUnknown_08400CBB[]; +extern const u8 BattleText_PlayerMenu[]; extern u8 gActiveBank; -extern const u8 gUnknown_08400D15[]; +extern const u8 BattleText_MenuOptionsSafari[]; extern void *gBattleBankFunc[]; extern u16 gUnknown_030042A0; @@ -476,7 +476,7 @@ void SafariHandlecmd18(void) FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2; - InitWindow(&gUnknown_03004210, gUnknown_08400D15, 400, 18, 35); + InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35); sub_8002F44(&gUnknown_03004210); sub_814A5C0(0, 0xFFFF, 12, 11679, 0); @@ -484,7 +484,7 @@ void SafariHandlecmd18(void) nullsub_8(i); sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); - StrCpyDecodeToDisplayedStringBattle(gUnknown_08400CBB); + StrCpyDecodeToDisplayedStringBattle(BattleText_PlayerMenu); InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); sub_8002F44(&gUnknown_03004210); |