From 31f4edbe503134eba4f7fee8ca9ecc85099c51bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 20:10:19 -0400 Subject: Document more symbols in battle --- src/battle_gfx_sfx_util.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 4340703e3..7019acc86 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -950,9 +950,12 @@ void HideBattlerShadowSprite(u8 battlerId) gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible; } -void sub_80357C8(void) +// Low-level function that sets specific interface tiles' palettes, +// overwriting any pixel with value 0. +void BattleInterfaceSetWindowPals(void) { - u16 *vramPtr = (u16 *)(VRAM + 0x240); + // 9 tiles at 0x06000240 + u16 *vramPtr = (u16 *)(BG_VRAM + 0x240); s32 i; s32 j; @@ -970,7 +973,9 @@ void sub_80357C8(void) *vramPtr |= 0x000F; } } - vramPtr = (u16 *)(VRAM + 0x600); + + // 18 tiles at 0x06000600 + vramPtr = (u16 *)(BG_VRAM + 0x600); for (i = 0; i < 18; ++i) { for (j = 0; j < 16; ++vramPtr, ++j) @@ -1005,7 +1010,7 @@ void AllocateMonSpritesGfx(void) for (i = 0; i < MAX_BATTLERS_COUNT; ++i) { gMonSpritesGfxPtr->sprites[i] = gMonSpritesGfxPtr->firstDecompressed + (i * 0x2000); - *(gMonSpritesGfxPtr->templates + i) = gUnknown_825DEF0[i]; + *(gMonSpritesGfxPtr->templates + i) = gSpriteTemplates_Battlers[i]; for (j = 0; j < 4; ++j) { -- cgit v1.2.3 From 2f4f63afdb6a7b77a8161f0cd42ae64cc5f1515c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 14:27:50 -0400 Subject: Document old man batttle controller --- src/battle_gfx_sfx_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 7019acc86..3cafba334 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -128,7 +128,7 @@ void FreeBattleSpritesData(void) } } -void sub_8033E3C(struct Sprite *sprite) +void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite) { u8 spriteId = sprite->data[1]; @@ -158,7 +158,7 @@ static void sub_8033EB0(struct Sprite *sprite, bool8 arg1) AnimateSprite(sprite); } -void sub_8033EEC(struct Sprite *sprite) +void SpriteCB_TrainerSlideIn(struct Sprite *sprite) { if (!(gIntroSlideFlags & 1)) { @@ -864,7 +864,7 @@ void HandleBattleLowHpMusicChange(void) } } -void sub_8035450(u8 affineMode) +void SetBattlerSpriteAffineMode(u8 affineMode) { s32 i; -- cgit v1.2.3 From 81da6acff56cadc5e2b7b5572aba944bf0f1c8ad Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 19:32:49 -0400 Subject: battle_gfx_sfx_util sync emerald names to unnamed syms --- src/battle_gfx_sfx_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 3cafba334..db172b4a1 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -140,14 +140,14 @@ void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite) gSprites[spriteId].animPaused = 0; else if (gSprites[spriteId].animEnded) { - gSprites[spriteId].callback = sub_8012100; + gSprites[spriteId].callback = SpriteCB_SetToDummy3; StartSpriteAffineAnim(&gSprites[spriteId], 0); sprite->callback = SpriteCallbackDummy; } } // not used -static void sub_8033EB0(struct Sprite *sprite, bool8 arg1) +UNUSED static void UnusedDoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1) { sprite->animPaused = 1; sprite->callback = SpriteCallbackDummy; @@ -290,7 +290,7 @@ bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn) return FALSE; } -bool8 mplay_80342A4(u8 battlerId) +bool8 IsBattleSEPlaying(u8 battlerId) { u8 zero = 0; @@ -384,7 +384,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId) } otId = GetMonData(mon, MON_DATA_OT_ID); position = GetBattlerPosition(battlerId); - if (sub_804455C(1, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) + if (ShouldIgnoreDeoxysForm(1, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->sprites[position], species, currentPersonality); -- cgit v1.2.3 From 14aa5bf52f5e6bfe93b41afcd0f9ccd6bb796d68 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 20:17:47 -0400 Subject: Remove unused, unneeded fields from BattleHealthboxInfo --- src/battle_gfx_sfx_util.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index db172b4a1..06c6aaaa9 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -296,15 +296,18 @@ bool8 IsBattleSEPlaying(u8 battlerId) if (IsSEPlaying()) { - ++gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_8 < 30) + ++gBattleSpritesDataPtr->healthBoxesData[battlerId].soundTimer; + // UB: Uses gActiveBattler instead of battlerId. + // In practice, this is never a problem, as this routine + // is only ever passed gActiveBattler. + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].soundTimer < 30) return TRUE; m4aMPlayStop(&gMPlayInfo_SE1); m4aMPlayStop(&gMPlayInfo_SE2); } if (zero == 0) { - gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8 = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].soundTimer = 0; return FALSE; } else -- cgit v1.2.3 From 10f0222d280c2b30c34bd326428f1a0e50c6c570 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 08:24:53 -0400 Subject: Battle controller opponent sync labels from emerald --- src/battle_gfx_sfx_util.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 06c6aaaa9..b2d051d9c 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1017,11 +1017,11 @@ void AllocateMonSpritesGfx(void) for (j = 0; j < 4; ++j) { - gMonSpritesGfxPtr->field_74[i][j].data = gMonSpritesGfxPtr->sprites[i] + (j * 0x800); - gMonSpritesGfxPtr->field_74[i][j].size = 0x800; + gMonSpritesGfxPtr->images[i][j].data = gMonSpritesGfxPtr->sprites[i] + (j * 0x800); + gMonSpritesGfxPtr->images[i][j].size = 0x800; } - gMonSpritesGfxPtr->templates[i].images = gMonSpritesGfxPtr->field_74[i]; + gMonSpritesGfxPtr->templates[i].images = gMonSpritesGfxPtr->images[i]; } gMonSpritesGfxPtr->barFontGfx = AllocZeroed(0x1000); } @@ -1030,8 +1030,8 @@ void FreeMonSpritesGfx(void) { if (gMonSpritesGfxPtr == NULL) return; - if (gMonSpritesGfxPtr->field_17C != NULL) - FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_17C); + if (gMonSpritesGfxPtr->multiUseBuffer != NULL) + FREE_AND_SET_NULL(gMonSpritesGfxPtr->multiUseBuffer); if (gMonSpritesGfxPtr->field_178 != NULL) FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_178); FREE_AND_SET_NULL(gMonSpritesGfxPtr->barFontGfx); -- cgit v1.2.3 From 6fc2bdf84011a7d68ed76762b50cc84fbf9ff5a7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 09:46:17 -0400 Subject: battle_controller_link_partner sync labels from emerald --- src/battle_gfx_sfx_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_gfx_sfx_util.c') diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index b2d051d9c..d0025de01 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -452,7 +452,7 @@ void DecompressTrainerBackPalette(u16 index, u8 palette) LoadCompressedPalette(gTrainerBackPicPaletteTable[index].data, (palette + 16) * 16, 0x20); } -void nullsub_16(u8 a1) +void BattleGfxSfxDummy3(u8 a1) { } -- cgit v1.2.3