Merge branch 'master' into battle
This commit is contained in:
jiangzhengwenjz
+4
-4
@@ -118,7 +118,7 @@ DoMoveAnim: @ 807259C
|
||||
ldr r0, _080725CC @ =gBattlerTarget
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r2]
|
||||
ldr r0, _080725D0 @ =gUnknown_81C68F4
|
||||
ldr r0, _080725D0 @ =gBattleAnims_Moves
|
||||
movs r2, 0x1
|
||||
bl LaunchBattleAnimation
|
||||
pop {r0}
|
||||
@@ -128,7 +128,7 @@ _080725C0: .4byte gBattleAnimAttacker
|
||||
_080725C4: .4byte gBattlerAttacker
|
||||
_080725C8: .4byte gBattleAnimTarget
|
||||
_080725CC: .4byte gBattlerTarget
|
||||
_080725D0: .4byte gUnknown_81C68F4
|
||||
_080725D0: .4byte gBattleAnims_Moves
|
||||
thumb_func_end DoMoveAnim
|
||||
|
||||
thumb_func_start LaunchBattleAnimation
|
||||
@@ -247,7 +247,7 @@ _080726A6:
|
||||
cmp r0, 0
|
||||
beq _08072706
|
||||
movs r4, 0
|
||||
ldr r2, _080726E8 @ =gUnknown_81C68EC
|
||||
ldr r2, _080726E8 @ =gMovesWithQuietBGM
|
||||
b _080726EE
|
||||
.align 2, 0
|
||||
_080726C0: .4byte gUnknown_2037F18
|
||||
@@ -260,7 +260,7 @@ _080726D8: .4byte RunAnimScriptCommand
|
||||
_080726DC: .4byte gBattleAnimArgs
|
||||
_080726E0: .4byte 0x0000ffff
|
||||
_080726E4: .4byte gUnknown_2037EEE
|
||||
_080726E8: .4byte gUnknown_81C68EC
|
||||
_080726E8: .4byte gMovesWithQuietBGM
|
||||
_080726EC:
|
||||
adds r4, 0x1
|
||||
_080726EE:
|
||||
|
||||
@@ -905,7 +905,7 @@ LaunchStatusAnimation: @ 807886C
|
||||
strb r4, [r0]
|
||||
ldr r0, _080788AC @ =gBattleAnimTarget
|
||||
strb r4, [r0]
|
||||
ldr r0, _080788B0 @ =gUnknown_81C6E84
|
||||
ldr r0, _080788B0 @ =gBattleAnims_StatusConditions
|
||||
movs r2, 0
|
||||
bl LaunchBattleAnimation
|
||||
ldr r0, _080788B4 @ =task0A_80788BC
|
||||
@@ -925,7 +925,7 @@ LaunchStatusAnimation: @ 807886C
|
||||
.align 2, 0
|
||||
_080788A8: .4byte gBattleAnimAttacker
|
||||
_080788AC: .4byte gBattleAnimTarget
|
||||
_080788B0: .4byte gUnknown_81C6E84
|
||||
_080788B0: .4byte gBattleAnims_StatusConditions
|
||||
_080788B4: .4byte task0A_80788BC
|
||||
_080788B8: .4byte gTasks
|
||||
thumb_func_end LaunchStatusAnimation
|
||||
|
||||
@@ -1686,7 +1686,7 @@ _080D8038:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080D8058
|
||||
bl sub_80E60E4
|
||||
bl GetBattleTowerTrainerClassNameId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0xD
|
||||
@@ -1781,7 +1781,7 @@ _080D80F0:
|
||||
cmp r0, 0
|
||||
beq _080D810C
|
||||
mov r0, sp
|
||||
bl sub_80E6150
|
||||
bl GetBattleTowerTrainerName
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
_080D8108: .4byte gBattleTypeFlags
|
||||
|
||||
-3664
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -490,8 +490,8 @@ _0805A914: .4byte gUnknown_3000E90
|
||||
_0805A918: .4byte gMapHeader
|
||||
thumb_func_end CurrentMapDrawMetatileAt
|
||||
|
||||
thumb_func_start sub_805A91C
|
||||
sub_805A91C: @ 805A91C
|
||||
thumb_func_start DrawDoorMetatileAt
|
||||
DrawDoorMetatileAt: @ 805A91C
|
||||
push {r4,r5,lr}
|
||||
adds r3, r0, 0
|
||||
adds r4, r1, 0
|
||||
@@ -513,7 +513,7 @@ _0805A93E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A944: .4byte gUnknown_3000E90
|
||||
thumb_func_end sub_805A91C
|
||||
thumb_func_end DrawDoorMetatileAt
|
||||
|
||||
thumb_func_start sub_805A948
|
||||
sub_805A948: @ 805A948
|
||||
|
||||
@@ -1,667 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_805AF14
|
||||
sub_805AF14: @ 805AF14
|
||||
push {r4-r7,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
adds r7, r3, 0
|
||||
ldrh r1, [r5, 0x2]
|
||||
ldr r0, _0805AF34 @ =0x0000ffff
|
||||
cmp r1, r0
|
||||
bne _0805AF38
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
bl sub_805AF54
|
||||
b _0805AF4E
|
||||
.align 2, 0
|
||||
_0805AF34: .4byte 0x0000ffff
|
||||
_0805AF38:
|
||||
ldrh r1, [r5, 0x2]
|
||||
ldr r0, [r4, 0x4]
|
||||
adds r0, r1
|
||||
bl sub_805AF80
|
||||
ldr r3, [r4, 0x8]
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r7, 0
|
||||
bl sub_805AF94
|
||||
_0805AF4E:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805AF14
|
||||
|
||||
thumb_func_start sub_805AF54
|
||||
sub_805AF54: @ 805AF54
|
||||
push {r4,r5,lr}
|
||||
adds r5, r1, 0
|
||||
adds r4, r2, 0
|
||||
ldrb r0, [r0, 0x3]
|
||||
cmp r0, 0
|
||||
bne _0805AF6A
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl CurrentMapDrawMetatileAt
|
||||
b _0805AF7A
|
||||
_0805AF6A:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl CurrentMapDrawMetatileAt
|
||||
subs r1, r4, 0x1
|
||||
adds r0, r5, 0
|
||||
bl CurrentMapDrawMetatileAt
|
||||
_0805AF7A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805AF54
|
||||
|
||||
thumb_func_start sub_805AF80
|
||||
sub_805AF80: @ 805AF80
|
||||
push {lr}
|
||||
ldr r1, _0805AF90 @ =0x06007f00
|
||||
movs r2, 0x40
|
||||
bl CpuFastSet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805AF90: .4byte 0x06007f00
|
||||
thumb_func_end sub_805AF80
|
||||
|
||||
thumb_func_start sub_805AF94
|
||||
sub_805AF94: @ 805AF94
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x10
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
adds r4, r3, 0
|
||||
ldrb r0, [r0, 0x3]
|
||||
cmp r0, 0
|
||||
bne _0805AFB2
|
||||
movs r1, 0xFE
|
||||
lsls r1, 2
|
||||
mov r0, sp
|
||||
adds r2, r4, 0
|
||||
bl sub_805AFE8
|
||||
b _0805AFD4
|
||||
_0805AFB2:
|
||||
movs r1, 0xFE
|
||||
lsls r1, 2
|
||||
mov r0, sp
|
||||
adds r2, r4, 0
|
||||
bl sub_805AFE8
|
||||
subs r1, r6, 0x1
|
||||
adds r0, r5, 0
|
||||
mov r2, sp
|
||||
bl sub_805A91C
|
||||
movs r1, 0xFF
|
||||
lsls r1, 2
|
||||
adds r2, r4, 0x4
|
||||
mov r0, sp
|
||||
bl sub_805AFE8
|
||||
_0805AFD4:
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
mov r2, sp
|
||||
bl sub_805A91C
|
||||
add sp, 0x10
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805AF94
|
||||
|
||||
thumb_func_start sub_805AFE8
|
||||
sub_805AFE8: @ 805AFE8
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r5, r1, 16
|
||||
movs r4, 0
|
||||
adds r1, r6, 0
|
||||
_0805AFF4:
|
||||
ldrb r0, [r2]
|
||||
lsls r0, 28
|
||||
lsrs r3, r0, 16
|
||||
adds r2, 0x1
|
||||
adds r0, r5, r4
|
||||
orrs r3, r0
|
||||
strh r3, [r1]
|
||||
adds r1, 0x2
|
||||
adds r4, 0x1
|
||||
cmp r4, 0x3
|
||||
ble _0805AFF4
|
||||
cmp r4, 0x7
|
||||
bgt _0805B022
|
||||
lsls r0, r4, 1
|
||||
adds r1, r0, r6
|
||||
_0805B012:
|
||||
ldrb r0, [r2]
|
||||
lsls r3, r0, 12
|
||||
adds r2, 0x1
|
||||
strh r3, [r1]
|
||||
adds r1, 0x2
|
||||
adds r4, 0x1
|
||||
cmp r4, 0x7
|
||||
ble _0805B012
|
||||
_0805B022:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805AFE8
|
||||
|
||||
thumb_func_start sub_805B028
|
||||
sub_805B028: @ 805B028
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
lsls r2, r4, 2
|
||||
adds r2, r4
|
||||
lsls r2, 3
|
||||
ldr r0, _0805B05C @ =gTasks+0x8
|
||||
adds r2, r0
|
||||
ldrh r1, [r2]
|
||||
lsls r1, 16
|
||||
ldrh r0, [r2, 0x2]
|
||||
orrs r1, r0
|
||||
ldrh r0, [r2, 0x4]
|
||||
lsls r0, 16
|
||||
ldrh r3, [r2, 0x6]
|
||||
orrs r0, r3
|
||||
bl sub_805B060
|
||||
cmp r0, 0
|
||||
bne _0805B056
|
||||
adds r0, r4, 0
|
||||
bl DestroyTask
|
||||
_0805B056:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805B05C: .4byte gTasks+0x8
|
||||
thumb_func_end sub_805B028
|
||||
|
||||
thumb_func_start sub_805B060
|
||||
sub_805B060: @ 805B060
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r4, r2, 0
|
||||
movs r1, 0xA
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _0805B086
|
||||
movs r2, 0x8
|
||||
ldrsh r1, [r4, r2]
|
||||
lsls r1, 2
|
||||
adds r1, r5, r1
|
||||
movs r0, 0xC
|
||||
ldrsh r2, [r4, r0]
|
||||
movs r0, 0xE
|
||||
ldrsh r3, [r4, r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_805AF14
|
||||
_0805B086:
|
||||
movs r2, 0xA
|
||||
ldrsh r1, [r4, r2]
|
||||
movs r2, 0x8
|
||||
ldrsh r0, [r4, r2]
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
cmp r1, r0
|
||||
bne _0805B0B4
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0xA]
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r4, r1]
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0805B0BA
|
||||
movs r0, 0
|
||||
b _0805B0BC
|
||||
_0805B0B4:
|
||||
ldrh r0, [r4, 0xA]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0xA]
|
||||
_0805B0BA:
|
||||
movs r0, 0x1
|
||||
_0805B0BC:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_805B060
|
||||
|
||||
thumb_func_start door_find
|
||||
door_find: @ 805B0C4
|
||||
push {lr}
|
||||
adds r2, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
b _0805B0DA
|
||||
_0805B0CE:
|
||||
ldrh r0, [r2]
|
||||
cmp r0, r1
|
||||
bne _0805B0D8
|
||||
adds r0, r2, 0
|
||||
b _0805B0E2
|
||||
_0805B0D8:
|
||||
adds r2, 0xC
|
||||
_0805B0DA:
|
||||
ldr r0, [r2, 0x4]
|
||||
cmp r0, 0
|
||||
bne _0805B0CE
|
||||
movs r0, 0
|
||||
_0805B0E2:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end door_find
|
||||
|
||||
thumb_func_start task_overworld_door_add_if_inactive
|
||||
task_overworld_door_add_if_inactive: @ 805B0E8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r7, r2, 0
|
||||
mov r8, r3
|
||||
ldr r4, _0805B134 @ =sub_805B028
|
||||
adds r0, r4, 0
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _0805B13C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
lsls r1, 3
|
||||
ldr r2, _0805B138 @ =gTasks+0x8
|
||||
adds r1, r2
|
||||
strh r7, [r1, 0xC]
|
||||
mov r2, r8
|
||||
strh r2, [r1, 0xE]
|
||||
strh r5, [r1, 0x2]
|
||||
lsrs r2, r5, 16
|
||||
strh r2, [r1]
|
||||
strh r6, [r1, 0x6]
|
||||
lsrs r2, r6, 16
|
||||
strh r2, [r1, 0x4]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
b _0805B140
|
||||
.align 2, 0
|
||||
_0805B134: .4byte sub_805B028
|
||||
_0805B138: .4byte gTasks+0x8
|
||||
_0805B13C:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_0805B140:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end task_overworld_door_add_if_inactive
|
||||
|
||||
thumb_func_start DrawClosedDoor
|
||||
DrawClosedDoor: @ 805B14C
|
||||
push {lr}
|
||||
bl sub_805AF54
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end DrawClosedDoor
|
||||
|
||||
thumb_func_start sub_805B158
|
||||
sub_805B158: @ 805B158
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
bl MapGridGetMetatileIdAt
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl door_find
|
||||
adds r4, r0, 0
|
||||
cmp r0, 0
|
||||
beq _0805B196
|
||||
ldrb r0, [r0, 0x3]
|
||||
ldr r1, _0805B19C @ =gUnknown_835B49C
|
||||
cmp r0, 0
|
||||
bne _0805B184
|
||||
ldr r1, _0805B1A0 @ =gUnknown_835B488
|
||||
_0805B184:
|
||||
adds r0, r1, 0
|
||||
bl sub_805B1A4
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl sub_805AF14
|
||||
_0805B196:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805B19C: .4byte gUnknown_835B49C
|
||||
_0805B1A0: .4byte gUnknown_835B488
|
||||
thumb_func_end sub_805B158
|
||||
|
||||
thumb_func_start sub_805B1A4
|
||||
sub_805B1A4: @ 805B1A4
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
b _0805B1AC
|
||||
_0805B1AA:
|
||||
adds r1, 0x4
|
||||
_0805B1AC:
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0
|
||||
bne _0805B1AA
|
||||
subs r0, r1, 0x4
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_805B1A4
|
||||
|
||||
thumb_func_start sub_805B1B8
|
||||
sub_805B1B8: @ 805B1B8
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
bl MapGridGetMetatileIdAt
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl door_find
|
||||
adds r2, r0, 0
|
||||
adds r4, r2, 0
|
||||
cmp r2, 0
|
||||
bne _0805B1E2
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
b _0805B204
|
||||
_0805B1E2:
|
||||
ldrb r0, [r2, 0x3]
|
||||
cmp r0, 0
|
||||
beq _0805B1F4
|
||||
ldr r1, _0805B1F0 @ =gUnknown_835B49C
|
||||
adds r0, r2, 0
|
||||
b _0805B1F8
|
||||
.align 2, 0
|
||||
_0805B1F0: .4byte gUnknown_835B49C
|
||||
_0805B1F4:
|
||||
ldr r1, _0805B20C @ =gUnknown_835B488
|
||||
adds r0, r4, 0
|
||||
_0805B1F8:
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl task_overworld_door_add_if_inactive
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
_0805B204:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0805B20C: .4byte gUnknown_835B488
|
||||
thumb_func_end sub_805B1B8
|
||||
|
||||
thumb_func_start sub_805B210
|
||||
sub_805B210: @ 805B210
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
bl MapGridGetMetatileIdAt
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl door_find
|
||||
adds r2, r0, 0
|
||||
adds r4, r2, 0
|
||||
cmp r2, 0
|
||||
bne _0805B23A
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
b _0805B25C
|
||||
_0805B23A:
|
||||
ldrb r0, [r2, 0x3]
|
||||
cmp r0, 0
|
||||
beq _0805B24C
|
||||
ldr r1, _0805B248 @ =gUnknown_835B4C4
|
||||
adds r0, r2, 0
|
||||
b _0805B250
|
||||
.align 2, 0
|
||||
_0805B248: .4byte gUnknown_835B4C4
|
||||
_0805B24C:
|
||||
ldr r1, _0805B264 @ =gUnknown_835B4B0
|
||||
adds r0, r4, 0
|
||||
_0805B250:
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl task_overworld_door_add_if_inactive
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
_0805B25C:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0805B264: .4byte gUnknown_835B4B0
|
||||
thumb_func_end sub_805B210
|
||||
|
||||
thumb_func_start FieldSetDoorOpened
|
||||
FieldSetDoorOpened: @ 805B268
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
bl MapGridGetMetatileBehaviorAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl MetatileBehavior_IsWarpDoor_2
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805B292
|
||||
ldr r0, _0805B298 @ =gUnknown_835B5D8
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805B158
|
||||
_0805B292:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805B298: .4byte gUnknown_835B5D8
|
||||
thumb_func_end FieldSetDoorOpened
|
||||
|
||||
thumb_func_start FieldSetDoorClosed
|
||||
FieldSetDoorClosed: @ 805B29C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
bl MapGridGetMetatileBehaviorAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl MetatileBehavior_IsWarpDoor_2
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805B2C6
|
||||
ldr r0, _0805B2CC @ =gUnknown_835B5D8
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl DrawClosedDoor
|
||||
_0805B2C6:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805B2CC: .4byte gUnknown_835B5D8
|
||||
thumb_func_end FieldSetDoorClosed
|
||||
|
||||
thumb_func_start FieldAnimateDoorClose
|
||||
FieldAnimateDoorClose: @ 805B2D0
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
bl MapGridGetMetatileBehaviorAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl MetatileBehavior_IsWarpDoor_2
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805B304
|
||||
ldr r0, _0805B300 @ =gUnknown_835B5D8
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805B210
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
b _0805B308
|
||||
.align 2, 0
|
||||
_0805B300: .4byte gUnknown_835B5D8
|
||||
_0805B304:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_0805B308:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end FieldAnimateDoorClose
|
||||
|
||||
thumb_func_start FieldAnimateDoorOpen
|
||||
FieldAnimateDoorOpen: @ 805B310
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
bl MapGridGetMetatileBehaviorAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl MetatileBehavior_IsWarpDoor_2
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805B344
|
||||
ldr r0, _0805B340 @ =gUnknown_835B5D8
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805B1B8
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
b _0805B348
|
||||
.align 2, 0
|
||||
_0805B340: .4byte gUnknown_835B5D8
|
||||
_0805B344:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_0805B348:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end FieldAnimateDoorOpen
|
||||
|
||||
thumb_func_start FieldIsDoorAnimationRunning
|
||||
FieldIsDoorAnimationRunning: @ 805B350
|
||||
push {lr}
|
||||
ldr r0, _0805B360 @ =sub_805B028
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0805B360: .4byte sub_805B028
|
||||
thumb_func_end FieldIsDoorAnimationRunning
|
||||
|
||||
thumb_func_start GetDoorSoundEffect
|
||||
GetDoorSoundEffect: @ 805B364
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
adds r2, r1, 0
|
||||
ldr r0, _0805B37C @ =gUnknown_835B5D8
|
||||
adds r1, r3, 0
|
||||
bl sub_805B388
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805B380
|
||||
movs r0, 0x12
|
||||
b _0805B382
|
||||
.align 2, 0
|
||||
_0805B37C: .4byte gUnknown_835B5D8
|
||||
_0805B380:
|
||||
movs r0, 0xF1
|
||||
_0805B382:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetDoorSoundEffect
|
||||
|
||||
thumb_func_start sub_805B388
|
||||
sub_805B388: @ 805B388
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, r1, 0
|
||||
adds r1, r2, 0
|
||||
bl MapGridGetMetatileIdAt
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl door_find
|
||||
cmp r0, 0
|
||||
beq _0805B3AC
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
b _0805B3B0
|
||||
_0805B3AC:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_0805B3B0:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_805B388
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+1
-1
@@ -5826,7 +5826,7 @@ UseRegisteredKeyItemOnField: @ 810AD10
|
||||
movs r0, 0
|
||||
b _0810ADA0
|
||||
_0810AD1E:
|
||||
bl sub_80982EC
|
||||
bl DismissMapNamePopup
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
|
||||
-1954
File diff suppressed because it is too large
Load Diff
+4
-4
@@ -12663,7 +12663,7 @@ sub_811C04C: @ 811C04C
|
||||
ldr r6, _0811C0CC @ =gPlayerParty
|
||||
ldr r5, _0811C0D0 @ =gEnemyParty
|
||||
_0811C05C:
|
||||
ldr r0, _0811C0D4 @ =gUnknown_203B0D4
|
||||
ldr r0, _0811C0D4 @ =gSelectedOrderFromParty
|
||||
adds r0, r4, r0
|
||||
ldrb r0, [r0]
|
||||
subs r0, 0x1
|
||||
@@ -12717,7 +12717,7 @@ _0811C096:
|
||||
.align 2, 0
|
||||
_0811C0CC: .4byte gPlayerParty
|
||||
_0811C0D0: .4byte gEnemyParty
|
||||
_0811C0D4: .4byte gUnknown_203B0D4
|
||||
_0811C0D4: .4byte gSelectedOrderFromParty
|
||||
_0811C0D8: .4byte gTrainerBattleOpponent_A
|
||||
_0811C0DC: .4byte CB2_InitBattle
|
||||
thumb_func_end sub_811C04C
|
||||
@@ -13029,7 +13029,7 @@ _0811C3BC:
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl memset
|
||||
ldr r0, _0811C3DC @ =gUnknown_203B0D4
|
||||
ldr r0, _0811C3DC @ =gSelectedOrderFromParty
|
||||
ldrb r1, [r0]
|
||||
ldrb r0, [r0, 0x1]
|
||||
cmn r1, r0
|
||||
@@ -13038,7 +13038,7 @@ _0811C3BC:
|
||||
b _0811C3E2
|
||||
.align 2, 0
|
||||
_0811C3D8: .4byte gBlockSendBuffer
|
||||
_0811C3DC: .4byte gUnknown_203B0D4
|
||||
_0811C3DC: .4byte gSelectedOrderFromParty
|
||||
_0811C3E0:
|
||||
movs r0, 0x51
|
||||
_0811C3E2:
|
||||
|
||||
@@ -0,0 +1,285 @@
|
||||
@ commands
|
||||
|
||||
.macro loadspritegfx tag:req
|
||||
.byte 0x0
|
||||
.2byte \tag
|
||||
.endm
|
||||
|
||||
.macro unloadspritegfx tag:req
|
||||
.byte 0x1
|
||||
.2byte \tag
|
||||
.endm
|
||||
|
||||
.macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg
|
||||
.byte 0x02
|
||||
.4byte \template
|
||||
.if \anim_battler == ANIM_TARGET
|
||||
.byte 0x80 | (\subpriority_offset & 0x7F)
|
||||
.else
|
||||
.byte (\subpriority_offset & 0x7F)
|
||||
.endif
|
||||
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
|
||||
.Lsprite_\@_1:
|
||||
.2byte \argv
|
||||
.Lsprite_\@_2:
|
||||
.endm
|
||||
|
||||
.macro createvisualtask addr:req, priority:req, argv:vararg
|
||||
.byte 0x03
|
||||
.4byte \addr
|
||||
.byte \priority
|
||||
.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2
|
||||
.Lcreatetask_\@_1:
|
||||
.2byte \argv
|
||||
.Lcreatetask_\@_2:
|
||||
.endm
|
||||
|
||||
.macro delay param0:req
|
||||
.byte 0x4
|
||||
.byte \param0
|
||||
.endm
|
||||
|
||||
.macro waitforvisualfinish
|
||||
.byte 0x5
|
||||
.endm
|
||||
|
||||
.macro hang1
|
||||
.byte 0x6
|
||||
.endm
|
||||
|
||||
.macro hang2
|
||||
.byte 0x7
|
||||
.endm
|
||||
|
||||
.macro end
|
||||
.byte 0x8
|
||||
.endm
|
||||
|
||||
.macro playse se:req
|
||||
.byte 0x9
|
||||
.2byte \se
|
||||
.endm
|
||||
|
||||
.macro monbg battler:req
|
||||
.byte 0xa
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro clearmonbg battler:req
|
||||
.byte 0xb
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro setalpha eva:req, evb:req
|
||||
.byte 0x0C
|
||||
.2byte ((\evb) << 8) | (\eva)
|
||||
.endm
|
||||
|
||||
.macro blendoff
|
||||
.byte 0xd
|
||||
.endm
|
||||
|
||||
.macro call param0:req
|
||||
.byte 0xe
|
||||
.4byte \param0
|
||||
.endm
|
||||
|
||||
.macro return
|
||||
.byte 0xf
|
||||
.endm
|
||||
|
||||
.macro setarg param0:req, param1:req
|
||||
.byte 0x10
|
||||
.byte \param0
|
||||
.2byte \param1
|
||||
.endm
|
||||
|
||||
.macro choosetwoturnanim param0:req, param1:req
|
||||
.byte 0x11
|
||||
.4byte \param0
|
||||
.4byte \param1
|
||||
.endm
|
||||
|
||||
.macro jumpifmoveturn param0:req, ptr:req
|
||||
.byte 0x12
|
||||
.byte \param0
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro goto ptr:req
|
||||
.byte 0x13
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro fadetobg bg:req
|
||||
.byte 0x14
|
||||
.byte \bg
|
||||
.endm
|
||||
|
||||
.macro restorebg
|
||||
.byte 0x15
|
||||
.endm
|
||||
|
||||
.macro waitbgfadeout
|
||||
.byte 0x16
|
||||
.endm
|
||||
|
||||
.macro waitbgfadein
|
||||
.byte 0x17
|
||||
.endm
|
||||
|
||||
.macro changebg bg:req
|
||||
.byte 0x18
|
||||
.byte \bg
|
||||
.endm
|
||||
|
||||
.macro playsewithpan se:req, pan:req
|
||||
.byte 0x19
|
||||
.2byte \se
|
||||
.byte \pan
|
||||
.endm
|
||||
|
||||
.macro setpan pan:req
|
||||
.byte 0x1a
|
||||
.byte \pan
|
||||
.endm
|
||||
|
||||
.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req
|
||||
.byte 0x1b
|
||||
.2byte \se
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.byte \param3
|
||||
.byte \param4
|
||||
.endm
|
||||
|
||||
.macro loopsewithpan se:req, pan:req, wait:req, times:req
|
||||
.byte 0x1c
|
||||
.2byte \se
|
||||
.byte \pan
|
||||
.byte \wait
|
||||
.byte \times
|
||||
.endm
|
||||
|
||||
.macro waitplaysewithpan se:req, pan:req, wait:req
|
||||
.byte 0x1d
|
||||
.2byte \se
|
||||
.byte \pan
|
||||
.byte \wait
|
||||
.endm
|
||||
|
||||
.macro setbldcnt param0:req
|
||||
.byte 0x1e
|
||||
.2byte \param0
|
||||
.endm
|
||||
|
||||
.macro createsoundtask addr:req, argv:vararg
|
||||
.byte 0x1F
|
||||
.4byte \addr
|
||||
.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
|
||||
.Lcreatetask_1F_\@_1:
|
||||
.2byte \argv
|
||||
.Lcreatetask_1F_\@_2:
|
||||
.endm
|
||||
|
||||
.macro waitsound
|
||||
.byte 0x20
|
||||
.endm
|
||||
|
||||
.macro jumpargeq param0:req, param1:req, ptr:req
|
||||
.byte 0x21
|
||||
.byte \param0
|
||||
.2byte \param1
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro monbg_22 battler:req
|
||||
.byte 0x22
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro clearmonbg_23 battler:req
|
||||
.byte 0x23
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro jumpifcontest ptr:req
|
||||
.byte 0x24
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro fadetobgfromset param0:req, param1:req, param2:req
|
||||
.byte 0x25
|
||||
.byte \param0
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.endm
|
||||
|
||||
.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req
|
||||
.byte 0x26
|
||||
.2byte \se
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.byte \param3
|
||||
.byte \param4
|
||||
.endm
|
||||
|
||||
.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req
|
||||
.byte 0x27
|
||||
.2byte \se
|
||||
.byte \param1
|
||||
.byte \param2
|
||||
.byte \param3
|
||||
.byte \param4
|
||||
.endm
|
||||
|
||||
.macro monbgprio_28 battler:req
|
||||
.byte 0x28
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro monbgprio_29
|
||||
.byte 0x29
|
||||
.endm
|
||||
|
||||
.macro monbgprio_2A battler:req
|
||||
.byte 0x2a
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro invisible battler:req
|
||||
.byte 0x2b
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro visible battler:req
|
||||
.byte 0x2c
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro doublebattle_2D battler:req
|
||||
.byte 0x2d
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro doublebattle_2E battler:req
|
||||
.byte 0x2e
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro stopsound
|
||||
.byte 0x2f
|
||||
.endm
|
||||
|
||||
@ useful macros
|
||||
.macro jumpreteq value:req, ptr:req
|
||||
jumpargeq ARG_RET_ID, \value, \ptr
|
||||
.endm
|
||||
|
||||
.macro jumprettrue ptr:req
|
||||
jumpreteq TRUE, \ptr
|
||||
.endm
|
||||
|
||||
.macro jumpretfalse ptr:req
|
||||
jumpreteq FALSE, \ptr
|
||||
.endm
|
||||
@@ -1,490 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8098110
|
||||
sub_8098110: @ 8098110
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
movs r0, 0x80
|
||||
lsls r0, 7
|
||||
bl FlagGet
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _080981A2
|
||||
ldr r0, _08098178 @ =gUnknown_203ADFA
|
||||
ldrb r0, [r0]
|
||||
subs r0, 0x2
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080981A2
|
||||
ldr r5, _0809817C @ =sub_80981AC
|
||||
adds r0, r5, 0
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0xFF
|
||||
bne _08098188
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5A
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl ChangeBgX
|
||||
ldr r1, _08098180 @ =0xffffef7f
|
||||
movs r0, 0
|
||||
movs r2, 0
|
||||
bl ChangeBgY
|
||||
ldr r1, _08098184 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x8]
|
||||
strh r1, [r0, 0xC]
|
||||
strh r6, [r0, 0x18]
|
||||
b _080981A2
|
||||
.align 2, 0
|
||||
_08098178: .4byte gUnknown_203ADFA
|
||||
_0809817C: .4byte sub_80981AC
|
||||
_08098180: .4byte 0xffffef7f
|
||||
_08098184: .4byte gTasks
|
||||
_08098188:
|
||||
ldr r0, _080981A8 @ =gTasks
|
||||
lsls r1, r4, 2
|
||||
adds r1, r4
|
||||
lsls r1, 3
|
||||
adds r1, r0
|
||||
movs r2, 0x8
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0x4
|
||||
beq _0809819E
|
||||
movs r0, 0x4
|
||||
strh r0, [r1, 0x8]
|
||||
_0809819E:
|
||||
movs r0, 0x1
|
||||
strh r0, [r1, 0xE]
|
||||
_080981A2:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080981A8: .4byte gTasks
|
||||
thumb_func_end sub_8098110
|
||||
|
||||
thumb_func_start sub_80981AC
|
||||
sub_80981AC: @ 80981AC
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 3
|
||||
ldr r1, _080981D0 @ =gTasks
|
||||
adds r4, r0, r1
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0x8
|
||||
bls _080981C6
|
||||
b _080982DE
|
||||
_080981C6:
|
||||
lsls r0, 2
|
||||
ldr r1, _080981D4 @ =_080981D8
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080981D0: .4byte gTasks
|
||||
_080981D4: .4byte _080981D8
|
||||
.align 2, 0
|
||||
_080981D8:
|
||||
.4byte _080981FC
|
||||
.4byte _0809820E
|
||||
.4byte _08098218
|
||||
.4byte _08098234
|
||||
.4byte _0809824C
|
||||
.4byte _080982DE
|
||||
.4byte _0809827E
|
||||
.4byte _080982A6
|
||||
.4byte _080982D6
|
||||
_080981FC:
|
||||
movs r1, 0x18
|
||||
ldrsh r0, [r4, r1]
|
||||
bl sub_8098340
|
||||
strh r0, [r4, 0x10]
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x12]
|
||||
strh r0, [r4, 0x8]
|
||||
b _080982DE
|
||||
_0809820E:
|
||||
bl IsDma3ManagerBusyWithBgCopy
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080982DE
|
||||
_08098218:
|
||||
ldrh r0, [r4, 0xC]
|
||||
subs r0, 0x2
|
||||
strh r0, [r4, 0xC]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
movs r1, 0x18
|
||||
negs r1, r1
|
||||
cmp r0, r1
|
||||
bgt _080982DE
|
||||
movs r0, 0x3
|
||||
strh r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0xA]
|
||||
b _080982DE
|
||||
_08098234:
|
||||
ldrh r0, [r4, 0xA]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0xA]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x78
|
||||
ble _080982DE
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0xA]
|
||||
movs r0, 0x4
|
||||
strh r0, [r4, 0x8]
|
||||
b _080982DE
|
||||
_0809824C:
|
||||
ldrh r0, [r4, 0xC]
|
||||
adds r0, 0x2
|
||||
strh r0, [r4, 0xC]
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
blt _080982DE
|
||||
movs r1, 0xE
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
beq _08098278
|
||||
ldrh r0, [r4, 0x10]
|
||||
bl sub_8098400
|
||||
ldrb r0, [r4, 0x10]
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0xE]
|
||||
b _080982DE
|
||||
_08098278:
|
||||
movs r0, 0x6
|
||||
strh r0, [r4, 0x8]
|
||||
b _080982E6
|
||||
_0809827E:
|
||||
movs r1, 0x12
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
beq _080982A0
|
||||
movs r1, 0x14
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080982A0
|
||||
ldrb r0, [r4, 0x10]
|
||||
bl rbox_fill_rectangle
|
||||
ldrb r0, [r4, 0x10]
|
||||
movs r1, 0x1
|
||||
bl CopyWindowToVram
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x14]
|
||||
_080982A0:
|
||||
movs r0, 0x7
|
||||
strh r0, [r4, 0x8]
|
||||
b _080982E6
|
||||
_080982A6:
|
||||
bl IsDma3ManagerBusyWithBgCopy
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0
|
||||
bne _080982E6
|
||||
movs r1, 0x12
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
beq _080982C6
|
||||
ldrb r0, [r4, 0x10]
|
||||
bl RemoveWindow
|
||||
strh r5, [r4, 0x12]
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x16]
|
||||
_080982C6:
|
||||
movs r0, 0x8
|
||||
strh r0, [r4, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl ChangeBgY
|
||||
b _080982E6
|
||||
_080982D6:
|
||||
adds r0, r2, 0
|
||||
bl DestroyTask
|
||||
b _080982E6
|
||||
_080982DE:
|
||||
ldrh r1, [r4, 0xC]
|
||||
movs r0, 0x12
|
||||
bl SetGpuReg
|
||||
_080982E6:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80981AC
|
||||
|
||||
thumb_func_start sub_80982EC
|
||||
sub_80982EC: @ 80982EC
|
||||
push {lr}
|
||||
ldr r0, _08098318 @ =sub_80981AC
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0xFF
|
||||
beq _08098312
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
lsls r0, 3
|
||||
ldr r1, _0809831C @ =gTasks+0x8
|
||||
adds r1, r0, r1
|
||||
movs r2, 0
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0x5
|
||||
bgt _08098312
|
||||
movs r0, 0x6
|
||||
strh r0, [r1]
|
||||
_08098312:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08098318: .4byte sub_80981AC
|
||||
_0809831C: .4byte gTasks+0x8
|
||||
thumb_func_end sub_80982EC
|
||||
|
||||
thumb_func_start sub_8098320
|
||||
sub_8098320: @ 8098320
|
||||
push {lr}
|
||||
ldr r0, _0809833C @ =sub_80981AC
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0xFF
|
||||
eors r0, r1
|
||||
negs r1, r0
|
||||
orrs r1, r0
|
||||
lsrs r1, 31
|
||||
adds r0, r1, 0
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809833C: .4byte sub_80981AC
|
||||
thumb_func_end sub_8098320
|
||||
|
||||
thumb_func_start sub_8098340
|
||||
sub_8098340: @ 8098340
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
ldr r0, _08098378 @ =gUnknown_83D4164
|
||||
ldr r1, [r0, 0x4]
|
||||
ldr r0, [r0]
|
||||
str r0, [sp]
|
||||
str r1, [sp, 0x4]
|
||||
movs r6, 0x1D
|
||||
ldr r0, _0809837C @ =gMapHeader
|
||||
ldrb r0, [r0, 0x1A]
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
cmp r0, 0
|
||||
beq _08098396
|
||||
cmp r0, 0x7F
|
||||
beq _08098384
|
||||
ldr r2, [sp]
|
||||
lsrs r1, r2, 24
|
||||
adds r1, 0x5
|
||||
lsls r1, 24
|
||||
ldr r0, _08098380 @ =0x00ffffff
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
str r0, [sp]
|
||||
movs r6, 0x27
|
||||
b _08098396
|
||||
.align 2, 0
|
||||
_08098378: .4byte gUnknown_83D4164
|
||||
_0809837C: .4byte gMapHeader
|
||||
_08098380: .4byte 0x00ffffff
|
||||
_08098384:
|
||||
ldr r2, [sp]
|
||||
lsrs r1, r2, 24
|
||||
adds r1, 0x8
|
||||
lsls r1, 24
|
||||
ldr r0, _080983B4 @ =0x00ffffff
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
str r0, [sp]
|
||||
movs r6, 0x2D
|
||||
_08098396:
|
||||
mov r0, sp
|
||||
bl AddWindow
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
cmp r4, 0
|
||||
beq _080983B8
|
||||
movs r0, 0x3
|
||||
bl stdpal_get
|
||||
movs r1, 0xD0
|
||||
movs r2, 0x20
|
||||
bl LoadPalette
|
||||
b _080983C6
|
||||
.align 2, 0
|
||||
_080983B4: .4byte 0x00ffffff
|
||||
_080983B8:
|
||||
movs r0, 0x3
|
||||
bl stdpal_get
|
||||
ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0
|
||||
movs r2, 0x10
|
||||
bl CpuSet
|
||||
_080983C6:
|
||||
lsls r4, r5, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_814FF6C
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
movs r2, 0xD
|
||||
bl DrawTextBorderOuter
|
||||
adds r0, r4, 0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r5, 0
|
||||
bl sub_8098400
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
adds r0, r5, 0
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080983FC: .4byte gPlttBufferUnfaded + 0x1A0
|
||||
thumb_func_end sub_8098340
|
||||
|
||||
thumb_func_start sub_8098400
|
||||
sub_8098400: @ 8098400
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x28
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
movs r5, 0x70
|
||||
ldr r4, _08098478 @ =gMapHeader
|
||||
ldrb r1, [r4, 0x14]
|
||||
add r0, sp, 0xC
|
||||
movs r2, 0
|
||||
bl GetMapName
|
||||
adds r2, r0, 0
|
||||
movs r0, 0x1A
|
||||
ldrsb r0, [r4, r0]
|
||||
cmp r0, 0
|
||||
beq _08098434
|
||||
adds r1, r0, 0
|
||||
adds r0, r2, 0
|
||||
bl sub_809847C
|
||||
movs r0, 0x1A
|
||||
ldrsb r0, [r4, r0]
|
||||
movs r5, 0xB0
|
||||
cmp r0, 0x7F
|
||||
beq _08098434
|
||||
movs r5, 0x98
|
||||
_08098434:
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
movs r0, 0x2
|
||||
add r1, sp, 0xC
|
||||
bl GetStringWidth
|
||||
adds r4, r0, 0
|
||||
subs r4, r5, r4
|
||||
lsrs r4, 1
|
||||
lsls r5, r6, 24
|
||||
lsrs r5, 24
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x2
|
||||
str r0, [sp]
|
||||
movs r0, 0xFF
|
||||
str r0, [sp, 0x4]
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x8]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
add r2, sp, 0xC
|
||||
adds r3, r4, 0
|
||||
bl AddTextPrinterParameterized
|
||||
add sp, 0x28
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08098478: .4byte gMapHeader
|
||||
thumb_func_end sub_8098400
|
||||
|
||||
thumb_func_start sub_809847C
|
||||
sub_809847C: @ 809847C
|
||||
push {lr}
|
||||
adds r2, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r3, r1, 24
|
||||
asrs r1, 24
|
||||
cmp r1, 0
|
||||
beq _080984D2
|
||||
movs r0, 0
|
||||
strb r0, [r2]
|
||||
adds r2, 0x1
|
||||
cmp r1, 0x7F
|
||||
bne _080984A4
|
||||
ldr r1, _080984A0 @ =gUnknown_841D18D
|
||||
adds r0, r2, 0
|
||||
bl StringCopy
|
||||
b _080984D2
|
||||
.align 2, 0
|
||||
_080984A0: .4byte gUnknown_841D18D
|
||||
_080984A4:
|
||||
cmp r1, 0
|
||||
bge _080984B4
|
||||
movs r0, 0xBC
|
||||
strb r0, [r2]
|
||||
adds r2, 0x1
|
||||
negs r0, r1
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
_080984B4:
|
||||
lsls r1, r3, 24
|
||||
asrs r1, 24
|
||||
adds r0, r2, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl ConvertIntToDecimalStringN
|
||||
adds r2, r0, 0
|
||||
adds r1, r2, 0
|
||||
movs r0, 0xC0
|
||||
strb r0, [r2]
|
||||
adds r2, 0x1
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x1]
|
||||
adds r0, r2, 0
|
||||
_080984D2:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_809847C
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+5
-5
@@ -1747,7 +1747,7 @@ _080558D4:
|
||||
cmp r0, r1
|
||||
beq _08055914
|
||||
movs r0, 0x1
|
||||
bl sub_8098110
|
||||
bl CreateMapNamePopupIfNotAlreadyRunning
|
||||
_08055914:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -3282,7 +3282,7 @@ sub_805644C: @ 805644C
|
||||
bl sub_81127F8
|
||||
_0805649E:
|
||||
bl ScriptContext2_Enable
|
||||
bl sub_80982EC
|
||||
bl DismissMapNamePopup
|
||||
b _080564BA
|
||||
.align 2, 0
|
||||
_080564A8: .4byte gUnknown_3005E88
|
||||
@@ -3323,7 +3323,7 @@ sub_80564C8: @ 80564C8
|
||||
cmp r0, 0x1
|
||||
bne _0805650C
|
||||
bl ScriptContext2_Enable
|
||||
bl sub_80982EC
|
||||
bl DismissMapNamePopup
|
||||
b _08056522
|
||||
.align 2, 0
|
||||
_08056508: .4byte gUnknown_3005E90
|
||||
@@ -3824,7 +3824,7 @@ sub_8056918: @ 8056918
|
||||
cmp r0, 0x4
|
||||
bne _0805692C
|
||||
movs r0, 0
|
||||
bl sub_8098110
|
||||
bl CreateMapNamePopupIfNotAlreadyRunning
|
||||
_0805692C:
|
||||
bl sub_807DF7C
|
||||
pop {r0}
|
||||
@@ -4223,7 +4223,7 @@ _08056CA8:
|
||||
cmp r0, 0x4
|
||||
bne _08056CCA
|
||||
movs r0, 0
|
||||
bl sub_8098110
|
||||
bl CreateMapNamePopupIfNotAlreadyRunning
|
||||
b _08056CCA
|
||||
.align 2, 0
|
||||
_08056CBC: .4byte gMapHeader
|
||||
|
||||
+21
-21
@@ -1152,7 +1152,7 @@ sub_811F388: @ 811F388
|
||||
muls r0, r4
|
||||
ldr r1, _0811F3AC @ =gPlayerParty
|
||||
adds r0, r1
|
||||
ldr r5, _0811F3B0 @ =gUnknown_203B0D4
|
||||
ldr r5, _0811F3B0 @ =gSelectedOrderFromParty
|
||||
bl sub_8127550
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@@ -1163,7 +1163,7 @@ sub_811F388: @ 811F388
|
||||
b _0811F3F8
|
||||
.align 2, 0
|
||||
_0811F3AC: .4byte gPlayerParty
|
||||
_0811F3B0: .4byte gUnknown_203B0D4
|
||||
_0811F3B0: .4byte gSelectedOrderFromParty
|
||||
_0811F3B4:
|
||||
adds r1, 0x2
|
||||
lsls r1, 24
|
||||
@@ -11131,7 +11131,7 @@ _0812418C:
|
||||
adds r0, r1
|
||||
mov r10, r0
|
||||
_081241B6:
|
||||
ldr r0, _0812420C @ =gUnknown_203B0D4
|
||||
ldr r0, _0812420C @ =gSelectedOrderFromParty
|
||||
adds r4, r5, r0
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0
|
||||
@@ -11168,7 +11168,7 @@ _081241FC: .4byte gUnknown_8416B16
|
||||
_08124200: .4byte gUnknown_203B09C
|
||||
_08124204: .4byte gUnknown_203B0A0
|
||||
_08124208: .4byte gTasks
|
||||
_0812420C: .4byte gUnknown_203B0D4
|
||||
_0812420C: .4byte gSelectedOrderFromParty
|
||||
_08124210: .4byte gUnknown_203B0B4
|
||||
_08124214: .4byte sub_811FB28
|
||||
_08124218:
|
||||
@@ -11237,7 +11237,7 @@ sub_8124278: @ 8124278
|
||||
adds r0, 0xD
|
||||
bl sub_8121CE4
|
||||
movs r4, 0
|
||||
ldr r3, _081242C0 @ =gUnknown_203B0D4
|
||||
ldr r3, _081242C0 @ =gSelectedOrderFromParty
|
||||
ldr r6, _081242C4 @ =gUnknown_203B0A0
|
||||
adds r5, r6, 0
|
||||
_0812429E:
|
||||
@@ -11257,7 +11257,7 @@ _0812429E:
|
||||
b _081242E6
|
||||
.align 2, 0
|
||||
_081242BC: .4byte gUnknown_203B09C
|
||||
_081242C0: .4byte gUnknown_203B0D4
|
||||
_081242C0: .4byte gSelectedOrderFromParty
|
||||
_081242C4: .4byte gUnknown_203B0A0
|
||||
_081242C8:
|
||||
ldrb r0, [r3, 0x1]
|
||||
@@ -11287,7 +11287,7 @@ _081242E6:
|
||||
movs r0, 0x1
|
||||
movs r2, 0x1
|
||||
bl sub_8121C70
|
||||
ldr r4, _08124348 @ =gUnknown_203B0D4
|
||||
ldr r4, _08124348 @ =gSelectedOrderFromParty
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _08124312
|
||||
@@ -11324,7 +11324,7 @@ _08124328:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08124344: .4byte gUnknown_203B0B4
|
||||
_08124348: .4byte gUnknown_203B0D4
|
||||
_08124348: .4byte gSelectedOrderFromParty
|
||||
_0812434C: .4byte gTasks
|
||||
_08124350: .4byte sub_811FB28
|
||||
thumb_func_end sub_8124278
|
||||
@@ -17411,14 +17411,14 @@ _081274F8: .4byte sub_812773C
|
||||
thumb_func_start sub_81274FC
|
||||
sub_81274FC: @ 81274FC
|
||||
push {lr}
|
||||
ldr r0, _0812750C @ =gUnknown_203B0D4
|
||||
ldr r0, _0812750C @ =gSelectedOrderFromParty
|
||||
movs r1, 0
|
||||
movs r2, 0x3
|
||||
bl memset
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0812750C: .4byte gUnknown_203B0D4
|
||||
_0812750C: .4byte gSelectedOrderFromParty
|
||||
thumb_func_end sub_81274FC
|
||||
|
||||
thumb_func_start sub_8127510
|
||||
@@ -17564,18 +17564,18 @@ sub_81275F8: @ 81275F8
|
||||
_08127618: .4byte gPlayerParty
|
||||
_0812761C: .4byte gUnknown_203B0A0
|
||||
_08127620:
|
||||
ldr r1, _0812762C @ =gUnknown_203B0D4
|
||||
ldr r1, _0812762C @ =gSelectedOrderFromParty
|
||||
ldrb r0, [r1, 0x2]
|
||||
cmp r0, 0
|
||||
bne _08127630
|
||||
movs r0, 0x11
|
||||
b _08127702
|
||||
.align 2, 0
|
||||
_0812762C: .4byte gUnknown_203B0D4
|
||||
_0812762C: .4byte gSelectedOrderFromParty
|
||||
_08127630:
|
||||
movs r5, 0
|
||||
_08127632:
|
||||
ldr r2, _081276DC @ =gUnknown_203B0D4
|
||||
ldr r2, _081276DC @ =gSelectedOrderFromParty
|
||||
adds r4, r2, r5
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x64
|
||||
@@ -17618,7 +17618,7 @@ _0812767E:
|
||||
adds r0, r2
|
||||
movs r1, 0
|
||||
ldrsh r4, [r0, r1]
|
||||
ldr r2, _081276DC @ =gUnknown_203B0D4
|
||||
ldr r2, _081276DC @ =gSelectedOrderFromParty
|
||||
adds r6, r2, r5
|
||||
ldrb r0, [r6]
|
||||
muls r0, r7
|
||||
@@ -17660,18 +17660,18 @@ _081276D0:
|
||||
bls _08127632
|
||||
b _08127700
|
||||
.align 2, 0
|
||||
_081276DC: .4byte gUnknown_203B0D4
|
||||
_081276DC: .4byte gSelectedOrderFromParty
|
||||
_081276E0: .4byte gUnknown_203B09C
|
||||
_081276E4: .4byte 0x00000236
|
||||
_081276E8:
|
||||
ldr r2, _081276F4 @ =gUnknown_203B0D4
|
||||
ldr r2, _081276F4 @ =gSelectedOrderFromParty
|
||||
ldrb r0, [r2, 0x1]
|
||||
cmp r0, 0
|
||||
bne _08127700
|
||||
movs r0, 0x12
|
||||
b _08127702
|
||||
.align 2, 0
|
||||
_081276F4: .4byte gUnknown_203B0D4
|
||||
_081276F4: .4byte gSelectedOrderFromParty
|
||||
_081276F8:
|
||||
movs r0, 0x13
|
||||
b _08127702
|
||||
@@ -17696,7 +17696,7 @@ sub_8127710: @ 8127710
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0
|
||||
ldr r3, _08127728 @ =gUnknown_203B0D4
|
||||
ldr r3, _08127728 @ =gSelectedOrderFromParty
|
||||
_0812771A:
|
||||
adds r0, r1, r3
|
||||
ldrb r0, [r0]
|
||||
@@ -17705,7 +17705,7 @@ _0812771A:
|
||||
movs r0, 0x1
|
||||
b _08127738
|
||||
.align 2, 0
|
||||
_08127728: .4byte gUnknown_203B0D4
|
||||
_08127728: .4byte gSelectedOrderFromParty
|
||||
_0812772C:
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 24
|
||||
@@ -17740,7 +17740,7 @@ sub_812773C: @ 812773C
|
||||
.align 2, 0
|
||||
_08127764: .4byte gTasks
|
||||
_08127768:
|
||||
ldr r0, _08127780 @ =gUnknown_203B0D4
|
||||
ldr r0, _08127780 @ =gSelectedOrderFromParty
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08127784
|
||||
@@ -17750,7 +17750,7 @@ _08127768:
|
||||
bl sub_811FA78
|
||||
b _0812779E
|
||||
.align 2, 0
|
||||
_08127780: .4byte gUnknown_203B0D4
|
||||
_08127780: .4byte gSelectedOrderFromParty
|
||||
_08127784:
|
||||
movs r0, 0x1A
|
||||
bl PlaySE
|
||||
|
||||
@@ -1,149 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start SaveStatToString
|
||||
SaveStatToString: @ 80F7FCC
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
adds r5, r1, 0
|
||||
movs r1, 0xFC
|
||||
strb r1, [r5]
|
||||
adds r5, 0x1
|
||||
movs r0, 0x1
|
||||
strb r0, [r5]
|
||||
adds r5, 0x1
|
||||
strb r2, [r5]
|
||||
adds r5, 0x1
|
||||
strb r1, [r5]
|
||||
adds r5, 0x1
|
||||
movs r0, 0x3
|
||||
strb r0, [r5]
|
||||
adds r5, 0x1
|
||||
adds r2, 0x1
|
||||
strb r2, [r5]
|
||||
adds r5, 0x1
|
||||
cmp r3, 0x5
|
||||
bhi _080F80D8
|
||||
lsls r0, r3, 2
|
||||
ldr r1, _080F8008 @ =_080F800C
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080F8008: .4byte _080F800C
|
||||
.align 2, 0
|
||||
_080F800C:
|
||||
.4byte _080F8024
|
||||
.4byte _080F8034
|
||||
.4byte _080F805C
|
||||
.4byte _080F8098
|
||||
.4byte _080F80A8
|
||||
.4byte _080F806C
|
||||
_080F8024:
|
||||
ldr r0, _080F8030 @ =gSaveBlock2Ptr
|
||||
ldr r1, [r0]
|
||||
adds r0, r5, 0
|
||||
bl StringCopy
|
||||
b _080F80D8
|
||||
.align 2, 0
|
||||
_080F8030: .4byte gSaveBlock2Ptr
|
||||
_080F8034:
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080F8044
|
||||
movs r0, 0x1
|
||||
bl GetNationalPokedexCount
|
||||
b _080F804A
|
||||
_080F8044:
|
||||
movs r0, 0x1
|
||||
bl GetKantoPokedexCount
|
||||
_080F804A:
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r5, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl ConvertIntToDecimalStringN
|
||||
b _080F80D8
|
||||
_080F805C:
|
||||
ldr r4, _080F8068 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r4]
|
||||
ldrh r1, [r0, 0xE]
|
||||
adds r0, r5, 0
|
||||
movs r2, 0
|
||||
b _080F8076
|
||||
.align 2, 0
|
||||
_080F8068: .4byte gSaveBlock2Ptr
|
||||
_080F806C:
|
||||
ldr r4, _080F8094 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r4]
|
||||
ldrh r1, [r0, 0xE]
|
||||
adds r0, r5, 0
|
||||
movs r2, 0x1
|
||||
_080F8076:
|
||||
movs r3, 0x3
|
||||
bl ConvertIntToDecimalStringN
|
||||
adds r5, r0, 0
|
||||
movs r0, 0xF0
|
||||
strb r0, [r5]
|
||||
adds r5, 0x1
|
||||
ldr r0, [r4]
|
||||
ldrb r1, [r0, 0x10]
|
||||
adds r0, r5, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl ConvertIntToDecimalStringN
|
||||
b _080F80D8
|
||||
.align 2, 0
|
||||
_080F8094: .4byte gSaveBlock2Ptr
|
||||
_080F8098:
|
||||
ldr r0, _080F80A4 @ =gMapHeader
|
||||
ldrb r1, [r0, 0x14]
|
||||
adds r0, r5, 0
|
||||
bl sub_80C4DF8
|
||||
b _080F80D8
|
||||
.align 2, 0
|
||||
_080F80A4: .4byte gMapHeader
|
||||
_080F80A8:
|
||||
movs r4, 0x82
|
||||
lsls r4, 4
|
||||
movs r6, 0
|
||||
adds r7, r5, 0x1
|
||||
_080F80B0:
|
||||
lsls r0, r4, 16
|
||||
lsrs r0, 16
|
||||
bl FlagGet
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F80C0
|
||||
adds r6, 0x1
|
||||
_080F80C0:
|
||||
adds r4, 0x1
|
||||
ldr r0, _080F80E0 @ =0x00000827
|
||||
cmp r4, r0
|
||||
ble _080F80B0
|
||||
adds r0, r6, 0
|
||||
subs r0, 0x5F
|
||||
strb r0, [r5]
|
||||
adds r5, r7, 0
|
||||
movs r0, 0xA
|
||||
strb r0, [r5]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r5, 0x1]
|
||||
_080F80D8:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F80E0: .4byte 0x00000827
|
||||
thumb_func_end SaveStatToString
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -396,7 +396,7 @@ _080A034C: .4byte sub_80A0350
|
||||
thumb_func_start sub_80A0350
|
||||
sub_80A0350: @ 80A0350
|
||||
push {lr}
|
||||
ldr r0, _080A0360 @ =gUnknown_203B0D4
|
||||
ldr r0, _080A0360 @ =gSelectedOrderFromParty
|
||||
ldrb r1, [r0]
|
||||
cmp r1, 0
|
||||
bne _080A0368
|
||||
@@ -404,7 +404,7 @@ sub_80A0350: @ 80A0350
|
||||
strh r1, [r0]
|
||||
b _080A036E
|
||||
.align 2, 0
|
||||
_080A0360: .4byte gUnknown_203B0D4
|
||||
_080A0360: .4byte gSelectedOrderFromParty
|
||||
_080A0364: .4byte gSpecialVar_Result
|
||||
_080A0368:
|
||||
ldr r1, _080A0378 @ =gSpecialVar_Result
|
||||
@@ -438,7 +438,7 @@ _080A0398: .4byte sub_80A039C
|
||||
thumb_func_start sub_80A039C
|
||||
sub_80A039C: @ 80A039C
|
||||
push {r4,lr}
|
||||
ldr r0, _080A03B0 @ =gUnknown_203B0D4
|
||||
ldr r0, _080A03B0 @ =gSelectedOrderFromParty
|
||||
ldrb r4, [r0]
|
||||
cmp r4, 0
|
||||
bne _080A03B8
|
||||
@@ -447,7 +447,7 @@ sub_80A039C: @ 80A039C
|
||||
strh r4, [r0]
|
||||
b _080A03C2
|
||||
.align 2, 0
|
||||
_080A03B0: .4byte gUnknown_203B0D4
|
||||
_080A03B0: .4byte gSelectedOrderFromParty
|
||||
_080A03B4: .4byte gSpecialVar_Result
|
||||
_080A03B8:
|
||||
bl ReducePlayerPartyToThree
|
||||
@@ -481,7 +481,7 @@ ReducePlayerPartyToThree: @ 80A03D8
|
||||
ldr r6, _080A0454 @ =gPlayerParty
|
||||
adds r4, r7, 0
|
||||
_080A03F4:
|
||||
ldr r0, _080A0458 @ =gUnknown_203B0D4
|
||||
ldr r0, _080A0458 @ =gSelectedOrderFromParty
|
||||
adds r1, r5, r0
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0
|
||||
@@ -528,7 +528,7 @@ _080A042C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A0454: .4byte gPlayerParty
|
||||
_080A0458: .4byte gUnknown_203B0D4
|
||||
_080A0458: .4byte gSelectedOrderFromParty
|
||||
_080A045C: .4byte 0x05000096
|
||||
thumb_func_end ReducePlayerPartyToThree
|
||||
|
||||
|
||||
BIN
Binary file not shown.
+122
-11
@@ -7,13 +7,67 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_83FEDE4:: @ 83FEDE4
|
||||
.incbin "baserom.gba", 0x3FEDE4, 0x29C
|
||||
.incbin "baserom.gba", 0x3FEDE4, 0x1C
|
||||
|
||||
gUnknown_83FEE00::
|
||||
.incbin "baserom.gba", 0x3FEE00, 0x18
|
||||
|
||||
gUnknown_83FEE18::
|
||||
.incbin "baserom.gba", 0x3FEE18, 0x18
|
||||
|
||||
gUnknown_83FEE30::
|
||||
.incbin "baserom.gba", 0x3FEE30, 0x2C
|
||||
|
||||
gUnknown_83FEE5C::
|
||||
.incbin "baserom.gba", 0x3FEE5C, 0x18
|
||||
|
||||
gUnknown_83FEE74::
|
||||
.incbin "baserom.gba", 0x3FEE74, 0x18
|
||||
|
||||
gUnknown_83FEE8C::
|
||||
.incbin "baserom.gba", 0x3FEE8C, 0x58
|
||||
|
||||
gUnknown_83FEEE4::
|
||||
.incbin "baserom.gba", 0x3FEEE4, 0x18
|
||||
|
||||
gUnknown_83FEEFC::
|
||||
.incbin "baserom.gba", 0x3FEEFC, 0x34
|
||||
|
||||
gUnknown_83FEF30::
|
||||
.incbin "baserom.gba", 0x3FEF30, 0x40
|
||||
|
||||
gUnknown_83FEF70::
|
||||
.incbin "baserom.gba", 0x3FEF70, 0x4C
|
||||
|
||||
gUnknown_83FEFBC::
|
||||
.incbin "baserom.gba", 0x3FEFBC, 0x50
|
||||
|
||||
gUnknown_83FF00C::
|
||||
.incbin "baserom.gba", 0x3FF00C, 0x18
|
||||
|
||||
gUnknown_83FF024::
|
||||
.incbin "baserom.gba", 0x3FF024, 0x18
|
||||
|
||||
gUnknown_83FF03C::
|
||||
.incbin "baserom.gba", 0x3FF03C, 0x2C
|
||||
|
||||
gUnknown_83FF068::
|
||||
.incbin "baserom.gba", 0x3FF068, 0x18
|
||||
|
||||
gUnknown_83FF080:: @ 83FF080
|
||||
.incbin "baserom.gba", 0x3FF080, 0xB0
|
||||
.incbin "baserom.gba", 0x3FF080, 0x58
|
||||
|
||||
gUnknown_83FF0D8::
|
||||
.incbin "baserom.gba", 0x3FF0D8, 0x40
|
||||
|
||||
gUnknown_83FF118::
|
||||
.incbin "baserom.gba", 0x3FF118, 0x18
|
||||
|
||||
gUnknown_83FF130:: @ 83FF130
|
||||
.incbin "baserom.gba", 0x3FF130, 0x38
|
||||
.incbin "baserom.gba", 0x3FF130, 0x20
|
||||
|
||||
gUnknown_83FF150::
|
||||
.incbin "baserom.gba", 0x3FF150, 0x18
|
||||
|
||||
gUnknown_83FF168:: @ 83FF168
|
||||
.incbin "baserom.gba", 0x3FF168, 0x18
|
||||
@@ -25,7 +79,10 @@ gUnknown_83FF198:: @ 83FF198
|
||||
.incbin "baserom.gba", 0x3FF198, 0x28
|
||||
|
||||
gUnknown_83FF1C0:: @ 83FF1C0
|
||||
.incbin "baserom.gba", 0x3FF1C0, 0x50
|
||||
.incbin "baserom.gba", 0x3FF1C0, 0x38
|
||||
|
||||
gUnknown_83FF1F8::
|
||||
.incbin "baserom.gba", 0x3FF1F8, 0x18
|
||||
|
||||
gUnknown_83FF210:: @ 83FF210
|
||||
.incbin "baserom.gba", 0x3FF210, 0x30
|
||||
@@ -43,10 +100,34 @@ gUnknown_83FF288:: @ 83FF288
|
||||
.incbin "baserom.gba", 0x3FF288, 0x8
|
||||
|
||||
gUnknown_83FF290:: @ 83FF290
|
||||
.incbin "baserom.gba", 0x3FF290, 0x140
|
||||
.incbin "baserom.gba", 0x3FF290, 0x20
|
||||
|
||||
gUnknown_83FF2B0::
|
||||
.incbin "baserom.gba", 0x3FF2B0, 0x74
|
||||
|
||||
gUnknown_83FF324::
|
||||
.incbin "baserom.gba", 0x3FF324, 0x4C
|
||||
|
||||
gUnknown_83FF370::
|
||||
.incbin "baserom.gba", 0x3FF370, 0x18
|
||||
|
||||
gUnknown_83FF388::
|
||||
.incbin "baserom.gba", 0x3FF388, 0x18
|
||||
|
||||
gUnknown_83FF3A0::
|
||||
.incbin "baserom.gba", 0x3FF3A0, 0x18
|
||||
|
||||
gUnknown_83FF3B8::
|
||||
.incbin "baserom.gba", 0x3FF3B8, 0x18
|
||||
|
||||
gUnknown_83FF3D0:: @ 83FF3D0
|
||||
.incbin "baserom.gba", 0x3FF3D0, 0x15C
|
||||
.incbin "baserom.gba", 0x3FF3D0, 0x9C
|
||||
|
||||
gUnknown_83FF46C::
|
||||
.incbin "baserom.gba", 0x3FF46C, 0xA8
|
||||
|
||||
gUnknown_83FF514::
|
||||
.incbin "baserom.gba", 0x3FF514, 0x18
|
||||
|
||||
gUnknown_83FF52C:: @ 83FF52C
|
||||
.incbin "baserom.gba", 0x3FF52C, 0x20
|
||||
@@ -55,16 +136,46 @@ gUnknown_83FF54C:: @ 83FF54C
|
||||
.incbin "baserom.gba", 0x3FF54C, 0x18
|
||||
|
||||
gUnknown_83FF564:: @ 83FF564
|
||||
.incbin "baserom.gba", 0x3FF564, 0x68
|
||||
.incbin "baserom.gba", 0x3FF564, 0x50
|
||||
|
||||
gUnknown_83FF5B4::
|
||||
.incbin "baserom.gba", 0x3FF5B4, 0x18
|
||||
|
||||
gUnknown_83FF5CC:: @ 83FF5CC
|
||||
.incbin "baserom.gba", 0x3FF5CC, 0x60
|
||||
.incbin "baserom.gba", 0x3FF5CC, 0x18
|
||||
|
||||
gUnknown_83FF5E4::
|
||||
.incbin "baserom.gba", 0x3FF5E4, 0x48
|
||||
|
||||
gUnknown_83FF62C:: @ 83FF62C
|
||||
.incbin "baserom.gba", 0x3FF62C, 0x30
|
||||
.incbin "baserom.gba", 0x3FF62C, 0x18
|
||||
|
||||
gUnknown_83FF644::
|
||||
.incbin "baserom.gba", 0x3FF644, 0x18
|
||||
|
||||
gUnknown_83FF65C:: @ 83FF65C
|
||||
.incbin "baserom.gba", 0x3FF65C, 0x14C
|
||||
.incbin "baserom.gba", 0x3FF65C, 0x18
|
||||
|
||||
gUnknown_83FF674::
|
||||
.incbin "baserom.gba", 0x3FF674, 0x18
|
||||
|
||||
gUnknown_83FF68C::
|
||||
.incbin "baserom.gba", 0x3FF68C, 0x18
|
||||
|
||||
gUnknown_83FF6A4::
|
||||
.incbin "baserom.gba", 0x3FF6A4, 0x18
|
||||
|
||||
gUnknown_83FF6BC::
|
||||
.incbin "baserom.gba", 0x3FF6BC, 0x30
|
||||
|
||||
gUnknown_83FF6EC::
|
||||
.incbin "baserom.gba", 0x3FF6EC, 0x78
|
||||
|
||||
gUnknown_83FF764::
|
||||
.incbin "baserom.gba", 0x3FF764, 0x2C
|
||||
|
||||
gUnknown_83FF790::
|
||||
.incbin "baserom.gba", 0x3FF790, 0x18
|
||||
|
||||
gUnknown_83FF7A8:: @ 83FF7A8
|
||||
.incbin "baserom.gba", 0x3FF7A8, 0x24C
|
||||
.incbin "baserom.gba", 0x3FF7A8, 0x30
|
||||
|
||||
+400
-22
@@ -7,7 +7,30 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_83E2964:: @ 83E2964
|
||||
.incbin "baserom.gba", 0x3E2964, 0x74
|
||||
.byte 0x02, 0x04, 0x01, 0x03
|
||||
|
||||
gUnknown_83E2968::
|
||||
obj_image_anim_frame 0x0000, 5
|
||||
obj_image_anim_frame 0x0002, 5
|
||||
obj_image_anim_frame 0x0004, 5
|
||||
obj_image_anim_frame 0x0006, 5
|
||||
obj_image_anim_frame 0x0008, 5
|
||||
obj_image_anim_frame 0x000a, 5
|
||||
obj_image_anim_frame 0x000c, 5
|
||||
obj_image_anim_frame 0x000e, 5
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gUnknown_83E298C::
|
||||
.4byte gUnknown_83E2968
|
||||
|
||||
gUnknown_83E2990::
|
||||
spr_template 10067, 10067, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
|
||||
|
||||
gUnknown_83E29A8::
|
||||
spr_template 10068, 10068, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
|
||||
|
||||
gUnknown_83E29C0::
|
||||
spr_template 10065, 10065, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
|
||||
|
||||
gAnimCmd_83E29D8::
|
||||
obj_image_anim_frame 0, 1
|
||||
@@ -76,46 +99,296 @@ gUnknown_83E2A70::
|
||||
gUnknown_83E2A88:: @ 83E2A88
|
||||
spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430
|
||||
|
||||
.incbin "baserom.gba", 0x3E2AA0, 0x4D8
|
||||
gSpriteTemplate_83E2AA0::
|
||||
.incbin "baserom.gba", 0x3E2AA0, 0x1C
|
||||
|
||||
gUnknown_83E2ABC::
|
||||
.incbin "baserom.gba", 0x3E2ABC, 0x2C
|
||||
|
||||
gUnknown_83E2AE8::
|
||||
.incbin "baserom.gba", 0x3E2AE8, 0x18
|
||||
|
||||
gUnknown_83E2B00::
|
||||
.incbin "baserom.gba", 0x3E2B00, 0x34
|
||||
|
||||
gUnknown_83E2B34::
|
||||
.incbin "baserom.gba", 0x3E2B34, 0x30
|
||||
|
||||
gUnknown_83E2B64::
|
||||
.incbin "baserom.gba", 0x3E2B64, 0x30
|
||||
|
||||
gUnknown_83E2B94::
|
||||
.incbin "baserom.gba", 0x3E2B94, 0x18
|
||||
|
||||
gUnknown_83E2BAC::
|
||||
.incbin "baserom.gba", 0x3E2BAC, 0x5C
|
||||
|
||||
gUnknown_83E2C08::
|
||||
.incbin "baserom.gba", 0x3E2C08, 0x18
|
||||
|
||||
gUnknown_83E2C20::
|
||||
.incbin "baserom.gba", 0x3E2C20, 0x30
|
||||
|
||||
gUnknown_83E2C50::
|
||||
.incbin "baserom.gba", 0x3E2C50, 0x2C
|
||||
|
||||
gUnknown_83E2C7C::
|
||||
.incbin "baserom.gba", 0x3E2C7C, 0x90
|
||||
|
||||
gUnknown_83E2D0C::
|
||||
.incbin "baserom.gba", 0x3E2D0C, 0x48
|
||||
|
||||
gUnknown_83E2D54::
|
||||
.incbin "baserom.gba", 0x3E2D54, 0x70
|
||||
|
||||
gUnknown_83E2DC4::
|
||||
.incbin "baserom.gba", 0x3E2DC4, 0x18
|
||||
|
||||
gUnknown_83E2DDC::
|
||||
.incbin "baserom.gba", 0x3E2DDC, 0x28
|
||||
|
||||
gUnknown_83E2E04::
|
||||
.incbin "baserom.gba", 0x3E2E04, 0x84
|
||||
|
||||
gUnknown_83E2E88::
|
||||
.incbin "baserom.gba", 0x3E2E88, 0x18
|
||||
|
||||
gUnknown_83E2EA0::
|
||||
.incbin "baserom.gba", 0x3E2EA0, 0x30
|
||||
|
||||
gUnknown_83E2ED0::
|
||||
.incbin "baserom.gba", 0x3E2ED0, 0x18
|
||||
|
||||
gUnknown_83E2EE8::
|
||||
.incbin "baserom.gba", 0x3E2EE8, 0x78
|
||||
|
||||
gUnknown_83E2F60::
|
||||
.incbin "baserom.gba", 0x3E2F60, 0x18
|
||||
|
||||
gUnknown_83E2F78:: @ 83E2F78
|
||||
.incbin "baserom.gba", 0x3E2F78, 0x78
|
||||
|
||||
gUnknown_83E2FF0:: @ 83E2FF0
|
||||
.incbin "baserom.gba", 0x3E2FF0, 0x100
|
||||
.incbin "baserom.gba", 0x3E2FF0, 0x34
|
||||
|
||||
gUnknown_83E3024::
|
||||
.incbin "baserom.gba", 0x3E3024, 0x18
|
||||
|
||||
gUnknown_83E303C::
|
||||
.incbin "baserom.gba", 0x3E303C, 0x6C
|
||||
|
||||
gUnknown_83E30A8::
|
||||
.incbin "baserom.gba", 0x3E30A8, 0x18
|
||||
|
||||
gUnknown_83E30C0::
|
||||
.incbin "baserom.gba", 0x3E30C0, 0x18
|
||||
|
||||
gUnknown_83E30D8::
|
||||
.incbin "baserom.gba", 0x3E30D8, 0x18
|
||||
|
||||
gUnknown_83E30F0:: @ 83E30F0
|
||||
.incbin "baserom.gba", 0x3E30F0, 0x458
|
||||
.incbin "baserom.gba", 0x3E30F0, 0x10
|
||||
|
||||
gUnknown_83E3100::
|
||||
.incbin "baserom.gba", 0x3E3100, 0x48
|
||||
|
||||
gUnknown_83E3148::
|
||||
.incbin "baserom.gba", 0x3E3148, 0x18
|
||||
|
||||
gUnknown_83E3160::
|
||||
.incbin "baserom.gba", 0x3E3160, 0x134
|
||||
|
||||
gUnknown_83E3294::
|
||||
.incbin "baserom.gba", 0x3E3294, 0x18
|
||||
|
||||
gUnknown_83E32AC::
|
||||
.incbin "baserom.gba", 0x3E32AC, 0xA8
|
||||
|
||||
gUnknown_83E3354::
|
||||
.incbin "baserom.gba", 0x3E3354, 0x60
|
||||
|
||||
gUnknown_83E33B4::
|
||||
.incbin "baserom.gba", 0x3E33B4, 0x40
|
||||
|
||||
gUnknown_83E33F4::
|
||||
.incbin "baserom.gba", 0x3E33F4, 0x18
|
||||
|
||||
gUnknown_83E340C::
|
||||
.incbin "baserom.gba", 0x3E340C, 0xF4
|
||||
|
||||
gUnknown_83E3500::
|
||||
.incbin "baserom.gba", 0x3E3500, 0x18
|
||||
|
||||
gUnknown_83E3518::
|
||||
.incbin "baserom.gba", 0x3E3518, 0x18
|
||||
|
||||
gUnknown_83E3530::
|
||||
.incbin "baserom.gba", 0x3E3530, 0x18
|
||||
|
||||
gUnknown_83E3548:: @ 83E3548
|
||||
.incbin "baserom.gba", 0x3E3548, 0x1EC
|
||||
.incbin "baserom.gba", 0x3E3548, 0x8
|
||||
|
||||
gUnknown_83E3550::
|
||||
.incbin "baserom.gba", 0x3E3550, 0x54
|
||||
|
||||
gUnknown_83E35A4::
|
||||
.incbin "baserom.gba", 0x3E35A4, 0x18
|
||||
|
||||
gUnknown_83E35BC::
|
||||
.incbin "baserom.gba", 0x3E35BC, 0x18
|
||||
|
||||
gUnknown_83E35D4::
|
||||
.incbin "baserom.gba", 0x3E35D4, 0x30
|
||||
|
||||
gUnknown_83E3604::
|
||||
.incbin "baserom.gba", 0x3E3604, 0x58
|
||||
|
||||
gUnknown_83E365C::
|
||||
.incbin "baserom.gba", 0x3E365C, 0x18
|
||||
|
||||
gUnknown_83E3674::
|
||||
.incbin "baserom.gba", 0x3E3674, 0x34
|
||||
|
||||
gUnknown_83E36A8::
|
||||
.incbin "baserom.gba", 0x3E36A8, 0x44
|
||||
|
||||
gUnknown_83E36EC::
|
||||
.incbin "baserom.gba", 0x3E36EC, 0x30
|
||||
|
||||
gUnknown_83E371C::
|
||||
.incbin "baserom.gba", 0x3E371C, 0x18
|
||||
|
||||
gUnknown_83E3734:: @ 83E3734
|
||||
.incbin "baserom.gba", 0x3E3734, 0x30
|
||||
|
||||
gUnknown_83E3764:: @ 83E3764
|
||||
.incbin "baserom.gba", 0x3E3764, 0x134
|
||||
.incbin "baserom.gba", 0x3E3764, 0x40
|
||||
|
||||
gUnknown_83E37A4::
|
||||
.incbin "baserom.gba", 0x3E37A4, 0x18
|
||||
|
||||
gUnknown_83E37BC::
|
||||
.incbin "baserom.gba", 0x3E37BC, 0x30
|
||||
|
||||
gUnknown_83E37EC::
|
||||
.incbin "baserom.gba", 0x3E37EC, 0x94
|
||||
|
||||
gUnknown_83E3880::
|
||||
.incbin "baserom.gba", 0x3E3880, 0x18
|
||||
|
||||
gUnknown_83E3898:: @ 83E3898
|
||||
.incbin "baserom.gba", 0x3E3898, 0xF4
|
||||
.incbin "baserom.gba", 0x3E3898, 0x30
|
||||
|
||||
gUnknown_83E38C8::
|
||||
.incbin "baserom.gba", 0x3E38C8, 0x18
|
||||
|
||||
gUnknown_83E38E0::
|
||||
.incbin "baserom.gba", 0x3E38E0, 0x34
|
||||
|
||||
gUnknown_83E3914::
|
||||
.incbin "baserom.gba", 0x3E3914, 0x78
|
||||
|
||||
gUnknown_83E398C:: @ 83E398C
|
||||
.incbin "baserom.gba", 0x3E398C, 0x29C
|
||||
.incbin "baserom.gba", 0x3E398C, 0xA8
|
||||
|
||||
gUnknown_83E3A34::
|
||||
.incbin "baserom.gba", 0x3E3A34, 0x18
|
||||
|
||||
gUnknown_83E3A4C::
|
||||
.incbin "baserom.gba", 0x3E3A4C, 0x78
|
||||
|
||||
gUnknown_83E3AC4::
|
||||
.incbin "baserom.gba", 0x3E3AC4, 0xF8
|
||||
|
||||
gUnknown_83E3BBC::
|
||||
.incbin "baserom.gba", 0x3E3BBC, 0x3C
|
||||
|
||||
gUnknown_83E3BF8::
|
||||
.incbin "baserom.gba", 0x3E3BF8, 0x18
|
||||
|
||||
gUnknown_83E3C10::
|
||||
.incbin "baserom.gba", 0x3E3C10, 0x18
|
||||
|
||||
gUnknown_83E3C28:: @ 83E3C28
|
||||
.incbin "baserom.gba", 0x3E3C28, 0xF0
|
||||
.incbin "baserom.gba", 0x3E3C28, 0x78
|
||||
|
||||
gUnknown_83E3CA0::
|
||||
.incbin "baserom.gba", 0x3E3CA0, 0x18
|
||||
|
||||
gUnknown_83E3CB8::
|
||||
.incbin "baserom.gba", 0x3E3CB8, 0x18
|
||||
|
||||
gUnknown_83E3CD0::
|
||||
.incbin "baserom.gba", 0x3E3CD0, 0x18
|
||||
|
||||
gUnknown_83E3CE8::
|
||||
.incbin "baserom.gba", 0x3E3CE8, 0x18
|
||||
|
||||
gUnknown_83E3D00::
|
||||
.incbin "baserom.gba", 0x3E3D00, 0x18
|
||||
|
||||
gUnknown_83E3D18:: @ 83E3D18
|
||||
.incbin "baserom.gba", 0x3E3D18, 0x148
|
||||
.incbin "baserom.gba", 0x3E3D18, 0x38
|
||||
|
||||
gUnknown_83E3D50::
|
||||
.incbin "baserom.gba", 0x3E3D50, 0x18
|
||||
|
||||
gUnknown_83E3D68::
|
||||
.incbin "baserom.gba", 0x3E3D68, 0x2C
|
||||
|
||||
gUnknown_83E3D94::
|
||||
.incbin "baserom.gba", 0x3E3D94, 0x34
|
||||
|
||||
gUnknown_83E3DC8::
|
||||
.incbin "baserom.gba", 0x3E3DC8, 0x40
|
||||
|
||||
gUnknown_83E3E08::
|
||||
.incbin "baserom.gba", 0x3E3E08, 0x40
|
||||
|
||||
gUnknown_83E3E48::
|
||||
.incbin "baserom.gba", 0x3E3E48, 0x18
|
||||
|
||||
gUnknown_83E3E60:: @ 83E3E60
|
||||
.incbin "baserom.gba", 0x3E3E60, 0x20
|
||||
|
||||
gUnknown_83E3E80:: @ 83E3E80
|
||||
.incbin "baserom.gba", 0x3E3E80, 0x9C
|
||||
.incbin "baserom.gba", 0x3E3E80, 0x50
|
||||
|
||||
gUnknown_83E3ED0::
|
||||
.incbin "baserom.gba", 0x3E3ED0, 0x34
|
||||
|
||||
gUnknown_83E3F04::
|
||||
.incbin "baserom.gba", 0x3E3F04, 0x18
|
||||
|
||||
gUnknown_83E3F1C:: @ 83E3F1C
|
||||
.incbin "baserom.gba", 0x3E3F1C, 0x20C
|
||||
.incbin "baserom.gba", 0x3E3F1C, 0x30
|
||||
|
||||
gUnknown_83E3F4C::
|
||||
.incbin "baserom.gba", 0x3E3F4C, 0x18
|
||||
|
||||
gUnknown_83E3F64::
|
||||
.incbin "baserom.gba", 0x3E3F64, 0x30
|
||||
|
||||
gUnknown_83E3F94::
|
||||
.incbin "baserom.gba", 0x3E3F94, 0x94
|
||||
|
||||
gUnknown_83E4028::
|
||||
.incbin "baserom.gba", 0x3E4028, 0x6C
|
||||
|
||||
gUnknown_83E4094::
|
||||
.incbin "baserom.gba", 0x3E4094, 0x34
|
||||
|
||||
gUnknown_83E40C8::
|
||||
.incbin "baserom.gba", 0x3E40C8, 0x18
|
||||
|
||||
gUnknown_83E40E0::
|
||||
.incbin "baserom.gba", 0x3E40E0, 0x18
|
||||
|
||||
gUnknown_83E40F8::
|
||||
.incbin "baserom.gba", 0x3E40F8, 0x18
|
||||
|
||||
gUnknown_83E4110::
|
||||
.incbin "baserom.gba", 0x3E4110, 0x18
|
||||
|
||||
gUnknown_83E4128:: @ 83E4128
|
||||
.incbin "baserom.gba", 0x3E4128, 0x2C
|
||||
@@ -124,28 +397,133 @@ gUnknown_83E4154:: @ 83E4154
|
||||
.incbin "baserom.gba", 0x3E4154, 0x18
|
||||
|
||||
gUnknown_83E416C:: @ 83E416C
|
||||
.incbin "baserom.gba", 0x3E416C, 0x5C
|
||||
.incbin "baserom.gba", 0x3E416C, 0x44
|
||||
|
||||
gUnknown_83E41B0::
|
||||
.incbin "baserom.gba", 0x3E41B0, 0x18
|
||||
|
||||
gUnknown_83E41C8:: @ 83E41C8
|
||||
.incbin "baserom.gba", 0x3E41C8, 0x38
|
||||
.incbin "baserom.gba", 0x3E41C8, 0x8
|
||||
|
||||
gUnknown_83E41D0::
|
||||
.incbin "baserom.gba", 0x3E41D0, 0x18
|
||||
|
||||
gUnknown_83E41E8::
|
||||
.incbin "baserom.gba", 0x3E41E8, 0x18
|
||||
|
||||
gUnknown_83E4200:: @ 83E4200
|
||||
.incbin "baserom.gba", 0x3E4200, 0x210
|
||||
.incbin "baserom.gba", 0x3E4200, 0x18
|
||||
|
||||
gUnknown_83E4218::
|
||||
.incbin "baserom.gba", 0x3E4218, 0x18
|
||||
|
||||
gUnknown_83E4230::
|
||||
.incbin "baserom.gba", 0x3E4230, 0x18
|
||||
|
||||
gUnknown_83E4248::
|
||||
.incbin "baserom.gba", 0x3E4248, 0x34
|
||||
|
||||
gUnknown_83E427C::
|
||||
.incbin "baserom.gba", 0x3E427C, 0x18
|
||||
|
||||
gUnknown_83E4294::
|
||||
.incbin "baserom.gba", 0x3E4294, 0x34
|
||||
|
||||
gUnknown_83E42C8::
|
||||
.incbin "baserom.gba", 0x3E42C8, 0x34
|
||||
|
||||
gUnknown_83E42FC::
|
||||
.incbin "baserom.gba", 0x3E42FC, 0x24
|
||||
|
||||
gUnknown_83E4320::
|
||||
.incbin "baserom.gba", 0x3E4320, 0x18
|
||||
|
||||
gUnknown_83E4338::
|
||||
.incbin "baserom.gba", 0x3E4338, 0x30
|
||||
|
||||
gUnknown_83E4368::
|
||||
.incbin "baserom.gba", 0x3E4368, 0x48
|
||||
|
||||
gUnknown_83E43B0::
|
||||
.incbin "baserom.gba", 0x3E43B0, 0x48
|
||||
|
||||
gUnknown_83E43F8::
|
||||
.incbin "baserom.gba", 0x3E43F8, 0x18
|
||||
|
||||
gUnknown_83E4410:: @ 83E4410
|
||||
.incbin "baserom.gba", 0x3E4410, 0x1488
|
||||
.incbin "baserom.gba", 0x3E4410, 0x20
|
||||
|
||||
gUnknown_83E4430::
|
||||
.incbin "baserom.gba", 0x3E4430, 0x54
|
||||
|
||||
gUnknown_83E4484::
|
||||
.incbin "baserom.gba", 0x3E4484, 0x18
|
||||
|
||||
gUnknown_83E449C::
|
||||
.incbin "baserom.gba", 0x3E449C, 0x40
|
||||
|
||||
gUnknown_83E44DC::
|
||||
.incbin "baserom.gba", 0x3E44DC, 0x13BC
|
||||
|
||||
gUnknown_83E5898:: @ 83E5898
|
||||
.incbin "baserom.gba", 0x3E5898, 0xC0
|
||||
.incbin "baserom.gba", 0x3E5898, 0x48
|
||||
|
||||
gUnknown_83E58E0::
|
||||
.incbin "baserom.gba", 0x3E58E0, 0x4C
|
||||
|
||||
gUnknown_83E592C::
|
||||
.incbin "baserom.gba", 0x3E592C, 0x2C
|
||||
|
||||
gUnknown_83E5958:: @ 83E5958
|
||||
.incbin "baserom.gba", 0x3E5958, 0x120
|
||||
.incbin "baserom.gba", 0x3E5958, 0x4
|
||||
|
||||
gUnknown_83E5A78:: @ 83E5A78
|
||||
.incbin "baserom.gba", 0x3E5A78, 0x68
|
||||
gUnknown_83E595C::
|
||||
.incbin "baserom.gba", 0x3E595C, 0x18
|
||||
|
||||
gUnknown_83E5974::
|
||||
.incbin "baserom.gba", 0x3E5974, 0x18
|
||||
|
||||
gUnknown_83E598C::
|
||||
.incbin "baserom.gba", 0x3E598C, 0x18
|
||||
|
||||
gUnknown_83E59A4::
|
||||
.incbin "baserom.gba", 0x3E59A4, 0x2C
|
||||
|
||||
gUnknown_83E59D0::
|
||||
.incbin "baserom.gba", 0x3E59D0, 0x18
|
||||
|
||||
gUnknown_83E59E8::
|
||||
.incbin "baserom.gba", 0x3E59E8, 0x50
|
||||
|
||||
gUnknown_83E5A38::
|
||||
.incbin "baserom.gba", 0x3E5A38, 0x18
|
||||
|
||||
gUnknown_83E5A50::
|
||||
.incbin "baserom.gba", 0x3E5A50, 0x28
|
||||
|
||||
gUnknown_83E5A78::
|
||||
.incbin "baserom.gba", 0x3E5A78, 0x8
|
||||
|
||||
gUnknown_83E5A80::
|
||||
.incbin "baserom.gba", 0x3E5A80, 0x18
|
||||
|
||||
gUnknown_83E5A98::
|
||||
.incbin "baserom.gba", 0x3E5A98, 0x18
|
||||
|
||||
gUnknown_83E5AB0::
|
||||
.incbin "baserom.gba", 0x3E5AB0, 0x18
|
||||
|
||||
gUnknown_83E5AC8::
|
||||
.incbin "baserom.gba", 0x3E5AC8, 0x18
|
||||
|
||||
gUnknown_83E5AE0:: @ 83E5AE0
|
||||
.incbin "baserom.gba", 0x3E5AE0, 0xA8
|
||||
.incbin "baserom.gba", 0x3E5AE0, 0x90
|
||||
|
||||
gUnknown_83E5B70::
|
||||
.incbin "baserom.gba", 0x3E5B70, 0x18
|
||||
|
||||
gUnknown_83E5B88:: @ 83E5B88
|
||||
.incbin "baserom.gba", 0x3E5B88, 0x30
|
||||
.incbin "baserom.gba", 0x3E5B88, 0x18
|
||||
|
||||
gUnknown_83E5BA0:: @ 83E5BA0
|
||||
.incbin "baserom.gba", 0x3E5BA0, 0x18
|
||||
|
||||
+11091
-10
File diff suppressed because it is too large
Load Diff
@@ -28,4 +28,10 @@ gUnknown_840C104:: @ 840C104
|
||||
.incbin "baserom.gba", 0x40C104, 0xC0
|
||||
|
||||
gUnknown_840C1C4:: @ 840C1C4
|
||||
.incbin "baserom.gba", 0x40C1C4, 0x64
|
||||
.incbin "baserom.gba", 0x40C1C4, 0x28
|
||||
|
||||
gUnknown_840C1EC::
|
||||
.incbin "baserom.gba", 0x40C1EC, 0x24
|
||||
|
||||
gUnknown_840C210::
|
||||
.incbin "baserom.gba", 0x40C210, 0x18
|
||||
|
||||
@@ -1,14 +1,110 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_83BF3E0:: @ 83BF3DC
|
||||
.incbin "baserom.gba", 0x3BF3E0, 0x174
|
||||
obj_image_anim_frame 0, 3
|
||||
obj_image_anim_frame 4, 3
|
||||
obj_image_anim_frame 8, 3
|
||||
obj_image_anim_frame 12, 3
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnimTable_83BF3F4:: @ 83BF3F4
|
||||
.4byte gUnknown_83BF3E0
|
||||
|
||||
gSpriteTemplate_83BF3F8:: @ 83BF3F8
|
||||
spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58
|
||||
|
||||
gSpriteTemplate_83BF410:: @ 83BF410
|
||||
spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8
|
||||
|
||||
gUnknown_83BF428:: @ 83BF428
|
||||
obj_image_anim_frame 0x0000, 3
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gSpriteAnimTable_83BF430:: @ 83BF430
|
||||
.4byte gUnknown_83BF428
|
||||
|
||||
gSpriteTemplate_83BF434:: @ 83BF434
|
||||
spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C
|
||||
|
||||
gSpriteTemplate_83BF44C:: @ 83BF44C
|
||||
spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350
|
||||
|
||||
gUnknown_83BF464:: @ 83BF464
|
||||
obj_image_anim_frame 0x0000, 3
|
||||
obj_image_anim_frame 0x0010, 3
|
||||
obj_image_anim_frame 0x0020, 3
|
||||
obj_image_anim_frame 0x0030, 3
|
||||
obj_image_anim_frame 0x0040, 3
|
||||
obj_image_anim_end
|
||||
|
||||
gSpriteAnimTable_83BF47C:: @ 83BF47C
|
||||
.4byte gUnknown_83BF464
|
||||
|
||||
gSpriteTemplate_83BF480:: @ 83BF480
|
||||
spr_template 10071, 10071, gOamData_83AC9D8, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0
|
||||
|
||||
gSpriteTemplate_83BF498:: @ 83BF498
|
||||
spr_template 10051, 10051, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58
|
||||
|
||||
gUnknown_83BF4B0:: @ 83BF4B0
|
||||
obj_image_anim_frame 0x0000, 5
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gUnknown_83BF4B8:: @ 83BF4B8
|
||||
obj_image_anim_frame 0x0000, 5
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gUnknown_83BF4C0:: @ 83BF4C0
|
||||
obj_image_anim_frame 0x0000, 5
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gSpriteAniimTable_83BF4C8:: @ 83BF4C8
|
||||
.4byte gUnknown_83BF4B0
|
||||
.4byte gUnknown_83BF4B8
|
||||
.4byte gUnknown_83BF4C0
|
||||
|
||||
gSpriteTemplate_83BF4D4:: @ 83BF4D4
|
||||
spr_template 10135, 10135, gOamData_83AC9D8, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58
|
||||
|
||||
gUnknown_83BF4EC:: @ 83BF4EC
|
||||
obj_image_anim_frame 0x0000, 15
|
||||
obj_image_anim_jump 0x0000
|
||||
|
||||
gSpriteAnimTable_83BF4F4:: @ 83BF4F4
|
||||
.4byte gUnknown_83BF4EC
|
||||
|
||||
gUnknown_83BF4F8:: @ 83BF4F8
|
||||
obj_rot_scal_anim_frame 0x0060, 0x0060, 0x00, 0
|
||||
obj_rot_scal_anim_frame 0x0002, 0x0002, 0x00, 1
|
||||
obj_rot_scal_anim_jump 0x0001
|
||||
|
||||
gSpriteAffineAnimTable_83BF510:: @ 83BF510
|
||||
.4byte gUnknown_83BF4F8
|
||||
|
||||
gSpriteTemplate_83BF514:: @ 83BF514
|
||||
spr_template 10004, 10004, gOamData_83ACA90, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8
|
||||
|
||||
gUnknown_83BF52C:: @ 83BF52C
|
||||
.string "TASK OVER\n"
|
||||
.string "タスクがオーバーしました$"
|
||||
|
||||
.align 2
|
||||
gSubsprites_83BF544:: @ 83BF544
|
||||
subsprite 240, 240, 2, 0x00, 64x64
|
||||
subsprite 240, 48, 2, 0x40, 64x32
|
||||
subsprite 48, 240, 2, 0x60, 32x64
|
||||
subsprite 48, 48, 2, 0x80, 32x32
|
||||
|
||||
gUnknown_83BF554:: @ 83BF554
|
||||
.incbin "baserom.gba", 0x3BF554, 0x8
|
||||
.byte 4
|
||||
.align 2
|
||||
.4byte gSubsprites_83BF544
|
||||
|
||||
gUnknown_83BF55C:: @ 83BF55C
|
||||
.incbin "baserom.gba", 0x3BF55C, 0x18
|
||||
spr_template 10010, 10010, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83BF574:: @ 83BF574
|
||||
.incbin "baserom.gba", 0x3BF574, 0x18
|
||||
spr_template 10136, 10136, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
gUnknown_846E2E0:: @ 846E2E0
|
||||
.incbin "baserom.gba", 0x46E2E0, 0x8
|
||||
|
||||
gUnknown_846E2E8:: @ 846E2E8
|
||||
.incbin "baserom.gba", 0x46E2E8, 0x8
|
||||
|
||||
gUnknown_846E2F0:: @ 846E2F0
|
||||
.incbin "baserom.gba", 0x46E2F0, 0x24
|
||||
|
||||
gUnknown_846E314:: @ 846E314
|
||||
.incbin "baserom.gba", 0x46E314, 0x14
|
||||
|
||||
gUnknown_846E328:: @ 846E328
|
||||
.incbin "baserom.gba", 0x46E328, 0x24
|
||||
|
||||
gUnknown_846E34C:: @ 846E34C
|
||||
.incbin "baserom.gba", 0x46E34C, 0x68
|
||||
|
||||
gUnknown_846E3B4:: @ 846E3B4
|
||||
.incbin "baserom.gba", 0x46E3B4, 0x10
|
||||
|
||||
gUnknown_846E3C4:: @ 846E3C4
|
||||
.incbin "baserom.gba", 0x46E3C4, 0x4
|
||||
|
||||
gUnknown_846E3C8:: @ 846E3C8
|
||||
.incbin "baserom.gba", 0x46E3C8, 0x4
|
||||
|
||||
gUnknown_846E3CC:: @ 846E3CC
|
||||
.incbin "baserom.gba", 0x46E3CC, 0x4
|
||||
|
||||
gUnknown_846E3D0:: @ 846E3D0
|
||||
.incbin "baserom.gba", 0x46E3D0, 0xC
|
||||
|
||||
gUnknown_846E3DC:: @ 846E3DC
|
||||
.incbin "baserom.gba", 0x46E3DC, 0x3
|
||||
|
||||
gUnknown_846E3DF:: @ 846E3DF
|
||||
.incbin "baserom.gba", 0x46E3DF, 0x3
|
||||
|
||||
gUnknown_846E3E2:: @ 846E3E2
|
||||
.incbin "baserom.gba", 0x46E3E2, 0x3
|
||||
|
||||
gUnknown_846E3E5:: @ 846E3E5
|
||||
.incbin "baserom.gba", 0x46E3E5, 0x6
|
||||
|
||||
gUnknown_846E3EB:: @ 846E3EB
|
||||
.incbin "baserom.gba", 0x46E3EB, 0x5
|
||||
|
||||
gUnknown_846E3F0:: @ 846E3F0
|
||||
.incbin "baserom.gba", 0x46E3F0, 0x8
|
||||
|
||||
gUnknown_846E3F8:: @ 846E3F8
|
||||
.incbin "baserom.gba", 0x46E3F8, 0x50
|
||||
|
||||
gUnknown_846E448:: @ 846E448
|
||||
.incbin "baserom.gba", 0x46E448, 0x8
|
||||
|
||||
gUnknown_846E450:: @ 846E450
|
||||
.incbin "baserom.gba", 0x46E450, 0x940
|
||||
|
||||
gUnknown_846ED90:: @ 846ED90
|
||||
.incbin "baserom.gba", 0x46ED90, 0x130
|
||||
|
||||
gUnknown_846EEC0:: @ 846EEC0
|
||||
.incbin "baserom.gba", 0x46EEC0, 0x198
|
||||
|
||||
gUnknown_846F058:: @ 846F058
|
||||
.incbin "baserom.gba", 0x46F058, 0x228
|
||||
|
||||
gUnknown_846F280:: @ 846F280
|
||||
.incbin "baserom.gba", 0x46F280, 0x14
|
||||
|
||||
gUnknown_846F294:: @ 846F294
|
||||
.incbin "baserom.gba", 0x46F294, 0x3C
|
||||
|
||||
gUnknown_846F2D0:: @ 846F2D0
|
||||
.incbin "baserom.gba", 0x46F2D0, 0x1
|
||||
|
||||
gUnknown_846F2D1:: @ 846F2D1
|
||||
.incbin "baserom.gba", 0x46F2D1, 0x5
|
||||
|
||||
gUnknown_846F2D6:: @ 846F2D6
|
||||
.incbin "baserom.gba", 0x46F2D6, 0x1
|
||||
|
||||
gUnknown_846F2D7:: @ 846F2D7
|
||||
.incbin "baserom.gba", 0x46F2D7, 0x15
|
||||
|
||||
gUnknown_846F2EC:: @ 846F2EC
|
||||
.incbin "baserom.gba", 0x46F2EC, 0xC
|
||||
|
||||
gUnknown_846F2F8:: @ 846F2F8
|
||||
.incbin "baserom.gba", 0x46F2F8, 0x28
|
||||
|
||||
gUnknown_846F320:: @ 846F320
|
||||
.incbin "baserom.gba", 0x46F320, 0xF0
|
||||
|
||||
gUnknown_846F410:: @ 846F410
|
||||
.incbin "baserom.gba", 0x46F410, 0x18
|
||||
|
||||
gUnknown_846F428:: @ 846F428
|
||||
.incbin "baserom.gba", 0x46F428, 0x18
|
||||
|
||||
gUnknown_846F440:: @ 846F440
|
||||
.incbin "baserom.gba", 0x46F440, 0x18
|
||||
|
||||
gUnknown_846F458:: @ 846F458
|
||||
.incbin "baserom.gba", 0x46F458, 0x18
|
||||
|
||||
gUnknown_846F470:: @ 846F470
|
||||
.incbin "baserom.gba", 0x46F470, 0x18
|
||||
|
||||
gUnknown_846F488:: @ 846F488
|
||||
.incbin "baserom.gba", 0x46F488, 0x30
|
||||
|
||||
gUnknown_846F4B8:: @ 846F4B8
|
||||
.incbin "baserom.gba", 0x46F4B8, 0x18
|
||||
@@ -7,4 +7,12 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_841F4B4:: @ 841F4B4
|
||||
.incbin "baserom.gba", 0x41f4b4, 0x20
|
||||
.2byte 0x0100, 0x0100
|
||||
.2byte 0x0200, 0x0100
|
||||
.2byte 0x0100, 0x0200
|
||||
.2byte 0x0200, 0x0200
|
||||
|
||||
.2byte 0x0080, 0x0080
|
||||
.2byte 0x0100, 0x0100
|
||||
.2byte 0x0200, 0x0200
|
||||
.2byte 0x0400, 0x0400
|
||||
|
||||
@@ -7,10 +7,24 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_841EE64:: @ 841EE64
|
||||
.incbin "baserom.gba", 0x41EE64, 0x4
|
||||
.4byte 0x000001f0
|
||||
@ {
|
||||
@ .bg = 0,
|
||||
@ .charBaseIndex = 0,
|
||||
@ .mapBaseIndex = 31,
|
||||
@ .screenSize = 0,
|
||||
@ .paletteMode = 0,
|
||||
@ .priority = 0,
|
||||
@ .baseTile = 0x0000
|
||||
@ }
|
||||
|
||||
gUnknown_841EE68:: @ 841EE68
|
||||
.incbin "baserom.gba", 0x41EE68, 0x18
|
||||
.byte 0, 3, 5, 6, 4, 15
|
||||
.2byte 0x000a
|
||||
.byte 0, 3, 15, 23, 4, 15
|
||||
.2byte 0x0022
|
||||
.byte 255, 0, 0, 0, 0, 0
|
||||
.2byte 0x0000
|
||||
|
||||
gUnknown_841EE80:: @ 841EE80
|
||||
.incbin "baserom.gba", 0x41EE80, 0x44
|
||||
.byte 0x01, 0x02, 0x03
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_84687A0::
|
||||
.string "You have collected all STAMPs!\n"
|
||||
.string "Want to input a CARD as a prize?$"
|
||||
|
||||
.include "data/mevent/script_ish.inc"
|
||||
.include "data/mevent/script_common.inc"
|
||||
@@ -6,6 +6,9 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_841EE84:: @ 841EE84
|
||||
.incbin "baserom.gba", 0x41EE84, 0x40
|
||||
|
||||
gUnknown_841EEC4:: @ 841EEC4
|
||||
.incbin "baserom.gba", 0x41EEC4, 0x10
|
||||
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_835B488:: @ 835B488
|
||||
.incbin "baserom.gba", 0x35B488, 0x14
|
||||
|
||||
gUnknown_835B49C:: @ 835B49C
|
||||
.incbin "baserom.gba", 0x35B49C, 0x14
|
||||
|
||||
gUnknown_835B4B0:: @ 835B4B0
|
||||
.incbin "baserom.gba", 0x35B4B0, 0x14
|
||||
|
||||
gUnknown_835B4C4:: @ 835B4C4
|
||||
.incbin "baserom.gba", 0x35B4C4, 0x114
|
||||
|
||||
gUnknown_835B5D8:: @ 835B5D8
|
||||
.incbin "baserom.gba", 0x35B5D8, 0x18C
|
||||
@@ -7,22 +7,28 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_83FECCC:: @ 83FECCC
|
||||
.byte 0x0c, 0x00, 0x1c, 0x00, 0x2c, 0x00
|
||||
.2byte 0x0c, 0x1c, 0x2c
|
||||
|
||||
gUnknown_83FECD2:: @ 83FECD2
|
||||
.incbin "baserom.gba", 0x3FECD2, 0x4
|
||||
.byte 0, 1, 2, 3
|
||||
|
||||
gUnknown_83FECD6:: @ 83FECD6
|
||||
.incbin "baserom.gba", 0x3FECD6, 0xA
|
||||
.2byte 0x0004, 0x0004, 0x0004, 0x0010
|
||||
|
||||
.align 2
|
||||
gUnknown_83FECE0:: @ 83FECE0
|
||||
.incbin "baserom.gba", 0x3FECE0, 0x8
|
||||
.4byte sub_80DBB18
|
||||
.4byte sub_80DBB3C
|
||||
|
||||
.align 2
|
||||
gUnknown_83FECE8:: @ 83FECE8
|
||||
.incbin "baserom.gba", 0x3FECE8, 0xC
|
||||
.4byte sub_80DC318
|
||||
.4byte sub_80DC348
|
||||
.4byte sub_80DC3A8
|
||||
|
||||
gUnknown_83FECF4:: @ 83FECF4
|
||||
.incbin "baserom.gba", 0x3FECF4, 0x6
|
||||
.byte 0, 0, 1, 2, 3
|
||||
|
||||
.align 1
|
||||
gUnknown_83FECFA:: @ 83FECFA
|
||||
.incbin "baserom.gba", 0x3FECFA, 0x6
|
||||
.2byte 0x0007, 0x000f
|
||||
|
||||
@@ -531,7 +531,15 @@ gUnknown_8398008:: @ 8398008
|
||||
gUnknown_8398028:: @ 8398028
|
||||
.incbin "graphics/map_objects/12.gbapal"
|
||||
|
||||
.incbin "baserom.gba", 0x398048, 0x1340
|
||||
.incbin "baserom.gba", 0x398048, 0x600
|
||||
|
||||
gUnknown_8398648::
|
||||
.incbin "graphics/map_objects/fldeff_cut.4bpp"
|
||||
.incbin "graphics/map_objects/fldeff_cut.4bpp"
|
||||
|
||||
gUnknown_8398688::
|
||||
.incbin "graphics/map_objects/fldeff_cut.gbapal"
|
||||
.incbin "baserom.gba", 0x3986A8, 0xCE0
|
||||
|
||||
gUnknown_8399388:: @ 8399388
|
||||
.incbin "baserom.gba", 0x399388, 0x908
|
||||
|
||||
+17
-2
@@ -1,7 +1,22 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
gUnknown_83A7310:: @ 83A7310
|
||||
.incbin "baserom.gba", 0x3A7310, 0x20
|
||||
.4byte nullsub_40
|
||||
.4byte sub_806EB54
|
||||
.4byte nullsub_40
|
||||
.4byte nullsub_40
|
||||
.4byte sub_806E9E0
|
||||
.4byte nullsub_40
|
||||
.4byte nullsub_40
|
||||
.4byte sub_806EC40
|
||||
|
||||
gUnknown_83A7330:: @ 83A7330
|
||||
.incbin "baserom.gba", 0x3A7330, 0x14
|
||||
.byte 0x08, 0x03
|
||||
.byte 0x0a, 0x05
|
||||
.byte 0x0f, 0x05
|
||||
.byte 0x08, 0x09
|
||||
.byte 0x09, 0x09
|
||||
.byte 0x10, 0x09
|
||||
.byte 0x08, 0x0a
|
||||
.byte 0x09, 0x0a
|
||||
.byte 0x08, 0x0e
|
||||
|
||||
+27
-3
@@ -7,10 +7,34 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_83D4100:: @ 83D4100
|
||||
.incbin "baserom.gba", 0x3D4100, 0x44
|
||||
.2byte 0x000d, 0x0001
|
||||
.2byte 0x000a, 0x0013
|
||||
.2byte 0x000b, 0x000e
|
||||
.2byte 0x000c, 0x000f
|
||||
.2byte 0x0352, 0x033e
|
||||
.2byte 0x0300, 0x0310
|
||||
.2byte 0x0301, 0x0311
|
||||
.2byte 0x0302, 0x0312
|
||||
.2byte 0x0284, 0x0281
|
||||
.2byte 0xffff, 0xffff
|
||||
|
||||
.align 2
|
||||
gOamData_83D4128::
|
||||
.4byte 0x00000000, 0x00001401
|
||||
|
||||
gAnimCmd_83D4130::
|
||||
obj_image_anim_frame 0, 30
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnimTable_83D4138::
|
||||
.4byte gAnimCmd_83D4130
|
||||
|
||||
gUnknown_83D413C::
|
||||
obj_frame_tiles gUnknown_8398648, 0x20
|
||||
|
||||
gUnknown_83D4144::
|
||||
.incbin "baserom.gba", 0x3D4144, 0x8
|
||||
obj_pal gUnknown_8398688, 4096
|
||||
|
||||
gUnknown_83D414C:: @ 83D414C
|
||||
.incbin "baserom.gba", 0x3D414C, 0x18
|
||||
spr_template 0xFFFF, 4096, gOamData_83D4128, gSpriteAnimTable_83D4138, gUnknown_83D413C, gDummySpriteAffineAnimTable, objc_8097BA8
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#include "constants/maps.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
.incbin "baserom.gba", 0x3E27B4, 0x1A0
|
||||
|
||||
gUnknown_83E2954:: @ 83E2954
|
||||
.4byte sub_8124C8C
|
||||
.4byte CB2_ReturnToField
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
@@ -1,28 +0,0 @@
|
||||
#include "constants/region_map.h"
|
||||
#include "constants/flags.h"
|
||||
#include "constants/moves.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_83FF9F4:: @ 83FF9F4
|
||||
.incbin "baserom.gba", 0x3FF9F4, 0x8
|
||||
|
||||
gUnknown_83FF9FC:: @ 83FF9FC
|
||||
.incbin "baserom.gba", 0x3FF9FC, 0x28
|
||||
|
||||
gUnknown_83FFA24:: @ 83FFA24
|
||||
.incbin "baserom.gba", 0x3FFA24, 0x18
|
||||
|
||||
gUnknown_83FFA3C:: @ 83FFA3C
|
||||
.incbin "baserom.gba", 0x3FFA3C, 0x8
|
||||
|
||||
gUnknown_83FFA44:: @ 83FFA44
|
||||
.incbin "baserom.gba", 0x3FFA44, 0x48
|
||||
|
||||
gUnknown_83FFA8C:: @ 83FFA8C
|
||||
.incbin "baserom.gba", 0x3FFA8C, 0x8
|
||||
|
||||
gUnknown_83FFA94:: @ 83FFA94
|
||||
.incbin "baserom.gba", 0x3FFA94, 0x30
|
||||
@@ -1,10 +0,0 @@
|
||||
#include "constants/maps.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_83D4164:: @ 83D4164
|
||||
.incbin "baserom.gba", 0x3D4164, 0x8
|
||||
@@ -1,6 +0,0 @@
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
|
||||
gUnknown_8353068:: @ 8353068
|
||||
.incbin "baserom.gba", 0x353068, 0x8420
|
||||
@@ -1,87 +0,0 @@
|
||||
gMEventSrvScript_UnableToSend::
|
||||
.4byte 0x12, 0x10, gMEventClientScript_UnableToRecv @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x0a, NULL @ RETURN (can't send)
|
||||
|
||||
.4byte 0x12, 0x10, gMEventClientScript_CommError @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x0b, NULL @ RETURN (comm error)
|
||||
|
||||
.4byte 0x12, 0x10, gMEventClientScript_OtherTrainerCanceled @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x09, NULL @ RETURN (other trn canceled)
|
||||
|
||||
gMEventSrvScript_OtherTrnHasNews::
|
||||
.4byte 0x12, 0x10, gMEventClientScript_AlreadyHadNews @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x07, NULL @ RETURN (other trn has news)
|
||||
|
||||
gMEventSrvScript_SentNewsSuccess::
|
||||
.4byte 0x12, 0x28, gMEventClientScript_ReceiveNewsAndValidate @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x0e, 0x00, NULL @ SEND_NEWS
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x13, NULL @ RECV
|
||||
.4byte 0x08, 0x00, NULL @ READWORD
|
||||
.4byte 0x04, 0x01, gMEventSrvScript_OtherTrnHasNews @ BRANCH_EQ
|
||||
.4byte 0x12, 0x10, gMEventClientScript_RecvNewsSuccess @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x03, NULL @ RETURN (news sent to)
|
||||
|
||||
gMEventSrvScript_SendCardSuccess::
|
||||
.4byte 0x12, 0x30, gMEventClientScript_ReceiveCardAndReturnSuccess @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x0d, 0x00, NULL @ SEND_CARD
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x0f, 0x00, NULL @ BUFFER_SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x02, NULL @ RETURN (card sent to)
|
||||
|
||||
gMEventSrvScript_AskClientToOverwriteCard::
|
||||
.4byte 0x12, 0x28, gMEventClientScript_AskWouldLikeToTossCard @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x13, NULL @ RECV
|
||||
.4byte 0x08, 0x00, NULL @ READWORD
|
||||
.4byte 0x04, 0x00, gMEventSrvScript_SendCardSuccess @ BRANCH_EQ
|
||||
.4byte 0x03, 0x00, gMEventSrvScript_OtherTrainerCanceled @ BRANCH
|
||||
|
||||
gMEventSrvScript_OtherTrnHasCard::
|
||||
.4byte 0x12, 0x10, gMEventClientScript_AlreadyHadCard @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x05, NULL @ RETURN (other trn has card)
|
||||
|
||||
.4byte 0x12, 0x10, gMEventClientScript_NothingSentOver @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x14, NULL @ RECV
|
||||
.4byte 0x00, 0x00, NULL @ RETURN (nothing sent over)
|
||||
|
||||
gMEventSrvScript_SendNews:: @ 8468B6C
|
||||
.4byte 0x1b, 0x00, NULL @ BUFFER_SAVED_NEWS
|
||||
.4byte 0x12, 0x20, gMEventClientScript_Send1442CC @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x11, NULL @ RECV
|
||||
.4byte 0x05, 0x00, NULL @ READ_1442CC
|
||||
.4byte 0x06, 0x00, NULL @ VALID_1442CC
|
||||
.4byte 0x04, 0x00, gMEventSrvScript_UnableToSend @ BRANCH_EQ
|
||||
.4byte 0x03, 0x00, gMEventSrvScript_SentNewsSuccess @ BRANCH
|
||||
|
||||
gMEventSrvScript_SendCard:: @ 8468BCC
|
||||
.4byte 0x1a, 0x00, NULL @ BUFFER_SAVED_CARD
|
||||
.4byte 0x1c, 0x00, NULL @ RAM_SCRIPT_IF_VALID
|
||||
.4byte 0x12, 0x20, gMEventClientScript_Send1442CC @ SEND
|
||||
.4byte 0x01, 0x00, NULL @ WAIT SEND
|
||||
.4byte 0x02, 0x11, NULL @ RECV
|
||||
.4byte 0x05, 0x00, NULL @ READ_1442CC
|
||||
.4byte 0x06, 0x00, NULL @ VALID_1442CC
|
||||
.4byte 0x04, 0x00, gMEventSrvScript_UnableToSend @ BRANCH_EQ
|
||||
.4byte 0x07, 0x00, NULL @ CHECK_1442CC_14
|
||||
.4byte 0x04, 0x02, gMEventSrvScript_AskClientToOverwriteCard @ BRANCH_EQ
|
||||
.4byte 0x04, 0x00, gMEventSrvScript_SendCardSuccess @ BRANCH_EQ
|
||||
.4byte 0x03, 0x00, gMEventSrvScript_OtherTrnHasCard @ BRANCH
|
||||
@@ -1,65 +0,0 @@
|
||||
gMEventClientScript_InotialListen:: @ 84687E0
|
||||
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
|
||||
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
|
||||
|
||||
gMEventClientScript_Send1442CC::
|
||||
.4byte 0x08, 0x00 @ SEND HEADER MAYBE
|
||||
.4byte 0x03, 0x00 @ WAIT SEND
|
||||
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
|
||||
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
|
||||
|
||||
gMEventClientScript_UnableToRecv:: @ can't accept card or news
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x0a @ RETURN 0x0a
|
||||
|
||||
gMEventClientScript_CommError:: @ comm error
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x0b @ RETURN 0x0b
|
||||
|
||||
gMEventClientScript_NothingSentOver:: @ nothing sent
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x00 @ RETURN 0x00
|
||||
|
||||
gMEventClientScript_ReceiveCardAndReturnSuccess:: @ card success
|
||||
.4byte 0x02, 0x16 @ RECEIVE ID(0x16)
|
||||
.4byte 0x0a, 0x00 @ RECEIVE_TO_SAVE_FILE
|
||||
.4byte 0x02, 0x19 @ RECEIVE ID(0x19)
|
||||
.4byte 0x11, 0x00 @ RECEIVE_TO_RAM_SCRIPT
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x02 @ RETURN 0x02
|
||||
|
||||
gMEventClientScript_ReceiveNewsAndValidate::
|
||||
.4byte 0x02, 0x17 @ RECEIVE ID(0x17)
|
||||
.4byte 0x09, 0x00 @ VALIDATE NEWS
|
||||
.4byte 0x03, 0x00 @ WAIT SEND
|
||||
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
|
||||
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
|
||||
|
||||
gMEventClientScript_AlreadyHadNews:: @ already had news
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x07 @ RETURN 0x07
|
||||
|
||||
gMEventClientScript_RecvNewsSuccess:: @ news success
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x03 @ RETURN 0x03
|
||||
|
||||
gMEventClientScript_AskWouldLikeToTossCard::
|
||||
.4byte 0x0d, 0x00 @ REQUEST PARAMETER
|
||||
.4byte 0x0e, 0x00 @ SEND PARAMETER
|
||||
.4byte 0x03, 0x00 @ WAIT SEND
|
||||
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
|
||||
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
|
||||
|
||||
gMEventClientScript_OtherTrainerCanceled:: @ comm canceled
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x09 @ RETURN 0x09
|
||||
|
||||
gMEventClientScript_AlreadyHadCard:: @ already had card
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x05 @ RETURN 0x05
|
||||
|
||||
gMEventClientScript_SuccessFromBuffer:: @ success from buffer
|
||||
.4byte 0x02, 0x15 @ RECEIVE ID(0x15)
|
||||
.4byte 0x0c, 0x00 @ READ PACKET AND COMPUTE SOMETHING
|
||||
.4byte 0x14, 0x00 @ SEND ALL
|
||||
.4byte 0x01, 0x0d @ RETURN 0x0d
|
||||
@@ -179,120 +179,3 @@ gUnknown_846E2CC:: @ 846E2CC
|
||||
|
||||
gUnknown_846E2D4:: @ 846E2D4
|
||||
.incbin "baserom.gba", 0x46E2D4, 0xC
|
||||
|
||||
gUnknown_846E2E0:: @ 846E2E0
|
||||
.incbin "baserom.gba", 0x46E2E0, 0x8
|
||||
|
||||
gUnknown_846E2E8:: @ 846E2E8
|
||||
.incbin "baserom.gba", 0x46E2E8, 0x8
|
||||
|
||||
gUnknown_846E2F0:: @ 846E2F0
|
||||
.incbin "baserom.gba", 0x46E2F0, 0x24
|
||||
|
||||
gUnknown_846E314:: @ 846E314
|
||||
.incbin "baserom.gba", 0x46E314, 0x14
|
||||
|
||||
gUnknown_846E328:: @ 846E328
|
||||
.incbin "baserom.gba", 0x46E328, 0x24
|
||||
|
||||
gUnknown_846E34C:: @ 846E34C
|
||||
.incbin "baserom.gba", 0x46E34C, 0x68
|
||||
|
||||
gUnknown_846E3B4:: @ 846E3B4
|
||||
.incbin "baserom.gba", 0x46E3B4, 0x10
|
||||
|
||||
gUnknown_846E3C4:: @ 846E3C4
|
||||
.incbin "baserom.gba", 0x46E3C4, 0x4
|
||||
|
||||
gUnknown_846E3C8:: @ 846E3C8
|
||||
.incbin "baserom.gba", 0x46E3C8, 0x4
|
||||
|
||||
gUnknown_846E3CC:: @ 846E3CC
|
||||
.incbin "baserom.gba", 0x46E3CC, 0x4
|
||||
|
||||
gUnknown_846E3D0:: @ 846E3D0
|
||||
.incbin "baserom.gba", 0x46E3D0, 0xC
|
||||
|
||||
gUnknown_846E3DC:: @ 846E3DC
|
||||
.incbin "baserom.gba", 0x46E3DC, 0x3
|
||||
|
||||
gUnknown_846E3DF:: @ 846E3DF
|
||||
.incbin "baserom.gba", 0x46E3DF, 0x3
|
||||
|
||||
gUnknown_846E3E2:: @ 846E3E2
|
||||
.incbin "baserom.gba", 0x46E3E2, 0x3
|
||||
|
||||
gUnknown_846E3E5:: @ 846E3E5
|
||||
.incbin "baserom.gba", 0x46E3E5, 0x6
|
||||
|
||||
gUnknown_846E3EB:: @ 846E3EB
|
||||
.incbin "baserom.gba", 0x46E3EB, 0x5
|
||||
|
||||
gUnknown_846E3F0:: @ 846E3F0
|
||||
.incbin "baserom.gba", 0x46E3F0, 0x8
|
||||
|
||||
gUnknown_846E3F8:: @ 846E3F8
|
||||
.incbin "baserom.gba", 0x46E3F8, 0x50
|
||||
|
||||
gUnknown_846E448:: @ 846E448
|
||||
.incbin "baserom.gba", 0x46E448, 0x8
|
||||
|
||||
gUnknown_846E450:: @ 846E450
|
||||
.incbin "baserom.gba", 0x46E450, 0x940
|
||||
|
||||
gUnknown_846ED90:: @ 846ED90
|
||||
.incbin "baserom.gba", 0x46ED90, 0x130
|
||||
|
||||
gUnknown_846EEC0:: @ 846EEC0
|
||||
.incbin "baserom.gba", 0x46EEC0, 0x198
|
||||
|
||||
gUnknown_846F058:: @ 846F058
|
||||
.incbin "baserom.gba", 0x46F058, 0x228
|
||||
|
||||
gUnknown_846F280:: @ 846F280
|
||||
.incbin "baserom.gba", 0x46F280, 0x14
|
||||
|
||||
gUnknown_846F294:: @ 846F294
|
||||
.incbin "baserom.gba", 0x46F294, 0x3C
|
||||
|
||||
gUnknown_846F2D0:: @ 846F2D0
|
||||
.incbin "baserom.gba", 0x46F2D0, 0x1
|
||||
|
||||
gUnknown_846F2D1:: @ 846F2D1
|
||||
.incbin "baserom.gba", 0x46F2D1, 0x5
|
||||
|
||||
gUnknown_846F2D6:: @ 846F2D6
|
||||
.incbin "baserom.gba", 0x46F2D6, 0x1
|
||||
|
||||
gUnknown_846F2D7:: @ 846F2D7
|
||||
.incbin "baserom.gba", 0x46F2D7, 0x15
|
||||
|
||||
gUnknown_846F2EC:: @ 846F2EC
|
||||
.incbin "baserom.gba", 0x46F2EC, 0xC
|
||||
|
||||
gUnknown_846F2F8:: @ 846F2F8
|
||||
.incbin "baserom.gba", 0x46F2F8, 0x28
|
||||
|
||||
gUnknown_846F320:: @ 846F320
|
||||
.incbin "baserom.gba", 0x46F320, 0xF0
|
||||
|
||||
gUnknown_846F410:: @ 846F410
|
||||
.incbin "baserom.gba", 0x46F410, 0x18
|
||||
|
||||
gUnknown_846F428:: @ 846F428
|
||||
.incbin "baserom.gba", 0x46F428, 0x18
|
||||
|
||||
gUnknown_846F440:: @ 846F440
|
||||
.incbin "baserom.gba", 0x46F440, 0x18
|
||||
|
||||
gUnknown_846F458:: @ 846F458
|
||||
.incbin "baserom.gba", 0x46F458, 0x18
|
||||
|
||||
gUnknown_846F470:: @ 846F470
|
||||
.incbin "baserom.gba", 0x46F470, 0x18
|
||||
|
||||
gUnknown_846F488:: @ 846F488
|
||||
.incbin "baserom.gba", 0x46F488, 0x30
|
||||
|
||||
gUnknown_846F4B8:: @ 846F4B8
|
||||
.incbin "baserom.gba", 0x46F4B8, 0x18
|
||||
@@ -7,4 +7,4 @@
|
||||
.align 2
|
||||
|
||||
gUnknown_841EE44:: @ 841EE44
|
||||
.incbin "baserom.gba", 0x41EE44, 0x20
|
||||
.incbin "graphics/interface/save_failed_screen.gbapal"
|
||||
|
||||
+1
-1
@@ -239,7 +239,7 @@ gSpecials:: @ 815FD60
|
||||
def_special nullsub_75
|
||||
def_special nullsub_75
|
||||
def_special Special_GetLeadMonFriendship
|
||||
def_special sub_80E5970
|
||||
def_special ScrSpecial_BattleTowerMapScript2
|
||||
def_special ChooseNextBattleTowerTrainer
|
||||
def_special CheckPartyBattleTowerBanlist
|
||||
def_special PrintBattleTowerTrainerGreeting
|
||||
|
||||
+9
-9
@@ -4535,17 +4535,17 @@ gDaycareText_PlayOther:: @ 841E3A8
|
||||
.string "The two prefer to play with other\n"
|
||||
.string "POKéMON than each other.$"
|
||||
|
||||
gUnknown_841E3E3:: @ 841E3E3
|
||||
gText_TeachWhichMoveToMon:: @ 841E3E3
|
||||
.string "Teach which move to {STR_VAR_1}?$"
|
||||
|
||||
gUnknown_841E3FB:: @ 841E3FB
|
||||
gText_TeachMoveQues:: @ 841E3FB
|
||||
.string "Teach {STR_VAR_2}?$"
|
||||
|
||||
gUnknown_841E405:: @ 841E405
|
||||
gText_MonLearnedMove:: @ 841E405
|
||||
.string "{STR_VAR_1} learned\n"
|
||||
.string "{STR_VAR_2}.$"
|
||||
|
||||
gUnknown_841E414:: @ 841E414
|
||||
gText_MonIsTryingToLearnMove:: @ 841E414
|
||||
.string "{STR_VAR_1} is trying to learn\n"
|
||||
.string "{STR_VAR_2}.\p"
|
||||
.string "But {STR_VAR_1} can't learn more\n"
|
||||
@@ -4553,24 +4553,24 @@ gUnknown_841E414:: @ 841E414
|
||||
.string "Delete an older move to make\n"
|
||||
.string "room for {STR_VAR_2}?$"
|
||||
|
||||
gUnknown_841E481:: @ 841E481
|
||||
gText_StopLearningMove:: @ 841E481
|
||||
.string "Stop learning {STR_VAR_2}?$"
|
||||
|
||||
gUnknown_841E493:: @ 841E493
|
||||
gText_1_2_and_Poof:: @ 841E493
|
||||
.string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p"
|
||||
.string "$"
|
||||
|
||||
gUnknown_841E4C0:: @ 841E4C0
|
||||
gText_MonForgotOldMoveAndMonLearnedNewMove:: @ 841E4C0
|
||||
.string "{STR_VAR_1} forgot {STR_VAR_3}.\p"
|
||||
.string "And‥\p"
|
||||
.string "{STR_VAR_1}\n"
|
||||
.string "learned {STR_VAR_2}.$"
|
||||
|
||||
gUnknown_841E4E2:: @ 841E4E2
|
||||
gText_GiveUpTryingToTeachNewMove:: @ 841E4E2
|
||||
.string "Give up trying to teach a new\n"
|
||||
.string "move to {STR_VAR_1}?$"
|
||||
|
||||
gUnknown_841E50C:: @ 841E50C
|
||||
gText_WhichMoveShouldBeForgotten:: @ 841E50C
|
||||
.string "Which move should be forgotten?\p"
|
||||
.string "$"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.section .rodata
|
||||
|
||||
gUnknownSerialData_Start:: @ 86FC50C
|
||||
.incbin "baserom.gba", 0x6FC50C, 0x3760
|
||||
.incbin "data/unknown_serial_data.bin"
|
||||
gUnknownSerialData_End::
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 139 B |
Binary file not shown.
|
After Width: | Height: | Size: 124 B |
Binary file not shown.
|
After Width: | Height: | Size: 102 B |
Binary file not shown.
|
After Width: | Height: | Size: 105 B |
Binary file not shown.
|
After Width: | Height: | Size: 116 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 121 B |
Binary file not shown.
|
After Width: | Height: | Size: 128 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 147 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 102 B |
Binary file not shown.
|
After Width: | Height: | Size: 144 B |
Binary file not shown.
|
After Width: | Height: | Size: 127 B |
Binary file not shown.
|
After Width: | Height: | Size: 102 B |
Binary file not shown.
|
After Width: | Height: | Size: 131 B |
Binary file not shown.
|
After Width: | Height: | Size: 123 B |
Binary file not shown.
|
After Width: | Height: | Size: 108 B |
Binary file not shown.
|
After Width: | Height: | Size: 146 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 102 B |
Binary file not shown.
|
After Width: | Height: | Size: 140 B |
Binary file not shown.
|
After Width: | Height: | Size: 124 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 125 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 95 B |
Binary file not shown.
|
After Width: | Height: | Size: 145 B |
Binary file not shown.
|
After Width: | Height: | Size: 133 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 141 B |
Binary file not shown.
|
After Width: | Height: | Size: 125 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 138 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 146 B |
Binary file not shown.
|
After Width: | Height: | Size: 138 B |
Binary file not shown.
|
After Width: | Height: | Size: 119 B |
Binary file not shown.
|
After Width: | Height: | Size: 122 B |
Binary file not shown.
|
After Width: | Height: | Size: 129 B |
Binary file not shown.
|
After Width: | Height: | Size: 105 B |
Binary file not shown.
|
After Width: | Height: | Size: 151 B |
Binary file not shown.
|
After Width: | Height: | Size: 129 B |
Binary file not shown.
|
After Width: | Height: | Size: 103 B |
Binary file not shown.
|
After Width: | Height: | Size: 150 B |
Binary file not shown.
|
After Width: | Height: | Size: 131 B |
Binary file not shown.
|
After Width: | Height: | Size: 90 B |
Binary file not shown.
|
After Width: | Height: | Size: 140 B |
Binary file not shown.
|
After Width: | Height: | Size: 127 B |
Binary file not shown.
|
After Width: | Height: | Size: 98 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 127 B |
Binary file not shown.
|
After Width: | Height: | Size: 104 B |
Binary file not shown.
|
After Width: | Height: | Size: 139 B |
Binary file not shown.
|
After Width: | Height: | Size: 141 B |
Binary file not shown.
|
After Width: | Height: | Size: 130 B |
Binary file not shown.
|
After Width: | Height: | Size: 137 B |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user