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

Merge branch 'master' of github.com:pret/pokeemerald

Browse Source
This commit is contained in:
Diegoisawesome
2017-10-21 20:20:52 -05:00
parent 667914075b afd42c8e14
commit b8f23aa20d
194 changed files with 13648 additions and 24632 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
+25 -25
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
@@ -1801,7 +1801,7 @@ _0805E056:
movs r4, 0 movs r4, 0
cmp r4, r5 cmp r4, r5
bcs _0805E076 bcs _0805E076
ldr r7, =gBanksBySide ldr r7, =gBanksByIdentity
ldr r6, =gUnknown_0832C108 ldr r6, =gUnknown_0832C108
_0805E060: _0805E060:
adds r0, r4, r7 adds r0, r4, r7
@@ -1874,14 +1874,14 @@ _0805E0F0:
_0805E100: _0805E100:
cmp r4, 0x4 cmp r4, 0x4
bne _0805E110 bne _0805E110
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0] ldrb r0, [r0]
b _0805E198 b _0805E198
.pool .pool
_0805E110: _0805E110:
cmp r4, 0x5 cmp r4, 0x5
bne _0805E1AC bne _0805E1AC
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
b _0805E198 b _0805E198
.pool .pool
@@ -1916,28 +1916,28 @@ _0805E150:
_0805E160: _0805E160:
cmp r4, 0x6 cmp r4, 0x6
bne _0805E170 bne _0805E170
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0] ldrb r0, [r0]
b _0805E198 b _0805E198
.pool .pool
_0805E170: _0805E170:
cmp r4, 0x7 cmp r4, 0x7
bne _0805E180 bne _0805E180
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
b _0805E198 b _0805E198
.pool .pool
_0805E180: _0805E180:
cmp r4, 0x8 cmp r4, 0x8
bne _0805E190 bne _0805E190
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
b _0805E198 b _0805E198
.pool .pool
_0805E190: _0805E190:
cmp r5, 0x9 cmp r5, 0x9
bne _0805E1AC bne _0805E1AC
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r0, [r0, 0x3] ldrb r0, [r0, 0x3]
_0805E198: _0805E198:
lsls r0, 3 lsls r0, 3
@@ -1955,8 +1955,8 @@ _0805E1AE:
bx r1 bx r1
thumb_func_end BattleLoadAllHealthBoxesGfx thumb_func_end BattleLoadAllHealthBoxesGfx
thumb_func_start load_gfxc_health_bar thumb_func_start LoadBattleBarGfx
load_gfxc_health_bar: @ 805E1B8 LoadBattleBarGfx: @ 805E1B8
push {lr} push {lr}
ldr r0, =gUnknown_08C093F0 ldr r0, =gUnknown_08C093F0
ldr r1, =gMonSpritesGfxPtr ldr r1, =gMonSpritesGfxPtr
@@ -1969,7 +1969,7 @@ load_gfxc_health_bar: @ 805E1B8
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end load_gfxc_health_bar thumb_func_end LoadBattleBarGfx
thumb_func_start BattleInitAllSprites thumb_func_start BattleInitAllSprites
BattleInitAllSprites: @ 805E1D8 BattleInitAllSprites: @ 805E1D8
@@ -2038,7 +2038,7 @@ _0805E252:
_0805E260: _0805E260:
ldrb r0, [r4] ldrb r0, [r4]
bl SetBankHealthboxSpritePos bl SetBankHealthboxSpritePos
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -2048,7 +2048,7 @@ _0805E260:
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl nullsub_30 bl DummyBattleInterfaceFunc
b _0805E30E b _0805E30E
.pool .pool
_0805E288: _0805E288:
@@ -2056,7 +2056,7 @@ _0805E288:
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl nullsub_30 bl DummyBattleInterfaceFunc
b _0805E30E b _0805E30E
.pool .pool
_0805E29C: _0805E29C:
@@ -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]
@@ -2857,7 +2857,7 @@ sub_805E990: @ 805E990
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075060 bl GetHPBarLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2997,7 +2997,7 @@ sub_805EAB4: @ 805EAB4
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075060 bl GetHPBarLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r4,r5} pop {r4,r5}
@@ -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
@@ -3796,7 +3796,7 @@ sub_805F110: @ 805F110
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075060 bl GetHPBarLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x2 cmp r0, 0x2
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
+914 -914
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
+66 -66
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
@@ -2379,7 +2379,7 @@ _0817185A:
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl sub_8072A88 bl UpdateOamPriorityInAllHealthboxes
bl m4aMPlayAllStop bl m4aMPlayAllStop
ldr r0, =0x00000213 ldr r0, =0x00000213
bl PlaySE bl PlaySE
@@ -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]
@@ -2879,7 +2879,7 @@ _08171C24:
ldr r0, =gDoingBattleAnim ldr r0, =gDoingBattleAnim
strb r6, [r0] strb r6, [r0]
movs r0, 0x1 movs r0, 0x1
bl sub_8072A88 bl UpdateOamPriorityInAllHealthboxes
_08171C8A: _08171C8A:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -2974,7 +2974,7 @@ _08171D3E:
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
movs r0, 0x1 movs r0, 0x1
bl sub_8072A88 bl UpdateOamPriorityInAllHealthboxes
_08171D52: _08171D52:
pop {r4} pop {r4}
pop {r0} pop {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
+14 -14
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
@@ -985,7 +985,7 @@ sub_8064BC0: @ 8064BC0
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _08064C0C b _08064C0C
.pool .pool
_08064C08: _08064C08:
@@ -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]
@@ -5124,7 +5124,7 @@ sub_80670A0: @ 80670A0
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -5171,7 +5171,7 @@ sub_80670A0: @ 80670A0
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0806715A b _0806715A
.pool .pool
_08067130: _08067130:
@@ -5193,7 +5193,7 @@ _08067130:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
_0806715A: _0806715A:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -5954,7 +5954,7 @@ _080677B4:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+13 -13
View File
@@ -509,7 +509,7 @@ bx_t4_healthbar_update: @ 814B2D0
adds r0, r6 adds r0, r6
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _0814B332 b _0814B332
.pool .pool
_0814B318: _0814B318:
@@ -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]
@@ -4433,7 +4433,7 @@ sub_814D63C: @ 814D63C
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -4480,7 +4480,7 @@ sub_814D63C: @ 814D63C
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0814D6F6 b _0814D6F6
.pool .pool
_0814D6CC: _0814D6CC:
@@ -4502,7 +4502,7 @@ _0814D6CC:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
_0814D6F6: _0814D6F6:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -5349,7 +5349,7 @@ _0814DE08:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+21 -21
View File
@@ -1079,7 +1079,7 @@ sub_805FA70: @ 805FA70
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _0805FABC b _0805FABC
.pool .pool
_0805FAB8: _0805FAB8:
@@ -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}
@@ -5574,7 +5574,7 @@ sub_8062294: @ 8062294
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -5621,7 +5621,7 @@ sub_8062294: @ 8062294
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0806234E b _0806234E
.pool .pool
_08062324: _08062324:
@@ -5643,7 +5643,7 @@ _08062324:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
_0806234E: _0806234E:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -6409,7 +6409,7 @@ _080629B4:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+35 -35
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
@@ -403,7 +403,7 @@ _080577DC:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _080577E8 beq _080577E8
bl sub_8073314 bl SwapHpBarsWithHpText
_080577E8: _080577E8:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -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
@@ -3278,7 +3278,7 @@ bx_t1_healthbar_update: @ 8059130
adds r0, r6 adds r0, r6
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _08059192 b _08059192
.pool .pool
_08059178: _08059178:
@@ -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
@@ -3557,7 +3557,7 @@ sub_8059330: @ 8059330
negs r0, r0 negs r0, r0
str r0, [sp] str r0, [sp]
mov r0, r10 mov r0, r10
bl sub_807294C bl SetBattleBarStruct
movs r0, 0x21 movs r0, 0x21
bl PlaySE bl PlaySE
ldr r0, =sub_8059400 ldr r0, =sub_8059400
@@ -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
@@ -8936,7 +8936,7 @@ sub_805C410: @ 805C410
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -8992,7 +8992,7 @@ _0805C44A:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0805C4F2 b _0805C4F2
.pool .pool
_0805C4B4: _0805C4B4:
@@ -9016,14 +9016,14 @@ _0805C4B4:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
mov r2, r9 mov r2, r9
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
_0805C4F2: _0805C4F2:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -9067,7 +9067,7 @@ sub_805C528: @ 805C528
.pool .pool
_0805C560: _0805C560:
movs r0, 0x1 movs r0, 0x1
bl load_gfxc_health_bar bl LoadBattleBarGfx
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -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
@@ -10038,7 +10038,7 @@ _0805CDA4:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+19 -19
View File
@@ -510,7 +510,7 @@ bx_t3_healthbar_update: @ 81BB214
adds r0, r6 adds r0, r6
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _081BB276 b _081BB276
.pool .pool
_081BB25C: _081BB25C:
@@ -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
@@ -789,7 +789,7 @@ sub_81BB414: @ 81BB414
negs r0, r0 negs r0, r0
str r0, [sp] str r0, [sp]
mov r0, r10 mov r0, r10
bl sub_807294C bl SetBattleBarStruct
movs r0, 0x21 movs r0, 0x21
bl PlaySE bl PlaySE
ldr r0, =sub_81BB4E4 ldr r0, =sub_81BB4E4
@@ -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}
@@ -5162,7 +5162,7 @@ sub_81BDC10: @ 81BDC10
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -5209,7 +5209,7 @@ sub_81BDC10: @ 81BDC10
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _081BDCCA b _081BDCCA
.pool .pool
_081BDCA0: _081BDCA0:
@@ -5231,7 +5231,7 @@ _081BDCA0:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
_081BDCCA: _081BDCCA:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -5275,7 +5275,7 @@ sub_81BDD00: @ 81BDD00
.pool .pool
_081BDD38: _081BDD38:
movs r0, 0x1 movs r0, 0x1
bl load_gfxc_health_bar bl LoadBattleBarGfx
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -6082,7 +6082,7 @@ _081BE404:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+17 -17
View File
@@ -966,7 +966,7 @@ sub_8186D04: @ 8186D04
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _08186D50 b _08186D50
.pool .pool
_08186D4C: _08186D4C:
@@ -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}
@@ -4863,7 +4863,7 @@ sub_8188FD0: @ 8188FD0
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -4910,7 +4910,7 @@ sub_8188FD0: @ 8188FD0
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0818908A b _0818908A
.pool .pool
_08189060: _08189060:
@@ -4932,7 +4932,7 @@ _08189060:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
_0818908A: _0818908A:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -5693,7 +5693,7 @@ _081896E4:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+19 -19
View File
@@ -885,7 +885,7 @@ sub_818A0A4: @ 818A0A4
adds r0, r6 adds r0, r6
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _0818A106 b _0818A106
.pool .pool
_0818A0EC: _0818A0EC:
@@ -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}
@@ -5007,7 +5007,7 @@ sub_818C5E8: @ 818C5E8
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -5054,7 +5054,7 @@ sub_818C5E8: @ 818C5E8
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0818C6B2 b _0818C6B2
.pool .pool
_0818C678: _0818C678:
@@ -5076,14 +5076,14 @@ _0818C678:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
mov r1, r9 mov r1, r9
ldrb r0, [r1] ldrb r0, [r1]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
_0818C6B2: _0818C6B2:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -5878,7 +5878,7 @@ _0818CD60:
subs r4, 0x2 subs r4, 0x2
adds r3, r4 adds r3, r4
ldrb r3, [r3] ldrb r3, [r3]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
@@ -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
+17 -17
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}
@@ -676,7 +676,7 @@ sub_8168934: @ 8168934
adds r0, r6 adds r0, r6
ldrb r0, [r0] ldrb r0, [r0]
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
b _08168996 b _08168996
.pool .pool
_0816897C: _0816897C:
@@ -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}
@@ -3836,7 +3836,7 @@ sub_816A5D4: @ 816A5D4
push {r6,r7} push {r6,r7}
sub sp, 0x4 sub sp, 0x4
movs r0, 0 movs r0, 0
bl load_gfxc_health_bar bl LoadBattleBarGfx
ldr r3, =gBattleBufferA ldr r3, =gBattleBufferA
ldr r0, =gActiveBank ldr r0, =gActiveBank
mov r9, r0 mov r9, r0
@@ -3883,7 +3883,7 @@ sub_816A5D4: @ 816A5D4
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
mov r2, r8 mov r2, r8
bl sub_807294C bl SetBattleBarStruct
b _0816A69E b _0816A69E
.pool .pool
_0816A664: _0816A664:
@@ -3905,14 +3905,14 @@ _0816A664:
ldrb r1, [r1] ldrb r1, [r1]
str r7, [sp] str r7, [sp]
movs r3, 0 movs r3, 0
bl sub_807294C bl SetBattleBarStruct
mov r1, r9 mov r1, r9
ldrb r0, [r1] ldrb r0, [r1]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl heathbar_draw_hp bl UpdateHpTextInHealthbox
_0816A69E: _0816A69E:
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank ldr r0, =gActiveBank
@@ -4645,7 +4645,7 @@ _0816ACA8:
subs r3, 0x2 subs r3, 0x2
adds r4, r3 adds r4, r3
ldrb r3, [r4] ldrb r3, [r4]
bl sub_80735DC bl CreatePartyStatusSummarySprites
ldr r2, =gUnknown_020244B4 ldr r2, =gUnknown_020244B4
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
asm/battle_frontier_1.s
+3 -3
View File
@@ -14296,7 +14296,7 @@ sub_81963F0: @ 81963F0
adds r0, r1 adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
_08196446: _08196446:
movs r0, 0x1 movs r0, 0x1
@@ -14680,7 +14680,7 @@ sub_8196748: @ 8196748
ldr r4, =gUnknown_085500A4 ldr r4, =gUnknown_085500A4
_08196750: _08196750:
ldrh r0, [r4] ldrh r0, [r4]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0819675E beq _0819675E
@@ -14706,7 +14706,7 @@ sub_8196774: @ 8196774
ldr r5, =gUnknown_085500A4 ldr r5, =gUnknown_085500A4
_0819677E: _0819677E:
ldrh r0, [r5] ldrh r0, [r5]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0819679A beq _0819679A
asm/battle_frontier_2.s
+3 -3
View File
@@ -27306,7 +27306,7 @@ _081A8A74:
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
adds r3, r7, 0 adds r3, r7, 0
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _081A8AD4 b _081A8AD4
.pool .pool
_081A8ACC: _081A8ACC:
@@ -27540,7 +27540,7 @@ _081A8C72:
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _081A8D32 b _081A8D32
.pool .pool
_081A8C9C: _081A8C9C:
@@ -27618,7 +27618,7 @@ _081A8D12:
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
bl exec_movement bl ScriptMovement_StartObjectMovementScript
_081A8D32: _081A8D32:
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
asm/battle_interface.s
-5734
View File
File diff suppressed because it is too large Load Diff
asm/battle_setup.s
+30 -30
View File
@@ -299,8 +299,8 @@ sub_80B086C: @ 80B086C
.pool .pool
thumb_func_end sub_80B086C thumb_func_end sub_80B086C
thumb_func_start sub_80B08A8 thumb_func_start BattleSetup_StartScriptedWildBattle
sub_80B08A8: @ 80B08A8 BattleSetup_StartScriptedWildBattle: @ 80B08A8
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r1, =gMain ldr r1, =gMain
@@ -323,7 +323,7 @@ sub_80B08A8: @ 80B08A8
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80B08A8 thumb_func_end BattleSetup_StartScriptedWildBattle
thumb_func_start sub_80B08EC thumb_func_start sub_80B08EC
sub_80B08EC: @ 80B08EC sub_80B08EC: @ 80B08EC
@@ -1357,7 +1357,7 @@ sub_80B1158: @ 80B1158
movs r1, 0x5 movs r1, 0x5
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_80F9244 bl ScriptGiveMon
bl ResetTasks bl ResetTasks
bl PlayBattleBGM bl PlayBattleBGM
ldr r0, =sub_80B11A8 ldr r0, =sub_80B11A8
@@ -1686,9 +1686,9 @@ _080B141A:
.pool .pool
thumb_func_end battle_80801F0 thumb_func_end battle_80801F0
thumb_func_start TrainerBattleConfigure thumb_func_start BattleSetup_ConfigureTrainerBattle
@ u8 *TrainerBattleConfigure(u8 *args) @ u8 *BattleSetup_ConfigureTrainerBattle(u8 *args)
TrainerBattleConfigure: @ 80B1430 BattleSetup_ConfigureTrainerBattle: @ 80B1430
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
bl InitTrainerBattleVariables bl InitTrainerBattleVariables
@@ -1872,7 +1872,7 @@ _080B161E:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end TrainerBattleConfigure thumb_func_end BattleSetup_ConfigureTrainerBattle
thumb_func_start SingleTrainerWantsBattle thumb_func_start SingleTrainerWantsBattle
@ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript) @ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
@@ -1892,7 +1892,7 @@ SingleTrainerWantsBattle: @ 80B162C
strh r0, [r4] strh r0, [r4]
adds r1, 0x1 adds r1, 0x1
adds r0, r1, 0 adds r0, r1, 0
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gUnknown_08271354 ldr r0, =gUnknown_08271354
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -1920,7 +1920,7 @@ TwoTrainersWantBattle: @ 80B1670
strh r0, [r4] strh r0, [r4]
adds r1, 0x1 adds r1, 0x1
adds r0, r1, 0 adds r0, r1, 0
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -2056,8 +2056,8 @@ sub_80B178C: @ 80B178C
bx r0 bx r0
thumb_func_end sub_80B178C thumb_func_end sub_80B178C
thumb_func_start trainer_flag_check thumb_func_start HasTrainerAlreadyBeenFought
trainer_flag_check: @ 80B17A0 HasTrainerAlreadyBeenFought: @ 80B17A0
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xA0 movs r1, 0xA0
@@ -2069,7 +2069,7 @@ trainer_flag_check: @ 80B17A0
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end trainer_flag_check thumb_func_end HasTrainerAlreadyBeenFought
thumb_func_start trainer_flag_set thumb_func_start trainer_flag_set
trainer_flag_set: @ 80B17B8 trainer_flag_set: @ 80B17B8
@@ -2092,13 +2092,13 @@ trainer_flag_clear: @ 80B17CC
lsls r1, 19 lsls r1, 19
adds r0, r1 adds r0, r1
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end trainer_flag_clear thumb_func_end trainer_flag_clear
thumb_func_start sub_80B17E0 thumb_func_start BattleSetup_StartTrainerBattle
sub_80B17E0: @ 80B17E0 BattleSetup_StartTrainerBattle: @ 80B17E0
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_030060A8 ldr r0, =gUnknown_030060A8
ldrb r0, [r0] ldrb r0, [r0]
@@ -2217,7 +2217,7 @@ _080B190C:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80B17E0 thumb_func_end BattleSetup_StartTrainerBattle
thumb_func_start sub_80B1918 thumb_func_start sub_80B1918
sub_80B1918: @ 80B1918 sub_80B1918: @ 80B1918
@@ -2413,8 +2413,8 @@ _080B1AF4:
bx r0 bx r0
thumb_func_end sub_80B1A14 thumb_func_end sub_80B1A14
thumb_func_start sub_80B1AF8 thumb_func_start BattleSetup_GetScriptAddrAfterBattle
sub_80B1AF8: @ 80B1AF8 BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
push {lr} push {lr}
ldr r0, =gUnknown_02038BEC ldr r0, =gUnknown_02038BEC
ldr r0, [r0] ldr r0, [r0]
@@ -2425,10 +2425,10 @@ _080B1B04:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80B1AF8 thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start sub_80B1B10 thumb_func_start BattleSetup_GetTrainerPostBattleScript
sub_80B1B10: @ 80B1B10 BattleSetup_GetTrainerPostBattleScript: @ 80B1B10
push {lr} push {lr}
ldr r1, =gUnknown_02038BF8 ldr r1, =gUnknown_02038BF8
ldrb r2, [r1] ldrb r2, [r1]
@@ -2462,7 +2462,7 @@ _080B1B56:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80B1B10 thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start special_trainer_unable_to_battle thumb_func_start special_trainer_unable_to_battle
special_trainer_unable_to_battle: @ 80B1B60 special_trainer_unable_to_battle: @ 80B1B60
@@ -2796,7 +2796,7 @@ _080B1DCE:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B1DE2 beq _080B1DE2
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B1DCA bne _080B1DCA
@@ -2895,7 +2895,7 @@ sub_80B1E94: @ 80B1E94
lsls r0, r4, 4 lsls r0, r4, 4
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3076,7 +3076,7 @@ _080B1FE2:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B1FCA beq _080B1FCA
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B1FD4 beq _080B1FD4
@@ -3127,7 +3127,7 @@ _080B203A:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B201E beq _080B201E
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B2028 beq _080B2028
@@ -3233,7 +3233,7 @@ sub_80B20F4: @ 80B20F4
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r4 adds r0, r4
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B211E beq _080B211E
@@ -3509,7 +3509,7 @@ sub_80B2318: @ 80B2318
lsrs r4, r0, 12 lsrs r4, r0, 12
adds r6, r4, r7 adds r6, r4, r7
ldrh r0, [r6] ldrh r0, [r6]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3527,7 +3527,7 @@ _080B2338:
adds r4, r6, 0x2 adds r4, r6, 0x2
_080B2346: _080B2346:
ldrh r0, [r4] ldrh r0, [r4]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B2360 beq _080B2360
asm/battle_tower.s
+5 -5
View File
@@ -3548,11 +3548,11 @@ _08163E2C:
movs r0, 0 movs r0, 0
strb r0, [r4] strb r0, [r4]
ldr r0, =gUnknown_08224158 ldr r0, =gUnknown_08224158
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
movs r0, 0x1 movs r0, 0x1
strb r0, [r4] strb r0, [r4]
ldr r0, =gUnknown_08224167 ldr r0, =gUnknown_08224167
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gPartnerTrainerId ldr r0, =gPartnerTrainerId
strh r5, [r0] strh r5, [r0]
ldr r0, =sub_8163A8C ldr r0, =sub_8163A8C
@@ -4364,7 +4364,7 @@ _081644E0:
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
movs r0, 0xD8 movs r0, 0xD8
lsls r0, 2 lsls r0, 2
bl FlagReset bl FlagClear
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
@@ -4525,7 +4525,7 @@ _08164660:
adds r1, 0xC0 adds r1, 0xC0
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, =0x00000361 ldr r0, =0x00000361
bl FlagReset bl FlagClear
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
@@ -6056,7 +6056,7 @@ _081653E0:
bne _081653F8 bne _081653F8
bl sub_80F01B8 bl sub_80F01B8
movs r0, 0x77 movs r0, 0x77
bl FlagReset bl FlagClear
_081653F8: _081653F8:
pop {r0} pop {r0}
bx r0 bx r0
asm/battle_transition.s
+2 -2
View File
@@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
ands r5, r0 ands r5, r0
movs r1, 0 movs r1, 0
mov r8, r4 mov r8, r4
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
_08147046: _08147046:
lsls r5, 16 lsls r5, 16
asrs r5, 16 asrs r5, 16
@@ -2221,7 +2221,7 @@ _081470C4:
sub_81470D0: @ 81470D0 sub_81470D0: @ 81470D0
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_085C8E68 ldr r0, =gUnknown_085C8E68
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
movs r2, 0 movs r2, 0
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
movs r3, 0x4 movs r3, 0x4
asm/bike.s
+2 -2
View File
@@ -2013,9 +2013,9 @@ _0811A0B0:
bl SetPlayerAvatarTransitionFlags bl SetPlayerAvatarTransitionFlags
ldr r4, =0x00000193 ldr r4, =0x00000193
adds r0, r4, 0 adds r0, r4, 0
bl sav1_set_battle_music_maybe bl Overworld_SetSavedMusic
adds r0, r4, 0 adds r0, r4, 0
bl sub_80858C4 bl Overworld_ChangeMusicTo
_0811A0C4: _0811A0C4:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/cable_club.s
+11 -11
View File
@@ -434,7 +434,7 @@ sub_80B2688: @ 80B2688
movs r0, 0x15 movs r0, 0x15
bl PlaySE bl PlaySE
ldr r0, =gUnknown_082780B3 ldr r0, =gUnknown_082780B3
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B270C ldr r0, =sub_80B270C
b _080B26FA b _080B26FA
.pool .pool
@@ -442,7 +442,7 @@ _080B26EC:
movs r0, 0x16 movs r0, 0x16
bl PlaySE bl PlaySE
ldr r0, =gUnknown_08278131 ldr r0, =gUnknown_08278131
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B2918 ldr r0, =sub_80B2918
_080B26FA: _080B26FA:
str r0, [r4] str r0, [r4]
@@ -545,7 +545,7 @@ sub_80B275C: @ 80B275C
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2 ldr r0, =gUnknown_082780F2
bl box_related_two__3 bl ShowFieldAutoScrollMessage
mov r0, r9 mov r0, r9
subs r0, 0x8 subs r0, 0x8
add r0, r8 add r0, r8
@@ -598,7 +598,7 @@ sub_80B2804: @ 80B2804
beq _080B2878 beq _080B2878
_080B2852: _080B2852:
ldr r0, =gUnknown_082780B3 ldr r0, =gUnknown_082780B3
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -719,7 +719,7 @@ sub_80B2918: @ 80B2918
cmp r0, 0x1 cmp r0, 0x1
bhi _080B297C bhi _080B297C
bl sub_800AC34 bl sub_800AC34
bl textbox_close bl HideFieldMessageBox
ldr r0, =sub_80B2CB0 ldr r0, =sub_80B2CB0
b _080B29E4 b _080B29E4
.pool .pool
@@ -730,7 +730,7 @@ _080B297C:
bne _080B2994 bne _080B2994
_080B2984: _080B2984:
bl sub_80097E8 bl sub_80097E8
bl textbox_close bl HideFieldMessageBox
ldr r0, =sub_80B2CB0 ldr r0, =sub_80B2CB0
b _080B29E4 b _080B29E4
.pool .pool
@@ -814,7 +814,7 @@ _080B2A42:
_080B2A4A: _080B2A4A:
bl sub_80097E8 bl sub_80097E8
_080B2A4E: _080B2A4E:
bl textbox_close bl HideFieldMessageBox
ldr r0, =gTasks ldr r0, =gTasks
lsls r1, r7, 2 lsls r1, r7, 2
adds r1, r7 adds r1, r7
@@ -1151,7 +1151,7 @@ sub_80B2D2C: @ 80B2D2C
bl sub_80B241C bl sub_80B241C
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
bl RemoveWindow bl RemoveWindow
bl textbox_close bl HideFieldMessageBox
bl EnableBothScriptContexts bl EnableBothScriptContexts
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
@@ -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:
@@ -2303,7 +2303,7 @@ _080B375A:
b _080B37CC b _080B37CC
.pool .pool
_080B376C: _080B376C:
bl sub_809833C bl IsFieldMessageBoxHidden
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B37CC beq _080B37CC
@@ -2325,7 +2325,7 @@ _080B378C:
beq _080B37B2 beq _080B37B2
b _080B37CC b _080B37CC
_080B379E: _080B379E:
bl textbox_close bl HideFieldMessageBox
movs r0, 0 movs r0, 0
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
bl sub_80872C4 bl sub_80872C4
asm/clock.s
+3 -3
View File
@@ -27,8 +27,8 @@ sub_809E778: @ 809E778
.pool .pool
thumb_func_end sub_809E778 thumb_func_end sub_809E778
thumb_func_start sub_809E7B0 thumb_func_start DoTimeBasedEvents
sub_809E7B0: @ 809E7B0 DoTimeBasedEvents: @ 809E7B0
push {r4,lr} push {r4,lr}
ldr r0, =0x00000895 ldr r0, =0x00000895
bl FlagGet bl FlagGet
@@ -50,7 +50,7 @@ _0809E7DA:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_809E7B0 thumb_func_end DoTimeBasedEvents
thumb_func_start sub_809E7E8 thumb_func_start sub_809E7E8
sub_809E7E8: @ 809E7E8 sub_809E7E8: @ 809E7E8
asm/coins.s
+8 -8
View File
@@ -5,9 +5,9 @@
.text .text
thumb_func_start AddCoins thumb_func_start GiveCoins
@ bool8 AddCoins(u16 toAdd) @ bool8 GiveCoins(u16 toAdd)
AddCoins: @ 8145C80 GiveCoins: @ 8145C80
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -44,11 +44,11 @@ _08145CC0:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end AddCoins thumb_func_end GiveCoins
thumb_func_start SubtractCoins thumb_func_start TakeCoins
@ bool8 SubtractCoins(u16 toSub) @ bool8 TakeCoins(u16 toSub)
SubtractCoins: @ 8145CCC TakeCoins: @ 8145CCC
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -69,6 +69,6 @@ _08145CEE:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end SubtractCoins thumb_func_end TakeCoins
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/contest.s
+182 -182
View File
File diff suppressed because it is too large Load Diff
asm/contest_ai.s
+150 -150
View File
File diff suppressed because it is too large Load Diff
asm/contest_effect.s
+75 -75
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]
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3 adds r0, r3
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
lsls r0, 29 lsls r0, 29
ldr r1, =gUnknown_02039F2C ldr r1, =gScriptContestCategory
lsrs r0, 29 lsrs r0, 29
ldrh r1, [r1] ldrh r1, [r1]
cmp r0, r1 cmp r0, r1
@@ -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_80F57C4.s
+5 -5
View File
@@ -3008,7 +3008,7 @@ _080F7236:
bl CopyToBgTilemapBufferRect bl CopyToBgTilemapBufferRect
movs r5, 0xF movs r5, 0xF
_080F7240: _080F7240:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080F725C bne _080F725C
@@ -4640,7 +4640,7 @@ sub_80F7F30: @ 80F7F30
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _080F7F5E beq _080F7F5E
ldr r4, =gUnknown_02039F2C ldr r4, =gScriptContestCategory
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, =gUnknown_02039F2E ldr r1, =gUnknown_02039F2E
ldrb r1, [r1] ldrb r1, [r1]
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
muls r1, r0 muls r1, r0
ldr r0, =gPlayerParty ldr r0, =gPlayerParty
adds r2, r1, r0 adds r2, r1, r0
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080F7FEE bhi _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
beq _080F8010 beq _080F8010
b _080F8250 b _080F8250
_080F8010: _080F8010:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bls _080F801A bls _080F801A
@@ -5488,7 +5488,7 @@ _080F8678:
bl sub_80F86E0 bl sub_80F86E0
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DB09C bl sub_80DB09C
ldr r1, =sub_80FCF40 ldr r1, =sub_80FCF40
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/contest_link_81D9DE4.s
+1 -1
View File
@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DB09C bl sub_80DB09C
ldr r1, =sub_80FCF40 ldr r1, =sub_80FCF40
asm/decoration.s
+2 -2
View File
@@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@@ -2490,7 +2490,7 @@ _08127E34:
cmp r0, 0x1 cmp r0, 0x1
bne _08127F1C bne _08127F1C
adds r0, r4, 0 adds r0, r4, 0
bl FlagReset bl FlagClear
movs r2, 0 movs r2, 0
ldr r0, [r7, 0x4] ldr r0, [r7, 0x4]
ldrb r4, [r0] ldrb r4, [r0]
asm/decoration_inventory.s
+3 -3
View File
@@ -156,8 +156,8 @@ _08161910:
bx r1 bx r1
thumb_func_end sub_81618D0 thumb_func_end sub_81618D0
thumb_func_start sub_8161918 thumb_func_start CheckHasDecoration
sub_8161918: @ 8161918 CheckHasDecoration: @ 8161918
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -193,7 +193,7 @@ _08161958:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8161918 thumb_func_end CheckHasDecoration
thumb_func_start DecorationAdd thumb_func_start DecorationAdd
DecorationAdd: @ 8161960 DecorationAdd: @ 8161960
asm/easy_chat.s
+1 -1
View File
@@ -9914,7 +9914,7 @@ _0811EF48:
adds r1, r5, 0 adds r1, r5, 0
bl ConvertEasyChatWordsToString bl ConvertEasyChatWordsToString
adds r0, r4, 0 adds r0, r4, 0
bl box_related_two__3 bl ShowFieldAutoScrollMessage
_0811EF58: _0811EF58:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/field_door.s
+18 -18
View File
@@ -581,8 +581,8 @@ sub_808A83C: @ 808A83C
.pool .pool
thumb_func_end sub_808A83C thumb_func_end sub_808A83C
thumb_func_start sub_808A854 thumb_func_start FieldSetDoorOpened
sub_808A854: @ 808A854 FieldSetDoorOpened: @ 808A854
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -602,10 +602,10 @@ _0808A876:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_808A854 thumb_func_end FieldSetDoorOpened
thumb_func_start sub_808A880 thumb_func_start FieldSetDoorClosed
sub_808A880: @ 808A880 FieldSetDoorClosed: @ 808A880
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -625,10 +625,10 @@ _0808A8A2:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_808A880 thumb_func_end FieldSetDoorClosed
thumb_func_start sub_808A8AC thumb_func_start FieldAnimateDoorClose
sub_808A8AC: @ 808A8AC FieldAnimateDoorClose: @ 808A8AC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -654,10 +654,10 @@ _0808A8DC:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_808A8AC thumb_func_end FieldAnimateDoorClose
thumb_func_start task_overworld_door_add_if_role_69_for_opening_door_at thumb_func_start FieldAnimateDoorOpen
task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4 FieldAnimateDoorOpen: @ 808A8E4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -683,10 +683,10 @@ _0808A914:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end task_overworld_door_add_if_role_69_for_opening_door_at thumb_func_end FieldAnimateDoorOpen
thumb_func_start sub_808A91C thumb_func_start FieldIsDoorAnimationRunning
sub_808A91C: @ 808A91C FieldIsDoorAnimationRunning: @ 808A91C
push {lr} push {lr}
ldr r0, =task50_overworld_door ldr r0, =task50_overworld_door
bl FuncIsActiveTask bl FuncIsActiveTask
@@ -695,10 +695,10 @@ sub_808A91C: @ 808A91C
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_808A91C thumb_func_end FieldIsDoorAnimationRunning
thumb_func_start cur_mapdata_get_door_sound_at thumb_func_start GetDoorSoundEffect
cur_mapdata_get_door_sound_at: @ 808A930 GetDoorSoundEffect: @ 808A930
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
adds r2, r1, 0 adds r2, r1, 0
@@ -725,7 +725,7 @@ _0808A95C:
_0808A95E: _0808A95E:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end cur_mapdata_get_door_sound_at thumb_func_end GetDoorSoundEffect
thumb_func_start sub_808A964 thumb_func_start sub_808A964
sub_808A964: @ 808A964 sub_808A964: @ 808A964
asm/field_effect.s
+27 -27
View File
@@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
cmp r0, 0 cmp r0, 0
beq _080B6A8A beq _080B6A8A
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -2100,7 +2100,7 @@ _080B6B3E:
cmp r0, 0 cmp r0, 0
bne _080B6B58 bne _080B6B58
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
_080B6B58: _080B6B58:
@@ -2459,7 +2459,7 @@ sub_80B6E18: @ 80B6E18
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl CameraObjectReset1 bl CameraObjectReset1
bl sub_809757C bl UnfreezeMapObjects
bl InstallCameraPanAheadCallback bl InstallCameraPanAheadCallback
ldr r0, =sub_80B6B94 ldr r0, =sub_80B6B94
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
ldr r2, [r2] ldr r2, [r2]
strh r2, [r1, 0xA] strh r2, [r1, 0xA]
bl _call_via_r4 bl _call_via_r4
@@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
bne _080B7420 bne _080B7420
adds r0, r5, 0 adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
ldr r2, [r3] ldr r2, [r3]
strh r2, [r1, 0x26] strh r2, [r1, 0x26]
ldr r2, [r3, 0x4] ldr r2, [r3, 0x4]
@@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x26 movs r2, 0x26
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
strh r0, [r2, 0x26] strh r0, [r2, 0x26]
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r5, 0x10 movs r5, 0x10
ldrsh r0, [r1, r5] ldrsh r0, [r1, r5]
str r0, [r3] str r0, [r3]
@@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B795C beq _080B795C
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -3919,7 +3919,7 @@ sub_80B79BC: @ 80B79BC
movs r0, 0 movs r0, 0
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B7890 ldr r0, =sub_80B7890
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -3935,7 +3935,7 @@ _080B79E6:
thumb_func_start sub_80B79F4 thumb_func_start sub_80B79F4
sub_80B79F4: @ 80B79F4 sub_80B79F4: @ 80B79F4
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
cmp r0, 0x3 cmp r0, 0x3
ble _080B7B6C ble _080B7B6C
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -4222,7 +4222,7 @@ _080B7C2C:
thumb_func_start sub_80B7C48 thumb_func_start sub_80B7C48
sub_80B7C48: @ 80B7C48 sub_80B7C48: @ 80B7C48
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -4583,7 +4583,7 @@ _080B7F32:
ands r0, r1 ands r0, r1
strb r0, [r6, 0x1] strb r0, [r6, 0x1]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B7E94 ldr r0, =sub_80B7E94
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -5194,7 +5194,7 @@ sub_80B8410: @ 80B8410
bne _080B8484 bne _080B8484
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl CameraObjectReset1 bl CameraObjectReset1
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B8250 ldr r0, =sub_80B8250
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -5229,7 +5229,7 @@ _080B84BE:
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
ldr r0, [r2] ldr r0, [r2]
ldr r1, [r2, 0x4] ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8] ldr r2, [r2, 0x8]
@@ -5252,7 +5252,7 @@ _080B84BE:
thumb_func_start sub_80B84F8 thumb_func_start sub_80B84F8
sub_80B84F8: @ 80B84F8 sub_80B84F8: @ 80B84F8
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldr r0, [r5] ldr r0, [r5]
movs r6, 0x80 movs r6, 0x80
lsls r6, 24 lsls r6, 24
@@ -6292,12 +6292,12 @@ sub_80B8D44: @ 80B8D44
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r1, 0x26] strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
ldr r0, =0x0000016d ldr r0, =0x0000016d
bl sub_80858C4 bl Overworld_ChangeMusicTo
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
@@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8E96 beq _080B8E96
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x26 movs r1, 0x26
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r1, 0x80 movs r1, 0x80
@@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl FieldObjectSetSpecialAnim bl FieldObjectSetSpecialAnim
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r6, r2] ldrsh r0, [r6, r2]
str r0, [r1] str r0, [r1]
@@ -6527,7 +6527,7 @@ sub_80B8F24: @ 80B8F24
ldrb r0, [r4, 0x1A] ldrb r0, [r4, 0x1A]
movs r1, 0x1 movs r1, 0x1
bl sub_81555AC bl sub_81555AC
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
movs r0, 0x9 movs r0, 0x9
bl FieldEffectActiveListRemove bl FieldEffectActiveListRemove
@@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
strb r0, [r2, 0x5] strb r0, [r2, 0x5]
ldr r0, =sub_80B9128 ldr r0, =sub_80B9128
str r0, [r2, 0x1C] str r0, [r2, 0x1C]
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r2, 0x30] strh r0, [r2, 0x30]
movs r0, 0x9E movs r0, 0x9E
@@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r1, 0xA] strh r0, [r1, 0xA]
movs r0, 0 movs r0, 0
@@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -7922,7 +7922,7 @@ _080B9ACA:
sub_80B9ADC: @ 80B9ADC sub_80B9ADC: @ 80B9ADC
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldrb r0, [r4] ldrb r0, [r4]
ldrb r1, [r4, 0x4] ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8] ldrb r2, [r4, 0x8]
@@ -8343,7 +8343,7 @@ _080B9E24:
sub_80B9E28: @ 80B9E28 sub_80B9E28: @ 80B9E28
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
asm/field_effect_helpers.s
+28 -28
View File
@@ -574,7 +574,7 @@ _0815432E:
thumb_func_start oei_shadow thumb_func_start oei_shadow
oei_shadow: @ 8154340 oei_shadow: @ 8154340
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrb r0, [r5] ldrb r0, [r5]
ldrb r1, [r5, 0x4] ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8] ldrb r2, [r5, 0x8]
@@ -742,7 +742,7 @@ _08154498:
oei_grass_normal: @ 81544AC oei_grass_normal: @ 81544AC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -951,7 +951,7 @@ _08154648:
thumb_func_start sub_8154658 thumb_func_start sub_8154658
sub_8154658: @ 8154658 sub_8154658: @ 8154658
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1080,7 +1080,7 @@ _0815474C:
sub_8154758: @ 8154758 sub_8154758: @ 8154758
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -1282,7 +1282,7 @@ _081548EA:
thumb_func_start sub_81548FC thumb_func_start sub_81548FC
sub_81548FC: @ 81548FC sub_81548FC: @ 81548FC
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1336,7 +1336,7 @@ _08154958:
thumb_func_start sub_815496C thumb_func_start sub_815496C
sub_815496C: @ 815496C sub_815496C: @ 815496C
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -1537,7 +1537,7 @@ _08154AF2:
thumb_func_start sub_8154B04 thumb_func_start sub_8154B04
sub_8154B04: @ 8154B04 sub_8154B04: @ 8154B04
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1591,7 +1591,7 @@ _08154B62:
thumb_func_start sub_8154B78 thumb_func_start sub_8154B78
sub_8154B78: @ 8154B78 sub_8154B78: @ 8154B78
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1646,7 +1646,7 @@ _08154BD8:
thumb_func_start sub_8154BEC thumb_func_start sub_8154BEC
sub_8154BEC: @ 8154BEC sub_8154BEC: @ 8154BEC
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1777,7 +1777,7 @@ _08154CE4:
thumb_func_start sub_8154CEC thumb_func_start sub_8154CEC
sub_8154CEC: @ 8154CEC sub_8154CEC: @ 8154CEC
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -1922,7 +1922,7 @@ _08154E0A:
thumb_func_start sub_8154E1C thumb_func_start sub_8154E1C
sub_8154E1C: @ 8154E1C sub_8154E1C: @ 8154E1C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1976,7 +1976,7 @@ _08154E78:
thumb_func_start oei_water_drop_tall thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 8154E8C oei_water_drop_tall: @ 8154E8C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2030,7 +2030,7 @@ _08154EE8:
thumb_func_start sub_8154EFC thumb_func_start sub_8154EFC
sub_8154EFC: @ 8154EFC sub_8154EFC: @ 8154EFC
push {r4-r7,lr} push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
@@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
push {r4,lr} push {r4,lr}
ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r3, 0x4 movs r3, 0x4
@@ -2238,7 +2238,7 @@ _081550A0:
thumb_func_start sub_81550B4 thumb_func_start sub_81550B4
sub_81550B4: @ 81550B4 sub_81550B4: @ 81550B4
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -2393,7 +2393,7 @@ _081551E4:
thumb_func_start sub_81551F0 thumb_func_start sub_81551F0
sub_81551F0: @ 81551F0 sub_81551F0: @ 81551F0
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2445,7 +2445,7 @@ _08155248:
thumb_func_start sub_815525C thumb_func_start sub_815525C
sub_815525C: @ 815525C sub_815525C: @ 815525C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2497,7 +2497,7 @@ _081552B4:
thumb_func_start sub_81552C8 thumb_func_start sub_81552C8
sub_81552C8: @ 81552C8 sub_81552C8: @ 81552C8
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2549,7 +2549,7 @@ _08155320:
thumb_func_start sub_8155334 thumb_func_start sub_8155334
sub_8155334: @ 8155334 sub_8155334: @ 8155334
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2603,7 +2603,7 @@ ash: @ 81553A0
push {r4,lr} push {r4,lr}
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
str r0, [r4] str r0, [r4]
@@ -2630,7 +2630,7 @@ ash: @ 81553A0
oei_ash: @ 81553D4 oei_ash: @ 81553D4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -2809,7 +2809,7 @@ _0815552C:
thumb_func_start sub_8155534 thumb_func_start sub_8155534
sub_8155534: @ 8155534 sub_8155534: @ 8155534
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3261,7 +3261,7 @@ _08155888:
thumb_func_start sub_8155890 thumb_func_start sub_8155890
sub_8155890: @ 8155890 sub_8155890: @ 8155890
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3315,7 +3315,7 @@ _081558EC:
thumb_func_start sub_8155900 thumb_func_start sub_8155900
sub_8155900: @ 8155900 sub_8155900: @ 8155900
push {r4-r7,lr} push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
@@ -3505,7 +3505,7 @@ _08155A76:
thumb_func_start sub_8155A88 thumb_func_start sub_8155A88
sub_8155A88: @ 8155A88 sub_8155A88: @ 8155A88
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3586,7 +3586,7 @@ _08155B20:
thumb_func_start sub_8155B2C thumb_func_start sub_8155B2C
sub_8155B2C: @ 8155B2C sub_8155B2C: @ 8155B2C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
lsrs r6, r1, 24 lsrs r6, r1, 24
lsls r2, 24 lsls r2, 24
lsrs r7, r2, 24 lsrs r7, r2, 24
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrb r0, [r5] ldrb r0, [r5]
ldrb r1, [r5, 0x4] ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8] ldrb r2, [r5, 0x8]
@@ -3950,7 +3950,7 @@ _08155DD8:
thumb_func_start sub_8155DDC thumb_func_start sub_8155DDC
sub_8155DDC: @ 8155DDC sub_8155DDC: @ 8155DDC
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x7 adds r0, 0x7
str r0, [r4] str r0, [r4]
asm/field_ground_effect.s
+12 -12
View File
@@ -1166,7 +1166,7 @@ _08096E8C:
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnTallGrass: @ 8096E90 GroundEffect_SpawnOnTallGrass: @ 8096E90
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnTallGrass: @ 8096EDC GroundEffect_StepOnTallGrass: @ 8096EDC
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnLongGrass: @ 8096F28 GroundEffect_SpawnOnLongGrass: @ 8096F28
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnLongGrass: @ 8096F74 GroundEffect_StepOnLongGrass: @ 8096F74
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
mov r0, sp mov r0, sp
movs r2, 0x4 movs r2, 0x4
bl memcpy bl memcpy
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x14 movs r2, 0x14
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
cmp r1, r0 cmp r1, r0
beq _080970D6 beq _080970D6
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x14 movs r1, 0x14
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
sub sp, 0x4 sub sp, 0x4
adds r5, r0, 0 adds r5, r0, 0
adds r6, r1, 0 adds r6, r1, 0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -1562,7 +1562,7 @@ _0809715A:
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnLongGrass: @ 8097168 GroundEffect_JumpOnLongGrass: @ 8097168
push {lr} push {lr}
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x10 movs r3, 0x10
ldrsh r1, [r0, r3] ldrsh r1, [r0, r3]
str r1, [r2] str r1, [r2]
@@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnShallowWater: @ 8097190 GroundEffect_JumpOnShallowWater: @ 8097190
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnWater: @ 80971C0 GroundEffect_JumpOnWater: @ 80971C0
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpLandingDust: @ 80971F0 GroundEffect_JumpLandingDust: @ 80971F0
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
GroundEffect_Seaweed: @ 8097240 GroundEffect_Seaweed: @ 8097240
push {lr} push {lr}
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x10 movs r3, 0x10
ldrsh r1, [r0, r3] ldrsh r1, [r0, r3]
str r1, [r2] str r1, [r2]
asm/field_message_box.s
+9 -9
View File
@@ -181,8 +181,8 @@ _08098272:
bx r1 bx r1
thumb_func_end sub_8098238 thumb_func_end sub_8098238
thumb_func_start box_related_two__3 thumb_func_start ShowFieldAutoScrollMessage
box_related_two__3: @ 8098278 ShowFieldAutoScrollMessage: @ 8098278
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r2, =gUnknown_020375BC ldr r2, =gUnknown_020375BC
@@ -202,7 +202,7 @@ _08098298:
_0809829A: _0809829A:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end box_related_two__3 thumb_func_end ShowFieldAutoScrollMessage
thumb_func_start sub_80982A0 thumb_func_start sub_80982A0
sub_80982A0: @ 80982A0 sub_80982A0: @ 80982A0
@@ -267,8 +267,8 @@ textbox_auto_and_task_add: @ 8098304
bx r0 bx r0
thumb_func_end textbox_auto_and_task_add thumb_func_end textbox_auto_and_task_add
thumb_func_start textbox_close thumb_func_start HideFieldMessageBox
textbox_close: @ 8098314 HideFieldMessageBox: @ 8098314
push {lr} push {lr}
bl task_del_textbox bl task_del_textbox
movs r0, 0 movs r0, 0
@@ -280,7 +280,7 @@ textbox_close: @ 8098314
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end textbox_close thumb_func_end HideFieldMessageBox
thumb_func_start textbox_any_visible thumb_func_start textbox_any_visible
textbox_any_visible: @ 8098330 textbox_any_visible: @ 8098330
@@ -290,8 +290,8 @@ textbox_any_visible: @ 8098330
.pool .pool
thumb_func_end textbox_any_visible thumb_func_end textbox_any_visible
thumb_func_start sub_809833C thumb_func_start IsFieldMessageBoxHidden
sub_809833C: @ 809833C IsFieldMessageBoxHidden: @ 809833C
push {lr} push {lr}
ldr r0, =gUnknown_020375BC ldr r0, =gUnknown_020375BC
ldrb r0, [r0] ldrb r0, [r0]
@@ -305,7 +305,7 @@ _08098350:
_08098352: _08098352:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809833C thumb_func_end IsFieldMessageBoxHidden
thumb_func_start sub_8098358 thumb_func_start sub_8098358
sub_8098358: @ 8098358 sub_8098358: @ 8098358
asm/field_player_avatar.s
+4 -4
View File
@@ -1522,7 +1522,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
bl FieldObjectTurn bl FieldObjectTurn
movs r0, 0x8 movs r0, 0x8
bl SetPlayerAvatarStateMask bl SetPlayerAvatarStateMask
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3517,7 +3517,7 @@ _0808C3F0:
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl FieldObjectSetSpecialAnim bl FieldObjectSetSpecialAnim
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x10 movs r1, 0x10
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -3897,7 +3897,7 @@ sub_808C750: @ 808C750
lsrs r4, 24 lsrs r4, 24
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
bl sub_8085898 bl Overworld_ChangeMusicToDefault
ldr r2, =gPlayerAvatar ldr r2, =gPlayerAvatar
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0xF7 movs r0, 0xF7
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
ldr r0, =gPlayerAvatar ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6] strb r1, [r0, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8197434 bl sub_8197434
asm/field_poison.s
+1 -1
View File
@@ -178,7 +178,7 @@ _080F96A8:
strh r0, [r4] strh r0, [r4]
b _080F9722 b _080F9722
_080F96AE: _080F96AE:
bl sub_809833C bl IsFieldMessageBoxHidden
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F9722 beq _080F9722
asm/field_screen.s
+17 -17
View File
@@ -7503,8 +7503,8 @@ _080AED78:
bx r0 bx r0
thumb_func_end bag_add_task0_by_acit thumb_func_end bag_add_task0_by_acit
thumb_func_start sub_80AED7C thumb_func_start SetSav1Weather
sub_80AED7C: @ 80AED7C SetSav1Weather: @ 80AED7C
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gSaveBlock1Ptr ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
@@ -7525,7 +7525,7 @@ sub_80AED7C: @ 80AED7C
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80AED7C thumb_func_end SetSav1Weather
thumb_func_start sav1_get_weather_probably thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 80AEDAC sav1_get_weather_probably: @ 80AEDAC
@@ -7564,7 +7564,7 @@ sub_80AEDBC: @ 80AEDBC
thumb_func_start sub_80AEDF0 thumb_func_start sub_80AEDF0
sub_80AEDF0: @ 80AEDF0 sub_80AEDF0: @ 80AEDF0
push {lr} push {lr}
bl sub_80AED7C bl SetSav1Weather
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -7576,7 +7576,7 @@ sub_80AEDF0: @ 80AEDF0
thumb_func_start sub_80AEE08 thumb_func_start sub_80AEE08
sub_80AEE08: @ 80AEE08 sub_80AEE08: @ 80AEE08
push {lr} push {lr}
bl sub_80AED7C bl SetSav1Weather
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -7585,8 +7585,8 @@ sub_80AEE08: @ 80AEE08
bx r0 bx r0
thumb_func_end sub_80AEE08 thumb_func_end sub_80AEE08
thumb_func_start sub_80AEE20 thumb_func_start DoCurrentWeather
sub_80AEE20: @ 80AEE20 DoCurrentWeather: @ 80AEE20
push {r4,r5,lr} push {r4,r5,lr}
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
@@ -7627,7 +7627,7 @@ _080AEE6E:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80AEE20 thumb_func_end DoCurrentWeather
thumb_func_start sub_80AEE84 thumb_func_start sub_80AEE84
sub_80AEE84: @ 80AEE84 sub_80AEE84: @ 80AEE84
@@ -8390,7 +8390,7 @@ _080AF480:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_808A854 bl FieldSetDoorOpened
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF54A b _080AF54A
@@ -8427,7 +8427,7 @@ _080AF4DC:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_808A8AC bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1 cmp r0, 0x1
beq _080AF54A beq _080AF54A
_080AF536: _080AF536:
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0x4 movs r0, 0x4
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF54A b _080AF54A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AF60A beq _080AF60A
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0x3 movs r0, 0x3
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF60A b _080AF60A
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C bl sub_80AF71C
cmp r0, 0 cmp r0, 0
beq _080AF65A beq _080AF65A
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
@@ -9142,7 +9142,7 @@ _080AFAD4:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl cur_mapdata_get_door_sound_at bl GetDoorSoundEffect
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl PlaySE bl PlaySE
@@ -9151,7 +9151,7 @@ _080AFAD4:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl task_overworld_door_add_if_role_69_for_opening_door_at bl FieldAnimateDoorOpen
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -9211,7 +9211,7 @@ _080AFB6C:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl sub_808A8AC bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4 bl sub_808D1B4
cmp r0, 0x1 cmp r0, 0x1
beq _080B01B6 beq _080B01B6
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
asm/field_tasks.s
+4 -4
View File
@@ -46,7 +46,7 @@ _0809D8CA:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0809D8FC beq _0809D8FC
bl sub_809E7B0 bl DoTimeBasedEvents
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
b _0809D8FA b _0809D8FA
@@ -144,8 +144,8 @@ _0809D992:
.pool .pool
thumb_func_end overworld_ensure_per_step_coros_running thumb_func_end overworld_ensure_per_step_coros_running
thumb_func_start activate_per_step_callback thumb_func_start ActivatePerStepCallback
activate_per_step_callback: @ 809D9A8 ActivatePerStepCallback: @ 809D9A8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -180,7 +180,7 @@ _0809D9EA:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end activate_per_step_callback thumb_func_end ActivatePerStepCallback
thumb_func_start wild_encounter_reset_coro_args thumb_func_start wild_encounter_reset_coro_args
wild_encounter_reset_coro_args: @ 809D9F0 wild_encounter_reset_coro_args: @ 809D9F0
asm/fldeff_80F9BCC.s
+16 -16
View File
@@ -486,7 +486,7 @@ sub_80F9F78: @ 80F9F78
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080F9FC0 beq _080F9FC0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4] ldr r0, [r1, 0x4]
cmp r0, 0x2 cmp r0, 0x2
beq _080F9FAE beq _080F9FAE
@@ -517,7 +517,7 @@ _080F9FB6:
movs r0, 0x18 movs r0, 0x18
b _080F9FFC b _080F9FFC
_080F9FC0: _080F9FC0:
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4] ldr r0, [r1, 0x4]
cmp r0, 0x2 cmp r0, 0x2
beq _080F9FEA beq _080F9FEA
@@ -643,7 +643,7 @@ _080FA0C4:
sub_80FA0DC: @ 80FA0DC sub_80FA0DC: @ 80FA0DC
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
sub_80FA1E8: @ 80FA1E8 sub_80FA1E8: @ 80FA1E8
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -836,13 +836,13 @@ sub_80FA248: @ 80FA248
ands r2, r0 ands r2, r0
cmp r2, 0x96 cmp r2, 0x96
bne _080FA26A bne _080FA26A
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r0, 0 movs r0, 0
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
_080FA26A: _080FA26A:
cmp r2, 0x9C cmp r2, 0x9C
bne _080FA274 bne _080FA274
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r0, 0x2 movs r0, 0x2
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
_080FA274: _080FA274:
@@ -858,7 +858,7 @@ _080FA274:
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x9B movs r0, 0x9B
bl PlaySE bl PlaySE
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r1, [r0, 0x1C] ldr r1, [r0, 0x1C]
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x2A adds r2, 0x2A
@@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
asrs r0, 16 asrs r0, 16
cmp r0, 0x27 cmp r0, 0x27
ble _080FA32E ble _080FA32E
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
cmp r0, 0 cmp r0, 0
beq _080FA322 beq _080FA322
@@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
sub_80FA34C: @ 80FA34C sub_80FA34C: @ 80FA34C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r0, [r0, r2] ldrsh r0, [r0, r2]
@@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
adds r5, r0, 0 adds r5, r0, 0
movs r0, 0x83 movs r0, 0x83
bl PlaySE bl PlaySE
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
subs r1, 0x1 subs r1, 0x1
@@ -1953,7 +1953,7 @@ _080FABDC:
lsls r2, 2 lsls r2, 2
bl MapGridSetMetatileIdAt bl MapGridSetMetatileIdAt
_080FABEA: _080FABEA:
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
ldr r2, =0x0000020a ldr r2, =0x0000020a
@@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
b _080FAC54 b _080FAC54
_080FAC38: _080FAC38:
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
ldr r2, =0x00000e8c ldr r2, =0x00000e8c
asm/fldeff_cut.s
+2 -2
View File
@@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
movs r0, 0x1 movs r0, 0x1
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
sub_80D3A9C: @ 80D3A9C sub_80D3A9C: @ 80D3A9C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/fldeff_groundshake.s
+2 -2
View File
@@ -161,7 +161,7 @@ sub_81BE79C: @ 81BE79C
beq _081BE7B8 beq _081BE7B8
movs r0, 0xA7 movs r0, 0xA7
lsls r0, 1 lsls r0, 1
bl FlagReset bl FlagClear
b _081BE7EE b _081BE7EE
.pool .pool
_081BE7B8: _081BE7B8:
@@ -188,7 +188,7 @@ _081BE7D4:
_081BE7E6: _081BE7E6:
movs r0, 0xA7 movs r0, 0xA7
lsls r0, 1 lsls r0, 1
bl FlagReset bl FlagClear
_081BE7EE: _081BE7EE:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/fldeff_strength.s
+2 -2
View File
@@ -40,7 +40,7 @@ _08145DF2:
sub_8145E0C: @ 8145E0C sub_8145E0C: @ 8145E0C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
lsrs r0, r2, 16 lsrs r0, r2, 16
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
strh r2, [r1, 0x1A] strh r2, [r1, 0x1A]
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
movs r0, 0x33 movs r0, 0x33
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/fldeff_teleport.s
+1 -1
View File
@@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
movs r0, 0x3F movs r0, 0x3F
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/international_string_util.s
-121
View File
@@ -5,127 +5,6 @@
.text .text
thumb_func_start GetStringCenterAlignXOffset
@ s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
GetStringCenterAlignXOffset: @ 81DB35C
push {lr}
movs r3, 0
bl GetStringCenterAlignXOffsetWithLetterSpacing
pop {r1}
bx r1
thumb_func_end GetStringCenterAlignXOffset
thumb_func_start GetStringRightAlignXOffset
@ s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
GetStringRightAlignXOffset: @ 81DB368
push {lr}
movs r3, 0
bl GetStringWidthDifference
pop {r1}
bx r1
thumb_func_end GetStringRightAlignXOffset
thumb_func_start GetStringCenterAlignXOffsetWithLetterSpacing
@ s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
GetStringCenterAlignXOffsetWithLetterSpacing: @ 81DB374
push {lr}
bl GetStringWidthDifference
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
pop {r1}
bx r1
thumb_func_end GetStringCenterAlignXOffsetWithLetterSpacing
thumb_func_start GetStringWidthDifference
@ s32 GetStringWidthDifference(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
GetStringWidthDifference: @ 81DB384
push {r4,lr}
adds r4, r2, 0
adds r2, r3, 0
lsls r0, 24
lsrs r0, 24
lsls r2, 16
asrs r2, 16
bl GetStringWidth
cmp r4, r0
bgt _081DB39E
movs r0, 0
b _081DB3A0
_081DB39E:
subs r0, r4, r0
_081DB3A0:
pop {r4}
pop {r1}
bx r1
thumb_func_end GetStringWidthDifference
thumb_func_start GetMaxWidthInMenuTable
GetMaxWidthInMenuTable: @ 81DB3A8
push {r4-r6,lr}
movs r6, 0
cmp r6, r1
bge _081DB3CC
adds r5, r0, 0
adds r4, r1, 0
_081DB3B4:
ldr r1, [r5]
movs r0, 0x1
movs r2, 0
bl GetStringWidth
cmp r0, r6
ble _081DB3C4
adds r6, r0, 0
_081DB3C4:
adds r5, 0x8
subs r4, 0x1
cmp r4, 0
bne _081DB3B4
_081DB3CC:
adds r0, r6, 0
bl convert_pixel_width_to_tile_width
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end GetMaxWidthInMenuTable
thumb_func_start sub_81DB3D8
sub_81DB3D8: @ 81DB3D8
push {r4-r7,lr}
mov r7, r8
push {r7}
mov r8, r0
adds r7, r1, 0
adds r5, r2, 0
movs r6, 0
movs r4, 0
cmp r6, r5
bge _081DB40A
_081DB3EC:
adds r0, r7, r4
ldrb r0, [r0]
lsls r0, 3
add r0, r8
ldr r1, [r0]
movs r0, 0x1
movs r2, 0
bl GetStringWidth
cmp r0, r6
ble _081DB404
adds r6, r0, 0
_081DB404:
adds r4, 0x1
cmp r4, r5
blt _081DB3EC
_081DB40A:
adds r0, r6, 0
bl convert_pixel_width_to_tile_width
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81DB3D8
thumb_func_start sub_81DB41C thumb_func_start sub_81DB41C
sub_81DB41C: @ 81DB41C sub_81DB41C: @ 81DB41C
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/item.s
+6 -6
View File
@@ -676,8 +676,8 @@ _080D6D04:
.pool .pool
thumb_func_end sub_80D6CE4 thumb_func_end sub_80D6CE4
thumb_func_start sub_80D6D1C thumb_func_start CheckPCHasItem
sub_80D6D1C: @ 80D6D1C CheckPCHasItem: @ 80D6D1C
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -717,10 +717,10 @@ _080D6D68:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D6D1C thumb_func_end CheckPCHasItem
thumb_func_start sub_80D6D70 thumb_func_start AddPCItem
sub_80D6D70: @ 80D6D70 AddPCItem: @ 80D6D70
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -819,7 +819,7 @@ _080D6E3A:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80D6D70 thumb_func_end AddPCItem
thumb_func_start sub_80D6E48 thumb_func_start sub_80D6E48
sub_80D6E48: @ 80D6E48 sub_80D6E48: @ 80D6E48
asm/item_menu.s
+1 -1
View File
@@ -5388,7 +5388,7 @@ _081ADB6C:
ldrh r0, [r4] ldrh r0, [r4]
mov r3, r8 mov r3, r8
ldrh r1, [r3, 0x10] ldrh r1, [r3, 0x10]
bl sub_80D6D70 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x1 cmp r6, 0x1
asm/item_use.s
+2 -2
View File
@@ -2215,7 +2215,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagSet bl FlagSet
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagReset bl FlagClear
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildLured ldr r1, =gText_UsedVar2WildLured
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -2225,7 +2225,7 @@ _080FE278:
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagSet bl FlagSet
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagReset bl FlagClear
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildRepelled ldr r1, =gText_UsedVar2WildRepelled
bl StringExpandPlaceholders bl StringExpandPlaceholders
asm/link.s
+15 -15
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
@@ -21117,7 +21117,7 @@ sub_8014290: @ 8014290
asrs r5, 24 asrs r5, 24
str r5, [sp] str r5, [sp]
adds r3, r4, 0 adds r3, r4, 0
bl warp1_set bl Overworld_SetWarpDestination
ldr r0, [r6] ldr r0, [r6]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
@@ -21182,7 +21182,7 @@ sub_8014304: @ 8014304
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
mov r3, r8 mov r3, r8
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
add sp, 0x4 add sp, 0x4
pop {r3} pop {r3}
@@ -28312,7 +28312,7 @@ _080181BC:
sub_80181CC: @ 80181CC sub_80181CC: @ 80181CC
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_80983E8 bl ScriptFreezeMapObjects
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80181CC thumb_func_end sub_80181CC
@@ -31292,7 +31292,7 @@ flag_clear_x63: @ 8019A64
adds r0, r1 adds r0, r1
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -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/mail.s
-1035
View File
File diff suppressed because it is too large Load Diff
asm/map_obj_8097404.s
+5 -5
View File
@@ -205,8 +205,8 @@ _0809756C:
.pool .pool
thumb_func_end npc_sync_anim_pause_bits thumb_func_end npc_sync_anim_pause_bits
thumb_func_start sub_809757C thumb_func_start UnfreezeMapObjects
sub_809757C: @ 809757C UnfreezeMapObjects: @ 809757C
push {r4,r5,lr} push {r4,r5,lr}
movs r4, 0 movs r4, 0
ldr r5, =gMapObjects ldr r5, =gMapObjects
@@ -231,7 +231,7 @@ _08097598:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_809757C thumb_func_end UnfreezeMapObjects
thumb_func_start little_step thumb_func_start little_step
@ void little_step(struct obj *object, u8 direction) @ void little_step(struct obj *object, u8 direction)
@@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
adds r0, r1, 0 adds r0, r1, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4 adds r2, r1, 0x4
adds r3, r1, 0 adds r3, r1, 0
adds r3, 0x8 adds r3, 0x8
@@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
adds r4, r1, 0 adds r4, r1, 0
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo bl GetFieldObjectGraphicsInfo
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x20 movs r3, 0x20
ldrsh r1, [r4, r3] ldrsh r1, [r4, r3]
str r1, [r2] str r1, [r2]
asm/map_obj_lock.s
+8 -8
View File
@@ -59,8 +59,8 @@ _080983E2:
bx r1 bx r1
thumb_func_end sub_80983C4 thumb_func_end sub_80983C4
thumb_func_start sub_80983E8 thumb_func_start ScriptFreezeMapObjects
sub_80983E8: @ 80983E8 ScriptFreezeMapObjects: @ 80983E8
push {lr} push {lr}
bl player_bitmagic bl player_bitmagic
ldr r0, =sub_80983A4 ldr r0, =sub_80983A4
@@ -69,7 +69,7 @@ sub_80983E8: @ 80983E8
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80983E8 thumb_func_end ScriptFreezeMapObjects
thumb_func_start sub_8098400 thumb_func_start sub_8098400
sub_8098400: @ 8098400 sub_8098400: @ 8098400
@@ -149,8 +149,8 @@ _0809849A:
bx r1 bx r1
thumb_func_end sub_809847C thumb_func_end sub_809847C
thumb_func_start sub_80984A0 thumb_func_start LockSelectedMapObject
sub_80984A0: @ 80984A0 LockSelectedMapObject: @ 80984A0
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gSelectedMapObject ldr r4, =gSelectedMapObject
ldrb r0, [r4] ldrb r0, [r4]
@@ -184,7 +184,7 @@ _080984DE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80984A0 thumb_func_end LockSelectedMapObject
thumb_func_start sub_80984F4 thumb_func_start sub_80984F4
sub_80984F4: @ 80984F4 sub_80984F4: @ 80984F4
@@ -203,7 +203,7 @@ sub_80984F4: @ 80984F4
adds r0, r1 adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -239,7 +239,7 @@ _08098542:
adds r0, r4 adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
asm/mystery_event_script.s
+4 -4
View File
@@ -46,7 +46,7 @@ sub_8153804: @ 8153804
ldr r1, =gUnknown_08674C86 ldr r1, =gUnknown_08674C86
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl sub_81538C4 bl SetMysteryEventScriptStatus
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -140,13 +140,13 @@ _081538AC:
.pool .pool
thumb_func_end sub_81538A0 thumb_func_end sub_81538A0
thumb_func_start sub_81538C4 thumb_func_start SetMysteryEventScriptStatus
sub_81538C4: @ 81538C4 SetMysteryEventScriptStatus: @ 81538C4
ldr r1, =gUnknown_0203BBC0 ldr r1, =gUnknown_0203BBC0
str r0, [r1, 0x6C] str r0, [r1, 0x6C]
bx lr bx lr
.pool .pool
thumb_func_end sub_81538C4 thumb_func_end SetMysteryEventScriptStatus
thumb_func_start sub_81538D0 thumb_func_start sub_81538D0
sub_81538D0: @ 81538D0 sub_81538D0: @ 81538D0
asm/party_menu.s
+8 -8
View File
@@ -5441,7 +5441,7 @@ sub_81B2E64: @ 81B2E64
mov r2, r9 mov r2, r9
lsls r1, r2, 16 lsls r1, r2, 16
asrs r1, 16 asrs r1, 16
bl sub_8075060 bl GetHPBarLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x2 cmp r0, 0x2
@@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750
cmp r0, 0x1 cmp r0, 0x1
bne _081B577C bne _081B577C
bl brm_get_selected_species bl brm_get_selected_species
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
str r0, [r1] str r0, [r1]
@@ -10135,7 +10135,7 @@ _081B57FE:
hm_surf_run_dp02scr: @ 81B5804 hm_surf_run_dp02scr: @ 81B5804
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
hm2_waterfall: @ 81B58D4 hm2_waterfall: @ 81B58D4
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10299,7 +10299,7 @@ _081B594E:
sub_81B5958: @ 81B5958 sub_81B5958: @ 81B5958
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
sub_81B5974: @ 81B5974 sub_81B5974: @ 81B5974
push {lr} push {lr}
bl sub_809D1E8 bl sub_809D1E8
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1, 0x4] str r0, [r1, 0x4]
@@ -10452,7 +10452,7 @@ sub_81B5A8C: @ 81B5A8C
asrs r2, 16 asrs r2, 16
adds r0, r1, 0 adds r0, r1, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8075060 bl GetHPBarLevel
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x2 cmp r0, 0x2
@@ -15205,7 +15205,7 @@ sub_81B841C: @ 81B841C
beq _081B8438 beq _081B8438
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80D6D70 bl AddPCItem
b _081B8440 b _081B8440
.pool .pool
_081B8438: _081B8438:
asm/player_pc.s
+1 -1
View File
@@ -31,7 +31,7 @@ _0816AE1A:
ldrh r0, [r0] ldrh r0, [r0]
adds r1, r6 adds r1, r6
ldrh r1, [r1] ldrh r1, [r1]
bl sub_80D6D70 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/pokemon_storage_system.s
+43 -43
View File
@@ -1043,7 +1043,7 @@ _080C77C2:
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r5, 0xD cmp r5, 0xD
bls _080C77C2 bls _080C77C2
bl sub_80D242C bl ResetWaldaWallpaper
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
@@ -6902,7 +6902,7 @@ sub_80CABE0: @ 80CABE0
cmp r1, r0 cmp r1, r0
beq _080CAC0A beq _080CAC0A
ldr r0, =0x000008d7 ldr r0, =0x000008d7
bl FlagReset bl FlagClear
ldr r4, =0x00004036 ldr r4, =0x00004036
bl StorageGetCurrentBox bl StorageGetCurrentBox
adds r1, r0, 0 adds r1, r0, 0
@@ -7122,7 +7122,7 @@ sub_80CADD8: @ 80CADD8
bl sub_80CFF34 bl sub_80CFF34
movs r0, 0x15 movs r0, 0x15
bl sub_80CFF34 bl sub_80CFF34
bl sub_80D2494 bl IsWaldaWallpaperUnlocked
cmp r0, 0 cmp r0, 0
beq _080CAE04 beq _080CAE04
movs r0, 0x16 movs r0, 0x16
@@ -10421,7 +10421,7 @@ _080CC888:
b _080CC9DA b _080CC9DA
.pool .pool
_080CC8C4: _080CC8C4:
bl sub_80D24A8 bl GetWaldaWallpaperPatternId
lsls r1, r0, 1 lsls r1, r0, 1
adds r1, r0 adds r1, r0
lsls r1, 2 lsls r1, 2
@@ -10448,13 +10448,13 @@ _080CC8C4:
adds r1, r4 adds r1, r4
movs r2, 0x20 movs r2, 0x20
bl CpuSet bl CpuSet
bl sub_80D2510 bl GetWaldaWallpaperColorsPtr
ldr r1, [r7] ldr r1, [r7]
ldr r2, =0x00000794 ldr r2, =0x00000794
adds r1, r2 adds r1, r2
movs r2, 0x2 movs r2, 0x2
bl CpuSet bl CpuSet
bl sub_80D2510 bl GetWaldaWallpaperColorsPtr
ldr r1, [r7] ldr r1, [r7]
ldr r3, =0x000007b4 ldr r3, =0x000007b4
adds r1, r3 adds r1, r3
@@ -10500,7 +10500,7 @@ _080CC976:
adds r1, r5 adds r1, r5
str r0, [r1] str r0, [r1]
ldr r4, =gUnknown_0857B004 ldr r4, =gUnknown_0857B004
bl sub_80D24DC bl GetWaldaWallpaperIconId
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
ldr r0, [r0] ldr r0, [r0]
@@ -21544,8 +21544,8 @@ _080D241E:
bx r1 bx r1
thumb_func_end sub_80D23A8 thumb_func_end sub_80D23A8
thumb_func_start sub_80D242C thumb_func_start ResetWaldaWallpaper
sub_80D242C: @ 80D242C ResetWaldaWallpaper: @ 80D242C
ldr r2, =gSaveBlock1Ptr ldr r2, =gSaveBlock1Ptr
ldr r0, [r2] ldr r0, [r2]
ldr r1, =0x00003d84 ldr r1, =0x00003d84
@@ -21575,10 +21575,10 @@ sub_80D242C: @ 80D242C
strb r0, [r1] strb r0, [r1]
bx lr bx lr
.pool .pool
thumb_func_end sub_80D242C thumb_func_end ResetWaldaWallpaper
thumb_func_start sub_80D2480 thumb_func_start SetWaldaWallpaperLockedOrUnlocked
sub_80D2480: @ 80D2480 SetWaldaWallpaperLockedOrUnlocked: @ 80D2480
ldr r1, =gSaveBlock1Ptr ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
ldr r2, =0x00003d86 ldr r2, =0x00003d86
@@ -21586,10 +21586,10 @@ sub_80D2480: @ 80D2480
strb r0, [r1] strb r0, [r1]
bx lr bx lr
.pool .pool
thumb_func_end sub_80D2480 thumb_func_end SetWaldaWallpaperLockedOrUnlocked
thumb_func_start sub_80D2494 thumb_func_start IsWaldaWallpaperUnlocked
sub_80D2494: @ 80D2494 IsWaldaWallpaperUnlocked: @ 80D2494
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d86 ldr r1, =0x00003d86
@@ -21597,10 +21597,10 @@ sub_80D2494: @ 80D2494
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.pool .pool
thumb_func_end sub_80D2494 thumb_func_end IsWaldaWallpaperUnlocked
thumb_func_start sub_80D24A8 thumb_func_start GetWaldaWallpaperPatternId
sub_80D24A8: @ 80D24A8 GetWaldaWallpaperPatternId: @ 80D24A8
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d85 ldr r1, =0x00003d85
@@ -21608,10 +21608,10 @@ sub_80D24A8: @ 80D24A8
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.pool .pool
thumb_func_end sub_80D24A8 thumb_func_end GetWaldaWallpaperPatternId
thumb_func_start sub_80D24BC thumb_func_start SetWaldaWallpaperPatternId
sub_80D24BC: @ 80D24BC SetWaldaWallpaperPatternId: @ 80D24BC
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -21626,10 +21626,10 @@ _080D24D0:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80D24BC thumb_func_end SetWaldaWallpaperPatternId
thumb_func_start sub_80D24DC thumb_func_start GetWaldaWallpaperIconId
sub_80D24DC: @ 80D24DC GetWaldaWallpaperIconId: @ 80D24DC
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d84 ldr r1, =0x00003d84
@@ -21637,10 +21637,10 @@ sub_80D24DC: @ 80D24DC
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.pool .pool
thumb_func_end sub_80D24DC thumb_func_end GetWaldaWallpaperIconId
thumb_func_start sub_80D24F0 thumb_func_start SetWaldaWallpaperIconId
sub_80D24F0: @ 80D24F0 SetWaldaWallpaperIconId: @ 80D24F0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -21655,20 +21655,20 @@ _080D2504:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80D24F0 thumb_func_end SetWaldaWallpaperIconId
thumb_func_start sub_80D2510 thumb_func_start GetWaldaWallpaperColorsPtr
sub_80D2510: @ 80D2510 GetWaldaWallpaperColorsPtr: @ 80D2510
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d70 ldr r1, =0x00003d70
adds r0, r1 adds r0, r1
bx lr bx lr
.pool .pool
thumb_func_end sub_80D2510 thumb_func_end GetWaldaWallpaperColorsPtr
thumb_func_start sub_80D2524 thumb_func_start SetWaldaWallpaperColors
sub_80D2524: @ 80D2524 SetWaldaWallpaperColors: @ 80D2524
push {r4,lr} push {r4,lr}
ldr r2, =gSaveBlock1Ptr ldr r2, =gSaveBlock1Ptr
ldr r2, [r2] ldr r2, [r2]
@@ -21682,20 +21682,20 @@ sub_80D2524: @ 80D2524
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80D2524 thumb_func_end SetWaldaWallpaperColors
thumb_func_start sub_80D2548 thumb_func_start GetWaldaPhrasePtr
sub_80D2548: @ 80D2548 GetWaldaPhrasePtr: @ 80D2548
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00003d74 ldr r1, =0x00003d74
adds r0, r1 adds r0, r1
bx lr bx lr
.pool .pool
thumb_func_end sub_80D2548 thumb_func_end GetWaldaPhrasePtr
thumb_func_start sub_80D255C thumb_func_start SetWaldaPhrase
sub_80D255C: @ 80D255C SetWaldaPhrase: @ 80D255C
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
@@ -21706,10 +21706,10 @@ sub_80D255C: @ 80D255C
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80D255C thumb_func_end SetWaldaPhrase
thumb_func_start sub_80D2578 thumb_func_start IsWaldaPhraseEmpty
sub_80D2578: @ 80D2578 IsWaldaPhraseEmpty: @ 80D2578
push {lr} push {lr}
movs r1, 0 movs r1, 0
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
@@ -21725,7 +21725,7 @@ _080D258C:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80D2578 thumb_func_end IsWaldaPhraseEmpty
thumb_func_start sub_80D259C thumb_func_start sub_80D259C
sub_80D259C: @ 80D259C sub_80D259C: @ 80D259C
asm/rayquaza_scene.s
-21
View File
@@ -5968,26 +5968,5 @@ _081D99B4:
bx r0 bx r0
thumb_func_end sub_81D98B4 thumb_func_end sub_81D98B4
thumb_func_start sub_81D99BC
sub_81D99BC: @ 81D99BC
push {r4,lr}
bl sub_80D2578
cmp r0, 0
bne _081D99DC
ldr r4, =gStringVar1
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
movs r0, 0x1
b _081D99DE
.pool
_081D99DC:
movs r0, 0
_081D99DE:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81D99BC
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/record_mixing.s
+2 -2
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
@@ -2266,7 +2266,7 @@ sub_80E7F68: @ 80E7F68
bne _080E7FE4 bne _080E7FE4
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80D6D1C bl CheckPCHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E7FE4 bne _080E7FE4
asm/rom3.s
-3775
View File
File diff suppressed because it is too large Load Diff
asm/rom4.s
+57 -57
View File
@@ -36,15 +36,15 @@ flag_var_implications_of_teleport_: @ 8084660
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -55,15 +55,15 @@ sub_808469C: @ 808469C
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
ldr r0, =gUnknown_08271862 ldr r0, =gUnknown_08271862
bl ScriptContext2_RunNewScript bl ScriptContext2_RunNewScript
pop {r0} pop {r0}
@@ -76,15 +76,15 @@ flagmods_08054D70: @ 80846E4
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -95,15 +95,15 @@ sub_8084720: @ 8084720
push {r4,lr} push {r4,lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
ldr r4, =0x00004039 ldr r4, =0x00004039
adds r0, r4, 0 adds r0, r4, 0
bl VarGet bl VarGet
@@ -128,7 +128,7 @@ _08084764:
sub_8084788: @ 8084788 sub_8084788: @ 8084788
push {lr} push {lr}
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
bl sub_8085B2C bl sub_8085B2C
bl wild_pokemon_reroll bl wild_pokemon_reroll
bl UpdateLocationHistoryForRoamer bl UpdateLocationHistoryForRoamer
@@ -324,8 +324,8 @@ _080848F4:
.pool .pool
thumb_func_end CopyFieldObjectTemplateCoordsToSav1 thumb_func_end CopyFieldObjectTemplateCoordsToSav1
thumb_func_start update_saveblock1_field_object_coords thumb_func_start Overworld_SetMapObjTemplateCoords
update_saveblock1_field_object_coords: @ 8084910 Overworld_SetMapObjTemplateCoords: @ 8084910
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -356,10 +356,10 @@ _08084944:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end update_saveblock1_field_object_coords thumb_func_end Overworld_SetMapObjTemplateCoords
thumb_func_start update_saveblock1_field_object_movement_behavior thumb_func_start Overworld_SetMapObjTemplateMovementType
update_saveblock1_field_object_movement_behavior: @ 808494C Overworld_SetMapObjTemplateMovementType: @ 808494C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -387,7 +387,7 @@ _08084978:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end update_saveblock1_field_object_movement_behavior thumb_func_end Overworld_SetMapObjTemplateMovementType
thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980 mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
@@ -710,9 +710,9 @@ warp_in: @ 8084BD8
bx r0 bx r0
thumb_func_end warp_in thumb_func_end warp_in
thumb_func_start warp1_set thumb_func_start Overworld_SetWarpDestination
@ void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y) @ void Overworld_SetWarpDestination(char bank, char map, char warpid, char enter_x, char enter_y)
warp1_set: @ 8084BEC Overworld_SetWarpDestination: @ 8084BEC
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -741,7 +741,7 @@ warp1_set: @ 8084BEC
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end warp1_set thumb_func_end Overworld_SetWarpDestination
thumb_func_start warp1_set_2 thumb_func_start warp1_set_2
@ void warp1_set_2(char bank, char map, char warpid) @ void warp1_set_2(char bank, char map, char warpid)
@@ -757,7 +757,7 @@ warp1_set_2: @ 8084C28
movs r3, 0x1 movs r3, 0x1
negs r3, r3 negs r3, r3
str r3, [sp] str r3, [sp]
bl warp1_set bl Overworld_SetWarpDestination
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
@@ -857,7 +857,7 @@ sub_8084CCC: @ 8084CCC
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
_08084CFA: _08084CFA:
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
@@ -879,8 +879,8 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
.pool .pool
thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1 thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
thumb_func_start sub_8084D1C thumb_func_start Overworld_SetHealLocationWarp
sub_8084D1C: @ 8084D1C Overworld_SetHealLocationWarp: @ 8084D1C
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -911,7 +911,7 @@ _08084D50:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8084D1C thumb_func_end Overworld_SetHealLocationWarp
thumb_func_start sub_8084D5C thumb_func_start sub_8084D5C
sub_8084D5C: @ 8084D5C sub_8084D5C: @ 8084D5C
@@ -1126,7 +1126,7 @@ _08084EF0:
lsls r4, r6, 24 lsls r4, r6, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
_08084F0A: _08084F0A:
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}
@@ -1289,7 +1289,7 @@ sub_8084FF8: @ 8084FF8
lsls r4, r5, 24 lsls r4, r5, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
b _0808504C b _0808504C
_08085030: _08085030:
bl mapheader_run_script_with_tag_x6 bl mapheader_run_script_with_tag_x6
@@ -1365,7 +1365,7 @@ mliX_load_map: @ 8085098
negs r3, r3 negs r3, r3
str r3, [sp] str r3, [sp]
adds r2, r3, 0 adds r2, r3, 0
bl warp1_set bl Overworld_SetWarpDestination
ldr r4, =gMapHeader ldr r4, =gMapHeader
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
cmp r0, 0x3A cmp r0, 0x3A
@@ -1382,7 +1382,7 @@ _080850C8:
adds r0, r6, 0 adds r0, r6, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80B21B4 bl sub_80B21B4
bl sub_809E7B0 bl DoTimeBasedEvents
bl sub_80AEDBC bl sub_80AEDBC
bl sub_8085B2C bl sub_8085B2C
bl update_sav1_flash_used_on_map bl update_sav1_flash_used_on_map
@@ -1404,7 +1404,7 @@ _08085116:
bl sub_80A0A2C bl sub_80A0A2C
bl UpdateLocationHistoryForRoamer bl UpdateLocationHistoryForRoamer
bl RoamerMove bl RoamerMove
bl sub_80AEE20 bl DoCurrentWeather
bl wild_encounter_reset_coro_args bl wild_encounter_reset_coro_args
bl mapheader_run_script_with_tag_x5 bl mapheader_run_script_with_tag_x5
ldr r2, =gMapHeader ldr r2, =gMapHeader
@@ -1481,14 +1481,14 @@ _080851A2:
bl sub_80B21B4 bl sub_80B21B4
cmp r7, 0x1 cmp r7, 0x1
beq _080851EE beq _080851EE
bl sub_809E7B0 bl DoTimeBasedEvents
_080851EE: _080851EE:
bl sub_80AEDBC bl sub_80AEDBC
bl sub_8085B2C bl sub_8085B2C
cmp r5, 0 cmp r5, 0
beq _08085200 beq _08085200
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
_08085200: _08085200:
bl update_sav1_flash_used_on_map bl update_sav1_flash_used_on_map
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
@@ -1858,8 +1858,8 @@ _080854DE:
.pool .pool
thumb_func_end update_sav1_flash_used_on_map thumb_func_end update_sav1_flash_used_on_map
thumb_func_start sub_80854EC thumb_func_start Overworld_SetFlashLevel
sub_80854EC: @ 80854EC Overworld_SetFlashLevel: @ 80854EC
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
cmp r1, 0 cmp r1, 0
@@ -1878,7 +1878,7 @@ _080854FE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80854EC thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8085514 sav1_get_flash_used_on_map: @ 8085514
@@ -2263,14 +2263,14 @@ _080857E8:
.pool .pool
thumb_func_end sub_8085784 thumb_func_end sub_8085784
thumb_func_start sav1_set_battle_music_maybe thumb_func_start Overworld_SetSavedMusic
sav1_set_battle_music_maybe: @ 80857F4 Overworld_SetSavedMusic: @ 80857F4
ldr r1, =gSaveBlock1Ptr ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x2C] strh r0, [r1, 0x2C]
bx lr bx lr
.pool .pool
thumb_func_end sav1_set_battle_music_maybe thumb_func_end Overworld_SetSavedMusic
thumb_func_start sav1_reset_battle_music_maybe thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8085800 sav1_reset_battle_music_maybe: @ 8085800
@@ -2339,8 +2339,8 @@ _08085890:
bx r0 bx r0
thumb_func_end sub_8085810 thumb_func_end sub_8085810
thumb_func_start sub_8085898 thumb_func_start Overworld_ChangeMusicToDefault
sub_8085898: @ 8085898 Overworld_ChangeMusicToDefault: @ 8085898
push {r4,lr} push {r4,lr}
bl GetCurrentMapMusic bl GetCurrentMapMusic
adds r4, r0, 0 adds r4, r0, 0
@@ -2360,10 +2360,10 @@ _080858BE:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8085898 thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start sub_80858C4 thumb_func_start Overworld_ChangeMusicTo
sub_80858C4: @ 80858C4 Overworld_ChangeMusicTo: @ 80858C4
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -2383,7 +2383,7 @@ _080858E4:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80858C4 thumb_func_end Overworld_ChangeMusicTo
thumb_func_start is_warp1_light_level_8_or_9 thumb_func_start is_warp1_light_level_8_or_9
is_warp1_light_level_8_or_9: @ 80858F0 is_warp1_light_level_8_or_9: @ 80858F0
@@ -3525,8 +3525,8 @@ _08086278:
_08086286: _08086286:
bl CopyFieldObjectTemplateCoordsToSav1 bl CopyFieldObjectTemplateCoordsToSav1
_0808628A: _0808628A:
bl sub_809757C bl UnfreezeMapObjects
bl sub_809E7B0 bl DoTimeBasedEvents
bl sub_8084788 bl sub_8084788
ldr r0, =gMapHeader ldr r0, =gMapHeader
ldrh r1, [r0, 0x12] ldrh r1, [r0, 0x12]
asm/rom6.s
+38 -38
View File
@@ -167,7 +167,7 @@ sub_8135578: @ 8135578
cmp r4, 0 cmp r4, 0
bne _081355FC bne _081355FC
bl player_get_direction_lower_nybble bl player_get_direction_lower_nybble
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r6, 0x4] str r0, [r6, 0x4]
@@ -303,7 +303,7 @@ _081356AC:
sub_81356C4: @ 81356C4 sub_81356C4: @ 81356C4
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -380,7 +380,7 @@ hm2_dig: @ 8135760
movs r0, 0x26 movs r0, 0x26
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -4337,7 +4337,7 @@ sub_8137988: @ 8137988
.pool .pool
_081379C8: _081379C8:
ldr r0, =0x0000089a ldr r0, =0x0000089a
bl FlagReset bl FlagClear
_081379CE: _081379CE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5030,7 +5030,7 @@ _08137F6E:
movs r1, 0 movs r1, 0
bl VarSet bl VarSet
movs r0, 0 movs r0, 0
bl sav1_set_battle_music_maybe bl Overworld_SetSavedMusic
_08137F7C: _08137F7C:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5056,7 +5056,7 @@ sub_8137F90: @ 8137F90
sub_8137FB0: @ 8137FB0 sub_8137FB0: @ 8137FB0
push {lr} push {lr}
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -6485,7 +6485,7 @@ sub_8138B8C: @ 8138B8C
movs r0, 0x13 movs r0, 0x13
movs r1, 0 movs r1, 0
movs r3, 0x6 movs r3, 0x6
bl warp1_set bl Overworld_SetWarpDestination
b _08138BC2 b _08138BC2
.pool .pool
_08138BB0: _08138BB0:
@@ -6496,7 +6496,7 @@ _08138BB0:
movs r0, 0x13 movs r0, 0x13
movs r1, 0x1 movs r1, 0x1
movs r3, 0x6 movs r3, 0x6
bl warp1_set bl Overworld_SetWarpDestination
_08138BC2: _08138BC2:
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
@@ -6537,7 +6537,7 @@ _08138BF6:
thumb_func_start sub_8138C04 thumb_func_start sub_8138C04
sub_8138C04: @ 8138C04 sub_8138C04: @ 8138C04
push {r4,lr} push {r4,lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7051,7 +7051,7 @@ sub_8138FEC: @ 8138FEC
ldr r1, =gSpecialVar_0x8004 ldr r1, =gSpecialVar_0x8004
ldr r0, =0x000001f5 ldr r0, =0x000001f5
strh r0, [r1] strh r0, [r1]
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -7060,7 +7060,7 @@ sub_8138FEC: @ 8138FEC
thumb_func_start sub_8139004 thumb_func_start sub_8139004
sub_8139004: @ 8139004 sub_8139004: @ 8139004
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7084,7 +7084,7 @@ _0813902A:
thumb_func_start sub_8139030 thumb_func_start sub_8139030
sub_8139030: @ 8139030 sub_8139030: @ 8139030
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7108,7 +7108,7 @@ _08139056:
thumb_func_start sub_813905C thumb_func_start sub_813905C
sub_813905C: @ 813905C sub_813905C: @ 813905C
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7132,7 +7132,7 @@ _08139082:
thumb_func_start sub_8139088 thumb_func_start sub_8139088
sub_8139088: @ 8139088 sub_8139088: @ 8139088
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7156,7 +7156,7 @@ _081390AE:
thumb_func_start sub_81390B4 thumb_func_start sub_81390B4
sub_81390B4: @ 81390B4 sub_81390B4: @ 81390B4
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7295,7 +7295,7 @@ RemoveScriptFieldObject: @ 81391AC
thumb_func_start sub_81391D0 thumb_func_start sub_81391D0
sub_81391D0: @ 81391D0 sub_81391D0: @ 81391D0
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7479,7 +7479,7 @@ _08139342:
thumb_func_start sub_8139348 thumb_func_start sub_8139348
sub_8139348: @ 8139348 sub_8139348: @ 8139348
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7507,7 +7507,7 @@ sub_8139370: @ 8139370
movs r1, 0x1 movs r1, 0x1
mov r0, sp mov r0, sp
strb r1, [r0] strb r1, [r0]
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7538,7 +7538,7 @@ _081393B6:
thumb_func_start sub_81393C8 thumb_func_start sub_81393C8
sub_81393C8: @ 81393C8 sub_81393C8: @ 81393C8
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7858,7 +7858,7 @@ sub_8139648: @ 8139648
cmp r0, 0x1 cmp r0, 0x1
beq _08139664 beq _08139664
movs r0, 0x14 movs r0, 0x14
bl sub_80AED7C bl SetSav1Weather
_08139664: _08139664:
pop {r0} pop {r0}
bx r0 bx r0
@@ -7876,14 +7876,14 @@ sub_8139668: @ 8139668
cmp r0, 0x1 cmp r0, 0x1
beq _08139684 beq _08139684
movs r0, 0x15 movs r0, 0x15
bl sub_80AED7C bl SetSav1Weather
_08139684: _08139684:
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8139668 thumb_func_end sub_8139668
thumb_func_start GetIdxOfFirstPartyMemberThatIsNotAnEgg thumb_func_start GetLeadMonIndex
GetIdxOfFirstPartyMemberThatIsNotAnEgg: @ 8139688 GetLeadMonIndex: @ 8139688
push {r4-r6,lr} push {r4-r6,lr}
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
lsls r0, 24 lsls r0, 24
@@ -7926,7 +7926,7 @@ _081396D8:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end GetIdxOfFirstPartyMemberThatIsNotAnEgg thumb_func_end GetLeadMonIndex
thumb_func_start sub_81396E0 thumb_func_start sub_81396E0
sub_81396E0: @ 81396E0 sub_81396E0: @ 81396E0
@@ -11039,7 +11039,7 @@ _0813B0F8:
ldr r0, =sub_813B160 ldr r0, =sub_813B160
movs r1, 0x8 movs r1, 0x8
bl CreateTask bl CreateTask
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r0, 0x1 movs r0, 0x1
str r0, [r3] str r0, [r3]
movs r0, 0x3A movs r0, 0x3A
@@ -11074,7 +11074,7 @@ _0813B13A:
adds r0, r5, r0 adds r0, r5, r0
ldrb r2, [r0] ldrb r2, [r0]
movs r0, 0x1 movs r0, 0x1
bl update_saveblock1_field_object_coords bl Overworld_SetMapObjTemplateCoords
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -11238,7 +11238,7 @@ _0813B27E:
cmp r0, r4 cmp r0, r4
beq _0813B2A6 beq _0813B2A6
ldr r0, =0x000008d7 ldr r0, =0x000008d7
bl FlagReset bl FlagClear
_0813B2A6: _0813B2A6:
ldr r0, =0x00004036 ldr r0, =0x00004036
lsrs r1, r7, 16 lsrs r1, r7, 16
@@ -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
@@ -11778,7 +11778,7 @@ _0813B728:
cmp r0, 0x2 cmp r0, 0x2
bne _0813B790 bne _0813B790
ldr r0, =gUnknown_0824979B ldr r0, =gUnknown_0824979B
bl box_related_two__3 bl ShowFieldAutoScrollMessage
b _0813B790 b _0813B790
.pool .pool
_0813B74C: _0813B74C:
@@ -11787,7 +11787,7 @@ _0813B74C:
cmp r0, 0x3 cmp r0, 0x3
bne _0813B790 bne _0813B790
ldr r0, =gUnknown_0824979B ldr r0, =gUnknown_0824979B
bl box_related_two__3 bl ShowFieldAutoScrollMessage
b _0813B790 b _0813B790
.pool .pool
_0813B764: _0813B764:
@@ -12075,7 +12075,7 @@ sub_813B9A0: @ 813B9A0
cmp r1, r0 cmp r1, r0
bne _0813B9B6 bne _0813B9B6
movs r0, 0x3 movs r0, 0x3
bl sub_8084D1C bl Overworld_SetHealLocationWarp
_0813B9B6: _0813B9B6:
pop {r0} pop {r0}
bx r0 bx r0
@@ -12187,16 +12187,16 @@ sub_813BA60: @ 813BA60
adds r1, r2 adds r1, r2
strh r0, [r1] strh r0, [r1]
ldr r0, =0x00000315 ldr r0, =0x00000315
bl FlagReset bl FlagClear
ldr r0, =0x00000316 ldr r0, =0x00000316
bl FlagReset bl FlagClear
ldr r0, =0x00000317 ldr r0, =0x00000317
bl FlagReset bl FlagClear
movs r0, 0xC6 movs r0, 0xC6
lsls r0, 2 lsls r0, 2
bl FlagReset bl FlagClear
ldr r0, =0x000002da ldr r0, =0x000002da
bl FlagReset bl FlagClear
ldr r0, =0x00004095 ldr r0, =0x00004095
movs r1, 0x1 movs r1, 0x1
bl VarSet bl VarSet
asm/rom_80A5C6C.s
+87 -87
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
@@ -1810,7 +1810,7 @@ _080A6A04:
GetBankSide: @ 80A6A30 GetBankSide: @ 80A6A30
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gBanksBySide ldr r1, =gBanksByIdentity
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
@@ -1823,7 +1823,7 @@ GetBankSide: @ 80A6A30
GetBankIdentity: @ 80A6A44 GetBankIdentity: @ 80A6A44
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gBanksBySide ldr r1, =gBanksByIdentity
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
@@ -1840,7 +1840,7 @@ GetBankByIdentity: @ 80A6A54
ldrb r2, [r0] ldrb r2, [r0]
cmp r1, r2 cmp r1, r2
bcs _080A6A7E bcs _080A6A7E
ldr r4, =gBanksBySide ldr r4, =gBanksByIdentity
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, r3 cmp r0, r3
beq _080A6A7E beq _080A6A7E
@@ -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,18 +1872,18 @@ 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
b _080A6B18 b _080A6B18
.pool .pool
_080A6ABC: _080A6ABC:
ldr r0, =gBanksBySide ldr r0, =gBanksByIdentity
adds r0, r4, r0 adds r0, r4, r0
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0xFF cmp r0, 0xFF
@@ -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/scrcmd.s
-5744
View File
File diff suppressed because it is too large Load Diff
asm/script_menu.s
+19 -19
View File
@@ -5,9 +5,9 @@
.text .text
thumb_func_start Multichoice thumb_func_start ScriptMenu_Multichoice
@ bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling) @ bool8 ScriptMenu_Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
Multichoice: @ 80E1E08 ScriptMenu_Multichoice: @ 80E1E08
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -44,10 +44,10 @@ _080E1E4E:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end Multichoice thumb_func_end ScriptMenu_Multichoice
thumb_func_start sub_80E1E58 thumb_func_start ScriptMenu_MultichoiceWithDefault
sub_80E1E58: @ 80E1E58 ScriptMenu_MultichoiceWithDefault: @ 80E1E58
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -91,7 +91,7 @@ _080E1EAA:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80E1E58 thumb_func_end ScriptMenu_MultichoiceWithDefault
thumb_func_start sub_80E1EB8 thumb_func_start sub_80E1EB8
sub_80E1EB8: @ 80E1EB8 sub_80E1EB8: @ 80E1EB8
@@ -379,8 +379,8 @@ _080E20FC:
.pool .pool
thumb_func_end sub_80E2058 thumb_func_end sub_80E2058
thumb_func_start yes_no_box thumb_func_start ScriptMenu_YesNo
yes_no_box: @ 80E2108 ScriptMenu_YesNo: @ 80E2108
push {r4,lr} push {r4,lr}
ldr r4, =task_yes_no_maybe ldr r4, =task_yes_no_maybe
adds r0, r4, 0 adds r0, r4, 0
@@ -405,7 +405,7 @@ _080E213A:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end yes_no_box thumb_func_end ScriptMenu_YesNo
thumb_func_start sub_80E2140 thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140 sub_80E2140: @ 80E2140
@@ -485,8 +485,8 @@ _080E21C4:
.pool .pool
thumb_func_end task_yes_no_maybe thumb_func_end task_yes_no_maybe
thumb_func_start sub_80E21D0 thumb_func_start ScriptMenu_MultichoiceGrid
sub_80E21D0: @ 80E21D0 ScriptMenu_MultichoiceGrid: @ 80E21D0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -627,7 +627,7 @@ _080E22E8:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80E21D0 thumb_func_end ScriptMenu_MultichoiceGrid
thumb_func_start sub_80E2308 thumb_func_start sub_80E2308
sub_80E2308: @ 80E2308 sub_80E2308: @ 80E2308
@@ -1334,8 +1334,8 @@ _080E28F8:
bx r0 bx r0
thumb_func_end task_picbox thumb_func_end task_picbox
thumb_func_start sub_80E2900 thumb_func_start ScriptMenu_ShowPokemonPic
sub_80E2900: @ 80E2900 ScriptMenu_ShowPokemonPic: @ 80E2900
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1422,10 +1422,10 @@ _080E29BA:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80E2900 thumb_func_end ScriptMenu_ShowPokemonPic
thumb_func_start picbox_close thumb_func_start ScriptMenu_GetPicboxWaitFunc
picbox_close: @ 80E29C4 ScriptMenu_GetPicboxWaitFunc: @ 80E29C4
push {lr} push {lr}
ldr r0, =task_picbox ldr r0, =task_picbox
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -1449,7 +1449,7 @@ _080E29F4:
_080E29F6: _080E29F6:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end picbox_close thumb_func_end ScriptMenu_GetPicboxWaitFunc
thumb_func_start sub_80E29FC thumb_func_start sub_80E29FC
sub_80E29FC: @ 80E29FC sub_80E29FC: @ 80E29FC
asm/script_movement.s
+6 -6
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start exec_movement thumb_func_start ScriptMovement_StartObjectMovementScript
exec_movement: @ 80D32E8 ScriptMovement_StartObjectMovementScript: @ 80D32E8
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r3, 0 adds r4, r3, 0
@@ -47,10 +47,10 @@ _080D3332:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end exec_movement thumb_func_end ScriptMovement_StartObjectMovementScript
thumb_func_start sub_80D3340 thumb_func_start ScriptMovement_IsObjectMovementFinished
sub_80D3340: @ 80D3340 ScriptMovement_IsObjectMovementFinished: @ 80D3340
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -87,7 +87,7 @@ _080D3384:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D3340 thumb_func_end ScriptMovement_IsObjectMovementFinished
thumb_func_start sub_80D338C thumb_func_start sub_80D338C
sub_80D338C: @ 80D338C sub_80D338C: @ 80D338C
asm/script_pokemon_util_80F87D8.s
+17 -17
View File
@@ -83,7 +83,7 @@ sub_80F8850: @ 80F8850
thumb_func_start sub_80F8864 thumb_func_start sub_80F8864
sub_80F8864: @ 80F8864 sub_80F8864: @ 80F8864
push {lr} push {lr}
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080F88A4 bhi _080F88A4
@@ -397,8 +397,8 @@ sub_80F8ACC: @ 80F8ACC
.pool .pool
thumb_func_end sub_80F8ACC thumb_func_end sub_80F8ACC
thumb_func_start sub_80F8ADC thumb_func_start ShowContestWinner
sub_80F8ADC: @ 80F8ADC ShowContestWinner: @ 80F8ADC
push {lr} push {lr}
ldr r0, =sub_812FDEC ldr r0, =sub_812FDEC
bl SetMainCallback2 bl SetMainCallback2
@@ -408,7 +408,7 @@ sub_80F8ADC: @ 80F8ADC
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F8ADC thumb_func_end ShowContestWinner
thumb_func_start sub_80F8AFC thumb_func_start sub_80F8AFC
sub_80F8AFC: @ 80F8AFC sub_80F8AFC: @ 80F8AFC
@@ -1269,9 +1269,9 @@ _080F922C:
.pool .pool
thumb_func_end sp000_heal_pokemon thumb_func_end sp000_heal_pokemon
thumb_func_start sub_80F9244 thumb_func_start ScriptGiveMon
@ void sub_80F9244(s16 species_num, u8 level, int held_item) @ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
sub_80F9244: @ 80F9244 ScriptGiveMon: @ 80F9244
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -1332,10 +1332,10 @@ _080F92B8:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80F9244 thumb_func_end ScriptGiveMon
thumb_func_start sub_80F92C8 thumb_func_start ScriptGiveEgg
sub_80F92C8: @ 80F92C8 ScriptGiveEgg: @ 80F92C8
push {lr} push {lr}
sub sp, 0x68 sub sp, 0x68
adds r1, r0, 0 adds r1, r0, 0
@@ -1357,7 +1357,7 @@ sub_80F92C8: @ 80F92C8
add sp, 0x68 add sp, 0x68
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80F92C8 thumb_func_end ScriptGiveEgg
thumb_func_start sub_80F92F8 thumb_func_start sub_80F92F8
sub_80F92F8: @ 80F92F8 sub_80F92F8: @ 80F92F8
@@ -1450,8 +1450,8 @@ _080F9392:
.pool .pool
thumb_func_end sub_80F9370 thumb_func_end sub_80F9370
thumb_func_start sub_80F93A0 thumb_func_start CreateScriptedWildMon
sub_80F93A0: @ 80F93A0 CreateScriptedWildMon: @ 80F93A0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1496,10 +1496,10 @@ _080F93EE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F93A0 thumb_func_end CreateScriptedWildMon
thumb_func_start sub_80F9400 thumb_func_start ScriptSetMonMoveSlot
sub_80F9400: @ 80F9400 ScriptSetMonMoveSlot: @ 80F9400
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -1525,7 +1525,7 @@ _080F941C:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F9400 thumb_func_end ScriptSetMonMoveSlot
thumb_func_start sub_80F9438 thumb_func_start sub_80F9438
sub_80F9438: @ 80F9438 sub_80F9438: @ 80F9438
asm/secret_base.s
+2 -2
View File
@@ -861,7 +861,7 @@ sub_80E916C: @ 80E916C
asrs r0, 24 asrs r0, 24
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
ldr r1, =gFieldCallback ldr r1, =gFieldCallback
ldr r0, =sub_80E9108 ldr r0, =sub_80E9108
@@ -1208,7 +1208,7 @@ _080E9462:
adds r0, 0xAE adds r0, 0xAE
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
ldrb r0, [r6] ldrb r0, [r6]
ldr r5, =gSaveBlock1Ptr ldr r5, =gSaveBlock1Ptr
ldr r2, [r5] ldr r2, [r5]
asm/shop.s
+1 -1
View File
@@ -2465,7 +2465,7 @@ BuyMenuSubtractMoney: @ 80E0F88
lsls r2, 6 lsls r2, 6
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl SubtractMoney bl RemoveMoney
movs r0, 0x5F movs r0, 0x5F
bl PlaySE bl PlaySE
ldr r0, [r5] ldr r0, [r5]
asm/slot_machine.s
+3 -3
View File
@@ -55,8 +55,8 @@ _0812A530:
.pool .pool
thumb_func_end sub_812A4DC thumb_func_end sub_812A4DC
thumb_func_start sub_812A540 thumb_func_start PlaySlotMachine
sub_812A540: @ 812A540 PlaySlotMachine: @ 812A540
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -85,7 +85,7 @@ sub_812A540: @ 812A540
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_812A540 thumb_func_end PlaySlotMachine
thumb_func_start sub_812A588 thumb_func_start sub_812A588
sub_812A588: @ 812A588 sub_812A588: @ 812A588
asm/trade.s
+5 -5
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}
@@ -5954,7 +5954,7 @@ _0807A488:
asrs r0, 16 asrs r0, 16
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075060 bl GetHPBarLevel
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x5D adds r1, 0x5D
adds r1, r6 adds r1, r6
@@ -5997,7 +5997,7 @@ _0807A4E8:
asrs r0, 16 asrs r0, 16
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075060 bl GetHPBarLevel
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x63 adds r1, 0x63
adds r1, r6 adds r1, r6
@@ -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}
asm/trainer_rematch.s
+1 -1
View File
@@ -185,7 +185,7 @@ _081DA6D4:
adds r0, r1 adds r0, r1
adds r0, r6 adds r0, r6
ldrh r0, [r0] ldrh r0, [r0]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA6F0 bne _081DA6F0
asm/trainer_see.s
+6 -6
View File
@@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
adds r4, r2, 0 adds r4, r2, 0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4 adds r2, r1, 0x4
adds r3, r1, 0 adds r3, r1, 0
adds r3, 0x8 adds r3, 0x8
@@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B4426 beq _080B4426
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x10 movs r1, 0x10
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -1303,7 +1303,7 @@ sub_80B45D0: @ 80B45D0
ldr r1, =gScriptResult ldr r1, =gScriptResult
movs r0, 0x1 movs r0, 0x1
strh r0, [r1] strh r0, [r1]
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =gUnknown_03006090 ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC] ldrb r0, [r0, 0xC]
bl sub_80974D0 bl sub_80974D0
@@ -1432,7 +1432,7 @@ sub_80B46D8: @ 80B46D8
orrs r3, r4 orrs r3, r4
mov r4, r12 mov r4, r12
strb r3, [r4] strb r3, [r4]
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4] ldr r3, [r4]
strh r3, [r0, 0x2E] strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4] ldr r3, [r4, 0x4]
@@ -1609,7 +1609,7 @@ sub_80B4808: @ 80B4808
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
movs r0, 0xFF movs r0, 0xFF
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _080B489E b _080B489E
.pool .pool
_080B4870: _080B4870:
@@ -1633,7 +1633,7 @@ _080B4870:
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
movs r0, 0xFF movs r0, 0xFF
bl exec_movement bl ScriptMovement_StartObjectMovementScript
_080B489E: _080B489E:
movs r0, 0xFF movs r0, 0xFF
bl sub_809BE48 bl sub_809BE48
asm/walda_phrase.s
-543
View File
@@ -1,543 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start walda_maybe
walda_maybe: @ 81D99E4
push {r4,lr}
sub sp, 0x8
ldr r4, =gStringVar2
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
movs r0, 0
str r0, [sp]
ldr r0, =sub_81D9A1C
str r0, [sp, 0x4]
movs r0, 0x4
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl DoNamingScreen
add sp, 0x8
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end walda_maybe
thumb_func_start sub_81D9A1C
sub_81D9A1C: @ 81D9A1C
push {r4,r5,lr}
ldr r4, =gSpecialVar_0x8004
ldr r5, =gStringVar2
adds r0, r5, 0
bl sub_81D9A98
strh r0, [r4]
ldrh r0, [r4]
cmp r0, 0x1
beq _081D9A68
cmp r0, 0x1
bgt _081D9A44
cmp r0, 0
beq _081D9A62
b _081D9A68
.pool
_081D9A44:
cmp r0, 0x2
bne _081D9A68
bl sub_80D2578
cmp r0, 0
beq _081D9A5C
ldr r0, =gText_Peekaboo
bl sub_80D255C
b _081D9A68
.pool
_081D9A5C:
movs r0, 0x1
strh r0, [r4]
b _081D9A68
_081D9A62:
adds r0, r5, 0
bl sub_80D255C
_081D9A68:
ldr r4, =gStringVar1
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9A1C
thumb_func_start sub_81D9A98
sub_81D9A98: @ 81D9A98
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4]
cmp r0, 0xFF
bne _081D9AA6
movs r0, 0x2
b _081D9ABC
_081D9AA6:
bl sub_80D2548
adds r1, r0, 0
adds r0, r4, 0
bl StringCompare
cmp r0, 0
beq _081D9ABA
movs r0, 0
b _081D9ABC
_081D9ABA:
movs r0, 0x1
_081D9ABC:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81D9A98
thumb_func_start sub_81D9AC4
sub_81D9AC4: @ 81D9AC4
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xA
bl ReadUnalignedWord
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =gScriptResult
mov r8, r0
bl sub_80D2548
mov r7, sp
adds r7, 0xA
add r6, sp, 0xC
mov r5, sp
adds r5, 0xD
str r4, [sp]
str r0, [sp, 0x4]
add r0, sp, 0x8
adds r1, r7, 0
adds r2, r6, 0
adds r3, r5, 0
bl sub_81D9B68
mov r1, r8
strh r0, [r1]
lsls r0, 16
cmp r0, 0
beq _081D9B1E
ldrb r0, [r5]
bl sub_80D24BC
ldrb r0, [r6]
bl sub_80D24F0
add r0, sp, 0x8
ldrh r0, [r0]
ldrh r1, [r7]
bl sub_80D2524
_081D9B1E:
mov r1, r8
ldrh r0, [r1]
bl sub_80D2480
mov r1, r8
ldrb r0, [r1]
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81D9AC4
thumb_func_start sub_81D9B40
sub_81D9B40: @ 81D9B40
push {lr}
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
ldr r3, =gUnknown_0862AD14
_081D9B4A:
adds r0, r1, r3
ldrb r0, [r0]
cmp r0, r2
bne _081D9B5C
lsls r0, r1, 24
lsrs r0, 24
b _081D9B64
.pool
_081D9B5C:
adds r1, 0x1
cmp r1, 0x1F
bls _081D9B4A
movs r0, 0x20
_081D9B64:
pop {r1}
bx r1
thumb_func_end sub_81D9B40
thumb_func_start sub_81D9B68
sub_81D9B68: @ 81D9B68
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x2C
mov r10, r0
str r1, [sp, 0x20]
str r2, [sp, 0x24]
str r3, [sp, 0x28]
ldr r0, [sp, 0x4C]
ldr r5, [sp, 0x50]
lsls r0, 16
lsrs r0, 16
mov r9, r0
adds r0, r5, 0
bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0xF
bne _081D9C7E
movs r4, 0
add r7, sp, 0x10
_081D9B98:
adds r0, r5, r4
ldrb r0, [r0]
bl sub_81D9B40
adds r1, r7, r4
strb r0, [r1]
lsls r0, 24
lsrs r0, 24
cmp r0, 0x20
beq _081D9C7E
adds r4, 0x1
cmp r4, 0xE
ble _081D9B98
movs r6, 0x3
movs r5, 0
movs r0, 0x5
mov r8, r0
movs r4, 0xD
_081D9BBC:
mov r1, r8
str r1, [sp]
add r0, sp, 0x4
adds r1, r7, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_81D9D5C
adds r6, 0x8
adds r5, 0x5
subs r4, 0x1
cmp r4, 0
bge _081D9BBC
movs r0, 0x2
str r0, [sp]
add r0, sp, 0x4
adds r1, r7, 0
movs r2, 0x46
movs r3, 0x73
bl sub_81D9D5C
add r0, sp, 0x4
movs r1, 0
movs r2, 0x3
bl sub_81D9DAC
adds r4, r0, 0
adds r0, r7, 0
movs r1, 0x75
movs r2, 0x3
bl sub_81D9DAC
cmp r4, r0
bne _081D9C7E
add r0, sp, 0x4
movs r1, 0x9
movs r2, 0x15
bl sub_81D9C90
add r0, sp, 0x4
ldrb r0, [r0, 0x8]
movs r2, 0xF
ands r2, r0
add r0, sp, 0x4
movs r1, 0x8
bl sub_81D9C90
add r0, sp, 0x4
ldrb r2, [r0, 0x8]
lsrs r2, 4
movs r1, 0x8
bl sub_81D9CDC
add r0, sp, 0x4
ldrb r2, [r0, 0x6]
adds r1, r0, 0
ldrb r0, [r0]
ldrb r1, [r1, 0x2]
eors r0, r1
add r1, sp, 0x4
ldrb r4, [r1, 0x4]
eors r0, r4
mov r3, r9
lsrs r1, r3, 8
eors r0, r1
cmp r2, r0
bne _081D9C7E
add r0, sp, 0x4
ldrb r3, [r0, 0x7]
adds r2, r0, 0
ldrb r1, [r0, 0x1]
ldrb r0, [r2, 0x3]
eors r1, r0
adds r0, r2, 0
ldrb r2, [r0, 0x5]
eors r1, r2
movs r0, 0xFF
mov r5, r9
ands r0, r5
eors r1, r0
cmp r3, r1
bne _081D9C7E
add r0, sp, 0x4
ldrh r0, [r0]
mov r1, r10
strh r0, [r1]
mov r0, sp
adds r0, 0x6
ldrh r0, [r0]
ldr r3, [sp, 0x20]
strh r0, [r3]
ldr r5, [sp, 0x24]
strb r4, [r5]
ldr r0, [sp, 0x28]
strb r2, [r0]
movs r0, 0x1
b _081D9C80
_081D9C7E:
movs r0, 0
_081D9C80:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81D9B68
thumb_func_start sub_81D9C90
sub_81D9C90: @ 81D9C90
push {r4-r7,lr}
adds r7, r0, 0
mov r12, r1
subs r3, r2, 0x1
cmp r2, 0
beq _081D9CD6
_081D9C9C:
ldrb r1, [r7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r4, r0, 31
mov r2, r12
subs r2, 0x1
subs r5, r3, 0x1
cmp r2, 0
blt _081D9CCC
movs r6, 0x80
adds r3, r2, r7
_081D9CB4:
ldrb r1, [r3]
adds r0, r6, 0
ands r0, r1
lsls r0, 24
lsls r1, 1
orrs r4, r1
strb r4, [r3]
lsrs r4, r0, 31
subs r3, 0x1
subs r2, 0x1
cmp r2, 0
bge _081D9CB4
_081D9CCC:
adds r3, r5, 0
movs r0, 0x1
negs r0, r0
cmp r3, r0
bne _081D9C9C
_081D9CD6:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81D9C90
thumb_func_start sub_81D9CDC
sub_81D9CDC: @ 81D9CDC
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
lsls r2, 24
lsrs r3, r2, 24
lsls r0, r3, 4
orrs r3, r0
lsls r0, r3, 24
lsrs r3, r0, 24
movs r4, 0
cmp r4, r5
bcs _081D9D04
_081D9CF4:
adds r2, r6, r4
ldrb r1, [r2]
adds r0, r3, 0
eors r0, r1
strb r0, [r2]
adds r4, 0x1
cmp r4, r5
bcc _081D9CF4
_081D9D04:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81D9CDC
thumb_func_start sub_81D9D0C
sub_81D9D0C: @ 81D9D0C
push {lr}
lsrs r3, r1, 3
movs r2, 0x7
ands r2, r1
movs r1, 0x80
asrs r1, r2
adds r0, r3
ldrb r0, [r0]
ands r0, r1
cmp r0, 0
beq _081D9D24
movs r0, 0x1
_081D9D24:
pop {r1}
bx r1
thumb_func_end sub_81D9D0C
thumb_func_start sub_81D9D28
sub_81D9D28: @ 81D9D28
lsrs r3, r1, 3
movs r2, 0x7
ands r2, r1
movs r1, 0x80
asrs r1, r2
lsls r1, 24
lsrs r1, 24
adds r0, r3
ldrb r2, [r0]
orrs r1, r2
strb r1, [r0]
bx lr
thumb_func_end sub_81D9D28
thumb_func_start sub_81D9D40
sub_81D9D40: @ 81D9D40
lsrs r3, r1, 3
movs r2, 0x7
ands r2, r1
movs r1, 0x80
asrs r1, r2
mvns r1, r1
lsls r1, 24
lsrs r1, 24
adds r0, r3
ldrb r2, [r0]
ands r1, r2
strb r1, [r0]
bx lr
thumb_func_end sub_81D9D40
thumb_func_start sub_81D9D5C
sub_81D9D5C: @ 81D9D5C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r6, r0, 0
mov r9, r1
adds r1, r2, 0
mov r8, r3
ldr r7, [sp, 0x1C]
movs r5, 0
cmp r5, r7
bcs _081D9DA0
adds r4, r1, 0
_081D9D76:
mov r0, r8
adds r1, r0, r5
mov r0, r9
bl sub_81D9D0C
lsls r0, 24
cmp r0, 0
beq _081D9D90
adds r0, r6, 0
adds r1, r4, 0
bl sub_81D9D28
b _081D9D98
_081D9D90:
adds r0, r6, 0
adds r1, r4, 0
bl sub_81D9D40
_081D9D98:
adds r4, 0x1
adds r5, 0x1
cmp r5, r7
bcc _081D9D76
_081D9DA0:
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81D9D5C
thumb_func_start sub_81D9DAC
sub_81D9DAC: @ 81D9DAC
push {r4-r7,lr}
mov r7, r8
push {r7}
mov r8, r0
adds r7, r1, 0
adds r6, r2, 0
movs r4, 0
movs r5, 0
cmp r4, r6
bcs _081D9DD6
_081D9DC0:
lsls r4, 1
adds r1, r7, r5
mov r0, r8
bl sub_81D9D0C
lsls r0, 24
lsrs r0, 24
orrs r4, r0
adds r5, 0x1
cmp r5, r6
bcc _081D9DC0
_081D9DD6:
adds r0, r4, 0
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81D9DAC
.align 2, 0 @ Don't pad with nop.
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/battle_interface.s
-180
View File
@@ -1,180 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C138:: @ 832C138
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C140:: @ 832C140
spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C158:: @ 832C158
spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C170:: @ 832C170
spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C188:: @ 832C188
spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1A0:: @ 832C1A0
spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1B8:: @ 832C1B8
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C1C0:: @ 832C1C0
spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1D8:: @ 832C1D8
spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1F0:: @ 832C1F0
spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C208:: @ 832C208
spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C220:: @ 832C220
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
.byte 0x30, 0x20, 0x85, 0x43
.align 2
gUnknown_0832C234:: @ 832C234
.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
.byte 0x30, 0x20, 0x85, 0x47
.align 2
gUnknown_0832C248:: @ 832C248
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C250:: @ 832C250
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C258:: @ 832C258
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.align 2
gUnknown_0832C260:: @ 832C260
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x80, 0x40
.align 2
gUnknown_0832C26C:: @ 832C26C
.4byte 0x00000005, gUnknown_0832C220
.4byte 0x00000002, gUnknown_0832C248
.4byte 0x00000005, gUnknown_0832C234
.4byte 0x00000002, gUnknown_0832C250
.align 2
gUnknown_0832C28C:: @ 832C28C
.4byte 0x00000002, gUnknown_0832C258
.4byte 0x00000003, gUnknown_0832C260
.align 2
gUnknown_0832C29C:: @ 832C29C
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2AC:: @ 832C2AC
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2C4:: @ 832C2C4
.4byte 0x00000004, gUnknown_0832C29C
.align 2
gUnknown_0832C2CC:: @ 832C2CC
.4byte 0x00000006, gUnknown_0832C2AC
.align 2
gUnknown_0832C2D4:: @ 832C2D4
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
.align 2
gUnknown_0832C334:: @ 832C334
obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
.align 2
gUnknown_0832C33C:: @ 832C33C
obj_pal gBattleInterface_BallStatusBarPal, 0xd710
.align 2
gUnknown_0832C344:: @ 832C344
obj_pal gBattleInterface_BallDisplayPal, 0xd712
.align 2
gUnknown_0832C34C:: @ 832C34C
obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
.align 2
gUnknown_0832C354:: @ 832C354
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C35C:: @ 832C35C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C364:: @ 832C364
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C37C:: @ 832C37C
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C394:: @ 832C394
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3AC:: @ 832C3AC
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3C4:: @ 832C3C4
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3D8:: @ 832C3D8
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3EC:: @ 832C3EC
.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
.byte 0xdc, 0x29, 0x00, 0x00
.align 2
gUnknown_0832C3F8:: @ 832C3F8
.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
data/event_script_command_function_table.inc
+227 -227
View File
@@ -1,229 +1,229 @@
.align 2 .align 2
gScriptCmdTable:: @ 81DB67C gScriptCmdTable:: @ 81DB67C
.4byte s00_nop .4byte ScrCmd_nop
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s02_end .4byte ScrCmd_end
.4byte s03_return .4byte ScrCmd_return
.4byte s04_call .4byte ScrCmd_call
.4byte s05_goto .4byte ScrCmd_goto
.4byte s06_if_jump .4byte ScrCmd_goto_if
.4byte s07_if_call .4byte ScrCmd_call_if
.4byte s08_jumpstd .4byte ScrCmd_gotostd
.4byte s09_callstd .4byte ScrCmd_callstd
.4byte s0A_jumpstd_if .4byte ScrCmd_gotostd_if
.4byte s0B_callstd_if .4byte ScrCmd_callstd_if
.4byte s0C_restore_execution_after_sCF .4byte ScrCmd_gotoram
.4byte s0D_endscript_killram .4byte ScrCmd_killscript
.4byte s0E_set_byte .4byte ScrCmd_setmysteryeventstatus
.4byte s0F_u32_var_to_const .4byte ScrCmd_loadword
.4byte s10_u8_var_to_const .4byte ScrCmd_loadbyte
.4byte s11_u8_ptr_to_const .4byte ScrCmd_writebytetoaddr
.4byte s12_u32_var_to_ptr .4byte ScrCmd_loadbytefromaddr
.4byte s13_u8_var_to_ptr .4byte ScrCmd_setptrbyte
.4byte s14_u32_var_to_var .4byte ScrCmd_copylocal
.4byte s15_u8_ptr_to_ptr .4byte ScrCmd_copybyte
.4byte s16_u16_gvar_to_const .4byte ScrCmd_setvar
.4byte s17_u16_gvar_add_const .4byte ScrCmd_addvar
.4byte sub_809993C .4byte ScrCmd_subvar
.4byte s19_u16_gvar_gvar .4byte ScrCmd_copyvar
.4byte s1A_u16_gvar_gvar .4byte ScrCmd_setorcopyvar
.4byte s1B_cmp_u8_var_var .4byte ScrCmd_compare_local_to_local
.4byte s1C_cmp_u8_var_const .4byte ScrCmd_compare_local_to_value
.4byte s1D_cmp_u8_var_ptr .4byte ScrCmd_compare_local_to_addr
.4byte s1E_cmp_u8_ptr_var .4byte ScrCmd_compare_addr_to_local
.4byte s1F_cmp_u8_ptr_const .4byte ScrCmd_compare_addr_to_value
.4byte s20_cmp_u8_ptr_ptr .4byte ScrCmd_compare_addr_to_addr
.4byte s21_cmp_u16_gvar_const .4byte ScrCmd_compare_var_to_value
.4byte s22_cmp_u16_gvar_gvar .4byte ScrCmd_compare_var_to_var
.4byte s23_execute_ASM .4byte ScrCmd_callnative
.4byte s24_execute_ASM_2 .4byte ScrCmd_gotonative
.4byte s25_extended_cmd .4byte ScrCmd_special
.4byte s26_extended_cmd_setvar .4byte ScrCmd_specialvar
.4byte s27_set_to_waitstate .4byte ScrCmd_waitstate
.4byte s28_pause .4byte ScrCmd_delay
.4byte s29_flag_set .4byte ScrCmd_setflag
.4byte s2A_flag_clear .4byte ScrCmd_clearflag
.4byte s2B_flag_check .4byte ScrCmd_checkflag
.4byte s2C_unknown .4byte ScrCmd_initclock
.4byte s2D_unknown .4byte ScrCmd_dodailyevents
.4byte s2E_unknown .4byte ScrCmd_gettime
.4byte s2F_music_play .4byte ScrCmd_playse
.4byte s30_music_check .4byte ScrCmd_waitse
.4byte s31_PlayFanfare .4byte ScrCmd_playfanfare
.4byte s32_fanfare_wait .4byte ScrCmd_waitfanfare
.4byte s33_play_music .4byte ScrCmd_playbgm
.4byte s34_unknown .4byte ScrCmd_savebgm
.4byte s35_fade_to_default .4byte ScrCmd_fadedefaultbgm
.4byte s36_fade_to_music .4byte ScrCmd_fadenewbgm
.4byte s37_fadeout .4byte ScrCmd_fadeoutbgm
.4byte s38_fadein .4byte ScrCmd_fadeinbgm
.4byte s39_warp_sfx .4byte ScrCmd_warp
.4byte s3A_warp_new_music .4byte ScrCmd_warpsilent
.4byte s3B_warp_keep_music .4byte ScrCmd_warpdoor
.4byte sub_809A054 .4byte ScrCmd_warphole
.4byte s3D_warp_v4 .4byte ScrCmd_warpteleport
.4byte s3E_set_new_map .4byte ScrCmd_setwarp
.4byte s3F_set_new_map_DMA .4byte ScrCmd_setdynamicwarp
.4byte sub_809A2DC .4byte ScrCmd_setdivewarp
.4byte sub_809A35C .4byte ScrCmd_setholewarp
.4byte s42_get_map_camera_pos .4byte ScrCmd_getplayerxy
.4byte s43_get_player_party_count .4byte ScrCmd_countpokemon
.4byte sub_80999A0 .4byte ScrCmd_additem
.4byte sub_80999E4 .4byte ScrCmd_removeitem
.4byte sub_8099A28 .4byte ScrCmd_checkitemspace
.4byte sub_8099A6C .4byte ScrCmd_checkitem
.4byte s48_get_item_type .4byte ScrCmd_checkitemtype
.4byte sub_8099ADC .4byte ScrCmd_addpcitem
.4byte sub_8099B20 .4byte ScrCmd_checkpcitem
.4byte sub_8099B64 .4byte ScrCmd_adddecor
.4byte sub_8099B90 .4byte ScrCmd_removedecor
.4byte sub_8099BE8 .4byte ScrCmd_hasdecor
.4byte sub_8099BBC .4byte ScrCmd_checkdecor
.4byte s4F_execute_movement .4byte ScrCmd_applymovement
.4byte s50_execute_movement_remote .4byte ScrCmd_applymovement_at
.4byte s51_waitmove .4byte ScrCmd_waitmovement
.4byte s52_waitmove_remote .4byte ScrCmd_waitmovement_at
.4byte s53_hide_sprite .4byte ScrCmd_removeobject
.4byte s54_hide_sprite_set_coords .4byte ScrCmd_removeobject_at
.4byte s55_show_sprite .4byte ScrCmd_addobject
.4byte s56_show_sprite_set_coords .4byte ScrCmd_addobject_at
.4byte s57_move_sprites .4byte ScrCmd_setobjectxy
.4byte s58_npc_f1_clear_x20 .4byte ScrCmd_showobject
.4byte s59_npc_f1_set_x20 .4byte ScrCmd_hideobject
.4byte s5A_face_player .4byte ScrCmd_faceplayer
.4byte s5B_npc_set_direction .4byte ScrCmd_turnobject
.4byte s5C_trainer_battle_configure_and_start .4byte ScrCmd_trainerbattle
.4byte sub_809B5E4 .4byte ScrCmd_battlebegin
.4byte sub_809B5F0 .4byte ScrCmd_ontrainerbattleend
.4byte sub_809B604 .4byte ScrCmd_ontrainerbattleendgoto
.4byte s60_check_trainer_flag .4byte ScrCmd_checktrainerflag
.4byte s61_set_trainer_flag .4byte ScrCmd_settrainerflag
.4byte s62_unset_trainer_flag .4byte ScrCmd_cleartrainerflag
.4byte s63_new_sprite_location_permanent .4byte ScrCmd_setobjectxyperm
.4byte s64_set_sprite_top_left_corner .4byte ScrCmd_moveobjectoffscreen
.4byte s65_set_sprite_behaviour .4byte ScrCmd_setobjectmovementtype
.4byte sub_809AC78 .4byte ScrCmd_waitmessage
.4byte s67_execute_box .4byte ScrCmd_message
.4byte s68_close_box .4byte ScrCmd_closemessage
.4byte sub_809AAC4 .4byte ScrCmd_lockall
.4byte sub_809AAEC .4byte ScrCmd_lock
.4byte s6B_release .4byte ScrCmd_releaseall
.4byte s6C_release_2 .4byte ScrCmd_release
.4byte sub_809ACC0 .4byte ScrCmd_waitbutton
.4byte s6E_yes_no .4byte ScrCmd_yesnobox
.4byte s6F_multichoice .4byte ScrCmd_multichoice
.4byte sub_809AD3C .4byte ScrCmd_multichoicedefault
.4byte sub_809AD90 .4byte ScrCmd_multichoicegrid
.4byte sub_809AD8C .4byte ScrCmd_drawbox
.4byte s73_nop_skip_word .4byte ScrCmd_erasebox
.4byte sub_809ADEC .4byte ScrCmd_drawboxtext
.4byte sub_809ADF8 .4byte ScrCmd_drawpokepic
.4byte s76_close_picture_box .4byte ScrCmd_erasepokepic
.4byte sub_809AE48 .4byte ScrCmd_drawcontestwinner
.4byte sub_809AE6C .4byte ScrCmd_braillemessage
.4byte s79_give_pokemon .4byte ScrCmd_givepoke
.4byte s7A_create_egg .4byte ScrCmd_giveegg
.4byte s7B_change_pokedata_AP .4byte ScrCmd_setpokemove
.4byte sub_809B3DC .4byte ScrCmd_checkpokemove
.4byte s7D_load_pokename .4byte ScrCmd_getspeciesname
.4byte s7E_load_first_pokenames .4byte ScrCmd_getfirstpartypokename
.4byte s7F_load_pokename_team .4byte ScrCmd_getpartypokename
.4byte s80_load_item_name .4byte ScrCmd_getitemname
.4byte sub_809B114 .4byte ScrCmd_getdecorname
.4byte s82_load_item_name .4byte ScrCmd_getmovename
.4byte s83_load_textvar_var .4byte ScrCmd_getnumberstring
.4byte s84_load_textvar_std_expression .4byte ScrCmd_getstdstring
.4byte s85_load_textvar_pointer .4byte ScrCmd_getstring
.4byte s86_pokemart .4byte ScrCmd_pokemart
.4byte s87_pokemartdecor .4byte ScrCmd_pokemartdecor
.4byte s88_pokemartbp .4byte ScrCmd_pokemartbp
.4byte s89_open_casino_game1 .4byte ScrCmd_playslotmachine
.4byte berry_script_cmd .4byte ScrCmd_plantberrytree
.4byte sub_809B784 .4byte ScrCmd_choosecontestpkmn
.4byte sub_809B794 .4byte ScrCmd_startcontest
.4byte sub_809B7A4 .4byte ScrCmd_showcontestresults
.4byte sub_809B7B4 .4byte ScrCmd_contestlinktransfer
.4byte s8F_get_random_val .4byte ScrCmd_random
.4byte s90_AddMoney .4byte ScrCmd_givemoney
.4byte s91_SubtractMoney .4byte ScrCmd_takemoney
.4byte s92_check_money .4byte ScrCmd_checkmoney
.4byte s93_display_money .4byte ScrCmd_showmoneybox
.4byte s94_hide_money .4byte ScrCmd_hidemoneybox
.4byte s95_update_money .4byte ScrCmd_updatemoneybox
.4byte sub_809B758 .4byte ScrCmd_getpricereduction
.4byte s97_screen_special_effect .4byte ScrCmd_fadescreen
.4byte s98_refade_with_timer .4byte ScrCmd_fadescreendelay
.4byte s99_unknown .4byte ScrCmd_setdarklevel
.4byte s9A_unknown .4byte ScrCmd_animdarklevel
.4byte s9B_unknown .4byte ScrCmd_messageautoscroll
.4byte s9C_execute_HM .4byte ScrCmd_dofieldeffect
.4byte s9D_set_HM_animation_data .4byte ScrCmd_setfieldeffect
.4byte s9E_checkarray_HM_animation .4byte ScrCmd_waitfieldeffect
.4byte s9F_changeposition_fly .4byte ScrCmd_sethealplace
.4byte sA0_check_gender .4byte ScrCmd_checkplayergender
.4byte sA1_play_cry .4byte ScrCmd_playpokecry
.4byte sA2_setmaptile .4byte ScrCmd_setmaptile
.4byte sA3_set_standard_weather_data .4byte ScrCmd_resetweather
.4byte sA4_set_weather_data .4byte ScrCmd_setweather
.4byte sub_8099E7C .4byte ScrCmd_doweather
.4byte sA6_activate_per_step_callback_eg_ash .4byte ScrCmd_tileeffect
.4byte sA7_set_new_map_footer .4byte ScrCmd_setmaplayoutindex
.4byte sA8_unknown .4byte ScrCmd_setobjectpriority
.4byte sA9_unknown .4byte ScrCmd_resetobjectpriority
.4byte sAA_create_new_sprite .4byte ScrCmd_createvobject
.4byte sAB_unknown .4byte ScrCmd_turnvobject
.4byte sAC_open_door .4byte ScrCmd_opendoor
.4byte sub_809B9C8 .4byte ScrCmd_closedoor
.4byte sub_809BA24 .4byte ScrCmd_waitdooranim
.4byte sub_809BA38 .4byte ScrCmd_setdooropen
.4byte sub_809BA7C .4byte ScrCmd_setdoorclosed
.4byte sub_809BAC0 .4byte ScrCmd_addelevmenuitem
.4byte sub_809BAFC .4byte ScrCmd_showelevmenu
.4byte sB3_get_coin_amount .4byte ScrCmd_checkcoins
.4byte sub_809BB20 .4byte ScrCmd_givecoins
.4byte sub_809BB58 .4byte ScrCmd_takecoins
.4byte sB6_load_battle .4byte ScrCmd_setwildbattle
.4byte sub_809B6A8 .4byte ScrCmd_dowildbattle
.4byte sB8_set_virtual_address .4byte ScrCmd_setvaddress
.4byte sB9_virtual_jump .4byte ScrCmd_vgoto
.4byte sBA_virtual_call .4byte ScrCmd_vcall
.4byte sBB_virtual_if_jump .4byte ScrCmd_vgoto_if
.4byte sBC_virtual_if_call .4byte ScrCmd_vcall_if
.4byte sBD_virtual_message .4byte ScrCmd_vmessage
.4byte sBE_virtual_load_text .4byte ScrCmd_vloadword
.4byte sBF_virtual_load_textbuffer .4byte ScrCmd_vgetstring
.4byte sub_809B578 .4byte ScrCmd_showcoinsbox
.4byte sC1_hide_coins .4byte ScrCmd_hidecoinsbox
.4byte sC2_update_coins .4byte ScrCmd_updatecoinsbox
.4byte sC3_unknown .4byte ScrCmd_incrementgamestat
.4byte sC4_unknown .4byte ScrCmd_setescapewarp
.4byte sub_809B8DC .4byte ScrCmd_waitpokecry
.4byte sC6_load_textvar_box_label .4byte ScrCmd_getboxname
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte sCD_set_obedient_bit .4byte ScrCmd_setpokeobedient
.4byte sCE_check_obedient_bit .4byte ScrCmd_checkpokeobedience
.4byte sCF_execute_RAM_script_DMA .4byte ScrCmd_cmdCF
.4byte s01_nop .4byte ScrCmd_nop1
.4byte sD1_warp_v5 .4byte ScrCmd_warpD1
.4byte sub_809BD70 .4byte ScrCmd_setpokemetlocation
.4byte sub_809BB90 .4byte ScrCmd_mossdeepgym1
.4byte sub_809BBB4 .4byte ScrCmd_mossdeepgym2
.4byte ScrCmd_MossdeepGymSwitch .4byte ScrCmd_mossdeepgym3
.4byte sub_809BBDC .4byte ScrCmd_mossdeepgym4
.4byte sub_809A150 .4byte ScrCmd_warpD7
.4byte sub_809BBE8 .4byte ScrCmd_cmdD8
.4byte sub_809BBFC .4byte ScrCmd_cmdD9
.4byte sub_809AF94 .4byte ScrCmd_cmdDA
.4byte sub_809AC3C .4byte ScrCmd_cmdDB
.4byte sub_8099D20 .4byte ScrCmd_fadescreenswapbuffers
.4byte sub_809BDD0 .4byte ScrCmd_gettrainerclass
.4byte sub_809BE0C .4byte ScrCmd_gettrainername
.4byte sub_809ABF0 .4byte ScrCmd_pokenavcall
.4byte sub_809BE54 .4byte ScrCmd_warpE0
.4byte sub_809B214 .4byte ScrCmd_getcontesttype
.4byte sub_809B0C4 .4byte ScrCmd_getitemnameplural
data/event_scripts.s
+3 -4
View File
@@ -12,13 +12,12 @@ gScriptCmdTableEnd:: @ 81DBA08
gSpecialVars:: @ 81DBA0C gSpecialVars:: @ 81DBA0C
.incbin "baserom.gba", 0x1dba0c, 0x58 .incbin "baserom.gba", 0x1dba0c, 0x58
gUnknown_081DBA64:: @ 81DBA64 .include "data/specials.inc"
.incbin "baserom.gba", 0x1dba64, 0x83c
gUnknown_081DC2A0:: @ 81DC2A0 gStdScripts:: @ 81DC2A0
.incbin "baserom.gba", 0x1dc2a0, 0x2c .incbin "baserom.gba", 0x1dc2a0, 0x2c
gUnknown_081DC2CC:: @ 81DC2CC gStdScripts_End:: @ 81DC2CC
.incbin "baserom.gba", 0x1dc2cc, 0x34ee .incbin "baserom.gba", 0x1dc2cc, 0x34ee
gUnknown_081DF7BA:: @ 81DF7BA gUnknown_081DF7BA:: @ 81DF7BA
data/graphics.s
+111 -3
View File
@@ -39,7 +39,7 @@ gBattleInterface_BallDisplayPal:: @ 8C11BBC
.incbin "graphics/battle_interface/ball_display.gbapal" .incbin "graphics/battle_interface/ball_display.gbapal"
.align 2 .align 2
gUnknown_08C11BDC:: @ 8C11BDC gHealthboxElementsGfxTable:: @ 8C11BDC
.incbin "baserom.gba", 0xc11bdc, 0x840 .incbin "baserom.gba", 0xc11bdc, 0x840
.align 2 .align 2
@@ -910,8 +910,116 @@ gCableCarCord_Gfx:: @ 8DBC2C0
gUnknown_08DBC2E8:: @ 8DBC2E8 gUnknown_08DBC2E8:: @ 8DBC2E8
.incbin "baserom.gba", 0xdbc2e8, 0x72c .incbin "baserom.gba", 0xdbc2e8, 0x72c
gUnknown_08DBCA14:: @ 8DBCA14 gUnknown_08DBCA14:: @ 0x08DBCA14
.incbin "baserom.gba", 0xdbca14, 0x3d00 .incbin "baserom.gba", 0xdbca14, 0x1e04
gUnknown_08DBE818:: @ 0x08DBE818
.incbin "baserom.gba", 0xdbe818, 0x20
gUnknown_08DBE838:: @ 0x08DBE838
.incbin "baserom.gba", 0xdbe838, 0x20
gUnknown_08DBE858:: @ 0x08DBE858
.incbin "baserom.gba", 0xdbe858, 0x20
gUnknown_08DBE878:: @ 0x08DBE878
.incbin "baserom.gba", 0xdbe878, 0x20
gUnknown_08DBE898:: @ 0x08DBE898
.incbin "baserom.gba", 0xdbe898, 0x20
gUnknown_08DBE8B8:: @ 0x08DBE8B8
.incbin "baserom.gba", 0xdbe8b8, 0x20
gUnknown_08DBE8D8:: @ 0x08DBE8D8
.incbin "baserom.gba", 0xdbe8d8, 0x20
gUnknown_08DBE8F8:: @ 0x08DBE8F8
.incbin "baserom.gba", 0xdbe8f8, 0x20
gUnknown_08DBE918:: @ 0x08DBE918
.incbin "baserom.gba", 0xdbe918, 0x20
gUnknown_08DBE938:: @ 0x08DBE938
.incbin "baserom.gba", 0xdbe938, 0x20
gUnknown_08DBE958:: @ 0x08DBE958
.incbin "baserom.gba", 0xdbe958, 0x20
gUnknown_08DBE978:: @ 0x08DBE978
.incbin "baserom.gba", 0xdbe978, 0x20
gUnknown_08DBE998:: @ 0x08DBE998
.incbin "baserom.gba", 0xdbe998, 0x1a0
gUnknown_08DBEB38:: @ 0x08DBEB38
.incbin "baserom.gba", 0xdbeb38, 0x13c
gUnknown_08DBEC74:: @ 0x08DBEC74
.incbin "baserom.gba", 0xdbec74, 0x210
gUnknown_08DBEE84:: @ 0x08DBEE84
.incbin "baserom.gba", 0xdbee84, 0xd8
gUnknown_08DBEF5C:: @ 0x08DBEF5C
.incbin "baserom.gba", 0xdbef5c, 0x1f8
gUnknown_08DBF154:: @ 0x08DBF154
.incbin "baserom.gba", 0xdbf154, 0x180
gUnknown_08DBF2D4:: @ 0x08DBF2D4
.incbin "baserom.gba", 0xdbf2d4, 0xa8
gUnknown_08DBF37C:: @ 0x08DBF37C
.incbin "baserom.gba", 0xdbf37c, 0x190
gUnknown_08DBF50C:: @ 0x08DBF50C
.incbin "baserom.gba", 0xdbf50c, 0x140
gUnknown_08DBF64C:: @ 0x08DBF64C
.incbin "baserom.gba", 0xdbf64c, 0x168
gUnknown_08DBF7B4:: @ 0x08DBF7B4
.incbin "baserom.gba", 0xdbf7b4, 0x150
gUnknown_08DBF904:: @ 0x08DBF904
.incbin "baserom.gba", 0xdbf904, 0x2a0
gUnknown_08DBFBA4:: @ 0x08DBFBA4
.incbin "baserom.gba", 0xdbfba4, 0xd8
gUnknown_08DBFC7C:: @ 0x08DBFC7C
.incbin "baserom.gba", 0xdbfc7c, 0xe0
gUnknown_08DBFD5C:: @ 0x08DBFD5C
.incbin "baserom.gba", 0xdbfd5c, 0x10c
gUnknown_08DBFE68:: @ 0x08DBFE68
.incbin "baserom.gba", 0xdbfe68, 0xdc
gUnknown_08DBFF44:: @ 0x08DBFF44
.incbin "baserom.gba", 0xdbff44, 0xf0
gUnknown_08DC0034:: @ 0x08DC0034
.incbin "baserom.gba", 0xdc0034, 0xe0
gUnknown_08DC0114:: @ 0x08DC0114
.incbin "baserom.gba", 0xdc0114, 0xe0
gUnknown_08DC01F4:: @ 0x08DC01F4
.incbin "baserom.gba", 0xdc01f4, 0x10c
gUnknown_08DC0300:: @ 0x08DC0300
.incbin "baserom.gba", 0xdc0300, 0xf0
gUnknown_08DC03F0:: @ 0x08DC03F0
.incbin "baserom.gba", 0xdc03f0, 0xf8
gUnknown_08DC04E8:: @ 0x08DC04E8
.incbin "baserom.gba", 0xdc04e8, 0x118
gUnknown_08DC0600:: @ 0x08DC0600
.incbin "baserom.gba", 0xdc0600, 0x114
gUnknown_08DC0714:: @ 8DC0714 gUnknown_08DC0714:: @ 8DC0714
.incbin "baserom.gba", 0xdc0714, 0x40 .incbin "baserom.gba", 0xdc0714, 0x40
data/mail.s
-26
View File
@@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0859F290:: @ 859F290
.incbin "baserom.gba", 0x59f290, 0xc
gUnknown_0859F29C:: @ 859F29C
.incbin "baserom.gba", 0x59f29c, 0x10
gUnknown_0859F2AC:: @ 859F2AC
.incbin "baserom.gba", 0x59f2ac, 0x4
gUnknown_0859F2B0:: @ 859F2B0
.incbin "baserom.gba", 0x59f2b0, 0x8
gUnknown_0859F2B8:: @ 859F2B8
.incbin "baserom.gba", 0x59f2b8, 0xfc
gUnknown_0859F3B4:: @ 859F3B4
.incbin "baserom.gba", 0x59f3b4, 0xa4
gUnknown_0859F458:: @ 859F458
.incbin "baserom.gba", 0x59f458, 0xbc
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/scrcmd.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gNullScriptPtr:: @ 85102BC
.incbin "baserom.gba", 0x5102bc, 0x4
gUnknown_085102C0:: @ 85102C0
.incbin "baserom.gba", 0x5102c0, 0x14
gUnknown_085102D4:: @ 85102D4
.incbin "baserom.gba", 0x5102d4, 0xc
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 TryBufferWaldaPhrase
def_special DoWaldaNamingScreen
def_special TryGetWallpaperWithWaldaPhrase
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
data/walda_phrase.s
-7
View File
@@ -1,7 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862AD14:: @ 862AD14
.incbin "baserom.gba", 0x62ad14, 0x20
graphics/battle_interface/unknown_32C2D4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 B

include/battle.h
+38 -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
@@ -883,6 +888,19 @@ struct BattleSpriteInfo
struct BattleAnimationInfo struct BattleAnimationInfo
{ {
u16 field; // to fill up later u16 field; // to fill up later
u8 field_2;
u8 field_3;
u8 field_4;
u8 field_5;
u8 field_6;
u8 field_7;
u8 field_8;
u8 field_9_x1 : 1;
u8 field_9_x2 : 1;
u8 field_9_x1C : 3;
u8 field_9_x20 : 1;
u8 field_9_x40 : 1;
u8 field_9_x80 : 1;
}; };
struct BattleHealthboxInfo struct BattleHealthboxInfo
@@ -890,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;
@@ -903,15 +923,30 @@ struct BattleHealthboxInfo
u8 field_B; u8 field_B;
}; };
struct BattleBarInfo
{
u8 healthboxSpriteId;
s32 maxValue;
s32 currentValue;
s32 field_C;
s32 field_10;
};
struct BattleSpriteData struct BattleSpriteData
{ {
struct BattleSpriteInfo *bankData; struct BattleSpriteInfo *bankData;
struct BattleHealthboxInfo *healthBoxesData; struct BattleHealthboxInfo *healthBoxesData;
struct BattleAnimationInfo *animationData; struct BattleAnimationInfo *animationData;
struct BattleBarInfo *battleBars;
}; };
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"
@@ -921,6 +956,8 @@ struct MonSpritesGfx
void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
void* sprites[4]; void* sprites[4];
struct SpriteTemplate templates[4]; struct SpriteTemplate templates[4];
u8 field_74[0x100];
u8 *fontPixels;
}; };
extern struct BattleSpritesGfx* gMonSpritesGfx; extern struct BattleSpritesGfx* gMonSpritesGfx;
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_SIDE_PLAYER -64
#define PAN_SIDE_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

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