summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_1.s48
-rw-r--r--asm/battle_2.s124
-rw-r--r--asm/battle_anim_81258BC.s56
-rw-r--r--asm/battle_anim_812C144.s812
-rw-r--r--asm/battle_anim_813F0F4.s176
-rwxr-xr-xasm/battle_intro.s84
-rwxr-xr-xasm/bug.s114
-rw-r--r--asm/contest_link_80C2020.s104
-rwxr-xr-xasm/current.s156
-rwxr-xr-xasm/dark.s178
-rwxr-xr-xasm/dragon.s102
-rwxr-xr-xasm/fight.s200
-rwxr-xr-xasm/fire.s360
-rwxr-xr-xasm/fire_2.s955
-rwxr-xr-xasm/flying.s172
-rwxr-xr-xasm/ghost.s160
-rwxr-xr-xasm/ground.s180
-rwxr-xr-xasm/ice.s266
-rw-r--r--asm/macros/battle_script.inc482
-rw-r--r--asm/macros/event.inc10
-rw-r--r--asm/macros/map.inc12
-rwxr-xr-xasm/normal.s318
-rwxr-xr-xasm/poison.s44
-rw-r--r--asm/pokemon_storage_system.s12
-rw-r--r--asm/pokenav.s2
-rwxr-xr-xasm/psychic.s144
-rwxr-xr-xasm/rock.s104
-rw-r--r--asm/slot_machine.s10158
-rwxr-xr-xasm/water.s66
-rwxr-xr-xasm/wisp_fire.s22
30 files changed, 2173 insertions, 13448 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s
index c37418e5c..f0a883ec4 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -490,8 +490,8 @@ _0800D7B0: .4byte 0x0000675a
_0800D7B4: .4byte gPlttBufferFaded + 0xB8
thumb_func_end sub_800D74C
- thumb_func_start sub_800D7B8
-sub_800D7B8: @ 800D7B8
+ thumb_func_start DrawMainBattleBackground
+DrawMainBattleBackground: @ 800D7B8
push {r4,r5,lr}
ldr r0, _0800D7DC @ =gBattleTypeFlags
ldrh r1, [r0]
@@ -792,7 +792,7 @@ _0800DAA8: .4byte 0x06008000
_0800DAAC: .4byte gBattleTerrainTilemap_Building
_0800DAB0: .4byte 0x0600d000
_0800DAB4: .4byte gBattleTerrainPalette_BattleTower
- thumb_func_end sub_800D7B8
+ thumb_func_end DrawMainBattleBackground
thumb_func_start sub_800DAB8
sub_800DAB8: @ 800DAB8
@@ -811,7 +811,7 @@ sub_800DAB8: @ 800DAB8
movs r2, 0x40
bl LoadCompressedPalette
bl sub_800D74C
- bl sub_800D7B8
+ bl DrawMainBattleBackground
pop {r0}
bx r0
.align 2, 0
@@ -1231,7 +1231,7 @@ _0800E03C:
ldrsh r0, [r6, r1]
cmp r0, 0
beq _0800E0A4
- ldr r4, _0800E090 @ =gUnknown_030042C0
+ ldr r4, _0800E090 @ =gBattle_BG1_X
ldrh r0, [r6, 0xA]
bl Sin2
lsls r0, 16
@@ -1246,7 +1246,7 @@ _0800E056:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
- ldr r4, _0800E094 @ =gUnknown_03004288
+ ldr r4, _0800E094 @ =gBattle_BG2_X
ldrh r0, [r6, 0xC]
bl Sin2
lsls r0, 16
@@ -1261,21 +1261,21 @@ _0800E074:
adds r0, r5, 0
subs r0, r1
strh r0, [r4]
- ldr r0, _0800E098 @ =gUnknown_030041B4
+ ldr r0, _0800E098 @ =gBattle_BG1_Y
ldr r2, _0800E09C @ =0x0000ffdc
adds r1, r2, 0
strh r1, [r0]
- ldr r0, _0800E0A0 @ =gUnknown_03004280
+ ldr r0, _0800E0A0 @ =gBattle_BG2_Y
strh r1, [r0]
b _0800E110
.align 2, 0
-_0800E090: .4byte gUnknown_030042C0
-_0800E094: .4byte gUnknown_03004288
-_0800E098: .4byte gUnknown_030041B4
+_0800E090: .4byte gBattle_BG1_X
+_0800E094: .4byte gBattle_BG2_X
+_0800E098: .4byte gBattle_BG1_Y
_0800E09C: .4byte 0x0000ffdc
-_0800E0A0: .4byte gUnknown_03004280
+_0800E0A0: .4byte gBattle_BG2_Y
_0800E0A4:
- ldr r4, _0800E134 @ =gUnknown_030042C0
+ ldr r4, _0800E134 @ =gBattle_BG1_X
ldrh r0, [r6, 0xA]
bl Sin2
lsls r0, 16
@@ -1290,7 +1290,7 @@ _0800E0B6:
adds r0, r5, 0
subs r0, r1
strh r0, [r4]
- ldr r4, _0800E138 @ =gUnknown_030041B4
+ ldr r4, _0800E138 @ =gBattle_BG1_Y
ldrh r0, [r6, 0xA]
bl Cos2
lsls r0, 16
@@ -1302,7 +1302,7 @@ _0800E0D4:
asrs r0, 5
subs r0, 0xA4
strh r0, [r4]
- ldr r4, _0800E13C @ =gUnknown_03004288
+ ldr r4, _0800E13C @ =gBattle_BG2_X
ldrh r0, [r6, 0xC]
bl Sin2
lsls r0, 16
@@ -1317,7 +1317,7 @@ _0800E0EC:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
- ldr r4, _0800E140 @ =gUnknown_03004280
+ ldr r4, _0800E140 @ =gBattle_BG2_Y
ldrh r0, [r6, 0xC]
bl Cos2
lsls r0, 16
@@ -1348,10 +1348,10 @@ _0800E110:
strh r0, [r1, 0xA]
b _0800E212
.align 2, 0
-_0800E134: .4byte gUnknown_030042C0
-_0800E138: .4byte gUnknown_030041B4
-_0800E13C: .4byte gUnknown_03004288
-_0800E140: .4byte gUnknown_03004280
+_0800E134: .4byte gBattle_BG1_X
+_0800E138: .4byte gBattle_BG1_Y
+_0800E13C: .4byte gBattle_BG2_X
+_0800E140: .4byte gBattle_BG2_Y
_0800E144: .4byte gTasks
_0800E148:
movs r5, 0x12
@@ -1506,11 +1506,11 @@ sub_800E23C: @ 800E23C
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- ldr r0, _0800E2CC @ =gUnknown_030041B4
+ ldr r0, _0800E2CC @ =gBattle_BG1_Y
ldr r2, _0800E2D0 @ =0x0000ff5c
adds r1, r2, 0
strh r1, [r0]
- ldr r0, _0800E2D4 @ =gUnknown_03004280
+ ldr r0, _0800E2D4 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800E2D8 @ =gUnknown_081F95A4
bl LoadCompressedObjectPic
@@ -1528,9 +1528,9 @@ _0800E2BC: .4byte gVersusFramePal
_0800E2C0: .4byte REG_BG1CNT
_0800E2C4: .4byte 0x00005c04
_0800E2C8: .4byte REG_WININ
-_0800E2CC: .4byte gUnknown_030041B4
+_0800E2CC: .4byte gBattle_BG1_Y
_0800E2D0: .4byte 0x0000ff5c
-_0800E2D4: .4byte gUnknown_03004280
+_0800E2D4: .4byte gBattle_BG2_Y
_0800E2D8: .4byte gUnknown_081F95A4
_0800E2DC:
ldr r0, _0800E2F0 @ =0x00000902
diff --git a/asm/battle_2.s b/asm/battle_2.s
index dd720ec79..5a751ba55 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -426,13 +426,13 @@ _080126C2:
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
- ldr r1, _080126DC @ =gUnknown_081D9B29
+ ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed
b _080129CC
.align 2, 0
_080126D0: .4byte gBattleTypeFlags
_080126D4: .4byte 0x00000902
_080126D8: .4byte gUnknown_02024C1C
-_080126DC: .4byte gUnknown_081D9B29
+_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed
_080126E0:
ldr r3, _08012738 @ =gSharedMem
ldr r5, _0801273C @ =gActiveBank
@@ -661,7 +661,7 @@ _080128B0:
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
- ldr r1, _080128F4 @ =gUnknown_081D8E4A
+ ldr r1, _080128F4 @ =BattleScript_PrintFullBox
str r1, [r0]
ldr r0, _080128F8 @ =gBattleCommunication
ldrb r1, [r2]
@@ -684,7 +684,7 @@ _080128B0:
.align 2, 0
_080128EC: .4byte gUnknown_02024C1C
_080128F0: .4byte gActiveBank
-_080128F4: .4byte gUnknown_081D8E4A
+_080128F4: .4byte BattleScript_PrintFullBox
_080128F8: .4byte gBattleCommunication
_080128FC: .4byte gSharedMem
_08012900: .4byte 0x00016060
@@ -747,7 +747,7 @@ _08012968:
ldrb r0, [r1]
cmp r0, 0x3
bne _080129A8
- ldr r0, _080129A0 @ =gUnknown_081D8E37
+ ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer
bl b_call_bc_move_exec
ldr r1, _080129A4 @ =gBattleCommunication
ldrb r0, [r4]
@@ -757,7 +757,7 @@ _08012968:
_08012994: .4byte gBattleTypeFlags
_08012998: .4byte gBattleBufferB
_0801299C: .4byte gActiveBank
-_080129A0: .4byte gUnknown_081D8E37
+_080129A0: .4byte BattleScript_PrintCantRunFromTrainer
_080129A4: .4byte gBattleCommunication
_080129A8:
bl CanRunFromBattle
@@ -776,7 +776,7 @@ _080129A8:
ldr r1, _080129FC @ =gUnknown_02024C1C
lsls r0, r2, 2
adds r0, r1
- ldr r1, _08012A00 @ =gUnknown_081D8E44
+ ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle
_080129CC:
str r1, [r0]
ldr r0, _08012A04 @ =gBattleCommunication
@@ -801,7 +801,7 @@ _080129CC:
_080129F4: .4byte gBattleBufferB
_080129F8: .4byte gActiveBank
_080129FC: .4byte gUnknown_02024C1C
-_08012A00: .4byte gUnknown_081D8E44
+_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle
_08012A04: .4byte gBattleCommunication
_08012A08: .4byte gSharedMem
_08012A0C: .4byte 0x00016060
@@ -2790,7 +2790,7 @@ _08013A04:
_08013A0E:
bl BattleMusicStop
ldr r1, _08013A3C @ =gBattlescriptCurrInstr
- ldr r0, _08013A40 @ =gUnknown_081D8DBE
+ ldr r0, _08013A40 @ =BattleScript_LocalTrainerBattleWon
str r0, [r1]
ldr r2, _08013A44 @ =gTrainers
ldr r0, _08013A48 @ =gTrainerBattleOpponent
@@ -2812,7 +2812,7 @@ _08013A30:
mov pc, r0
.align 2, 0
_08013A3C: .4byte gBattlescriptCurrInstr
-_08013A40: .4byte gUnknown_081D8DBE
+_08013A40: .4byte BattleScript_LocalTrainerBattleWon
_08013A44: .4byte gTrainers
_08013A48: .4byte gTrainerBattleOpponent
_08013A4C: .4byte _08013A50
@@ -2891,7 +2891,7 @@ _08013B38:
b _08013B48
_08013B42:
ldr r1, _08013B54 @ =gBattlescriptCurrInstr
- ldr r0, _08013B58 @ =gUnknown_081D8DCE
+ ldr r0, _08013B58 @ =BattleScript_PayDayMoneyAndPickUpItems
_08013B46:
str r0, [r1]
_08013B48:
@@ -2903,7 +2903,7 @@ _08013B48:
bx r0
.align 2, 0
_08013B54: .4byte gBattlescriptCurrInstr
-_08013B58: .4byte gUnknown_081D8DCE
+_08013B58: .4byte BattleScript_PayDayMoneyAndPickUpItems
_08013B5C: .4byte gBattleMainFunc
_08013B60: .4byte sub_8013C9C
thumb_func_end sub_8013998
@@ -2946,7 +2946,7 @@ _08013BB0: .4byte gBattlescriptCurrInstr
_08013BB4: .4byte gUnknown_081D8E02
_08013BB8:
ldr r1, _08013BCC @ =gBattlescriptCurrInstr
- ldr r0, _08013BD0 @ =gUnknown_081D8DD1
+ ldr r0, _08013BD0 @ =BattleScript_LocalBattleLost
str r0, [r1]
_08013BBE:
ldr r1, _08013BD4 @ =gBattleMainFunc
@@ -2957,7 +2957,7 @@ _08013BBE:
bx r0
.align 2, 0
_08013BCC: .4byte gBattlescriptCurrInstr
-_08013BD0: .4byte gUnknown_081D8DD1
+_08013BD0: .4byte BattleScript_LocalBattleLost
_08013BD4: .4byte gBattleMainFunc
_08013BD8: .4byte sub_8013C9C
thumb_func_end sub_8013B64
@@ -2981,24 +2981,24 @@ sub_8013BDC: @ 8013BDC
cmp r0, 0x2
beq _08013C28
ldr r1, _08013C10 @ =gBattlescriptCurrInstr
- ldr r0, _08013C14 @ =gUnknown_081D8E29
+ ldr r0, _08013C14 @ =BattleScript_GotAwaySafely
b _08013C2C
.align 2, 0
_08013C04: .4byte gFightStateTracker
_08013C08: .4byte gProtectStructs
_08013C0C: .4byte gBankAttacker
_08013C10: .4byte gBattlescriptCurrInstr
-_08013C14: .4byte gUnknown_081D8E29
+_08013C14: .4byte BattleScript_GotAwaySafely
_08013C18:
ldr r1, _08013C20 @ =gBattlescriptCurrInstr
- ldr r0, _08013C24 @ =gUnknown_081D8E14
+ ldr r0, _08013C24 @ =BattleScript_SmokeBallEscape
b _08013C2C
.align 2, 0
_08013C20: .4byte gBattlescriptCurrInstr
-_08013C24: .4byte gUnknown_081D8E14
+_08013C24: .4byte BattleScript_SmokeBallEscape
_08013C28:
ldr r1, _08013C38 @ =gBattlescriptCurrInstr
- ldr r0, _08013C3C @ =gUnknown_081D8E22
+ ldr r0, _08013C3C @ =BattleScript_RanAwayUsingMonAbility
_08013C2C:
str r0, [r1]
ldr r1, _08013C40 @ =gBattleMainFunc
@@ -3008,7 +3008,7 @@ _08013C2C:
bx r0
.align 2, 0
_08013C38: .4byte gBattlescriptCurrInstr
-_08013C3C: .4byte gUnknown_081D8E22
+_08013C3C: .4byte BattleScript_RanAwayUsingMonAbility
_08013C40: .4byte gBattleMainFunc
_08013C44: .4byte sub_8013C9C
thumb_func_end sub_8013BDC
@@ -3035,7 +3035,7 @@ sub_8013C48: @ 8013C48
movs r0, 0xFF
strb r0, [r1, 0x4]
ldr r1, _08013C8C @ =gBattlescriptCurrInstr
- ldr r0, _08013C90 @ =gUnknown_081D8E30
+ ldr r0, _08013C90 @ =BattleScript_WildMonFled
str r0, [r1]
ldr r1, _08013C94 @ =gBattleMainFunc
ldr r0, _08013C98 @ =sub_8013C9C
@@ -3047,7 +3047,7 @@ _08013C80: .4byte gBattleTextBuff1
_08013C84: .4byte gBankAttacker
_08013C88: .4byte gBattlePartyID
_08013C8C: .4byte gBattlescriptCurrInstr
-_08013C90: .4byte gUnknown_081D8E30
+_08013C90: .4byte BattleScript_WildMonFled
_08013C94: .4byte gBattleMainFunc
_08013C98: .4byte sub_8013C9C
thumb_func_end sub_8013C48
@@ -3545,7 +3545,7 @@ _08014044:
ands r0, r1
strb r0, [r5]
ldr r2, _080140E0 @ =gCurrentMove
- ldr r1, _080140E4 @ =gUnknown_02024BE8
+ ldr r1, _080140E4 @ =gChosenMove
movs r0, 0xA5
strh r0, [r1]
strh r0, [r2]
@@ -3574,7 +3574,7 @@ _080140D4: .4byte 0x0001608c
_080140D8: .4byte gUnknown_02024BE5
_080140DC: .4byte gProtectStructs
_080140E0: .4byte gCurrentMove
-_080140E4: .4byte gUnknown_02024BE8
+_080140E4: .4byte gChosenMove
_080140E8: .4byte gHitMarker
_080140EC: .4byte 0x00016010
_080140F0:
@@ -3598,7 +3598,7 @@ _080140F0:
beq _08014138
_08014114:
ldr r3, _0801412C @ =gCurrentMove
- ldr r2, _08014130 @ =gUnknown_02024BE8
+ ldr r2, _08014130 @ =gChosenMove
ldr r1, _08014134 @ =gLockedMove
lsls r0, r4, 1
adds r0, r1
@@ -3609,7 +3609,7 @@ _08014114:
.align 2, 0
_08014128: .4byte gBattleMons
_0801412C: .4byte gCurrentMove
-_08014130: .4byte gUnknown_02024BE8
+_08014130: .4byte gChosenMove
_08014134: .4byte gLockedMove
_08014138:
ldr r3, _08014188 @ =gDisableStructs
@@ -3635,7 +3635,7 @@ _08014138:
cmp r1, r0
bne _080141A0
ldr r1, _08014190 @ =gCurrentMove
- ldr r0, _08014194 @ =gUnknown_02024BE8
+ ldr r0, _08014194 @ =gChosenMove
strh r4, [r0]
strh r4, [r1]
ldrb r0, [r2, 0xC]
@@ -3654,7 +3654,7 @@ _08014138:
_08014188: .4byte gDisableStructs
_0801418C: .4byte gBattleMons
_08014190: .4byte gCurrentMove
-_08014194: .4byte gUnknown_02024BE8
+_08014194: .4byte gChosenMove
_08014198: .4byte gUnknown_02024BE5
_0801419C: .4byte 0x00016010
_080141A0:
@@ -3667,7 +3667,7 @@ _080141A0:
mov r1, r8
strb r3, [r1]
ldr r3, _0801420C @ =gCurrentMove
- ldr r1, _08014210 @ =gUnknown_02024BE8
+ ldr r1, _08014210 @ =gChosenMove
mov r2, r8
ldrb r0, [r2]
lsls r0, 1
@@ -3712,7 +3712,7 @@ _08014200:
.align 2, 0
_08014208: .4byte gUnknown_02024BE5
_0801420C: .4byte gCurrentMove
-_08014210: .4byte gUnknown_02024BE8
+_08014210: .4byte gChosenMove
_08014214: .4byte 0x00016010
_08014218:
mov r4, r8
@@ -3734,7 +3734,7 @@ _08014218:
cmp r3, r2
beq _08014278
ldr r1, _08014268 @ =gCurrentMove
- ldr r0, _0801426C @ =gUnknown_02024BE8
+ ldr r0, _0801426C @ =gChosenMove
strh r3, [r0]
strh r3, [r1]
ldrh r0, [r1]
@@ -3752,12 +3752,12 @@ _0801425C: .4byte gBankAttacker
_08014260: .4byte gBattleMons
_08014264: .4byte gChosenMovesByBanks
_08014268: .4byte gCurrentMove
-_0801426C: .4byte gUnknown_02024BE8
+_0801426C: .4byte gChosenMove
_08014270: .4byte gSharedMem
_08014274: .4byte 0x00016010
_08014278:
ldr r1, _08014298 @ =gCurrentMove
- ldr r0, _0801429C @ =gUnknown_02024BE8
+ ldr r0, _0801429C @ =gChosenMove
strh r3, [r0]
strh r3, [r1]
_08014280:
@@ -3774,7 +3774,7 @@ _08014280:
b _080142B0
.align 2, 0
_08014298: .4byte gCurrentMove
-_0801429C: .4byte gUnknown_02024BE8
+_0801429C: .4byte gChosenMove
_080142A0: .4byte gBankAttacker
_080142A4: .4byte gBattleResults
_080142A8:
@@ -3963,7 +3963,7 @@ _08014416:
b _08014522
_0801441E:
ldr r2, _08014460 @ =gBattleMoves
- ldr r0, _0801447C @ =gUnknown_02024BE8
+ ldr r0, _0801447C @ =gChosenMove
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -3998,7 +3998,7 @@ _0801446C: .4byte gSharedMem
_08014470: .4byte 0x00016010
_08014474: .4byte gActiveBank
_08014478: .4byte gNoOfAllBanks
-_0801447C: .4byte gUnknown_02024BE8
+_0801447C: .4byte gChosenMove
_08014480:
movs r0, 0x3
b _08014496
@@ -4121,7 +4121,7 @@ _08014570:
cmp r0, 0
beq _0801461C
ldr r2, _080145B4 @ =gBattleMoves
- ldr r0, _080145B8 @ =gUnknown_02024BE8
+ ldr r0, _080145B8 @ =gChosenMove
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -4146,7 +4146,7 @@ _08014570:
b _080145D2
.align 2, 0
_080145B4: .4byte gBattleMoves
-_080145B8: .4byte gUnknown_02024BE8
+_080145B8: .4byte gChosenMove
_080145BC:
movs r0, 0x3
b _080145D2
@@ -4260,7 +4260,7 @@ _0801469A:
strb r0, [r5]
_080146AC:
ldr r4, _080146E0 @ =gBattlescriptCurrInstr
- ldr r3, _080146E4 @ =gBattleScriptsEffectsTable
+ ldr r3, _080146E4 @ =gBattleScriptsForMoveEffects
ldr r2, _080146E8 @ =gBattleMoves
ldr r0, _080146EC @ =gCurrentMove
ldrh r1, [r0]
@@ -4287,7 +4287,7 @@ _080146CC:
bx r0
.align 2, 0
_080146E0: .4byte gBattlescriptCurrInstr
-_080146E4: .4byte gBattleScriptsEffectsTable
+_080146E4: .4byte gBattleScriptsForMoveEffects
_080146E8: .4byte gBattleMoves
_080146EC: .4byte gCurrentMove
_080146F0: .4byte gFightStateTracker
@@ -4336,7 +4336,7 @@ sub_80146F4: @ 80146F4
adds r1, r0
strb r4, [r1]
ldr r1, _08014790 @ =gBattlescriptCurrInstr
- ldr r0, _08014794 @ =gUnknown_081D8E4E
+ ldr r0, _08014794 @ =BattleScript_ActionSwitch
str r0, [r1]
ldr r1, _08014798 @ =gFightStateTracker
movs r0, 0xA
@@ -4364,7 +4364,7 @@ _08014784: .4byte gSharedMem
_08014788: .4byte 0x00016064
_0801478C: .4byte 0x00016003
_08014790: .4byte gBattlescriptCurrInstr
-_08014794: .4byte gUnknown_081D8E4E
+_08014794: .4byte BattleScript_ActionSwitch
_08014798: .4byte gFightStateTracker
_0801479C: .4byte gBattleResults
thumb_func_end sub_80146F4
@@ -4452,14 +4452,14 @@ _0801484C:
cmp r0, 0
bne _0801486C
ldr r0, _08014864 @ =gBattlescriptCurrInstr
- ldr r1, _08014868 @ =gUnknown_081D9E7C
+ ldr r1, _08014868 @ =gBattlescriptsForUsingItem
_0801485C:
ldr r1, [r1]
str r1, [r0]
b _08014A8C
.align 2, 0
_08014864: .4byte gBattlescriptCurrInstr
-_08014868: .4byte gUnknown_081D9E7C
+_08014868: .4byte gBattlescriptsForUsingItem
_0801486C:
ldr r2, _080148A0 @ =gSharedMem
ldrb r0, [r4]
@@ -4476,7 +4476,7 @@ _0801486C:
mov r8, r4
ldr r3, _080148AC @ =gBattlescriptCurrInstr
mov r9, r3
- ldr r1, _080148B0 @ =gUnknown_081D9E7C
+ ldr r1, _080148B0 @ =gBattlescriptsForUsingItem
mov r10, r1
adds r7, r2, 0
cmp r0, 0x4
@@ -4493,7 +4493,7 @@ _080148A0: .4byte gSharedMem
_080148A4: .4byte 0x00016003
_080148A8: .4byte 0x000160d8
_080148AC: .4byte gBattlescriptCurrInstr
-_080148B0: .4byte gUnknown_081D9E7C
+_080148B0: .4byte gBattlescriptsForUsingItem
_080148B4: .4byte _080148B8
.align 2, 0
_080148B8:
@@ -4522,7 +4522,7 @@ _080148CC:
ands r0, r3
ldr r3, _08014910 @ =gBattlescriptCurrInstr
mov r9, r3
- ldr r1, _08014914 @ =gUnknown_081D9E7C
+ ldr r1, _08014914 @ =gBattlescriptsForUsingItem
mov r10, r1
cmp r0, 0
bne _080148FC
@@ -4536,11 +4536,11 @@ _08014904: .4byte gBattleCommunication
_08014908: .4byte gBankAttacker
_0801490C: .4byte 0x000160da
_08014910: .4byte gBattlescriptCurrInstr
-_08014914: .4byte gUnknown_081D9E7C
+_08014914: .4byte gBattlescriptsForUsingItem
_08014918:
ldr r3, _08014950 @ =gBattlescriptCurrInstr
mov r9, r3
- ldr r0, _08014954 @ =gUnknown_081D9E7C
+ ldr r0, _08014954 @ =gBattlescriptsForUsingItem
mov r10, r0
adds r5, r7, 0
mov r4, r8
@@ -4568,7 +4568,7 @@ _08014926:
b _08014A74
.align 2, 0
_08014950: .4byte gBattlescriptCurrInstr
-_08014954: .4byte gUnknown_081D9E7C
+_08014954: .4byte gBattlescriptsForUsingItem
_08014958:
ldr r3, _0801498C @ =gBattleCommunication
movs r0, 0x4
@@ -4592,7 +4592,7 @@ _08014958:
strb r0, [r3, 0x5]
ldr r2, _08014998 @ =gBattlescriptCurrInstr
mov r9, r2
- ldr r3, _0801499C @ =gUnknown_081D9E7C
+ ldr r3, _0801499C @ =gBattlescriptsForUsingItem
mov r10, r3
b _08014A74
.align 2, 0
@@ -4600,7 +4600,7 @@ _0801498C: .4byte gBattleCommunication
_08014990: .4byte gBankAttacker
_08014994: .4byte 0x000160da
_08014998: .4byte gBattlescriptCurrInstr
-_0801499C: .4byte gUnknown_081D9E7C
+_0801499C: .4byte gBattlescriptsForUsingItem
_080149A0:
ldr r3, _08014A18 @ =gBattleTextBuff1
movs r4, 0xFD
@@ -4623,7 +4623,7 @@ _080149A0:
ands r2, r0
ldr r0, _08014A20 @ =gBattlescriptCurrInstr
mov r9, r0
- ldr r1, _08014A24 @ =gUnknown_081D9E7C
+ ldr r1, _08014A24 @ =gBattlescriptsForUsingItem
mov r10, r1
adds r6, r3, 0
cmp r2, 0
@@ -4667,7 +4667,7 @@ _08014A02:
_08014A18: .4byte gBattleTextBuff1
_08014A1C: .4byte gBattleTextBuff2
_08014A20: .4byte gBattlescriptCurrInstr
-_08014A24: .4byte gUnknown_081D9E7C
+_08014A24: .4byte gBattlescriptsForUsingItem
_08014A28: .4byte 0x000160a4
_08014A2C: .4byte 0x000160a5
_08014A30:
@@ -4684,7 +4684,7 @@ _08014A30:
mov r8, r0
ldr r1, _08014A5C @ =gBattlescriptCurrInstr
mov r9, r1
- ldr r2, _08014A60 @ =gUnknown_081D9E7C
+ ldr r2, _08014A60 @ =gBattlescriptsForUsingItem
mov r10, r2
b _08014A74
.align 2, 0
@@ -4692,7 +4692,7 @@ _08014A50: .4byte gBattleTypeFlags
_08014A54: .4byte gBattleCommunication
_08014A58: .4byte gBankAttacker
_08014A5C: .4byte gBattlescriptCurrInstr
-_08014A60: .4byte gUnknown_081D9E7C
+_08014A60: .4byte gBattlescriptsForUsingItem
_08014A64:
ldr r0, _08014AA0 @ =gBattleCommunication
strb r1, [r0, 0x5]
@@ -4700,7 +4700,7 @@ _08014A64:
mov r8, r3
ldr r0, _08014AA8 @ =gBattlescriptCurrInstr
mov r9, r0
- ldr r1, _08014AAC @ =gUnknown_081D9E7C
+ ldr r1, _08014AAC @ =gBattlescriptsForUsingItem
mov r10, r1
_08014A74:
mov r2, r8
@@ -4730,7 +4730,7 @@ _08014A8C:
_08014AA0: .4byte gBattleCommunication
_08014AA4: .4byte gBankAttacker
_08014AA8: .4byte gBattlescriptCurrInstr
-_08014AAC: .4byte gUnknown_081D9E7C
+_08014AAC: .4byte gBattlescriptsForUsingItem
_08014AB0: .4byte 0x000160d8
_08014AB4: .4byte gFightStateTracker
thumb_func_end sub_80147A0
@@ -4998,7 +4998,7 @@ _08014C9C:
movs r0, 0x3
strb r0, [r1, 0x5]
ldr r1, _08014CE8 @ =gBattlescriptCurrInstr
- ldr r0, _08014CEC @ =gUnknown_081D8E3B
+ ldr r0, _08014CEC @ =BattleScript_PrintFailedToRunString
str r0, [r1]
ldr r1, _08014CF0 @ =gFightStateTracker
movs r0, 0xA
@@ -5008,7 +5008,7 @@ _08014CDC: .4byte gBattleMons
_08014CE0: .4byte 0xfdffffff
_08014CE4: .4byte gBattleCommunication
_08014CE8: .4byte gBattlescriptCurrInstr
-_08014CEC: .4byte gUnknown_081D8E3B
+_08014CEC: .4byte BattleScript_PrintFailedToRunString
_08014CF0: .4byte gFightStateTracker
_08014CF4:
ldr r1, _08014D1C @ =gBattleMons
@@ -5026,7 +5026,7 @@ _08014CF4:
movs r0, 0x4
strb r0, [r1, 0x5]
ldr r1, _08014D28 @ =gBattlescriptCurrInstr
- ldr r0, _08014D2C @ =gUnknown_081D8E3B
+ ldr r0, _08014D2C @ =BattleScript_PrintFailedToRunString
str r0, [r1]
ldr r1, _08014D30 @ =gFightStateTracker
movs r0, 0xA
@@ -5036,7 +5036,7 @@ _08014D1C: .4byte gBattleMons
_08014D20: .4byte 0x0400e000
_08014D24: .4byte gBattleCommunication
_08014D28: .4byte gBattlescriptCurrInstr
-_08014D2C: .4byte gUnknown_081D8E3B
+_08014D2C: .4byte BattleScript_PrintFailedToRunString
_08014D30: .4byte gFightStateTracker
_08014D34:
ldr r0, _08014D48 @ =gNoOfAllBanks
diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s
index 6705c0fd7..2c19ad731 100644
--- a/asm/battle_anim_81258BC.s
+++ b/asm/battle_anim_81258BC.s
@@ -77,12 +77,12 @@ sub_812AF30: @ 812AF30
strh r0, [r6, 0xA]
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
@@ -91,7 +91,7 @@ sub_812AF30: @ 812AF30
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_807712C
+ bl CalculatePanIncrement
strh r4, [r6, 0xC]
strh r5, [r6, 0xE]
lsls r0, 24
@@ -188,7 +188,7 @@ sub_812B004: @ 812B004
movs r0, 0
strh r0, [r4, 0x1C]
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
ldrh r0, [r4, 0xA]
lsls r1, 24
@@ -236,14 +236,14 @@ sub_812B058: @ 812B058
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
asrs r5, 24
adds r0, r5, 0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
@@ -254,7 +254,7 @@ sub_812B058: @ 812B058
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_807712C
+ bl CalculatePanIncrement
ldr r2, _0812B100 @ =gTasks
mov r3, r8
lsls r1, r3, 2
@@ -373,10 +373,10 @@ sub_812B18C: @ 812B18C
movs r4, 0
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
lsls r0, 24
lsrs r6, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812B1CC
@@ -402,29 +402,29 @@ _0812B1CC:
adds r2, r0, 0
cmp r1, 0
bne _0812B1E8
- ldr r0, _0812B1E4 @ =gBattleAnimBankAttacker
+ ldr r0, _0812B1E4 @ =gAnimBankAttacker
ldrb r4, [r0]
b _0812B20E
.align 2, 0
_0812B1E0: .4byte gBattleAnimArgs
-_0812B1E4: .4byte gBattleAnimBankAttacker
+_0812B1E4: .4byte gAnimBankAttacker
_0812B1E8:
cmp r1, 0x1
bne _0812B1F8
- ldr r0, _0812B1F4 @ =gBattleAnimBankTarget
+ ldr r0, _0812B1F4 @ =gAnimBankTarget
ldrb r4, [r0]
b _0812B20E
.align 2, 0
-_0812B1F4: .4byte gBattleAnimBankTarget
+_0812B1F4: .4byte gAnimBankTarget
_0812B1F8:
cmp r1, 0x2
bne _0812B204
- ldr r0, _0812B200 @ =gBattleAnimBankAttacker
+ ldr r0, _0812B200 @ =gAnimBankAttacker
b _0812B206
.align 2, 0
-_0812B200: .4byte gBattleAnimBankAttacker
+_0812B200: .4byte gAnimBankAttacker
_0812B204:
- ldr r0, _0812B230 @ =gBattleAnimBankTarget
+ ldr r0, _0812B230 @ =gAnimBankTarget
_0812B206:
ldrb r1, [r0]
movs r0, 0x2
@@ -447,7 +447,7 @@ _0812B21A:
bl DestroyAnimVisualTask
b _0812B2B0
.align 2, 0
-_0812B230: .4byte gBattleAnimBankTarget
+_0812B230: .4byte gAnimBankTarget
_0812B234:
adds r0, r4, 0
bl GetBankSide
@@ -520,10 +520,10 @@ sub_812B2B8: @ 812B2B8
lsrs r5, r0, 24
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
lsls r0, 24
lsrs r4, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812B2DC
@@ -532,8 +532,8 @@ sub_812B2B8: @ 812B2B8
.align 2, 0
_0812B2D8: .4byte gSharedMem + 0x19348
_0812B2DC:
- ldr r1, _0812B304 @ =gUnknown_0202F7CA
- ldr r0, _0812B308 @ =gBattleAnimBankAttacker
+ ldr r1, _0812B304 @ =gAnimSpeciesByBanks
+ ldr r0, _0812B308 @ =gAnimBankAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -552,8 +552,8 @@ _0812B2F6:
pop {r0}
bx r0
.align 2, 0
-_0812B304: .4byte gUnknown_0202F7CA
-_0812B308: .4byte gBattleAnimBankAttacker
+_0812B304: .4byte gAnimSpeciesByBanks
+_0812B308: .4byte gAnimBankAttacker
thumb_func_end sub_812B2B8
thumb_func_start sub_812B30C
@@ -567,7 +567,7 @@ sub_812B30C: @ 812B30C
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -593,7 +593,7 @@ sub_812B340: @ 812B340
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -626,14 +626,14 @@ sub_812B374: @ 812B374
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
asrs r5, 24
adds r0, r5, 0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
@@ -644,7 +644,7 @@ sub_812B374: @ 812B374
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_807712C
+ bl CalculatePanIncrement
ldr r2, _0812B3FC @ =gTasks
mov r3, r8
lsls r1, r3, 2
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 91033c777..02eec98ec 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -77,7 +77,7 @@ sub_812C184: @ 812C184
b _0812C1CA
_0812C1C4:
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812C1CA:
pop {r0}
bx r0
@@ -89,10 +89,10 @@ sub_812C1D0: @ 812C1D0
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, _0812C21C @ =gBattleAnimBankTarget
+ ldr r6, _0812C21C @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 8
@@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0
asrs r4, 16
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 8
@@ -119,7 +119,7 @@ sub_812C1D0: @ 812C1D0
pop {r0}
bx r0
.align 2, 0
-_0812C21C: .4byte gBattleAnimBankTarget
+_0812C21C: .4byte gAnimBankTarget
thumb_func_end sub_812C1D0
thumb_func_start sub_812C220
@@ -198,7 +198,7 @@ sub_812C2A4: @ 812C2A4
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
- bl move_anim_8072740
+ bl DestroyAnimSprite
pop {r0}
bx r0
.align 2, 0
@@ -210,16 +210,16 @@ sub_812C2BC: @ 812C2BC
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
- ldr r4, _0812C348 @ =gBattleAnimBankTarget
+ ldr r4, _0812C348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -240,7 +240,7 @@ sub_812C2BC: @ 812C2BC
lsls r1, 23
adds r0, r1
lsrs r4, r0, 16
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812C31A
@@ -264,7 +264,7 @@ _0812C31A:
strh r6, [r5, 0x36]
ldr r0, _0812C350 @ =sub_8078B34
str r0, [r5, 0x1C]
- ldr r1, _0812C354 @ =move_anim_8072740
+ ldr r1, _0812C354 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
add sp, 0x4
@@ -272,10 +272,10 @@ _0812C31A:
pop {r0}
bx r0
.align 2, 0
-_0812C348: .4byte gBattleAnimBankTarget
+_0812C348: .4byte gAnimBankTarget
_0812C34C: .4byte gBattleAnimArgs
_0812C350: .4byte sub_8078B34
-_0812C354: .4byte move_anim_8072740
+_0812C354: .4byte DestroyAnimSprite
thumb_func_end sub_812C2BC
thumb_func_start sub_812C358
@@ -547,7 +547,7 @@ _0812C53A:
strh r0, [r1]
strh r0, [r4]
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812C550:
pop {r4}
pop {r0}
@@ -796,7 +796,7 @@ sub_812C720: @ 812C720
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _0812C784 @ =gBattleAnimBankTarget
+ ldr r0, _0812C784 @ =gAnimBankTarget
ldrb r0, [r0]
mov r5, sp
adds r5, 0x2
@@ -804,7 +804,7 @@ sub_812C720: @ 812C720
mov r2, sp
adds r3, r5, 0
bl sub_807A3FC
- ldr r0, _0812C788 @ =gBattleAnimBankAttacker
+ ldr r0, _0812C788 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -838,8 +838,8 @@ _0812C754:
pop {r0}
bx r0
.align 2, 0
-_0812C784: .4byte gBattleAnimBankTarget
-_0812C788: .4byte gBattleAnimBankAttacker
+_0812C784: .4byte gAnimBankTarget
+_0812C788: .4byte gAnimBankAttacker
_0812C78C: .4byte gBattleAnimArgs
_0812C790: .4byte 0x0000ffce
_0812C794: .4byte sub_812C798
@@ -904,7 +904,7 @@ _0812C7F4:
cmp r0, 0x10
bne _0812C808
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812C808:
pop {r0}
bx r0
@@ -926,7 +926,7 @@ sub_812C80C: @ 812C80C
strh r0, [r4, 0x22]
ldr r0, _0812C840 @ =sub_8078600
str r0, [r4, 0x1C]
- ldr r1, _0812C844 @ =move_anim_8072740
+ ldr r1, _0812C844 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -935,7 +935,7 @@ sub_812C80C: @ 812C80C
.align 2, 0
_0812C83C: .4byte gBattleAnimArgs
_0812C840: .4byte sub_8078600
-_0812C844: .4byte move_anim_8072740
+_0812C844: .4byte DestroyAnimSprite
thumb_func_end sub_812C80C
thumb_func_start sub_812C848
@@ -953,11 +953,11 @@ sub_812C848: @ 812C848
ldrsh r1, [r5, r2]
adds r0, r4, 0
bl sub_807867C
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812C89C
- ldr r0, _0812C888 @ =gBattleAnimBankAttacker
+ ldr r0, _0812C888 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -967,7 +967,7 @@ sub_812C848: @ 812C848
b _0812C8A2
.align 2, 0
_0812C884: .4byte gBattleAnimArgs
-_0812C888: .4byte gBattleAnimBankAttacker
+_0812C888: .4byte gAnimBankAttacker
_0812C88C:
movs r1, 0x4
ldrsh r0, [r5, r1]
@@ -1028,7 +1028,7 @@ _0812C8A8:
cmp r0, 0xF0
bls _0812C900
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812C900:
pop {r4,r5}
pop {r0}
@@ -1046,7 +1046,7 @@ sub_812C908: @ 812C908
cmp r0, 0
beq _0812C91E
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812C91E:
pop {r0}
bx r0
@@ -1057,7 +1057,7 @@ sub_812C924: @ 812C924
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _0812C940 @ =gBattleAnimBankTarget
+ ldr r0, _0812C940 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1068,7 +1068,7 @@ sub_812C924: @ 812C924
movs r0, 0
b _0812C94C
.align 2, 0
-_0812C940: .4byte gBattleAnimBankTarget
+_0812C940: .4byte gAnimBankTarget
_0812C944: .4byte gBattleAnimArgs
_0812C948:
ldr r1, _0812C95C @ =gBattleAnimArgs
@@ -1089,7 +1089,7 @@ sub_812C960: @ 812C960
push {lr}
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, _0812C974 @ =gMoveDmgMoveAnim
+ ldr r0, _0812C974 @ =gAnimMoveDmg
ldr r0, [r0]
cmp r0, 0
ble _0812C97C
@@ -1097,7 +1097,7 @@ sub_812C960: @ 812C960
movs r0, 0
b _0812C980
.align 2, 0
-_0812C974: .4byte gMoveDmgMoveAnim
+_0812C974: .4byte gAnimMoveDmg
_0812C978: .4byte gBattleAnimArgs
_0812C97C:
ldr r1, _0812C98C @ =gBattleAnimArgs
@@ -1128,10 +1128,10 @@ sub_812C990: @ 812C990
adds r1, r3, 0
orrs r0, r1
strh r0, [r2]
- ldr r0, _0812C9F4 @ =gUnknown_030042C4
+ ldr r0, _0812C9F4 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _0812C9F8 @ =gUnknown_03004240
+ ldr r0, _0812C9F8 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _0812C9FC @ =REG_WIN0H
strh r1, [r0]
@@ -1161,8 +1161,8 @@ sub_812C990: @ 812C990
.align 2, 0
_0812C9EC: .4byte REG_WINOUT
_0812C9F0: .4byte 0x00001f3f
-_0812C9F4: .4byte gUnknown_030042C4
-_0812C9F8: .4byte gUnknown_03004240
+_0812C9F4: .4byte gBattle_WIN0H
+_0812C9F8: .4byte gBattle_WIN0V
_0812C9FC: .4byte REG_WIN0H
_0812CA00: .4byte sub_812CA04
thumb_func_end sub_812C990
@@ -1288,7 +1288,7 @@ sub_812CAD0: @ 812CAD0
adds r2, r4, 0
eors r1, r2
strh r1, [r3]
- bl move_anim_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -1306,16 +1306,16 @@ sub_812CAFC: @ 812CAFC
ldrsh r0, [r6, r1]
cmp r0, 0
bne _0812CB28
- ldr r4, _0812CB74 @ =gBattleAnimBankAttacker
+ ldr r4, _0812CB74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1357,7 +1357,7 @@ _0812CB28:
b _0812CB8A
.align 2, 0
_0812CB70: .4byte gBattleAnimArgs
-_0812CB74: .4byte gBattleAnimBankAttacker
+_0812CB74: .4byte gAnimBankAttacker
_0812CB78: .4byte 0x000003ff
_0812CB7C: .4byte 0xfffffc00
_0812CB80: .4byte 0x0000fff4
@@ -1412,7 +1412,7 @@ sub_812CBB4: @ 812CBB4
bne _0812CC12
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -1443,7 +1443,7 @@ _0812CC12:
cmp r0, 0
bne _0812CC20
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812CC20:
pop {r4}
pop {r0}
@@ -1472,7 +1472,7 @@ sub_812CC44: @ 812CC44
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812CC7A
@@ -1480,19 +1480,19 @@ sub_812CC44: @ 812CC44
ldr r2, _0812CC8C @ =0x00001f3f
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _0812CC90 @ =gUnknown_03004200
+ ldr r1, _0812CC90 @ =gBattle_WIN1H
ldr r2, _0812CC94 @ =0x000098f0
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _0812CC98 @ =gUnknown_03004244
+ ldr r1, _0812CC98 @ =gBattle_WIN1V
movs r0, 0xA0
strh r0, [r1]
ldr r1, _0812CC9C @ =REG_WIN1H
- ldr r0, _0812CCA0 @ =gUnknown_030042C4
+ ldr r0, _0812CCA0 @ =gBattle_WIN0H
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x4
- ldr r0, _0812CCA4 @ =gUnknown_03004240
+ ldr r0, _0812CCA4 @ =gBattle_WIN0V
ldrh r0, [r0]
strh r0, [r1]
_0812CC7A:
@@ -1504,12 +1504,12 @@ _0812CC7A:
.align 2, 0
_0812CC88: .4byte REG_WININ
_0812CC8C: .4byte 0x00001f3f
-_0812CC90: .4byte gUnknown_03004200
+_0812CC90: .4byte gBattle_WIN1H
_0812CC94: .4byte 0x000098f0
-_0812CC98: .4byte gUnknown_03004244
+_0812CC98: .4byte gBattle_WIN1V
_0812CC9C: .4byte REG_WIN1H
-_0812CCA0: .4byte gUnknown_030042C4
-_0812CCA4: .4byte gUnknown_03004240
+_0812CCA0: .4byte gBattle_WIN0H
+_0812CCA4: .4byte gBattle_WIN0V
thumb_func_end sub_812CC44
thumb_func_start sub_812CCA8
@@ -1517,7 +1517,7 @@ sub_812CCA8: @ 812CCA8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812CCCA
@@ -1525,10 +1525,10 @@ sub_812CCA8: @ 812CCA8
ldr r2, _0812CCDC @ =0x00003f3f
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _0812CCE0 @ =gUnknown_03004200
+ ldr r0, _0812CCE0 @ =gBattle_WIN1H
movs r1, 0
strh r1, [r0]
- ldr r0, _0812CCE4 @ =gUnknown_03004244
+ ldr r0, _0812CCE4 @ =gBattle_WIN1V
strh r1, [r0]
_0812CCCA:
adds r0, r4, 0
@@ -1539,8 +1539,8 @@ _0812CCCA:
.align 2, 0
_0812CCD8: .4byte REG_WININ
_0812CCDC: .4byte 0x00003f3f
-_0812CCE0: .4byte gUnknown_03004200
-_0812CCE4: .4byte gUnknown_03004244
+_0812CCE0: .4byte gBattle_WIN1H
+_0812CCE4: .4byte gBattle_WIN1V
thumb_func_end sub_812CCA8
thumb_func_start sub_812CCE8
@@ -1552,17 +1552,17 @@ sub_812CCE8: @ 812CCE8
ldrsh r0, [r6, r1]
cmp r0, 0
bne _0812CD04
- ldr r4, _0812CD00 @ =gBattleAnimBankAttacker
+ ldr r4, _0812CD00 @ =gAnimBankAttacker
b _0812CD06
.align 2, 0
_0812CCFC: .4byte gBattleAnimArgs
-_0812CD00: .4byte gBattleAnimBankAttacker
+_0812CD00: .4byte gAnimBankAttacker
_0812CD04:
- ldr r4, _0812CD58 @ =gBattleAnimBankTarget
+ ldr r4, _0812CD58 @ =gAnimBankTarget
_0812CD06:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -1570,7 +1570,7 @@ _0812CD06:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1601,7 +1601,7 @@ _0812CD3E:
pop {r0}
bx r0
.align 2, 0
-_0812CD58: .4byte gBattleAnimBankTarget
+_0812CD58: .4byte gAnimBankTarget
_0812CD5C: .4byte gBattleAnimArgs
_0812CD60: .4byte sub_812CD64
thumb_func_end sub_812CCE8
@@ -1640,7 +1640,7 @@ sub_812CD64: @ 812CD64
cmp r0, r1
bge _0812CDC2
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _0812CDC2
.align 2, 0
_0812CDAC: .4byte gSineTable
@@ -1652,7 +1652,7 @@ _0812CDB0:
cmp r0, r1
ble _0812CDC2
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812CDC2:
pop {r0}
bx r0
@@ -1674,14 +1674,14 @@ sub_812CDC8: @ 812CDC8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0812CDF4
- ldr r4, _0812CDF0 @ =gBattleAnimBankAttacker
+ ldr r4, _0812CDF0 @ =gAnimBankAttacker
b _0812CDF6
.align 2, 0
_0812CDE8: .4byte gTasks
_0812CDEC: .4byte gBattleAnimArgs
-_0812CDF0: .4byte gBattleAnimBankAttacker
+_0812CDF0: .4byte gAnimBankAttacker
_0812CDF4:
- ldr r4, _0812CE3C @ =gBattleAnimBankTarget
+ ldr r4, _0812CE3C @ =gAnimBankTarget
_0812CDF6:
ldrb r0, [r4]
bl sub_8077FC0
@@ -1714,14 +1714,14 @@ _0812CE20:
strh r2, [r5, 0x16]
cmp r7, 0x1
bne _0812CE48
- ldr r0, _0812CE44 @ =gUnknown_030042C0
+ ldr r0, _0812CE44 @ =gBattle_BG1_X
b _0812CE4A
.align 2, 0
-_0812CE3C: .4byte gBattleAnimBankTarget
+_0812CE3C: .4byte gAnimBankTarget
_0812CE40: .4byte gBattleAnimArgs
-_0812CE44: .4byte gUnknown_030042C0
+_0812CE44: .4byte gBattle_BG1_X
_0812CE48:
- ldr r0, _0812CE68 @ =gUnknown_03004288
+ ldr r0, _0812CE68 @ =gBattle_BG2_X
_0812CE4A:
ldrh r2, [r0]
strh r2, [r5, 0x18]
@@ -1738,7 +1738,7 @@ _0812CE4A:
ldrh r3, [r5, 0x18]
b _0812CE70
.align 2, 0
-_0812CE68: .4byte gUnknown_03004288
+_0812CE68: .4byte gBattle_BG2_X
_0812CE6C:
strh r2, [r5, 0x1E]
ldrh r3, [r5, 0x1A]
@@ -1974,16 +1974,16 @@ sub_812D008: @ 812D008
movs r5, 0
strh r5, [r4, 0x8]
strh r5, [r4, 0xA]
- ldr r6, _0812D060 @ =gBattleAnimBankAttacker
+ ldr r6, _0812D060 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xE]
@@ -2004,7 +2004,7 @@ sub_812D008: @ 812D008
bx r0
.align 2, 0
_0812D05C: .4byte gTasks
-_0812D060: .4byte gBattleAnimBankAttacker
+_0812D060: .4byte gAnimBankAttacker
_0812D064: .4byte 0x0000ffec
_0812D068: .4byte sub_812D06C
thumb_func_end sub_812D008
@@ -2081,7 +2081,7 @@ _0812D0D4:
lsrs r4, r0, 24
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -2347,7 +2347,7 @@ _0812D2F0:
ldrsh r0, [r5, r1]
cmp r0, 0x3D
bne _0812D33C
- ldr r1, _0812D344 @ =move_anim_8072740
+ ldr r1, _0812D344 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
ldrh r0, [r5, 0x24]
@@ -2363,16 +2363,16 @@ _0812D2F0:
strh r1, [r5, 0x26]
movs r0, 0x14
strh r0, [r5, 0x2E]
- ldr r4, _0812D348 @ =gBattleAnimBankTarget
+ ldr r4, _0812D348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -2383,8 +2383,8 @@ _0812D33C:
pop {r0}
bx r0
.align 2, 0
-_0812D344: .4byte move_anim_8072740
-_0812D348: .4byte gBattleAnimBankTarget
+_0812D344: .4byte DestroyAnimSprite
+_0812D348: .4byte gAnimBankTarget
_0812D34C: .4byte sub_8078B34
thumb_func_end sub_812D294
@@ -2460,16 +2460,16 @@ _0812D3CC:
beq _0812D490
b _0812D4AE
_0812D3D6:
- ldr r4, _0812D408 @ =gBattleAnimBankAttacker
+ ldr r4, _0812D408 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2482,7 +2482,7 @@ _0812D3D6:
strh r0, [r5, 0x32]
b _0812D484
.align 2, 0
-_0812D408: .4byte gBattleAnimBankAttacker
+_0812D408: .4byte gAnimBankAttacker
_0812D40C:
ldrh r0, [r5, 0x30]
adds r0, 0x60
@@ -2563,7 +2563,7 @@ _0812D490:
cmp r0, r1
bge _0812D4AE
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812D4AE:
pop {r4-r6}
pop {r0}
@@ -2574,7 +2574,7 @@ _0812D4AE:
sub_812D4B4: @ 812D4B4
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0812D4CC @ =gBattleAnimBankAttacker
+ ldr r0, _0812D4CC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2583,7 +2583,7 @@ sub_812D4B4: @ 812D4B4
ldr r0, _0812D4D0 @ =0x0000fff0
b _0812D4D8
.align 2, 0
-_0812D4CC: .4byte gBattleAnimBankAttacker
+_0812D4CC: .4byte gAnimBankAttacker
_0812D4D0: .4byte 0x0000fff0
_0812D4D4:
movs r0, 0x80
@@ -2608,7 +2608,7 @@ sub_812D4EC: @ 812D4EC
ldrh r0, [r4, 0x2E]
adds r0, 0x48
strh r0, [r4, 0x2E]
- ldr r0, _0812D50C @ =gBattleAnimBankAttacker
+ ldr r0, _0812D50C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2619,7 +2619,7 @@ sub_812D4EC: @ 812D4EC
asrs r0, 20
b _0812D518
.align 2, 0
-_0812D50C: .4byte gBattleAnimBankAttacker
+_0812D50C: .4byte gAnimBankAttacker
_0812D510:
ldrh r0, [r4, 0x2E]
lsls r0, 16
@@ -2674,7 +2674,7 @@ _0812D564:
cmp r0, r1
bls _0812D57E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812D57E:
pop {r4,r5}
pop {r0}
@@ -2919,10 +2919,10 @@ _0812D736:
movs r0, 0x90
lsls r0, 4
strh r0, [r4, 0x30]
- ldr r0, _0812D75C @ =gBattleAnimBankAttacker
+ ldr r0, _0812D75C @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -2931,7 +2931,7 @@ _0812D736:
strh r0, [r4, 0x2E]
b _0812D788
.align 2, 0
-_0812D75C: .4byte gBattleAnimBankAttacker
+_0812D75C: .4byte gAnimBankAttacker
_0812D760:
ldrh r2, [r4, 0x30]
lsls r1, r2, 16
@@ -2951,7 +2951,7 @@ _0812D760:
cmp r0, r1
ble _0812D788
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812D788:
pop {r4}
pop {r0}
@@ -3043,7 +3043,7 @@ _0812D834:
ldr r1, _0812D850 @ =REG_MOSAIC
movs r0, 0
strh r0, [r1]
- ldr r0, _0812D854 @ =gBattleAnimBankAttacker
+ ldr r0, _0812D854 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -3054,7 +3054,7 @@ _0812D834:
b _0812D85E
.align 2, 0
_0812D850: .4byte REG_MOSAIC
-_0812D854: .4byte gBattleAnimBankAttacker
+_0812D854: .4byte gAnimBankAttacker
_0812D858: .4byte REG_BG1CNT
_0812D85C:
ldr r0, _0812D87C @ =REG_BG2CNT
@@ -3110,9 +3110,9 @@ _0812D8BC:
.align 2, 0
_0812D8C0: .4byte REG_MOSAIC
_0812D8C4:
- ldr r5, _0812D8F4 @ =gBattleAnimBankAttacker
+ ldr r5, _0812D8F4 @ =gAnimBankAttacker
ldrb r0, [r5]
- ldr r1, _0812D8F8 @ =gBattleAnimBankTarget
+ ldr r1, _0812D8F8 @ =gAnimBankTarget
ldrb r1, [r1]
mov r2, r8
lsls r4, r2, 2
@@ -3124,7 +3124,7 @@ _0812D8C4:
ldrb r1, [r5]
mov r0, sp
bl sub_8078954
- bl NotInBattle
+ bl IsContest
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -3132,8 +3132,8 @@ _0812D8C4:
movs r1, 0
b _0812D906
.align 2, 0
-_0812D8F4: .4byte gBattleAnimBankAttacker
-_0812D8F8: .4byte gBattleAnimBankTarget
+_0812D8F4: .4byte gAnimBankAttacker
+_0812D8F8: .4byte gAnimBankTarget
_0812D8FC:
ldrb r0, [r5]
bl GetBankIdentity
@@ -3144,7 +3144,7 @@ _0812D906:
lsls r1, 2
adds r1, r0
ldr r2, _0812D9D0 @ =gBattleMonForms
- ldr r0, _0812D9D4 @ =gBattleAnimBankAttacker
+ ldr r0, _0812D9D4 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r2
ldrb r0, [r0]
@@ -3158,16 +3158,16 @@ _0812D906:
ldr r1, _0812D9DC @ =0x84000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812DA20
ldr r5, _0812D9E0 @ =gSharedMem + 0x19348
ldrh r0, [r5]
- bl sub_80AEB1C
+ bl IsSpeciesNotUnown
adds r4, r0, 0
ldrh r0, [r5, 0x2]
- bl sub_80AEB1C
+ bl IsSpeciesNotUnown
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -3222,13 +3222,13 @@ _0812D98E:
_0812D9A2:
ldr r0, _0812D9E0 @ =gSharedMem + 0x19348
ldrh r0, [r0, 0x2]
- bl sub_80AEB1C
+ bl IsSpeciesNotUnown
lsls r0, 24
cmp r0, 0
beq _0812D9F0
ldr r3, _0812D9E4 @ =gSprites
ldr r4, _0812D9E8 @ =gObjectBankIDs
- ldr r2, _0812D9D4 @ =gBattleAnimBankAttacker
+ ldr r2, _0812D9D4 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
ldrb r1, [r0]
@@ -3243,7 +3243,7 @@ _0812D9A2:
.align 2, 0
_0812D9CC: .4byte gUnknown_081FAF4C
_0812D9D0: .4byte gBattleMonForms
-_0812D9D4: .4byte gBattleAnimBankAttacker
+_0812D9D4: .4byte gAnimBankAttacker
_0812D9D8: .4byte 0x040000d4
_0812D9DC: .4byte 0x84000200
_0812D9E0: .4byte gSharedMem + 0x19348
@@ -3253,7 +3253,7 @@ _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18
_0812D9F0:
ldr r3, _0812DA34 @ =gSprites
ldr r4, _0812DA38 @ =gObjectBankIDs
- ldr r2, _0812DA3C @ =gBattleAnimBankAttacker
+ ldr r2, _0812DA3C @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
ldrb r1, [r0]
@@ -3289,7 +3289,7 @@ _0812DA2A:
.align 2, 0
_0812DA34: .4byte gSprites
_0812DA38: .4byte gObjectBankIDs
-_0812DA3C: .4byte gBattleAnimBankAttacker
+_0812DA3C: .4byte gAnimBankAttacker
_0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC
_0812DA44: .4byte gTasks
_0812DA48:
@@ -3328,7 +3328,7 @@ _0812DA84:
ldr r1, _0812DAA0 @ =REG_MOSAIC
movs r0, 0
strh r0, [r1]
- ldr r0, _0812DAA4 @ =gBattleAnimBankAttacker
+ ldr r0, _0812DAA4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -3339,7 +3339,7 @@ _0812DA84:
b _0812DAAE
.align 2, 0
_0812DAA0: .4byte REG_MOSAIC
-_0812DAA4: .4byte gBattleAnimBankAttacker
+_0812DAA4: .4byte gAnimBankAttacker
_0812DAA8: .4byte REG_BG1CNT
_0812DAAC:
ldr r2, _0812DB08 @ =REG_BG2CNT
@@ -3349,11 +3349,11 @@ _0812DAAE:
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DAF4
- ldr r4, _0812DB0C @ =gBattleAnimBankAttacker
+ ldr r4, _0812DB0C @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -3389,7 +3389,7 @@ _0812DAFA:
bx r0
.align 2, 0
_0812DB08: .4byte REG_BG2CNT
-_0812DB0C: .4byte gBattleAnimBankAttacker
+_0812DB0C: .4byte gAnimBankAttacker
_0812DB10: .4byte gTasks
_0812DB14: .4byte gSharedMem + 0x17800
thumb_func_end sub_812D7E8
@@ -3402,7 +3402,7 @@ c3_80DFBE4: @ 812DB18
ldr r4, _0812DB48 @ =gBattleAnimArgs
ldr r3, _0812DB4C @ =gSprites
ldr r2, _0812DB50 @ =gObjectBankIDs
- ldr r1, _0812DB54 @ =gBattleAnimBankAttacker
+ ldr r1, _0812DB54 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
ldrb r2, [r1]
@@ -3423,7 +3423,7 @@ c3_80DFBE4: @ 812DB18
_0812DB48: .4byte gBattleAnimArgs
_0812DB4C: .4byte gSprites
_0812DB50: .4byte gObjectBankIDs
-_0812DB54: .4byte gBattleAnimBankAttacker
+_0812DB54: .4byte gAnimBankAttacker
thumb_func_end c3_80DFBE4
thumb_func_start sub_812DB58
@@ -3432,9 +3432,9 @@ sub_812DB58: @ 812DB58
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _0812DB7C @ =gBattleAnimBankAttacker
+ ldr r0, _0812DB7C @ =gAnimBankAttacker
ldrb r0, [r0]
- ldr r1, _0812DB80 @ =gBattleAnimBankTarget
+ ldr r1, _0812DB80 @ =gAnimBankTarget
ldrb r1, [r1]
movs r2, 0x1
bl sub_8031FC4
@@ -3444,8 +3444,8 @@ sub_812DB58: @ 812DB58
pop {r0}
bx r0
.align 2, 0
-_0812DB7C: .4byte gBattleAnimBankAttacker
-_0812DB80: .4byte gBattleAnimBankTarget
+_0812DB7C: .4byte gAnimBankAttacker
+_0812DB80: .4byte gAnimBankTarget
thumb_func_end sub_812DB58
thumb_func_start sub_812DB84
@@ -3506,7 +3506,7 @@ _0812DBD0:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DC12
@@ -3541,7 +3541,7 @@ _0812DC12:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812DC9C
@@ -3551,11 +3551,11 @@ _0812DC12:
movs r2, 0
movs r3, 0
bl sub_80763FC
- ldr r1, _0812DC90 @ =gUnknown_030042C0
+ ldr r1, _0812DC90 @ =gBattle_BG1_X
ldr r2, _0812DC94 @ =0x0000ffc8
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _0812DC98 @ =gUnknown_030041B4
+ ldr r0, _0812DC98 @ =gBattle_BG1_Y
strh r4, [r0]
b _0812DCCE
.align 2, 0
@@ -3567,31 +3567,31 @@ _0812DC80: .4byte 0x85000400
_0812DC84: .4byte gUnknown_08D2AA98
_0812DC88: .4byte gUnknown_08D2A9E0
_0812DC8C: .4byte gUnknown_08D2AA80
-_0812DC90: .4byte gUnknown_030042C0
+_0812DC90: .4byte gBattle_BG1_X
_0812DC94: .4byte 0x0000ffc8
-_0812DC98: .4byte gUnknown_030041B4
+_0812DC98: .4byte gBattle_BG1_Y
_0812DC9C:
- ldr r0, _0812DCB4 @ =gBattleAnimBankAttacker
+ ldr r0, _0812DCB4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0812DCC0
- ldr r1, _0812DCB8 @ =gUnknown_030042C0
+ ldr r1, _0812DCB8 @ =gBattle_BG1_X
ldr r4, _0812DCBC @ =0x0000ff79
adds r0, r4, 0
b _0812DCC6
.align 2, 0
-_0812DCB4: .4byte gBattleAnimBankAttacker
-_0812DCB8: .4byte gUnknown_030042C0
+_0812DCB4: .4byte gAnimBankAttacker
+_0812DCB8: .4byte gBattle_BG1_X
_0812DCBC: .4byte 0x0000ff79
_0812DCC0:
- ldr r1, _0812DCEC @ =gUnknown_030042C0
+ ldr r1, _0812DCEC @ =gBattle_BG1_X
ldr r2, _0812DCF0 @ =0x0000fff6
adds r0, r2, 0
_0812DCC6:
strh r0, [r1]
- ldr r1, _0812DCF4 @ =gUnknown_030041B4
+ ldr r1, _0812DCF4 @ =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
_0812DCCE:
@@ -3600,19 +3600,19 @@ _0812DCCE:
adds r1, r7
lsls r1, 3
adds r1, r0
- ldr r0, _0812DCEC @ =gUnknown_030042C0
+ ldr r0, _0812DCEC @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
- ldr r0, _0812DCF4 @ =gUnknown_030041B4
+ ldr r0, _0812DCF4 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
ldrh r0, [r1, 0x8]
adds r0, 0x1
b _0812DDD2
.align 2, 0
-_0812DCEC: .4byte gUnknown_030042C0
+_0812DCEC: .4byte gBattle_BG1_X
_0812DCF0: .4byte 0x0000fff6
-_0812DCF4: .4byte gUnknown_030041B4
+_0812DCF4: .4byte gBattle_BG1_Y
_0812DCF8: .4byte gTasks
_0812DCFC:
lsls r0, r7, 2
@@ -3685,7 +3685,7 @@ _0812DD64:
beq _0812DD7C
b _0812DE80
_0812DD7C:
- ldr r2, _0812DDA8 @ =gUnknown_030042C0
+ ldr r2, _0812DDA8 @ =gBattle_BG1_X
ldr r1, _0812DDAC @ =gUnknown_084025C0
movs r4, 0xC
ldrsh r0, [r3, r4]
@@ -3707,7 +3707,7 @@ _0812DD7C:
b _0812DE80
.align 2, 0
_0812DDA4: .4byte REG_BLDALPHA
-_0812DDA8: .4byte gUnknown_030042C0
+_0812DDA8: .4byte gBattle_BG1_X
_0812DDAC: .4byte gUnknown_084025C0
_0812DDB0:
movs r0, 0x3
@@ -3732,7 +3732,7 @@ _0812DDD2:
strh r0, [r1, 0x8]
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3785,7 +3785,7 @@ _0812DE0C:
ldr r1, _0812DE98 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DE5A
@@ -3804,9 +3804,9 @@ _0812DE5A:
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
- ldr r0, _0812DEA0 @ =gUnknown_030042C0
+ ldr r0, _0812DEA0 @ =gBattle_BG1_X
strh r4, [r0]
- ldr r0, _0812DEA4 @ =gUnknown_030041B4
+ ldr r0, _0812DEA4 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _0812DEA8 @ =REG_BLDCNT
strh r4, [r0]
@@ -3827,8 +3827,8 @@ _0812DE90: .4byte 0x040000d4
_0812DE94: .4byte 0x85000400
_0812DE98: .4byte 0x85000200
_0812DE9C: .4byte REG_BG1CNT
-_0812DEA0: .4byte gUnknown_030042C0
-_0812DEA4: .4byte gUnknown_030041B4
+_0812DEA0: .4byte gBattle_BG1_X
+_0812DEA4: .4byte gBattle_BG1_Y
_0812DEA8: .4byte REG_BLDCNT
thumb_func_end sub_812DB84
@@ -3855,17 +3855,17 @@ sub_812DEAC: @ 812DEAC
lsls r0, 16
lsrs r5, r0, 16
_0812DED6:
- ldr r4, _0812DFD0 @ =gBattleAnimBankAttacker
+ ldr r4, _0812DFD0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, r5
strh r0, [r7, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -3974,7 +3974,7 @@ _0812DED6:
pop {r0}
bx r0
.align 2, 0
-_0812DFD0: .4byte gBattleAnimBankAttacker
+_0812DFD0: .4byte gAnimBankAttacker
_0812DFD4: .4byte gBattleAnimArgs
_0812DFD8: .4byte gBattleAnimSpriteTemplate_84025EC
_0812DFDC: .4byte gSprites
@@ -4113,7 +4113,7 @@ sub_812E09C: @ 812E09C
adds r0, r5
bl DestroySprite
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812E0E8:
pop {r4-r6}
pop {r0}
@@ -4225,7 +4225,7 @@ _0812E194:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812E1D4
@@ -4260,7 +4260,7 @@ _0812E1D4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812E260
@@ -4270,11 +4270,11 @@ _0812E1D4:
movs r2, 0
movs r3, 0
bl sub_80763FC
- ldr r1, _0812E254 @ =gUnknown_030042C0
+ ldr r1, _0812E254 @ =gBattle_BG1_X
ldr r3, _0812E258 @ =0x0000ffc8
adds r0, r3, 0
strh r0, [r1]
- ldr r0, _0812E25C @ =gUnknown_030041B4
+ ldr r0, _0812E25C @ =gBattle_BG1_Y
strh r4, [r0]
b _0812E2D2
.align 2, 0
@@ -4287,11 +4287,11 @@ _0812E244: .4byte 0x85000400
_0812E248: .4byte gUnknown_08D2AA98
_0812E24C: .4byte gUnknown_08D2A9E0
_0812E250: .4byte gUnknown_08D2AA80
-_0812E254: .4byte gUnknown_030042C0
+_0812E254: .4byte gBattle_BG1_X
_0812E258: .4byte 0x0000ffc8
-_0812E25C: .4byte gUnknown_030041B4
+_0812E25C: .4byte gBattle_BG1_Y
_0812E260:
- ldr r0, _0812E2A0 @ =gBattleAnimBankTarget
+ ldr r0, _0812E2A0 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity
lsls r0, 24
@@ -4301,7 +4301,7 @@ _0812E260:
lsrs r0, 24
cmp r0, 0x1
bne _0812E2B4
- ldr r1, _0812E2A4 @ =gUnknown_030042C0
+ ldr r1, _0812E2A4 @ =gBattle_BG1_X
cmp r4, 0x1
bne _0812E284
ldr r2, _0812E2A8 @ =0x0000ff65
@@ -4321,32 +4321,32 @@ _0812E28E:
_0812E296:
cmp r4, 0x2
bne _0812E2CC
- ldr r1, _0812E2A4 @ =gUnknown_030042C0
+ ldr r1, _0812E2A4 @ =gBattle_BG1_X
ldr r2, _0812E2B0 @ =0x0000ffec
b _0812E2C8
.align 2, 0
-_0812E2A0: .4byte gBattleAnimBankTarget
-_0812E2A4: .4byte gUnknown_030042C0
+_0812E2A0: .4byte gAnimBankTarget
+_0812E2A4: .4byte gBattle_BG1_X
_0812E2A8: .4byte 0x0000ff65
_0812E2AC: .4byte 0x0000ff8d
_0812E2B0: .4byte 0x0000ffec
_0812E2B4:
cmp r4, 0x1
bne _0812E2C0
- ldr r1, _0812E2EC @ =gUnknown_030042C0
+ ldr r1, _0812E2EC @ =gBattle_BG1_X
ldr r3, _0812E2F0 @ =0x0000ff79
adds r0, r3, 0
strh r0, [r1]
_0812E2C0:
cmp r4, 0
bne _0812E2CC
- ldr r1, _0812E2EC @ =gUnknown_030042C0
+ ldr r1, _0812E2EC @ =gBattle_BG1_X
ldr r2, _0812E2F4 @ =0x0000fff6
_0812E2C8:
adds r0, r2, 0
strh r0, [r1]
_0812E2CC:
- ldr r1, _0812E2F8 @ =gUnknown_030041B4
+ ldr r1, _0812E2F8 @ =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
_0812E2D2:
@@ -4355,18 +4355,18 @@ _0812E2D2:
adds r1, r6
lsls r1, 3
adds r1, r0
- ldr r0, _0812E2EC @ =gUnknown_030042C0
+ ldr r0, _0812E2EC @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
- ldr r0, _0812E2F8 @ =gUnknown_030041B4
+ ldr r0, _0812E2F8 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
b _0812E380
.align 2, 0
-_0812E2EC: .4byte gUnknown_030042C0
+_0812E2EC: .4byte gBattle_BG1_X
_0812E2F0: .4byte 0x0000ff79
_0812E2F4: .4byte 0x0000fff6
-_0812E2F8: .4byte gUnknown_030041B4
+_0812E2F8: .4byte gBattle_BG1_Y
_0812E2FC: .4byte gTasks
_0812E300:
ldr r1, _0812E334 @ =gTasks
@@ -4376,14 +4376,14 @@ _0812E300:
adds r5, r0, r1
movs r0, 0
strh r0, [r5, 0xE]
- ldr r0, _0812E338 @ =gBattleAnimBankTarget
+ ldr r0, _0812E338 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0812E344
- ldr r2, _0812E33C @ =gUnknown_030042C0
+ ldr r2, _0812E33C @ =gBattle_BG1_X
ldr r1, _0812E340 @ =gUnknown_08402604
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4396,11 +4396,11 @@ _0812E300:
b _0812E356
.align 2, 0
_0812E334: .4byte gTasks
-_0812E338: .4byte gBattleAnimBankTarget
-_0812E33C: .4byte gUnknown_030042C0
+_0812E338: .4byte gAnimBankTarget
+_0812E33C: .4byte gBattle_BG1_X
_0812E340: .4byte gUnknown_08402604
_0812E344:
- ldr r2, _0812E374 @ =gUnknown_030042C0
+ ldr r2, _0812E374 @ =gBattle_BG1_X
ldr r1, _0812E378 @ =gUnknown_08402604
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4425,7 +4425,7 @@ _0812E356:
strh r0, [r1, 0x8]
b _0812E476
.align 2, 0
-_0812E374: .4byte gUnknown_030042C0
+_0812E374: .4byte gBattle_BG1_X
_0812E378: .4byte gUnknown_08402604
_0812E37C: .4byte gTasks
_0812E380:
@@ -4528,7 +4528,7 @@ _0812E420:
ldr r0, _0812E484 @ =0x85000200
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812E450
@@ -4547,9 +4547,9 @@ _0812E450:
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
- ldr r0, _0812E48C @ =gUnknown_030042C0
+ ldr r0, _0812E48C @ =gBattle_BG1_X
strh r4, [r0]
- ldr r0, _0812E490 @ =gUnknown_030041B4
+ ldr r0, _0812E490 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _0812E494 @ =REG_BLDCNT
strh r4, [r0]
@@ -4566,8 +4566,8 @@ _0812E476:
_0812E480: .4byte 0x040000d4
_0812E484: .4byte 0x85000200
_0812E488: .4byte REG_BG1CNT
-_0812E48C: .4byte gUnknown_030042C0
-_0812E490: .4byte gUnknown_030041B4
+_0812E48C: .4byte gBattle_BG1_X
+_0812E490: .4byte gBattle_BG1_Y
_0812E494: .4byte REG_BLDCNT
thumb_func_end sub_812E14C
@@ -4642,7 +4642,7 @@ _0812E50E:
ldrh r0, [r4, 0x32]
adds r0, 0x80
strh r0, [r4, 0x32]
- ldr r0, _0812E53C @ =gBattleAnimBankAttacker
+ ldr r0, _0812E53C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -4654,7 +4654,7 @@ _0812E50E:
negs r0, r0
b _0812E546
.align 2, 0
-_0812E53C: .4byte gBattleAnimBankAttacker
+_0812E53C: .4byte gAnimBankAttacker
_0812E540:
ldrh r0, [r4, 0x30]
lsls r0, 16
@@ -4672,7 +4672,7 @@ _0812E546:
cmp r0, 0x40
ble _0812E562
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812E562:
pop {r4}
pop {r0}
@@ -4747,12 +4747,12 @@ _0812E5AC:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0812E5F8
- ldr r0, _0812E5F4 @ =gBattleAnimBankAttacker
+ ldr r0, _0812E5F4 @ =gAnimBankAttacker
b _0812E5FA
.align 2, 0
-_0812E5F4: .4byte gBattleAnimBankAttacker
+_0812E5F4: .4byte gAnimBankAttacker
_0812E5F8:
- ldr r0, _0812E630 @ =gBattleAnimBankTarget
+ ldr r0, _0812E630 @ =gAnimBankTarget
_0812E5FA:
ldrb r0, [r0]
bl GetBankSide
@@ -4781,7 +4781,7 @@ _0812E628:
pop {r0}
bx r0
.align 2, 0
-_0812E630: .4byte gBattleAnimBankTarget
+_0812E630: .4byte gAnimBankTarget
_0812E634: .4byte sub_812E638
thumb_func_end sub_812E568
@@ -4970,7 +4970,7 @@ _0812E798:
sub_812E7A0: @ 812E7A0
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0812E7BC @ =gBattleAnimBankAttacker
+ ldr r0, _0812E7BC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -4982,7 +4982,7 @@ sub_812E7A0: @ 812E7A0
ldrh r0, [r1]
b _0812E7CE
.align 2, 0
-_0812E7BC: .4byte gBattleAnimBankAttacker
+_0812E7BC: .4byte gAnimBankAttacker
_0812E7C0: .4byte gBattleAnimArgs
_0812E7C4:
movs r0, 0xF0
@@ -5014,7 +5014,7 @@ sub_812E7F0: @ 812E7F0
ldrh r0, [r4, 0x2E]
adds r0, 0x3
strh r0, [r4, 0x2E]
- ldr r0, _0812E830 @ =gBattleAnimBankAttacker
+ ldr r0, _0812E830 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -5031,7 +5031,7 @@ sub_812E7F0: @ 812E7F0
cmp r1, 0xF0
ble _0812E822
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812E822:
ldrh r1, [r4, 0x2E]
movs r0, 0xFF
@@ -5040,7 +5040,7 @@ _0812E822:
bl Sin
b _0812E858
.align 2, 0
-_0812E830: .4byte gBattleAnimBankAttacker
+_0812E830: .4byte gAnimBankAttacker
_0812E834:
ldrh r1, [r4, 0x20]
subs r1, 0x5
@@ -5052,7 +5052,7 @@ _0812E834:
cmp r1, 0
bge _0812E84C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812E84C:
ldrh r1, [r4, 0x2E]
movs r0, 0xFF
@@ -5329,16 +5329,16 @@ sub_812EA4C: @ 812EA4C
ldrsh r0, [r6, r2]
cmp r0, 0
bne _0812EA80
- ldr r4, _0812EAA8 @ =gBattleAnimBankAttacker
+ ldr r4, _0812EAA8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -5363,7 +5363,7 @@ _0812EA80:
b _0812EB0A
.align 2, 0
_0812EAA4: .4byte gBattleAnimArgs
-_0812EAA8: .4byte gBattleAnimBankAttacker
+_0812EAA8: .4byte gAnimBankAttacker
_0812EAAC:
ldrh r1, [r5, 0x30]
lsls r0, r1, 16
@@ -5410,7 +5410,7 @@ _0812EAEA:
cmp r0, 0
beq _0812EB0A
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812EB0A:
pop {r4-r6}
pop {r0}
@@ -5440,14 +5440,14 @@ sub_812EB10: @ 812EB10
mov r8, r0
cmp r1, 0
bne _0812EB4C
- ldr r0, _0812EB48 @ =gBattleAnimBankAttacker
+ ldr r0, _0812EB48 @ =gAnimBankAttacker
b _0812EB4E
.align 2, 0
_0812EB40: .4byte gTasks
_0812EB44: .4byte gBattleAnimArgs
-_0812EB48: .4byte gBattleAnimBankAttacker
+_0812EB48: .4byte gAnimBankAttacker
_0812EB4C:
- ldr r0, _0812EB88 @ =gBattleAnimBankTarget
+ ldr r0, _0812EB88 @ =gAnimBankTarget
_0812EB4E:
ldrb r0, [r0]
strh r0, [r2, 0x1E]
@@ -5477,7 +5477,7 @@ _0812EB4E:
lsls r2, r5, 4
b _0812EBF8
.align 2, 0
-_0812EB88: .4byte gBattleAnimBankTarget
+_0812EB88: .4byte gAnimBankTarget
_0812EB8C: .4byte gTasks
_0812EB90:
cmp r0, 0x2
@@ -5512,7 +5512,7 @@ _0812EBC2:
bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8079A64
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812EBE8
@@ -5733,7 +5733,7 @@ _0812ED6A:
cmp r0, 0x1F
bne _0812ED7E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812ED7E:
pop {r4}
pop {r0}
@@ -5756,10 +5756,10 @@ sub_812ED84: @ 812ED84
adds r1, r3, 0
orrs r0, r1
strh r0, [r2]
- ldr r0, _0812EDEC @ =gUnknown_030042C4
+ ldr r0, _0812EDEC @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _0812EDF0 @ =gUnknown_03004240
+ ldr r0, _0812EDF0 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _0812EDF4 @ =REG_WIN0H
strh r1, [r0]
@@ -5792,8 +5792,8 @@ sub_812ED84: @ 812ED84
.align 2, 0
_0812EDE4: .4byte REG_WINOUT
_0812EDE8: .4byte 0x00001f3f
-_0812EDEC: .4byte gUnknown_030042C4
-_0812EDF0: .4byte gUnknown_03004240
+_0812EDEC: .4byte gBattle_WIN0H
+_0812EDF0: .4byte gBattle_WIN0V
_0812EDF4: .4byte REG_WIN0H
_0812EDF8: .4byte gBattleAnimArgs
_0812EDFC: .4byte sub_812EE00
@@ -5878,7 +5878,7 @@ _0812EE76:
eors r0, r1
strh r0, [r2]
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812EE94:
pop {r4}
pop {r0}
@@ -5892,16 +5892,16 @@ _0812EEA0: .4byte 0x00003f3f
sub_812EEA4: @ 812EEA4
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _0812EEE0 @ =gBattleAnimBankAttacker
+ ldr r5, _0812EEE0 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -5918,7 +5918,7 @@ sub_812EEA4: @ 812EEA4
pop {r0}
bx r0
.align 2, 0
-_0812EEE0: .4byte gBattleAnimBankAttacker
+_0812EEE0: .4byte gAnimBankAttacker
_0812EEE4: .4byte gBattleAnimArgs
_0812EEE8: .4byte sub_812EEEC
thumb_func_end sub_812EEA4
@@ -5953,15 +5953,15 @@ sub_812EEEC: @ 812EEEC
cmp r0, 0xC3
ble _0812EF38
_0812EF26:
- ldr r0, _0812EF34 @ =gBattleAnimBankAttacker
+ ldr r0, _0812EF34 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
b _0812EF42
.align 2, 0
-_0812EF34: .4byte gBattleAnimBankAttacker
+_0812EF34: .4byte gAnimBankAttacker
_0812EF38:
- ldr r0, _0812EF84 @ =gBattleAnimBankAttacker
+ ldr r0, _0812EF84 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079E90
adds r0, 0x1
@@ -5999,7 +5999,7 @@ _0812EF42:
strh r0, [r4, 0x38]
b _0812EFB8
.align 2, 0
-_0812EF84: .4byte gBattleAnimBankAttacker
+_0812EF84: .4byte gAnimBankAttacker
_0812EF88:
cmp r2, 0x1
bne _0812EFB8
@@ -6023,7 +6023,7 @@ _0812EF88:
cmp r0, r1
bne _0812EFB8
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0812EFB8:
pop {r4}
pop {r0}
@@ -6046,7 +6046,7 @@ sub_812EFC8: @ 812EFC8
str r0, [sp, 0x10]
movs r0, 0
bl GetAnimBankSpriteId
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812F004
@@ -6063,7 +6063,7 @@ sub_812EFC8: @ 812EFC8
.align 2, 0
_0812F000: .4byte gSharedMem + 0x19348
_0812F004:
- ldr r0, _0812F070 @ =gBattleAnimBankAttacker
+ ldr r0, _0812F070 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -6072,7 +6072,7 @@ _0812F004:
movs r0, 0
str r0, [sp, 0x14]
ldr r6, _0812F074 @ =gBattlePartyID
- ldr r4, _0812F078 @ =gBattleAnimBankTarget
+ ldr r4, _0812F078 @ =gAnimBankTarget
ldrb r0, [r4]
lsls r0, 1
adds r0, r6
@@ -6113,9 +6113,9 @@ _0812F004:
adds r0, r7
b _0812F092
.align 2, 0
-_0812F070: .4byte gBattleAnimBankAttacker
+_0812F070: .4byte gAnimBankAttacker
_0812F074: .4byte gBattlePartyID
-_0812F078: .4byte gBattleAnimBankTarget
+_0812F078: .4byte gAnimBankTarget
_0812F07C: .4byte gPlayerParty
_0812F080: .4byte gSharedMem + 0x17800
_0812F084:
@@ -6144,7 +6144,7 @@ _0812F0AC:
movs r2, 0x1
str r2, [sp, 0x14]
ldr r6, _0812F10C @ =gBattlePartyID
- ldr r4, _0812F110 @ =gBattleAnimBankTarget
+ ldr r4, _0812F110 @ =gAnimBankTarget
ldrb r0, [r4]
lsls r0, 1
adds r0, r6
@@ -6187,7 +6187,7 @@ _0812F0AC:
b _0812F12C
.align 2, 0
_0812F10C: .4byte gBattlePartyID
-_0812F110: .4byte gBattleAnimBankTarget
+_0812F110: .4byte gAnimBankTarget
_0812F114: .4byte gEnemyParty
_0812F118: .4byte gSharedMem + 0x17800
_0812F11C: .4byte gPlayerParty
@@ -6211,21 +6211,21 @@ _0812F13A:
_0812F13C:
mov r10, r3
_0812F13E:
- ldr r0, _0812F21C @ =gBattleAnimBankAttacker
+ ldr r0, _0812F21C @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
lsrs r7, r0, 24
- ldr r5, _0812F21C @ =gBattleAnimBankAttacker
+ ldr r5, _0812F21C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
mov r2, r10
lsls r1, r2, 16
@@ -6317,7 +6317,7 @@ _0812F13E:
bx r0
.align 2, 0
_0812F218: .4byte 0x0000ffec
-_0812F21C: .4byte gBattleAnimBankAttacker
+_0812F21C: .4byte gAnimBankAttacker
_0812F220: .4byte gSprites
_0812F224: .4byte 0x00007fff
_0812F228: .4byte REG_BLDCNT
@@ -6454,14 +6454,14 @@ sub_812F314: @ 812F314
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0812F340
- ldr r0, _0812F33C @ =gBattleAnimBankAttacker
+ ldr r0, _0812F33C @ =gAnimBankAttacker
b _0812F342
.align 2, 0
_0812F334: .4byte gTasks
_0812F338: .4byte gBattleAnimArgs
-_0812F33C: .4byte gBattleAnimBankAttacker
+_0812F33C: .4byte gAnimBankAttacker
_0812F340:
- ldr r0, _0812F3C0 @ =gBattleAnimBankTarget
+ ldr r0, _0812F3C0 @ =gAnimBankTarget
_0812F342:
ldrb r5, [r0]
movs r6, 0
@@ -6519,18 +6519,18 @@ _0812F388:
ldr r2, _0812F3D0 @ =0x00003f42
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _0812F3D4 @ =gUnknown_030042C0
+ ldr r0, _0812F3D4 @ =gBattle_BG1_X
ldrh r5, [r0]
- ldr r0, _0812F3D8 @ =gUnknown_030041B4
+ ldr r0, _0812F3D8 @ =gBattle_BG1_Y
b _0812F3EE
.align 2, 0
-_0812F3C0: .4byte gBattleAnimBankTarget
+_0812F3C0: .4byte gAnimBankTarget
_0812F3C4: .4byte gBattleAnimArgs
_0812F3C8: .4byte REG_BG1HOFS
_0812F3CC: .4byte REG_BLDCNT
_0812F3D0: .4byte 0x00003f42
-_0812F3D4: .4byte gUnknown_030042C0
-_0812F3D8: .4byte gUnknown_030041B4
+_0812F3D4: .4byte gBattle_BG1_X
+_0812F3D8: .4byte gBattle_BG1_Y
_0812F3DC:
ldr r0, _0812F454 @ =REG_BG2HOFS
str r0, [sp]
@@ -6538,9 +6538,9 @@ _0812F3DC:
ldr r2, _0812F45C @ =0x00003f44
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _0812F460 @ =gUnknown_03004288
+ ldr r0, _0812F460 @ =gBattle_BG2_X
ldrh r5, [r0]
- ldr r0, _0812F464 @ =gUnknown_03004280
+ ldr r0, _0812F464 @ =gBattle_BG2_Y
_0812F3EE:
ldrh r3, [r0]
movs r7, 0
@@ -6597,8 +6597,8 @@ _0812F3FE:
_0812F454: .4byte REG_BG2HOFS
_0812F458: .4byte REG_BLDCNT
_0812F45C: .4byte 0x00003f44
-_0812F460: .4byte gUnknown_03004288
-_0812F464: .4byte gUnknown_03004280
+_0812F460: .4byte gBattle_BG2_X
+_0812F464: .4byte gBattle_BG2_Y
_0812F468: .4byte gUnknown_03004DE0
_0812F46C: .4byte 0xa6600001
_0812F470: .4byte sub_812F474
@@ -6625,20 +6625,20 @@ sub_812F474: @ 812F474
lsrs r0, 24
cmp r0, 0x1
bne _0812F4B4
- ldr r0, _0812F4AC @ =gUnknown_030042C0
+ ldr r0, _0812F4AC @ =gBattle_BG1_X
ldrh r0, [r0]
str r0, [sp, 0x4]
- ldr r0, _0812F4B0 @ =gUnknown_030041B4
+ ldr r0, _0812F4B0 @ =gBattle_BG1_Y
b _0812F4BC
.align 2, 0
_0812F4A8: .4byte gTasks
-_0812F4AC: .4byte gUnknown_030042C0
-_0812F4B0: .4byte gUnknown_030041B4
+_0812F4AC: .4byte gBattle_BG1_X
+_0812F4B0: .4byte gBattle_BG1_Y
_0812F4B4:
- ldr r0, _0812F4D4 @ =gUnknown_03004288
+ ldr r0, _0812F4D4 @ =gBattle_BG2_X
ldrh r0, [r0]
str r0, [sp, 0x4]
- ldr r0, _0812F4D8 @ =gUnknown_03004280
+ ldr r0, _0812F4D8 @ =gBattle_BG2_Y
_0812F4BC:
ldrh r0, [r0]
str r0, [sp, 0x8]
@@ -6654,8 +6654,8 @@ _0812F4CA:
beq _0812F4EA
b _0812F712
.align 2, 0
-_0812F4D4: .4byte gUnknown_03004288
-_0812F4D8: .4byte gUnknown_03004280
+_0812F4D4: .4byte gBattle_BG2_X
+_0812F4D8: .4byte gBattle_BG2_Y
_0812F4DC:
cmp r0, 0x2
bne _0812F4E2
@@ -7249,7 +7249,7 @@ sub_812F948: @ 812F948
ldrb r1, [r6]
adds r0, r5, 0
bl StartSpriteAffineAnim
- ldr r0, _0812F9A4 @ =gBattleAnimBankTarget
+ ldr r0, _0812F9A4 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -7259,10 +7259,10 @@ sub_812F948: @ 812F948
negs r0, r0
strh r0, [r6, 0x2]
_0812F96E:
- ldr r4, _0812F9A8 @ =gBattleAnimBankAttacker
+ ldr r4, _0812F9A8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -7270,7 +7270,7 @@ _0812F96E:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7283,8 +7283,8 @@ _0812F96E:
bx r0
.align 2, 0
_0812F9A0: .4byte gBattleAnimArgs
-_0812F9A4: .4byte gBattleAnimBankTarget
-_0812F9A8: .4byte gBattleAnimBankAttacker
+_0812F9A4: .4byte gAnimBankTarget
+_0812F9A8: .4byte gAnimBankAttacker
_0812F9AC: .4byte sub_80DA48C
thumb_func_end sub_812F948
@@ -7673,7 +7673,7 @@ sub_812FC68: @ 812FC68
mov r1, r8
adds r4, r0, r1
ldr r1, _0812FCCC @ =gObjectBankIDs
- ldr r2, _0812FCD0 @ =gBattleAnimBankAttacker
+ ldr r2, _0812FCD0 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r1
ldrb r0, [r0]
@@ -7710,7 +7710,7 @@ _0812FCAC:
.align 2, 0
_0812FCC8: .4byte gTasks
_0812FCCC: .4byte gObjectBankIDs
-_0812FCD0: .4byte gBattleAnimBankAttacker
+_0812FCD0: .4byte gAnimBankAttacker
_0812FCD4: .4byte gBattleAnimArgs
_0812FCD8: .4byte 0xffff8000
_0812FCDC:
@@ -7821,25 +7821,25 @@ _0812FD9C:
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0812FDC0
- ldr r0, _0812FDBC @ =gBattleAnimBankAttacker
+ ldr r0, _0812FDBC @ =gAnimBankAttacker
b _0812FDC2
.align 2, 0
_0812FDB4: .4byte gTasks
_0812FDB8: .4byte gBattleAnimArgs
-_0812FDBC: .4byte gBattleAnimBankAttacker
+_0812FDBC: .4byte gAnimBankAttacker
_0812FDC0:
- ldr r0, _0812FE10 @ =gBattleAnimBankTarget
+ ldr r0, _0812FE10 @ =gAnimBankTarget
_0812FDC2:
ldrb r4, [r0]
adds r0, r4, 0
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -7864,7 +7864,7 @@ _0812FDC2:
pop {r0}
bx r0
.align 2, 0
-_0812FE10: .4byte gBattleAnimBankTarget
+_0812FE10: .4byte gAnimBankTarget
_0812FE14: .4byte gBattleAnimArgs
_0812FE18: .4byte gUnknown_084028AC
_0812FE1C: .4byte sub_812FE20
@@ -8214,7 +8214,7 @@ sub_81300A4: @ 81300A4
lsrs r0, 24
movs r2, 0xD0
lsls r2, 1
- ldr r1, _081300E0 @ =gBattleAnimBankAttacker
+ ldr r1, _081300E0 @ =gAnimBankAttacker
ldrb r3, [r1]
ldr r1, _081300E4 @ =gBattleAnimArgs
ldrb r1, [r1]
@@ -8237,7 +8237,7 @@ sub_81300A4: @ 81300A4
pop {r0}
bx r0
.align 2, 0
-_081300E0: .4byte gBattleAnimBankAttacker
+_081300E0: .4byte gAnimBankAttacker
_081300E4: .4byte gBattleAnimArgs
_081300E8: .4byte gUnknown_08D2E014
_081300EC: .4byte gUnknown_08D2E170
@@ -8248,7 +8248,7 @@ _081300F0: .4byte gUnknown_08D2E150
sub_81300F4: @ 81300F4
push {r4-r6,lr}
adds r5, r0, 0
- ldr r6, _0813014C @ =gBattleAnimBankAttacker
+ ldr r6, _0813014C @ =gAnimBankAttacker
ldrb r0, [r6]
bl GetBankSide
lsls r0, 24
@@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4
_08130110:
ldrb r0, [r6]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r4, _08130150 @ =gBattleAnimArgs
lsrs r0, 24
@@ -8271,7 +8271,7 @@ _08130110:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -8288,7 +8288,7 @@ _08130110:
strh r0, [r5, 0x30]
b _08130180
.align 2, 0
-_0813014C: .4byte gBattleAnimBankAttacker
+_0813014C: .4byte gAnimBankAttacker
_08130150: .4byte gBattleAnimArgs
_08130154: .4byte 0x0000fd80
_08130158:
@@ -8313,7 +8313,7 @@ _08130172:
lsls r0, 2
strh r0, [r5, 0x2E]
_08130180:
- ldr r0, _081301AC @ =gBattleAnimBankAttacker
+ ldr r0, _081301AC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -8335,7 +8335,7 @@ _081301A0:
pop {r0}
bx r0
.align 2, 0
-_081301AC: .4byte gBattleAnimBankAttacker
+_081301AC: .4byte gAnimBankAttacker
_081301B0: .4byte sub_81301B4
thumb_func_end sub_81300F4
@@ -8365,7 +8365,7 @@ sub_81301B4: @ 81301B4
cmp r0, 0xE
bne _081301E8
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_081301E8:
pop {r0}
bx r0
@@ -8381,7 +8381,7 @@ sub_81301EC: @ 81301EC
lsls r1, 3
ldr r0, _08130218 @ =gTasks
adds r6, r1, r0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -8402,7 +8402,7 @@ _0813021C:
strh r0, [r6, 0x14]
strh r1, [r6, 0x16]
_08130226:
- ldr r5, _0813025C @ =gBattleAnimBankAttacker
+ ldr r5, _0813025C @ =gAnimBankAttacker
ldrb r0, [r5]
bl GetBankSide
lsls r0, 24
@@ -8410,7 +8410,7 @@ _08130226:
bne _08130260
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8427,11 +8427,11 @@ _08130254:
adds r0, r4, r0
b _08130284
.align 2, 0
-_0813025C: .4byte gBattleAnimBankAttacker
+_0813025C: .4byte gAnimBankAttacker
_08130260:
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8448,10 +8448,10 @@ _08130280:
subs r0, r4, r0
_08130284:
strh r0, [r6, 0x1E]
- ldr r5, _081302D8 @ =gBattleAnimBankAttacker
+ ldr r5, _081302D8 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8467,16 +8467,16 @@ _081302A8:
asrs r0, 2
subs r0, r4, r0
strh r0, [r6, 0x20]
- ldr r4, _081302DC @ =gBattleAnimBankTarget
+ ldr r4, _081302DC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x24]
@@ -8486,8 +8486,8 @@ _081302A8:
pop {r0}
bx r0
.align 2, 0
-_081302D8: .4byte gBattleAnimBankAttacker
-_081302DC: .4byte gBattleAnimBankTarget
+_081302D8: .4byte gAnimBankAttacker
+_081302DC: .4byte gAnimBankTarget
_081302E0: .4byte sub_81302E4
thumb_func_end sub_81301EC
@@ -8807,7 +8807,7 @@ sub_813051C: @ 813051C
strh r0, [r4, 0x36]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x2E]
- ldr r1, _0813054C @ =move_anim_8072740
+ ldr r1, _0813054C @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
ldr r0, _08130550 @ =sub_8078CC0
@@ -8817,7 +8817,7 @@ sub_813051C: @ 813051C
bx r0
.align 2, 0
_08130548: .4byte gBattleAnimArgs
-_0813054C: .4byte move_anim_8072740
+_0813054C: .4byte DestroyAnimSprite
_08130550: .4byte sub_8078CC0
thumb_func_end sub_813051C
@@ -8836,33 +8836,33 @@ sub_8130554: @ 8130554
lsls r0, 3
ldr r1, _08130674 @ =gTasks
adds r7, r0, r1
- ldr r0, _08130678 @ =gBattleAnimBankAttacker
+ ldr r0, _08130678 @ =gAnimBankAttacker
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x1E]
mov r1, r10
ldrb r0, [r1]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
- ldr r0, _0813067C @ =gBattleAnimBankTarget
+ ldr r0, _0813067C @ =gAnimBankTarget
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
mov r1, r8
ldrb r0, [r1]
@@ -8961,8 +8961,8 @@ _0813066E:
b _08130696
.align 2, 0
_08130674: .4byte gTasks
-_08130678: .4byte gBattleAnimBankAttacker
-_0813067C: .4byte gBattleAnimBankTarget
+_08130678: .4byte gAnimBankAttacker
+_0813067C: .4byte gAnimBankTarget
_08130680: .4byte gSpriteTemplate_84029AC
_08130684: .4byte gSprites
_08130688: .4byte 0x0000ffe0
@@ -9128,13 +9128,13 @@ sub_81307B0: @ 81307B0
adds r6, r0, 0
cmp r1, 0
bne _081307CC
- ldr r0, _081307C8 @ =gBattleAnimBankAttacker
+ ldr r0, _081307C8 @ =gAnimBankAttacker
b _081307CE
.align 2, 0
_081307C4: .4byte gBattleAnimArgs
-_081307C8: .4byte gBattleAnimBankAttacker
+_081307C8: .4byte gAnimBankAttacker
_081307CC:
- ldr r0, _08130834 @ =gBattleAnimBankTarget
+ ldr r0, _08130834 @ =gAnimBankTarget
_081307CE:
ldrb r5, [r0]
ldrh r2, [r4, 0x4]
@@ -9163,7 +9163,7 @@ _081307FC:
strh r1, [r4, 0x3C]
adds r0, r5, 0
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -9187,7 +9187,7 @@ _081307FC:
subs r0, 0x8
b _0813084A
.align 2, 0
-_08130834: .4byte gBattleAnimBankTarget
+_08130834: .4byte gAnimBankTarget
_08130838: .4byte 0x000003ff
_0813083C: .4byte 0xfffffc00
_08130840:
@@ -9306,7 +9306,7 @@ _081308DA:
b _08130914
_0813090E:
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08130914:
pop {r0}
bx r0
@@ -9460,17 +9460,17 @@ sub_8130A2C: @ 8130A2C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _08130A48
- ldr r4, _08130A44 @ =gBattleAnimBankAttacker
+ ldr r4, _08130A44 @ =gAnimBankAttacker
b _08130A4A
.align 2, 0
_08130A40: .4byte gBattleAnimArgs
-_08130A44: .4byte gBattleAnimBankAttacker
+_08130A44: .4byte gAnimBankAttacker
_08130A48:
- ldr r4, _08130A88 @ =gBattleAnimBankTarget
+ ldr r4, _08130A88 @ =gAnimBankTarget
_08130A4A:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -9499,7 +9499,7 @@ _08130A6E:
pop {r0}
bx r0
.align 2, 0
-_08130A88: .4byte gBattleAnimBankTarget
+_08130A88: .4byte gAnimBankTarget
_08130A8C: .4byte gBattleAnimArgs
_08130A90: .4byte sub_8130A94
thumb_func_end sub_8130A2C
@@ -9546,7 +9546,7 @@ sub_8130A94: @ 8130A94
cmp r0, 0
bne _08130AE8
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08130AE8:
pop {r0}
bx r0
@@ -9840,7 +9840,7 @@ _08130CF6:
cmp r0, 0x5
bne _08130D18
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08130D18:
pop {r4}
pop {r0}
@@ -9862,7 +9862,7 @@ sub_8130D20: @ 8130D20
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _08130DA8
@@ -9871,10 +9871,10 @@ sub_8130D20: @ 8130D20
lsrs r7, r0, 24
cmp r7, 0x1
bne _08130D8C
- ldr r5, _08130D80 @ =gBattleAnimBankAttacker
+ ldr r5, _08130D80 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20
movs r0, 0x2
eors r0, r1
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -9891,14 +9891,14 @@ sub_8130D20: @ 8130D20
b _08130DAC
.align 2, 0
_08130D7C: .4byte gTasks
-_08130D80: .4byte gBattleAnimBankAttacker
+_08130D80: .4byte gAnimBankAttacker
_08130D84:
ldr r0, _08130D88 @ =0x0000ffff
b _08130DAA
.align 2, 0
_08130D88: .4byte 0x0000ffff
_08130D8C:
- ldr r0, _08130DA0 @ =gBattleAnimBankAttacker
+ ldr r0, _08130DA0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -9907,7 +9907,7 @@ _08130D8C:
ldr r0, _08130DA4 @ =0x0000ffff
b _08130DAA
.align 2, 0
-_08130DA0: .4byte gBattleAnimBankAttacker
+_08130DA0: .4byte gAnimBankAttacker
_08130DA4: .4byte 0x0000ffff
_08130DA8:
movs r0, 0x1
@@ -10152,13 +10152,13 @@ sub_8130F5C: @ 8130F5C
adds r0, r4, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _08130F7C @ =gBattleAnimBankAttacker
+ ldr r0, _08130F7C @ =gAnimBankAttacker
b _08130F82
.align 2, 0
_08130F78: .4byte gBattleAnimArgs
-_08130F7C: .4byte gBattleAnimBankAttacker
+_08130F7C: .4byte gAnimBankAttacker
_08130F80:
- ldr r0, _08130FD8 @ =gBattleAnimBankTarget
+ ldr r0, _08130FD8 @ =gAnimBankTarget
_08130F82:
ldrb r0, [r0]
strh r0, [r4, 0x3C]
@@ -10203,7 +10203,7 @@ _08130FA6:
pop {r0}
bx r0
.align 2, 0
-_08130FD8: .4byte gBattleAnimBankTarget
+_08130FD8: .4byte gAnimBankTarget
_08130FDC: .4byte sub_8130FE0
thumb_func_end sub_8130F5C
@@ -10323,14 +10323,14 @@ _081310C4:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r1, r0, 24
_081310E4:
@@ -10467,7 +10467,7 @@ _081311CA:
_081311D4: .4byte REG_BLDALPHA
_081311D8:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_081311DE:
pop {r4,r5}
pop {r0}
@@ -10528,7 +10528,7 @@ _08131242:
cmp r1, r0
bne _08131254
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08131254:
ldrh r0, [r4, 0x38]
adds r0, 0x1
@@ -10544,19 +10544,19 @@ _08131260: .4byte gSpriteTemplate_8402500
sub_8131264: @ 8131264
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _081312A0 @ =gBattleAnimBankTarget
+ ldr r4, _081312A0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08131290
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _081312A8
@@ -10570,7 +10570,7 @@ _08131290:
subs r1, r0
b _081312B6
.align 2, 0
-_081312A0: .4byte gBattleAnimBankTarget
+_081312A0: .4byte gAnimBankTarget
_081312A4: .4byte gBattleAnimArgs
_081312A8:
ldr r2, _081312DC @ =gBattleAnimArgs
@@ -10685,11 +10685,11 @@ _08131378:
.align 2, 0
_08131380: .4byte gSprites
_08131384:
- ldr r4, _081313F4 @ =gBattleAnimBankAttacker
+ ldr r4, _081313F4 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
bl refresh_graphics_maybe
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _081313C6
@@ -10742,7 +10742,7 @@ _081313E8:
pop {r0}
bx r0
.align 2, 0
-_081313F4: .4byte gBattleAnimBankAttacker
+_081313F4: .4byte gAnimBankAttacker
_081313F8: .4byte gSprites
_081313FC: .4byte gObjectBankIDs
_08131400: .4byte gSpriteAffineAnimTable_81E7C18
@@ -10838,7 +10838,7 @@ _081314A6:
bne _0813155A
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10911,7 +10911,7 @@ _08131538:
bne _0813155A
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10931,7 +10931,7 @@ _08131560: .4byte gSprites
sub_8131564: @ 8131564
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _08131588 @ =gBattleAnimBankTarget
+ ldr r4, _08131588 @ =gAnimBankTarget
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -10946,7 +10946,7 @@ sub_8131564: @ 8131564
ldr r4, _0813158C @ =0x0000ff70
b _081315A0
.align 2, 0
-_08131588: .4byte gBattleAnimBankTarget
+_08131588: .4byte gAnimBankTarget
_0813158C: .4byte 0x0000ff70
_08131590:
ldrb r0, [r4]
@@ -10957,10 +10957,10 @@ _08131590:
strb r0, [r1]
ldr r4, _081315BC @ =0x0000ffa0
_081315A0:
- ldr r0, _081315C0 @ =gBattleAnimBankTarget
+ ldr r0, _081315C0 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -10972,7 +10972,7 @@ _081315A0:
bx r0
.align 2, 0
_081315BC: .4byte 0x0000ffa0
-_081315C0: .4byte gBattleAnimBankTarget
+_081315C0: .4byte gAnimBankTarget
_081315C4: .4byte sub_81315C8
thumb_func_end sub_8131564
@@ -11008,7 +11008,7 @@ _081315F8:
cmp r0, 0
blt _081316F2
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -11037,7 +11037,7 @@ _0813161C:
cmp r1, 0x7F
ble _081316F2
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -11081,7 +11081,7 @@ _0813168C:
cmp r0, 0x8
ble _081316F2
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -11122,7 +11122,7 @@ _081316B8:
cmp r0, 0x7
bne _081316F2
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_081316F2:
pop {r4,r5}
pop {r0}
@@ -11139,7 +11139,7 @@ sub_81316F8: @ 81316F8
lsls r0, 24
lsrs r4, r0, 24
mov r10, r4
- bl NotInBattle
+ bl IsContest
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -11395,7 +11395,7 @@ sub_81318F0: @ 81318F0
ldr r3, _0813193C @ =gBattleAnimArgs
movs r2, 0
strh r2, [r3, 0xE]
- ldr r1, _08131940 @ =gHappinessMoveAnim
+ ldr r1, _08131940 @ =gAnimFriendship
ldrb r0, [r1]
ldrb r1, [r1]
adds r0, r1, 0
@@ -11431,7 +11431,7 @@ _08131930:
bx r0
.align 2, 0
_0813193C: .4byte gBattleAnimArgs
-_08131940: .4byte gHappinessMoveAnim
+_08131940: .4byte gAnimFriendship
thumb_func_end sub_81318F0
thumb_func_start sub_8131944
@@ -11488,7 +11488,7 @@ _08131990:
ldrh r1, [r6, 0xA]
adds r0, r1
strh r0, [r6, 0xA]
- ldr r0, _081319E0 @ =gBattleAnimBankAttacker
+ ldr r0, _081319E0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -11509,7 +11509,7 @@ _08131990:
b _08131A02
.align 2, 0
_081319DC: .4byte gTasks
-_081319E0: .4byte gBattleAnimBankAttacker
+_081319E0: .4byte gAnimBankAttacker
_081319E4: .4byte gSprites
_081319E8:
ldr r3, _08131A3C @ =gSprites
@@ -11559,7 +11559,7 @@ _08131A2E:
_08131A3C: .4byte gSprites
_08131A40: .4byte gTasks
_08131A44:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _08131A74
@@ -11569,7 +11569,7 @@ _08131A44:
ldr r3, [r0, 0xC]
mov r9, r3
ldrh r5, [r0]
- ldr r0, _08131A70 @ =gBattleAnimBankAttacker
+ ldr r0, _08131A70 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -11578,9 +11578,9 @@ _08131A44:
b _08131B92
.align 2, 0
_08131A6C: .4byte gSharedMem + 0x19348
-_08131A70: .4byte gBattleAnimBankAttacker
+_08131A70: .4byte gAnimBankAttacker
_08131A74:
- ldr r4, _08131AD4 @ =gBattleAnimBankAttacker
+ ldr r4, _08131AD4 @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -11625,7 +11625,7 @@ _08131A74:
lsrs r5, r0, 16
b _08131AE6
.align 2, 0
-_08131AD4: .4byte gBattleAnimBankAttacker
+_08131AD4: .4byte gAnimBankAttacker
_08131AD8: .4byte gBattlePartyID
_08131ADC: .4byte gPlayerParty
_08131AE0: .4byte gSharedMem + 0x17800
@@ -11716,10 +11716,10 @@ _08131B72:
_08131B92:
ldr r6, _08131C08 @ =0x0000ffe0
_08131B94:
- ldr r0, _08131C0C @ =gBattleAnimBankTarget
+ ldr r0, _08131C0C @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -11736,7 +11736,7 @@ _08131B94:
bl sub_8079F44
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _08131C10 @ =gBattleAnimBankAttacker
+ ldr r0, _08131C10 @ =gAnimBankAttacker
ldrb r0, [r0]
lsls r0, 2
ldr r1, _08131C14 @ =gSharedMem + 0x17800
@@ -11772,8 +11772,8 @@ _08131BF2:
.align 2, 0
_08131C04: .4byte gSprites
_08131C08: .4byte 0x0000ffe0
-_08131C0C: .4byte gBattleAnimBankTarget
-_08131C10: .4byte gBattleAnimBankAttacker
+_08131C0C: .4byte gAnimBankTarget
+_08131C10: .4byte gAnimBankAttacker
_08131C14: .4byte gSharedMem + 0x17800
_08131C18: .4byte 0x00007fff
_08131C1C: .4byte gTasks
@@ -11793,7 +11793,7 @@ _08131C20:
ldrh r2, [r6, 0xA]
adds r0, r2
strh r0, [r6, 0xA]
- ldr r0, _08131C70 @ =gBattleAnimBankAttacker
+ ldr r0, _08131C70 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -11816,7 +11816,7 @@ _08131C20:
b _08131C8E
.align 2, 0
_08131C6C: .4byte gTasks
-_08131C70: .4byte gBattleAnimBankAttacker
+_08131C70: .4byte gAnimBankAttacker
_08131C74: .4byte gSprites
_08131C78:
ldr r2, _08131CDC @ =gSprites
@@ -11850,7 +11850,7 @@ _08131C8E:
ldrsh r0, [r6, r1]
cmp r0, 0
bne _08131D0E
- ldr r0, _08131CE4 @ =gBattleAnimBankAttacker
+ ldr r0, _08131CE4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -11858,10 +11858,10 @@ _08131C8E:
bne _08131CEC
lsls r4, r5, 16
asrs r4, 16
- ldr r0, _08131CE8 @ =gBattleAnimBankTarget
+ ldr r0, _08131CE8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11870,15 +11870,15 @@ _08131C8E:
.align 2, 0
_08131CDC: .4byte gSprites
_08131CE0: .4byte gTasks
-_08131CE4: .4byte gBattleAnimBankAttacker
-_08131CE8: .4byte gBattleAnimBankTarget
+_08131CE4: .4byte gAnimBankAttacker
+_08131CE8: .4byte gAnimBankTarget
_08131CEC:
lsls r4, r5, 16
asrs r4, 16
- ldr r0, _08131D30 @ =gBattleAnimBankTarget
+ ldr r0, _08131D30 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11910,7 +11910,7 @@ _08131D20:
strh r0, [r1, 0xA]
b _08131DB6
.align 2, 0
-_08131D30: .4byte gBattleAnimBankTarget
+_08131D30: .4byte gAnimBankTarget
_08131D34: .4byte gBattleAnimArgs
_08131D38: .4byte 0x0000ffff
_08131D3C: .4byte gTasks
@@ -11934,7 +11934,7 @@ _08131D40:
ldr r5, _08131D90 @ =gSprites
adds r0, r5
bl sub_807A0F4
- ldr r0, _08131D94 @ =gBattleAnimBankAttacker
+ ldr r0, _08131D94 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -11953,7 +11953,7 @@ _08131D40:
.align 2, 0
_08131D8C: .4byte gTasks
_08131D90: .4byte gSprites
-_08131D94: .4byte gBattleAnimBankAttacker
+_08131D94: .4byte gAnimBankAttacker
_08131D98:
lsls r0, r7, 4
adds r0, r7
@@ -11995,7 +11995,7 @@ _08131DC4:
ldrh r3, [r2, 0xA]
adds r0, r3
strh r0, [r2, 0xA]
- ldr r0, _08131E3C @ =gBattleAnimBankAttacker
+ ldr r0, _08131E3C @ =gAnimBankAttacker
mov r10, r0
ldrb r0, [r0]
str r2, [sp, 0x10]
@@ -12024,7 +12024,7 @@ _08131DC4:
mov r1, r10
ldrb r0, [r1]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12035,7 +12035,7 @@ _08131DC4:
b _08131E7C
.align 2, 0
_08131E38: .4byte gTasks
-_08131E3C: .4byte gBattleAnimBankAttacker
+_08131E3C: .4byte gAnimBankAttacker
_08131E40: .4byte gSprites
_08131E44:
ldr r1, _08131EB0 @ =gSprites
@@ -12057,7 +12057,7 @@ _08131E44:
mov r2, r10
ldrb r0, [r2]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12117,16 +12117,16 @@ _08131ECA:
cmp r1, r0
bne _08131F64
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
movs r0, 0x7A
bl PlaySE12WithPanning
- ldr r0, _08131F54 @ =gBattleAnimBankTarget
+ ldr r0, _08131F54 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -12143,14 +12143,14 @@ _08131ECA:
negs r0, r0
ands r0, r1
strb r0, [r2]
- ldr r0, _08131F5C @ =gBattleAnimBankAttacker
+ ldr r0, _08131F5C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08131FF4
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _08131FF4
@@ -12172,9 +12172,9 @@ _08131ECA:
b _08131FF4
.align 2, 0
_08131F50: .4byte gBattleAnimArgs
-_08131F54: .4byte gBattleAnimBankTarget
+_08131F54: .4byte gAnimBankTarget
_08131F58: .4byte 0x0000ffe0
-_08131F5C: .4byte gBattleAnimBankAttacker
+_08131F5C: .4byte gAnimBankAttacker
_08131F60: .4byte gSprites
_08131F64:
adds r0, r4, 0
@@ -12217,7 +12217,7 @@ _08131FA6:
ldrh r1, [r4, 0x32]
adds r0, r1
strh r0, [r4, 0x32]
- ldr r0, _08131FD0 @ =gBattleAnimBankAttacker
+ ldr r0, _08131FD0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -12232,7 +12232,7 @@ _08131FA6:
adds r1, r2, 0
b _08131FE0
.align 2, 0
-_08131FD0: .4byte gBattleAnimBankAttacker
+_08131FD0: .4byte gAnimBankAttacker
_08131FD4:
ldrh r1, [r4, 0x32]
lsls r0, r1, 16
@@ -12249,7 +12249,7 @@ _08131FE0:
cmp r0, 0x2
bne _08131FF4
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08131FF4:
pop {r4}
pop {r0}
@@ -12289,17 +12289,17 @@ _0813202C:
.4byte _08132104
.4byte _0813216A
_08132040:
- ldr r0, _08132084 @ =gBattleAnimBankAttacker
+ ldr r0, _08132084 @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
- ldr r0, _08132088 @ =gBattleAnimBankTarget
+ ldr r0, _08132088 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -12322,12 +12322,12 @@ _08132076:
strh r0, [r1, 0x26]
b _08132188
.align 2, 0
-_08132084: .4byte gBattleAnimBankAttacker
-_08132088: .4byte gBattleAnimBankTarget
+_08132084: .4byte gAnimBankAttacker
+_08132088: .4byte gAnimBankTarget
_0813208C: .4byte gTasks
_08132090:
ldr r1, _081320CC @ =gObjectBankIDs
- ldr r0, _081320D0 @ =gBattleAnimBankAttacker
+ ldr r0, _081320D0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12358,7 +12358,7 @@ _08132090:
b _0813215E
.align 2, 0
_081320CC: .4byte gObjectBankIDs
-_081320D0: .4byte gBattleAnimBankAttacker
+_081320D0: .4byte gAnimBankAttacker
_081320D4: .4byte gSprites
_081320D8:
movs r3, 0x20
@@ -12386,7 +12386,7 @@ _081320EC:
b _08132188
_08132104:
ldr r1, _08132144 @ =gObjectBankIDs
- ldr r0, _08132148 @ =gBattleAnimBankAttacker
+ ldr r0, _08132148 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12419,7 +12419,7 @@ _08132104:
b _08132162
.align 2, 0
_08132144: .4byte gObjectBankIDs
-_08132148: .4byte gBattleAnimBankAttacker
+_08132148: .4byte gAnimBankAttacker
_0813214C: .4byte gSprites
_08132150:
movs r3, 0x20
@@ -12439,7 +12439,7 @@ _08132162:
b _08132188
_0813216A:
ldr r1, _08132190 @ =gObjectBankIDs
- ldr r0, _08132194 @ =gBattleAnimBankAttacker
+ ldr r0, _08132194 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12458,7 +12458,7 @@ _08132188:
bx r0
.align 2, 0
_08132190: .4byte gObjectBankIDs
-_08132194: .4byte gBattleAnimBankAttacker
+_08132194: .4byte gAnimBankAttacker
_08132198: .4byte gSprites
thumb_func_end sub_8131FFC
@@ -12478,7 +12478,7 @@ sub_813219C: @ 813219C
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0xE]
- ldr r0, _08132208 @ =gBattleAnimBankAttacker
+ ldr r0, _08132208 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -12517,7 +12517,7 @@ _081321D0:
bx r0
.align 2, 0
_08132204: .4byte gTasks
-_08132208: .4byte gBattleAnimBankAttacker
+_08132208: .4byte gAnimBankAttacker
_0813220C: .4byte gSprites
_08132210: .4byte sub_8132214
thumb_func_end sub_813219C
@@ -12661,7 +12661,7 @@ _08132312:
sub_8132318: @ 8132318
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0813236C @ =gBattleAnimBankTarget
+ ldr r0, _0813236C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -12689,7 +12689,7 @@ sub_8132318: @ 8132318
cmp r0, 0
beq _0813235E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_0813235E:
ldrh r0, [r4, 0x32]
adds r0, 0x1
@@ -12698,14 +12698,14 @@ _0813235E:
pop {r0}
bx r0
.align 2, 0
-_0813236C: .4byte gBattleAnimBankTarget
+_0813236C: .4byte gAnimBankTarget
thumb_func_end sub_8132318
thumb_func_start sub_8132370
sub_8132370: @ 8132370
push {r4,lr}
adds r4, r0, 0
- ldr r0, _081323A8 @ =gBattleAnimBankTarget
+ ldr r0, _081323A8 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -12729,7 +12729,7 @@ sub_8132370: @ 8132370
bl StartSpriteAffineAnim
b _081323CE
.align 2, 0
-_081323A8: .4byte gBattleAnimBankTarget
+_081323A8: .4byte gAnimBankTarget
_081323AC: .4byte gBattleAnimArgs
_081323B0: .4byte 0x0000fff5
_081323B4:
@@ -12761,10 +12761,10 @@ _081323DC: .4byte sub_8132318
sub_81323E0: @ 81323E0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _08132424 @ =gBattleAnimBankAttacker
+ ldr r4, _08132424 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -12792,7 +12792,7 @@ _0813240A:
pop {r0}
bx r0
.align 2, 0
-_08132424: .4byte gBattleAnimBankAttacker
+_08132424: .4byte gAnimBankAttacker
_08132428: .4byte sub_8132430
_0813242C: .4byte REG_BLDALPHA
thumb_func_end sub_81323E0
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index f09d42062..73f399caa 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -16,12 +16,12 @@ unref_sub_813F0F4: @ 813F0F4
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
- ldr r0, _0813F2AC @ =gBattleAnimBankAttacker
+ ldr r0, _0813F2AC @ =gAnimBankAttacker
ldrb r3, [r0]
- ldr r0, _0813F2B0 @ =gUnknown_030042C4
+ ldr r0, _0813F2B0 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _0813F2B4 @ =gUnknown_03004240
+ ldr r0, _0813F2B4 @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _0813F2B8 @ =REG_WININ
ldr r2, _0813F2BC @ =0x00003f3f
@@ -183,12 +183,12 @@ unref_sub_813F0F4: @ 813F0F4
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- ldr r1, _0813F2F0 @ =gUnknown_030042C0
+ ldr r1, _0813F2F0 @ =gBattle_BG1_X
ldrh r0, [r7, 0x20]
negs r0, r0
adds r0, 0x20
strh r0, [r1]
- ldr r1, _0813F2F4 @ =gUnknown_030041B4
+ ldr r1, _0813F2F4 @ =gBattle_BG1_Y
ldrh r0, [r7, 0x22]
negs r0, r0
subs r0, 0x20
@@ -219,9 +219,9 @@ unref_sub_813F0F4: @ 813F0F4
pop {r0}
bx r0
.align 2, 0
-_0813F2AC: .4byte gBattleAnimBankAttacker
-_0813F2B0: .4byte gUnknown_030042C4
-_0813F2B4: .4byte gUnknown_03004240
+_0813F2AC: .4byte gAnimBankAttacker
+_0813F2B0: .4byte gBattle_WIN0H
+_0813F2B4: .4byte gBattle_WIN0V
_0813F2B8: .4byte REG_WININ
_0813F2BC: .4byte 0x00003f3f
_0813F2C0: .4byte 0x00003f3d
@@ -236,8 +236,8 @@ _0813F2E0: .4byte 0x85000400
_0813F2E4: .4byte gUnknown_08D2EE48
_0813F2E8: .4byte gUnknown_08D2EDFC
_0813F2EC: .4byte gUnknown_08D2E150
-_0813F2F0: .4byte gUnknown_030042C0
-_0813F2F4: .4byte gUnknown_030041B4
+_0813F2F0: .4byte gBattle_BG1_X
+_0813F2F4: .4byte gBattle_BG1_Y
_0813F2F8: .4byte gTasks
_0813F2FC: .4byte sub_813F300
thumb_func_end unref_sub_813F0F4
@@ -251,7 +251,7 @@ sub_813F300: @ 813F300
sub sp, 0x10
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, _0813F34C @ =gBattleAnimBankAttacker
+ ldr r0, _0813F34C @ =gAnimBankAttacker
ldrb r0, [r0]
mov r9, r0
ldr r1, _0813F350 @ =gTasks
@@ -264,7 +264,7 @@ sub_813F300: @ 813F300
adds r1, r0
movs r3, 0
strh r1, [r4, 0x22]
- ldr r2, _0813F354 @ =gUnknown_030041B4
+ ldr r2, _0813F354 @ =gBattle_BG1_Y
lsls r0, r1, 16
lsrs r0, 24
ldrh r5, [r2]
@@ -283,9 +283,9 @@ sub_813F300: @ 813F300
beq _0813F35E
b _0813F4B2
.align 2, 0
-_0813F34C: .4byte gBattleAnimBankAttacker
+_0813F34C: .4byte gAnimBankAttacker
_0813F350: .4byte gTasks
-_0813F354: .4byte gUnknown_030041B4
+_0813F354: .4byte gBattle_BG1_Y
_0813F358:
cmp r0, 0x2
beq _0813F3AC
@@ -357,9 +357,9 @@ _0813F3AC:
bne _0813F4B2
movs r0, 0
bl sub_8076464
- ldr r0, _0813F4C4 @ =gUnknown_030042C4
+ ldr r0, _0813F4C4 @ =gBattle_WIN0H
strh r5, [r0]
- ldr r0, _0813F4C8 @ =gUnknown_03004240
+ ldr r0, _0813F4C8 @ =gBattle_WIN0V
strh r5, [r0]
ldr r0, _0813F4CC @ =REG_WININ
ldr r2, _0813F4D0 @ =0x00003f3f
@@ -367,7 +367,7 @@ _0813F3AC:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0813F406
@@ -470,8 +470,8 @@ _0813F4B2:
bx r0
.align 2, 0
_0813F4C0: .4byte REG_BLDALPHA
-_0813F4C4: .4byte gUnknown_030042C4
-_0813F4C8: .4byte gUnknown_03004240
+_0813F4C4: .4byte gBattle_WIN0H
+_0813F4C8: .4byte gBattle_WIN0V
_0813F4CC: .4byte REG_WININ
_0813F4D0: .4byte 0x00003f3f
_0813F4D4: .4byte REG_BG1CNT
@@ -494,7 +494,7 @@ sub_813F4EC: @ 813F4EC
lsrs r0, 24
str r0, [sp]
ldr r1, _0813F5D0 @ =gHealthboxIDs
- ldr r0, _0813F5D4 @ =gBattleAnimBankAttacker
+ ldr r0, _0813F5D4 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -594,7 +594,7 @@ sub_813F4EC: @ 813F4EC
bx r0
.align 2, 0
_0813F5D0: .4byte gHealthboxIDs
-_0813F5D4: .4byte gBattleAnimBankAttacker
+_0813F5D4: .4byte gAnimBankAttacker
_0813F5D8: .4byte gSprites
_0813F5DC: .4byte 0x0000d709
_0813F5E0: .4byte 0x0000d70a
@@ -613,7 +613,7 @@ sub_813F5E8: @ 813F5E8
lsrs r0, 24
mov r8, r0
ldr r1, _0813F684 @ =gHealthboxIDs
- ldr r0, _0813F688 @ =gBattleAnimBankAttacker
+ ldr r0, _0813F688 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -677,7 +677,7 @@ sub_813F5E8: @ 813F5E8
bx r0
.align 2, 0
_0813F684: .4byte gHealthboxIDs
-_0813F688: .4byte gBattleAnimBankAttacker
+_0813F688: .4byte gAnimBankAttacker
_0813F68C: .4byte gSprites
_0813F690: .4byte 0x0000d709
_0813F694: .4byte 0x0000d70a
@@ -819,7 +819,7 @@ sub_813F798: @ 813F798
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _0813F7C4 @ =gObjectBankIDs
- ldr r0, _0813F7C8 @ =gBattleAnimBankAttacker
+ ldr r0, _0813F7C8 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -839,7 +839,7 @@ sub_813F798: @ 813F798
b _0813F838
.align 2, 0
_0813F7C4: .4byte gObjectBankIDs
-_0813F7C8: .4byte gBattleAnimBankAttacker
+_0813F7C8: .4byte gAnimBankAttacker
_0813F7CC: .4byte gTasks
_0813F7D0:
cmp r0, 0x2
@@ -910,7 +910,7 @@ sub_813F844: @ 813F844
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0813F87C @ =gObjectBankIDs
- ldr r4, _0813F880 @ =gBattleAnimBankAttacker
+ ldr r4, _0813F880 @ =gAnimBankAttacker
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
@@ -930,7 +930,7 @@ sub_813F844: @ 813F844
b _0813F89C
.align 2, 0
_0813F87C: .4byte gObjectBankIDs
-_0813F880: .4byte gBattleAnimBankAttacker
+_0813F880: .4byte gAnimBankAttacker
_0813F884: .4byte gBattlePartyID
_0813F888: .4byte gPlayerParty
_0813F88C:
@@ -969,16 +969,16 @@ _0813F8CC: .4byte gBattlePartyID
_0813F8D0: .4byte gEnemyParty
_0813F8D4: .4byte gTasks
_0813F8D8:
- ldr r5, _0813F950 @ =gBattleAnimBankAttacker
+ ldr r5, _0813F950 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
adds r1, r0, 0
lsls r1, 24
ldr r2, _0813F954 @ =gSprites
@@ -1024,7 +1024,7 @@ _0813F8D8:
strh r0, [r6, 0x8]
b _0813F982
.align 2, 0
-_0813F950: .4byte gBattleAnimBankAttacker
+_0813F950: .4byte gAnimBankAttacker
_0813F954: .4byte gSprites
_0813F958:
movs r1, 0x1C
@@ -1234,18 +1234,18 @@ sub_813FA94: @ 813FA94
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
- ldr r2, _0813FB64 @ =gBattleAnimBankTarget
+ ldr r2, _0813FB64 @ =gAnimBankTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1296,7 +1296,7 @@ sub_813FA94: @ 813FA94
_0813FB58: .4byte gLastUsedItem
_0813FB5C: .4byte gBallSpriteTemplates
_0813FB60: .4byte gSprites
-_0813FB64: .4byte gBattleAnimBankTarget
+_0813FB64: .4byte gAnimBankTarget
_0813FB68: .4byte sub_813FD90
_0813FB6C: .4byte gSharedMem + 0x17840
_0813FB70: .4byte gObjectBankIDs
@@ -1396,18 +1396,18 @@ _0813FBE0:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
- ldr r1, _0813FCA8 @ =gBattleAnimBankTarget
+ ldr r1, _0813FCA8 @ =gAnimBankTarget
mov r8, r1
ldrb r0, [r1]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1448,7 +1448,7 @@ _0813FBE0:
_0813FC9C: .4byte gLastUsedItem
_0813FCA0: .4byte gBallSpriteTemplates
_0813FCA4: .4byte gSprites
-_0813FCA8: .4byte gBattleAnimBankTarget
+_0813FCA8: .4byte gAnimBankTarget
_0813FCAC: .4byte SpriteCallbackDummy
_0813FCB0: .4byte gObjectBankIDs
_0813FCB4: .4byte gTasks
@@ -1651,7 +1651,7 @@ _0813FE10:
movs r2, 0x1
movs r3, 0x1C
bl sub_814086C
- ldr r0, _0813FE6C @ =gBattleAnimBankTarget
+ ldr r0, _0813FE6C @ =gAnimBankTarget
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1665,7 +1665,7 @@ _0813FE5A:
.align 2, 0
_0813FE64: .4byte sub_813FE70
_0813FE68: .4byte gLastUsedItem
-_0813FE6C: .4byte gBattleAnimBankTarget
+_0813FE6C: .4byte gAnimBankTarget
thumb_func_end sub_813FDC0
thumb_func_start sub_813FE70
@@ -1689,7 +1689,7 @@ sub_813FE70: @ 813FE70
str r0, [r4, 0x1C]
ldr r2, _0813FEBC @ =gSprites
ldr r1, _0813FEC0 @ =gObjectBankIDs
- ldr r0, _0813FEC4 @ =gBattleAnimBankTarget
+ ldr r0, _0813FEC4 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1708,7 +1708,7 @@ _0813FEB4: .4byte TaskDummy
_0813FEB8: .4byte sub_813FEC8
_0813FEBC: .4byte gSprites
_0813FEC0: .4byte gObjectBankIDs
-_0813FEC4: .4byte gBattleAnimBankTarget
+_0813FEC4: .4byte gAnimBankTarget
thumb_func_end sub_813FE70
thumb_func_start sub_813FEC8
@@ -1716,7 +1716,7 @@ sub_813FEC8: @ 813FEC8
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, _0813FF0C @ =gObjectBankIDs
- ldr r0, _0813FF10 @ =gBattleAnimBankTarget
+ ldr r0, _0813FF10 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -1749,7 +1749,7 @@ _0813FEFA:
b _0813FFDC
.align 2, 0
_0813FF0C: .4byte gObjectBankIDs
-_0813FF10: .4byte gBattleAnimBankTarget
+_0813FF10: .4byte gAnimBankTarget
_0813FF14: .4byte gTasks
_0813FF18:
cmp r0, 0x2
@@ -2450,7 +2450,7 @@ _08140450: .4byte sub_8140454
sub_8140454: @ 8140454
push {r4-r7,lr}
adds r6, r0, 0
- ldr r7, _08140484 @ =gBattleAnimBankTarget
+ ldr r7, _08140484 @ =gAnimBankTarget
ldrh r0, [r6, 0x36]
adds r0, 0x1
strh r0, [r6, 0x36]
@@ -2464,13 +2464,13 @@ sub_8140454: @ 8140454
movs r1, 0
strb r1, [r0]
movs r0, 0x1
- bl sub_8043EB4
+ bl UpdateOamPriorityInAllHealthboxes
bl m4aMPlayAllStop
ldr r0, _0814048C @ =0x00000173
bl PlaySE
b _081404CC
.align 2, 0
-_08140484: .4byte gBattleAnimBankTarget
+_08140484: .4byte gAnimBankTarget
_08140488: .4byte gDoingBattleAnim
_0814048C: .4byte 0x00000173
_08140490:
@@ -2689,7 +2689,7 @@ sub_81405F4: @ 81405F4
movs r2, 0x1
movs r3, 0x1C
bl sub_814086C
- ldr r0, _081406B0 @ =gBattleAnimBankTarget
+ ldr r0, _081406B0 @ =gAnimBankTarget
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2698,7 +2698,7 @@ sub_81405F4: @ 81405F4
_08140646:
ldr r6, _081406B4 @ =gSprites
ldr r5, _081406B8 @ =gObjectBankIDs
- ldr r4, _081406B0 @ =gBattleAnimBankTarget
+ ldr r4, _081406B0 @ =gAnimBankTarget
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2746,7 +2746,7 @@ _08140646:
.align 2, 0
_081406A8: .4byte sub_81406BC
_081406AC: .4byte gLastUsedItem
-_081406B0: .4byte gBattleAnimBankTarget
+_081406B0: .4byte gAnimBankTarget
_081406B4: .4byte gSprites
_081406B8: .4byte gObjectBankIDs
thumb_func_end sub_81405F4
@@ -2771,7 +2771,7 @@ sub_81406BC: @ 81406BC
_081406DA:
ldr r4, _08140708 @ =gSprites
ldr r3, _0814070C @ =gObjectBankIDs
- ldr r2, _08140710 @ =gBattleAnimBankTarget
+ ldr r2, _08140710 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2793,7 +2793,7 @@ _081406DA:
.align 2, 0
_08140708: .4byte gSprites
_0814070C: .4byte gObjectBankIDs
-_08140710: .4byte gBattleAnimBankTarget
+_08140710: .4byte gAnimBankTarget
_08140714:
ldr r6, _0814079C @ =0xfffffee0
adds r0, r6, 0
@@ -2823,7 +2823,7 @@ _08140734:
beq _08140796
ldr r4, _081407A0 @ =gSprites
ldr r3, _081407A4 @ =gObjectBankIDs
- ldr r2, _081407A8 @ =gBattleAnimBankTarget
+ ldr r2, _081407A8 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2859,7 +2859,7 @@ _08140734:
ldr r0, _081407B4 @ =gDoingBattleAnim
strb r6, [r0]
movs r0, 0x1
- bl sub_8043EB4
+ bl UpdateOamPriorityInAllHealthboxes
_08140796:
pop {r4-r7}
pop {r0}
@@ -2868,7 +2868,7 @@ _08140796:
_0814079C: .4byte 0xfffffee0
_081407A0: .4byte gSprites
_081407A4: .4byte gObjectBankIDs
-_081407A8: .4byte gBattleAnimBankTarget
+_081407A8: .4byte gAnimBankTarget
_081407AC: .4byte gSharedMem + 0x17840
_081407B0: .4byte sub_81405C8
_081407B4: .4byte gDoingBattleAnim
@@ -2962,7 +2962,7 @@ _0814084A:
movs r0, 0
strb r0, [r1]
movs r0, 0x1
- bl sub_8043EB4
+ bl UpdateOamPriorityInAllHealthboxes
_0814085E:
pop {r4}
pop {r0}
@@ -4582,7 +4582,7 @@ sub_814151C: @ 814151C
movs r0, 0
mov r8, r0
ldr r0, _08141550 @ =gObjectBankIDs
- ldr r3, _08141554 @ =gBattleAnimBankAttacker
+ ldr r3, _08141554 @ =gAnimBankAttacker
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -4602,7 +4602,7 @@ sub_814151C: @ 814151C
b _081416B6
.align 2, 0
_08141550: .4byte gObjectBankIDs
-_08141554: .4byte gBattleAnimBankAttacker
+_08141554: .4byte gAnimBankAttacker
_08141558: .4byte gTasks
_0814155C:
cmp r0, 0x2
@@ -4737,7 +4737,7 @@ _08141654:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
- ldr r0, _08141690 @ =gBattleAnimBankAttacker
+ ldr r0, _08141690 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -4758,7 +4758,7 @@ _08141654:
.align 2, 0
_08141688: .4byte gSprites
_0814168C: .4byte gTasks
-_08141690: .4byte gBattleAnimBankAttacker
+_08141690: .4byte gAnimBankAttacker
_08141694:
ldr r0, _081416C0 @ =gSprites
adds r1, r4, r6
@@ -4815,7 +4815,7 @@ _081416EC:
beq _0814177C
b _081417B8
_081416F2:
- ldr r0, _08141708 @ =gBattleAnimBankAttacker
+ ldr r0, _08141708 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -4826,7 +4826,7 @@ _081416F2:
ldr r2, _08141710 @ =0x00003f42
b _08141718
.align 2, 0
-_08141708: .4byte gBattleAnimBankAttacker
+_08141708: .4byte gAnimBankAttacker
_0814170C: .4byte REG_BLDCNT
_08141710: .4byte 0x00003f42
_08141714:
@@ -4883,7 +4883,7 @@ _08141744:
_08141778: .4byte REG_BLDALPHA
_0814177C:
ldr r1, _081417C0 @ =gObjectBankIDs
- ldr r3, _081417C4 @ =gBattleAnimBankAttacker
+ ldr r3, _081417C4 @ =gAnimBankAttacker
ldrb r0, [r3]
adds r0, r1
ldrb r1, [r0]
@@ -4917,7 +4917,7 @@ _081417B8:
bx r0
.align 2, 0
_081417C0: .4byte gObjectBankIDs
-_081417C4: .4byte gBattleAnimBankAttacker
+_081417C4: .4byte gAnimBankAttacker
_081417C8: .4byte gSprites
_081417CC: .4byte 0x06010000
_081417D0: .4byte 0x040000d4
@@ -4930,7 +4930,7 @@ sub_81417D8: @ 81417D8
lsls r0, 24
lsrs r0, 24
ldr r3, _081417FC @ =gBattleAnimArgs
- ldr r1, _08141800 @ =gBattleAnimBankAttacker
+ ldr r1, _08141800 @ =gAnimBankAttacker
ldrb r1, [r1]
lsls r1, 2
ldr r2, _08141804 @ =gSharedMem + 0x17800
@@ -4944,7 +4944,7 @@ sub_81417D8: @ 81417D8
bx r0
.align 2, 0
_081417FC: .4byte gBattleAnimArgs
-_08141800: .4byte gBattleAnimBankAttacker
+_08141800: .4byte gAnimBankAttacker
_08141804: .4byte gSharedMem + 0x17800
thumb_func_end sub_81417D8
@@ -4953,7 +4953,7 @@ sub_8141808: @ 8141808
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _08141820 @ =gBattleAnimBankTarget
+ ldr r2, _08141820 @ =gAnimBankTarget
ldr r1, _08141824 @ =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
@@ -4961,7 +4961,7 @@ sub_8141808: @ 8141808
pop {r0}
bx r0
.align 2, 0
-_08141820: .4byte gBattleAnimBankTarget
+_08141820: .4byte gAnimBankTarget
_08141824: .4byte gEffectBank
thumb_func_end sub_8141808
@@ -5124,12 +5124,12 @@ _08141966:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5487,7 +5487,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r5, _08141CA4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -5499,7 +5499,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -5510,7 +5510,7 @@ sub_8141C30: @ 8141C30
adds r0, r4, 0
bl sub_80786EC
ldr r1, _08141CAC @ =gObjectBankIDs
- ldr r0, _08141CB0 @ =gBattleAnimBankAttacker
+ ldr r0, _08141CB0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5530,7 +5530,7 @@ sub_8141C30: @ 8141C30
_08141CA4: .4byte gBattleAnimArgs
_08141CA8: .4byte 0x0000ffe0
_08141CAC: .4byte gObjectBankIDs
-_08141CB0: .4byte gBattleAnimBankAttacker
+_08141CB0: .4byte gAnimBankAttacker
_08141CB4: .4byte gSprites
_08141CB8: .4byte sub_8141CBC
thumb_func_end sub_8141C30
@@ -5541,7 +5541,7 @@ sub_8141CBC: @ 8141CBC
adds r3, r0, 0
ldr r2, _08141CE4 @ =gSprites
ldr r1, _08141CE8 @ =gObjectBankIDs
- ldr r0, _08141CEC @ =gBattleAnimBankAttacker
+ ldr r0, _08141CEC @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5561,7 +5561,7 @@ _08141CE0:
.align 2, 0
_08141CE4: .4byte gSprites
_08141CE8: .4byte gObjectBankIDs
-_08141CEC: .4byte gBattleAnimBankAttacker
+_08141CEC: .4byte gAnimBankAttacker
_08141CF0: .4byte sub_8141CF4
thumb_func_end sub_8141CBC
@@ -5597,7 +5597,7 @@ sub_8141D20: @ 8141D20
adds r4, r0, 0
ldr r5, _08141D70 @ =gSprites
ldr r3, _08141D74 @ =gObjectBankIDs
- ldr r2, _08141D78 @ =gBattleAnimBankAttacker
+ ldr r2, _08141D78 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -5626,7 +5626,7 @@ sub_8141D20: @ 8141D20
movs r1, 0
bl StartSpriteAnim
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_08141D68:
pop {r4,r5}
pop {r0}
@@ -5634,7 +5634,7 @@ _08141D68:
.align 2, 0
_08141D70: .4byte gSprites
_08141D74: .4byte gObjectBankIDs
-_08141D78: .4byte gBattleAnimBankAttacker
+_08141D78: .4byte gAnimBankAttacker
thumb_func_end sub_8141D20
thumb_func_start sub_8141D7C
@@ -5645,11 +5645,11 @@ sub_8141D7C: @ 8141D7C
lsrs r4, 24
movs r0, 0
bl GetBankByPlayerAI
- ldr r1, _08141DA4 @ =gBattleAnimBankAttacker
+ ldr r1, _08141DA4 @ =gAnimBankAttacker
strb r0, [r1]
movs r0, 0x1
bl GetBankByPlayerAI
- ldr r1, _08141DA8 @ =gBattleAnimBankTarget
+ ldr r1, _08141DA8 @ =gAnimBankTarget
strb r0, [r1]
adds r0, r4, 0
bl DestroyAnimVisualTask
@@ -5657,8 +5657,8 @@ sub_8141D7C: @ 8141D7C
pop {r0}
bx r0
.align 2, 0
-_08141DA4: .4byte gBattleAnimBankAttacker
-_08141DA8: .4byte gBattleAnimBankTarget
+_08141DA4: .4byte gAnimBankAttacker
+_08141DA8: .4byte gAnimBankTarget
thumb_func_end sub_8141D7C
thumb_func_start sub_8141DAC
@@ -5720,20 +5720,20 @@ sub_8141E10: @ 8141E10
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _08141E2C @ =gBattleAnimBankAttacker
+ ldr r2, _08141E2C @ =gAnimBankAttacker
ldr r1, _08141E30 @ =gSharedMem + 0x17840
ldrh r1, [r1]
strb r1, [r2]
- ldr r2, _08141E34 @ =gBattleAnimBankTarget
+ ldr r2, _08141E34 @ =gAnimBankTarget
lsrs r1, 8
strb r1, [r2]
bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_08141E2C: .4byte gBattleAnimBankAttacker
+_08141E2C: .4byte gAnimBankAttacker
_08141E30: .4byte gSharedMem + 0x17840
-_08141E34: .4byte gBattleAnimBankTarget
+_08141E34: .4byte gAnimBankTarget
thumb_func_end sub_8141E10
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_intro.s b/asm/battle_intro.s
index 721583c30..10b504a79 100755
--- a/asm/battle_intro.s
+++ b/asm/battle_intro.s
@@ -76,14 +76,14 @@ sub_80E443C: @ 80E443C
lsls r0, 24
lsrs r0, 24
bl DestroyTask
- ldr r0, _080E4474 @ =gUnknown_030042C0
+ ldr r0, _080E4474 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
- ldr r0, _080E4478 @ =gUnknown_030041B4
+ ldr r0, _080E4478 @ =gBattle_BG1_Y
strh r1, [r0]
- ldr r0, _080E447C @ =gUnknown_03004288
+ ldr r0, _080E447C @ =gBattle_BG2_X
strh r1, [r0]
- ldr r0, _080E4480 @ =gUnknown_03004280
+ ldr r0, _080E4480 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _080E4484 @ =REG_BLDCNT
strh r1, [r0]
@@ -100,10 +100,10 @@ sub_80E443C: @ 80E443C
pop {r0}
bx r0
.align 2, 0
-_080E4474: .4byte gUnknown_030042C0
-_080E4478: .4byte gUnknown_030041B4
-_080E447C: .4byte gUnknown_03004288
-_080E4480: .4byte gUnknown_03004280
+_080E4474: .4byte gBattle_BG1_X
+_080E4478: .4byte gBattle_BG1_Y
+_080E447C: .4byte gBattle_BG2_X
+_080E4480: .4byte gBattle_BG2_Y
_080E4484: .4byte REG_BLDCNT
_080E4488: .4byte 0x00003f3f
thumb_func_end sub_80E443C
@@ -117,7 +117,7 @@ task_battle_intro_80BC47C: @ 80E448C
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
- ldr r1, _080E44C4 @ =gUnknown_030042C0
+ ldr r1, _080E44C4 @ =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
strh r0, [r1]
@@ -139,7 +139,7 @@ _080E44B8:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080E44C4: .4byte gUnknown_030042C0
+_080E44C4: .4byte gBattle_BG1_X
_080E44C8: .4byte gTasks
_080E44CC: .4byte _080E44D0
.align 2, 0
@@ -200,7 +200,7 @@ _080E452C:
.align 2, 0
_080E453C: .4byte REG_WININ
_080E4540:
- ldr r1, _080E457C @ =gUnknown_03004240
+ ldr r1, _080E457C @ =gBattle_WIN0V
ldrh r0, [r1]
subs r0, 0xFF
strh r0, [r1]
@@ -231,7 +231,7 @@ _080E4558:
strh r0, [r2]
b _080E46BE
.align 2, 0
-_080E457C: .4byte gUnknown_03004240
+_080E457C: .4byte gBattle_WIN0V
_080E4580: .4byte gUnknown_02024DE8
_080E4584: .4byte 0x0000fffe
_080E4588:
@@ -254,7 +254,7 @@ _080E45A4:
ldrsh r0, [r2, r1]
cmp r0, 0x1
bne _080E45C4
- ldr r2, _080E45BC @ =gUnknown_030041B4
+ ldr r2, _080E45BC @ =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, _080E45C0 @ =0x0000ffb0
cmp r1, r0
@@ -262,10 +262,10 @@ _080E45A4:
subs r0, r1, 0x2
b _080E45D0
.align 2, 0
-_080E45BC: .4byte gUnknown_030041B4
+_080E45BC: .4byte gBattle_BG1_Y
_080E45C0: .4byte 0x0000ffb0
_080E45C4:
- ldr r2, _080E4690 @ =gUnknown_030041B4
+ ldr r2, _080E4690 @ =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, _080E4694 @ =0x0000ffc8
cmp r1, r0
@@ -274,7 +274,7 @@ _080E45C4:
_080E45D0:
strh r0, [r2]
_080E45D2:
- ldr r2, _080E4698 @ =gUnknown_03004240
+ ldr r2, _080E4698 @ =gBattle_WIN0V
ldrh r1, [r2]
movs r0, 0xFF
lsls r0, 8
@@ -373,9 +373,9 @@ _080E464E:
strh r0, [r1]
b _080E46BE
.align 2, 0
-_080E4690: .4byte gUnknown_030041B4
+_080E4690: .4byte gBattle_BG1_Y
_080E4694: .4byte 0x0000ffc8
-_080E4698: .4byte gUnknown_03004240
+_080E4698: .4byte gBattle_WIN0V
_080E469C: .4byte 0xfffffc04
_080E46A0: .4byte gUnknown_03004DC0
_080E46A4: .4byte gUnknown_03004DE0
@@ -425,14 +425,14 @@ _080E46FC:
cmp r0, 0x4
bne _080E4714
_080E4700:
- ldr r1, _080E4708 @ =gUnknown_030042C0
+ ldr r1, _080E4708 @ =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
b _080E4712
.align 2, 0
-_080E4708: .4byte gUnknown_030042C0
+_080E4708: .4byte gBattle_BG1_X
_080E470C:
- ldr r1, _080E4750 @ =gUnknown_030042C0
+ ldr r1, _080E4750 @ =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_080E4712:
@@ -447,7 +447,7 @@ _080E4714:
adds r6, r0, 0
cmp r1, 0x4
bne _080E4778
- ldr r7, _080E4754 @ =gUnknown_030041B4
+ ldr r7, _080E4754 @ =gBattle_BG1_Y
ldrh r0, [r4, 0x14]
bl Cos2
lsls r0, 16
@@ -468,8 +468,8 @@ _080E473A:
adds r0, r1, 0x4
b _080E475E
.align 2, 0
-_080E4750: .4byte gUnknown_030042C0
-_080E4754: .4byte gUnknown_030041B4
+_080E4750: .4byte gBattle_BG1_X
+_080E4754: .4byte gBattle_BG1_Y
_080E4758: .4byte 0x000001ff
_080E475C:
adds r0, r1, 0x6
@@ -562,7 +562,7 @@ _080E47F6:
_080E4804: .4byte gTasks
_080E4808: .4byte REG_WININ
_080E480C:
- ldr r1, _080E484C @ =gUnknown_03004240
+ ldr r1, _080E484C @ =gBattle_WIN0V
ldrh r0, [r1]
subs r0, 0xFF
strh r0, [r1]
@@ -595,7 +595,7 @@ _080E4824:
strh r0, [r2]
b _080E4996
.align 2, 0
-_080E484C: .4byte gUnknown_03004240
+_080E484C: .4byte gBattle_WIN0V
_080E4850: .4byte gTasks
_080E4854: .4byte gUnknown_02024DE8
_080E4858: .4byte 0x0000fffe
@@ -646,7 +646,7 @@ _080E4898:
movs r0, 0x4
strh r0, [r1, 0x12]
_080E48B8:
- ldr r3, _080E4970 @ =gUnknown_03004240
+ ldr r3, _080E4970 @ =gBattle_WIN0V
ldrh r1, [r3]
movs r0, 0xFF
lsls r0, 8
@@ -743,7 +743,7 @@ _080E4932:
strh r0, [r1]
b _080E4996
.align 2, 0
-_080E4970: .4byte gUnknown_03004240
+_080E4970: .4byte gBattle_WIN0V
_080E4974: .4byte 0xfffffc04
_080E4978: .4byte gUnknown_03004DC0
_080E497C: .4byte gUnknown_03004DE0
@@ -786,7 +786,7 @@ task_battle_intro_anim: @ 80E49C0
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
- ldr r1, _080E49F4 @ =gUnknown_030042C0
+ ldr r1, _080E49F4 @ =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
strh r0, [r1]
@@ -808,7 +808,7 @@ _080E49EA:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080E49F4: .4byte gUnknown_030042C0
+_080E49F4: .4byte gBattle_BG1_X
_080E49F8: .4byte gTasks
_080E49FC: .4byte _080E4A00
.align 2, 0
@@ -884,7 +884,7 @@ _080E4A84:
_080E4A94: .4byte gTasks
_080E4A98: .4byte REG_WININ
_080E4A9C:
- ldr r1, _080E4ADC @ =gUnknown_03004240
+ ldr r1, _080E4ADC @ =gBattle_WIN0V
ldrh r0, [r1]
subs r0, 0xFF
strh r0, [r1]
@@ -918,7 +918,7 @@ _080E4AB4:
strh r0, [r2]
b _080E4C06
.align 2, 0
-_080E4ADC: .4byte gUnknown_03004240
+_080E4ADC: .4byte gBattle_WIN0V
_080E4AE0: .4byte gTasks
_080E4AE4: .4byte gUnknown_02024DE8
_080E4AE8: .4byte 0x0000fffe
@@ -954,7 +954,7 @@ _080E4B06:
movs r0, 0x6
strh r0, [r2, 0x12]
_080E4B26:
- ldr r2, _080E4BE0 @ =gUnknown_03004240
+ ldr r2, _080E4BE0 @ =gBattle_WIN0V
ldrh r1, [r2]
movs r0, 0xFF
lsls r0, 8
@@ -1051,7 +1051,7 @@ _080E4B9E:
strh r0, [r1]
b _080E4C06
.align 2, 0
-_080E4BE0: .4byte gUnknown_03004240
+_080E4BE0: .4byte gBattle_WIN0V
_080E4BE4: .4byte 0xfffffc04
_080E4BE8: .4byte gUnknown_03004DC0
_080E4BEC: .4byte gUnknown_03004DE0
@@ -1109,7 +1109,7 @@ sub_80E4C34: @ 80E4C34
ldrsh r0, [r7, r2]
cmp r0, 0
bne _080E4CAA
- ldr r2, _080E4C84 @ =gUnknown_030042C0
+ ldr r2, _080E4C84 @ =gBattle_BG1_X
ldrh r1, [r2]
movs r0, 0x80
lsls r0, 8
@@ -1123,15 +1123,15 @@ sub_80E4C34: @ 80E4C34
_080E4C72:
adds r0, r1, 0x3
strh r0, [r2]
- ldr r1, _080E4C88 @ =gUnknown_03004288
+ ldr r1, _080E4C88 @ =gBattle_BG2_X
ldrh r0, [r1]
subs r0, 0x3
strh r0, [r1]
b _080E4CAA
.align 2, 0
_080E4C80: .4byte gTasks
-_080E4C84: .4byte gUnknown_030042C0
-_080E4C88: .4byte gUnknown_03004288
+_080E4C84: .4byte gBattle_BG1_X
+_080E4C88: .4byte gBattle_BG2_X
_080E4C8C:
str r5, [sp]
ldr r1, _080E4CCC @ =0x0600e000
@@ -1265,7 +1265,7 @@ _080E4D9C: .4byte 0x0001608b
_080E4DA0: .4byte REG_WININ
_080E4DA4: .4byte 0x00003f06
_080E4DA8:
- ldr r1, _080E4DE0 @ =gUnknown_03004240
+ ldr r1, _080E4DE0 @ =gBattle_WIN0V
ldrh r0, [r1]
subs r0, 0xFF
strh r0, [r1]
@@ -1295,11 +1295,11 @@ _080E4DC0:
strh r0, [r2]
b _080E4EBA
.align 2, 0
-_080E4DE0: .4byte gUnknown_03004240
+_080E4DE0: .4byte gBattle_WIN0V
_080E4DE4: .4byte gUnknown_02024DE8
_080E4DE8: .4byte 0x0000fffe
_080E4DEC:
- ldr r2, _080E4E9C @ =gUnknown_03004240
+ ldr r2, _080E4E9C @ =gBattle_WIN0V
ldrh r1, [r2]
movs r0, 0xFF
lsls r0, 8
@@ -1393,7 +1393,7 @@ _080E4E94:
strh r0, [r1]
b _080E4EBA
.align 2, 0
-_080E4E9C: .4byte gUnknown_03004240
+_080E4E9C: .4byte gBattle_WIN0V
_080E4EA0: .4byte 0xfffffc04
_080E4EA4: .4byte gUnknown_03004DC0
_080E4EA8: .4byte gUnknown_03004DE0
diff --git a/asm/bug.s b/asm/bug.s
index 987e46bbf..83170e9a7 100755
--- a/asm/bug.s
+++ b/asm/bug.s
@@ -11,7 +11,7 @@
sub_80DC824: @ 80DC824
push {r4-r6,lr}
adds r6, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC850
@@ -29,7 +29,7 @@ sub_80DC824: @ 80DC824
.align 2, 0
_080DC84C: .4byte gBattleAnimArgs
_080DC850:
- ldr r0, _080DC8E4 @ =gBattleAnimBankTarget
+ ldr r0, _080DC8E4 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -52,7 +52,7 @@ _080DC850:
negs r0, r0
strh r0, [r1]
_080DC880:
- ldr r5, _080DC8E4 @ =gBattleAnimBankTarget
+ ldr r5, _080DC8E4 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077EE4
@@ -74,7 +74,7 @@ _080DC880:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -82,7 +82,7 @@ _080DC880:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -90,24 +90,24 @@ _080DC880:
strh r0, [r6, 0x36]
ldr r0, _080DC8EC @ =sub_8078B34
str r0, [r6, 0x1C]
- ldr r1, _080DC8F0 @ =move_anim_8072740
+ ldr r1, _080DC8F0 @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080DC8E4: .4byte gBattleAnimBankTarget
+_080DC8E4: .4byte gAnimBankTarget
_080DC8E8: .4byte gBattleAnimArgs
_080DC8EC: .4byte sub_8078B34
-_080DC8F0: .4byte move_anim_8072740
+_080DC8F0: .4byte DestroyAnimSprite
thumb_func_end sub_80DC824
thumb_func_start sub_80DC8F4
sub_80DC8F4: @ 80DC8F4
push {r4-r6,lr}
adds r6, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC918
@@ -122,7 +122,7 @@ sub_80DC8F4: @ 80DC8F4
.align 2, 0
_080DC914: .4byte gBattleAnimArgs
_080DC918:
- ldr r0, _080DC990 @ =gBattleAnimBankTarget
+ ldr r0, _080DC990 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -136,7 +136,7 @@ _080DC918:
negs r1, r1
strh r1, [r0]
_080DC934:
- ldr r5, _080DC990 @ =gBattleAnimBankTarget
+ ldr r5, _080DC990 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077EE4
@@ -158,36 +158,36 @@ _080DC934:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, _080DC998 @ =sub_8078B34
str r0, [r6, 0x1C]
- ldr r1, _080DC99C @ =move_anim_8072740
+ ldr r1, _080DC99C @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080DC990: .4byte gBattleAnimBankTarget
+_080DC990: .4byte gAnimBankTarget
_080DC994: .4byte gBattleAnimArgs
_080DC998: .4byte sub_8078B34
-_080DC99C: .4byte move_anim_8072740
+_080DC99C: .4byte DestroyAnimSprite
thumb_func_end sub_80DC8F4
thumb_func_start sub_80DC9A0
sub_80DC9A0: @ 80DC9A0
push {r4,r5,lr}
adds r5, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC9BC
@@ -213,25 +213,25 @@ _080DC9BC:
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080DCA04
- ldr r4, _080DCA00 @ =gBattleAnimBankTarget
+ ldr r4, _080DCA00 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _080DCA16
.align 2, 0
_080DC9FC: .4byte gBattleAnimArgs
-_080DCA00: .4byte gBattleAnimBankTarget
+_080DCA00: .4byte gAnimBankTarget
_080DCA04:
- ldr r0, _080DCA2C @ =gBattleAnimBankTarget
+ ldr r0, _080DCA2C @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -251,7 +251,7 @@ _080DCA16:
pop {r0}
bx r0
.align 2, 0
-_080DCA2C: .4byte gBattleAnimBankTarget
+_080DCA2C: .4byte gAnimBankTarget
_080DCA30: .4byte gBattleAnimArgs
_080DCA34: .4byte sub_80DCA38
thumb_func_end sub_80DC9A0
@@ -265,7 +265,7 @@ sub_80DCA38: @ 80DCA38
cmp r0, 0
beq _080DCA4E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080DCA6A
_080DCA4E:
movs r1, 0x3A
@@ -291,7 +291,7 @@ _080DCA6A:
sub_80DCA70: @ 80DCA70
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DCAA0 @ =gBattleAnimBankTarget
+ ldr r0, _080DCAA0 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -299,7 +299,7 @@ sub_80DCA70: @ 80DCA70
adds r3, 0x22
movs r1, 0
bl sub_807A3FC
- ldr r0, _080DCAA4 @ =gBattleAnimBankAttacker
+ ldr r0, _080DCAA4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -312,8 +312,8 @@ sub_80DCA70: @ 80DCA70
strh r1, [r4, 0x20]
b _080DCAB8
.align 2, 0
-_080DCAA0: .4byte gBattleAnimBankTarget
-_080DCAA4: .4byte gBattleAnimBankAttacker
+_080DCAA0: .4byte gAnimBankTarget
+_080DCAA4: .4byte gAnimBankAttacker
_080DCAA8: .4byte gBattleAnimArgs
_080DCAAC:
ldr r1, _080DCAE0 @ =gBattleAnimArgs
@@ -327,7 +327,7 @@ _080DCAB8:
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
- ldr r0, _080DCAE4 @ =gBattleAnimBankTarget
+ ldr r0, _080DCAE4 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -344,7 +344,7 @@ _080DCAD4:
bx r0
.align 2, 0
_080DCAE0: .4byte gBattleAnimArgs
-_080DCAE4: .4byte gBattleAnimBankTarget
+_080DCAE4: .4byte gAnimBankTarget
_080DCAE8: .4byte sub_80DCAEC
thumb_func_end sub_80DCA70
@@ -385,7 +385,7 @@ _080DCB20:
cmp r0, 0x33
bne _080DCB34
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DCB34:
pop {r0}
bx r0
@@ -468,7 +468,7 @@ sub_80DCBB4: @ 80DCBB4
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
- bl move_anim_8072740
+ bl DestroyAnimSprite
pop {r0}
bx r0
.align 2, 0
@@ -480,7 +480,7 @@ sub_80DCBCC: @ 80DCBCC
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DCBEC
@@ -492,7 +492,7 @@ sub_80DCBCC: @ 80DCBCC
.align 2, 0
_080DCBE8: .4byte gBattleAnimArgs
_080DCBEC:
- ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker
+ ldr r0, _080DCCE8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -509,15 +509,15 @@ _080DCBEC:
negs r0, r0
strh r0, [r1, 0x6]
_080DCC0E:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DCC5E
- ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker
+ ldr r0, _080DCCE8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
adds r4, r0, 0
- ldr r5, _080DCCF0 @ =gBattleAnimBankTarget
+ ldr r5, _080DCCF0 @ =gAnimBankTarget
ldrb r0, [r5]
bl GetBankSide
lsls r4, 24
@@ -549,10 +549,10 @@ _080DCC5E:
adds r0, r7, 0
movs r1, 0x1
bl sub_80787B0
- ldr r5, _080DCCF0 @ =gBattleAnimBankTarget
+ ldr r5, _080DCCF0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
ldr r6, _080DCCEC @ =gBattleAnimArgs
@@ -563,7 +563,7 @@ _080DCC5E:
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -601,7 +601,7 @@ _080DCC5E:
strh r5, [r7, 0x36]
ldr r0, _080DCCF4 @ =sub_8078B34
str r0, [r7, 0x1C]
- ldr r1, _080DCCF8 @ =move_anim_8072740
+ ldr r1, _080DCCF8 @ =DestroyAnimSprite
adds r0, r7, 0
bl StoreSpriteCallbackInData
add sp, 0x4
@@ -609,11 +609,11 @@ _080DCC5E:
pop {r0}
bx r0
.align 2, 0
-_080DCCE8: .4byte gBattleAnimBankAttacker
+_080DCCE8: .4byte gAnimBankAttacker
_080DCCEC: .4byte gBattleAnimArgs
-_080DCCF0: .4byte gBattleAnimBankTarget
+_080DCCF0: .4byte gAnimBankTarget
_080DCCF4: .4byte sub_8078B34
-_080DCCF8: .4byte move_anim_8072740
+_080DCCF8: .4byte DestroyAnimSprite
thumb_func_end sub_80DCBCC
thumb_func_start sub_80DCCFC
@@ -622,7 +622,7 @@ sub_80DCCFC: @ 80DCCFC
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DCD68 @ =gBattleAnimBankAttacker
+ ldr r0, _080DCD68 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -636,10 +636,10 @@ _080DCD1C:
ldr r4, _080DCD6C @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
- ldr r5, _080DCD70 @ =gBattleAnimBankTarget
+ ldr r5, _080DCD70 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -647,7 +647,7 @@ _080DCD1C:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -669,9 +669,9 @@ _080DCD1C:
pop {r0}
bx r0
.align 2, 0
-_080DCD68: .4byte gBattleAnimBankAttacker
+_080DCD68: .4byte gAnimBankAttacker
_080DCD6C: .4byte gBattleAnimArgs
-_080DCD70: .4byte gBattleAnimBankTarget
+_080DCD70: .4byte gAnimBankTarget
_080DCD74: .4byte sub_80DCD78
thumb_func_end sub_80DCCFC
@@ -695,7 +695,7 @@ sub_80DCD78: @ 80DCD78
cmp r0, 0
beq _080DCDA4
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080DCE34
_080DCDA4:
movs r0, 0x2E
@@ -787,23 +787,23 @@ sub_80DCE40: @ 80DCE40
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DCE5C
- ldr r4, _080DCE58 @ =gBattleAnimBankAttacker
+ ldr r4, _080DCE58 @ =gAnimBankAttacker
b _080DCE5E
.align 2, 0
_080DCE54: .4byte gBattleAnimArgs
-_080DCE58: .4byte gBattleAnimBankAttacker
+_080DCE58: .4byte gAnimBankAttacker
_080DCE5C:
- ldr r4, _080DCE90 @ =gBattleAnimBankTarget
+ ldr r4, _080DCE90 @ =gAnimBankTarget
_080DCE5E:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
@@ -817,7 +817,7 @@ _080DCE5E:
pop {r0}
bx r0
.align 2, 0
-_080DCE90: .4byte gBattleAnimBankTarget
+_080DCE90: .4byte gAnimBankTarget
_080DCE94: .4byte move_anim_8074EE0
_080DCE98: .4byte sub_80785E4
thumb_func_end sub_80DCE40
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 594d569ad..26ed8e3fe 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -86,25 +86,25 @@ sub_80C2020: @ 80C2020
strh r2, [r0]
ldr r0, _080C2118 @ =gUnknown_030042A0
strh r2, [r0]
- ldr r0, _080C211C @ =gUnknown_030042C0
+ ldr r0, _080C211C @ =gBattle_BG1_X
strh r2, [r0]
- ldr r0, _080C2120 @ =gUnknown_030041B4
+ ldr r0, _080C2120 @ =gBattle_BG1_Y
strh r2, [r0]
- ldr r0, _080C2124 @ =gUnknown_03004288
+ ldr r0, _080C2124 @ =gBattle_BG2_X
strh r2, [r0]
- ldr r0, _080C2128 @ =gUnknown_03004280
+ ldr r0, _080C2128 @ =gBattle_BG2_Y
strh r2, [r0]
ldr r0, _080C212C @ =gUnknown_030041B0
strh r2, [r0]
ldr r0, _080C2130 @ =gUnknown_030041B8
strh r2, [r0]
- ldr r0, _080C2134 @ =gUnknown_030042C4
+ ldr r0, _080C2134 @ =gBattle_WIN0H
strh r2, [r0]
- ldr r0, _080C2138 @ =gUnknown_03004240
+ ldr r0, _080C2138 @ =gBattle_WIN0V
strh r2, [r0]
- ldr r0, _080C213C @ =gUnknown_03004200
+ ldr r0, _080C213C @ =gBattle_WIN1H
strh r2, [r0]
- ldr r0, _080C2140 @ =gUnknown_03004244
+ ldr r0, _080C2140 @ =gBattle_WIN1V
strh r2, [r0]
pop {r4,r5}
pop {r0}
@@ -121,16 +121,16 @@ _080C210C: .4byte 0x00003f3f
_080C2110: .4byte REG_WIN0H
_080C2114: .4byte gUnknown_030042A4
_080C2118: .4byte gUnknown_030042A0
-_080C211C: .4byte gUnknown_030042C0
-_080C2120: .4byte gUnknown_030041B4
-_080C2124: .4byte gUnknown_03004288
-_080C2128: .4byte gUnknown_03004280
+_080C211C: .4byte gBattle_BG1_X
+_080C2120: .4byte gBattle_BG1_Y
+_080C2124: .4byte gBattle_BG2_X
+_080C2128: .4byte gBattle_BG2_Y
_080C212C: .4byte gUnknown_030041B0
_080C2130: .4byte gUnknown_030041B8
-_080C2134: .4byte gUnknown_030042C4
-_080C2138: .4byte gUnknown_03004240
-_080C213C: .4byte gUnknown_03004200
-_080C2140: .4byte gUnknown_03004244
+_080C2134: .4byte gBattle_WIN0H
+_080C2138: .4byte gBattle_WIN0V
+_080C213C: .4byte gBattle_WIN1H
+_080C2140: .4byte gBattle_WIN1V
thumb_func_end sub_80C2020
thumb_func_start sub_80C2144
@@ -435,10 +435,10 @@ sub_80C2358: @ 80C2358
strb r0, [r4, 0x2]
ldr r0, _080C2418 @ =sub_80C2430
bl SetMainCallback2
- ldr r1, _080C241C @ =gUnknown_03004200
+ ldr r1, _080C241C @ =gBattle_WIN1H
movs r0, 0xF0
strh r0, [r1]
- ldr r1, _080C2420 @ =gUnknown_03004244
+ ldr r1, _080C2420 @ =gBattle_WIN1V
ldr r2, _080C2424 @ =0x000080a0
adds r0, r2, 0
strh r0, [r1]
@@ -460,8 +460,8 @@ _080C240C: .4byte gPaletteFade
_080C2410: .4byte gSharedMem + 0x18000
_080C2414: .4byte sub_80C24F4
_080C2418: .4byte sub_80C2430
-_080C241C: .4byte gUnknown_03004200
-_080C2420: .4byte gUnknown_03004244
+_080C241C: .4byte gBattle_WIN1H
+_080C2420: .4byte gBattle_WIN1V
_080C2424: .4byte 0x000080a0
_080C2428: .4byte sub_80C2F28
_080C242C: .4byte sub_80C2448
@@ -490,19 +490,19 @@ sub_80C2448: @ 80C2448
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x2
- ldr r0, _080C24CC @ =gUnknown_030042C0
+ ldr r0, _080C24CC @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x2
- ldr r0, _080C24D0 @ =gUnknown_030041B4
+ ldr r0, _080C24D0 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x2
- ldr r0, _080C24D4 @ =gUnknown_03004288
+ ldr r0, _080C24D4 @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x2
- ldr r0, _080C24D8 @ =gUnknown_03004280
+ ldr r0, _080C24D8 @ =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x2
@@ -514,19 +514,19 @@ sub_80C2448: @ 80C2448
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x22
- ldr r0, _080C24E4 @ =gUnknown_030042C4
+ ldr r0, _080C24E4 @ =gBattle_WIN0H
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x4
- ldr r0, _080C24E8 @ =gUnknown_03004240
+ ldr r0, _080C24E8 @ =gBattle_WIN0V
ldrh r0, [r0]
strh r0, [r1]
subs r1, 0x2
- ldr r0, _080C24EC @ =gUnknown_03004200
+ ldr r0, _080C24EC @ =gBattle_WIN1H
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x4
- ldr r0, _080C24F0 @ =gUnknown_03004244
+ ldr r0, _080C24F0 @ =gBattle_WIN1V
ldrh r0, [r0]
strh r0, [r1]
bl LoadOam
@@ -539,16 +539,16 @@ sub_80C2448: @ 80C2448
_080C24C0: .4byte REG_BG0HOFS
_080C24C4: .4byte gUnknown_030042A4
_080C24C8: .4byte gUnknown_030042A0
-_080C24CC: .4byte gUnknown_030042C0
-_080C24D0: .4byte gUnknown_030041B4
-_080C24D4: .4byte gUnknown_03004288
-_080C24D8: .4byte gUnknown_03004280
+_080C24CC: .4byte gBattle_BG1_X
+_080C24D0: .4byte gBattle_BG1_Y
+_080C24D4: .4byte gBattle_BG2_X
+_080C24D8: .4byte gBattle_BG2_Y
_080C24DC: .4byte gUnknown_030041B0
_080C24E0: .4byte gUnknown_030041B8
-_080C24E4: .4byte gUnknown_030042C4
-_080C24E8: .4byte gUnknown_03004240
-_080C24EC: .4byte gUnknown_03004200
-_080C24F0: .4byte gUnknown_03004244
+_080C24E4: .4byte gBattle_WIN0H
+_080C24E8: .4byte gBattle_WIN0V
+_080C24EC: .4byte gBattle_WIN1H
+_080C24F0: .4byte gBattle_WIN1V
thumb_func_end sub_80C2448
thumb_func_start sub_80C24F4
@@ -1302,10 +1302,10 @@ _080C2AC4:
.4byte _080C2CA8
.4byte _080C2CE8
_080C2ADC:
- ldr r1, _080C2BC4 @ =gUnknown_030042C4
+ ldr r1, _080C2BC4 @ =gBattle_WIN0H
movs r0, 0xF0
strh r0, [r1]
- ldr r1, _080C2BC8 @ =gUnknown_03004240
+ ldr r1, _080C2BC8 @ =gBattle_WIN0V
ldr r3, _080C2BCC @ =0x00005050
adds r0, r3, 0
strh r0, [r1]
@@ -1413,8 +1413,8 @@ _080C2B14:
strh r0, [r1, 0x8]
b _080C2D04
.align 2, 0
-_080C2BC4: .4byte gUnknown_030042C4
-_080C2BC8: .4byte gUnknown_03004240
+_080C2BC4: .4byte gBattle_WIN0H
+_080C2BC8: .4byte gBattle_WIN0V
_080C2BCC: .4byte 0x00005050
_080C2BD0: .4byte gContestFinalStandings
_080C2BD4: .4byte gContestMons
@@ -1454,7 +1454,7 @@ _080C2C04:
strh r0, [r4, 0xC]
_080C2C30:
ldrb r2, [r4, 0xC]
- ldr r3, _080C2C50 @ =gUnknown_03004240
+ ldr r3, _080C2C50 @ =gBattle_WIN0V
movs r0, 0x50
subs r0, r2
lsls r0, 8
@@ -1469,7 +1469,7 @@ _080C2C30:
strh r0, [r4, 0x8]
b _080C2D04
.align 2, 0
-_080C2C50: .4byte gUnknown_03004240
+_080C2C50: .4byte gBattle_WIN0V
_080C2C54:
ldr r0, _080C2C60 @ =gSharedMem + 0x18000
ldrb r0, [r0, 0x6]
@@ -1515,7 +1515,7 @@ _080C2CA8:
ldrb r0, [r0, 0x6]
cmp r0, 0x2
bne _080C2D04
- ldr r3, _080C2CE4 @ =gUnknown_03004240
+ ldr r3, _080C2CE4 @ =gBattle_WIN0V
ldrh r0, [r3]
lsrs r2, r0, 8
adds r0, r2, 0x2
@@ -1543,7 +1543,7 @@ _080C2CD0:
b _080C2D04
.align 2, 0
_080C2CE0: .4byte gSharedMem + 0x18000
-_080C2CE4: .4byte gUnknown_03004240
+_080C2CE4: .4byte gBattle_WIN0V
_080C2CE8:
ldr r2, _080C2D14 @ =gSharedMem + 0x18000
ldrb r0, [r2, 0x6]
@@ -2857,10 +2857,10 @@ _080C36DA:
adds r5, 0x1
cmp r5, 0x2
ble _080C36DA
- ldr r1, _080C3754 @ =gUnknown_030042C4
+ ldr r1, _080C3754 @ =gBattle_WIN0H
movs r0, 0xF0
strh r0, [r1]
- ldr r2, _080C3758 @ =gUnknown_03004240
+ ldr r2, _080C3758 @ =gBattle_WIN0V
ldrh r1, [r4, 0x22]
adds r0, r1, 0
subs r0, 0x10
@@ -2878,8 +2878,8 @@ _080C36DA:
.align 2, 0
_080C374C: .4byte gSharedMem + 0x18000
_080C3750: .4byte gSprites
-_080C3754: .4byte gUnknown_030042C4
-_080C3758: .4byte gUnknown_03004240
+_080C3754: .4byte gBattle_WIN0H
+_080C3758: .4byte gBattle_WIN0V
_080C375C: .4byte REG_WININ
_080C3760: .4byte 0x00003f3e
thumb_func_end sub_80C3698
@@ -2902,8 +2902,8 @@ sub_80C3764: @ 80C3764
orrs r0, r1
mov r1, r12
strb r0, [r1]
- ldr r7, _080C37D0 @ =gUnknown_030042C4
- ldr r6, _080C37D4 @ =gUnknown_03004240
+ ldr r7, _080C37D0 @ =gBattle_WIN0H
+ ldr r6, _080C37D4 @ =gBattle_WIN0V
adds r5, r3, 0
movs r4, 0x4
adds r2, 0x2E
@@ -2940,8 +2940,8 @@ _080C3790:
.align 2, 0
_080C37C8: .4byte gSharedMem + 0x18000
_080C37CC: .4byte gSprites
-_080C37D0: .4byte gUnknown_030042C4
-_080C37D4: .4byte gUnknown_03004240
+_080C37D0: .4byte gBattle_WIN0H
+_080C37D4: .4byte gBattle_WIN0V
_080C37D8: .4byte REG_WIN0H
_080C37DC: .4byte REG_WININ
_080C37E0: .4byte 0x00003f3f
diff --git a/asm/current.s b/asm/current.s
index df72b56af..e77218cc9 100755
--- a/asm/current.s
+++ b/asm/current.s
@@ -18,10 +18,10 @@ sub_80D648C: @ 80D648C
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r6, _080D6504 @ =gBattleAnimBankTarget
+ ldr r6, _080D6504 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -64,7 +64,7 @@ sub_80D648C: @ 80D648C
bx r0
.align 2, 0
_080D6500: .4byte gBattleAnimArgs
-_080D6504: .4byte gBattleAnimBankTarget
+_080D6504: .4byte gAnimBankTarget
_080D6508: .4byte 0x000003ff
_080D650C: .4byte 0xfffffc00
_080D6510: .4byte sub_80D6514
@@ -123,7 +123,7 @@ sub_80D6514: @ 80D6514
b _080D6584
_080D657E:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D6584:
pop {r4}
pop {r0}
@@ -168,7 +168,7 @@ _080D65C4:
cmp r0, 0
bgt _080D65D6
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D65D6:
pop {r0}
bx r0
@@ -186,7 +186,7 @@ sub_80D65DC: @ 80D65DC
ands r0, r1
cmp r0, 0
beq _080D65FE
- ldr r0, _080D664C @ =gBattleAnimBankTarget
+ ldr r0, _080D664C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -198,10 +198,10 @@ _080D65FE:
negs r0, r0
strh r0, [r1, 0x2]
_080D6606:
- ldr r5, _080D664C @ =gBattleAnimBankTarget
+ ldr r5, _080D664C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r4, _080D6650 @ =gBattleAnimArgs
lsrs r0, 24
@@ -210,7 +210,7 @@ _080D6606:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -229,7 +229,7 @@ _080D6606:
.align 2, 0
_080D6644: .4byte gMain
_080D6648: .4byte 0x0000043d
-_080D664C: .4byte gBattleAnimBankTarget
+_080D664C: .4byte gAnimBankTarget
_080D6650: .4byte gBattleAnimArgs
_080D6654: .4byte sub_80D658C
thumb_func_end sub_80D65DC
@@ -248,13 +248,13 @@ sub_80D6658: @ 80D6658
ands r0, r1
cmp r0, 0
beq _080D667C
- ldr r0, _080D6678 @ =gBattleAnimBankTarget
+ ldr r0, _080D6678 @ =gAnimBankTarget
b _080D667E
.align 2, 0
_080D6674: .4byte gBattleAnimArgs
-_080D6678: .4byte gBattleAnimBankTarget
+_080D6678: .4byte gAnimBankTarget
_080D667C:
- ldr r0, _080D670C @ =gBattleAnimBankAttacker
+ ldr r0, _080D670C @ =gAnimBankAttacker
_080D667E:
ldrb r6, [r0]
ldr r0, _080D6710 @ =gMain
@@ -278,7 +278,7 @@ _080D669C:
_080D66A4:
adds r0, r6, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r4, _080D6718 @ =gBattleAnimArgs
lsrs r0, 24
@@ -287,7 +287,7 @@ _080D66A4:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x2]
@@ -325,7 +325,7 @@ _080D66A4:
pop {r0}
bx r0
.align 2, 0
-_080D670C: .4byte gBattleAnimBankAttacker
+_080D670C: .4byte gAnimBankAttacker
_080D6710: .4byte gMain
_080D6714: .4byte 0x0000043d
_080D6718: .4byte gBattleAnimArgs
@@ -385,7 +385,7 @@ _080D6782:
cmp r0, 0
bgt _080D6794
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D6794:
pop {r4}
pop {r0}
@@ -444,7 +444,7 @@ _080D67F6:
strh r0, [r4, 0x2E]
ldr r0, _080D6814 @ =sub_80782D8
str r0, [r4, 0x1C]
- ldr r1, _080D6818 @ =move_anim_8072740
+ ldr r1, _080D6818 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -453,7 +453,7 @@ _080D67F6:
.align 2, 0
_080D6810: .4byte gBattleAnimArgs
_080D6814: .4byte sub_80782D8
-_080D6818: .4byte move_anim_8072740
+_080D6818: .4byte DestroyAnimSprite
thumb_func_end sub_80D679C
thumb_func_start sub_80D681C
@@ -462,10 +462,10 @@ sub_80D681C: @ 80D681C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, _080D6864 @ =gBattleAnimBankTarget
+ ldr r6, _080D6864 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
ldr r1, _080D6868 @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -493,7 +493,7 @@ sub_80D681C: @ 80D681C
pop {r0}
bx r0
.align 2, 0
-_080D6864: .4byte gBattleAnimBankTarget
+_080D6864: .4byte gAnimBankTarget
_080D6868: .4byte gTasks
_080D686C: .4byte gBattleAnimArgs
_080D6870: .4byte sub_80D6874
@@ -855,7 +855,7 @@ _080D6B24:
cmp r0, 0x33
bne _080D6B38
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D6B38:
pop {r0}
bx r0
@@ -876,24 +876,24 @@ sub_80D6B3C: @ 80D6B3C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6B68
- ldr r4, _080D6B64 @ =gBattleAnimBankAttacker
+ ldr r4, _080D6B64 @ =gAnimBankAttacker
b _080D6B6A
.align 2, 0
_080D6B5C: .4byte gTasks
_080D6B60: .4byte gBattleAnimArgs
-_080D6B64: .4byte gBattleAnimBankAttacker
+_080D6B64: .4byte gAnimBankAttacker
_080D6B68:
- ldr r4, _080D6BAC @ =gBattleAnimBankTarget
+ ldr r4, _080D6BAC @ =gAnimBankTarget
_080D6B6A:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -916,7 +916,7 @@ _080D6B6A:
pop {r0}
bx r0
.align 2, 0
-_080D6BAC: .4byte gBattleAnimBankTarget
+_080D6BAC: .4byte gAnimBankTarget
_080D6BB0: .4byte gBattleAnimArgs
_080D6BB4: .4byte sub_80D6BB8
thumb_func_end sub_80D6B3C
@@ -1110,23 +1110,23 @@ sub_80D6D18: @ 80D6D18
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6D34
- ldr r4, _080D6D30 @ =gBattleAnimBankAttacker
+ ldr r4, _080D6D30 @ =gAnimBankAttacker
b _080D6D36
.align 2, 0
_080D6D2C: .4byte gBattleAnimArgs
-_080D6D30: .4byte gBattleAnimBankAttacker
+_080D6D30: .4byte gAnimBankAttacker
_080D6D34:
- ldr r4, _080D6D64 @ =gBattleAnimBankTarget
+ ldr r4, _080D6D64 @ =gAnimBankTarget
_080D6D36:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1139,7 +1139,7 @@ _080D6D36:
pop {r0}
bx r0
.align 2, 0
-_080D6D64: .4byte gBattleAnimBankTarget
+_080D6D64: .4byte gAnimBankTarget
_080D6D68: .4byte move_anim_8074EE0
_080D6D6C: .4byte sub_80785E4
thumb_func_end sub_80D6D18
@@ -1153,23 +1153,23 @@ sub_80D6D70: @ 80D6D70
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6D8C
- ldr r4, _080D6D88 @ =gBattleAnimBankAttacker
+ ldr r4, _080D6D88 @ =gAnimBankAttacker
b _080D6D8E
.align 2, 0
_080D6D84: .4byte gBattleAnimArgs
-_080D6D88: .4byte gBattleAnimBankAttacker
+_080D6D88: .4byte gAnimBankAttacker
_080D6D8C:
- ldr r4, _080D6DC8 @ =gBattleAnimBankTarget
+ ldr r4, _080D6DC8 @ =gAnimBankTarget
_080D6D8E:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1178,7 +1178,7 @@ _080D6D8E:
strh r0, [r5, 0x24]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x26]
- ldr r1, _080D6DD0 @ =move_anim_8072740
+ ldr r1, _080D6DD0 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
ldr r0, _080D6DD4 @ =sub_8078600
@@ -1187,9 +1187,9 @@ _080D6D8E:
pop {r0}
bx r0
.align 2, 0
-_080D6DC8: .4byte gBattleAnimBankTarget
+_080D6DC8: .4byte gAnimBankTarget
_080D6DCC: .4byte gBattleAnimArgs
-_080D6DD0: .4byte move_anim_8072740
+_080D6DD0: .4byte DestroyAnimSprite
_080D6DD4: .4byte sub_8078600
thumb_func_end sub_80D6D70
@@ -1199,16 +1199,16 @@ sub_80D6DD8: @ 80D6DD8
adds r5, r0, 0
movs r1, 0x1
bl StartSpriteAffineAnim
- ldr r4, _080D6E30 @ =gBattleAnimBankAttacker
+ ldr r4, _080D6E30 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1236,7 +1236,7 @@ _080D6E26:
pop {r0}
bx r0
.align 2, 0
-_080D6E30: .4byte gBattleAnimBankAttacker
+_080D6E30: .4byte gAnimBankAttacker
_080D6E34: .4byte sub_80D6E38
thumb_func_end sub_80D6DD8
@@ -1331,10 +1331,10 @@ _080D6ED0:
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x26]
- ldr r4, _080D6F04 @ =gBattleAnimBankAttacker
+ ldr r4, _080D6F04 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1348,7 +1348,7 @@ _080D6ED0:
movs r0, 0x2
b _080D6F12
.align 2, 0
-_080D6F04: .4byte gBattleAnimBankAttacker
+_080D6F04: .4byte gAnimBankAttacker
_080D6F08: .4byte 0x0000ffe0
_080D6F0C:
movs r0, 0x20
@@ -1513,7 +1513,7 @@ _080D7034:
_080D703A:
b _080D718E
_080D703C:
- ldr r4, _080D707C @ =gBattleAnimBankAttacker
+ ldr r4, _080D707C @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -1545,19 +1545,19 @@ _080D7052:
ldr r0, _080D7084 @ =0x0000fff0
b _080D70F0
.align 2, 0
-_080D707C: .4byte gBattleAnimBankAttacker
+_080D707C: .4byte gAnimBankAttacker
_080D7080: .4byte gBattleAnimArgs
_080D7084: .4byte 0x0000fff0
_080D7088:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1574,16 +1574,16 @@ _080D70B0:
movs r0, 0x78
subs r0, r1
strh r0, [r5, 0xE]
- ldr r4, _080D70E4 @ =gBattleAnimBankTarget
+ ldr r4, _080D70E4 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -1593,7 +1593,7 @@ _080D70B0:
strh r0, [r5, 0x10]
b _080D7126
.align 2, 0
-_080D70E4: .4byte gBattleAnimBankTarget
+_080D70E4: .4byte gAnimBankTarget
_080D70E8:
ldr r0, _080D710C @ =0x0000fff0
strh r0, [r5, 0xE]
@@ -1826,16 +1826,16 @@ sub_80D727C: @ 80D727C
beq _080D72C0
b _080D72D4
_080D728E:
- ldr r4, _080D72BC @ =gBattleAnimBankAttacker
+ ldr r4, _080D72BC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1847,7 +1847,7 @@ _080D728E:
strh r0, [r5, 0x2E]
b _080D72D4
.align 2, 0
-_080D72BC: .4byte gBattleAnimBankAttacker
+_080D72BC: .4byte gAnimBankAttacker
_080D72C0:
adds r0, r5, 0
adds r0, 0x3F
@@ -1896,25 +1896,25 @@ _080D7308:
.4byte _080D7444
.4byte _080D7454
_080D731C:
- ldr r4, _080D73A0 @ =gBattleAnimBankAttacker
+ ldr r4, _080D73A0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
movs r0, 0x4
strh r0, [r5, 0x18]
- ldr r0, _080D73A4 @ =gBattleAnimBankTarget
+ ldr r0, _080D73A4 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -1933,12 +1933,12 @@ _080D731C:
movs r0, 0xC
strh r0, [r5, 0x1E]
subs r0, 0x4C
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0x20]
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0x22]
@@ -1956,8 +1956,8 @@ _080D731C:
adds r0, 0x1
b _080D7466
.align 2, 0
-_080D73A0: .4byte gBattleAnimBankAttacker
-_080D73A4: .4byte gBattleAnimBankTarget
+_080D73A0: .4byte gAnimBankAttacker
+_080D73A4: .4byte gAnimBankTarget
_080D73A8: .4byte 0x0000ffff
_080D73AC:
ldrh r0, [r5, 0xA]
@@ -2254,10 +2254,10 @@ _080D75C4:
beq _080D7640
b _080D764E
_080D75CA:
- ldr r0, _080D7614 @ =gBattleAnimBankTarget
+ ldr r0, _080D7614 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2276,10 +2276,10 @@ _080D75E4:
bgt _080D75E4
strh r1, [r5, 0x24]
_080D75F4:
- ldr r4, _080D7614 @ =gBattleAnimBankTarget
+ ldr r4, _080D7614 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2291,7 +2291,7 @@ _080D75F4:
strh r0, [r5, 0x20]
b _080D7638
.align 2, 0
-_080D7614: .4byte gBattleAnimBankTarget
+_080D7614: .4byte gAnimBankTarget
_080D7618:
ldrh r0, [r5, 0xA]
adds r0, 0x1
diff --git a/asm/dark.s b/asm/dark.s
index 5175d84f0..3fcc3f56c 100755
--- a/asm/dark.s
+++ b/asm/dark.s
@@ -116,13 +116,13 @@ sub_80DFFD0: @ 80DFFD0
adds r3, r0, 0
cmp r1, 0
bne _080DFFEC
- ldr r0, _080DFFE8 @ =gBattleAnimBankAttacker
+ ldr r0, _080DFFE8 @ =gAnimBankAttacker
b _080DFFEE
.align 2, 0
_080DFFE4: .4byte gBattleAnimArgs
-_080DFFE8: .4byte gBattleAnimBankAttacker
+_080DFFE8: .4byte gAnimBankAttacker
_080DFFEC:
- ldr r0, _080E001C @ =gBattleAnimBankTarget
+ ldr r0, _080E001C @ =gAnimBankTarget
_080DFFEE:
ldrb r5, [r0]
movs r6, 0x14
@@ -147,7 +147,7 @@ _080DFFEE:
beq _080E0032
b _080E00A0
.align 2, 0
-_080E001C: .4byte gBattleAnimBankTarget
+_080E001C: .4byte gAnimBankTarget
_080E0020: .4byte 0x000003ff
_080E0024: .4byte 0xfffffc00
_080E0028:
@@ -259,10 +259,10 @@ sub_80E00EC: @ 80E00EC
lsls r1, 3
ldr r0, _080E0150 @ =gTasks
adds r5, r1, r0
- ldr r4, _080E0154 @ =gBattleAnimBankAttacker
+ ldr r4, _080E0154 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -281,7 +281,7 @@ sub_80E00EC: @ 80E00EC
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -298,13 +298,13 @@ sub_80E00EC: @ 80E00EC
b _080E015E
.align 2, 0
_080E0150: .4byte gTasks
-_080E0154: .4byte gBattleAnimBankAttacker
+_080E0154: .4byte gAnimBankAttacker
_080E0158: .4byte 0x0000fff4
_080E015C:
ldr r0, _080E01A8 @ =0x0000ffc0
_080E015E:
strh r0, [r5, 0x18]
- ldr r0, _080E01AC @ =gBattleAnimBankAttacker
+ ldr r0, _080E01AC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -315,7 +315,7 @@ _080E015E:
add r4, sp, 0xC
adds r0, r4, 0
bl sub_8078914
- ldr r0, _080E01B0 @ =gUnknown_030041B4
+ ldr r0, _080E01B0 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, _080E01B4 @ =REG_BLDCNT
@@ -330,22 +330,22 @@ _080E015E:
ldr r0, _080E01BC @ =REG_BG1VOFS
str r0, [sp]
movs r7, 0x2
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E01F4
- ldr r1, _080E01C0 @ =gUnknown_03004288
+ ldr r1, _080E01C0 @ =gBattle_BG2_X
b _080E01EE
.align 2, 0
_080E01A8: .4byte 0x0000ffc0
-_080E01AC: .4byte gBattleAnimBankAttacker
-_080E01B0: .4byte gUnknown_030041B4
+_080E01AC: .4byte gAnimBankAttacker
+_080E01B0: .4byte gBattle_BG1_Y
_080E01B4: .4byte REG_BLDCNT
_080E01B8: .4byte 0x00003f42
_080E01BC: .4byte REG_BG1VOFS
-_080E01C0: .4byte gUnknown_03004288
+_080E01C0: .4byte gBattle_BG2_X
_080E01C4:
- ldr r0, _080E0278 @ =gUnknown_03004280
+ ldr r0, _080E0278 @ =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, _080E027C @ =REG_BLDCNT
@@ -359,11 +359,11 @@ _080E01C4:
ldr r0, _080E0284 @ =REG_BG2VOFS
str r0, [sp]
movs r7, 0x4
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E01F4
- ldr r1, _080E0288 @ =gUnknown_030042C0
+ ldr r1, _080E0288 @ =gBattle_BG1_X
_080E01EE:
ldrh r0, [r1]
adds r0, 0xF0
@@ -419,13 +419,13 @@ _080E0220:
adds r2, 0x3F
adds r0, r2, 0
strh r0, [r1]
- ldr r2, _080E0298 @ =gUnknown_030042C4
+ ldr r2, _080E0298 @ =gBattle_WIN0H
ldrh r0, [r5, 0x24]
lsls r0, 8
ldrh r1, [r5, 0x26]
orrs r0, r1
strh r0, [r2]
- ldr r1, _080E029C @ =gUnknown_03004240
+ ldr r1, _080E029C @ =gBattle_WIN0V
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080E02A0 @ =sub_80E02A4
@@ -435,16 +435,16 @@ _080E0220:
pop {r0}
bx r0
.align 2, 0
-_080E0278: .4byte gUnknown_03004280
+_080E0278: .4byte gBattle_BG2_Y
_080E027C: .4byte REG_BLDCNT
_080E0280: .4byte 0x00003f44
_080E0284: .4byte REG_BG2VOFS
-_080E0288: .4byte gUnknown_030042C0
+_080E0288: .4byte gBattle_BG1_X
_080E028C: .4byte 0xa2600001
_080E0290: .4byte gUnknown_03004DE0
_080E0294: .4byte REG_WINOUT
-_080E0298: .4byte gUnknown_030042C4
-_080E029C: .4byte gUnknown_03004240
+_080E0298: .4byte gBattle_WIN0H
+_080E029C: .4byte gBattle_WIN0V
_080E02A0: .4byte sub_80E02A4
thumb_func_end sub_80E00EC
@@ -561,7 +561,7 @@ _080E035E:
blt _080E0380
strh r2, [r4, 0x24]
_080E0380:
- ldr r3, _080E0398 @ =gUnknown_030042C4
+ ldr r3, _080E0398 @ =gBattle_WIN0H
ldrh r2, [r4, 0x24]
lsls r0, r2, 8
ldrh r1, [r4, 0x26]
@@ -573,7 +573,7 @@ _080E0380:
bne _080E03B6
b _080E03A2
.align 2, 0
-_080E0398: .4byte gUnknown_030042C4
+_080E0398: .4byte gBattle_WIN0H
_080E039C:
ldr r1, _080E03AC @ =gUnknown_03004DC0
movs r0, 0x3
@@ -627,15 +627,15 @@ _080E03EC:
.4byte _080E053C
.4byte _080E05A4
_080E0400:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080E043C
- ldr r0, _080E042C @ =gUnknown_030042C4
+ ldr r0, _080E042C @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _080E0430 @ =gUnknown_03004240
+ ldr r0, _080E0430 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _080E0434 @ =REG_WININ
ldr r2, _080E0438 @ =0x00003f3f
@@ -647,12 +647,12 @@ _080E0400:
bl DestroyAnimVisualTask
b _080E05F2
.align 2, 0
-_080E042C: .4byte gUnknown_030042C4
-_080E0430: .4byte gUnknown_03004240
+_080E042C: .4byte gBattle_WIN0H
+_080E0430: .4byte gBattle_WIN0V
_080E0434: .4byte REG_WININ
_080E0438: .4byte 0x00003f3f
_080E043C:
- ldr r0, _080E045C @ =gBattleAnimBankTarget
+ ldr r0, _080E045C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -664,19 +664,19 @@ _080E043C:
ldr r2, _080E0464 @ =0x00003f42
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _080E0468 @ =gUnknown_03004288
+ ldr r1, _080E0468 @ =gBattle_BG2_X
b _080E0476
.align 2, 0
-_080E045C: .4byte gBattleAnimBankTarget
+_080E045C: .4byte gAnimBankTarget
_080E0460: .4byte REG_BLDCNT
_080E0464: .4byte 0x00003f42
-_080E0468: .4byte gUnknown_03004288
+_080E0468: .4byte gBattle_BG2_X
_080E046C:
ldr r1, _080E0480 @ =REG_BLDCNT
ldr r2, _080E0484 @ =0x00003f44
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _080E0488 @ =gUnknown_030042C0
+ ldr r1, _080E0488 @ =gBattle_BG1_X
_080E0476:
ldrh r0, [r1]
adds r0, 0xF0
@@ -685,7 +685,7 @@ _080E0476:
.align 2, 0
_080E0480: .4byte REG_BLDCNT
_080E0484: .4byte 0x00003f44
-_080E0488: .4byte gUnknown_030042C0
+_080E0488: .4byte gBattle_BG1_X
_080E048C:
movs r1, 0xE
ldrsh r0, [r5, r1]
@@ -693,7 +693,7 @@ _080E048C:
bne _080E04B4
mov r0, sp
bl sub_8078914
- ldr r0, _080E04B0 @ =gUnknown_030041B4
+ ldr r0, _080E04B0 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
mov r0, sp
@@ -704,9 +704,9 @@ _080E048C:
bl FillPalette
b _080E04C4
.align 2, 0
-_080E04B0: .4byte gUnknown_030041B4
+_080E04B0: .4byte gBattle_BG1_Y
_080E04B4:
- ldr r0, _080E04CC @ =gUnknown_03004280
+ ldr r0, _080E04CC @ =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
movs r0, 0
@@ -718,12 +718,12 @@ _080E04C4:
bl sub_80E08CC
b _080E0590
.align 2, 0
-_080E04CC: .4byte gUnknown_03004280
+_080E04CC: .4byte gBattle_BG2_Y
_080E04D0:
- ldr r4, _080E051C @ =gBattleAnimBankTarget
+ ldr r4, _080E051C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -740,7 +740,7 @@ _080E04D0:
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
subs r1, r0, 0x4
@@ -755,7 +755,7 @@ _080E04D0:
ldr r0, _080E0520 @ =0x0000fff4
b _080E0526
.align 2, 0
-_080E051C: .4byte gBattleAnimBankTarget
+_080E051C: .4byte gAnimBankTarget
_080E0520: .4byte 0x0000fff4
_080E0524:
ldr r0, _080E0538 @ =0x0000ffc0
@@ -846,13 +846,13 @@ _080E05C0:
ldr r2, _080E0608 @ =0x00003f3f
adds r0, r2, 0
strh r0, [r1]
- ldr r2, _080E060C @ =gUnknown_030042C4
+ ldr r2, _080E060C @ =gBattle_WIN0H
ldrh r0, [r5, 0x24]
lsls r0, 8
ldrh r1, [r5, 0x26]
orrs r0, r1
strh r0, [r2]
- ldr r1, _080E0610 @ =gUnknown_03004240
+ ldr r1, _080E0610 @ =gBattle_WIN0V
movs r0, 0xA0
strh r0, [r1]
movs r0, 0
@@ -875,8 +875,8 @@ _080E05FC: .4byte REG_WINOUT
_080E0600: .4byte 0x00003f3b
_080E0604: .4byte REG_WININ
_080E0608: .4byte 0x00003f3f
-_080E060C: .4byte gUnknown_030042C4
-_080E0610: .4byte gUnknown_03004240
+_080E060C: .4byte gBattle_WIN0H
+_080E0610: .4byte gBattle_WIN0V
_080E0614: .4byte REG_BLDALPHA
_080E0618: .4byte 0x0000080c
_080E061C: .4byte sub_80E0620
@@ -956,7 +956,7 @@ _080E06A8:
movs r0, 0x1
strh r0, [r4, 0xA]
_080E06AC:
- ldr r2, _080E06F0 @ =gUnknown_030042C4
+ ldr r2, _080E06F0 @ =gBattle_WIN0H
ldrh r0, [r4, 0x24]
lsls r0, 8
ldrh r1, [r4, 0x26]
@@ -990,7 +990,7 @@ _080E06CE:
strh r0, [r4, 0xA]
b _080E075A
.align 2, 0
-_080E06F0: .4byte gUnknown_030042C4
+_080E06F0: .4byte gBattle_WIN0H
_080E06F4:
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -1054,10 +1054,10 @@ _080E075A:
.align 2, 0
_080E0764: .4byte gUnknown_03004DC0
_080E0768:
- ldr r0, _080E078C @ =gUnknown_030042C4
+ ldr r0, _080E078C @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _080E0790 @ =gUnknown_03004240
+ ldr r0, _080E0790 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _080E0794 @ =REG_WININ
ldr r3, _080E0798 @ =0x00003f3f
@@ -1072,8 +1072,8 @@ _080E0784:
pop {r0}
bx r0
.align 2, 0
-_080E078C: .4byte gUnknown_030042C4
-_080E0790: .4byte gUnknown_03004240
+_080E078C: .4byte gBattle_WIN0H
+_080E0790: .4byte gBattle_WIN0V
_080E0794: .4byte REG_WININ
_080E0798: .4byte 0x00003f3f
thumb_func_end sub_80E0620
@@ -1293,7 +1293,7 @@ sub_80E0918: @ 80E0918
lsls r0, 24
lsrs r0, 24
mov r10, r0
- ldr r6, _080E09B8 @ =gBattleAnimBankAttacker
+ ldr r6, _080E09B8 @ =gAnimBankAttacker
ldrb r0, [r6]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -1361,7 +1361,7 @@ _080E09A2:
pop {r0}
bx r0
.align 2, 0
-_080E09B8: .4byte gBattleAnimBankAttacker
+_080E09B8: .4byte gAnimBankAttacker
_080E09BC: .4byte gSprites
_080E09C0: .4byte gObjectBankIDs
thumb_func_end sub_80E0918
@@ -1371,7 +1371,7 @@ sub_80E09C4: @ 80E09C4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r4, _080E0A0C @ =gBattleAnimBankAttacker
+ ldr r4, _080E0A0C @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -1401,7 +1401,7 @@ _080E0A00:
pop {r0}
bx r0
.align 2, 0
-_080E0A0C: .4byte gBattleAnimBankAttacker
+_080E0A0C: .4byte gAnimBankAttacker
thumb_func_end sub_80E09C4
thumb_func_start sub_80E0A10
@@ -1422,7 +1422,7 @@ sub_80E0A10: @ 80E0A10
bl StartSpriteAnim
ldr r0, _080E0A44 @ =sub_8078600
str r0, [r4, 0x1C]
- ldr r1, _080E0A48 @ =move_anim_8072740
+ ldr r1, _080E0A48 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4}
@@ -1431,7 +1431,7 @@ sub_80E0A10: @ 80E0A10
.align 2, 0
_080E0A40: .4byte gBattleAnimArgs
_080E0A44: .4byte sub_8078600
-_080E0A48: .4byte move_anim_8072740
+_080E0A48: .4byte DestroyAnimSprite
thumb_func_end sub_80E0A10
thumb_func_start sub_80E0A4C
@@ -1445,9 +1445,9 @@ sub_80E0A4C: @ 80E0A4C
lsrs r0, 24
mov r9, r0
movs r7, 0
- ldr r0, _080E0B50 @ =gUnknown_030042C4
+ ldr r0, _080E0B50 @ =gBattle_WIN0H
strh r7, [r0]
- ldr r0, _080E0B54 @ =gUnknown_03004240
+ ldr r0, _080E0B54 @ =gBattle_WIN0V
strh r7, [r0]
ldr r1, _080E0B58 @ =REG_WININ
ldr r2, _080E0B5C @ =0x00003f3f
@@ -1484,7 +1484,7 @@ sub_80E0A4C: @ 80E0A4C
movs r0, 0x3F
ands r0, r1
strb r0, [r5, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0AC4
@@ -1500,11 +1500,11 @@ _080E0AC4:
lsls r0, 24
cmp r0, 0
beq _080E0B40
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0B40
- ldr r4, _080E0B74 @ =gBattleAnimBankAttacker
+ ldr r4, _080E0B74 @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankIdentity
lsls r0, 24
@@ -1555,7 +1555,7 @@ _080E0AF4:
strb r0, [r5]
movs r7, 0x1
_080E0B40:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E0B84
@@ -1563,8 +1563,8 @@ _080E0B40:
ldrh r5, [r0]
b _080E0BCC
.align 2, 0
-_080E0B50: .4byte gUnknown_030042C4
-_080E0B54: .4byte gUnknown_03004240
+_080E0B50: .4byte gBattle_WIN0H
+_080E0B54: .4byte gBattle_WIN0V
_080E0B58: .4byte REG_WININ
_080E0B5C: .4byte 0x00003f3f
_080E0B60: .4byte 0x00003f3d
@@ -1572,12 +1572,12 @@ _080E0B64: .4byte REG_BLDCNT
_080E0B68: .4byte 0x00003f42
_080E0B6C: .4byte 0x00000c08
_080E0B70: .4byte REG_BG1CNT
-_080E0B74: .4byte gBattleAnimBankAttacker
+_080E0B74: .4byte gAnimBankAttacker
_080E0B78: .4byte gSprites
_080E0B7C: .4byte gObjectBankIDs
_080E0B80: .4byte gSharedMem + 0x19348
_080E0B84:
- ldr r4, _080E0BA4 @ =gBattleAnimBankAttacker
+ ldr r4, _080E0BA4 @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -1593,7 +1593,7 @@ _080E0B84:
ldr r1, _080E0BAC @ =gEnemyParty
b _080E0BC0
.align 2, 0
-_080E0BA4: .4byte gBattleAnimBankAttacker
+_080E0BA4: .4byte gAnimBankAttacker
_080E0BA8: .4byte gBattlePartyID
_080E0BAC: .4byte gEnemyParty
_080E0BB0:
@@ -1617,7 +1617,7 @@ _080E0BCC:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E0C60 @ =gBattleAnimBankAttacker
+ ldr r0, _080E0C60 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r1, r4, 0
adds r2, r5, 0
@@ -1647,7 +1647,7 @@ _080E0BCC:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- ldr r2, _080E0C78 @ =gUnknown_030042C0
+ ldr r2, _080E0C78 @ =gBattle_BG1_X
ldr r0, _080E0C7C @ =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -1657,7 +1657,7 @@ _080E0BCC:
negs r0, r0
adds r0, 0x60
strh r0, [r2]
- ldr r2, _080E0C80 @ =gUnknown_030041B4
+ ldr r2, _080E0C80 @ =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@@ -1678,15 +1678,15 @@ _080E0BCC:
.align 2, 0
_080E0C58: .4byte gBattlePartyID
_080E0C5C: .4byte gPlayerParty
-_080E0C60: .4byte gBattleAnimBankAttacker
+_080E0C60: .4byte gAnimBankAttacker
_080E0C64: .4byte 0x040000d4
_080E0C68: .4byte 0x85000400
_080E0C6C: .4byte gUnknown_08D1D574
_080E0C70: .4byte gUnknown_08D1D410
_080E0C74: .4byte gUnknown_08D1D54C
-_080E0C78: .4byte gUnknown_030042C0
+_080E0C78: .4byte gBattle_BG1_X
_080E0C7C: .4byte gSprites
-_080E0C80: .4byte gUnknown_030041B4
+_080E0C80: .4byte gBattle_BG1_Y
_080E0C84: .4byte gBattleAnimArgs
_080E0C88:
lsls r0, r1, 4
@@ -1740,7 +1740,7 @@ sub_80E0CD0: @ 80E0CD0
adds r0, 0x4
movs r5, 0
strh r0, [r4, 0x1C]
- ldr r2, _080E0DF4 @ =gUnknown_030042C0
+ ldr r2, _080E0DF4 @ =gBattle_BG1_X
ldrh r3, [r2]
subs r1, r3, 0x4
strh r1, [r2]
@@ -1761,9 +1761,9 @@ sub_80E0CD0: @ 80E0CD0
bne _080E0DE8
movs r0, 0
bl sub_8076464
- ldr r0, _080E0DF8 @ =gUnknown_030042C4
+ ldr r0, _080E0DF8 @ =gBattle_WIN0H
strh r5, [r0]
- ldr r0, _080E0DFC @ =gUnknown_03004240
+ ldr r0, _080E0DFC @ =gBattle_WIN0V
strh r5, [r0]
ldr r0, _080E0E00 @ =REG_WININ
ldr r2, _080E0E04 @ =0x00003f3f
@@ -1771,7 +1771,7 @@ sub_80E0CD0: @ 80E0CD0
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0D40
@@ -1838,7 +1838,7 @@ _080E0D84:
cmp r0, 0x1
bne _080E0DE2
ldr r2, _080E0E1C @ =gObjectBankIDs
- ldr r0, _080E0E20 @ =gBattleAnimBankAttacker
+ ldr r0, _080E0E20 @ =gAnimBankAttacker
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -1870,9 +1870,9 @@ _080E0DE8:
bx r0
.align 2, 0
_080E0DF0: .4byte gTasks
-_080E0DF4: .4byte gUnknown_030042C0
-_080E0DF8: .4byte gUnknown_030042C4
-_080E0DFC: .4byte gUnknown_03004240
+_080E0DF4: .4byte gBattle_BG1_X
+_080E0DF8: .4byte gBattle_WIN0H
+_080E0DFC: .4byte gBattle_WIN0V
_080E0E00: .4byte REG_WININ
_080E0E04: .4byte 0x00003f3f
_080E0E08: .4byte REG_BG1CNT
@@ -1881,7 +1881,7 @@ _080E0E10: .4byte gSprites
_080E0E14: .4byte 0x040000d4
_080E0E18: .4byte 0x85000200
_080E0E1C: .4byte gObjectBankIDs
-_080E0E20: .4byte gBattleAnimBankAttacker
+_080E0E20: .4byte gAnimBankAttacker
thumb_func_end sub_80E0CD0
thumb_func_start sub_80E0E24
@@ -1986,7 +1986,7 @@ sub_80E0EE8: @ 80E0EE8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
- ldr r2, _080E0F14 @ =gUnknown_0202F7C4
+ ldr r2, _080E0F14 @ =gAnimMoveTurn
ldrb r0, [r2]
cmp r0, 0x1
bhi _080E0EFC
@@ -2006,7 +2006,7 @@ _080E0F08:
pop {r0}
bx r0
.align 2, 0
-_080E0F14: .4byte gUnknown_0202F7C4
+_080E0F14: .4byte gAnimMoveTurn
_080E0F18: .4byte gBattleAnimArgs
thumb_func_end sub_80E0EE8
diff --git a/asm/dragon.s b/asm/dragon.s
index c384e3b6c..7c4ea0547 100755
--- a/asm/dragon.s
+++ b/asm/dragon.s
@@ -11,16 +11,16 @@
sub_80DF5A0: @ 80DF5A0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DF5E8 @ =gBattleAnimBankAttacker
+ ldr r4, _080DF5E8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -43,7 +43,7 @@ sub_80DF5A0: @ 80DF5A0
adds r1, r2, 0
b _080DF5FA
.align 2, 0
-_080DF5E8: .4byte gBattleAnimBankAttacker
+_080DF5E8: .4byte gAnimBankAttacker
_080DF5EC: .4byte gBattleAnimArgs
_080DF5F0:
ldr r1, _080DF630 @ =gBattleAnimArgs
@@ -89,20 +89,20 @@ sub_80DF63C: @ 80DF63C
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8078650
- ldr r4, _080DF694 @ =gBattleAnimBankTarget
+ ldr r4, _080DF694 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
- ldr r0, _080DF698 @ =gBattleAnimBankAttacker
+ ldr r0, _080DF698 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -126,8 +126,8 @@ sub_80DF63C: @ 80DF63C
strh r0, [r5, 0x36]
b _080DF6CA
.align 2, 0
-_080DF694: .4byte gBattleAnimBankTarget
-_080DF698: .4byte gBattleAnimBankAttacker
+_080DF694: .4byte gAnimBankTarget
+_080DF698: .4byte gAnimBankAttacker
_080DF69C: .4byte gBattleAnimArgs
_080DF6A0:
ldr r1, _080DF6E4 @ =gBattleAnimArgs
@@ -177,23 +177,23 @@ sub_80DF6F0: @ 80DF6F0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DF70C
- ldr r4, _080DF708 @ =gBattleAnimBankAttacker
+ ldr r4, _080DF708 @ =gAnimBankAttacker
b _080DF70E
.align 2, 0
_080DF704: .4byte gBattleAnimArgs
-_080DF708: .4byte gBattleAnimBankAttacker
+_080DF708: .4byte gAnimBankAttacker
_080DF70C:
- ldr r4, _080DF750 @ =gBattleAnimBankTarget
+ ldr r4, _080DF750 @ =gAnimBankTarget
_080DF70E:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -215,7 +215,7 @@ _080DF70E:
pop {r0}
bx r0
.align 2, 0
-_080DF750: .4byte gBattleAnimBankTarget
+_080DF750: .4byte gAnimBankTarget
_080DF754: .4byte gBattleAnimArgs
_080DF758: .4byte sub_8078600
_080DF75C: .4byte move_anim_8074EE0
@@ -225,7 +225,7 @@ _080DF75C: .4byte move_anim_8074EE0
sub_80DF760: @ 80DF760
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DF788 @ =gBattleAnimBankAttacker
+ ldr r0, _080DF788 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -241,24 +241,24 @@ _080DF77A:
pop {r0}
bx r0
.align 2, 0
-_080DF788: .4byte gBattleAnimBankAttacker
+_080DF788: .4byte gAnimBankAttacker
thumb_func_end sub_80DF760
thumb_func_start sub_80DF78C
sub_80DF78C: @ 80DF78C
push {r4-r7,lr}
adds r6, r0, 0
- ldr r4, _080DF7E0 @ =gBattleAnimBankAttacker
+ ldr r4, _080DF7E0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -284,7 +284,7 @@ sub_80DF78C: @ 80DF78C
lsrs r0, r7, 17
b _080DF7EE
.align 2, 0
-_080DF7E0: .4byte gBattleAnimBankAttacker
+_080DF7E0: .4byte gAnimBankAttacker
_080DF7E4: .4byte gBattleAnimArgs
_080DF7E8: .4byte gBankAttacker
_080DF7EC:
@@ -442,7 +442,7 @@ _080DF90A:
cmp r0, 0x14
ble _080DF91E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DF91E:
pop {r4,r5}
pop {r0}
@@ -460,7 +460,7 @@ sub_80DF924: @ 80DF924
lsls r1, 3
ldr r0, _080DF950 @ =gTasks
adds r4, r1, r0
- ldr r0, _080DF954 @ =gBattleAnimBankAttacker
+ ldr r0, _080DF954 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -469,17 +469,17 @@ sub_80DF924: @ 80DF924
bne _080DF960
ldr r0, _080DF958 @ =REG_BG1HOFS
str r0, [sp]
- ldr r0, _080DF95C @ =gUnknown_030042C0
+ ldr r0, _080DF95C @ =gBattle_BG1_X
b _080DF966
.align 2, 0
_080DF950: .4byte gTasks
-_080DF954: .4byte gBattleAnimBankAttacker
+_080DF954: .4byte gAnimBankAttacker
_080DF958: .4byte REG_BG1HOFS
-_080DF95C: .4byte gUnknown_030042C0
+_080DF95C: .4byte gBattle_BG1_X
_080DF960:
ldr r0, _080DF9DC @ =REG_BG2HOFS
str r0, [sp]
- ldr r0, _080DF9E0 @ =gUnknown_03004288
+ ldr r0, _080DF9E0 @ =gBattle_BG2_X
_080DF966:
ldrh r0, [r0]
strh r0, [r4, 0xC]
@@ -491,7 +491,7 @@ _080DF966:
strb r0, [r1, 0x8]
mov r0, sp
strb r5, [r0, 0x9]
- ldr r0, _080DF9E8 @ =gBattleAnimBankAttacker
+ ldr r0, _080DF9E8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -542,9 +542,9 @@ _080DF9C4:
bx r0
.align 2, 0
_080DF9DC: .4byte REG_BG2HOFS
-_080DF9E0: .4byte gUnknown_03004288
+_080DF9E0: .4byte gBattle_BG2_X
_080DF9E4: .4byte 0xa2600001
-_080DF9E8: .4byte gBattleAnimBankAttacker
+_080DF9E8: .4byte gAnimBankAttacker
_080DF9EC: .4byte gUnknown_03004DE0
_080DF9F0: .4byte sub_80DF9F4
thumb_func_end sub_80DF924
@@ -724,18 +724,18 @@ sub_80DFB28: @ 80DFB28
movs r1, 0x5
bl __divsi3
adds r6, r0, 0
- ldr r1, _080DFBCC @ =gBattleAnimBankAttacker
+ ldr r1, _080DFBCC @ =gAnimBankAttacker
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
@@ -790,7 +790,7 @@ _080DFBB0:
bx r0
.align 2, 0
_080DFBC8: .4byte gBattleAnimArgs
-_080DFBCC: .4byte gBattleAnimBankAttacker
+_080DFBCC: .4byte gAnimBankAttacker
_080DFBD0: .4byte sub_80DFBD8
_080DFBD4: .4byte gUnknown_03000730
thumb_func_end sub_80DFB28
@@ -827,7 +827,7 @@ sub_80DFBD8: @ 80DFBD8
cmp r0, r1
ble _080DFC1C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DFC1C:
pop {r4}
pop {r0}
@@ -847,7 +847,7 @@ sub_80DFC24: @ 80DFC24
ldr r0, _080DFC5C @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r1, 0x8]
- ldr r0, _080DFC60 @ =gBattleAnimBankAttacker
+ ldr r0, _080DFC60 @ =gAnimBankAttacker
ldrb r0, [r0]
movs r2, 0x10
strh r2, [r1, 0xA]
@@ -864,7 +864,7 @@ sub_80DFC24: @ 80DFC24
.align 2, 0
_080DFC58: .4byte gTasks
_080DFC5C: .4byte gBattleAnimArgs
-_080DFC60: .4byte gBattleAnimBankAttacker
+_080DFC60: .4byte gAnimBankAttacker
_080DFC64: .4byte REG_BLDALPHA
_080DFC68: .4byte REG_BLDCNT
_080DFC6C: .4byte 0x00003f42
@@ -927,7 +927,7 @@ sub_80DFC9C: @ 80DFC9C
bne _080DFD1E
ldr r2, _080DFD0C @ =gSprites
ldr r1, _080DFD10 @ =gObjectBankIDs
- ldr r0, _080DFD14 @ =gBattleAnimBankAttacker
+ ldr r0, _080DFD14 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -948,7 +948,7 @@ _080DFD04: .4byte gTasks
_080DFD08: .4byte REG_BLDALPHA
_080DFD0C: .4byte gSprites
_080DFD10: .4byte gObjectBankIDs
-_080DFD14: .4byte gBattleAnimBankAttacker
+_080DFD14: .4byte gAnimBankAttacker
_080DFD18:
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -1050,7 +1050,7 @@ sub_80DFDC0: @ 80DFDC0
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _080DFDEC @ =gBattleAnimBankAttacker
+ ldr r0, _080DFDEC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -1062,7 +1062,7 @@ sub_80DFDC0: @ 80DFDC0
b _080DFDFC
.align 2, 0
_080DFDE8: .4byte REG_BLDALPHA
-_080DFDEC: .4byte gBattleAnimBankAttacker
+_080DFDEC: .4byte gAnimBankAttacker
_080DFDF0: .4byte REG_BLDCNT
_080DFDF4: .4byte 0x00003f42
_080DFDF8:
@@ -1085,29 +1085,29 @@ _080DFE10: .4byte 0x00003f44
sub_80DFE14: @ 80DFE14
push {r4-r6,lr}
adds r4, r0, 0
- ldr r6, _080DFE80 @ =gBattleAnimBankTarget
+ ldr r6, _080DFE80 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
- ldr r5, _080DFE84 @ =gBattleAnimBankAttacker
+ ldr r5, _080DFE84 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1131,8 +1131,8 @@ sub_80DFE14: @ 80DFE14
pop {r0}
bx r0
.align 2, 0
-_080DFE80: .4byte gBattleAnimBankTarget
-_080DFE84: .4byte gBattleAnimBankAttacker
+_080DFE80: .4byte gAnimBankTarget
+_080DFE84: .4byte gAnimBankAttacker
_080DFE88: .4byte 0x0000ffd8
_080DFE8C: .4byte sub_80DFE90
thumb_func_end sub_80DFE14
@@ -1204,7 +1204,7 @@ _080DFF02:
cmp r0, 0
bne _080DFF14
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DFF14:
pop {r4-r6}
pop {r0}
diff --git a/asm/fight.s b/asm/fight.s
index c6ef33840..d0d042113 100755
--- a/asm/fight.s
+++ b/asm/fight.s
@@ -24,7 +24,7 @@ unc_080B08A0: @ 80D8FF0
strh r0, [r4, 0x2E]
ldr r0, _080D9024 @ =sub_80782D8
str r0, [r4, 0x1C]
- ldr r1, _080D9028 @ =move_anim_8072740
+ ldr r1, _080D9028 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -33,7 +33,7 @@ unc_080B08A0: @ 80D8FF0
.align 2, 0
_080D9020: .4byte gBattleAnimArgs
_080D9024: .4byte sub_80782D8
-_080D9028: .4byte move_anim_8072740
+_080D9028: .4byte DestroyAnimSprite
thumb_func_end unc_080B08A0
thumb_func_start sub_80D902C
@@ -45,7 +45,7 @@ sub_80D902C: @ 80D902C
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _080D9054
- ldr r0, _080D9074 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9074 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -71,14 +71,14 @@ _080D9054:
bx r0
.align 2, 0
_080D9070: .4byte gBattleAnimArgs
-_080D9074: .4byte gBattleAnimBankAttacker
+_080D9074: .4byte gAnimBankAttacker
thumb_func_end sub_80D902C
thumb_func_start sub_80D9078
sub_80D9078: @ 80D9078
push {r4,lr}
adds r4, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9094
@@ -126,7 +126,7 @@ _080D90D0:
strh r0, [r5, 0x2E]
ldr r0, _080D90EC @ =sub_80782D8
str r0, [r5, 0x1C]
- ldr r1, _080D90F0 @ =move_anim_8072740
+ ldr r1, _080D90F0 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -135,7 +135,7 @@ _080D90D0:
.align 2, 0
_080D90E8: .4byte gBattleAnimArgs
_080D90EC: .4byte sub_80782D8
-_080D90F0: .4byte move_anim_8072740
+_080D90F0: .4byte DestroyAnimSprite
thumb_func_end sub_80D90A4
thumb_func_start sub_80D90F4
@@ -151,13 +151,13 @@ sub_80D90F4: @ 80D90F4
mov r9, r0
cmp r1, 0
bne _080D9118
- ldr r0, _080D9114 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9114 @ =gAnimBankAttacker
b _080D911A
.align 2, 0
_080D9110: .4byte gBattleAnimArgs
-_080D9114: .4byte gBattleAnimBankAttacker
+_080D9114: .4byte gAnimBankAttacker
_080D9118:
- ldr r0, _080D9260 @ =gBattleAnimBankTarget
+ ldr r0, _080D9260 @ =gAnimBankTarget
_080D911A:
ldrb r0, [r0]
mov r8, r0
@@ -178,13 +178,13 @@ _080D9138:
bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
mov r0, r8
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -314,7 +314,7 @@ _080D9250:
pop {r0}
bx r0
.align 2, 0
-_080D9260: .4byte gBattleAnimBankTarget
+_080D9260: .4byte gAnimBankTarget
_080D9264: .4byte gBanksBySide
_080D9268: .4byte 0xfff00000
_080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8
@@ -355,7 +355,7 @@ sub_80D927C: @ 80D927C
bl DestroySprite
_080D92B8:
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080D92C8
.align 2, 0
_080D92C0: .4byte gSprites
@@ -444,7 +444,7 @@ sub_80D9328: @ 80D9328
strh r6, [r5, 0x24]
ldr r0, _080D9370 @ =sub_8078B34
str r0, [r5, 0x1C]
- ldr r1, _080D9374 @ =move_anim_8072740
+ ldr r1, _080D9374 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
_080D9368:
@@ -453,17 +453,17 @@ _080D9368:
bx r0
.align 2, 0
_080D9370: .4byte sub_8078B34
-_080D9374: .4byte move_anim_8072740
+_080D9374: .4byte DestroyAnimSprite
thumb_func_end sub_80D9328
thumb_func_start sub_80D9378
sub_80D9378: @ 80D9378
push {r4-r6,lr}
adds r6, r0, 0
- ldr r0, _080D93F4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D93F4 @ =gAnimBankAttacker
ldrb r1, [r0]
movs r0, 0x2
- ldr r2, _080D93F8 @ =gBattleAnimBankTarget
+ ldr r2, _080D93F8 @ =gAnimBankTarget
eors r0, r1
ldrb r1, [r2]
cmp r0, r1
@@ -483,7 +483,7 @@ _080D93A4:
adds r0, r6, 0
movs r1, 0x1
bl sub_8078764
- ldr r0, _080D93F4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D93F4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -519,8 +519,8 @@ _080D93C2:
pop {r0}
bx r0
.align 2, 0
-_080D93F4: .4byte gBattleAnimBankAttacker
-_080D93F8: .4byte gBattleAnimBankTarget
+_080D93F4: .4byte gAnimBankAttacker
+_080D93F8: .4byte gAnimBankTarget
_080D93FC: .4byte gBattleAnimArgs
_080D9400: .4byte sub_80D9404
thumb_func_end sub_80D9378
@@ -549,7 +549,7 @@ sub_80D9404: @ 80D9404
b _080D9436
_080D9430:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9436:
pop {r4}
pop {r0}
@@ -598,7 +598,7 @@ sub_80D9474: @ 80D9474
strh r0, [r4, 0x2E]
ldr r0, _080D94A0 @ =sub_80782D8
str r0, [r4, 0x1C]
- ldr r1, _080D94A4 @ =move_anim_8072740
+ ldr r1, _080D94A4 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4}
@@ -606,7 +606,7 @@ sub_80D9474: @ 80D9474
bx r0
.align 2, 0
_080D94A0: .4byte sub_80782D8
-_080D94A4: .4byte move_anim_8072740
+_080D94A4: .4byte DestroyAnimSprite
thumb_func_end sub_80D9474
thumb_func_start sub_80D94A8
@@ -643,16 +643,16 @@ sub_80D94CC: @ 80D94CC
bne _080D9510
movs r0, 0x6
strh r0, [r5, 0x2E]
- ldr r4, _080D9518 @ =gBattleAnimBankTarget
+ ldr r4, _080D9518 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -666,7 +666,7 @@ _080D9510:
pop {r0}
bx r0
.align 2, 0
-_080D9518: .4byte gBattleAnimBankTarget
+_080D9518: .4byte gAnimBankTarget
_080D951C: .4byte sub_8078B34
_080D9520: .4byte sub_80D9524
thumb_func_end sub_80D94CC
@@ -678,13 +678,13 @@ sub_80D9524: @ 80D9524
strh r1, [r0, 0x2E]
ldr r1, _080D9538 @ =sub_80782D8
str r1, [r0, 0x1C]
- ldr r1, _080D953C @ =move_anim_8072740
+ ldr r1, _080D953C @ =DestroyAnimSprite
bl StoreSpriteCallbackInData
pop {r0}
bx r0
.align 2, 0
_080D9538: .4byte sub_80782D8
-_080D953C: .4byte move_anim_8072740
+_080D953C: .4byte DestroyAnimSprite
thumb_func_end sub_80D9524
thumb_func_start sub_80D9540
@@ -754,7 +754,7 @@ _080D95BA:
cmp r0, 0x78
ble _080D95C8
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D95C8:
pop {r4}
pop {r0}
@@ -770,23 +770,23 @@ sub_80D95D0: @ 80D95D0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D95EC
- ldr r4, _080D95E8 @ =gBattleAnimBankAttacker
+ ldr r4, _080D95E8 @ =gAnimBankAttacker
b _080D95EE
.align 2, 0
_080D95E4: .4byte gBattleAnimArgs
-_080D95E8: .4byte gBattleAnimBankAttacker
+_080D95E8: .4byte gAnimBankAttacker
_080D95EC:
- ldr r4, _080D9634 @ =gBattleAnimBankTarget
+ ldr r4, _080D9634 @ =gAnimBankTarget
_080D95EE:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -812,7 +812,7 @@ _080D95EE:
pop {r0}
bx r0
.align 2, 0
-_080D9634: .4byte gBattleAnimBankTarget
+_080D9634: .4byte gAnimBankTarget
_080D9638: .4byte gBattleAnimArgs
_080D963C: .4byte sub_80D9640
thumb_func_end sub_80D95D0
@@ -840,7 +840,7 @@ _080D9652:
cmp r0, 0
bne _080D966E
adds r0, r1, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080D96B0
_080D966E:
ldrh r0, [r1, 0x2E]
@@ -878,7 +878,7 @@ _080D969E:
cmp r0, 0
bne _080D96B0
adds r0, r1, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D96B0:
pop {r0}
bx r0
@@ -895,10 +895,10 @@ sub_80D96B8: @ 80D96B8
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D96E4
- ldr r4, _080D96E0 @ =gBattleAnimBankAttacker
+ ldr r4, _080D96E0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x4]
@@ -906,12 +906,12 @@ sub_80D96B8: @ 80D96B8
b _080D96F6
.align 2, 0
_080D96DC: .4byte gBattleAnimArgs
-_080D96E0: .4byte gBattleAnimBankAttacker
+_080D96E0: .4byte gAnimBankAttacker
_080D96E4:
- ldr r4, _080D9740 @ =gBattleAnimBankTarget
+ ldr r4, _080D9740 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -920,7 +920,7 @@ _080D96F6:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -954,7 +954,7 @@ _080D96F6:
beq _080D975A
b _080D978A
.align 2, 0
-_080D9740: .4byte gBattleAnimBankTarget
+_080D9740: .4byte gAnimBankTarget
_080D9744: .4byte gBattleAnimArgs
_080D9748: .4byte 0x000003ff
_080D974C: .4byte 0xfffffc00
@@ -991,7 +991,7 @@ _080D9784:
b _080D9792
_080D978A:
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080D9796
_080D9792:
ldr r0, _080D979C @ =sub_80D97A0
@@ -1024,7 +1024,7 @@ sub_80D97A0: @ 80D97A0
cmp r0, 0x28
ble _080D97C8
adds r0, r1, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D97C8:
pop {r0}
bx r0
@@ -1042,17 +1042,17 @@ sub_80D97CC: @ 80D97CC
ldr r4, _080D981C @ =gBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r0, _080D9820 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9820 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -1064,15 +1064,15 @@ sub_80D97CC: @ 80D97CC
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- ldr r0, _080D9824 @ =gBattleAnimBankTarget
+ ldr r0, _080D9824 @ =gAnimBankTarget
b _080D9844
.align 2, 0
_080D9818: .4byte gBattleAnimArgs
_080D981C: .4byte gBankAttacker
-_080D9820: .4byte gBattleAnimBankAttacker
-_080D9824: .4byte gBattleAnimBankTarget
+_080D9820: .4byte gAnimBankAttacker
+_080D9824: .4byte gAnimBankTarget
_080D9828:
- ldr r0, _080D9860 @ =gBattleAnimBankTarget
+ ldr r0, _080D9860 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -1084,7 +1084,7 @@ _080D9828:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- ldr r0, _080D9864 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9864 @ =gAnimBankAttacker
_080D9844:
ldrb r0, [r0]
strh r0, [r5, 0x3C]
@@ -1100,8 +1100,8 @@ _080D9844:
pop {r0}
bx r0
.align 2, 0
-_080D9860: .4byte gBattleAnimBankTarget
-_080D9864: .4byte gBattleAnimBankAttacker
+_080D9860: .4byte gAnimBankTarget
+_080D9864: .4byte gAnimBankAttacker
_080D9868: .4byte sub_80D986C
thumb_func_end sub_80D97CC
@@ -1127,7 +1127,7 @@ sub_80D986C: @ 80D986C
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -1137,7 +1137,7 @@ sub_80D986C: @ 80D986C
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1237,7 +1237,7 @@ sub_80D9934: @ 80D9934
cmp r4, r0
bge _080D997E
adds r0, r7, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080D99DC
_080D997E:
ldrh r0, [r7, 0x2E]
@@ -1245,31 +1245,31 @@ _080D997E:
strh r0, [r7, 0x2E]
b _080D99DC
_080D9986:
- ldr r4, _080D99E8 @ =gBattleAnimBankAttacker
+ ldr r4, _080D99E8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r2, _080D99EC @ =gBattleAnimBankTarget
+ ldr r2, _080D99EC @ =gAnimBankTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
subs r4, r6
strh r4, [r7, 0x2E]
@@ -1291,8 +1291,8 @@ _080D99DC:
pop {r0}
bx r0
.align 2, 0
-_080D99E8: .4byte gBattleAnimBankAttacker
-_080D99EC: .4byte gBattleAnimBankTarget
+_080D99E8: .4byte gAnimBankAttacker
+_080D99EC: .4byte gAnimBankTarget
_080D99F0: .4byte sub_80D99F4
thumb_func_end sub_80D9934
@@ -1329,7 +1329,7 @@ sub_80D99F4: @ 80D99F4
ble _080D9A34
_080D9A2E:
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9A34:
pop {r0}
bx r0
@@ -1347,29 +1347,29 @@ sub_80D9A38: @ 80D9A38
ldr r4, _080D9A70 @ =gBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r0, _080D9A74 @ =gBattleAnimBankTarget
+ ldr r0, _080D9A74 @ =gAnimBankTarget
ldrb r4, [r0]
- ldr r0, _080D9A78 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9A78 @ =gAnimBankAttacker
b _080D9A82
.align 2, 0
_080D9A6C: .4byte gBattleAnimArgs
_080D9A70: .4byte gBankAttacker
-_080D9A74: .4byte gBattleAnimBankTarget
-_080D9A78: .4byte gBattleAnimBankAttacker
+_080D9A74: .4byte gAnimBankTarget
+_080D9A78: .4byte gAnimBankAttacker
_080D9A7C:
- ldr r0, _080D9AB4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9AB4 @ =gAnimBankAttacker
ldrb r4, [r0]
- ldr r0, _080D9AB8 @ =gBattleAnimBankTarget
+ ldr r0, _080D9AB8 @ =gAnimBankTarget
_080D9A82:
ldrb r0, [r0]
bl sub_8079ED4
@@ -1382,7 +1382,7 @@ _080D9A82:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9ABC
@@ -1395,8 +1395,8 @@ _080D9A82:
subs r0, 0x47
b _080D9AD6
.align 2, 0
-_080D9AB4: .4byte gBattleAnimBankAttacker
-_080D9AB8: .4byte gBattleAnimBankTarget
+_080D9AB4: .4byte gAnimBankAttacker
+_080D9AB8: .4byte gAnimBankTarget
_080D9ABC:
adds r0, r4, 0
bl GetBankSide
@@ -1421,7 +1421,7 @@ _080D9ADC:
strh r0, [r5, 0x30]
adds r0, r4, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -1429,13 +1429,13 @@ _080D9ADC:
strh r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4
- ldr r1, _080D9B1C @ =move_anim_8072740
+ ldr r1, _080D9B1C @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
ldr r0, _080D9B20 @ =sub_8078BB8
@@ -1444,7 +1444,7 @@ _080D9ADC:
pop {r0}
bx r0
.align 2, 0
-_080D9B1C: .4byte move_anim_8072740
+_080D9B1C: .4byte DestroyAnimSprite
_080D9B20: .4byte sub_8078BB8
thumb_func_end sub_80D9A38
@@ -1459,7 +1459,7 @@ sub_80D9B24: @ 80D9B24
cmp r1, r0
bne _080D9B3A
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9B3A:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -1473,16 +1473,16 @@ _080D9B3A:
sub_80D9B48: @ 80D9B48
push {r4-r6,lr}
adds r5, r0, 0
- ldr r4, _080D9BC4 @ =gBattleAnimBankTarget
+ ldr r4, _080D9BC4 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1495,7 +1495,7 @@ sub_80D9B48: @ 80D9B48
strh r0, [r5, 0x34]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x36]
- ldr r0, _080D9BCC @ =gUnknown_0202F7C4
+ ldr r0, _080D9BCC @ =gAnimMoveTurn
ldrb r6, [r0]
ldrb r0, [r4]
bl GetBankSide
@@ -1532,9 +1532,9 @@ _080D9BA6:
pop {r0}
bx r0
.align 2, 0
-_080D9BC4: .4byte gBattleAnimBankTarget
+_080D9BC4: .4byte gAnimBankTarget
_080D9BC8: .4byte gBattleAnimArgs
-_080D9BCC: .4byte gUnknown_0202F7C4
+_080D9BCC: .4byte gAnimMoveTurn
_080D9BD0: .4byte sub_80D9B24
thumb_func_end sub_80D9B48
@@ -1558,7 +1558,7 @@ _080D9BF0:
movs r1, 0
bl sub_8078764
_080D9BF8:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9C0C
@@ -1567,7 +1567,7 @@ _080D9BF8:
bl StartSpriteAnim
b _080D9C22
_080D9C0C:
- ldr r0, _080D9C34 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9C34 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1579,16 +1579,16 @@ _080D9C0C:
_080D9C22:
ldr r0, _080D9C38 @ =sub_8078600
str r0, [r4, 0x1C]
- ldr r1, _080D9C3C @ =move_anim_8072740
+ ldr r1, _080D9C3C @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_080D9C34: .4byte gBattleAnimBankAttacker
+_080D9C34: .4byte gAnimBankAttacker
_080D9C38: .4byte sub_8078600
-_080D9C3C: .4byte move_anim_8072740
+_080D9C3C: .4byte DestroyAnimSprite
thumb_func_end sub_80D9BD4
thumb_func_start sub_80D9C40
@@ -1619,7 +1619,7 @@ sub_80D9C40: @ 80D9C40
cmp r0, 0x28
ble _080D9C7A
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9C7A:
pop {r4}
pop {r0}
@@ -1682,7 +1682,7 @@ _080D9CDE:
ldrh r1, [r4, 0x1C]
adds r0, r1
strh r0, [r4, 0x1C]
- ldr r0, _080D9D0C @ =gBattleAnimBankTarget
+ ldr r0, _080D9D0C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1698,7 +1698,7 @@ _080D9CDE:
adds r7, r1, 0
b _080D9D24
.align 2, 0
-_080D9D0C: .4byte gBattleAnimBankTarget
+_080D9D0C: .4byte gAnimBankTarget
_080D9D10: .4byte gUnknown_030041B0
_080D9D14:
ldr r2, _080D9D64 @ =gUnknown_030041B0
diff --git a/asm/fire.s b/asm/fire.s
deleted file mode 100755
index bafe1d7e1..000000000
--- a/asm/fire.s
+++ /dev/null
@@ -1,360 +0,0 @@
- .include "constants/gba_constants.inc"
- .include "asm/macros.inc"
-
- .syntax unified
-
- .text
-
- @ fire
-
- thumb_func_start sub_80D4ED8
-sub_80D4ED8: @ 80D4ED8
- push {r4,lr}
- adds r4, r0, 0
- ldr r0, _080D4F0C @ =gBattleAnimArgs
- ldrh r0, [r0]
- strh r0, [r4, 0x2E]
- movs r0, 0x3C
- strh r0, [r4, 0x30]
- movs r0, 0x9
- strh r0, [r4, 0x32]
- movs r0, 0x1E
- strh r0, [r4, 0x34]
- movs r0, 0xFE
- lsls r0, 8
- strh r0, [r4, 0x36]
- ldr r1, _080D4F10 @ =move_anim_8072740
- adds r0, r4, 0
- bl StoreSpriteCallbackInData
- ldr r1, _080D4F14 @ =sub_8078174
- str r1, [r4, 0x1C]
- adds r0, r4, 0
- bl _call_via_r1
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D4F0C: .4byte gBattleAnimArgs
-_080D4F10: .4byte move_anim_8072740
-_080D4F14: .4byte sub_8078174
- thumb_func_end sub_80D4ED8
-
- thumb_func_start sub_80D4F18
-sub_80D4F18: @ 80D4F18
- push {r4,r5,lr}
- adds r4, r0, 0
- ldr r5, _080D4F50 @ =gBattleAnimArgs
- movs r0, 0
- ldrsh r1, [r5, r0]
- adds r0, r4, 0
- bl sub_807867C
- ldrh r0, [r5, 0x2]
- ldrh r1, [r4, 0x22]
- adds r0, r1
- strh r0, [r4, 0x22]
- ldrh r0, [r5, 0x8]
- strh r0, [r4, 0x2E]
- ldrh r0, [r5, 0x4]
- strh r0, [r4, 0x30]
- ldrh r0, [r5, 0x6]
- strh r0, [r4, 0x32]
- ldr r0, _080D4F54 @ =sub_8078394
- str r0, [r4, 0x1C]
- ldr r1, _080D4F58 @ =move_anim_8072740
- adds r0, r4, 0
- bl StoreSpriteCallbackInData
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080D4F50: .4byte gBattleAnimArgs
-_080D4F54: .4byte sub_8078394
-_080D4F58: .4byte move_anim_8072740
- thumb_func_end sub_80D4F18
-
- thumb_func_start sub_80D4F5C
-sub_80D4F5C: @ 80D4F5C
- push {r4,lr}
- adds r4, r0, 0
- bl sub_8078650
- ldr r0, _080D4F90 @ =gBattleAnimBankAttacker
- ldrb r0, [r0]
- bl GetBankSide
- lsls r0, 24
- cmp r0, 0
- beq _080D4F98
- ldr r2, _080D4F94 @ =gBattleAnimArgs
- ldrh r0, [r4, 0x20]
- ldrh r1, [r2]
- subs r0, r1
- strh r0, [r4, 0x20]
- ldrh r0, [r2, 0x2]
- ldrh r1, [r4, 0x22]
- adds r0, r1
- strh r0, [r4, 0x22]
- ldrh r0, [r2, 0x8]
- negs r0, r0
- strh r0, [r4, 0x32]
- adds r1, r2, 0
- b _080D4FAE
- .align 2, 0
-_080D4F90: .4byte gBattleAnimBankAttacker
-_080D4F94: .4byte gBattleAnimArgs
-_080D4F98:
- ldr r1, _080D4FC4 @ =gBattleAnimArgs
- ldrh r0, [r1]
- ldrh r2, [r4, 0x20]
- adds r0, r2
- strh r0, [r4, 0x20]
- ldrh r0, [r1, 0x2]
- ldrh r2, [r4, 0x22]
- adds r0, r2
- strh r0, [r4, 0x22]
- ldrh r0, [r1, 0x8]
- strh r0, [r4, 0x32]
-_080D4FAE:
- ldrh r0, [r1, 0x4]
- strh r0, [r4, 0x30]
- ldrh r0, [r1, 0x6]
- strh r0, [r4, 0x36]
- ldrh r0, [r1, 0xA]
- strh r0, [r4, 0x34]
- ldr r0, _080D4FC8 @ =sub_80D5038
- str r0, [r4, 0x1C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D4FC4: .4byte gBattleAnimArgs
-_080D4FC8: .4byte sub_80D5038
- thumb_func_end sub_80D4F5C
-
- thumb_func_start sub_80D4FCC
-sub_80D4FCC: @ 80D4FCC
- push {r4,lr}
- adds r4, r0, 0
- ldr r0, _080D4FF8 @ =gBattleAnimBankAttacker
- ldrb r0, [r0]
- bl GetBankSide
- lsls r0, 24
- cmp r0, 0
- beq _080D5000
- ldr r2, _080D4FFC @ =gBattleAnimArgs
- ldrh r0, [r4, 0x20]
- ldrh r1, [r2]
- subs r0, r1
- strh r0, [r4, 0x20]
- ldrh r0, [r2, 0x2]
- ldrh r1, [r4, 0x22]
- adds r0, r1
- strh r0, [r4, 0x22]
- ldrh r0, [r2, 0x8]
- strh r0, [r4, 0x32]
- adds r1, r2, 0
- b _080D5018
- .align 2, 0
-_080D4FF8: .4byte gBattleAnimBankAttacker
-_080D4FFC: .4byte gBattleAnimArgs
-_080D5000:
- ldr r1, _080D5030 @ =gBattleAnimArgs
- ldrh r0, [r1]
- ldrh r2, [r4, 0x20]
- adds r0, r2
- strh r0, [r4, 0x20]
- ldrh r0, [r1, 0x2]
- ldrh r2, [r4, 0x22]
- adds r0, r2
- strh r0, [r4, 0x22]
- ldrh r0, [r1, 0x8]
- negs r0, r0
- strh r0, [r4, 0x32]
-_080D5018:
- ldrh r0, [r1, 0x4]
- strh r0, [r4, 0x30]
- ldrh r0, [r1, 0x6]
- strh r0, [r4, 0x36]
- ldrh r0, [r1, 0xA]
- strh r0, [r4, 0x34]
- ldr r0, _080D5034 @ =sub_80D5038
- str r0, [r4, 0x1C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D5030: .4byte gBattleAnimArgs
-_080D5034: .4byte sub_80D5038
- thumb_func_end sub_80D4FCC
-
- thumb_func_start sub_80D5038
-sub_80D5038: @ 80D5038
- push {lr}
- adds r2, r0, 0
- ldrh r0, [r2, 0x2E]
- adds r0, 0x1
- strh r0, [r2, 0x2E]
- lsls r0, 16
- asrs r0, 16
- movs r3, 0x36
- ldrsh r1, [r2, r3]
- cmp r0, r1
- bge _080D505E
- ldrh r0, [r2, 0x32]
- ldrh r1, [r2, 0x24]
- adds r0, r1
- strh r0, [r2, 0x24]
- ldrh r0, [r2, 0x34]
- ldrh r3, [r2, 0x26]
- adds r0, r3
- strh r0, [r2, 0x26]
-_080D505E:
- movs r0, 0x2E
- ldrsh r1, [r2, r0]
- movs r3, 0x30
- ldrsh r0, [r2, r3]
- cmp r1, r0
- bne _080D5070
- adds r0, r2, 0
- bl move_anim_8074EE0
-_080D5070:
- pop {r0}
- bx r0
- thumb_func_end sub_80D5038
-
- thumb_func_start sub_80D5074
-sub_80D5074: @ 80D5074
- push {r4,lr}
- adds r4, r0, 0
- bl sub_8078650
- ldr r0, _080D5098 @ =gBattleAnimBankAttacker
- ldrb r0, [r0]
- bl GetBankSide
- lsls r0, 24
- cmp r0, 0
- beq _080D50A0
- ldr r0, _080D509C @ =gBattleAnimArgs
- ldrh r1, [r4, 0x20]
- ldrh r2, [r0]
- subs r1, r2
- strh r1, [r4, 0x20]
- b _080D50B2
- .align 2, 0
-_080D5098: .4byte gBattleAnimBankAttacker
-_080D509C: .4byte gBattleAnimArgs
-_080D50A0:
- ldr r0, _080D50E0 @ =gBattleAnimArgs
- ldrh r1, [r0]
- ldrh r2, [r4, 0x20]
- adds r1, r2
- strh r1, [r4, 0x20]
- adds r2, r4, 0
- adds r2, 0x43
- movs r1, 0x8
- strb r1, [r2]
-_080D50B2:
- adds r2, r0, 0
- ldrh r0, [r2, 0x2]
- ldrh r1, [r4, 0x22]
- adds r0, r1
- movs r1, 0
- strh r0, [r4, 0x22]
- ldrh r0, [r2, 0x4]
- strh r0, [r4, 0x2E]
- ldrh r0, [r2, 0x6]
- strh r0, [r4, 0x30]
- ldrh r0, [r2, 0x8]
- strh r0, [r4, 0x32]
- ldrh r0, [r2, 0xA]
- strh r0, [r4, 0x34]
- ldrh r0, [r2, 0xC]
- strh r0, [r4, 0x36]
- strh r1, [r4, 0x38]
- ldr r0, _080D50E4 @ =sub_80D50E8
- str r0, [r4, 0x1C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D50E0: .4byte gBattleAnimArgs
-_080D50E4: .4byte sub_80D50E8
- thumb_func_end sub_80D5074
-
- thumb_func_start sub_80D50E8
-sub_80D50E8: @ 80D50E8
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x34
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _080D5170
- movs r2, 0x38
- ldrsh r1, [r4, r2]
- ldr r0, _080D5154 @ =0x00002710
- cmp r1, r0
- ble _080D5106
- adds r1, r4, 0
- adds r1, 0x43
- movs r0, 0x1
- strb r0, [r1]
-_080D5106:
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- ldrh r1, [r4, 0x38]
- lsls r1, 16
- asrs r1, 24
- ldrh r2, [r4, 0x30]
- adds r1, r2
- lsls r1, 16
- asrs r1, 16
- bl Sin
- strh r0, [r4, 0x24]
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- ldrh r1, [r4, 0x38]
- lsls r1, 16
- asrs r1, 24
- ldrh r2, [r4, 0x30]
- adds r1, r2
- lsls r1, 16
- asrs r1, 16
- bl Cos
- strh r0, [r4, 0x26]
- ldrh r0, [r4, 0x32]
- ldrh r2, [r4, 0x2E]
- adds r1, r0, r2
- strh r1, [r4, 0x2E]
- ldrh r0, [r4, 0x36]
- ldrh r2, [r4, 0x38]
- adds r0, r2
- strh r0, [r4, 0x38]
- lsls r0, r1, 16
- asrs r0, 16
- cmp r0, 0xFF
- ble _080D515C
- ldr r2, _080D5158 @ =0xffffff00
- b _080D5164
- .align 2, 0
-_080D5154: .4byte 0x00002710
-_080D5158: .4byte 0xffffff00
-_080D515C:
- cmp r0, 0
- bge _080D5168
- movs r2, 0x80
- lsls r2, 1
-_080D5164:
- adds r0, r1, r2
- strh r0, [r4, 0x2E]
-_080D5168:
- ldrh r0, [r4, 0x34]
- subs r0, 0x1
- strh r0, [r4, 0x34]
- b _080D5176
-_080D5170:
- adds r0, r4, 0
- bl move_anim_8074EE0
-_080D5176:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_80D50E8
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/fire_2.s b/asm/fire_2.s
deleted file mode 100755
index b96962bdf..000000000
--- a/asm/fire_2.s
+++ /dev/null
@@ -1,955 +0,0 @@
- .include "constants/gba_constants.inc"
- .include "asm/macros.inc"
-
- .syntax unified
-
- .text
-
- @ fire_2
-
- thumb_func_start sub_80D51A8
-sub_80D51A8: @ 80D51A8
- push {r4-r6,lr}
- adds r6, r0, 0
- ldr r5, _080D5200 @ =gBattleAnimBankAttacker
- ldrb r0, [r5]
- bl GetBankSide
- adds r4, r0, 0
- ldr r0, _080D5204 @ =gBattleAnimBankTarget
- ldrb r0, [r0]
- bl GetBankSide
- lsls r4, 24
- lsls r0, 24
- cmp r4, r0
- bne _080D51EE
- movs r0, 0x2
- bl GetBankByPlayerAI
- ldrb r1, [r5]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- beq _080D51E6
- movs r0, 0x3
- bl GetBankByPlayerAI
- ldrb r1, [r5]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- bne _080D51EE
-_080D51E6:
- ldr r1, _080D5208 @ =gBattleAnimArgs
- ldrh r0, [r1, 0x4]
- negs r0, r0
- strh r0, [r1, 0x4]
-_080D51EE:
- ldr r1, _080D520C @ =sub_8079534
- str r1, [r6, 0x1C]
- adds r0, r6, 0
- bl _call_via_r1
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080D5200: .4byte gBattleAnimBankAttacker
-_080D5204: .4byte gBattleAnimBankTarget
-_080D5208: .4byte gBattleAnimArgs
-_080D520C: .4byte sub_8079534
- thumb_func_end sub_80D51A8
-
- thumb_func_start sub_80D5210
-sub_80D5210: @ 80D5210
- ldr r2, _080D5224 @ =gBattleAnimArgs
- ldrh r1, [r2]
- negs r1, r1
- strh r1, [r2]
- ldrh r1, [r2, 0x4]
- negs r1, r1
- strh r1, [r2, 0x4]
- ldr r1, _080D5228 @ =sub_8079534
- str r1, [r0, 0x1C]
- bx lr
- .align 2, 0
-_080D5224: .4byte gBattleAnimArgs
-_080D5228: .4byte sub_8079534
- thumb_func_end sub_80D5210
-
- thumb_func_start sub_80D522C
-sub_80D522C: @ 80D522C
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x1
- bl sub_80787B0
- ldr r0, _080D524C @ =gBattleAnimArgs
- ldrh r0, [r0, 0x4]
- movs r1, 0
- strh r0, [r4, 0x3C]
- strh r1, [r4, 0x2E]
- ldr r0, _080D5250 @ =sub_80D5254
- str r0, [r4, 0x1C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D524C: .4byte gBattleAnimArgs
-_080D5250: .4byte sub_80D5254
- thumb_func_end sub_80D522C
-
- thumb_func_start sub_80D5254
-sub_80D5254: @ 80D5254
- push {r4,r5,lr}
- adds r5, r0, 0
- bl sub_80D5348
- ldrh r0, [r5, 0x2E]
- adds r0, 0x1
- strh r0, [r5, 0x2E]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x12
- bne _080D529E
- movs r0, 0x19
- strh r0, [r5, 0x2E]
- ldrh r0, [r5, 0x20]
- strh r0, [r5, 0x30]
- ldr r4, _080D52A4 @ =gBattleAnimBankTarget
- ldrb r0, [r4]
- movs r1, 0x2
- bl sub_8077ABC
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r5, 0x32]
- ldrh r0, [r5, 0x22]
- strh r0, [r5, 0x34]
- ldrb r0, [r4]
- movs r1, 0x3
- bl sub_8077ABC
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r5, 0x36]
- adds r0, r5, 0
- bl obj_translate_based_on_private_1_2_3_4
- ldr r0, _080D52A8 @ =sub_80D52AC
- str r0, [r5, 0x1C]
-_080D529E:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080D52A4: .4byte gBattleAnimBankTarget
-_080D52A8: .4byte sub_80D52AC
- thumb_func_end sub_80D5254
-
- thumb_func_start sub_80D52AC
-sub_80D52AC: @ 80D52AC
- push {r4-r6,lr}
- adds r6, r0, 0
- bl sub_8078B5C
- lsls r0, 24
- cmp r0, 0
- beq _080D52F4
- movs r4, 0
- strh r4, [r6, 0x2E]
- ldr r5, _080D52EC @ =gBattleAnimBankTarget
- ldrb r0, [r5]
- movs r1, 0x2
- bl sub_8077ABC
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r6, 0x20]
- ldrb r0, [r5]
- movs r1, 0x3
- bl sub_8077ABC
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r6, 0x22]
- strh r4, [r6, 0x26]
- strh r4, [r6, 0x24]
- ldr r1, _080D52F0 @ =sub_80D5324
- str r1, [r6, 0x1C]
- adds r0, r6, 0
- bl _call_via_r1
- b _080D531E
- .align 2, 0
-_080D52EC: .4byte gBattleAnimBankTarget
-_080D52F0: .4byte sub_80D5324
-_080D52F4:
- movs r1, 0x3C
- ldrsh r0, [r6, r1]
- movs r1, 0x1C
- bl Sin
- ldrh r1, [r6, 0x24]
- adds r0, r1
- strh r0, [r6, 0x24]
- movs r1, 0x3C
- ldrsh r0, [r6, r1]
- movs r1, 0x1C
- bl Cos
- ldrh r1, [r6, 0x26]
- adds r0, r1
- strh r0, [r6, 0x26]
- ldrh r0, [r6, 0x3C]
- adds r0, 0x14
- movs r1, 0xFF
- ands r0, r1
- strh r0, [r6, 0x3C]
-_080D531E:
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_80D52AC
-
- thumb_func_start sub_80D5324
-sub_80D5324: @ 80D5324
- push {r4,lr}
- adds r4, r0, 0
- bl sub_80D5348
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x1F
- bne _080D5340
- adds r0, r4, 0
- bl move_anim_8072740
-_080D5340:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_80D5324
-
- thumb_func_start sub_80D5348
-sub_80D5348: @ 80D5348
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x3C
- ldrsh r0, [r4, r1]
- movs r1, 0x1C
- bl Sin
- strh r0, [r4, 0x24]
- movs r1, 0x3C
- ldrsh r0, [r4, r1]
- movs r1, 0x1C
- bl Cos
- strh r0, [r4, 0x26]
- ldrh r0, [r4, 0x3C]
- adds r0, 0x14
- movs r1, 0xFF
- ands r0, r1
- strh r0, [r4, 0x3C]
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_80D5348
-
- thumb_func_start sub_80D5374
-sub_80D5374: @ 80D5374
- push {r4,lr}
- adds r4, r0, 0
- ldr r1, _080D53A8 @ =gBattleAnimArgs
- ldrh r0, [r1]
- ldrh r2, [r4, 0x20]
- adds r0, r2
- strh r0, [r4, 0x20]
- ldrh r0, [r1, 0x2]
- ldrh r2, [r4, 0x22]
- adds r0, r2
- strh r0, [r4, 0x22]
- ldrh r0, [r1, 0x4]
- strh r0, [r4, 0x2E]
- ldrh r0, [r1, 0x6]
- strh r0, [r4, 0x30]
- ldrh r0, [r1, 0x8]
- strh r0, [r4, 0x32]
- ldr r1, _080D53AC @ =move_anim_8072740
- adds r0, r4, 0
- bl StoreSpriteCallbackInData
- ldr r0, _080D53B0 @ =sub_8078364
- str r0, [r4, 0x1C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D53A8: .4byte gBattleAnimArgs
-_080D53AC: .4byte move_anim_8072740
-_080D53B0: .4byte sub_8078364
- thumb_func_end sub_80D5374
-
- thumb_func_start sub_80D53B4
-sub_80D53B4: @ 80D53B4
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x1
- bl sub_80787B0
- ldr r1, _080D53E8 @ =gBattleAnimArgs
- ldrh r0, [r1, 0x4]
- strh r0, [r4, 0x30]
- ldrh r0, [r1, 0x6]
- strh r0, [r4, 0x2E]
- adds r2, r4, 0
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- ldr r0, _080D53EC @ =sub_80782D8
- str r0, [r4, 0x1C]
- ldr r1, _080D53F0 @ =sub_80D53F4
- adds r0, r4, 0
- bl StoreSpriteCallbackInData
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D53E8: .4byte gBattleAnimArgs
-_080D53EC: .4byte sub_80782D8
-_080D53F0: .4byte sub_80D53F4
- thumb_func_end sub_80D53B4
-
- thumb_func_start sub_80D53F4
-sub_80D53F4: @ 80D53F4
- push {lr}
- adds r3, r0, 0
- adds r3, 0x3E
- ldrb r2, [r3]
- movs r1, 0x5
- negs r1, r1
- ands r1, r2
- strb r1, [r3]
- ldrh r1, [r0, 0x30]
- movs r2, 0
- strh r1, [r0, 0x2E]
- strh r2, [r0, 0x30]
- ldr r1, _080D5418 @ =sub_80D541C
- str r1, [r0, 0x1C]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_080D5418: .4byte sub_80D541C
- thumb_func_end sub_80D53F4
-
- thumb_func_start sub_80D541C
-sub_80D541C: @ 80D541C
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x30
- ldrsh r0, [r4, r1]
- ldrh r1, [r4, 0x32]
- lsls r1, 16
- asrs r1, 24
- bl Sin
- strh r0, [r4, 0x24]
- movs r1, 0x30
- ldrsh r0, [r4, r1]
- ldrh r1, [r4, 0x32]
- lsls r1, 16
- asrs r1, 24
- bl Cos
- strh r0, [r4, 0x26]
- ldrh r0, [r4, 0x30]
- adds r0, 0xA
- movs r1, 0xFF
- ands r0, r1
- strh r0, [r4, 0x30]
- ldrh r0, [r4, 0x32]
- adds r0, 0xD0
- strh r0, [r4, 0x32]
- ldrh r0, [r4, 0x2E]
- subs r0, 0x1
- strh r0, [r4, 0x2E]
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- negs r1, r1
- cmp r0, r1
- bne _080D5468
- adds r0, r4, 0
- bl move_anim_8072740
-_080D5468:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_80D541C
-
- thumb_func_start sub_80D5470
-sub_80D5470: @ 80D5470
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r4, r0, 2
- adds r4, r0
- lsls r4, 3
- ldr r0, _080D54D0 @ =gTasks
- adds r4, r0
- movs r0, 0
- bl GetAnimBankSpriteId
- lsls r0, 24
- lsrs r0, 24
- movs r5, 0
- strh r0, [r4, 0x26]
- strh r5, [r4, 0x8]
- strh r5, [r4, 0xA]
- strh r5, [r4, 0xC]
- strh r5, [r4, 0xE]
- ldr r2, _080D54D4 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r0, [r0, 0x22]
- strh r0, [r4, 0x10]
- ldr r0, _080D54D8 @ =gBattleAnimBankAttacker
- ldrb r0, [r0]
- bl GetBankSide
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r4, 0x12]
- strh r5, [r4, 0x14]
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0
- bl sub_8078E70
- ldr r0, _080D54DC @ =sub_80D54E0
- str r0, [r4]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080D54D0: .4byte gTasks
-_080D54D4: .4byte gSprites
-_080D54D8: .4byte gBattleAnimBankAttacker
-_080D54DC: .4byte sub_80D54E0
- thumb_func_end sub_80D5470
-
- thumb_func_start sub_80D54E0
-sub_80D54E0: @ 80D54E0
- push {r4,r5,lr}
- sub sp, 0xC
- lsls r0, 24
- lsrs r5, r0, 24
- lsls r0, r5, 2
- adds r0, r5
- lsls r0, 3
- ldr r1, _080D5508 @ =gTasks
- adds r4, r0, r1
- movs r1, 0x8
- ldrsh r0, [r4, r1]
- cmp r0, 0x6
- bls _080D54FC
- b _080D57BA
-_080D54FC:
- lsls r0, 2
- ldr r1, _080D550C @ =_080D5510
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_080D5508: .4byte gTasks
-_080D550C: .4byte _080D5510
- .align 2, 0
-_080D5510:
- .4byte _080D552C
- .4byte _080D5552
- .4byte _080D5604
- .4byte _080D5664
- .4byte _080D5682
- .4byte _080D5758
- .4byte _080D57AC
-_080D552C:
- ldrh r1, [r4, 0x26]
- lsls r1, 24
- lsrs r1, 24
- movs r3, 0x80
- lsls r3, 1
- movs r0, 0xE0
- str r0, [sp]
- movs r0, 0x80
- lsls r0, 2
- str r0, [sp, 0x4]
- movs r0, 0x20
- str r0, [sp, 0x8]
- adds r0, r4, 0
- adds r2, r3, 0
- bl sub_8079C08
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
-_080D5552:
- ldrh r0, [r4, 0xA]
- adds r0, 0x1
- strh r0, [r4, 0xA]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x1
- ble _080D559A
- movs r0, 0
- strh r0, [r4, 0xA]
- ldrh r0, [r4, 0xC]
- adds r0, 0x1
- strh r0, [r4, 0xC]
- movs r1, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080D5588
- ldr r2, _080D5584 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- movs r1, 0x3
- b _080D5598
- .align 2, 0
-_080D5584: .4byte gSprites
-_080D5588:
- ldr r2, _080D55FC @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldr r1, _080D5600 @ =0x0000fffd
-_080D5598:
- strh r1, [r0, 0x24]
-_080D559A:
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _080D55C8
- ldrh r0, [r4, 0xE]
- adds r0, 0x1
- strh r0, [r4, 0xE]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _080D55C8
- movs r0, 0
- strh r0, [r4, 0xE]
- ldr r2, _080D55FC @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r0, 0x22]
- adds r1, 0x1
- strh r1, [r0, 0x22]
-_080D55C8:
- adds r0, r4, 0
- bl sub_8079C74
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0
- beq _080D55D8
- b _080D57BA
-_080D55D8:
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- bl sub_8079A64
- ldr r2, _080D55FC @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- strh r5, [r0, 0x24]
- strh r5, [r4, 0xA]
- strh r5, [r4, 0xC]
- strh r5, [r4, 0xE]
- b _080D57A0
- .align 2, 0
-_080D55FC: .4byte gSprites
-_080D5600: .4byte 0x0000fffd
-_080D5604:
- ldrh r0, [r4, 0xA]
- adds r0, 0x1
- strh r0, [r4, 0xA]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x4
- bgt _080D5614
- b _080D57BA
-_080D5614:
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _080D563E
- ldrh r1, [r4, 0x26]
- lsls r1, 24
- lsrs r1, 24
- movs r3, 0x80
- lsls r3, 2
- movs r0, 0xC0
- lsls r0, 1
- str r0, [sp]
- movs r0, 0xF0
- str r0, [sp, 0x4]
- movs r0, 0x6
- str r0, [sp, 0x8]
- adds r0, r4, 0
- movs r2, 0xE0
- bl sub_8079C08
- b _080D565E
-_080D563E:
- ldrh r1, [r4, 0x26]
- lsls r1, 24
- lsrs r1, 24
- movs r3, 0x80
- lsls r3, 2
- movs r0, 0xC0
- lsls r0, 1
- str r0, [sp]
- movs r0, 0xC0
- str r0, [sp, 0x4]
- movs r0, 0x6
- str r0, [sp, 0x8]
- adds r0, r4, 0
- movs r2, 0xE0
- bl sub_8079C08
-_080D565E:
- movs r0, 0
- strh r0, [r4, 0xA]
- b _080D57A0
-_080D5664:
- adds r0, r4, 0
- bl sub_8079C74
- lsls r0, 24
- cmp r0, 0
- beq _080D5672
- b _080D57BA
-_080D5672:
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- adds r1, r5, 0
- movs r2, 0x6
- bl sub_80D57C4
- b _080D57A0
-_080D5682:
- ldrh r0, [r4, 0xA]
- adds r0, 0x1
- strh r0, [r4, 0xA]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x1
- ble _080D56D0
- movs r0, 0
- strh r0, [r4, 0xA]
- ldrh r0, [r4, 0xC]
- adds r0, 0x1
- strh r0, [r4, 0xC]
- movs r1, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080D56BC
- ldr r2, _080D56B8 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r0, 0x26]
- adds r1, 0x3
- b _080D56CE
- .align 2, 0
-_080D56B8: .4byte gSprites
-_080D56BC:
- ldr r2, _080D5708 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r0, 0x26]
- subs r1, 0x3
-_080D56CE:
- strh r1, [r0, 0x26]
-_080D56D0:
- ldrh r0, [r4, 0xE]
- adds r0, 0x1
- strh r0, [r4, 0xE]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x18
- ble _080D57BA
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _080D570C
- ldrh r1, [r4, 0x26]
- lsls r1, 24
- lsrs r1, 24
- movs r2, 0xC0
- lsls r2, 1
- movs r0, 0x80
- lsls r0, 1
- str r0, [sp]
- str r0, [sp, 0x4]
- movs r0, 0x8
- str r0, [sp, 0x8]
- adds r0, r4, 0
- movs r3, 0xF0
- bl sub_8079C08
- b _080D572A
- .align 2, 0
-_080D5708: .4byte gSprites
-_080D570C:
- ldrh r1, [r4, 0x26]
- lsls r1, 24
- lsrs r1, 24
- movs r2, 0xC0
- lsls r2, 1
- movs r0, 0x80
- lsls r0, 1
- str r0, [sp]
- str r0, [sp, 0x4]
- movs r0, 0x8
- str r0, [sp, 0x8]
- adds r0, r4, 0
- movs r3, 0xC0
- bl sub_8079C08
-_080D572A:
- ldrh r1, [r4, 0xC]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080D5748
- ldr r2, _080D5754 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r0, 0x26]
- subs r1, 0x3
- strh r1, [r0, 0x26]
-_080D5748:
- movs r0, 0
- strh r0, [r4, 0xA]
- strh r0, [r4, 0xC]
- strh r0, [r4, 0xE]
- b _080D57A0
- .align 2, 0
-_080D5754: .4byte gSprites
-_080D5758:
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _080D5774
- ldr r2, _080D57A8 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r0, 0x22]
- subs r1, 0x1
- strh r1, [r0, 0x22]
-_080D5774:
- adds r0, r4, 0
- bl sub_8079C74
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0
- bne _080D57BA
- ldr r2, _080D57A8 @ =gSprites
- movs r0, 0x26
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r1, [r4, 0x10]
- strh r1, [r0, 0x22]
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- bl sub_8078F40
- strh r5, [r4, 0xC]
-_080D57A0:
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- b _080D57BA
- .align 2, 0
-_080D57A8: .4byte gSprites
-_080D57AC:
- movs r1, 0x14
- ldrsh r0, [r4, r1]
- cmp r0, 0
- bne _080D57BA
- adds r0, r5, 0
- bl DestroyAnimVisualTask
-_080D57BA:
- add sp, 0xC
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_80D54E0
-
- thumb_func_start sub_80D57C4
-sub_80D57C4: @ 80D57C4
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0xC
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r1, 24
- lsrs r7, r1, 24
- lsls r2, 24
- lsrs r2, 24
- mov r8, r2
- adds r0, r4, 0
- bl sub_80D5940
- lsls r0, 16
- lsrs r0, 16
- mov r9, r0
- ldr r1, _080D5814 @ =gSprites
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- adds r0, r1
- ldrh r4, [r0, 0x20]
- ldr r0, _080D5818 @ =gBattleAnimBankAttacker
- ldrb r0, [r0]
- bl GetBankSide
- lsls r0, 24
- cmp r0, 0
- bne _080D581C
- adds r0, r4, 0
- subs r0, 0xC
- lsls r0, 16
- lsrs r4, r0, 16
- movs r0, 0x1
- b _080D5826
- .align 2, 0
-_080D5814: .4byte gSprites
-_080D5818: .4byte gBattleAnimBankAttacker
-_080D581C:
- adds r0, r4, 0
- adds r0, 0x10
- lsls r0, 16
- lsrs r4, r0, 16
- movs r0, 0xFF
-_080D5826:
- movs r6, 0
- movs r5, 0
- lsls r4, 16
- str r4, [sp, 0x8]
- mov r1, r9
- lsls r1, 16
- str r1, [sp, 0x4]
- ldr r2, _080D58E0 @ =gUnknown_083D96DC
- mov r9, r2
- lsls r0, 24
- asrs r0, 24
- str r0, [sp]
- mov r3, r8
- lsls r3, 1
- mov r10, r3
-_080D5844:
- ldr r0, _080D58E4 @ =gSpriteTemplate_83D96C4
- ldr r2, [sp, 0x8]
- asrs r1, r2, 16
- ldr r3, [sp, 0x4]
- asrs r2, r3, 16
- movs r3, 0x2
- bl CreateSprite
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0x40
- beq _080D58C6
- ldr r1, _080D58E8 @ =gSprites
- lsls r0, r2, 4
- adds r0, r2
- lsls r0, 2
- adds r4, r0, r1
- ldrh r2, [r4, 0x4]
- lsls r1, r2, 22
- lsrs r1, 22
- lsls r0, r5, 2
- adds r0, 0x40
- adds r1, r0
- ldr r3, _080D58EC @ =0x000003ff
- adds r0, r3, 0
- ands r1, r0
- ldr r3, _080D58F0 @ =0xfffffc00
- adds r0, r3, 0
- ands r2, r0
- orrs r2, r1
- strh r2, [r4, 0x4]
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- cmp r5, 0x4
- bls _080D588E
- movs r5, 0
-_080D588E:
- lsls r2, r6, 2
- mov r1, r9
- adds r0, r2, r1
- ldrh r0, [r0]
- ldr r3, [sp]
- adds r1, r0, 0
- muls r1, r3
- lsls r1, 16
- asrs r1, 16
- ldr r0, _080D58F4 @ =gUnknown_083D96DC + 0x2
- adds r2, r0
- movs r3, 0
- ldrsh r2, [r2, r3]
- adds r0, r4, 0
- bl sub_80D5994
- strh r7, [r4, 0x3A]
- mov r0, r8
- strh r0, [r4, 0x3C]
- lsls r0, r7, 2
- adds r0, r7
- lsls r0, 3
- add r0, r10
- ldr r1, _080D58F8 @ =gTasks + 0x8
- adds r0, r1
- ldrh r1, [r0]
- adds r1, 0x1
- strh r1, [r0]
-_080D58C6:
- adds r0, r6, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- cmp r6, 0x6
- bls _080D5844
- add sp, 0xC
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080D58E0: .4byte gUnknown_083D96DC
-_080D58E4: .4byte gSpriteTemplate_83D96C4
-_080D58E8: .4byte gSprites
-_080D58EC: .4byte 0x000003ff
-_080D58F0: .4byte 0xfffffc00
-_080D58F4: .4byte gUnknown_083D96DC + 0x2
-_080D58F8: .4byte gTasks + 0x8
- thumb_func_end sub_80D57C4
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/flying.s b/asm/flying.s
index cf0b1053c..99cb11913 100755
--- a/asm/flying.s
+++ b/asm/flying.s
@@ -56,7 +56,7 @@ sub_80DA05C: @ 80DA05C
cmp r0, 0x47
bne _080DA096
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DA096:
pop {r4}
pop {r0}
@@ -175,7 +175,7 @@ sub_80DA16C: @ 80DA16C
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DA1D8 @ =gBattleAnimBankAttacker
+ ldr r0, _080DA1D8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -191,10 +191,10 @@ _080DA18C:
strh r0, [r6, 0x2E]
ldrh r0, [r6, 0x20]
strh r0, [r6, 0x30]
- ldr r5, _080DA1E0 @ =gBattleAnimBankTarget
+ ldr r5, _080DA1E0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -204,7 +204,7 @@ _080DA18C:
strh r0, [r6, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -221,9 +221,9 @@ _080DA18C:
pop {r0}
bx r0
.align 2, 0
-_080DA1D8: .4byte gBattleAnimBankAttacker
+_080DA1D8: .4byte gAnimBankAttacker
_080DA1DC: .4byte gBattleAnimArgs
-_080DA1E0: .4byte gBattleAnimBankTarget
+_080DA1E0: .4byte gAnimBankTarget
_080DA1E4: .4byte sub_80785E4
_080DA1E8: .4byte sub_80DA1EC
thumb_func_end sub_80DA16C
@@ -237,7 +237,7 @@ sub_80DA1EC: @ 80DA1EC
cmp r0, 0
beq _080DA200
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DA200:
pop {r4}
pop {r0}
@@ -248,7 +248,7 @@ _080DA200:
sub_80DA208: @ 80DA208
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DA2A4 @ =gBattleAnimBankAttacker
+ ldr r4, _080DA2A4 @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -268,7 +268,7 @@ sub_80DA208: @ 80DA208
negs r0, r0
strh r0, [r1, 0x6]
_080DA234:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DA24C
@@ -282,13 +282,13 @@ _080DA234:
_080DA24C:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r2, _080DA2A8 @ =gBattleAnimArgs
ldrh r1, [r2]
@@ -305,26 +305,26 @@ _080DA24C:
ldrsh r0, [r2, r3]
cmp r0, 0
bne _080DA2B0
- ldr r4, _080DA2AC @ =gBattleAnimBankTarget
+ ldr r4, _080DA2AC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _080DA2C2
.align 2, 0
-_080DA2A4: .4byte gBattleAnimBankAttacker
+_080DA2A4: .4byte gAnimBankAttacker
_080DA2A8: .4byte gBattleAnimArgs
-_080DA2AC: .4byte gBattleAnimBankTarget
+_080DA2AC: .4byte gAnimBankTarget
_080DA2B0:
- ldr r0, _080DA2F0 @ =gBattleAnimBankTarget
+ ldr r0, _080DA2F0 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -344,7 +344,7 @@ _080DA2C2:
strh r0, [r5, 0x36]
ldr r0, _080DA2F8 @ =sub_8078B34
str r0, [r5, 0x1C]
- ldr r1, _080DA2FC @ =move_anim_8072740
+ ldr r1, _080DA2FC @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
ldrb r1, [r4, 0xA]
@@ -354,10 +354,10 @@ _080DA2C2:
pop {r0}
bx r0
.align 2, 0
-_080DA2F0: .4byte gBattleAnimBankTarget
+_080DA2F0: .4byte gAnimBankTarget
_080DA2F4: .4byte gBattleAnimArgs
_080DA2F8: .4byte sub_8078B34
-_080DA2FC: .4byte move_anim_8072740
+_080DA2FC: .4byte DestroyAnimSprite
thumb_func_end sub_80DA208
thumb_func_start sub_80DA300
@@ -429,7 +429,7 @@ _080DA36E:
cmp r0, r1
bge _080DA386
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DA386:
pop {r0}
bx r0
@@ -439,7 +439,7 @@ _080DA386:
sub_80DA38C: @ 80DA38C
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, _080DA3B4 @ =gBattleAnimBankAttacker
+ ldr r0, _080DA3B4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -455,7 +455,7 @@ sub_80DA38C: @ 80DA38C
bl StartSpriteAffineAnim
b _080DA3C2
.align 2, 0
-_080DA3B4: .4byte gBattleAnimBankAttacker
+_080DA3B4: .4byte gAnimBankAttacker
_080DA3B8: .4byte 0x0000ffe0
_080DA3BC:
ldr r0, _080DA400 @ =0x0000ffe0
@@ -467,10 +467,10 @@ _080DA3C2:
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080DA408 @ =gBattleAnimBankTarget
+ ldr r4, _080DA408 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -478,7 +478,7 @@ _080DA3C2:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -492,7 +492,7 @@ _080DA3C2:
.align 2, 0
_080DA400: .4byte 0x0000ffe0
_080DA404: .4byte gBattleAnimArgs
-_080DA408: .4byte gBattleAnimBankTarget
+_080DA408: .4byte gAnimBankTarget
_080DA40C: .4byte sub_80DA410
thumb_func_end sub_80DA38C
@@ -552,7 +552,7 @@ _080DA45A:
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DA480:
pop {r4}
pop {r0}
@@ -617,13 +617,13 @@ sub_80DA4D8: @ 80DA4D8
ands r0, r1
cmp r0, 0
beq _080DA500
- ldr r0, _080DA4FC @ =gBattleAnimBankAttacker
+ ldr r0, _080DA4FC @ =gAnimBankAttacker
b _080DA502
.align 2, 0
_080DA4F8: .4byte gBattleAnimArgs
-_080DA4FC: .4byte gBattleAnimBankAttacker
+_080DA4FC: .4byte gAnimBankAttacker
_080DA500:
- ldr r0, _080DA5B0 @ =gBattleAnimBankTarget
+ ldr r0, _080DA5B0 @ =gAnimBankTarget
_080DA502:
ldrb r6, [r0]
adds r0, r6, 0
@@ -638,7 +638,7 @@ _080DA502:
_080DA518:
adds r0, r6, 0
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r4, _080DA5B4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -647,7 +647,7 @@ _080DA518:
strh r0, [r7, 0x20]
adds r0, r6, 0
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldrh r1, [r4, 0x2]
lsrs r0, 24
@@ -710,7 +710,7 @@ _080DA518:
strb r1, [r7, 0x5]
b _080DA5D8
.align 2, 0
-_080DA5B0: .4byte gBattleAnimBankTarget
+_080DA5B0: .4byte gAnimBankTarget
_080DA5B4: .4byte gBattleAnimArgs
_080DA5B8: .4byte gMain
_080DA5BC: .4byte 0x0000043d
@@ -1718,7 +1718,7 @@ _080DAD2C: .4byte sub_80DA48C
sub_80DAD30: @ 80DAD30
push {r4,r5,lr}
adds r4, r0, 0
- ldr r0, _080DAD78 @ =gBattleAnimBankTarget
+ ldr r0, _080DAD78 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -1730,16 +1730,16 @@ sub_80DAD30: @ 80DAD30
ands r0, r2
orrs r0, r1
strb r0, [r4, 0x5]
- ldr r5, _080DAD7C @ =gBattleAnimBankAttacker
+ ldr r5, _080DAD7C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1749,8 +1749,8 @@ sub_80DAD30: @ 80DAD30
pop {r0}
bx r0
.align 2, 0
-_080DAD78: .4byte gBattleAnimBankTarget
-_080DAD7C: .4byte gBattleAnimBankAttacker
+_080DAD78: .4byte gAnimBankTarget
+_080DAD7C: .4byte gAnimBankAttacker
_080DAD80: .4byte sub_807941C
thumb_func_end sub_80DAD30
@@ -1774,7 +1774,7 @@ sub_80DAD84: @ 80DAD84
cmp r0, 0
beq _080DAE44
ldr r0, _080DADD8 @ =gBanksBySide
- ldr r1, _080DADDC @ =gBattleAnimBankTarget
+ ldr r1, _080DADDC @ =gAnimBankTarget
ldrb r2, [r1]
adds r0, r2, r0
ldrb r1, [r0]
@@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84
beq _080DADE0
adds r0, r2, 0
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -1795,11 +1795,11 @@ _080DADCC: .4byte gBattleAnimArgs
_080DADD0: .4byte gMain
_080DADD4: .4byte 0x0000043d
_080DADD8: .4byte gBanksBySide
-_080DADDC: .4byte gBattleAnimBankTarget
+_080DADDC: .4byte gAnimBankTarget
_080DADE0:
adds r0, r2, 0
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -1810,7 +1810,7 @@ _080DADEE:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080DAE24
- ldr r0, _080DAE20 @ =gBattleAnimBankTarget
+ ldr r0, _080DAE20 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -1828,9 +1828,9 @@ _080DADEE:
b _080DAE58
.align 2, 0
_080DAE1C: .4byte gBattleAnimArgs
-_080DAE20: .4byte gBattleAnimBankTarget
+_080DAE20: .4byte gAnimBankTarget
_080DAE24:
- ldr r0, _080DAE40 @ =gBattleAnimBankTarget
+ ldr r0, _080DAE40 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -1844,12 +1844,12 @@ _080DAE24:
strb r0, [r4, 0x5]
b _080DAE58
.align 2, 0
-_080DAE40: .4byte gBattleAnimBankTarget
+_080DAE40: .4byte gAnimBankTarget
_080DAE44:
- ldr r0, _080DAEFC @ =gBattleAnimBankTarget
+ ldr r0, _080DAEFC @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -1940,7 +1940,7 @@ _080DAEF2:
pop {r0}
bx r0
.align 2, 0
-_080DAEFC: .4byte gBattleAnimBankTarget
+_080DAEFC: .4byte gAnimBankTarget
_080DAF00: .4byte gSineTable
_080DAF04: .4byte gOamMatrices
_080DAF08: .4byte sub_80DAF0C
@@ -2100,7 +2100,7 @@ _080DB024:
ldrsh r0, [r4, r2]
cmp r0, 0
bne _080DB03C
- ldr r0, _080DB090 @ =gBattleAnimBankAttacker
+ ldr r0, _080DB090 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2111,7 +2111,7 @@ _080DB03C:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _080DB058
- ldr r0, _080DB094 @ =gBattleAnimBankTarget
+ ldr r0, _080DB094 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2149,8 +2149,8 @@ _080DB058:
bx r0
.align 2, 0
_080DB08C: .4byte gBattleAnimArgs
-_080DB090: .4byte gBattleAnimBankAttacker
-_080DB094: .4byte gBattleAnimBankTarget
+_080DB090: .4byte gAnimBankAttacker
+_080DB094: .4byte gAnimBankTarget
_080DB098: .4byte 0x00000ccc
_080DB09C: .4byte sub_80DB0A0
thumb_func_end sub_80DB000
@@ -2188,7 +2188,7 @@ _080DB0CA:
cmp r0, r1
bne _080DB0E2
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB0E2:
pop {r4}
pop {r0}
@@ -2236,16 +2236,16 @@ sub_80DB0E8: @ 80DB0E8
strh r0, [r4, 0x6]
ldr r0, _080DB18C @ =gBattleAnimSpriteTemplate_83DB538
mov r8, r0
- ldr r5, _080DB190 @ =gBattleAnimBankTarget
+ ldr r5, _080DB190 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2274,7 +2274,7 @@ _080DB180: .4byte gTasks
_080DB184: .4byte gAnimVisualTaskCount
_080DB188: .4byte gBattleAnimArgs
_080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538
-_080DB190: .4byte gBattleAnimBankTarget
+_080DB190: .4byte gAnimBankTarget
thumb_func_end sub_80DB0E8
thumb_func_start sub_80DB194
@@ -2321,7 +2321,7 @@ _080DB1D8:
cmp r0, 0
beq _080DB1EC
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB1EC:
pop {r4}
pop {r0}
@@ -2346,10 +2346,10 @@ _080DB20A:
beq _080DB240
b _080DB27E
_080DB210:
- ldr r0, _080DB228 @ =gBattleAnimBankTarget
+ ldr r0, _080DB228 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2358,7 +2358,7 @@ _080DB210:
strh r0, [r4, 0x26]
b _080DB238
.align 2, 0
-_080DB228: .4byte gBattleAnimBankTarget
+_080DB228: .4byte gAnimBankTarget
_080DB22C:
ldrh r0, [r4, 0x26]
adds r0, 0xA
@@ -2400,7 +2400,7 @@ _080DB240:
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB27E:
pop {r4}
pop {r0}
@@ -2532,7 +2532,7 @@ _080DB360:
cmp r0, 0
ble _080DB36E
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB36E:
pop {r0}
bx r0
@@ -2556,23 +2556,23 @@ _080DB388:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _080DB3A0
- ldr r4, _080DB39C @ =gBattleAnimBankAttacker
+ ldr r4, _080DB39C @ =gAnimBankAttacker
b _080DB3A2
.align 2, 0
_080DB398: .4byte gBattleAnimArgs
-_080DB39C: .4byte gBattleAnimBankAttacker
+_080DB39C: .4byte gAnimBankAttacker
_080DB3A0:
- ldr r4, _080DB3DC @ =gBattleAnimBankTarget
+ ldr r4, _080DB3DC @ =gAnimBankTarget
_080DB3A2:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2591,7 +2591,7 @@ _080DB3A2:
strh r0, [r5, 0x2E]
b _080DB44C
.align 2, 0
-_080DB3DC: .4byte gBattleAnimBankTarget
+_080DB3DC: .4byte gAnimBankTarget
_080DB3E0:
movs r1, 0x32
ldrsh r0, [r5, r1]
@@ -2645,7 +2645,7 @@ _080DB42C:
adds r0, r5, 0
bl sub_8079098
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB44C:
add sp, 0x4
pop {r4,r5}
@@ -2716,23 +2716,23 @@ _080DB4C0:
ldrsh r0, [r2, r1]
cmp r0, 0
bne _080DB4D4
- ldr r4, _080DB4D0 @ =gBattleAnimBankAttacker
+ ldr r4, _080DB4D0 @ =gAnimBankAttacker
b _080DB4D6
.align 2, 0
_080DB4CC: .4byte gBattleAnimArgs
-_080DB4D0: .4byte gBattleAnimBankAttacker
+_080DB4D0: .4byte gAnimBankAttacker
_080DB4D4:
- ldr r4, _080DB500 @ =gBattleAnimBankTarget
+ ldr r4, _080DB500 @ =gAnimBankTarget
_080DB4D6:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2743,7 +2743,7 @@ _080DB4D6:
pop {r0}
bx r0
.align 2, 0
-_080DB500: .4byte gBattleAnimBankTarget
+_080DB500: .4byte gAnimBankTarget
_080DB504: .4byte sub_80DB508
thumb_func_end sub_80DB458
@@ -2793,7 +2793,7 @@ _080DB54A:
cmp r0, 0x1F
bne _080DB55E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB55E:
pop {r4}
pop {r0}
@@ -2866,7 +2866,7 @@ _080DB58A:
b _080DB5DE
_080DB5D8:
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DB5DE:
pop {r0}
bx r0
@@ -2882,17 +2882,17 @@ sub_80DB5E4: @ 80DB5E4
mov r8, r0
ldrh r4, [r0, 0x20]
ldrh r5, [r0, 0x22]
- ldr r6, _080DB698 @ =gBattleAnimBankAttacker
+ ldr r6, _080DB698 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -2958,7 +2958,7 @@ sub_80DB5E4: @ 80DB5E4
pop {r0}
bx r0
.align 2, 0
-_080DB698: .4byte gBattleAnimBankAttacker
+_080DB698: .4byte gAnimBankAttacker
_080DB69C: .4byte sub_80DB6A0
thumb_func_end sub_80DB5E4
diff --git a/asm/ghost.s b/asm/ghost.s
index 09458dec1..0db176d08 100755
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -18,10 +18,10 @@ sub_80DDB6C: @ 80DDB6C
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r5, _080DDBCC @ =gBattleAnimBankTarget
+ ldr r5, _080DDBCC @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -52,7 +52,7 @@ sub_80DDB6C: @ 80DDB6C
bx r0
.align 2, 0
_080DDBC8: .4byte gBattleAnimArgs
-_080DDBCC: .4byte gBattleAnimBankTarget
+_080DDBCC: .4byte gAnimBankTarget
_080DDBD0: .4byte sub_80DDBD8
_080DDBD4: .4byte REG_BLDCNT
thumb_func_end sub_80DDB6C
@@ -334,7 +334,7 @@ _080DDDB6:
cmp r0, 0x3D
bne _080DDDE8
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DDDE8:
pop {r4}
pop {r0}
@@ -520,11 +520,11 @@ sub_80DDF40: @ 80DDF40
adds r4, r0, 0
ldrh r5, [r4, 0x20]
ldrh r6, [r4, 0x22]
- ldr r0, _080DDFDC @ =gBattleAnimBankAttacker
+ ldr r0, _080DDFDC @ =gAnimBankAttacker
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -587,7 +587,7 @@ sub_80DDF40: @ 80DDF40
pop {r0}
bx r0
.align 2, 0
-_080DDFDC: .4byte gBattleAnimBankAttacker
+_080DDFDC: .4byte gAnimBankAttacker
_080DDFE0: .4byte gBattleAnimArgs
_080DDFE4: .4byte sub_80DDFE8
thumb_func_end sub_80DDF40
@@ -640,16 +640,16 @@ _080DE032:
lsls r0, 16
cmp r0, 0
bgt _080DE0F6
- ldr r4, _080DE098 @ =gBattleAnimBankTarget
+ ldr r4, _080DE098 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -681,7 +681,7 @@ _080DE032:
strh r0, [r5, 0x3C]
b _080DE0E2
.align 2, 0
-_080DE098: .4byte gBattleAnimBankTarget
+_080DE098: .4byte gAnimBankTarget
_080DE09C:
ldrh r0, [r5, 0x3A]
ldrh r1, [r5, 0x36]
@@ -703,16 +703,16 @@ _080DE09C:
lsls r0, 16
cmp r0, 0
bgt _080DE0F6
- ldr r4, _080DE0EC @ =gBattleAnimBankTarget
+ ldr r4, _080DE0EC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -722,7 +722,7 @@ _080DE0E2:
strh r0, [r5, 0x2E]
b _080DE0F6
.align 2, 0
-_080DE0EC: .4byte gBattleAnimBankTarget
+_080DE0EC: .4byte gAnimBankTarget
_080DE0F0:
adds r0, r5, 0
bl move_anim_8074EE0
@@ -824,7 +824,7 @@ _080DE198:
cmp r6, 0
beq _080DE1A4
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
b _080DE1AA
_080DE1A4:
ldrh r0, [r3, 0x30]
@@ -886,7 +886,7 @@ _080DE1E0:
adds r0, r4
movs r1, 0x50
strh r1, [r0, 0x2E]
- ldr r0, _080DE250 @ =gBattleAnimBankTarget
+ ldr r0, _080DE250 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -912,7 +912,7 @@ _080DE1E0:
_080DE244: .4byte REG_BLDCNT
_080DE248: .4byte REG_BLDALPHA
_080DE24C: .4byte gSprites
-_080DE250: .4byte gBattleAnimBankTarget
+_080DE250: .4byte gAnimBankTarget
_080DE254: .4byte 0x0000ff70
_080DE258:
movs r2, 0x8
@@ -1125,7 +1125,7 @@ sub_80DE3D4: @ 80DE3D4
lsls r0, 3
ldr r1, _080DE40C @ =gTasks
adds r5, r0, r1
- ldr r0, _080DE410 @ =gBattleAnimBankTarget
+ ldr r0, _080DE410 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -1143,7 +1143,7 @@ _080DE400:
mov pc, r0
.align 2, 0
_080DE40C: .4byte gTasks
-_080DE410: .4byte gBattleAnimBankTarget
+_080DE410: .4byte gAnimBankTarget
_080DE414: .4byte _080DE418
.align 2, 0
_080DE418:
@@ -1485,7 +1485,7 @@ sub_80DE6B0: @ 80DE6B0
lsls r0, 3
ldr r1, _080DE6E0 @ =gTasks
adds r4, r0, r1
- ldr r0, _080DE6E4 @ =gBattleAnimBankTarget
+ ldr r0, _080DE6E4 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -1501,7 +1501,7 @@ sub_80DE6B0: @ 80DE6B0
b _080DE7AA
.align 2, 0
_080DE6E0: .4byte gTasks
-_080DE6E4: .4byte gBattleAnimBankTarget
+_080DE6E4: .4byte gAnimBankTarget
_080DE6E8:
cmp r0, 0x2
beq _080DE740
@@ -1617,54 +1617,54 @@ sub_80DE7B8: @ 80DE7B8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DE800
- ldr r4, _080DE7F8 @ =gBattleAnimBankAttacker
+ ldr r4, _080DE7F8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
lsls r2, 13
adds r0, r2
lsrs r5, r0, 16
- ldr r4, _080DE7FC @ =gBattleAnimBankTarget
+ ldr r4, _080DE7FC @ =gAnimBankTarget
b _080DE824
.align 2, 0
_080DE7F4: .4byte gBattleAnimArgs
-_080DE7F8: .4byte gBattleAnimBankAttacker
-_080DE7FC: .4byte gBattleAnimBankTarget
+_080DE7F8: .4byte gAnimBankAttacker
+_080DE7FC: .4byte gAnimBankTarget
_080DE800:
- ldr r4, _080DE8C8 @ =gBattleAnimBankTarget
+ ldr r4, _080DE8C8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
lsls r2, 13
adds r0, r2
lsrs r5, r0, 16
- ldr r4, _080DE8CC @ =gBattleAnimBankAttacker
+ ldr r4, _080DE8CC @ =gAnimBankAttacker
_080DE824:
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 8
movs r1, 0xE0
@@ -1734,8 +1734,8 @@ _080DE824:
pop {r0}
bx r0
.align 2, 0
-_080DE8C8: .4byte gBattleAnimBankTarget
-_080DE8CC: .4byte gBattleAnimBankAttacker
+_080DE8C8: .4byte gAnimBankTarget
+_080DE8CC: .4byte gAnimBankAttacker
_080DE8D0: .4byte gBattleAnimArgs
_080DE8D4: .4byte sub_80DE8D8
thumb_func_end sub_80DE7B8
@@ -1813,10 +1813,10 @@ sub_80DE918: @ 80DE918
ldr r2, _080DEA70 @ =gBattleAnimArgs
ldrh r0, [r2]
strh r0, [r1, 0x1C]
- ldr r4, _080DEA74 @ =gBattleAnimBankAttacker
+ ldr r4, _080DEA74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1826,7 +1826,7 @@ sub_80DE918: @ 80DE918
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DE988
@@ -1836,7 +1836,7 @@ _080DE988:
_080DE98A:
lsls r1, r4, 16
asrs r3, r1, 16
- ldr r0, _080DEA74 @ =gBattleAnimBankAttacker
+ ldr r0, _080DEA74 @ =gAnimBankAttacker
ldrb r2, [r0]
str r1, [sp, 0x10]
cmp r3, r2
@@ -1868,7 +1868,7 @@ _080DE98A:
beq _080DEA56
adds r0, r4, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1944,7 +1944,7 @@ _080DEA56:
_080DEA68: .4byte gTasks
_080DEA6C: .4byte REG_BLDCNT
_080DEA70: .4byte gBattleAnimArgs
-_080DEA74: .4byte gBattleAnimBankAttacker
+_080DEA74: .4byte gAnimBankAttacker
_080DEA78: .4byte gSpriteTemplate_83DAF08
_080DEA7C: .4byte gSprites
_080DEA80: .4byte gSprites + 0x1C
@@ -2240,10 +2240,10 @@ sub_80DECB0: @ 80DECB0
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, _080DECF8 @ =gUnknown_030042C4
+ ldr r0, _080DECF8 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _080DECFC @ =gUnknown_03004240
+ ldr r0, _080DECFC @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _080DED00 @ =REG_WININ
ldr r2, _080DED04 @ =0x00003f3f
@@ -2259,13 +2259,13 @@ sub_80DECB0: @ 80DECB0
adds r1, 0x4
movs r0, 0x10
strh r0, [r1]
- ldr r0, _080DED08 @ =gBattleAnimBankAttacker
+ ldr r0, _080DED08 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080DECF4
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DED0C
@@ -2273,21 +2273,21 @@ _080DECF4:
movs r6, 0x28
b _080DED0E
.align 2, 0
-_080DECF8: .4byte gUnknown_030042C4
-_080DECFC: .4byte gUnknown_03004240
+_080DECF8: .4byte gBattle_WIN0H
+_080DECFC: .4byte gBattle_WIN0V
_080DED00: .4byte REG_WININ
_080DED04: .4byte 0x00003f3f
-_080DED08: .4byte gBattleAnimBankAttacker
+_080DED08: .4byte gAnimBankAttacker
_080DED0C:
movs r6, 0xC8
_080DED0E:
- ldr r1, _080DED4C @ =gUnknown_030042C4
+ ldr r1, _080DED4C @ =gBattle_WIN0H
lsls r3, r6, 16
asrs r2, r3, 16
lsls r0, r2, 8
orrs r0, r2
strh r0, [r1]
- ldr r1, _080DED50 @ =gUnknown_03004240
+ ldr r1, _080DED50 @ =gBattle_WIN0V
movs r5, 0x28
ldr r0, _080DED54 @ =0x00002828
strh r0, [r1]
@@ -2312,8 +2312,8 @@ _080DED0E:
pop {r0}
bx r0
.align 2, 0
-_080DED4C: .4byte gUnknown_030042C4
-_080DED50: .4byte gUnknown_03004240
+_080DED4C: .4byte gBattle_WIN0H
+_080DED50: .4byte gBattle_WIN0V
_080DED54: .4byte 0x00002828
_080DED58: .4byte gTasks
_080DED5C: .4byte sub_80DED60
@@ -2470,12 +2470,12 @@ _080DEE8C:
ldr r0, _080DEEDC @ =sub_80DEEE8
str r0, [r4]
_080DEEBA:
- ldr r1, _080DEEE0 @ =gUnknown_030042C4
+ ldr r1, _080DEEE0 @ =gBattle_WIN0H
mov r2, r9
lsls r0, r2, 8
orrs r7, r0
strh r7, [r1]
- ldr r1, _080DEEE4 @ =gUnknown_03004240
+ ldr r1, _080DEEE4 @ =gBattle_WIN0V
lsls r0, r6, 8
orrs r5, r0
strh r5, [r1]
@@ -2489,8 +2489,8 @@ _080DEEBA:
bx r0
.align 2, 0
_080DEEDC: .4byte sub_80DEEE8
-_080DEEE0: .4byte gUnknown_030042C4
-_080DEEE4: .4byte gUnknown_03004240
+_080DEEE0: .4byte gBattle_WIN0H
+_080DEEE4: .4byte gBattle_WIN0V
thumb_func_end sub_80DED60
thumb_func_start sub_80DEEE8
@@ -2506,9 +2506,9 @@ sub_80DEEE8: @ 80DEEE8
lsrs r2, r0, 24
cmp r2, 0
bne _080DEF20
- ldr r0, _080DEF2C @ =gUnknown_030042C4
+ ldr r0, _080DEF2C @ =gBattle_WIN0H
strh r2, [r0]
- ldr r0, _080DEF30 @ =gUnknown_03004240
+ ldr r0, _080DEF30 @ =gBattle_WIN0V
strh r2, [r0]
ldr r0, _080DEF34 @ =REG_WININ
ldr r4, _080DEF38 @ =0x00003f3f
@@ -2528,8 +2528,8 @@ _080DEF20:
bx r0
.align 2, 0
_080DEF28: .4byte gPaletteFade
-_080DEF2C: .4byte gUnknown_030042C4
-_080DEF30: .4byte gUnknown_03004240
+_080DEF2C: .4byte gBattle_WIN0H
+_080DEF30: .4byte gBattle_WIN0V
_080DEF34: .4byte REG_WININ
_080DEF38: .4byte 0x00003f3f
thumb_func_end sub_80DEEE8
@@ -2540,7 +2540,7 @@ sub_80DEF3C: @ 80DEF3C
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DEF68 @ =gBattleAnimBankAttacker
+ ldr r0, _080DEF68 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2557,7 +2557,7 @@ sub_80DEF3C: @ 80DEF3C
strb r1, [r4, 0x3]
b _080DEF74
.align 2, 0
-_080DEF68: .4byte gBattleAnimBankAttacker
+_080DEF68: .4byte gAnimBankAttacker
_080DEF6C: .4byte 0x0000fffe
_080DEF70:
ldr r2, _080DEF90 @ =0x0000ffe8
@@ -2722,17 +2722,17 @@ sub_80DF090: @ 80DF090
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
- ldr r1, _080DF0B0 @ =gUnknown_030042C4
+ ldr r1, _080DF0B0 @ =gBattle_WIN0H
strh r2, [r1]
- ldr r1, _080DF0B4 @ =gUnknown_03004240
+ ldr r1, _080DF0B4 @ =gBattle_WIN0V
strh r2, [r1]
- bl move_anim_8072740
+ bl DestroyAnimSprite
pop {r0}
bx r0
.align 2, 0
_080DF0AC: .4byte REG_BLDCNT
-_080DF0B0: .4byte gUnknown_030042C4
-_080DF0B4: .4byte gUnknown_03004240
+_080DF0B0: .4byte gBattle_WIN0H
+_080DF0B4: .4byte gBattle_WIN0V
thumb_func_end sub_80DF090
thumb_func_start sub_80DF0B8
@@ -2744,7 +2744,7 @@ sub_80DF0B8: @ 80DF0B8
movs r1, 0xC
bl Sin
strh r0, [r4, 0x24]
- ldr r0, _080DF120 @ =gBattleAnimBankAttacker
+ ldr r0, _080DF120 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -2788,7 +2788,7 @@ _080DF0DC:
strh r0, [r1]
b _080DF17E
.align 2, 0
-_080DF120: .4byte gBattleAnimBankAttacker
+_080DF120: .4byte gAnimBankAttacker
_080DF124: .4byte 0x0000050b
_080DF128: .4byte REG_BLDCNT
_080DF12C:
@@ -2852,7 +2852,7 @@ sub_80DF18C: @ 80DF18C
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
- bl move_anim_8072740
+ bl DestroyAnimSprite
pop {r0}
bx r0
.align 2, 0
@@ -2877,10 +2877,10 @@ sub_80DF1A4: @ 80DF1A4
mov r8, r0
mov r2, r8
strh r2, [r4, 0xA]
- ldr r5, _080DF240 @ =gBattleAnimBankAttacker
+ ldr r5, _080DF240 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
@@ -2934,7 +2934,7 @@ sub_80DF1A4: @ 80DF1A4
bx r0
.align 2, 0
_080DF23C: .4byte gTasks
-_080DF240: .4byte gBattleAnimBankAttacker
+_080DF240: .4byte gAnimBankAttacker
_080DF244: .4byte REG_BLDCNT
_080DF248: .4byte sub_80DF24C
thumb_func_end sub_80DF1A4
@@ -2991,7 +2991,7 @@ _080DF292:
lsls r0, 2
adds r5, r0, r1
strh r7, [r5, 0x2E]
- ldr r0, _080DF2FC @ =gBattleAnimBankAttacker
+ ldr r0, _080DF2FC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
movs r1, 0
@@ -3025,7 +3025,7 @@ _080DF2E6:
.align 2, 0
_080DF2F4: .4byte gSpriteTemplate_83DAF80
_080DF2F8: .4byte gSprites
-_080DF2FC: .4byte gBattleAnimBankAttacker
+_080DF2FC: .4byte gAnimBankAttacker
_080DF300:
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -3258,7 +3258,7 @@ sub_80DF49C: @ 80DF49C
orrs r1, r2
strb r1, [r3]
ldr r2, _080DF4E0 @ =gObjectBankIDs
- ldr r1, _080DF4E4 @ =gBattleAnimBankAttacker
+ ldr r1, _080DF4E4 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
ldrb r1, [r1]
@@ -3287,7 +3287,7 @@ sub_80DF49C: @ 80DF49C
bx lr
.align 2, 0
_080DF4E0: .4byte gObjectBankIDs
-_080DF4E4: .4byte gBattleAnimBankAttacker
+_080DF4E4: .4byte gAnimBankAttacker
_080DF4E8: .4byte gBattleAnimArgs
_080DF4EC: .4byte sub_80DF4F4
_080DF4F0: .4byte gSprites
diff --git a/asm/ground.s b/asm/ground.s
index 7a401e9e8..fd4cecbfd 100755
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -11,31 +11,31 @@
sub_80E0F1C: @ 80E0F1C
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080E0F74 @ =gBattleAnimBankAttacker
+ ldr r5, _080E0F74 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
movs r0, 0x14
strh r0, [r4, 0x2E]
- ldr r5, _080E0F78 @ =gBattleAnimBankTarget
+ ldr r5, _080E0F78 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -49,8 +49,8 @@ sub_80E0F1C: @ 80E0F1C
pop {r0}
bx r0
.align 2, 0
-_080E0F74: .4byte gBattleAnimBankAttacker
-_080E0F78: .4byte gBattleAnimBankTarget
+_080E0F74: .4byte gAnimBankAttacker
+_080E0F78: .4byte gAnimBankTarget
_080E0F7C: .4byte 0x0000ffd8
_080E0F80: .4byte sub_80E0F84
thumb_func_end sub_80E0F1C
@@ -76,16 +76,16 @@ sub_80E0F84: @ 80E0F84
strh r1, [r5, 0x24]
movs r0, 0x14
strh r0, [r5, 0x2E]
- ldr r4, _080E0FE0 @ =gBattleAnimBankAttacker
+ ldr r4, _080E0FE0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -100,7 +100,7 @@ _080E0FD8:
pop {r0}
bx r0
.align 2, 0
-_080E0FE0: .4byte gBattleAnimBankAttacker
+_080E0FE0: .4byte gAnimBankAttacker
_080E0FE4: .4byte sub_80E0FE8
thumb_func_end sub_80E0F84
@@ -113,7 +113,7 @@ sub_80E0FE8: @ 80E0FE8
cmp r0, 0
beq _080E0FFC
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E0FFC:
pop {r4}
pop {r0}
@@ -126,7 +126,7 @@ sub_80E1004: @ 80E1004
adds r6, r0, 0
movs r1, 0x1
bl sub_8078764
- ldr r0, _080E1064 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1064 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -140,10 +140,10 @@ _080E1024:
ldr r4, _080E1068 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
- ldr r5, _080E106C @ =gBattleAnimBankTarget
+ ldr r5, _080E106C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -151,7 +151,7 @@ _080E1024:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -159,18 +159,18 @@ _080E1024:
strh r0, [r6, 0x36]
ldr r0, _080E1070 @ =sub_8078B34
str r0, [r6, 0x1C]
- ldr r1, _080E1074 @ =move_anim_8072740
+ ldr r1, _080E1074 @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080E1064: .4byte gBattleAnimBankAttacker
+_080E1064: .4byte gAnimBankAttacker
_080E1068: .4byte gBattleAnimArgs
-_080E106C: .4byte gBattleAnimBankTarget
+_080E106C: .4byte gAnimBankTarget
_080E1070: .4byte sub_8078B34
-_080E1074: .4byte move_anim_8072740
+_080E1074: .4byte DestroyAnimSprite
thumb_func_end sub_80E1004
thumb_func_start sub_80E1078
@@ -181,7 +181,7 @@ sub_80E1078: @ 80E1078
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r4, _080E10F8 @ =gBattleAnimBankTarget
+ ldr r4, _080E10F8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077EE4
@@ -235,7 +235,7 @@ _080E10D0:
pop {r0}
bx r0
.align 2, 0
-_080E10F8: .4byte gBattleAnimBankTarget
+_080E10F8: .4byte gAnimBankTarget
_080E10FC: .4byte gBattleAnimArgs
_080E1100: .4byte sub_8078B34
_080E1104: .4byte move_anim_8074EE0
@@ -261,10 +261,10 @@ sub_80E1108: @ 80E1108
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080E117C
- ldr r4, _080E1174 @ =gBattleAnimBankAttacker
+ ldr r4, _080E1174 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x2]
@@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r3, [r6, 0x4]
@@ -294,7 +294,7 @@ _080E1162:
_080E1168: .4byte 0x000003ff
_080E116C: .4byte 0xfffffc00
_080E1170: .4byte gBattleAnimArgs
-_080E1174: .4byte gBattleAnimBankAttacker
+_080E1174: .4byte gAnimBankAttacker
_080E1178: .4byte sub_80E1198
_080E117C:
ldrh r0, [r6, 0x2]
@@ -341,7 +341,7 @@ _080E11B6:
cmp r0, r1
bge _080E11CE
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E11CE:
pop {r0}
bx r0
@@ -402,7 +402,7 @@ _080E11FC:
cmp r0, 0xA
bne _080E123E
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E123E:
pop {r0}
bx r0
@@ -479,7 +479,7 @@ _080E12C4:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
- ldr r0, _080E12EC @ =gBattleAnimBankAttacker
+ ldr r0, _080E12EC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -487,24 +487,24 @@ _080E12C4:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _080E12F8
- ldr r0, _080E12F0 @ =gUnknown_030042C0
+ ldr r0, _080E12F0 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
- ldr r0, _080E12F4 @ =gUnknown_030041B4
+ ldr r0, _080E12F4 @ =gBattle_BG1_Y
b _080E1300
.align 2, 0
-_080E12EC: .4byte gBattleAnimBankAttacker
-_080E12F0: .4byte gUnknown_030042C0
-_080E12F4: .4byte gUnknown_030041B4
+_080E12EC: .4byte gAnimBankAttacker
+_080E12F0: .4byte gBattle_BG1_X
+_080E12F4: .4byte gBattle_BG1_Y
_080E12F8:
- ldr r0, _080E133C @ =gUnknown_03004288
+ ldr r0, _080E133C @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
- ldr r0, _080E1340 @ =gUnknown_03004280
+ ldr r0, _080E1340 @ =gBattle_BG2_Y
_080E1300:
ldrh r0, [r0]
strh r0, [r4, 0x22]
- ldr r0, _080E1344 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1344 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -533,9 +533,9 @@ _080E1322:
strb r1, [r0]
b _080E1406
.align 2, 0
-_080E133C: .4byte gUnknown_03004288
-_080E1340: .4byte gUnknown_03004280
-_080E1344: .4byte gBattleAnimBankAttacker
+_080E133C: .4byte gBattle_BG2_X
+_080E1340: .4byte gBattle_BG2_Y
+_080E1344: .4byte gAnimBankAttacker
_080E1348: .4byte gSprites
_080E134C:
ldrb r0, [r4, 0x1E]
@@ -579,13 +579,13 @@ _080E137E:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _080E13A8
- ldr r1, _080E13A4 @ =gUnknown_030041B4
+ ldr r1, _080E13A4 @ =gBattle_BG1_Y
b _080E13AA
.align 2, 0
_080E13A0: .4byte gSineTable
-_080E13A4: .4byte gUnknown_030041B4
+_080E13A4: .4byte gBattle_BG1_Y
_080E13A8:
- ldr r1, _080E13CC @ =gUnknown_03004280
+ ldr r1, _080E13CC @ =gBattle_BG2_Y
_080E13AA:
ldrh r0, [r4, 0x22]
subs r0, r2
@@ -602,13 +602,13 @@ _080E13AA:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _080E13D4
- ldr r1, _080E13D0 @ =gUnknown_030041B4
+ ldr r1, _080E13D0 @ =gBattle_BG1_Y
b _080E13D6
.align 2, 0
-_080E13CC: .4byte gUnknown_03004280
-_080E13D0: .4byte gUnknown_030041B4
+_080E13CC: .4byte gBattle_BG2_Y
+_080E13D0: .4byte gBattle_BG1_Y
_080E13D4:
- ldr r1, _080E13F8 @ =gUnknown_03004280
+ ldr r1, _080E13F8 @ =gBattle_BG2_Y
_080E13D6:
ldrh r0, [r4, 0x22]
subs r0, r2
@@ -628,7 +628,7 @@ _080E13D6:
strh r0, [r1, 0x24]
b _080E1406
.align 2, 0
-_080E13F8: .4byte gUnknown_03004280
+_080E13F8: .4byte gBattle_BG2_Y
_080E13FC: .4byte gSprites
_080E1400:
ldr r1, _080E1410 @ =gUnknown_03004DC0
@@ -687,21 +687,21 @@ sub_80E143C: @ 80E143C
movs r4, 0
strh r4, [r1, 0x24]
strh r4, [r1, 0x26]
- ldr r0, _080E1480 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1480 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080E1488
- ldr r0, _080E1484 @ =gUnknown_030041B4
+ ldr r0, _080E1484 @ =gBattle_BG1_Y
b _080E148A
.align 2, 0
_080E147C: .4byte gSprites
-_080E1480: .4byte gBattleAnimBankAttacker
-_080E1484: .4byte gUnknown_030041B4
+_080E1480: .4byte gAnimBankAttacker
+_080E1484: .4byte gBattle_BG1_Y
_080E1488:
- ldr r0, _080E1498 @ =gUnknown_03004280
+ ldr r0, _080E1498 @ =gBattle_BG2_Y
_080E148A:
strh r4, [r0]
adds r0, r5, 0
@@ -710,7 +710,7 @@ _080E148A:
pop {r0}
bx r0
.align 2, 0
-_080E1498: .4byte gUnknown_03004280
+_080E1498: .4byte gBattle_BG2_Y
thumb_func_end sub_80E143C
thumb_func_start sub_80E149C
@@ -852,7 +852,7 @@ _080E15A0:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
- ldr r0, _080E15C4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E15C4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
@@ -860,17 +860,17 @@ _080E15A0:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _080E15CC
- ldr r0, _080E15C8 @ =gUnknown_030042C0
+ ldr r0, _080E15C8 @ =gBattle_BG1_X
b _080E15CE
.align 2, 0
-_080E15C4: .4byte gBattleAnimBankAttacker
-_080E15C8: .4byte gUnknown_030042C0
+_080E15C4: .4byte gAnimBankAttacker
+_080E15C8: .4byte gBattle_BG1_X
_080E15CC:
- ldr r0, _080E15EC @ =gUnknown_03004288
+ ldr r0, _080E15EC @ =gBattle_BG2_X
_080E15CE:
ldrh r0, [r0]
strh r0, [r4, 0x20]
- ldr r0, _080E15F0 @ =gBattleAnimBankAttacker
+ ldr r0, _080E15F0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -882,8 +882,8 @@ _080E15CE:
strh r0, [r4, 0x26]
b _080E164A
.align 2, 0
-_080E15EC: .4byte gUnknown_03004288
-_080E15F0: .4byte gBattleAnimBankAttacker
+_080E15EC: .4byte gBattle_BG2_X
+_080E15F0: .4byte gAnimBankAttacker
_080E15F4:
ldrb r0, [r4, 0x1E]
movs r1, 0x26
@@ -957,15 +957,15 @@ sub_80E1668: @ 80E1668
lsrs r4, r2, 16
cmp r0, 0x1
bne _080E168C
- ldr r0, _080E1684 @ =gUnknown_030042C0
+ ldr r0, _080E1684 @ =gBattle_BG1_X
ldrh r3, [r0]
ldr r0, _080E1688 @ =REG_BG1HOFS
b _080E1692
.align 2, 0
-_080E1684: .4byte gUnknown_030042C0
+_080E1684: .4byte gBattle_BG1_X
_080E1688: .4byte REG_BG1HOFS
_080E168C:
- ldr r0, _080E1718 @ =gUnknown_03004288
+ ldr r0, _080E1718 @ =gBattle_BG2_X
ldrh r3, [r0]
ldr r0, _080E171C @ =REG_BG2HOFS
_080E1692:
@@ -1041,7 +1041,7 @@ _080E16F6:
pop {r0}
bx r0
.align 2, 0
-_080E1718: .4byte gUnknown_03004288
+_080E1718: .4byte gBattle_BG2_X
_080E171C: .4byte REG_BG2HOFS
_080E1720: .4byte gUnknown_03004DE0
_080E1724: .4byte 0xa2600001
@@ -1057,13 +1057,13 @@ sub_80E1728: @ 80E1728
adds r7, r0, 0
cmp r1, 0
bne _080E1744
- ldr r0, _080E1740 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1740 @ =gAnimBankAttacker
b _080E1746
.align 2, 0
_080E173C: .4byte gBattleAnimArgs
-_080E1740: .4byte gBattleAnimBankAttacker
+_080E1740: .4byte gAnimBankAttacker
_080E1744:
- ldr r0, _080E17A8 @ =gBattleAnimBankTarget
+ ldr r0, _080E17A8 @ =gAnimBankTarget
_080E1746:
ldrb r4, [r0]
movs r6, 0x18
@@ -1082,7 +1082,7 @@ _080E1746:
_080E1762:
adds r0, r4, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -1112,7 +1112,7 @@ _080E1762:
pop {r0}
bx r0
.align 2, 0
-_080E17A8: .4byte gBattleAnimBankTarget
+_080E17A8: .4byte gAnimBankTarget
_080E17AC: .4byte sub_80E17B0
thumb_func_end sub_80E1728
@@ -1125,7 +1125,7 @@ sub_80E17B0: @ 80E17B0
cmp r0, 0
beq _080E17C4
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E17C4:
pop {r4}
pop {r0}
@@ -1141,18 +1141,18 @@ sub_80E17CC: @ 80E17CC
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080E17E8
- ldr r0, _080E17E4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E17E4 @ =gAnimBankAttacker
b _080E17EA
.align 2, 0
_080E17E0: .4byte gBattleAnimArgs
-_080E17E4: .4byte gBattleAnimBankAttacker
+_080E17E4: .4byte gAnimBankAttacker
_080E17E8:
- ldr r0, _080E1848 @ =gBattleAnimBankTarget
+ ldr r0, _080E1848 @ =gAnimBankTarget
_080E17EA:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldr r2, _080E184C @ =0x0000fff0
@@ -1183,7 +1183,7 @@ _080E17EA:
ands r0, r2
orrs r0, r1
strh r0, [r6, 0x4]
- ldr r1, _080E185C @ =move_anim_8072740
+ ldr r1, _080E185C @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData
ldrh r0, [r4, 0x4]
@@ -1194,12 +1194,12 @@ _080E17EA:
pop {r0}
bx r0
.align 2, 0
-_080E1848: .4byte gBattleAnimBankTarget
+_080E1848: .4byte gAnimBankTarget
_080E184C: .4byte 0x0000fff0
_080E1850: .4byte gBattleAnimArgs
_080E1854: .4byte 0x000003ff
_080E1858: .4byte 0xfffffc00
-_080E185C: .4byte move_anim_8072740
+_080E185C: .4byte DestroyAnimSprite
_080E1860: .4byte sub_80782D8
thumb_func_end sub_80E17CC
@@ -1226,7 +1226,7 @@ sub_80E1864: @ 80E1864
_080E1888: .4byte gTasks
_080E188C: .4byte gBattleAnimArgs
_080E1890:
- ldr r0, _080E18BC @ =gMovePowerMoveAnim
+ ldr r0, _080E18BC @ =gAnimMovePower
ldrh r0, [r0]
movs r1, 0xA
bl __udivsi3
@@ -1249,7 +1249,7 @@ _080E189C:
ldr r0, _080E18C4 @ =sub_80E1934
b _080E1926
.align 2, 0
-_080E18BC: .4byte gMovePowerMoveAnim
+_080E18BC: .4byte gAnimMovePower
_080E18C0: .4byte gUnknown_030041B0
_080E18C4: .4byte sub_80E1934
_080E18C8:
@@ -1643,7 +1643,7 @@ sub_80E1B88: @ 80E1B88
lsrs r1, r0, 24
ldr r3, _080E1BA8 @ =gBattleAnimArgs
movs r2, 0
- ldr r0, _080E1BAC @ =gMovePowerMoveAnim
+ ldr r0, _080E1BAC @ =gAnimMovePower
ldrh r0, [r0]
cmp r0, 0x63
bls _080E1B9C
@@ -1656,7 +1656,7 @@ _080E1B9C:
bx r0
.align 2, 0
_080E1BA8: .4byte gBattleAnimArgs
-_080E1BAC: .4byte gMovePowerMoveAnim
+_080E1BAC: .4byte gAnimMovePower
thumb_func_end sub_80E1B88
thumb_func_start sub_80E1BB0
@@ -1671,13 +1671,13 @@ sub_80E1BB0: @ 80E1BB0
adds r6, r2, 0
cmp r0, 0
beq _080E1BD0
- ldr r0, _080E1BCC @ =gBattleAnimBankTarget
+ ldr r0, _080E1BCC @ =gAnimBankTarget
b _080E1BD2
.align 2, 0
_080E1BC8: .4byte gBattleAnimArgs
-_080E1BCC: .4byte gBattleAnimBankTarget
+_080E1BCC: .4byte gAnimBankTarget
_080E1BD0:
- ldr r0, _080E1C40 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1C40 @ =gAnimBankAttacker
_080E1BD2:
ldrb r0, [r0]
adds r5, r0, 0
@@ -1700,7 +1700,7 @@ _080E1BE2:
adds r4, r0
adds r0, r5, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x20
@@ -1711,7 +1711,7 @@ _080E1BE2:
strh r1, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x40
@@ -1732,7 +1732,7 @@ _080E1BE2:
pop {r0}
bx r0
.align 2, 0
-_080E1C40: .4byte gBattleAnimBankAttacker
+_080E1C40: .4byte gAnimBankAttacker
_080E1C44: .4byte sub_80E1C58
_080E1C48: .4byte gTasks
_080E1C4C: .4byte 0x000001ff
diff --git a/asm/ice.s b/asm/ice.s
index ec0b83d4c..1fad057ed 100755
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -62,29 +62,29 @@ sub_80D7704: @ 80D7704
ands r0, r2
orrs r0, r1
strh r0, [r5, 0x4]
- ldr r4, _080D7814 @ =gBattleAnimBankTarget
+ ldr r4, _080D7814 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r4, _080D7818 @ =gBattleAnimBankAttacker
+ ldr r4, _080D7818 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r3, r0, 24
ldrb r0, [r4]
movs r1, 0x3
str r3, [sp]
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080D781C @ =gBattleAnimArgs
@@ -176,8 +176,8 @@ _080D77DE:
.align 2, 0
_080D780C: .4byte 0x000003ff
_080D7810: .4byte 0xfffffc00
-_080D7814: .4byte gBattleAnimBankTarget
-_080D7818: .4byte gBattleAnimBankAttacker
+_080D7814: .4byte gAnimBankTarget
+_080D7818: .4byte gAnimBankAttacker
_080D781C: .4byte gBattleAnimArgs
_080D7820:
lsls r1, r3, 16
@@ -281,7 +281,7 @@ sub_80D7888: @ 80D7888
b _080D78E6
_080D78E0:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D78E6:
pop {r4}
pop {r0}
@@ -304,7 +304,7 @@ sub_80D78EC: @ 80D78EC
movs r0, 0xFE
lsls r0, 8
strh r0, [r4, 0x36]
- ldr r1, _080D7924 @ =move_anim_8072740
+ ldr r1, _080D7924 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
ldr r1, _080D7928 @ =sub_8078174
@@ -316,7 +316,7 @@ sub_80D78EC: @ 80D78EC
bx r0
.align 2, 0
_080D7920: .4byte gBattleAnimArgs
-_080D7924: .4byte move_anim_8072740
+_080D7924: .4byte DestroyAnimSprite
_080D7928: .4byte sub_8078174
thumb_func_end sub_80D78EC
@@ -326,14 +326,14 @@ sub_80D792C: @ 80D792C
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080D7960 @ =gBattleAnimBankTarget
+ ldr r0, _080D7960 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
- ldr r0, _080D7964 @ =gBattleAnimBankAttacker
+ ldr r0, _080D7964 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -346,8 +346,8 @@ sub_80D792C: @ 80D792C
strh r1, [r4, 0x32]
b _080D7976
.align 2, 0
-_080D7960: .4byte gBattleAnimBankTarget
-_080D7964: .4byte gBattleAnimBankAttacker
+_080D7960: .4byte gAnimBankTarget
+_080D7964: .4byte gAnimBankAttacker
_080D7968: .4byte gBattleAnimArgs
_080D796C:
ldr r0, _080D79A4 @ =gBattleAnimArgs
@@ -356,10 +356,10 @@ _080D796C:
adds r0, r1
strh r0, [r4, 0x32]
_080D7976:
- ldr r0, _080D79A8 @ =gBattleAnimBankTarget
+ ldr r0, _080D79A8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r1, _080D79A4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -368,7 +368,7 @@ _080D7976:
strh r0, [r4, 0x36]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x2E]
- ldr r1, _080D79AC @ =move_anim_8072740
+ ldr r1, _080D79AC @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
ldr r0, _080D79B0 @ =sub_8078B34
@@ -378,8 +378,8 @@ _080D7976:
bx r0
.align 2, 0
_080D79A4: .4byte gBattleAnimArgs
-_080D79A8: .4byte gBattleAnimBankTarget
-_080D79AC: .4byte move_anim_8072740
+_080D79A8: .4byte gAnimBankTarget
+_080D79AC: .4byte DestroyAnimSprite
_080D79B0: .4byte sub_8078B34
thumb_func_end sub_80D792C
@@ -399,7 +399,7 @@ sub_80D79B4: @ 80D79B4
.align 2, 0
_080D79CC: .4byte gBattleAnimArgs
_080D79D0:
- ldr r0, _080D7A18 @ =gBattleAnimBankTarget
+ ldr r0, _080D7A18 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -407,7 +407,7 @@ _080D79D0:
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D7A1C @ =gBattleAnimBankAttacker
+ ldr r0, _080D7A1C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -435,8 +435,8 @@ _080D7A06:
pop {r0}
bx r0
.align 2, 0
-_080D7A18: .4byte gBattleAnimBankTarget
-_080D7A1C: .4byte gBattleAnimBankAttacker
+_080D7A18: .4byte gAnimBankTarget
+_080D7A1C: .4byte gAnimBankAttacker
_080D7A20: .4byte sub_80D7A28
_080D7A24: .4byte sub_80785E4
thumb_func_end sub_80D79B4
@@ -492,16 +492,16 @@ sub_80D7A64: @ 80D7A64
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D7AB4
- ldr r4, _080D7AB0 @ =gBattleAnimBankTarget
+ ldr r4, _080D7AB0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -510,9 +510,9 @@ sub_80D7A64: @ 80D7A64
b _080D7AC6
.align 2, 0
_080D7AAC: .4byte gBattleAnimArgs
-_080D7AB0: .4byte gBattleAnimBankTarget
+_080D7AB0: .4byte gAnimBankTarget
_080D7AB4:
- ldr r0, _080D7AE0 @ =gBattleAnimBankTarget
+ ldr r0, _080D7AE0 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -521,7 +521,7 @@ _080D7AB4:
movs r1, 0x1
bl sub_807A3FC
_080D7AC6:
- ldr r0, _080D7AE4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D7AE4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -534,8 +534,8 @@ _080D7AC6:
strh r1, [r5, 0x32]
b _080D7AF6
.align 2, 0
-_080D7AE0: .4byte gBattleAnimBankTarget
-_080D7AE4: .4byte gBattleAnimBankAttacker
+_080D7AE0: .4byte gAnimBankTarget
+_080D7AE4: .4byte gAnimBankAttacker
_080D7AE8: .4byte gBattleAnimArgs
_080D7AEC:
ldr r0, _080D7B94 @ =gBattleAnimArgs
@@ -647,7 +647,7 @@ sub_80D7BA0: @ 80D7BA0
strh r5, [r4, 0x24]
movs r0, 0x80
strh r0, [r4, 0x2E]
- ldr r0, _080D7BFC @ =gBattleAnimBankAttacker
+ ldr r0, _080D7BFC @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -676,7 +676,7 @@ _080D7BD0:
pop {r0}
bx r0
.align 2, 0
-_080D7BFC: .4byte gBattleAnimBankAttacker
+_080D7BFC: .4byte gAnimBankAttacker
_080D7C00: .4byte 0x0000ffec
_080D7C04: .4byte sub_80D7C08
thumb_func_end sub_80D7BA0
@@ -685,7 +685,7 @@ _080D7C04: .4byte sub_80D7C08
sub_80D7C08: @ 80D7C08
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D7C5C @ =gBattleAnimBankAttacker
+ ldr r0, _080D7C5C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -723,7 +723,7 @@ _080D7C1E:
strh r0, [r4, 0x38]
b _080D7C82
.align 2, 0
-_080D7C5C: .4byte gBattleAnimBankAttacker
+_080D7C5C: .4byte gAnimBankAttacker
_080D7C60: .4byte 0x0000ffec
_080D7C64:
ldrh r0, [r4, 0x24]
@@ -782,7 +782,7 @@ sub_80D7C8C: @ 80D7C8C
bge _080D7CCE
_080D7CC8:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D7CCE:
pop {r4}
pop {r0}
@@ -807,25 +807,25 @@ sub_80D7CD4: @ 80D7CD4
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080D7D20
- ldr r4, _080D7D1C @ =gBattleAnimBankTarget
+ ldr r4, _080D7D1C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _080D7D32
.align 2, 0
_080D7D18: .4byte gBattleAnimArgs
-_080D7D1C: .4byte gBattleAnimBankTarget
+_080D7D1C: .4byte gAnimBankTarget
_080D7D20:
- ldr r0, _080D7D50 @ =gBattleAnimBankTarget
+ ldr r0, _080D7D50 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -834,7 +834,7 @@ _080D7D20:
movs r1, 0x1
bl sub_807A3FC
_080D7D32:
- ldr r0, _080D7D54 @ =gBattleAnimBankAttacker
+ ldr r0, _080D7D54 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -848,8 +848,8 @@ _080D7D32:
adds r1, r0, 0
b _080D7D66
.align 2, 0
-_080D7D50: .4byte gBattleAnimBankTarget
-_080D7D54: .4byte gBattleAnimBankAttacker
+_080D7D50: .4byte gAnimBankTarget
+_080D7D54: .4byte gAnimBankAttacker
_080D7D58: .4byte gBattleAnimArgs
_080D7D5C:
ldr r1, _080D7E10 @ =gBattleAnimArgs
@@ -1002,7 +1002,7 @@ _080D7E2C:
bge _080D7E82
_080D7E7C:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D7E82:
pop {r4}
pop {r0}
@@ -1029,7 +1029,7 @@ sub_80D7E88: @ 80D7E88
.align 2, 0
_080D7EA8: .4byte gBattleAnimArgs
_080D7EAC:
- ldr r0, _080D7EEC @ =gBattleAnimBankTarget
+ ldr r0, _080D7EEC @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -1037,7 +1037,7 @@ _080D7EAC:
adds r3, 0x22
movs r1, 0
bl sub_807A3FC
- ldr r0, _080D7EF0 @ =gBattleAnimBankAttacker
+ ldr r0, _080D7EF0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1061,8 +1061,8 @@ _080D7EE2:
strh r0, [r4, 0x2E]
b _080D7F08
.align 2, 0
-_080D7EEC: .4byte gBattleAnimBankTarget
-_080D7EF0: .4byte gBattleAnimBankAttacker
+_080D7EEC: .4byte gAnimBankTarget
+_080D7EF0: .4byte gAnimBankAttacker
_080D7EF4:
adds r0, r4, 0
adds r0, 0x3F
@@ -1072,7 +1072,7 @@ _080D7EF4:
cmp r0, 0
beq _080D7F08
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D7F08:
pop {r4,r5}
pop {r0}
@@ -1099,7 +1099,7 @@ sub_80D7F10: @ 80D7F10
.align 2, 0
_080D7F30: .4byte gBattleAnimArgs
_080D7F34:
- ldr r4, _080D7F5C @ =gBattleAnimBankAttacker
+ ldr r4, _080D7F5C @ =gAnimBankAttacker
ldrb r0, [r4]
adds r2, r5, 0
adds r2, 0x20
@@ -1117,7 +1117,7 @@ _080D7F34:
subs r0, r1
b _080D7F66
.align 2, 0
-_080D7F5C: .4byte gBattleAnimBankAttacker
+_080D7F5C: .4byte gAnimBankAttacker
_080D7F60:
ldrh r0, [r6]
ldrh r1, [r5, 0x20]
@@ -1130,11 +1130,11 @@ _080D7F66:
adds r0, r1
strh r0, [r5, 0x22]
_080D7F72:
- ldr r0, _080D7F7C @ =gBattleAnimBankAttacker
+ ldr r0, _080D7F7C @ =gAnimBankAttacker
b _080D7FD0
.align 2, 0
_080D7F78: .4byte gBattleAnimArgs
-_080D7F7C: .4byte gBattleAnimBankAttacker
+_080D7F7C: .4byte gAnimBankAttacker
_080D7F80:
movs r1, 0xA
ldrsh r0, [r6, r1]
@@ -1145,7 +1145,7 @@ _080D7F80:
bl sub_8078764
b _080D7FCE
_080D7F92:
- ldr r4, _080D7FB8 @ =gBattleAnimBankTarget
+ ldr r4, _080D7FB8 @ =gAnimBankTarget
ldrb r0, [r4]
adds r2, r5, 0
adds r2, 0x20
@@ -1163,7 +1163,7 @@ _080D7F92:
subs r0, r1
b _080D7FC2
.align 2, 0
-_080D7FB8: .4byte gBattleAnimBankTarget
+_080D7FB8: .4byte gAnimBankTarget
_080D7FBC:
ldrh r0, [r6]
ldrh r1, [r5, 0x20]
@@ -1176,7 +1176,7 @@ _080D7FC2:
adds r0, r1
strh r0, [r5, 0x22]
_080D7FCE:
- ldr r0, _080D7FF0 @ =gBattleAnimBankTarget
+ ldr r0, _080D7FF0 @ =gAnimBankTarget
_080D7FD0:
ldrb r0, [r0]
strh r0, [r5, 0x3C]
@@ -1194,12 +1194,12 @@ _080D7FE8:
b _080D7FF6
.align 2, 0
_080D7FEC: .4byte gBattleAnimArgs
-_080D7FF0: .4byte gBattleAnimBankTarget
+_080D7FF0: .4byte gAnimBankTarget
_080D7FF4:
movs r0, 0x40
_080D7FF6:
strh r0, [r5, 0x3A]
- ldr r0, _080D803C @ =gBattleAnimBankTarget
+ ldr r0, _080D803C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1232,7 +1232,7 @@ _080D800C:
pop {r0}
bx r0
.align 2, 0
-_080D803C: .4byte gBattleAnimBankTarget
+_080D803C: .4byte gAnimBankTarget
_080D8040: .4byte gBattleAnimArgs
_080D8044: .4byte sub_80D8048
thumb_func_end sub_80D7F10
@@ -1307,7 +1307,7 @@ _080D80C6:
b _080D80D8
_080D80D2:
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D80D8:
pop {r4}
pop {r0}
@@ -1341,7 +1341,7 @@ sub_80D80E0: @ 80D80E0
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D812A
@@ -1353,10 +1353,10 @@ sub_80D80E0: @ 80D80E0
orrs r1, r0
strb r1, [r4]
_080D812A:
- ldr r0, _080D81B4 @ =gUnknown_030042C0
+ ldr r0, _080D81B4 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
- ldr r0, _080D81B8 @ =gUnknown_030041B4
+ ldr r0, _080D81B8 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080D81BC @ =REG_BG1HOFS
strh r1, [r0]
@@ -1389,7 +1389,7 @@ _080D812A:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D8190
@@ -1415,8 +1415,8 @@ _080D8190:
_080D81A8: .4byte REG_BLDCNT
_080D81AC: .4byte 0x00003f42
_080D81B0: .4byte REG_BG1CNT
-_080D81B4: .4byte gUnknown_030042C0
-_080D81B8: .4byte gUnknown_030041B4
+_080D81B4: .4byte gBattle_BG1_X
+_080D81B8: .4byte gBattle_BG1_Y
_080D81BC: .4byte REG_BG1HOFS
_080D81C0: .4byte 0x040000d4
_080D81C4: .4byte 0x85000400
@@ -1438,13 +1438,13 @@ sub_80D81E0: @ 80D81E0
sub sp, 0x10
lsls r0, 24
lsrs r6, r0, 24
- ldr r2, _080D8220 @ =gUnknown_030042C0
+ ldr r2, _080D8220 @ =gBattle_BG1_X
ldr r1, _080D8224 @ =0x0000ffff
adds r0, r1, 0
ldrh r4, [r2]
adds r0, r4
strh r0, [r2]
- ldr r1, _080D8228 @ =gUnknown_030041B4
+ ldr r1, _080D8228 @ =gBattle_BG1_Y
ldr r3, _080D822C @ =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -1463,9 +1463,9 @@ _080D8214:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080D8220: .4byte gUnknown_030042C0
+_080D8220: .4byte gBattle_BG1_X
_080D8224: .4byte 0x0000ffff
-_080D8228: .4byte gUnknown_030041B4
+_080D8228: .4byte gBattle_BG1_Y
_080D822C: .4byte gTasks
_080D8230: .4byte _080D8234
.align 2, 0
@@ -1620,7 +1620,7 @@ _080D832A:
ldr r1, _080D83C8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D8378
@@ -1639,8 +1639,8 @@ _080D8378:
ldrh r0, [r1, 0x20]
adds r0, 0x1
strh r0, [r1, 0x20]
- ldr r2, _080D83D4 @ =gUnknown_030042C0
- ldr r4, _080D83D8 @ =gUnknown_030041B4
+ ldr r2, _080D83D4 @ =gBattle_BG1_X
+ ldr r4, _080D83D8 @ =gBattle_BG1_Y
_080D838C:
movs r1, 0
strh r1, [r2]
@@ -1674,8 +1674,8 @@ _080D83C4: .4byte 0x85000400
_080D83C8: .4byte 0x85000200
_080D83CC: .4byte REG_BG1CNT
_080D83D0: .4byte gTasks
-_080D83D4: .4byte gUnknown_030042C0
-_080D83D8: .4byte gUnknown_030041B4
+_080D83D4: .4byte gBattle_BG1_X
+_080D83D8: .4byte gBattle_BG1_Y
_080D83DC: .4byte REG_BLDCNT
thumb_func_end sub_80D81E0
@@ -1683,16 +1683,16 @@ _080D83DC: .4byte REG_BLDCNT
sub_80D83E0: @ 80D83E0
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080D840C @ =gBattleAnimBankAttacker
+ ldr r5, _080D840C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1702,7 +1702,7 @@ sub_80D83E0: @ 80D83E0
pop {r0}
bx r0
.align 2, 0
-_080D840C: .4byte gBattleAnimBankAttacker
+_080D840C: .4byte gAnimBankAttacker
_080D8410: .4byte sub_807941C
thumb_func_end sub_80D83E0
@@ -1733,7 +1733,7 @@ sub_80D8414: @ 80D8414
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D845E
@@ -1745,10 +1745,10 @@ sub_80D8414: @ 80D8414
orrs r1, r0
strb r1, [r4]
_080D845E:
- ldr r0, _080D84EC @ =gUnknown_030042C0
+ ldr r0, _080D84EC @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
- ldr r0, _080D84F0 @ =gUnknown_030041B4
+ ldr r0, _080D84F0 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080D84F4 @ =REG_BG1HOFS
strh r1, [r0]
@@ -1781,7 +1781,7 @@ _080D845E:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D84C4
@@ -1809,8 +1809,8 @@ _080D84C4:
_080D84E0: .4byte REG_BLDCNT
_080D84E4: .4byte 0x00003f42
_080D84E8: .4byte REG_BG1CNT
-_080D84EC: .4byte gUnknown_030042C0
-_080D84F0: .4byte gUnknown_030041B4
+_080D84EC: .4byte gBattle_BG1_X
+_080D84F0: .4byte gBattle_BG1_Y
_080D84F4: .4byte REG_BG1HOFS
_080D84F8: .4byte 0x040000d4
_080D84FC: .4byte 0x85000400
@@ -1833,7 +1833,7 @@ sub_80D851C: @ 80D851C
sub sp, 0x10
lsls r0, 24
lsrs r6, r0, 24
- ldr r3, _080D8558 @ =gUnknown_030042C0
+ ldr r3, _080D8558 @ =gBattle_BG1_X
ldr r4, _080D855C @ =gTasks
lsls r1, r6, 2
adds r1, r6
@@ -1843,7 +1843,7 @@ sub_80D851C: @ 80D851C
ldrh r2, [r3]
adds r0, r2
strh r0, [r3]
- ldr r2, _080D8560 @ =gUnknown_030041B4
+ ldr r2, _080D8560 @ =gBattle_BG1_Y
movs r5, 0x20
ldrsh r0, [r1, r5]
cmp r0, 0x4
@@ -1856,9 +1856,9 @@ _080D854C:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080D8558: .4byte gUnknown_030042C0
+_080D8558: .4byte gBattle_BG1_X
_080D855C: .4byte gTasks
-_080D8560: .4byte gUnknown_030041B4
+_080D8560: .4byte gBattle_BG1_Y
_080D8564: .4byte _080D8568
.align 2, 0
_080D8568:
@@ -2002,7 +2002,7 @@ _080D864A:
ldr r1, _080D86E8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D8698
@@ -2021,8 +2021,8 @@ _080D8698:
ldrh r0, [r1, 0x20]
adds r0, 0x1
strh r0, [r1, 0x20]
- ldr r3, _080D86F4 @ =gUnknown_030042C0
- ldr r2, _080D86F8 @ =gUnknown_030041B4
+ ldr r3, _080D86F4 @ =gBattle_BG1_X
+ ldr r2, _080D86F8 @ =gBattle_BG1_Y
_080D86AC:
movs r1, 0
strh r1, [r3]
@@ -2056,8 +2056,8 @@ _080D86E4: .4byte 0x85000400
_080D86E8: .4byte 0x85000200
_080D86EC: .4byte REG_BG1CNT
_080D86F0: .4byte gTasks
-_080D86F4: .4byte gUnknown_030042C0
-_080D86F8: .4byte gUnknown_030041B4
+_080D86F4: .4byte gBattle_BG1_X
+_080D86F8: .4byte gBattle_BG1_Y
_080D86FC: .4byte REG_BLDCNT
thumb_func_end sub_80D851C
@@ -2070,16 +2070,16 @@ sub_80D8700: @ 80D8700
ldr r6, _080D87E8 @ =gBattleAnimArgs
ldrh r0, [r6]
strh r0, [r5, 0x2E]
- ldr r0, _080D87EC @ =gBattleAnimBankAttacker
+ ldr r0, _080D87EC @ =gAnimBankAttacker
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
adds r4, r0, 0
- ldr r7, _080D87F0 @ =gBattleAnimBankTarget
+ ldr r7, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r7]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -2137,16 +2137,16 @@ _080D8790:
movs r0, 0x1
strh r0, [r5, 0x3A]
_080D8794:
- ldr r4, _080D87EC @ =gBattleAnimBankAttacker
+ ldr r4, _080D87EC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2159,10 +2159,10 @@ _080D8794:
ldrh r1, [r5, 0x20]
adds r0, r1
strh r0, [r5, 0x30]
- ldr r4, _080D87F0 @ =gBattleAnimBankTarget
+ ldr r4, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2177,8 +2177,8 @@ _080D8794:
b _080D8824
.align 2, 0
_080D87E8: .4byte gBattleAnimArgs
-_080D87EC: .4byte gBattleAnimBankAttacker
-_080D87F0: .4byte gBattleAnimBankTarget
+_080D87EC: .4byte gAnimBankAttacker
+_080D87F0: .4byte gAnimBankTarget
_080D87F4: .4byte gBanksBySide
_080D87F8: .4byte gSprites
_080D87FC:
@@ -2186,10 +2186,10 @@ _080D87FC:
ldrh r1, [r5, 0x20]
adds r0, r1
strh r0, [r5, 0x30]
- ldr r4, _080D886C @ =gBattleAnimBankTarget
+ ldr r4, _080D886C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2202,7 +2202,7 @@ _080D87FC:
ldrb r0, [r4]
movs r1, 0x1
_080D8824:
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x8]
@@ -2215,7 +2215,7 @@ _080D8824:
ldrh r1, [r5, 0x3C]
orrs r0, r1
strh r0, [r5, 0x3C]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D8858
@@ -2236,7 +2236,7 @@ _080D8858:
pop {r0}
bx r0
.align 2, 0
-_080D886C: .4byte gBattleAnimBankTarget
+_080D886C: .4byte gAnimBankTarget
_080D8870: .4byte sub_80D8874
thumb_func_end sub_80D8700
@@ -2298,10 +2298,10 @@ _080D88C8:
_080D88D6:
movs r5, 0x50
strh r5, [r4, 0x2E]
- ldr r6, _080D8928 @ =gBattleAnimBankTarget
+ ldr r6, _080D8928 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -2337,7 +2337,7 @@ _080D88D6:
strh r0, [r4, 0x38]
b _080D893A
.align 2, 0
-_080D8928: .4byte gBattleAnimBankTarget
+_080D8928: .4byte gAnimBankTarget
_080D892C: .4byte gMain
_080D8930: .4byte 0x0000043d
_080D8934: .4byte gBanksBySide
@@ -2486,7 +2486,7 @@ _080D8A12:
cmp r0, 0
beq _080D8A78
ldr r1, _080D8A70 @ =gBanksBySide
- ldr r0, _080D8A74 @ =gBattleAnimBankTarget
+ ldr r0, _080D8A74 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -2501,7 +2501,7 @@ _080D8A12:
_080D8A68: .4byte gMain
_080D8A6C: .4byte 0x0000043d
_080D8A70: .4byte gBanksBySide
-_080D8A74: .4byte gBattleAnimBankTarget
+_080D8A74: .4byte gAnimBankTarget
_080D8A78:
ldr r0, _080D8A90 @ =0x0000fff0
_080D8A7A:
@@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r7, r0, 24
adds r0, r5, 0
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r6, r0, 24
mov r1, r8
@@ -3008,7 +3008,7 @@ _080D8E48: .4byte gTasks
unc_080B06FC: @ 80D8E4C
push {r4-r6,lr}
adds r5, r0, 0
- ldr r0, _080D8ECC @ =gDisableStructMoveAnim
+ ldr r0, _080D8ECC @ =gAnimDisableStructPtr
ldr r0, [r0]
ldrb r1, [r0, 0x11]
lsrs r0, r1, 4
@@ -3030,7 +3030,7 @@ _080D8E6A:
ldr r6, _080D8ED0 @ =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
- ldr r0, _080D8ED4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D8ED4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -3040,10 +3040,10 @@ _080D8E6A:
negs r0, r0
strh r0, [r6, 0x4]
_080D8E92:
- ldr r4, _080D8ED8 @ =gBattleAnimBankTarget
+ ldr r4, _080D8ED8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -3051,7 +3051,7 @@ _080D8E92:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -3067,10 +3067,10 @@ _080D8E92:
pop {r0}
bx r0
.align 2, 0
-_080D8ECC: .4byte gDisableStructMoveAnim
+_080D8ECC: .4byte gAnimDisableStructPtr
_080D8ED0: .4byte gBattleAnimArgs
-_080D8ED4: .4byte gBattleAnimBankAttacker
-_080D8ED8: .4byte gBattleAnimBankTarget
+_080D8ED4: .4byte gAnimBankAttacker
+_080D8ED8: .4byte gAnimBankTarget
_080D8EDC: .4byte sub_80D8EE0
thumb_func_end unc_080B06FC
@@ -3087,7 +3087,7 @@ sub_80D8EE0: @ 80D8EE0
bl StartSpriteAnim
ldr r0, _080D8F08 @ =sub_8078600
str r0, [r4, 0x1C]
- ldr r1, _080D8F0C @ =move_anim_8072740
+ ldr r1, _080D8F0C @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
_080D8F02:
@@ -3096,7 +3096,7 @@ _080D8F02:
bx r0
.align 2, 0
_080D8F08: .4byte sub_8078600
-_080D8F0C: .4byte move_anim_8072740
+_080D8F0C: .4byte DestroyAnimSprite
thumb_func_end sub_80D8EE0
thumb_func_start sub_80D8F10
@@ -3185,7 +3185,7 @@ _080D8F9C:
cmp r0, 0x15
bne _080D8FBA
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D8FBA:
pop {r4}
pop {r0}
@@ -3201,7 +3201,7 @@ sub_80D8FC0: @ 80D8FC0
ldrb r3, [r1]
lsls r3, 1
adds r3, r1
- ldr r1, _080D8FEC @ =gDisableStructMoveAnim
+ ldr r1, _080D8FEC @ =gAnimDisableStructPtr
ldr r1, [r1]
ldrb r1, [r1, 0x11]
lsrs r2, r1, 4
@@ -3215,7 +3215,7 @@ sub_80D8FC0: @ 80D8FC0
bx r0
.align 2, 0
_080D8FE8: .4byte gBattleAnimArgs
-_080D8FEC: .4byte gDisableStructMoveAnim
+_080D8FEC: .4byte gAnimDisableStructPtr
thumb_func_end sub_80D8FC0
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 5dd1d5a1a..e4fa0c454 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -34,19 +34,19 @@
.byte 0x04
.endm
- .macro atk5
+ .macro damagecalc
.byte 0x05
.endm
- .macro atk6
+ .macro typecalc
.byte 0x06
.endm
- .macro atk7
+ .macro adjustnormaldamage
.byte 0x07
.endm
- .macro atk8
+ .macro adjustnormaldamage2
.byte 0x08
.endm
@@ -58,7 +58,7 @@
.byte 0x0a
.endm
- .macro graphicalhpupdate bank
+ .macro healthbarupdate bank
.byte 0x0b
.byte \bank
.endm
@@ -72,7 +72,7 @@
.byte 0x0d
.endm
- .macro missmessage
+ .macro effectivenesssound
.byte 0x0e
.endm
@@ -85,7 +85,7 @@
.2byte \string
.endm
- .macro printstring2 string
+ .macro printselectionstring string
.byte 0x11
.2byte \string
.endm
@@ -100,41 +100,41 @@
.4byte \table
.endm
- .macro printfromtable2 table
+ .macro printselectionstringfromtable table
.byte 0x14
.4byte \table
.endm
- .macro seteffectwithchancetarget
+ .macro seteffectwithchance
.byte 0x15
.endm
- .macro seteffecttarget
+ .macro seteffectprimary
.byte 0x16
.endm
- .macro seteffectuser
+ .macro seteffectsecondary
.byte 0x17
.endm
- .macro clearstatus bank
+ .macro clearstatusfromeffect bank
.byte 0x18
.byte \bank
.endm
- .macro faintpokemon bank, param2, param3
+ .macro tryfaintmon bank, param2, param3
.byte 0x19
.byte \bank
.byte \param2
.4byte \param3
.endm
- .macro atk1a param1
+ .macro dofaintanimation param1
.byte 0x1a
.byte \param1
.endm
- .macro atk1b bank
+ .macro cleareffectsonfaint bank
.byte 0x1b
.byte \bank
.endm
@@ -146,7 +146,7 @@
.4byte \address
.endm
- .macro jumpifsecondarytstatus bank, status, address
+ .macro jumpifstatus2 bank, status, address
.byte 0x1d
.byte \bank
.4byte \status
@@ -160,7 +160,7 @@
.4byte \address
.endm
- .macro jumpifhalverset bank, status, address
+ .macro jumpifsideaffecting bank, status, address
.byte 0x1f
.byte \bank
.2byte \status
@@ -176,7 +176,7 @@
.4byte \address
.endm
- .macro jumpifspecialstatusflag bank, mask, status, address
+ .macro jumpifstatus3condition bank, mask, status, address
.byte 0x21
.byte \bank
.4byte \mask
@@ -191,7 +191,7 @@
.4byte \address
.endm
- .macro atk23 bank
+ .macro getexp bank
.byte 0x23
.byte \bank
.endm
@@ -201,21 +201,21 @@
.4byte \address
.endm
- .macro atk25
+ .macro movevaluescleanup
.byte 0x25
.endm
- .macro atk26 param1
+ .macro setmultihit param1
.byte 0x26
.byte \param1
.endm
- .macro atk27 address
+ .macro decrementmultihit address
.byte 0x27
.4byte \address
.endm
- .macro jump address
+ .macro goto address
.byte 0x28
.4byte \address
.endm
@@ -272,7 +272,7 @@
.byte \value
.endm
- .macro subtractbyte pointer, value
+ .macro subbyte pointer, value
.byte 0x30
.4byte \pointer
.byte \value
@@ -285,7 +285,7 @@
.byte \size
.endm
- .macro atk32 param1, param2, param3, byte
+ .macro copyarraywithindex param1, param2, param3, byte
.byte 0x32
.4byte \param1
.4byte \param2
@@ -334,11 +334,11 @@
.2byte \pause_duration
.endm
- .macro waitstateatk
+ .macro waitstate
.byte 0x3a
.endm
- .macro somethinghealatk3b bank
+ .macro healthbar_update bank
.byte 0x3b
.byte \bank
.endm
@@ -359,12 +359,12 @@
.byte 0x3f
.endm
- .macro atk40 address
+ .macro jumpifaffectedbyprotect address
.byte 0x40
.4byte \address
.endm
- .macro callatk address
+ .macro call address
.byte 0x41
.4byte \address
.endm
@@ -382,7 +382,7 @@
.4byte \address
.endm
- .macro atk44
+ .macro endselectionscript
.byte 0x44
.endm
@@ -393,14 +393,14 @@
.4byte \var_address
.endm
- .macro atk46 bank, address, int
+ .macro playanimation2 bank, address, int
.byte 0x46
.byte \bank
.4byte \address
.4byte \int
.endm
- .macro atk47
+ .macro setgraphicalstatchangevalues
.byte 0x47
.endm
@@ -411,37 +411,37 @@
.byte \byte
.endm
- .macro atk49 byte1, byte2
+ .macro moveend byte1, byte2
.byte 0x49
.byte \byte1
.byte \byte2
.endm
- .macro damagecalc2
+ .macro typecalc2
.byte 0x4a
.endm
- .macro atk4b
+ .macro returnatktoball
.byte 0x4b
.endm
- .macro switch1 bank
+ .macro getswitchedmondata bank
.byte 0x4c
.byte \bank
.endm
- .macro switch2 bank
+ .macro switchindataupdate bank
.byte 0x4d
.byte \bank
.endm
- .macro switch3 bank, byte
+ .macro switchinanim bank, byte
.byte 0x4e
.byte \bank
.byte \byte
.endm
- .macro jumpifcannotswitch bank, address
+ .macro jumpifcantswitch bank, address
.byte 0x4f
.byte \bank
.4byte \address
@@ -453,33 +453,33 @@
.4byte \address
.endm
- .macro atk51 bank, param2
+ .macro switchhandleorder bank, param2
.byte 0x51
.byte \bank
.byte \param2
.endm
- .macro atk52 bank
+ .macro switchineffects bank
.byte 0x52
.byte \bank
.endm
- .macro atk53 bank
+ .macro trainerslidein bank
.byte 0x53
.byte \bank
.endm
- .macro atk54 word
+ .macro playse word
.byte 0x54
.2byte \word
.endm
- .macro atk55 int
+ .macro fanfare int
.byte 0x55
- .4byte \int
+ .2byte \int
.endm
- .macro atk56 bank_or_side
+ .macro playfaintcry bank_or_side
.byte 0x56
.byte \bank_or_side
.endm
@@ -488,34 +488,34 @@
.byte 0x57
.endm
- .macro atk58 bank
+ .macro returntoball bank
.byte 0x58
.byte \bank
.endm
- .macro checkiflearnmoveinbattle param1, param2, bank_maybe
+ .macro handlelearnnewmove param1, param2, bank_maybe
.byte 0x59
.4byte \param1
.4byte \param2
.byte \bank_maybe
.endm
- .macro atk5a address
+ .macro yesnoboxlearnmove address
.byte 0x5a
.4byte \address
.endm
- .macro atk5b address
+ .macro yesnoboxstoplearningmove address
.byte 0x5b
.4byte \address
.endm
- .macro atk5c bank
+ .macro hitanimation bank
.byte 0x5c
.byte \bank
.endm
- .macro atk5d
+ .macro getmoneyreward
.byte 0x5d
.endm
@@ -528,12 +528,12 @@
.byte 0x5f
.endm
- .macro atk60 byte
+ .macro incrementgamestat byte
.byte 0x60
.byte \byte
.endm
- .macro atk61 bank_or_side
+ .macro drawpartystatussummary bank_or_side
.byte 0x61
.byte \bank_or_side
.endm
@@ -543,7 +543,7 @@
.byte \bank_or_side
.endm
- .macro jumptoattack bank
+ .macro jumptorandomattack bank
.byte 0x63
.byte \bank
.endm
@@ -553,28 +553,28 @@
.byte \bank
.endm
- .macro atk65 bank_or_side, address
+ .macro status2animation bank_or_side, address
.byte 0x65
.byte \bank_or_side
.4byte \address
.endm
- .macro atk66 bank_or_side, bank_or_side2, address
+ .macro chosenstatusanimation bank_or_side, bank_or_side2, address
.byte 0x66
.byte \bank_or_side
.byte \bank_or_side2
.4byte \address
.endm
- .macro atk67
+ .macro yesnobox
.byte 0x67
.endm
- .macro atk68
+ .macro cancelallactions
.byte 0x68
.endm
- .macro atk69
+ .macro adjustsetdamage
.byte 0x69
.endm
@@ -583,62 +583,62 @@
.byte \bank
.endm
- .macro atk6b
+ .macro atknameinbuff1
.byte 0x6b
.endm
- .macro atk6c
+ .macro drawlvlupbox
.byte 0x6c
.endm
- .macro atk6d
+ .macro resetsentmonsvalue
.byte 0x6d
.endm
- .macro atk6e
+ .macro setatktoplayer0
.byte 0x6e
.endm
- .macro atk6f bank
+ .macro makevisible bank
.byte 0x6f
.byte \bank
.endm
- .macro atk70 bank
+ .macro recordlastability bank
.byte 0x70
.byte \bank
.endm
- .macro atk71
+ .macro buffermovetolearn
.byte 0x71
.endm
- .macro atk72 address
+ .macro jumpifplayerran address
.byte 0x72
.4byte \address
.endm
- .macro atk73 bank
+ .macro hpthresholds bank
.byte 0x73
.byte \bank
.endm
- .macro atk74 bank
+ .macro hpthresholds2 bank
.byte 0x74
.byte \bank
.endm
- .macro atk75
+ .macro useitemonopponent
.byte 0x75
.endm
- .macro atk76 bank, byte
+ .macro various bank, byte
.byte 0x76
.byte \bank
.byte \byte
.endm
- .macro setprotect
+ .macro setprotectlike
.byte 0x77
.endm
@@ -646,22 +646,22 @@
.byte 0x78
.endm
- .macro setuserhptozero
+ .macro setatkhptozero
.byte 0x79
.endm
- .macro jumpwhiletargetvalid address
+ .macro jumpifnexttargetvalid address
.byte 0x7a
.4byte \address
.endm
- .macro setdamageasrestorehalfmaxhp address, byte
+ .macro tryhealhalfhealth address, byte
.byte 0x7b
.4byte \address
.byte \byte
.endm
- .macro jumptolastusedattack
+ .macro trymirrormove
.byte 0x7c
.endm
@@ -673,7 +673,7 @@
.byte 0x7e
.endm
- .macro setleechseed
+ .macro setseeded
.byte 0x7f
.endm
@@ -682,7 +682,7 @@
.byte \id
.endm
- .macro setrest address
+ .macro trysetrest address
.byte 0x81
.4byte \address
.endm
@@ -692,11 +692,11 @@
.4byte \address
.endm
- .macro nop3
+ .macro nop
.byte 0x83
.endm
- .macro jumpifcannotsleep address
+ .macro jumpifcantmakeasleep address
.byte 0x84
.4byte \address
.endm
@@ -710,7 +710,7 @@
.4byte \address
.endm
- .macro stockpiletohprecovery address
+ .macro stockpiletohpheal address
.byte 0x87
.4byte \address
.endm
@@ -737,12 +737,12 @@
.byte 0x8c
.endm
- .macro setloopcounter count
+ .macro setmultihitcounter count
.byte 0x8d
.byte \count
.endm
- .macro atk8e
+ .macro initmultihitstring
.byte 0x8e
.endm
@@ -751,12 +751,12 @@
.4byte \address
.endm
- .macro changetypestoenemyattacktype address
+ .macro tryconversiontypechange address
.byte 0x90
.4byte \address
.endm
- .macro givemoney
+ .macro givepaydaymoney
.byte 0x91
.endm
@@ -764,12 +764,12 @@
.byte 0x92
.endm
- .macro koplussomethings address
+ .macro tryKO address
.byte 0x93
.4byte \address
.endm
- .macro gethalfcurrentenemyhp
+ .macro damagetohalftargethp
.byte 0x94
.endm
@@ -781,21 +781,21 @@
.byte 0x96
.endm
- .macro tryinfatuatetarget address
+ .macro tryinfatuating address
.byte 0x97
.4byte \address
.endm
- .macro atk98 byte
+ .macro updatestatusicon byte
.byte 0x98
.byte \byte
.endm
- .macro setmisteffect
+ .macro setmist
.byte 0x99
.endm
- .macro setincreasedcriticalchance
+ .macro setfocusenergy
.byte 0x9a
.endm
@@ -803,20 +803,20 @@
.byte 0x9b
.endm
- .macro setsubstituteeffect
+ .macro setsubstitute
.byte 0x9c
.endm
- .macro copyattack address
+ .macro mimicattackcopy address
.byte 0x9d
.4byte \address
.endm
- .macro metronomeeffect
+ .macro metronome
.byte 0x9e
.endm
- .macro nightshadedamageeffect
+ .macro dmgtolevel
.byte 0x9f
.endm
@@ -839,12 +839,12 @@
.4byte \address
.endm
- .macro setencore address
+ .macro trysetencore address
.byte 0xa4
.4byte \address
.endm
- .macro painsplitdamagecalculator address
+ .macro painsplitdmgcalc address
.byte 0xa5
.4byte \address
.endm
@@ -863,16 +863,16 @@
.4byte \address
.endm
- .macro selectrandommovefromusermoves address
+ .macro trychoosesleeptalkmove address
.byte 0xa9
.4byte \address
.endm
- .macro destinybondeffect
+ .macro setdestinybond
.byte 0xaa
.endm
- .macro atkab
+ .macro trysetdestinybondtohappen
.byte 0xab
.endm
@@ -880,12 +880,12 @@
.byte 0xac
.endm
- .macro reducepprandom address
+ .macro tryspiteppreduce address
.byte 0xad
.4byte \address
.endm
- .macro clearstatusifnotsoundproofed
+ .macro healpartystatus
.byte 0xae
.endm
@@ -894,7 +894,7 @@
.4byte \address
.endm
- .macro setspikes address
+ .macro trysetspikes address
.byte 0xb0
.4byte \address
.endm
@@ -903,7 +903,7 @@
.byte 0xb1
.endm
- .macro setperishsong address
+ .macro trysetperishsong address
.byte 0xb2
.4byte \address
.endm
@@ -912,13 +912,13 @@
.byte 0xb3
.endm
- .macro jumpifconfusedandattackmaxed bank, address
+ .macro jumpifconfusedandstatmaxed bank, address
.byte 0xb4
.byte \bank
.4byte \address
.endm
- .macro furycutterdamagecalculation
+ .macro furycuttercalc
.byte 0xb5
.endm
@@ -938,7 +938,7 @@
.byte 0xb9
.endm
- .macro atkba address
+ .macro jumpifnopursuitswitchdmg address
.byte 0xba
.4byte \address
.endm
@@ -957,11 +957,11 @@
.4byte \address
.endm
- .macro breakfree
+ .macro rapidspinfree
.byte 0xbe
.endm
- .macro setcurled
+ .macro setdefensecurlbit
.byte 0xbf
.endm
@@ -970,30 +970,30 @@
.4byte \address
.endm
- .macro hiddenpowerdamagecalculation
+ .macro hiddenpowercalc
.byte 0xc1
.endm
- .macro selectnexttarget
+ .macro selectfirstvalidtarget
.byte 0xc2
.endm
- .macro setfutureattack address
+ .macro trysetfutureattack address
.byte 0xc3
.4byte \address
.endm
- .macro beatupcalculation address1, address2
+ .macro trydobeatup address1, address2
.byte 0xc4
.4byte \address1
.4byte \address2
.endm
- .macro hidepreattack
+ .macro setsemiinvulnerablebit
.byte 0xc5
.endm
- .macro unhidepostattack
+ .macro clearsemiinvulnerablebit
.byte 0xc6
.endm
@@ -1042,28 +1042,28 @@
.4byte \address
.endm
- .macro sethelpinghand address
+ .macro trysethelpinghand address
.byte 0xd1
.4byte \address
.endm
- .macro itemswap address
+ .macro tryswapitems address
.byte 0xd2
.4byte \address
.endm
- .macro copyability address
+ .macro trycopyability address
.byte 0xd3
.4byte \address
.endm
- .macro atkd4 byte, address
+ .macro trywish byte, address
.byte 0xd4
.byte \byte
.4byte \address
.endm
- .macro setroots address
+ .macro trysetroots address
.byte 0xd5
.4byte \address
.endm
@@ -1086,17 +1086,17 @@
.byte 0xd9
.endm
- .macro abilityswap address
+ .macro tryswapabilities address
.byte 0xda
.4byte \address
.endm
- .macro imprisoneffect address
+ .macro tryimprision address
.byte 0xdb
.4byte \address
.endm
- .macro setgrudge address
+ .macro trysetgrudge address
.byte 0xdc
.4byte \address
.endm
@@ -1110,45 +1110,45 @@
.4byte \address
.endm
- .macro setmagiccoat address
+ .macro trysetmagiccoat address
.byte 0xdf
.4byte \address
.endm
- .macro setstealstatchange address
+ .macro trysetsnatch address
.byte 0xe0
.4byte \address
.endm
- .macro atke1 address
+ .macro trygetintimidatetarget address
.byte 0xe1
.4byte \address
.endm
- .macro atke2 bank
+ .macro switchoutabilities bank
.byte 0xe2
.byte \bank
.endm
- .macro jumpiffainted bank, address
+ .macro jumpifhasnohp bank, address
.byte 0xe3
.byte \bank
.4byte \address
.endm
- .macro naturepowereffect
+ .macro getsecretpowereffect
.byte 0xe4
.endm
- .macro pickupitemcalculation
+ .macro pickup
.byte 0xe5
.endm
- .macro actualcastformswitch
+ .macro docastformchangeanimation
.byte 0xe6
.endm
- .macro castformswitch
+ .macro trycastformdatachange
.byte 0xe7
.endm
@@ -1157,11 +1157,11 @@
.4byte \address
.endm
- .macro seteffectbyweather
+ .macro setweatherballtype
.byte 0xe9
.endm
- .macro recycleitem address
+ .macro tryrecycleitem address
.byte 0xea
.4byte \address
.endm
@@ -1171,58 +1171,244 @@
.4byte \address
.endm
- .macro pursuitwhenswitched address
+ .macro pursuitrelated address
.byte 0xec
.4byte \address
.endm
- .macro snatchmove
+ .macro snatchsetbanks
.byte 0xed
.endm
- .macro removereflectlightscreen
+ .macro removelightscreenreflect
.byte 0xee
.endm
- .macro pokemoncatchfunction
+ .macro handleballthrow
.byte 0xef
.endm
- .macro catchpoke
+ .macro givecaughtmon
.byte 0xf0
.endm
- .macro capturesomethingf1 address
+ .macro trysetcaughtmondexflags address
.byte 0xf1
.4byte \address
.endm
- .macro capturesomethingf2
+ .macro displaydexinfo
.byte 0xf2
.endm
- .macro capturesomethingf3 address
+ .macro trygivecaughtmonnick address
.byte 0xf3
.4byte \address
.endm
- .macro removehp
+ .macro subattackerhpbydmg
.byte 0xf4
.endm
- .macro curestatusfirstword
+ .macro removeattackerstatus1
.byte 0xf5
.endm
- .macro atkf6
+ .macro finishaction
.byte 0xf6
.endm
- .macro activesidesomething
+ .macro finishturn
.byte 0xf7
.endm
- .macro atkf8 bank
+ .macro trainerslideout bank
.byte 0xf8
.byte \bank
.endm
+
+@ various command changed to more readable macros
+ .macro cancelmultiturnmoves bank
+ various \bank, VARIOUS_CANCEL_MULTI_TURN_MOVES
+ .endm
+
+ .macro setmagiccoattarget bank
+ various \bank, VARIOUS_SET_MAGIC_COAT_TARGET
+ .endm
+
+ .macro getifcantrunfrombattle bank
+ various \bank, VARIOUS_IS_RUNNING_IMPOSSIBLE
+ .endm
+
+ .macro getmovetarget bank
+ various \bank, VARIOUS_GET_MOVE_TARGET
+ .endm
+
+ .macro various4 bank
+ various \bank, 4
+ .endm
+
+ .macro resetintrimidatetracebits bank
+ various \bank, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
+ .endm
+
+ .macro updatechoicemoveonlvlup bank
+ various \bank, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
+ .endm
+
+ .macro various7 bank
+ various \bank, 7
+ .endm
+
+ .macro various8 bank
+ various \bank, 8
+ .endm
+
+ .macro various9 bank
+ various \bank, 9
+ .endm
+
+ .macro various10 bank
+ various \bank, 10
+ .endm
+
+ .macro various11 bank
+ various \bank, 11
+ .endm
+
+ .macro various12 bank
+ various \bank, 12
+ .endm
+
+ .macro forfeityesnobox bank
+ various \bank, VARIOUS_EMIT_YESNOBOX
+ .endm
+
+ .macro various14 bank
+ various \bank, 14
+ .endm
+
+ .macro various15 bank
+ various \bank, 15
+ .endm
+
+ .macro various16 bank
+ various \bank, 16
+ .endm
+
+ .macro various17 bank
+ various \bank, 17
+ .endm
+
+ .macro waitcry bank
+ various \bank, VARIOUS_WAIT_CRY
+ .endm
+
+ .macro returnopponentmon1toball bank
+ various \bank, VARIOUS_RETURN_OPPONENT_MON1
+ .endm
+
+ .macro returnopponentmon2toball bank
+ various \bank, VARIOUS_RETURN_OPPONENT_MON2
+ .endm
+
+ .macro various21 bank
+ various \bank, 21
+ .endm
+
+ .macro various22 bank
+ various \bank, 22
+ .endm
+
+ .macro various23 bank
+ various \bank, 23
+ .endm
+
+ .macro various24 bank
+ various \bank, 24
+ .endm
+
+ .macro setoutcomeonteleport bank
+ various \bank, VARIOUS_SET_TELEPORT_OUTCOME
+ .endm
+
+ .macro playtrainerdefeatbgm bank
+ various \bank, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
+ .endm
+
+@ helpful macros
+ .macro setstatchanger stat, stages, down
+ setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7
+ .endm
+
+ .macro setmoveeffect effect
+ setbyte cEFFECT_CHOOSER \effect
+ .endm
+
+ .macro chosenstatus1animation bank, status
+ chosenstatusanimation \bank 0x0 \status
+ .endm
+
+ .macro chosenstatus2animation bank, status
+ chosenstatusanimation \bank 0x1 \status
+ .endm
+
+ .macro sethword dst, value
+ setbyte \dst, \value & 0xFF
+ setbyte \dst + 1, (\value >> 8) & 0xFF
+ .endm
+
+ .macro setword dst, value
+ setbyte \dst, \value & 0xFF
+ setbyte \dst + 1, (\value >> 8) & 0xFF
+ setbyte \dst + 2, (\value >> 16) & 0xFF
+ setbyte \dst + 3, (\value >> 24) & 0xFF
+ .endm
+
+ .macro copybyte dst, src
+ copyarray \dst, \src, 0x1
+ .endm
+
+ .macro copyhword dst, src
+ copyarray \dst, \src, 0x2
+ .endm
+
+ .macro copyword dst, src
+ copyarray \dst, \src, 0x4
+ .endm
+
+ .macro jumpifbytenotequal byte1, byte2, jumpptr
+ jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr
+ .endm
+
+ .macro jumpifbyteequal byte1, byte2, jumpptr
+ jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr
+ .endm
+
+ .macro jumpifmove move, jumpptr
+ jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr
+ .endm
+
+ .macro jumpifnotmove move, jumpptr
+ jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr
+ .endm
+
+ .macro jumpifstatus3 bank, status, jumpptr
+ jumpifstatus3condition \bank, \status, 0x0, \jumpptr
+ .endm
+
+ .macro jumpifnostatus3 bank, status, jumpptr
+ jumpifstatus3condition \bank, \status, 0x1, \jumpptr
+ .endm
+
+ .macro jumpifmovehadnoeffect jumpptr
+ jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
+ .endm
+
+ .macro jumpifbattletype flags, jumpptr
+ jumpifhalfword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+ .endm
+
+ .macro jumpifnotbattletype flags, jumpptr
+ jumpifhalfword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+ .endm
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 738c2418e..5176beff3 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1366,11 +1366,11 @@
.endm
.macro switch var
- copyvar 0x8000, \var
+ copyvar VAR_SPECIAL_0, \var
.endm
.macro case condition, dest
- compare_var_to_value 0x8000, \condition
+ compare_var_to_value VAR_SPECIAL_0, \condition
goto_if_eq \dest
.endm
@@ -1386,12 +1386,12 @@
NO = 0
.macro giveitem_std item, amount=1, function=0
- setorcopyvar 0x8000, \item
- setorcopyvar 0x8001, \amount
+ setorcopyvar VAR_SPECIAL_0, \item
+ setorcopyvar VAR_SPECIAL_1, \amount
callstd \function
.endm
.macro givedecoration_std decoration
- setorcopyvar 0x8000, \decoration
+ setorcopyvar VAR_SPECIAL_0, \decoration
callstd 7
.endm
diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 9c68e8414..db37d9346 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -40,6 +40,10 @@
inc _num_traps
.endm
+ .macro coord_weather_event x, y, height, weather
+ coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0
+ .endm
+
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.2byte \x, \y
.byte \byte, \kind
@@ -53,6 +57,14 @@
inc _num_signs
.endm
+ .macro bg_hidden_item_event x, y, height, item, flag
+ bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
+ .endm
+
+ .macro bg_secret_base_event x, y, height, secret_base_id
+ bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0
+ .endm
+
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
diff --git a/asm/normal.s b/asm/normal.s
index 2d084dcf1..a800b348a 100755
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -22,7 +22,7 @@ sub_80E1CB4: @ 80E1CB4
strh r0, [r4, 0x22]
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
- ldr r0, _080E1CF0 @ =gBattleAnimBankAttacker
+ ldr r0, _080E1CF0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -37,7 +37,7 @@ sub_80E1CB4: @ 80E1CB4
b _080E1D02
.align 2, 0
_080E1CEC: .4byte gBattleAnimArgs
-_080E1CF0: .4byte gBattleAnimBankAttacker
+_080E1CF0: .4byte gAnimBankAttacker
_080E1CF4:
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x30]
@@ -108,7 +108,7 @@ _080E1D5A:
cmp r0, r1
bne _080E1D7E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E1D7E:
pop {r4}
pop {r0}
@@ -198,7 +198,7 @@ sub_80E1E0C: @ 80E1E0C
cmp r0, 0
bne _080E1E22
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E1E22:
pop {r0}
bx r0
@@ -338,7 +338,7 @@ sub_80E1F0C: @ 80E1F0C
movs r2, 0
bl BlendPalettes
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E1F32:
pop {r4}
pop {r0}
@@ -875,9 +875,9 @@ sub_80E2324: @ 80E2324
lsrs r0, 24
mov r8, r0
movs r2, 0
- ldr r0, _080E239C @ =gBattleAnimBankAttacker
+ ldr r0, _080E239C @ =gAnimBankAttacker
ldrb r6, [r0]
- ldr r0, _080E23A0 @ =gBattleAnimBankTarget
+ ldr r0, _080E23A0 @ =gAnimBankTarget
ldrb r7, [r0]
ldr r4, _080E23A4 @ =gBattleAnimArgs
ldrh r1, [r4]
@@ -927,8 +927,8 @@ _080E2382:
pop {r0}
bx r0
.align 2, 0
-_080E239C: .4byte gBattleAnimBankAttacker
-_080E23A0: .4byte gBattleAnimBankTarget
+_080E239C: .4byte gAnimBankAttacker
+_080E23A0: .4byte gAnimBankTarget
_080E23A4: .4byte gBattleAnimArgs
thumb_func_end sub_80E2324
@@ -971,10 +971,10 @@ _080E23EA:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
- ldr r0, _080E24A4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E24A4 @ =gAnimBankAttacker
ldrb r0, [r0]
mov r9, r0
- ldr r0, _080E24A8 @ =gBattleAnimBankTarget
+ ldr r0, _080E24A8 @ =gAnimBankTarget
ldrb r0, [r0]
mov r10, r0
ldrh r1, [r4, 0xC]
@@ -1061,8 +1061,8 @@ _080E248E:
.align 2, 0
_080E249C: .4byte gTasks
_080E24A0: .4byte gBattleAnimArgs
-_080E24A4: .4byte gBattleAnimBankAttacker
-_080E24A8: .4byte gBattleAnimBankTarget
+_080E24A4: .4byte gAnimBankAttacker
+_080E24A8: .4byte gAnimBankTarget
_080E24AC: .4byte 0x0000ffff
_080E24B0: .4byte gSprites
_080E24B4: .4byte gHealthboxIDs
@@ -1237,7 +1237,7 @@ _080E25D2:
bcc _080E25D2
_080E25F4:
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E25FA:
pop {r4-r7}
pop {r0}
@@ -1253,7 +1253,7 @@ sub_80E260C: @ 80E260C
push {r4-r6,lr}
ldr r6, _080E2680 @ =gSprites
ldr r4, _080E2684 @ =gObjectBankIDs
- ldr r5, _080E2688 @ =gBattleAnimBankAttacker
+ ldr r5, _080E2688 @ =gAnimBankAttacker
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -1268,7 +1268,7 @@ sub_80E260C: @ 80E260C
adds r0, r2, 0
ands r0, r3
strb r0, [r1]
- ldr r3, _080E268C @ =gBattleAnimBankTarget
+ ldr r3, _080E268C @ =gAnimBankTarget
ldrb r0, [r3]
adds r0, r4
ldrb r1, [r0]
@@ -1310,8 +1310,8 @@ sub_80E260C: @ 80E260C
.align 2, 0
_080E2680: .4byte gSprites
_080E2684: .4byte gObjectBankIDs
-_080E2688: .4byte gBattleAnimBankAttacker
-_080E268C: .4byte gBattleAnimBankTarget
+_080E2688: .4byte gAnimBankAttacker
+_080E268C: .4byte gAnimBankTarget
_080E2690: .4byte gBattleAnimArgs
_080E2694:
cmp r0, 0
@@ -1482,7 +1482,7 @@ _080E27C4:
_080E27CC:
ldr r0, _080E27E0 @ =sub_80785E4
str r0, [r5, 0x1C]
- ldr r1, _080E27E4 @ =move_anim_8072740
+ ldr r1, _080E27E4 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -1490,7 +1490,7 @@ _080E27CC:
bx r0
.align 2, 0
_080E27E0: .4byte sub_80785E4
-_080E27E4: .4byte move_anim_8072740
+_080E27E4: .4byte DestroyAnimSprite
thumb_func_end sub_80E27A0
thumb_func_start sub_80E27E8
@@ -1536,13 +1536,13 @@ _080E2834: .4byte sub_80DA48C
sub_80E2838: @ 80E2838
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080E2868 @ =gBattleAnimBankAttacker
+ ldr r0, _080E2868 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E285C
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E285C
@@ -1557,7 +1557,7 @@ _080E285C:
pop {r0}
bx r0
.align 2, 0
-_080E2868: .4byte gBattleAnimBankAttacker
+_080E2868: .4byte gAnimBankAttacker
_080E286C: .4byte gBattleAnimArgs
thumb_func_end sub_80E2838
@@ -1706,7 +1706,7 @@ _080E299C:
ldr r0, _080E29B4 @ =gBattleAnimArgs
ldrh r0, [r0, 0x6]
strh r0, [r4, 0x2E]
- ldr r1, _080E29B8 @ =move_anim_8072740
+ ldr r1, _080E29B8 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
ldr r0, _080E29BC @ =sub_80782D8
@@ -1716,7 +1716,7 @@ _080E299C:
bx r0
.align 2, 0
_080E29B4: .4byte gBattleAnimArgs
-_080E29B8: .4byte move_anim_8072740
+_080E29B8: .4byte DestroyAnimSprite
_080E29BC: .4byte sub_80782D8
thumb_func_end sub_80E2978
@@ -1778,7 +1778,7 @@ sub_80E29FC: @ 80E29FC
cmp r0, 0xC
ble _080E2A32
adds r0, r3, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080E2A32:
pop {r0}
bx r0
@@ -1857,33 +1857,33 @@ _080E2AD0:
movs r5, 0
_080E2AD2:
mov r0, sp
- ldr r1, _080E2AD8 @ =gBattleAnimBankAttacker
+ ldr r1, _080E2AD8 @ =gAnimBankAttacker
b _080E2AE2
.align 2, 0
-_080E2AD8: .4byte gBattleAnimBankAttacker
+_080E2AD8: .4byte gAnimBankAttacker
_080E2ADC:
movs r5, 0
_080E2ADE:
mov r0, sp
- ldr r1, _080E2AE8 @ =gBattleAnimBankTarget
+ ldr r1, _080E2AE8 @ =gAnimBankTarget
_080E2AE2:
ldrb r1, [r1]
strb r1, [r0]
b _080E2B26
.align 2, 0
-_080E2AE8: .4byte gBattleAnimBankTarget
+_080E2AE8: .4byte gAnimBankTarget
_080E2AEC:
mov r1, sp
- ldr r0, _080E2AFC @ =gBattleAnimBankAttacker
+ ldr r0, _080E2AFC @ =gAnimBankAttacker
ldrb r0, [r0]
strb r0, [r1]
- ldr r0, _080E2B00 @ =gBattleAnimBankTarget
+ ldr r0, _080E2B00 @ =gAnimBankTarget
ldrb r0, [r0]
strb r0, [r1, 0x1]
b _080E2B26
.align 2, 0
-_080E2AFC: .4byte gBattleAnimBankAttacker
-_080E2B00: .4byte gBattleAnimBankTarget
+_080E2AFC: .4byte gAnimBankAttacker
+_080E2B00: .4byte gAnimBankTarget
_080E2B04:
mov r1, sp
movs r0, 0xFF
@@ -1892,14 +1892,14 @@ _080E2B04:
_080E2B0C:
movs r5, 0
mov r2, sp
- ldr r0, _080E2B14 @ =gBattleAnimBankAttacker
+ ldr r0, _080E2B14 @ =gAnimBankAttacker
b _080E2B1E
.align 2, 0
-_080E2B14: .4byte gBattleAnimBankAttacker
+_080E2B14: .4byte gAnimBankAttacker
_080E2B18:
movs r5, 0
mov r2, sp
- ldr r0, _080E2B70 @ =gBattleAnimBankTarget
+ ldr r0, _080E2B70 @ =gAnimBankTarget
_080E2B1E:
ldrb r0, [r0]
movs r1, 0x2
@@ -1942,7 +1942,7 @@ _080E2B54:
pop {r0}
bx r0
.align 2, 0
-_080E2B70: .4byte gBattleAnimBankTarget
+_080E2B70: .4byte gAnimBankTarget
thumb_func_end sub_80E2A7C
thumb_func_start sub_80E2B74
@@ -2447,9 +2447,9 @@ sub_80E2F2C: @ 80E2F2C
lsrs r0, 24
mov r9, r0
movs r7, 0
- ldr r0, _080E3038 @ =gUnknown_030042C4
+ ldr r0, _080E3038 @ =gBattle_WIN0H
strh r7, [r0]
- ldr r0, _080E303C @ =gUnknown_03004240
+ ldr r0, _080E303C @ =gBattle_WIN0V
strh r7, [r0]
ldr r1, _080E3040 @ =REG_WININ
ldr r2, _080E3044 @ =0x00003f3f
@@ -2490,7 +2490,7 @@ sub_80E2F2C: @ 80E2F2C
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E2FAC
@@ -2506,11 +2506,11 @@ _080E2FAC:
lsls r0, 24
cmp r0, 0
beq _080E3028
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3028
- ldr r5, _080E305C @ =gBattleAnimBankAttacker
+ ldr r5, _080E305C @ =gAnimBankAttacker
ldrb r0, [r5]
bl GetBankIdentity
lsls r0, 24
@@ -2561,7 +2561,7 @@ _080E2FDC:
strb r0, [r4]
movs r7, 0x1
_080E3028:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E306C
@@ -2569,8 +2569,8 @@ _080E3028:
ldrh r4, [r0]
b _080E30B4
.align 2, 0
-_080E3038: .4byte gUnknown_030042C4
-_080E303C: .4byte gUnknown_03004240
+_080E3038: .4byte gBattle_WIN0H
+_080E303C: .4byte gBattle_WIN0V
_080E3040: .4byte REG_WININ
_080E3044: .4byte 0x00003f3f
_080E3048: .4byte 0x00003f3d
@@ -2578,12 +2578,12 @@ _080E304C: .4byte REG_BLDCNT
_080E3050: .4byte 0x00003f42
_080E3054: .4byte 0x00000c08
_080E3058: .4byte REG_BG1CNT
-_080E305C: .4byte gBattleAnimBankAttacker
+_080E305C: .4byte gAnimBankAttacker
_080E3060: .4byte gSprites
_080E3064: .4byte gObjectBankIDs
_080E3068: .4byte gSharedMem + 0x19348
_080E306C:
- ldr r4, _080E308C @ =gBattleAnimBankAttacker
+ ldr r4, _080E308C @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -2599,7 +2599,7 @@ _080E306C:
ldr r1, _080E3094 @ =gEnemyParty
b _080E30A8
.align 2, 0
-_080E308C: .4byte gBattleAnimBankAttacker
+_080E308C: .4byte gAnimBankAttacker
_080E3090: .4byte gBattlePartyID
_080E3094: .4byte gEnemyParty
_080E3098:
@@ -2622,7 +2622,7 @@ _080E30B4:
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080E3168 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3168 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r1, r5, 0
adds r2, r4, 0
@@ -2643,7 +2643,7 @@ _080E30B4:
ldr r0, [r2, 0x8]
ldr r0, _080E3174 @ =gUnknown_08D20A30
bl LZDecompressVram
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3106
@@ -2664,7 +2664,7 @@ _080E3106:
adds r1, 0x1
movs r2, 0x2
bl LoadPalette
- ldr r2, _080E3180 @ =gUnknown_030042C0
+ ldr r2, _080E3180 @ =gBattle_BG1_X
ldr r0, _080E3184 @ =gSprites
lsls r1, r5, 4
adds r1, r5
@@ -2674,7 +2674,7 @@ _080E3106:
negs r0, r0
adds r0, 0x20
strh r0, [r2]
- ldr r2, _080E3188 @ =gUnknown_030041B4
+ ldr r2, _080E3188 @ =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@@ -2699,15 +2699,15 @@ _080E3106:
.align 2, 0
_080E3160: .4byte gBattlePartyID
_080E3164: .4byte gPlayerParty
-_080E3168: .4byte gBattleAnimBankAttacker
+_080E3168: .4byte gAnimBankAttacker
_080E316C: .4byte 0x040000d4
_080E3170: .4byte 0x85000400
_080E3174: .4byte gUnknown_08D20A30
_080E3178: .4byte gUnknown_08D20A14
_080E317C: .4byte gUnknown_083DB568
-_080E3180: .4byte gUnknown_030042C0
+_080E3180: .4byte gBattle_BG1_X
_080E3184: .4byte gSprites
-_080E3188: .4byte gUnknown_030041B4
+_080E3188: .4byte gBattle_BG1_Y
_080E318C: .4byte gTasks
_080E3190: .4byte sub_80E3194
thumb_func_end sub_80E2F2C
@@ -2729,7 +2729,7 @@ sub_80E3194: @ 80E3194
adds r0, 0x4
movs r5, 0
strh r0, [r4, 0x1C]
- ldr r7, _080E32B0 @ =gUnknown_030041B4
+ ldr r7, _080E32B0 @ =gBattle_BG1_Y
ldrh r2, [r7]
subs r1, r2, 0x4
strh r1, [r7]
@@ -2750,9 +2750,9 @@ sub_80E3194: @ 80E3194
bne _080E329E
movs r0, 0
bl sub_8076464
- ldr r0, _080E32B4 @ =gUnknown_030042C4
+ ldr r0, _080E32B4 @ =gBattle_WIN0H
strh r5, [r0]
- ldr r0, _080E32B8 @ =gUnknown_03004240
+ ldr r0, _080E32B8 @ =gBattle_WIN0V
strh r5, [r0]
ldr r0, _080E32BC @ =REG_WININ
ldr r2, _080E32C0 @ =0x00003f3f
@@ -2760,7 +2760,7 @@ sub_80E3194: @ 80E3194
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3208
@@ -2810,7 +2810,7 @@ _080E3208:
cmp r0, 0x1
bne _080E3288
ldr r2, _080E32D8 @ =gObjectBankIDs
- ldr r0, _080E32DC @ =gBattleAnimBankAttacker
+ ldr r0, _080E32DC @ =gAnimBankAttacker
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -2852,9 +2852,9 @@ _080E329E:
bx r0
.align 2, 0
_080E32AC: .4byte gTasks
-_080E32B0: .4byte gUnknown_030041B4
-_080E32B4: .4byte gUnknown_030042C4
-_080E32B8: .4byte gUnknown_03004240
+_080E32B0: .4byte gBattle_BG1_Y
+_080E32B4: .4byte gBattle_WIN0H
+_080E32B8: .4byte gBattle_WIN0V
_080E32BC: .4byte REG_WININ
_080E32C0: .4byte 0x00003f3f
_080E32C4: .4byte REG_BG1CNT
@@ -2863,7 +2863,7 @@ _080E32CC: .4byte gSprites
_080E32D0: .4byte 0x040000d4
_080E32D4: .4byte 0x85000200
_080E32D8: .4byte gObjectBankIDs
-_080E32DC: .4byte gBattleAnimBankAttacker
+_080E32DC: .4byte gAnimBankAttacker
thumb_func_end sub_80E3194
thumb_func_start sub_80E32E0
@@ -2954,13 +2954,13 @@ _080E336C:
ldrsh r0, [r7, r1]
cmp r0, 0
bne _080E3390
- ldr r0, _080E338C @ =gBattleAnimBankAttacker
+ ldr r0, _080E338C @ =gAnimBankAttacker
b _080E3392
.align 2, 0
_080E3388: .4byte gTasks
-_080E338C: .4byte gBattleAnimBankAttacker
+_080E338C: .4byte gAnimBankAttacker
_080E3390:
- ldr r0, _080E34B4 @ =gBattleAnimBankTarget
+ ldr r0, _080E34B4 @ =gAnimBankTarget
_080E3392:
ldrb r5, [r0]
movs r0, 0x2
@@ -2968,7 +2968,7 @@ _080E3392:
mov r2, r8
eors r2, r0
mov r8, r2
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E33BC
@@ -2985,10 +2985,10 @@ _080E33BC:
movs r0, 0
strh r0, [r7, 0x6]
_080E33C0:
- ldr r0, _080E34B8 @ =gUnknown_030042C4
+ ldr r0, _080E34B8 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _080E34BC @ =gUnknown_03004240
+ ldr r0, _080E34BC @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _080E34C0 @ =REG_WININ
ldr r2, _080E34C4 @ =0x00003f3f
@@ -3030,7 +3030,7 @@ _080E33C0:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3432
@@ -3097,7 +3097,7 @@ _080E345E:
movs r2, 0x1
str r2, [sp, 0x20]
_080E34A4:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E34E4
@@ -3105,9 +3105,9 @@ _080E34A4:
ldrh r4, [r0]
b _080E3522
.align 2, 0
-_080E34B4: .4byte gBattleAnimBankTarget
-_080E34B8: .4byte gUnknown_030042C4
-_080E34BC: .4byte gUnknown_03004240
+_080E34B4: .4byte gAnimBankTarget
+_080E34B8: .4byte gBattle_WIN0H
+_080E34BC: .4byte gBattle_WIN0V
_080E34C0: .4byte REG_WININ
_080E34C4: .4byte 0x00003f3f
_080E34C8: .4byte 0x00003f3d
@@ -3191,7 +3191,7 @@ _080E3578:
ldr r1, [sp, 0x4]
bl LZDecompressVram
_080E3580:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3598
@@ -3272,10 +3272,10 @@ _080E3610:
movs r2, 0x20
bl LoadCompressedPalette
_080E361E:
- ldr r2, _080E3648 @ =gUnknown_030042C0
+ ldr r2, _080E3648 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r2]
- ldr r0, _080E364C @ =gUnknown_030041B4
+ ldr r0, _080E364C @ =gBattle_BG1_Y
strh r1, [r0]
movs r3, 0
ldrsh r0, [r7, r3]
@@ -3293,8 +3293,8 @@ _080E361E:
b _080E3668
.align 2, 0
_080E3644: .4byte gBattleStatMask5_Pal
-_080E3648: .4byte gUnknown_030042C0
-_080E364C: .4byte gUnknown_030041B4
+_080E3648: .4byte gBattle_BG1_X
+_080E364C: .4byte gBattle_BG1_Y
_080E3650: .4byte gTasks
_080E3654: .4byte 0x0000fffd
_080E3658:
@@ -3356,7 +3356,7 @@ _080E3692:
bne _080E36E0
movs r0, 0x40
negs r0, r0
- bl sub_8077094
+ bl BattleAnimAdjustPanning2
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3369,7 +3369,7 @@ _080E36DC: .4byte sub_80E3704
_080E36E0:
movs r0, 0x40
negs r0, r0
- bl sub_8077094
+ bl BattleAnimAdjustPanning2
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3391,7 +3391,7 @@ sub_80E3704: @ 80E3704
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r2, _080E3730 @ =gUnknown_030041B4
+ ldr r2, _080E3730 @ =gBattle_BG1_Y
ldr r1, _080E3734 @ =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -3411,7 +3411,7 @@ sub_80E3704: @ 80E3704
beq _080E373E
b _080E3866
.align 2, 0
-_080E3730: .4byte gUnknown_030041B4
+_080E3730: .4byte gBattle_BG1_Y
_080E3734: .4byte gTasks
_080E3738:
cmp r2, 0x2
@@ -3484,9 +3484,9 @@ _080E378E:
bne _080E3866
movs r0, 0
bl sub_8076464
- ldr r0, _080E3870 @ =gUnknown_030042C4
+ ldr r0, _080E3870 @ =gBattle_WIN0H
strh r5, [r0]
- ldr r0, _080E3874 @ =gUnknown_03004240
+ ldr r0, _080E3874 @ =gBattle_WIN0V
strh r5, [r0]
ldr r0, _080E3878 @ =REG_WININ
ldr r2, _080E387C @ =0x00003f3f
@@ -3494,7 +3494,7 @@ _080E378E:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E37E8
@@ -3573,8 +3573,8 @@ _080E3866:
bx r0
.align 2, 0
_080E386C: .4byte REG_BLDALPHA
-_080E3870: .4byte gUnknown_030042C4
-_080E3874: .4byte gUnknown_03004240
+_080E3870: .4byte gBattle_WIN0H
+_080E3874: .4byte gBattle_WIN0V
_080E3878: .4byte REG_WININ
_080E387C: .4byte 0x00003f3f
_080E3880: .4byte REG_BG1CNT
@@ -3791,7 +3791,7 @@ sub_80E3A08: @ 80E3A08
lsrs r6, r0, 24
movs r4, 0
movs r2, 0
- ldr r0, _080E3A50 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3A50 @ =gAnimBankAttacker
ldrb r3, [r0]
movs r5, 0x1
_080E3A18:
@@ -3824,7 +3824,7 @@ _080E3A34:
pop {r0}
bx r0
.align 2, 0
-_080E3A50: .4byte gBattleAnimBankAttacker
+_080E3A50: .4byte gAnimBankAttacker
_080E3A54: .4byte gBattleAnimArgs
thumb_func_end sub_80E3A08
@@ -3845,7 +3845,7 @@ sub_80E3A58: @ 80E3A58
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080E3A94
- ldr r0, _080E3AC8 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3AC8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -3881,7 +3881,7 @@ _080E3A94:
.align 2, 0
_080E3AC0: .4byte sub_80E3AD0
_080E3AC4: .4byte gBattleAnimArgs
-_080E3AC8: .4byte gBattleAnimBankAttacker
+_080E3AC8: .4byte gAnimBankAttacker
_080E3ACC: .4byte gTasks
thumb_func_end sub_80E3A58
@@ -3953,7 +3953,7 @@ sub_80E3B4C: @ 80E3B4C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E3B70 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3B70 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
ldr r1, _080E3B74 @ =gBattleAnimArgs
@@ -3966,7 +3966,7 @@ sub_80E3B4C: @ 80E3B4C
pop {r0}
bx r0
.align 2, 0
-_080E3B70: .4byte gBattleAnimBankAttacker
+_080E3B70: .4byte gAnimBankAttacker
_080E3B74: .4byte gBattleAnimArgs
thumb_func_end sub_80E3B4C
@@ -3976,7 +3976,7 @@ sub_80E3B78: @ 80E3B78
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E3B9C @ =gBattleAnimBankTarget
+ ldr r0, _080E3B9C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
ldr r1, _080E3BA0 @ =gBattleAnimArgs
@@ -3989,7 +3989,7 @@ sub_80E3B78: @ 80E3B78
pop {r0}
bx r0
.align 2, 0
-_080E3B9C: .4byte gBattleAnimBankTarget
+_080E3B9C: .4byte gAnimBankTarget
_080E3BA0: .4byte gBattleAnimArgs
thumb_func_end sub_80E3B78
@@ -4000,10 +4000,10 @@ sub_80E3BA4: @ 80E3BA4
lsrs r3, r0, 24
ldr r5, _080E3BD0 @ =gBattleAnimArgs
movs r4, 0
- ldr r0, _080E3BD4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3BD4 @ =gAnimBankAttacker
ldrb r2, [r0]
movs r0, 0x2
- ldr r1, _080E3BD8 @ =gBattleAnimBankTarget
+ ldr r1, _080E3BD8 @ =gAnimBankTarget
eors r0, r2
ldrb r1, [r1]
cmp r0, r1
@@ -4018,8 +4018,8 @@ _080E3BC0:
bx r0
.align 2, 0
_080E3BD0: .4byte gBattleAnimArgs
-_080E3BD4: .4byte gBattleAnimBankAttacker
-_080E3BD8: .4byte gBattleAnimBankTarget
+_080E3BD4: .4byte gAnimBankAttacker
+_080E3BD8: .4byte gAnimBankTarget
thumb_func_end sub_80E3BA4
thumb_func_start sub_80E3BDC
@@ -4030,7 +4030,7 @@ sub_80E3BDC: @ 80E3BDC
movs r4, 0
ldr r6, _080E3C3C @ =gSprites
_080E3BE6:
- ldr r0, _080E3C40 @ =gBattleAnimBankAttacker
+ ldr r0, _080E3C40 @ =gAnimBankAttacker
ldrb r0, [r0]
cmp r4, r0
beq _080E3C24
@@ -4073,7 +4073,7 @@ _080E3C24:
bx r0
.align 2, 0
_080E3C3C: .4byte gSprites
-_080E3C40: .4byte gBattleAnimBankAttacker
+_080E3C40: .4byte gAnimBankAttacker
_080E3C44: .4byte gObjectBankIDs
_080E3C48: .4byte gBattleAnimArgs
thumb_func_end sub_80E3BDC
@@ -4115,7 +4115,7 @@ sub_80E3C4C: @ 80E3C4C
movs r0, 0x2
adds r6, r7, 0
eors r6, r0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3CAE
@@ -4131,10 +4131,10 @@ _080E3CAE:
movs r2, 0
mov r8, r2
_080E3CB2:
- ldr r0, _080E3D34 @ =gUnknown_030042C4
+ ldr r0, _080E3D34 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
- ldr r0, _080E3D38 @ =gUnknown_03004240
+ ldr r0, _080E3D38 @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _080E3D3C @ =REG_WININ
ldr r3, _080E3D40 @ =0x00003f3f
@@ -4175,7 +4175,7 @@ _080E3CB2:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3D22
@@ -4187,7 +4187,7 @@ _080E3CB2:
orrs r1, r0
strb r1, [r4]
_080E3D22:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3D58
@@ -4195,8 +4195,8 @@ _080E3D22:
ldrh r4, [r0]
b _080E3D96
.align 2, 0
-_080E3D34: .4byte gUnknown_030042C4
-_080E3D38: .4byte gUnknown_03004240
+_080E3D34: .4byte gBattle_WIN0H
+_080E3D38: .4byte gBattle_WIN0V
_080E3D3C: .4byte REG_WININ
_080E3D40: .4byte 0x00003f3f
_080E3D44: .4byte 0x00003f3d
@@ -4261,7 +4261,7 @@ _080E3DC0:
ldr r1, [sp, 0x4]
ldr r0, [sp, 0x50]
bl LZDecompressVram
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3DE6
@@ -4281,10 +4281,10 @@ _080E3DE6:
ldr r0, [sp, 0x54]
movs r2, 0x20
bl LoadCompressedPalette
- ldr r0, _080E3E54 @ =gUnknown_030042C0
+ ldr r0, _080E3E54 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
- ldr r0, _080E3E58 @ =gUnknown_030041B4
+ ldr r0, _080E3E58 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r1, _080E3E5C @ =gTasks
mov r2, r9
@@ -4323,8 +4323,8 @@ _080E3DE6:
_080E3E48: .4byte gBattlePartyID
_080E3E4C: .4byte gPlayerParty
_080E3E50: .4byte gObjectBankIDs
-_080E3E54: .4byte gUnknown_030042C0
-_080E3E58: .4byte gUnknown_030041B4
+_080E3E54: .4byte gBattle_BG1_X
+_080E3E58: .4byte gBattle_BG1_Y
_080E3E5C: .4byte gTasks
_080E3E60: .4byte sub_80E3E64
thumb_func_end sub_80E3C4C
@@ -4353,7 +4353,7 @@ _080E3E80:
ldrsh r0, [r3, r1]
cmp r0, 0
bge _080E3EA4
- ldr r2, _080E3EA0 @ =gUnknown_030041B4
+ ldr r2, _080E3EA0 @ =gBattle_BG1_Y
lsls r1, r4, 16
asrs r1, 24
ldrh r0, [r2]
@@ -4362,9 +4362,9 @@ _080E3E80:
b _080E3EB0
.align 2, 0
_080E3E9C: .4byte gTasks
-_080E3EA0: .4byte gUnknown_030041B4
+_080E3EA0: .4byte gBattle_BG1_Y
_080E3EA4:
- ldr r1, _080E3ED4 @ =gUnknown_030041B4
+ ldr r1, _080E3ED4 @ =gBattle_BG1_Y
lsls r0, r4, 16
asrs r0, 24
ldrh r2, [r1]
@@ -4390,7 +4390,7 @@ _080E3EB0:
beq _080E3EDE
b _080E3FE2
.align 2, 0
-_080E3ED4: .4byte gUnknown_030041B4
+_080E3ED4: .4byte gBattle_BG1_Y
_080E3ED8:
cmp r0, 0x2
beq _080E3F32
@@ -4465,9 +4465,9 @@ _080E3F32:
bne _080E3FE2
movs r0, 0
bl sub_8076464
- ldr r0, _080E3FEC @ =gUnknown_030042C4
+ ldr r0, _080E3FEC @ =gBattle_WIN0H
strh r5, [r0]
- ldr r0, _080E3FF0 @ =gUnknown_03004240
+ ldr r0, _080E3FF0 @ =gBattle_WIN0V
strh r5, [r0]
ldr r0, _080E3FF4 @ =REG_WININ
ldr r2, _080E3FF8 @ =0x00003f3f
@@ -4475,7 +4475,7 @@ _080E3F32:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3F90
@@ -4531,8 +4531,8 @@ _080E3FE2:
bx r0
.align 2, 0
_080E3FE8: .4byte REG_BLDALPHA
-_080E3FEC: .4byte gUnknown_030042C4
-_080E3FF0: .4byte gUnknown_03004240
+_080E3FEC: .4byte gBattle_WIN0H
+_080E3FF0: .4byte gBattle_WIN0V
_080E3FF4: .4byte REG_WININ
_080E3FF8: .4byte 0x00003f3f
_080E3FFC: .4byte REG_BG1CNT
@@ -4596,14 +4596,14 @@ _080E4068: .4byte gBattleAnimArgs
_080E406C:
cmp r0, 0x1
bne _080E4078
- ldr r0, _080E4074 @ =gBattleAnimBankAttacker
+ ldr r0, _080E4074 @ =gAnimBankAttacker
b _080E407E
.align 2, 0
-_080E4074: .4byte gBattleAnimBankAttacker
+_080E4074: .4byte gAnimBankAttacker
_080E4078:
cmp r0, 0x2
bne _080E4084
- ldr r0, _080E409C @ =gBattleAnimBankTarget
+ ldr r0, _080E409C @ =gAnimBankTarget
_080E407E:
ldrb r0, [r0]
adds r4, r0, 0
@@ -4613,14 +4613,14 @@ _080E4084:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r5, r0, 5
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E40A8
ldr r0, _080E40A4 @ =gSharedMem + 0x14800
b _080E40AA
.align 2, 0
-_080E409C: .4byte gBattleAnimBankTarget
+_080E409C: .4byte gAnimBankTarget
_080E40A0: .4byte gBattleAnimArgs
_080E40A4: .4byte gSharedMem + 0x14800
_080E40A8:
@@ -4683,14 +4683,14 @@ _080E4110: .4byte gBattleAnimArgs
_080E4114:
cmp r0, 0x1
bne _080E4120
- ldr r0, _080E411C @ =gBattleAnimBankAttacker
+ ldr r0, _080E411C @ =gAnimBankAttacker
b _080E4126
.align 2, 0
-_080E411C: .4byte gBattleAnimBankAttacker
+_080E411C: .4byte gAnimBankAttacker
_080E4120:
cmp r0, 0x2
bne _080E412C
- ldr r0, _080E4148 @ =gBattleAnimBankTarget
+ ldr r0, _080E4148 @ =gAnimBankTarget
_080E4126:
ldrb r0, [r0]
adds r4, r0, 0
@@ -4703,14 +4703,14 @@ _080E412C:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r4, r0, 5
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E4158
ldr r0, _080E4154 @ =gSharedMem + 0x14800
b _080E415A
.align 2, 0
-_080E4148: .4byte gBattleAnimBankTarget
+_080E4148: .4byte gAnimBankTarget
_080E414C: .4byte gPlttBufferUnfaded
_080E4150: .4byte gBattleAnimArgs
_080E4154: .4byte gSharedMem + 0x14800
@@ -4770,14 +4770,14 @@ _080E41B8: .4byte gBattleAnimArgs
_080E41BC:
cmp r0, 0x1
bne _080E41C8
- ldr r0, _080E41C4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E41C4 @ =gAnimBankAttacker
b _080E41CE
.align 2, 0
-_080E41C4: .4byte gBattleAnimBankAttacker
+_080E41C4: .4byte gAnimBankAttacker
_080E41C8:
cmp r0, 0x2
bne _080E41D4
- ldr r0, _080E41F4 @ =gBattleAnimBankTarget
+ ldr r0, _080E41F4 @ =gAnimBankTarget
_080E41CE:
ldrb r0, [r0]
adds r4, r0, 0
@@ -4797,7 +4797,7 @@ _080E41D4:
pop {r0}
bx r0
.align 2, 0
-_080E41F4: .4byte gBattleAnimBankTarget
+_080E41F4: .4byte gAnimBankTarget
_080E41F8: .4byte gPlttBufferUnfaded
_080E41FC: .4byte gPlttBufferFaded
thumb_func_end sub_80E4178
@@ -4807,7 +4807,7 @@ sub_80E4200: @ 80E4200
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -4836,11 +4836,11 @@ sub_80E4234: @ 80E4234
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E4254 @ =gBattleAnimBankAttacker
+ ldr r2, _080E4254 @ =gAnimBankAttacker
ldr r1, _080E4258 @ =gBankTarget
ldrb r1, [r1]
strb r1, [r2]
- ldr r2, _080E425C @ =gBattleAnimBankTarget
+ ldr r2, _080E425C @ =gAnimBankTarget
ldr r1, _080E4260 @ =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
@@ -4848,9 +4848,9 @@ sub_80E4234: @ 80E4234
pop {r0}
bx r0
.align 2, 0
-_080E4254: .4byte gBattleAnimBankAttacker
+_080E4254: .4byte gAnimBankAttacker
_080E4258: .4byte gBankTarget
-_080E425C: .4byte gBattleAnimBankTarget
+_080E425C: .4byte gAnimBankTarget
_080E4260: .4byte gEffectBank
thumb_func_end sub_80E4234
@@ -4859,11 +4859,11 @@ sub_80E4264: @ 80E4264
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080E428C @ =gBattleAnimBankAttacker
+ ldr r0, _080E428C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
adds r4, r0, 0
- ldr r0, _080E4290 @ =gBattleAnimBankTarget
+ ldr r0, _080E4290 @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankSide
lsls r4, 24
@@ -4874,8 +4874,8 @@ sub_80E4264: @ 80E4264
movs r0, 0x1
b _080E429C
.align 2, 0
-_080E428C: .4byte gBattleAnimBankAttacker
-_080E4290: .4byte gBattleAnimBankTarget
+_080E428C: .4byte gAnimBankAttacker
+_080E4290: .4byte gAnimBankTarget
_080E4294: .4byte gBattleAnimArgs
_080E4298:
ldr r1, _080E42AC @ =gBattleAnimArgs
@@ -4896,7 +4896,7 @@ sub_80E42B0: @ 80E42B0
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E42C8 @ =gBattleAnimBankTarget
+ ldr r2, _080E42C8 @ =gAnimBankTarget
ldr r1, _080E42CC @ =gBankTarget
ldrb r1, [r1]
strb r1, [r2]
@@ -4904,7 +4904,7 @@ sub_80E42B0: @ 80E42B0
pop {r0}
bx r0
.align 2, 0
-_080E42C8: .4byte gBattleAnimBankTarget
+_080E42C8: .4byte gAnimBankTarget
_080E42CC: .4byte gBankTarget
thumb_func_end sub_80E42B0
@@ -4913,11 +4913,11 @@ sub_80E42D0: @ 80E42D0
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E42F0 @ =gBattleAnimBankAttacker
+ ldr r2, _080E42F0 @ =gAnimBankAttacker
ldr r1, _080E42F4 @ =gBankAttacker
ldrb r1, [r1]
strb r1, [r2]
- ldr r2, _080E42F8 @ =gBattleAnimBankTarget
+ ldr r2, _080E42F8 @ =gAnimBankTarget
ldr r1, _080E42FC @ =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
@@ -4925,9 +4925,9 @@ sub_80E42D0: @ 80E42D0
pop {r0}
bx r0
.align 2, 0
-_080E42F0: .4byte gBattleAnimBankAttacker
+_080E42F0: .4byte gAnimBankAttacker
_080E42F4: .4byte gBankAttacker
-_080E42F8: .4byte gBattleAnimBankTarget
+_080E42F8: .4byte gAnimBankTarget
_080E42FC: .4byte gEffectBank
thumb_func_end sub_80E42D0
@@ -4936,7 +4936,7 @@ sub_80E4300: @ 80E4300
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E4318
@@ -4949,7 +4949,7 @@ _080E4318:
adds r3, r4
lsls r3, 3
adds r3, r0
- ldr r1, _080E4358 @ =gBattleAnimBankAttacker
+ ldr r1, _080E4358 @ =gAnimBankAttacker
ldrb r0, [r1]
lsls r0, 2
ldr r2, _080E435C @ =gSharedMem + 0x17800
@@ -4977,7 +4977,7 @@ _080E434E:
bx r0
.align 2, 0
_080E4354: .4byte gTasks
-_080E4358: .4byte gBattleAnimBankAttacker
+_080E4358: .4byte gAnimBankAttacker
_080E435C: .4byte gSharedMem + 0x17800
_080E4360: .4byte sub_80E4368
_080E4364: .4byte gAnimVisualTaskCount
@@ -4995,7 +4995,7 @@ sub_80E4368: @ 80E4368
lsls r0, 5
cmp r1, r0
bne _080E43A8
- ldr r0, _080E43B4 @ =gBattleAnimBankAttacker
+ ldr r0, _080E43B4 @ =gAnimBankAttacker
ldrb r3, [r0]
lsls r3, 2
ldr r0, _080E43B8 @ =gSharedMem + 0x17800
@@ -5022,7 +5022,7 @@ _080E43A8:
bx r0
.align 2, 0
_080E43B0: .4byte gBattleAnimArgs
-_080E43B4: .4byte gBattleAnimBankAttacker
+_080E43B4: .4byte gAnimBankAttacker
_080E43B8: .4byte gSharedMem + 0x17800
_080E43BC: .4byte gTasks
thumb_func_end sub_80E4368
diff --git a/asm/poison.s b/asm/poison.s
index 4411027e9..234348df2 100755
--- a/asm/poison.s
+++ b/asm/poison.s
@@ -25,16 +25,16 @@ _080D9D86:
bl sub_80787B0
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
- ldr r4, _080D9DC8 @ =gBattleAnimBankTarget
+ ldr r4, _080D9DC8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -49,7 +49,7 @@ _080D9D86:
bx r0
.align 2, 0
_080D9DC4: .4byte gBattleAnimArgs
-_080D9DC8: .4byte gBattleAnimBankTarget
+_080D9DC8: .4byte gAnimBankTarget
_080D9DCC: .4byte 0x0000ffe2
_080D9DD0: .4byte sub_80D9DD4
thumb_func_end sub_80D9D70
@@ -63,7 +63,7 @@ sub_80D9DD4: @ 80D9DD4
cmp r0, 0
beq _080D9DE8
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9DE8:
pop {r4}
pop {r0}
@@ -87,7 +87,7 @@ _080D9E08:
adds r0, r4, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080D9E68 @ =gBattleAnimBankTarget
+ ldr r0, _080D9E68 @ =gAnimBankTarget
ldrb r0, [r0]
mov r6, sp
adds r6, 0x2
@@ -95,7 +95,7 @@ _080D9E08:
mov r2, sp
adds r3, r6, 0
bl sub_807A3FC
- ldr r0, _080D9E6C @ =gBattleAnimBankAttacker
+ ldr r0, _080D9E6C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -128,8 +128,8 @@ _080D9E36:
bx r0
.align 2, 0
_080D9E64: .4byte gBattleAnimArgs
-_080D9E68: .4byte gBattleAnimBankTarget
-_080D9E6C: .4byte gBattleAnimBankAttacker
+_080D9E68: .4byte gAnimBankTarget
+_080D9E6C: .4byte gAnimBankAttacker
_080D9E70: .4byte 0x0000ffe2
_080D9E74: .4byte sub_80D9E78
thumb_func_end sub_80D9DF0
@@ -143,7 +143,7 @@ sub_80D9E78: @ 80D9E78
cmp r0, 0
beq _080D9E8C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9E8C:
pop {r4}
pop {r0}
@@ -209,7 +209,7 @@ sub_80D9EE8: @ 80D9EE8
cmp r0, 0
bne _080D9F0E
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D9F0E:
pop {r4}
pop {r0}
@@ -220,7 +220,7 @@ _080D9F0E:
sub_80D9F14: @ 80D9F14
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D9F74 @ =gBattleAnimBankTarget
+ ldr r0, _080D9F74 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -228,7 +228,7 @@ sub_80D9F14: @ 80D9F14
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D9F78 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9F78 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -257,18 +257,18 @@ _080D9F40:
strh r1, [r4, 0x36]
ldr r0, _080D9F80 @ =sub_8078B34
str r0, [r4, 0x1C]
- ldr r1, _080D9F84 @ =move_anim_8072740
+ ldr r1, _080D9F84 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_080D9F74: .4byte gBattleAnimBankTarget
-_080D9F78: .4byte gBattleAnimBankAttacker
+_080D9F74: .4byte gAnimBankTarget
+_080D9F78: .4byte gAnimBankAttacker
_080D9F7C: .4byte gBattleAnimArgs
_080D9F80: .4byte sub_8078B34
-_080D9F84: .4byte move_anim_8072740
+_080D9F84: .4byte DestroyAnimSprite
thumb_func_end sub_80D9F14
thumb_func_start sub_80D9F88
@@ -287,7 +287,7 @@ sub_80D9F88: @ 80D9F88
.align 2, 0
_080D9FA0: .4byte gBattleAnimArgs
_080D9FA4:
- ldr r0, _080D9FE4 @ =gBattleAnimBankTarget
+ ldr r0, _080D9FE4 @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -295,7 +295,7 @@ _080D9FA4:
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D9FE8 @ =gBattleAnimBankAttacker
+ ldr r0, _080D9FE8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -320,8 +320,8 @@ _080D9FDA:
pop {r0}
bx r0
.align 2, 0
-_080D9FE4: .4byte gBattleAnimBankTarget
-_080D9FE8: .4byte gBattleAnimBankAttacker
+_080D9FE4: .4byte gAnimBankTarget
+_080D9FE8: .4byte gAnimBankAttacker
_080D9FEC: .4byte sub_80D9FF0
thumb_func_end sub_80D9F88
@@ -354,7 +354,7 @@ sub_80D9FF0: @ 80D9FF0
cmp r0, 0
beq _080DA02C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DA02C:
pop {r4}
pop {r0}
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 7670d867d..69c6d9e4f 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -87,8 +87,8 @@ _08095B66:
bx r1
thumb_func_end sub_8095B24
- thumb_func_start sub_8095B6C
-sub_8095B6C: @ 8095B6C
+ thumb_func_start GetNumValidDaycarePartyMons
+GetNumValidDaycarePartyMons: @ 8095B6C
push {r4-r6,lr}
movs r5, 0
movs r6, 0
@@ -124,7 +124,7 @@ _08095B9A:
bx r1
.align 2, 0
_08095BB0: .4byte gPlayerParty
- thumb_func_end sub_8095B6C
+ thumb_func_end GetNumValidDaycarePartyMons
thumb_func_start CountAlivePartyMonsExceptOne
CountAlivePartyMonsExceptOne: @ 8095BB4
@@ -174,8 +174,8 @@ _08095BF6:
_08095C0C: .4byte gPlayerParty
thumb_func_end CountAlivePartyMonsExceptOne
- thumb_func_start sub_8095C10
-sub_8095C10: @ 8095C10
+ thumb_func_start CountAlivePartyMonsExceptSelectedOne
+CountAlivePartyMonsExceptSelectedOne: @ 8095C10
push {lr}
ldr r0, _08095C24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
@@ -186,7 +186,7 @@ sub_8095C10: @ 8095C10
bx r1
.align 2, 0
_08095C24: .4byte gSpecialVar_0x8004
- thumb_func_end sub_8095C10
+ thumb_func_end CountAlivePartyMonsExceptSelectedOne
thumb_func_start StorageSystemGetPartySize
StorageSystemGetPartySize: @ 8095C28
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 066d16d5d..83ceed00f 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -4038,7 +4038,7 @@ sub_80F2598: @ 80F2598
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8082C0C
+ bl DoesSomeoneWantRematchIn
cmp r0, 0x1
bne _080F2618
ldr r0, _080F25FC @ =gSpriteSheet_PokenavBlueLight
diff --git a/asm/psychic.s b/asm/psychic.s
index fb024a00d..7a6000335 100755
--- a/asm/psychic.s
+++ b/asm/psychic.s
@@ -11,13 +11,13 @@
sub_80DB74C: @ 80DB74C
push {r4-r7,lr}
adds r6, r0, 0
- ldr r0, _080DB804 @ =gBattleAnimBankAttacker
+ ldr r0, _080DB804 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DB768
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DB77E
@@ -34,7 +34,7 @@ _080DB768:
movs r0, 0xC8
strb r0, [r1]
_080DB77E:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB7DA
@@ -75,7 +75,7 @@ _080DB7BC:
adds r1, r5, 0
bl sub_8076034
_080DB7DA:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB810
@@ -83,7 +83,7 @@ _080DB7DA:
lsls r0, 24
cmp r0, 0
beq _080DB810
- ldr r0, _080DB804 @ =gBattleAnimBankAttacker
+ ldr r0, _080DB804 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -94,14 +94,14 @@ _080DB7DA:
movs r0, 0x50
b _080DB84A
.align 2, 0
-_080DB804: .4byte gBattleAnimBankAttacker
+_080DB804: .4byte gAnimBankAttacker
_080DB808:
movs r0, 0xB0
strh r0, [r6, 0x20]
movs r0, 0x28
b _080DB84A
_080DB810:
- ldr r5, _080DB880 @ =gBattleAnimBankAttacker
+ ldr r5, _080DB880 @ =gAnimBankAttacker
ldrb r0, [r5]
bl GetBankSide
lsls r0, 24
@@ -114,7 +114,7 @@ _080DB810:
_080DB826:
ldrb r0, [r5]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
ldr r4, _080DB884 @ =gBattleAnimArgs
lsrs r0, 24
@@ -123,14 +123,14 @@ _080DB826:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
adds r0, r4
_080DB84A:
strh r0, [r6, 0x22]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DB85C
@@ -155,7 +155,7 @@ _080DB85C:
pop {r0}
bx r0
.align 2, 0
-_080DB880: .4byte gBattleAnimBankAttacker
+_080DB880: .4byte gAnimBankAttacker
_080DB884: .4byte gBattleAnimArgs
_080DB888: .4byte sub_80DB88C
thumb_func_end sub_80DB74C
@@ -269,7 +269,7 @@ sub_80DB92C: @ 80DB92C
negs r1, r1
cmp r0, r1
bne _080DB9CC
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB9BC
@@ -344,7 +344,7 @@ _080DB9E0: .4byte sub_80DB9E4
sub_80DB9E4: @ 80DB9E4
push {r4-r6,lr}
adds r6, r0, 0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DBA3C
@@ -381,13 +381,13 @@ _080DBA22:
adds r0, r5, 0
bl sub_8076464
_080DBA3C:
- ldr r0, _080DBA48 @ =move_anim_8072740
+ ldr r0, _080DBA48 @ =DestroyAnimSprite
str r0, [r6, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080DBA48: .4byte move_anim_8072740
+_080DBA48: .4byte DestroyAnimSprite
thumb_func_end sub_80DB9E4
thumb_func_start sub_80DBA4C
@@ -406,7 +406,7 @@ sub_80DBA4C: @ 80DBA4C
bne _080DBA66
movs r6, 0x1
_080DBA66:
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DBAAE
@@ -414,7 +414,7 @@ _080DBA66:
lsls r0, 24
cmp r0, 0
beq _080DBAAE
- ldr r0, _080DBA9C @ =gBattleAnimBankAttacker
+ ldr r0, _080DBA9C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -430,7 +430,7 @@ _080DBA66:
b _080DBAD0
.align 2, 0
_080DBA98: .4byte gBattleAnimArgs
-_080DBA9C: .4byte gBattleAnimBankAttacker
+_080DBA9C: .4byte gAnimBankAttacker
_080DBAA0:
ldrh r0, [r5]
adds r0, 0xB0
@@ -480,16 +480,16 @@ _080DBAEC:
sub_80DBAF4: @ 80DBAF4
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DBB3C @ =gBattleAnimBankAttacker
+ ldr r4, _080DBB3C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -510,7 +510,7 @@ sub_80DBAF4: @ 80DBAF4
ldr r0, _080DBB40 @ =0x0000ffff
b _080DBB52
.align 2, 0
-_080DBB3C: .4byte gBattleAnimBankAttacker
+_080DBB3C: .4byte gAnimBankAttacker
_080DBB40: .4byte 0x0000ffff
_080DBB44:
ldrh r0, [r5, 0x20]
@@ -522,7 +522,7 @@ _080DBB44:
movs r0, 0x1
_080DBB52:
strh r0, [r5, 0x30]
- ldr r1, _080DBB68 @ =move_anim_8072740
+ ldr r1, _080DBB68 @ =DestroyAnimSprite
adds r0, r5, 0
bl StoreSpriteCallbackInData
ldr r0, _080DBB6C @ =sub_8078600
@@ -531,7 +531,7 @@ _080DBB52:
pop {r0}
bx r0
.align 2, 0
-_080DBB68: .4byte move_anim_8072740
+_080DBB68: .4byte DestroyAnimSprite
_080DBB6C: .4byte sub_8078600
thumb_func_end sub_80DBAF4
@@ -539,7 +539,7 @@ _080DBB6C: .4byte sub_8078600
sub_80DBB70: @ 80DBB70
push {r4-r7,lr}
adds r5, r0, 0
- ldr r6, _080DBBF4 @ =gBattleAnimBankAttacker
+ ldr r6, _080DBBF4 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x1
bl sub_807A100
@@ -572,14 +572,14 @@ sub_80DBB70: @ 80DBB70
_080DBBB6:
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, r4
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
adds r0, r7
@@ -600,7 +600,7 @@ _080DBBE2:
pop {r0}
bx r0
.align 2, 0
-_080DBBF4: .4byte gBattleAnimBankAttacker
+_080DBBF4: .4byte gAnimBankAttacker
_080DBBF8: .4byte sub_80DBC00
_080DBBFC: .4byte sub_8078600
thumb_func_end sub_80DBB70
@@ -677,7 +677,7 @@ _080DBC74:
cmp r0, r1
bne _080DBC8C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DBC8C:
pop {r4}
pop {r0}
@@ -756,7 +756,7 @@ sub_80DBCFC: @ 80DBCFC
strh r0, [r4, 0x8]
strh r1, [r4, 0xA]
strh r1, [r4, 0xC]
- ldr r0, _080DBD4C @ =gBattleAnimBankAttacker
+ ldr r0, _080DBD4C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -777,7 +777,7 @@ _080DBD30:
bx r0
.align 2, 0
_080DBD48: .4byte gTasks
-_080DBD4C: .4byte gBattleAnimBankAttacker
+_080DBD4C: .4byte gAnimBankAttacker
_080DBD50: .4byte gUnknown_083DA8C4
_080DBD54: .4byte sub_80DBD58
thumb_func_end sub_80DBCFC
@@ -884,16 +884,16 @@ sub_80DBE00: @ 80DBE00
movs r7, 0x10
strh r7, [r5, 0xE]
strh r0, [r5, 0x10]
- ldr r4, _080DBE88 @ =gBattleAnimBankAttacker
+ ldr r4, _080DBE88 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -935,7 +935,7 @@ _080DBE6A:
bx r0
.align 2, 0
_080DBE84: .4byte gTasks
-_080DBE88: .4byte gBattleAnimBankAttacker
+_080DBE88: .4byte gAnimBankAttacker
_080DBE8C: .4byte REG_BLDCNT
_080DBE90: .4byte REG_BLDALPHA
_080DBE94: .4byte sub_80DBE98
@@ -1185,7 +1185,7 @@ _080DC04A:
cmp r1, r0
bne _080DC05C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DC05C:
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -1204,16 +1204,16 @@ sub_80DC068: @ 80DC068
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080DC094
- ldr r4, _080DC0A8 @ =gBattleAnimBankAttacker
+ ldr r4, _080DC0A8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1227,7 +1227,7 @@ _080DC094:
bx r0
.align 2, 0
_080DC0A4: .4byte gBattleAnimArgs
-_080DC0A8: .4byte gBattleAnimBankAttacker
+_080DC0A8: .4byte gAnimBankAttacker
_080DC0AC: .4byte sub_80DC020
thumb_func_end sub_80DC068
@@ -1241,7 +1241,7 @@ sub_80DC0B0: @ 80DC0B0
lsls r1, 3
ldr r0, _080DC10C @ =gTasks
adds r5, r1, r0
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC154
@@ -1252,7 +1252,7 @@ sub_80DC0B0: @ 80DC0B0
bne _080DC120
ldr r0, _080DC114 @ =0x0000fff6
strh r0, [r5, 0x1C]
- ldr r4, _080DC118 @ =gBattleAnimBankTarget
+ ldr r4, _080DC118 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -1263,7 +1263,7 @@ sub_80DC0B0: @ 80DC0B0
bl sub_807A100
adds r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC11C @ =gBattleAnimBankAttacker
+ ldr r4, _080DC11C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -1278,12 +1278,12 @@ sub_80DC0B0: @ 80DC0B0
_080DC10C: .4byte gTasks
_080DC110: .4byte gBattleAnimArgs
_080DC114: .4byte 0x0000fff6
-_080DC118: .4byte gBattleAnimBankTarget
-_080DC11C: .4byte gBattleAnimBankAttacker
+_080DC118: .4byte gAnimBankTarget
+_080DC11C: .4byte gAnimBankAttacker
_080DC120:
movs r0, 0xA
strh r0, [r5, 0x1C]
- ldr r4, _080DC14C @ =gBattleAnimBankAttacker
+ ldr r4, _080DC14C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -1294,15 +1294,15 @@ _080DC120:
bl sub_807A100
subs r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC150 @ =gBattleAnimBankTarget
+ ldr r4, _080DC150 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
adds r0, 0x8
b _080DC1D2
.align 2, 0
-_080DC14C: .4byte gBattleAnimBankAttacker
-_080DC150: .4byte gBattleAnimBankTarget
+_080DC14C: .4byte gAnimBankAttacker
+_080DC150: .4byte gAnimBankTarget
_080DC154:
ldr r0, _080DC198 @ =gBattleAnimArgs
movs r1, 0
@@ -1311,7 +1311,7 @@ _080DC154:
bne _080DC1A8
ldr r0, _080DC19C @ =0x0000fff6
strh r0, [r5, 0x1C]
- ldr r4, _080DC1A0 @ =gBattleAnimBankTarget
+ ldr r4, _080DC1A0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -1322,7 +1322,7 @@ _080DC154:
bl sub_807A100
adds r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC1A4 @ =gBattleAnimBankAttacker
+ ldr r4, _080DC1A4 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -1336,12 +1336,12 @@ _080DC154:
.align 2, 0
_080DC198: .4byte gBattleAnimArgs
_080DC19C: .4byte 0x0000fff6
-_080DC1A0: .4byte gBattleAnimBankTarget
-_080DC1A4: .4byte gBattleAnimBankAttacker
+_080DC1A0: .4byte gAnimBankTarget
+_080DC1A4: .4byte gAnimBankAttacker
_080DC1A8:
movs r0, 0xA
strh r0, [r5, 0x1C]
- ldr r4, _080DC1F0 @ =gBattleAnimBankAttacker
+ ldr r4, _080DC1F0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -1352,7 +1352,7 @@ _080DC1A8:
bl sub_807A100
subs r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC1F4 @ =gBattleAnimBankTarget
+ ldr r4, _080DC1F4 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -1373,8 +1373,8 @@ _080DC1DE:
pop {r0}
bx r0
.align 2, 0
-_080DC1F0: .4byte gBattleAnimBankAttacker
-_080DC1F4: .4byte gBattleAnimBankTarget
+_080DC1F0: .4byte gAnimBankAttacker
+_080DC1F4: .4byte gAnimBankTarget
_080DC1F8: .4byte sub_80DC1FC
thumb_func_end sub_80DC0B0
@@ -1499,7 +1499,7 @@ sub_80DC2D4: @ 80DC2D4
lsls r1, 3
ldr r0, _080DC30C @ =gTasks
adds r4, r1, r0
- ldr r0, _080DC310 @ =gBattleAnimBankTarget
+ ldr r0, _080DC310 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -1519,7 +1519,7 @@ sub_80DC2D4: @ 80DC2D4
b _080DC346
.align 2, 0
_080DC30C: .4byte gTasks
-_080DC310: .4byte gBattleAnimBankTarget
+_080DC310: .4byte gAnimBankTarget
_080DC314: .4byte gBattleAnimArgs
_080DC318:
cmp r0, 0x2
@@ -1557,24 +1557,24 @@ _080DC346:
movs r0, 0
strh r0, [r4, 0x24]
_080DC352:
- ldr r0, _080DC36C @ =gBattleAnimBankTarget
+ ldr r0, _080DC36C @ =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080DC378
- ldr r0, _080DC370 @ =gUnknown_030042C0
+ ldr r0, _080DC370 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, _080DC374 @ =REG_BG1HOFS
b _080DC380
.align 2, 0
-_080DC36C: .4byte gBattleAnimBankTarget
-_080DC370: .4byte gUnknown_030042C0
+_080DC36C: .4byte gAnimBankTarget
+_080DC370: .4byte gBattle_BG1_X
_080DC374: .4byte REG_BG1HOFS
_080DC378:
- ldr r0, _080DC3E0 @ =gUnknown_03004288
+ ldr r0, _080DC3E0 @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, _080DC3E4 @ =REG_BG2HOFS
@@ -1629,7 +1629,7 @@ _080DC3BA:
pop {r0}
bx r0
.align 2, 0
-_080DC3E0: .4byte gUnknown_03004288
+_080DC3E0: .4byte gBattle_BG2_X
_080DC3E4: .4byte REG_BG2HOFS
_080DC3E8: .4byte gUnknown_03004DE0
_080DC3EC: .4byte 0xa2600001
@@ -2051,20 +2051,20 @@ _080DC716:
beq _080DC808
b _080DC818
_080DC720:
- ldr r4, _080DC76C @ =gBattleAnimBankAttacker
+ ldr r4, _080DC76C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC74E
@@ -2088,7 +2088,7 @@ _080DC74E:
strh r0, [r2]
b _080DC7A2
.align 2, 0
-_080DC76C: .4byte gBattleAnimBankAttacker
+_080DC76C: .4byte gAnimBankAttacker
_080DC770: .4byte REG_BLDCNT
_080DC774: .4byte REG_BLDALPHA
_080DC778:
@@ -2101,7 +2101,7 @@ _080DC778:
beq _080DC818
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -2171,7 +2171,7 @@ _080DC808:
adds r0, 0x2
strh r1, [r0]
adds r0, r5, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DC818:
pop {r4,r5}
pop {r0}
diff --git a/asm/rock.s b/asm/rock.s
index 66c698577..923c842be 100755
--- a/asm/rock.s
+++ b/asm/rock.s
@@ -16,7 +16,7 @@ sub_80DCE9C: @ 80DCE9C
ldrsh r0, [r6, r1]
cmp r0, 0
beq _080DCEBC
- ldr r0, _080DCF0C @ =gBattleAnimBankTarget
+ ldr r0, _080DCF0C @ =gAnimBankTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x20
@@ -60,7 +60,7 @@ _080DCEBC:
bx r0
.align 2, 0
_080DCF08: .4byte gBattleAnimArgs
-_080DCF0C: .4byte gBattleAnimBankTarget
+_080DCF0C: .4byte gAnimBankTarget
_080DCF10: .4byte 0x0000ffba
_080DCF14: .4byte sub_80DCF1C
_080DCF18: .4byte sub_8078278
@@ -108,7 +108,7 @@ sub_80DCF60: @ 80DCF60
bl StartSpriteAnim
adds r0, r5, 0
bl AnimateSprite
- ldr r0, _080DCF8C @ =gBattleAnimBankAttacker
+ ldr r0, _080DCF8C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -120,7 +120,7 @@ sub_80DCF60: @ 80DCF60
b _080DCF96
.align 2, 0
_080DCF88: .4byte gBattleAnimArgs
-_080DCF8C: .4byte gBattleAnimBankAttacker
+_080DCF8C: .4byte gAnimBankAttacker
_080DCF90:
ldrh r0, [r4]
ldrh r1, [r5, 0x20]
@@ -235,7 +235,7 @@ sub_80DD02C: @ 80DD02C
cmp r0, r1
bne _080DD072
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DD072:
pop {r4}
pop {r0}
@@ -270,7 +270,7 @@ do_boulder_dust: @ 80DD078
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DD0C4
@@ -282,9 +282,9 @@ do_boulder_dust: @ 80DD078
orrs r1, r0
strb r1, [r4]
_080DD0C4:
- ldr r0, _080DD160 @ =gUnknown_030042C0
+ ldr r0, _080DD160 @ =gBattle_BG1_X
strh r5, [r0]
- ldr r0, _080DD164 @ =gUnknown_030041B4
+ ldr r0, _080DD164 @ =gBattle_BG1_Y
strh r5, [r0]
ldr r0, _080DD168 @ =REG_BG1HOFS
strh r5, [r0]
@@ -312,7 +312,7 @@ _080DD0C4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DD120
@@ -328,7 +328,7 @@ _080DD120:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080DD13A
- ldr r0, _080DD184 @ =gBattleAnimBankAttacker
+ ldr r0, _080DD184 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -352,8 +352,8 @@ _080DD13A:
_080DD154: .4byte REG_BLDCNT
_080DD158: .4byte 0x00003f42
_080DD15C: .4byte REG_BG1CNT
-_080DD160: .4byte gUnknown_030042C0
-_080DD164: .4byte gUnknown_030041B4
+_080DD160: .4byte gBattle_BG1_X
+_080DD164: .4byte gBattle_BG1_Y
_080DD168: .4byte REG_BG1HOFS
_080DD16C: .4byte 0x040000d4
_080DD170: .4byte 0x85000400
@@ -361,7 +361,7 @@ _080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew
_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew
_080DD17C: .4byte gBattleAnimSpritePalette_261
_080DD180: .4byte gBattleAnimArgs
-_080DD184: .4byte gBattleAnimBankAttacker
+_080DD184: .4byte gAnimBankAttacker
_080DD188: .4byte gTasks
_080DD18C: .4byte sub_80DD190
thumb_func_end do_boulder_dust
@@ -386,7 +386,7 @@ sub_80DD190: @ 80DD190
adds r3, r1, 0
cmp r0, 0
bne _080DD1CC
- ldr r1, _080DD1C4 @ =gUnknown_030042C0
+ ldr r1, _080DD1C4 @ =gBattle_BG1_X
ldr r5, _080DD1C8 @ =0x0000fffa
adds r0, r5, 0
ldrh r2, [r1]
@@ -394,16 +394,16 @@ sub_80DD190: @ 80DD190
b _080DD1D2
.align 2, 0
_080DD1C0: .4byte gTasks
-_080DD1C4: .4byte gUnknown_030042C0
+_080DD1C4: .4byte gBattle_BG1_X
_080DD1C8: .4byte 0x0000fffa
_080DD1CC:
- ldr r1, _080DD204 @ =gUnknown_030042C0
+ ldr r1, _080DD204 @ =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_080DD1D2:
strh r0, [r1]
adds r4, r1, 0
- ldr r1, _080DD208 @ =gUnknown_030041B4
+ ldr r1, _080DD208 @ =gBattle_BG1_Y
ldr r5, _080DD20C @ =0x0000ffff
adds r0, r5, 0
ldrh r2, [r1]
@@ -427,8 +427,8 @@ _080DD1F8:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080DD204: .4byte gUnknown_030042C0
-_080DD208: .4byte gUnknown_030041B4
+_080DD204: .4byte gBattle_BG1_X
+_080DD208: .4byte gBattle_BG1_Y
_080DD20C: .4byte 0x0000ffff
_080DD210: .4byte _080DD214
.align 2, 0
@@ -574,7 +574,7 @@ _080DD2F6:
ldr r1, _080DD394 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DD344
@@ -593,8 +593,8 @@ _080DD344:
ldrh r0, [r1, 0x20]
adds r0, 0x1
strh r0, [r1, 0x20]
- ldr r4, _080DD3A0 @ =gUnknown_030042C0
- ldr r2, _080DD3A4 @ =gUnknown_030041B4
+ ldr r4, _080DD3A0 @ =gBattle_BG1_X
+ ldr r2, _080DD3A4 @ =gBattle_BG1_Y
_080DD358:
movs r1, 0
strh r1, [r4]
@@ -628,8 +628,8 @@ _080DD390: .4byte 0x85000400
_080DD394: .4byte 0x85000200
_080DD398: .4byte REG_BG1CNT
_080DD39C: .4byte gTasks
-_080DD3A0: .4byte gUnknown_030042C0
-_080DD3A4: .4byte gUnknown_030041B4
+_080DD3A0: .4byte gBattle_BG1_X
+_080DD3A4: .4byte gBattle_BG1_Y
_080DD3A8: .4byte REG_BLDCNT
thumb_func_end sub_80DD190
@@ -646,7 +646,7 @@ sub_80DD3AC: @ 80DD3AC
ldrsh r0, [r4, r2]
cmp r0, 0
beq _080DD3F8
- ldr r0, _080DD3F4 @ =gBattleAnimBankAttacker
+ ldr r0, _080DD3F4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -669,7 +669,7 @@ sub_80DD3AC: @ 80DD3AC
b _080DD3FC
.align 2, 0
_080DD3F0: .4byte gBattleAnimArgs
-_080DD3F4: .4byte gBattleAnimBankAttacker
+_080DD3F4: .4byte gAnimBankAttacker
_080DD3F8:
ldr r0, _080DD41C @ =0x0000ffc0
strh r0, [r5, 0x20]
@@ -739,14 +739,14 @@ _080DD46E:
cmp r0, r1
bge _080DD484
_080DD480:
- ldr r0, _080DD48C @ =move_anim_8072740
+ ldr r0, _080DD48C @ =DestroyAnimSprite
str r0, [r5, 0x1C]
_080DD484:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_080DD48C: .4byte move_anim_8072740
+_080DD48C: .4byte DestroyAnimSprite
thumb_func_end sub_80DD3AC
thumb_func_start sub_80DD490
@@ -769,7 +769,7 @@ sub_80DD490: @ 80DD490
strh r0, [r4, 0x36]
ldr r0, _080DD4CC @ =sub_8078B34
str r0, [r4, 0x1C]
- ldr r1, _080DD4D0 @ =move_anim_8072740
+ ldr r1, _080DD4D0 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
pop {r4,r5}
@@ -778,7 +778,7 @@ sub_80DD490: @ 80DD490
.align 2, 0
_080DD4C8: .4byte gBattleAnimArgs
_080DD4CC: .4byte sub_8078B34
-_080DD4D0: .4byte move_anim_8072740
+_080DD4D0: .4byte DestroyAnimSprite
thumb_func_end sub_80DD490
thumb_func_start sub_80DD4D4
@@ -795,32 +795,32 @@ sub_80DD4D4: @ 80DD4D4
lsls r1, 3
ldr r0, _080DD554 @ =gTasks
adds r6, r1, r0
- ldr r5, _080DD558 @ =gBattleAnimBankAttacker
+ ldr r5, _080DD558 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 8
movs r1, 0xC0
lsls r1, 13
adds r0, r1
lsrs r7, r0, 16
- ldr r4, _080DD55C @ =gBattleAnimBankTarget
+ ldr r4, _080DD55C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 8
movs r2, 0xC0
@@ -845,8 +845,8 @@ _080DD544:
b _080DD566
.align 2, 0
_080DD554: .4byte gTasks
-_080DD558: .4byte gBattleAnimBankAttacker
-_080DD55C: .4byte gBattleAnimBankTarget
+_080DD558: .4byte gAnimBankAttacker
+_080DD55C: .4byte gAnimBankTarget
_080DD560:
lsls r1, r5, 3
movs r0, 0x30
@@ -891,13 +891,13 @@ _080DD57E:
strh r4, [r6, 0x16]
movs r0, 0x40
negs r0, r0
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
adds r4, r0, 0
lsls r4, 24
asrs r4, 8
lsrs r4, 16
movs r0, 0x3F
- bl sub_8076F98
+ bl BattleAnimAdjustPanning
lsls r0, 24
strh r4, [r6, 0x22]
asrs r0, 24
@@ -1283,7 +1283,7 @@ _080DD8B8: .4byte gTasks
thumb_func_start sub_80DD8BC
sub_80DD8BC: @ 80DD8BC
push {lr}
- ldr r0, _080DD8E4 @ =gDisableStructMoveAnim
+ ldr r0, _080DD8E4 @ =gAnimDisableStructPtr
ldr r0, [r0]
ldrb r1, [r0, 0x11]
lsrs r0, r1, 4
@@ -1304,7 +1304,7 @@ _080DD8DE:
pop {r1}
bx r1
.align 2, 0
-_080DD8E4: .4byte gDisableStructMoveAnim
+_080DD8E4: .4byte gAnimDisableStructPtr
thumb_func_end sub_80DD8BC
thumb_func_start sub_80DD8E8
@@ -1379,7 +1379,7 @@ _080DD960:
cmp r0, 0
bne _080DD972
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DD972:
pop {r0}
bx r0
@@ -1389,7 +1389,7 @@ _080DD972:
sub_80DD978: @ 80DD978
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DD9A0 @ =gBattleAnimBankAttacker
+ ldr r0, _080DD9A0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1406,23 +1406,23 @@ _080DD994:
pop {r0}
bx r0
.align 2, 0
-_080DD9A0: .4byte gBattleAnimBankAttacker
+_080DD9A0: .4byte gAnimBankAttacker
thumb_func_end sub_80DD978
thumb_func_start sub_80DD9A4
sub_80DD9A4: @ 80DD9A4
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080DD9F0 @ =gBattleAnimBankTarget
+ ldr r5, _080DD9F0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
ldr r2, _080DD9F4 @ =gBattleAnimArgs
@@ -1446,7 +1446,7 @@ sub_80DD9A4: @ 80DD9A4
pop {r0}
bx r0
.align 2, 0
-_080DD9F0: .4byte gBattleAnimBankTarget
+_080DD9F0: .4byte gAnimBankTarget
_080DD9F4: .4byte gBattleAnimArgs
_080DD9F8: .4byte sub_80DD9FC
thumb_func_end sub_80DD9A4
@@ -1486,7 +1486,7 @@ sub_80DD9FC: @ 80DD9FC
cmp r0, 0x8C
ble _080DDA46
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080DDA46:
pop {r4}
pop {r0}
@@ -1498,7 +1498,7 @@ sub_80DDA4C: @ 80DDA4C
push {lr}
lsls r0, 24
lsrs r3, r0, 24
- ldr r2, _080DDA84 @ =gMoveDmgMoveAnim
+ ldr r2, _080DDA84 @ =gAnimMoveDmg
ldr r0, [r2]
cmp r0, 0x20
bgt _080DDA60
@@ -1526,7 +1526,7 @@ _080DDA7A:
pop {r0}
bx r0
.align 2, 0
-_080DDA84: .4byte gMoveDmgMoveAnim
+_080DDA84: .4byte gAnimMoveDmg
_080DDA88: .4byte gBattleAnimArgs
thumb_func_end sub_80DDA4C
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
deleted file mode 100644
index 62792245d..000000000
--- a/asm/slot_machine.s
+++ /dev/null
@@ -1,10158 +0,0 @@
- .include "constants/gba_constants.inc"
- .include "asm/macros.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start PlaySlotMachine
-PlaySlotMachine: @ 81018A0
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- bl sub_81019B0
- ldr r0, _081018B4 @ =sub_81018B8
- bl SetMainCallback2
- pop {r0}
- bx r0
- .align 2, 0
-_081018B4: .4byte sub_81018B8
- thumb_func_end PlaySlotMachine
-
- thumb_func_start sub_81018B8
-sub_81018B8: @ 81018B8
- push {lr}
- ldr r0, _081018D0 @ =gMain
- ldr r1, _081018D4 @ =0x0000043c
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0x6
- bhi _0810194A
- lsls r0, 2
- ldr r1, _081018D8 @ =_081018DC
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_081018D0: .4byte gMain
-_081018D4: .4byte 0x0000043c
-_081018D8: .4byte _081018DC
- .align 2, 0
-_081018DC:
- .4byte _081018F8
- .4byte _08101902
- .4byte _08101908
- .4byte _08101912
- .4byte _08101918
- .4byte _0810191E
- .4byte _08101938
-_081018F8:
- bl sub_8101A28
- bl sub_8101BA4
- b _08101922
-_08101902:
- bl sub_8101A8C
- b _08101922
-_08101908:
- bl sub_8101AE0
- bl sub_8101B04
- b _08101922
-_08101912:
- bl sub_8101C84
- b _08101922
-_08101918:
- bl sub_8101CA0
- b _08101922
-_0810191E:
- bl sub_8101CC0
-_08101922:
- ldr r1, _08101930 @ =gMain
- ldr r0, _08101934 @ =0x0000043c
- adds r1, r0
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- b _0810194A
- .align 2, 0
-_08101930: .4byte gMain
-_08101934: .4byte 0x0000043c
-_08101938:
- bl sub_8101CD4
- bl sub_8101CEC
- bl sub_8101A44
- ldr r0, _08101950 @ =sub_8101954
- bl SetMainCallback2
-_0810194A:
- pop {r0}
- bx r0
- .align 2, 0
-_08101950: .4byte sub_8101954
- thumb_func_end sub_81018B8
-
- thumb_func_start sub_8101954
-sub_8101954: @ 8101954
- push {lr}
- bl RunTasks
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- pop {r0}
- bx r0
- thumb_func_end sub_8101954
-
- thumb_func_start sub_810196C
-sub_810196C: @ 810196C
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- ldr r1, _081019A8 @ =REG_WIN0H
- ldr r2, _081019AC @ =gSharedMem
- adds r0, r2, 0
- adds r0, 0x58
- ldrh r0, [r0]
- strh r0, [r1]
- adds r1, 0x4
- adds r0, r2, 0
- adds r0, 0x5A
- ldrh r0, [r0]
- strh r0, [r1]
- adds r1, 0x4
- adds r0, r2, 0
- adds r0, 0x5C
- ldrh r0, [r0]
- strh r0, [r1]
- adds r1, 0x2
- adds r0, r2, 0
- adds r0, 0x5E
- ldrh r0, [r0]
- strh r0, [r1]
- pop {r0}
- bx r0
- .align 2, 0
-_081019A8: .4byte REG_WIN0H
-_081019AC: .4byte gSharedMem
- thumb_func_end sub_810196C
-
- thumb_func_start sub_81019B0
-sub_81019B0: @ 81019B0
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- lsls r4, 24
- lsrs r4, 24
- ldr r0, _081019E4 @ =nullsub_67
- movs r1, 0xFF
- bl CreateTask
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _081019E8 @ =gTasks
- adds r0, r1
- strh r4, [r0, 0x8]
- adds r0, 0xA
- adds r1, r5, 0
- bl StoreWordInTwoHalfwords
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081019E4: .4byte nullsub_67
-_081019E8: .4byte gTasks
- thumb_func_end sub_81019B0
-
- thumb_func_start sub_81019EC
-sub_81019EC: @ 81019EC
- push {lr}
- ldr r0, _08101A18 @ =nullsub_67
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- lsls r2, r0, 2
- adds r2, r0
- lsls r2, 3
- ldr r0, _08101A1C @ =gTasks
- adds r2, r0
- ldr r1, _08101A20 @ =gSharedMem
- ldrh r0, [r2, 0x8]
- strb r0, [r1, 0x1]
- adds r2, 0xA
- adds r1, 0x64
- adds r0, r2, 0
- bl LoadWordFromTwoHalfwords
- pop {r0}
- bx r0
- .align 2, 0
-_08101A18: .4byte nullsub_67
-_08101A1C: .4byte gTasks
-_08101A20: .4byte gSharedMem
- thumb_func_end sub_81019EC
-
- thumb_func_start nullsub_67
-nullsub_67: @ 8101A24
- bx lr
- thumb_func_end nullsub_67
-
- thumb_func_start sub_8101A28
-sub_8101A28: @ 8101A28
- push {lr}
- movs r0, 0
- bl SetVBlankCallback
- movs r0, 0
- bl SetHBlankCallback
- movs r1, 0x80
- lsls r1, 19
- movs r0, 0
- strh r0, [r1]
- pop {r0}
- bx r0
- thumb_func_end sub_8101A28
-
- thumb_func_start sub_8101A44
-sub_8101A44: @ 8101A44
- push {r4,lr}
- ldr r0, _08101A7C @ =sub_810196C
- bl SetVBlankCallback
- ldr r3, _08101A80 @ =0x04000208
- ldrh r2, [r3]
- movs r0, 0
- strh r0, [r3]
- ldr r4, _08101A84 @ =0x04000200
- ldrh r0, [r4]
- movs r1, 0x1
- orrs r0, r1
- strh r0, [r4]
- strh r2, [r3]
- ldr r2, _08101A88 @ =REG_DISPSTAT
- ldrh r0, [r2]
- movs r1, 0x8
- orrs r0, r1
- strh r0, [r2]
- movs r1, 0x80
- lsls r1, 19
- movs r2, 0xFD
- lsls r2, 6
- adds r0, r2, 0
- strh r0, [r1]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08101A7C: .4byte sub_810196C
-_08101A80: .4byte 0x04000208
-_08101A84: .4byte 0x04000200
-_08101A88: .4byte REG_DISPSTAT
- thumb_func_end sub_8101A44
-
- thumb_func_start sub_8101A8C
-sub_8101A8C: @ 8101A8C
- push {r4-r7,lr}
- sub sp, 0x4
- movs r2, 0xC0
- lsls r2, 19
- movs r3, 0x80
- lsls r3, 9
- mov r4, sp
- movs r6, 0
- ldr r1, _08101AD8 @ =0x040000d4
- movs r5, 0x80
- lsls r5, 5
- ldr r7, _08101ADC @ =0x81000800
- movs r0, 0x81
- lsls r0, 24
- mov r12, r0
-_08101AAA:
- strh r6, [r4]
- mov r0, sp
- str r0, [r1]
- str r2, [r1, 0x4]
- str r7, [r1, 0x8]
- ldr r0, [r1, 0x8]
- adds r2, r5
- subs r3, r5
- cmp r3, r5
- bhi _08101AAA
- strh r6, [r4]
- mov r0, sp
- str r0, [r1]
- str r2, [r1, 0x4]
- lsrs r0, r3, 1
- mov r2, r12
- orrs r0, r2
- str r0, [r1, 0x8]
- ldr r0, [r1, 0x8]
- add sp, 0x4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08101AD8: .4byte 0x040000d4
-_08101ADC: .4byte 0x81000800
- thumb_func_end sub_8101A8C
-
- thumb_func_start sub_8101AE0
-sub_8101AE0: @ 8101AE0
- sub sp, 0x4
- movs r2, 0xE0
- lsls r2, 19
- mov r1, sp
- movs r0, 0
- strh r0, [r1]
- ldr r0, _08101AFC @ =0x040000d4
- str r1, [r0]
- str r2, [r0, 0x4]
- ldr r1, _08101B00 @ =0x81000200
- str r1, [r0, 0x8]
- ldr r0, [r0, 0x8]
- add sp, 0x4
- bx lr
- .align 2, 0
-_08101AFC: .4byte 0x040000d4
-_08101B00: .4byte 0x81000200
- thumb_func_end sub_8101AE0
-
- thumb_func_start sub_8101B04
-sub_8101B04: @ 8101B04
- push {r4,r5,lr}
- ldr r5, _08101B70 @ =REG_BG0CNT
- movs r1, 0
- strh r1, [r5]
- ldr r2, _08101B74 @ =REG_BG1CNT
- strh r1, [r2]
- ldr r3, _08101B78 @ =REG_BG2CNT
- strh r1, [r3]
- ldr r4, _08101B7C @ =REG_BG3CNT
- strh r1, [r4]
- ldr r0, _08101B80 @ =REG_BG0HOFS
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- ldr r1, _08101B84 @ =0x00001f08
- adds r0, r1, 0
- strh r0, [r5]
- ldr r1, _08101B88 @ =0x00001c01
- adds r0, r1, 0
- strh r0, [r2]
- ldr r2, _08101B8C @ =0x00001d02
- adds r0, r2, 0
- strh r0, [r3]
- ldr r1, _08101B90 @ =0x00001e02
- adds r0, r1, 0
- strh r0, [r4]
- ldr r0, _08101B94 @ =REG_WININ
- movs r1, 0x3F
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- ldr r1, _08101B98 @ =REG_BLDCNT
- ldr r2, _08101B9C @ =0x00001048
- adds r0, r2, 0
- strh r0, [r1]
- adds r1, 0x2
- ldr r2, _08101BA0 @ =0x00000809
- adds r0, r2, 0
- strh r0, [r1]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08101B70: .4byte REG_BG0CNT
-_08101B74: .4byte REG_BG1CNT
-_08101B78: .4byte REG_BG2CNT
-_08101B7C: .4byte REG_BG3CNT
-_08101B80: .4byte REG_BG0HOFS
-_08101B84: .4byte 0x00001f08
-_08101B88: .4byte 0x00001c01
-_08101B8C: .4byte 0x00001d02
-_08101B90: .4byte 0x00001e02
-_08101B94: .4byte REG_WININ
-_08101B98: .4byte REG_BLDCNT
-_08101B9C: .4byte 0x00001048
-_08101BA0: .4byte 0x00000809
- thumb_func_end sub_8101B04
-
- thumb_func_start sub_8101BA4
-sub_8101BA4: @ 8101BA4
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- bl sub_81019EC
- ldr r5, _08101C74 @ =gSharedMem
- movs r4, 0
- strb r4, [r5]
- strb r4, [r5, 0x2]
- bl Random
- movs r1, 0x1
- ands r1, r0
- strb r1, [r5, 0x3]
- strb r4, [r5, 0x4]
- movs r0, 0
- strh r4, [r5, 0x8]
- strb r0, [r5, 0xA]
- strb r0, [r5, 0xB]
- ldr r0, _08101C78 @ =gSaveBlock1
- ldr r1, _08101C7C @ =0x00000494
- adds r0, r1
- ldrh r0, [r0]
- strh r0, [r5, 0xC]
- strh r4, [r5, 0xE]
- strh r4, [r5, 0x10]
- strh r4, [r5, 0x12]
- strh r4, [r5, 0x18]
- movs r0, 0x8
- strh r0, [r5, 0x1A]
- adds r1, r5, 0
- adds r1, 0x58
- movs r0, 0xF0
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0xA0
- strh r0, [r1]
- adds r0, r5, 0
- adds r0, 0x5C
- movs r1, 0x3F
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- bl GetCurrentMapMusic
- adds r1, r5, 0
- adds r1, 0x60
- strh r0, [r1]
- movs r7, 0
- adds r6, r5, 0
- ldr r2, _08101C80 @ =gUnknown_083ECCF8
- mov r9, r2
- movs r0, 0x1C
- adds r0, r6
- mov r8, r0
-_08101C14:
- lsls r5, r7, 1
- adds r0, r6, 0
- adds r0, 0x22
- adds r0, r5, r0
- movs r1, 0
- strh r1, [r0]
- adds r4, r6, 0
- adds r4, 0x28
- adds r4, r5, r4
- ldrb r0, [r6, 0x3]
- lsls r0, 1
- lsls r1, r7, 2
- adds r0, r1
- add r0, r9
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r1, 0x15
- bl __modsi3
- strh r0, [r4]
- add r5, r8
- movs r2, 0
- ldrsh r0, [r4, r2]
- lsls r1, r0, 1
- adds r1, r0
- lsls r1, 3
- movs r2, 0xFC
- lsls r2, 1
- adds r0, r2, 0
- subs r0, r1
- strh r0, [r5]
- movs r1, 0
- ldrsh r0, [r5, r1]
- adds r1, r2, 0
- bl __modsi3
- strh r0, [r5]
- adds r0, r7, 0x1
- lsls r0, 24
- lsrs r7, r0, 24
- cmp r7, 0x2
- bls _08101C14
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08101C74: .4byte gSharedMem
-_08101C78: .4byte gSaveBlock1
-_08101C7C: .4byte 0x00000494
-_08101C80: .4byte gUnknown_083ECCF8
- thumb_func_end sub_8101BA4
-
- thumb_func_start sub_8101C84
-sub_8101C84: @ 8101C84
- push {r4,lr}
- ldr r4, _08101C9C @ =gWindowConfig_81E7128
- adds r0, r4, 0
- bl SetUpWindowConfig
- adds r0, r4, 0
- bl InitMenuWindow
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08101C9C: .4byte gWindowConfig_81E7128
- thumb_func_end sub_8101C84
-
- thumb_func_start sub_8101CA0
-sub_8101CA0: @ 8101CA0
- push {lr}
- bl ResetPaletteFade
- bl ResetSpriteData
- ldr r1, _08101CBC @ =gOamLimit
- movs r0, 0x80
- strb r0, [r1]
- bl FreeAllSpritePalettes
- bl ResetTasks
- pop {r0}
- bx r0
- .align 2, 0
-_08101CBC: .4byte gOamLimit
- thumb_func_end sub_8101CA0
-
- thumb_func_start sub_8101CC0
-sub_8101CC0: @ 8101CC0
- push {lr}
- bl sub_8106448
- bl sub_81064B8
- bl sub_81063C0
- pop {r0}
- bx r0
- thumb_func_end sub_8101CC0
-
- thumb_func_start sub_8101CD4
-sub_8101CD4: @ 8101CD4
- push {lr}
- bl sub_8104EA8
- bl sub_8104F8C
- bl sub_8103DC8
- bl sub_81050C4
- pop {r0}
- bx r0
- thumb_func_end sub_8101CD4
-
- thumb_func_start sub_8101CEC
-sub_8101CEC: @ 8101CEC
- push {lr}
- bl sub_8104048
- bl sub_8102DA8
- bl sub_8104C5C
- bl sub_8101D04
- pop {r0}
- bx r0
- thumb_func_end sub_8101CEC
-
- thumb_func_start sub_8101D04
-sub_8101D04: @ 8101D04
- push {r4,lr}
- ldr r4, _08101D20 @ =sub_8101D24
- adds r0, r4, 0
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- bl _call_via_r4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08101D20: .4byte sub_8101D24
- thumb_func_end sub_8101D04
-
- thumb_func_start sub_8101D24
-sub_8101D24: @ 8101D24
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r7, _08101D50 @ =gUnknown_083ECAAC
- lsls r1, r0, 2
- adds r1, r0
- lsls r4, r1, 3
- ldr r6, _08101D54 @ =gSharedMem
- ldr r5, _08101D58 @ =gTasks
-_08101D36:
- ldrb r0, [r6]
- lsls r0, 2
- adds r0, r7
- ldr r1, [r0]
- adds r0, r4, r5
- bl _call_via_r1
- lsls r0, 24
- cmp r0, 0
- bne _08101D36
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08101D50: .4byte gUnknown_083ECAAC
-_08101D54: .4byte gSharedMem
-_08101D58: .4byte gTasks
- thumb_func_end sub_8101D24
-
- thumb_func_start sub_8101D5C
-sub_8101D5C: @ 8101D5C
- push {r4,lr}
- sub sp, 0x4
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r4, _08101D88 @ =gSharedMem
- ldrb r0, [r4, 0x2]
- bl sub_810423C
- ldrb r0, [r4]
- adds r0, 0x1
- strb r0, [r4]
- movs r0, 0
- add sp, 0x4
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08101D88: .4byte gSharedMem
- thumb_func_end sub_8101D5C
-
- thumb_func_start sub_8101D8C
-sub_8101D8C: @ 8101D8C
- push {lr}
- ldr r0, _08101DA8 @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08101DA2
- ldr r1, _08101DAC @ =gSharedMem
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
-_08101DA2:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08101DA8: .4byte gPaletteFade
-_08101DAC: .4byte gSharedMem
- thumb_func_end sub_8101D8C
-
- thumb_func_start sub_8101DB0
-sub_8101DB0: @ 8101DB0
- push {lr}
- ldr r2, _08101DD8 @ =gSharedMem
- movs r0, 0
- strh r0, [r2, 0xE]
- strh r0, [r2, 0x12]
- strh r0, [r2, 0x18]
- ldrb r1, [r2, 0x4]
- movs r0, 0xC0
- ands r0, r1
- strb r0, [r2, 0x4]
- movs r0, 0x4
- strb r0, [r2]
- movs r1, 0xC
- ldrsh r0, [r2, r1]
- cmp r0, 0
- bgt _08101DDC
- movs r0, 0x19
- strb r0, [r2]
- b _08101DEC
- .align 2, 0
-_08101DD8: .4byte gSharedMem
-_08101DDC:
- ldrb r0, [r2, 0xA]
- cmp r0, 0
- beq _08101DEC
- movs r0, 0x3
- strb r0, [r2]
- movs r0, 0x4
- bl sub_8104CAC
-_08101DEC:
- movs r0, 0x1
- pop {r1}
- bx r1
- thumb_func_end sub_8101DB0
-
- thumb_func_start sub_8101DF4
-sub_8101DF4: @ 8101DF4
- push {lr}
- bl sub_8104E18
- lsls r0, 24
- cmp r0, 0
- beq _08101E06
- ldr r1, _08101E0C @ =gSharedMem
- movs r0, 0x4
- strb r0, [r1]
-_08101E06:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08101E0C: .4byte gSharedMem
- thumb_func_end sub_8101DF4
-
- thumb_func_start sub_8101E10
-sub_8101E10: @ 8101E10
- push {lr}
- movs r0, 0
- bl sub_8104CAC
- ldr r2, _08101E34 @ =gSharedMem
- movs r0, 0x5
- strb r0, [r2]
- movs r0, 0xC
- ldrsh r1, [r2, r0]
- ldr r0, _08101E38 @ =0x0000270e
- cmp r1, r0
- ble _08101E2C
- movs r0, 0x17
- strb r0, [r2]
-_08101E2C:
- movs r0, 0x1
- pop {r1}
- bx r1
- .align 2, 0
-_08101E34: .4byte gSharedMem
-_08101E38: .4byte 0x0000270e
- thumb_func_end sub_8101E10
-
- thumb_func_start sub_8101E3C
-sub_8101E3C: @ 8101E3C
- push {r4,lr}
- ldr r0, _08101E58 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x4
- ands r0, r1
- cmp r0, 0
- beq _08101E60
- movs r0, 0
- bl sub_8104AB8
- ldr r1, _08101E5C @ =gSharedMem
- movs r0, 0x8
- strb r0, [r1]
- b _08101F1A
- .align 2, 0
-_08101E58: .4byte gMain
-_08101E5C: .4byte gSharedMem
-_08101E60:
- movs r0, 0x80
- lsls r0, 1
- ands r0, r1
- cmp r0, 0
- beq _08101EC2
- ldr r2, _08101EB8 @ =gSharedMem
- movs r1, 0xC
- ldrsh r0, [r2, r1]
- subs r0, 0x3
- movs r3, 0x12
- ldrsh r1, [r2, r3]
- adds r0, r1
- cmp r0, 0
- blt _08101EBC
- ldrh r4, [r2, 0x12]
- adds r0, r1, 0
- cmp r0, 0x2
- bgt _08101E9C
-_08101E84:
- lsls r0, r4, 24
- lsrs r0, 24
- bl sub_8103D50
- lsls r0, r4, 16
- movs r2, 0x80
- lsls r2, 9
- adds r0, r2
- lsrs r4, r0, 16
- asrs r0, 16
- cmp r0, 0x2
- ble _08101E84
-_08101E9C:
- ldr r1, _08101EB8 @ =gSharedMem
- ldrh r0, [r1, 0xC]
- subs r0, 0x3
- ldrh r3, [r1, 0x12]
- adds r0, r3
- strh r0, [r1, 0xC]
- movs r0, 0x3
- strh r0, [r1, 0x12]
- movs r0, 0x9
- strb r0, [r1]
- movs r0, 0x5F
- bl PlaySE
- b _08101F1A
- .align 2, 0
-_08101EB8: .4byte gSharedMem
-_08101EBC:
- movs r0, 0x6
- strb r0, [r2]
- b _08101F1A
-_08101EC2:
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _08101EEC
- ldr r4, _08101F24 @ =gSharedMem
- movs r1, 0xC
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _08101EEC
- movs r0, 0x5F
- bl PlaySE
- ldrb r0, [r4, 0x12]
- bl sub_8103D50
- ldrh r0, [r4, 0xC]
- subs r0, 0x1
- strh r0, [r4, 0xC]
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
-_08101EEC:
- ldr r0, _08101F24 @ =gSharedMem
- movs r2, 0x12
- ldrsh r1, [r0, r2]
- ldr r2, _08101F28 @ =gMain
- adds r3, r0, 0
- cmp r1, 0x2
- bgt _08101F08
- cmp r1, 0
- beq _08101F0C
- ldrh r1, [r2, 0x2E]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08101F0C
-_08101F08:
- movs r0, 0x9
- strb r0, [r3]
-_08101F0C:
- ldrh r1, [r2, 0x2E]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- beq _08101F1A
- movs r0, 0x15
- strb r0, [r3]
-_08101F1A:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08101F24: .4byte gSharedMem
-_08101F28: .4byte gMain
- thumb_func_end sub_8101E3C
-
- thumb_func_start sub_8101F2C
-sub_8101F2C: @ 8101F2C
- push {r4,lr}
- adds r4, r0, 0
- bl MenuDisplayMessageBox
- adds r0, r4, 0
- movs r1, 0x2
- movs r2, 0xF
- bl MenuPrint
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8101F2C
-
- thumb_func_start sub_8101F44
-sub_8101F44: @ 8101F44
- push {lr}
- ldr r0, _08101F58 @ =gOtherText_DontHaveThreeCoins
- bl sub_8101F2C
- ldr r1, _08101F5C @ =gSharedMem
- movs r0, 0x7
- strb r0, [r1]
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08101F58: .4byte gOtherText_DontHaveThreeCoins
-_08101F5C: .4byte gSharedMem
- thumb_func_end sub_8101F44
-
- thumb_func_start sub_8101F60
-sub_8101F60: @ 8101F60
- push {lr}
- ldr r0, _08101F80 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x3
- ands r0, r1
- cmp r0, 0
- beq _08101F78
- bl MenuZeroFillScreen
- ldr r1, _08101F84 @ =gSharedMem
- movs r0, 0x5
- strb r0, [r1]
-_08101F78:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08101F80: .4byte gMain
-_08101F84: .4byte gSharedMem
- thumb_func_end sub_8101F60
-
- thumb_func_start sub_8101F88
-sub_8101F88: @ 8101F88
- push {lr}
- bl sub_8104AEC
- lsls r0, 24
- cmp r0, 0
- beq _08101F9A
- ldr r1, _08101FA0 @ =gSharedMem
- movs r0, 0x5
- strb r0, [r1]
-_08101F9A:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08101FA0: .4byte gSharedMem
- thumb_func_end sub_8101F88
-
- thumb_func_start sub_8101FA4
-sub_8101FA4: @ 8101FA4
- push {r4,lr}
- adds r4, r0, 0
- bl sub_8102484
- bl sub_8104DA4
- movs r0, 0
- bl sub_8102DEC
- movs r0, 0x1
- bl sub_8102DEC
- movs r0, 0x2
- bl sub_8102DEC
- movs r0, 0
- strh r0, [r4, 0x8]
- ldr r4, _08101FDC @ =gSharedMem
- ldrb r1, [r4, 0x4]
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _08101FE0
- bl sub_810430C
- movs r0, 0xA
- b _08101FE8
- .align 2, 0
-_08101FDC: .4byte gSharedMem
-_08101FE0:
- movs r0, 0x1
- bl sub_8104CAC
- movs r0, 0xB
-_08101FE8:
- strb r0, [r4]
- ldr r4, _08102004 @ =gSharedMem
- movs r0, 0x8
- strh r0, [r4, 0x1A]
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- beq _08101FFC
- bl dp15_jump_random_unknown
- strh r0, [r4, 0x1A]
-_08101FFC:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102004: .4byte gSharedMem
- thumb_func_end sub_8101FA4
-
- thumb_func_start sub_8102008
-sub_8102008: @ 8102008
- push {lr}
- bl sub_810432C
- lsls r0, 24
- cmp r0, 0
- beq _08102028
- movs r0, 0x1
- bl sub_8104CAC
- ldr r1, _08102030 @ =gSharedMem
- ldrb r2, [r1, 0x4]
- movs r0, 0xDF
- ands r0, r2
- strb r0, [r1, 0x4]
- movs r0, 0xB
- strb r0, [r1]
-_08102028:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102030: .4byte gSharedMem
- thumb_func_end sub_8102008
-
- thumb_func_start sub_8102034
-sub_8102034: @ 8102034
- push {lr}
- ldrh r1, [r0, 0x8]
- adds r1, 0x1
- strh r1, [r0, 0x8]
- lsls r1, 16
- asrs r1, 16
- cmp r1, 0x1D
- ble _0810204E
- bl sub_81024F0
- ldr r1, _08102054 @ =gSharedMem
- movs r0, 0xC
- strb r0, [r1]
-_0810204E:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102054: .4byte gSharedMem
- thumb_func_end sub_8102034
-
- thumb_func_start sub_8102058
-sub_8102058: @ 8102058
- push {r4,lr}
- ldr r0, _08102088 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _0810207E
- movs r0, 0x18
- bl PlaySE
- ldr r4, _0810208C @ =gSharedMem
- ldrb r0, [r4, 0x18]
- bl sub_8102E1C
- ldrb r0, [r4, 0x18]
- bl sub_8103C14
- movs r0, 0xD
- strb r0, [r4]
-_0810207E:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102088: .4byte gMain
-_0810208C: .4byte gSharedMem
- thumb_func_end sub_8102058
-
- thumb_func_start sub_8102090
-sub_8102090: @ 8102090
- push {r4,lr}
- ldr r4, _081020BC @ =gSharedMem
- ldrb r0, [r4, 0x18]
- bl sub_8102E40
- lsls r0, 24
- cmp r0, 0
- bne _081020C0
- ldrh r0, [r4, 0x18]
- adds r0, 0x1
- strh r0, [r4, 0x18]
- movs r1, 0xC
- strb r1, [r4]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x2
- ble _081020B6
- movs r0, 0xE
- strb r0, [r4]
-_081020B6:
- movs r0, 0x1
- b _081020C2
- .align 2, 0
-_081020BC: .4byte gSharedMem
-_081020C0:
- movs r0, 0
-_081020C2:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8102090
-
- thumb_func_start sub_81020C8
-sub_81020C8: @ 81020C8
- push {r4,lr}
- ldr r4, _08102128 @ =gSharedMem
- ldrb r1, [r4, 0x4]
- movs r0, 0xC0
- ands r0, r1
- strb r0, [r4, 0x4]
- bl sub_81027A0
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- beq _081020E8
- subs r0, 0x1
- strb r0, [r4, 0xA]
- ldrb r0, [r4, 0xB]
- adds r0, 0x1
- strb r0, [r4, 0xB]
-_081020E8:
- ldrh r0, [r4, 0x8]
- cmp r0, 0
- beq _081021B4
- movs r0, 0xF
- strb r0, [r4]
- bl sub_8102A24
- bl sub_8103F70
- ldrh r0, [r4, 0x10]
- ldrh r1, [r4, 0xE]
- subs r0, r1
- strh r0, [r4, 0x10]
- lsls r0, 16
- cmp r0, 0
- bge _0810210C
- movs r0, 0
- strh r0, [r4, 0x10]
-_0810210C:
- ldrh r1, [r4, 0x8]
- movs r0, 0xC0
- lsls r0, 1
- ands r0, r1
- cmp r0, 0
- beq _08102130
- ldr r0, _0810212C @ =0x00000185
- bl PlayFanfare
- movs r0, 0x6
- bl sub_8104CAC
- b _0810215A
- .align 2, 0
-_08102128: .4byte gSharedMem
-_0810212C: .4byte 0x00000185
-_08102130:
- movs r0, 0x40
- ands r0, r1
- cmp r0, 0
- beq _0810214C
- ldr r0, _08102148 @ =0x00000185
- bl PlayFanfare
- movs r0, 0x5
- bl sub_8104CAC
- b _0810215A
- .align 2, 0
-_08102148: .4byte 0x00000185
-_0810214C:
- movs r0, 0xC3
- lsls r0, 1
- bl PlayFanfare
- movs r0, 0x2
- bl sub_8104CAC
-_0810215A:
- ldr r1, _081021B0 @ =gSharedMem
- ldrh r3, [r1, 0x8]
- movs r0, 0xE0
- lsls r0, 1
- ands r0, r3
- adds r2, r1, 0
- cmp r0, 0
- beq _08102192
- ldrb r1, [r2, 0x4]
- movs r0, 0x3F
- ands r0, r1
- movs r1, 0
- strb r0, [r2, 0x4]
- movs r0, 0xC0
- lsls r0, 1
- ands r0, r3
- cmp r0, 0
- beq _08102192
- strb r1, [r2, 0xA]
- strb r1, [r2, 0xB]
- strb r1, [r2, 0x3]
- movs r0, 0x80
- lsls r0, 1
- ands r0, r3
- cmp r0, 0
- beq _08102192
- movs r0, 0x1
- strb r0, [r2, 0x3]
-_08102192:
- ldrh r1, [r2, 0x8]
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _081021D2
- ldrb r0, [r2, 0x2]
- cmp r0, 0xF
- bhi _081021D2
- adds r0, 0x1
- strb r0, [r2, 0x2]
- ldrb r0, [r2, 0x2]
- bl sub_8104064
- b _081021D2
- .align 2, 0
-_081021B0: .4byte gSharedMem
-_081021B4:
- movs r0, 0x3
- bl sub_8104CAC
- movs r0, 0x14
- strb r0, [r4]
- ldrh r0, [r4, 0x12]
- ldrh r1, [r4, 0x10]
- adds r0, r1
- strh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 16
- ldr r1, _081021DC @ =0x0000270f
- cmp r0, r1
- ble _081021D2
- strh r1, [r4, 0x10]
-_081021D2:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_081021DC: .4byte 0x0000270f
- thumb_func_end sub_81020C8
-
- thumb_func_start sub_81021E0
-sub_81021E0: @ 81021E0
- push {lr}
- bl sub_8102A44
- lsls r0, 24
- cmp r0, 0
- beq _081021F2
- ldr r1, _081021F8 @ =gSharedMem
- movs r0, 0x10
- strb r0, [r1]
-_081021F2:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081021F8: .4byte gSharedMem
- thumb_func_end sub_81021E0
-
- thumb_func_start sub_81021FC
-sub_81021FC: @ 81021FC
- push {r4,lr}
- bl sub_8103FA0
- lsls r0, 24
- cmp r0, 0
- beq _08102256
- ldr r4, _08102260 @ =gSharedMem
- movs r0, 0x13
- strb r0, [r4]
- ldrh r1, [r4, 0x8]
- movs r0, 0xC0
- lsls r0, 1
- ands r0, r1
- cmp r0, 0
- beq _08102220
- movs r0, 0x1C
- bl IncrementGameStat
-_08102220:
- ldrh r1, [r4, 0x8]
- movs r0, 0x4
- ands r0, r1
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r2, 0
- beq _08102236
- movs r0, 0
- strh r0, [r4, 0x18]
- movs r0, 0x9
- strb r0, [r4]
-_08102236:
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _08102242
- movs r0, 0x11
- strb r0, [r4]
-_08102242:
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- beq _08102256
- cmp r2, 0
- beq _08102256
- movs r0, 0x4
- bl sub_8104CAC
- movs r0, 0x12
- strb r0, [r4]
-_08102256:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102260: .4byte gSharedMem
- thumb_func_end sub_81021FC
-
- thumb_func_start sub_8102264
-sub_8102264: @ 8102264
- push {r4,lr}
- bl sub_81040C8
- lsls r0, 24
- cmp r0, 0
- bne _08102294
- ldr r4, _0810229C @ =gSharedMem
- movs r0, 0x13
- strb r0, [r4]
- ldrh r1, [r4, 0x8]
- movs r0, 0x4
- ands r0, r1
- cmp r0, 0
- beq _08102294
- movs r0, 0x9
- strb r0, [r4]
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- beq _08102294
- movs r0, 0x4
- bl sub_8104CAC
- movs r0, 0x12
- strb r0, [r4]
-_08102294:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_0810229C: .4byte gSharedMem
- thumb_func_end sub_8102264
-
- thumb_func_start sub_81022A0
-sub_81022A0: @ 81022A0
- push {lr}
- bl sub_8104E18
- lsls r0, 24
- cmp r0, 0
- beq _081022C0
- ldr r2, _081022C8 @ =gSharedMem
- movs r0, 0x13
- strb r0, [r2]
- ldrh r1, [r2, 0x8]
- movs r0, 0x4
- ands r0, r1
- cmp r0, 0
- beq _081022C0
- movs r0, 0x9
- strb r0, [r2]
-_081022C0:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081022C8: .4byte gSharedMem
- thumb_func_end sub_81022A0
-
- thumb_func_start sub_81022CC
-sub_81022CC: @ 81022CC
- push {lr}
- movs r0, 0
- bl sub_8103D8C
- movs r0, 0x1
- bl sub_8103D8C
- movs r0, 0x2
- bl sub_8103D8C
- ldr r1, _081022EC @ =gSharedMem
- movs r0, 0x2
- strb r0, [r1]
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081022EC: .4byte gSharedMem
- thumb_func_end sub_81022CC
-
- thumb_func_start sub_81022F0
-sub_81022F0: @ 81022F0
- push {lr}
- adds r1, r0, 0
- ldrh r0, [r1, 0xA]
- adds r0, 0x1
- strh r0, [r1, 0xA]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x40
- ble _0810230C
- movs r0, 0
- strh r0, [r1, 0xA]
- ldr r1, _08102314 @ =gSharedMem
- movs r0, 0x13
- strb r0, [r1]
-_0810230C:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102314: .4byte gSharedMem
- thumb_func_end sub_81022F0
-
- thumb_func_start sub_8102318
-sub_8102318: @ 8102318
- push {lr}
- ldr r0, _0810233C @ =gOtherText_QuitGamePrompt
- bl sub_8101F2C
- movs r0, 0x15
- movs r1, 0x7
- movs r2, 0x1
- bl DisplayYesNoMenu
- bl sub_814AB84
- ldr r1, _08102340 @ =gSharedMem
- movs r0, 0x16
- strb r0, [r1]
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_0810233C: .4byte gOtherText_QuitGamePrompt
-_08102340: .4byte gSharedMem
- thumb_func_end sub_8102318
-
- thumb_func_start sub_8102344
-sub_8102344: @ 8102344
- push {lr}
- bl ProcessMenuInputNoWrap_
- lsls r0, 24
- asrs r1, r0, 24
- cmp r1, 0
- bne _0810237C
- bl MenuZeroFillScreen
- movs r0, 0
- bl sub_8103D8C
- movs r0, 0x1
- bl sub_8103D8C
- movs r0, 0x2
- bl sub_8103D8C
- ldr r0, _08102378 @ =gSharedMem
- ldrh r1, [r0, 0x12]
- ldrh r2, [r0, 0xC]
- adds r1, r2
- strh r1, [r0, 0xC]
- movs r1, 0x1B
- strb r1, [r0]
- b _08102392
- .align 2, 0
-_08102378: .4byte gSharedMem
-_0810237C:
- cmp r1, 0x1
- beq _08102388
- movs r0, 0x1
- negs r0, r0
- cmp r1, r0
- bne _08102392
-_08102388:
- bl MenuZeroFillScreen
- ldr r1, _08102398 @ =gSharedMem
- movs r0, 0x5
- strb r0, [r1]
-_08102392:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102398: .4byte gSharedMem
- thumb_func_end sub_8102344
-
- thumb_func_start sub_810239C
-sub_810239C: @ 810239C
- push {lr}
- ldr r0, _081023B0 @ =gOtherText_MaxCoins
- bl sub_8101F2C
- ldr r1, _081023B4 @ =gSharedMem
- movs r0, 0x18
- strb r0, [r1]
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081023B0: .4byte gOtherText_MaxCoins
-_081023B4: .4byte gSharedMem
- thumb_func_end sub_810239C
-
- thumb_func_start sub_81023B8
-sub_81023B8: @ 81023B8
- push {lr}
- ldr r0, _081023D8 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x3
- ands r0, r1
- cmp r0, 0
- beq _081023D0
- bl MenuZeroFillScreen
- ldr r1, _081023DC @ =gSharedMem
- movs r0, 0x5
- strb r0, [r1]
-_081023D0:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081023D8: .4byte gMain
-_081023DC: .4byte gSharedMem
- thumb_func_end sub_81023B8
-
- thumb_func_start sub_81023E0
-sub_81023E0: @ 81023E0
- push {lr}
- ldr r0, _081023F4 @ =gOtherText_OutOfCoins
- bl sub_8101F2C
- ldr r1, _081023F8 @ =gSharedMem
- movs r0, 0x1A
- strb r0, [r1]
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_081023F4: .4byte gOtherText_OutOfCoins
-_081023F8: .4byte gSharedMem
- thumb_func_end sub_81023E0
-
- thumb_func_start sub_81023FC
-sub_81023FC: @ 81023FC
- push {lr}
- ldr r0, _0810241C @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x3
- ands r0, r1
- cmp r0, 0
- beq _08102414
- bl MenuZeroFillScreen
- ldr r1, _08102420 @ =gSharedMem
- movs r0, 0x1B
- strb r0, [r1]
-_08102414:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_0810241C: .4byte gMain
-_08102420: .4byte gSharedMem
- thumb_func_end sub_81023FC
-
- thumb_func_start sub_8102424
-sub_8102424: @ 8102424
- push {r4,lr}
- sub sp, 0x4
- ldr r0, _08102454 @ =gSaveBlock1
- ldr r4, _08102458 @ =gSharedMem
- ldrh r1, [r4, 0xC]
- ldr r2, _0810245C @ =0x00000494
- adds r0, r2
- movs r2, 0
- strh r1, [r0]
- movs r0, 0x1
- negs r0, r0
- str r2, [sp]
- movs r1, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldrb r0, [r4]
- adds r0, 0x1
- strb r0, [r4]
- movs r0, 0
- add sp, 0x4
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102454: .4byte gSaveBlock1
-_08102458: .4byte gSharedMem
-_0810245C: .4byte 0x00000494
- thumb_func_end sub_8102424
-
- thumb_func_start sub_8102460
-sub_8102460: @ 8102460
- push {lr}
- ldr r0, _0810247C @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08102476
- ldr r0, _08102480 @ =gSharedMem
- ldr r0, [r0, 0x64]
- bl SetMainCallback2
-_08102476:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_0810247C: .4byte gPaletteFade
-_08102480: .4byte gSharedMem
- thumb_func_end sub_8102460
-
- thumb_func_start sub_8102484
-sub_8102484: @ 8102484
- push {r4,lr}
- ldr r4, _081024E4 @ =gSharedMem
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- bne _081024DC
- ldrb r1, [r4, 0x4]
- movs r0, 0xC0
- ands r0, r1
- cmp r0, 0
- bne _081024DC
- bl sub_8102540
- lsls r0, 24
- cmp r0, 0
- beq _081024C0
- bl sub_8102578
- lsls r0, 24
- lsrs r3, r0, 24
- cmp r3, 0x3
- beq _081024C0
- ldr r1, _081024E8 @ =gUnknown_083ECE42
- lsls r0, r3, 1
- adds r0, r1
- ldrb r1, [r0]
- ldrb r0, [r4, 0x4]
- orrs r0, r1
- strb r0, [r4, 0x4]
- cmp r3, 0x1
- bne _081024DC
-_081024C0:
- bl sub_81025BC
- lsls r0, 24
- lsrs r3, r0, 24
- cmp r3, 0x5
- beq _081024DC
- ldr r2, _081024E4 @ =gSharedMem
- ldr r1, _081024EC @ =gUnknown_083ECE48
- lsls r0, r3, 1
- adds r0, r1
- ldrb r1, [r0]
- ldrb r0, [r2, 0x4]
- orrs r0, r1
- strb r0, [r2, 0x4]
-_081024DC:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081024E4: .4byte gSharedMem
-_081024E8: .4byte gUnknown_083ECE42
-_081024EC: .4byte gUnknown_083ECE48
- thumb_func_end sub_8102484
-
- thumb_func_start sub_81024F0
-sub_81024F0: @ 81024F0
- push {lr}
- ldr r1, _08102508 @ =gSharedMem
- movs r0, 0
- strb r0, [r1, 0x6]
- ldrb r0, [r1, 0x4]
- cmp r0, 0
- beq _08102502
- movs r0, 0x1
- strb r0, [r1, 0x6]
-_08102502:
- pop {r0}
- bx r0
- .align 2, 0
-_08102508: .4byte gSharedMem
- thumb_func_end sub_81024F0
-
- thumb_func_start sub_810250C
-sub_810250C: @ 810250C
- push {r4,lr}
- lsls r0, 24
- lsrs r1, r0, 24
- movs r2, 0
- movs r3, 0x1
- ldr r4, _08102528 @ =gUnknown_083ECE3A
-_08102518:
- adds r0, r1, 0
- ands r0, r3
- cmp r0, 0
- beq _0810252C
- adds r0, r2, r4
- ldrb r0, [r0]
- b _0810253A
- .align 2, 0
-_08102528: .4byte gUnknown_083ECE3A
-_0810252C:
- lsrs r1, 1
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0x7
- bls _08102518
- movs r0, 0
-_0810253A:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_810250C
-
- thumb_func_start sub_8102540
-sub_8102540: @ 8102540
- push {r4,lr}
- bl Random
- lsls r0, 24
- lsrs r0, 24
- ldr r4, _08102568 @ =gUnknown_083ECD04
- ldr r1, _0810256C @ =gSharedMem
- movs r3, 0x12
- ldrsh r2, [r1, r3]
- ldrb r3, [r1, 0x1]
- lsls r1, r3, 1
- adds r1, r3
- subs r1, 0x1
- adds r2, r1
- adds r2, r4
- ldrb r1, [r2]
- cmp r1, r0
- bhi _08102570
- movs r0, 0
- b _08102572
- .align 2, 0
-_08102568: .4byte gUnknown_083ECD04
-_0810256C: .4byte gSharedMem
-_08102570:
- movs r0, 0x1
-_08102572:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8102540
-
- thumb_func_start sub_8102578
-sub_8102578: @ 8102578
- push {r4-r6,lr}
- movs r5, 0
- ldr r6, _081025B4 @ =gUnknown_083ECD16
-_0810257E:
- bl Random
- movs r2, 0xFF
- ldr r3, _081025B8 @ =gSharedMem
- lsls r1, r5, 16
- asrs r4, r1, 16
- lsls r1, r4, 1
- adds r1, r4
- lsls r1, 1
- ldrb r3, [r3, 0x1]
- adds r1, r3
- adds r1, r6
- ldrb r1, [r1]
- ands r2, r0
- cmp r1, r2
- bgt _081025AA
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x2
- ble _0810257E
-_081025AA:
- lsls r0, r5, 24
- lsrs r0, 24
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_081025B4: .4byte gUnknown_083ECD16
-_081025B8: .4byte gSharedMem
- thumb_func_end sub_8102578
-
- thumb_func_start sub_81025BC
-sub_81025BC: @ 81025BC
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- movs r6, 0
- ldr r0, _08102600 @ =gUnknown_083ECD28
- mov r8, r0
- ldr r5, _08102604 @ =gSharedMem
- movs r7, 0x80
- lsls r7, 17
-_081025CE:
- bl Random
- movs r4, 0xFF
- ands r4, r0
- lsls r2, r6, 16
- asrs r1, r2, 16
- lsls r0, r1, 1
- adds r0, r1
- lsls r0, 1
- ldrb r3, [r5, 0x1]
- adds r0, r3
- add r0, r8
- ldrb r3, [r0]
- cmp r1, 0
- bne _08102608
- ldrb r0, [r5, 0x3]
- cmp r0, 0x1
- bne _08102608
- adds r3, 0xA
- asrs r0, r7, 16
- cmp r3, r0
- ble _08102622
- adds r3, r0, 0
- b _08102622
- .align 2, 0
-_08102600: .4byte gUnknown_083ECD28
-_08102604: .4byte gSharedMem
-_08102608:
- asrs r0, r2, 16
- cmp r0, 0x4
- bne _08102622
- ldrb r0, [r5, 0x3]
- cmp r0, 0x1
- bne _08102622
- lsls r0, r3, 16
- ldr r1, _08102648 @ =0xfff60000
- adds r0, r1
- lsrs r3, r0, 16
- cmp r0, 0
- bge _08102622
- movs r3, 0
-_08102622:
- lsls r0, r3, 16
- asrs r0, 16
- cmp r0, r4
- bgt _08102638
- movs r3, 0x80
- lsls r3, 9
- adds r0, r2, r3
- lsrs r6, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081025CE
-_08102638:
- lsls r0, r6, 24
- lsrs r0, 24
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_08102648: .4byte 0xfff60000
- thumb_func_end sub_81025BC
-
- thumb_func_start sub_810264C
-sub_810264C: @ 810264C
- push {lr}
- lsls r0, 24
- lsrs r2, r0, 24
- ldr r3, _08102660 @ =gSharedMem
- ldrb r0, [r3, 0x3]
- cmp r0, 0
- beq _08102668
- ldr r0, _08102664 @ =gUnknown_083ECDAC
- b _0810266A
- .align 2, 0
-_08102660: .4byte gSharedMem
-_08102664: .4byte gUnknown_083ECDAC
-_08102668:
- ldr r0, _0810267C @ =gUnknown_083ECD46
-_0810266A:
- lsls r1, r2, 4
- adds r1, r2
- ldrb r3, [r3, 0x2]
- adds r1, r3
- adds r1, r0
- ldrb r0, [r1]
- pop {r1}
- bx r1
- .align 2, 0
-_0810267C: .4byte gUnknown_083ECD46
- thumb_func_end sub_810264C
-
- thumb_func_start sub_8102680
-sub_8102680: @ 8102680
- push {r4-r6,lr}
- ldr r1, _081026A4 @ =gSharedMem
- movs r0, 0
- strb r0, [r1, 0x5]
- bl Random
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0
- bl sub_810264C
- lsls r0, 24
- lsrs r0, 24
- cmp r4, r0
- bcc _081026D2
- movs r6, 0x5
- b _081026AE
- .align 2, 0
-_081026A4: .4byte gSharedMem
-_081026A8:
- subs r0, r5, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
-_081026AE:
- lsls r0, r6, 16
- asrs r5, r0, 16
- cmp r5, 0
- ble _081026CE
- bl Random
- lsls r0, 24
- lsrs r4, r0, 24
- lsls r0, r6, 24
- lsrs r0, 24
- bl sub_810264C
- lsls r0, 24
- lsrs r0, 24
- cmp r4, r0
- bcs _081026A8
-_081026CE:
- ldr r0, _081026D8 @ =gSharedMem
- strb r6, [r0, 0x5]
-_081026D2:
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_081026D8: .4byte gSharedMem
- thumb_func_end sub_8102680
-
- thumb_func_start sub_81026DC
-sub_81026DC: @ 81026DC
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- bl Random
- movs r1, 0xFF
- ands r1, r0
- ldr r0, _081026FC @ =gUnknown_083ECE12
- lsls r4, 1
- adds r4, r0
- ldrh r4, [r4]
- cmp r1, r4
- bcc _08102700
- movs r0, 0
- b _08102702
- .align 2, 0
-_081026FC: .4byte gUnknown_083ECE12
-_08102700:
- movs r0, 0x1
-_08102702:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81026DC
-
- thumb_func_start dp15_jump_random_unknown
-dp15_jump_random_unknown: @ 8102708
- push {r4,r5,lr}
- movs r4, 0
- ldr r0, _0810271C @ =gSharedMem
- movs r2, 0x10
- ldrsh r1, [r0, r2]
- ldr r0, _08102720 @ =0x0000012b
- cmp r1, r0
- ble _08102724
- movs r4, 0x4
- b _0810273A
- .align 2, 0
-_0810271C: .4byte gSharedMem
-_08102720: .4byte 0x0000012b
-_08102724:
- cmp r1, 0xF9
- ble _0810272C
- movs r4, 0x3
- b _0810273A
-_0810272C:
- cmp r1, 0xC7
- ble _08102734
- movs r4, 0x2
- b _0810273A
-_08102734:
- cmp r1, 0x95
- ble _0810273A
- movs r4, 0x1
-_0810273A:
- bl Random
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x64
- bl __umodsi3
- lsls r0, 24
- lsrs r1, r0, 24
- ldr r5, _0810275C @ =gUnknown_083ECE1C
- lsls r4, 2
- adds r0, r4, r5
- ldrb r0, [r0]
- cmp r1, r0
- bcs _08102760
- movs r0, 0x4
- b _0810279A
- .align 2, 0
-_0810275C: .4byte gUnknown_083ECE1C
-_08102760:
- bl Random
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x64
- bl __umodsi3
- lsls r0, 24
- adds r2, r5, 0x2
- adds r2, r4, r2
- ldr r3, _08102790 @ =gUnknown_083ECE30
- ldr r1, _08102794 @ =gSharedMem
- ldrb r1, [r1, 0xB]
- lsls r1, 1
- adds r1, r3
- ldrb r1, [r1]
- ldrb r2, [r2]
- adds r1, r2
- lsls r1, 24
- cmp r0, r1
- bcc _08102798
- movs r0, 0x8
- b _0810279A
- .align 2, 0
-_08102790: .4byte gUnknown_083ECE30
-_08102794: .4byte gSharedMem
-_08102798:
- movs r0, 0x2
-_0810279A:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end dp15_jump_random_unknown
-
- thumb_func_start sub_81027A0
-sub_81027A0: @ 81027A0
- push {r4,lr}
- ldr r4, _081027CC @ =gSharedMem
- movs r0, 0
- strh r0, [r4, 0x8]
- bl sub_81027D0
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0x1
- ble _081027B8
- bl sub_8102840
-_081027B8:
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- cmp r0, 0x2
- ble _081027C4
- bl sub_810290C
-_081027C4:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081027CC: .4byte gSharedMem
- thumb_func_end sub_81027A0
-
- thumb_func_start sub_81027D0
-sub_81027D0: @ 81027D0
- push {r4,r5,lr}
- movs r0, 0
- movs r1, 0x2
- bl sub_8102BA4
- adds r5, r0, 0
- lsls r5, 24
- lsrs r5, 24
- movs r0, 0x1
- movs r1, 0x2
- bl sub_8102BA4
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0x2
- movs r1, 0x2
- bl sub_8102BA4
- adds r2, r0, 0
- lsls r2, 24
- lsrs r2, 24
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_81029D4
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x9
- beq _0810282E
- ldr r2, _08102834 @ =gSharedMem
- ldr r0, _08102838 @ =gUnknown_083ECE6C
- lsls r1, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- ldrh r3, [r2, 0xE]
- adds r0, r3
- strh r0, [r2, 0xE]
- ldr r0, _0810283C @ =gUnknown_083ECE5A
- adds r1, r0
- ldrh r0, [r2, 0x8]
- ldrh r1, [r1]
- orrs r0, r1
- strh r0, [r2, 0x8]
- movs r0, 0
- bl sub_8103E04
-_0810282E:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08102834: .4byte gSharedMem
-_08102838: .4byte gUnknown_083ECE6C
-_0810283C: .4byte gUnknown_083ECE5A
- thumb_func_end sub_81027D0
-
- thumb_func_start sub_8102840
-sub_8102840: @ 8102840
- push {r4,r5,lr}
- movs r0, 0
- movs r1, 0x1
- bl sub_8102BA4
- lsls r0, 24
- lsrs r5, r0, 24
- movs r0, 0x1
- movs r1, 0x1
- bl sub_8102BA4
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0x2
- movs r1, 0x1
- bl sub_8102BA4
- lsls r0, 24
- lsrs r2, r0, 24
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_81029D4
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x9
- beq _0810289E
- cmp r1, 0
- bne _0810287C
- movs r1, 0x1
-_0810287C:
- ldr r2, _08102900 @ =gSharedMem
- ldr r0, _08102904 @ =gUnknown_083ECE6C
- lsls r1, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- ldrh r3, [r2, 0xE]
- adds r0, r3
- strh r0, [r2, 0xE]
- ldr r0, _08102908 @ =gUnknown_083ECE5A
- adds r1, r0
- ldrh r0, [r2, 0x8]
- ldrh r1, [r1]
- orrs r0, r1
- strh r0, [r2, 0x8]
- movs r0, 0x1
- bl sub_8103E04
-_0810289E:
- movs r0, 0
- movs r1, 0x3
- bl sub_8102BA4
- lsls r0, 24
- lsrs r5, r0, 24
- movs r0, 0x1
- movs r1, 0x3
- bl sub_8102BA4
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0x2
- movs r1, 0x3
- bl sub_8102BA4
- lsls r0, 24
- lsrs r2, r0, 24
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_81029D4
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x9
- beq _081028FA
- cmp r1, 0
- bne _081028D8
- movs r1, 0x1
-_081028D8:
- ldr r2, _08102900 @ =gSharedMem
- ldr r0, _08102904 @ =gUnknown_083ECE6C
- lsls r1, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- ldrh r3, [r2, 0xE]
- adds r0, r3
- strh r0, [r2, 0xE]
- ldr r0, _08102908 @ =gUnknown_083ECE5A
- adds r1, r0
- ldrh r0, [r2, 0x8]
- ldrh r1, [r1]
- orrs r0, r1
- strh r0, [r2, 0x8]
- movs r0, 0x2
- bl sub_8103E04
-_081028FA:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08102900: .4byte gSharedMem
-_08102904: .4byte gUnknown_083ECE6C
-_08102908: .4byte gUnknown_083ECE5A
- thumb_func_end sub_8102840
-
- thumb_func_start sub_810290C
-sub_810290C: @ 810290C
- push {r4,r5,lr}
- movs r0, 0
- movs r1, 0x1
- bl sub_8102BA4
- lsls r0, 24
- lsrs r5, r0, 24
- movs r0, 0x1
- movs r1, 0x2
- bl sub_8102BA4
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0x2
- movs r1, 0x3
- bl sub_8102BA4
- lsls r0, 24
- lsrs r2, r0, 24
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_81029D4
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x9
- beq _08102968
- cmp r1, 0
- beq _08102962
- ldr r2, _081029C8 @ =gSharedMem
- ldr r0, _081029CC @ =gUnknown_083ECE6C
- lsls r1, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- ldrh r3, [r2, 0xE]
- adds r0, r3
- strh r0, [r2, 0xE]
- ldr r0, _081029D0 @ =gUnknown_083ECE5A
- adds r1, r0
- ldrh r0, [r2, 0x8]
- ldrh r1, [r1]
- orrs r0, r1
- strh r0, [r2, 0x8]
-_08102962:
- movs r0, 0x3
- bl sub_8103E04
-_08102968:
- movs r0, 0
- movs r1, 0x3
- bl sub_8102BA4
- lsls r0, 24
- lsrs r5, r0, 24
- movs r0, 0x1
- movs r1, 0x2
- bl sub_8102BA4
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0x2
- movs r1, 0x1
- bl sub_8102BA4
- lsls r0, 24
- lsrs r2, r0, 24
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_81029D4
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x9
- beq _081029C2
- cmp r1, 0
- beq _081029BC
- ldr r2, _081029C8 @ =gSharedMem
- ldr r0, _081029CC @ =gUnknown_083ECE6C
- lsls r1, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- ldrh r3, [r2, 0xE]
- adds r0, r3
- strh r0, [r2, 0xE]
- ldr r0, _081029D0 @ =gUnknown_083ECE5A
- adds r1, r0
- ldrh r0, [r2, 0x8]
- ldrh r1, [r1]
- orrs r0, r1
- strh r0, [r2, 0x8]
-_081029BC:
- movs r0, 0x4
- bl sub_8103E04
-_081029C2:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081029C8: .4byte gSharedMem
-_081029CC: .4byte gUnknown_083ECE6C
-_081029D0: .4byte gUnknown_083ECE5A
- thumb_func_end sub_810290C
-
- thumb_func_start sub_81029D4
-sub_81029D4: @ 81029D4
- push {lr}
- lsls r0, 24
- lsrs r3, r0, 24
- lsls r1, 24
- lsrs r1, 24
- lsls r2, 24
- lsrs r2, 24
- cmp r3, r1
- bne _081029F8
- cmp r3, r2
- bne _081029F8
- ldr r0, _081029F4 @ =gUnknown_083ECE52
- adds r0, r3, r0
- ldrb r0, [r0]
- b _08102A1E
- .align 2, 0
-_081029F4: .4byte gUnknown_083ECE52
-_081029F8:
- cmp r3, 0
- bne _08102A04
- cmp r1, 0
- bne _08102A04
- cmp r2, 0x1
- beq _08102A10
-_08102A04:
- cmp r3, 0x1
- bne _08102A14
- cmp r1, 0x1
- bne _08102A14
- cmp r2, 0
- bne _08102A14
-_08102A10:
- movs r0, 0x6
- b _08102A1E
-_08102A14:
- cmp r3, 0x4
- beq _08102A1C
- movs r0, 0x9
- b _08102A1E
-_08102A1C:
- movs r0, 0
-_08102A1E:
- pop {r1}
- bx r1
- thumb_func_end sub_81029D4
-
- thumb_func_start sub_8102A24
-sub_8102A24: @ 8102A24
- push {r4,lr}
- ldr r4, _08102A40 @ =sub_8102A64
- adds r0, r4, 0
- movs r1, 0x4
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- bl _call_via_r4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08102A40: .4byte sub_8102A64
- thumb_func_end sub_8102A24
-
- thumb_func_start sub_8102A44
-sub_8102A44: @ 8102A44
- push {lr}
- ldr r0, _08102A58 @ =sub_8102A64
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0xFF
- beq _08102A5C
- movs r0, 0
- b _08102A5E
- .align 2, 0
-_08102A58: .4byte sub_8102A64
-_08102A5C:
- movs r0, 0x1
-_08102A5E:
- pop {r1}
- bx r1
- thumb_func_end sub_8102A44
-
- thumb_func_start sub_8102A64
-sub_8102A64: @ 8102A64
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _08102A94 @ =gUnknown_083ECB20
- ldr r2, _08102A98 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r4, r1, r2
-_08102A76:
- movs r1, 0x8
- ldrsh r0, [r4, r1]
- lsls r0, 2
- adds r0, r5
- ldr r1, [r0]
- adds r0, r4, 0
- bl _call_via_r1
- lsls r0, 24
- cmp r0, 0
- bne _08102A76
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08102A94: .4byte gUnknown_083ECB20
-_08102A98: .4byte gTasks
- thumb_func_end sub_8102A64
-
- thumb_func_start sub_8102A9C
-sub_8102A9C: @ 8102A9C
- push {r4,lr}
- adds r4, r0, 0
- bl sub_8103E38
- lsls r0, 24
- cmp r0, 0
- beq _08102AC8
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- ldr r0, _08102AC4 @ =gSharedMem
- movs r1, 0xE
- ldrsh r0, [r0, r1]
- cmp r0, 0
- bne _08102AC8
- movs r0, 0x2
- strh r0, [r4, 0x8]
- movs r0, 0x1
- b _08102ACA
- .align 2, 0
-_08102AC4: .4byte gSharedMem
-_08102AC8:
- movs r0, 0
-_08102ACA:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8102A9C
-
- thumb_func_start sub_8102AD0
-sub_8102AD0: @ 8102AD0
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0xA]
- subs r0, 0x1
- strh r0, [r4, 0xA]
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- negs r1, r1
- cmp r0, r1
- bne _08102B22
- bl IsFanfareTaskInactive
- lsls r0, 24
- cmp r0, 0
- beq _08102AF6
- movs r0, 0x15
- bl PlaySE
-_08102AF6:
- ldr r2, _08102B70 @ =gSharedMem
- ldrh r0, [r2, 0xE]
- subs r0, 0x1
- strh r0, [r2, 0xE]
- ldrh r3, [r2, 0xC]
- movs r0, 0xC
- ldrsh r1, [r2, r0]
- ldr r0, _08102B74 @ =0x0000270e
- cmp r1, r0
- bgt _08102B0E
- adds r0, r3, 0x1
- strh r0, [r2, 0xC]
-_08102B0E:
- movs r0, 0x8
- strh r0, [r4, 0xA]
- ldr r0, _08102B78 @ =gMain
- ldrh r1, [r0, 0x2C]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08102B22
- movs r0, 0x4
- strh r0, [r4, 0xA]
-_08102B22:
- bl IsFanfareTaskInactive
- lsls r0, 24
- cmp r0, 0
- beq _08102B58
- ldr r0, _08102B78 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x8
- ands r0, r1
- cmp r0, 0
- beq _08102B58
- movs r0, 0x15
- bl PlaySE
- ldr r1, _08102B70 @ =gSharedMem
- ldrh r0, [r1, 0xE]
- ldrh r2, [r1, 0xC]
- adds r0, r2
- strh r0, [r1, 0xC]
- lsls r0, 16
- asrs r0, 16
- ldr r2, _08102B7C @ =0x0000270f
- cmp r0, r2
- ble _08102B54
- strh r2, [r1, 0xC]
-_08102B54:
- movs r0, 0
- strh r0, [r1, 0xE]
-_08102B58:
- ldr r0, _08102B70 @ =gSharedMem
- movs r1, 0xE
- ldrsh r0, [r0, r1]
- cmp r0, 0
- bne _08102B68
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
-_08102B68:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102B70: .4byte gSharedMem
-_08102B74: .4byte 0x0000270e
-_08102B78: .4byte gMain
-_08102B7C: .4byte 0x0000270f
- thumb_func_end sub_8102AD0
-
- thumb_func_start sub_8102B80
-sub_8102B80: @ 8102B80
- push {lr}
- bl sub_8103E7C
- lsls r0, 24
- cmp r0, 0
- beq _08102B9A
- ldr r0, _08102BA0 @ =sub_8102A64
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- bl DestroyTask
-_08102B9A:
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102BA0: .4byte sub_8102A64
- thumb_func_end sub_8102B80
-
- thumb_func_start sub_8102BA4
-sub_8102BA4: @ 8102BA4
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- adds r4, r0, 0
- ldr r0, _08102BF0 @ =gSharedMem
- lsls r2, r4, 1
- adds r0, 0x28
- adds r2, r0
- movs r3, 0
- ldrsh r0, [r2, r3]
- lsls r1, 16
- asrs r1, 16
- adds r0, r1
- movs r1, 0x15
- bl __modsi3
- lsls r0, 16
- lsrs r1, r0, 16
- asrs r0, 16
- cmp r0, 0
- bge _08102BD4
- adds r0, 0x15
- lsls r0, 16
- lsrs r1, r0, 16
-_08102BD4:
- ldr r2, _08102BF4 @ =gUnknown_083ECCB2
- lsls r1, 16
- asrs r1, 16
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 2
- adds r0, r4
- adds r1, r0
- adds r1, r2
- ldrb r0, [r1]
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102BF0: .4byte gSharedMem
-_08102BF4: .4byte gUnknown_083ECCB2
- thumb_func_end sub_8102BA4
-
- thumb_func_start sub_8102BF8
-sub_8102BF8: @ 8102BF8
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r0, 24
- adds r5, r0, 0
- lsls r1, 16
- lsrs r4, r1, 16
- movs r6, 0
- ldr r0, _08102C40 @ =gSharedMem
- lsls r1, r5, 1
- adds r0, 0x1C
- adds r1, r0
- movs r2, 0
- ldrsh r0, [r1, r2]
- movs r1, 0x18
- bl __modsi3
- lsls r0, 16
- cmp r0, 0
- beq _08102C20
- ldr r6, _08102C44 @ =0x0000ffff
-_08102C20:
- lsls r1, r4, 16
- asrs r1, 16
- lsls r0, r6, 16
- asrs r0, 16
- adds r1, r0
- lsls r1, 16
- asrs r1, 16
- adds r0, r5, 0
- bl sub_8102BA4
- lsls r0, 24
- lsrs r0, 24
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08102C40: .4byte gSharedMem
-_08102C44: .4byte 0x0000ffff
- thumb_func_end sub_8102BF8
-
- thumb_func_start sub_8102C48
-sub_8102C48: @ 8102C48
- push {lr}
- ldr r1, _08102C7C @ =gSharedMem
- movs r2, 0x16
- ldrsh r1, [r1, r2]
- lsls r0, 16
- asrs r0, 16
- adds r1, r0
- adds r0, r1, 0
- movs r1, 0x6
- bl __modsi3
- lsls r0, 16
- lsrs r1, r0, 16
- asrs r0, 16
- cmp r0, 0
- bge _08102C6E
- adds r0, 0x6
- lsls r0, 16
- lsrs r1, r0, 16
-_08102C6E:
- ldr r0, _08102C80 @ =gUnknown_083ECCF1
- lsls r1, 16
- asrs r1, 16
- adds r1, r0
- ldrb r0, [r1]
- pop {r1}
- bx r1
- .align 2, 0
-_08102C7C: .4byte gSharedMem
-_08102C80: .4byte gUnknown_083ECCF1
- thumb_func_end sub_8102C48
-
- thumb_func_start sub_8102C84
-sub_8102C84: @ 8102C84
- push {r4-r6,lr}
- adds r5, r0, 0
- lsls r5, 24
- ldr r6, _08102CC8 @ =gSharedMem
- lsrs r5, 23
- adds r4, r6, 0
- adds r4, 0x1C
- adds r4, r5, r4
- lsls r1, 16
- asrs r1, 16
- ldrh r0, [r4]
- adds r1, r0
- strh r1, [r4]
- movs r1, 0
- ldrsh r0, [r4, r1]
- movs r1, 0xFC
- lsls r1, 1
- bl __modsi3
- strh r0, [r4]
- adds r6, 0x28
- adds r5, r6
- movs r1, 0
- ldrsh r0, [r4, r1]
- movs r1, 0x18
- bl __divsi3
- movs r1, 0x15
- subs r1, r0
- strh r1, [r5]
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08102CC8: .4byte gSharedMem
- thumb_func_end sub_8102C84
-
- thumb_func_start sub_8102CCC
-sub_8102CCC: @ 8102CCC
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r0, 24
- adds r6, r0, 0
- lsls r1, 16
- lsrs r4, r1, 16
- ldr r0, _08102D24 @ =gSharedMem
- lsls r1, r6, 1
- adds r0, 0x1C
- adds r5, r1, r0
- movs r1, 0
- ldrsh r0, [r5, r1]
- movs r1, 0x18
- bl __modsi3
- lsls r0, 16
- lsrs r0, 16
- lsls r2, r0, 16
- asrs r1, r2, 16
- cmp r1, 0
- beq _08102D18
- lsls r0, r4, 16
- asrs r0, 16
- cmp r1, r0
- bge _08102D00
- lsrs r4, r2, 16
-_08102D00:
- lsls r1, r4, 16
- asrs r1, 16
- adds r0, r6, 0
- bl sub_8102C84
- movs r1, 0
- ldrsh r0, [r5, r1]
- movs r1, 0x18
- bl __modsi3
- lsls r0, 16
- lsrs r0, 16
-_08102D18:
- lsls r0, 16
- asrs r0, 16
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08102D24: .4byte gSharedMem
- thumb_func_end sub_8102CCC
-
- thumb_func_start sub_8102D28
-sub_8102D28: @ 8102D28
- push {r4,lr}
- ldr r4, _08102D58 @ =gSharedMem
- lsls r0, 16
- asrs r0, 16
- ldrh r1, [r4, 0x14]
- adds r0, r1
- strh r0, [r4, 0x14]
- movs r1, 0x14
- ldrsh r0, [r4, r1]
- movs r1, 0x78
- bl __modsi3
- strh r0, [r4, 0x14]
- movs r1, 0x14
- ldrsh r0, [r4, r1]
- movs r1, 0x14
- bl __divsi3
- movs r1, 0x6
- subs r1, r0
- strh r1, [r4, 0x16]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08102D58: .4byte gSharedMem
- thumb_func_end sub_8102D28
-
- thumb_func_start sub_8102D5C
-sub_8102D5C: @ 8102D5C
- push {r4,r5,lr}
- lsls r0, 16
- lsrs r4, r0, 16
- ldr r5, _08102DA4 @ =gSharedMem
- movs r1, 0x14
- ldrsh r0, [r5, r1]
- movs r1, 0x14
- bl __modsi3
- lsls r0, 16
- lsrs r0, 16
- lsls r2, r0, 16
- asrs r1, r2, 16
- cmp r1, 0
- beq _08102D9A
- lsls r0, r4, 16
- asrs r0, 16
- cmp r1, r0
- bge _08102D84
- lsrs r4, r2, 16
-_08102D84:
- lsls r0, r4, 16
- asrs r0, 16
- bl sub_8102D28
- movs r1, 0x14
- ldrsh r0, [r5, r1]
- movs r1, 0x14
- bl __modsi3
- lsls r0, 16
- lsrs r0, 16
-_08102D9A:
- lsls r0, 16
- asrs r0, 16
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_08102DA4: .4byte gSharedMem
- thumb_func_end sub_8102D5C
-
- thumb_func_start sub_8102DA8
-sub_8102DA8: @ 8102DA8
- push {r4-r7,lr}
- movs r4, 0
- ldr r5, _08102DE0 @ =sub_8102E68
- ldr r7, _08102DE4 @ =gTasks
- ldr r6, _08102DE8 @ =gSharedMem + 0x3A
-_08102DB2:
- adds r0, r5, 0
- movs r1, 0x2
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r7
- strh r4, [r1, 0x26]
- adds r1, r4, r6
- strb r0, [r1]
- bl _call_via_r5
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x2
- bls _08102DB2
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08102DE0: .4byte sub_8102E68
-_08102DE4: .4byte gTasks
-_08102DE8: .4byte gSharedMem + 0x3A
- thumb_func_end sub_8102DA8
-
- thumb_func_start sub_8102DEC
-sub_8102DEC: @ 8102DEC
- lsls r0, 24
- lsrs r0, 24
- ldr r3, _08102E14 @ =gTasks
- ldr r1, _08102E18 @ =gSharedMem
- adds r1, 0x3A
- adds r0, r1
- ldrb r2, [r0]
- lsls r1, r2, 2
- adds r1, r2
- lsls r1, 3
- adds r1, r3
- movs r2, 0x1
- strh r2, [r1, 0x8]
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r3
- strh r2, [r0, 0x24]
- bx lr
- .align 2, 0
-_08102E14: .4byte gTasks
-_08102E18: .4byte gSharedMem
- thumb_func_end sub_8102DEC
-
- thumb_func_start sub_8102E1C
-sub_8102E1C: @ 8102E1C
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08102E38 @ =gTasks
- ldr r1, _08102E3C @ =gSharedMem
- adds r1, 0x3A
- adds r0, r1
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r1, 0x2
- strh r1, [r0, 0x8]
- bx lr
- .align 2, 0
-_08102E38: .4byte gTasks
-_08102E3C: .4byte gSharedMem
- thumb_func_end sub_8102E1C
-
- thumb_func_start sub_8102E40
-sub_8102E40: @ 8102E40
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08102E60 @ =gTasks
- ldr r1, _08102E64 @ =gSharedMem
- adds r1, 0x3A
- adds r0, r1
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- ldrh r0, [r0, 0x24]
- lsls r0, 24
- lsrs r0, 24
- bx lr
- .align 2, 0
-_08102E60: .4byte gTasks
-_08102E64: .4byte gSharedMem
- thumb_func_end sub_8102E40
-
- thumb_func_start sub_8102E68
-sub_8102E68: @ 8102E68
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _08102E98 @ =gUnknown_083ECB2C
- ldr r2, _08102E9C @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r4, r1, r2
-_08102E7A:
- movs r1, 0x8
- ldrsh r0, [r4, r1]
- lsls r0, 2
- adds r0, r5
- ldr r1, [r0]
- adds r0, r4, 0
- bl _call_via_r1
- lsls r0, 24
- cmp r0, 0
- bne _08102E7A
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08102E98: .4byte gUnknown_083ECB2C
-_08102E9C: .4byte gTasks
- thumb_func_end sub_8102E68
-
- thumb_func_start sub_8102EA0
-sub_8102EA0: @ 8102EA0
- movs r0, 0
- bx lr
- thumb_func_end sub_8102EA0
-
- thumb_func_start sub_8102EA4
-sub_8102EA4: @ 8102EA4
- push {lr}
- ldrh r0, [r0, 0x26]
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _08102EBC @ =gSharedMem
- movs r2, 0x1A
- ldrsh r1, [r1, r2]
- bl sub_8102C84
- movs r0, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08102EBC: .4byte gSharedMem
- thumb_func_end sub_8102EA4
-
- thumb_func_start sub_8102EC0
-sub_8102EC0: @ 8102EC0
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- movs r2, 0
- strh r0, [r4, 0x8]
- ldr r3, _08102F40 @ =gSharedMem
- movs r1, 0x26
- ldrsh r0, [r4, r1]
- lsls r0, 1
- adds r1, r3, 0
- adds r1, 0x34
- adds r0, r1
- strh r2, [r0]
- movs r1, 0x26
- ldrsh r0, [r4, r1]
- lsls r0, 1
- adds r1, r3, 0
- adds r1, 0x2E
- adds r0, r1
- strh r2, [r0]
- ldrb r0, [r3, 0xA]
- cmp r0, 0
- bne _08102F28
- ldrb r0, [r3, 0x4]
- cmp r0, 0
- beq _08102F12
- ldrb r0, [r3, 0x6]
- cmp r0, 0
- beq _08102F12
- ldr r1, _08102F44 @ =gUnknown_083ECB40
- movs r2, 0x26
- ldrsh r0, [r4, r2]
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
- lsls r0, 24
- cmp r0, 0
- bne _08102F28
-_08102F12:
- ldr r1, _08102F40 @ =gSharedMem
- movs r0, 0
- strb r0, [r1, 0x6]
- ldr r1, _08102F48 @ =gUnknown_083ECB4C
- movs r2, 0x26
- ldrsh r0, [r4, r2]
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
-_08102F28:
- ldr r0, _08102F40 @ =gSharedMem
- movs r2, 0x26
- ldrsh r1, [r4, r2]
- lsls r1, 1
- adds r0, 0x2E
- adds r1, r0
- ldrh r0, [r1]
- strh r0, [r4, 0xA]
- movs r0, 0x1
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08102F40: .4byte gSharedMem
-_08102F44: .4byte gUnknown_083ECB40
-_08102F48: .4byte gUnknown_083ECB4C
- thumb_func_end sub_8102EC0
-
- thumb_func_start sub_8102F4C
-sub_8102F4C: @ 8102F4C
- push {r4-r7,lr}
- sub sp, 0xC
- adds r4, r0, 0
- ldr r1, _08102F8C @ =gUnknown_083ECB58
- mov r0, sp
- movs r2, 0xA
- bl memcpy
- ldr r5, _08102F90 @ =gSharedMem
- movs r1, 0x26
- ldrsh r0, [r4, r1]
- lsls r6, r0, 1
- adds r7, r5, 0
- adds r7, 0x1C
- adds r0, r6, r7
- movs r2, 0
- ldrsh r0, [r0, r2]
- movs r1, 0x18
- bl __modsi3
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r0, 0
- beq _08102F94
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- movs r6, 0x1A
- ldrsh r1, [r5, r6]
- bl sub_8102CCC
- b _08102FC8
- .align 2, 0
-_08102F8C: .4byte gUnknown_083ECB58
-_08102F90: .4byte gSharedMem
-_08102F94:
- adds r0, r5, 0
- adds r0, 0x2E
- adds r1, r6, r0
- ldrh r3, [r1]
- movs r6, 0
- ldrsh r0, [r1, r6]
- cmp r0, 0
- beq _08102FCC
- subs r0, r3, 0x1
- strh r0, [r1]
- ldrh r0, [r4, 0x26]
- lsls r0, 24
- lsrs r0, 24
- movs r2, 0x1A
- ldrsh r1, [r5, r2]
- bl sub_8102C84
- movs r6, 0x26
- ldrsh r0, [r4, r6]
- lsls r0, 1
- adds r0, r7
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r1, 0x18
- bl __modsi3
-_08102FC8:
- lsls r0, 16
- lsrs r2, r0, 16
-_08102FCC:
- cmp r2, 0
- bne _08102FF8
- ldr r1, _08103004 @ =gSharedMem
- movs r2, 0x26
- ldrsh r0, [r4, r2]
- lsls r0, 1
- adds r1, 0x2E
- adds r0, r1
- movs r6, 0
- ldrsh r1, [r0, r6]
- cmp r1, 0
- bne _08102FF8
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- movs r2, 0xA
- ldrsh r0, [r4, r2]
- lsls r0, 1
- add r0, sp
- ldrh r0, [r0]
- strh r0, [r4, 0xA]
- strh r1, [r4, 0xC]
-_08102FF8:
- movs r0, 0
- add sp, 0xC
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_08103004: .4byte gSharedMem
- thumb_func_end sub_8102F4C
-
- thumb_func_start sub_8103008
-sub_8103008: @ 8103008
- push {r4,lr}
- adds r2, r0, 0
- ldr r1, _08103058 @ =gSharedMem
- movs r3, 0x26
- ldrsh r0, [r2, r3]
- lsls r0, 1
- adds r4, r1, 0
- adds r4, 0x22
- adds r0, r4
- ldrh r1, [r2, 0xA]
- strh r1, [r0]
- ldrh r0, [r2, 0xA]
- negs r3, r0
- strh r3, [r2, 0xA]
- ldrh r0, [r2, 0xC]
- adds r0, 0x1
- strh r0, [r2, 0xC]
- movs r1, 0x3
- ands r0, r1
- cmp r0, 0
- bne _08103038
- lsls r0, r3, 16
- asrs r0, 17
- strh r0, [r2, 0xA]
-_08103038:
- movs r0, 0xA
- ldrsh r3, [r2, r0]
- cmp r3, 0
- bne _0810304E
- strh r3, [r2, 0x8]
- strh r3, [r2, 0x24]
- movs r1, 0x26
- ldrsh r0, [r2, r1]
- lsls r0, 1
- adds r0, r4
- strh r3, [r0]
-_0810304E:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08103058: .4byte gSharedMem
- thumb_func_end sub_8103008
-
- thumb_func_start sub_810305C
-sub_810305C: @ 810305C
- push {r4,r5,lr}
- ldr r4, _0810309C @ =gSharedMem
- ldrb r0, [r4, 0x4]
- bl sub_810250C
- lsls r0, 24
- lsrs r3, r0, 24
- adds r5, r3, 0
- ldrb r1, [r4, 0x4]
- movs r0, 0xC0
- ands r0, r1
- cmp r0, 0
- beq _0810307A
- movs r5, 0
- movs r3, 0x1
-_0810307A:
- ldr r1, _081030A0 @ =gUnknown_083ECB64
- movs r2, 0x12
- ldrsh r0, [r4, r2]
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- ldr r2, [r0]
- adds r0, r5, 0
- adds r1, r3, 0
- bl _call_via_r2
- lsls r0, 24
- lsrs r0, 24
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_0810309C: .4byte gSharedMem
-_081030A0: .4byte gUnknown_083ECB64
- thumb_func_end sub_810305C
-
- thumb_func_start sub_81030A4
-sub_81030A4: @ 81030A4
- push {r4,r5,lr}
- adds r3, r0, 0
- adds r4, r1, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r2, 24
- lsrs r5, r2, 24
- lsls r3, 16
- asrs r3, 16
- movs r0, 0
- adds r1, r3, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- adds r1, r0, 0
- cmp r0, r4
- beq _081030CC
- cmp r0, r5
- bne _081030D8
-_081030CC:
- ldr r0, _081030D4 @ =gSharedMem
- strb r1, [r0, 0x7]
- movs r0, 0x1
- b _081030DA
- .align 2, 0
-_081030D4: .4byte gSharedMem
-_081030D8:
- movs r0, 0
-_081030DA:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_81030A4
-
- thumb_func_start sub_81030E0
-sub_81030E0: @ 81030E0
- push {r4,lr}
- movs r1, 0x1
- lsls r0, 16
- asrs r4, r0, 16
- subs r1, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x4
- beq _08103128
- movs r1, 0x2
- subs r1, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x4
- beq _08103128
- movs r1, 0x3
- subs r1, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x4
- bne _0810312C
-_08103128:
- movs r0, 0x1
- b _0810312E
-_0810312C:
- movs r0, 0
-_0810312E:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81030E0
-
- thumb_func_start sub_8103134
-sub_8103134: @ 8103134
- push {lr}
- ldr r0, _08103148 @ =gSharedMem
- ldrb r1, [r0, 0x4]
- movs r0, 0xC2
- ands r0, r1
- cmp r0, 0
- bne _0810314C
- movs r0, 0
- b _0810314E
- .align 2, 0
-_08103148: .4byte gSharedMem
-_0810314C:
- movs r0, 0x1
-_0810314E:
- pop {r1}
- bx r1
- thumb_func_end sub_8103134
-
- thumb_func_start sub_8103154
-sub_8103154: @ 8103154
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r1, 24
- lsrs r7, r1, 24
- movs r5, 0
- movs r0, 0x2
- mov r9, r0
- ldr r6, _08103194 @ =gSharedMem
-_0810316E:
- lsls r0, r5, 16
- asrs r4, r0, 16
- mov r1, r9
- subs r0, r1, r4
- lsls r0, 16
- asrs r0, 16
- mov r1, r8
- adds r2, r7, 0
- bl sub_81030A4
- lsls r0, 24
- cmp r0, 0
- beq _08103198
- movs r0, 0x2
- strh r0, [r6, 0x34]
- strh r5, [r6, 0x2E]
- movs r0, 0x1
- b _081031A6
- .align 2, 0
-_08103194: .4byte gSharedMem
-_08103198:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _0810316E
- movs r0, 0
-_081031A6:
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_8103154
-
- thumb_func_start sub_81031B4
-sub_81031B4: @ 81031B4
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- lsls r0, 24
- lsrs r0, 24
- mov r10, r0
- lsls r1, 24
- lsrs r1, 24
- mov r9, r1
- bl sub_8103134
- lsls r0, 24
- lsrs r6, r0, 24
- cmp r6, 0
- bne _081031E2
- movs r0, 0
- bl sub_81030E0
- lsls r0, 24
- cmp r0, 0
- bne _0810321E
-_081031E2:
- movs r0, 0x1
- mov r8, r0
- ldr r5, _0810320C @ =gSharedMem
- movs r7, 0
-_081031EA:
- mov r1, r8
- lsls r0, r1, 16
- asrs r4, r0, 16
- adds r0, r4, 0
- mov r1, r10
- mov r2, r9
- bl sub_81030A4
- lsls r0, 24
- cmp r0, 0
- beq _08103210
- mov r0, r8
- strh r0, [r5, 0x34]
- strh r7, [r5, 0x2E]
- movs r0, 0x1
- b _081032B2
- .align 2, 0
-_0810320C: .4byte gSharedMem
-_08103210:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- mov r8, r1
- asrs r0, 16
- cmp r0, 0x3
- ble _081031EA
-_0810321E:
- movs r0, 0x1
- mov r8, r0
- adds r7, r6, 0
- ldr r6, _0810326C @ =gSharedMem
-_08103226:
- mov r1, r8
- lsls r5, r1, 16
- cmp r7, 0
- bne _0810323A
- asrs r0, r5, 16
- bl sub_81030E0
- lsls r0, 24
- cmp r0, 0
- bne _081032A0
-_0810323A:
- movs r0, 0x1
- asrs r4, r5, 16
- subs r0, r4
- lsls r0, 16
- asrs r0, 16
- mov r1, r10
- mov r2, r9
- bl sub_81030A4
- lsls r0, 24
- cmp r0, 0
- beq _081032A0
- cmp r4, 0x1
- bne _08103270
- cmp r7, 0
- bne _08103266
- movs r0, 0x3
- bl sub_81030E0
- lsls r0, 24
- cmp r0, 0
- bne _08103270
-_08103266:
- movs r0, 0x3
- strh r0, [r6, 0x34]
- b _0810329A
- .align 2, 0
-_0810326C: .4byte gSharedMem
-_08103270:
- asrs r0, r5, 16
- cmp r0, 0x3
- bgt _08103294
- adds r4, r0, 0x1
- cmp r7, 0
- bne _0810328A
- lsls r0, r4, 16
- asrs r0, 16
- bl sub_81030E0
- lsls r0, 24
- cmp r0, 0
- bne _08103294
-_0810328A:
- movs r0, 0x2
- strh r0, [r6, 0x34]
- strh r4, [r6, 0x2E]
- movs r0, 0x1
- b _081032B2
-_08103294:
- movs r0, 0x1
- strh r0, [r6, 0x34]
- mov r0, r8
-_0810329A:
- strh r0, [r6, 0x2E]
- movs r0, 0x1
- b _081032B2
-_081032A0:
- movs r1, 0x80
- lsls r1, 9
- adds r0, r5, r1
- lsrs r1, r0, 16
- mov r8, r1
- asrs r0, 16
- cmp r0, 0x4
- ble _08103226
- movs r0, 0
-_081032B2:
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_81031B4
-
- thumb_func_start sub_81032C0
-sub_81032C0: @ 81032C0
- push {lr}
- ldr r1, _081032E0 @ =gUnknown_083ECB70
- ldr r0, _081032E4 @ =gSharedMem
- movs r2, 0x12
- ldrsh r0, [r0, r2]
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- .align 2, 0
-_081032E0: .4byte gUnknown_083ECB70
-_081032E4: .4byte gSharedMem
- thumb_func_end sub_81032C0
-
- thumb_func_start sub_81032E8
-sub_81032E8: @ 81032E8
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- ldr r0, _08103320 @ =gSharedMem
- movs r6, 0
- ldrh r1, [r0, 0x34]
- mov r8, r1
- movs r1, 0x34
- ldrsh r7, [r0, r1]
- adds r5, r0, 0
-_081032FC:
- lsls r0, r6, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- ldrb r1, [r5, 0x7]
- cmp r0, r1
- bne _08103324
- mov r0, r8
- strh r0, [r5, 0x36]
- strh r6, [r5, 0x30]
- movs r0, 0x1
- b _08103332
- .align 2, 0
-_08103320: .4byte gSharedMem
-_08103324:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081032FC
- movs r0, 0
-_08103332:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_81032E8
-
- thumb_func_start sub_810333C
-sub_810333C: @ 810333C
- push {r4-r7,lr}
- bl sub_81032E8
- lsls r0, 24
- cmp r0, 0
- beq _0810339A
- ldr r1, _0810338C @ =gSharedMem
- movs r2, 0x34
- ldrsh r0, [r1, r2]
- cmp r0, 0x2
- beq _08103396
- movs r2, 0x30
- ldrsh r0, [r1, r2]
- cmp r0, 0x1
- ble _08103396
- cmp r0, 0x4
- beq _08103396
- movs r5, 0
- movs r7, 0x2
- adds r6, r1, 0
-_08103364:
- lsls r0, r5, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- ldrb r1, [r6, 0x7]
- cmp r0, r1
- beq _08103390
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _08103364
- b _08103396
- .align 2, 0
-_0810338C: .4byte gSharedMem
-_08103390:
- movs r0, 0x2
- strh r0, [r6, 0x36]
- strh r5, [r6, 0x30]
-_08103396:
- movs r0, 0x1
- b _081033D2
-_0810339A:
- ldr r1, _081033D8 @ =gSharedMem
- movs r2, 0x34
- ldrsh r0, [r1, r2]
- cmp r0, 0x2
- beq _081033D0
- movs r5, 0
- movs r7, 0x2
- adds r6, r1, 0
-_081033AA:
- lsls r0, r5, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- ldrb r1, [r6, 0x7]
- cmp r0, r1
- beq _08103390
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081033AA
-_081033D0:
- movs r0, 0
-_081033D2:
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_081033D8: .4byte gSharedMem
- thumb_func_end sub_810333C
-
- thumb_func_start sub_81033DC
-sub_81033DC: @ 81033DC
- push {r4,lr}
- ldr r0, _08103414 @ =gSharedMem
- ldrb r3, [r0, 0x7]
- adds r4, r3, 0
- ldrb r2, [r0, 0x4]
- movs r1, 0x40
- ands r1, r2
- cmp r1, 0
- beq _081033F6
- movs r3, 0
- cmp r4, 0
- bne _081033F6
- movs r3, 0x1
-_081033F6:
- ldr r1, _08103418 @ =gUnknown_083ECB7C
- movs r2, 0x12
- ldrsh r0, [r0, r2]
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- ldr r1, [r0]
- adds r0, r3, 0
- bl _call_via_r1
- lsls r0, 24
- lsrs r0, 24
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08103414: .4byte gSharedMem
-_08103418: .4byte gUnknown_083ECB7C
- thumb_func_end sub_81033DC
-
- thumb_func_start sub_810341C
-sub_810341C: @ 810341C
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- lsls r0, 24
- lsrs r0, 24
- mov r9, r0
- ldr r0, _0810345C @ =gSharedMem
- movs r5, 0
- ldrh r1, [r0, 0x36]
- mov r8, r1
- movs r1, 0x36
- ldrsh r7, [r0, r1]
- adds r6, r0, 0
-_08103438:
- lsls r0, r5, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r0, r9
- bne _08103460
- mov r0, r8
- strh r0, [r6, 0x38]
- strh r5, [r6, 0x32]
- movs r0, 0x1
- b _0810346E
- .align 2, 0
-_0810345C: .4byte gSharedMem
-_08103460:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _08103438
- movs r0, 0
-_0810346E:
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_810341C
-
- thumb_func_start sub_810347C
-sub_810347C: @ 810347C
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 24
- lsrs r6, r0, 24
- ldr r0, _081034A0 @ =gSharedMem
- movs r2, 0x34
- ldrsh r1, [r0, r2]
- movs r2, 0x36
- ldrsh r0, [r0, r2]
- cmp r1, r0
- bne _081034B4
- adds r0, r6, 0
- bl sub_810341C
- lsls r0, 24
- lsrs r0, 24
- b _081034EA
- .align 2, 0
-_081034A0: .4byte gSharedMem
-_081034A4:
- ldr r0, _081034B0 @ =gSharedMem
- strh r5, [r0, 0x32]
- mov r1, r8
- strh r1, [r0, 0x38]
- movs r0, 0x1
- b _081034EA
- .align 2, 0
-_081034B0: .4byte gSharedMem
-_081034B4:
- movs r2, 0x1
- mov r8, r2
- cmp r1, 0x1
- bne _081034C0
- movs r0, 0x3
- mov r8, r0
-_081034C0:
- movs r5, 0
- mov r7, r8
-_081034C4:
- lsls r0, r5, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r0, r6
- beq _081034A4
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081034C4
- movs r0, 0
-_081034EA:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_810347C
-
- thumb_func_start sub_81034F4
-sub_81034F4: @ 81034F4
- push {r4,r5,lr}
- movs r5, 0
- b _08103500
-_081034FA:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
-_08103500:
- lsls r0, r5, 16
- asrs r4, r0, 16
- adds r0, r4, 0
- bl sub_81030E0
- lsls r0, 24
- cmp r0, 0
- bne _081034FA
- ldr r0, _0810351C @ =gSharedMem
- strh r5, [r0, 0x2E]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0810351C: .4byte gSharedMem
- thumb_func_end sub_81034F4
-
- thumb_func_start sub_8103520
-sub_8103520: @ 8103520
- push {lr}
- adds r1, r0, 0
- ldrb r0, [r1]
- cmp r0, 0
- bne _0810352E
- movs r0, 0x1
- b _08103538
-_0810352E:
- cmp r0, 0x1
- beq _08103536
- movs r0, 0
- b _0810353C
-_08103536:
- movs r0, 0
-_08103538:
- strb r0, [r1]
- movs r0, 0x1
-_0810353C:
- pop {r1}
- bx r1
- thumb_func_end sub_8103520
-
- thumb_func_start sub_8103540
-sub_8103540: @ 8103540
- push {lr}
- ldr r1, _0810355C @ =gUnknown_083ECB88
- ldr r0, _08103560 @ =gSharedMem
- movs r2, 0x12
- ldrsh r0, [r0, r2]
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
- pop {r0}
- bx r0
- .align 2, 0
-_0810355C: .4byte gUnknown_083ECB88
-_08103560: .4byte gSharedMem
- thumb_func_end sub_8103540
-
- thumb_func_start sub_8103564
-sub_8103564: @ 8103564
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x4
- ldr r4, _081035D0 @ =gSharedMem
- movs r1, 0x34
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _081035E0
- ldrb r1, [r4, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _081035E0
- ldrh r0, [r4, 0x2E]
- movs r1, 0x2
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- mov r1, sp
- strb r0, [r1]
- mov r0, sp
- bl sub_8103520
- lsls r0, 24
- cmp r0, 0
- beq _081035E0
- movs r5, 0
- mov r7, sp
- movs r0, 0x2
- mov r8, r0
- adds r6, r4, 0
-_081035AA:
- lsls r0, r5, 16
- asrs r4, r0, 16
- mov r0, r8
- subs r1, r0, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- ldrb r1, [r7]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- bne _081035D4
- movs r0, 0x2
- strh r0, [r6, 0x36]
- strh r5, [r6, 0x30]
- b _081035E0
- .align 2, 0
-_081035D0: .4byte gSharedMem
-_081035D4:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081035AA
-_081035E0:
- add sp, 0x4
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8103564
-
- thumb_func_start j5_08111E84
-j5_08111E84: @ 81035EC
- push {r4-r7,lr}
- sub sp, 0x4
- ldr r4, _08103650 @ =gSharedMem
- ldrh r2, [r4, 0x34]
- movs r1, 0x34
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _08103660
- ldrb r1, [r4, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _08103660
- ldrh r1, [r4, 0x2E]
- subs r1, r2, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- mov r1, sp
- strb r0, [r1]
- mov r0, sp
- bl sub_8103520
- lsls r0, 24
- cmp r0, 0
- beq _08103660
- movs r6, 0
- mov r7, sp
- adds r5, r4, 0
-_0810362A:
- ldrh r1, [r5, 0x34]
- lsls r0, r6, 16
- asrs r4, r0, 16
- subs r1, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- ldrb r1, [r7]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- bne _08103654
- ldrh r0, [r5, 0x34]
- strh r0, [r5, 0x36]
- strh r6, [r5, 0x30]
- b _08103660
- .align 2, 0
-_08103650: .4byte gSharedMem
-_08103654:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _0810362A
-_08103660:
- add sp, 0x4
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end j5_08111E84
-
- thumb_func_start sub_8103668
-sub_8103668: @ 8103668
- push {r4-r7,lr}
- sub sp, 0x4
- ldr r4, _0810368C @ =gSharedMem
- ldrh r3, [r4, 0x34]
- movs r0, 0x34
- ldrsh r2, [r4, r0]
- cmp r2, 0
- beq _0810375A
- ldrb r1, [r4, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _0810375A
- cmp r2, 0x2
- bne _081036AE
- bl j5_08111E84
- b _0810375A
- .align 2, 0
-_0810368C: .4byte gSharedMem
-_08103690:
- ldr r0, _0810369C @ =gSharedMem
- movs r1, 0
- strh r6, [r0, 0x36]
- strh r1, [r0, 0x30]
- b _0810375A
- .align 2, 0
-_0810369C: .4byte gSharedMem
-_081036A0:
- movs r0, 0x2
- strh r0, [r5, 0x36]
- adds r0, r4, 0x1
- strh r0, [r5, 0x30]
- b _0810375A
-_081036AA:
- movs r0, 0x3
- b _08103736
-_081036AE:
- ldrh r1, [r4, 0x2E]
- subs r1, r3, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- mov r1, sp
- strb r0, [r1]
- mov r0, sp
- bl sub_8103520
- lsls r0, 24
- cmp r0, 0
- beq _0810375A
- movs r6, 0x2
- movs r1, 0x34
- ldrsh r0, [r4, r1]
- cmp r0, 0x3
- bne _081036D8
- movs r6, 0x3
-_081036D8:
- movs r5, 0
- mov r7, sp
-_081036DC:
- lsls r0, r6, 16
- asrs r4, r0, 16
- movs r0, 0x1
- adds r1, r4, 0
- bl sub_8102BF8
- ldrb r1, [r7]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- beq _08103690
- lsls r1, r5, 16
- movs r0, 0x80
- lsls r0, 9
- adds r1, r0
- subs r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- lsrs r5, r1, 16
- asrs r1, 16
- cmp r1, 0x1
- ble _081036DC
- movs r6, 0x1
- mov r7, sp
- ldr r5, _0810373C @ =gSharedMem
-_0810370E:
- ldrh r1, [r5, 0x34]
- lsls r0, r6, 16
- asrs r4, r0, 16
- subs r1, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- ldrb r1, [r7]
- lsls r0, 24
- lsrs r0, 24
- cmp r1, r0
- bne _0810374E
- movs r1, 0x34
- ldrsh r0, [r5, r1]
- cmp r0, 0x1
- bne _08103740
- cmp r4, 0x2
- ble _081036A0
-_08103736:
- strh r0, [r5, 0x36]
- strh r6, [r5, 0x30]
- b _0810375A
- .align 2, 0
-_0810373C: .4byte gSharedMem
-_08103740:
- cmp r4, 0x2
- ble _081036AA
- movs r0, 0x2
- strh r0, [r5, 0x36]
- subs r0, r4, 0x1
- strh r0, [r5, 0x30]
- b _0810375A
-_0810374E:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _0810370E
-_0810375A:
- add sp, 0x4
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8103668
-
- thumb_func_start sub_8103764
-sub_8103764: @ 8103764
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- adds r2, r1, 0
- cmp r0, 0
- bne _08103778
- cmp r1, 0x1
- beq _08103780
-_08103778:
- cmp r0, 0x1
- bne _08103784
- cmp r2, 0
- bne _08103784
-_08103780:
- movs r0, 0x1
- b _08103786
-_08103784:
- movs r0, 0
-_08103786:
- pop {r1}
- bx r1
- thumb_func_end sub_8103764
-
- thumb_func_start sub_810378C
-sub_810378C: @ 810378C
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- lsls r2, 24
- lsrs r2, 24
- cmp r0, 0
- bne _081037A6
- cmp r1, 0x1
- bne _081037A6
- cmp r2, 0
- beq _081037B2
-_081037A6:
- cmp r0, 0x1
- bne _081037B6
- cmp r1, 0
- bne _081037B6
- cmp r2, 0x1
- bne _081037B6
-_081037B2:
- movs r0, 0x1
- b _081037B8
-_081037B6:
- movs r0, 0
-_081037B8:
- pop {r1}
- bx r1
- thumb_func_end sub_810378C
-
- thumb_func_start sub_81037BC
-sub_81037BC: @ 81037BC
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- lsls r2, 24
- lsrs r2, 24
- cmp r0, 0
- bne _081037D6
- cmp r1, 0x1
- bne _081037D6
- cmp r2, 0
- beq _08103802
-_081037D6:
- cmp r0, 0x1
- bne _081037E2
- cmp r1, 0
- bne _081037E2
- cmp r2, 0x1
- beq _08103802
-_081037E2:
- cmp r0, 0
- bne _081037EE
- cmp r1, 0
- bne _081037EE
- cmp r2, 0x1
- beq _08103802
-_081037EE:
- cmp r0, 0x1
- bne _081037FA
- cmp r1, 0x1
- bne _081037FA
- cmp r2, 0
- beq _08103802
-_081037FA:
- cmp r0, r1
- bne _08103806
- cmp r0, r2
- bne _08103806
-_08103802:
- movs r0, 0
- b _08103808
-_08103806:
- movs r0, 0x1
-_08103808:
- pop {r1}
- bx r1
- thumb_func_end sub_81037BC
-
- thumb_func_start sub_810380C
-sub_810380C: @ 810380C
- push {lr}
- ldr r1, _08103828 @ =gUnknown_083ECB94
- ldr r0, _0810382C @ =gSharedMem
- movs r2, 0x12
- ldrsh r0, [r0, r2]
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
- pop {r0}
- bx r0
- .align 2, 0
-_08103828: .4byte gUnknown_083ECB94
-_0810382C: .4byte gSharedMem
- thumb_func_end sub_810380C
-
- thumb_func_start sub_8103830
-sub_8103830: @ 8103830
- push {r4-r7,lr}
- movs r6, 0
- ldr r7, _08103868 @ =gSharedMem
- ldrh r1, [r7, 0x2E]
- movs r4, 0x2
- subs r1, r4, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r5, r0, 24
- ldrh r0, [r7, 0x30]
- subs r4, r0
- lsls r4, 16
- asrs r4, 16
- movs r0, 0x1
- adds r1, r4, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r5, r1
- bne _081038A0
- movs r4, 0x2
- b _08103876
- .align 2, 0
-_08103868: .4byte gSharedMem
-_0810386C:
- lsls r0, r6, 16
- movs r1, 0x80
- lsls r1, 9
- adds r0, r1
- lsrs r6, r0, 16
-_08103876:
- lsls r1, r6, 16
- asrs r1, 16
- subs r1, r4, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r5, r0
- beq _0810386C
- cmp r5, 0
- bne _08103896
- cmp r0, 0x1
- beq _0810386C
-_08103896:
- cmp r5, 0x1
- bne _08103900
- cmp r0, 0
- beq _0810386C
- b _08103900
-_081038A0:
- adds r0, r5, 0
- bl sub_8103764
- lsls r0, 24
- cmp r0, 0
- beq _08103900
- ldrb r1, [r7, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _081038DC
- movs r7, 0x2
-_081038B8:
- lsls r0, r6, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r5, r0
- beq _08103900
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _081038B8
-_081038DC:
- movs r6, 0
- movs r7, 0x2
- b _081038E8
-_081038E2:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r6, r0, 16
-_081038E8:
- lsls r0, r6, 16
- asrs r4, r0, 16
- subs r1, r7, r4
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r0, 24
- cmp r5, r0
- beq _081038E2
-_08103900:
- ldr r0, _0810390C @ =gSharedMem
- strh r6, [r0, 0x32]
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0810390C: .4byte gSharedMem
- thumb_func_end sub_8103830
-
- thumb_func_start sub_8103910
-sub_8103910: @ 8103910
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x4
- movs r0, 0
- str r0, [sp]
- ldr r4, _08103978 @ =gSharedMem
- movs r2, 0x36
- ldrsh r1, [r4, r2]
- cmp r1, 0
- beq _081039A6
- ldrh r2, [r4, 0x34]
- movs r3, 0x34
- ldrsh r0, [r4, r3]
- cmp r0, r1
- bne _081039A6
- ldrb r1, [r4, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _081039A6
- ldrh r1, [r4, 0x2E]
- subs r1, r2, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r7, r0, 24
- ldrh r1, [r4, 0x36]
- ldrh r0, [r4, 0x30]
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r6, r0, 24
- adds r0, r7, 0
- adds r1, r6, 0
- bl sub_8103764
- lsls r0, 24
- cmp r0, 0
- beq _081039A6
- movs r5, 0
- b _08103982
- .align 2, 0
-_08103978: .4byte gSharedMem
-_0810397C:
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
-_08103982:
- lsls r6, r5, 16
- asrs r5, r6, 16
- cmp r5, 0x4
- bgt _081039A6
- ldr r0, _08103A34 @ =gSharedMem
- ldrh r1, [r0, 0x36]
- subs r1, r5
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r7, r4
- bne _0810397C
- lsrs r6, 16
- str r6, [sp]
-_081039A6:
- ldr r0, _08103A34 @ =gSharedMem
- mov r9, r0
-_081039AA:
- movs r5, 0x1
- movs r1, 0
- mov r8, r1
- ldr r2, [sp]
- lsls r2, 16
- mov r10, r2
-_081039B6:
- mov r3, r9
- ldrh r1, [r3, 0x2E]
- lsls r5, 16
- asrs r4, r5, 16
- subs r1, r4, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r7, r0, 24
- mov r0, r9
- ldrh r1, [r0, 0x30]
- subs r1, r4, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r6, r0, 24
- mov r1, r10
- asrs r0, r1, 16
- subs r4, r0
- lsls r4, 16
- asrs r4, 16
- movs r0, 0x2
- adds r1, r4, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r4, r0, 24
- adds r0, r7, 0
- adds r1, r6, 0
- adds r2, r4, 0
- bl sub_81037BC
- lsls r0, 24
- cmp r0, 0
- bne _08103A38
- adds r0, r7, 0
- adds r1, r6, 0
- adds r2, r4, 0
- bl sub_810378C
- lsls r0, 24
- cmp r0, 0
- beq _08103A24
- mov r2, r9
- ldrb r1, [r2, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08103A38
-_08103A24:
- mov r3, r8
- lsls r0, r3, 16
- movs r1, 0x80
- lsls r1, 9
- adds r0, r1
- lsrs r0, 16
- mov r8, r0
- b _08103A46
- .align 2, 0
-_08103A34: .4byte gSharedMem
-_08103A38:
- movs r2, 0x80
- lsls r2, 9
- adds r0, r5, r2
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, 0x3
- ble _081039B6
-_08103A46:
- mov r3, r8
- cmp r3, 0
- beq _08103A5C
- ldr r1, [sp]
- lsls r0, r1, 16
- movs r2, 0x80
- lsls r2, 9
- adds r0, r2
- lsrs r0, 16
- str r0, [sp]
- b _081039AA
-_08103A5C:
- ldr r0, _08103A74 @ =gSharedMem
- mov r3, sp
- ldrh r3, [r3]
- strh r3, [r0, 0x32]
- add sp, 0x4
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08103A74: .4byte gSharedMem
- thumb_func_end sub_8103910
-
- thumb_func_start sub_8103A78
-sub_8103A78: @ 8103A78
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- bl sub_8103910
- ldr r4, _08103B10 @ =gSharedMem
- movs r0, 0x36
- ldrsh r1, [r4, r0]
- cmp r1, 0
- beq _08103B20
- ldrh r2, [r4, 0x34]
- movs r3, 0x34
- ldrsh r0, [r4, r3]
- cmp r0, r1
- beq _08103B20
- ldrb r1, [r4, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _08103B20
- ldrh r1, [r4, 0x2E]
- subs r1, r2, r1
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r6, r0, 24
- ldrh r1, [r4, 0x36]
- ldrh r0, [r4, 0x30]
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r5, r0, 24
- adds r0, r6, 0
- adds r1, r5, 0
- bl sub_8103764
- lsls r0, 24
- cmp r0, 0
- beq _08103B20
- movs r1, 0x1
- movs r2, 0x34
- ldrsh r0, [r4, r2]
- cmp r0, 0x1
- bne _08103AE0
- movs r1, 0x3
-_08103AE0:
- movs r3, 0
- lsls r1, 16
- mov r8, r1
- adds r7, r4, 0
-_08103AE8:
- ldrh r2, [r7, 0x32]
- lsls r0, r3, 16
- asrs r5, r0, 16
- adds r2, r5, r2
- mov r3, r8
- asrs r1, r3, 16
- subs r1, r2
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r6, r4
- bne _08103B14
- ldrh r0, [r7, 0x32]
- adds r0, r5, r0
- strh r0, [r7, 0x32]
- b _08103B20
- .align 2, 0
-_08103B10: .4byte gSharedMem
-_08103B14:
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r3, r0, 16
- asrs r0, 16
- cmp r0, 0x4
- ble _08103AE8
-_08103B20:
- ldr r7, _08103B90 @ =gSharedMem
-_08103B22:
- ldrh r0, [r7, 0x2E]
- movs r1, 0x1
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r6, r0, 24
- ldrh r0, [r7, 0x30]
- movs r1, 0x2
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r5, r0, 24
- ldrh r0, [r7, 0x32]
- movs r1, 0x3
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r4, r0, 24
- adds r0, r6, 0
- adds r1, r5, 0
- adds r2, r4, 0
- bl sub_81037BC
- lsls r0, 24
- cmp r0, 0
- bne _08103B94
- adds r0, r6, 0
- adds r1, r5, 0
- adds r2, r4, 0
- bl sub_810378C
- lsls r0, 24
- cmp r0, 0
- beq _08103B88
- ldrb r1, [r7, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08103B94
-_08103B88:
- ldrh r0, [r7, 0x32]
- adds r0, 0x1
- strh r0, [r7, 0x32]
- b _08103B22
- .align 2, 0
-_08103B90: .4byte gSharedMem
-_08103B94:
- ldr r7, _08103C04 @ =gSharedMem
-_08103B96:
- ldrh r0, [r7, 0x2E]
- movs r1, 0x3
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0
- bl sub_8102BF8
- lsls r0, 24
- lsrs r6, r0, 24
- ldrh r0, [r7, 0x30]
- movs r1, 0x2
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x1
- bl sub_8102BF8
- lsls r0, 24
- lsrs r5, r0, 24
- ldrh r0, [r7, 0x32]
- movs r1, 0x1
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- movs r0, 0x2
- bl sub_8102BF8
- lsls r0, 24
- lsrs r4, r0, 24
- adds r0, r6, 0
- adds r1, r5, 0
- adds r2, r4, 0
- bl sub_81037BC
- lsls r0, 24
- cmp r0, 0
- bne _08103C08
- adds r0, r6, 0
- adds r1, r5, 0
- adds r2, r4, 0
- bl sub_810378C
- lsls r0, 24
- cmp r0, 0
- beq _08103BFC
- ldrb r1, [r7, 0x4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08103C08
-_08103BFC:
- ldrh r0, [r7, 0x32]
- adds r0, 0x1
- strh r0, [r7, 0x32]
- b _08103B96
- .align 2, 0
-_08103C04: .4byte gSharedMem
-_08103C08:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8103A78
-
- thumb_func_start sub_8103C14
-sub_8103C14: @ 8103C14
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- ldr r5, _08103C40 @ =sub_8103C48
- adds r0, r5, 0
- movs r1, 0x5
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08103C44 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- strh r4, [r1, 0x26]
- bl _call_via_r5
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08103C40: .4byte sub_8103C48
-_08103C44: .4byte gTasks
- thumb_func_end sub_8103C14
-
- thumb_func_start sub_8103C48
-sub_8103C48: @ 8103C48
- push {r4,lr}
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r3, _08103C70 @ =gUnknown_083ECBA0
- ldr r2, _08103C74 @ =gTasks
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r4, 0x8
- ldrsh r2, [r0, r4]
- lsls r2, 2
- adds r2, r3
- ldr r2, [r2]
- bl _call_via_r2
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08103C70: .4byte gUnknown_083ECBA0
-_08103C74: .4byte gTasks
- thumb_func_end sub_8103C48
-
- thumb_func_start sub_8103C78
-sub_8103C78: @ 8103C78
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- ldr r1, _08103CA8 @ =gUnknown_083ECBAC
- movs r2, 0x26
- ldrsh r0, [r4, r2]
- lsls r0, 1
- adds r0, r1
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r1, 0x73
- str r1, [sp]
- movs r1, 0x62
- movs r2, 0x63
- movs r3, 0x72
- bl sub_81065A8
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08103CA8: .4byte gUnknown_083ECBAC
- thumb_func_end sub_8103C78
-
- thumb_func_start sub_8103CAC
-sub_8103CAC: @ 8103CAC
- push {lr}
- adds r1, r0, 0
- ldrh r0, [r1, 0xA]
- adds r0, 0x1
- strh r0, [r1, 0xA]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xB
- ble _08103CC4
- ldrh r0, [r1, 0x8]
- adds r0, 0x1
- strh r0, [r1, 0x8]
-_08103CC4:
- pop {r0}
- bx r0
- thumb_func_end sub_8103CAC
-
- thumb_func_start sub_8103CC8
-sub_8103CC8: @ 8103CC8
- push {r4,lr}
- sub sp, 0x4
- lsls r4, r1, 24
- lsrs r4, 24
- ldr r1, _08103CFC @ =gUnknown_083ECBAC
- movs r2, 0x26
- ldrsh r0, [r0, r2]
- lsls r0, 1
- adds r0, r1
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r1, 0x53
- str r1, [sp]
- movs r1, 0x42
- movs r2, 0x43
- movs r3, 0x52
- bl sub_81065A8
- adds r0, r4, 0
- bl DestroyTask
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08103CFC: .4byte gUnknown_083ECBAC
- thumb_func_end sub_8103CC8
-
- thumb_func_start sub_8103D00
-sub_8103D00: @ 8103D00
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08103D20 @ =gUnknown_083EDD08
- lsls r1, r0, 2
- adds r1, r2
- ldr r2, [r1]
- ldr r1, _08103D24 @ =gUnknown_083EDD30
- adds r0, r1
- ldrb r1, [r0]
- adds r0, r2, 0
- movs r2, 0x2
- bl LoadPalette
- pop {r0}
- bx r0
- .align 2, 0
-_08103D20: .4byte gUnknown_083EDD08
-_08103D24: .4byte gUnknown_083EDD30
- thumb_func_end sub_8103D00
-
- thumb_func_start sub_8103D28
-sub_8103D28: @ 8103D28
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08103D48 @ =gUnknown_083EDD1C
- lsls r1, r0, 2
- adds r1, r2
- ldr r2, [r1]
- ldr r1, _08103D4C @ =gUnknown_083EDD30
- adds r0, r1
- ldrb r1, [r0]
- adds r0, r2, 0
- movs r2, 0x2
- bl LoadPalette
- pop {r0}
- bx r0
- .align 2, 0
-_08103D48: .4byte gUnknown_083EDD1C
-_08103D4C: .4byte gUnknown_083EDD30
- thumb_func_end sub_8103D28
-
- thumb_func_start sub_8103D50
-sub_8103D50: @ 8103D50
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r1, r0, 24
- movs r4, 0
- ldr r0, _08103D84 @ =gUnknown_083EDD3B
- adds r0, r1, r0
- ldrb r0, [r0]
- cmp r4, r0
- bcs _08103D7C
- ldr r7, _08103D88 @ =gUnknown_083EDD35
- adds r6, r0, 0
- lsls r5, r1, 1
-_08103D68:
- adds r0, r4, r5
- adds r0, r7
- ldrb r0, [r0]
- bl sub_8103D00
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, r6
- bcc _08103D68
-_08103D7C:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08103D84: .4byte gUnknown_083EDD3B
-_08103D88: .4byte gUnknown_083EDD35
- thumb_func_end sub_8103D50
-
- thumb_func_start sub_8103D8C
-sub_8103D8C: @ 8103D8C
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r1, r0, 24
- movs r4, 0
- ldr r0, _08103DC0 @ =gUnknown_083EDD3B
- adds r0, r1, r0
- ldrb r0, [r0]
- cmp r4, r0
- bcs _08103DB8
- ldr r7, _08103DC4 @ =gUnknown_083EDD35
- adds r6, r0, 0
- lsls r5, r1, 1
-_08103DA4:
- adds r0, r4, r5
- adds r0, r7
- ldrb r0, [r0]
- bl sub_8103D28
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, r6
- bcc _08103DA4
-_08103DB8:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08103DC0: .4byte gUnknown_083EDD3B
-_08103DC4: .4byte gUnknown_083EDD35
- thumb_func_end sub_8103D8C
-
- thumb_func_start sub_8103DC8
-sub_8103DC8: @ 8103DC8
- push {r4-r6,lr}
- movs r4, 0
- ldr r6, _08103DF8 @ =gSprites
- ldr r5, _08103DFC @ =gSharedMem + 0x44
-_08103DD0:
- ldr r0, _08103E00 @ =sub_8103EE4
- bl CreateInvisibleSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r1, r6
- strh r4, [r1, 0x2E]
- adds r1, r4, r5
- strb r0, [r1]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x4
- bls _08103DD0
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08103DF8: .4byte gSprites
-_08103DFC: .4byte gSharedMem + 0x44
-_08103E00: .4byte sub_8103EE4
- thumb_func_end sub_8103DC8
-
- thumb_func_start sub_8103E04
-sub_8103E04: @ 8103E04
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _08103E30 @ =gSharedMem
- adds r1, 0x44
- adds r0, r1
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08103E34 @ =gSprites
- adds r0, r1
- movs r2, 0
- movs r1, 0x1
- strh r1, [r0, 0x30]
- movs r1, 0x4
- strh r1, [r0, 0x32]
- strh r2, [r0, 0x34]
- strh r2, [r0, 0x36]
- movs r1, 0x2
- strh r1, [r0, 0x38]
- strh r2, [r0, 0x3C]
- bx lr
- .align 2, 0
-_08103E30: .4byte gSharedMem
-_08103E34: .4byte gSprites
- thumb_func_end sub_8103E04
-
- thumb_func_start sub_8103E38
-sub_8103E38: @ 8103E38
- push {r4,r5,lr}
- movs r2, 0
- ldr r4, _08103E60 @ =gSharedMem + 0x44
- ldr r3, _08103E64 @ =gSprites
-_08103E40:
- adds r0, r2, r4
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r1, r0, r3
- movs r5, 0x30
- ldrsh r0, [r1, r5]
- cmp r0, 0
- beq _08103E68
- movs r5, 0x32
- ldrsh r0, [r1, r5]
- cmp r0, 0
- beq _08103E68
- movs r0, 0
- b _08103E74
- .align 2, 0
-_08103E60: .4byte gSharedMem + 0x44
-_08103E64: .4byte gSprites
-_08103E68:
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0x4
- bls _08103E40
- movs r0, 0x1
-_08103E74:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8103E38
-
- thumb_func_start sub_8103E7C
-sub_8103E7C: @ 8103E7C
- push {r4,r5,lr}
- movs r4, 0
- ldr r5, _08103E94 @ =gSharedMem + 0x44
-_08103E82:
- adds r0, r4, r5
- ldrb r0, [r0]
- bl sub_8103EAC
- lsls r0, 24
- cmp r0, 0
- bne _08103E98
- movs r0, 0
- b _08103EA4
- .align 2, 0
-_08103E94: .4byte gSharedMem + 0x44
-_08103E98:
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x4
- bls _08103E82
- movs r0, 0x1
-_08103EA4:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8103E7C
-
- thumb_func_start sub_8103EAC
-sub_8103EAC: @ 8103EAC
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- ldr r0, _08103EC8 @ =gSprites
- adds r1, r0
- movs r2, 0x30
- ldrsh r0, [r1, r2]
- cmp r0, 0
- bne _08103ECC
- movs r0, 0x1
- b _08103EDE
- .align 2, 0
-_08103EC8: .4byte gSprites
-_08103ECC:
- ldrh r2, [r1, 0x3C]
- movs r3, 0x3C
- ldrsh r0, [r1, r3]
- cmp r0, 0
- beq _08103EDA
- movs r0, 0
- strh r0, [r1, 0x30]
-_08103EDA:
- lsls r0, r2, 24
- lsrs r0, 24
-_08103EDE:
- pop {r1}
- bx r1
- thumb_func_end sub_8103EAC
-
- thumb_func_start sub_8103EE4
-sub_8103EE4: @ 8103EE4
- push {r4-r7,lr}
- adds r2, r0, 0
- movs r1, 0x30
- ldrsh r0, [r2, r1]
- cmp r0, 0
- beq _08103F66
- ldrh r0, [r2, 0x34]
- subs r0, 0x1
- strh r0, [r2, 0x34]
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- negs r1, r1
- cmp r0, r1
- bne _08103F4E
- movs r0, 0
- strh r0, [r2, 0x3C]
- movs r6, 0x1
- strh r6, [r2, 0x34]
- ldrh r1, [r2, 0x38]
- ldrh r3, [r2, 0x36]
- adds r0, r1, r3
- strh r0, [r2, 0x36]
- movs r4, 0x4
- ldrh r5, [r2, 0x32]
- movs r7, 0x32
- ldrsh r3, [r2, r7]
- cmp r3, 0
- beq _08103F20
- movs r4, 0x8
-_08103F20:
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0
- bgt _08103F38
- strh r6, [r2, 0x3C]
- negs r0, r1
- strh r0, [r2, 0x38]
- cmp r3, 0
- beq _08103F4E
- subs r0, r5, 0x1
- strh r0, [r2, 0x32]
- b _08103F40
-_08103F38:
- cmp r0, r4
- blt _08103F40
- negs r0, r1
- strh r0, [r2, 0x38]
-_08103F40:
- movs r1, 0x32
- ldrsh r0, [r2, r1]
- cmp r0, 0
- beq _08103F4E
- ldrh r0, [r2, 0x34]
- lsls r0, 1
- strh r0, [r2, 0x34]
-_08103F4E:
- ldr r1, _08103F6C @ =gUnknown_083EDD30
- movs r3, 0x2E
- ldrsh r0, [r2, r3]
- adds r0, r1
- ldrb r0, [r0]
- ldrh r3, [r2, 0x36]
- lsls r3, 24
- lsrs r3, 24
- adds r1, r3, 0
- adds r2, r3, 0
- bl MultiplyPaletteRGBComponents
-_08103F66:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08103F6C: .4byte gUnknown_083EDD30
- thumb_func_end sub_8103EE4
-
- thumb_func_start sub_8103F70
-sub_8103F70: @ 8103F70
- push {r4,lr}
- ldr r4, _08103F98 @ =sub_8103FE8
- adds r0, r4, 0
- movs r1, 0x6
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08103F9C @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- movs r2, 0x1
- strh r2, [r1, 0xE]
- bl _call_via_r4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08103F98: .4byte sub_8103FE8
-_08103F9C: .4byte gTasks
- thumb_func_end sub_8103F70
-
- thumb_func_start sub_8103FA0
-sub_8103FA0: @ 8103FA0
- push {lr}
- ldr r0, _08103FC4 @ =sub_8103FE8
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r2, r0, 24
- ldr r1, _08103FC8 @ =gTasks
- lsls r0, r2, 2
- adds r0, r2
- lsls r0, 3
- adds r0, r1
- movs r1, 0xC
- ldrsh r0, [r0, r1]
- cmp r0, 0
- beq _08103FCC
- movs r0, 0
- b _08103FE0
- .align 2, 0
-_08103FC4: .4byte sub_8103FE8
-_08103FC8: .4byte gTasks
-_08103FCC:
- adds r0, r2, 0
- bl DestroyTask
- ldr r0, _08103FE4 @ =gUnknown_083EDDAC
- ldr r0, [r0]
- movs r1, 0x10
- movs r2, 0x20
- bl LoadPalette
- movs r0, 0x1
-_08103FE0:
- pop {r1}
- bx r1
- .align 2, 0
-_08103FE4: .4byte gUnknown_083EDDAC
- thumb_func_end sub_8103FA0
-
- thumb_func_start sub_8103FE8
-sub_8103FE8: @ 8103FE8
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _08104040 @ =gTasks
- adds r2, r1, r0
- ldrh r0, [r2, 0xA]
- subs r0, 0x1
- strh r0, [r2, 0xA]
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- negs r1, r1
- cmp r0, r1
- bne _08104026
- movs r0, 0x4
- strh r0, [r2, 0xA]
- ldrh r1, [r2, 0xE]
- ldrh r3, [r2, 0xC]
- adds r0, r1, r3
- strh r0, [r2, 0xC]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0
- beq _08104022
- cmp r0, 0x2
- bne _08104026
-_08104022:
- negs r0, r1
- strh r0, [r2, 0xE]
-_08104026:
- ldr r0, _08104044 @ =gUnknown_083EDDA0
- movs r3, 0xC
- ldrsh r1, [r2, r3]
- lsls r1, 2
- adds r1, r0
- ldr r0, [r1]
- movs r1, 0x10
- movs r2, 0x20
- bl LoadPalette
- pop {r0}
- bx r0
- .align 2, 0
-_08104040: .4byte gTasks
-_08104044: .4byte gUnknown_083EDDA0
- thumb_func_end sub_8103FE8
-
- thumb_func_start sub_8104048
-sub_8104048: @ 8104048
- push {lr}
- ldr r0, _0810405C @ =sub_81040E8
- movs r1, 0x8
- bl CreateTask
- ldr r1, _08104060 @ =gSharedMem
- adds r1, 0x3E
- strb r0, [r1]
- pop {r0}
- bx r0
- .align 2, 0
-_0810405C: .4byte sub_81040E8
-_08104060: .4byte gSharedMem
- thumb_func_end sub_8104048
-
- thumb_func_start sub_8104064
-sub_8104064: @ 8104064
- push {r4,lr}
- ldr r0, _08104090 @ =gSharedMem
- adds r0, 0x3E
- ldrb r0, [r0]
- lsls r4, r0, 2
- adds r4, r0
- lsls r4, 3
- ldr r0, _08104094 @ =gTasks
- adds r4, r0
- adds r0, r4, 0
- bl sub_810421C
- movs r1, 0x1
- strh r1, [r4, 0x8]
- ldrh r0, [r4, 0xA]
- adds r0, 0x1
- strh r0, [r4, 0xA]
- strh r1, [r4, 0x26]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104090: .4byte gSharedMem
-_08104094: .4byte gTasks
- thumb_func_end sub_8104064
-
- thumb_func_start sub_8104098
-sub_8104098: @ 8104098
- push {r4,lr}
- ldr r0, _081040C0 @ =gSharedMem
- adds r0, 0x3E
- ldrb r0, [r0]
- lsls r4, r0, 2
- adds r4, r0
- lsls r4, 3
- ldr r0, _081040C4 @ =gTasks
- adds r4, r0
- adds r0, r4, 0
- bl sub_810421C
- movs r0, 0x3
- strh r0, [r4, 0x8]
- movs r0, 0x1
- strh r0, [r4, 0x26]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081040C0: .4byte gSharedMem
-_081040C4: .4byte gTasks
- thumb_func_end sub_8104098
-
- thumb_func_start sub_81040C8
-sub_81040C8: @ 81040C8
- ldr r2, _081040E0 @ =gTasks
- ldr r0, _081040E4 @ =gSharedMem
- adds r0, 0x3E
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- ldrh r0, [r0, 0x26]
- lsls r0, 24
- lsrs r0, 24
- bx lr
- .align 2, 0
-_081040E0: .4byte gTasks
-_081040E4: .4byte gSharedMem
- thumb_func_end sub_81040C8
-
- thumb_func_start sub_81040E8
-sub_81040E8: @ 81040E8
- push {lr}
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r3, _08104110 @ =gUnknown_083ECBB4
- ldr r2, _08104114 @ =gTasks
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r2, 0x8
- ldrsh r1, [r0, r2]
- lsls r1, 2
- adds r1, r3
- ldr r1, [r1]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_08104110: .4byte gUnknown_083ECBB4
-_08104114: .4byte gTasks
- thumb_func_end sub_81040E8
-
- thumb_func_start nullsub_68
-nullsub_68: @ 8104118
- bx lr
- thumb_func_end nullsub_68
-
- thumb_func_start sub_810411C
-sub_810411C: @ 810411C
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0xA]
- lsls r0, 19
- movs r1, 0xA0
- lsls r1, 13
- adds r0, r1
- asrs r0, 16
- movs r1, 0x14
- bl sub_8105B1C
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r4, 0xC]
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_810411C
-
- thumb_func_start sub_8104144
-sub_8104144: @ 8104144
- push {r4,lr}
- adds r4, r0, 0
- ldr r2, _08104174 @ =gSprites
- movs r0, 0xC
- ldrsh r1, [r4, r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- movs r1, 0x3C
- ldrsh r0, [r0, r1]
- cmp r0, 0
- beq _0810419E
- ldrh r1, [r4, 0xA]
- adds r0, r1, 0x2
- lsls r0, 16
- lsrs r2, r0, 16
- movs r0, 0
- lsls r1, 16
- asrs r1, 16
- cmp r1, 0x1
- bne _08104178
- movs r0, 0x1
- b _0810417E
- .align 2, 0
-_08104174: .4byte gSprites
-_08104178:
- cmp r1, 0x10
- bne _0810417E
- movs r0, 0x2
-_0810417E:
- lsls r1, r2, 16
- asrs r1, 15
- ldr r2, _081041A4 @ =0x0600e800
- adds r1, r2
- adds r1, 0x80
- ldr r2, _081041A8 @ =gUnknown_083ECBC4
- lsls r0, 2
- adds r0, r2
- ldrh r0, [r0]
- strh r0, [r1]
- ldrb r0, [r4, 0xC]
- bl sub_8105B88
- movs r0, 0
- strh r0, [r4, 0x8]
- strh r0, [r4, 0x26]
-_0810419E:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081041A4: .4byte 0x0600e800
-_081041A8: .4byte gUnknown_083ECBC4
- thumb_func_end sub_8104144
-
- thumb_func_start sub_81041AC
-sub_81041AC: @ 81041AC
- push {r4,lr}
- adds r3, r0, 0
- ldrh r1, [r3, 0xA]
- adds r0, r1, 0x2
- lsls r0, 16
- lsrs r4, r0, 16
- movs r2, 0
- lsls r1, 16
- asrs r1, 16
- cmp r1, 0x1
- bne _081041C6
- movs r2, 0x1
- b _081041CC
-_081041C6:
- cmp r1, 0x10
- bne _081041CC
- movs r2, 0x2
-_081041CC:
- movs r1, 0xC
- ldrsh r0, [r3, r1]
- cmp r0, 0
- bne _081041F0
- lsls r0, r4, 16
- asrs r0, 15
- ldr r1, _08104214 @ =0x0600e800
- adds r0, r1
- adds r0, 0x80
- ldr r1, _08104218 @ =gUnknown_083ECBC4
- lsls r2, 2
- adds r1, 0x2
- adds r2, r1
- ldrh r1, [r2]
- strh r1, [r0]
- ldrh r0, [r3, 0xA]
- subs r0, 0x1
- strh r0, [r3, 0xA]
-_081041F0:
- ldrh r0, [r3, 0xC]
- adds r0, 0x1
- strh r0, [r3, 0xC]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x13
- ble _08104202
- movs r0, 0
- strh r0, [r3, 0xC]
-_08104202:
- movs r1, 0xA
- ldrsh r0, [r3, r1]
- cmp r0, 0
- bne _0810420E
- strh r0, [r3, 0x8]
- strh r0, [r3, 0x26]
-_0810420E:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104214: .4byte 0x0600e800
-_08104218: .4byte gUnknown_083ECBC4
- thumb_func_end sub_81041AC
-
- thumb_func_start sub_810421C
-sub_810421C: @ 810421C
- push {lr}
- movs r1, 0x2
- adds r2, r0, 0
- adds r2, 0x8
- movs r3, 0
-_08104226:
- lsls r0, r1, 1
- adds r0, r2, r0
- strh r3, [r0]
- adds r0, r1, 0x1
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0xF
- bls _08104226
- pop {r0}
- bx r0
- thumb_func_end sub_810421C
-
- thumb_func_start sub_810423C
-sub_810423C: @ 810423C
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 24
- lsrs r5, r0, 24
- movs r2, 0x3
- ldr r6, _08104268 @ =0x0600e800
- movs r4, 0
- ldr r0, _0810426C @ =gTasks
- mov r8, r0
- ldr r1, _08104270 @ =gSharedMem
- mov r12, r1
- cmp r4, r5
- bge _081042A6
- ldr r7, _08104274 @ =gUnknown_083ECBC4
-_0810425A:
- movs r3, 0
- lsls r0, r4, 16
- asrs r0, 16
- cmp r0, 0
- bne _08104278
- movs r3, 0x1
- b _0810427E
- .align 2, 0
-_08104268: .4byte 0x0600e800
-_0810426C: .4byte gTasks
-_08104270: .4byte gSharedMem
-_08104274: .4byte gUnknown_083ECBC4
-_08104278:
- cmp r0, 0xF
- bne _0810427E
- movs r3, 0x2
-_0810427E:
- lsls r2, 16
- asrs r2, 16
- lsls r1, r2, 1
- adds r1, r6
- adds r1, 0x80
- lsls r0, r3, 2
- adds r0, r7
- ldrh r0, [r0]
- strh r0, [r1]
- lsls r0, r4, 16
- movs r1, 0x80
- lsls r1, 9
- adds r0, r1
- adds r2, 0x1
- lsls r2, 16
- lsrs r2, 16
- lsrs r4, r0, 16
- asrs r0, 16
- cmp r0, r5
- blt _0810425A
-_081042A6:
- lsls r1, r4, 16
- asrs r0, r1, 16
- cmp r0, 0xF
- bgt _081042F0
- ldr r7, _081042BC @ =gUnknown_083ECBC4 + 0x2
-_081042B0:
- movs r3, 0
- asrs r0, r1, 16
- cmp r0, 0
- bne _081042C0
- movs r3, 0x1
- b _081042C6
- .align 2, 0
-_081042BC: .4byte gUnknown_083ECBC4 + 0x2
-_081042C0:
- cmp r0, 0xF
- bne _081042C6
- movs r3, 0x2
-_081042C6:
- lsls r2, 16
- asrs r2, 16
- lsls r1, r2, 1
- adds r1, r6
- adds r1, 0x80
- lsls r0, r3, 2
- adds r0, r7
- ldrh r0, [r0]
- strh r0, [r1]
- lsls r0, r4, 16
- movs r1, 0x80
- lsls r1, 9
- adds r0, r1
- lsrs r4, r0, 16
- adds r2, 0x1
- lsls r2, 16
- lsrs r2, 16
- lsls r1, r4, 16
- asrs r0, r1, 16
- cmp r0, 0xF
- ble _081042B0
-_081042F0:
- mov r0, r12
- adds r0, 0x3E
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- add r0, r8
- strh r5, [r0, 0xA]
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_810423C
-
- thumb_func_start sub_810430C
-sub_810430C: @ 810430C
- push {r4,lr}
- ldr r4, _08104328 @ =sub_810434C
- adds r0, r4, 0
- movs r1, 0x7
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- bl _call_via_r4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104328: .4byte sub_810434C
- thumb_func_end sub_810430C
-
- thumb_func_start sub_810432C
-sub_810432C: @ 810432C
- push {lr}
- ldr r0, _08104340 @ =sub_810434C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0xFF
- beq _08104344
- movs r0, 0
- b _08104346
- .align 2, 0
-_08104340: .4byte sub_810434C
-_08104344:
- movs r0, 0x1
-_08104346:
- pop {r1}
- bx r1
- thumb_func_end sub_810432C
-
- thumb_func_start sub_810434C
-sub_810434C: @ 810434C
- push {lr}
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r3, _08104374 @ =gUnknown_083ECBD0
- ldr r2, _08104378 @ =gTasks
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r2, 0x8
- ldrsh r1, [r0, r2]
- lsls r1, 2
- adds r1, r3
- ldr r1, [r1]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_08104374: .4byte gUnknown_083ECBD0
-_08104378: .4byte gTasks
- thumb_func_end sub_810434C
-
- thumb_func_start sub_810437C
-sub_810437C: @ 810437C
- push {lr}
- ldr r1, _081043DC @ =gSharedMem
- movs r2, 0
- strb r2, [r1, 0xA]
- strh r2, [r1, 0x14]
- strh r2, [r1, 0x16]
- ldrh r1, [r0, 0x8]
- adds r1, 0x1
- strh r1, [r0, 0x8]
- strh r2, [r0, 0xA]
- movs r1, 0x1E
- strh r1, [r0, 0xC]
- movs r1, 0xA0
- lsls r1, 3
- strh r1, [r0, 0x10]
- ldr r0, _081043E0 @ =gSpriteCoordOffsetX
- strh r2, [r0]
- ldr r0, _081043E4 @ =gSpriteCoordOffsetY
- strh r2, [r0]
- ldr r0, _081043E8 @ =REG_BG1HOFS
- strh r2, [r0]
- adds r0, 0x2
- strh r2, [r0]
- movs r0, 0x1E
- movs r1, 0
- bl sub_8104A40
- bl sub_81051C0
- bl sub_8105100
- bl sub_81052EC
- bl sub_81053A0
- bl sub_810545C
- bl sub_8102680
- bl StopMapMusic
- movs r0, 0xC4
- lsls r0, 1
- bl PlayNewMapMusic
- pop {r0}
- bx r0
- .align 2, 0
-_081043DC: .4byte gSharedMem
-_081043E0: .4byte gSpriteCoordOffsetX
-_081043E4: .4byte gSpriteCoordOffsetY
-_081043E8: .4byte REG_BG1HOFS
- thumb_func_end sub_810437C
-
- thumb_func_start sub_81043EC
-sub_81043EC: @ 81043EC
- push {r4,lr}
- adds r4, r0, 0
- ldr r1, _0810445C @ =gSpriteCoordOffsetX
- ldrh r0, [r1]
- subs r0, 0x8
- strh r0, [r1]
- ldrh r2, [r4, 0xA]
- adds r2, 0x8
- strh r2, [r4, 0xA]
- movs r1, 0xA
- ldrsh r0, [r4, r1]
- adds r0, 0xF0
- movs r1, 0xFF
- ands r0, r1
- lsrs r3, r0, 3
- ldr r1, _08104460 @ =REG_BG1HOFS
- ldr r0, _08104464 @ =0x000001ff
- ands r2, r0
- strh r2, [r1]
- adds r2, r3, 0
- movs r1, 0xC
- ldrsh r0, [r4, r1]
- cmp r2, r0
- beq _08104438
- movs r1, 0xE
- ldrsh r0, [r4, r1]
- cmp r0, 0x12
- bgt _08104438
- strh r3, [r4, 0xC]
- ldrh r0, [r4, 0xA]
- lsls r0, 16
- asrs r0, 19
- strh r0, [r4, 0xE]
- movs r0, 0xE
- ldrsh r1, [r4, r0]
- adds r0, r2, 0
- bl sub_8104A40
-_08104438:
- movs r1, 0xA
- ldrsh r0, [r4, r1]
- cmp r0, 0xC7
- ble _0810444A
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- movs r1, 0
- strh r0, [r4, 0x8]
- strh r1, [r4, 0xE]
-_0810444A:
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0810445C: .4byte gSpriteCoordOffsetX
-_08104460: .4byte REG_BG1HOFS
-_08104464: .4byte 0x000001ff
- thumb_func_end sub_81043EC
-
- thumb_func_start sub_8104468
-sub_8104468: @ 8104468
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x3B
- ble _08104492
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- bl sub_8105578
- bl sub_81056F0
-_08104492:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8104468
-
- thumb_func_start sub_8104498
-sub_8104498: @ 8104498
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x14
- adds r7, r0, 0
- ldr r1, _08104534 @ =gUnknown_083ECC1C
- mov r0, sp
- movs r2, 0x4
- bl memcpy
- add r0, sp, 0x4
- mov r8, r0
- ldr r1, _08104538 @ =gUnknown_083ECC20
- movs r2, 0x8
- bl memcpy
- add r6, sp, 0xC
- ldr r1, _0810453C @ =gUnknown_083ECC28
- adds r0, r6, 0
- movs r2, 0x8
- bl memcpy
- ldrh r0, [r7, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- ldrh r0, [r7, 0x10]
- subs r0, 0x4
- strh r0, [r7, 0x10]
- lsls r0, 16
- asrs r0, 24
- movs r5, 0x4
- subs r5, r0
- lsls r4, r5, 1
- add r8, r4
- mov r1, r8
- movs r2, 0
- ldrsh r0, [r1, r2]
- bl sub_8105688
- adds r6, r4
- movs r1, 0
- ldrsh r0, [r6, r1]
- bl sub_81057E8
- ldr r0, _08104540 @ =gSharedMem
- adds r0, 0x3F
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08104544 @ =gSprites
- adds r0, r1
- mov r2, sp
- adds r1, r2, r5
- ldrb r1, [r1]
- bl StartSpriteAnimIfDifferent
- movs r1, 0x10
- ldrsh r0, [r7, r1]
- movs r1, 0x80
- lsls r1, 1
- cmp r0, r1
- bgt _08104526
- ldrh r0, [r7, 0x8]
- adds r0, 0x1
- strh r0, [r7, 0x8]
- strh r1, [r7, 0x10]
- movs r0, 0
- strh r0, [r7, 0x12]
-_08104526:
- add sp, 0x14
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08104534: .4byte gUnknown_083ECC1C
-_08104538: .4byte gUnknown_083ECC20
-_0810453C: .4byte gUnknown_083ECC28
-_08104540: .4byte gSharedMem
-_08104544: .4byte gSprites
- thumb_func_end sub_8104498
-
- thumb_func_start sub_8104548
-sub_8104548: @ 8104548
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x4F
- ble _0810458A
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- movs r0, 0
- strh r0, [r4, 0x12]
- movs r0, 0x2
- bl sub_81057E8
- ldr r0, _08104590 @ =gSharedMem
- adds r0, 0x3F
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08104594 @ =gSprites
- adds r0, r1
- movs r1, 0x3
- bl StartSpriteAnimIfDifferent
-_0810458A:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104590: .4byte gSharedMem
-_08104594: .4byte gSprites
- thumb_func_end sub_8104548
-
- thumb_func_start sub_8104598
-sub_8104598: @ 8104598
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- ldrb r0, [r4, 0x10]
- adds r0, 0x80
- strh r0, [r4, 0x10]
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x4F
- ble _081045C4
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- movs r0, 0
- strh r0, [r4, 0x12]
-_081045C4:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8104598
-
- thumb_func_start sub_81045CC
-sub_81045CC: @ 81045CC
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- ldrb r0, [r4, 0x10]
- adds r0, 0x40
- strh r0, [r4, 0x10]
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x27
- ble _08104634
- movs r0, 0
- strh r0, [r4, 0x12]
- ldr r1, _0810460C @ =gSharedMem
- ldrb r0, [r1, 0x5]
- cmp r0, 0
- beq _08104610
- ldrb r1, [r1, 0xA]
- movs r2, 0x14
- ldrsh r0, [r4, r2]
- cmp r1, r0
- bgt _0810462E
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- b _0810462C
- .align 2, 0
-_0810460C: .4byte gSharedMem
-_08104610:
- movs r1, 0x14
- ldrsh r0, [r4, r1]
- cmp r0, 0x3
- ble _0810461E
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- b _0810462C
-_0810461E:
- ldrh r0, [r4, 0x14]
- bl sub_81026DC
- lsls r0, 24
- cmp r0, 0
- beq _0810462E
- movs r0, 0xE
-_0810462C:
- strh r0, [r4, 0x8]
-_0810462E:
- ldrh r0, [r4, 0x14]
- adds r0, 0x1
- strh r0, [r4, 0x14]
-_08104634:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_81045CC
-
- thumb_func_start sub_810463C
-sub_810463C: @ 810463C
- push {r4-r6,lr}
- adds r4, r0, 0
- ldr r6, _08104660 @ =gSharedMem
- movs r1, 0x14
- ldrsh r0, [r6, r1]
- movs r1, 0x14
- bl __modsi3
- lsls r0, 16
- lsrs r5, r0, 16
- cmp r0, 0
- beq _08104664
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D5C
- b _08104688
- .align 2, 0
-_08104660: .4byte gSharedMem
-_08104664:
- movs r0, 0x1
- bl sub_8102C48
- lsls r0, 24
- lsrs r0, 24
- ldrb r1, [r6, 0x5]
- cmp r0, r1
- beq _08104692
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 24
- bl sub_8102D28
- movs r1, 0x14
- ldrsh r0, [r6, r1]
- movs r1, 0x14
- bl __modsi3
-_08104688:
- lsls r0, 16
- lsrs r5, r0, 16
- ldrb r0, [r4, 0x10]
- adds r0, 0x40
- strh r0, [r4, 0x10]
-_08104692:
- lsls r0, r5, 16
- asrs r5, r0, 16
- cmp r5, 0
- bne _081046B4
- movs r0, 0x1
- bl sub_8102C48
- ldr r1, _081046BC @ =gSharedMem
- lsls r0, 24
- lsrs r0, 24
- ldrb r1, [r1, 0x5]
- cmp r0, r1
- bne _081046B4
- strh r5, [r4, 0x10]
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
-_081046B4:
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_081046BC: .4byte gSharedMem
- thumb_func_end sub_810463C
-
- thumb_func_start sub_81046C0
-sub_81046C0: @ 81046C0
- push {r4-r7,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x10]
- adds r0, 0x1
- movs r7, 0
- strh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x3B
- ble _08104758
- bl StopMapMusic
- bl sub_81056C0
- bl sub_8105804
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- ldr r5, _08104710 @ =gSharedMem
- ldrb r0, [r5, 0x5]
- cmp r0, 0
- bne _0810471C
- movs r0, 0xA0
- strh r0, [r4, 0x10]
- adds r0, r5, 0
- adds r0, 0x3F
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08104714 @ =gSprites
- adds r0, r1
- movs r1, 0x5
- bl StartSpriteAnimIfDifferent
- ldr r0, _08104718 @ =0x00000187
- bl PlayFanfare
- b _08104758
- .align 2, 0
-_08104710: .4byte gSharedMem
-_08104714: .4byte gSprites
-_08104718: .4byte 0x00000187
-_0810471C:
- movs r0, 0xC0
- strh r0, [r4, 0x10]
- adds r6, r5, 0
- adds r6, 0x3F
- ldrb r1, [r6]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r4, _08104760 @ =gSprites
- adds r0, r4
- movs r1, 0x4
- bl StartSpriteAnimIfDifferent
- ldrb r1, [r6]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r4
- adds r0, 0x2B
- strb r7, [r0]
- ldrb r0, [r5, 0x2]
- cmp r0, 0
- beq _08104750
- bl sub_8104098
- strb r7, [r5, 0x2]
-_08104750:
- movs r0, 0xC3
- lsls r0, 1
- bl PlayFanfare
-_08104758:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08104760: .4byte gSprites
- thumb_func_end sub_81046C0
-
- thumb_func_start sub_8104764
-sub_8104764: @ 8104764
- push {r4,lr}
- adds r4, r0, 0
- ldrh r1, [r4, 0x10]
- movs r2, 0x10
- ldrsh r0, [r4, r2]
- cmp r0, 0
- beq _0810477C
- subs r0, r1, 0x1
- strh r0, [r4, 0x10]
- lsls r0, 16
- cmp r0, 0
- bne _0810478C
-_0810477C:
- bl sub_81040C8
- lsls r0, 24
- cmp r0, 0
- bne _0810478C
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
-_0810478C:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8104764
-
- thumb_func_start sub_8104794
-sub_8104794: @ 8104794
- push {r4,lr}
- adds r3, r0, 0
- ldr r1, _081047D4 @ =gSpriteCoordOffsetX
- ldrh r0, [r1]
- subs r0, 0x8
- strh r0, [r1]
- ldrh r2, [r3, 0xA]
- adds r2, 0x8
- strh r2, [r3, 0xA]
- ldrh r0, [r3, 0xE]
- adds r0, 0x8
- strh r0, [r3, 0xE]
- movs r1, 0xA
- ldrsh r0, [r3, r1]
- subs r0, 0x8
- movs r1, 0xFF
- ands r0, r1
- lsrs r4, r0, 3
- ldr r1, _081047D8 @ =REG_BG1HOFS
- ldr r0, _081047DC @ =0x000001ff
- ands r2, r0
- strh r2, [r1]
- ldrh r0, [r3, 0xE]
- lsls r0, 16
- asrs r0, 19
- cmp r0, 0x19
- bgt _081047E0
- adds r0, r4, 0
- bl sub_8104A88
- b _081047E6
- .align 2, 0
-_081047D4: .4byte gSpriteCoordOffsetX
-_081047D8: .4byte REG_BG1HOFS
-_081047DC: .4byte 0x000001ff
-_081047E0:
- ldrh r0, [r3, 0x8]
- adds r0, 0x1
- strh r0, [r3, 0x8]
-_081047E6:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8104794
-
- thumb_func_start sub_81047EC
-sub_81047EC: @ 81047EC
- push {r4-r6,lr}
- adds r5, r0, 0
- ldr r4, _08104834 @ =gSharedMem
- movs r6, 0
- strb r6, [r4, 0xB]
- ldrb r0, [r4, 0x5]
- strb r0, [r4, 0xA]
- ldr r0, _08104838 @ =gSpriteCoordOffsetX
- strh r6, [r0]
- ldr r0, _0810483C @ =REG_BG1HOFS
- strh r6, [r0]
- movs r0, 0x8
- strh r0, [r4, 0x1A]
- bl sub_810514C
- bl sub_81054B8
- bl sub_8105524
- adds r0, r4, 0
- adds r0, 0x60
- ldrh r0, [r0]
- bl PlayNewMapMusic
- ldrb r0, [r4, 0xA]
- cmp r0, 0
- bne _08104844
- ldr r0, _08104840 @ =sub_810434C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- bl DestroyTask
- b _0810485A
- .align 2, 0
-_08104834: .4byte gSharedMem
-_08104838: .4byte gSpriteCoordOffsetX
-_0810483C: .4byte REG_BG1HOFS
-_08104840: .4byte sub_810434C
-_08104844:
- movs r0, 0x4
- bl sub_8104CAC
- bl dp15_jump_random_unknown
- strh r0, [r5, 0xA]
- strh r6, [r5, 0xC]
- strh r6, [r5, 0xE]
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_0810485A:
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_81047EC
-
- thumb_func_start sub_8104860
-sub_8104860: @ 8104860
- push {r4-r6,lr}
- adds r4, r0, 0
- ldr r5, _0810487C @ =gSharedMem
- ldrh r0, [r5, 0x1A]
- lsls r6, r0, 16
- asrs r1, r6, 16
- movs r2, 0xA
- ldrsh r0, [r4, r2]
- cmp r1, r0
- bne _08104880
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- b _081048A2
- .align 2, 0
-_0810487C: .4byte gSharedMem
-_08104880:
- movs r1, 0x1C
- ldrsh r0, [r5, r1]
- movs r1, 0x18
- bl __modsi3
- lsls r0, 16
- cmp r0, 0
- bne _081048A2
- ldrh r0, [r4, 0xC]
- adds r0, 0x1
- strh r0, [r4, 0xC]
- movs r1, 0x7
- ands r0, r1
- cmp r0, 0
- bne _081048A2
- asrs r0, r6, 17
- strh r0, [r5, 0x1A]
-_081048A2:
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_8104860
-
- thumb_func_start sub_81048A8
-sub_81048A8: @ 81048A8
- push {lr}
- bl sub_8104E18
- lsls r0, 24
- cmp r0, 0
- beq _081048C2
- ldr r0, _081048C8 @ =sub_810434C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- bl DestroyTask
-_081048C2:
- pop {r0}
- bx r0
- .align 2, 0
-_081048C8: .4byte sub_810434C
- thumb_func_end sub_81048A8
-
- thumb_func_start sub_81048CC
-sub_81048CC: @ 81048CC
- push {r4,r5,lr}
- adds r4, r0, 0
- bl sub_81054B8
- bl sub_81056C0
- bl sub_8105804
- bl sub_8105854
- ldr r5, _08104934 @ =gSprites
- ldr r3, _08104938 @ =gSharedMem
- adds r0, r3, 0
- adds r0, 0x4E
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r5
- adds r0, 0x3E
- ldrb r1, [r0]
- movs r2, 0x4
- orrs r1, r2
- strb r1, [r0]
- adds r3, 0x3F
- ldrb r1, [r3]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r5
- movs r1, 0x5
- bl StartSpriteAnimIfDifferent
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- movs r1, 0
- strh r0, [r4, 0x8]
- movs r0, 0x4
- strh r0, [r4, 0x10]
- strh r1, [r4, 0x12]
- bl StopMapMusic
- ldr r0, _0810493C @ =0x00000187
- bl PlayFanfare
- movs r0, 0xB2
- bl PlaySE
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08104934: .4byte gSprites
-_08104938: .4byte gSharedMem
-_0810493C: .4byte 0x00000187
- thumb_func_end sub_81048CC
-
- thumb_func_start sub_8104940
-sub_8104940: @ 8104940
- push {r4,r5,lr}
- adds r4, r0, 0
- ldr r0, _081049B8 @ =gSpriteCoordOffsetY
- ldrh r1, [r4, 0x10]
- strh r1, [r0]
- ldr r0, _081049BC @ =REG_BG1VOFS
- strh r1, [r0]
- ldrh r1, [r4, 0x12]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _0810495E
- ldrh r0, [r4, 0x10]
- negs r0, r0
- strh r0, [r4, 0x10]
-_0810495E:
- ldrh r0, [r4, 0x12]
- adds r0, 0x1
- strh r0, [r4, 0x12]
- movs r1, 0x1F
- ands r0, r1
- cmp r0, 0
- bne _08104974
- ldrh r0, [r4, 0x10]
- lsls r0, 16
- asrs r0, 17
- strh r0, [r4, 0x10]
-_08104974:
- movs r0, 0x10
- ldrsh r5, [r4, r0]
- cmp r5, 0
- bne _081049B0
- bl sub_81058A0
- bl sub_81058C4
- bl sub_8105284
- bl sub_81059E8
- ldr r2, _081049C0 @ =gSprites
- ldr r0, _081049C4 @ =gSharedMem
- adds r0, 0x4E
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- adds r0, 0x3E
- ldrb r2, [r0]
- movs r1, 0x5
- negs r1, r1
- ands r1, r2
- strb r1, [r0]
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- strh r5, [r4, 0x12]
-_081049B0:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081049B8: .4byte gSpriteCoordOffsetY
-_081049BC: .4byte REG_BG1VOFS
-_081049C0: .4byte gSprites
-_081049C4: .4byte gSharedMem
- thumb_func_end sub_8104940
-
- thumb_func_start sub_81049C8
-sub_81049C8: @ 81049C8
- push {r4,lr}
- adds r4, r0, 0
- ldr r0, _081049F0 @ =gSpriteCoordOffsetY
- movs r1, 0
- strh r1, [r0]
- ldr r0, _081049F4 @ =REG_BG1VOFS
- strh r1, [r0]
- bl sub_8105ACC
- lsls r0, 24
- cmp r0, 0
- beq _081049EA
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- bl sub_8105AEC
-_081049EA:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081049F0: .4byte gSpriteCoordOffsetY
-_081049F4: .4byte REG_BG1VOFS
- thumb_func_end sub_81049C8
-
- thumb_func_start sub_81049F8
-sub_81049F8: @ 81049F8
- push {lr}
- ldr r0, _08104A30 @ =gSpriteCoordOffsetX
- movs r1, 0
- strh r1, [r0]
- ldr r0, _08104A34 @ =REG_BG1HOFS
- strh r1, [r0]
- ldr r0, _08104A38 @ =gSharedMem
- adds r0, 0x60
- ldrh r0, [r0]
- bl PlayNewMapMusic
- bl sub_810514C
- bl sub_8105554
- bl sub_8105524
- bl sub_81059B8
- ldr r0, _08104A3C @ =sub_810434C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- bl DestroyTask
- pop {r0}
- bx r0
- .align 2, 0
-_08104A30: .4byte gSpriteCoordOffsetX
-_08104A34: .4byte REG_BG1HOFS
-_08104A38: .4byte gSharedMem
-_08104A3C: .4byte sub_810434C
- thumb_func_end sub_81049F8
-
- thumb_func_start sub_8104A40
-sub_8104A40: @ 8104A40
- push {r4-r7,lr}
- movs r3, 0x4
- ldr r7, _08104A80 @ =gReelTimeWindowTilemap
- lsls r1, 16
- asrs r5, r1, 16
- lsls r0, 16
- asrs r4, r0, 16
- ldr r6, _08104A84 @ =0x0600e000
-_08104A50:
- lsls r2, r3, 16
- asrs r2, 16
- subs r1, r2, 0x4
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 2
- adds r0, r5, r0
- lsls r0, 1
- adds r0, r7
- ldrh r1, [r0]
- lsls r0, r2, 5
- adds r0, r4
- lsls r0, 1
- adds r0, r6
- strh r1, [r0]
- adds r2, 0x1
- lsls r2, 16
- lsrs r3, r2, 16
- asrs r2, 16
- cmp r2, 0xE
- ble _08104A50
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08104A80: .4byte gReelTimeWindowTilemap
-_08104A84: .4byte 0x0600e000
- thumb_func_end sub_8104A40
-
- thumb_func_start sub_8104A88
-sub_8104A88: @ 8104A88
- push {r4,r5,lr}
- movs r2, 0x4
- lsls r0, 16
- asrs r3, r0, 16
- ldr r5, _08104AB4 @ =0x0600e000
- movs r4, 0
-_08104A94:
- lsls r1, r2, 16
- asrs r1, 16
- lsls r0, r1, 5
- adds r0, r3
- lsls r0, 1
- adds r0, r5
- strh r4, [r0]
- adds r1, 0x1
- lsls r1, 16
- lsrs r2, r1, 16
- asrs r1, 16
- cmp r1, 0xE
- ble _08104A94
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08104AB4: .4byte 0x0600e000
- thumb_func_end sub_8104A88
-
- thumb_func_start sub_8104AB8
-sub_8104AB8: @ 8104AB8
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- ldr r5, _08104AE4 @ =sub_8104B0C
- adds r0, r5, 0
- movs r1, 0x1
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _08104AE8 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- strh r4, [r1, 0xA]
- bl _call_via_r5
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08104AE4: .4byte sub_8104B0C
-_08104AE8: .4byte gTasks
- thumb_func_end sub_8104AB8
-
- thumb_func_start sub_8104AEC
-sub_8104AEC: @ 8104AEC
- push {lr}
- ldr r0, _08104B00 @ =sub_8104B0C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0xFF
- beq _08104B04
- movs r0, 0
- b _08104B06
- .align 2, 0
-_08104B00: .4byte sub_8104B0C
-_08104B04:
- movs r0, 0x1
-_08104B06:
- pop {r1}
- bx r1
- thumb_func_end sub_8104AEC
-
- thumb_func_start sub_8104B0C
-sub_8104B0C: @ 8104B0C
- push {lr}
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r3, _08104B34 @ =gUnknown_083ECC30
- ldr r2, _08104B38 @ =gTasks
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r2, 0x8
- ldrsh r1, [r0, r2]
- lsls r1, 2
- adds r1, r3
- ldr r1, [r1]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_08104B34: .4byte gUnknown_083ECC30
-_08104B38: .4byte gTasks
- thumb_func_end sub_8104B0C
-
- thumb_func_start sub_8104B3C
-sub_8104B3C: @ 8104B3C
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8104B3C
-
- thumb_func_start sub_8104B60
-sub_8104B60: @ 8104B60
- push {lr}
- adds r2, r0, 0
- ldr r0, _08104B7C @ =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08104B76
- ldrh r0, [r2, 0x8]
- adds r0, 0x1
- strh r0, [r2, 0x8]
-_08104B76:
- pop {r0}
- bx r0
- .align 2, 0
-_08104B7C: .4byte gPaletteFade
- thumb_func_end sub_8104B60
-
- thumb_func_start sub_8104B80
-sub_8104B80: @ 8104B80
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- bl sub_8104DA4
- bl sub_81065DC
- ldr r0, _08104BC0 @ =gWindowConfig_81E7144
- bl BasicInitMenuWindow
- ldr r0, _08104BC4 @ =gOtherText_ReelTime
- movs r1, 0xA
- movs r2, 0x20
- movs r3, 0x1
- bl MenuPrint_PixelCoords
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104BC0: .4byte gWindowConfig_81E7144
-_08104BC4: .4byte gOtherText_ReelTime
- thumb_func_end sub_8104B80
-
- thumb_func_start sub_8104BC8
-sub_8104BC8: @ 8104BC8
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- ldr r0, _08104BF8 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x6
- ands r0, r1
- cmp r0, 0
- beq _08104BF0
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
-_08104BF0:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104BF8: .4byte gMain
- thumb_func_end sub_8104BC8
-
- thumb_func_start sub_8104BFC
-sub_8104BFC: @ 8104BFC
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- bl MenuZeroFillScreen
- ldr r0, _08104C3C @ =gWindowConfig_81E7128
- bl BasicInitMenuWindow
- bl sub_81064B8
- ldrb r0, [r4, 0xA]
- bl sub_8104CAC
- ldr r0, _08104C40 @ =gSharedMem
- ldrb r0, [r0, 0x2]
- bl sub_810423C
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08104C3C: .4byte gWindowConfig_81E7128
-_08104C40: .4byte gSharedMem
- thumb_func_end sub_8104BFC
-
- thumb_func_start sub_8104C44
-sub_8104C44: @ 8104C44
- push {lr}
- ldr r0, _08104C58 @ =sub_8104B0C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r0, 24
- bl DestroyTask
- pop {r0}
- bx r0
- .align 2, 0
-_08104C58: .4byte sub_8104B0C
- thumb_func_end sub_8104C44
-
- thumb_func_start sub_8104C5C
-sub_8104C5C: @ 8104C5C
- push {lr}
- ldr r0, _08104C9C @ =sub_8104E74
- movs r1, 0x3
- bl CreateTask
- lsls r0, 24
- lsrs r1, r0, 24
- ldr r0, _08104CA0 @ =gSharedMem
- adds r0, 0x3D
- strb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _08104CA4 @ =gTasks
- adds r0, r1
- ldr r1, _08104CA8 @ =0x0000ffff
- strh r1, [r0, 0xA]
- movs r1, 0x4
- adds r2, r0, 0
- adds r2, 0x8
- movs r3, 0x40
-_08104C86:
- lsls r0, r1, 1
- adds r0, r2, r0
- strh r3, [r0]
- adds r0, r1, 0x1
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0xF
- bls _08104C86
- pop {r0}
- bx r0
- .align 2, 0
-_08104C9C: .4byte sub_8104E74
-_08104CA0: .4byte gSharedMem
-_08104CA4: .4byte gTasks
-_08104CA8: .4byte 0x0000ffff
- thumb_func_end sub_8104C5C
-
-.section .text_8104D30
-
- thumb_func_start sub_8104D30
-sub_8104D30: @ 8104D30
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x4
- mov r8, r1
- ldr r4, [sp, 0x1C]
- lsls r0, 24
- lsrs r7, r0, 24
- ldr r0, _08104D84 @ =gSharedMem
- adds r0, 0x3D
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _08104D88 @ =gTasks
- adds r0, r1
- mov r12, r0
- movs r5, 0x4
- lsls r4, 16
- asrs r6, r4, 16
- lsls r2, 16
- lsls r3, 16
-_08104D5C:
- lsls r0, r5, 1
- mov r1, r12
- adds r1, 0x8
- adds r4, r1, r0
- movs r1, 0
- ldrsh r0, [r4, r1]
- cmp r0, 0x40
- bne _08104D8C
- str r6, [sp]
- adds r0, r7, 0
- mov r1, r8
- asrs r2, 16
- asrs r3, 16
- bl sub_8105BF8
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r4]
- b _08104D96
- .align 2, 0
-_08104D84: .4byte gSharedMem
-_08104D88: .4byte gTasks
-_08104D8C:
- adds r0, r5, 0x1
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0xF
- bls _08104D5C
-_08104D96:
- add sp, 0x4
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8104D30
-
- thumb_func_start sub_8104DA4
-sub_8104DA4: @ 8104DA4
- push {r4-r6,lr}
- ldr r0, _08104E04 @ =gSharedMem
- adds r0, 0x3D
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _08104E08 @ =gTasks
- adds r4, r0, r1
- ldrh r1, [r4, 0xA]
- ldr r0, _08104E0C @ =0x0000ffff
- cmp r1, r0
- beq _08104DCE
- ldr r0, _08104E10 @ =gUnknown_083ED064
- movs r2, 0xA
- ldrsh r1, [r4, r2]
- lsls r1, 2
- adds r1, r0
- ldr r0, [r1]
- bl _call_via_r0
-_08104DCE:
- movs r5, 0x4
- adds r6, r4, 0
- adds r6, 0x8
-_08104DD4:
- lsls r0, r5, 1
- adds r4, r6, r0
- movs r1, 0
- ldrsh r0, [r4, r1]
- cmp r0, 0x40
- beq _08104DF4
- adds r1, r0, 0
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08104E14 @ =gSprites
- adds r0, r1
- bl DestroySprite
- movs r0, 0x40
- strh r0, [r4]
-_08104DF4:
- adds r0, r5, 0x1
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0xF
- bls _08104DD4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08104E04: .4byte gSharedMem
-_08104E08: .4byte gTasks
-_08104E0C: .4byte 0x0000ffff
-_08104E10: .4byte gUnknown_083ED064
-_08104E14: .4byte gSprites
- thumb_func_end sub_8104DA4
-
- thumb_func_start sub_8104E18
-sub_8104E18: @ 8104E18
- push {r4,r5,lr}
- ldr r0, _08104E54 @ =gSharedMem
- adds r0, 0x3D
- ldrb r1, [r0]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _08104E58 @ =gTasks
- adds r0, r1
- movs r2, 0x4
- adds r3, r0, 0
- adds r3, 0x8
- ldr r4, _08104E5C @ =gSprites
-_08104E32:
- lsls r0, r2, 1
- adds r1, r3, r0
- movs r5, 0
- ldrsh r0, [r1, r5]
- cmp r0, 0x40
- beq _08104E60
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r1, r4
- movs r5, 0x3C
- ldrsh r0, [r1, r5]
- cmp r0, 0
- beq _08104E60
- movs r0, 0
- b _08104E6C
- .align 2, 0
-_08104E54: .4byte gSharedMem
-_08104E58: .4byte gTasks
-_08104E5C: .4byte gSprites
-_08104E60:
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0xF
- bls _08104E32
- movs r0, 0x1
-_08104E6C:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8104E18
-
- thumb_func_start sub_8104E74
-sub_8104E74: @ 8104E74
- push {lr}
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r3, _08104E9C @ =gUnknown_083ECC54
- ldr r2, _08104EA0 @ =gTasks
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r2
- movs r2, 0x8
- ldrsh r1, [r0, r2]
- lsls r1, 2
- adds r1, r3
- ldr r1, [r1]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_08104E9C: .4byte gUnknown_083ECC54
-_08104EA0: .4byte gTasks
- thumb_func_end sub_8104E74
-
- thumb_func_start nullsub_69
-nullsub_69: @ 8104EA4
- bx lr
- thumb_func_end nullsub_69
-
- thumb_func_start sub_8104EA8
-sub_8104EA8: @ 8104EA8
- push {r4-r7,lr}
- movs r6, 0
- movs r0, 0x30
-_08104EAE:
- movs r4, 0
- lsls r5, r0, 16
- lsls r7, r6, 16
-_08104EB4:
- ldr r0, _08104F0C @ =gSpriteTemplate_83ED414
- asrs r1, r5, 16
- movs r2, 0
- movs r3, 0xE
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- ldr r0, _08104F10 @ =gSprites
- adds r1, r0
- ldrb r0, [r1, 0x5]
- movs r2, 0xC
- orrs r0, r2
- strb r0, [r1, 0x5]
- strh r6, [r1, 0x2E]
- strh r4, [r1, 0x30]
- ldr r0, _08104F14 @ =0x0000ffff
- strh r0, [r1, 0x34]
- lsls r0, r4, 16
- movs r1, 0xC0
- lsls r1, 13
- adds r0, r1
- lsrs r4, r0, 16
- asrs r0, 16
- cmp r0, 0x77
- ble _08104EB4
- movs r2, 0x80
- lsls r2, 9
- adds r1, r7, r2
- movs r2, 0xA0
- lsls r2, 14
- adds r0, r5, r2
- lsrs r0, 16
- lsrs r6, r1, 16
- asrs r1, 16
- cmp r1, 0x2
- ble _08104EAE
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08104F0C: .4byte gSpriteTemplate_83ED414
-_08104F10: .4byte gSprites
-_08104F14: .4byte 0x0000ffff
- thumb_func_end sub_8104EA8
-
- thumb_func_start sub_8104F18
-sub_8104F18: @ 8104F18
- push {r4,r5,lr}
- adds r5, r0, 0
- ldr r4, _08104F88 @ =gSharedMem
- movs r0, 0x2E
- ldrsh r1, [r5, r0]
- lsls r1, 1
- adds r0, r4, 0
- adds r0, 0x1C
- adds r1, r0
- ldrh r0, [r5, 0x30]
- ldrh r1, [r1]
- adds r0, r1
- strh r0, [r5, 0x32]
- movs r1, 0x32
- ldrsh r0, [r5, r1]
- movs r1, 0x78
- bl __modsi3
- strh r0, [r5, 0x32]
- movs r2, 0x2E
- ldrsh r1, [r5, r2]
- lsls r1, 1
- adds r4, 0x22
- adds r1, r4
- ldrh r1, [r1]
- adds r1, 0x1C
- adds r0, r1
- strh r0, [r5, 0x22]
- ldrh r4, [r5, 0x2E]
- lsls r4, 24
- lsrs r4, 24
- movs r1, 0x32
- ldrsh r0, [r5, r1]
- movs r1, 0x18
- bl __divsi3
- adds r1, r0, 0
- lsls r1, 16
- asrs r1, 16
- adds r0, r4, 0
- bl sub_8102BA4
- lsls r0, 24
- lsrs r0, 24
- bl GetSpriteTileStartByTag
- adds r1, r5, 0
- adds r1, 0x40
- strh r0, [r1]
- adds r0, r5, 0
- bl SetSpriteSheetFrameTileNum
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08104F88: .4byte gSharedMem
- thumb_func_end sub_8104F18
-
- thumb_func_start sub_8104F8C
-sub_8104F8C: @ 8104F8C
- push {r4-r6,lr}
- movs r4, 0xCB
- movs r5, 0x1
- ldr r6, _08104FF0 @ =0x0000270f
-_08104F94:
- lsls r4, 16
- asrs r4, 16
- lsls r5, 16
- asrs r5, 16
- adds r0, r4, 0
- movs r1, 0x17
- movs r2, 0
- adds r3, r5, 0
- bl sub_8104FF4
- lsls r0, r5, 2
- adds r0, r5
- lsls r0, 17
- subs r4, 0x7
- lsls r4, 16
- lsrs r4, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, r6
- ble _08104F94
- movs r4, 0xEB
- movs r5, 0x1
- ldr r6, _08104FF0 @ =0x0000270f
-_08104FC2:
- lsls r4, 16
- asrs r4, 16
- lsls r5, 16
- asrs r5, 16
- adds r0, r4, 0
- movs r1, 0x17
- movs r2, 0x1
- adds r3, r5, 0
- bl sub_8104FF4
- lsls r0, r5, 2
- adds r0, r5
- lsls r0, 17
- subs r4, 0x7
- lsls r4, 16
- lsrs r4, 16
- lsrs r5, r0, 16
- asrs r0, 16
- cmp r0, r6
- ble _08104FC2
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08104FF0: .4byte 0x0000270f
- thumb_func_end sub_8104F8C
-
- thumb_func_start sub_8104FF4
-sub_8104FF4: @ 8104FF4
- push {r4-r6,lr}
- mov r6, r8
- push {r6}
- adds r5, r0, 0
- adds r6, r1, 0
- mov r8, r2
- adds r4, r3, 0
- mov r0, r8
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r4, 16
- lsrs r4, 16
- ldr r0, _08105060 @ =gSpriteTemplate_83ED42C
- lsls r5, 16
- asrs r5, 16
- lsls r6, 16
- asrs r6, 16
- adds r1, r5, 0
- adds r2, r6, 0
- movs r3, 0xD
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r2, r0, 4
- adds r2, r0
- lsls r2, 2
- ldr r0, _08105064 @ =gSprites
- adds r2, r0
- ldrb r1, [r2, 0x5]
- movs r0, 0xD
- negs r0, r0
- ands r0, r1
- movs r1, 0x8
- orrs r0, r1
- strb r0, [r2, 0x5]
- mov r0, r8
- strh r0, [r2, 0x2E]
- strh r4, [r2, 0x30]
- lsls r4, 16
- asrs r4, 16
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 1
- strh r0, [r2, 0x32]
- ldr r0, _08105068 @ =0x0000ffff
- strh r0, [r2, 0x34]
- pop {r3}
- mov r8, r3
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08105060: .4byte gSpriteTemplate_83ED42C
-_08105064: .4byte gSprites
-_08105068: .4byte 0x0000ffff
- thumb_func_end sub_8104FF4
-
- thumb_func_start sub_810506C
-sub_810506C: @ 810506C
- push {r4,lr}
- adds r4, r0, 0
- ldr r1, _081050C0 @ =gSharedMem
- ldrh r2, [r1, 0xC]
- movs r3, 0x2E
- ldrsh r0, [r4, r3]
- cmp r0, 0
- beq _0810507E
- ldrh r2, [r1, 0xE]
-_0810507E:
- movs r1, 0x34
- ldrsh r0, [r4, r1]
- cmp r0, r2
- beq _081050B8
- strh r2, [r4, 0x34]
- ldrh r1, [r4, 0x32]
- adds r0, r2, 0
- bl __umodsi3
- lsls r0, 16
- lsrs r2, r0, 16
- ldrh r1, [r4, 0x30]
- adds r0, r2, 0
- bl __udivsi3
- lsls r0, 16
- movs r3, 0xE0
- lsls r3, 11
- adds r0, r3
- lsrs r2, r0, 16
- adds r0, r2, 0
- bl GetSpriteTileStartByTag
- adds r1, r4, 0
- adds r1, 0x40
- strh r0, [r1]
- adds r0, r4, 0
- bl SetSpriteSheetFrameTileNum
-_081050B8:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081050C0: .4byte gSharedMem
- thumb_func_end sub_810506C
-
- thumb_func_start sub_81050C4
-sub_81050C4: @ 81050C4
- push {lr}
- ldr r0, _081050F4 @ =gSpriteTemplate_83ED444
- movs r1, 0x58
- movs r2, 0x48
- movs r3, 0xF
- bl CreateSprite
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- ldr r2, _081050F8 @ =gSprites
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrb r1, [r0, 0x5]
- movs r2, 0xC
- orrs r1, r2
- strb r1, [r0, 0x5]
- ldr r1, _081050FC @ =gSubspriteTables_83ED704
- bl SetSubspriteTables
- pop {r0}
- bx r0
- .align 2, 0
-_081050F4: .4byte gSpriteTemplate_83ED444
-_081050F8: .4byte gSprites
-_081050FC: .4byte gSubspriteTables_83ED704
- thumb_func_end sub_81050C4
-
- thumb_func_start sub_8105100
-sub_8105100: @ 8105100
- push {lr}
- ldr r0, _08105140 @ =gSpriteTemplate_83ED45C
- movs r1, 0x8C
- lsls r1, 1
- movs r2, 0x50
- movs r3, 0x1
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _08105144 @ =gSprites
- lsls r2, r0, 4
- adds r2, r0
- lsls r2, 2
- adds r2, r1
- ldrb r3, [r2, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r3
- movs r3, 0x4
- orrs r1, r3
- strb r1, [r2, 0x5]
- adds r2, 0x3E
- ldrb r1, [r2]
- movs r3, 0x2
- orrs r1, r3
- strb r1, [r2]
- ldr r1, _08105148 @ =gSharedMem
- adds r1, 0x3F
- strb r0, [r1]
- pop {r0}
- bx r0
- .align 2, 0
-_08105140: .4byte gSpriteTemplate_83ED45C
-_08105144: .4byte gSprites
-_08105148: .4byte gSharedMem
- thumb_func_end sub_8105100
-
- thumb_func_start sub_810514C
-sub_810514C: @ 810514C
- push {lr}
- ldr r0, _08105168 @ =gSharedMem
- adds r0, 0x3F
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _0810516C @ =gSprites
- adds r0, r1
- bl DestroySprite
- pop {r0}
- bx r0
- .align 2, 0
-_08105168: .4byte gSharedMem
-_0810516C: .4byte gSprites
- thumb_func_end sub_810514C
-
- thumb_func_start sub_8105170
-sub_8105170: @ 8105170
- push {lr}
- adds r2, r0, 0
- movs r0, 0
- strh r0, [r2, 0x24]
- strh r0, [r2, 0x26]
- adds r0, r2, 0
- adds r0, 0x2A
- ldrb r0, [r0]
- cmp r0, 0x4
- bne _081051B6
- movs r0, 0x8
- strh r0, [r2, 0x24]
- strh r0, [r2, 0x26]
- adds r0, r2, 0
- adds r0, 0x2B
- ldrb r0, [r0]
- cmp r0, 0
- beq _081051A4
- adds r0, r2, 0
- adds r0, 0x2C
- ldrb r1, [r0]
- movs r0, 0x3F
- ands r0, r1
- cmp r0, 0
- bne _081051B2
- b _081051B6
-_081051A4:
- adds r0, r2, 0
- adds r0, 0x2C
- ldrb r1, [r0]
- movs r0, 0x3F
- ands r0, r1
- cmp r0, 0
- bne _081051B6
-_081051B2:
- ldr r0, _081051BC @ =0x0000fff8
- strh r0, [r2, 0x26]
-_081051B6:
- pop {r0}
- bx r0
- .align 2, 0
-_081051BC: .4byte 0x0000fff8
- thumb_func_end sub_8105170
-
- thumb_func_start sub_81051C0
-sub_81051C0: @ 81051C0
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- ldr r0, _0810526C @ =gSpriteTemplate_83ED474
- movs r7, 0xB8
- lsls r7, 1
- adds r1, r7, 0
- movs r2, 0x34
- movs r3, 0x7
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r1, _08105270 @ =gSprites
- mov r10, r1
- adds r2, r0, r1
- ldrb r1, [r2, 0x5]
- movs r5, 0xD
- negs r5, r5
- adds r0, r5, 0
- ands r0, r1
- movs r3, 0x4
- mov r9, r3
- mov r1, r9
- orrs r0, r1
- strb r0, [r2, 0x5]
- adds r1, r2, 0
- adds r1, 0x3E
- ldrb r0, [r1]
- movs r3, 0x2
- mov r8, r3
- mov r3, r8
- orrs r0, r3
- strb r0, [r1]
- ldr r1, _08105274 @ =gSubspriteTables_83ED73C
- adds r0, r2, 0
- bl SetSubspriteTables
- ldr r6, _08105278 @ =gSharedMem
- adds r0, r6, 0
- adds r0, 0x49
- strb r4, [r0]
- ldr r0, _0810527C @ =gSpriteTemplate_83ED48C
- adds r1, r7, 0
- movs r2, 0x54
- movs r3, 0x7
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- mov r1, r10
- adds r2, r0, r1
- ldrb r0, [r2, 0x5]
- ands r5, r0
- mov r3, r9
- orrs r5, r3
- strb r5, [r2, 0x5]
- adds r1, r2, 0
- adds r1, 0x3E
- ldrb r0, [r1]
- mov r3, r8
- orrs r0, r3
- strb r0, [r1]
- ldr r1, _08105280 @ =gSubspriteTables_83ED75C
- adds r0, r2, 0
- bl SetSubspriteTables
- adds r6, 0x4A
- strb r4, [r6]
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0810526C: .4byte gSpriteTemplate_83ED474
-_08105270: .4byte gSprites
-_08105274: .4byte gSubspriteTables_83ED73C
-_08105278: .4byte gSharedMem
-_0810527C: .4byte gSpriteTemplate_83ED48C
-_08105280: .4byte gSubspriteTables_83ED75C
- thumb_func_end sub_81051C0
-
- thumb_func_start sub_8105284
-sub_8105284: @ 8105284
- push {r4,lr}
- ldr r0, _081052D8 @ =gSpriteTemplate_83ED4A4
- ldr r1, _081052DC @ =gSpriteCoordOffsetX
- ldrh r2, [r1]
- movs r1, 0xA8
- subs r1, r2
- lsls r1, 16
- asrs r1, 16
- movs r2, 0x50
- movs r3, 0x7
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r1, _081052E0 @ =gSprites
- adds r0, r1
- ldrb r2, [r0, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r2
- movs r2, 0x4
- orrs r1, r2
- strb r1, [r0, 0x5]
- adds r3, r0, 0
- adds r3, 0x3E
- ldrb r1, [r3]
- movs r2, 0x2
- orrs r1, r2
- strb r1, [r3]
- ldr r1, _081052E4 @ =gSubspriteTables_83ED78C
- bl SetSubspriteTables
- ldr r0, _081052E8 @ =gSharedMem
- adds r0, 0x42
- strb r4, [r0]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081052D8: .4byte gSpriteTemplate_83ED4A4
-_081052DC: .4byte gSpriteCoordOffsetX
-_081052E0: .4byte gSprites
-_081052E4: .4byte gSubspriteTables_83ED78C
-_081052E8: .4byte gSharedMem
- thumb_func_end sub_8105284
-
- thumb_func_start sub_81052EC
-sub_81052EC: @ 81052EC
- push {r4-r7,lr}
- movs r4, 0
- movs r5, 0
- ldr r6, _08105350 @ =gSharedMem + 0x4B
-_081052F4:
- ldr r0, _08105354 @ =gSpriteTemplate_83ED4BC
- movs r1, 0xB8
- lsls r1, 1
- movs r2, 0
- movs r3, 0xA
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r3, r0, 4
- adds r3, r0
- lsls r3, 2
- ldr r1, _08105358 @ =gSprites
- adds r3, r1
- ldrb r2, [r3, 0x5]
- movs r7, 0xD
- negs r7, r7
- adds r1, r7, 0
- ands r2, r1
- movs r1, 0x4
- orrs r2, r1
- strb r2, [r3, 0x5]
- movs r1, 0x3E
- adds r1, r3
- mov r12, r1
- ldrb r1, [r1]
- movs r2, 0x2
- orrs r1, r2
- mov r2, r12
- strb r1, [r2]
- strh r5, [r3, 0x3C]
- adds r1, r4, r6
- strb r0, [r1]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- lsls r0, r5, 16
- movs r7, 0xA0
- lsls r7, 13
- adds r0, r7
- lsrs r5, r0, 16
- cmp r4, 0x2
- bls _081052F4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08105350: .4byte gSharedMem + 0x4B
-_08105354: .4byte gSpriteTemplate_83ED4BC
-_08105358: .4byte gSprites
- thumb_func_end sub_81052EC
-
- thumb_func_start sub_810535C
-sub_810535C: @ 810535C
- push {r4,lr}
- adds r4, r0, 0
- ldr r1, _0810539C @ =gSharedMem
- ldrh r0, [r4, 0x3C]
- ldrh r1, [r1, 0x14]
- adds r0, r1
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x28
- bl __modsi3
- lsls r0, 16
- asrs r0, 16
- adds r1, r0, 0
- adds r1, 0x3B
- strh r1, [r4, 0x22]
- movs r1, 0x14
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- bl sub_8102C48
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl StartSpriteAnimIfDifferent
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0810539C: .4byte gSharedMem
- thumb_func_end sub_810535C
-
- thumb_func_start sub_81053A0
-sub_81053A0: @ 81053A0
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- movs r1, 0xB8
- lsls r1, 1
- ldr r0, _0810544C @ =gSpriteTemplate_83ED4D4
- movs r2, 0x64
- movs r3, 0x9
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r7, _08105450 @ =gSprites
- adds r2, r0, r7
- adds r1, r2, 0
- adds r1, 0x3E
- ldrb r0, [r1]
- movs r3, 0x2
- mov r10, r3
- mov r3, r10
- orrs r0, r3
- strb r0, [r1]
- ldrb r1, [r2, 0x5]
- movs r5, 0xD
- negs r5, r5
- adds r0, r5, 0
- ands r0, r1
- movs r1, 0x4
- mov r8, r1
- mov r3, r8
- orrs r0, r3
- strb r0, [r2, 0x5]
- ldr r0, _08105454 @ =gSubspriteTables_83ED7B4
- mov r9, r0
- adds r0, r2, 0
- mov r1, r9
- bl SetSubspriteTables
- ldr r6, _08105458 @ =gSharedMem
- adds r0, r6, 0
- adds r0, 0x4E
- strb r4, [r0]
- movs r1, 0x90
- lsls r1, 1
- ldr r0, _0810544C @ =gSpriteTemplate_83ED4D4
- movs r2, 0x68
- movs r3, 0x4
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- adds r2, r0, r7
- adds r1, r2, 0
- adds r1, 0x3E
- ldrb r0, [r1]
- mov r3, r10
- orrs r0, r3
- strb r0, [r1]
- ldrb r0, [r2, 0x5]
- ands r5, r0
- mov r0, r8
- orrs r5, r0
- strb r5, [r2, 0x5]
- adds r0, r2, 0
- mov r1, r9
- bl SetSubspriteTables
- adds r6, 0x4F
- strb r4, [r6]
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0810544C: .4byte gSpriteTemplate_83ED4D4
-_08105450: .4byte gSprites
-_08105454: .4byte gSubspriteTables_83ED7B4
-_08105458: .4byte gSharedMem
- thumb_func_end sub_81053A0
-
- thumb_func_start sub_810545C
-sub_810545C: @ 810545C
- push {r4,lr}
- ldr r0, _081054A8 @ =gSpriteTemplate_83ED4EC
- movs r1, 0xB8
- lsls r1, 1
- movs r2, 0x4C
- movs r3, 0xB
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r1, _081054AC @ =gSprites
- adds r0, r1
- adds r3, r0, 0
- adds r3, 0x3E
- ldrb r1, [r3]
- movs r2, 0x2
- orrs r1, r2
- strb r1, [r3]
- ldrb r2, [r0, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r2
- movs r2, 0x4
- orrs r1, r2
- strb r1, [r0, 0x5]
- ldr r1, _081054B0 @ =gSubspriteTables_83ED7D4
- bl SetSubspriteTables
- ldr r0, _081054B4 @ =gSharedMem
- adds r0, 0x40
- strb r4, [r0]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081054A8: .4byte gSpriteTemplate_83ED4EC
-_081054AC: .4byte gSprites
-_081054B0: .4byte gSubspriteTables_83ED7D4
-_081054B4: .4byte gSharedMem
- thumb_func_end sub_810545C
-
- thumb_func_start sub_81054B8
-sub_81054B8: @ 81054B8
- push {r4,r5,lr}
- ldr r4, _08105518 @ =gSharedMem
- adds r0, r4, 0
- adds r0, 0x40
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _0810551C @ =gSprites
- adds r0, r1
- bl DestroySprite
- movs r5, 0
- adds r4, 0x49
-_081054D4:
- adds r0, r5, r4
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _0810551C @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r5, 0x1
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0x1
- bls _081054D4
- movs r5, 0
- ldr r4, _08105520 @ =gSharedMem + 0x4B
-_081054F4:
- adds r0, r5, r4
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _0810551C @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r5, 0x1
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0x2
- bls _081054F4
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08105518: .4byte gSharedMem
-_0810551C: .4byte gSprites
-_08105520: .4byte gSharedMem + 0x4B
- thumb_func_end sub_81054B8
-
- thumb_func_start sub_8105524
-sub_8105524: @ 8105524
- push {r4,r5,lr}
- movs r4, 0
- ldr r5, _0810554C @ =gSharedMem + 0x4E
-_0810552A:
- adds r0, r4, r5
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08105550 @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x1
- bls _0810552A
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0810554C: .4byte gSharedMem + 0x4E
-_08105550: .4byte gSprites
- thumb_func_end sub_8105524
-
- thumb_func_start sub_8105554
-sub_8105554: @ 8105554
- push {lr}
- ldr r0, _08105570 @ =gSharedMem
- adds r0, 0x42
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08105574 @ =gSprites
- adds r0, r1
- bl DestroySprite
- pop {r0}
- bx r0
- .align 2, 0
-_08105570: .4byte gSharedMem
-_08105574: .4byte gSprites
- thumb_func_end sub_8105554
-
- thumb_func_start sub_8105578
-sub_8105578: @ 8105578
- push {r4-r6,lr}
- mov r6, r10
- mov r5, r9
- mov r4, r8
- push {r4-r6}
- ldr r0, _0810561C @ =gSpriteTemplate_83ED504
- mov r10, r0
- movs r1, 0x98
- movs r2, 0x20
- movs r3, 0x5
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- ldr r2, _08105620 @ =gSprites
- mov r9, r2
- adds r3, r1, r2
- ldrb r2, [r3, 0x5]
- movs r4, 0xD
- negs r4, r4
- adds r1, r4, 0
- ands r1, r2
- movs r2, 0x4
- mov r8, r2
- mov r2, r8
- orrs r1, r2
- strb r1, [r3, 0x5]
- adds r5, r3, 0
- adds r5, 0x3F
- ldrb r1, [r5]
- movs r2, 0x1
- orrs r1, r2
- strb r1, [r5]
- ldr r5, _08105624 @ =gSharedMem
- adds r1, r5, 0
- adds r1, 0x50
- strb r0, [r1]
- movs r0, 0x8
- strh r0, [r3, 0x2E]
- ldr r0, _08105628 @ =0x0000ffff
- strh r0, [r3, 0x30]
- movs r0, 0x1
- negs r0, r0
- strh r0, [r3, 0x32]
- movs r6, 0x20
- strh r6, [r3, 0x3C]
- mov r0, r10
- movs r1, 0xB8
- movs r2, 0x20
- movs r3, 0x5
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- mov r2, r9
- adds r3, r1, r2
- ldrb r1, [r3, 0x5]
- ands r4, r1
- mov r1, r8
- orrs r4, r1
- strb r4, [r3, 0x5]
- adds r5, 0x51
- strb r0, [r5]
- movs r0, 0x1
- strh r0, [r3, 0x30]
- subs r0, 0x2
- strh r0, [r3, 0x32]
- strh r6, [r3, 0x3C]
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0810561C: .4byte gSpriteTemplate_83ED504
-_08105620: .4byte gSprites
-_08105624: .4byte gSharedMem
-_08105628: .4byte 0x0000ffff
- thumb_func_end sub_8105578
-
- thumb_func_start sub_810562C
-sub_810562C: @ 810562C
- push {r4,lr}
- adds r2, r0, 0
- ldrh r0, [r2, 0x2E]
- movs r1, 0x2E
- ldrsh r4, [r2, r1]
- cmp r4, 0
- beq _08105650
- subs r0, 0x1
- movs r1, 0
- strh r0, [r2, 0x2E]
- strh r1, [r2, 0x24]
- strh r1, [r2, 0x26]
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- b _08105682
-_08105650:
- adds r3, r2, 0
- adds r3, 0x3E
- ldrb r1, [r3]
- movs r0, 0x5
- negs r0, r0
- ands r0, r1
- strb r0, [r3]
- ldrh r0, [r2, 0x30]
- ldrh r1, [r2, 0x24]
- adds r0, r1
- strh r0, [r2, 0x24]
- ldrh r0, [r2, 0x32]
- ldrh r1, [r2, 0x26]
- adds r0, r1
- strh r0, [r2, 0x26]
- ldrh r0, [r2, 0x34]
- adds r0, 0x1
- strh r0, [r2, 0x34]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x7
- ble _08105682
- ldrh r0, [r2, 0x3C]
- strh r0, [r2, 0x2E]
- strh r4, [r2, 0x34]
-_08105682:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_810562C
-
- thumb_func_start sub_8105688
-sub_8105688: @ 8105688
- push {r4,lr}
- lsls r0, 16
- lsrs r0, 16
- ldr r4, _081056B8 @ =gSprites
- ldr r3, _081056BC @ =gSharedMem
- adds r1, r3, 0
- adds r1, 0x50
- ldrb r2, [r1]
- lsls r1, r2, 4
- adds r1, r2
- lsls r1, 2
- adds r1, r4
- strh r0, [r1, 0x3C]
- adds r3, 0x51
- ldrb r2, [r3]
- lsls r1, r2, 4
- adds r1, r2
- lsls r1, 2
- adds r1, r4
- strh r0, [r1, 0x3C]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081056B8: .4byte gSprites
-_081056BC: .4byte gSharedMem
- thumb_func_end sub_8105688
-
- thumb_func_start sub_81056C0
-sub_81056C0: @ 81056C0
- push {r4,r5,lr}
- movs r4, 0
- ldr r5, _081056E8 @ =gSharedMem + 0x50
-_081056C6:
- adds r0, r4, r5
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _081056EC @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x1
- bls _081056C6
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081056E8: .4byte gSharedMem + 0x50
-_081056EC: .4byte gSprites
- thumb_func_end sub_81056C0
-
- thumb_func_start sub_81056F0
-sub_81056F0: @ 81056F0
- push {r4-r6,lr}
- mov r6, r9
- mov r5, r8
- push {r5,r6}
- ldr r0, _08105778 @ =gSpriteTemplate_83ED51C
- mov r8, r0
- movs r1, 0x48
- movs r2, 0x50
- movs r3, 0x3
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _0810577C @ =gSprites
- mov r9, r1
- lsls r2, r0, 4
- adds r2, r0
- lsls r2, 2
- add r2, r9
- ldrb r3, [r2, 0x5]
- movs r4, 0xD
- negs r4, r4
- adds r1, r4, 0
- ands r1, r3
- movs r6, 0x4
- orrs r1, r6
- strb r1, [r2, 0x5]
- movs r3, 0
- movs r1, 0x1
- strh r1, [r2, 0x2E]
- strh r3, [r2, 0x38]
- movs r1, 0x10
- strh r1, [r2, 0x3A]
- movs r1, 0x8
- strh r1, [r2, 0x3C]
- ldr r5, _08105780 @ =gSharedMem
- adds r1, r5, 0
- adds r1, 0x52
- strb r0, [r1]
- mov r0, r8
- movs r1, 0x68
- movs r2, 0x50
- movs r3, 0x3
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- add r1, r9
- ldrb r2, [r1, 0x5]
- ands r4, r2
- orrs r4, r6
- strb r4, [r1, 0x5]
- adds r1, 0x3F
- ldrb r2, [r1]
- movs r3, 0x1
- orrs r2, r3
- strb r2, [r1]
- adds r5, 0x53
- strb r0, [r5]
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08105778: .4byte gSpriteTemplate_83ED51C
-_0810577C: .4byte gSprites
-_08105780: .4byte gSharedMem
- thumb_func_end sub_81056F0
-
- thumb_func_start sub_8105784
-sub_8105784: @ 8105784
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- ldr r1, _081057E0 @ =gUnknown_083ECC58
- mov r0, sp
- movs r2, 0x2
- bl memcpy
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _081057D6
- ldrh r0, [r4, 0x3A]
- subs r0, 0x1
- strh r0, [r4, 0x3A]
- lsls r0, 16
- cmp r0, 0
- bgt _081057D6
- movs r0, 0x7
- bl IndexOfSpritePaletteTag
- lsls r0, 24
- lsrs r0, 4
- ldr r2, _081057E4 @ =0x01030000
- adds r0, r2
- lsrs r0, 16
- movs r2, 0x38
- ldrsh r1, [r4, r2]
- add r1, sp
- ldrb r3, [r1]
- adds r1, r3, 0
- adds r2, r3, 0
- bl MultiplyInvertedPaletteRGBComponents
- ldrh r0, [r4, 0x38]
- adds r0, 0x1
- movs r1, 0x1
- ands r0, r1
- strh r0, [r4, 0x38]
- ldrh r0, [r4, 0x3C]
- strh r0, [r4, 0x3A]
-_081057D6:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081057E0: .4byte gUnknown_083ECC58
-_081057E4: .4byte 0x01030000
- thumb_func_end sub_8105784
-
- thumb_func_start sub_81057E8
-sub_81057E8: @ 81057E8
- ldr r3, _081057FC @ =gSprites
- ldr r1, _08105800 @ =gSharedMem
- adds r1, 0x52
- ldrb r2, [r1]
- lsls r1, r2, 4
- adds r1, r2
- lsls r1, 2
- adds r1, r3
- strh r0, [r1, 0x3C]
- bx lr
- .align 2, 0
-_081057FC: .4byte gSprites
-_08105800: .4byte gSharedMem
- thumb_func_end sub_81057E8
-
- thumb_func_start sub_8105804
-sub_8105804: @ 8105804
- push {r4,r5,lr}
- movs r0, 0x7
- bl IndexOfSpritePaletteTag
- lsls r0, 24
- lsrs r0, 4
- ldr r1, _08105848 @ =0x01030000
- adds r0, r1
- lsrs r0, 16
- movs r1, 0
- movs r2, 0
- movs r3, 0
- bl MultiplyInvertedPaletteRGBComponents
- movs r4, 0
- ldr r5, _0810584C @ =gSharedMem + 0x52
-_08105824:
- adds r0, r4, r5
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _08105850 @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x1
- bls _08105824
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08105848: .4byte 0x01030000
-_0810584C: .4byte gSharedMem + 0x52
-_08105850: .4byte gSprites
- thumb_func_end sub_8105804
-
- thumb_func_start sub_8105854
-sub_8105854: @ 8105854
- push {lr}
- ldr r0, _08105888 @ =gSpriteTemplate_83ED534
- movs r1, 0xA8
- movs r2, 0x50
- movs r3, 0x6
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _0810588C @ =gSprites
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r1, r2
- ldrb r3, [r1, 0x5]
- movs r2, 0xD
- negs r2, r2
- ands r2, r3
- movs r3, 0x4
- orrs r2, r3
- strb r2, [r1, 0x5]
- ldr r1, _08105890 @ =gSharedMem
- adds r1, 0x41
- strb r0, [r1]
- pop {r0}
- bx r0
- .align 2, 0
-_08105888: .4byte gSpriteTemplate_83ED534
-_0810588C: .4byte gSprites
-_08105890: .4byte gSharedMem
- thumb_func_end sub_8105854
-
- thumb_func_start sub_8105894
-sub_8105894: @ 8105894
- ldr r1, _0810589C @ =gSpriteCoordOffsetY
- ldrh r1, [r1]
- strh r1, [r0, 0x26]
- bx lr
- .align 2, 0
-_0810589C: .4byte gSpriteCoordOffsetY
- thumb_func_end sub_8105894
-
- thumb_func_start sub_81058A0
-sub_81058A0: @ 81058A0
- push {lr}
- ldr r0, _081058BC @ =gSharedMem
- adds r0, 0x41
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _081058C0 @ =gSprites
- adds r0, r1
- bl DestroySprite
- pop {r0}
- bx r0
- .align 2, 0
-_081058BC: .4byte gSharedMem
-_081058C0: .4byte gSprites
- thumb_func_end sub_81058A0
-
- thumb_func_start sub_81058C4
-sub_81058C4: @ 81058C4
- push {r4-r6,lr}
- sub sp, 0x8
- ldr r1, _08105938 @ =gUnknown_083ECC5A
- mov r0, sp
- movs r2, 0x8
- bl memcpy
- movs r4, 0
- ldr r5, _0810593C @ =gSharedMem + 0x54
-_081058D6:
- ldr r0, _08105940 @ =gSpriteCoordOffsetX
- ldrh r0, [r0]
- movs r1, 0x50
- subs r1, r0
- lsls r1, 16
- asrs r1, 16
- ldr r0, _08105944 @ =gSpriteTemplate_83ED54C
- movs r2, 0x44
- movs r3, 0
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- lsls r3, r0, 4
- adds r3, r0
- lsls r3, 2
- ldr r1, _08105948 @ =gSprites
- adds r3, r1
- ldrb r2, [r3, 0x5]
- movs r6, 0xD
- negs r6, r6
- adds r1, r6, 0
- ands r2, r1
- movs r1, 0x4
- orrs r2, r1
- strb r2, [r3, 0x5]
- movs r1, 0x3E
- adds r1, r3
- mov r12, r1
- ldrb r1, [r1]
- movs r2, 0x2
- orrs r1, r2
- mov r2, r12
- strb r1, [r2]
- lsls r1, r4, 1
- add r1, sp
- ldrh r1, [r1]
- strh r1, [r3, 0x2E]
- adds r1, r4, r5
- strb r0, [r1]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x3
- bls _081058D6
- add sp, 0x8
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08105938: .4byte gUnknown_083ECC5A
-_0810593C: .4byte gSharedMem + 0x54
-_08105940: .4byte gSpriteCoordOffsetX
-_08105944: .4byte gSpriteTemplate_83ED54C
-_08105948: .4byte gSprites
- thumb_func_end sub_81058C4
-
- thumb_func_start sub_810594C
-sub_810594C: @ 810594C
- push {r4,r5,lr}
- adds r5, r0, 0
- ldrh r0, [r5, 0x2E]
- subs r0, 0x2
- movs r4, 0
- movs r1, 0xFF
- ands r0, r1
- strh r0, [r5, 0x2E]
- movs r1, 0x2E
- ldrsh r0, [r5, r1]
- movs r1, 0x14
- bl Cos
- strh r0, [r5, 0x24]
- movs r2, 0x2E
- ldrsh r0, [r5, r2]
- movs r1, 0x6
- bl Sin
- strh r0, [r5, 0x26]
- adds r1, r5, 0
- adds r1, 0x43
- strb r4, [r1]
- movs r2, 0x2E
- ldrsh r0, [r5, r2]
- cmp r0, 0x7F
- ble _08105986
- movs r0, 0x2
- strb r0, [r1]
-_08105986:
- ldrh r0, [r5, 0x30]
- adds r0, 0x1
- strh r0, [r5, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xF
- ble _081059B0
- adds r3, r5, 0
- adds r3, 0x3F
- ldrb r2, [r3]
- lsls r0, r2, 31
- lsrs r0, 31
- movs r1, 0x1
- eors r1, r0
- movs r0, 0x2
- negs r0, r0
- ands r0, r2
- orrs r0, r1
- strb r0, [r3]
- movs r0, 0
- strh r0, [r5, 0x30]
-_081059B0:
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_810594C
-
- thumb_func_start sub_81059B8
-sub_81059B8: @ 81059B8
- push {r4,r5,lr}
- movs r4, 0
- ldr r5, _081059E0 @ =gSharedMem + 0x54
-_081059BE:
- adds r0, r4, r5
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- ldr r1, _081059E4 @ =gSprites
- adds r0, r1
- bl DestroySprite
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x3
- bls _081059BE
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081059E0: .4byte gSharedMem + 0x54
-_081059E4: .4byte gSprites
- thumb_func_end sub_81059B8
-
- thumb_func_start sub_81059E8
-sub_81059E8: @ 81059E8
- push {r4,lr}
- ldr r0, _08105A2C @ =gSpriteTemplate_83ED564
- movs r1, 0xA8
- movs r2, 0x3C
- movs r3, 0x8
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r1, _08105A30 @ =gSprites
- adds r0, r1
- ldrb r2, [r0, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r2
- movs r2, 0x4
- orrs r1, r2
- strb r1, [r0, 0x5]
- ldrb r1, [r0, 0x1]
- movs r2, 0x3
- orrs r1, r2
- strb r1, [r0, 0x1]
- bl InitSpriteAffineAnim
- ldr r0, _08105A34 @ =gSharedMem
- adds r0, 0x43
- strb r4, [r0]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08105A2C: .4byte gSpriteTemplate_83ED564
-_08105A30: .4byte gSprites
-_08105A34: .4byte gSharedMem
- thumb_func_end sub_81059E8
-
- thumb_func_start sub_8105A38
-sub_8105A38: @ 8105A38
- push {lr}
- adds r3, r0, 0
- ldrh r2, [r3, 0x2E]
- movs r1, 0x2E
- ldrsh r0, [r3, r1]
- cmp r0, 0
- bne _08105A5A
- adds r0, r3, 0
- adds r0, 0x3F
- ldrb r1, [r0]
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _08105AB4
- adds r0, r2, 0x1
- strh r0, [r3, 0x2E]
- b _08105AB4
-_08105A5A:
- cmp r0, 0x1
- bne _08105A96
- movs r0, 0x3E
- adds r0, r3
- mov r12, r0
- ldrb r2, [r0]
- lsls r0, r2, 29
- lsrs r0, 31
- movs r1, 0x1
- eors r1, r0
- lsls r1, 2
- movs r0, 0x5
- negs r0, r0
- ands r0, r2
- orrs r0, r1
- mov r1, r12
- strb r0, [r1]
- ldrh r0, [r3, 0x32]
- adds r0, 0x1
- strh r0, [r3, 0x32]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x17
- ble _08105AB4
- ldrh r0, [r3, 0x2E]
- adds r0, 0x1
- strh r0, [r3, 0x2E]
- movs r0, 0
- strh r0, [r3, 0x32]
- b _08105AB4
-_08105A96:
- adds r2, r3, 0
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- ldrh r0, [r3, 0x32]
- adds r0, 0x1
- strh r0, [r3, 0x32]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xF
- ble _08105AB4
- movs r0, 0x1
- strh r0, [r3, 0x3C]
-_08105AB4:
- ldrh r0, [r3, 0x30]
- movs r1, 0xFF
- ands r1, r0
- adds r1, 0x10
- strh r1, [r3, 0x30]
- lsrs r1, 8
- ldrh r0, [r3, 0x26]
- subs r0, r1
- strh r0, [r3, 0x26]
- pop {r0}
- bx r0
- thumb_func_end sub_8105A38
-
- thumb_func_start sub_8105ACC
-sub_8105ACC: @ 8105ACC
- ldr r2, _08105AE4 @ =gSprites
- ldr r0, _08105AE8 @ =gSharedMem
- adds r0, 0x43
- ldrb r1, [r0]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrh r0, [r0, 0x3C]
- lsls r0, 24
- lsrs r0, 24
- bx lr
- .align 2, 0
-_08105AE4: .4byte gSprites
-_08105AE8: .4byte gSharedMem
- thumb_func_end sub_8105ACC
-
- thumb_func_start sub_8105AEC
-sub_8105AEC: @ 8105AEC
- push {r4,lr}
- ldr r0, _08105B14 @ =gSharedMem
- adds r0, 0x43
- ldrb r0, [r0]
- lsls r4, r0, 4
- adds r4, r0
- lsls r4, 2
- ldr r0, _08105B18 @ =gSprites
- adds r4, r0
- ldrb r0, [r4, 0x3]
- lsls r0, 26
- lsrs r0, 27
- bl FreeOamMatrix
- adds r0, r4, 0
- bl DestroySprite
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08105B14: .4byte gSharedMem
-_08105B18: .4byte gSprites
- thumb_func_end sub_8105AEC
-
- thumb_func_start sub_8105B1C
-sub_8105B1C: @ 8105B1C
- push {r4,lr}
- adds r3, r0, 0
- adds r2, r1, 0
- ldr r0, _08105B68 @ =gSpriteTemplate_83ED6CC
- lsls r3, 16
- asrs r3, 16
- lsls r2, 16
- asrs r2, 16
- adds r1, r3, 0
- movs r3, 0xC
- bl CreateSprite
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- ldr r1, _08105B6C @ =gSprites
- adds r0, r1
- ldrb r2, [r0, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r2
- movs r2, 0x8
- orrs r1, r2
- strb r1, [r0, 0x5]
- ldrb r1, [r0, 0x1]
- movs r2, 0x3
- orrs r1, r2
- strb r1, [r0, 0x1]
- bl InitSpriteAffineAnim
- adds r0, r4, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08105B68: .4byte gSpriteTemplate_83ED6CC
-_08105B6C: .4byte gSprites
- thumb_func_end sub_8105B1C
-
- thumb_func_start sub_8105B70
-sub_8105B70: @ 8105B70
- push {lr}
- adds r2, r0, 0
- adds r0, 0x3F
- ldrb r1, [r0]
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _08105B84
- movs r0, 0x1
- strh r0, [r2, 0x3C]
-_08105B84:
- pop {r0}
- bx r0
- thumb_func_end sub_8105B70
-
- thumb_func_start sub_8105B88
-sub_8105B88: @ 8105B88
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r4, r0, 4
- adds r4, r0
- lsls r4, 2
- ldr r0, _08105BB0 @ =gSprites
- adds r4, r0
- ldrb r0, [r4, 0x3]
- lsls r0, 26
- lsrs r0, 27
- bl FreeOamMatrix
- adds r0, r4, 0
- bl DestroySprite
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08105BB0: .4byte gSprites
- thumb_func_end sub_8105B88
-
- thumb_func_start sub_8105BB4
-sub_8105BB4: @ 8105BB4
- push {r4-r6,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- ldr r3, _08105BF0 @ =gUnknown_083ECF0C
- lsrs r1, 22
- adds r3, r1, r3
- ldr r5, [r3]
- ldr r3, _08105BF4 @ =gUnknown_083ECE7E
- adds r4, r1, r3
- movs r6, 0
- ldrsh r4, [r4, r6]
- adds r3, 0x2
- adds r1, r3
- movs r6, 0
- ldrsh r3, [r1, r6]
- lsls r2, 16
- asrs r2, 16
- str r2, [sp]
- adds r1, r5, 0
- adds r2, r4, 0
- bl sub_8105BF8
- lsls r0, 24
- lsrs r0, 24
- add sp, 0x4
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08105BF0: .4byte gUnknown_083ECF0C
-_08105BF4: .4byte gUnknown_083ECE7E
- thumb_func_end sub_8105BB4
-
- thumb_func_start sub_8105BF8
-sub_8105BF8: @ 8105BF8
- push {r4-r7,lr}
- adds r4, r0, 0
- adds r6, r1, 0
- adds r1, r2, 0
- adds r2, r3, 0
- ldr r5, [sp, 0x14]
- lsls r4, 24
- lsls r5, 16
- lsrs r5, 16
- ldr r0, _08105C58 @ =gUnknown_083EDB5C
- lsrs r4, 22
- adds r0, r4, r0
- ldr r0, [r0]
- lsls r1, 16
- asrs r1, 16
- lsls r2, 16
- asrs r2, 16
- movs r3, 0x10
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- adds r7, r0, 0
- lsls r0, r7, 4
- adds r0, r7
- lsls r0, 2
- ldr r1, _08105C5C @ =gSprites
- adds r2, r0, r1
- ldrb r0, [r2, 0x5]
- movs r1, 0xC
- orrs r0, r1
- strb r0, [r2, 0x5]
- str r6, [r2, 0x1C]
- strh r5, [r2, 0x3A]
- movs r0, 0x1
- strh r0, [r2, 0x3C]
- ldr r0, _08105C60 @ =gUnknown_083EDBC4
- adds r4, r0
- ldr r1, [r4]
- cmp r1, 0
- beq _08105C50
- adds r0, r2, 0
- bl SetSubspriteTables
-_08105C50:
- adds r0, r7, 0
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_08105C58: .4byte gUnknown_083EDB5C
-_08105C5C: .4byte gSprites
-_08105C60: .4byte gUnknown_083EDBC4
- thumb_func_end sub_8105BF8
-
- thumb_func_start sub_8105C64
-sub_8105C64: @ 8105C64
- movs r1, 0
- strh r1, [r0, 0x3C]
- bx lr
- thumb_func_end sub_8105C64
-
- thumb_func_start sub_8105C6C
-sub_8105C6C: @ 8105C6C
- push {r4,r5,lr}
- sub sp, 0x10
- adds r4, r0, 0
- ldr r1, _08105CE8 @ =gUnknown_083ECC62
- mov r0, sp
- movs r2, 0x8
- bl memcpy
- add r5, sp, 0x8
- ldr r1, _08105CEC @ =gUnknown_083ECC6A
- adds r0, r5, 0
- movs r2, 0x8
- bl memcpy
- ldrh r0, [r4, 0x30]
- adds r1, r0, 0x1
- strh r1, [r4, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xF
- ble _08105CB2
- adds r3, r4, 0
- adds r3, 0x42
- ldrb r2, [r3]
- lsls r0, r2, 26
- lsrs r0, 26
- movs r1, 0x1
- eors r1, r0
- movs r0, 0x40
- negs r0, r0
- ands r0, r2
- orrs r0, r1
- strb r0, [r3]
- movs r0, 0
- strh r0, [r4, 0x30]
-_08105CB2:
- movs r0, 0
- strh r0, [r4, 0x24]
- strh r0, [r4, 0x26]
- adds r0, r4, 0
- adds r0, 0x42
- ldrb r1, [r0]
- movs r0, 0x3F
- ands r0, r1
- cmp r0, 0
- beq _08105CDE
- movs r1, 0x3A
- ldrsh r0, [r4, r1]
- lsls r0, 1
- add r0, sp
- ldrh r0, [r0]
- strh r0, [r4, 0x24]
- movs r1, 0x3A
- ldrsh r0, [r4, r1]
- lsls r0, 1
- adds r0, r5, r0
- ldrh r0, [r0]
- strh r0, [r4, 0x26]
-_08105CDE:
- add sp, 0x10
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08105CE8: .4byte gUnknown_083ECC62
-_08105CEC: .4byte gUnknown_083ECC6A
- thumb_func_end sub_8105C6C
-
- thumb_func_start sub_8105CF0
-sub_8105CF0: @ 8105CF0
- push {lr}
- adds r3, r0, 0
- adds r3, 0x3F
- ldrb r1, [r3]
- movs r2, 0x1
- orrs r1, r2
- strb r1, [r3]
- bl sub_8105C6C
- pop {r0}
- bx r0
- thumb_func_end sub_8105CF0
-
- thumb_func_start sub_8105D08
-sub_8105D08: @ 8105D08
- push {lr}
- adds r3, r0, 0
- adds r3, 0x3F
- ldrb r1, [r3]
- movs r2, 0x2
- orrs r1, r2
- strb r1, [r3]
- bl sub_8105C6C
- pop {r0}
- bx r0
- thumb_func_end sub_8105D08
-
- thumb_func_start sub_8105D20
-sub_8105D20: @ 8105D20
- push {lr}
- adds r3, r0, 0
- adds r3, 0x3F
- ldrb r1, [r3]
- movs r2, 0x1
- orrs r1, r2
- movs r2, 0x2
- orrs r1, r2
- strb r1, [r3]
- bl sub_8105C6C
- pop {r0}
- bx r0
- thumb_func_end sub_8105D20
-
- thumb_func_start sub_8105D3C
-sub_8105D3C: @ 8105D3C
- push {lr}
- adds r2, r0, 0
- movs r1, 0x2E
- ldrsh r0, [r2, r1]
- cmp r0, 0x1
- beq _08105D70
- cmp r0, 0x1
- bgt _08105D52
- cmp r0, 0
- beq _08105D5C
- b _08105DA0
-_08105D52:
- cmp r0, 0x2
- beq _08105D80
- cmp r0, 0x3
- beq _08105D9C
- b _08105DA0
-_08105D5C:
- ldrh r0, [r2, 0x20]
- adds r0, 0x4
- strh r0, [r2, 0x20]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xCF
- ble _08105DA0
- movs r0, 0xD0
- strh r0, [r2, 0x20]
- b _08105D8E
-_08105D70:
- ldrh r0, [r2, 0x30]
- adds r0, 0x1
- strh r0, [r2, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x5A
- ble _08105DA0
- b _08105D8E
-_08105D80:
- ldrh r0, [r2, 0x20]
- adds r0, 0x4
- strh r0, [r2, 0x20]
- lsls r0, 16
- ldr r1, _08105D98 @ =0x010f0000
- cmp r0, r1
- ble _08105DA0
-_08105D8E:
- ldrh r0, [r2, 0x2E]
- adds r0, 0x1
- strh r0, [r2, 0x2E]
- b _08105DA0
- .align 2, 0
-_08105D98: .4byte 0x010f0000
-_08105D9C:
- movs r0, 0
- strh r0, [r2, 0x3C]
-_08105DA0:
- pop {r0}
- bx r0
- thumb_func_end sub_8105D3C
-
- thumb_func_start sub_8105DA4
-sub_8105DA4: @ 8105DA4
- push {lr}
- adds r1, r0, 0
- movs r2, 0x2E
- ldrsh r0, [r1, r2]
- cmp r0, 0x1
- beq _08105DD8
- cmp r0, 0x1
- bgt _08105DBA
- cmp r0, 0
- beq _08105DC4
- b _08105E02
-_08105DBA:
- cmp r0, 0x2
- beq _08105DE8
- cmp r0, 0x3
- beq _08105DFE
- b _08105E02
-_08105DC4:
- ldrh r0, [r1, 0x20]
- subs r0, 0x4
- strh r0, [r1, 0x20]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xD0
- bgt _08105E02
- movs r0, 0xD0
- strh r0, [r1, 0x20]
- b _08105DF6
-_08105DD8:
- ldrh r0, [r1, 0x30]
- adds r0, 0x1
- strh r0, [r1, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x5A
- ble _08105E02
- b _08105DF6
-_08105DE8:
- ldrh r0, [r1, 0x20]
- subs r0, 0x4
- strh r0, [r1, 0x20]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x90
- bgt _08105E02
-_08105DF6:
- ldrh r0, [r1, 0x2E]
- adds r0, 0x1
- strh r0, [r1, 0x2E]
- b _08105E02
-_08105DFE:
- movs r0, 0
- strh r0, [r1, 0x3C]
-_08105E02:
- pop {r0}
- bx r0
- thumb_func_end sub_8105DA4
-
- thumb_func_start sub_8105E08
-sub_8105E08: @ 8105E08
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- cmp r0, 0x5
- bhi _08105EAE
- lsls r0, 2
- ldr r1, _08105E20 @ =_08105E24
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_08105E20: .4byte _08105E24
- .align 2, 0
-_08105E24:
- .4byte _08105E3C
- .4byte _08105E52
- .4byte _08105E70
- .4byte _08105E84
- .4byte _08105E94
- .4byte _08105EAA
-_08105E3C:
- ldr r0, _08105E6C @ =gSharedMem
- ldrb r1, [r0, 0xA]
- subs r1, 0x1
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl StartSpriteAnim
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
-_08105E52:
- ldrh r0, [r4, 0x30]
- adds r0, 0x1
- strh r0, [r4, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x3
- ble _08105EAE
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
- movs r0, 0
- strh r0, [r4, 0x30]
- b _08105EAE
- .align 2, 0
-_08105E6C: .4byte gSharedMem
-_08105E70:
- ldrh r0, [r4, 0x20]
- adds r0, 0x4
- strh r0, [r4, 0x20]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xCF
- ble _08105EAE
- movs r0, 0xD0
- strh r0, [r4, 0x20]
- b _08105EA2
-_08105E84:
- ldrh r0, [r4, 0x30]
- adds r0, 0x1
- strh r0, [r4, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x5A
- ble _08105EAE
- b _08105EA2
-_08105E94:
- ldrh r0, [r4, 0x20]
- adds r0, 0x4
- strh r0, [r4, 0x20]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xF7
- ble _08105EAE
-_08105EA2:
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
- b _08105EAE
-_08105EAA:
- movs r0, 0
- strh r0, [r4, 0x3C]
-_08105EAE:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8105E08
-
- thumb_func_start sub_8105EB4
-sub_8105EB4: @ 8105EB4
- push {lr}
- adds r3, r0, 0
- movs r1, 0x2E
- ldrsh r0, [r3, r1]
- cmp r0, 0x1
- beq _08105EE2
- cmp r0, 0x1
- bgt _08105ECA
- cmp r0, 0
- beq _08105ED0
- b _08105F50
-_08105ECA:
- cmp r0, 0x2
- beq _08105F00
- b _08105F50
-_08105ED0:
- adds r2, r3, 0
- adds r2, 0x2C
- ldrb r0, [r2]
- movs r1, 0x40
- orrs r0, r1
- strb r0, [r2]
- ldrh r0, [r3, 0x2E]
- adds r0, 0x1
- strh r0, [r3, 0x2E]
-_08105EE2:
- ldrh r0, [r3, 0x22]
- adds r0, 0x8
- strh r0, [r3, 0x22]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x6F
- ble _08105F50
- movs r0, 0x70
- strh r0, [r3, 0x22]
- movs r0, 0x10
- strh r0, [r3, 0x30]
- ldrh r0, [r3, 0x2E]
- adds r0, 0x1
- strh r0, [r3, 0x2E]
- b _08105F50
-_08105F00:
- movs r0, 0x32
- ldrsh r2, [r3, r0]
- cmp r2, 0
- bne _08105F46
- ldrh r0, [r3, 0x22]
- ldrh r1, [r3, 0x30]
- subs r0, r1
- strh r0, [r3, 0x22]
- negs r1, r1
- strh r1, [r3, 0x30]
- ldrh r0, [r3, 0x34]
- adds r0, 0x1
- strh r0, [r3, 0x34]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x1
- ble _08105F46
- lsls r0, r1, 16
- asrs r0, 18
- strh r0, [r3, 0x30]
- strh r2, [r3, 0x34]
- adds r1, r0, 0
- cmp r1, 0
- bne _08105F46
- ldrh r0, [r3, 0x2E]
- adds r0, 0x1
- strh r0, [r3, 0x2E]
- strh r1, [r3, 0x3C]
- adds r2, r3, 0
- adds r2, 0x2C
- ldrb r1, [r2]
- movs r0, 0x41
- negs r0, r0
- ands r0, r1
- strb r0, [r2]
-_08105F46:
- ldrh r0, [r3, 0x32]
- adds r0, 0x1
- movs r1, 0x7
- ands r0, r1
- strh r0, [r3, 0x32]
-_08105F50:
- pop {r0}
- bx r0
- thumb_func_end sub_8105EB4
-
- thumb_func_start sub_8105F54
-sub_8105F54: @ 8105F54
- push {lr}
- adds r1, r0, 0
- movs r2, 0x2E
- ldrsh r0, [r1, r2]
- cmp r0, 0
- beq _08105F66
- cmp r0, 0x1
- beq _08105F7C
- b _08105F98
-_08105F66:
- ldrh r0, [r1, 0x30]
- adds r0, 0x1
- strh r0, [r1, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x8
- ble _08105F98
- ldrh r0, [r1, 0x2E]
- adds r0, 0x1
- strh r0, [r1, 0x2E]
- b _08105F98
-_08105F7C:
- ldrh r0, [r1, 0x22]
- adds r0, 0x2
- strh r0, [r1, 0x22]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x2F
- ble _08105F98
- movs r0, 0x30
- strh r0, [r1, 0x22]
- ldrh r0, [r1, 0x2E]
- adds r0, 0x1
- strh r0, [r1, 0x2E]
- movs r0, 0
- strh r0, [r1, 0x3C]
-_08105F98:
- pop {r0}
- bx r0
- thumb_func_end sub_8105F54
-
- thumb_func_start sub_8105F9C
-sub_8105F9C: @ 8105F9C
- push {r4,lr}
- adds r4, r0, 0
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _08105FAE
- cmp r0, 0x1
- beq _08106000
- b _0810604E
-_08105FAE:
- adds r2, r4, 0
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- ldrh r0, [r4, 0x30]
- adds r0, 0x1
- strh r0, [r4, 0x30]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x20
- ble _0810604E
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
- movs r0, 0x5
- strh r0, [r4, 0x30]
- ldrb r0, [r4, 0x1]
- movs r1, 0x10
- orrs r0, r1
- strb r0, [r4, 0x1]
- ldrb r1, [r2]
- movs r0, 0x5
- negs r0, r0
- ands r0, r1
- strb r0, [r2]
- adds r0, r4, 0
- movs r1, 0x1
- bl StartSpriteAnim
- ldr r2, _08105FFC @ =REG_MOSAIC
- ldrh r1, [r4, 0x30]
- lsls r0, r1, 4
- orrs r0, r1
- lsls r0, 8
- strh r0, [r2]
- b _0810604E
- .align 2, 0
-_08105FFC: .4byte REG_MOSAIC
-_08106000:
- ldrh r1, [r4, 0x32]
- lsls r1, 16
- asrs r1, 24
- ldrh r0, [r4, 0x30]
- subs r0, r1
- strh r0, [r4, 0x30]
- lsls r0, 16
- cmp r0, 0
- bge _08106016
- movs r0, 0
- strh r0, [r4, 0x30]
-_08106016:
- ldr r2, _08106054 @ =REG_MOSAIC
- ldrh r1, [r4, 0x30]
- lsls r0, r1, 4
- orrs r0, r1
- lsls r0, 8
- strh r0, [r2]
- ldrh r1, [r4, 0x32]
- movs r0, 0xFF
- ands r0, r1
- adds r0, 0x80
- strh r0, [r4, 0x32]
- movs r0, 0x30
- ldrsh r1, [r4, r0]
- cmp r1, 0
- bne _0810604E
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
- strh r1, [r4, 0x3C]
- ldrb r1, [r4, 0x1]
- movs r0, 0x11
- negs r0, r0
- ands r0, r1
- strb r0, [r4, 0x1]
- adds r0, r4, 0
- movs r1, 0
- bl StartSpriteAnim
-_0810604E:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08106054: .4byte REG_MOSAIC
- thumb_func_end sub_8105F9C
-
- thumb_func_start sub_8106058
-sub_8106058: @ 8106058
- push {r4,r5,lr}
- adds r5, r0, 0
- movs r1, 0x30
- ldrsh r0, [r5, r1]
- cmp r0, 0x2
- bgt _081060A8
- ldr r1, _081060A4 @ =gUnknown_083EDE10
- lsls r0, 2
- adds r0, r1
- ldr r4, [r0]
- movs r0, 0x6
- bl IndexOfSpritePaletteTag
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 4
- movs r0, 0x80
- lsls r0, 17
- adds r1, r0
- lsrs r1, 16
- adds r0, r4, 0
- movs r2, 0x20
- bl LoadPalette
- ldrh r0, [r5, 0x32]
- adds r0, 0x1
- strh r0, [r5, 0x32]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x3
- ble _081060E4
- ldrh r0, [r5, 0x30]
- adds r0, 0x1
- strh r0, [r5, 0x30]
- movs r0, 0
- strh r0, [r5, 0x32]
- b _081060E4
- .align 2, 0
-_081060A4: .4byte gUnknown_083EDE10
-_081060A8:
- ldr r1, _081060F8 @ =gUnknown_083EDE10
- movs r2, 0x30
- ldrsh r0, [r5, r2]
- lsls r0, 2
- adds r0, r1
- ldr r4, [r0]
- movs r0, 0x6
- bl IndexOfSpritePaletteTag
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 4
- movs r0, 0x80
- lsls r0, 17
- adds r1, r0
- lsrs r1, 16
- adds r0, r4, 0
- movs r2, 0x20
- bl LoadPalette
- ldrh r0, [r5, 0x32]
- adds r0, 0x1
- movs r1, 0
- strh r0, [r5, 0x32]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x18
- ble _081060E4
- strh r1, [r5, 0x30]
- strh r1, [r5, 0x32]
-_081060E4:
- adds r0, r5, 0
- movs r1, 0x1
- bl StartSpriteAnimIfDifferent
- movs r0, 0
- strh r0, [r5, 0x3C]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_081060F8: .4byte gUnknown_083EDE10
- thumb_func_end sub_8106058
-
- thumb_func_start sub_81060FC
-sub_81060FC: @ 81060FC
- push {r4-r6,lr}
- sub sp, 0x30
- adds r4, r0, 0
- ldr r1, _08106138 @ =gUnknown_083ECC72
- mov r0, sp
- movs r2, 0x10
- bl memcpy
- add r6, sp, 0x10
- ldr r1, _0810613C @ =gUnknown_083ECC82
- adds r0, r6, 0
- movs r2, 0x10
- bl memcpy
- add r5, sp, 0x20
- ldr r1, _08106140 @ =gUnknown_083ECC92
- adds r0, r5, 0
- movs r2, 0x10
- bl memcpy
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- cmp r0, 0x1
- beq _08106174
- cmp r0, 0x1
- bgt _08106144
- cmp r0, 0
- beq _0810614A
- b _081061C0
- .align 2, 0
-_08106138: .4byte gUnknown_083ECC72
-_0810613C: .4byte gUnknown_083ECC82
-_08106140: .4byte gUnknown_083ECC92
-_08106144:
- cmp r0, 0x2
- beq _08106188
- b _081061C0
-_0810614A:
- movs r2, 0x3A
- ldrsh r0, [r4, r2]
- lsls r0, 1
- add r0, sp
- ldrh r0, [r0]
- strh r0, [r4, 0x24]
- movs r1, 0x3A
- ldrsh r0, [r4, r1]
- lsls r0, 1
- adds r0, r6, r0
- ldrh r0, [r0]
- strh r0, [r4, 0x26]
- movs r2, 0x3A
- ldrsh r0, [r4, r2]
- lsls r0, 1
- adds r0, r5, r0
- ldrh r0, [r0]
- strh r0, [r4, 0x30]
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
-_08106174:
- ldrh r0, [r4, 0x30]
- subs r0, 0x1
- strh r0, [r4, 0x30]
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- negs r1, r1
- cmp r0, r1
- bne _081061C0
- b _081061BA
-_08106188:
- ldrh r0, [r4, 0x24]
- movs r2, 0x24
- ldrsh r1, [r4, r2]
- cmp r1, 0
- ble _08106196
- subs r0, 0x4
- b _0810619C
-_08106196:
- cmp r1, 0
- bge _0810619E
- adds r0, 0x4
-_0810619C:
- strh r0, [r4, 0x24]
-_0810619E:
- ldrh r0, [r4, 0x26]
- movs r2, 0x26
- ldrsh r1, [r4, r2]
- cmp r1, 0
- ble _081061AC
- subs r0, 0x4
- b _081061B2
-_081061AC:
- cmp r1, 0
- bge _081061B4
- adds r0, 0x4
-_081061B2:
- strh r0, [r4, 0x26]
-_081061B4:
- ldr r0, [r4, 0x24]
- cmp r0, 0
- bne _081061C0
-_081061BA:
- ldrh r0, [r4, 0x2E]
- adds r0, 0x1
- strh r0, [r4, 0x2E]
-_081061C0:
- add sp, 0x30
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_81060FC
-
- thumb_func_start sub_81061C8
-sub_81061C8: @ 81061C8
- push {r4,lr}
- sub sp, 0x10
- adds r4, r0, 0
- ldr r1, _0810622C @ =gUnknown_083ECCA2
- mov r0, sp
- movs r2, 0x10
- bl memcpy
- ldrh r1, [r4, 0x2E]
- movs r2, 0x2E
- ldrsh r0, [r4, r2]
- cmp r0, 0
- bne _081061EA
- adds r0, r1, 0x1
- strh r0, [r4, 0x2E]
- movs r0, 0xC
- strh r0, [r4, 0x30]
-_081061EA:
- movs r1, 0x3A
- ldrsh r0, [r4, r1]
- lsls r0, 1
- add r0, sp
- movs r2, 0
- ldrsh r0, [r0, r2]
- movs r2, 0x30
- ldrsh r1, [r4, r2]
- bl Cos
- strh r0, [r4, 0x24]
- movs r1, 0x3A
- ldrsh r0, [r4, r1]
- lsls r0, 1
- add r0, sp
- movs r2, 0
- ldrsh r0, [r0, r2]
- movs r2, 0x30
- ldrsh r1, [r4, r2]
- bl Sin
- strh r0, [r4, 0x26]
- ldrh r1, [r4, 0x30]
- movs r2, 0x30
- ldrsh r0, [r4, r2]
- cmp r0, 0
- beq _08106224
- subs r0, r1, 0x1
- strh r0, [r4, 0x30]
-_08106224:
- add sp, 0x10
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0810622C: .4byte gUnknown_083ECCA2
- thumb_func_end sub_81061C8
-
- thumb_func_start sub_8106230
-sub_8106230: @ 8106230
- push {r4-r6,lr}
- sub sp, 0x4
- adds r5, r0, 0
- movs r1, 0x2E
- ldrsh r0, [r5, r1]
- cmp r0, 0x1
- beq _0810627A
- cmp r0, 0x1
- bgt _08106248
- cmp r0, 0
- beq _08106252
- b _0810634A
-_08106248:
- cmp r0, 0x2
- beq _081062C4
- cmp r0, 0x3
- beq _081062FC
- b _0810634A
-_08106252:
- ldr r2, _081062BC @ =gSharedMem
- adds r1, r2, 0
- adds r1, 0x5C
- movs r0, 0x2F
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0x3F
- strh r0, [r1]
- subs r1, 0x4
- ldr r0, _081062C0 @ =0x00002088
- strh r0, [r1]
- adds r2, r5, 0
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r2]
- ldrh r0, [r5, 0x2E]
- adds r0, 0x1
- strh r0, [r5, 0x2E]
-_0810627A:
- ldrh r0, [r5, 0x30]
- adds r2, r0, 0x2
- strh r2, [r5, 0x30]
- adds r0, 0xB2
- strh r0, [r5, 0x32]
- movs r1, 0xF0
- subs r1, r2
- strh r1, [r5, 0x34]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xD0
- ble _08106296
- movs r0, 0xD0
- strh r0, [r5, 0x32]
-_08106296:
- movs r1, 0x34
- ldrsh r0, [r5, r1]
- cmp r0, 0xCF
- bgt _081062A2
- movs r0, 0xD0
- strh r0, [r5, 0x34]
-_081062A2:
- ldr r2, _081062BC @ =gSharedMem
- ldrh r0, [r5, 0x32]
- lsls r0, 8
- ldrh r1, [r5, 0x34]
- orrs r0, r1
- adds r1, r2, 0
- adds r1, 0x58
- strh r0, [r1]
- movs r1, 0x30
- ldrsh r0, [r5, r1]
- cmp r0, 0x33
- ble _0810634A
- b _0810633C
- .align 2, 0
-_081062BC: .4byte gSharedMem
-_081062C0: .4byte 0x00002088
-_081062C4:
- ldr r6, _08106354 @ =gSharedMem
- movs r1, 0x12
- ldrsh r0, [r6, r1]
- cmp r0, 0
- beq _0810634A
- ldr r1, _08106358 @ =SpriteCallbackDummy
- movs r4, 0
- str r4, [sp]
- movs r0, 0x5
- movs r2, 0xD0
- movs r3, 0x74
- bl sub_8104D30
- adds r1, r6, 0
- adds r1, 0x58
- ldr r0, _0810635C @ =0x0000c0e0
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0xD1
- lsls r0, 7
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0x2F
- strh r0, [r1]
- ldrh r0, [r5, 0x2E]
- adds r0, 0x1
- strh r0, [r5, 0x2E]
- strh r4, [r5, 0x30]
-_081062FC:
- ldrh r0, [r5, 0x30]
- adds r2, r0, 0x2
- strh r2, [r5, 0x30]
- adds r0, 0xC2
- strh r0, [r5, 0x32]
- movs r1, 0xE0
- subs r1, r2
- strh r1, [r5, 0x34]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xD0
- ble _08106318
- movs r0, 0xD0
- strh r0, [r5, 0x32]
-_08106318:
- movs r1, 0x34
- ldrsh r0, [r5, r1]
- cmp r0, 0xCF
- bgt _08106324
- movs r0, 0xD0
- strh r0, [r5, 0x34]
-_08106324:
- ldr r2, _08106354 @ =gSharedMem
- ldrh r0, [r5, 0x32]
- lsls r0, 8
- ldrh r1, [r5, 0x34]
- orrs r0, r1
- adds r1, r2, 0
- adds r1, 0x58
- strh r0, [r1]
- movs r1, 0x30
- ldrsh r0, [r5, r1]
- cmp r0, 0xF
- ble _0810634A
-_0810633C:
- ldrh r0, [r5, 0x2E]
- adds r0, 0x1
- strh r0, [r5, 0x2E]
- adds r1, r2, 0
- adds r1, 0x5C
- movs r0, 0x3F
- strh r0, [r1]
-_0810634A:
- add sp, 0x4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08106354: .4byte gSharedMem
-_08106358: .4byte SpriteCallbackDummy
-_0810635C: .4byte 0x0000c0e0
- thumb_func_end sub_8106230
-
- thumb_func_start nullsub_70
-nullsub_70: @ 8106360
- bx lr
- thumb_func_end nullsub_70
-
- thumb_func_start sub_8106364
-sub_8106364: @ 8106364
- ldr r1, _0810636C @ =REG_MOSAIC
- movs r0, 0
- strh r0, [r1]
- bx lr
- .align 2, 0
-_0810636C: .4byte REG_MOSAIC
- thumb_func_end sub_8106364
-
- thumb_func_start sub_8106370
-sub_8106370: @ 8106370
- push {r4,lr}
- ldr r0, _08106398 @ =gUnknown_083EDE20
- ldr r4, [r0]
- movs r0, 0x6
- bl IndexOfSpritePaletteTag
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 4
- movs r0, 0x80
- lsls r0, 17
- adds r1, r0
- lsrs r1, 16
- adds r0, r4, 0
- movs r2, 0x20
- bl LoadPalette
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08106398: .4byte gUnknown_083EDE20
- thumb_func_end sub_8106370
-
- thumb_func_start sub_810639C
-sub_810639C: @ 810639C
- ldr r2, _081063BC @ =gSharedMem
- adds r1, r2, 0
- adds r1, 0x58
- movs r0, 0xF0
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0xA0
- strh r0, [r1]
- adds r0, r2, 0
- adds r0, 0x5C
- movs r1, 0x3F
- strh r1, [r0]
- adds r0, 0x2
- strh r1, [r0]
- bx lr
- .align 2, 0
-_081063BC: .4byte gSharedMem
- thumb_func_end sub_810639C
-
- thumb_func_start sub_81063C0
-sub_81063C0: @ 81063C0
- push {r4,lr}
- bl sub_8106404
- ldr r0, _081063F0 @ =gSlotMachineReelTimeLights_Gfx
- ldr r4, _081063F4 @ =gSharedMem + 0x10000
- adds r1, r4, 0
- bl LZDecompressWram
- ldr r0, _081063F8 @ =gUnknown_083EDE8C
- movs r1, 0xC8
- lsls r1, 6
- adds r4, r1
- adds r1, r4, 0
- bl LZDecompressWram
- ldr r0, _081063FC @ =gUnknown_083EDC2C
- bl LoadSpriteSheets
- ldr r0, _08106400 @ =gSlotMachineSpritePalettes
- bl LoadSpritePalettes
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081063F0: .4byte gSlotMachineReelTimeLights_Gfx
-_081063F4: .4byte gSharedMem + 0x10000
-_081063F8: .4byte gUnknown_083EDE8C
-_081063FC: .4byte gUnknown_083EDC2C
-_08106400: .4byte gSlotMachineSpritePalettes
- thumb_func_end sub_81063C0
-
- thumb_func_start sub_8106404
-sub_8106404: @ 8106404
- push {r4,r5,lr}
- ldr r3, _0810643C @ =gSharedMem + 0x10000
- movs r2, 0
- ldr r5, _08106440 @ =gUnknown_083EDCDC
- ldr r0, _08106444 @ =gUnknown_083EDCE4
- ldr r4, [r0]
-_08106410:
- movs r1, 0
- adds r2, 0x1
-_08106414:
- adds r0, r4, r1
- ldrb r0, [r0]
- strb r0, [r3]
- adds r0, r1, 0x1
- lsls r0, 24
- lsrs r1, r0, 24
- adds r3, 0x1
- cmp r1, 0x1F
- bls _08106414
- lsls r0, r2, 24
- lsrs r2, r0, 24
- cmp r2, 0x3F
- bls _08106410
- adds r0, r5, 0
- bl LoadSpriteSheet
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0810643C: .4byte gSharedMem + 0x10000
-_08106440: .4byte gUnknown_083EDCDC
-_08106444: .4byte gUnknown_083EDCE4
- thumb_func_end sub_8106404
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/water.s b/asm/water.s
index 4bf95ab59..d72f9438c 100755
--- a/asm/water.s
+++ b/asm/water.s
@@ -23,16 +23,16 @@ sub_80D3B60: @ 80D3B60
lsls r4, 3
adds r4, r0
ldrh r0, [r4, 0x8]
- ldr r1, _080D3D48 @ =gUnknown_030042C0
+ ldr r1, _080D3D48 @ =gBattle_BG1_X
ldrh r1, [r1]
adds r0, r1
- ldr r2, _080D3D48 @ =gUnknown_030042C0
+ ldr r2, _080D3D48 @ =gBattle_BG1_X
strh r0, [r2]
ldrh r0, [r4, 0xA]
- ldr r3, _080D3D4C @ =gUnknown_030041B4
+ ldr r3, _080D3D4C @ =gBattle_BG1_Y
ldrh r3, [r3]
adds r0, r3
- ldr r1, _080D3D4C @ =gUnknown_030041B4
+ ldr r1, _080D3D4C @ =gBattle_BG1_Y
strh r0, [r1]
add r5, sp, 0x4
adds r0, r5, 0
@@ -211,7 +211,7 @@ _080D3CAA:
ldr r1, _080D3D58 @ =0x85000400
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D3D02
@@ -222,9 +222,9 @@ _080D3CAA:
ands r0, r1
strb r0, [r2]
_080D3D02:
- ldr r0, _080D3D48 @ =gUnknown_030042C0
+ ldr r0, _080D3D48 @ =gBattle_BG1_X
strh r4, [r0]
- ldr r1, _080D3D4C @ =gUnknown_030041B4
+ ldr r1, _080D3D4C @ =gBattle_BG1_Y
strh r4, [r1]
ldr r0, _080D3D60 @ =REG_BLDCNT
strh r4, [r0]
@@ -256,8 +256,8 @@ _080D3D32:
bx r0
.align 2, 0
_080D3D44: .4byte gTasks
-_080D3D48: .4byte gUnknown_030042C0
-_080D3D4C: .4byte gUnknown_030041B4
+_080D3D48: .4byte gBattle_BG1_X
+_080D3D4C: .4byte gBattle_BG1_Y
_080D3D50: .4byte gPlttBufferFaded
_080D3D54: .4byte 0x040000d4
_080D3D58: .4byte 0x85000400
@@ -739,7 +739,7 @@ _080D40D0:
cmp r0, 0x15
bne _080D40EE
adds r0, r2, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D40EE:
pop {r4}
pop {r0}
@@ -1083,7 +1083,7 @@ _080D438A:
thumb_func_start sub_80D4394
sub_80D4394: @ 80D4394
push {r4,r5,lr}
- ldr r4, _080D43B8 @ =gBattleAnimBankAttacker
+ ldr r4, _080D43B8 @ =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -1099,7 +1099,7 @@ sub_80D4394: @ 80D4394
ldr r0, _080D43C0 @ =gPlayerParty
b _080D43D8
.align 2, 0
-_080D43B8: .4byte gBattleAnimBankAttacker
+_080D43B8: .4byte gAnimBankAttacker
_080D43BC: .4byte gBattlePartyID
_080D43C0: .4byte gPlayerParty
_080D43C4:
@@ -1160,16 +1160,16 @@ sub_80D4418: @ 80D4418
lsls r1, 24
lsrs r1, 24
str r1, [sp]
- ldr r4, _080D4520 @ =gBattleAnimBankAttacker
+ ldr r4, _080D4520 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0xAC
@@ -1280,7 +1280,7 @@ _080D44EA:
pop {r0}
bx r0
.align 2, 0
-_080D4520: .4byte gBattleAnimBankAttacker
+_080D4520: .4byte gAnimBankAttacker
_080D4524: .4byte gSpriteTemplate_83D9378
_080D4528: .4byte gSprites
thumb_func_end sub_80D4418
@@ -1390,7 +1390,7 @@ sub_80D45D8: @ 80D45D8
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
- ldr r0, _080D460C @ =gBattleAnimBankAttacker
+ ldr r0, _080D460C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -1402,7 +1402,7 @@ sub_80D45D8: @ 80D45D8
b _080D4616
.align 2, 0
_080D4608: .4byte gTasks
-_080D460C: .4byte gBattleAnimBankAttacker
+_080D460C: .4byte gAnimBankAttacker
_080D4610:
movs r0, 0x10
strh r0, [r4, 0x10]
@@ -1788,17 +1788,17 @@ sub_80D48F4: @ 80D48F4
lsls r1, 3
ldr r0, _080D4978 @ =gTasks
adds r5, r1, r0
- ldr r4, _080D497C @ =gBattleAnimBankAttacker
+ ldr r4, _080D497C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -1813,7 +1813,7 @@ sub_80D48F4: @ 80D48F4
movs r1, 0x1
_080D4938:
strh r1, [r5, 0x16]
- bl NotInBattle
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D494C
@@ -1845,7 +1845,7 @@ _080D494C:
bx r0
.align 2, 0
_080D4978: .4byte gTasks
-_080D497C: .4byte gBattleAnimBankAttacker
+_080D497C: .4byte gAnimBankAttacker
_080D4980: .4byte 0x0000ffe0
_080D4984: .4byte sub_80D4988
thumb_func_end sub_80D48F4
@@ -2218,7 +2218,7 @@ sub_80D4C18: @ 80D4C18
cmp r0, 0
bne _080D4C5C
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D4C5C:
pop {r4}
pop {r0}
@@ -2265,16 +2265,16 @@ sub_80D4CA4: @ 80D4CA4
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r5, _080D4CE0 @ =gBattleAnimBankTarget
+ ldr r5, _080D4CE0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8077ABC
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -2289,7 +2289,7 @@ sub_80D4CA4: @ 80D4CA4
pop {r0}
bx r0
.align 2, 0
-_080D4CE0: .4byte gBattleAnimBankTarget
+_080D4CE0: .4byte gAnimBankTarget
_080D4CE4: .4byte gBattleAnimArgs
_080D4CE8: .4byte sub_80D4CEC
thumb_func_end sub_80D4CA4
@@ -2345,7 +2345,7 @@ _080D4D44:
cmp r1, r0
bne _080D4D56
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D4D56:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -2443,7 +2443,7 @@ _080D4DF2:
strh r0, [r4, 0x2E]
mov r0, r9
strh r0, [r4, 0x30]
- ldr r0, _080D4E3C @ =gBattleAnimBankAttacker
+ ldr r0, _080D4E3C @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
@@ -2459,7 +2459,7 @@ _080D4DF2:
.align 2, 0
_080D4E34: .4byte gSpriteTemplate_83D9420
_080D4E38: .4byte gSprites
-_080D4E3C: .4byte gBattleAnimBankAttacker
+_080D4E3C: .4byte gAnimBankAttacker
_080D4E40:
strh r7, [r4, 0x32]
_080D4E42:
@@ -2501,7 +2501,7 @@ _080D4E68:
strh r0, [r4, 0x2E]
mov r0, r9
strh r0, [r4, 0x30]
- ldr r0, _080D4EB4 @ =gBattleAnimBankAttacker
+ ldr r0, _080D4EB4 @ =gAnimBankAttacker
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
@@ -2517,7 +2517,7 @@ _080D4E68:
.align 2, 0
_080D4EAC: .4byte gSpriteTemplate_83D9420
_080D4EB0: .4byte gSprites
-_080D4EB4: .4byte gBattleAnimBankAttacker
+_080D4EB4: .4byte gAnimBankAttacker
_080D4EB8:
strh r7, [r4, 0x32]
_080D4EBA:
diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s
index a22903e6b..a6407589f 100755
--- a/asm/wisp_fire.s
+++ b/asm/wisp_fire.s
@@ -63,7 +63,7 @@ _080D5CD8:
lsrs r0, 16
cmp r0, 0x83
bls _080D5D5C
- ldr r0, _080D5D58 @ =gBattleAnimBankTarget
+ ldr r0, _080D5D58 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -80,9 +80,9 @@ _080D5CD8:
_080D5D4C: .4byte gBattleAnimArgs
_080D5D50: .4byte gMain
_080D5D54: .4byte 0x0000043d
-_080D5D58: .4byte gBattleAnimBankTarget
+_080D5D58: .4byte gAnimBankTarget
_080D5D5C:
- ldr r0, _080D5D80 @ =gBattleAnimBankTarget
+ ldr r0, _080D5D80 @ =gAnimBankTarget
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -99,7 +99,7 @@ _080D5D5C:
strb r1, [r4, 0x5]
b _080D5DA0
.align 2, 0
-_080D5D80: .4byte gBattleAnimBankTarget
+_080D5D80: .4byte gAnimBankTarget
_080D5D84:
adds r0, r2, 0
subs r0, 0x40
@@ -144,7 +144,7 @@ _080D5DC8:
cmp r0, 0x1E
bne _080D5DD6
adds r0, r4, 0
- bl move_anim_8072740
+ bl DestroyAnimSprite
_080D5DD6:
pop {r4}
pop {r0}
@@ -161,7 +161,7 @@ sub_80D5DDC: @ 80D5DDC
lsls r1, 3
ldr r0, _080D5E3C @ =gTasks
adds r4, r1, r0
- ldr r0, _080D5E40 @ =gBattleAnimBankAttacker
+ ldr r0, _080D5E40 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -173,7 +173,7 @@ sub_80D5DDC: @ 80D5DDC
movs r1, 0x1
_080D5E02:
strh r1, [r4, 0x20]
- ldr r0, _080D5E44 @ =gBattleAnimBankTarget
+ ldr r0, _080D5E44 @ =gAnimBankTarget
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -199,8 +199,8 @@ _080D5E02:
bx r0
.align 2, 0
_080D5E3C: .4byte gTasks
-_080D5E40: .4byte gBattleAnimBankAttacker
-_080D5E44: .4byte gBattleAnimBankTarget
+_080D5E40: .4byte gAnimBankAttacker
+_080D5E44: .4byte gAnimBankTarget
_080D5E48: .4byte sub_80D5E4C
thumb_func_end sub_80D5DDC
@@ -570,7 +570,7 @@ _080D60EA:
adds r0, 0x1
strh r0, [r2, 0x8]
ldr r1, _080D6114 @ =gObjectBankIDs
- ldr r0, _080D6118 @ =gBattleAnimBankTarget
+ ldr r0, _080D6118 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
ldrb r6, [r0]
@@ -586,7 +586,7 @@ _080D60EA:
_080D610C: .4byte gTasks
_080D6110: .4byte gBattleAnimArgs
_080D6114: .4byte gObjectBankIDs
-_080D6118: .4byte gBattleAnimBankTarget
+_080D6118: .4byte gAnimBankTarget
_080D611C: .4byte gUnknown_083D9794
_080D6120:
ldr r4, _080D616C @ =gUnknown_083D97A4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 13:11:55 +0000