From 752ce9b90d756e01766c12136169eefe335ac016 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 14 Oct 2017 16:55:25 +0200 Subject: [PATCH] start working on battle anim --- asm/battle_7.s | 18 +- asm/battle_anim.s | 1587 +------------------ asm/battle_anim_80A9C70.s | 12 +- asm/battle_anim_80D51AC.s | 90 +- asm/battle_anim_80FE840.s | 1746 ++++++++++----------- asm/battle_anim_815A0D4.s | 398 ++--- asm/battle_anim_8170478.s | 116 +- asm/battle_anim_sound_tasks.s | 62 +- asm/battle_controller_linkopponent.s | 14 +- asm/battle_controller_linkpartner.s | 12 +- asm/battle_controller_opponent.s | 12 +- asm/battle_controller_player.s | 12 +- asm/battle_controller_player_partner.s | 12 +- asm/battle_controller_recorded_opponent.s | 12 +- asm/battle_controller_recorded_player.s | 12 +- asm/battle_controller_wally.s | 10 +- asm/contest.s | 338 ++-- asm/contest_ai.s | 298 ++-- asm/contest_effect.s | 148 +- asm/contest_link_80FC4F4.s | 16 +- asm/rom3.s | 2 +- asm/rom_80A5C6C.s | 158 +- data/battle_anim_scripts.s | 2 +- data/battle_anims.s | 28 +- include/battle_anim.h | 48 + include/battle_interface.h | 1 + include/contest.h | 30 +- include/decompress.h | 2 +- include/sprite.h | 2 +- ld_script.txt | 1 + src/battle_anim.c | 650 ++++++++ src/decompress.c | 2 +- src/sprite.c | 2 +- sym_ewram.txt | 74 +- 34 files changed, 2538 insertions(+), 3389 deletions(-) create mode 100644 include/battle_anim.h create mode 100644 src/battle_anim.c diff --git a/asm/battle_7.s b/asm/battle_7.s index 36a0bf282..4fea68650 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -1056,10 +1056,10 @@ _0805D980: b _0805DA1E .pool _0805D9CC: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r2, r10 strb r2, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget mov r1, sp ldrb r1, [r1] strb r1, [r0] @@ -1070,7 +1070,7 @@ _0805D9CC: ldr r0, =gUnknown_082C9320 adds r1, r5, 0 movs r2, 0 - bl move_something + bl DoBattleAnim ldr r0, =task0A_0803415C movs r1, 0xA bl CreateTask @@ -1180,14 +1180,14 @@ move_anim_start_t4: @ 805DAC4 lsrs r4, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker strb r1, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget strb r2, [r0] ldr r0, =gUnknown_082C937C adds r1, r3, 0 movs r2, 0 - bl move_something + bl DoBattleAnim ldr r0, =task0A_08034248 movs r1, 0xA bl CreateTask @@ -2353,7 +2353,7 @@ _0805E51C: beq _0805E558 movs r0, 0 mov r10, r0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x18] ldrh r1, [r2, 0x2] @@ -3111,7 +3111,7 @@ sub_805EB9C: @ 805EB9C _0805EBC8: lsls r0, r5, 24 lsrs r0, 24 - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _0805EC60 @@ -3329,7 +3329,7 @@ sub_805ED70: @ 805ED70 cmp r0, 0 beq _0805EDAC adds r0, r4, 0 - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 bne _0805EDC0 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 5ce9c4cf9..a35f322d4 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -5,1523 +5,16 @@ .text - thumb_func_start sub_80A3934 -sub_80A3934: @ 80A3934 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r0, =gAnimFramesToWait - movs r1, 0 - strb r1, [r0] - ldr r0, =gAnimScriptActive - strb r1, [r0] - ldr r0, =gAnimVisualTaskCount - strb r1, [r0] - ldr r0, =gAnimSoundTaskCount - strb r1, [r0] - ldr r0, =gDisableStructMoveAnim - movs r1, 0 - str r1, [r0] - ldr r0, =gMoveDmgMoveAnim - str r1, [r0] - ldr r0, =gMovePowerMoveAnim - movs r2, 0 - strh r1, [r0] - ldr r0, =gHappinessMoveAnim - strb r2, [r0] - ldr r4, =gUnknown_02038430 - ldr r5, =gUnknown_02038432 - ldr r6, =gUnknown_02038433 - ldr r7, =gAnimMoveIndex - ldr r0, =gAnimationBankAttacker - mov r12, r0 - ldr r1, =gAnimationBankTarget - mov r8, r1 - ldr r0, =gUnknown_02038440 - mov r9, r0 - ldr r1, =0x0000ffff - adds r3, r1, 0 - ldr r1, =gAnimSpriteIndexArray - movs r2, 0x7 -_080A397E: - ldrh r0, [r1] - orrs r0, r3 - strh r0, [r1] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080A397E - ldr r1, =gBattleAnimArgs - movs r2, 0 - adds r0, r1, 0 - adds r0, 0xE -_080A3994: - strh r2, [r0] - subs r0, 0x2 - cmp r0, r1 - bge _080A3994 - movs r1, 0 - movs r0, 0xFF - strb r0, [r4] - movs r0, 0x1 - negs r0, r0 - strb r0, [r4, 0x1] - strb r1, [r5] - strb r1, [r6] - movs r0, 0 - strh r1, [r7] - mov r1, r12 - strb r0, [r1] - mov r1, r8 - strb r0, [r1] - mov r1, r9 - strb r0, [r1] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3934 - - thumb_func_start move_anim_start_t1 -move_anim_start_t1: @ 80A3A10 - push {lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r2, =gAnimationBankAttacker - ldr r0, =gBankAttacker - ldrb r0, [r0] - strb r0, [r2] - ldr r2, =gAnimationBankTarget - ldr r0, =gBankTarget - ldrb r0, [r0] - strb r0, [r2] - ldr r0, =gUnknown_082C8D6C - movs r2, 0x1 - bl move_something - pop {r0} - bx r0 - .pool - thumb_func_end move_anim_start_t1 - - thumb_func_start move_something -move_something: @ 80A3A48 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - lsls r1, 16 - lsrs r1, 16 - mov r8, r1 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080A3AE8 - bl sub_80A8278 - movs r0, 0 - bl sub_8072A88 - movs r4, 0 - mov r0, r8 - lsls r0, 2 - mov r10, r0 - ldr r6, =gBattlePartyID - movs r7, 0x64 - ldr r5, =gUnknown_02038438 -_080A3A84: - lsls r0, r4, 24 - lsrs r0, 24 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080A3AA8 - ldrh r0, [r6] - muls r0, r7 - ldr r1, =gEnemyParty - b _080A3AAE - .pool -_080A3AA8: - ldrh r0, [r6] - muls r0, r7 - ldr r1, =gPlayerParty -_080A3AAE: - adds r0, r1 - movs r1, 0xB - bl GetMonData - strh r0, [r5] - adds r6, 0x2 - adds r5, 0x2 - adds r4, 0x1 - cmp r4, 0x3 - ble _080A3A84 - ldr r3, =gAnimMoveIndex - ldr r5, =gUnknown_02038430 - ldr r1, =gAnimScriptActive - mov r12, r1 - ldr r7, =gAnimScriptCallback - ldr r6, =move_anim_execute - b _080A3B10 - .pool -_080A3AE8: - ldr r3, =gAnimMoveIndex - ldr r5, =gUnknown_02038430 - mov r0, r8 - lsls r0, 2 - mov r10, r0 - ldr r1, =gAnimScriptActive - mov r12, r1 - ldr r7, =gAnimScriptCallback - ldr r6, =move_anim_execute - ldr r2, =gUnknown_02039F34 - ldr r1, =gUnknown_02038438 - movs r4, 0x3 -_080A3B00: - ldr r0, [r2] - ldr r0, [r0, 0x18] - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _080A3B00 -_080A3B10: - mov r0, r9 - cmp r0, 0 - bne _080A3B38 - strh r0, [r3] - b _080A3B3C - .pool -_080A3B38: - mov r1, r8 - strh r1, [r3] -_080A3B3C: - ldr r1, =gBattleAnimArgs - movs r2, 0 - adds r0, r1, 0 - adds r0, 0xE -_080A3B44: - strh r2, [r0] - subs r0, 0x2 - cmp r0, r1 - bge _080A3B44 - movs r0, 0xFF - strb r0, [r5] - movs r0, 0x1 - negs r0, r0 - strb r0, [r5, 0x1] - ldr r0, [sp] - add r0, r10 - ldr r0, [r0] - ldr r1, =gBattleAnimScriptPtr - str r0, [r1] - movs r0, 0x1 - mov r1, r12 - strb r0, [r1] - movs r0, 0 - ldr r1, =gAnimFramesToWait - strb r0, [r1] - str r6, [r7] - ldr r0, =0x0000ffff - adds r2, r0, 0 - ldr r1, =gAnimSpriteIndexArray - movs r4, 0x7 -_080A3B76: - ldrh r0, [r1] - orrs r0, r2 - strh r0, [r1] - adds r1, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _080A3B76 - mov r1, r9 - cmp r1, 0 - beq _080A3BC2 - movs r4, 0 - ldr r2, =gUnknown_082C8D64 - b _080A3BAA - .pool -_080A3BA8: - adds r4, 0x1 -_080A3BAA: - lsls r0, r4, 1 - adds r0, r2 - ldrh r0, [r0] - ldr r1, =0x0000ffff - cmp r0, r1 - beq _080A3BC2 - cmp r8, r0 - bne _080A3BA8 - ldr r0, =gMPlay_BGM - movs r2, 0x80 - bl m4aMPlayVolumeControl -_080A3BC2: - ldr r0, =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_WIN0V - strh r1, [r0] - ldr r0, =gBattle_WIN1H - strh r1, [r0] - ldr r0, =gBattle_WIN1V - strh r1, [r0] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end move_something - - thumb_func_start move_anim_8072740 -move_anim_8072740: @ 80A3BFC - push {r4,lr} - adds r4, r0, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end move_anim_8072740 - - thumb_func_start move_anim_task_del -move_anim_task_del: @ 80A3C1C - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end move_anim_task_del - - thumb_func_start move_anim_related_task_del -move_anim_related_task_del: @ 80A3C38 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldr r1, =gAnimSoundTaskCount - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end move_anim_related_task_del - - thumb_func_start sub_80A3C54 -sub_80A3C54: @ 80A3C54 - push {r4,lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r4, =0x0000ffff - ldr r1, =gAnimSpriteIndexArray -_080A3C60: - ldrh r0, [r1] - cmp r0, r4 - bne _080A3C74 - strh r3, [r1] - b _080A3C7C - .pool -_080A3C74: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0x7 - ble _080A3C60 -_080A3C7C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80A3C54 - - thumb_func_start sub_80A3C84 -sub_80A3C84: @ 80A3C84 - push {r4,lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r0, =0x0000ffff - adds r4, r0, 0 - ldr r1, =gAnimSpriteIndexArray -_080A3C92: - ldrh r0, [r1] - cmp r0, r3 - bne _080A3CA8 - orrs r0, r4 - strh r0, [r1] - b _080A3CB0 - .pool -_080A3CA8: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0x7 - ble _080A3C92 -_080A3CB0: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80A3C84 - - thumb_func_start move_anim_waiter -move_anim_waiter: @ 80A3CB8 - push {lr} - ldr r2, =gAnimFramesToWait - ldrb r1, [r2] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - bgt _080A3CDC - ldr r0, =gAnimScriptCallback - ldr r1, =move_anim_execute - str r1, [r0] - movs r0, 0 - b _080A3CDE - .pool -_080A3CDC: - subs r0, r1, 0x1 -_080A3CDE: - strb r0, [r2] - pop {r0} - bx r0 - thumb_func_end move_anim_waiter - - thumb_func_start move_anim_execute -move_anim_execute: @ 80A3CE4 - push {r4,lr} - ldr r4, =gUnknown_08525E98 -_080A3CE8: - ldr r0, =gBattleAnimScriptPtr - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldr r0, [r0] - bl _call_via_r0 - ldr r0, =gAnimFramesToWait - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _080A3D0C - ldr r0, =gAnimScriptActive - ldrb r0, [r0] - cmp r0, 0 - bne _080A3CE8 -_080A3D0C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end move_anim_execute - - thumb_func_start ma00_load_graphics -ma00_load_graphics: @ 80A3D24 - push {r4-r6,lr} - ldr r6, =gBattleAnimScriptPtr - ldr r0, [r6] - adds r1, r0, 0x1 - str r1, [r6] - ldrb r4, [r0, 0x1] - ldrb r0, [r1, 0x1] - lsls r0, 8 - orrs r4, r0 - lsls r5, r4, 3 - ldr r0, =gUnknown_085112B4 + 0x10 - adds r0, r5, r0 - bl LoadCompressedObjectPicUsingHeap - ldr r0, =gUnknown_08511A34 + 0x198 - adds r5, r0 - adds r0, r5, 0 - bl LoadCompressedObjectPaletteUsingHeap - ldr r0, [r6] - adds r0, 0x2 - str r0, [r6] - ldr r0, =0xffffd8f0 - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - bl sub_80A3C54 - ldr r1, =gAnimFramesToWait - movs r0, 0x1 - strb r0, [r1] - ldr r1, =gAnimScriptCallback - ldr r0, =move_anim_waiter - str r0, [r1] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end ma00_load_graphics - - thumb_func_start ma01_080728D0 -@ void ma01_080728D0() -ma01_080728D0: @ 80A3D8C - push {r4-r6,lr} - ldr r6, =gBattleAnimScriptPtr - ldr r0, [r6] - adds r1, r0, 0x1 - str r1, [r6] - ldrb r4, [r0, 0x1] - ldrb r0, [r1, 0x1] - lsls r0, 8 - orrs r4, r0 - ldr r1, =gUnknown_08524B44 - ldr r0, =0xffffd8f0 - adds r4, r0 - lsls r0, r4, 3 - adds r0, r1 - ldrh r5, [r0, 0x6] - adds r0, r5, 0 - bl FreeSpriteTilesByTag - adds r0, r5, 0 - bl FreeSpritePaletteByTag - ldr r0, [r6] - adds r0, 0x2 - str r0, [r6] - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - bl sub_80A3C84 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end ma01_080728D0 - - thumb_func_start ma02_instanciate_template -ma02_instanciate_template: @ 80A3DD8 - push {r4-r7,lr} - ldr r5, =gBattleAnimScriptPtr - ldr r1, [r5] - adds r3, r1, 0x1 - str r3, [r5] - ldrb r2, [r1, 0x1] - ldrb r0, [r3, 0x1] - lsls r0, 8 - adds r2, r0 - ldrb r0, [r3, 0x2] - lsls r0, 16 - adds r2, r0 - ldrb r0, [r3, 0x3] - lsls r0, 24 - adds r7, r2, r0 - adds r0, r1, 0x5 - str r0, [r5] - ldrb r4, [r1, 0x5] - adds r0, r1, 0x6 - str r0, [r5] - ldrb r0, [r1, 0x6] - adds r1, 0x7 - str r1, [r5] - cmp r0, 0 - beq _080A3E28 - adds r6, r5, 0 - ldr r5, =gBattleAnimArgs - adds r3, r0, 0 -_080A3E10: - ldr r2, [r6] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - strh r1, [r5] - adds r2, 0x2 - str r2, [r6] - adds r5, 0x2 - subs r3, 0x1 - cmp r3, 0 - bne _080A3E10 -_080A3E28: - movs r0, 0x80 - ands r0, r4 - cmp r0, 0 - beq _080A3E58 - movs r0, 0x80 - eors r4, r0 - cmp r4, 0x3F - bls _080A3E48 - adds r0, r4, 0 - subs r0, 0x40 - b _080A3E4A - .pool -_080A3E48: - negs r0, r4 -_080A3E4A: - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gAnimationBankTarget - b _080A3E6A - .pool -_080A3E58: - cmp r4, 0x3F - bls _080A3E62 - adds r0, r4, 0 - subs r0, 0x40 - b _080A3E64 -_080A3E62: - negs r0, r4 -_080A3E64: - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gAnimationBankAttacker -_080A3E6A: - ldrb r0, [r0] - bl sub_80A82E4 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r4, 24 - asrs r1, 24 - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r0, r6, 16 - asrs r0, 16 - cmp r0, 0x2 - bgt _080A3E88 - movs r6, 0x3 -_080A3E88: - ldr r5, =gAnimationBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl sub_80A5C6C - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r5] - movs r1, 0x3 - bl sub_80A5C6C - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - lsls r3, r6, 24 - lsrs r3, 24 - adds r0, r7, 0 - adds r1, r4, 0 - bl CreateSpriteAndAnimate - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end ma02_instanciate_template - - thumb_func_start sub_80A3ECC -sub_80A3ECC: @ 80A3ECC - push {r4-r7,lr} - ldr r4, =gBattleAnimScriptPtr - ldr r1, [r4] - adds r3, r1, 0x1 - str r3, [r4] - ldrb r2, [r1, 0x1] - ldrb r0, [r3, 0x1] - lsls r0, 8 - adds r2, r0 - ldrb r0, [r3, 0x2] - lsls r0, 16 - adds r2, r0 - ldrb r0, [r3, 0x3] - lsls r0, 24 - adds r6, r2, r0 - adds r0, r1, 0x5 - str r0, [r4] - ldrb r7, [r1, 0x5] - adds r0, r1, 0x6 - str r0, [r4] - ldrb r0, [r1, 0x6] - adds r1, 0x7 - str r1, [r4] - cmp r0, 0 - beq _080A3F1C - adds r5, r4, 0 - ldr r4, =gBattleAnimArgs - adds r3, r0, 0 -_080A3F04: - ldr r2, [r5] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - strh r1, [r4] - adds r2, 0x2 - str r2, [r5] - adds r4, 0x2 - subs r3, 0x1 - cmp r3, 0 - bne _080A3F04 -_080A3F1C: - adds r0, r6, 0 - adds r1, r7, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - bl _call_via_r6 - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3ECC - - thumb_func_start ma04_wait_countdown -ma04_wait_countdown: @ 80A3F48 - push {r4,lr} - ldr r1, =gBattleAnimScriptPtr - ldr r0, [r1] - adds r2, r0, 0x1 - str r2, [r1] - ldr r3, =gAnimFramesToWait - ldrb r0, [r0, 0x1] - strb r0, [r3] - lsls r0, 24 - cmp r0, 0 - bne _080A3F66 - movs r4, 0x1 - negs r4, r4 - adds r0, r4, 0 - strb r0, [r3] -_080A3F66: - adds r0, r2, 0x1 - str r0, [r1] - ldr r1, =gAnimScriptCallback - ldr r0, =move_anim_waiter - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end ma04_wait_countdown - - thumb_func_start sub_80A3F88 -sub_80A3F88: @ 80A3F88 - push {lr} - ldr r0, =gAnimVisualTaskCount - ldrb r2, [r0] - cmp r2, 0 - bne _080A3FAC - ldr r0, =gBattleAnimScriptPtr - ldr r1, [r0] - adds r1, 0x1 - str r1, [r0] - ldr r0, =gAnimFramesToWait - strb r2, [r0] - b _080A3FB2 - .pool -_080A3FAC: - ldr r1, =gAnimFramesToWait - movs r0, 0x1 - strb r0, [r1] -_080A3FB2: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3F88 - - thumb_func_start nullsub_6 -nullsub_6: @ 80A3FBC - bx lr - thumb_func_end nullsub_6 - - thumb_func_start nullsub_7 -nullsub_7: @ 80A3FC0 - bx lr - thumb_func_end nullsub_7 - - thumb_func_start sub_80A3FC4 -sub_80A3FC4: @ 80A3FC4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r0, 0 - mov r8, r0 - ldr r0, =gAnimVisualTaskCount - ldrb r0, [r0] - cmp r0, 0 - bne _080A3FEC - ldr r0, =gAnimSoundTaskCount - ldrb r0, [r0] - cmp r0, 0 - bne _080A3FEC - ldr r1, =gUnknown_02038430 - ldrb r0, [r1] - cmp r0, 0xFF - bne _080A3FEC - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - beq _080A4004 -_080A3FEC: - ldr r1, =gSoundAnimFramesToWait - movs r0, 0 - strh r0, [r1] - b _080A401E - .pool -_080A4004: - bl IsSEPlaying - lsls r0, 24 - cmp r0, 0 - beq _080A403C - ldr r1, =gSoundAnimFramesToWait - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5A - bhi _080A4030 -_080A401E: - ldr r1, =gAnimFramesToWait - movs r0, 0x1 - strb r0, [r1] - b _080A40A2 - .pool -_080A4030: - ldr r0, =gMPlay_SE1 - bl m4aMPlayStop - ldr r0, =gMPlay_SE2 - bl m4aMPlayStop -_080A403C: - ldr r1, =gSoundAnimFramesToWait - movs r0, 0 - strh r0, [r1] - movs r5, 0 - ldr r7, =0x0000ffff - ldr r6, =gUnknown_08524B44 - ldr r4, =gAnimSpriteIndexArray -_080A404A: - ldrh r0, [r4] - cmp r0, r7 - beq _080A406E - lsls r0, 3 - adds r0, r6 - ldrh r0, [r0, 0x6] - bl FreeSpriteTilesByTag - ldrh r0, [r4] - lsls r0, 3 - adds r0, r6 - ldrh r0, [r0, 0x6] - bl FreeSpritePaletteByTag - ldrh r1, [r4] - adds r0, r7, 0 - orrs r0, r1 - strh r0, [r4] -_080A406E: - adds r4, 0x2 - adds r5, 0x1 - cmp r5, 0x7 - ble _080A404A - mov r1, r8 - cmp r1, 0 - bne _080A40A2 - ldr r0, =gMPlay_BGM - ldr r1, =0x0000ffff - movs r2, 0x80 - lsls r2, 1 - bl m4aMPlayVolumeControl - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080A409C - bl sub_80A8278 - movs r0, 0x1 - bl sub_8072A88 -_080A409C: - ldr r0, =gAnimScriptActive - mov r1, r8 - strb r1, [r0] -_080A40A2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A3FC4 - - thumb_func_start ma09_play_sound -ma09_play_sound: @ 80A40CC - push {r4,lr} - ldr r4, =gBattleAnimScriptPtr - ldr r0, [r4] - adds r1, r0, 0x1 - str r1, [r4] - ldrb r0, [r0, 0x1] - ldrb r1, [r1, 0x1] - lsls r1, 8 - orrs r0, r1 - bl PlaySE - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end ma09_play_sound - - thumb_func_start sub_80A40F4 -sub_80A40F4: @ 80A40F4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - mov r8, r1 - adds r6, r0, r1 - ldr r1, =gBankSpriteIds - movs r2, 0 - ldrsh r0, [r6, r2] - adds r0, r1 - ldrb r5, [r0] - ldr r1, =gSprites - lsls r0, r5, 4 - adds r0, r5 - lsls r0, 2 - adds r4, r0, r1 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r3, 0x4 - ldrsh r0, [r6, r3] - cmp r0, 0 - bne _080A4148 - adds r0, r7, 0 - bl move_anim_task_del - b _080A41BE - .pool -_080A4148: - ldr r0, =task_pA_ma0A_obj_to_bg_pal - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - mov r1, r8 - subs r1, 0x8 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0, r1 - strh r5, [r1, 0x8] - ldrh r0, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r0, r3 - strh r0, [r1, 0xA] - ldrh r0, [r4, 0x26] - ldrh r4, [r4, 0x22] - adds r0, r4 - strh r0, [r1, 0xC] - movs r3, 0x2 - ldrsh r0, [r6, r3] - cmp r0, 0 - bne _080A4190 - ldr r0, =gBattle_BG1_X - ldrh r0, [r0] - strh r0, [r1, 0xE] - ldr r0, =gBattle_BG1_Y - b _080A4198 - .pool -_080A4190: - ldr r0, =gBattle_BG2_X - ldrh r0, [r0] - strh r0, [r1, 0xE] - ldr r0, =gBattle_BG2_Y -_080A4198: - ldrh r0, [r0] - strh r0, [r1, 0x10] - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r6, 0x2] - strh r1, [r0, 0x12] - ldrh r1, [r6] - strh r1, [r0, 0x14] - ldr r1, =gUnknown_02038430 - movs r3, 0x6 - ldrsh r0, [r6, r3] - adds r0, r1 - strb r2, [r0] - adds r0, r7, 0 - bl move_anim_task_del -_080A41BE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A40F4 - - thumb_func_start sub_80A41D8 -sub_80A41D8: @ 80A41D8 - push {r4,r5,lr} - ldr r1, =gBattleAnimScriptPtr - ldr r2, [r1] - adds r0, r2, 0x1 - str r0, [r1] - ldrb r0, [r2, 0x1] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080A41F8 - ldr r0, =gAnimationBankTarget - b _080A41FA - .pool -_080A41F8: - ldr r0, =gAnimationBankAttacker -_080A41FA: - ldrb r4, [r0] - adds r0, r4, 0 - bl b_side_obj__get_some_boolean - lsls r0, 24 - cmp r0, 0 - beq _080A4266 - adds r0, r4, 0 - bl GetBankIdentity - lsls r0, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r0, 24 - cmp r0, 0x1 - bls _080A4226 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080A4230 -_080A4226: - movs r5, 0 - b _080A4232 - .pool -_080A4230: - movs r5, 0x1 -_080A4232: - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - bl sub_80A438C - ldr r0, =sub_80A40F4 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - movs r2, 0 - strh r4, [r0, 0x8] - strh r5, [r0, 0xA] - movs r1, 0x1 - strh r1, [r0, 0xC] - strh r2, [r0, 0xE] -_080A4266: - movs r0, 0x2 - eors r4, r0 - adds r0, r4, 0 - bl b_side_obj__get_some_boolean - lsls r0, 24 - cmp r0, 0 - beq _080A42D8 - adds r0, r4, 0 - bl GetBankIdentity - lsls r0, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r0, 24 - cmp r0, 0x1 - bls _080A4294 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080A42A4 -_080A4294: - movs r5, 0 - b _080A42A6 - .pool -_080A42A4: - movs r5, 0x1 -_080A42A6: - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - bl sub_80A438C - ldr r0, =sub_80A40F4 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - strh r4, [r0, 0x8] - strh r5, [r0, 0xA] - movs r1, 0x1 - strh r1, [r0, 0xC] - strh r1, [r0, 0xE] -_080A42D8: - ldr r1, =gBattleAnimScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - ldr r1, =gAnimFramesToWait - movs r0, 0x1 - strb r0, [r1] - ldr r1, =gAnimScriptCallback - ldr r0, =move_anim_waiter - str r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A41D8 - - thumb_func_start b_side_obj__get_some_boolean -b_side_obj__get_some_boolean: @ 80A4310 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r5, r4, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080A4330 - ldr r0, =gAnimationBankAttacker - ldrb r0, [r0] - cmp r4, r0 - beq _080A4374 - b _080A4384 - .pool -_080A4330: - adds r0, r4, 0 - bl sub_80A6A90 - lsls r0, 24 - cmp r0, 0 - beq _080A4384 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080A4374 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r1, [r0] - lsls r0, r5, 2 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080A4374 - ldr r2, =gSprites - ldr r0, =gBankSpriteIds - adds r0, r5, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 29 - cmp r0, 0 - blt _080A4384 -_080A4374: - movs r0, 0x1 - b _080A4386 - .pool -_080A4384: - movs r0, 0 -_080A4386: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end b_side_obj__get_some_boolean - - thumb_func_start sub_80A438C -sub_80A438C: @ 80A438C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x28 - lsls r0, 24 - lsrs r5, r0, 24 - adds r6, r5, 0 - lsls r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - cmp r1, 0 - beq _080A43AA - b _080A455E -_080A43AA: - bl IsContest - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080A43DC - ldr r1, =0x06008000 - movs r2, 0x80 - lsls r2, 6 - movs r0, 0 - movs r3, 0x1 - bl RequestDma3Fill - ldr r1, =0x0600f000 - movs r2, 0x80 - lsls r2, 5 - movs r0, 0xFF - movs r3, 0 - bl RequestDma3Fill - b _080A43F8 - .pool -_080A43DC: - ldr r1, =0x06004000 - movs r2, 0x80 - lsls r2, 6 - movs r0, 0 - movs r3, 0x1 - bl RequestDma3Fill - ldr r1, =0x0600e000 - movs r2, 0x80 - lsls r2, 5 - movs r0, 0xFF - movs r3, 0 - bl RequestDma3Fill -_080A43F8: - add r0, sp, 0x10 - bl sub_80A6B30 - add r0, sp, 0x20 - movs r1, 0 - strh r1, [r0] - ldr r1, [sp, 0x10] - ldr r2, =0x01000800 - bl CpuSet - mov r0, sp - adds r0, 0x22 - movs r1, 0xFF - strh r1, [r0] - ldr r1, [sp, 0x14] - ldr r2, =0x01000400 - bl CpuSet - movs r0, 0x1 - movs r1, 0x4 - movs r2, 0x2 - bl lcd_bg_operations - movs r0, 0x1 - movs r1, 0 - movs r2, 0x1 - bl lcd_bg_operations - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl lcd_bg_operations - ldr r0, =gBankSpriteIds - adds r0, r6, r0 - ldrb r4, [r0] - ldr r5, =gBattle_BG1_X - ldr r0, =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x24] - ldrh r1, [r1, 0x20] - adds r0, r1 - negs r0, r0 - adds r0, 0x20 - strh r0, [r5] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080A447A - ldr r0, =gUnknown_02039F34 - ldr r0, [r0] - ldr r0, [r0, 0x18] - ldrh r0, [r0] - bl sub_80DB2A8 - lsls r0, 24 - cmp r0, 0 - beq _080A447A - ldrh r0, [r5] - subs r0, 0x1 - strh r0, [r5] -_080A447A: - ldr r5, =gBattle_BG1_Y - ldr r2, =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r2 - ldrh r0, [r1, 0x26] - ldrh r1, [r1, 0x22] - adds r0, r1 - negs r0, r0 - adds r0, 0x20 - strh r0, [r5] - mov r0, r9 - cmp r0, 0 - beq _080A44B0 - ldr r0, =gBankSpriteIds - adds r0, r6, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_080A44B0: - ldr r0, =gBattle_BG1_X - ldrh r1, [r0] - movs r0, 0x14 - bl SetGpuReg - ldrh r1, [r5] - movs r0, 0x16 - bl SetGpuReg - lsls r4, r6, 5 - ldr r0, =gPlttBufferUnfaded + 0x200 - adds r4, r0 - add r0, sp, 0x10 - ldrb r1, [r0, 0x8] - lsls r1, 4 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - add r0, sp, 0x10 - ldrb r1, [r0, 0x8] - lsls r1, 5 - movs r0, 0xA0 - lsls r0, 19 - adds r1, r0 - ldr r2, =0x04000008 - adds r0, r4, 0 - bl CpuSet - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080A4524 - movs r3, 0 - b _080A452E - .pool -_080A4524: - adds r0, r6, 0 - bl GetBankIdentity - lsls r0, 24 - lsrs r3, r0, 24 -_080A452E: - add r0, sp, 0x10 - ldrb r0, [r0, 0x8] - str r0, [sp] - ldr r0, [sp, 0x10] - str r0, [sp, 0x4] - ldr r0, [sp, 0x14] - str r0, [sp, 0x8] - add r0, sp, 0x10 - ldrh r0, [r0, 0xA] - str r0, [sp, 0xC] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl sub_8118FBC - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080A4558 - b _080A4666 -_080A4558: - bl sub_80A46A0 - b _080A4666 -_080A455E: - ldr r1, =0x06006000 - movs r2, 0x80 - lsls r2, 6 - movs r0, 0 - movs r3, 0x1 - bl RequestDma3Fill - ldr r1, =0x0600f000 - movs r7, 0x80 - lsls r7, 5 - movs r0, 0 - adds r2, r7, 0 - movs r3, 0x1 - bl RequestDma3Fill - add r0, sp, 0x10 - movs r1, 0x2 - bl sub_80A6B90 - add r0, sp, 0x24 - movs r4, 0 - strh r4, [r0] - ldr r1, [sp, 0x10] - adds r1, r7 - ldr r2, =0x01000800 - bl CpuSet - mov r0, sp - adds r0, 0x26 - strh r4, [r0] - ldr r1, [sp, 0x14] - movs r2, 0x80 - lsls r2, 4 - mov r8, r2 - add r1, r8 - ldr r2, =0x01000400 - bl CpuSet - movs r0, 0x2 - movs r1, 0x4 - movs r2, 0x2 - bl lcd_bg_operations - movs r0, 0x2 - movs r1, 0 - movs r2, 0x1 - bl lcd_bg_operations - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl lcd_bg_operations - ldr r0, =gBankSpriteIds - adds r2, r5, r0 - ldrb r4, [r2] - ldr r5, =gBattle_BG2_X - ldr r3, =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r3 - ldrh r0, [r1, 0x24] - ldrh r4, [r1, 0x20] - adds r0, r4 - negs r0, r0 - adds r0, 0x20 - strh r0, [r5] - ldr r4, =gBattle_BG2_Y - ldrh r0, [r1, 0x26] - ldrh r1, [r1, 0x22] - adds r0, r1 - negs r0, r0 - adds r0, 0x20 - strh r0, [r4] - mov r0, r9 - cmp r0, 0 - beq _080A460E - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_080A460E: - ldrh r1, [r5] - movs r0, 0x18 - bl SetGpuReg - ldrh r1, [r4] - movs r0, 0x1A - bl SetGpuReg - lsls r4, r6, 5 - ldr r0, =gPlttBufferUnfaded + 0x200 - adds r4, r0 - adds r0, r4, 0 - movs r1, 0x90 - movs r2, 0x20 - bl LoadPalette - ldr r1, =0x05000120 - ldr r2, =0x04000008 - adds r0, r4, 0 - bl CpuSet - adds r0, r6, 0 - bl GetBankIdentity - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - add r0, sp, 0x10 - ldrb r0, [r0, 0x8] - str r0, [sp] - ldr r0, [sp, 0x10] - adds r0, r7 - str r0, [sp, 0x4] - ldr r0, [sp, 0x14] - add r0, r8 - str r0, [sp, 0x8] - add r0, sp, 0x10 - ldrh r0, [r0, 0xA] - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl sub_8118FBC -_080A4666: - add sp, 0x28 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80A438C - + thumb_func_start sub_80A46A0 sub_80A46A0: @ 80A46A0 push {r4-r7,lr} sub sp, 0x10 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] - bl sub_80DB2A8 + bl IsSpeciesNotUnown lsls r0, 24 cmp r0, 0 beq _080A4712 @@ -1790,14 +283,14 @@ _080A48D2: cmp r4, 0x2 bne _080A48E0 _080A48D6: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080A48E2 .pool _080A48E0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080A48E2: ldrb r5, [r0] - ldr r3, =gUnknown_02038430 + ldr r3, =gMonAnimTaskIdArray ldrb r0, [r3] cmp r0, 0xFF beq _080A4908 @@ -1902,7 +395,7 @@ _080A49BC: _080A49C4: movs r4, 0x1 _080A49C6: - ldr r6, =gUnknown_02038430 + ldr r6, =gMonAnimTaskIdArray ldrb r0, [r6] cmp r0, 0xFF beq _080A49DE @@ -1964,15 +457,15 @@ _080A4A3A: cmp r5, 0x2 bne _080A4A48 _080A4A3E: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080A4A4A .pool _080A4A48: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080A4A4A: ldrb r4, [r0] adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4A8A @@ -2005,7 +498,7 @@ _080A4A8A: cmp r5, 0x1 bls _080A4ACA adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4ACA @@ -2066,15 +559,15 @@ _080A4AFE: cmp r5, 0x2 bne _080A4B0C _080A4B02: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080A4B0E .pool _080A4B0C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080A4B0E: ldrb r6, [r0] adds r0, r6, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4B38 @@ -2099,7 +592,7 @@ _080A4B38: adds r4, r6, 0 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4B78 @@ -2183,7 +676,7 @@ _080A4BF8: movs r5, 0x1 _080A4BFA: adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4C0C @@ -2202,7 +695,7 @@ _080A4C0C: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A4C38 @@ -2526,7 +1019,7 @@ sub_80A4E5C: @ 80A4E5C b _080A4EDA .pool _080A4EA8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2866,7 +1359,7 @@ BattleAnimGetPanControl: @ 80A5178 bne _080A51C0 ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r2, [r0] ldr r1, [r1, 0x4] lsls r0, r2, 1 @@ -2892,8 +1385,8 @@ _080A51C0: lsls r0, 24 cmp r0, 0 beq _080A51E8 - ldr r0, =gAnimationBankAttacker - ldr r1, =gAnimationBankTarget + ldr r0, =gAnimBankAttacker + ldr r1, =gAnimBankTarget ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -2905,13 +1398,13 @@ _080A51C0: b _080A524C .pool _080A51E8: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A5226 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2933,7 +1426,7 @@ _080A5218: lsls r0, 24 b _080A5250 _080A5226: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2988,7 +1481,7 @@ sub_80A5278: @ 80A5278 bne _080A52C0 ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r2, [r0] ldr r1, [r1, 0x4] lsls r0, r2, 1 @@ -3010,7 +1503,7 @@ sub_80A5278: @ 80A5278 b _080A52DE .pool _080A52C0: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3860,11 +2353,11 @@ sub_80A5984: @ 80A5984 str r1, [r0] cmp r2, 0 beq _080A59A0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget b _080A59A2 .pool _080A59A0: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker _080A59A2: ldrb r0, [r0] bl GetBankIdentity @@ -3882,11 +2375,11 @@ _080A59BE: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x2 movs r1, 0x4 movs r2, 0x2 - bl lcd_bg_operations + bl SetAnimBgAttribute _080A59D2: pop {r4} pop {r0} @@ -3908,11 +2401,11 @@ sub_80A59DC: @ 80A59DC movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x2 movs r1, 0x4 movs r2, 0x2 - bl lcd_bg_operations + bl SetAnimBgAttribute _080A5A04: pop {r0} bx r0 @@ -3927,11 +2420,11 @@ sub_80A5A0C: @ 80A5A0C ldrb r6, [r0, 0x1] adds r0, 0x2 str r0, [r1] - ldr r7, =gAnimationBankAttacker + ldr r7, =gAnimBankAttacker ldrb r0, [r7] bl GetBankSide adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 @@ -3961,11 +2454,11 @@ _080A5A64: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x2 movs r1, 0x4 movs r2, 0x2 - bl lcd_bg_operations + bl SetAnimBgAttribute _080A5A78: pop {r4-r7} pop {r0} @@ -4051,11 +2544,11 @@ sub_80A5AFC: @ 80A5AFC lsls r0, 24 cmp r0, 0 beq _080A5BA6 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 @@ -4133,11 +2626,11 @@ sub_80A5BAC: @ 80A5BAC lsls r0, 24 cmp r0, 0 beq _080A5C38 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 diff --git a/asm/battle_anim_80A9C70.s b/asm/battle_anim_80A9C70.s index ca6572e1a..0559ceab2 100644 --- a/asm/battle_anim_80A9C70.s +++ b/asm/battle_anim_80A9C70.s @@ -331,7 +331,7 @@ sub_80A9EF4: @ 80A9EF4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -616,7 +616,7 @@ _080AA16C: movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080AA186: pop {r4} pop {r0} @@ -829,7 +829,7 @@ _080AA322: b _080AA330 _080AA328: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080AA352 _080AA330: ldr r0, =gBattleAnimArgs @@ -863,13 +863,13 @@ move_anim_start_t2: @ 80AA364 lsrs r4, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker strb r4, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget strb r4, [r0] ldr r0, =gUnknown_082C92FC movs r2, 0 - bl move_something + bl DoBattleAnim ldr r0, =task0A_80788BC movs r1, 0xA bl CreateTask diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s index 52b599c4c..3ee1786ad 100755 --- a/asm/battle_anim_80D51AC.s +++ b/asm/battle_anim_80D51AC.s @@ -18,7 +18,7 @@ sub_80D51AC: @ 80D51AC cmp r2, 0xFF bne _080D51D0 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D520C .pool _080D51D0: @@ -140,7 +140,7 @@ _080D5288: adds r0, r6 strh r3, [r0, 0x26] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D52CA _080D52C6: subs r0, 0x1 @@ -204,7 +204,7 @@ _080D5326: lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _080D533C @@ -216,7 +216,7 @@ _080D533C: .pool _080D5348: ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 _080D5350: @@ -226,7 +226,7 @@ _080D5352: beq _080D5368 _080D5356: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D53A6 .pool _080D5368: @@ -359,7 +359,7 @@ _080D5436: adds r0, r7 strh r2, [r0, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D5478 _080D5474: subs r0, r2, 0x1 @@ -385,7 +385,7 @@ sub_80D5484: @ 80D5484 cmp r3, 0xFF bne _080D54A8 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D54F6 .pool _080D54A8: @@ -584,7 +584,7 @@ _080D55F8: strh r0, [r2, 0x26] _080D5630: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D563C _080D5638: subs r0, r2, 0x1 @@ -705,7 +705,7 @@ _080D56F6: cmp r0, 0 bne _080D5728 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D5728: pop {r4-r7} pop {r0} @@ -829,7 +829,7 @@ _080D5810: strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D5822: pop {r4-r6} pop {r0} @@ -842,7 +842,7 @@ sub_80D5830: @ 80D5830 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -871,7 +871,7 @@ sub_80D5860: @ 80D5860 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -892,7 +892,7 @@ _080D5894: strh r2, [r4, 0x2E] strh r0, [r4, 0x32] ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -919,7 +919,7 @@ sub_80D58D4: @ 80D58D4 strh r1, [r0, 0x30] ldr r1, =sub_80A6630 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 pop {r0} bx r0 @@ -970,7 +970,7 @@ sub_80D5944: @ 80D5944 strh r1, [r0, 0x32] ldr r1, =sub_80A6630 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 pop {r0} bx r0 @@ -988,12 +988,12 @@ sub_80D5968: @ 80D5968 cmp r0, 0 bne _080D598C ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080D5990 .pool _080D598C: ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080D5990: ldrb r0, [r0] adds r0, r1 @@ -1093,7 +1093,7 @@ _080D5A56: strh r1, [r3, 0x26] _080D5A58: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D5A8E .pool _080D5A64: @@ -1133,11 +1133,11 @@ sub_80D5A94: @ 80D5A94 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D5AB0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080D5AB2 .pool _080D5AB0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080D5AB2: ldrb r2, [r0] ldr r0, =gBankSpriteIds @@ -1192,7 +1192,7 @@ _080D5ADC: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A6680 @@ -1218,11 +1218,11 @@ sub_80D5B48: @ 80D5B48 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D5B70 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080D5B72 .pool _080D5B70: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080D5B72: ldrb r1, [r0] ldr r0, =gBankSpriteIds @@ -1281,7 +1281,7 @@ _080D5B9C: lsls r0, 16 cmp r0, 0 bne _080D5C04 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 b _080D5C0C @@ -1318,7 +1318,7 @@ sub_80D5C20: @ 80D5C20 lsls r1, 2 adds r1, r4 strh r3, [r1, 0x26] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1338,7 +1338,7 @@ sub_80D5C50: @ 80D5C50 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1485,7 +1485,7 @@ _080D5D70: cmp r0, 0 bne _080D5DA4 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D5DA4: pop {r4,r5} pop {r0} @@ -1518,16 +1518,16 @@ _080D5DD8: beq _080D5DE8 b _080D5E10 _080D5DDE: - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker b _080D5DEA .pool _080D5DE8: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget _080D5DEA: ldrb r0, [r5] movs r4, 0x2 eors r0, r4 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080D5E10 @@ -1540,7 +1540,7 @@ _080D5DEA: .pool _080D5E10: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D5E58 _080D5E18: ldr r1, =gTasks @@ -1549,7 +1549,7 @@ _080D5E18: lsls r0, 3 adds r5, r0, r1 strh r2, [r5, 0x8] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1609,7 +1609,7 @@ sub_80D5E6C: @ 80D5E6C cmp r1, r0 bls _080D5EAA adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D5EAA: pop {r4} pop {r0} @@ -1622,7 +1622,7 @@ sub_80D5EB8: @ 80D5EB8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -1660,7 +1660,7 @@ _080D5ED4: b _080D5F18 .pool _080D5F14: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] _080D5F18: strh r0, [r2, 0x12] @@ -1817,7 +1817,7 @@ _080D601E: strh r3, [r0, 0x24] strh r3, [r0, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D6050: pop {r3,r4} mov r8, r3 @@ -1923,7 +1923,7 @@ _080D6120: adds r0, r6, 0 bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D612C: pop {r4-r6} pop {r0} @@ -1995,11 +1995,11 @@ _080D61B8: ldrsh r0, [r6, r1] cmp r0, 0 bne _080D61C8 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080D61CA .pool _080D61C8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080D61CA: ldrb r0, [r0] bl GetBankSide @@ -2076,11 +2076,11 @@ sub_80D622C: @ 80D622C ldrsh r0, [r4, r1] cmp r0, 0 bne _080D6274 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080D6276 .pool _080D6274: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080D6276: ldrb r0, [r0] bl GetBankSide @@ -2201,7 +2201,7 @@ _080D6364: bl sub_80A7344 _080D636A: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080D6382 _080D6372: movs r0, 0 @@ -2236,7 +2236,7 @@ sub_80D6388: @ 80D6388 adds r0, r5, r7 lsls r0, 3 adds r6, r0, r4 - ldr r0, =gMovePowerMoveAnim + ldr r0, =gAnimMovePower ldrh r0, [r0] movs r1, 0xC bl __udivsi3 @@ -2248,7 +2248,7 @@ _080D63C0: adds r0, r5, r7 lsls r0, 3 adds r6, r0, r4 - ldr r0, =gMoveDmgMoveAnim + ldr r0, =gAnimMoveDmg ldr r0, [r0] movs r1, 0xC bl __divsi3 @@ -2435,7 +2435,7 @@ _080D6518: adds r0, r2 strh r4, [r0, 0x26] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080D654A: pop {r4,r5} pop {r0} diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index 4ecdcbf68..318f8061c 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -22,7 +22,7 @@ sub_80FE840: @ 80FE840 strh r0, [r4, 0x2E] ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -80,7 +80,7 @@ sub_80FE898: @ 80FE898 b _080FE8DA _080FE8D4: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FE8DA: pop {r4} pop {r0} @@ -96,7 +96,7 @@ sub_80FE8E0: @ 80FE8E0 ldr r0, =gBattleAnimArgs ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -132,7 +132,7 @@ sub_80FE930: @ 80FE930 bl StartSpriteAnim ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -147,7 +147,7 @@ sub_80FE930: @ 80FE930 strh r0, [r4, 0x36] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -167,7 +167,7 @@ sub_80FE988: @ 80FE988 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -212,14 +212,14 @@ _080FE9FA: ldrsh r0, [r4, r1] cmp r0, 0x7F ble _080FEA14 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 b _080FEA1E .pool _080FEA14: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x6 @@ -287,7 +287,7 @@ sub_80FEA58: @ 80FEA58 strh r0, [r1, 0x4] strh r2, [r1, 0x6] ldr r4, =gUnknown_08592210 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 adds r3, r0, 0 @@ -304,7 +304,7 @@ _080FEAB2: cmp r0, 0xF bne _080FEAC0 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080FEAC0: pop {r4-r6} pop {r0} @@ -321,7 +321,7 @@ sub_80FEAD8: @ 80FEAD8 ldr r6, =gBattleAnimArgs ldrh r0, [r6, 0x6] strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -355,7 +355,7 @@ sub_80FEB28: @ 80FEB28 cmp r0, 0 beq _080FEB3C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FEB3C: pop {r4} pop {r0} @@ -374,7 +374,7 @@ sub_80FEB44: @ 80FEB44 ands r1, r0 adds r0, r5, 0 bl StartSpriteAnim - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -410,7 +410,7 @@ _080FEB94: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -454,7 +454,7 @@ sub_80FEBFC: @ 80FEBFC cmp r0, 0 beq _080FEC12 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080FEC42 _080FEC12: movs r1, 0x38 @@ -494,7 +494,7 @@ sub_80FEC48: @ 80FEC48 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -508,7 +508,7 @@ _080FEC68: ldr r4, =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -583,7 +583,7 @@ sub_80FECF0: @ 80FECF0 strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -655,7 +655,7 @@ sub_80FED74: @ 80FED74 lsrs r0, 16 cmp r0, 0x7F bhi _080FEDC8 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -669,7 +669,7 @@ sub_80FED74: @ 80FED74 b _080FEDEC .pool _080FEDC8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 adds r0, 0x1 @@ -704,7 +704,7 @@ _080FEDEC: cmp r0, r1 bne _080FEE10 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FEE10: pop {r4} pop {r0} @@ -727,10 +727,10 @@ sub_80FEE1C: @ 80FEE1C bne _080FEE3E _080FEE36: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080FEE70 _080FEE3E: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -740,17 +740,17 @@ _080FEE3E: movs r0, 0x2 movs r1, 0x4 movs r2, 0x3 - bl lcd_bg_operations + bl SetAnimBgAttribute b _080FEE6A .pool _080FEE60: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _080FEE6A: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080FEE70: pop {r4} pop {r0} @@ -771,7 +771,7 @@ sub_80FEE78: @ 80FEE78 strh r0, [r4, 0x32] ldrh r0, [r4, 0x22] strh r0, [r4, 0x34] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -823,14 +823,14 @@ sub_80FEECC: @ 80FEECC lsrs r0, 16 cmp r0, 0x7F bhi _080FEF18 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 b _080FEF22 .pool _080FEF18: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 @@ -847,7 +847,7 @@ _080FEF22: .pool _080FEF38: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FEF3E: pop {r4} pop {r0} @@ -868,7 +868,7 @@ sub_80FEF44: @ 80FEF44 strh r0, [r4, 0x32] ldrh r0, [r4, 0x22] strh r0, [r4, 0x34] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -939,7 +939,7 @@ _080FEFE4: b _080FEFF6 _080FEFF0: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FEFF6: pop {r4} pop {r0} @@ -950,7 +950,7 @@ _080FEFF6: sub_80FEFFC: @ 80FEFFC push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -1026,7 +1026,7 @@ _080FF08C: sub_80FF090: @ 80FF090 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1067,7 +1067,7 @@ _080FF0DE: cmp r0, 0x50 ble _080FF0EC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF0EC: pop {r4} pop {r0} @@ -1080,7 +1080,7 @@ sub_80FF0F4: @ 80FF0F4 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1098,7 +1098,7 @@ _080FF114: ldrsh r0, [r6, r1] cmp r0, 0 bne _080FF154 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -1117,7 +1117,7 @@ _080FF114: b _080FF174 .pool _080FF154: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -1139,11 +1139,11 @@ _080FF174: strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -1249,7 +1249,7 @@ _080FF256: cmp r7, 0 beq _080FF260 adds r0, r6, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF260: pop {r4-r7} pop {r0} @@ -1265,7 +1265,7 @@ sub_80FF268: @ 80FF268 lsrs r0, 24 cmp r0, 0x1 bne _080FF28A - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -1350,7 +1350,7 @@ _080FF2F8: ldrsh r0, [r4, r1] cmp r0, 0x7F bgt _080FF338 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -1359,7 +1359,7 @@ _080FF2F8: b _080FF346 .pool _080FF338: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -1382,7 +1382,7 @@ _080FF346: cmp r0, 0 bne _080FF36A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF36A: pop {r4,r5} pop {r0} @@ -1500,7 +1500,7 @@ _080FF424: b _080FF452 _080FF44C: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF452: pop {r4} pop {r0} @@ -1534,7 +1534,7 @@ sub_80FF458: @ 80FF458 cmp r0, 0 bge _080FF498 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080FF51C .pool _080FF498: @@ -1550,7 +1550,7 @@ _080FF498: lsls r0, 28 lsrs r0, 30 strh r0, [r6, 0x24] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget mov r9, r0 ldrb r0, [r0] bl sub_80A8328 @@ -1639,7 +1639,7 @@ sub_80FF53C: @ 80FF53C lsls r1, 16 asrs r1, 24 strh r1, [r5, 0x24] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1765,7 +1765,7 @@ _080FF674: cmp r0, 0x3 bne _080FF68E adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080FF68E: pop {r4-r7} pop {r0} @@ -1785,7 +1785,7 @@ sub_80FF698: @ 80FF698 beq _080FF704 b _080FF756 _080FF6AA: - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -1845,7 +1845,7 @@ _080FF704: bl ChangeSpriteAffineAnim movs r0, 0x19 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -1860,7 +1860,7 @@ _080FF704: strh r0, [r5, 0x36] ldr r0, =sub_80A70C0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 _080FF756: @@ -1878,7 +1878,7 @@ sub_80FF768: @ 80FF768 ldrsh r0, [r5, r1] cmp r0, 0 bne _080FF7D4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -1941,7 +1941,7 @@ sub_80FF7EC: @ 80FF7EC push {r4-r6} sub sp, 0x4 mov r9, r0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -1956,7 +1956,7 @@ sub_80FF7EC: @ 80FF7EC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -2081,7 +2081,7 @@ _080FF91C: cmp r1, r0 ble _080FF92E adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF92E: pop {r0} bx r0 @@ -2095,7 +2095,7 @@ sub_80FF934: @ 80FF934 ldrsh r0, [r6, r1] cmp r0, 0 bne _080FF974 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -2144,7 +2144,7 @@ _080FF974: cmp r1, r0 ble _080FF9AA adds r0, r6, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FF9AA: pop {r4-r6} pop {r0} @@ -2284,7 +2284,7 @@ _080FFA98: cmp r0, 0x32 ble _080FFAAC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FFAAC: pop {r4} pop {r0} @@ -2349,7 +2349,7 @@ sub_80FFB18: @ 80FFB18 adds r5, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -2360,7 +2360,7 @@ sub_80FFB18: @ 80FFB18 bl sub_80A5C6C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -2442,7 +2442,7 @@ _080FFBBA: strh r5, [r4, 0x26] strh r5, [r4, 0x2E] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FFBEC: pop {r4,r5} pop {r0} @@ -2453,7 +2453,7 @@ _080FFBEC: sub_80FFBF4: @ 80FFBF4 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -2537,7 +2537,7 @@ _080FFC8A: cmp r0, 0 beq _080FFCAA adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FFCAA: pop {r4} pop {r0} @@ -2551,7 +2551,7 @@ sub_80FFCB4: @ 80FFCB4 adds r5, r0, 0 movs r1, 0 bl sub_80A6980 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -2562,7 +2562,7 @@ sub_80FFCB4: @ 80FFCB4 bl sub_80A5C6C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -2915,7 +2915,7 @@ sub_80FFF7C: @ 80FFF7C cmp r0, 0x14 ble _080FFF8E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080FFF8E: movs r0, 0x2E ldrsh r1, [r4, r0] @@ -2954,7 +2954,7 @@ sub_80FFFC0: @ 80FFFC0 lsls r0, 3 ldr r1, =gTasks adds r5, r0, r1 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] bl sub_80A82E4 lsls r0, 24 @@ -3017,7 +3017,7 @@ _08100028: cmp r0, 0x40 bne _08100060 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08100060: ldr r4, =gSprites movs r0, 0xC @@ -3581,7 +3581,7 @@ _081004D6: cmp r0, 0 bne _081004FC adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081004FC _081004E6: ldrh r0, [r6, 0xA] @@ -3772,11 +3772,11 @@ sub_8100640: @ 8100640 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810065C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810065E .pool _0810065C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810065E: ldrb r6, [r0] adds r0, r6, 0 @@ -3857,7 +3857,7 @@ _081006E4: strb r0, [r4, 0x5] b _08100738 _08100700: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -4047,7 +4047,7 @@ _08100876: cmp r1, r0 bne _0810088A adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810088A: pop {r4-r7} pop {r0} @@ -4066,7 +4066,7 @@ sub_8100898: @ 8100898 cmp r0, 0 bne _081008B4 adds r0, r6, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810098E .pool _081008B4: @@ -4074,11 +4074,11 @@ _081008B4: ldrsh r0, [r1, r3] cmp r0, 0 bne _081008C4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _081008C6 .pool _081008C4: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _081008C6: ldrb r0, [r4] movs r1, 0x2 @@ -4227,7 +4227,7 @@ sub_81009DC: @ 81009DC cmp r0, 0 beq _081009F2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081009F2: pop {r0} bx r0 @@ -4237,7 +4237,7 @@ _081009F2: sub_81009F8: @ 81009F8 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4264,7 +4264,7 @@ _08100A2C: strh r0, [r4, 0x22] ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -4277,7 +4277,7 @@ _08100A2C: sub_8100A50: @ 8100A50 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4343,7 +4343,7 @@ sub_8100A94: @ 8100A94 sub_8100AE0: @ 8100AE0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -4439,7 +4439,7 @@ sub_8100B88: @ 8100B88 b _08100C24 .pool _08100BA8: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -4453,7 +4453,7 @@ _08100BA8: b _08100C34 .pool _08100BC8: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -4469,7 +4469,7 @@ _08100BC8: mov r8, r2 mov r1, r8 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _08100C3E @@ -4494,7 +4494,7 @@ _08100BC8: b _08100C3E .pool _08100C24: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -4509,7 +4509,7 @@ _08100C34: _08100C3E: strh r7, [r6, 0x20] strh r4, [r6, 0x22] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4619,7 +4619,7 @@ _08100CF2: asrs r0, 16 cmp r0, 0x14 bne _08100D28 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 movs r0, 0x3 @@ -4739,7 +4739,7 @@ _08100DE0: adds r0, r4 bl DestroySprite adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08100E10: pop {r4,r5} pop {r0} @@ -4754,7 +4754,7 @@ sub_8100E1C: @ 8100E1C ldr r4, =gBattleAnimArgs ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4846,7 +4846,7 @@ _08100EB2: cmp r0, r1 bne _08100EE8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08100EE8: pop {r4} pop {r0} @@ -4866,7 +4866,7 @@ sub_8100EF0: @ 8100EF0 adds r0, 0x8 strh r0, [r1, 0x2] _08100F06: - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r1, 0 bl sub_80A60AC @@ -5090,7 +5090,7 @@ _081010C2: sub_81010CC: @ 81010CC push {r4-r6,lr} adds r4, r0, 0 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -5309,7 +5309,7 @@ _0810127A: movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08101290: pop {r4} pop {r0} @@ -5406,7 +5406,7 @@ _08101320: strh r0, [r4, 0x30] ldrh r0, [r5, 0x8] strh r0, [r4, 0x32] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A656C @@ -5426,11 +5426,11 @@ sub_810135C: @ 810135C ldrsh r0, [r0, r1] cmp r0, 0 bne _08101378 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810137A .pool _08101378: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810137A: ldrb r6, [r0] bl IsDoubleBattle @@ -5440,7 +5440,7 @@ _0810137A: movs r1, 0x2 adds r0, r6, 0 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _081013C4 @@ -5507,7 +5507,7 @@ _08101414: strh r0, [r5, 0x30] ldrh r0, [r1, 0x8] strh r0, [r5, 0x32] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A656C @@ -5523,7 +5523,7 @@ sub_8101440: @ 8101440 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5599,7 +5599,7 @@ _081014D8: cmp r0, 0 beq _081014EC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081014EC: pop {r4} pop {r0} @@ -5611,7 +5611,7 @@ sub_81014F4: @ 81014F4 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5885,7 +5885,7 @@ _08101718: strh r1, [r5, 0x24] movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -6052,7 +6052,7 @@ _0810187C: cmp r0, 0x8 bne _08101890 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08101890: pop {r4} pop {r0} @@ -6199,7 +6199,7 @@ sub_8101998: @ 8101998 adds r4, r0, 0 movs r0, 0x6 strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -6238,7 +6238,7 @@ sub_81019E8: @ 81019E8 cmp r6, 0 bne _08101A24 ldr r1, =gBankSpriteIds - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -6301,7 +6301,7 @@ sub_8101A74: @ 8101A74 adds r4, r0, 0 movs r0, 0x4 strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -6361,7 +6361,7 @@ sub_8101AE8: @ 8101AE8 cmp r0, 0 bne _08101B38 ldr r1, =gBankSpriteIds - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -6431,7 +6431,7 @@ _08101B78: thumb_func_start sub_8101B84 sub_8101B84: @ 8101B84 push {lr} - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 thumb_func_end sub_8101B84 @@ -6466,7 +6466,7 @@ _08101BB6: _08101BBC: strh r5, [r4, 0x30] ldr r1, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -6558,7 +6558,7 @@ _08101C4C: lsrs r0, 24 bl sub_80A7344 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08101C8E: pop {r4,r5} pop {r0} @@ -6576,7 +6576,7 @@ sub_8101C94: @ 8101C94 lsls r0, 3 adds r5, r0, r1 ldr r1, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -6596,7 +6596,7 @@ sub_8101C94: @ 8101C94 cmp r1, 0x1 beq _08101D04 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08101D22 .pool _08101CE8: @@ -6864,7 +6864,7 @@ _08101ED4: .pool _08101EE0: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08101EE6: pop {r4} pop {r0} @@ -6906,7 +6906,7 @@ _08101F2C: ldrb r0, [r4, 0x8] bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08101F38: pop {r4,r5} pop {r0} @@ -6922,11 +6922,11 @@ sub_8101F40: @ 8101F40 ldrsh r0, [r6, r1] cmp r0, 0 bne _08101F5C - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _08101F5E .pool _08101F5C: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _08101F5E: ldrb r0, [r4] movs r1, 0x2 @@ -6962,7 +6962,7 @@ _08101F5E: sub_8101FA8: @ 8101FA8 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -6992,7 +6992,7 @@ sub_8101FA8: @ 8101FA8 sub_8101FF0: @ 8101FF0 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -7100,7 +7100,7 @@ sub_810208C: @ 810208C cmp r0, 0x8 ble _081020D4 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081020D4: pop {r0} bx r0 @@ -7115,11 +7115,11 @@ sub_81020D8: @ 81020D8 ldrsh r0, [r6, r1] cmp r0, 0 bne _081020F4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _081020F6 .pool _081020F4: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _081020F6: ldrb r0, [r4] movs r1, 0 @@ -7181,7 +7181,7 @@ _0810215C: cmp r0, 0 beq _08102178 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08102178: pop {r0} bx r0 @@ -7191,7 +7191,7 @@ _08102178: sub_810217C: @ 810217C push {r4-r6,lr} adds r4, r0, 0 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -7301,7 +7301,7 @@ _08102238: cmp r0, 0 beq _08102262 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08102262: pop {r4} pop {r0} @@ -7316,7 +7316,7 @@ sub_8102268: @ 8102268 ldrsh r0, [r6, r1] cmp r0, 0 bne _081022B2 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -7352,7 +7352,7 @@ _081022B2: cmp r1, r0 bne _081022C2 adds r0, r6, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081022C2: pop {r4-r6} pop {r0} @@ -7383,7 +7383,7 @@ _08102300: cmp r0, 0x2 bne _0810230C adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08102344 _0810230C: ldrh r0, [r4, 0x8] @@ -7465,7 +7465,7 @@ _08102390: strb r0, [r2] movs r0, 0x1E strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -7480,7 +7480,7 @@ _08102390: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 _081023CC: @@ -7525,7 +7525,7 @@ sub_81023E0: @ 81023E0 cmp r0, 0x10 bne _08102428 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08102428: pop {r4,r5} pop {r0} @@ -7582,7 +7582,7 @@ _08102482: bcc _08102448 _08102490: adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r7} pop {r0} bx r0 @@ -7610,7 +7610,7 @@ _081024C2: cmp r4, r0 bcc _081024B2 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -7663,7 +7663,7 @@ sub_8102528: @ 8102528 cmp r0, 0 beq _0810253A adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810253A: pop {r0} bx r0 @@ -7673,7 +7673,7 @@ _0810253A: sub_8102540: @ 8102540 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C @@ -7729,7 +7729,7 @@ _081025AE: cmp r0, 0 beq _081025BC adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081025BC: pop {r0} bx r0 @@ -8034,7 +8034,7 @@ _08102820: cmp r0, 0 bne _08102832 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08102832: add sp, 0x4 pop {r3} @@ -8068,7 +8068,7 @@ _08102862: strh r0, [r5, 0x2E] ldrh r0, [r6, 0x4] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -8113,7 +8113,7 @@ _08102862: b _081028FA .pool _081028D4: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -8216,7 +8216,7 @@ _081029A2: cmp r0, 0 bne _081029B0 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081029B0: pop {r0} bx r0 @@ -8333,7 +8333,7 @@ _08102A88: _08102A9A: ldr r0, =sub_8102AE0 str r0, [r6] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -8374,7 +8374,7 @@ sub_8102AE0: @ 8102AE0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08102B32 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -8396,7 +8396,7 @@ _08102B26: ldr r0, =0x00002771 bl FreeSpritePaletteByTag adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08102B32: pop {r4} pop {r0} @@ -8481,7 +8481,7 @@ _08102BC2: sub_8102BCC: @ 8102BCC push {r4,lr} adds r4, r0, 0 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] @@ -8575,7 +8575,7 @@ _08102C7A: cmp r4, 0x3 bls _08102C32 mov r0, r9 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r3,r4} mov r8, r3 mov r9, r4 @@ -8605,7 +8605,7 @@ _08102CAA: cmp r4, 0x3 bls _08102CAA adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -8657,7 +8657,7 @@ _08102D10: b _08102D4E .pool _08102D34: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -8855,7 +8855,7 @@ _08102EA6: sub_8102EB0: @ 8102EB0 push {r4-r7,lr} adds r6, r0, 0 - ldr r7, =gAnimationBankAttacker + ldr r7, =gAnimBankAttacker ldrb r0, [r7] bl GetBankSide lsls r0, 24 @@ -9002,7 +9002,7 @@ sub_8102FB8: @ 8102FB8 _08102FDC: ldr r6, =0x0000fff0 _08102FDE: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -9021,7 +9021,7 @@ _08102FDE: strh r0, [r5, 0x2E] ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4-r6} @@ -9135,7 +9135,7 @@ _081030DC: b _08103106 _08103100: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08103106: pop {r4} pop {r0} @@ -9197,11 +9197,11 @@ sub_8103164: @ 8103164 ldrsh r0, [r0, r1] cmp r0, 0 bne _08103180 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08103182 .pool _08103180: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08103182: ldrb r4, [r0] adds r0, r4, 0 @@ -9242,7 +9242,7 @@ sub_81031D0: @ 81031D0 lsls r0, 16 cmp r0, 0 bne _081031F8 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldrh r1, [r4, 0x30] @@ -9268,11 +9268,11 @@ sub_8103208: @ 8103208 ldrsh r0, [r0, r1] cmp r0, 0 bne _08103224 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08103226 .pool _08103224: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08103226: ldrb r0, [r0] adds r1, r4, 0 @@ -9325,11 +9325,11 @@ sub_8103284: @ 8103284 ldrsh r0, [r0, r1] cmp r0, 0 bne _081032A0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _081032A2 .pool _081032A0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _081032A2: ldrb r5, [r0] adds r0, r5, 0 @@ -9463,11 +9463,11 @@ sub_8103390: @ 8103390 ldrsh r0, [r0, r1] cmp r0, 0 bne _081033AC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _081033AE .pool _081033AC: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _081033AE: ldrb r4, [r0] adds r0, r4, 0 @@ -9541,7 +9541,7 @@ sub_810342C: @ 810342C cmp r0, 0x5 ble _08103444 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08103444: pop {r0} bx r0 @@ -9591,11 +9591,11 @@ sub_8103498: @ 8103498 ldrsh r0, [r0, r1] cmp r0, 0 bne _081034B4 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _081034B6 .pool _081034B4: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _081034B6: ldrb r0, [r0] adds r1, r4, 0 @@ -9664,7 +9664,7 @@ _08103524: cmp r0, 0x40 bne _08103538 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08103538: pop {r0} bx r0 @@ -9716,7 +9716,7 @@ _0810357A: sub_810358C: @ 810358C push {r4-r6,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -9730,7 +9730,7 @@ sub_810358C: @ 810358C lsrs r0, 24 strh r0, [r5, 0x22] ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -9830,7 +9830,7 @@ sub_8103680: @ 8103680 cmp r0, 0 bne _08103696 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810369A _08103696: subs r0, r2, 0x1 @@ -9847,7 +9847,7 @@ sub_81036A0: @ 81036A0 lsls r4, 24 lsrs r4, 24 ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -9872,7 +9872,7 @@ sub_81036DC: @ 81036DC lsls r0, 24 lsrs r5, r0, 24 ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r1, r0, r1 ldrb r4, [r1] @@ -9974,7 +9974,7 @@ _081037AA: adds r0, r4, 0 bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081037D0 .pool _081037CC: @@ -9992,7 +9992,7 @@ sub_81037D8: @ 81037D8 push {r4,r5,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -10018,7 +10018,7 @@ _08103810: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -10054,7 +10054,7 @@ _0810384C: _08103860: ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -10092,7 +10092,7 @@ sub_81038A0: @ 81038A0 strh r1, [r0, 0x36] ldr r1, =sub_80A6EEC str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 pop {r0} bx r0 @@ -10117,7 +10117,7 @@ sub_81038C8: @ 81038C8 b _0810390E .pool _081038EC: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -10137,7 +10137,7 @@ _0810390E: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -10201,7 +10201,7 @@ _08103980: strh r7, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 add sp, 0x4 @@ -10507,7 +10507,7 @@ sub_8103BE4: @ 8103BE4 cmp r0, 0 bne _08103C02 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08103C02: pop {r0} bx r0 @@ -10677,7 +10677,7 @@ _08103D54: b _08103DB6 _08103D5C: ldr r1, =gBanksBySide - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -10716,7 +10716,7 @@ _08103DB0: _08103DB4: strh r0, [r2, 0x4] _08103DB6: - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -10742,11 +10742,11 @@ _08103DB6: ands r0, r1 cmp r0, 0 beq _08103E20 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r1, [r4] movs r0, 0x2 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _08103E20 @@ -10759,7 +10759,7 @@ _08103DB6: .pool _08103E20: mov r5, sp - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -10897,7 +10897,7 @@ _08103F28: asrs r0, 16 cmp r0, 0x3F ble _08103FA0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -10914,7 +10914,7 @@ _08103F78: asrs r0, 16 cmp r0, 0x3F ble _08103FA0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -10927,7 +10927,7 @@ _08103F78: b _08103FB0 .pool _08103FA0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -11035,7 +11035,7 @@ _08104050: cmp r0, 0x18 bne _0810407C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810407C: pop {r4-r7} pop {r0} @@ -11050,7 +11050,7 @@ sub_8104088: @ 8104088 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -11066,7 +11066,7 @@ sub_8104088: @ 8104088 adds r0, r1 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11112,7 +11112,7 @@ _081040CC: strh r7, [r5, 0x36] ldr r0, =sub_80A7000 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 add sp, 0x4 @@ -11145,7 +11145,7 @@ sub_8104154: @ 8104154 lsls r0, 16 asrs r0, 24 strh r0, [r4, 0x24] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11184,7 +11184,7 @@ _08104178: cmp r0, 0x2 bne _081041B8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081041B8: pop {r4} pop {r0} @@ -11200,7 +11200,7 @@ sub_81041C4: @ 81041C4 bl sub_80A69CC movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -11339,7 +11339,7 @@ _081042BE: cmp r0, 0x1 bne _081042FE adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081042FE: pop {r4} pop {r0} @@ -11352,7 +11352,7 @@ sub_8104304: @ 8104304 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11375,7 +11375,7 @@ _08104322: strh r0, [r4, 0x36] ldr r0, =sub_80A62EC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r1, [r4, 0x1C] @@ -11423,7 +11423,7 @@ _08104390: strh r0, [r5, 0x22] movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -11462,7 +11462,7 @@ sub_81043F8: @ 81043F8 cmp r0, 0 beq _0810440E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810440E: pop {r0} bx r0 @@ -11510,7 +11510,7 @@ _08104448: movs r0, 0x6 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -11664,7 +11664,7 @@ sub_8104594: @ 8104594 cmp r0, 0 beq _081045A8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081045A8: pop {r4} pop {r0} @@ -11752,7 +11752,7 @@ sub_8104614: @ 8104614 movs r1, 0x1 bl sub_80A750C adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08104664: pop {r4,r5} pop {r0} @@ -11786,7 +11786,7 @@ sub_8104674: @ 8104674 strh r0, [r4, 0x10] strh r5, [r4, 0x12] strh r5, [r4, 0x14] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -11946,7 +11946,7 @@ _081047D8: movs r1, 0 strh r1, [r0, 0x26] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081047F6: pop {r4,r5} pop {r0} @@ -12124,7 +12124,7 @@ sub_8104938: @ 8104938 cmp r0, 0 bne _08104964 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0810498A .pool _08104964: @@ -12276,7 +12276,7 @@ _08104A64: adds r0, r2 strh r5, [r0, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08104AA8 .pool _08104A9C: @@ -12333,7 +12333,7 @@ sub_8104AF0: @ 8104AF0 cmp r0, 0 bne _08104B10 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08104B10: pop {r4} pop {r0} @@ -12345,7 +12345,7 @@ _08104B10: sub_8104B1C: @ 8104B1C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -12378,7 +12378,7 @@ _08104B50: ldr r0, =0x0000ffc0 _08104B6A: strh r0, [r4, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -12391,7 +12391,7 @@ _08104B6A: strh r1, [r4, 0x32] strh r1, [r4, 0x34] strh r1, [r4, 0x36] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A656C @@ -12411,11 +12411,11 @@ sub_8104BAC: @ 8104BAC ldrsh r0, [r0, r1] cmp r0, 0 bne _08104BC8 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08104BCA .pool _08104BC8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08104BCA: ldrb r5, [r0] adds r0, r5, 0 @@ -12509,7 +12509,7 @@ sub_8104C78: @ 8104C78 cmp r0, 0 bne _08104C98 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08104C98: pop {r4} pop {r0} @@ -12559,7 +12559,7 @@ sub_8104CA4: @ 8104CA4 strh r2, [r4, 0x18] movs r0, 0x2 strh r0, [r4, 0x1A] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12741,7 +12741,7 @@ _08104E48: strh r1, [r0, 0x22] _08104E66: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08104E6C: pop {r4,r5} pop {r0} @@ -12759,7 +12759,7 @@ sub_8104E74: @ 8104E74 lsls r1, 3 ldr r0, =gTasks adds r5, r1, r0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] bl sub_80A6190 lsls r0, 24 @@ -12947,7 +12947,7 @@ _08104FF0: movs r0, 0x3 strb r0, [r1, 0x15] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810500E: pop {r4} pop {r0} @@ -12959,7 +12959,7 @@ _0810500E: sub_810501C: @ 810501C push {r4-r6,lr} adds r4, r0, 0 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -13169,7 +13169,7 @@ _0810519A: ands r0, r1 strb r0, [r2] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081051BC: pop {r4} pop {r0} @@ -13194,11 +13194,11 @@ sub_81051C4: @ 81051C4 adds r1, r0, 0 cmp r2, 0 bne _081051F0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _081051F2 .pool _081051F0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _081051F2: ldrb r5, [r0] ldrb r1, [r1, 0x6] @@ -13212,7 +13212,7 @@ _081051F2: movs r1, 0x2 adds r0, r5, 0 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810526A @@ -13278,7 +13278,7 @@ sub_8105284: @ 8105284 adds r0, r4, 0 bl FreeSpriteOamMatrix adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810529E: pop {r4} pop {r0} @@ -13305,15 +13305,15 @@ sub_81052A4: @ 81052A4 ldrsh r0, [r0, r2] cmp r0, 0 bne _081052DC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r7, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget b _081052E2 .pool _081052DC: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r7, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker _081052E2: ldrb r0, [r0] mov r8, r0 @@ -13354,7 +13354,7 @@ _08105310: mov r4, r8 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810535C @@ -13389,7 +13389,7 @@ _0810536C: adds r4, r7, 0 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _081053E4 @@ -13457,7 +13457,7 @@ _081053FA: movs r1, 0x2 mov r0, r8 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810544C @@ -13581,7 +13581,7 @@ sub_8105538: @ 8105538 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -13622,7 +13622,7 @@ sub_810557C: @ 810557C strh r0, [r4, 0x24] subs r2, 0x20 strh r2, [r4, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -13836,7 +13836,7 @@ sub_810571C: @ 810571C b _08105752 .pool _08105750: - ldr r0, =move_anim_8072740 + ldr r0, =DestroyAnimSprite _08105752: str r0, [r3, 0x1C] _08105754: @@ -13856,7 +13856,7 @@ sub_810575C: @ 810575C movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -13925,7 +13925,7 @@ sub_81057B8: @ 81057B8 orrs r1, r2 strb r1, [r0] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08105802: pop {r4,r5} pop {r0} @@ -13950,7 +13950,7 @@ sub_8105810: @ 8105810 strh r0, [r4, 0xE] movs r0, 0x3 strh r0, [r4, 0x20] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -14124,7 +14124,7 @@ _08105962: cmp r0, 0 bne _08105992 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08105992: pop {r4,r5} pop {r0} @@ -14263,7 +14263,7 @@ _08105A88: ands r1, r2 strb r1, [r0] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08105AA6: pop {r4-r6} pop {r0} @@ -14292,7 +14292,7 @@ sub_8105AAC: @ 8105AAC strh r0, [r4, 0x16] strh r0, [r4, 0x18] strh r0, [r4, 0x22] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -14469,7 +14469,7 @@ _08105C34: cmp r0, 0 bne _08105C42 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08105C42: pop {r4-r6} pop {r0} @@ -14603,7 +14603,7 @@ _08105D00: movs r1, 0 str r1, [r0] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0x4 pop {r4-r6} pop {r0} @@ -14626,7 +14626,7 @@ _08105D6A: cmp r4, 0 bge _08105D6A adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -14684,7 +14684,7 @@ sub_8105DE8: @ 8105DE8 adds r5, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -14716,7 +14716,7 @@ _08105E08: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldrb r1, [r4, 0xA] @@ -14765,7 +14765,7 @@ _08105E7A: cmp r0, 0x3C bne _08105EAA adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08105EAA: pop {r4} pop {r0} @@ -14923,7 +14923,7 @@ _08105FD8: movs r1, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810600C: add sp, 0xC pop {r4,r5} @@ -14989,7 +14989,7 @@ _0810607C: strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081060A4: pop {r4-r6} pop {r0} @@ -15054,7 +15054,7 @@ _0810610C: strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08106134: pop {r4-r6} pop {r0} @@ -15072,7 +15072,7 @@ sub_8106140: @ 8106140 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -15120,7 +15120,7 @@ sub_810618C: @ 810618C b _081061BC _081061B6: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081061BC: pop {r4} pop {r0} @@ -15190,7 +15190,7 @@ _08106236: cmp r0, 0x78 ble _08106244 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106244: pop {r4} pop {r0} @@ -15268,7 +15268,7 @@ sub_810627C: @ 810627C cmp r5, 0x40 bgt _081062E2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081062E2: pop {r4,r5} pop {r0} @@ -15291,11 +15291,11 @@ sub_81062E8: @ 81062E8 movs r0, 0x1 movs r1, 0x4 movs r2, 0x3 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -15303,7 +15303,7 @@ sub_81062E8: @ 81062E8 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810632A: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -15489,7 +15489,7 @@ _081064BC: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _081064D0: movs r0, 0x50 movs r1, 0 @@ -15500,9 +15500,9 @@ _081064D0: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081064F0: add sp, 0x10 pop {r4,r5} @@ -15526,11 +15526,11 @@ sub_81064F8: @ 81064F8 movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -15538,7 +15538,7 @@ sub_81064F8: @ 81064F8 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810653A: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -15561,7 +15561,7 @@ _0810653A: b _0810658A .pool _08106578: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -15747,7 +15747,7 @@ _081066FC: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _08106710: movs r0, 0x50 movs r1, 0 @@ -15758,9 +15758,9 @@ _08106710: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08106730: add sp, 0x10 pop {r4,r5} @@ -15773,7 +15773,7 @@ _08106730: sub_810673C: @ 810673C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -15912,7 +15912,7 @@ _08106858: cmp r1, r0 bne _08106868 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106868: pop {r4} pop {r0} @@ -15924,7 +15924,7 @@ _08106868: sub_8106878: @ 8106878 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -15991,7 +15991,7 @@ sub_81068CC: @ 81068CC bge _08106910 _0810690A: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106910: pop {r0} bx r0 @@ -16019,7 +16019,7 @@ sub_8106914: @ 8106914 cmp r0, r1 blt _08106940 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106940: pop {r0} bx r0 @@ -16029,7 +16029,7 @@ _08106940: sub_8106944: @ 8106944 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -16074,7 +16074,7 @@ sub_810699C: @ 810699C cmp r0, 0 beq _081069B2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081069B2: pop {r0} bx r0 @@ -16164,7 +16164,7 @@ _08106A50: cmp r2, 0x64 ble _08106A5A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106A5A: pop {r4,r5} pop {r0} @@ -16222,7 +16222,7 @@ _08106ABA: cmp r0, 0x1E ble _08106AC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106AC8: pop {r4} pop {r0} @@ -16314,7 +16314,7 @@ sub_8106B54: @ 8106B54 adds r0, r4, 0 movs r1, 0 bl StartSpriteAnim - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -16439,7 +16439,7 @@ _08106C6A: cmp r0, 0x5A ble _08106C78 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106C78: pop {r4} pop {r0} @@ -16480,7 +16480,7 @@ _08106CB4: cmp r0, 0 beq _08106CC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106CC8: pop {r4} pop {r0} @@ -16497,7 +16497,7 @@ sub_8106CD0: @ 8106CD0 cmp r0, 0 bne _08106CEC adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _08106D50 .pool _08106CEC: @@ -16505,11 +16505,11 @@ _08106CEC: ldrsh r0, [r1, r2] cmp r0, 0 bne _08106CFC - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _08106CFE .pool _08106CFC: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _08106CFE: ldrb r0, [r4] movs r1, 0x2 @@ -16579,7 +16579,7 @@ sub_8106D5C: @ 8106D5C b _08106D8C _08106D86: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106D8C: pop {r0} bx r0 @@ -16628,7 +16628,7 @@ sub_8106DD4: @ 8106DD4 cmp r0, 0 bne _08106DF4 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08106DF4: pop {r4} pop {r0} @@ -16645,11 +16645,11 @@ sub_8106E00: @ 8106E00 ldrsh r0, [r0, r1] cmp r0, 0 bne _08106E1C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08106E1E .pool _08106E1C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08106E1E: ldrb r6, [r0] adds r0, r6, 0 @@ -16754,7 +16754,7 @@ sub_8106EC8: @ 8106EC8 cmp r0, 0x10 ble _08106EFC adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106EFC: pop {r0} bx r0 @@ -16803,7 +16803,7 @@ _08106F40: cmp r1, r0 bne _08106F54 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08106F54: pop {r4} pop {r0} @@ -16968,14 +16968,14 @@ _08107066: orrs r0, r1 strb r0, [r3] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08107098: movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0x4 bne _081070A6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081070A6: pop {r4} pop {r0} @@ -16992,11 +16992,11 @@ sub_81070AC: @ 81070AC ands r0, r1 cmp r0, 0 beq _081070F8 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r1, [r4] movs r0, 0x2 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _081070F8 @@ -17016,7 +17016,7 @@ sub_81070AC: @ 81070AC b _08107118 .pool _081070F8: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -17040,7 +17040,7 @@ _08107118: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -17055,13 +17055,13 @@ sub_8107144: @ 8107144 lsls r0, 24 lsrs r0, 24 ldr r3, =gBattleAnimArgs - ldr r1, =gDisableStructMoveAnim + ldr r1, =gAnimDisableStructPtr ldr r1, [r1] ldrb r2, [r1, 0x10] movs r1, 0x1 ands r1, r2 strh r1, [r3, 0xE] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -17073,11 +17073,11 @@ update_fury_cutter_counter_copy: @ 8107168 lsls r0, 24 lsrs r0, 24 ldr r2, =gBattleAnimArgs - ldr r1, =gDisableStructMoveAnim + ldr r1, =gAnimDisableStructPtr ldr r1, [r1] ldrb r1, [r1, 0x10] strh r1, [r2, 0xE] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -17144,7 +17144,7 @@ _081071F8: cmp r1, r0 bne _0810720A adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810720A: pop {r4-r6} pop {r0} @@ -17196,7 +17196,7 @@ _0810725A: sub_8107260: @ 8107260 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -17237,7 +17237,7 @@ _081072A2: movs r1, 0x40 orrs r0, r1 strb r0, [r2] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -17253,7 +17253,7 @@ _081072D8: strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -17422,7 +17422,7 @@ sub_810744C: @ 810744C adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -17445,7 +17445,7 @@ _08107482: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -17507,7 +17507,7 @@ _08107506: cmp r0, 0 beq _08107518 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08107518: pop {r4} pop {r0} @@ -17603,7 +17603,7 @@ _081075BE: cmp r1, r0 bne _081075DE adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081075DE: pop {r4-r7} pop {r0} @@ -17621,7 +17621,7 @@ sub_81075EC: @ 81075EC strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -17683,7 +17683,7 @@ sub_8107674: @ 8107674 cmp r0, 0 beq _08107688 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08107688: ldrh r0, [r4, 0x3A] lsls r0, 16 @@ -17762,7 +17762,7 @@ sub_81076F4: @ 81076F4 cmp r1, 0 bne _08107722 adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08107722: pop {r0} bx r0 @@ -17773,7 +17773,7 @@ _08107722: sub_8107730: @ 8107730 push {r4-r7,lr} adds r4, r0, 0 - ldr r7, =gAnimationBankAttacker + ldr r7, =gAnimBankAttacker ldrb r0, [r7] movs r1, 0 bl sub_80A5C6C @@ -17836,7 +17836,7 @@ sub_81077A4: @ 81077A4 cmp r0, 0 beq _081077BA adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081077BA: pop {r0} bx r0 @@ -17846,11 +17846,11 @@ _081077BA: sub_81077C0: @ 81077C0 push {r4-r7,lr} adds r6, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -17898,7 +17898,7 @@ _0810781E: _08107828: adds r0, r6, 0 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -17910,7 +17910,7 @@ _08107828: _08107842: ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -17929,7 +17929,7 @@ _08107842: strh r0, [r6, 0x36] ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 pop {r4-r7} @@ -17956,7 +17956,7 @@ sub_8107894: @ 8107894 strh r1, [r4, 0x36] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -18026,7 +18026,7 @@ sub_810790C: @ 810790C cmp r0, r1 bne _0810794C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810794C: pop {r4} pop {r0} @@ -18054,11 +18054,11 @@ sub_8107954: @ 8107954 movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute mov r0, sp bl sub_80A6B30 bl IsContest @@ -18068,8 +18068,8 @@ sub_8107954: @ 8107954 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations - ldr r0, =gAnimationBankAttacker + bl SetAnimBgAttribute + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -18174,7 +18174,7 @@ _08107A32: b _08107B0E .pool _08107AB4: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -18454,7 +18454,7 @@ _08107D08: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _08107D1C: movs r0, 0 strh r0, [r7] @@ -18475,7 +18475,7 @@ _08107D1C: ldr r1, =0x0000ffff strh r1, [r0, 0x26] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08107D4A: pop {r3} mov r8, r3 @@ -18945,7 +18945,7 @@ _081080C0: cmp r0, 0x15 bne _081080DE adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081080DE: pop {r4} pop {r0} @@ -19267,7 +19267,7 @@ _0810836C: cmp r0, 0 bne _0810837A adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810837A: add sp, 0xC pop {r4-r6} @@ -19278,7 +19278,7 @@ _0810837A: thumb_func_start sub_8108384 sub_8108384: @ 8108384 push {r4,r5,lr} - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -19350,7 +19350,7 @@ sub_8108408: @ 8108408 lsls r1, 24 lsrs r1, 24 str r1, [sp] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -19576,7 +19576,7 @@ sub_81085C8: @ 81085C8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -19721,7 +19721,7 @@ _08108704: cmp r0, 0 bne _08108712 adds r0, r1, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08108712: pop {r3} mov r8, r3 @@ -19956,7 +19956,7 @@ sub_81088E4: @ 81088E4 lsls r1, 3 ldr r0, =gTasks adds r5, r1, r0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -20171,7 +20171,7 @@ _08108AAA: b _08108AB8 _08108AB2: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08108AB8: pop {r4} pop {r0} @@ -20371,7 +20371,7 @@ sub_8108C08: @ 8108C08 cmp r0, 0 bne _08108C4C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08108C4C: pop {r4} pop {r0} @@ -20418,7 +20418,7 @@ sub_8108C94: @ 8108C94 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -20495,7 +20495,7 @@ _08108D34: cmp r1, r0 bne _08108D46 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08108D46: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -20593,7 +20593,7 @@ _08108DE2: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -20648,7 +20648,7 @@ _08108E58: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -20698,7 +20698,7 @@ sub_8108EC8: @ 8108EC8 movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r1, =sub_80A634C @@ -20732,7 +20732,7 @@ sub_8108F08: @ 8108F08 strh r0, [r4, 0x32] ldr r0, =sub_80A656C str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -20746,7 +20746,7 @@ sub_8108F4C: @ 8108F4C push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -20798,7 +20798,7 @@ _08108F9E: sub_8108FBC: @ 8108FBC push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -20886,7 +20886,7 @@ sub_8109064: @ 8109064 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -21026,7 +21026,7 @@ sub_810916C: @ 810916C strh r1, [r0, 0x36] ldr r1, =sub_80A6EEC str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 pop {r0} bx r0 @@ -21037,11 +21037,11 @@ sub_810916C: @ 810916C sub_8109198: @ 8109198 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -21128,7 +21128,7 @@ sub_8109244: @ 8109244 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -21164,7 +21164,7 @@ sub_810929C: @ 810929C beq _081092E4 movs r4, 0 strh r4, [r6, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -21224,7 +21224,7 @@ sub_8109314: @ 8109314 cmp r0, 0x1F bne _08109330 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08109330: pop {r4} pop {r0} @@ -21274,7 +21274,7 @@ sub_8109364: @ 8109364 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A653C @@ -21371,7 +21371,7 @@ sub_810940C: @ 810940C cmp r0, r1 bne _08109458 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08109458: pop {r4} pop {r0} @@ -21407,7 +21407,7 @@ sub_8109460: @ 8109460 adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x10] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -21785,7 +21785,7 @@ _0810979C: cmp r0, 0 bne _081097AA adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081097AA: add sp, 0xC pop {r4,r5} @@ -21820,7 +21820,7 @@ sub_81097B4: @ 81097B4 lsls r0, 2 adds r0, r1 ldrh r4, [r0, 0x20] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -21992,7 +21992,7 @@ sub_8109930: @ 8109930 adds r0, r2 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -22214,7 +22214,7 @@ _08109AE0: cmp r0, 0x10 ble _08109AF4 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08109AF4: pop {r4} pop {r0} @@ -22248,7 +22248,7 @@ _08109B18: bl StartSpriteAnim ldrh r0, [r4, 0x4] strh r0, [r5, 0x3C] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -22261,7 +22261,7 @@ _08109B48: ldr r0, =0x0000fffc _08109B4A: strh r0, [r5, 0x36] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -22279,7 +22279,7 @@ _08109B70: ldrh r0, [r5, 0x30] adds r0, 0xC0 strh r0, [r5, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -22356,7 +22356,7 @@ _08109BCE: lsls r0, 1 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -22426,7 +22426,7 @@ _08109C82: .pool _08109CA4: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08109CAA: pop {r4} pop {r0} @@ -22485,7 +22485,7 @@ _08109CC8: lsrs r0, 16 cmp r0, 0x83 bls _08109D3C - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -22500,7 +22500,7 @@ _08109CC8: b _08109D80 .pool _08109D3C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -22561,7 +22561,7 @@ _08109DA8: cmp r0, 0x1E bne _08109DB6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08109DB6: pop {r4} pop {r0} @@ -22578,7 +22578,7 @@ sub_8109DBC: @ 8109DBC lsls r1, 3 ldr r0, =gTasks adds r4, r1, r0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -22590,11 +22590,11 @@ sub_8109DBC: @ 8109DBC movs r1, 0x1 _08109DE2: strh r1, [r4, 0x20] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r1, [r0] movs r0, 0x2 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 lsrs r0, 24 adds r0, 0x1 @@ -22906,7 +22906,7 @@ _0810A024: blt _0810A024 _0810A04E: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810A054: pop {r4-r7} pop {r0} @@ -22932,7 +22932,7 @@ sub_810A060: @ 810A060 movs r1, 0x10 bl BlendPalette adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0x10 pop {r4} pop {r0} @@ -22974,7 +22974,7 @@ _0810A0CA: adds r0, 0x1 strh r0, [r2, 0x8] ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -23059,7 +23059,7 @@ _0810A16E: strh r1, [r0, 0x24] strh r1, [r0, 0x26] adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810A194: pop {r3-r5} mov r8, r3 @@ -23075,7 +23075,7 @@ _0810A194: sub_810A1A8: @ 810A1A8 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -23119,7 +23119,7 @@ sub_810A1F8: @ 810A1F8 cmp r0, 0 beq _0810A20E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810A20E: pop {r0} bx r0 @@ -23129,7 +23129,7 @@ _0810A20E: sub_810A214: @ 810A214 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -23178,7 +23178,7 @@ _0810A26E: sub_810A274: @ 810A274 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -23191,7 +23191,7 @@ sub_810A274: @ 810A274 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -23261,15 +23261,15 @@ _0810A324: beq _0810A35C b _0810A380 _0810A32E: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810A382 .pool _0810A338: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r6, 0x2 eors r0, r6 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _0810A354 @@ -23282,21 +23282,21 @@ _0810A354: eors r4, r0 b _0810A384 _0810A35C: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r4, 0x2 eors r0, r4 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810A380 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] eors r4, r0 b _0810A384 .pool _0810A380: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810A382: ldrb r4, [r0] _0810A384: @@ -23417,7 +23417,7 @@ sub_810A46C: @ 810A46C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -23517,7 +23517,7 @@ sub_810A4F4: @ 810A4F4 b _0810A564 _0810A55E: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810A564: pop {r4} pop {r0} @@ -23562,7 +23562,7 @@ _0810A5A4: cmp r0, 0 bgt _0810A5B6 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810A5B6: pop {r0} bx r0 @@ -23576,7 +23576,7 @@ sub_810A5BC: @ 810A5BC lsls r0, 24 cmp r0, 0 bne _0810A5D8 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -23588,7 +23588,7 @@ _0810A5D8: negs r0, r0 strh r0, [r1, 0x2] _0810A5E0: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -23633,11 +23633,11 @@ sub_810A628: @ 810A628 ands r0, r1 cmp r0, 0 beq _0810A64C - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget b _0810A64E .pool _0810A64C: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker _0810A64E: ldrb r6, [r0] bl IsContest @@ -23756,7 +23756,7 @@ _0810A742: cmp r0, 0 bgt _0810A754 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810A754: pop {r4} pop {r0} @@ -23812,7 +23812,7 @@ _0810A7B6: strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -23827,7 +23827,7 @@ sub_810A7DC: @ 810A7DC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -24012,7 +24012,7 @@ _0810A952: .pool _0810A970: mov r0, r9 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0810A9BC _0810A978: cmp r7, 0 @@ -24199,7 +24199,7 @@ _0810AAE4: cmp r0, 0x33 bne _0810AAF8 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810AAF8: pop {r0} bx r0 @@ -24220,11 +24220,11 @@ sub_810AAFC: @ 810AAFC ldrsh r0, [r0, r1] cmp r0, 0 bne _0810AB28 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810AB2A .pool _0810AB28: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810AB2A: ldrb r0, [r4] movs r1, 0x2 @@ -24383,7 +24383,7 @@ _0810AC78: cmp r0, 0 bne _0810AC86 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810AC86: pop {r4-r7} pop {r0} @@ -24440,11 +24440,11 @@ sub_810ACD8: @ 810ACD8 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810ACF4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810ACF6 .pool _0810ACF4: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810ACF6: ldrb r0, [r4] movs r1, 0x2 @@ -24478,11 +24478,11 @@ sub_810AD30: @ 810AD30 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810AD4C - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810AD4E .pool _0810AD4C: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810AD4E: ldrb r0, [r4] movs r1, 0x2 @@ -24501,7 +24501,7 @@ _0810AD4E: strh r0, [r5, 0x24] ldrh r0, [r1, 0x4] strh r0, [r5, 0x26] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A67D8 @@ -24518,7 +24518,7 @@ sub_810AD98: @ 810AD98 adds r5, r0, 0 movs r1, 0x1 bl StartSpriteAffineAnim - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -24646,7 +24646,7 @@ _0810AE90: lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x26] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -24783,7 +24783,7 @@ _0810AFA0: ands r1, r2 strb r1, [r0] adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810AFC0: pop {r4-r6} pop {r0} @@ -24820,7 +24820,7 @@ _0810AFF4: _0810AFFA: b _0810B14E _0810AFFC: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -24878,7 +24878,7 @@ _0810B070: movs r0, 0x78 subs r0, r1 strh r0, [r5, 0xE] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x3 bl sub_80A5C6C @@ -24981,7 +24981,7 @@ _0810B140: cmp r0, 0 bne _0810B14E adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810B14E: pop {r4-r6} pop {r0} @@ -25124,7 +25124,7 @@ sub_810B23C: @ 810B23C beq _0810B280 b _0810B294 _0810B24E: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -25191,7 +25191,7 @@ _0810B2C8: .4byte _0810B404 .4byte _0810B414 _0810B2DC: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -25206,7 +25206,7 @@ _0810B2DC: strh r0, [r5, 0x16] movs r0, 0x4 strh r0, [r5, 0x18] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C @@ -25338,7 +25338,7 @@ _0810B404: cmp r0, 0 bne _0810B428 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0810B428 _0810B414: ldrh r1, [r5, 0x1E] @@ -25539,7 +25539,7 @@ _0810B584: beq _0810B600 b _0810B60E _0810B58A: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -25561,7 +25561,7 @@ _0810B5A4: bgt _0810B5A4 strh r1, [r5, 0x24] _0810B5B4: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -25603,7 +25603,7 @@ _0810B600: cmp r0, 0 bne _0810B60E adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810B60E: pop {r4,r5} pop {r0} @@ -25721,7 +25721,7 @@ sub_810B6C4: @ 810B6C4 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -25734,7 +25734,7 @@ sub_810B6C4: @ 810B6C4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -25934,7 +25934,7 @@ sub_810B848: @ 810B848 b _0810B8A6 _0810B8A0: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810B8A6: pop {r4} pop {r0} @@ -25957,7 +25957,7 @@ sub_810B8AC: @ 810B8AC movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r1, =sub_80A634C @@ -25976,14 +25976,14 @@ sub_810B8EC: @ 810B8EC adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26003,7 +26003,7 @@ _0810B92C: adds r0, r1 strh r0, [r4, 0x32] _0810B936: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -26015,7 +26015,7 @@ _0810B936: strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A6EEC @@ -26041,7 +26041,7 @@ sub_810B974: @ 810B974 b _0810B9C6 .pool _0810B990: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -26049,7 +26049,7 @@ _0810B990: adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26130,7 +26130,7 @@ sub_810BA24: @ 810BA24 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810BA74 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -26148,7 +26148,7 @@ sub_810BA24: @ 810BA24 b _0810BA86 .pool _0810BA74: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -26157,7 +26157,7 @@ _0810BA74: movs r1, 0x1 bl sub_80A8924 _0810BA86: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26277,7 +26277,7 @@ sub_810BB60: @ 810BB60 strh r5, [r4, 0x24] movs r0, 0x80 strh r0, [r4, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26312,7 +26312,7 @@ _0810BB90: sub_810BBC8: @ 810BBC8 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26406,7 +26406,7 @@ sub_810BC4C: @ 810BC4C bge _0810BC8E _0810BC88: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810BC8E: pop {r4} pop {r0} @@ -26431,7 +26431,7 @@ sub_810BC94: @ 810BC94 ldrsh r0, [r1, r2] cmp r0, 0 bne _0810BCE0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -26447,7 +26447,7 @@ sub_810BC94: @ 810BC94 b _0810BCF2 .pool _0810BCE0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -26456,7 +26456,7 @@ _0810BCE0: movs r1, 0x1 bl sub_80A8924 _0810BCF2: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26619,7 +26619,7 @@ _0810BDEC: bge _0810BE42 _0810BE3C: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810BE42: pop {r4} pop {r0} @@ -26645,7 +26645,7 @@ sub_810BE48: @ 810BE48 b _0810BEA2 .pool _0810BE6C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -26653,7 +26653,7 @@ _0810BE6C: adds r3, 0x22 movs r1, 0 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26686,7 +26686,7 @@ _0810BEB4: cmp r0, 0 beq _0810BEC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810BEC8: pop {r4,r5} pop {r0} @@ -26712,7 +26712,7 @@ sub_810BED0: @ 810BED0 b _0810BF32 .pool _0810BEF4: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -26742,7 +26742,7 @@ _0810BF26: adds r0, r1 strh r0, [r5, 0x22] _0810BF32: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810BF90 .pool _0810BF40: @@ -26755,7 +26755,7 @@ _0810BF40: bl sub_80A6980 b _0810BF8E _0810BF52: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -26785,7 +26785,7 @@ _0810BF82: adds r0, r1 strh r0, [r5, 0x22] _0810BF8E: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810BF90: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -26806,7 +26806,7 @@ _0810BFB4: movs r0, 0x40 _0810BFB6: strh r0, [r5, 0x3A] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -26911,7 +26911,7 @@ _0810C086: b _0810C098 _0810C092: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810C098: pop {r4} pop {r0} @@ -26934,11 +26934,11 @@ sub_810C0A0: @ 810C0A0 movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -26946,7 +26946,7 @@ sub_810C0A0: @ 810C0A0 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810C0E2: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -27148,7 +27148,7 @@ _0810C29C: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810C2B0: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -27164,9 +27164,9 @@ _0810C2B0: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810C2DA: add sp, 0x10 pop {r4,r5} @@ -27179,7 +27179,7 @@ _0810C2DA: sub_810C2F0: @ 810C2F0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -27216,11 +27216,11 @@ sub_810C324: @ 810C324 movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -27228,7 +27228,7 @@ sub_810C324: @ 810C324 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810C366: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -27420,7 +27420,7 @@ _0810C50C: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0810C520: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -27436,9 +27436,9 @@ _0810C520: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810C54A: add sp, 0x10 pop {r4,r5} @@ -27456,13 +27456,13 @@ sub_810C560: @ 810C560 ldr r6, =gBattleAnimArgs ldrh r0, [r6] strh r0, [r5, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C adds r4, r0, 0 - ldr r7, =gAnimationBankTarget + ldr r7, =gAnimBankTarget ldrb r0, [r7] movs r1, 0x2 bl sub_80A5C6C @@ -27523,7 +27523,7 @@ _0810C5F0: movs r0, 0x1 strh r0, [r5, 0x3A] _0810C5F4: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -27545,7 +27545,7 @@ _0810C5F4: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -27567,7 +27567,7 @@ _0810C65C: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -27676,7 +27676,7 @@ _0810C728: _0810C736: movs r5, 0x50 strh r5, [r4, 0x2E] - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -27844,7 +27844,7 @@ _0810C85A: cmp r0, 0 bne _0810C8B4 ldr r1, =gBanksBySide - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -28011,7 +28011,7 @@ _0810C9CE: cmp r0, 0 bne _0810C9DC adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810C9DC: pop {r4,r5} pop {r0} @@ -28054,7 +28054,7 @@ sub_810C9E4: @ 810C9E4 lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810CAD0 @@ -28349,7 +28349,7 @@ _0810CC7C: unc_080B06FC: @ 810CC88 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, =gDisableStructMoveAnim + ldr r0, =gAnimDisableStructPtr ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -28371,7 +28371,7 @@ _0810CCA6: ldr r6, =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -28381,7 +28381,7 @@ _0810CCA6: negs r0, r0 strh r0, [r6, 0x4] _0810CCCE: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -28423,7 +28423,7 @@ sub_810CD1C: @ 810CD1C bl StartSpriteAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 _0810CD3E: @@ -28515,7 +28515,7 @@ _0810CDD8: cmp r0, 0x15 bne _0810CDF6 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810CDF6: pop {r4} pop {r0} @@ -28531,7 +28531,7 @@ sub_810CDFC: @ 810CDFC ldrb r3, [r1] lsls r3, 1 adds r3, r1 - ldr r1, =gDisableStructMoveAnim + ldr r1, =gAnimDisableStructPtr ldr r1, [r1] ldrb r1, [r1, 0x11] lsrs r2, r1, 4 @@ -28540,7 +28540,7 @@ sub_810CDFC: @ 810CDFC subs r2, r1 subs r2, 0x1 strh r2, [r3] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -28563,7 +28563,7 @@ unc_080B08A0: @ 810CE2C strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -28581,7 +28581,7 @@ sub_810CE68: @ 810CE68 ldrsh r0, [r4, r1] cmp r0, 0x1 bne _0810CE90 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -28658,7 +28658,7 @@ _0810CF0C: strh r0, [r5, 0x2E] ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -28680,11 +28680,11 @@ sub_810CF30: @ 810CF30 mov r9, r0 cmp r1, 0 bne _0810CF54 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810CF56 .pool _0810CF54: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810CF56: ldrb r0, [r0] mov r8, r0 @@ -28875,7 +28875,7 @@ sub_810D0B8: @ 810D0B8 bl DestroySprite _0810D0F4: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810D104 .pool _0810D100: @@ -28960,7 +28960,7 @@ sub_810D164: @ 810D164 strh r6, [r5, 0x24] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 _0810D1A4: @@ -28974,10 +28974,10 @@ _0810D1A4: sub_810D1B4: @ 810D1B4 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget eors r0, r1 ldrb r1, [r2] cmp r0, r1 @@ -28997,7 +28997,7 @@ _0810D1E0: adds r0, r6, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -29059,7 +29059,7 @@ sub_810D240: @ 810D240 b _0810D272 _0810D26C: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D272: pop {r4} pop {r0} @@ -29105,7 +29105,7 @@ sub_810D2B0: @ 810D2B0 strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -29146,7 +29146,7 @@ sub_810D308: @ 810D308 bne _0810D34C movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -29178,7 +29178,7 @@ sub_810D360: @ 810D360 strh r1, [r0, 0x2E] ldr r1, =sub_80A64B0 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 pop {r0} bx r0 @@ -29251,7 +29251,7 @@ _0810D3F6: cmp r0, 0x78 ble _0810D404 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D404: pop {r4} pop {r0} @@ -29267,11 +29267,11 @@ sub_810D40C: @ 810D40C ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D428 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810D42A .pool _0810D428: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810D42A: ldrb r0, [r4] movs r1, 0 @@ -29332,7 +29332,7 @@ _0810D48E: cmp r0, 0 bne _0810D4AA adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810D4EC _0810D4AA: ldrh r0, [r1, 0x2E] @@ -29370,7 +29370,7 @@ _0810D4DA: cmp r0, 0 bne _0810D4EC adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D4EC: pop {r0} bx r0 @@ -29386,7 +29386,7 @@ sub_810D4F4: @ 810D4F4 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810D520 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -29397,7 +29397,7 @@ sub_810D4F4: @ 810D4F4 b _0810D532 .pool _0810D520: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -29473,7 +29473,7 @@ _0810D5C0: b _0810D5CE _0810D5C6: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810D5D2 _0810D5CE: ldr r0, =sub_810D5DC @@ -29505,7 +29505,7 @@ sub_810D5DC: @ 810D5DC cmp r0, 0x28 ble _0810D604 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D604: pop {r0} bx r0 @@ -29533,7 +29533,7 @@ sub_810D608: @ 810D608 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -29545,11 +29545,11 @@ sub_810D608: @ 810D608 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget b _0810D680 .pool _0810D664: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -29561,7 +29561,7 @@ _0810D664: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker _0810D680: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -29704,7 +29704,7 @@ sub_810D770: @ 810D770 cmp r4, r0 bge _0810D7BA adds r0, r7, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0810D818 _0810D7BA: ldrh r0, [r7, 0x2E] @@ -29712,7 +29712,7 @@ _0810D7BA: strh r0, [r7, 0x2E] b _0810D818 _0810D7C2: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -29725,7 +29725,7 @@ _0810D7C2: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0x2 @@ -29793,7 +29793,7 @@ sub_810D830: @ 810D830 ble _0810D870 _0810D86A: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D870: pop {r0} bx r0 @@ -29821,15 +29821,15 @@ sub_810D874: @ 810D874 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r4, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810D8BE .pool _0810D8B8: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r4, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810D8BE: ldrb r0, [r0] bl sub_80A8328 @@ -29893,7 +29893,7 @@ _0810D918: strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A6F98 @@ -29915,7 +29915,7 @@ sub_810D960: @ 810D960 cmp r1, r0 bne _0810D976 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810D976: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -29929,7 +29929,7 @@ _0810D976: sub_810D984: @ 810D984 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -30018,7 +30018,7 @@ _0810DA34: bl StartSpriteAnim b _0810DA5E _0810DA48: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30030,7 +30030,7 @@ _0810DA48: _0810DA5E: ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -30067,7 +30067,7 @@ sub_810DA7C: @ 810DA7C cmp r0, 0x28 ble _0810DAB6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DAB6: pop {r4} pop {r0} @@ -30128,7 +30128,7 @@ _0810DB1A: ldrh r1, [r4, 0x1C] adds r0, r1 strh r0, [r4, 0x1C] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30179,7 +30179,7 @@ _0810DB60: movs r0, 0x1 bl sub_80A6DAC adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810DB98: pop {r4-r7} pop {r0} @@ -30205,7 +30205,7 @@ _0810DBC2: bl sub_80A69CC ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -30239,7 +30239,7 @@ sub_810DC10: @ 810DC10 cmp r0, 0 beq _0810DC24 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DC24: pop {r4} pop {r0} @@ -30263,7 +30263,7 @@ _0810DC44: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] mov r6, sp adds r6, 0x2 @@ -30271,7 +30271,7 @@ _0810DC44: mov r2, sp adds r3, r6, 0 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30314,7 +30314,7 @@ sub_810DCB4: @ 810DCB4 cmp r0, 0 beq _0810DCC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DCC8: pop {r4} pop {r0} @@ -30378,7 +30378,7 @@ sub_810DD24: @ 810DD24 cmp r0, 0 bne _0810DD4A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DD4A: pop {r4} pop {r0} @@ -30389,7 +30389,7 @@ _0810DD4A: sub_810DD50: @ 810DD50 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -30397,7 +30397,7 @@ sub_810DD50: @ 810DD50 adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30426,7 +30426,7 @@ _0810DD7C: strh r1, [r4, 0x36] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -30450,7 +30450,7 @@ sub_810DDC4: @ 810DDC4 b _0810DE16 .pool _0810DDE0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -30458,7 +30458,7 @@ _0810DDE0: adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30514,7 +30514,7 @@ sub_810DE2C: @ 810DE2C cmp r0, 0 beq _0810DE68 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DE68: pop {r4} pop {r0} @@ -30569,7 +30569,7 @@ sub_810DE98: @ 810DE98 cmp r0, 0x47 bne _0810DED2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810DED2: pop {r4} pop {r0} @@ -30666,7 +30666,7 @@ _0810DF76: cmp r1, 0 bne _0810DF90 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810DF90: pop {r4-r7} pop {r0} @@ -30680,7 +30680,7 @@ sub_810DFA8: @ 810DFA8 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30696,7 +30696,7 @@ _0810DFC8: strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -30737,7 +30737,7 @@ sub_810E028: @ 810E028 cmp r0, 0 beq _0810E03C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810E03C: pop {r4} pop {r0} @@ -30748,7 +30748,7 @@ _0810E03C: sub_810E044: @ 810E044 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -30805,7 +30805,7 @@ _0810E088: ldrsh r0, [r2, r3] cmp r0, 0 bne _0810E0EC - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -30821,7 +30821,7 @@ _0810E088: b _0810E0FE .pool _0810E0EC: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -30841,7 +30841,7 @@ _0810E0FE: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldrb r1, [r4, 0xA] @@ -30919,7 +30919,7 @@ _0810E1AA: cmp r0, r1 bge _0810E1C2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810E1C2: pop {r0} bx r0 @@ -30929,7 +30929,7 @@ _0810E1C2: sub_810E1C8: @ 810E1C8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -30955,7 +30955,7 @@ _0810E1FE: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -31036,7 +31036,7 @@ _0810E296: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810E2BC: pop {r4} pop {r0} @@ -31099,11 +31099,11 @@ sub_810E314: @ 810E314 ands r0, r1 cmp r0, 0 beq _0810E33C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0810E33E .pool _0810E33C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0810E33E: ldrb r6, [r0] adds r0, r6, 0 @@ -32049,7 +32049,7 @@ _0810EA36: sub_810EA4C: @ 810EA4C push {r4,r5,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -32061,7 +32061,7 @@ sub_810EA4C: @ 810EA4C ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -32106,7 +32106,7 @@ _0810EAC4: ldrsh r0, [r4, r2] cmp r0, 0 bne _0810EADC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -32117,7 +32117,7 @@ _0810EADC: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _0810EAF8 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -32189,7 +32189,7 @@ _0810EB6A: cmp r0, r1 bne _0810EB82 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810EB82: pop {r4} pop {r0} @@ -32237,7 +32237,7 @@ sub_810EB88: @ 810EB88 strh r0, [r4, 0x6] ldr r0, =gUnknown_085973E8 mov r8, r0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -32263,7 +32263,7 @@ _0810EC02: cmp r0, 0xFF ble _0810EC16 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810EC16: pop {r3} mov r8, r3 @@ -32316,7 +32316,7 @@ _0810EC78: cmp r0, 0 beq _0810EC8C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810EC8C: pop {r4} pop {r0} @@ -32341,7 +32341,7 @@ _0810ECAA: beq _0810ECE0 b _0810ED1E _0810ECB0: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -32394,7 +32394,7 @@ _0810ECE0: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810ED1E: pop {r4} pop {r0} @@ -32521,7 +32521,7 @@ _0810EE00: cmp r0, 0 ble _0810EE0E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810EE0E: pop {r0} bx r0 @@ -32545,11 +32545,11 @@ _0810EE28: ldrsh r0, [r0, r2] cmp r0, 0 bne _0810EE40 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810EE42 .pool _0810EE40: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810EE42: ldrb r0, [r4] movs r1, 0 @@ -32631,7 +32631,7 @@ _0810EECC: adds r0, r5, 0 bl sub_80A749C adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810EEEC: add sp, 0x4 pop {r4,r5} @@ -32700,11 +32700,11 @@ _0810EF60: ldrsh r0, [r2, r1] cmp r0, 0 bne _0810EF74 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0810EF76 .pool _0810EF74: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0810EF76: ldrb r0, [r4] movs r1, 0 @@ -32773,7 +32773,7 @@ _0810EFEA: cmp r0, 0x1F bne _0810EFFE adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810EFFE: pop {r4} pop {r0} @@ -32845,7 +32845,7 @@ _0810F02A: b _0810F07E _0810F078: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810F07E: pop {r0} bx r0 @@ -32861,7 +32861,7 @@ sub_810F084: @ 810F084 mov r8, r0 ldrh r4, [r0, 0x20] ldrh r5, [r0, 0x22] - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -33021,7 +33021,7 @@ _0810F1BC: _0810F1DA: strb r0, [r1] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -33038,7 +33038,7 @@ sub_810F1EC: @ 810F1EC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -33078,7 +33078,7 @@ _0810F22E: orrs r1, r0 lsrs r6, r1, 31 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F264 @@ -33091,7 +33091,7 @@ _0810F264: adds r4, r0, 0 eors r4, r7 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F284 @@ -33109,7 +33109,7 @@ _0810F284: lsls r0, 24 cmp r0, 0 beq _0810F2B8 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -33126,7 +33126,7 @@ _0810F2B0: movs r0, 0x28 b _0810F2F2 _0810F2B8: - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -33205,7 +33205,7 @@ sub_810F340: @ 810F340 b _0810F3B6 _0810F35C: adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F382 @@ -33226,7 +33226,7 @@ _0810F382: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F3AC @@ -33375,7 +33375,7 @@ sub_810F46C: @ 810F46C lsrs r4, r0, 24 adds r6, r4, 0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F4D4 @@ -33398,7 +33398,7 @@ _0810F4D4: adds r4, r0, 0 eors r4, r6 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F502 @@ -33454,7 +33454,7 @@ sub_810F524: @ 810F524 orrs r1, r0 lsrs r5, r1, 31 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F562 @@ -33464,7 +33464,7 @@ _0810F562: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0810F57C @@ -33473,7 +33473,7 @@ _0810F562: adds r0, r5, 0 bl sub_80A477C _0810F57C: - ldr r0, =move_anim_8072740 + ldr r0, =DestroyAnimSprite str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -33505,7 +33505,7 @@ _0810F5A6: lsls r0, 24 cmp r0, 0 beq _0810F5EE - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -33568,7 +33568,7 @@ _0810F62C: sub_810F634: @ 810F634 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -33608,7 +33608,7 @@ _0810F684: movs r0, 0x1 _0810F692: strh r0, [r5, 0x30] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A67D8 @@ -33623,7 +33623,7 @@ _0810F692: sub_810F6B0: @ 810F6B0 push {r4-r7,lr} adds r5, r0, 0 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x1 bl sub_80A861C @@ -33756,7 +33756,7 @@ _0810F7B4: cmp r0, r1 bne _0810F7CC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810F7CC: pop {r4} pop {r0} @@ -33805,7 +33805,7 @@ sub_810F810: @ 810F810 cmp r0, 0 bne _0810F830 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810F830: pop {r4} pop {r0} @@ -33831,7 +33831,7 @@ sub_810F83C: @ 810F83C strh r0, [r4, 0x8] strh r1, [r4, 0xA] strh r1, [r4, 0xC] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -33930,7 +33930,7 @@ _0810F900: ldrb r0, [r4, 0x8] bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810F936: pop {r4,r5} pop {r0} @@ -33952,7 +33952,7 @@ sub_810F940: @ 810F940 movs r0, 0x10 strh r0, [r5, 0xE] strh r1, [r5, 0x10] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -34203,7 +34203,7 @@ _0810FB44: movs r1, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810FB5A: pop {r4-r6} pop {r0} @@ -34241,7 +34241,7 @@ _0810FB8A: cmp r1, r0 bne _0810FB9C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0810FB9C: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -34260,7 +34260,7 @@ sub_810FBA8: @ 810FBA8 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810FBD4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -34305,7 +34305,7 @@ sub_810FBF0: @ 810FBF0 bne _0810FC60 ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -34316,7 +34316,7 @@ sub_810FBF0: @ 810FBF0 bl sub_80A861C adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -34331,7 +34331,7 @@ sub_810FBF0: @ 810FBF0 _0810FC60: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -34342,7 +34342,7 @@ _0810FC60: bl sub_80A861C subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -34357,7 +34357,7 @@ _0810FC94: bne _0810FCE8 ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -34368,7 +34368,7 @@ _0810FC94: bl sub_80A861C adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -34383,7 +34383,7 @@ _0810FC94: _0810FCE8: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -34394,7 +34394,7 @@ _0810FCE8: bl sub_80A861C subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -34497,7 +34497,7 @@ _0810FDD4: cmp r0, 0x11 ble _0810FDE8 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0810FDE8: pop {r4,r5} pop {r0} @@ -34535,7 +34535,7 @@ sub_810FE14: @ 810FE14 lsls r1, 3 ldr r0, =gTasks adds r4, r1, r0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -34590,7 +34590,7 @@ _0810FE86: movs r0, 0 strh r0, [r4, 0x24] _0810FE92: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -34786,7 +34786,7 @@ _08110014: .pool _08110020: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08110026: pop {r3,r4} mov r8, r3 @@ -34819,7 +34819,7 @@ sub_8110034: @ 8110034 cmp r6, 0xFF bne _0811006C adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08110116 .pool _0811006C: @@ -34835,7 +34835,7 @@ _0811006C: adds r0, r5, 0 bl FreeOamMatrix mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08110116 .pool _08110094: @@ -35035,7 +35035,7 @@ _08110228: lsrs r0, 24 bl FreeOamMatrix adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08110238: pop {r4,r5} pop {r0} @@ -35062,7 +35062,7 @@ _08110256: beq _0811034A b _08110360 _08110260: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -35181,7 +35181,7 @@ _0811034A: movs r1, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08110360: pop {r4,r5} pop {r0} @@ -35209,7 +35209,7 @@ sub_8110368: @ 8110368 b _081103C4 .pool _08110394: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35232,7 +35232,7 @@ _08110394: negs r0, r0 strh r0, [r1] _081103C4: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A60AC @@ -35270,7 +35270,7 @@ _081103C4: strh r0, [r6, 0x36] ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 pop {r4-r6} @@ -35297,7 +35297,7 @@ sub_8110438: @ 8110438 b _08110478 .pool _0811045C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35311,7 +35311,7 @@ _0811045C: negs r1, r1 strh r1, [r0] _08110478: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A60AC @@ -35345,7 +35345,7 @@ _08110478: strh r0, [r6, 0x36] ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 pop {r4-r6} @@ -35384,7 +35384,7 @@ _08110500: ldrsh r0, [r1, r2] cmp r0, 0 bne _08110548 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -35400,7 +35400,7 @@ _08110500: b _0811055A .pool _08110548: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -35431,7 +35431,7 @@ sub_811057C: @ 811057C cmp r0, 0 beq _08110592 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _081105AE _08110592: movs r1, 0x3A @@ -35457,7 +35457,7 @@ _081105AE: sub_81105B4: @ 81105B4 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -35465,7 +35465,7 @@ sub_81105B4: @ 81105B4 adds r3, 0x22 movs r1, 0 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35490,7 +35490,7 @@ _081105FC: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35545,7 +35545,7 @@ _08110664: cmp r0, 0x33 bne _08110678 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08110678: pop {r0} bx r0 @@ -35633,7 +35633,7 @@ sub_8110700: @ 8110700 movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -35655,7 +35655,7 @@ sub_8110720: @ 8110720 b _08110762 .pool _08110740: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35676,11 +35676,11 @@ _08110762: lsls r0, 24 cmp r0, 0 bne _081107B2 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 @@ -35712,7 +35712,7 @@ _081107B2: adds r0, r7, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -35764,7 +35764,7 @@ _081107B2: strh r5, [r7, 0x36] ldr r0, =sub_80A6EEC str r0, [r7, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r7, 0 bl StoreSpriteCallbackInData6 add sp, 0x4 @@ -35780,7 +35780,7 @@ sub_8110850: @ 8110850 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -35794,7 +35794,7 @@ _08110870: ldr r4, =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -35849,7 +35849,7 @@ sub_81108CC: @ 81108CC cmp r0, 0 beq _081108F8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _08110988 _081108F8: movs r0, 0x2E @@ -35941,11 +35941,11 @@ sub_8110994: @ 8110994 ldrsh r0, [r0, r1] cmp r0, 0 bne _081109B0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _081109B2 .pool _081109B0: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _081109B2: ldrb r0, [r4] movs r1, 0x2 @@ -35980,7 +35980,7 @@ sub_81109F0: @ 81109F0 ldrsh r0, [r6, r1] cmp r0, 0 beq _08110A10 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x20 @@ -36064,7 +36064,7 @@ sub_8110AB4: @ 8110AB4 bl StartSpriteAnim adds r0, r5, 0 bl AnimateSprite - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -36183,7 +36183,7 @@ sub_8110B80: @ 8110B80 cmp r0, r1 bne _08110BC6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08110BC6: pop {r4} pop {r0} @@ -36207,11 +36207,11 @@ sub_8110BCC: @ 8110BCC movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -36219,7 +36219,7 @@ sub_8110BCC: @ 8110BCC movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _08110C10: ldr r0, =gBattle_BG1_X strh r5, [r0] @@ -36254,7 +36254,7 @@ _08110C10: ldrsh r0, [r0, r1] cmp r0, 0 beq _08110C6E - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -36440,7 +36440,7 @@ _08110DFC: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _08110E10: ldr r0, =gBattle_BG1_X movs r1, 0 @@ -36456,9 +36456,9 @@ _08110E10: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08110E3A: add sp, 0x10 pop {r4,r5} @@ -36480,7 +36480,7 @@ sub_8110E4C: @ 8110E4C ldrsh r0, [r4, r2] cmp r0, 0 beq _08110E98 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -36568,7 +36568,7 @@ _08110F0E: cmp r0, r1 bge _08110F24 _08110F20: - ldr r0, =move_anim_8072740 + ldr r0, =DestroyAnimSprite str r0, [r5, 0x1C] _08110F24: pop {r4,r5} @@ -36597,7 +36597,7 @@ sub_8110F30: @ 8110F30 strh r0, [r4, 0x36] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -36620,7 +36620,7 @@ sub_8110F74: @ 8110F74 lsls r1, 3 ldr r0, =gTasks adds r6, r1, r0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -36636,7 +36636,7 @@ sub_8110F74: @ 8110F74 lsls r1, 13 adds r0, r1 lsrs r7, r0, 16 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -36926,7 +36926,7 @@ _081111FE: cmp r0, 0 bne _0811120C adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811120C: pop {r4} pop {r0} @@ -37090,7 +37090,7 @@ _0811134E: thumb_func_start sub_811135C sub_811135C: @ 811135C push {lr} - ldr r0, =gDisableStructMoveAnim + ldr r0, =gAnimDisableStructPtr ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -37183,7 +37183,7 @@ _08111400: cmp r0, 0 bne _08111412 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08111412: pop {r0} bx r0 @@ -37193,7 +37193,7 @@ _08111412: sub_8111418: @ 8111418 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -37216,7 +37216,7 @@ _08111434: sub_8111444: @ 8111444 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -37286,7 +37286,7 @@ sub_811149C: @ 811149C cmp r0, 0x8C ble _081114E6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081114E6: pop {r4} pop {r0} @@ -37298,7 +37298,7 @@ sub_81114EC: @ 81114EC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gMoveDmgMoveAnim + ldr r2, =gAnimMoveDmg ldr r0, [r2] cmp r0, 0x20 bgt _08111500 @@ -37322,7 +37322,7 @@ _08111510: strh r0, [r1, 0xE] _0811151A: adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -37365,7 +37365,7 @@ _0811154E: movs r0, 0x1 bl sub_80A6DAC adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811157A: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -37424,7 +37424,7 @@ _081115BC: movs r0, 0x1 bl sub_80A6DAC adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081115F4: pop {r4-r6} pop {r0} @@ -37443,7 +37443,7 @@ sub_811160C: @ 811160C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -37748,7 +37748,7 @@ _08111852: cmp r0, 0x3D bne _08111884 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08111884: pop {r4} pop {r0} @@ -37902,7 +37902,7 @@ _081119BC: adds r0, r1, 0 bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -37925,7 +37925,7 @@ sub_81119E0: @ 81119E0 adds r4, r0, 0 ldrh r5, [r4, 0x20] ldrh r6, [r4, 0x22] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 @@ -38042,7 +38042,7 @@ _08111AD2: lsls r0, 16 cmp r0, 0 bgt _08111B96 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -38104,7 +38104,7 @@ _08111B3C: lsls r0, 16 cmp r0, 0 bgt _08111B96 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -38223,7 +38223,7 @@ _08111C38: cmp r6, 0 beq _08111C44 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _08111C4A _08111C44: ldrh r0, [r3, 0x30] @@ -38254,7 +38254,7 @@ sub_8111C50: @ 8111C50 cmp r0, 0 bge _08111C80 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08111D5C .pool _08111C80: @@ -38285,7 +38285,7 @@ _08111C80: adds r0, r4 movs r1, 0x50 strh r1, [r0, 0x2E] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -38470,7 +38470,7 @@ _08111E1C: b _08111E48 _08111E42: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08111E48: pop {r4} pop {r0} @@ -38510,7 +38510,7 @@ sub_8111E78: @ 8111E78 lsls r0, 3 ldr r1, =gTasks adds r5, r0, r1 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -38557,7 +38557,7 @@ _08111ED0: bl FreeSpritePaletteByTag _08111EFE: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081120CC .pool _08111F0C: @@ -38604,7 +38604,7 @@ _08111F0C: adds r2, r4 ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -38864,7 +38864,7 @@ sub_8112170: @ 8112170 lsls r0, 3 ldr r1, =gTasks adds r4, r0, r1 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -38956,7 +38956,7 @@ _08112248: bl SetGpuRegBits _08112252: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08112258: ldrh r0, [r4, 0x26] adds r0, 0x1 @@ -38979,7 +38979,7 @@ sub_8112264: @ 8112264 ldrsh r0, [r0, r1] cmp r0, 0 bne _081122AC - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -38994,11 +38994,11 @@ sub_8112264: @ 8112264 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget b _081122D0 .pool _081122AC: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -39013,7 +39013,7 @@ _081122AC: lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker _081122D0: ldrb r0, [r4] movs r1, 0 @@ -39166,7 +39166,7 @@ sub_81123C4: @ 81123C4 ldr r2, =gBattleAnimArgs ldrh r0, [r2] strh r0, [r1, 0x1C] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -39189,7 +39189,7 @@ _08112434: _08112436: lsls r1, r4, 16 asrs r3, r1, 16 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r2, [r0] str r1, [sp, 0x10] cmp r3, r2 @@ -39201,7 +39201,7 @@ _08112436: lsls r0, r4, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _08112502 @@ -39565,7 +39565,7 @@ _0811273C: movs r1, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08112752: pop {r4,r5} pop {r0} @@ -39594,7 +39594,7 @@ sub_8112758: @ 8112758 movs r0, 0x54 movs r1, 0x10 bl SetGpuReg - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -39855,7 +39855,7 @@ sub_8112994: @ 8112994 movs r1, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081129DA: pop {r4,r5} pop {r0} @@ -39869,7 +39869,7 @@ sub_81129F0: @ 81129F0 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -40048,7 +40048,7 @@ sub_8112B44: @ 8112B44 ldr r0, =gBattle_WIN0V strh r1, [r0] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -40064,7 +40064,7 @@ sub_8112B78: @ 8112B78 movs r1, 0xC bl Sin strh r0, [r5, 0x24] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -40171,7 +40171,7 @@ sub_8112C4C: @ 8112C4C movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -40195,7 +40195,7 @@ sub_8112C6C: @ 8112C6C mov r8, r0 mov r0, r8 strh r0, [r4, 0xA] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -40301,7 +40301,7 @@ _08112D56: lsls r0, 2 adds r5, r0, r1 strh r7, [r5, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide movs r1, 0 @@ -40445,7 +40445,7 @@ _08112E80: movs r1, 0 bl SetGpuReg adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08112E96: pop {r4-r7} pop {r0} @@ -40562,7 +40562,7 @@ sub_8112F60: @ 8112F60 orrs r1, r2 strb r1, [r3] ldr r2, =gBankSpriteIds - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r1, [r1] @@ -40679,7 +40679,7 @@ _08113054: sub_8113064: @ 8113064 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -40752,7 +40752,7 @@ sub_8113100: @ 8113100 push {r4,r5,lr} adds r5, r0, 0 bl sub_80A6838 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -40765,7 +40765,7 @@ sub_8113100: @ 8113100 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -40834,11 +40834,11 @@ sub_81131B4: @ 81131B4 ldrsh r0, [r0, r1] cmp r0, 0 bne _081131D0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _081131D2 .pool _081131D0: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _081131D2: ldrb r0, [r4] movs r1, 0 @@ -40876,7 +40876,7 @@ _081131D2: sub_8113224: @ 8113224 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -40898,7 +40898,7 @@ _0811323E: sub_8113250: @ 8113250 push {r4-r7,lr} adds r6, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -41088,7 +41088,7 @@ _081133CE: cmp r0, 0x14 ble _081133E2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081133E2: pop {r4,r5} pop {r0} @@ -41106,7 +41106,7 @@ sub_81133E8: @ 81133E8 lsls r1, 3 ldr r0, =gTasks adds r4, r1, r0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -41133,7 +41133,7 @@ _0811342A: strb r0, [r1, 0x8] mov r0, sp strb r5, [r0, 0x9] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -41274,7 +41274,7 @@ _08113556: .pool _08113568: adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811356E: pop {r0} bx r0 @@ -41354,7 +41354,7 @@ sub_81135EC: @ 81135EC movs r1, 0x5 bl __divsi3 adds r6, r0, 0 - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker mov r8, r1 ldrb r0, [r1] movs r1, 0x2 @@ -41453,7 +41453,7 @@ sub_811369C: @ 811369C cmp r0, r1 ble _081136E0 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081136E0: pop {r4} pop {r0} @@ -41473,7 +41473,7 @@ sub_81136E8: @ 81136E8 ldr r1, =gBattleAnimArgs ldrh r1, [r1] strh r1, [r0, 0x8] - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker ldrb r4, [r1] movs r1, 0x10 strh r1, [r0, 0xA] @@ -41545,7 +41545,7 @@ sub_811375C: @ 811375C bne _081137DE ldr r2, =gSprites ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -41559,7 +41559,7 @@ sub_811375C: @ 811375C orrs r1, r2 strb r1, [r0] adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081137DE .pool _081137D8: @@ -41639,7 +41639,7 @@ sub_811381C: @ 811381C movs r1, 0 bl SetGpuReg adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08113882 .pool _0811387C: @@ -41661,7 +41661,7 @@ sub_8113888: @ 8113888 lsls r1, 5 movs r0, 0x52 bl SetGpuReg - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -41679,7 +41679,7 @@ _081138BC: bl SetGpuReg _081138C4: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -41690,14 +41690,14 @@ _081138C4: sub_81138D4: @ 81138D4 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -41805,7 +41805,7 @@ _081139C2: cmp r0, 0 bne _081139D4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081139D4: pop {r4-r6} pop {r0} @@ -41918,11 +41918,11 @@ sub_8113A90: @ 8113A90 adds r3, r0, 0 cmp r1, 0 bne _08113AAC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08113AAE .pool _08113AAC: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08113AAE: ldrb r5, [r0] movs r6, 0x14 @@ -42054,7 +42054,7 @@ sub_8113BAC: @ 8113BAC lsls r1, 3 ldr r0, =gTasks adds r5, r1, r0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -42096,7 +42096,7 @@ _08113C1C: ldr r0, =0x0000ffc0 _08113C1E: strh r0, [r5, 0x18] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -42355,7 +42355,7 @@ _08113E5E: .pool _08113E6C: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08113E72: pop {r4} pop {r0} @@ -42411,11 +42411,11 @@ _08113EBC: adds r1, r4, 0 bl SetGpuReg adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081140A6 .pool _08113EF8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -42472,7 +42472,7 @@ _08113F78: b _08114044 .pool _08113F84: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -42795,7 +42795,7 @@ _08114210: adds r1, r4, 0 bl SetGpuReg adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08114232: pop {r4,r5} pop {r0} @@ -43014,7 +43014,7 @@ sub_81143C0: @ 81143C0 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankIdentity_permutated lsls r0, 24 @@ -43049,7 +43049,7 @@ sub_81143C0: @ 81143C0 ldrb r0, [r6] movs r5, 0x2 eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0811444E @@ -43075,7 +43075,7 @@ sub_81143C0: @ 81143C0 strb r1, [r0] _0811444E: mov r0, r10 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r3-r5} mov r8, r3 mov r9, r4 @@ -43091,7 +43091,7 @@ sub_8114470: @ 8114470 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity_permutated lsls r0, 24 @@ -43106,7 +43106,7 @@ sub_8114470: @ 8114470 ldrb r1, [r4] movs r0, 0x2 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _081144AC @@ -43116,7 +43116,7 @@ sub_8114470: @ 8114470 bl sub_80A477C _081144AC: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -43141,7 +43141,7 @@ sub_81144BC: @ 81144BC bl StartSpriteAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -43180,11 +43180,11 @@ sub_81144F8: @ 81144F8 movs r0, 0x1 movs r1, 0x4 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -43192,7 +43192,7 @@ sub_81144F8: @ 81144F8 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0811455C: bl IsDoubleBattle lsls r0, 24 @@ -43202,7 +43202,7 @@ _0811455C: lsls r0, 24 cmp r0, 0 bne _081145D6 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -43218,7 +43218,7 @@ _0811458C: ldrb r0, [r4] movs r5, 0x2 eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -43248,21 +43248,21 @@ _0811458C: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r6, 0x1 _081145D6: bl IsContest lsls r0, 24 cmp r0, 0 beq _08114614 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] b _0811465C .pool _08114614: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -43299,7 +43299,7 @@ _0811465C: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -43458,7 +43458,7 @@ _081147B8: cmp r0, 0x1 bne _08114886 ldr r2, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -43503,7 +43503,7 @@ _08114824: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _08114856: movs r0, 0 bl GetGpuReg @@ -43523,7 +43523,7 @@ _08114856: movs r1, 0 bl SetGpuReg adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08114886: add sp, 0x10 pop {r4-r6} @@ -43590,7 +43590,7 @@ _08114908: lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0811492C @@ -43617,7 +43617,7 @@ _0811492E: bl sub_80A750C _0811494A: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -43645,7 +43645,7 @@ _08114974: strh r0, [r1, 0xE] _08114980: adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -43655,7 +43655,7 @@ _08114980: sub_8114994: @ 8114994 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -43670,7 +43670,7 @@ sub_8114994: @ 8114994 strh r0, [r4, 0x22] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -43716,7 +43716,7 @@ sub_81149FC: @ 81149FC strh r1, [r5, 0x24] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -43751,7 +43751,7 @@ sub_8114A60: @ 8114A60 cmp r0, 0 beq _08114A74 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08114A74: pop {r4} pop {r0} @@ -43764,7 +43764,7 @@ sub_8114A7C: @ 8114A7C adds r6, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -43778,7 +43778,7 @@ _08114A9C: ldr r4, =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -43797,7 +43797,7 @@ _08114A9C: strh r0, [r6, 0x36] ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 pop {r4-r6} @@ -43814,7 +43814,7 @@ sub_8114AF0: @ 8114AF0 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A60AC @@ -43890,7 +43890,7 @@ sub_8114B80: @ 8114B80 ldrsh r0, [r6, r1] cmp r0, 0 bne _08114BF4 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -43964,7 +43964,7 @@ _08114C2E: cmp r0, r1 bge _08114C46 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08114C46: pop {r0} bx r0 @@ -44025,7 +44025,7 @@ _08114C74: cmp r0, 0xA bne _08114CB6 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08114CB6: pop {r0} bx r0 @@ -44096,7 +44096,7 @@ _08114D3C: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -44118,7 +44118,7 @@ _08114D70: _08114D78: ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -44246,7 +44246,7 @@ _08114E7E: .pool _08114E8C: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask ldr r2, =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] @@ -44289,7 +44289,7 @@ sub_8114EB4: @ 8114EB4 movs r4, 0 strh r4, [r1, 0x24] strh r4, [r1, 0x26] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -44304,7 +44304,7 @@ _08114F00: _08114F02: strh r4, [r0] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -44402,7 +44402,7 @@ _08114F78: .pool _08114FCC: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08114FD2: pop {r4,r5} pop {r0} @@ -44442,7 +44442,7 @@ _08115018: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -44458,7 +44458,7 @@ _08115044: _08115046: ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -44521,7 +44521,7 @@ _081150C2: .pool _081150D4: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081150DA: pop {r4} pop {r0} @@ -44634,11 +44634,11 @@ sub_81151A0: @ 81151A0 adds r7, r0, 0 cmp r1, 0 bne _081151BC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _081151BE .pool _081151BC: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _081151BE: ldrb r4, [r0] movs r6, 0x18 @@ -44698,7 +44698,7 @@ sub_8115228: @ 8115228 cmp r0, 0 beq _0811523C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0811523C: pop {r4} pop {r0} @@ -44714,11 +44714,11 @@ sub_8115244: @ 8115244 ldrsh r0, [r0, r1] cmp r0, 0 bne _08115260 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08115262 .pool _08115260: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08115262: ldrb r5, [r0] adds r0, r5, 0 @@ -44754,7 +44754,7 @@ _08115262: ands r0, r2 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData6 ldrh r0, [r4, 0x4] @@ -44788,7 +44788,7 @@ sub_81152DC: @ 81152DC b _08115314 .pool _08115308: - ldr r0, =gMovePowerMoveAnim + ldr r0, =gAnimMovePower ldrh r0, [r0] movs r1, 0xA bl __udivsi3 @@ -44818,7 +44818,7 @@ _08115340: _08115346: lsls r0, r5, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _08115370 @@ -44853,7 +44853,7 @@ _08115380: cmp r0, 0xFF bne _08115398 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _081153A0 _08115398: movs r0, 0x1 @@ -44991,7 +44991,7 @@ _08115490: ldrh r0, [r3, 0x22] strh r0, [r1] adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811549C: pop {r0} bx r0 @@ -45110,7 +45110,7 @@ _08115554: blt _08115554 _08115578: adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811557E: pop {r4-r7} pop {r0} @@ -45191,7 +45191,7 @@ sub_8115600: @ 8115600 lsrs r1, r0, 24 ldr r3, =gBattleAnimArgs movs r2, 0 - ldr r0, =gMovePowerMoveAnim + ldr r0, =gAnimMovePower ldrh r0, [r0] cmp r0, 0x63 bls _08115614 @@ -45199,7 +45199,7 @@ sub_8115600: @ 8115600 _08115614: strh r2, [r3, 0x1E] adds r0, r1, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -45217,11 +45217,11 @@ sub_8115628: @ 8115628 adds r6, r2, 0 cmp r0, 0 beq _08115648 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget b _0811564A .pool _08115648: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker _0811564A: ldrb r0, [r0] adds r5, r0, 0 @@ -45271,7 +45271,7 @@ _0811565A: ldrh r0, [r6, 0x4] strh r0, [r4, 0xE] adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r7} pop {r0} bx r0 @@ -45333,7 +45333,7 @@ sub_811572C: @ 811572C strh r0, [r4, 0x22] ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -45415,7 +45415,7 @@ _081157D2: cmp r0, r1 bne _081157F6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081157F6: pop {r4} pop {r0} @@ -45503,7 +45503,7 @@ sub_8115884: @ 8115884 cmp r0, 0 bne _0811589A adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0811589A: pop {r0} bx r0 @@ -45638,7 +45638,7 @@ sub_8115984: @ 8115984 movs r2, 0 bl BlendPalettes adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081159AA: pop {r4} pop {r0} @@ -45810,7 +45810,7 @@ _08115AF8: b _08115B06 _08115B00: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08115B06: pop {r4-r6} pop {r0} @@ -45852,9 +45852,9 @@ sub_8115B0C: @ 8115B0C mov r8, r2 cmp r5, r1 bge _08115B74 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r3, [r0] - ldr r7, =gAnimationBankTarget + ldr r7, =gAnimBankTarget movs r0, 0x1 mov r12, r0 adds r2, r1, 0 @@ -45996,7 +45996,7 @@ _08115C6C: b _08115C7A _08115C74: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08115C7A: pop {r4-r6} pop {r0} @@ -46135,7 +46135,7 @@ _08115D80: b _08115D8E _08115D88: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08115D8E: pop {r4-r6} pop {r0} @@ -46317,7 +46317,7 @@ sub_8115EB8: @ 8115EB8 movs r3, 0 bl BeginNormalPaletteFade adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08115EFE: add sp, 0x4 pop {r4,r5} @@ -46336,9 +46336,9 @@ sub_8115F10: @ 8115F10 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r6, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r7, [r0] ldr r4, =gBattleAnimArgs ldrh r1, [r4] @@ -46380,7 +46380,7 @@ _08115F6E: adds r0, r2, 0 bl InvertPlttBuffer mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0xC pop {r3} mov r8, r3 @@ -46429,10 +46429,10 @@ _08115FD6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] mov r9, r0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] mov r10, r0 ldrh r1, [r4, 0xC] @@ -46507,7 +46507,7 @@ _08116050: adds r0, r5, 0 bl UnfadePlttBuffer mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask _0811607A: pop {r3-r5} mov r8, r3 @@ -46679,7 +46679,7 @@ _081161BA: bcc _081161BA _081161DC: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081161E2: pop {r4-r7} pop {r0} @@ -46692,7 +46692,7 @@ sub_81161F4: @ 81161F4 push {r4-r6,lr} ldr r6, =gSprites ldr r4, =gBankSpriteIds - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -46707,7 +46707,7 @@ sub_81161F4: @ 81161F4 adds r0, r2, 0 ands r0, r3 strb r0, [r1] - ldr r3, =gAnimationBankTarget + ldr r3, =gAnimBankTarget ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -46873,7 +46873,7 @@ _08116358: strh r1, [r6] strh r1, [r2] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08116382 _0811637E: subs r0, r2, 0x1 @@ -46907,7 +46907,7 @@ _081163AC: _081163B4: ldr r0, =sub_80A67BC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -46955,7 +46955,7 @@ _081163FC: sub_8116420: @ 8116420 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -47113,7 +47113,7 @@ _08116584: ldr r0, =gBattleAnimArgs ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A64B0 @@ -47180,7 +47180,7 @@ sub_81165E4: @ 81165E4 cmp r0, 0xC ble _0811661A adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0811661A: pop {r0} bx r0 @@ -47256,14 +47256,14 @@ _081166B8: movs r5, 0 _081166BA: mov r0, sp - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker b _081166CA .pool _081166C4: movs r5, 0 _081166C6: mov r0, sp - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget _081166CA: ldrb r1, [r1] strb r1, [r0] @@ -47271,10 +47271,10 @@ _081166CA: .pool _081166D4: mov r1, sp - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] strb r0, [r1] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] strb r0, [r1, 0x1] b _0811670E @@ -47287,13 +47287,13 @@ _081166EC: _081166F4: movs r5, 0 mov r2, sp - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08116706 .pool _08116700: movs r5, 0 mov r2, sp - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08116706: ldrb r0, [r0] movs r1, 0x2 @@ -47310,7 +47310,7 @@ _08116712: cmp r4, r0 beq _0811673C adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0811673C @@ -47558,7 +47558,7 @@ _0811693C: b _08116954 _08116946: adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08116954 _0811694E: mov r0, r8 @@ -47614,7 +47614,7 @@ sub_81169A0: @ 81169A0 cmp r0, 0 bne _081169B8 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081169B8: pop {r0} bx r0 @@ -47750,7 +47750,7 @@ _08116ABC: cmp r0, 0 bne _08116ACA adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08116ACA: pop {r4-r6} pop {r0} @@ -47867,7 +47867,7 @@ _08116BA2: lsls r0, 24 cmp r0, 0 bne _08116C26 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankIdentity lsls r0, 24 @@ -47883,7 +47883,7 @@ _08116BD2: ldrb r0, [r5] movs r6, 0x2 eors r0, r6 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -47925,14 +47925,14 @@ _08116C26: lsls r0, 24 cmp r0, 0 beq _08116C64 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] b _08116CAC .pool _08116C64: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -47969,7 +47969,7 @@ _08116CAC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -48138,7 +48138,7 @@ _08116DF6: cmp r0, 0x1 bne _08116E7C ldr r2, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -48164,7 +48164,7 @@ _08116E7C: mov r2, r8 strh r2, [r7] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08116E86: add sp, 0x14 pop {r3} @@ -48223,11 +48223,11 @@ sub_8116F04: @ 8116F04 ldrsh r0, [r1, r2] cmp r0, 0 bne _08116F24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08116F26 .pool _08116F24: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08116F26: ldrb r0, [r0] strb r0, [r1] @@ -48247,7 +48247,7 @@ _08116F26: cmp r0, 0 beq _08116F5C ldrb r0, [r1, 0x1] - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _08116F5C @@ -48281,11 +48281,11 @@ _08116F5C: movs r0, 0x1 movs r1, 0x4 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -48293,7 +48293,7 @@ _08116F5C: movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _08116FBA: bl IsDoubleBattle lsls r0, 24 @@ -48320,7 +48320,7 @@ _08116FBA: _08116FEC: ldr r0, [r4] ldrb r0, [r0, 0x1] - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 @@ -48350,7 +48350,7 @@ _08116FEC: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute ldr r0, [r4] strb r5, [r0, 0x2] _08117036: @@ -48360,7 +48360,7 @@ _08117036: beq _08117078 ldr r0, =gUnknown_0203A110 ldr r1, [r0] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -48765,7 +48765,7 @@ _081173B6: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _081173E6: movs r0, 0 bl GetGpuReg @@ -48833,7 +48833,7 @@ _08117466: movs r0, 0 str r0, [r4] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08117478: pop {r4-r6} pop {r0} @@ -48987,7 +48987,7 @@ _081175AC: .pool _081175B8: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081175BE: pop {r4-r6} pop {r0} @@ -49044,7 +49044,7 @@ sub_8117610: @ 8117610 lsrs r6, r0, 24 movs r4, 0 movs r2, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r3, [r0] movs r5, 0x1 _08117620: @@ -49096,7 +49096,7 @@ sub_8117660: @ 8117660 ldrsh r0, [r4, r1] cmp r0, 0 beq _0811769C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -49125,7 +49125,7 @@ _0811769C: adds r0, 0x1 strh r0, [r1, 0x8] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -49196,7 +49196,7 @@ sub_8117754: @ 8117754 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide ldr r1, =gBattleAnimArgs @@ -49204,7 +49204,7 @@ sub_8117754: @ 8117754 lsrs r0, 24 strh r0, [r1, 0xE] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -49217,7 +49217,7 @@ sub_8117780: @ 8117780 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide ldr r1, =gBattleAnimArgs @@ -49225,7 +49225,7 @@ sub_8117780: @ 8117780 lsrs r0, 24 strh r0, [r1, 0xE] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -49239,10 +49239,10 @@ sub_81177AC: @ 81177AC lsrs r3, r0, 24 ldr r5, =gBattleAnimArgs movs r4, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r2, [r0] movs r0, 0x2 - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget eors r0, r2 ldrb r1, [r1] cmp r0, r1 @@ -49251,7 +49251,7 @@ sub_81177AC: @ 81177AC _081177C8: strh r4, [r5, 0xE] adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -49266,13 +49266,13 @@ sub_81177E4: @ 81177E4 movs r4, 0 ldr r6, =gSprites _081177EE: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] cmp r4, r0 beq _0811782C lsls r0, r4, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _0811782C @@ -49303,7 +49303,7 @@ _0811782C: cmp r4, 0x3 bls _081177EE adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r7} pop {r0} bx r0 @@ -49355,7 +49355,7 @@ sub_8117854: @ 8117854 cmp r1, 0 beq _081178BA adds r0, r6, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _081178BA @@ -49423,7 +49423,7 @@ _08117930: lsls r0, 24 cmp r0, 0 beq _08117964 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] @@ -49744,7 +49744,7 @@ _08117BB2: bl DestroySprite _08117C06: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08117C0C: add sp, 0x4 pop {r4-r6} @@ -49762,7 +49762,7 @@ sub_8117C24: @ 8117C24 ldr r1, =gBattleTerrain ldrb r1, [r1] strh r1, [r2] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -49784,7 +49784,7 @@ sub_8117C44: @ 8117C44 adds r1, r2 str r0, [r1] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -49809,7 +49809,7 @@ sub_8117C70: @ 8117C70 movs r1, 0 str r1, [r0] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -49854,13 +49854,13 @@ _08117CD2: _08117CE4: cmp r0, 0x1 bne _08117CF0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08117CF6 .pool _08117CF0: cmp r0, 0x2 bne _08117CFC - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08117CF6: ldrb r0, [r0] adds r4, r0, 0 @@ -49883,7 +49883,7 @@ _08117CFC: movs r2, 0x20 bl memcpy adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0xC pop {r4,r5} pop {r0} @@ -49929,13 +49929,13 @@ _08117D6E: _08117D80: cmp r0, 0x1 bne _08117D8C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08117D92 .pool _08117D8C: cmp r0, 0x2 bne _08117D98 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08117D92: ldrb r0, [r0] adds r4, r0, 0 @@ -49958,7 +49958,7 @@ _08117D98: movs r2, 0x20 bl memcpy adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0xC pop {r4,r5} pop {r0} @@ -50004,13 +50004,13 @@ _08117E0A: _08117E1C: cmp r0, 0x1 bne _08117E28 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08117E2E .pool _08117E28: cmp r0, 0x2 bne _08117E34 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08117E2E: ldrb r0, [r0] adds r4, r0, 0 @@ -50024,7 +50024,7 @@ _08117E34: movs r2, 0x20 bl memcpy adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0xC pop {r4,r5} pop {r0} @@ -50052,7 +50052,7 @@ _08117E80: strh r1, [r0, 0xE] _08117E84: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -50064,15 +50064,15 @@ sub_8117E94: @ 8117E94 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldr r1, =gBankTarget ldrb r1, [r1] strb r1, [r2] - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldr r1, =gEffectBank ldrb r1, [r1] strb r1, [r2] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -50083,11 +50083,11 @@ sub_8117EC4: @ 8117EC4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -50104,7 +50104,7 @@ _08117EF8: _08117EFC: strh r0, [r1, 0xE] adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -50116,11 +50116,11 @@ sub_8117F10: @ 8117F10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldr r1, =gBankTarget ldrb r1, [r1] strb r1, [r2] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -50131,15 +50131,15 @@ sub_8117F30: @ 8117F30 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldr r1, =gBankAttacker ldrb r1, [r1] strb r1, [r2] - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldr r1, =gEffectBank ldrb r1, [r1] strb r1, [r2] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -50155,7 +50155,7 @@ sub_8117F60: @ 8117F60 cmp r0, 0 beq _08117F78 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08117FB4 _08117F78: ldr r0, =gTasks @@ -50165,7 +50165,7 @@ _08117F78: adds r3, r0 ldr r0, =gBattleSpritesDataPtr ldr r4, [r0] - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] ldr r1, [r4] lsls r0, 2 @@ -50209,7 +50209,7 @@ sub_8117FD0: @ 8117FD0 bne _08118014 ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r3, [r0] ldr r0, [r1] lsls r3, 2 @@ -50237,8 +50237,8 @@ _08118014: .pool thumb_func_end sub_8117FD0 - thumb_func_start lcd_bg_operations -lcd_bg_operations: @ 811802C + thumb_func_start SetAnimBgAttribute +SetAnimBgAttribute: @ 811802C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -50364,7 +50364,7 @@ _08118132: pop {r0} bx r0 .pool - thumb_func_end lcd_bg_operations + thumb_func_end SetAnimBgAttribute thumb_func_start sub_8118140 sub_8118140: @ 8118140 diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s index fc21f001f..55c7037cd 100755 --- a/asm/battle_anim_815A0D4.s +++ b/asm/battle_anim_815A0D4.s @@ -75,7 +75,7 @@ sub_815A114: @ 815A114 b _0815A15A _0815A154: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815A15A: pop {r0} bx r0 @@ -87,7 +87,7 @@ sub_815A160: @ 815A160 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -112,7 +112,7 @@ sub_815A160: @ 815A160 movs r2, 0 bl sub_807521C adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4-r6} pop {r0} bx r0 @@ -196,7 +196,7 @@ sub_815A234: @ 815A234 movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -207,7 +207,7 @@ sub_815A254: @ 815A254 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -261,7 +261,7 @@ _0815A2B2: strh r6, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 add sp, 0x4 @@ -537,7 +537,7 @@ _0815A4E0: movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815A4FE: pop {r4} pop {r0} @@ -768,7 +768,7 @@ sub_815A6C4: @ 815A6C4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] mov r5, sp adds r5, 0x2 @@ -776,7 +776,7 @@ sub_815A6C4: @ 815A6C4 mov r2, sp adds r3, r5, 0 bl sub_80A8924 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -869,7 +869,7 @@ _0815A798: cmp r0, 0x10 bne _0815A7AC adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815A7AC: pop {r0} bx r0 @@ -891,7 +891,7 @@ sub_815A7B0: @ 815A7B0 strh r0, [r4, 0x22] ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} @@ -919,7 +919,7 @@ sub_815A7EC: @ 815A7EC lsls r0, 24 cmp r0, 0 bne _0815A840 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -988,7 +988,7 @@ _0815A84C: cmp r0, 0xF0 bls _0815A8A4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815A8A4: pop {r4,r5} pop {r0} @@ -1006,7 +1006,7 @@ sub_815A8AC: @ 815A8AC cmp r0, 0 beq _0815A8C2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815A8C2: pop {r0} bx r0 @@ -1017,7 +1017,7 @@ sub_815A8C8: @ 815A8C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1034,7 +1034,7 @@ _0815A8EC: _0815A8F0: strh r0, [r1, 0xE] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -1046,7 +1046,7 @@ sub_815A904: @ 815A904 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gMoveDmgMoveAnim + ldr r0, =gAnimMoveDmg ldr r0, [r0] cmp r0, 0 ble _0815A920 @@ -1060,7 +1060,7 @@ _0815A920: _0815A924: strh r0, [r1, 0xE] adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -1235,7 +1235,7 @@ sub_815AA6C: @ 815AA6C movs r0, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1251,7 +1251,7 @@ sub_815AAA4: @ 815AAA4 ldrsh r0, [r6, r1] cmp r0, 0 bne _0815AAD0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -1380,7 +1380,7 @@ _0815ABBA: cmp r0, 0 bne _0815ABC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815ABC8: pop {r4} pop {r0} @@ -1456,7 +1456,7 @@ _0815AC40: bl SetGpuRegBits _0815AC70: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -1486,7 +1486,7 @@ sub_815AC8C: @ 815AC8C bl ClearGpuRegBits _0815ACB8: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -1502,11 +1502,11 @@ sub_815ACD0: @ 815ACD0 ldrsh r0, [r6, r1] cmp r0, 0 bne _0815ACEC - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0815ACEE .pool _0815ACEC: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0815ACEE: ldrb r0, [r4] movs r1, 0 @@ -1585,7 +1585,7 @@ sub_815AD4C: @ 815AD4C cmp r0, r1 bge _0815ADAA adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0815ADAA .pool _0815AD98: @@ -1596,7 +1596,7 @@ _0815AD98: cmp r0, r1 ble _0815ADAA adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815ADAA: pop {r0} bx r0 @@ -1618,11 +1618,11 @@ sub_815ADB0: @ 815ADB0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815ADDC - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0815ADDE .pool _0815ADDC: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0815ADDE: ldrb r0, [r4] bl sub_80A6190 @@ -1882,7 +1882,7 @@ _0815AFC4: strb r0, [r1, 0x15] _0815AFDA: adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815AFE0: pop {r4-r7} pop {r0} @@ -1903,7 +1903,7 @@ sub_815AFF0: @ 815AFF0 movs r5, 0 strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -2162,7 +2162,7 @@ _0815B220: cmp r0, 0 bne _0815B22E adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815B22E: add sp, 0x8 pop {r3} @@ -2262,7 +2262,7 @@ _0815B2D8: ldrsh r0, [r5, r1] cmp r0, 0x3D bne _0815B324 - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 ldrh r0, [r5, 0x24] @@ -2278,7 +2278,7 @@ _0815B2D8: strh r1, [r5, 0x26] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -2339,7 +2339,7 @@ _0815B37C: cmp r0, 0 bne _0815B38E adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815B38E: pop {r4,r5} pop {r0} @@ -2370,7 +2370,7 @@ _0815B3B4: beq _0815B478 b _0815B496 _0815B3BE: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -2471,7 +2471,7 @@ _0815B478: cmp r0, r1 bge _0815B496 adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815B496: pop {r4-r6} pop {r0} @@ -2482,7 +2482,7 @@ _0815B496: sub_815B49C: @ 815B49C push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2513,7 +2513,7 @@ sub_815B4D4: @ 815B4D4 ldrh r0, [r4, 0x2E] adds r0, 0x48 strh r0, [r4, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2578,7 +2578,7 @@ _0815B54C: cmp r0, r1 bls _0815B566 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815B566: pop {r4,r5} pop {r0} @@ -2747,7 +2747,7 @@ _0815B69C: cmp r0, 0 bne _0815B6AE adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815B6AE: pop {r4,r5} pop {r0} @@ -2789,7 +2789,7 @@ _0815B6F4: cmp r0, 0 bne _0815B706 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815B706: pop {r4,r5} pop {r0} @@ -2814,7 +2814,7 @@ _0815B71E: movs r0, 0x90 lsls r0, 4 strh r0, [r4, 0x30] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -2845,7 +2845,7 @@ _0815B748: cmp r0, r1 ble _0815B770 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815B770: pop {r4} pop {r0} @@ -2887,7 +2887,7 @@ _0815B7B8: cmp r0, 0 bne _0815B7CA adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815B7CA: pop {r4,r5} pop {r0} @@ -2933,7 +2933,7 @@ _0815B81C: movs r0, 0x4C movs r1, 0 bl SetGpuReg - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -2943,14 +2943,14 @@ _0815B81C: movs r0, 0x1 movs r1, 0x2 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute b _0815B84E .pool _0815B844: movs r0, 0x2 movs r1, 0x2 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815B84E: ldr r0, =gTasks mov r6, r8 @@ -2996,9 +2996,9 @@ _0815B886: _0815B8A6: b _0815BA7A _0815B8A8: - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget ldrb r1, [r1] mov r2, r8 lsls r4, r2, 2 @@ -3030,7 +3030,7 @@ _0815B8EA: adds r2, 0x4 adds r2, r0 ldr r1, =gBattleMonForms - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -3051,16 +3051,16 @@ _0815B8EA: lsls r0, 24 cmp r0, 0 beq _0815BA1C - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0, 0x18] ldrh r0, [r0] - bl sub_80DB2A8 + bl IsSpeciesNotUnown adds r4, r0, 0 ldr r0, [r5] ldr r0, [r0, 0x18] ldrh r0, [r0, 0x2] - bl sub_80DB2A8 + bl IsSpeciesNotUnown lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -3113,17 +3113,17 @@ _0815B988: cmp r5, 0x7 ble _0815B980 _0815B99C: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0, 0x2] - bl sub_80DB2A8 + bl IsSpeciesNotUnown lsls r0, 24 cmp r0, 0 beq _0815B9EC ldr r3, =gSprites ldr r4, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3139,7 +3139,7 @@ _0815B99C: _0815B9EC: ldr r3, =gSprites ldr r4, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3209,7 +3209,7 @@ _0815BA82: movs r0, 0x4C movs r1, 0 bl SetGpuReg - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -3219,20 +3219,20 @@ _0815BA82: movs r0, 0x1 movs r1, 0x2 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute b _0815BAB6 .pool _0815BAAC: movs r0, 0x2 movs r1, 0x2 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815BAB6: bl IsContest lsls r0, 24 cmp r0, 0 bne _0815BAF6 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -3259,7 +3259,7 @@ _0815BAB6: bl SetBankEnemyShadowSpriteCallback _0815BAF6: mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815BAFC: add sp, 0x10 pop {r3,r4} @@ -3279,7 +3279,7 @@ c3_80DFBE4: @ 815BB18 ldr r4, =gBattleAnimArgs ldr r3, =gSprites ldr r2, =gBankSpriteIds - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r2, [r1] @@ -3292,7 +3292,7 @@ c3_80DFBE4: @ 815BB18 lsls r1, 29 lsrs r1, 31 strh r1, [r4, 0xE] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -3305,14 +3305,14 @@ sub_815BB58: @ 815BB58 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget ldrb r1, [r1] movs r2, 0x1 bl sub_805E448 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -3361,11 +3361,11 @@ _0815BBC8: movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -3373,7 +3373,7 @@ _0815BBC8: movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815BC02: mov r0, sp bl sub_80A6B30 @@ -3390,7 +3390,7 @@ _0815BC02: b _0815BC5C .pool _0815BC34: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3571,12 +3571,12 @@ _0815BDA6: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815BDC8: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute ldr r0, =gBattle_BG1_X movs r1, 0 strh r1, [r0] @@ -3589,7 +3589,7 @@ _0815BDC8: movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815BDF2: add sp, 0x10 pop {r4} @@ -3621,7 +3621,7 @@ sub_815BE04: @ 815BE04 lsls r0, 16 lsrs r5, r0, 16 _0815BE2E: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -3870,7 +3870,7 @@ sub_815BFF4: @ 815BFF4 adds r0, r5 bl DestroySprite adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815C040: pop {r4-r6} pop {r0} @@ -3966,11 +3966,11 @@ _0815C0EC: movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute bl IsContest lsls r0, 24 cmp r0, 0 @@ -3978,7 +3978,7 @@ _0815C0EC: movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815C124: mov r0, sp bl sub_80A6B30 @@ -3996,7 +3996,7 @@ _0815C124: b _0815C1CA .pool _0815C15C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 @@ -4085,7 +4085,7 @@ _0815C224: adds r5, r0, r1 movs r0, 0 strh r0, [r5, 0xE] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4229,12 +4229,12 @@ _0815C34A: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0815C36C: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute ldr r0, =gBattle_BG1_X movs r1, 0 strh r1, [r0] @@ -4247,7 +4247,7 @@ _0815C36C: movs r1, 0 bl SetGpuReg adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815C396: add sp, 0x10 pop {r4-r6} @@ -4291,7 +4291,7 @@ _0815C3E8: cmp r0, 0 bne _0815C3FA adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815C3FA: pop {r4,r5} pop {r0} @@ -4325,7 +4325,7 @@ _0815C41E: ldrh r0, [r4, 0x32] adds r0, 0x80 strh r0, [r4, 0x32] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4354,7 +4354,7 @@ _0815C456: cmp r0, 0x40 ble _0815C472 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815C472: pop {r4} pop {r0} @@ -4377,7 +4377,7 @@ sub_815C478: @ 815C478 cmp r0, 0 bne _0815C4A4 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0815C538 .pool _0815C4A4: @@ -4427,11 +4427,11 @@ _0815C4BC: ldrsh r0, [r5, r1] cmp r0, 0 bne _0815C508 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815C50A .pool _0815C508: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815C50A: ldrb r0, [r0] bl GetBankSide @@ -4632,7 +4632,7 @@ _0815C698: lsrs r0, 24 bl sub_80A7344 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815C6A8: pop {r4-r6} pop {r0} @@ -4643,7 +4643,7 @@ _0815C6A8: sub_815C6B0: @ 815C6B0 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4683,7 +4683,7 @@ sub_815C700: @ 815C700 ldrh r0, [r4, 0x2E] adds r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4700,7 +4700,7 @@ sub_815C700: @ 815C700 cmp r1, 0xF0 ble _0815C732 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815C732: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -4720,7 +4720,7 @@ _0815C744: cmp r1, 0 bge _0815C75C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815C75C: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -4909,7 +4909,7 @@ _0815C8C8: lsrs r0, 24 bl sub_80A7344 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0815C950 _0815C8DA: ldrh r0, [r7, 0x26] @@ -4991,7 +4991,7 @@ sub_815C95C: @ 815C95C ldrsh r0, [r6, r2] cmp r0, 0 bne _0815C990 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -5070,7 +5070,7 @@ _0815C9FA: cmp r0, 0 beq _0815CA1A adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815CA1A: pop {r4-r6} pop {r0} @@ -5100,11 +5100,11 @@ sub_815CA20: @ 815CA20 mov r8, r0 cmp r1, 0 bne _0815CA5C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815CA5E .pool _0815CA5C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815CA5E: ldrb r0, [r0] strh r0, [r2, 0x1E] @@ -5239,7 +5239,7 @@ _0815CB50: strh r4, [r0, 0x24] strh r4, [r0, 0x26] adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815CB78: pop {r3} mov r8, r3 @@ -5379,7 +5379,7 @@ _0815CC7A: cmp r0, 0x1F bne _0815CC8E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815CC8E: pop {r4} pop {r0} @@ -5516,7 +5516,7 @@ _0815CD82: movs r0, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815CDAA: pop {r4} pop {r0} @@ -5528,7 +5528,7 @@ _0815CDAA: sub_815CDB4: @ 815CDB4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -5586,14 +5586,14 @@ sub_815CDFC: @ 815CDFC cmp r0, 0xC3 ble _0815CE48 _0815CE36: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 b _0815CE52 .pool _0815CE48: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 @@ -5654,7 +5654,7 @@ _0815CE98: cmp r0, r1 bne _0815CEC8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815CEC8: pop {r4} pop {r0} @@ -5681,7 +5681,7 @@ sub_815CED8: @ 815CED8 beq _0815CF18 movs r0, 0x1 str r0, [sp, 0x1C] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldr r1, [r0, 0x10] @@ -5693,7 +5693,7 @@ sub_815CED8: @ 815CED8 b _0815D058 .pool _0815CF18: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5702,7 +5702,7 @@ _0815CF18: movs r0, 0 str r0, [sp, 0x1C] ldr r6, =gBattlePartyID - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -5770,7 +5770,7 @@ _0815CFC4: movs r2, 0x1 str r2, [sp, 0x1C] ldr r6, =gBattlePartyID - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -5834,12 +5834,12 @@ _0815D056: _0815D058: mov r10, r3 _0815D05A: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -5864,7 +5864,7 @@ _0815D05A: str r3, [sp, 0x8] mov r0, r8 str r0, [sp, 0xC] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] str r0, [sp, 0x10] movs r0, 0x1 @@ -6072,11 +6072,11 @@ sub_815D240: @ 815D240 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815D26C - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815D26E .pool _0815D26C: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815D26E: ldrb r5, [r0] movs r6, 0 @@ -6536,7 +6536,7 @@ _0815D62E: b _0815D63C _0815D636: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815D63C: add sp, 0x14 pop {r3-r5} @@ -6643,7 +6643,7 @@ _0815D708: cmp r0, 0 bne _0815D720 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815D720: pop {r4-r6} pop {r0} @@ -6827,7 +6827,7 @@ sub_815D870: @ 815D870 ldrb r1, [r6] adds r0, r5, 0 bl StartSpriteAffineAnim - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6837,7 +6837,7 @@ sub_815D870: @ 815D870 negs r0, r0 strh r0, [r6, 0x2] _0815D896: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -7238,7 +7238,7 @@ sub_815DB90: @ 815DB90 mov r1, r8 adds r4, r0, r1 ldr r1, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -7361,7 +7361,7 @@ sub_815DCA4: @ 815DCA4 cmp r0, 0 bne _0815DCC4 adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815DCC4: movs r0, 0 strh r0, [r5, 0x8] @@ -7373,11 +7373,11 @@ _0815DCC4: ldrsh r0, [r4, r1] cmp r0, 0 bne _0815DCE8 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815DCEA .pool _0815DCE8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815DCEA: ldrb r4, [r0] adds r0, r4, 0 @@ -7485,7 +7485,7 @@ _0815DDCC: cmp r0, 0 bne _0815DDDA adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815DDDA: pop {r4,r5} pop {r0} @@ -7731,7 +7731,7 @@ _0815DFB4: movs r3, 0 bl BlendPalette adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815DFC6: pop {r4,r5} pop {r0} @@ -7746,7 +7746,7 @@ sub_815DFCC: @ 815DFCC lsrs r0, 24 movs r2, 0xD0 lsls r2, 1 - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker ldrb r3, [r1] ldr r1, =gBattleAnimArgs ldrb r1, [r1] @@ -7775,7 +7775,7 @@ sub_815DFCC: @ 815DFCC sub_815E01C: @ 815E01C push {r4-r6,lr} adds r5, r0, 0 - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -7837,7 +7837,7 @@ _0815E09A: lsls r0, 2 strh r0, [r5, 0x2E] _0815E0A8: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -7887,7 +7887,7 @@ sub_815E0DC: @ 815E0DC cmp r0, 0xE bne _0815E110 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815E110: pop {r0} bx r0 @@ -7923,7 +7923,7 @@ _0815E144: strh r0, [r6, 0x14] strh r1, [r6, 0x16] _0815E14E: - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -7968,7 +7968,7 @@ _0815E1A8: subs r0, r4, r0 _0815E1AC: strh r0, [r6, 0x1E] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x3 bl sub_80A5C6C @@ -7987,7 +7987,7 @@ _0815E1D0: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x20] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -8163,7 +8163,7 @@ _0815E330: cmp r0, 0 bne _0815E33E adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815E33E: add sp, 0x14 pop {r3} @@ -8319,7 +8319,7 @@ sub_815E444: @ 815E444 strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 ldr r0, =sub_80A70C0 @@ -8345,7 +8345,7 @@ sub_815E47C: @ 815E47C lsls r0, 3 ldr r1, =gTasks adds r7, r0, r1 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] movs r1, 0x2 @@ -8360,7 +8360,7 @@ sub_815E47C: @ 815E47C lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x20] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget mov r8, r0 ldrb r0, [r0] movs r1, 0x2 @@ -8471,7 +8471,7 @@ _0815E596: .pool _0815E5B8: mov r0, r9 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815E5BE: pop {r3-r5} mov r8, r3 @@ -8609,7 +8609,7 @@ _0815E6BE: .pool _0815E6CC: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815E6D2: pop {r4,r5} pop {r0} @@ -8626,11 +8626,11 @@ sub_815E6D8: @ 815E6D8 adds r6, r0, 0 cmp r1, 0 bne _0815E6F4 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815E6F6 .pool _0815E6F4: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815E6F6: ldrb r5, [r0] ldrh r2, [r4, 0x4] @@ -8798,7 +8798,7 @@ _0815E802: b _0815E83C _0815E836: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815E83C: pop {r0} bx r0 @@ -8815,7 +8815,7 @@ sub_815E840: @ 815E840 cmp r0, 0 bne _0815E85C adds r0, r1, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0815E884 .pool _0815E85C: @@ -8926,7 +8926,7 @@ _0815E8F2: .pool _0815E948: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815E94E: pop {r4-r6} pop {r0} @@ -8942,11 +8942,11 @@ sub_815E954: @ 815E954 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815E970 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker b _0815E972 .pool _0815E970: - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget _0815E972: ldrb r0, [r4] movs r1, 0x2 @@ -9023,7 +9023,7 @@ sub_815E9BC: @ 815E9BC cmp r0, 0 bne _0815EA10 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815EA10: pop {r0} bx r0 @@ -9308,7 +9308,7 @@ _0815EC1E: cmp r0, 0x5 bne _0815EC40 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815EC40: pop {r4} pop {r0} @@ -9339,7 +9339,7 @@ sub_815EC48: @ 815EC48 lsrs r7, r0, 24 cmp r7, 0x1 bne _0815ECB4 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -9363,7 +9363,7 @@ _0815ECAC: b _0815ECD2 .pool _0815ECB4: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -9586,7 +9586,7 @@ _0815EE60: movs r1, 0 strh r1, [r0, 0x24] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815EE78: pop {r4} pop {r0} @@ -9606,11 +9606,11 @@ sub_815EE84: @ 815EE84 adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _0815EEAA .pool _0815EEA8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _0815EEAA: ldrb r0, [r0] strh r0, [r4, 0x3C] @@ -9915,7 +9915,7 @@ _0815F0F8: b _0815F106 _0815F100: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815F106: pop {r4,r5} pop {r0} @@ -9976,7 +9976,7 @@ _0815F16A: cmp r1, r0 bne _0815F17C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815F17C: ldrh r0, [r4, 0x38] adds r0, 0x1 @@ -9991,7 +9991,7 @@ _0815F17C: sub_815F18C: @ 815F18C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -10126,7 +10126,7 @@ _0815F2A0: b _0815F310 .pool _0815F2AC: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl refresh_graphics_maybe @@ -10348,7 +10348,7 @@ _0815F460: movs r0, 0x7D bl PlaySE12WithPanning adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815F482: pop {r4-r6} pop {r0} @@ -10360,7 +10360,7 @@ _0815F482: sub_815F48C: @ 815F48C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -10384,7 +10384,7 @@ _0815F4B8: strb r0, [r1] ldr r4, =0x0000ffa0 _0815F4C8: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -10543,7 +10543,7 @@ _0815F5E0: cmp r0, 0x7 bne _0815F61A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815F61A: pop {r4,r5} pop {r0} @@ -10589,7 +10589,7 @@ sub_815F620: @ 815F620 bl obj_delete_but_dont_free_vram _0815F66E: mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0815F780 .pool _0815F67C: @@ -10639,7 +10639,7 @@ _0815F67C: strh r1, [r0, 0x8] ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -10742,7 +10742,7 @@ sub_815F79C: @ 815F79C cmp r0, 0 bne _0815F7BA adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815F7BA: pop {r0} bx r0 @@ -10764,7 +10764,7 @@ sub_815F7C4: @ 815F7C4 strh r0, [r4, 0x30] ldr r0, =gBattleSpritesDataPtr ldr r1, [r0] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -10869,7 +10869,7 @@ sub_815F8A0: @ 815F8A0 ldr r3, =gBattleAnimArgs movs r2, 0 strh r2, [r3, 0xE] - ldr r1, =gHappinessMoveAnim + ldr r1, =gAnimFriendship ldrb r0, [r1] ldrb r1, [r1] adds r0, r1, 0 @@ -10899,7 +10899,7 @@ _0815F8D4: strh r0, [r3, 0xE] _0815F8E0: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -10958,7 +10958,7 @@ _0815F940: ldrh r1, [r6, 0xA] adds r0, r1 strh r0, [r6, 0xA] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11028,7 +11028,7 @@ _0815F9F4: lsls r0, 24 cmp r0, 0 beq _0815FA28 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldr r2, [r0, 0x8] @@ -11036,7 +11036,7 @@ _0815F9F4: ldr r3, [r0, 0xC] mov r9, r3 ldrh r6, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -11045,7 +11045,7 @@ _0815F9F4: b _0815FB4E .pool _0815FA28: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -11177,7 +11177,7 @@ _0815FB2E: _0815FB4E: ldr r5, =0x0000ffe0 _0815FB50: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -11191,7 +11191,7 @@ _0815FB50: str r4, [sp, 0x8] mov r0, r9 str r0, [sp, 0xC] - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] str r0, [sp, 0x10] movs r0, 0 @@ -11253,7 +11253,7 @@ _0815FBE8: ldrh r2, [r6, 0xA] adds r0, r2 strh r0, [r6, 0xA] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11307,7 +11307,7 @@ _0815FC56: ldrsh r0, [r6, r1] cmp r0, 0 bne _0815FCD6 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11315,7 +11315,7 @@ _0815FC56: bne _0815FCB4 lsls r4, r5, 16 asrs r4, 16 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -11328,7 +11328,7 @@ _0815FC56: _0815FCB4: lsls r4, r5, 16 asrs r4, 16 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -11383,7 +11383,7 @@ _0815FD08: ldr r5, =gSprites adds r0, r5 bl sub_80A8610 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11440,7 +11440,7 @@ _0815FD8C: ldrh r3, [r2, 0xA] adds r0, r3 strh r0, [r2, 0xA] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x18] @@ -11524,7 +11524,7 @@ _0815FE44: cmp r0, 0 bne _0815FE68 mov r0, r8 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815FE68: add sp, 0x1C pop {r3-r5} @@ -11563,7 +11563,7 @@ _0815FE92: asrs r1, 24 movs r0, 0x7A bl PlaySE12WithPanning - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -11583,7 +11583,7 @@ _0815FE92: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11652,7 +11652,7 @@ _0815FF6E: ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11683,7 +11683,7 @@ _0815FFA8: cmp r0, 0x2 bne _0815FFBC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0815FFBC: pop {r4} pop {r0} @@ -11721,14 +11721,14 @@ _0815FFF4: .4byte _081600CC .4byte _08160132 _08160008: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -11756,7 +11756,7 @@ _0816003E: .pool _08160058: ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -11812,7 +11812,7 @@ _081600B4: b _08160150 _081600CC: ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -11862,7 +11862,7 @@ _0816012A: b _08160150 _08160132: ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -11874,7 +11874,7 @@ _08160132: movs r1, 0 strh r1, [r0, 0x24] adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08160150: pop {r4,r5} pop {r0} @@ -11898,7 +11898,7 @@ sub_8160164: @ 8160164 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0xE] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12061,7 +12061,7 @@ _081602C4: .pool _081602D4: adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081602DA: pop {r4-r6} pop {r0} @@ -12072,7 +12072,7 @@ _081602DA: sub_81602E0: @ 81602E0 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12100,7 +12100,7 @@ sub_81602E0: @ 81602E0 cmp r0, 0 beq _08160326 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08160326: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -12115,7 +12115,7 @@ _08160326: sub_8160338: @ 8160338 push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12166,7 +12166,7 @@ _08160396: sub_81603A8: @ 81603A8 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -12377,7 +12377,7 @@ _08160536: strh r0, [r2, 0xE] _08160538: adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 thumb_func_end sub_81604F0 @@ -12477,7 +12477,7 @@ _08160600: cmp r0, 0 bne _08160618 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08160618: pop {r4-r6} pop {r0} diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index dd992a8cd..1e90e60c7 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -16,7 +16,7 @@ sub_8170478: @ 8170478 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r4, [r0] ldr r0, =gBattle_WIN0H movs r1, 0 @@ -43,19 +43,19 @@ sub_8170478: @ 8170478 movs r0, 0x1 movs r1, 0x4 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0x1 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute ldr r0, =gHealthBoxesIds adds r4, r0 ldrb r0, [r4] @@ -212,7 +212,7 @@ sub_8170660: @ 8170660 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] mov r8, r0 ldr r1, =gTasks @@ -335,7 +335,7 @@ _08170708: movs r0, 0x1 movs r1, 0x3 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _0817076C: movs r0, 0 bl GetGpuReg @@ -372,7 +372,7 @@ _0817076C: movs r0, 0x1 movs r1, 0x1 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute ldr r0, =gHealthBoxesIds add r0, r8 ldrb r0, [r0] @@ -412,7 +412,7 @@ _0817076C: orrs r2, r5 strb r2, [r0, 0x5] adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08170814: pop {r3} mov r8, r3 @@ -540,12 +540,12 @@ sub_8170920: @ 8170920 lsrs r4, 24 mov r1, sp adds r1, 0x1 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r2, [r0] mov r0, sp bl sub_8170834 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask add sp, 0x4 pop {r4} pop {r0} @@ -628,11 +628,11 @@ sub_81709EC: @ 81709EC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl sub_817094C adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -752,7 +752,7 @@ _08170AD6: cmp r0, 0 bne _08170AF8 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08170AF8: pop {r4-r6} pop {r0} @@ -766,7 +766,7 @@ sub_8170B04: @ 8170B04 lsls r0, 24 lsrs r6, r0, 24 ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r5, [r0] @@ -834,7 +834,7 @@ _08170B84: orrs r1, r2 strb r1, [r0] adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08170BA4: pop {r4-r6} pop {r0} @@ -852,7 +852,7 @@ sub_8170BB0: @ 8170BB0 lsls r0, 24 lsrs r5, r0, 24 ldr r1, =gBankSpriteIds - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] @@ -904,7 +904,7 @@ _08170C08: b _08170CEE .pool _08170C44: - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -979,7 +979,7 @@ _08170CC4: cmp r0, 0 bne _08170CEE adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08170CEE: add sp, 0xC pop {r3,r4} @@ -1003,7 +1003,7 @@ sub_8170CFC: @ 8170CFC lsrs r0, 24 bl sub_8076A78 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -1023,7 +1023,7 @@ sub_8170D24: @ 8170D24 lsrs r0, 24 bl sub_8076AE8 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -1051,7 +1051,7 @@ _08170D70: _08170D74: strh r0, [r1, 0xE] adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -1162,7 +1162,7 @@ sub_8170E04: @ 8170E04 adds r6, r4, r1 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0 @@ -1246,7 +1246,7 @@ sub_8170EF0: @ 8170EF0 cmp r1, r0 bne _08170F1A adds r0, r3, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08170F1A: pop {r0} bx r0 @@ -1313,7 +1313,7 @@ _08170F54: adds r6, r4, r0 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget mov r8, r1 ldrb r0, [r1] movs r1, 0 @@ -1550,7 +1550,7 @@ _08171188: movs r2, 0x1 movs r3, 0x1C bl sub_8171D98 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r1, [r0] movs r0, 0 movs r2, 0xE @@ -1585,7 +1585,7 @@ sub_81711E8: @ 81711E8 str r0, [r4, 0x1C] ldr r2, =gSprites ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1607,7 +1607,7 @@ sub_8171240: @ 8171240 push {r4-r7,lr} adds r7, r0, 0 ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r4, [r0] @@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8 push {r7} sub sp, 0x4 adds r6, r0, 0 - ldr r7, =gAnimationBankTarget + ldr r7, =gAnimBankTarget ldrh r0, [r6, 0x36] adds r0, 0x1 movs r1, 0 @@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4 movs r2, 0x1 movs r3, 0x1C bl sub_8171D98 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r1, [r0] movs r0, 0x1 movs r2, 0xE @@ -2724,7 +2724,7 @@ sub_8171AE4: @ 8171AE4 _08171B36: ldr r6, =gSprites ldr r5, =gBankSpriteIds - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -2792,7 +2792,7 @@ sub_8171BAC: @ 8171BAC _08171BCA: ldr r4, =gSprites ldr r3, =gBankSpriteIds - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -2841,7 +2841,7 @@ _08171C24: beq _08171C8A ldr r4, =gSprites ldr r3, =gBankSpriteIds - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -4730,7 +4730,7 @@ sub_8172BF0: @ 8172BF0 movs r0, 0 mov r8, r0 ldr r0, =gBankSpriteIds - ldr r3, =gAnimationBankAttacker + ldr r3, =gAnimBankAttacker ldrb r2, [r3] adds r0, r2, r0 ldrb r6, [r0] @@ -4877,7 +4877,7 @@ _08172D28: adds r0, r1 ldrb r1, [r0, 0x8] strh r1, [r0, 0x8] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4914,7 +4914,7 @@ _08172D7E: beq _08172D8A _08172D84: adds r0, r7, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08172D8A: pop {r3} mov r8, r3 @@ -4949,7 +4949,7 @@ _08172DC0: beq _08172E4E b _08172E84 _08172DC6: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -5010,7 +5010,7 @@ _08172E14: b _08172E84 _08172E4E: ldr r1, =gBankSpriteIds - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -5032,7 +5032,7 @@ _08172E4E: ldrb r0, [r4] bl sub_805E974 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08172E84: pop {r4,r5} pop {r0} @@ -5048,7 +5048,7 @@ sub_8172E9C: @ 8172E9C ldr r3, =gBattleAnimArgs ldr r1, =gBattleSpritesDataPtr ldr r2, [r1] - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker ldrb r1, [r1] ldr r2, [r2] lsls r1, 2 @@ -5057,7 +5057,7 @@ sub_8172E9C: @ 8172E9C lsls r1, 29 lsrs r1, 31 strh r1, [r3, 0xE] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -5068,11 +5068,11 @@ sub_8172ED0: @ 8172ED0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gAnimationBankTarget + ldr r2, =gAnimBankTarget ldr r1, =gEffectBank ldrb r1, [r1] strb r1, [r2] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0 bl GetMonData adds r4, r0, 0 adds r0, r6, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _08172FC8 @@ -5540,7 +5540,7 @@ sub_81732B0: @ 81732B0 ldr r0, =0x0000281d bl IndexOfSpritePaletteTag adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -5559,7 +5559,7 @@ sub_81732E4: @ 81732E4 adds r0, r5, 0 bl FreeSpritePaletteByTag adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -5603,7 +5603,7 @@ sub_817330C: @ 817330C bl sub_80A68D4 ldr r2, =gSprites ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5628,7 +5628,7 @@ sub_817339C: @ 817339C adds r3, r0, 0 ldr r2, =gSprites ldr r1, =gBankSpriteIds - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5679,7 +5679,7 @@ sub_8173400: @ 8173400 adds r4, r0, 0 ldr r5, =gSprites ldr r3, =gBankSpriteIds - ldr r2, =gAnimationBankAttacker + ldr r2, =gAnimBankAttacker ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -5708,7 +5708,7 @@ sub_8173400: @ 8173400 movs r1, 0 bl StartSpriteAnim adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08173448: pop {r4,r5} pop {r0} @@ -5733,7 +5733,7 @@ sub_817345C: @ 817345C _08173478: movs r0, 0 bl GetBankByIdentity - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 b _08173498 @@ -5741,16 +5741,16 @@ _08173478: _0817348C: movs r0, 0x1 bl GetBankByIdentity - ldr r1, =gAnimationBankAttacker + ldr r1, =gAnimBankAttacker strb r0, [r1] movs r0, 0 _08173498: bl GetBankByIdentity - ldr r1, =gAnimationBankTarget + ldr r1, =gAnimBankTarget strb r0, [r1] _081734A0: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -5801,7 +5801,7 @@ _08173508: _0817350C: strh r0, [r1] adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -5812,18 +5812,18 @@ sub_817351C: @ 817351C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, =gAnimationBankAttacker + ldr r3, =gAnimBankAttacker ldr r1, =gBattleSpritesDataPtr ldr r2, [r1] ldr r1, [r2, 0x8] ldrh r1, [r1] strb r1, [r3] - ldr r3, =gAnimationBankTarget + ldr r3, =gAnimBankTarget ldr r1, [r2, 0x8] ldrh r1, [r1] lsrs r1, 8 strb r1, [r3] - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s index 698230802..27b7a8013 100644 --- a/asm/battle_anim_sound_tasks.s +++ b/asm/battle_anim_sound_tasks.s @@ -142,7 +142,7 @@ sub_8158C04: @ 8158C04 cmp r0, 0x2 bne _08158C4C adds r0, r5, 0 - bl move_anim_related_task_del + bl DestroyAnimSoundTask _08158C4C: pop {r4,r5} pop {r0} @@ -264,7 +264,7 @@ sub_8158D08: @ 8158D08 cmp r0, 0 bne _08158D50 adds r0, r5, 0 - bl move_anim_related_task_del + bl DestroyAnimSoundTask b _08158D82 .pool _08158D50: @@ -319,7 +319,7 @@ sub_8158D8C: @ 8158D8C ldrsh r0, [r0, r1] cmp r0, 0 bne _08158DC8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] @@ -327,7 +327,7 @@ sub_8158D8C: @ 8158D8C .pool _08158DC8: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08158E76 _08158DD0: ldr r0, =gBattleAnimArgs @@ -336,25 +336,25 @@ _08158DD0: adds r2, r0, 0 cmp r1, 0 bne _08158DEC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r4, [r0] b _08158E12 .pool _08158DEC: cmp r1, 0x1 bne _08158DFC - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r4, [r0] b _08158E12 .pool _08158DFC: cmp r1, 0x2 bne _08158E08 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08158E0A .pool _08158E08: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08158E0A: ldrb r1, [r0] movs r0, 0x2 @@ -369,12 +369,12 @@ _08158E12: bne _08158E38 _08158E1E: adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _08158E38 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08158E8C .pool _08158E38: @@ -416,7 +416,7 @@ _08158E76: bl PlayCry3 _08158E86: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08158E8C: pop {r4-r6} pop {r0} @@ -444,7 +444,7 @@ sub_8158E9C: @ 8158E9C ldrsh r0, [r0, r1] cmp r0, 0 bne _08158ED8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] @@ -452,7 +452,7 @@ sub_8158E9C: @ 8158E9C .pool _08158ED8: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08158F86 _08158EE0: ldr r0, =gBattleAnimArgs @@ -461,25 +461,25 @@ _08158EE0: adds r2, r0, 0 cmp r1, 0 bne _08158EFC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r4, [r0] b _08158F22 .pool _08158EFC: cmp r1, 0x1 bne _08158F0C - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r4, [r0] b _08158F22 .pool _08158F0C: cmp r1, 0x2 bne _08158F18 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _08158F1A .pool _08158F18: - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _08158F1A: ldrb r1, [r0] movs r0, 0x2 @@ -494,12 +494,12 @@ _08158F22: bne _08158F48 _08158F2E: adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _08158F48 adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _08158FEE .pool _08158F48: @@ -571,7 +571,7 @@ _08158FD0: .pool _08158FE8: adds r0, r6, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08158FEE: pop {r4-r6} pop {r0} @@ -620,7 +620,7 @@ _08159028: movs r2, 0xA bl PlayCry3 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _0815906A _0815904E: bl IsCryPlaying @@ -633,7 +633,7 @@ _0815904E: movs r2, 0x8 bl PlayCry3 mov r0, r9 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815906A: pop {r3,r4} mov r8, r3 @@ -669,7 +669,7 @@ _081590A0: cmp r0, 0 bne _081590B0 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _081590B0: pop {r4} pop {r0} @@ -698,14 +698,14 @@ sub_81590B8: @ 81590B8 lsls r0, 24 cmp r0, 0 beq _081590F8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] b _08159102 .pool _081590F8: - ldr r1, =gUnknown_02038438 - ldr r0, =gAnimationBankAttacker + ldr r1, =gAnimSpeciesByBanks + ldr r0, =gAnimBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -728,7 +728,7 @@ _08159102: .pool _08159130: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08159136: pop {r4,r5} pop {r0} @@ -829,7 +829,7 @@ _081591F2: bl PlayCry3 _081591FE: adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _08159204: pop {r3} mov r8, r3 @@ -856,7 +856,7 @@ sub_8159210: @ 8159210 adds r0, r5, 0 bl PlaySE1WithPanning adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -881,7 +881,7 @@ sub_8159244: @ 8159244 adds r0, r5, 0 bl PlaySE2WithPanning adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4,r5} pop {r0} bx r0 @@ -995,7 +995,7 @@ _08159342: cmp r1, r0 bne _0815935A adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _0815935A: pop {r4,r5} pop {r0} diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index bf350a8bc..85794d9e8 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -276,7 +276,7 @@ _080645CA: ldrb r1, [r7] movs r0, 0x2 eors r0, r1 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _0806469C @@ -4729,7 +4729,7 @@ _08066D32: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, =gMovePowerMoveAnim + ldr r3, =gAnimMovePower ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4743,7 +4743,7 @@ _08066D32: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, =gMoveDmgMoveAnim + ldr r3, =gAnimMoveDmg ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4769,7 +4769,7 @@ _08066D32: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, =gHappinessMoveAnim + ldr r2, =gAnimFriendship ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -4791,7 +4791,7 @@ _08066D32: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, =gDisableStructMoveAnim + ldr r7, =gAnimDisableStructPtr ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4928,7 +4928,7 @@ _08066F08: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6080,7 +6080,7 @@ sub_80678D0: @ 80678D0 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _08067916 diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s index b26943cf5..954abc779 100644 --- a/asm/battle_controller_linkpartner.s +++ b/asm/battle_controller_linkpartner.s @@ -4038,7 +4038,7 @@ _0814D2CE: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, =gMovePowerMoveAnim + ldr r3, =gAnimMovePower ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4052,7 +4052,7 @@ _0814D2CE: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, =gMoveDmgMoveAnim + ldr r3, =gAnimMoveDmg ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4078,7 +4078,7 @@ _0814D2CE: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, =gHappinessMoveAnim + ldr r2, =gAnimFriendship ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -4100,7 +4100,7 @@ _0814D2CE: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, =gDisableStructMoveAnim + ldr r7, =gAnimDisableStructPtr ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -4237,7 +4237,7 @@ _0814D4A4: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -5474,7 +5474,7 @@ sub_814DF40: @ 814DF40 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _0814DF86 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index 424e4159d..c32ba8938 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -4877,7 +4877,7 @@ _08061C8A: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4891,7 +4891,7 @@ _08061C8A: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4917,7 +4917,7 @@ _08061C8A: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4939,7 +4939,7 @@ _08061C8A: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -5068,7 +5068,7 @@ _08061E48: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6535,7 +6535,7 @@ sub_8062AD0: @ 8062AD0 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _08062B16 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 047c62f6b..a4dcf0a52 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -8142,7 +8142,7 @@ _0805BCBE: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, =gMovePowerMoveAnim + ldr r3, =gAnimMovePower ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8156,7 +8156,7 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, =gMoveDmgMoveAnim + ldr r3, =gAnimMoveDmg ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8182,7 +8182,7 @@ _0805BCBE: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, =gHappinessMoveAnim + ldr r2, =gAnimFriendship ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -8204,7 +8204,7 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, =gDisableStructMoveAnim + ldr r7, =gAnimDisableStructPtr ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -8341,7 +8341,7 @@ _0805BE94: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -10172,7 +10172,7 @@ dp01t_33_1_enemy_move: @ 805CEF4 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _0805CF3A diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index 35ee3a733..8da3eac54 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -4658,7 +4658,7 @@ _081BD7A2: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4672,7 +4672,7 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4698,7 +4698,7 @@ _081BD7A2: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4720,7 +4720,7 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4849,7 +4849,7 @@ _081BD960: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6207,7 +6207,7 @@ sub_81BE53C: @ 81BE53C push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _081BE582 diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s index 562b55d4d..b52aafcea 100644 --- a/asm/battle_controller_recorded_opponent.s +++ b/asm/battle_controller_recorded_opponent.s @@ -4414,7 +4414,7 @@ _08188BE6: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4428,7 +4428,7 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4454,7 +4454,7 @@ _08188BE6: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4476,7 +4476,7 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4605,7 +4605,7 @@ _08188DA4: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -5819,7 +5819,7 @@ sub_8189800: @ 8189800 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _08189846 diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s index f7dfc0fed..6b2710b8e 100644 --- a/asm/battle_controller_recorded_player.s +++ b/asm/battle_controller_recorded_player.s @@ -4514,7 +4514,7 @@ _0818C192: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4528,7 +4528,7 @@ _0818C192: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4554,7 +4554,7 @@ _0818C192: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4576,7 +4576,7 @@ _0818C192: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4705,7 +4705,7 @@ _0818C350: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6003,7 +6003,7 @@ sub_818CE98: @ 818CE98 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _0818CEDE diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index de17547a1..2a45ccb3e 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3322,7 +3322,7 @@ sub_816A144: @ 816A144 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3336,7 +3336,7 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3362,7 +3362,7 @@ sub_816A144: @ 816A144 lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3384,7 +3384,7 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3505,7 +3505,7 @@ _0816A2F6: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] diff --git a/asm/contest.s b/asm/contest.s index eebe557e5..51dc80176 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -138,7 +138,7 @@ sub_80D779C: @ 80D779C _080D77BA: lsls r0, r4, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] lsls r2, r4, 2 adds r1, 0x24 @@ -224,7 +224,7 @@ _080D7848: thumb_func_start sub_80D787C sub_80D787C: @ 80D787C push {r4-r7,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -244,7 +244,7 @@ _080D7890: cmp r5, 0x3 ble _080D7890 movs r4, 0 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources movs r5, 0x3 _080D78AA: ldr r0, [r6] @@ -257,7 +257,7 @@ _080D78AA: subs r5, 0x1 cmp r5, 0 bge _080D78AA - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources movs r7, 0x4 negs r7, r7 movs r6, 0xFF @@ -287,7 +287,7 @@ _080D78CC: subs r5, 0x1 cmp r5, 0 bge _080D78CC - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x8] movs r1, 0 @@ -339,7 +339,7 @@ _080D7942: cmp r5, 0x3 ble _080D7942 bl sub_80DD590 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x1C] movs r1, 0 @@ -354,7 +354,7 @@ _080D7942: thumb_func_start sub_80D7988 sub_80D7988: @ 80D7988 push {r4,r5,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources movs r0, 0x40 bl AllocZeroed str r0, [r4] @@ -441,7 +441,7 @@ sub_80D7988: @ 80D7988 thumb_func_start sub_80D7A5C sub_80D7A5C: @ 80D7A5C push {r4,r5,lr} - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0] bl Free @@ -590,7 +590,7 @@ _080D7BD4: strb r0, [r6] b _080D7C56 _080D7BDA: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] adds r0, 0x59 @@ -628,7 +628,7 @@ _080D7C04: ldr r0, =sub_80D7C7C movs r1, 0xA bl CreateTask - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0x8] @@ -840,7 +840,7 @@ sub_80D7DE8: @ 80D7DE8 bl GetMultiplayerId adds r0, r4, 0 bl DestroyTask - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -973,7 +973,7 @@ _080D7F40: bl CopyToBgTilemapBuffer movs r0, 0x2 bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x2C] ldr r2, =0x0201aa04 @@ -1038,7 +1038,7 @@ _080D8004: bl sub_80DBF90 bl sub_80DB2BC bl sub_80DB120 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] movs r4, 0 @@ -1256,7 +1256,7 @@ _080D81FA: b _080D822C .pool _080D8208: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -1401,7 +1401,7 @@ sub_80D833C: @ 80D833C str r1, [r0, 0x8] ldr r0, [r0, 0x8] ldr r0, =gStringVar1 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -1527,7 +1527,7 @@ sub_80D8490: @ 80D8490 mov r8, r0 ldr r2, =gUnknown_02039E00 + 30 mov r10, r2 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources _080D84B8: lsls r1, r6, 1 mov r0, r8 @@ -1632,7 +1632,7 @@ _080D856C: lsrs r6, r0, 24 cmp r6, 0x3 bls _080D84B8 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -1738,7 +1738,7 @@ _080D868E: movs r0, 0 bl sub_80DC490 ldr r0, =gStringVar1 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -1785,7 +1785,7 @@ _080D86E4: b _080D87FA .pool _080D8730: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -1804,7 +1804,7 @@ _080D8754: subs r0, 0x1 _080D8756: strb r0, [r1] - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -1831,7 +1831,7 @@ _080D8756: b _080D87FA .pool _080D879C: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -1851,7 +1851,7 @@ _080D87C0: adds r0, r2, 0x1 strb r0, [r1] _080D87C4: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -1967,7 +1967,7 @@ sub_80D8894: @ 80D8894 ldr r4, =gUnknown_02039F25 ldrb r0, [r4] bl sub_80DB8B8 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldrb r2, [r4] ldr r3, [r1, 0x4] @@ -2020,7 +2020,7 @@ sub_80D892C: @ 80D892C lsrs r0, 24 bl DestroyTask ldr r2, =gTasks - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -2145,7 +2145,7 @@ sub_80D8A50: @ 80D8A50 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrh r1, [r0, 0x6] @@ -2184,7 +2184,7 @@ sub_80D8A88: @ 80D8A88 asrs r0, 16 cmp r0, 0x13 ble _080D8B18 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r1, [r0] movs r0, 0 @@ -2217,7 +2217,7 @@ _080D8ADE: lsls r0, 24 lsrs r0, 24 bl sub_80DB8B8 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldrb r2, [r5] adds r2, r4 @@ -2259,7 +2259,7 @@ sub_80D8B38: @ 80D8B38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0] ldrb r6, [r0, 0x11] @@ -2348,7 +2348,7 @@ _080D8B84: _080D8C74: bl sub_80DCD48 movs r7, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0] ldr r0, [r0, 0x8] @@ -2367,7 +2367,7 @@ _080D8C92: cmp r1, r0 bne _080D8C92 _080D8C9C: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] strb r7, [r0, 0x11] @@ -2447,7 +2447,7 @@ _080D8D56: adds r0, r6, 0 bl sub_80DF080 bl sub_80DF750 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -2678,7 +2678,7 @@ _080D8F84: beq _080D8F92 bl _080DA100 _080D8F92: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] adds r0, 0x5A @@ -2719,7 +2719,7 @@ _080D8FB8: adds r0, r4, 0 bl sub_80DEAA8 adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r1, =gTasks mov r2, r8 lsls r0, r2, 2 @@ -2742,7 +2742,7 @@ _080D9010: _080D9024: adds r0, r6, 0 bl sub_80DE9B0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1] adds r0, 0x5A @@ -3173,7 +3173,7 @@ _080D939E: cmp r7, 0x3 bgt _080D9418 ldr r5, =gUnknown_02039F26 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources _080D93BC: movs r3, 0 str r3, [sp] @@ -3488,7 +3488,7 @@ _080D963C: movs r0, 0x64 bl PlaySE _080D9642: - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -3588,7 +3588,7 @@ _080D971C: beq _080D9728 bl _080DA100 _080D9728: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -3739,7 +3739,7 @@ _080D9870: bgt _080D988E bl _080DA100 _080D988E: - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources ldr r0, [r7] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -3866,7 +3866,7 @@ _080D999E: beq _080D99A8 b _080DA100 _080D99A8: - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] lsls r4, r6, 3 @@ -3898,7 +3898,7 @@ _080D99A8: .pool _080D99EC: bl sub_80DCD48 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x14] lsls r0, r6, 2 @@ -3992,7 +3992,7 @@ _080D9AAE: lsls r0, r5, 24 cmp r0, 0 ble _080D9AD2 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] ldr r2, [sp, 0x4] @@ -4013,7 +4013,7 @@ _080D9AD2: ldr r2, =gUnknown_02039E00 + 2 adds r1, r2 bl StringCopy - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r1, [r0] ldrb r0, [r1, 0x13] @@ -4374,7 +4374,7 @@ _080D9DC2: _080D9DD4: bl sub_80DB89C ldr r0, =gStringVar3 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r1, [r5] ldr r1, [r1, 0x10] ldr r1, [r1] @@ -4725,7 +4725,7 @@ sub_80DA110: @ 80DA110 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r3, [r1] ldrb r2, [r3, 0x7] @@ -4829,7 +4829,7 @@ _080DA1C6: ands r0, r1 cmp r0, 0 beq _080DA224 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -4861,7 +4861,7 @@ _080DA224: bl sub_80DBA18 b _080DA23E _080DA22E: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -4947,7 +4947,7 @@ _080DA2BA: strh r5, [r4, 0xA] b _080DA2F6 _080DA2D2: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -5082,7 +5082,7 @@ sub_80DA3CC: @ 80DA3CC ldrsh r0, [r6, r1] cmp r0, 0 bne _080DA448 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r5, =gUnknown_02039F25 ldrb r1, [r5] @@ -5255,7 +5255,7 @@ sub_80DA51C: @ 80DA51C ldrh r1, [r4] movs r0, 0xC bl SetGpuReg - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r1, [r0] ldrb r0, [r1, 0x1] @@ -5296,7 +5296,7 @@ sub_80DA5B4: @ 80DA5B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -5327,7 +5327,7 @@ sub_80DA5E8: @ 80DA5E8 strh r1, [r0] ldr r0, =gBattle_BG2_Y strh r1, [r0] - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources movs r3, 0 ldr r2, =gUnknown_02039F10 movs r1, 0x3 @@ -5350,7 +5350,7 @@ _080DA600: ands r0, r1 cmp r0, 0 bne _080DA65C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r0, =gUnknown_02039F25 ldrb r1, [r0] @@ -5553,7 +5553,7 @@ sub_80DA7EC: @ 80DA7EC movs r3, 0x10 bl BeginNormalPaletteFade ldr r2, =gTasks - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -6818,7 +6818,7 @@ _080DB1CC: strh r0, [r4, 0x2E] strh r5, [r4, 0x32] adds r0, r5, 0 - bl sub_80DB2A8 + bl IsSpeciesNotUnown lsls r0, 24 cmp r0, 0 beq _080DB278 @@ -6851,8 +6851,8 @@ _080DB280: .pool thumb_func_end sub_80DB174 - thumb_func_start sub_80DB2A8 -sub_80DB2A8: @ 80DB2A8 + thumb_func_start IsSpeciesNotUnown +IsSpeciesNotUnown: @ 80DB2A8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -6865,12 +6865,12 @@ _080DB2B6: _080DB2B8: pop {r1} bx r1 - thumb_func_end sub_80DB2A8 + thumb_func_end IsSpeciesNotUnown thumb_func_start sub_80DB2BC sub_80DB2BC: @ 80DB2BC push {r4-r6,lr} - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0, 0x24] movs r4, 0xA0 @@ -7199,7 +7199,7 @@ sub_80DB584: @ 80DB584 movs r4, 0 movs r5, 0 _080DB58A: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x4] adds r0, r5, r0 @@ -7238,7 +7238,7 @@ sub_80DB5B8: @ 80DB5B8 lsrs r1, 24 mov r8, r1 mov r10, r8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources mov r9, r0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -7365,7 +7365,7 @@ _080DB6B6: adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x4] add r0, r8 @@ -7486,7 +7486,7 @@ sub_80DB798: @ 80DB798 adds r1, 0x2 lsls r1, 24 lsrs r7, r1, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -7647,7 +7647,7 @@ _080DB8D0: .pool _080DB8F4: ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0] @@ -7674,7 +7674,7 @@ _080DB91E: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DB8B8 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1, 0x4] adds r1, r5, r1 @@ -7696,7 +7696,7 @@ sub_80DB944: @ 80DB944 mov r6, r8 push {r6,r7} sub sp, 0x8 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources mov r4, sp movs r3, 0 movs r6, 0x3 @@ -7751,7 +7751,7 @@ _080DB9A4: movs r0, 0x4 negs r0, r0 mov r9, r0 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources mov r8, r1 movs r7, 0x3 mov r12, r7 @@ -7806,7 +7806,7 @@ _080DB9F8: thumb_func_start sub_80DBA18 sub_80DBA18: @ 80DBA18 push {r4,r5,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources movs r2, 0 movs r3, 0x3 _080DBA20: @@ -7854,7 +7854,7 @@ sub_80DBA68: @ 80DBA68 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -7889,7 +7889,7 @@ sub_80DBAA0: @ 80DBAA0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources movs r0, 0 mov r8, r0 movs r1, 0x7 @@ -8092,7 +8092,7 @@ _080DBC1A: b _080DBAC0 _080DBC34: movs r6, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources movs r7, 0 movs r4, 0 _080DBC3C: @@ -8132,7 +8132,7 @@ _080DBC3C: adds r6, 0x1 cmp r6, 0x3 ble _080DBC3C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x10] ldrb r1, [r2, 0x1] @@ -8155,7 +8155,7 @@ sub_80DBCA8: @ 80DBCA8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -8626,7 +8626,7 @@ sub_80DC028: @ 80DC028 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x14] lsls r1, r2, 2 @@ -8746,7 +8746,7 @@ _080DC126: bne _080DC15C adds r0, r7, 0 bl DestroyTask - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x14] mov r2, r9 @@ -8950,7 +8950,7 @@ _080DC2C8: movs r1, 0xB4 movs r3, 0x1 bl CreateSprite - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x14] lsls r1, r4, 2 @@ -8970,7 +8970,7 @@ sub_80DC308: @ 80DC308 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r2, [r0, 0x14] lsls r3, r6, 2 @@ -9067,7 +9067,7 @@ _080DC3B0: sub_80DC3C4: @ 80DC3C4 push {r4,lr} movs r2, 0 - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r0, [r0, 0x14] ldrb r1, [r0, 0x2] @@ -9114,7 +9114,7 @@ sub_80DC408: @ 80DC408 ldrsh r0, [r3, r4] cmp r1, r0 bne _080DC440 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] movs r2, 0x2E ldrsh r1, [r3, r2] @@ -9145,7 +9145,7 @@ sub_80DC44C: @ 80DC44C push {r4-r6,lr} movs r2, 0 ldr r6, =gSprites - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r4, =gUnknown_08587A6C ldr r3, =gUnknown_02039F26 _080DC458: @@ -9180,7 +9180,7 @@ sub_80DC490: @ 80DC490 movs r3, 0 ldr r7, =gUnknown_02039F26 ldr r5, =gSprites - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources movs r2, 0 _080DC4A0: adds r0, r3, r7 @@ -9231,7 +9231,7 @@ sub_80DC4F0: @ 80DC4F0 ldr r0, =gUnknown_08587B08 bl LoadSpritePalette movs r5, 0 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources ldr r0, =gSprites mov r8, r0 movs r6, 0 @@ -9315,7 +9315,7 @@ sub_80DC594: @ 80DC594 movs r3, 0x4 orrs r2, r3 strb r2, [r1] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] adds r1, 0x58 @@ -9333,7 +9333,7 @@ sub_80DC5E8: @ 80DC5E8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0xD] @@ -9365,7 +9365,7 @@ sub_80DC630: @ 80DC630 lsls r0, 24 lsrs r0, 24 ldr r3, =gTasks - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r5, [r1] ldr r1, [r5] ldrb r2, [r1, 0xD] @@ -9430,7 +9430,7 @@ sub_80DC6A4: @ 80DC6A4 adds r0, r2 ldrb r0, [r0, 0x8] adds r5, r0, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r0, [r4] ldrb r1, [r0, 0xD] @@ -9553,7 +9553,7 @@ _080DC79C: eors r1, r2 strh r1, [r0] _080DC7AA: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] adds r0, 0x14 @@ -9590,7 +9590,7 @@ sub_80DC7EC: @ 80DC7EC ldr r0, =sub_80DC8D0 movs r1, 0x1E bl CreateTask - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0xE] @@ -9614,7 +9614,7 @@ sub_80DC81C: @ 80DC81C lsls r0, 24 lsrs r0, 24 ldr r3, =gTasks - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r4, [r1] ldr r1, [r4] ldrb r2, [r1, 0xE] @@ -9819,7 +9819,7 @@ sub_80DC9B4: @ 80DC9B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 3 @@ -9923,7 +9923,7 @@ sub_80DC9EC: @ 80DC9EC lsls r3, 6 ldr r0, =0x0600e026 adds r3, r0 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources ldr r0, [r7] ldr r0, [r0, 0x34] str r0, [sp] @@ -10083,7 +10083,7 @@ sub_80DCBE8: @ 80DCBE8 lsrs r0, 24 mov r9, r0 bl sub_80DCBB4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r2, =gSprites mov r8, r2 @@ -10186,7 +10186,7 @@ _080DCCCC: thumb_func_start sub_80DCCD8 sub_80DCCD8: @ 80DCCD8 push {lr} - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] movs r3, 0x30 ldrsh r2, [r0, r3] @@ -10279,7 +10279,7 @@ _080DCD7E: bls _080DCD7E movs r5, 0 _080DCD92: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 3 @@ -10322,7 +10322,7 @@ _080DCDBC: bls _080DCD92 movs r5, 0 _080DCDEA: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 3 @@ -10536,7 +10536,7 @@ _080DCF80: ldr r3, =gUnknown_02039F26 movs r6, 0 _080DCF90: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x4] adds r0, r6, r0 @@ -10577,7 +10577,7 @@ _080DCFCC: add r3, sp, 0x4 mov r12, r3 _080DCFE0: - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r4, 3 @@ -10667,7 +10667,7 @@ sub_80DD080: @ 80DD080 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r3, [r4] ldr r1, [r3, 0x4] lsls r7, r6, 3 @@ -10731,7 +10731,7 @@ _080DD0B4: b _080DD12C .pool _080DD110: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x4] lsls r3, r6, 3 @@ -10789,7 +10789,7 @@ _080DD166: adds r2, 0x1 cmp r2, 0x3 ble _080DD166 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -10819,7 +10819,7 @@ _080DD1B4: add r0, r9 ldr r0, [r0] bl _call_via_r0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -10855,7 +10855,7 @@ _080DD204: _080DD206: adds r0, r1 strh r0, [r2, 0x2] - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -10927,7 +10927,7 @@ _080DD206: .pool _080DD29C: ldr r2, =gContestMoves - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -10960,7 +10960,7 @@ _080DD2D8: ands r0, r1 strb r0, [r3, 0x15] _080DD2E2: - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -11071,7 +11071,7 @@ _080DD3AE: cmp r0, 0 bne _080DD3A2 _080DD3B6: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -11092,7 +11092,7 @@ _080DD3C4: sub_80DD3D4: @ 80DD3D4 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r2, [r2] ldr r3, [r2, 0x4] lsls r2, r0, 3 @@ -11108,7 +11108,7 @@ sub_80DD3D4: @ 80DD3D4 sub_80DD3F0: @ 80DD3F0 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r2, [r2] ldr r3, [r2, 0x4] lsls r2, r0, 3 @@ -11177,7 +11177,7 @@ sub_80DD45C: @ 80DD45C adds r1, r2 bl StringCopy ldr r0, =gStringVar2 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r1, [r5] ldr r2, [r1, 0x4] lsls r1, r4, 3 @@ -11265,7 +11265,7 @@ sub_80DD560: @ 80DD560 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r3, [r1, 0x4] lsls r1, r0, 3 @@ -11315,7 +11315,7 @@ _080DD5AC: cmp r4, 0x3 ble _080DD5AC movs r4, 0 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources ldr r1, [r7] mov r8, r1 adds r5, r2, 0 @@ -11422,7 +11422,7 @@ _080DD684: cmp r4, 0x3 ble _080DD5CA movs r4, 0 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources movs r5, 0 _080DD690: ldr r0, [r6] @@ -11483,7 +11483,7 @@ sub_80DD6DC: @ 80DD6DC strb r0, [r3] ldr r0, =SpriteCallbackDummy str r0, [r2, 0x1C] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -11502,7 +11502,7 @@ sub_80DD720: @ 80DD720 push {r4,r5,lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r5, [r0, 0x12] @@ -11700,7 +11700,7 @@ _080DD8F8: adds r2, r4 ldr r0, =sub_80DD6DC str r0, [r2] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -11720,7 +11720,7 @@ sub_80DD940: @ 80DD940 mov r6, r8 push {r6,r7} movs r5, 0 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, =gSprites mov r9, r0 ldr r0, =0x06010000 @@ -11905,7 +11905,7 @@ _080DDACA: movs r1, 0x1 eors r0, r1 strh r0, [r4, 0xE] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x13] @@ -11939,7 +11939,7 @@ sub_80DDB0C: @ 80DDB0C movs r1, 0xA bl CreateTask ldr r3, =gSprites - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r2, [r4] ldr r0, [r2] adds r0, 0x58 @@ -11981,7 +11981,7 @@ sub_80DDB6C: @ 80DDB6C lsls r0, 24 lsrs r0, 24 adds r3, r0, 0 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0] adds r0, 0x58 @@ -12040,7 +12040,7 @@ _080DDBD4: sub_80DDBE8: @ 80DDBE8 push {r4,r5,lr} ldr r5, =gSprites - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r2, [r0] adds r0, r2, 0 @@ -12093,7 +12093,7 @@ task08_080CD1CC: @ 80DDC4C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0] adds r0, 0x58 @@ -12175,7 +12175,7 @@ sub_80DDCDC: @ 80DDCDC lsls r4, 24 asrs r4, 24 strh r4, [r1, 0x8] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -12216,7 +12216,7 @@ _080DDD4E: bl sub_80DDB0C b _080DDD64 _080DDD54: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -12241,7 +12241,7 @@ _080DDD70: movs r0, 0 strh r0, [r4, 0x1E] bl sub_80DD940 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -12261,7 +12261,7 @@ _080DDD9C: thumb_func_start sub_80DDDA8 sub_80DDDA8: @ 80DDDA8 ldr r3, =gSprites - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r0, [r2] adds r0, 0x58 @@ -12292,7 +12292,7 @@ sub_80DDDA8: @ 80DDDA8 thumb_func_start sub_80DDDE4 sub_80DDDE4: @ 80DDDE4 ldr r2, =gSprites - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] adds r0, 0x58 @@ -12316,7 +12316,7 @@ sub_80DDE0C: @ 80DDE0C ldr r0, =sub_80DDE30 movs r1, 0xF bl CreateTask - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -12383,7 +12383,7 @@ _080DDE8C: ldrsh r0, [r0, r1] cmp r0, 0x9 bne _080DDEBA - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -12421,7 +12421,7 @@ sub_80DDED0: @ 80DDED0 cmp r4, 0 ble _080DDF1C movs r5, 0 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0] movs r1, 0x13 @@ -12433,7 +12433,7 @@ sub_80DDED0: @ 80DDED0 b _080DDF4E .pool _080DDF1C: - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0] movs r1, 0x13 @@ -12458,7 +12458,7 @@ _080DDF48: movs r5, 0xC movs r3, 0 _080DDF4C: - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources _080DDF4E: ldr r1, =gTasks lsls r0, r6, 2 @@ -12536,7 +12536,7 @@ _080DDFB8: bne _080DDFFC adds r0, r5, 0 bl DestroyTask - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x7] @@ -12562,7 +12562,7 @@ sub_80DE008: @ 80DE008 lsrs r0, 24 mov r10, r0 movs r5, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources mov r9, r0 mov r8, r9 ldr r6, =gSprites @@ -12666,7 +12666,7 @@ sub_80DE0F0: @ 80DE0F0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -12708,7 +12708,7 @@ sub_80DE12C: @ 80DE12C movs r0, 0x11 mov r9, r0 _080DE146: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0xD @@ -12789,7 +12789,7 @@ sub_80DE1E8: @ 80DE1E8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -12896,7 +12896,7 @@ sub_80DE224: @ 80DE224 movs r0, 0 str r0, [sp, 0x8] add r0, sp, 0x8 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r1, [r1, 0x28] ldr r2, =0x05000400 @@ -12963,7 +12963,7 @@ sub_80DE350: @ 80DE350 bl RequestDma3Fill movs r5, 0 str r5, [sp] - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r1, [r0, 0x28] ldr r2, =0x05000400 @@ -13136,7 +13136,7 @@ _080DE4D0: _080DE4DA: movs r2, 0 adds r6, r3, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r3, =gUnknown_02039F26 _080DE4E2: ldr r0, [r5] @@ -13170,7 +13170,7 @@ _080DE52C: ands r1, r0 cmp r1, 0 beq _080DE584 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -13201,7 +13201,7 @@ _080DE584: bl sub_80DBAA0 b _080DE59A _080DE58A: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -13356,7 +13356,7 @@ sub_80DE69C: @ 80DE69C mov r8, r0 movs r7, 0 ldr r6, =gSprites - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources _080DE6AE: bl AllocOamMatrix ldr r1, [r5] @@ -13450,7 +13450,7 @@ _080DE74C: adds r1, r2 mov r0, r8 strh r0, [r1, 0x8] - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -13471,7 +13471,7 @@ sub_80DE794: @ 80DE794 lsls r0, 24 lsrs r6, r0, 24 ldr r2, =gSprites - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r0, [r0, 0x14] ldrb r1, [r0] @@ -13515,7 +13515,7 @@ _080DE7CC: _080DE7EC: movs r4, 0 _080DE7EE: - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x14] lsls r0, r4, 2 @@ -13583,7 +13583,7 @@ sub_80DE864: @ 80DE864 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -13606,7 +13606,7 @@ sub_80DE864: @ 80DE864 movs r1, 0 movs r2, 0x14 bl memset - bl sub_80A3934 + bl ClearBattleAnimationVars ldr r1, =gBattleMonForms movs r2, 0 adds r0, r1, 0x3 @@ -13667,7 +13667,7 @@ _080DE910: b _080DE9A0 .pool _080DE920: - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -13695,17 +13695,17 @@ _080DE920: b _080DE9A2 .pool _080DE960: - ldr r1, =gHappinessMoveAnim + ldr r1, =gAnimFriendship movs r0, 0xFF b _080DE9A0 .pool _080DE96C: - ldr r1, =gHappinessMoveAnim + ldr r1, =gAnimFriendship movs r0, 0 b _080DE9A0 .pool _080DE978: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0] adds r2, r0, 0 @@ -13735,7 +13735,7 @@ _080DE9A2: thumb_func_start sub_80DE9B0 sub_80DE9B0: @ 80DE9B0 push {r4,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x18] movs r1, 0 @@ -13763,7 +13763,7 @@ sub_80DE9DC: @ 80DE9DC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r0, [r0, 0x18] strb r4, [r0, 0x5] @@ -14558,7 +14558,7 @@ sub_80DF080: @ 80DF080 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r3, [r2] ldr r5, [r3, 0x10] ldrb r1, [r5, 0x1] @@ -14810,7 +14810,7 @@ sub_80DF250: @ 80DF250 movs r0, 0 str r0, [sp, 0x20] movs r4, 0 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources mov r2, sp adds r2, 0xC str r2, [sp, 0x28] @@ -14871,7 +14871,7 @@ _080DF2C2: subs r2, r0 cmp r2, 0x32 bgt _080DF2EE - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources ldr r0, [r7] ldr r2, [r0, 0x1C] add r2, r9 @@ -14880,7 +14880,7 @@ _080DF2C2: orrs r0, r1 strb r0, [r2, 0xD] _080DF2EE: - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x1C] mov r3, r9 @@ -14926,7 +14926,7 @@ _080DF336: ldrb r0, [r0] cmp r0, 0 beq _080DF354 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r2, [r0, 0x1C] add r2, r9 @@ -14978,7 +14978,7 @@ _080DF38E: mov r2, r8 cmp r2, 0 bne _080DF3B4 - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r2, [r0, 0x1C] add r2, r9 @@ -14987,7 +14987,7 @@ _080DF38E: orrs r0, r1 strb r0, [r2, 0xD] _080DF3B4: - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r0, [r0, 0x1C] mov r7, r9 @@ -15031,7 +15031,7 @@ _080DF3EA: ldr r2, [sp, 0x28] strb r0, [r2, 0x5] movs r4, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] mov r8, r0 ldr r7, [sp, 0x30] @@ -15046,7 +15046,7 @@ _080DF40E: mov r12, r4 cmp r0, 0 beq _080DF450 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r6, [r0] ldr r3, [sp, 0x28] mov r4, sp @@ -15123,7 +15123,7 @@ _080DF4B6: bne _080DF478 _080DF4C0: bl Random - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r4, [r1, 0x1C] ldr r1, [sp, 0x30] @@ -15167,7 +15167,7 @@ sub_80DF4F8: @ 80DF4F8 _080DF514: movs r7, 0 movs r3, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources mov r12, r0 _080DF51C: adds r0, r3, r1 @@ -15253,7 +15253,7 @@ _080DF5A0: bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x1C] add r0, r8 @@ -15295,7 +15295,7 @@ _080DF5F6: bne _080DF628 mov r0, sp strb r1, [r0] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x1C] ldrb r4, [r0, 0x1D] @@ -15306,7 +15306,7 @@ _080DF628: mov r1, sp movs r0, 0 strb r0, [r1] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x1C] ldrb r4, [r0, 0xD] @@ -15360,7 +15360,7 @@ _080DF682: ldrb r6, [r0] movs r2, 0x80 movs r3, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0, 0x1C] lsls r1, r6, 4 @@ -15391,7 +15391,7 @@ _080DF6C4: ldr r5, [sp, 0x4] lsrs r0, r5, 24 bl ContestLiveUpdates_BeforeInterview_3 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x1C] add r0, r8 @@ -15519,7 +15519,7 @@ _080DF7AE: movs r2, 0x5 movs r3, 0x1 bl sub_80DEBD0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x1C] lsls r0, r7, 4 @@ -15606,7 +15606,7 @@ _080DF884: add r0, sp, 0x4 ldr r1, =gText_BDot bl StringCopy - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x1C] lsls r0, r7, 4 diff --git a/asm/contest_ai.s b/asm/contest_ai.s index f937633da..a213c393c 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -10,7 +10,7 @@ sub_81562C4: @ 81562C4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0xC] movs r1, 0 @@ -57,7 +57,7 @@ _081562DE: thumb_func_start sub_8156324 sub_8156324: @ 8156324 push {r4-r6,lr} - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0xC] ldr r0, [r0, 0x14] @@ -98,7 +98,7 @@ _0815636C: bl Random adds r5, r0, 0 ands r5, r6 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r1, [r0, 0xC] adds r0, r1, 0x5 @@ -135,7 +135,7 @@ sub_81563B0: @ 81563B0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r0, [r0, 0xC] ldrb r0, [r0] @@ -211,7 +211,7 @@ _08156444: orrs r0, r1 strb r0, [r2, 0x9] _08156458: - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x9] @@ -263,7 +263,7 @@ sub_81564AC: @ 81564AC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r0, [r0, 0x8] b _081564CC @@ -289,7 +289,7 @@ _081564D2: thumb_func_start sub_81564DC sub_81564DC: @ 81564DC push {r4,lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0x5 @@ -331,7 +331,7 @@ _08156516: thumb_func_start sub_8156530 sub_8156530: @ 8156530 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r0, [r0] @@ -349,7 +349,7 @@ sub_8156530: @ 8156530 sub_8156550: @ 8156550 push {lr} bl sub_8156530 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -384,7 +384,7 @@ _08156590: sub_8156594: @ 8156594 push {lr} bl sub_8156530 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -419,7 +419,7 @@ _081565D4: sub_81565D8: @ 81565D8 push {lr} bl sub_8156530 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -454,7 +454,7 @@ _08156618: sub_815661C: @ 815661C push {lr} bl sub_8156530 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -487,7 +487,7 @@ _0815665C: thumb_func_start sub_8156660 sub_8156660: @ 8156660 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r0, [r0] @@ -507,7 +507,7 @@ sub_8156660: @ 8156660 sub_8156684: @ 8156684 push {lr} bl sub_8156660 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -542,7 +542,7 @@ _081566C4: sub_81566C8: @ 81566C8 push {lr} bl sub_8156660 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -577,7 +577,7 @@ _08156708: sub_815670C: @ 815670C push {lr} bl sub_8156660 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -612,7 +612,7 @@ _0815674C: sub_8156750: @ 8156750 push {lr} bl sub_8156660 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -645,7 +645,7 @@ _08156790: thumb_func_start sub_8156794 sub_8156794: @ 8156794 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r0, [r0, 0x8] @@ -667,7 +667,7 @@ sub_8156794: @ 8156794 sub_81567BC: @ 81567BC push {lr} bl sub_8156794 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -702,7 +702,7 @@ _081567FC: sub_8156800: @ 8156800 push {lr} bl sub_8156794 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -737,7 +737,7 @@ _08156840: sub_8156844: @ 8156844 push {lr} bl sub_8156794 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -772,7 +772,7 @@ _08156884: sub_8156888: @ 8156888 push {lr} bl sub_8156794 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -806,7 +806,7 @@ _081568C8: thumb_func_start sub_81568CC sub_81568CC: @ 81568CC push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r4, [r0, 0xC] adds r1, r4, 0 @@ -839,7 +839,7 @@ sub_81568CC: @ 81568CC sub_815690C: @ 815690C push {lr} bl sub_81568CC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -874,7 +874,7 @@ _0815694C: sub_8156950: @ 8156950 push {lr} bl sub_81568CC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -909,7 +909,7 @@ _08156990: sub_8156994: @ 8156994 push {lr} bl sub_81568CC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -944,7 +944,7 @@ _081569D4: sub_81569D8: @ 81569D8 push {lr} bl sub_81568CC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -977,7 +977,7 @@ _08156A18: thumb_func_start sub_8156A1C sub_8156A1C: @ 8156A1C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r3, [r0, 0xC] adds r1, r3, 0 @@ -1002,7 +1002,7 @@ sub_8156A1C: @ 8156A1C sub_8156A48: @ 8156A48 push {r4,r5,lr} bl sub_8156A1C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1043,7 +1043,7 @@ _08156A90: sub_8156A98: @ 8156A98 push {r4,r5,lr} bl sub_8156A1C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1084,7 +1084,7 @@ _08156AE0: sub_8156AE8: @ 8156AE8 push {r4,r5,lr} bl sub_8156A1C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1125,7 +1125,7 @@ _08156B30: sub_8156B38: @ 8156B38 push {r4,r5,lr} bl sub_8156A1C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1164,7 +1164,7 @@ _08156B80: thumb_func_start sub_8156B88 sub_8156B88: @ 8156B88 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r1, =gUnknown_02039F00 @@ -1187,7 +1187,7 @@ sub_8156B88: @ 8156B88 sub_8156BB4: @ 8156BB4 push {r4,r5,lr} bl sub_8156B88 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1228,7 +1228,7 @@ _08156BFC: sub_8156C04: @ 8156C04 push {r4,r5,lr} bl sub_8156B88 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1269,7 +1269,7 @@ _08156C4C: sub_8156C54: @ 8156C54 push {r4,r5,lr} bl sub_8156B88 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1310,7 +1310,7 @@ _08156C9C: sub_8156CA4: @ 8156CA4 push {r4,r5,lr} bl sub_8156B88 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -1349,7 +1349,7 @@ _08156CEC: thumb_func_start sub_8156CF4 sub_8156CF4: @ 8156CF4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r0, =gScriptContestCategory @@ -1367,7 +1367,7 @@ sub_8156CF4: @ 8156CF4 sub_8156D18: @ 8156D18 push {lr} bl sub_8156CF4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1402,7 +1402,7 @@ _08156D58: sub_8156D5C: @ 8156D5C push {lr} bl sub_8156CF4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1437,7 +1437,7 @@ _08156D9C: sub_8156DA0: @ 8156DA0 push {r4,lr} ldr r2, =gUnknown_02039E00 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -1469,7 +1469,7 @@ sub_8156DA0: @ 8156DA0 sub_8156DE4: @ 8156DE4 push {r4,lr} bl sub_8156DA0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldr r3, =gAIScriptPtr @@ -1506,7 +1506,7 @@ _08156E24: sub_8156E2C: @ 8156E2C push {r4,lr} bl sub_8156DA0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldr r3, =gAIScriptPtr @@ -1543,7 +1543,7 @@ _08156E6C: sub_8156E74: @ 8156E74 push {r4,lr} bl sub_8156DA0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldr r3, =gAIScriptPtr @@ -1580,7 +1580,7 @@ _08156EB4: sub_8156EBC: @ 8156EBC push {r4,lr} bl sub_8156DA0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldr r3, =gAIScriptPtr @@ -1616,7 +1616,7 @@ _08156EFC: thumb_func_start sub_8156F04 sub_8156F04: @ 8156F04 ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x4] @@ -1646,7 +1646,7 @@ sub_8156F04: @ 8156F04 sub_8156F44: @ 8156F44 push {lr} bl sub_8156F04 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1681,7 +1681,7 @@ _08156F84: sub_8156F88: @ 8156F88 push {lr} bl sub_8156F04 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1715,7 +1715,7 @@ _08156FC8: thumb_func_start sub_8156FCC sub_8156FCC: @ 8156FCC ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x4] @@ -1749,7 +1749,7 @@ sub_8156FCC: @ 8156FCC sub_8157018: @ 8157018 push {lr} bl sub_8156FCC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1784,7 +1784,7 @@ _08157058: sub_815705C: @ 815705C push {lr} bl sub_8156FCC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1819,7 +1819,7 @@ _0815709C: sub_81570A0: @ 81570A0 push {r4-r7,lr} ldr r2, =gUnknown_02039E00 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] @@ -1887,7 +1887,7 @@ _0815711A: sub_815712C: @ 815712C push {lr} bl sub_81570A0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -1924,7 +1924,7 @@ _0815716C: sub_8157174: @ 8157174 push {r4-r7,lr} ldr r2, =gUnknown_02039E00 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] @@ -1992,7 +1992,7 @@ _081571EE: sub_8157200: @ 8157200 push {lr} bl sub_8157174 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2029,7 +2029,7 @@ _08157240: sub_8157248: @ 8157248 push {r4,lr} ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r4, [r0, 0xC] ldrb r1, [r4, 0x4] @@ -2069,7 +2069,7 @@ sub_8157248: @ 8157248 sub_81572A4: @ 81572A4 push {lr} bl sub_8157248 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2104,7 +2104,7 @@ _081572E4: sub_81572E8: @ 81572E8 push {lr} bl sub_8157248 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2139,7 +2139,7 @@ _08157328: sub_815732C: @ 815732C push {lr} bl sub_8157248 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2174,7 +2174,7 @@ _0815736C: sub_8157370: @ 8157370 push {lr} bl sub_8157248 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2209,7 +2209,7 @@ _081573B0: sub_81573B4: @ 81573B4 push {r4,lr} ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r4, [r0, 0xC] ldrb r1, [r4, 0x4] @@ -2249,7 +2249,7 @@ sub_81573B4: @ 81573B4 sub_8157410: @ 8157410 push {lr} bl sub_81573B4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2284,7 +2284,7 @@ _08157450: sub_8157454: @ 8157454 push {lr} bl sub_81573B4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2319,7 +2319,7 @@ _08157494: sub_8157498: @ 8157498 push {lr} bl sub_81573B4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2354,7 +2354,7 @@ _081574D8: sub_81574DC: @ 81574DC push {lr} bl sub_81573B4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2389,7 +2389,7 @@ _0815751C: sub_8157520: @ 8157520 push {r4,r5,lr} ldr r3, =gUnknown_02039E00 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r4, [r5] ldr r1, [r4, 0xC] ldrb r0, [r1, 0x4] @@ -2435,7 +2435,7 @@ _08157560: sub_8157578: @ 8157578 push {lr} bl sub_8157520 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2470,7 +2470,7 @@ _081575B8: sub_81575BC: @ 81575BC push {lr} bl sub_8157520 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2505,7 +2505,7 @@ _081575FC: sub_8157600: @ 8157600 push {lr} bl sub_8157520 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2540,7 +2540,7 @@ _08157640: sub_8157644: @ 8157644 push {lr} bl sub_8157520 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2576,7 +2576,7 @@ sub_8157688: @ 8157688 push {r4-r6,lr} movs r3, 0 ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -2592,7 +2592,7 @@ sub_8157688: @ 8157688 adds r6, r2, 0 _081576AA: lsls r1, r4, 1 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -2619,7 +2619,7 @@ _081576D2: _081576DC: movs r3, 0x1 _081576DE: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] strh r3, [r0, 0x18] @@ -2637,7 +2637,7 @@ _081576DE: sub_8157700: @ 8157700 push {lr} bl sub_8157688 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2674,7 +2674,7 @@ _08157740: sub_8157748: @ 8157748 push {lr} bl sub_8157688 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2712,7 +2712,7 @@ sub_8157790: @ 8157790 push {r4-r6,lr} movs r3, 0 ldr r2, =gUnknown_02039E00 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -2728,7 +2728,7 @@ sub_8157790: @ 8157790 adds r6, r2, 0 _081577B2: lsls r1, r4, 1 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -2754,7 +2754,7 @@ _081577D8: _081577E2: movs r3, 0x1 _081577E4: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] strh r3, [r0, 0x18] @@ -2772,7 +2772,7 @@ _081577E4: sub_8157808: @ 8157808 push {lr} bl sub_8157790 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2809,7 +2809,7 @@ _08157848: sub_8157850: @ 8157850 push {lr} bl sub_8157790 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2847,7 +2847,7 @@ sub_8157898: @ 8157898 push {r4-r6,lr} movs r5, 0 ldr r3, =gUnknown_02039E00 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r4, [r6] ldr r1, [r4, 0xC] ldrb r0, [r1, 0x4] @@ -2893,7 +2893,7 @@ _081578D6: sub_81578F8: @ 81578F8 push {lr} bl sub_8157898 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2930,7 +2930,7 @@ _08157938: sub_8157940: @ 8157940 push {lr} bl sub_8157898 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -2972,7 +2972,7 @@ sub_8157988: @ 8157988 bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r5, [r1, 0xC] ldr r2, [r1, 0x4] @@ -3000,7 +3000,7 @@ sub_8157988: @ 8157988 sub_81579CC: @ 81579CC push {lr} bl sub_8157988 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3035,7 +3035,7 @@ _08157A0C: sub_8157A10: @ 8157A10 push {lr} bl sub_8157988 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3070,7 +3070,7 @@ _08157A50: sub_8157A54: @ 8157A54 push {lr} bl sub_8157988 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3105,7 +3105,7 @@ _08157A94: sub_8157A98: @ 8157A98 push {lr} bl sub_8157988 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3152,7 +3152,7 @@ sub_8157ADC: @ 8157ADC cmp r0, 0 beq _08157B18 ldr r2, =gContestMoves - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r4, 3 @@ -3167,7 +3167,7 @@ sub_8157ADC: @ 8157ADC orrs r0, r1 lsrs r6, r0, 31 _08157B18: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] strh r6, [r0, 0x18] @@ -3184,7 +3184,7 @@ _08157B18: sub_8157B38: @ 8157B38 push {lr} bl sub_8157ADC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3219,7 +3219,7 @@ _08157B78: sub_8157B7C: @ 8157B7C push {lr} bl sub_8157ADC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3254,7 +3254,7 @@ _08157BBC: sub_8157BC0: @ 8157BC0 push {lr} bl sub_8157ADC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3289,7 +3289,7 @@ _08157C00: sub_8157C04: @ 8157C04 push {lr} bl sub_8157ADC - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3333,14 +3333,14 @@ sub_8157C48: @ 8157C48 lsls r0, 24 cmp r0, 0 beq _08157C74 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0 b _08157C7C .pool _08157C74: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0x1 @@ -3359,7 +3359,7 @@ _08157C7C: sub_8157C94: @ 8157C94 push {lr} bl sub_8157C48 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3396,7 +3396,7 @@ _08157CD4: sub_8157CDC: @ 8157CDC push {lr} bl sub_8157C48 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3438,7 +3438,7 @@ sub_8157D24: @ 8157D24 bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r3, [r1, 0xC] ldr r2, [r1, 0x4] @@ -3463,7 +3463,7 @@ sub_8157D24: @ 8157D24 sub_8157D60: @ 8157D60 push {lr} bl sub_8157D24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3500,7 +3500,7 @@ _08157DA0: sub_8157DA8: @ 8157DA8 push {lr} bl sub_8157D24 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3542,7 +3542,7 @@ sub_8157DF0: @ 8157DF0 bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r5, [r1, 0xC] ldr r3, [r1, 0x4] @@ -3574,7 +3574,7 @@ sub_8157DF0: @ 8157DF0 sub_8157E3C: @ 8157E3C push {lr} bl sub_8157DF0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3611,7 +3611,7 @@ _08157E7C: sub_8157E84: @ 8157E84 push {lr} bl sub_8157DF0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3648,7 +3648,7 @@ _08157EC4: sub_8157ECC: @ 8157ECC push {lr} bl sub_8157DF0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3685,7 +3685,7 @@ _08157F0C: sub_8157F14: @ 8157F14 push {lr} bl sub_8157DF0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3726,7 +3726,7 @@ sub_8157F5C: @ 8157F5C ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r3, [r1, 0xC] ldr r2, =gUnknown_02039F00 @@ -3754,7 +3754,7 @@ sub_8157F5C: @ 8157F5C sub_8157FA0: @ 8157FA0 push {lr} bl sub_8157F5C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3791,7 +3791,7 @@ _08157FE0: sub_8157FE8: @ 8157FE8 push {lr} bl sub_8157F5C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3828,7 +3828,7 @@ _08158028: sub_8158030: @ 8158030 push {lr} bl sub_8157F5C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3865,7 +3865,7 @@ _08158070: sub_8158078: @ 8158078 push {lr} bl sub_8157F5C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3908,7 +3908,7 @@ sub_81580C0: @ 81580C0 lsls r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r4, [r1] ldr r1, [r4] lsrs r0, 23 @@ -3935,7 +3935,7 @@ sub_81580C0: @ 81580C0 sub_8158108: @ 8158108 push {lr} bl sub_81580C0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -3970,7 +3970,7 @@ _08158148: sub_815814C: @ 815814C push {lr} bl sub_81580C0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4005,7 +4005,7 @@ _0815818C: sub_8158190: @ 8158190 push {lr} bl sub_81580C0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4040,7 +4040,7 @@ _081581D0: sub_81581D4: @ 81581D4 push {lr} bl sub_81580C0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4082,7 +4082,7 @@ sub_8158218: @ 8158218 lsrs r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r4, [r1] ldr r1, [r4] lsls r2, 2 @@ -4105,7 +4105,7 @@ sub_8158218: @ 8158218 sub_8158254: @ 8158254 push {lr} bl sub_8158218 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4140,7 +4140,7 @@ _08158294: sub_8158298: @ 8158298 push {lr} bl sub_8158218 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4175,7 +4175,7 @@ _081582D8: sub_81582DC: @ 81582DC push {lr} bl sub_8158218 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4210,7 +4210,7 @@ _0815831C: sub_8158320: @ 8158320 push {lr} bl sub_8158218 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4251,7 +4251,7 @@ sub_8158364: @ 8158364 lsls r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r4, [r1] ldr r1, [r4] lsrs r0, 23 @@ -4282,7 +4282,7 @@ sub_8158364: @ 8158364 sub_81583B8: @ 81583B8 push {lr} bl sub_8158364 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4317,7 +4317,7 @@ _081583F8: sub_81583FC: @ 81583FC push {lr} bl sub_8158364 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -4351,7 +4351,7 @@ _0815843C: thumb_func_start sub_8158440 sub_8158440: @ 8158440 push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r3, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4374,7 +4374,7 @@ sub_8158440: @ 8158440 thumb_func_start sub_815846C sub_815846C: @ 815846C push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r3, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4399,7 +4399,7 @@ sub_815846C: @ 815846C thumb_func_start sub_815849C sub_815849C: @ 815849C push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4427,7 +4427,7 @@ sub_815849C: @ 815849C thumb_func_start sub_81584D4 sub_81584D4: @ 81584D4 push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4454,7 +4454,7 @@ sub_81584D4: @ 81584D4 thumb_func_start sub_8158508 sub_8158508: @ 8158508 push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4481,7 +4481,7 @@ sub_8158508: @ 8158508 thumb_func_start sub_815853C sub_815853C: @ 815853C push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4524,7 +4524,7 @@ _08158586: thumb_func_start sub_815858C sub_815858C: @ 815858C push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4567,7 +4567,7 @@ _081585D6: thumb_func_start sub_81585DC sub_81585DC: @ 81585DC push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4610,7 +4610,7 @@ _08158626: thumb_func_start sub_815862C sub_815862C: @ 815862C push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4653,7 +4653,7 @@ _08158676: thumb_func_start sub_815867C sub_815867C: @ 815867C push {r4,r5,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4696,7 +4696,7 @@ _081586C8: thumb_func_start sub_81586D0 sub_81586D0: @ 81586D0 push {r4,r5,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4739,7 +4739,7 @@ _0815871C: thumb_func_start sub_8158724 sub_8158724: @ 8158724 push {r4,r5,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4782,7 +4782,7 @@ _08158770: thumb_func_start sub_8158778 sub_8158778: @ 8158778 push {r4,r5,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4828,7 +4828,7 @@ sub_81587CC: @ 81587CC bl Random movs r2, 0xFF ands r2, r0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4869,7 +4869,7 @@ sub_815881C: @ 815881C bl Random movs r2, 0xFF ands r2, r0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0xC] ldr r4, =gAIScriptPtr @@ -4955,7 +4955,7 @@ sub_81588BC: @ 81588BC lsls r0, 24 cmp r0, 0 bne _081588D6 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0xC] ldrb r1, [r2, 0x9] @@ -4971,7 +4971,7 @@ _081588D6: thumb_func_start sub_81588E0 sub_81588E0: @ 81588E0 push {r4,lr} - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r1, [r1] ldr r3, [r1, 0xC] adds r4, r3, 0 @@ -4993,7 +4993,7 @@ sub_81588E0: @ 81588E0 thumb_func_start sub_8158908 sub_8158908: @ 8158908 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -5033,7 +5033,7 @@ sub_8158948: @ 8158948 ldr r6, =gUnknown_02039E00 + 30 _08158950: lsls r1, r4, 1 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -5057,7 +5057,7 @@ _08158980: cmp r4, 0x3 ble _08158950 _08158986: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] strh r5, [r0, 0x18] @@ -5075,7 +5075,7 @@ _08158986: sub_81589A4: @ 81589A4 push {lr} bl sub_8158948 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -5112,7 +5112,7 @@ _081589E4: sub_81589EC: @ 81589EC push {lr} bl sub_8158948 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -5158,7 +5158,7 @@ sub_8158A34: @ 8158A34 movs r4, 0 ldr r0, =gUnknown_02039E00 mov r12, r0 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -5205,7 +5205,7 @@ _08158A8E: sub_8158AA0: @ 8158AA0 push {lr} bl sub_8158A34 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 @@ -5242,7 +5242,7 @@ _08158AE0: sub_8158AE8: @ 8158AE8 push {lr} bl sub_8158A34 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 3b88e16e0..f3c234503 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -68,7 +68,7 @@ ContestEffectFunc_080E547C: @ 80E547C thumb_func_start ContestEffectFunc_080E5480 ContestEffectFunc_080E5480: @ 80E5480 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -94,7 +94,7 @@ ContestEffectFunc_080E5480: @ 80E5480 thumb_func_start ContestEffectFunc_080E54B0 ContestEffectFunc_080E54B0: @ 80E54B0 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -119,7 +119,7 @@ ContestEffectFunc_080E54B0: @ 80E54B0 thumb_func_start ContestEffectFunc_080E54E0 ContestEffectFunc_080E54E0: @ 80E54E0 - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -165,7 +165,7 @@ ContestEffectFunc_080E54E0: @ 80E54E0 thumb_func_start ContestEffectFunc_080E5534 ContestEffectFunc_080E5534: @ 80E5534 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -189,7 +189,7 @@ ContestEffectFunc_080E5534: @ 80E5534 thumb_func_start ContestEffectFunc_080E5560 ContestEffectFunc_080E5560: @ 80E5560 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -215,7 +215,7 @@ ContestEffectFunc_080E5560: @ 80E5560 thumb_func_start ContestEffectFunc_080E5590 ContestEffectFunc_080E5590: @ 80E5590 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -239,7 +239,7 @@ ContestEffectFunc_080E5590: @ 80E5590 thumb_func_start ContestEffectFunc_080E55BC ContestEffectFunc_080E55BC: @ 80E55BC push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -266,7 +266,7 @@ ContestEffectFunc_080E55BC: @ 80E55BC ContestEffectFunc_080E55EC: @ 80E55EC push {r4,r5,lr} movs r2, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources ldr r0, [r5] ldr r1, [r0, 0x8] ldrb r4, [r1, 0x11] @@ -293,7 +293,7 @@ _080E560A: cmp r0, r1 bne _080E560A _080E5622: - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x8] strb r2, [r0, 0x8] @@ -307,14 +307,14 @@ _080E5622: _080E563A: cmp r2, 0 bne _080E564C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E564C: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -330,7 +330,7 @@ _080E564C: ContestEffectFunc_080E5664: @ 80E5664 push {r4-r6,lr} movs r1, 0 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0, 0x8] ldrb r5, [r0, 0x11] @@ -359,7 +359,7 @@ _080E5698: adds r3, 0x1 cmp r3, 0x3 ble _080E567E - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x8 @@ -372,14 +372,14 @@ _080E5698: _080E56B4: cmp r1, 0 bne _080E56C6 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E56C6: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -409,7 +409,7 @@ ContestEffectFunc_080E56E0: @ 80E56E0 bhi _080E5702 movs r1, 0x28 _080E5702: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] strh r1, [r0, 0x4] @@ -425,7 +425,7 @@ ContestEffectFunc_080E5718: @ 80E5718 mov r7, r8 push {r7} movs r7, 0 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r5, [r0, 0x11] @@ -521,7 +521,7 @@ ContestEffectFunc_080E57CC: @ 80E57CC push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r2, [r0, 0x11] @@ -619,7 +619,7 @@ ContestEffectFunc_080E588C: @ 80E588C push {r6,r7} movs r0, 0 mov r9, r0 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r7, [r0, 0x11] @@ -674,7 +674,7 @@ _080E58DA: _080E5900: adds r6, 0x1C adds r5, 0x1 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources cmp r5, 0x3 ble _080E58B0 _080E590A: @@ -704,7 +704,7 @@ _080E5928: thumb_func_start ContestEffectFunc_080E5938 ContestEffectFunc_080E5938: @ 80E5938 push {r4,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -732,7 +732,7 @@ ContestEffectFunc_080E5938: @ 80E5938 thumb_func_start ContestEffectFunc_080E5970 ContestEffectFunc_080E5970: @ 80E5970 push {r4,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -765,7 +765,7 @@ ContestEffectFunc_080E59B0: @ 80E59B0 push {lr} movs r0, 0 bl sub_80E6934 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -781,7 +781,7 @@ ContestEffectFunc_080E59D0: @ 80E59D0 push {lr} movs r0, 0x1 bl sub_80E6934 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -797,7 +797,7 @@ ContestEffectFunc_080E59F0: @ 80E59F0 push {lr} movs r0, 0x2 bl sub_80E6934 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -813,7 +813,7 @@ ContestEffectFunc_080E5A10: @ 80E5A10 push {lr} movs r0, 0x3 bl sub_80E6934 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -829,7 +829,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30 push {lr} movs r0, 0x4 bl sub_80E6934 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -844,7 +844,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30 ContestEffectFunc_080E5A50: @ 80E5A50 push {r4-r6,lr} movs r4, 0 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x11] @@ -855,7 +855,7 @@ ContestEffectFunc_080E5A50: @ 80E5A50 beq _080E5AB0 movs r5, 0 _080E5A68: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r1, [r0, 0x8] ldrb r0, [r1, 0x11] @@ -932,7 +932,7 @@ ContestEffectFunc_080E5AD4: @ 80E5AD4 mov r10, r3 movs r6, 0 _080E5B00: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r1, [r2, 0x8] ldrb r0, [r1, 0x11] @@ -1000,7 +1000,7 @@ _080E5B76: bge _080E5B76 _080E5B7E: movs r5, 0 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources movs r6, 0 mov r4, r10 _080E5B86: @@ -1125,7 +1125,7 @@ _080E5C70: lsrs r0, 24 mov r9, r0 _080E5C86: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0xD @@ -1139,7 +1139,7 @@ _080E5C86: cmp r0, 0xFF bne _080E5C16 _080E5CA0: - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, [r6] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1173,7 +1173,7 @@ ContestEffectFunc_080E5CD4: @ 80E5CD4 movs r0, 0 mov r8, r0 movs r6, 0 - ldr r7, =gUnknown_02039F34 + ldr r7, =gContestResources movs r5, 0 _080E5CE4: ldr r2, [r7] @@ -1228,7 +1228,7 @@ _080E5D46: adds r6, 0x1 cmp r6, 0x3 ble _080E5CE4 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1256,7 +1256,7 @@ ContestEffectFunc_080E5D7C: @ 80E5D7C push {r4-r7,lr} movs r7, 0 movs r4, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources movs r6, 0 _080E5D86: ldr r3, [r5] @@ -1301,7 +1301,7 @@ _080E5DD2: adds r4, 0x1 cmp r4, 0x3 ble _080E5D86 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1325,7 +1325,7 @@ _080E5DF8: ContestEffectFunc_080E5E04: @ 80E5E04 push {r4,lr} ldr r1, =gUnknown_02039F26 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r0, [r4, 0x8] ldrb r2, [r0, 0x11] @@ -1366,7 +1366,7 @@ _080E5E46: ContestEffectFunc_080E5E5C: @ 80E5E5C push {r4,lr} ldr r1, =gUnknown_02039F26 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r0, [r4, 0x8] ldrb r2, [r0, 0x11] @@ -1408,7 +1408,7 @@ ContestEffectFunc_080E5EB4: @ 80E5EB4 push {r4-r7,lr} movs r1, 0 movs r5, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r2, [r4, 0x8] ldrb r0, [r2, 0x11] @@ -1434,7 +1434,7 @@ _080E5EDA: bge _080E5EE8 movs r5, 0 _080E5EE8: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r3, [r0] ldr r0, [r3, 0x8] ldrb r2, [r0, 0x11] @@ -1467,7 +1467,7 @@ _080E5F0C: movs r1, 0x11 bl sub_80DD3D4 _080E5F2C: - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -1498,7 +1498,7 @@ _080E5F2C: ContestEffectFunc_080E5F64: @ 80E5F64 push {r4-r7,lr} movs r6, 0 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r2, [r4, 0x8] ldrb r1, [r2, 0x11] @@ -1567,7 +1567,7 @@ _080E5FDE: thumb_func_start ContestEffectFunc_080E5FE4 ContestEffectFunc_080E5FE4: @ 80E5FE4 push {r4,r5,lr} - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources ldr r3, [r1] ldr r0, [r3, 0x8] ldrb r2, [r0, 0x11] @@ -1647,7 +1647,7 @@ ContestEffectFunc_080E6068: @ 80E6068 cmp r0, 0x2 bhi _080E6098 movs r4, 0xA - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1659,7 +1659,7 @@ _080E6098: cmp r0, 0x5 bhi _080E60B4 movs r4, 0x14 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1671,7 +1671,7 @@ _080E60B4: cmp r0, 0x7 bhi _080E60D0 movs r4, 0x28 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1683,7 +1683,7 @@ _080E60D0: cmp r1, 0x8 bhi _080E60EC movs r4, 0x3C - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -1693,14 +1693,14 @@ _080E60D0: .pool _080E60EC: movs r4, 0x50 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80DD3D4 _080E60FC: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -1721,7 +1721,7 @@ ContestEffectFunc_080E611C: @ 80E611C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r3, [r0, 0x8] ldrb r0, [r3, 0x11] @@ -1743,7 +1743,7 @@ _080E6140: adds r5, r0, 0 cmp r6, r1 beq _080E616A - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources _080E614E: lsls r0, r2, 24 movs r2, 0x80 @@ -1845,7 +1845,7 @@ ContestEffectFunc_080E620C: @ 80E620C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r3, [r0] ldr r1, [r3, 0x8] ldrb r2, [r1, 0x11] @@ -1928,7 +1928,7 @@ _080E62AC: thumb_func_start ContestEffectFunc_080E62B8 ContestEffectFunc_080E62B8: @ 80E62B8 push {r4-r7,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x11] @@ -1939,7 +1939,7 @@ ContestEffectFunc_080E62B8: @ 80E62B8 movs r5, 0 movs r6, 0 _080E62CE: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r4, [r0] ldr r1, [r4, 0x8] ldrb r2, [r1, 0x11] @@ -1994,7 +1994,7 @@ _080E632E: thumb_func_start ContestEffectFunc_080E6334 ContestEffectFunc_080E6334: @ 80E6334 push {r4,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -2046,7 +2046,7 @@ _080E6390: thumb_func_start ContestEffectFunc_080E6398 ContestEffectFunc_080E6398: @ 80E6398 push {lr} - ldr r3, =gUnknown_02039F34 + ldr r3, =gContestResources ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -2090,7 +2090,7 @@ _080E63E4: ContestEffectFunc_080E63E8: @ 80E63E8 push {r4-r7,lr} sub sp, 0x4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r1, [r2] ldrb r1, [r1, 0x1] @@ -2258,7 +2258,7 @@ ContestEffectFunc_080E6520: @ 80E6520 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r1, [r2] ldrb r1, [r1, 0x1] @@ -2434,7 +2434,7 @@ ContestEffectFunc_080E6664: @ 80E6664 ContestEffectFunc_080E6668: @ 80E6668 push {r4-r7,lr} sub sp, 0x8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1] ldrb r0, [r0, 0x1] @@ -2517,7 +2517,7 @@ _080E66FC: cmp r0, 0x3 ble _080E66AA movs r6, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources adds r4, r5, 0 _080E6712: ldr r0, [r4] @@ -2576,7 +2576,7 @@ _080E676C: ContestEffectFunc_080E6778: @ 80E6778 push {lr} ldr r3, =gContestMoves - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -2613,7 +2613,7 @@ ContestEffectFunc_080E67BC: @ 80E67BC movs r0, 0 mov r8, r0 movs r4, 0 - ldr r5, =gUnknown_02039F34 + ldr r5, =gContestResources movs r6, 0 _080E67CC: ldr r3, [r5] @@ -2672,14 +2672,14 @@ _080E682E: mov r7, r8 cmp r7, 0 bne _080E684A - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E684A: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -2696,7 +2696,7 @@ _080E684A: thumb_func_start ContestEffectFunc_080E6868 ContestEffectFunc_080E6868: @ 80E6868 push {r4,lr} - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1] ldrb r0, [r0, 0x13] @@ -2745,7 +2745,7 @@ _080E68C2: movs r1, 0x1E bl sub_80DD3D4 _080E68CE: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -2764,7 +2764,7 @@ _080E68CE: thumb_func_start ContestEffectFunc_080E68EC ContestEffectFunc_080E68EC: @ 80E68EC push {r4,lr} - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r2, [r0, 0x10] ldrb r1, [r2, 0x1] @@ -2811,7 +2811,7 @@ sub_80E6934: @ 80E6934 mov r8, r0 movs r7, 0 movs r4, 0 - ldr r6, =gUnknown_02039F34 + ldr r6, =gContestResources ldr r0, =gContestMoves mov r9, r0 movs r5, 0 @@ -2861,7 +2861,7 @@ _080E699E: ble _080E694E cmp r7, 0 bne _080E69B8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -2882,7 +2882,7 @@ sub_80E69C8: @ 80E69C8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r0, [r2] ldr r0, [r0, 0x8] adds r0, 0xD @@ -2945,7 +2945,7 @@ sub_80E6A2C: @ 80E6A2C movs r2, 0x8 bl memset movs r7, 0 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] @@ -3040,7 +3040,7 @@ _080E6AD6: strh r0, [r1] _080E6AFE: adds r7, 0x1 - ldr r4, =gUnknown_02039F34 + ldr r4, =gContestResources ldr r0, [r4] ldr r0, [r0, 0x8] adds r0, 0x8 @@ -3081,7 +3081,7 @@ sub_80E6B3C: @ 80E6B3C lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02039F34 + ldr r2, =gContestResources ldr r4, [r2] ldr r3, [r4, 0x4] lsls r2, r0, 3 diff --git a/asm/contest_link_80FC4F4.s b/asm/contest_link_80FC4F4.s index 4565c75aa..0154cab36 100644 --- a/asm/contest_link_80FC4F4.s +++ b/asm/contest_link_80FC4F4.s @@ -657,7 +657,7 @@ _080FCA30: lsls r0, 24 cmp r0, 0 beq _080FCAB2 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r2, [r0] ldr r0, =gUnknown_02039F25 ldrb r0, [r0] @@ -688,7 +688,7 @@ _080FCA68: ldrb r0, [r6] cmp r2, r0 bge _080FCAA4 - ldr r1, =gUnknown_02039F34 + ldr r1, =gContestResources mov r8, r1 ldr r4, =gBlockRecvBuffer movs r3, 0 @@ -955,7 +955,7 @@ _080FCCE8: bne _080FCCF4 b _080FCE42 _080FCCF4: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x4] movs r1, 0x70 @@ -968,7 +968,7 @@ _080FCD04: bne _080FCD10 b _080FCE42 _080FCD10: - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x4] ldr r1, =gUnknown_02039F2B @@ -1004,7 +1004,7 @@ _080FCD54: lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] movs r1, 0x14 @@ -1015,7 +1015,7 @@ _080FCD6C: lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x8] ldr r1, =gUnknown_02039F2B @@ -1031,7 +1031,7 @@ _080FCD98: lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x10] b _080FCDD4 @@ -1041,7 +1041,7 @@ _080FCDB0: lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x10] b _080FCE04 diff --git a/asm/rom3.s b/asm/rom3.s index 0159a453a..f5ee3f47a 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -75,7 +75,7 @@ _080326B8: ldr r0, =gBattleExecBuffer movs r5, 0 str r5, [r0] - bl sub_80A3934 + bl ClearBattleAnimationVars bl ClearBattleMonForms movs r0, 0xF bl BattleAI_HandleItemUseBeforeAISetup diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s index 0e328358b..a4d786159 100644 --- a/asm/rom_80A5C6C.s +++ b/asm/rom_80A5C6C.s @@ -74,7 +74,7 @@ _080A5D00: lsls r0, 24 cmp r0, 0 beq _080A5D28 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -180,7 +180,7 @@ _080A5DDA: lsls r0, 24 cmp r0, 0 beq _080A5E04 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -531,7 +531,7 @@ sub_80A60AC: @ 80A60AC lsls r0, 24 cmp r0, 0 beq _080A60E8 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -554,7 +554,7 @@ _080A60E8: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A610C - ldr r1, =gUnknown_02038438 + ldr r1, =gAnimSpeciesByBanks lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -724,9 +724,9 @@ GetAnimBankSpriteId: @ 80A6240 adds r1, r0, 0 cmp r0, 0 bne _080A6268 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _080A62B6 @@ -737,9 +737,9 @@ GetAnimBankSpriteId: @ 80A6240 _080A6268: cmp r0, 0x1 bne _080A6288 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _080A62B6 @@ -750,22 +750,22 @@ _080A6268: _080A6288: cmp r1, 0x2 bne _080A62A4 - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r4, 0x2 eors r0, r4 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A62B6 b _080A62C0 .pool _080A62A4: - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r4, 0x2 eors r0, r4 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 bne _080A62C0 @@ -1242,7 +1242,7 @@ sub_80A65EC: @ 80A65EC ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x34] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -1421,7 +1421,7 @@ move_anim_8074EE0: @ 80A674C adds r4, r0, 0 bl FreeSpriteOamMatrix adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1439,7 +1439,7 @@ sub_80A6760: @ 80A6760 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x34] - ldr r5, =gAnimationBankAttacker + ldr r5, =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -1518,7 +1518,7 @@ sub_80A67F4: @ 80A67F4 movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1537,7 +1537,7 @@ sub_80A6814: @ 80A6814 movs r1, 0 bl SetGpuReg adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r4} pop {r0} bx r0 @@ -1547,7 +1547,7 @@ sub_80A6814: @ 80A6814 sub_80A6838: @ 80A6838 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -1575,13 +1575,13 @@ sub_80A6864: @ 80A6864 lsls r1, 16 lsrs r5, r1, 16 mov r8, r5 - ldr r7, =gAnimationBankAttacker + ldr r7, =gAnimBankAttacker ldrb r0, [r7] movs r1, 0 bl sub_80A5C6C lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -1729,7 +1729,7 @@ sub_80A6980: @ 80A6980 lsls r1, 24 cmp r1, 0 bne _080A69A8 - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0 bl sub_80A60AC @@ -1765,7 +1765,7 @@ sub_80A69CC: @ 80A69CC lsls r1, 24 cmp r1, 0 bne _080A69F0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A60AC @@ -1777,7 +1777,7 @@ sub_80A69CC: @ 80A69CC b _080A6A04 .pool _080A69F0: - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A60AC @@ -1862,8 +1862,8 @@ _080A6A7E: .pool thumb_func_end GetBankByIdentity - thumb_func_start sub_80A6A90 -sub_80A6A90: @ 80A6A90 + thumb_func_start AnimBankSpriteExists +AnimBankSpriteExists: @ 80A6A90 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1872,11 +1872,11 @@ sub_80A6A90: @ 80A6A90 lsls r0, 24 cmp r0, 0 beq _080A6ABC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] cmp r0, r4 beq _080A6B0A - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] cmp r0, r4 beq _080A6B0A @@ -1926,7 +1926,7 @@ _080A6B1A: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80A6A90 + thumb_func_end AnimBankSpriteExists thumb_func_start IsDoubleBattle IsDoubleBattle: @ 80A6B20 @@ -2061,7 +2061,7 @@ sub_80A6BFC: @ 80A6BFC b _080A6C60 .pool _080A6C30: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -2271,21 +2271,21 @@ _080A6DBE: movs r0, 0x3 movs r1, 0 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x3 movs r1, 0x1 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute b _080A6DE8 _080A6DD4: movs r0, 0x3 movs r1, 0 movs r2, 0x1 - bl lcd_bg_operations + bl SetAnimBgAttribute movs r0, 0x3 movs r1, 0x1 movs r2, 0 - bl lcd_bg_operations + bl SetAnimBgAttribute _080A6DE8: pop {r0} bx r0 @@ -2934,7 +2934,7 @@ sub_80A7270: @ 80A7270 cmp r0, 0 bne _080A72A6 adds r0, r7, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A72B4 @@ -3372,7 +3372,7 @@ _080A75F6: _080A7602: cmp r7, 0 beq _080A7614 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] adds r1, r0, 0 adds r1, 0x10 @@ -3383,7 +3383,7 @@ _080A7614: mov r0, r8 cmp r0, 0 beq _080A7628 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] adds r1, r0, 0 adds r1, 0x10 @@ -3394,11 +3394,11 @@ _080A7628: mov r0, r9 cmp r0, 0 beq _080A764E - ldr r6, =gAnimationBankAttacker + ldr r6, =gAnimBankAttacker ldrb r0, [r6] movs r5, 0x2 eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A764E @@ -3413,11 +3413,11 @@ _080A764E: mov r0, r10 cmp r0, 0 beq _080A7674 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] movs r5, 0x2 eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A7674 @@ -3499,7 +3499,7 @@ _080A76F2: bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A771A @@ -3517,7 +3517,7 @@ _080A771A: bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A7746 @@ -3537,7 +3537,7 @@ _080A7746: bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A7772 @@ -3558,7 +3558,7 @@ _080A7772: bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A77A0 @@ -3670,7 +3670,7 @@ _080A7838: _080A7842: adds r0, r5, 0 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3682,7 +3682,7 @@ _080A7842: _080A785C: ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r4, =gAnimationBankTarget + ldr r4, =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -3701,7 +3701,7 @@ _080A785C: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4-r7} @@ -3716,7 +3716,7 @@ sub_80A78AC: @ 80A78AC adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3730,7 +3730,7 @@ _080A78CC: ldr r4, =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, =gAnimationBankTarget + ldr r5, =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -3768,7 +3768,7 @@ sub_80A791C: @ 80A791C cmp r0, 0 beq _080A7930 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080A7930: pop {r4} pop {r0} @@ -3799,17 +3799,17 @@ _080A7954: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A69CC - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker b _080A7976 .pool _080A796C: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A6980 - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget _080A7976: ldrb r6, [r0] - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3844,7 +3844,7 @@ _080A798E: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData6 pop {r4-r7} @@ -4070,7 +4070,7 @@ _080A7B60: cmp r1, r0 bne _080A7B90 adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080A7B90: pop {r4,r5} pop {r0} @@ -4090,7 +4090,7 @@ sub_80A7B98: @ 80A7B98 cmp r3, 0xFF bne _080A7BBC adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080A7BE2 .pool _080A7BBC: @@ -4210,7 +4210,7 @@ _080A7C78: b _080A7CAC _080A7CA6: adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080A7CAC: pop {r4,r5} pop {r0} @@ -4230,7 +4230,7 @@ sub_80A7CB4: @ 80A7CB4 cmp r2, 0xFF bne _080A7CD8 adds r0, r4, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask b _080A7CEE .pool _080A7CD8: @@ -4554,7 +4554,7 @@ _080A7F42: lsls r0, 24 cmp r0, 0 beq _080A7F78 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r2, [r0] @@ -4807,7 +4807,7 @@ sub_80A8140: @ 80A8140 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gHappinessMoveAnim + ldr r0, =gAnimFriendship ldrb r0, [r0] movs r1, 0 cmp r0, 0x1E @@ -4823,7 +4823,7 @@ _080A815E: ldr r0, =gBattleAnimArgs strh r1, [r0, 0xE] adds r0, r2, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask pop {r0} bx r0 .pool @@ -4837,9 +4837,9 @@ sub_80A8174: @ 80A8174 lsls r0, 24 lsrs r4, r0, 24 adds r7, r4, 0 - ldr r6, =gAnimationBankTarget + ldr r6, =gAnimBankTarget ldrb r0, [r6] - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A81B4 @@ -4863,10 +4863,10 @@ sub_80A8174: @ 80A8174 orrs r0, r2 strb r0, [r1, 0x5] _080A81B4: - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A81EC @@ -4894,7 +4894,7 @@ _080A81EC: ldrb r0, [r6] movs r5, 0x2 eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A8224 @@ -4922,7 +4922,7 @@ _080A8224: mov r1, r8 ldrb r0, [r1] eors r0, r5 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A825C @@ -4968,7 +4968,7 @@ _080A8286: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl b_side_obj__get_some_boolean + bl IsAnimBankSpriteVisible lsls r0, 24 cmp r0, 0 beq _080A82C8 @@ -5416,7 +5416,7 @@ sub_80A861C: @ 80A861C lsls r0, 24 cmp r0, 0 beq _080A86C4 - ldr r0, =gUnknown_02039F34 + ldr r0, =gContestResources ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -5941,7 +5941,7 @@ sub_80A8A6C: @ 80A8A6C push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5998,7 +5998,7 @@ _080A8AB6: sub_80A8AEC: @ 80A8AEC push {r4,lr} adds r4, r0, 0 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6054,7 +6054,7 @@ sub_80A8B64: @ 80A8B64 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, =gAnimationBankAttacker + ldr r0, =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6081,7 +6081,7 @@ _080A8B9C: strh r0, [r4, 0x22] ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4} @@ -6106,7 +6106,7 @@ sub_80A8BC4: @ 80A8BC4 lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x8] - ldr r7, =gAnimationBankAttacker + ldr r7, =gAnimBankAttacker ldrb r0, [r7] bl GetBankSide lsls r0, 24 @@ -6283,7 +6283,7 @@ _080A8D58: ldr r0, =0x00002771 bl FreeSpritePaletteByTag adds r0, r5, 0 - bl move_anim_task_del + bl DestroyAnimVisualTask _080A8D6C: pop {r4,r5} pop {r0} @@ -6389,7 +6389,7 @@ _080A8E26: sub_80A8E30: @ 80A8E30 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =gAnimationBankAttacker + ldr r4, =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -6465,7 +6465,7 @@ _080A8EC4: cmp r0, r1 bge _080A8EDC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080A8EDC: pop {r4,r5} pop {r0} @@ -6487,7 +6487,7 @@ sub_80A8EE4: @ 80A8EE4 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x36] - ldr r0, =gAnimationBankTarget + ldr r0, =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6514,7 +6514,7 @@ _080A8F32: strh r0, [r4, 0x22] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 pop {r4,r5} diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index b657ae179..e97943840 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6,7 +6,7 @@ gUnknown_082C8D64:: @ 82C8D64 .incbin "baserom.gba", 0x2c8d64, 0x8 -gUnknown_082C8D6C:: @ 82C8D6C +gBattleAnims_Moves:: @ 82C8D6C .incbin "baserom.gba", 0x2c8d6c, 0x590 gUnknown_082C92FC:: @ 82C92FC diff --git a/data/battle_anims.s b/data/battle_anims.s index 13e1bdc2f..5cbdee7cf 100644 --- a/data/battle_anims.s +++ b/data/battle_anims.s @@ -294,7 +294,7 @@ gUnknown_08524B3C:: @ 8524B3C .byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 .align 2 -gUnknown_08524B44:: @ 8524B44 +gBattleAnimPicTable:: @ 8524B44 obj_tiles 0x08c02538, 0x0200, 0x2710 obj_tiles 0x08c1c6e0, 0x0300, 0x2711 obj_tiles 0x08c20784, 0x0200, 0x2712 @@ -597,6 +597,8 @@ gUnknown_085253AC:: @ 85253AC obj_tiles 0x08c0a3ec, 0x1000, 0x282f obj_tiles 0x08c1bee4, 0x0100, 0x2830 + .align 2 +gBattleAnimPaletteTable:: @ 852544C obj_pal 0x08c028cc, 0x2710 obj_pal 0x08c1c794, 0x2711 obj_pal 0x08c20868, 0x2712 @@ -930,18 +932,18 @@ gUnknown_08525D54:: @ 8525D54 .4byte 0x08c25bec, 0x08d91074, 0x08c27324 .align 2 -gUnknown_08525E98:: @ 8525E98 - .4byte ma00_load_graphics - .4byte ma01_080728D0 - .4byte ma02_instanciate_template - .4byte sub_80A3ECC - .4byte ma04_wait_countdown - .4byte sub_80A3F88 - .4byte nullsub_6 - .4byte nullsub_7 - .4byte sub_80A3FC4 - .4byte ma09_play_sound - .4byte sub_80A41D8 +sScriptCmdTable:: @ 8525E98 + .4byte ScriptCmd_loadspritegfx + .4byte ScriptCmd_unloadspritegfx + .4byte ScriptCmd_createsprite + .4byte ScriptCmd_createvisualtask + .4byte ScriptCmd_delay + .4byte ScriptCmd_waitforvisualfinish + .4byte ScriptCmd_hang1 + .4byte ScriptCmd_hang2 + .4byte ScriptCmd_end + .4byte ScriptCmd_playse + .4byte ScriptCmd_monbg .4byte ma0B_0807324C .4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument .4byte ma0D_reset_BLDCNT_and_BLDALPHA diff --git a/include/battle_anim.h b/include/battle_anim.h new file mode 100644 index 000000000..8ba25f9c5 --- /dev/null +++ b/include/battle_anim.h @@ -0,0 +1,48 @@ +#ifndef GUARD_BATTLE_ANIM_H +#define GUARD_BATTLE_ANIM_H + +enum +{ + ANIM_BANK_ATTACKER, + ANIM_BANK_TARGET, + ANIM_BANK_ATK_PARTNER, + ANIM_BANK_DEF_PARTNER, +}; + +enum +{ + BG_ANIM_SCREEN_SIZE, + BG_ANIM_AREA_OVERFLOW_MODE, + BG_ANIM2, + BG_ANIM3, + BG_ANIM_PRIORITY, + BG_ANIM_5, + BG_ANIM_6 +}; + +struct UnknownAnimStruct2 +{ + void *unk0; + u16 *unk4; + u8 unk8; + u8 unk9; + u16 unkA; + u16 unkC; +}; + +void ClearBattleAnimationVars(void); +void DoMoveAnim(u16 move); +void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim); +void DestroyAnimSprite(struct Sprite *sprite); +void DestroyAnimVisualTask(u8 taskId); +void DestroyAnimSoundTask(u8 taskId); +bool8 IsAnimBankSpriteVisible(u8 bank); +void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible); + +bool8 IsContest(void); + +// battle_anim_80FE840.s +void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); +void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 bankIdentity, u8 arg4, void *arg5, u16 *arg6, u16 arg7); + +#endif // GUARD_BATTLE_ANIM_H diff --git a/include/battle_interface.h b/include/battle_interface.h index cecc7bd1f..9c5b56bc8 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -24,5 +24,6 @@ void SetHealthboxSpriteVisible(u8 healthboxSpriteId); void SetHealthboxSpriteInvisible(u8 healthboxSpriteId); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); void nullsub_30(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly); +void sub_8072A88(u8 arg0); #endif // GUARD_BATTLE_INTERFACE_H diff --git a/include/contest.h b/include/contest.h index 5c473bd2c..7635e7358 100644 --- a/include/contest.h +++ b/include/contest.h @@ -1,7 +1,8 @@ #ifndef GUARD_CONTEST_H #define GUARD_CONTEST_H -struct ContestStruct_02039E00 { +struct ContestStruct_02039E00 +{ u16 unk_00; u8 unk_02[11]; u8 unk_0d[8]; @@ -11,8 +12,29 @@ struct ContestStruct_02039E00 { extern struct ContestStruct_02039E00 gUnknown_02039E00[4]; extern u8 gUnknown_02039F24; -extern EWRAM_DATA u16 gScriptContestCategory; -extern EWRAM_DATA u8 gUnknown_02039F2E; -extern EWRAM_DATA u8 gUnknown_02039F30; +extern u16 gScriptContestCategory; +extern u8 gUnknown_02039F2E; +extern u8 gUnknown_02039F30; + +struct ContestStruct_field_18 +{ + // unknown size + u16 field_0; +}; + +struct ContestResources +{ + void *field_0; + void *field_4; + void *field_8; + void *field_C; + void *field_10; + void *field_14; + struct ContestStruct_field_18 *field_18; +}; + +extern struct ContestResources *gContestResources; + +bool8 IsSpeciesNotUnown(u16 species); #endif //GUARD_CONTEST_H diff --git a/include/decompress.h b/include/decompress.h index 6c925f730..c3a771893 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -8,7 +8,7 @@ void LZDecompressVram(const void *src, void *dest); u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src); void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer); -bool8 LoadCompressedObjectPicUsingHeap(struct CompressedSpriteSheet* src); +bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src); void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src); void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer); diff --git a/include/sprite.h b/include/sprite.h index a9377165e..531314079 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -251,7 +251,7 @@ void BuildOamBuffer(void); u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); void DestroySprite(struct Sprite *sprite); void ResetOamRange(u8 a, u8 b); void LoadOam(void); diff --git a/ld_script.txt b/ld_script.txt index 04e394b5c..f56047947 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -113,6 +113,7 @@ SECTIONS { src/tileset_anims.o(.text); src/palette.o(.text); src/sound.o(.text); + src/battle_anim.o(.text); asm/battle_anim.o(.text); asm/rom_80A5C6C.o(.text); src/task.o(.text); diff --git a/src/battle_anim.c b/src/battle_anim.c new file mode 100644 index 000000000..6c316157f --- /dev/null +++ b/src/battle_anim.c @@ -0,0 +1,650 @@ +#include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "sprite.h" +#include "contest.h" +#include "m4a.h" +#include "pokemon.h" +#include "battle_interface.h" +#include "task.h" +#include "decompress.h" +#include "sound.h" +#include "dma3.h" +#include "bg.h" +#include "gpu_regs.h" +#include "palette.h" + +// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. +#define GET_TRUE_SPRITE_INDEX(i) ((i - 10000)) +#define SCRIPT_READ_32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) +#define SCRIPT_READ_32_(ptr) (((ptr)[0]) + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) +#define SCRIPT_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) +#define SCRIPT_READ_16_(ptr) ((ptr)[0] + ((ptr)[1] << 8)) + +#define ANIM_SPRITE_INDEX_COUNT 8 +#define ANIM_ARGS_COUNT 8 + +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattlePartyID[BATTLE_BANKS_COUNT]; +extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT]; +extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlay_SE1; +extern struct MusicPlayerInfo gMPlay_SE2; + +EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL; +EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL; +EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL; +EWRAM_DATA s8 gAnimFramesToWait = 0; +EWRAM_DATA bool8 gAnimScriptActive = FALSE; +EWRAM_DATA u8 gAnimVisualTaskCount = 0; +EWRAM_DATA u8 gAnimSoundTaskCount = 0; +EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL; +EWRAM_DATA u32 gAnimMoveDmg = 0; +EWRAM_DATA u16 gAnimMovePower = 0; +EWRAM_DATA u16 gAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT] = {0}; +EWRAM_DATA u8 gAnimFriendship = 0; +EWRAM_DATA u16 gWeatherMoveAnim = 0; +EWRAM_DATA s16 gBattleAnimArgs[ANIM_ARGS_COUNT] = {0}; +EWRAM_DATA u16 gSoundAnimFramesToWait = 0; +EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0}; +EWRAM_DATA u8 gUnknown_02038432 = 0; +EWRAM_DATA u8 gUnknown_02038433 = 0; +EWRAM_DATA u16 gAnimMoveIndex = 0; // set but unused. +EWRAM_DATA u8 gAnimBankAttacker = 0; +EWRAM_DATA u8 gAnimBankTarget = 0; +EWRAM_DATA u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT] = {0}; +EWRAM_DATA u8 gUnknown_02038440 = 0; + +extern void (* const sScriptCmdTable[])(void); +extern const u16 gUnknown_082C8D64[]; +extern const u8 * const gBattleAnims_Moves[]; +extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; +extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; + +extern void sub_80A8278(void); // rom_80A5C6C.s +extern void sub_80A6B30(struct UnknownAnimStruct2*); // rom_80A5C6C.s +extern void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); // rom_80A5C6C.s +extern u8 sub_80A82E4(u8 bank); // rom_80A5C6C.s +extern u8 sub_80A5C6C(u8 bank, u8 attributeId); // rom_80A5C6C.s +extern bool8 AnimBankSpriteExists(u8 bank); // rom_80A5C6C.s + +// this file's functions +void RunAnimScriptCommand(void); +void task_pA_ma0A_obj_to_bg_pal(u8 taskId); +void sub_80A46A0(void); + +void ClearBattleAnimationVars(void) +{ + s32 i; + + gAnimFramesToWait = 0; + gAnimScriptActive = FALSE; + gAnimVisualTaskCount = 0; + gAnimSoundTaskCount = 0; + gAnimDisableStructPtr = NULL; + gAnimMoveDmg = 0; + gAnimMovePower = 0; + gAnimFriendship = 0; + + // clear index array. + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) + gAnimSpriteIndexArray[i] |= 0xFFFF; + + // clear anim args. + for (i = 0; i < ANIM_ARGS_COUNT; i++) + gBattleAnimArgs[i] = 0; + + gMonAnimTaskIdArray[0] = 0xFF; + gMonAnimTaskIdArray[1] = 0xFF; + gUnknown_02038432 = 0; + gUnknown_02038433 = 0; + gAnimMoveIndex = 0; + gAnimBankAttacker = 0; + gAnimBankTarget = 0; + gUnknown_02038440 = 0; +} + +void DoMoveAnim(u16 move) +{ + gAnimBankAttacker = gBankAttacker; + gAnimBankTarget = gBankTarget; + DoBattleAnim(gBattleAnims_Moves, move, TRUE); +} + +void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim) +{ + s32 i; + + if (!IsContest()) + { + sub_80A8278(); + sub_8072A88(0); + for (i = 0; i < BATTLE_BANKS_COUNT; i++) + { + if (GetBankSide(i) != 0) + gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); + else + gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); + } + } + else + { + for (i = 0; i < 4; i++) + gAnimSpeciesByBanks[i] = gContestResources->field_18->field_0; + } + + if (!isMoveAnim) + gAnimMoveIndex = 0; + else + gAnimMoveIndex = tableId; + + for (i = 0; i < ANIM_ARGS_COUNT; i++) + gBattleAnimArgs[i] = 0; + + gMonAnimTaskIdArray[0] = 0xFF; + gMonAnimTaskIdArray[1] = 0xFF; + gBattleAnimScriptPtr = animsTable[tableId]; + gAnimScriptActive = TRUE; + gAnimFramesToWait = 0; + gAnimScriptCallback = RunAnimScriptCommand; + + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) + gAnimSpriteIndexArray[i] |= 0xFFFF; + + if (isMoveAnim) + { + for (i = 0; gUnknown_082C8D64[i] != 0xFFFF; i++) + { + if (tableId == gUnknown_082C8D64[i]) + { + m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128); + break; + } + } + } + + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + gBattle_WIN1H = 0; + gBattle_WIN1V = 0; +} + +void DestroyAnimSprite(struct Sprite *sprite) +{ + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + gAnimVisualTaskCount--; +} + +void DestroyAnimVisualTask(u8 taskId) +{ + DestroyTask(taskId); + gAnimVisualTaskCount--; +} + +void DestroyAnimSoundTask(u8 taskId) +{ + DestroyTask(taskId); + gAnimSoundTaskCount--; +} + +/*static*/ void AddSpriteIndex(u16 index) +{ + s32 i; + + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) + { + if (gAnimSpriteIndexArray[i] == 0xFFFF) + { + gAnimSpriteIndexArray[i] = index; + return; + } + } +} + +/*static*/ void ClearSpriteIndex(u16 index) +{ + s32 i; + + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) + { + if (gAnimSpriteIndexArray[i] == index) + { + gAnimSpriteIndexArray[i] |= 0xFFFF; + return; + } + } +} + +/*static*/ void WaitAnimFrameCount(void) +{ + if (gAnimFramesToWait <= 0) + { + gAnimScriptCallback = RunAnimScriptCommand; + gAnimFramesToWait = 0; + } + else + { + gAnimFramesToWait--; + } +} + +/*static*/ void RunAnimScriptCommand(void) +{ + do + { + sScriptCmdTable[gBattleAnimScriptPtr[0]](); + } while (gAnimFramesToWait == 0 && gAnimScriptActive); +} + +/*static*/ void ScriptCmd_loadspritegfx(void) +{ + u16 index; + + gBattleAnimScriptPtr++; + index = SCRIPT_READ_16(gBattleAnimScriptPtr); + LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]); + LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]); + gBattleAnimScriptPtr += 2; + AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); + gAnimFramesToWait = 1; + gAnimScriptCallback = WaitAnimFrameCount; +} + +/*static*/ void ScriptCmd_unloadspritegfx(void) +{ + u16 index; + + gBattleAnimScriptPtr++; + index = SCRIPT_READ_16(gBattleAnimScriptPtr); + FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); + FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); + gBattleAnimScriptPtr += 2; + ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); +} + +/*static*/ void ScriptCmd_createsprite(void) +{ + s32 i; + const struct SpriteTemplate *template; + u8 argVar; + u8 argsCount; + s16 subpriority; + + gBattleAnimScriptPtr++; + template = (const struct SpriteTemplate *)(SCRIPT_READ_32_(gBattleAnimScriptPtr)); + gBattleAnimScriptPtr += 4; + + argVar = gBattleAnimScriptPtr[0]; + gBattleAnimScriptPtr++; + + argsCount = gBattleAnimScriptPtr[0]; + gBattleAnimScriptPtr++; + for (i = 0; i < argsCount; i++) + { + gBattleAnimArgs[i] = SCRIPT_READ_16(gBattleAnimScriptPtr); + gBattleAnimScriptPtr += 2; + } + + if (argVar & 0x80) + { + argVar ^= 0x80; + if (argVar >= 0x40) + argVar -= 0x40; + else + argVar *= -1; + + subpriority = sub_80A82E4(gAnimBankTarget) + (s8)(argVar); + } + else + { + if (argVar >= 0x40) + argVar -= 0x40; + else + argVar *= -1; + + subpriority = sub_80A82E4(gAnimBankAttacker) + (s8)(argVar); + } + + if (subpriority < 3) + subpriority = 3; + + CreateSpriteAndAnimate(template, sub_80A5C6C(gAnimBankTarget, 2), sub_80A5C6C(gAnimBankTarget, 3), subpriority); + gAnimVisualTaskCount++; +} + +/*static*/ void ScriptCmd_createvisualtask(void) +{ + TaskFunc taskFunc; + u8 taskPriority; + u8 taskId; + u8 numArgs; + s32 i; + + gBattleAnimScriptPtr++; + + taskFunc = (TaskFunc)SCRIPT_READ_32_(gBattleAnimScriptPtr); + gBattleAnimScriptPtr += 4; + + taskPriority = gBattleAnimScriptPtr[0]; + gBattleAnimScriptPtr++; + + numArgs = gBattleAnimScriptPtr[0]; + gBattleAnimScriptPtr++; + + for (i = 0; i < numArgs; i++) + { + gBattleAnimArgs[i] = SCRIPT_READ_16(gBattleAnimScriptPtr); + gBattleAnimScriptPtr += 2; + } + + taskId = CreateTask(taskFunc, taskPriority); + taskFunc(taskId); + gAnimVisualTaskCount++; +} + +/*static*/ void ScriptCmd_delay(void) +{ + gBattleAnimScriptPtr++; + gAnimFramesToWait = gBattleAnimScriptPtr[0]; + if (gAnimFramesToWait == 0) + gAnimFramesToWait = -1; + gBattleAnimScriptPtr++; + gAnimScriptCallback = WaitAnimFrameCount; +} + +// wait for visual tasks to finish. +/*static*/ void ScriptCmd_waitforvisualfinish(void) +{ + if (gAnimVisualTaskCount == 0) + { + gBattleAnimScriptPtr++; + gAnimFramesToWait = 0; + } + else + { + gAnimFramesToWait = 1; + } +} + +/*static*/ void ScriptCmd_hang1(void) +{ +} + +/*static*/ void ScriptCmd_hang2(void) +{ +} + +/*static*/ void ScriptCmd_end(void) +{ + s32 i; + bool32 continuousAnim = FALSE; + + // keep waiting as long as there is animations to be done. + if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 + || gMonAnimTaskIdArray[0] != 0xFF || gMonAnimTaskIdArray[1] != 0xFF) + { + gSoundAnimFramesToWait = 0; + gAnimFramesToWait = 1; + return; + } + + // finish the sound effects. + if (IsSEPlaying()) + { + if (++gSoundAnimFramesToWait <= 90) // wait 90 frames, then halt the sound effect. + { + gAnimFramesToWait = 1; + return; + } + else + { + m4aMPlayStop(&gMPlay_SE1); + m4aMPlayStop(&gMPlay_SE2); + } + } + + // the SE has halted, so set the SE Frame Counter to 0 and continue. + gSoundAnimFramesToWait = 0; + + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) + { + if (gAnimSpriteIndexArray[i] != 0xFFFF) + { + FreeSpriteTilesByTag(gBattleAnimPicTable[gAnimSpriteIndexArray[i]].tag); + FreeSpritePaletteByTag(gBattleAnimPicTable[gAnimSpriteIndexArray[i]].tag); + gAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator. + } + } + + if (!continuousAnim) // may have been used for debug? + { + m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); + if (!IsContest()) + { + sub_80A8278(); + sub_8072A88(1); + } + gAnimScriptActive = FALSE; + } +} + +/*static*/ void ScriptCmd_playse(void) +{ + gBattleAnimScriptPtr++; + PlaySE(SCRIPT_READ_16(gBattleAnimScriptPtr)); + gBattleAnimScriptPtr += 2; +} + +#define t1_MONBG_BANK 0 +#define t1_MON_IN_BG2 1 +#define t1_CREATE_ANOTHER_TASK 2 +#define t1_IS_SECONDMON_BG 3 + +#define t2_BANK_SPRITE_ID 0 +#define t2_MON_IN_BG2 5 +#define t2_MONBG_BANK 6 + +/*static*/ void sub_80A40F4(u8 taskId) +{ + u8 newTaskId; + + s16 *selfData = gTasks[taskId].data; + u8 bankSpriteId = gBankSpriteIds[selfData[t1_MONBG_BANK]]; + gSprites[bankSpriteId].invisible = 1; + + if (!selfData[t1_CREATE_ANOTHER_TASK]) + { + DestroyAnimVisualTask(taskId); + return; + } + + newTaskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); + gTasks[newTaskId].data[t2_BANK_SPRITE_ID] = bankSpriteId; + gTasks[newTaskId].data[1] = gSprites[bankSpriteId].pos1.x + gSprites[bankSpriteId].pos2.x; + gTasks[newTaskId].data[2] = gSprites[bankSpriteId].pos1.y + gSprites[bankSpriteId].pos2.y; + + if (!selfData[t1_MON_IN_BG2]) + { + gTasks[newTaskId].data[3] = gBattle_BG1_X; + gTasks[newTaskId].data[4] = gBattle_BG1_Y; + } + else + { + gTasks[newTaskId].data[3] = gBattle_BG2_X; + gTasks[newTaskId].data[4] = gBattle_BG2_Y; + } + + gTasks[newTaskId].data[t2_MON_IN_BG2] = selfData[t1_MON_IN_BG2]; + gTasks[newTaskId].data[t2_MONBG_BANK] = selfData[t1_MONBG_BANK]; + gMonAnimTaskIdArray[selfData[t1_IS_SECONDMON_BG]] = newTaskId; + DestroyAnimVisualTask(taskId); +} + +/*static*/ void ScriptCmd_monbg(void) +{ + bool8 toBG_2; + u8 taskId; + u8 bank; + u8 animBank; + + gBattleAnimScriptPtr++; + + animBank = gBattleAnimScriptPtr[0]; + if (animBank & ANIM_BANK_TARGET) + bank = gAnimBankTarget; + else + bank = gAnimBankAttacker; + + if (IsAnimBankSpriteVisible(bank)) + { + u8 identity = GetBankIdentity(bank); + if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest()) + toBG_2 = FALSE; + else + toBG_2 = TRUE; + + sub_80A438C(bank, toBG_2, FALSE); + taskId = CreateTask(sub_80A40F4, 10); + gAnimVisualTaskCount++; + gTasks[taskId].data[t1_MONBG_BANK] = bank; + gTasks[taskId].data[t1_MON_IN_BG2] = toBG_2; + gTasks[taskId].data[t1_CREATE_ANOTHER_TASK] = TRUE; + gTasks[taskId].data[t1_IS_SECONDMON_BG] = 0; + + } + + bank ^= BIT_MON; + if (IsAnimBankSpriteVisible(bank)) + { + u8 identity = GetBankIdentity(bank); + if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest()) + toBG_2 = FALSE; + else + toBG_2 = TRUE; + + sub_80A438C(bank, toBG_2, FALSE); + taskId = CreateTask(sub_80A40F4, 10); + gAnimVisualTaskCount++; + gTasks[taskId].data[0] = bank; + gTasks[taskId].data[1] = toBG_2; + gTasks[taskId].data[t1_CREATE_ANOTHER_TASK] = TRUE; + gTasks[taskId].data[t1_IS_SECONDMON_BG] = 1; + } + + gBattleAnimScriptPtr++; + gAnimFramesToWait = 1; + gAnimScriptCallback = WaitAnimFrameCount; +} + +bool8 IsAnimBankSpriteVisible(u8 bank) +{ + if (IsContest()) + { + if (bank == gAnimBankAttacker) + return TRUE; + else + return FALSE; + } + if (!AnimBankSpriteExists(bank)) + return FALSE; + if (IsContest()) + return TRUE; // this line wont ever be reached. + if (!gBattleSpritesDataPtr->bankData[bank].invisible || !gSprites[gBankSpriteIds[bank]].invisible) + return TRUE; + + return FALSE; +} + +void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible) +{ + struct UnknownAnimStruct2 unknownStruct; + u8 bankSpriteId; + + if (!toBG_2) + { + u8 bankIdentity; + + if (IsContest() == TRUE) + { + RequestDma3Fill(0, (void*)(VRAM + 0x8000), 0x2000, 1); + RequestDma3Fill(0xFF, (void*)(VRAM + 0xF000), 0x1000, 0); + } + else + { + RequestDma3Fill(0, (void*)(VRAM + 0x4000), 0x2000, 1); + RequestDma3Fill(0xFF, (void*)(VRAM + 0xe000), 0x1000, 0); + } + + sub_80A6B30(&unknownStruct); + CpuFill16(0, unknownStruct.unk0, 0x1000); + CpuFill16(0xFF, unknownStruct.unk4, 0x800); + + SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 2); + SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1); + SetAnimBgAttribute(1, BG_ANIM_AREA_OVERFLOW_MODE, 0); + + bankSpriteId = gBankSpriteIds[bank]; + + gBattle_BG1_X = -(gSprites[bankSpriteId].pos1.x + gSprites[bankSpriteId].pos2.x) + 0x20; + if (IsContest() && IsSpeciesNotUnown(gContestResources->field_18->field_0)) + gBattle_BG1_X--; + + gBattle_BG1_Y = -(gSprites[bankSpriteId].pos1.y + gSprites[bankSpriteId].pos2.y) + 0x20; + if (setSpriteInvisible) + gSprites[gBankSpriteIds[bank]].invisible = 1; + + SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); + SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); + + LoadPalette(&gPlttBufferUnfaded[0x100 + bank * 16], unknownStruct.unk8 * 16, 0x20); + CpuCopy32(&gPlttBufferUnfaded[0x100 + bank * 16], (void*)(BG_PLTT + unknownStruct.unk8 * 32), 0x20); + + if (IsContest()) + bankIdentity = 0; + else + bankIdentity = GetBankIdentity(bank); + + sub_8118FBC(1, 0, 0, bankIdentity, unknownStruct.unk8, unknownStruct.unk0, unknownStruct.unk4, unknownStruct.unkA); + + if (IsContest()) + sub_80A46A0(); + } + else + { + RequestDma3Fill(0, (void*)(VRAM + 0x6000), 0x2000, 1); + RequestDma3Fill(0, (void*)(VRAM + 0xF000), 0x1000, 1); + sub_80A6B90(&unknownStruct, 2); + CpuFill16(0, unknownStruct.unk0 + 0x1000, 0x1000); + CpuFill16(0, unknownStruct.unk4 + 0x400, 0x800); + SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2); + SetAnimBgAttribute(2, BG_ANIM_SCREEN_SIZE, 1); + SetAnimBgAttribute(2, BG_ANIM_AREA_OVERFLOW_MODE, 0); + + bankSpriteId = gBankSpriteIds[bank]; + + gBattle_BG2_X = -(gSprites[bankSpriteId].pos1.x + gSprites[bankSpriteId].pos2.x) + 0x20; + gBattle_BG2_Y = -(gSprites[bankSpriteId].pos1.y + gSprites[bankSpriteId].pos2.y) + 0x20; + + if (setSpriteInvisible) + gSprites[gBankSpriteIds[bank]].invisible = 1; + + SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X); + SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y); + + LoadPalette(&gPlttBufferUnfaded[0x100 + bank * 16], 0x90, 0x20); + CpuCopy32(&gPlttBufferUnfaded[0x100 + bank * 16], (void*)(BG_PLTT + 0x120), 0x20); + + sub_8118FBC(2, 0, 0, GetBankIdentity(bank), unknownStruct.unk8, unknownStruct.unk0 + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.unkA); + } +} + diff --git a/src/decompress.c b/src/decompress.c index 2863ff1f5..9210799ec 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -465,7 +465,7 @@ u32 sub_8034974(void* ptr) return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]); } -bool8 LoadCompressedObjectPicUsingHeap(struct CompressedSpriteSheet* src) +bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src) { struct SpriteSheet dest; void* buffer; diff --git a/src/sprite.c b/src/sprite.c index 17b0f181a..daa019019 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -594,7 +594,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, return index; } -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) { u8 i; diff --git a/sym_ewram.txt b/sym_ewram.txt index 8ce7ce8df..71865e103 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -713,77 +713,9 @@ gUnknown_02037622: @ 2037622 .include "src/tileset_anims.o" .include "src/palette.o" .include "src/sound.o" - - .align 0x2 + .include "src/battle_anim.o" -gBattleAnimScriptPtr: @ 20383F0 - .space 0x4 - -gBattleAnimScriptRetAddr: @ 20383F4 - .space 0x4 - -gAnimScriptCallback: @ 20383F8 - .space 0x4 - -gAnimFramesToWait: @ 20383FC - .space 0x1 - -gAnimScriptActive: @ 20383FD - .space 0x1 - -gAnimVisualTaskCount: @ 20383FE - .space 0x1 - -gAnimSoundTaskCount: @ 20383FF - .space 0x1 - -gDisableStructMoveAnim: @ 2038400 - .space 0x4 - -gMoveDmgMoveAnim: @ 2038404 - .space 0x4 - -gMovePowerMoveAnim: @ 2038408 - .space 0x2 - -gAnimSpriteIndexArray: @ 203840A - .space 0x10 - -gHappinessMoveAnim: @ 203841A - .space 0x2 - -gWeatherMoveAnim: @ 203841C - .space 0x2 - -gBattleAnimArgs: @ 203841E - .space 0x10 - -gSoundAnimFramesToWait: @ 203842E - .space 0x2 - -gUnknown_02038430: @ 2038430 - .space 0x2 - -gUnknown_02038432: @ 2038432 - .space 0x1 - -gUnknown_02038433: @ 2038433 - .space 0x1 - -gAnimMoveIndex: @ 2038434 - .space 0x2 - -gAnimationBankAttacker: @ 2038436 - .space 0x1 - -gAnimationBankTarget: @ 2038437 - .space 0x1 - -gUnknown_02038438: @ 2038438 - .space 0x8 - -gUnknown_02038440: @ 2038440 - .space 0x4 +.align 2 gUnknown_02038444: @ 2038444 .space 0x10 @@ -1058,7 +990,7 @@ gUnknown_02039F30: @ 2039F30 gUnknown_02039F31: @ 2039F31 .space 0x3 -gUnknown_02039F34: @ 2039F34 +gContestResources: @ 2039F34 .space 0x4 gUnknown_02039F38: @ 2039F38