dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-10-20 10:49:21 +02:00
parent 9ccc472b97 ae5aa3c4df
commit b65da491a9
60 changed files with 6252 additions and 10191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+4 -4
View File
@@ -1424,8 +1424,8 @@ _0803575A:
.pool .pool
thumb_func_end ApplyPlayerChosenFrameToBattleMenu thumb_func_end ApplyPlayerChosenFrameToBattleMenu
thumb_func_start load_battle_oval_graphics thumb_func_start DrawMainBattleBackground
load_battle_oval_graphics: @ 8035770 DrawMainBattleBackground: @ 8035770
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gBattleTypeFlags ldr r0, =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
@@ -1665,7 +1665,7 @@ _08035A8A:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end load_battle_oval_graphics thumb_func_end DrawMainBattleBackground
thumb_func_start LoadBattleTextboxAndBackground thumb_func_start LoadBattleTextboxAndBackground
LoadBattleTextboxAndBackground: @ 8035AA4 LoadBattleTextboxAndBackground: @ 8035AA4
@@ -1686,7 +1686,7 @@ LoadBattleTextboxAndBackground: @ 8035AA4
movs r2, 0x40 movs r2, 0x40
bl LoadCompressedPalette bl LoadCompressedPalette
bl ApplyPlayerChosenFrameToBattleMenu bl ApplyPlayerChosenFrameToBattleMenu
bl load_battle_oval_graphics bl DrawMainBattleBackground
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
asm/battle_5.s
+4 -4
View File
@@ -59,13 +59,13 @@ _08056F3E:
bl AllocZeroed bl AllocZeroed
ldr r1, [r5] ldr r1, [r5]
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
ldr r4, =gUnknown_020244A0 ldr r4, =gLinkBattleSendBuffer
movs r5, 0x80 movs r5, 0x80
lsls r5, 5 lsls r5, 5
adds r0, r5, 0 adds r0, r5, 0
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
ldr r4, =gUnknown_020244A4 ldr r4, =gLinkBattleRecvBuffer
adds r0, r5, 0 adds r0, r5, 0
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
@@ -160,11 +160,11 @@ _0805703C:
str r5, [r0, 0x1C] str r5, [r0, 0x1C]
bl Free bl Free
str r5, [r6] str r5, [r6]
ldr r4, =gUnknown_020244A0 ldr r4, =gLinkBattleSendBuffer
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
str r5, [r4] str r5, [r4]
ldr r4, =gUnknown_020244A4 ldr r4, =gLinkBattleRecvBuffer
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
str r5, [r4] str r5, [r4]
asm/battle_7.s
+9 -9
View File
@@ -1056,10 +1056,10 @@ _0805D980:
b _0805DA1E b _0805DA1E
.pool .pool
_0805D9CC: _0805D9CC:
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
mov r2, r10 mov r2, r10
strb r2, [r0] strb r2, [r0]
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
mov r1, sp mov r1, sp
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r0] strb r1, [r0]
@@ -1070,7 +1070,7 @@ _0805D9CC:
ldr r0, =gUnknown_082C9320 ldr r0, =gUnknown_082C9320
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0 movs r2, 0
bl move_something bl DoBattleAnim
ldr r0, =task0A_0803415C ldr r0, =task0A_0803415C
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
@@ -1180,14 +1180,14 @@ move_anim_start_t4: @ 805DAC4
lsrs r4, 24 lsrs r4, 24
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
strb r1, [r0] strb r1, [r0]
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
strb r2, [r0] strb r2, [r0]
ldr r0, =gUnknown_082C937C ldr r0, =gUnknown_082C937C
adds r1, r3, 0 adds r1, r3, 0
movs r2, 0 movs r2, 0
bl move_something bl DoBattleAnim
ldr r0, =task0A_08034248 ldr r0, =task0A_08034248
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
@@ -2353,7 +2353,7 @@ _0805E51C:
beq _0805E558 beq _0805E558
movs r0, 0 movs r0, 0
mov r10, r0 mov r10, r0
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x18] ldr r2, [r0, 0x18]
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
@@ -3111,7 +3111,7 @@ sub_805EB9C: @ 805EB9C
_0805EBC8: _0805EBC8:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0805EC60 beq _0805EC60
@@ -3329,7 +3329,7 @@ sub_805ED70: @ 805ED70
cmp r0, 0 cmp r0, 0
beq _0805EDAC beq _0805EDAC
adds r0, r4, 0 adds r0, r4, 0
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0805EDC0 bne _0805EDC0
asm/battle_anim.s
-4205
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80A9C70.s
+8 -8
View File
@@ -26,9 +26,9 @@ sub_80A9C70: @ 80A9C70
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
ldr r0, =gUnknown_08524F84 ldr r0, =gBattleAnimPicTable + 0x440
bl LoadCompressedObjectPicUsingHeap bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852588C ldr r0, =gBattleAnimPaletteTable + 0x440
bl LoadCompressedObjectPaletteUsingHeap bl LoadCompressedObjectPaletteUsingHeap
ldr r1, =gTasks ldr r1, =gTasks
mov r2, r8 mov r2, r8
@@ -331,7 +331,7 @@ sub_80A9EF4: @ 80A9EF4
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r4, =gAnimationBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -616,7 +616,7 @@ _080AA16C:
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080AA186: _080AA186:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -829,7 +829,7 @@ _080AA322:
b _080AA330 b _080AA330
_080AA328: _080AA328:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080AA352 b _080AA352
_080AA330: _080AA330:
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
@@ -863,13 +863,13 @@ move_anim_start_t2: @ 80AA364
lsrs r4, 24 lsrs r4, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
strb r4, [r0] strb r4, [r0]
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
strb r4, [r0] strb r4, [r0]
ldr r0, =gUnknown_082C92FC ldr r0, =gUnknown_082C92FC
movs r2, 0 movs r2, 0
bl move_something bl DoBattleAnim
ldr r0, =task0A_80788BC ldr r0, =task0A_80788BC
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
asm/battle_anim_80D51AC.s
+45 -45
View File
@@ -18,7 +18,7 @@ sub_80D51AC: @ 80D51AC
cmp r2, 0xFF cmp r2, 0xFF
bne _080D51D0 bne _080D51D0
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D520C b _080D520C
.pool .pool
_080D51D0: _080D51D0:
@@ -140,7 +140,7 @@ _080D5288:
adds r0, r6 adds r0, r6
strh r3, [r0, 0x26] strh r3, [r0, 0x26]
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D52CA b _080D52CA
_080D52C6: _080D52C6:
subs r0, 0x1 subs r0, 0x1
@@ -204,7 +204,7 @@ _080D5326:
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080D533C bne _080D533C
@@ -216,7 +216,7 @@ _080D533C:
.pool .pool
_080D5348: _080D5348:
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
_080D5350: _080D5350:
@@ -226,7 +226,7 @@ _080D5352:
beq _080D5368 beq _080D5368
_080D5356: _080D5356:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D53A6 b _080D53A6
.pool .pool
_080D5368: _080D5368:
@@ -359,7 +359,7 @@ _080D5436:
adds r0, r7 adds r0, r7
strh r2, [r0, 0x26] strh r2, [r0, 0x26]
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D5478 b _080D5478
_080D5474: _080D5474:
subs r0, r2, 0x1 subs r0, r2, 0x1
@@ -385,7 +385,7 @@ sub_80D5484: @ 80D5484
cmp r3, 0xFF cmp r3, 0xFF
bne _080D54A8 bne _080D54A8
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D54F6 b _080D54F6
.pool .pool
_080D54A8: _080D54A8:
@@ -584,7 +584,7 @@ _080D55F8:
strh r0, [r2, 0x26] strh r0, [r2, 0x26]
_080D5630: _080D5630:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D563C b _080D563C
_080D5638: _080D5638:
subs r0, r2, 0x1 subs r0, r2, 0x1
@@ -705,7 +705,7 @@ _080D56F6:
cmp r0, 0 cmp r0, 0
bne _080D5728 bne _080D5728
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D5728: _080D5728:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -829,7 +829,7 @@ _080D5810:
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D5822: _080D5822:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -842,7 +842,7 @@ sub_80D5830: @ 80D5830
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -871,7 +871,7 @@ sub_80D5860: @ 80D5860
movs r1, 0x4 movs r1, 0x4
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -892,7 +892,7 @@ _080D5894:
strh r2, [r4, 0x2E] strh r2, [r4, 0x2E]
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -919,7 +919,7 @@ sub_80D58D4: @ 80D58D4
strh r1, [r0, 0x30] strh r1, [r0, 0x30]
ldr r1, =sub_80A6630 ldr r1, =sub_80A6630
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r0} pop {r0}
bx r0 bx r0
@@ -970,7 +970,7 @@ sub_80D5944: @ 80D5944
strh r1, [r0, 0x32] strh r1, [r0, 0x32]
ldr r1, =sub_80A6630 ldr r1, =sub_80A6630
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r0} pop {r0}
bx r0 bx r0
@@ -988,12 +988,12 @@ sub_80D5968: @ 80D5968
cmp r0, 0 cmp r0, 0
bne _080D598C bne _080D598C
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080D5990 b _080D5990
.pool .pool
_080D598C: _080D598C:
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080D5990: _080D5990:
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1093,7 +1093,7 @@ _080D5A56:
strh r1, [r3, 0x26] strh r1, [r3, 0x26]
_080D5A58: _080D5A58:
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_8072740 bl DestroyAnimSprite
b _080D5A8E b _080D5A8E
.pool .pool
_080D5A64: _080D5A64:
@@ -1133,11 +1133,11 @@ sub_80D5A94: @ 80D5A94
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _080D5AB0 bne _080D5AB0
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080D5AB2 b _080D5AB2
.pool .pool
_080D5AB0: _080D5AB0:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080D5AB2: _080D5AB2:
ldrb r2, [r0] ldrb r2, [r0]
ldr r0, =gBankSpriteIds ldr r0, =gBankSpriteIds
@@ -1192,7 +1192,7 @@ _080D5ADC:
movs r1, 0x4 movs r1, 0x4
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6680 ldr r0, =sub_80A6680
@@ -1218,11 +1218,11 @@ sub_80D5B48: @ 80D5B48
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _080D5B70 bne _080D5B70
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080D5B72 b _080D5B72
.pool .pool
_080D5B70: _080D5B70:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080D5B72: _080D5B72:
ldrb r1, [r0] ldrb r1, [r0]
ldr r0, =gBankSpriteIds ldr r0, =gBankSpriteIds
@@ -1281,7 +1281,7 @@ _080D5B9C:
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080D5C04 bne _080D5C04
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r6, 0 adds r0, r6, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
b _080D5C0C b _080D5C0C
@@ -1318,7 +1318,7 @@ sub_80D5C20: @ 80D5C20
lsls r1, 2 lsls r1, 2
adds r1, r4 adds r1, r4
strh r3, [r1, 0x26] strh r3, [r1, 0x26]
bl move_anim_8072740 bl DestroyAnimSprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1338,7 +1338,7 @@ sub_80D5C50: @ 80D5C50
bl __divsi3 bl __divsi3
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -1485,7 +1485,7 @@ _080D5D70:
cmp r0, 0 cmp r0, 0
bne _080D5DA4 bne _080D5DA4
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D5DA4: _080D5DA4:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -1518,16 +1518,16 @@ _080D5DD8:
beq _080D5DE8 beq _080D5DE8
b _080D5E10 b _080D5E10
_080D5DDE: _080D5DDE:
ldr r5, =gAnimationBankAttacker ldr r5, =gAnimBankAttacker
b _080D5DEA b _080D5DEA
.pool .pool
_080D5DE8: _080D5DE8:
ldr r5, =gAnimationBankTarget ldr r5, =gAnimBankTarget
_080D5DEA: _080D5DEA:
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x2 movs r4, 0x2
eors r0, r4 eors r0, r4
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080D5E10 beq _080D5E10
@@ -1540,7 +1540,7 @@ _080D5DEA:
.pool .pool
_080D5E10: _080D5E10:
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D5E58 b _080D5E58
_080D5E18: _080D5E18:
ldr r1, =gTasks ldr r1, =gTasks
@@ -1549,7 +1549,7 @@ _080D5E18:
lsls r0, 3 lsls r0, 3
adds r5, r0, r1 adds r5, r0, r1
strh r2, [r5, 0x8] strh r2, [r5, 0x8]
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -1609,7 +1609,7 @@ sub_80D5E6C: @ 80D5E6C
cmp r1, r0 cmp r1, r0
bls _080D5EAA bls _080D5EAA
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D5EAA: _080D5EAA:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1622,7 +1622,7 @@ sub_80D5EB8: @ 80D5EB8
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r6, =gAnimationBankAttacker ldr r6, =gAnimBankAttacker
ldrb r0, [r6] ldrb r0, [r6]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -1660,7 +1660,7 @@ _080D5ED4:
b _080D5F18 b _080D5F18
.pool .pool
_080D5F14: _080D5F14:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
_080D5F18: _080D5F18:
strh r0, [r2, 0x12] strh r0, [r2, 0x12]
@@ -1817,7 +1817,7 @@ _080D601E:
strh r3, [r0, 0x24] strh r3, [r0, 0x24]
strh r3, [r0, 0x26] strh r3, [r0, 0x26]
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D6050: _080D6050:
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -1923,7 +1923,7 @@ _080D6120:
adds r0, r6, 0 adds r0, r6, 0
bl sub_80A7344 bl sub_80A7344
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D612C: _080D612C:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1995,11 +1995,11 @@ _080D61B8:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
cmp r0, 0 cmp r0, 0
bne _080D61C8 bne _080D61C8
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080D61CA b _080D61CA
.pool .pool
_080D61C8: _080D61C8:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080D61CA: _080D61CA:
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
@@ -2076,11 +2076,11 @@ sub_80D622C: @ 80D622C
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
bne _080D6274 bne _080D6274
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080D6276 b _080D6276
.pool .pool
_080D6274: _080D6274:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080D6276: _080D6276:
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
@@ -2201,7 +2201,7 @@ _080D6364:
bl sub_80A7344 bl sub_80A7344
_080D636A: _080D636A:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080D6382 b _080D6382
_080D6372: _080D6372:
movs r0, 0 movs r0, 0
@@ -2236,7 +2236,7 @@ sub_80D6388: @ 80D6388
adds r0, r5, r7 adds r0, r5, r7
lsls r0, 3 lsls r0, 3
adds r6, r0, r4 adds r6, r0, r4
ldr r0, =gMovePowerMoveAnim ldr r0, =gAnimMovePower
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0xC movs r1, 0xC
bl __udivsi3 bl __udivsi3
@@ -2248,7 +2248,7 @@ _080D63C0:
adds r0, r5, r7 adds r0, r5, r7
lsls r0, 3 lsls r0, 3
adds r6, r0, r4 adds r6, r0, r4
ldr r0, =gMoveDmgMoveAnim ldr r0, =gAnimMoveDmg
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xC movs r1, 0xC
bl __divsi3 bl __divsi3
@@ -2435,7 +2435,7 @@ _080D6518:
adds r0, r2 adds r0, r2
strh r4, [r0, 0x26] strh r4, [r0, 0x26]
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080D654A: _080D654A:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/battle_anim_80FE840.s
+909 -909
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_815A0D4.s
+213 -213
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+63 -63
View File
@@ -16,7 +16,7 @@ sub_8170478: @ 8170478
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [sp, 0x10] str r0, [sp, 0x10]
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, =gBattle_WIN0H ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
@@ -43,19 +43,19 @@ sub_8170478: @ 8170478
movs r0, 0x1 movs r0, 0x1
movs r1, 0x4 movs r1, 0x4
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0x1 movs r2, 0x1
bl lcd_bg_operations bl SetAnimBgAttribute
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
movs r2, 0x1 movs r2, 0x1
bl lcd_bg_operations bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds ldr r0, =gHealthBoxesIds
adds r4, r0 adds r4, r0
ldrb r0, [r4] ldrb r0, [r4]
@@ -212,7 +212,7 @@ sub_8170660: @ 8170660
push {r7} push {r7}
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
mov r8, r0 mov r8, r0
ldr r1, =gTasks ldr r1, =gTasks
@@ -335,7 +335,7 @@ _08170708:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
_0817076C: _0817076C:
movs r0, 0 movs r0, 0
bl GetGpuReg bl GetGpuReg
@@ -372,7 +372,7 @@ _0817076C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds ldr r0, =gHealthBoxesIds
add r0, r8 add r0, r8
ldrb r0, [r0] ldrb r0, [r0]
@@ -412,7 +412,7 @@ _0817076C:
orrs r2, r5 orrs r2, r5
strb r2, [r0, 0x5] strb r2, [r0, 0x5]
adds r0, r7, 0 adds r0, r7, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08170814: _08170814:
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -540,12 +540,12 @@ sub_8170920: @ 8170920
lsrs r4, 24 lsrs r4, 24
mov r1, sp mov r1, sp
adds r1, 0x1 adds r1, 0x1
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r2, [r0] ldrb r2, [r0]
mov r0, sp mov r0, sp
bl sub_8170834 bl sub_8170834
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -628,11 +628,11 @@ sub_81709EC: @ 81709EC
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_817094C bl sub_817094C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -752,7 +752,7 @@ _08170AD6:
cmp r0, 0 cmp r0, 0
bne _08170AF8 bne _08170AF8
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08170AF8: _08170AF8:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -766,7 +766,7 @@ sub_8170B04: @ 8170B04
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r5, [r0] ldrb r5, [r0]
@@ -834,7 +834,7 @@ _08170B84:
orrs r1, r2 orrs r1, r2
strb r1, [r0] strb r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08170BA4: _08170BA4:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -852,7 +852,7 @@ sub_8170BB0: @ 8170BB0
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r1, r0, r1 adds r1, r0, r1
ldrb r1, [r1] ldrb r1, [r1]
@@ -904,7 +904,7 @@ _08170C08:
b _08170CEE b _08170CEE
.pool .pool
_08170C44: _08170C44:
ldr r5, =gAnimationBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl sub_80A5C6C
@@ -979,7 +979,7 @@ _08170CC4:
cmp r0, 0 cmp r0, 0
bne _08170CEE bne _08170CEE
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08170CEE: _08170CEE:
add sp, 0xC add sp, 0xC
pop {r3,r4} pop {r3,r4}
@@ -1003,7 +1003,7 @@ sub_8170CFC: @ 8170CFC
lsrs r0, 24 lsrs r0, 24
bl sub_8076A78 bl sub_8076A78
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1023,7 +1023,7 @@ sub_8170D24: @ 8170D24
lsrs r0, 24 lsrs r0, 24
bl sub_8076AE8 bl sub_8076AE8
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1051,7 +1051,7 @@ _08170D70:
_08170D74: _08170D74:
strh r0, [r1, 0xE] strh r0, [r1, 0xE]
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -1162,7 +1162,7 @@ sub_8170E04: @ 8170E04
adds r6, r4, r1 adds r6, r4, r1
movs r0, 0x22 movs r0, 0x22
strh r0, [r6, 0x2E] strh r0, [r6, 0x2E]
ldr r2, =gAnimationBankTarget ldr r2, =gAnimBankTarget
mov r8, r2 mov r8, r2
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0 movs r1, 0
@@ -1246,7 +1246,7 @@ sub_8170EF0: @ 8170EF0
cmp r1, r0 cmp r1, r0
bne _08170F1A bne _08170F1A
adds r0, r3, 0 adds r0, r3, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08170F1A: _08170F1A:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1313,7 +1313,7 @@ _08170F54:
adds r6, r4, r0 adds r6, r4, r0
movs r0, 0x22 movs r0, 0x22
strh r0, [r6, 0x2E] strh r0, [r6, 0x2E]
ldr r1, =gAnimationBankTarget ldr r1, =gAnimBankTarget
mov r8, r1 mov r8, r1
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0 movs r1, 0
@@ -1550,7 +1550,7 @@ _08171188:
movs r2, 0x1 movs r2, 0x1
movs r3, 0x1C movs r3, 0x1C
bl sub_8171D98 bl sub_8171D98
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0 movs r0, 0
movs r2, 0xE movs r2, 0xE
@@ -1585,7 +1585,7 @@ sub_81711E8: @ 81711E8
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r2, =gSprites ldr r2, =gSprites
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -1607,7 +1607,7 @@ sub_8171240: @ 8171240
push {r4-r7,lr} push {r4-r7,lr}
adds r7, r0, 0 adds r7, r0, 0
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r4, [r0] ldrb r4, [r0]
@@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8
push {r7} push {r7}
sub sp, 0x4 sub sp, 0x4
adds r6, r0, 0 adds r6, r0, 0
ldr r7, =gAnimationBankTarget ldr r7, =gAnimBankTarget
ldrh r0, [r6, 0x36] ldrh r0, [r6, 0x36]
adds r0, 0x1 adds r0, 0x1
movs r1, 0 movs r1, 0
@@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4
movs r2, 0x1 movs r2, 0x1
movs r3, 0x1C movs r3, 0x1C
bl sub_8171D98 bl sub_8171D98
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0xE movs r2, 0xE
@@ -2724,7 +2724,7 @@ sub_8171AE4: @ 8171AE4
_08171B36: _08171B36:
ldr r6, =gSprites ldr r6, =gSprites
ldr r5, =gBankSpriteIds ldr r5, =gBankSpriteIds
ldr r4, =gAnimationBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -2792,7 +2792,7 @@ sub_8171BAC: @ 8171BAC
_08171BCA: _08171BCA:
ldr r4, =gSprites ldr r4, =gSprites
ldr r3, =gBankSpriteIds ldr r3, =gBankSpriteIds
ldr r2, =gAnimationBankTarget ldr r2, =gAnimBankTarget
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -2841,7 +2841,7 @@ _08171C24:
beq _08171C8A beq _08171C8A
ldr r4, =gSprites ldr r4, =gSprites
ldr r3, =gBankSpriteIds ldr r3, =gBankSpriteIds
ldr r2, =gAnimationBankTarget ldr r2, =gAnimBankTarget
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -4730,7 +4730,7 @@ sub_8172BF0: @ 8172BF0
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
ldr r0, =gBankSpriteIds ldr r0, =gBankSpriteIds
ldr r3, =gAnimationBankAttacker ldr r3, =gAnimBankAttacker
ldrb r2, [r3] ldrb r2, [r3]
adds r0, r2, r0 adds r0, r2, r0
ldrb r6, [r0] ldrb r6, [r0]
@@ -4877,7 +4877,7 @@ _08172D28:
adds r0, r1 adds r0, r1
ldrb r1, [r0, 0x8] ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8] strh r1, [r0, 0x8]
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -4914,7 +4914,7 @@ _08172D7E:
beq _08172D8A beq _08172D8A
_08172D84: _08172D84:
adds r0, r7, 0 adds r0, r7, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08172D8A: _08172D8A:
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -4949,9 +4949,9 @@ _08172DC0:
beq _08172E4E beq _08172E4E
b _08172E84 b _08172E84
_08172DC6: _08172DC6:
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankIdentity_permutated bl sub_80A8364
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -5010,7 +5010,7 @@ _08172E14:
b _08172E84 b _08172E84
_08172E4E: _08172E4E:
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -5032,7 +5032,7 @@ _08172E4E:
ldrb r0, [r4] ldrb r0, [r4]
bl sub_805E974 bl sub_805E974
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08172E84: _08172E84:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -5048,7 +5048,7 @@ sub_8172E9C: @ 8172E9C
ldr r3, =gBattleAnimArgs ldr r3, =gBattleAnimArgs
ldr r1, =gBattleSpritesDataPtr ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1] ldr r2, [r1]
ldr r1, =gAnimationBankAttacker ldr r1, =gAnimBankAttacker
ldrb r1, [r1] ldrb r1, [r1]
ldr r2, [r2] ldr r2, [r2]
lsls r1, 2 lsls r1, 2
@@ -5057,7 +5057,7 @@ sub_8172E9C: @ 8172E9C
lsls r1, 29 lsls r1, 29
lsrs r1, 31 lsrs r1, 31
strh r1, [r3, 0xE] strh r1, [r3, 0xE]
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -5068,11 +5068,11 @@ sub_8172ED0: @ 8172ED0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gAnimationBankTarget ldr r2, =gAnimBankTarget
ldr r1, =gEffectBank ldr r1, =gEffectBank
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r2] strb r1, [r2]
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0
bl GetMonData bl GetMonData
adds r4, r0, 0 adds r4, r0, 0
adds r0, r6, 0 adds r0, r6, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08172FC8 beq _08172FC8
@@ -5134,9 +5134,9 @@ _08172F4E:
lsrs r0, 16 lsrs r0, 16
cmp r0, r7 cmp r0, r7
bne _08172F6E bne _08172F6E
ldr r0, =gUnknown_0852528C ldr r0, =gBattleAnimPicTable + 0x748
bl LoadCompressedObjectPicUsingHeap bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_08525B94 ldr r0, =gBattleAnimPaletteTable + 0x748
bl LoadCompressedObjectPaletteUsingHeap bl LoadCompressedObjectPaletteUsingHeap
_08172F6E: _08172F6E:
ldr r5, =sub_8172FEC ldr r5, =sub_8172FEC
@@ -5533,14 +5533,14 @@ sub_81732B0: @ 81732B0
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_085253AC ldr r0, =gBattleAnimPicTable + 0x868
bl LoadCompressedObjectPicUsingHeap bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_08525CB4 ldr r0, =gBattleAnimPaletteTable + 0x868
bl LoadCompressedObjectPaletteUsingHeap bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =0x0000281d ldr r0, =0x0000281d
bl IndexOfSpritePaletteTag bl IndexOfSpritePaletteTag
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -5559,7 +5559,7 @@ sub_81732E4: @ 81732E4
adds r0, r5, 0 adds r0, r5, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -5603,7 +5603,7 @@ sub_817330C: @ 817330C
bl sub_80A68D4 bl sub_80A68D4
ldr r2, =gSprites ldr r2, =gSprites
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -5628,7 +5628,7 @@ sub_817339C: @ 817339C
adds r3, r0, 0 adds r3, r0, 0
ldr r2, =gSprites ldr r2, =gSprites
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -5679,7 +5679,7 @@ sub_8173400: @ 8173400
adds r4, r0, 0 adds r4, r0, 0
ldr r5, =gSprites ldr r5, =gSprites
ldr r3, =gBankSpriteIds ldr r3, =gBankSpriteIds
ldr r2, =gAnimationBankAttacker ldr r2, =gAnimBankAttacker
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -5708,7 +5708,7 @@ sub_8173400: @ 8173400
movs r1, 0 movs r1, 0
bl StartSpriteAnim bl StartSpriteAnim
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl DestroyAnimSprite
_08173448: _08173448:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -5733,7 +5733,7 @@ sub_817345C: @ 817345C
_08173478: _08173478:
movs r0, 0 movs r0, 0
bl GetBankByIdentity bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker ldr r1, =gAnimBankAttacker
strb r0, [r1] strb r0, [r1]
movs r0, 0x1 movs r0, 0x1
b _08173498 b _08173498
@@ -5741,16 +5741,16 @@ _08173478:
_0817348C: _0817348C:
movs r0, 0x1 movs r0, 0x1
bl GetBankByIdentity bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker ldr r1, =gAnimBankAttacker
strb r0, [r1] strb r0, [r1]
movs r0, 0 movs r0, 0
_08173498: _08173498:
bl GetBankByIdentity bl GetBankByIdentity
ldr r1, =gAnimationBankTarget ldr r1, =gAnimBankTarget
strb r0, [r1] strb r0, [r1]
_081734A0: _081734A0:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -5801,7 +5801,7 @@ _08173508:
_0817350C: _0817350C:
strh r0, [r1] strh r0, [r1]
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -5812,18 +5812,18 @@ sub_817351C: @ 817351C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =gAnimationBankAttacker ldr r3, =gAnimBankAttacker
ldr r1, =gBattleSpritesDataPtr ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1] ldr r2, [r1]
ldr r1, [r2, 0x8] ldr r1, [r2, 0x8]
ldrh r1, [r1] ldrh r1, [r1]
strb r1, [r3] strb r1, [r3]
ldr r3, =gAnimationBankTarget ldr r3, =gAnimBankTarget
ldr r1, [r2, 0x8] ldr r1, [r2, 0x8]
ldrh r1, [r1] ldrh r1, [r1]
lsrs r1, 8 lsrs r1, 8
strb r1, [r3] strb r1, [r3]
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
asm/battle_anim_sound_tasks.s
+46 -46
View File
@@ -22,12 +22,12 @@ sub_8158B30: @ 8158B30
strh r0, [r6, 0xA] strh r0, [r6, 0xA]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x3F movs r0, 0x3F
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
@@ -36,7 +36,7 @@ sub_8158B30: @ 8158B30
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x2 movs r2, 0x2
bl sub_80A5314 bl CalculatePanIncrement
strh r4, [r6, 0xC] strh r4, [r6, 0xC]
strh r5, [r6, 0xE] strh r5, [r6, 0xE]
lsls r0, 24 lsls r0, 24
@@ -128,7 +128,7 @@ sub_8158C04: @ 8158C04
movs r0, 0 movs r0, 0
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
movs r0, 0x3F movs r0, 0x3F
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r1, r0, 0 adds r1, r0, 0
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
lsls r1, 24 lsls r1, 24
@@ -142,7 +142,7 @@ sub_8158C04: @ 8158C04
cmp r0, 0x2 cmp r0, 0x2
bne _08158C4C bne _08158C4C
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_related_task_del bl DestroyAnimSoundTask
_08158C4C: _08158C4C:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -175,14 +175,14 @@ mas_80DCF38: @ 8158C58
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r5, 24 lsls r5, 24
asrs r5, 24 asrs r5, 24
adds r0, r5, 0 adds r0, r5, 0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
@@ -193,7 +193,7 @@ mas_80DCF38: @ 8158C58
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
bl sub_80A5314 bl CalculatePanIncrement
ldr r2, =gTasks ldr r2, =gTasks
mov r3, r8 mov r3, r8
lsls r1, r3, 2 lsls r1, r3, 2
@@ -264,7 +264,7 @@ sub_8158D08: @ 8158D08
cmp r0, 0 cmp r0, 0
bne _08158D50 bne _08158D50
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_related_task_del bl DestroyAnimSoundTask
b _08158D82 b _08158D82
.pool .pool
_08158D50: _08158D50:
@@ -307,7 +307,7 @@ sub_8158D8C: @ 8158D8C
movs r4, 0 movs r4, 0
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
bl IsContest bl IsContest
@@ -319,7 +319,7 @@ sub_8158D8C: @ 8158D8C
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _08158DC8 bne _08158DC8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
ldrh r4, [r0] ldrh r4, [r0]
@@ -327,7 +327,7 @@ sub_8158D8C: @ 8158D8C
.pool .pool
_08158DC8: _08158DC8:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _08158E76 b _08158E76
_08158DD0: _08158DD0:
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
@@ -336,25 +336,25 @@ _08158DD0:
adds r2, r0, 0 adds r2, r0, 0
cmp r1, 0 cmp r1, 0
bne _08158DEC bne _08158DEC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r4, [r0] ldrb r4, [r0]
b _08158E12 b _08158E12
.pool .pool
_08158DEC: _08158DEC:
cmp r1, 0x1 cmp r1, 0x1
bne _08158DFC bne _08158DFC
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r4, [r0] ldrb r4, [r0]
b _08158E12 b _08158E12
.pool .pool
_08158DFC: _08158DFC:
cmp r1, 0x2 cmp r1, 0x2
bne _08158E08 bne _08158E08
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _08158E0A b _08158E0A
.pool .pool
_08158E08: _08158E08:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_08158E0A: _08158E0A:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x2 movs r0, 0x2
@@ -369,12 +369,12 @@ _08158E12:
bne _08158E38 bne _08158E38
_08158E1E: _08158E1E:
adds r0, r4, 0 adds r0, r4, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08158E38 bne _08158E38
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _08158E8C b _08158E8C
.pool .pool
_08158E38: _08158E38:
@@ -416,7 +416,7 @@ _08158E76:
bl PlayCry3 bl PlayCry3
_08158E86: _08158E86:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08158E8C: _08158E8C:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -432,7 +432,7 @@ sub_8158E9C: @ 8158E9C
movs r4, 0 movs r4, 0
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl IsContest bl IsContest
@@ -444,7 +444,7 @@ sub_8158E9C: @ 8158E9C
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _08158ED8 bne _08158ED8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
ldrh r4, [r0] ldrh r4, [r0]
@@ -452,7 +452,7 @@ sub_8158E9C: @ 8158E9C
.pool .pool
_08158ED8: _08158ED8:
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _08158F86 b _08158F86
_08158EE0: _08158EE0:
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
@@ -461,25 +461,25 @@ _08158EE0:
adds r2, r0, 0 adds r2, r0, 0
cmp r1, 0 cmp r1, 0
bne _08158EFC bne _08158EFC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r4, [r0] ldrb r4, [r0]
b _08158F22 b _08158F22
.pool .pool
_08158EFC: _08158EFC:
cmp r1, 0x1 cmp r1, 0x1
bne _08158F0C bne _08158F0C
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r4, [r0] ldrb r4, [r0]
b _08158F22 b _08158F22
.pool .pool
_08158F0C: _08158F0C:
cmp r1, 0x2 cmp r1, 0x2
bne _08158F18 bne _08158F18
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _08158F1A b _08158F1A
.pool .pool
_08158F18: _08158F18:
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_08158F1A: _08158F1A:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x2 movs r0, 0x2
@@ -494,12 +494,12 @@ _08158F22:
bne _08158F48 bne _08158F48
_08158F2E: _08158F2E:
adds r0, r4, 0 adds r0, r4, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08158F48 bne _08158F48
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _08158FEE b _08158FEE
.pool .pool
_08158F48: _08158F48:
@@ -571,7 +571,7 @@ _08158FD0:
.pool .pool
_08158FE8: _08158FE8:
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08158FEE: _08158FEE:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -620,7 +620,7 @@ _08159028:
movs r2, 0xA movs r2, 0xA
bl PlayCry3 bl PlayCry3
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _0815906A b _0815906A
_0815904E: _0815904E:
bl IsCryPlaying bl IsCryPlaying
@@ -633,7 +633,7 @@ _0815904E:
movs r2, 0x8 movs r2, 0x8
bl PlayCry3 bl PlayCry3
mov r0, r9 mov r0, r9
bl move_anim_task_del bl DestroyAnimVisualTask
_0815906A: _0815906A:
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -669,7 +669,7 @@ _081590A0:
cmp r0, 0 cmp r0, 0
bne _081590B0 bne _081590B0
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_081590B0: _081590B0:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -691,21 +691,21 @@ sub_81590B8: @ 81590B8
strh r1, [r0, 0x1C] strh r1, [r0, 0x1C]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081590F8 beq _081590F8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
b _08159102 b _08159102
.pool .pool
_081590F8: _081590F8:
ldr r1, =gUnknown_02038438 ldr r1, =gAnimSpeciesByBanks
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
@@ -728,7 +728,7 @@ _08159102:
.pool .pool
_08159130: _08159130:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08159136: _08159136:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -829,7 +829,7 @@ _081591F2:
bl PlayCry3 bl PlayCry3
_081591FE: _081591FE:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_08159204: _08159204:
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -849,14 +849,14 @@ sub_8159210: @ 8159210
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
adds r0, r5, 0 adds r0, r5, 0
bl PlaySE1WithPanning bl PlaySE1WithPanning
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -874,14 +874,14 @@ sub_8159244: @ 8159244
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
adds r0, r5, 0 adds r0, r5, 0
bl PlaySE2WithPanning bl PlaySE2WithPanning
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -906,14 +906,14 @@ sub_8159278: @ 8159278
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r5, 24 lsls r5, 24
asrs r5, 24 asrs r5, 24
adds r0, r5, 0 adds r0, r5, 0
bl BattleAnimGetPanControl bl BattleAnimAdjustPanning
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
@@ -924,7 +924,7 @@ sub_8159278: @ 8159278
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
bl sub_80A5314 bl CalculatePanIncrement
ldr r2, =gTasks ldr r2, =gTasks
mov r3, r8 mov r3, r8
lsls r1, r3, 2 lsls r1, r3, 2
@@ -995,7 +995,7 @@ _08159342:
cmp r1, r0 cmp r1, r0
bne _0815935A bne _0815935A
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_0815935A: _0815935A:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/battle_controller_linkopponent.s
+9 -9
View File
@@ -276,7 +276,7 @@ _080645CA:
ldrb r1, [r7] ldrb r1, [r7]
movs r0, 0x2 movs r0, 0x2
eors r0, r1 eors r0, r1
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0806469C bne _0806469C
@@ -1572,7 +1572,7 @@ _0806513A:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl LinkOpponentBufferExecCompleted bl LinkOpponentBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -4721,7 +4721,7 @@ _08066D32:
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 8 lsls r0, 8
orrs r6, r0 orrs r6, r0
ldr r0, =gUnknown_02038432 ldr r0, =gAnimMoveTurn
mov r8, r0 mov r8, r0
mov r0, r12 mov r0, r12
adds r0, 0x3 adds r0, 0x3
@@ -4729,7 +4729,7 @@ _08066D32:
ldrb r0, [r1] ldrb r0, [r1]
mov r1, r8 mov r1, r8
strb r0, [r1] strb r0, [r1]
ldr r3, =gMovePowerMoveAnim ldr r3, =gAnimMovePower
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4743,7 +4743,7 @@ _08066D32:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r3] strh r2, [r3]
ldr r3, =gMoveDmgMoveAnim ldr r3, =gAnimMoveDmg
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4769,7 +4769,7 @@ _08066D32:
lsls r0, 24 lsls r0, 24
orrs r2, r0 orrs r2, r0
str r2, [r3] str r2, [r3]
ldr r2, =gHappinessMoveAnim ldr r2, =gAnimFriendship
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
mov r1, r12 mov r1, r12
@@ -4791,7 +4791,7 @@ _08066D32:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r4] strh r2, [r4]
ldr r7, =gDisableStructMoveAnim ldr r7, =gAnimDisableStructPtr
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4928,7 +4928,7 @@ _08066F08:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -6080,7 +6080,7 @@ sub_80678D0: @ 80678D0
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08067916 beq _08067916
asm/battle_controller_linkpartner.s
+8 -8
View File
@@ -1113,7 +1113,7 @@ _0814B872:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl LinkPartnerBufferExecCompleted bl LinkPartnerBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -4030,7 +4030,7 @@ _0814D2CE:
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 8 lsls r0, 8
orrs r6, r0 orrs r6, r0
ldr r0, =gUnknown_02038432 ldr r0, =gAnimMoveTurn
mov r8, r0 mov r8, r0
mov r0, r12 mov r0, r12
adds r0, 0x3 adds r0, 0x3
@@ -4038,7 +4038,7 @@ _0814D2CE:
ldrb r0, [r1] ldrb r0, [r1]
mov r1, r8 mov r1, r8
strb r0, [r1] strb r0, [r1]
ldr r3, =gMovePowerMoveAnim ldr r3, =gAnimMovePower
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4052,7 +4052,7 @@ _0814D2CE:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r3] strh r2, [r3]
ldr r3, =gMoveDmgMoveAnim ldr r3, =gAnimMoveDmg
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4078,7 +4078,7 @@ _0814D2CE:
lsls r0, 24 lsls r0, 24
orrs r2, r0 orrs r2, r0
str r2, [r3] str r2, [r3]
ldr r2, =gHappinessMoveAnim ldr r2, =gAnimFriendship
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
mov r1, r12 mov r1, r12
@@ -4100,7 +4100,7 @@ _0814D2CE:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r4] strh r2, [r4]
ldr r7, =gDisableStructMoveAnim ldr r7, =gAnimDisableStructPtr
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -4237,7 +4237,7 @@ _0814D4A4:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5474,7 +5474,7 @@ sub_814DF40: @ 814DF40
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0814DF86 beq _0814DF86
asm/battle_controller_opponent.s
+16 -16
View File
@@ -1666,7 +1666,7 @@ _0805FFEA:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -2607,7 +2607,7 @@ _08060806:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
adds r2, r4, 0 adds r2, r4, 0
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
add sp, 0x58 add sp, 0x58
pop {r4-r7} pop {r4-r7}
@@ -4871,13 +4871,13 @@ _08061C8A:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, =gUnknown_02038432 ldr r5, =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
ldrb r1, [r2] ldrb r1, [r2]
strb r1, [r5] strb r1, [r5]
ldr r4, =gMovePowerMoveAnim ldr r4, =gAnimMovePower
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4891,7 +4891,7 @@ _08061C8A:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r4, =gMoveDmgMoveAnim ldr r4, =gAnimMoveDmg
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4917,7 +4917,7 @@ _08061C8A:
lsls r1, 24 lsls r1, 24
orrs r3, r1 orrs r3, r1
str r3, [r4] str r3, [r4]
ldr r3, =gHappinessMoveAnim ldr r3, =gAnimFriendship
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 9 lsls r1, 9
mov r2, r12 mov r2, r12
@@ -4939,7 +4939,7 @@ _08061C8A:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, =gDisableStructMoveAnim ldr r3, =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -5068,7 +5068,7 @@ _08061E48:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5243,7 +5243,7 @@ sub_8061FB8: @ 8061FB8
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
_08061FD6: _08061FD6:
bl EmitCmd_x21 bl EmitCmd33
_08061FDA: _08061FDA:
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
b _08062156 b _08062156
@@ -5347,7 +5347,7 @@ _0806209C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
adds r2, r4, 0 adds r2, r4, 0
bl EmitCmd_x21 bl EmitCmd33
b _08061FDA b _08061FDA
.pool .pool
_080620C4: _080620C4:
@@ -5378,7 +5378,7 @@ _080620C6:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
adds r2, r4, 0 adds r2, r4, 0
bl EmitCmd_x21 bl EmitCmd33
b _08062152 b _08062152
.pool .pool
_08062108: _08062108:
@@ -5401,7 +5401,7 @@ _08062108:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
b _08062152 b _08062152
.pool .pool
_0806213C: _0806213C:
@@ -5413,7 +5413,7 @@ _0806213C:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
_08062152: _08062152:
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
_08062156: _08062156:
@@ -5435,7 +5435,7 @@ sub_806215C: @ 806215C
adds r0, 0xC0 adds r0, 0xC0
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl dp01_build_cmdbuf_x23_aa_0 bl EmitCmd35
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -5550,7 +5550,7 @@ _0806225A:
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -6535,7 +6535,7 @@ sub_8062AD0: @ 8062AD0
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08062B16 beq _08062B16
asm/battle_controller_player.s
+26 -26
View File
@@ -226,7 +226,7 @@ _0805764C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
b _080577C2 b _080577C2
_08057658: _08057658:
movs r0, 0x20 movs r0, 0x20
@@ -393,7 +393,7 @@ _080577B2:
movs r1, 0xC movs r1, 0xC
_080577BC: _080577BC:
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
_080577C2: _080577C2:
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
b _080577E8 b _080577E8
@@ -518,7 +518,7 @@ _080578A0:
orrs r2, r0 orrs r2, r0
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl dp11b_obj_free bl dp11b_obj_free
@@ -1086,7 +1086,7 @@ _08057E14:
_08057E1C: _08057E1C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
b _08057F9E b _08057F9E
.pool .pool
@@ -3413,7 +3413,7 @@ _080591FE:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd_x21 bl EmitCmd33
strb r5, [r4] strb r5, [r4]
bl IsDoubleBattle bl IsDoubleBattle
lsls r0, 24 lsls r0, 24
@@ -3686,7 +3686,7 @@ _08059430:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd_x21 bl EmitCmd33
strb r5, [r4] strb r5, [r4]
ldr r0, =sub_8059544 ldr r0, =sub_8059544
str r0, [r6] str r0, [r6]
@@ -4059,14 +4059,14 @@ sub_8059828: @ 8059828
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, =gUnknown_0203CF00 ldr r2, =gUnknown_0203CF00
movs r0, 0x1 movs r0, 0x1
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
b _0805987A b _0805987A
.pool .pool
_08059870: _08059870:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x6 movs r1, 0x6
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
_0805987A: _0805987A:
ldr r1, =gBattleBufferA ldr r1, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -4130,7 +4130,7 @@ sub_80598E0: @ 80598E0
ldr r0, =gScriptItemId ldr r0, =gScriptItemId
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl dp01_build_cmdbuf_x23_aa_0 bl EmitCmd35
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
_08059906: _08059906:
pop {r0} pop {r0}
@@ -4291,14 +4291,14 @@ _08059A2C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xE movs r1, 0xE
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
b _08059A76 b _08059A76
.pool .pool
_08059A6C: _08059A6C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xD movs r1, 0xD
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
_08059A76: _08059A76:
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
_08059A7A: _08059A7A:
@@ -4772,7 +4772,7 @@ _08059E4E:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -5713,7 +5713,7 @@ _0805A66A:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
adds r2, r4, 0 adds r2, r4, 0
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
add sp, 0x58 add sp, 0x58
pop {r4-r7} pop {r4-r7}
@@ -8134,7 +8134,7 @@ _0805BCBE:
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 8 lsls r0, 8
orrs r6, r0 orrs r6, r0
ldr r0, =gUnknown_02038432 ldr r0, =gAnimMoveTurn
mov r8, r0 mov r8, r0
mov r0, r12 mov r0, r12
adds r0, 0x3 adds r0, 0x3
@@ -8142,7 +8142,7 @@ _0805BCBE:
ldrb r0, [r1] ldrb r0, [r1]
mov r1, r8 mov r1, r8
strb r0, [r1] strb r0, [r1]
ldr r3, =gMovePowerMoveAnim ldr r3, =gAnimMovePower
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -8156,7 +8156,7 @@ _0805BCBE:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r3] strh r2, [r3]
ldr r3, =gMoveDmgMoveAnim ldr r3, =gAnimMoveDmg
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -8182,7 +8182,7 @@ _0805BCBE:
lsls r0, 24 lsls r0, 24
orrs r2, r0 orrs r2, r0
str r2, [r3] str r2, [r3]
ldr r2, =gHappinessMoveAnim ldr r2, =gAnimFriendship
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
mov r1, r12 mov r1, r12
@@ -8204,7 +8204,7 @@ _0805BCBE:
lsls r0, 8 lsls r0, 8
orrs r2, r0 orrs r2, r0
strh r2, [r4] strh r2, [r4]
ldr r7, =gDisableStructMoveAnim ldr r7, =gAnimDisableStructPtr
ldrb r1, [r5] ldrb r1, [r5]
lsls r1, 9 lsls r1, 9
mov r0, r12 mov r0, r12
@@ -8341,7 +8341,7 @@ _0805BE94:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -8658,7 +8658,7 @@ sub_805C158: @ 805C158
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
_0805C194: _0805C194:
pop {r0} pop {r0}
@@ -8826,7 +8826,7 @@ _0805C2C8:
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
mov r2, r12 mov r2, r12
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
b _0805C3BC b _0805C3BC
.pool .pool
@@ -9378,7 +9378,7 @@ sub_805C80C: @ 805C80C
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -9390,7 +9390,7 @@ sub_805C820: @ 805C820
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -9401,7 +9401,7 @@ sub_805C834: @ 805C834
push {lr} push {lr}
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl dp01_build_cmdbuf_x23_aa_0 bl EmitCmd35
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -9412,7 +9412,7 @@ sub_805C848: @ 805C848
push {lr} push {lr}
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl dp01_build_cmdbuf_x24_aa_0 bl EmitCmd36
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -10172,7 +10172,7 @@ dp01t_33_1_enemy_move: @ 805CEF4
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0805CF3A beq _0805CF3A
asm/battle_controller_player_partner.s
+12 -12
View File
@@ -645,7 +645,7 @@ _081BB2E2:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd_x21 bl EmitCmd33
strb r5, [r4] strb r5, [r4]
bl IsDoubleBattle bl IsDoubleBattle
lsls r0, 24 lsls r0, 24
@@ -918,7 +918,7 @@ _081BB514:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd_x21 bl EmitCmd33
strb r5, [r4] strb r5, [r4]
ldr r0, =sub_81BB628 ldr r0, =sub_81BB628
str r0, [r6] str r0, [r6]
@@ -1688,7 +1688,7 @@ _081BBCBE:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl PlayerPartnerBufferExecCompleted bl PlayerPartnerBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -4652,13 +4652,13 @@ _081BD7A2:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, =gUnknown_02038432 ldr r5, =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
ldrb r1, [r2] ldrb r1, [r2]
strb r1, [r5] strb r1, [r5]
ldr r4, =gMovePowerMoveAnim ldr r4, =gAnimMovePower
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4672,7 +4672,7 @@ _081BD7A2:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r4, =gMoveDmgMoveAnim ldr r4, =gAnimMoveDmg
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4698,7 +4698,7 @@ _081BD7A2:
lsls r1, 24 lsls r1, 24
orrs r3, r1 orrs r3, r1
str r3, [r4] str r3, [r4]
ldr r3, =gHappinessMoveAnim ldr r3, =gAnimFriendship
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 9 lsls r1, 9
mov r2, r12 mov r2, r12
@@ -4720,7 +4720,7 @@ _081BD7A2:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, =gDisableStructMoveAnim ldr r3, =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4849,7 +4849,7 @@ _081BD960:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5068,7 +5068,7 @@ _081BDB3C:
orrs r2, r5 orrs r2, r5
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
bl PlayerPartnerBufferExecCompleted bl PlayerPartnerBufferExecCompleted
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -5138,7 +5138,7 @@ _081BDBD0:
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl PlayerPartnerBufferExecCompleted bl PlayerPartnerBufferExecCompleted
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -6207,7 +6207,7 @@ sub_81BE53C: @ 81BE53C
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081BE582 beq _081BE582
asm/battle_controller_recorded_opponent.s
+12 -12
View File
@@ -1553,7 +1553,7 @@ _0818727E:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -4408,13 +4408,13 @@ _08188BE6:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, =gUnknown_02038432 ldr r5, =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
ldrb r1, [r2] ldrb r1, [r2]
strb r1, [r5] strb r1, [r5]
ldr r4, =gMovePowerMoveAnim ldr r4, =gAnimMovePower
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4428,7 +4428,7 @@ _08188BE6:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r4, =gMoveDmgMoveAnim ldr r4, =gAnimMoveDmg
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4454,7 +4454,7 @@ _08188BE6:
lsls r1, 24 lsls r1, 24
orrs r3, r1 orrs r3, r1
str r3, [r4] str r3, [r4]
ldr r3, =gHappinessMoveAnim ldr r3, =gAnimFriendship
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 9 lsls r1, 9
mov r2, r12 mov r2, r12
@@ -4476,7 +4476,7 @@ _08188BE6:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, =gDisableStructMoveAnim ldr r3, =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4605,7 +4605,7 @@ _08188DA4:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
b _08188F6C b _08188F6C
.pool .pool
_08188F48: _08188F48:
@@ -4803,7 +4803,7 @@ _08188F48:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
_08188F6C: _08188F6C:
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
pop {r4,r5} pop {r4,r5}
@@ -4839,7 +4839,7 @@ sub_8188F88: @ 8188F88
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5819,7 +5819,7 @@ sub_8189800: @ 8189800
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08189846 beq _08189846
asm/battle_controller_recorded_player.s
+13 -13
View File
@@ -1489,7 +1489,7 @@ _0818A646:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -4508,13 +4508,13 @@ _0818C192:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, =gUnknown_02038432 ldr r5, =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
ldrb r1, [r2] ldrb r1, [r2]
strb r1, [r5] strb r1, [r5]
ldr r4, =gMovePowerMoveAnim ldr r4, =gAnimMovePower
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4528,7 +4528,7 @@ _0818C192:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r4, =gMoveDmgMoveAnim ldr r4, =gAnimMoveDmg
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4554,7 +4554,7 @@ _0818C192:
lsls r1, 24 lsls r1, 24
orrs r3, r1 orrs r3, r1
str r3, [r4] str r3, [r4]
ldr r3, =gHappinessMoveAnim ldr r3, =gAnimFriendship
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 9 lsls r1, 9
mov r2, r12 mov r2, r12
@@ -4576,7 +4576,7 @@ _0818C192:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, =gDisableStructMoveAnim ldr r3, =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4705,7 +4705,7 @@ _0818C350:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
_0818C4C6: _0818C4C6:
pop {r0} pop {r0}
@@ -4897,7 +4897,7 @@ _0818C508:
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
_0818C522: _0818C522:
pop {r0} pop {r0}
@@ -4929,7 +4929,7 @@ sub_818C538: @ 818C538
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
b _0818C584 b _0818C584
.pool .pool
_0818C560: _0818C560:
@@ -4947,7 +4947,7 @@ _0818C560:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
_0818C584: _0818C584:
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
pop {r4,r5} pop {r4,r5}
@@ -4983,7 +4983,7 @@ sub_818C5A0: @ 818C5A0
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes bl EmitCmd34
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -6003,7 +6003,7 @@ sub_818CE98: @ 818CE98
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0818CEDE beq _0818CEDE
asm/battle_controller_safari.s
+3 -3
View File
@@ -103,13 +103,13 @@ _0815942A:
movs r1, 0x7 movs r1, 0x7
_0815942E: _0815942E:
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
b _08159440 b _08159440
_08159436: _08159436:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x8 movs r1, 0x8
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
_08159440: _08159440:
bl SafariBufferExecCompleted bl SafariBufferExecCompleted
b _0815954E b _0815954E
@@ -399,7 +399,7 @@ sub_8159698: @ 8159698
ldr r0, =gScriptItemId ldr r0, =gScriptItemId
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl dp01_build_cmdbuf_x23_aa_0 bl EmitCmd35
bl SafariBufferExecCompleted bl SafariBufferExecCompleted
_081596BE: _081596BE:
pop {r0} pop {r0}
asm/battle_controller_wally.s
+11 -11
View File
@@ -153,7 +153,7 @@ _081684CE:
movs r1, 0x9 movs r1, 0x9
_081684E4: _081684E4:
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x94 adds r1, 0x94
@@ -208,7 +208,7 @@ _08168540:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd_x21 bl EmitCmd33
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
_08168564: _08168564:
pop {r4,r5} pop {r4,r5}
@@ -311,7 +311,7 @@ sub_8168610: @ 8168610
ldr r0, =gScriptItemId ldr r0, =gScriptItemId
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl dp01_build_cmdbuf_x23_aa_0 bl EmitCmd35
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
_08168636: _08168636:
pop {r0} pop {r0}
@@ -975,7 +975,7 @@ _08168BFA:
lsrs r1, 16 lsrs r1, 16
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs bl EmitDataTransfer
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
@@ -3316,13 +3316,13 @@ sub_816A144: @ 816A144
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, =gUnknown_02038432 ldr r5, =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
ldrb r1, [r2] ldrb r1, [r2]
strb r1, [r5] strb r1, [r5]
ldr r4, =gMovePowerMoveAnim ldr r4, =gAnimMovePower
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -3336,7 +3336,7 @@ sub_816A144: @ 816A144
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r4, =gMoveDmgMoveAnim ldr r4, =gAnimMoveDmg
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -3362,7 +3362,7 @@ sub_816A144: @ 816A144
lsls r1, 24 lsls r1, 24
orrs r3, r1 orrs r3, r1
str r3, [r4] str r3, [r4]
ldr r3, =gHappinessMoveAnim ldr r3, =gAnimFriendship
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 9 lsls r1, 9
mov r2, r12 mov r2, r12
@@ -3384,7 +3384,7 @@ sub_816A144: @ 816A144
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, =gDisableStructMoveAnim ldr r3, =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -3505,7 +3505,7 @@ _0816A2F6:
movs r0, 0 movs r0, 0
bl sub_805EB9C bl sub_805EB9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_start_t1 bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -3777,7 +3777,7 @@ _0816A550:
lsls r2, 1 lsls r2, 1
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd_x21 bl EmitCmd33
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
_0816A574: _0816A574:
pop {r4} pop {r4}
asm/cable_club.s
+1 -1
View File
@@ -1980,7 +1980,7 @@ _080B3474:
bl sub_800B524 bl sub_800B524
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_800A5EC bl ResetBlockReceivedFlag
adds r5, 0x1C adds r5, 0x1C
adds r4, 0x1 adds r4, 0x1
_080B349A: _080B349A:
asm/contest.s
+175 -175
View File
File diff suppressed because it is too large Load Diff
asm/contest_ai.s
+149 -149
View File
File diff suppressed because it is too large Load Diff
asm/contest_effect.s
+74 -74
View File
@@ -68,7 +68,7 @@ ContestEffectFunc_080E547C: @ 80E547C
thumb_func_start ContestEffectFunc_080E5480 thumb_func_start ContestEffectFunc_080E5480
ContestEffectFunc_080E5480: @ 80E5480 ContestEffectFunc_080E5480: @ 80E5480
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -94,7 +94,7 @@ ContestEffectFunc_080E5480: @ 80E5480
thumb_func_start ContestEffectFunc_080E54B0 thumb_func_start ContestEffectFunc_080E54B0
ContestEffectFunc_080E54B0: @ 80E54B0 ContestEffectFunc_080E54B0: @ 80E54B0
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -119,7 +119,7 @@ ContestEffectFunc_080E54B0: @ 80E54B0
thumb_func_start ContestEffectFunc_080E54E0 thumb_func_start ContestEffectFunc_080E54E0
ContestEffectFunc_080E54E0: @ 80E54E0 ContestEffectFunc_080E54E0: @ 80E54E0
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -165,7 +165,7 @@ ContestEffectFunc_080E54E0: @ 80E54E0
thumb_func_start ContestEffectFunc_080E5534 thumb_func_start ContestEffectFunc_080E5534
ContestEffectFunc_080E5534: @ 80E5534 ContestEffectFunc_080E5534: @ 80E5534
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -189,7 +189,7 @@ ContestEffectFunc_080E5534: @ 80E5534
thumb_func_start ContestEffectFunc_080E5560 thumb_func_start ContestEffectFunc_080E5560
ContestEffectFunc_080E5560: @ 80E5560 ContestEffectFunc_080E5560: @ 80E5560
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -215,7 +215,7 @@ ContestEffectFunc_080E5560: @ 80E5560
thumb_func_start ContestEffectFunc_080E5590 thumb_func_start ContestEffectFunc_080E5590
ContestEffectFunc_080E5590: @ 80E5590 ContestEffectFunc_080E5590: @ 80E5590
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -239,7 +239,7 @@ ContestEffectFunc_080E5590: @ 80E5590
thumb_func_start ContestEffectFunc_080E55BC thumb_func_start ContestEffectFunc_080E55BC
ContestEffectFunc_080E55BC: @ 80E55BC ContestEffectFunc_080E55BC: @ 80E55BC
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -266,7 +266,7 @@ ContestEffectFunc_080E55BC: @ 80E55BC
ContestEffectFunc_080E55EC: @ 80E55EC ContestEffectFunc_080E55EC: @ 80E55EC
push {r4,r5,lr} push {r4,r5,lr}
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_02039F34 ldr r5, =gContestResources
ldr r0, [r5] ldr r0, [r5]
ldr r1, [r0, 0x8] ldr r1, [r0, 0x8]
ldrb r4, [r1, 0x11] ldrb r4, [r1, 0x11]
@@ -293,7 +293,7 @@ _080E560A:
cmp r0, r1 cmp r0, r1
bne _080E560A bne _080E560A
_080E5622: _080E5622:
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
ldr r0, [r1] ldr r0, [r1]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
strb r2, [r0, 0x8] strb r2, [r0, 0x8]
@@ -307,14 +307,14 @@ _080E5622:
_080E563A: _080E563A:
cmp r2, 0 cmp r2, 0
bne _080E564C bne _080E564C
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
movs r1, 0x36 movs r1, 0x36
bl sub_80DD3F0 bl sub_80DD3F0
_080E564C: _080E564C:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -330,7 +330,7 @@ _080E564C:
ContestEffectFunc_080E5664: @ 80E5664 ContestEffectFunc_080E5664: @ 80E5664
push {r4-r6,lr} push {r4-r6,lr}
movs r1, 0 movs r1, 0
ldr r2, =gUnknown_02039F34 ldr r2, =gContestResources
ldr r0, [r2] ldr r0, [r2]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r5, [r0, 0x11] ldrb r5, [r0, 0x11]
@@ -359,7 +359,7 @@ _080E5698:
adds r3, 0x1 adds r3, 0x1
cmp r3, 0x3 cmp r3, 0x3
ble _080E567E ble _080E567E
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
adds r0, 0x8 adds r0, 0x8
@@ -372,14 +372,14 @@ _080E5698:
_080E56B4: _080E56B4:
cmp r1, 0 cmp r1, 0
bne _080E56C6 bne _080E56C6
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
movs r1, 0x36 movs r1, 0x36
bl sub_80DD3F0 bl sub_80DD3F0
_080E56C6: _080E56C6:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -409,7 +409,7 @@ ContestEffectFunc_080E56E0: @ 80E56E0
bhi _080E5702 bhi _080E5702
movs r1, 0x28 movs r1, 0x28
_080E5702: _080E5702:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
strh r1, [r0, 0x4] strh r1, [r0, 0x4]
@@ -425,7 +425,7 @@ ContestEffectFunc_080E5718: @ 80E5718
mov r7, r8 mov r7, r8
push {r7} push {r7}
movs r7, 0 movs r7, 0
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
ldr r0, [r1] ldr r0, [r1]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r5, [r0, 0x11] ldrb r5, [r0, 0x11]
@@ -521,7 +521,7 @@ ContestEffectFunc_080E57CC: @ 80E57CC
push {r5-r7} push {r5-r7}
movs r0, 0 movs r0, 0
mov r9, r0 mov r9, r0
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
ldr r0, [r1] ldr r0, [r1]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -619,7 +619,7 @@ ContestEffectFunc_080E588C: @ 80E588C
push {r6,r7} push {r6,r7}
movs r0, 0 movs r0, 0
mov r9, r0 mov r9, r0
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
ldr r0, [r1] ldr r0, [r1]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r7, [r0, 0x11] ldrb r7, [r0, 0x11]
@@ -674,7 +674,7 @@ _080E58DA:
_080E5900: _080E5900:
adds r6, 0x1C adds r6, 0x1C
adds r5, 0x1 adds r5, 0x1
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
cmp r5, 0x3 cmp r5, 0x3
ble _080E58B0 ble _080E58B0
_080E590A: _080E590A:
@@ -704,7 +704,7 @@ _080E5928:
thumb_func_start ContestEffectFunc_080E5938 thumb_func_start ContestEffectFunc_080E5938
ContestEffectFunc_080E5938: @ 80E5938 ContestEffectFunc_080E5938: @ 80E5938
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r1, [r4] ldr r1, [r4]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -732,7 +732,7 @@ ContestEffectFunc_080E5938: @ 80E5938
thumb_func_start ContestEffectFunc_080E5970 thumb_func_start ContestEffectFunc_080E5970
ContestEffectFunc_080E5970: @ 80E5970 ContestEffectFunc_080E5970: @ 80E5970
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r1, [r4] ldr r1, [r4]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -765,7 +765,7 @@ ContestEffectFunc_080E59B0: @ 80E59B0
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_80E6934 bl sub_80E6934
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -781,7 +781,7 @@ ContestEffectFunc_080E59D0: @ 80E59D0
push {lr} push {lr}
movs r0, 0x1 movs r0, 0x1
bl sub_80E6934 bl sub_80E6934
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -797,7 +797,7 @@ ContestEffectFunc_080E59F0: @ 80E59F0
push {lr} push {lr}
movs r0, 0x2 movs r0, 0x2
bl sub_80E6934 bl sub_80E6934
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -813,7 +813,7 @@ ContestEffectFunc_080E5A10: @ 80E5A10
push {lr} push {lr}
movs r0, 0x3 movs r0, 0x3
bl sub_80E6934 bl sub_80E6934
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -829,7 +829,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
push {lr} push {lr}
movs r0, 0x4 movs r0, 0x4
bl sub_80E6934 bl sub_80E6934
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -844,7 +844,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
ContestEffectFunc_080E5A50: @ 80E5A50 ContestEffectFunc_080E5A50: @ 80E5A50
push {r4-r6,lr} push {r4-r6,lr}
movs r4, 0 movs r4, 0
ldr r2, =gUnknown_02039F34 ldr r2, =gContestResources
ldr r0, [r2] ldr r0, [r2]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x11] ldrb r1, [r0, 0x11]
@@ -855,7 +855,7 @@ ContestEffectFunc_080E5A50: @ 80E5A50
beq _080E5AB0 beq _080E5AB0
movs r5, 0 movs r5, 0
_080E5A68: _080E5A68:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x8] ldr r1, [r0, 0x8]
ldrb r0, [r1, 0x11] ldrb r0, [r1, 0x11]
@@ -932,7 +932,7 @@ ContestEffectFunc_080E5AD4: @ 80E5AD4
mov r10, r3 mov r10, r3
movs r6, 0 movs r6, 0
_080E5B00: _080E5B00:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r2, [r0] ldr r2, [r0]
ldr r1, [r2, 0x8] ldr r1, [r2, 0x8]
ldrb r0, [r1, 0x11] ldrb r0, [r1, 0x11]
@@ -1000,7 +1000,7 @@ _080E5B76:
bge _080E5B76 bge _080E5B76
_080E5B7E: _080E5B7E:
movs r5, 0 movs r5, 0
ldr r7, =gUnknown_02039F34 ldr r7, =gContestResources
movs r6, 0 movs r6, 0
mov r4, r10 mov r4, r10
_080E5B86: _080E5B86:
@@ -1125,7 +1125,7 @@ _080E5C70:
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
_080E5C86: _080E5C86:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
adds r0, 0xD adds r0, 0xD
@@ -1139,7 +1139,7 @@ _080E5C86:
cmp r0, 0xFF cmp r0, 0xFF
bne _080E5C16 bne _080E5C16
_080E5CA0: _080E5CA0:
ldr r6, =gUnknown_02039F34 ldr r6, =gContestResources
ldr r0, [r6] ldr r0, [r6]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1173,7 +1173,7 @@ ContestEffectFunc_080E5CD4: @ 80E5CD4
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
movs r6, 0 movs r6, 0
ldr r7, =gUnknown_02039F34 ldr r7, =gContestResources
movs r5, 0 movs r5, 0
_080E5CE4: _080E5CE4:
ldr r2, [r7] ldr r2, [r7]
@@ -1228,7 +1228,7 @@ _080E5D46:
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x3 cmp r6, 0x3
ble _080E5CE4 ble _080E5CE4
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1256,7 +1256,7 @@ ContestEffectFunc_080E5D7C: @ 80E5D7C
push {r4-r7,lr} push {r4-r7,lr}
movs r7, 0 movs r7, 0
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_02039F34 ldr r5, =gContestResources
movs r6, 0 movs r6, 0
_080E5D86: _080E5D86:
ldr r3, [r5] ldr r3, [r5]
@@ -1301,7 +1301,7 @@ _080E5DD2:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _080E5D86 ble _080E5D86
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1325,7 +1325,7 @@ _080E5DF8:
ContestEffectFunc_080E5E04: @ 80E5E04 ContestEffectFunc_080E5E04: @ 80E5E04
push {r4,lr} push {r4,lr}
ldr r1, =gUnknown_02039F26 ldr r1, =gUnknown_02039F26
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r4, [r0] ldr r4, [r0]
ldr r0, [r4, 0x8] ldr r0, [r4, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1366,7 +1366,7 @@ _080E5E46:
ContestEffectFunc_080E5E5C: @ 80E5E5C ContestEffectFunc_080E5E5C: @ 80E5E5C
push {r4,lr} push {r4,lr}
ldr r1, =gUnknown_02039F26 ldr r1, =gUnknown_02039F26
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r4, [r0] ldr r4, [r0]
ldr r0, [r4, 0x8] ldr r0, [r4, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1408,7 +1408,7 @@ ContestEffectFunc_080E5EB4: @ 80E5EB4
push {r4-r7,lr} push {r4-r7,lr}
movs r1, 0 movs r1, 0
movs r5, 0 movs r5, 0
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r4, [r0] ldr r4, [r0]
ldr r2, [r4, 0x8] ldr r2, [r4, 0x8]
ldrb r0, [r2, 0x11] ldrb r0, [r2, 0x11]
@@ -1434,7 +1434,7 @@ _080E5EDA:
bge _080E5EE8 bge _080E5EE8
movs r5, 0 movs r5, 0
_080E5EE8: _080E5EE8:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r3, [r0] ldr r3, [r0]
ldr r0, [r3, 0x8] ldr r0, [r3, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1467,7 +1467,7 @@ _080E5F0C:
movs r1, 0x11 movs r1, 0x11
bl sub_80DD3D4 bl sub_80DD3D4
_080E5F2C: _080E5F2C:
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r1, [r4] ldr r1, [r4]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1498,7 +1498,7 @@ _080E5F2C:
ContestEffectFunc_080E5F64: @ 80E5F64 ContestEffectFunc_080E5F64: @ 80E5F64
push {r4-r7,lr} push {r4-r7,lr}
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r4, [r0] ldr r4, [r0]
ldr r2, [r4, 0x8] ldr r2, [r4, 0x8]
ldrb r1, [r2, 0x11] ldrb r1, [r2, 0x11]
@@ -1567,7 +1567,7 @@ _080E5FDE:
thumb_func_start ContestEffectFunc_080E5FE4 thumb_func_start ContestEffectFunc_080E5FE4
ContestEffectFunc_080E5FE4: @ 80E5FE4 ContestEffectFunc_080E5FE4: @ 80E5FE4
push {r4,r5,lr} push {r4,r5,lr}
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
ldr r3, [r1] ldr r3, [r1]
ldr r0, [r3, 0x8] ldr r0, [r3, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1647,7 +1647,7 @@ ContestEffectFunc_080E6068: @ 80E6068
cmp r0, 0x2 cmp r0, 0x2
bhi _080E6098 bhi _080E6098
movs r4, 0xA movs r4, 0xA
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1659,7 +1659,7 @@ _080E6098:
cmp r0, 0x5 cmp r0, 0x5
bhi _080E60B4 bhi _080E60B4
movs r4, 0x14 movs r4, 0x14
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1671,7 +1671,7 @@ _080E60B4:
cmp r0, 0x7 cmp r0, 0x7
bhi _080E60D0 bhi _080E60D0
movs r4, 0x28 movs r4, 0x28
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1683,7 +1683,7 @@ _080E60D0:
cmp r1, 0x8 cmp r1, 0x8
bhi _080E60EC bhi _080E60EC
movs r4, 0x3C movs r4, 0x3C
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -1693,14 +1693,14 @@ _080E60D0:
.pool .pool
_080E60EC: _080E60EC:
movs r4, 0x50 movs r4, 0x50
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
movs r1, 0x1E movs r1, 0x1E
bl sub_80DD3D4 bl sub_80DD3D4
_080E60FC: _080E60FC:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -1721,7 +1721,7 @@ ContestEffectFunc_080E611C: @ 80E611C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
ldr r2, =gUnknown_02039F34 ldr r2, =gContestResources
ldr r0, [r2] ldr r0, [r2]
ldr r3, [r0, 0x8] ldr r3, [r0, 0x8]
ldrb r0, [r3, 0x11] ldrb r0, [r3, 0x11]
@@ -1743,7 +1743,7 @@ _080E6140:
adds r5, r0, 0 adds r5, r0, 0
cmp r6, r1 cmp r6, r1
beq _080E616A beq _080E616A
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
_080E614E: _080E614E:
lsls r0, r2, 24 lsls r0, r2, 24
movs r2, 0x80 movs r2, 0x80
@@ -1845,7 +1845,7 @@ ContestEffectFunc_080E620C: @ 80E620C
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r3, [r0] ldr r3, [r0]
ldr r1, [r3, 0x8] ldr r1, [r3, 0x8]
ldrb r2, [r1, 0x11] ldrb r2, [r1, 0x11]
@@ -1928,7 +1928,7 @@ _080E62AC:
thumb_func_start ContestEffectFunc_080E62B8 thumb_func_start ContestEffectFunc_080E62B8
ContestEffectFunc_080E62B8: @ 80E62B8 ContestEffectFunc_080E62B8: @ 80E62B8
push {r4-r7,lr} push {r4-r7,lr}
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x11] ldrb r1, [r0, 0x11]
@@ -1939,7 +1939,7 @@ ContestEffectFunc_080E62B8: @ 80E62B8
movs r5, 0 movs r5, 0
movs r6, 0 movs r6, 0
_080E62CE: _080E62CE:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r4, [r0] ldr r4, [r0]
ldr r1, [r4, 0x8] ldr r1, [r4, 0x8]
ldrb r2, [r1, 0x11] ldrb r2, [r1, 0x11]
@@ -1994,7 +1994,7 @@ _080E632E:
thumb_func_start ContestEffectFunc_080E6334 thumb_func_start ContestEffectFunc_080E6334
ContestEffectFunc_080E6334: @ 80E6334 ContestEffectFunc_080E6334: @ 80E6334
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r1, [r4] ldr r1, [r4]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -2046,7 +2046,7 @@ _080E6390:
thumb_func_start ContestEffectFunc_080E6398 thumb_func_start ContestEffectFunc_080E6398
ContestEffectFunc_080E6398: @ 80E6398 ContestEffectFunc_080E6398: @ 80E6398
push {lr} push {lr}
ldr r3, =gUnknown_02039F34 ldr r3, =gContestResources
ldr r1, [r3] ldr r1, [r3]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -2090,7 +2090,7 @@ _080E63E4:
ContestEffectFunc_080E63E8: @ 80E63E8 ContestEffectFunc_080E63E8: @ 80E63E8
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r2, [r0] ldr r2, [r0]
ldr r1, [r2] ldr r1, [r2]
ldrb r1, [r1, 0x1] ldrb r1, [r1, 0x1]
@@ -2258,7 +2258,7 @@ ContestEffectFunc_080E6520: @ 80E6520
mov r7, r8 mov r7, r8
push {r7} push {r7}
sub sp, 0x4 sub sp, 0x4
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r2, [r0] ldr r2, [r0]
ldr r1, [r2] ldr r1, [r2]
ldrb r1, [r1, 0x1] ldrb r1, [r1, 0x1]
@@ -2434,7 +2434,7 @@ ContestEffectFunc_080E6664: @ 80E6664
ContestEffectFunc_080E6668: @ 80E6668 ContestEffectFunc_080E6668: @ 80E6668
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r1] ldr r0, [r1]
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
@@ -2517,7 +2517,7 @@ _080E66FC:
cmp r0, 0x3 cmp r0, 0x3
ble _080E66AA ble _080E66AA
movs r6, 0 movs r6, 0
ldr r5, =gUnknown_02039F34 ldr r5, =gContestResources
adds r4, r5, 0 adds r4, r5, 0
_080E6712: _080E6712:
ldr r0, [r4] ldr r0, [r4]
@@ -2576,7 +2576,7 @@ _080E676C:
ContestEffectFunc_080E6778: @ 80E6778 ContestEffectFunc_080E6778: @ 80E6778
push {lr} push {lr}
ldr r3, =gContestMoves ldr r3, =gContestMoves
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -2613,7 +2613,7 @@ ContestEffectFunc_080E67BC: @ 80E67BC
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_02039F34 ldr r5, =gContestResources
movs r6, 0 movs r6, 0
_080E67CC: _080E67CC:
ldr r3, [r5] ldr r3, [r5]
@@ -2672,14 +2672,14 @@ _080E682E:
mov r7, r8 mov r7, r8
cmp r7, 0 cmp r7, 0
bne _080E684A bne _080E684A
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
movs r1, 0x36 movs r1, 0x36
bl sub_80DD3F0 bl sub_80DD3F0
_080E684A: _080E684A:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -2696,7 +2696,7 @@ _080E684A:
thumb_func_start ContestEffectFunc_080E6868 thumb_func_start ContestEffectFunc_080E6868
ContestEffectFunc_080E6868: @ 80E6868 ContestEffectFunc_080E6868: @ 80E6868
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r1] ldr r0, [r1]
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
@@ -2745,7 +2745,7 @@ _080E68C2:
movs r1, 0x1E movs r1, 0x1E
bl sub_80DD3D4 bl sub_80DD3D4
_080E68CE: _080E68CE:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r1, [r0] ldr r1, [r0]
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11] ldrb r2, [r0, 0x11]
@@ -2764,7 +2764,7 @@ _080E68CE:
thumb_func_start ContestEffectFunc_080E68EC thumb_func_start ContestEffectFunc_080E68EC
ContestEffectFunc_080E68EC: @ 80E68EC ContestEffectFunc_080E68EC: @ 80E68EC
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r0, [r4] ldr r0, [r4]
ldr r2, [r0, 0x10] ldr r2, [r0, 0x10]
ldrb r1, [r2, 0x1] ldrb r1, [r2, 0x1]
@@ -2811,7 +2811,7 @@ sub_80E6934: @ 80E6934
mov r8, r0 mov r8, r0
movs r7, 0 movs r7, 0
movs r4, 0 movs r4, 0
ldr r6, =gUnknown_02039F34 ldr r6, =gContestResources
ldr r0, =gContestMoves ldr r0, =gContestMoves
mov r9, r0 mov r9, r0
movs r5, 0 movs r5, 0
@@ -2861,7 +2861,7 @@ _080E699E:
ble _080E694E ble _080E694E
cmp r7, 0 cmp r7, 0
bne _080E69B8 bne _080E69B8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11] ldrb r0, [r0, 0x11]
@@ -2882,7 +2882,7 @@ sub_80E69C8: @ 80E69C8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r2, =gUnknown_02039F34 ldr r2, =gContestResources
ldr r0, [r2] ldr r0, [r2]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
adds r0, 0xD adds r0, 0xD
@@ -2945,7 +2945,7 @@ sub_80E6A2C: @ 80E6A2C
movs r2, 0x8 movs r2, 0x8
bl memset bl memset
movs r7, 0 movs r7, 0
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
@@ -3040,7 +3040,7 @@ _080E6AD6:
strh r0, [r1] strh r0, [r1]
_080E6AFE: _080E6AFE:
adds r7, 0x1 adds r7, 0x1
ldr r4, =gUnknown_02039F34 ldr r4, =gContestResources
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
adds r0, 0x8 adds r0, 0x8
@@ -3081,7 +3081,7 @@ sub_80E6B3C: @ 80E6B3C
lsrs r0, 24 lsrs r0, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r2, =gUnknown_02039F34 ldr r2, =gContestResources
ldr r4, [r2] ldr r4, [r2]
ldr r3, [r4, 0x4] ldr r3, [r4, 0x4]
lsls r2, r0, 3 lsls r2, r0, 3
asm/contest_link_80FC4F4.s
+9 -9
View File
@@ -50,7 +50,7 @@ sub_80FC530: @ 80FC530
cmp r4, 0 cmp r4, 0
beq _080FC552 beq _080FC552
adds r0, r5, 0 adds r0, r5, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
movs r0, 0x1 movs r0, 0x1
b _080FC554 b _080FC554
_080FC552: _080FC552:
@@ -657,7 +657,7 @@ _080FCA30:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCAB2 beq _080FCAB2
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r2, [r0] ldr r2, [r0]
ldr r0, =gUnknown_02039F25 ldr r0, =gUnknown_02039F25
ldrb r0, [r0] ldrb r0, [r0]
@@ -688,7 +688,7 @@ _080FCA68:
ldrb r0, [r6] ldrb r0, [r6]
cmp r2, r0 cmp r2, r0
bge _080FCAA4 bge _080FCAA4
ldr r1, =gUnknown_02039F34 ldr r1, =gContestResources
mov r8, r1 mov r8, r1
ldr r4, =gBlockRecvBuffer ldr r4, =gBlockRecvBuffer
movs r3, 0 movs r3, 0
@@ -955,7 +955,7 @@ _080FCCE8:
bne _080FCCF4 bne _080FCCF4
b _080FCE42 b _080FCE42
_080FCCF4: _080FCCF4:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
movs r1, 0x70 movs r1, 0x70
@@ -968,7 +968,7 @@ _080FCD04:
bne _080FCD10 bne _080FCD10
b _080FCE42 b _080FCE42
_080FCD10: _080FCD10:
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
@@ -1004,7 +1004,7 @@ _080FCD54:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
movs r1, 0x14 movs r1, 0x14
@@ -1015,7 +1015,7 @@ _080FCD6C:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
@@ -1031,7 +1031,7 @@ _080FCD98:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
b _080FCDD4 b _080FCDD4
@@ -1041,7 +1041,7 @@ _080FCDB0:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
b _080FCE04 b _080FCE04
asm/intro.s
+2 -2
View File
@@ -1958,9 +1958,9 @@ task_intro_13: @ 816DD28
ldr r0, =gUnknown_08D8A818 ldr r0, =gUnknown_08D8A818
ldr r1, =0x0600e000 ldr r1, =0x0600e000
bl LZDecompressVram bl LZDecompressVram
ldr r0, =gUnknown_08524D14 ldr r0, =gBattleAnimPicTable + 0x1D0
bl LoadCompressedObjectPicUsingHeap bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852561C ldr r0, =gBattleAnimPaletteTable + 0x1D0
bl LoadCompressedObjectPaletteUsingHeap bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =gUnknown_08D85CD0 ldr r0, =gUnknown_08D85CD0
ldr r1, =gPlttBufferUnfaded ldr r1, =gPlttBufferUnfaded
asm/link.s
+11 -11
View File
@@ -545,7 +545,7 @@ _08009888:
movs r6, 0 movs r6, 0
strh r0, [r4] strh r0, [r4]
adds r0, r5, 0 adds r0, r5, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, r8 cmp r0, r8
beq _080098C4 beq _080098C4
@@ -2181,8 +2181,8 @@ _0800A5E2:
.pool .pool
thumb_func_end ResetBlockReceivedFlags thumb_func_end ResetBlockReceivedFlags
thumb_func_start sub_800A5EC thumb_func_start ResetBlockReceivedFlag
sub_800A5EC: @ 800A5EC ResetBlockReceivedFlag: @ 800A5EC
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -2206,7 +2206,7 @@ _0800A616:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_800A5EC thumb_func_end ResetBlockReceivedFlag
thumb_func_start sub_800A620 thumb_func_start sub_800A620
sub_800A620: @ 800A620 sub_800A620: @ 800A620
@@ -14607,7 +14607,7 @@ sub_8010A70: @ 8010A70
adds r1, r4, 0 adds r1, r4, 0
bl CpuSet bl CpuSet
movs r0, 0 movs r0, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
_08010A9C: _08010A9C:
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@@ -14683,7 +14683,7 @@ _08010B40:
b _08010CF0 b _08010CF0
_08010B4A: _08010B4A:
adds r0, r4, 0 adds r0, r4, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
movs r0, 0xF0 movs r0, 0xF0
lsls r0, 7 lsls r0, 7
bl sub_800FD14 bl sub_800FD14
@@ -14713,7 +14713,7 @@ _08010B78:
b _08010CF0 b _08010CF0
_08010B8C: _08010B8C:
adds r0, r4, 0 adds r0, r4, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
lsls r2, r4, 8 lsls r2, r4, 8
ldr r0, =gBlockRecvBuffer ldr r0, =gBlockRecvBuffer
adds r2, r0 adds r2, r0
@@ -14845,7 +14845,7 @@ _08010C94:
ldr r2, =0x0100007e ldr r2, =0x0100007e
bl CpuSet bl CpuSet
movs r0, 0 movs r0, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
ldr r1, =gUnknown_03005000 ldr r1, =gUnknown_03005000
ldr r5, =0x00000ce8 ldr r5, =0x00000ce8
adds r0, r1, r5 adds r0, r1, r5
@@ -14947,7 +14947,7 @@ _08010D82:
ldr r0, =gBlockRecvBuffer ldr r0, =gBlockRecvBuffer
bl sub_8010A14 bl sub_8010A14
movs r0, 0 movs r0, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
ldr r0, =gReceivedRemoteLinkPlayers ldr r0, =gReceivedRemoteLinkPlayers
strb r4, [r0] strb r4, [r0]
adds r0, r5, 0 adds r0, r5, 0
@@ -39108,7 +39108,7 @@ sub_801D978: @ 801D978
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_800A5EC bl ResetBlockReceivedFlag
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_801D978 thumb_func_end sub_801D978
@@ -42361,7 +42361,7 @@ _0801F3A2:
strh r1, [r4, 0x4] strh r1, [r4, 0x4]
lsls r0, r1, 24 lsls r0, r1, 24
lsrs r0, 24 lsrs r0, 24
bl sub_800A5EC bl ResetBlockReceivedFlag
movs r1, 0x2 movs r1, 0x2
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
lsls r0, 8 lsls r0, 8
asm/macros/event.s
+2 -2
View File
@@ -241,14 +241,14 @@
@ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers. @ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
.macro special function .macro special function
.byte 0x25 .byte 0x25
.2byte \function .2byte SPECIAL_\function
.endm .endm
@ Calls a special function. That function's output (if any) will be written to the variable you specify. @ Calls a special function. That function's output (if any) will be written to the variable you specify.
.macro specialval output, function .macro specialval output, function
.byte 0x26 .byte 0x26
.2byte \output .2byte \output
.2byte \function .2byte SPECIAL_\function
.endm .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). @ 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).
asm/record_mixing.s
+1 -1
View File
@@ -1135,7 +1135,7 @@ _080E76DC:
bl memcpy bl memcpy
_080E76E4: _080E76E4:
mov r0, r8 mov r0, r8
bl sub_800A5EC bl ResetBlockReceivedFlag
mov r0, r9 mov r0, r9
lsls r1, r0, 1 lsls r1, r0, 1
adds r1, r5, r1 adds r1, r5, r1
asm/rom3.s
-3775
View File
File diff suppressed because it is too large Load Diff
asm/rom6.s
+2 -2
View File
@@ -11676,7 +11676,7 @@ _0813B62E:
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r5] strh r0, [r5]
movs r0, 0x1 movs r0, 0x1
bl sub_800A5EC bl ResetBlockReceivedFlag
ldr r0, =gSpecialVar_0x8004 ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
@@ -11756,7 +11756,7 @@ _0813B6E4:
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r1] strh r0, [r1]
movs r0, 0 movs r0, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
_0813B708: _0813B708:
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
asm/rom_80A5C6C.s
+83 -83
View File
@@ -74,7 +74,7 @@ _080A5D00:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A5D28 beq _080A5D28
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x18] ldr r2, [r0, 0x18]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
@@ -180,7 +180,7 @@ _080A5DDA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A5E04 beq _080A5E04
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x18] ldr r2, [r0, 0x18]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
@@ -531,7 +531,7 @@ sub_80A60AC: @ 80A60AC
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A60E8 beq _080A60E8
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x18] ldr r2, [r0, 0x18]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
@@ -554,7 +554,7 @@ _080A60E8:
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _080A610C bne _080A610C
ldr r1, =gUnknown_02038438 ldr r1, =gAnimSpeciesByBanks
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
@@ -724,9 +724,9 @@ GetAnimBankSpriteId: @ 80A6240
adds r1, r0, 0 adds r1, r0, 0
cmp r0, 0 cmp r0, 0
bne _080A6268 bne _080A6268
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A62B6 beq _080A62B6
@@ -737,9 +737,9 @@ GetAnimBankSpriteId: @ 80A6240
_080A6268: _080A6268:
cmp r0, 0x1 cmp r0, 0x1
bne _080A6288 bne _080A6288
ldr r4, =gAnimationBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80A6A90 bl AnimBankSpriteExists
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A62B6 beq _080A62B6
@@ -750,22 +750,22 @@ _080A6268:
_080A6288: _080A6288:
cmp r1, 0x2 cmp r1, 0x2
bne _080A62A4 bne _080A62A4
ldr r5, =gAnimationBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x2 movs r4, 0x2
eors r0, r4 eors r0, r4
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A62B6 beq _080A62B6
b _080A62C0 b _080A62C0
.pool .pool
_080A62A4: _080A62A4:
ldr r5, =gAnimationBankTarget ldr r5, =gAnimBankTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x2 movs r4, 0x2
eors r0, r4 eors r0, r4
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080A62C0 bne _080A62C0
@@ -1242,7 +1242,7 @@ sub_80A65EC: @ 80A65EC
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
ldr r5, =gAnimationBankTarget ldr r5, =gAnimBankTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -1421,7 +1421,7 @@ move_anim_8074EE0: @ 80A674C
adds r4, r0, 0 adds r4, r0, 0
bl FreeSpriteOamMatrix bl FreeSpriteOamMatrix
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl DestroyAnimSprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1439,7 +1439,7 @@ sub_80A6760: @ 80A6760
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
ldr r5, =gAnimationBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -1518,7 +1518,7 @@ sub_80A67F4: @ 80A67F4
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl DestroyAnimSprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1537,7 +1537,7 @@ sub_80A6814: @ 80A6814
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1547,7 +1547,7 @@ sub_80A6814: @ 80A6814
sub_80A6838: @ 80A6838 sub_80A6838: @ 80A6838
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -1575,13 +1575,13 @@ sub_80A6864: @ 80A6864
lsls r1, 16 lsls r1, 16
lsrs r5, r1, 16 lsrs r5, r1, 16
mov r8, r5 mov r8, r5
ldr r7, =gAnimationBankAttacker ldr r7, =gAnimBankAttacker
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl sub_80A5C6C
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl sub_80A5C6C
@@ -1729,7 +1729,7 @@ sub_80A6980: @ 80A6980
lsls r1, 24 lsls r1, 24
cmp r1, 0 cmp r1, 0
bne _080A69A8 bne _080A69A8
ldr r4, =gAnimationBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80A60AC bl sub_80A60AC
@@ -1765,7 +1765,7 @@ sub_80A69CC: @ 80A69CC
lsls r1, 24 lsls r1, 24
cmp r1, 0 cmp r1, 0
bne _080A69F0 bne _080A69F0
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80A60AC bl sub_80A60AC
@@ -1777,7 +1777,7 @@ sub_80A69CC: @ 80A69CC
b _080A6A04 b _080A6A04
.pool .pool
_080A69F0: _080A69F0:
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A60AC bl sub_80A60AC
@@ -1862,8 +1862,8 @@ _080A6A7E:
.pool .pool
thumb_func_end GetBankByIdentity thumb_func_end GetBankByIdentity
thumb_func_start sub_80A6A90 thumb_func_start AnimBankSpriteExists
sub_80A6A90: @ 80A6A90 AnimBankSpriteExists: @ 80A6A90
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -1872,11 +1872,11 @@ sub_80A6A90: @ 80A6A90
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A6ABC beq _080A6ABC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, r4 cmp r0, r4
beq _080A6B0A beq _080A6B0A
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, r4 cmp r0, r4
beq _080A6B0A beq _080A6B0A
@@ -1926,7 +1926,7 @@ _080A6B1A:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A6A90 thumb_func_end AnimBankSpriteExists
thumb_func_start IsDoubleBattle thumb_func_start IsDoubleBattle
IsDoubleBattle: @ 80A6B20 IsDoubleBattle: @ 80A6B20
@@ -2061,9 +2061,9 @@ sub_80A6BFC: @ 80A6BFC
b _080A6C60 b _080A6C60
.pool .pool
_080A6C30: _080A6C30:
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankIdentity_permutated bl sub_80A8364
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x1 cmp r1, 0x1
@@ -2271,21 +2271,21 @@ _080A6DBE:
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
movs r2, 0x1 movs r2, 0x1
bl lcd_bg_operations bl SetAnimBgAttribute
b _080A6DE8 b _080A6DE8
_080A6DD4: _080A6DD4:
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
movs r2, 0x1 movs r2, 0x1
bl lcd_bg_operations bl SetAnimBgAttribute
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl lcd_bg_operations bl SetAnimBgAttribute
_080A6DE8: _080A6DE8:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2934,7 +2934,7 @@ sub_80A7270: @ 80A7270
cmp r0, 0 cmp r0, 0
bne _080A72A6 bne _080A72A6
adds r0, r7, 0 adds r0, r7, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A72B4 beq _080A72B4
@@ -3372,7 +3372,7 @@ _080A75F6:
_080A7602: _080A7602:
cmp r7, 0 cmp r7, 0
beq _080A7614 beq _080A7614
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r1, r0, 0 adds r1, r0, 0
adds r1, 0x10 adds r1, 0x10
@@ -3383,7 +3383,7 @@ _080A7614:
mov r0, r8 mov r0, r8
cmp r0, 0 cmp r0, 0
beq _080A7628 beq _080A7628
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r1, r0, 0 adds r1, r0, 0
adds r1, 0x10 adds r1, 0x10
@@ -3394,11 +3394,11 @@ _080A7628:
mov r0, r9 mov r0, r9
cmp r0, 0 cmp r0, 0
beq _080A764E beq _080A764E
ldr r6, =gAnimationBankAttacker ldr r6, =gAnimBankAttacker
ldrb r0, [r6] ldrb r0, [r6]
movs r5, 0x2 movs r5, 0x2
eors r0, r5 eors r0, r5
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A764E beq _080A764E
@@ -3413,11 +3413,11 @@ _080A764E:
mov r0, r10 mov r0, r10
cmp r0, 0 cmp r0, 0
beq _080A7674 beq _080A7674
ldr r6, =gAnimationBankTarget ldr r6, =gAnimBankTarget
ldrb r0, [r6] ldrb r0, [r6]
movs r5, 0x2 movs r5, 0x2
eors r0, r5 eors r0, r5
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7674 beq _080A7674
@@ -3499,7 +3499,7 @@ _080A76F2:
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A771A beq _080A771A
@@ -3517,7 +3517,7 @@ _080A771A:
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7746 beq _080A7746
@@ -3537,7 +3537,7 @@ _080A7746:
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7772 beq _080A7772
@@ -3558,7 +3558,7 @@ _080A7772:
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A77A0 beq _080A77A0
@@ -3670,7 +3670,7 @@ _080A7838:
_080A7842: _080A7842:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80A69CC bl sub_80A69CC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -3682,7 +3682,7 @@ _080A7842:
_080A785C: _080A785C:
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r4, =gAnimationBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -3701,7 +3701,7 @@ _080A785C:
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC ldr r0, =sub_80A6EEC
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4-r7} pop {r4-r7}
@@ -3716,7 +3716,7 @@ sub_80A78AC: @ 80A78AC
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80A69CC bl sub_80A69CC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -3730,7 +3730,7 @@ _080A78CC:
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E] strh r0, [r6, 0x2E]
ldr r5, =gAnimationBankTarget ldr r5, =gAnimBankTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -3768,7 +3768,7 @@ sub_80A791C: @ 80A791C
cmp r0, 0 cmp r0, 0
beq _080A7930 beq _080A7930
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl DestroyAnimSprite
_080A7930: _080A7930:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -3799,17 +3799,17 @@ _080A7954:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_80A69CC bl sub_80A69CC
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
b _080A7976 b _080A7976
.pool .pool
_080A796C: _080A796C:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_80A6980 bl sub_80A6980
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
_080A7976: _080A7976:
ldrb r6, [r0] ldrb r6, [r0]
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -3844,7 +3844,7 @@ _080A798E:
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC ldr r0, =sub_80A6EEC
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4-r7} pop {r4-r7}
@@ -4070,7 +4070,7 @@ _080A7B60:
cmp r1, r0 cmp r1, r0
bne _080A7B90 bne _080A7B90
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080A7B90: _080A7B90:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -4090,7 +4090,7 @@ sub_80A7B98: @ 80A7B98
cmp r3, 0xFF cmp r3, 0xFF
bne _080A7BBC bne _080A7BBC
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080A7BE2 b _080A7BE2
.pool .pool
_080A7BBC: _080A7BBC:
@@ -4210,7 +4210,7 @@ _080A7C78:
b _080A7CAC b _080A7CAC
_080A7CA6: _080A7CA6:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080A7CAC: _080A7CAC:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -4230,7 +4230,7 @@ sub_80A7CB4: @ 80A7CB4
cmp r2, 0xFF cmp r2, 0xFF
bne _080A7CD8 bne _080A7CD8
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl DestroyAnimVisualTask
b _080A7CEE b _080A7CEE
.pool .pool
_080A7CD8: _080A7CD8:
@@ -4554,7 +4554,7 @@ _080A7F42:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7F78 beq _080A7F78
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
ldrh r2, [r0] ldrh r2, [r0]
@@ -4807,7 +4807,7 @@ sub_80A8140: @ 80A8140
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r0, =gHappinessMoveAnim ldr r0, =gAnimFriendship
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
cmp r0, 0x1E cmp r0, 0x1E
@@ -4823,7 +4823,7 @@ _080A815E:
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
strh r1, [r0, 0xE] strh r1, [r0, 0xE]
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_task_del bl DestroyAnimVisualTask
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -4837,9 +4837,9 @@ sub_80A8174: @ 80A8174
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r7, r4, 0 adds r7, r4, 0
ldr r6, =gAnimationBankTarget ldr r6, =gAnimBankTarget
ldrb r0, [r6] ldrb r0, [r6]
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A81B4 beq _080A81B4
@@ -4863,10 +4863,10 @@ sub_80A8174: @ 80A8174
orrs r0, r2 orrs r0, r2
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
_080A81B4: _080A81B4:
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A81EC beq _080A81EC
@@ -4894,7 +4894,7 @@ _080A81EC:
ldrb r0, [r6] ldrb r0, [r6]
movs r5, 0x2 movs r5, 0x2
eors r0, r5 eors r0, r5
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A8224 beq _080A8224
@@ -4922,7 +4922,7 @@ _080A8224:
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
eors r0, r5 eors r0, r5
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A825C beq _080A825C
@@ -4968,7 +4968,7 @@ _080A8286:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl b_side_obj__get_some_boolean bl IsAnimBankSpriteVisible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A82C8 beq _080A82C8
@@ -5083,8 +5083,8 @@ _080A835C:
bx r1 bx r1
thumb_func_end sub_80A8328 thumb_func_end sub_80A8328
thumb_func_start GetBankIdentity_permutated thumb_func_start sub_80A8364
GetBankIdentity_permutated: @ 80A8364 sub_80A8364: @ 80A8364
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -5109,7 +5109,7 @@ _080A838C:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end GetBankIdentity_permutated thumb_func_end sub_80A8364
thumb_func_start sub_80A8394 thumb_func_start sub_80A8394
sub_80A8394: @ 80A8394 sub_80A8394: @ 80A8394
@@ -5416,7 +5416,7 @@ sub_80A861C: @ 80A861C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A86C4 beq _080A86C4
ldr r0, =gUnknown_02039F34 ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x18] ldr r2, [r0, 0x18]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
@@ -5941,7 +5941,7 @@ sub_80A8A6C: @ 80A8A6C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6838 bl sub_80A6838
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -5998,7 +5998,7 @@ _080A8AB6:
sub_80A8AEC: @ 80A8AEC sub_80A8AEC: @ 80A8AEC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -6054,7 +6054,7 @@ sub_80A8B64: @ 80A8B64
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6838 bl sub_80A6838
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -6081,7 +6081,7 @@ _080A8B9C:
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, =sub_80A67D8 ldr r0, =sub_80A67D8
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4} pop {r4}
@@ -6106,7 +6106,7 @@ sub_80A8BC4: @ 80A8BC4
lsrs r0, 24 lsrs r0, 24
movs r6, 0 movs r6, 0
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
ldr r7, =gAnimationBankAttacker ldr r7, =gAnimBankAttacker
ldrb r0, [r7] ldrb r0, [r7]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -6283,7 +6283,7 @@ _080A8D58:
ldr r0, =0x00002771 ldr r0, =0x00002771
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_task_del bl DestroyAnimVisualTask
_080A8D6C: _080A8D6C:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -6389,7 +6389,7 @@ _080A8E26:
sub_80A8E30: @ 80A8E30 sub_80A8E30: @ 80A8E30
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
ldr r4, =gAnimationBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl sub_80A5C6C
@@ -6465,7 +6465,7 @@ _080A8EC4:
cmp r0, r1 cmp r0, r1
bge _080A8EDC bge _080A8EDC
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl DestroyAnimSprite
_080A8EDC: _080A8EDC:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -6487,7 +6487,7 @@ sub_80A8EE4: @ 80A8EE4
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
ldr r0, =gAnimationBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -6514,7 +6514,7 @@ _080A8F32:
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, =sub_80A6EEC ldr r0, =sub_80A6EEC
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740 ldr r1, =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4,r5} pop {r4,r5}
asm/trade.s
+3 -3
View File
@@ -125,7 +125,7 @@ sub_8077234: @ 8077234
_08077250: _08077250:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_800A5EC bl ResetBlockReceivedFlag
_08077258: _08077258:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -12903,7 +12903,7 @@ _0807E504:
strb r6, [r0] strb r6, [r0]
_0807E514: _0807E514:
movs r0, 0 movs r0, 0
bl sub_800A5EC bl ResetBlockReceivedFlag
_0807E51A: _0807E51A:
movs r0, 0x2 movs r0, 0x2
ands r0, r5 ands r0, r5
@@ -12924,7 +12924,7 @@ _0807E51A:
strb r1, [r0] strb r1, [r0]
_0807E53C: _0807E53C:
movs r0, 0x1 movs r0, 0x1
bl sub_800A5EC bl ResetBlockReceivedFlag
_0807E542: _0807E542:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
data/battle_anim_scripts.s
+1 -1
View File
@@ -6,7 +6,7 @@
gUnknown_082C8D64:: @ 82C8D64 gUnknown_082C8D64:: @ 82C8D64
.incbin "baserom.gba", 0x2c8d64, 0x8 .incbin "baserom.gba", 0x2c8d64, 0x8
gUnknown_082C8D6C:: @ 82C8D6C gBattleAnims_Moves:: @ 82C8D6C
.incbin "baserom.gba", 0x2c8d6c, 0x590 .incbin "baserom.gba", 0x2c8d6c, 0x590
gUnknown_082C92FC:: @ 82C92FC gUnknown_082C92FC:: @ 82C92FC
data/battle_anims.s
+4 -128
View File
@@ -294,7 +294,7 @@ gUnknown_08524B3C:: @ 8524B3C
.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2 .align 2
gUnknown_08524B44:: @ 8524B44 gBattleAnimPicTable:: @ 8524B44
obj_tiles 0x08c02538, 0x0200, 0x2710 obj_tiles 0x08c02538, 0x0200, 0x2710
obj_tiles 0x08c1c6e0, 0x0300, 0x2711 obj_tiles 0x08c1c6e0, 0x0300, 0x2711
obj_tiles 0x08c20784, 0x0200, 0x2712 obj_tiles 0x08c20784, 0x0200, 0x2712
@@ -353,9 +353,6 @@ gUnknown_08524B44:: @ 8524B44
obj_tiles 0x08c0a8bc, 0x0200, 0x2747 obj_tiles 0x08c0a8bc, 0x0200, 0x2747
obj_tiles 0x08c0a3ec, 0x1000, 0x2748 obj_tiles 0x08c0a3ec, 0x1000, 0x2748
obj_tiles 0x08c0a980, 0x0180, 0x2749 obj_tiles 0x08c0a980, 0x0180, 0x2749
.align 2
gUnknown_08524D14:: @ 8524D14
obj_tiles 0x08c0aa2c, 0x0c00, 0x274a obj_tiles 0x08c0aa2c, 0x0c00, 0x274a
obj_tiles 0x08c0aebc, 0x0100, 0x274b obj_tiles 0x08c0aebc, 0x0100, 0x274b
obj_tiles 0x08c0af38, 0x0040, 0x274c obj_tiles 0x08c0af38, 0x0040, 0x274c
@@ -434,9 +431,6 @@ gUnknown_08524D14:: @ 8524D14
obj_tiles 0x08c14b78, 0x0100, 0x2795 obj_tiles 0x08c14b78, 0x0100, 0x2795
obj_tiles 0x08c14c1c, 0x0200, 0x2796 obj_tiles 0x08c14c1c, 0x0200, 0x2796
obj_tiles 0x08c1a3a0, 0x0200, 0x2797 obj_tiles 0x08c1a3a0, 0x0200, 0x2797
.align 2
gUnknown_08524F84:: @ 8524F84
obj_tiles 0x08c1a540, 0x0020, 0x2798 obj_tiles 0x08c1a540, 0x0020, 0x2798
obj_tiles 0x08c1a58c, 0x0a00, 0x2799 obj_tiles 0x08c1a58c, 0x0a00, 0x2799
obj_tiles 0x08c1ab40, 0x0800, 0x279a obj_tiles 0x08c1ab40, 0x0800, 0x279a
@@ -534,9 +528,6 @@ gUnknown_08524F84:: @ 8524F84
obj_tiles 0x08c258b8, 0x0800, 0x27f6 obj_tiles 0x08c258b8, 0x0800, 0x27f6
obj_tiles 0x08c28394, 0x0380, 0x27f7 obj_tiles 0x08c28394, 0x0380, 0x27f7
obj_tiles 0x08c27e34, 0x0800, 0x27f8 obj_tiles 0x08c27e34, 0x0800, 0x27f8
.align 2
gUnknown_0852528C:: @ 852528C
obj_tiles 0x08c28564, 0x00c0, 0x27f9 obj_tiles 0x08c28564, 0x00c0, 0x27f9
obj_tiles 0x08c28610, 0x0800, 0x27fa obj_tiles 0x08c28610, 0x0800, 0x27fa
obj_tiles 0x08c28880, 0x0060, 0x27fb obj_tiles 0x08c28880, 0x0060, 0x27fb
@@ -573,9 +564,6 @@ gUnknown_0852528C:: @ 852528C
obj_tiles 0x08d93b9c, 0x0080, 0x281a obj_tiles 0x08d93b9c, 0x0080, 0x281a
obj_tiles 0x08c2407c, 0x0800, 0x281b obj_tiles 0x08c2407c, 0x0800, 0x281b
obj_tiles 0x08d8ea54, 0x0020, 0x281c obj_tiles 0x08d8ea54, 0x0020, 0x281c
.align 2
gUnknown_085253AC:: @ 85253AC
obj_tiles 0x08d8ef2c, 0x0080, 0x281d obj_tiles 0x08d8ef2c, 0x0080, 0x281d
obj_tiles 0x08dba378, 0x0400, 0x281e obj_tiles 0x08dba378, 0x0400, 0x281e
obj_tiles 0x08dba4b8, 0x0080, 0x281f obj_tiles 0x08dba4b8, 0x0080, 0x281f
@@ -597,6 +585,8 @@ gUnknown_085253AC:: @ 85253AC
obj_tiles 0x08c0a3ec, 0x1000, 0x282f obj_tiles 0x08c0a3ec, 0x1000, 0x282f
obj_tiles 0x08c1bee4, 0x0100, 0x2830 obj_tiles 0x08c1bee4, 0x0100, 0x2830
.align 2
gBattleAnimPaletteTable:: @ 852544C
obj_pal 0x08c028cc, 0x2710 obj_pal 0x08c028cc, 0x2710
obj_pal 0x08c1c794, 0x2711 obj_pal 0x08c1c794, 0x2711
obj_pal 0x08c20868, 0x2712 obj_pal 0x08c20868, 0x2712
@@ -655,9 +645,6 @@ gUnknown_085253AC:: @ 85253AC
obj_pal 0x08c09fd8, 0x2747 obj_pal 0x08c09fd8, 0x2747
obj_pal 0x08c0a894, 0x2748 obj_pal 0x08c0a894, 0x2748
obj_pal 0x08c0aa08, 0x2749 obj_pal 0x08c0aa08, 0x2749
.align 2
gUnknown_0852561C:: @ 852561C
obj_pal 0x08c0ae94, 0x274a obj_pal 0x08c0ae94, 0x274a
obj_pal 0x08c0af1c, 0x274b obj_pal 0x08c0af1c, 0x274b
obj_pal 0x08c0af60, 0x274c obj_pal 0x08c0af60, 0x274c
@@ -736,9 +723,6 @@ gUnknown_0852561C:: @ 852561C
obj_pal 0x08c14bf4, 0x2795 obj_pal 0x08c14bf4, 0x2795
obj_pal 0x08c14bf4, 0x2796 obj_pal 0x08c14bf4, 0x2796
obj_pal 0x08c1a478, 0x2797 obj_pal 0x08c1a478, 0x2797
.align 2
gUnknown_0852588C:: @ 852588C
obj_pal 0x08c1a564, 0x2798 obj_pal 0x08c1a564, 0x2798
obj_pal 0x08c1a478, 0x2799 obj_pal 0x08c1a478, 0x2799
obj_pal 0x08c1a478, 0x279a obj_pal 0x08c1a478, 0x279a
@@ -836,9 +820,6 @@ gUnknown_0852588C:: @ 852588C
obj_pal 0x08c25890, 0x27f6 obj_pal 0x08c25890, 0x27f6
obj_pal 0x08c2836c, 0x27f7 obj_pal 0x08c2836c, 0x27f7
obj_pal 0x08c2836c, 0x27f8 obj_pal 0x08c2836c, 0x27f8
.align 2
gUnknown_08525B94:: @ 8525B94
obj_pal 0x08c285e8, 0x27f9 obj_pal 0x08c285e8, 0x27f9
obj_pal 0x08c287d0, 0x27fa obj_pal 0x08c287d0, 0x27fa
obj_pal 0x08c288d0, 0x27fb obj_pal 0x08c288d0, 0x27fb
@@ -875,9 +856,6 @@ gUnknown_08525B94:: @ 8525B94
obj_pal 0x08d93bdc, 0x281a obj_pal 0x08d93bdc, 0x281a
obj_pal 0x08d93bf4, 0x281b obj_pal 0x08d93bf4, 0x281b
obj_pal 0x08d93c0c, 0x281c obj_pal 0x08d93c0c, 0x281c
.align 2
gUnknown_08525CB4:: @ 8525CB4
obj_pal 0x08d8ef80, 0x281d obj_pal 0x08d8ef80, 0x281d
obj_pal 0x08dba35c, 0x281e obj_pal 0x08dba35c, 0x281e
obj_pal 0x08dba4a0, 0x281f obj_pal 0x08dba4a0, 0x281f
@@ -900,7 +878,7 @@ gUnknown_08525CB4:: @ 8525CB4
obj_pal 0x08c1bf5c, 0x2830 obj_pal 0x08c1bf5c, 0x2830
.align 2 .align 2
gUnknown_08525D54:: @ 8525D54 gBattleAnimBackgroundTable:: @ 8525D54
.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c .4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c .4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
.4byte 0x08d90074, 0x08d90d3c, 0x08d90d58 .4byte 0x08d90074, 0x08d90d3c, 0x08d90d58
@@ -928,105 +906,3 @@ gUnknown_08525D54:: @ 8525D54
.4byte 0x08c25bec, 0x08d91074, 0x08c26958 .4byte 0x08c25bec, 0x08d91074, 0x08c26958
.4byte 0x08c25bec, 0x08d91074, 0x08c26e54 .4byte 0x08c25bec, 0x08d91074, 0x08c26e54
.4byte 0x08c25bec, 0x08d91074, 0x08c27324 .4byte 0x08c25bec, 0x08d91074, 0x08c27324
.align 2
gUnknown_08525E98:: @ 8525E98
.4byte ma00_load_graphics
.4byte ma01_080728D0
.4byte ma02_instanciate_template
.4byte sub_80A3ECC
.4byte ma04_wait_countdown
.4byte sub_80A3F88
.4byte nullsub_6
.4byte nullsub_7
.4byte sub_80A3FC4
.4byte ma09_play_sound
.4byte sub_80A41D8
.4byte ma0B_0807324C
.4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
.4byte ma0D_reset_BLDCNT_and_BLDALPHA
.4byte ma0E_call
.4byte sub_80A4D00
.4byte ma10_080736AC
.4byte ma11_if_else
.4byte ma12_cond_if
.4byte ma13_goto
.4byte ma14_load_background
.4byte ma15_load_battle_screen_elements
.4byte ma16_wait_for_battle_screen_elements_s2
.4byte sub_80A5124
.4byte ma18_load_background_probably
.4byte ma19_08073BC8
.4byte ma1A_8073C00
.4byte ma1B_8073C2C
.4byte ma1C_8073ED0
.4byte ma1D_08073FB4
.4byte ma1E_set_BLDCNT
.4byte sub_80A57F8
.4byte ma20_wait_for_something
.4byte ma21_08074164
.4byte sub_80A4A18
.4byte ma23_8073484
.4byte sub_80A5944
.4byte sub_80A4E5C
.4byte sub_80A5508
.4byte sub_80A559C
.4byte sub_80A5984
.4byte sub_80A59DC
.4byte sub_80A5A0C
.4byte ma2B_make_side_invisible
.4byte ma2C_make_side_visible
.4byte sub_80A5AFC
.4byte sub_80A5BAC
.4byte ma2F_stop_music
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
.align 2
@ the mother of all baserom includes
.incbin "baserom.gba", 0x525fd0, 0x18f60
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
data/event_scripts.s
+1 -2
View File
@@ -12,8 +12,7 @@ gScriptCmdTableEnd:: @ 81DBA08
gSpecialVars:: @ 81DBA0C gSpecialVars:: @ 81DBA0C
.incbin "baserom.gba", 0x1dba0c, 0x58 .incbin "baserom.gba", 0x1dba0c, 0x58
gSpecials:: @ 81DBA64 .include "data/specials.inc"
.incbin "baserom.gba", 0x1dba64, 0x83c
gStdScripts:: @ 81DC2A0 gStdScripts:: @ 81DC2A0
.incbin "baserom.gba", 0x1dc2a0, 0x2c .incbin "baserom.gba", 0x1dc2a0, 0x2c
data/rom_8525F58.s
+57
View File
@@ -0,0 +1,57 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
.align 2
@ the mother of all baserom includes
.incbin "baserom.gba", 0x525fd0, 0x18f60
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
data/specials.inc
+537
View File
@@ -0,0 +1,537 @@
.macro def_special ptr
.set SPECIAL_\ptr, __special__
.set __special__, __special__ + 1
.4byte \ptr
.endm
.set __special__, 0
.align 2
gSpecials:: @ 81DBA64
def_special sp000_heal_pokemon
def_special sub_809D2BC
def_special sub_80AF948
def_special sub_80AF9F8
def_special sub_80B36EC
def_special sub_80B371C
def_special sub_80E8E18
def_special sub_80E8BC8
def_special sub_80E9068
def_special sub_80E9A90
def_special sub_80E9AC0
def_special sub_80E9744
def_special sub_80E9BDC
def_special sub_80E9C2C
def_special sub_80E9C74
def_special sub_80E9C88
def_special sub_80EA2E4
def_special sub_80EA354
def_special sub_80E933C
def_special sub_8127E18
def_special sub_81297AC
def_special sub_80E8C98
def_special sub_80E95D4
def_special sub_8129708
def_special sub_80E91F8
def_special sub_80EA30C
def_special sub_80FA57C
def_special sub_80E6BE8
def_special sub_80B2DA4
def_special sub_80B2E4C
def_special sub_80B2E74
def_special sub_80B2EA8
def_special sub_80097E8
def_special sub_80B3968
def_special sub_80B3924
def_special nullsub_37
def_special sub_80B3254
def_special sub_80B2FD8
def_special sub_8138240
def_special SpawnLinkPartnerFieldObject
def_special copy_player_party_to_sav1
def_special copy_player_party_from_sav1
def_special sub_80F9438
def_special sp02A_crash_sound
def_special FieldObjectInteractionGetBerryTreeData
def_special FieldObjectInteractionGetBerryName
def_special FieldObjectInteractionGetBerryCountString
def_special Bag_ChooseBerry
def_special FieldObjectInteractionPlantBerryTree
def_special FieldObjectInteractionPickBerryTree
def_special FieldObjectInteractionRemoveBerryTree
def_special FieldObjectInteractionWaterBerryTree
def_special PlayerHasBerries
def_special IsEnigmaBerryValid
def_special sub_80B170C
def_special sub_80B1A14
def_special special_trainer_unable_to_battle
def_special check_trainer_flag
def_special sub_80B45AC
def_special SetUpTrainerEncounterMusic
def_special sub_80B226C
def_special sub_80B22A0
def_special sub_80B19EC
def_special sub_80C7578
def_special sub_80F92F8
def_special TurnOffTVScreen
def_special DoTVShow
def_special DoPokeNews
def_special special_0x44
def_special special_0x45
def_special InterviewBefore
def_special InterviewAfter
def_special sub_80EF8F8
def_special SetContestCategoryStringVarForInterview
def_special special_0x4a
def_special TV_IsScriptShowKindAlreadyInQueue
def_special CheckForBigMovieOrEmergencyNewsOnTV
def_special GetMomOrDadStringForTVMessage
def_special ResetTVShowState
def_special sub_80F831C
def_special sub_80F84B0
def_special sub_80F8814
def_special sub_80F834C
def_special sub_80F8390
def_special sub_80F8850
def_special sub_80F82B4
def_special sub_80F87D8
def_special sub_80F7F30
def_special sub_80F8970
def_special sub_80F8AFC
def_special sub_80F82FC
def_special sub_80F7F7C
def_special sub_80F7FFC
def_special sub_80F8D24
def_special sub_80F8C7C
def_special sub_80B3000
def_special sub_809FF80
def_special sub_80FAFF8
def_special easy_chat_input_maybe
def_special sub_811EECC
def_special sub_81201DC
def_special sub_81201F4
def_special sub_8120210
def_special sub_8120358
def_special sub_8120374
def_special sub_812038C
def_special sub_8120340
def_special sub_8120B5C
def_special sub_81203FC
def_special sub_81203C4
def_special sub_81213B0
def_special sub_812139C
def_special sub_8121388
def_special sub_81213D8
def_special sub_8121450
def_special sub_8121424
def_special sub_8133EC0
def_special sub_8133CD8
def_special sub_8133CF4
def_special sub_8133D2C
def_special sub_8133D8C
def_special sub_8133E38
def_special GetSeedotSizeRecordInfo
def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo
def_special CompareLotadSize
def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special sub_8122998
def_special sub_81229C8
def_special sub_811EF6C
def_special sub_8122A30
def_special sub_80D6EDC
def_special CalculatePlayerPartyCount
def_special sub_80C7008
def_special sub_80C70AC
def_special sub_80F88E8
def_special sub_80F88DC
def_special sub_80F8864
def_special sub_80F8940
def_special ShowContestWinner
def_special sub_8138540
def_special sub_81384F0
def_special sub_8138AC0
def_special DrawWholeMapView
def_special sub_8138AD0
def_special sub_8138750
def_special sub_81388E4
def_special sub_8138AA4
def_special sub_8138AF0
def_special sub_8138B10
def_special sub_8138B48
def_special sub_8138BC8
def_special sub_8138B8C
def_special sub_814FC9C
def_special sub_8085784
def_special Special_StartWallClock
def_special Special_ViewWallClock
def_special sub_80B1138
def_special sub_80B086C
def_special ChangePokemonNickname
def_special sub_81B94B0
def_special sub_8136EF4
def_special sub_807FA80
def_special sub_8142BC8
def_special sub_813BD60
def_special sub_813BCA8
def_special sub_813BDB4
def_special sub_813BA30
def_special sub_813BCE8
def_special sub_813BF60
def_special sub_813BA60
def_special sub_813BF7C
def_special rock_smash_wild_pokemon_encounter
def_special GabbyAndTyGetBattleNum
def_special GabbyAndTyAfterInterview
def_special GabbyAndTyBeforeInterview
def_special DoTVShowInSearchOfTrainers
def_special IsTVShowInSearchOfTrainersAiring
def_special GabbyAndTyGetLastQuote
def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
def_special sub_8138B80
def_special sp0B5_daycare
def_special sp0B6_daycare
def_special sub_8070728
def_special sp0B8_daycare
def_special sp0B9_daycare_relationship_comment
def_special sub_8070C58
def_special daycare_send_selected_pokemon
def_special sub_8071330
def_special sub_80712C0
def_special sub_806FF30
def_special sub_806FED8
def_special sub_806FDC4
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8071614
def_special sub_813C4BC
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special sub_80F972C
def_special sp0C8_whiteout_maybe
def_special sub_80FBE90
def_special sub_80FBED0
def_special sub_8137F90
def_special sub_8137FB0
def_special EnterSafariMode
def_special ExitSafariMode
def_special GetPokeblockFeederInFront
def_special sub_8135908
def_special sub_813793C
def_special sub_8137988
def_special sub_8137A0C
def_special sub_8137A4C
def_special sub_8137C10
def_special sp0D9_ComputerRelated
def_special sub_8138E20
def_special sub_8139994
def_special sub_8138EC0
def_special sub_8138FAC
def_special sub_81B951C
def_special sub_81B968C
def_special sub_81B9770
def_special sub_81B9718
def_special sub_81B96D0
def_special sub_8160638
def_special sub_8137EFC
def_special sub_8137D0C
def_special sp0E3_walkrun_bitfield_interpretation
def_special sub_8137E6C
def_special sub_8137F44
def_special sub_8138C04
def_special sub_81A1780
def_special sub_8161F74
def_special sub_818E9AC
def_special sub_8195960
def_special sub_8165360
def_special sub_8163AC4
def_special sub_81A5238
def_special sub_81A5E74
def_special sub_81A703C
def_special sub_81A8E7C
def_special StopMapMusic
def_special sub_81B99B4
def_special sub_81B9B80
def_special sub_81B9D08
def_special sub_80F9490
def_special sub_81652B4
def_special sub_8139228
def_special sub_80F94E8
def_special sub_816AE58
def_special sub_816AE98
def_special sub_8138C94
def_special sub_807E73C
def_special sub_807EA10
def_special sub_807F0E4
def_special sub_807E9D4
def_special sub_8138BDC
def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket
def_special ShowBerryBlenderRecordWindow
def_special sub_8138FEC
def_special sub_8138FD4
def_special sp109_CreatePCMenu
def_special sub_8137C28
def_special sub_8137CB4
def_special sub_8139004
def_special sub_8139030
def_special sub_813905C
def_special sub_8139088
def_special sub_81390B4
def_special sub_80FB7A4
def_special DoSoftReset
def_special sub_8137734
def_special sub_8139A78
def_special nullsub_55
def_special SpawnScriptFieldObject
def_special RemoveScriptFieldObject
def_special sub_81391D0
def_special sub_8139200
def_special CheckRelicanthWailord
def_special ShouldDoBrailleStrengthEffectOld
def_special sub_80B0534
def_special sub_80B058C
def_special sub_81379F8
def_special sub_8139238
def_special sub_8139248
def_special player_get_direction_lower_nybble
def_special sub_81392AC
def_special sub_81392D4
def_special sub_81392F8
def_special sub_8139320
def_special sub_8139348
def_special sub_8139370
def_special sub_81393C8
def_special sub_8098574
def_special sub_809859C
def_special InitRoamer
def_special sub_81393FC
def_special sub_81390E0
def_special sub_80AFC60
def_special sub_813946C
def_special sub_81394D8
def_special sub_80E980C
def_special sub_8139530
def_special DoSealedChamberShakingEffect1
def_special sub_8139B60
def_special sub_80FAC78
def_special sub_8139540
def_special sub_809E1C8
def_special sub_8139560
def_special sub_80B0A18
def_special sub_80B0934
def_special sub_80B0A74
def_special sub_80B16D8
def_special DoSealedChamberShakingEffect2
def_special sub_8139634
def_special sub_80AC81C
def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp
def_special sub_80F8D28
def_special sub_80F8EB8
def_special sub_8162794
def_special sub_80B08EC
def_special sub_8139648
def_special sub_8139668
def_special sub_80F8FA0
def_special sub_81396E0
def_special sub_81B98DC
def_special nullsub_54
def_special sub_80E9B70
def_special copy_bags_and_unk_data_from_save_blocks
def_special sub_80B05B4
def_special sub_8139754
def_special sub_813970C
def_special sub_80C08E4
def_special sub_8139770
def_special sub_81397C4
def_special sub_81653CC
def_special sub_80F9370
def_special sub_80F8FE8
def_special sub_81AFDD0
def_special sub_80EDCE8
def_special sub_80EE2CC
def_special sub_80EE72C
def_special sub_80EE7C0
def_special nullsub_55
def_special PutFanClubSpecialOnTheAir
def_special sub_80EED10
def_special sub_80EED34
def_special sub_80EB1AC
def_special sub_80EBE7C
def_special sub_80EB300
def_special sub_80EB438
def_special sub_80EB368
def_special sub_80EB3D0
def_special sub_80EB290
def_special sub_80EB2C8
def_special sub_80EB56C
def_special sub_80EB9E0
def_special sub_80EBB28
def_special sub_80EB498
def_special sub_818D9C0
def_special sub_818DAEC
def_special sub_818DBE8
def_special sub_818DC2C
def_special sub_818DC60
def_special sub_818DCC8
def_special sub_818DD14
def_special sub_818DD54
def_special sub_818DD78
def_special sub_818DE44
def_special sub_818DE5C
def_special sub_818DEA0
def_special sub_818DEDC
def_special sub_818E038
def_special sub_818E06C
def_special sub_818E2D8
def_special sub_811A858
def_special sub_818E2FC
def_special sub_818E308
def_special sub_818E358
def_special sub_818E37C
def_special sub_818E298
def_special sub_818E39C
def_special sub_818E3BC
def_special sub_818E3E0
def_special sub_818E430
def_special sub_818E47C
def_special sub_818E490
def_special sub_813986C
def_special sub_818E4A4
def_special sub_818E510
def_special sub_818E538
def_special sub_818E274
def_special sub_818E3EC
def_special sub_818E8E0
def_special sub_818E8B4
def_special sub_818E914
def_special sub_818E92C
def_special sub_818E940
def_special sub_818E960
def_special sub_818E990
def_special PutLilycoveContestLadyShowOnTheAir
def_special sub_813B880
def_special sub_81A085C
def_special CheckIfMultipleTrainersWantBattle
def_special AddMapNamePopUpWindowTask
def_special AddMapNamePopUpWindowTask
def_special sub_81BE994
def_special sub_81BE79C
def_special sub_81BE7F4
def_special sub_81398C0
def_special sub_80093CC
def_special BerryBlenderLinkBecomeLeader
def_special BerryBlenderLinkJoinGroup
def_special UnionRoomSpecial
def_special sub_801A42C
def_special sub_8016934
def_special sp182_move_string
def_special sub_801DC20
def_special sub_81B8958
def_special sub_8018090
def_special sub_813990C
def_special sub_801B27C
def_special HasAtLeastOneBerry
def_special sub_802C920
def_special sub_802E3C4
def_special sub_8027A5C
def_special sub_8027AAC
def_special sub_8139980
def_special sub_81399F4
def_special sub_8139D98
def_special sub_80F905C
def_special sub_800B518
def_special sub_80F90DC
def_special sub_80F910C
def_special sub_80F9160
def_special sub_81A4AA0
def_special sub_81A4AE8
def_special sub_8139F20
def_special sub_80F9134
def_special sub_80F9154
def_special sub_80B3028
def_special sub_813A128
def_special sub_813A630
def_special sub_813A080
def_special sub_81C6A94
def_special sub_81C4F24
def_special sub_81B95E0
def_special sub_81B9620
def_special sub_813A76C
def_special sub_813A7B8
def_special sub_813A958
def_special sub_813A8FC
def_special sub_813A988
def_special sub_813A9D0
def_special sub_813A9A4
def_special sub_813AA04
def_special sub_813AA18
def_special sub_813AA44
def_special sub_80248B0
def_special sub_8024918
def_special sub_80246D4
def_special sub_802477C
def_special sub_802488C
def_special sub_813A820
def_special sub_813A854
def_special sub_813B7D8
def_special sub_81C72A4
def_special sp106_CreateStartMenu
def_special sub_80C2E40
def_special sub_813AC7C
def_special sub_813ADB8
def_special sub_813ADD4
def_special sub_81B892C
def_special sub_813AEB4
def_special sub_813AF48
def_special sub_813AFC8
def_special sub_813B1D0
def_special DoScriptedWildBattle
def_special sub_81BEB54
def_special sub_81BEB68
def_special sub_81BEB7C
def_special ChangeBoxPokemonNickname
def_special get_unknown_box_id
def_special sub_813B21C
def_special sub_81D1C20
def_special sub_8175280
def_special sub_813B2E4
def_special sub_813B374
def_special sub_813B490
def_special sub_80A08CC
def_special sub_813B484
def_special sub_81AFDA0
def_special sub_813B4E0
def_special ShouldDoBrailleRegicePuzzle
def_special EnableNationalPokedex
def_special sub_80E2548
def_special sub_80E2878
def_special TurnOnTVScreen
def_special sub_81D4A90
def_special sub_813B514
def_special sub_813B568
def_special sub_813B534
def_special sp194_trainer_tower
def_special sub_813B7D8
def_special sub_813B80C
def_special sub_81D4BEC
def_special sub_80224D0
def_special sub_81D99BC
def_special walda_maybe
def_special sub_81D9AC4
def_special sub_8139ED0
def_special sub_813B968
def_special sub_80F8B94
def_special sub_813C904
def_special sub_80B4808
def_special sub_813B9A0
def_special sub_81B9918
def_special sub_80722E0
def_special sub_80B45D0
def_special sub_813C5A0
def_special sub_8139C10
def_special sub_80B3BC4
include/battle.h
+13 -1
View File
@@ -27,7 +27,9 @@
#define BIT_SIDE 0x1 #define BIT_SIDE 0x1
#define BIT_MON 0x2 #define BIT_MON 0x2
#define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank]))
#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE)) #define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE))
#define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE))
#define BATTLE_TYPE_DOUBLE 0x0001 #define BATTLE_TYPE_DOUBLE 0x0001
#define BATTLE_TYPE_LINK 0x0002 #define BATTLE_TYPE_LINK 0x0002
@@ -655,7 +657,9 @@ struct BattleStruct
u8 field_1A1; u8 field_1A1;
bool8 overworldWeatherDone; bool8 overworldWeatherDone;
u8 atkCancellerTracker; u8 atkCancellerTracker;
u8 field_1A4[240]; u8 field_1A4[96];
u8 field_204[104];
u8 field_26C[40];
u8 field_294[4]; u8 field_294[4];
u8 field_298[8]; u8 field_298[8];
u8 field_2A0; u8 field_2A0;
@@ -826,6 +830,7 @@ void LoadBattleTextboxAndBackground(void);
void LoadBattleEntryBackground(void); void LoadBattleEntryBackground(void);
void ApplyPlayerChosenFrameToBattleMenu(void); void ApplyPlayerChosenFrameToBattleMenu(void);
bool8 LoadChosenBattleElement(u8 caseId); bool8 LoadChosenBattleElement(u8 caseId);
void DrawMainBattleBackground(void);
void task00_0800F6FC(u8 taskId); void task00_0800F6FC(u8 taskId);
// battle_5 // battle_5
@@ -903,6 +908,8 @@ struct BattleHealthboxInfo
u8 flag_x1 : 1; u8 flag_x1 : 1;
u8 flag_x2 : 1; u8 flag_x2 : 1;
u8 flag_x4 : 1; u8 flag_x4 : 1;
u8 flag_x8 : 1;
u8 flag_x10 : 1;
u8 field_1; u8 field_1;
u8 field_2; u8 field_2;
u8 field_3; u8 field_3;
@@ -935,6 +942,11 @@ struct BattleSpriteData
extern struct BattleSpriteData *gBattleSpritesDataPtr; extern struct BattleSpriteData *gBattleSpritesDataPtr;
#define BATTLE_BUFFER_LINK_SIZE 0x1000
extern u8 *gLinkBattleSendBuffer;
extern u8 *gLinkBattleRecvBuffer;
// Move this somewhere else // Move this somewhere else
#include "sprite.h" #include "sprite.h"
include/battle_2.h
+2
View File
@@ -17,6 +17,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void);
void RunBattleScriptCommands(void); void RunBattleScriptCommands(void);
u32 sub_80397C4(u32 setId, u32 tableId); u32 sub_80397C4(u32 setId, u32 tableId);
void sub_8039E9C(struct Sprite *sprite); void sub_8039E9C(struct Sprite *sprite);
void nullsub_20(void);
void BeginBattleIntro(void);
extern const u8 gStatusConditionString_PoisonJpn[8]; extern const u8 gStatusConditionString_PoisonJpn[8];
extern const u8 gStatusConditionString_SleepJpn[8]; extern const u8 gStatusConditionString_SleepJpn[8];
include/battle_anim.h
+79
View File
@@ -0,0 +1,79 @@
#ifndef GUARD_BATTLE_ANIM_H
#define GUARD_BATTLE_ANIM_H
enum
{
ANIM_BANK_ATTACKER,
ANIM_BANK_TARGET,
ANIM_BANK_ATK_PARTNER,
ANIM_BANK_DEF_PARTNER,
};
enum
{
BG_ANIM_SCREEN_SIZE,
BG_ANIM_AREA_OVERFLOW_MODE,
BG_ANIM2,
BG_ANIM3,
BG_ANIM_PRIORITY,
BG_ANIM_5,
BG_ANIM_6
};
struct UnknownAnimStruct2
{
void *unk0;
u16 *unk4;
u8 unk8;
u8 unk9;
u16 unkA;
u16 unkC;
};
struct BattleAnimBackground
{
void *image;
void *palette;
void *tilemap;
};
#define ANIM_ARGS_COUNT 8
#define PAN_ATTACKER_PLAYER -64
#define PAN_ATTACKER_OPPONENT 63
extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount;
extern u8 gAnimSoundTaskCount;
extern struct DisableStruct *gAnimDisableStructPtr;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
extern u8 gAnimMoveTurn;
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT];
extern u8 gUnknown_02038440;
void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move);
void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
void DestroyAnimSprite(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 taskId);
void DestroyAnimSoundTask(u8 taskId);
bool8 IsAnimBankSpriteVisible(u8 bank);
void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible);
bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan);
s16 sub_80A52EC(s16 a);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
// battle_anim_80FE840.s
void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 bankIdentity, u8 arg4, void *arg5, u16 *arg6, u16 arg7);
#endif // GUARD_BATTLE_ANIM_H
include/battle_controller_player.h
-7
View File
@@ -1,7 +0,0 @@
#ifndef GUARD_BATTLE_CONTROLLER_PLAYER_H
#define GUARD_BATTLE_CONTROLLER_PLAYER_H
void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused);
void ActionSelectionDestroyCursorAt(u8 cursorPos);
#endif // GUARD_BATTLE_CONTROLLER_PLAYER_H
include/battle_controllers.h
+149 -33
View File
@@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_CONTROLLERS_H #ifndef GUARD_BATTLE_CONTROLLERS_H
#define GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H
#include "battle_controller_player.h"
#define REQUEST_ALL_BATTLE 0x0 #define REQUEST_ALL_BATTLE 0x0
#define REQUEST_SPECIES_BATTLE 0x1 #define REQUEST_SPECIES_BATTLE 0x1
#define REQUEST_HELDITEM_BATTLE 0x2 #define REQUEST_HELDITEM_BATTLE 0x2
@@ -48,44 +46,162 @@ struct ChooseMoveStruct
u8 monType2; u8 monType2;
}; };
// rom3.s, emitters enum
void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data); {
void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct* disableStructPtr, u8 multihit); CONTROLLER_GETMONDATA,
void EmitHealthBarUpdate(u8 bufferId, u16 hpValue); CONTROLLER_GETRAWMONDATA,
void EmitEffectivenessSound(u8 bufferId, u16 songId); CONTROLLER_SETMONDATA,
void EmitPlaySound(u8 bufferId, u16 songId, u8 arg2); CONTROLLER_SETRAWMONDATA,
void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId); CONTROLLER_LOADMONSPRITE,
void EmitFaintAnimation(u8 bufferId); CONTROLLER_SWITCHINANIM,
void Emit_x2A(u8 bufferId); CONTROLLER_RETURNMONTOBALL,
void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints); CONTROLLER_DRAWTRAINERPIC,
void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); CONTROLLER_TRAINERSLIDE,
void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); CONTROLLER_TRAINERSLIDEBACK,
void EmitReturnPokeToBall(u8 bufferId, u8 arg1); CONTROLLER_FAINTANIMATION,
CONTROLLER_11,
CONTROLLER_12,
CONTROLLER_BALLTHROW,
CONTROLLER_PAUSE,
CONTROLLER_MOVEANIMATION,
CONTROLLER_PRINTSTRING,
CONTROLLER_PRINTSTRINGPLAYERONLY,
CONTROLLER_CHOOSEACTION,
CONTROLLER_19,
CONTROLLER_CHOOSEMOVE,
CONTROLLER_OPENBAG,
CONTROLLER_CHOOSEPOKEMON,
CONTROLLER_23,
CONTROLLER_HEALTHBARUPDATE,
CONTROLLER_EXPUPDATE,
CONTROLLER_STATUSICONUPDATE,
CONTROLLER_STATUSANIMATION,
CONTROLLER_STATUSXOR,
CONTROLLER_DATATRANSFER,
CONTROLLER_DMA3TRANSFER,
CONTROLLER_31,
CONTROLLER_32,
CONTROLLER_33,
CONTROLLER_34,
CONTROLLER_35,
CONTROLLER_36,
CONTROLLER_37,
CONTROLLER_38,
CONTROLLER_39,
CONTROLLER_40,
CONTROLLER_HITANIMATION,
CONTROLLER_42,
CONTROLLER_EFFECTIVENESSSOUND,
CONTROLLER_PLAYFANFAREORBGM,
CONTROLLER_FAINTINGCRY,
CONTROLLER_INTROSLIDE,
CONTROLLER_INTROTRAINERBALLTHROW,
CONTROLLER_DRAWPARTYSTATUSSUMMARY,
CONTROLLER_49,
CONTROLLER_50,
CONTROLLER_SPRITEINVISIBILITY,
CONTROLLER_BATTLEANIMATION,
CONTROLLER_LINKSTANDBYMSG,
CONTROLLER_RESETACTIONMOVESELECTION,
CONTROLLER_55,
CONTROLLER_56
};
#define LAST_CONTROLLER_CMD_ID CONTROLLER_56 + 1
// general functions
void HandleLinkBattleSetup(void);
void SetUpBattleVarsAndBirchZigzagoon(void);
void sub_8032768(void);
void sub_8033648(void);
void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
// emitters
void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2); void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
void EmitLoadMonSprite(u8 bufferId);
void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit); void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4); void EmitReturnMonToBall(u8 bufferId, u8 arg1);
void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2); void EmitDrawTrainerPic(u8 bufferId);
void EmitTrainerSlide(u8 bufferId); void EmitTrainerSlide(u8 bufferId);
void EmitTrainerSlideBack(u8 bufferId); void EmitTrainerSlideBack(u8 bufferId);
void EmitFaintingCry(u8 bufferId); void EmitFaintAnimation(u8 bufferId);
void Emit_x37(u8 bufferId, u8 arg1); void EmitCmd11(u8 bufferId); // unused
void EmitCmd12(u8 bufferId); // unused
void EmitBallThrow(u8 bufferId, u8 caseId);
void EmitPause(u8 bufferId, u8 toWait, void *data); // unused
void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit);
void EmitPrintString(u8 bufferId, u16 stringId);
void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId);
void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void EmitCmd19(u8 bufferId);
void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
void EmitOpenBag(u8 bufferId, u8* arg1);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
void EmitCmd23(u8 bufferId); // unused
void EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
void EmitStatusXor(u8 bufferId, u8 b); // unused
void EmitDataTransfer(u8 bufferId, u16 size, void *data);
void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused
void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter); // unused
void EmitCmd32(u8 bufferId, u16 size, void *c); // unused
void EmitCmd33(u8 bufferId, u8 arg1, u16 arg2);
void EmitCmd34(u8 bufferId, u8 b, u8 *c);
void EmitCmd35(u8 bufferId, u16 b);
void EmitCmd36(u8 bufferId, u16 b);
void EmitCmd37(u8 bufferId);
void EmitCmd38(u8 bufferId, u8 b);
void EmitCmd39(u8 bufferId);
void EmitCmd40(u8 bufferId);
void EmitHitAnimation(u8 bufferId); void EmitHitAnimation(u8 bufferId);
void EmitCmd42(u8 bufferId);
void EmitEffectivenessSound(u8 bufferId, u16 songId);
void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
void EmitFaintingCry(u8 bufferId);
void EmitIntroSlide(u8 bufferId, u8 terrainId);
void EmitIntroTrainerBallThrow(u8 bufferId);
void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2); void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
void EmitCmd49(u8 bufferId); void EmitCmd49(u8 bufferId);
void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status); void EmitCmd50(u8 bufferId);
void EmitCmd13(u8 bufferId); void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2); void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
void EmitIntroSlide(u8 bufferId, u8 terrainId); void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
void EmitDrawTrainerPic(u8 bufferId);
void EmitLoadMonSprite(u8 bufferId);
void EmitIntroTrainerBallThrow(u8 bufferId);
void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct* movePpData);
void EmitOpenBag(u8 bufferId, u8* arg1);
void Emit_x32(u8 bufferId);
void EmitPrintString(u8 bufferId, u16 stringId);
void EmitResetActionMoveSelection(u8 bufferId, u8 caseId); void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
void EmitBallThrow(u8 bufferId, u8 caseId); void EmitCmd55(u8 bufferId, u8 arg1);
void EmitCmd_x21(u8 bufferId, u8 arg1, u16 arg2);
// player controller
void SetBankFuncToPlayerBufferRunCommand(void);
void nullsub_21(void);
void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused);
void ActionSelectionDestroyCursorAt(u8 cursorPos);
// recorded player controller
void SetBankFuncToRecordedPlayerBufferRunCommand(void);
// opponent controller
void SetBankFuncToOpponentBufferRunCommand(void);
// player partner controller
void SetBankFuncToPlayerPartnerBufferRunCommand(void);
// safari controller
void SetBankFuncToSafariBufferRunCommand(void);
// wally controller
void SetBankFuncToWallyBufferRunCommand(void);
// recorded opponent controller
void SetBankFuncToRecordedOpponentBufferRunCommand(void);
// link opponent
void SetBankFuncToLinkOpponentBufferRunCommand(void);
// link partner
void SetBankFuncToLinkPartnerBufferRunCommand(void);
#endif // GUARD_BATTLE_CONTROLLERS_H #endif // GUARD_BATTLE_CONTROLLERS_H
include/battle_interface.h
+2
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_BATTLE_INTERFACE_H #ifndef GUARD_BATTLE_INTERFACE_H
#define GUARD_BATTLE_INTERFACE_H #define GUARD_BATTLE_INTERFACE_H
#include "battle_controllers.h"
#define TAG_HEALTHBOX_PLAYER1_TILE 0xD6FF #define TAG_HEALTHBOX_PLAYER1_TILE 0xD6FF
#define TAG_HEALTHBOX_PLAYER2_TILE 0xD700 #define TAG_HEALTHBOX_PLAYER2_TILE 0xD700
#define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701 #define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701
include/battle_util.h
+1
View File
@@ -33,6 +33,7 @@
#define ITEMEFFECT_ON_SWITCH_IN 0x0 #define ITEMEFFECT_ON_SWITCH_IN 0x0
#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)))
#define BS_GET_TARGET 0 #define BS_GET_TARGET 0
#define BS_GET_ATTACKER 1 #define BS_GET_ATTACKER 1
include/contest.h
+27 -4
View File
@@ -1,7 +1,8 @@
#ifndef GUARD_CONTEST_H #ifndef GUARD_CONTEST_H
#define GUARD_CONTEST_H #define GUARD_CONTEST_H
struct ContestStruct_02039E00 { struct ContestStruct_02039E00
{
u16 unk_00; u16 unk_00;
u8 unk_02[11]; u8 unk_02[11];
u8 unk_0d[8]; u8 unk_0d[8];
@@ -11,8 +12,30 @@ struct ContestStruct_02039E00 {
extern struct ContestStruct_02039E00 gUnknown_02039E00[4]; extern struct ContestStruct_02039E00 gUnknown_02039E00[4];
extern u8 gUnknown_02039F24; extern u8 gUnknown_02039F24;
extern EWRAM_DATA u16 gScriptContestCategory; extern u16 gScriptContestCategory;
extern EWRAM_DATA u8 gUnknown_02039F2E; extern u8 gUnknown_02039F2E;
extern EWRAM_DATA u8 gUnknown_02039F30; extern u8 gUnknown_02039F30;
struct ContestStruct_field_18
{
// unknown size
u16 field_0;
};
struct ContestResources
{
void *field_0;
void *field_4;
void *field_8;
void *field_C;
void *field_10;
void *field_14;
struct ContestStruct_field_18 *field_18;
};
extern struct ContestResources *gContestResources;
bool8 IsSpeciesNotUnown(u16 species);
void LoadContestBgAfterMoveAnim(void);
#endif //GUARD_CONTEST_H #endif //GUARD_CONTEST_H
include/gba/io_reg.h
+2
View File
@@ -521,6 +521,8 @@
#define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled #define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled
#define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled #define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled
// BLDCNT
// SOUNDCNT_H // SOUNDCNT_H
#define SOUND_CGB_MIX_QUARTER 0x0000 #define SOUND_CGB_MIX_QUARTER 0x0000
#define SOUND_CGB_MIX_HALF 0x0001 #define SOUND_CGB_MIX_HALF 0x0001
include/link.h
+7
View File
@@ -141,6 +141,7 @@ extern u8 gShouldAdvanceLinkState;
extern struct LinkPlayer gLinkPlayers[]; extern struct LinkPlayer gLinkPlayers[];
extern u16 word_3002910[]; extern u16 word_3002910[];
extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gReceivedRemoteLinkPlayers;
extern bool8 gLinkVSyncDisabled;
void Task_DestroySelf(u8); void Task_DestroySelf(u8);
void OpenLink(void); void OpenLink(void);
@@ -184,5 +185,11 @@ bool8 sub_800A520(void);
bool8 sub_8010500(void); bool8 sub_8010500(void);
void sub_800DFB4(u8, u8); void sub_800DFB4(u8, u8);
void sub_800ADF8(void); void sub_800ADF8(void);
void sub_800B488(void);
void sub_8009734(void);
void sub_800A620(void);
void sub_8011BD0(void);
u8 sub_800ABAC(void);
u8 sub_800ABBC(void);
#endif // GUARD_LINK_H #endif // GUARD_LINK_H
include/recorded_battle.h
+3
View File
@@ -3,6 +3,7 @@
extern u32 gRecordedBattleRngSeed; extern u32 gRecordedBattleRngSeed;
void sub_8184DA4(u8 arg0);
void sub_8185F84(void); void sub_8185F84(void);
void sub_8184E58(void); void sub_8184E58(void);
void RecordedBattle_SetBankAction(u8 bank, u8 action); void RecordedBattle_SetBankAction(u8 bank, u8 action);
@@ -15,5 +16,7 @@ u8 MoveRecordedBattleToSaveData(void);
void sub_818603C(u8); void sub_818603C(u8);
void sub_8185FD0(void); void sub_8185FD0(void);
void sub_8186444(void); void sub_8186444(void);
void sub_8185EB8(void);
u8 sub_81850DC(u8 *arg0);
#endif // GUARD_RECORDED_BATTLE_H #endif // GUARD_RECORDED_BATTLE_H
include/sprite.h
+1 -1
View File
@@ -251,7 +251,7 @@ void BuildOamBuffer(void);
u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); u8 CreateInvisibleSprite(void (*callback)(struct Sprite *));
u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
void DestroySprite(struct Sprite *sprite); void DestroySprite(struct Sprite *sprite);
void ResetOamRange(u8 a, u8 b); void ResetOamRange(u8 a, u8 b);
void LoadOam(void); void LoadOam(void);
ld_script.txt
+4 -2
View File
@@ -54,7 +54,7 @@ SECTIONS {
asm/link.o(.text); asm/link.o(.text);
src/rtc.o(.text); src/rtc.o(.text);
asm/main_menu.o(.text); asm/main_menu.o(.text);
asm/rom3.o(.text); src/battle_controllers.o(.text);
src/decompress.o(.text); src/decompress.o(.text);
asm/battle_1.o(.text); asm/battle_1.o(.text);
src/battle_2.o(.text); src/battle_2.o(.text);
@@ -113,7 +113,7 @@ SECTIONS {
src/tileset_anims.o(.text); src/tileset_anims.o(.text);
src/palette.o(.text); src/palette.o(.text);
src/sound.o(.text); src/sound.o(.text);
asm/battle_anim.o(.text); src/battle_anim.o(.text);
asm/rom_80A5C6C.o(.text); asm/rom_80A5C6C.o(.text);
src/task.o(.text); src/task.o(.text);
src/reshow_battle_screen.o(.text); src/reshow_battle_screen.o(.text);
@@ -364,6 +364,8 @@ SECTIONS {
src/palette.o(.rodata); src/palette.o(.rodata);
data/fanfares.o(.rodata); data/fanfares.o(.rodata);
data/battle_anims.o(.rodata); data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
data/rom_8525F58.o(.rodata);
data/title_screen.o(.rodata); data/title_screen.o(.rodata);
data/field_screen.o(.rodata); data/field_screen.o(.rodata);
data/battle_setup.o(.rodata); data/battle_setup.o(.rodata);
src/battle_2.c
+2 -5
View File
@@ -204,9 +204,6 @@ extern const u8 BattleScript_ActionSwitch[];
extern const u8 BattleScript_PrintFailedToRunString[]; extern const u8 BattleScript_PrintFailedToRunString[];
// functions // functions
extern void HandleLinkBattleSetup(void); // rom_3
extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3
extern void sub_8032768(void); // rom_3
extern void dp12_8087EA4(void); extern void dp12_8087EA4(void);
extern void sub_80356D0(void); extern void sub_80356D0(void);
extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
@@ -4083,7 +4080,7 @@ static void HandleTurnActionSelectionState(void)
if (gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS if (gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
|| gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE) || gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
{ {
Emit_x32(0); EmitCmd50(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
return; return;
} }
@@ -4111,7 +4108,7 @@ static void HandleTurnActionSelectionState(void)
{ {
RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3); RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3);
} }
Emit_x32(0); EmitCmd50(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
return; return;
} }
src/battle_ai_switch_items.c
+9 -9
View File
@@ -39,7 +39,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
&& gDisableStructs[gActiveBank].perishSong1 == 0) && gDisableStructs[gActiveBank].perishSong1 == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -121,7 +121,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -221,7 +221,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -241,13 +241,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1) if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1) else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -258,7 +258,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
if (Random() & 1) if (Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -426,7 +426,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0) if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd_x21(1, 2, 0); EmitCmd33(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -611,7 +611,7 @@ void AI_TrySwitchOrUseItem(void)
} }
} }
EmitCmd_x21(1, 0, (gActiveBank ^ BIT_SIDE) << 8); EmitCmd33(1, 0, (gActiveBank ^ BIT_SIDE) << 8);
} }
#define TYPE_FORESIGHT 0xFE #define TYPE_FORESIGHT 0xFE
@@ -940,7 +940,7 @@ static bool8 ShouldUseItem(void)
if (shouldUse) if (shouldUse)
{ {
EmitCmd_x21(1, 1, 0); EmitCmd33(1, 1, 0);
*(gBattleStruct->field_C0 + (gActiveBank / 2) * 2) = item; *(gBattleStruct->field_C0 + (gActiveBank / 2) * 2) = item;
gBattleResources->battleHistory->trainerItems[i] = 0; gBattleResources->battleHistory->trainerItems[i] = 0;
return shouldUse; return shouldUse;
src/battle_anim.c
+1850
View File
File diff suppressed because it is too large Load Diff
src/battle_controllers.c
+1551
View File
File diff suppressed because it is too large Load Diff
src/battle_script_commands.c
+17 -17
View File
@@ -349,7 +349,7 @@ static void atk51_switch_handle_order(void);
static void atk52_switch_in_effects(void); static void atk52_switch_in_effects(void);
static void atk53_trainer_slide(void); static void atk53_trainer_slide(void);
static void atk54_effectiveness_sound(void); static void atk54_effectiveness_sound(void);
static void atk55_play_sound(void); static void atk55_play_fanfare(void);
static void atk56_fainting_cry(void); static void atk56_fainting_cry(void);
static void atk57(void); static void atk57(void);
static void atk58_return_to_ball(void); static void atk58_return_to_ball(void);
@@ -601,7 +601,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
atk52_switch_in_effects, atk52_switch_in_effects,
atk53_trainer_slide, atk53_trainer_slide,
atk54_effectiveness_sound, atk54_effectiveness_sound,
atk55_play_sound, atk55_play_fanfare,
atk56_fainting_cry, atk56_fainting_cry,
atk57, atk57,
atk58_return_to_ball, atk58_return_to_ball,
@@ -5308,7 +5308,7 @@ static void atk4B_return_atk_to_ball(void)
gActiveBank = gBankAttacker; gActiveBank = gBankAttacker;
if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank))) if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
{ {
EmitReturnPokeToBall(0, 0); EmitReturnMonToBall(0, 0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
@@ -5627,7 +5627,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -5649,7 +5649,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -5670,7 +5670,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -5692,7 +5692,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -5755,7 +5755,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -5771,7 +5771,7 @@ static void atk50_openpartyscreen(void)
{ {
gAbsentBankFlags |= gBitTable[gActiveBank]; gAbsentBankFlags |= gBitTable[gActiveBank];
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
Emit_x2A(0); EmitCmd42(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
else if (!gSpecialStatuses[gActiveBank].flag40) else if (!gSpecialStatuses[gActiveBank].flag40)
@@ -6031,10 +6031,10 @@ static void atk54_effectiveness_sound(void)
gBattlescriptCurrInstr += 3; gBattlescriptCurrInstr += 3;
} }
static void atk55_play_sound(void) static void atk55_play_fanfare(void)
{ {
gActiveBank = gBankAttacker; gActiveBank = gBankAttacker;
EmitPlaySound(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), 0); EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
gBattlescriptCurrInstr += 3; gBattlescriptCurrInstr += 3;
@@ -6052,7 +6052,7 @@ static void atk56_fainting_cry(void)
static void atk57(void) static void atk57(void)
{ {
gActiveBank = GetBankByIdentity(0); gActiveBank = GetBankByIdentity(0);
Emit_x37(0, gBattleOutcome); EmitCmd55(0, gBattleOutcome);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
gBattlescriptCurrInstr += 1; gBattlescriptCurrInstr += 1;
@@ -6061,7 +6061,7 @@ static void atk57(void)
static void atk58_return_to_ball(void) static void atk58_return_to_ball(void)
{ {
gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]); gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
EmitReturnPokeToBall(0, 1); EmitReturnMonToBall(0, 1);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
gBattlescriptCurrInstr += 2; gBattlescriptCurrInstr += 2;
@@ -7137,7 +7137,7 @@ static void atk76_various(void)
gDisableStructs[1].truantUnknownBit = 1; gDisableStructs[1].truantUnknownBit = 1;
break; break;
case 13: case 13:
EmitCmd13(0); EmitCmd19(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
break; break;
case 14: case 14:
@@ -7162,7 +7162,7 @@ static void atk76_various(void)
gActiveBank = 1; gActiveBank = 1;
if (gBattleMons[gActiveBank].hp != 0) if (gBattleMons[gActiveBank].hp != 0)
{ {
EmitReturnPokeToBall(0, 0); EmitReturnMonToBall(0, 0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
break; break;
@@ -7172,7 +7172,7 @@ static void atk76_various(void)
gActiveBank = 3; gActiveBank = 3;
if (gBattleMons[gActiveBank].hp != 0) if (gBattleMons[gActiveBank].hp != 0)
{ {
EmitReturnPokeToBall(0, 0); EmitReturnMonToBall(0, 0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
} }
} }
@@ -7197,7 +7197,7 @@ static void atk76_various(void)
gBattleOutcome = BATTLE_OPPONENT_TELEPORTED; gBattleOutcome = BATTLE_OPPONENT_TELEPORTED;
break; break;
case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC: case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
EmitPlaySound(0, BGM_KACHI1, 1); EmitPlayFanfareOrBGM(0, BGM_KACHI1, TRUE);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
break; break;
} }
src/decompress.c
+1 -1
View File
@@ -465,7 +465,7 @@ u32 sub_8034974(void* ptr)
return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]); return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]);
} }
bool8 LoadCompressedObjectPicUsingHeap(struct CompressedSpriteSheet* src) bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src)
{ {
struct SpriteSheet dest; struct SpriteSheet dest;
void* buffer; void* buffer;
src/egg_hatch.c
+1 -1
View File
@@ -462,7 +462,7 @@ static void VBlankCB_EggHatch(void)
TransferPlttBuffer(); TransferPlttBuffer();
} }
static void EggHatch(void) void EggHatch(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
CreateTask(Task_EggHatch, 10); CreateTask(Task_EggHatch, 10);
src/safari_zone.c
+1 -1
View File
@@ -139,7 +139,7 @@ static void ClearAllPokeblockFeeders(void)
memset(sPokeblockFeeders, 0, sizeof(sPokeblockFeeders)); memset(sPokeblockFeeders, 0, sizeof(sPokeblockFeeders));
} }
static void GetPokeblockFeederInFront(void) void GetPokeblockFeederInFront(void)
{ {
s16 x, y; s16 x, y;
u16 i; u16 i;
src/sprite.c
+1 -1
View File
@@ -594,7 +594,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y,
return index; return index;
} }
u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority)
{ {
u8 i; u8 i;
sym_ewram.txt
+6 -74
View File
@@ -196,7 +196,7 @@ gUnknown_02022D0A: @ 2022D0A
gUnknown_02022D0C: @ 2022D0C gUnknown_02022D0C: @ 2022D0C
.space 0x4 .space 0x4
gUnknown_02022D10: @ 2022D10 gBattleBuffersTransferData: @ 2022D10
.space 0x100 .space 0x100
gUnknown_02022E10: @ 2022E10 gUnknown_02022E10: @ 2022E10
@@ -471,10 +471,10 @@ gBattleScripting: @ 2024474
gBattleStruct: @ 202449C gBattleStruct: @ 202449C
.space 0x4 .space 0x4
gUnknown_020244A0: @ 20244A0 gLinkBattleSendBuffer: @ 20244A0
.space 0x4 .space 0x4
gUnknown_020244A4: @ 20244A4 gLinkBattleRecvBuffer: @ 20244A4
.space 0x4 .space 0x4
gBattleResources: @ 20244A8 gBattleResources: @ 20244A8
@@ -713,77 +713,9 @@ gUnknown_02037622: @ 2037622
.include "src/tileset_anims.o" .include "src/tileset_anims.o"
.include "src/palette.o" .include "src/palette.o"
.include "src/sound.o" .include "src/sound.o"
.include "src/battle_anim.o"
.align 0x2
gBattleAnimScriptPtr: @ 20383F0 .align 2
.space 0x4
gBattleAnimScriptRetAddr: @ 20383F4
.space 0x4
gAnimScriptCallback: @ 20383F8
.space 0x4
gAnimFramesToWait: @ 20383FC
.space 0x1
gAnimScriptActive: @ 20383FD
.space 0x1
gAnimVisualTaskCount: @ 20383FE
.space 0x1
gAnimSoundTaskCount: @ 20383FF
.space 0x1
gDisableStructMoveAnim: @ 2038400
.space 0x4
gMoveDmgMoveAnim: @ 2038404
.space 0x4
gMovePowerMoveAnim: @ 2038408
.space 0x2
gAnimSpriteIndexArray: @ 203840A
.space 0x10
gHappinessMoveAnim: @ 203841A
.space 0x2
gWeatherMoveAnim: @ 203841C
.space 0x2
gBattleAnimArgs: @ 203841E
.space 0x10
gSoundAnimFramesToWait: @ 203842E
.space 0x2
gUnknown_02038430: @ 2038430
.space 0x2
gUnknown_02038432: @ 2038432
.space 0x1
gUnknown_02038433: @ 2038433
.space 0x1
gAnimMoveIndex: @ 2038434
.space 0x2
gAnimationBankAttacker: @ 2038436
.space 0x1
gAnimationBankTarget: @ 2038437
.space 0x1
gUnknown_02038438: @ 2038438
.space 0x8
gUnknown_02038440: @ 2038440
.space 0x4
gUnknown_02038444: @ 2038444 gUnknown_02038444: @ 2038444
.space 0x10 .space 0x10
@@ -1058,7 +990,7 @@ gUnknown_02039F30: @ 2039F30
gUnknown_02039F31: @ 2039F31 gUnknown_02039F31: @ 2039F31
.space 0x3 .space 0x3
gUnknown_02039F34: @ 2039F34 gContestResources: @ 2039F34
.space 0x4 .space 0x4
gUnknown_02039F38: @ 2039F38 gUnknown_02039F38: @ 2039F38