diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/battle_util2.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index 6de4941cb..b1036ef0b 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -15,7 +15,7 @@ void AllocateBattleResources(void) s32 i; for (i = 0; i < 4; ++i) - gUnknown_3005EE0[i] = AllocZeroed(8); + gPokedudeBattlerStates[i] = AllocZeroed(sizeof(struct PokedudeBattlerState)); } gBattleStruct = AllocZeroed(sizeof(*gBattleStruct)); gBattleResources = AllocZeroed(sizeof(*gBattleResources)); @@ -29,10 +29,10 @@ void AllocateBattleResources(void) gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack)); gLinkBattleSendBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE); gLinkBattleRecvBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE); - gUnknown_2022BB8 = AllocZeroed(0x2000); - gUnknown_2022BBC = AllocZeroed(0x1000); - SetBgTilemapBuffer(1, gUnknown_2022BBC); - SetBgTilemapBuffer(2, gUnknown_2022BBC); + gBattleAnimMons_BgTilesBuffer = AllocZeroed(0x2000); + gBattleAnimMons_BgTilemapBuffer = AllocZeroed(0x1000); + SetBgTilemapBuffer(1, gBattleAnimMons_BgTilemapBuffer); + SetBgTilemapBuffer(2, gBattleAnimMons_BgTilemapBuffer); } void FreeBattleResources(void) @@ -45,7 +45,7 @@ void FreeBattleResources(void) for (i = 0; i < 4; ++i) { - FREE_AND_SET_NULL(gUnknown_3005EE0[i]); + FREE_AND_SET_NULL(gPokedudeBattlerStates[i]); } } if (gBattleResources != NULL) @@ -62,8 +62,8 @@ void FreeBattleResources(void) FREE_AND_SET_NULL(gBattleResources); FREE_AND_SET_NULL(gLinkBattleSendBuffer); FREE_AND_SET_NULL(gLinkBattleRecvBuffer); - FREE_AND_SET_NULL(gUnknown_2022BB8); - FREE_AND_SET_NULL(gUnknown_2022BBC); + FREE_AND_SET_NULL(gBattleAnimMons_BgTilesBuffer); + FREE_AND_SET_NULL(gBattleAnimMons_BgTilemapBuffer); } } |