diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-08 23:16:13 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-08 23:16:13 -0600 |
| commit | 6d16dba22e9ea2b40bf684f7549b73a583d143f6 (patch) | |
| tree | 6502fb0b748b810ac586a999b7961c2355d8355a /src/battle/battle_2.c | |
| parent | c4c885504729b56c00aa245aea6e284a1b6a1719 (diff) | |
re-label some window and text code
Diffstat (limited to 'src/battle/battle_2.c')
| -rw-r--r-- | src/battle/battle_2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index ae84e5585..dccf73fa8 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -245,9 +245,9 @@ void InitBattle(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; gBattleTerrain = BattleSetup_GetTerrain(); - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0); - InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); sub_800D6D4(); sub_800DAB8(); ResetSpriteData(); @@ -898,7 +898,7 @@ void BattleMainCB2(void) { AnimateSprites(); BuildOamBuffer(); - sub_800374C(&gUnknown_03004210); + Text_UpdateWindowInBattle(&gUnknown_03004210); UpdatePaletteFade(); RunTasks(); } @@ -1221,9 +1221,9 @@ void c2_8011A1C(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0); - InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); sub_800D6D4(); LoadCompressedPalette(gUnknown_08D004E0, 0, 64); sub_800D74C(); |