Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
This commit is contained in:
Diegoisawesome
+4
-4
@@ -1424,8 +1424,8 @@ _0803575A:
|
||||
.pool
|
||||
thumb_func_end ApplyPlayerChosenFrameToBattleMenu
|
||||
|
||||
thumb_func_start load_battle_oval_graphics
|
||||
load_battle_oval_graphics: @ 8035770
|
||||
thumb_func_start DrawMainBattleBackground
|
||||
DrawMainBattleBackground: @ 8035770
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =gBattleTypeFlags
|
||||
ldr r1, [r0]
|
||||
@@ -1665,7 +1665,7 @@ _08035A8A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end load_battle_oval_graphics
|
||||
thumb_func_end DrawMainBattleBackground
|
||||
|
||||
thumb_func_start LoadBattleTextboxAndBackground
|
||||
LoadBattleTextboxAndBackground: @ 8035AA4
|
||||
@@ -1686,7 +1686,7 @@ LoadBattleTextboxAndBackground: @ 8035AA4
|
||||
movs r2, 0x40
|
||||
bl LoadCompressedPalette
|
||||
bl ApplyPlayerChosenFrameToBattleMenu
|
||||
bl load_battle_oval_graphics
|
||||
bl DrawMainBattleBackground
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
|
||||
+4
-4
@@ -59,13 +59,13 @@ _08056F3E:
|
||||
bl AllocZeroed
|
||||
ldr r1, [r5]
|
||||
str r0, [r1, 0x1C]
|
||||
ldr r4, =gUnknown_020244A0
|
||||
ldr r4, =gLinkBattleSendBuffer
|
||||
movs r5, 0x80
|
||||
lsls r5, 5
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, =gUnknown_020244A4
|
||||
ldr r4, =gLinkBattleRecvBuffer
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
@@ -160,11 +160,11 @@ _0805703C:
|
||||
str r5, [r0, 0x1C]
|
||||
bl Free
|
||||
str r5, [r6]
|
||||
ldr r4, =gUnknown_020244A0
|
||||
ldr r4, =gLinkBattleSendBuffer
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, =gUnknown_020244A4
|
||||
ldr r4, =gLinkBattleRecvBuffer
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
|
||||
+25
-25
@@ -1056,10 +1056,10 @@ _0805D980:
|
||||
b _0805DA1E
|
||||
.pool
|
||||
_0805D9CC:
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
mov r2, r10
|
||||
strb r2, [r0]
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
mov r1, sp
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r0]
|
||||
@@ -1070,7 +1070,7 @@ _0805D9CC:
|
||||
ldr r0, =gUnknown_082C9320
|
||||
adds r1, r5, 0
|
||||
movs r2, 0
|
||||
bl move_something
|
||||
bl DoBattleAnim
|
||||
ldr r0, =task0A_0803415C
|
||||
movs r1, 0xA
|
||||
bl CreateTask
|
||||
@@ -1180,14 +1180,14 @@ move_anim_start_t4: @ 805DAC4
|
||||
lsrs r4, 24
|
||||
lsls r3, 24
|
||||
lsrs r3, 24
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
strb r1, [r0]
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
strb r2, [r0]
|
||||
ldr r0, =gUnknown_082C937C
|
||||
adds r1, r3, 0
|
||||
movs r2, 0
|
||||
bl move_something
|
||||
bl DoBattleAnim
|
||||
ldr r0, =task0A_08034248
|
||||
movs r1, 0xA
|
||||
bl CreateTask
|
||||
@@ -1801,7 +1801,7 @@ _0805E056:
|
||||
movs r4, 0
|
||||
cmp r4, r5
|
||||
bcs _0805E076
|
||||
ldr r7, =gBanksBySide
|
||||
ldr r7, =gBanksByIdentity
|
||||
ldr r6, =gUnknown_0832C108
|
||||
_0805E060:
|
||||
adds r0, r4, r7
|
||||
@@ -1874,14 +1874,14 @@ _0805E0F0:
|
||||
_0805E100:
|
||||
cmp r4, 0x4
|
||||
bne _0805E110
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0]
|
||||
b _0805E198
|
||||
.pool
|
||||
_0805E110:
|
||||
cmp r4, 0x5
|
||||
bne _0805E1AC
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0, 0x1]
|
||||
b _0805E198
|
||||
.pool
|
||||
@@ -1916,28 +1916,28 @@ _0805E150:
|
||||
_0805E160:
|
||||
cmp r4, 0x6
|
||||
bne _0805E170
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0]
|
||||
b _0805E198
|
||||
.pool
|
||||
_0805E170:
|
||||
cmp r4, 0x7
|
||||
bne _0805E180
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0, 0x1]
|
||||
b _0805E198
|
||||
.pool
|
||||
_0805E180:
|
||||
cmp r4, 0x8
|
||||
bne _0805E190
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0, 0x2]
|
||||
b _0805E198
|
||||
.pool
|
||||
_0805E190:
|
||||
cmp r5, 0x9
|
||||
bne _0805E1AC
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r0, [r0, 0x3]
|
||||
_0805E198:
|
||||
lsls r0, 3
|
||||
@@ -1955,8 +1955,8 @@ _0805E1AE:
|
||||
bx r1
|
||||
thumb_func_end BattleLoadAllHealthBoxesGfx
|
||||
|
||||
thumb_func_start load_gfxc_health_bar
|
||||
load_gfxc_health_bar: @ 805E1B8
|
||||
thumb_func_start LoadBattleBarGfx
|
||||
LoadBattleBarGfx: @ 805E1B8
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_08C093F0
|
||||
ldr r1, =gMonSpritesGfxPtr
|
||||
@@ -1969,7 +1969,7 @@ load_gfxc_health_bar: @ 805E1B8
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end load_gfxc_health_bar
|
||||
thumb_func_end LoadBattleBarGfx
|
||||
|
||||
thumb_func_start BattleInitAllSprites
|
||||
BattleInitAllSprites: @ 805E1D8
|
||||
@@ -2038,7 +2038,7 @@ _0805E252:
|
||||
_0805E260:
|
||||
ldrb r0, [r4]
|
||||
bl SetBankHealthboxSpritePos
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
ldrb r1, [r4]
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -2048,7 +2048,7 @@ _0805E260:
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl nullsub_30
|
||||
bl DummyBattleInterfaceFunc
|
||||
b _0805E30E
|
||||
.pool
|
||||
_0805E288:
|
||||
@@ -2056,7 +2056,7 @@ _0805E288:
|
||||
adds r0, r1, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl nullsub_30
|
||||
bl DummyBattleInterfaceFunc
|
||||
b _0805E30E
|
||||
.pool
|
||||
_0805E29C:
|
||||
@@ -2353,7 +2353,7 @@ _0805E51C:
|
||||
beq _0805E558
|
||||
movs r0, 0
|
||||
mov r10, r0
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x18]
|
||||
ldrh r1, [r2, 0x2]
|
||||
@@ -2857,7 +2857,7 @@ sub_805E990: @ 805E990
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -2997,7 +2997,7 @@ sub_805EAB4: @ 805EAB4
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
@@ -3111,7 +3111,7 @@ sub_805EB9C: @ 805EB9C
|
||||
_0805EBC8:
|
||||
lsls r0, r5, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805EC60
|
||||
@@ -3329,7 +3329,7 @@ sub_805ED70: @ 805ED70
|
||||
cmp r0, 0
|
||||
beq _0805EDAC
|
||||
adds r0, r4, 0
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0805EDC0
|
||||
@@ -3796,7 +3796,7 @@ sub_805F110: @ 805F110
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
|
||||
-4205
File diff suppressed because it is too large
Load Diff
@@ -26,9 +26,9 @@ sub_80A9C70: @ 80A9C70
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
ldr r0, =gUnknown_08524F84
|
||||
ldr r0, =gBattleAnimPicTable + 0x440
|
||||
bl LoadCompressedObjectPicUsingHeap
|
||||
ldr r0, =gUnknown_0852588C
|
||||
ldr r0, =gBattleAnimPaletteTable + 0x440
|
||||
bl LoadCompressedObjectPaletteUsingHeap
|
||||
ldr r1, =gTasks
|
||||
mov r2, r8
|
||||
@@ -331,7 +331,7 @@ sub_80A9EF4: @ 80A9EF4
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r4, =gAnimationBankTarget
|
||||
ldr r4, =gAnimBankTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -616,7 +616,7 @@ _080AA16C:
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080AA186:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -829,7 +829,7 @@ _080AA322:
|
||||
b _080AA330
|
||||
_080AA328:
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080AA352
|
||||
_080AA330:
|
||||
ldr r0, =gBattleAnimArgs
|
||||
@@ -863,13 +863,13 @@ move_anim_start_t2: @ 80AA364
|
||||
lsrs r4, 24
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
strb r4, [r0]
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
strb r4, [r0]
|
||||
ldr r0, =gUnknown_082C92FC
|
||||
movs r2, 0
|
||||
bl move_something
|
||||
bl DoBattleAnim
|
||||
ldr r0, =task0A_80788BC
|
||||
movs r1, 0xA
|
||||
bl CreateTask
|
||||
|
||||
+45
-45
@@ -18,7 +18,7 @@ sub_80D51AC: @ 80D51AC
|
||||
cmp r2, 0xFF
|
||||
bne _080D51D0
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D520C
|
||||
.pool
|
||||
_080D51D0:
|
||||
@@ -140,7 +140,7 @@ _080D5288:
|
||||
adds r0, r6
|
||||
strh r3, [r0, 0x26]
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D52CA
|
||||
_080D52C6:
|
||||
subs r0, 0x1
|
||||
@@ -204,7 +204,7 @@ _080D5326:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D533C
|
||||
@@ -216,7 +216,7 @@ _080D533C:
|
||||
.pool
|
||||
_080D5348:
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
_080D5350:
|
||||
@@ -226,7 +226,7 @@ _080D5352:
|
||||
beq _080D5368
|
||||
_080D5356:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D53A6
|
||||
.pool
|
||||
_080D5368:
|
||||
@@ -359,7 +359,7 @@ _080D5436:
|
||||
adds r0, r7
|
||||
strh r2, [r0, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D5478
|
||||
_080D5474:
|
||||
subs r0, r2, 0x1
|
||||
@@ -385,7 +385,7 @@ sub_80D5484: @ 80D5484
|
||||
cmp r3, 0xFF
|
||||
bne _080D54A8
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D54F6
|
||||
.pool
|
||||
_080D54A8:
|
||||
@@ -584,7 +584,7 @@ _080D55F8:
|
||||
strh r0, [r2, 0x26]
|
||||
_080D5630:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D563C
|
||||
_080D5638:
|
||||
subs r0, r2, 0x1
|
||||
@@ -705,7 +705,7 @@ _080D56F6:
|
||||
cmp r0, 0
|
||||
bne _080D5728
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D5728:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -829,7 +829,7 @@ _080D5810:
|
||||
strh r0, [r4, 0x24]
|
||||
strh r0, [r4, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D5822:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -842,7 +842,7 @@ sub_80D5830: @ 80D5830
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -871,7 +871,7 @@ sub_80D5860: @ 80D5860
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -892,7 +892,7 @@ _080D5894:
|
||||
strh r2, [r4, 0x2E]
|
||||
strh r0, [r4, 0x32]
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
@@ -919,7 +919,7 @@ sub_80D58D4: @ 80D58D4
|
||||
strh r1, [r0, 0x30]
|
||||
ldr r1, =sub_80A6630
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -970,7 +970,7 @@ sub_80D5944: @ 80D5944
|
||||
strh r1, [r0, 0x32]
|
||||
ldr r1, =sub_80A6630
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -988,12 +988,12 @@ sub_80D5968: @ 80D5968
|
||||
cmp r0, 0
|
||||
bne _080D598C
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080D5990
|
||||
.pool
|
||||
_080D598C:
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080D5990:
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
@@ -1093,7 +1093,7 @@ _080D5A56:
|
||||
strh r1, [r3, 0x26]
|
||||
_080D5A58:
|
||||
adds r0, r2, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
b _080D5A8E
|
||||
.pool
|
||||
_080D5A64:
|
||||
@@ -1133,11 +1133,11 @@ sub_80D5A94: @ 80D5A94
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080D5AB0
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080D5AB2
|
||||
.pool
|
||||
_080D5AB0:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080D5AB2:
|
||||
ldrb r2, [r0]
|
||||
ldr r0, =gBankSpriteIds
|
||||
@@ -1192,7 +1192,7 @@ _080D5ADC:
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, =sub_80A6680
|
||||
@@ -1218,11 +1218,11 @@ sub_80D5B48: @ 80D5B48
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080D5B70
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080D5B72
|
||||
.pool
|
||||
_080D5B70:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080D5B72:
|
||||
ldrb r1, [r0]
|
||||
ldr r0, =gBankSpriteIds
|
||||
@@ -1281,7 +1281,7 @@ _080D5B9C:
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _080D5C04
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
b _080D5C0C
|
||||
@@ -1318,7 +1318,7 @@ sub_80D5C20: @ 80D5C20
|
||||
lsls r1, 2
|
||||
adds r1, r4
|
||||
strh r3, [r1, 0x26]
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1338,7 +1338,7 @@ sub_80D5C50: @ 80D5C50
|
||||
bl __divsi3
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -1485,7 +1485,7 @@ _080D5D70:
|
||||
cmp r0, 0
|
||||
bne _080D5DA4
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D5DA4:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1518,16 +1518,16 @@ _080D5DD8:
|
||||
beq _080D5DE8
|
||||
b _080D5E10
|
||||
_080D5DDE:
|
||||
ldr r5, =gAnimationBankAttacker
|
||||
ldr r5, =gAnimBankAttacker
|
||||
b _080D5DEA
|
||||
.pool
|
||||
_080D5DE8:
|
||||
ldr r5, =gAnimationBankTarget
|
||||
ldr r5, =gAnimBankTarget
|
||||
_080D5DEA:
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D5E10
|
||||
@@ -1540,7 +1540,7 @@ _080D5DEA:
|
||||
.pool
|
||||
_080D5E10:
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D5E58
|
||||
_080D5E18:
|
||||
ldr r1, =gTasks
|
||||
@@ -1549,7 +1549,7 @@ _080D5E18:
|
||||
lsls r0, 3
|
||||
adds r5, r0, r1
|
||||
strh r2, [r5, 0x8]
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -1609,7 +1609,7 @@ sub_80D5E6C: @ 80D5E6C
|
||||
cmp r1, r0
|
||||
bls _080D5EAA
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D5EAA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1622,7 +1622,7 @@ sub_80D5EB8: @ 80D5EB8
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r6, =gAnimationBankAttacker
|
||||
ldr r6, =gAnimBankAttacker
|
||||
ldrb r0, [r6]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -1660,7 +1660,7 @@ _080D5ED4:
|
||||
b _080D5F18
|
||||
.pool
|
||||
_080D5F14:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
_080D5F18:
|
||||
strh r0, [r2, 0x12]
|
||||
@@ -1817,7 +1817,7 @@ _080D601E:
|
||||
strh r3, [r0, 0x24]
|
||||
strh r3, [r0, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D6050:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
@@ -1923,7 +1923,7 @@ _080D6120:
|
||||
adds r0, r6, 0
|
||||
bl sub_80A7344
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D612C:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -1995,11 +1995,11 @@ _080D61B8:
|
||||
ldrsh r0, [r6, r1]
|
||||
cmp r0, 0
|
||||
bne _080D61C8
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080D61CA
|
||||
.pool
|
||||
_080D61C8:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080D61CA:
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
@@ -2076,11 +2076,11 @@ sub_80D622C: @ 80D622C
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080D6274
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080D6276
|
||||
.pool
|
||||
_080D6274:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080D6276:
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
@@ -2201,7 +2201,7 @@ _080D6364:
|
||||
bl sub_80A7344
|
||||
_080D636A:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080D6382
|
||||
_080D6372:
|
||||
movs r0, 0
|
||||
@@ -2236,7 +2236,7 @@ sub_80D6388: @ 80D6388
|
||||
adds r0, r5, r7
|
||||
lsls r0, 3
|
||||
adds r6, r0, r4
|
||||
ldr r0, =gMovePowerMoveAnim
|
||||
ldr r0, =gAnimMovePower
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0xC
|
||||
bl __udivsi3
|
||||
@@ -2248,7 +2248,7 @@ _080D63C0:
|
||||
adds r0, r5, r7
|
||||
lsls r0, 3
|
||||
adds r6, r0, r4
|
||||
ldr r0, =gMoveDmgMoveAnim
|
||||
ldr r0, =gAnimMoveDmg
|
||||
ldr r0, [r0]
|
||||
movs r1, 0xC
|
||||
bl __divsi3
|
||||
@@ -2435,7 +2435,7 @@ _080D6518:
|
||||
adds r0, r2
|
||||
strh r4, [r0, 0x26]
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080D654A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
+914
-914
File diff suppressed because it is too large
Load Diff
+213
-213
File diff suppressed because it is too large
Load Diff
+66
-66
@@ -16,7 +16,7 @@ sub_8170478: @ 8170478
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x10]
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r4, [r0]
|
||||
ldr r0, =gBattle_WIN0H
|
||||
movs r1, 0
|
||||
@@ -43,19 +43,19 @@ sub_8170478: @ 8170478
|
||||
movs r0, 0x1
|
||||
movs r1, 0x4
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
ldr r0, =gHealthBoxesIds
|
||||
adds r4, r0
|
||||
ldrb r0, [r4]
|
||||
@@ -212,7 +212,7 @@ sub_8170660: @ 8170660
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
mov r8, r0
|
||||
ldr r1, =gTasks
|
||||
@@ -335,7 +335,7 @@ _08170708:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
_0817076C:
|
||||
movs r0, 0
|
||||
bl GetGpuReg
|
||||
@@ -372,7 +372,7 @@ _0817076C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
ldr r0, =gHealthBoxesIds
|
||||
add r0, r8
|
||||
ldrb r0, [r0]
|
||||
@@ -412,7 +412,7 @@ _0817076C:
|
||||
orrs r2, r5
|
||||
strb r2, [r0, 0x5]
|
||||
adds r0, r7, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08170814:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -540,12 +540,12 @@ sub_8170920: @ 8170920
|
||||
lsrs r4, 24
|
||||
mov r1, sp
|
||||
adds r1, 0x1
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r2, [r0]
|
||||
mov r0, sp
|
||||
bl sub_8170834
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -628,11 +628,11 @@ sub_81709EC: @ 81709EC
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_817094C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -752,7 +752,7 @@ _08170AD6:
|
||||
cmp r0, 0
|
||||
bne _08170AF8
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08170AF8:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -766,7 +766,7 @@ sub_8170B04: @ 8170B04
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r5, [r0]
|
||||
@@ -834,7 +834,7 @@ _08170B84:
|
||||
orrs r1, r2
|
||||
strb r1, [r0]
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08170BA4:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -852,7 +852,7 @@ sub_8170BB0: @ 8170BB0
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
adds r1, r0, r1
|
||||
ldrb r1, [r1]
|
||||
@@ -904,7 +904,7 @@ _08170C08:
|
||||
b _08170CEE
|
||||
.pool
|
||||
_08170C44:
|
||||
ldr r5, =gAnimationBankAttacker
|
||||
ldr r5, =gAnimBankAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_80A5C6C
|
||||
@@ -979,7 +979,7 @@ _08170CC4:
|
||||
cmp r0, 0
|
||||
bne _08170CEE
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08170CEE:
|
||||
add sp, 0xC
|
||||
pop {r3,r4}
|
||||
@@ -1003,7 +1003,7 @@ sub_8170CFC: @ 8170CFC
|
||||
lsrs r0, 24
|
||||
bl sub_8076A78
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1023,7 +1023,7 @@ sub_8170D24: @ 8170D24
|
||||
lsrs r0, 24
|
||||
bl sub_8076AE8
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1051,7 +1051,7 @@ _08170D70:
|
||||
_08170D74:
|
||||
strh r0, [r1, 0xE]
|
||||
adds r0, r2, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@@ -1162,7 +1162,7 @@ sub_8170E04: @ 8170E04
|
||||
adds r6, r4, r1
|
||||
movs r0, 0x22
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r2, =gAnimationBankTarget
|
||||
ldr r2, =gAnimBankTarget
|
||||
mov r8, r2
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0
|
||||
@@ -1246,7 +1246,7 @@ sub_8170EF0: @ 8170EF0
|
||||
cmp r1, r0
|
||||
bne _08170F1A
|
||||
adds r0, r3, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08170F1A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1313,7 +1313,7 @@ _08170F54:
|
||||
adds r6, r4, r0
|
||||
movs r0, 0x22
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r1, =gAnimationBankTarget
|
||||
ldr r1, =gAnimBankTarget
|
||||
mov r8, r1
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0
|
||||
@@ -1550,7 +1550,7 @@ _08171188:
|
||||
movs r2, 0x1
|
||||
movs r3, 0x1C
|
||||
bl sub_8171D98
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0
|
||||
movs r2, 0xE
|
||||
@@ -1585,7 +1585,7 @@ sub_81711E8: @ 81711E8
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r2, =gSprites
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -1607,7 +1607,7 @@ sub_8171240: @ 8171240
|
||||
push {r4-r7,lr}
|
||||
adds r7, r0, 0
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r4, [r0]
|
||||
@@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8
|
||||
push {r7}
|
||||
sub sp, 0x4
|
||||
adds r6, r0, 0
|
||||
ldr r7, =gAnimationBankTarget
|
||||
ldr r7, =gAnimBankTarget
|
||||
ldrh r0, [r6, 0x36]
|
||||
adds r0, 0x1
|
||||
movs r1, 0
|
||||
@@ -2379,7 +2379,7 @@ _0817185A:
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl sub_8072A88
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
bl m4aMPlayAllStop
|
||||
ldr r0, =0x00000213
|
||||
bl PlaySE
|
||||
@@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4
|
||||
movs r2, 0x1
|
||||
movs r3, 0x1C
|
||||
bl sub_8171D98
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
movs r2, 0xE
|
||||
@@ -2724,7 +2724,7 @@ sub_8171AE4: @ 8171AE4
|
||||
_08171B36:
|
||||
ldr r6, =gSprites
|
||||
ldr r5, =gBankSpriteIds
|
||||
ldr r4, =gAnimationBankTarget
|
||||
ldr r4, =gAnimBankTarget
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
ldrb r1, [r0]
|
||||
@@ -2792,7 +2792,7 @@ sub_8171BAC: @ 8171BAC
|
||||
_08171BCA:
|
||||
ldr r4, =gSprites
|
||||
ldr r3, =gBankSpriteIds
|
||||
ldr r2, =gAnimationBankTarget
|
||||
ldr r2, =gAnimBankTarget
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -2841,7 +2841,7 @@ _08171C24:
|
||||
beq _08171C8A
|
||||
ldr r4, =gSprites
|
||||
ldr r3, =gBankSpriteIds
|
||||
ldr r2, =gAnimationBankTarget
|
||||
ldr r2, =gAnimBankTarget
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -2879,7 +2879,7 @@ _08171C24:
|
||||
ldr r0, =gDoingBattleAnim
|
||||
strb r6, [r0]
|
||||
movs r0, 0x1
|
||||
bl sub_8072A88
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
_08171C8A:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -2974,7 +2974,7 @@ _08171D3E:
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
bl sub_8072A88
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
_08171D52:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -4730,7 +4730,7 @@ sub_8172BF0: @ 8172BF0
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
ldr r0, =gBankSpriteIds
|
||||
ldr r3, =gAnimationBankAttacker
|
||||
ldr r3, =gAnimBankAttacker
|
||||
ldrb r2, [r3]
|
||||
adds r0, r2, r0
|
||||
ldrb r6, [r0]
|
||||
@@ -4877,7 +4877,7 @@ _08172D28:
|
||||
adds r0, r1
|
||||
ldrb r1, [r0, 0x8]
|
||||
strh r1, [r0, 0x8]
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -4914,7 +4914,7 @@ _08172D7E:
|
||||
beq _08172D8A
|
||||
_08172D84:
|
||||
adds r0, r7, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08172D8A:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -4949,9 +4949,9 @@ _08172DC0:
|
||||
beq _08172E4E
|
||||
b _08172E84
|
||||
_08172DC6:
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankIdentity_permutated
|
||||
bl sub_80A8364
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -5010,7 +5010,7 @@ _08172E14:
|
||||
b _08172E84
|
||||
_08172E4E:
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -5032,7 +5032,7 @@ _08172E4E:
|
||||
ldrb r0, [r4]
|
||||
bl sub_805E974
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08172E84:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -5048,7 +5048,7 @@ sub_8172E9C: @ 8172E9C
|
||||
ldr r3, =gBattleAnimArgs
|
||||
ldr r1, =gBattleSpritesDataPtr
|
||||
ldr r2, [r1]
|
||||
ldr r1, =gAnimationBankAttacker
|
||||
ldr r1, =gAnimBankAttacker
|
||||
ldrb r1, [r1]
|
||||
ldr r2, [r2]
|
||||
lsls r1, 2
|
||||
@@ -5057,7 +5057,7 @@ sub_8172E9C: @ 8172E9C
|
||||
lsls r1, 29
|
||||
lsrs r1, 31
|
||||
strh r1, [r3, 0xE]
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@@ -5068,11 +5068,11 @@ sub_8172ED0: @ 8172ED0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, =gAnimationBankTarget
|
||||
ldr r2, =gAnimBankTarget
|
||||
ldr r1, =gEffectBank
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
adds r0, r6, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08172FC8
|
||||
@@ -5134,9 +5134,9 @@ _08172F4E:
|
||||
lsrs r0, 16
|
||||
cmp r0, r7
|
||||
bne _08172F6E
|
||||
ldr r0, =gUnknown_0852528C
|
||||
ldr r0, =gBattleAnimPicTable + 0x748
|
||||
bl LoadCompressedObjectPicUsingHeap
|
||||
ldr r0, =gUnknown_08525B94
|
||||
ldr r0, =gBattleAnimPaletteTable + 0x748
|
||||
bl LoadCompressedObjectPaletteUsingHeap
|
||||
_08172F6E:
|
||||
ldr r5, =sub_8172FEC
|
||||
@@ -5533,14 +5533,14 @@ sub_81732B0: @ 81732B0
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, =gUnknown_085253AC
|
||||
ldr r0, =gBattleAnimPicTable + 0x868
|
||||
bl LoadCompressedObjectPicUsingHeap
|
||||
ldr r0, =gUnknown_08525CB4
|
||||
ldr r0, =gBattleAnimPaletteTable + 0x868
|
||||
bl LoadCompressedObjectPaletteUsingHeap
|
||||
ldr r0, =0x0000281d
|
||||
bl IndexOfSpritePaletteTag
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -5559,7 +5559,7 @@ sub_81732E4: @ 81732E4
|
||||
adds r0, r5, 0
|
||||
bl FreeSpritePaletteByTag
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -5603,7 +5603,7 @@ sub_817330C: @ 817330C
|
||||
bl sub_80A68D4
|
||||
ldr r2, =gSprites
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -5628,7 +5628,7 @@ sub_817339C: @ 817339C
|
||||
adds r3, r0, 0
|
||||
ldr r2, =gSprites
|
||||
ldr r1, =gBankSpriteIds
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
@@ -5679,7 +5679,7 @@ sub_8173400: @ 8173400
|
||||
adds r4, r0, 0
|
||||
ldr r5, =gSprites
|
||||
ldr r3, =gBankSpriteIds
|
||||
ldr r2, =gAnimationBankAttacker
|
||||
ldr r2, =gAnimBankAttacker
|
||||
ldrb r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
@@ -5708,7 +5708,7 @@ sub_8173400: @ 8173400
|
||||
movs r1, 0
|
||||
bl StartSpriteAnim
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
_08173448:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -5733,7 +5733,7 @@ sub_817345C: @ 817345C
|
||||
_08173478:
|
||||
movs r0, 0
|
||||
bl GetBankByIdentity
|
||||
ldr r1, =gAnimationBankAttacker
|
||||
ldr r1, =gAnimBankAttacker
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
b _08173498
|
||||
@@ -5741,16 +5741,16 @@ _08173478:
|
||||
_0817348C:
|
||||
movs r0, 0x1
|
||||
bl GetBankByIdentity
|
||||
ldr r1, =gAnimationBankAttacker
|
||||
ldr r1, =gAnimBankAttacker
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
_08173498:
|
||||
bl GetBankByIdentity
|
||||
ldr r1, =gAnimationBankTarget
|
||||
ldr r1, =gAnimBankTarget
|
||||
strb r0, [r1]
|
||||
_081734A0:
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -5801,7 +5801,7 @@ _08173508:
|
||||
_0817350C:
|
||||
strh r0, [r1]
|
||||
adds r0, r2, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@@ -5812,18 +5812,18 @@ sub_817351C: @ 817351C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, =gAnimationBankAttacker
|
||||
ldr r3, =gAnimBankAttacker
|
||||
ldr r1, =gBattleSpritesDataPtr
|
||||
ldr r2, [r1]
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrh r1, [r1]
|
||||
strb r1, [r3]
|
||||
ldr r3, =gAnimationBankTarget
|
||||
ldr r3, =gAnimBankTarget
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrh r1, [r1]
|
||||
lsrs r1, 8
|
||||
strb r1, [r3]
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
|
||||
@@ -22,12 +22,12 @@ sub_8158B30: @ 8158B30
|
||||
strh r0, [r6, 0xA]
|
||||
movs r0, 0x40
|
||||
negs r0, r0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x3F
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r5, r0, 0
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
@@ -36,7 +36,7 @@ sub_8158B30: @ 8158B30
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x2
|
||||
bl sub_80A5314
|
||||
bl CalculatePanIncrement
|
||||
strh r4, [r6, 0xC]
|
||||
strh r5, [r6, 0xE]
|
||||
lsls r0, 24
|
||||
@@ -128,7 +128,7 @@ sub_8158C04: @ 8158C04
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0x1C]
|
||||
movs r0, 0x3F
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r1, r0, 0
|
||||
ldrh r0, [r4, 0xA]
|
||||
lsls r1, 24
|
||||
@@ -142,7 +142,7 @@ sub_8158C04: @ 8158C04
|
||||
cmp r0, 0x2
|
||||
bne _08158C4C
|
||||
adds r0, r5, 0
|
||||
bl move_anim_related_task_del
|
||||
bl DestroyAnimSoundTask
|
||||
_08158C4C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -175,14 +175,14 @@ mas_80DCF38: @ 8158C58
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
adds r0, r5, 0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r5, r0, 0
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
@@ -193,7 +193,7 @@ mas_80DCF38: @ 8158C58
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_80A5314
|
||||
bl CalculatePanIncrement
|
||||
ldr r2, =gTasks
|
||||
mov r3, r8
|
||||
lsls r1, r3, 2
|
||||
@@ -264,7 +264,7 @@ sub_8158D08: @ 8158D08
|
||||
cmp r0, 0
|
||||
bne _08158D50
|
||||
adds r0, r5, 0
|
||||
bl move_anim_related_task_del
|
||||
bl DestroyAnimSoundTask
|
||||
b _08158D82
|
||||
.pool
|
||||
_08158D50:
|
||||
@@ -307,7 +307,7 @@ sub_8158D8C: @ 8158D8C
|
||||
movs r4, 0
|
||||
movs r0, 0x40
|
||||
negs r0, r0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl IsContest
|
||||
@@ -319,7 +319,7 @@ sub_8158D8C: @ 8158D8C
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _08158DC8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x18]
|
||||
ldrh r4, [r0]
|
||||
@@ -327,7 +327,7 @@ sub_8158D8C: @ 8158D8C
|
||||
.pool
|
||||
_08158DC8:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _08158E76
|
||||
_08158DD0:
|
||||
ldr r0, =gBattleAnimArgs
|
||||
@@ -336,25 +336,25 @@ _08158DD0:
|
||||
adds r2, r0, 0
|
||||
cmp r1, 0
|
||||
bne _08158DEC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r4, [r0]
|
||||
b _08158E12
|
||||
.pool
|
||||
_08158DEC:
|
||||
cmp r1, 0x1
|
||||
bne _08158DFC
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r4, [r0]
|
||||
b _08158E12
|
||||
.pool
|
||||
_08158DFC:
|
||||
cmp r1, 0x2
|
||||
bne _08158E08
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _08158E0A
|
||||
.pool
|
||||
_08158E08:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_08158E0A:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x2
|
||||
@@ -369,12 +369,12 @@ _08158E12:
|
||||
bne _08158E38
|
||||
_08158E1E:
|
||||
adds r0, r4, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08158E38
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _08158E8C
|
||||
.pool
|
||||
_08158E38:
|
||||
@@ -416,7 +416,7 @@ _08158E76:
|
||||
bl PlayCry3
|
||||
_08158E86:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08158E8C:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -432,7 +432,7 @@ sub_8158E9C: @ 8158E9C
|
||||
movs r4, 0
|
||||
movs r0, 0x40
|
||||
negs r0, r0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl IsContest
|
||||
@@ -444,7 +444,7 @@ sub_8158E9C: @ 8158E9C
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _08158ED8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x18]
|
||||
ldrh r4, [r0]
|
||||
@@ -452,7 +452,7 @@ sub_8158E9C: @ 8158E9C
|
||||
.pool
|
||||
_08158ED8:
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _08158F86
|
||||
_08158EE0:
|
||||
ldr r0, =gBattleAnimArgs
|
||||
@@ -461,25 +461,25 @@ _08158EE0:
|
||||
adds r2, r0, 0
|
||||
cmp r1, 0
|
||||
bne _08158EFC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r4, [r0]
|
||||
b _08158F22
|
||||
.pool
|
||||
_08158EFC:
|
||||
cmp r1, 0x1
|
||||
bne _08158F0C
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r4, [r0]
|
||||
b _08158F22
|
||||
.pool
|
||||
_08158F0C:
|
||||
cmp r1, 0x2
|
||||
bne _08158F18
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _08158F1A
|
||||
.pool
|
||||
_08158F18:
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_08158F1A:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x2
|
||||
@@ -494,12 +494,12 @@ _08158F22:
|
||||
bne _08158F48
|
||||
_08158F2E:
|
||||
adds r0, r4, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08158F48
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _08158FEE
|
||||
.pool
|
||||
_08158F48:
|
||||
@@ -571,7 +571,7 @@ _08158FD0:
|
||||
.pool
|
||||
_08158FE8:
|
||||
adds r0, r6, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08158FEE:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -620,7 +620,7 @@ _08159028:
|
||||
movs r2, 0xA
|
||||
bl PlayCry3
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _0815906A
|
||||
_0815904E:
|
||||
bl IsCryPlaying
|
||||
@@ -633,7 +633,7 @@ _0815904E:
|
||||
movs r2, 0x8
|
||||
bl PlayCry3
|
||||
mov r0, r9
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_0815906A:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
@@ -669,7 +669,7 @@ _081590A0:
|
||||
cmp r0, 0
|
||||
bne _081590B0
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_081590B0:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -691,21 +691,21 @@ sub_81590B8: @ 81590B8
|
||||
strh r1, [r0, 0x1C]
|
||||
movs r0, 0x40
|
||||
negs r0, r0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081590F8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x18]
|
||||
b _08159102
|
||||
.pool
|
||||
_081590F8:
|
||||
ldr r1, =gUnknown_02038438
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r1, =gAnimSpeciesByBanks
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 1
|
||||
adds r0, r1
|
||||
@@ -728,7 +728,7 @@ _08159102:
|
||||
.pool
|
||||
_08159130:
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08159136:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -829,7 +829,7 @@ _081591F2:
|
||||
bl PlayCry3
|
||||
_081591FE:
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_08159204:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -849,14 +849,14 @@ sub_8159210: @ 8159210
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl PlaySE1WithPanning
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -874,14 +874,14 @@ sub_8159244: @ 8159244
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl PlaySE2WithPanning
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -906,14 +906,14 @@ sub_8159278: @ 8159278
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
adds r0, r5, 0
|
||||
bl BattleAnimGetPanControl
|
||||
bl BattleAnimAdjustPanning
|
||||
adds r5, r0, 0
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
@@ -924,7 +924,7 @@ sub_8159278: @ 8159278
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_80A5314
|
||||
bl CalculatePanIncrement
|
||||
ldr r2, =gTasks
|
||||
mov r3, r8
|
||||
lsls r1, r3, 2
|
||||
@@ -995,7 +995,7 @@ _08159342:
|
||||
cmp r1, r0
|
||||
bne _0815935A
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_0815935A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
@@ -276,7 +276,7 @@ _080645CA:
|
||||
ldrb r1, [r7]
|
||||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806469C
|
||||
@@ -985,7 +985,7 @@ sub_8064BC0: @ 8064BC0
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _08064C0C
|
||||
.pool
|
||||
_08064C08:
|
||||
@@ -1572,7 +1572,7 @@ _0806513A:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl LinkOpponentBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -4721,7 +4721,7 @@ _08066D32:
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 8
|
||||
orrs r6, r0
|
||||
ldr r0, =gUnknown_02038432
|
||||
ldr r0, =gAnimMoveTurn
|
||||
mov r8, r0
|
||||
mov r0, r12
|
||||
adds r0, 0x3
|
||||
@@ -4729,7 +4729,7 @@ _08066D32:
|
||||
ldrb r0, [r1]
|
||||
mov r1, r8
|
||||
strb r0, [r1]
|
||||
ldr r3, =gMovePowerMoveAnim
|
||||
ldr r3, =gAnimMovePower
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4743,7 +4743,7 @@ _08066D32:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r3]
|
||||
ldr r3, =gMoveDmgMoveAnim
|
||||
ldr r3, =gAnimMoveDmg
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4769,7 +4769,7 @@ _08066D32:
|
||||
lsls r0, 24
|
||||
orrs r2, r0
|
||||
str r2, [r3]
|
||||
ldr r2, =gHappinessMoveAnim
|
||||
ldr r2, =gAnimFriendship
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 9
|
||||
mov r1, r12
|
||||
@@ -4791,7 +4791,7 @@ _08066D32:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r4]
|
||||
ldr r7, =gDisableStructMoveAnim
|
||||
ldr r7, =gAnimDisableStructPtr
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4928,7 +4928,7 @@ _08066F08:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -5124,7 +5124,7 @@ sub_80670A0: @ 80670A0
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -5171,7 +5171,7 @@ sub_80670A0: @ 80670A0
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0806715A
|
||||
.pool
|
||||
_08067130:
|
||||
@@ -5193,7 +5193,7 @@ _08067130:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
_0806715A:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -5954,7 +5954,7 @@ _080677B4:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -6080,7 +6080,7 @@ sub_80678D0: @ 80678D0
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08067916
|
||||
|
||||
@@ -509,7 +509,7 @@ bx_t4_healthbar_update: @ 814B2D0
|
||||
adds r0, r6
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _0814B332
|
||||
.pool
|
||||
_0814B318:
|
||||
@@ -1113,7 +1113,7 @@ _0814B872:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl LinkPartnerBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -4030,7 +4030,7 @@ _0814D2CE:
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 8
|
||||
orrs r6, r0
|
||||
ldr r0, =gUnknown_02038432
|
||||
ldr r0, =gAnimMoveTurn
|
||||
mov r8, r0
|
||||
mov r0, r12
|
||||
adds r0, 0x3
|
||||
@@ -4038,7 +4038,7 @@ _0814D2CE:
|
||||
ldrb r0, [r1]
|
||||
mov r1, r8
|
||||
strb r0, [r1]
|
||||
ldr r3, =gMovePowerMoveAnim
|
||||
ldr r3, =gAnimMovePower
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4052,7 +4052,7 @@ _0814D2CE:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r3]
|
||||
ldr r3, =gMoveDmgMoveAnim
|
||||
ldr r3, =gAnimMoveDmg
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4078,7 +4078,7 @@ _0814D2CE:
|
||||
lsls r0, 24
|
||||
orrs r2, r0
|
||||
str r2, [r3]
|
||||
ldr r2, =gHappinessMoveAnim
|
||||
ldr r2, =gAnimFriendship
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 9
|
||||
mov r1, r12
|
||||
@@ -4100,7 +4100,7 @@ _0814D2CE:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r4]
|
||||
ldr r7, =gDisableStructMoveAnim
|
||||
ldr r7, =gAnimDisableStructPtr
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -4237,7 +4237,7 @@ _0814D4A4:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -4433,7 +4433,7 @@ sub_814D63C: @ 814D63C
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -4480,7 +4480,7 @@ sub_814D63C: @ 814D63C
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0814D6F6
|
||||
.pool
|
||||
_0814D6CC:
|
||||
@@ -4502,7 +4502,7 @@ _0814D6CC:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
_0814D6F6:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -5349,7 +5349,7 @@ _0814DE08:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -5474,7 +5474,7 @@ sub_814DF40: @ 814DF40
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814DF86
|
||||
|
||||
@@ -1079,7 +1079,7 @@ sub_805FA70: @ 805FA70
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _0805FABC
|
||||
.pool
|
||||
_0805FAB8:
|
||||
@@ -1666,7 +1666,7 @@ _0805FFEA:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl OpponentBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -2607,7 +2607,7 @@ _08060806:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
adds r2, r4, 0
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl OpponentBufferExecCompleted
|
||||
add sp, 0x58
|
||||
pop {r4-r7}
|
||||
@@ -4871,13 +4871,13 @@ _08061C8A:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, =gUnknown_02038432
|
||||
ldr r5, =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
ldrb r1, [r2]
|
||||
strb r1, [r5]
|
||||
ldr r4, =gMovePowerMoveAnim
|
||||
ldr r4, =gAnimMovePower
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4891,7 +4891,7 @@ _08061C8A:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r4, =gMoveDmgMoveAnim
|
||||
ldr r4, =gAnimMoveDmg
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4917,7 +4917,7 @@ _08061C8A:
|
||||
lsls r1, 24
|
||||
orrs r3, r1
|
||||
str r3, [r4]
|
||||
ldr r3, =gHappinessMoveAnim
|
||||
ldr r3, =gAnimFriendship
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 9
|
||||
mov r2, r12
|
||||
@@ -4939,7 +4939,7 @@ _08061C8A:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, =gDisableStructMoveAnim
|
||||
ldr r3, =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -5068,7 +5068,7 @@ _08061E48:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -5243,7 +5243,7 @@ sub_8061FB8: @ 8061FB8
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
_08061FD6:
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_08061FDA:
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08062156
|
||||
@@ -5347,7 +5347,7 @@ _0806209C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
adds r2, r4, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08061FDA
|
||||
.pool
|
||||
_080620C4:
|
||||
@@ -5378,7 +5378,7 @@ _080620C6:
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
adds r2, r4, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08062152
|
||||
.pool
|
||||
_08062108:
|
||||
@@ -5401,7 +5401,7 @@ _08062108:
|
||||
orrs r2, r4
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08062152
|
||||
.pool
|
||||
_0806213C:
|
||||
@@ -5413,7 +5413,7 @@ _0806213C:
|
||||
orrs r2, r4
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_08062152:
|
||||
bl OpponentBufferExecCompleted
|
||||
_08062156:
|
||||
@@ -5435,7 +5435,7 @@ sub_806215C: @ 806215C
|
||||
adds r0, 0xC0
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl EmitCmd35
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -5550,7 +5550,7 @@ _0806225A:
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -5574,7 +5574,7 @@ sub_8062294: @ 8062294
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -5621,7 +5621,7 @@ sub_8062294: @ 8062294
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0806234E
|
||||
.pool
|
||||
_08062324:
|
||||
@@ -5643,7 +5643,7 @@ _08062324:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
_0806234E:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -6409,7 +6409,7 @@ _080629B4:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -6535,7 +6535,7 @@ sub_8062AD0: @ 8062AD0
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08062B16
|
||||
|
||||
@@ -226,7 +226,7 @@ _0805764C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _080577C2
|
||||
_08057658:
|
||||
movs r0, 0x20
|
||||
@@ -393,7 +393,7 @@ _080577B2:
|
||||
movs r1, 0xC
|
||||
_080577BC:
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_080577C2:
|
||||
bl PlayerBufferExecCompleted
|
||||
b _080577E8
|
||||
@@ -403,7 +403,7 @@ _080577DC:
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080577E8
|
||||
bl sub_8073314
|
||||
bl SwapHpBarsWithHpText
|
||||
_080577E8:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -518,7 +518,7 @@ _080578A0:
|
||||
orrs r2, r0
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl dp11b_obj_free
|
||||
@@ -1086,7 +1086,7 @@ _08057E14:
|
||||
_08057E1C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl PlayerBufferExecCompleted
|
||||
b _08057F9E
|
||||
.pool
|
||||
@@ -3278,7 +3278,7 @@ bx_t1_healthbar_update: @ 8059130
|
||||
adds r0, r6
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _08059192
|
||||
.pool
|
||||
_08059178:
|
||||
@@ -3413,7 +3413,7 @@ _080591FE:
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xB
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
strb r5, [r4]
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
@@ -3557,7 +3557,7 @@ sub_8059330: @ 8059330
|
||||
negs r0, r0
|
||||
str r0, [sp]
|
||||
mov r0, r10
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
movs r0, 0x21
|
||||
bl PlaySE
|
||||
ldr r0, =sub_8059400
|
||||
@@ -3686,7 +3686,7 @@ _08059430:
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xB
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
strb r5, [r4]
|
||||
ldr r0, =sub_8059544
|
||||
str r0, [r6]
|
||||
@@ -4059,14 +4059,14 @@ sub_8059828: @ 8059828
|
||||
ldrb r1, [r0]
|
||||
ldr r2, =gUnknown_0203CF00
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
b _0805987A
|
||||
.pool
|
||||
_08059870:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x6
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
_0805987A:
|
||||
ldr r1, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
@@ -4130,7 +4130,7 @@ sub_80598E0: @ 80598E0
|
||||
ldr r0, =gScriptItemId
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl EmitCmd35
|
||||
bl PlayerBufferExecCompleted
|
||||
_08059906:
|
||||
pop {r0}
|
||||
@@ -4291,14 +4291,14 @@ _08059A2C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0xE
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08059A76
|
||||
.pool
|
||||
_08059A6C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0xD
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_08059A76:
|
||||
bl PlayerBufferExecCompleted
|
||||
_08059A7A:
|
||||
@@ -4772,7 +4772,7 @@ _08059E4E:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl PlayerBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -5713,7 +5713,7 @@ _0805A66A:
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
adds r2, r4, 0
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl PlayerBufferExecCompleted
|
||||
add sp, 0x58
|
||||
pop {r4-r7}
|
||||
@@ -8134,7 +8134,7 @@ _0805BCBE:
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 8
|
||||
orrs r6, r0
|
||||
ldr r0, =gUnknown_02038432
|
||||
ldr r0, =gAnimMoveTurn
|
||||
mov r8, r0
|
||||
mov r0, r12
|
||||
adds r0, 0x3
|
||||
@@ -8142,7 +8142,7 @@ _0805BCBE:
|
||||
ldrb r0, [r1]
|
||||
mov r1, r8
|
||||
strb r0, [r1]
|
||||
ldr r3, =gMovePowerMoveAnim
|
||||
ldr r3, =gAnimMovePower
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -8156,7 +8156,7 @@ _0805BCBE:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r3]
|
||||
ldr r3, =gMoveDmgMoveAnim
|
||||
ldr r3, =gAnimMoveDmg
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -8182,7 +8182,7 @@ _0805BCBE:
|
||||
lsls r0, 24
|
||||
orrs r2, r0
|
||||
str r2, [r3]
|
||||
ldr r2, =gHappinessMoveAnim
|
||||
ldr r2, =gAnimFriendship
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 9
|
||||
mov r1, r12
|
||||
@@ -8204,7 +8204,7 @@ _0805BCBE:
|
||||
lsls r0, 8
|
||||
orrs r2, r0
|
||||
strh r2, [r4]
|
||||
ldr r7, =gDisableStructMoveAnim
|
||||
ldr r7, =gAnimDisableStructPtr
|
||||
ldrb r1, [r5]
|
||||
lsls r1, 9
|
||||
mov r0, r12
|
||||
@@ -8341,7 +8341,7 @@ _0805BE94:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -8658,7 +8658,7 @@ sub_805C158: @ 805C158
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl PlayerBufferExecCompleted
|
||||
_0805C194:
|
||||
pop {r0}
|
||||
@@ -8826,7 +8826,7 @@ _0805C2C8:
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
mov r2, r12
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl PlayerBufferExecCompleted
|
||||
b _0805C3BC
|
||||
.pool
|
||||
@@ -8936,7 +8936,7 @@ sub_805C410: @ 805C410
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -8992,7 +8992,7 @@ _0805C44A:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0805C4F2
|
||||
.pool
|
||||
_0805C4B4:
|
||||
@@ -9016,14 +9016,14 @@ _0805C4B4:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
mov r2, r9
|
||||
ldrb r0, [r2]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
_0805C4F2:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -9067,7 +9067,7 @@ sub_805C528: @ 805C528
|
||||
.pool
|
||||
_0805C560:
|
||||
movs r0, 0x1
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl GetMonData
|
||||
@@ -9378,7 +9378,7 @@ sub_805C80C: @ 805C80C
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl PlayerBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -9390,7 +9390,7 @@ sub_805C820: @ 805C820
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl PlayerBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -9401,7 +9401,7 @@ sub_805C834: @ 805C834
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl EmitCmd35
|
||||
bl PlayerBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -9412,7 +9412,7 @@ sub_805C848: @ 805C848
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl dp01_build_cmdbuf_x24_aa_0
|
||||
bl EmitCmd36
|
||||
bl PlayerBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -10038,7 +10038,7 @@ _0805CDA4:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -10172,7 +10172,7 @@ dp01t_33_1_enemy_move: @ 805CEF4
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805CF3A
|
||||
|
||||
@@ -510,7 +510,7 @@ bx_t3_healthbar_update: @ 81BB214
|
||||
adds r0, r6
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _081BB276
|
||||
.pool
|
||||
_081BB25C:
|
||||
@@ -645,7 +645,7 @@ _081BB2E2:
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xB
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
strb r5, [r4]
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
@@ -789,7 +789,7 @@ sub_81BB414: @ 81BB414
|
||||
negs r0, r0
|
||||
str r0, [sp]
|
||||
mov r0, r10
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
movs r0, 0x21
|
||||
bl PlaySE
|
||||
ldr r0, =sub_81BB4E4
|
||||
@@ -918,7 +918,7 @@ _081BB514:
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xB
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
strb r5, [r4]
|
||||
ldr r0, =sub_81BB628
|
||||
str r0, [r6]
|
||||
@@ -1688,7 +1688,7 @@ _081BBCBE:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl PlayerPartnerBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -4652,13 +4652,13 @@ _081BD7A2:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, =gUnknown_02038432
|
||||
ldr r5, =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
ldrb r1, [r2]
|
||||
strb r1, [r5]
|
||||
ldr r4, =gMovePowerMoveAnim
|
||||
ldr r4, =gAnimMovePower
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4672,7 +4672,7 @@ _081BD7A2:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r4, =gMoveDmgMoveAnim
|
||||
ldr r4, =gAnimMoveDmg
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4698,7 +4698,7 @@ _081BD7A2:
|
||||
lsls r1, 24
|
||||
orrs r3, r1
|
||||
str r3, [r4]
|
||||
ldr r3, =gHappinessMoveAnim
|
||||
ldr r3, =gAnimFriendship
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 9
|
||||
mov r2, r12
|
||||
@@ -4720,7 +4720,7 @@ _081BD7A2:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, =gDisableStructMoveAnim
|
||||
ldr r3, =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4849,7 +4849,7 @@ _081BD960:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -5068,7 +5068,7 @@ _081BDB3C:
|
||||
orrs r2, r5
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl PlayerPartnerBufferExecCompleted
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -5138,7 +5138,7 @@ _081BDBD0:
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl PlayerPartnerBufferExecCompleted
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -5162,7 +5162,7 @@ sub_81BDC10: @ 81BDC10
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -5209,7 +5209,7 @@ sub_81BDC10: @ 81BDC10
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _081BDCCA
|
||||
.pool
|
||||
_081BDCA0:
|
||||
@@ -5231,7 +5231,7 @@ _081BDCA0:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
_081BDCCA:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -5275,7 +5275,7 @@ sub_81BDD00: @ 81BDD00
|
||||
.pool
|
||||
_081BDD38:
|
||||
movs r0, 0x1
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl GetMonData
|
||||
@@ -6082,7 +6082,7 @@ _081BE404:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -6207,7 +6207,7 @@ sub_81BE53C: @ 81BE53C
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081BE582
|
||||
|
||||
@@ -966,7 +966,7 @@ sub_8186D04: @ 8186D04
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _08186D50
|
||||
.pool
|
||||
_08186D4C:
|
||||
@@ -1553,7 +1553,7 @@ _0818727E:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl RecordedOpponentBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -4408,13 +4408,13 @@ _08188BE6:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, =gUnknown_02038432
|
||||
ldr r5, =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
ldrb r1, [r2]
|
||||
strb r1, [r5]
|
||||
ldr r4, =gMovePowerMoveAnim
|
||||
ldr r4, =gAnimMovePower
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4428,7 +4428,7 @@ _08188BE6:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r4, =gMoveDmgMoveAnim
|
||||
ldr r4, =gAnimMoveDmg
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4454,7 +4454,7 @@ _08188BE6:
|
||||
lsls r1, 24
|
||||
orrs r3, r1
|
||||
str r3, [r4]
|
||||
ldr r3, =gHappinessMoveAnim
|
||||
ldr r3, =gAnimFriendship
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 9
|
||||
mov r2, r12
|
||||
@@ -4476,7 +4476,7 @@ _08188BE6:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, =gDisableStructMoveAnim
|
||||
ldr r3, =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4605,7 +4605,7 @@ _08188DA4:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl RecordedOpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08188F6C
|
||||
.pool
|
||||
_08188F48:
|
||||
@@ -4803,7 +4803,7 @@ _08188F48:
|
||||
orrs r2, r4
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_08188F6C:
|
||||
bl RecordedOpponentBufferExecCompleted
|
||||
pop {r4,r5}
|
||||
@@ -4839,7 +4839,7 @@ sub_8188F88: @ 8188F88
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl RecordedOpponentBufferExecCompleted
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -4863,7 +4863,7 @@ sub_8188FD0: @ 8188FD0
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -4910,7 +4910,7 @@ sub_8188FD0: @ 8188FD0
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0818908A
|
||||
.pool
|
||||
_08189060:
|
||||
@@ -4932,7 +4932,7 @@ _08189060:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
_0818908A:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -5693,7 +5693,7 @@ _081896E4:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -5819,7 +5819,7 @@ sub_8189800: @ 8189800
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08189846
|
||||
|
||||
@@ -885,7 +885,7 @@ sub_818A0A4: @ 818A0A4
|
||||
adds r0, r6
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _0818A106
|
||||
.pool
|
||||
_0818A0EC:
|
||||
@@ -1489,7 +1489,7 @@ _0818A646:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl RecordedPlayerBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -4508,13 +4508,13 @@ _0818C192:
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, =gUnknown_02038432
|
||||
ldr r5, =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
ldrb r1, [r2]
|
||||
strb r1, [r5]
|
||||
ldr r4, =gMovePowerMoveAnim
|
||||
ldr r4, =gAnimMovePower
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4528,7 +4528,7 @@ _0818C192:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r4, =gMoveDmgMoveAnim
|
||||
ldr r4, =gAnimMoveDmg
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4554,7 +4554,7 @@ _0818C192:
|
||||
lsls r1, 24
|
||||
orrs r3, r1
|
||||
str r3, [r4]
|
||||
ldr r3, =gHappinessMoveAnim
|
||||
ldr r3, =gAnimFriendship
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 9
|
||||
mov r2, r12
|
||||
@@ -4576,7 +4576,7 @@ _0818C192:
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, =gDisableStructMoveAnim
|
||||
ldr r3, =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -4705,7 +4705,7 @@ _0818C350:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl RecordedPlayerBufferExecCompleted
|
||||
_0818C4C6:
|
||||
pop {r0}
|
||||
@@ -4897,7 +4897,7 @@ _0818C508:
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl RecordedPlayerBufferExecCompleted
|
||||
_0818C522:
|
||||
pop {r0}
|
||||
@@ -4929,7 +4929,7 @@ sub_818C538: @ 818C538
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _0818C584
|
||||
.pool
|
||||
_0818C560:
|
||||
@@ -4947,7 +4947,7 @@ _0818C560:
|
||||
orrs r2, r4
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_0818C584:
|
||||
bl RecordedPlayerBufferExecCompleted
|
||||
pop {r4,r5}
|
||||
@@ -4983,7 +4983,7 @@ sub_818C5A0: @ 818C5A0
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl EmitCmd34
|
||||
bl RecordedPlayerBufferExecCompleted
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -5007,7 +5007,7 @@ sub_818C5E8: @ 818C5E8
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -5054,7 +5054,7 @@ sub_818C5E8: @ 818C5E8
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0818C6B2
|
||||
.pool
|
||||
_0818C678:
|
||||
@@ -5076,14 +5076,14 @@ _0818C678:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
mov r1, r9
|
||||
ldrb r0, [r1]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
_0818C6B2:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -5878,7 +5878,7 @@ _0818CD60:
|
||||
subs r4, 0x2
|
||||
adds r3, r4
|
||||
ldrb r3, [r3]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
@@ -6003,7 +6003,7 @@ sub_818CE98: @ 818CE98
|
||||
push {r4,lr}
|
||||
ldr r4, =gActiveBank
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0818CEDE
|
||||
|
||||
@@ -103,13 +103,13 @@ _0815942A:
|
||||
movs r1, 0x7
|
||||
_0815942E:
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
b _08159440
|
||||
_08159436:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x8
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
_08159440:
|
||||
bl SafariBufferExecCompleted
|
||||
b _0815954E
|
||||
@@ -399,7 +399,7 @@ sub_8159698: @ 8159698
|
||||
ldr r0, =gScriptItemId
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl EmitCmd35
|
||||
bl SafariBufferExecCompleted
|
||||
_081596BE:
|
||||
pop {r0}
|
||||
|
||||
@@ -153,7 +153,7 @@ _081684CE:
|
||||
movs r1, 0x9
|
||||
_081684E4:
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl WallyBufferExecCompleted
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x94
|
||||
@@ -208,7 +208,7 @@ _08168540:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl WallyBufferExecCompleted
|
||||
_08168564:
|
||||
pop {r4,r5}
|
||||
@@ -311,7 +311,7 @@ sub_8168610: @ 8168610
|
||||
ldr r0, =gScriptItemId
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl EmitCmd35
|
||||
bl WallyBufferExecCompleted
|
||||
_08168636:
|
||||
pop {r0}
|
||||
@@ -676,7 +676,7 @@ sub_8168934: @ 8168934
|
||||
adds r0, r6
|
||||
ldrb r0, [r0]
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
b _08168996
|
||||
.pool
|
||||
_0816897C:
|
||||
@@ -975,7 +975,7 @@ _08168BFA:
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl EmitDataTransfer
|
||||
bl WallyBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
@@ -3316,13 +3316,13 @@ sub_816A144: @ 816A144
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
ldr r5, =gUnknown_02038432
|
||||
ldr r5, =gAnimMoveTurn
|
||||
mov r1, r12
|
||||
adds r1, 0x3
|
||||
adds r2, r1
|
||||
ldrb r1, [r2]
|
||||
strb r1, [r5]
|
||||
ldr r4, =gMovePowerMoveAnim
|
||||
ldr r4, =gAnimMovePower
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -3336,7 +3336,7 @@ sub_816A144: @ 816A144
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r4, =gMoveDmgMoveAnim
|
||||
ldr r4, =gAnimMoveDmg
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -3362,7 +3362,7 @@ sub_816A144: @ 816A144
|
||||
lsls r1, 24
|
||||
orrs r3, r1
|
||||
str r3, [r4]
|
||||
ldr r3, =gHappinessMoveAnim
|
||||
ldr r3, =gAnimFriendship
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 9
|
||||
mov r2, r12
|
||||
@@ -3384,7 +3384,7 @@ sub_816A144: @ 816A144
|
||||
lsls r1, 8
|
||||
orrs r3, r1
|
||||
strh r3, [r4]
|
||||
ldr r3, =gDisableStructMoveAnim
|
||||
ldr r3, =gAnimDisableStructPtr
|
||||
ldrb r2, [r6]
|
||||
lsls r2, 9
|
||||
mov r1, r12
|
||||
@@ -3505,7 +3505,7 @@ _0816A2F6:
|
||||
movs r0, 0
|
||||
bl sub_805EB9C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_start_t1
|
||||
bl DoMoveAnim
|
||||
ldr r0, [r7]
|
||||
ldrb r1, [r6]
|
||||
ldr r2, [r0, 0x4]
|
||||
@@ -3777,7 +3777,7 @@ _0816A550:
|
||||
lsls r2, 1
|
||||
movs r0, 0x1
|
||||
movs r1, 0xA
|
||||
bl EmitCmd_x21
|
||||
bl EmitCmd33
|
||||
bl WallyBufferExecCompleted
|
||||
_0816A574:
|
||||
pop {r4}
|
||||
@@ -3836,7 +3836,7 @@ sub_816A5D4: @ 816A5D4
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
bl load_gfxc_health_bar
|
||||
bl LoadBattleBarGfx
|
||||
ldr r3, =gBattleBufferA
|
||||
ldr r0, =gActiveBank
|
||||
mov r9, r0
|
||||
@@ -3883,7 +3883,7 @@ sub_816A5D4: @ 816A5D4
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
mov r2, r8
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
b _0816A69E
|
||||
.pool
|
||||
_0816A664:
|
||||
@@ -3905,14 +3905,14 @@ _0816A664:
|
||||
ldrb r1, [r1]
|
||||
str r7, [sp]
|
||||
movs r3, 0
|
||||
bl sub_807294C
|
||||
bl SetBattleBarStruct
|
||||
mov r1, r9
|
||||
ldrb r0, [r1]
|
||||
adds r0, r4
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl heathbar_draw_hp
|
||||
bl UpdateHpTextInHealthbox
|
||||
_0816A69E:
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
@@ -4645,7 +4645,7 @@ _0816ACA8:
|
||||
subs r3, 0x2
|
||||
adds r4, r3
|
||||
ldrb r3, [r4]
|
||||
bl sub_80735DC
|
||||
bl CreatePartyStatusSummarySprites
|
||||
ldr r2, =gUnknown_020244B4
|
||||
ldrb r1, [r5]
|
||||
adds r1, r2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1980,7 +1980,7 @@ _080B3474:
|
||||
bl sub_800B524
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
adds r5, 0x1C
|
||||
adds r4, 0x1
|
||||
_080B349A:
|
||||
|
||||
@@ -1,399 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start c2_clear_save_data_screen_2
|
||||
c2_clear_save_data_screen_2: @ 817ACC8
|
||||
push {lr}
|
||||
bl sub_817AE00
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0817ACDC
|
||||
ldr r0, =sub_817ACE4
|
||||
movs r1, 0
|
||||
bl CreateTask
|
||||
_0817ACDC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end c2_clear_save_data_screen_2
|
||||
|
||||
thumb_func_start sub_817ACE4
|
||||
sub_817ACE4: @ 817ACE4
|
||||
push {r4,lr}
|
||||
sub sp, 0xC
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0xE
|
||||
bl SetWindowBorderStyle
|
||||
ldr r2, =gText_ClearAllSaveData
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x4]
|
||||
str r0, [sp, 0x8]
|
||||
movs r1, 0x1
|
||||
movs r3, 0
|
||||
bl PrintTextOnWindow
|
||||
ldr r0, =gUnknown_085F06D8
|
||||
movs r1, 0x2
|
||||
movs r2, 0xE
|
||||
movs r3, 0x1
|
||||
bl CreateYesNoMenu
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, =sub_817AD40
|
||||
str r1, [r0]
|
||||
add sp, 0xC
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_817ACE4
|
||||
|
||||
thumb_func_start sub_817AD40
|
||||
sub_817AD40: @ 817AD40
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_8198C58
|
||||
lsls r0, 24
|
||||
asrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
beq _0817AD68
|
||||
cmp r4, 0
|
||||
bgt _0817AD62
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
cmp r4, r0
|
||||
beq _0817ADA0
|
||||
b _0817ADB2
|
||||
_0817AD62:
|
||||
cmp r4, 0x1
|
||||
beq _0817ADA0
|
||||
b _0817ADB2
|
||||
_0817AD68:
|
||||
movs r0, 0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r2, =gText_ClearingData
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
str r4, [sp, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
movs r3, 0
|
||||
bl PrintTextOnWindow
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, =sub_817ADC0
|
||||
str r1, [r0]
|
||||
b _0817ADB2
|
||||
.pool
|
||||
_0817ADA0:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
adds r0, r5, 0
|
||||
bl DestroyTask
|
||||
ldr r0, =sub_817AFD4
|
||||
bl SetMainCallback2
|
||||
_0817ADB2:
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_817AD40
|
||||
|
||||
thumb_func_start sub_817ADC0
|
||||
sub_817ADC0: @ 817ADC0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl ClearSaveData
|
||||
adds r0, r4, 0
|
||||
bl DestroyTask
|
||||
ldr r0, =sub_817AFD4
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_817ADC0
|
||||
|
||||
thumb_func_start sub_817ADE4
|
||||
sub_817ADE4: @ 817ADE4
|
||||
push {lr}
|
||||
bl RunTasks
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_817ADE4
|
||||
|
||||
thumb_func_start sub_817ADF4
|
||||
sub_817ADF4: @ 817ADF4
|
||||
push {lr}
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_817ADF4
|
||||
|
||||
thumb_func_start sub_817AE00
|
||||
sub_817AE00: @ 817AE00
|
||||
push {r4,lr}
|
||||
sub sp, 0xC
|
||||
ldr r0, =gMain
|
||||
movs r1, 0x87
|
||||
lsls r1, 3
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0817AE18
|
||||
cmp r0, 0x1
|
||||
bne _0817AE18
|
||||
b _0817AFA4
|
||||
_0817AE18:
|
||||
movs r0, 0
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1C
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1E
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x40
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x44
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x48
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
add r0, sp, 0x4
|
||||
movs r4, 0
|
||||
strh r4, [r0]
|
||||
ldr r1, =0x040000d4
|
||||
str r0, [r1]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 19
|
||||
str r0, [r1, 0x4]
|
||||
ldr r0, =0x8100c000
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
movs r2, 0
|
||||
str r2, [sp, 0x8]
|
||||
add r0, sp, 0x8
|
||||
str r0, [r1]
|
||||
movs r0, 0xE0
|
||||
lsls r0, 19
|
||||
str r0, [r1, 0x4]
|
||||
ldr r0, =0x85000100
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
add r0, sp, 0x4
|
||||
strh r2, [r0]
|
||||
str r0, [r1]
|
||||
ldr r0, =0x05000002
|
||||
str r0, [r1, 0x4]
|
||||
ldr r0, =0x810001ff
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
bl ResetPaletteFade
|
||||
ldr r2, =gPlttBufferUnfaded
|
||||
ldr r0, =0x00007fff
|
||||
strh r0, [r2]
|
||||
ldr r1, =gPlttBufferFaded
|
||||
strh r0, [r1]
|
||||
ldr r0, =0x00003945
|
||||
strh r0, [r2, 0x2]
|
||||
strh r0, [r1, 0x2]
|
||||
movs r1, 0
|
||||
ldr r3, =0x06000020
|
||||
ldr r0, =0x00001111
|
||||
adds r2, r0, 0
|
||||
_0817AED4:
|
||||
lsls r0, r1, 1
|
||||
adds r0, r3
|
||||
strh r2, [r0]
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
cmp r1, 0xF
|
||||
bls _0817AED4
|
||||
movs r1, 0
|
||||
ldr r4, =0x0600f000
|
||||
movs r3, 0x1
|
||||
ldr r2, =0x000003ff
|
||||
_0817AEEC:
|
||||
lsls r0, r1, 1
|
||||
adds r0, r4
|
||||
strh r3, [r0]
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
cmp r1, r2
|
||||
bls _0817AEEC
|
||||
bl ResetTasks
|
||||
bl ResetSpriteData
|
||||
movs r0, 0
|
||||
bl ResetBgsAndClearDma3BusyFlags
|
||||
ldr r1, =gUnknown_085F06C0
|
||||
movs r0, 0
|
||||
movs r2, 0x2
|
||||
bl InitBgsFromTemplates
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl ShowBg
|
||||
movs r0, 0x3
|
||||
bl ShowBg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
bl sub_817B02C
|
||||
ldr r0, =0x0000ffff
|
||||
str r0, [sp]
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0x1
|
||||
bl EnableInterrupts
|
||||
ldr r0, =sub_817ADF4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, =gMain
|
||||
movs r1, 0x87
|
||||
lsls r1, 3
|
||||
adds r0, r1
|
||||
movs r1, 0x1
|
||||
strb r1, [r0]
|
||||
b _0817AFC8
|
||||
.pool
|
||||
_0817AFA4:
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, =gPaletteFade
|
||||
ldrb r1, [r0, 0x7]
|
||||
movs r0, 0x80
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0817AFC8
|
||||
ldr r0, =sub_817ADE4
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x1
|
||||
b _0817AFCA
|
||||
.pool
|
||||
_0817AFC8:
|
||||
movs r0, 0
|
||||
_0817AFCA:
|
||||
add sp, 0xC
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_817AE00
|
||||
|
||||
thumb_func_start sub_817AFD4
|
||||
sub_817AFD4: @ 817AFD4
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
ldr r0, =gMain
|
||||
movs r1, 0x87
|
||||
lsls r1, 3
|
||||
adds r4, r0, r1
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0817AFEA
|
||||
cmp r0, 0x1
|
||||
beq _0817B008
|
||||
_0817AFEA:
|
||||
ldr r0, =0x0000ffff
|
||||
str r0, [sp]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0x1
|
||||
strb r0, [r4]
|
||||
b _0817B020
|
||||
.pool
|
||||
_0817B008:
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, =gPaletteFade
|
||||
ldrb r1, [r0, 0x7]
|
||||
movs r0, 0x80
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0817B020
|
||||
bl FreeAllWindowBuffers
|
||||
bl DoSoftReset
|
||||
_0817B020:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_817AFD4
|
||||
|
||||
thumb_func_start sub_817B02C
|
||||
sub_817B02C: @ 817B02C
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_085F06C8
|
||||
bl InitWindows
|
||||
bl DeactivateAllTextPrinters
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0xE0
|
||||
bl sub_80987D4
|
||||
ldr r0, =gUnknown_0860F074
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl LoadPalette
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_817B02C
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+176
-176
File diff suppressed because it is too large
Load Diff
+149
-149
File diff suppressed because it is too large
Load Diff
+74
-74
@@ -68,7 +68,7 @@ ContestEffectFunc_080E547C: @ 80E547C
|
||||
thumb_func_start ContestEffectFunc_080E5480
|
||||
ContestEffectFunc_080E5480: @ 80E5480
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -94,7 +94,7 @@ ContestEffectFunc_080E5480: @ 80E5480
|
||||
thumb_func_start ContestEffectFunc_080E54B0
|
||||
ContestEffectFunc_080E54B0: @ 80E54B0
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -119,7 +119,7 @@ ContestEffectFunc_080E54B0: @ 80E54B0
|
||||
|
||||
thumb_func_start ContestEffectFunc_080E54E0
|
||||
ContestEffectFunc_080E54E0: @ 80E54E0
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -165,7 +165,7 @@ ContestEffectFunc_080E54E0: @ 80E54E0
|
||||
thumb_func_start ContestEffectFunc_080E5534
|
||||
ContestEffectFunc_080E5534: @ 80E5534
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -189,7 +189,7 @@ ContestEffectFunc_080E5534: @ 80E5534
|
||||
thumb_func_start ContestEffectFunc_080E5560
|
||||
ContestEffectFunc_080E5560: @ 80E5560
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -215,7 +215,7 @@ ContestEffectFunc_080E5560: @ 80E5560
|
||||
thumb_func_start ContestEffectFunc_080E5590
|
||||
ContestEffectFunc_080E5590: @ 80E5590
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -239,7 +239,7 @@ ContestEffectFunc_080E5590: @ 80E5590
|
||||
thumb_func_start ContestEffectFunc_080E55BC
|
||||
ContestEffectFunc_080E55BC: @ 80E55BC
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -266,7 +266,7 @@ ContestEffectFunc_080E55BC: @ 80E55BC
|
||||
ContestEffectFunc_080E55EC: @ 80E55EC
|
||||
push {r4,r5,lr}
|
||||
movs r2, 0
|
||||
ldr r5, =gUnknown_02039F34
|
||||
ldr r5, =gContestResources
|
||||
ldr r0, [r5]
|
||||
ldr r1, [r0, 0x8]
|
||||
ldrb r4, [r1, 0x11]
|
||||
@@ -293,7 +293,7 @@ _080E560A:
|
||||
cmp r0, r1
|
||||
bne _080E560A
|
||||
_080E5622:
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
ldr r0, [r1]
|
||||
ldr r0, [r0, 0x8]
|
||||
strb r2, [r0, 0x8]
|
||||
@@ -307,14 +307,14 @@ _080E5622:
|
||||
_080E563A:
|
||||
cmp r2, 0
|
||||
bne _080E564C
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
movs r1, 0x36
|
||||
bl sub_80DD3F0
|
||||
_080E564C:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -330,7 +330,7 @@ _080E564C:
|
||||
ContestEffectFunc_080E5664: @ 80E5664
|
||||
push {r4-r6,lr}
|
||||
movs r1, 0
|
||||
ldr r2, =gUnknown_02039F34
|
||||
ldr r2, =gContestResources
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r5, [r0, 0x11]
|
||||
@@ -359,7 +359,7 @@ _080E5698:
|
||||
adds r3, 0x1
|
||||
cmp r3, 0x3
|
||||
ble _080E567E
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
adds r0, 0x8
|
||||
@@ -372,14 +372,14 @@ _080E5698:
|
||||
_080E56B4:
|
||||
cmp r1, 0
|
||||
bne _080E56C6
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
movs r1, 0x36
|
||||
bl sub_80DD3F0
|
||||
_080E56C6:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -409,7 +409,7 @@ ContestEffectFunc_080E56E0: @ 80E56E0
|
||||
bhi _080E5702
|
||||
movs r1, 0x28
|
||||
_080E5702:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
strh r1, [r0, 0x4]
|
||||
@@ -425,7 +425,7 @@ ContestEffectFunc_080E5718: @ 80E5718
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
movs r7, 0
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
ldr r0, [r1]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r5, [r0, 0x11]
|
||||
@@ -521,7 +521,7 @@ ContestEffectFunc_080E57CC: @ 80E57CC
|
||||
push {r5-r7}
|
||||
movs r0, 0
|
||||
mov r9, r0
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
ldr r0, [r1]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -619,7 +619,7 @@ ContestEffectFunc_080E588C: @ 80E588C
|
||||
push {r6,r7}
|
||||
movs r0, 0
|
||||
mov r9, r0
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
ldr r0, [r1]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r7, [r0, 0x11]
|
||||
@@ -674,7 +674,7 @@ _080E58DA:
|
||||
_080E5900:
|
||||
adds r6, 0x1C
|
||||
adds r5, 0x1
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
cmp r5, 0x3
|
||||
ble _080E58B0
|
||||
_080E590A:
|
||||
@@ -704,7 +704,7 @@ _080E5928:
|
||||
thumb_func_start ContestEffectFunc_080E5938
|
||||
ContestEffectFunc_080E5938: @ 80E5938
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r1, [r4]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -732,7 +732,7 @@ ContestEffectFunc_080E5938: @ 80E5938
|
||||
thumb_func_start ContestEffectFunc_080E5970
|
||||
ContestEffectFunc_080E5970: @ 80E5970
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r1, [r4]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -765,7 +765,7 @@ ContestEffectFunc_080E59B0: @ 80E59B0
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
bl sub_80E6934
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -781,7 +781,7 @@ ContestEffectFunc_080E59D0: @ 80E59D0
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_80E6934
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -797,7 +797,7 @@ ContestEffectFunc_080E59F0: @ 80E59F0
|
||||
push {lr}
|
||||
movs r0, 0x2
|
||||
bl sub_80E6934
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -813,7 +813,7 @@ ContestEffectFunc_080E5A10: @ 80E5A10
|
||||
push {lr}
|
||||
movs r0, 0x3
|
||||
bl sub_80E6934
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -829,7 +829,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
|
||||
push {lr}
|
||||
movs r0, 0x4
|
||||
bl sub_80E6934
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -844,7 +844,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
|
||||
ContestEffectFunc_080E5A50: @ 80E5A50
|
||||
push {r4-r6,lr}
|
||||
movs r4, 0
|
||||
ldr r2, =gUnknown_02039F34
|
||||
ldr r2, =gContestResources
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x11]
|
||||
@@ -855,7 +855,7 @@ ContestEffectFunc_080E5A50: @ 80E5A50
|
||||
beq _080E5AB0
|
||||
movs r5, 0
|
||||
_080E5A68:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x8]
|
||||
ldrb r0, [r1, 0x11]
|
||||
@@ -932,7 +932,7 @@ ContestEffectFunc_080E5AD4: @ 80E5AD4
|
||||
mov r10, r3
|
||||
movs r6, 0
|
||||
_080E5B00:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r2, [r0]
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrb r0, [r1, 0x11]
|
||||
@@ -1000,7 +1000,7 @@ _080E5B76:
|
||||
bge _080E5B76
|
||||
_080E5B7E:
|
||||
movs r5, 0
|
||||
ldr r7, =gUnknown_02039F34
|
||||
ldr r7, =gContestResources
|
||||
movs r6, 0
|
||||
mov r4, r10
|
||||
_080E5B86:
|
||||
@@ -1125,7 +1125,7 @@ _080E5C70:
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
_080E5C86:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
adds r0, 0xD
|
||||
@@ -1139,7 +1139,7 @@ _080E5C86:
|
||||
cmp r0, 0xFF
|
||||
bne _080E5C16
|
||||
_080E5CA0:
|
||||
ldr r6, =gUnknown_02039F34
|
||||
ldr r6, =gContestResources
|
||||
ldr r0, [r6]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1173,7 +1173,7 @@ ContestEffectFunc_080E5CD4: @ 80E5CD4
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
movs r6, 0
|
||||
ldr r7, =gUnknown_02039F34
|
||||
ldr r7, =gContestResources
|
||||
movs r5, 0
|
||||
_080E5CE4:
|
||||
ldr r2, [r7]
|
||||
@@ -1228,7 +1228,7 @@ _080E5D46:
|
||||
adds r6, 0x1
|
||||
cmp r6, 0x3
|
||||
ble _080E5CE4
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1256,7 +1256,7 @@ ContestEffectFunc_080E5D7C: @ 80E5D7C
|
||||
push {r4-r7,lr}
|
||||
movs r7, 0
|
||||
movs r4, 0
|
||||
ldr r5, =gUnknown_02039F34
|
||||
ldr r5, =gContestResources
|
||||
movs r6, 0
|
||||
_080E5D86:
|
||||
ldr r3, [r5]
|
||||
@@ -1301,7 +1301,7 @@ _080E5DD2:
|
||||
adds r4, 0x1
|
||||
cmp r4, 0x3
|
||||
ble _080E5D86
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1325,7 +1325,7 @@ _080E5DF8:
|
||||
ContestEffectFunc_080E5E04: @ 80E5E04
|
||||
push {r4,lr}
|
||||
ldr r1, =gUnknown_02039F26
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r4, [r0]
|
||||
ldr r0, [r4, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1366,7 +1366,7 @@ _080E5E46:
|
||||
ContestEffectFunc_080E5E5C: @ 80E5E5C
|
||||
push {r4,lr}
|
||||
ldr r1, =gUnknown_02039F26
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r4, [r0]
|
||||
ldr r0, [r4, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1408,7 +1408,7 @@ ContestEffectFunc_080E5EB4: @ 80E5EB4
|
||||
push {r4-r7,lr}
|
||||
movs r1, 0
|
||||
movs r5, 0
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r4, [r0]
|
||||
ldr r2, [r4, 0x8]
|
||||
ldrb r0, [r2, 0x11]
|
||||
@@ -1434,7 +1434,7 @@ _080E5EDA:
|
||||
bge _080E5EE8
|
||||
movs r5, 0
|
||||
_080E5EE8:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r3, [r0]
|
||||
ldr r0, [r3, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1467,7 +1467,7 @@ _080E5F0C:
|
||||
movs r1, 0x11
|
||||
bl sub_80DD3D4
|
||||
_080E5F2C:
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r1, [r4]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1498,7 +1498,7 @@ _080E5F2C:
|
||||
ContestEffectFunc_080E5F64: @ 80E5F64
|
||||
push {r4-r7,lr}
|
||||
movs r6, 0
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r4, [r0]
|
||||
ldr r2, [r4, 0x8]
|
||||
ldrb r1, [r2, 0x11]
|
||||
@@ -1567,7 +1567,7 @@ _080E5FDE:
|
||||
thumb_func_start ContestEffectFunc_080E5FE4
|
||||
ContestEffectFunc_080E5FE4: @ 80E5FE4
|
||||
push {r4,r5,lr}
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
ldr r3, [r1]
|
||||
ldr r0, [r3, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1647,7 +1647,7 @@ ContestEffectFunc_080E6068: @ 80E6068
|
||||
cmp r0, 0x2
|
||||
bhi _080E6098
|
||||
movs r4, 0xA
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1659,7 +1659,7 @@ _080E6098:
|
||||
cmp r0, 0x5
|
||||
bhi _080E60B4
|
||||
movs r4, 0x14
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1671,7 +1671,7 @@ _080E60B4:
|
||||
cmp r0, 0x7
|
||||
bhi _080E60D0
|
||||
movs r4, 0x28
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1683,7 +1683,7 @@ _080E60D0:
|
||||
cmp r1, 0x8
|
||||
bhi _080E60EC
|
||||
movs r4, 0x3C
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -1693,14 +1693,14 @@ _080E60D0:
|
||||
.pool
|
||||
_080E60EC:
|
||||
movs r4, 0x50
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
movs r1, 0x1E
|
||||
bl sub_80DD3D4
|
||||
_080E60FC:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -1721,7 +1721,7 @@ ContestEffectFunc_080E611C: @ 80E611C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
ldr r2, =gUnknown_02039F34
|
||||
ldr r2, =gContestResources
|
||||
ldr r0, [r2]
|
||||
ldr r3, [r0, 0x8]
|
||||
ldrb r0, [r3, 0x11]
|
||||
@@ -1743,7 +1743,7 @@ _080E6140:
|
||||
adds r5, r0, 0
|
||||
cmp r6, r1
|
||||
beq _080E616A
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
_080E614E:
|
||||
lsls r0, r2, 24
|
||||
movs r2, 0x80
|
||||
@@ -1845,7 +1845,7 @@ ContestEffectFunc_080E620C: @ 80E620C
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
push {r6,r7}
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r3, [r0]
|
||||
ldr r1, [r3, 0x8]
|
||||
ldrb r2, [r1, 0x11]
|
||||
@@ -1928,7 +1928,7 @@ _080E62AC:
|
||||
thumb_func_start ContestEffectFunc_080E62B8
|
||||
ContestEffectFunc_080E62B8: @ 80E62B8
|
||||
push {r4-r7,lr}
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x11]
|
||||
@@ -1939,7 +1939,7 @@ ContestEffectFunc_080E62B8: @ 80E62B8
|
||||
movs r5, 0
|
||||
movs r6, 0
|
||||
_080E62CE:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r4, [r0]
|
||||
ldr r1, [r4, 0x8]
|
||||
ldrb r2, [r1, 0x11]
|
||||
@@ -1994,7 +1994,7 @@ _080E632E:
|
||||
thumb_func_start ContestEffectFunc_080E6334
|
||||
ContestEffectFunc_080E6334: @ 80E6334
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r1, [r4]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -2046,7 +2046,7 @@ _080E6390:
|
||||
thumb_func_start ContestEffectFunc_080E6398
|
||||
ContestEffectFunc_080E6398: @ 80E6398
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02039F34
|
||||
ldr r3, =gContestResources
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -2090,7 +2090,7 @@ _080E63E4:
|
||||
ContestEffectFunc_080E63E8: @ 80E63E8
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r2, [r0]
|
||||
ldr r1, [r2]
|
||||
ldrb r1, [r1, 0x1]
|
||||
@@ -2258,7 +2258,7 @@ ContestEffectFunc_080E6520: @ 80E6520
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x4
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r2, [r0]
|
||||
ldr r1, [r2]
|
||||
ldrb r1, [r1, 0x1]
|
||||
@@ -2434,7 +2434,7 @@ ContestEffectFunc_080E6664: @ 80E6664
|
||||
ContestEffectFunc_080E6668: @ 80E6668
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1]
|
||||
ldrb r0, [r0, 0x1]
|
||||
@@ -2517,7 +2517,7 @@ _080E66FC:
|
||||
cmp r0, 0x3
|
||||
ble _080E66AA
|
||||
movs r6, 0
|
||||
ldr r5, =gUnknown_02039F34
|
||||
ldr r5, =gContestResources
|
||||
adds r4, r5, 0
|
||||
_080E6712:
|
||||
ldr r0, [r4]
|
||||
@@ -2576,7 +2576,7 @@ _080E676C:
|
||||
ContestEffectFunc_080E6778: @ 80E6778
|
||||
push {lr}
|
||||
ldr r3, =gContestMoves
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -2613,7 +2613,7 @@ ContestEffectFunc_080E67BC: @ 80E67BC
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
movs r4, 0
|
||||
ldr r5, =gUnknown_02039F34
|
||||
ldr r5, =gContestResources
|
||||
movs r6, 0
|
||||
_080E67CC:
|
||||
ldr r3, [r5]
|
||||
@@ -2672,14 +2672,14 @@ _080E682E:
|
||||
mov r7, r8
|
||||
cmp r7, 0
|
||||
bne _080E684A
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
movs r1, 0x36
|
||||
bl sub_80DD3F0
|
||||
_080E684A:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -2696,7 +2696,7 @@ _080E684A:
|
||||
thumb_func_start ContestEffectFunc_080E6868
|
||||
ContestEffectFunc_080E6868: @ 80E6868
|
||||
push {r4,lr}
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1]
|
||||
ldrb r0, [r0, 0x13]
|
||||
@@ -2745,7 +2745,7 @@ _080E68C2:
|
||||
movs r1, 0x1E
|
||||
bl sub_80DD3D4
|
||||
_080E68CE:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldrb r2, [r0, 0x11]
|
||||
@@ -2764,7 +2764,7 @@ _080E68CE:
|
||||
thumb_func_start ContestEffectFunc_080E68EC
|
||||
ContestEffectFunc_080E68EC: @ 80E68EC
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r0, [r4]
|
||||
ldr r2, [r0, 0x10]
|
||||
ldrb r1, [r2, 0x1]
|
||||
@@ -2811,7 +2811,7 @@ sub_80E6934: @ 80E6934
|
||||
mov r8, r0
|
||||
movs r7, 0
|
||||
movs r4, 0
|
||||
ldr r6, =gUnknown_02039F34
|
||||
ldr r6, =gContestResources
|
||||
ldr r0, =gContestMoves
|
||||
mov r9, r0
|
||||
movs r5, 0
|
||||
@@ -2861,7 +2861,7 @@ _080E699E:
|
||||
ble _080E694E
|
||||
cmp r7, 0
|
||||
bne _080E69B8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@@ -2882,7 +2882,7 @@ sub_80E69C8: @ 80E69C8
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, =gUnknown_02039F34
|
||||
ldr r2, =gContestResources
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0, 0x8]
|
||||
adds r0, 0xD
|
||||
@@ -2945,7 +2945,7 @@ sub_80E6A2C: @ 80E6A2C
|
||||
movs r2, 0x8
|
||||
bl memset
|
||||
movs r7, 0
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x8]
|
||||
@@ -3040,7 +3040,7 @@ _080E6AD6:
|
||||
strh r0, [r1]
|
||||
_080E6AFE:
|
||||
adds r7, 0x1
|
||||
ldr r4, =gUnknown_02039F34
|
||||
ldr r4, =gContestResources
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x8]
|
||||
adds r0, 0x8
|
||||
@@ -3081,7 +3081,7 @@ sub_80E6B3C: @ 80E6B3C
|
||||
lsrs r0, 24
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
ldr r2, =gUnknown_02039F34
|
||||
ldr r2, =gContestResources
|
||||
ldr r4, [r2]
|
||||
ldr r3, [r4, 0x4]
|
||||
lsls r2, r0, 3
|
||||
|
||||
@@ -50,7 +50,7 @@ sub_80FC530: @ 80FC530
|
||||
cmp r4, 0
|
||||
beq _080FC552
|
||||
adds r0, r5, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
movs r0, 0x1
|
||||
b _080FC554
|
||||
_080FC552:
|
||||
@@ -657,7 +657,7 @@ _080FCA30:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FCAB2
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r2, [r0]
|
||||
ldr r0, =gUnknown_02039F25
|
||||
ldrb r0, [r0]
|
||||
@@ -688,7 +688,7 @@ _080FCA68:
|
||||
ldrb r0, [r6]
|
||||
cmp r2, r0
|
||||
bge _080FCAA4
|
||||
ldr r1, =gUnknown_02039F34
|
||||
ldr r1, =gContestResources
|
||||
mov r8, r1
|
||||
ldr r4, =gBlockRecvBuffer
|
||||
movs r3, 0
|
||||
@@ -955,7 +955,7 @@ _080FCCE8:
|
||||
bne _080FCCF4
|
||||
b _080FCE42
|
||||
_080FCCF4:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
movs r1, 0x70
|
||||
@@ -968,7 +968,7 @@ _080FCD04:
|
||||
bne _080FCD10
|
||||
b _080FCE42
|
||||
_080FCD10:
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
ldr r1, =gUnknown_02039F2B
|
||||
@@ -1004,7 +1004,7 @@ _080FCD54:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FCE42
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
movs r1, 0x14
|
||||
@@ -1015,7 +1015,7 @@ _080FCD6C:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FCE42
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldr r1, =gUnknown_02039F2B
|
||||
@@ -1031,7 +1031,7 @@ _080FCD98:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FCE42
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x10]
|
||||
b _080FCDD4
|
||||
@@ -1041,7 +1041,7 @@ _080FCDB0:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FCE42
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x10]
|
||||
b _080FCE04
|
||||
|
||||
+1
-1
@@ -163,7 +163,7 @@ IntrMain: @ 8000248
|
||||
IntrMain_FoundIntr:
|
||||
strh r0, [r3, OFFSET_REG_IF - 0x200]
|
||||
bic r2, r2, r0
|
||||
ldr r0, =gUnknown_03007868
|
||||
ldr r0, =gRfuState
|
||||
ldr r0, [r0]
|
||||
ldrb r0, [r0, 0xA]
|
||||
mov r1, 0x8
|
||||
|
||||
-7167
File diff suppressed because it is too large
Load Diff
@@ -1,459 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start SetDecorationInventoriesPointers
|
||||
SetDecorationInventoriesPointers: @ 81617F4
|
||||
push {r4,lr}
|
||||
ldr r0, =gDecorationInventories
|
||||
mov r12, r0
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r1, [r0]
|
||||
ldr r2, =0x00002734
|
||||
adds r0, r1, r2
|
||||
mov r4, r12
|
||||
str r0, [r4]
|
||||
movs r3, 0xA
|
||||
strb r3, [r4, 0x4]
|
||||
adds r2, 0xA
|
||||
adds r0, r1, r2
|
||||
str r0, [r4, 0x8]
|
||||
strb r3, [r4, 0xC]
|
||||
ldr r4, =0x00002748
|
||||
adds r0, r1, r4
|
||||
mov r2, r12
|
||||
str r0, [r2, 0x10]
|
||||
strb r3, [r2, 0x14]
|
||||
adds r4, 0xA
|
||||
adds r0, r1, r4
|
||||
str r0, [r2, 0x18]
|
||||
movs r2, 0x1E
|
||||
mov r0, r12
|
||||
strb r2, [r0, 0x1C]
|
||||
adds r4, 0x1E
|
||||
adds r0, r1, r4
|
||||
mov r4, r12
|
||||
str r0, [r4, 0x20]
|
||||
mov r0, r12
|
||||
adds r0, 0x24
|
||||
strb r2, [r0]
|
||||
ldr r2, =0x0000278e
|
||||
adds r0, r1, r2
|
||||
str r0, [r4, 0x28]
|
||||
mov r0, r12
|
||||
adds r0, 0x2C
|
||||
strb r3, [r0]
|
||||
ldr r4, =0x00002798
|
||||
adds r0, r1, r4
|
||||
mov r2, r12
|
||||
str r0, [r2, 0x30]
|
||||
adds r2, 0x34
|
||||
movs r0, 0x28
|
||||
strb r0, [r2]
|
||||
adds r4, 0x28
|
||||
adds r1, r4
|
||||
mov r0, r12
|
||||
str r1, [r0, 0x38]
|
||||
adds r0, 0x3C
|
||||
strb r3, [r0]
|
||||
bl sub_8126968
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SetDecorationInventoriesPointers
|
||||
|
||||
thumb_func_start ClearDecorationInventory
|
||||
ClearDecorationInventory: @ 8161880
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
movs r3, 0
|
||||
ldr r1, =gDecorationInventories
|
||||
lsrs r2, r0, 21
|
||||
adds r0, r2, r1
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r3, r0
|
||||
bcs _081618AA
|
||||
adds r5, r1, 0
|
||||
movs r4, 0
|
||||
_08161896:
|
||||
adds r0, r2, r5
|
||||
ldr r1, [r0]
|
||||
adds r1, r3
|
||||
strb r4, [r1]
|
||||
adds r1, r3, 0x1
|
||||
lsls r1, 24
|
||||
lsrs r3, r1, 24
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r3, r0
|
||||
bcc _08161896
|
||||
_081618AA:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end ClearDecorationInventory
|
||||
|
||||
thumb_func_start ClearDecorationInventories
|
||||
ClearDecorationInventories: @ 81618B4
|
||||
push {r4,lr}
|
||||
movs r4, 0
|
||||
_081618B8:
|
||||
adds r0, r4, 0
|
||||
bl ClearDecorationInventory
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x7
|
||||
bls _081618B8
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end ClearDecorationInventories
|
||||
|
||||
thumb_func_start sub_81618D0
|
||||
sub_81618D0: @ 81618D0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
movs r2, 0
|
||||
ldr r1, =gDecorationInventories
|
||||
lsrs r0, 21
|
||||
adds r0, r1
|
||||
movs r1, 0x4
|
||||
ldrsb r1, [r0, r1]
|
||||
cmp r2, r1
|
||||
bge _0816190C
|
||||
adds r4, r0, 0
|
||||
adds r3, r1, 0
|
||||
_081618E8:
|
||||
lsls r0, r2, 24
|
||||
asrs r1, r0, 24
|
||||
ldr r0, [r4]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _08161900
|
||||
adds r0, r1, 0
|
||||
b _08161910
|
||||
.pool
|
||||
_08161900:
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
asrs r0, 24
|
||||
cmp r0, r3
|
||||
blt _081618E8
|
||||
_0816190C:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_08161910:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81618D0
|
||||
|
||||
thumb_func_start CheckHasDecoration
|
||||
CheckHasDecoration: @ 8161918
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r1, =gDecorations
|
||||
lsls r0, r3, 5
|
||||
adds r0, r1
|
||||
ldrb r0, [r0, 0x13]
|
||||
movs r2, 0
|
||||
ldr r1, =gDecorationInventories
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldrb r1, [r0, 0x4]
|
||||
cmp r2, r1
|
||||
bcs _08161956
|
||||
ldr r4, [r0]
|
||||
_08161936:
|
||||
adds r0, r4, r2
|
||||
ldrb r0, [r0]
|
||||
cmp r0, r3
|
||||
bne _0816194C
|
||||
movs r0, 0x1
|
||||
b _08161958
|
||||
.pool
|
||||
_0816194C:
|
||||
adds r0, r2, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, r1
|
||||
bcc _08161936
|
||||
_08161956:
|
||||
movs r0, 0
|
||||
_08161958:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end CheckHasDecoration
|
||||
|
||||
thumb_func_start DecorationAdd
|
||||
DecorationAdd: @ 8161960
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _081619A0
|
||||
ldr r1, =gDecorations
|
||||
lsls r0, r4, 5
|
||||
adds r0, r1
|
||||
ldrb r5, [r0, 0x13]
|
||||
adds r0, r5, 0
|
||||
bl sub_81618D0
|
||||
lsls r0, 24
|
||||
asrs r2, r0, 24
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
cmp r2, r0
|
||||
beq _081619A0
|
||||
ldr r0, =gDecorationInventories
|
||||
lsls r1, r5, 3
|
||||
adds r1, r0
|
||||
ldr r0, [r1]
|
||||
adds r0, r2
|
||||
strb r4, [r0]
|
||||
movs r0, 0x1
|
||||
b _081619A2
|
||||
.pool
|
||||
_081619A0:
|
||||
movs r0, 0
|
||||
_081619A2:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end DecorationAdd
|
||||
|
||||
thumb_func_start DecorationCheckSpace
|
||||
DecorationCheckSpace: @ 81619A8
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
beq _081619D4
|
||||
ldr r1, =gDecorations
|
||||
lsls r0, 5
|
||||
adds r0, r1
|
||||
ldrb r0, [r0, 0x13]
|
||||
bl sub_81618D0
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
movs r1, 0x1
|
||||
negs r1, r1
|
||||
cmp r0, r1
|
||||
beq _081619D4
|
||||
movs r0, 0x1
|
||||
b _081619D6
|
||||
.pool
|
||||
_081619D4:
|
||||
movs r0, 0
|
||||
_081619D6:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end DecorationCheckSpace
|
||||
|
||||
thumb_func_start DecorationRemove
|
||||
DecorationRemove: @ 81619DC
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
movs r3, 0
|
||||
cmp r5, 0
|
||||
bne _081619F8
|
||||
b _08161A26
|
||||
_081619EA:
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
adds r0, r6, 0
|
||||
bl sub_8161A38
|
||||
movs r0, 0x1
|
||||
b _08161A28
|
||||
_081619F8:
|
||||
ldr r2, =gDecorationInventories
|
||||
ldr r1, =gDecorations
|
||||
lsls r0, r5, 5
|
||||
adds r0, r1
|
||||
ldrb r4, [r0, 0x13]
|
||||
lsls r0, r4, 3
|
||||
adds r0, r2
|
||||
ldrb r1, [r0, 0x4]
|
||||
cmp r3, r1
|
||||
bcs _08161A26
|
||||
adds r6, r4, 0
|
||||
adds r4, r0, 0
|
||||
adds r2, r1, 0
|
||||
_08161A12:
|
||||
ldr r0, [r4]
|
||||
adds r1, r0, r3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, r5
|
||||
beq _081619EA
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, r2
|
||||
bcc _08161A12
|
||||
_08161A26:
|
||||
movs r0, 0
|
||||
_08161A28:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end DecorationRemove
|
||||
|
||||
thumb_func_start sub_8161A38
|
||||
sub_8161A38: @ 8161A38
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
movs r6, 0
|
||||
ldr r2, =gDecorationInventories
|
||||
lsrs r0, 21
|
||||
adds r1, r0, r2
|
||||
ldrb r3, [r1, 0x4]
|
||||
cmp r6, r3
|
||||
bcs _08161ABC
|
||||
adds r7, r0, 0
|
||||
mov r10, r1
|
||||
mov r0, r10
|
||||
str r0, [sp]
|
||||
_08161A5C:
|
||||
adds r1, r6, 0x1
|
||||
lsls r0, r1, 24
|
||||
lsrs r3, r0, 24
|
||||
adds r2, r7, 0
|
||||
mov r12, r1
|
||||
mov r1, r10
|
||||
ldrb r1, [r1, 0x4]
|
||||
cmp r3, r1
|
||||
bcs _08161AAE
|
||||
ldr r0, =gDecorationInventories
|
||||
mov r9, r0
|
||||
adds r1, r0, 0
|
||||
mov r8, r1
|
||||
_08161A76:
|
||||
mov r0, r9
|
||||
adds r5, r2, r0
|
||||
ldr r1, [r5]
|
||||
adds r0, r1, r3
|
||||
ldrb r4, [r0]
|
||||
adds r2, r4, 0
|
||||
cmp r2, 0
|
||||
beq _08161A9C
|
||||
adds r0, r1, r6
|
||||
ldrb r1, [r0]
|
||||
cmp r1, 0
|
||||
beq _08161A92
|
||||
cmp r1, r2
|
||||
bls _08161A9C
|
||||
_08161A92:
|
||||
ldrb r1, [r0]
|
||||
strb r4, [r0]
|
||||
ldr r0, [r5]
|
||||
adds r0, r3
|
||||
strb r1, [r0]
|
||||
_08161A9C:
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
adds r2, r7, 0
|
||||
mov r1, r8
|
||||
adds r0, r2, r1
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r3, r0
|
||||
bcc _08161A76
|
||||
_08161AAE:
|
||||
mov r3, r12
|
||||
lsls r0, r3, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r0, [sp]
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r6, r0
|
||||
bcc _08161A5C
|
||||
_08161ABC:
|
||||
add sp, 0x4
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8161A38
|
||||
|
||||
thumb_func_start sub_8161AD0
|
||||
sub_8161AD0: @ 8161AD0
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
movs r4, 0
|
||||
movs r3, 0
|
||||
ldr r2, =gDecorationInventories
|
||||
lsrs r1, r0, 21
|
||||
adds r0, r1, r2
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r4, r0
|
||||
bcs _08161B04
|
||||
adds r5, r2, 0
|
||||
_08161AE6:
|
||||
adds r2, r1, r5
|
||||
ldr r0, [r2]
|
||||
adds r0, r3
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08161AF8
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_08161AF8:
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldrb r2, [r2, 0x4]
|
||||
cmp r3, r2
|
||||
bcc _08161AE6
|
||||
_08161B04:
|
||||
adds r0, r4, 0
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_8161AD0
|
||||
|
||||
thumb_func_start sub_8161B10
|
||||
sub_8161B10: @ 8161B10
|
||||
push {r4,r5,lr}
|
||||
movs r5, 0
|
||||
movs r4, 0
|
||||
_08161B16:
|
||||
adds r0, r4, 0
|
||||
bl sub_8161AD0
|
||||
adds r0, r5, r0
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x7
|
||||
bls _08161B16
|
||||
adds r0, r5, 0
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8161B10
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
@@ -5,127 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start GetStringCenterAlignXOffset
|
||||
@ s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
|
||||
GetStringCenterAlignXOffset: @ 81DB35C
|
||||
push {lr}
|
||||
movs r3, 0
|
||||
bl GetStringCenterAlignXOffsetWithLetterSpacing
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetStringCenterAlignXOffset
|
||||
|
||||
thumb_func_start GetStringRightAlignXOffset
|
||||
@ s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
|
||||
GetStringRightAlignXOffset: @ 81DB368
|
||||
push {lr}
|
||||
movs r3, 0
|
||||
bl GetStringWidthDifference
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetStringRightAlignXOffset
|
||||
|
||||
thumb_func_start GetStringCenterAlignXOffsetWithLetterSpacing
|
||||
@ s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
|
||||
GetStringCenterAlignXOffsetWithLetterSpacing: @ 81DB374
|
||||
push {lr}
|
||||
bl GetStringWidthDifference
|
||||
lsrs r1, r0, 31
|
||||
adds r0, r1
|
||||
asrs r0, 1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetStringCenterAlignXOffsetWithLetterSpacing
|
||||
|
||||
thumb_func_start GetStringWidthDifference
|
||||
@ s32 GetStringWidthDifference(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
|
||||
GetStringWidthDifference: @ 81DB384
|
||||
push {r4,lr}
|
||||
adds r4, r2, 0
|
||||
adds r2, r3, 0
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r2, 16
|
||||
asrs r2, 16
|
||||
bl GetStringWidth
|
||||
cmp r4, r0
|
||||
bgt _081DB39E
|
||||
movs r0, 0
|
||||
b _081DB3A0
|
||||
_081DB39E:
|
||||
subs r0, r4, r0
|
||||
_081DB3A0:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetStringWidthDifference
|
||||
|
||||
thumb_func_start GetMaxWidthInMenuTable
|
||||
GetMaxWidthInMenuTable: @ 81DB3A8
|
||||
push {r4-r6,lr}
|
||||
movs r6, 0
|
||||
cmp r6, r1
|
||||
bge _081DB3CC
|
||||
adds r5, r0, 0
|
||||
adds r4, r1, 0
|
||||
_081DB3B4:
|
||||
ldr r1, [r5]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl GetStringWidth
|
||||
cmp r0, r6
|
||||
ble _081DB3C4
|
||||
adds r6, r0, 0
|
||||
_081DB3C4:
|
||||
adds r5, 0x8
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bne _081DB3B4
|
||||
_081DB3CC:
|
||||
adds r0, r6, 0
|
||||
bl convert_pixel_width_to_tile_width
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetMaxWidthInMenuTable
|
||||
|
||||
thumb_func_start sub_81DB3D8
|
||||
sub_81DB3D8: @ 81DB3D8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
mov r8, r0
|
||||
adds r7, r1, 0
|
||||
adds r5, r2, 0
|
||||
movs r6, 0
|
||||
movs r4, 0
|
||||
cmp r6, r5
|
||||
bge _081DB40A
|
||||
_081DB3EC:
|
||||
adds r0, r7, r4
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 3
|
||||
add r0, r8
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl GetStringWidth
|
||||
cmp r0, r6
|
||||
ble _081DB404
|
||||
adds r6, r0, 0
|
||||
_081DB404:
|
||||
adds r4, 0x1
|
||||
cmp r4, r5
|
||||
blt _081DB3EC
|
||||
_081DB40A:
|
||||
adds r0, r6, 0
|
||||
bl convert_pixel_width_to_tile_width
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81DB3D8
|
||||
|
||||
thumb_func_start sub_81DB41C
|
||||
sub_81DB41C: @ 81DB41C
|
||||
|
||||
+2
-2
@@ -1958,9 +1958,9 @@ task_intro_13: @ 816DD28
|
||||
ldr r0, =gUnknown_08D8A818
|
||||
ldr r1, =0x0600e000
|
||||
bl LZDecompressVram
|
||||
ldr r0, =gUnknown_08524D14
|
||||
ldr r0, =gBattleAnimPicTable + 0x1D0
|
||||
bl LoadCompressedObjectPicUsingHeap
|
||||
ldr r0, =gUnknown_0852561C
|
||||
ldr r0, =gBattleAnimPaletteTable + 0x1D0
|
||||
bl LoadCompressedObjectPaletteUsingHeap
|
||||
ldr r0, =gUnknown_08D85CD0
|
||||
ldr r1, =gPlttBufferUnfaded
|
||||
|
||||
+9
-2254
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,696 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
arm_func_start IntrSIO32
|
||||
IntrSIO32: @ 82E3554
|
||||
mov r12, sp
|
||||
stmdb sp!, {r11,r12,lr,pc}
|
||||
ldr r3, _082E35B4
|
||||
ldr r0, [r3]
|
||||
ldr r2, [r0]
|
||||
sub r11, r12, 0x4
|
||||
cmp r2, 0xA
|
||||
bne _082E3590
|
||||
ldr r0, [r0, 0x20]
|
||||
cmp r0, 0
|
||||
ldmdbeq r11, {r11,sp,lr}
|
||||
bxeq lr
|
||||
bl sub_82E3EB0
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
_082E3590:
|
||||
ldrb r3, [r0, 0x14]
|
||||
cmp r3, 0x1
|
||||
bne _082E35A8
|
||||
bl sio32intr_clock_master
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
_082E35A8:
|
||||
bl sio32intr_clock_slave
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_082E35B4: .4byte gRfuState
|
||||
arm_func_end IntrSIO32
|
||||
|
||||
arm_func_start sio32intr_clock_master
|
||||
sio32intr_clock_master: @ 82E35B8
|
||||
mov r12, sp
|
||||
stmdb sp!, {r4-r6,r11,r12,lr,pc}
|
||||
mov r0, 0x50
|
||||
sub r11, r12, 0x4
|
||||
bl STWI_set_timer_in_RAM
|
||||
mov r4, 0x120
|
||||
ldr r2, _082E382C
|
||||
add r4, r4, 0x4000000
|
||||
ldr lr, [r4]
|
||||
ldr r12, [r2]
|
||||
ldr r3, [r12]
|
||||
mov r6, r2
|
||||
cmp r3, 0
|
||||
bne _082E3638
|
||||
cmp lr, 0x80000000
|
||||
bne _082E36B8
|
||||
ldrb r2, [r12, 0x5]
|
||||
ldrb r3, [r12, 0x4]
|
||||
cmp r2, r3
|
||||
bhi _082E3628
|
||||
ldr r3, [r12, 0x24]
|
||||
mov r1, r2
|
||||
ldr r2, [r3, r1, lsl 2]
|
||||
str r2, [r4]
|
||||
ldrb r3, [r12, 0x5]
|
||||
add r3, r3, 0x1
|
||||
strb r3, [r12, 0x5]
|
||||
b _082E3714
|
||||
_082E3628:
|
||||
mov r3, 0x1
|
||||
str r3, [r12]
|
||||
str lr, [r4]
|
||||
b _082E3714
|
||||
_082E3638:
|
||||
ldr r3, [r12]
|
||||
cmp r3, 0x1
|
||||
bne _082E36C8
|
||||
mov r3, 0x99000000
|
||||
add r3, r3, 0x660000
|
||||
mov r5, 0x80000000
|
||||
and r2, lr, r5, asr 15
|
||||
cmp r2, r3
|
||||
bne _082E36B8
|
||||
mov r3, 0
|
||||
strb r3, [r12, 0x8]
|
||||
ldr r1, [r6]
|
||||
ldrb r0, [r1, 0x8]
|
||||
ldr r2, [r1, 0x28]
|
||||
str lr, [r2, r0, lsl 2]
|
||||
ldrb r3, [r1, 0x8]
|
||||
add r3, r3, 0x1
|
||||
strb r3, [r1, 0x8]
|
||||
ldr r2, [r6]
|
||||
strb lr, [r2, 0x9]
|
||||
ldr r3, [r6]
|
||||
mov r2, lr, lsr 8
|
||||
strb r2, [r3, 0x7]
|
||||
ldr r1, [r6]
|
||||
ldrb r2, [r1, 0x7]
|
||||
ldrb r3, [r1, 0x8]
|
||||
cmp r2, r3
|
||||
bcc _082E3700
|
||||
mov r3, 0x2
|
||||
str r3, [r1]
|
||||
str r5, [r4]
|
||||
b _082E3714
|
||||
_082E36B8:
|
||||
bl STWI_stop_timer_in_RAM
|
||||
mov r0, 0x82
|
||||
bl STWI_set_timer_in_RAM
|
||||
b _082E3840
|
||||
_082E36C8:
|
||||
ldr r3, [r12]
|
||||
cmp r3, 0x2
|
||||
bne _082E3714
|
||||
ldrb r1, [r12, 0x8]
|
||||
ldr r2, [r12, 0x28]
|
||||
str lr, [r2, r1, lsl 2]
|
||||
ldrb r3, [r12, 0x8]
|
||||
add r3, r3, 0x1
|
||||
strb r3, [r12, 0x8]
|
||||
ldr r1, [r6]
|
||||
ldrb r2, [r1, 0x7]
|
||||
ldrb r3, [r1, 0x8]
|
||||
cmp r2, r3
|
||||
bcs _082E370C
|
||||
_082E3700:
|
||||
mov r3, 0x3
|
||||
str r3, [r1]
|
||||
b _082E3714
|
||||
_082E370C:
|
||||
mov r3, 0x80000000
|
||||
str r3, [r4]
|
||||
_082E3714:
|
||||
mov r0, 0x1
|
||||
bl handshake_wait
|
||||
mov r0, r0, lsl 16
|
||||
cmp r0, 0x10000
|
||||
beq _082E3840
|
||||
mov r4, 0x128
|
||||
add r4, r4, 0x4000000
|
||||
mov r5, 0x5000
|
||||
add r3, r5, 0xB
|
||||
strh r3, [r4]
|
||||
mov r0, 0
|
||||
bl handshake_wait
|
||||
mov r0, r0, lsl 16
|
||||
cmp r0, 0x10000
|
||||
beq _082E3840
|
||||
bl STWI_stop_timer_in_RAM
|
||||
ldr r1, [r6]
|
||||
ldr r0, [r1]
|
||||
cmp r0, 0x3
|
||||
bne _082E3830
|
||||
ldrb r3, [r1, 0x9]
|
||||
cmp r3, 0xA5
|
||||
cmpne r3, 0xA7
|
||||
beq _082E3788
|
||||
and r3, r3, 0xFF
|
||||
cmp r3, 0xB5
|
||||
beq _082E3788
|
||||
cmp r3, 0xB7
|
||||
bne _082E37D0
|
||||
_082E3788:
|
||||
mov r1, 0x120
|
||||
add r1, r1, 0x4000000
|
||||
mov r12, 0x128
|
||||
add r12, r12, 0x4000000
|
||||
ldr r0, [r6]
|
||||
mov r3, 0
|
||||
strb r3, [r0, 0x14]
|
||||
mov r2, 0x80000000
|
||||
str r2, [r1]
|
||||
add r3, r3, 0x5000
|
||||
add r2, r3, 0x2
|
||||
strh r2, [r12]
|
||||
add r3, r3, 0x82
|
||||
strh r3, [r12]
|
||||
ldr r2, [r6]
|
||||
mov r3, 0x5
|
||||
str r3, [r2]
|
||||
b _082E3800
|
||||
_082E37D0:
|
||||
cmp r3, 0xEE
|
||||
bne _082E37F0
|
||||
add r3, r5, 0x3
|
||||
strh r3, [r4]
|
||||
mov r2, 0x4
|
||||
str r2, [r1]
|
||||
strh r0, [r1, 0x12]
|
||||
b _082E3800
|
||||
_082E37F0:
|
||||
add r3, r5, 0x3
|
||||
strh r3, [r4]
|
||||
mov r2, 0x4
|
||||
str r2, [r1]
|
||||
_082E3800:
|
||||
ldr r2, [r6]
|
||||
mov r3, 0
|
||||
strb r3, [r2, 0x2C]
|
||||
ldr r0, [r6]
|
||||
ldr r2, [r0, 0x18]
|
||||
cmp r2, r3
|
||||
beq _082E3840
|
||||
ldrh r1, [r0, 0x12]
|
||||
ldrb r0, [r0, 0x6]
|
||||
bl sub_82E3EA8
|
||||
b _082E3840
|
||||
.align 2, 0
|
||||
_082E382C: .4byte gRfuState
|
||||
_082E3830:
|
||||
add r3, r5, 0x3
|
||||
strh r3, [r4]
|
||||
add r2, r5, 0x83
|
||||
strh r2, [r4]
|
||||
_082E3840:
|
||||
ldmdb r11, {r4-r6,r11,sp,lr}
|
||||
bx lr
|
||||
arm_func_end sio32intr_clock_master
|
||||
|
||||
arm_func_start sio32intr_clock_slave
|
||||
sio32intr_clock_slave: @ 82E3848
|
||||
mov r12, sp
|
||||
stmdb sp!, {r4-r6,r11,r12,lr,pc}
|
||||
ldr r4, _082E3BF4
|
||||
mov r0, 0x64
|
||||
ldr r3, [r4]
|
||||
mov r6, 0
|
||||
strb r6, [r3, 0x10]
|
||||
sub r11, r12, 0x4
|
||||
bl STWI_set_timer_in_RAM
|
||||
mov r0, r6
|
||||
bl handshake_wait
|
||||
mov r0, r0, lsl 16
|
||||
cmp r0, 0x10000
|
||||
mov r5, r4
|
||||
beq _082E3C4C
|
||||
mov r3, 0x128
|
||||
add r3, r3, 0x4000000
|
||||
mov r2, 0x5000
|
||||
add r2, r2, 0xA
|
||||
strh r2, [r3]
|
||||
mov lr, 0x120
|
||||
ldr r0, [r5]
|
||||
add lr, lr, 0x4000000
|
||||
ldr r12, [lr]
|
||||
ldr r3, [r0]
|
||||
cmp r3, 0x5
|
||||
bne _082E3978
|
||||
ldr r3, [r0, 0x28]
|
||||
mov r4, 0x1
|
||||
mov r0, 0x99000000
|
||||
str r12, [r3]
|
||||
add r0, r0, 0x660000
|
||||
ldr r2, [r5]
|
||||
mov r3, r0, lsr 16
|
||||
strb r4, [r2, 0x5]
|
||||
cmp r3, r12, lsr 16
|
||||
bne _082E3AC4
|
||||
ldr r3, [r5]
|
||||
mov r2, r12, lsr 8
|
||||
strb r2, [r3, 0x4]
|
||||
ldr r2, [r5]
|
||||
strb r12, [r2, 0x6]
|
||||
ldr r1, [r5]
|
||||
ldrb r3, [r1, 0x4]
|
||||
cmp r3, r6
|
||||
bne _082E395C
|
||||
ldrb r2, [r1, 0x6]
|
||||
sub r3, r2, 0x27
|
||||
cmp r2, 0x36
|
||||
cmpne r3, 0x2
|
||||
bhi _082E3930
|
||||
add r3, r2, 0x80
|
||||
strb r3, [r1, 0x9]
|
||||
ldr r2, [r5]
|
||||
ldrb r3, [r2, 0x9]
|
||||
ldr r1, [r2, 0x24]
|
||||
add r3, r3, r0
|
||||
b _082E39E0
|
||||
_082E3930:
|
||||
ldr r2, [r1, 0x24]
|
||||
ldr r3, _082E3BF8
|
||||
str r3, [r2]
|
||||
ldr r2, [r5]
|
||||
ldrb r3, [r2, 0x6]
|
||||
sub r3, r3, 0x10
|
||||
cmp r3, 0x2D
|
||||
bhi _082E3A18
|
||||
ldr r3, [r2, 0x24]
|
||||
str r4, [r3, 0x4]
|
||||
b _082E3A24
|
||||
_082E395C:
|
||||
mov r3, 0x80000000
|
||||
str r3, [lr]
|
||||
strb r4, [r1, 0x5]
|
||||
ldr r2, [r5]
|
||||
add r3, r3, 0x80000006
|
||||
str r3, [r2]
|
||||
b _082E3AD4
|
||||
_082E3978:
|
||||
ldr r3, [r0]
|
||||
cmp r3, 0x6
|
||||
bne _082E3A78
|
||||
ldrb r1, [r0, 0x5]
|
||||
ldr r2, [r0, 0x28]
|
||||
str r12, [r2, r1, lsl 2]
|
||||
ldrb r3, [r0, 0x5]
|
||||
add r3, r3, 0x1
|
||||
strb r3, [r0, 0x5]
|
||||
ldr r1, [r5]
|
||||
ldrb r2, [r1, 0x4]
|
||||
ldrb r3, [r1, 0x5]
|
||||
cmp r2, r3
|
||||
bcs _082E3A6C
|
||||
ldrb r2, [r1, 0x6]
|
||||
sub r3, r2, 0x28
|
||||
cmp r2, 0x36
|
||||
cmpne r3, 0x1
|
||||
bhi _082E39F0
|
||||
add r3, r2, 0x80
|
||||
strb r3, [r1, 0x9]
|
||||
ldr r2, [r5]
|
||||
ldrb r3, [r2, 0x9]
|
||||
ldr r1, [r2, 0x24]
|
||||
orr r3, r3, 0x99000000
|
||||
orr r3, r3, 0x660000
|
||||
_082E39E0:
|
||||
str r3, [r1]
|
||||
ldr r2, [r5]
|
||||
strb r6, [r2, 0x7]
|
||||
b _082E3A3C
|
||||
_082E39F0:
|
||||
ldr r2, [r1, 0x24]
|
||||
ldr r3, _082E3BF8
|
||||
str r3, [r2]
|
||||
ldr r2, [r5]
|
||||
ldrb r3, [r2, 0x6]
|
||||
sub r3, r3, 0x10
|
||||
cmp r3, 0x2D
|
||||
ldrls r2, [r2, 0x24]
|
||||
movls r3, 0x1
|
||||
bls _082E3A20
|
||||
_082E3A18:
|
||||
ldr r2, [r2, 0x24]
|
||||
mov r3, 0x2
|
||||
_082E3A20:
|
||||
str r3, [r2, 0x4]
|
||||
_082E3A24:
|
||||
ldr r2, [r5]
|
||||
mov r3, 0x1
|
||||
strb r3, [r2, 0x7]
|
||||
ldr r1, [r5]
|
||||
add r3, r3, 0x2
|
||||
strh r3, [r1, 0x12]
|
||||
_082E3A3C:
|
||||
ldr r0, [r5]
|
||||
ldr r2, [r0, 0x24]
|
||||
mov r3, 0x120
|
||||
ldr r1, [r2]
|
||||
add r3, r3, 0x4000000
|
||||
str r1, [r3]
|
||||
mov r2, 0x1
|
||||
strb r2, [r0, 0x8]
|
||||
ldr r1, [r5]
|
||||
mov r3, 0x7
|
||||
str r3, [r1]
|
||||
b _082E3AD4
|
||||
_082E3A6C:
|
||||
mov r3, 0x80000000
|
||||
str r3, [lr]
|
||||
b _082E3AD4
|
||||
_082E3A78:
|
||||
ldr r3, [r0]
|
||||
cmp r3, 0x7
|
||||
bne _082E3AD4
|
||||
cmp r12, 0x80000000
|
||||
bne _082E3AC4
|
||||
ldrb r2, [r0, 0x7]
|
||||
ldrb r3, [r0, 0x8]
|
||||
cmp r2, r3
|
||||
movcc r3, 0x8
|
||||
strcc r3, [r0]
|
||||
bcc _082E3AD4
|
||||
ldrb r1, [r0, 0x8]
|
||||
ldr r3, [r0, 0x24]
|
||||
ldr r2, [r3, r1, lsl 2]
|
||||
str r2, [lr]
|
||||
ldrb r3, [r0, 0x8]
|
||||
add r3, r3, 0x1
|
||||
strb r3, [r0, 0x8]
|
||||
b _082E3AD4
|
||||
_082E3AC4:
|
||||
bl STWI_stop_timer_in_RAM
|
||||
mov r0, 0x64
|
||||
bl STWI_set_timer_in_RAM
|
||||
b _082E3C4C
|
||||
_082E3AD4:
|
||||
mov r0, 0x1
|
||||
bl handshake_wait
|
||||
mov r0, r0, lsl 16
|
||||
cmp r0, 0x10000
|
||||
beq _082E3C4C
|
||||
mov r6, r5
|
||||
ldr r3, [r6]
|
||||
ldr r2, [r3]
|
||||
cmp r2, 0x8
|
||||
bne _082E3B9C
|
||||
mov r4, 0x128
|
||||
add r4, r4, 0x4000000
|
||||
mov r3, 0x5000
|
||||
add r3, r3, 0x2
|
||||
strh r3, [r4]
|
||||
bl STWI_stop_timer_in_RAM
|
||||
ldr r0, [r6]
|
||||
ldrh r3, [r0, 0x12]
|
||||
cmp r3, 0x3
|
||||
bne _082E3B48
|
||||
bl STWI_init_slave
|
||||
ldr r3, [r6]
|
||||
ldr r1, [r3, 0x1C]
|
||||
cmp r1, 0
|
||||
beq _082E3C4C
|
||||
mov r0, 0x1EC
|
||||
add r0, r0, 0x2
|
||||
bl sub_82E3EAC
|
||||
b _082E3C4C
|
||||
_082E3B48:
|
||||
mov r3, 0x120
|
||||
add r3, r3, 0x4000000
|
||||
mov r1, 0
|
||||
str r1, [r3]
|
||||
mov r2, 0x5000
|
||||
strh r1, [r4]
|
||||
add r2, r2, 0x3
|
||||
strh r2, [r4]
|
||||
mov r3, 0x1
|
||||
strb r3, [r0, 0x14]
|
||||
ldr r0, [r5]
|
||||
ldr r2, [r0, 0x1C]
|
||||
str r1, [r0]
|
||||
cmp r2, r1
|
||||
beq _082E3C4C
|
||||
ldrb r3, [r0, 0x4]
|
||||
ldrb r0, [r0, 0x6]
|
||||
mov r1, r2
|
||||
orr r0, r0, r3, lsl 8
|
||||
bl sub_82E3EAC
|
||||
b _082E3C4C
|
||||
_082E3B9C:
|
||||
mov r3, 0x208
|
||||
add r3, r3, 0x4000000
|
||||
mov r2, 0
|
||||
strh r2, [r3]
|
||||
mov r1, 0x100
|
||||
add r2, r1, 0x4000002
|
||||
ldrh r3, [r2]
|
||||
tst r3, 0x80
|
||||
beq _082E3C20
|
||||
ldrh r3, [r2]
|
||||
tst r3, 0x3
|
||||
bne _082E3BFC
|
||||
mov r2, 0xFF00
|
||||
add r1, r1, 0x4000000
|
||||
ldrh r3, [r1]
|
||||
add r2, r2, 0x9B
|
||||
cmp r3, r2
|
||||
bls _082E3C20
|
||||
_082E3BE4:
|
||||
ldrh r3, [r1]
|
||||
cmp r3, r2
|
||||
bhi _082E3BE4
|
||||
b _082E3C20
|
||||
.align 2, 0
|
||||
_082E3BF4: .4byte gRfuState
|
||||
_082E3BF8: .4byte 0x996601ee
|
||||
_082E3BFC:
|
||||
mov r2, 0xFF00
|
||||
add r1, r1, 0x4000000
|
||||
ldrh r3, [r1]
|
||||
add r2, r2, 0xFE
|
||||
cmp r3, r2
|
||||
bls _082E3C20
|
||||
_082E3C14:
|
||||
ldrh r3, [r1]
|
||||
cmp r3, r2
|
||||
bhi _082E3C14
|
||||
_082E3C20:
|
||||
mov r1, 0x128
|
||||
add r1, r1, 0x4000000
|
||||
mov r0, 0x208
|
||||
add r0, r0, 0x4000000
|
||||
mov r3, 0x5000
|
||||
add r2, r3, 0x2
|
||||
strh r2, [r1]
|
||||
add r3, r3, 0x82
|
||||
strh r3, [r1]
|
||||
mov r2, 0x1
|
||||
strh r2, [r0]
|
||||
_082E3C4C:
|
||||
ldmdb r11, {r4-r6,r11,sp,lr}
|
||||
bx lr
|
||||
arm_func_end sio32intr_clock_slave
|
||||
|
||||
arm_func_start handshake_wait
|
||||
handshake_wait: @ 82E3C54
|
||||
mov r12, sp
|
||||
stmdb sp!, {r11,r12,lr,pc}
|
||||
mov r1, 0x128
|
||||
add r1, r1, 0x4000000
|
||||
mov r0, r0, lsl 16
|
||||
ldr r2, _082E3CB8
|
||||
sub r11, r12, 0x4
|
||||
mov lr, r0, lsr 14
|
||||
ldr r12, [r2]
|
||||
_082E3C78:
|
||||
ldrb r3, [r12, 0x10]
|
||||
and r0, r3, 0xFF
|
||||
cmp r0, 0x1
|
||||
beq _082E3CA4
|
||||
ldrh r3, [r1]
|
||||
and r3, r3, 0x4
|
||||
cmp r3, lr
|
||||
bne _082E3C78
|
||||
mov r0, 0
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
_082E3CA4:
|
||||
ldr r2, [r2]
|
||||
mov r3, 0
|
||||
strb r3, [r2, 0x10]
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_082E3CB8: .4byte gRfuState
|
||||
arm_func_end handshake_wait
|
||||
|
||||
arm_func_start STWI_set_timer_in_RAM
|
||||
STWI_set_timer_in_RAM: @ 82E3CBC
|
||||
mov r12, sp
|
||||
stmdb sp!, {r4,r5,r11,r12,lr,pc}
|
||||
mov r1, 0x208
|
||||
add r1, r1, 0x4000000
|
||||
mov r3, 0
|
||||
sub r11, r12, 0x4
|
||||
ldr r12, _082E3D74
|
||||
and lr, r0, 0xFF
|
||||
ldr r2, [r12]
|
||||
cmp lr, 0x50
|
||||
ldrb r0, [r2, 0xA]
|
||||
mov r4, r12
|
||||
mov r2, lr
|
||||
strh r3, [r1]
|
||||
mov r0, r0, lsl 2
|
||||
add r3, r3, 0x100
|
||||
add r1, r3, 0x4000000
|
||||
add r3, r3, 0x4000002
|
||||
add r5, r0, r3
|
||||
beq _082E3D44
|
||||
bgt _082E3D1C
|
||||
cmp lr, 0x32
|
||||
beq _082E3D30
|
||||
b _082E3D90
|
||||
_082E3D1C:
|
||||
cmp r2, 0x64
|
||||
beq _082E3D5C
|
||||
cmp r2, 0x82
|
||||
beq _082E3D78
|
||||
b _082E3D90
|
||||
_082E3D30:
|
||||
mvn r3, 0x334
|
||||
strh r3, [r0, r1]
|
||||
ldr r2, [r4]
|
||||
mov r3, 0x1
|
||||
b _082E3D8C
|
||||
_082E3D44:
|
||||
mov r3, 0xAE000000
|
||||
mov r3, r3, asr 20
|
||||
strh r3, [r0, r1]
|
||||
ldr r2, [r4]
|
||||
mov r3, 0x2
|
||||
b _082E3D8C
|
||||
_082E3D5C:
|
||||
mvn r3, 0x660
|
||||
sub r3, r3, 0x9
|
||||
strh r3, [r0, r1]
|
||||
ldr r2, [r4]
|
||||
mov r3, 0x3
|
||||
b _082E3D8C
|
||||
.align 2, 0
|
||||
_082E3D74: .4byte gRfuState
|
||||
_082E3D78:
|
||||
mvn r3, 0x850
|
||||
sub r3, r3, 0x2
|
||||
strh r3, [r0, r1]
|
||||
ldr r2, [r4]
|
||||
mov r3, 0x4
|
||||
_082E3D8C:
|
||||
str r3, [r2, 0xC]
|
||||
_082E3D90:
|
||||
mov r12, 0x200
|
||||
add r12, r12, 0x4000002
|
||||
mov r3, 0xC3
|
||||
strh r3, [r5]
|
||||
mov r1, 0x208
|
||||
ldr r2, [r4]
|
||||
add r1, r1, 0x4000000
|
||||
ldrb r0, [r2, 0xA]
|
||||
sub r3, r3, 0xBB
|
||||
mov r3, r3, lsl r0
|
||||
strh r3, [r12]
|
||||
mov r2, 0x1
|
||||
strh r2, [r1]
|
||||
ldmdb r11, {r4,r5,r11,sp,lr}
|
||||
bx lr
|
||||
arm_func_end STWI_set_timer_in_RAM
|
||||
|
||||
arm_func_start STWI_stop_timer_in_RAM
|
||||
STWI_stop_timer_in_RAM: @ 82E3DCC
|
||||
mov r12, sp
|
||||
stmdb sp!, {r11,r12,lr,pc}
|
||||
mov r1, 0x100
|
||||
ldr lr, _082E3E18
|
||||
add r0, r1, 0x4000000
|
||||
ldr r2, [lr]
|
||||
sub r11, r12, 0x4
|
||||
ldrb r3, [r2, 0xA]
|
||||
mov r12, 0
|
||||
str r12, [r2, 0xC]
|
||||
mov r3, r3, lsl 2
|
||||
strh r12, [r3, r0]
|
||||
ldr r2, [lr]
|
||||
ldrb r3, [r2, 0xA]
|
||||
add r1, r1, 0x4000002
|
||||
mov r3, r3, lsl 2
|
||||
strh r12, [r3, r1]
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_082E3E18: .4byte gRfuState
|
||||
arm_func_end STWI_stop_timer_in_RAM
|
||||
|
||||
arm_func_start STWI_init_slave
|
||||
STWI_init_slave: @ 82E3E1C
|
||||
mov r12, sp
|
||||
stmdb sp!, {r11,r12,lr,pc}
|
||||
ldr r0, _082E3EA4
|
||||
ldr r2, [r0]
|
||||
mov r3, 0x5
|
||||
str r3, [r2]
|
||||
mov r1, 0
|
||||
strb r1, [r2, 0x14]
|
||||
ldr r3, [r0]
|
||||
strb r1, [r3, 0x4]
|
||||
ldr r2, [r0]
|
||||
strb r1, [r2, 0x5]
|
||||
ldr r3, [r0]
|
||||
strb r1, [r3, 0x6]
|
||||
ldr r2, [r0]
|
||||
strb r1, [r2, 0x7]
|
||||
ldr r3, [r0]
|
||||
strb r1, [r3, 0x8]
|
||||
ldr r2, [r0]
|
||||
strb r1, [r2, 0x9]
|
||||
ldr r3, [r0]
|
||||
str r1, [r3, 0xC]
|
||||
sub r11, r12, 0x4
|
||||
strb r1, [r3, 0x10]
|
||||
mov r2, 0x128
|
||||
ldr r12, [r0]
|
||||
add r2, r2, 0x4000000
|
||||
strh r1, [r12, 0x12]
|
||||
mov r3, 0x5000
|
||||
strb r1, [r12, 0x15]
|
||||
add r3, r3, 0x82
|
||||
strh r3, [r2]
|
||||
ldmdb r11, {r11,sp,lr}
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_082E3EA4: .4byte gRfuState
|
||||
arm_func_end STWI_init_slave
|
||||
|
||||
arm_func_start sub_82E3EA8
|
||||
sub_82E3EA8: @ 82E3EA8
|
||||
bx r2
|
||||
arm_func_end sub_82E3EA8
|
||||
|
||||
arm_func_start sub_82E3EAC
|
||||
sub_82E3EAC: @ 82E3EAC
|
||||
bx r1
|
||||
arm_func_end sub_82E3EAC
|
||||
|
||||
arm_func_start sub_82E3EB0
|
||||
sub_82E3EB0: @ 82E3EB0
|
||||
bx r0
|
||||
arm_func_end sub_82E3EB0
|
||||
+11
-11
@@ -545,7 +545,7 @@ _08009888:
|
||||
movs r6, 0
|
||||
strh r0, [r4]
|
||||
adds r0, r5, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
ldrh r0, [r4]
|
||||
cmp r0, r8
|
||||
beq _080098C4
|
||||
@@ -2181,8 +2181,8 @@ _0800A5E2:
|
||||
.pool
|
||||
thumb_func_end ResetBlockReceivedFlags
|
||||
|
||||
thumb_func_start sub_800A5EC
|
||||
sub_800A5EC: @ 800A5EC
|
||||
thumb_func_start ResetBlockReceivedFlag
|
||||
ResetBlockReceivedFlag: @ 800A5EC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@@ -2206,7 +2206,7 @@ _0800A616:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_800A5EC
|
||||
thumb_func_end ResetBlockReceivedFlag
|
||||
|
||||
thumb_func_start sub_800A620
|
||||
sub_800A620: @ 800A620
|
||||
@@ -14607,7 +14607,7 @@ sub_8010A70: @ 8010A70
|
||||
adds r1, r4, 0
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
_08010A9C:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -14683,7 +14683,7 @@ _08010B40:
|
||||
b _08010CF0
|
||||
_08010B4A:
|
||||
adds r0, r4, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
movs r0, 0xF0
|
||||
lsls r0, 7
|
||||
bl sub_800FD14
|
||||
@@ -14713,7 +14713,7 @@ _08010B78:
|
||||
b _08010CF0
|
||||
_08010B8C:
|
||||
adds r0, r4, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
lsls r2, r4, 8
|
||||
ldr r0, =gBlockRecvBuffer
|
||||
adds r2, r0
|
||||
@@ -14845,7 +14845,7 @@ _08010C94:
|
||||
ldr r2, =0x0100007e
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
ldr r1, =gUnknown_03005000
|
||||
ldr r5, =0x00000ce8
|
||||
adds r0, r1, r5
|
||||
@@ -14947,7 +14947,7 @@ _08010D82:
|
||||
ldr r0, =gBlockRecvBuffer
|
||||
bl sub_8010A14
|
||||
movs r0, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
ldr r0, =gReceivedRemoteLinkPlayers
|
||||
strb r4, [r0]
|
||||
adds r0, r5, 0
|
||||
@@ -39108,7 +39108,7 @@ sub_801D978: @ 801D978
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_801D978
|
||||
@@ -42361,7 +42361,7 @@ _0801F3A2:
|
||||
strh r1, [r4, 0x4]
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
movs r1, 0x2
|
||||
ldrsh r0, [r4, r1]
|
||||
lsls r0, 8
|
||||
|
||||
@@ -241,14 +241,14 @@
|
||||
@ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers.
|
||||
.macro special function
|
||||
.byte 0x25
|
||||
.2byte \function
|
||||
.2byte SPECIAL_\function
|
||||
.endm
|
||||
|
||||
@ Calls a special function. That function's output (if any) will be written to the variable you specify.
|
||||
.macro specialvar output, function
|
||||
.byte 0x26
|
||||
.2byte \output
|
||||
.2byte \function
|
||||
.2byte SPECIAL_\function
|
||||
.endm
|
||||
|
||||
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
|
||||
|
||||
-1035
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -5441,7 +5441,7 @@ sub_81B2E64: @ 81B2E64
|
||||
mov r2, r9
|
||||
lsls r1, r2, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@@ -10452,7 +10452,7 @@ sub_81B5A8C: @ 81B5A8C
|
||||
asrs r2, 16
|
||||
adds r0, r1, 0
|
||||
adds r1, r2, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
|
||||
@@ -1043,7 +1043,7 @@ _080C77C2:
|
||||
lsrs r5, r0, 16
|
||||
cmp r5, 0xD
|
||||
bls _080C77C2
|
||||
bl sub_80D242C
|
||||
bl ResetWaldaWallpaper
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -7122,7 +7122,7 @@ sub_80CADD8: @ 80CADD8
|
||||
bl sub_80CFF34
|
||||
movs r0, 0x15
|
||||
bl sub_80CFF34
|
||||
bl sub_80D2494
|
||||
bl IsWaldaWallpaperUnlocked
|
||||
cmp r0, 0
|
||||
beq _080CAE04
|
||||
movs r0, 0x16
|
||||
@@ -10421,7 +10421,7 @@ _080CC888:
|
||||
b _080CC9DA
|
||||
.pool
|
||||
_080CC8C4:
|
||||
bl sub_80D24A8
|
||||
bl GetWaldaWallpaperPatternId
|
||||
lsls r1, r0, 1
|
||||
adds r1, r0
|
||||
lsls r1, 2
|
||||
@@ -10448,13 +10448,13 @@ _080CC8C4:
|
||||
adds r1, r4
|
||||
movs r2, 0x20
|
||||
bl CpuSet
|
||||
bl sub_80D2510
|
||||
bl GetWaldaWallpaperColorsPtr
|
||||
ldr r1, [r7]
|
||||
ldr r2, =0x00000794
|
||||
adds r1, r2
|
||||
movs r2, 0x2
|
||||
bl CpuSet
|
||||
bl sub_80D2510
|
||||
bl GetWaldaWallpaperColorsPtr
|
||||
ldr r1, [r7]
|
||||
ldr r3, =0x000007b4
|
||||
adds r1, r3
|
||||
@@ -10500,7 +10500,7 @@ _080CC976:
|
||||
adds r1, r5
|
||||
str r0, [r1]
|
||||
ldr r4, =gUnknown_0857B004
|
||||
bl sub_80D24DC
|
||||
bl GetWaldaWallpaperIconId
|
||||
lsls r0, 2
|
||||
adds r0, r4
|
||||
ldr r0, [r0]
|
||||
@@ -21544,8 +21544,8 @@ _080D241E:
|
||||
bx r1
|
||||
thumb_func_end sub_80D23A8
|
||||
|
||||
thumb_func_start sub_80D242C
|
||||
sub_80D242C: @ 80D242C
|
||||
thumb_func_start ResetWaldaWallpaper
|
||||
ResetWaldaWallpaper: @ 80D242C
|
||||
ldr r2, =gSaveBlock1Ptr
|
||||
ldr r0, [r2]
|
||||
ldr r1, =0x00003d84
|
||||
@@ -21575,10 +21575,10 @@ sub_80D242C: @ 80D242C
|
||||
strb r0, [r1]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D242C
|
||||
thumb_func_end ResetWaldaWallpaper
|
||||
|
||||
thumb_func_start sub_80D2480
|
||||
sub_80D2480: @ 80D2480
|
||||
thumb_func_start SetWaldaWallpaperLockedOrUnlocked
|
||||
SetWaldaWallpaperLockedOrUnlocked: @ 80D2480
|
||||
ldr r1, =gSaveBlock1Ptr
|
||||
ldr r1, [r1]
|
||||
ldr r2, =0x00003d86
|
||||
@@ -21586,10 +21586,10 @@ sub_80D2480: @ 80D2480
|
||||
strb r0, [r1]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D2480
|
||||
thumb_func_end SetWaldaWallpaperLockedOrUnlocked
|
||||
|
||||
thumb_func_start sub_80D2494
|
||||
sub_80D2494: @ 80D2494
|
||||
thumb_func_start IsWaldaWallpaperUnlocked
|
||||
IsWaldaWallpaperUnlocked: @ 80D2494
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003d86
|
||||
@@ -21597,10 +21597,10 @@ sub_80D2494: @ 80D2494
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D2494
|
||||
thumb_func_end IsWaldaWallpaperUnlocked
|
||||
|
||||
thumb_func_start sub_80D24A8
|
||||
sub_80D24A8: @ 80D24A8
|
||||
thumb_func_start GetWaldaWallpaperPatternId
|
||||
GetWaldaWallpaperPatternId: @ 80D24A8
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003d85
|
||||
@@ -21608,10 +21608,10 @@ sub_80D24A8: @ 80D24A8
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D24A8
|
||||
thumb_func_end GetWaldaWallpaperPatternId
|
||||
|
||||
thumb_func_start sub_80D24BC
|
||||
sub_80D24BC: @ 80D24BC
|
||||
thumb_func_start SetWaldaWallpaperPatternId
|
||||
SetWaldaWallpaperPatternId: @ 80D24BC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@@ -21626,10 +21626,10 @@ _080D24D0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D24BC
|
||||
thumb_func_end SetWaldaWallpaperPatternId
|
||||
|
||||
thumb_func_start sub_80D24DC
|
||||
sub_80D24DC: @ 80D24DC
|
||||
thumb_func_start GetWaldaWallpaperIconId
|
||||
GetWaldaWallpaperIconId: @ 80D24DC
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003d84
|
||||
@@ -21637,10 +21637,10 @@ sub_80D24DC: @ 80D24DC
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D24DC
|
||||
thumb_func_end GetWaldaWallpaperIconId
|
||||
|
||||
thumb_func_start sub_80D24F0
|
||||
sub_80D24F0: @ 80D24F0
|
||||
thumb_func_start SetWaldaWallpaperIconId
|
||||
SetWaldaWallpaperIconId: @ 80D24F0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@@ -21655,20 +21655,20 @@ _080D2504:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D24F0
|
||||
thumb_func_end SetWaldaWallpaperIconId
|
||||
|
||||
thumb_func_start sub_80D2510
|
||||
sub_80D2510: @ 80D2510
|
||||
thumb_func_start GetWaldaWallpaperColorsPtr
|
||||
GetWaldaWallpaperColorsPtr: @ 80D2510
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003d70
|
||||
adds r0, r1
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D2510
|
||||
thumb_func_end GetWaldaWallpaperColorsPtr
|
||||
|
||||
thumb_func_start sub_80D2524
|
||||
sub_80D2524: @ 80D2524
|
||||
thumb_func_start SetWaldaWallpaperColors
|
||||
SetWaldaWallpaperColors: @ 80D2524
|
||||
push {r4,lr}
|
||||
ldr r2, =gSaveBlock1Ptr
|
||||
ldr r2, [r2]
|
||||
@@ -21682,20 +21682,20 @@ sub_80D2524: @ 80D2524
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D2524
|
||||
thumb_func_end SetWaldaWallpaperColors
|
||||
|
||||
thumb_func_start sub_80D2548
|
||||
sub_80D2548: @ 80D2548
|
||||
thumb_func_start GetWaldaPhrasePtr
|
||||
GetWaldaPhrasePtr: @ 80D2548
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003d74
|
||||
adds r0, r1
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_80D2548
|
||||
thumb_func_end GetWaldaPhrasePtr
|
||||
|
||||
thumb_func_start sub_80D255C
|
||||
sub_80D255C: @ 80D255C
|
||||
thumb_func_start SetWaldaPhrase
|
||||
SetWaldaPhrase: @ 80D255C
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
@@ -21706,10 +21706,10 @@ sub_80D255C: @ 80D255C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D255C
|
||||
thumb_func_end SetWaldaPhrase
|
||||
|
||||
thumb_func_start sub_80D2578
|
||||
sub_80D2578: @ 80D2578
|
||||
thumb_func_start IsWaldaPhraseEmpty
|
||||
IsWaldaPhraseEmpty: @ 80D2578
|
||||
push {lr}
|
||||
movs r1, 0
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
@@ -21725,7 +21725,7 @@ _080D258C:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_80D2578
|
||||
thumb_func_end IsWaldaPhraseEmpty
|
||||
|
||||
thumb_func_start sub_80D259C
|
||||
sub_80D259C: @ 80D259C
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5968,26 +5968,5 @@ _081D99B4:
|
||||
bx r0
|
||||
thumb_func_end sub_81D98B4
|
||||
|
||||
thumb_func_start sub_81D99BC
|
||||
sub_81D99BC: @ 81D99BC
|
||||
push {r4,lr}
|
||||
bl sub_80D2578
|
||||
cmp r0, 0
|
||||
bne _081D99DC
|
||||
ldr r4, =gStringVar1
|
||||
bl sub_80D2548
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
movs r0, 0x1
|
||||
b _081D99DE
|
||||
.pool
|
||||
_081D99DC:
|
||||
movs r0, 0
|
||||
_081D99DE:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D99BC
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+1
-1
@@ -1135,7 +1135,7 @@ _080E76DC:
|
||||
bl memcpy
|
||||
_080E76E4:
|
||||
mov r0, r8
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
mov r0, r9
|
||||
lsls r1, r0, 1
|
||||
adds r1, r5, r1
|
||||
|
||||
-3775
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -11676,7 +11676,7 @@ _0813B62E:
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r5]
|
||||
movs r0, 0x1
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
ldr r0, =gSpecialVar_0x8004
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0x1
|
||||
@@ -11756,7 +11756,7 @@ _0813B6E4:
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r1]
|
||||
movs r0, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
_0813B708:
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r4, 2
|
||||
|
||||
+87
-87
@@ -74,7 +74,7 @@ _080A5D00:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5D28
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x18]
|
||||
ldrb r1, [r2, 0x4]
|
||||
@@ -180,7 +180,7 @@ _080A5DDA:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5E04
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x18]
|
||||
ldrb r1, [r2, 0x4]
|
||||
@@ -531,7 +531,7 @@ sub_80A60AC: @ 80A60AC
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A60E8
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x18]
|
||||
ldrb r1, [r2, 0x4]
|
||||
@@ -554,7 +554,7 @@ _080A60E8:
|
||||
ldrh r0, [r1, 0x2]
|
||||
cmp r0, 0
|
||||
bne _080A610C
|
||||
ldr r1, =gUnknown_02038438
|
||||
ldr r1, =gAnimSpeciesByBanks
|
||||
lsls r0, r4, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
@@ -724,9 +724,9 @@ GetAnimBankSpriteId: @ 80A6240
|
||||
adds r1, r0, 0
|
||||
cmp r0, 0
|
||||
bne _080A6268
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A62B6
|
||||
@@ -737,9 +737,9 @@ GetAnimBankSpriteId: @ 80A6240
|
||||
_080A6268:
|
||||
cmp r0, 0x1
|
||||
bne _080A6288
|
||||
ldr r4, =gAnimationBankTarget
|
||||
ldr r4, =gAnimBankTarget
|
||||
ldrb r0, [r4]
|
||||
bl sub_80A6A90
|
||||
bl AnimBankSpriteExists
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A62B6
|
||||
@@ -750,22 +750,22 @@ _080A6268:
|
||||
_080A6288:
|
||||
cmp r1, 0x2
|
||||
bne _080A62A4
|
||||
ldr r5, =gAnimationBankAttacker
|
||||
ldr r5, =gAnimBankAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A62B6
|
||||
b _080A62C0
|
||||
.pool
|
||||
_080A62A4:
|
||||
ldr r5, =gAnimationBankTarget
|
||||
ldr r5, =gAnimBankTarget
|
||||
ldrb r0, [r5]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A62C0
|
||||
@@ -1242,7 +1242,7 @@ sub_80A65EC: @ 80A65EC
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x34]
|
||||
ldr r5, =gAnimationBankTarget
|
||||
ldr r5, =gAnimBankTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -1421,7 +1421,7 @@ move_anim_8074EE0: @ 80A674C
|
||||
adds r4, r0, 0
|
||||
bl FreeSpriteOamMatrix
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1439,7 +1439,7 @@ sub_80A6760: @ 80A6760
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x34]
|
||||
ldr r5, =gAnimationBankAttacker
|
||||
ldr r5, =gAnimBankAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -1518,7 +1518,7 @@ sub_80A67F4: @ 80A67F4
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1537,7 +1537,7 @@ sub_80A6814: @ 80A6814
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1547,7 +1547,7 @@ sub_80A6814: @ 80A6814
|
||||
sub_80A6838: @ 80A6838
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -1575,13 +1575,13 @@ sub_80A6864: @ 80A6864
|
||||
lsls r1, 16
|
||||
lsrs r5, r1, 16
|
||||
mov r8, r5
|
||||
ldr r7, =gAnimationBankAttacker
|
||||
ldr r7, =gAnimBankAttacker
|
||||
ldrb r0, [r7]
|
||||
movs r1, 0
|
||||
bl sub_80A5C6C
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_80A5C6C
|
||||
@@ -1729,7 +1729,7 @@ sub_80A6980: @ 80A6980
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
bne _080A69A8
|
||||
ldr r4, =gAnimationBankTarget
|
||||
ldr r4, =gAnimBankTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_80A60AC
|
||||
@@ -1765,7 +1765,7 @@ sub_80A69CC: @ 80A69CC
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
bne _080A69F0
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_80A60AC
|
||||
@@ -1777,7 +1777,7 @@ sub_80A69CC: @ 80A69CC
|
||||
b _080A6A04
|
||||
.pool
|
||||
_080A69F0:
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_80A60AC
|
||||
@@ -1810,7 +1810,7 @@ _080A6A04:
|
||||
GetBankSide: @ 80A6A30
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, =gBanksBySide
|
||||
ldr r1, =gBanksByIdentity
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
@@ -1823,7 +1823,7 @@ GetBankSide: @ 80A6A30
|
||||
GetBankIdentity: @ 80A6A44
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, =gBanksBySide
|
||||
ldr r1, =gBanksByIdentity
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
@@ -1840,7 +1840,7 @@ GetBankByIdentity: @ 80A6A54
|
||||
ldrb r2, [r0]
|
||||
cmp r1, r2
|
||||
bcs _080A6A7E
|
||||
ldr r4, =gBanksBySide
|
||||
ldr r4, =gBanksByIdentity
|
||||
ldrb r0, [r4]
|
||||
cmp r0, r3
|
||||
beq _080A6A7E
|
||||
@@ -1862,8 +1862,8 @@ _080A6A7E:
|
||||
.pool
|
||||
thumb_func_end GetBankByIdentity
|
||||
|
||||
thumb_func_start sub_80A6A90
|
||||
sub_80A6A90: @ 80A6A90
|
||||
thumb_func_start AnimBankSpriteExists
|
||||
AnimBankSpriteExists: @ 80A6A90
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -1872,18 +1872,18 @@ sub_80A6A90: @ 80A6A90
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A6ABC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
cmp r0, r4
|
||||
beq _080A6B0A
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
cmp r0, r4
|
||||
beq _080A6B0A
|
||||
b _080A6B18
|
||||
.pool
|
||||
_080A6ABC:
|
||||
ldr r0, =gBanksBySide
|
||||
ldr r0, =gBanksByIdentity
|
||||
adds r0, r4, r0
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0xFF
|
||||
@@ -1926,7 +1926,7 @@ _080A6B1A:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80A6A90
|
||||
thumb_func_end AnimBankSpriteExists
|
||||
|
||||
thumb_func_start IsDoubleBattle
|
||||
IsDoubleBattle: @ 80A6B20
|
||||
@@ -2061,9 +2061,9 @@ sub_80A6BFC: @ 80A6BFC
|
||||
b _080A6C60
|
||||
.pool
|
||||
_080A6C30:
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankIdentity_permutated
|
||||
bl sub_80A8364
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0x1
|
||||
@@ -2271,21 +2271,21 @@ _080A6DBE:
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
movs r0, 0x3
|
||||
movs r1, 0x1
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
b _080A6DE8
|
||||
_080A6DD4:
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
movs r0, 0x3
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl SetAnimBgAttribute
|
||||
_080A6DE8:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -2934,7 +2934,7 @@ sub_80A7270: @ 80A7270
|
||||
cmp r0, 0
|
||||
bne _080A72A6
|
||||
adds r0, r7, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A72B4
|
||||
@@ -3372,7 +3372,7 @@ _080A75F6:
|
||||
_080A7602:
|
||||
cmp r7, 0
|
||||
beq _080A7614
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x10
|
||||
@@ -3383,7 +3383,7 @@ _080A7614:
|
||||
mov r0, r8
|
||||
cmp r0, 0
|
||||
beq _080A7628
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x10
|
||||
@@ -3394,11 +3394,11 @@ _080A7628:
|
||||
mov r0, r9
|
||||
cmp r0, 0
|
||||
beq _080A764E
|
||||
ldr r6, =gAnimationBankAttacker
|
||||
ldr r6, =gAnimBankAttacker
|
||||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A764E
|
||||
@@ -3413,11 +3413,11 @@ _080A764E:
|
||||
mov r0, r10
|
||||
cmp r0, 0
|
||||
beq _080A7674
|
||||
ldr r6, =gAnimationBankTarget
|
||||
ldr r6, =gAnimBankTarget
|
||||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7674
|
||||
@@ -3499,7 +3499,7 @@ _080A76F2:
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A771A
|
||||
@@ -3517,7 +3517,7 @@ _080A771A:
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7746
|
||||
@@ -3537,7 +3537,7 @@ _080A7746:
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7772
|
||||
@@ -3558,7 +3558,7 @@ _080A7772:
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A77A0
|
||||
@@ -3670,7 +3670,7 @@ _080A7838:
|
||||
_080A7842:
|
||||
adds r0, r5, 0
|
||||
bl sub_80A69CC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -3682,7 +3682,7 @@ _080A7842:
|
||||
_080A785C:
|
||||
ldrh r0, [r6, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r4, =gAnimationBankTarget
|
||||
ldr r4, =gAnimBankTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -3701,7 +3701,7 @@ _080A785C:
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, =sub_80A6EEC
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4-r7}
|
||||
@@ -3716,7 +3716,7 @@ sub_80A78AC: @ 80A78AC
|
||||
adds r6, r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_80A69CC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -3730,7 +3730,7 @@ _080A78CC:
|
||||
ldr r4, =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldr r5, =gAnimationBankTarget
|
||||
ldr r5, =gAnimBankTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -3768,7 +3768,7 @@ sub_80A791C: @ 80A791C
|
||||
cmp r0, 0
|
||||
beq _080A7930
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
_080A7930:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -3799,17 +3799,17 @@ _080A7954:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_80A69CC
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
b _080A7976
|
||||
.pool
|
||||
_080A796C:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_80A6980
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
_080A7976:
|
||||
ldrb r6, [r0]
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -3844,7 +3844,7 @@ _080A798E:
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, =sub_80A6EEC
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4-r7}
|
||||
@@ -4070,7 +4070,7 @@ _080A7B60:
|
||||
cmp r1, r0
|
||||
bne _080A7B90
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080A7B90:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -4090,7 +4090,7 @@ sub_80A7B98: @ 80A7B98
|
||||
cmp r3, 0xFF
|
||||
bne _080A7BBC
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080A7BE2
|
||||
.pool
|
||||
_080A7BBC:
|
||||
@@ -4210,7 +4210,7 @@ _080A7C78:
|
||||
b _080A7CAC
|
||||
_080A7CA6:
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080A7CAC:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -4230,7 +4230,7 @@ sub_80A7CB4: @ 80A7CB4
|
||||
cmp r2, 0xFF
|
||||
bne _080A7CD8
|
||||
adds r0, r4, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
b _080A7CEE
|
||||
.pool
|
||||
_080A7CD8:
|
||||
@@ -4554,7 +4554,7 @@ _080A7F42:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7F78
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x18]
|
||||
ldrh r2, [r0]
|
||||
@@ -4807,7 +4807,7 @@ sub_80A8140: @ 80A8140
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r0, =gHappinessMoveAnim
|
||||
ldr r0, =gAnimFriendship
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
cmp r0, 0x1E
|
||||
@@ -4823,7 +4823,7 @@ _080A815E:
|
||||
ldr r0, =gBattleAnimArgs
|
||||
strh r1, [r0, 0xE]
|
||||
adds r0, r2, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@@ -4837,9 +4837,9 @@ sub_80A8174: @ 80A8174
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r7, r4, 0
|
||||
ldr r6, =gAnimationBankTarget
|
||||
ldr r6, =gAnimBankTarget
|
||||
ldrb r0, [r6]
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A81B4
|
||||
@@ -4863,10 +4863,10 @@ sub_80A8174: @ 80A8174
|
||||
orrs r0, r2
|
||||
strb r0, [r1, 0x5]
|
||||
_080A81B4:
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
mov r8, r0
|
||||
ldrb r0, [r0]
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A81EC
|
||||
@@ -4894,7 +4894,7 @@ _080A81EC:
|
||||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8224
|
||||
@@ -4922,7 +4922,7 @@ _080A8224:
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
eors r0, r5
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A825C
|
||||
@@ -4968,7 +4968,7 @@ _080A8286:
|
||||
lsls r0, r5, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl b_side_obj__get_some_boolean
|
||||
bl IsAnimBankSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A82C8
|
||||
@@ -5083,8 +5083,8 @@ _080A835C:
|
||||
bx r1
|
||||
thumb_func_end sub_80A8328
|
||||
|
||||
thumb_func_start GetBankIdentity_permutated
|
||||
GetBankIdentity_permutated: @ 80A8364
|
||||
thumb_func_start sub_80A8364
|
||||
sub_80A8364: @ 80A8364
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -5109,7 +5109,7 @@ _080A838C:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetBankIdentity_permutated
|
||||
thumb_func_end sub_80A8364
|
||||
|
||||
thumb_func_start sub_80A8394
|
||||
sub_80A8394: @ 80A8394
|
||||
@@ -5416,7 +5416,7 @@ sub_80A861C: @ 80A861C
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A86C4
|
||||
ldr r0, =gUnknown_02039F34
|
||||
ldr r0, =gContestResources
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x18]
|
||||
ldrb r1, [r2, 0x4]
|
||||
@@ -5941,7 +5941,7 @@ sub_80A8A6C: @ 80A8A6C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80A6838
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -5998,7 +5998,7 @@ _080A8AB6:
|
||||
sub_80A8AEC: @ 80A8AEC
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -6054,7 +6054,7 @@ sub_80A8B64: @ 80A8B64
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80A6838
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
ldr r0, =gAnimBankAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -6081,7 +6081,7 @@ _080A8B9C:
|
||||
strh r0, [r4, 0x22]
|
||||
ldr r0, =sub_80A67D8
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4}
|
||||
@@ -6106,7 +6106,7 @@ sub_80A8BC4: @ 80A8BC4
|
||||
lsrs r0, 24
|
||||
movs r6, 0
|
||||
strh r0, [r5, 0x8]
|
||||
ldr r7, =gAnimationBankAttacker
|
||||
ldr r7, =gAnimBankAttacker
|
||||
ldrb r0, [r7]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -6283,7 +6283,7 @@ _080A8D58:
|
||||
ldr r0, =0x00002771
|
||||
bl FreeSpritePaletteByTag
|
||||
adds r0, r5, 0
|
||||
bl move_anim_task_del
|
||||
bl DestroyAnimVisualTask
|
||||
_080A8D6C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -6389,7 +6389,7 @@ _080A8E26:
|
||||
sub_80A8E30: @ 80A8E30
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, =gAnimationBankAttacker
|
||||
ldr r4, =gAnimBankAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_80A5C6C
|
||||
@@ -6465,7 +6465,7 @@ _080A8EC4:
|
||||
cmp r0, r1
|
||||
bge _080A8EDC
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8072740
|
||||
bl DestroyAnimSprite
|
||||
_080A8EDC:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -6487,7 +6487,7 @@ sub_80A8EE4: @ 80A8EE4
|
||||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, =gAnimationBankTarget
|
||||
ldr r0, =gAnimBankTarget
|
||||
ldrb r0, [r0]
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
@@ -6514,7 +6514,7 @@ _080A8F32:
|
||||
strh r0, [r4, 0x22]
|
||||
ldr r0, =sub_80A6EEC
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, =move_anim_8072740
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4,r5}
|
||||
|
||||
+1
-1
@@ -1192,7 +1192,7 @@ _080E9462:
|
||||
mov r3, r10
|
||||
ldrb r1, [r3]
|
||||
lsls r1, 5
|
||||
ldr r2, =gUnknown_085A5C24
|
||||
ldr r2, =gDecorations + 0x1c
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
ldrh r1, [r1]
|
||||
|
||||
+1
-1
@@ -1228,7 +1228,7 @@ c2_clear_save_data_screen_1: @ 80AAEF0
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AAF02
|
||||
ldr r0, =c2_clear_save_data_screen_2
|
||||
ldr r0, =CB2_InitClearSaveDataScreen
|
||||
bl SetMainCallback2
|
||||
_080AAF02:
|
||||
pop {r0}
|
||||
|
||||
+5
-5
@@ -125,7 +125,7 @@ sub_8077234: @ 8077234
|
||||
_08077250:
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
_08077258:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -5954,7 +5954,7 @@ _0807A488:
|
||||
asrs r0, 16
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x5D
|
||||
adds r1, r6
|
||||
@@ -5997,7 +5997,7 @@ _0807A4E8:
|
||||
asrs r0, 16
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x63
|
||||
adds r1, r6
|
||||
@@ -12903,7 +12903,7 @@ _0807E504:
|
||||
strb r6, [r0]
|
||||
_0807E514:
|
||||
movs r0, 0
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
_0807E51A:
|
||||
movs r0, 0x2
|
||||
ands r0, r5
|
||||
@@ -12924,7 +12924,7 @@ _0807E51A:
|
||||
strb r1, [r0]
|
||||
_0807E53C:
|
||||
movs r0, 0x1
|
||||
bl sub_800A5EC
|
||||
bl ResetBlockReceivedFlag
|
||||
_0807E542:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
||||
+5
-5
@@ -351,7 +351,7 @@ sub_8133CF4: @ 8133CF4
|
||||
ldr r5, =gScriptResult
|
||||
_08133CFA:
|
||||
adds r0, r4, 0
|
||||
bl sub_8161AD0
|
||||
bl CountDecorationCategoryN
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08133D10
|
||||
@@ -395,7 +395,7 @@ sub_8133D2C: @ 8133D2C
|
||||
cmp r1, r0
|
||||
beq _08133D72
|
||||
adds r0, r1, 0
|
||||
bl sub_81618D0
|
||||
bl GetFirstEmptyDecorSlot
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
movs r1, 0x1
|
||||
@@ -433,15 +433,15 @@ sub_8133DA0: @ 8133DA0
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_81279C4
|
||||
bl IsSelectedDecorInThePC
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _08133DFC
|
||||
ldr r5, =gSpecialVar_0x8006
|
||||
ldr r0, =gUnknown_0203A172
|
||||
ldr r0, =gCurDecorationIndex
|
||||
ldrb r1, [r0]
|
||||
ldr r0, =gUnknown_0203A14C
|
||||
ldr r0, =gCurDecorInventoryItems
|
||||
ldr r0, [r0]
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
|
||||
@@ -1,543 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start walda_maybe
|
||||
walda_maybe: @ 81D99E4
|
||||
push {r4,lr}
|
||||
sub sp, 0x8
|
||||
ldr r4, =gStringVar2
|
||||
bl sub_80D2548
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
ldr r0, =sub_81D9A1C
|
||||
str r0, [sp, 0x4]
|
||||
movs r0, 0x4
|
||||
adds r1, r4, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl DoNamingScreen
|
||||
add sp, 0x8
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end walda_maybe
|
||||
|
||||
thumb_func_start sub_81D9A1C
|
||||
sub_81D9A1C: @ 81D9A1C
|
||||
push {r4,r5,lr}
|
||||
ldr r4, =gSpecialVar_0x8004
|
||||
ldr r5, =gStringVar2
|
||||
adds r0, r5, 0
|
||||
bl sub_81D9A98
|
||||
strh r0, [r4]
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0x1
|
||||
beq _081D9A68
|
||||
cmp r0, 0x1
|
||||
bgt _081D9A44
|
||||
cmp r0, 0
|
||||
beq _081D9A62
|
||||
b _081D9A68
|
||||
.pool
|
||||
_081D9A44:
|
||||
cmp r0, 0x2
|
||||
bne _081D9A68
|
||||
bl sub_80D2578
|
||||
cmp r0, 0
|
||||
beq _081D9A5C
|
||||
ldr r0, =gText_Peekaboo
|
||||
bl sub_80D255C
|
||||
b _081D9A68
|
||||
.pool
|
||||
_081D9A5C:
|
||||
movs r0, 0x1
|
||||
strh r0, [r4]
|
||||
b _081D9A68
|
||||
_081D9A62:
|
||||
adds r0, r5, 0
|
||||
bl sub_80D255C
|
||||
_081D9A68:
|
||||
ldr r4, =gStringVar1
|
||||
bl sub_80D2548
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCopy
|
||||
ldr r1, =gFieldCallback
|
||||
ldr r0, =sub_80AF168
|
||||
str r0, [r1]
|
||||
ldr r0, =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81D9A1C
|
||||
|
||||
thumb_func_start sub_81D9A98
|
||||
sub_81D9A98: @ 81D9A98
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0xFF
|
||||
bne _081D9AA6
|
||||
movs r0, 0x2
|
||||
b _081D9ABC
|
||||
_081D9AA6:
|
||||
bl sub_80D2548
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl StringCompare
|
||||
cmp r0, 0
|
||||
beq _081D9ABA
|
||||
movs r0, 0
|
||||
b _081D9ABC
|
||||
_081D9ABA:
|
||||
movs r0, 0x1
|
||||
_081D9ABC:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D9A98
|
||||
|
||||
thumb_func_start sub_81D9AC4
|
||||
sub_81D9AC4: @ 81D9AC4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x10
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0xA
|
||||
bl ReadUnalignedWord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
ldr r0, =gScriptResult
|
||||
mov r8, r0
|
||||
bl sub_80D2548
|
||||
mov r7, sp
|
||||
adds r7, 0xA
|
||||
add r6, sp, 0xC
|
||||
mov r5, sp
|
||||
adds r5, 0xD
|
||||
str r4, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
add r0, sp, 0x8
|
||||
adds r1, r7, 0
|
||||
adds r2, r6, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_81D9B68
|
||||
mov r1, r8
|
||||
strh r0, [r1]
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
beq _081D9B1E
|
||||
ldrb r0, [r5]
|
||||
bl sub_80D24BC
|
||||
ldrb r0, [r6]
|
||||
bl sub_80D24F0
|
||||
add r0, sp, 0x8
|
||||
ldrh r0, [r0]
|
||||
ldrh r1, [r7]
|
||||
bl sub_80D2524
|
||||
_081D9B1E:
|
||||
mov r1, r8
|
||||
ldrh r0, [r1]
|
||||
bl sub_80D2480
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
add sp, 0x10
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_81D9AC4
|
||||
|
||||
thumb_func_start sub_81D9B40
|
||||
sub_81D9B40: @ 81D9B40
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0
|
||||
ldr r3, =gUnknown_0862AD14
|
||||
_081D9B4A:
|
||||
adds r0, r1, r3
|
||||
ldrb r0, [r0]
|
||||
cmp r0, r2
|
||||
bne _081D9B5C
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
b _081D9B64
|
||||
.pool
|
||||
_081D9B5C:
|
||||
adds r1, 0x1
|
||||
cmp r1, 0x1F
|
||||
bls _081D9B4A
|
||||
movs r0, 0x20
|
||||
_081D9B64:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D9B40
|
||||
|
||||
thumb_func_start sub_81D9B68
|
||||
sub_81D9B68: @ 81D9B68
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x2C
|
||||
mov r10, r0
|
||||
str r1, [sp, 0x20]
|
||||
str r2, [sp, 0x24]
|
||||
str r3, [sp, 0x28]
|
||||
ldr r0, [sp, 0x4C]
|
||||
ldr r5, [sp, 0x50]
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r9, r0
|
||||
adds r0, r5, 0
|
||||
bl StringLength
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0xF
|
||||
bne _081D9C7E
|
||||
movs r4, 0
|
||||
add r7, sp, 0x10
|
||||
_081D9B98:
|
||||
adds r0, r5, r4
|
||||
ldrb r0, [r0]
|
||||
bl sub_81D9B40
|
||||
adds r1, r7, r4
|
||||
strb r0, [r1]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x20
|
||||
beq _081D9C7E
|
||||
adds r4, 0x1
|
||||
cmp r4, 0xE
|
||||
ble _081D9B98
|
||||
movs r6, 0x3
|
||||
movs r5, 0
|
||||
movs r0, 0x5
|
||||
mov r8, r0
|
||||
movs r4, 0xD
|
||||
_081D9BBC:
|
||||
mov r1, r8
|
||||
str r1, [sp]
|
||||
add r0, sp, 0x4
|
||||
adds r1, r7, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl sub_81D9D5C
|
||||
adds r6, 0x8
|
||||
adds r5, 0x5
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bge _081D9BBC
|
||||
movs r0, 0x2
|
||||
str r0, [sp]
|
||||
add r0, sp, 0x4
|
||||
adds r1, r7, 0
|
||||
movs r2, 0x46
|
||||
movs r3, 0x73
|
||||
bl sub_81D9D5C
|
||||
add r0, sp, 0x4
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl sub_81D9DAC
|
||||
adds r4, r0, 0
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x75
|
||||
movs r2, 0x3
|
||||
bl sub_81D9DAC
|
||||
cmp r4, r0
|
||||
bne _081D9C7E
|
||||
add r0, sp, 0x4
|
||||
movs r1, 0x9
|
||||
movs r2, 0x15
|
||||
bl sub_81D9C90
|
||||
add r0, sp, 0x4
|
||||
ldrb r0, [r0, 0x8]
|
||||
movs r2, 0xF
|
||||
ands r2, r0
|
||||
add r0, sp, 0x4
|
||||
movs r1, 0x8
|
||||
bl sub_81D9C90
|
||||
add r0, sp, 0x4
|
||||
ldrb r2, [r0, 0x8]
|
||||
lsrs r2, 4
|
||||
movs r1, 0x8
|
||||
bl sub_81D9CDC
|
||||
add r0, sp, 0x4
|
||||
ldrb r2, [r0, 0x6]
|
||||
adds r1, r0, 0
|
||||
ldrb r0, [r0]
|
||||
ldrb r1, [r1, 0x2]
|
||||
eors r0, r1
|
||||
add r1, sp, 0x4
|
||||
ldrb r4, [r1, 0x4]
|
||||
eors r0, r4
|
||||
mov r3, r9
|
||||
lsrs r1, r3, 8
|
||||
eors r0, r1
|
||||
cmp r2, r0
|
||||
bne _081D9C7E
|
||||
add r0, sp, 0x4
|
||||
ldrb r3, [r0, 0x7]
|
||||
adds r2, r0, 0
|
||||
ldrb r1, [r0, 0x1]
|
||||
ldrb r0, [r2, 0x3]
|
||||
eors r1, r0
|
||||
adds r0, r2, 0
|
||||
ldrb r2, [r0, 0x5]
|
||||
eors r1, r2
|
||||
movs r0, 0xFF
|
||||
mov r5, r9
|
||||
ands r0, r5
|
||||
eors r1, r0
|
||||
cmp r3, r1
|
||||
bne _081D9C7E
|
||||
add r0, sp, 0x4
|
||||
ldrh r0, [r0]
|
||||
mov r1, r10
|
||||
strh r0, [r1]
|
||||
mov r0, sp
|
||||
adds r0, 0x6
|
||||
ldrh r0, [r0]
|
||||
ldr r3, [sp, 0x20]
|
||||
strh r0, [r3]
|
||||
ldr r5, [sp, 0x24]
|
||||
strb r4, [r5]
|
||||
ldr r0, [sp, 0x28]
|
||||
strb r2, [r0]
|
||||
movs r0, 0x1
|
||||
b _081D9C80
|
||||
_081D9C7E:
|
||||
movs r0, 0
|
||||
_081D9C80:
|
||||
add sp, 0x2C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D9B68
|
||||
|
||||
thumb_func_start sub_81D9C90
|
||||
sub_81D9C90: @ 81D9C90
|
||||
push {r4-r7,lr}
|
||||
adds r7, r0, 0
|
||||
mov r12, r1
|
||||
subs r3, r2, 0x1
|
||||
cmp r2, 0
|
||||
beq _081D9CD6
|
||||
_081D9C9C:
|
||||
ldrb r1, [r7]
|
||||
movs r0, 0x80
|
||||
ands r0, r1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 31
|
||||
mov r2, r12
|
||||
subs r2, 0x1
|
||||
subs r5, r3, 0x1
|
||||
cmp r2, 0
|
||||
blt _081D9CCC
|
||||
movs r6, 0x80
|
||||
adds r3, r2, r7
|
||||
_081D9CB4:
|
||||
ldrb r1, [r3]
|
||||
adds r0, r6, 0
|
||||
ands r0, r1
|
||||
lsls r0, 24
|
||||
lsls r1, 1
|
||||
orrs r4, r1
|
||||
strb r4, [r3]
|
||||
lsrs r4, r0, 31
|
||||
subs r3, 0x1
|
||||
subs r2, 0x1
|
||||
cmp r2, 0
|
||||
bge _081D9CB4
|
||||
_081D9CCC:
|
||||
adds r3, r5, 0
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
cmp r3, r0
|
||||
bne _081D9C9C
|
||||
_081D9CD6:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81D9C90
|
||||
|
||||
thumb_func_start sub_81D9CDC
|
||||
sub_81D9CDC: @ 81D9CDC
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r2, 24
|
||||
lsrs r3, r2, 24
|
||||
lsls r0, r3, 4
|
||||
orrs r3, r0
|
||||
lsls r0, r3, 24
|
||||
lsrs r3, r0, 24
|
||||
movs r4, 0
|
||||
cmp r4, r5
|
||||
bcs _081D9D04
|
||||
_081D9CF4:
|
||||
adds r2, r6, r4
|
||||
ldrb r1, [r2]
|
||||
adds r0, r3, 0
|
||||
eors r0, r1
|
||||
strb r0, [r2]
|
||||
adds r4, 0x1
|
||||
cmp r4, r5
|
||||
bcc _081D9CF4
|
||||
_081D9D04:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81D9CDC
|
||||
|
||||
thumb_func_start sub_81D9D0C
|
||||
sub_81D9D0C: @ 81D9D0C
|
||||
push {lr}
|
||||
lsrs r3, r1, 3
|
||||
movs r2, 0x7
|
||||
ands r2, r1
|
||||
movs r1, 0x80
|
||||
asrs r1, r2
|
||||
adds r0, r3
|
||||
ldrb r0, [r0]
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _081D9D24
|
||||
movs r0, 0x1
|
||||
_081D9D24:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D9D0C
|
||||
|
||||
thumb_func_start sub_81D9D28
|
||||
sub_81D9D28: @ 81D9D28
|
||||
lsrs r3, r1, 3
|
||||
movs r2, 0x7
|
||||
ands r2, r1
|
||||
movs r1, 0x80
|
||||
asrs r1, r2
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r3
|
||||
ldrb r2, [r0]
|
||||
orrs r1, r2
|
||||
strb r1, [r0]
|
||||
bx lr
|
||||
thumb_func_end sub_81D9D28
|
||||
|
||||
thumb_func_start sub_81D9D40
|
||||
sub_81D9D40: @ 81D9D40
|
||||
lsrs r3, r1, 3
|
||||
movs r2, 0x7
|
||||
ands r2, r1
|
||||
movs r1, 0x80
|
||||
asrs r1, r2
|
||||
mvns r1, r1
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r3
|
||||
ldrb r2, [r0]
|
||||
ands r1, r2
|
||||
strb r1, [r0]
|
||||
bx lr
|
||||
thumb_func_end sub_81D9D40
|
||||
|
||||
thumb_func_start sub_81D9D5C
|
||||
sub_81D9D5C: @ 81D9D5C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
push {r6,r7}
|
||||
adds r6, r0, 0
|
||||
mov r9, r1
|
||||
adds r1, r2, 0
|
||||
mov r8, r3
|
||||
ldr r7, [sp, 0x1C]
|
||||
movs r5, 0
|
||||
cmp r5, r7
|
||||
bcs _081D9DA0
|
||||
adds r4, r1, 0
|
||||
_081D9D76:
|
||||
mov r0, r8
|
||||
adds r1, r0, r5
|
||||
mov r0, r9
|
||||
bl sub_81D9D0C
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081D9D90
|
||||
adds r0, r6, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_81D9D28
|
||||
b _081D9D98
|
||||
_081D9D90:
|
||||
adds r0, r6, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_81D9D40
|
||||
_081D9D98:
|
||||
adds r4, 0x1
|
||||
adds r5, 0x1
|
||||
cmp r5, r7
|
||||
bcc _081D9D76
|
||||
_081D9DA0:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81D9D5C
|
||||
|
||||
thumb_func_start sub_81D9DAC
|
||||
sub_81D9DAC: @ 81D9DAC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
mov r8, r0
|
||||
adds r7, r1, 0
|
||||
adds r6, r2, 0
|
||||
movs r4, 0
|
||||
movs r5, 0
|
||||
cmp r4, r6
|
||||
bcs _081D9DD6
|
||||
_081D9DC0:
|
||||
lsls r4, 1
|
||||
adds r1, r7, r5
|
||||
mov r0, r8
|
||||
bl sub_81D9D0C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
orrs r4, r0
|
||||
adds r5, 0x1
|
||||
cmp r5, r6
|
||||
bcc _081D9DC0
|
||||
_081D9DD6:
|
||||
adds r0, r4, 0
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81D9DAC
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
Reference in New Issue
Block a user