dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #86 from jiangzhengwenjz/battle

Browse Source 
battle
This commit is contained in:
PikalaxALT
2019-09-25 13:49:34 -04:00
committed by GitHub
parent 6539884c88 0e217e22d8
commit 44f8d694ce
150 changed files with 30345 additions and 93096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+19 -19
View File
@@ -523,7 +523,7 @@ sub_800F5CC: @ 800F5CC
bne _0800F5E8
ldr r0, _0800F5E4 @ =gUnknown_83FE883
movs r1, 0x15
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F5E0: .4byte gBattleOutcome
@@ -609,10 +609,10 @@ _0800F666:
_0800F682:
ldr r0, _0800F69C @ =gUnknown_83FE874
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6A0 @ =gUnknown_83FE87B
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F694: .4byte gLinkPlayers
@@ -635,10 +635,10 @@ _0800F6A4:
_0800F6BC:
ldr r0, _0800F6D8 @ =gUnknown_83FE874
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6DC @ =gUnknown_83FE87B
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F6D0: .4byte gLinkPlayers
@@ -648,10 +648,10 @@ _0800F6DC: .4byte gUnknown_83FE87B
_0800F6E0:
ldr r0, _0800F6F4 @ =gUnknown_83FE874
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6F8 @ =gUnknown_83FE87B
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
_0800F6F0:
pop {r0}
bx r0
@@ -727,14 +727,14 @@ _0800F764:
_0800F76E:
adds r0, r1, 0
movs r1, 0x11
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x4
b _0800F79C
_0800F77C:
adds r0, r1, 0
movs r1, 0x12
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x4
str r0, [sp]
@@ -744,7 +744,7 @@ _0800F77C:
_0800F790:
adds r0, r1, 0
movs r1, 0x13
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x8
_0800F79C:
@@ -758,7 +758,7 @@ _0800F7A2:
_0800F7AA:
adds r0, r1, 0
movs r1, 0x14
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x8
str r0, [sp]
@@ -799,14 +799,14 @@ _0800F7F0:
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0xF
bl sub_80D87BC
bl BattlePutTextOnWindow
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0x10
bl sub_80D87BC
bl BattlePutTextOnWindow
movs r4, 0x7
str r4, [sp]
adds r0, r7, 0
@@ -1274,12 +1274,12 @@ _0800FC08:
lsls r0, 24
cmp r0, 0
bne _0800FC20
ldr r0, _0800FC1C @ =gUnknown_2022B50
ldr r0, _0800FC1C @ =gBattleTerrain
ldrb r0, [r0]
bl sub_800F2AC
b _0800FC26
.align 2, 0
_0800FC1C: .4byte gUnknown_2022B50
_0800FC1C: .4byte gBattleTerrain
_0800FC20:
movs r0, 0x8
bl sub_800F2AC
@@ -1309,12 +1309,12 @@ _0800FC48:
ands r0, r1
cmp r0, 0
beq _0800FC60
ldr r0, _0800FC5C @ =gUnknown_2022B50
ldr r0, _0800FC5C @ =gBattleTerrain
strb r2, [r0]
movs r0, 0
b _0800FCAA
.align 2, 0
_0800FC5C: .4byte gUnknown_2022B50
_0800FC5C: .4byte gBattleTerrain
_0800FC60:
movs r0, 0x8
ands r1, r0
@@ -1351,13 +1351,13 @@ _0800FC90:
lsrs r0, 24
b _0800FCAA
_0800FCA6:
ldr r0, _0800FCB0 @ =gUnknown_2022B50
ldr r0, _0800FCB0 @ =gBattleTerrain
ldrb r0, [r0]
_0800FCAA:
pop {r1}
bx r1
.align 2, 0
_0800FCB0: .4byte gUnknown_2022B50
_0800FCB0: .4byte gBattleTerrain
thumb_func_end sub_800FC2C
thumb_func_start sub_800FCB4
asm/battle_2.s
+952 -952
View File
File diff suppressed because it is too large Load Diff
asm/battle_ai_switch_items.s
-2654
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim.s
+54 -54
View File
@@ -14,7 +14,7 @@ ClearBattleAnimationVars: @ 80724C0
ldr r0, _08072554 @ =gUnknown_2037EE0
movs r1, 0
strb r1, [r0]
ldr r0, _08072558 @ =gUnknown_2037EE1
ldr r0, _08072558 @ =gAnimScriptActive
strb r1, [r0]
ldr r0, _0807255C @ =gUnknown_2037EE2
strb r1, [r0]
@@ -23,12 +23,12 @@ ClearBattleAnimationVars: @ 80724C0
ldr r0, _08072564 @ =gAnimDisableStructPtr
movs r1, 0
str r1, [r0]
ldr r0, _08072568 @ =gUnknown_2037EE8
ldr r0, _08072568 @ =gAnimMoveDmg
str r1, [r0]
ldr r0, _0807256C @ =gUnknown_2037EEC
ldr r0, _0807256C @ =gAnimMovePower
movs r2, 0
strh r1, [r0]
ldr r0, _08072570 @ =gUnknown_2037EFE
ldr r0, _08072570 @ =gAnimFriendship
strb r2, [r0]
ldr r4, _08072574 @ =gUnknown_2037F14
ldr r5, _08072578 @ =gAnimMoveTurn
@@ -85,13 +85,13 @@ _08072520:
bx r0
.align 2, 0
_08072554: .4byte gUnknown_2037EE0
_08072558: .4byte gUnknown_2037EE1
_08072558: .4byte gAnimScriptActive
_0807255C: .4byte gUnknown_2037EE2
_08072560: .4byte gUnknown_2037EE3
_08072564: .4byte gAnimDisableStructPtr
_08072568: .4byte gUnknown_2037EE8
_0807256C: .4byte gUnknown_2037EEC
_08072570: .4byte gUnknown_2037EFE
_08072568: .4byte gAnimMoveDmg
_0807256C: .4byte gAnimMovePower
_08072570: .4byte gAnimFriendship
_08072574: .4byte gUnknown_2037F14
_08072578: .4byte gAnimMoveTurn
_0807257C: .4byte gUnknown_2037F17
@@ -111,7 +111,7 @@ DoMoveAnim: @ 807259C
lsls r1, 16
lsrs r1, 16
ldr r2, _080725C0 @ =gBattleAnimAttacker
ldr r0, _080725C4 @ =sBattler_AI
ldr r0, _080725C4 @ =gBattlerAttacker
ldrb r0, [r0]
strb r0, [r2]
ldr r2, _080725C8 @ =gBattleAnimTarget
@@ -120,19 +120,19 @@ DoMoveAnim: @ 807259C
strb r0, [r2]
ldr r0, _080725D0 @ =gUnknown_81C68F4
movs r2, 0x1
bl sub_80725D4
bl LaunchBattleAnimation
pop {r0}
bx r0
.align 2, 0
_080725C0: .4byte gBattleAnimAttacker
_080725C4: .4byte sBattler_AI
_080725C4: .4byte gBattlerAttacker
_080725C8: .4byte gBattleAnimTarget
_080725CC: .4byte gBattlerTarget
_080725D0: .4byte gUnknown_81C68F4
thumb_func_end DoMoveAnim
thumb_func_start sub_80725D4
sub_80725D4: @ 80725D4
thumb_func_start LaunchBattleAnimation
LaunchBattleAnimation: @ 80725D4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -200,10 +200,10 @@ _08072658:
ldr r5, _080726C8 @ =gUnknown_2037ED4
mov r0, r8
lsls r3, r0, 2
ldr r6, _080726CC @ =gUnknown_2037EE1
ldr r6, _080726CC @ =gAnimScriptActive
ldr r1, _080726D0 @ =gUnknown_2037EE0
mov r12, r1
ldr r0, _080726D4 @ =gUnknown_2037EDC
ldr r0, _080726D4 @ =gAnimScriptCallback
mov r10, r0
ldr r7, _080726D8 @ =RunAnimScriptCommand
ldr r1, _080726DC @ =gBattleAnimArgs
@@ -253,9 +253,9 @@ _080726A6:
_080726C0: .4byte gUnknown_2037F18
_080726C4: .4byte gUnknown_2037F14
_080726C8: .4byte gUnknown_2037ED4
_080726CC: .4byte gUnknown_2037EE1
_080726CC: .4byte gAnimScriptActive
_080726D0: .4byte gUnknown_2037EE0
_080726D4: .4byte gUnknown_2037EDC
_080726D4: .4byte gAnimScriptCallback
_080726D8: .4byte RunAnimScriptCommand
_080726DC: .4byte gBattleAnimArgs
_080726E0: .4byte 0x0000ffff
@@ -300,7 +300,7 @@ _08072730: .4byte gUnknown_2022984
_08072734: .4byte gUnknown_2022986
_08072738: .4byte gUnknown_2022988
_0807273C: .4byte gUnknown_202298A
thumb_func_end sub_80725D4
thumb_func_end LaunchBattleAnimation
thumb_func_start DestroyAnimSprite
DestroyAnimSprite: @ 8072740
@@ -419,14 +419,14 @@ WaitAnimFrameCount: @ 80727FC
ldrsb r0, [r2, r0]
cmp r0, 0
bgt _08072820
ldr r0, _08072818 @ =gUnknown_2037EDC
ldr r0, _08072818 @ =gAnimScriptCallback
ldr r1, _0807281C @ =RunAnimScriptCommand
str r1, [r0]
movs r0, 0
b _08072822
.align 2, 0
_08072814: .4byte gUnknown_2037EE0
_08072818: .4byte gUnknown_2037EDC
_08072818: .4byte gAnimScriptCallback
_0807281C: .4byte RunAnimScriptCommand
_08072820:
subs r0, r1, 0x1
@@ -454,7 +454,7 @@ _0807282C:
asrs r0, 24
cmp r0, 0
bne _08072850
ldr r0, _08072864 @ =gUnknown_2037EE1
ldr r0, _08072864 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _0807282C
@@ -466,7 +466,7 @@ _08072850:
_08072858: .4byte gUnknown_83ADF5C
_0807285C: .4byte gUnknown_2037ED4
_08072860: .4byte gUnknown_2037EE0
_08072864: .4byte gUnknown_2037EE1
_08072864: .4byte gAnimScriptActive
thumb_func_end RunAnimScriptCommand
thumb_func_start ScriptCmd_loadspritegfx
@@ -500,7 +500,7 @@ ScriptCmd_loadspritegfx: @ 8072868
ldr r1, _080728C4 @ =gUnknown_2037EE0
movs r0, 0x1
strb r0, [r1]
ldr r1, _080728C8 @ =gUnknown_2037EDC
ldr r1, _080728C8 @ =gAnimScriptCallback
ldr r0, _080728CC @ =WaitAnimFrameCount
str r0, [r1]
pop {r4-r6}
@@ -512,7 +512,7 @@ _080728B8: .4byte gUnknown_8399388
_080728BC: .4byte gUnknown_8399C90
_080728C0: .4byte 0xffffd8f0
_080728C4: .4byte gUnknown_2037EE0
_080728C8: .4byte gUnknown_2037EDC
_080728C8: .4byte gAnimScriptCallback
_080728CC: .4byte WaitAnimFrameCount
thumb_func_end ScriptCmd_loadspritegfx
@@ -634,7 +634,7 @@ _080729A8:
ldr r0, _08072A04 @ =gBattleAnimAttacker
_080729AE:
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 24
@@ -651,13 +651,13 @@ _080729CC:
ldr r5, _08072A08 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -762,7 +762,7 @@ ScriptCmd_delay: @ 8072A8C
_08072AAA:
adds r0, r2, 0x1
str r0, [r1]
ldr r1, _08072AC4 @ =gUnknown_2037EDC
ldr r1, _08072AC4 @ =gAnimScriptCallback
ldr r0, _08072AC8 @ =WaitAnimFrameCount
str r0, [r1]
pop {r4}
@@ -771,7 +771,7 @@ _08072AAA:
.align 2, 0
_08072ABC: .4byte gUnknown_2037ED4
_08072AC0: .4byte gUnknown_2037EE0
_08072AC4: .4byte gUnknown_2037EDC
_08072AC4: .4byte gAnimScriptCallback
_08072AC8: .4byte WaitAnimFrameCount
thumb_func_end ScriptCmd_delay
@@ -913,7 +913,7 @@ _08072BB2:
bl sub_80767F0
movs r0, 0x1
bl UpdateOamPriorityInAllHealthboxes
ldr r0, _08072C04 @ =gUnknown_2037EE1
ldr r0, _08072C04 @ =gAnimScriptActive
mov r1, r8
strb r1, [r0]
_08072BDC:
@@ -930,7 +930,7 @@ _08072BF4: .4byte 0x0000ffff
_08072BF8: .4byte gUnknown_83ACC08
_08072BFC: .4byte gUnknown_2037EEE
_08072C00: .4byte gMPlayInfo_BGM
_08072C04: .4byte gUnknown_2037EE1
_08072C04: .4byte gAnimScriptActive
thumb_func_end sub_8072B08
thumb_func_start sub_8072C08
@@ -989,7 +989,7 @@ _08072C60:
_08072C62:
ldrb r5, [r0]
adds r0, r5, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08072D12
@@ -1073,7 +1073,7 @@ _08072D12:
cmp r6, 0x1
bls _08072DCE
adds r0, r5, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08072DCE
@@ -1169,17 +1169,17 @@ _08072DE8: .4byte gUnknown_2037F14
_08072DEC: .4byte gUnknown_2037ED4
thumb_func_end sub_8072C30
thumb_func_start sub_8072DF0
sub_8072DF0: @ 8072DF0
thumb_func_start IsBattlerSpriteVisible
IsBattlerSpriteVisible: @ 8072DF0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8075224
bl IsBattlerSpritePresent
lsls r0, 24
cmp r0, 0
beq _08072E40
ldr r0, _08072E34 @ =gUnknown_2024018
ldr r0, _08072E34 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0]
lsls r0, r4, 2
@@ -1206,7 +1206,7 @@ _08072E30:
movs r0, 0x1
b _08072E42
.align 2, 0
_08072E34: .4byte gUnknown_2024018
_08072E34: .4byte gBattleSpritesDataPtr
_08072E38: .4byte gSprites
_08072E3C: .4byte gBattlerSpriteIds
_08072E40:
@@ -1215,7 +1215,7 @@ _08072E42:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8072DF0
thumb_func_end IsBattlerSpriteVisible
thumb_func_start sub_8072E48
sub_8072E48: @ 8072E48
@@ -1897,7 +1897,7 @@ _080733CC:
_080733CE:
ldrb r4, [r0]
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08073416
@@ -1935,7 +1935,7 @@ _08073416:
cmp r5, 0x1
bls _08073464
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08073464
@@ -2016,7 +2016,7 @@ _080734B4:
_080734B6:
ldrb r6, [r0]
adds r0, r6, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080734E0
@@ -2041,7 +2041,7 @@ _080734E0:
adds r4, r6, 0
eors r4, r0
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08073520
@@ -2127,7 +2127,7 @@ sub_8073558: @ 8073558
movs r7, 0
_08073598:
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080735AA
@@ -2141,7 +2141,7 @@ _080735AA:
movs r0, 0x2
eors r6, r0
adds r0, r6, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080735CC
@@ -2397,11 +2397,11 @@ ScriptCmd_jump: @ 8073764
_08073784: .4byte gUnknown_2037ED4
thumb_func_end ScriptCmd_jump
thumb_func_start sub_8073788
sub_8073788: @ 8073788
thumb_func_start IsContest
IsContest: @ 8073788
movs r0, 0
bx lr
thumb_func_end sub_8073788
thumb_func_end IsContest
thumb_func_start sub_807378C
sub_807378C: @ 807378C
@@ -2772,7 +2772,7 @@ sub_8073A44: @ 8073A44
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08073A78 @ =gUnknown_2024018
ldr r0, _08073A78 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _08073A7C @ =gBattleAnimAttacker
ldrb r2, [r0]
@@ -2795,7 +2795,7 @@ sub_8073A44: @ 8073A44
movs r4, 0x3F
b _08073AE6
.align 2, 0
_08073A78: .4byte gUnknown_2024018
_08073A78: .4byte gBattleSpritesDataPtr
_08073A7C: .4byte gBattleAnimAttacker
_08073A80:
adds r0, r2, 0
@@ -2874,7 +2874,7 @@ sub_8073B08: @ 8073B08
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08073B3C @ =gUnknown_2024018
ldr r0, _08073B3C @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _08073B40 @ =gBattleAnimAttacker
ldrb r2, [r0]
@@ -2897,7 +2897,7 @@ sub_8073B08: @ 8073B08
movs r4, 0x3F
b _08073B56
.align 2, 0
_08073B3C: .4byte gUnknown_2024018
_08073B3C: .4byte gBattleSpritesDataPtr
_08073B40: .4byte gBattleAnimAttacker
_08073B44:
adds r0, r2, 0
@@ -3942,7 +3942,7 @@ sub_8074320: @ 8074320
ldrb r7, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080743C2
@@ -4024,7 +4024,7 @@ sub_80743C8: @ 80743C8
ldrb r7, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0807444C
asm/battle_anim_effects_1.s
+140 -140
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_effects_2.s
+101 -101
View File
@@ -185,13 +185,13 @@ sub_80A6F8C: @ 80A6F8C
ldr r4, _080A6FD4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -286,14 +286,14 @@ sub_80A7058: @ 80A7058
ldrh r1, [r0, 0x22]
adds r1, 0xF
strh r1, [r0, 0x36]
ldr r1, _080A7078 @ =sub_8075590
ldr r1, _080A7078 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080A707C @ =sub_80A7080
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080A7078: .4byte sub_8075590
_080A7078: .4byte StartAnimLinearTranslation
_080A707C: .4byte sub_80A7080
thumb_func_end sub_80A7058
@@ -329,7 +329,7 @@ sub_80A70A0: @ 80A70A0
adds r0, r1
ldrb r0, [r0]
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
ldr r1, _080A70D4 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -389,7 +389,7 @@ _080A7126:
lsls r2, 1
adds r0, r4, 0
adds r1, r2, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldr r1, _080A7158 @ =gTasks
adds r0, r6, r5
lsls r0, 3
@@ -458,7 +458,7 @@ _080A71AA:
cmp r0, 0x2
bne _080A71CC
adds r0, r4, 0
bl sub_8075980
bl ResetSpriteRotScale
adds r0, r5, 0
bl DestroyAnimVisualTask
b _080A71D0
@@ -586,14 +586,14 @@ sub_80A72A0: @ 80A72A0
ldrh r1, [r0, 0x22]
subs r1, 0x20
strh r1, [r0, 0x36]
ldr r1, _080A72C0 @ =sub_8075590
ldr r1, _080A72C0 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080A72C4 @ =DestroyAnimSprite
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080A72C0: .4byte sub_8075590
_080A72C0: .4byte StartAnimLinearTranslation
_080A72C4: .4byte DestroyAnimSprite
thumb_func_end sub_80A72A0
@@ -604,7 +604,7 @@ sub_80A72C8: @ 80A72C8
push {r7}
sub sp, 0x4
adds r5, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A72EC
@@ -639,7 +639,7 @@ _080A730E:
ldr r4, _080A73BC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r6, _080A73B8 @ =gBattleAnimArgs
lsrs r0, 24
@@ -650,7 +650,7 @@ _080A730E:
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x6]
@@ -677,7 +677,7 @@ _080A730E:
lsls r1, 24
adds r0, r1
lsrs r4, r0, 16
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A7380
@@ -698,7 +698,7 @@ _080A7380:
mov r0, r8
strh r0, [r5, 0x32]
strh r7, [r5, 0x36]
ldr r0, _080A73C4 @ =sub_8075590
ldr r0, _080A73C4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A73C8 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -714,7 +714,7 @@ _080A73B4: .4byte gBattleAnimAttacker
_080A73B8: .4byte gBattleAnimArgs
_080A73BC: .4byte gBattleAnimTarget
_080A73C0: .4byte 0xffffa000
_080A73C4: .4byte sub_8075590
_080A73C4: .4byte StartAnimLinearTranslation
_080A73C8: .4byte DestroyAnimSprite
thumb_func_end sub_80A72C8
@@ -1158,7 +1158,7 @@ sub_80A76F0: @ 80A76F0
mov r4, sp
adds r4, 0x2
strh r1, [r4]
bl sub_8073788
bl IsContest
lsls r0, 24
mov r10, r4
cmp r0, 0
@@ -1194,7 +1194,7 @@ _080A7754:
strh r0, [r3, 0x4]
b _080A77B6
_080A775C:
ldr r1, _080A77A0 @ =gUnknown_2023BD6
ldr r1, _080A77A0 @ =gBattlerPositions
ldr r0, _080A77A4 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
@@ -1228,7 +1228,7 @@ _080A775C:
ands r0, r1
b _080A77B4
.align 2, 0
_080A77A0: .4byte gUnknown_2023BD6
_080A77A0: .4byte gBattlerPositions
_080A77A4: .4byte gBattleAnimTarget
_080A77A8: .4byte gTasks
_080A77AC: .4byte gBattleAnimArgs
@@ -1241,7 +1241,7 @@ _080A77B6:
ldr r5, _080A7810 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
ldr r1, _080A7814 @ =gTasks
mov r3, r8
adds r4, r3, r7
@@ -1253,7 +1253,7 @@ _080A77B6:
adds r6, r0, 0
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -1268,7 +1268,7 @@ _080A77B6:
ldrb r1, [r4]
movs r0, 0x2
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A7820
@@ -1288,13 +1288,13 @@ _080A7820:
ldr r4, _080A787C @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r1, r10
@@ -1430,7 +1430,7 @@ _080A7928:
ble _080A79A0
ldr r0, _080A7970 @ =gBattleAnimTarget
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
ldr r2, _080A7974 @ =0x0000ffc0
@@ -1451,7 +1451,7 @@ _080A7978:
ble _080A79A0
ldr r0, _080A7998 @ =gBattleAnimTarget
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
ldr r3, _080A799C @ =0x0000ffc0
@@ -1466,7 +1466,7 @@ _080A799C: .4byte 0x0000ffc0
_080A79A0:
ldr r0, _080A79DC @ =gBattleAnimTarget
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x8]
@@ -1596,12 +1596,12 @@ sub_80A7A88: @ 80A7A88
ldr r4, _080A7B28 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080A7B2C @ =gBattleAnimArgs
lsrs r0, 24
@@ -1754,17 +1754,17 @@ sub_80A7BC4: @ 80A7BC4
ldr r5, _080A7C10 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, _080A7C14 @ =sub_8075590
ldr r0, _080A7C14 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x2C
@@ -1780,7 +1780,7 @@ sub_80A7BC4: @ 80A7BC4
bx r0
.align 2, 0
_080A7C10: .4byte gBattleAnimTarget
_080A7C14: .4byte sub_8075590
_080A7C14: .4byte StartAnimLinearTranslation
_080A7C18: .4byte sub_80A7C1C
thumb_func_end sub_80A7BC4
@@ -1986,19 +1986,19 @@ _080A7D90:
ldr r4, _080A7DEC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
add r0, r8
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, _080A7DF0 @ =sub_8075590
ldr r0, _080A7DF0 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A7DF4 @ =sub_80A7DF8
adds r0, r5, 0
@@ -2013,7 +2013,7 @@ _080A7DE0: .4byte 0x0000ffe0
_080A7DE4: .4byte 0x0000fff0
_080A7DE8: .4byte gBattleAnimArgs
_080A7DEC: .4byte gBattleAnimTarget
_080A7DF0: .4byte sub_8075590
_080A7DF0: .4byte StartAnimLinearTranslation
_080A7DF4: .4byte sub_80A7DF8
thumb_func_end sub_80A7D64
@@ -2079,7 +2079,7 @@ _080A7E48:
ldr r4, _080A7EB4 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
add r0, r9
@@ -2088,7 +2088,7 @@ _080A7E48:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -2258,12 +2258,12 @@ sub_80A7FB0: @ 80A7FB0
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x1
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
adds r0, r4, 0
movs r1, 0xD0
movs r2, 0xD0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldr r1, _080A8008 @ =gSprites
lsls r0, r4, 4
adds r0, r4
@@ -2317,7 +2317,7 @@ sub_80A8014: @ 80A8014
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8075980
bl ResetSpriteRotScale
ldr r1, _080A8070 @ =gSprites
lsls r0, r4, 4
adds r0, r4
@@ -2356,7 +2356,7 @@ sub_80A8074: @ 80A8074
movs r5, 0
strh r0, [r4, 0x8]
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
strh r5, [r4, 0xA]
strh r5, [r4, 0xC]
strh r5, [r4, 0xE]
@@ -2367,7 +2367,7 @@ sub_80A8074: @ 80A8074
strh r5, [r4, 0x14]
ldr r0, _080A80C4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]
@@ -2439,7 +2439,7 @@ _080A8128:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r2, 0xC
@@ -2471,7 +2471,7 @@ _080A816E:
ldrb r0, [r4, 0x8]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r0, 0x2
@@ -2502,7 +2502,7 @@ _080A81A4:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r2, 0xC
@@ -2519,7 +2519,7 @@ _080A81D0:
b _080A81F6
_080A81D8:
ldrb r0, [r4, 0x8]
bl sub_8075980
bl ResetSpriteRotScale
ldr r2, _080A81FC @ =gSprites
movs r0, 0x26
ldrsh r1, [r4, r0]
@@ -2631,7 +2631,7 @@ _080A8244:
ldrsh r2, [r7, r1]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrb r0, [r4, 0x1]
movs r3, 0x4
negs r3, r3
@@ -2959,7 +2959,7 @@ sub_80A851C: @ 80A851C
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2974,7 +2974,7 @@ _080A8550:
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x20
@@ -2985,7 +2985,7 @@ _080A856A:
ldr r0, _080A85A0 @ =gBattleAnimAttacker
ldrb r0, [r0]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -3042,7 +3042,7 @@ _080A85CA:
_080A85E4:
adds r0, r5, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080A862C @ =gBattleAnimArgs
lsrs r0, 24
@@ -3051,7 +3051,7 @@ _080A85E4:
strh r0, [r6, 0x20]
adds r0, r5, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x4]
@@ -3602,7 +3602,7 @@ sub_80A8A1C: @ 80A8A1C
ldr r6, _080A8A70 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -3849,14 +3849,14 @@ _080A8BF2:
movs r0, 0x1
adds r4, r0, 0
eors r4, r1
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080A8C6A
movs r1, 0x2
adds r0, r5, 0
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A8C6A
@@ -3876,7 +3876,7 @@ _080A8C30:
adds r0, r5, 0
movs r1, 0x2
_080A8C34:
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r4, r0, 24
adds r0, r5, 0
@@ -3995,7 +3995,7 @@ _080A8D10:
beq _080A8D6C
adds r0, r7, 0
mov r1, r10
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r1, _080A8D50 @ =gBattleAnimArgs
lsrs r0, 24
@@ -4008,7 +4008,7 @@ _080A8D10:
mov r4, r8
eors r4, r0
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A8D5C
@@ -4031,7 +4031,7 @@ _080A8D68: .4byte gBattlerSpriteIds
_080A8D6C:
adds r0, r7, 0
mov r1, r10
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r1, _080A8DD4 @ =gBattleAnimArgs
@@ -4040,7 +4040,7 @@ _080A8D6C:
lsls r0, 16
lsrs r0, 16
mov r9, r0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A8DE4
@@ -4048,7 +4048,7 @@ _080A8D6C:
adds r4, r7, 0
eors r4, r0
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A8DE4
@@ -4104,7 +4104,7 @@ _080A8DFA:
strb r0, [r1]
adds r0, r7, 0
ldr r1, [sp, 0x4]
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080A8E48 @ =gBattleAnimArgs
lsrs r0, 24
@@ -4112,14 +4112,14 @@ _080A8DFA:
adds r0, r1
lsls r0, 16
lsrs r6, r0, 16
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A8E4C
movs r1, 0x2
mov r0, r8
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A8E4C
@@ -4138,13 +4138,13 @@ _080A8E4C:
mov r4, sp
mov r0, r8
mov r1, r10
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
mov r0, r8
ldr r1, [sp, 0x4]
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r2, sp
@@ -5007,13 +5007,13 @@ sub_80A94AC: @ 80A94AC
ldr r5, _080A9500 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5428,7 +5428,7 @@ _080A9808:
strh r0, [r5, 0x2E]
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -5436,13 +5436,13 @@ _080A9808:
strh r0, [r5, 0x32]
ldrb r0, [r6]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r5, 0x36]
ldr r0, _080A9858 @ =sub_8075590
ldr r0, _080A9858 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A985C @ =DestroyAnimSprite
adds r0, r5, 0
@@ -5457,7 +5457,7 @@ _080A9808:
.align 2, 0
_080A9850: .4byte gBattleAnimAttacker
_080A9854: .4byte gBattleAnimArgs
_080A9858: .4byte sub_8075590
_080A9858: .4byte StartAnimLinearTranslation
_080A985C: .4byte DestroyAnimSprite
thumb_func_end sub_80A97E8
@@ -5509,7 +5509,7 @@ sub_80A98B0: @ 80A98B0
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
bl sub_8073788
bl IsContest
lsls r0, 24
movs r6, 0xF0
cmp r0, 0
@@ -5830,7 +5830,7 @@ sub_80A9B40: @ 80A9B40
ldr r5, _080A9B84 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -5838,7 +5838,7 @@ sub_80A9B40: @ 80A9B40
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -6057,7 +6057,7 @@ sub_80A9CE8: @ 80A9CE8
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A9D2A
@@ -6095,7 +6095,7 @@ _080A9D2A:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A9D88
@@ -6265,7 +6265,7 @@ _080A9EAE:
.align 2, 0
_080A9ED0: .4byte gTasks
_080A9ED4:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A9EE8
@@ -6314,7 +6314,7 @@ sub_80A9F10: @ 80A9F10
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A9F52
@@ -6336,7 +6336,7 @@ _080A9F52:
bl SetGpuReg
mov r0, sp
bl sub_80752A0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A9F98
@@ -6383,7 +6383,7 @@ _080A9FC6:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A9FFA
@@ -6548,7 +6548,7 @@ _080AA112:
adds r0, 0x1
strh r0, [r1, 0x20]
_080AA134:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AA148
@@ -6585,13 +6585,13 @@ sub_80AA174: @ 80AA174
ldr r5, _080AA1C8 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -6607,7 +6607,7 @@ sub_80AA174: @ 80AA174
ldrh r0, [r1, 0x2]
strh r0, [r4, 0x30]
ldrb r0, [r5]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x3C]
@@ -6743,13 +6743,13 @@ sub_80AA2B0: @ 80AA2B0
ldr r4, _080AA2F8 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -6851,13 +6851,13 @@ sub_80AA37C: @ 80AA37C
ldr r4, _080AA3C8 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -7142,7 +7142,7 @@ sub_80AA58C: @ 80AA58C
bl StartSpriteAnim
ldr r0, _080AA68C @ =gBattleAnimTarget
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
@@ -7345,13 +7345,13 @@ _080AA734:
_080AA736:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -7508,7 +7508,7 @@ _080AA856:
_080AA870:
adds r0, r6, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r7, _080AA8F0 @ =gBattleAnimArgs
lsrs r0, 24
@@ -7518,7 +7518,7 @@ _080AA870:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r7, 0x4]
@@ -7733,7 +7733,7 @@ _080AA9C6:
str r0, [r6, 0x1C]
strh r5, [r6, 0x2E]
adds r0, r6, 0
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
movs r0, 0x5
strh r0, [r6, 0x32]
strh r5, [r6, 0x36]
@@ -7847,7 +7847,7 @@ sub_80AAAE4: @ 80AAAE4
ldrb r1, [r4]
movs r0, 0x2
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080AAB30
@@ -7872,13 +7872,13 @@ _080AAB30:
ldr r4, _080AAB70 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -7891,7 +7891,7 @@ _080AAB50:
ldrh r0, [r5, 0x22]
subs r0, 0x48
strh r0, [r5, 0x36]
ldr r0, _080AAB74 @ =sub_8075590
ldr r0, _080AAB74 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080AAB78 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -7901,7 +7901,7 @@ _080AAB50:
bx r0
.align 2, 0
_080AAB70: .4byte gBattleAnimAttacker
_080AAB74: .4byte sub_8075590
_080AAB74: .4byte StartAnimLinearTranslation
_080AAB78: .4byte DestroyAnimSprite
thumb_func_end sub_80AAAE4
asm/battle_anim_effects_3.s
+125 -125
View File
@@ -92,7 +92,7 @@ sub_80DE34C: @ 80DE34C
ldr r6, _080DE398 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 8
@@ -102,7 +102,7 @@ sub_80DE34C: @ 80DE34C
asrs r4, 16
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 8
@@ -216,13 +216,13 @@ sub_80DE440: @ 80DE440
ldr r4, _080DE4CC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -243,7 +243,7 @@ sub_80DE440: @ 80DE440
lsls r1, 23
adds r0, r1
lsrs r4, r0, 16
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DE49E
@@ -265,7 +265,7 @@ _080DE49E:
strh r0, [r5, 0x2E]
strh r7, [r5, 0x32]
strh r6, [r5, 0x36]
ldr r0, _080DE4D4 @ =sub_8075590
ldr r0, _080DE4D4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080DE4D8 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -277,7 +277,7 @@ _080DE49E:
.align 2, 0
_080DE4CC: .4byte gBattleAnimTarget
_080DE4D0: .4byte gBattleAnimArgs
_080DE4D4: .4byte sub_8075590
_080DE4D4: .4byte StartAnimLinearTranslation
_080DE4D8: .4byte DestroyAnimSprite
thumb_func_end sub_80DE440
@@ -957,7 +957,7 @@ sub_80DE9D8: @ 80DE9D8
ldrsh r1, [r5, r2]
adds r0, r4, 0
bl sub_8074FF8
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DEA2C
@@ -1093,7 +1093,7 @@ sub_80DEAF0: @ 80DEAF0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080DEB04 @ =gUnknown_2037EE8
ldr r0, _080DEB04 @ =gAnimMoveDmg
ldr r0, [r0]
cmp r0, 0
ble _080DEB0C
@@ -1101,7 +1101,7 @@ sub_80DEAF0: @ 80DEAF0
movs r0, 0
b _080DEB10
.align 2, 0
_080DEB04: .4byte gUnknown_2037EE8
_080DEB04: .4byte gAnimMoveDmg
_080DEB08: .4byte gBattleAnimArgs
_080DEB0C:
ldr r1, _080DEB1C @ =gBattleAnimArgs
@@ -1311,13 +1311,13 @@ sub_80DEC90: @ 80DEC90
ldr r4, _080DED08 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1474,7 +1474,7 @@ sub_80DEDD8: @ 80DEDD8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DEE2C
@@ -1551,7 +1551,7 @@ sub_80DEE78: @ 80DEE78
strh r1, [r0]
ldr r0, _080DEEB8 @ =gUnknown_202298A
strh r1, [r0]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DEEA4
@@ -1590,7 +1590,7 @@ _080DEED8:
_080DEEDA:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -1598,7 +1598,7 @@ _080DEEDA:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2005,13 +2005,13 @@ sub_80DF1DC: @ 80DF1DC
ldr r6, _080DF234 @ =gBattleAnimAttacker
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xE]
@@ -2394,17 +2394,17 @@ _080DF4C4:
ldr r4, _080DF51C @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080DF520 @ =sub_8075590
ldr r0, _080DF520 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
_080DF510:
pop {r4,r5}
@@ -2413,7 +2413,7 @@ _080DF510:
.align 2, 0
_080DF518: .4byte DestroyAnimSprite
_080DF51C: .4byte gBattleAnimTarget
_080DF520: .4byte sub_8075590
_080DF520: .4byte StartAnimLinearTranslation
thumb_func_end sub_80DF468
thumb_func_start sub_80DF524
@@ -2491,19 +2491,19 @@ _080DF5AA:
ldr r4, _080DF5DC @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
adds r0, r6, 0
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
movs r0, 0x80
lsls r0, 1
strh r0, [r5, 0x30]
@@ -2524,7 +2524,7 @@ _080DF5E0:
ldrsh r2, [r5, r0]
adds r0, r6, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r5, 0x34]
adds r0, 0x1
strh r0, [r5, 0x34]
@@ -2548,7 +2548,7 @@ _080DF610:
ldrsh r2, [r5, r0]
adds r0, r6, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r5, 0x34]
adds r0, 0x1
strh r0, [r5, 0x34]
@@ -2569,7 +2569,7 @@ _080DF610:
orrs r1, r2
strb r1, [r0]
adds r0, r6, 0
bl sub_8075980
bl ResetSpriteRotScale
_080DF658:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -2950,7 +2950,7 @@ _080DF90A:
ldr r0, _080DF930 @ =gBattleAnimAttacker
ldrb r0, [r0]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -3140,11 +3140,11 @@ _080DFA86:
lsls r2, 3
adds r2, r3
ldrb r2, [r2, 0x1C]
bl sub_8034BF4
bl HandleSpeciesGfxDataChange
ldrb r1, [r6]
mov r0, sp
bl sub_8075300
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DFABC
@@ -3252,7 +3252,7 @@ _080DFB80:
movs r2, 0
bl SetAnimBgAttribute
_080DFB8A:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DFBC8
@@ -3273,13 +3273,13 @@ _080DFB8A:
cmp r0, 0
bne _080DFBC8
ldrb r0, [r4]
ldr r1, _080DFBE0 @ =gUnknown_2024018
ldr r1, _080DFBE0 @ =gBattleSpritesDataPtr
ldr r1, [r1]
ldr r2, [r1]
lsls r1, r0, 2
adds r1, r2
ldrh r1, [r1, 0x2]
bl SetBankEnemyShadowSpriteCallback
bl SetBattlerShadowSpriteCallback
_080DFBC8:
adds r0, r5, 0
bl DestroyAnimVisualTask
@@ -3291,7 +3291,7 @@ _080DFBCE:
.align 2, 0
_080DFBD8: .4byte gBattleAnimAttacker
_080DFBDC: .4byte gTasks
_080DFBE0: .4byte gUnknown_2024018
_080DFBE0: .4byte gBattleSpritesDataPtr
thumb_func_end sub_80DF9BC
thumb_func_start c3_80DFBE4
@@ -3337,7 +3337,7 @@ sub_80DFC24: @ 80DFC24
ldr r1, _080DFC4C @ =gBattleAnimTarget
ldrb r1, [r1]
movs r2, 0x1
bl sub_8034BF4
bl HandleSpeciesGfxDataChange
adds r0, r4, 0
bl DestroyAnimVisualTask
pop {r4}
@@ -3397,7 +3397,7 @@ _080DFC94:
movs r1, 0x4
movs r2, 0x1
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DFCCE
@@ -3424,7 +3424,7 @@ _080DFCCE:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DFD30
@@ -3616,7 +3616,7 @@ _080DFE7E:
mov r0, sp
ldrb r0, [r0, 0x9]
bl sub_8075358
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DFEA0
@@ -3678,14 +3678,14 @@ _080DFF06:
ldr r4, _080E0000 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r5
strh r0, [r7, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -4039,7 +4039,7 @@ _080E01C4:
movs r1, 0x4
movs r2, 0x1
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E01FC
@@ -4066,7 +4066,7 @@ _080E01FC:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E0264
@@ -4094,7 +4094,7 @@ _080E0264:
bl GetBattlerPosition
lsls r0, 24
lsrs r4, r0, 24
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4319,7 +4319,7 @@ _080E042A:
mov r0, sp
ldrb r0, [r0, 0x9]
bl sub_8075358
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E044C
@@ -4557,7 +4557,7 @@ _080E0608:
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
ldr r0, _080E0624 @ =sub_80E0628
str r0, [r4]
_080E0618:
@@ -4621,7 +4621,7 @@ _080E065C:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4662,7 +4662,7 @@ _080E06B0:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4706,7 +4706,7 @@ _080E0708:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4741,7 +4741,7 @@ _080E0778:
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8075980
bl ResetSpriteRotScale
adds r0, r5, 0
bl DestroyAnimVisualTask
_080E0788:
@@ -4879,7 +4879,7 @@ sub_80E0850: @ 80E0850
lsrs r0, 24
strh r0, [r4, 0x26]
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
ldr r0, _080E08A0 @ =sub_80E08A4
str r0, [r4]
pop {r4}
@@ -5028,7 +5028,7 @@ _080E09A8:
ldrh r0, [r7, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8075980
bl ResetSpriteRotScale
adds r0, r4, 0
bl DestroyAnimVisualTask
b _080E0A30
@@ -5040,7 +5040,7 @@ _080E09BA:
lsls r2, 1
ldrh r3, [r7, 0xC]
adds r1, r2, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r7, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -5116,13 +5116,13 @@ sub_80E0A3C: @ 80E0A3C
ldr r4, _080E0A98 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -5248,7 +5248,7 @@ _080E0B3E:
strh r5, [r6, 0x1C]
adds r0, r5, 0
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
mov r2, r8
movs r3, 0x2
ldrsh r0, [r2, r3]
@@ -5274,7 +5274,7 @@ _080E0B88:
adds r0, r5, 0
movs r1, 0xE0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
adds r0, r5, 0
bl sub_8076440
lsls r2, r5, 4
@@ -5293,10 +5293,10 @@ _080E0BAA:
_080E0BB2:
adds r0, r5, 0
movs r1, 0xD0
bl obj_id_set_rotscale
bl SetSpriteRotScale
adds r0, r5, 0
bl sub_8076440
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0BD8
@@ -5361,7 +5361,7 @@ _080E0C30:
cmp r0, 0xD
bne _080E0C58
adds r0, r5, 0
bl sub_8075980
bl ResetSpriteRotScale
ldr r1, _080E0C64 @ =gSprites
lsls r0, r5, 4
adds r0, r5
@@ -5675,13 +5675,13 @@ sub_80E0E94: @ 80E0E94
ldr r5, _080E0ED0 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -5735,7 +5735,7 @@ sub_80E0EDC: @ 80E0EDC
_080E0F16:
ldr r0, _080E0F24 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
b _080E0F32
.align 2, 0
@@ -5743,7 +5743,7 @@ _080E0F24: .4byte gBattleAnimAttacker
_080E0F28:
ldr r0, _080E0F74 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
adds r0, 0x1
_080E0F32:
adds r1, r4, 0
@@ -5856,7 +5856,7 @@ sub_80E0FB8: @ 80E0FB8
movs r1, 0x1
bl GetMonData
mov r9, r0
ldr r0, _080E1050 @ =gUnknown_2024018
ldr r0, _080E1050 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
ldr r1, [r0]
@@ -5882,7 +5882,7 @@ _080E1040: .4byte gBattleAnimAttacker
_080E1044: .4byte gBattlerPartyIndexes
_080E1048: .4byte gBattleAnimTarget
_080E104C: .4byte gPlayerParty
_080E1050: .4byte gUnknown_2024018
_080E1050: .4byte gBattleSpritesDataPtr
_080E1054:
ldrb r0, [r4]
lsls r0, 1
@@ -5930,7 +5930,7 @@ _080E107C:
movs r1, 0x1
bl GetMonData
mov r9, r0
ldr r0, _080E10EC @ =gUnknown_2024018
ldr r0, _080E10EC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
ldr r1, [r0]
@@ -5956,7 +5956,7 @@ _080E107C:
_080E10E0: .4byte gBattlerPartyIndexes
_080E10E4: .4byte gBattleAnimTarget
_080E10E8: .4byte gEnemyParty
_080E10EC: .4byte gUnknown_2024018
_080E10EC: .4byte gBattleSpritesDataPtr
_080E10F0: .4byte gPlayerParty
_080E10F4:
ldrb r0, [r4]
@@ -5985,13 +5985,13 @@ _080E1112:
ldr r5, _080E1200 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
mov r2, r8
lsls r1, r2, 16
@@ -7031,7 +7031,7 @@ _080E194E:
ldr r4, _080E1988 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -7039,7 +7039,7 @@ _080E194E:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7602,18 +7602,18 @@ _080E1DA2:
ldrb r4, [r0]
adds r0, r4, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
adds r0, r4, 0
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
@@ -8031,7 +8031,7 @@ sub_80E20D4: @ 80E20D4
_080E20F0:
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080E2130 @ =gBattleAnimArgs
lsrs r0, 24
@@ -8040,7 +8040,7 @@ _080E20F0:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -8164,7 +8164,7 @@ sub_80E21CC: @ 80E21CC
bne _080E2224
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8186,7 +8186,7 @@ _080E2220: .4byte gBattleAnimAttacker
_080E2224:
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8206,7 +8206,7 @@ _080E2248:
ldr r5, _080E229C @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8225,13 +8225,13 @@ _080E226C:
ldr r4, _080E22A0 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x24]
@@ -8595,14 +8595,14 @@ sub_80E2518: @ 80E2518
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x1E]
mov r1, r10
ldrb r0, [r1]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
@@ -8610,14 +8610,14 @@ sub_80E2518: @ 80E2518
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
mov r1, r8
ldrb r0, [r1]
@@ -8641,7 +8641,7 @@ _080E258A:
ldrsh r6, [r7, r1]
mov r1, r8
ldrb r0, [r1]
bl sub_807685C
bl GetBattlerSpriteSubpriority
adds r3, r0, 0
subs r3, 0x5
lsls r3, 24
@@ -8918,7 +8918,7 @@ _080E27C0:
strh r1, [r4, 0x3C]
adds r0, r5, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -9225,7 +9225,7 @@ _080E2A0C:
_080E2A0E:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -9617,7 +9617,7 @@ sub_80E2CE4: @ 80E2CE4
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x1
@@ -9625,7 +9625,7 @@ sub_80E2CE4: @ 80E2CE4
ldr r5, _080E2D38 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9633,7 +9633,7 @@ sub_80E2CE4: @ 80E2CE4
movs r0, 0x2
eors r0, r1
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -10074,14 +10074,14 @@ _080E307C:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r1, r0, 24
_080E309C:
@@ -10298,10 +10298,10 @@ sub_80E321C: @ 80E321C
ldr r4, _080E3250 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -10378,7 +10378,7 @@ sub_80E3294: @ 80E3294
bne _080E32DC
adds r0, r5, 0
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
movs r0, 0x80
lsls r0, 1
strh r0, [r4, 0xA]
@@ -10401,7 +10401,7 @@ _080E32DC:
ldrsh r2, [r4, r0]
adds r0, r5, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0xE]
adds r0, 0x1
strh r0, [r4, 0xE]
@@ -10412,7 +10412,7 @@ _080E32DC:
movs r0, 0
strh r0, [r4, 0xE]
adds r0, r5, 0
bl sub_8075980
bl ResetSpriteRotScale
ldr r1, _080E3330 @ =gSprites
lsls r0, r5, 4
adds r0, r5
@@ -10654,7 +10654,7 @@ sub_80E34D0: @ 80E34D0
cmp r0, 0
bne _080E34FC
ldrb r0, [r4]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x2
adds r1, r5, 0
adds r1, 0x43
@@ -10666,7 +10666,7 @@ _080E34F4: .4byte gBattleAnimTarget
_080E34F8: .4byte 0x0000ff70
_080E34FC:
ldrb r0, [r4]
bl sub_807685C
bl GetBattlerSpriteSubpriority
adds r0, 0x2
adds r1, r5, 0
adds r1, 0x43
@@ -10676,7 +10676,7 @@ _080E350C:
ldr r0, _080E352C @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -10927,7 +10927,7 @@ _080E36B4:
adds r0, r2
movs r1, 0x2
strh r1, [r0, 0x8]
ldr r0, _080E3750 @ =gUnknown_2024018
ldr r0, _080E3750 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _080E3754 @ =gBattleAnimTarget
ldrb r0, [r0]
@@ -10960,7 +10960,7 @@ _080E36B4:
_080E3744: .4byte gSprites
_080E3748: .4byte 0x0000fff0
_080E374C: .4byte gTasks
_080E3750: .4byte gUnknown_2024018
_080E3750: .4byte gBattleSpritesDataPtr
_080E3754: .4byte gBattleAnimTarget
_080E3758:
adds r1, r5, 0
@@ -11063,7 +11063,7 @@ sub_80E37FC: @ 80E37FC
ble _080E3846
movs r0, 0
strh r0, [r4, 0x30]
ldr r0, _080E3870 @ =gUnknown_2024018
ldr r0, _080E3870 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _080E3874 @ =gBattleAnimTarget
ldrb r0, [r0]
@@ -11111,7 +11111,7 @@ _080E3846:
beq _080E3890
b _080E38CE
.align 2, 0
_080E3870: .4byte gUnknown_2024018
_080E3870: .4byte gBattleSpritesDataPtr
_080E3874: .4byte gBattleAnimTarget
_080E3878:
ldrh r0, [r4, 0x32]
@@ -11173,7 +11173,7 @@ sub_80E38D8: @ 80E38D8
ldr r3, _080E3924 @ =gBattleAnimArgs
movs r2, 0
strh r2, [r3, 0xE]
ldr r1, _080E3928 @ =gUnknown_2037EFE
ldr r1, _080E3928 @ =gAnimFriendship
ldrb r0, [r1]
ldrb r1, [r1]
adds r0, r1, 0
@@ -11209,7 +11209,7 @@ _080E3918:
bx r0
.align 2, 0
_080E3924: .4byte gBattleAnimArgs
_080E3928: .4byte gUnknown_2037EFE
_080E3928: .4byte gAnimFriendship
thumb_func_end sub_80E38D8
thumb_func_start sub_80E392C
@@ -11364,7 +11364,7 @@ _080E3A2C:
movs r1, 0x1
bl GetMonData
mov r9, r0
ldr r0, _080E3A9C @ =gUnknown_2024018
ldr r0, _080E3A9C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
ldr r1, [r0]
@@ -11387,7 +11387,7 @@ _080E3A2C:
_080E3A90: .4byte gBattleAnimAttacker
_080E3A94: .4byte gBattlerPartyIndexes
_080E3A98: .4byte gPlayerParty
_080E3A9C: .4byte gUnknown_2024018
_080E3A9C: .4byte gBattleSpritesDataPtr
_080E3AA0:
ldrh r5, [r1, 0x2]
_080E3AA2:
@@ -11433,7 +11433,7 @@ _080E3ACC:
movs r1, 0x1
bl GetMonData
mov r9, r0
ldr r0, _080E3B2C @ =gUnknown_2024018
ldr r0, _080E3B2C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
ldr r1, [r0]
@@ -11455,7 +11455,7 @@ _080E3ACC:
.align 2, 0
_080E3B24: .4byte gBattlerPartyIndexes
_080E3B28: .4byte gEnemyParty
_080E3B2C: .4byte gUnknown_2024018
_080E3B2C: .4byte gBattleSpritesDataPtr
_080E3B30:
ldrh r5, [r1, 0x2]
_080E3B32:
@@ -11479,7 +11479,7 @@ _080E3B54:
ldr r0, _080E3BD8 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -11501,7 +11501,7 @@ _080E3B54:
bl sub_80768D0
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080E3BE0 @ =gUnknown_2024018
ldr r0, _080E3BE0 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldrb r0, [r4]
ldr r1, [r1]
@@ -11540,7 +11540,7 @@ _080E3BD0: .4byte gSprites
_080E3BD4: .4byte 0x0000ffe0
_080E3BD8: .4byte gBattleAnimTarget
_080E3BDC: .4byte gBattleAnimAttacker
_080E3BE0: .4byte gUnknown_2024018
_080E3BE0: .4byte gBattleSpritesDataPtr
_080E3BE4: .4byte 0x00007fff
_080E3BE8: .4byte gTasks
_080E3BEC:
@@ -11627,7 +11627,7 @@ _080E3C5A:
ldr r0, _080E3CB4 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11644,7 +11644,7 @@ _080E3CB8:
ldr r0, _080E3CFC @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11790,7 +11790,7 @@ _080E3D90:
mov r1, r10
ldrb r0, [r1]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -11823,7 +11823,7 @@ _080E3E10:
mov r2, r10
ldrb r0, [r2]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -11892,7 +11892,7 @@ _080E3E96:
ldr r0, _080E3F18 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -12054,14 +12054,14 @@ _080E4004:
ldr r0, _080E4048 @ =gBattleAnimAttacker
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, _080E404C @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -12526,7 +12526,7 @@ sub_80E43A4: @ 80E43A4
ldr r4, _080E43E8 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -12703,7 +12703,7 @@ sub_80E44EC: @ 80E44EC
ldr r2, _080E4508 @ =gBattleAnimArgs
movs r0, 0
strh r0, [r2, 0xE]
ldr r0, _080E450C @ =gUnknown_2037F00
ldr r0, _080E450C @ =gWeatherMoveAnim
ldrh r1, [r0]
movs r0, 0x60
ands r0, r1
@@ -12713,7 +12713,7 @@ sub_80E44EC: @ 80E44EC
b _080E4532
.align 2, 0
_080E4508: .4byte gBattleAnimArgs
_080E450C: .4byte gUnknown_2037F00
_080E450C: .4byte gWeatherMoveAnim
_080E4510:
movs r0, 0x7
ands r0, r1
asm/battle_anim_mons.s
+156 -156
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_sound_tasks.s
+2 -2
View File
@@ -363,7 +363,7 @@ _080DD0BE:
bne _080DD0E8
_080DD0CC:
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080DD0E8
@@ -475,7 +475,7 @@ _080DD19A:
bne _080DD1C4
_080DD1A8:
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080DD1C4
asm/battle_anim_special.s
+89 -89
View File
@@ -56,7 +56,7 @@ sub_80EEC0C: @ 80EEC0C
movs r1, 0x3
movs r2, 0x1
bl SetAnimBgAttribute
ldr r0, _080EEDCC @ =gUnknown_3004FF0
ldr r0, _080EEDCC @ =gHealthboxSpriteIds
adds r4, r0
ldrb r0, [r4]
ldr r1, _080EEDD0 @ =gSprites
@@ -209,7 +209,7 @@ _080EEDBC: .4byte gUnknown_2022986
_080EEDC0: .4byte 0x00003f3f
_080EEDC4: .4byte 0x00003f3d
_080EEDC8: .4byte 0x00003f42
_080EEDCC: .4byte gUnknown_3004FF0
_080EEDCC: .4byte gHealthboxSpriteIds
_080EEDD0: .4byte gSprites
_080EEDD4: .4byte SpriteCallbackDummy
_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
@@ -347,7 +347,7 @@ _080EEE9C:
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080EEF00
@@ -392,7 +392,7 @@ _080EEF00:
movs r1, 0x1
movs r2, 0
bl SetAnimBgAttribute
ldr r0, _080EEFC4 @ =gUnknown_3004FF0
ldr r0, _080EEFC4 @ =gHealthboxSpriteIds
add r0, r8
ldrb r0, [r0]
lsls r1, r0, 4
@@ -443,7 +443,7 @@ _080EEFB4: .4byte gUnknown_2022984
_080EEFB8: .4byte gUnknown_2022986
_080EEFBC: .4byte 0x00003f3f
_080EEFC0: .4byte gSprites
_080EEFC4: .4byte gUnknown_3004FF0
_080EEFC4: .4byte gHealthboxSpriteIds
thumb_func_end sub_80EEDF4
thumb_func_start sub_80EEFC8
@@ -458,7 +458,7 @@ sub_80EEFC8: @ 80EEFC8
adds r7, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, _080EF0A0 @ =gUnknown_3004FF0
ldr r0, _080EF0A0 @ =gHealthboxSpriteIds
adds r2, r0
ldrb r0, [r2]
lsls r5, r0, 4
@@ -553,7 +553,7 @@ sub_80EEFC8: @ 80EEFC8
pop {r0}
bx r0
.align 2, 0
_080EF0A0: .4byte gUnknown_3004FF0
_080EF0A0: .4byte gHealthboxSpriteIds
_080EF0A4: .4byte gSprites
_080EF0A8: .4byte 0x0000d709
_080EF0AC: .4byte 0x0000d70a
@@ -591,7 +591,7 @@ sub_80EF0E0: @ 80EF0E0
push {r5,r6}
lsls r0, 24
lsrs r0, 24
ldr r1, _080EF168 @ =gUnknown_3004FF0
ldr r1, _080EF168 @ =gHealthboxSpriteIds
adds r0, r1
ldrb r0, [r0]
ldr r1, _080EF16C @ =gSprites
@@ -650,7 +650,7 @@ sub_80EF0E0: @ 80EF0E0
pop {r0}
bx r0
.align 2, 0
_080EF168: .4byte gUnknown_3004FF0
_080EF168: .4byte gHealthboxSpriteIds
_080EF16C: .4byte gSprites
_080EF170: .4byte 0x0000d709
_080EF174: .4byte 0x0000d70a
@@ -839,7 +839,7 @@ _080EF2D0:
_080EF2D6:
adds r0, r5, 0
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
movs r0, 0x80
lsls r0, 1
strh r0, [r4, 0x1C]
@@ -853,7 +853,7 @@ _080EF2E6:
adds r0, r5, 0
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
adds r0, r5, 0
bl sub_8076440
movs r0, 0x1C
@@ -870,7 +870,7 @@ _080EF30A:
_080EF314: .4byte 0x000002cf
_080EF318:
adds r0, r5, 0
bl sub_8075980
bl ResetSpriteRotScale
ldr r1, _080EF340 @ =gSprites
lsls r0, r5, 4
adds r0, r5
@@ -963,13 +963,13 @@ _080EF3D8:
ldr r5, _080EF450 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, _080EF454 @ =gSprites
@@ -1054,7 +1054,7 @@ sub_80EF490: @ 80EF490
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF4B4 @ =gUnknown_2023D68
ldr r0, _080EF4B4 @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
lsls r0, 24
@@ -1066,7 +1066,7 @@ sub_80EF490: @ 80EF490
pop {r0}
bx r0
.align 2, 0
_080EF4B4: .4byte gUnknown_2023D68
_080EF4B4: .4byte gLastUsedItem
thumb_func_end sub_80EF490
thumb_func_start sub_80EF4B8
@@ -1075,7 +1075,7 @@ sub_80EF4B8: @ 80EF4B8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF4DC @ =gUnknown_2023D68
ldr r0, _080EF4DC @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
lsls r0, 24
@@ -1087,7 +1087,7 @@ sub_80EF4B8: @ 80EF4B8
pop {r0}
bx r0
.align 2, 0
_080EF4DC: .4byte gUnknown_2023D68
_080EF4DC: .4byte gLastUsedItem
thumb_func_end sub_80EF4B8
thumb_func_start sub_80EF4E0
@@ -1095,7 +1095,7 @@ sub_80EF4E0: @ 80EF4E0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080EF4FC @ =gUnknown_2024018
ldr r0, _080EF4FC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8]
@@ -1107,7 +1107,7 @@ sub_80EF4E0: @ 80EF4E0
movs r0, 0
b _080EF518
.align 2, 0
_080EF4FC: .4byte gUnknown_2024018
_080EF4FC: .4byte gBattleSpritesDataPtr
_080EF500: .4byte gBattleAnimArgs
_080EF504:
ldr r1, _080EF50C @ =gBattleAnimArgs
@@ -1210,7 +1210,7 @@ sub_80EF5AC: @ 80EF5AC
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r0, _080EF674 @ =gUnknown_2023D68
ldr r0, _080EF674 @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
adds r1, r0, 0
@@ -1240,14 +1240,14 @@ sub_80EF5AC: @ 80EF5AC
mov r8, r2
ldrb r0, [r2]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1257,7 +1257,7 @@ sub_80EF5AC: @ 80EF5AC
adds r4, r0
ldr r0, _080EF684 @ =sub_80EF8C0
str r0, [r4]
ldr r0, _080EF688 @ =gUnknown_2024018
ldr r0, _080EF688 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r3, [r0, 0x8]
ldr r1, _080EF68C @ =gBattlerSpriteIds
@@ -1297,12 +1297,12 @@ sub_80EF5AC: @ 80EF5AC
pop {r0}
bx r0
.align 2, 0
_080EF674: .4byte gUnknown_2023D68
_080EF674: .4byte gLastUsedItem
_080EF678: .4byte gUnknown_82606F4
_080EF67C: .4byte gSprites
_080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0
_080EF688: .4byte gUnknown_2024018
_080EF688: .4byte gBattleSpritesDataPtr
_080EF68C: .4byte gBattlerSpriteIds
_080EF690: .4byte gTasks
_080EF694: .4byte sub_80EF698
@@ -1369,7 +1369,7 @@ _080EF6F8:
bne _080EF708
movs r6, 0xD
_080EF708:
ldr r0, _080EF7C8 @ =gUnknown_2023D68
ldr r0, _080EF7C8 @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
adds r4, r0, 0
@@ -1379,7 +1379,7 @@ _080EF708:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_807685C
bl GetBattlerSpriteSubpriority
adds r3, r0, 0
adds r3, 0x1
lsls r3, 24
@@ -1411,14 +1411,14 @@ _080EF708:
mov r8, r1
ldrb r0, [r1]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1457,7 +1457,7 @@ _080EF708:
bx r0
.align 2, 0
_080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gUnknown_2023D68
_080EF7C8: .4byte gLastUsedItem
_080EF7CC: .4byte gUnknown_82606F4
_080EF7D0: .4byte gSprites
_080EF7D4: .4byte gBattleAnimTarget
@@ -1605,7 +1605,7 @@ sub_80EF8F0: @ 80EF8F0
lsls r0, 24
cmp r0, 0
beq _080EF99E
ldr r0, _080EF914 @ =gUnknown_2024018
ldr r0, _080EF914 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8]
@@ -1615,7 +1615,7 @@ sub_80EF8F0: @ 80EF8F0
str r0, [r4, 0x1C]
b _080EF99E
.align 2, 0
_080EF914: .4byte gUnknown_2024018
_080EF914: .4byte gBattleSpritesDataPtr
_080EF918: .4byte sub_80F0478
_080EF91C:
cmp r0, 0x6
@@ -1654,7 +1654,7 @@ _080EF954:
strh r0, [r4, 0x38]
ldr r0, _080EF9A8 @ =sub_80EF9B4
str r0, [r4, 0x1C]
ldr r0, _080EF9AC @ =gUnknown_2023D68
ldr r0, _080EF9AC @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
lsls r0, 24
@@ -1687,7 +1687,7 @@ _080EF99E:
bx r0
.align 2, 0
_080EF9A8: .4byte sub_80EF9B4
_080EF9AC: .4byte gUnknown_2023D68
_080EF9AC: .4byte gLastUsedItem
_080EF9B0: .4byte gBattleAnimTarget
thumb_func_end sub_80EF8F0
@@ -1781,7 +1781,7 @@ _080EFA5C:
_080EFA62:
adds r0, r4, 0
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
movs r0, 0x80
lsls r0, 1
strh r0, [r5, 0x1C]
@@ -1824,7 +1824,7 @@ _080EFAB4:
adds r0, r4, 0
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r5, 0xC]
ldrh r1, [r5, 0xE]
adds r0, r1
@@ -1850,7 +1850,7 @@ _080EFAF0: .4byte gSprites
_080EFAF4: .4byte 0x0000047f
_080EFAF8:
adds r0, r4, 0
bl sub_8075980
bl ResetSpriteRotScale
ldr r1, _080EFB1C @ =gSprites
lsls r0, r4, 4
adds r0, r4
@@ -2040,7 +2040,7 @@ _080EFC52:
adds r0, r1
strh r0, [r4, 0x22]
strh r5, [r4, 0x26]
ldr r0, _080EFC84 @ =gUnknown_2024018
ldr r0, _080EFC84 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8]
@@ -2052,7 +2052,7 @@ _080EFC52:
b _080EFC96
.align 2, 0
_080EFC80: .4byte 0xffffff00
_080EFC84: .4byte gUnknown_2024018
_080EFC84: .4byte gBattleSpritesDataPtr
_080EFC88: .4byte sub_80EFF80
_080EFC8C:
ldr r0, _080EFC9C @ =sub_80EFCA0
@@ -2090,7 +2090,7 @@ sub_80EFCA0: @ 80EFCA0
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r0, _080EFCE4 @ =gUnknown_2024018
ldr r0, _080EFCE4 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
strh r5, [r0, 0xC]
@@ -2103,7 +2103,7 @@ _080EFCDC:
pop {r0}
bx r0
.align 2, 0
_080EFCE4: .4byte gUnknown_2024018
_080EFCE4: .4byte gBattleSpritesDataPtr
_080EFCE8: .4byte sub_80EFCEC
thumb_func_end sub_80EFCA0
@@ -2135,7 +2135,7 @@ _080EFD0C:
.4byte _080EFED4
.4byte _080EFF34
_080EFD28:
ldr r1, _080EFD4C @ =gUnknown_2024018
ldr r1, _080EFD4C @ =gBattleSpritesDataPtr
ldr r5, [r1]
ldr r2, [r5, 0x8]
ldrh r3, [r2, 0xC]
@@ -2153,7 +2153,7 @@ _080EFD28:
strh r0, [r1, 0xC]
b _080EFD56
.align 2, 0
_080EFD4C: .4byte gUnknown_2024018
_080EFD4C: .4byte gBattleSpritesDataPtr
_080EFD50:
adds r0, r3, 0
adds r0, 0xB0
@@ -2214,7 +2214,7 @@ _080EFDB6:
bl ChangeSpriteAffineAnim
b _080EFF7A
_080EFDC0:
ldr r1, _080EFDE4 @ =gUnknown_2024018
ldr r1, _080EFDE4 @ =gBattleSpritesDataPtr
ldr r5, [r1]
ldr r2, [r5, 0x8]
ldrh r3, [r2, 0xC]
@@ -2232,7 +2232,7 @@ _080EFDC0:
strh r0, [r1, 0xC]
b _080EFDEE
.align 2, 0
_080EFDE4: .4byte gUnknown_2024018
_080EFDE4: .4byte gBattleSpritesDataPtr
_080EFDE8:
adds r0, r3, 0
adds r0, 0xB0
@@ -2307,7 +2307,7 @@ _080EFE68:
movs r1, 0x1
bl ChangeSpriteAffineAnim
_080EFE70:
ldr r1, _080EFE94 @ =gUnknown_2024018
ldr r1, _080EFE94 @ =gBattleSpritesDataPtr
ldr r5, [r1]
ldr r2, [r5, 0x8]
ldrh r3, [r2, 0xC]
@@ -2325,7 +2325,7 @@ _080EFE70:
strh r0, [r1, 0xC]
b _080EFE9E
.align 2, 0
_080EFE94: .4byte gUnknown_2024018
_080EFE94: .4byte gBattleSpritesDataPtr
_080EFE98:
adds r0, r3, 0
adds r0, 0xB0
@@ -2367,7 +2367,7 @@ _080EFED4:
strh r0, [r4, 0x34]
lsls r0, 16
asrs r1, r0, 24
ldr r0, _080EFF04 @ =gUnknown_2024018
ldr r0, _080EFF04 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8]
@@ -2383,7 +2383,7 @@ _080EFED4:
str r0, [r4, 0x1C]
b _080EFF7A
.align 2, 0
_080EFF04: .4byte gUnknown_2024018
_080EFF04: .4byte gBattleSpritesDataPtr
_080EFF08: .4byte sub_80EFF80
_080EFF0C:
cmp r0, 0x4
@@ -2538,7 +2538,7 @@ _080F0008:
_080F0026:
cmp r1, 0x5F
bne _080F004C
ldr r0, _080F0044 @ =gUnknown_2024005
ldr r0, _080F0044 @ =gDoingBattleAnim
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -2548,7 +2548,7 @@ _080F0026:
bl PlaySE
b _080F0088
.align 2, 0
_080F0044: .4byte gUnknown_2024005
_080F0044: .4byte gDoingBattleAnim
_080F0048: .4byte 0x0000013f
_080F004C:
ldr r0, _080F0094 @ =0x0000013b
@@ -2873,7 +2873,7 @@ sub_80F02B0: @ 80F02B0
bl StartSpriteAffineAnim
ldr r0, _080F0364 @ =sub_80F0378
str r0, [r4, 0x1C]
ldr r0, _080F0368 @ =gUnknown_2023D68
ldr r0, _080F0368 @ =gLastUsedItem
ldrh r0, [r0]
bl ItemIdToBallId
lsls r0, 24
@@ -2949,7 +2949,7 @@ _080F0302:
bx r0
.align 2, 0
_080F0364: .4byte sub_80F0378
_080F0368: .4byte gUnknown_2023D68
_080F0368: .4byte gLastUsedItem
_080F036C: .4byte gBattleAnimTarget
_080F0370: .4byte gSprites
_080F0374: .4byte gBattlerSpriteIds
@@ -3045,7 +3045,7 @@ _080F03F0:
adds r2, r0
lsls r2, 2
adds r2, r4
ldr r0, _080F046C @ =gUnknown_2024018
ldr r0, _080F046C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x9]
@@ -3062,7 +3062,7 @@ _080F03F0:
strh r5, [r7, 0x2E]
ldr r0, _080F0470 @ =sub_80F018C
str r0, [r7, 0x1C]
ldr r0, _080F0474 @ =gUnknown_2024005
ldr r0, _080F0474 @ =gDoingBattleAnim
strb r6, [r0]
movs r0, 0x1
bl UpdateOamPriorityInAllHealthboxes
@@ -3075,9 +3075,9 @@ _080F045C: .4byte 0xfffffee0
_080F0460: .4byte gSprites
_080F0464: .4byte gBattlerSpriteIds
_080F0468: .4byte gBattleAnimTarget
_080F046C: .4byte gUnknown_2024018
_080F046C: .4byte gBattleSpritesDataPtr
_080F0470: .4byte sub_80F018C
_080F0474: .4byte gUnknown_2024005
_080F0474: .4byte gDoingBattleAnim
thumb_func_end sub_80F0378
thumb_func_start sub_80F0478
@@ -3164,7 +3164,7 @@ _080F050A:
strh r0, [r4, 0x2E]
ldr r0, _080F0524 @ =sub_80F018C
str r0, [r4, 0x1C]
ldr r1, _080F0528 @ =gUnknown_2024005
ldr r1, _080F0528 @ =gDoingBattleAnim
movs r0, 0
strb r0, [r1]
movs r0, 0x1
@@ -3175,7 +3175,7 @@ _080F051E:
bx r0
.align 2, 0
_080F0524: .4byte sub_80F018C
_080F0528: .4byte gUnknown_2024005
_080F0528: .4byte gDoingBattleAnim
thumb_func_end sub_80F04B4
thumb_func_start sub_80F052C
@@ -3237,7 +3237,7 @@ _080F0590:
strh r0, [r4, 0x2E]
ldr r0, _080F05AC @ =sub_80F018C
str r0, [r4, 0x1C]
ldr r0, _080F05B0 @ =gUnknown_2024005
ldr r0, _080F05B0 @ =gDoingBattleAnim
strb r1, [r0]
movs r0, 0x1
bl UpdateOamPriorityInAllHealthboxes
@@ -3247,7 +3247,7 @@ _080F05A4:
bx r0
.align 2, 0
_080F05AC: .4byte sub_80F018C
_080F05B0: .4byte gUnknown_2024005
_080F05B0: .4byte gDoingBattleAnim
thumb_func_end sub_80F0574
thumb_func_start sub_80F05B4
@@ -3356,7 +3356,7 @@ sub_80F0674: @ 80F0674
ands r0, r1
cmp r0, 0
beq _080F0692
ldr r0, _080F06A0 @ =gUnknown_2024018
ldr r0, _080F06A0 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x8]
ldrb r0, [r1, 0xA]
@@ -3368,7 +3368,7 @@ _080F0692:
.align 2, 0
_080F0698: .4byte gMain
_080F069C: .4byte 0x00000439
_080F06A0: .4byte gUnknown_2024018
_080F06A0: .4byte gBattleSpritesDataPtr
thumb_func_end sub_80F0674
thumb_func_start sub_80F06A4
@@ -4771,7 +4771,7 @@ sub_80F1198: @ 80F1198
_080F11BC: .4byte gMain
_080F11C0: .4byte 0x00000439
_080F11C4:
ldr r2, _080F1200 @ =gUnknown_2024018
ldr r2, _080F1200 @ =gBattleSpritesDataPtr
ldr r0, [r2]
ldr r1, [r0, 0x8]
ldrb r0, [r1, 0xA]
@@ -4800,7 +4800,7 @@ _080F11F6:
bl DestroySprite
b _080F1212
.align 2, 0
_080F1200: .4byte gUnknown_2024018
_080F1200: .4byte gBattleSpritesDataPtr
_080F1204: .4byte gUnknown_840BF48
_080F1208: .4byte gUnknown_840BFA8
_080F120C:
@@ -5420,7 +5420,7 @@ sub_80F16CC: @ 80F16CC
lsls r0, 24
lsrs r0, 24
ldr r3, _080F16F4 @ =gBattleAnimArgs
ldr r1, _080F16F8 @ =gUnknown_2024018
ldr r1, _080F16F8 @ =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, _080F16FC @ =gBattleAnimAttacker
ldrb r1, [r1]
@@ -5436,7 +5436,7 @@ sub_80F16CC: @ 80F16CC
bx r0
.align 2, 0
_080F16F4: .4byte gBattleAnimArgs
_080F16F8: .4byte gUnknown_2024018
_080F16F8: .4byte gBattleSpritesDataPtr
_080F16FC: .4byte gBattleAnimAttacker
thumb_func_end sub_80F16CC
@@ -5446,7 +5446,7 @@ sub_80F1700: @ 80F1700
lsls r0, 24
lsrs r0, 24
ldr r2, _080F1718 @ =gBattleAnimTarget
ldr r1, _080F171C @ =gUnknown_2023D6E
ldr r1, _080F171C @ =gEffectBattler
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -5454,7 +5454,7 @@ sub_80F1700: @ 80F1700
bx r0
.align 2, 0
_080F1718: .4byte gBattleAnimTarget
_080F171C: .4byte gUnknown_2023D6E
_080F171C: .4byte gEffectBattler
thumb_func_end sub_80F1700
thumb_func_start sub_80F1720
@@ -5467,7 +5467,7 @@ sub_80F1720: @ 80F1720
lsrs r6, r0, 24
movs r0, 0
mov r8, r0
ldr r0, _080F17DC @ =gUnknown_2024018
ldr r0, _080F17DC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x4]
lsls r0, r6, 1
@@ -5487,7 +5487,7 @@ sub_80F1720: @ 80F1720
bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080F17F8
@@ -5547,7 +5547,7 @@ _080F179E:
strh r0, [r1, 0xA]
b _080F180E
.align 2, 0
_080F17DC: .4byte gUnknown_2024018
_080F17DC: .4byte gBattleSpritesDataPtr
_080F17E0: .4byte 0x0000ffff
_080F17E4: .4byte 0x000027f9
_080F17E8: .4byte gUnknown_83AD350
@@ -5555,7 +5555,7 @@ _080F17EC: .4byte gUnknown_83ADC58
_080F17F0: .4byte sub_80F181C
_080F17F4: .4byte gTasks
_080F17F8:
ldr r0, _080F1818 @ =gUnknown_2024018
ldr r0, _080F1818 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x4]
lsls r0, r6, 1
@@ -5573,7 +5573,7 @@ _080F180E:
pop {r0}
bx r0
.align 2, 0
_080F1818: .4byte gUnknown_2024018
_080F1818: .4byte gBattleSpritesDataPtr
thumb_func_end sub_80F1720
thumb_func_start sub_80F181C
@@ -5600,7 +5600,7 @@ sub_80F181C: @ 80F181C
.align 2, 0
_080F1844: .4byte gTasks
_080F1848:
ldr r0, _080F189C @ =gUnknown_2024018
ldr r0, _080F189C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0xA]
@@ -5622,12 +5622,12 @@ _080F186A:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5642,7 +5642,7 @@ _080F186A:
lsrs r5, r0, 24
b _080F1906
.align 2, 0
_080F189C: .4byte gUnknown_2024018
_080F189C: .4byte gBattleSpritesDataPtr
_080F18A0: .4byte gUnknown_83FF168
_080F18A4:
cmp r0, 0
@@ -5817,7 +5817,7 @@ sub_80F19E0: @ 80F19E0
cmp r0, 0x1
bne _080F1A1A
ldrb r1, [r1, 0x8]
ldr r0, _080F1A28 @ =gUnknown_2024018
ldr r0, _080F1A28 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -5836,7 +5836,7 @@ _080F1A20:
bx r0
.align 2, 0
_080F1A24: .4byte gTasks
_080F1A28: .4byte gUnknown_2024018
_080F1A28: .4byte gBattleSpritesDataPtr
thumb_func_end sub_80F19E0
thumb_func_start sub_80F1A2C
@@ -5990,7 +5990,7 @@ sub_80F1B3C: @ 80F1B3C
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r5, _080F1BB0 @ =gBattleAnimArgs
lsrs r0, 24
@@ -6002,7 +6002,7 @@ sub_80F1B3C: @ 80F1B3C
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -6192,7 +6192,7 @@ sub_80F1CE4: @ 80F1CE4
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _080F1CF8 @ =gUnknown_2023E82
ldr r2, _080F1CF8 @ =gBattleCommunication
ldrb r0, [r2, 0x5]
cmp r0, 0x2
bls _080F1D00
@@ -6200,7 +6200,7 @@ sub_80F1CE4: @ 80F1CE4
movs r0, 0
b _080F1D04
.align 2, 0
_080F1CF8: .4byte gUnknown_2023E82
_080F1CF8: .4byte gBattleCommunication
_080F1CFC: .4byte gBattleAnimArgs
_080F1D00:
ldr r1, _080F1D10 @ =gBattleAnimArgs
@@ -6220,7 +6220,7 @@ sub_80F1D14: @ 80F1D14
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F1D2C @ =gUnknown_2024018
ldr r0, _080F1D2C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrh r1, [r0]
@@ -6230,7 +6230,7 @@ sub_80F1D14: @ 80F1D14
movs r0, 0x1
b _080F1D6C
.align 2, 0
_080F1D2C: .4byte gUnknown_2024018
_080F1D2C: .4byte gBattleSpritesDataPtr
_080F1D30: .4byte gBattleAnimArgs
_080F1D34:
cmp r1, 0xFA
@@ -6277,7 +6277,7 @@ sub_80F1D7C: @ 80F1D7C
lsls r0, 24
lsrs r0, 24
ldr r3, _080F1DA0 @ =gBattleAnimAttacker
ldr r1, _080F1DA4 @ =gUnknown_2024018
ldr r1, _080F1DA4 @ =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, [r2, 0x8]
ldrh r1, [r1]
@@ -6292,7 +6292,7 @@ sub_80F1D7C: @ 80F1D7C
bx r0
.align 2, 0
_080F1DA0: .4byte gBattleAnimAttacker
_080F1DA4: .4byte gUnknown_2024018
_080F1DA4: .4byte gBattleSpritesDataPtr
_080F1DA8: .4byte gBattleAnimTarget
thumb_func_end sub_80F1D7C
asm/battle_anim_status_effects.s
+12 -12
View File
@@ -344,7 +344,7 @@ sub_80783FC: @ 80783FC
ldr r4, _080784AC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, _080784B0 @ =0xffe00000
@@ -352,13 +352,13 @@ sub_80783FC: @ 80783FC
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, _080784B4 @ =0xffdc0000
adds r0, r1
lsrs r4, r0, 16
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0807843A
@@ -662,7 +662,7 @@ sub_8078694: @ 8078694
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r0, _080786B8 @ =gUnknown_2024018
ldr r0, _080786B8 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrh r0, [r0]
@@ -677,7 +677,7 @@ _080786AC:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080786B8: .4byte gUnknown_2024018
_080786B8: .4byte gBattleSpritesDataPtr
_080786BC: .4byte _080786C0
.align 2, 0
_080786C0:
@@ -907,7 +907,7 @@ LaunchStatusAnimation: @ 807886C
strb r4, [r0]
ldr r0, _080788B0 @ =gUnknown_81C6E84
movs r2, 0
bl sub_80725D4
bl LaunchBattleAnimation
ldr r0, _080788B4 @ =task0A_80788BC
movs r1, 0xA
bl CreateTask
@@ -935,14 +935,14 @@ task0A_80788BC: @ 80788BC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08078904 @ =gUnknown_2037EDC
ldr r0, _08078904 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
ldr r0, _08078908 @ =gUnknown_2037EE1
ldr r0, _08078908 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _080788FE
ldr r0, _0807890C @ =gUnknown_2024018
ldr r0, _0807890C @ =gBattleSpritesDataPtr
ldr r2, [r0]
ldr r1, _08078910 @ =gTasks
lsls r0, r4, 2
@@ -968,9 +968,9 @@ _080788FE:
pop {r0}
bx r0
.align 2, 0
_08078904: .4byte gUnknown_2037EDC
_08078908: .4byte gUnknown_2037EE1
_0807890C: .4byte gUnknown_2024018
_08078904: .4byte gAnimScriptCallback
_08078908: .4byte gAnimScriptActive
_0807890C: .4byte gBattleSpritesDataPtr
_08078910: .4byte gTasks
thumb_func_end task0A_80788BC
asm/battle_anim_utility_funcs.s
+47 -47
View File
@@ -137,7 +137,7 @@ _080BA8EA:
cmp r4, r0
beq _080BA914
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080BA914
@@ -176,7 +176,7 @@ sub_80BA934: @ 80BA934
ldrsh r0, [r0, r1]
bl sub_80B9A14
adds r2, r0, 0
ldr r0, _080BA95C @ =gUnknown_2022B50
ldr r0, _080BA95C @ =gBattleTerrain
ldrb r0, [r0]
cmp r0, 0x9
bhi _080BAA0A
@@ -187,7 +187,7 @@ sub_80BA934: @ 80BA934
mov pc, r0
.align 2, 0
_080BA958: .4byte gBattleAnimArgs
_080BA95C: .4byte gUnknown_2022B50
_080BA95C: .4byte gBattleTerrain
_080BA960: .4byte _080BA964
.align 2, 0
_080BA964:
@@ -707,7 +707,7 @@ sub_80BACEC: @ 80BACEC
ldrh r1, [r4]
movs r0, 0xA
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BAD7A
@@ -722,11 +722,11 @@ sub_80BACEC: @ 80BACEC
movs r0, 0xA
bl SetGpuReg
_080BAD7A:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080BADFE
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BADFE
@@ -746,7 +746,7 @@ _080BADAA:
ldrb r0, [r5]
movs r6, 0x2
eors r0, r6
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -844,7 +844,7 @@ _080BAE5C:
ldrb r0, [r0, 0x9]
ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap
bl sub_807543C
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080BAEAC
@@ -967,7 +967,7 @@ sub_80BAF38: @ 80BAF38
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BAFCA
@@ -1134,7 +1134,7 @@ _080BB0FA:
movs r1, 0x2
eors r0, r1
strb r0, [r2, 0x1]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BB12A
@@ -1144,7 +1144,7 @@ _080BB0FA:
cmp r0, 0
beq _080BB130
ldrb r0, [r1, 0x1]
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080BB130
@@ -1183,7 +1183,7 @@ _080BB130:
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BB18E
@@ -1192,7 +1192,7 @@ _080BB130:
movs r2, 0x1
bl SetAnimBgAttribute
_080BB18E:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080BB20A
@@ -1217,7 +1217,7 @@ _080BB18E:
_080BB1C0:
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
@@ -1369,7 +1369,7 @@ _080BB30C:
ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap
bl sub_807543C
_080BB316:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080BB32E
@@ -1692,7 +1692,7 @@ _080BB582:
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BB5B2
@@ -2234,7 +2234,7 @@ _080BB9BA:
beq _080BB9F8
lsls r0, r4, 24
lsrs r0, 24
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080BB9F8
@@ -2313,7 +2313,7 @@ sub_80BBA20: @ 80BBA20
movs r0, 0x2
adds r6, r7, 0
eors r6, r0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BBA82
@@ -2321,7 +2321,7 @@ sub_80BBA20: @ 80BBA20
cmp r1, 0
beq _080BBA86
adds r0, r6, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080BBA86
@@ -2370,7 +2370,7 @@ _080BBA86:
movs r1, 0x20
orrs r0, r1
strb r0, [r2]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BBAFC
@@ -2446,7 +2446,7 @@ _080BBB80:
ldrb r0, [r0, 0x9]
ldr r1, [sp, 0x58]
bl sub_807543C
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080BBBA8
@@ -2669,7 +2669,7 @@ _080BBD00:
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BBD7E
@@ -2745,7 +2745,7 @@ sub_80BBDF0: @ 80BBDF0
lsls r0, 24
lsrs r0, 24
ldr r2, _080BBE08 @ =gBattleAnimArgs
ldr r1, _080BBE0C @ =gUnknown_2022B50
ldr r1, _080BBE0C @ =gBattleTerrain
ldrb r1, [r1]
strh r1, [r2]
bl DestroyAnimVisualTask
@@ -2753,7 +2753,7 @@ sub_80BBDF0: @ 80BBDF0
bx r0
.align 2, 0
_080BBE08: .4byte gBattleAnimArgs
_080BBE0C: .4byte gUnknown_2022B50
_080BBE0C: .4byte gBattleTerrain
thumb_func_end sub_80BBDF0
thumb_func_start sub_80BBE10
@@ -3044,7 +3044,7 @@ sub_80BC02C: @ 80BC02C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8073788
bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -3078,7 +3078,7 @@ sub_80BC060: @ 80BC060
ldrb r1, [r1]
strb r1, [r2]
ldr r2, _080BC088 @ =gBattleAnimTarget
ldr r1, _080BC08C @ =gUnknown_2023D6E
ldr r1, _080BC08C @ =gEffectBattler
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -3088,7 +3088,7 @@ sub_80BC060: @ 80BC060
_080BC080: .4byte gBattleAnimAttacker
_080BC084: .4byte gBattlerTarget
_080BC088: .4byte gBattleAnimTarget
_080BC08C: .4byte gUnknown_2023D6E
_080BC08C: .4byte gEffectBattler
thumb_func_end sub_80BC060
thumb_func_start sub_80BC090
@@ -3151,11 +3151,11 @@ sub_80BC0FC: @ 80BC0FC
lsls r0, 24
lsrs r0, 24
ldr r2, _080BC11C @ =gBattleAnimAttacker
ldr r1, _080BC120 @ =sBattler_AI
ldr r1, _080BC120 @ =gBattlerAttacker
ldrb r1, [r1]
strb r1, [r2]
ldr r2, _080BC124 @ =gBattleAnimTarget
ldr r1, _080BC128 @ =gUnknown_2023D6E
ldr r1, _080BC128 @ =gEffectBattler
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -3163,9 +3163,9 @@ sub_80BC0FC: @ 80BC0FC
bx r0
.align 2, 0
_080BC11C: .4byte gBattleAnimAttacker
_080BC120: .4byte sBattler_AI
_080BC120: .4byte gBattlerAttacker
_080BC124: .4byte gBattleAnimTarget
_080BC128: .4byte gUnknown_2023D6E
_080BC128: .4byte gEffectBattler
thumb_func_end sub_80BC0FC
thumb_func_start sub_80BC12C
@@ -3173,7 +3173,7 @@ sub_80BC12C: @ 80BC12C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080BC144
@@ -3186,7 +3186,7 @@ _080BC144:
adds r3, r4
lsls r3, 3
adds r3, r0
ldr r0, _080BC18C @ =gUnknown_2024018
ldr r0, _080BC18C @ =gBattleSpritesDataPtr
ldr r4, [r0]
ldr r2, _080BC190 @ =gBattleAnimAttacker
ldrb r0, [r2]
@@ -3217,7 +3217,7 @@ _080BC180:
bx r0
.align 2, 0
_080BC188: .4byte gTasks
_080BC18C: .4byte gUnknown_2024018
_080BC18C: .4byte gBattleSpritesDataPtr
_080BC190: .4byte gBattleAnimAttacker
_080BC194: .4byte sub_80BC19C
_080BC198: .4byte gUnknown_2037EE2
@@ -3235,7 +3235,7 @@ sub_80BC19C: @ 80BC19C
lsls r0, 5
cmp r1, r0
bne _080BC1E0
ldr r0, _080BC1EC @ =gUnknown_2024018
ldr r0, _080BC1EC @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _080BC1F0 @ =gBattleAnimAttacker
ldrb r3, [r0]
@@ -3264,7 +3264,7 @@ _080BC1E0:
bx r0
.align 2, 0
_080BC1E8: .4byte gBattleAnimArgs
_080BC1EC: .4byte gUnknown_2024018
_080BC1EC: .4byte gBattleSpritesDataPtr
_080BC1F0: .4byte gBattleAnimAttacker
_080BC1F4: .4byte gTasks
thumb_func_end sub_80BC19C
@@ -3488,8 +3488,8 @@ _080BC396:
bx r1
thumb_func_end sub_80BC30C
thumb_func_start sub_80BC3A0
sub_80BC3A0: @ 80BC3A0
thumb_func_start HandleIntroSlide
HandleIntroSlide: @ 80BC3A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3549,7 +3549,7 @@ _080BC3E8:
.align 2, 0
_080BC414: .4byte gUnknown_83E7CD4
_080BC418: .4byte gTasks
thumb_func_end sub_80BC3A0
thumb_func_end HandleIntroSlide
thumb_func_start sub_80BC41C
sub_80BC41C: @ 80BC41C
@@ -3707,7 +3707,7 @@ _080BC544:
strh r0, [r1, 0xC]
movs r0, 0x20
strh r0, [r1, 0xE]
ldr r2, _080BC56C @ =gUnknown_2023F4C
ldr r2, _080BC56C @ =gIntroSlideFlags
ldrh r1, [r2]
ldr r0, _080BC570 @ =0x0000fffe
ands r0, r1
@@ -3715,7 +3715,7 @@ _080BC544:
b _080BC6BA
.align 2, 0
_080BC568: .4byte gUnknown_2022986
_080BC56C: .4byte gUnknown_2023F4C
_080BC56C: .4byte gIntroSlideFlags
_080BC570: .4byte 0x0000fffe
_080BC574:
lsls r0, r4, 2
@@ -4075,7 +4075,7 @@ _080BC820:
strh r0, [r1, 0xE]
movs r0, 0x1
strh r0, [r1, 0x12]
ldr r2, _080BC850 @ =gUnknown_2023F4C
ldr r2, _080BC850 @ =gIntroSlideFlags
ldrh r1, [r2]
ldr r0, _080BC854 @ =0x0000fffe
ands r0, r1
@@ -4084,7 +4084,7 @@ _080BC820:
.align 2, 0
_080BC848: .4byte gUnknown_2022986
_080BC84C: .4byte gTasks
_080BC850: .4byte gUnknown_2023F4C
_080BC850: .4byte gIntroSlideFlags
_080BC854: .4byte 0x0000fffe
_080BC858:
ldr r0, _080BC890 @ =gTasks
@@ -4398,7 +4398,7 @@ _080BCAC0:
strh r0, [r1, 0xE]
movs r0, 0x1
strh r0, [r1, 0x12]
ldr r2, _080BCAF0 @ =gUnknown_2023F4C
ldr r2, _080BCAF0 @ =gIntroSlideFlags
ldrh r1, [r2]
ldr r0, _080BCAF4 @ =0x0000fffe
ands r0, r1
@@ -4407,7 +4407,7 @@ _080BCAC0:
.align 2, 0
_080BCAE8: .4byte gUnknown_2022986
_080BCAEC: .4byte gTasks
_080BCAF0: .4byte gUnknown_2023F4C
_080BCAF0: .4byte gIntroSlideFlags
_080BCAF4: .4byte 0x0000fffe
_080BCAF8:
lsls r0, r5, 2
@@ -4782,7 +4782,7 @@ _080BCDDC:
strh r0, [r1, 0xC]
movs r0, 0x20
strh r0, [r1, 0xE]
ldr r2, _080BCE00 @ =gUnknown_2023F4C
ldr r2, _080BCE00 @ =gIntroSlideFlags
ldrh r1, [r2]
ldr r0, _080BCE04 @ =0x0000fffe
ands r0, r1
@@ -4790,7 +4790,7 @@ _080BCDDC:
b _080BCEE6
.align 2, 0
_080BCDFC: .4byte gUnknown_2022986
_080BCE00: .4byte gUnknown_2023F4C
_080BCE00: .4byte gIntroSlideFlags
_080BCE04: .4byte 0x0000fffe
_080BCE08:
ldr r2, _080BCECC @ =gUnknown_2022986
asm/battle_controller_link_opponent.s
-6260
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_link_partner.s
-5929
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_oak.s
+309 -309
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_opponent.s
-6736
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player.s
-11027
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_pokedude.s
+325 -325
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_safari.s
-1534
View File
File diff suppressed because it is too large Load Diff
asm/battle_controllers.s
-3392
View File
File diff suppressed because it is too large Load Diff
asm/battle_gfx_sfx_util.s
-3606
View File
File diff suppressed because it is too large Load Diff
asm/battle_interface.s
+76 -76
View File
@@ -255,8 +255,8 @@ sub_8047CAC: @ 8047CAC
bx r0
thumb_func_end sub_8047CAC
thumb_func_start CreateBankHealthboxSprites
CreateBankHealthboxSprites: @ 8047CE0
thumb_func_start CreateBattlerHealthboxSprites
CreateBattlerHealthboxSprites: @ 8047CE0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -268,7 +268,7 @@ CreateBankHealthboxSprites: @ 8047CE0
mov r10, r0
movs r0, 0
str r0, [sp]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08047DF4
@@ -522,7 +522,7 @@ _08047E98:
_08047F1A:
str r0, [sp]
_08047F1C:
ldr r0, _08047FF4 @ =gUnknown_2023BD6
ldr r0, _08047FF4 @ =gBattlerPositions
add r0, r10
ldrb r1, [r0]
lsls r0, r1, 1
@@ -621,12 +621,12 @@ _08047FE4: .4byte gSprites
_08047FE8: .4byte 0x000003ff
_08047FEC: .4byte 0xfffffc00
_08047FF0: .4byte sub_8048128
_08047FF4: .4byte gUnknown_2023BD6
_08047FF4: .4byte gBattlerPositions
_08047FF8: .4byte gUnknown_82602F8
_08047FFC: .4byte gUnknown_82603C4
_08048000: .4byte 0x06010000
_08048004: .4byte 0x04000010
thumb_func_end CreateBankHealthboxSprites
thumb_func_end CreateBattlerHealthboxSprites
thumb_func_start CreateSafariPlayerHealthboxSprites
CreateSafariPlayerHealthboxSprites: @ 8048008
@@ -808,7 +808,7 @@ SetBattleBarStruct: @ 8048150
ldr r7, [sp, 0x14]
lsls r0, 24
lsrs r0, 24
ldr r6, _08048180 @ =gUnknown_2024018
ldr r6, _08048180 @ =gBattleSpritesDataPtr
ldr r4, [r6]
ldr r5, [r4, 0xC]
lsls r4, r0, 2
@@ -828,7 +828,7 @@ SetBattleBarStruct: @ 8048150
pop {r0}
bx r0
.align 2, 0
_08048180: .4byte gUnknown_2024018
_08048180: .4byte gBattleSpritesDataPtr
_08048184: .4byte 0xffff8000
thumb_func_end SetBattleBarStruct
@@ -970,10 +970,10 @@ DestoryHealthboxSprite: @ 8048248
_08048284: .4byte gSprites
thumb_func_end DestoryHealthboxSprite
thumb_func_start nullsub_21
nullsub_21: @ 8048288
thumb_func_start DummyBattleInterfaceFunc
DummyBattleInterfaceFunc: @ 8048288
bx lr
thumb_func_end nullsub_21
thumb_func_end DummyBattleInterfaceFunc
thumb_func_start UpdateOamPriorityInAllHealthboxes
UpdateOamPriorityInAllHealthboxes: @ 804828C
@@ -996,7 +996,7 @@ UpdateOamPriorityInAllHealthboxes: @ 804828C
lsls r5, r0, 2
movs r7, 0xD
negs r7, r7
ldr r2, _08048318 @ =gUnknown_3004FF0
ldr r2, _08048318 @ =gHealthboxSpriteIds
mov r9, r2
_080482B6:
mov r1, r9
@@ -1048,17 +1048,17 @@ _08048304:
.align 2, 0
_08048310: .4byte gBattlersCount
_08048314: .4byte gSprites
_08048318: .4byte gUnknown_3004FF0
_08048318: .4byte gHealthboxSpriteIds
thumb_func_end UpdateOamPriorityInAllHealthboxes
thumb_func_start SetBankHealthboxSpritePos
SetBankHealthboxSpritePos: @ 804831C
thumb_func_start InitBattlerHealthboxCoords
InitBattlerHealthboxCoords: @ 804831C
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
movs r4, 0
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08048348
@@ -1108,7 +1108,7 @@ _0804837C:
movs r5, 0x20
movs r4, 0x2C
_08048380:
ldr r0, _08048394 @ =gUnknown_3004FF0
ldr r0, _08048394 @ =gHealthboxSpriteIds
adds r0, r6, r0
ldrb r0, [r0]
adds r1, r5, 0
@@ -1118,8 +1118,8 @@ _08048380:
pop {r0}
bx r0
.align 2, 0
_08048394: .4byte gUnknown_3004FF0
thumb_func_end SetBankHealthboxSpritePos
_08048394: .4byte gHealthboxSpriteIds
thumb_func_end InitBattlerHealthboxCoords
thumb_func_start UpdateLvlInHealthbox
UpdateLvlInHealthbox: @ 8048398
@@ -1169,7 +1169,7 @@ UpdateLvlInHealthbox: @ 8048398
lsls r0, 24
cmp r0, 0
bne _08048420
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
ldr r2, _08048418 @ =0x06010420
adds r1, r4, r2
@@ -1201,8 +1201,8 @@ _08048424:
_0804843C: .4byte 0x06010400
thumb_func_end UpdateLvlInHealthbox
thumb_func_start sub_8048440
sub_8048440: @ 8048440
thumb_func_start UpdateHpTextInHealthbox
UpdateHpTextInHealthbox: @ 8048440
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1230,7 +1230,7 @@ sub_8048440: @ 8048440
lsls r0, 24
cmp r0, 0
bne _08048514
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08048514
@@ -1315,7 +1315,7 @@ _08048514:
ldrh r0, [r7, 0x3A]
lsls r0, 24
lsrs r6, r0, 24
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1425,7 +1425,7 @@ _08048608: .4byte gMonSpritesGfxPtr
_0804860C: .4byte gSprites
_08048610: .4byte 0x06010000
_08048614: .4byte 0x04000008
thumb_func_end sub_8048440
thumb_func_end UpdateHpTextInHealthbox
thumb_func_start sub_8048618
sub_8048618: @ 8048618
@@ -1457,7 +1457,7 @@ sub_8048618: @ 8048618
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r0, _08048700 @ =gUnknown_2024018
ldr r0, _08048700 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0]
mov r3, r10
@@ -1541,7 +1541,7 @@ _080486C6:
.align 2, 0
_080486F8: .4byte gUnknown_8260542
_080486FC: .4byte gSprites
_08048700: .4byte gUnknown_2024018
_08048700: .4byte gBattleSpritesDataPtr
_08048704: .4byte gUnknown_8260540
_08048708: .4byte gMonSpritesGfxPtr
_0804870C: .4byte 0x06010000
@@ -1945,8 +1945,8 @@ _08048A44: .4byte 0x060100c0
_08048A48: .4byte 0x04000008
thumb_func_end sub_80487F8
thumb_func_start sub_8048A4C
sub_8048A4C: @ 8048A4C
thumb_func_start SwapHpBarsWithHpText
SwapHpBarsWithHpText: @ 8048A4C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1966,7 +1966,7 @@ _08048A66:
ldr r2, _08048B80 @ =gBattlerPartyIndexes
mov r8, r2
_08048A6E:
ldr r0, _08048B84 @ =gUnknown_3004FF0
ldr r0, _08048B84 @ =gHealthboxSpriteIds
mov r1, r9
adds r6, r1, r0
ldrb r1, [r6]
@@ -1993,7 +1993,7 @@ _08048A8C:
bne _08048AA2
b _08048CE0
_08048AA2:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08048ABA
@@ -2004,7 +2004,7 @@ _08048AA2:
bne _08048ABA
b _08048CE0
_08048ABA:
ldr r5, _08048B8C @ =gUnknown_2024018
ldr r5, _08048B8C @ =gBattleSpritesDataPtr
ldr r0, [r5]
ldr r3, [r0]
mov r0, r9
@@ -2036,7 +2036,7 @@ _08048ABA:
lsls r0, 24
cmp r0, 0
bne _08048BE8
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08048B08
@@ -2099,9 +2099,9 @@ _08048B16:
_08048B78: .4byte gBattlersCount
_08048B7C: .4byte gSprites
_08048B80: .4byte gBattlerPartyIndexes
_08048B84: .4byte gUnknown_3004FF0
_08048B84: .4byte gHealthboxSpriteIds
_08048B88: .4byte SpriteCallbackDummy
_08048B8C: .4byte gUnknown_2024018
_08048B8C: .4byte gBattleSpritesDataPtr
_08048B90: .4byte gBattleTypeFlags
_08048B94: .4byte 0x06010000
_08048B98: .4byte 0x05000040
@@ -2242,7 +2242,7 @@ _08048C94:
movs r2, 0x4
bl UpdateHealthboxAttribute
_08048CCA:
ldr r0, _08048D0C @ =gUnknown_3004FF0
ldr r0, _08048D0C @ =gHealthboxSpriteIds
add r0, r9
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2275,12 +2275,12 @@ _08048CF2:
.align 2, 0
_08048D04: .4byte gEnemyParty
_08048D08: .4byte gBattleTypeFlags
_08048D0C: .4byte gUnknown_3004FF0
_08048D0C: .4byte gHealthboxSpriteIds
_08048D10: .4byte gBattlersCount
thumb_func_end sub_8048A4C
thumb_func_end SwapHpBarsWithHpText
thumb_func_start sub_8048D14
sub_8048D14: @ 8048D14
thumb_func_start CreatePartyStatusSummarySprites
CreatePartyStatusSummarySprites: @ 8048D14
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2323,7 +2323,7 @@ _08048D64:
movs r7, 0x1
cmp r4, 0
beq _08048D74
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08048D7A
@@ -2866,10 +2866,10 @@ _08049172:
.align 2, 0
_080491A8: .4byte TaskDummy
_080491AC: .4byte gTasks
thumb_func_end sub_8048D14
thumb_func_end CreatePartyStatusSummarySprites
thumb_func_start sub_80491B0
sub_80491B0: @ 80491B0
thumb_func_start Task_HidePartyStatusSummary
Task_HidePartyStatusSummary: @ 80491B0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3099,7 +3099,7 @@ _0804936E:
.align 2, 0
_08049380: .4byte gTasks
_08049384: .4byte sub_804948C
thumb_func_end sub_80491B0
thumb_func_end Task_HidePartyStatusSummary
thumb_func_start sub_8049388
sub_8049388: @ 8049388
@@ -3668,7 +3668,7 @@ _08049782:
adds r1, r6, 0
movs r2, 0x6
bl sub_804A6E8
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
ldr r2, _080497F0 @ =0x06010400
adds r5, r4, r2
@@ -3877,7 +3877,7 @@ UpdateStatusIconInHealthbox: @ 8049934
movs r1, 0x37
bl GetMonData
adds r4, r0, 0
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
movs r3, 0x12
mov r8, r3
@@ -4009,7 +4009,7 @@ _08049A7E:
adds r4, 0x1
cmp r4, 0x2
ble _08049A7E
ldr r0, _08049AEC @ =gUnknown_2024018
ldr r0, _08049AEC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0]
adds r0, r7, r0
@@ -4042,7 +4042,7 @@ _08049AD4:
_08049AE0: .4byte gSprites
_08049AE4: .4byte 0x06010000
_08049AE8: .4byte 0x04000008
_08049AEC: .4byte gUnknown_2024018
_08049AEC: .4byte gBattleSpritesDataPtr
_08049AF0: .4byte 0x04000010
_08049AF4:
mov r1, r9
@@ -4084,7 +4084,7 @@ _08049AF4:
ldr r2, _08049BD8 @ =0x04000018
adds r0, r6, 0
bl CpuSet
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4096,7 +4096,7 @@ _08049AF4:
cmp r0, 0x1
bne _08049BAE
_08049B62:
ldr r0, _08049BDC @ =gUnknown_2024018
ldr r0, _08049BDC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0]
lsls r0, r7, 2
@@ -4149,7 +4149,7 @@ _08049BCC: .4byte gPlttBufferUnfaded + 0x200
_08049BD0: .4byte 0x05000200
_08049BD4: .4byte 0x06010000
_08049BD8: .4byte 0x04000018
_08049BDC: .4byte gUnknown_2024018
_08049BDC: .4byte gBattleSpritesDataPtr
_08049BE0: .4byte 0x04000008
thumb_func_end UpdateStatusIconInHealthbox
@@ -4381,7 +4381,7 @@ UpdateHealthboxAttribute: @ 8049D98
mov r9, r0
cmp r7, 0
bne _08049DD4
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08049DD4
@@ -4426,7 +4426,7 @@ _08049E0C:
asrs r1, 16
adds r0, r6, 0
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
_08049E26:
cmp r7, 0x2
beq _08049E2E
@@ -4441,7 +4441,7 @@ _08049E2E:
asrs r1, 16
adds r0, r6, 0
movs r2, 0x1
bl sub_8048440
bl UpdateHpTextInHealthbox
_08049E44:
cmp r7, 0x5
beq _08049E4C
@@ -4468,9 +4468,9 @@ _08049E4C:
adds r1, r6, 0
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049E80:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -4530,7 +4530,7 @@ _08049E96:
adds r1, r6, 0
movs r2, 0x1
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049F06:
cmp r7, 0x4
beq _08049F0E
@@ -4607,7 +4607,7 @@ _08049F74:
adds r1, r6, 0
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049FA8:
cmp r7, 0x4
beq _08049FB0
@@ -4636,8 +4636,8 @@ _08049FC6:
bx r0
thumb_func_end UpdateHealthboxAttribute
thumb_func_start sub_8049FD8
sub_8049FD8: @ 8049FD8
thumb_func_start MoveBattleBar
MoveBattleBar: @ 8049FD8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4652,7 +4652,7 @@ sub_8049FD8: @ 8049FD8
mov r9, r2
cmp r2, 0
bne _0804A024
ldr r0, _0804A020 @ =gUnknown_2024018
ldr r0, _0804A020 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0xC]
mov r1, r8
@@ -4673,9 +4673,9 @@ sub_8049FD8: @ 8049FD8
adds r7, r5, 0
b _0804A080
.align 2, 0
_0804A020: .4byte gUnknown_2024018
_0804A020: .4byte gBattleSpritesDataPtr
_0804A024:
ldr r2, _0804A0D0 @ =gUnknown_2024018
ldr r2, _0804A0D0 @ =gBattleSpritesDataPtr
mov r10, r2
ldr r0, [r2]
ldr r2, [r0, 0xC]
@@ -4726,7 +4726,7 @@ _0804A080:
beq _0804A09C
cmp r2, 0
bne _0804A0A4
ldr r0, _0804A0D0 @ =gUnknown_2024018
ldr r0, _0804A0D0 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0]
adds r0, r7, r0
@@ -4744,7 +4744,7 @@ _0804A0A4:
negs r0, r0
cmp r4, r0
bne _0804A0BE
ldr r0, _0804A0D0 @ =gUnknown_2024018
ldr r0, _0804A0D0 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0xC]
mov r2, r8
@@ -4764,8 +4764,8 @@ _0804A0BE:
pop {r1}
bx r1
.align 2, 0
_0804A0D0: .4byte gUnknown_2024018
thumb_func_end sub_8049FD8
_0804A0D0: .4byte gBattleSpritesDataPtr
thumb_func_end MoveBattleBar
thumb_func_start sub_804A0D4
sub_804A0D4: @ 804A0D4
@@ -4784,7 +4784,7 @@ sub_804A0D4: @ 804A0D4
beq _0804A1D8
b _0804A2D6
_0804A0F0:
ldr r0, _0804A184 @ =gUnknown_2024018
ldr r0, _0804A184 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0xC]
lsls r5, r6, 2
@@ -4818,7 +4818,7 @@ _0804A12C:
ldr r0, _0804A188 @ =gSprites
mov r8, r0
_0804A132:
ldr r0, _0804A184 @ =gUnknown_2024018
ldr r0, _0804A184 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0xC]
adds r0, r7, r6
@@ -4858,7 +4858,7 @@ _0804A132:
bl CpuSet
b _0804A1C2
.align 2, 0
_0804A184: .4byte gUnknown_2024018
_0804A184: .4byte gBattleSpritesDataPtr
_0804A188: .4byte gSprites
_0804A18C: .4byte 0x06010000
_0804A190: .4byte 0x04000008
@@ -4895,7 +4895,7 @@ _0804A1C2:
_0804A1D0: .4byte 0x06010040
_0804A1D4: .4byte 0x04000008
_0804A1D8:
ldr r0, _0804A27C @ =gUnknown_2024018
ldr r0, _0804A27C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0xC]
lsls r5, r6, 2
@@ -4955,7 +4955,7 @@ _0804A23A:
ldrb r1, [r1]
lsls r1, 5
adds r0, r1
ldr r1, _0804A27C @ =gUnknown_2024018
ldr r1, _0804A27C @ =gBattleSpritesDataPtr
ldr r1, [r1]
ldr r1, [r1, 0xC]
adds r1, r4, r1
@@ -4977,7 +4977,7 @@ _0804A23A:
bl CpuSet
b _0804A2CC
.align 2, 0
_0804A27C: .4byte gUnknown_2024018
_0804A27C: .4byte gBattleSpritesDataPtr
_0804A280: .4byte gBattlerPartyIndexes
_0804A284: .4byte gPlayerParty
_0804A288: .4byte gSprites
@@ -4992,7 +4992,7 @@ _0804A294:
ldrb r1, [r1]
lsls r1, 5
adds r0, r1
ldr r1, _0804A2E4 @ =gUnknown_2024018
ldr r1, _0804A2E4 @ =gBattleSpritesDataPtr
ldr r1, [r1]
ldr r1, [r1, 0xC]
adds r1, r4, r1
@@ -5025,7 +5025,7 @@ _0804A2D6:
pop {r0}
bx r0
.align 2, 0
_0804A2E4: .4byte gUnknown_2024018
_0804A2E4: .4byte gBattleSpritesDataPtr
_0804A2E8: .4byte 0x06010b80
_0804A2EC: .4byte 0x04000008
thumb_func_end sub_804A0D4
asm/battle_message.s
+40 -40
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80D7274
sub_80D7274: @ 80D7274
thumb_func_start BufferStringBattle
BufferStringBattle: @ 80D7274
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -23,7 +23,7 @@ sub_80D7274: @ 80D7274
ldr r0, _080D7338 @ =gUnknown_2022BC8
adds r1, r0
str r1, [r4]
ldr r2, _080D733C @ =gUnknown_2023D68
ldr r2, _080D733C @ =gLastUsedItem
ldrh r0, [r1, 0x4]
strh r0, [r2]
ldr r2, _080D7340 @ =gLastUsedAbility
@@ -71,7 +71,7 @@ _080D72D6:
mov r8, r0
ldr r3, _080D7330 @ =gUnknown_2039A34
ldr r5, _080D7358 @ =gBattleTextBuff2
ldr r4, _080D735C @ =gUnknown_2022AD8
ldr r4, _080D735C @ =gBattleTextBuff3
_080D72F4:
mov r0, r8
adds r1, r2, r0
@@ -108,7 +108,7 @@ _080D7326:
_080D7330: .4byte gUnknown_2039A34
_080D7334: .4byte gActiveBattler
_080D7338: .4byte gUnknown_2022BC8
_080D733C: .4byte gUnknown_2023D68
_080D733C: .4byte gLastUsedItem
_080D7340: .4byte gLastUsedAbility
_080D7344: .4byte gBattleScripting
_080D7348: .4byte gBattleStruct
@@ -116,7 +116,7 @@ _080D734C: .4byte gPotentialItemEffectBattler
_080D7350: .4byte gBattleTextBuff1
_080D7354: .4byte gUnknown_2039A30
_080D7358: .4byte gBattleTextBuff2
_080D735C: .4byte gUnknown_2022AD8
_080D735C: .4byte gBattleTextBuff3
_080D7360: .4byte _080D7364
.align 2, 0
_080D7364:
@@ -701,7 +701,7 @@ _080D77E2:
bx r0
.align 2, 0
_080D77F0: .4byte gUnknown_83FDF3C
thumb_func_end sub_80D7274
thumb_func_end BufferStringBattle
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
@@ -890,7 +890,7 @@ _080D79A2:
_080D79B0: .4byte gBattleTextBuff2
_080D79B4: .4byte gStringVar2
_080D79B8:
ldr r1, _080D79D0 @ =gUnknown_2022AD8
ldr r1, _080D79D0 @ =gBattleTextBuff3
ldrb r0, [r1]
cmp r0, 0xFD
bne _080D79D8
@@ -902,7 +902,7 @@ _080D79C4:
bl ExpandBattleTextBuffPlaceholders
bl _080D8382
.align 2, 0
_080D79D0: .4byte gUnknown_2022AD8
_080D79D0: .4byte gBattleTextBuff3
_080D79D4: .4byte gStringVar3
_080D79D8:
adds r4, r1, 0
@@ -1073,7 +1073,7 @@ _080D7B40: .4byte gBattlerPartyIndexes
_080D7B44: .4byte gLinkPlayers
_080D7B48: .4byte gEnemyParty
_080D7B4C:
ldr r4, _080D7B70 @ =sBattler_AI
ldr r4, _080D7B70 @ =gBattlerAttacker
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -1090,7 +1090,7 @@ _080D7B4C:
ldr r4, _080D7B7C @ =gUnknown_83FD55B
b _080D7B8A
.align 2, 0
_080D7B70: .4byte sBattler_AI
_080D7B70: .4byte gBattlerAttacker
_080D7B74: .4byte gBattleTypeFlags
_080D7B78: .4byte gUnknown_83FD555
_080D7B7C: .4byte gUnknown_83FD55B
@@ -1140,7 +1140,7 @@ _080D7BC0:
.align 2, 0
_080D7BDC: .4byte gBattlerPartyIndexes
_080D7BE0:
ldr r4, _080D7C14 @ =sBattler_AI
ldr r4, _080D7C14 @ =gBattlerAttacker
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -1164,7 +1164,7 @@ _080D7BE0:
adds r0, r1
b _080D82AA
.align 2, 0
_080D7C14: .4byte sBattler_AI
_080D7C14: .4byte gBattlerAttacker
_080D7C18: .4byte gBattlerPartyIndexes
_080D7C1C: .4byte gPlayerParty
_080D7C20:
@@ -1188,7 +1188,7 @@ _080D7C20:
_080D7C44: .4byte gBattlerPartyIndexes
_080D7C48: .4byte gEnemyParty
_080D7C4C:
ldr r5, _080D7C98 @ =sBattler_AI
ldr r5, _080D7C98 @ =gBattlerAttacker
ldrb r0, [r5]
bl GetBattlerSide
lsls r0, 24
@@ -1228,7 +1228,7 @@ _080D7C8C:
ldrh r1, [r0]
b _080D82A4
.align 2, 0
_080D7C98: .4byte sBattler_AI
_080D7C98: .4byte gBattlerAttacker
_080D7C9C: .4byte gBattleTypeFlags
_080D7CA0: .4byte gUnknown_83FD555
_080D7CA4: .4byte gUnknown_83FD55B
@@ -1300,7 +1300,7 @@ _080D7D24:
.align 2, 0
_080D7D30: .4byte gBattlerPartyIndexes
_080D7D34:
ldr r5, _080D7D80 @ =gUnknown_2023D6E
ldr r5, _080D7D80 @ =gEffectBattler
ldrb r0, [r5]
bl GetBattlerSide
lsls r0, 24
@@ -1340,7 +1340,7 @@ _080D7D74:
ldrh r1, [r0]
b _080D82A4
.align 2, 0
_080D7D80: .4byte gUnknown_2023D6E
_080D7D80: .4byte gEffectBattler
_080D7D84: .4byte gBattleTypeFlags
_080D7D88: .4byte gUnknown_83FD555
_080D7D8C: .4byte gUnknown_83FD55B
@@ -1517,7 +1517,7 @@ _080D7EE4:
ands r0, r1
cmp r0, 0
beq _080D7F9C
ldr r2, _080D7F20 @ =gUnknown_2023D68
ldr r2, _080D7F20 @ =gLastUsedItem
ldrh r0, [r2]
cmp r0, 0xAF
bne _080D7F98
@@ -1540,7 +1540,7 @@ _080D7EE4:
b _080D7F90
.align 2, 0
_080D7F1C: .4byte gBattleTypeFlags
_080D7F20: .4byte gUnknown_2023D68
_080D7F20: .4byte gLastUsedItem
_080D7F24: .4byte gBattleStruct
_080D7F28: .4byte gPotentialItemEffectBattler
_080D7F2C:
@@ -1600,7 +1600,7 @@ _080D7F98:
ldrh r0, [r2]
b _080D7FA0
_080D7F9C:
ldr r0, _080D7FAC @ =gUnknown_2023D68
ldr r0, _080D7FAC @ =gLastUsedItem
ldrh r0, [r0]
_080D7FA0:
mov r1, sp
@@ -1608,7 +1608,7 @@ _080D7FA0:
mov r4, sp
b _080D8382
.align 2, 0
_080D7FAC: .4byte gUnknown_2023D68
_080D7FAC: .4byte gLastUsedItem
_080D7FB0:
ldr r0, _080D7FB4 @ =gLastUsedAbility
b _080D7FF0
@@ -1616,11 +1616,11 @@ _080D7FB0:
_080D7FB4: .4byte gLastUsedAbility
_080D7FB8:
ldr r1, _080D7FC0 @ =gUnknown_2039A30
ldr r0, _080D7FC4 @ =sBattler_AI
ldr r0, _080D7FC4 @ =gBattlerAttacker
b _080D7FEC
.align 2, 0
_080D7FC0: .4byte gUnknown_2039A30
_080D7FC4: .4byte sBattler_AI
_080D7FC4: .4byte gBattlerAttacker
_080D7FC8:
ldr r1, _080D7FD0 @ =gUnknown_2039A30
ldr r0, _080D7FD4 @ =gBattlerTarget
@@ -1638,7 +1638,7 @@ _080D7FE0: .4byte gUnknown_2039A30
_080D7FE4: .4byte gBattleScripting
_080D7FE8:
ldr r1, _080D7FFC @ =gUnknown_2039A30
ldr r0, _080D8000 @ =gUnknown_2023D6E
ldr r0, _080D8000 @ =gEffectBattler
_080D7FEC:
ldrb r0, [r0]
_080D7FEE:
@@ -1652,7 +1652,7 @@ _080D7FF0:
b _080D8382
.align 2, 0
_080D7FFC: .4byte gUnknown_2039A30
_080D8000: .4byte gUnknown_2023D6E
_080D8000: .4byte gEffectBattler
_080D8004: .4byte gUnknown_824FC40
_080D8008:
ldr r3, _080D8020 @ =gTrainerBattleOpponent_A
@@ -1871,7 +1871,7 @@ _080D819C:
movs r0, 0x3
_080D81AA:
eors r0, r1
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -1883,7 +1883,7 @@ _080D81BC: .4byte gLinkPlayers
_080D81C0:
ldr r0, _080D81D4 @ =gBattleScripting
ldrb r0, [r0, 0x17]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
_080D81C8:
lsls r1, r0, 3
subs r1, r0
@@ -2045,10 +2045,10 @@ _080D830C: .4byte 0x00000834
_080D8310: .4byte gUnknown_83FD81A
_080D8314: .4byte gUnknown_83FD824
_080D8318:
ldr r0, _080D831C @ =sBattler_AI
ldr r0, _080D831C @ =gBattlerAttacker
b _080D8322
.align 2, 0
_080D831C: .4byte sBattler_AI
_080D831C: .4byte gBattlerAttacker
_080D8320:
ldr r0, _080D8334 @ =gBattlerTarget
_080D8322:
@@ -2065,10 +2065,10 @@ _080D8334: .4byte gBattlerTarget
_080D8338: .4byte gUnknown_83FD569
_080D833C: .4byte gUnknown_83FD56D
_080D8340:
ldr r0, _080D8344 @ =sBattler_AI
ldr r0, _080D8344 @ =gBattlerAttacker
b _080D834A
.align 2, 0
_080D8344: .4byte sBattler_AI
_080D8344: .4byte gBattlerAttacker
_080D8348:
ldr r0, _080D835C @ =gBattlerTarget
_080D834A:
@@ -2085,10 +2085,10 @@ _080D835C: .4byte gBattlerTarget
_080D8360: .4byte gUnknown_83FD560
_080D8364: .4byte gUnknown_83FD564
_080D8368:
ldr r0, _080D836C @ =sBattler_AI
ldr r0, _080D836C @ =gBattlerAttacker
b _080D8372
.align 2, 0
_080D836C: .4byte sBattler_AI
_080D836C: .4byte gBattlerAttacker
_080D8370:
ldr r0, _080D83D4 @ =gBattlerTarget
_080D8372:
@@ -2304,10 +2304,10 @@ _080D8504:
ldrb r0, [r0, 0x1]
lsls r1, r0, 3
subs r1, r0
ldr r0, _080D8510 @ =gUnknown_824F1A0
ldr r0, _080D8510 @ =gTypeNames
b _080D8616
.align 2, 0
_080D8510: .4byte gUnknown_824F1A0
_080D8510: .4byte gTypeNames
_080D8514:
ldrb r0, [r4, 0x1]
bl GetBattlerSide
@@ -2649,8 +2649,8 @@ _080D87B0:
_080D87B8: .4byte gUnknown_83FD58E
thumb_func_end sub_80D8720
thumb_func_start sub_80D87BC
sub_80D87BC: @ 80D87BC
thumb_func_start BattlePutTextOnWindow
BattlePutTextOnWindow: @ 80D87BC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2907,7 +2907,7 @@ _080D89A4:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D87BC
thumb_func_end BattlePutTextOnWindow
thumb_func_start sub_80D89B0
sub_80D89B0: @ 80D89B0
@@ -2946,7 +2946,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
ldr r0, _080D8A3C @ =gUnknown_2022BC8
adds r1, r0
ldr r4, _080D8A40 @ =gUnknown_8D2FBB4
ldr r0, _080D8A44 @ =gUnknown_2023FFC
ldr r0, _080D8A44 @ =gMoveSelectionCursor
adds r2, r0
ldrb r2, [r2]
adds r0, r1, 0
@@ -2985,7 +2985,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
_080D8A38: .4byte gActiveBattler
_080D8A3C: .4byte gUnknown_2022BC8
_080D8A40: .4byte gUnknown_8D2FBB4
_080D8A44: .4byte gUnknown_2023FFC
_080D8A44: .4byte gMoveSelectionCursor
_080D8A48: .4byte gPlttBufferUnfaded
_080D8A4C: .4byte gPlttBufferFaded + 0xB8
thumb_func_end SetPpNumbersPaletteInMoveSelection
asm/battle_script_commands.s
-33196
View File
File diff suppressed because it is too large Load Diff
asm/battle_tower.s
+3 -3
View File
@@ -929,8 +929,8 @@ _080E6062:
_080E6074: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E5E7C
thumb_func_start sub_80E6078
sub_80E6078: @ 80E6078
thumb_func_start GetBattleTowerTrainerFrontSpriteId
GetBattleTowerTrainerFrontSpriteId: @ 80E6078
push {lr}
ldr r0, _080E6094 @ =gSaveBlock2Ptr
ldr r3, [r0]
@@ -983,7 +983,7 @@ _080E60D6:
.align 2, 0
_080E60DC: .4byte gFacilityClassToPicIndex
_080E60E0: .4byte gUnknown_83FFAC4
thumb_func_end sub_80E6078
thumb_func_end GetBattleTowerTrainerFrontSpriteId
thumb_func_start sub_80E60E4
sub_80E60E4: @ 80E60E4
asm/battle_util.s
-12796
View File
File diff suppressed because it is too large Load Diff
asm/battle_util2.s
-333
View File
@@ -1,333 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_802E03C
sub_802E03C: @ 802E03C
push {r4,r5,lr}
ldr r4, _0802E118 @ =gBattleTypeFlags
ldr r0, [r4]
movs r1, 0x80
lsls r1, 12
ands r0, r1
cmp r0, 0
beq _0802E050
bl sub_815DA54
_0802E050:
ldr r0, [r4]
movs r1, 0x80
lsls r1, 9
ands r0, r1
cmp r0, 0
beq _0802E06E
ldr r5, _0802E11C @ =gUnknown_3005EE0
movs r4, 0x3
_0802E060:
movs r0, 0x8
bl AllocZeroed
stm r5!, {r0}
subs r4, 0x1
cmp r4, 0
bge _0802E060
_0802E06E:
ldr r4, _0802E120 @ =gBattleStruct
movs r0, 0x80
lsls r0, 2
bl AllocZeroed
str r0, [r4]
ldr r4, _0802E124 @ =gBattleResources
movs r0, 0x20
bl AllocZeroed
str r0, [r4]
movs r0, 0xA0
bl AllocZeroed
ldr r1, [r4]
str r0, [r1]
movs r0, 0x10
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x4]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x8]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0xC]
movs r0, 0xC
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x10]
movs r0, 0x1C
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x14]
movs r0, 0x30
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x18]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x1C]
ldr r4, _0802E128 @ =gUnknown_2023FEC
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, _0802E12C @ =gUnknown_2023FF0
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, _0802E130 @ =gUnknown_2022BB8
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
str r0, [r4]
ldr r4, _0802E134 @ =gUnknown_2022BBC
adds r0, r5, 0
bl AllocZeroed
adds r1, r0, 0
str r1, [r4]
movs r0, 0x1
bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0x2
bl SetBgTilemapBuffer
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0802E118: .4byte gBattleTypeFlags
_0802E11C: .4byte gUnknown_3005EE0
_0802E120: .4byte gBattleStruct
_0802E124: .4byte gBattleResources
_0802E128: .4byte gUnknown_2023FEC
_0802E12C: .4byte gUnknown_2023FF0
_0802E130: .4byte gUnknown_2022BB8
_0802E134: .4byte gUnknown_2022BBC
thumb_func_end sub_802E03C
thumb_func_start sub_802E138
sub_802E138: @ 802E138
push {r4-r6,lr}
ldr r4, _0802E208 @ =gBattleTypeFlags
ldr r0, [r4]
movs r1, 0x80
lsls r1, 12
ands r0, r1
cmp r0, 0
beq _0802E14C
bl sub_815DBDC
_0802E14C:
ldr r0, [r4]
movs r1, 0x80
lsls r1, 9
ands r0, r1
cmp r0, 0
beq _0802E16C
ldr r5, _0802E20C @ =gUnknown_3005EE0
movs r6, 0
movs r4, 0x3
_0802E15E:
ldr r0, [r5]
bl Free
stm r5!, {r6}
subs r4, 0x1
cmp r4, 0
bge _0802E15E
_0802E16C:
ldr r6, _0802E210 @ =gBattleResources
ldr r0, [r6]
cmp r0, 0
beq _0802E200
ldr r4, _0802E214 @ =gBattleStruct
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
bl Free
str r5, [r6]
ldr r4, _0802E218 @ =gUnknown_2023FEC
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, _0802E21C @ =gUnknown_2023FF0
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, _0802E220 @ =gUnknown_2022BB8
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, _0802E224 @ =gUnknown_2022BBC
ldr r0, [r4]
bl Free
str r5, [r4]
_0802E200:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0802E208: .4byte gBattleTypeFlags
_0802E20C: .4byte gUnknown_3005EE0
_0802E210: .4byte gBattleResources
_0802E214: .4byte gBattleStruct
_0802E218: .4byte gUnknown_2023FEC
_0802E21C: .4byte gUnknown_2023FF0
_0802E220: .4byte gUnknown_2022BB8
_0802E224: .4byte gUnknown_2022BBC
thumb_func_end sub_802E138
thumb_func_start sub_802E228
sub_802E228: @ 802E228
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0802E26C @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0802E274
movs r0, 0x1
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBattlerAtPosition
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0802E270 @ =gBattleMons
movs r0, 0x58
adds r1, r3, 0
muls r1, r0
adds r1, r2
adds r1, 0x2A
muls r0, r4
adds r0, r2
adds r0, 0x2A
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bls _0802E27E
adds r4, r3, 0
b _0802E27E
.align 2, 0
_0802E26C: .4byte gBattleTypeFlags
_0802E270: .4byte gBattleMons
_0802E274:
movs r0, 0x1
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
_0802E27E:
ldr r2, _0802E2C0 @ =gBattleMons
movs r1, 0x58
adds r0, r4, 0
muls r0, r1
adds r0, r2
adds r3, r0, 0
adds r3, 0x2A
adds r0, r5, 0
muls r0, r1
adds r0, r2
adds r1, r0, 0
adds r1, 0x2A
ldrb r0, [r3]
ldrb r2, [r1]
cmp r0, r2
bls _0802E2EC
ldrb r1, [r1]
subs r0, r1
cmp r0, 0x1D
ble _0802E2CC
ldr r1, _0802E2C4 @ =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _0802E2C8 @ =gPlayerParty
adds r0, r1
movs r1, 0x9
bl AdjustFriendship
b _0802E302
.align 2, 0
_0802E2C0: .4byte gBattleMons
_0802E2C4: .4byte gBattlerPartyIndexes
_0802E2C8: .4byte gPlayerParty
_0802E2CC:
ldr r1, _0802E2E4 @ =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _0802E2E8 @ =gPlayerParty
adds r0, r1
movs r1, 0x7
bl AdjustFriendship
b _0802E302
.align 2, 0
_0802E2E4: .4byte gBattlerPartyIndexes
_0802E2E8: .4byte gPlayerParty
_0802E2EC:
ldr r1, _0802E308 @ =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _0802E30C @ =gPlayerParty
adds r0, r1
movs r1, 0x7
bl AdjustFriendship
_0802E302:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0802E308: .4byte gBattlerPartyIndexes
_0802E30C: .4byte gPlayerParty
thumb_func_end sub_802E228
.align 2, 0 @ Don't pad with nop.
asm/berry_crush_2.s
+18 -18
View File
@@ -146,7 +146,7 @@ _0814BC44:
bl sub_80FA42C
b _0814BC66
_0814BC4A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _0814BC66
@@ -362,7 +362,7 @@ _0814BDCC:
bl sub_80FA42C
b _0814BDFC
_0814BDD2:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814BE02
@@ -497,7 +497,7 @@ _0814BED4:
bl sub_80FA42C
b _0814BFC0
_0814BEDA:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814BFC6
@@ -519,7 +519,7 @@ _0814BEDA:
bl SendBlock
b _0814BFC0
_0814BF0A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814BFC6
@@ -653,7 +653,7 @@ _0814C008:
bl sub_80FA42C
b _0814C108
_0814C01A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C10E
@@ -725,7 +725,7 @@ _0814C080:
.align 2, 0
_0814C0AC: .4byte sub_814DB84
_0814C0B0:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C10E
@@ -751,7 +751,7 @@ _0814C0D2:
bl sub_80FA42C
b _0814C108
_0814C0E4:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C10E
@@ -907,7 +907,7 @@ _0814C1FC:
bl sub_80FA42C
b _0814C23C
_0814C21E:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C242
@@ -951,7 +951,7 @@ _0814C262:
beq _0814C298
b _0814C2EC
_0814C26C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C2F2
@@ -972,7 +972,7 @@ _0814C292:
bl sub_80FA42C
b _0814C2EC
_0814C298:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814C2F2
@@ -2070,7 +2070,7 @@ _0814CADA:
strh r0, [r4, 0x10]
b _0814CB12
_0814CAF4:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814CB18
@@ -2172,7 +2172,7 @@ _0814CB8A:
bl SetGpuReg
b _0814CBFC
_0814CBBC:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814CC02
@@ -2273,7 +2273,7 @@ _0814CC72:
bl SendBlock
b _0814CF8E
_0814CC8A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _0814CC96
@@ -2618,7 +2618,7 @@ _0814CF24:
bl SendBlock
b _0814CF8E
_0814CF30:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814CF94
@@ -2849,7 +2849,7 @@ _0814D100:
bl sub_80FA42C
b _0814D178
_0814D106:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D17E
@@ -3031,7 +3031,7 @@ _0814D260:
bl sub_80FA42C
b _0814D30C
_0814D266:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D312
@@ -3047,7 +3047,7 @@ _0814D266:
bl SendBlock
b _0814D30C
_0814D288:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D312
@@ -3319,7 +3319,7 @@ _0814D482:
bl sub_80FA42C
b _0814D4B8
_0814D488:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D4BE
asm/berry_crush_3.s
+3 -3
View File
@@ -236,10 +236,10 @@ _0814D7E8: .4byte gUnknown_846ED90
_0814D7EC: .4byte gUnknown_846EEC0
_0814D7F0: .4byte gUnknown_846F058
_0814D7F4:
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
adds r0, r5, 0
bl sub_814ECE0
ldr r0, _0814D82C @ =gSpriteCoordOffsetY
@@ -341,7 +341,7 @@ _0814D8D4:
bl sub_80FA42C
b _0814D9BA
_0814D8DA:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D9C0
asm/bug.s
+23 -23
View File
@@ -9,7 +9,7 @@
sub_80B3FAC: @ 80B3FAC
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B3FD8
@@ -72,7 +72,7 @@ _080B4008:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -80,13 +80,13 @@ _080B4008:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, _080B4074 @ =sub_8075590
ldr r0, _080B4074 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B4078 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -97,7 +97,7 @@ _080B4008:
.align 2, 0
_080B406C: .4byte gBattleAnimTarget
_080B4070: .4byte gBattleAnimArgs
_080B4074: .4byte sub_8075590
_080B4074: .4byte StartAnimLinearTranslation
_080B4078: .4byte DestroyAnimSprite
thumb_func_end sub_80B3FAC
@@ -105,7 +105,7 @@ _080B4078: .4byte DestroyAnimSprite
sub_80B407C: @ 80B407C
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B40A0
@@ -156,17 +156,17 @@ _080B40BC:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, _080B4120 @ =sub_8075590
ldr r0, _080B4120 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B4124 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -177,7 +177,7 @@ _080B40BC:
.align 2, 0
_080B4118: .4byte gBattleAnimTarget
_080B411C: .4byte gBattleAnimArgs
_080B4120: .4byte sub_8075590
_080B4120: .4byte StartAnimLinearTranslation
_080B4124: .4byte DestroyAnimSprite
thumb_func_end sub_80B407C
@@ -185,7 +185,7 @@ _080B4124: .4byte DestroyAnimSprite
sub_80B4128: @ 80B4128
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B4144
@@ -214,13 +214,13 @@ _080B4144:
ldr r4, _080B4188 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -484,7 +484,7 @@ sub_80B4364: @ 80B4364
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B4384
@@ -513,7 +513,7 @@ _080B4384:
negs r0, r0
strh r0, [r1, 0x6]
_080B43A6:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B43F6
@@ -556,7 +556,7 @@ _080B43F6:
ldr r5, _080B4488 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
ldr r6, _080B4484 @ =gBattleAnimArgs
@@ -567,7 +567,7 @@ _080B43F6:
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -603,7 +603,7 @@ _080B43F6:
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, _080B448C @ =sub_8075590
ldr r0, _080B448C @ =StartAnimLinearTranslation
str r0, [r7, 0x1C]
ldr r1, _080B4490 @ =DestroyAnimSprite
adds r0, r7, 0
@@ -616,7 +616,7 @@ _080B43F6:
_080B4480: .4byte gBattleAnimAttacker
_080B4484: .4byte gBattleAnimArgs
_080B4488: .4byte gBattleAnimTarget
_080B448C: .4byte sub_8075590
_080B448C: .4byte StartAnimLinearTranslation
_080B4490: .4byte DestroyAnimSprite
thumb_func_end sub_80B4364
@@ -643,7 +643,7 @@ _080B44B4:
ldr r5, _080B4508 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -651,7 +651,7 @@ _080B44B4:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -801,13 +801,13 @@ _080B45F4:
_080B45F6:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
asm/cable_club.s
+8 -8
View File
@@ -439,7 +439,7 @@ sub_8080A4C: @ 8080A4C
adds r4, r0, r1
movs r0, 0
strh r0, [r4, 0xE]
bl sub_800AA48
bl IsLinkMaster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -644,7 +644,7 @@ _08080C3C:
beq _08080C5C
movs r0, 0x5
bl PlaySE
bl sub_800A5BC
bl CheckShouldAdvanceLinkState
ldr r0, _08080C64 @ =gTasks
lsls r1, r6, 2
adds r1, r6
@@ -1367,7 +1367,7 @@ sub_80811FC: @ 80811FC
ldrsh r2, [r4, r3]
cmp r2, 0
bne _08081230
bl sub_8009804
bl OpenLink
bl sub_800A270
ldr r0, _0808122C @ =sub_8081A90
movs r1, 0x50
@@ -1405,7 +1405,7 @@ sub_808124C: @ 808124C
lsrs r0, 24
cmp r0, 0x1
bls _08081292
bl sub_800AA48
bl IsLinkMaster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1450,7 +1450,7 @@ sub_80812A0: @ 80812A0
lsls r0, 24
cmp r4, r0
bne _080812CA
bl sub_800A5BC
bl CheckShouldAdvanceLinkState
ldr r0, _080812D0 @ =gTasks
lsls r1, r5, 2
adds r1, r5
@@ -1790,7 +1790,7 @@ _08081560:
strh r0, [r6]
b _0808160A
_0808156A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0808160A
@@ -1901,7 +1901,7 @@ _08081640:
strb r0, [r4]
b _0808165C
_0808164C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0808165C
@@ -2283,7 +2283,7 @@ _08081950:
.align 2, 0
_08081958: .4byte gUnknown_2031DA4
_0808195C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08081970
asm/dark.s
+20 -20
View File
@@ -256,33 +256,33 @@ sub_80B7ACC: @ 80B7ACC
ldr r6, _080B7B38 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldr r5, _080B7B3C @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
movs r0, 0x7E
strh r0, [r4, 0x2E]
adds r0, r4, 0
bl sub_80754B8
bl InitSpriteDataForLinearTranslation
ldrh r0, [r4, 0x30]
negs r0, r0
strh r0, [r4, 0x34]
@@ -634,7 +634,7 @@ sub_80B7DA4: @ 80B7DA4
ldr r4, _080B7E0C @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -653,7 +653,7 @@ sub_80B7DA4: @ 80B7DA4
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -701,7 +701,7 @@ _080B7E16:
ldr r0, _080B7E70 @ =0x04000016
str r0, [sp]
movs r7, 0x2
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B7EA8
@@ -728,7 +728,7 @@ _080B7E78:
ldr r0, _080B7F38 @ =0x0400001a
str r0, [sp]
movs r7, 0x4
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B7EA8
@@ -995,7 +995,7 @@ _080B80A0:
.4byte _080B81E8
.4byte _080B8250
_080B80B4:
bl sub_8073788
bl IsContest
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1087,7 +1087,7 @@ _080B817C:
ldr r4, _080B81C8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -1104,7 +1104,7 @@ _080B817C:
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r1, r0, 0x4
@@ -1685,7 +1685,7 @@ sub_80B85B8: @ 80B85B8
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B8642
@@ -1744,7 +1744,7 @@ sub_80B8664: @ 80B8664
ldrb r1, [r4]
movs r0, 0x2
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B86A0
@@ -1827,7 +1827,7 @@ sub_80B86EC: @ 80B86EC
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B8750
@@ -1836,11 +1836,11 @@ sub_80B86EC: @ 80B86EC
movs r2, 0x1
bl SetAnimBgAttribute
_080B8750:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080B87CA
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B87CA
@@ -1860,7 +1860,7 @@ _080B8780:
ldrb r0, [r4]
movs r5, 0x2
eors r0, r5
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2155,7 +2155,7 @@ _080B89FC:
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B8A2E
@@ -2254,7 +2254,7 @@ _080B8AE0:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B8B04
asm/dodrio_berry_picking.s
+10 -10
View File
@@ -385,7 +385,7 @@ _08150B08:
bl sub_80FA42C
b _08150BDC
_08150B16:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08150BFC
@@ -393,10 +393,10 @@ _08150B16:
ldrb r0, [r0]
cmp r0, 0
beq _08150BDC
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
b _08150BDC
.align 2, 0
_08150B38: .4byte gReceivedRemoteLinkPlayers
@@ -652,7 +652,7 @@ _08150D28:
bl sub_815F138
b _08150D52
_08150D3A:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08150D74
@@ -673,7 +673,7 @@ _08150D52:
.align 2, 0
_08150D60: .4byte gUnknown_203F3E0
_08150D64:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08150D74
@@ -1025,7 +1025,7 @@ _08150FFE:
ldr r1, [r6]
b _0815106A
_08151010:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08151092
@@ -1131,7 +1131,7 @@ _081510BE:
ldr r1, [r6]
b _08151140
_081510DA:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0815118A
@@ -1276,7 +1276,7 @@ _081511DC:
ldr r1, [r6]
b _0815128A
_08151202:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081512AA
@@ -1463,7 +1463,7 @@ _0815136A:
.align 2, 0
_08151388: .4byte gUnknown_203F3E0
_0815138C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08151480
@@ -1984,7 +1984,7 @@ _0815177E:
_081517A0: .4byte gUnknown_203F3E0
_081517A4: .4byte 0x0000318c
_081517A8:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08151836
asm/dragon.s
+14 -14
View File
@@ -12,13 +12,13 @@ sub_80B725C: @ 80B725C
ldr r4, _080B72A4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -90,13 +90,13 @@ sub_80B72F8: @ 80B72F8
ldr r4, _080B7350 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -152,7 +152,7 @@ _080B7386:
ldr r0, _080B73A0 @ =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, _080B73A4 @ =sub_8075590
ldr r0, _080B73A4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B73A8 @ =move_anim_8074EE0
adds r0, r5, 0
@@ -162,7 +162,7 @@ _080B7386:
bx r0
.align 2, 0
_080B73A0: .4byte gBattleAnimArgs
_080B73A4: .4byte sub_8075590
_080B73A4: .4byte StartAnimLinearTranslation
_080B73A8: .4byte move_anim_8074EE0
thumb_func_end sub_80B72F8
@@ -185,13 +185,13 @@ _080B73C8:
_080B73CA:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -249,14 +249,14 @@ sub_80B7448: @ 80B7448
ldr r4, _080B749C @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -266,7 +266,7 @@ sub_80B7448: @ 80B7448
ldr r0, _080B74A0 @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r6, 0x3A]
ldr r4, _080B74A4 @ =sBattler_AI
ldr r4, _080B74A4 @ =gBattlerAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8076B2C
@@ -284,7 +284,7 @@ sub_80B7448: @ 80B7448
.align 2, 0
_080B749C: .4byte gBattleAnimAttacker
_080B74A0: .4byte gBattleAnimArgs
_080B74A4: .4byte sBattler_AI
_080B74A4: .4byte gBattlerAttacker
_080B74A8:
lsrs r0, r1, 17
_080B74AA:
@@ -726,14 +726,14 @@ sub_80B77E4: @ 80B77E4
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
asm/electric.s
+38 -38
View File
@@ -123,13 +123,13 @@ sub_80ADCB8: @ 80ADCB8
ldr r4, _080ADCFC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -219,7 +219,7 @@ _080ADD7C:
ldrb r0, [r4]
movs r6, 0x2
eors r0, r6
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080ADD98
@@ -237,7 +237,7 @@ _080ADDA0:
ldrb r0, [r0]
movs r4, 0x2
eors r0, r4
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080ADDC4
@@ -260,7 +260,7 @@ _080ADDC8:
bne _080ADDF0
adds r0, r4, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -273,14 +273,14 @@ _080ADDEC: .4byte gBattleAnimArgs
_080ADDF0:
adds r0, r4, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
adds r0, r4, 0
movs r1, 0x3
_080ADE02:
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -379,7 +379,7 @@ sub_80ADEB0: @ 80ADEB0
ldr r6, _080ADF28 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -387,7 +387,7 @@ sub_80ADEB0: @ 80ADEB0
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -536,7 +536,7 @@ _080ADFFA:
sub_80AE000: @ 80AE000
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AE01C
@@ -555,7 +555,7 @@ _080AE024:
ldr r5, _080AE060 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE064 @ =gBattleAnimArgs
lsrs r0, 24
@@ -564,7 +564,7 @@ _080AE024:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -609,7 +609,7 @@ _080AE090:
ldr r0, _080AE118 @ =gBattleAnimAttacker
_080AE092:
ldrb r6, [r0]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AE0AA
@@ -626,7 +626,7 @@ _080AE0AA:
_080AE0B2:
adds r0, r6, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE11C @ =gBattleAnimArgs
lsrs r0, 24
@@ -635,7 +635,7 @@ _080AE0B2:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -811,7 +811,7 @@ sub_80AE220: @ 80AE220
ldr r6, _080AE268 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
ldr r1, _080AE26C @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -825,7 +825,7 @@ sub_80AE220: @ 80AE220
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -1233,13 +1233,13 @@ _080AE56C:
_080AE56E:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -1466,13 +1466,13 @@ _080AE738:
_080AE73A:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1509,13 +1509,13 @@ _080AE790:
_080AE792:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1548,13 +1548,13 @@ sub_80AE7DC: @ 80AE7DC
ldr r4, _080AE834 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1680,7 +1680,7 @@ _080AE8D4:
ldr r4, _080AE908 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1897,13 +1897,13 @@ _080AEA88: .4byte 0x0000fff0
_080AEA8C:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1923,13 +1923,13 @@ _080AEAB4:
ldr r4, _080AEAE8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -2175,13 +2175,13 @@ _080AEC92:
ldr r4, _080AECC0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2245,13 +2245,13 @@ _080AED20:
ldr r4, _080AEDA4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -2260,7 +2260,7 @@ _080AED20:
ldr r0, _080AEDA8 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -2603,7 +2603,7 @@ _080AEFCE:
ldr r0, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2625,12 +2625,12 @@ _080AEFF8:
ldr r4, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
subs r0, 0x2
asm/evolution_scene.s
+82 -82
View File
@@ -192,7 +192,7 @@ EvolutionScene: @ 80CDDF4
ldr r0, _080CE09C @ =gBattle_BG3_Y
movs r1, 0
strh r1, [r0]
ldr r1, _080CE0A0 @ =gUnknown_2022B50
ldr r1, _080CE0A0 @ =gBattleTerrain
movs r0, 0x9
strb r0, [r1]
bl sub_800F34C
@@ -409,7 +409,7 @@ _080CE090: .4byte gBattle_BG2_X
_080CE094: .4byte gBattle_BG2_Y
_080CE098: .4byte gBattle_BG3_X
_080CE09C: .4byte gBattle_BG3_Y
_080CE0A0: .4byte gUnknown_2022B50
_080CE0A0: .4byte gBattleTerrain
_080CE0A4: .4byte gReservedSpritePaletteCount
_080CE0A8: .4byte gUnknown_2039A20
_080CE0AC: .4byte gStringVar1
@@ -513,7 +513,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
strh r0, [r1]
ldr r0, _080CE2AC @ =gBattle_BG3_Y
strh r4, [r0]
ldr r1, _080CE2B0 @ =gUnknown_2022B50
ldr r1, _080CE2B0 @ =gBattleTerrain
movs r0, 0x9
strb r0, [r1]
bl sub_800F34C
@@ -616,7 +616,7 @@ _080CE2A0: .4byte gBattle_BG2_X
_080CE2A4: .4byte gBattle_BG2_Y
_080CE2A8: .4byte gBattle_BG3_X
_080CE2AC: .4byte gBattle_BG3_Y
_080CE2B0: .4byte gUnknown_2022B50
_080CE2B0: .4byte gBattleTerrain
_080CE2B4: .4byte gReservedSpritePaletteCount
_080CE2B8: .4byte gMonFrontPicTable
_080CE2BC: .4byte gMonSpritesGfxPtr
@@ -843,10 +843,10 @@ _080CE4CC:
ldrb r0, [r0]
cmp r0, 0
beq _080CE4E0
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
_080CE4E0:
movs r0, 0x1
negs r0, r0
@@ -1337,7 +1337,7 @@ sub_80CE8DC: @ 80CE8DC
strh r0, [r5, 0x8]
movs r2, 0x1
strh r2, [r5, 0x1A]
ldr r0, _080CE944 @ =gUnknown_2023E82
ldr r0, _080CE944 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1349,7 +1349,7 @@ sub_80CE8DC: @ 80CE8DC
.align 2, 0
_080CE93C: .4byte gTasks
_080CE940: .4byte gPlayerParty
_080CE944: .4byte gUnknown_2023E82
_080CE944: .4byte gBattleCommunication
_080CE948:
ldr r0, _080CE9A0 @ =gMain
ldrh r1, [r0, 0x2C]
@@ -1367,7 +1367,7 @@ _080CE948:
ldrsh r0, [r2, r3]
cmp r0, 0x8
bne _080CE9AC
ldr r4, _080CE9A8 @ =gUnknown_2023E82
ldr r4, _080CE9A8 @ =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1395,7 +1395,7 @@ _080CE948:
.align 2, 0
_080CE9A0: .4byte gMain
_080CE9A4: .4byte gTasks
_080CE9A8: .4byte gUnknown_2023E82
_080CE9A8: .4byte gBattleCommunication
_080CE9AC:
mov r1, r8
adds r0, r1, r7
@@ -1497,7 +1497,7 @@ _080CEAA0:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEACC @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1584,7 +1584,7 @@ _080CEB68:
bl InitMovingBackgroundTask
movs r0, 0x11
bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CEB88 @ =gUnknown_2023E82
ldr r1, _080CEB88 @ =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, _080CEB8C @ =gTasks
mov r2, r8
@@ -1594,10 +1594,10 @@ _080CEB68:
b _080CEFDE
.align 2, 0
_080CEB84: .4byte gPaletteFade
_080CEB88: .4byte gUnknown_2023E82
_080CEB88: .4byte gBattleCommunication
_080CEB8C: .4byte gTasks
_080CEB90:
ldr r4, _080CEBC8 @ =gUnknown_2023E82
ldr r4, _080CEBC8 @ =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1623,10 +1623,10 @@ _080CEBA6:
strb r0, [r4, 0x2]
bl _080CF528
.align 2, 0
_080CEBC8: .4byte gUnknown_2023E82
_080CEBC8: .4byte gBattleCommunication
_080CEBCC: .4byte gUnknown_2039A20
_080CEBD0:
ldr r4, _080CEC00 @ =gUnknown_2023E82
ldr r4, _080CEC00 @ =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1649,7 +1649,7 @@ _080CEBE6:
add r1, r10
b _080CEFDE
.align 2, 0
_080CEC00: .4byte gUnknown_2023E82
_080CEC00: .4byte gBattleCommunication
_080CEC04: .4byte gUnknown_2039A20
_080CEC08:
ldr r2, _080CEC44 @ =gUnknown_2039A20
@@ -1665,7 +1665,7 @@ _080CEC1C:
ldr r1, [r2]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r0, _080CEC48 @ =gUnknown_2023E82
ldr r0, _080CEC48 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1683,10 +1683,10 @@ _080CEC38:
b _080CEFDE
.align 2, 0
_080CEC44: .4byte gUnknown_2039A20
_080CEC48: .4byte gUnknown_2023E82
_080CEC48: .4byte gBattleCommunication
_080CEC4C:
bl sub_80F5F74
ldr r1, _080CEC60 @ =gUnknown_2023E82
ldr r1, _080CEC60 @ =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, _080CEC64 @ =gTasks
mov r3, r8
@@ -1695,10 +1695,10 @@ _080CEC4C:
adds r1, r0
b _080CEFDE
.align 2, 0
_080CEC60: .4byte gUnknown_2023E82
_080CEC60: .4byte gBattleCommunication
_080CEC64: .4byte gTasks
_080CEC68:
ldr r6, _080CEC90 @ =gUnknown_2023E82
ldr r6, _080CEC90 @ =gBattleCommunication
ldrb r0, [r6, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -1718,9 +1718,9 @@ _080CEC7E:
strb r0, [r6, 0x2]
b _080CEF2E
.align 2, 0
_080CEC90: .4byte gUnknown_2023E82
_080CEC90: .4byte gBattleCommunication
_080CEC94:
ldr r0, _080CECBC @ =gUnknown_2023E82
ldr r0, _080CECBC @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1739,7 +1739,7 @@ _080CECAA:
add r1, r10
b _080CEFDE
.align 2, 0
_080CECBC: .4byte gUnknown_2023E82
_080CECBC: .4byte gBattleCommunication
_080CECC0:
bl IsSEPlaying
lsls r0, 24
@@ -1802,7 +1802,7 @@ _080CED3A:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEDB0 @ =0x00000103
bl PlayBGM
ldr r2, _080CEDB4 @ =gTasks
@@ -1971,7 +1971,7 @@ _080CEEC4: .4byte gPaletteFade
_080CEEC8: .4byte gUnknown_2039A20
_080CEECC: .4byte gUnknown_300537C
_080CEED0:
ldr r0, _080CEF04 @ =gUnknown_2023E82
ldr r0, _080CEF04 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -1996,7 +1996,7 @@ _080CEEE4:
add r1, r10
b _080CEFDE
.align 2, 0
_080CEF04: .4byte gUnknown_2023E82
_080CEF04: .4byte gBattleCommunication
_080CEF08: .4byte 0x0006001c
_080CEF0C: .4byte 0x00007fff
_080CEF10:
@@ -2055,7 +2055,7 @@ _080CEF70:
_080CEF78:
ldr r0, _080CEF90 @ =gStringVar4
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CEF98 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2090,7 +2090,7 @@ _080CEFB6:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CEFF0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEFF4 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2193,7 +2193,7 @@ _080CF0A2:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF0CC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF0D0 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2225,7 +2225,7 @@ _080CF0EE:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF114 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF118 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2253,7 +2253,7 @@ _080CF11C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF1AC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF1B0 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2286,10 +2286,10 @@ _080CF176:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
ldr r0, _080CF1B4 @ =gUnknown_83FE791
bl HandleBattleWindow
ldr r0, _080CF1B4 @ =gText_BattleYesNoChoice
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF1B0 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2299,16 +2299,16 @@ _080CF176:
adds r0, 0x1
movs r2, 0
strh r0, [r1, 0x14]
ldr r0, _080CF1B8 @ =gUnknown_2023E82
ldr r0, _080CF1B8 @ =gBattleCommunication
strb r2, [r0, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
b _080CF528
.align 2, 0
_080CF1A8: .4byte gUnknown_83FDF3C
_080CF1AC: .4byte gDisplayedStringBattle
_080CF1B0: .4byte gTasks
_080CF1B4: .4byte gUnknown_83FE791
_080CF1B8: .4byte gUnknown_2023E82
_080CF1B4: .4byte gText_BattleYesNoChoice
_080CF1B8: .4byte gBattleCommunication
_080CF1BC:
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2316,16 +2316,16 @@ _080CF1BC:
ands r0, r1
cmp r0, 0
beq _080CF1E2
ldr r4, _080CF248 @ =gUnknown_2023E82
ldr r4, _080CF248 @ =gBattleCommunication
ldrb r0, [r4, 0x1]
cmp r0, 0
beq _080CF1E2
movs r0, 0x5
bl PlaySE
bl sub_802DCF8
bl BattleDestroyYesNoCursorAt
movs r0, 0
strb r0, [r4, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
_080CF1E2:
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2333,16 +2333,16 @@ _080CF1E2:
ands r0, r1
cmp r0, 0
beq _080CF208
ldr r4, _080CF248 @ =gUnknown_2023E82
ldr r4, _080CF248 @ =gBattleCommunication
ldrb r0, [r4, 0x1]
cmp r0, 0
bne _080CF208
movs r0, 0x5
bl PlaySE
bl sub_802DCF8
bl BattleDestroyYesNoCursorAt
movs r0, 0x1
strb r0, [r4, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
_080CF208:
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2356,10 +2356,10 @@ _080CF208:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r0, _080CF248 @ =gUnknown_2023E82
ldr r0, _080CF248 @ =gBattleCommunication
ldrb r2, [r0, 0x1]
cmp r2, 0
beq _080CF250
@@ -2373,7 +2373,7 @@ _080CF208:
b _080CF276
.align 2, 0
_080CF244: .4byte gMain
_080CF248: .4byte gUnknown_2023E82
_080CF248: .4byte gBattleCommunication
_080CF24C: .4byte gTasks
_080CF250:
ldr r0, _080CF2AC @ =gTasks
@@ -2409,7 +2409,7 @@ _080CF284:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r1, _080CF2AC @ =gTasks
@@ -2449,7 +2449,7 @@ _080CF2C2:
ldr r4, _080CF308 @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldrh r0, [r5, 0x14]
adds r0, 0x1
strh r0, [r5, 0x14]
@@ -2510,7 +2510,7 @@ _080CF34C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF390 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF394 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2566,7 +2566,7 @@ _080CF3E0:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF40C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF410 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2598,7 +2598,7 @@ _080CF42E:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF454 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF458 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2629,7 +2629,7 @@ _080CF45C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF49C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF4A0 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2648,7 +2648,7 @@ _080CF4A4:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4D0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF4D4 @ =gTasks
mov r3, r8
adds r0, r3, r7
@@ -2671,7 +2671,7 @@ _080CF4D8:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4FC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF500 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2751,7 +2751,7 @@ sub_80CF53C: @ 80CF53C
strh r0, [r4, 0x8]
movs r2, 0x1
strh r2, [r4, 0x1A]
ldr r0, _080CF5C4 @ =gUnknown_2023E82
ldr r0, _080CF5C4 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -2784,7 +2784,7 @@ _080CF5B2:
.align 2, 0
_080CF5BC: .4byte gTasks
_080CF5C0: .4byte gPlayerParty
_080CF5C4: .4byte gUnknown_2023E82
_080CF5C4: .4byte gBattleCommunication
_080CF5C8: .4byte _080CF5CC
.align 2, 0
_080CF5CC:
@@ -2911,7 +2911,7 @@ _080CF6E0:
adds r5, 0x10
adds r0, r5, 0
bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CF730 @ =gUnknown_2023E82
ldr r1, _080CF730 @ =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, _080CF734 @ =gTasks
adds r1, r7, r6
@@ -2928,11 +2928,11 @@ _080CF6E0:
_080CF724: .4byte gPaletteFade
_080CF728: .4byte gSprites
_080CF72C: .4byte gUnknown_2039A20
_080CF730: .4byte gUnknown_2023E82
_080CF730: .4byte gBattleCommunication
_080CF734: .4byte gTasks
_080CF738: .4byte 0x00000603
_080CF73C:
ldr r4, _080CF770 @ =gUnknown_2023E82
ldr r4, _080CF770 @ =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -2957,10 +2957,10 @@ _080CF752:
strb r0, [r4, 0x2]
bl _080D003A
.align 2, 0
_080CF770: .4byte gUnknown_2023E82
_080CF770: .4byte gBattleCommunication
_080CF774: .4byte gUnknown_2039A20
_080CF778:
ldr r4, _080CF7A4 @ =gUnknown_2023E82
ldr r4, _080CF7A4 @ =gBattleCommunication
ldrb r0, [r4, 0x2]
lsls r1, r0, 2
adds r1, r0
@@ -2982,7 +2982,7 @@ _080CF78E:
adds r1, r5
b _080CFB1A
.align 2, 0
_080CF7A4: .4byte gUnknown_2023E82
_080CF7A4: .4byte gBattleCommunication
_080CF7A8: .4byte gUnknown_2039A20
_080CF7AC:
ldr r2, _080CF7E4 @ =gUnknown_2039A20
@@ -2998,7 +2998,7 @@ _080CF7C0:
ldr r1, [r2]
movs r0, 0x3
strb r0, [r1, 0x3]
ldr r0, _080CF7E8 @ =gUnknown_2023E82
ldr r0, _080CF7E8 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -3015,10 +3015,10 @@ _080CF7DC:
b _080CFB1A
.align 2, 0
_080CF7E4: .4byte gUnknown_2039A20
_080CF7E8: .4byte gUnknown_2023E82
_080CF7E8: .4byte gBattleCommunication
_080CF7EC:
bl sub_80F5F74
ldr r1, _080CF800 @ =gUnknown_2023E82
ldr r1, _080CF800 @ =gBattleCommunication
strb r0, [r1, 0x2]
ldr r0, _080CF804 @ =gTasks
adds r1, r7, r6
@@ -3026,10 +3026,10 @@ _080CF7EC:
adds r1, r0
b _080CFB1A
.align 2, 0
_080CF800: .4byte gUnknown_2023E82
_080CF800: .4byte gBattleCommunication
_080CF804: .4byte gTasks
_080CF808:
ldr r0, _080CF834 @ =gUnknown_2023E82
ldr r0, _080CF834 @ =gBattleCommunication
mov r8, r0
ldrb r0, [r0, 0x2]
lsls r1, r0, 2
@@ -3050,9 +3050,9 @@ _080CF820:
strb r0, [r1, 0x2]
b _080CFA90
.align 2, 0
_080CF834: .4byte gUnknown_2023E82
_080CF834: .4byte gBattleCommunication
_080CF838:
ldr r0, _080CF85C @ =gUnknown_2023E82
ldr r0, _080CF85C @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -3070,7 +3070,7 @@ _080CF84E:
adds r1, r5
b _080CFB1A
.align 2, 0
_080CF85C: .4byte gUnknown_2023E82
_080CF85C: .4byte gBattleCommunication
_080CF860:
bl IsSEPlaying
lsls r0, 24
@@ -3261,7 +3261,7 @@ _080CFA08: .4byte gUnknown_2039A20
_080CFA0C: .4byte gTextFlags
_080CFA10: .4byte gUnknown_300537C
_080CFA14:
ldr r0, _080CFA60 @ =gUnknown_2023E82
ldr r0, _080CFA60 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
lsls r0, r1, 2
adds r0, r1
@@ -3299,7 +3299,7 @@ _080CFA28:
adds r1, r5
b _080CFB1A
.align 2, 0
_080CFA60: .4byte gUnknown_2023E82
_080CFA60: .4byte gBattleCommunication
_080CFA64: .4byte gSprites
_080CFA68: .4byte gUnknown_2039A20
_080CFA6C: .4byte 0x0004001c
@@ -3578,7 +3578,7 @@ _080CFCAE:
movs r2, 0
movs r3, 0x2
bl CreateYesNoMenu
ldr r3, _080CFCF8 @ =gUnknown_2023E82
ldr r3, _080CFCF8 @ =gBattleCommunication
strb r4, [r3, 0x1]
ldr r0, _080CFCF0 @ =gTasks
adds r1, r7, r6
@@ -3595,7 +3595,7 @@ _080CFCE8: .4byte gUnknown_83FDF3C
_080CFCEC: .4byte gDisplayedStringBattle
_080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82
_080CFCF8: .4byte gBattleCommunication
_080CFCFC:
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
@@ -3614,7 +3614,7 @@ _080CFD16:
beq _080CFD70
b _080D003A
_080CFD1C:
ldr r0, _080CFD60 @ =gUnknown_2023E82
ldr r0, _080CFD60 @ =gBattleCommunication
strb r4, [r0, 0x1]
ldr r0, _080CFD64 @ =gUnknown_83FDF3C
movs r3, 0x92
@@ -3648,12 +3648,12 @@ _080CFD56:
bl BeginNormalPaletteFade
b _080D003A
.align 2, 0
_080CFD60: .4byte gUnknown_2023E82
_080CFD60: .4byte gBattleCommunication
_080CFD64: .4byte gUnknown_83FDF3C
_080CFD68: .4byte gDisplayedStringBattle
_080CFD6C: .4byte gTasks
_080CFD70:
ldr r1, _080CFD9C @ =gUnknown_2023E82
ldr r1, _080CFD9C @ =gBattleCommunication
movs r0, 0x1
strb r0, [r1, 0x1]
ldr r0, _080CFDA0 @ =gUnknown_83FDF3C
@@ -3674,7 +3674,7 @@ _080CFD70:
strh r1, [r0, 0x14]
b _080D003A
.align 2, 0
_080CFD9C: .4byte gUnknown_2023E82
_080CFD9C: .4byte gBattleCommunication
_080CFDA0: .4byte gUnknown_83FDF3C
_080CFDA4: .4byte gDisplayedStringBattle
_080CFDA8: .4byte gTasks
@@ -3718,7 +3718,7 @@ _080CFDC6:
ldr r4, _080CFE2C @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldrh r0, [r5, 0x14]
adds r0, 0x1
strh r0, [r5, 0x14]
asm/field_effect.s
+1 -1
View File
@@ -5758,7 +5758,7 @@ _08086024: .4byte sub_8085DDC
thumb_func_start FldEff_FieldMoveShowMon
FldEff_FieldMoveShowMon: @ 8086028
push {r4,lr}
bl sav1_map_get_light_level
bl GetCurrentMapType
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
asm/field_fadetransition.s
+6 -6
View File
@@ -49,7 +49,7 @@ pal_fill_for_maplights: @ 807DB58
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -88,7 +88,7 @@ sub_807DBAC: @ 807DBAC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -148,7 +148,7 @@ sub_807DC18: @ 807DC18
cmp r0, 0
bne _0807DC58
_0807DC36:
bl sav1_map_get_light_level
bl GetCurrentMapType
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4, 0x17]
@@ -180,7 +180,7 @@ _0807DC6A:
thumb_func_start sub_807DC70
sub_807DC70: @ 807DC70
push {r4,lr}
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -406,7 +406,7 @@ _0807DE1E:
bl sub_800AB9C
b _0807DE32
_0807DE24:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0807DE50
@@ -475,7 +475,7 @@ sub_807DE78: @ 807DE78
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/field_map_obj.s
+1 -1
View File
@@ -666,7 +666,7 @@ _0805E2E0:
sub_805E2E8: @ 805E2E8
push {r4,r5,lr}
adds r4, r0, 0
bl sav1_map_get_light_level
bl GetCurrentMapType
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
asm/field_weather.s
+3 -3
View File
@@ -2561,8 +2561,8 @@ _0807AF92:
bx r0
thumb_func_end sub_807AF00
thumb_func_start weather_get_current
weather_get_current: @ 807AF98
thumb_func_start GetCurrentWeather
GetCurrentWeather: @ 807AF98
ldr r0, _0807AFA4 @ =gUnknown_2037F34
movs r1, 0xDA
lsls r1, 3
@@ -2571,7 +2571,7 @@ weather_get_current: @ 807AF98
bx lr
.align 2, 0
_0807AFA4: .4byte gUnknown_2037F34
thumb_func_end weather_get_current
thumb_func_end GetCurrentWeather
thumb_func_start SetRainStrengthFromSoundEffect
SetRainStrengthFromSoundEffect: @ 807AFA8
asm/fighting.s
+38 -38
View File
@@ -76,7 +76,7 @@ _080B0924: .4byte gBattleAnimAttacker
sub_80B0928: @ 80B0928
push {r4,lr}
adds r4, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B0944
@@ -176,13 +176,13 @@ _080B09E8:
bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
mov r0, r8
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -242,7 +242,7 @@ _080B0A74:
negs r0, r0
lsrs r4, r0, 16
_080B0A86:
ldr r0, _080B0B14 @ =gUnknown_2023BD6
ldr r0, _080B0B14 @ =gBattlerPositions
add r0, r8
ldrb r1, [r0]
adds r0, r7, 0
@@ -313,7 +313,7 @@ _080B0B00:
bx r0
.align 2, 0
_080B0B10: .4byte gBattleAnimTarget
_080B0B14: .4byte gUnknown_2023BD6
_080B0B14: .4byte gBattlerPositions
_080B0B18: .4byte 0xfff00000
_080B0B1C: .4byte gUnknown_83E7C08
_080B0B20: .4byte gSprites
@@ -399,7 +399,7 @@ _080B0BB6:
ldrh r0, [r4, 0x22]
subs r0, 0x14
strh r0, [r4, 0x36]
ldr r0, _080B0BD0 @ =sub_8075590
ldr r0, _080B0BD0 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B0BD4 @ =sub_80B0BD8
adds r0, r4, 0
@@ -408,7 +408,7 @@ _080B0BB6:
pop {r0}
bx r0
.align 2, 0
_080B0BD0: .4byte sub_8075590
_080B0BD0: .4byte StartAnimLinearTranslation
_080B0BD4: .4byte sub_80B0BD8
thumb_func_end sub_80B0B80
@@ -440,7 +440,7 @@ sub_80B0BD8: @ 80B0BD8
strh r1, [r5, 0x22]
strh r6, [r5, 0x26]
strh r6, [r5, 0x24]
ldr r0, _080B0C20 @ =sub_8075590
ldr r0, _080B0C20 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0C24 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -450,7 +450,7 @@ _080B0C18:
pop {r0}
bx r0
.align 2, 0
_080B0C20: .4byte sub_8075590
_080B0C20: .4byte StartAnimLinearTranslation
_080B0C24: .4byte DestroyAnimSprite
thumb_func_end sub_80B0BD8
@@ -644,17 +644,17 @@ sub_80B0D7C: @ 80B0D7C
ldr r4, _080B0DC8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080B0DCC @ =sub_8075590
ldr r0, _080B0DCC @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0DD0 @ =sub_80B0DD4
adds r0, r5, 0
@@ -665,7 +665,7 @@ _080B0DC0:
bx r0
.align 2, 0
_080B0DC8: .4byte gBattleAnimTarget
_080B0DCC: .4byte sub_8075590
_080B0DCC: .4byte StartAnimLinearTranslation
_080B0DD0: .4byte sub_80B0DD4
thumb_func_end sub_80B0D7C
@@ -778,13 +778,13 @@ _080B0E9C:
_080B0E9E:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -896,7 +896,7 @@ sub_80B0F68: @ 80B0F68
ldr r4, _080B0F90 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x4]
@@ -909,7 +909,7 @@ _080B0F94:
ldr r4, _080B0FF0 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -918,7 +918,7 @@ _080B0FA6:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -1037,16 +1037,16 @@ sub_80B107C: @ 80B107C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B10D8
ldr r4, _080B10CC @ =sBattler_AI
ldr r4, _080B10CC @ =gBattlerAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1066,7 +1066,7 @@ sub_80B107C: @ 80B107C
b _080B10F4
.align 2, 0
_080B10C8: .4byte gBattleAnimArgs
_080B10CC: .4byte sBattler_AI
_080B10CC: .4byte gBattlerAttacker
_080B10D0: .4byte gBattleAnimAttacker
_080B10D4: .4byte gBattleAnimTarget
_080B10D8:
@@ -1125,7 +1125,7 @@ sub_80B111C: @ 80B111C
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -1135,7 +1135,7 @@ sub_80B111C: @ 80B111C
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1245,13 +1245,13 @@ _080B1236:
ldr r4, _080B1298 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1259,14 +1259,14 @@ _080B1236:
mov r8, r2
ldrb r0, [r2]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
subs r4, r6
strh r4, [r7, 0x2E]
@@ -1341,16 +1341,16 @@ sub_80B12E8: @ 80B12E8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B132C
ldr r4, _080B1320 @ =sBattler_AI
ldr r4, _080B1320 @ =gBattlerAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1360,7 +1360,7 @@ sub_80B12E8: @ 80B12E8
b _080B1332
.align 2, 0
_080B131C: .4byte gBattleAnimArgs
_080B1320: .4byte sBattler_AI
_080B1320: .4byte gBattlerAttacker
_080B1324: .4byte gBattleAnimTarget
_080B1328: .4byte gBattleAnimAttacker
_080B132C:
@@ -1379,7 +1379,7 @@ _080B1332:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B136C
@@ -1418,7 +1418,7 @@ _080B138C:
strh r0, [r5, 0x30]
adds r0, r4, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -1426,7 +1426,7 @@ _080B138C:
strh r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1473,13 +1473,13 @@ sub_80B13F8: @ 80B13F8
ldr r4, _080B1474 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1555,7 +1555,7 @@ _080B14A0:
movs r1, 0
bl sub_8075114
_080B14A8:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B14BC
asm/fire.s
+12 -12
View File
@@ -367,14 +367,14 @@ sub_80ACBB0: @ 80ACBB0
strh r1, [r0, 0x32]
movs r1, 0x50
strh r1, [r0, 0x36]
ldr r1, _080ACBD4 @ =sub_8075590
ldr r1, _080ACBD4 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080ACBD8 @ =DestroyAnimSprite
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080ACBD4: .4byte sub_8075590
_080ACBD4: .4byte StartAnimLinearTranslation
_080ACBD8: .4byte DestroyAnimSprite
thumb_func_end sub_80ACBB0
@@ -484,7 +484,7 @@ sub_80ACC88: @ 80ACC88
ldr r4, _080ACCD8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -492,7 +492,7 @@ sub_80ACC88: @ 80ACC88
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -522,13 +522,13 @@ sub_80ACCE0: @ 80ACCE0
ldr r5, _080ACD20 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -782,7 +782,7 @@ sub_80ACEA4: @ 80ACEA4
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
ldr r0, _080ACF10 @ =sub_80ACF14
str r0, [r4]
pop {r4,r5}
@@ -1147,7 +1147,7 @@ _080AD1A8:
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8075980
bl ResetSpriteRotScale
strh r5, [r4, 0xC]
_080AD1D4:
ldrh r0, [r4, 0x8]
@@ -1758,7 +1758,7 @@ _080AD612:
ldr r4, _080AD688 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -1766,7 +1766,7 @@ _080AD612:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1877,7 +1877,7 @@ _080AD70C:
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x30]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AD7A8
@@ -1999,7 +1999,7 @@ _080AD826:
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
lsrs r0, 24
adds r0, 0x1
asm/fldeff_flash.s
+1 -1
View File
@@ -209,7 +209,7 @@ sub_80C9CE8: @ 80C9CE8
bl get_map_light_from_warp0
lsls r0, 24
lsrs r7, r0, 24
bl sav1_map_get_light_level
bl GetCurrentMapType
lsls r0, 24
lsrs r6, r0, 24
movs r4, 0
asm/flying.s
+35 -35
View File
@@ -228,7 +228,7 @@ _080B1A3C:
ldr r5, _080B1A90 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -238,7 +238,7 @@ _080B1A3C:
strh r0, [r6, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -302,7 +302,7 @@ sub_80B1AB8: @ 80B1AB8
negs r0, r0
strh r0, [r1, 0x6]
_080B1AE4:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B1AFC
@@ -316,13 +316,13 @@ _080B1AE4:
_080B1AFC:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r2, _080B1B58 @ =gBattleAnimArgs
ldrh r1, [r2]
@@ -342,13 +342,13 @@ _080B1AFC:
ldr r4, _080B1B5C @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -376,7 +376,7 @@ _080B1B72:
ldrh r3, [r5, 0x36]
adds r0, r3
strh r0, [r5, 0x36]
ldr r0, _080B1BA8 @ =sub_8075590
ldr r0, _080B1BA8 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B1BAC @ =DestroyAnimSprite
adds r0, r5, 0
@@ -390,7 +390,7 @@ _080B1B72:
.align 2, 0
_080B1BA0: .4byte gBattleAnimTarget
_080B1BA4: .4byte gBattleAnimArgs
_080B1BA8: .4byte sub_8075590
_080B1BA8: .4byte StartAnimLinearTranslation
_080B1BAC: .4byte DestroyAnimSprite
thumb_func_end sub_80B1AB8
@@ -504,7 +504,7 @@ _080B1C72:
ldr r4, _080B1CB8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -512,7 +512,7 @@ _080B1C72:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -672,7 +672,7 @@ _080B1DB2:
_080B1DC8:
adds r0, r6, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080B1E60 @ =gBattleAnimArgs
lsrs r0, 24
@@ -681,7 +681,7 @@ _080B1DC8:
strh r0, [r7, 0x20]
adds r0, r6, 0
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldrh r1, [r4, 0x2]
lsrs r0, 24
@@ -720,7 +720,7 @@ _080B1DC8:
lsrs r1, 16
cmp r1, 0x7F
bhi _080B1EBE
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B1E64
@@ -1017,7 +1017,7 @@ _080B2028:
ands r0, r1
cmp r0, 0
beq _080B20E6
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B20B6
@@ -1149,7 +1149,7 @@ _080B211C:
ands r0, r1
cmp r0, 0
beq _080B21DA
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B21AA
@@ -1281,7 +1281,7 @@ _080B2210:
ands r0, r1
cmp r0, 0
beq _080B22CE
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B229E
@@ -1422,7 +1422,7 @@ _080B2318:
ands r0, r1
cmp r0, 0
beq _080B23D6
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B23A6
@@ -1627,13 +1627,13 @@ sub_80B24C0: @ 80B24C0
ldr r5, _080B250C @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1659,11 +1659,11 @@ sub_80B2514: @ 80B2514
strh r0, [r4, 0x32]
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x34]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B25C4
ldr r0, _080B2558 @ =gUnknown_2023BD6
ldr r0, _080B2558 @ =gBattlerPositions
ldr r1, _080B255C @ =gBattleAnimTarget
ldrb r2, [r1]
adds r0, r2, r0
@@ -1674,7 +1674,7 @@ sub_80B2514: @ 80B2514
beq _080B2560
adds r0, r2, 0
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -1682,12 +1682,12 @@ sub_80B2514: @ 80B2514
b _080B256E
.align 2, 0
_080B2554: .4byte gBattleAnimArgs
_080B2558: .4byte gUnknown_2023BD6
_080B2558: .4byte gBattlerPositions
_080B255C: .4byte gBattleAnimTarget
_080B2560:
adds r0, r2, 0
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -1737,7 +1737,7 @@ _080B25C4:
ldr r0, _080B267C @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -2127,13 +2127,13 @@ sub_80B2868: @ 80B2868
ldr r5, _080B2910 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2237,7 +2237,7 @@ _080B2990:
ldr r0, _080B29A8 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2454,13 +2454,13 @@ _080B2B20:
_080B2B22:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2614,13 +2614,13 @@ _080B2C54:
_080B2C56:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2773,14 +2773,14 @@ sub_80B2D64: @ 80B2D64
ldr r6, _080B2E18 @ =gBattleAnimAttacker
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x20]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
asm/ghost.s
+27 -27
View File
@@ -19,7 +19,7 @@ sub_80B5268: @ 80B5268
ldr r5, _080B52C8 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -27,7 +27,7 @@ sub_80B5268: @ 80B5268
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -358,12 +358,12 @@ sub_80B54E8: @ 80B54E8
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x1
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
adds r0, r4, 0
movs r1, 0x80
movs r2, 0x80
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldr r1, _080B5560 @ =gSprites
lsls r0, r4, 4
adds r0, r4
@@ -485,11 +485,11 @@ _080B55F0:
adds r0, r1, 0
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
b _080B5634
_080B5618:
adds r0, r1, 0
bl sub_8075980
bl ResetSpriteRotScale
adds r0, r5, 0
bl DestroyAnimVisualTask
movs r0, 0x50
@@ -518,7 +518,7 @@ sub_80B563C: @ 80B563C
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -527,7 +527,7 @@ sub_80B563C: @ 80B563C
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -637,13 +637,13 @@ _080B572E:
ldr r4, _080B5794 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -700,13 +700,13 @@ _080B5798:
ldr r4, _080B57E8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1214,7 +1214,7 @@ _080B5B68:
adds r2, r0
lsls r2, 2
adds r2, r4
ldr r0, _080B5C18 @ =gUnknown_2024018
ldr r0, _080B5C18 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _080B5C1C @ =gBattleAnimTarget
ldrb r0, [r0]
@@ -1260,7 +1260,7 @@ _080B5B68:
b _080B5C24
.align 2, 0
_080B5C14: .4byte gSprites
_080B5C18: .4byte gUnknown_2024018
_080B5C18: .4byte gBattleSpritesDataPtr
_080B5C1C: .4byte gBattleAnimTarget
_080B5C20:
movs r1, 0x80
@@ -1614,12 +1614,12 @@ sub_80B5EC0: @ 80B5EC0
ldr r4, _080B5F00 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1636,12 +1636,12 @@ _080B5F08:
ldr r4, _080B5FD0 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1652,13 +1652,13 @@ _080B5F08:
_080B5F2C:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xE0
@@ -1808,7 +1808,7 @@ sub_80B6020: @ 80B6020
ldr r4, _080B6178 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1818,7 +1818,7 @@ sub_80B6020: @ 80B6020
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B6090
@@ -1840,7 +1840,7 @@ _080B6092:
lsls r0, r4, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B615E
@@ -1860,7 +1860,7 @@ _080B6092:
beq _080B615E
adds r0, r4, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2253,7 +2253,7 @@ sub_80B63B4: @ 80B63B4
lsls r0, 24
cmp r0, 0
bne _080B63FC
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B6414
@@ -2872,7 +2872,7 @@ sub_80B68C8: @ 80B68C8
ldr r5, _080B6964 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
@@ -2898,7 +2898,7 @@ sub_80B68C8: @ 80B68C8
lsrs r0, 24
strh r0, [r4, 0x12]
ldrb r0, [r5]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
subs r0, 0x2
asm/ground.s
+23 -23
View File
@@ -12,13 +12,13 @@ sub_80B8B6C: @ 80B8B6C
ldr r5, _080B8BC4 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -27,13 +27,13 @@ sub_80B8B6C: @ 80B8B6C
ldr r5, _080B8BC8 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -77,13 +77,13 @@ sub_80B8BD4: @ 80B8BD4
ldr r4, _080B8C30 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -141,7 +141,7 @@ _080B8C74:
ldr r5, _080B8CBC @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -149,13 +149,13 @@ _080B8C74:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, _080B8CC0 @ =sub_8075590
ldr r0, _080B8CC0 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B8CC4 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -167,7 +167,7 @@ _080B8C74:
_080B8CB4: .4byte gBattleAnimAttacker
_080B8CB8: .4byte gBattleAnimArgs
_080B8CBC: .4byte gBattleAnimTarget
_080B8CC0: .4byte sub_8075590
_080B8CC0: .4byte StartAnimLinearTranslation
_080B8CC4: .4byte DestroyAnimSprite
thumb_func_end sub_80B8C54
@@ -222,7 +222,7 @@ _080B8D20:
strh r0, [r6, 0x32]
adds r0, r7, r4
strh r0, [r6, 0x36]
ldr r0, _080B8D50 @ =sub_8075590
ldr r0, _080B8D50 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B8D54 @ =move_anim_8074EE0
adds r0, r6, 0
@@ -235,7 +235,7 @@ _080B8D20:
.align 2, 0
_080B8D48: .4byte gBattleAnimTarget
_080B8D4C: .4byte gBattleAnimArgs
_080B8D50: .4byte sub_8075590
_080B8D50: .4byte StartAnimLinearTranslation
_080B8D54: .4byte move_anim_8074EE0
thumb_func_end sub_80B8CC8
@@ -262,7 +262,7 @@ sub_80B8D58: @ 80B8D58
ldr r4, _080B8DC4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x2]
@@ -270,7 +270,7 @@ sub_80B8D58: @ 80B8D58
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r6, 0x4]
@@ -1080,7 +1080,7 @@ _080B9396:
_080B93B2:
adds r0, r4, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -1150,7 +1150,7 @@ _080B943A:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r2, _080B949C @ =0x0000fff0
@@ -1224,7 +1224,7 @@ sub_80B94B4: @ 80B94B4
_080B94D8: .4byte gTasks
_080B94DC: .4byte gBattleAnimArgs
_080B94E0:
ldr r0, _080B950C @ =gUnknown_2037EEC
ldr r0, _080B950C @ =gAnimMovePower
ldrh r0, [r0]
movs r1, 0xA
bl __udivsi3
@@ -1247,7 +1247,7 @@ _080B94EC:
ldr r0, _080B9514 @ =sub_80B9584
b _080B9576
.align 2, 0
_080B950C: .4byte gUnknown_2037EEC
_080B950C: .4byte gAnimMovePower
_080B9510: .4byte gBattle_BG3_X
_080B9514: .4byte sub_80B9584
_080B9518:
@@ -1257,7 +1257,7 @@ _080B9518:
_080B951E:
lsls r0, r5, 24
lsrs r0, 24
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B9548
@@ -1641,7 +1641,7 @@ sub_80B97D8: @ 80B97D8
lsrs r1, r0, 24
ldr r3, _080B97F8 @ =gBattleAnimArgs
movs r2, 0
ldr r0, _080B97FC @ =gUnknown_2037EEC
ldr r0, _080B97FC @ =gAnimMovePower
ldrh r0, [r0]
cmp r0, 0x63
bls _080B97EC
@@ -1654,7 +1654,7 @@ _080B97EC:
bx r0
.align 2, 0
_080B97F8: .4byte gBattleAnimArgs
_080B97FC: .4byte gUnknown_2037EEC
_080B97FC: .4byte gAnimMovePower
thumb_func_end sub_80B97D8
thumb_func_start sub_80B9800
@@ -1698,7 +1698,7 @@ _080B9832:
adds r4, r0
adds r0, r5, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x20
@@ -1709,7 +1709,7 @@ _080B9832:
strh r1, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x40
asm/ice.s
+44 -44
View File
@@ -123,26 +123,26 @@ sub_80AF108: @ 80AF108
ldr r4, _080AF218 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, _080AF21C @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r3, r0, 24
ldrb r0, [r4]
movs r1, 0x3
str r3, [sp]
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080AF220 @ =gBattleAnimArgs
@@ -387,7 +387,7 @@ sub_80AF330: @ 80AF330
ldr r0, _080AF364 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -417,7 +417,7 @@ _080AF37A:
ldr r0, _080AF3AC @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r1, _080AF3A8 @ =gBattleAnimArgs
lsrs r0, 24
@@ -429,7 +429,7 @@ _080AF37A:
ldr r1, _080AF3B0 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
ldr r0, _080AF3B4 @ =sub_8075590
ldr r0, _080AF3B4 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -438,7 +438,7 @@ _080AF37A:
_080AF3A8: .4byte gBattleAnimArgs
_080AF3AC: .4byte gBattleAnimTarget
_080AF3B0: .4byte DestroyAnimSprite
_080AF3B4: .4byte sub_8075590
_080AF3B4: .4byte StartAnimLinearTranslation
thumb_func_end sub_80AF330
thumb_func_start sub_80AF3B8
@@ -553,13 +553,13 @@ sub_80AF468: @ 80AF468
ldr r4, _080AF4B4 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -868,13 +868,13 @@ sub_80AF6D8: @ 80AF6D8
ldr r4, _080AF720 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1243,7 +1243,7 @@ _080AF9D4:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080AF9EC
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080AF9F8
@@ -1393,7 +1393,7 @@ sub_80AFAE4: @ 80AFAE4
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AFB26
@@ -1433,7 +1433,7 @@ _080AFB26:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080AFB88
@@ -1619,7 +1619,7 @@ _080AFCD6:
adds r0, 0x1
strh r0, [r1, 0x20]
_080AFCF8:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AFD0C
@@ -1663,13 +1663,13 @@ sub_80AFD4C: @ 80AFD4C
ldr r5, _080AFD78 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1704,7 +1704,7 @@ sub_80AFD80: @ 80AFD80
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AFDC2
@@ -1744,7 +1744,7 @@ _080AFDC2:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080AFE24
@@ -1920,7 +1920,7 @@ _080AFF5E:
adds r0, 0x1
strh r0, [r1, 0x20]
_080AFF80:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AFF94
@@ -1970,12 +1970,12 @@ sub_80AFFD4: @ 80AFFD4
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldr r7, _080B00C4 @ =gBattleAnimTarget
ldrb r0, [r7]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -1984,7 +1984,7 @@ sub_80AFFD4: @ 80AFFD4
lsls r0, 8
strh r0, [r5, 0x3C]
_080B0008:
ldr r3, _080B00C8 @ =gUnknown_2023BD6
ldr r3, _080B00C8 @ =gBattlerPositions
ldrb r0, [r7]
adds r0, r3
ldrb r1, [r0]
@@ -2036,13 +2036,13 @@ _080B0068:
ldr r4, _080B00C0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2058,7 +2058,7 @@ _080B0068:
ldr r4, _080B00C4 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2075,7 +2075,7 @@ _080B0068:
_080B00BC: .4byte gBattleAnimArgs
_080B00C0: .4byte gBattleAnimAttacker
_080B00C4: .4byte gBattleAnimTarget
_080B00C8: .4byte gUnknown_2023BD6
_080B00C8: .4byte gBattlerPositions
_080B00CC: .4byte gSprites
_080B00D0:
ldrh r0, [r6, 0x2]
@@ -2085,7 +2085,7 @@ _080B00D0:
ldr r4, _080B0140 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2098,7 +2098,7 @@ _080B00D0:
ldrb r0, [r4]
movs r1, 0x1
_080B00F8:
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x8]
@@ -2111,7 +2111,7 @@ _080B00F8:
ldrh r1, [r5, 0x3C]
orrs r0, r1
strh r0, [r5, 0x3C]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B012C
@@ -2197,7 +2197,7 @@ _080B01AA:
ldr r6, _080B01F8 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -2213,11 +2213,11 @@ _080B01AA:
ldrh r0, [r4, 0x3C]
adds r0, 0x1
strh r0, [r4, 0x3C]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B0200
ldr r1, _080B01FC @ =gUnknown_2023BD6
ldr r1, _080B01FC @ =gBattlerPositions
ldrb r0, [r6]
adds r0, r1
ldrb r1, [r0]
@@ -2230,7 +2230,7 @@ _080B01AA:
b _080B0202
.align 2, 0
_080B01F8: .4byte gBattleAnimTarget
_080B01FC: .4byte gUnknown_2023BD6
_080B01FC: .4byte gBattlerPositions
_080B0200:
strh r5, [r4, 0x38]
_080B0202:
@@ -2283,7 +2283,7 @@ _080B0230:
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B02AE
@@ -2361,11 +2361,11 @@ _080B02CE:
strh r0, [r4, 0x34]
adds r0, 0x4
strh r0, [r4, 0x36]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B0328
ldr r1, _080B0320 @ =gUnknown_2023BD6
ldr r1, _080B0320 @ =gBattlerPositions
ldr r0, _080B0324 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
@@ -2378,7 +2378,7 @@ _080B02CE:
lsls r0, 1
b _080B032A
.align 2, 0
_080B0320: .4byte gUnknown_2023BD6
_080B0320: .4byte gBattlerPositions
_080B0324: .4byte gBattleAnimTarget
_080B0328:
ldr r0, _080B0340 @ =0x0000fff0
@@ -2583,7 +2583,7 @@ sub_80B0458: @ 80B0458
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B0544
@@ -2591,12 +2591,12 @@ sub_80B0458: @ 80B0458
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r7, r0, 24
adds r0, r5, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
mov r1, r8
@@ -2921,7 +2921,7 @@ _080B0742:
ldr r4, _080B0788 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -2929,7 +2929,7 @@ _080B0742:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
asm/item_menu.s
+8 -8
View File
@@ -154,14 +154,14 @@ _08107EC8: .4byte sub_80568A8
thumb_func_start sub_8107ECC
sub_8107ECC: @ 8107ECC
push {lr}
ldr r2, _08107EDC @ =sub_8030AEC
ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x5
movs r1, 0x3
bl sub_8107DB4
pop {r0}
bx r0
.align 2, 0
_08107EDC: .4byte sub_8030AEC
_08107EDC: .4byte SetCB2ToReshowScreenAfterMenu2
thumb_func_end sub_8107ECC
thumb_func_start sub_8107EE0
@@ -6124,14 +6124,14 @@ sub_810AF74: @ 810AF74
movs r0, 0x4
movs r1, 0x1
bl AddBagItem
ldr r2, _0810AF98 @ =sub_8030AEC
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x6
movs r1, 0
bl sub_8107DB4
pop {r0}
bx r0
.align 2, 0
_0810AF98: .4byte sub_8030AEC
_0810AF98: .4byte SetCB2ToReshowScreenAfterMenu2
thumb_func_end sub_810AF74
thumb_func_start sub_810AF9C
@@ -6348,13 +6348,13 @@ sub_810B108: @ 810B108
.align 2, 0
_0810B15C: .4byte CB2_ReturnToTeachyTV
_0810B160:
ldr r2, _0810B168 @ =sub_8030AEC
ldr r2, _0810B168 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x7
b _0810B170
.align 2, 0
_0810B168: .4byte sub_8030AEC
_0810B168: .4byte SetCB2ToReshowScreenAfterMenu2
_0810B16C:
ldr r2, _0810B17C @ =sub_8030AEC
ldr r2, _0810B17C @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x8
_0810B170:
movs r1, 0
@@ -6363,7 +6363,7 @@ _0810B170:
pop {r0}
bx r0
.align 2, 0
_0810B17C: .4byte sub_8030AEC
_0810B17C: .4byte SetCB2ToReshowScreenAfterMenu2
thumb_func_end sub_810B108
thumb_func_start sub_810B180
asm/learn_move.s
+1 -1
View File
@@ -758,7 +758,7 @@ _080E4C7E:
adds r5, r4
ldrh r4, [r5]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldr r1, [r7]
movs r0, 0x1C
b _080E4ED8
asm/link.s
+14 -14
View File
@@ -236,7 +236,7 @@ sub_8009640: @ 8009640
ldr r2, _080096DC @ =0x00001111
adds r0, r2, 0
strh r0, [r1]
bl sub_8009804
bl OpenLink
ldr r0, _080096E0 @ =gMain
ldrh r0, [r0, 0x24]
bl SeedRng
@@ -431,8 +431,8 @@ _080097FC: .4byte gTasks
_08009800: .4byte gUnknown_3003F84
thumb_func_end task02_080097CC
thumb_func_start sub_8009804
sub_8009804: @ 8009804
thumb_func_start OpenLink
OpenLink: @ 8009804
push {r4-r6,lr}
ldr r0, _0800984C @ =gWirelessCommType
ldrb r4, [r0]
@@ -505,7 +505,7 @@ _080098A8: .4byte gReceivedRemoteLinkPlayers
_080098AC: .4byte gUnknown_3003EB8
_080098B0: .4byte gUnknown_3003F30
_080098B4: .4byte gUnknown_3003F2C
thumb_func_end sub_8009804
thumb_func_end OpenLink
thumb_func_start CloseLink
CloseLink: @ 80098B8
@@ -1556,7 +1556,7 @@ sub_800A0B4: @ 800A0B4
str r1, [r0]
ldr r0, _0800A0CC @ =gLinkTimeOutCounter
strh r1, [r0]
bl sub_8009804
bl OpenLink
pop {r0}
bx r0
.align 2, 0
@@ -2115,8 +2115,8 @@ _0800A4B4: .4byte gUnknown_3003F90
_0800A4B8: .4byte 0x0000cccc
thumb_func_end sub_800A474
thumb_func_start sub_800A4BC
sub_800A4BC: @ 800A4BC
thumb_func_start IsLinkTaskFinished
IsLinkTaskFinished: @ 800A4BC
push {lr}
ldr r0, _0800A4D0 @ =gWirelessCommType
ldrb r0, [r0]
@@ -2142,7 +2142,7 @@ _0800A4E2:
bx r1
.align 2, 0
_0800A4E8: .4byte gUnknown_3003F80
thumb_func_end sub_800A4BC
thumb_func_end IsLinkTaskFinished
thumb_func_start GetBlockReceivedStatus
GetBlockReceivedStatus: @ 800A4EC
@@ -2265,8 +2265,8 @@ _0800A5B2:
_0800A5B8: .4byte gUnknown_3003EBC
thumb_func_end ResetBlockReceivedFlag
thumb_func_start sub_800A5BC
sub_800A5BC: @ 800A5BC
thumb_func_start CheckShouldAdvanceLinkState
CheckShouldAdvanceLinkState: @ 800A5BC
push {lr}
ldr r0, _0800A5DC @ =gUnknown_3003F20
ldr r1, [r0]
@@ -2287,7 +2287,7 @@ _0800A5D8:
.align 2, 0
_0800A5DC: .4byte gUnknown_3003F20
_0800A5E0: .4byte gUnknown_3003F84
thumb_func_end sub_800A5BC
thumb_func_end CheckShouldAdvanceLinkState
thumb_func_start LinkTestCalcBlockChecksum
LinkTestCalcBlockChecksum: @ 800A5E4
@@ -2883,8 +2883,8 @@ GetLinkPlayerCount_2: @ 800AA38
_0800AA44: .4byte gUnknown_3003F20
thumb_func_end GetLinkPlayerCount_2
thumb_func_start sub_800AA48
sub_800AA48: @ 800AA48
thumb_func_start IsLinkMaster
IsLinkMaster: @ 800AA48
push {lr}
ldr r0, _0800AA60 @ =gWirelessCommType
ldrb r0, [r0]
@@ -2906,7 +2906,7 @@ _0800AA68:
_0800AA70:
pop {r1}
bx r1
thumb_func_end sub_800AA48
thumb_func_end IsLinkMaster
thumb_func_start sub_800AA74
sub_800AA74: @ 800AA74
asm/link_rfu_2.s
+9 -9
View File
@@ -4996,7 +4996,7 @@ _080FAC58:
.align 2, 0
_080FAC74: .4byte 0x0000099d
_080FAC78:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FACD6
@@ -5103,7 +5103,7 @@ _080FAD3A:
.align 2, 0
_080FAD50: .4byte gBlockSendBuffer
_080FAD54:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FAD8A
@@ -6875,7 +6875,7 @@ sub_80FBA78: @ 80FBA78
adds r0, r2, 0
strh r0, [r1]
bl sub_800B1F4
bl sub_8009804
bl OpenLink
ldr r0, _080FBB00 @ =gMain
ldrh r0, [r0, 0x24]
bl SeedRng
@@ -9368,8 +9368,8 @@ _080FCD6C: .4byte gUnknown_3005440
_080FCD70: .4byte gUnknown_3005E00
thumb_func_end sub_80FCD50
thumb_func_start sub_80FCD74
sub_80FCD74: @ 80FCD74
thumb_func_start CreateWirelessStatusIndicatorSprite
CreateWirelessStatusIndicatorSprite: @ 80FCD74
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -9464,7 +9464,7 @@ _080FCE34: .4byte gUnknown_203ACE4
_080FCE38: .4byte gSprites
_080FCE3C: .4byte 0x00001234
_080FCE40: .4byte gUnknown_843F274
thumb_func_end sub_80FCD74
thumb_func_end CreateWirelessStatusIndicatorSprite
thumb_func_start DestroyWirelessStatusIndicatorSprite
DestroyWirelessStatusIndicatorSprite: @ 80FCE44
@@ -9514,8 +9514,8 @@ _080FCEA0: .4byte gDummyOamData
_080FCEA4: .4byte 0x070003e8
thumb_func_end DestroyWirelessStatusIndicatorSprite
thumb_func_start sub_80FCEA8
sub_80FCEA8: @ 80FCEA8
thumb_func_start LoadWirelessStatusIndicatorSpriteGfx
LoadWirelessStatusIndicatorSpriteGfx: @ 80FCEA8
push {r4,lr}
ldr r4, _080FCED4 @ =gUnknown_843F274
ldrh r0, [r4, 0x6]
@@ -9540,7 +9540,7 @@ _080FCED4: .4byte gUnknown_843F274
_080FCED8: .4byte 0xffff0000
_080FCEDC: .4byte gUnknown_843F27C
_080FCEE0: .4byte gUnknown_203ACE4
thumb_func_end sub_80FCEA8
thumb_func_end LoadWirelessStatusIndicatorSpriteGfx
thumb_func_start sub_80FCEE4
sub_80FCEE4: @ 80FCEE4
asm/link_rfu_3.s
+29 -29
View File
@@ -317,7 +317,7 @@ _08115B0C:
movs r2, 0
bl sub_80FAF58
bl sub_800B1F4
bl sub_8009804
bl OpenLink
ldrb r1, [r4]
movs r0, 0xF
ands r0, r1
@@ -707,10 +707,10 @@ _08115E84:
beq _08115EC0
b _081161D8
_08115E8E:
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
movs r0, 0x5
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13]
@@ -1841,7 +1841,7 @@ _081167C0:
ldrb r0, [r0]
strb r0, [r1]
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBBD8
movs r0, 0x70
bl AllocZeroed
@@ -2475,10 +2475,10 @@ sub_8116D60: @ 8116D60
push {r4,r5,lr}
adds r4, r0, 0
strb r1, [r4, 0xF]
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE]
bl RedrawListMenu
ldr r5, _08116DD4 @ =gStringVar1
@@ -2595,7 +2595,7 @@ _08116E70:
movs r2, 0
bl sub_80FAF58
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBBD8
movs r0, 0x1
bl sub_80FB128
@@ -3864,7 +3864,7 @@ _08117968:
.align 2, 0
_08117970: .4byte gPaletteFade
_08117974:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08117988
@@ -3999,7 +3999,7 @@ _08117A7C:
movs r1, 0
bl sub_80FAF74
bl sub_800B1F4
bl sub_8009804
bl OpenLink
movs r0, 0x2
bl sub_80FBB8C
movs r0, 0x1
@@ -4188,10 +4188,10 @@ _08117C3C:
beq _08117C84
b _08117ECA
_08117C42:
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
ldr r1, [r5]
ldrb r0, [r5, 0x13]
lsls r0, 5
@@ -4477,7 +4477,7 @@ _08117EB2:
strb r0, [r5, 0xC]
b _08117ECA
_08117EBA:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08117ECA
@@ -4571,7 +4571,7 @@ _08117F7C:
movs r2, 0
bl sub_80FAF58
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBBD8
movs r0, 0x70
bl AllocZeroed
@@ -4702,10 +4702,10 @@ _0811808E:
cmp r0, 0
bne _08118130
strb r2, [r5, 0xF]
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r5, 0xE]
bl RedrawListMenu
ldr r4, _0811812C @ =gStringVar1
@@ -4897,7 +4897,7 @@ _0811826C:
bl sub_800AB9C
b _08118288
_08118278:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08118288
@@ -4990,7 +4990,7 @@ _08118340:
movs r2, 0
bl sub_80FAF58
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBBD8
movs r0, 0x70
bl AllocZeroed
@@ -5118,10 +5118,10 @@ _0811843A:
beq _0811849C
strb r4, [r5, 0xF]
strb r4, [r5, 0x14]
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
ldr r0, [r5]
adds r4, r0, 0
adds r4, 0x10
@@ -5302,7 +5302,7 @@ _081185E8:
bl sub_800AB9C
b _08118604
_081185F4:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08118604
@@ -5582,7 +5582,7 @@ _0811887C:
ldrh r2, [r2, 0xC]
bl sub_80FAFA0
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBC00
ldr r0, [r6, 0x8]
movs r1, 0x1
@@ -6274,7 +6274,7 @@ _08118EAC:
.align 2, 0
_08118EC4: .4byte gStringVar4
_08118EC8:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08118ED6
@@ -6796,7 +6796,7 @@ _08119354:
movs r0, 0xF
b _081198DA
_0811935C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08119368
@@ -7242,7 +7242,7 @@ _081196EC:
lsrs r2, 2
lsls r1, r2, 3
subs r1, r2
ldr r2, _0811972C @ =gUnknown_824F1A0
ldr r2, _0811972C @ =gTypeNames
adds r1, r2
bl StringCopy
ldr r1, _08119730 @ =gUnknown_8458ED0
@@ -7250,7 +7250,7 @@ _081196EC:
.align 2, 0
_08119724: .4byte gStringVar1
_08119728: .4byte gStringVar2
_0811972C: .4byte gUnknown_824F1A0
_0811972C: .4byte gTypeNames
_08119730: .4byte gUnknown_8458ED0
_08119734:
ldr r4, _08119774 @ =gStringVar1
@@ -7273,7 +7273,7 @@ _08119734:
lsrs r2, 2
lsls r1, r2, 3
subs r1, r2
ldr r2, _0811977C @ =gUnknown_824F1A0
ldr r2, _0811977C @ =gTypeNames
adds r1, r2
bl StringCopy
ldr r1, _08119780 @ =gUnknown_8458F04
@@ -7284,7 +7284,7 @@ _0811976A:
.align 2, 0
_08119774: .4byte gStringVar1
_08119778: .4byte gStringVar2
_0811977C: .4byte gUnknown_824F1A0
_0811977C: .4byte gTypeNames
_08119780: .4byte gUnknown_8458F04
_08119784:
adds r0, r6, 0
@@ -7640,7 +7640,7 @@ _08119A3E:
movs r2, 0
bl sub_80FAF58
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBC00
movs r0, 0x1
bl sub_80FB128
@@ -13134,7 +13134,7 @@ _0811C48C:
.align 2, 0
_0811C4A4: .4byte gMain
_0811C4A8:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0811C516
asm/macros/battle_script.inc
+1 -1
View File
@@ -538,7 +538,7 @@
.byte \bank_or_side
.endm
.macro atk62 bank_or_side
.macro atk62_hidepartystatussummary bank_or_side
.byte 0x62
.byte \bank_or_side
.endm
asm/normal.s
+3 -3
View File
@@ -1185,7 +1185,7 @@ _080BA1D0:
cmp r0, 0
beq _080BA200
ldr r2, _080BA274 @ =gSprites
ldr r0, _080BA278 @ =gUnknown_3004FF0
ldr r0, _080BA278 @ =gHealthboxSpriteIds
add r0, r9
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1258,7 +1258,7 @@ _080BA268: .4byte gBattleAnimAttacker
_080BA26C: .4byte gBattleAnimTarget
_080BA270: .4byte 0x0000ffff
_080BA274: .4byte gSprites
_080BA278: .4byte gUnknown_3004FF0
_080BA278: .4byte gHealthboxSpriteIds
thumb_func_end sub_80BA16C
thumb_func_start sub_80BA27C
@@ -1733,7 +1733,7 @@ sub_80BA5F8: @ 80BA5F8
lsls r0, 24
cmp r0, 0
beq _080BA61C
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080BA61C
asm/overworld.s
+9 -9
View File
@@ -1228,7 +1228,7 @@ sub_805550C: @ 805550C
lsrs r6, r0, 16
lsls r1, 16
lsrs r7, r1, 16
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1911,7 +1911,7 @@ _08055A68: .4byte gUnknown_2031DD4
thumb_func_start sub_8055A6C
sub_8055A6C: @ 8055A6C
push {r4-r7,lr}
bl sav1_map_get_light_level
bl GetCurrentMapType
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2884,8 +2884,8 @@ get_map_light_level_from_warp: @ 8056170
bx r1
thumb_func_end get_map_light_level_from_warp
thumb_func_start sav1_map_get_light_level
sav1_map_get_light_level: @ 8056188
thumb_func_start GetCurrentMapType
GetCurrentMapType: @ 8056188
push {lr}
ldr r0, _0805619C @ =gSaveBlock1Ptr
ldr r0, [r0]
@@ -2897,7 +2897,7 @@ sav1_map_get_light_level: @ 8056188
bx r1
.align 2, 0
_0805619C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_light_level
thumb_func_end GetCurrentMapType
thumb_func_start get_map_light_from_warp0
get_map_light_from_warp0: @ 80561A0
@@ -4058,10 +4058,10 @@ _08056B3C:
ldrb r0, [r0]
cmp r0, 0
beq _08056B62
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
b _08056B62
.align 2, 0
_08056B54: .4byte gWirelessCommType
@@ -4389,10 +4389,10 @@ _08056E18:
ldrb r0, [r0]
cmp r0, 0
beq _08056E3E
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
b _08056E3E
.align 2, 0
_08056E30: .4byte gWirelessCommType
asm/party_menu.s
+30 -30
View File
@@ -2010,8 +2010,8 @@ _0811FA18: .4byte gUnknown_8459FC4
_0811FA1C: .4byte gUnknown_8459FE0
thumb_func_end sub_811F9DC
thumb_func_start sub_811FA20
sub_811FA20: @ 811FA20
thumb_func_start IsMultiBattle
IsMultiBattle: @ 811FA20
push {lr}
ldr r0, _0811FA34 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -2028,7 +2028,7 @@ _0811FA38:
_0811FA3A:
pop {r1}
bx r1
thumb_func_end sub_811FA20
thumb_func_end IsMultiBattle
thumb_func_start sub_811FA40
sub_811FA40: @ 811FA40
@@ -7145,7 +7145,7 @@ party_menu_icon_anim: @ 81221D4
adds r7, r1, 0
adds r4, r2, 0
movs r6, 0x1
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13549,7 +13549,7 @@ sub_8125554: @ 8125554
bl sub_81202F8
movs r0, 0x2
bl ScheduleBgCopyTilemapToVram
bl sub_803539C
bl HandleBattleLowHpMusicChange
ldr r1, _081255B4 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -14645,7 +14645,7 @@ sub_8125E4C: @ 8125E4C
ldr r3, _08125E80 @ =sub_8125E84
ldrh r4, [r4, 0xE]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
add sp, 0x4
pop {r4}
pop {r0}
@@ -15250,7 +15250,7 @@ sub_8126350: @ 8126350
lsls r2, 2
adds r1, r7, r2
adds r0, r4, 0
bl sub_811D130
bl GetMonLevelUpWindowStats
ldrb r0, [r6, 0x9]
ldr r5, _0812641C @ =gSpecialVar_ItemId
ldrh r1, [r5]
@@ -15260,7 +15260,7 @@ sub_8126350: @ 8126350
lsls r0, 2
adds r1, r7, r0
adds r0, r4, 0
bl sub_811D130
bl GetMonLevelUpWindowStats
ldr r1, _08126420 @ =gUnknown_203B0C0
movs r0, 0x1
strb r0, [r1]
@@ -15497,7 +15497,7 @@ sub_8126570: @ 8126570
str r1, [sp, 0x4]
adds r1, r4, 0
movs r3, 0x1
bl sub_811E7F0
bl DrawLevelUpWindowPg1
ldrb r0, [r4, 0x18]
movs r1, 0x2
bl CopyWindowToVram
@@ -15528,7 +15528,7 @@ sub_81265BC: @ 81265BC
str r2, [sp]
movs r2, 0x1
movs r3, 0x2
bl sub_811E93C
bl DrawLevelUpWindowPg2
ldrb r0, [r4, 0x18]
movs r1, 0x2
bl CopyWindowToVram
@@ -17909,14 +17909,14 @@ _081278B0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_start sub_81278B4
sub_81278B4: @ 81278B4
push {lr}
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _081278C4
movs r0, 0
b _081278D6
_081278C4:
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17930,8 +17930,8 @@ _081278D6:
bx r1
thumb_func_end sub_81278B4
thumb_func_start sub_81278DC
sub_81278DC: @ 81278DC
thumb_func_start OpenPartyMenuInBattle
OpenPartyMenuInBattle: @ 81278DC
push {r4,lr}
sub sp, 0xC
lsls r0, 24
@@ -17955,7 +17955,7 @@ sub_81278DC: @ 81278DC
str r0, [sp]
ldr r0, _08127928 @ =sub_8120C3C
str r0, [sp, 0x4]
ldr r0, _0812792C @ =sub_8030ADC
ldr r0, _0812792C @ =SetCB2ToReshowScreenAfterMenu
str r0, [sp, 0x8]
movs r0, 0x1
adds r2, r4, 0
@@ -17967,7 +17967,7 @@ sub_81278DC: @ 81278DC
.align 2, 0
_08127924: .4byte gBattleTypeFlags
_08127928: .4byte sub_8120C3C
_0812792C: .4byte sub_8030ADC
_0812792C: .4byte SetCB2ToReshowScreenAfterMenu
_08127930:
bl sub_81278B4
adds r1, r0, 0
@@ -17977,7 +17977,7 @@ _08127930:
str r0, [sp]
ldr r0, _08127960 @ =sub_811FB28
str r0, [sp, 0x4]
ldr r0, _08127964 @ =sub_8030ADC
ldr r0, _08127964 @ =SetCB2ToReshowScreenAfterMenu
str r0, [sp, 0x8]
movs r0, 0x1
adds r2, r4, 0
@@ -17992,8 +17992,8 @@ _08127950:
bx r0
.align 2, 0
_08127960: .4byte sub_811FB28
_08127964: .4byte sub_8030ADC
thumb_func_end sub_81278DC
_08127964: .4byte SetCB2ToReshowScreenAfterMenu
thumb_func_end OpenPartyMenuInBattle
thumb_func_start sub_8127968
sub_8127968: @ 8127968
@@ -18007,7 +18007,7 @@ sub_8127968: @ 8127968
str r0, [sp]
ldr r0, _0812799C @ =sub_8120EBC
str r0, [sp, 0x4]
ldr r0, _081279A0 @ =sub_8030ADC
ldr r0, _081279A0 @ =SetCB2ToReshowScreenAfterMenu
str r0, [sp, 0x8]
movs r0, 0x1
movs r2, 0
@@ -18020,7 +18020,7 @@ sub_8127968: @ 8127968
bx r0
.align 2, 0
_0812799C: .4byte sub_8120EBC
_081279A0: .4byte sub_8030ADC
_081279A0: .4byte SetCB2ToReshowScreenAfterMenu
thumb_func_end sub_8127968
thumb_func_start sub_81279A4
@@ -18169,7 +18169,7 @@ sub_8127AC0: @ 8127AC0
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r5, r0, 24
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18290,7 +18290,7 @@ _08127BD8:
ldrb r0, [r0, 0xB]
cmp r0, 0x4
bne _08127BEC
bl sub_8044348
bl SetMonPreventsSwitchingString
b _08127C8A
.align 2, 0
_08127BE8: .4byte gUnknown_203B0A0
@@ -18402,7 +18402,7 @@ sub_8127CCC: @ 8127CCC
adds r6, r0, 0
lsls r1, 24
lsrs r4, r1, 24
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18425,7 +18425,7 @@ _08127CF4:
strb r0, [r6, 0x2]
b _08127D9C
_08127D02:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08127D40
@@ -18565,7 +18565,7 @@ _08127E00:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18588,7 +18588,7 @@ _08127E26:
strb r0, [r5, 0x2]
b _08127EB6
_08127E34:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08127E6C
@@ -18678,7 +18678,7 @@ sub_8127EC4: @ 8127EC4
lsls r2, 24
lsrs r6, r2, 24
movs r7, 0
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
cmp r0, 0
beq _08127F72
@@ -19046,12 +19046,12 @@ _0812817A:
sub_8128184: @ 8128184
push {lr}
bl sub_8108CF0
ldr r0, _08128194 @ =sub_8030ADC
ldr r0, _08128194 @ =SetCB2ToReshowScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_08128194: .4byte sub_8030ADC
_08128194: .4byte SetCB2ToReshowScreenAfterMenu
thumb_func_end sub_8128184
thumb_func_start sub_8128198
asm/poison.s
+5 -5
View File
@@ -26,13 +26,13 @@ _080B1636:
ldr r4, _080B1678 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -166,7 +166,7 @@ sub_80B1744: @ 80B1744
adds r0, r1
strh r0, [r4, 0x36]
adds r0, r4, 0
bl sub_80754B8
bl InitSpriteDataForLinearTranslation
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r2, 0x4
@@ -253,7 +253,7 @@ _080B17F0:
strh r2, [r4, 0x32]
adds r1, r3
strh r1, [r4, 0x36]
ldr r0, _080B1830 @ =sub_8075590
ldr r0, _080B1830 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B1834 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -265,7 +265,7 @@ _080B17F0:
_080B1824: .4byte gBattleAnimTarget
_080B1828: .4byte gBattleAnimAttacker
_080B182C: .4byte gBattleAnimArgs
_080B1830: .4byte sub_8075590
_080B1830: .4byte StartAnimLinearTranslation
_080B1834: .4byte DestroyAnimSprite
thumb_func_end sub_80B17C4
asm/pokeball.s
+35 -35
View File
@@ -14,10 +14,10 @@ DoPokeballSendOutAnimation: @ 804A938
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
ldr r1, _0804A98C @ =gUnknown_2024005
ldr r1, _0804A98C @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldr r0, _0804A990 @ =gUnknown_2024018
ldr r0, _0804A990 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r6, _0804A994 @ =gActiveBattler
ldrb r1, [r6]
@@ -49,8 +49,8 @@ DoPokeballSendOutAnimation: @ 804A938
pop {r1}
bx r1
.align 2, 0
_0804A98C: .4byte gUnknown_2024005
_0804A990: .4byte gUnknown_2024018
_0804A98C: .4byte gDoingBattleAnim
_0804A990: .4byte gBattleSpritesDataPtr
_0804A994: .4byte gActiveBattler
_0804A998: .4byte sub_804A9A0
_0804A99C: .4byte gTasks
@@ -132,7 +132,7 @@ _0804AA12:
beq _0804AA60
ldr r4, _0804AA5C @ =gLinkPlayers
adds r0, r6, 0
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -220,13 +220,13 @@ _0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1
_0804AAF8:
adds r0, r6, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
adds r0, r6, 0
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x18
@@ -276,13 +276,13 @@ _0804AB6C:
strh r0, [r4, 0x2E]
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1265,11 +1265,11 @@ _0804B324:
cmp r5, r0
bne _0804B3A6
_0804B34E:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0804B3A6
ldr r0, _0804B390 @ =gUnknown_2024018
ldr r0, _0804B390 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x9]
@@ -1293,7 +1293,7 @@ _0804B34E:
.align 2, 0
_0804B388: .4byte gBattlerPartyIndexes
_0804B38C: .4byte gPlayerParty
_0804B390: .4byte gUnknown_2024018
_0804B390: .4byte gBattleSpritesDataPtr
_0804B394: .4byte gBattleTypeFlags
_0804B398: .4byte gMPlayInfo_BGM
_0804B39C:
@@ -1302,11 +1302,11 @@ _0804B39C:
movs r2, 0x80
bl m4aMPlayVolumeControl
_0804B3A6:
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0804B3C0
ldr r0, _0804B3CC @ =gUnknown_2024018
ldr r0, _0804B3CC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x9]
@@ -1320,7 +1320,7 @@ _0804B3C0:
.align 2, 0
_0804B3C4: .4byte gMPlayInfo_BGM
_0804B3C8: .4byte 0x0000ffff
_0804B3CC: .4byte gUnknown_2024018
_0804B3CC: .4byte gBattleSpritesDataPtr
_0804B3D0:
movs r0, 0
bl GetBattlerAtPosition
@@ -1519,9 +1519,9 @@ _0804B52C:
movs r2, 0
movs r1, 0
strh r1, [r0, 0x26]
ldr r0, _0804B5C0 @ =gUnknown_2024005
ldr r0, _0804B5C0 @ =gDoingBattleAnim
strb r2, [r0]
ldr r4, _0804B5C4 @ =gUnknown_2024018
ldr r4, _0804B5C4 @ =gBattleSpritesDataPtr
ldr r0, [r4]
ldr r0, [r0, 0x4]
lsls r1, r6, 1
@@ -1572,8 +1572,8 @@ _0804B5AE:
_0804B5B4: .4byte 0xfffffee0
_0804B5B8: .4byte gSprites
_0804B5BC: .4byte gBattlerSpriteIds
_0804B5C0: .4byte gUnknown_2024005
_0804B5C4: .4byte gUnknown_2024018
_0804B5C0: .4byte gDoingBattleAnim
_0804B5C4: .4byte gBattleSpritesDataPtr
thumb_func_end HandleBallAnimEnd
thumb_func_start sub_804B5C8
@@ -1592,7 +1592,7 @@ sub_804B5C8: @ 804B5C8
beq _0804B666
cmp r1, 0x5F
bne _0804B600
ldr r0, _0804B5F8 @ =gUnknown_2024005
ldr r0, _0804B5F8 @ =gDoingBattleAnim
movs r1, 0
strb r1, [r0]
bl m4aMPlayAllStop
@@ -1600,7 +1600,7 @@ sub_804B5C8: @ 804B5C8
bl PlaySE
b _0804B666
.align 2, 0
_0804B5F8: .4byte gUnknown_2024005
_0804B5F8: .4byte gDoingBattleAnim
_0804B5FC: .4byte 0x0000013f
_0804B600:
ldr r0, _0804B66C @ =0x0000013b
@@ -1639,7 +1639,7 @@ _0804B600:
ands r0, r1
cmp r0, 0
beq _0804B666
ldr r0, _0804B680 @ =gUnknown_2024018
ldr r0, _0804B680 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x4]
lsls r1, r7, 1
@@ -1661,7 +1661,7 @@ _0804B670: .4byte gSprites
_0804B674: .4byte gBattlerSpriteIds
_0804B678: .4byte gMain
_0804B67C: .4byte 0x00000439
_0804B680: .4byte gUnknown_2024018
_0804B680: .4byte gBattleSpritesDataPtr
thumb_func_end sub_804B5C8
thumb_func_start SpriteCB_PlayerMonSendOut_1
@@ -1674,7 +1674,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -1682,7 +1682,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x18
@@ -1843,11 +1843,11 @@ _0804B7C8:
ldrb r0, [r5, 0x6]
strh r0, [r5, 0x3A]
strh r1, [r5, 0x2E]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0804B828
ldr r0, _0804B820 @ =gUnknown_2024018
ldr r0, _0804B820 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x9]
@@ -1866,7 +1866,7 @@ _0804B7C8:
ldr r0, _0804B824 @ =SpriteCB_ReleaseMon2FromBall
b _0804B82A
.align 2, 0
_0804B820: .4byte gUnknown_2024018
_0804B820: .4byte gBattleSpritesDataPtr
_0804B824: .4byte SpriteCB_ReleaseMon2FromBall
_0804B828:
ldr r0, _0804B840 @ =sub_804B268
@@ -1920,11 +1920,11 @@ SpriteCB_OpponentMonSendOut: @ 804B868
ble _0804B8BC
movs r0, 0
strh r0, [r5, 0x2E]
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0804B8B8
ldr r0, _0804B8B0 @ =gUnknown_2024018
ldr r0, _0804B8B0 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x9]
@@ -1943,7 +1943,7 @@ SpriteCB_OpponentMonSendOut: @ 804B868
ldr r0, _0804B8B4 @ =SpriteCB_ReleaseMon2FromBall
b _0804B8BA
.align 2, 0
_0804B8B0: .4byte gUnknown_2024018
_0804B8B0: .4byte gBattleSpritesDataPtr
_0804B8B4: .4byte SpriteCB_ReleaseMon2FromBall
_0804B8B8:
ldr r0, _0804B8C4 @ =sub_804B268
@@ -2594,7 +2594,7 @@ sub_804BD94: @ 804BD94
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, _0804BE14 @ =gUnknown_3004FF0
ldr r0, _0804BE14 @ =gHealthboxSpriteIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2653,7 +2653,7 @@ _0804BE0C:
pop {r0}
bx r0
.align 2, 0
_0804BE14: .4byte gUnknown_3004FF0
_0804BE14: .4byte gHealthboxSpriteIds
_0804BE18: .4byte gSprites
_0804BE1C: .4byte sub_804BE48
_0804BE20: .4byte sub_804BE24
@@ -2723,7 +2723,7 @@ DoHitAnimHealthboxEffect: @ 804BE70
adds r3, r1, r2
movs r0, 0x1
strh r0, [r3, 0x2E]
ldr r0, _0804BEB0 @ =gUnknown_3004FF0
ldr r0, _0804BEB0 @ =gHealthboxSpriteIds
adds r4, r0
ldrb r0, [r4]
strh r0, [r3, 0x30]
@@ -2736,7 +2736,7 @@ DoHitAnimHealthboxEffect: @ 804BE70
.align 2, 0
_0804BEA8: .4byte SpriteCB_HitAnimHealthoxEffect
_0804BEAC: .4byte gSprites
_0804BEB0: .4byte gUnknown_3004FF0
_0804BEB0: .4byte gHealthboxSpriteIds
thumb_func_end DoHitAnimHealthboxEffect
thumb_func_start SpriteCB_HitAnimHealthoxEffect
asm/pokemon_jump_2.s
+4 -4
View File
@@ -442,10 +442,10 @@ _08147E0C:
ldr r0, [r4]
adds r0, 0xA4
bl sub_8149CEC
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
ldr r1, [r4]
b _08147EBC
.align 2, 0
@@ -470,7 +470,7 @@ _08147E3C:
.align 2, 0
_08147E60: .4byte gUnknown_203F3D4
_08147E64:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08147F04
@@ -6896,7 +6896,7 @@ _0814AE2A:
ldrh r0, [r7]
ldr r1, [r7, 0x4]
ldr r2, [r7, 0x8]
bl GetFrontSpritePalFromSpeciesAndPersonality
bl GetMonSpritePalFromSpeciesAndPersonality
str r0, [sp, 0x20]
add r0, sp, 0x20
ldr r1, [r0, 0x4]
asm/pokemon_special_anim.s
+11 -11
View File
@@ -1508,8 +1508,8 @@ sub_811D120: @ 811D120
bx r1
thumb_func_end sub_811D120
thumb_func_start sub_811D130
sub_811D130: @ 811D130
thumb_func_start GetMonLevelUpWindowStats
GetMonLevelUpWindowStats: @ 811D130
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1539,7 +1539,7 @@ sub_811D130: @ 811D130
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_811D130
thumb_func_end GetMonLevelUpWindowStats
thumb_func_start sub_811D178
sub_811D178: @ 811D178
@@ -2294,7 +2294,7 @@ sub_811D764: @ 811D764
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x1
bl sub_811E7F0
bl DrawLevelUpWindowPg1
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x1
@@ -2316,7 +2316,7 @@ sub_811D7A0: @ 811D7A0
movs r0, 0x1
movs r2, 0x1
movs r3, 0x2
bl sub_811E93C
bl DrawLevelUpWindowPg2
movs r0, 0x1
movs r1, 0x2
bl CopyWindowToVram
@@ -4457,8 +4457,8 @@ _0811E7E8:
_0811E7EC: .4byte gTasks
thumb_func_end sub_811E7B4
thumb_func_start sub_811E7F0
sub_811E7F0: @ 811E7F0
thumb_func_start DrawLevelUpWindowPg1
DrawLevelUpWindowPg1: @ 811E7F0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4622,10 +4622,10 @@ _0811E8F4:
_0811E930: .4byte gUnknown_8459B48
_0811E934: .4byte gUnknown_841B2E5
_0811E938: .4byte gUnknown_841B2DC
thumb_func_end sub_811E7F0
thumb_func_end DrawLevelUpWindowPg1
thumb_func_start sub_811E93C
sub_811E93C: @ 811E93C
thumb_func_start DrawLevelUpWindowPg2
DrawLevelUpWindowPg2: @ 811E93C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4755,6 +4755,6 @@ _0811E9C0:
bx r0
.align 2, 0
_0811EA40: .4byte gUnknown_8459B48
thumb_func_end sub_811E93C
thumb_func_end DrawLevelUpWindowPg2
.align 2, 0 @ Don't pad with nop.
asm/pokemon_storage_system.s
+1 -1
View File
@@ -16568,7 +16568,7 @@ _08093C4E:
adds r1, r4
ldrh r0, [r1]
mov r1, r9
bl GetFrontSpritePalFromSpeciesAndPersonality
bl GetMonSpritePalFromSpeciesAndPersonality
ldr r1, [r5]
ldr r3, _08093CE8 @ =0x00000cd8
adds r2, r1, r3
asm/pokemon_summary_screen.s
+5 -5
View File
@@ -270,8 +270,8 @@ _08134730: .4byte 0x00003204
_08134734: .4byte sub_8135C34
thumb_func_end sub_81344F8
thumb_func_start sub_8134738
sub_8134738: @ 8134738
thumb_func_start ShowSelectMovePokemonSummaryScreen
ShowSelectMovePokemonSummaryScreen: @ 8134738
push {r4,r5,lr}
sub sp, 0x4
ldr r5, [sp, 0x10]
@@ -296,7 +296,7 @@ sub_8134738: @ 8134738
.align 2, 0
_08134764: .4byte gUnknown_203B140
_08134768: .4byte 0x00003260
thumb_func_end sub_8134738
thumb_func_end ShowSelectMovePokemonSummaryScreen
thumb_func_start sub_813476C
sub_813476C: @ 813476C
@@ -8434,7 +8434,7 @@ sub_8138B4C: @ 8138B4C
bl IsUpdateLinkStateCBActive
cmp r0, 0
bne _08138B84
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13244,7 +13244,7 @@ _0813B198:
ldrb r0, [r0]
cmp r0, 0x1
bne _0813B1C4
bl sub_811FA20
bl IsMultiBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/psychic.s
+33 -33
View File
@@ -15,7 +15,7 @@ sub_80B2ECC: @ 80B2ECC
lsls r0, 24
cmp r0, 0
beq _080B2EE8
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B2EFE
@@ -32,7 +32,7 @@ _080B2EE8:
movs r0, 0xC8
strb r0, [r1]
_080B2EFE:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B2F5A
@@ -51,7 +51,7 @@ _080B2EFE:
orrs r1, r0
lsrs r5, r1, 31
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B2F3C
@@ -63,7 +63,7 @@ _080B2F3C:
adds r4, r0, 0
eors r4, r7
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B2F5A
@@ -73,11 +73,11 @@ _080B2F3C:
adds r1, r5, 0
bl sub_8072E48
_080B2F5A:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B2F90
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080B2F90
@@ -112,7 +112,7 @@ _080B2F90:
_080B2FA6:
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080B3004 @ =gBattleAnimArgs
lsrs r0, 24
@@ -121,14 +121,14 @@ _080B2FA6:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
adds r0, r4
_080B2FCA:
strh r0, [r6, 0x22]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B2FDC
@@ -271,7 +271,7 @@ sub_80B30B0: @ 80B30B0
negs r1, r1
cmp r0, r1
bne _080B3156
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B3146
@@ -281,7 +281,7 @@ sub_80B30B0: @ 80B30B0
lsrs r4, r0, 24
adds r6, r4, 0
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B3118
@@ -304,7 +304,7 @@ _080B3118:
adds r4, r0, 0
eors r4, r6
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B3146
@@ -345,7 +345,7 @@ _080B3164: .4byte sub_80B3168
sub_80B3168: @ 80B3168
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B31C0
@@ -363,7 +363,7 @@ sub_80B3168: @ 80B3168
orrs r1, r0
lsrs r5, r1, 31
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B31A6
@@ -373,7 +373,7 @@ _080B31A6:
movs r0, 0x2
eors r4, r0
adds r0, r4, 0
bl sub_8072DF0
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080B31C0
@@ -407,11 +407,11 @@ sub_80B31D0: @ 80B31D0
bne _080B31EA
movs r6, 0x1
_080B31EA:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B3232
bl sub_8075290
bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080B3232
@@ -484,13 +484,13 @@ sub_80B3278: @ 80B3278
ldr r4, _080B32C0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -573,14 +573,14 @@ sub_80B32F4: @ 80B32F4
_080B333A:
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r4
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r7
@@ -860,7 +860,7 @@ _080B3544:
lsls r1, 1
strh r1, [r0, 0x20]
ldrb r0, [r4, 0x8]
bl sub_8075980
bl ResetSpriteRotScale
adds r0, r5, 0
bl DestroyAnimVisualTask
_080B357A:
@@ -888,13 +888,13 @@ sub_80B3584: @ 80B3584
ldr r4, _080B3610 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1206,13 +1206,13 @@ sub_80B37EC: @ 80B37EC
ldr r4, _080B382C @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1240,7 +1240,7 @@ sub_80B3834: @ 80B3834
lsls r1, 3
ldr r0, _080B3890 @ =gTasks
adds r5, r1, r0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B38D8
@@ -1860,7 +1860,7 @@ _080B3CD8:
lsls r2, 1
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrb r3, [r4, 0x1]
lsrs r1, r3, 6
ldrb r2, [r4, 0x3]
@@ -1947,7 +1947,7 @@ _080B3DAA:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -1986,7 +1986,7 @@ _080B3DFC:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
bl obj_id_set_rotscale
bl SetSpriteRotScale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -2053,17 +2053,17 @@ _080B3EA4:
ldr r4, _080B3EF8 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B3ED2
asm/reshow_battle_screen.s
-1190
View File
File diff suppressed because it is too large Load Diff
asm/rock.s
+14 -14
View File
@@ -143,7 +143,7 @@ _080B472E:
adds r2, r0
strh r2, [r5, 0x36]
adds r0, r5, 0
bl sub_80754B8
bl InitSpriteDataForLinearTranslation
strh r4, [r5, 0x34]
strh r4, [r5, 0x36]
ldr r0, _080B4774 @ =sub_8074D00
@@ -262,7 +262,7 @@ do_boulder_dust: @ 80B4810
movs r1, 0
movs r2, 0
bl SetAnimBgAttribute
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B4854
@@ -299,7 +299,7 @@ _080B4854:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B48B0
@@ -512,7 +512,7 @@ _080B4A4C:
.align 2, 0
_080B4A54: .4byte gTasks
_080B4A58:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080B4A6C
@@ -682,7 +682,7 @@ sub_80B4B8C: @ 80B4B8C
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x36]
ldr r0, _080B4BC8 @ =sub_8075590
ldr r0, _080B4BC8 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B4BCC @ =DestroyAnimSprite
adds r0, r4, 0
@@ -692,7 +692,7 @@ sub_80B4B8C: @ 80B4B8C
bx r0
.align 2, 0
_080B4BC4: .4byte gBattleAnimArgs
_080B4BC8: .4byte sub_8075590
_080B4BC8: .4byte StartAnimLinearTranslation
_080B4BCC: .4byte DestroyAnimSprite
thumb_func_end sub_80B4B8C
@@ -713,13 +713,13 @@ sub_80B4BD0: @ 80B4BD0
ldr r5, _080B4C54 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xC0
@@ -729,13 +729,13 @@ sub_80B4BD0: @ 80B4BD0
ldr r4, _080B4C58 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xC0
@@ -1331,13 +1331,13 @@ sub_80B50A0: @ 80B50A0
ldr r5, _080B50EC @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r2, _080B50F0 @ =gBattleAnimArgs
@@ -1413,7 +1413,7 @@ sub_80B5148: @ 80B5148
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _080B5180 @ =gUnknown_2037EE8
ldr r2, _080B5180 @ =gAnimMoveDmg
ldr r0, [r2]
cmp r0, 0x20
bgt _080B515C
@@ -1441,7 +1441,7 @@ _080B5176:
pop {r0}
bx r0
.align 2, 0
_080B5180: .4byte gUnknown_2037EE8
_080B5180: .4byte gAnimMoveDmg
_080B5184: .4byte gBattleAnimArgs
thumb_func_end sub_80B5148
asm/script_pokemon_util_80BF8FC.s
+1 -1
View File
@@ -115,7 +115,7 @@ sub_80BF9BC: @ 80BF9BC
ldr r3, _080BF9FC @ =CB2_ReturnToField
movs r4, 0
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
movs r0, 0x3
bl sub_8138B38
ldr r1, _080BFA00 @ =gFieldCallback
asm/trade.s
+22 -22
View File
@@ -263,7 +263,7 @@ _0804C80A:
cmp r0, 0
beq _0804C880
bl sub_800B1F4
bl sub_8009804
bl OpenLink
bl sub_80FBB20
b _0804C892
.align 2, 0
@@ -275,7 +275,7 @@ _0804C874: .4byte 0x00001122
_0804C878: .4byte gUnknown_2031DA8
_0804C87C: .4byte gWirelessCommType
_0804C880:
bl sub_8009804
bl OpenLink
ldr r1, _0804C8A8 @ =gMain
movs r7, 0x87
lsls r7, 3
@@ -341,7 +341,7 @@ _0804C8F4:
bcs _0804C908
b _0804CEE6
_0804C908:
bl sub_800AA48
bl IsLinkMaster
lsls r0, 24
cmp r0, 0
beq _0804C940
@@ -357,7 +357,7 @@ _0804C908:
bhi _0804C928
b _0804CEE6
_0804C928:
bl sub_800A5BC
bl CheckShouldAdvanceLinkState
ldr r1, _0804C93C @ =gMain
movs r3, 0x87
lsls r3, 3
@@ -435,10 +435,10 @@ _0804C9C4:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
b _0804CEE6
.align 2, 0
_0804C9E0: .4byte gWirelessCommType
@@ -1134,10 +1134,10 @@ _0804CFDC:
ldrb r0, [r0]
cmp r0, 0
beq _0804CFF0
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
_0804CFF0:
ldr r1, _0804D000 @ =gMain
movs r3, 0x87
@@ -2201,7 +2201,7 @@ _0804D8D8: .4byte gBlockSendBuffer
_0804D8DC: .4byte gPlayerParty
_0804D8E0: .4byte gUnknown_2031DA8
_0804D8E4:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _0804D8F0
@@ -3875,7 +3875,7 @@ _0804E61C:
adds r0, 0x80
ldr r1, _0804E64C @ =0x0000bbbb
strh r1, [r0]
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0804E668
@@ -3944,7 +3944,7 @@ _0804E6B0:
movs r0, 0x3
movs r1, 0x1
bl sub_804F488
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0804E6DE
@@ -4285,7 +4285,7 @@ sub_804E944: @ 804E944
ldrb r0, [r0]
cmp r0, 0
beq _0804E988
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0804E9AA
@@ -7508,7 +7508,7 @@ _08050240:
adds r0, r1
movs r1, 0x1
strb r1, [r0]
bl sub_8009804
bl OpenLink
ldr r1, _08050278 @ =gMain
movs r2, 0x87
lsls r2, 3
@@ -7549,7 +7549,7 @@ _08050298:
.align 2, 0
_080502A4: .4byte gUnknown_2031DAC
_080502A8:
bl sub_800AA48
bl IsLinkMaster
lsls r0, 24
cmp r0, 0
bne _080502B4
@@ -7571,7 +7571,7 @@ _080502B4:
bhi _080502D6
b _08050472
_080502D6:
bl sub_800A5BC
bl CheckShouldAdvanceLinkState
ldr r1, _080502E8 @ =gMain
movs r2, 0x87
lsls r2, 3
@@ -7749,10 +7749,10 @@ _0805044C:
ldrb r0, [r0]
cmp r0, 0
beq _0805046C
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0
movs r1, 0
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
_0805046C:
ldr r0, _08050498 @ =sub_8053D84
bl SetMainCallback2
@@ -8274,7 +8274,7 @@ sub_80508F4: @ 80508F4
.align 2, 0
_08050908: .4byte gUnknown_2031DAC
_0805090C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08050932
@@ -14405,7 +14405,7 @@ _08054080:
strb r1, [r0]
str r2, [r3, 0x64]
_0805409C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _080540A8
@@ -14420,7 +14420,7 @@ _080540A8:
_080540B4: .4byte gUnknown_2031DAC
_080540B8: .4byte gMain
_080540BC:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _080540C8
@@ -14637,7 +14637,7 @@ _08054278:
str r0, [r1, 0x64]
b _08054396
_0805427E:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _0805428A
@@ -14672,7 +14672,7 @@ _080542A0:
.align 2, 0
_080542C0: .4byte gUnknown_2031DAC
_080542C4:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08054396
asm/trainer_card.s
+2 -2
View File
@@ -208,10 +208,10 @@ _0808919A:
ldrb r0, [r0]
cmp r0, 0x1
bne _080891B6
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0xE6
movs r1, 0x96
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
_080891B6:
movs r0, 0x1
negs r0, r0
asm/union_room_chat.s
+11 -11
View File
@@ -177,10 +177,10 @@ _08128554:
bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0xF]
bl sub_80FCEA8
bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0xE8
movs r1, 0x96
bl sub_80FCD74
bl CreateWirelessStatusIndicatorSprite
_08128598:
add sp, 0x4
pop {r4-r6}
@@ -295,7 +295,7 @@ _08128662:
adds r0, 0x1
strh r0, [r1, 0x6]
_08128674:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081286BC
@@ -321,7 +321,7 @@ _08128674:
.align 2, 0
_081286A8: .4byte gUnknown_203B0E0
_081286AC:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081286BC
@@ -765,7 +765,7 @@ _08128A36:
.align 2, 0
_08128A40: .4byte gUnknown_203B0E0
_08128A44:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128A94
@@ -888,7 +888,7 @@ _08128B28:
.align 2, 0
_08128B48: .4byte gUnknown_203B0E0
_08128B4C:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128BFC
@@ -925,7 +925,7 @@ _08128B80:
.align 2, 0
_08128B9C: .4byte gUnknown_203B0E0
_08128BA0:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128BFC
@@ -1016,7 +1016,7 @@ _08128C44:
lsls r0, 24
cmp r0, 0
bne _08128CA2
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128CA2
@@ -1134,7 +1134,7 @@ _08128D30:
lsrs r0, 24
cmp r0, 0x1
beq _08128D9C
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128D9C
@@ -1231,7 +1231,7 @@ _08128DEC:
adds r0, 0x1
strh r0, [r1, 0x6]
_08128E00:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1277,7 +1277,7 @@ _08128E52:
.align 2, 0
_08128E5C: .4byte gUnknown_203B0E0
_08128E60:
bl sub_800A4BC
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08128E70
asm/water.s
+34 -34
View File
@@ -130,7 +130,7 @@ sub_80AAC98: @ 80AAC98
beq _080AACC8
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r4, _080AACC4 @ =gBattleAnimArgs
@@ -143,7 +143,7 @@ _080AACC4: .4byte gBattleAnimArgs
_080AACC8:
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AADA0 @ =gBattleAnimArgs
lsrs r0, 24
@@ -153,7 +153,7 @@ _080AACDA:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
@@ -184,7 +184,7 @@ _080AAD10:
ldr r4, _080AADA8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
@@ -192,7 +192,7 @@ _080AAD10:
strh r0, [r6, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
@@ -390,7 +390,7 @@ _080AAEBA:
ldr r4, _080AAF14 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -399,7 +399,7 @@ _080AAEBA:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r7, [r7, 0x6]
@@ -577,7 +577,7 @@ sub_80AB024: @ 80AB024
ldr r4, _080AB08C @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -585,7 +585,7 @@ sub_80AB024: @ 80AB024
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -737,23 +737,23 @@ sub_80AB168: @ 80AB168
ldr r7, _080AB1B4 @ =gBattleAnimAttacker
ldrb r0, [r7]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r7]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
ldr r6, _080AB1B8 @ =0x0000fff6
strh r6, [r4, 0x26]
ldrb r0, [r7]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r5, r0, 24
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AB1C2
@@ -877,7 +877,7 @@ _080AB27A:
ldr r4, _080AB2BC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x4]
@@ -885,13 +885,13 @@ _080AB27A:
strh r0, [r6, 0x32]
ldrb r0, [r4]
adds r1, r7, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
adds r0, r5
strh r0, [r6, 0x36]
ldr r0, _080AB2C4 @ =sub_8075590
ldr r0, _080AB2C4 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080AB2C8 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -903,7 +903,7 @@ _080AB27A:
_080AB2B8: .4byte gBattleAnimAttacker
_080AB2BC: .4byte gBattleAnimTarget
_080AB2C0: .4byte gBattleAnimArgs
_080AB2C4: .4byte sub_8075590
_080AB2C4: .4byte StartAnimLinearTranslation
_080AB2C8: .4byte DestroyAnimSprite
thumb_func_end sub_80AB1F8
@@ -923,7 +923,7 @@ sub_80AB2CC: @ 80AB2CC
ldrh r0, [r4, 0x22]
adds r1, r0
strh r1, [r4, 0x36]
ldr r0, _080AB300 @ =sub_8075590
ldr r0, _080AB300 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080AB304 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -933,7 +933,7 @@ sub_80AB2CC: @ 80AB2CC
bx r0
.align 2, 0
_080AB2FC: .4byte gBattleAnimArgs
_080AB300: .4byte sub_8075590
_080AB300: .4byte StartAnimLinearTranslation
_080AB304: .4byte DestroyAnimSprite
thumb_func_end sub_80AB2CC
@@ -1036,7 +1036,7 @@ sub_80AB38C: @ 80AB38C
bl SetAnimBgAttribute
mov r0, sp
bl sub_80752A0
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AB418
@@ -1140,7 +1140,7 @@ _080AB476:
lsls r0, 5
strh r0, [r7, 0xA]
strh r0, [r7, 0xC]
bl sub_8073788
bl IsContest
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1461,7 +1461,7 @@ _080AB740: .4byte gBattle_BG1_X
_080AB744: .4byte gBattle_BG1_Y
_080AB748: .4byte gTasks
_080AB74C:
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AB760
@@ -2012,7 +2012,7 @@ sub_80ABB28: @ 80ABB28
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_80758E0
bl PrepareBattlerSpriteForRotScale
ldr r0, _080ABB80 @ =sub_80ABB84
str r0, [r4]
pop {r4}
@@ -2282,7 +2282,7 @@ _080ABD64:
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8075980
bl ResetSpriteRotScale
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -2397,18 +2397,18 @@ sub_80ABE4C: @ 80ABE4C
ldr r4, _080ABF54 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0xAC
ldrb r0, [r4]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -3025,14 +3025,14 @@ sub_80AC328: @ 80AC328
ldr r4, _080AC3B0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -3047,7 +3047,7 @@ sub_80AC328: @ 80AC328
movs r1, 0x1
_080AC36C:
strh r1, [r5, 0x16]
bl sub_8073788
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080AC380
@@ -3502,13 +3502,13 @@ sub_80AC6D8: @ 80AC6D8
ldr r5, _080AC714 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -3679,7 +3679,7 @@ _080AC826:
strh r0, [r4, 0x30]
ldr r0, _080AC870 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
@@ -3737,7 +3737,7 @@ _080AC89C:
strh r0, [r4, 0x30]
ldr r0, _080AC8E8 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
data/battle_ai_scripts.s
+1 -1
View File
@@ -4,7 +4,7 @@
.section script_data, "aw", %progbits
BattleAIs:: @ 81D9BF4
gBattleAI_ScriptsTable:: @ 81D9BF4
.4byte AI_CheckBadMove
.4byte AI_TryToFaint
.4byte AI_CheckViability
data/battle_anim_scripts.s
+2 -2
View File
@@ -10,8 +10,8 @@ gUnknown_81C68F4:: @ 81C68F4
gUnknown_81C6E84:: @ 81C6E84
.incbin "baserom.gba", 0x1C6E84, 0x24
gUnknown_81C6EA8:: @ 81C6EA8
gBattleAnims_General:: @ 81C6EA8
.incbin "baserom.gba", 0x1C6EA8, 0x70
gUnknown_81C6F18:: @ 81C6F18
gBattleAnims_Special:: @ 81C6F18
.incbin "baserom.gba", 0x1C6F18, 0xF690
data/battle_scripts_1.s
+190 -157
View File
@@ -1,45 +1,45 @@
.section script_data, "aw", %progbits
gUnknown_81D65A8:: @ 81D65A8
gBattleScriptsForMoveEffects:: @ 81D65A8
.incbin "baserom.gba", 0x1D65A8, 0x388
gUnknown_81D6930:: @ 81D6930
BattleScript_HitFromCritCalc:: @ 81D6930
.incbin "baserom.gba", 0x1D6930, 0x1E
gUnknown_81D694E:: @ 81D694E
BattleScript_MoveEnd:: @ 81D694E
.incbin "baserom.gba", 0x1D694E, 0x12
gUnknown_81D6960:: @ 81D6960
BattleScript_MoveMissedPause:: @ 81D6960
.incbin "baserom.gba", 0x1D6960, 0x271
gUnknown_81D6BD1:: @ 81D6BD1
BattleScript_StatUp:: @ 81D6BD1
.incbin "baserom.gba", 0x1D6BD1, 0x91
gUnknown_81D6C62:: @ 81D6C62
BattleScript_StatDown:: @ 81D6C62
.incbin "baserom.gba", 0x1D6C62, 0x6E0
gUnknown_81D7342:: @ 81D7342
BattleScript_MoveUsedMustRecharge:: @ 81D7342
.incbin "baserom.gba", 0x1D7342, 0xA75
gUnknown_81D7DB7:: @ 81D7DB7
BattleScript_PresentHealTarget:: @ 81D7DB7
.incbin "baserom.gba", 0x1D7DB7, 0x1A
gUnknown_81D7DD1:: @ 81D7DD1
BattleScript_AlreadyAtFullHp:: @ 81D7DD1
.incbin "baserom.gba", 0x1D7DD1, 0x21
gUnknown_81D7DF2:: @ 81D7DF2
BattleScript_ButItFailed:: @ 81D7DF2
.incbin "baserom.gba", 0x1D7DF2, 0x882
gUnknown_81D8674:: @ 81D8674
BattleScript_FaintAttacker:: @ 81D8674
.incbin "baserom.gba", 0x1D8674, 0x10
gUnknown_81D8684:: @ 81D8684
BattleScript_FaintTarget:: @ 81D8684
.incbin "baserom.gba", 0x1D8684, 0x10
gUnknown_81D8694:: @ 81D8694
BattleScript_GiveExp:: @ 81D8694
.incbin "baserom.gba", 0x1D8694, 0x9
gUnknown_81D869D:: @ 81D869D
BattleScript_HandleFaintedMon:: @ 81D869D
.incbin "baserom.gba", 0x1D869D, 0x152
gUnknown_81D87EF:: @ 81D87EF
@@ -84,226 +84,226 @@ gUnknown_81D8949:: @ 81D8949
gUnknown_81D894D:: @ 81D894D
.incbin "baserom.gba", 0x1D894D, 0xA4
gUnknown_81D89F1:: @ 81D89F1
BattleScript_Pausex20:: @ 81D89F1
.incbin "baserom.gba", 0x1D89F1, 0x4
gUnknown_81D89F5:: @ 81D89F5
BattleScript_LevelUp:: @ 81D89F5
.incbin "baserom.gba", 0x1D89F5, 0x6F
gUnknown_81D8A64:: @ 81D8A64
BattleScript_RainContinuesOrEnds:: @ 81D8A64
.incbin "baserom.gba", 0x1D8A64, 0x1B
gUnknown_81D8A7F:: @ 81D8A7F
BattleScript_DamagingWeatherContinues:: @ 81D8A7F
.incbin "baserom.gba", 0x1D8A7F, 0x82
gUnknown_81D8B01:: @ 81D8B01
BattleScript_SandStormHailEnds:: @ 81D8B01
.incbin "baserom.gba", 0x1D8B01, 0x9
gUnknown_81D8B0A:: @ 81D8B0A
BattleScript_SunlightContinues:: @ 81D8B0A
.incbin "baserom.gba", 0x1D8B0A, 0xE
gUnknown_81D8B18:: @ 81D8B18
BattleScript_SunlightFaded:: @ 81D8B18
.incbin "baserom.gba", 0x1D8B18, 0x7
gUnknown_81D8B1F:: @ 81D8B1F
BattleScript_OverworldWeatherStarts:: @ 81D8B1F
.incbin "baserom.gba", 0x1D8B1F, 0x13
gUnknown_81D8B32:: @ 81D8B32
BattleScript_SideStatusWoreOff:: @ 81D8B32
.incbin "baserom.gba", 0x1D8B32, 0x11
gUnknown_81D8B43:: @ 81D8B43
BattleScript_SafeguardEnds:: @ 81D8B43
.incbin "baserom.gba", 0x1D8B43, 0xA
gUnknown_81D8B4D:: @ 81D8B4D
BattleScript_LeechSeedTurnDrain:: @ 81D8B4D
.incbin "baserom.gba", 0x1D8B4D, 0x5C
gUnknown_81D8BA9:: @ 81D8BA9
BattleScript_BideStoringEnergy:: @ 81D8BA9
.incbin "baserom.gba", 0x1D8BA9, 0xB
gUnknown_81D8BB4:: @ 81D8BB4
BattleScript_BideAttack:: @ 81D8BB4
.incbin "baserom.gba", 0x1D8BB4, 0x48
gUnknown_81D8BFC:: @ 81D8BFC
BattleScript_BideNoEnergyToAttack:: @ 81D8BFC
.incbin "baserom.gba", 0x1D8BFC, 0x14
gUnknown_81D8C10:: @ 81D8C10
BattleScript_SuccessForceOut:: @ 81D8C10
.incbin "baserom.gba", 0x1D8C10, 0x2E
gUnknown_81D8C3E:: @ 81D8C3E
BattleScript_MistProtected:: @ 81D8C3E
.incbin "baserom.gba", 0x1D8C3E, 0xA
gUnknown_81D8C48:: @ 81D8C48
BattleScript_RageIsBuilding:: @ 81D8C48
.incbin "baserom.gba", 0x1D8C48, 0x7
gUnknown_81D8C4F:: @ 81D8C4F
BattleScript_MoveUsedIsDisabled:: @ 81D8C4F
.incbin "baserom.gba", 0x1D8C4F, 0xB
gUnknown_81D8C5A:: @ 81D8C5A
BattleScript_SelectingDisabledMove:: @ 81D8C5A
.incbin "baserom.gba", 0x1D8C5A, 0x4
gUnknown_81D8C5E:: @ 81D8C5E
BattleScript_DisabledNoMore:: @ 81D8C5E
.incbin "baserom.gba", 0x1D8C5E, 0x7
gUnknown_81D8C65:: @ 81D8C65
BattleScript_EncoredNoMore:: @ 81D8C65
.incbin "baserom.gba", 0x1D8C65, 0x7
gUnknown_81D8C6C:: @ 81D8C6C
BattleScript_DestinyBondTakesLife:: @ 81D8C6C
.incbin "baserom.gba", 0x1D8C6C, 0x1B
gUnknown_81D8C87:: @ 81D8C87
BattleScript_SpikesOnAttacker:: @ 81D8C87
.incbin "baserom.gba", 0x1D8C87, 0x37
gUnknown_81D8CBE:: @ 81D8CBE
BattleScript_SpikesOnTarget:: @ 81D8CBE
.incbin "baserom.gba", 0x1D8CBE, 0x37
gUnknown_81D8CF5:: @ 81D8CF5
BattleScript_SpikesOnFaintedBattler:: @ 81D8CF5
.incbin "baserom.gba", 0x1D8CF5, 0x3E
gUnknown_81D8D33:: @ 81D8D33
BattleScript_PerishSongTakesLife:: @ 81D8D33
.incbin "baserom.gba", 0x1D8D33, 0x1B
gUnknown_81D8D4E:: @ 81D8D4E
BattleScript_PerishSongCountGoesDown:: @ 81D8D4E
.incbin "baserom.gba", 0x1D8D4E, 0x7
gUnknown_81D8D55:: @ 81D8D55
BattleScript_AllStatsUp:: @ 81D8D55
.incbin "baserom.gba", 0x1D8D55, 0x9C
gUnknown_81D8DF1:: @ 81D8DF1
BattleScript_RapidSpinAway:: @ 81D8DF1
.incbin "baserom.gba", 0x1D8DF1, 0x2
gUnknown_81D8DF3:: @ 81D8DF3
BattleScript_WrapFree:: @ 81D8DF3
.incbin "baserom.gba", 0x1D8DF3, 0x11
gUnknown_81D8E04:: @ 81D8E04
BattleScript_LeechSeedFree:: @ 81D8E04
.incbin "baserom.gba", 0x1D8E04, 0x7
gUnknown_81D8E0B:: @ 81D8E0B
BattleScript_SpikesFree:: @ 81D8E0B
.incbin "baserom.gba", 0x1D8E0B, 0x7
gUnknown_81D8E12:: @ 81D8E12
BattleScript_MonTookFutureAttack:: @ 81D8E12
.incbin "baserom.gba", 0x1D8E12, 0x8E
gUnknown_81D8EA0:: @ 81D8EA0
BattleScript_NoMovesLeft:: @ 81D8EA0
.incbin "baserom.gba", 0x1D8EA0, 0x4
gUnknown_81D8EA4:: @ 81D8EA4
BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4
.incbin "baserom.gba", 0x1D8EA4, 0x4
gUnknown_81D8EA8:: @ 81D8EA8
BattleScript_NoPPForMove:: @ 81D8EA8
.incbin "baserom.gba", 0x1D8EA8, 0xF
gUnknown_81D8EB7:: @ 81D8EB7
BattleScript_SelectingTormentedMove:: @ 81D8EB7
.incbin "baserom.gba", 0x1D8EB7, 0xF
gUnknown_81D8EC6:: @ 81D8EC6
BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6
.incbin "baserom.gba", 0x1D8EC6, 0x4
gUnknown_81D8ECA:: @ 81D8ECA
BattleScript_MoveUsedIsTaunted:: @ 81D8ECA
.incbin "baserom.gba", 0x1D8ECA, 0xB
gUnknown_81D8ED5:: @ 81D8ED5
BattleScript_WishComesTrue:: @ 81D8ED5
.incbin "baserom.gba", 0x1D8ED5, 0x37
gUnknown_81D8F0C:: @ 81D8F0C
BattleScript_IngrainTurnHeal:: @ 81D8F0C
.incbin "baserom.gba", 0x1D8F0C, 0x29
gUnknown_81D8F35:: @ 81D8F35
BattleScript_AtkDefDown:: @ 81D8F35
.incbin "baserom.gba", 0x1D8F35, 0x51
gUnknown_81D8F86:: @ 81D8F86
BattleScript_KnockedOff:: @ 81D8F86
.incbin "baserom.gba", 0x1D8F86, 0xE
gUnknown_81D8F94:: @ 81D8F94
BattleScript_MoveUsedIsImprisoned:: @ 81D8F94
.incbin "baserom.gba", 0x1D8F94, 0xB
gUnknown_81D8F9F:: @ 81D8F9F
BattleScript_SelectingImprisonedMove:: @ 81D8F9F
.incbin "baserom.gba", 0x1D8F9F, 0x4
gUnknown_81D8FA3:: @ 81D8FA3
BattleScript_GrudgeTakesPp:: @ 81D8FA3
.incbin "baserom.gba", 0x1D8FA3, 0x7
gUnknown_81D8FAA:: @ 81D8FAA
BattleScript_MagicCoatBounce:: @ 81D8FAA
.incbin "baserom.gba", 0x1D8FAA, 0x18
gUnknown_81D8FC2:: @ 81D8FC2
BattleScript_SnatchedMove:: @ 81D8FC2
.incbin "baserom.gba", 0x1D8FC2, 0x1B
gUnknown_81D8FDD:: @ 81D8FDD
BattleScript_EnduredMsg:: @ 81D8FDD
.incbin "baserom.gba", 0x1D8FDD, 0x7
gUnknown_81D8FE4:: @ 81D8FE4
BattleScript_OneHitKOMsg:: @ 81D8FE4
.incbin "baserom.gba", 0x1D8FE4, 0x7
gUnknown_81D8FEB:: @ 81D8FEB
BattleScript_SAtkDown2:: @ 81D8FEB
.incbin "baserom.gba", 0x1D8FEB, 0x2A
gUnknown_81D9015:: @ 81D9015
.incbin "baserom.gba", 0x1D9015, 0x14
gUnknown_81D9029:: @ 81D9029
BattleScript_MoveUsedIsAsleep:: @ 81D9029
.incbin "baserom.gba", 0x1D9029, 0xD
gUnknown_81D9036:: @ 81D9036
BattleScript_MoveUsedWokeUp:: @ 81D9036
.incbin "baserom.gba", 0x1D9036, 0x14
gUnknown_81D904A:: @ 81D904A
BattleScript_MonWokeUpInUproar:: @ 81D904A
.incbin "baserom.gba", 0x1D904A, 0x9
gUnknown_81D9053:: @ 81D9053
BattleScript_PoisonTurnDmg:: @ 81D9053
.incbin "baserom.gba", 0x1D9053, 0x22
gUnknown_81D9075:: @ 81D9075
BattleScript_BurnTurnDmg:: @ 81D9075
.incbin "baserom.gba", 0x1D9075, 0xB
gUnknown_81D9080:: @ 81D9080
BattleScript_MoveUsedIsFrozen:: @ 81D9080
.incbin "baserom.gba", 0x1D9080, 0xD
gUnknown_81D908D:: @ 81D908D
BattleScript_MoveUsedUnfroze:: @ 81D908D
.incbin "baserom.gba", 0x1D908D, 0xB
gUnknown_81D9098:: @ 81D9098
BattleScript_DefrostedViaFireMove:: @ 81D9098
.incbin "baserom.gba", 0x1D9098, 0x9
gUnknown_81D90A1:: @ 81D90A1
BattleScript_MoveUsedIsParalyzed:: @ 81D90A1
.incbin "baserom.gba", 0x1D90A1, 0x10
gUnknown_81D90B1:: @ 81D90B1
BattleScript_MoveUsedFlinched:: @ 81D90B1
.incbin "baserom.gba", 0x1D90B1, 0xB
gUnknown_81D90BC:: @ 81D90BC
BattleScript_PrintUproarOverTurns:: @ 81D90BC
.incbin "baserom.gba", 0x1D90BC, 0x9
gUnknown_81D90C5:: @ 81D90C5
BattleScript_ThrashConfuses:: @ 81D90C5
.incbin "baserom.gba", 0x1D90C5, 0xE
gUnknown_81D90D3:: @ 81D90D3
BattleScript_MoveUsedIsConfused:: @ 81D90D3
.incbin "baserom.gba", 0x1D90D3, 0x43
gUnknown_81D9116:: @ 81D9116
BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116
.incbin "baserom.gba", 0x1D9116, 0x7
gUnknown_81D911D:: @ 81D911D
BattleScript_PrintPayDayMoneyString:: @ 81D911D
.incbin "baserom.gba", 0x1D911D, 0x7
gUnknown_81D9124:: @ 81D9124
BattleScript_WrapTurnDmg:: @ 81D9124
.incbin "baserom.gba", 0x1D9124, 0x12
gUnknown_81D9136:: @ 81D9136
BattleScript_WrapEnds:: @ 81D9136
.incbin "baserom.gba", 0x1D9136, 0x7
gUnknown_81D913D:: @ 81D913D
BattleScript_MoveUsedIsInLove:: @ 81D913D
.incbin "baserom.gba", 0x1D913D, 0xD
gUnknown_81D914A:: @ 81D914A
BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A
.incbin "baserom.gba", 0x1D914A, 0xB
gUnknown_81D9155:: @ 81D9155
BattleScript_NightmareTurnDmg:: @ 81D9155
.incbin "baserom.gba", 0x1D9155, 0x11
gUnknown_81D9166:: @ 81D9166
BattleScript_CurseTurnDmg:: @ 81D9166
.incbin "baserom.gba", 0x1D9166, 0x11
gUnknown_81D9177:: @ 81D9177
BattleScript_TargetPRLZHeal:: @ 81D9177
.incbin "baserom.gba", 0x1D9177, 0x9
gUnknown_81D9180:: @ 81D9180
@@ -313,211 +313,244 @@ gUnknown_81D9192:: @ 81D9192
.incbin "baserom.gba", 0x1D9192, 0xF
gUnknown_81D91A1:: @ 81D91A1
.incbin "baserom.gba", 0x1D91A1, 0x26
.incbin "baserom.gba", 0x1D91A1, 0x18
gUnknown_81D91C7:: @ 81D91C7
.incbin "baserom.gba", 0x1D91C7, 0xAA
BattleScript_MoveEffectSleep:: @ 81D91B9
.incbin "baserom.gba", 0x1D91B9, 0xE
gUnknown_81D9271:: @ 81D9271
BattleScript_YawnMakesAsleep:: @ 81D91C7
.incbin "baserom.gba", 0x1D91C7, 0xE
BattleScript_MoveEffectPoison:: @ 81D91D5
.incbin "baserom.gba", 0x1D91D5, 0xF
BattleScript_MoveEffectBurn:: @ 81D91E4
.incbin "baserom.gba", 0x1D91E4, 0xF
BattleScript_MoveEffectFreeze:: @ 81D91F3
.incbin "baserom.gba", 0x1D91F3, 0xF
BattleScript_MoveEffectParalysis:: @ 81D9202
.incbin "baserom.gba", 0x1D9202, 0xF
BattleScript_MoveEffectUproar:: @ 81D9211
.incbin "baserom.gba", 0x1D9211, 0x7
BattleScript_MoveEffectToxic:: @ 81D9218
.incbin "baserom.gba", 0x1D9218, 0xD
BattleScript_MoveEffectPayDay:: @ 81D9225
.incbin "baserom.gba", 0x1D9225, 0x7
BattleScript_MoveEffectWrap:: @ 81D922C
.incbin "baserom.gba", 0x1D922C, 0x9
BattleScript_MoveEffectConfusion:: @ 81D9235
.incbin "baserom.gba", 0x1D9235, 0xE
BattleScript_MoveEffectRecoil:: @ 81D9243
.incbin "baserom.gba", 0x1D9243, 0x2E
BattleScript_ItemSteal:: @ 81D9271
.incbin "baserom.gba", 0x1D9271, 0xE
gUnknown_81D927F:: @ 81D927F
BattleScript_DrizzleActivates:: @ 81D927F
.incbin "baserom.gba", 0x1D927F, 0x14
gUnknown_81D9293:: @ 81D9293
BattleScript_SpeedBoostActivates:: @ 81D9293
.incbin "baserom.gba", 0x1D9293, 0xE
gUnknown_81D92A1:: @ 81D92A1
BattleScript_TraceActivates:: @ 81D92A1
.incbin "baserom.gba", 0x1D92A1, 0xA
gUnknown_81D92AB:: @ 81D92AB
BattleScript_RainDishActivates:: @ 81D92AB
.incbin "baserom.gba", 0x1D92AB, 0x14
gUnknown_81D92BF:: @ 81D92BF
BattleScript_SandstreamActivates:: @ 81D92BF
.incbin "baserom.gba", 0x1D92BF, 0x14
gUnknown_81D92D3:: @ 81D92D3
BattleScript_ShedSkinActivates:: @ 81D92D3
.incbin "baserom.gba", 0x1D92D3, 0x25
gUnknown_81D92F8:: @ 81D92F8
BattleScript_CastformChange:: @ 81D92F8
.incbin "baserom.gba", 0x1D92F8, 0xF
gUnknown_81D9307:: @ 81D9307
BattleScript_IntimidateActivatesEnd3:: @ 81D9307
.incbin "baserom.gba", 0x1D9307, 0x9
gUnknown_81D9310:: @ 81D9310
BattleScript_IntimidateActivates:: @ 81D9310
.incbin "baserom.gba", 0x1D9310, 0x69
gUnknown_81D9379:: @ 81D9379
BattleScript_DroughtActivates:: @ 81D9379
.incbin "baserom.gba", 0x1D9379, 0x14
gUnknown_81D938D:: @ 81D938D
BattleScript_TookAttack:: @ 81D938D
.incbin "baserom.gba", 0x1D938D, 0x14
gUnknown_81D93A1:: @ 81D93A1
BattleScript_SturdyPreventsOHKO:: @ 81D93A1
.incbin "baserom.gba", 0x1D93A1, 0xE
gUnknown_81D93AF:: @ 81D93AF
BattleScript_DampStopsExplosion:: @ 81D93AF
.incbin "baserom.gba", 0x1D93AF, 0xE
gUnknown_81D93BD:: @ 81D93BD
BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD
.incbin "baserom.gba", 0x1D93BD, 0x1
gUnknown_81D93BE:: @ 81D93BE
BattleScript_MoveHPDrain:: @ 81D93BE
.incbin "baserom.gba", 0x1D93BE, 0x22
gUnknown_81D93E0:: @ 81D93E0
BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0
.incbin "baserom.gba", 0x1D93E0, 0x1
gUnknown_81D93E1:: @ 81D93E1
BattleScript_MonMadeMoveUseless:: @ 81D93E1
.incbin "baserom.gba", 0x1D93E1, 0x15
gUnknown_81D93F6:: @ 81D93F6
BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6
.incbin "baserom.gba", 0x1D93F6, 0x1
gUnknown_81D93F7:: @ 81D93F7
BattleScript_FlashFireBoost:: @ 81D93F7
.incbin "baserom.gba", 0x1D93F7, 0x1F
gUnknown_81D9416:: @ 81D9416
BattleScript_AbilityNoStatLoss:: @ 81D9416
.incbin "baserom.gba", 0x1D9416, 0xA
gUnknown_81D9420:: @ 81D9420
BattleScript_BRNPrevention:: @ 81D9420
.incbin "baserom.gba", 0x1D9420, 0xC
gUnknown_81D942C:: @ 81D942C
BattleScript_PRLZPrevention:: @ 81D942C
.incbin "baserom.gba", 0x1D942C, 0xC
gUnknown_81D9438:: @ 81D9438
BattleScript_PSNPrevention:: @ 81D9438
.incbin "baserom.gba", 0x1D9438, 0xC
gUnknown_81D9444:: @ 81D9444
BattleScript_ObliviousPreventsAttraction:: @ 81D9444
.incbin "baserom.gba", 0x1D9444, 0xE
gUnknown_81D9452:: @ 81D9452
BattleScript_FlinchPrevention:: @ 81D9452
.incbin "baserom.gba", 0x1D9452, 0x1C
gUnknown_81D946E:: @ 81D946E
BattleScript_SoundproofProtected:: @ 81D946E
.incbin "baserom.gba", 0x1D946E, 0x10
gUnknown_81D947E:: @ 81D947E
BattleScript_AbilityNoSpecificStatLoss:: @ 81D947E
.incbin "baserom.gba", 0x1D947E, 0x10
gUnknown_81D948E:: @ 81D948E
BattleScript_StickyHoldActivates:: @ 81D948E
.incbin "baserom.gba", 0x1D948E, 0xE
gUnknown_81D949C:: @ 81D949C
BattleScript_ColorChangeActivates:: @ 81D949C
.incbin "baserom.gba", 0x1D949C, 0x7
gUnknown_81D94A3:: @ 81D94A3
BattleScript_RoughSkinActivates:: @ 81D94A3
.incbin "baserom.gba", 0x1D94A3, 0x1B
gUnknown_81D94BE:: @ 81D94BE
BattleScript_CuteCharmActivates:: @ 81D94BE
.incbin "baserom.gba", 0x1D94BE, 0xD
gUnknown_81D94CB:: @ 81D94CB
BattleScript_ApplySecondaryEffect:: @ 81D94CB
.incbin "baserom.gba", 0x1D94CB, 0x3
gUnknown_81D94CE:: @ 81D94CE
BattleScript_SynchronizeActivates:: @ 81D94CE
.incbin "baserom.gba", 0x1D94CE, 0x3
gUnknown_81D94D1:: @ 81D94D1
BattleScript_AbilityCuredStatus:: @ 81D94D1
.incbin "baserom.gba", 0x1D94D1, 0x9
gUnknown_81D94DA:: @ 81D94DA
BattleScript_IgnoresWhileAsleep:: @ 81D94DA
.incbin "baserom.gba", 0x1D94DA, 0x10
gUnknown_81D94EA:: @ 81D94EA
BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA
.incbin "baserom.gba", 0x1D94EA, 0x8
gUnknown_81D94F2:: @ 81D94F2
BattleScript_MoveUsedLoafingAround:: @ 81D94F2
.incbin "baserom.gba", 0x1D94F2, 0x12
gUnknown_81D9504:: @ 81D9504
BattleScript_IgnoresAndFallsAsleep:: @ 81D9504
.incbin "baserom.gba", 0x1D9504, 0x17
gUnknown_81D951B:: @ 81D951B
BattleScript_IgnoresAndHitsItself:: @ 81D951B
.incbin "baserom.gba", 0x1D951B, 0xB
gUnknown_81D9526:: @ 81D9526
BattleScript_SubstituteFade:: @ 81D9526
.incbin "baserom.gba", 0x1D9526, 0xB
gUnknown_81D9531:: @ 81D9531
BattleScript_BerryCurePrlzEnd2:: @ 81D9531
.incbin "baserom.gba", 0x1D9531, 0x6
gUnknown_81D9537:: @ 81D9537
BattleScript_BerryCureParRet:: @ 81D9537
.incbin "baserom.gba", 0x1D9537, 0x12
gUnknown_81D9549:: @ 81D9549
BattleScript_BerryCurePsnEnd2:: @ 81D9549
.incbin "baserom.gba", 0x1D9549, 0x6
gUnknown_81D954F:: @ 81D954F
BattleScript_BerryCurePsnRet:: @ 81D954F
.incbin "baserom.gba", 0x1D954F, 0x12
gUnknown_81D9561:: @ 81D9561
BattleScript_BerryCureBrnEnd2:: @ 81D9561
.incbin "baserom.gba", 0x1D9561, 0x6
gUnknown_81D9567:: @ 81D9567
BattleScript_BerryCureBrnRet:: @ 81D9567
.incbin "baserom.gba", 0x1D9567, 0x12
gUnknown_81D9579:: @ 81D9579
BattleScript_BerryCureFrzEnd2:: @ 81D9579
.incbin "baserom.gba", 0x1D9579, 0x6
gUnknown_81D957F:: @ 81D957F
BattleScript_BerryCureFrzRet:: @ 81D957F
.incbin "baserom.gba", 0x1D957F, 0x12
gUnknown_81D9591:: @ 81D9591
BattleScript_BerryCureSlpEnd2:: @ 81D9591
.incbin "baserom.gba", 0x1D9591, 0x6
gUnknown_81D9597:: @ 81D9597
BattleScript_BerryCureSlpRet:: @ 81D9597
.incbin "baserom.gba", 0x1D9597, 0x12
gUnknown_81D95A9:: @ 81D95A9
BattleScript_BerryCureConfusionEnd2:: @ 81D95A9
.incbin "baserom.gba", 0x1D95A9, 0x6
gUnknown_81D95AF:: @ 81D95AF
BattleScript_BerryCureConfusionRet:: @ 81D95AF
.incbin "baserom.gba", 0x1D95AF, 0x10
gUnknown_81D95BF:: @ 81D95BF
BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF
.incbin "baserom.gba", 0x1D95BF, 0x6
gUnknown_81D95C5:: @ 81D95C5
BattleScript_BerryCureChosenStatusRet:: @ 81D95C5
.incbin "baserom.gba", 0x1D95C5, 0x14
gUnknown_81D95D9:: @ 81D95D9
BattleScript_WhiteHerbEnd2:: @ 81D95D9
.incbin "baserom.gba", 0x1D95D9, 0x6
gUnknown_81D95DF:: @ 81D95DF
BattleScript_WhiteHerbRet:: @ 81D95DF
.incbin "baserom.gba", 0x1D95DF, 0x10
gUnknown_81D95EF:: @ 81D95EF
BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF
.incbin "baserom.gba", 0x1D95EF, 0x1D
gUnknown_81D960C:: @ 81D960C
BattleScript_BerryPPHealEnd2:: @ 81D960C
.incbin "baserom.gba", 0x1D960C, 0x10
gUnknown_81D961C:: @ 81D961C
BattleScript_ItemHealHP_End2:: @ 81D961C
.incbin "baserom.gba", 0x1D961C, 0x6
gUnknown_81D9622:: @ 81D9622
BattleScript_ItemHealHP_Ret:: @ 81D9622
.incbin "baserom.gba", 0x1D9622, 0x1B
gUnknown_81D963D:: @ 81D963D
BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D
.incbin "baserom.gba", 0x1D963D, 0x4
gUnknown_81D9641:: @ 81D9641
BattleScript_HangedOnMsg:: @ 81D9641
.incbin "baserom.gba", 0x1D9641, 0xE
gUnknown_81D964F:: @ 81D964F
BattleScript_BerryConfuseHealEnd2:: @ 81D964F
.incbin "baserom.gba", 0x1D964F, 0x2A
gUnknown_81D9679:: @ 81D9679
BattleScript_BerryStatRaiseEnd2:: @ 81D9679
.incbin "baserom.gba", 0x1D9679, 0x1B
gUnknown_81D9694:: @ 81D9694
BattleScript_BerryFocusEnergyEnd2:: @ 81D9694
.incbin "baserom.gba", 0x1D9694, 0x10
gUnknown_81D96A4:: @ 81D96A4
.incbin "baserom.gba", 0x1D96A4, 0x4
gUnknown_81D96A8:: @ 81D96A8
BattleScript_FlushMessageBox:: @ 81D96A8
.incbin "baserom.gba", 0x1D96A8, 0x4
data/battle_scripts_2.s
+4 -4
View File
@@ -12,17 +12,17 @@ gUnknown_81D99FC:: @ 81D99FC
gUnknown_81D9A04:: @ 81D9A04
.incbin "baserom.gba", 0x1D9A04, 0x3E
gUnknown_81D9A42:: @ 81D9A42
BattleScript_SuccessBallThrow:: @ 81D9A42
.incbin "baserom.gba", 0x1D9A42, 0x46
gUnknown_81D9A88:: @ 81D9A88
.incbin "baserom.gba", 0x1D9A88, 0xB
gUnknown_81D9A93:: @ 81D9A93
BattleScript_ShakeBallThrow:: @ 81D9A93
.incbin "baserom.gba", 0x1D9A93, 0x2E
gUnknown_81D9AC1:: @ 81D9AC1
BattleScript_TrainerBallBlock:: @ 81D9AC1
.incbin "baserom.gba", 0x1D9AC1, 0x10
gUnknown_81D9AD1:: @ 81D9AD1
BattleScript_GhostBallDodge:: @ 81D9AD1
.incbin "baserom.gba", 0x1D9AD1, 0x123
data/data.s
+17 -120
View File
@@ -145,7 +145,7 @@ gMonShinyPaletteTable:: @ 82380CC
gTrainerFrontAnimsPtrTable:: @ 82390DC
.incbin "baserom.gba", 0x2390DC, 0x250
gUnknown_823932C:: @ 823932C
gTrainerFrontPicCoords:: @ 823932C
.incbin "baserom.gba", 0x23932C, 0x250
gTrainerFrontPicTable:: @ 823957C
@@ -157,16 +157,16 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C
gTrainerBackAnimsPtrTable:: @ 8239F74
.incbin "baserom.gba", 0x239F74, 0x18
gUnknown_8239F8C:: @ 8239F8C
gTrainerBackPicCoords:: @ 8239F8C
.incbin "baserom.gba", 0x239F8C, 0x18
gTrainerBackPicTable:: @ 8239FA4
.incbin "baserom.gba", 0x239FA4, 0x30
gUnknown_8239FD4:: @ 8239FD4
gTrainerBackPicPaletteTable:: @ 8239FD4
.incbin "baserom.gba", 0x239FD4, 0x30
gUnknown_823A004:: @ 823A004
gEnemyMonElevation:: @ 823A004
.incbin "baserom.gba", 0x23A004, 0x4554
gTrainerClassNames:: @ 823E558
@@ -233,13 +233,13 @@ gUnknown_824F020:: @ 824F020
gUnknown_824F048:: @ 824F048
.incbin "baserom.gba", 0x24F048, 0x8
gUnknown_824F050:: @ 824F050
gTypeEffectiveness:: @ 824F050
.incbin "baserom.gba", 0x24F050, 0x150
gUnknown_824F1A0:: @ 824F1A0
gTypeNames:: @ 824F1A0
.incbin "baserom.gba", 0x24F1A0, 0x80
gUnknown_824F220:: @ 824F220
gTrainerMoneyTable:: @ 824F220
.incbin "baserom.gba", 0x24F220, 0x8E8
gUnknown_824FB08:: @ 824FB08
@@ -254,137 +254,34 @@ gUnknown_8250038:: @ 8250038
gUnknown_8250070:: @ 8250070
.incbin "baserom.gba", 0x250070, 0x24
gUnknown_8250094:: @ 8250094
gStatusConditionString_PoisonJpn:: @ 8250094
.incbin "baserom.gba", 0x250094, 0x8
gUnknown_825009C:: @ 825009C
gStatusConditionString_SleepJpn:: @ 825009C
.incbin "baserom.gba", 0x25009C, 0x8
gUnknown_82500A4:: @ 82500A4
gStatusConditionString_ParalysisJpn:: @ 82500A4
.incbin "baserom.gba", 0x2500A4, 0x8
gUnknown_82500AC:: @ 82500AC
gStatusConditionString_BurnJpn:: @ 82500AC
.incbin "baserom.gba", 0x2500AC, 0x8
gUnknown_82500B4:: @ 82500B4
gStatusConditionString_IceJpn:: @ 82500B4
.incbin "baserom.gba", 0x2500B4, 0x8
gUnknown_82500BC:: @ 82500BC
gStatusConditionString_ConfusionJpn:: @ 82500BC
.incbin "baserom.gba", 0x2500BC, 0x8
gUnknown_82500C4:: @ 82500C4
gStatusConditionString_LoveJpn:: @ 82500C4
.incbin "baserom.gba", 0x2500C4, 0x8
gUnknown_82500CC:: @ 82500CC
.incbin "baserom.gba", 0x2500CC, 0x38
gUnknown_8250104:: @ 8250104
.incbin "baserom.gba", 0x250104, 0x18
.section .rodata.8260270
gUnknown_825011C:: @ 825011C
.incbin "baserom.gba", 0x25011C, 0x3E0
gUnknown_82504FC:: @ 82504FC
.incbin "baserom.gba", 0x2504FC, 0x34
gUnknown_8250530:: @ 8250530
.incbin "baserom.gba", 0x250530, 0xC
gUnknown_825053C:: @ 825053C
.incbin "baserom.gba", 0x25053C, 0xF0
gUnknown_825062C:: @ 825062C
.incbin "baserom.gba", 0x25062C, 0xA4
gUnknown_82506D0:: @ 82506D0
.incbin "baserom.gba", 0x2506D0, 0x20
gUnknown_82506F0:: @ 82506F0
.incbin "baserom.gba", 0x2506F0, 0xD8
gUnknown_82507C8:: @ 82507C8
.incbin "baserom.gba", 0x2507C8, 0x18
gUnknown_82507E0:: @ 82507E0
.incbin "baserom.gba", 0x2507E0, 0x8
gUnknown_82507E8:: @ 82507E8
.incbin "baserom.gba", 0x2507E8, 0x28
gUnknown_8250810:: @ 8250810
.incbin "baserom.gba", 0x250810, 0xC
gUnknown_825081C:: @ 825081C
.incbin "baserom.gba", 0x25081C, 0x14
gUnknown_8250830:: @ 8250830
.incbin "baserom.gba", 0x250830, 0x18
gUnknown_8250848:: @ 8250848
.incbin "baserom.gba", 0x250848, 0x40
gUnknown_8250888:: @ 8250888
.incbin "baserom.gba", 0x250888, 0xA
gUnknown_8250892:: @ 8250892
.incbin "baserom.gba", 0x250892, 0xA
gUnknown_825089C:: @ 825089C
.incbin "baserom.gba", 0x25089C, 0xE4
gUnknown_8250980:: @ 8250980
.incbin "baserom.gba", 0x250980, 0xC
gUnknown_825098C:: @ 825098C
.incbin "baserom.gba", 0x25098C, 0x8
gUnknown_8250994:: @ 8250994
.incbin "baserom.gba", 0x250994, 0x60
gUnknown_82509F4:: @ 82509F4
.incbin "baserom.gba", 0x2509F4, 0x18
gUnknown_8250A0C:: @ 8250A0C
.incbin "baserom.gba", 0x250A0C, 0x10
gUnknown_8250A1C:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
gUnknown_8250A34:: @ 8250A34
.incbin "baserom.gba", 0x250A34, 0xEC
gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4
.section .rodata.825EF0C
.align 2
gUnknown_8260208:: @ 8260208
.incbin "baserom.gba", 0x260208, 0x8
gUnknown_8260210:: @ 8260210
.incbin "baserom.gba", 0x260210, 0x8
gUnknown_8260218:: @ 8260218
.incbin "baserom.gba", 0x260218, 0x8
gUnknown_8260220:: @ 8260220
.incbin "baserom.gba", 0x260220, 0x8
gUnknown_8260228:: @ 8260228
.incbin "baserom.gba", 0x260228, 0x8
gUnknown_8260230:: @ 8260230
.incbin "baserom.gba", 0x260230, 0x8
gUnknown_8260238:: @ 8260238
.incbin "baserom.gba", 0x260238, 0x8
gUnknown_8260240:: @ 8260240
.incbin "baserom.gba", 0x260240, 0x20
gUnknown_8260260:: @ 8260260
.incbin "baserom.gba", 0x260260, 0x18
gUnknown_8260270:: @ 8260270
.incbin "baserom.gba", 0x260270, 0x8
gUnknown_8260278:: @ 8260278
.incbin "baserom.gba", 0x260278, 0x30
data/data_83F5738.s
+11 -11
View File
@@ -133,10 +133,10 @@ gUnknown_83F846D:: @ 83F846D
gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323
.section .rodata.83FB134
.section .rodata.83FB218
gUnknown_83FB134:: @ 83FB134
.incbin "baserom.gba", 0x3FB134, 0xA80
gUnknown_83FB218:: @ 83FB218
.incbin "baserom.gba", 0x3FB218, 0x99C
BattleText_MistShroud:: @ 83FBBB4
.incbin "baserom.gba", 0x3FBBB4, 0x35
@@ -369,10 +369,10 @@ gUnknown_83FDDEB:: @ 83FDDEB
gUnknown_83FDF3C:: @ 83FDF3C
.incbin "baserom.gba", 0x3FDF3C, 0x5D8
gUnknown_83FE514:: @ 83FE514
gMissStringIds:: @ 83FE514
.incbin "baserom.gba", 0x3FE514, 0x150
gUnknown_83FE664:: @ 83FE664
gTrappingMoves:: @ 83FE664
.incbin "baserom.gba", 0x3FE664, 0xE
gUnknown_83FE672:: @ 83FE672
@@ -387,7 +387,7 @@ gUnknown_83FE6B5:: @ 83FE6B5
gUnknown_83FE6D0:: @ 83FE6D0
.incbin "baserom.gba", 0x3FE6D0, 0x5
gUnknown_83FE6D5:: @ 83FE6D5
gText_WhatWillPkmnDo:: @ 83FE6D5
.incbin "baserom.gba", 0x3FE6D5, 0x11
gUnknown_83FE6E6:: @ 83FE6E6
@@ -396,7 +396,7 @@ gUnknown_83FE6E6:: @ 83FE6E6
gUnknown_83FE6FA:: @ 83FE6FA
.incbin "baserom.gba", 0x3FE6FA, 0x1A
gUnknown_83FE714:: @ 83FE714
gText_LinkStandby:: @ 83FE714
.incbin "baserom.gba", 0x3FE714, 0x11
gUnknown_83FE725:: @ 83FE725
@@ -405,19 +405,19 @@ gUnknown_83FE725:: @ 83FE725
gUnknown_83FE747:: @ 83FE747
.incbin "baserom.gba", 0x3FE747, 0x1F
gUnknown_83FE766:: @ 83FE766
gText_MoveInterfacePP:: @ 83FE766
.incbin "baserom.gba", 0x3FE766, 0x4
gUnknown_83FE76A:: @ 83FE76A
gText_MoveInterfaceType:: @ 83FE76A
.incbin "baserom.gba", 0x3FE76A, 0x6
gUnknown_83FE770:: @ 83FE770
.incbin "baserom.gba", 0x3FE770, 0x21
gUnknown_83FE791:: @ 83FE791
gText_BattleYesNoChoice:: @ 83FE791
.incbin "baserom.gba", 0x3FE791, 0xF
gUnknown_83FE7A0:: @ 83FE7A0
gText_BattleSwitchWhich:: @ 83FE7A0
.incbin "baserom.gba", 0x3FE7A0, 0x6C
gUnknown_83FE80C:: @ 83FE80C
data/data_83FECCC.s
+4 -2
View File
@@ -26,8 +26,10 @@ gUnknown_83FECF4:: @ 83FECF4
gUnknown_83FECFA:: @ 83FECFA
.incbin "baserom.gba", 0x3FECFA, 0x6
gUnknown_83FED00:: @ 83FED00
.incbin "baserom.gba", 0x3FED00, 0x380
.section .rodata.83FEDE4
gUnknown_83FEDE4:: @ 83FEDE4
.incbin "baserom.gba", 0x3FEDE4, 0x29C
gUnknown_83FF080:: @ 83FF080
.incbin "baserom.gba", 0x3FF080, 0xB0
data/graphics.s
+16 -13
View File
@@ -146,7 +146,7 @@ gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8
.incbin "graphics/interface/ball_open.4bpp.lz"
.align 2
gFile_graphics_interface_blank_sheet:: @ 8D02364
gBlankGfxCompressed:: @ 8D02364
.incbin "graphics/interface/blank.4bpp.lz"
.align 2
@@ -1062,8 +1062,11 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
.incbin "graphics/unused/basic_frame.bin.lz"
.align 2
gUnknown_8D11B84:: @ 8D11B84
.incbin "baserom.gba", 0xD11B84, 0x40
gBattleInterface_BallStatusBarPal:: @ 8D11B84
.incbin "baserom.gba", 0xD11B84, 0x20
gBattleInterface_BallDisplayPal:: @ 8D11BA4
.incbin "baserom.gba", 0xD11BA4, 0x20
gUnknown_8D11BC4:: @ 8D11BC4
.incbin "baserom.gba", 0xD11BC4, 0xF00
@@ -1761,23 +1764,23 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C
.incbin "graphics/battle_anims/sprites/186.gbapal.lz"
.align 2
gUnknown_8D1F340:: @ 8D1F340
gHealthboxSinglesPlayerGfx:: @ 8D1F340
.incbin "baserom.gba", 0xD1F340, 0x2C4
.align 2
gUnknown_8D1F604:: @ 8D1F604
gHealthboxSinglesOpponentGfx:: @ 8D1F604
.incbin "baserom.gba", 0xD1F604, 0x190
.align 2
gUnknown_8D1F794:: @ 8D1F794
gHealthboxDoublesPlayerGfx:: @ 8D1F794
.incbin "baserom.gba", 0xD1F794, 0x194
.align 2
gUnknown_8D1F928:: @ 8D1F928
gHealthboxDoublesOpponentGfx:: @ 8D1F928
.incbin "baserom.gba", 0xD1F928, 0x194
.align 2
gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC
gHealthboxSafariGfx:: @ 8D1FABC
.incbin "graphics/battle_interface/healthbox_safari.4bpp.lz"
.align 2
@@ -2365,15 +2368,15 @@ gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068
.incbin "graphics/battle_anims/sprites/240.gbapal.lz"
.align 2
gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090
gSubstituteDollPal:: @ 8D2D090
.incbin "graphics/battle_anims/sprites/substitute.gbapal.lz"
.align 2
gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4
gSubstituteDollGfx:: @ 8D2D0B4
.incbin "graphics/battle_anims/sprites/substitute.4bpp.lz"
.align 2
gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4
gSubstituteDollTilemap:: @ 8D2D2F4
.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
.align 2
@@ -15923,10 +15926,10 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4
.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
.align 2
gUnknown_8E93B14:: @ 8E93B14
gGhostPalette:: @ 8E93B14
.incbin "baserom.gba", 0xE93B14, 0x24
gUnknown_8E93B38:: @ 8E93B38
gGhostFrontPic:: @ 8E93B38
.incbin "baserom.gba", 0xE93B38, 0x368
gUnknown_8E93EA0:: @ 8E93EA0
data/smokescreen.s
+17
View File
@@ -0,0 +1,17 @@
.section .rodata
.balign 4
gUnknown_825098C:: @ 825098C
.incbin "baserom.gba", 0x25098C, 0x8
gUnknown_8250994:: @ 8250994
.incbin "baserom.gba", 0x250994, 0x60
gUnknown_82509F4:: @ 82509F4
.incbin "baserom.gba", 0x2509F4, 0x18
gSpriteSheet_EnemyShadow:: @ 8250A0C
.incbin "baserom.gba", 0x250A0C, 0x10
gSpriteTemplate_EnemyShadow:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
graphics/battle_interface/unk_battlebox.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
106 90 115
0 0 0
213 230 255
189 205 238
238 238 255
106 172 197
90 139 180
123 197 205
0 0 0
0 0 0
123 197 255
0 0 139
255 131 131
164 0 0
graphics/battle_interface/unk_battlebox.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 B

include/battle.h
+223 -243
View File
@@ -2,15 +2,14 @@
#define GUARD_BATTLE_H
#include "global.h"
// should they be included here or included individually by every file?
#include "constants/battle.h"
#include "battle_util.h"
#include "battle_script_commands.h"
#include "battle_2.h"
#include "battle_main.h"
#include "battle_ai_switch_items.h"
#include "battle_gfx_sfx_util.h"
#include "battle_util2.h"
#include "battle_bg.h"
/*
Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
@@ -19,8 +18,6 @@
0x2 bit is responsible for the id of sent out pokemon. 0 means it's the first sent out pokemon, 1 it's the second one. (Triple battle didn't exist at the time yet.)
*/
#define BATTLE_BANKS_COUNT 4
#define IDENTITY_PLAYER_MON1 0
#define IDENTITY_OPPONENT_MON1 1
#define IDENTITY_PLAYER_MON2 2
@@ -29,9 +26,9 @@
#define SIDE_PLAYER 0x0
#define SIDE_OPPONENT 0x1
#define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank]))
#define GET_BANK_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE))
#define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE))
#define GET_BATTLER_POSITION(battler)((gBattlerPositions[battler]))
#define GET_BATTLER_SIDE(battler)((GetBattlerPosition(battler) & BIT_SIDE))
#define GET_BATTLER_SIDE2(battler)((GET_BATTLER_POSITION(battler) & BIT_SIDE))
#define TRAINER_OPPONENT_3FE 0x3FE
#define TRAINER_OPPONENT_C00 0xC00
@@ -73,21 +70,22 @@
#define SIDE_STATUS_MIST (1 << 8)
#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
#define ACTION_USE_MOVE 0
#define ACTION_USE_ITEM 1
#define ACTION_SWITCH 2
#define ACTION_RUN 3
#define ACTION_WATCHES_CAREFULLY 4
#define ACTION_SAFARI_ZONE_BALL 5
#define ACTION_POKEBLOCK_CASE 6
#define ACTION_GO_NEAR 7
#define ACTION_SAFARI_ZONE_RUN 8
#define ACTION_9 9
#define ACTION_RUN_BATTLESCRIPT 10 // when executing an action
#define ACTION_CANCEL_PARTNER 12 // when choosing an action
#define ACTION_FINISHED 12 // when executing an action
#define ACTION_NOTHING_FAINTED 13 // when choosing an action
#define ACTION_INIT_VALUE 0xFF
#define B_ACTION_USE_MOVE 0
#define B_ACTION_USE_ITEM 1
#define B_ACTION_SWITCH 2
#define B_ACTION_RUN 3
#define B_ACTION_SAFARI_WATCH_CAREFULLY 4
#define B_ACTION_SAFARI_BALL 5
#define B_ACTION_SAFARI_POKEBLOCK 6
#define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8
#define B_ACTION_9 9
#define B_ACTION_EXEC_SCRIPT 10
#define B_ACTION_TRY_FINISH 11
#define B_ACTION_FINISHED 12
#define B_ACTION_CANCEL_PARTNER 12 // when choosing an action
#define B_ACTION_NOTHING_FAINTED 13 // when choosing an action
#define B_ACTION_NONE 0xFF
#define MOVESTATUS_MISSED (1 << 0)
#define MOVESTATUS_SUPEREFFECTIVE (1 << 1)
@@ -150,19 +148,6 @@
#define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF
#define BS_GET_TARGET 0
#define BS_GET_ATTACKER 1
#define BS_GET_EFFECT_BANK 2
#define BS_GET_gBank1 3
#define BS_GET_BANK_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_GET_SCRIPTING_BANK 10
#define BS_GET_OPPONENT1 12
#define BS_GET_PLAYER2 13
#define BS_GET_OPPONENT2 14
// for battle script commands
#define CMP_EQUAL 0x0
#define CMP_NOT_EQUAL 0x1
@@ -178,9 +163,6 @@ struct TrainerMonNoItemDefaultMoves
u16 species;
};
u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
u8 GetBattlerSide(u8 bank);
struct TrainerMonItemDefaultMoves
{
u16 iv;
@@ -208,10 +190,10 @@ struct TrainerMonItemCustomMoves
union TrainerMonPtr
{
struct TrainerMonNoItemDefaultMoves* NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves* NoItemCustomMoves;
struct TrainerMonItemDefaultMoves* ItemDefaultMoves;
struct TrainerMonItemCustomMoves* ItemCustomMoves;
struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
@@ -235,12 +217,12 @@ extern const struct Trainer gTrainers[];
#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
struct UnknownFlags
struct ResourceFlags
{
u32 flags[4];
};
#define UNKNOWN_FLAG_FLASH_FIRE 1
#define RESOURCE_FLAG_FLASH_FIRE 1
struct DisableStruct
{
@@ -250,41 +232,41 @@ struct DisableStruct
/*0x08*/ u8 protectUses;
/*0x09*/ u8 stockpileCounter;
/*0x0A*/ u8 substituteHP;
/*0x0B*/ u8 disableTimer1 : 4;
/*0x0B*/ u8 disableTimer2 : 4;
/*0x0B*/ u8 disableTimer : 4;
/*0x0B*/ u8 disableTimerStartValue : 4;
/*0x0C*/ u8 encoredMovePos;
/*0x0D*/ u8 unkD;
/*0x0E*/ u8 encoreTimer1 : 4;
/*0x0E*/ u8 encoreTimer2 : 4;
/*0x0F*/ u8 perishSongTimer1 : 4;
/*0x0F*/ u8 perishSongTimer2 : 4;
/*0x0E*/ u8 encoreTimer : 4;
/*0x0E*/ u8 encoreTimerStartValue : 4;
/*0x0F*/ u8 perishSongTimer : 4;
/*0x0F*/ u8 perishSongTimerStartValue : 4;
/*0x10*/ u8 furyCutterCounter;
/*0x11*/ u8 rolloutCounter1 : 4;
/*0x11*/ u8 rolloutCounter2 : 4;
/*0x12*/ u8 chargeTimer1 : 4;
/*0x12*/ u8 chargeTimer2 : 4;
/*0x13*/ u8 tauntTimer1:4;
/*0x11*/ u8 rolloutTimer : 4;
/*0x11*/ u8 rolloutTimerStartValue : 4;
/*0x12*/ u8 chargeTimer : 4;
/*0x12*/ u8 chargeTimerStartValue : 4;
/*0x13*/ u8 tauntTimer:4;
/*0x13*/ u8 tauntTimer2:4;
/*0x14*/ u8 bankPreventingEscape;
/*0x15*/ u8 bankWithSureHit;
/*0x14*/ u8 battlerPreventingEscape;
/*0x15*/ u8 battlerWithSureHit;
/*0x16*/ u8 isFirstTurn;
/*0x17*/ u8 unk17;
/*0x18*/ u8 truantCounter : 1;
/*0x18*/ u8 truantUnknownBit : 1;
/*0x18*/ u8 truantSwitchInHack : 1; // unused?
/*0x18*/ u8 unk18_a_2 : 2;
/*0x18*/ u8 unk18_b : 4;
/*0x19*/ u8 rechargeCounter;
/*0x18*/ u8 mimickedMoves : 4;
/*0x19*/ u8 rechargeTimer;
/*0x1A*/ u8 unk1A[2];
};
extern struct DisableStruct gDisableStructs[BATTLE_BANKS_COUNT];
extern struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT];
struct ProtectStruct
{
/* field_0 */
u32 protected:1;
u32 endured:1;
u32 onlyStruggle:1;
u32 noValidMoves:1;
u32 helpingHand:1;
u32 bounceMove:1;
u32 stealMove:1;
@@ -295,7 +277,7 @@ struct ProtectStruct
u32 targetNotAffected:1;
u32 chargingTurn:1;
u32 fleeFlag:2; // for RunAway and Smoke Ball
u32 usedImprisionedMove:1;
u32 usedImprisonedMove:1;
u32 loveImmobility:1;
u32 usedDisabledMove:1;
/* field_2 */
@@ -312,45 +294,45 @@ struct ProtectStruct
/* field_4 */ u32 physicalDmg;
/* field_8 */ u32 specialDmg;
/* field_C */ u8 physicalBank;
/* field_D */ u8 specialBank;
/* field_C */ u8 physicalBattlerId;
/* field_D */ u8 specialBattlerId;
/* field_E */ u16 fieldE;
};
extern struct ProtectStruct gProtectStructs[BATTLE_BANKS_COUNT];
extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT];
struct SpecialStatus
{
u8 statLowered : 1; // 0x1
u8 lightningRodRedirected : 1; // 0x2
u8 restoredBankSprite: 1; // 0x4
u8 intimidatedPoke : 1; // 0x8
u8 restoredBattlerSprite: 1; // 0x4
u8 intimidatedMon : 1; // 0x8
u8 traced : 1; // 0x10
u8 flag20 : 1;
u8 ppNotAffectedByPressure : 1;
u8 flag40 : 1;
u8 focusBanded : 1;
u8 field1[3];
s32 moveturnLostHP;
s32 moveturnLostHP_physical;
s32 moveturnLostHP_special;
u8 moveturnPhysicalBank;
u8 moveturnSpecialBank;
s32 dmg;
s32 physicalDmg;
s32 specialDmg;
u8 physicalBattlerId;
u8 specialBattlerId;
u8 field12;
u8 field13;
};
extern struct SpecialStatus gSpecialStatuses[BATTLE_BANKS_COUNT];
extern struct SpecialStatus gSpecialStatuses[MAX_BATTLERS_COUNT];
struct SideTimer
{
/*0x00*/ u8 reflectTimer;
/*0x01*/ u8 reflectBank;
/*0x01*/ u8 reflectBattlerId;
/*0x02*/ u8 lightscreenTimer;
/*0x03*/ u8 lightscreenBank;
/*0x03*/ u8 lightscreenBattlerId;
/*0x04*/ u8 mistTimer;
/*0x05*/ u8 mistBank;
/*0x05*/ u8 mistBattlerId;
/*0x06*/ u8 safeguardTimer;
/*0x07*/ u8 safeguardBank;
/*0x07*/ u8 safeguardBattlerId;
/*0x08*/ u8 followmeTimer;
/*0x09*/ u8 followmeTarget;
/*0x0A*/ u8 spikesAmount;
@@ -361,14 +343,14 @@ extern struct SideTimer gSideTimers[];
struct WishFutureKnock
{
u8 futureSightCounter[BATTLE_BANKS_COUNT];
u8 futureSightAttacker[BATTLE_BANKS_COUNT];
s32 futureSightDmg[BATTLE_BANKS_COUNT];
u16 futureSightMove[BATTLE_BANKS_COUNT];
u8 wishCounter[BATTLE_BANKS_COUNT];
u8 wishUserID[BATTLE_BANKS_COUNT];
u8 futureSightCounter[MAX_BATTLERS_COUNT];
u8 futureSightAttacker[MAX_BATTLERS_COUNT];
s32 futureSightDmg[MAX_BATTLERS_COUNT];
u16 futureSightMove[MAX_BATTLERS_COUNT];
u8 wishCounter[MAX_BATTLERS_COUNT];
u8 wishMonId[MAX_BATTLERS_COUNT];
u8 weatherDuration;
u8 knockedOffPokes[2];
u8 knockedOffMons[2];
};
extern struct WishFutureKnock gWishFutureKnock;
@@ -391,10 +373,6 @@ extern u8 gActiveBattler;
extern u8 gBattlerTarget;
extern u8 gAbsentBattlerFlags;
// TODO: move these to constants/battle.h
#define MAX_BATTLERS_COUNT 4
#define BIT_FLANK 2
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
@@ -413,6 +391,12 @@ extern u8 gAbsentBattlerFlags;
extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
struct UsedMoves
{
u16 moves[MAX_BATTLERS_COUNT];
u16 unknown[MAX_BATTLERS_COUNT];
};
struct BattleHistory
{
/*0x00*/ u16 usedMoves[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
@@ -436,27 +420,22 @@ struct BattleCallbacksStack
struct StatsArray
{
u16 hp;
u16 atk;
u16 def;
u16 spd;
u16 spAtk;
u16 spDef;
u16 stats[NUM_STATS];
};
struct BattleResources
{
struct SecretBaseRecord* secretBase;
struct UnknownFlags *flags;
struct BattleScriptsStack* battleScriptsStack;
struct BattleCallbacksStack* battleCallbackStack;
struct StatsArray* statsBeforeLvlUp;
struct SecretBaseRecord *secretBase;
struct ResourceFlags *flags;
struct BattleScriptsStack *battleScriptsStack;
struct BattleCallbacksStack *battleCallbackStack;
struct StatsArray *beforeLvlUp;
struct AI_ThinkingStruct *ai;
struct BattleHistory *battleHistory;
struct BattleScriptsStack *AI_ScriptsStack;
};
extern struct BattleResources* gBattleResources;
extern struct BattleResources *gBattleResources;
#define BATTLESCRIPTS_STACK (gBattleResources->battleScriptsStack)
#define BATTLE_CALLBACKS_STACK (gBattleResources->battleCallbackStack)
@@ -467,18 +446,18 @@ struct BattleResults
u8 playerFaintCounter; // 0x0
u8 opponentFaintCounter; // 0x1
u8 playerSwitchesCounter; // 0x2
u8 unk3; // 0x3
u8 unk4; // 0x4
u8 unk5_0:1; // 0x5
u8 numHealingItemsUsed; // 0x3
u8 numRevivesUsed; // 0x4
u8 playerMonWasDamaged:1; // 0x5
u8 usedMasterBall:1; // 0x5
u8 caughtMonBall:4; // 0x5
u8 unk5_6:1; // 0x5
u8 shinyWildMon:1; // 0x5
u8 unk5_7:1; // 0x5
u16 playerMon1Species; // 0x6
u8 playerMon1Name[11]; // 0x8
u8 battleTurnCounter; // 0x13
u8 playerMon2Name[11]; // 0x14
u8 field_1F; // 0x1F
u8 pokeblockThrows; // 0x1F
u16 lastOpponentSpecies; // 0x20
u16 lastUsedMovePlayer; // 0x22
u16 lastUsedMoveOpponent; // 0x24
@@ -494,39 +473,31 @@ extern struct BattleResults gBattleResults;
struct BattleStruct
{
u8 turnEffectsTracker;
u8 turnEffectsBank;
u8 turnEffectsBattlerId;
u8 filler2;
u8 turncountersTracker;
u8 wrappedMove[8]; // ask gamefreak why they declared it that way
u8 moveTarget[4];
u8 expGetterId;
u8 turnCountersTracker;
u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; // Leftover from Ruby's ewram access.
u8 moveTarget[MAX_BATTLERS_COUNT];
u8 expGetterMonId;
u8 field_11;
u8 wildVictorySong;
u8 dynamicMoveType;
u8 wrappedBy[4];
u16 assistPossibleMoves[5 * 4]; // 5 mons, each of them knowing 4 moves
u8 field_40;
u8 field_41;
u8 field_42;
u8 field_43;
u8 field_44;
u8 field_45;
u8 field_46;
u8 field_47;
u8 focusPunchBank;
u16 assistPossibleMoves[PARTY_SIZE * MAX_MON_MOVES]; // 6 mons, each of them knowing 4 moves
u8 focusPunchBattlerId;
u8 battlerPreventingSwitchout;
u8 moneyMultiplier;
u8 savedTurnActionNumber;
u8 switchInAbilitiesCounter;
u8 faintedActionsState;
u8 faintedActionsBank;
u8 faintedActionsBattlerId;
u8 field_4F;
u16 expValue;
u8 field_52;
u8 sentInPokes;
bool8 selectionScriptFinished[BATTLE_BANKS_COUNT];
bool8 selectionScriptFinished[MAX_BATTLERS_COUNT];
u8 field_58[4];
u8 monToSwitchIntoId[BATTLE_BANKS_COUNT];
u8 monToSwitchIntoId[MAX_BATTLERS_COUNT];
u8 field_60[4][3];
u8 runTries;
u8 caughtMonNick[11];
@@ -535,11 +506,11 @@ struct BattleStruct
u8 safariPkblThrowCounter;
u8 safariEscapeFactor;
u8 safariCatchFactor;
u8 field_7D;
u8 field_7E;
u8 linkBattleVsSpriteId_V;
u8 linkBattleVsSpriteId_S;
u8 formToChangeInto;
u8 chosenMovePositions[BATTLE_BANKS_COUNT];
u8 stateIdAfterSelScript[BATTLE_BANKS_COUNT];
u8 chosenMovePositions[MAX_BATTLERS_COUNT];
u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT];
u8 field_88;
u8 field_89;
u8 field_8A;
@@ -547,69 +518,48 @@ struct BattleStruct
u8 field_8C;
u8 field_8D;
u8 stringMoveType;
u8 expGetterBank;
u8 expGetterBattlerId;
u8 field_90;
u8 field_91;
u8 field_92;
u8 field_93;
u8 wallyBattleState;
u8 wallyMovesState;
u8 wallyWaitFrames;
u8 wallyMoveFrames;
u8 mirrorMoves[8]; // ask gamefreak why they declared it that way
u8 field_A0;
u8 field_A1;
u8 field_A2;
u8 field_A3;
u8 field_A4;
u8 field_A5;
u8 field_A6;
u8 field_A7;
u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
u8 field_96;
u8 field_97;
u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // ask gamefreak why they declared it that way
u16 hpOnSwitchout[2];
u32 savedBattleTypeFlags;
u8 abilityPreventingSwitchout;
u8 hpScale;
u8 synchronizeMoveEffect;
u8 field_AE;
u8 field_AF;
u8 field_B0;
u8 field_B1;
u8 field_B2;
u8 field_B3;
u8 field_B4;
u8 synchronizeMoveEffect;
u8 field_B5;
u8 field_B6;
u8 field_B7;
// void (*savedCallback)(void);
u16 usedHeldItems[BATTLE_BANKS_COUNT];
u8 atkCancellerTracker;
u16 usedHeldItems[MAX_BATTLERS_COUNT];
u8 chosenItem[4]; // why is this an u8?
u8 AI_itemType[2];
u8 AI_itemFlags[2];
u16 choicedMove[BATTLE_BANKS_COUNT];
u16 changedItems[BATTLE_BANKS_COUNT];
u8 intimidateBank;
u16 choicedMove[MAX_BATTLERS_COUNT];
u16 changedItems[MAX_BATTLERS_COUNT];
u8 intimidateBattler;
u8 switchInItemsCounter;
u8 field_DA;
u8 arenaTurnCounter; // not used in FR?
u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC];
u8 field_DF;
u8 mirrorMoveArrays[32];
u16 castformPalette[BATTLE_BANKS_COUNT][16];
u8 field_180;
u8 field_181;
u8 givenExpMons;
u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2];
u16 castformPalette[MAX_BATTLERS_COUNT][16];
u8 wishPerishSongState;
u8 wishPerishSongBattlerId;
u8 field_182;
u8 field_183;
struct BattleEnigmaBerry battleEnigmaBerry;
u8 wishPerishSongState;
u8 wishPerishSongBank;
bool8 overworldWeatherDone;
u8 atkCancellerTracker;
u8 field_1A4[96];
u8 field_204[104];
u8 field_26C[40];
u8 AI_monToSwitchIntoId[BATTLE_BANKS_COUNT];
u8 field_298[8];
u8 field_2A0;
u8 field_2A1;
u8 field_2A2;
};
u8 field_184[124]; // currently unknown
}; // size == 0x200 bytes
extern struct BattleStruct* gBattleStruct;
extern struct BattleStruct *gBattleStruct;
#define GET_MOVE_TYPE(move, typeArg) \
{ \
@@ -621,6 +571,13 @@ extern struct BattleStruct* gBattleStruct;
#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0))
#define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type))
#define SET_BATTLER_TYPE(battlerId, type) \
{ \
gBattleMons[battlerId].type1 = type; \
gBattleMons[battlerId].type2 = type; \
}
#define MOVE_EFFECT_SLEEP 0x1
#define MOVE_EFFECT_POISON 0x2
@@ -688,53 +645,8 @@ extern struct BattleStruct* gBattleStruct;
#define MOVE_EFFECT_AFFECTS_USER 0x40
#define MOVE_EFFECT_CERTAIN 0x80
// table ids for general animations
#define B_ANIM_CASTFORM_CHANGE 0x0
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_x4 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9
#define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC
#define B_ANIM_HAIL_CONTINUES 0xD
#define B_ANIM_LEECH_SEED_DRAIN 0xE
#define B_ANIM_MON_HIT 0xF
#define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_x14 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
// special animations table
#define B_ANIM_LVL_UP 0x0
#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1
#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2
#define B_ANIM_BALL_THROW 0x3
#define B_ANIM_SAFARI_BALL_THROW 0x4
#define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE2(n)((n & 0xF0))
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
@@ -779,13 +691,13 @@ struct BattleScripting
u8 animArg2;
u16 tripleKickPower;
u8 atk49_state;
u8 bankWithAbility;
u8 battlerWithAbility;
u8 multihitMoveEffect;
u8 bank;
u8 battler;
u8 animTurn;
u8 animTargetsHit;
u8 statChanger;
u8 field_1B;
bool8 statAnimPlayed;
u8 atk23_state;
u8 battleStyle;
u8 atk6C_state;
@@ -794,12 +706,8 @@ struct BattleScripting
u8 reshowMainState;
u8 reshowHelperState;
u8 field_23;
u8 field_24;
u8 multiplayerId;
};
extern struct BattleScripting gBattleScripting;
// functions
// battle_1
@@ -809,6 +717,7 @@ void ApplyPlayerChosenFrameToBattleMenu(void);
bool8 LoadChosenBattleElement(u8 caseId);
void DrawMainBattleBackground(void);
void task00_0800F6FC(u8 taskId);
void sub_800F324(void);
enum
{
@@ -863,24 +772,23 @@ struct BattleAnimationInfo
struct BattleHealthboxInfo
{
u8 flag_x1 : 1;
u8 flag_x2 : 1;
u8 flag_x4 : 1;
u8 partyStatusSummaryShown : 1;
u8 healthboxIsBouncing : 1;
u8 battlerIsBouncing : 1;
u8 ballAnimActive : 1; // 0x8
u8 statusAnimActive : 1; // x10
u8 animFromTableActive : 1; // x20
u8 specialAnimActive : 1; //x40
u8 flag_x80 : 1;
u8 field_1_x1 : 1;
u8 field_1_x1E : 4;
u8 field_1_x20 : 1;
u8 field_1_x1E : 5;
u8 field_1_x40 : 1;
u8 field_1_x80 : 1;
u8 field_2;
u8 field_3;
u8 healthboxBounceSpriteId;
u8 battlerBounceSpriteId;
u8 animationState;
u8 field_5;
u8 field_6;
u8 matrixNum;
u8 shadowSpriteId;
u8 field_8;
u8 field_9;
@@ -892,14 +800,14 @@ struct BattleBarInfo
{
u8 healthboxSpriteId;
s32 maxValue;
s32 currentValue;
s32 oldValue;
s32 receivedValue;
s32 field_10;
s32 currValue;
};
struct BattleSpriteData
{
struct BattleSpriteInfo *bankData;
struct BattleSpriteInfo *battlerData;
struct BattleHealthboxInfo *healthBoxesData;
struct BattleAnimationInfo *animationData;
struct BattleBarInfo *battleBars;
@@ -931,16 +839,30 @@ struct MonSpritesGfx
void *field_17C;
};
extern struct BattleSpritesGfx* gMonSpritesGfx;
extern u16 gBattle_BG0_X;
extern u16 gBattle_BG0_Y;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X;
extern u16 gBattle_BG3_Y;
extern u16 gBattle_WIN0H;
extern u16 gBattle_WIN0V;
extern u16 gBattle_WIN1H;
extern u16 gBattle_WIN1V;
extern struct BattleSpritesGfx *gMonSpritesGfx;
extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
extern u32 gBattleTypeFlags;
extern struct MonSpritesGfx* gMonSpritesGfxPtr;
extern struct MonSpritesGfx *gMonSpritesGfxPtr;
extern u16 gTrainerBattleOpponent_A;
extern u16 gMoveToLearn;
extern u16 gBattleMovePower;
extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
extern u16 gCurrentMove;
extern u16 gChosenMove;
extern u16 gCalledMove;
extern u8 gCritMultiplier;
extern u16 gBattleWeather;
extern u8 gLastUsedAbility;
@@ -949,8 +871,66 @@ extern u8 gPotentialItemEffectBattler;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
extern s32 gBattleMoveDamage;
extern u16 gIntroSlideFlags;
extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
extern u8 gBattleOutcome;
extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
extern u32 gBattleControllerExecFlags;
extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
extern void (*gPreBattleCallback1)(void);
extern bool8 gDoingBattleAnim;
extern void *gUnknown_3005EE0[];
extern u8 *gUnknown_2022BB8;
extern u8 *gUnknown_2022BBC;
extern void (*gBattleMainFunc)(void);
extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
extern u32 gUnknown_2022B54;
extern u8 gUnknown_2023DDC;
extern u8 gBattlerAttacker;
extern u8 gEffectBattler;
extern u8 gMultiHitCounter;
extern struct BattleScripting gBattleScripting;
extern u8 gBattlerFainted;
extern u32 gStatuses3[MAX_BATTLERS_COUNT];
extern u8 gSentPokesToOpponent[2];
extern const u8 *gBattlescriptCurrInstr;
extern const u8 *gSelectionBattleScripts[MAX_BATTLERS_COUNT];
extern u16 gLastMoves[MAX_BATTLERS_COUNT];
extern u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gBattleCommunication[BATTLE_COMMUNICATION_ENTRIES_COUNT];
extern u16 gSideStatuses[2];
extern u32 gHitMarker;
extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
extern u8 gMoveResultFlags;
extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
extern u8 gCurrentActionFuncId;
extern u8 gCurrMovePos;
extern u8 gChosenMovePos;
extern u8 gUnknown_3004FFC[MAX_BATTLERS_COUNT];
extern u8 gBattlerStatusSummaryTaskId[MAX_BATTLERS_COUNT];
extern u16 gDynamicBasePower;
extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
extern u8 gMultiUsePlayerCursor;
extern u8 gNumberOfMovesToChoose;
extern u16 gLastHitByType[MAX_BATTLERS_COUNT];
extern s32 gHpDealt;
extern u16 gPauseCounterBattle;
extern u16 gPaydayMoney;
extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
extern u8 gCurrentTurnActionNumber;
extern u16 gExpShareExp;
extern u8 gLeveledUpInBattle;
extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT];
extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
extern u8 gBattleTerrain;
#endif // GUARD_BATTLE_H
include/battle_ai_script_commands.h
+7 -3
View File
@@ -3,15 +3,19 @@
#include "global.h"
extern u8 sBattler_AI;
// return values for BattleAI_ChooseMoveOrAction
// 0 - 3 are move idx
#define AI_CHOICE_FLEE 4
#define AI_CHOICE_WATCH 5
void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
void BattleAI_SetupAIData(u8 defaultScoreMoves);
void BattleAI_HandleItemUseBeforeAISetup(void);
void BattleAI_SetupAIData(void);
u8 BattleAI_ChooseMoveOrAction(void);
void ClearBankMoveHistory(u8 bank);
void RecordAbilityBattle(u8 bank, u8 abilityId);
void ClearBankAbilityHistory(u8 bank);
void RecordItemEffectBattle(u8 bank, u8 itemEffect);
void ClearBankItemEffectHistory(u8 bank);
u8 BattleAI_ChooseMoveOrAction(void);
#endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
include/battle_anim.h
+79 -32
View File
@@ -19,28 +19,28 @@ enum
{
BG_ANIM_SCREEN_SIZE,
BG_ANIM_AREA_OVERFLOW_MODE,
BG_ANIM2,
BG_ANIM3,
BG_ANIM_MOSAIC,
BG_ANIM_CHAR_BASE_BLOCK,
BG_ANIM_PRIORITY,
BG_ANIM_5,
BG_ANIM_6
BG_ANIM_PALETTES_MODE,
BG_ANIM_SCREEN_BASE_BLOCK
};
struct UnknownAnimStruct2
struct BattleAnimBgData
{
void *unk0;
u16 *unk4;
u8 unk8;
u8 unk9;
u16 unkA;
u16 unkC;
u8 *bgTiles;
u16 *bgTilemap;
u8 paletteId;
u8 bgId;
u16 tilesOffset;
u16 unused;
};
struct BattleAnimBackground
{
void *image;
void *palette;
void *tilemap;
const u32 *image;
const u32 *palette;
const u32 *tilemap;
};
#define ANIM_ARGS_COUNT 8
@@ -53,7 +53,6 @@ extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount;
extern u8 gAnimSoundTaskCount;
extern struct DisableStruct *gAnimDisableStructPtr;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
@@ -64,8 +63,8 @@ extern u8 gBattleAnimTarget;
extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT];
extern u8 gUnknown_02038440;
extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
extern u16 gUnknown_2037EEC;
extern s32 gUnknown_2037EE8;
extern u16 gAnimMovePower;
extern s32 gAnimMoveDmg;
void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move);
@@ -80,7 +79,7 @@ s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan);
s16 sub_80A52EC(s16 a);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
bool8 sub_8072DF0(u8 battlerId);
bool8 IsBattlerSpriteVisible(u8 battlerId);
// battle_anim_80FE840.s
void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
@@ -92,18 +91,35 @@ void sub_80A6EEC(struct Sprite *sprite);
void sub_80A68D4(struct Sprite *sprite);
void sub_80A6F3C(struct Sprite *sprite);
void sub_80A8278(void);
void sub_80A6B30(struct UnknownAnimStruct2*);
void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
void sub_80A6B30(struct BattleAnimBgData *);
void sub_80A6B90(struct BattleAnimBgData *, u32 arg1);
u8 sub_80A82E4(u8 bank);
bool8 AnimateBallThrow(struct Sprite *sprite);
// battle_anim_special
void sub_80F1720(u8 battler, struct Pokemon *mon);
enum
{
BANK_X_POS,
BANK_Y_POS,
BATTLER_COORD_X,
BATTLER_COORD_Y,
BATTLER_COORD_X_2,
BATTLER_COORD_Y_PIC_OFFSET,
BATTLER_COORD_Y_PIC_OFFSET_DEFAULT,
};
u8 GetBankPosition(u8 bank, u8 attributeId);
enum
{
BATTLER_COORD_ATTR_HEIGHT,
BATTLER_COORD_ATTR_WIDTH,
BATTLER_COORD_ATTR_TOP,
BATTLER_COORD_ATTR_BOTTOM,
BATTLER_COORD_ATTR_LEFT,
BATTLER_COORD_ATTR_RIGHT,
BATTLER_COORD_ATTR_RAW_BOTTOM,
};
u8 GetBattlerSpriteCoord(u8 bank, u8 attributeId);
bool8 IsBankSpritePresent(u8 bank);
void sub_80A6C68(u8 arg0);
@@ -112,12 +128,23 @@ bool8 IsDoubleBattle(void);
u8 sub_80A6D94(void);
u8 sub_80A8364(u8);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
u8 GetBankSpriteDefault_Y(u8 bank);
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 bank);
u8 sub_80A82E4(u8 bank);
u8 GetSubstituteSpriteDefault_Y(u8 bank);
u8 GetGhostSpriteDefault_Y(u8 battlerId);
void sub_8072E48(u8 battlerId, u8);
void sub_8073128(u8);
// battle_anim_80A9C70.s
#define STAT_ANIM_PLUS1 15
#define STAT_ANIM_PLUS2 39
#define STAT_ANIM_MINUS1 22
#define STAT_ANIM_MINUS2 46
#define STAT_ANIM_MULTIPLE_PLUS1 55
#define STAT_ANIM_MULTIPLE_PLUS2 56
#define STAT_ANIM_MULTIPLE_MINUS1 57
#define STAT_ANIM_MULTIPLE_MINUS2 58
void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
// battle_anim_8170478.s
@@ -126,13 +153,33 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId);
// battle_anim_mons.s
void sub_8074DC4(struct Sprite * sprite);
void sub_8074E14(struct Sprite * sprite);
void sub_80754B8(struct Sprite * sprite);
void sub_80758E0(u8 spriteId, u8 b);
void sub_8075980(u8 spriteId);
void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
bool8 sub_8073788(void);
void TranslateMonSpriteLinear(struct Sprite * sprite);
void TranslateMonSpriteLinearFixedPoint(struct Sprite * sprite);
void InitSpriteDataForLinearTranslation(struct Sprite * sprite);
void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 b);
void ResetSpriteRotScale(u8 spriteId);
void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
bool8 IsContest(void);
void sub_80759DC(u8 spriteId);
bool8 IsBattlerSpritePresent(u8 battlerId);
u8 GetBattlerSpriteSubpriority(u8 battlerId);
void StartAnimLinearTranslation(struct Sprite *sprite);
void sub_80755B8(struct Sprite *sprite);
u8 sub_80768B0(u8 battlerId);
// battle_anim_mon_movement.c
void AnimTask_ShakeMon(u8 taskId);
void AnimTask_ShakeMon2(u8 taskId);
void AnimTask_ShakeMonInPlace(u8 taskId);
void AnimTask_ShakeAndSinkMon(u8 taskId);
void AnimTask_TranslateMonElliptical(u8 taskId);
void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId);
void AnimTask_WindUpLunge(u8 taskId);
void sub_80995FC(u8 taskId);
void AnimTask_SwayMon(u8 taskId);
void AnimTask_ScaleMonAndRestore(u8 taskId);
void sub_8099980(u8 taskId);
void sub_8099A78(u8 taskId);
void sub_8099BD4(u8 taskId);
#endif // GUARD_BATTLE_ANIM_H
include/battle_bg.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_BATTLE_BG_H
#define GUARD_BATTLE_BG_H
void sub_800F34C(void);
#endif // GUARD_BATTLE_BG_H
include/battle_controllers.h
+68 -68
View File
@@ -77,10 +77,14 @@ enum
#define BALL_3_SHAKES_FAIL 3
#define BALL_3_SHAKES_SUCCESS 4
#define BALL_TRAINER_BLOCK 5
#define BALL_GHOST_DODGE 6
#define RET_VALUE_LEVELLED_UP 11
#define INSTANT_HP_BAR_DROP 32767
#define INSTANT_HP_BAR_DROP 0x7FFF
// Special return values in gBattleBufferB from Battle Controller functions.
#define RET_VALUE_LEVELED_UP 11
struct UnusedControllerStruct
{
@@ -162,8 +166,8 @@ enum
CONTROLLER_INTROSLIDE,
CONTROLLER_INTROTRAINERBALLTHROW,
CONTROLLER_DRAWPARTYSTATUSSUMMARY,
CONTROLLER_49,
CONTROLLER_50,
CONTROLLER_HIDEPARTYSTATUSSUMMARY,
CONTROLLER_ENDBOUNCE,
CONTROLLER_SPRITEINVISIBILITY,
CONTROLLER_BATTLEANIMATION,
CONTROLLER_LINKSTANDBYMSG,
@@ -174,90 +178,80 @@ enum
CONTROLLER_CMDS_COUNT
};
extern struct UnusedControllerStruct gUnknown_2022870;
// general functions
void HandleLinkBattleSetup(void);
void SetUpBattleVarsAndBirchZigzagoon(void);
void sub_8032768(void);
void sub_8033648(void);
void SetUpBattleVars(void);
void sub_800D30C(void);
void sub_800DD28(void);
void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
// emitters
void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
void EmitLoadMonSprite(u8 bufferId);
void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
void EmitReturnMonToBall(u8 bufferId, u8 arg1);
void EmitDrawTrainerPic(u8 bufferId);
void EmitTrainerSlide(u8 bufferId);
void EmitTrainerSlideBack(u8 bufferId);
void EmitFaintAnimation(u8 bufferId);
void EmitPaletteFade(u8 bufferId); // unused
void EmitSuccessBallThrowAnim(u8 bufferId); // unused
void EmitBallThrowAnim(u8 bufferId, u8 caseId);
void EmitPause(u8 bufferId, u8 toWait, void *data); // unused
void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit);
void EmitPrintString(u8 bufferId, u16 stringId);
void EmitPrintSelectionString(u8 bufferId, u16 stringId);
void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void EmitUnknownYesNoBox(u8 bufferId);
void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
void EmitChooseItem(u8 bufferId, u8* arg1);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
void EmitCmd23(u8 bufferId); // unused
void EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
void EmitStatusXor(u8 bufferId, u8 b); // unused
void EmitDataTransfer(u8 bufferId, u16 size, void *data);
void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused
void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter); // unused
void EmitCmd32(u8 bufferId, u16 size, void *c); // unused
void EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
void EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
void EmitOneReturnValue(u8 bufferId, u16 arg1);
void EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
void EmitCmd37(u8 bufferId); // unused
void EmitCmd38(u8 bufferId, u8 b); // unused
void EmitCmd39(u8 bufferId); // unused
void EmitCmd40(u8 bufferId); // unused
void EmitHitAnimation(u8 bufferId);
void EmitCmd42(u8 bufferId);
void EmitPlaySE(u8 bufferId, u16 songId);
void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
void EmitFaintingCry(u8 bufferId);
void EmitIntroSlide(u8 bufferId, u8 terrainId);
void EmitIntroTrainerBallThrow(u8 bufferId);
void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
void EmitCmd49(u8 bufferId);
void EmitCmd50(u8 bufferId);
void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
void EmitCmd55(u8 bufferId, u8 arg1);
void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
void BtlController_EmitLoadMonSprite(u8 bufferId);
void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
void BtlController_EmitReturnMonToBall(u8 bufferId, u8 arg1);
void BtlController_EmitDrawTrainerPic(u8 bufferId);
void BtlController_EmitTrainerSlide(u8 bufferId);
void BtlController_EmitTrainerSlideBack(u8 bufferId);
void BtlController_EmitFaintAnimation(u8 bufferId);
void BtlController_EmitBallThrowAnim(u8 bufferId, u8 caseId);
void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr);
void BtlController_EmitPrintString(u8 bufferId, u16 stringId);
void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId);
void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
void BtlController_EmitChooseItem(u8 bufferId, u8* arg1);
void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
void BtlController_EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
void BtlController_EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
void BtlController_EmitDataTransfer(u8 bufferId, u16 size, void *data);
void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1);
void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
void BtlController_EmitHitAnimation(u8 bufferId);
void BtlController_EmitCmd42(u8 bufferId);
void BtlController_EmitPlaySE(u8 bufferId, u16 songId);
void BtlController_EmitPlayFanfare(u8 bufferId, u16 songId);
void BtlController_EmitFaintingCry(u8 bufferId);
void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId);
void BtlController_EmitIntroTrainerBallThrow(u8 bufferId);
void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
void BtlController_EmitHidePartyStatusSummary(u8 bufferId);
void BtlController_EmitEndBounceEffect(u8 bufferId);
void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1);
void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
void BtlController_EmitCmd55(u8 bufferId, u8 arg1);
// player controller
void nullsub_13(void);
void SetControllerToPlayer(void);
void nullsub_21(void);
void PlayerHandleGetRawMonData(void);
void sub_80587B0(void);
void sub_805CC00(struct Sprite *sprite);
void sub_80335F8(struct Sprite *sprite);
void SetCB2ToReshowScreenAfterMenu(void);
void SetCB2ToReshowScreenAfterMenu2(void);
void c3_0802FDF4(u8 taskId);
void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused);
void ActionSelectionDestroyCursorAt(u8 cursorPos);
void InitMoveSelectionsVarsAndStrings(void);
void sub_802F6A8(void);
void MoveSelectionCreateCursorAt(u8 cursorPos, u8 arg1);
void MoveSelectionDestroyCursorAt(u8 cursorPos);
void HandleInputChooseMove(void);
// recorded player controller
void SetControllerToRecordedPlayer(void);
// opponent controller
void SetControllerToOpponent(void);
void OpponentBufferExecCompleted(void);
// player partner controller
void SetControllerToPlayerPartner(void);
@@ -265,11 +259,17 @@ void SetControllerToPlayerPartner(void);
// safari controller
void SetControllerToSafari(void);
// wally controller
void SetControllerToWally(void);
// pokedude controller
void SetControllerToPokedude(void);
// recorded opponent controller
void SetControllerToRecordedOpponent(void);
// oak controller
void SetControllerToOakOrOldman(void);
bool8 sub_80EB2E0(u8);
void sub_80EB2F4(u8);
void sub_80E8570(void);
void sub_80E85C0(void);
void sub_80E8598(void);
void sub_80E7988(void);
// link opponent
void SetControllerToLinkOpponent(void);
include/battle_gfx_sfx_util.h
+29 -34
View File
@@ -1,50 +1,45 @@
#ifndef GUARD_BATTLE_GFX_SFX_UTIL
#define GUARD_BATTLE_GFX_SFX_UTIL
#ifndef GUARD_BATTLE_GFX_SFX_UTIL_H
#define GUARD_BATTLE_GFX_SFX_UTIL_H
void AllocateBattleSpritesData(void);
void FreeBattleSpritesData(void);
u16 ChooseMoveAndTargetInBattlePalace(void);
void sub_805D714(struct Sprite *sprite);
void sub_805D770(struct Sprite *sprite, bool8 arg1);
void sub_805D7AC(struct Sprite *sprite);
void sub_8033E3C(struct Sprite *sprite);
void sub_8033EEC(struct Sprite *sprite);
void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status);
bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument);
void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId);
bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId, u16 argument);
void InitAndLaunchSpecialAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId);
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
bool8 mplay_80342A4(u8 bank);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank);
void nullsub_23(void);
void nullsub_24(u16 species);
void DecompressTrainerFrontPic(u16 frontPicId, u8 bank);
void DecompressTrainerBackPic(u16 backPicId, u8 bank);
void nullsub_25(u8 arg0);
void FreeTrainerFrontPicPalette(u16 frontPicId);
void sub_805DFFC(void);
bool8 mplay_80342A4(u8 battlerId);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId);
void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId);
void DecompressTrainerBackPalette(u16 a1, u8 a2);
void nullsub_16(u8 a1);
void FreeTrainerFrontPicPaletteAndTile(u16 frontPicId);
bool8 BattleLoadAllHealthBoxesGfx(u8 state);
void LoadBattleBarGfx(u8 arg0);
bool8 BattleInitAllSprites(u8 *state1, u8 *bank);
bool8 BattleInitAllSprites(u8 *state, u8 *battlerId);
void ClearSpritesHealthboxAnimData(void);
void CopyAllBattleSpritesInvisibilities(void);
void CopyBattleSpriteInvisibility(u8 bank);
void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform);
void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite);
void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId);
void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
void ClearBehindSubstituteBit(u8 bank);
void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank);
void CopyBattleSpriteInvisibility(u8 battlerId);
void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform);
void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite);
void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId);
void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move);
void ClearBehindSubstituteBit(u8 battlerId);
void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId);
void BattleStopLowHpSound(void);
u8 GetMonHPBarLevel(struct Pokemon *mon);
void sub_805EAE8(void);
void sub_805EB9C(u8 affineMode);
void HandleBattleLowHpMusicChange(void);
void sub_8035450(u8 affineMode);
void LoadAndCreateEnemyShadowSprites(void);
void SpriteCB_SetInvisible(struct Sprite *sprite);
void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species);
void EnemyShadowCallbackToSetInvisible(u8 bank);
void sub_805EF14(void);
void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute);
void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species);
void HideBattlerShadowSprite(u8 battlerId);
void sub_80357C8(void);
void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
void AllocateMonSpritesGfx(void);
void FreeMonSpritesGfx(void);
bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon);
#endif // GUARD_BATTLE_GFX_SFX_UTIL
#endif // GUARD_BATTLE_GFX_SFX_UTIL_H
include/battle_interface.h
+12 -2
View File
@@ -30,12 +30,18 @@ enum
#define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701
#define TAG_HEALTHBOX_OPPONENT2_TILE 0xD702
#define TAG_HEALTHBAR_PLAYER1_TILE 0xD704
#define TAG_HEALTHBAR_OPPONENT1_TILE 0xD705
#define TAG_HEALTHBAR_PLAYER2_TILE 0xD706
#define TAG_HEALTHBAR_OPPONENT2_TILE 0xD707
#define TAG_HEALTHBOX_SAFARI_TILE 0xD70B
#define TAG_STATUS_SUMMARY_BAR_TILE 0xD70C
#define TAG_STATUS_SUMMARY_BALLS_TILE 0xD714
#define TAG_HEALTHBOX_PAL 0xD6FF
#define TAG_HEALTHBAR_PAL 0xD704
#define TAG_STATUS_SUMMARY_BAR_PAL 0xD710
#define TAG_STATUS_SUMMARY_BALLS_PAL 0xD712
@@ -55,7 +61,8 @@ enum
HEALTHBOX_SAFARI_BALLS_TEXT
};
u8 CreateBankHealthboxSprites(u8 bank);
void Task_HidePartyStatusSummary(u8 taskId);
u8 CreateBattlerHealthboxSprites(u8 bank);
u8 CreateSafariPlayerHealthboxSprites(void);
void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
@@ -63,7 +70,7 @@ void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
void DestoryHealthboxSprite(u8 healthboxSpriteId);
void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly);
void UpdateOamPriorityInAllHealthboxes(u8 priority);
void SetBankHealthboxSpritePos(u8 bank);
void InitBattlerHealthboxCoords(u8 bank);
void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent);
void SwapHpBarsWithHpText(void);
u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart);
@@ -72,5 +79,8 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem
s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3);
u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
u8 GetHPBarLevel(s16 hp, s16 maxhp);
void sub_80496C0(u8 spriteId, struct Pokemon *mon);
void sub_804981C(u8 spriteId, u8);
s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 arg3);
#endif // GUARD_BATTLE_INTERFACE_H
include/battle_2.h → include/battle_main.h
+57 -14
View File
@@ -1,8 +1,47 @@
#ifndef GUARD_BATTLE_2_H
#define GUARD_BATTLE_2_H
#ifndef GUARD_BATTLE_MAIN_H
#define GUARD_BATTLE_MAIN_H
#include "global.h"
#include "sprite.h"
struct TrainerMoney
{
u8 classId;
u8 value;
};
struct UnknownPokemonStruct4
{
/*0x00*/ u16 species;
/*0x02*/ u16 heldItem;
/*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x0F*/ u8 level;
/*0x10*/ u16 hp;
/*0x12*/ u16 maxhp;
/*0x14*/ u32 status;
/*0x18*/ u32 personality;
/*0x1C*/ u8 gender;
/*0x1D*/ u8 language;
};
#define TYPE_NAME_LENGTH 6
#define ABILITY_NAME_LENGTH 12
// defines for the u8 array gTypeEffectiveness
#define TYPE_EFFECT_ATK_TYPE(i)((gTypeEffectiveness[i + 0]))
#define TYPE_EFFECT_DEF_TYPE(i)((gTypeEffectiveness[i + 1]))
#define TYPE_EFFECT_MULTIPLIER(i)((gTypeEffectiveness[i + 2]))
// defines for the gTypeEffectiveness multipliers
#define TYPE_MUL_NO_EFFECT 0
#define TYPE_MUL_NOT_EFFECTIVE 5
#define TYPE_MUL_NORMAL 10
#define TYPE_MUL_SUPER_EFFECTIVE 20
// special type table Ids
#define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF
// defines for the 'DoBounceEffect' function
#define BOUNCE_MON 0x0
#define BOUNCE_HEALTHBOX 0x1
void CB2_InitBattle(void);
void BattleMainCB2(void);
@@ -10,27 +49,25 @@ void CB2_QuitRecordedBattle(void);
void sub_8038528(struct Sprite* sprite);
void sub_8038A04(void); // unused
void VBlankCB_Battle(void);
void nullsub_17(void);
void sub_8038B74(struct Sprite *sprite);
void sub_8038D64(void);
void sub_8011A1C(void);
u32 sub_80391E0(u8 arrayId, u8 caseId);
u32 sub_80397C4(u32 setId, u32 tableId);
void oac_poke_opponent(struct Sprite *sprite);
void SpriteCallbackDummy_2(struct Sprite *sprite);
void sub_8039934(struct Sprite *sprite);
void sub_8039AD8(struct Sprite *sprite);
void sub_8039B2C(struct Sprite *sprite);
void sub_8012098(struct Sprite *sprite);
void sub_8012044(struct Sprite *sprite);
void sub_8039B58(struct Sprite *sprite);
void sub_8039BB4(struct Sprite *sprite);
void sub_80105DC(struct Sprite *sprite);
void sub_8039C00(struct Sprite *sprite);
void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d);
void dp11b_obj_free(u8 bank, bool8 b);
void sub_8012110(struct Sprite *sprite);
void DoBounceEffect(u8 bank, u8 b, s8 c, s8 d);
void EndBounceEffect(u8 bank, bool8 b);
void sub_8039E44(struct Sprite *sprite);
void sub_8039E60(struct Sprite *sprite);
void sub_8039E84(struct Sprite *sprite);
void sub_8039E9C(struct Sprite *sprite);
void nullsub_20(void);
void BeginBattleIntro(void);
void SwitchInClearSetData(void);
void FaintClearSetData(void);
@@ -38,7 +75,7 @@ void sub_803B3AC(void); // unused
void sub_803B598(void); // unused
void BattleTurnPassed(void);
u8 IsRunningFromBattleImpossible(void);
void sub_803BDA0(u8 bank);
void sub_8013F6C(u8 battlerId);
void SwapTurnOrder(u8 id1, u8 id2);
u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
void RunBattleScriptCommands_PopCallbacksStack(void);
@@ -46,6 +83,9 @@ void RunBattleScriptCommands(void);
bool8 TryRunFromBattle(u8 bank);
void sub_800FD9C(void);
void sub_80120C4(struct Sprite *);
void sub_8012100(struct Sprite *);
void nullsub_12(void);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
extern const u8 gStatusConditionString_PoisonJpn[8];
extern const u8 gStatusConditionString_SleepJpn[8];
@@ -57,4 +97,7 @@ extern const u8 gStatusConditionString_LoveJpn[8];
extern const u8 * const gStatusConditionStringsTable[7][2];
#endif // GUARD_BATTLE_2_H
extern const u8 gTypeEffectiveness[336];
extern const struct TrainerMoney gTrainerMoneyTable[];
#endif // GUARD_BATTLE_MAIN_H
include/battle_message.h
+11 -7
View File
@@ -35,11 +35,11 @@
#define B_TXT_EFF_ABILITY 0x1B
#define B_TXT_TRAINER1_CLASS 0x1C
#define B_TXT_TRAINER1_NAME 0x1D
#define B_TXT_1E 0x1E // trainer name for a link player
#define B_TXT_1F 0x1F // trainer name for a link player
#define B_TXT_20 0x20 // trainer name for a link player
#define B_TXT_21 0x21 // trainer name for a link player
#define B_TXT_22 0x22 // trainer name for a link player
#define B_TXT_LINK_PLAYER_NAME 0x1E
#define B_TXT_LINK_PARTNER_NAME 0x1F
#define B_TXT_LINK_OPPONENT1_NAME 0x20
#define B_TXT_LINK_OPPONENT2_NAME 0x21
#define B_TXT_LINK_SCR_TRAINER_NAME 0x22
#define B_TXT_PLAYER_NAME 0x23
#define B_TXT_TRAINER1_LOSE_TEXT 0x24
#define B_TXT_TRAINER1_WIN_TEXT 0x25
@@ -196,7 +196,7 @@
textVar[4] = B_BUFF_EOS; \
}
struct StringInfoBattle
struct BattleMsgData
{
u16 currentMove;
u16 originallyUsedMove;
@@ -205,7 +205,7 @@ struct StringInfoBattle
u8 scrActive;
u8 unk1605E;
u8 hpScale;
u8 StringBank;
u8 itemEffectBattler;
u8 moveType;
u8 abilities[4];
u8 textBuffs[3][0x10];
@@ -217,6 +217,10 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
void BattlePutTextOnWindow(const u8* text, u8 arg1);
bool8 sub_80D89B0(u16);
extern struct BattleMsgData *gBattleMsgDataPtr;
#define TEXT_BUFF_ARRAY_COUNT 16
include/battle_script_commands.h
+9 -26
View File
@@ -14,10 +14,6 @@
#define CMP_COMMON_BITS 0x4
#define CMP_NO_COMMON_BITS 0x5
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define ATK48_STAT_NEGATIVE 0x1
#define ATK48_STAT_BY_TWO 0x2
#define ATK48_BIT_x4 0x4
@@ -25,19 +21,6 @@
#define ATK4F_DONT_CHECK_STATUSES 0x80
#define VARIOUS_CANCEL_MULTI_TURN_MOVES 0
#define VARIOUS_SET_MAGIC_COAT_TARGET 1
#define VARIOUS_IS_RUNNING_IMPOSSIBLE 2
#define VARIOUS_GET_MOVE_TARGET 3
#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5
#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6
#define VARIOUS_EMIT_YESNOBOX 13
#define VARIOUS_WAIT_CRY 18
#define VARIOUS_RETURN_OPPONENT_MON1 19
#define VARIOUS_RETURN_OPPONENT_MON2 20
#define VARIOUS_SET_TELEPORT_OUTCOME 25
#define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC 26
#define ATK80_DMG_CHANGE_SIGN 0
#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP 1
#define ATK80_DMG_DOUBLED 2
@@ -51,18 +34,18 @@
#define WINDOW_CLEAR 0x1
#define WINDOW_x80 0x80
void AI_CalcDmg(u8 bankAtk, u8 bankDef);
u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
u8 BankGetTurnOrder(u8 bank);
void SetMoveEffect(bool8 primary, u8 certain);
void BattleDestroyYesNoCursorAt(u8 cursorPosition);
void BattleCreateYesNoCursorAt(u8 cursorPosition);
void BufferMoveToLearnIntoBattleTextBuff2(void);
bool8 UproarWakeUpCheck(u8 battlerId);
u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
u8 TypeCalc(u16 move, u8 attacker, u8 defender);
void AI_CalcDmg(u8 attacker, u8 defender);
bool32 IsMonGettingExpSentOut(void);
void BattleCreateYesNoCursorAt(void);
void BattleDestroyYesNoCursorAt(void);
void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
bool8 UproarWakeUpCheck(u8 bank);
u8 GetBattlerTurnOrderNum(u8 battlerId);
void BufferMoveToLearnIntoBattleTextBuff2(void);
extern void (* const gBattleScriptingCommandsTable[])(void);
extern const u8 gUnknown_0831C494[][4];
#endif // GUARD_BATTLE_SCRIPT_COMMANDS_H
include/battle_scripts.h
+14 -75
View File
@@ -28,16 +28,8 @@ extern const u8 BattleScript_LocalBattleLost[];
extern const u8 BattleScript_LocalBattleLostPrintWhiteOut[];
extern const u8 BattleScript_LocalBattleLostEnd[];
extern const u8 BattleScript_CheckDomeDrew[];
extern const u8 BattleScript_82DAA0B[];
extern const u8 BattleScript_82DAA31[];
extern const u8 BattleScript_LinkBattleWonOrLost[];
extern const u8 BattleScript_82DAA5C[];
extern const u8 BattleScript_82DAA83[];
extern const u8 BattleScript_FrontierTrainerBattleWon[];
extern const u8 BattleScript_82DAAAB[];
extern const u8 BattleScript_82DAAAE[];
extern const u8 BattleScript_82DAACB[];
extern const u8 BattleScript_82DAADA[];
extern const u8 BattleScript_SmokeBallEscape[];
extern const u8 BattleScript_RanAwayUsingMonAbility[];
extern const u8 BattleScript_GotAwaySafely[];
@@ -47,11 +39,6 @@ extern const u8 BattleScript_PrintFailedToRunString[];
extern const u8 BattleScript_PrintCantEscapeFromBattle[];
extern const u8 BattleScript_PrintFullBox[];
extern const u8 BattleScript_ActionSwitch[];
extern const u8 BattleScript_82DAB35[];
extern const u8 BattleScript_82DAB37[];
extern const u8 BattleScript_82DAB44[];
extern const u8 BattleScript_82DAB77[];
extern const u8 BattleScript_82DABB8[];
extern const u8 BattleScript_Pausex20[];
extern const u8 BattleScript_LevelUp[];
extern const u8 BattleScript_RainContinuesOrEnds[];
@@ -64,13 +51,10 @@ extern const u8 BattleScript_SideStatusWoreOff[];
extern const u8 BattleScript_SafeguardProtected[];
extern const u8 BattleScript_SafeguardEnds[];
extern const u8 BattleScript_LeechSeedTurnDrain[];
extern const u8 BattleScript_82DAD47[];
extern const u8 BattleScript_82DAD4D[];
extern const u8 BattleScript_BideStoringEnergy[];
extern const u8 BattleScript_BideAttack[];
extern const u8 BattleScript_BideNoEnergyToAttack[];
extern const u8 BattleScript_SuccessForceOut[];
extern const u8 BattleScript_82DADF1[];
extern const u8 BattleScript_MistProtected[];
extern const u8 BattleScript_RageIsBuilding[];
extern const u8 BattleScript_MoveUsedIsDisabled[];
@@ -81,32 +65,16 @@ extern const u8 BattleScript_SelectingUnusableMoveInPalace[];
extern const u8 BattleScript_EncoredNoMore[];
extern const u8 BattleScript_DestinyBondTakesLife[];
extern const u8 BattleScript_SpikesOnAttacker[];
extern const u8 BattleScript_82DAE7A[];
extern const u8 BattleScript_SpikesOnTarget[];
extern const u8 BattleScript_82DAEB1[];
extern const u8 BattleScript_SpikesOngBank1[];
extern const u8 BattleScript_82DAEE8[];
extern const u8 BattleScript_82DAEFE[];
extern const u8 BattleScript_PerishSongTakesLife[];
extern const u8 BattleScript_PerishSongCountGoesDown[];
extern const u8 BattleScript_AllStatsUp[];
extern const u8 BattleScript_82DAF54[];
extern const u8 BattleScript_82DAF72[];
extern const u8 BattleScript_82DAF86[];
extern const u8 BattleScript_82DAF9A[];
extern const u8 BattleScript_82DAFAE[];
extern const u8 BattleScript_82DAFC2[];
extern const u8 BattleScript_RapidSpinAway[];
extern const u8 BattleScript_WrapFree[];
extern const u8 BattleScript_LeechSeedFree[];
extern const u8 BattleScript_SpikesFree[];
extern const u8 BattleScript_MonTookFutureAttack[];
extern const u8 BattleScript_82DB001[];
extern const u8 BattleScript_82DB008[];
extern const u8 BattleScript_82DB020[];
extern const u8 BattleScript_82DB027[];
extern const u8 BattleScript_82DB03F[];
extern const u8 BattleScript_82DB058[];
extern const u8 BattleScript_NoMovesLeft[];
extern const u8 BattleScript_SelectingMoveWithNoPP[];
extern const u8 BattleScript_NoPPForMove[];
@@ -119,27 +87,21 @@ extern const u8 BattleScript_SelectingNotAllowedMoveTauntInPalace[];
extern const u8 BattleScript_WishComesTrue[];
extern const u8 BattleScript_IngrainTurnHeal[];
extern const u8 BattleScript_AtkDefDown[];
extern const u8 BattleScript_82DB144[];
extern const u8 BattleScript_82DB167[];
extern const u8 BattleScript_KnockedOff[];
extern const u8 BattleScript_MoveUsedIsImprisoned[];
extern const u8 BattleScript_SelectingImprisionedMove[];
extern const u8 BattleScript_SelectingImprisionedMoveInPalace[];
extern const u8 BattleScript_SelectingImprisonedMove[];
extern const u8 BattleScript_SelectingImprisonedMoveInPalace[];
extern const u8 BattleScript_GrudgeTakesPp[];
extern const u8 BattleScript_MagicCoatBounce[];
extern const u8 BattleScript_SnatchedMove[];
extern const u8 BattleScript_EnduredMsg[];
extern const u8 BattleScript_OneHitKOMsg[];
extern const u8 BattleScript_SAtkDown2[];
extern const u8 BattleScript_82DB1FE[];
extern const u8 BattleScript_FocusPunchSetUp[];
extern const u8 BattleScript_MoveUsedIsAsleep[];
extern const u8 BattleScript_MoveUsedWokeUp[];
extern const u8 BattleScript_MonWokeUpInUproar[];
extern const u8 BattleScript_PoisonTurnDmg[];
extern const u8 BattleScript_82DB243[];
extern const u8 BattleScript_82DB245[];
extern const u8 BattleScript_82DB25E[];
extern const u8 BattleScript_BurnTurnDmg[];
extern const u8 BattleScript_MoveUsedIsFrozen[];
extern const u8 BattleScript_MoveUsedUnfroze[];
@@ -149,19 +111,17 @@ extern const u8 BattleScript_MoveUsedFlinched[];
extern const u8 BattleScript_PrintUproarOverTurns[];
extern const u8 BattleScript_ThrashConfuses[];
extern const u8 BattleScript_MoveUsedIsConfused[];
extern const u8 BattleScript_82DB2D4[];
extern const u8 BattleScript_82DB2FF[];
extern const u8 BattleScript_MoveUsedIsConfusedNoMore[];
extern const u8 BattleScript_PrintPayDayMoneyString[];
extern const u8 BattleScript_WrapTurnDmg[];
extern const u8 BattleScript_WrapEnds[];
extern const u8 BattleScript_MoveUsedIsInLove[];
extern const u8 BattleScript_MoveUsedIsInLoveCantAttack[];
extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[];
extern const u8 BattleScript_NightmareTurnDmg[];
extern const u8 BattleScript_CurseTurnDmg[];
extern const u8 BattleScript_TargetPRLZHeal[];
extern const u8 BattleScript_MoveEffectSleep[];
extern const u8 BattleScript_82DB374[];
extern const u8 BattleScript_YawnMakesAsleep[];
extern const u8 BattleScript_MoveEffectPoison[];
extern const u8 BattleScript_MoveEffectBurn[];
@@ -185,14 +145,6 @@ extern const u8 BattleScript_ShedSkinActivates[];
extern const u8 BattleScript_WeatherFormChanges[];
extern const u8 BattleScript_WeatherFormChangesLoop[];
extern const u8 BattleScript_CastformChange[];
extern const u8 BattleScript_82DB4AF[];
extern const u8 BattleScript_82DB4B8[];
extern const u8 BattleScript_82DB4BE[];
extern const u8 BattleScript_82DB4C1[];
extern const u8 BattleScript_82DB4CD[];
extern const u8 BattleScript_82DB510[];
extern const u8 BattleScript_82DB51B[];
extern const u8 BattleScript_82DB51C[];
extern const u8 BattleScript_DroughtActivates[];
extern const u8 BattleScript_TookAttack[];
extern const u8 BattleScript_SturdyPreventsOHKO[];
@@ -220,12 +172,9 @@ extern const u8 BattleScript_ApplySecondaryEffect[];
extern const u8 BattleScript_SynchronizeActivates[];
extern const u8 BattleScript_NoItemSteal[];
extern const u8 BattleScript_AbilityCuredStatus[];
extern const u8 BattleScript_82DB695[];
extern const u8 BattleScript_IgnoresAndUsesRandomMove[];
extern const u8 BattleScript_MoveUsedLoafingAround[];
extern const u8 BattleScript_82DB6C7[];
extern const u8 BattleScript_IgnoresAndFallsAsleep[];
extern const u8 BattleScript_82DB6F0[];
extern const u8 BattleScript_SubstituteFade[];
extern const u8 BattleScript_BerryCurePrlzEnd2[];
extern const u8 BattleScript_BerryCureParRet[];
@@ -251,18 +200,8 @@ extern const u8 BattleScript_SelectingNotAllowedMoveChoiceItem[];
extern const u8 BattleScript_HangedOnMsg[];
extern const u8 BattleScript_BerryConfuseHealEnd2[];
extern const u8 BattleScript_BerryStatRaiseEnd2[];
extern const u8 BattleScript_82DB85B[];
extern const u8 BattleScript_BerryFocusEnergyEnd2[];
extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[];
extern const u8 BattleScript_82DB87D[];
extern const u8 BattleScript_82DB881[];
extern const u8 BattleScript_82DB887[];
extern const u8 BattleScript_82DB89D[];
extern const u8 BattleScript_82DB8BE[];
extern const u8 BattleScript_82DB8E0[];
extern const u8 BattleScript_82DB8F3[];
extern const u8 BattleScript_82DB973[];
extern const u8 BattleScript_82DB992[];
extern const u8 BattleScript_AskIfWantsToForfeitMatch[];
extern const u8 BattleScript_PrintPlayerForfeited[];
extern const u8 BattleScript_PrintPlayerForfeitedLinkBattle[];
@@ -270,23 +209,23 @@ extern const u8 BattleScript_BallThrow[];
extern const u8 BattleScript_BallThrowByWally[];
extern const u8 BattleScript_SafariBallThrow[];
extern const u8 BattleScript_SuccessBallThrow[];
extern const u8 BattleScript_82DBD92[];
extern const u8 BattleScript_82DBDA5[];
extern const u8 BattleScript_82DBDC2[];
extern const u8 BattleScript_82DBDC3[];
extern const u8 BattleScript_WallyBallThrow[];
extern const u8 BattleScript_ShakeBallThrow[];
extern const u8 BattleScript_82DBE01[];
extern const u8 BattleScript_TrainerBallBlock[];
extern const u8 BattleScript_82DBE12[];
extern const u8 BattleScript_82DBE1C[];
extern const u8 BattleScript_82DBE4B[];
extern const u8 BattleScript_82DBE6F[];
extern const u8 BattleScript_82DBE91[];
extern const u8 BattleScript_RunByUsingItem[];
extern const u8 BattleScript_ActionWatchesCarefully[];
extern const u8 BattleScript_ActionGetNear[];
extern const u8 BattleScript_ActionThrowPokeblock[];
extern const u8 BattleScript_82DBEE3[];
extern const u8 gUnknown_81D9192[];
extern const u8 gUnknown_81D9180[];
extern const u8 BattleScript_IntimidateActivates[];
extern const u8 BattleScript_IntimidateActivatesEnd3[];
extern const u8 BattleScript_IgnoresWhileAsleep[];
extern const u8 BattleScript_IgnoresAndHitsItself[];
extern const u8 BattleScript_MoveEffectRecoil[];
extern const u8 BattleScript_FlushMessageBox[];
extern const u8 BattleScript_SpikesOnFaintedBattler[];
extern const u8 BattleScript_GhostBallDodge[];
extern const u8 gUnknown_81D9A88[];
#endif // GUARD_BATTLE_SCRIPTS_H
include/battle_tower.h
+2
View File
@@ -6,5 +6,7 @@
u16 sub_8164FCC(u8, u8);
void sub_80E7524(u32 *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
#endif //GUARD_BATTLE_TOWER_H
include/battle_util.h
+49 -49
View File
@@ -8,35 +8,37 @@
#define MOVE_LIMITATION_DISABLED (1 << 2)
#define MOVE_LIMITATION_TORMENTED (1 << 3)
#define MOVE_LIMITATION_TAUNT (1 << 4)
#define MOVE_LIMITATION_IMPRISION (1 << 5)
#define MOVE_LIMITATION_IMPRISON (1 << 5)
#define ABILITYEFFECT_ON_SWITCHIN 0x0
#define ABILITYEFFECT_ENDTURN 0x1
#define ABILITYEFFECT_MOVES_BLOCK 0x2
#define ABILITYEFFECT_ABSORBING 0x3
#define ABILITYEFFECT_CONTACT 0x4
#define ABILITYEFFECT_IMMUNITY 0x5
#define ABILITYEFFECT_FORECAST 0x6
#define ABILITYEFFECT_SYNCHRONIZE 0x7
#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8
#define ABILITYEFFECT_INTIMIDATE1 0x9
#define ABILITYEFFECT_INTIMIDATE2 0xA
#define ABILITYEFFECT_TRACE 0xB
#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC
#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD
#define ABILITYEFFECT_FIELD_SPORT 0xE
#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF
#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10
#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11
#define ABILITYEFFECT_COUNT_ON_FIELD 0x12
#define ABILITYEFFECT_CHECK_ON_FIELD 0x13
#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF
#define ABILITYEFFECT_ON_SWITCHIN 0x0
#define ABILITYEFFECT_ENDTURN 0x1
#define ABILITYEFFECT_MOVES_BLOCK 0x2
#define ABILITYEFFECT_ABSORBING 0x3
#define ABILITYEFFECT_MOVE_END 0x4
#define ABILITYEFFECT_IMMUNITY 0x5
#define ABILITYEFFECT_FORECAST 0x6
#define ABILITYEFFECT_SYNCHRONIZE 0x7
#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8
#define ABILITYEFFECT_INTIMIDATE1 0x9
#define ABILITYEFFECT_INTIMIDATE2 0xA
#define ABILITYEFFECT_TRACE 0xB
#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC
#define ABILITYEFFECT_CHECK_BATTLER_SIDE 0xD
#define ABILITYEFFECT_FIELD_SPORT 0xE
#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER 0xF // TODO: Is it correct?
#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10
#define ABILITYEFFECT_COUNT_BATTLER_SIDE 0x11
#define ABILITYEFFECT_COUNT_ON_FIELD 0x12
#define ABILITYEFFECT_CHECK_ON_FIELD 0x13
#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF
#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0))
#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0))
#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0))
#define ITEMEFFECT_ON_SWITCH_IN 0x0
#define ITEMEFFECT_MOVE_END 0x3
#define ITEMEFFECT_KINGSROCK_SHELLBELL 0x4
#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)))
@@ -50,43 +52,41 @@
#define BS_GET_PLAYER2 13
#define BS_GET_OPPONENT2 14
u8 GetBattleBank(u8 caseId);
void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move);
void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
void PressurePPLoseOnUsingImprision(u8 bankAtk);
void MarkAllBufferBanksForExecution(void); // unused
void MarkBufferBankForExecution(u8 bank);
void sub_803F850(u8 arg0);
void CancelMultiTurnMoves(u8 bank);
bool8 WasUnableToUseMove(u8 bank);
void PrepareStringBattle(u16 stringId, u8 bank);
u8 GetBattlerForBattleScript(u8 caseId);
void PressurePPLose(u8 target, u8 attacker, u16 move);
void PressurePPLoseOnUsingImprison(u8 attacker);
void PressurePPLoseOnUsingPerishSong(u8 attacker);
void MarkAllBattlersForControllerExec(void);
void MarkBattlerForControllerExec(u8 battlerId);
void sub_8017298(u8 arg0);
void CancelMultiTurnMoves(u8 battler);
bool8 WasUnableToUseMove(u8 battler);
void PrepareStringBattle(u16 stringId, u8 battler);
void ResetSentPokesToOpponentValue(void);
void sub_803F9EC(u8 bank);
void sub_803FA70(u8 bank);
void BattleScriptPush(const u8* bsPtr);
void sub_8017434(u8 battler);
void sub_80174B8(u8 battler);
void BattleScriptPush(const u8 *bsPtr);
void BattleScriptPushCursor(void);
void BattleScriptPop(void);
u8 TrySetCantSelectMoveBattleScript(void);
u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check);
bool8 AreAllMovesUnusable(void);
u8 GetImprisonedMovesCount(u8 bank, u16 move);
u8 UpdateTurnCounters(void);
u8 TurnBasedEffects(void);
u8 GetImprisonedMovesCount(u8 battlerId, u16 move);
u8 DoFieldEndTurnEffects(void);
u8 DoBattlerEndTurnEffects(void);
bool8 HandleWishPerishSongOnTurnEnd(void);
bool8 HandleFaintedMonActions(void);
void TryClearRageStatuses(void);
u8 AtkCanceller_UnableToUseMove(void);
bool8 sub_80423F4(u8 bank, u8 r1, u8 r2);
u8 CastformDataTypeChange(u8 bank);
u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
void BattleScriptExecute(const u8* BS_ptr);
void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
void ClearFuryCutterDestinyBondGrudge(u8 bank);
bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2);
u8 CastformDataTypeChange(u8 battler);
u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveArg);
void BattleScriptExecute(const u8 *BS_ptr);
void BattleScriptPushCursorAndCallback(const u8 *BS_ptr);
u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
void HandleAction_RunBattleScript(void);
u8 GetMoveTarget(u16 move, u8 useMoveTarget);
u8 GetMoveTarget(u16 move, u8 setTarget);
u8 IsMonDisobedient(void);
void MarkBufferBankForExecution(u8 battlerId);
void sub_80174B8(u8 battlerId);
#endif // GUARD_BATTLE_UTIL_H
include/battle_util2.h
-2
View File
@@ -6,7 +6,5 @@
void AllocateBattleResources(void);
void FreeBattleResources(void);
void AdjustFriendshipOnBattleFaint(u8 bank);
void sub_80571DC(u8 bank, u8 arg1);
u32 sub_805725C(u8 bank);
#endif // GUARD_BATTLE_UTIL_H
include/cable_club.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef GUARD_CABLE_CLUB_H
#define GUARD_CABLE_CLUB_H
#include "task.h"
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
void sub_8081A90(u8 taskId);
#endif //GUARD_CABLE_CLUB_H
include/constants/battle.h
+19 -7
View File
@@ -53,7 +53,7 @@
#define BATTLE_TYPE_MULTI 0x0040
#define BATTLE_TYPE_SAFARI 0x0080
#define BATTLE_TYPE_BATTLE_TOWER 0x0100
#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200
#define BATTLE_TYPE_OLDMAN_TUTORIAL 0x0200
#define BATTLE_TYPE_ROAMER 0x0400
#define BATTLE_TYPE_EREADER_TRAINER 0x0800
#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000
@@ -63,7 +63,7 @@
#define BATTLE_TYPE_POKEDUDE 0x10000
#define BATTLE_TYPE_PALACE 0x20000
#define BATTLE_TYPE_ARENA 0x40000
#define BATTLE_TYPE_FACTORY 0x80000
#define BATTLE_TYPE_TRAINER_TOWER 0x80000
#define BATTLE_TYPE_PIKE 0x100000
#define BATTLE_TYPE_PYRAMID 0x200000
#define BATTLE_TYPE_INGAME_PARTNER 0x400000
@@ -174,7 +174,7 @@
#define HITMARKER_GRUDGE 0x01000000
#define HITMARKER_OBEYS 0x02000000
#define HITMARKER_x4000000 0x04000000
#define HITMARKER_x8000000 0x08000000
#define HITMARKER_CHARGING 0x08000000
#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
#define HITMARKER_UNK(battler) (0x10000000 << battler)
@@ -207,12 +207,12 @@
#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
#define WEATHER_SUNNY_TEMPORARY (1 << 5)
#define WEATHER_SUNNY_PERMANENT (1 << 6)
#define WEATHER_SUNNY_ANY (WEATHER_SUNNY_TEMPORARY | WEATHER_SUNNY_PERMANENT)
#define WEATHER_SUN_TEMPORARY (1 << 5)
#define WEATHER_SUN_PERMANENT (1 << 6)
#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY (WEATHER_HAIL)
#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUNNY_ANY | WEATHER_HAIL_ANY)
#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
// Move Effects
#define MOVE_EFFECT_SLEEP 0x1
@@ -281,4 +281,16 @@
#define MOVE_EFFECT_AFFECTS_USER 0x40
#define MOVE_EFFECT_CERTAIN 0x80
// Battle terrain defines for gBattleTerrain.
#define BATTLE_TERRAIN_GRASS 0
#define BATTLE_TERRAIN_LONG_GRASS 1
#define BATTLE_TERRAIN_SAND 2
#define BATTLE_TERRAIN_UNDERWATER 3
#define BATTLE_TERRAIN_WATER 4
#define BATTLE_TERRAIN_POND 5
#define BATTLE_TERRAIN_MOUNTAIN 6
#define BATTLE_TERRAIN_CAVE 7
#define BATTLE_TERRAIN_BUILDING 8
#define BATTLE_TERRAIN_PLAIN 9
#endif // GUARD_CONSTANTS_BATTLE_H
include/constants/battle_anim.h
+443
View File
@@ -0,0 +1,443 @@
#ifndef GUARD_CONSTANTS_BATTLE_ANIM_H
#define GUARD_CONSTANTS_BATTLE_ANIM_H
// Sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
#define GET_TRUE_SPRITE_INDEX(i) ((i - ANIM_SPRITES_START))
// Particle ids.
#define ANIM_SPRITES_START 10000
#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0)
#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1)
#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2)
#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3)
#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4)
#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5)
#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6)
#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7)
#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused
#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9)
#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10)
#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11)
#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused
#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13)
#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14)
#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15)
#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16)
#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17)
#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18)
#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused
#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20)
#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21)
#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22)
#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused
#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused
#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused
#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused
#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27)
#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused
#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29)
#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30)
#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31)
#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32)
#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33)
#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused
#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35)
#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused
#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37)
#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused
#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39)
#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused
#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused
#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused
#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43)
#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused
#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused
#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused
#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused
#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48)
#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49)
#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50)
#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51)
#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused
#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53)
#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused
#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused
#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56)
#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused
#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58)
#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused
#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused
#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused
#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused
#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63)
#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64)
#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65)
#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused
#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67)
#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68)
#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused
#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70)
#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71)
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72)
#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73)
#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74)
#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75)
#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused
#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused
#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused
#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79)
#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused
#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused
#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused
#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused
#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused
#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused
#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86)
#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87)
#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused
#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused
#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused
#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused
#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused
#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93)
#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused
#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused
#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused
#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97)
#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused
#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99)
#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100)
#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused
#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused
#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused
#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused
#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused
#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused
#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused
#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused
#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused
#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused
#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused
#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused
#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused
#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused
#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115)
#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused
#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused
#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused
#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused
#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused
#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused
#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused
#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused
#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused
#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused
#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused
#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused
#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused
#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused
#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused
#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused
#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused
#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused
#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused
#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135)
#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136)
#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137)
#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138)
#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139)
#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140)
#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141)
#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142)
#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143)
#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144)
#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145)
#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146)
#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147)
#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148)
#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149)
#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150)
#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151)
#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152)
#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153)
#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154)
#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155)
#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156)
#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157)
#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158)
#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159)
#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160)
#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161)
#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162)
#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163)
#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164)
#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165)
#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166)
#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167)
#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168)
#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169)
#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170)
#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171)
#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172)
#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173)
#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174)
#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175)
#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176)
#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177)
#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178)
#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179)
#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180)
#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181)
#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused
#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183)
#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184)
#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185)
#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186)
#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187)
#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188)
#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189)
#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190)
#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191)
#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192)
#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193)
#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194)
#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195)
#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196)
#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197)
#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198)
#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199)
#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200)
#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201)
#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202)
#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203)
#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused
#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205)
#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206)
#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207)
#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208)
#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209)
#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210)
#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211)
#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212)
#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213)
#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214)
#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215)
#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216)
#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217)
#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218)
#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219)
#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220)
#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221)
#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222)
#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223)
#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224)
#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225)
#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226)
#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231)
#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232)
#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233)
#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234)
#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235)
#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236)
#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237)
#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238)
#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239)
#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240)
#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241)
#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242)
#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243)
#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244)
#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245)
#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246)
#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247)
#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248)
#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249)
#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250)
#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251)
#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252)
#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253)
#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254)
#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255)
#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256)
#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257)
#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258)
#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259)
#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260)
#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261)
#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262)
#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263)
#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264)
#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265)
#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266)
#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267)
#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268)
#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269)
#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270)
#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272)
#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273)
#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused
#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused
#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused
#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277)
#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278)
#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused
#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280)
#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281)
#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282)
#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283)
#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284)
#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285)
#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286)
#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287)
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
// battlers
#define ANIM_ATTACKER 0
#define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3
// stereo panning constants [0-255]
//
// 0
// . .
// . .
// 192 . . 63
// . .
// . .
// . .
// 127
//
#define SOUND_PAN_ATTACKER -64
#define SOUND_PAN_TARGET 63
// move background ids
#define BG_DARK_ 0 // the same as BG_DARK but is unused
#define BG_DARK 1
#define BG_GHOST 2
#define BG_PSYCHIC 3
#define BG_IMPACT_OPPONENT 4
#define BG_IMPACT_PLAYER 5
#define BG_IMPACT_CONTESTS 6
#define BG_DRILL 7
#define BG_DRILL_CONTESTS 8
#define BG_HIGHSPEED_OPPONENT 9
#define BG_HIGHSPEED_PLAYER 10
#define BG_THUNDER 11
#define BG_GUILLOTINE_OPPONENT 12
#define BG_GUILLOTINE_PLAYER 13
#define BG_GUILLOTINE_CONTESTS 14
#define BG_ICE 15
#define BG_COSMIC 16
#define BG_IN_AIR 17
#define BG_SKY 18
#define BG_SKY_CONTESTS 19
#define BG_AURORA 20
#define BG_FISSURE 21
#define BG_BUG_OPPONENT 22
#define BG_BUG_PLAYER 23
#define BG_SOLARBEAM_OPPONENT 24
#define BG_SOLARBEAM_PLAYER 25
#define BG_SOLARBEAM_CONTESTS 26
// table ids for general animations
#define B_ANIM_CASTFORM_CHANGE 0x0
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_POKEBLOCK_THROW 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9
#define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC
#define B_ANIM_HAIL_CONTINUES 0xD
#define B_ANIM_LEECH_SEED_DRAIN 0xE
#define B_ANIM_MON_HIT 0xF
#define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_FOCUS_PUNCH_SETUP 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
#define B_ANIM_x19 0x19
// special animations table
#define B_ANIM_LVL_UP 0x0
#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1
#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2
#define B_ANIM_BALL_THROW 0x3
#define B_ANIM_SAFARI_BALL_THROW 0x4
#define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist
// Most tasks return a value to gBattleAnimArgs[7].
#define ARG_RET_ID 0x7
// Trapping Wrap-like moves end turn animation.
#define TRAP_ANIM_BIND 0
#define TRAP_ANIM_WRAP 0
#define TRAP_ANIM_FIRE_SPIN 1
#define TRAP_ANIM_WHIRLPOOL 2
#define TRAP_ANIM_CLAMP 3
#define TRAP_ANIM_SAND_TOMB 4
// Weather defines for battle animation scripts.
#define ANIM_WEATHER_NONE 0
#define ANIM_WEATHER_SUN 1
#define ANIM_WEATHER_RAIN 2
#define ANIM_WEATHER_SANDSTORM 3
#define ANIM_WEATHER_HAIL 4
// Battle mon back animations.
#define BACK_ANIM_NONE 0x00
#define BACK_ANIM_H_SLIDE_QUICK 0x01
#define BACK_ANIM_H_SLIDE 0x02
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04
#define BACK_ANIM_SHRINK_GROW_1 0x05
#define BACK_ANIM_GROW_1 0x06
#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07
#define BACK_ANIM_HORIZONTAL_SHAKE 0x08
#define BACK_ANIM_VERTICAL_SHAKE 0x09
#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a
#define BACK_ANIM_VERTICAL_STRETCH 0x0b
#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c
#define BACK_ANIM_GROW_2 0x0d
#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e
#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11
#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12
#define BACK_ANIM_DIP_RIGHT_SIDE 0x13
#define BACK_ANIM_SHRINK_GROW_2 0x14
#define BACK_ANIM_JOLT_RIGHT 0x15
#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16
#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17
#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18
#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H
include/constants/battle_script_commands.h
+127
View File
@@ -0,0 +1,127 @@
#ifndef GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
#define GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
// Battle Scripting and BattleCommunication addresses
#define sPAINSPLIT_HP gBattleScripting
#define sBIDE_DMG gBattleScripting + 4
#define sMULTIHIT_STRING gBattleScripting + 8
#define sDMG_MULTIPLIER gBattleScripting + 0xE
#define sTWOTURN_STRINGID gBattleScripting + 0xF
#define sB_ANIM_ARG1 gBattleScripting + 0x10
#define sB_ANIM_ARG2 gBattleScripting + 0x11
#define sTRIPLE_KICK_POWER gBattleScripting + 0x12
#define sMOVEEND_STATE gBattleScripting + 0x14
#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15
#define sMULTIHIT_EFFECT gBattleScripting + 0x16
#define sBATTLER gBattleScripting + 0x17
#define sB_ANIM_TURN gBattleScripting + 0x18
#define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19
#define sSTATCHANGER gBattleScripting + 0x1A
#define sSTAT_ANIM_PLAYED gBattleScripting + 0x1B
#define sGIVEEXP_STATE gBattleScripting + 0x1C
#define sBATTLE_STYLE gBattleScripting + 0x1D
#define sLVLBOX_STATE gBattleScripting + 0x1E
#define sLEARNMOVE_STATE gBattleScripting + 0x1F
#define sFIELD_20 gBattleScripting + 0x20
#define sRESHOW_MAIN_STATE gBattleScripting + 0x21
#define sRESHOW_HELPER_STATE gBattleScripting + 0x22
#define sFIELD_23 gBattleScripting + 0x23
#define sWINDOWS_TYPE gBattleScripting + 0x24
#define sMULTIPLAYER_ID gBattleScripting + 0x25
#define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26
#define cEFFECT_CHOOSER gBattleCommunication + 3
#define cMULTISTRING_CHOOSER gBattleCommunication + 5
// Battle Script defines for getting the wanted battler
#define BS_TARGET 0
#define BS_ATTACKER 1
#define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3
#define BS_BATTLER_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon
#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_SCRIPTING 10
#define BS_PLAYER1 11
#define BS_OPPONENT1 12
#define BS_PLAYER2 13 // for atk98_updatestatusicon
#define BS_OPPONENT2 14
// atk 01, accuracy calc
#define NO_ACC_CALC 0xFFFE
#define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
#define ACC_CURR_MOVE 0
// compare operands
#define CMP_EQUAL 0x0
#define CMP_NOT_EQUAL 0x1
#define CMP_GREATER_THAN 0x2
#define CMP_LESS_THAN 0x3
#define CMP_COMMON_BITS 0x4
#define CMP_NO_COMMON_BITS 0x5
// TODO: documentation
// atk76, various
#define VARIOUS_CANCEL_MULTI_TURN_MOVES 0
#define VARIOUS_SET_MAGIC_COAT_TARGET 1
#define VARIOUS_IS_RUNNING_IMPOSSIBLE 2
#define VARIOUS_GET_MOVE_TARGET 3
#define VARIOUS_CASE_4 4
#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5
#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6
#define VARIOUS_CASE_7 7
#define VARIOUS_CASE_8 8
#define VARIOUS_RETURN_OPPONENT_MON1 9
#define VARIOUS_RETURN_OPPONENT_MON2 10
#define VARIOUS_CASE_11 11
#define VARIOUS_CASE_12 12
// atk80, dmg manipulation
#define ATK80_DMG_CHANGE_SIGN 0
#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP 1
#define ATK80_DMG_DOUBLED 2
// atk4F, a flag used for the jumpifcantswitch command
#define ATK4F_DONT_CHECK_STATUSES 0x80
// statchange defines
#define STAT_CHANGE_BS_PTR 0x1
#define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20
// atk48
#define ATK48_STAT_NEGATIVE 0x1
#define ATK48_STAT_BY_TWO 0x2
#define ATK48_ONLY_MULTIPLE 0x4
#define ATK48_DONT_CHECK_LOWER 0x8
// atk49, moveend cases
#define ATK49_RAGE 0
#define ATK49_DEFROST 1
#define ATK49_SYNCHRONIZE_TARGET 2
#define ATK49_MOVE_END_ABILITIES 3
#define ATK49_STATUS_IMMUNITY_ABILITIES 4
#define ATK49_SYNCHRONIZE_ATTACKER 5
#define ATK49_CHOICE_MOVE 6
#define ATK49_CHANGED_ITEMS 7
#define ATK49_ATTACKER_INVISIBLE 8
#define ATK49_ATTACKER_VISIBLE 9
#define ATK49_TARGET_VISIBLE 10
#define ATK49_ITEM_EFFECTS_ALL 11
#define ATK49_KINGSROCK_SHELLBELL 12
#define ATK49_SUBSTITUTE 13
#define ATK49_UPDATE_LAST_MOVES 14
#define ATK49_MIRROR_MOVE 15
#define ATK49_NEXT_TARGET 16
#define ATK49_COUNT 17
#define BIT_HP 0x1
#define BIT_ATK 0x2
#define BIT_DEF 0x4
#define BIT_SPEED 0x8
#define BIT_SPATK 0x10
#define BIT_SPDEF 0x20
#define BIT_ACC 0x40
#define BIT_EVASION 0x80
#endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
include/constants/pokemon.h
+6
View File
@@ -77,4 +77,10 @@
#define STAT_ACC 6 // only in battles
#define STAT_EVASION 7 // only in battles
#define NUM_STATS 6
#define NUM_BATTLE_STATS 8
// Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
#endif // GUARD_CONSTANTS_POKEMON_H

Some files were not shown because too many files have changed in this diff Show More