fix for merge
This commit is contained in:
jiangzhengwenjz
@@ -78,7 +78,7 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
|
||||
|
||||
all: rom
|
||||
|
||||
rom: $(ROM)
|
||||
rom: tools $(ROM)
|
||||
|
||||
tools:
|
||||
@$(MAKE) -C tools/gbagfx
|
||||
|
||||
+2
-2
@@ -4511,7 +4511,7 @@ _080121D4: .4byte SpriteCB_HealthBoxBounce
|
||||
_080121D8: .4byte gUnknown_3004FF0
|
||||
_080121DC: .4byte gSprites
|
||||
_080121E0:
|
||||
ldr r0, _0801224C @ =gUnknown_2023D44
|
||||
ldr r0, _0801224C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r7, [r0]
|
||||
ldr r2, _08012250 @ =gUnknown_2024018
|
||||
@@ -4567,7 +4567,7 @@ _0801223C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0801224C: .4byte gUnknown_2023D44
|
||||
_0801224C: .4byte gBattlerSpriteIds
|
||||
_08012250: .4byte gUnknown_2024018
|
||||
_08012254: .4byte gSprites
|
||||
thumb_func_end dp11b_obj_instanciate
|
||||
|
||||
+97
-97
@@ -20,7 +20,7 @@ ClearBattleAnimationVars: @ 80724C0
|
||||
strb r1, [r0]
|
||||
ldr r0, _08072560 @ =gUnknown_2037EE3
|
||||
strb r1, [r0]
|
||||
ldr r0, _08072564 @ =gUnknown_2037EE4
|
||||
ldr r0, _08072564 @ =gAnimDisableStructPtr
|
||||
movs r1, 0
|
||||
str r1, [r0]
|
||||
ldr r0, _08072568 @ =gUnknown_2037EE8
|
||||
@@ -31,12 +31,12 @@ ClearBattleAnimationVars: @ 80724C0
|
||||
ldr r0, _08072570 @ =gUnknown_2037EFE
|
||||
strb r2, [r0]
|
||||
ldr r4, _08072574 @ =gUnknown_2037F14
|
||||
ldr r5, _08072578 @ =gUnknown_2037F16
|
||||
ldr r5, _08072578 @ =gAnimMoveTurn
|
||||
ldr r6, _0807257C @ =gUnknown_2037F17
|
||||
ldr r7, _08072580 @ =gUnknown_2037F18
|
||||
ldr r0, _08072584 @ =gUnknown_2037F1A
|
||||
ldr r0, _08072584 @ =gBattleAnimAttacker
|
||||
mov r12, r0
|
||||
ldr r1, _08072588 @ =gUnknown_2037F1B
|
||||
ldr r1, _08072588 @ =gBattleAnimTarget
|
||||
mov r8, r1
|
||||
ldr r0, _0807258C @ =gUnknown_2037F24
|
||||
mov r9, r0
|
||||
@@ -52,7 +52,7 @@ _0807250A:
|
||||
subs r2, 0x1
|
||||
cmp r2, 0
|
||||
bge _0807250A
|
||||
ldr r1, _08072598 @ =gUnknown_2037F02
|
||||
ldr r1, _08072598 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
adds r0, r1, 0
|
||||
adds r0, 0xE
|
||||
@@ -88,20 +88,20 @@ _08072554: .4byte gUnknown_2037EE0
|
||||
_08072558: .4byte gUnknown_2037EE1
|
||||
_0807255C: .4byte gUnknown_2037EE2
|
||||
_08072560: .4byte gUnknown_2037EE3
|
||||
_08072564: .4byte gUnknown_2037EE4
|
||||
_08072564: .4byte gAnimDisableStructPtr
|
||||
_08072568: .4byte gUnknown_2037EE8
|
||||
_0807256C: .4byte gUnknown_2037EEC
|
||||
_08072570: .4byte gUnknown_2037EFE
|
||||
_08072574: .4byte gUnknown_2037F14
|
||||
_08072578: .4byte gUnknown_2037F16
|
||||
_08072578: .4byte gAnimMoveTurn
|
||||
_0807257C: .4byte gUnknown_2037F17
|
||||
_08072580: .4byte gUnknown_2037F18
|
||||
_08072584: .4byte gUnknown_2037F1A
|
||||
_08072588: .4byte gUnknown_2037F1B
|
||||
_08072584: .4byte gBattleAnimAttacker
|
||||
_08072588: .4byte gBattleAnimTarget
|
||||
_0807258C: .4byte gUnknown_2037F24
|
||||
_08072590: .4byte 0x0000ffff
|
||||
_08072594: .4byte gUnknown_2037EEE
|
||||
_08072598: .4byte gUnknown_2037F02
|
||||
_08072598: .4byte gBattleAnimArgs
|
||||
thumb_func_end ClearBattleAnimationVars
|
||||
|
||||
thumb_func_start DoMoveAnim
|
||||
@@ -110,11 +110,11 @@ DoMoveAnim: @ 807259C
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
ldr r2, _080725C0 @ =gUnknown_2037F1A
|
||||
ldr r2, _080725C0 @ =gBattleAnimAttacker
|
||||
ldr r0, _080725C4 @ =sBattler_AI
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r2]
|
||||
ldr r2, _080725C8 @ =gUnknown_2037F1B
|
||||
ldr r2, _080725C8 @ =gBattleAnimTarget
|
||||
ldr r0, _080725CC @ =gBattlerTarget
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r2]
|
||||
@@ -124,9 +124,9 @@ DoMoveAnim: @ 807259C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080725C0: .4byte gUnknown_2037F1A
|
||||
_080725C0: .4byte gBattleAnimAttacker
|
||||
_080725C4: .4byte sBattler_AI
|
||||
_080725C8: .4byte gUnknown_2037F1B
|
||||
_080725C8: .4byte gBattleAnimTarget
|
||||
_080725CC: .4byte gBattlerTarget
|
||||
_080725D0: .4byte gUnknown_81C68F4
|
||||
thumb_func_end DoMoveAnim
|
||||
@@ -206,7 +206,7 @@ _08072658:
|
||||
ldr r0, _080726D4 @ =gUnknown_2037EDC
|
||||
mov r10, r0
|
||||
ldr r7, _080726D8 @ =RunAnimScriptCommand
|
||||
ldr r1, _080726DC @ =gUnknown_2037F02
|
||||
ldr r1, _080726DC @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
adds r0, r1, 0
|
||||
adds r0, 0xE
|
||||
@@ -257,7 +257,7 @@ _080726CC: .4byte gUnknown_2037EE1
|
||||
_080726D0: .4byte gUnknown_2037EE0
|
||||
_080726D4: .4byte gUnknown_2037EDC
|
||||
_080726D8: .4byte RunAnimScriptCommand
|
||||
_080726DC: .4byte gUnknown_2037F02
|
||||
_080726DC: .4byte gBattleAnimArgs
|
||||
_080726E0: .4byte 0x0000ffff
|
||||
_080726E4: .4byte gUnknown_2037EEE
|
||||
_080726E8: .4byte gUnknown_81C68EC
|
||||
@@ -581,7 +581,7 @@ ScriptCmd_createsprite: @ 807291C
|
||||
cmp r0, 0
|
||||
beq _0807296C
|
||||
adds r6, r5, 0
|
||||
ldr r5, _08072988 @ =gUnknown_2037F02
|
||||
ldr r5, _08072988 @ =gBattleAnimArgs
|
||||
adds r3, r0, 0
|
||||
_08072954:
|
||||
ldr r2, [r6]
|
||||
@@ -610,16 +610,16 @@ _0807296C:
|
||||
b _0807298E
|
||||
.align 2, 0
|
||||
_08072984: .4byte gUnknown_2037ED4
|
||||
_08072988: .4byte gUnknown_2037F02
|
||||
_08072988: .4byte gBattleAnimArgs
|
||||
_0807298C:
|
||||
negs r0, r4
|
||||
_0807298E:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08072998 @ =gUnknown_2037F1B
|
||||
ldr r0, _08072998 @ =gBattleAnimTarget
|
||||
b _080729AE
|
||||
.align 2, 0
|
||||
_08072998: .4byte gUnknown_2037F1B
|
||||
_08072998: .4byte gBattleAnimTarget
|
||||
_0807299C:
|
||||
cmp r4, 0x3F
|
||||
bls _080729A6
|
||||
@@ -631,7 +631,7 @@ _080729A6:
|
||||
_080729A8:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08072A04 @ =gUnknown_2037F1A
|
||||
ldr r0, _08072A04 @ =gBattleAnimAttacker
|
||||
_080729AE:
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
@@ -648,7 +648,7 @@ _080729AE:
|
||||
bgt _080729CC
|
||||
movs r6, 0x3
|
||||
_080729CC:
|
||||
ldr r5, _08072A08 @ =gUnknown_2037F1B
|
||||
ldr r5, _08072A08 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -674,8 +674,8 @@ _080729CC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08072A04: .4byte gUnknown_2037F1A
|
||||
_08072A08: .4byte gUnknown_2037F1B
|
||||
_08072A04: .4byte gBattleAnimAttacker
|
||||
_08072A08: .4byte gBattleAnimTarget
|
||||
_08072A0C: .4byte gUnknown_2037EE2
|
||||
thumb_func_end ScriptCmd_createsprite
|
||||
|
||||
@@ -707,7 +707,7 @@ ScriptCmd_createvisualtask: @ 8072A10
|
||||
cmp r0, 0
|
||||
beq _08072A60
|
||||
adds r5, r4, 0
|
||||
ldr r4, _08072A84 @ =gUnknown_2037F02
|
||||
ldr r4, _08072A84 @ =gBattleAnimArgs
|
||||
adds r3, r0, 0
|
||||
_08072A48:
|
||||
ldr r2, [r5]
|
||||
@@ -738,7 +738,7 @@ _08072A60:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08072A80: .4byte gUnknown_2037ED4
|
||||
_08072A84: .4byte gUnknown_2037F02
|
||||
_08072A84: .4byte gBattleAnimArgs
|
||||
_08072A88: .4byte gUnknown_2037EE2
|
||||
thumb_func_end ScriptCmd_createvisualtask
|
||||
|
||||
@@ -980,12 +980,12 @@ _08072C52:
|
||||
cmp r6, 0x2
|
||||
bne _08072C60
|
||||
_08072C56:
|
||||
ldr r0, _08072C5C @ =gUnknown_2037F1A
|
||||
ldr r0, _08072C5C @ =gBattleAnimAttacker
|
||||
b _08072C62
|
||||
.align 2, 0
|
||||
_08072C5C: .4byte gUnknown_2037F1A
|
||||
_08072C5C: .4byte gBattleAnimAttacker
|
||||
_08072C60:
|
||||
ldr r0, _08072CD8 @ =gUnknown_2037F1B
|
||||
ldr r0, _08072CD8 @ =gBattleAnimTarget
|
||||
_08072C62:
|
||||
ldrb r5, [r0]
|
||||
adds r0, r5, 0
|
||||
@@ -1008,7 +1008,7 @@ _08072C88:
|
||||
adds r0, r5, 0
|
||||
adds r1, r7, 0
|
||||
bl sub_8072E48
|
||||
ldr r0, _08072CDC @ =gUnknown_2023D44
|
||||
ldr r0, _08072CDC @ =gBattlerSpriteIds
|
||||
adds r0, r5, r0
|
||||
ldrb r4, [r0]
|
||||
ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal
|
||||
@@ -1043,8 +1043,8 @@ _08072C88:
|
||||
ldr r0, _08072CF0 @ =gBattle_BG1_Y
|
||||
b _08072CFC
|
||||
.align 2, 0
|
||||
_08072CD8: .4byte gUnknown_2037F1B
|
||||
_08072CDC: .4byte gUnknown_2023D44
|
||||
_08072CD8: .4byte gBattleAnimTarget
|
||||
_08072CDC: .4byte gBattlerSpriteIds
|
||||
_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
|
||||
_08072CE4: .4byte gTasks
|
||||
_08072CE8: .4byte gSprites
|
||||
@@ -1092,7 +1092,7 @@ _08072D3E:
|
||||
adds r0, r5, 0
|
||||
adds r1, r7, 0
|
||||
bl sub_8072E48
|
||||
ldr r0, _08072D9C @ =gUnknown_2023D44
|
||||
ldr r0, _08072D9C @ =gBattlerSpriteIds
|
||||
adds r0, r5, r0
|
||||
ldrb r4, [r0]
|
||||
ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal
|
||||
@@ -1131,7 +1131,7 @@ _08072D8C: .4byte gBattle_BG2_X
|
||||
_08072D90: .4byte gBattle_BG2_Y
|
||||
_08072D94: .4byte gTasks
|
||||
_08072D98: .4byte gUnknown_2037F14
|
||||
_08072D9C: .4byte gUnknown_2023D44
|
||||
_08072D9C: .4byte gBattlerSpriteIds
|
||||
_08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal
|
||||
_08072DA4: .4byte gSprites
|
||||
_08072DA8: .4byte gBattle_BG1_X
|
||||
@@ -1190,7 +1190,7 @@ sub_8072DF0: @ 8072DF0
|
||||
cmp r0, 0
|
||||
beq _08072E30
|
||||
ldr r2, _08072E38 @ =gSprites
|
||||
ldr r0, _08072E3C @ =gUnknown_2023D44
|
||||
ldr r0, _08072E3C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1208,7 +1208,7 @@ _08072E30:
|
||||
.align 2, 0
|
||||
_08072E34: .4byte gUnknown_2024018
|
||||
_08072E38: .4byte gSprites
|
||||
_08072E3C: .4byte gUnknown_2023D44
|
||||
_08072E3C: .4byte gBattlerSpriteIds
|
||||
_08072E40:
|
||||
movs r0, 0
|
||||
_08072E42:
|
||||
@@ -1268,7 +1268,7 @@ _08072E5E:
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
ldr r2, _08072F6C @ =gUnknown_2023D44
|
||||
ldr r2, _08072F6C @ =gBattlerSpriteIds
|
||||
adds r2, r7, r2
|
||||
ldrb r0, [r2]
|
||||
ldr r5, _08072F70 @ =gBattle_BG1_X
|
||||
@@ -1349,7 +1349,7 @@ _08072F5C: .4byte 0x06004000
|
||||
_08072F60: .4byte 0x0600e000
|
||||
_08072F64: .4byte 0x01000800
|
||||
_08072F68: .4byte 0x01000400
|
||||
_08072F6C: .4byte gUnknown_2023D44
|
||||
_08072F6C: .4byte gBattlerSpriteIds
|
||||
_08072F70: .4byte gBattle_BG1_X
|
||||
_08072F74: .4byte gSprites
|
||||
_08072F78: .4byte gBattle_BG1_Y
|
||||
@@ -1401,7 +1401,7 @@ _08072F84:
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
ldr r2, _080730A4 @ =gUnknown_2023D44
|
||||
ldr r2, _080730A4 @ =gBattlerSpriteIds
|
||||
adds r2, r7, r2
|
||||
ldrb r0, [r2]
|
||||
ldr r5, _080730A8 @ =gBattle_BG2_X
|
||||
@@ -1483,7 +1483,7 @@ _08073094: .4byte 0x06006000
|
||||
_08073098: .4byte 0x0600f000
|
||||
_0807309C: .4byte 0x01000800
|
||||
_080730A0: .4byte 0x01000400
|
||||
_080730A4: .4byte gUnknown_2023D44
|
||||
_080730A4: .4byte gBattlerSpriteIds
|
||||
_080730A8: .4byte gBattle_BG2_X
|
||||
_080730AC: .4byte gSprites
|
||||
_080730B0: .4byte gBattle_BG2_Y
|
||||
@@ -1715,12 +1715,12 @@ _0807326E:
|
||||
cmp r4, 0x2
|
||||
bne _0807327C
|
||||
_08073272:
|
||||
ldr r0, _08073278 @ =gUnknown_2037F1A
|
||||
ldr r0, _08073278 @ =gBattleAnimAttacker
|
||||
b _0807327E
|
||||
.align 2, 0
|
||||
_08073278: .4byte gUnknown_2037F1A
|
||||
_08073278: .4byte gBattleAnimAttacker
|
||||
_0807327C:
|
||||
ldr r0, _080732D4 @ =gUnknown_2037F1B
|
||||
ldr r0, _080732D4 @ =gBattleAnimTarget
|
||||
_0807327E:
|
||||
ldrb r5, [r0]
|
||||
ldr r3, _080732D8 @ =gUnknown_2037F14
|
||||
@@ -1728,7 +1728,7 @@ _0807327E:
|
||||
cmp r0, 0xFF
|
||||
beq _080732A4
|
||||
ldr r2, _080732DC @ =gSprites
|
||||
ldr r0, _080732E0 @ =gUnknown_2023D44
|
||||
ldr r0, _080732E0 @ =gBattlerSpriteIds
|
||||
adds r0, r5, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1748,7 +1748,7 @@ _080732A4:
|
||||
cmp r0, 0xFF
|
||||
beq _080732E4
|
||||
ldr r3, _080732DC @ =gSprites
|
||||
ldr r2, _080732E0 @ =gUnknown_2023D44
|
||||
ldr r2, _080732E0 @ =gBattlerSpriteIds
|
||||
movs r1, 0x2
|
||||
adds r0, r5, 0
|
||||
eors r0, r1
|
||||
@@ -1766,10 +1766,10 @@ _080732A4:
|
||||
strb r1, [r0]
|
||||
b _080732E6
|
||||
.align 2, 0
|
||||
_080732D4: .4byte gUnknown_2037F1B
|
||||
_080732D4: .4byte gBattleAnimTarget
|
||||
_080732D8: .4byte gUnknown_2037F14
|
||||
_080732DC: .4byte gSprites
|
||||
_080732E0: .4byte gUnknown_2023D44
|
||||
_080732E0: .4byte gBattlerSpriteIds
|
||||
_080732E4:
|
||||
movs r4, 0
|
||||
_080732E6:
|
||||
@@ -1888,12 +1888,12 @@ _080733BE:
|
||||
cmp r5, 0x2
|
||||
bne _080733CC
|
||||
_080733C2:
|
||||
ldr r0, _080733C8 @ =gUnknown_2037F1A
|
||||
ldr r0, _080733C8 @ =gBattleAnimAttacker
|
||||
b _080733CE
|
||||
.align 2, 0
|
||||
_080733C8: .4byte gUnknown_2037F1A
|
||||
_080733C8: .4byte gBattleAnimAttacker
|
||||
_080733CC:
|
||||
ldr r0, _08073474 @ =gUnknown_2037F1B
|
||||
ldr r0, _08073474 @ =gBattleAnimTarget
|
||||
_080733CE:
|
||||
ldrb r4, [r0]
|
||||
adds r0, r4, 0
|
||||
@@ -1916,7 +1916,7 @@ _080733F4:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072E48
|
||||
ldr r2, _08073478 @ =gSprites
|
||||
ldr r0, _0807347C @ =gUnknown_2023D44
|
||||
ldr r0, _0807347C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1954,7 +1954,7 @@ _08073442:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072E48
|
||||
ldr r2, _08073478 @ =gSprites
|
||||
ldr r0, _0807347C @ =gUnknown_2023D44
|
||||
ldr r0, _0807347C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1976,9 +1976,9 @@ _08073464:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08073474: .4byte gUnknown_2037F1B
|
||||
_08073474: .4byte gBattleAnimTarget
|
||||
_08073478: .4byte gSprites
|
||||
_0807347C: .4byte gUnknown_2023D44
|
||||
_0807347C: .4byte gBattlerSpriteIds
|
||||
_08073480: .4byte gUnknown_2037ED4
|
||||
thumb_func_end sub_807339C
|
||||
|
||||
@@ -2007,12 +2007,12 @@ _080734A6:
|
||||
cmp r5, 0x2
|
||||
bne _080734B4
|
||||
_080734AA:
|
||||
ldr r0, _080734B0 @ =gUnknown_2037F1A
|
||||
ldr r0, _080734B0 @ =gBattleAnimAttacker
|
||||
b _080734B6
|
||||
.align 2, 0
|
||||
_080734B0: .4byte gUnknown_2037F1A
|
||||
_080734B0: .4byte gBattleAnimAttacker
|
||||
_080734B4:
|
||||
ldr r0, _08073514 @ =gUnknown_2037F1B
|
||||
ldr r0, _08073514 @ =gBattleAnimTarget
|
||||
_080734B6:
|
||||
ldrb r6, [r0]
|
||||
adds r0, r6, 0
|
||||
@@ -2021,7 +2021,7 @@ _080734B6:
|
||||
cmp r0, 0
|
||||
beq _080734E0
|
||||
ldr r2, _08073518 @ =gSprites
|
||||
ldr r0, _0807351C @ =gUnknown_2023D44
|
||||
ldr r0, _0807351C @ =gBattlerSpriteIds
|
||||
adds r0, r6, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -2046,7 +2046,7 @@ _080734E0:
|
||||
cmp r0, 0
|
||||
beq _08073520
|
||||
ldr r2, _08073518 @ =gSprites
|
||||
ldr r0, _0807351C @ =gUnknown_2023D44
|
||||
ldr r0, _0807351C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -2061,9 +2061,9 @@ _080734E0:
|
||||
strb r1, [r0]
|
||||
b _08073522
|
||||
.align 2, 0
|
||||
_08073514: .4byte gUnknown_2037F1B
|
||||
_08073514: .4byte gBattleAnimTarget
|
||||
_08073518: .4byte gSprites
|
||||
_0807351C: .4byte gUnknown_2023D44
|
||||
_0807351C: .4byte gBattlerSpriteIds
|
||||
_08073520:
|
||||
movs r5, 0
|
||||
_08073522:
|
||||
@@ -2290,7 +2290,7 @@ ScriptCmd_setarg: @ 80736AC
|
||||
orrs r4, r0
|
||||
adds r1, 0x4
|
||||
str r1, [r5]
|
||||
ldr r0, _080736DC @ =gUnknown_2037F02
|
||||
ldr r0, _080736DC @ =gBattleAnimArgs
|
||||
lsls r2, 1
|
||||
adds r2, r0
|
||||
strh r4, [r2]
|
||||
@@ -2299,7 +2299,7 @@ ScriptCmd_setarg: @ 80736AC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080736D8: .4byte gUnknown_2037ED4
|
||||
_080736DC: .4byte gUnknown_2037F02
|
||||
_080736DC: .4byte gBattleAnimArgs
|
||||
thumb_func_end ScriptCmd_setarg
|
||||
|
||||
thumb_func_start ScriptCmd_choosetwoturnanim
|
||||
@@ -2309,7 +2309,7 @@ ScriptCmd_choosetwoturnanim: @ 80736E0
|
||||
ldr r2, [r3]
|
||||
adds r0, r2, 0x1
|
||||
str r0, [r3]
|
||||
ldr r0, _0807371C @ =gUnknown_2037F16
|
||||
ldr r0, _0807371C @ =gAnimMoveTurn
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
@@ -2334,7 +2334,7 @@ _080736FA:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08073718: .4byte gUnknown_2037ED4
|
||||
_0807371C: .4byte gUnknown_2037F16
|
||||
_0807371C: .4byte gAnimMoveTurn
|
||||
thumb_func_end ScriptCmd_choosetwoturnanim
|
||||
|
||||
thumb_func_start ScriptCmd_jumpifmoveturn
|
||||
@@ -2347,7 +2347,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
|
||||
ldrb r1, [r4, 0x1]
|
||||
adds r3, r2, 0x1
|
||||
str r3, [r5]
|
||||
ldr r0, _08073754 @ =gUnknown_2037F16
|
||||
ldr r0, _08073754 @ =gAnimMoveTurn
|
||||
ldrb r0, [r0]
|
||||
cmp r1, r0
|
||||
bne _08073758
|
||||
@@ -2365,7 +2365,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
|
||||
b _0807375C
|
||||
.align 2, 0
|
||||
_08073750: .4byte gUnknown_2037ED4
|
||||
_08073754: .4byte gUnknown_2037F16
|
||||
_08073754: .4byte gAnimMoveTurn
|
||||
_08073758:
|
||||
adds r0, r4, 0x6
|
||||
str r0, [r5]
|
||||
@@ -2469,7 +2469,7 @@ sub_80737E4: @ 80737E4
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08073828 @ =gUnknown_2037F1B
|
||||
ldr r0, _08073828 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -2485,7 +2485,7 @@ sub_80737E4: @ 80737E4
|
||||
.align 2, 0
|
||||
_08073820: .4byte gUnknown_2037ED4
|
||||
_08073824: .4byte sub_8073850
|
||||
_08073828: .4byte gUnknown_2037F1B
|
||||
_08073828: .4byte gBattleAnimTarget
|
||||
_0807382C: .4byte gTasks
|
||||
_08073830:
|
||||
ldr r1, _08073848 @ =gTasks
|
||||
@@ -2774,7 +2774,7 @@ sub_8073A44: @ 8073A44
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08073A78 @ =gUnknown_2024018
|
||||
ldr r1, [r0]
|
||||
ldr r0, _08073A7C @ =gUnknown_2037F1A
|
||||
ldr r0, _08073A7C @ =gBattleAnimAttacker
|
||||
ldrb r2, [r0]
|
||||
ldr r1, [r1, 0x4]
|
||||
lsls r0, r2, 1
|
||||
@@ -2796,14 +2796,14 @@ sub_8073A44: @ 8073A44
|
||||
b _08073AE6
|
||||
.align 2, 0
|
||||
_08073A78: .4byte gUnknown_2024018
|
||||
_08073A7C: .4byte gUnknown_2037F1A
|
||||
_08073A7C: .4byte gBattleAnimAttacker
|
||||
_08073A80:
|
||||
adds r0, r2, 0
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08073ABA
|
||||
ldr r0, _08073AA8 @ =gUnknown_2037F1B
|
||||
ldr r0, _08073AA8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -2816,7 +2816,7 @@ _08073A80:
|
||||
movs r4, 0xC0
|
||||
b _08073AE6
|
||||
.align 2, 0
|
||||
_08073AA8: .4byte gUnknown_2037F1B
|
||||
_08073AA8: .4byte gBattleAnimTarget
|
||||
_08073AAC:
|
||||
movs r0, 0x40
|
||||
negs r0, r0
|
||||
@@ -2826,7 +2826,7 @@ _08073AAC:
|
||||
lsls r0, 24
|
||||
b _08073AE4
|
||||
_08073ABA:
|
||||
ldr r0, _08073ADC @ =gUnknown_2037F1B
|
||||
ldr r0, _08073ADC @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -2842,7 +2842,7 @@ _08073ABA:
|
||||
movs r4, 0x3F
|
||||
b _08073AE6
|
||||
.align 2, 0
|
||||
_08073ADC: .4byte gUnknown_2037F1B
|
||||
_08073ADC: .4byte gBattleAnimTarget
|
||||
_08073AE0:
|
||||
lsls r0, r4, 24
|
||||
negs r0, r0
|
||||
@@ -2876,7 +2876,7 @@ sub_8073B08: @ 8073B08
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08073B3C @ =gUnknown_2024018
|
||||
ldr r1, [r0]
|
||||
ldr r0, _08073B40 @ =gUnknown_2037F1A
|
||||
ldr r0, _08073B40 @ =gBattleAnimAttacker
|
||||
ldrb r2, [r0]
|
||||
ldr r1, [r1, 0x4]
|
||||
lsls r0, r2, 1
|
||||
@@ -2898,7 +2898,7 @@ sub_8073B08: @ 8073B08
|
||||
b _08073B56
|
||||
.align 2, 0
|
||||
_08073B3C: .4byte gUnknown_2024018
|
||||
_08073B40: .4byte gUnknown_2037F1A
|
||||
_08073B40: .4byte gBattleAnimAttacker
|
||||
_08073B44:
|
||||
adds r0, r2, 0
|
||||
bl GetBattlerSide
|
||||
@@ -3597,7 +3597,7 @@ ScriptCmd_createsoundtask: @ 807406C
|
||||
cmp r0, 0
|
||||
beq _080740B6
|
||||
adds r5, r4, 0
|
||||
ldr r4, _080740D8 @ =gUnknown_2037F02
|
||||
ldr r4, _080740D8 @ =gBattleAnimArgs
|
||||
adds r3, r0, 0
|
||||
_0807409E:
|
||||
ldr r2, [r5]
|
||||
@@ -3628,7 +3628,7 @@ _080740B6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080740D4: .4byte gUnknown_2037ED4
|
||||
_080740D8: .4byte gUnknown_2037F02
|
||||
_080740D8: .4byte gBattleAnimArgs
|
||||
_080740DC: .4byte gUnknown_2037EE3
|
||||
thumb_func_end ScriptCmd_createsoundtask
|
||||
|
||||
@@ -3707,7 +3707,7 @@ ScriptCmd_jumpargeq: @ 8074164
|
||||
ldrb r0, [r3, 0x2]
|
||||
lsls r0, 8
|
||||
orrs r1, r0
|
||||
ldr r0, _080741A8 @ =gUnknown_2037F02
|
||||
ldr r0, _080741A8 @ =gBattleAnimArgs
|
||||
lsls r2, 1
|
||||
adds r2, r0
|
||||
lsls r1, 16
|
||||
@@ -3730,7 +3730,7 @@ ScriptCmd_jumpargeq: @ 8074164
|
||||
b _080741B2
|
||||
.align 2, 0
|
||||
_080741A4: .4byte gUnknown_2037ED4
|
||||
_080741A8: .4byte gUnknown_2037F02
|
||||
_080741A8: .4byte gBattleAnimArgs
|
||||
_080741AC:
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x8
|
||||
@@ -3762,13 +3762,13 @@ sub_80741C8: @ 80741C8
|
||||
str r1, [r0]
|
||||
cmp r2, 0
|
||||
beq _080741E4
|
||||
ldr r0, _080741E0 @ =gUnknown_2037F1B
|
||||
ldr r0, _080741E0 @ =gBattleAnimTarget
|
||||
b _080741E6
|
||||
.align 2, 0
|
||||
_080741DC: .4byte gUnknown_2037ED4
|
||||
_080741E0: .4byte gUnknown_2037F1B
|
||||
_080741E0: .4byte gBattleAnimTarget
|
||||
_080741E4:
|
||||
ldr r0, _08074210 @ =gUnknown_2037F1A
|
||||
ldr r0, _08074210 @ =gBattleAnimAttacker
|
||||
_080741E6:
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerPosition
|
||||
@@ -3791,7 +3791,7 @@ _0807420C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08074210: .4byte gUnknown_2037F1A
|
||||
_08074210: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80741C8
|
||||
|
||||
thumb_func_start sub_8074214
|
||||
@@ -3823,11 +3823,11 @@ sub_807423C: @ 807423C
|
||||
ldrb r6, [r0, 0x1]
|
||||
adds r0, 0x2
|
||||
str r0, [r1]
|
||||
ldr r7, _08074270 @ =gUnknown_2037F1A
|
||||
ldr r7, _08074270 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r7]
|
||||
bl GetBattlerSide
|
||||
adds r4, r0, 0
|
||||
ldr r5, _08074274 @ =gUnknown_2037F1B
|
||||
ldr r5, _08074274 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r4, 24
|
||||
@@ -3840,8 +3840,8 @@ sub_807423C: @ 807423C
|
||||
b _0807427A
|
||||
.align 2, 0
|
||||
_0807426C: .4byte gUnknown_2037ED4
|
||||
_08074270: .4byte gUnknown_2037F1A
|
||||
_08074274: .4byte gUnknown_2037F1B
|
||||
_08074270: .4byte gBattleAnimAttacker
|
||||
_08074274: .4byte gBattleAnimTarget
|
||||
_08074278:
|
||||
ldrb r0, [r7]
|
||||
_0807427A:
|
||||
@@ -3946,11 +3946,11 @@ sub_8074320: @ 8074320
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080743C2
|
||||
ldr r6, _08074368 @ =gUnknown_2037F1A
|
||||
ldr r6, _08074368 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
bl GetBattlerSide
|
||||
adds r4, r0, 0
|
||||
ldr r5, _0807436C @ =gUnknown_2037F1B
|
||||
ldr r5, _0807436C @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r4, 24
|
||||
@@ -3967,8 +3967,8 @@ sub_8074320: @ 8074320
|
||||
b _0807437C
|
||||
.align 2, 0
|
||||
_08074364: .4byte gUnknown_2037ED4
|
||||
_08074368: .4byte gUnknown_2037F1A
|
||||
_0807436C: .4byte gUnknown_2037F1B
|
||||
_08074368: .4byte gBattleAnimAttacker
|
||||
_0807436C: .4byte gBattleAnimTarget
|
||||
_08074370:
|
||||
ldrb r0, [r5]
|
||||
bl sub_80768B0
|
||||
@@ -4028,11 +4028,11 @@ sub_80743C8: @ 80743C8
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807444C
|
||||
ldr r6, _08074410 @ =gUnknown_2037F1A
|
||||
ldr r6, _08074410 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
bl GetBattlerSide
|
||||
adds r4, r0, 0
|
||||
ldr r5, _08074414 @ =gUnknown_2037F1B
|
||||
ldr r5, _08074414 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r4, 24
|
||||
@@ -4049,8 +4049,8 @@ sub_80743C8: @ 80743C8
|
||||
b _08074424
|
||||
.align 2, 0
|
||||
_0807440C: .4byte gUnknown_2037ED4
|
||||
_08074410: .4byte gUnknown_2037F1A
|
||||
_08074414: .4byte gUnknown_2037F1B
|
||||
_08074410: .4byte gBattleAnimAttacker
|
||||
_08074414: .4byte gBattleAnimTarget
|
||||
_08074418:
|
||||
ldrb r0, [r5]
|
||||
bl sub_80768B0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@ sub_80989F8: @ 80989F8
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08098A18 @ =gUnknown_2037F02
|
||||
ldr r4, _08098A18 @ =gBattleAnimArgs
|
||||
ldrb r0, [r4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -21,7 +21,7 @@ sub_80989F8: @ 80989F8
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098A58
|
||||
.align 2, 0
|
||||
_08098A18: .4byte gUnknown_2037F02
|
||||
_08098A18: .4byte gBattleAnimArgs
|
||||
_08098A1C:
|
||||
ldr r1, _08098A60 @ =gSprites
|
||||
lsls r0, r2, 4
|
||||
@@ -163,7 +163,7 @@ sub_8098B1C: @ 8098B1C
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
movs r6, 0
|
||||
ldr r2, _08098B44 @ =gUnknown_2037F02
|
||||
ldr r2, _08098B44 @ =gBattleAnimArgs
|
||||
ldrh r0, [r2]
|
||||
movs r3, 0
|
||||
ldrsh r1, [r2, r3]
|
||||
@@ -178,7 +178,7 @@ sub_8098B1C: @ 8098B1C
|
||||
bne _08098B9E
|
||||
b _08098BA2
|
||||
.align 2, 0
|
||||
_08098B44: .4byte gUnknown_2037F02
|
||||
_08098B44: .4byte gBattleAnimArgs
|
||||
_08098B48:
|
||||
cmp r1, 0x8
|
||||
beq _08098B94
|
||||
@@ -217,14 +217,14 @@ _08098B72:
|
||||
bne _08098B88
|
||||
movs r6, 0x1
|
||||
_08098B88:
|
||||
ldr r0, _08098B90 @ =gUnknown_2023D44
|
||||
ldr r0, _08098B90 @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
b _08098B9C
|
||||
.align 2, 0
|
||||
_08098B90: .4byte gUnknown_2023D44
|
||||
_08098B90: .4byte gBattlerSpriteIds
|
||||
_08098B94:
|
||||
ldr r1, _08098BAC @ =gUnknown_2023D44
|
||||
ldr r0, _08098BB0 @ =gUnknown_2037F1A
|
||||
ldr r1, _08098BAC @ =gBattlerSpriteIds
|
||||
ldr r0, _08098BB0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
_08098B9C:
|
||||
@@ -237,15 +237,15 @@ _08098BA2:
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098BF2
|
||||
.align 2, 0
|
||||
_08098BAC: .4byte gUnknown_2023D44
|
||||
_08098BB0: .4byte gUnknown_2037F1A
|
||||
_08098BAC: .4byte gBattlerSpriteIds
|
||||
_08098BB0: .4byte gBattleAnimAttacker
|
||||
_08098BB4:
|
||||
ldr r1, _08098BF8 @ =gSprites
|
||||
lsls r0, r3, 4
|
||||
adds r0, r3
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r2, _08098BFC @ =gUnknown_2037F02
|
||||
ldr r2, _08098BFC @ =gBattleAnimArgs
|
||||
ldrh r1, [r2, 0x2]
|
||||
strh r1, [r0, 0x24]
|
||||
ldrh r1, [r2, 0x4]
|
||||
@@ -276,7 +276,7 @@ _08098BF2:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08098BF8: .4byte gSprites
|
||||
_08098BFC: .4byte gUnknown_2037F02
|
||||
_08098BFC: .4byte gBattleAnimArgs
|
||||
_08098C00: .4byte gTasks
|
||||
_08098C04: .4byte sub_8098C08
|
||||
thumb_func_end sub_8098B1C
|
||||
@@ -393,7 +393,7 @@ sub_8098CD0: @ 8098CD0
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08098CF0 @ =gUnknown_2037F02
|
||||
ldr r4, _08098CF0 @ =gBattleAnimArgs
|
||||
ldrb r0, [r4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -404,7 +404,7 @@ sub_8098CD0: @ 8098CD0
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098D42
|
||||
.align 2, 0
|
||||
_08098CF0: .4byte gUnknown_2037F02
|
||||
_08098CF0: .4byte gBattleAnimArgs
|
||||
_08098CF4:
|
||||
ldr r0, _08098D48 @ =gSprites
|
||||
lsls r1, r3, 4
|
||||
@@ -624,7 +624,7 @@ sub_8098E90: @ 8098E90
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r5, _08098EE0 @ =gUnknown_2037F02
|
||||
ldr r5, _08098EE0 @ =gBattleAnimArgs
|
||||
ldrb r0, [r5]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -658,7 +658,7 @@ sub_8098E90: @ 8098E90
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08098EE0: .4byte gUnknown_2037F02
|
||||
_08098EE0: .4byte gBattleAnimArgs
|
||||
_08098EE4: .4byte gSprites
|
||||
_08098EE8: .4byte gTasks
|
||||
_08098EEC: .4byte sub_8098EF0
|
||||
@@ -750,7 +750,7 @@ sub_8098F84: @ 8098F84
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
movs r6, 0x1
|
||||
ldr r4, _08098FF8 @ =gUnknown_2037F02
|
||||
ldr r4, _08098FF8 @ =gBattleAnimArgs
|
||||
ldrb r0, [r4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -804,7 +804,7 @@ _08098FCE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08098FF8: .4byte gUnknown_2037F02
|
||||
_08098FF8: .4byte gBattleAnimArgs
|
||||
_08098FFC: .4byte gTasks
|
||||
_08099000: .4byte sub_8099004
|
||||
thumb_func_end sub_8098F84
|
||||
@@ -876,13 +876,13 @@ sub_809907C: @ 809907C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _080990A4 @ =gUnknown_2037F1A
|
||||
ldr r0, _080990A4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099098
|
||||
ldr r1, _080990A8 @ =gUnknown_2037F02
|
||||
ldr r1, _080990A8 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
@@ -893,8 +893,8 @@ _08099098:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080990A4: .4byte gUnknown_2037F1A
|
||||
_080990A8: .4byte gUnknown_2037F02
|
||||
_080990A4: .4byte gBattleAnimAttacker
|
||||
_080990A8: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_809907C
|
||||
|
||||
thumb_func_start sub_80990AC
|
||||
@@ -907,21 +907,21 @@ sub_80990AC: @ 80990AC
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, _080990D4 @ =gUnknown_2037F1A
|
||||
ldr r0, _080990D4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080990DC
|
||||
ldr r1, _080990D8 @ =gUnknown_2037F02
|
||||
ldr r1, _080990D8 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
b _080990E0
|
||||
.align 2, 0
|
||||
_080990D4: .4byte gUnknown_2037F1A
|
||||
_080990D8: .4byte gUnknown_2037F02
|
||||
_080990D4: .4byte gBattleAnimAttacker
|
||||
_080990D8: .4byte gBattleAnimArgs
|
||||
_080990DC:
|
||||
ldr r1, _0809910C @ =gUnknown_2037F02
|
||||
ldr r1, _0809910C @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
_080990E0:
|
||||
strh r0, [r4, 0x30]
|
||||
@@ -929,8 +929,8 @@ _080990E0:
|
||||
movs r0, 0
|
||||
strh r2, [r4, 0x2E]
|
||||
strh r0, [r4, 0x32]
|
||||
ldr r1, _08099110 @ =gUnknown_2023D44
|
||||
ldr r0, _08099114 @ =gUnknown_2037F1A
|
||||
ldr r1, _08099110 @ =gBattlerSpriteIds
|
||||
ldr r0, _08099114 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -945,9 +945,9 @@ _080990E0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0809910C: .4byte gUnknown_2037F02
|
||||
_08099110: .4byte gUnknown_2023D44
|
||||
_08099114: .4byte gUnknown_2037F1A
|
||||
_0809910C: .4byte gBattleAnimArgs
|
||||
_08099110: .4byte gBattlerSpriteIds
|
||||
_08099114: .4byte gBattleAnimAttacker
|
||||
_08099118: .4byte sub_8099120
|
||||
_0809911C: .4byte sub_8074DC4
|
||||
thumb_func_end sub_80990AC
|
||||
@@ -981,7 +981,7 @@ sub_8099144: @ 8099144
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r5, _08099184 @ =gUnknown_2037F02
|
||||
ldr r5, _08099184 @ =gBattleAnimArgs
|
||||
ldrb r0, [r5, 0x4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -1003,7 +1003,7 @@ sub_8099144: @ 8099144
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08099184: .4byte gUnknown_2037F02
|
||||
_08099184: .4byte gBattleAnimArgs
|
||||
_08099188: .4byte sub_8099190
|
||||
_0809918C: .4byte sub_8074DC4
|
||||
thumb_func_end sub_8099144
|
||||
@@ -1032,26 +1032,26 @@ sub_80991B4: @ 80991B4
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r6, r0, 0
|
||||
ldr r0, _080991CC @ =gUnknown_2037F02
|
||||
ldr r0, _080991CC @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080991D8
|
||||
ldr r1, _080991D0 @ =gUnknown_2023D44
|
||||
ldr r0, _080991D4 @ =gUnknown_2037F1A
|
||||
ldr r1, _080991D0 @ =gBattlerSpriteIds
|
||||
ldr r0, _080991D4 @ =gBattleAnimAttacker
|
||||
b _080991DC
|
||||
.align 2, 0
|
||||
_080991CC: .4byte gUnknown_2037F02
|
||||
_080991D0: .4byte gUnknown_2023D44
|
||||
_080991D4: .4byte gUnknown_2037F1A
|
||||
_080991CC: .4byte gBattleAnimArgs
|
||||
_080991D0: .4byte gBattlerSpriteIds
|
||||
_080991D4: .4byte gBattleAnimAttacker
|
||||
_080991D8:
|
||||
ldr r1, _0809923C @ =gUnknown_2023D44
|
||||
ldr r0, _08099240 @ =gUnknown_2037F1B
|
||||
ldr r1, _0809923C @ =gBattlerSpriteIds
|
||||
ldr r0, _08099240 @ =gBattleAnimTarget
|
||||
_080991DC:
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r7, [r0]
|
||||
ldr r5, _08099244 @ =gUnknown_2037F02
|
||||
ldr r5, _08099244 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x4]
|
||||
movs r3, 0
|
||||
strh r0, [r6, 0x2E]
|
||||
@@ -1095,16 +1095,16 @@ _080991DC:
|
||||
strh r3, [r6, 0x32]
|
||||
b _08099252
|
||||
.align 2, 0
|
||||
_0809923C: .4byte gUnknown_2023D44
|
||||
_08099240: .4byte gUnknown_2037F1B
|
||||
_08099244: .4byte gUnknown_2037F02
|
||||
_0809923C: .4byte gBattlerSpriteIds
|
||||
_08099240: .4byte gBattleAnimTarget
|
||||
_08099244: .4byte gBattleAnimArgs
|
||||
_08099248: .4byte gSprites
|
||||
_0809924C:
|
||||
cmp r0, 0x2
|
||||
bne _08099252
|
||||
strh r3, [r6, 0x30]
|
||||
_08099252:
|
||||
ldr r0, _08099268 @ =gUnknown_2037F02
|
||||
ldr r0, _08099268 @ =gBattleAnimArgs
|
||||
ldrh r1, [r0, 0x2]
|
||||
lsls r0, r7, 8
|
||||
orrs r0, r1
|
||||
@@ -1116,7 +1116,7 @@ _08099252:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08099268: .4byte gUnknown_2037F02
|
||||
_08099268: .4byte gBattleAnimArgs
|
||||
_0809926C: .4byte sub_8099270
|
||||
thumb_func_end sub_80991B4
|
||||
|
||||
@@ -1188,21 +1188,21 @@ _080992DA:
|
||||
sub_80992E0: @ 80992E0
|
||||
push {r4-r6,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, _080992F4 @ =gUnknown_2037F02
|
||||
ldr r0, _080992F4 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080992FC
|
||||
ldr r0, _080992F8 @ =gUnknown_2037F1A
|
||||
ldr r0, _080992F8 @ =gBattleAnimAttacker
|
||||
b _080992FE
|
||||
.align 2, 0
|
||||
_080992F4: .4byte gUnknown_2037F02
|
||||
_080992F8: .4byte gUnknown_2037F1A
|
||||
_080992F4: .4byte gBattleAnimArgs
|
||||
_080992F8: .4byte gBattleAnimAttacker
|
||||
_080992FC:
|
||||
ldr r0, _0809937C @ =gUnknown_2037F1B
|
||||
ldr r0, _0809937C @ =gBattleAnimTarget
|
||||
_080992FE:
|
||||
ldrb r2, [r0]
|
||||
ldr r0, _08099380 @ =gUnknown_2023D44
|
||||
ldr r0, _08099380 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r0
|
||||
ldrb r6, [r0]
|
||||
adds r0, r2, 0
|
||||
@@ -1210,7 +1210,7 @@ _080992FE:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099328
|
||||
ldr r1, _08099384 @ =gUnknown_2037F02
|
||||
ldr r1, _08099384 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
@@ -1222,7 +1222,7 @@ _080992FE:
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
_08099328:
|
||||
ldr r2, _08099384 @ =gUnknown_2037F02
|
||||
ldr r2, _08099384 @ =gBattleAnimArgs
|
||||
ldrh r0, [r2, 0x8]
|
||||
movs r4, 0
|
||||
strh r0, [r5, 0x2E]
|
||||
@@ -1263,9 +1263,9 @@ _08099328:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0809937C: .4byte gUnknown_2037F1B
|
||||
_08099380: .4byte gUnknown_2023D44
|
||||
_08099384: .4byte gUnknown_2037F02
|
||||
_0809937C: .4byte gBattleAnimTarget
|
||||
_08099380: .4byte gBattlerSpriteIds
|
||||
_08099384: .4byte gBattleAnimArgs
|
||||
_08099388: .4byte gSprites
|
||||
_0809938C: .4byte DestroyAnimSprite
|
||||
_08099390: .4byte sub_8074E14
|
||||
@@ -1281,21 +1281,21 @@ sub_8099394: @ 8099394
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, _080993B4 @ =gUnknown_2037F02
|
||||
ldr r0, _080993B4 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080993BC
|
||||
ldr r0, _080993B8 @ =gUnknown_2037F1A
|
||||
ldr r0, _080993B8 @ =gBattleAnimAttacker
|
||||
b _080993BE
|
||||
.align 2, 0
|
||||
_080993B4: .4byte gUnknown_2037F02
|
||||
_080993B8: .4byte gUnknown_2037F1A
|
||||
_080993B4: .4byte gBattleAnimArgs
|
||||
_080993B8: .4byte gBattleAnimAttacker
|
||||
_080993BC:
|
||||
ldr r0, _0809943C @ =gUnknown_2037F1B
|
||||
ldr r0, _0809943C @ =gBattleAnimTarget
|
||||
_080993BE:
|
||||
ldrb r1, [r0]
|
||||
ldr r0, _08099440 @ =gUnknown_2023D44
|
||||
ldr r0, _08099440 @ =gBattlerSpriteIds
|
||||
adds r0, r1, r0
|
||||
ldrb r7, [r0]
|
||||
adds r0, r1, 0
|
||||
@@ -1303,7 +1303,7 @@ _080993BE:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080993E8
|
||||
ldr r1, _08099444 @ =gUnknown_2037F02
|
||||
ldr r1, _08099444 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
@@ -1315,7 +1315,7 @@ _080993BE:
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
_080993E8:
|
||||
ldr r5, _08099444 @ =gUnknown_2037F02
|
||||
ldr r5, _08099444 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r0, _08099448 @ =gSprites
|
||||
@@ -1356,9 +1356,9 @@ _080993E8:
|
||||
bl StoreSpriteCallbackInData6
|
||||
b _08099458
|
||||
.align 2, 0
|
||||
_0809943C: .4byte gUnknown_2037F1B
|
||||
_08099440: .4byte gUnknown_2023D44
|
||||
_08099444: .4byte gUnknown_2037F02
|
||||
_0809943C: .4byte gBattleAnimTarget
|
||||
_08099440: .4byte gBattlerSpriteIds
|
||||
_08099444: .4byte gBattleAnimArgs
|
||||
_08099448: .4byte gSprites
|
||||
_0809944C: .4byte DestroyAnimSprite
|
||||
_08099450:
|
||||
@@ -1408,7 +1408,7 @@ sub_809949C: @ 809949C
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r5, _08099520 @ =gUnknown_2037F02
|
||||
ldr r5, _08099520 @ =gBattleAnimArgs
|
||||
movs r0, 0x6
|
||||
ldrsh r1, [r5, r0]
|
||||
movs r0, 0x80
|
||||
@@ -1416,7 +1416,7 @@ sub_809949C: @ 809949C
|
||||
bl __divsi3
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
ldr r0, _08099524 @ =gUnknown_2037F1A
|
||||
ldr r0, _08099524 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -1468,8 +1468,8 @@ _080994CE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08099520: .4byte gUnknown_2037F02
|
||||
_08099524: .4byte gUnknown_2037F1A
|
||||
_08099520: .4byte gBattleAnimArgs
|
||||
_08099524: .4byte gBattleAnimAttacker
|
||||
_08099528: .4byte gTasks
|
||||
_0809952C: .4byte sub_8099530
|
||||
thumb_func_end sub_809949C
|
||||
@@ -1585,7 +1585,7 @@ sub_80995FC: @ 80995FC
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r1, _08099620 @ =gUnknown_2037F02
|
||||
ldr r1, _08099620 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0x2
|
||||
@@ -1600,18 +1600,18 @@ sub_80995FC: @ 80995FC
|
||||
lsrs r2, r0, 24
|
||||
b _08099664
|
||||
.align 2, 0
|
||||
_08099620: .4byte gUnknown_2037F02
|
||||
_08099620: .4byte gBattleAnimArgs
|
||||
_08099624:
|
||||
cmp r0, 0x3
|
||||
beq _08099634
|
||||
b _0809965C
|
||||
_0809962A:
|
||||
ldr r5, _08099630 @ =gUnknown_2037F1A
|
||||
ldr r5, _08099630 @ =gBattleAnimAttacker
|
||||
b _08099636
|
||||
.align 2, 0
|
||||
_08099630: .4byte gUnknown_2037F1A
|
||||
_08099630: .4byte gBattleAnimAttacker
|
||||
_08099634:
|
||||
ldr r5, _08099654 @ =gUnknown_2037F1B
|
||||
ldr r5, _08099654 @ =gBattleAnimTarget
|
||||
_08099636:
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
@@ -1620,15 +1620,15 @@ _08099636:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0809965C
|
||||
ldr r1, _08099658 @ =gUnknown_2023D44
|
||||
ldr r1, _08099658 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
eors r0, r4
|
||||
adds r0, r1
|
||||
ldrb r2, [r0]
|
||||
b _08099664
|
||||
.align 2, 0
|
||||
_08099654: .4byte gUnknown_2037F1B
|
||||
_08099658: .4byte gUnknown_2023D44
|
||||
_08099654: .4byte gBattleAnimTarget
|
||||
_08099658: .4byte gBattlerSpriteIds
|
||||
_0809965C:
|
||||
adds r0, r6, 0
|
||||
bl DestroyAnimVisualTask
|
||||
@@ -1640,21 +1640,21 @@ _08099664:
|
||||
lsls r0, 3
|
||||
adds r5, r0, r1
|
||||
strh r2, [r5, 0x8]
|
||||
ldr r0, _08099688 @ =gUnknown_2037F1B
|
||||
ldr r0, _08099688 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099690
|
||||
ldr r0, _0809968C @ =gUnknown_2037F02
|
||||
ldr r0, _0809968C @ =gBattleAnimArgs
|
||||
ldrh r0, [r0, 0x2]
|
||||
b _08099696
|
||||
.align 2, 0
|
||||
_08099684: .4byte gTasks
|
||||
_08099688: .4byte gUnknown_2037F1B
|
||||
_0809968C: .4byte gUnknown_2037F02
|
||||
_08099688: .4byte gBattleAnimTarget
|
||||
_0809968C: .4byte gBattleAnimArgs
|
||||
_08099690:
|
||||
ldr r0, _080996AC @ =gUnknown_2037F02
|
||||
ldr r0, _080996AC @ =gBattleAnimArgs
|
||||
ldrh r0, [r0, 0x2]
|
||||
negs r0, r0
|
||||
_08099696:
|
||||
@@ -1670,7 +1670,7 @@ _080996A4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080996AC: .4byte gUnknown_2037F02
|
||||
_080996AC: .4byte gBattleAnimArgs
|
||||
_080996B0: .4byte gTasks
|
||||
_080996B4: .4byte sub_80996B8
|
||||
thumb_func_end sub_80995FC
|
||||
@@ -1721,18 +1721,18 @@ sub_8099704: @ 8099704
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r6, _08099754 @ =gUnknown_2037F1A
|
||||
ldr r6, _08099754 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099720
|
||||
ldr r1, _08099758 @ =gUnknown_2037F02
|
||||
ldr r1, _08099758 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
_08099720:
|
||||
ldr r4, _08099758 @ =gUnknown_2037F02
|
||||
ldr r4, _08099758 @ =gBattleAnimArgs
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -1758,11 +1758,11 @@ _08099720:
|
||||
ldrb r0, [r6]
|
||||
b _08099764
|
||||
.align 2, 0
|
||||
_08099754: .4byte gUnknown_2037F1A
|
||||
_08099758: .4byte gUnknown_2037F02
|
||||
_08099754: .4byte gBattleAnimAttacker
|
||||
_08099758: .4byte gBattleAnimArgs
|
||||
_0809975C: .4byte gTasks
|
||||
_08099760:
|
||||
ldr r0, _0809977C @ =gUnknown_2037F1B
|
||||
ldr r0, _0809977C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
_08099764:
|
||||
strh r0, [r2, 0x12]
|
||||
@@ -1778,7 +1778,7 @@ _08099764:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0809977C: .4byte gUnknown_2037F1B
|
||||
_0809977C: .4byte gBattleAnimTarget
|
||||
_08099780: .4byte gTasks
|
||||
_08099784: .4byte sub_8099788
|
||||
thumb_func_end sub_8099704
|
||||
@@ -1944,7 +1944,7 @@ sub_80998B0: @ 80998B0
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r6, _080998FC @ =gUnknown_2037F02
|
||||
ldr r6, _080998FC @ =gBattleAnimArgs
|
||||
ldrb r0, [r6, 0x6]
|
||||
bl GetAnimBankSpriteId
|
||||
adds r5, r0, 0
|
||||
@@ -1977,7 +1977,7 @@ sub_80998B0: @ 80998B0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080998FC: .4byte gUnknown_2037F02
|
||||
_080998FC: .4byte gBattleAnimArgs
|
||||
_08099900: .4byte gTasks
|
||||
_08099904: .4byte sub_8099908
|
||||
thumb_func_end sub_80998B0
|
||||
@@ -2051,7 +2051,7 @@ sub_8099980: @ 8099980
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldr r4, _080999BC @ =gUnknown_2037F02
|
||||
ldr r4, _080999BC @ =gBattleAnimArgs
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -2075,7 +2075,7 @@ sub_8099980: @ 8099980
|
||||
strh r1, [r2, 0xE]
|
||||
b _080999D0
|
||||
.align 2, 0
|
||||
_080999BC: .4byte gUnknown_2037F02
|
||||
_080999BC: .4byte gBattleAnimArgs
|
||||
_080999C0: .4byte gTasks
|
||||
_080999C4:
|
||||
ldrh r0, [r4]
|
||||
@@ -2090,7 +2090,7 @@ _080999D0:
|
||||
adds r0, r4, r7
|
||||
lsls r0, 3
|
||||
adds r5, r0, r1
|
||||
ldr r6, _08099A00 @ =gUnknown_2037F02
|
||||
ldr r6, _08099A00 @ =gBattleAnimArgs
|
||||
ldrh r0, [r6, 0x2]
|
||||
strh r0, [r5, 0x10]
|
||||
mov r0, r8
|
||||
@@ -2107,18 +2107,18 @@ _080999D0:
|
||||
b _08099A28
|
||||
.align 2, 0
|
||||
_080999FC: .4byte gTasks
|
||||
_08099A00: .4byte gUnknown_2037F02
|
||||
_08099A00: .4byte gBattleAnimArgs
|
||||
_08099A04:
|
||||
movs r1, 0x4
|
||||
ldrsh r0, [r6, r1]
|
||||
cmp r0, 0
|
||||
bne _08099A14
|
||||
ldr r0, _08099A10 @ =gUnknown_2037F1A
|
||||
ldr r0, _08099A10 @ =gBattleAnimAttacker
|
||||
b _08099A16
|
||||
.align 2, 0
|
||||
_08099A10: .4byte gUnknown_2037F1A
|
||||
_08099A10: .4byte gBattleAnimAttacker
|
||||
_08099A14:
|
||||
ldr r0, _08099A6C @ =gUnknown_2037F1B
|
||||
ldr r0, _08099A6C @ =gBattleAnimTarget
|
||||
_08099A16:
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
@@ -2165,7 +2165,7 @@ _08099A54:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08099A6C: .4byte gUnknown_2037F1B
|
||||
_08099A6C: .4byte gBattleAnimTarget
|
||||
_08099A70: .4byte gTasks
|
||||
_08099A74: .4byte sub_8099B54
|
||||
thumb_func_end sub_8099980
|
||||
@@ -2177,7 +2177,7 @@ sub_8099A78: @ 8099A78
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08099AB4 @ =gUnknown_2037F02
|
||||
ldr r4, _08099AB4 @ =gBattleAnimArgs
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -2198,14 +2198,14 @@ sub_8099A78: @ 8099A78
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _08099AC0
|
||||
ldr r0, _08099ABC @ =gUnknown_2037F1A
|
||||
ldr r0, _08099ABC @ =gBattleAnimAttacker
|
||||
b _08099AC2
|
||||
.align 2, 0
|
||||
_08099AB4: .4byte gUnknown_2037F02
|
||||
_08099AB4: .4byte gBattleAnimArgs
|
||||
_08099AB8: .4byte gTasks
|
||||
_08099ABC: .4byte gUnknown_2037F1A
|
||||
_08099ABC: .4byte gBattleAnimAttacker
|
||||
_08099AC0:
|
||||
ldr r0, _08099AF0 @ =gUnknown_2037F1B
|
||||
ldr r0, _08099AF0 @ =gBattleAnimTarget
|
||||
_08099AC2:
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
@@ -2216,7 +2216,7 @@ _08099AC2:
|
||||
negs r0, r0
|
||||
strh r0, [r4, 0x2]
|
||||
_08099AD4:
|
||||
ldr r0, _08099AF4 @ =gUnknown_2037F02
|
||||
ldr r0, _08099AF4 @ =gBattleAnimArgs
|
||||
movs r2, 0x6
|
||||
ldrsh r1, [r0, r2]
|
||||
adds r6, r0, 0
|
||||
@@ -2231,8 +2231,8 @@ _08099AD4:
|
||||
strh r1, [r0, 0xE]
|
||||
b _08099B16
|
||||
.align 2, 0
|
||||
_08099AF0: .4byte gUnknown_2037F1B
|
||||
_08099AF4: .4byte gUnknown_2037F02
|
||||
_08099AF0: .4byte gBattleAnimTarget
|
||||
_08099AF4: .4byte gBattleAnimArgs
|
||||
_08099AF8: .4byte gTasks
|
||||
_08099AFC:
|
||||
ldr r3, _08099B4C @ =gTasks
|
||||
@@ -2356,7 +2356,7 @@ sub_8099BD4: @ 8099BD4
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldr r0, _08099C00 @ =gUnknown_2037F02
|
||||
ldr r0, _08099C00 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
ldrsh r1, [r0, r2]
|
||||
mov r8, r0
|
||||
@@ -2373,7 +2373,7 @@ sub_8099BD4: @ 8099BD4
|
||||
bl __udivsi3
|
||||
b _08099C20
|
||||
.align 2, 0
|
||||
_08099C00: .4byte gUnknown_2037F02
|
||||
_08099C00: .4byte gBattleAnimArgs
|
||||
_08099C04: .4byte gTasks
|
||||
_08099C08: .4byte gUnknown_2037EEC
|
||||
_08099C0C:
|
||||
@@ -711,37 +711,37 @@ GetAnimBankSpriteId: @ 80749D4
|
||||
adds r1, r0, 0
|
||||
cmp r0, 0
|
||||
bne _080749FC
|
||||
ldr r4, _080749F4 @ =gUnknown_2037F1A
|
||||
ldr r4, _080749F4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
bl sub_8075224
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08074A4A
|
||||
ldr r1, _080749F8 @ =gUnknown_2023D44
|
||||
ldr r1, _080749F8 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r4]
|
||||
b _08074A5A
|
||||
.align 2, 0
|
||||
_080749F4: .4byte gUnknown_2037F1A
|
||||
_080749F8: .4byte gUnknown_2023D44
|
||||
_080749F4: .4byte gBattleAnimAttacker
|
||||
_080749F8: .4byte gBattlerSpriteIds
|
||||
_080749FC:
|
||||
cmp r0, 0x1
|
||||
bne _08074A1C
|
||||
ldr r4, _08074A14 @ =gUnknown_2037F1B
|
||||
ldr r4, _08074A14 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
bl sub_8075224
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08074A4A
|
||||
ldr r1, _08074A18 @ =gUnknown_2023D44
|
||||
ldr r1, _08074A18 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r4]
|
||||
b _08074A5A
|
||||
.align 2, 0
|
||||
_08074A14: .4byte gUnknown_2037F1B
|
||||
_08074A18: .4byte gUnknown_2023D44
|
||||
_08074A14: .4byte gBattleAnimTarget
|
||||
_08074A18: .4byte gBattlerSpriteIds
|
||||
_08074A1C:
|
||||
cmp r1, 0x2
|
||||
bne _08074A38
|
||||
ldr r5, _08074A34 @ =gUnknown_2037F1A
|
||||
ldr r5, _08074A34 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
@@ -751,9 +751,9 @@ _08074A1C:
|
||||
beq _08074A4A
|
||||
b _08074A54
|
||||
.align 2, 0
|
||||
_08074A34: .4byte gUnknown_2037F1A
|
||||
_08074A34: .4byte gBattleAnimAttacker
|
||||
_08074A38:
|
||||
ldr r5, _08074A50 @ =gUnknown_2037F1B
|
||||
ldr r5, _08074A50 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
@@ -765,9 +765,9 @@ _08074A4A:
|
||||
movs r0, 0xFF
|
||||
b _08074A5E
|
||||
.align 2, 0
|
||||
_08074A50: .4byte gUnknown_2037F1B
|
||||
_08074A50: .4byte gBattleAnimTarget
|
||||
_08074A54:
|
||||
ldr r1, _08074A64 @ =gUnknown_2023D44
|
||||
ldr r1, _08074A64 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
eors r0, r4
|
||||
_08074A5A:
|
||||
@@ -778,7 +778,7 @@ _08074A5E:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08074A64: .4byte gUnknown_2023D44
|
||||
_08074A64: .4byte gBattlerSpriteIds
|
||||
thumb_func_end GetAnimBankSpriteId
|
||||
|
||||
thumb_func_start StoreSpriteCallbackInData6
|
||||
@@ -1242,7 +1242,7 @@ sub_8074D80: @ 8074D80
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x34]
|
||||
ldr r5, _08074DBC @ =gUnknown_2037F1B
|
||||
ldr r5, _08074DBC @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -1261,7 +1261,7 @@ sub_8074D80: @ 8074D80
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08074DBC: .4byte gUnknown_2037F1B
|
||||
_08074DBC: .4byte gBattleAnimTarget
|
||||
_08074DC0: .4byte sub_8074C64
|
||||
thumb_func_end sub_8074D80
|
||||
|
||||
@@ -1443,7 +1443,7 @@ sub_8074EF4: @ 8074EF4
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x34]
|
||||
ldr r5, _08074F30 @ =gUnknown_2037F1A
|
||||
ldr r5, _08074F30 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -1462,7 +1462,7 @@ sub_8074EF4: @ 8074EF4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08074F30: .4byte gUnknown_2037F1A
|
||||
_08074F30: .4byte gBattleAnimAttacker
|
||||
_08074F34: .4byte sub_8074C64
|
||||
thumb_func_end sub_8074EF4
|
||||
|
||||
@@ -1553,7 +1553,7 @@ sub_8074FA8: @ 8074FA8
|
||||
sub_8074FCC: @ 8074FCC
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, _08074FF4 @ =gUnknown_2037F1A
|
||||
ldr r4, _08074FF4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -1570,7 +1570,7 @@ sub_8074FCC: @ 8074FCC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08074FF4: .4byte gUnknown_2037F1A
|
||||
_08074FF4: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_8074FCC
|
||||
|
||||
thumb_func_start sub_8074FF8
|
||||
@@ -1582,13 +1582,13 @@ sub_8074FF8: @ 8074FF8
|
||||
lsls r1, 16
|
||||
lsrs r5, r1, 16
|
||||
mov r8, r5
|
||||
ldr r7, _08075030 @ =gUnknown_2037F1A
|
||||
ldr r7, _08075030 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r7]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r0, _08075034 @ =gUnknown_2037F1B
|
||||
ldr r0, _08075034 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
@@ -1601,8 +1601,8 @@ sub_8074FF8: @ 8074FF8
|
||||
lsls r0, r5, 16
|
||||
b _08075054
|
||||
.align 2, 0
|
||||
_08075030: .4byte gUnknown_2037F1A
|
||||
_08075034: .4byte gUnknown_2037F1B
|
||||
_08075030: .4byte gBattleAnimAttacker
|
||||
_08075034: .4byte gBattleAnimTarget
|
||||
_08075038:
|
||||
ldrb r0, [r7]
|
||||
bl GetBattlerSide
|
||||
@@ -1738,7 +1738,7 @@ sub_8075114: @ 8075114
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
bne _0807513C
|
||||
ldr r4, _08075158 @ =gUnknown_2037F1B
|
||||
ldr r4, _08075158 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074844
|
||||
@@ -1752,7 +1752,7 @@ sub_8075114: @ 8075114
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
_0807513C:
|
||||
ldr r4, _0807515C @ =gUnknown_2037F02
|
||||
ldr r4, _0807515C @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
ldrsh r1, [r4, r0]
|
||||
adds r0, r5, 0
|
||||
@@ -1765,8 +1765,8 @@ _0807513C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08075158: .4byte gUnknown_2037F1B
|
||||
_0807515C: .4byte gUnknown_2037F02
|
||||
_08075158: .4byte gBattleAnimTarget
|
||||
_0807515C: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_8075114
|
||||
|
||||
thumb_func_start sub_8075160
|
||||
@@ -1776,7 +1776,7 @@ sub_8075160: @ 8075160
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
bne _08075184
|
||||
ldr r4, _08075180 @ =gUnknown_2037F1A
|
||||
ldr r4, _08075180 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074844
|
||||
@@ -1787,9 +1787,9 @@ sub_8075160: @ 8075160
|
||||
movs r1, 0x1
|
||||
b _08075198
|
||||
.align 2, 0
|
||||
_08075180: .4byte gUnknown_2037F1A
|
||||
_08075180: .4byte gBattleAnimAttacker
|
||||
_08075184:
|
||||
ldr r4, _080751BC @ =gUnknown_2037F1A
|
||||
ldr r4, _080751BC @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074844
|
||||
@@ -1803,7 +1803,7 @@ _08075198:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
ldr r4, _080751C0 @ =gUnknown_2037F02
|
||||
ldr r4, _080751C0 @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
ldrsh r1, [r4, r0]
|
||||
adds r0, r5, 0
|
||||
@@ -1816,8 +1816,8 @@ _08075198:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080751BC: .4byte gUnknown_2037F1A
|
||||
_080751C0: .4byte gUnknown_2037F02
|
||||
_080751BC: .4byte gBattleAnimAttacker
|
||||
_080751C0: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_8075160
|
||||
|
||||
thumb_func_start GetBattlerSide
|
||||
@@ -2011,7 +2011,7 @@ sub_8075300: @ 8075300
|
||||
ldr r0, _08075338 @ =gUnknown_2022BBC
|
||||
ldr r0, [r0]
|
||||
str r0, [r4, 0x4]
|
||||
ldr r0, _0807533C @ =gUnknown_2037F1A
|
||||
ldr r0, _0807533C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_80768B0
|
||||
lsls r0, 24
|
||||
@@ -2030,7 +2030,7 @@ sub_8075300: @ 8075300
|
||||
.align 2, 0
|
||||
_08075334: .4byte gUnknown_2022BB8
|
||||
_08075338: .4byte gUnknown_2022BBC
|
||||
_0807533C: .4byte gUnknown_2037F1A
|
||||
_0807533C: .4byte gBattleAnimAttacker
|
||||
_08075340:
|
||||
movs r1, 0
|
||||
movs r0, 0x9
|
||||
@@ -3252,7 +3252,7 @@ sub_8075BE8: @ 8075BE8
|
||||
_08075C1C:
|
||||
cmp r1, 0
|
||||
beq _08075C2E
|
||||
ldr r0, _08075CB0 @ =gUnknown_2037F1A
|
||||
ldr r0, _08075CB0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x10
|
||||
@@ -3262,7 +3262,7 @@ _08075C1C:
|
||||
_08075C2E:
|
||||
cmp r2, 0
|
||||
beq _08075C40
|
||||
ldr r0, _08075CB4 @ =gUnknown_2037F1B
|
||||
ldr r0, _08075CB4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x10
|
||||
@@ -3272,7 +3272,7 @@ _08075C2E:
|
||||
_08075C40:
|
||||
cmp r3, 0
|
||||
beq _08075C64
|
||||
ldr r6, _08075CB0 @ =gUnknown_2037F1A
|
||||
ldr r6, _08075CB0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
@@ -3290,7 +3290,7 @@ _08075C40:
|
||||
_08075C64:
|
||||
cmp r7, 0
|
||||
beq _08075C88
|
||||
ldr r6, _08075CB4 @ =gUnknown_2037F1B
|
||||
ldr r6, _08075CB4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
@@ -3328,8 +3328,8 @@ _08075CA0:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08075CB0: .4byte gUnknown_2037F1A
|
||||
_08075CB4: .4byte gUnknown_2037F1B
|
||||
_08075CB0: .4byte gBattleAnimAttacker
|
||||
_08075CB4: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_8075BE8
|
||||
|
||||
thumb_func_start sub_8075CB8
|
||||
@@ -3454,7 +3454,7 @@ sub_8075D9C: @ 8075D9C
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _08075DDA
|
||||
ldr r2, _08075DC8 @ =gUnknown_2037F02
|
||||
ldr r2, _08075DC8 @ =gBattleAnimArgs
|
||||
movs r3, 0x6
|
||||
ldrsh r0, [r2, r3]
|
||||
movs r1, 0
|
||||
@@ -3470,7 +3470,7 @@ _08075DB6:
|
||||
bl sub_8075160
|
||||
b _08075DD2
|
||||
.align 2, 0
|
||||
_08075DC8: .4byte gUnknown_2037F02
|
||||
_08075DC8: .4byte gBattleAnimArgs
|
||||
_08075DCC:
|
||||
adds r0, r4, 0
|
||||
bl sub_8075114
|
||||
@@ -3499,7 +3499,7 @@ _08075DEE:
|
||||
sub_8075DF4: @ 8075DF4
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r6, _08075E6C @ =gUnknown_2037F02
|
||||
ldr r6, _08075E6C @ =gBattleAnimArgs
|
||||
movs r1, 0xA
|
||||
ldrsh r0, [r6, r1]
|
||||
movs r1, 0xFF
|
||||
@@ -3518,7 +3518,7 @@ _08075E0C:
|
||||
_08075E16:
|
||||
adds r0, r5, 0
|
||||
bl sub_8075160
|
||||
ldr r0, _08075E70 @ =gUnknown_2037F1A
|
||||
ldr r0, _08075E70 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -3530,7 +3530,7 @@ _08075E16:
|
||||
_08075E30:
|
||||
ldrh r0, [r6, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r4, _08075E74 @ =gUnknown_2037F1B
|
||||
ldr r4, _08075E74 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -3556,9 +3556,9 @@ _08075E30:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08075E6C: .4byte gUnknown_2037F02
|
||||
_08075E70: .4byte gUnknown_2037F1A
|
||||
_08075E74: .4byte gUnknown_2037F1B
|
||||
_08075E6C: .4byte gBattleAnimArgs
|
||||
_08075E70: .4byte gBattleAnimAttacker
|
||||
_08075E74: .4byte gBattleAnimTarget
|
||||
_08075E78: .4byte sub_8075590
|
||||
_08075E7C: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_8075DF4
|
||||
@@ -3569,21 +3569,21 @@ sub_8075E80: @ 8075E80
|
||||
adds r6, r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldr r0, _08075EE0 @ =gUnknown_2037F1A
|
||||
ldr r0, _08075EE0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08075EA0
|
||||
ldr r1, _08075EE4 @ =gUnknown_2037F02
|
||||
ldr r1, _08075EE4 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
_08075EA0:
|
||||
ldr r4, _08075EE4 @ =gUnknown_2037F02
|
||||
ldr r4, _08075EE4 @ =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r5, _08075EE8 @ =gUnknown_2037F1B
|
||||
ldr r5, _08075EE8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -3610,9 +3610,9 @@ _08075EA0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08075EE0: .4byte gUnknown_2037F1A
|
||||
_08075EE4: .4byte gUnknown_2037F02
|
||||
_08075EE8: .4byte gUnknown_2037F1B
|
||||
_08075EE0: .4byte gBattleAnimAttacker
|
||||
_08075EE4: .4byte gBattleAnimArgs
|
||||
_08075EE8: .4byte gBattleAnimTarget
|
||||
_08075EEC: .4byte sub_8075EF0
|
||||
thumb_func_end sub_8075E80
|
||||
|
||||
@@ -3636,7 +3636,7 @@ _08075F04:
|
||||
sub_8075F0C: @ 8075F0C
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, _08075F20 @ =gUnknown_2037F02
|
||||
ldr r0, _08075F20 @ =gBattleAnimArgs
|
||||
movs r2, 0xC
|
||||
ldrsh r1, [r0, r2]
|
||||
cmp r1, 0
|
||||
@@ -3645,7 +3645,7 @@ sub_8075F0C: @ 8075F0C
|
||||
movs r7, 0x3
|
||||
b _08075F28
|
||||
.align 2, 0
|
||||
_08075F20: .4byte gUnknown_2037F02
|
||||
_08075F20: .4byte gBattleAnimArgs
|
||||
_08075F24:
|
||||
movs r4, 0
|
||||
movs r7, 0x1
|
||||
@@ -3657,24 +3657,24 @@ _08075F28:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_8075160
|
||||
ldr r0, _08075F3C @ =gUnknown_2037F1A
|
||||
ldr r0, _08075F3C @ =gBattleAnimAttacker
|
||||
b _08075F4A
|
||||
.align 2, 0
|
||||
_08075F3C: .4byte gUnknown_2037F1A
|
||||
_08075F3C: .4byte gBattleAnimAttacker
|
||||
_08075F40:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_8075114
|
||||
ldr r0, _08075FA8 @ =gUnknown_2037F1B
|
||||
ldr r0, _08075FA8 @ =gBattleAnimTarget
|
||||
_08075F4A:
|
||||
ldrb r6, [r0]
|
||||
ldr r0, _08075FAC @ =gUnknown_2037F1A
|
||||
ldr r0, _08075FAC @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08075F62
|
||||
ldr r1, _08075FB0 @ =gUnknown_2037F02
|
||||
ldr r1, _08075FB0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
@@ -3682,7 +3682,7 @@ _08075F62:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_8075114
|
||||
ldr r4, _08075FB0 @ =gUnknown_2037F02
|
||||
ldr r4, _08075FB0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
adds r0, r6, 0
|
||||
@@ -3710,9 +3710,9 @@ _08075F62:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08075FA8: .4byte gUnknown_2037F1B
|
||||
_08075FAC: .4byte gUnknown_2037F1A
|
||||
_08075FB0: .4byte gUnknown_2037F02
|
||||
_08075FA8: .4byte gBattleAnimTarget
|
||||
_08075FAC: .4byte gBattleAnimAttacker
|
||||
_08075FB0: .4byte gBattleAnimArgs
|
||||
_08075FB4: .4byte sub_8075590
|
||||
_08075FB8: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_8075F0C
|
||||
@@ -3801,7 +3801,7 @@ sub_8076048: @ 8076048
|
||||
lsrs r5, r0, 24
|
||||
movs r6, 0
|
||||
movs r3, 0
|
||||
ldr r2, _080760C0 @ =gUnknown_2037F02
|
||||
ldr r2, _080760C0 @ =gBattleAnimArgs
|
||||
movs r0, 0x4
|
||||
ldrsh r1, [r2, r0]
|
||||
movs r4, 0
|
||||
@@ -3860,7 +3860,7 @@ _0807607C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080760C0: .4byte gUnknown_2037F02
|
||||
_080760C0: .4byte gBattleAnimArgs
|
||||
_080760C4: .4byte 0x0000ffff
|
||||
_080760C8: .4byte gTasks
|
||||
_080760CC: .4byte sub_80760D0
|
||||
@@ -3952,7 +3952,7 @@ sub_807616C: @ 807616C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _0807618C @ =gUnknown_2037F02
|
||||
ldr r0, _0807618C @ =gBattleAnimArgs
|
||||
ldrb r0, [r0]
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
@@ -3963,7 +3963,7 @@ sub_807616C: @ 807616C
|
||||
bl DestroyAnimVisualTask
|
||||
b _080761B6
|
||||
.align 2, 0
|
||||
_0807618C: .4byte gUnknown_2037F02
|
||||
_0807618C: .4byte gBattleAnimArgs
|
||||
_08076190:
|
||||
ldr r1, _080761BC @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
@@ -3995,7 +3995,7 @@ _080761C4: .4byte 0x00000101
|
||||
|
||||
thumb_func_start sub_80761C8
|
||||
sub_80761C8: @ 80761C8
|
||||
ldr r3, _080761E8 @ =gUnknown_2037F02
|
||||
ldr r3, _080761E8 @ =gBattleAnimArgs
|
||||
ldrh r1, [r3, 0x2]
|
||||
movs r2, 0
|
||||
strh r1, [r0, 0xA]
|
||||
@@ -4012,7 +4012,7 @@ sub_80761C8: @ 80761C8
|
||||
str r1, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080761E8: .4byte gUnknown_2037F02
|
||||
_080761E8: .4byte gBattleAnimArgs
|
||||
_080761EC: .4byte sub_80761F0
|
||||
thumb_func_end sub_80761C8
|
||||
|
||||
@@ -4099,7 +4099,7 @@ sub_8076288: @ 8076288
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _080762A8 @ =gUnknown_2037F02
|
||||
ldr r0, _080762A8 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0]
|
||||
bl IndexOfSpritePaletteTag
|
||||
lsls r0, 24
|
||||
@@ -4110,7 +4110,7 @@ sub_8076288: @ 8076288
|
||||
bl DestroyAnimVisualTask
|
||||
b _080762C2
|
||||
.align 2, 0
|
||||
_080762A8: .4byte gUnknown_2037F02
|
||||
_080762A8: .4byte gBattleAnimArgs
|
||||
_080762AC:
|
||||
ldr r1, _080762C8 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
@@ -4428,7 +4428,7 @@ sub_80764EC: @ 80764EC
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
movs r4, 0
|
||||
ldr r1, _0807654C @ =gUnknown_2023D44
|
||||
ldr r1, _0807654C @ =gBattlerSpriteIds
|
||||
ldr r6, _08076550 @ =gBattlerPartyIndexes
|
||||
_08076508:
|
||||
adds r0, r4, r1
|
||||
@@ -4463,7 +4463,7 @@ _08076508:
|
||||
b _0807655E
|
||||
.align 2, 0
|
||||
_08076548: .4byte gSprites
|
||||
_0807654C: .4byte gUnknown_2023D44
|
||||
_0807654C: .4byte gBattlerSpriteIds
|
||||
_08076550: .4byte gBattlerPartyIndexes
|
||||
_08076554: .4byte gUnknown_2024018
|
||||
_08076558: .4byte gPlayerParty
|
||||
@@ -4680,7 +4680,7 @@ sub_80766B8: @ 80766B8
|
||||
bhi _080766D6
|
||||
movs r1, 0x2
|
||||
_080766D6:
|
||||
ldr r0, _080766E8 @ =gUnknown_2037F02
|
||||
ldr r0, _080766E8 @ =gBattleAnimArgs
|
||||
strh r1, [r0, 0xE]
|
||||
adds r0, r2, 0
|
||||
bl DestroyAnimVisualTask
|
||||
@@ -4688,7 +4688,7 @@ _080766D6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080766E4: .4byte gUnknown_2037EFE
|
||||
_080766E8: .4byte gUnknown_2037F02
|
||||
_080766E8: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80766B8
|
||||
|
||||
thumb_func_start sub_80766EC
|
||||
@@ -4699,14 +4699,14 @@ sub_80766EC: @ 80766EC
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r7, r4, 0
|
||||
ldr r6, _080767E0 @ =gUnknown_2037F1B
|
||||
ldr r6, _080767E0 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
bl sub_8072DF0
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807672C
|
||||
ldr r2, _080767E4 @ =gSprites
|
||||
ldr r1, _080767E8 @ =gUnknown_2023D44
|
||||
ldr r1, _080767E8 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r6]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -4725,7 +4725,7 @@ sub_80766EC: @ 80766EC
|
||||
orrs r0, r2
|
||||
strb r0, [r1, 0x5]
|
||||
_0807672C:
|
||||
ldr r0, _080767EC @ =gUnknown_2037F1A
|
||||
ldr r0, _080767EC @ =gBattleAnimAttacker
|
||||
mov r8, r0
|
||||
ldrb r0, [r0]
|
||||
bl sub_8072DF0
|
||||
@@ -4733,7 +4733,7 @@ _0807672C:
|
||||
cmp r0, 0
|
||||
beq _08076764
|
||||
ldr r2, _080767E4 @ =gSprites
|
||||
ldr r1, _080767E8 @ =gUnknown_2023D44
|
||||
ldr r1, _080767E8 @ =gBattlerSpriteIds
|
||||
mov r3, r8
|
||||
ldrb r0, [r3]
|
||||
adds r0, r1
|
||||
@@ -4761,7 +4761,7 @@ _08076764:
|
||||
cmp r0, 0
|
||||
beq _0807679C
|
||||
ldr r2, _080767E4 @ =gSprites
|
||||
ldr r1, _080767E8 @ =gUnknown_2023D44
|
||||
ldr r1, _080767E8 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r6]
|
||||
eors r0, r5
|
||||
adds r0, r1
|
||||
@@ -4789,7 +4789,7 @@ _0807679C:
|
||||
cmp r0, 0
|
||||
beq _080767D4
|
||||
ldr r2, _080767E4 @ =gSprites
|
||||
ldr r1, _080767E8 @ =gUnknown_2023D44
|
||||
ldr r1, _080767E8 @ =gBattlerSpriteIds
|
||||
mov r3, r8
|
||||
ldrb r0, [r3]
|
||||
eors r0, r5
|
||||
@@ -4815,10 +4815,10 @@ _080767D4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080767E0: .4byte gUnknown_2037F1B
|
||||
_080767E0: .4byte gBattleAnimTarget
|
||||
_080767E4: .4byte gSprites
|
||||
_080767E8: .4byte gUnknown_2023D44
|
||||
_080767EC: .4byte gUnknown_2037F1A
|
||||
_080767E8: .4byte gBattlerSpriteIds
|
||||
_080767EC: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80766EC
|
||||
|
||||
thumb_func_start sub_80767F0
|
||||
@@ -4840,7 +4840,7 @@ _080767FE:
|
||||
beq _08076840
|
||||
adds r0, r4, 0
|
||||
bl sub_807685C
|
||||
ldr r3, _08076858 @ =gUnknown_2023D44
|
||||
ldr r3, _08076858 @ =gBattlerSpriteIds
|
||||
adds r3, r5, r3
|
||||
ldrb r2, [r3]
|
||||
lsls r1, r2, 4
|
||||
@@ -4875,7 +4875,7 @@ _0807684A:
|
||||
.align 2, 0
|
||||
_08076850: .4byte gBattlersCount
|
||||
_08076854: .4byte gSprites
|
||||
_08076858: .4byte gUnknown_2023D44
|
||||
_08076858: .4byte gBattlerSpriteIds
|
||||
thumb_func_end sub_80767F0
|
||||
|
||||
thumb_func_start sub_807685C
|
||||
@@ -5719,13 +5719,13 @@ sub_8076ED8: @ 8076ED8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8074FCC
|
||||
ldr r0, _08076F10 @ =gUnknown_2037F1A
|
||||
ldr r0, _08076F10 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08076F18
|
||||
ldr r2, _08076F14 @ =gUnknown_2037F02
|
||||
ldr r2, _08076F14 @ =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x20]
|
||||
ldrh r1, [r2]
|
||||
subs r0, r1
|
||||
@@ -5742,10 +5742,10 @@ sub_8076ED8: @ 8076ED8
|
||||
adds r1, r2, 0
|
||||
b _08076F22
|
||||
.align 2, 0
|
||||
_08076F10: .4byte gUnknown_2037F1A
|
||||
_08076F14: .4byte gUnknown_2037F02
|
||||
_08076F10: .4byte gBattleAnimAttacker
|
||||
_08076F14: .4byte gBattleAnimArgs
|
||||
_08076F18:
|
||||
ldr r1, _08076F4C @ =gUnknown_2037F02
|
||||
ldr r1, _08076F4C @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r4, 0x20]
|
||||
adds r0, r2
|
||||
@@ -5772,7 +5772,7 @@ _08076F22:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08076F4C: .4byte gUnknown_2037F02
|
||||
_08076F4C: .4byte gBattleAnimArgs
|
||||
_08076F50: .4byte move_anim_8074EE0
|
||||
_08076F54: .4byte sub_8074E70
|
||||
thumb_func_end sub_8076ED8
|
||||
@@ -5781,13 +5781,13 @@ _08076F54: .4byte sub_8074E70
|
||||
sub_8076F58: @ 8076F58
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _08076F80 @ =gUnknown_2037F1A
|
||||
ldr r0, _08076F80 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08076F88
|
||||
ldr r2, _08076F84 @ =gUnknown_2037F02
|
||||
ldr r2, _08076F84 @ =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x20]
|
||||
ldrh r1, [r2]
|
||||
subs r0, r1
|
||||
@@ -5799,10 +5799,10 @@ sub_8076F58: @ 8076F58
|
||||
adds r1, r2, 0
|
||||
b _08076F92
|
||||
.align 2, 0
|
||||
_08076F80: .4byte gUnknown_2037F1A
|
||||
_08076F84: .4byte gUnknown_2037F02
|
||||
_08076F80: .4byte gBattleAnimAttacker
|
||||
_08076F84: .4byte gBattleAnimArgs
|
||||
_08076F88:
|
||||
ldr r1, _08076FC4 @ =gUnknown_2037F02
|
||||
ldr r1, _08076FC4 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r4, 0x20]
|
||||
adds r0, r2
|
||||
@@ -5832,7 +5832,7 @@ _08076F92:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08076FC4: .4byte gUnknown_2037F02
|
||||
_08076FC4: .4byte gBattleAnimArgs
|
||||
_08076FC8: .4byte move_anim_8074EE0
|
||||
_08076FCC: .4byte sub_8074E70
|
||||
thumb_func_end sub_8076F58
|
||||
@@ -5842,23 +5842,23 @@ sub_8076FD0: @ 8076FD0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8074FCC
|
||||
ldr r0, _08076FF4 @ =gUnknown_2037F1A
|
||||
ldr r0, _08076FF4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08076FFC
|
||||
ldr r0, _08076FF8 @ =gUnknown_2037F02
|
||||
ldr r0, _08076FF8 @ =gBattleAnimArgs
|
||||
ldrh r1, [r4, 0x20]
|
||||
ldrh r2, [r0]
|
||||
subs r1, r2
|
||||
strh r1, [r4, 0x20]
|
||||
b _08077008
|
||||
.align 2, 0
|
||||
_08076FF4: .4byte gUnknown_2037F1A
|
||||
_08076FF8: .4byte gUnknown_2037F02
|
||||
_08076FF4: .4byte gBattleAnimAttacker
|
||||
_08076FF8: .4byte gBattleAnimArgs
|
||||
_08076FFC:
|
||||
ldr r1, _08077024 @ =gUnknown_2037F02
|
||||
ldr r1, _08077024 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r4, 0x20]
|
||||
adds r0, r2
|
||||
@@ -5878,7 +5878,7 @@ _08077008:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08077024: .4byte gUnknown_2037F02
|
||||
_08077024: .4byte gBattleAnimArgs
|
||||
_08077028: .4byte sub_8074F6C
|
||||
_0807702C: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_8076FD0
|
||||
@@ -5899,7 +5899,7 @@ sub_8077030: @ 8077030
|
||||
lsrs r0, 24
|
||||
movs r6, 0
|
||||
strh r0, [r5, 0x8]
|
||||
ldr r7, _080770C8 @ =gUnknown_2037F1A
|
||||
ldr r7, _080770C8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r7]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -5959,7 +5959,7 @@ _080770C0:
|
||||
b _080770D6
|
||||
.align 2, 0
|
||||
_080770C4: .4byte gTasks
|
||||
_080770C8: .4byte gUnknown_2037F1A
|
||||
_080770C8: .4byte gBattleAnimAttacker
|
||||
_080770CC: .4byte gSprites
|
||||
_080770D0: .4byte 0x00002771
|
||||
_080770D4:
|
||||
@@ -5974,7 +5974,7 @@ _080770D6:
|
||||
adds r1, r2
|
||||
ldr r2, _0807710C @ =0x04000008
|
||||
bl CpuSet
|
||||
ldr r0, _08077110 @ =gUnknown_2037F02
|
||||
ldr r0, _08077110 @ =gBattleAnimArgs
|
||||
ldrb r2, [r0, 0x2]
|
||||
ldrh r3, [r0]
|
||||
adds r0, r6, 0
|
||||
@@ -5989,7 +5989,7 @@ _080770D6:
|
||||
_08077104: .4byte gPlttBufferUnfaded
|
||||
_08077108: .4byte gPlttBufferFaded
|
||||
_0807710C: .4byte 0x04000008
|
||||
_08077110: .4byte gUnknown_2037F02
|
||||
_08077110: .4byte gBattleAnimArgs
|
||||
_08077114: .4byte sub_8077118
|
||||
thumb_func_end sub_8077030
|
||||
|
||||
@@ -6198,7 +6198,7 @@ _08077298: .4byte gTasks
|
||||
sub_807729C: @ 807729C
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, _080772D0 @ =gUnknown_2037F1A
|
||||
ldr r4, _080772D0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -6219,7 +6219,7 @@ sub_807729C: @ 807729C
|
||||
movs r0, 0x5
|
||||
b _080772D6
|
||||
.align 2, 0
|
||||
_080772D0: .4byte gUnknown_2037F1A
|
||||
_080772D0: .4byte gBattleAnimAttacker
|
||||
_080772D4:
|
||||
ldr r0, _080772E8 @ =0x0000fff6
|
||||
_080772D6:
|
||||
@@ -6289,7 +6289,7 @@ _08077348:
|
||||
sub_8077350: @ 8077350
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r5, _08077388 @ =gUnknown_2037F02
|
||||
ldr r5, _08077388 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x4]
|
||||
strh r0, [r4, 0x2E]
|
||||
ldrh r0, [r5, 0x8]
|
||||
@@ -6300,7 +6300,7 @@ sub_8077350: @ 8077350
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, _0807738C @ =gUnknown_2037F1B
|
||||
ldr r0, _0807738C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -6315,8 +6315,8 @@ sub_8077350: @ 8077350
|
||||
subs r0, 0x14
|
||||
b _0807739E
|
||||
.align 2, 0
|
||||
_08077388: .4byte gUnknown_2037F02
|
||||
_0807738C: .4byte gUnknown_2037F1B
|
||||
_08077388: .4byte gBattleAnimArgs
|
||||
_0807738C: .4byte gBattleAnimTarget
|
||||
_08077390:
|
||||
ldrh r0, [r5, 0x8]
|
||||
subs r0, 0x1E
|
||||
@@ -15,7 +15,7 @@ sub_80DCE10: @ 80DCE10
|
||||
adds r6, r0
|
||||
lsls r6, 3
|
||||
adds r6, r1
|
||||
ldr r1, _080DCE70 @ =gUnknown_2037F02
|
||||
ldr r1, _080DCE70 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
strh r0, [r6, 0x8]
|
||||
ldrh r0, [r1, 0x2]
|
||||
@@ -51,7 +51,7 @@ sub_80DCE10: @ 80DCE10
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DCE6C: .4byte gTasks
|
||||
_080DCE70: .4byte gUnknown_2037F02
|
||||
_080DCE70: .4byte gBattleAnimArgs
|
||||
_080DCE74: .4byte sub_80DCE78
|
||||
thumb_func_end sub_80DCE10
|
||||
|
||||
@@ -168,7 +168,7 @@ mas_80DCF38: @ 80DCF38
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
ldr r0, _080DCFDC @ =gUnknown_2037F02
|
||||
ldr r0, _080DCFDC @ =gBattleAnimArgs
|
||||
ldrh r1, [r0]
|
||||
str r1, [sp]
|
||||
ldrb r5, [r0, 0x4]
|
||||
@@ -236,7 +236,7 @@ mas_80DCF38: @ 80DCF38
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DCFDC: .4byte gUnknown_2037F02
|
||||
_080DCFDC: .4byte gBattleAnimArgs
|
||||
_080DCFE0: .4byte gTasks
|
||||
_080DCFE4: .4byte sub_80DCFE8
|
||||
thumb_func_end mas_80DCF38
|
||||
@@ -320,41 +320,41 @@ sub_80DD06C: @ 80DD06C
|
||||
bl sub_8073A44
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r0, _080DD090 @ =gUnknown_2037F02
|
||||
ldr r0, _080DD090 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080DD098
|
||||
ldr r0, _080DD094 @ =gUnknown_2037F1A
|
||||
ldr r0, _080DD094 @ =gBattleAnimAttacker
|
||||
ldrb r4, [r0]
|
||||
b _080DD0BE
|
||||
.align 2, 0
|
||||
_080DD090: .4byte gUnknown_2037F02
|
||||
_080DD094: .4byte gUnknown_2037F1A
|
||||
_080DD090: .4byte gBattleAnimArgs
|
||||
_080DD094: .4byte gBattleAnimAttacker
|
||||
_080DD098:
|
||||
cmp r0, 0x1
|
||||
bne _080DD0A8
|
||||
ldr r0, _080DD0A4 @ =gUnknown_2037F1B
|
||||
ldr r0, _080DD0A4 @ =gBattleAnimTarget
|
||||
ldrb r4, [r0]
|
||||
b _080DD0BE
|
||||
.align 2, 0
|
||||
_080DD0A4: .4byte gUnknown_2037F1B
|
||||
_080DD0A4: .4byte gBattleAnimTarget
|
||||
_080DD0A8:
|
||||
cmp r0, 0x2
|
||||
bne _080DD0B4
|
||||
ldr r0, _080DD0B0 @ =gUnknown_2037F1A
|
||||
ldr r0, _080DD0B0 @ =gBattleAnimAttacker
|
||||
b _080DD0B6
|
||||
.align 2, 0
|
||||
_080DD0B0: .4byte gUnknown_2037F1A
|
||||
_080DD0B0: .4byte gBattleAnimAttacker
|
||||
_080DD0B4:
|
||||
ldr r0, _080DD0E0 @ =gUnknown_2037F1B
|
||||
ldr r0, _080DD0E0 @ =gBattleAnimTarget
|
||||
_080DD0B6:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x2
|
||||
adds r4, r0, 0
|
||||
eors r4, r1
|
||||
_080DD0BE:
|
||||
ldr r0, _080DD0E4 @ =gUnknown_2037F02
|
||||
ldr r0, _080DD0E4 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0x1
|
||||
@@ -371,8 +371,8 @@ _080DD0CC:
|
||||
bl DestroyAnimVisualTask
|
||||
b _080DD13A
|
||||
.align 2, 0
|
||||
_080DD0E0: .4byte gUnknown_2037F1B
|
||||
_080DD0E4: .4byte gUnknown_2037F02
|
||||
_080DD0E0: .4byte gBattleAnimTarget
|
||||
_080DD0E4: .4byte gBattleAnimArgs
|
||||
_080DD0E8:
|
||||
adds r0, r4, 0
|
||||
bl GetBattlerSide
|
||||
@@ -432,41 +432,41 @@ sub_80DD148: @ 80DD148
|
||||
bl sub_8073A44
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, _080DD16C @ =gUnknown_2037F02
|
||||
ldr r0, _080DD16C @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080DD174
|
||||
ldr r0, _080DD170 @ =gUnknown_2037F1A
|
||||
ldr r0, _080DD170 @ =gBattleAnimAttacker
|
||||
ldrb r4, [r0]
|
||||
b _080DD19A
|
||||
.align 2, 0
|
||||
_080DD16C: .4byte gUnknown_2037F02
|
||||
_080DD170: .4byte gUnknown_2037F1A
|
||||
_080DD16C: .4byte gBattleAnimArgs
|
||||
_080DD170: .4byte gBattleAnimAttacker
|
||||
_080DD174:
|
||||
cmp r0, 0x1
|
||||
bne _080DD184
|
||||
ldr r0, _080DD180 @ =gUnknown_2037F1B
|
||||
ldr r0, _080DD180 @ =gBattleAnimTarget
|
||||
ldrb r4, [r0]
|
||||
b _080DD19A
|
||||
.align 2, 0
|
||||
_080DD180: .4byte gUnknown_2037F1B
|
||||
_080DD180: .4byte gBattleAnimTarget
|
||||
_080DD184:
|
||||
cmp r0, 0x2
|
||||
bne _080DD190
|
||||
ldr r0, _080DD18C @ =gUnknown_2037F1A
|
||||
ldr r0, _080DD18C @ =gBattleAnimAttacker
|
||||
b _080DD192
|
||||
.align 2, 0
|
||||
_080DD18C: .4byte gUnknown_2037F1A
|
||||
_080DD18C: .4byte gBattleAnimAttacker
|
||||
_080DD190:
|
||||
ldr r0, _080DD1BC @ =gUnknown_2037F1B
|
||||
ldr r0, _080DD1BC @ =gBattleAnimTarget
|
||||
_080DD192:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x2
|
||||
adds r4, r0, 0
|
||||
eors r4, r1
|
||||
_080DD19A:
|
||||
ldr r0, _080DD1C0 @ =gUnknown_2037F02
|
||||
ldr r0, _080DD1C0 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
ldrsh r0, [r0, r2]
|
||||
cmp r0, 0x1
|
||||
@@ -483,8 +483,8 @@ _080DD1A8:
|
||||
bl DestroyAnimVisualTask
|
||||
b _080DD26A
|
||||
.align 2, 0
|
||||
_080DD1BC: .4byte gUnknown_2037F1B
|
||||
_080DD1C0: .4byte gUnknown_2037F02
|
||||
_080DD1BC: .4byte gBattleAnimTarget
|
||||
_080DD1C0: .4byte gBattleAnimArgs
|
||||
_080DD1C4:
|
||||
adds r0, r4, 0
|
||||
bl GetBattlerSide
|
||||
@@ -521,7 +521,7 @@ _080DD1F6:
|
||||
adds r0, r2, r6
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r4, _080DD240 @ =gUnknown_2037F02
|
||||
ldr r4, _080DD240 @ =gBattleAnimArgs
|
||||
ldrh r1, [r4, 0x2]
|
||||
strh r1, [r0, 0x8]
|
||||
strh r3, [r0, 0xA]
|
||||
@@ -543,7 +543,7 @@ _080DD1F6:
|
||||
_080DD234: .4byte gBattlerPartyIndexes
|
||||
_080DD238: .4byte gPlayerParty
|
||||
_080DD23C: .4byte gTasks
|
||||
_080DD240: .4byte gUnknown_2037F02
|
||||
_080DD240: .4byte gBattleAnimArgs
|
||||
_080DD244:
|
||||
adds r0, r3, 0
|
||||
movs r2, 0x7
|
||||
@@ -677,7 +677,7 @@ sub_80DD334: @ 80DD334
|
||||
negs r0, r0
|
||||
bl sub_8073A44
|
||||
ldr r2, _080DD374 @ =gUnknown_2037F1C
|
||||
ldr r1, _080DD378 @ =gUnknown_2037F1A
|
||||
ldr r1, _080DD378 @ =gBattleAnimAttacker
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 1
|
||||
adds r1, r2
|
||||
@@ -701,7 +701,7 @@ sub_80DD334: @ 80DD334
|
||||
b _080DD38A
|
||||
.align 2, 0
|
||||
_080DD374: .4byte gUnknown_2037F1C
|
||||
_080DD378: .4byte gUnknown_2037F1A
|
||||
_080DD378: .4byte gBattleAnimAttacker
|
||||
_080DD37C: .4byte gTasks
|
||||
_080DD380: .4byte sub_80DD390
|
||||
_080DD384:
|
||||
@@ -758,7 +758,7 @@ sub_80DD3DC: @ 80DD3DC
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080DD40C @ =gUnknown_2037F02
|
||||
ldr r0, _080DD40C @ =gBattleAnimArgs
|
||||
ldrh r5, [r0]
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
@@ -775,7 +775,7 @@ sub_80DD3DC: @ 80DD3DC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD40C: .4byte gUnknown_2037F02
|
||||
_080DD40C: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80DD3DC
|
||||
|
||||
thumb_func_start sub_80DD410
|
||||
@@ -784,7 +784,7 @@ sub_80DD410: @ 80DD410
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080DD440 @ =gUnknown_2037F02
|
||||
ldr r0, _080DD440 @ =gBattleAnimArgs
|
||||
ldrh r5, [r0]
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
@@ -801,7 +801,7 @@ sub_80DD410: @ 80DD410
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD440: .4byte gUnknown_2037F02
|
||||
_080DD440: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80DD410
|
||||
|
||||
thumb_func_start sub_80DD444
|
||||
@@ -814,7 +814,7 @@ sub_80DD444: @ 80DD444
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
ldr r0, _080DD4C8 @ =gUnknown_2037F02
|
||||
ldr r0, _080DD4C8 @ =gBattleAnimArgs
|
||||
ldrb r5, [r0, 0x2]
|
||||
ldrb r6, [r0, 0x4]
|
||||
ldrh r1, [r0, 0x6]
|
||||
@@ -868,7 +868,7 @@ sub_80DD444: @ 80DD444
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD4C8: .4byte gUnknown_2037F02
|
||||
_080DD4C8: .4byte gBattleAnimArgs
|
||||
_080DD4CC: .4byte gTasks
|
||||
_080DD4D0: .4byte sub_80DD4D4
|
||||
thumb_func_end sub_80DD444
|
||||
|
||||
@@ -16,7 +16,7 @@ sub_80EEC0C: @ 80EEC0C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x10]
|
||||
ldr r0, _080EEDB4 @ =gUnknown_2037F1A
|
||||
ldr r0, _080EEDB4 @ =gBattleAnimAttacker
|
||||
ldrb r4, [r0]
|
||||
ldr r0, _080EEDB8 @ =gUnknown_2022984
|
||||
movs r1, 0
|
||||
@@ -203,7 +203,7 @@ sub_80EEC0C: @ 80EEC0C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EEDB4: .4byte gUnknown_2037F1A
|
||||
_080EEDB4: .4byte gBattleAnimAttacker
|
||||
_080EEDB8: .4byte gUnknown_2022984
|
||||
_080EEDBC: .4byte gUnknown_2022986
|
||||
_080EEDC0: .4byte 0x00003f3f
|
||||
@@ -228,7 +228,7 @@ sub_80EEDF4: @ 80EEDF4
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldr r0, _080EEE3C @ =gUnknown_2037F1A
|
||||
ldr r0, _080EEE3C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
mov r8, r0
|
||||
ldr r1, _080EEE40 @ =gTasks
|
||||
@@ -260,7 +260,7 @@ sub_80EEDF4: @ 80EEDF4
|
||||
beq _080EEE4E
|
||||
b _080EEFA8
|
||||
.align 2, 0
|
||||
_080EEE3C: .4byte gUnknown_2037F1A
|
||||
_080EEE3C: .4byte gBattleAnimAttacker
|
||||
_080EEE40: .4byte gTasks
|
||||
_080EEE44: .4byte gBattle_BG1_Y
|
||||
_080EEE48:
|
||||
@@ -569,7 +569,7 @@ sub_80EF0B4: @ 80EF0B4
|
||||
lsrs r4, 24
|
||||
mov r1, sp
|
||||
adds r1, 0x1
|
||||
ldr r0, _080EF0DC @ =gUnknown_2037F1A
|
||||
ldr r0, _080EF0DC @ =gBattleAnimAttacker
|
||||
ldrb r2, [r0]
|
||||
mov r0, sp
|
||||
bl sub_80EEFC8
|
||||
@@ -580,7 +580,7 @@ sub_80EF0B4: @ 80EF0B4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF0DC: .4byte gUnknown_2037F1A
|
||||
_080EF0DC: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80EF0B4
|
||||
|
||||
thumb_func_start sub_80EF0E0
|
||||
@@ -664,7 +664,7 @@ sub_80EF180: @ 80EF180
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080EF19C @ =gUnknown_2037F1A
|
||||
ldr r0, _080EF19C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_80EF0E0
|
||||
adds r0, r4, 0
|
||||
@@ -673,7 +673,7 @@ sub_80EF180: @ 80EF180
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF19C: .4byte gUnknown_2037F1A
|
||||
_080EF19C: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80EF180
|
||||
|
||||
thumb_func_start sub_80EF1A0
|
||||
@@ -685,7 +685,7 @@ sub_80EF1A0: @ 80EF1A0
|
||||
adds r1, r0
|
||||
lsls r1, 3
|
||||
adds r1, r2
|
||||
ldr r2, _080EF1C4 @ =gUnknown_2037F02
|
||||
ldr r2, _080EF1C4 @ =gBattleAnimArgs
|
||||
ldrh r0, [r2]
|
||||
strh r0, [r1, 0x1C]
|
||||
ldrh r0, [r2, 0x2]
|
||||
@@ -695,7 +695,7 @@ sub_80EF1A0: @ 80EF1A0
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080EF1C0: .4byte gTasks
|
||||
_080EF1C4: .4byte gUnknown_2037F02
|
||||
_080EF1C4: .4byte gBattleAnimArgs
|
||||
_080EF1C8: .4byte sub_80EF1CC
|
||||
thumb_func_end sub_80EF1A0
|
||||
|
||||
@@ -809,8 +809,8 @@ sub_80EF298: @ 80EF298
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r1, _080EF2C4 @ =gUnknown_2023D44
|
||||
ldr r0, _080EF2C8 @ =gUnknown_2037F1A
|
||||
ldr r1, _080EF2C4 @ =gBattlerSpriteIds
|
||||
ldr r0, _080EF2C8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r5, [r0]
|
||||
@@ -829,8 +829,8 @@ sub_80EF298: @ 80EF298
|
||||
beq _080EF2D6
|
||||
b _080EF338
|
||||
.align 2, 0
|
||||
_080EF2C4: .4byte gUnknown_2023D44
|
||||
_080EF2C8: .4byte gUnknown_2037F1A
|
||||
_080EF2C4: .4byte gBattlerSpriteIds
|
||||
_080EF2C8: .4byte gBattleAnimAttacker
|
||||
_080EF2CC: .4byte gTasks
|
||||
_080EF2D0:
|
||||
cmp r0, 0x2
|
||||
@@ -900,8 +900,8 @@ sub_80EF344: @ 80EF344
|
||||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r1, _080EF37C @ =gUnknown_2023D44
|
||||
ldr r4, _080EF380 @ =gUnknown_2037F1A
|
||||
ldr r1, _080EF37C @ =gBattlerSpriteIds
|
||||
ldr r4, _080EF380 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
adds r1, r0, r1
|
||||
ldrb r1, [r1]
|
||||
@@ -920,8 +920,8 @@ sub_80EF344: @ 80EF344
|
||||
ldr r1, _080EF388 @ =gPlayerParty
|
||||
b _080EF39C
|
||||
.align 2, 0
|
||||
_080EF37C: .4byte gUnknown_2023D44
|
||||
_080EF380: .4byte gUnknown_2037F1A
|
||||
_080EF37C: .4byte gBattlerSpriteIds
|
||||
_080EF380: .4byte gBattleAnimAttacker
|
||||
_080EF384: .4byte gBattlerPartyIndexes
|
||||
_080EF388: .4byte gPlayerParty
|
||||
_080EF38C:
|
||||
@@ -960,7 +960,7 @@ _080EF3CC: .4byte gBattlerPartyIndexes
|
||||
_080EF3D0: .4byte gEnemyParty
|
||||
_080EF3D4: .4byte gTasks
|
||||
_080EF3D8:
|
||||
ldr r5, _080EF450 @ =gUnknown_2037F1A
|
||||
ldr r5, _080EF450 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
@@ -1015,7 +1015,7 @@ _080EF3D8:
|
||||
strh r0, [r6, 0x8]
|
||||
b _080EF482
|
||||
.align 2, 0
|
||||
_080EF450: .4byte gUnknown_2037F1A
|
||||
_080EF450: .4byte gBattleAnimAttacker
|
||||
_080EF454: .4byte gSprites
|
||||
_080EF458:
|
||||
movs r1, 0x1C
|
||||
@@ -1103,21 +1103,21 @@ sub_80EF4E0: @ 80EF4E0
|
||||
beq _080EF504
|
||||
cmp r0, 0x6
|
||||
beq _080EF514
|
||||
ldr r1, _080EF500 @ =gUnknown_2037F02
|
||||
ldr r1, _080EF500 @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
b _080EF518
|
||||
.align 2, 0
|
||||
_080EF4FC: .4byte gUnknown_2024018
|
||||
_080EF500: .4byte gUnknown_2037F02
|
||||
_080EF500: .4byte gBattleAnimArgs
|
||||
_080EF504:
|
||||
ldr r1, _080EF50C @ =gUnknown_2037F02
|
||||
ldr r1, _080EF50C @ =gBattleAnimArgs
|
||||
ldr r0, _080EF510 @ =0x0000ffff
|
||||
b _080EF518
|
||||
.align 2, 0
|
||||
_080EF50C: .4byte gUnknown_2037F02
|
||||
_080EF50C: .4byte gBattleAnimArgs
|
||||
_080EF510: .4byte 0x0000ffff
|
||||
_080EF514:
|
||||
ldr r1, _080EF524 @ =gUnknown_2037F02
|
||||
ldr r1, _080EF524 @ =gBattleAnimArgs
|
||||
ldr r0, _080EF528 @ =0x0000fffe
|
||||
_080EF518:
|
||||
strh r0, [r1, 0xE]
|
||||
@@ -1126,7 +1126,7 @@ _080EF518:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF524: .4byte gUnknown_2037F02
|
||||
_080EF524: .4byte gBattleAnimArgs
|
||||
_080EF528: .4byte 0x0000fffe
|
||||
thumb_func_end sub_80EF4E0
|
||||
|
||||
@@ -1236,7 +1236,7 @@ sub_80EF5AC: @ 80EF5AC
|
||||
adds r6, r4, r1
|
||||
movs r0, 0x22
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r2, _080EF680 @ =gUnknown_2037F1B
|
||||
ldr r2, _080EF680 @ =gBattleAnimTarget
|
||||
mov r8, r2
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0
|
||||
@@ -1260,7 +1260,7 @@ sub_80EF5AC: @ 80EF5AC
|
||||
ldr r0, _080EF688 @ =gUnknown_2024018
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x8]
|
||||
ldr r1, _080EF68C @ =gUnknown_2023D44
|
||||
ldr r1, _080EF68C @ =gBattlerSpriteIds
|
||||
mov r2, r8
|
||||
ldrb r0, [r2]
|
||||
adds r0, r1
|
||||
@@ -1300,10 +1300,10 @@ sub_80EF5AC: @ 80EF5AC
|
||||
_080EF674: .4byte gUnknown_2023D68
|
||||
_080EF678: .4byte gUnknown_82606F4
|
||||
_080EF67C: .4byte gSprites
|
||||
_080EF680: .4byte gUnknown_2037F1B
|
||||
_080EF680: .4byte gBattleAnimTarget
|
||||
_080EF684: .4byte sub_80EF8C0
|
||||
_080EF688: .4byte gUnknown_2024018
|
||||
_080EF68C: .4byte gUnknown_2023D44
|
||||
_080EF68C: .4byte gBattlerSpriteIds
|
||||
_080EF690: .4byte gTasks
|
||||
_080EF694: .4byte sub_80EF698
|
||||
thumb_func_end sub_80EF5AC
|
||||
@@ -1407,7 +1407,7 @@ _080EF708:
|
||||
adds r6, r4, r0
|
||||
movs r0, 0x22
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r1, _080EF7D4 @ =gUnknown_2037F1B
|
||||
ldr r1, _080EF7D4 @ =gBattleAnimTarget
|
||||
mov r8, r1
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0
|
||||
@@ -1430,7 +1430,7 @@ _080EF708:
|
||||
str r0, [r4]
|
||||
movs r0, 0
|
||||
bl GetBattlerAtPosition
|
||||
ldr r1, _080EF7DC @ =gUnknown_2023D44
|
||||
ldr r1, _080EF7DC @ =gBattlerSpriteIds
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r1
|
||||
@@ -1460,9 +1460,9 @@ _080EF7C4: .4byte gSaveBlock2Ptr
|
||||
_080EF7C8: .4byte gUnknown_2023D68
|
||||
_080EF7CC: .4byte gUnknown_82606F4
|
||||
_080EF7D0: .4byte gSprites
|
||||
_080EF7D4: .4byte gUnknown_2037F1B
|
||||
_080EF7D4: .4byte gBattleAnimTarget
|
||||
_080EF7D8: .4byte SpriteCallbackDummy
|
||||
_080EF7DC: .4byte gUnknown_2023D44
|
||||
_080EF7DC: .4byte gBattlerSpriteIds
|
||||
_080EF7E0: .4byte sub_8012354
|
||||
_080EF7E4: .4byte gTasks
|
||||
_080EF7E8: .4byte sub_80EF7EC
|
||||
@@ -1476,7 +1476,7 @@ sub_80EF7EC: @ 80EF7EC
|
||||
ldr r6, _080EF84C @ =gSprites
|
||||
movs r0, 0
|
||||
bl GetBattlerAtPosition
|
||||
ldr r1, _080EF850 @ =gUnknown_2023D44
|
||||
ldr r1, _080EF850 @ =gBattlerSpriteIds
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r1
|
||||
@@ -1518,7 +1518,7 @@ _080EF846:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF84C: .4byte gSprites
|
||||
_080EF850: .4byte gUnknown_2023D44
|
||||
_080EF850: .4byte gBattlerSpriteIds
|
||||
_080EF854: .4byte gTasks
|
||||
_080EF858: .4byte sub_80EF8C0
|
||||
_080EF85C: .4byte sub_80EF864
|
||||
@@ -1533,7 +1533,7 @@ sub_80EF864: @ 80EF864
|
||||
ldr r6, _080EF8B8 @ =gSprites
|
||||
movs r0, 0
|
||||
bl GetBattlerAtPosition
|
||||
ldr r4, _080EF8BC @ =gUnknown_2023D44
|
||||
ldr r4, _080EF8BC @ =gBattlerSpriteIds
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r4
|
||||
@@ -1567,7 +1567,7 @@ _080EF8B0:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF8B8: .4byte gSprites
|
||||
_080EF8BC: .4byte gUnknown_2023D44
|
||||
_080EF8BC: .4byte gBattlerSpriteIds
|
||||
thumb_func_end sub_80EF864
|
||||
|
||||
thumb_func_start sub_80EF8C0
|
||||
@@ -1674,7 +1674,7 @@ _080EF954:
|
||||
movs r2, 0x1
|
||||
movs r3, 0x1C
|
||||
bl LaunchBallStarsTask
|
||||
ldr r0, _080EF9B0 @ =gUnknown_2037F1B
|
||||
ldr r0, _080EF9B0 @ =gBattleAnimTarget
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0
|
||||
movs r2, 0xE
|
||||
@@ -1688,7 +1688,7 @@ _080EF99E:
|
||||
.align 2, 0
|
||||
_080EF9A8: .4byte sub_80EF9B4
|
||||
_080EF9AC: .4byte gUnknown_2023D68
|
||||
_080EF9B0: .4byte gUnknown_2037F1B
|
||||
_080EF9B0: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80EF8F0
|
||||
|
||||
thumb_func_start sub_80EF9B4
|
||||
@@ -1711,8 +1711,8 @@ sub_80EF9B4: @ 80EF9B4
|
||||
ldr r0, _080EF9FC @ =sub_80EFA0C
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r2, _080EFA00 @ =gSprites
|
||||
ldr r1, _080EFA04 @ =gUnknown_2023D44
|
||||
ldr r0, _080EFA08 @ =gUnknown_2037F1B
|
||||
ldr r1, _080EFA04 @ =gBattlerSpriteIds
|
||||
ldr r0, _080EFA08 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -1730,16 +1730,16 @@ _080EF9F0:
|
||||
_080EF9F8: .4byte TaskDummy
|
||||
_080EF9FC: .4byte sub_80EFA0C
|
||||
_080EFA00: .4byte gSprites
|
||||
_080EFA04: .4byte gUnknown_2023D44
|
||||
_080EFA08: .4byte gUnknown_2037F1B
|
||||
_080EFA04: .4byte gBattlerSpriteIds
|
||||
_080EFA08: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80EF9B4
|
||||
|
||||
thumb_func_start sub_80EFA0C
|
||||
sub_80EFA0C: @ 80EFA0C
|
||||
push {r4-r7,lr}
|
||||
adds r7, r0, 0
|
||||
ldr r1, _080EFA50 @ =gUnknown_2023D44
|
||||
ldr r0, _080EFA54 @ =gUnknown_2037F1B
|
||||
ldr r1, _080EFA50 @ =gBattlerSpriteIds
|
||||
ldr r0, _080EFA54 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r4, [r0]
|
||||
@@ -1771,8 +1771,8 @@ _080EFA3E:
|
||||
beq _080EFA62
|
||||
b _080EFB20
|
||||
.align 2, 0
|
||||
_080EFA50: .4byte gUnknown_2023D44
|
||||
_080EFA54: .4byte gUnknown_2037F1B
|
||||
_080EFA50: .4byte gBattlerSpriteIds
|
||||
_080EFA54: .4byte gBattleAnimTarget
|
||||
_080EFA58: .4byte gTasks
|
||||
_080EFA5C:
|
||||
cmp r0, 0x2
|
||||
@@ -2495,7 +2495,7 @@ sub_80EFFC4: @ 80EFFC4
|
||||
push {r7}
|
||||
sub sp, 0x4
|
||||
adds r6, r0, 0
|
||||
ldr r7, _080F0004 @ =gUnknown_2037F1B
|
||||
ldr r7, _080F0004 @ =gBattleAnimTarget
|
||||
ldrh r0, [r6, 0x36]
|
||||
adds r0, 0x1
|
||||
movs r1, 0
|
||||
@@ -2519,7 +2519,7 @@ sub_80EFFC4: @ 80EFFC4
|
||||
bl sub_80F01B8
|
||||
b _080F0088
|
||||
.align 2, 0
|
||||
_080F0004: .4byte gUnknown_2037F1B
|
||||
_080F0004: .4byte gBattleAnimTarget
|
||||
_080F0008:
|
||||
cmp r1, 0x3C
|
||||
bne _080F0026
|
||||
@@ -2555,7 +2555,7 @@ _080F004C:
|
||||
cmp r1, r0
|
||||
bne _080F0088
|
||||
ldr r5, _080F0098 @ =gSprites
|
||||
ldr r4, _080F009C @ =gUnknown_2023D44
|
||||
ldr r4, _080F009C @ =gBattlerSpriteIds
|
||||
ldrb r0, [r7]
|
||||
adds r0, r4
|
||||
ldrb r1, [r0]
|
||||
@@ -2589,7 +2589,7 @@ _080F0088:
|
||||
.align 2, 0
|
||||
_080F0094: .4byte 0x0000013b
|
||||
_080F0098: .4byte gSprites
|
||||
_080F009C: .4byte gUnknown_2023D44
|
||||
_080F009C: .4byte gBattlerSpriteIds
|
||||
_080F00A0: .4byte sub_80F00A4
|
||||
thumb_func_end sub_80EFFC4
|
||||
|
||||
@@ -2893,7 +2893,7 @@ sub_80F02B0: @ 80F02B0
|
||||
movs r2, 0x1
|
||||
movs r3, 0x1C
|
||||
bl LaunchBallStarsTask
|
||||
ldr r0, _080F036C @ =gUnknown_2037F1B
|
||||
ldr r0, _080F036C @ =gBattleAnimTarget
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
movs r2, 0xE
|
||||
@@ -2901,8 +2901,8 @@ sub_80F02B0: @ 80F02B0
|
||||
bl LaunchBallFadeMonTask
|
||||
_080F0302:
|
||||
ldr r6, _080F0370 @ =gSprites
|
||||
ldr r5, _080F0374 @ =gUnknown_2023D44
|
||||
ldr r4, _080F036C @ =gUnknown_2037F1B
|
||||
ldr r5, _080F0374 @ =gBattlerSpriteIds
|
||||
ldr r4, _080F036C @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
ldrb r1, [r0]
|
||||
@@ -2950,9 +2950,9 @@ _080F0302:
|
||||
.align 2, 0
|
||||
_080F0364: .4byte sub_80F0378
|
||||
_080F0368: .4byte gUnknown_2023D68
|
||||
_080F036C: .4byte gUnknown_2037F1B
|
||||
_080F036C: .4byte gBattleAnimTarget
|
||||
_080F0370: .4byte gSprites
|
||||
_080F0374: .4byte gUnknown_2023D44
|
||||
_080F0374: .4byte gBattlerSpriteIds
|
||||
thumb_func_end sub_80F02B0
|
||||
|
||||
thumb_func_start sub_80F0378
|
||||
@@ -2974,8 +2974,8 @@ sub_80F0378: @ 80F0378
|
||||
strb r0, [r2]
|
||||
_080F0396:
|
||||
ldr r4, _080F03C4 @ =gSprites
|
||||
ldr r3, _080F03C8 @ =gUnknown_2023D44
|
||||
ldr r2, _080F03CC @ =gUnknown_2037F1B
|
||||
ldr r3, _080F03C8 @ =gBattlerSpriteIds
|
||||
ldr r2, _080F03CC @ =gBattleAnimTarget
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -2996,8 +2996,8 @@ _080F0396:
|
||||
b _080F03F0
|
||||
.align 2, 0
|
||||
_080F03C4: .4byte gSprites
|
||||
_080F03C8: .4byte gUnknown_2023D44
|
||||
_080F03CC: .4byte gUnknown_2037F1B
|
||||
_080F03C8: .4byte gBattlerSpriteIds
|
||||
_080F03CC: .4byte gBattleAnimTarget
|
||||
_080F03D0:
|
||||
ldr r6, _080F045C @ =0xfffffee0
|
||||
adds r0, r6, 0
|
||||
@@ -3026,8 +3026,8 @@ _080F03F0:
|
||||
cmp r5, 0
|
||||
beq _080F0456
|
||||
ldr r4, _080F0460 @ =gSprites
|
||||
ldr r3, _080F0464 @ =gUnknown_2023D44
|
||||
ldr r2, _080F0468 @ =gUnknown_2037F1B
|
||||
ldr r3, _080F0464 @ =gBattlerSpriteIds
|
||||
ldr r2, _080F0468 @ =gBattleAnimTarget
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -3073,8 +3073,8 @@ _080F0456:
|
||||
.align 2, 0
|
||||
_080F045C: .4byte 0xfffffee0
|
||||
_080F0460: .4byte gSprites
|
||||
_080F0464: .4byte gUnknown_2023D44
|
||||
_080F0468: .4byte gUnknown_2037F1B
|
||||
_080F0464: .4byte gBattlerSpriteIds
|
||||
_080F0468: .4byte gBattleAnimTarget
|
||||
_080F046C: .4byte gUnknown_2024018
|
||||
_080F0470: .4byte sub_80F018C
|
||||
_080F0474: .4byte gUnknown_2024005
|
||||
@@ -5082,8 +5082,8 @@ sub_80F1420: @ 80F1420
|
||||
lsrs r7, r0, 24
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
ldr r0, _080F1454 @ =gUnknown_2023D44
|
||||
ldr r3, _080F1458 @ =gUnknown_2037F1A
|
||||
ldr r0, _080F1454 @ =gBattlerSpriteIds
|
||||
ldr r3, _080F1458 @ =gBattleAnimAttacker
|
||||
ldrb r2, [r3]
|
||||
adds r0, r2, r0
|
||||
ldrb r6, [r0]
|
||||
@@ -5102,15 +5102,15 @@ sub_80F1420: @ 80F1420
|
||||
beq _080F1466
|
||||
b _080F15BA
|
||||
.align 2, 0
|
||||
_080F1454: .4byte gUnknown_2023D44
|
||||
_080F1458: .4byte gUnknown_2037F1A
|
||||
_080F1454: .4byte gBattlerSpriteIds
|
||||
_080F1458: .4byte gBattleAnimAttacker
|
||||
_080F145C: .4byte gTasks
|
||||
_080F1460:
|
||||
cmp r0, 0x2
|
||||
beq _080F150A
|
||||
b _080F15BA
|
||||
_080F1466:
|
||||
ldr r0, _080F14A0 @ =gUnknown_2037F02
|
||||
ldr r0, _080F14A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r5, 0x1E]
|
||||
movs r2, 0xA0
|
||||
@@ -5138,7 +5138,7 @@ _080F1466:
|
||||
adds r4, r3, 0
|
||||
b _080F14C0
|
||||
.align 2, 0
|
||||
_080F14A0: .4byte gUnknown_2037F02
|
||||
_080F14A0: .4byte gBattleAnimArgs
|
||||
_080F14A4: .4byte gSprites
|
||||
_080F14A8:
|
||||
ldr r3, _080F14F0 @ =gSprites
|
||||
@@ -5238,7 +5238,7 @@ _080F1558:
|
||||
adds r0, r1
|
||||
ldrb r1, [r0, 0x8]
|
||||
strh r1, [r0, 0x8]
|
||||
ldr r0, _080F1594 @ =gUnknown_2037F1A
|
||||
ldr r0, _080F1594 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
@@ -5259,7 +5259,7 @@ _080F1558:
|
||||
.align 2, 0
|
||||
_080F158C: .4byte gSprites
|
||||
_080F1590: .4byte gTasks
|
||||
_080F1594: .4byte gUnknown_2037F1A
|
||||
_080F1594: .4byte gBattleAnimAttacker
|
||||
_080F1598:
|
||||
ldr r0, _080F15C4 @ =gSprites
|
||||
adds r1, r4, r6
|
||||
@@ -5315,7 +5315,7 @@ _080F15F0:
|
||||
beq _080F167E
|
||||
b _080F16B4
|
||||
_080F15F6:
|
||||
ldr r0, _080F1610 @ =gUnknown_2037F1A
|
||||
ldr r0, _080F1610 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_80768B0
|
||||
lsls r0, 24
|
||||
@@ -5327,7 +5327,7 @@ _080F15F6:
|
||||
bl SetGpuReg
|
||||
b _080F1620
|
||||
.align 2, 0
|
||||
_080F1610: .4byte gUnknown_2037F1A
|
||||
_080F1610: .4byte gBattleAnimAttacker
|
||||
_080F1614: .4byte 0x00003f42
|
||||
_080F1618:
|
||||
ldr r1, _080F163C @ =0x00003f44
|
||||
@@ -5379,8 +5379,8 @@ _080F1644:
|
||||
strh r0, [r4, 0x26]
|
||||
b _080F16B4
|
||||
_080F167E:
|
||||
ldr r1, _080F16BC @ =gUnknown_2023D44
|
||||
ldr r4, _080F16C0 @ =gUnknown_2037F1A
|
||||
ldr r1, _080F16BC @ =gBattlerSpriteIds
|
||||
ldr r4, _080F16C0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -5408,8 +5408,8 @@ _080F16B4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F16BC: .4byte gUnknown_2023D44
|
||||
_080F16C0: .4byte gUnknown_2037F1A
|
||||
_080F16BC: .4byte gBattlerSpriteIds
|
||||
_080F16C0: .4byte gBattleAnimAttacker
|
||||
_080F16C4: .4byte gSprites
|
||||
_080F16C8: .4byte 0x06010000
|
||||
thumb_func_end sub_80F15C8
|
||||
@@ -5419,10 +5419,10 @@ sub_80F16CC: @ 80F16CC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080F16F4 @ =gUnknown_2037F02
|
||||
ldr r3, _080F16F4 @ =gBattleAnimArgs
|
||||
ldr r1, _080F16F8 @ =gUnknown_2024018
|
||||
ldr r2, [r1]
|
||||
ldr r1, _080F16FC @ =gUnknown_2037F1A
|
||||
ldr r1, _080F16FC @ =gBattleAnimAttacker
|
||||
ldrb r1, [r1]
|
||||
ldr r2, [r2]
|
||||
lsls r1, 2
|
||||
@@ -5435,9 +5435,9 @@ sub_80F16CC: @ 80F16CC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F16F4: .4byte gUnknown_2037F02
|
||||
_080F16F4: .4byte gBattleAnimArgs
|
||||
_080F16F8: .4byte gUnknown_2024018
|
||||
_080F16FC: .4byte gUnknown_2037F1A
|
||||
_080F16FC: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80F16CC
|
||||
|
||||
thumb_func_start sub_80F1700
|
||||
@@ -5445,7 +5445,7 @@ sub_80F1700: @ 80F1700
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F1718 @ =gUnknown_2037F1B
|
||||
ldr r2, _080F1718 @ =gBattleAnimTarget
|
||||
ldr r1, _080F171C @ =gUnknown_2023D6E
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
@@ -5453,7 +5453,7 @@ sub_80F1700: @ 80F1700
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1718: .4byte gUnknown_2037F1B
|
||||
_080F1718: .4byte gBattleAnimTarget
|
||||
_080F171C: .4byte gUnknown_2023D6E
|
||||
thumb_func_end sub_80F1700
|
||||
|
||||
@@ -5992,7 +5992,7 @@ sub_80F1B3C: @ 80F1B3C
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
ldr r5, _080F1BB0 @ =gUnknown_2037F02
|
||||
ldr r5, _080F1BB0 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r5, 0x4]
|
||||
adds r0, r1
|
||||
@@ -6013,8 +6013,8 @@ sub_80F1B3C: @ 80F1B3C
|
||||
adds r0, r4, 0
|
||||
bl sub_8075068
|
||||
ldr r2, _080F1BB8 @ =gSprites
|
||||
ldr r1, _080F1BBC @ =gUnknown_2023D44
|
||||
ldr r0, _080F1BC0 @ =gUnknown_2037F1A
|
||||
ldr r1, _080F1BBC @ =gBattlerSpriteIds
|
||||
ldr r0, _080F1BC0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -6031,11 +6031,11 @@ sub_80F1B3C: @ 80F1B3C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1BB0: .4byte gUnknown_2037F02
|
||||
_080F1BB0: .4byte gBattleAnimArgs
|
||||
_080F1BB4: .4byte 0x0000ffe0
|
||||
_080F1BB8: .4byte gSprites
|
||||
_080F1BBC: .4byte gUnknown_2023D44
|
||||
_080F1BC0: .4byte gUnknown_2037F1A
|
||||
_080F1BBC: .4byte gBattlerSpriteIds
|
||||
_080F1BC0: .4byte gBattleAnimAttacker
|
||||
_080F1BC4: .4byte sub_8012354
|
||||
_080F1BC8: .4byte sub_80F1BCC
|
||||
thumb_func_end sub_80F1B3C
|
||||
@@ -6045,8 +6045,8 @@ sub_80F1BCC: @ 80F1BCC
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
ldr r2, _080F1BF4 @ =gSprites
|
||||
ldr r1, _080F1BF8 @ =gUnknown_2023D44
|
||||
ldr r0, _080F1BFC @ =gUnknown_2037F1A
|
||||
ldr r1, _080F1BF8 @ =gBattlerSpriteIds
|
||||
ldr r0, _080F1BFC @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -6065,8 +6065,8 @@ _080F1BF0:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1BF4: .4byte gSprites
|
||||
_080F1BF8: .4byte gUnknown_2023D44
|
||||
_080F1BFC: .4byte gUnknown_2037F1A
|
||||
_080F1BF8: .4byte gBattlerSpriteIds
|
||||
_080F1BFC: .4byte gBattleAnimAttacker
|
||||
_080F1C00: .4byte sub_80F1C04
|
||||
thumb_func_end sub_80F1BCC
|
||||
|
||||
@@ -6101,8 +6101,8 @@ sub_80F1C30: @ 80F1C30
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080F1C80 @ =gSprites
|
||||
ldr r3, _080F1C84 @ =gUnknown_2023D44
|
||||
ldr r2, _080F1C88 @ =gUnknown_2037F1A
|
||||
ldr r3, _080F1C84 @ =gBattlerSpriteIds
|
||||
ldr r2, _080F1C88 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -6138,8 +6138,8 @@ _080F1C78:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1C80: .4byte gSprites
|
||||
_080F1C84: .4byte gUnknown_2023D44
|
||||
_080F1C88: .4byte gUnknown_2037F1A
|
||||
_080F1C84: .4byte gBattlerSpriteIds
|
||||
_080F1C88: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80F1C30
|
||||
|
||||
thumb_func_start sub_80F1C8C
|
||||
@@ -6147,7 +6147,7 @@ sub_80F1C8C: @ 80F1C8C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _080F1CA4 @ =gUnknown_2037F02
|
||||
ldr r0, _080F1CA4 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
@@ -6156,25 +6156,25 @@ sub_80F1C8C: @ 80F1C8C
|
||||
beq _080F1CBC
|
||||
b _080F1CD0
|
||||
.align 2, 0
|
||||
_080F1CA4: .4byte gUnknown_2037F02
|
||||
_080F1CA4: .4byte gBattleAnimArgs
|
||||
_080F1CA8:
|
||||
movs r0, 0
|
||||
bl GetBattlerAtPosition
|
||||
ldr r1, _080F1CB8 @ =gUnknown_2037F1A
|
||||
ldr r1, _080F1CB8 @ =gBattleAnimAttacker
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
b _080F1CC8
|
||||
.align 2, 0
|
||||
_080F1CB8: .4byte gUnknown_2037F1A
|
||||
_080F1CB8: .4byte gBattleAnimAttacker
|
||||
_080F1CBC:
|
||||
movs r0, 0x1
|
||||
bl GetBattlerAtPosition
|
||||
ldr r1, _080F1CDC @ =gUnknown_2037F1A
|
||||
ldr r1, _080F1CDC @ =gBattleAnimAttacker
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
_080F1CC8:
|
||||
bl GetBattlerAtPosition
|
||||
ldr r1, _080F1CE0 @ =gUnknown_2037F1B
|
||||
ldr r1, _080F1CE0 @ =gBattleAnimTarget
|
||||
strb r0, [r1]
|
||||
_080F1CD0:
|
||||
adds r0, r4, 0
|
||||
@@ -6183,8 +6183,8 @@ _080F1CD0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1CDC: .4byte gUnknown_2037F1A
|
||||
_080F1CE0: .4byte gUnknown_2037F1B
|
||||
_080F1CDC: .4byte gBattleAnimAttacker
|
||||
_080F1CE0: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80F1C8C
|
||||
|
||||
thumb_func_start sub_80F1CE4
|
||||
@@ -6196,14 +6196,14 @@ sub_80F1CE4: @ 80F1CE4
|
||||
ldrb r0, [r2, 0x5]
|
||||
cmp r0, 0x2
|
||||
bls _080F1D00
|
||||
ldr r1, _080F1CFC @ =gUnknown_2037F02
|
||||
ldr r1, _080F1CFC @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
b _080F1D04
|
||||
.align 2, 0
|
||||
_080F1CF8: .4byte gUnknown_2023E82
|
||||
_080F1CFC: .4byte gUnknown_2037F02
|
||||
_080F1CFC: .4byte gBattleAnimArgs
|
||||
_080F1D00:
|
||||
ldr r1, _080F1D10 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D10 @ =gBattleAnimArgs
|
||||
ldrb r0, [r2, 0x5]
|
||||
_080F1D04:
|
||||
strh r0, [r1, 0xE]
|
||||
@@ -6212,7 +6212,7 @@ _080F1D04:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1D10: .4byte gUnknown_2037F02
|
||||
_080F1D10: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80F1CE4
|
||||
|
||||
thumb_func_start sub_80F1D14
|
||||
@@ -6226,40 +6226,40 @@ sub_80F1D14: @ 80F1D14
|
||||
ldrh r1, [r0]
|
||||
cmp r1, 0x53
|
||||
bne _080F1D34
|
||||
ldr r1, _080F1D30 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D30 @ =gBattleAnimArgs
|
||||
movs r0, 0x1
|
||||
b _080F1D6C
|
||||
.align 2, 0
|
||||
_080F1D2C: .4byte gUnknown_2024018
|
||||
_080F1D30: .4byte gUnknown_2037F02
|
||||
_080F1D30: .4byte gBattleAnimArgs
|
||||
_080F1D34:
|
||||
cmp r1, 0xFA
|
||||
bne _080F1D44
|
||||
ldr r1, _080F1D40 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D40 @ =gBattleAnimArgs
|
||||
movs r0, 0x2
|
||||
b _080F1D6C
|
||||
.align 2, 0
|
||||
_080F1D40: .4byte gUnknown_2037F02
|
||||
_080F1D40: .4byte gBattleAnimArgs
|
||||
_080F1D44:
|
||||
cmp r1, 0x80
|
||||
bne _080F1D54
|
||||
ldr r1, _080F1D50 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D50 @ =gBattleAnimArgs
|
||||
movs r0, 0x3
|
||||
b _080F1D6C
|
||||
.align 2, 0
|
||||
_080F1D50: .4byte gUnknown_2037F02
|
||||
_080F1D50: .4byte gBattleAnimArgs
|
||||
_080F1D54:
|
||||
movs r0, 0xA4
|
||||
lsls r0, 1
|
||||
cmp r1, r0
|
||||
bne _080F1D68
|
||||
ldr r1, _080F1D64 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D64 @ =gBattleAnimArgs
|
||||
movs r0, 0x4
|
||||
b _080F1D6C
|
||||
.align 2, 0
|
||||
_080F1D64: .4byte gUnknown_2037F02
|
||||
_080F1D64: .4byte gBattleAnimArgs
|
||||
_080F1D68:
|
||||
ldr r1, _080F1D78 @ =gUnknown_2037F02
|
||||
ldr r1, _080F1D78 @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
_080F1D6C:
|
||||
strh r0, [r1]
|
||||
@@ -6268,7 +6268,7 @@ _080F1D6C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1D78: .4byte gUnknown_2037F02
|
||||
_080F1D78: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80F1D14
|
||||
|
||||
thumb_func_start sub_80F1D7C
|
||||
@@ -6276,13 +6276,13 @@ sub_80F1D7C: @ 80F1D7C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080F1DA0 @ =gUnknown_2037F1A
|
||||
ldr r3, _080F1DA0 @ =gBattleAnimAttacker
|
||||
ldr r1, _080F1DA4 @ =gUnknown_2024018
|
||||
ldr r2, [r1]
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrh r1, [r1]
|
||||
strb r1, [r3]
|
||||
ldr r3, _080F1DA8 @ =gUnknown_2037F1B
|
||||
ldr r3, _080F1DA8 @ =gBattleAnimTarget
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrh r1, [r1]
|
||||
lsrs r1, 8
|
||||
@@ -6291,9 +6291,9 @@ sub_80F1D7C: @ 80F1D7C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1DA0: .4byte gUnknown_2037F1A
|
||||
_080F1DA0: .4byte gBattleAnimAttacker
|
||||
_080F1DA4: .4byte gUnknown_2024018
|
||||
_080F1DA8: .4byte gUnknown_2037F1B
|
||||
_080F1DA8: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80F1D7C
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -16,7 +16,7 @@ sub_8078178: @ 8078178
|
||||
lsrs r4, 24
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
ldr r0, _0807821C @ =gUnknown_2023D44
|
||||
ldr r0, _0807821C @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r6, [r0]
|
||||
ldr r0, _08078220 @ =sub_80782BC
|
||||
@@ -88,7 +88,7 @@ _08078210:
|
||||
bls _080781CC
|
||||
b _08078298
|
||||
.align 2, 0
|
||||
_0807821C: .4byte gUnknown_2023D44
|
||||
_0807821C: .4byte gBattlerSpriteIds
|
||||
_08078220: .4byte sub_80782BC
|
||||
_08078224: .4byte gUnknown_83AD048
|
||||
_08078228: .4byte gUnknown_83AD950
|
||||
@@ -341,7 +341,7 @@ sub_80783FC: @ 80783FC
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r4, _080784AC @ =gUnknown_2037F1B
|
||||
ldr r4, _080784AC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
@@ -420,7 +420,7 @@ _08078484:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080784AC: .4byte gUnknown_2037F1B
|
||||
_080784AC: .4byte gBattleAnimTarget
|
||||
_080784B0: .4byte 0xffe00000
|
||||
_080784B4: .4byte 0xffdc0000
|
||||
_080784B8: .4byte 0xfffa0000
|
||||
@@ -867,7 +867,7 @@ _08078830:
|
||||
bl DestroyAnimVisualTask
|
||||
b _0807885A
|
||||
_08078838:
|
||||
ldr r0, _08078860 @ =gUnknown_2037F02
|
||||
ldr r0, _08078860 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
strh r5, [r0]
|
||||
strh r2, [r0, 0x2]
|
||||
@@ -888,7 +888,7 @@ _0807885A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08078860: .4byte gUnknown_2037F02
|
||||
_08078860: .4byte gBattleAnimArgs
|
||||
_08078864: .4byte gTasks
|
||||
_08078868: .4byte sub_80BB088
|
||||
thumb_func_end sub_8078694
|
||||
@@ -901,9 +901,9 @@ LaunchStatusAnimation: @ 807886C
|
||||
lsrs r4, 24
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
ldr r0, _080788A8 @ =gUnknown_2037F1A
|
||||
ldr r0, _080788A8 @ =gBattleAnimAttacker
|
||||
strb r4, [r0]
|
||||
ldr r0, _080788AC @ =gUnknown_2037F1B
|
||||
ldr r0, _080788AC @ =gBattleAnimTarget
|
||||
strb r4, [r0]
|
||||
ldr r0, _080788B0 @ =gUnknown_81C6E84
|
||||
movs r2, 0
|
||||
@@ -923,8 +923,8 @@ LaunchStatusAnimation: @ 807886C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080788A8: .4byte gUnknown_2037F1A
|
||||
_080788AC: .4byte gUnknown_2037F1B
|
||||
_080788A8: .4byte gBattleAnimAttacker
|
||||
_080788AC: .4byte gBattleAnimTarget
|
||||
_080788B0: .4byte gUnknown_81C6E84
|
||||
_080788B4: .4byte task0A_80788BC
|
||||
_080788B8: .4byte gTasks
|
||||
File diff suppressed because it is too large
Load Diff
@@ -70,7 +70,7 @@ _0803A6D0:
|
||||
sub_803A6D4: @ 803A6D4
|
||||
push {lr}
|
||||
ldr r2, _0803A6FC @ =gSprites
|
||||
ldr r1, _0803A700 @ =gUnknown_2023D44
|
||||
ldr r1, _0803A700 @ =gBattlerSpriteIds
|
||||
ldr r0, _0803A704 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -90,7 +90,7 @@ _0803A6F8:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803A6FC: .4byte gSprites
|
||||
_0803A700: .4byte gUnknown_2023D44
|
||||
_0803A700: .4byte gBattlerSpriteIds
|
||||
_0803A704: .4byte gActiveBattler
|
||||
_0803A708: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_803A6D4
|
||||
@@ -99,7 +99,7 @@ _0803A708: .4byte SpriteCallbackDummy
|
||||
sub_803A70C: @ 803A70C
|
||||
push {r4-r6,lr}
|
||||
ldr r4, _0803A784 @ =gSprites
|
||||
ldr r6, _0803A788 @ =gUnknown_2023D44
|
||||
ldr r6, _0803A788 @ =gBattlerSpriteIds
|
||||
ldr r5, _0803A78C @ =gActiveBattler
|
||||
ldrb r0, [r5]
|
||||
adds r0, r6
|
||||
@@ -155,7 +155,7 @@ _0803A77C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803A784: .4byte gSprites
|
||||
_0803A788: .4byte gUnknown_2023D44
|
||||
_0803A788: .4byte gBattlerSpriteIds
|
||||
_0803A78C: .4byte gActiveBattler
|
||||
_0803A790: .4byte SpriteCallbackDummy
|
||||
_0803A794: .4byte 0x000003ff
|
||||
@@ -714,7 +714,7 @@ _0803AC10: .4byte sub_803A7E4
|
||||
sub_803AC14: @ 803AC14
|
||||
push {r4-r7,lr}
|
||||
ldr r2, _0803AC70 @ =gSprites
|
||||
ldr r0, _0803AC74 @ =gUnknown_2023D44
|
||||
ldr r0, _0803AC74 @ =gBattlerSpriteIds
|
||||
ldr r7, _0803AC78 @ =gActiveBattler
|
||||
ldrb r3, [r7]
|
||||
adds r0, r3, r0
|
||||
@@ -758,7 +758,7 @@ sub_803AC14: @ 803AC14
|
||||
b _0803ACC0
|
||||
.align 2, 0
|
||||
_0803AC70: .4byte gSprites
|
||||
_0803AC74: .4byte gUnknown_2023D44
|
||||
_0803AC74: .4byte gBattlerSpriteIds
|
||||
_0803AC78: .4byte gActiveBattler
|
||||
_0803AC7C: .4byte gUnknown_2024018
|
||||
_0803AC80: .4byte gBattlerPartyIndexes
|
||||
@@ -842,7 +842,7 @@ _0803AD18:
|
||||
sub_803AD20: @ 803AD20
|
||||
push {lr}
|
||||
ldr r2, _0803AD54 @ =gSprites
|
||||
ldr r0, _0803AD58 @ =gUnknown_2023D44
|
||||
ldr r0, _0803AD58 @ =gBattlerSpriteIds
|
||||
ldr r1, _0803AD5C @ =gActiveBattler
|
||||
ldrb r3, [r1]
|
||||
adds r0, r3, r0
|
||||
@@ -866,7 +866,7 @@ _0803AD4E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803AD54: .4byte gSprites
|
||||
_0803AD58: .4byte gUnknown_2023D44
|
||||
_0803AD58: .4byte gBattlerSpriteIds
|
||||
_0803AD5C: .4byte gActiveBattler
|
||||
_0803AD60: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_803AD20
|
||||
@@ -888,7 +888,7 @@ sub_803AD64: @ 803AD64
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0803ADBE
|
||||
ldr r5, _0803ADCC @ =gUnknown_2023D44
|
||||
ldr r5, _0803ADCC @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -920,7 +920,7 @@ _0803ADBE:
|
||||
.align 2, 0
|
||||
_0803ADC4: .4byte gUnknown_2024018
|
||||
_0803ADC8: .4byte gActiveBattler
|
||||
_0803ADCC: .4byte gUnknown_2023D44
|
||||
_0803ADCC: .4byte gBattlerSpriteIds
|
||||
_0803ADD0: .4byte gSprites
|
||||
_0803ADD4: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_803AD64
|
||||
@@ -942,7 +942,7 @@ _0803ADEA:
|
||||
thumb_func_start DoHitAnimBlinkSpriteEffect_4
|
||||
DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
|
||||
push {r4,lr}
|
||||
ldr r1, _0803AE2C @ =gUnknown_2023D44
|
||||
ldr r1, _0803AE2C @ =gBattlerSpriteIds
|
||||
ldr r0, _0803AE30 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -970,7 +970,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
|
||||
bl RecordedOpponentBufferExecCompleted
|
||||
b _0803AE66
|
||||
.align 2, 0
|
||||
_0803AE2C: .4byte gUnknown_2023D44
|
||||
_0803AE2C: .4byte gBattlerSpriteIds
|
||||
_0803AE30: .4byte gActiveBattler
|
||||
_0803AE34: .4byte gSprites
|
||||
_0803AE38: .4byte gUnknown_2024005
|
||||
@@ -1132,7 +1132,7 @@ sub_803AF28: @ 803AF28
|
||||
bl FreeSpriteTilesByTag
|
||||
adds r0, r4, 0
|
||||
bl FreeSpritePaletteByTag
|
||||
ldr r1, _0803AFE0 @ =gUnknown_2023D44
|
||||
ldr r1, _0803AFE0 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -1179,7 +1179,7 @@ _0803AFCC:
|
||||
_0803AFD4: .4byte gUnknown_2024018
|
||||
_0803AFD8: .4byte gActiveBattler
|
||||
_0803AFDC: .4byte 0x000027f9
|
||||
_0803AFE0: .4byte gUnknown_2023D44
|
||||
_0803AFE0: .4byte gBattlerSpriteIds
|
||||
_0803AFE4: .4byte gSprites
|
||||
_0803AFE8: .4byte gUnknown_3004FF0
|
||||
_0803AFEC: .4byte gBattlerPartyIndexes
|
||||
@@ -3599,7 +3599,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _0803C4EC @ =gUnknown_2023D44
|
||||
ldr r4, _0803C4EC @ =gBattlerSpriteIds
|
||||
ldrb r1, [r6]
|
||||
adds r1, r4
|
||||
strb r0, [r1]
|
||||
@@ -3678,7 +3678,7 @@ _0803C4DC: .4byte gBattlerPartyIndexes
|
||||
_0803C4E0: .4byte gActiveBattler
|
||||
_0803C4E4: .4byte gEnemyParty
|
||||
_0803C4E8: .4byte gMultiuseSpriteTemplate
|
||||
_0803C4EC: .4byte gUnknown_2023D44
|
||||
_0803C4EC: .4byte gBattlerSpriteIds
|
||||
_0803C4F0: .4byte gSprites
|
||||
_0803C4F4: .4byte 0x0000ff10
|
||||
_0803C4F8: .4byte gBattleMonForms
|
||||
@@ -3803,7 +3803,7 @@ sub_803C550: @ 803C550
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _0803C6C4 @ =gUnknown_2023D44
|
||||
ldr r4, _0803C6C4 @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _0803C6C8 @ =gSprites
|
||||
@@ -3893,7 +3893,7 @@ _0803C6B4: .4byte gEnemyParty
|
||||
_0803C6B8: .4byte sub_8033E3C
|
||||
_0803C6BC: .4byte gUnknown_3004FFC
|
||||
_0803C6C0: .4byte gMultiuseSpriteTemplate
|
||||
_0803C6C4: .4byte gUnknown_2023D44
|
||||
_0803C6C4: .4byte gBattlerSpriteIds
|
||||
_0803C6C8: .4byte gSprites
|
||||
_0803C6CC: .4byte gBattleMonForms
|
||||
_0803C6D0: .4byte SpriteCallbackDummy
|
||||
@@ -3933,7 +3933,7 @@ _0803C710: .4byte gUnknown_2024018
|
||||
_0803C714: .4byte gUnknown_3004FE0
|
||||
_0803C718: .4byte sub_803C76C
|
||||
_0803C71C:
|
||||
ldr r5, _0803C760 @ =gUnknown_2023D44
|
||||
ldr r5, _0803C760 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -3963,7 +3963,7 @@ _0803C758:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803C760: .4byte gUnknown_2023D44
|
||||
_0803C760: .4byte gBattlerSpriteIds
|
||||
_0803C764: .4byte gSprites
|
||||
_0803C768: .4byte gUnknown_3004FF0
|
||||
thumb_func_end LinkOpponentHandleReturnPokeToBall
|
||||
@@ -4278,7 +4278,7 @@ _0803C992:
|
||||
adds r1, r6, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r5, _0803CAD8 @ =gUnknown_2023D44
|
||||
ldr r5, _0803CAD8 @ =gBattlerSpriteIds
|
||||
mov r2, r8
|
||||
ldrb r1, [r2]
|
||||
adds r1, r5
|
||||
@@ -4392,7 +4392,7 @@ _0803CAC8: .4byte gFacilityClassToPicIndex
|
||||
_0803CACC: .4byte gActiveBattler
|
||||
_0803CAD0: .4byte gMultiuseSpriteTemplate
|
||||
_0803CAD4: .4byte gUnknown_823932C
|
||||
_0803CAD8: .4byte gUnknown_2023D44
|
||||
_0803CAD8: .4byte gBattlerSpriteIds
|
||||
_0803CADC: .4byte gSprites
|
||||
_0803CAE0: .4byte 0x0000ff10
|
||||
_0803CAE4: .4byte gTrainerFrontPicPaletteTable
|
||||
@@ -4415,7 +4415,7 @@ sub_803CB00: @ 803CB00
|
||||
thumb_func_start sub_803CB0C
|
||||
sub_803CB0C: @ 803CB0C
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _0803CB9C @ =gUnknown_2023D44
|
||||
ldr r6, _0803CB9C @ =gBattlerSpriteIds
|
||||
ldr r4, _0803CBA0 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r6
|
||||
@@ -4484,7 +4484,7 @@ sub_803CB0C: @ 803CB0C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803CB9C: .4byte gUnknown_2023D44
|
||||
_0803CB9C: .4byte gBattlerSpriteIds
|
||||
_0803CBA0: .4byte gActiveBattler
|
||||
_0803CBA4: .4byte gSprites
|
||||
_0803CBA8: .4byte sub_8075590
|
||||
@@ -4548,7 +4548,7 @@ _0803CC0C:
|
||||
movs r1, 0x3F
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _0803CC50 @ =gSprites
|
||||
ldr r1, _0803CC54 @ =gUnknown_2023D44
|
||||
ldr r1, _0803CC54 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -4571,7 +4571,7 @@ _0803CC48:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803CC50: .4byte gSprites
|
||||
_0803CC54: .4byte gUnknown_2023D44
|
||||
_0803CC54: .4byte gBattlerSpriteIds
|
||||
_0803CC58: .4byte sub_8011EA0
|
||||
_0803CC5C: .4byte gUnknown_3004FE0
|
||||
_0803CC60: .4byte sub_803AD20
|
||||
@@ -4633,7 +4633,7 @@ _0803CCA6:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _0803CD80 @ =gUnknown_2037F16
|
||||
ldr r5, _0803CD80 @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -4701,7 +4701,7 @@ _0803CCA6:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _0803CD94 @ =gUnknown_2037EE4
|
||||
ldr r3, _0803CD94 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4725,12 +4725,12 @@ _0803CCA6:
|
||||
.align 2, 0
|
||||
_0803CD78: .4byte gActiveBattler
|
||||
_0803CD7C: .4byte gUnknown_2022BC4
|
||||
_0803CD80: .4byte gUnknown_2037F16
|
||||
_0803CD80: .4byte gAnimMoveTurn
|
||||
_0803CD84: .4byte gUnknown_2037EEC
|
||||
_0803CD88: .4byte gUnknown_2037EE8
|
||||
_0803CD8C: .4byte gUnknown_2037EFE
|
||||
_0803CD90: .4byte gUnknown_2037F00
|
||||
_0803CD94: .4byte gUnknown_2037EE4
|
||||
_0803CD94: .4byte gAnimDisableStructPtr
|
||||
_0803CD98: .4byte gUnknown_2024008
|
||||
_0803CD9C:
|
||||
ldr r0, _0803CDC0 @ =gUnknown_2024018
|
||||
@@ -5437,7 +5437,7 @@ _0803D2F0: .4byte gUnknown_2022870
|
||||
RecordedOpponentHandleHitAnimation: @ 803D2F4
|
||||
push {r4,lr}
|
||||
ldr r3, _0803D31C @ =gSprites
|
||||
ldr r2, _0803D320 @ =gUnknown_2023D44
|
||||
ldr r2, _0803D320 @ =gBattlerSpriteIds
|
||||
ldr r4, _0803D324 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -5455,7 +5455,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4
|
||||
b _0803D352
|
||||
.align 2, 0
|
||||
_0803D31C: .4byte gSprites
|
||||
_0803D320: .4byte gUnknown_2023D44
|
||||
_0803D320: .4byte gBattlerSpriteIds
|
||||
_0803D324: .4byte gActiveBattler
|
||||
_0803D328:
|
||||
ldr r1, _0803D358 @ =gUnknown_2024005
|
||||
@@ -5612,7 +5612,7 @@ _0803D450: .4byte gUnknown_2023F4C
|
||||
thumb_func_start sub_803D454
|
||||
sub_803D454: @ 803D454
|
||||
push {r4-r6,lr}
|
||||
ldr r5, _0803D534 @ =gUnknown_2023D44
|
||||
ldr r5, _0803D534 @ =gBattlerSpriteIds
|
||||
ldr r6, _0803D538 @ =gActiveBattler
|
||||
ldrb r0, [r6]
|
||||
adds r0, r5
|
||||
@@ -5722,7 +5722,7 @@ _0803D516:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0803D534: .4byte gUnknown_2023D44
|
||||
_0803D534: .4byte gBattlerSpriteIds
|
||||
_0803D538: .4byte gActiveBattler
|
||||
_0803D53C: .4byte gSprites
|
||||
_0803D540: .4byte sub_8075590
|
||||
@@ -6100,7 +6100,7 @@ RecordedOpponentHandleSpriteInvisibility: @ 803D834
|
||||
cmp r0, 0
|
||||
beq _0803D87A
|
||||
ldr r3, _0803D888 @ =gSprites
|
||||
ldr r0, _0803D88C @ =gUnknown_2023D44
|
||||
ldr r0, _0803D88C @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -6133,7 +6133,7 @@ _0803D87A:
|
||||
.align 2, 0
|
||||
_0803D884: .4byte gActiveBattler
|
||||
_0803D888: .4byte gSprites
|
||||
_0803D88C: .4byte gUnknown_2023D44
|
||||
_0803D88C: .4byte gBattlerSpriteIds
|
||||
_0803D890: .4byte gUnknown_2022BC4
|
||||
thumb_func_end RecordedOpponentHandleSpriteInvisibility
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ _080D426C:
|
||||
sub_80D4270: @ 80D4270
|
||||
push {lr}
|
||||
ldr r2, _080D4298 @ =gSprites
|
||||
ldr r1, _080D429C @ =gUnknown_2023D44
|
||||
ldr r1, _080D429C @ =gBattlerSpriteIds
|
||||
ldr r0, _080D42A0 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -90,7 +90,7 @@ _080D4294:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D4298: .4byte gSprites
|
||||
_080D429C: .4byte gUnknown_2023D44
|
||||
_080D429C: .4byte gBattlerSpriteIds
|
||||
_080D42A0: .4byte gActiveBattler
|
||||
_080D42A4: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_80D4270
|
||||
@@ -99,7 +99,7 @@ _080D42A4: .4byte SpriteCallbackDummy
|
||||
sub_80D42A8: @ 80D42A8
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _080D4300 @ =gSprites
|
||||
ldr r5, _080D4304 @ =gUnknown_2023D44
|
||||
ldr r5, _080D4304 @ =gBattlerSpriteIds
|
||||
ldr r4, _080D4308 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
@@ -139,7 +139,7 @@ _080D42F8:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D4300: .4byte gSprites
|
||||
_080D4304: .4byte gUnknown_2023D44
|
||||
_080D4304: .4byte gBattlerSpriteIds
|
||||
_080D4308: .4byte gActiveBattler
|
||||
_080D430C: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_80D42A8
|
||||
@@ -456,7 +456,7 @@ _080D458C: .4byte sub_80D4358
|
||||
sub_80D4590: @ 80D4590
|
||||
push {lr}
|
||||
ldr r2, _080D45C4 @ =gSprites
|
||||
ldr r1, _080D45C8 @ =gUnknown_2023D44
|
||||
ldr r1, _080D45C8 @ =gBattlerSpriteIds
|
||||
ldr r0, _080D45CC @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -481,7 +481,7 @@ _080D45BE:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D45C4: .4byte gSprites
|
||||
_080D45C8: .4byte gUnknown_2023D44
|
||||
_080D45C8: .4byte gBattlerSpriteIds
|
||||
_080D45CC: .4byte gActiveBattler
|
||||
thumb_func_end sub_80D4590
|
||||
|
||||
@@ -543,7 +543,7 @@ _080D463C: .4byte gPlayerParty
|
||||
sub_80D4640: @ 80D4640
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _080D4698 @ =gSprites
|
||||
ldr r5, _080D469C @ =gUnknown_2023D44
|
||||
ldr r5, _080D469C @ =gBattlerSpriteIds
|
||||
ldr r4, _080D46A0 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
@@ -583,7 +583,7 @@ _080D4690:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D4698: .4byte gSprites
|
||||
_080D469C: .4byte gUnknown_2023D44
|
||||
_080D469C: .4byte gBattlerSpriteIds
|
||||
_080D46A0: .4byte gActiveBattler
|
||||
_080D46A4: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_80D4640
|
||||
@@ -605,7 +605,7 @@ sub_80D46A8: @ 80D46A8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080D46FC
|
||||
ldr r5, _080D470C @ =gUnknown_2023D44
|
||||
ldr r5, _080D470C @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -635,7 +635,7 @@ _080D46FC:
|
||||
.align 2, 0
|
||||
_080D4704: .4byte gUnknown_2024018
|
||||
_080D4708: .4byte gActiveBattler
|
||||
_080D470C: .4byte gUnknown_2023D44
|
||||
_080D470C: .4byte gBattlerSpriteIds
|
||||
_080D4710: .4byte gSprites
|
||||
_080D4714: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_80D46A8
|
||||
@@ -657,7 +657,7 @@ _080D472A:
|
||||
thumb_func_start sub_80D4730
|
||||
sub_80D4730: @ 80D4730
|
||||
push {r4,lr}
|
||||
ldr r1, _080D476C @ =gUnknown_2023D44
|
||||
ldr r1, _080D476C @ =gBattlerSpriteIds
|
||||
ldr r0, _080D4770 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -685,7 +685,7 @@ sub_80D4730: @ 80D4730
|
||||
bl sub_80D49E8
|
||||
b _080D47A6
|
||||
.align 2, 0
|
||||
_080D476C: .4byte gUnknown_2023D44
|
||||
_080D476C: .4byte gBattlerSpriteIds
|
||||
_080D4770: .4byte gActiveBattler
|
||||
_080D4774: .4byte gSprites
|
||||
_080D4778: .4byte gUnknown_2024005
|
||||
@@ -852,7 +852,7 @@ sub_80D484C: @ 80D484C
|
||||
ldr r5, _080D492C @ =gPlayerParty
|
||||
adds r0, r5
|
||||
bl HandleLowHpMusicChange
|
||||
ldr r1, _080D4930 @ =gUnknown_2023D44
|
||||
ldr r1, _080D4930 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r7]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -901,7 +901,7 @@ _080D4920: .4byte 0x000027f9
|
||||
_080D4924: .4byte c3_0802FDF4
|
||||
_080D4928: .4byte gBattlerPartyIndexes
|
||||
_080D492C: .4byte gPlayerParty
|
||||
_080D4930: .4byte gUnknown_2023D44
|
||||
_080D4930: .4byte gBattlerSpriteIds
|
||||
_080D4934: .4byte gSprites
|
||||
_080D4938: .4byte gUnknown_3004FF0
|
||||
_080D493C: .4byte gUnknown_3004FE0
|
||||
@@ -3393,7 +3393,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _080D5EB8 @ =gUnknown_2023D44
|
||||
ldr r4, _080D5EB8 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r6]
|
||||
adds r1, r4
|
||||
strb r0, [r1]
|
||||
@@ -3455,7 +3455,7 @@ _080D5EA8: .4byte gBattlerPartyIndexes
|
||||
_080D5EAC: .4byte gActiveBattler
|
||||
_080D5EB0: .4byte gPlayerParty
|
||||
_080D5EB4: .4byte gMultiuseSpriteTemplate
|
||||
_080D5EB8: .4byte gUnknown_2023D44
|
||||
_080D5EB8: .4byte gBattlerSpriteIds
|
||||
_080D5EBC: .4byte gSprites
|
||||
_080D5EC0: .4byte 0x0000ff10
|
||||
_080D5EC4: .4byte gBattleMonForms
|
||||
@@ -3585,7 +3585,7 @@ sub_80D5F40: @ 80D5F40
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _080D609C @ =gUnknown_2023D44
|
||||
ldr r4, _080D609C @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _080D60A0 @ =gSprites
|
||||
@@ -3675,7 +3675,7 @@ _080D608C: .4byte gPlayerParty
|
||||
_080D6090: .4byte sub_8033E3C
|
||||
_080D6094: .4byte gUnknown_3004FFC
|
||||
_080D6098: .4byte gMultiuseSpriteTemplate
|
||||
_080D609C: .4byte gUnknown_2023D44
|
||||
_080D609C: .4byte gBattlerSpriteIds
|
||||
_080D60A0: .4byte gSprites
|
||||
_080D60A4: .4byte gBattleMonForms
|
||||
_080D60A8: .4byte SpriteCallbackDummy
|
||||
@@ -3715,7 +3715,7 @@ _080D60E8: .4byte gUnknown_2024018
|
||||
_080D60EC: .4byte gUnknown_3004FE0
|
||||
_080D60F0: .4byte sub_80D613C
|
||||
_080D60F4:
|
||||
ldr r5, _080D6130 @ =gUnknown_2023D44
|
||||
ldr r5, _080D6130 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -3743,7 +3743,7 @@ _080D612A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D6130: .4byte gUnknown_2023D44
|
||||
_080D6130: .4byte gBattlerSpriteIds
|
||||
_080D6134: .4byte gSprites
|
||||
_080D6138: .4byte gUnknown_3004FF0
|
||||
thumb_func_end LinkPartnerHandleReturnPokeToBall
|
||||
@@ -3926,7 +3926,7 @@ _080D6258:
|
||||
mov r1, r8
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r6, _080D6324 @ =gUnknown_2023D44
|
||||
ldr r6, _080D6324 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r5]
|
||||
adds r1, r6
|
||||
strb r0, [r1]
|
||||
@@ -3987,7 +3987,7 @@ _080D6258:
|
||||
_080D6318: .4byte gActiveBattler
|
||||
_080D631C: .4byte gMultiuseSpriteTemplate
|
||||
_080D6320: .4byte gUnknown_8239F8C
|
||||
_080D6324: .4byte gUnknown_2023D44
|
||||
_080D6324: .4byte gBattlerSpriteIds
|
||||
_080D6328: .4byte gSprites
|
||||
_080D632C: .4byte 0x0000fffe
|
||||
_080D6330: .4byte sub_8033EEC
|
||||
@@ -4006,7 +4006,7 @@ sub_80D633C: @ 80D633C
|
||||
thumb_func_start sub_80D6348
|
||||
sub_80D6348: @ 80D6348
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _080D63D4 @ =gUnknown_2023D44
|
||||
ldr r6, _080D63D4 @ =gBattlerSpriteIds
|
||||
ldr r4, _080D63D8 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r6
|
||||
@@ -4074,7 +4074,7 @@ sub_80D6348: @ 80D6348
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D63D4: .4byte gUnknown_2023D44
|
||||
_080D63D4: .4byte gBattlerSpriteIds
|
||||
_080D63D8: .4byte gActiveBattler
|
||||
_080D63DC: .4byte gSprites
|
||||
_080D63E0: .4byte 0x0000ffd8
|
||||
@@ -4150,7 +4150,7 @@ _080D6448:
|
||||
movs r0, 0x10
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _080D64CC @ =gSprites
|
||||
ldr r3, _080D64D0 @ =gUnknown_2023D44
|
||||
ldr r3, _080D64D0 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -4192,7 +4192,7 @@ _080D64BE:
|
||||
_080D64C4: .4byte gBattlerPartyIndexes
|
||||
_080D64C8: .4byte gPlayerParty
|
||||
_080D64CC: .4byte gSprites
|
||||
_080D64D0: .4byte gUnknown_2023D44
|
||||
_080D64D0: .4byte gBattlerSpriteIds
|
||||
_080D64D4: .4byte sub_8012110
|
||||
_080D64D8: .4byte gUnknown_3004FE0
|
||||
_080D64DC: .4byte sub_80D4640
|
||||
@@ -4254,7 +4254,7 @@ _080D6522:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _080D65FC @ =gUnknown_2037F16
|
||||
ldr r5, _080D65FC @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -4322,7 +4322,7 @@ _080D6522:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _080D6610 @ =gUnknown_2037EE4
|
||||
ldr r3, _080D6610 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4346,12 +4346,12 @@ _080D6522:
|
||||
.align 2, 0
|
||||
_080D65F4: .4byte gActiveBattler
|
||||
_080D65F8: .4byte gUnknown_2022BC4
|
||||
_080D65FC: .4byte gUnknown_2037F16
|
||||
_080D65FC: .4byte gAnimMoveTurn
|
||||
_080D6600: .4byte gUnknown_2037EEC
|
||||
_080D6604: .4byte gUnknown_2037EE8
|
||||
_080D6608: .4byte gUnknown_2037EFE
|
||||
_080D660C: .4byte gUnknown_2037F00
|
||||
_080D6610: .4byte gUnknown_2037EE4
|
||||
_080D6610: .4byte gAnimDisableStructPtr
|
||||
_080D6614: .4byte gUnknown_2024008
|
||||
_080D6618:
|
||||
ldr r0, _080D663C @ =gUnknown_2024018
|
||||
@@ -5058,7 +5058,7 @@ _080D6B6C: .4byte gUnknown_2022870
|
||||
LinkPartnerHandleHitAnimation: @ 80D6B70
|
||||
push {r4,lr}
|
||||
ldr r3, _080D6B98 @ =gSprites
|
||||
ldr r2, _080D6B9C @ =gUnknown_2023D44
|
||||
ldr r2, _080D6B9C @ =gBattlerSpriteIds
|
||||
ldr r4, _080D6BA0 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -5076,7 +5076,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70
|
||||
b _080D6BCE
|
||||
.align 2, 0
|
||||
_080D6B98: .4byte gSprites
|
||||
_080D6B9C: .4byte gUnknown_2023D44
|
||||
_080D6B9C: .4byte gBattlerSpriteIds
|
||||
_080D6BA0: .4byte gActiveBattler
|
||||
_080D6BA4:
|
||||
ldr r1, _080D6BD4 @ =gUnknown_2024005
|
||||
@@ -5234,7 +5234,7 @@ _080D6CD0: .4byte gUnknown_2023F4C
|
||||
thumb_func_start sub_80D6CD4
|
||||
sub_80D6CD4: @ 80D6CD4
|
||||
push {r4-r7,lr}
|
||||
ldr r5, _080D6DDC @ =gUnknown_2023D44
|
||||
ldr r5, _080D6DDC @ =gBattlerSpriteIds
|
||||
ldr r6, _080D6DE0 @ =gActiveBattler
|
||||
ldrb r0, [r6]
|
||||
adds r0, r5
|
||||
@@ -5358,7 +5358,7 @@ _080D6DC2:
|
||||
adds r0, 0x2
|
||||
b _080D6E0C
|
||||
.align 2, 0
|
||||
_080D6DDC: .4byte gUnknown_2023D44
|
||||
_080D6DDC: .4byte gBattlerSpriteIds
|
||||
_080D6DE0: .4byte gActiveBattler
|
||||
_080D6DE4: .4byte gSprites
|
||||
_080D6DE8: .4byte 0x0000ffd8
|
||||
@@ -5386,7 +5386,7 @@ _080D6E0C:
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
ldr r2, _080D6EA8 @ =gSprites
|
||||
ldr r1, _080D6EAC @ =gUnknown_2023D44
|
||||
ldr r1, _080D6EAC @ =gBattlerSpriteIds
|
||||
ldr r5, _080D6EB0 @ =gActiveBattler
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
@@ -5453,7 +5453,7 @@ _080D6E86:
|
||||
.align 2, 0
|
||||
_080D6EA4: .4byte gUnknown_8239FD4
|
||||
_080D6EA8: .4byte gSprites
|
||||
_080D6EAC: .4byte gUnknown_2023D44
|
||||
_080D6EAC: .4byte gBattlerSpriteIds
|
||||
_080D6EB0: .4byte gActiveBattler
|
||||
_080D6EB4: .4byte sub_80D6ED0
|
||||
_080D6EB8: .4byte gTasks
|
||||
@@ -5781,7 +5781,7 @@ LinkPartnerHandleSpriteInvisibility: @ 80D7144
|
||||
cmp r0, 0
|
||||
beq _080D718A
|
||||
ldr r3, _080D7198 @ =gSprites
|
||||
ldr r0, _080D719C @ =gUnknown_2023D44
|
||||
ldr r0, _080D719C @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -5814,7 +5814,7 @@ _080D718A:
|
||||
.align 2, 0
|
||||
_080D7194: .4byte gActiveBattler
|
||||
_080D7198: .4byte gSprites
|
||||
_080D719C: .4byte gUnknown_2023D44
|
||||
_080D719C: .4byte gBattlerSpriteIds
|
||||
_080D71A0: .4byte gUnknown_2022BC4
|
||||
thumb_func_end LinkPartnerHandleSpriteInvisibility
|
||||
|
||||
|
||||
+34
-34
@@ -422,7 +422,7 @@ _080E78D8:
|
||||
sub_80E78E0: @ 80E78E0
|
||||
push {lr}
|
||||
ldr r2, _080E7908 @ =gSprites
|
||||
ldr r1, _080E790C @ =gUnknown_2023D44
|
||||
ldr r1, _080E790C @ =gBattlerSpriteIds
|
||||
ldr r0, _080E7910 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -442,7 +442,7 @@ _080E7904:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E7908: .4byte gSprites
|
||||
_080E790C: .4byte gUnknown_2023D44
|
||||
_080E790C: .4byte gBattlerSpriteIds
|
||||
_080E7910: .4byte gActiveBattler
|
||||
_080E7914: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_80E78E0
|
||||
@@ -1653,7 +1653,7 @@ _080E82F0: .4byte sub_80E8930
|
||||
sub_80E82F4: @ 80E82F4
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _080E834C @ =gSprites
|
||||
ldr r5, _080E8350 @ =gUnknown_2023D44
|
||||
ldr r5, _080E8350 @ =gBattlerSpriteIds
|
||||
ldr r4, _080E8354 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
@@ -1693,7 +1693,7 @@ _080E8344:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E834C: .4byte gSprites
|
||||
_080E8350: .4byte gUnknown_2023D44
|
||||
_080E8350: .4byte gBattlerSpriteIds
|
||||
_080E8354: .4byte gActiveBattler
|
||||
_080E8358: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_80E82F4
|
||||
@@ -2432,7 +2432,7 @@ _080E8942:
|
||||
thumb_func_start DoHitAnimBlinkSpriteEffect_3
|
||||
DoHitAnimBlinkSpriteEffect_3: @ 80E8948
|
||||
push {r4,lr}
|
||||
ldr r1, _080E8984 @ =gUnknown_2023D44
|
||||
ldr r1, _080E8984 @ =gBattlerSpriteIds
|
||||
ldr r0, _080E8988 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -2460,7 +2460,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948
|
||||
bl WallyBufferExecCompleted
|
||||
b _080E89BE
|
||||
.align 2, 0
|
||||
_080E8984: .4byte gUnknown_2023D44
|
||||
_080E8984: .4byte gBattlerSpriteIds
|
||||
_080E8988: .4byte gActiveBattler
|
||||
_080E898C: .4byte gSprites
|
||||
_080E8990: .4byte gUnknown_2024005
|
||||
@@ -2510,7 +2510,7 @@ sub_80E89C4: @ 80E89C4
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080E8A18
|
||||
ldr r5, _080E8A28 @ =gUnknown_2023D44
|
||||
ldr r5, _080E8A28 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -2540,7 +2540,7 @@ _080E8A18:
|
||||
.align 2, 0
|
||||
_080E8A20: .4byte gUnknown_2024018
|
||||
_080E8A24: .4byte gActiveBattler
|
||||
_080E8A28: .4byte gUnknown_2023D44
|
||||
_080E8A28: .4byte gBattlerSpriteIds
|
||||
_080E8A2C: .4byte gSprites
|
||||
_080E8A30: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_80E89C4
|
||||
@@ -2549,7 +2549,7 @@ _080E8A30: .4byte gUnknown_3004FF0
|
||||
sub_80E8A34: @ 80E8A34
|
||||
push {lr}
|
||||
ldr r2, _080E8A5C @ =gSprites
|
||||
ldr r1, _080E8A60 @ =gUnknown_2023D44
|
||||
ldr r1, _080E8A60 @ =gBattlerSpriteIds
|
||||
ldr r0, _080E8A64 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -2569,7 +2569,7 @@ _080E8A58:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E8A5C: .4byte gSprites
|
||||
_080E8A60: .4byte gUnknown_2023D44
|
||||
_080E8A60: .4byte gBattlerSpriteIds
|
||||
_080E8A64: .4byte gActiveBattler
|
||||
_080E8A68: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_80E8A34
|
||||
@@ -4919,7 +4919,7 @@ _080E9E18: .4byte gActiveBattler
|
||||
_080E9E1C: .4byte gUnknown_3004FE0
|
||||
_080E9E20: .4byte sub_80E89C4
|
||||
_080E9E24:
|
||||
ldr r5, _080E9E60 @ =gUnknown_2023D44
|
||||
ldr r5, _080E9E60 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -4947,7 +4947,7 @@ _080E9E5A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E9E60: .4byte gUnknown_2023D44
|
||||
_080E9E60: .4byte gBattlerSpriteIds
|
||||
_080E9E64: .4byte gSprites
|
||||
_080E9E68: .4byte gUnknown_3004FF0
|
||||
thumb_func_end WallyHandleReturnMonToBall
|
||||
@@ -4993,7 +4993,7 @@ sub_80E9E6C: @ 80E9E6C
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r2, _080E9EDC @ =gUnknown_2023D44
|
||||
ldr r2, _080E9EDC @ =gBattlerSpriteIds
|
||||
ldrb r1, [r6]
|
||||
b _080E9F1C
|
||||
.align 2, 0
|
||||
@@ -5002,7 +5002,7 @@ _080E9ECC: .4byte gSaveBlock2Ptr
|
||||
_080E9ED0: .4byte gActiveBattler
|
||||
_080E9ED4: .4byte gMultiuseSpriteTemplate
|
||||
_080E9ED8: .4byte gUnknown_8239F8C
|
||||
_080E9EDC: .4byte gUnknown_2023D44
|
||||
_080E9EDC: .4byte gBattlerSpriteIds
|
||||
_080E9EE0:
|
||||
ldr r4, _080E9F8C @ =gActiveBattler
|
||||
ldrb r1, [r4]
|
||||
@@ -5028,13 +5028,13 @@ _080E9EE0:
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r2, _080E9F98 @ =gUnknown_2023D44
|
||||
ldr r2, _080E9F98 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
_080E9F1C:
|
||||
adds r1, r2
|
||||
strb r0, [r1]
|
||||
ldr r4, _080E9F9C @ =gSprites
|
||||
ldr r5, _080E9F98 @ =gUnknown_2023D44
|
||||
ldr r5, _080E9F98 @ =gBattlerSpriteIds
|
||||
ldr r6, _080E9F8C @ =gActiveBattler
|
||||
ldrb r3, [r6]
|
||||
adds r0, r3, r5
|
||||
@@ -5090,7 +5090,7 @@ _080E9F1C:
|
||||
_080E9F8C: .4byte gActiveBattler
|
||||
_080E9F90: .4byte gMultiuseSpriteTemplate
|
||||
_080E9F94: .4byte gUnknown_8239F8C
|
||||
_080E9F98: .4byte gUnknown_2023D44
|
||||
_080E9F98: .4byte gBattlerSpriteIds
|
||||
_080E9F9C: .4byte gSprites
|
||||
_080E9FA0: .4byte 0x0000fffe
|
||||
_080E9FA4: .4byte sub_8033EEC
|
||||
@@ -5139,7 +5139,7 @@ sub_80E9FB0: @ 80E9FB0
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r2, _080EA020 @ =gUnknown_2023D44
|
||||
ldr r2, _080EA020 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r6]
|
||||
b _080EA060
|
||||
.align 2, 0
|
||||
@@ -5148,7 +5148,7 @@ _080EA010: .4byte gSaveBlock2Ptr
|
||||
_080EA014: .4byte gActiveBattler
|
||||
_080EA018: .4byte gMultiuseSpriteTemplate
|
||||
_080EA01C: .4byte gUnknown_8239F8C
|
||||
_080EA020: .4byte gUnknown_2023D44
|
||||
_080EA020: .4byte gBattlerSpriteIds
|
||||
_080EA024:
|
||||
ldr r4, _080EA0D0 @ =gActiveBattler
|
||||
ldrb r1, [r4]
|
||||
@@ -5174,13 +5174,13 @@ _080EA024:
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r2, _080EA0DC @ =gUnknown_2023D44
|
||||
ldr r2, _080EA0DC @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
_080EA060:
|
||||
adds r1, r2
|
||||
strb r0, [r1]
|
||||
ldr r4, _080EA0E0 @ =gSprites
|
||||
ldr r5, _080EA0DC @ =gUnknown_2023D44
|
||||
ldr r5, _080EA0DC @ =gBattlerSpriteIds
|
||||
ldr r6, _080EA0D0 @ =gActiveBattler
|
||||
ldrb r3, [r6]
|
||||
adds r0, r3, r5
|
||||
@@ -5236,7 +5236,7 @@ _080EA060:
|
||||
_080EA0D0: .4byte gActiveBattler
|
||||
_080EA0D4: .4byte gMultiuseSpriteTemplate
|
||||
_080EA0D8: .4byte gUnknown_8239F8C
|
||||
_080EA0DC: .4byte gUnknown_2023D44
|
||||
_080EA0DC: .4byte gBattlerSpriteIds
|
||||
_080EA0E0: .4byte gSprites
|
||||
_080EA0E4: .4byte 0x0000ffa0
|
||||
_080EA0E8: .4byte sub_8033EEC
|
||||
@@ -5318,7 +5318,7 @@ _080EA154:
|
||||
movs r0, 0x10
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _080EA1D8 @ =gSprites
|
||||
ldr r3, _080EA1DC @ =gUnknown_2023D44
|
||||
ldr r3, _080EA1DC @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -5360,7 +5360,7 @@ _080EA1CA:
|
||||
_080EA1D0: .4byte gBattlerPartyIndexes
|
||||
_080EA1D4: .4byte gPlayerParty
|
||||
_080EA1D8: .4byte gSprites
|
||||
_080EA1DC: .4byte gUnknown_2023D44
|
||||
_080EA1DC: .4byte gBattlerSpriteIds
|
||||
_080EA1E0: .4byte sub_8012110
|
||||
_080EA1E4: .4byte gUnknown_3004FE0
|
||||
_080EA1E8: .4byte sub_80E82F4
|
||||
@@ -5483,7 +5483,7 @@ sub_80EA2B8: @ 80EA2B8
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _080EA394 @ =gUnknown_2037F16
|
||||
ldr r5, _080EA394 @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -5551,7 +5551,7 @@ sub_80EA2B8: @ 80EA2B8
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _080EA3A8 @ =gUnknown_2037EE4
|
||||
ldr r3, _080EA3A8 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -5575,12 +5575,12 @@ sub_80EA2B8: @ 80EA2B8
|
||||
.align 2, 0
|
||||
_080EA38C: .4byte gUnknown_2022BC4
|
||||
_080EA390: .4byte gActiveBattler
|
||||
_080EA394: .4byte gUnknown_2037F16
|
||||
_080EA394: .4byte gAnimMoveTurn
|
||||
_080EA398: .4byte gUnknown_2037EEC
|
||||
_080EA39C: .4byte gUnknown_2037EE8
|
||||
_080EA3A0: .4byte gUnknown_2037EFE
|
||||
_080EA3A4: .4byte gUnknown_2037F00
|
||||
_080EA3A8: .4byte gUnknown_2037EE4
|
||||
_080EA3A8: .4byte gAnimDisableStructPtr
|
||||
_080EA3AC: .4byte gUnknown_2024008
|
||||
_080EA3B0:
|
||||
ldr r0, _080EA3D4 @ =gUnknown_2024018
|
||||
@@ -6641,7 +6641,7 @@ sub_80EABFC: @ 80EABFC
|
||||
sub_80EAC08: @ 80EAC08
|
||||
push {r4,lr}
|
||||
ldr r3, _080EAC30 @ =gSprites
|
||||
ldr r2, _080EAC34 @ =gUnknown_2023D44
|
||||
ldr r2, _080EAC34 @ =gBattlerSpriteIds
|
||||
ldr r4, _080EAC38 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -6659,7 +6659,7 @@ sub_80EAC08: @ 80EAC08
|
||||
b _080EAC66
|
||||
.align 2, 0
|
||||
_080EAC30: .4byte gSprites
|
||||
_080EAC34: .4byte gUnknown_2023D44
|
||||
_080EAC34: .4byte gBattlerSpriteIds
|
||||
_080EAC38: .4byte gActiveBattler
|
||||
_080EAC3C:
|
||||
ldr r1, _080EAC6C @ =gUnknown_2024005
|
||||
@@ -6812,7 +6812,7 @@ sub_80EAD54: @ 80EAD54
|
||||
bne _080EAD64
|
||||
b _080EAEE4
|
||||
_080EAD64:
|
||||
ldr r6, _080EAEA4 @ =gUnknown_2023D44
|
||||
ldr r6, _080EAEA4 @ =gBattlerSpriteIds
|
||||
ldr r7, _080EAEA8 @ =gActiveBattler
|
||||
ldrb r0, [r7]
|
||||
adds r0, r6
|
||||
@@ -6966,7 +6966,7 @@ _080EAE84:
|
||||
b _080EAF18
|
||||
.align 2, 0
|
||||
_080EAEA0: .4byte gBattleTypeFlags
|
||||
_080EAEA4: .4byte gUnknown_2023D44
|
||||
_080EAEA4: .4byte gBattlerSpriteIds
|
||||
_080EAEA8: .4byte gActiveBattler
|
||||
_080EAEAC: .4byte gSprites
|
||||
_080EAEB0: .4byte 0x0000ffd8
|
||||
@@ -7094,7 +7094,7 @@ sub_80EAF34: @ 80EAF34
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _080EB098 @ =gUnknown_2023D44
|
||||
ldr r4, _080EB098 @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _080EB09C @ =gSprites
|
||||
@@ -7185,7 +7185,7 @@ _080EB088: .4byte gPlayerParty
|
||||
_080EB08C: .4byte sub_8033E3C
|
||||
_080EB090: .4byte gUnknown_3004FFC
|
||||
_080EB094: .4byte gMultiuseSpriteTemplate
|
||||
_080EB098: .4byte gUnknown_2023D44
|
||||
_080EB098: .4byte gBattlerSpriteIds
|
||||
_080EB09C: .4byte gSprites
|
||||
_080EB0A0: .4byte gBattleMonForms
|
||||
_080EB0A4: .4byte SpriteCallbackDummy
|
||||
|
||||
@@ -70,7 +70,7 @@ _08035AE4:
|
||||
sub_8035AE8: @ 8035AE8
|
||||
push {lr}
|
||||
ldr r2, _08035B10 @ =gSprites
|
||||
ldr r1, _08035B14 @ =gUnknown_2023D44
|
||||
ldr r1, _08035B14 @ =gBattlerSpriteIds
|
||||
ldr r0, _08035B18 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -90,7 +90,7 @@ _08035B0C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08035B10: .4byte gSprites
|
||||
_08035B14: .4byte gUnknown_2023D44
|
||||
_08035B14: .4byte gBattlerSpriteIds
|
||||
_08035B18: .4byte gActiveBattler
|
||||
_08035B1C: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_8035AE8
|
||||
@@ -99,7 +99,7 @@ _08035B1C: .4byte SpriteCallbackDummy
|
||||
sub_8035B20: @ 8035B20
|
||||
push {lr}
|
||||
ldr r2, _08035B48 @ =gSprites
|
||||
ldr r1, _08035B4C @ =gUnknown_2023D44
|
||||
ldr r1, _08035B4C @ =gBattlerSpriteIds
|
||||
ldr r0, _08035B50 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -119,7 +119,7 @@ _08035B44:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08035B48: .4byte gSprites
|
||||
_08035B4C: .4byte gUnknown_2023D44
|
||||
_08035B4C: .4byte gBattlerSpriteIds
|
||||
_08035B50: .4byte gActiveBattler
|
||||
_08035B54: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_8035B20
|
||||
@@ -128,7 +128,7 @@ _08035B54: .4byte SpriteCallbackDummy
|
||||
sub_8035B58: @ 8035B58
|
||||
push {r4-r6,lr}
|
||||
ldr r4, _08035BD0 @ =gSprites
|
||||
ldr r6, _08035BD4 @ =gUnknown_2023D44
|
||||
ldr r6, _08035BD4 @ =gBattlerSpriteIds
|
||||
ldr r5, _08035BD8 @ =gActiveBattler
|
||||
ldrb r0, [r5]
|
||||
adds r0, r6
|
||||
@@ -184,7 +184,7 @@ _08035BC8:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08035BD0: .4byte gSprites
|
||||
_08035BD4: .4byte gUnknown_2023D44
|
||||
_08035BD4: .4byte gBattlerSpriteIds
|
||||
_08035BD8: .4byte gActiveBattler
|
||||
_08035BDC: .4byte SpriteCallbackDummy
|
||||
_08035BE0: .4byte 0x000003ff
|
||||
@@ -685,7 +685,7 @@ _08035FE4: .4byte sub_8035C30
|
||||
sub_8035FE8: @ 8035FE8
|
||||
push {r4-r7,lr}
|
||||
ldr r2, _08036044 @ =gSprites
|
||||
ldr r0, _08036048 @ =gUnknown_2023D44
|
||||
ldr r0, _08036048 @ =gBattlerSpriteIds
|
||||
ldr r7, _0803604C @ =gActiveBattler
|
||||
ldrb r3, [r7]
|
||||
adds r0, r3, r0
|
||||
@@ -729,7 +729,7 @@ sub_8035FE8: @ 8035FE8
|
||||
b _08036094
|
||||
.align 2, 0
|
||||
_08036044: .4byte gSprites
|
||||
_08036048: .4byte gUnknown_2023D44
|
||||
_08036048: .4byte gBattlerSpriteIds
|
||||
_0803604C: .4byte gActiveBattler
|
||||
_08036050: .4byte gUnknown_2024018
|
||||
_08036054: .4byte gBattlerPartyIndexes
|
||||
@@ -838,7 +838,7 @@ _08036124:
|
||||
sub_803612C: @ 803612C
|
||||
push {lr}
|
||||
ldr r2, _08036160 @ =gSprites
|
||||
ldr r0, _08036164 @ =gUnknown_2023D44
|
||||
ldr r0, _08036164 @ =gBattlerSpriteIds
|
||||
ldr r1, _08036168 @ =gActiveBattler
|
||||
ldrb r3, [r1]
|
||||
adds r0, r3, r0
|
||||
@@ -862,7 +862,7 @@ _0803615A:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08036160: .4byte gSprites
|
||||
_08036164: .4byte gUnknown_2023D44
|
||||
_08036164: .4byte gBattlerSpriteIds
|
||||
_08036168: .4byte gActiveBattler
|
||||
_0803616C: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_803612C
|
||||
@@ -884,7 +884,7 @@ sub_8036170: @ 8036170
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080361CA
|
||||
ldr r5, _080361D8 @ =gUnknown_2023D44
|
||||
ldr r5, _080361D8 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -916,7 +916,7 @@ _080361CA:
|
||||
.align 2, 0
|
||||
_080361D0: .4byte gUnknown_2024018
|
||||
_080361D4: .4byte gActiveBattler
|
||||
_080361D8: .4byte gUnknown_2023D44
|
||||
_080361D8: .4byte gBattlerSpriteIds
|
||||
_080361DC: .4byte gSprites
|
||||
_080361E0: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_8036170
|
||||
@@ -938,7 +938,7 @@ _080361F6:
|
||||
thumb_func_start sub_80361FC
|
||||
sub_80361FC: @ 80361FC
|
||||
push {r4,lr}
|
||||
ldr r1, _08036238 @ =gUnknown_2023D44
|
||||
ldr r1, _08036238 @ =gBattlerSpriteIds
|
||||
ldr r0, _0803623C @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -966,7 +966,7 @@ sub_80361FC: @ 80361FC
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08036272
|
||||
.align 2, 0
|
||||
_08036238: .4byte gUnknown_2023D44
|
||||
_08036238: .4byte gBattlerSpriteIds
|
||||
_0803623C: .4byte gActiveBattler
|
||||
_08036240: .4byte gSprites
|
||||
_08036244: .4byte gUnknown_2024005
|
||||
@@ -1128,7 +1128,7 @@ sub_8036334: @ 8036334
|
||||
bl FreeSpriteTilesByTag
|
||||
adds r0, r4, 0
|
||||
bl FreeSpritePaletteByTag
|
||||
ldr r1, _080363EC @ =gUnknown_2023D44
|
||||
ldr r1, _080363EC @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -1175,7 +1175,7 @@ _080363D8:
|
||||
_080363E0: .4byte gUnknown_2024018
|
||||
_080363E4: .4byte gActiveBattler
|
||||
_080363E8: .4byte 0x000027f9
|
||||
_080363EC: .4byte gUnknown_2023D44
|
||||
_080363EC: .4byte gBattlerSpriteIds
|
||||
_080363F0: .4byte gSprites
|
||||
_080363F4: .4byte gUnknown_3004FF0
|
||||
_080363F8: .4byte gBattlerPartyIndexes
|
||||
@@ -3666,7 +3666,7 @@ _080378AA:
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _080379A4 @ =gUnknown_2023D44
|
||||
ldr r4, _080379A4 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r7]
|
||||
adds r1, r4
|
||||
strb r0, [r1]
|
||||
@@ -3759,7 +3759,7 @@ _08037986:
|
||||
.align 2, 0
|
||||
_0803799C: .4byte gActiveBattler
|
||||
_080379A0: .4byte gMultiuseSpriteTemplate
|
||||
_080379A4: .4byte gUnknown_2023D44
|
||||
_080379A4: .4byte gBattlerSpriteIds
|
||||
_080379A8: .4byte gSprites
|
||||
_080379AC: .4byte 0x0000ff10
|
||||
_080379B0: .4byte gBattleMonForms
|
||||
@@ -3895,7 +3895,7 @@ sub_8037A28: @ 8037A28
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _08037B9C @ =gUnknown_2023D44
|
||||
ldr r4, _08037B9C @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _08037BA0 @ =gSprites
|
||||
@@ -3985,7 +3985,7 @@ _08037B8C: .4byte gEnemyParty
|
||||
_08037B90: .4byte sub_8033E3C
|
||||
_08037B94: .4byte gUnknown_3004FFC
|
||||
_08037B98: .4byte gMultiuseSpriteTemplate
|
||||
_08037B9C: .4byte gUnknown_2023D44
|
||||
_08037B9C: .4byte gBattlerSpriteIds
|
||||
_08037BA0: .4byte gSprites
|
||||
_08037BA4: .4byte gBattleMonForms
|
||||
_08037BA8: .4byte SpriteCallbackDummy
|
||||
@@ -4025,7 +4025,7 @@ _08037BE8: .4byte gUnknown_2024018
|
||||
_08037BEC: .4byte gUnknown_3004FE0
|
||||
_08037BF0: .4byte sub_8037C44
|
||||
_08037BF4:
|
||||
ldr r5, _08037C38 @ =gUnknown_2023D44
|
||||
ldr r5, _08037C38 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -4055,7 +4055,7 @@ _08037C30:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08037C38: .4byte gUnknown_2023D44
|
||||
_08037C38: .4byte gBattlerSpriteIds
|
||||
_08037C3C: .4byte gSprites
|
||||
_08037C40: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_8037BAC
|
||||
@@ -4227,7 +4227,7 @@ _08037D3A:
|
||||
movs r1, 0xB0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r5, _08037E7C @ =gUnknown_2023D44
|
||||
ldr r5, _08037E7C @ =gBattlerSpriteIds
|
||||
mov r2, r8
|
||||
ldrb r1, [r2]
|
||||
adds r1, r5
|
||||
@@ -4341,7 +4341,7 @@ _08037E6C: .4byte gTrainers
|
||||
_08037E70: .4byte gActiveBattler
|
||||
_08037E74: .4byte gMultiuseSpriteTemplate
|
||||
_08037E78: .4byte gUnknown_823932C
|
||||
_08037E7C: .4byte gUnknown_2023D44
|
||||
_08037E7C: .4byte gBattlerSpriteIds
|
||||
_08037E80: .4byte gSprites
|
||||
_08037E84: .4byte 0x0000ff10
|
||||
_08037E88: .4byte gTrainerFrontPicPaletteTable
|
||||
@@ -4439,7 +4439,7 @@ _08037F0E:
|
||||
movs r1, 0xB0
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r5, _08038050 @ =gUnknown_2023D44
|
||||
ldr r5, _08038050 @ =gBattlerSpriteIds
|
||||
mov r2, r8
|
||||
ldrb r1, [r2]
|
||||
adds r1, r5
|
||||
@@ -4561,7 +4561,7 @@ _08038040: .4byte gTrainers
|
||||
_08038044: .4byte gActiveBattler
|
||||
_08038048: .4byte gMultiuseSpriteTemplate
|
||||
_0803804C: .4byte gUnknown_823932C
|
||||
_08038050: .4byte gUnknown_2023D44
|
||||
_08038050: .4byte gBattlerSpriteIds
|
||||
_08038054: .4byte gSprites
|
||||
_08038058: .4byte 0x0000fffe
|
||||
_0803805C: .4byte gTrainerFrontPicPaletteTable
|
||||
@@ -4576,7 +4576,7 @@ _08038074: .4byte sub_8035B20
|
||||
thumb_func_start sub_8038078
|
||||
sub_8038078: @ 8038078
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _08038108 @ =gUnknown_2023D44
|
||||
ldr r6, _08038108 @ =gBattlerSpriteIds
|
||||
ldr r4, _0803810C @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r6
|
||||
@@ -4645,7 +4645,7 @@ sub_8038078: @ 8038078
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08038108: .4byte gUnknown_2023D44
|
||||
_08038108: .4byte gBattlerSpriteIds
|
||||
_0803810C: .4byte gActiveBattler
|
||||
_08038110: .4byte gSprites
|
||||
_08038114: .4byte sub_8075590
|
||||
@@ -4709,7 +4709,7 @@ _08038178:
|
||||
movs r1, 0x3F
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _080381BC @ =gSprites
|
||||
ldr r1, _080381C0 @ =gUnknown_2023D44
|
||||
ldr r1, _080381C0 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -4732,7 +4732,7 @@ _080381B4:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080381BC: .4byte gSprites
|
||||
_080381C0: .4byte gUnknown_2023D44
|
||||
_080381C0: .4byte gBattlerSpriteIds
|
||||
_080381C4: .4byte sub_8011EA0
|
||||
_080381C8: .4byte gUnknown_3004FE0
|
||||
_080381CC: .4byte sub_803612C
|
||||
@@ -4794,7 +4794,7 @@ _08038212:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _080382EC @ =gUnknown_2037F16
|
||||
ldr r5, _080382EC @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -4862,7 +4862,7 @@ _08038212:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _08038300 @ =gUnknown_2037EE4
|
||||
ldr r3, _08038300 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4886,12 +4886,12 @@ _08038212:
|
||||
.align 2, 0
|
||||
_080382E4: .4byte gActiveBattler
|
||||
_080382E8: .4byte gUnknown_2022BC4
|
||||
_080382EC: .4byte gUnknown_2037F16
|
||||
_080382EC: .4byte gAnimMoveTurn
|
||||
_080382F0: .4byte gUnknown_2037EEC
|
||||
_080382F4: .4byte gUnknown_2037EE8
|
||||
_080382F8: .4byte gUnknown_2037EFE
|
||||
_080382FC: .4byte gUnknown_2037F00
|
||||
_08038300: .4byte gUnknown_2037EE4
|
||||
_08038300: .4byte gAnimDisableStructPtr
|
||||
_08038304: .4byte gUnknown_2024008
|
||||
_08038308:
|
||||
ldr r0, _0803832C @ =gUnknown_2024018
|
||||
@@ -5926,7 +5926,7 @@ _08038B1C: .4byte gUnknown_2022870
|
||||
OpponentHandleHitAnimation: @ 8038B20
|
||||
push {r4,lr}
|
||||
ldr r3, _08038B48 @ =gSprites
|
||||
ldr r2, _08038B4C @ =gUnknown_2023D44
|
||||
ldr r2, _08038B4C @ =gBattlerSpriteIds
|
||||
ldr r4, _08038B50 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -5944,7 +5944,7 @@ OpponentHandleHitAnimation: @ 8038B20
|
||||
b _08038B7E
|
||||
.align 2, 0
|
||||
_08038B48: .4byte gSprites
|
||||
_08038B4C: .4byte gUnknown_2023D44
|
||||
_08038B4C: .4byte gBattlerSpriteIds
|
||||
_08038B50: .4byte gActiveBattler
|
||||
_08038B54:
|
||||
ldr r1, _08038B84 @ =gUnknown_2024005
|
||||
@@ -6101,7 +6101,7 @@ _08038C7C: .4byte gUnknown_2023F4C
|
||||
thumb_func_start sub_8038C80
|
||||
sub_8038C80: @ 8038C80
|
||||
push {r4-r6,lr}
|
||||
ldr r5, _08038D60 @ =gUnknown_2023D44
|
||||
ldr r5, _08038D60 @ =gBattlerSpriteIds
|
||||
ldr r6, _08038D64 @ =gActiveBattler
|
||||
ldrb r0, [r6]
|
||||
adds r0, r5
|
||||
@@ -6211,7 +6211,7 @@ _08038D42:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08038D60: .4byte gUnknown_2023D44
|
||||
_08038D60: .4byte gBattlerSpriteIds
|
||||
_08038D64: .4byte gActiveBattler
|
||||
_08038D68: .4byte gSprites
|
||||
_08038D6C: .4byte sub_8075590
|
||||
@@ -6589,7 +6589,7 @@ sub_8039060: @ 8039060
|
||||
cmp r0, 0
|
||||
beq _080390A6
|
||||
ldr r3, _080390B4 @ =gSprites
|
||||
ldr r0, _080390B8 @ =gUnknown_2023D44
|
||||
ldr r0, _080390B8 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -6622,7 +6622,7 @@ _080390A6:
|
||||
.align 2, 0
|
||||
_080390B0: .4byte gActiveBattler
|
||||
_080390B4: .4byte gSprites
|
||||
_080390B8: .4byte gUnknown_2023D44
|
||||
_080390B8: .4byte gBattlerSpriteIds
|
||||
_080390BC: .4byte gUnknown_2022BC4
|
||||
thumb_func_end sub_8039060
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@ _0802E400:
|
||||
CompleteOnBankSpritePosX_0: @ 802E404
|
||||
push {lr}
|
||||
ldr r2, _0802E42C @ =gSprites
|
||||
ldr r1, _0802E430 @ =gUnknown_2023D44
|
||||
ldr r1, _0802E430 @ =gBattlerSpriteIds
|
||||
ldr r0, _0802E434 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -150,7 +150,7 @@ _0802E426:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E42C: .4byte gSprites
|
||||
_0802E430: .4byte gUnknown_2023D44
|
||||
_0802E430: .4byte gBattlerSpriteIds
|
||||
_0802E434: .4byte gActiveBattler
|
||||
thumb_func_end CompleteOnBankSpritePosX_0
|
||||
|
||||
@@ -480,7 +480,7 @@ _0802E6B6:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r2, _0802E718 @ =gSprites
|
||||
ldr r1, _0802E71C @ =gUnknown_2023D44
|
||||
ldr r1, _0802E71C @ =gBattlerSpriteIds
|
||||
ldr r4, _0802E70C @ =gUnknown_3004FF4
|
||||
ldrb r0, [r4]
|
||||
adds r0, r1
|
||||
@@ -514,7 +514,7 @@ _0802E70C: .4byte gUnknown_3004FF4
|
||||
_0802E710: .4byte gBattlersCount
|
||||
_0802E714: .4byte gMain
|
||||
_0802E718: .4byte gSprites
|
||||
_0802E71C: .4byte gUnknown_2023D44
|
||||
_0802E71C: .4byte gBattlerSpriteIds
|
||||
_0802E720: .4byte sub_8012098
|
||||
_0802E724: .4byte gUnknown_2023FFC
|
||||
_0802E728: .4byte gActiveBattler
|
||||
@@ -526,7 +526,7 @@ _0802E72C:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r2, _0802E784 @ =gSprites
|
||||
ldr r1, _0802E788 @ =gUnknown_2023D44
|
||||
ldr r1, _0802E788 @ =gBattlerSpriteIds
|
||||
ldr r5, _0802E78C @ =gUnknown_3004FF4
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
@@ -561,7 +561,7 @@ _0802E72C:
|
||||
b _0802E9DC
|
||||
.align 2, 0
|
||||
_0802E784: .4byte gSprites
|
||||
_0802E788: .4byte gUnknown_2023D44
|
||||
_0802E788: .4byte gBattlerSpriteIds
|
||||
_0802E78C: .4byte gUnknown_3004FF4
|
||||
_0802E790: .4byte sub_8012098
|
||||
_0802E794: .4byte gUnknown_3004FE0
|
||||
@@ -577,7 +577,7 @@ _0802E7AA:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r2, _0802E7DC @ =gSprites
|
||||
ldr r1, _0802E7E0 @ =gUnknown_2023D44
|
||||
ldr r1, _0802E7E0 @ =gBattlerSpriteIds
|
||||
ldr r3, _0802E7E4 @ =gUnknown_3004FF4
|
||||
ldrb r0, [r3]
|
||||
adds r0, r1
|
||||
@@ -600,7 +600,7 @@ _0802E7CC:
|
||||
b _0802E7F6
|
||||
.align 2, 0
|
||||
_0802E7DC: .4byte gSprites
|
||||
_0802E7E0: .4byte gUnknown_2023D44
|
||||
_0802E7E0: .4byte gBattlerSpriteIds
|
||||
_0802E7E4: .4byte gUnknown_3004FF4
|
||||
_0802E7E8: .4byte sub_8012098
|
||||
_0802E7EC:
|
||||
@@ -718,7 +718,7 @@ _0802E8CE:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r2, _0802E900 @ =gSprites
|
||||
ldr r1, _0802E904 @ =gUnknown_2023D44
|
||||
ldr r1, _0802E904 @ =gBattlerSpriteIds
|
||||
ldr r3, _0802E908 @ =gUnknown_3004FF4
|
||||
ldrb r0, [r3]
|
||||
adds r0, r1
|
||||
@@ -741,7 +741,7 @@ _0802E8F0:
|
||||
b _0802E91A
|
||||
.align 2, 0
|
||||
_0802E900: .4byte gSprites
|
||||
_0802E904: .4byte gUnknown_2023D44
|
||||
_0802E904: .4byte gBattlerSpriteIds
|
||||
_0802E908: .4byte gUnknown_3004FF4
|
||||
_0802E90C: .4byte sub_8012098
|
||||
_0802E910:
|
||||
@@ -841,7 +841,7 @@ _0802E9C0:
|
||||
beq _0802E8F0
|
||||
_0802E9C4:
|
||||
ldr r2, _0802EA04 @ =gSprites
|
||||
ldr r1, _0802EA08 @ =gUnknown_2023D44
|
||||
ldr r1, _0802EA08 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -867,7 +867,7 @@ _0802E9F8: .4byte gAbsentBattlerFlags
|
||||
_0802E9FC: .4byte gBitTable
|
||||
_0802EA00: .4byte gUnknown_3004FF4
|
||||
_0802EA04: .4byte gSprites
|
||||
_0802EA08: .4byte gUnknown_2023D44
|
||||
_0802EA08: .4byte gBattlerSpriteIds
|
||||
_0802EA0C: .4byte sub_8012044
|
||||
thumb_func_end sub_802E674
|
||||
|
||||
@@ -1095,7 +1095,7 @@ _0802EBDE:
|
||||
_0802EBE4:
|
||||
strb r0, [r1]
|
||||
ldr r2, _0802EC04 @ =gSprites
|
||||
ldr r1, _0802EC08 @ =gUnknown_2023D44
|
||||
ldr r1, _0802EC08 @ =gBattlerSpriteIds
|
||||
ldr r0, _0802EC00 @ =gUnknown_3004FF4
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -1110,7 +1110,7 @@ _0802EBE4:
|
||||
.align 2, 0
|
||||
_0802EC00: .4byte gUnknown_3004FF4
|
||||
_0802EC04: .4byte gSprites
|
||||
_0802EC08: .4byte gUnknown_2023D44
|
||||
_0802EC08: .4byte gBattlerSpriteIds
|
||||
_0802EC0C: .4byte sub_8012044
|
||||
_0802EC10:
|
||||
movs r7, 0x2
|
||||
@@ -2462,7 +2462,7 @@ _0802F72C: .4byte gUnknown_3004F80
|
||||
sub_802F730: @ 802F730
|
||||
push {lr}
|
||||
ldr r2, _0802F758 @ =gSprites
|
||||
ldr r1, _0802F75C @ =gUnknown_2023D44
|
||||
ldr r1, _0802F75C @ =gBattlerSpriteIds
|
||||
ldr r0, _0802F760 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -2482,7 +2482,7 @@ _0802F754:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802F758: .4byte gSprites
|
||||
_0802F75C: .4byte gUnknown_2023D44
|
||||
_0802F75C: .4byte gBattlerSpriteIds
|
||||
_0802F760: .4byte gActiveBattler
|
||||
_0802F764: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_802F730
|
||||
@@ -2491,7 +2491,7 @@ _0802F764: .4byte SpriteCallbackDummy
|
||||
sub_802F768: @ 802F768
|
||||
push {lr}
|
||||
ldr r2, _0802F790 @ =gSprites
|
||||
ldr r1, _0802F794 @ =gUnknown_2023D44
|
||||
ldr r1, _0802F794 @ =gBattlerSpriteIds
|
||||
ldr r0, _0802F798 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -2511,7 +2511,7 @@ _0802F78C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802F790: .4byte gSprites
|
||||
_0802F794: .4byte gUnknown_2023D44
|
||||
_0802F794: .4byte gBattlerSpriteIds
|
||||
_0802F798: .4byte gActiveBattler
|
||||
_0802F79C: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_802F768
|
||||
@@ -2520,7 +2520,7 @@ _0802F79C: .4byte SpriteCallbackDummy
|
||||
sub_802F7A0: @ 802F7A0
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _0802F7FC @ =gSprites
|
||||
ldr r5, _0802F800 @ =gUnknown_2023D44
|
||||
ldr r5, _0802F800 @ =gBattlerSpriteIds
|
||||
ldr r4, _0802F804 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
@@ -2562,7 +2562,7 @@ _0802F7F4:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802F7FC: .4byte gSprites
|
||||
_0802F800: .4byte gUnknown_2023D44
|
||||
_0802F800: .4byte gBattlerSpriteIds
|
||||
_0802F804: .4byte gActiveBattler
|
||||
_0802F808: .4byte SpriteCallbackDummy
|
||||
_0802F80C: .4byte gSaveBlock2Ptr
|
||||
@@ -4010,7 +4010,7 @@ sub_80303A8: @ 80303A8
|
||||
negs r1, r0
|
||||
orrs r1, r0
|
||||
lsrs r6, r1, 31
|
||||
ldr r0, _08030400 @ =gUnknown_2023D44
|
||||
ldr r0, _08030400 @ =gBattlerSpriteIds
|
||||
adds r0, r7, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -4031,7 +4031,7 @@ _080303F0:
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080303FC: .4byte gTasks+0x8
|
||||
_08030400: .4byte gUnknown_2023D44
|
||||
_08030400: .4byte gBattlerSpriteIds
|
||||
_08030404: .4byte gSprites
|
||||
_08030408: .4byte _0803040C
|
||||
.align 2, 0
|
||||
@@ -4179,7 +4179,7 @@ _08030534: .4byte sub_802FE94
|
||||
sub_8030538: @ 8030538
|
||||
push {r4-r6,lr}
|
||||
ldr r6, _08030590 @ =gSprites
|
||||
ldr r5, _08030594 @ =gUnknown_2023D44
|
||||
ldr r5, _08030594 @ =gBattlerSpriteIds
|
||||
ldr r4, _08030598 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
@@ -4219,7 +4219,7 @@ _08030588:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08030590: .4byte gSprites
|
||||
_08030594: .4byte gUnknown_2023D44
|
||||
_08030594: .4byte gBattlerSpriteIds
|
||||
_08030598: .4byte gActiveBattler
|
||||
_0803059C: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_8030538
|
||||
@@ -4241,7 +4241,7 @@ sub_80305A0: @ 80305A0
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080305F4
|
||||
ldr r5, _08030604 @ =gUnknown_2023D44
|
||||
ldr r5, _08030604 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -4271,7 +4271,7 @@ _080305F4:
|
||||
.align 2, 0
|
||||
_080305FC: .4byte gUnknown_2024018
|
||||
_08030600: .4byte gActiveBattler
|
||||
_08030604: .4byte gUnknown_2023D44
|
||||
_08030604: .4byte gBattlerSpriteIds
|
||||
_08030608: .4byte gSprites
|
||||
_0803060C: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_80305A0
|
||||
@@ -4485,7 +4485,7 @@ _080307B0: .4byte gActiveBattler
|
||||
thumb_func_start DoHitAnimBlinkSpriteEffect
|
||||
DoHitAnimBlinkSpriteEffect: @ 80307B4
|
||||
push {r4,lr}
|
||||
ldr r1, _080307F0 @ =gUnknown_2023D44
|
||||
ldr r1, _080307F0 @ =gBattlerSpriteIds
|
||||
ldr r0, _080307F4 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -4513,7 +4513,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
|
||||
bl PlayerBufferExecCompleted
|
||||
b _0803082A
|
||||
.align 2, 0
|
||||
_080307F0: .4byte gUnknown_2023D44
|
||||
_080307F0: .4byte gBattlerSpriteIds
|
||||
_080307F4: .4byte gActiveBattler
|
||||
_080307F8: .4byte gSprites
|
||||
_080307FC: .4byte gUnknown_2024005
|
||||
@@ -7299,7 +7299,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
|
||||
adds r0, r2
|
||||
bl sub_8034498
|
||||
ldr r2, _08031F58 @ =gSprites
|
||||
ldr r0, _08031F5C @ =gUnknown_2023D44
|
||||
ldr r0, _08031F5C @ =gBattlerSpriteIds
|
||||
ldrb r3, [r4]
|
||||
adds r0, r3, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -7327,7 +7327,7 @@ _08031F4C: .4byte gBattlerPartyIndexes
|
||||
_08031F50: .4byte gActiveBattler
|
||||
_08031F54: .4byte gPlayerParty
|
||||
_08031F58: .4byte gSprites
|
||||
_08031F5C: .4byte gUnknown_2023D44
|
||||
_08031F5C: .4byte gBattlerSpriteIds
|
||||
_08031F60: .4byte gUnknown_3004FE0
|
||||
_08031F64: .4byte CompleteOnBankSpritePosX_0
|
||||
thumb_func_end PlayerHandleLoadMonSprite
|
||||
@@ -7465,7 +7465,7 @@ sub_8031FF4: @ 8031FF4
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _08032150 @ =gUnknown_2023D44
|
||||
ldr r4, _08032150 @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _08032154 @ =gSprites
|
||||
@@ -7555,7 +7555,7 @@ _08032140: .4byte gPlayerParty
|
||||
_08032144: .4byte sub_8033E3C
|
||||
_08032148: .4byte gUnknown_3004FFC
|
||||
_0803214C: .4byte gMultiuseSpriteTemplate
|
||||
_08032150: .4byte gUnknown_2023D44
|
||||
_08032150: .4byte gBattlerSpriteIds
|
||||
_08032154: .4byte gSprites
|
||||
_08032158: .4byte gBattleMonForms
|
||||
_0803215C: .4byte SpriteCallbackDummy
|
||||
@@ -7595,7 +7595,7 @@ _0803219C: .4byte gUnknown_2024018
|
||||
_080321A0: .4byte gUnknown_3004FE0
|
||||
_080321A4: .4byte sub_80321F0
|
||||
_080321A8:
|
||||
ldr r5, _080321E4 @ =gUnknown_2023D44
|
||||
ldr r5, _080321E4 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -7623,7 +7623,7 @@ _080321DE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080321E4: .4byte gUnknown_2023D44
|
||||
_080321E4: .4byte gBattlerSpriteIds
|
||||
_080321E8: .4byte gSprites
|
||||
_080321EC: .4byte gUnknown_3004FF0
|
||||
thumb_func_end PlayerHandleReturnPokeToBall
|
||||
@@ -7833,7 +7833,7 @@ _08032342:
|
||||
mov r1, r8
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r6, _08032410 @ =gUnknown_2023D44
|
||||
ldr r6, _08032410 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r5]
|
||||
adds r1, r6
|
||||
strb r0, [r1]
|
||||
@@ -7895,7 +7895,7 @@ _08032400: .4byte gSaveBlock2Ptr
|
||||
_08032404: .4byte gActiveBattler
|
||||
_08032408: .4byte gMultiuseSpriteTemplate
|
||||
_0803240C: .4byte gUnknown_8239F8C
|
||||
_08032410: .4byte gUnknown_2023D44
|
||||
_08032410: .4byte gBattlerSpriteIds
|
||||
_08032414: .4byte gSprites
|
||||
_08032418: .4byte 0x0000fffe
|
||||
_0803241C: .4byte sub_8033EEC
|
||||
@@ -8003,7 +8003,7 @@ _080324BE:
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r6, _08032578 @ =gUnknown_2023D44
|
||||
ldr r6, _08032578 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r5]
|
||||
adds r1, r6
|
||||
strb r0, [r1]
|
||||
@@ -8063,7 +8063,7 @@ _08032568: .4byte gSaveBlock2Ptr
|
||||
_0803256C: .4byte gActiveBattler
|
||||
_08032570: .4byte gMultiuseSpriteTemplate
|
||||
_08032574: .4byte gUnknown_8239F8C
|
||||
_08032578: .4byte gUnknown_2023D44
|
||||
_08032578: .4byte gBattlerSpriteIds
|
||||
_0803257C: .4byte gSprites
|
||||
_08032580: .4byte 0x0000ffa0
|
||||
_08032584: .4byte sub_8033EEC
|
||||
@@ -8074,7 +8074,7 @@ _0803258C: .4byte sub_802F768
|
||||
thumb_func_start PlayerHandleTrainerSlideBack
|
||||
PlayerHandleTrainerSlideBack: @ 8032590
|
||||
push {r4-r6,lr}
|
||||
ldr r5, _08032630 @ =gUnknown_2023D44
|
||||
ldr r5, _08032630 @ =gBattlerSpriteIds
|
||||
ldr r6, _08032634 @ =gActiveBattler
|
||||
ldrb r0, [r6]
|
||||
adds r0, r5
|
||||
@@ -8151,7 +8151,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08032630: .4byte gUnknown_2023D44
|
||||
_08032630: .4byte gBattlerSpriteIds
|
||||
_08032634: .4byte gActiveBattler
|
||||
_08032638: .4byte gSprites
|
||||
_0803263C: .4byte 0x0000ffd8
|
||||
@@ -8227,7 +8227,7 @@ _080326A4:
|
||||
movs r0, 0x10
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _08032728 @ =gSprites
|
||||
ldr r3, _0803272C @ =gUnknown_2023D44
|
||||
ldr r3, _0803272C @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -8269,7 +8269,7 @@ _0803271A:
|
||||
_08032720: .4byte gBattlerPartyIndexes
|
||||
_08032724: .4byte gPlayerParty
|
||||
_08032728: .4byte gSprites
|
||||
_0803272C: .4byte gUnknown_2023D44
|
||||
_0803272C: .4byte gBattlerSpriteIds
|
||||
_08032730: .4byte sub_8012110
|
||||
_08032734: .4byte gUnknown_3004FE0
|
||||
_08032738: .4byte sub_8030538
|
||||
@@ -8428,7 +8428,7 @@ _08032852:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _0803292C @ =gUnknown_2037F16
|
||||
ldr r5, _0803292C @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -8496,7 +8496,7 @@ _08032852:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _08032940 @ =gUnknown_2037EE4
|
||||
ldr r3, _08032940 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -8520,12 +8520,12 @@ _08032852:
|
||||
.align 2, 0
|
||||
_08032924: .4byte gActiveBattler
|
||||
_08032928: .4byte gUnknown_2022BC4
|
||||
_0803292C: .4byte gUnknown_2037F16
|
||||
_0803292C: .4byte gAnimMoveTurn
|
||||
_08032930: .4byte gUnknown_2037EEC
|
||||
_08032934: .4byte gUnknown_2037EE8
|
||||
_08032938: .4byte gUnknown_2037EFE
|
||||
_0803293C: .4byte gUnknown_2037F00
|
||||
_08032940: .4byte gUnknown_2037EE4
|
||||
_08032940: .4byte gAnimDisableStructPtr
|
||||
_08032944: .4byte gUnknown_2024008
|
||||
_08032948:
|
||||
ldr r0, _0803296C @ =gUnknown_2024018
|
||||
@@ -9754,7 +9754,7 @@ _08033310: .4byte gUnknown_2022870
|
||||
PlayerHandleHitAnimation: @ 8033314
|
||||
push {r4,lr}
|
||||
ldr r3, _0803333C @ =gSprites
|
||||
ldr r2, _08033340 @ =gUnknown_2023D44
|
||||
ldr r2, _08033340 @ =gBattlerSpriteIds
|
||||
ldr r4, _08033344 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -9772,7 +9772,7 @@ PlayerHandleHitAnimation: @ 8033314
|
||||
b _08033372
|
||||
.align 2, 0
|
||||
_0803333C: .4byte gSprites
|
||||
_08033340: .4byte gUnknown_2023D44
|
||||
_08033340: .4byte gBattlerSpriteIds
|
||||
_08033344: .4byte gActiveBattler
|
||||
_08033348:
|
||||
ldr r1, _08033378 @ =gUnknown_2024005
|
||||
@@ -9930,7 +9930,7 @@ _08033474: .4byte gUnknown_2023F4C
|
||||
thumb_func_start PlayerHandleIntroTrainerBallThrow
|
||||
PlayerHandleIntroTrainerBallThrow: @ 8033478
|
||||
push {r4-r7,lr}
|
||||
ldr r6, _080335B8 @ =gUnknown_2023D44
|
||||
ldr r6, _080335B8 @ =gBattlerSpriteIds
|
||||
ldr r7, _080335BC @ =gActiveBattler
|
||||
ldrb r0, [r7]
|
||||
adds r0, r6
|
||||
@@ -10085,7 +10085,7 @@ _0803359A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080335B8: .4byte gUnknown_2023D44
|
||||
_080335B8: .4byte gBattlerSpriteIds
|
||||
_080335BC: .4byte gActiveBattler
|
||||
_080335C0: .4byte gSprites
|
||||
_080335C4: .4byte 0x0000ffd8
|
||||
@@ -10129,7 +10129,7 @@ sub_80335F8: @ 80335F8
|
||||
adds r0, r1
|
||||
adds r1, r4, 0
|
||||
bl sub_8034498
|
||||
ldr r0, _08033658 @ =gUnknown_2023D44
|
||||
ldr r0, _08033658 @ =gBattlerSpriteIds
|
||||
adds r4, r0
|
||||
ldrb r1, [r4]
|
||||
lsls r0, r1, 4
|
||||
@@ -10145,7 +10145,7 @@ sub_80335F8: @ 80335F8
|
||||
.align 2, 0
|
||||
_08033650: .4byte gBattlerPartyIndexes
|
||||
_08033654: .4byte gPlayerParty
|
||||
_08033658: .4byte gUnknown_2023D44
|
||||
_08033658: .4byte gBattlerSpriteIds
|
||||
_0803365C: .4byte gSprites
|
||||
thumb_func_end sub_80335F8
|
||||
|
||||
@@ -10476,7 +10476,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
|
||||
cmp r0, 0
|
||||
beq _08033932
|
||||
ldr r3, _08033940 @ =gSprites
|
||||
ldr r0, _08033944 @ =gUnknown_2023D44
|
||||
ldr r0, _08033944 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -10509,7 +10509,7 @@ _08033932:
|
||||
.align 2, 0
|
||||
_0803393C: .4byte gActiveBattler
|
||||
_08033940: .4byte gSprites
|
||||
_08033944: .4byte gUnknown_2023D44
|
||||
_08033944: .4byte gBattlerSpriteIds
|
||||
_08033948: .4byte gUnknown_2022BC4
|
||||
thumb_func_end PlayerHandleSpriteInvisibility
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ sub_8156140: @ 8156140
|
||||
sub_815614C: @ 815614C
|
||||
push {lr}
|
||||
ldr r2, _08156174 @ =gSprites
|
||||
ldr r1, _08156178 @ =gUnknown_2023D44
|
||||
ldr r1, _08156178 @ =gBattlerSpriteIds
|
||||
ldr r0, _0815617C @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -118,7 +118,7 @@ _08156170:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08156174: .4byte gSprites
|
||||
_08156178: .4byte gUnknown_2023D44
|
||||
_08156178: .4byte gBattlerSpriteIds
|
||||
_0815617C: .4byte gActiveBattler
|
||||
_08156180: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_815614C
|
||||
@@ -127,7 +127,7 @@ _08156180: .4byte SpriteCallbackDummy
|
||||
sub_8156184: @ 8156184
|
||||
push {r4-r7,lr}
|
||||
ldr r2, _081561E0 @ =gSprites
|
||||
ldr r0, _081561E4 @ =gUnknown_2023D44
|
||||
ldr r0, _081561E4 @ =gBattlerSpriteIds
|
||||
ldr r7, _081561E8 @ =gActiveBattler
|
||||
ldrb r3, [r7]
|
||||
adds r0, r3, r0
|
||||
@@ -171,7 +171,7 @@ sub_8156184: @ 8156184
|
||||
b _08156230
|
||||
.align 2, 0
|
||||
_081561E0: .4byte gSprites
|
||||
_081561E4: .4byte gUnknown_2023D44
|
||||
_081561E4: .4byte gBattlerSpriteIds
|
||||
_081561E8: .4byte gActiveBattler
|
||||
_081561EC: .4byte gUnknown_2024018
|
||||
_081561F0: .4byte gBattlerPartyIndexes
|
||||
@@ -1635,7 +1635,7 @@ sub_8156DCC: @ 8156DCC
|
||||
cmp r0, 0
|
||||
bne _08156E3C
|
||||
ldr r6, _08156E30 @ =gSprites
|
||||
ldr r5, _08156E34 @ =gUnknown_2023D44
|
||||
ldr r5, _08156E34 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
ldrb r1, [r0]
|
||||
@@ -1672,11 +1672,11 @@ sub_8156DCC: @ 8156DCC
|
||||
.align 2, 0
|
||||
_08156E2C: .4byte gActiveBattler
|
||||
_08156E30: .4byte gSprites
|
||||
_08156E34: .4byte gUnknown_2023D44
|
||||
_08156E34: .4byte gBattlerSpriteIds
|
||||
_08156E38: .4byte gUnknown_3004FF0
|
||||
_08156E3C:
|
||||
ldr r2, _08156E6C @ =gSprites
|
||||
ldr r0, _08156E70 @ =gUnknown_2023D44
|
||||
ldr r0, _08156E70 @ =gBattlerSpriteIds
|
||||
ldrb r3, [r4]
|
||||
adds r0, r3, r0
|
||||
ldrb r1, [r0]
|
||||
@@ -1700,7 +1700,7 @@ _08156E66:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08156E6C: .4byte gSprites
|
||||
_08156E70: .4byte gUnknown_2023D44
|
||||
_08156E70: .4byte gBattlerSpriteIds
|
||||
_08156E74: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_8156DCC
|
||||
|
||||
@@ -1775,7 +1775,7 @@ _08156EFA:
|
||||
thumb_func_start sub_8156F00
|
||||
sub_8156F00: @ 8156F00
|
||||
push {r4,lr}
|
||||
ldr r1, _08156F3C @ =gUnknown_2023D44
|
||||
ldr r1, _08156F3C @ =gBattlerSpriteIds
|
||||
ldr r0, _08156F40 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -1803,7 +1803,7 @@ sub_8156F00: @ 8156F00
|
||||
bl PlayerPartnerBufferExecCompleted
|
||||
b _08156F76
|
||||
.align 2, 0
|
||||
_08156F3C: .4byte gUnknown_2023D44
|
||||
_08156F3C: .4byte gBattlerSpriteIds
|
||||
_08156F40: .4byte gActiveBattler
|
||||
_08156F44: .4byte gSprites
|
||||
_08156F48: .4byte gUnknown_2024005
|
||||
@@ -1853,7 +1853,7 @@ sub_8156F7C: @ 8156F7C
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _08156FD0
|
||||
ldr r5, _08156FE0 @ =gUnknown_2023D44
|
||||
ldr r5, _08156FE0 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1883,7 +1883,7 @@ _08156FD0:
|
||||
.align 2, 0
|
||||
_08156FD8: .4byte gUnknown_2024018
|
||||
_08156FDC: .4byte gActiveBattler
|
||||
_08156FE0: .4byte gUnknown_2023D44
|
||||
_08156FE0: .4byte gBattlerSpriteIds
|
||||
_08156FE4: .4byte gSprites
|
||||
_08156FE8: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_8156F7C
|
||||
@@ -1892,7 +1892,7 @@ _08156FE8: .4byte gUnknown_3004FF0
|
||||
sub_8156FEC: @ 8156FEC
|
||||
push {lr}
|
||||
ldr r2, _08157014 @ =gSprites
|
||||
ldr r1, _08157018 @ =gUnknown_2023D44
|
||||
ldr r1, _08157018 @ =gBattlerSpriteIds
|
||||
ldr r0, _0815701C @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -1912,7 +1912,7 @@ _08157010:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08157014: .4byte gSprites
|
||||
_08157018: .4byte gUnknown_2023D44
|
||||
_08157018: .4byte gBattlerSpriteIds
|
||||
_0815701C: .4byte gActiveBattler
|
||||
_08157020: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_8156FEC
|
||||
@@ -3950,7 +3950,7 @@ sub_81580E0: @ 81580E0
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _08158224 @ =gUnknown_2023D44
|
||||
ldr r4, _08158224 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r6]
|
||||
adds r1, r4
|
||||
strb r0, [r1]
|
||||
@@ -4038,7 +4038,7 @@ _08158214: .4byte gActiveBattler
|
||||
_08158218: .4byte gBattlerPartyIndexes
|
||||
_0815821C: .4byte gEnemyParty
|
||||
_08158220: .4byte gMultiuseSpriteTemplate
|
||||
_08158224: .4byte gUnknown_2023D44
|
||||
_08158224: .4byte gBattlerSpriteIds
|
||||
_08158228: .4byte gSprites
|
||||
_0815822C: .4byte 0x0000ff10
|
||||
_08158230: .4byte gBattleMonForms
|
||||
@@ -4135,7 +4135,7 @@ _081582F0: .4byte gActiveBattler
|
||||
_081582F4: .4byte gUnknown_3004FE0
|
||||
_081582F8: .4byte sub_8156F7C
|
||||
_081582FC:
|
||||
ldr r5, _08158338 @ =gUnknown_2023D44
|
||||
ldr r5, _08158338 @ =gBattlerSpriteIds
|
||||
adds r0, r2, r5
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -4163,7 +4163,7 @@ _08158332:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08158338: .4byte gUnknown_2023D44
|
||||
_08158338: .4byte gBattlerSpriteIds
|
||||
_0815833C: .4byte gSprites
|
||||
_08158340: .4byte gUnknown_3004FF0
|
||||
thumb_func_end sub_81582C0
|
||||
@@ -4202,7 +4202,7 @@ sub_8158344: @ 8158344
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r5, _081583E4 @ =gUnknown_2023D44
|
||||
ldr r5, _081583E4 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r7]
|
||||
adds r1, r5
|
||||
strb r0, [r1]
|
||||
@@ -4243,7 +4243,7 @@ sub_8158344: @ 8158344
|
||||
_081583D8: .4byte gActiveBattler
|
||||
_081583DC: .4byte gMultiuseSpriteTemplate
|
||||
_081583E0: .4byte gUnknown_8239F8C
|
||||
_081583E4: .4byte gUnknown_2023D44
|
||||
_081583E4: .4byte gBattlerSpriteIds
|
||||
_081583E8: .4byte gSprites
|
||||
_081583EC: .4byte 0x0000fffe
|
||||
_081583F0:
|
||||
@@ -4281,7 +4281,7 @@ _081583F0:
|
||||
movs r1, 0xB0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r5, _08158518 @ =gUnknown_2023D44
|
||||
ldr r5, _08158518 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r7]
|
||||
adds r1, r5
|
||||
strb r0, [r1]
|
||||
@@ -4387,7 +4387,7 @@ _081584E2:
|
||||
.align 2, 0
|
||||
_08158510: .4byte gMultiuseSpriteTemplate
|
||||
_08158514: .4byte gUnknown_823932C
|
||||
_08158518: .4byte gUnknown_2023D44
|
||||
_08158518: .4byte gBattlerSpriteIds
|
||||
_0815851C: .4byte gSprites
|
||||
_08158520: .4byte 0x0000ff10
|
||||
_08158524: .4byte gTrainerFrontPicPaletteTable
|
||||
@@ -4427,7 +4427,7 @@ sub_8158544: @ 8158544
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r6, _081585F8 @ =gUnknown_2023D44
|
||||
ldr r6, _081585F8 @ =gBattlerSpriteIds
|
||||
ldrb r1, [r4]
|
||||
adds r1, r6
|
||||
strb r0, [r1]
|
||||
@@ -4486,7 +4486,7 @@ sub_8158544: @ 8158544
|
||||
_081585EC: .4byte gActiveBattler
|
||||
_081585F0: .4byte gMultiuseSpriteTemplate
|
||||
_081585F4: .4byte gUnknown_8239F8C
|
||||
_081585F8: .4byte gUnknown_2023D44
|
||||
_081585F8: .4byte gBattlerSpriteIds
|
||||
_081585FC: .4byte gSprites
|
||||
_08158600: .4byte 0x0000ffa0
|
||||
_08158604: .4byte sub_8033EEC
|
||||
@@ -4574,7 +4574,7 @@ _08158670:
|
||||
movs r0, 0x10
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _081586F0 @ =gSprites
|
||||
ldr r3, _081586F4 @ =gUnknown_2023D44
|
||||
ldr r3, _081586F4 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -4606,14 +4606,14 @@ _08158670:
|
||||
_081586E8: .4byte gBattlerPartyIndexes
|
||||
_081586EC: .4byte gPlayerParty
|
||||
_081586F0: .4byte gSprites
|
||||
_081586F4: .4byte gUnknown_2023D44
|
||||
_081586F4: .4byte gBattlerSpriteIds
|
||||
_081586F8: .4byte sub_8012110
|
||||
_081586FC:
|
||||
movs r0, 0x10
|
||||
movs r1, 0x3F
|
||||
bl PlaySE12WithPanning
|
||||
ldr r2, _08158730 @ =gSprites
|
||||
ldr r1, _08158734 @ =gUnknown_2023D44
|
||||
ldr r1, _08158734 @ =gBattlerSpriteIds
|
||||
ldrb r0, [r5]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -4638,7 +4638,7 @@ _0815872A:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08158730: .4byte gSprites
|
||||
_08158734: .4byte gUnknown_2023D44
|
||||
_08158734: .4byte gBattlerSpriteIds
|
||||
_08158738: .4byte sub_8011EA0
|
||||
_0815873C: .4byte gUnknown_3004FE0
|
||||
_08158740: .4byte gActiveBattler
|
||||
@@ -4762,7 +4762,7 @@ sub_8158814: @ 8158814
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, _081588F0 @ =gUnknown_2037F16
|
||||
ldr r5, _081588F0 @ =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
@@ -4830,7 +4830,7 @@ sub_8158814: @ 8158814
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, _08158904 @ =gUnknown_2037EE4
|
||||
ldr r3, _08158904 @ =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4854,12 +4854,12 @@ sub_8158814: @ 8158814
|
||||
.align 2, 0
|
||||
_081588E8: .4byte gUnknown_2022BC4
|
||||
_081588EC: .4byte gActiveBattler
|
||||
_081588F0: .4byte gUnknown_2037F16
|
||||
_081588F0: .4byte gAnimMoveTurn
|
||||
_081588F4: .4byte gUnknown_2037EEC
|
||||
_081588F8: .4byte gUnknown_2037EE8
|
||||
_081588FC: .4byte gUnknown_2037EFE
|
||||
_08158900: .4byte gUnknown_2037F00
|
||||
_08158904: .4byte gUnknown_2037EE4
|
||||
_08158904: .4byte gAnimDisableStructPtr
|
||||
_08158908: .4byte gUnknown_2024008
|
||||
_0815890C:
|
||||
ldr r0, _08158930 @ =gUnknown_2024018
|
||||
@@ -5936,7 +5936,7 @@ sub_8159184: @ 8159184
|
||||
sub_8159190: @ 8159190
|
||||
push {r4,lr}
|
||||
ldr r3, _081591B8 @ =gSprites
|
||||
ldr r2, _081591BC @ =gUnknown_2023D44
|
||||
ldr r2, _081591BC @ =gBattlerSpriteIds
|
||||
ldr r4, _081591C0 @ =gActiveBattler
|
||||
ldrb r0, [r4]
|
||||
adds r0, r2
|
||||
@@ -5954,7 +5954,7 @@ sub_8159190: @ 8159190
|
||||
b _081591EE
|
||||
.align 2, 0
|
||||
_081591B8: .4byte gSprites
|
||||
_081591BC: .4byte gUnknown_2023D44
|
||||
_081591BC: .4byte gBattlerSpriteIds
|
||||
_081591C0: .4byte gActiveBattler
|
||||
_081591C4:
|
||||
ldr r1, _081591F4 @ =gUnknown_2024005
|
||||
@@ -6119,7 +6119,7 @@ _08159300: .4byte gUnknown_2023F4C
|
||||
thumb_func_start sub_8159304
|
||||
sub_8159304: @ 8159304
|
||||
push {r4-r7,lr}
|
||||
ldr r6, _0815943C @ =gUnknown_2023D44
|
||||
ldr r6, _0815943C @ =gBattlerSpriteIds
|
||||
ldr r7, _08159440 @ =gActiveBattler
|
||||
ldrb r0, [r7]
|
||||
adds r0, r6
|
||||
@@ -6269,7 +6269,7 @@ _0815941C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0815943C: .4byte gUnknown_2023D44
|
||||
_0815943C: .4byte gBattlerSpriteIds
|
||||
_08159440: .4byte gActiveBattler
|
||||
_08159444: .4byte gSprites
|
||||
_08159448: .4byte 0x0000ffd8
|
||||
@@ -6359,7 +6359,7 @@ sub_8159478: @ 8159478
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r4, _081595DC @ =gUnknown_2023D44
|
||||
ldr r4, _081595DC @ =gBattlerSpriteIds
|
||||
adds r4, r6, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _081595E0 @ =gSprites
|
||||
@@ -6450,7 +6450,7 @@ _081595CC: .4byte gPlayerParty
|
||||
_081595D0: .4byte sub_8033E3C
|
||||
_081595D4: .4byte gUnknown_3004FFC
|
||||
_081595D8: .4byte gMultiuseSpriteTemplate
|
||||
_081595DC: .4byte gUnknown_2023D44
|
||||
_081595DC: .4byte gBattlerSpriteIds
|
||||
_081595E0: .4byte gSprites
|
||||
_081595E4: .4byte gBattleMonForms
|
||||
_081595E8: .4byte SpriteCallbackDummy
|
||||
|
||||
@@ -259,7 +259,7 @@ _080DD724: .4byte gActiveBattler
|
||||
sub_80DD728: @ 80DD728
|
||||
push {lr}
|
||||
ldr r2, _080DD750 @ =gSprites
|
||||
ldr r1, _080DD754 @ =gUnknown_2023D44
|
||||
ldr r1, _080DD754 @ =gBattlerSpriteIds
|
||||
ldr r0, _080DD758 @ =gActiveBattler
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -279,7 +279,7 @@ _080DD74C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD750: .4byte gSprites
|
||||
_080DD754: .4byte gUnknown_2023D44
|
||||
_080DD754: .4byte gBattlerSpriteIds
|
||||
_080DD758: .4byte gActiveBattler
|
||||
_080DD75C: .4byte SpriteCallbackDummy
|
||||
thumb_func_end sub_80DD728
|
||||
@@ -646,7 +646,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl CreateSprite
|
||||
ldr r6, _080DDA8C @ =gUnknown_2023D44
|
||||
ldr r6, _080DDA8C @ =gBattlerSpriteIds
|
||||
ldrb r1, [r5]
|
||||
adds r1, r6
|
||||
strb r0, [r1]
|
||||
@@ -706,7 +706,7 @@ _080DDA7C: .4byte gSaveBlock2Ptr
|
||||
_080DDA80: .4byte gActiveBattler
|
||||
_080DDA84: .4byte gMultiuseSpriteTemplate
|
||||
_080DDA88: .4byte gUnknown_8239F8C
|
||||
_080DDA8C: .4byte gUnknown_2023D44
|
||||
_080DDA8C: .4byte gBattlerSpriteIds
|
||||
_080DDA90: .4byte gSprites
|
||||
_080DDA94: .4byte 0x0000fffe
|
||||
_080DDA98: .4byte sub_8033EEC
|
||||
|
||||
+24
-24
@@ -394,7 +394,7 @@ _08034094:
|
||||
cmp r5, 0x2
|
||||
bne _080340E0
|
||||
ldr r1, _080340D8 @ =gSprites
|
||||
ldr r0, _080340DC @ =gUnknown_2023D44
|
||||
ldr r0, _080340DC @ =gBattlerSpriteIds
|
||||
adds r0, r6, r0
|
||||
ldrb r2, [r0]
|
||||
lsls r0, r2, 4
|
||||
@@ -415,12 +415,12 @@ _08034094:
|
||||
b _08034132
|
||||
.align 2, 0
|
||||
_080340D8: .4byte gSprites
|
||||
_080340DC: .4byte gUnknown_2023D44
|
||||
_080340DC: .4byte gBattlerSpriteIds
|
||||
_080340E0:
|
||||
ldr r0, _08034144 @ =gUnknown_2037F1A
|
||||
ldr r0, _08034144 @ =gBattleAnimAttacker
|
||||
mov r2, r10
|
||||
strb r2, [r0]
|
||||
ldr r0, _08034148 @ =gUnknown_2037F1B
|
||||
ldr r0, _08034148 @ =gBattleAnimTarget
|
||||
mov r1, sp
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r0]
|
||||
@@ -466,8 +466,8 @@ _08034132:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08034144: .4byte gUnknown_2037F1A
|
||||
_08034148: .4byte gUnknown_2037F1B
|
||||
_08034144: .4byte gBattleAnimAttacker
|
||||
_08034148: .4byte gBattleAnimTarget
|
||||
_0803414C: .4byte gUnknown_2024018
|
||||
_08034150: .4byte gUnknown_81C6EA8
|
||||
_08034154: .4byte Task_ClearBitWhenBattleTableAnimDone
|
||||
@@ -551,9 +551,9 @@ InitAndLaunchSpecialAnimation: @ 80341D8
|
||||
lsrs r4, 24
|
||||
lsls r3, 24
|
||||
lsrs r3, 24
|
||||
ldr r0, _08034230 @ =gUnknown_2037F1A
|
||||
ldr r0, _08034230 @ =gBattleAnimAttacker
|
||||
strb r1, [r0]
|
||||
ldr r0, _08034234 @ =gUnknown_2037F1B
|
||||
ldr r0, _08034234 @ =gBattleAnimTarget
|
||||
strb r2, [r0]
|
||||
ldr r0, _08034238 @ =gUnknown_81C6F18
|
||||
adds r1, r3, 0
|
||||
@@ -587,8 +587,8 @@ InitAndLaunchSpecialAnimation: @ 80341D8
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08034230: .4byte gUnknown_2037F1A
|
||||
_08034234: .4byte gUnknown_2037F1B
|
||||
_08034230: .4byte gBattleAnimAttacker
|
||||
_08034234: .4byte gBattleAnimTarget
|
||||
_08034238: .4byte gUnknown_81C6F18
|
||||
_0803423C: .4byte Task_ClearBitWhenSpecialAnimDone
|
||||
_08034240: .4byte gTasks
|
||||
@@ -1718,7 +1718,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40
|
||||
negs r0, r0
|
||||
mov r8, r0
|
||||
ldr r7, _08034BAC @ =gUnknown_2024018
|
||||
ldr r6, _08034BB0 @ =gUnknown_2023D44
|
||||
ldr r6, _08034BB0 @ =gBattlerSpriteIds
|
||||
_08034B64:
|
||||
ldr r0, [r7]
|
||||
ldr r0, [r0]
|
||||
@@ -1756,7 +1756,7 @@ _08034B96:
|
||||
_08034BA4: .4byte gBattlersCount
|
||||
_08034BA8: .4byte gSprites
|
||||
_08034BAC: .4byte gUnknown_2024018
|
||||
_08034BB0: .4byte gUnknown_2023D44
|
||||
_08034BB0: .4byte gBattlerSpriteIds
|
||||
thumb_func_end CopyAllBattleSpritesInvisibilities
|
||||
|
||||
thumb_func_start CopyBattleSpriteInvisibility
|
||||
@@ -1769,7 +1769,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
|
||||
lsls r3, r0, 2
|
||||
adds r3, r1
|
||||
ldr r2, _08034BEC @ =gSprites
|
||||
ldr r1, _08034BF0 @ =gUnknown_2023D44
|
||||
ldr r1, _08034BF0 @ =gBattlerSpriteIds
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1790,7 +1790,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
|
||||
.align 2, 0
|
||||
_08034BE8: .4byte gUnknown_2024018
|
||||
_08034BEC: .4byte gSprites
|
||||
_08034BF0: .4byte gUnknown_2023D44
|
||||
_08034BF0: .4byte gBattlerSpriteIds
|
||||
thumb_func_end CopyBattleSpriteInvisibility
|
||||
|
||||
thumb_func_start sub_8034BF4
|
||||
@@ -1869,7 +1869,7 @@ _08034C16:
|
||||
adds r0, r5
|
||||
ldr r2, [r0]
|
||||
ldr r5, _08034D68 @ =gSprites
|
||||
ldr r4, _08034D6C @ =gUnknown_2023D44
|
||||
ldr r4, _08034D6C @ =gBattlerSpriteIds
|
||||
add r4, r9
|
||||
ldrb r1, [r4]
|
||||
lsls r0, r1, 4
|
||||
@@ -1964,7 +1964,7 @@ _08034D5C: .4byte gEnemyParty
|
||||
_08034D60: .4byte gMonFrontPicTable
|
||||
_08034D64: .4byte gMonSpritesGfxPtr
|
||||
_08034D68: .4byte gSprites
|
||||
_08034D6C: .4byte gUnknown_2023D44
|
||||
_08034D6C: .4byte gBattlerSpriteIds
|
||||
_08034D70: .4byte 0x06010000
|
||||
_08034D74: .4byte 0x040000d4
|
||||
_08034D78: .4byte 0x84000200
|
||||
@@ -1974,7 +1974,7 @@ _08034D84: .4byte gUnknown_3004FF0
|
||||
_08034D88:
|
||||
cmp r2, 0
|
||||
beq _08034E4C
|
||||
ldr r0, _08034E28 @ =gUnknown_2023D44
|
||||
ldr r0, _08034E28 @ =gBattlerSpriteIds
|
||||
mov r3, r9
|
||||
adds r5, r3, r0
|
||||
ldrb r1, [r5]
|
||||
@@ -2048,7 +2048,7 @@ _08034E0E:
|
||||
strh r0, [r1, 0x22]
|
||||
b _08035062
|
||||
.align 2, 0
|
||||
_08034E28: .4byte gUnknown_2023D44
|
||||
_08034E28: .4byte gBattlerSpriteIds
|
||||
_08034E2C: .4byte gSprites
|
||||
_08034E30: .4byte gUnknown_2024018
|
||||
_08034E34: .4byte gBattleStruct
|
||||
@@ -2189,7 +2189,7 @@ _08034F5E:
|
||||
adds r0, 0x4
|
||||
adds r0, r5
|
||||
ldr r2, [r0]
|
||||
ldr r0, _08035088 @ =gUnknown_2023D44
|
||||
ldr r0, _08035088 @ =gBattlerSpriteIds
|
||||
add r0, r9
|
||||
str r0, [sp, 0x10]
|
||||
ldrb r1, [r0]
|
||||
@@ -2318,7 +2318,7 @@ _08035078: .4byte gEnemyParty
|
||||
_0803507C: .4byte gMonFrontPicTable
|
||||
_08035080: .4byte gMonSpritesGfxPtr
|
||||
_08035084: .4byte gUnknown_2024008
|
||||
_08035088: .4byte gUnknown_2023D44
|
||||
_08035088: .4byte gBattlerSpriteIds
|
||||
_0803508C: .4byte gSprites
|
||||
_08035090: .4byte 0x06010000
|
||||
_08035094: .4byte 0x040000d4
|
||||
@@ -2820,7 +2820,7 @@ _0803547C:
|
||||
cmp r0, 0
|
||||
beq _08035514
|
||||
ldr r4, _080354E4 @ =gSprites
|
||||
ldr r0, _080354E8 @ =gUnknown_2023D44
|
||||
ldr r0, _080354E8 @ =gBattlerSpriteIds
|
||||
adds r3, r5, r0
|
||||
ldrb r1, [r3]
|
||||
lsls r0, r1, 4
|
||||
@@ -2864,7 +2864,7 @@ _0803547C:
|
||||
.align 2, 0
|
||||
_080354E0: .4byte gBattlersCount
|
||||
_080354E4: .4byte gSprites
|
||||
_080354E8: .4byte gUnknown_2023D44
|
||||
_080354E8: .4byte gBattlerSpriteIds
|
||||
_080354EC: .4byte gUnknown_2024018
|
||||
_080354F0:
|
||||
ldrb r0, [r3]
|
||||
@@ -3026,7 +3026,7 @@ SpriteCB_EnemyShadow: @ 8035624
|
||||
ldrh r0, [r5, 0x2E]
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08035668 @ =gUnknown_2023D44
|
||||
ldr r0, _08035668 @ =gBattlerSpriteIds
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -3051,7 +3051,7 @@ _08035660:
|
||||
str r0, [r5, 0x1C]
|
||||
b _080356EA
|
||||
.align 2, 0
|
||||
_08035668: .4byte gUnknown_2023D44
|
||||
_08035668: .4byte gBattlerSpriteIds
|
||||
_0803566C: .4byte gSprites
|
||||
_08035670: .4byte SpriteCB_SetInvisible
|
||||
_08035674:
|
||||
|
||||
@@ -5559,7 +5559,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
|
||||
movs r1, 0
|
||||
adds r2, r6, 0
|
||||
mov r3, r8
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
mov r0, r10
|
||||
str r4, [r0]
|
||||
adds r0, r5, 0
|
||||
|
||||
@@ -1092,7 +1092,7 @@ _080CDA72:
|
||||
movs r1, 0x2
|
||||
movs r2, 0xC
|
||||
movs r3, 0x18
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
mov r3, r8
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
movs r6, 0
|
||||
_080CDB0E:
|
||||
movs r4, 0x54
|
||||
@@ -1161,7 +1161,7 @@ _080CDB1C:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
mov r3, r8
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -1230,7 +1230,7 @@ _080CDBA6:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
mov r3, r8
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x4
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r5, _080CDCA8 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r5]
|
||||
ldr r1, _080CDCAC @ =0x00000a98
|
||||
@@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4
|
||||
movs r1, 0x2
|
||||
movs r2, 0x54
|
||||
movs r3, 0x30
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r7, r5, 0
|
||||
movs r5, 0xF4
|
||||
lsls r5, 22
|
||||
|
||||
+5
-5
@@ -229,7 +229,7 @@ _0814BCA2:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _0814BD12
|
||||
.align 2, 0
|
||||
_0814BCE8: .4byte gStringVar4
|
||||
@@ -250,7 +250,7 @@ _0814BCF0:
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
_0814BD12:
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
@@ -2868,7 +2868,7 @@ _0814D106:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -3232,7 +3232,7 @@ _0814D3C0:
|
||||
str r1, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _0814D40C
|
||||
.align 2, 0
|
||||
_0814D3EC: .4byte gUnknown_846E328
|
||||
@@ -3249,7 +3249,7 @@ _0814D3F0:
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
_0814D40C:
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
|
||||
+23
-23
@@ -1212,7 +1212,7 @@ sub_814DF44: @ 814DF44
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -1355,7 +1355,7 @@ _0814E048:
|
||||
movs r1, 0x2
|
||||
adds r2, r7, 0
|
||||
adds r3, r4, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [sp, 0x2C]
|
||||
ldrb r0, [r1]
|
||||
adds r2, r7, 0
|
||||
@@ -1370,7 +1370,7 @@ _0814E048:
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
adds r3, r4, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r9, r6
|
||||
_0814E0C8:
|
||||
ldr r6, [sp, 0x20]
|
||||
@@ -1509,7 +1509,7 @@ _0814E178:
|
||||
ldr r1, _0814E1F8 @ =gStringVar4
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0814E27E
|
||||
.align 2, 0
|
||||
_0814E1E4: .4byte gStringVar1
|
||||
@@ -1573,7 +1573,7 @@ _0814E21A:
|
||||
ldr r1, _0814E2A0 @ =gStringVar4
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r9, r4
|
||||
mov r6, r8
|
||||
adds r6, 0xA2
|
||||
@@ -1632,7 +1632,7 @@ _0814E2B8:
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r10
|
||||
lsls r0, r2, 24
|
||||
lsrs r0, 24
|
||||
@@ -1702,7 +1702,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r4, _0814E568 @ =gUnknown_841D088
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
@@ -1722,7 +1722,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r6, 0
|
||||
subs r0, 0x20
|
||||
lsls r0, 24
|
||||
@@ -1759,7 +1759,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r4, _0814E57C @ =gUnknown_841D078
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
@@ -1779,7 +1779,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r6, 0
|
||||
subs r0, 0x9
|
||||
lsls r0, 24
|
||||
@@ -1806,7 +1806,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r7, 0
|
||||
adds r0, 0xE
|
||||
lsls r0, 24
|
||||
@@ -1821,7 +1821,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r4, _0814E588 @ =gUnknown_841D098
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
@@ -1842,7 +1842,7 @@ sub_814E32C: @ 814E32C
|
||||
movs r1, 0x3
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r4, r8
|
||||
ldrb r2, [r4, 0x16]
|
||||
ldrh r0, [r4, 0x16]
|
||||
@@ -1919,7 +1919,7 @@ _0814E4EA:
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0814E5B6
|
||||
.align 2, 0
|
||||
_0814E560: .4byte gUnknown_846E3DC
|
||||
@@ -1949,7 +1949,7 @@ _0814E59C:
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0814E5B6:
|
||||
adds r0, r7, 0
|
||||
adds r0, 0xE
|
||||
@@ -1970,7 +1970,7 @@ _0814E5B6:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0814E638 @ =gStringVar1
|
||||
ldr r4, [sp, 0x10]
|
||||
ldrh r1, [r4, 0x8]
|
||||
@@ -1998,7 +1998,7 @@ _0814E5B6:
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x1C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -2341,7 +2341,7 @@ _0814E8B0:
|
||||
str r5, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r5, _0814EA04 @ =gUnknown_841D124
|
||||
movs r0, 0x2
|
||||
adds r1, r5, 0
|
||||
@@ -2358,7 +2358,7 @@ _0814E8B0:
|
||||
str r5, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x2A
|
||||
str r0, [sp, 0xC]
|
||||
ldr r1, _0814EA08 @ =gStringVar4
|
||||
@@ -2383,7 +2383,7 @@ _0814E90E:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
ldr r3, [sp, 0xC]
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r3, 0
|
||||
mov r0, r9
|
||||
lsls r4, r0, 1
|
||||
@@ -2456,7 +2456,7 @@ _0814E96E:
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x3
|
||||
ldr r3, [sp, 0xC]
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [sp, 0x10]
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
@@ -2723,7 +2723,7 @@ _0814EBC6:
|
||||
str r4, [sp, 0x10]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
b _0814EC4C
|
||||
.align 2, 0
|
||||
_0814EC10: .4byte 0x000001bb
|
||||
@@ -2752,7 +2752,7 @@ _0814EC18:
|
||||
str r4, [sp, 0x10]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
_0814EC4C:
|
||||
ldr r1, _0814EC7C @ =0x000001bb
|
||||
adds r0, r6, r1
|
||||
|
||||
+4
-4
@@ -1072,7 +1072,7 @@ _0813D5EA:
|
||||
movs r1, 0xA0
|
||||
movs r2, 0x8
|
||||
movs r3, 0x78
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
|
||||
movs r1, 0xD4
|
||||
movs r2, 0x78
|
||||
movs r3, 0x98
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
|
||||
movs r1, 0x98
|
||||
movs r2, 0x48
|
||||
movs r3, 0x68
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0
|
||||
str r4, [sp, 0xC]
|
||||
str r2, [sp, 0x10]
|
||||
mov r2, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
|
||||
@@ -0,0 +1,829 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80B3FAC
|
||||
sub_80B3FAC: @ 80B3FAC
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3FD8
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _080B3FD4 @ =gBattleAnimArgs
|
||||
ldrh r1, [r0, 0x4]
|
||||
negs r1, r1
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r0]
|
||||
negs r1, r1
|
||||
strh r1, [r0]
|
||||
b _080B4008
|
||||
.align 2, 0
|
||||
_080B3FD4: .4byte gBattleAnimArgs
|
||||
_080B3FD8:
|
||||
ldr r0, _080B406C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B4008
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r1, _080B4070 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
ldrh r0, [r1, 0x6]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
ldrh r0, [r1]
|
||||
negs r0, r0
|
||||
strh r0, [r1]
|
||||
_080B4008:
|
||||
ldr r5, _080B406C @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074844
|
||||
lsls r0, 24
|
||||
ldr r4, _080B4070 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074844
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x22]
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x6]
|
||||
adds r0, r4
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B4074 @ =sub_8075590
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B4078 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B406C: .4byte gBattleAnimTarget
|
||||
_080B4070: .4byte gBattleAnimArgs
|
||||
_080B4074: .4byte sub_8075590
|
||||
_080B4078: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B3FAC
|
||||
|
||||
thumb_func_start sub_80B407C
|
||||
sub_80B407C: @ 80B407C
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B40A0
|
||||
ldr r1, _080B409C @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
negs r0, r0
|
||||
strh r0, [r1]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
bl StartSpriteAffineAnim
|
||||
b _080B40BC
|
||||
.align 2, 0
|
||||
_080B409C: .4byte gBattleAnimArgs
|
||||
_080B40A0:
|
||||
ldr r0, _080B4118 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B40BC
|
||||
ldr r0, _080B411C @ =gBattleAnimArgs
|
||||
ldrh r1, [r0, 0x2]
|
||||
negs r1, r1
|
||||
strh r1, [r0, 0x2]
|
||||
ldrh r1, [r0]
|
||||
negs r1, r1
|
||||
strh r1, [r0]
|
||||
_080B40BC:
|
||||
ldr r5, _080B4118 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074844
|
||||
lsls r0, 24
|
||||
ldr r4, _080B411C @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074844
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x22]
|
||||
ldrh r0, [r4, 0x4]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B4120 @ =sub_8075590
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B4124 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4118: .4byte gBattleAnimTarget
|
||||
_080B411C: .4byte gBattleAnimArgs
|
||||
_080B4120: .4byte sub_8075590
|
||||
_080B4124: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B407C
|
||||
|
||||
thumb_func_start sub_80B4128
|
||||
sub_80B4128: @ 80B4128
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_8073788
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B4144
|
||||
ldr r0, _080B4184 @ =gBattleAnimArgs
|
||||
movs r2, 0x4
|
||||
ldrsh r1, [r0, r2]
|
||||
lsrs r2, r1, 31
|
||||
adds r1, r2
|
||||
asrs r1, 1
|
||||
strh r1, [r0, 0x4]
|
||||
_080B4144:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldr r1, _080B4184 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldrh r0, [r5, 0x20]
|
||||
strh r0, [r5, 0x30]
|
||||
ldrh r0, [r5, 0x22]
|
||||
strh r0, [r5, 0x34]
|
||||
movs r2, 0x8
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0
|
||||
bne _080B418C
|
||||
ldr r4, _080B4188 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
b _080B419E
|
||||
.align 2, 0
|
||||
_080B4184: .4byte gBattleAnimArgs
|
||||
_080B4188: .4byte gBattleAnimTarget
|
||||
_080B418C:
|
||||
ldr r0, _080B41B4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r2, r5, 0
|
||||
adds r2, 0x32
|
||||
adds r3, r5, 0
|
||||
adds r3, 0x36
|
||||
movs r1, 0x1
|
||||
bl sub_8076D9C
|
||||
_080B419E:
|
||||
adds r0, r5, 0
|
||||
bl sub_8075678
|
||||
ldr r0, _080B41B8 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0, 0x6]
|
||||
strh r0, [r5, 0x38]
|
||||
ldr r0, _080B41BC @ =sub_80B41C0
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B41B4: .4byte gBattleAnimTarget
|
||||
_080B41B8: .4byte gBattleAnimArgs
|
||||
_080B41BC: .4byte sub_80B41C0
|
||||
thumb_func_end sub_80B4128
|
||||
|
||||
thumb_func_start sub_80B41C0
|
||||
sub_80B41C0: @ 80B41C0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80755E0
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B41D6
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
b _080B41F2
|
||||
_080B41D6:
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl Sin
|
||||
ldrh r1, [r4, 0x24]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x24]
|
||||
ldrh r0, [r4, 0x3A]
|
||||
adds r0, 0xD
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x3A]
|
||||
_080B41F2:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B41C0
|
||||
|
||||
thumb_func_start sub_80B41F8
|
||||
sub_80B41F8: @ 80B41F8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _080B4228 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x20
|
||||
adds r3, r4, 0
|
||||
adds r3, 0x22
|
||||
movs r1, 0
|
||||
bl sub_8076D9C
|
||||
ldr r0, _080B422C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B4234
|
||||
ldr r0, _080B4230 @ =gBattleAnimArgs
|
||||
ldrh r1, [r4, 0x20]
|
||||
ldrh r2, [r0]
|
||||
subs r1, r2
|
||||
strh r1, [r4, 0x20]
|
||||
b _080B4240
|
||||
.align 2, 0
|
||||
_080B4228: .4byte gBattleAnimTarget
|
||||
_080B422C: .4byte gBattleAnimAttacker
|
||||
_080B4230: .4byte gBattleAnimArgs
|
||||
_080B4234:
|
||||
ldr r1, _080B4268 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r4, 0x20]
|
||||
adds r0, r2
|
||||
strh r0, [r4, 0x20]
|
||||
adds r0, r1, 0
|
||||
_080B4240:
|
||||
ldrh r0, [r0, 0x2]
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x22]
|
||||
ldr r0, _080B426C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B425C
|
||||
ldrh r0, [r4, 0x22]
|
||||
adds r0, 0x8
|
||||
strh r0, [r4, 0x22]
|
||||
_080B425C:
|
||||
ldr r0, _080B4270 @ =sub_80B4274
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4268: .4byte gBattleAnimArgs
|
||||
_080B426C: .4byte gBattleAnimTarget
|
||||
_080B4270: .4byte sub_80B4274
|
||||
thumb_func_end sub_80B41F8
|
||||
|
||||
thumb_func_start sub_80B4274
|
||||
sub_80B4274: @ 80B4274
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
ldrh r0, [r3, 0x2E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r3, 0x2E]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x3
|
||||
bne _080B42A8
|
||||
movs r0, 0
|
||||
strh r0, [r3, 0x2E]
|
||||
movs r0, 0x3E
|
||||
adds r0, r3
|
||||
mov r12, r0
|
||||
ldrb r2, [r0]
|
||||
lsls r0, r2, 29
|
||||
lsrs r0, 31
|
||||
movs r1, 0x1
|
||||
eors r1, r0
|
||||
lsls r1, 2
|
||||
movs r0, 0x5
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
mov r1, r12
|
||||
strb r0, [r1]
|
||||
_080B42A8:
|
||||
ldrh r0, [r3, 0x30]
|
||||
adds r0, 0x1
|
||||
strh r0, [r3, 0x30]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x33
|
||||
bne _080B42BC
|
||||
adds r0, r3, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B42BC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B4274
|
||||
|
||||
thumb_func_start sub_80B42C0
|
||||
sub_80B42C0: @ 80B42C0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0xFD
|
||||
lsls r1, 6
|
||||
movs r0, 0x50
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0x10
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
strh r0, [r4, 0x2E]
|
||||
ldr r0, _080B42E4 @ =sub_80B42E8
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B42E4: .4byte sub_80B42E8
|
||||
thumb_func_end sub_80B42C0
|
||||
|
||||
thumb_func_start sub_80B42E8
|
||||
sub_80B42E8: @ 80B42E8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrh r1, [r4, 0x32]
|
||||
movs r2, 0x32
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0x13
|
||||
bgt _080B42FC
|
||||
adds r0, r1, 0x1
|
||||
strh r0, [r4, 0x32]
|
||||
b _080B433A
|
||||
_080B42FC:
|
||||
ldrh r1, [r4, 0x30]
|
||||
adds r0, r1, 0x1
|
||||
strh r0, [r4, 0x30]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080B433A
|
||||
ldrh r1, [r4, 0x2E]
|
||||
subs r1, 0x1
|
||||
strh r1, [r4, 0x2E]
|
||||
movs r0, 0x10
|
||||
subs r0, r1
|
||||
lsls r0, 8
|
||||
orrs r1, r0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl SetGpuReg
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080B433A
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x3E
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, _080B4340 @ =sub_80B4344
|
||||
str r0, [r4, 0x1C]
|
||||
_080B433A:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4340: .4byte sub_80B4344
|
||||
thumb_func_end sub_80B42E8
|
||||
|
||||
thumb_func_start sub_80B4344
|
||||
sub_80B4344: @ 80B4344
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B4344
|
||||
|
||||
thumb_func_start sub_80B4364
|
||||
sub_80B4364: @ 80B4364
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
bl sub_8073788
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B4384
|
||||
ldr r1, _080B4380 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
b _080B43A6
|
||||
.align 2, 0
|
||||
_080B4380: .4byte gBattleAnimArgs
|
||||
_080B4384:
|
||||
ldr r0, _080B4480 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B43A6
|
||||
ldr r1, _080B4484 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
ldrh r0, [r1, 0x6]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_080B43A6:
|
||||
bl sub_8073788
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B43F6
|
||||
ldr r0, _080B4480 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080B4488 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
bne _080B43F6
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerPosition
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B43E4
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerPosition
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080B43F6
|
||||
_080B43E4:
|
||||
ldr r0, _080B4484 @ =gBattleAnimArgs
|
||||
movs r2, 0x4
|
||||
ldrsh r1, [r0, r2]
|
||||
negs r1, r1
|
||||
strh r1, [r0, 0x4]
|
||||
movs r2, 0
|
||||
ldrsh r1, [r0, r2]
|
||||
negs r1, r1
|
||||
strh r1, [r0]
|
||||
_080B43F6:
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldr r5, _080B4488 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
ldr r6, _080B4484 @ =gBattleAnimArgs
|
||||
lsrs r4, 24
|
||||
ldrh r0, [r6, 0x4]
|
||||
adds r4, r0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
ldrh r2, [r6, 0x6]
|
||||
adds r1, r2
|
||||
lsls r1, 16
|
||||
ldrh r2, [r7, 0x20]
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
subs r0, r2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
ldrh r2, [r7, 0x22]
|
||||
lsrs r5, r1, 16
|
||||
asrs r1, 16
|
||||
subs r1, r2
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075B30
|
||||
lsls r0, 16
|
||||
movs r1, 0xC0
|
||||
lsls r1, 24
|
||||
adds r0, r1
|
||||
lsrs r0, 16
|
||||
movs r3, 0x80
|
||||
lsls r3, 1
|
||||
str r0, [sp]
|
||||
adds r0, r7, 0
|
||||
movs r1, 0
|
||||
adds r2, r3, 0
|
||||
bl sub_8075A1C
|
||||
ldrh r0, [r6, 0x8]
|
||||
strh r0, [r7, 0x2E]
|
||||
strh r4, [r7, 0x32]
|
||||
strh r5, [r7, 0x36]
|
||||
ldr r0, _080B448C @ =sub_8075590
|
||||
str r0, [r7, 0x1C]
|
||||
ldr r1, _080B4490 @ =DestroyAnimSprite
|
||||
adds r0, r7, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
add sp, 0x4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4480: .4byte gBattleAnimAttacker
|
||||
_080B4484: .4byte gBattleAnimArgs
|
||||
_080B4488: .4byte gBattleAnimTarget
|
||||
_080B448C: .4byte sub_8075590
|
||||
_080B4490: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B4364
|
||||
|
||||
thumb_func_start sub_80B4494
|
||||
sub_80B4494: @ 80B4494
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldr r0, _080B4500 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B44B4
|
||||
ldr r1, _080B4504 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
_080B44B4:
|
||||
ldr r4, _080B4504 @ =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r5, _080B4508 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x6]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x36]
|
||||
ldrh r0, [r4, 0xA]
|
||||
strh r0, [r6, 0x38]
|
||||
adds r0, r6, 0
|
||||
bl sub_8075068
|
||||
ldr r0, _080B450C @ =sub_80B4510
|
||||
str r0, [r6, 0x1C]
|
||||
adds r2, r6, 0
|
||||
adds r2, 0x3E
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4500: .4byte gBattleAnimAttacker
|
||||
_080B4504: .4byte gBattleAnimArgs
|
||||
_080B4508: .4byte gBattleAnimTarget
|
||||
_080B450C: .4byte sub_80B4510
|
||||
thumb_func_end sub_80B4494
|
||||
|
||||
thumb_func_start sub_80B4510
|
||||
sub_80B4510: @ 80B4510
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x14
|
||||
adds r4, r0, 0
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x3E
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x5
|
||||
negs r1, r1
|
||||
ands r1, r0
|
||||
strb r1, [r2]
|
||||
adds r0, r4, 0
|
||||
bl AnimateBallThrow
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B453C
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
b _080B45CC
|
||||
_080B453C:
|
||||
movs r0, 0x2E
|
||||
adds r0, r4
|
||||
mov r8, r0
|
||||
ldrh r7, [r4, 0x20]
|
||||
ldrh r5, [r4, 0x24]
|
||||
ldrh r1, [r4, 0x22]
|
||||
mov r12, r1
|
||||
ldrh r6, [r4, 0x26]
|
||||
mov r2, r8
|
||||
add r1, sp, 0x4
|
||||
movs r3, 0x7
|
||||
_080B4552:
|
||||
ldrh r0, [r2]
|
||||
strh r0, [r1]
|
||||
adds r2, 0x2
|
||||
adds r1, 0x2
|
||||
subs r3, 0x1
|
||||
cmp r3, 0
|
||||
bge _080B4552
|
||||
adds r0, r7, r5
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
mov r2, r12
|
||||
adds r0, r2, r6
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl AnimateBallThrow
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B45CC
|
||||
ldrh r0, [r4, 0x24]
|
||||
ldrh r1, [r4, 0x20]
|
||||
adds r0, r1
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
subs r0, r1
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
ldrh r1, [r4, 0x26]
|
||||
ldrh r2, [r4, 0x22]
|
||||
adds r1, r2
|
||||
lsls r2, r6, 16
|
||||
asrs r2, 16
|
||||
subs r1, r2
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075B30
|
||||
lsls r0, 16
|
||||
movs r1, 0xC0
|
||||
lsls r1, 24
|
||||
adds r0, r1
|
||||
lsrs r0, 16
|
||||
movs r3, 0x80
|
||||
lsls r3, 1
|
||||
str r0, [sp]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
adds r2, r3, 0
|
||||
bl sub_8075A1C
|
||||
add r2, sp, 0x4
|
||||
mov r1, r8
|
||||
movs r3, 0x7
|
||||
_080B45BE:
|
||||
ldrh r0, [r2]
|
||||
strh r0, [r1]
|
||||
adds r2, 0x2
|
||||
adds r1, 0x2
|
||||
subs r3, 0x1
|
||||
cmp r3, 0
|
||||
bge _080B45BE
|
||||
_080B45CC:
|
||||
add sp, 0x14
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B4510
|
||||
|
||||
thumb_func_start sub_80B45D8
|
||||
sub_80B45D8: @ 80B45D8
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, _080B45EC @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080B45F4
|
||||
ldr r4, _080B45F0 @ =gBattleAnimAttacker
|
||||
b _080B45F6
|
||||
.align 2, 0
|
||||
_080B45EC: .4byte gBattleAnimArgs
|
||||
_080B45F0: .4byte gBattleAnimAttacker
|
||||
_080B45F4:
|
||||
ldr r4, _080B4628 @ =gBattleAnimTarget
|
||||
_080B45F6:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x12
|
||||
strh r0, [r5, 0x22]
|
||||
ldr r1, _080B462C @ =move_anim_8074EE0
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _080B4630 @ =sub_8074F50
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B4628: .4byte gBattleAnimTarget
|
||||
_080B462C: .4byte move_anim_8074EE0
|
||||
_080B4630: .4byte sub_8074F50
|
||||
thumb_func_end sub_80B45D8
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4
|
||||
str r4, [sp, 0xC]
|
||||
str r2, [sp, 0x10]
|
||||
mov r2, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
|
||||
@@ -134,7 +134,7 @@ _080F5660:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@@ -241,7 +241,7 @@ _080F5744:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
|
||||
+3
-3
@@ -422,7 +422,7 @@ _080F3D0A:
|
||||
movs r1, 0x1
|
||||
movs r2, 0x8
|
||||
movs r3, 0x29
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r1, [r7]
|
||||
movs r0, 0x5
|
||||
b _080F413C
|
||||
@@ -649,7 +649,7 @@ _080F3EB4:
|
||||
movs r1, 0x1
|
||||
movs r2, 0x2
|
||||
movs r3, 0x6
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r1, [r7]
|
||||
movs r0, 0x8
|
||||
b _080F3FB8
|
||||
@@ -696,7 +696,7 @@ _080F3F24:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x8
|
||||
movs r3, 0x6
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r1, [r7]
|
||||
movs r0, 0x9
|
||||
b _080F3FB8
|
||||
|
||||
+2323
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -559,7 +559,7 @@ _080F5050:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x4
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, _080F50EC @ =gUnknown_841B619
|
||||
add r0, sp, 0xC
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
@@ -579,7 +579,7 @@ _080F5050:
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
movs r3, 0x1E
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r6, [sp]
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x4]
|
||||
@@ -589,7 +589,7 @@ _080F5050:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x78
|
||||
movs r3, 0x69
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
bl PutWindowTilemap
|
||||
add sp, 0xAC
|
||||
|
||||
@@ -9014,7 +9014,7 @@ _08154C4E:
|
||||
str r4, [sp, 0x8]
|
||||
movs r1, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r10
|
||||
ldr r0, [r2]
|
||||
add r0, r9
|
||||
@@ -9319,7 +9319,7 @@ _08154EC8:
|
||||
movs r1, 0
|
||||
movs r2, 0x1C
|
||||
adds r3, r6, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r0, sp, 0xC
|
||||
mov r1, r9
|
||||
movs r2, 0x1
|
||||
@@ -9563,7 +9563,7 @@ _081550EA:
|
||||
str r6, [sp, 0x8]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r7, 0
|
||||
mov r0, r9
|
||||
adds r0, 0x1
|
||||
@@ -9624,7 +9624,7 @@ _0815512E:
|
||||
add r1, sp, 0xC
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _081551FA
|
||||
.align 2, 0
|
||||
_081551A8: .4byte gUnknown_203F440
|
||||
@@ -10669,7 +10669,7 @@ _08155AA6:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _08155B08
|
||||
.align 2, 0
|
||||
_08155ACC: .4byte gUnknown_8419F54
|
||||
|
||||
+835
@@ -0,0 +1,835 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80B725C
|
||||
sub_80B725C: @ 80B725C
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, _080B72A4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B72AC
|
||||
ldr r2, _080B72A8 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x20]
|
||||
ldrh r1, [r2]
|
||||
subs r0, r1
|
||||
strh r0, [r5, 0x20]
|
||||
ldrh r0, [r2, 0x6]
|
||||
negs r0, r0
|
||||
strh r0, [r2, 0x6]
|
||||
ldrh r0, [r2, 0x8]
|
||||
negs r0, r0
|
||||
strh r0, [r2, 0x8]
|
||||
adds r1, r2, 0
|
||||
b _080B72B6
|
||||
.align 2, 0
|
||||
_080B72A4: .4byte gBattleAnimAttacker
|
||||
_080B72A8: .4byte gBattleAnimArgs
|
||||
_080B72AC:
|
||||
ldr r1, _080B72EC @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r5, 0x20]
|
||||
adds r0, r2
|
||||
strh r0, [r5, 0x20]
|
||||
_080B72B6:
|
||||
ldrh r0, [r1, 0x2]
|
||||
ldrh r2, [r5, 0x22]
|
||||
adds r0, r2
|
||||
strh r0, [r5, 0x22]
|
||||
ldrh r0, [r1, 0x4]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldrh r0, [r1, 0x6]
|
||||
strh r0, [r5, 0x30]
|
||||
ldrh r0, [r1, 0x8]
|
||||
strh r0, [r5, 0x34]
|
||||
ldrh r0, [r1, 0xA]
|
||||
strh r0, [r5, 0x38]
|
||||
adds r2, r5, 0
|
||||
adds r2, 0x3E
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r1, _080B72F0 @ =move_anim_8074EE0
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _080B72F4 @ =sub_8074E70
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B72EC: .4byte gBattleAnimArgs
|
||||
_080B72F0: .4byte move_anim_8074EE0
|
||||
_080B72F4: .4byte sub_8074E70
|
||||
thumb_func_end sub_80B725C
|
||||
|
||||
thumb_func_start sub_80B72F8
|
||||
sub_80B72F8: @ 80B72F8
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_8074FCC
|
||||
ldr r4, _080B7350 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080B7354 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B735C
|
||||
ldr r2, _080B7358 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x20]
|
||||
ldrh r1, [r2, 0x2]
|
||||
subs r0, r1
|
||||
strh r0, [r5, 0x20]
|
||||
ldrh r0, [r5, 0x22]
|
||||
adds r1, r0
|
||||
strh r1, [r5, 0x22]
|
||||
ldrh r0, [r5, 0x32]
|
||||
ldrh r1, [r2, 0x4]
|
||||
subs r0, r1
|
||||
strh r0, [r5, 0x32]
|
||||
ldrh r0, [r2, 0x6]
|
||||
ldrh r1, [r5, 0x36]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x36]
|
||||
b _080B7386
|
||||
.align 2, 0
|
||||
_080B7350: .4byte gBattleAnimTarget
|
||||
_080B7354: .4byte gBattleAnimAttacker
|
||||
_080B7358: .4byte gBattleAnimArgs
|
||||
_080B735C:
|
||||
ldr r1, _080B73A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
ldrh r2, [r5, 0x20]
|
||||
adds r0, r2
|
||||
strh r0, [r5, 0x20]
|
||||
ldrh r0, [r1, 0x2]
|
||||
ldrh r2, [r5, 0x22]
|
||||
adds r0, r2
|
||||
strh r0, [r5, 0x22]
|
||||
ldrh r0, [r1, 0x4]
|
||||
ldrh r2, [r5, 0x32]
|
||||
adds r0, r2
|
||||
strh r0, [r5, 0x32]
|
||||
ldrh r0, [r1, 0x6]
|
||||
ldrh r1, [r5, 0x36]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x36]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAnim
|
||||
_080B7386:
|
||||
ldr r0, _080B73A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r0, _080B73A4 @ =sub_8075590
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B73A8 @ =move_anim_8074EE0
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B73A0: .4byte gBattleAnimArgs
|
||||
_080B73A4: .4byte sub_8075590
|
||||
_080B73A8: .4byte move_anim_8074EE0
|
||||
thumb_func_end sub_80B72F8
|
||||
|
||||
thumb_func_start sub_80B73AC
|
||||
sub_80B73AC: @ 80B73AC
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, _080B73C0 @ =gBattleAnimArgs
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080B73C8
|
||||
ldr r4, _080B73C4 @ =gBattleAnimAttacker
|
||||
b _080B73CA
|
||||
.align 2, 0
|
||||
_080B73C0: .4byte gBattleAnimArgs
|
||||
_080B73C4: .4byte gBattleAnimAttacker
|
||||
_080B73C8:
|
||||
ldr r4, _080B740C @ =gBattleAnimTarget
|
||||
_080B73CA:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
ldr r4, _080B7410 @ =gBattleAnimArgs
|
||||
movs r0, 0x2
|
||||
ldrsh r1, [r4, r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_8074FF8
|
||||
ldrh r0, [r4, 0x4]
|
||||
ldrh r1, [r5, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x22]
|
||||
ldr r0, _080B7414 @ =sub_8074F6C
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B7418 @ =move_anim_8074EE0
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B740C: .4byte gBattleAnimTarget
|
||||
_080B7410: .4byte gBattleAnimArgs
|
||||
_080B7414: .4byte sub_8074F6C
|
||||
_080B7418: .4byte move_anim_8074EE0
|
||||
thumb_func_end sub_80B73AC
|
||||
|
||||
thumb_func_start sub_80B741C
|
||||
sub_80B741C: @ 80B741C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _080B7444 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B7436
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAffineAnim
|
||||
_080B7436:
|
||||
adds r0, r4, 0
|
||||
bl sub_80B72F8
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B7444: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80B741C
|
||||
|
||||
thumb_func_start sub_80B7448
|
||||
sub_80B7448: @ 80B7448
|
||||
push {r4-r7,lr}
|
||||
adds r6, r0, 0
|
||||
ldr r4, _080B749C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r5, 0
|
||||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x22]
|
||||
strh r5, [r6, 0x36]
|
||||
movs r0, 0x1
|
||||
strh r0, [r6, 0x38]
|
||||
ldr r0, _080B74A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r6, 0x3A]
|
||||
ldr r4, _080B74A4 @ =sBattler_AI
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8076B2C
|
||||
lsls r7, r0, 16
|
||||
lsrs r5, r7, 16
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8076B2C
|
||||
lsls r1, r0, 16
|
||||
lsrs r0, r1, 16
|
||||
cmp r5, r0
|
||||
bls _080B74A8
|
||||
lsrs r0, r7, 17
|
||||
b _080B74AA
|
||||
.align 2, 0
|
||||
_080B749C: .4byte gBattleAnimAttacker
|
||||
_080B74A0: .4byte gBattleAnimArgs
|
||||
_080B74A4: .4byte sBattler_AI
|
||||
_080B74A8:
|
||||
lsrs r0, r1, 17
|
||||
_080B74AA:
|
||||
strh r0, [r6, 0x3C]
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r6, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r6, r2]
|
||||
bl Cos
|
||||
strh r0, [r6, 0x24]
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r6, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r6, r2]
|
||||
bl Sin
|
||||
strh r0, [r6, 0x26]
|
||||
ldr r0, _080B74D4 @ =sub_80B74D8
|
||||
str r0, [r6, 0x1C]
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B74D4: .4byte sub_80B74D8
|
||||
thumb_func_end sub_80B7448
|
||||
|
||||
thumb_func_start sub_80B74D8
|
||||
sub_80B74D8: @ 80B74D8
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x2E
|
||||
ldrsh r5, [r4, r0]
|
||||
cmp r5, 0
|
||||
beq _080B74EA
|
||||
cmp r5, 0x1
|
||||
beq _080B7556
|
||||
b _080B75DA
|
||||
_080B74EA:
|
||||
ldrh r0, [r4, 0x3A]
|
||||
ldrh r1, [r4, 0x38]
|
||||
subs r0, r1
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x3A]
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r4, r2]
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r4, r2]
|
||||
bl Sin
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x36]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x36]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x5
|
||||
ble _080B753C
|
||||
strh r5, [r4, 0x36]
|
||||
ldrh r1, [r4, 0x38]
|
||||
movs r2, 0x38
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0xF
|
||||
bgt _080B753C
|
||||
adds r0, r1, 0x1
|
||||
strh r0, [r4, 0x38]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0xF
|
||||
ble _080B753C
|
||||
movs r0, 0x10
|
||||
strh r0, [r4, 0x38]
|
||||
_080B753C:
|
||||
ldrh r0, [r4, 0x34]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x34]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x3C
|
||||
ble _080B75DA
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0x34]
|
||||
ldrh r0, [r4, 0x2E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x2E]
|
||||
b _080B75DA
|
||||
_080B7556:
|
||||
ldrh r0, [r4, 0x3A]
|
||||
ldrh r1, [r4, 0x38]
|
||||
subs r0, r1
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x3A]
|
||||
ldrh r1, [r4, 0x3C]
|
||||
movs r2, 0x3C
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0x95
|
||||
bgt _080B757E
|
||||
adds r0, r1, 0
|
||||
adds r0, 0x8
|
||||
strh r0, [r4, 0x3C]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x95
|
||||
ble _080B757E
|
||||
movs r0, 0x96
|
||||
strh r0, [r4, 0x3C]
|
||||
_080B757E:
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r4, r2]
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x3C
|
||||
ldrsh r1, [r4, r2]
|
||||
bl Sin
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x36]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x36]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x5
|
||||
ble _080B75C6
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0x36]
|
||||
ldrh r1, [r4, 0x38]
|
||||
movs r2, 0x38
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0xF
|
||||
bgt _080B75C6
|
||||
adds r0, r1, 0x1
|
||||
strh r0, [r4, 0x38]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0xF
|
||||
ble _080B75C6
|
||||
movs r0, 0x10
|
||||
strh r0, [r4, 0x38]
|
||||
_080B75C6:
|
||||
ldrh r0, [r4, 0x34]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x34]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x14
|
||||
ble _080B75DA
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B75DA:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B74D8
|
||||
|
||||
thumb_func_start sub_80B75E0
|
||||
sub_80B75E0: @ 80B75E0
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
lsls r1, 3
|
||||
ldr r0, _080B760C @ =gTasks
|
||||
adds r4, r1, r0
|
||||
ldr r0, _080B7610 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_80768B0
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080B761C
|
||||
ldr r0, _080B7614 @ =0x04000014
|
||||
str r0, [sp]
|
||||
ldr r0, _080B7618 @ =gBattle_BG1_X
|
||||
b _080B7622
|
||||
.align 2, 0
|
||||
_080B760C: .4byte gTasks
|
||||
_080B7610: .4byte gBattleAnimAttacker
|
||||
_080B7614: .4byte 0x04000014
|
||||
_080B7618: .4byte gBattle_BG1_X
|
||||
_080B761C:
|
||||
ldr r0, _080B7698 @ =0x04000018
|
||||
str r0, [sp]
|
||||
ldr r0, _080B769C @ =gBattle_BG2_X
|
||||
_080B7622:
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r4, 0xC]
|
||||
ldr r0, _080B76A0 @ =0xa2600001
|
||||
str r0, [sp, 0x4]
|
||||
mov r1, sp
|
||||
movs r5, 0
|
||||
movs r0, 0x1
|
||||
strb r0, [r1, 0x8]
|
||||
mov r0, sp
|
||||
strb r5, [r0, 0x9]
|
||||
ldr r0, _080B76A4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807492C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r0, 0
|
||||
subs r1, 0x20
|
||||
strh r1, [r4, 0xE]
|
||||
adds r0, 0x20
|
||||
strh r0, [r4, 0x10]
|
||||
cmp r1, 0
|
||||
bge _080B7652
|
||||
strh r5, [r4, 0xE]
|
||||
_080B7652:
|
||||
ldrh r3, [r4, 0xE]
|
||||
movs r1, 0x10
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r3, r0
|
||||
bgt _080B7680
|
||||
ldr r5, _080B76A8 @ =gScanlineEffectRegBuffers
|
||||
movs r0, 0xF0
|
||||
lsls r0, 3
|
||||
adds r6, r5, r0
|
||||
_080B7664:
|
||||
lsls r1, r3, 1
|
||||
adds r2, r1, r5
|
||||
ldrh r0, [r4, 0xC]
|
||||
strh r0, [r2]
|
||||
adds r1, r6
|
||||
ldrh r0, [r4, 0xC]
|
||||
strh r0, [r1]
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
movs r1, 0x10
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r3, r0
|
||||
ble _080B7664
|
||||
_080B7680:
|
||||
ldr r0, [sp]
|
||||
ldr r1, [sp, 0x4]
|
||||
ldr r2, [sp, 0x8]
|
||||
bl ScanlineEffect_SetParams
|
||||
ldr r0, _080B76AC @ =sub_80B76B0
|
||||
str r0, [r4]
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B7698: .4byte 0x04000018
|
||||
_080B769C: .4byte gBattle_BG2_X
|
||||
_080B76A0: .4byte 0xa2600001
|
||||
_080B76A4: .4byte gBattleAnimAttacker
|
||||
_080B76A8: .4byte gScanlineEffectRegBuffers
|
||||
_080B76AC: .4byte sub_80B76B0
|
||||
thumb_func_end sub_80B75E0
|
||||
|
||||
thumb_func_start sub_80B76B0
|
||||
sub_80B76B0: @ 80B76B0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
lsls r0, r3, 2
|
||||
adds r0, r3
|
||||
lsls r0, 3
|
||||
ldr r1, _080B76D4 @ =gTasks
|
||||
adds r2, r0, r1
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r2, r1]
|
||||
cmp r0, 0x4
|
||||
bhi _080B7766
|
||||
lsls r0, 2
|
||||
ldr r1, _080B76D8 @ =_080B76DC
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080B76D4: .4byte gTasks
|
||||
_080B76D8: .4byte _080B76DC
|
||||
.align 2, 0
|
||||
_080B76DC:
|
||||
.4byte _080B76F0
|
||||
.4byte _080B7712
|
||||
.4byte _080B7722
|
||||
.4byte _080B774E
|
||||
.4byte _080B7760
|
||||
_080B76F0:
|
||||
ldrh r0, [r2, 0x16]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0x16]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x1
|
||||
ble _080B7746
|
||||
movs r0, 0
|
||||
strh r0, [r2, 0x16]
|
||||
ldrh r0, [r2, 0x14]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0x14]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x3
|
||||
bne _080B7746
|
||||
b _080B7740
|
||||
_080B7712:
|
||||
ldrh r0, [r2, 0xA]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0xA]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x3C
|
||||
ble _080B7746
|
||||
b _080B7740
|
||||
_080B7722:
|
||||
ldrh r0, [r2, 0x16]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0x16]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x1
|
||||
ble _080B7746
|
||||
movs r0, 0
|
||||
strh r0, [r2, 0x16]
|
||||
ldrh r0, [r2, 0x14]
|
||||
subs r0, 0x1
|
||||
strh r0, [r2, 0x14]
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _080B7746
|
||||
_080B7740:
|
||||
ldrh r0, [r2, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0x8]
|
||||
_080B7746:
|
||||
adds r0, r2, 0
|
||||
bl sub_80B776C
|
||||
b _080B7766
|
||||
_080B774E:
|
||||
ldr r1, _080B775C @ =gScanlineEffect
|
||||
movs r0, 0x3
|
||||
strb r0, [r1, 0x15]
|
||||
ldrh r0, [r2, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r2, 0x8]
|
||||
b _080B7766
|
||||
.align 2, 0
|
||||
_080B775C: .4byte gScanlineEffect
|
||||
_080B7760:
|
||||
adds r0, r3, 0
|
||||
bl DestroyAnimVisualTask
|
||||
_080B7766:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B76B0
|
||||
|
||||
thumb_func_start sub_80B776C
|
||||
sub_80B776C: @ 80B776C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r5, r0, 0
|
||||
ldrh r3, [r5, 0x12]
|
||||
ldrh r4, [r5, 0xE]
|
||||
movs r1, 0x10
|
||||
ldrsh r0, [r5, r1]
|
||||
cmp r4, r0
|
||||
bgt _080B77C2
|
||||
ldr r7, _080B77D8 @ =gScanlineEffectRegBuffers
|
||||
mov r12, r7
|
||||
ldr r0, _080B77DC @ =gSineTable
|
||||
mov r8, r0
|
||||
ldr r6, _080B77E0 @ =gScanlineEffect
|
||||
_080B778A:
|
||||
lsls r2, r4, 1
|
||||
ldrb r1, [r6, 0x14]
|
||||
lsls r0, r1, 4
|
||||
subs r0, r1
|
||||
lsls r0, 7
|
||||
adds r2, r0
|
||||
add r2, r12
|
||||
lsls r0, r3, 1
|
||||
add r0, r8
|
||||
movs r7, 0
|
||||
ldrsh r1, [r0, r7]
|
||||
movs r7, 0x14
|
||||
ldrsh r0, [r5, r7]
|
||||
muls r0, r1
|
||||
asrs r0, 7
|
||||
ldrh r1, [r5, 0xC]
|
||||
adds r0, r1
|
||||
strh r0, [r2]
|
||||
adds r3, 0x8
|
||||
movs r0, 0xFF
|
||||
ands r3, r0
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
movs r7, 0x10
|
||||
ldrsh r0, [r5, r7]
|
||||
cmp r4, r0
|
||||
ble _080B778A
|
||||
_080B77C2:
|
||||
ldrh r0, [r5, 0x12]
|
||||
adds r0, 0x9
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r5, 0x12]
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B77D8: .4byte gScanlineEffectRegBuffers
|
||||
_080B77DC: .4byte gSineTable
|
||||
_080B77E0: .4byte gScanlineEffect
|
||||
thumb_func_end sub_80B776C
|
||||
|
||||
thumb_func_start sub_80B77E4
|
||||
sub_80B77E4: @ 80B77E4
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080B7884 @ =gBattleAnimArgs
|
||||
movs r0, 0x4
|
||||
ldrsh r1, [r5, r0]
|
||||
lsls r0, r1, 1
|
||||
adds r0, r1
|
||||
movs r1, 0x5
|
||||
bl __divsi3
|
||||
adds r6, r0, 0
|
||||
ldr r1, _080B7888 @ =gBattleAnimAttacker
|
||||
mov r8, r1
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
mov r2, r8
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r3, [r5, 0x8]
|
||||
adds r0, r3
|
||||
strh r0, [r4, 0x22]
|
||||
movs r1, 0x2
|
||||
ldrsh r0, [r5, r1]
|
||||
movs r2, 0x4
|
||||
ldrsh r1, [r5, r2]
|
||||
bl Cos
|
||||
strh r0, [r4, 0x30]
|
||||
movs r3, 0x2
|
||||
ldrsh r0, [r5, r3]
|
||||
lsls r6, 16
|
||||
asrs r6, 16
|
||||
adds r1, r6, 0
|
||||
bl Sin
|
||||
strh r0, [r4, 0x32]
|
||||
ldrh r1, [r4, 0x30]
|
||||
ldrh r2, [r5]
|
||||
adds r3, r2, 0
|
||||
muls r3, r1
|
||||
adds r1, r3, 0
|
||||
ldrh r3, [r4, 0x20]
|
||||
adds r1, r3
|
||||
strh r1, [r4, 0x20]
|
||||
adds r1, r2, 0
|
||||
muls r1, r0
|
||||
adds r0, r1, 0
|
||||
ldrh r2, [r4, 0x22]
|
||||
adds r0, r2
|
||||
strh r0, [r4, 0x22]
|
||||
ldrh r0, [r5, 0x6]
|
||||
strh r0, [r4, 0x34]
|
||||
ldr r0, _080B788C @ =sub_80B7894
|
||||
str r0, [r4, 0x1C]
|
||||
adds r4, 0x2E
|
||||
ldr r2, _080B7890 @ =gUnknown_20399A4
|
||||
movs r1, 0x6
|
||||
_080B786C:
|
||||
ldrh r0, [r4]
|
||||
strh r0, [r2]
|
||||
adds r4, 0x2
|
||||
adds r2, 0x2
|
||||
subs r1, 0x1
|
||||
cmp r1, 0
|
||||
bge _080B786C
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B7884: .4byte gBattleAnimArgs
|
||||
_080B7888: .4byte gBattleAnimAttacker
|
||||
_080B788C: .4byte sub_80B7894
|
||||
_080B7890: .4byte gUnknown_20399A4
|
||||
thumb_func_end sub_80B77E4
|
||||
|
||||
thumb_func_start sub_80B7894
|
||||
sub_80B7894: @ 80B7894
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrh r0, [r4, 0x30]
|
||||
ldrh r1, [r4, 0x36]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
ldrh r0, [r4, 0x32]
|
||||
ldrh r2, [r4, 0x38]
|
||||
adds r0, r2
|
||||
strh r0, [r4, 0x38]
|
||||
movs r1, 0x36
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0xA
|
||||
bl __divsi3
|
||||
strh r0, [r4, 0x24]
|
||||
movs r2, 0x38
|
||||
ldrsh r0, [r4, r2]
|
||||
movs r1, 0xA
|
||||
bl __divsi3
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x2E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x2E]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
movs r2, 0x34
|
||||
ldrsh r1, [r4, r2]
|
||||
cmp r0, r1
|
||||
ble _080B78D8
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B78D8:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B7894
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+2675
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -1373,8 +1373,8 @@ SpawnSpecialFieldObject: @ 805E7F4
|
||||
_0805E82C: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SpawnSpecialFieldObject
|
||||
|
||||
thumb_func_start SpawnSpecialFieldObjectParametrized
|
||||
SpawnSpecialFieldObjectParametrized: @ 805E830
|
||||
thumb_func_start SpawnSpecialFieldObjectParameterized
|
||||
SpawnSpecialFieldObjectParameterized: @ 805E830
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
@@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParametrized: @ 805E830
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0805E894: .4byte 0xfff90000
|
||||
thumb_func_end SpawnSpecialFieldObjectParametrized
|
||||
thumb_func_end SpawnSpecialFieldObjectParameterized
|
||||
|
||||
thumb_func_start show_sprite
|
||||
show_sprite: @ 805E898
|
||||
|
||||
@@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
@@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0xD
|
||||
strh r0, [r6, 0x8]
|
||||
movs r0, 0x1
|
||||
@@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
ldrh r0, [r6, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r6, 0x8]
|
||||
|
||||
@@ -785,7 +785,7 @@ _0807F3E0:
|
||||
movs r1, 0x2
|
||||
mov r2, r10
|
||||
mov r3, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r2, _0807F42C @ =gTextFlags
|
||||
ldrb r1, [r2]
|
||||
movs r0, 0x2
|
||||
|
||||
@@ -601,7 +601,7 @@ SpawnScriptFieldObject: @ 80CAA34
|
||||
movs r0, 0x12
|
||||
movs r1, 0x8
|
||||
movs r2, 0x7F
|
||||
bl SpawnSpecialFieldObjectParametrized
|
||||
bl SpawnSpecialFieldObjectParameterized
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080CAA84 @ =gMapObjects
|
||||
|
||||
+1746
File diff suppressed because it is too large
Load Diff
+2500
File diff suppressed because it is too large
Load Diff
@@ -1,366 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start hm_prepare_dive_probably
|
||||
hm_prepare_dive_probably: @ 80E5684
|
||||
push {r4-r6,lr}
|
||||
bl GetCursorSelectionMonId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r6, 0x64
|
||||
muls r0, r6
|
||||
ldr r4, _080E56D0 @ =gPlayerParty
|
||||
adds r0, r4
|
||||
movs r1, 0x3A
|
||||
bl GetMonData
|
||||
adds r5, r0, 0
|
||||
lsls r5, 16
|
||||
lsrs r5, 16
|
||||
bl GetCursorSelectionMonId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
muls r0, r6
|
||||
adds r0, r4
|
||||
movs r1, 0x39
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5
|
||||
bl __udivsi3
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r4, r0
|
||||
bhi _080E56D4
|
||||
movs r0, 0
|
||||
b _080E56D6
|
||||
.align 2, 0
|
||||
_080E56D0: .4byte gPlayerParty
|
||||
_080E56D4:
|
||||
movs r0, 0x1
|
||||
_080E56D6:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end hm_prepare_dive_probably
|
||||
|
||||
thumb_func_start sub_80E56DC
|
||||
sub_80E56DC: @ 80E56DC
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080E5718 @ =gUnknown_203B0A0
|
||||
movs r1, 0xA
|
||||
strb r1, [r0, 0xB]
|
||||
ldrb r1, [r0, 0x9]
|
||||
strb r1, [r0, 0xA]
|
||||
bl GetCursorSelectionMonId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1
|
||||
bl sub_811F818
|
||||
movs r0, 0x5
|
||||
bl sub_8121D0C
|
||||
ldr r1, _080E571C @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080E5720 @ =sub_811FB28
|
||||
str r1, [r0]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E5718: .4byte gUnknown_203B0A0
|
||||
_080E571C: .4byte gTasks
|
||||
_080E5720: .4byte sub_811FB28
|
||||
thumb_func_end sub_80E56DC
|
||||
|
||||
thumb_func_start sub_80E5724
|
||||
sub_80E5724: @ 80E5724
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
str r4, [sp, 0x4]
|
||||
ldr r1, _080E575C @ =gUnknown_203B0A0
|
||||
ldrb r7, [r1, 0x9]
|
||||
mov r8, r7
|
||||
ldrb r0, [r1, 0xA]
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0x6
|
||||
bls _080E5768
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0xB]
|
||||
bl sub_8121D0C
|
||||
ldr r1, _080E5760 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080E5764 @ =sub_811FB28
|
||||
str r1, [r0]
|
||||
b _080E57D4
|
||||
.align 2, 0
|
||||
_080E575C: .4byte gUnknown_203B0A0
|
||||
_080E5760: .4byte gTasks
|
||||
_080E5764: .4byte sub_811FB28
|
||||
_080E5768:
|
||||
movs r0, 0x64
|
||||
mov r10, r0
|
||||
mov r0, r10
|
||||
muls r0, r5
|
||||
ldr r1, _080E57A0 @ =gPlayerParty
|
||||
mov r9, r1
|
||||
adds r6, r0, r1
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x39
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
cmp r4, 0
|
||||
beq _080E5796
|
||||
cmp r7, r5
|
||||
beq _080E5796
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x3A
|
||||
bl GetMonData
|
||||
cmp r0, r4
|
||||
bne _080E57A4
|
||||
_080E5796:
|
||||
ldr r0, [sp, 0x4]
|
||||
bl sub_80E5934
|
||||
b _080E57D4
|
||||
.align 2, 0
|
||||
_080E57A0: .4byte gPlayerParty
|
||||
_080E57A4:
|
||||
movs r0, 0x1
|
||||
bl PlaySE
|
||||
mov r1, r10
|
||||
mov r0, r8
|
||||
muls r0, r1
|
||||
add r0, r9
|
||||
movs r1, 0x3A
|
||||
bl GetMonData
|
||||
movs r1, 0x5
|
||||
bl __udivsi3
|
||||
adds r3, r0, 0
|
||||
lsls r3, 16
|
||||
asrs r3, 16
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
ldr r0, _080E57E4 @ =sub_80E57E8
|
||||
str r0, [sp]
|
||||
ldr r0, [sp, 0x4]
|
||||
mov r1, r8
|
||||
bl sub_8120760
|
||||
_080E57D4:
|
||||
add sp, 0x8
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E57E4: .4byte sub_80E57E8
|
||||
thumb_func_end sub_80E5724
|
||||
|
||||
thumb_func_start sub_80E57E8
|
||||
sub_80E57E8: @ 80E57E8
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x1
|
||||
bl PlaySE
|
||||
ldr r5, _080E5830 @ =gUnknown_203B0A0
|
||||
movs r1, 0x9
|
||||
ldrsb r1, [r5, r1]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _080E5834 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x3A
|
||||
bl GetMonData
|
||||
movs r1, 0x5
|
||||
bl __udivsi3
|
||||
adds r3, r0, 0
|
||||
lsls r3, 16
|
||||
asrs r3, 16
|
||||
ldrb r1, [r5, 0xA]
|
||||
ldr r0, _080E5838 @ =sub_80E583C
|
||||
str r0, [sp]
|
||||
adds r0, r4, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8120760
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E5830: .4byte gUnknown_203B0A0
|
||||
_080E5834: .4byte gPlayerParty
|
||||
_080E5838: .4byte sub_80E583C
|
||||
thumb_func_end sub_80E57E8
|
||||
|
||||
thumb_func_start sub_80E583C
|
||||
sub_80E583C: @ 80E583C
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
ldr r0, _080E5884 @ =gUnknown_203B0A0
|
||||
movs r1, 0xA
|
||||
ldrsb r1, [r0, r1]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _080E5888 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
ldr r1, _080E588C @ =gStringVar1
|
||||
bl GetMonNickname
|
||||
ldr r4, _080E5890 @ =gStringVar4
|
||||
ldr r1, _080E5894 @ =gUnknown_8416F27
|
||||
adds r0, r4, 0
|
||||
bl StringExpandPlaceholders
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_81202F8
|
||||
movs r0, 0x2
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r1, _080E5898 @ =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080E589C @ =sub_80E58A0
|
||||
str r1, [r0]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E5884: .4byte gUnknown_203B0A0
|
||||
_080E5888: .4byte gPlayerParty
|
||||
_080E588C: .4byte gStringVar1
|
||||
_080E5890: .4byte gStringVar4
|
||||
_080E5894: .4byte gUnknown_8416F27
|
||||
_080E5898: .4byte gTasks
|
||||
_080E589C: .4byte sub_80E58A0
|
||||
thumb_func_end sub_80E583C
|
||||
|
||||
thumb_func_start sub_80E58A0
|
||||
sub_80E58A0: @ 80E58A0
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_8120370
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _080E58EE
|
||||
ldr r4, _080E58F4 @ =gUnknown_203B0A0
|
||||
movs r0, 0
|
||||
strb r0, [r4, 0xB]
|
||||
ldrb r0, [r4, 0x9]
|
||||
movs r1, 0
|
||||
bl sub_811F818
|
||||
ldrb r0, [r4, 0xA]
|
||||
strb r0, [r4, 0x9]
|
||||
ldrb r0, [r4, 0xA]
|
||||
movs r1, 0x1
|
||||
bl sub_811F818
|
||||
movs r0, 0x6
|
||||
movs r1, 0
|
||||
bl sub_810F4D8
|
||||
movs r0, 0x6
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8121D0C
|
||||
ldr r1, _080E58F8 @ =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080E58FC @ =sub_811FB28
|
||||
str r1, [r0]
|
||||
_080E58EE:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E58F4: .4byte gUnknown_203B0A0
|
||||
_080E58F8: .4byte gTasks
|
||||
_080E58FC: .4byte sub_811FB28
|
||||
thumb_func_end sub_80E58A0
|
||||
|
||||
thumb_func_start sub_80E5900
|
||||
sub_80E5900: @ 80E5900
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8120370
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _080E5926
|
||||
movs r0, 0x5
|
||||
bl sub_8121D0C
|
||||
ldr r0, _080E592C @ =gTasks
|
||||
lsls r1, r4, 2
|
||||
adds r1, r4
|
||||
lsls r1, 3
|
||||
adds r1, r0
|
||||
ldr r0, _080E5930 @ =sub_811FB28
|
||||
str r0, [r1]
|
||||
_080E5926:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E592C: .4byte gTasks
|
||||
_080E5930: .4byte sub_811FB28
|
||||
thumb_func_end sub_80E5900
|
||||
|
||||
thumb_func_start sub_80E5934
|
||||
sub_80E5934: @ 80E5934
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r0, _080E5964 @ =gUnknown_84169F8
|
||||
movs r1, 0
|
||||
bl sub_81202F8
|
||||
movs r0, 0x2
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r1, _080E5968 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080E596C @ =sub_80E5900
|
||||
str r1, [r0]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E5964: .4byte gUnknown_84169F8
|
||||
_080E5968: .4byte gTasks
|
||||
_080E596C: .4byte sub_80E5900
|
||||
thumb_func_end sub_80E5934
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+2945
File diff suppressed because it is too large
Load Diff
+4055
File diff suppressed because it is too large
Load Diff
+1787
File diff suppressed because it is too large
Load Diff
+15
-15
@@ -521,7 +521,7 @@ _080F21B2:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -1277,7 +1277,7 @@ _080F27AC:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -2358,7 +2358,7 @@ sub_80F30A4: @ 80F30A4
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -2436,7 +2436,7 @@ HallOfFame_PrintWelcomeText: @ 80F313C
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -2535,7 +2535,7 @@ _080F322E:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x10
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_080F3252:
|
||||
movs r2, 0
|
||||
ldrb r0, [r7, 0xA]
|
||||
@@ -2606,7 +2606,7 @@ _080F32C4:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldrh r2, [r7, 0x8]
|
||||
ldr r4, _080F3320 @ =0x000001ff
|
||||
adds r0, r4, 0
|
||||
@@ -2676,7 +2676,7 @@ _080F3348:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x80
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, _080F33D4 @ =gUnknown_84160F4
|
||||
add r0, sp, 0xC
|
||||
bl StringCopy
|
||||
@@ -2694,7 +2694,7 @@ _080F3348:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x20
|
||||
movs r3, 0x11
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, _080F33D8 @ =gUnknown_8416104
|
||||
add r0, sp, 0xC
|
||||
bl StringCopy
|
||||
@@ -2711,7 +2711,7 @@ _080F3348:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x60
|
||||
movs r3, 0x11
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_080F33BA:
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
@@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r0, _080F35FC @ =gSaveBlock2Ptr
|
||||
mov r10, r0
|
||||
ldr r1, [r0]
|
||||
@@ -2785,7 +2785,7 @@ sub_80F33DC: @ 80F33DC
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r3, 0x3
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r1, r10
|
||||
ldr r0, [r1]
|
||||
ldrb r4, [r0, 0xA]
|
||||
@@ -2801,7 +2801,7 @@ sub_80F33DC: @ 80F33DC
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0x12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r1, sp, 0x14
|
||||
mov r8, r1
|
||||
ldr r1, _080F3604 @ =0x000186a0
|
||||
@@ -2869,7 +2869,7 @@ sub_80F33DC: @ 80F33DC
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
movs r3, 0x12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r1, r9
|
||||
str r1, [sp]
|
||||
str r7, [sp, 0x4]
|
||||
@@ -2879,7 +2879,7 @@ sub_80F33DC: @ 80F33DC
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0x20
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r5, sp, 0x14
|
||||
mov r0, r10
|
||||
ldr r4, [r0]
|
||||
@@ -2957,7 +2957,7 @@ _080F3582:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r3, 0x20
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
|
||||
+3
-3
@@ -1383,7 +1383,7 @@ sub_8108888: @ 8108888
|
||||
movs r1, 0xA0
|
||||
movs r2, 0x8
|
||||
movs r3, 0x68
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -1439,7 +1439,7 @@ sub_8108908: @ 8108908
|
||||
movs r1, 0x98
|
||||
movs r2, 0x48
|
||||
movs r3, 0x68
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -1469,7 +1469,7 @@ sub_8108940: @ 8108940
|
||||
movs r1, 0xD4
|
||||
movs r2, 0x78
|
||||
movs r3, 0x98
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
|
||||
+3
-3
@@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
|
||||
movs r1, 0x80
|
||||
movs r2, 0x8
|
||||
movs r3, 0x68
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
|
||||
movs r1, 0xD4
|
||||
movs r2, 0x78
|
||||
movs r3, 0x98
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34
|
||||
str r4, [sp, 0xC]
|
||||
str r2, [sp, 0x10]
|
||||
mov r2, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
|
||||
+1
-1
@@ -1936,7 +1936,7 @@ _080E563E:
|
||||
movs r1, 0x3
|
||||
adds r2, r7, 0
|
||||
adds r3, r6, 0
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
|
||||
+5
-5
@@ -3387,7 +3387,7 @@ sub_800AE1C: @ 800AE1C
|
||||
movs r1, 0x3
|
||||
movs r2, 0x2
|
||||
movs r3, 0x5
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r4, [sp]
|
||||
str r5, [sp, 0x4]
|
||||
ldr r0, _0800AECC @ =gUnknown_841DF05
|
||||
@@ -3396,7 +3396,7 @@ sub_800AE1C: @ 800AE1C
|
||||
movs r1, 0x3
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
@@ -3444,7 +3444,7 @@ sub_800AED0: @ 800AED0
|
||||
movs r1, 0x3
|
||||
movs r2, 0x2
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x1
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
@@ -3522,7 +3522,7 @@ _0800AF7A:
|
||||
movs r1, 0x3
|
||||
movs r2, 0x2
|
||||
movs r3, 0x14
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0800AFC4
|
||||
.align 2, 0
|
||||
_0800AF9C: .4byte gWirelessCommType
|
||||
@@ -3541,7 +3541,7 @@ _0800AFA8:
|
||||
movs r1, 0x3
|
||||
movs r2, 0x2
|
||||
movs r3, 0x14
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0800AFC4:
|
||||
ldr r0, _0800B004 @ =gMain
|
||||
movs r2, 0x87
|
||||
|
||||
+1
-1
@@ -7823,7 +7823,7 @@ _08100E0A:
|
||||
str r0, [sp, 0x8]
|
||||
mov r0, r12
|
||||
adds r2, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x10
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
|
||||
+1
-1
@@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0
|
||||
movs r1, 0x3
|
||||
adds r2, r6, 0
|
||||
ldr r3, [sp, 0x14]
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x18
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
|
||||
+2
-2
@@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428
|
||||
str r6, [sp, 0x10]
|
||||
adds r2, r7, 0
|
||||
mov r3, r12
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldrb r1, [r5, 0x3]
|
||||
movs r0, 0x7F
|
||||
ands r0, r1
|
||||
@@ -820,7 +820,7 @@ _08107494:
|
||||
str r6, [sp, 0x10]
|
||||
adds r2, r7, 0
|
||||
mov r3, r12
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
_081074D2:
|
||||
add sp, 0x18
|
||||
pop {r4-r7}
|
||||
|
||||
+3
-3
@@ -811,7 +811,7 @@ _080BF260:
|
||||
str r0, [sp, 0x4]
|
||||
str r5, [sp, 0x8]
|
||||
movs r1, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r1, r8
|
||||
ldr r0, [r1]
|
||||
adds r0, 0xF8
|
||||
@@ -856,7 +856,7 @@ _080BF2CE:
|
||||
str r4, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r5]
|
||||
adds r0, r1, 0
|
||||
adds r0, 0xE9
|
||||
@@ -875,7 +875,7 @@ _080BF2CE:
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
|
||||
+2
-2
@@ -154,7 +154,7 @@ _0810EC62:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x8
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
_0810EC82:
|
||||
add sp, 0x34
|
||||
pop {r4,r5}
|
||||
@@ -303,7 +303,7 @@ sub_810ED80: @ 810ED80
|
||||
movs r1, 0xC2
|
||||
movs r2, 0xC
|
||||
movs r3, 0x94
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
strb r0, [r4, 0xA]
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
|
||||
+15
-15
@@ -639,7 +639,7 @@ _0800C828:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0800C86C @ =gUnknown_8234618
|
||||
bl sub_800D0B4
|
||||
movs r0, 0
|
||||
@@ -670,7 +670,7 @@ _0800C870:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, _0800C8E8 @ =gUnknown_8415A6E
|
||||
@@ -679,7 +679,7 @@ _0800C870:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
bl sub_800CE58
|
||||
ldr r4, _0800C8EC @ =gUnknown_8234620
|
||||
adds r0, r4, 0
|
||||
@@ -725,7 +725,7 @@ _0800C8F0:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, _0800C9B8 @ =gUnknown_8415A6E
|
||||
@@ -734,7 +734,7 @@ _0800C8F0:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x1
|
||||
strh r0, [r6, 0x1C]
|
||||
str r5, [sp]
|
||||
@@ -745,7 +745,7 @@ _0800C8F0:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
bl sub_800CE58
|
||||
ldr r4, _0800C9C0 @ =gUnknown_8234620
|
||||
adds r0, r4, 0
|
||||
@@ -1355,7 +1355,7 @@ sub_800CDF8: @ 800CDF8
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x4
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
@@ -1404,7 +1404,7 @@ sub_800CE70: @ 800CE70
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r1, sp, 0xC
|
||||
movs r2, 0
|
||||
ldr r0, _0800CED0 @ =gSaveBlock2Ptr
|
||||
@@ -1430,7 +1430,7 @@ _0800CE96:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3E
|
||||
movs r3, 0x12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x14
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1455,7 +1455,7 @@ sub_800CED4: @ 800CED4
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x22
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r4, _0800CF38 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r4]
|
||||
ldrh r1, [r0, 0xE]
|
||||
@@ -1479,7 +1479,7 @@ sub_800CED4: @ 800CED4
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3E
|
||||
movs r3, 0x22
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x2C
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -1525,7 +1525,7 @@ _0800CF6A:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x32
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r0, sp, 0xC
|
||||
adds r1, r6, 0
|
||||
movs r2, 0
|
||||
@@ -1541,7 +1541,7 @@ _0800CF6A:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3E
|
||||
movs r3, 0x32
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0800CFAE:
|
||||
add sp, 0x2C
|
||||
pop {r4-r6}
|
||||
@@ -1586,7 +1586,7 @@ _0800CFE2:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x42
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r0, sp, 0xC
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x2
|
||||
@@ -1602,7 +1602,7 @@ _0800CFE2:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3E
|
||||
movs r3, 0x42
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x2C
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
||||
@@ -345,7 +345,7 @@ sub_80F8318: @ 80F8318
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0x2
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
mov r0, r8
|
||||
add sp, 0x14
|
||||
pop {r3,r4}
|
||||
|
||||
+4
-4
@@ -1041,7 +1041,7 @@ PrintTextOnRightSnappedWindow: @ 810F5E8
|
||||
adds r0, r1, 0
|
||||
movs r1, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
cmp r6, 0
|
||||
beq _0810F63E
|
||||
ldrb r0, [r4]
|
||||
@@ -1118,7 +1118,7 @@ _0810F684:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0810F6CE:
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
@@ -1132,7 +1132,7 @@ _0810F6CE:
|
||||
movs r1, 0x1
|
||||
movs r2, 0x4
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
cmp r7, 0
|
||||
beq _0810F6F6
|
||||
ldrb r0, [r6]
|
||||
@@ -1883,7 +1883,7 @@ _0810FC30:
|
||||
adds r0, r7, 0
|
||||
ldr r1, [sp, 0x14]
|
||||
ldr r3, [sp, 0x18]
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ _080BF4B8:
|
||||
adds r1, r7, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
ldr r1, _080BF50C @ =gUnknown_20399CC
|
||||
ldr r0, [sp, 0x34]
|
||||
str r0, [r1]
|
||||
|
||||
@@ -294,8 +294,8 @@ _08133B38: .4byte 0x0000ffff
|
||||
_08133B3C: .4byte gSprites
|
||||
thumb_func_end AddScrollIndicatorArrowPair
|
||||
|
||||
thumb_func_start AddScrollIndicatorArrowPairParametrized
|
||||
AddScrollIndicatorArrowPairParametrized: @ 8133B40
|
||||
thumb_func_start AddScrollIndicatorArrowPairParameterized
|
||||
AddScrollIndicatorArrowPairParameterized: @ 8133B40
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
subs r0, 0x2
|
||||
@@ -345,7 +345,7 @@ _08133B76:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08133BA0: .4byte gUnknown_203B130
|
||||
thumb_func_end AddScrollIndicatorArrowPairParametrized
|
||||
thumb_func_end AddScrollIndicatorArrowPairParameterized
|
||||
|
||||
thumb_func_start sub_8133BA4
|
||||
sub_8133BA4: @ 8133BA4
|
||||
|
||||
+4
-4
@@ -980,7 +980,7 @@ _0809E156:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -3657,7 +3657,7 @@ _0809F5EE:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x68
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0809F614:
|
||||
add sp, 0x10
|
||||
pop {r4,r5}
|
||||
@@ -4196,7 +4196,7 @@ _0809FA12:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -4317,7 +4317,7 @@ sub_809FAE4: @ 809FAE4
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
|
||||
@@ -725,8 +725,8 @@ sub_80F6CBC: @ 80F6CBC
|
||||
bx r1
|
||||
thumb_func_end sub_80F6CBC
|
||||
|
||||
thumb_func_start AddTextPrinterParametrized
|
||||
AddTextPrinterParametrized: @ 80F6CD0
|
||||
thumb_func_start AddTextPrinterParameterized2
|
||||
AddTextPrinterParameterized2: @ 80F6CD0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -796,7 +796,7 @@ AddTextPrinterParametrized: @ 80F6CD0
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080F6D58: .4byte gTextFlags
|
||||
thumb_func_end AddTextPrinterParametrized
|
||||
thumb_func_end AddTextPrinterParameterized2
|
||||
|
||||
thumb_func_start sub_80F6D5C
|
||||
sub_80F6D5C: @ 80F6D5C
|
||||
@@ -832,7 +832,7 @@ sub_80F6D5C: @ 80F6D5C
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x4
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _080F6DFC
|
||||
.align 2, 0
|
||||
_080F6DA8: .4byte gTextFlags
|
||||
@@ -853,7 +853,7 @@ _080F6DB0:
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x5
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _080F6DFC
|
||||
.align 2, 0
|
||||
_080F6DD8: .4byte gStringVar4
|
||||
@@ -871,7 +871,7 @@ _080F6DDC:
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
_080F6DFC:
|
||||
add sp, 0x10
|
||||
pop {r4,r5}
|
||||
@@ -910,7 +910,7 @@ sub_80F6E08: @ 80F6E08
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -948,7 +948,7 @@ sub_80F6E54: @ 80F6E54
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
+1978
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -409,7 +409,7 @@ sub_8088680: @ 8088680
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x2
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
@@ -906,7 +906,7 @@ _08088A72:
|
||||
movs r1, 0x2
|
||||
mov r2, r8
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _08088ADE
|
||||
.align 2, 0
|
||||
_08088A94: .4byte gUnknown_83CC354
|
||||
@@ -940,7 +940,7 @@ _08088A9C:
|
||||
movs r1, 0x2
|
||||
mov r2, r8
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_08088ADE:
|
||||
movs r0, 0x1
|
||||
bl PutWindowTilemap
|
||||
|
||||
+9
-9
@@ -5084,7 +5084,7 @@ _0812110E:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
movs r3, 0x1
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r4, 0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0
|
||||
@@ -5141,7 +5141,7 @@ _08121194:
|
||||
movs r1, 0
|
||||
adds r2, r5, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _08121224
|
||||
.align 2, 0
|
||||
_081211E0: .4byte gUnknown_845A108
|
||||
@@ -5172,7 +5172,7 @@ _081211F0:
|
||||
movs r1, 0
|
||||
adds r2, r5, 0
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_08121224:
|
||||
adds r0, r6, 0
|
||||
bl PutWindowTilemap
|
||||
@@ -5778,7 +5778,7 @@ sub_8121704: @ 8121704
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0
|
||||
adds r2, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -6486,7 +6486,7 @@ _08121CAA:
|
||||
ldr r1, [r1]
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_08121CD0:
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
@@ -6831,7 +6831,7 @@ _08121F3C:
|
||||
str r1, [sp, 0x10]
|
||||
movs r1, 0x2
|
||||
mov r2, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -6903,7 +6903,7 @@ sub_8121FC0: @ 8121FC0
|
||||
movs r0, 0x6
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -7005,7 +7005,7 @@ sub_8122084: @ 8122084
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x4
|
||||
adds r2, r5, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -7121,7 +7121,7 @@ _0812217A:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3
|
||||
movs r3, 0x6
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldrb r0, [r4, 0xE]
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
|
||||
+326
@@ -0,0 +1,326 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80B1620
|
||||
sub_80B1620: @ 80B1620
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, _080B1674 @ =gBattleAnimArgs
|
||||
movs r1, 0x6
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080B1636
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl StartSpriteAnim
|
||||
_080B1636:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldrh r0, [r4, 0x4]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r4, _080B1678 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080B167C @ =0x0000ffe2
|
||||
strh r0, [r5, 0x38]
|
||||
adds r0, r5, 0
|
||||
bl sub_8075068
|
||||
ldr r0, _080B1680 @ =sub_80B1684
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B1674: .4byte gBattleAnimArgs
|
||||
_080B1678: .4byte gBattleAnimTarget
|
||||
_080B167C: .4byte 0x0000ffe2
|
||||
_080B1680: .4byte sub_80B1684
|
||||
thumb_func_end sub_80B1620
|
||||
|
||||
thumb_func_start sub_80B1684
|
||||
sub_80B1684: @ 80B1684
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl AnimateBallThrow
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B1698
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B1698:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B1684
|
||||
|
||||
thumb_func_start sub_80B16A0
|
||||
sub_80B16A0: @ 80B16A0
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080B1714 @ =gBattleAnimArgs
|
||||
movs r1, 0x6
|
||||
ldrsh r0, [r5, r1]
|
||||
cmp r0, 0
|
||||
bne _080B16B8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl StartSpriteAnim
|
||||
_080B16B8:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075160
|
||||
ldr r0, _080B1718 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
mov r6, sp
|
||||
adds r6, 0x2
|
||||
movs r1, 0x1
|
||||
mov r2, sp
|
||||
adds r3, r6, 0
|
||||
bl sub_8076D9C
|
||||
ldr r0, _080B171C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B16E6
|
||||
ldrh r0, [r5, 0x8]
|
||||
negs r0, r0
|
||||
strh r0, [r5, 0x8]
|
||||
_080B16E6:
|
||||
ldrh r0, [r5, 0x4]
|
||||
strh r0, [r4, 0x2E]
|
||||
mov r1, sp
|
||||
ldrh r0, [r5, 0x8]
|
||||
ldrh r1, [r1]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x32]
|
||||
ldrh r0, [r5, 0xA]
|
||||
ldrh r6, [r6]
|
||||
adds r0, r6
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, _080B1720 @ =0x0000ffe2
|
||||
strh r0, [r4, 0x38]
|
||||
adds r0, r4, 0
|
||||
bl sub_8075068
|
||||
ldr r0, _080B1724 @ =sub_80B1728
|
||||
str r0, [r4, 0x1C]
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B1714: .4byte gBattleAnimArgs
|
||||
_080B1718: .4byte gBattleAnimTarget
|
||||
_080B171C: .4byte gBattleAnimAttacker
|
||||
_080B1720: .4byte 0x0000ffe2
|
||||
_080B1724: .4byte sub_80B1728
|
||||
thumb_func_end sub_80B16A0
|
||||
|
||||
thumb_func_start sub_80B1728
|
||||
sub_80B1728: @ 80B1728
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl AnimateBallThrow
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B173C
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B173C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B1728
|
||||
|
||||
thumb_func_start sub_80B1744
|
||||
sub_80B1744: @ 80B1744
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080B1790 @ =gBattleAnimArgs
|
||||
ldrh r0, [r5, 0x4]
|
||||
strh r0, [r4, 0x2E]
|
||||
ldrh r0, [r4, 0x20]
|
||||
strh r0, [r4, 0x30]
|
||||
ldrh r1, [r5]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x32]
|
||||
ldrh r0, [r4, 0x22]
|
||||
strh r0, [r4, 0x34]
|
||||
ldrh r1, [r5, 0x2]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
adds r0, r4, 0
|
||||
bl sub_80754B8
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x4
|
||||
ldrsh r1, [r5, r2]
|
||||
bl __divsi3
|
||||
strh r0, [r4, 0x38]
|
||||
movs r1, 0x32
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x4
|
||||
ldrsh r1, [r5, r2]
|
||||
bl __divsi3
|
||||
strh r0, [r4, 0x3A]
|
||||
ldr r0, _080B1794 @ =sub_80B1798
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B1790: .4byte gBattleAnimArgs
|
||||
_080B1794: .4byte sub_80B1798
|
||||
thumb_func_end sub_80B1744
|
||||
|
||||
thumb_func_start sub_80B1798
|
||||
sub_80B1798: @ 80B1798
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8074D00
|
||||
ldrh r0, [r4, 0x30]
|
||||
ldrh r1, [r4, 0x38]
|
||||
subs r0, r1
|
||||
strh r0, [r4, 0x30]
|
||||
ldrh r0, [r4, 0x32]
|
||||
ldrh r1, [r4, 0x3A]
|
||||
subs r0, r1
|
||||
strh r0, [r4, 0x32]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080B17BE
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_080B17BE:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80B1798
|
||||
|
||||
thumb_func_start sub_80B17C4
|
||||
sub_80B17C4: @ 80B17C4
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _080B1824 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x20
|
||||
adds r3, r4, 0
|
||||
adds r3, 0x22
|
||||
movs r1, 0x1
|
||||
bl sub_8076D9C
|
||||
ldr r0, _080B1828 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B17F0
|
||||
ldr r1, _080B182C @ =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
negs r0, r0
|
||||
strh r0, [r1]
|
||||
_080B17F0:
|
||||
ldr r0, _080B182C @ =gBattleAnimArgs
|
||||
ldrh r2, [r0]
|
||||
ldrh r1, [r4, 0x20]
|
||||
adds r2, r1
|
||||
strh r2, [r4, 0x20]
|
||||
ldrh r1, [r0, 0x2]
|
||||
ldrh r3, [r4, 0x22]
|
||||
adds r1, r3
|
||||
strh r1, [r4, 0x22]
|
||||
ldrh r3, [r0, 0x8]
|
||||
strh r3, [r4, 0x2E]
|
||||
ldrh r0, [r0, 0x4]
|
||||
adds r2, r0
|
||||
strh r2, [r4, 0x32]
|
||||
adds r1, r3
|
||||
strh r1, [r4, 0x36]
|
||||
ldr r0, _080B1830 @ =sub_8075590
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080B1834 @ =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B1824: .4byte gBattleAnimTarget
|
||||
_080B1828: .4byte gBattleAnimAttacker
|
||||
_080B182C: .4byte gBattleAnimArgs
|
||||
_080B1830: .4byte sub_8075590
|
||||
_080B1834: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B17C4
|
||||
|
||||
thumb_func_start sub_80B1838
|
||||
sub_80B1838: @ 80B1838
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r5, _080B1850 @ =gBattleAnimArgs
|
||||
movs r1, 0x4
|
||||
ldrsh r0, [r5, r1]
|
||||
cmp r0, 0
|
||||
bne _080B1854
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8075114
|
||||
b _080B188A
|
||||
.align 2, 0
|
||||
_080B1850: .4byte gBattleAnimArgs
|
||||
_080B1854:
|
||||
ldr r0, _080B1894 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x20
|
||||
adds r3, r4, 0
|
||||
adds r3, 0x22
|
||||
movs r1, 0x1
|
||||
bl sub_8076D9C
|
||||
ldr r0, _080B1898 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B187A
|
||||
ldrh r0, [r5]
|
||||
negs r0, r0
|
||||
strh r0, [r5]
|
||||
_080B187A:
|
||||
ldrh r0, [r5]
|
||||
ldrh r1, [r4, 0x20]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x20]
|
||||
ldrh r0, [r5, 0x2]
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x22]
|
||||
_080B188A:
|
||||
ldr r0, _080B189C @ =sub_80B18A0
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B1894: .4byte gBattleAnimTarget
|
||||
_080B1898: .4byte gBattleAnimAttacker
|
||||
_080B189C: .4byte sub_80B18A0
|
||||
thumb_func_end sub_80B1838
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+12
-12
@@ -432,7 +432,7 @@ sub_804AC94: @ 804AC94
|
||||
strh r7, [r6, 0x38]
|
||||
ldr r0, _0804ACF4 @ =sub_804AD00
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r5, _0804ACF8 @ =gUnknown_2023D44
|
||||
ldr r5, _0804ACF8 @ =gBattlerSpriteIds
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r6, r1]
|
||||
adds r0, r5
|
||||
@@ -468,7 +468,7 @@ _0804ACEE:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804ACF4: .4byte sub_804AD00
|
||||
_0804ACF8: .4byte gUnknown_2023D44
|
||||
_0804ACF8: .4byte gBattlerSpriteIds
|
||||
_0804ACFC: .4byte gSprites
|
||||
thumb_func_end sub_804AC94
|
||||
|
||||
@@ -487,7 +487,7 @@ sub_804AD00: @ 804AD00
|
||||
bl PlaySE
|
||||
_0804AD18:
|
||||
ldr r6, _0804AD64 @ =gSprites
|
||||
ldr r5, _0804AD68 @ =gUnknown_2023D44
|
||||
ldr r5, _0804AD68 @ =gBattlerSpriteIds
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r4, r1]
|
||||
adds r0, r5
|
||||
@@ -525,7 +525,7 @@ _0804AD18:
|
||||
b _0804AD90
|
||||
.align 2, 0
|
||||
_0804AD64: .4byte gSprites
|
||||
_0804AD68: .4byte gUnknown_2023D44
|
||||
_0804AD68: .4byte gBattlerSpriteIds
|
||||
_0804AD6C: .4byte sub_804AD98
|
||||
_0804AD70:
|
||||
ldrh r0, [r1, 0x30]
|
||||
@@ -1363,7 +1363,7 @@ _0804B3F2:
|
||||
strh r7, [r1, 0x10]
|
||||
strh r2, [r1, 0x26]
|
||||
_0804B420:
|
||||
ldr r5, _0804B47C @ =gUnknown_2023D44
|
||||
ldr r5, _0804B47C @ =gBattlerSpriteIds
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r6, r1]
|
||||
adds r0, r5
|
||||
@@ -1405,7 +1405,7 @@ _0804B420:
|
||||
.align 2, 0
|
||||
_0804B474: .4byte Task_PlayCryWhenReleasedFromBall
|
||||
_0804B478: .4byte gTasks
|
||||
_0804B47C: .4byte gUnknown_2023D44
|
||||
_0804B47C: .4byte gBattlerSpriteIds
|
||||
_0804B480: .4byte gSprites
|
||||
thumb_func_end sub_804B268
|
||||
|
||||
@@ -1437,7 +1437,7 @@ HandleBallAnimEnd: @ 804B4A4
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r4, _0804B508 @ =gSprites
|
||||
ldr r0, _0804B50C @ =gUnknown_2023D44
|
||||
ldr r0, _0804B50C @ =gBattlerSpriteIds
|
||||
adds r3, r6, r0
|
||||
ldrb r1, [r3]
|
||||
lsls r0, r1, 4
|
||||
@@ -1482,7 +1482,7 @@ _0804B4E6:
|
||||
b _0804B52C
|
||||
.align 2, 0
|
||||
_0804B508: .4byte gSprites
|
||||
_0804B50C: .4byte gUnknown_2023D44
|
||||
_0804B50C: .4byte gBattlerSpriteIds
|
||||
_0804B510:
|
||||
ldr r2, _0804B5B4 @ =0xfffffee0
|
||||
adds r0, r2, 0
|
||||
@@ -1509,7 +1509,7 @@ _0804B52C:
|
||||
cmp r7, 0
|
||||
beq _0804B5AE
|
||||
ldr r2, _0804B5B8 @ =gSprites
|
||||
ldr r0, _0804B5BC @ =gUnknown_2023D44
|
||||
ldr r0, _0804B5BC @ =gBattlerSpriteIds
|
||||
adds r0, r6, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -1571,7 +1571,7 @@ _0804B5AE:
|
||||
.align 2, 0
|
||||
_0804B5B4: .4byte 0xfffffee0
|
||||
_0804B5B8: .4byte gSprites
|
||||
_0804B5BC: .4byte gUnknown_2023D44
|
||||
_0804B5BC: .4byte gBattlerSpriteIds
|
||||
_0804B5C0: .4byte gUnknown_2024005
|
||||
_0804B5C4: .4byte gUnknown_2024018
|
||||
thumb_func_end HandleBallAnimEnd
|
||||
@@ -1607,7 +1607,7 @@ _0804B600:
|
||||
cmp r1, r0
|
||||
bne _0804B666
|
||||
ldr r5, _0804B670 @ =gSprites
|
||||
ldr r4, _0804B674 @ =gUnknown_2023D44
|
||||
ldr r4, _0804B674 @ =gBattlerSpriteIds
|
||||
movs r1, 0x3A
|
||||
ldrsh r0, [r6, r1]
|
||||
adds r0, r4
|
||||
@@ -1658,7 +1658,7 @@ _0804B666:
|
||||
.align 2, 0
|
||||
_0804B66C: .4byte 0x0000013b
|
||||
_0804B670: .4byte gSprites
|
||||
_0804B674: .4byte gUnknown_2023D44
|
||||
_0804B674: .4byte gBattlerSpriteIds
|
||||
_0804B678: .4byte gMain
|
||||
_0804B67C: .4byte 0x00000439
|
||||
_0804B680: .4byte gUnknown_2024018
|
||||
|
||||
@@ -4266,7 +4266,7 @@ _08104852:
|
||||
adds r0, r7, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x18
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
|
||||
@@ -6116,7 +6116,7 @@ sub_814A84C: @ 814A84C
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r0, sp, 0xC
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -6126,7 +6126,7 @@ sub_814A84C: @ 814A84C
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -6582,7 +6582,7 @@ sub_814AB98: @ 814AB98
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, [r6]
|
||||
adds r0, 0x1C
|
||||
add r0, r8
|
||||
@@ -7950,7 +7950,7 @@ sub_814B5C4: @ 814B5C4
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
movs r7, 0
|
||||
mov r8, r4
|
||||
movs r1, 0xFF
|
||||
@@ -7980,7 +7980,7 @@ _0814B63E:
|
||||
mov r0, r8
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
ldr r0, [sp, 0x2C]
|
||||
ldm r0!, {r1}
|
||||
str r0, [sp, 0x2C]
|
||||
@@ -8007,7 +8007,7 @@ _0814B63E:
|
||||
mov r0, r8
|
||||
movs r1, 0x2
|
||||
adds r2, r5, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
movs r0, 0xE0
|
||||
lsls r0, 20
|
||||
add r9, r0
|
||||
|
||||
@@ -1918,7 +1918,7 @@ _0811D4A2:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
_0811D4C2:
|
||||
add sp, 0x14
|
||||
pop {r3,r4}
|
||||
@@ -4548,7 +4548,7 @@ _0811E880:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
lsls r0, r7, 1
|
||||
mov r4, sp
|
||||
adds r4, r0
|
||||
@@ -4571,7 +4571,7 @@ _0811E8BA:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x38
|
||||
adds r3, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
strb r0, [r6]
|
||||
movs r0, 0
|
||||
@@ -4604,7 +4604,7 @@ _0811E8F4:
|
||||
mov r0, r8
|
||||
movs r1, 0x2
|
||||
adds r3, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r7, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
@@ -4725,7 +4725,7 @@ _0811E9C0:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r4, 0x38
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -4739,7 +4739,7 @@ _0811E9C0:
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r6, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
|
||||
@@ -807,7 +807,7 @@ _0808BF3C:
|
||||
str r1, [sp, 0x10]
|
||||
movs r1, 0x1
|
||||
movs r3, 0x2
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r0, [sp, 0x50]
|
||||
mov r10, r4
|
||||
cmp r0, 0x6
|
||||
@@ -960,7 +960,7 @@ sub_808BFE0: @ 808BFE0
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
lsrs r5, 1
|
||||
adds r0, r7, 0
|
||||
ldr r1, [sp, 0x24]
|
||||
@@ -1442,7 +1442,7 @@ _0808C3E0:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0xFF
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -1549,7 +1549,7 @@ _0808C4CE:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _0808C69C
|
||||
.align 2, 0
|
||||
_0808C504: .4byte gMain
|
||||
@@ -1725,7 +1725,7 @@ _0808C66E:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
strh r4, [r5, 0x8]
|
||||
b _0808C69C
|
||||
.align 2, 0
|
||||
@@ -22054,7 +22054,7 @@ _080966BA:
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
movs r3, 0x2
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
add sp, 0x14
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
@@ -4808,7 +4808,7 @@ sub_8136DA4: @ 8136DA4
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
@@ -4853,7 +4853,7 @@ sub_8136DF0: @ 8136DF0
|
||||
adds r0, r1, 0
|
||||
movs r1, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
@@ -4904,7 +4904,7 @@ sub_8136E50: @ 8136E50
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_08136E9A:
|
||||
ldr r2, [r6]
|
||||
adds r0, r2, r7
|
||||
@@ -4920,7 +4920,7 @@ _08136E9A:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x28
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, [r6]
|
||||
ldr r3, _08136F04 @ =0x00003290
|
||||
adds r0, r3
|
||||
@@ -4941,7 +4941,7 @@ _08136E9A:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x69
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _08136F28
|
||||
.align 2, 0
|
||||
_08136EEC: .4byte gUnknown_203B140
|
||||
@@ -4965,7 +4965,7 @@ _08136F0C:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x69
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_08136F28:
|
||||
ldr r0, _08136F44 @ =gUnknown_203B140
|
||||
ldr r0, [r0]
|
||||
@@ -5053,7 +5053,7 @@ sub_8136FB0: @ 8136FB0
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2F
|
||||
movs r3, 0x13
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r3, [r6]
|
||||
movs r1, 0xC8
|
||||
lsls r1, 6
|
||||
@@ -5077,7 +5077,7 @@ sub_8136FB0: @ 8136FB0
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x5
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r6]
|
||||
ldr r2, _08137064 @ =0x00003003
|
||||
adds r0, r1, r2
|
||||
@@ -5090,7 +5090,7 @@ sub_8136FB0: @ 8136FB0
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2F
|
||||
movs r3, 0x31
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r6]
|
||||
ldr r2, _08137064 @ =0x00003003
|
||||
adds r0, r1, r2
|
||||
@@ -5103,7 +5103,7 @@ sub_8136FB0: @ 8136FB0
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2F
|
||||
movs r3, 0x40
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r6]
|
||||
ldr r2, _08137064 @ =0x00003003
|
||||
adds r0, r1, r2
|
||||
@@ -5116,7 +5116,7 @@ sub_8136FB0: @ 8136FB0
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2F
|
||||
movs r3, 0x4F
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _081370CA
|
||||
.align 2, 0
|
||||
_08137060: .4byte gUnknown_203B140
|
||||
@@ -5167,7 +5167,7 @@ _081370A6:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x7
|
||||
movs r3, 0x2D
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_081370CA:
|
||||
add sp, 0xC
|
||||
pop {r4-r7}
|
||||
@@ -5212,7 +5212,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x4
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5230,7 +5230,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x16
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5248,7 +5248,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x23
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5266,7 +5266,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x30
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5284,7 +5284,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x3D
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5302,7 +5302,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x4A
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
@@ -5320,7 +5320,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x57
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r2, r9
|
||||
ldr r3, [r2]
|
||||
adds r4, r3, r4
|
||||
@@ -5338,7 +5338,7 @@ sub_81370EC: @ 81370EC
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0x64
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0xC
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
@@ -5406,7 +5406,7 @@ _081372B0:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3
|
||||
movs r3, 0x75
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_081372CE:
|
||||
add sp, 0xC
|
||||
pop {r4}
|
||||
@@ -5490,7 +5490,7 @@ _0813733E:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3
|
||||
mov r3, r12
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r1, r10
|
||||
ldr r0, [r1]
|
||||
ldr r2, _081373A4 @ =0x00003258
|
||||
@@ -5577,7 +5577,7 @@ _081373EA:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x24
|
||||
mov r3, r8
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r0, r10
|
||||
ldr r3, [r0]
|
||||
adds r4, r3, r4
|
||||
@@ -5603,7 +5603,7 @@ _081373EA:
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
mov r3, r8
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r0, r10
|
||||
ldr r1, [r0]
|
||||
ldr r2, _081374DC @ =0x00003258
|
||||
@@ -5623,7 +5623,7 @@ _081373EA:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x3A
|
||||
mov r3, r8
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r0, r10
|
||||
ldr r3, [r0]
|
||||
ldr r1, _081374C8 @ =0x00003003
|
||||
@@ -5645,7 +5645,7 @@ _081373EA:
|
||||
str r3, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
mov r3, r8
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_081374B4:
|
||||
add sp, 0x10
|
||||
pop {r3-r5}
|
||||
@@ -5928,7 +5928,7 @@ _081376E6:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0xD4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -6052,7 +6052,7 @@ _081377F6:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
b _0813792C
|
||||
.align 2, 0
|
||||
_08137820: .4byte gUnknown_8419782
|
||||
@@ -6176,7 +6176,7 @@ _08137906:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
_0813792C:
|
||||
add sp, 0xD4
|
||||
pop {r4-r6}
|
||||
@@ -6341,7 +6341,7 @@ _08137A46:
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
add sp, 0x14
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -6377,7 +6377,7 @@ sub_8137A90: @ 8137A90
|
||||
movs r1, 0x2
|
||||
movs r2, 0x1A
|
||||
movs r3, 0x7
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
mov r1, r8
|
||||
ldr r0, [r1]
|
||||
adds r0, r6
|
||||
@@ -6389,7 +6389,7 @@ sub_8137A90: @ 8137A90
|
||||
movs r1, 0x2
|
||||
movs r2, 0x1A
|
||||
movs r3, 0x14
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -6444,7 +6444,7 @@ _08137B1C:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x39
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r3, [r7]
|
||||
adds r0, r3, r4
|
||||
ldrb r0, [r0]
|
||||
@@ -6461,7 +6461,7 @@ _08137B1C:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x39
|
||||
movs r3, 0xF
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r2, [r7]
|
||||
adds r4, r2, r4
|
||||
ldrb r0, [r4]
|
||||
@@ -6486,7 +6486,7 @@ _08137B1C:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x7
|
||||
movs r3, 0x2A
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
_08137B9E:
|
||||
add sp, 0x14
|
||||
pop {r3}
|
||||
@@ -6569,7 +6569,7 @@ sub_8137C18: @ 8137C18
|
||||
movs r1, 0x2
|
||||
movs r2, 0x42
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r5]
|
||||
adds r4, r1, r4
|
||||
ldrb r0, [r4]
|
||||
@@ -6582,7 +6582,7 @@ sub_8137C18: @ 8137C18
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0xF
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -9875,7 +9875,7 @@ _081396A8:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x7
|
||||
movs r3, 0x2A
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
|
||||
+2180
File diff suppressed because it is too large
Load Diff
+6
-6
@@ -1600,7 +1600,7 @@ _080C0B44:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
@@ -1718,7 +1718,7 @@ sub_80C0BB0: @ 80C0BB0
|
||||
movs r1, 0x2
|
||||
movs r2, 0xC
|
||||
movs r3, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x1
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
@@ -3737,7 +3737,7 @@ _080C1CA8:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x4
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
bl sub_80C3580
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -3750,7 +3750,7 @@ _080C1CA8:
|
||||
movs r1, 0x2
|
||||
movs r2, 0x2
|
||||
movs r3, 0xE
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x2
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@@ -9815,7 +9815,7 @@ _080C4E48:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x3
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@@ -9860,7 +9860,7 @@ _080C4EA4:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x4
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
|
||||
@@ -678,7 +678,7 @@ _08077CD2:
|
||||
adds r1, r4, 0
|
||||
mov r2, r8
|
||||
bl CreateSprite
|
||||
ldr r4, _08077D9C @ =gUnknown_2023D44
|
||||
ldr r4, _08077D9C @ =gBattlerSpriteIds
|
||||
adds r4, r7, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _08077DA0 @ =gSprites
|
||||
@@ -735,7 +735,7 @@ _08077CD2:
|
||||
_08077D90: .4byte gBattlerPartyIndexes
|
||||
_08077D94: .4byte gEnemyParty
|
||||
_08077D98: .4byte gMultiuseSpriteTemplate
|
||||
_08077D9C: .4byte gUnknown_2023D44
|
||||
_08077D9C: .4byte gBattlerSpriteIds
|
||||
_08077DA0: .4byte gSprites
|
||||
_08077DA4: .4byte SpriteCallbackDummy
|
||||
_08077DA8: .4byte gBattleMonForms
|
||||
@@ -820,7 +820,7 @@ _08077E54:
|
||||
movs r1, 0x50
|
||||
adds r2, r4, 0
|
||||
bl CreateSprite
|
||||
ldr r3, _08077E9C @ =gUnknown_2023D44
|
||||
ldr r3, _08077E9C @ =gBattlerSpriteIds
|
||||
strb r0, [r3]
|
||||
ldr r4, _08077EA0 @ =gSprites
|
||||
ldrb r0, [r3]
|
||||
@@ -851,7 +851,7 @@ _08077E54:
|
||||
.align 2, 0
|
||||
_08077E94: .4byte gMultiuseSpriteTemplate
|
||||
_08077E98: .4byte gUnknown_8239F8C
|
||||
_08077E9C: .4byte gUnknown_2023D44
|
||||
_08077E9C: .4byte gBattlerSpriteIds
|
||||
_08077EA0: .4byte gSprites
|
||||
_08077EA4: .4byte SpriteCallbackDummy
|
||||
_08077EA8:
|
||||
@@ -904,7 +904,7 @@ _08077EA8:
|
||||
adds r1, r4, 0
|
||||
mov r2, r8
|
||||
bl CreateSprite
|
||||
ldr r4, _08077FD0 @ =gUnknown_2023D44
|
||||
ldr r4, _08077FD0 @ =gBattlerSpriteIds
|
||||
adds r4, r7, r4
|
||||
strb r0, [r4]
|
||||
ldr r5, _08077FD4 @ =gSprites
|
||||
@@ -958,7 +958,7 @@ _08077EA8:
|
||||
bl StartSpriteAnim
|
||||
_08077F84:
|
||||
ldr r1, _08077FD4 @ =gSprites
|
||||
ldr r0, _08077FD0 @ =gUnknown_2023D44
|
||||
ldr r0, _08077FD0 @ =gBattlerSpriteIds
|
||||
adds r0, r7, r0
|
||||
ldrb r0, [r0]
|
||||
lsls r2, r0, 4
|
||||
@@ -993,7 +993,7 @@ _08077FB4:
|
||||
_08077FC4: .4byte gBattlerPartyIndexes
|
||||
_08077FC8: .4byte gPlayerParty
|
||||
_08077FCC: .4byte gMultiuseSpriteTemplate
|
||||
_08077FD0: .4byte gUnknown_2023D44
|
||||
_08077FD0: .4byte gBattlerSpriteIds
|
||||
_08077FD4: .4byte gSprites
|
||||
_08077FD8: .4byte SpriteCallbackDummy
|
||||
_08077FDC: .4byte gBattleMonForms
|
||||
|
||||
+1558
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -578,7 +578,7 @@ _0809CD82:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
b _0809CDE0
|
||||
.align 2, 0
|
||||
_0809CDAC: .4byte gUnknown_83E0738
|
||||
@@ -603,7 +603,7 @@ _0809CDB0:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
_0809CDE0:
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
@@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+2
-2
@@ -1510,7 +1510,7 @@ _0809B6C4:
|
||||
movs r2, 0x8
|
||||
movs r3, 0x58
|
||||
_0809B6E2:
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
lsls r0, 3
|
||||
ldrb r2, [r4, 0x17]
|
||||
movs r1, 0x7
|
||||
@@ -1542,7 +1542,7 @@ sub_809B6FC: @ 809B6FC
|
||||
movs r1, 0x98
|
||||
movs r2, 0x48
|
||||
movs r3, 0x68
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
lsls r0, 3
|
||||
ldrb r2, [r4, 0x17]
|
||||
movs r1, 0x7
|
||||
|
||||
+2
-2
@@ -3603,7 +3603,7 @@ _081411D0:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r1, 0x83
|
||||
@@ -4228,7 +4228,7 @@ sub_81417E4: @ 81417E4
|
||||
movs r0, 0
|
||||
adds r2, r4, 0
|
||||
movs r3, 0x1
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
add sp, 0x14
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
+9
-9
@@ -1908,7 +1908,7 @@ _0806FC14:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
movs r3, 0xFF
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
movs r0, 0
|
||||
movs r1, 0x8
|
||||
movs r2, 0xF
|
||||
@@ -2043,7 +2043,7 @@ sub_806FCF4: @ 806FCF4
|
||||
str r4, [sp, 0x8]
|
||||
movs r1, 0x2
|
||||
movs r3, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
adds r2, r6, 0
|
||||
@@ -2058,7 +2058,7 @@ sub_806FCF4: @ 806FCF4
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0xE
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x2
|
||||
@@ -2077,7 +2077,7 @@ sub_806FCF4: @ 806FCF4
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0x1C
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x4
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x2
|
||||
@@ -2091,7 +2091,7 @@ sub_806FCF4: @ 806FCF4
|
||||
movs r1, 0
|
||||
movs r2, 0x3C
|
||||
movs r3, 0x1C
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r7, 0x2A
|
||||
ldr r0, _0806FE78 @ =0x00000829
|
||||
bl FlagGet
|
||||
@@ -2108,7 +2108,7 @@ sub_806FCF4: @ 806FCF4
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2A
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x2
|
||||
@@ -2121,7 +2121,7 @@ sub_806FCF4: @ 806FCF4
|
||||
movs r1, 0
|
||||
movs r2, 0x3C
|
||||
movs r3, 0x2A
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r7, 0x38
|
||||
_0806FE0A:
|
||||
ldrb r0, [r5]
|
||||
@@ -2133,7 +2133,7 @@ _0806FE0A:
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x2
|
||||
@@ -2146,7 +2146,7 @@ _0806FE0A:
|
||||
movs r1, 0
|
||||
movs r2, 0x3C
|
||||
adds r3, r7, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ sub_815B1DC: @ 815B1DC
|
||||
movs r0, 0
|
||||
movs r1, 0x4
|
||||
adds r2, r4, 0
|
||||
bl AddTextPrinterParametrized
|
||||
bl AddTextPrinterParameterized2
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
+4
-4
@@ -4827,7 +4827,7 @@ _0804ECEC:
|
||||
str r0, [sp, 0x8]
|
||||
adds r0, r5, 0
|
||||
movs r3, 0x4
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r6, sp, 0x28
|
||||
adds r0, r6, 0
|
||||
ldr r1, [sp, 0x60]
|
||||
@@ -4847,7 +4847,7 @@ _0804ECEC:
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r5, 0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r5, 0
|
||||
@@ -5110,7 +5110,7 @@ sub_804EFB4: @ 804EFB4
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
movs r3, 0x4
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r4, 0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0
|
||||
@@ -14989,7 +14989,7 @@ sub_8054508: @ 8054508
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl AddTextPrinterParametrized2
|
||||
bl AddTextPrinterParameterized4
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
|
||||
+35
-35
@@ -1856,7 +1856,7 @@ sub_8089EEC: @ 8089EEC
|
||||
add r0, sp, 0xC
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x4C
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1908,7 +1908,7 @@ sub_8089F78: @ 8089F78
|
||||
add r0, sp, 0xC
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x2C
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1972,7 +1972,7 @@ sub_8089FEC: @ 8089FEC
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x14
|
||||
movs r3, 0x38
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
add r0, sp, 0xC
|
||||
@@ -1981,7 +1981,7 @@ sub_8089FEC: @ 8089FEC
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
movs r3, 0x38
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0808A0CA
|
||||
.align 2, 0
|
||||
_0808A068: .4byte gUnknown_8419CED
|
||||
@@ -2015,7 +2015,7 @@ _0808A080:
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0x39
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
add r1, sp, 0xC
|
||||
@@ -2024,7 +2024,7 @@ _0808A080:
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
movs r3, 0x39
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A0CA:
|
||||
add sp, 0x18
|
||||
pop {r4-r7}
|
||||
@@ -2108,7 +2108,7 @@ _0808A112:
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x14
|
||||
movs r3, 0x48
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
add r0, sp, 0xC
|
||||
@@ -2117,7 +2117,7 @@ _0808A112:
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
movs r3, 0x48
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, _0808A1B0 @ =gUnknown_8419CF7
|
||||
@@ -2126,7 +2126,7 @@ _0808A112:
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x8A
|
||||
movs r3, 0x48
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0808A212
|
||||
.align 2, 0
|
||||
_0808A198: .4byte 0x00000829
|
||||
@@ -2161,7 +2161,7 @@ _0808A1B4:
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0x49
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
add r1, sp, 0xC
|
||||
@@ -2170,7 +2170,7 @@ _0808A1B4:
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
movs r3, 0x49
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, _0808A228 @ =gUnknown_8419CF7
|
||||
@@ -2179,7 +2179,7 @@ _0808A1B4:
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x8A
|
||||
movs r3, 0x49
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A212:
|
||||
add sp, 0x18
|
||||
pop {r4-r7}
|
||||
@@ -2258,7 +2258,7 @@ _0808A264:
|
||||
movs r0, 0x1
|
||||
movs r2, 0x14
|
||||
movs r3, 0x58
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0808A2F4
|
||||
.align 2, 0
|
||||
_0808A2B0: .4byte gSaveBlock2Ptr
|
||||
@@ -2284,7 +2284,7 @@ _0808A2D8:
|
||||
movs r0, 0x1
|
||||
movs r2, 0x10
|
||||
movs r3, 0x59
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A2F4:
|
||||
add r0, sp, 0xC
|
||||
adds r1, r5, 0
|
||||
@@ -2316,7 +2316,7 @@ _0808A2F4:
|
||||
str r1, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
mov r1, r10
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, _0808A3C0 @ =gUnknown_83CD932
|
||||
mov r2, r9
|
||||
ldr r4, [r2]
|
||||
@@ -2338,7 +2338,7 @@ _0808A2F4:
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
mov r1, r10
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add r0, sp, 0xC
|
||||
adds r1, r7, 0
|
||||
movs r2, 0x2
|
||||
@@ -2360,7 +2360,7 @@ _0808A2F4:
|
||||
str r1, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
mov r1, r10
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x14
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -2412,7 +2412,7 @@ sub_808A3D0: @ 808A3D0
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0xA
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x19
|
||||
movs r0, 0x2
|
||||
@@ -2433,7 +2433,7 @@ sub_808A3D0: @ 808A3D0
|
||||
str r1, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0808A4A4 @ =gUnknown_83CD93A
|
||||
mov r8, r0
|
||||
ldr r1, [r7]
|
||||
@@ -2448,7 +2448,7 @@ sub_808A3D0: @ 808A3D0
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0xA
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x33
|
||||
movs r0, 0x2
|
||||
@@ -2469,7 +2469,7 @@ sub_808A3D0: @ 808A3D0
|
||||
str r1, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A486:
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
@@ -2553,7 +2553,7 @@ sub_808A4FC: @ 808A4FC
|
||||
adds r0, 0x4D
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
b _0808A59C
|
||||
.align 2, 0
|
||||
_0808A538: .4byte gUnknown_20397A4
|
||||
@@ -2597,7 +2597,7 @@ _0808A550:
|
||||
str r4, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A59C:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
@@ -2708,7 +2708,7 @@ sub_808A654: @ 808A654
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
movs r3, 0x23
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0808A6C4 @ =gUnknown_83CD8E3
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -2719,7 +2719,7 @@ sub_808A654: @ 808A654
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xA4
|
||||
movs r3, 0x23
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A6A2:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
@@ -2830,7 +2830,7 @@ sub_808A760: @ 808A760
|
||||
movs r0, 0x1
|
||||
adds r1, r6, 0
|
||||
movs r3, 0x33
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, [r7]
|
||||
@@ -2841,7 +2841,7 @@ sub_808A760: @ 808A760
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x82
|
||||
movs r3, 0x33
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r5, _0808A804 @ =gUnknown_83CD8E3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -2853,7 +2853,7 @@ sub_808A760: @ 808A760
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x90
|
||||
movs r3, 0x33
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
ldr r0, [r7]
|
||||
@@ -2864,7 +2864,7 @@ sub_808A760: @ 808A760
|
||||
adds r1, r6, 0
|
||||
movs r2, 0xC0
|
||||
movs r3, 0x33
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A7E2:
|
||||
add sp, 0xC
|
||||
pop {r4-r7}
|
||||
@@ -2943,7 +2943,7 @@ sub_808A854: @ 808A854
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
movs r3, 0x43
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0808A8C8 @ =gUnknown_83CD8E3
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -2955,7 +2955,7 @@ sub_808A854: @ 808A854
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xBA
|
||||
movs r3, 0x43
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A8A6:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
@@ -3042,7 +3042,7 @@ sub_808A91C: @ 808A91C
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
movs r3, 0x63
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0808A99C @ =gUnknown_83CD8E3
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -3054,7 +3054,7 @@ sub_808A91C: @ 808A91C
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xBA
|
||||
movs r3, 0x63
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808A97A:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
@@ -3140,7 +3140,7 @@ sub_808A9F0: @ 808A9F0
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
movs r3, 0x53
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
ldr r0, _0808AA70 @ =gUnknown_83CD8E3
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -3152,7 +3152,7 @@ sub_808A9F0: @ 808A9F0
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xBA
|
||||
movs r3, 0x53
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0808AA4C:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
|
||||
+1
-1
@@ -1024,7 +1024,7 @@ sub_808226C: @ 808226C
|
||||
movs r0, 0x12
|
||||
movs r1, 0x7
|
||||
movs r2, 0x7F
|
||||
bl SpawnSpecialFieldObjectParametrized
|
||||
bl SpawnSpecialFieldObjectParameterized
|
||||
ldr r2, _080822C8 @ =gMapObjects
|
||||
lsls r1, r0, 3
|
||||
adds r1, r0
|
||||
|
||||
@@ -4516,7 +4516,7 @@ _0812A642:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
b _0812A6DA
|
||||
.align 2, 0
|
||||
_0812A6AC: .4byte gUnknown_845AB64
|
||||
@@ -4539,7 +4539,7 @@ _0812A6B0:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
bl sub_812E62C
|
||||
bl AddTextPrinterParameterized5
|
||||
_0812A6DA:
|
||||
ldr r0, _0812A6F0 @ =gUnknown_203B0E4
|
||||
ldr r0, [r0]
|
||||
@@ -4689,7 +4689,7 @@ _0812A7B4:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x34
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -4767,7 +4767,7 @@ _0812A866:
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
lsrs r2, r5, 24
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r4, 0x4
|
||||
adds r7, 0x1
|
||||
adds r0, r6, 0
|
||||
@@ -4807,7 +4807,7 @@ _0812A8A8:
|
||||
movs r4, 0x80
|
||||
lsls r4, 19
|
||||
lsrs r2, r4, 24
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r0, r7, 0x1
|
||||
str r0, [sp, 0x48]
|
||||
adds r6, 0xC
|
||||
@@ -4858,7 +4858,7 @@ _0812A90C:
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
adds r3, r4, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
adds r2, r7, 0
|
||||
add r0, sp, 0xC
|
||||
str r0, [sp]
|
||||
@@ -4870,7 +4870,7 @@ _0812A90C:
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
adds r3, r4, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
_0812A960:
|
||||
ldr r7, [sp, 0x48]
|
||||
mov r4, r10
|
||||
@@ -5063,7 +5063,7 @@ sub_812AA78: @ 812AA78
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
adds r3, r4, 0
|
||||
bl box_print
|
||||
bl AddTextPrinterParameterized3
|
||||
add sp, 0x10
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
+3775
File diff suppressed because it is too large
Load Diff
+4
-2
@@ -1063,7 +1063,8 @@ gUnknown_84169DC:: @ 84169DC
|
||||
.incbin "baserom.gba", 0x4169DC, 0x1C
|
||||
|
||||
gUnknown_84169F8:: @ 84169F8
|
||||
.incbin "baserom.gba", 0x4169F8, 0x26
|
||||
.string "This can't be used on\n"
|
||||
.string "that POKéMON.{PAUSE_UNTIL_PRESS}$"
|
||||
|
||||
gUnknown_8416A1E:: @ 8416A1E
|
||||
.incbin "baserom.gba", 0x416A1E, 0x1C
|
||||
@@ -1159,7 +1160,8 @@ gUnknown_8416F10:: @ 8416F10
|
||||
.incbin "baserom.gba", 0x416F10, 0x17
|
||||
|
||||
gUnknown_8416F27:: @ 8416F27
|
||||
.incbin "baserom.gba", 0x416F27, 0x27
|
||||
.string "{STR_VAR_1}'s HP was restored\n"
|
||||
.string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$"
|
||||
|
||||
gUnknown_8416F4E:: @ 8416F4E
|
||||
.incbin "baserom.gba", 0x416F4E, 0x21
|
||||
|
||||
+2408
-2408
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 578 B After Width: | Height: | Size: 578 B |
|
Before Width: | Height: | Size: 94 B After Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
|
Before Width: | Height: | Size: 327 B After Width: | Height: | Size: 327 B |
|
Before Width: | Height: | Size: 673 B After Width: | Height: | Size: 673 B |
|
Before Width: | Height: | Size: 102 B After Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 890 B |
|
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 371 B |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user