diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:22:33 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:22:33 -0400 |
| commit | d172b9ed71485e45f4896beb637ab536e10cc138 (patch) | |
| tree | 05b1a4fd706d30cf065aa76017975ac7dba133bf /src/battle_anim.c | |
| parent | 0117d43fa758bfc12a8bf5c3dd09a625556a644c (diff) | |
Merge structs at 02019348
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 8516c62f1..5ee83571b 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1488,7 +1488,7 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim) else { for (i = 0; i < 4; i++) - gAnimSpeciesByBanks[i] = EWRAM_19348[0]; + gAnimSpeciesByBanks[i] = gContestResources__moveAnim.species; } if (isMoveAnim == 0) @@ -1940,7 +1940,7 @@ void MoveBattlerSpriteToBG(u8 bank, u8 toBG_2) spriteId = gBattlerSpriteIds[bank]; gBattle_BG1_X = -(gSprites[spriteId].x + gSprites[spriteId].x2) + 32; - if (IsContest() && IsSpeciesNotUnown(EWRAM_19348[0]) != 0) + if (IsContest() && IsSpeciesNotUnown(gContestResources__moveAnim.species) != 0) gBattle_BG1_X--; gBattle_BG1_Y = -(gSprites[spriteId].y + gSprites[spriteId].y2) + 32; gSprites[gBattlerSpriteIds[bank]].invisible = TRUE; @@ -1994,7 +1994,7 @@ static void sub_8076380(void) struct UnknownStruct2 s; u16 *ptr; - if (IsSpeciesNotUnown(EWRAM_19348[0])) + if (IsSpeciesNotUnown(gContestResources__moveAnim.species)) { sub_8078914(&s); ptr = s.unk4; @@ -2451,9 +2451,9 @@ static void LoadMoveBg(u16 bgId) { void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; - LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); - sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); - DmaCopy32Defvars(3, IsContest() ? EWRAM_14800 : EWRAM_18000, (void *)(VRAM + 0xD000), 0x800); + LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : ewram18000); + sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : ewram18000, 0x100, 0); + DmaCopy32Defvars(3, IsContest() ? EWRAM_14800 : ewram18000, (void *)(VRAM + 0xD000), 0x800); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32); } |