import function names from pokeemerald
This commit is contained in:
@@ -38,21 +38,21 @@ _0810B87A:
|
||||
ldr r0, _0810B8E8 @ =gUnknown_8453098
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
movs r4, 0
|
||||
_0810B8A8:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r4, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x2
|
||||
bls _0810B8A8
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r4, 0
|
||||
ldr r3, _0810B8EC @ =gUnknown_203AD34
|
||||
movs r2, 0xFF
|
||||
@@ -169,7 +169,7 @@ sub_810B994: @ 810B994
|
||||
movs r1, 0
|
||||
movs r2, 0x81
|
||||
movs r3, 0xC
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
ldr r4, _0810B9D8 @ =gUnknown_84162E8
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
@@ -221,7 +221,7 @@ sub_810B9DC: @ 810B9DC
|
||||
movs r1, 0
|
||||
movs r2, 0x64
|
||||
movs r3, 0xE
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
b _0810BA24
|
||||
.align 2, 0
|
||||
_0810BA10: .4byte gUnknown_203AD34
|
||||
@@ -231,10 +231,10 @@ _0810BA18:
|
||||
movs r1, 0
|
||||
movs r2, 0x81
|
||||
movs r3, 0xC
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
_0810BA24:
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
_0810BA2A:
|
||||
ldr r0, _0810BA38 @ =gUnknown_203AD34
|
||||
adds r0, r5, r0
|
||||
@@ -258,11 +258,11 @@ sub_810BA3C: @ 810BA3C
|
||||
movs r1, 0
|
||||
bl sub_810F4D8
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
pop {r4}
|
||||
@@ -310,13 +310,13 @@ sub_810BA9C: @ 810BA9C
|
||||
movs r1, 0
|
||||
bl sub_810F260
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
_0810BACE:
|
||||
|
||||
+53
-53
@@ -8,12 +8,12 @@
|
||||
thumb_func_start sub_800F1E8
|
||||
sub_800F1E8: @ 800F1E8
|
||||
push {lr}
|
||||
bl sub_8006B10
|
||||
bl ResetSpriteData
|
||||
ldr r0, _0800F21C @ =gUnknown_824EFF0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0800F220 @ =gUnknown_202063C
|
||||
@@ -27,7 +27,7 @@ sub_800F1E8: @ 800F1E8
|
||||
orrs r0, r2
|
||||
strb r0, [r1]
|
||||
ldr r0, _0800F224 @ =sub_800F228
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -39,8 +39,8 @@ _0800F224: .4byte sub_800F228
|
||||
thumb_func_start sub_800F228
|
||||
sub_800F228: @ 800F228
|
||||
push {lr}
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800F228
|
||||
@@ -87,18 +87,18 @@ _0800F26C:
|
||||
adds r0, r4, r5
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0800F2A4 @ =0x06008000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
adds r0, r5, 0x4
|
||||
adds r0, r4, r0
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0800F2A8 @ =0x0600d000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
adds r5, 0x10
|
||||
adds r4, r5
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x20
|
||||
movs r2, 0x60
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -126,12 +126,12 @@ _0800F2B8:
|
||||
adds r0, r4, r0
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0800F2E4 @ =0x06004000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
adds r5, 0xC
|
||||
adds r4, r5
|
||||
ldr r0, [r4]
|
||||
ldr r1, _0800F2E8 @ =0x0600e000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -197,20 +197,20 @@ _0800F348: .4byte gUnknown_8248330
|
||||
sub_800F34C: @ 800F34C
|
||||
push {lr}
|
||||
movs r0, 0xC5
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
bl sub_800F324
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0800F37C @ =0x0000b040
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -297,18 +297,18 @@ sub_800F420: @ 800F420
|
||||
ldr r0, _0800F454 @ =gUnknown_8D00000
|
||||
movs r1, 0xC0
|
||||
lsls r1, 19
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
ldr r1, _0800F458 @ =gUnknown_8D0051C
|
||||
movs r0, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r0, _0800F45C @ =gUnknown_8D004D8
|
||||
movs r1, 0
|
||||
movs r2, 0x40
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
bl sub_800F380
|
||||
bl sub_800F40C
|
||||
pop {r0}
|
||||
@@ -440,9 +440,9 @@ _0800F50E:
|
||||
add r1, sp, 0xC
|
||||
mov r2, r12
|
||||
mov r3, r9
|
||||
bl sub_8002228
|
||||
bl CopyToBgTilemapBufferRect_ChangePalette
|
||||
mov r0, r8
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _0800F5B6
|
||||
.align 2, 0
|
||||
_0800F544: .4byte 0x00006001
|
||||
@@ -498,9 +498,9 @@ _0800F582:
|
||||
add r1, sp, 0xC
|
||||
mov r2, r12
|
||||
mov r3, r9
|
||||
bl sub_8002228
|
||||
bl CopyToBgTilemapBufferRect_ChangePalette
|
||||
mov r0, r8
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
_0800F5B6:
|
||||
add sp, 0x18
|
||||
pop {r3,r4}
|
||||
@@ -836,7 +836,7 @@ _0800F848: .4byte gUnknown_202273C
|
||||
_0800F84C: .4byte gUnknown_3005090
|
||||
_0800F850:
|
||||
ldr r0, _0800F8CC @ =0x00002710
|
||||
bl sub_80089B8
|
||||
bl AllocSpritePalette
|
||||
lsls r0, 24
|
||||
ldr r2, _0800F8D0 @ =gUnknown_20371F8
|
||||
lsrs r0, 19
|
||||
@@ -852,7 +852,7 @@ _0800F850:
|
||||
movs r1, 0x6C
|
||||
movs r2, 0x50
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r4, _0800F8E4 @ =gUnknown_2023FE8
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x7D
|
||||
@@ -861,7 +861,7 @@ _0800F850:
|
||||
movs r1, 0x84
|
||||
movs r2, 0x50
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x7E
|
||||
strb r0, [r1]
|
||||
@@ -910,7 +910,7 @@ _0800F8F0:
|
||||
beq _0800F958
|
||||
ldr r4, _0800F944 @ =gUnknown_2022978
|
||||
ldrh r0, [r5, 0xA]
|
||||
bl sub_8044E6C
|
||||
bl Sin2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -925,7 +925,7 @@ _0800F90A:
|
||||
strh r0, [r4]
|
||||
ldr r4, _0800F948 @ =gUnknown_202297C
|
||||
ldrh r0, [r5, 0xC]
|
||||
bl sub_8044E6C
|
||||
bl Sin2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -954,7 +954,7 @@ _0800F954: .4byte gUnknown_202297E
|
||||
_0800F958:
|
||||
ldr r4, _0800F9E8 @ =gUnknown_2022978
|
||||
ldrh r0, [r5, 0xA]
|
||||
bl sub_8044E6C
|
||||
bl Sin2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -969,7 +969,7 @@ _0800F96A:
|
||||
strh r0, [r4]
|
||||
ldr r4, _0800F9EC @ =gUnknown_202297A
|
||||
ldrh r0, [r5, 0xA]
|
||||
bl sub_8044EB0
|
||||
bl Cos2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -981,7 +981,7 @@ _0800F988:
|
||||
strh r0, [r4]
|
||||
ldr r4, _0800F9F0 @ =gUnknown_202297C
|
||||
ldrh r0, [r5, 0xC]
|
||||
bl sub_8044E6C
|
||||
bl Sin2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -996,7 +996,7 @@ _0800F9A0:
|
||||
strh r0, [r4]
|
||||
ldr r4, _0800F9F4 @ =gUnknown_202297E
|
||||
ldrh r0, [r5, 0xC]
|
||||
bl sub_8044EB0
|
||||
bl Cos2
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -1040,7 +1040,7 @@ _0800FA08:
|
||||
movs r0, 0x71
|
||||
bl sub_80722CC
|
||||
adds r0, r7, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r4, _0800FAD0 @ =gUnknown_202063C
|
||||
ldr r5, _0800FAD4 @ =gUnknown_2023FE8
|
||||
ldr r0, [r5]
|
||||
@@ -1154,42 +1154,42 @@ sub_800FAE0: @ 800FAE0
|
||||
beq _0800FB94
|
||||
ldr r0, _0800FB68 @ =gUnknown_8E7737C
|
||||
ldr r1, _0800FB6C @ =0x06004000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
ldr r0, _0800FB70 @ =gUnknown_8E77598
|
||||
ldr r1, _0800FB74 @ =0x06010000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
ldr r0, _0800FB78 @ =gUnknown_8E77570
|
||||
movs r1, 0x60
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
movs r2, 0x1
|
||||
bl sub_80019E4
|
||||
bl SetBgAttribute
|
||||
ldr r1, _0800FB7C @ =0x00005c04
|
||||
movs r0, 0xA
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r4, _0800FB80 @ =gUnknown_8E77464
|
||||
movs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x2
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x48
|
||||
movs r1, 0x36
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0x36
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _0800FB84 @ =gUnknown_202297A
|
||||
ldr r2, _0800FB88 @ =0x0000ff5c
|
||||
adds r1, r2, 0
|
||||
@@ -1270,7 +1270,7 @@ _0800FBF8:
|
||||
_0800FC00: .4byte gUnknown_823EAC8
|
||||
_0800FC04: .4byte gUnknown_20386AE
|
||||
_0800FC08:
|
||||
bl sub_8056288
|
||||
bl sav1_map_get_battletype
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0800FC20
|
||||
@@ -1341,7 +1341,7 @@ _0800FC88:
|
||||
movs r0, 0x13
|
||||
b _0800FCAA
|
||||
_0800FC90:
|
||||
bl sub_8056288
|
||||
bl sav1_map_get_battletype
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
@@ -1388,7 +1388,7 @@ _0800FCEC:
|
||||
ldr r0, _0800FCF8 @ =gUnknown_8D00000
|
||||
movs r1, 0xC0
|
||||
lsls r1, 19
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
b _0800FD94
|
||||
.align 2, 0
|
||||
_0800FCF8: .4byte gUnknown_8D00000
|
||||
@@ -1397,9 +1397,9 @@ _0800FCFC:
|
||||
movs r0, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _0800FD94
|
||||
.align 2, 0
|
||||
_0800FD10: .4byte gUnknown_8D0051C
|
||||
@@ -1407,7 +1407,7 @@ _0800FD14:
|
||||
ldr r0, _0800FD20 @ =gUnknown_8D004D8
|
||||
movs r1, 0
|
||||
movs r2, 0x40
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0800FD94
|
||||
.align 2, 0
|
||||
_0800FD20: .4byte gUnknown_8D004D8
|
||||
@@ -1422,7 +1422,7 @@ _0800FD24:
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0800FD60 @ =0x06008000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
_0800FD3E:
|
||||
bl sub_800FC2C
|
||||
lsls r0, 24
|
||||
@@ -1435,7 +1435,7 @@ _0800FD3E:
|
||||
adds r0, r1
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0800FD64 @ =0x0600d000
|
||||
bl sub_800EBC0
|
||||
bl LZDecompressVram
|
||||
b _0800FD94
|
||||
.align 2, 0
|
||||
_0800FD5C: .4byte gUnknown_824EE34
|
||||
@@ -1454,7 +1454,7 @@ _0800FD68:
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x20
|
||||
movs r2, 0x60
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0800FD94
|
||||
.align 2, 0
|
||||
_0800FD88: .4byte gUnknown_824EE34
|
||||
|
||||
+409
-409
File diff suppressed because it is too large
Load Diff
+116
-116
@@ -131,7 +131,7 @@ _080C6DE0:
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
_080C6DFA:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, [r5]
|
||||
ldr r2, [r1, 0x14]
|
||||
adds r2, 0x18
|
||||
@@ -163,7 +163,7 @@ _080C6DFA:
|
||||
cmp r0, 0
|
||||
beq _080C6E7C
|
||||
ldr r4, _080C6E74 @ =gUnknown_2023D6C
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r3, 0x2
|
||||
ands r0, r3
|
||||
strb r0, [r4]
|
||||
@@ -401,7 +401,7 @@ _080C7012:
|
||||
adds r3, 0x1
|
||||
cmp r3, 0x3
|
||||
ble _080C6FD2
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r5, 0
|
||||
@@ -644,12 +644,12 @@ sub_80C71D0: @ 80C71D0
|
||||
lsls r1, 24
|
||||
lsrs r5, r1, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080C71FC
|
||||
adds r0, r4, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
ldr r1, _080C7204 @ =gUnknown_2023FF4
|
||||
ldr r1, [r1]
|
||||
ldr r2, [r1, 0x18]
|
||||
@@ -674,12 +674,12 @@ sub_80C7208: @ 80C7208
|
||||
lsls r1, 24
|
||||
lsrs r5, r1, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080C7234
|
||||
adds r0, r4, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
ldr r1, _080C723C @ =gUnknown_2023FF4
|
||||
ldr r1, [r1]
|
||||
ldr r2, [r1, 0x18]
|
||||
@@ -699,7 +699,7 @@ _080C723C: .4byte gUnknown_2023FF4
|
||||
thumb_func_start sub_80C7240
|
||||
sub_80C7240: @ 80C7240
|
||||
push {lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
movs r1, 0xFF
|
||||
lsls r1, 16
|
||||
@@ -735,7 +735,7 @@ _080C727C:
|
||||
thumb_func_start sub_80C7280
|
||||
sub_80C7280: @ 80C7280
|
||||
push {lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
movs r1, 0xFF
|
||||
lsls r1, 16
|
||||
@@ -771,7 +771,7 @@ _080C72BC:
|
||||
thumb_func_start sub_80C72C0
|
||||
sub_80C72C0: @ 80C72C0
|
||||
push {lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
movs r1, 0xFF
|
||||
lsls r1, 16
|
||||
@@ -807,7 +807,7 @@ _080C72FC:
|
||||
thumb_func_start sub_80C7300
|
||||
sub_80C7300: @ 80C7300
|
||||
push {lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
movs r1, 0xFF
|
||||
lsls r1, 16
|
||||
@@ -840,8 +840,8 @@ _080C733C:
|
||||
bx r0
|
||||
thumb_func_end sub_80C7300
|
||||
|
||||
thumb_func_start sub_80C7340
|
||||
sub_80C7340: @ 80C7340
|
||||
thumb_func_start BattleAICmd_score
|
||||
BattleAICmd_score: @ 80C7340
|
||||
push {r4,lr}
|
||||
ldr r2, _080C737C @ =gUnknown_2023FF4
|
||||
ldr r0, [r2]
|
||||
@@ -876,7 +876,7 @@ _080C7370:
|
||||
.align 2, 0
|
||||
_080C737C: .4byte gUnknown_2023FF4
|
||||
_080C7380: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C7340
|
||||
thumb_func_end BattleAICmd_score
|
||||
|
||||
thumb_func_start sub_80C7384
|
||||
sub_80C7384: @ 80C7384
|
||||
@@ -1489,7 +1489,7 @@ _080C77EC:
|
||||
ldr r0, _080C7838 @ =gUnknown_2023D6C
|
||||
_080C77EE:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r2, 0x1
|
||||
ands r2, r0
|
||||
ldr r4, _080C783C @ =gUnknown_2039A00
|
||||
@@ -1554,7 +1554,7 @@ _080C7868:
|
||||
ldr r0, _080C78B4 @ =gUnknown_2023D6C
|
||||
_080C786A:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r2, 0x1
|
||||
ands r2, r0
|
||||
ldr r4, _080C78B8 @ =gUnknown_2039A00
|
||||
@@ -2002,8 +2002,8 @@ _080C7B90:
|
||||
bx r0
|
||||
thumb_func_end sub_80C7B50
|
||||
|
||||
thumb_func_start sub_80C7B94
|
||||
sub_80C7B94: @ 80C7B94
|
||||
thumb_func_start BattleAICmd_if_in_bytes
|
||||
BattleAICmd_if_in_bytes: @ 80C7B94
|
||||
push {r4,lr}
|
||||
ldr r2, _080C7BE0 @ =gUnknown_2039A00
|
||||
ldr r1, [r2]
|
||||
@@ -2058,10 +2058,10 @@ _080C7BF6:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C7B94
|
||||
thumb_func_end BattleAICmd_if_in_bytes
|
||||
|
||||
thumb_func_start sub_80C7BFC
|
||||
sub_80C7BFC: @ 80C7BFC
|
||||
thumb_func_start BattleAICmd_if_not_in_bytes
|
||||
BattleAICmd_if_not_in_bytes: @ 80C7BFC
|
||||
push {r4,lr}
|
||||
ldr r2, _080C7C38 @ =gUnknown_2039A00
|
||||
ldr r1, [r2]
|
||||
@@ -2117,10 +2117,10 @@ _080C7C60:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C7BFC
|
||||
thumb_func_end BattleAICmd_if_not_in_bytes
|
||||
|
||||
thumb_func_start sub_80C7C68
|
||||
sub_80C7C68: @ 80C7C68
|
||||
thumb_func_start BattleAICmd_if_in_hwords
|
||||
BattleAICmd_if_in_hwords: @ 80C7C68
|
||||
push {r4,r5,lr}
|
||||
ldr r2, _080C7CB4 @ =gUnknown_2039A00
|
||||
ldr r1, [r2]
|
||||
@@ -2177,10 +2177,10 @@ _080C7CCE:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C7C68
|
||||
thumb_func_end BattleAICmd_if_in_hwords
|
||||
|
||||
thumb_func_start sub_80C7CD4
|
||||
sub_80C7CD4: @ 80C7CD4
|
||||
thumb_func_start BattleAICmd_if_not_in_hwords
|
||||
BattleAICmd_if_not_in_hwords: @ 80C7CD4
|
||||
push {r4,r5,lr}
|
||||
ldr r2, _080C7D10 @ =gUnknown_2039A00
|
||||
ldr r1, [r2]
|
||||
@@ -2238,7 +2238,7 @@ _080C7D3C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C7CD4
|
||||
thumb_func_end BattleAICmd_if_not_in_hwords
|
||||
|
||||
thumb_func_start sub_80C7D44
|
||||
sub_80C7D44: @ 80C7D44
|
||||
@@ -2360,8 +2360,8 @@ _080C7E1C:
|
||||
bx r0
|
||||
thumb_func_end sub_80C7DB4
|
||||
|
||||
thumb_func_start sub_80C7E24
|
||||
sub_80C7E24: @ 80C7E24
|
||||
thumb_func_start BattleAICmd_get_turn_count
|
||||
BattleAICmd_get_turn_count: @ 80C7E24
|
||||
ldr r0, _080C7E3C @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x14]
|
||||
@@ -2377,10 +2377,10 @@ sub_80C7E24: @ 80C7E24
|
||||
_080C7E3C: .4byte gUnknown_2023FF4
|
||||
_080C7E40: .4byte gUnknown_3004F90
|
||||
_080C7E44: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C7E24
|
||||
thumb_func_end BattleAICmd_get_turn_count
|
||||
|
||||
thumb_func_start sub_80C7E48
|
||||
sub_80C7E48: @ 80C7E48
|
||||
thumb_func_start BattleAICmd_get_type
|
||||
BattleAICmd_get_type: @ 80C7E48
|
||||
push {r4,lr}
|
||||
ldr r1, _080C7E60 @ =gUnknown_2039A00
|
||||
ldr r0, [r1]
|
||||
@@ -2494,10 +2494,10 @@ _080C7F22:
|
||||
.align 2, 0
|
||||
_080C7F30: .4byte gUnknown_2023FF4
|
||||
_080C7F34: .4byte gUnknown_8250C04
|
||||
thumb_func_end sub_80C7E48
|
||||
thumb_func_end BattleAICmd_get_type
|
||||
|
||||
thumb_func_start sub_80C7F38
|
||||
sub_80C7F38: @ 80C7F38
|
||||
thumb_func_start BattleAICmd_get_last_used_bank_move_power
|
||||
BattleAICmd_get_last_used_bank_move_power: @ 80C7F38
|
||||
ldr r0, _080C7F58 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x14]
|
||||
@@ -2518,10 +2518,10 @@ sub_80C7F38: @ 80C7F38
|
||||
_080C7F58: .4byte gUnknown_2023FF4
|
||||
_080C7F5C: .4byte gUnknown_8250C04
|
||||
_080C7F60: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C7F38
|
||||
thumb_func_end BattleAICmd_get_last_used_bank_move_power
|
||||
|
||||
thumb_func_start sub_80C7F64
|
||||
sub_80C7F64: @ 80C7F64
|
||||
thumb_func_start BattleAICmd_is_most_powerful_move
|
||||
BattleAICmd_is_most_powerful_move: @ 80C7F64
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -2661,11 +2661,11 @@ _080C8030:
|
||||
ldrb r0, [r7]
|
||||
ldr r4, _080C80D4 @ =gUnknown_2023D6C
|
||||
ldrb r1, [r4]
|
||||
bl sub_801E68C
|
||||
bl AI_CalcDmg
|
||||
ldrh r0, [r5]
|
||||
ldrb r1, [r7]
|
||||
ldrb r2, [r4]
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
mov r4, sp
|
||||
add r4, r8
|
||||
ldr r2, _080C80D8 @ =gUnknown_2023D50
|
||||
@@ -2776,10 +2776,10 @@ _080C814C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080C8164: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C7F64
|
||||
thumb_func_end BattleAICmd_is_most_powerful_move
|
||||
|
||||
thumb_func_start sub_80C8168
|
||||
sub_80C8168: @ 80C8168
|
||||
thumb_func_start BattleAICmd_get_last_used_bank_move
|
||||
BattleAICmd_get_last_used_bank_move: @ 80C8168
|
||||
push {lr}
|
||||
ldr r0, _080C8184 @ =gUnknown_2039A00
|
||||
ldr r1, [r0]
|
||||
@@ -2819,7 +2819,7 @@ _080C819E:
|
||||
_080C81B4: .4byte gUnknown_2023FF4
|
||||
_080C81B8: .4byte gUnknown_2023D98
|
||||
_080C81BC: .4byte gUnknown_2023D6C
|
||||
thumb_func_end sub_80C8168
|
||||
thumb_func_end BattleAICmd_get_last_used_bank_move
|
||||
|
||||
thumb_func_start sub_80C81C0
|
||||
sub_80C81C0: @ 80C81C0
|
||||
@@ -2981,8 +2981,8 @@ nullsub_65: @ 80C82D4
|
||||
bx lr
|
||||
thumb_func_end nullsub_65
|
||||
|
||||
thumb_func_start sub_80C82D8
|
||||
sub_80C82D8: @ 80C82D8
|
||||
thumb_func_start BattleAICmd_count_alive_pokemon
|
||||
BattleAICmd_count_alive_pokemon: @ 80C82D8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -3007,7 +3007,7 @@ _080C8304:
|
||||
_080C8306:
|
||||
ldrb r5, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
ldr r1, _080C8350 @ =gUnknown_202402C
|
||||
mov r8, r1
|
||||
@@ -3027,12 +3027,12 @@ _080C831C:
|
||||
adds r0, r4
|
||||
ldrb r7, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r1, 0x2
|
||||
eors r0, r1
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
adds r0, r4
|
||||
@@ -3063,17 +3063,17 @@ _080C836C:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _080C83B0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _080C83B0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -3101,10 +3101,10 @@ _080C83B0:
|
||||
_080C83C8: .4byte gUnknown_2023BCE
|
||||
_080C83CC: .4byte gUnknown_2023FF4
|
||||
_080C83D0: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C82D8
|
||||
thumb_func_end BattleAICmd_count_alive_pokemon
|
||||
|
||||
thumb_func_start sub_80C83D4
|
||||
sub_80C83D4: @ 80C83D4
|
||||
thumb_func_start BattleAICmd_get_considered_move
|
||||
BattleAICmd_get_considered_move: @ 80C83D4
|
||||
ldr r0, _080C83E8 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x14]
|
||||
@@ -3118,10 +3118,10 @@ sub_80C83D4: @ 80C83D4
|
||||
.align 2, 0
|
||||
_080C83E8: .4byte gUnknown_2023FF4
|
||||
_080C83EC: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C83D4
|
||||
thumb_func_end BattleAICmd_get_considered_move
|
||||
|
||||
thumb_func_start sub_80C83F0
|
||||
sub_80C83F0: @ 80C83F0
|
||||
thumb_func_start BattleAICmd_get_considered_move_effect
|
||||
BattleAICmd_get_considered_move_effect: @ 80C83F0
|
||||
ldr r0, _080C8410 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x14]
|
||||
@@ -3142,7 +3142,7 @@ sub_80C83F0: @ 80C83F0
|
||||
_080C8410: .4byte gUnknown_2023FF4
|
||||
_080C8414: .4byte gUnknown_8250C04
|
||||
_080C8418: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C83F0
|
||||
thumb_func_end BattleAICmd_get_considered_move_effect
|
||||
|
||||
thumb_func_start sub_80C841C
|
||||
sub_80C841C: @ 80C841C
|
||||
@@ -3162,12 +3162,12 @@ _080C8434:
|
||||
_080C8436:
|
||||
ldrb r4, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080C8506
|
||||
adds r0, r4, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r7, 0x1
|
||||
adds r1, r7, 0
|
||||
ands r1, r0
|
||||
@@ -3227,7 +3227,7 @@ _080C84A8:
|
||||
ldrb r0, [r2, 0x17]
|
||||
cmp r0, 0
|
||||
beq _080C84F6
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
adds r1, r7, 0
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -3336,7 +3336,7 @@ _080C856A:
|
||||
ldrb r1, [r6]
|
||||
ldr r2, _080C8618 @ =gUnknown_2023D6C
|
||||
ldrb r2, [r2]
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0x78
|
||||
bne _080C859A
|
||||
@@ -3436,7 +3436,7 @@ sub_80C8620: @ 80C8620
|
||||
ldrb r1, [r1]
|
||||
ldr r2, _080C86DC @ =gUnknown_2023D6C
|
||||
ldrb r2, [r2]
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0x78
|
||||
bne _080C8666
|
||||
@@ -3579,17 +3579,17 @@ _080C875C:
|
||||
add r4, r9
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x37
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r5, 0
|
||||
beq _080C8794
|
||||
cmp r5, r10
|
||||
@@ -3665,17 +3665,17 @@ _080C8800:
|
||||
add r4, r10
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x37
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r5, 0
|
||||
beq _080C8844
|
||||
movs r1, 0xCE
|
||||
@@ -4134,11 +4134,11 @@ sub_80C8B24: @ 80C8B24
|
||||
ldrb r0, [r4]
|
||||
ldr r6, _080C8BF8 @ =gUnknown_2023D6C
|
||||
ldrb r1, [r6]
|
||||
bl sub_801E68C
|
||||
bl AI_CalcDmg
|
||||
ldrh r0, [r5]
|
||||
ldrb r1, [r4]
|
||||
ldrb r2, [r6]
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
ldr r4, _080C8BFC @ =gUnknown_2023D50
|
||||
mov r1, r8
|
||||
ldr r0, [r1]
|
||||
@@ -4246,11 +4246,11 @@ sub_80C8C20: @ 80C8C20
|
||||
ldrb r0, [r4]
|
||||
ldr r5, _080C8CE0 @ =gUnknown_2023D6C
|
||||
ldrb r1, [r5]
|
||||
bl sub_801E68C
|
||||
bl AI_CalcDmg
|
||||
ldrh r0, [r6]
|
||||
ldrb r1, [r4]
|
||||
ldrb r2, [r5]
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
ldr r4, _080C8CE4 @ =gUnknown_2023D50
|
||||
ldr r0, [r7]
|
||||
ldr r1, [r0, 0x14]
|
||||
@@ -5004,7 +5004,7 @@ _080C91FC:
|
||||
adds r0, r4
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x64
|
||||
@@ -5074,12 +5074,12 @@ _080C927C:
|
||||
_080C927E:
|
||||
ldrb r4, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080C92B0
|
||||
adds r0, r4, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
ldr r0, _080C92AC @ =gUnknown_2023FF4
|
||||
@@ -5100,7 +5100,7 @@ _080C92B0:
|
||||
muls r0, r4
|
||||
adds r0, r1
|
||||
ldrh r0, [r0, 0x2E]
|
||||
bl sub_809A924
|
||||
bl ItemId_GetHoldEffect
|
||||
ldr r1, _080C92DC @ =gUnknown_2023FF4
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0x14]
|
||||
@@ -5121,8 +5121,8 @@ _080C92DC: .4byte gUnknown_2023FF4
|
||||
_080C92E0: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C9264
|
||||
|
||||
thumb_func_start sub_80C92E4
|
||||
sub_80C92E4: @ 80C92E4
|
||||
thumb_func_start BattleAICmd_get_gender
|
||||
BattleAICmd_get_gender: @ 80C92E4
|
||||
push {lr}
|
||||
ldr r0, _080C92F4 @ =gUnknown_2039A00
|
||||
ldr r0, [r0]
|
||||
@@ -5146,7 +5146,7 @@ _080C92FE:
|
||||
adds r2, 0x48
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
bl sub_803F78C
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
ldr r1, _080C9334 @ =gUnknown_2023FF4
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0x14]
|
||||
@@ -5164,10 +5164,10 @@ _080C932C: .4byte gUnknown_2023D6C
|
||||
_080C9330: .4byte gUnknown_2023BE4
|
||||
_080C9334: .4byte gUnknown_2023FF4
|
||||
_080C9338: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C92E4
|
||||
thumb_func_end BattleAICmd_get_gender
|
||||
|
||||
thumb_func_start sub_80C933C
|
||||
sub_80C933C: @ 80C933C
|
||||
thumb_func_start BattleAICmd_is_first_turn
|
||||
BattleAICmd_is_first_turn: @ 80C933C
|
||||
push {r4,lr}
|
||||
ldr r0, _080C9350 @ =gUnknown_2039A00
|
||||
ldr r1, [r0]
|
||||
@@ -5204,10 +5204,10 @@ _080C935A:
|
||||
_080C937C: .4byte gUnknown_2023D6C
|
||||
_080C9380: .4byte gUnknown_2023FF4
|
||||
_080C9384: .4byte gUnknown_2023E0C
|
||||
thumb_func_end sub_80C933C
|
||||
thumb_func_end BattleAICmd_is_first_turn
|
||||
|
||||
thumb_func_start sub_80C9388
|
||||
sub_80C9388: @ 80C9388
|
||||
thumb_func_start BattleAICmd_get_stockpile_count
|
||||
BattleAICmd_get_stockpile_count: @ 80C9388
|
||||
push {r4,lr}
|
||||
ldr r0, _080C939C @ =gUnknown_2039A00
|
||||
ldr r1, [r0]
|
||||
@@ -5244,10 +5244,10 @@ _080C93A6:
|
||||
_080C93C8: .4byte gUnknown_2023D6C
|
||||
_080C93CC: .4byte gUnknown_2023FF4
|
||||
_080C93D0: .4byte gUnknown_2023E0C
|
||||
thumb_func_end sub_80C9388
|
||||
thumb_func_end BattleAICmd_get_stockpile_count
|
||||
|
||||
thumb_func_start sub_80C93D4
|
||||
sub_80C93D4: @ 80C93D4
|
||||
thumb_func_start BattleAICmd_is_double_battle
|
||||
BattleAICmd_is_double_battle: @ 80C93D4
|
||||
ldr r0, _080C93F0 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x14]
|
||||
@@ -5265,10 +5265,10 @@ sub_80C93D4: @ 80C93D4
|
||||
_080C93F0: .4byte gUnknown_2023FF4
|
||||
_080C93F4: .4byte gUnknown_2022B4C
|
||||
_080C93F8: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C93D4
|
||||
thumb_func_end BattleAICmd_is_double_battle
|
||||
|
||||
thumb_func_start sub_80C93FC
|
||||
sub_80C93FC: @ 80C93FC
|
||||
thumb_func_start BattleAICmd_get_used_held_item
|
||||
BattleAICmd_get_used_held_item: @ 80C93FC
|
||||
push {r4,lr}
|
||||
ldr r0, _080C9410 @ =gUnknown_2039A00
|
||||
ldr r1, [r0]
|
||||
@@ -5305,10 +5305,10 @@ _080C941A:
|
||||
_080C943C: .4byte gUnknown_2023D6C
|
||||
_080C9440: .4byte gUnknown_2023FF4
|
||||
_080C9444: .4byte gUnknown_2023FE8
|
||||
thumb_func_end sub_80C93FC
|
||||
thumb_func_end BattleAICmd_get_used_held_item
|
||||
|
||||
thumb_func_start sub_80C9448
|
||||
sub_80C9448: @ 80C9448
|
||||
thumb_func_start BattleAICmd_get_move_type_from_result
|
||||
BattleAICmd_get_move_type_from_result: @ 80C9448
|
||||
ldr r0, _080C9468 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x14]
|
||||
@@ -5329,10 +5329,10 @@ sub_80C9448: @ 80C9448
|
||||
_080C9468: .4byte gUnknown_2023FF4
|
||||
_080C946C: .4byte gUnknown_8250C04
|
||||
_080C9470: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C9448
|
||||
thumb_func_end BattleAICmd_get_move_type_from_result
|
||||
|
||||
thumb_func_start sub_80C9474
|
||||
sub_80C9474: @ 80C9474
|
||||
thumb_func_start BattleAICmd_get_move_power_from_result
|
||||
BattleAICmd_get_move_power_from_result: @ 80C9474
|
||||
ldr r0, _080C9494 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x14]
|
||||
@@ -5353,10 +5353,10 @@ sub_80C9474: @ 80C9474
|
||||
_080C9494: .4byte gUnknown_2023FF4
|
||||
_080C9498: .4byte gUnknown_8250C04
|
||||
_080C949C: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C9474
|
||||
thumb_func_end BattleAICmd_get_move_power_from_result
|
||||
|
||||
thumb_func_start sub_80C94A0
|
||||
sub_80C94A0: @ 80C94A0
|
||||
thumb_func_start BattleAICmd_get_move_effect_from_result
|
||||
BattleAICmd_get_move_effect_from_result: @ 80C94A0
|
||||
ldr r0, _080C94C0 @ =gUnknown_2023FF4
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x14]
|
||||
@@ -5377,10 +5377,10 @@ sub_80C94A0: @ 80C94A0
|
||||
_080C94C0: .4byte gUnknown_2023FF4
|
||||
_080C94C4: .4byte gUnknown_8250C04
|
||||
_080C94C8: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C94A0
|
||||
thumb_func_end BattleAICmd_get_move_effect_from_result
|
||||
|
||||
thumb_func_start sub_80C94CC
|
||||
sub_80C94CC: @ 80C94CC
|
||||
thumb_func_start BattleAICmd_get_protect_count
|
||||
BattleAICmd_get_protect_count: @ 80C94CC
|
||||
push {r4,lr}
|
||||
ldr r0, _080C94E0 @ =gUnknown_2039A00
|
||||
ldr r1, [r0]
|
||||
@@ -5417,7 +5417,7 @@ _080C94EA:
|
||||
_080C950C: .4byte gUnknown_2023D6C
|
||||
_080C9510: .4byte gUnknown_2023FF4
|
||||
_080C9514: .4byte gUnknown_2023E0C
|
||||
thumb_func_end sub_80C94CC
|
||||
thumb_func_end BattleAICmd_get_protect_count
|
||||
|
||||
thumb_func_start nullsub_68
|
||||
nullsub_68: @ 80C9518
|
||||
@@ -5449,8 +5449,8 @@ nullsub_73: @ 80C952C
|
||||
bx lr
|
||||
thumb_func_end nullsub_73
|
||||
|
||||
thumb_func_start sub_80C9530
|
||||
sub_80C9530: @ 80C9530
|
||||
thumb_func_start BattleAICmd_call
|
||||
BattleAICmd_call: @ 80C9530
|
||||
push {r4,lr}
|
||||
ldr r4, _080C955C @ =gUnknown_2039A00
|
||||
ldr r0, [r4]
|
||||
@@ -5473,7 +5473,7 @@ sub_80C9530: @ 80C9530
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080C955C: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C9530
|
||||
thumb_func_end BattleAICmd_call
|
||||
|
||||
thumb_func_start sub_80C9560
|
||||
sub_80C9560: @ 80C9560
|
||||
@@ -5495,8 +5495,8 @@ sub_80C9560: @ 80C9560
|
||||
_080C957C: .4byte gUnknown_2039A00
|
||||
thumb_func_end sub_80C9560
|
||||
|
||||
thumb_func_start sub_80C9580
|
||||
sub_80C9580: @ 80C9580
|
||||
thumb_func_start BattleAICmd_end
|
||||
BattleAICmd_end: @ 80C9580
|
||||
push {lr}
|
||||
bl sub_80C9768
|
||||
lsls r0, 24
|
||||
@@ -5514,10 +5514,10 @@ _080C959A:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080C95A0: .4byte gUnknown_2023FF4
|
||||
thumb_func_end sub_80C9580
|
||||
thumb_func_end BattleAICmd_end
|
||||
|
||||
thumb_func_start sub_80C95A4
|
||||
sub_80C95A4: @ 80C95A4
|
||||
thumb_func_start BattleAICmd_if_level_cond
|
||||
BattleAICmd_if_level_cond: @ 80C95A4
|
||||
push {r4,r5,lr}
|
||||
ldr r5, _080C95BC @ =gUnknown_2039A00
|
||||
ldr r4, [r5]
|
||||
@@ -5623,7 +5623,7 @@ _080C9674:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C95A4
|
||||
thumb_func_end BattleAICmd_if_level_cond
|
||||
|
||||
thumb_func_start sub_80C967C
|
||||
sub_80C967C: @ 80C967C
|
||||
|
||||
@@ -28,7 +28,7 @@ sub_8039188: @ 8039188
|
||||
cmp r0, 0
|
||||
bne _080391E4
|
||||
adds r0, r2, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _080391E0 @ =gUnknown_2023FE8
|
||||
@@ -40,7 +40,7 @@ sub_8039188: @ 8039188
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
movs r0, 0x1
|
||||
b _080391E6
|
||||
.align 2, 0
|
||||
@@ -73,7 +73,7 @@ _08039204: .4byte gUnknown_2022B4C
|
||||
_08039208:
|
||||
ldr r0, _0803922C @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _08039230 @ =gUnknown_2023FE8
|
||||
@@ -84,7 +84,7 @@ _08039208:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
movs r0, 0x1
|
||||
b _0803935E
|
||||
.align 2, 0
|
||||
@@ -93,7 +93,7 @@ _08039230: .4byte gUnknown_2023FE8
|
||||
_08039234:
|
||||
ldr r4, _0803936C @ =gUnknown_2023BE4
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x58
|
||||
@@ -106,7 +106,7 @@ _08039234:
|
||||
b _0803935C
|
||||
_08039250:
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r6, 0
|
||||
@@ -133,7 +133,7 @@ _0803926C:
|
||||
ldrh r1, [r4]
|
||||
mov r3, r8
|
||||
ldrb r2, [r3]
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@@ -155,17 +155,17 @@ _080392A4:
|
||||
adds r4, r5, r3
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039356
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039356
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -180,12 +180,12 @@ _080392A4:
|
||||
beq _08039356
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2E
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r4, 0
|
||||
@@ -201,21 +201,21 @@ _08039310:
|
||||
adds r1, 0xD
|
||||
mov r0, r8
|
||||
add r0, r9
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0
|
||||
beq _08039350
|
||||
ldrh r1, [r5]
|
||||
ldrb r2, [r7]
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _08039350
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x3
|
||||
@@ -261,7 +261,7 @@ sub_803937C: @ 803937C
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080393A8
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x3
|
||||
@@ -305,12 +305,12 @@ _080393D6:
|
||||
beq _08039442
|
||||
mov r8, r3
|
||||
mov r0, r8
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _08039424 @ =gUnknown_2023D70
|
||||
ldrb r1, [r1]
|
||||
ldr r2, _08039428 @ =gUnknown_825E45C
|
||||
@@ -333,11 +333,11 @@ _08039424: .4byte gUnknown_2023D70
|
||||
_08039428: .4byte gUnknown_825E45C
|
||||
_0803942C:
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
eors r0, r4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
b _08039446
|
||||
@@ -396,7 +396,7 @@ _0803949C: .4byte gUnknown_2023BE4
|
||||
_080394A0:
|
||||
ldr r0, _080394C4 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _080394C8 @ =gUnknown_2023FE8
|
||||
@@ -407,7 +407,7 @@ _080394A0:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
movs r0, 0x1
|
||||
b _0803958A
|
||||
.align 2, 0
|
||||
@@ -425,17 +425,17 @@ _080394D2:
|
||||
adds r5, r1, r0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039582
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039582
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -466,12 +466,12 @@ _080394D2:
|
||||
beq _08039582
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2E
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039568
|
||||
lsls r0, r4, 3
|
||||
@@ -494,7 +494,7 @@ _08039568:
|
||||
_08039572:
|
||||
cmp r10, r0
|
||||
bne _08039582
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -553,7 +553,7 @@ sub_8039598: @ 8039598
|
||||
cmp r1, r0
|
||||
bne _08039600
|
||||
_080395DE:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -580,7 +580,7 @@ _08039600:
|
||||
ldrb r0, [r0, 0x1]
|
||||
cmp r0, 0
|
||||
bne _08039638
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -604,7 +604,7 @@ _08039638:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08039686
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -616,7 +616,7 @@ _08039664:
|
||||
ldr r0, _08039690 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
_08039668:
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _08039694 @ =gUnknown_2023FE8
|
||||
@@ -628,7 +628,7 @@ _08039668:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
_08039686:
|
||||
movs r0, 0x1
|
||||
_08039688:
|
||||
@@ -650,7 +650,7 @@ sub_8039698: @ 8039698
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r0, _08039730 @ =gUnknown_2023D70
|
||||
@@ -686,7 +686,7 @@ _080396D4:
|
||||
ldrh r1, [r5]
|
||||
mov r3, r9
|
||||
ldrb r2, [r3]
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@@ -696,7 +696,7 @@ _080396D4:
|
||||
mov r0, r8
|
||||
cmp r0, 0
|
||||
bne _08039744
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0xA
|
||||
@@ -727,7 +727,7 @@ _08039744:
|
||||
b _080397C4
|
||||
_08039748:
|
||||
movs r0, 0x2
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r0, _080397D0 @ =gUnknown_2023D70
|
||||
@@ -763,7 +763,7 @@ _08039776:
|
||||
ldrh r1, [r5]
|
||||
mov r3, r9
|
||||
ldrb r2, [r3]
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@@ -773,7 +773,7 @@ _08039776:
|
||||
mov r0, r8
|
||||
cmp r0, 0
|
||||
bne _08039744
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0xA
|
||||
@@ -898,12 +898,12 @@ _0803987A:
|
||||
beq _08039918
|
||||
mov r9, r3
|
||||
mov r0, r9
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080398CC @ =gUnknown_2023D70
|
||||
ldrb r1, [r1]
|
||||
ldr r2, _080398D0 @ =gUnknown_825E45C
|
||||
@@ -928,11 +928,11 @@ _080398CC: .4byte gUnknown_2023D70
|
||||
_080398D0: .4byte gUnknown_825E45C
|
||||
_080398D4:
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
eors r0, r4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
@@ -940,7 +940,7 @@ _080398D4:
|
||||
_080398EC:
|
||||
ldr r0, _08039910 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _08039914 @ =gUnknown_2023FE8
|
||||
@@ -951,7 +951,7 @@ _080398EC:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
movs r0, 0x1
|
||||
b _08039A56
|
||||
.align 2, 0
|
||||
@@ -970,21 +970,21 @@ _0803991E:
|
||||
adds r5, r1, r0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _08039936
|
||||
b _08039A4C
|
||||
_08039936:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _08039944
|
||||
b _08039A4C
|
||||
_08039944:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -1018,12 +1018,12 @@ _08039944:
|
||||
beq _08039A4C
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2E
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _080399C0
|
||||
lsls r0, r4, 3
|
||||
@@ -1053,7 +1053,7 @@ _080399CC:
|
||||
adds r0, r1
|
||||
ldrh r0, [r0]
|
||||
adds r1, r4, 0
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
ldr r1, [sp]
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -1081,21 +1081,21 @@ _08039A0A:
|
||||
adds r1, r4, 0
|
||||
adds r1, 0xD
|
||||
add r0, r8
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0
|
||||
beq _08039A46
|
||||
ldrh r1, [r5]
|
||||
ldrb r2, [r6]
|
||||
bl sub_801EFCC
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _08039A46
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r1, [sp, 0x4]
|
||||
@@ -1226,12 +1226,12 @@ _08039B1C:
|
||||
ldr r4, _08039B60 @ =gUnknown_2023BC4
|
||||
ldrb r7, [r4]
|
||||
adds r0, r7, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _08039B70 @ =gUnknown_2023D70
|
||||
ldrb r1, [r1]
|
||||
ldr r2, _08039B74 @ =gUnknown_825E45C
|
||||
@@ -1254,11 +1254,11 @@ _08039B70: .4byte gUnknown_2023D70
|
||||
_08039B74: .4byte gUnknown_825E45C
|
||||
_08039B78:
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
b _08039B94
|
||||
@@ -1276,17 +1276,17 @@ _08039B96:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039BFA
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039BFA
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -1396,7 +1396,7 @@ _08039C94:
|
||||
beq _08039D8C
|
||||
ldr r0, _08039CE0 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _08039CE4 @ =gUnknown_2023FE8
|
||||
@@ -1417,7 +1417,7 @@ _08039C94:
|
||||
cmp r0, 0
|
||||
bne _08039CE8
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r6, r5, 0
|
||||
@@ -1428,11 +1428,11 @@ _08039CE0: .4byte gUnknown_2023BC4
|
||||
_08039CE4: .4byte gUnknown_2023FE8
|
||||
_08039CE8:
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
movs r0, 0x3
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
_08039CFC:
|
||||
@@ -1443,7 +1443,7 @@ _08039CFE:
|
||||
ldr r1, _08039D7C @ =gUnknown_202402C
|
||||
adds r0, r1
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039D3E
|
||||
ldr r1, _08039D80 @ =gUnknown_2023BCE
|
||||
@@ -1476,7 +1476,7 @@ _08039D3E:
|
||||
_08039D44:
|
||||
ldr r0, _08039D88 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 25
|
||||
ldr r1, _08039D84 @ =gUnknown_2023FE8
|
||||
@@ -1487,7 +1487,7 @@ _08039D44:
|
||||
_08039D5A:
|
||||
ldr r4, _08039D88 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
ldrb r2, [r4]
|
||||
ldr r1, _08039D84 @ =gUnknown_2023FE8
|
||||
ldr r1, [r1]
|
||||
@@ -1518,7 +1518,7 @@ _08039D96:
|
||||
lsls r2, 8
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
_08039DA8:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -1628,12 +1628,12 @@ _08039E5E:
|
||||
beq _08039EF8
|
||||
str r2, [sp, 0xC]
|
||||
adds r0, r2, 0
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _08039EA4 @ =gUnknown_2023D70
|
||||
ldrb r1, [r1]
|
||||
ldr r2, _08039EA8 @ =gUnknown_825E45C
|
||||
@@ -1655,16 +1655,16 @@ _08039EA4: .4byte gUnknown_2023D70
|
||||
_08039EA8: .4byte gUnknown_825E45C
|
||||
_08039EAC:
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x10]
|
||||
_08039EC2:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r3, 0x2
|
||||
ands r0, r3
|
||||
lsls r0, 24
|
||||
@@ -1690,7 +1690,7 @@ _08039EF0: .4byte gUnknown_2023D70
|
||||
_08039EF4: .4byte gUnknown_825E45C
|
||||
_08039EF8:
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
@@ -1718,14 +1718,14 @@ _08039F20:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
cmp r5, 0
|
||||
beq _08039FF0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _08039FF0
|
||||
mov r1, r8
|
||||
@@ -1832,7 +1832,7 @@ _0803A018:
|
||||
adds r1, r7, 0
|
||||
adds r1, 0xD
|
||||
adds r0, r5, r6
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
cmp r4, 0
|
||||
@@ -1841,7 +1841,7 @@ _0803A018:
|
||||
ldrb r1, [r0]
|
||||
adds r0, r4, 0
|
||||
mov r2, r10
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
movs r1, 0x2
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -1904,7 +1904,7 @@ _0803A09C:
|
||||
adds r4, r6, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
adds r1, r7, 0x1
|
||||
str r1, [sp, 0x18]
|
||||
@@ -1912,7 +1912,7 @@ _0803A09C:
|
||||
beq _0803A158
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0803A158
|
||||
ldr r1, _0803A188 @ =gUnknown_2023BCE
|
||||
@@ -1950,7 +1950,7 @@ _0803A100:
|
||||
adds r1, 0xD
|
||||
ldr r0, _0803A184 @ =gUnknown_202402C
|
||||
add r0, r9
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
movs r0, 0
|
||||
@@ -1968,11 +1968,11 @@ _0803A100:
|
||||
beq _0803A13C
|
||||
ldrb r0, [r6]
|
||||
mov r1, r10
|
||||
bl sub_801E68C
|
||||
bl AI_CalcDmg
|
||||
ldrb r1, [r6]
|
||||
adds r0, r4, 0
|
||||
mov r2, r10
|
||||
bl sub_801EDF4
|
||||
bl TypeCalc
|
||||
_0803A13C:
|
||||
mov r2, r8
|
||||
ldr r0, [r2]
|
||||
@@ -2095,17 +2095,17 @@ _0803A20A:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0803A246
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0803A246
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
@@ -2245,7 +2245,7 @@ _0803A348:
|
||||
mov r0, r9
|
||||
movs r1, 0x4
|
||||
movs r2, 0x4
|
||||
bl sub_8042C08
|
||||
bl GetItemEffectParamOffset
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
@@ -2576,7 +2576,7 @@ _0803A5C4: .4byte gUnknown_2023E0C
|
||||
_0803A5C8:
|
||||
ldr r4, _0803A630 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _0803A634 @ =gUnknown_2023E0C
|
||||
@@ -2604,7 +2604,7 @@ _0803A5FC:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
ldr r0, _0803A630 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
lsrs r0, 1
|
||||
|
||||
+227
-227
File diff suppressed because it is too large
Load Diff
+182
-182
File diff suppressed because it is too large
Load Diff
+33
-33
@@ -21,7 +21,7 @@ sub_8078178: @ 8078178
|
||||
ldrb r6, [r0]
|
||||
ldr r0, _08078220 @ =sub_80782BC
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -55,7 +55,7 @@ _080781CC:
|
||||
asrs r2, 16
|
||||
ldr r0, _08078234 @ =gUnknown_83BF574
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
lsls r0, r4, 4
|
||||
@@ -114,7 +114,7 @@ _0807824A:
|
||||
asrs r2, 16
|
||||
ldr r0, _080782B8 @ =gUnknown_83BF574
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
lsls r0, r4, 4
|
||||
@@ -191,7 +191,7 @@ sub_80782BC: @ 80782BC
|
||||
ldrb r2, [r4, 0x10]
|
||||
ldrh r3, [r4, 0xA]
|
||||
movs r1, 0x10
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
ldrh r2, [r4, 0x12]
|
||||
movs r1, 0x12
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -229,7 +229,7 @@ _08078318:
|
||||
cmp r0, 0x2
|
||||
bne _08078346
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _08078346
|
||||
_08078342:
|
||||
adds r0, r1, 0x1
|
||||
@@ -278,12 +278,12 @@ sub_8078380: @ 8078380
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x20
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x8
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x26]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -325,11 +325,11 @@ _080783B2:
|
||||
cmp r0, 0
|
||||
beq _080783EE
|
||||
adds r0, r4, 0
|
||||
bl sub_8007804
|
||||
bl DestroySpriteAndFreeResources
|
||||
b _080783F4
|
||||
_080783EE:
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080783F4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -370,22 +370,22 @@ _0807843A:
|
||||
movs r1, 0xFD
|
||||
lsls r1, 6
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x80
|
||||
lsls r1, 5
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080784BC @ =gUnknown_83BF55C
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
lsls r2, r4, 16
|
||||
asrs r2, 16
|
||||
movs r3, 0x4
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _080784C0 @ =0x0000271a
|
||||
bl sub_8008804
|
||||
bl GetSpriteTileStartByTag
|
||||
lsls r0, 16
|
||||
ldr r1, _080784C4 @ =0xffff0000
|
||||
cmp r0, r1
|
||||
@@ -407,7 +407,7 @@ _08078484:
|
||||
ldr r1, _080784C8 @ =gUnknown_202063C
|
||||
adds r0, r1
|
||||
ldr r1, _080784CC @ =gUnknown_83BF554
|
||||
bl sub_8008A58
|
||||
bl SetSubspriteTables
|
||||
ldr r1, _080784D0 @ =gUnknown_3005090
|
||||
lsls r0, r6, 2
|
||||
adds r0, r6
|
||||
@@ -469,7 +469,7 @@ _0807850C:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_08078522:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -482,7 +482,7 @@ sub_8078528: @ 8078528
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080785C0 @ =0x0000271a
|
||||
bl sub_80089E8
|
||||
bl IndexOfSpritePaletteTag
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r1, _080785C4 @ =gUnknown_3005090
|
||||
@@ -599,7 +599,7 @@ _08078610:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_08078626:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -632,9 +632,9 @@ sub_807862C: @ 807862C
|
||||
ldr r0, _08078670 @ =gUnknown_202063C
|
||||
adds r4, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_80077D8
|
||||
bl FreeSpriteOamMatrix
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
b _0807868E
|
||||
.align 2, 0
|
||||
_0807866C: .4byte gUnknown_3005090
|
||||
@@ -644,12 +644,12 @@ _08078674:
|
||||
bne _0807868E
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_0807868E:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -864,7 +864,7 @@ _0807882A:
|
||||
b _08078838
|
||||
_08078830:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _0807885A
|
||||
_08078838:
|
||||
ldr r0, _08078860 @ =gUnknown_2037F02
|
||||
@@ -893,8 +893,8 @@ _08078864: .4byte gUnknown_3005090
|
||||
_08078868: .4byte sub_80BB088
|
||||
thumb_func_end sub_8078694
|
||||
|
||||
thumb_func_start sub_807886C
|
||||
sub_807886C: @ 807886C
|
||||
thumb_func_start LaunchStatusAnimation
|
||||
LaunchStatusAnimation: @ 807886C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -908,9 +908,9 @@ sub_807886C: @ 807886C
|
||||
ldr r0, _080788B0 @ =gUnknown_81C6E84
|
||||
movs r2, 0
|
||||
bl sub_80725D4
|
||||
ldr r0, _080788B4 @ =sub_80788BC
|
||||
ldr r0, _080788B4 @ =task0A_80788BC
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080788B8 @ =gUnknown_3005090
|
||||
@@ -926,12 +926,12 @@ sub_807886C: @ 807886C
|
||||
_080788A8: .4byte gUnknown_2037F1A
|
||||
_080788AC: .4byte gUnknown_2037F1B
|
||||
_080788B0: .4byte gUnknown_81C6E84
|
||||
_080788B4: .4byte sub_80788BC
|
||||
_080788B4: .4byte task0A_80788BC
|
||||
_080788B8: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_807886C
|
||||
thumb_func_end LaunchStatusAnimation
|
||||
|
||||
thumb_func_start sub_80788BC
|
||||
sub_80788BC: @ 80788BC
|
||||
thumb_func_start task0A_80788BC
|
||||
task0A_80788BC: @ 80788BC
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -962,7 +962,7 @@ sub_80788BC: @ 80788BC
|
||||
ands r0, r2
|
||||
strb r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080788FE:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -972,6 +972,6 @@ _08078904: .4byte gUnknown_2037EDC
|
||||
_08078908: .4byte gUnknown_2037EE1
|
||||
_0807890C: .4byte gUnknown_2024018
|
||||
_08078910: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80788BC
|
||||
thumb_func_end task0A_80788BC
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+62
-62
@@ -12,13 +12,13 @@ sub_80989F8: @ 80989F8
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08098A18 @ =gUnknown_2037F02
|
||||
ldrb r0, [r4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0xFF
|
||||
bne _08098A1C
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098A58
|
||||
.align 2, 0
|
||||
_08098A18: .4byte gUnknown_2037F02
|
||||
@@ -146,7 +146,7 @@ _08098AD4:
|
||||
adds r0, r6
|
||||
strh r3, [r0, 0x26]
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098B16
|
||||
_08098B12:
|
||||
subs r0, 0x1
|
||||
@@ -171,7 +171,7 @@ sub_8098B1C: @ 8098B1C
|
||||
bgt _08098B48
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0xFF
|
||||
@@ -207,7 +207,7 @@ _08098B6C:
|
||||
_08098B70:
|
||||
movs r0, 0x3
|
||||
_08098B72:
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
@@ -234,7 +234,7 @@ _08098B9E:
|
||||
beq _08098BB4
|
||||
_08098BA2:
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098BF2
|
||||
.align 2, 0
|
||||
_08098BAC: .4byte gUnknown_2023D44
|
||||
@@ -375,7 +375,7 @@ _08098C82:
|
||||
adds r0, r7
|
||||
strh r2, [r0, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098CC4
|
||||
_08098CC0:
|
||||
subs r0, r2, 0x1
|
||||
@@ -395,13 +395,13 @@ sub_8098CD0: @ 8098CD0
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08098CF0 @ =gUnknown_2037F02
|
||||
ldrb r0, [r4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0xFF
|
||||
bne _08098CF4
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098D42
|
||||
.align 2, 0
|
||||
_08098CF0: .4byte gUnknown_2037F02
|
||||
@@ -607,7 +607,7 @@ _08098E44:
|
||||
strh r0, [r2, 0x26]
|
||||
_08098E7C:
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08098E88
|
||||
_08098E84:
|
||||
subs r0, r2, 0x1
|
||||
@@ -626,7 +626,7 @@ sub_8098E90: @ 8098E90
|
||||
lsrs r4, 24
|
||||
ldr r5, _08098EE0 @ =gUnknown_2037F02
|
||||
ldrb r0, [r5]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _08098EE4 @ =gUnknown_202063C
|
||||
@@ -732,7 +732,7 @@ _08098F42:
|
||||
cmp r0, 0
|
||||
bne _08098F74
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_08098F74:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -752,7 +752,7 @@ sub_8098F84: @ 8098F84
|
||||
movs r6, 0x1
|
||||
ldr r4, _08098FF8 @ =gUnknown_2037F02
|
||||
ldrb r0, [r4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
movs r1, 0x8
|
||||
@@ -825,7 +825,7 @@ sub_8099004: @ 8099004
|
||||
ldrsh r0, [r5, r1]
|
||||
movs r2, 0xA
|
||||
ldrsh r1, [r5, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
ldr r2, _08099078 @ =gUnknown_202063C
|
||||
lsls r1, r4, 4
|
||||
adds r1, r4
|
||||
@@ -836,7 +836,7 @@ sub_8099004: @ 8099004
|
||||
ldrsh r0, [r5, r1]
|
||||
movs r2, 0xC
|
||||
ldrsh r1, [r5, r2]
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
negs r0, r0
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r1, [r5, 0xC]
|
||||
@@ -861,7 +861,7 @@ _0809905C:
|
||||
strh r0, [r4, 0x24]
|
||||
strh r0, [r4, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_0809906E:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -878,7 +878,7 @@ sub_809907C: @ 809907C
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _080990A4 @ =gUnknown_2037F1A
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099098
|
||||
@@ -909,7 +909,7 @@ sub_80990AC: @ 80990AC
|
||||
strb r0, [r2]
|
||||
ldr r0, _080990D4 @ =gUnknown_2037F1A
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080990DC
|
||||
@@ -938,7 +938,7 @@ _080990E0:
|
||||
strh r2, [r4, 0x36]
|
||||
ldr r1, _08099118 @ =sub_8099120
|
||||
adds r0, r4, 0
|
||||
bl sub_8074A68
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _0809911C @ =sub_8074DC4
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4}
|
||||
@@ -962,13 +962,13 @@ sub_8099120: @ 8099120
|
||||
strh r1, [r0, 0x30]
|
||||
ldr r1, _0809913C @ =sub_8074DC4
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, _08099140 @ =sub_8072740
|
||||
bl sub_8074A68
|
||||
ldr r1, _08099140 @ =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0809913C: .4byte sub_8074DC4
|
||||
_08099140: .4byte sub_8072740
|
||||
_08099140: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_8099120
|
||||
|
||||
thumb_func_start sub_8099144
|
||||
@@ -983,7 +983,7 @@ sub_8099144: @ 8099144
|
||||
strb r0, [r2]
|
||||
ldr r5, _08099184 @ =gUnknown_2037F02
|
||||
ldrb r0, [r5, 0x4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r2, [r5]
|
||||
@@ -996,7 +996,7 @@ sub_8099144: @ 8099144
|
||||
strh r2, [r4, 0x36]
|
||||
ldr r1, _08099188 @ =sub_8099190
|
||||
adds r0, r4, 0
|
||||
bl sub_8074A68
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _0809918C @ =sub_8074DC4
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4,r5}
|
||||
@@ -1018,13 +1018,13 @@ sub_8099190: @ 8099190
|
||||
strh r1, [r0, 0x32]
|
||||
ldr r1, _080991AC @ =sub_8074DC4
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, _080991B0 @ =sub_8072740
|
||||
bl sub_8074A68
|
||||
ldr r1, _080991B0 @ =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080991AC: .4byte sub_8074DC4
|
||||
_080991B0: .4byte sub_8072740
|
||||
_080991B0: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_8099190
|
||||
|
||||
thumb_func_start sub_80991B4
|
||||
@@ -1152,7 +1152,7 @@ _080992A2:
|
||||
strh r1, [r3, 0x26]
|
||||
_080992A4:
|
||||
adds r0, r2, 0
|
||||
bl sub_8072740
|
||||
bl DestroyAnimSprite
|
||||
b _080992DA
|
||||
.align 2, 0
|
||||
_080992AC: .4byte gUnknown_202063C
|
||||
@@ -1206,7 +1206,7 @@ _080992FE:
|
||||
adds r0, r2, r0
|
||||
ldrb r6, [r0]
|
||||
adds r0, r2, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099328
|
||||
@@ -1254,9 +1254,9 @@ _08099328:
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r1, _0809938C @ =sub_8072740
|
||||
ldr r1, _0809938C @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl sub_8074A68
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _08099390 @ =sub_8074E14
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4-r6}
|
||||
@@ -1267,7 +1267,7 @@ _0809937C: .4byte gUnknown_2037F1B
|
||||
_08099380: .4byte gUnknown_2023D44
|
||||
_08099384: .4byte gUnknown_2037F02
|
||||
_08099388: .4byte gUnknown_202063C
|
||||
_0809938C: .4byte sub_8072740
|
||||
_0809938C: .4byte DestroyAnimSprite
|
||||
_08099390: .4byte sub_8074E14
|
||||
thumb_func_end sub_80992E0
|
||||
|
||||
@@ -1299,7 +1299,7 @@ _080993BE:
|
||||
adds r0, r1, r0
|
||||
ldrb r7, [r0]
|
||||
adds r0, r1, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080993E8
|
||||
@@ -1351,20 +1351,20 @@ _080993E8:
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _08099450
|
||||
ldr r1, _0809944C @ =sub_8072740
|
||||
ldr r1, _0809944C @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
bl sub_8074A68
|
||||
bl StoreSpriteCallbackInData6
|
||||
b _08099458
|
||||
.align 2, 0
|
||||
_0809943C: .4byte gUnknown_2037F1B
|
||||
_08099440: .4byte gUnknown_2023D44
|
||||
_08099444: .4byte gUnknown_2037F02
|
||||
_08099448: .4byte gUnknown_202063C
|
||||
_0809944C: .4byte sub_8072740
|
||||
_0809944C: .4byte DestroyAnimSprite
|
||||
_08099450:
|
||||
ldr r1, _08099464 @ =sub_809946C
|
||||
adds r0, r6, 0
|
||||
bl sub_8074A68
|
||||
bl StoreSpriteCallbackInData6
|
||||
_08099458:
|
||||
ldr r0, _08099468 @ =sub_8074E14
|
||||
str r0, [r6, 0x1C]
|
||||
@@ -1395,7 +1395,7 @@ sub_809946C: @ 809946C
|
||||
lsls r1, 2
|
||||
adds r1, r4
|
||||
strh r3, [r1, 0x26]
|
||||
bl sub_8072740
|
||||
bl DestroyAnimSprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1418,7 +1418,7 @@ sub_809949C: @ 809949C
|
||||
lsrs r7, r0, 16
|
||||
ldr r0, _08099524 @ =gUnknown_2037F1A
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080994CE
|
||||
@@ -1430,7 +1430,7 @@ sub_809949C: @ 809949C
|
||||
strh r0, [r5, 0xA]
|
||||
_080994CE:
|
||||
ldrb r0, [r5]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
ldr r1, _08099528 @ =gUnknown_3005090
|
||||
lsls r4, r6, 2
|
||||
adds r4, r6
|
||||
@@ -1501,7 +1501,7 @@ sub_8099530: @ 8099530
|
||||
lsrs r0, 8
|
||||
movs r2, 0xC
|
||||
ldrsh r1, [r5, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r5, 0x16]
|
||||
ldrh r1, [r5, 0x1C]
|
||||
@@ -1571,7 +1571,7 @@ _080995BC:
|
||||
cmp r0, 0
|
||||
bne _080995F0
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080995F0:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1595,7 +1595,7 @@ sub_80995FC: @ 80995FC
|
||||
cmp r0, 0
|
||||
blt _0809965C
|
||||
ldrb r0, [r1]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
b _08099664
|
||||
@@ -1631,7 +1631,7 @@ _08099654: .4byte gUnknown_2037F1B
|
||||
_08099658: .4byte gUnknown_2023D44
|
||||
_0809965C:
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _080996A4
|
||||
_08099664:
|
||||
ldr r1, _08099684 @ =gUnknown_3005090
|
||||
@@ -1642,7 +1642,7 @@ _08099664:
|
||||
strh r2, [r5, 0x8]
|
||||
ldr r0, _08099688 @ =gUnknown_2037F1B
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099690
|
||||
@@ -1706,7 +1706,7 @@ sub_80996B8: @ 80996B8
|
||||
cmp r1, r0
|
||||
bls _080996F6
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080996F6:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1723,7 +1723,7 @@ sub_8099704: @ 8099704
|
||||
lsrs r5, r0, 24
|
||||
ldr r6, _08099754 @ =gUnknown_2037F1A
|
||||
ldrb r0, [r6]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099720
|
||||
@@ -1734,7 +1734,7 @@ sub_8099704: @ 8099704
|
||||
_08099720:
|
||||
ldr r4, _08099758 @ =gUnknown_2037F02
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0809975C @ =gUnknown_3005090
|
||||
@@ -1807,7 +1807,7 @@ sub_8099788: @ 8099788
|
||||
mov r0, r8
|
||||
movs r2, 0xA
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
mov r9, r5
|
||||
@@ -1829,7 +1829,7 @@ _080997D8: .4byte gUnknown_3005090
|
||||
_080997DC: .4byte gUnknown_202063C
|
||||
_080997E0:
|
||||
ldrb r0, [r4, 0x12]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08099808
|
||||
@@ -1925,7 +1925,7 @@ _0809986A:
|
||||
strh r3, [r0, 0x24]
|
||||
strh r3, [r0, 0x26]
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_0809989C:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
@@ -1946,7 +1946,7 @@ sub_80998B0: @ 80998B0
|
||||
lsrs r4, 24
|
||||
ldr r6, _080998FC @ =gUnknown_2037F02
|
||||
ldrb r0, [r6, 0x6]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
@@ -2009,7 +2009,7 @@ sub_8099908: @ 8099908
|
||||
ldrsh r2, [r4, r3]
|
||||
adds r0, r6, 0
|
||||
movs r3, 0
|
||||
bl sub_8075858
|
||||
bl obj_id_set_rotscale
|
||||
ldrh r0, [r4, 0xC]
|
||||
subs r0, 0x1
|
||||
strh r0, [r4, 0xC]
|
||||
@@ -2037,7 +2037,7 @@ _0809996C:
|
||||
adds r0, r6, 0
|
||||
bl sub_8075980
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_08099978:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -2053,7 +2053,7 @@ sub_8099980: @ 8099980
|
||||
lsrs r7, r0, 24
|
||||
ldr r4, _080999BC @ =gUnknown_2037F02
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -2121,7 +2121,7 @@ _08099A14:
|
||||
ldr r0, _08099A6C @ =gUnknown_2037F1B
|
||||
_08099A16:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
movs r1, 0
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@@ -2179,7 +2179,7 @@ sub_8099A78: @ 8099A78
|
||||
lsrs r5, r0, 24
|
||||
ldr r4, _08099AB4 @ =gUnknown_2037F02
|
||||
ldrb r0, [r4, 0x4]
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -2208,7 +2208,7 @@ _08099AC0:
|
||||
ldr r0, _08099AF0 @ =gUnknown_2037F1B
|
||||
_08099AC2:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08099AD4
|
||||
@@ -2299,7 +2299,7 @@ sub_8099B54: @ 8099B54
|
||||
lsls r2, 1
|
||||
ldrh r3, [r4, 0xE]
|
||||
adds r1, r2, 0
|
||||
bl sub_8075858
|
||||
bl obj_id_set_rotscale
|
||||
movs r2, 0x16
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0
|
||||
@@ -2332,7 +2332,7 @@ _08099BB0:
|
||||
bl sub_8075980
|
||||
_08099BB6:
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _08099BCE
|
||||
_08099BBE:
|
||||
movs r0, 0
|
||||
@@ -2424,7 +2424,7 @@ _08099C3A:
|
||||
ldrh r0, [r1, 0x8]
|
||||
strh r0, [r4, 0x1E]
|
||||
movs r0, 0x1
|
||||
bl sub_80749D4
|
||||
bl GetAnimBankSpriteId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x16]
|
||||
@@ -2576,7 +2576,7 @@ _08099D64:
|
||||
adds r0, r2
|
||||
strh r4, [r0, 0x26]
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_08099D96:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
+1707
-1707
File diff suppressed because it is too large
Load Diff
+327
-327
File diff suppressed because it is too large
Load Diff
+220
-220
File diff suppressed because it is too large
Load Diff
@@ -36,7 +36,7 @@ sub_80DCE10: @ 80DCE10
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8073B88
|
||||
bl CalculatePanIncrement
|
||||
strh r4, [r6, 0xC]
|
||||
strh r5, [r6, 0xE]
|
||||
lsls r0, 24
|
||||
@@ -96,7 +96,7 @@ _080DCEB0:
|
||||
ldrh r0, [r4, 0x8]
|
||||
lsls r1, r5, 24
|
||||
asrs r1, 24
|
||||
bl sub_80722F4
|
||||
bl PlaySE12WithPanning
|
||||
_080DCECA:
|
||||
lsls r1, r6, 24
|
||||
asrs r1, 24
|
||||
@@ -138,7 +138,7 @@ sub_80DCEE4: @ 80DCEE4
|
||||
ldrh r0, [r4, 0xA]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
bl sub_80722F4
|
||||
bl PlaySE12WithPanning
|
||||
ldrh r0, [r4, 0x1E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x1E]
|
||||
@@ -147,7 +147,7 @@ sub_80DCEE4: @ 80DCEE4
|
||||
cmp r0, 0x2
|
||||
bne _080DCF2C
|
||||
adds r0, r5, 0
|
||||
bl sub_807277C
|
||||
bl DestroyAnimSoundTask
|
||||
_080DCF2C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -156,8 +156,8 @@ _080DCF2C:
|
||||
_080DCF34: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80DCEE4
|
||||
|
||||
thumb_func_start sub_80DCF38
|
||||
sub_80DCF38: @ 80DCF38
|
||||
thumb_func_start mas_80DCF38
|
||||
mas_80DCF38: @ 80DCF38
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -199,7 +199,7 @@ sub_80DCF38: @ 80DCF38
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_8073B88
|
||||
bl CalculatePanIncrement
|
||||
ldr r2, _080DCFE0 @ =gUnknown_3005090
|
||||
mov r3, r8
|
||||
lsls r1, r3, 2
|
||||
@@ -239,7 +239,7 @@ sub_80DCF38: @ 80DCF38
|
||||
_080DCFDC: .4byte gUnknown_2037F02
|
||||
_080DCFE0: .4byte gUnknown_3005090
|
||||
_080DCFE4: .4byte sub_80DCFE8
|
||||
thumb_func_end sub_80DCF38
|
||||
thumb_func_end mas_80DCF38
|
||||
|
||||
thumb_func_start sub_80DCFE8
|
||||
sub_80DCFE8: @ 80DCFE8
|
||||
@@ -265,7 +265,7 @@ sub_80DCFE8: @ 80DCFE8
|
||||
ldrh r0, [r4, 0x8]
|
||||
movs r1, 0x1E
|
||||
ldrsb r1, [r4, r1]
|
||||
bl sub_80722F4
|
||||
bl PlaySE12WithPanning
|
||||
ldrh r0, [r4, 0x10]
|
||||
subs r0, 0x1
|
||||
strh r0, [r4, 0x10]
|
||||
@@ -273,7 +273,7 @@ sub_80DCFE8: @ 80DCFE8
|
||||
cmp r0, 0
|
||||
bne _080DD030
|
||||
adds r0, r5, 0
|
||||
bl sub_807277C
|
||||
bl DestroyAnimSoundTask
|
||||
b _080DD062
|
||||
.align 2, 0
|
||||
_080DD02C: .4byte gUnknown_3005090
|
||||
@@ -368,14 +368,14 @@ _080DD0CC:
|
||||
cmp r0, 0
|
||||
bne _080DD0E8
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _080DD13A
|
||||
.align 2, 0
|
||||
_080DD0E0: .4byte gUnknown_2037F1B
|
||||
_080DD0E4: .4byte gUnknown_2037F02
|
||||
_080DD0E8:
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DD10C
|
||||
@@ -401,7 +401,7 @@ _080DD10C:
|
||||
_080DD11A:
|
||||
adds r0, r1
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -409,10 +409,10 @@ _080DD11A:
|
||||
lsls r1, r6, 24
|
||||
asrs r1, 24
|
||||
movs r2, 0x3
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
_080DD134:
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD13A:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -480,14 +480,14 @@ _080DD1A8:
|
||||
cmp r0, 0
|
||||
bne _080DD1C4
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _080DD26A
|
||||
.align 2, 0
|
||||
_080DD1BC: .4byte gUnknown_2037F1B
|
||||
_080DD1C0: .4byte gUnknown_2037F02
|
||||
_080DD1C4:
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DD1E8
|
||||
@@ -513,7 +513,7 @@ _080DD1E8:
|
||||
_080DD1F6:
|
||||
adds r0, r1
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
ldr r1, _080DD23C @ =gUnknown_3005090
|
||||
@@ -537,7 +537,7 @@ _080DD1F6:
|
||||
bne _080DD244
|
||||
adds r0, r3, 0
|
||||
movs r2, 0x9
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
b _080DD24C
|
||||
.align 2, 0
|
||||
_080DD234: .4byte gUnknown_2023BCE
|
||||
@@ -547,7 +547,7 @@ _080DD240: .4byte gUnknown_2037F02
|
||||
_080DD244:
|
||||
adds r0, r3, 0
|
||||
movs r2, 0x7
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
_080DD24C:
|
||||
ldr r0, _080DD25C @ =gUnknown_3005090
|
||||
adds r1, r5, r6
|
||||
@@ -561,7 +561,7 @@ _080DD25C: .4byte gUnknown_3005090
|
||||
_080DD260: .4byte sub_80DD270
|
||||
_080DD264:
|
||||
adds r0, r6, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD26A:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -601,7 +601,7 @@ _080DD2A4:
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0xFF
|
||||
bne _080DD2CA
|
||||
bl sub_8072214
|
||||
bl IsCryPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD2E6
|
||||
@@ -609,12 +609,12 @@ _080DD2A4:
|
||||
asrs r1, 24
|
||||
adds r0, r6, 0
|
||||
movs r2, 0xA
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
b _080DD2E6
|
||||
_080DD2CA:
|
||||
bl sub_8072214
|
||||
bl IsCryPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD2E6
|
||||
@@ -622,9 +622,9 @@ _080DD2CA:
|
||||
asrs r1, 24
|
||||
mov r0, r8
|
||||
movs r2, 0x8
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
mov r0, r9
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD2E6:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
@@ -656,12 +656,12 @@ sub_80DD2F4: @ 80DD2F4
|
||||
.align 2, 0
|
||||
_080DD318: .4byte gUnknown_3005090
|
||||
_080DD31C:
|
||||
bl sub_8072214
|
||||
bl IsCryPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD32C
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD32C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -695,7 +695,7 @@ sub_80DD334: @ 80DD334
|
||||
beq _080DD384
|
||||
adds r0, r3, 0
|
||||
movs r2, 0x4
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
ldr r0, _080DD380 @ =sub_80DD390
|
||||
str r0, [r4]
|
||||
b _080DD38A
|
||||
@@ -706,7 +706,7 @@ _080DD37C: .4byte gUnknown_3005090
|
||||
_080DD380: .4byte sub_80DD390
|
||||
_080DD384:
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD38A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -735,7 +735,7 @@ sub_80DD390: @ 80DD390
|
||||
.align 2, 0
|
||||
_080DD3B4: .4byte gUnknown_3005090
|
||||
_080DD3B8:
|
||||
bl sub_8072214
|
||||
bl IsCryPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD3D4
|
||||
@@ -743,9 +743,9 @@ _080DD3B8:
|
||||
movs r1, 0xC
|
||||
ldrsb r1, [r4, r1]
|
||||
movs r2, 0x6
|
||||
bl sub_8071E60
|
||||
bl PlayCry3
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD3D4:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -768,9 +768,9 @@ sub_80DD3DC: @ 80DD3DC
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_8072348
|
||||
bl PlaySE1WithPanning
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -794,9 +794,9 @@ sub_80DD410: @ 80DD410
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_807237C
|
||||
bl PlaySE2WithPanning
|
||||
adds r0, r4, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -840,7 +840,7 @@ sub_80DD444: @ 80DD444
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_8073B88
|
||||
bl CalculatePanIncrement
|
||||
ldr r2, _080DD4CC @ =gUnknown_3005090
|
||||
mov r3, r8
|
||||
lsls r1, r3, 2
|
||||
@@ -914,7 +914,7 @@ _080DD50E:
|
||||
cmp r1, r0
|
||||
bne _080DD526
|
||||
adds r0, r5, 0
|
||||
bl sub_8072760
|
||||
bl DestroyAnimVisualTask
|
||||
_080DD526:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+328
-328
File diff suppressed because it is too large
Load Diff
+168
-168
File diff suppressed because it is too large
Load Diff
+419
-419
File diff suppressed because it is too large
Load Diff
+212
-212
File diff suppressed because it is too large
Load Diff
+141
-141
@@ -17,17 +17,17 @@ sub_80DD538: @ 80DD538
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DD550 @ =sub_80DD554
|
||||
ldr r1, _080DD550 @ =SafariBufferRunCommand
|
||||
str r1, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080DD548: .4byte gUnknown_3004FE0
|
||||
_080DD54C: .4byte gUnknown_2023BC4
|
||||
_080DD550: .4byte sub_80DD554
|
||||
_080DD550: .4byte SafariBufferRunCommand
|
||||
thumb_func_end sub_80DD538
|
||||
|
||||
thumb_func_start sub_80DD554
|
||||
sub_80DD554: @ 80DD554
|
||||
thumb_func_start SafariBufferRunCommand
|
||||
SafariBufferRunCommand: @ 80DD554
|
||||
push {lr}
|
||||
ldr r2, _080DD588 @ =gUnknown_2023BC8
|
||||
ldr r1, _080DD58C @ =gUnknown_825E45C
|
||||
@@ -60,14 +60,14 @@ _080DD590: .4byte gUnknown_2023BC4
|
||||
_080DD594: .4byte gUnknown_2022BC4
|
||||
_080DD598: .4byte gUnknown_83FED00
|
||||
_080DD59C:
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD5A0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD554
|
||||
thumb_func_end SafariBufferRunCommand
|
||||
|
||||
thumb_func_start sub_80DD5A4
|
||||
sub_80DD5A4: @ 80DD5A4
|
||||
thumb_func_start HandleInputChooseAction_0
|
||||
HandleInputChooseAction_0: @ 80DD5A4
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _080DD5D4 @ =gUnknown_30030F0
|
||||
ldrh r1, [r0, 0x2E]
|
||||
@@ -113,15 +113,15 @@ _080DD5F6:
|
||||
movs r1, 0x7
|
||||
_080DD5FA:
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
b _080DD60C
|
||||
_080DD602:
|
||||
movs r0, 0x1
|
||||
movs r1, 0x8
|
||||
movs r2, 0
|
||||
bl sub_800E848
|
||||
bl EmitTwoReturnValues
|
||||
_080DD60C:
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
b _080DD71A
|
||||
_080DD612:
|
||||
movs r0, 0x20
|
||||
@@ -253,7 +253,7 @@ _080DD71A:
|
||||
.align 2, 0
|
||||
_080DD720: .4byte gUnknown_2023FF8
|
||||
_080DD724: .4byte gUnknown_2023BC4
|
||||
thumb_func_end sub_80DD5A4
|
||||
thumb_func_end HandleInputChooseAction_0
|
||||
|
||||
thumb_func_start sub_80DD728
|
||||
sub_80DD728: @ 80DD728
|
||||
@@ -273,7 +273,7 @@ sub_80DD728: @ 80DD728
|
||||
ldr r0, _080DD75C @ =nullsub_8
|
||||
cmp r1, r0
|
||||
bne _080DD74C
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD74C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -284,19 +284,19 @@ _080DD758: .4byte gUnknown_2023BC4
|
||||
_080DD75C: .4byte nullsub_8
|
||||
thumb_func_end sub_80DD728
|
||||
|
||||
thumb_func_start sub_80DD760
|
||||
sub_80DD760: @ 80DD760
|
||||
thumb_func_start CompleteOnInactiveTextPrinter_3
|
||||
CompleteOnInactiveTextPrinter_3: @ 80DD760
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
bl sub_8002E64
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _080DD772
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD772:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD760
|
||||
thumb_func_end CompleteOnInactiveTextPrinter_3
|
||||
|
||||
thumb_func_start sub_80DD778
|
||||
sub_80DD778: @ 80DD778
|
||||
@@ -316,7 +316,7 @@ sub_80DD778: @ 80DD778
|
||||
ldr r0, _080DD7AC @ =nullsub_8
|
||||
cmp r1, r0
|
||||
bne _080DD79C
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD79C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -348,7 +348,7 @@ sub_80DD7B0: @ 80DD7B0
|
||||
ldr r0, [r0]
|
||||
str r0, [r2]
|
||||
ldr r0, [r2, 0x8]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080DD7DA:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -359,8 +359,8 @@ _080DD7E8: .4byte 0x00000439
|
||||
_080DD7EC: .4byte gUnknown_3004F80
|
||||
thumb_func_end sub_80DD7B0
|
||||
|
||||
thumb_func_start sub_80DD7F0
|
||||
sub_80DD7F0: @ 80DD7F0
|
||||
thumb_func_start CompleteOnSpecialAnimDone_0
|
||||
CompleteOnSpecialAnimDone_0: @ 80DD7F0
|
||||
push {lr}
|
||||
ldr r0, _080DD820 @ =gUnknown_2024005
|
||||
ldrb r0, [r0]
|
||||
@@ -381,7 +381,7 @@ sub_80DD7F0: @ 80DD7F0
|
||||
cmp r0, 0
|
||||
bne _080DD81A
|
||||
_080DD816:
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD81A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -389,7 +389,7 @@ _080DD81A:
|
||||
_080DD820: .4byte gUnknown_2024005
|
||||
_080DD824: .4byte gUnknown_2024018
|
||||
_080DD828: .4byte gUnknown_2023BC4
|
||||
thumb_func_end sub_80DD7F0
|
||||
thumb_func_end CompleteOnSpecialAnimDone_0
|
||||
|
||||
thumb_func_start sub_80DD82C
|
||||
sub_80DD82C: @ 80DD82C
|
||||
@@ -405,7 +405,7 @@ sub_80DD82C: @ 80DD82C
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DD858 @ =sub_80DD85C
|
||||
ldr r1, _080DD858 @ =CompleteWhenChosePokeblock
|
||||
str r1, [r0]
|
||||
_080DD848:
|
||||
pop {r0}
|
||||
@@ -414,11 +414,11 @@ _080DD848:
|
||||
_080DD84C: .4byte gUnknown_2037AB8
|
||||
_080DD850: .4byte gUnknown_3004FE0
|
||||
_080DD854: .4byte gUnknown_2023BC4
|
||||
_080DD858: .4byte sub_80DD85C
|
||||
_080DD858: .4byte CompleteWhenChosePokeblock
|
||||
thumb_func_end sub_80DD82C
|
||||
|
||||
thumb_func_start sub_80DD85C
|
||||
sub_80DD85C: @ 80DD85C
|
||||
thumb_func_start CompleteWhenChosePokeblock
|
||||
CompleteWhenChosePokeblock: @ 80DD85C
|
||||
push {lr}
|
||||
ldr r0, _080DD888 @ =gUnknown_30030F0
|
||||
ldr r1, [r0, 0x4]
|
||||
@@ -434,8 +434,8 @@ sub_80DD85C: @ 80DD85C
|
||||
ldr r0, _080DD894 @ =gUnknown_203AD30
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl sub_800E8AC
|
||||
bl sub_80DD8C8
|
||||
bl EmitOneReturnValue
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD882:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -444,10 +444,10 @@ _080DD888: .4byte gUnknown_30030F0
|
||||
_080DD88C: .4byte sub_8011100
|
||||
_080DD890: .4byte gUnknown_2037AB8
|
||||
_080DD894: .4byte gUnknown_203AD30
|
||||
thumb_func_end sub_80DD85C
|
||||
thumb_func_end CompleteWhenChosePokeblock
|
||||
|
||||
thumb_func_start sub_80DD898
|
||||
sub_80DD898: @ 80DD898
|
||||
thumb_func_start CompleteOnFinishedBattleAnimation_3
|
||||
CompleteOnFinishedBattleAnimation_3: @ 80DD898
|
||||
push {lr}
|
||||
ldr r0, _080DD8C0 @ =gUnknown_2024018
|
||||
ldr r2, [r0]
|
||||
@@ -463,17 +463,17 @@ sub_80DD898: @ 80DD898
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080DD8BA
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD8BA:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD8C0: .4byte gUnknown_2024018
|
||||
_080DD8C4: .4byte gUnknown_2023BC4
|
||||
thumb_func_end sub_80DD898
|
||||
thumb_func_end CompleteOnFinishedBattleAnimation_3
|
||||
|
||||
thumb_func_start sub_80DD8C8
|
||||
sub_80DD8C8: @ 80DD8C8
|
||||
thumb_func_start SafariBufferExecCompleted
|
||||
SafariBufferExecCompleted: @ 80DD8C8
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
ldr r1, _080DD908 @ =gUnknown_3004FE0
|
||||
@@ -481,7 +481,7 @@ sub_80DD8C8: @ 80DD8C8
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DD910 @ =sub_80DD554
|
||||
ldr r1, _080DD910 @ =SafariBufferRunCommand
|
||||
str r1, [r0]
|
||||
ldr r0, _080DD914 @ =gUnknown_2022B4C
|
||||
ldr r0, [r0]
|
||||
@@ -489,7 +489,7 @@ sub_80DD8C8: @ 80DD8C8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080DD91C
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
mov r1, sp
|
||||
strb r0, [r1]
|
||||
movs r0, 0x2
|
||||
@@ -506,7 +506,7 @@ sub_80DD8C8: @ 80DD8C8
|
||||
.align 2, 0
|
||||
_080DD908: .4byte gUnknown_3004FE0
|
||||
_080DD90C: .4byte gUnknown_2023BC4
|
||||
_080DD910: .4byte sub_80DD554
|
||||
_080DD910: .4byte SafariBufferRunCommand
|
||||
_080DD914: .4byte gUnknown_2022B4C
|
||||
_080DD918: .4byte gUnknown_2022BC4
|
||||
_080DD91C:
|
||||
@@ -527,10 +527,10 @@ _080DD92E:
|
||||
.align 2, 0
|
||||
_080DD938: .4byte gUnknown_2023BC8
|
||||
_080DD93C: .4byte gUnknown_825E45C
|
||||
thumb_func_end sub_80DD8C8
|
||||
thumb_func_end SafariBufferExecCompleted
|
||||
|
||||
thumb_func_start sub_80DD940
|
||||
sub_80DD940: @ 80DD940
|
||||
thumb_func_start CompleteOnFinishedStatusAnimation_3
|
||||
CompleteOnFinishedStatusAnimation_3: @ 80DD940
|
||||
push {lr}
|
||||
ldr r0, _080DD968 @ =gUnknown_2024018
|
||||
ldr r2, [r0]
|
||||
@@ -546,19 +546,19 @@ sub_80DD940: @ 80DD940
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080DD962
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DD962:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DD968: .4byte gUnknown_2024018
|
||||
_080DD96C: .4byte gUnknown_2023BC4
|
||||
thumb_func_end sub_80DD940
|
||||
thumb_func_end CompleteOnFinishedStatusAnimation_3
|
||||
|
||||
thumb_func_start sub_80DD970
|
||||
sub_80DD970: @ 80DD970
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD970
|
||||
@@ -566,7 +566,7 @@ sub_80DD970: @ 80DD970
|
||||
thumb_func_start sub_80DD97C
|
||||
sub_80DD97C: @ 80DD97C
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD97C
|
||||
@@ -574,7 +574,7 @@ sub_80DD97C: @ 80DD97C
|
||||
thumb_func_start sub_80DD988
|
||||
sub_80DD988: @ 80DD988
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD988
|
||||
@@ -582,7 +582,7 @@ sub_80DD988: @ 80DD988
|
||||
thumb_func_start sub_80DD994
|
||||
sub_80DD994: @ 80DD994
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD994
|
||||
@@ -590,7 +590,7 @@ sub_80DD994: @ 80DD994
|
||||
thumb_func_start sub_80DD9A0
|
||||
sub_80DD9A0: @ 80DD9A0
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD9A0
|
||||
@@ -598,7 +598,7 @@ sub_80DD9A0: @ 80DD9A0
|
||||
thumb_func_start sub_80DD9AC
|
||||
sub_80DD9AC: @ 80DD9AC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD9AC
|
||||
@@ -606,13 +606,13 @@ sub_80DD9AC: @ 80DD9AC
|
||||
thumb_func_start sub_80DD9B8
|
||||
sub_80DD9B8: @ 80DD9B8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DD9B8
|
||||
|
||||
thumb_func_start sub_80DD9C4
|
||||
sub_80DD9C4: @ 80DD9C4
|
||||
thumb_func_start SafariHandleDrawTrainerPic
|
||||
SafariHandleDrawTrainerPic: @ 80DD9C4
|
||||
push {r4-r6,lr}
|
||||
ldr r4, _080DDA7C @ =gUnknown_300500C
|
||||
ldr r0, [r4]
|
||||
@@ -623,7 +623,7 @@ sub_80DD9C4: @ 80DD9C4
|
||||
ldr r0, [r4]
|
||||
ldrb r6, [r0, 0x8]
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
@@ -645,7 +645,7 @@ sub_80DD9C4: @ 80DD9C4
|
||||
asrs r2, 16
|
||||
movs r1, 0x50
|
||||
movs r3, 0x1E
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r6, _080DDA8C @ =gUnknown_2023D44
|
||||
ldrb r1, [r5]
|
||||
adds r1, r6
|
||||
@@ -712,12 +712,12 @@ _080DDA94: .4byte 0x0000fffe
|
||||
_080DDA98: .4byte sub_8033EEC
|
||||
_080DDA9C: .4byte gUnknown_3004FE0
|
||||
_080DDAA0: .4byte sub_80DD728
|
||||
thumb_func_end sub_80DD9C4
|
||||
thumb_func_end SafariHandleDrawTrainerPic
|
||||
|
||||
thumb_func_start sub_80DDAA4
|
||||
sub_80DDAA4: @ 80DDAA4
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDAA4
|
||||
@@ -725,7 +725,7 @@ sub_80DDAA4: @ 80DDAA4
|
||||
thumb_func_start sub_80DDAB0
|
||||
sub_80DDAB0: @ 80DDAB0
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDAB0
|
||||
@@ -733,7 +733,7 @@ sub_80DDAB0: @ 80DDAB0
|
||||
thumb_func_start sub_80DDABC
|
||||
sub_80DDABC: @ 80DDABC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDABC
|
||||
@@ -741,7 +741,7 @@ sub_80DDABC: @ 80DDABC
|
||||
thumb_func_start sub_80DDAC8
|
||||
sub_80DDAC8: @ 80DDAC8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDAC8
|
||||
@@ -760,19 +760,19 @@ sub_80DDAD4: @ 80DDAD4
|
||||
ldr r5, _080DDB1C @ =gUnknown_2023BC4
|
||||
ldrb r4, [r5]
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
adds r2, r0, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
adds r0, r4, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x4
|
||||
bl sub_80341D8
|
||||
bl InitAndLaunchSpecialAnimation
|
||||
ldr r1, _080DDB20 @ =gUnknown_3004FE0
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DDB24 @ =sub_80DD7F0
|
||||
ldr r1, _080DDB24 @ =CompleteOnSpecialAnimDone_0
|
||||
str r1, [r0]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -782,7 +782,7 @@ _080DDB14: .4byte gUnknown_2024018
|
||||
_080DDB18: .4byte gUnknown_2024005
|
||||
_080DDB1C: .4byte gUnknown_2023BC4
|
||||
_080DDB20: .4byte gUnknown_3004FE0
|
||||
_080DDB24: .4byte sub_80DD7F0
|
||||
_080DDB24: .4byte CompleteOnSpecialAnimDone_0
|
||||
thumb_func_end sub_80DDAD4
|
||||
|
||||
thumb_func_start sub_80DDB28
|
||||
@@ -804,19 +804,19 @@ sub_80DDB28: @ 80DDB28
|
||||
strb r0, [r1]
|
||||
ldrb r4, [r5]
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
adds r2, r0, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
adds r0, r4, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x4
|
||||
bl sub_80341D8
|
||||
bl InitAndLaunchSpecialAnimation
|
||||
ldr r1, _080DDB80 @ =gUnknown_3004FE0
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DDB84 @ =sub_80DD7F0
|
||||
ldr r1, _080DDB84 @ =CompleteOnSpecialAnimDone_0
|
||||
str r1, [r0]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -827,13 +827,13 @@ _080DDB74: .4byte gUnknown_2023BC4
|
||||
_080DDB78: .4byte gUnknown_2024018
|
||||
_080DDB7C: .4byte gUnknown_2024005
|
||||
_080DDB80: .4byte gUnknown_3004FE0
|
||||
_080DDB84: .4byte sub_80DD7F0
|
||||
_080DDB84: .4byte CompleteOnSpecialAnimDone_0
|
||||
thumb_func_end sub_80DDB28
|
||||
|
||||
thumb_func_start sub_80DDB88
|
||||
sub_80DDB88: @ 80DDB88
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDB88
|
||||
@@ -841,7 +841,7 @@ sub_80DDB88: @ 80DDB88
|
||||
thumb_func_start sub_80DDB94
|
||||
sub_80DDB94: @ 80DDB94
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDB94
|
||||
@@ -886,7 +886,7 @@ _080DDBF0:
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DDC10 @ =sub_80DD760
|
||||
ldr r1, _080DDC10 @ =CompleteOnInactiveTextPrinter_3
|
||||
str r1, [r0]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -895,7 +895,7 @@ _080DDBF0:
|
||||
_080DDC04: .4byte gUnknown_202298C
|
||||
_080DDC08: .4byte gUnknown_3004FE0
|
||||
_080DDC0C: .4byte gUnknown_2023BC4
|
||||
_080DDC10: .4byte sub_80DD760
|
||||
_080DDC10: .4byte CompleteOnInactiveTextPrinter_3
|
||||
thumb_func_end sub_80DDBA0
|
||||
|
||||
thumb_func_start sub_80DDC14
|
||||
@@ -903,7 +903,7 @@ sub_80DDC14: @ 80DDC14
|
||||
push {lr}
|
||||
ldr r0, _080DDC2C @ =gUnknown_2023BC4
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DDC30
|
||||
@@ -912,7 +912,7 @@ sub_80DDC14: @ 80DDC14
|
||||
.align 2, 0
|
||||
_080DDC2C: .4byte gUnknown_2023BC4
|
||||
_080DDC30:
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
_080DDC34:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -921,7 +921,7 @@ _080DDC34:
|
||||
thumb_func_start sub_80DDC38
|
||||
sub_80DDC38: @ 80DDC38
|
||||
push {lr}
|
||||
bl sub_8001960
|
||||
bl IsDma3ManagerBusyWithBgCopy
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -936,7 +936,7 @@ sub_80DDC38: @ 80DDC38
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, _080DDC74 @ =sub_80DD5A4
|
||||
ldr r1, _080DDC74 @ =HandleInputChooseAction_0
|
||||
str r1, [r0]
|
||||
_080DDC5E:
|
||||
pop {r0}
|
||||
@@ -946,7 +946,7 @@ _080DDC64: .4byte gUnknown_2022974
|
||||
_080DDC68: .4byte gUnknown_2022976
|
||||
_080DDC6C: .4byte gUnknown_3004FE0
|
||||
_080DDC70: .4byte gUnknown_2023BC4
|
||||
_080DDC74: .4byte sub_80DD5A4
|
||||
_080DDC74: .4byte HandleInputChooseAction_0
|
||||
thumb_func_end sub_80DDC38
|
||||
|
||||
thumb_func_start sub_80DDC78
|
||||
@@ -1002,7 +1002,7 @@ _080DDCE8: .4byte gUnknown_202298C
|
||||
thumb_func_start sub_80DDCEC
|
||||
sub_80DDCEC: @ 80DDCEC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDCEC
|
||||
@@ -1010,7 +1010,7 @@ sub_80DDCEC: @ 80DDCEC
|
||||
thumb_func_start sub_80DDCF8
|
||||
sub_80DDCF8: @ 80DDCF8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDCF8
|
||||
@@ -1025,7 +1025,7 @@ sub_80DDD04: @ 80DDD04
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, _080DDD34 @ =gUnknown_3004FE0
|
||||
ldr r2, _080DDD38 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r2]
|
||||
@@ -1049,7 +1049,7 @@ _080DDD40: .4byte gUnknown_2024004
|
||||
thumb_func_start sub_80DDD44
|
||||
sub_80DDD44: @ 80DDD44
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDD44
|
||||
@@ -1057,7 +1057,7 @@ sub_80DDD44: @ 80DDD44
|
||||
thumb_func_start sub_80DDD50
|
||||
sub_80DDD50: @ 80DDD50
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDD50
|
||||
@@ -1065,7 +1065,7 @@ sub_80DDD50: @ 80DDD50
|
||||
thumb_func_start sub_80DDD5C
|
||||
sub_80DDD5C: @ 80DDD5C
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDD5C
|
||||
@@ -1073,7 +1073,7 @@ sub_80DDD5C: @ 80DDD5C
|
||||
thumb_func_start sub_80DDD68
|
||||
sub_80DDD68: @ 80DDD68
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDD68
|
||||
@@ -1095,8 +1095,8 @@ sub_80DDD74: @ 80DDD74
|
||||
ldr r2, _080DDDAC @ =gUnknown_2024284
|
||||
adds r1, r2
|
||||
movs r2, 0xB
|
||||
bl sub_8049D98
|
||||
bl sub_80DD8C8
|
||||
bl UpdateHealthboxAttribute
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1109,7 +1109,7 @@ _080DDDAC: .4byte gUnknown_2024284
|
||||
thumb_func_start sub_80DDDB0
|
||||
sub_80DDDB0: @ 80DDDB0
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDB0
|
||||
@@ -1117,7 +1117,7 @@ sub_80DDDB0: @ 80DDDB0
|
||||
thumb_func_start sub_80DDDBC
|
||||
sub_80DDDBC: @ 80DDDBC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDBC
|
||||
@@ -1125,7 +1125,7 @@ sub_80DDDBC: @ 80DDDBC
|
||||
thumb_func_start sub_80DDDC8
|
||||
sub_80DDDC8: @ 80DDDC8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDC8
|
||||
@@ -1133,7 +1133,7 @@ sub_80DDDC8: @ 80DDDC8
|
||||
thumb_func_start sub_80DDDD4
|
||||
sub_80DDDD4: @ 80DDDD4
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDD4
|
||||
@@ -1141,7 +1141,7 @@ sub_80DDDD4: @ 80DDDD4
|
||||
thumb_func_start sub_80DDDE0
|
||||
sub_80DDDE0: @ 80DDDE0
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDE0
|
||||
@@ -1149,7 +1149,7 @@ sub_80DDDE0: @ 80DDDE0
|
||||
thumb_func_start sub_80DDDEC
|
||||
sub_80DDDEC: @ 80DDDEC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDEC
|
||||
@@ -1157,7 +1157,7 @@ sub_80DDDEC: @ 80DDDEC
|
||||
thumb_func_start sub_80DDDF8
|
||||
sub_80DDDF8: @ 80DDDF8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDDF8
|
||||
@@ -1165,7 +1165,7 @@ sub_80DDDF8: @ 80DDDF8
|
||||
thumb_func_start sub_80DDE04
|
||||
sub_80DDE04: @ 80DDE04
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE04
|
||||
@@ -1173,7 +1173,7 @@ sub_80DDE04: @ 80DDE04
|
||||
thumb_func_start sub_80DDE10
|
||||
sub_80DDE10: @ 80DDE10
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE10
|
||||
@@ -1181,7 +1181,7 @@ sub_80DDE10: @ 80DDE10
|
||||
thumb_func_start sub_80DDE1C
|
||||
sub_80DDE1C: @ 80DDE1C
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE1C
|
||||
@@ -1189,7 +1189,7 @@ sub_80DDE1C: @ 80DDE1C
|
||||
thumb_func_start sub_80DDE28
|
||||
sub_80DDE28: @ 80DDE28
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE28
|
||||
@@ -1197,7 +1197,7 @@ sub_80DDE28: @ 80DDE28
|
||||
thumb_func_start sub_80DDE34
|
||||
sub_80DDE34: @ 80DDE34
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE34
|
||||
@@ -1205,7 +1205,7 @@ sub_80DDE34: @ 80DDE34
|
||||
thumb_func_start sub_80DDE40
|
||||
sub_80DDE40: @ 80DDE40
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE40
|
||||
@@ -1213,7 +1213,7 @@ sub_80DDE40: @ 80DDE40
|
||||
thumb_func_start sub_80DDE4C
|
||||
sub_80DDE4C: @ 80DDE4C
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE4C
|
||||
@@ -1221,7 +1221,7 @@ sub_80DDE4C: @ 80DDE4C
|
||||
thumb_func_start sub_80DDE58
|
||||
sub_80DDE58: @ 80DDE58
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE58
|
||||
@@ -1229,7 +1229,7 @@ sub_80DDE58: @ 80DDE58
|
||||
thumb_func_start sub_80DDE64
|
||||
sub_80DDE64: @ 80DDE64
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDE64
|
||||
@@ -1239,7 +1239,7 @@ sub_80DDE70: @ 80DDE70
|
||||
push {r4,lr}
|
||||
ldr r4, _080DDEAC @ =gUnknown_2023BC4
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
movs r3, 0x3F
|
||||
cmp r0, 0
|
||||
@@ -1259,8 +1259,8 @@ _080DDE84:
|
||||
orrs r0, r1
|
||||
lsls r1, r3, 24
|
||||
asrs r1, 24
|
||||
bl sub_80722F4
|
||||
bl sub_80DD8C8
|
||||
bl PlaySE12WithPanning
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1284,8 +1284,8 @@ sub_80DDEB4: @ 80DDEB4
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 8
|
||||
orrs r0, r1
|
||||
bl sub_8071C60
|
||||
bl sub_80DD8C8
|
||||
bl PlayFanfare
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1293,8 +1293,8 @@ _080DDEDC: .4byte gUnknown_2022BC4
|
||||
_080DDEE0: .4byte gUnknown_2023BC4
|
||||
thumb_func_end sub_80DDEB4
|
||||
|
||||
thumb_func_start sub_80DDEE4
|
||||
sub_80DDEE4: @ 80DDEE4
|
||||
thumb_func_start SafariHandleFaintingCry
|
||||
SafariHandleFaintingCry: @ 80DDEE4
|
||||
push {lr}
|
||||
ldr r1, _080DDF14 @ =gUnknown_2023BCE
|
||||
ldr r0, _080DDF18 @ =gUnknown_2023BC4
|
||||
@@ -1307,22 +1307,22 @@ sub_80DDEE4: @ 80DDEE4
|
||||
ldr r1, _080DDF1C @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x19
|
||||
bl sub_8071DF0
|
||||
bl sub_80DD8C8
|
||||
bl PlayCry1
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DDF14: .4byte gUnknown_2023BCE
|
||||
_080DDF18: .4byte gUnknown_2023BC4
|
||||
_080DDF1C: .4byte gUnknown_2024284
|
||||
thumb_func_end sub_80DDEE4
|
||||
thumb_func_end SafariHandleFaintingCry
|
||||
|
||||
thumb_func_start sub_80DDF20
|
||||
sub_80DDF20: @ 80DDF20
|
||||
thumb_func_start SafariHandleIntroSlide
|
||||
SafariHandleIntroSlide: @ 80DDF20
|
||||
push {lr}
|
||||
ldr r1, _080DDF48 @ =gUnknown_2022BC4
|
||||
ldr r0, _080DDF4C @ =gUnknown_2023BC4
|
||||
@@ -1337,17 +1337,17 @@ sub_80DDF20: @ 80DDF20
|
||||
movs r1, 0x1
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DDF48: .4byte gUnknown_2022BC4
|
||||
_080DDF4C: .4byte gUnknown_2023BC4
|
||||
_080DDF50: .4byte gUnknown_2023F4C
|
||||
thumb_func_end sub_80DDF20
|
||||
thumb_func_end SafariHandleIntroSlide
|
||||
|
||||
thumb_func_start sub_80DDF54
|
||||
sub_80DDF54: @ 80DDF54
|
||||
thumb_func_start SafariHandleIntroTrainerBallThrow
|
||||
SafariHandleIntroTrainerBallThrow: @ 80DDF54
|
||||
push {r4,r5,lr}
|
||||
ldr r5, _080DDF98 @ =gUnknown_3004FF0
|
||||
ldr r4, _080DDF9C @ =gUnknown_2023BC4
|
||||
@@ -1363,13 +1363,13 @@ sub_80DDF54: @ 80DDF54
|
||||
ldr r2, _080DDFA4 @ =gUnknown_2024284
|
||||
adds r1, r2
|
||||
movs r2, 0xA
|
||||
bl sub_8049D98
|
||||
bl UpdateHealthboxAttribute
|
||||
ldrb r0, [r4]
|
||||
bl sub_804BD94
|
||||
ldrb r0, [r4]
|
||||
adds r0, r5
|
||||
ldrb r0, [r0]
|
||||
bl sub_80481D4
|
||||
bl SetHealthboxSpriteVisible
|
||||
ldr r1, _080DDFA8 @ =gUnknown_3004FE0
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
@@ -1386,12 +1386,12 @@ _080DDFA0: .4byte gUnknown_2023BCE
|
||||
_080DDFA4: .4byte gUnknown_2024284
|
||||
_080DDFA8: .4byte gUnknown_3004FE0
|
||||
_080DDFAC: .4byte sub_80DD778
|
||||
thumb_func_end sub_80DDF54
|
||||
thumb_func_end SafariHandleIntroTrainerBallThrow
|
||||
|
||||
thumb_func_start sub_80DDFB0
|
||||
sub_80DDFB0: @ 80DDFB0
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDFB0
|
||||
@@ -1399,7 +1399,7 @@ sub_80DDFB0: @ 80DDFB0
|
||||
thumb_func_start sub_80DDFBC
|
||||
sub_80DDFBC: @ 80DDFBC
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDFBC
|
||||
@@ -1407,7 +1407,7 @@ sub_80DDFBC: @ 80DDFBC
|
||||
thumb_func_start sub_80DDFC8
|
||||
sub_80DDFC8: @ 80DDFC8
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDFC8
|
||||
@@ -1415,13 +1415,13 @@ sub_80DDFC8: @ 80DDFC8
|
||||
thumb_func_start sub_80DDFD4
|
||||
sub_80DDFD4: @ 80DDFD4
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DDFD4
|
||||
|
||||
thumb_func_start sub_80DDFE0
|
||||
sub_80DDFE0: @ 80DDFE0
|
||||
thumb_func_start SafariHandleBattleAnimation
|
||||
SafariHandleBattleAnimation: @ 80DDFE0
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
ldr r5, _080DE018 @ =gUnknown_2022BC4
|
||||
@@ -1442,11 +1442,11 @@ sub_80DDFE0: @ 80DDFE0
|
||||
str r4, [sp]
|
||||
adds r0, r2, 0
|
||||
adds r1, r2, 0
|
||||
bl sub_803401C
|
||||
bl TryHandleLaunchBattleTableAnimation
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DE020
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
b _080DE02C
|
||||
.align 2, 0
|
||||
_080DE018: .4byte gUnknown_2022BC4
|
||||
@@ -1456,7 +1456,7 @@ _080DE020:
|
||||
ldrb r1, [r6]
|
||||
lsls r1, 2
|
||||
adds r1, r0
|
||||
ldr r0, _080DE038 @ =sub_80DD898
|
||||
ldr r0, _080DE038 @ =CompleteOnFinishedBattleAnimation_3
|
||||
str r0, [r1]
|
||||
_080DE02C:
|
||||
add sp, 0x4
|
||||
@@ -1465,13 +1465,13 @@ _080DE02C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080DE034: .4byte gUnknown_3004FE0
|
||||
_080DE038: .4byte sub_80DD898
|
||||
thumb_func_end sub_80DDFE0
|
||||
_080DE038: .4byte CompleteOnFinishedBattleAnimation_3
|
||||
thumb_func_end SafariHandleBattleAnimation
|
||||
|
||||
thumb_func_start sub_80DE03C
|
||||
sub_80DE03C: @ 80DE03C
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DE03C
|
||||
@@ -1479,13 +1479,13 @@ sub_80DE03C: @ 80DE03C
|
||||
thumb_func_start sub_80DE048
|
||||
sub_80DE048: @ 80DE048
|
||||
push {lr}
|
||||
bl sub_80DD8C8
|
||||
bl SafariBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80DE048
|
||||
|
||||
thumb_func_start sub_80DE054
|
||||
sub_80DE054: @ 80DE054
|
||||
thumb_func_start SafariHandleCmd55
|
||||
SafariHandleCmd55: @ 80DE054
|
||||
push {r4,lr}
|
||||
ldr r2, _080DE098 @ =gUnknown_2023E8A
|
||||
ldr r1, _080DE09C @ =gUnknown_2022BC4
|
||||
@@ -1497,10 +1497,10 @@ sub_80DE054: @ 80DE054
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r2]
|
||||
movs r0, 0x5
|
||||
bl sub_8071AB4
|
||||
bl FadeOutMapMusic
|
||||
movs r0, 0x3
|
||||
bl sub_8070E44
|
||||
bl sub_80DD8C8
|
||||
bl BeginFastPaletteFade
|
||||
bl SafariBufferExecCompleted
|
||||
ldr r0, _080DE0A4 @ =gUnknown_2022B4C
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x6
|
||||
@@ -1524,7 +1524,7 @@ _080DE0A0: .4byte gUnknown_2023BC4
|
||||
_080DE0A4: .4byte gUnknown_2022B4C
|
||||
_080DE0A8: .4byte gUnknown_3004FE0
|
||||
_080DE0AC: .4byte sub_80DD7B0
|
||||
thumb_func_end sub_80DE054
|
||||
thumb_func_end SafariHandleCmd55
|
||||
|
||||
thumb_func_start nullsub_80
|
||||
nullsub_80: @ 80DE0B0
|
||||
|
||||
+175
-175
@@ -28,7 +28,7 @@ _0800D24A:
|
||||
_0800D256:
|
||||
ldr r0, _0800D274 @ =sub_8081A90
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
bl sub_800D93C
|
||||
_0800D262:
|
||||
pop {r0}
|
||||
@@ -415,7 +415,7 @@ _0800D598: .4byte gUnknown_2023BD6
|
||||
_0800D59C: .4byte sub_803A668
|
||||
_0800D5A0: .4byte gUnknown_2023BCC
|
||||
_0800D5A4:
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, [r4]
|
||||
@@ -707,24 +707,24 @@ _0800D7C2:
|
||||
adds r4, r7, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2D
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _0800D888
|
||||
ldr r0, _0800D804 @ =gUnknown_2023BCE
|
||||
@@ -745,7 +745,7 @@ _0800D808:
|
||||
adds r4, r7, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
@@ -758,25 +758,25 @@ _0800D830:
|
||||
adds r4, r7, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
_0800D844:
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0xCE
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
beq _0800D888
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2D
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _0800D888
|
||||
ldr r1, _0800D884 @ =gUnknown_2023BCE
|
||||
@@ -898,7 +898,7 @@ sub_800D93C: @ 800D93C
|
||||
push {r4-r6,lr}
|
||||
ldr r0, _0800D9D4 @ =sub_800DB6C
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r2, _0800D9D8 @ =gUnknown_202286C
|
||||
strb r0, [r2]
|
||||
ldr r5, _0800D9DC @ =gUnknown_3005090
|
||||
@@ -934,9 +934,9 @@ sub_800D93C: @ 800D93C
|
||||
lsls r0, 3
|
||||
adds r0, r5
|
||||
strh r4, [r0, 0x26]
|
||||
ldr r0, _0800D9E0 @ =sub_800DE4C
|
||||
ldr r0, _0800D9E0 @ =Task_HandleCopyReceivedLinkBuffersData
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r2, _0800D9E4 @ =gUnknown_202286D
|
||||
strb r0, [r2]
|
||||
ldrb r1, [r2]
|
||||
@@ -972,7 +972,7 @@ sub_800D93C: @ 800D93C
|
||||
_0800D9D4: .4byte sub_800DB6C
|
||||
_0800D9D8: .4byte gUnknown_202286C
|
||||
_0800D9DC: .4byte gUnknown_3005090
|
||||
_0800D9E0: .4byte sub_800DE4C
|
||||
_0800D9E0: .4byte Task_HandleCopyReceivedLinkBuffersData
|
||||
_0800D9E4: .4byte gUnknown_202286D
|
||||
_0800D9E8: .4byte gUnknown_202286E
|
||||
thumb_func_end sub_800D93C
|
||||
@@ -1325,7 +1325,7 @@ _0800DC80:
|
||||
adds r0, 0x8
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
bl sub_800A42C
|
||||
bl bitmask_all_link_players_but_self
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x26
|
||||
@@ -1333,7 +1333,7 @@ _0800DC80:
|
||||
ldr r1, [r5]
|
||||
adds r1, r2
|
||||
adds r2, r6, 0
|
||||
bl sub_800A448
|
||||
bl SendBlock
|
||||
ldrh r0, [r4, 0x1E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x1E]
|
||||
@@ -1430,7 +1430,7 @@ _0800DD64: .4byte gUnknown_202273C
|
||||
_0800DD68: .4byte 0x00002211
|
||||
_0800DD6C: .4byte gUnknown_2022118
|
||||
_0800DD70:
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0800DE38 @ =gUnknown_825E45C
|
||||
@@ -1443,7 +1443,7 @@ _0800DD70:
|
||||
cmp r0, 0
|
||||
beq _0800DE16
|
||||
adds r0, r4, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
lsls r0, r4, 8
|
||||
mov r4, r10
|
||||
adds r3, r0, r4
|
||||
@@ -1540,8 +1540,8 @@ _0800DE44: .4byte gUnknown_202286D
|
||||
_0800DE48: .4byte gUnknown_2023FF0
|
||||
thumb_func_end sub_800DD28
|
||||
|
||||
thumb_func_start sub_800DE4C
|
||||
sub_800DE4C: @ 800DE4C
|
||||
thumb_func_start Task_HandleCopyReceivedLinkBuffersData
|
||||
Task_HandleCopyReceivedLinkBuffersData: @ 800DE4C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -1707,10 +1707,10 @@ _0800DF8C:
|
||||
_0800DF98: .4byte gUnknown_2023BC8
|
||||
_0800DF9C: .4byte gUnknown_825E45C
|
||||
_0800DFA0: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_800DE4C
|
||||
thumb_func_end Task_HandleCopyReceivedLinkBuffersData
|
||||
|
||||
thumb_func_start sub_800DFA4
|
||||
sub_800DFA4: @ 800DFA4
|
||||
thumb_func_start EmitGetMonData
|
||||
EmitGetMonData: @ 800DFA4
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -1728,10 +1728,10 @@ sub_800DFA4: @ 800DFA4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800DFC4: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800DFA4
|
||||
thumb_func_end EmitGetMonData
|
||||
|
||||
thumb_func_start sub_800DFC8
|
||||
sub_800DFC8: @ 800DFC8
|
||||
thumb_func_start EmitGetRawMonData
|
||||
EmitGetRawMonData: @ 800DFC8
|
||||
push {r4,r5,lr}
|
||||
adds r5, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -1750,10 +1750,10 @@ sub_800DFC8: @ 800DFC8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800DFEC: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800DFC8
|
||||
thumb_func_end EmitGetRawMonData
|
||||
|
||||
thumb_func_start sub_800DFF0
|
||||
sub_800DFF0: @ 800DFF0
|
||||
thumb_func_start EmitSetMonData
|
||||
EmitSetMonData: @ 800DFF0
|
||||
push {r4-r6,lr}
|
||||
ldr r4, [sp, 0x10]
|
||||
lsls r0, 24
|
||||
@@ -1787,10 +1787,10 @@ _0800E01E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E02C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800DFF0
|
||||
thumb_func_end EmitSetMonData
|
||||
|
||||
thumb_func_start sub_800E030
|
||||
sub_800E030: @ 800E030
|
||||
thumb_func_start EmitSetRawMonData
|
||||
EmitSetRawMonData: @ 800E030
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -1824,10 +1824,10 @@ _0800E05C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E06C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E030
|
||||
thumb_func_end EmitSetRawMonData
|
||||
|
||||
thumb_func_start sub_800E070
|
||||
sub_800E070: @ 800E070
|
||||
thumb_func_start EmitLoadMonSprite
|
||||
EmitLoadMonSprite: @ 800E070
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1842,10 +1842,10 @@ sub_800E070: @ 800E070
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E08C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E070
|
||||
thumb_func_end EmitLoadMonSprite
|
||||
|
||||
thumb_func_start sub_800E090
|
||||
sub_800E090: @ 800E090
|
||||
thumb_func_start EmitSwitchInAnim
|
||||
EmitSwitchInAnim: @ 800E090
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -1863,10 +1863,10 @@ sub_800E090: @ 800E090
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E0B0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E090
|
||||
thumb_func_end EmitSwitchInAnim
|
||||
|
||||
thumb_func_start sub_800E0B4
|
||||
sub_800E0B4: @ 800E0B4
|
||||
thumb_func_start EmitReturnMonToBall
|
||||
EmitReturnMonToBall: @ 800E0B4
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -1881,10 +1881,10 @@ sub_800E0B4: @ 800E0B4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E0D0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E0B4
|
||||
thumb_func_end EmitReturnMonToBall
|
||||
|
||||
thumb_func_start sub_800E0D4
|
||||
sub_800E0D4: @ 800E0D4
|
||||
thumb_func_start EmitDrawTrainerPic
|
||||
EmitDrawTrainerPic: @ 800E0D4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1900,10 +1900,10 @@ sub_800E0D4: @ 800E0D4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E0F0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E0D4
|
||||
thumb_func_end EmitDrawTrainerPic
|
||||
|
||||
thumb_func_start sub_800E0F4
|
||||
sub_800E0F4: @ 800E0F4
|
||||
thumb_func_start EmitTrainerSlide
|
||||
EmitTrainerSlide: @ 800E0F4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1919,10 +1919,10 @@ sub_800E0F4: @ 800E0F4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E110: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E0F4
|
||||
thumb_func_end EmitTrainerSlide
|
||||
|
||||
thumb_func_start sub_800E114
|
||||
sub_800E114: @ 800E114
|
||||
thumb_func_start EmitTrainerSlideBack
|
||||
EmitTrainerSlideBack: @ 800E114
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1938,10 +1938,10 @@ sub_800E114: @ 800E114
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E130: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E114
|
||||
thumb_func_end EmitTrainerSlideBack
|
||||
|
||||
thumb_func_start sub_800E134
|
||||
sub_800E134: @ 800E134
|
||||
thumb_func_start EmitFaintAnimation
|
||||
EmitFaintAnimation: @ 800E134
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1957,10 +1957,10 @@ sub_800E134: @ 800E134
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E150: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E134
|
||||
thumb_func_end EmitFaintAnimation
|
||||
|
||||
thumb_func_start sub_800E154
|
||||
sub_800E154: @ 800E154
|
||||
thumb_func_start EmitPaletteFade
|
||||
EmitPaletteFade: @ 800E154
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1976,10 +1976,10 @@ sub_800E154: @ 800E154
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E170: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E154
|
||||
thumb_func_end EmitPaletteFade
|
||||
|
||||
thumb_func_start sub_800E174
|
||||
sub_800E174: @ 800E174
|
||||
thumb_func_start EmitSuccessBallThrowAnim
|
||||
EmitSuccessBallThrowAnim: @ 800E174
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1995,10 +1995,10 @@ sub_800E174: @ 800E174
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E190: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E174
|
||||
thumb_func_end EmitSuccessBallThrowAnim
|
||||
|
||||
thumb_func_start sub_800E194
|
||||
sub_800E194: @ 800E194
|
||||
thumb_func_start EmitBallThrowAnim
|
||||
EmitBallThrowAnim: @ 800E194
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2013,10 +2013,10 @@ sub_800E194: @ 800E194
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E1B0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E194
|
||||
thumb_func_end EmitBallThrowAnim
|
||||
|
||||
thumb_func_start sub_800E1B4
|
||||
sub_800E1B4: @ 800E1B4
|
||||
thumb_func_start EmitPause
|
||||
EmitPause: @ 800E1B4
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -2053,10 +2053,10 @@ _0800E1E2:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E1F8: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E1B4
|
||||
thumb_func_end EmitPause
|
||||
|
||||
thumb_func_start sub_800E1FC
|
||||
sub_800E1FC: @ 800E1FC
|
||||
thumb_func_start EmitMoveAnimation
|
||||
EmitMoveAnimation: @ 800E1FC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -2159,10 +2159,10 @@ _0800E2A6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E2D0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E1FC
|
||||
thumb_func_end EmitMoveAnimation
|
||||
|
||||
thumb_func_start sub_800E2D4
|
||||
sub_800E2D4: @ 800E2D4
|
||||
thumb_func_start EmitPrintString
|
||||
EmitPrintString: @ 800E2D4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -2290,10 +2290,10 @@ _0800E3DC: .4byte gUnknown_2022AD8
|
||||
_0800E3E0: .4byte gUnknown_2023BE4
|
||||
_0800E3E4: .4byte gUnknown_2022AC8
|
||||
_0800E3E8: .4byte gUnknown_2022AB8
|
||||
thumb_func_end sub_800E2D4
|
||||
thumb_func_end EmitPrintString
|
||||
|
||||
thumb_func_start sub_800E3EC
|
||||
sub_800E3EC: @ 800E3EC
|
||||
thumb_func_start EmitPrintSelectionString
|
||||
EmitPrintSelectionString: @ 800E3EC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -2400,10 +2400,10 @@ _0800E4C4: .4byte gUnknown_2022AD8
|
||||
_0800E4C8: .4byte gUnknown_2023BE4
|
||||
_0800E4CC: .4byte gUnknown_2022AC8
|
||||
_0800E4D0: .4byte gUnknown_2022AB8
|
||||
thumb_func_end sub_800E3EC
|
||||
thumb_func_end EmitPrintSelectionString
|
||||
|
||||
thumb_func_start sub_800E4D4
|
||||
sub_800E4D4: @ 800E4D4
|
||||
thumb_func_start EmitChooseAction
|
||||
EmitChooseAction: @ 800E4D4
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2424,7 +2424,7 @@ sub_800E4D4: @ 800E4D4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E4FC: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E4D4
|
||||
thumb_func_end EmitChooseAction
|
||||
|
||||
thumb_func_start sub_800E500
|
||||
sub_800E500: @ 800E500
|
||||
@@ -2444,8 +2444,8 @@ sub_800E500: @ 800E500
|
||||
_0800E51C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E500
|
||||
|
||||
thumb_func_start sub_800E520
|
||||
sub_800E520: @ 800E520
|
||||
thumb_func_start EmitChooseMove
|
||||
EmitChooseMove: @ 800E520
|
||||
push {r4-r6,lr}
|
||||
adds r5, r3, 0
|
||||
lsls r0, 24
|
||||
@@ -2476,10 +2476,10 @@ _0800E53C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E558: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E520
|
||||
thumb_func_end EmitChooseMove
|
||||
|
||||
thumb_func_start sub_800E55C
|
||||
sub_800E55C: @ 800E55C
|
||||
thumb_func_start EmitChooseItem
|
||||
EmitChooseItem: @ 800E55C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2505,10 +2505,10 @@ _0800E56E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E58C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E55C
|
||||
thumb_func_end EmitChooseItem
|
||||
|
||||
thumb_func_start sub_800E590
|
||||
sub_800E590: @ 800E590
|
||||
thumb_func_start EmitChoosePokemon
|
||||
EmitChoosePokemon: @ 800E590
|
||||
push {r4-r6,lr}
|
||||
ldr r6, [sp, 0x10]
|
||||
lsls r0, 24
|
||||
@@ -2538,10 +2538,10 @@ _0800E5AA:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E5C8: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E590
|
||||
thumb_func_end EmitChoosePokemon
|
||||
|
||||
thumb_func_start sub_800E5CC
|
||||
sub_800E5CC: @ 800E5CC
|
||||
thumb_func_start EmitCmd23
|
||||
EmitCmd23: @ 800E5CC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2557,10 +2557,10 @@ sub_800E5CC: @ 800E5CC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E5E8: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E5CC
|
||||
thumb_func_end EmitCmd23
|
||||
|
||||
thumb_func_start sub_800E5EC
|
||||
sub_800E5EC: @ 800E5EC
|
||||
thumb_func_start EmitHealthBarUpdate
|
||||
EmitHealthBarUpdate: @ 800E5EC
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2587,10 +2587,10 @@ sub_800E5EC: @ 800E5EC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E620: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E5EC
|
||||
thumb_func_end EmitHealthBarUpdate
|
||||
|
||||
thumb_func_start sub_800E624
|
||||
sub_800E624: @ 800E624
|
||||
thumb_func_start EmitExpUpdate
|
||||
EmitExpUpdate: @ 800E624
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2616,10 +2616,10 @@ sub_800E624: @ 800E624
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E654: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E624
|
||||
thumb_func_end EmitExpUpdate
|
||||
|
||||
thumb_func_start sub_800E658
|
||||
sub_800E658: @ 800E658
|
||||
thumb_func_start EmitStatusIconUpdate
|
||||
EmitStatusIconUpdate: @ 800E658
|
||||
push {r4-r6,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2660,10 +2660,10 @@ sub_800E658: @ 800E658
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E6A8: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E658
|
||||
thumb_func_end EmitStatusIconUpdate
|
||||
|
||||
thumb_func_start sub_800E6AC
|
||||
sub_800E6AC: @ 800E6AC
|
||||
thumb_func_start EmitStatusAnimation
|
||||
EmitStatusAnimation: @ 800E6AC
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2692,10 +2692,10 @@ sub_800E6AC: @ 800E6AC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E6E4: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E6AC
|
||||
thumb_func_end EmitStatusAnimation
|
||||
|
||||
thumb_func_start sub_800E6E8
|
||||
sub_800E6E8: @ 800E6E8
|
||||
thumb_func_start EmitStatusXor
|
||||
EmitStatusXor: @ 800E6E8
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2710,10 +2710,10 @@ sub_800E6E8: @ 800E6E8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E704: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E6E8
|
||||
thumb_func_end EmitStatusXor
|
||||
|
||||
thumb_func_start sub_800E708
|
||||
sub_800E708: @ 800E708
|
||||
thumb_func_start EmitDataTransfer
|
||||
EmitDataTransfer: @ 800E708
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -2751,10 +2751,10 @@ _0800E738:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E74C: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E708
|
||||
thumb_func_end EmitDataTransfer
|
||||
|
||||
thumb_func_start sub_800E750
|
||||
sub_800E750: @ 800E750
|
||||
thumb_func_start EmitDMA3Transfer
|
||||
EmitDMA3Transfer: @ 800E750
|
||||
push {r4-r6,lr}
|
||||
adds r4, r3, 0
|
||||
lsls r0, 24
|
||||
@@ -2807,10 +2807,10 @@ _0800E7A0:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E7B4: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E750
|
||||
thumb_func_end EmitDMA3Transfer
|
||||
|
||||
thumb_func_start sub_800E7B8
|
||||
sub_800E7B8: @ 800E7B8
|
||||
thumb_func_start EmitPlayBGM
|
||||
EmitPlayBGM: @ 800E7B8
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -2847,10 +2847,10 @@ _0800E7E6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E7FC: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E7B8
|
||||
thumb_func_end EmitPlayBGM
|
||||
|
||||
thumb_func_start sub_800E800
|
||||
sub_800E800: @ 800E800
|
||||
thumb_func_start EmitCmd32
|
||||
EmitCmd32: @ 800E800
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -2887,10 +2887,10 @@ _0800E82E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E844: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E800
|
||||
thumb_func_end EmitCmd32
|
||||
|
||||
thumb_func_start sub_800E848
|
||||
sub_800E848: @ 800E848
|
||||
thumb_func_start EmitTwoReturnValues
|
||||
EmitTwoReturnValues: @ 800E848
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2911,10 +2911,10 @@ sub_800E848: @ 800E848
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E870: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E848
|
||||
thumb_func_end EmitTwoReturnValues
|
||||
|
||||
thumb_func_start sub_800E874
|
||||
sub_800E874: @ 800E874
|
||||
thumb_func_start EmitChosenMonReturnValue
|
||||
EmitChosenMonReturnValue: @ 800E874
|
||||
push {r4,r5,lr}
|
||||
adds r4, r2, 0
|
||||
lsls r0, 24
|
||||
@@ -2942,10 +2942,10 @@ _0800E888:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E8A8: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E874
|
||||
thumb_func_end EmitChosenMonReturnValue
|
||||
|
||||
thumb_func_start sub_800E8AC
|
||||
sub_800E8AC: @ 800E8AC
|
||||
thumb_func_start EmitOneReturnValue
|
||||
EmitOneReturnValue: @ 800E8AC
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2967,10 +2967,10 @@ sub_800E8AC: @ 800E8AC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E8D4: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E8AC
|
||||
thumb_func_end EmitOneReturnValue
|
||||
|
||||
thumb_func_start sub_800E8D8
|
||||
sub_800E8D8: @ 800E8D8
|
||||
thumb_func_start EmitOneReturnValue_Duplicate
|
||||
EmitOneReturnValue_Duplicate: @ 800E8D8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2992,10 +2992,10 @@ sub_800E8D8: @ 800E8D8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E900: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E8D8
|
||||
thumb_func_end EmitOneReturnValue_Duplicate
|
||||
|
||||
thumb_func_start sub_800E904
|
||||
sub_800E904: @ 800E904
|
||||
thumb_func_start EmitCmd37
|
||||
EmitCmd37: @ 800E904
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3011,10 +3011,10 @@ sub_800E904: @ 800E904
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E920: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E904
|
||||
thumb_func_end EmitCmd37
|
||||
|
||||
thumb_func_start sub_800E924
|
||||
sub_800E924: @ 800E924
|
||||
thumb_func_start EmitCmd38
|
||||
EmitCmd38: @ 800E924
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -3029,10 +3029,10 @@ sub_800E924: @ 800E924
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E940: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E924
|
||||
thumb_func_end EmitCmd38
|
||||
|
||||
thumb_func_start sub_800E944
|
||||
sub_800E944: @ 800E944
|
||||
thumb_func_start EmitCmd39
|
||||
EmitCmd39: @ 800E944
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3048,10 +3048,10 @@ sub_800E944: @ 800E944
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E960: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E944
|
||||
thumb_func_end EmitCmd39
|
||||
|
||||
thumb_func_start sub_800E964
|
||||
sub_800E964: @ 800E964
|
||||
thumb_func_start EmitCmd40
|
||||
EmitCmd40: @ 800E964
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3067,10 +3067,10 @@ sub_800E964: @ 800E964
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E980: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E964
|
||||
thumb_func_end EmitCmd40
|
||||
|
||||
thumb_func_start sub_800E984
|
||||
sub_800E984: @ 800E984
|
||||
thumb_func_start EmitHitAnimation
|
||||
EmitHitAnimation: @ 800E984
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3086,10 +3086,10 @@ sub_800E984: @ 800E984
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E9A0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E984
|
||||
thumb_func_end EmitHitAnimation
|
||||
|
||||
thumb_func_start sub_800E9A4
|
||||
sub_800E9A4: @ 800E9A4
|
||||
thumb_func_start EmitCmd42
|
||||
EmitCmd42: @ 800E9A4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3105,10 +3105,10 @@ sub_800E9A4: @ 800E9A4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E9C0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E9A4
|
||||
thumb_func_end EmitCmd42
|
||||
|
||||
thumb_func_start sub_800E9C4
|
||||
sub_800E9C4: @ 800E9C4
|
||||
thumb_func_start EmitPlaySE
|
||||
EmitPlaySE: @ 800E9C4
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3130,7 +3130,7 @@ sub_800E9C4: @ 800E9C4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800E9EC: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E9C4
|
||||
thumb_func_end EmitPlaySE
|
||||
|
||||
thumb_func_start sub_800E9F0
|
||||
sub_800E9F0: @ 800E9F0
|
||||
@@ -3157,8 +3157,8 @@ sub_800E9F0: @ 800E9F0
|
||||
_0800EA18: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800E9F0
|
||||
|
||||
thumb_func_start sub_800EA1C
|
||||
sub_800EA1C: @ 800EA1C
|
||||
thumb_func_start EmitFaintingCry
|
||||
EmitFaintingCry: @ 800EA1C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3174,10 +3174,10 @@ sub_800EA1C: @ 800EA1C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EA38: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EA1C
|
||||
thumb_func_end EmitFaintingCry
|
||||
|
||||
thumb_func_start sub_800EA3C
|
||||
sub_800EA3C: @ 800EA3C
|
||||
thumb_func_start EmitIntroSlide
|
||||
EmitIntroSlide: @ 800EA3C
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -3192,10 +3192,10 @@ sub_800EA3C: @ 800EA3C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EA58: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EA3C
|
||||
thumb_func_end EmitIntroSlide
|
||||
|
||||
thumb_func_start sub_800EA5C
|
||||
sub_800EA5C: @ 800EA5C
|
||||
thumb_func_start EmitIntroTrainerBallThrow
|
||||
EmitIntroTrainerBallThrow: @ 800EA5C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3211,10 +3211,10 @@ sub_800EA5C: @ 800EA5C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EA78: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EA5C
|
||||
thumb_func_end EmitIntroTrainerBallThrow
|
||||
|
||||
thumb_func_start sub_800EA7C
|
||||
sub_800EA7C: @ 800EA7C
|
||||
thumb_func_start EmitDrawPartyStatusSummary
|
||||
EmitDrawPartyStatusSummary: @ 800EA7C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -3251,10 +3251,10 @@ _0800EAA4:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EAC0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EA7C
|
||||
thumb_func_end EmitDrawPartyStatusSummary
|
||||
|
||||
thumb_func_start sub_800EAC4
|
||||
sub_800EAC4: @ 800EAC4
|
||||
thumb_func_start EmitCmd49
|
||||
EmitCmd49: @ 800EAC4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3270,10 +3270,10 @@ sub_800EAC4: @ 800EAC4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EAE0: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EAC4
|
||||
thumb_func_end EmitCmd49
|
||||
|
||||
thumb_func_start sub_800EAE4
|
||||
sub_800EAE4: @ 800EAE4
|
||||
thumb_func_start EmitCmd50
|
||||
EmitCmd50: @ 800EAE4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3289,10 +3289,10 @@ sub_800EAE4: @ 800EAE4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EB00: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EAE4
|
||||
thumb_func_end EmitCmd50
|
||||
|
||||
thumb_func_start sub_800EB04
|
||||
sub_800EB04: @ 800EB04
|
||||
thumb_func_start EmitSpriteInvisibility
|
||||
EmitSpriteInvisibility: @ 800EB04
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -3309,10 +3309,10 @@ sub_800EB04: @ 800EB04
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EB24: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EB04
|
||||
thumb_func_end EmitSpriteInvisibility
|
||||
|
||||
thumb_func_start sub_800EB28
|
||||
sub_800EB28: @ 800EB28
|
||||
thumb_func_start EmitBattleAnimation
|
||||
EmitBattleAnimation: @ 800EB28
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -3333,7 +3333,7 @@ sub_800EB28: @ 800EB28
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EB50: .4byte gUnknown_2022874
|
||||
thumb_func_end sub_800EB28
|
||||
thumb_func_end EmitBattleAnimation
|
||||
|
||||
thumb_func_start sub_800EB54
|
||||
sub_800EB54: @ 800EB54
|
||||
|
||||
+37
-37
@@ -10,8 +10,8 @@ nullsub_91: @ 810BB88
|
||||
bx lr
|
||||
thumb_func_end nullsub_91
|
||||
|
||||
thumb_func_start sub_810BB8C
|
||||
sub_810BB8C: @ 810BB8C
|
||||
thumb_func_start dp13_810BB8C
|
||||
dp13_810BB8C: @ 810BB8C
|
||||
push {r4-r7,lr}
|
||||
ldr r4, _0810BBAC @ =gUnknown_8453178
|
||||
ldr r3, _0810BBB0 @ =gUnknown_203AD58
|
||||
@@ -32,10 +32,10 @@ _0810BB94:
|
||||
.align 2, 0
|
||||
_0810BBAC: .4byte gUnknown_8453178
|
||||
_0810BBB0: .4byte gUnknown_203AD58
|
||||
thumb_func_end sub_810BB8C
|
||||
thumb_func_end dp13_810BB8C
|
||||
|
||||
thumb_func_start sub_810BBB4
|
||||
sub_810BBB4: @ 810BBB4
|
||||
thumb_func_start load_pokemon_image_TODO
|
||||
load_pokemon_image_TODO: @ 810BBB4
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r6, r1, 0
|
||||
@@ -123,7 +123,7 @@ _0810BC4E:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0810BC58: .4byte gUnknown_8239FA4
|
||||
thumb_func_end sub_810BBB4
|
||||
thumb_func_end load_pokemon_image_TODO
|
||||
|
||||
thumb_func_start sub_810BC5C
|
||||
sub_810BC5C: @ 810BC5C
|
||||
@@ -139,7 +139,7 @@ sub_810BC5C: @ 810BC5C
|
||||
str r4, [sp]
|
||||
movs r4, 0
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_810BBB4
|
||||
bl load_pokemon_image_TODO
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
add sp, 0x8
|
||||
@@ -180,7 +180,7 @@ sub_810BC84: @ 810BC84
|
||||
adds r0, r4, 0
|
||||
adds r1, r7, 0
|
||||
mov r2, r8
|
||||
bl sub_80440F4
|
||||
bl GetFrontSpritePalFromSpeciesAndPersonality
|
||||
lsls r1, r5, 20
|
||||
b _0810BD04
|
||||
.align 2, 0
|
||||
@@ -192,8 +192,8 @@ _0810BCD0:
|
||||
adds r0, r4, 0
|
||||
adds r1, r7, 0
|
||||
mov r2, r8
|
||||
bl sub_8044180
|
||||
bl sub_800EC28
|
||||
bl GetMonSpritePalStructFromOtIdPersonality
|
||||
bl LoadCompressedObjectPalette
|
||||
b _0810BD2E
|
||||
.align 2, 0
|
||||
_0810BCE4: .4byte gUnknown_203AD40
|
||||
@@ -218,7 +218,7 @@ _0810BD04:
|
||||
adds r1, r2
|
||||
lsrs r1, 16
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0810BD2E
|
||||
.align 2, 0
|
||||
_0810BD14: .4byte 0x0000ffff
|
||||
@@ -230,7 +230,7 @@ _0810BD20:
|
||||
lsls r0, r6, 3
|
||||
ldr r1, _0810BD3C @ =gUnknown_8239A1C
|
||||
adds r0, r1
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
_0810BD2E:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -255,10 +255,10 @@ sub_810BD40: @ 810BD40
|
||||
cmp r1, 0
|
||||
bne _0810BD64
|
||||
adds r1, r5, 0
|
||||
bl sub_80440F4
|
||||
bl GetFrontSpritePalFromSpeciesAndPersonality
|
||||
lsls r1, r4, 4
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0810BD74
|
||||
_0810BD64:
|
||||
ldr r1, _0810BD7C @ =gUnknown_8239A1C
|
||||
@@ -267,7 +267,7 @@ _0810BD64:
|
||||
ldr r0, [r0]
|
||||
lsls r1, r4, 4
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
_0810BD74:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -276,8 +276,8 @@ _0810BD74:
|
||||
_0810BD7C: .4byte gUnknown_8239A1C
|
||||
thumb_func_end sub_810BD40
|
||||
|
||||
thumb_func_start sub_810BD80
|
||||
sub_810BD80: @ 810BD80
|
||||
thumb_func_start uns_builder_assign_animtable1
|
||||
uns_builder_assign_animtable1: @ 810BD80
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@@ -300,10 +300,10 @@ _0810BDA0:
|
||||
.align 2, 0
|
||||
_0810BDA4: .4byte gUnknown_203AD40
|
||||
_0810BDA8: .4byte gUnknown_82390DC
|
||||
thumb_func_end sub_810BD80
|
||||
thumb_func_end uns_builder_assign_animtable1
|
||||
|
||||
thumb_func_start sub_810BDAC
|
||||
sub_810BDAC: @ 810BDAC
|
||||
thumb_func_start oamt_spawn_poke_or_trainer_picture
|
||||
oamt_spawn_poke_or_trainer_picture: @ 810BDAC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -366,17 +366,17 @@ _0810BE1C:
|
||||
beq _0810BE40
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r7, r0, 0
|
||||
cmp r7, 0
|
||||
beq _0810BE40
|
||||
movs r0, 0x20
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
mov r8, r0
|
||||
cmp r0, 0
|
||||
bne _0810BE4C
|
||||
adds r0, r7, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0810BE40:
|
||||
ldr r0, _0810BE48 @ =0x0000ffff
|
||||
b _0810BF16
|
||||
@@ -391,7 +391,7 @@ _0810BE4C:
|
||||
ldr r1, [sp, 0x10]
|
||||
ldr r2, [sp, 0x14]
|
||||
adds r3, r7, 0
|
||||
bl sub_810BBB4
|
||||
bl load_pokemon_image_TODO
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _0810BE40
|
||||
@@ -425,7 +425,7 @@ _0810BE86:
|
||||
mov r0, r12
|
||||
str r0, [r5, 0x4]
|
||||
mov r0, r9
|
||||
bl sub_810BD80
|
||||
bl uns_builder_assign_animtable1
|
||||
mov r1, r8
|
||||
str r1, [r5, 0xC]
|
||||
ldr r0, _0810BF34 @ =gUnknown_8231CFC
|
||||
@@ -447,7 +447,7 @@ _0810BE86:
|
||||
asrs r2, r0, 16
|
||||
adds r0, r5, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
adds r6, r2, 0
|
||||
@@ -500,7 +500,7 @@ _0810BF34: .4byte gUnknown_8231CFC
|
||||
_0810BF38: .4byte nullsub_91
|
||||
_0810BF3C: .4byte gUnknown_202063C
|
||||
_0810BF40: .4byte gUnknown_203AD58
|
||||
thumb_func_end sub_810BDAC
|
||||
thumb_func_end oamt_spawn_poke_or_trainer_picture
|
||||
|
||||
thumb_func_start sub_810BF44
|
||||
sub_810BF44: @ 810BF44
|
||||
@@ -541,7 +541,7 @@ sub_810BF44: @ 810BF44
|
||||
str r7, [sp, 0x10]
|
||||
movs r4, 0
|
||||
str r4, [sp, 0x14]
|
||||
bl sub_810BDAC
|
||||
bl oamt_spawn_poke_or_trainer_picture
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
add sp, 0x18
|
||||
@@ -609,20 +609,20 @@ _0810BFE4:
|
||||
adds r0, r1
|
||||
ldrb r0, [r0, 0x5]
|
||||
lsrs r0, 4
|
||||
bl sub_8008A20
|
||||
bl GetSpritePaletteTagByPaletteNum
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_8008A30
|
||||
bl FreeSpritePaletteByTag
|
||||
_0810C018:
|
||||
adds r0, r6, r4
|
||||
lsls r0, 2
|
||||
ldr r1, _0810C048 @ =gUnknown_202063C
|
||||
adds r0, r1
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
mov r0, r8
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r7, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r1, r5, 0
|
||||
ldr r0, _0810C04C @ =gUnknown_8453178
|
||||
ldm r0!, {r2-r4}
|
||||
@@ -734,7 +734,7 @@ sub_810C0C0: @ 810C0C0
|
||||
lsrs r6, 24
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _0810C156
|
||||
@@ -760,7 +760,7 @@ sub_810C0C0: @ 810C0C0
|
||||
adds r1, r4, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80041F0
|
||||
bl BlitBitmapRectToWindow
|
||||
str r6, [sp]
|
||||
mov r0, r9
|
||||
ldr r1, [sp, 0x18]
|
||||
@@ -768,7 +768,7 @@ sub_810C0C0: @ 810C0C0
|
||||
ldr r3, [sp, 0x20]
|
||||
bl sub_810BD40
|
||||
adds r0, r4, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
b _0810C158
|
||||
_0810C156:
|
||||
@@ -825,7 +825,7 @@ sub_810C16C: @ 810C16C
|
||||
movs r4, 0
|
||||
str r4, [sp, 0x10]
|
||||
str r7, [sp, 0x14]
|
||||
bl sub_810BDAC
|
||||
bl oamt_spawn_poke_or_trainer_picture
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
add sp, 0x18
|
||||
|
||||
+263
-263
File diff suppressed because it is too large
Load Diff
+204
-204
File diff suppressed because it is too large
Load Diff
+61
-61
@@ -217,7 +217,7 @@ _080D7424: .4byte gUnknown_83FD2AA
|
||||
_080D7428:
|
||||
mov r1, r12
|
||||
ldrb r0, [r1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D7468
|
||||
@@ -297,7 +297,7 @@ _080D74C4: .4byte gUnknown_83FD3B1
|
||||
_080D74C8:
|
||||
mov r1, r12
|
||||
ldrb r0, [r1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D7520
|
||||
@@ -369,7 +369,7 @@ _080D7554: .4byte gUnknown_83FD522
|
||||
_080D7558:
|
||||
mov r1, r10
|
||||
ldrb r0, [r1, 0x17]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D75B0
|
||||
@@ -461,7 +461,7 @@ _080D75F0:
|
||||
lsls r1, 2
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _080D763C
|
||||
.align 2, 0
|
||||
_080D761C: .4byte gUnknown_2039A34
|
||||
@@ -475,7 +475,7 @@ _080D762C:
|
||||
muls r1, r2
|
||||
ldr r2, _080D764C @ =gUnknown_8247094
|
||||
adds r1, r2
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_080D763C:
|
||||
ldr r0, _080D7648 @ =gUnknown_2022AC8
|
||||
bl sub_80D8720
|
||||
@@ -497,7 +497,7 @@ _080D7654:
|
||||
strb r0, [r4]
|
||||
mov r1, r12
|
||||
ldrb r0, [r1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -552,7 +552,7 @@ _080D76D0: .4byte gUnknown_83FE9D4
|
||||
_080D76D4:
|
||||
mov r1, r12
|
||||
ldrb r0, [r1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -781,7 +781,7 @@ sub_80D7868: @ 80D7868
|
||||
mov r8, r1
|
||||
movs r6, 0
|
||||
movs r4, 0
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
mov r0, r9
|
||||
@@ -924,7 +924,7 @@ _080D79F4:
|
||||
_080D79FC: .4byte gUnknown_2021D04
|
||||
_080D7A00:
|
||||
movs r0, 0
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7A1C @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -940,7 +940,7 @@ _080D7A1C: .4byte gUnknown_2023BCE
|
||||
_080D7A20: .4byte gUnknown_2024284
|
||||
_080D7A24:
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7A40 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -956,7 +956,7 @@ _080D7A40: .4byte gUnknown_2023BCE
|
||||
_080D7A44: .4byte gUnknown_202402C
|
||||
_080D7A48:
|
||||
movs r0, 0x2
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7A64 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -972,7 +972,7 @@ _080D7A64: .4byte gUnknown_2023BCE
|
||||
_080D7A68: .4byte gUnknown_2024284
|
||||
_080D7A6C:
|
||||
movs r0, 0x3
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7A88 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -1075,7 +1075,7 @@ _080D7B48: .4byte gUnknown_202402C
|
||||
_080D7B4C:
|
||||
ldr r4, _080D7B70 @ =gUnknown_2023D6B
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
adds r2, r4, 0
|
||||
cmp r0, 0
|
||||
@@ -1106,11 +1106,11 @@ _080D7B8A:
|
||||
cmp r0, 0xFF
|
||||
bne _080D7B80
|
||||
ldrb r0, [r2]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7BB8 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -1126,11 +1126,11 @@ _080D7BB8: .4byte gUnknown_2023BCE
|
||||
_080D7BBC: .4byte gUnknown_202402C
|
||||
_080D7BC0:
|
||||
ldrb r0, [r2]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7BDC @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -1142,16 +1142,16 @@ _080D7BDC: .4byte gUnknown_2023BCE
|
||||
_080D7BE0:
|
||||
ldr r4, _080D7C14 @ =gUnknown_2023D6B
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D7C20
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7C18 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -1169,11 +1169,11 @@ _080D7C18: .4byte gUnknown_2023BCE
|
||||
_080D7C1C: .4byte gUnknown_2024284
|
||||
_080D7C20:
|
||||
ldrb r0, [r4]
|
||||
bl sub_80751D8
|
||||
bl GetBankIdentity
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
ldr r1, _080D7C44 @ =gUnknown_2023BCE
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
@@ -1190,7 +1190,7 @@ _080D7C48: .4byte gUnknown_202402C
|
||||
_080D7C4C:
|
||||
ldr r5, _080D7C98 @ =gUnknown_2023D6B
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D7CB0
|
||||
@@ -1246,7 +1246,7 @@ _080D7CBC: .4byte gUnknown_2023BCE
|
||||
_080D7CC0:
|
||||
ldr r5, _080D7D0C @ =gUnknown_2023D6C
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D7D24
|
||||
@@ -1302,7 +1302,7 @@ _080D7D30: .4byte gUnknown_2023BCE
|
||||
_080D7D34:
|
||||
ldr r5, _080D7D80 @ =gUnknown_2023D6E
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D7D98
|
||||
@@ -1358,7 +1358,7 @@ _080D7DA4: .4byte gUnknown_2023BCE
|
||||
_080D7DA8:
|
||||
ldr r5, _080D7DF4 @ =gUnknown_2023BC4
|
||||
ldrb r0, [r5]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D7E0C
|
||||
@@ -1414,7 +1414,7 @@ _080D7E18: .4byte gUnknown_2023BCE
|
||||
_080D7E1C:
|
||||
ldr r5, _080D7E68 @ =gUnknown_2023FC4
|
||||
ldrb r0, [r5, 0x17]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D7E80
|
||||
@@ -1579,10 +1579,10 @@ _080D7F64:
|
||||
ldr r0, _080D7F88 @ =gUnknown_2023F54
|
||||
adds r1, r0
|
||||
mov r0, sp
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, _080D7F8C @ =gUnknown_83FD8AF
|
||||
mov r0, sp
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
mov r4, sp
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
@@ -1661,7 +1661,7 @@ _080D8008:
|
||||
lsls r0, 3
|
||||
cmp r1, r0
|
||||
bne _080D8024
|
||||
bl sub_8040F2C
|
||||
bl GetSecretBaseTrainerNameIndex
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0xD
|
||||
@@ -1821,7 +1821,7 @@ _080D8134:
|
||||
bne _080D815C
|
||||
_080D814E:
|
||||
movs r0, 0x6
|
||||
bl sub_80091E0
|
||||
bl GetExpandedPlaceholder
|
||||
adds r4, r0, 0
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
@@ -1871,7 +1871,7 @@ _080D819C:
|
||||
movs r0, 0x3
|
||||
_080D81AA:
|
||||
eors r0, r1
|
||||
bl sub_8043658
|
||||
bl GetBankMultiplayerId
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
lsls r1, 2
|
||||
@@ -1883,7 +1883,7 @@ _080D81BC: .4byte gUnknown_202273C
|
||||
_080D81C0:
|
||||
ldr r0, _080D81D4 @ =gUnknown_2023FC4
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl sub_8043658
|
||||
bl GetBankMultiplayerId
|
||||
_080D81C8:
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
@@ -1959,7 +1959,7 @@ _080D825C: .4byte gUnknown_2021D18
|
||||
_080D8260:
|
||||
ldr r0, _080D82B4 @ =gUnknown_2023FC4
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080D82CC
|
||||
@@ -2000,7 +2000,7 @@ _080D82A4:
|
||||
_080D82AA:
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
b _080D82E4
|
||||
.align 2, 0
|
||||
_080D82B4: .4byte gUnknown_2023FC4
|
||||
@@ -2022,10 +2022,10 @@ _080D82DA:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
_080D82E4:
|
||||
mov r0, sp
|
||||
bl sub_8008D28
|
||||
bl StringGetEnd10
|
||||
mov r4, sp
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
@@ -2053,7 +2053,7 @@ _080D8320:
|
||||
ldr r0, _080D8334 @ =gUnknown_2023D6C
|
||||
_080D8322:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
ldr r4, _080D8338 @ =gUnknown_83FD569
|
||||
cmp r0, 0
|
||||
@@ -2073,7 +2073,7 @@ _080D8348:
|
||||
ldr r0, _080D835C @ =gUnknown_2023D6C
|
||||
_080D834A:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
ldr r4, _080D8360 @ =gUnknown_83FD560
|
||||
cmp r0, 0
|
||||
@@ -2093,7 +2093,7 @@ _080D8370:
|
||||
ldr r0, _080D83D4 @ =gUnknown_2023D6C
|
||||
_080D8372:
|
||||
ldrb r0, [r0]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
ldr r4, _080D83D8 @ =gUnknown_83FD572
|
||||
cmp r0, 0
|
||||
@@ -2310,7 +2310,7 @@ _080D8504:
|
||||
_080D8510: .4byte gUnknown_824F1A0
|
||||
_080D8514:
|
||||
ldrb r0, [r4, 0x1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D8538
|
||||
@@ -2321,7 +2321,7 @@ _080D8514:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
b _080D8574
|
||||
.align 2, 0
|
||||
_080D8534: .4byte gUnknown_2024284
|
||||
@@ -2334,7 +2334,7 @@ _080D8538:
|
||||
beq _080D8558
|
||||
ldr r1, _080D8554 @ =gUnknown_83FD55B
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080D8560
|
||||
.align 2, 0
|
||||
_080D8550: .4byte gUnknown_2022B4C
|
||||
@@ -2342,7 +2342,7 @@ _080D8554: .4byte gUnknown_83FD55B
|
||||
_080D8558:
|
||||
ldr r1, _080D8584 @ =gUnknown_83FD555
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
_080D8560:
|
||||
adds r0, r5, r7
|
||||
ldrb r1, [r0, 0x2]
|
||||
@@ -2352,13 +2352,13 @@ _080D8560:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
_080D8574:
|
||||
mov r0, sp
|
||||
bl sub_8008D28
|
||||
bl StringGetEnd10
|
||||
adds r0, r6, 0
|
||||
mov r1, sp
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080D86AE
|
||||
.align 2, 0
|
||||
_080D8584: .4byte gUnknown_83FD555
|
||||
@@ -2380,12 +2380,12 @@ _080D85A0:
|
||||
lsls r0, 8
|
||||
orrs r1, r0
|
||||
adds r0, r6, 0
|
||||
bl sub_8040FD0
|
||||
bl GetSpeciesName
|
||||
b _080D86AE
|
||||
_080D85B2:
|
||||
adds r4, r5, r7
|
||||
ldrb r0, [r4, 0x1]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D85D8
|
||||
@@ -2396,7 +2396,7 @@ _080D85B2:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
b _080D85EA
|
||||
.align 2, 0
|
||||
_080D85D4: .4byte gUnknown_2024284
|
||||
@@ -2408,10 +2408,10 @@ _080D85D8:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
adds r2, r6, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
_080D85EA:
|
||||
adds r0, r6, 0
|
||||
bl sub_8008D28
|
||||
bl StringGetEnd10
|
||||
b _080D86AE
|
||||
.align 2, 0
|
||||
_080D85F4: .4byte gUnknown_202402C
|
||||
@@ -2435,7 +2435,7 @@ _080D8616:
|
||||
adds r1, r0
|
||||
_080D8618:
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
adds r5, 0x2
|
||||
b _080D86B0
|
||||
.align 2, 0
|
||||
@@ -2474,7 +2474,7 @@ _080D8628:
|
||||
ldr r0, _080D8684 @ =gUnknown_2023F54
|
||||
adds r1, r0
|
||||
adds r0, r6, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, _080D8688 @ =gUnknown_83FD8AF
|
||||
b _080D868E
|
||||
.align 2, 0
|
||||
@@ -2488,7 +2488,7 @@ _080D868C:
|
||||
ldr r1, _080D8698 @ =gUnknown_83FD8A2
|
||||
_080D868E:
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080D86AE
|
||||
.align 2, 0
|
||||
_080D8698: .4byte gUnknown_83FD8A2
|
||||
@@ -2545,7 +2545,7 @@ _080D86E8:
|
||||
bgt _080D8708
|
||||
ldr r1, _080D8704 @ =gUnknown_83FE88B
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _080D8714
|
||||
.align 2, 0
|
||||
_080D86FC: .4byte gUnknown_2039A34
|
||||
@@ -2556,7 +2556,7 @@ _080D8708:
|
||||
bgt _080D8714
|
||||
ldr r1, _080D871C @ =gUnknown_83FE88F
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_080D8714:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -2633,14 +2633,14 @@ _080D8798:
|
||||
ldr r1, _080D87A4 @ =gUnknown_83FD58C
|
||||
_080D879A:
|
||||
adds r0, r3, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _080D87B0
|
||||
.align 2, 0
|
||||
_080D87A4: .4byte gUnknown_83FD58C
|
||||
_080D87A8:
|
||||
ldr r1, _080D87B8 @ =gUnknown_83FD58E
|
||||
adds r0, r3, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_080D87B0:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -2676,7 +2676,7 @@ sub_80D87BC: @ 80D87BC
|
||||
adds r1, r0
|
||||
ldrb r1, [r1]
|
||||
adds r0, r7, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
_080D87F2:
|
||||
movs r0, 0x40
|
||||
mov r1, r8
|
||||
@@ -2896,7 +2896,7 @@ _080D8982:
|
||||
cmp r1, 0
|
||||
bne _080D89A4
|
||||
adds r0, r7, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
|
||||
+76
-76
@@ -9,9 +9,9 @@
|
||||
sub_80CD228: @ 80CD228
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _080CD23C @ =sub_80CD240
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -51,7 +51,7 @@ _080CD268:
|
||||
.4byte _080CD338
|
||||
_080CD288:
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_80CD4D0
|
||||
b _080CD324
|
||||
_080CD294:
|
||||
@@ -61,7 +61,7 @@ _080CD29A:
|
||||
ldr r4, _080CD2C4 @ =gUnknown_2039A1C
|
||||
movs r0, 0x80
|
||||
lsls r0, 4
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
@@ -71,7 +71,7 @@ _080CD29A:
|
||||
bl sub_8001658
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x3
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
bl sub_80CD638
|
||||
b _080CD324
|
||||
.align 2, 0
|
||||
@@ -81,23 +81,23 @@ _080CD2CC:
|
||||
movs r0, 0x3
|
||||
bl sub_80CDCD0
|
||||
movs r0, 0
|
||||
bl sub_8150408
|
||||
bl stdpal_get
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
b _080CD324
|
||||
_080CD2E2:
|
||||
bl sub_8001960
|
||||
bl IsDma3ManagerBusyWithBgCopy
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _080CD376
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x3
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x3
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _080CD324
|
||||
_080CD302:
|
||||
ldr r0, _080CD310 @ =gUnknown_83F6C68
|
||||
@@ -113,7 +113,7 @@ _080CD314:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080CD324:
|
||||
ldr r1, _080CD334 @ =gUnknown_30030F0
|
||||
movs r0, 0x87
|
||||
@@ -128,7 +128,7 @@ _080CD334: .4byte gUnknown_30030F0
|
||||
_080CD338:
|
||||
bl sub_80CD628
|
||||
ldr r0, _080CD350 @ =sub_80CD38C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _080CD354 @ =gUnknown_20370C0
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
@@ -143,9 +143,9 @@ _080CD358:
|
||||
_080CD35C:
|
||||
ldr r0, _080CD380 @ =sub_80CD3B8
|
||||
movs r1, 0x8
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r0, _080CD384 @ =sub_80CD3A0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r0, _080CD388 @ =gUnknown_30030F0
|
||||
movs r1, 0x87
|
||||
lsls r1, 3
|
||||
@@ -166,9 +166,9 @@ _080CD388: .4byte gUnknown_30030F0
|
||||
thumb_func_start sub_80CD38C
|
||||
sub_80CD38C: @ 80CD38C
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80CD38C
|
||||
@@ -176,10 +176,10 @@ sub_80CD38C: @ 80CD38C
|
||||
thumb_func_start sub_80CD3A0
|
||||
sub_80CD3A0: @ 80CD3A0
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80CD3A0
|
||||
@@ -259,7 +259,7 @@ sub_80CD428: @ 80CD428
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, _080CD458 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -287,23 +287,23 @@ sub_80CD460: @ 80CD460
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080CD490
|
||||
ldr r0, _080CD49C @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _080CD49C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
ldr r0, _080CD4A0 @ =gUnknown_2039A1C
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
bl sub_80CD4A4
|
||||
bl sub_8003ECC
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080CD490:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080CD498: .4byte gUnknown_2037AB8
|
||||
_080CD49C: .4byte sub_80568E0
|
||||
_080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
_080CD4A0: .4byte gUnknown_2039A1C
|
||||
thumb_func_end sub_80CD460
|
||||
|
||||
@@ -315,9 +315,9 @@ sub_80CD4A4: @ 80CD4A4
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r4, 0
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -399,64 +399,64 @@ _080CD4F6:
|
||||
ldr r0, [r2, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x8
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0xA
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x14
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x16
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0xC
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x18
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1A
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0xE
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1C
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1E
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x40
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x44
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x48
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -471,12 +471,12 @@ _080CD604: .4byte 0x81000800
|
||||
thumb_func_start sub_80CD608
|
||||
sub_80CD608: @ 80CD608
|
||||
push {lr}
|
||||
bl sub_8087E64
|
||||
bl sub_80773BC
|
||||
bl sub_8006B10
|
||||
bl sub_810BB8C
|
||||
bl sub_8070528
|
||||
bl sub_80088F0
|
||||
bl remove_some_task
|
||||
bl ResetTasks
|
||||
bl ResetSpriteData
|
||||
bl dp13_810BB8C
|
||||
bl ResetPaletteFade
|
||||
bl FreeAllSpritePalettes
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80CD608
|
||||
@@ -487,7 +487,7 @@ sub_80CD628: @ 80CD628
|
||||
movs r1, 0x94
|
||||
lsls r1, 4
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80CD628
|
||||
@@ -498,35 +498,35 @@ sub_80CD638: @ 80CD638
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80CD638
|
||||
@@ -607,7 +607,7 @@ _080CD710:
|
||||
adds r0, r4, 0
|
||||
adds r1, r7, 0
|
||||
movs r2, 0x7
|
||||
bl sub_8008E4C
|
||||
bl StringCompareN
|
||||
cmp r0, 0
|
||||
bne _080CD728
|
||||
ldrh r0, [r4, 0x8]
|
||||
@@ -813,12 +813,12 @@ sub_80CD854: @ 80CD854
|
||||
mov r0, sp
|
||||
adds r0, 0x2
|
||||
adds r1, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _080CD88A
|
||||
_080CD882:
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_080CD88A:
|
||||
mov r0, r8
|
||||
bl sub_80CD818
|
||||
@@ -839,7 +839,7 @@ _080CD88A:
|
||||
adds r0, r4, 0
|
||||
mov r1, sp
|
||||
movs r2, 0x7
|
||||
bl sub_8008DBC
|
||||
bl StringCopyN
|
||||
strh r7, [r4, 0x8]
|
||||
_080CD8BE:
|
||||
lsls r0, r5, 4
|
||||
@@ -1182,11 +1182,11 @@ _080CDB56:
|
||||
movs r4, 0
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x8
|
||||
bl sub_8009284
|
||||
bl StringFillWithTerminator
|
||||
adds r0, r7, 0
|
||||
adds r1, r6, 0
|
||||
movs r2, 0x7
|
||||
bl sub_8008DBC
|
||||
bl StringCopyN
|
||||
b _080CDBA6
|
||||
.align 2, 0
|
||||
_080CDB70: .4byte gUnknown_2021CD0
|
||||
@@ -1264,7 +1264,7 @@ sub_80CDBE4: @ 80CDBE4
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
ldr r5, _080CDC9C @ =gUnknown_2021D18
|
||||
ldr r1, _080CDCA0 @ =gUnknown_8418174
|
||||
adds r0, r5, 0
|
||||
@@ -1352,7 +1352,7 @@ sub_80CDCB4: @ 80CDCB4
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
@@ -1372,7 +1372,7 @@ sub_80CDCD0: @ 80CDCD0
|
||||
adds r0, r4, 0
|
||||
movs r2, 0xC0
|
||||
movs r3, 0
|
||||
bl sub_80017D0
|
||||
bl LoadBgTiles
|
||||
ldr r1, _080CDD10 @ =gUnknown_83F6468
|
||||
movs r0, 0x20
|
||||
str r0, [sp]
|
||||
@@ -1380,11 +1380,11 @@ sub_80CDCD0: @ 80CDCD0
|
||||
adds r0, r4, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002124
|
||||
bl CopyToBgTilemapBufferRect
|
||||
ldr r0, _080CDD14 @ =gUnknown_83F6448
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
add sp, 0x8
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
+1328
-1328
File diff suppressed because it is too large
Load Diff
+83
-83
@@ -44,11 +44,11 @@ _0807F65E:
|
||||
bl sub_812B484
|
||||
bl sub_80563F0
|
||||
ldr r0, _0807F68C @ =sub_800FD9C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
bl sub_806D7E8
|
||||
bl sub_806D788
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0807F686:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -68,7 +68,7 @@ sub_807F690: @ 807F690
|
||||
lsrs r5, 16
|
||||
ldr r0, _0807F6C4 @ =sub_807F620
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0807F6C8 @ =gUnknown_3005090
|
||||
@@ -157,8 +157,8 @@ _0807F744:
|
||||
thumb_func_start sub_807F748
|
||||
sub_807F748: @ 807F748
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl sub_8068974
|
||||
bl ScriptContext2_Enable
|
||||
bl player_bitmagic
|
||||
bl sub_805C780
|
||||
ldr r1, _0807F780 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F784 @ =sub_807FB40
|
||||
@@ -186,8 +186,8 @@ _0807F788: .4byte gUnknown_2022B4C
|
||||
thumb_func_start sub_807F78C
|
||||
sub_807F78C: @ 807F78C
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl sub_8068974
|
||||
bl ScriptContext2_Enable
|
||||
bl player_bitmagic
|
||||
bl sub_805C780
|
||||
ldr r1, _0807F7C8 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F7CC @ =sub_807FB40
|
||||
@@ -217,8 +217,8 @@ _0807F7D4: .4byte 0x00000155
|
||||
thumb_func_start sub_807F7D8
|
||||
sub_807F7D8: @ 807F7D8
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl sub_8068974
|
||||
bl ScriptContext2_Enable
|
||||
bl player_bitmagic
|
||||
bl sub_805C780
|
||||
ldr r1, _0807F804 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F808 @ =sub_80A0F4C
|
||||
@@ -242,8 +242,8 @@ _0807F80C: .4byte gUnknown_2022B4C
|
||||
thumb_func_start sub_807F810
|
||||
sub_807F810: @ 807F810
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl sub_8068974
|
||||
bl ScriptContext2_Enable
|
||||
bl player_bitmagic
|
||||
bl sub_805C780
|
||||
ldr r1, _0807F854 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F858 @ =sub_807FB40
|
||||
@@ -297,10 +297,10 @@ sub_807F888: @ 807F888
|
||||
ldr r0, _0807F8B4 @ =gUnknown_202402C
|
||||
movs r1, 0xD
|
||||
movs r2, 0x5
|
||||
bl sub_803DF00
|
||||
bl sub_8069940
|
||||
bl CreateMaleMon
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807F8B8 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F8BC @ =sub_80568E0
|
||||
ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
str r0, [r1, 0x8]
|
||||
ldr r1, _0807F8C0 @ =gUnknown_2022B4C
|
||||
movs r0, 0x80
|
||||
@@ -314,14 +314,14 @@ sub_807F888: @ 807F888
|
||||
.align 2, 0
|
||||
_0807F8B4: .4byte gUnknown_202402C
|
||||
_0807F8B8: .4byte gUnknown_30030F0
|
||||
_0807F8BC: .4byte sub_80568E0
|
||||
_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
_0807F8C0: .4byte gUnknown_2022B4C
|
||||
thumb_func_end sub_807F888
|
||||
|
||||
thumb_func_start sub_807F8C4
|
||||
sub_807F8C4: @ 807F8C4
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807F8F8 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F8FC @ =sub_807FBA0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -350,7 +350,7 @@ _0807F900: .4byte gUnknown_2022B4C
|
||||
sub_807F904: @ 807F904
|
||||
push {lr}
|
||||
sub sp, 0xC
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807F944 @ =gUnknown_30030F0
|
||||
ldr r0, _0807F948 @ =sub_807FBF0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -374,7 +374,7 @@ sub_807F904: @ 807F904
|
||||
movs r1, 0x69
|
||||
movs r2, 0x1E
|
||||
movs r3, 0x1F
|
||||
bl sub_803DE00
|
||||
bl CreateMonWithGenderNatureLetter
|
||||
b _0807F960
|
||||
.align 2, 0
|
||||
_0807F944: .4byte gUnknown_30030F0
|
||||
@@ -413,7 +413,7 @@ _0807F994: .4byte gUnknown_841D148
|
||||
thumb_func_start sub_807F998
|
||||
sub_807F998: @ 807F998
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807F9CC @ =gUnknown_30030F0
|
||||
ldr r0, _0807F9D0 @ =sub_807FBA0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -441,7 +441,7 @@ _0807F9D4: .4byte gUnknown_2022B4C
|
||||
thumb_func_start sub_807F9D8
|
||||
sub_807F9D8: @ 807F9D8
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807FA0C @ =gUnknown_30030F0
|
||||
ldr r0, _0807FA10 @ =sub_807FBA0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -451,7 +451,7 @@ sub_807F9D8: @ 807F9D8
|
||||
str r0, [r1]
|
||||
ldr r0, _0807FA18 @ =gUnknown_202402C
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r0, 0
|
||||
@@ -513,7 +513,7 @@ _0807FA56:
|
||||
thumb_func_start sub_807FA68
|
||||
sub_807FA68: @ 807FA68
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807FA90 @ =gUnknown_30030F0
|
||||
ldr r0, _0807FA94 @ =sub_807FBA0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -552,7 +552,7 @@ _0807FAAA:
|
||||
thumb_func_start sub_807FABC
|
||||
sub_807FABC: @ 807FABC
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r1, _0807FAEC @ =gUnknown_30030F0
|
||||
ldr r0, _0807FAF0 @ =sub_807FBA0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -588,13 +588,13 @@ sub_807FAF8: @ 807FAF8
|
||||
thumb_func_start sub_807FB08
|
||||
sub_807FB08: @ 807FB08
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl sub_8068974
|
||||
bl ScriptContext2_Enable
|
||||
bl player_bitmagic
|
||||
bl sub_805C780
|
||||
ldr r1, _0807FB38 @ =gUnknown_30030F0
|
||||
ldr r0, _0807FB3C @ =sub_807FAF8
|
||||
str r0, [r1, 0x8]
|
||||
bl sub_804C1F0
|
||||
bl copy_player_party_to_sav1
|
||||
bl sub_8159F40
|
||||
bl sub_807FF34
|
||||
lsls r0, 24
|
||||
@@ -622,22 +622,22 @@ sub_807FB40: @ 807FB40
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
movs r1, 0x80
|
||||
bl sub_80072E8
|
||||
bl ResetOamRange
|
||||
ldr r0, _0807FB78 @ =gUnknown_2023E8A
|
||||
ldrb r0, [r0]
|
||||
bl sub_80800D0
|
||||
cmp r0, 0x1
|
||||
bne _0807FB80
|
||||
ldr r0, _0807FB7C @ =sub_80566A4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0807FB8C
|
||||
.align 2, 0
|
||||
_0807FB74: .4byte 0x01000100
|
||||
_0807FB78: .4byte gUnknown_2023E8A
|
||||
_0807FB7C: .4byte sub_80566A4
|
||||
_0807FB80:
|
||||
ldr r0, _0807FB94 @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
ldr r0, _0807FB94 @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
ldr r1, _0807FB98 @ =gUnknown_3005020
|
||||
ldr r0, _0807FB9C @ =sub_807E3EC
|
||||
str r0, [r1]
|
||||
@@ -646,7 +646,7 @@ _0807FB8C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0807FB94: .4byte sub_80567DC
|
||||
_0807FB94: .4byte c2_exit_to_overworld_2_switch
|
||||
_0807FB98: .4byte gUnknown_3005020
|
||||
_0807FB9C: .4byte sub_807E3EC
|
||||
thumb_func_end sub_807FB40
|
||||
@@ -665,28 +665,28 @@ sub_807FBA0: @ 807FBA0
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
movs r1, 0x80
|
||||
bl sub_80072E8
|
||||
bl ResetOamRange
|
||||
ldr r0, _0807FBD8 @ =gUnknown_2023E8A
|
||||
ldrb r0, [r0]
|
||||
bl sub_80800D0
|
||||
cmp r0, 0x1
|
||||
bne _0807FBE0
|
||||
ldr r0, _0807FBDC @ =sub_80566A4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0807FBE6
|
||||
.align 2, 0
|
||||
_0807FBD4: .4byte 0x01000100
|
||||
_0807FBD8: .4byte gUnknown_2023E8A
|
||||
_0807FBDC: .4byte sub_80566A4
|
||||
_0807FBE0:
|
||||
ldr r0, _0807FBEC @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
_0807FBE6:
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0807FBEC: .4byte sub_80568E0
|
||||
_0807FBEC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_807FBA0
|
||||
|
||||
thumb_func_start sub_807FBF0
|
||||
@@ -703,7 +703,7 @@ sub_807FBF0: @ 807FBF0
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
movs r1, 0x80
|
||||
bl sub_80072E8
|
||||
bl ResetOamRange
|
||||
ldr r4, _0807FC28 @ =gUnknown_2023E8A
|
||||
ldrb r0, [r4]
|
||||
bl sub_80800D0
|
||||
@@ -711,7 +711,7 @@ sub_807FBF0: @ 807FBF0
|
||||
cmp r1, 0
|
||||
beq _0807FC30
|
||||
ldr r0, _0807FC2C @ =sub_80566A4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0807FC4C
|
||||
.align 2, 0
|
||||
_0807FC24: .4byte 0x01000100
|
||||
@@ -731,8 +731,8 @@ _0807FC40:
|
||||
movs r0, 0x1
|
||||
strh r0, [r1]
|
||||
_0807FC46:
|
||||
ldr r0, _0807FC58 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _0807FC58 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
_0807FC4C:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
@@ -740,7 +740,7 @@ _0807FC4C:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0807FC54: .4byte gUnknown_20370D0
|
||||
_0807FC58: .4byte sub_80568E0
|
||||
_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_807FBF0
|
||||
|
||||
thumb_func_start sub_807FC5C
|
||||
@@ -751,7 +751,7 @@ sub_807FC5C: @ 807FC5C
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -862,7 +862,7 @@ _0807FD2C:
|
||||
b _0807FD88
|
||||
_0807FD58:
|
||||
movs r0, 0x8
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807FD86
|
||||
@@ -901,7 +901,7 @@ sub_807FD90: @ 807FD90
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -960,7 +960,7 @@ _0807FDFE:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r1, r0, 0
|
||||
movs r0, 0xCE
|
||||
lsls r0, 1
|
||||
@@ -970,12 +970,12 @@ _0807FDFE:
|
||||
beq _0807FE42
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _0807FE42
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x38
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r0, r7, r0
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
@@ -1131,7 +1131,7 @@ sub_807FF34: @ 807FF34
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, _0807FF64 @ =gUnknown_202402C
|
||||
movs r1, 0x38
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -1286,7 +1286,7 @@ sub_8080060: @ 8080060
|
||||
push {r4,lr}
|
||||
ldr r0, _08080084 @ =gUnknown_202402C
|
||||
movs r1, 0x38
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -1511,7 +1511,7 @@ sub_80801F0: @ 80801F0
|
||||
ldr r2, [r1]
|
||||
ldrb r1, [r2, 0x5]
|
||||
ldrb r2, [r2, 0x4]
|
||||
bl sub_805DF60
|
||||
bl GetFieldObjectIdByLocalIdAndMap
|
||||
ldr r1, _08080224 @ =gUnknown_3005074
|
||||
strb r0, [r1]
|
||||
_08080212:
|
||||
@@ -1661,8 +1661,8 @@ sub_8080334: @ 8080334
|
||||
adds r0, r1, 0
|
||||
bl sub_8080228
|
||||
ldr r0, _08080374 @ =gUnknown_81A4EB4
|
||||
bl sub_8069AE4
|
||||
bl sub_8069940
|
||||
bl ScriptContext1_SetupScript
|
||||
bl ScriptContext2_Enable
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1703,12 +1703,12 @@ sub_8080398: @ 8080398
|
||||
ldrb r0, [r4, 0x18]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
bl sub_806365C
|
||||
bl npc_running_behaviour_by_direction
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8063610
|
||||
bl npc_set_running_behaviour_etc
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1770,8 +1770,8 @@ sub_8080410: @ 8080410
|
||||
bx r0
|
||||
thumb_func_end sub_8080410
|
||||
|
||||
thumb_func_start sub_8080424
|
||||
sub_8080424: @ 8080424
|
||||
thumb_func_start HasTrainerAlreadyBeenFought
|
||||
HasTrainerAlreadyBeenFought: @ 8080424
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
movs r1, 0xA0
|
||||
@@ -1783,10 +1783,10 @@ sub_8080424: @ 8080424
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8080424
|
||||
thumb_func_end HasTrainerAlreadyBeenFought
|
||||
|
||||
thumb_func_start sub_808043C
|
||||
sub_808043C: @ 808043C
|
||||
thumb_func_start trainer_flag_set
|
||||
trainer_flag_set: @ 808043C
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
movs r1, 0xA0
|
||||
@@ -1796,10 +1796,10 @@ sub_808043C: @ 808043C
|
||||
bl sub_806E680
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_808043C
|
||||
thumb_func_end trainer_flag_set
|
||||
|
||||
thumb_func_start sub_8080450
|
||||
sub_8080450: @ 8080450
|
||||
thumb_func_start trainer_flag_clear
|
||||
trainer_flag_clear: @ 8080450
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
movs r1, 0xA0
|
||||
@@ -1809,7 +1809,7 @@ sub_8080450: @ 8080450
|
||||
bl sub_806E6A8
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8080450
|
||||
thumb_func_end trainer_flag_clear
|
||||
|
||||
thumb_func_start sub_8080464
|
||||
sub_8080464: @ 8080464
|
||||
@@ -1836,7 +1836,7 @@ _0808048C:
|
||||
ldr r0, _080804A8 @ =sub_80804AC
|
||||
str r0, [r1, 0x8]
|
||||
bl sub_807F868
|
||||
bl sub_8069B28
|
||||
bl ScriptContext1_Stop
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1878,14 +1878,14 @@ _080804E8:
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
_080804EE:
|
||||
ldr r0, _08080504 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _08080504 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
bl sub_80803FC
|
||||
bl sub_81139BC
|
||||
b _0808054E
|
||||
.align 2, 0
|
||||
_08080500: .4byte gUnknown_20370D0
|
||||
_08080504: .4byte sub_80568E0
|
||||
_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
_08080508:
|
||||
ldr r0, _0808051C @ =gUnknown_20386AE
|
||||
ldrh r1, [r0]
|
||||
@@ -1893,12 +1893,12 @@ _08080508:
|
||||
lsls r0, 3
|
||||
cmp r1, r0
|
||||
bne _08080524
|
||||
ldr r0, _08080520 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _08080520 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
b _0808054E
|
||||
.align 2, 0
|
||||
_0808051C: .4byte gUnknown_20386AE
|
||||
_08080520: .4byte sub_80568E0
|
||||
_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
_08080524:
|
||||
ldr r0, _08080538 @ =gUnknown_2023E8A
|
||||
ldrb r0, [r0]
|
||||
@@ -1907,21 +1907,21 @@ _08080524:
|
||||
bne _08080540
|
||||
_08080530:
|
||||
ldr r0, _0808053C @ =sub_80566A4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0808054E
|
||||
.align 2, 0
|
||||
_08080538: .4byte gUnknown_2023E8A
|
||||
_0808053C: .4byte sub_80566A4
|
||||
_08080540:
|
||||
ldr r0, _08080554 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
bl sub_80803FC
|
||||
bl sub_81139BC
|
||||
_0808054E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08080554: .4byte sub_80568E0
|
||||
_08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_80804AC
|
||||
|
||||
thumb_func_start sub_8080558
|
||||
@@ -1933,12 +1933,12 @@ sub_8080558: @ 8080558
|
||||
lsls r0, 3
|
||||
cmp r1, r0
|
||||
bne _08080578
|
||||
ldr r0, _08080574 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _08080574 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
b _080805A6
|
||||
.align 2, 0
|
||||
_08080570: .4byte gUnknown_20386AE
|
||||
_08080574: .4byte sub_80568E0
|
||||
_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
_08080578:
|
||||
ldr r0, _0808058C @ =gUnknown_2023E8A
|
||||
ldrb r0, [r0]
|
||||
@@ -1946,14 +1946,14 @@ _08080578:
|
||||
cmp r0, 0x1
|
||||
bne _08080594
|
||||
ldr r0, _08080590 @ =sub_80566A4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _080805A6
|
||||
.align 2, 0
|
||||
_0808058C: .4byte gUnknown_2023E8A
|
||||
_08080590: .4byte sub_80566A4
|
||||
_08080594:
|
||||
ldr r0, _080805AC @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
bl sub_80803FC
|
||||
bl sub_810CDE8
|
||||
bl sub_81138F8
|
||||
@@ -1961,7 +1961,7 @@ _080805A6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080805AC: .4byte sub_80568E0
|
||||
_080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_8080558
|
||||
|
||||
thumb_func_start sub_80805B0
|
||||
@@ -1974,7 +1974,7 @@ sub_80805B0: @ 80805B0
|
||||
ldr r0, _080805D4 @ =sub_8080558
|
||||
str r0, [r1, 0x8]
|
||||
bl sub_807F868
|
||||
bl sub_8069B28
|
||||
bl ScriptContext1_Stop
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2094,7 +2094,7 @@ _080806B4: .4byte 0x0000011d
|
||||
_080806B8:
|
||||
ldr r0, _080806C4 @ =0x0000011b
|
||||
_080806BA:
|
||||
bl sub_8071A74
|
||||
bl PlayNewMapMusic
|
||||
_080806BE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+40
-40
@@ -328,7 +328,7 @@ _080E5BD8:
|
||||
.align 2, 0
|
||||
_080E5BE8: .4byte gUnknown_300500C
|
||||
_080E5BEC:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _080E5C20 @ =gUnknown_300500C
|
||||
ldr r4, [r1]
|
||||
lsls r0, 16
|
||||
@@ -418,7 +418,7 @@ _080E5C90:
|
||||
adds r7, r6, 0
|
||||
mov r8, r5
|
||||
_080E5CA2:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0xFF
|
||||
ands r1, r0
|
||||
lsls r2, r1, 2
|
||||
@@ -488,7 +488,7 @@ _080E5D2C:
|
||||
adds r7, r6, 0
|
||||
mov r8, r5
|
||||
_080E5D30:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0xFF
|
||||
ands r1, r0
|
||||
lsls r0, r1, 2
|
||||
@@ -556,7 +556,7 @@ _080E5DB4: .4byte 0x0000056c
|
||||
_080E5DB8:
|
||||
adds r7, r5, 0
|
||||
_080E5DBA:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0xFF
|
||||
ands r1, r0
|
||||
lsls r0, r1, 4
|
||||
@@ -895,7 +895,7 @@ _080E602C:
|
||||
adds r5, r7, 0
|
||||
cmp r5, 0x4
|
||||
ble _080E5FC2
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r1, r8
|
||||
@@ -1133,7 +1133,7 @@ sub_80E61DC: @ 80E61DC
|
||||
add r4, sp, 0xC
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
bl sub_803DA34
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r1, _080E6210 @ =gUnknown_300500C
|
||||
ldr r0, [r1]
|
||||
ldr r2, _080E6214 @ =0x0000056c
|
||||
@@ -1300,7 +1300,7 @@ _080E6328:
|
||||
str r0, [sp, 0x20]
|
||||
movs r6, 0
|
||||
_080E6340:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0xFF
|
||||
ands r1, r0
|
||||
ldr r2, [sp, 0x1C]
|
||||
@@ -1342,7 +1342,7 @@ _080E6388:
|
||||
movs r1, 0xB
|
||||
movs r2, 0
|
||||
str r3, [sp, 0x24]
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r3, [sp, 0x24]
|
||||
ldrh r2, [r3]
|
||||
cmp r0, r2
|
||||
@@ -1366,14 +1366,14 @@ _080E63B8:
|
||||
movs r1, 0xC
|
||||
movs r2, 0
|
||||
str r3, [sp, 0x24]
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r3, [sp, 0x24]
|
||||
cmp r0, 0
|
||||
beq _080E63E8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xC
|
||||
movs r2, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, 0x2]
|
||||
lsls r1, 1
|
||||
@@ -1426,7 +1426,7 @@ _080E6412:
|
||||
str r2, [sp]
|
||||
ldr r2, [sp, 0x10]
|
||||
ldr r3, [sp, 0x14]
|
||||
bl sub_803E01C
|
||||
bl CreateMonWithEVSpread
|
||||
movs r5, 0
|
||||
adds r0, r6, 0x1
|
||||
mov r9, r0
|
||||
@@ -1444,7 +1444,7 @@ _080E6452:
|
||||
lsrs r2, 24
|
||||
adds r0, r7, r3
|
||||
str r3, [sp, 0x24]
|
||||
bl sub_803E964
|
||||
bl SetMonMoveSlot
|
||||
ldrh r0, [r4]
|
||||
ldr r3, [sp, 0x24]
|
||||
cmp r0, 0xDA
|
||||
@@ -1502,7 +1502,7 @@ sub_80E64C0: @ 80E64C0
|
||||
adds r5, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r4, r1, 24
|
||||
bl sub_8043298
|
||||
bl SpeciesToNationalPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x1
|
||||
@@ -1514,7 +1514,7 @@ sub_80E64C0: @ 80E64C0
|
||||
bne _080E64EC
|
||||
ldr r0, _080E6514 @ =gUnknown_2021CD0
|
||||
ldr r1, _080E6518 @ =gUnknown_83FE859
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
_080E64EC:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
@@ -1526,7 +1526,7 @@ _080E64EC:
|
||||
ldr r0, _080E651C @ =gUnknown_8245EE0
|
||||
adds r1, r0
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
cmp r4, 0x5
|
||||
beq _080E6538
|
||||
cmp r4, 0x5
|
||||
@@ -1547,14 +1547,14 @@ _080E6520:
|
||||
_080E652A:
|
||||
ldr r1, _080E6534 @ =gUnknown_83FE85E
|
||||
adds r0, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080E6554
|
||||
.align 2, 0
|
||||
_080E6534: .4byte gUnknown_83FE85E
|
||||
_080E6538:
|
||||
ldr r0, _080E6544 @ =gUnknown_2021CD0
|
||||
ldr r1, _080E6548 @ =gUnknown_83FE85C
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080E6554
|
||||
.align 2, 0
|
||||
_080E6544: .4byte gUnknown_2021CD0
|
||||
@@ -1562,7 +1562,7 @@ _080E6548: .4byte gUnknown_83FE85C
|
||||
_080E654C:
|
||||
ldr r0, _080E655C @ =gUnknown_2021CD0
|
||||
ldr r1, _080E6560 @ =gUnknown_83FE859
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
_080E6554:
|
||||
adds r0, r4, 0
|
||||
pop {r4-r6}
|
||||
@@ -1723,7 +1723,7 @@ _080E6662:
|
||||
adds r5, r0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r8, r0
|
||||
mov r1, r8
|
||||
lsls r1, 16
|
||||
@@ -1731,19 +1731,19 @@ _080E6662:
|
||||
mov r8, r1
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xC
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r6, r0, 0
|
||||
lsls r6, 16
|
||||
lsrs r6, 16
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x38
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r2, r0, 0
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
@@ -1795,7 +1795,7 @@ _080E66F2:
|
||||
_080E6704:
|
||||
ldr r4, _080E672C @ =gUnknown_2021CD0
|
||||
adds r0, r4, 0
|
||||
bl sub_8008E08
|
||||
bl StringLength
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
subs r0, r7, 0x1
|
||||
@@ -1820,7 +1820,7 @@ _080E6740:
|
||||
ldr r1, _080E674C @ =gUnknown_83FE864
|
||||
_080E6742:
|
||||
adds r0, r4, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _080E6770
|
||||
.align 2, 0
|
||||
_080E674C: .4byte gUnknown_83FE864
|
||||
@@ -1991,7 +1991,7 @@ _080E6874:
|
||||
ldr r0, [r6]
|
||||
adds r0, r1
|
||||
movs r1, 0xC
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r1, sp
|
||||
strh r0, [r1]
|
||||
ldr r0, _080E68A8 @ =gUnknown_2024284
|
||||
@@ -2010,14 +2010,14 @@ _080E68A8: .4byte gUnknown_2024284
|
||||
_080E68AC:
|
||||
bl sub_80E7550
|
||||
_080E68B0:
|
||||
ldr r0, _080E68C0 @ =sub_80568E0
|
||||
bl sub_8000544
|
||||
ldr r0, _080E68C0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080E68C0: .4byte sub_80568E0
|
||||
_080E68C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_80E6854
|
||||
|
||||
thumb_func_start sub_80E68C4
|
||||
@@ -2035,9 +2035,9 @@ sub_80E68C4: @ 80E68C4
|
||||
str r1, [r0, 0x8]
|
||||
bl sub_80563F0
|
||||
ldr r0, _080E68FC @ =sub_800FD9C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080E68EC:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -2093,7 +2093,7 @@ _080E6948:
|
||||
ldr r0, _080E6990 @ =gUnknown_2024284
|
||||
adds r0, r4, r0
|
||||
movs r1, 0xC
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r1, sp
|
||||
strh r0, [r1]
|
||||
adds r4, 0x38
|
||||
@@ -2108,7 +2108,7 @@ _080E6948:
|
||||
_080E6970:
|
||||
ldr r0, _080E6994 @ =sub_80E68C4
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r0, 0
|
||||
bl sub_8044090
|
||||
bl sub_8080060
|
||||
@@ -2121,7 +2121,7 @@ _080E698C: .4byte gUnknown_3005008
|
||||
_080E6990: .4byte gUnknown_2024284
|
||||
_080E6994: .4byte sub_80E68C4
|
||||
_080E6998:
|
||||
bl sub_803DA34
|
||||
bl ZeroEnemyPartyMons
|
||||
movs r5, 0
|
||||
ldr r4, _080E69F0 @ =gUnknown_300500C
|
||||
_080E69A0:
|
||||
@@ -2148,7 +2148,7 @@ _080E69A0:
|
||||
strh r0, [r1]
|
||||
ldr r0, _080E6A08 @ =sub_80E68C4
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r0, 0
|
||||
bl sub_8044090
|
||||
bl sub_8080060
|
||||
@@ -2802,7 +2802,7 @@ _080E6F0E:
|
||||
bl sub_805490C
|
||||
adds r0, r5, 0x4
|
||||
ldr r1, [r4]
|
||||
bl sub_8008D54
|
||||
bl StringCopy7
|
||||
adds r0, r6, 0
|
||||
bl sub_80E7188
|
||||
strh r0, [r5, 0x2]
|
||||
@@ -2921,7 +2921,7 @@ _080E7016:
|
||||
orrs r0, r2
|
||||
strb r0, [r1]
|
||||
movs r0, 0x2
|
||||
bl sub_80DA364
|
||||
bl TrySavingData
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -3160,7 +3160,7 @@ sub_80E71D0: @ 80E71D0
|
||||
subs r0, 0x1
|
||||
cmp r0, 0x5
|
||||
ble _080E7220
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r4, [r4]
|
||||
ldr r5, _080E721C @ =gUnknown_84020E6
|
||||
lsls r0, 16
|
||||
@@ -3180,7 +3180,7 @@ _080E7214: .4byte gUnknown_300500C
|
||||
_080E7218: .4byte 0x0000055c
|
||||
_080E721C: .4byte gUnknown_84020E6
|
||||
_080E7220:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r4, [r4]
|
||||
ldr r5, _080E7248 @ =gUnknown_84020DA
|
||||
lsls r0, 16
|
||||
@@ -3298,7 +3298,7 @@ _080E72EA:
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
adds r1, r7, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _080E731A
|
||||
movs r0, 0x1
|
||||
@@ -3372,7 +3372,7 @@ _080E7372:
|
||||
bl sub_805490C
|
||||
adds r0, r7, 0x4
|
||||
ldr r1, [r5]
|
||||
bl sub_8008D54
|
||||
bl StringCopy7
|
||||
movs r0, 0x1
|
||||
strh r0, [r7, 0x2]
|
||||
movs r6, 0x7
|
||||
|
||||
+179
-179
File diff suppressed because it is too large
Load Diff
+242
-242
File diff suppressed because it is too large
Load Diff
+35
-35
@@ -27,7 +27,7 @@ _0802E050:
|
||||
movs r4, 0x3
|
||||
_0802E060:
|
||||
movs r0, 0x8
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
stm r5!, {r0}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
@@ -36,69 +36,69 @@ _0802E06E:
|
||||
ldr r4, _0802E120 @ =gUnknown_2023FE8
|
||||
movs r0, 0x80
|
||||
lsls r0, 2
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E124 @ =gUnknown_2023FF4
|
||||
movs r0, 0x20
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r0, 0xA0
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1]
|
||||
movs r0, 0x10
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x4]
|
||||
movs r0, 0x24
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x8]
|
||||
movs r0, 0x24
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0xC]
|
||||
movs r0, 0xC
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x10]
|
||||
movs r0, 0x1C
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x14]
|
||||
movs r0, 0x30
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x18]
|
||||
movs r0, 0x24
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x1C]
|
||||
ldr r4, _0802E128 @ =gUnknown_2023FEC
|
||||
movs r5, 0x80
|
||||
lsls r5, 5
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E12C @ =gUnknown_2023FF0
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E130 @ =gUnknown_2022BB8
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E134 @ =gUnknown_2022BBC
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
adds r1, r0, 0
|
||||
str r1, [r4]
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x2
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -136,7 +136,7 @@ _0802E14C:
|
||||
movs r4, 0x3
|
||||
_0802E15E:
|
||||
ldr r0, [r5]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
stm r5!, {r6}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
@@ -148,59 +148,59 @@ _0802E16C:
|
||||
beq _0802E200
|
||||
ldr r4, _0802E214 @ =gUnknown_2023FE8
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r5, 0
|
||||
str r5, [r4]
|
||||
ldr r0, [r6]
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x4]
|
||||
ldr r0, [r0, 0x8]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x8]
|
||||
ldr r0, [r0, 0xC]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0xC]
|
||||
ldr r0, [r0, 0x10]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x10]
|
||||
ldr r0, [r0, 0x14]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x14]
|
||||
ldr r0, [r0, 0x18]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x18]
|
||||
ldr r0, [r0, 0x1C]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x1C]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r6]
|
||||
ldr r4, _0802E218 @ =gUnknown_2023FEC
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E21C @ =gUnknown_2023FF0
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E220 @ =gUnknown_2022BB8
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E224 @ =gUnknown_2022BBC
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
_0802E200:
|
||||
pop {r4-r6}
|
||||
@@ -229,11 +229,11 @@ sub_802E228: @ 802E228
|
||||
cmp r0, 0
|
||||
beq _0802E274
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r0, 0x3
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _0802E270 @ =gUnknown_2023BE4
|
||||
@@ -256,7 +256,7 @@ _0802E26C: .4byte gUnknown_2022B4C
|
||||
_0802E270: .4byte gUnknown_2023BE4
|
||||
_0802E274:
|
||||
movs r0, 0x1
|
||||
bl sub_80751E8
|
||||
bl GetBankByIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_0802E27E:
|
||||
|
||||
+14
-14
@@ -64,10 +64,10 @@ sub_815F74C: @ 815F74C
|
||||
ldr r0, _0815F7C4 @ =0x0000ffff
|
||||
bl sub_8000B94
|
||||
movs r0, 0x1
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
bl m4aSoundVSyncOff
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r4, 0
|
||||
str r4, [sp]
|
||||
ldr r0, _0815F7C8 @ =0x040000d4
|
||||
@@ -88,14 +88,14 @@ sub_815F74C: @ 815F74C
|
||||
ldr r1, _0815F7D0 @ =0x85000100
|
||||
str r1, [r0, 0x8]
|
||||
ldr r0, [r0, 0x8]
|
||||
bl sub_8006B10
|
||||
bl sub_80773BC
|
||||
bl sub_8087E64
|
||||
bl ResetSpriteData
|
||||
bl ResetTasks
|
||||
bl remove_some_task
|
||||
ldr r0, _0815F7D4 @ =gUnknown_3005ECC
|
||||
strb r4, [r0]
|
||||
ldr r0, _0815F7D8 @ =sub_815F7F0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0815F7DC @ =gUnknown_3005090
|
||||
@@ -105,7 +105,7 @@ sub_815F74C: @ 815F74C
|
||||
adds r1, r2
|
||||
strh r4, [r1, 0x8]
|
||||
ldr r0, _0815F7E0 @ =sub_815F7E4
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -124,7 +124,7 @@ _0815F7E0: .4byte sub_815F7E4
|
||||
thumb_func_start sub_815F7E4
|
||||
sub_815F7E4: @ 815F7E4
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl RunTasks
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_815F7E4
|
||||
@@ -216,7 +216,7 @@ _0815F890:
|
||||
adds r1, 0x4B
|
||||
movs r4, 0
|
||||
strb r4, [r1]
|
||||
bl sub_800BC20
|
||||
bl MultiBootInit
|
||||
strh r4, [r5, 0x2]
|
||||
movs r0, 0x5
|
||||
b _0815F9A4
|
||||
@@ -256,7 +256,7 @@ _0815F8C8:
|
||||
str r0, [sp]
|
||||
adds r0, r4, 0
|
||||
movs r3, 0x4
|
||||
bl sub_800C0BC
|
||||
bl MultiBootStartMaster
|
||||
strh r6, [r5, 0x2]
|
||||
movs r0, 0x6
|
||||
b _0815F9A4
|
||||
@@ -270,7 +270,7 @@ _0815F920:
|
||||
strh r0, [r5, 0x2]
|
||||
_0815F924:
|
||||
adds r0, r4, 0
|
||||
bl sub_800BC5C
|
||||
bl MultiBootMain
|
||||
ldr r1, _0815F930 @ =gUnknown_3005EF4
|
||||
str r0, [r1]
|
||||
b _0815F9A6
|
||||
@@ -279,11 +279,11 @@ _0815F930: .4byte gUnknown_3005EF4
|
||||
_0815F934:
|
||||
ldr r4, _0815F954 @ =gUnknown_3005F00
|
||||
adds r0, r4, 0
|
||||
bl sub_800BC5C
|
||||
bl MultiBootMain
|
||||
ldr r1, _0815F958 @ =gUnknown_3005EF4
|
||||
str r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_800C180
|
||||
bl MultiBootCheckComplete
|
||||
cmp r0, 0
|
||||
beq _0815F95C
|
||||
movs r0, 0x3
|
||||
@@ -312,7 +312,7 @@ _0815F96E:
|
||||
cmp r0, 0
|
||||
beq _0815F9A6
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_80008D8
|
||||
b _0815F9A6
|
||||
.align 2, 0
|
||||
|
||||
+155
-155
@@ -17,12 +17,12 @@ sub_813CD50: @ 813CD50
|
||||
lsrs r6, r2, 24
|
||||
ldr r7, _0813CD78 @ =gUnknown_203F36C
|
||||
ldr r0, _0813CD7C @ =0x00000814
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r7]
|
||||
cmp r0, 0
|
||||
bne _0813CD80
|
||||
adds r0, r4, 0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0813CDE2
|
||||
.align 2, 0
|
||||
_0813CD78: .4byte gUnknown_203F36C
|
||||
@@ -79,7 +79,7 @@ _0813CDB8:
|
||||
mov r1, r12
|
||||
strh r0, [r1]
|
||||
mov r0, r8
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_0813CDE2:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -97,11 +97,11 @@ _0813CDFC: .4byte 0x0000080c
|
||||
thumb_func_start sub_813CE00
|
||||
sub_813CE00: @ 813CE00
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80F67B8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl do_scheduled_bg_tilemap_copies_to_vram
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813CE00
|
||||
@@ -109,9 +109,9 @@ sub_813CE00: @ 813CE00
|
||||
thumb_func_start sub_813CE1C
|
||||
sub_813CE1C: @ 813CE1C
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813CE1C
|
||||
@@ -184,19 +184,19 @@ _0813CE84:
|
||||
.4byte _0813CFBE
|
||||
_0813CED0:
|
||||
bl sub_80BF768
|
||||
bl sub_80F6790
|
||||
bl clear_scheduled_bg_copies_to_vram
|
||||
b _0813CFD2
|
||||
_0813CEDA:
|
||||
bl sub_8087E64
|
||||
bl remove_some_task
|
||||
b _0813CFD2
|
||||
_0813CEE0:
|
||||
bl sub_80088F0
|
||||
bl FreeAllSpritePalettes
|
||||
b _0813CFD2
|
||||
_0813CEE6:
|
||||
bl sub_8070528
|
||||
bl ResetPaletteFade
|
||||
b _0813CFD2
|
||||
_0813CEEC:
|
||||
bl sub_8006B10
|
||||
bl ResetSpriteData
|
||||
b _0813CFD2
|
||||
_0813CEF2:
|
||||
bl sub_80984D8
|
||||
@@ -206,7 +206,7 @@ _0813CEF8:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0813CFD2
|
||||
bl sub_80773BC
|
||||
bl ResetTasks
|
||||
b _0813CFD2
|
||||
_0813CF08:
|
||||
bl sub_813D07C
|
||||
@@ -251,7 +251,7 @@ _0813CF5C:
|
||||
_0813CF62:
|
||||
ldr r0, _0813CF94 @ =sub_813DA68
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -259,7 +259,7 @@ _0813CF62:
|
||||
ldr r2, _0813CF9C @ =gUnknown_203F370
|
||||
ldrh r1, [r2, 0xA]
|
||||
ldrh r2, [r2, 0x8]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
ldr r2, _0813CFA0 @ =gUnknown_3005090
|
||||
lsls r1, r4, 2
|
||||
adds r1, r4
|
||||
@@ -287,7 +287,7 @@ _0813CFB0:
|
||||
negs r0, r0
|
||||
movs r1, 0x10
|
||||
movs r2, 0
|
||||
bl sub_80714D4
|
||||
bl BlendPalettes
|
||||
b _0813CFD2
|
||||
_0813CFBE:
|
||||
movs r0, 0x1
|
||||
@@ -298,7 +298,7 @@ _0813CFBE:
|
||||
str r2, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_0813CFD2:
|
||||
ldr r1, _0813CFE4 @ =gUnknown_30030F0
|
||||
movs r0, 0x87
|
||||
@@ -312,9 +312,9 @@ _0813CFD2:
|
||||
_0813CFE4: .4byte gUnknown_30030F0
|
||||
_0813CFE8:
|
||||
ldr r0, _0813CFF8 @ =sub_813CE1C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _0813CFFC @ =sub_813CE00
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x1
|
||||
b _0813D002
|
||||
.align 2, 0
|
||||
@@ -340,14 +340,14 @@ sub_813D00C: @ 813D00C
|
||||
movs r2, 0
|
||||
str r2, [sp]
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _0813D03C @ =sub_813D048
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r0, _0813D040 @ =sub_813CE1C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _0813D044 @ =sub_813CE00
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -370,10 +370,10 @@ sub_813D048: @ 813D048
|
||||
bne _0813D06C
|
||||
ldr r0, _0813D078 @ =gUnknown_203F370
|
||||
ldr r0, [r0]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
bl sub_813D7CC
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0813D06C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -403,22 +403,22 @@ sub_813D07C: @ 813D07C
|
||||
ldr r1, [r4]
|
||||
adds r1, 0xC
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x2
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -454,18 +454,18 @@ _0813D10C:
|
||||
beq _0813D178
|
||||
b _0813D190
|
||||
_0813D116:
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
ldr r1, _0813D12C @ =gUnknown_8E859D0
|
||||
str r4, [sp]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80F6878
|
||||
bl decompress_and_copy_tile_data_to_vram
|
||||
b _0813D17E
|
||||
.align 2, 0
|
||||
_0813D12C: .4byte gUnknown_8E859D0
|
||||
_0813D130:
|
||||
bl sub_80F682C
|
||||
bl free_temp_tile_data_buffers_if_possible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -473,7 +473,7 @@ _0813D130:
|
||||
ldr r0, _0813D148 @ =gUnknown_8E85C44
|
||||
ldr r1, [r5]
|
||||
adds r1, 0xC
|
||||
bl sub_800EBB4
|
||||
bl LZDecompressWram
|
||||
b _0813D17E
|
||||
.align 2, 0
|
||||
_0813D148: .4byte gUnknown_8E85C44
|
||||
@@ -481,7 +481,7 @@ _0813D14C:
|
||||
ldr r0, _0813D16C @ =gUnknown_8E85BA4
|
||||
movs r1, 0
|
||||
movs r2, 0x60
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
ldr r0, _0813D170 @ =gUnknown_300500C
|
||||
ldr r0, [r0]
|
||||
ldrb r0, [r0, 0x8]
|
||||
@@ -490,7 +490,7 @@ _0813D14C:
|
||||
ldr r0, _0813D174 @ =gUnknown_8E85BF4
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0813D17E
|
||||
.align 2, 0
|
||||
_0813D16C: .4byte gUnknown_8E85BA4
|
||||
@@ -498,7 +498,7 @@ _0813D170: .4byte gUnknown_300500C
|
||||
_0813D174: .4byte gUnknown_8E85BF4
|
||||
_0813D178:
|
||||
ldr r0, _0813D18C @ =gUnknown_84644A8
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
_0813D17E:
|
||||
ldr r1, [r5]
|
||||
adds r1, r6
|
||||
@@ -510,7 +510,7 @@ _0813D17E:
|
||||
_0813D18C: .4byte gUnknown_84644A8
|
||||
_0813D190:
|
||||
ldr r0, _0813D1A8 @ =gUnknown_84644B0
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
ldr r0, _0813D1AC @ =gUnknown_203F36C
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0813D1B0 @ =0x0000080c
|
||||
@@ -538,7 +538,7 @@ sub_813D1C0: @ 813D1C0
|
||||
ldr r4, _0813D1F0 @ =gUnknown_203F37C
|
||||
movs r0, 0xB0
|
||||
lsls r0, 1
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0813D1FC
|
||||
@@ -550,7 +550,7 @@ sub_813D1C0: @ 813D1C0
|
||||
subs r0, r1
|
||||
lsls r0, 2
|
||||
subs r0, r1
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0813D1FC
|
||||
@@ -717,10 +717,10 @@ sub_813D31C: @ 813D31C
|
||||
ldr r4, _0813D384 @ =gUnknown_2021D18
|
||||
ldr r1, _0813D388 @ =gUnknown_84166FF
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, _0813D38C @ =gUnknown_8416226
|
||||
adds r0, r4, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
ldr r6, _0813D390 @ =gUnknown_2021CD0
|
||||
adds r1, r5, 0
|
||||
subs r1, 0x84
|
||||
@@ -730,22 +730,22 @@ sub_813D31C: @ 813D31C
|
||||
bl sub_8008E78
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_8099E90
|
||||
ldr r1, _0813D394 @ =gUnknown_84643B4
|
||||
adds r0, r4, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
ldr r1, _0813D398 @ =gUnknown_8416703
|
||||
adds r0, r4, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
mov r0, r8
|
||||
adds r1, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
@@ -774,7 +774,7 @@ sub_813D39C: @ 813D39C
|
||||
ldr r1, [r1]
|
||||
adds r1, r2
|
||||
adds r0, r3, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -905,7 +905,7 @@ sub_813D4B0: @ 813D4B0
|
||||
lsrs r0, 24
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_8107300
|
||||
bl ListMenuGetYCoordForPrintingArrowCursor
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r4, 0
|
||||
@@ -942,7 +942,7 @@ sub_813D4D0: @ 813D4D0
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
adds r3, r5, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -983,7 +983,7 @@ sub_813D538: @ 813D538
|
||||
bl sub_809A798
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A96C
|
||||
bl ItemId_GetDescription
|
||||
adds r4, r0, 0
|
||||
b _0813D566
|
||||
.align 2, 0
|
||||
@@ -993,7 +993,7 @@ _0813D564:
|
||||
_0813D566:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x2
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
@@ -1030,7 +1030,7 @@ sub_813D594: @ 813D594
|
||||
movs r3, 0x1E
|
||||
bl sub_80F6B08
|
||||
movs r0, 0x1
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x8
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1072,7 +1072,7 @@ _0813D5EA:
|
||||
movs r1, 0xA0
|
||||
movs r2, 0x8
|
||||
movs r3, 0x78
|
||||
bl sub_8133B40
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
|
||||
movs r1, 0xD4
|
||||
movs r2, 0x78
|
||||
movs r3, 0x98
|
||||
bl sub_8133B40
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
|
||||
movs r1, 0x98
|
||||
movs r2, 0x48
|
||||
movs r3, 0x68
|
||||
bl sub_8133B40
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x6]
|
||||
add sp, 0x10
|
||||
@@ -1151,7 +1151,7 @@ sub_813D684: @ 813D684
|
||||
ldrb r0, [r1, 0x6]
|
||||
cmp r0, 0xFF
|
||||
beq _0813D69A
|
||||
bl sub_8133C30
|
||||
bl RemoveScrollIndicatorArrowPair
|
||||
ldr r1, [r4]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x6]
|
||||
@@ -1335,19 +1335,19 @@ sub_813D7CC: @ 813D7CC
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813D7DA
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0813D7DA:
|
||||
ldr r0, _0813D800 @ =gUnknown_203F37C
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813D7E6
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0813D7E6:
|
||||
ldr r0, _0813D804 @ =gUnknown_203F380
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813D7F2
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0813D7F2:
|
||||
bl sub_8003ECC
|
||||
pop {r0}
|
||||
@@ -1372,7 +1372,7 @@ sub_813D808: @ 813D808
|
||||
movs r2, 0
|
||||
str r2, [sp]
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, _0813D83C @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -1415,7 +1415,7 @@ sub_813D844: @ 813D844
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813D88C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0813D896
|
||||
.align 2, 0
|
||||
_0813D87C: .4byte gUnknown_3005098
|
||||
@@ -1426,12 +1426,12 @@ _0813D88C:
|
||||
adds r0, r4, 0
|
||||
subs r0, 0xA
|
||||
ldr r0, [r0]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_0813D896:
|
||||
bl sub_813D684
|
||||
bl sub_813D7CC
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0813D8A4:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1622,7 +1622,7 @@ sub_813D9F8: @ 813D9F8
|
||||
lsrs r6, 24
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r0, _0813DA5C @ =gUnknown_2021CD0
|
||||
lsls r4, 16
|
||||
asrs r4, 16
|
||||
@@ -1688,13 +1688,13 @@ _0813DA90:
|
||||
b _0813DB9E
|
||||
_0813DA9E:
|
||||
ldrb r0, [r7]
|
||||
bl sub_8107078
|
||||
bl ListMenuHandleInput
|
||||
adds r5, r0, 0
|
||||
ldrb r0, [r7]
|
||||
ldr r4, _0813DAE0 @ =gUnknown_203F37A
|
||||
subs r2, r4, 0x2
|
||||
adds r1, r4, 0
|
||||
bl sub_81072D4
|
||||
bl get_coro_args_x18_x1A
|
||||
ldr r0, _0813DAE4 @ =gUnknown_30030F0
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x4
|
||||
@@ -2051,7 +2051,7 @@ sub_813DDA0: @ 813DDA0
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _0813DDFE
|
||||
bl sub_810FA04
|
||||
bl ProcessMenuInputNoWrapAround
|
||||
lsls r0, 24
|
||||
asrs r4, r0, 24
|
||||
movs r0, 0x2
|
||||
@@ -2107,20 +2107,20 @@ sub_813DE0C: @ 813DE0C
|
||||
movs r0, 0x6
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r0, _0813DE60 @ =gUnknown_203F370
|
||||
ldrb r0, [r0, 0x4]
|
||||
cmp r0, 0x4
|
||||
bne _0813DE78
|
||||
ldr r4, _0813DE64 @ =gUnknown_203AD30
|
||||
ldrh r0, [r4]
|
||||
bl sub_809AA68
|
||||
bl ItemId_GetBattleFunc
|
||||
cmp r0, 0
|
||||
bne _0813DE68
|
||||
adds r0, r5, 0
|
||||
@@ -2132,19 +2132,19 @@ _0813DE60: .4byte gUnknown_203F370
|
||||
_0813DE64: .4byte gUnknown_203AD30
|
||||
_0813DE68:
|
||||
ldrh r0, [r4]
|
||||
bl sub_809AA68
|
||||
bl ItemId_GetBattleFunc
|
||||
adds r1, r0, 0
|
||||
adds r0, r5, 0
|
||||
bl _call_via_r1
|
||||
b _0813DEB0
|
||||
_0813DE78:
|
||||
bl sub_8040C3C
|
||||
bl CalculatePlayerPartyCount
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0813DEA0
|
||||
ldr r0, _0813DE9C @ =gUnknown_203AD30
|
||||
ldrh r0, [r0]
|
||||
bl sub_809A9FC
|
||||
bl ItemId_GetType
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -2157,7 +2157,7 @@ _0813DE9C: .4byte gUnknown_203AD30
|
||||
_0813DEA0:
|
||||
ldr r0, _0813DEB8 @ =gUnknown_203AD30
|
||||
ldrh r0, [r0]
|
||||
bl sub_809AA20
|
||||
bl ItemId_GetFieldFunc
|
||||
adds r1, r0, 0
|
||||
adds r0, r5, 0
|
||||
bl _call_via_r1
|
||||
@@ -2190,12 +2190,12 @@ sub_813DEBC: @ 813DEBC
|
||||
bl sub_813EB10
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x6
|
||||
bl sub_813EB10
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
adds r0, 0x9
|
||||
lsls r0, 24
|
||||
@@ -2204,7 +2204,7 @@ sub_813DEBC: @ 813DEBC
|
||||
movs r0, 0x6
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
strh r0, [r5, 0x10]
|
||||
movs r1, 0x4
|
||||
@@ -2305,13 +2305,13 @@ sub_813DFC8: @ 813DFC8
|
||||
movs r0, 0x7
|
||||
bl sub_813EA98
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_813D4B0
|
||||
@@ -2364,15 +2364,15 @@ _0813E048:
|
||||
bl sub_813EB10
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x8
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl sub_813D684
|
||||
adds r0, r5, 0
|
||||
bl sub_813DF54
|
||||
@@ -2391,13 +2391,13 @@ _0813E090:
|
||||
movs r0, 0
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_813D4B0
|
||||
@@ -2512,14 +2512,14 @@ _0813E18A:
|
||||
subs r4, 0xA
|
||||
ldrh r1, [r4, 0xA]
|
||||
ldrh r2, [r4, 0x8]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5]
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_813D4B0
|
||||
@@ -2551,14 +2551,14 @@ sub_813E200: @ 813E200
|
||||
movs r0, 0x6
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl sub_8040C3C
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl CalculatePlayerPartyCount
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0813E248
|
||||
@@ -2654,12 +2654,12 @@ sub_813E2B8: @ 813E2B8
|
||||
subs r4, 0xA
|
||||
ldrh r1, [r4, 0xA]
|
||||
ldrh r2, [r4, 0x8]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5]
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_813D4B0
|
||||
@@ -2689,13 +2689,13 @@ sub_813E320: @ 813E320
|
||||
movs r0, 0x6
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r1, _0813E378 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -2756,7 +2756,7 @@ _0813E3D4: .4byte sub_813E290
|
||||
_0813E3D8:
|
||||
ldr r0, _0813E3F0 @ =gUnknown_203F36C
|
||||
ldr r1, [r0]
|
||||
ldr r0, _0813E3F4 @ =sub_8123744
|
||||
ldr r0, _0813E3F4 @ =c2_8123744
|
||||
str r0, [r1]
|
||||
adds r0, r7, 0
|
||||
subs r0, 0x8
|
||||
@@ -2769,7 +2769,7 @@ _0813E3EA:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0813E3F0: .4byte gUnknown_203F36C
|
||||
_0813E3F4: .4byte sub_8123744
|
||||
_0813E3F4: .4byte c2_8123744
|
||||
_0813E3F8: .4byte sub_813D808
|
||||
thumb_func_end sub_813E37C
|
||||
|
||||
@@ -2809,7 +2809,7 @@ sub_813E428: @ 813E428
|
||||
adds r4, r0, r1
|
||||
ldr r6, _0813E474 @ =gUnknown_203AD30
|
||||
ldrh r0, [r6]
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _0813E488
|
||||
@@ -2896,7 +2896,7 @@ sub_813E4E4: @ 813E4E4
|
||||
bl sub_809A798
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
lsrs r0, 17
|
||||
movs r2, 0x10
|
||||
@@ -2958,13 +2958,13 @@ sub_813E568: @ 813E568
|
||||
movs r0, 0x5
|
||||
bl sub_813EACC
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_813D4B0
|
||||
@@ -3027,7 +3027,7 @@ sub_813E5B8: @ 813E5B8
|
||||
bl sub_809A798
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
lsrs r0, 17
|
||||
mov r2, r9
|
||||
@@ -3106,7 +3106,7 @@ sub_813E690: @ 813E690
|
||||
bl sub_809A798
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
lsrs r0, 17
|
||||
movs r2, 0x10
|
||||
@@ -3128,9 +3128,9 @@ _0813E6E4:
|
||||
movs r0, 0x1
|
||||
bl sub_813EA98
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl sub_813D684
|
||||
adds r0, r4, 0
|
||||
bl sub_813E4E4
|
||||
@@ -3151,13 +3151,13 @@ _0813E718:
|
||||
movs r0, 0x5
|
||||
bl sub_813EACC
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl sub_813D684
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
@@ -3182,9 +3182,9 @@ sub_813E768: @ 813E768
|
||||
ldr r0, _0813E7D4 @ =gUnknown_3005098
|
||||
adds r4, r0
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r0, _0813E7D8 @ =gUnknown_203AD30
|
||||
ldrh r0, [r0]
|
||||
ldr r1, _0813E7DC @ =gUnknown_2021CD0
|
||||
@@ -3195,7 +3195,7 @@ sub_813E768: @ 813E768
|
||||
bl sub_809A798
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
lsrs r0, 17
|
||||
movs r2, 0x10
|
||||
@@ -3258,7 +3258,7 @@ sub_813E7F0: @ 813E7F0
|
||||
mov r10, r3
|
||||
add r4, r10
|
||||
ldrh r0, [r5]
|
||||
bl sub_809A900
|
||||
bl itemid_get_market_price
|
||||
lsls r0, 16
|
||||
lsrs r0, 17
|
||||
mov r2, r8
|
||||
@@ -3266,7 +3266,7 @@ sub_813E7F0: @ 813E7F0
|
||||
ldrsh r1, [r2, r3]
|
||||
muls r1, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_809FDA0
|
||||
bl AddMoney
|
||||
ldrh r0, [r5]
|
||||
mov r2, r8
|
||||
ldrh r1, [r2, 0x10]
|
||||
@@ -3285,7 +3285,7 @@ sub_813E7F0: @ 813E7F0
|
||||
subs r4, 0xA
|
||||
ldrh r1, [r4, 0xA]
|
||||
ldrh r2, [r4, 0x8]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r1, r8
|
||||
@@ -3347,7 +3347,7 @@ _0813E8EE:
|
||||
movs r0, 0x2
|
||||
bl sub_813EA98
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0
|
||||
bl sub_813E2B8
|
||||
_0813E906:
|
||||
@@ -3379,27 +3379,27 @@ sub_813E910: @ 813E910
|
||||
ldr r0, _0813E998 @ =gUnknown_841F408
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
movs r4, 0
|
||||
_0813E946:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x2
|
||||
bls _0813E946
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r4, 0
|
||||
ldr r3, _0813E99C @ =gUnknown_203F38C
|
||||
movs r2, 0xFF
|
||||
@@ -3509,7 +3509,7 @@ _0813EA38:
|
||||
movs r1, 0
|
||||
movs r2, 0xA
|
||||
movs r3, 0xC
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
b _0813EA60
|
||||
.align 2, 0
|
||||
_0813EA4C: .4byte gUnknown_203F38C
|
||||
@@ -3519,10 +3519,10 @@ _0813EA54:
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
movs r3, 0xE
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
_0813EA60:
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r0, _0813EA74 @ =gUnknown_203F38C
|
||||
adds r0, r4, r0
|
||||
ldrb r0, [r0]
|
||||
@@ -3545,7 +3545,7 @@ sub_813EA78: @ 813EA78
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
movs r3, 0xE
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -3564,11 +3564,11 @@ sub_813EA98: @ 813EA98
|
||||
movs r1, 0
|
||||
bl sub_810F4D8
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
pop {r4}
|
||||
@@ -3591,15 +3591,15 @@ sub_813EACC: @ 813EACC
|
||||
movs r1, 0
|
||||
bl sub_810F260
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
_0813EB04:
|
||||
@@ -3656,7 +3656,7 @@ _0813EB44:
|
||||
movs r3, 0xD
|
||||
bl sub_80BF474
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x10
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -3751,7 +3751,7 @@ sub_813EC08: @ 813EC08
|
||||
movs r1, 0x28
|
||||
movs r2, 0x4C
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r1, _0813EC24 @ =gUnknown_203F39C
|
||||
strb r0, [r1]
|
||||
pop {r0}
|
||||
@@ -3780,7 +3780,7 @@ sub_813EC28: @ 813EC28
|
||||
beq _0813EC52
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _0813EC60 @ =sub_813EC64
|
||||
str r0, [r4, 0x1C]
|
||||
_0813EC52:
|
||||
@@ -3805,7 +3805,7 @@ sub_813EC64: @ 813EC64
|
||||
beq _0813EC80
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _0813EC88 @ =nullsub_8
|
||||
str r0, [r4, 0x1C]
|
||||
_0813EC80:
|
||||
|
||||
+8
-8
@@ -79,7 +79,7 @@ sub_80BD100: @ 80BD100
|
||||
lsls r4, 2
|
||||
ldr r0, _080BD160 @ =gUnknown_2036E38
|
||||
adds r4, r0
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
movs r0, 0
|
||||
@@ -195,7 +195,7 @@ sub_80BD1E8: @ 80BD1E8
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
mov r8, r2
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r7, r5, 0
|
||||
@@ -437,7 +437,7 @@ sub_80BD3A0: @ 80BD3A0
|
||||
adds r0, r6, 0
|
||||
add r1, sp, 0x4
|
||||
adds r2, r5, 0
|
||||
bl sub_8063A20
|
||||
bl MoveCoords
|
||||
add r0, sp, 0x4
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -581,7 +581,7 @@ sub_80BD4B8: @ 80BD4B8
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BD4E6
|
||||
bl sub_805C700
|
||||
bl PlayerGetZCoord
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -655,7 +655,7 @@ sub_80BD540: @ 80BD540
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -685,7 +685,7 @@ _080BD582:
|
||||
sub_80BD58C: @ 80BD58C
|
||||
push {lr}
|
||||
movs r0, 0x4
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BD5C0
|
||||
@@ -866,7 +866,7 @@ sub_80BD6C4: @ 80BD6C4
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -881,7 +881,7 @@ sub_80BD6C4: @ 80BD6C4
|
||||
beq _080BD70C
|
||||
movs r0, 0x2
|
||||
strb r0, [r5, 0x8]
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl nullsub_24
|
||||
|
||||
+3
-3
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8045274
|
||||
sub_8045274: @ 8045274
|
||||
thumb_func_start BlendPalette
|
||||
BlendPalette: @ 8045274
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -87,7 +87,7 @@ _080452FA:
|
||||
.align 2, 0
|
||||
_0804530C: .4byte gUnknown_20371F8
|
||||
_08045310: .4byte gUnknown_20375F8
|
||||
thumb_func_end sub_8045274
|
||||
thumb_func_end BlendPalette
|
||||
|
||||
thumb_func_start sub_8045314
|
||||
sub_8045314: @ 8045314
|
||||
|
||||
@@ -14,7 +14,7 @@ sub_80F7AD8: @ 80F7AD8
|
||||
lsls r0, r4, 1
|
||||
adds r0, r4
|
||||
lsls r0, 4
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r6]
|
||||
ldr r5, _080F7B28 @ =gUnknown_203ABE8
|
||||
movs r1, 0
|
||||
@@ -57,7 +57,7 @@ sub_80F7B2C: @ 80F7B2C
|
||||
push {lr}
|
||||
ldr r0, _080F7B3C @ =gUnknown_203ABE4
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -147,13 +147,13 @@ sub_80F7B80: @ 80F7B80
|
||||
strh r1, [r0, 0x26]
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8001AA8
|
||||
bl GetBgAttribute
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x9
|
||||
bl sub_8001AA8
|
||||
bl GetBgAttribute
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r2, r9
|
||||
@@ -584,7 +584,7 @@ _080F7EE6:
|
||||
movs r1, 0x1
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r7, 0
|
||||
bl sub_8002124
|
||||
bl CopyToBgTilemapBufferRect
|
||||
add r7, r9
|
||||
adds r6, 0x1
|
||||
mov r1, r10
|
||||
@@ -665,7 +665,7 @@ _080F7F7E:
|
||||
movs r1, 0x1
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r7, 0
|
||||
bl sub_8002124
|
||||
bl CopyToBgTilemapBufferRect
|
||||
add r7, r9
|
||||
adds r6, 0x1
|
||||
mov r1, r10
|
||||
|
||||
+5
-5
@@ -350,7 +350,7 @@ _0814FB22:
|
||||
lsrs r1, r2, 4
|
||||
orrs r1, r2
|
||||
lsrs r1, 24
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
b _0814F992
|
||||
_0814FB34:
|
||||
movs r0, 0x2
|
||||
@@ -418,7 +418,7 @@ _0814FB9A:
|
||||
lsrs r1, r2, 4
|
||||
orrs r1, r2
|
||||
lsrs r1, 24
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrb r0, [r6, 0x6]
|
||||
movs r1, 0
|
||||
strb r0, [r6, 0x8]
|
||||
@@ -473,7 +473,7 @@ _0814FBFC:
|
||||
orrs r3, r1
|
||||
lsrs r3, 24
|
||||
movs r1, 0
|
||||
bl sub_80044A8
|
||||
bl ScrollWindow
|
||||
movs r0, 0
|
||||
strb r0, [r6, 0x1F]
|
||||
b _0814FC62
|
||||
@@ -491,7 +491,7 @@ _0814FC38:
|
||||
orrs r3, r1
|
||||
lsrs r3, 24
|
||||
movs r1, 0
|
||||
bl sub_80044A8
|
||||
bl ScrollWindow
|
||||
ldr r0, [r5]
|
||||
ldrb r0, [r0, 0x14]
|
||||
lsls r0, 29
|
||||
@@ -510,7 +510,7 @@ _0814FC6C:
|
||||
strb r2, [r6, 0x1C]
|
||||
b _0814FB42
|
||||
_0814FC70:
|
||||
bl sub_80723E0
|
||||
bl IsSEPlaying
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
|
||||
@@ -34,15 +34,15 @@ _0813F686:
|
||||
movs r2, 0xF0
|
||||
bl sub_814FF2C
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x5
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
cmp r4, 0x1
|
||||
bne _0813F6C4
|
||||
movs r0, 0x6
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
_0813F6C4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -155,7 +155,7 @@ sub_813F75C: @ 813F75C
|
||||
movs r3, 0xE
|
||||
bl sub_80BF474
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x10
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -173,7 +173,7 @@ sub_813F7A8: @ 813F7A8
|
||||
lsrs r1, 24
|
||||
movs r2, 0x1
|
||||
movs r3, 0xD
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813F7A8
|
||||
@@ -187,7 +187,7 @@ sub_813F7C0: @ 813F7C0
|
||||
lsrs r1, 24
|
||||
movs r2, 0xA
|
||||
movs r3, 0xF
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813F7C0
|
||||
|
||||
+79
-79
@@ -14,14 +14,14 @@ sub_8080748: @ 8080748
|
||||
lsrs r5, r1, 24
|
||||
ldr r4, _08080784 @ =sub_80809F8
|
||||
adds r0, r4, 0
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
bne _0808077C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _08080788 @ =gUnknown_3005090
|
||||
@@ -361,7 +361,7 @@ sub_80809C4: @ 80809C4
|
||||
movs r0, 0x2
|
||||
bl sub_800A474
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080809EE:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -447,7 +447,7 @@ sub_8080A4C: @ 8080A4C
|
||||
movs r0, 0x15
|
||||
bl sub_80722CC
|
||||
ldr r0, _08080AA8 @ =gUnknown_81BC4CE
|
||||
bl sub_8069464
|
||||
bl ShowFieldAutoScrollMessage
|
||||
ldr r0, _08080AAC @ =sub_8080AD0
|
||||
b _08080ABE
|
||||
.align 2, 0
|
||||
@@ -458,7 +458,7 @@ _08080AB0:
|
||||
movs r0, 0x16
|
||||
bl sub_80722CC
|
||||
ldr r0, _08080AC8 @ =gUnknown_81BC54C
|
||||
bl sub_8069464
|
||||
bl ShowFieldAutoScrollMessage
|
||||
ldr r0, _08080ACC @ =sub_8080CDC
|
||||
_08080ABE:
|
||||
str r0, [r4]
|
||||
@@ -488,7 +488,7 @@ sub_8080AD0: @ 8080AD0
|
||||
bl sub_80808BC
|
||||
cmp r0, 0x1
|
||||
beq _08080B10
|
||||
bl sub_8069510
|
||||
bl textbox_any_visible
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0
|
||||
@@ -565,7 +565,7 @@ sub_8080B20: @ 8080B20
|
||||
movs r3, 0x1
|
||||
bl sub_8008E78
|
||||
ldr r0, _08080BC0 @ =gUnknown_81BC50D
|
||||
bl sub_8069464
|
||||
bl ShowFieldAutoScrollMessage
|
||||
mov r0, r9
|
||||
subs r0, 0x8
|
||||
add r0, r8
|
||||
@@ -604,7 +604,7 @@ sub_8080BC8: @ 8080BC8
|
||||
bl sub_80808BC
|
||||
cmp r0, 0x1
|
||||
beq _08080C5C
|
||||
bl sub_8069510
|
||||
bl textbox_any_visible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08080C5C
|
||||
@@ -623,7 +623,7 @@ sub_8080BC8: @ 8080BC8
|
||||
beq _08080C3C
|
||||
_08080C16:
|
||||
ldr r0, _08080C30 @ =gUnknown_81BC4CE
|
||||
bl sub_8069464
|
||||
bl ShowFieldAutoScrollMessage
|
||||
ldr r1, _08080C34 @ =gUnknown_3005090
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
@@ -752,7 +752,7 @@ sub_8080CDC: @ 8080CDC
|
||||
cmp r0, 0x1
|
||||
bhi _08080D3C
|
||||
bl sub_800AAC0
|
||||
bl sub_80694F4
|
||||
bl HideFieldMessageBox
|
||||
ldr r0, _08080D38 @ =sub_8080F78
|
||||
b _08080D72
|
||||
.align 2, 0
|
||||
@@ -766,7 +766,7 @@ _08080D3C:
|
||||
bne _08080D54
|
||||
_08080D44:
|
||||
bl sub_80098B8
|
||||
bl sub_80694F4
|
||||
bl HideFieldMessageBox
|
||||
ldr r0, _08080D50 @ =sub_8080F78
|
||||
b _08080D72
|
||||
.align 2, 0
|
||||
@@ -775,7 +775,7 @@ _08080D54:
|
||||
bl sub_800AA38
|
||||
ldr r4, _08080D7C @ =gUnknown_3005030
|
||||
strb r0, [r4]
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _08080D80 @ =gUnknown_300502C
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4]
|
||||
@@ -862,7 +862,7 @@ _08080DF6:
|
||||
_08080DFE:
|
||||
bl sub_80098B8
|
||||
_08080E02:
|
||||
bl sub_80694F4
|
||||
bl HideFieldMessageBox
|
||||
ldr r0, _08080E18 @ =gUnknown_3005090
|
||||
lsls r1, r5, 2
|
||||
adds r1, r5
|
||||
@@ -878,7 +878,7 @@ _08080E20:
|
||||
bl sub_800AA38
|
||||
ldr r4, _08080E58 @ =gUnknown_3005030
|
||||
strb r0, [r4]
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _08080E5C @ =gUnknown_300502C
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4]
|
||||
@@ -917,7 +917,7 @@ sub_8080E6C: @ 8080E6C
|
||||
bl sub_80808BC
|
||||
cmp r0, 0x1
|
||||
beq _08080F66
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
adds r4, r0, 0
|
||||
bl sub_800A8A4
|
||||
lsls r4, 24
|
||||
@@ -982,8 +982,8 @@ _08080EF8:
|
||||
bcc _08080E9A
|
||||
movs r0, 0
|
||||
bl sub_800B09C
|
||||
bl sub_800A550
|
||||
bl sub_80694F4
|
||||
bl ResetBlockReceivedFlags
|
||||
bl HideFieldMessageBox
|
||||
ldr r0, _08080F44 @ =gUnknown_20370D0
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0x1
|
||||
@@ -998,9 +998,9 @@ _08080EF8:
|
||||
adds r1, r0
|
||||
ldrh r0, [r1, 0x12]
|
||||
bl sub_80807E8
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r7, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _08080F66
|
||||
.align 2, 0
|
||||
_08080F3C: .4byte gUnknown_2022118
|
||||
@@ -1045,11 +1045,11 @@ sub_8080F78: @ 8080F78
|
||||
adds r4, r0
|
||||
ldrh r0, [r4, 0x12]
|
||||
bl sub_80807E8
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
ldrb r0, [r4, 0x12]
|
||||
bl sub_8003E3C
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08080FA6:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1075,10 +1075,10 @@ sub_8080FB4: @ 8080FB4
|
||||
adds r0, r1
|
||||
ldrh r0, [r0, 0x12]
|
||||
bl sub_80807E8
|
||||
bl sub_80694F4
|
||||
bl sub_8069B34
|
||||
bl HideFieldMessageBox
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1103,10 +1103,10 @@ sub_8080FF0: @ 8080FF0
|
||||
adds r0, r1
|
||||
ldrh r0, [r0, 0x12]
|
||||
bl sub_80807E8
|
||||
bl sub_80694F4
|
||||
bl sub_8069B34
|
||||
bl HideFieldMessageBox
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1275,7 +1275,7 @@ _0808114C: .4byte gUnknown_2022B4C
|
||||
sub_8081150: @ 8081150
|
||||
push {lr}
|
||||
ldr r0, _08081164 @ =sub_80811FC
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08081168
|
||||
@@ -1341,7 +1341,7 @@ _080811DC:
|
||||
_080811E0:
|
||||
ldr r0, _080811F8 @ =sub_80811FC
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
_080811EC:
|
||||
@@ -1371,7 +1371,7 @@ sub_80811FC: @ 80811FC
|
||||
bl sub_800A270
|
||||
ldr r0, _0808122C @ =sub_8081A90
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _0808123C
|
||||
.align 2, 0
|
||||
_08081228: .4byte gUnknown_3005098
|
||||
@@ -1484,7 +1484,7 @@ sub_80812D8: @ 80812D8
|
||||
bl sub_800A9A4
|
||||
bl sub_8009FE8
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08081300:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1536,7 +1536,7 @@ _08081344:
|
||||
_0808135C:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r1, _08081374 @ =gUnknown_202271A
|
||||
ldr r2, _08081378 @ =0x00002211
|
||||
adds r0, r2, 0
|
||||
@@ -1638,12 +1638,12 @@ _0808141A:
|
||||
adds r0, r2, 0
|
||||
strh r0, [r1]
|
||||
ldr r0, _08081448 @ =sub_800FD9C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r1, _0808144C @ =gUnknown_30030F0
|
||||
ldr r0, _08081450 @ =sub_8081668
|
||||
str r0, [r1, 0x8]
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0808143A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1693,7 +1693,7 @@ _08081480:
|
||||
_080814A0:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080814BC @ =gUnknown_202271A
|
||||
ldr r2, _080814C0 @ =0x00002211
|
||||
adds r1, r2, 0
|
||||
@@ -1723,14 +1723,14 @@ _080814DC:
|
||||
ldr r1, _080814EC @ =gUnknown_2022720
|
||||
movs r0, 0
|
||||
movs r2, 0x1C
|
||||
bl sub_800A448
|
||||
bl SendBlock
|
||||
movs r0, 0x3
|
||||
strh r0, [r6]
|
||||
b _0808160A
|
||||
.align 2, 0
|
||||
_080814EC: .4byte gUnknown_2022720
|
||||
_080814F0:
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
adds r4, r0, 0
|
||||
bl sub_800A8D4
|
||||
lsls r4, 24
|
||||
@@ -1759,7 +1759,7 @@ _08081510:
|
||||
bl sub_800B284
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
adds r5, 0x1C
|
||||
adds r4, 0x1
|
||||
_08081536:
|
||||
@@ -1861,12 +1861,12 @@ _080815EA:
|
||||
adds r0, r3, 0
|
||||
strh r0, [r1]
|
||||
ldr r0, _08081618 @ =sub_800FD9C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r1, _0808161C @ =gUnknown_30030F0
|
||||
ldr r0, _08081620 @ =sub_8081668
|
||||
str r0, [r1, 0x8]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0808160A:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -1905,14 +1905,14 @@ _0808164C:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0808165C
|
||||
ldr r0, _08081664 @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
ldr r0, _08081664 @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
_0808165C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08081664: .4byte sub_80567DC
|
||||
_08081664: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_8081624
|
||||
|
||||
thumb_func_start sub_8081668
|
||||
@@ -1956,7 +1956,7 @@ _080816C0: .4byte gUnknown_3003F3C
|
||||
_080816C4: .4byte gUnknown_2023E8A
|
||||
_080816C8:
|
||||
ldr r4, _080816E8 @ =gUnknown_202273C
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1973,7 +1973,7 @@ _080816C8:
|
||||
_080816E8: .4byte gUnknown_202273C
|
||||
_080816EC:
|
||||
ldr r4, _08081718 @ =gUnknown_202273C
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
eors r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1998,17 +1998,17 @@ _0808171C: .4byte gUnknown_30030F0
|
||||
_08081720: .4byte sub_8081624
|
||||
_08081724:
|
||||
ldr r1, _08081738 @ =gUnknown_30030F0
|
||||
ldr r0, _0808173C @ =sub_8056854
|
||||
ldr r0, _0808173C @ =c2_8056854
|
||||
_08081728:
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, _08081740 @ =sub_806FB7C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08081738: .4byte gUnknown_30030F0
|
||||
_0808173C: .4byte sub_8056854
|
||||
_0808173C: .4byte c2_8056854
|
||||
_08081740: .4byte sub_806FB7C
|
||||
thumb_func_end sub_8081668
|
||||
|
||||
@@ -2029,7 +2029,7 @@ _08081758:
|
||||
bl sub_804C440
|
||||
_08081760:
|
||||
movs r0, 0x7F
|
||||
bl sub_8055454
|
||||
bl copy_saved_warp2_bank_and_enter_x_to_warp1
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2080,7 +2080,7 @@ _080817AE:
|
||||
.align 2, 0
|
||||
_080817BC: .4byte gUnknown_81BC4AC
|
||||
_080817C0:
|
||||
bl sub_806951C
|
||||
bl IsFieldMessageBoxHidden
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08081820
|
||||
@@ -2103,12 +2103,12 @@ _080817E0:
|
||||
beq _08081806
|
||||
b _08081820
|
||||
_080817F2:
|
||||
bl sub_80694F4
|
||||
bl HideFieldMessageBox
|
||||
movs r0, 0
|
||||
strh r0, [r5, 0x8]
|
||||
bl sub_8057F70
|
||||
adds r0, r4, 0
|
||||
bl sub_807761C
|
||||
bl SwitchTaskToFollowupFunc
|
||||
b _08081820
|
||||
_08081806:
|
||||
movs r0, 0x3
|
||||
@@ -2119,8 +2119,8 @@ _0808180C:
|
||||
movs r0, 0x1
|
||||
bl sub_80F771C
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl sub_8069B34
|
||||
bl DestroyTask
|
||||
bl EnableBothScriptContexts
|
||||
_08081820:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -2134,13 +2134,13 @@ sub_8081828: @ 8081828
|
||||
ldr r4, _0808184C @ =sub_808177C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_80775E8
|
||||
bl sub_8069B28
|
||||
bl SetTaskFuncWithFollowupFunc
|
||||
bl ScriptContext1_Stop
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -2176,10 +2176,10 @@ _08081878:
|
||||
beq _080818C4
|
||||
b _080818D8
|
||||
_08081882:
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
bl sub_800A068
|
||||
b _080818B8
|
||||
_08081894:
|
||||
@@ -2212,9 +2212,9 @@ _080818C4:
|
||||
cmp r0, 0
|
||||
bne _080818D8
|
||||
ldr r0, _080818E4 @ =sub_804C718
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080818D8:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -2252,10 +2252,10 @@ _08081910:
|
||||
beq _0808195C
|
||||
b _08081970
|
||||
_0808191A:
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
bl sub_80F985C
|
||||
b _08081950
|
||||
_0808192C:
|
||||
@@ -2289,7 +2289,7 @@ _0808195C:
|
||||
beq _08081970
|
||||
bl sub_8117118
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08081970:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -2324,7 +2324,7 @@ sub_80819A4: @ 80819A4
|
||||
push {lr}
|
||||
ldr r0, _080819B4 @ =sub_8081850
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2335,7 +2335,7 @@ _080819B4: .4byte sub_8081850
|
||||
sub_80819B8: @ 80819B8
|
||||
push {lr}
|
||||
bl sub_80819A4
|
||||
bl sub_8069B28
|
||||
bl ScriptContext1_Stop
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80819B8
|
||||
@@ -2374,8 +2374,8 @@ sub_8081A04: @ 8081A04
|
||||
push {lr}
|
||||
ldr r0, _08081A18 @ =sub_808177C
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl sub_8069B28
|
||||
bl CreateTask
|
||||
bl ScriptContext1_Stop
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2387,13 +2387,13 @@ sub_8081A1C: @ 8081A1C
|
||||
push {lr}
|
||||
ldr r0, _08081A2C @ =gUnknown_20370C4
|
||||
ldrb r0, [r0]
|
||||
ldr r1, _08081A30 @ =sub_80568E0
|
||||
ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
bl sub_808B700
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08081A2C: .4byte gUnknown_20370C4
|
||||
_08081A30: .4byte sub_80568E0
|
||||
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||
thumb_func_end sub_8081A1C
|
||||
|
||||
thumb_func_start sub_8081A34
|
||||
@@ -2410,7 +2410,7 @@ sub_8081A34: @ 8081A34
|
||||
lsls r1, 2
|
||||
ldr r2, _08081A7C @ =gUnknown_2022744
|
||||
adds r1, r2
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r0, r4, 0
|
||||
bl sub_808B1BC
|
||||
lsls r0, 24
|
||||
@@ -2423,7 +2423,7 @@ sub_8081A34: @ 8081A34
|
||||
lsls r1, 2
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
movs r0, 0x1
|
||||
b _08081A8A
|
||||
.align 2, 0
|
||||
@@ -2460,24 +2460,24 @@ sub_8081A90: @ 8081A90
|
||||
cmp r1, r0
|
||||
ble _08081AC2
|
||||
bl sub_80098B8
|
||||
ldr r0, _08081ADC @ =sub_800ACD4
|
||||
bl sub_8000544
|
||||
ldr r0, _08081ADC @ =c2_800ACD4
|
||||
bl SetMainCallback2
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08081AC2:
|
||||
ldr r0, _08081AE0 @ =gUnknown_3003F64
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08081AD0
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08081AD0:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08081AD8: .4byte gUnknown_3005090
|
||||
_08081ADC: .4byte sub_800ACD4
|
||||
_08081ADC: .4byte c2_800ACD4
|
||||
_08081AE0: .4byte gUnknown_3003F64
|
||||
thumb_func_end sub_8081A90
|
||||
|
||||
@@ -2490,9 +2490,9 @@ sub_8081AE4: @ 8081AE4
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _08081AFC
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08081AFC:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
@@ -99,12 +99,12 @@ _0803ED6E:
|
||||
_0803ED9C: .4byte gUnknown_2023F54
|
||||
_0803EDA0:
|
||||
ldrh r0, [r6, 0x2E]
|
||||
bl sub_809A924
|
||||
bl ItemId_GetHoldEffect
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
ldrh r0, [r6, 0x2E]
|
||||
bl sub_809A948
|
||||
bl ItemId_GetHoldEffectParam
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
_0803EDB6:
|
||||
@@ -135,13 +135,13 @@ _0803EDD4:
|
||||
_0803EDE6:
|
||||
ldr r2, [sp, 0x4]
|
||||
ldrh r0, [r2, 0x2E]
|
||||
bl sub_809A924
|
||||
bl ItemId_GetHoldEffect
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x1C]
|
||||
ldr r3, [sp, 0x4]
|
||||
ldrh r0, [r3, 0x2E]
|
||||
bl sub_809A948
|
||||
bl ItemId_GetHoldEffectParam
|
||||
_0803EDFC:
|
||||
adds r0, r6, 0
|
||||
adds r0, 0x20
|
||||
@@ -168,7 +168,7 @@ _0803EE10:
|
||||
cmp r0, 0
|
||||
beq _0803EE44
|
||||
ldr r0, [sp, 0x10]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803EE44
|
||||
@@ -191,7 +191,7 @@ _0803EE44:
|
||||
cmp r0, 0
|
||||
beq _0803EE7A
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803EE7A
|
||||
@@ -216,7 +216,7 @@ _0803EE7A:
|
||||
cmp r0, 0
|
||||
beq _0803EEB2
|
||||
ldr r0, [sp, 0x10]
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803EEB2
|
||||
@@ -242,7 +242,7 @@ _0803EEB2:
|
||||
cmp r0, 0
|
||||
beq _0803EEE8
|
||||
adds r0, r4, 0
|
||||
bl sub_80751C4
|
||||
bl GetBankSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803EEE8
|
||||
|
||||
+4
-4
@@ -44,7 +44,7 @@ sub_815D67C: @ 815D67C
|
||||
lsls r4, 2
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_8045254
|
||||
bl CalcByteArraySum
|
||||
adds r4, r5, r4
|
||||
ldr r1, [r4]
|
||||
cmp r0, r1
|
||||
@@ -89,7 +89,7 @@ _0815D6E0:
|
||||
lsls r1, r6, 5
|
||||
subs r1, r6
|
||||
lsls r1, 5
|
||||
bl sub_8045254
|
||||
bl CalcByteArraySum
|
||||
ldr r1, [r7, 0x4]
|
||||
cmp r0, r1
|
||||
bne _0815D6F8
|
||||
@@ -179,14 +179,14 @@ sub_815D794: @ 815D794
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x80
|
||||
lsls r0, 5
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
adds r5, r0, 0
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_815D700
|
||||
adds r4, r0, 0
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r4, 0
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
thumb_func_start sub_80F5574
|
||||
sub_80F5574: @ 80F5574
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5574
|
||||
@@ -19,9 +19,9 @@ sub_80F5574: @ 80F5574
|
||||
thumb_func_start sub_80F558C
|
||||
sub_80F558C: @ 80F558C
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F558C
|
||||
@@ -31,7 +31,7 @@ sub_80F55A0: @ 80F55A0
|
||||
push {r4,lr}
|
||||
ldr r4, _080F55D0 @ =gUnknown_203AB54
|
||||
movs r0, 0x4
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r1, 0
|
||||
strb r1, [r0, 0x1]
|
||||
@@ -42,9 +42,9 @@ sub_80F55A0: @ 80F55A0
|
||||
bl sub_80F580C
|
||||
ldr r0, _080F55D4 @ =sub_80F55DC
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r0, _080F55D8 @ =sub_80F5574
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -88,7 +88,7 @@ _080F5618:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080F56E2
|
||||
_080F562A:
|
||||
ldr r0, _080F5640 @ =gUnknown_2037AB8
|
||||
@@ -98,7 +98,7 @@ _080F562A:
|
||||
cmp r0, 0
|
||||
bne _080F56EC
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
b _080F56E2
|
||||
.align 2, 0
|
||||
_080F5640: .4byte gUnknown_2037AB8
|
||||
@@ -120,7 +120,7 @@ _080F5660:
|
||||
movs r1, 0x1
|
||||
movs r2, 0x1
|
||||
movs r3, 0xF
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
@@ -154,7 +154,7 @@ _080F569C:
|
||||
movs r3, 0x2
|
||||
bl sub_810FF60
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _080F56E2
|
||||
.align 2, 0
|
||||
_080F56BC: .4byte gUnknown_841EE68
|
||||
@@ -164,9 +164,9 @@ _080F56C0:
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F56F8 @ =sub_80F558C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r1, _080F56FC @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -228,7 +228,7 @@ _080F5744:
|
||||
bl sub_80722CC
|
||||
movs r0, 0x1
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
@@ -287,7 +287,7 @@ _080F57B8:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, [r5]
|
||||
ldrb r0, [r1, 0x2]
|
||||
adds r0, 0x1
|
||||
@@ -306,10 +306,10 @@ _080F57D4:
|
||||
bne _080F57FE
|
||||
bl sub_81100E8
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_8003ECC
|
||||
ldr r0, [r5]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r4, [r5]
|
||||
bl sub_80008D8
|
||||
_080F57FE:
|
||||
@@ -324,9 +324,9 @@ _080F5808: .4byte gUnknown_2037AB8
|
||||
thumb_func_start sub_80F580C
|
||||
sub_80F580C: @ 80F580C
|
||||
push {lr}
|
||||
bl sub_8006B10
|
||||
bl sub_8070528
|
||||
bl sub_80773BC
|
||||
bl ResetSpriteData
|
||||
bl ResetPaletteFade
|
||||
bl ResetTasks
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F580C
|
||||
@@ -402,10 +402,10 @@ _080F5846:
|
||||
ldr r0, [r2, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
ldr r1, _080F5944 @ =gUnknown_841EE64
|
||||
@@ -415,44 +415,44 @@ _080F5846:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
ldr r0, _080F5948 @ =gUnknown_841EE68
|
||||
bl sub_8003B24
|
||||
bl sub_8002C28
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
|
||||
+5
-5
@@ -184,7 +184,7 @@ sub_80D0674: @ 80D0674
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
ldr r2, _080D06CC @ =gUnknown_8417C2D
|
||||
movs r4, 0
|
||||
str r4, [sp]
|
||||
@@ -291,9 +291,9 @@ sub_80D072C: @ 80D072C
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
ldr r5, _080D07C0 @ =0x0000021d
|
||||
adds r1, r5, 0
|
||||
@@ -303,7 +303,7 @@ sub_80D072C: @ 80D072C
|
||||
movs r1, 0
|
||||
adds r2, r5, 0
|
||||
movs r3, 0xD
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
ldrb r0, [r4]
|
||||
ldr r2, _080D07C4 @ =gUnknown_8417C2D
|
||||
movs r3, 0
|
||||
@@ -330,7 +330,7 @@ sub_80D07C8: @ 80D07C8
|
||||
push {r4,lr}
|
||||
ldr r4, _080D07E8 @ =gUnknown_2039A28
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_810F4D8
|
||||
|
||||
+128
-128
@@ -10,18 +10,18 @@ sub_80F39B4: @ 80F39B4
|
||||
push {r4,lr}
|
||||
ldr r4, _080F39E0 @ =gUnknown_203AB40
|
||||
movs r0, 0x20
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
bl sub_80773BC
|
||||
bl ResetTasks
|
||||
ldr r1, [r4]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r1, [r4]
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0x1D]
|
||||
bl sub_8006B10
|
||||
bl ResetSpriteData
|
||||
ldr r0, _080F39E4 @ =sub_80F39E8
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -47,10 +47,10 @@ _080F39FE:
|
||||
beq _080F3A4C
|
||||
b _080F3A68
|
||||
_080F3A04:
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
b _080F3A68
|
||||
_080F3A16:
|
||||
ldr r0, _080F3A28 @ =gUnknown_203AB40
|
||||
@@ -64,10 +64,10 @@ _080F3A16:
|
||||
.align 2, 0
|
||||
_080F3A28: .4byte gUnknown_203AB40
|
||||
_080F3A2C:
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
_080F3A3C:
|
||||
ldr r0, _080F3A48 @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
@@ -86,7 +86,7 @@ _080F3A4C:
|
||||
strb r0, [r1]
|
||||
ldr r0, _080F3A70 @ =gUnknown_203AB40
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0xFF
|
||||
bl SoftReset
|
||||
_080F3A68:
|
||||
@@ -103,17 +103,17 @@ sub_80F3A74: @ 80F3A74
|
||||
movs r1, 0x80
|
||||
lsls r1, 7
|
||||
movs r0, 0
|
||||
bl sub_8000B14
|
||||
bl ClearGpuRegBits
|
||||
movs r1, 0x80
|
||||
lsls r1, 6
|
||||
movs r0, 0
|
||||
bl sub_8000AF4
|
||||
bl SetGpuRegBits
|
||||
ldr r1, _080F3AA0 @ =0x00001f3f
|
||||
movs r0, 0x48
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0xE
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -125,14 +125,14 @@ sub_80F3AA4: @ 80F3AA4
|
||||
push {lr}
|
||||
movs r0, 0x50
|
||||
movs r1, 0xCE
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x82
|
||||
lsls r1, 3
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0xA
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F3AA4
|
||||
@@ -148,10 +148,10 @@ sub_80F3AC4: @ 80F3AC4
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
movs r1, 0x3
|
||||
@@ -234,10 +234,10 @@ _080F3B5E:
|
||||
bl sub_80F3AC4
|
||||
movs r0, 0x40
|
||||
movs r1, 0xF0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080F3BC4 @ =0x0000247c
|
||||
movs r0, 0x44
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
bl sub_80F3A74
|
||||
bl sub_80F3AA4
|
||||
movs r0, 0xF0
|
||||
@@ -310,10 +310,10 @@ _080F3C40:
|
||||
bl sub_80F3A74
|
||||
movs r0, 0x40
|
||||
movs r1, 0xF0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080F3C5C @ =0x00004f51
|
||||
movs r0, 0x44
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080F3C60 @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x1
|
||||
@@ -345,13 +345,13 @@ _080F3C90: .4byte gUnknown_20375F8
|
||||
_080F3C94: .4byte gUnknown_203AB40
|
||||
_080F3C98:
|
||||
movs r0, 0x44
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
add r1, sp, 0x14
|
||||
lsls r0, 16
|
||||
lsrs r0, 24
|
||||
strh r0, [r1]
|
||||
movs r0, 0x44
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
add r2, sp, 0x14
|
||||
movs r1, 0xFF
|
||||
ands r1, r0
|
||||
@@ -383,7 +383,7 @@ _080F3CCC:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x44
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _080F3D06
|
||||
_080F3CEE:
|
||||
ldr r1, [r7]
|
||||
@@ -490,7 +490,7 @@ _080F3DB4:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r4, _080F3DDC @ =gUnknown_203AB40
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x7
|
||||
@@ -498,7 +498,7 @@ _080F3DB4:
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0xA]
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0x8]
|
||||
b _080F4182
|
||||
@@ -555,7 +555,7 @@ _080F3E30:
|
||||
strb r0, [r2, 0x9]
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
b _080F3E94
|
||||
.align 2, 0
|
||||
_080F3E50: .4byte gUnknown_203AB40
|
||||
@@ -579,7 +579,7 @@ _080F3E58:
|
||||
movs r1, 0x4
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080F3E94
|
||||
.align 2, 0
|
||||
_080F3E84: .4byte gUnknown_203AB40
|
||||
@@ -726,7 +726,7 @@ _080F3F84:
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, [r7]
|
||||
movs r0, 0x6
|
||||
_080F3FB8:
|
||||
@@ -922,7 +922,7 @@ _080F4118:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F4148 @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x12
|
||||
@@ -948,7 +948,7 @@ _080F4156:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080F3D06
|
||||
.align 2, 0
|
||||
_080F416C: .4byte 0x00007fff
|
||||
@@ -974,9 +974,9 @@ _080F418C: .4byte gUnknown_2037AB8
|
||||
thumb_func_start sub_80F4190
|
||||
sub_80F4190: @ 80F4190
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F4190
|
||||
@@ -1005,7 +1005,7 @@ _080F41C4:
|
||||
bl sub_8003B24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0xA
|
||||
str r0, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@@ -1018,7 +1018,7 @@ _080F41C4:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
ldr r1, _080F41FC @ =gUnknown_840D228
|
||||
b _080F4270
|
||||
.align 2, 0
|
||||
@@ -1030,7 +1030,7 @@ _080F4200:
|
||||
bl sub_8003B24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0xA
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -1044,7 +1044,7 @@ _080F4200:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
ldr r1, _080F423C @ =gUnknown_840E904
|
||||
b _080F4270
|
||||
.align 2, 0
|
||||
@@ -1056,7 +1056,7 @@ _080F4240:
|
||||
bl sub_8003B24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0xA
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -1070,13 +1070,13 @@ _080F4240:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
ldr r1, _080F4284 @ =gUnknown_840F944
|
||||
_080F4270:
|
||||
movs r0, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
b _080F42C2
|
||||
.align 2, 0
|
||||
_080F427C: .4byte gUnknown_840C5F0
|
||||
@@ -1087,7 +1087,7 @@ _080F4288:
|
||||
bl sub_8003B24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0xA
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -1101,12 +1101,12 @@ _080F4288:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
ldr r1, _080F42EC @ =gUnknown_84105B4
|
||||
movs r0, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004404
|
||||
bl CopyToWindowPixelBuffer
|
||||
_080F42C2:
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
@@ -1199,31 +1199,31 @@ _080F434C:
|
||||
.4byte _080F4638
|
||||
_080F4374:
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0
|
||||
bl sub_8000700
|
||||
bl SetHBlankCallback
|
||||
movs r1, 0xC0
|
||||
lsls r1, 7
|
||||
movs r0, 0
|
||||
bl sub_8000B14
|
||||
bl ClearGpuRegBits
|
||||
movs r0, 0x48
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl sub_8070528
|
||||
bl sub_8006B10
|
||||
bl sub_80773BC
|
||||
bl SetGpuReg
|
||||
bl ResetPaletteFade
|
||||
bl ResetSpriteData
|
||||
bl ResetTasks
|
||||
movs r0, 0x1
|
||||
bl sub_8001618
|
||||
ldr r1, _080F44A8 @ =gUnknown_840C5A4
|
||||
@@ -1232,26 +1232,26 @@ _080F4374:
|
||||
bl sub_8001658
|
||||
movs r0, 0x80
|
||||
lsls r0, 4
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
movs r0, 0
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
ldr r6, _080F44AC @ =gUnknown_203AB40
|
||||
ldr r1, [r6]
|
||||
movs r4, 0
|
||||
@@ -1271,7 +1271,7 @@ _080F4374:
|
||||
movs r0, 0x2
|
||||
adds r1, r2, 0
|
||||
movs r3, 0x78
|
||||
bl sub_8001E80
|
||||
bl SetBgAffine
|
||||
ldr r1, _080F44B0 @ =gUnknown_8EAAB98
|
||||
movs r5, 0x80
|
||||
lsls r5, 6
|
||||
@@ -1308,18 +1308,18 @@ _080F4374:
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080F44C4 @ =gUnknown_840C630
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, [r6]
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_80F41A4
|
||||
ldr r0, _080F44C8 @ =sub_80F4190
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0x1
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
ldr r1, [r6]
|
||||
b _080F4630
|
||||
.align 2, 0
|
||||
@@ -1342,15 +1342,15 @@ _080F44CC:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r0, _080F4500 @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
b _080F4630
|
||||
@@ -1358,16 +1358,16 @@ _080F44CC:
|
||||
_080F4500: .4byte gUnknown_203AB40
|
||||
_080F4504:
|
||||
movs r0, 0x2
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
movs r1, 0
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F452C @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x28
|
||||
@@ -1408,9 +1408,9 @@ _080F4558:
|
||||
bhi _080F4630
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x4
|
||||
strh r0, [r1, 0xC]
|
||||
@@ -1440,7 +1440,7 @@ _080F4582:
|
||||
movs r0, 0x2
|
||||
adds r1, r2, 0
|
||||
movs r3, 0x78
|
||||
bl sub_8001E80
|
||||
bl SetBgAffine
|
||||
b _080F4668
|
||||
_080F45B2:
|
||||
movs r2, 0x80
|
||||
@@ -1455,7 +1455,7 @@ _080F45B2:
|
||||
movs r0, 0x2
|
||||
adds r1, r2, 0
|
||||
movs r3, 0x78
|
||||
bl sub_8001E80
|
||||
bl SetBgAffine
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x20
|
||||
strh r0, [r1, 0xC]
|
||||
@@ -1471,9 +1471,9 @@ _080F45DE:
|
||||
b _080F4668
|
||||
_080F45E4:
|
||||
movs r0, 0x2
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_80F42F0
|
||||
@@ -1482,7 +1482,7 @@ _080F45E4:
|
||||
movs r1, 0
|
||||
movs r2, 0x7D
|
||||
movs r3, 0xA
|
||||
bl sub_8071E3C
|
||||
bl PlayCry2
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x80
|
||||
strh r0, [r1, 0xC]
|
||||
@@ -1503,7 +1503,7 @@ _080F461E:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, [r4]
|
||||
_080F4630:
|
||||
ldrb r0, [r1, 0x1]
|
||||
@@ -1521,8 +1521,8 @@ _080F4638:
|
||||
bne _080F4668
|
||||
bl sub_8003ECC
|
||||
movs r0, 0
|
||||
bl sub_8002008
|
||||
bl sub_8002BC4
|
||||
bl GetBgTilemapBuffer
|
||||
bl Free
|
||||
ldr r0, _080F4664 @ =gUnknown_203AB40
|
||||
ldr r0, [r0]
|
||||
strb r4, [r0, 0x1]
|
||||
@@ -1568,31 +1568,31 @@ _080F469E:
|
||||
b _080F47EC
|
||||
_080F46A0:
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0
|
||||
bl sub_8000700
|
||||
bl SetHBlankCallback
|
||||
movs r1, 0xC0
|
||||
lsls r1, 7
|
||||
movs r0, 0
|
||||
bl sub_8000B14
|
||||
bl ClearGpuRegBits
|
||||
movs r0, 0x48
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl sub_8070528
|
||||
bl sub_8006B10
|
||||
bl sub_80773BC
|
||||
bl SetGpuReg
|
||||
bl ResetPaletteFade
|
||||
bl ResetSpriteData
|
||||
bl ResetTasks
|
||||
movs r0, 0x1
|
||||
bl sub_8001618
|
||||
ldr r1, _080F4778 @ =gUnknown_840C5A4
|
||||
@@ -1602,11 +1602,11 @@ _080F46A0:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
ldr r4, _080F477C @ =gUnknown_8410CDC
|
||||
ldr r0, [r6]
|
||||
ldrb r1, [r0, 0x9]
|
||||
@@ -1647,11 +1647,11 @@ _080F46A0:
|
||||
movs r2, 0x80
|
||||
lsls r2, 2
|
||||
movs r1, 0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080F4780 @ =sub_80F4190
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0x1
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
ldr r1, [r6]
|
||||
b _080F47C2
|
||||
.align 2, 0
|
||||
@@ -1660,12 +1660,12 @@ _080F477C: .4byte gUnknown_8410CDC
|
||||
_080F4780: .4byte sub_80F4190
|
||||
_080F4784:
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r1, [r6]
|
||||
b _080F47C2
|
||||
_080F478E:
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r0, [r6]
|
||||
ldrb r1, [r0, 0x9]
|
||||
cmp r1, 0
|
||||
@@ -1676,7 +1676,7 @@ _080F478E:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080F47BE
|
||||
_080F47AE:
|
||||
movs r0, 0x1
|
||||
@@ -1685,7 +1685,7 @@ _080F47AE:
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080F47BE:
|
||||
ldr r0, _080F47CC @ =gUnknown_203AB40
|
||||
ldr r1, [r0]
|
||||
@@ -1847,25 +1847,25 @@ sub_80F48D0: @ 80F48D0
|
||||
ldr r0, _080F4928 @ =gUnknown_3005098
|
||||
adds r4, r0
|
||||
ldrh r0, [r4, 0x2]
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldrb r1, [r4, 0x1]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
ldr r5, _080F492C @ =gUnknown_202063C
|
||||
adds r0, r5
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
ldrh r0, [r4, 0x8]
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldrb r1, [r4, 0x6]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
ldr r0, [r6]
|
||||
ldrb r0, [r0, 0x2]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r1, [r6]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x2]
|
||||
@@ -1897,7 +1897,7 @@ sub_80F4930: @ 80F4930
|
||||
_080F494A:
|
||||
ldr r0, _080F498C @ =sub_80F47F8
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
@@ -1987,7 +1987,7 @@ _080F49D8:
|
||||
ands r1, r3
|
||||
orrs r1, r2
|
||||
str r1, [r0, 0x4]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4A1C @ =gUnknown_8410E10
|
||||
b _080F4A36
|
||||
.align 2, 0
|
||||
@@ -2005,13 +2005,13 @@ _080F4A20:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x2]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4A48 @ =gUnknown_8411BF8
|
||||
_080F4A36:
|
||||
movs r1, 0xF8
|
||||
lsls r1, 1
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
b _080F4A6C
|
||||
.align 2, 0
|
||||
_080F4A44: .4byte gUnknown_8411C18
|
||||
@@ -2025,12 +2025,12 @@ _080F4A4C:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x2]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4ADC @ =gUnknown_84129A0
|
||||
movs r1, 0xF8
|
||||
lsls r1, 1
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
_080F4A6C:
|
||||
mov r1, sp
|
||||
ldr r0, _080F4AE0 @ =gUnknown_8414364
|
||||
@@ -2047,7 +2047,7 @@ _080F4A6C:
|
||||
mov r2, r9
|
||||
mov r0, sp
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
strb r0, [r6, 0x1]
|
||||
ldr r3, _080F4AE4 @ =gUnknown_202063C
|
||||
ldrb r1, [r6, 0x1]
|
||||
@@ -2107,7 +2107,7 @@ _080F4AFE:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x8]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4B1C @ =gUnknown_8413318
|
||||
b _080F4B8A
|
||||
.align 2, 0
|
||||
@@ -2122,12 +2122,12 @@ _080F4B20:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x8]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4B4C @ =gUnknown_8413318
|
||||
movs r1, 0xF0
|
||||
lsls r1, 1
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
mov r1, sp
|
||||
ldr r0, _080F4B50 @ =gUnknown_84143D0
|
||||
b _080F4B98
|
||||
@@ -2144,7 +2144,7 @@ _080F4B54:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x8]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4B70 @ =gUnknown_8413854
|
||||
b _080F4B8A
|
||||
.align 2, 0
|
||||
@@ -2159,13 +2159,13 @@ _080F4B74:
|
||||
strh r1, [r0, 0x4]
|
||||
ldrh r1, [r6, 0x8]
|
||||
strh r1, [r0, 0x6]
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F4BF0 @ =gUnknown_8413D98
|
||||
_080F4B8A:
|
||||
movs r1, 0xF0
|
||||
lsls r1, 1
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
mov r1, sp
|
||||
ldr r0, _080F4BF4 @ =gUnknown_84143B8
|
||||
_080F4B98:
|
||||
@@ -2182,7 +2182,7 @@ _080F4BA0:
|
||||
adds r2, 0x26
|
||||
mov r0, sp
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
strb r0, [r6, 0x6]
|
||||
ldr r3, _080F4BF8 @ =gUnknown_202063C
|
||||
ldrb r1, [r6, 0x6]
|
||||
|
||||
+277
-277
File diff suppressed because it is too large
Load Diff
+30
-30
@@ -5,24 +5,24 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_800EBB4
|
||||
sub_800EBB4: @ 800EBB4
|
||||
thumb_func_start LZDecompressWram
|
||||
LZDecompressWram: @ 800EBB4
|
||||
push {lr}
|
||||
bl LZ77UnCompWram
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800EBB4
|
||||
thumb_func_end LZDecompressWram
|
||||
|
||||
thumb_func_start sub_800EBC0
|
||||
sub_800EBC0: @ 800EBC0
|
||||
thumb_func_start LZDecompressVram
|
||||
LZDecompressVram: @ 800EBC0
|
||||
push {lr}
|
||||
bl LZ77UnCompVram
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800EBC0
|
||||
thumb_func_end LZDecompressVram
|
||||
|
||||
thumb_func_start sub_800EBCC
|
||||
sub_800EBCC: @ 800EBCC
|
||||
thumb_func_start LoadCompressedObjectPic
|
||||
LoadCompressedObjectPic: @ 800EBCC
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
@@ -37,7 +37,7 @@ sub_800EBCC: @ 800EBCC
|
||||
orrs r0, r1
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
add sp, 0x8
|
||||
@@ -46,10 +46,10 @@ sub_800EBCC: @ 800EBCC
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0800EBFC: .4byte gUnknown_201C000
|
||||
thumb_func_end sub_800EBCC
|
||||
thumb_func_end LoadCompressedObjectPic
|
||||
|
||||
thumb_func_start sub_800EC00
|
||||
sub_800EC00: @ 800EC00
|
||||
thumb_func_start LoadCompressedObjectPicOverrideBuffer
|
||||
LoadCompressedObjectPicOverrideBuffer: @ 800EC00
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
@@ -63,15 +63,15 @@ sub_800EC00: @ 800EC00
|
||||
orrs r0, r1
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800EC00
|
||||
thumb_func_end LoadCompressedObjectPicOverrideBuffer
|
||||
|
||||
thumb_func_start sub_800EC28
|
||||
sub_800EC28: @ 800EC28
|
||||
thumb_func_start LoadCompressedObjectPalette
|
||||
LoadCompressedObjectPalette: @ 800EC28
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
@@ -87,7 +87,7 @@ sub_800EC28: @ 800EC28
|
||||
orrs r0, r2
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -95,10 +95,10 @@ sub_800EC28: @ 800EC28
|
||||
.align 2, 0
|
||||
_0800EC54: .4byte gUnknown_201C000
|
||||
_0800EC58: .4byte 0xffff0000
|
||||
thumb_func_end sub_800EC28
|
||||
thumb_func_end LoadCompressedObjectPalette
|
||||
|
||||
thumb_func_start sub_800EC5C
|
||||
sub_800EC5C: @ 800EC5C
|
||||
thumb_func_start LoadCompressedObjectPaletteOverrideBuffer
|
||||
LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
@@ -113,14 +113,14 @@ sub_800EC5C: @ 800EC5C
|
||||
orrs r0, r2
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800EC88: .4byte 0xffff0000
|
||||
thumb_func_end sub_800EC5C
|
||||
thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
|
||||
|
||||
thumb_func_start sub_800EC8C
|
||||
sub_800EC8C: @ 800EC8C
|
||||
@@ -268,7 +268,7 @@ _0800ED8C:
|
||||
adds r1, r5, 0
|
||||
adds r2, r4, 0
|
||||
mov r3, r8
|
||||
bl sub_8043458
|
||||
bl DrawSpindaSpots
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
@@ -655,7 +655,7 @@ sub_800F034: @ 800F034
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0]
|
||||
lsrs r0, 8
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _0800F06E
|
||||
@@ -669,9 +669,9 @@ sub_800F034: @ 800F034
|
||||
orrs r0, r1
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
b _0800F070
|
||||
_0800F06E:
|
||||
@@ -691,7 +691,7 @@ sub_800F078: @ 800F078
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0]
|
||||
lsrs r0, 8
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _0800F0B8
|
||||
@@ -706,9 +706,9 @@ sub_800F078: @ 800F078
|
||||
orrs r0, r2
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
adds r0, r5, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
b _0800F0BA
|
||||
.align 2, 0
|
||||
@@ -876,7 +876,7 @@ _0800F1D0:
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
mov r3, r8
|
||||
bl sub_8043458
|
||||
bl DrawSpindaSpots
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
|
||||
+49
-49
@@ -8,9 +8,9 @@
|
||||
thumb_func_start sub_80F4BFC
|
||||
sub_80F4BFC: @ 80F4BFC
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F4BFC
|
||||
@@ -20,7 +20,7 @@ sub_80F4C10: @ 80F4C10
|
||||
push {r4,lr}
|
||||
ldr r4, _080F4C40 @ =gUnknown_203AB48
|
||||
ldr r0, _080F4C44 @ =0x00001004
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
@@ -31,9 +31,9 @@ sub_80F4C10: @ 80F4C10
|
||||
bl sub_80F4E24
|
||||
ldr r0, _080F4C48 @ =sub_80F4C68
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r0, _080F4C4C @ =sub_80F4C50
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -47,10 +47,10 @@ _080F4C4C: .4byte sub_80F4C50
|
||||
thumb_func_start sub_80F4C50
|
||||
sub_80F4C50: @ 80F4C50
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F4C50
|
||||
@@ -87,7 +87,7 @@ _080F4C8C:
|
||||
.4byte _080F4D22
|
||||
_080F4CB0:
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
b _080F4D50
|
||||
_080F4CB8:
|
||||
bl sub_80F4E40
|
||||
@@ -103,7 +103,7 @@ _080F4CCA:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
b _080F4D50
|
||||
.align 2, 0
|
||||
_080F4CD8: .4byte gUnknown_84154E8
|
||||
@@ -115,21 +115,21 @@ _080F4CDC:
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
movs r0, 0x14
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _080F4D50
|
||||
_080F4CF2:
|
||||
movs r0, 0x14
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _080F4D50
|
||||
_080F4CFC:
|
||||
bl sub_80F5018
|
||||
b _080F4D50
|
||||
_080F4D02:
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _080F4D50
|
||||
_080F4D10:
|
||||
movs r0, 0x1
|
||||
@@ -138,11 +138,11 @@ _080F4D10:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080F4D50
|
||||
_080F4D22:
|
||||
ldr r0, _080F4D2C @ =sub_80F4BFC
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
b _080F4D50
|
||||
.align 2, 0
|
||||
_080F4D2C: .4byte sub_80F4BFC
|
||||
@@ -204,7 +204,7 @@ _080F4D94:
|
||||
b _080F4DD6
|
||||
_080F4D9A:
|
||||
movs r0, 0
|
||||
bl sub_8071C10
|
||||
bl WaitFanfare
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F4DD6
|
||||
@@ -221,7 +221,7 @@ _080F4DA8:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080F4DC2:
|
||||
ldr r1, [r4]
|
||||
ldrb r0, [r1]
|
||||
@@ -254,14 +254,14 @@ sub_80F4DE0: @ 80F4DE0
|
||||
cmp r5, 0
|
||||
bne _080F4E10
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_8003ECC
|
||||
ldr r4, _080F4E1C @ =gUnknown_203AB48
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r0, _080F4E20 @ =sub_80568FC
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080F4E10:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -275,11 +275,11 @@ _080F4E20: .4byte sub_80568FC
|
||||
thumb_func_start sub_80F4E24
|
||||
sub_80F4E24: @ 80F4E24
|
||||
push {lr}
|
||||
bl sub_8006B10
|
||||
bl sub_8070528
|
||||
bl sub_80088F0
|
||||
bl sub_80773BC
|
||||
bl sub_8087E64
|
||||
bl ResetSpriteData
|
||||
bl ResetPaletteFade
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetTasks
|
||||
bl remove_some_task
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F4E24
|
||||
@@ -355,7 +355,7 @@ _080F4E66:
|
||||
ldr r0, [r2, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
ldr r1, _080F4F90 @ =gUnknown_8415A08
|
||||
@@ -365,51 +365,51 @@ _080F4E66:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
ldr r0, _080F4F94 @ =gUnknown_8415A10
|
||||
bl sub_8003B24
|
||||
bl sub_8002C28
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080F4F98 @ =gUnknown_203AB48
|
||||
ldr r1, [r0]
|
||||
adds r1, 0x4
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r5, 0x1E
|
||||
str r5, [sp]
|
||||
movs r4, 0x14
|
||||
@@ -418,14 +418,14 @@ _080F4E66:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
str r5, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
add sp, 0x10
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -463,7 +463,7 @@ _080F4FB8:
|
||||
beq _080F4FEE
|
||||
b _080F4FF8
|
||||
_080F4FC2:
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
b _080F5000
|
||||
_080F4FC8:
|
||||
ldr r1, _080F4FDC @ =gUnknown_84147C0
|
||||
@@ -472,12 +472,12 @@ _080F4FC8:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80F6878
|
||||
bl decompress_and_copy_tile_data_to_vram
|
||||
b _080F5000
|
||||
.align 2, 0
|
||||
_080F4FDC: .4byte gUnknown_84147C0
|
||||
_080F4FE0:
|
||||
bl sub_80F682C
|
||||
bl free_temp_tile_data_buffers_if_possible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -487,7 +487,7 @@ _080F4FEE:
|
||||
ldr r0, _080F4FFC @ =gUnknown_8415954
|
||||
movs r1, 0
|
||||
movs r2, 0x40
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
_080F4FF8:
|
||||
movs r0, 0x1
|
||||
b _080F500C
|
||||
@@ -536,7 +536,7 @@ _080F5048:
|
||||
_080F5050:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r1, _080F50E4 @ =gUnknown_841B60E
|
||||
add r0, sp, 0xC
|
||||
bl sub_813CCC8
|
||||
@@ -591,7 +591,7 @@ _080F5050:
|
||||
movs r3, 0x69
|
||||
bl sub_812E51C
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
add sp, 0xAC
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
||||
+15
-15
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8000BFC
|
||||
sub_8000BFC: @ 8000BFC
|
||||
thumb_func_start ClearDma3Requests
|
||||
ClearDma3Requests: @ 8000BFC
|
||||
push {lr}
|
||||
ldr r2, _08000C28 @ =gUnknown_30008C8
|
||||
movs r0, 0x1
|
||||
@@ -33,10 +33,10 @@ _08000C10:
|
||||
_08000C28: .4byte gUnknown_30008C8
|
||||
_08000C2C: .4byte gUnknown_30008C9
|
||||
_08000C30: .4byte gUnknown_30000C8
|
||||
thumb_func_end sub_8000BFC
|
||||
thumb_func_end ClearDma3Requests
|
||||
|
||||
thumb_func_start sub_8000C34
|
||||
sub_8000C34: @ 8000C34
|
||||
thumb_func_start ProcessDma3Requests
|
||||
ProcessDma3Requests: @ 8000C34
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -360,10 +360,10 @@ _08000E9C: .4byte gUnknown_30000D4
|
||||
_08000EA0: .4byte 0x040000d4
|
||||
_08000EA4: .4byte 0x81000800
|
||||
_08000EA8: .4byte gUnknown_30000C8
|
||||
thumb_func_end sub_8000C34
|
||||
thumb_func_end ProcessDma3Requests
|
||||
|
||||
thumb_func_start sub_8000EAC
|
||||
sub_8000EAC: @ 8000EAC
|
||||
thumb_func_start RequestDma3Copy
|
||||
RequestDma3Copy: @ 8000EAC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -443,10 +443,10 @@ _08000F34:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8000EAC
|
||||
thumb_func_end RequestDma3Copy
|
||||
|
||||
thumb_func_start sub_8000F44
|
||||
sub_8000F44: @ 8000F44
|
||||
thumb_func_start RequestDma3Fill
|
||||
RequestDma3Fill: @ 8000F44
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -532,10 +532,10 @@ _08000FDA:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8000F44
|
||||
thumb_func_end RequestDma3Fill
|
||||
|
||||
thumb_func_start sub_8000FE8
|
||||
sub_8000FE8: @ 8000FE8
|
||||
thumb_func_start CheckForSpaceForDma3Request
|
||||
CheckForSpaceForDma3Request: @ 8000FE8
|
||||
push {lr}
|
||||
movs r2, 0
|
||||
lsls r0, 16
|
||||
@@ -573,6 +573,6 @@ _08001020:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08001024: .4byte gUnknown_30000C8
|
||||
thumb_func_end sub_8000FE8
|
||||
thumb_func_end CheckForSpaceForDma3Request
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+17
-17
@@ -214,7 +214,7 @@ _080BD86C:
|
||||
adds r1, r0, 0
|
||||
_080BD87E:
|
||||
adds r0, r5, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _080BD896
|
||||
.align 2, 0
|
||||
_080BD888: .4byte 0x0000ffff
|
||||
@@ -335,7 +335,7 @@ _080BD95C: .4byte 0x000001ff
|
||||
_080BD960:
|
||||
ldr r0, _080BD970 @ =gUnknown_841E093
|
||||
_080BD962:
|
||||
bl sub_8008E08
|
||||
bl StringLength
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
_080BD96A:
|
||||
@@ -418,7 +418,7 @@ sub_80BD9E8: @ 80BD9E8
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r2, _080BDA38 @ =gUnknown_83ECED4
|
||||
lsls r1, r4, 3
|
||||
adds r1, r2
|
||||
@@ -565,7 +565,7 @@ _080BDAF8:
|
||||
adds r1, r5, 0
|
||||
bl sub_80BD89C
|
||||
adds r0, r4, 0
|
||||
bl sub_8069464
|
||||
bl ShowFieldAutoScrollMessage
|
||||
_080BDB08:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -579,7 +579,7 @@ _080BDB18: .4byte gUnknown_2021D18
|
||||
thumb_func_start sub_80BDB1C
|
||||
sub_80BDB1C: @ 80BDB1C
|
||||
push {lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
movs r0, 0xC
|
||||
@@ -699,7 +699,7 @@ _080BDBDC:
|
||||
.align 2, 0
|
||||
_080BDBF4: .4byte 0x000001ff
|
||||
_080BDBF8:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x21
|
||||
@@ -758,7 +758,7 @@ _080BDC50:
|
||||
.align 2, 0
|
||||
_080BDC60: .4byte 0x000001ff
|
||||
_080BDC64:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r5, 0
|
||||
@@ -822,7 +822,7 @@ _080BDCCA:
|
||||
.align 2, 0
|
||||
_080BDCD4: .4byte 0x000001ff
|
||||
_080BDCD8:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r4, 0
|
||||
@@ -837,7 +837,7 @@ _080BDCD8:
|
||||
bcs _080BDD22
|
||||
_080BDCF6:
|
||||
ldrh r0, [r5]
|
||||
bl sub_8043298
|
||||
bl SpeciesToNationalPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0
|
||||
@@ -1013,7 +1013,7 @@ sub_80BDE44: @ 80BDE44
|
||||
push {r4,lr}
|
||||
ldr r4, _080BDE60 @ =gUnknown_20399BC
|
||||
ldr r0, _080BDE64 @ =0x00003ba4
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _080BDE68
|
||||
@@ -1039,7 +1039,7 @@ sub_80BDE70: @ 80BDE70
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _080BDE7E
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_080BDE7E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1185,7 +1185,7 @@ sub_80BDF6C: @ 80BDF6C
|
||||
adds r1, r0
|
||||
ldr r1, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r1, r0, 0
|
||||
subs r4, r1, r4
|
||||
lsls r4, 16
|
||||
@@ -1224,8 +1224,8 @@ sub_80BDFB0: @ 80BDFB0
|
||||
_080BDFBC: .4byte gUnknown_83EDF98
|
||||
thumb_func_end sub_80BDFB0
|
||||
|
||||
thumb_func_start sub_80BDFC0
|
||||
sub_80BDFC0: @ 80BDFC0
|
||||
thumb_func_start CopyEasyChatWordPadded
|
||||
CopyEasyChatWordPadded: @ 80BDFC0
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r1, 16
|
||||
@@ -1255,7 +1255,7 @@ _080BDFEC:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80BDFC0
|
||||
thumb_func_end CopyEasyChatWordPadded
|
||||
|
||||
thumb_func_start sub_80BDFF8
|
||||
sub_80BDFF8: @ 80BDFF8
|
||||
@@ -1765,7 +1765,7 @@ _080BE3BC:
|
||||
cmp r0, 0x15
|
||||
bne _080BE3FA
|
||||
adds r0, r4, 0
|
||||
bl sub_8043298
|
||||
bl SpeciesToNationalPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0
|
||||
@@ -1779,7 +1779,7 @@ _080BE3D6:
|
||||
cmp r0, 0
|
||||
beq _080BE3F6
|
||||
adds r0, r4, 0
|
||||
bl sub_8043298
|
||||
bl SpeciesToNationalPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0
|
||||
|
||||
+152
-152
@@ -16,7 +16,7 @@ sub_8046BFC: @ 8046BFC
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [sp, 0x3C]
|
||||
@@ -42,7 +42,7 @@ _08046C3C:
|
||||
adds r1, r4, 0
|
||||
adds r1, 0xD
|
||||
adds r0, r6, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r1, r4, 1
|
||||
add r1, sp
|
||||
adds r1, 0x10
|
||||
@@ -54,14 +54,14 @@ _08046C3C:
|
||||
bls _08046C3C
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r8, r0
|
||||
movs r4, 0
|
||||
_08046C64:
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x27
|
||||
adds r0, r6, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r1, r4, 2
|
||||
adds r1, r7, r1
|
||||
str r0, [r1]
|
||||
@@ -72,21 +72,21 @@ _08046C64:
|
||||
bls _08046C64
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x25
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r1, r10
|
||||
strb r0, [r1]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x8
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r1, [sp, 0x40]
|
||||
strb r0, [r1]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x22
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
str r0, [sp, 0x38]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x50
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r1, [sp, 0x48]
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
@@ -100,7 +100,7 @@ _08046C64:
|
||||
ldr r1, [sp, 0x3C]
|
||||
movs r2, 0x5
|
||||
movs r3, 0x20
|
||||
bl sub_803DA54
|
||||
bl CreateMon
|
||||
movs r4, 0
|
||||
_08046CC8:
|
||||
adds r1, r4, 0
|
||||
@@ -196,19 +196,19 @@ sub_8046D60: @ 8046D60
|
||||
bl sub_804037C
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_8040FD0
|
||||
bl GetSpeciesName
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_804037C
|
||||
adds r0, r4, 0
|
||||
bl sub_8043298
|
||||
bl SpeciesToNationalPokedexNum
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
@@ -220,7 +220,7 @@ sub_8046D60: @ 8046D60
|
||||
bl sub_8088E74
|
||||
ldr r1, _08046E1C @ =gUnknown_2021CD0
|
||||
adds r0, r5, 0
|
||||
bl sub_80453C0
|
||||
bl GetMonNick
|
||||
mov r2, sp
|
||||
adds r2, 0xE
|
||||
movs r0, 0x4
|
||||
@@ -234,7 +234,7 @@ sub_8046D60: @ 8046D60
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x24
|
||||
bl sub_804037C
|
||||
bl sub_8056260
|
||||
bl sav1_map_get_name
|
||||
mov r2, sp
|
||||
adds r2, 0x12
|
||||
strb r0, [r2]
|
||||
@@ -242,9 +242,9 @@ sub_8046D60: @ 8046D60
|
||||
movs r1, 0x23
|
||||
bl sub_804037C
|
||||
adds r0, r5, 0
|
||||
bl sub_80442D8
|
||||
bl MonRestorePP
|
||||
adds r0, r5, 0
|
||||
bl sub_803E47C
|
||||
bl CalculateMonStats
|
||||
add sp, 0x14
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -278,7 +278,7 @@ sub_8046E34: @ 8046E34
|
||||
adds r4, r0, r1
|
||||
adds r0, r4, 0
|
||||
mov r1, sp
|
||||
bl sub_80453E0
|
||||
bl GetBoxMonNick
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x70
|
||||
ldrh r0, [r0]
|
||||
@@ -288,26 +288,26 @@ sub_8046E34: @ 8046E34
|
||||
adds r5, 0x7C
|
||||
mov r0, sp
|
||||
adds r1, r5, 0
|
||||
bl sub_8008E28
|
||||
bl StringCompare
|
||||
adds r4, 0x74
|
||||
cmp r0, 0
|
||||
bne _08046E74
|
||||
ldr r0, _08046E90 @ =gUnknown_300500C
|
||||
ldr r0, [r0]
|
||||
adds r1, r4, 0
|
||||
bl sub_8008E28
|
||||
bl StringCompare
|
||||
cmp r0, 0
|
||||
beq _08046EA0
|
||||
_08046E74:
|
||||
ldr r0, _08046E94 @ =gUnknown_2021CD0
|
||||
mov r1, sp
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r0, _08046E98 @ =gUnknown_2021CF0
|
||||
adds r1, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r0, _08046E9C @ =gUnknown_2021D04
|
||||
adds r1, r5, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
movs r0, 0x1
|
||||
b _08046EA2
|
||||
.align 2, 0
|
||||
@@ -389,13 +389,13 @@ _08046F18: .4byte gUnknown_2024284
|
||||
_08046F1C:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r3, r0, 0
|
||||
lsls r0, r4, 3
|
||||
ldr r1, _08046F64 @ =gUnknown_82350AC
|
||||
@@ -413,7 +413,7 @@ _08046F1C:
|
||||
bl sub_800ECC4
|
||||
adds r0, r5, 0
|
||||
bl sub_8044148
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
mov r0, r9
|
||||
strh r4, [r0]
|
||||
b _08046FA6
|
||||
@@ -430,7 +430,7 @@ _08046F6C:
|
||||
movs r1, 0x78
|
||||
movs r2, 0x46
|
||||
movs r3, 0x6
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldr r4, _08046FB8 @ =gUnknown_202063C
|
||||
@@ -464,9 +464,9 @@ _08046FBC: .4byte nullsub_8
|
||||
thumb_func_start sub_8046FC0
|
||||
sub_8046FC0: @ 8046FC0
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8046FC0
|
||||
@@ -475,17 +475,17 @@ sub_8046FC0: @ 8046FC0
|
||||
sub_8046FD4: @ 8046FD4
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r0, _08047000 @ =sub_8047004
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
movs r1, 0
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
bl sub_812B478
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
@@ -507,12 +507,12 @@ sub_8047004: @ 8047004
|
||||
bne _0804702C
|
||||
bl sub_80563F0
|
||||
ldr r0, _08047038 @ =sub_8047044
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r1, _0804703C @ =gUnknown_3005020
|
||||
ldr r0, _08047040 @ =sub_807DD24
|
||||
str r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0804702C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -559,12 +559,12 @@ _0804706C:
|
||||
_08047090:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r4, _08047148 @ =gUnknown_3000E74
|
||||
movs r0, 0x14
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
bl sub_80358D4
|
||||
bl AllocateMonSpritesGfx
|
||||
ldr r2, [r4]
|
||||
ldr r0, _0804714C @ =gUnknown_20370C0
|
||||
ldrh r0, [r0]
|
||||
@@ -573,11 +573,11 @@ _08047090:
|
||||
ldr r0, [r4]
|
||||
strb r1, [r0, 0x7]
|
||||
ldr r0, _08047150 @ =sub_8046FC0
|
||||
bl sub_80006F4
|
||||
bl sub_8071A68
|
||||
bl SetVBlankCallback
|
||||
bl GetCurrentMapMusic
|
||||
ldr r1, _08047154 @ =gUnknown_20370C2
|
||||
strh r0, [r1]
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
ldr r1, _08047158 @ =gUnknown_826019C
|
||||
@@ -587,41 +587,41 @@ _08047090:
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0x7
|
||||
movs r2, 0x2
|
||||
bl sub_80019E4
|
||||
bl SetBgAttribute
|
||||
movs r0, 0x80
|
||||
lsls r0, 5
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
movs r0, 0
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
bl sub_8002C28
|
||||
bl sub_8070528
|
||||
bl sub_80088F0
|
||||
bl sub_8006B10
|
||||
bl sub_80773BC
|
||||
bl sub_8087E64
|
||||
bl ResetPaletteFade
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetSpriteData
|
||||
bl ResetTasks
|
||||
bl remove_some_task
|
||||
bl m4aSoundVSyncOn
|
||||
b _0804724A
|
||||
.align 2, 0
|
||||
@@ -652,11 +652,11 @@ _08047174:
|
||||
movs r0, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
ldr r0, _080471A4 @ =gUnknown_8D004D8
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0804724A
|
||||
.align 2, 0
|
||||
_0804719C: .4byte gUnknown_8D00000
|
||||
@@ -664,11 +664,11 @@ _080471A0: .4byte gUnknown_8D0051C
|
||||
_080471A4: .4byte gUnknown_8D004D8
|
||||
_080471A8:
|
||||
ldr r0, _080471BC @ =gUnknown_826011C
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
ldr r0, _080471C0 @ =gUnknown_8260124
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
ldr r0, _080471C4 @ =gUnknown_826012C
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
b _0804724A
|
||||
.align 2, 0
|
||||
_080471BC: .4byte gUnknown_826011C
|
||||
@@ -676,7 +676,7 @@ _080471C0: .4byte gUnknown_8260124
|
||||
_080471C4: .4byte gUnknown_826012C
|
||||
_080471C8:
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r0, _080471DC @ =gUnknown_3000E74
|
||||
ldr r0, [r0]
|
||||
ldrb r0, [r0, 0x4]
|
||||
@@ -712,25 +712,25 @@ _08047214:
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _0804725C @ =gUnknown_8EAEA20
|
||||
movs r1, 0x10
|
||||
movs r2, 0xA0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r1, _08047260 @ =gUnknown_8EAEA80
|
||||
movs r2, 0xA1
|
||||
lsls r2, 5
|
||||
movs r0, 0x1
|
||||
movs r3, 0
|
||||
bl sub_80017D0
|
||||
bl LoadBgTiles
|
||||
ldr r1, _08047264 @ =gUnknown_826601C
|
||||
movs r2, 0x80
|
||||
lsls r2, 5
|
||||
movs r0, 0x1
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
_0804724A:
|
||||
ldr r1, _08047268 @ =gUnknown_30030F0
|
||||
movs r0, 0x87
|
||||
@@ -747,17 +747,17 @@ _08047264: .4byte gUnknown_826601C
|
||||
_08047268: .4byte gUnknown_30030F0
|
||||
_0804726C:
|
||||
ldr r0, _08047298 @ =sub_8047338
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r0, _0804729C @ =gUnknown_3000E74
|
||||
ldr r1, [r0]
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0x2]
|
||||
_0804727A:
|
||||
bl sub_8077578
|
||||
bl RunTasks
|
||||
bl sub_8002DE8
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -779,13 +779,13 @@ sub_80472A0: @ 80472A0
|
||||
ldr r2, _080472D8 @ =gUnknown_2021D04
|
||||
movs r1, 0x2
|
||||
bl sub_804037C
|
||||
bl sub_80359AC
|
||||
bl FreeMonSpritesGfx
|
||||
ldr r0, _080472DC @ =gUnknown_3000E74
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
bl sub_812B484
|
||||
ldr r0, _080472E0 @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
ldr r0, _080472E0 @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -793,7 +793,7 @@ _080472D0: .4byte gUnknown_20370C0
|
||||
_080472D4: .4byte gUnknown_2024284
|
||||
_080472D8: .4byte gUnknown_2021D04
|
||||
_080472DC: .4byte gUnknown_3000E74
|
||||
_080472E0: .4byte sub_80567DC
|
||||
_080472E0: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80472A0
|
||||
|
||||
thumb_func_start sub_80472E4
|
||||
@@ -810,14 +810,14 @@ sub_80472E4: @ 80472E4
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _08047300
|
||||
bl sub_8071A94
|
||||
bl StopMapMusic
|
||||
_08047300:
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0x1
|
||||
bne _0804730E
|
||||
ldr r0, _08047334 @ =0x00000107
|
||||
bl sub_80722A0
|
||||
bl PlayBGM
|
||||
_0804730E:
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -825,9 +825,9 @@ _0804730E:
|
||||
ble _08047324
|
||||
movs r0, 0x84
|
||||
lsls r0, 1
|
||||
bl sub_80722A0
|
||||
bl PlayBGM
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08047324:
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
@@ -886,26 +886,26 @@ _08047398:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080473D8 @ =gUnknown_8260134
|
||||
movs r1, 0x78
|
||||
movs r2, 0x4B
|
||||
movs r3, 0x5
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r4, _080473DC @ =gUnknown_3000E74
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r1, [r4]
|
||||
ldrb r0, [r1, 0x2]
|
||||
adds r0, 0x1
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, _080473E0 @ =sub_80472E4
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _08047684
|
||||
.align 2, 0
|
||||
_080473D8: .4byte gUnknown_8260134
|
||||
@@ -925,7 +925,7 @@ _080473F6:
|
||||
ldr r0, [r5]
|
||||
ldrb r0, [r0, 0x8]
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r0, [r5]
|
||||
strb r4, [r0, 0x3]
|
||||
ldr r1, [r5]
|
||||
@@ -978,14 +978,14 @@ _08047444:
|
||||
_0804745E:
|
||||
ldrh r0, [r3, 0xC]
|
||||
movs r1, 0
|
||||
bl sub_8071DF0
|
||||
bl PlayCry1
|
||||
ldr r1, [r5]
|
||||
b _08047648
|
||||
.align 2, 0
|
||||
_0804746C: .4byte gUnknown_202063C
|
||||
_08047470: .4byte nullsub_8
|
||||
_08047474:
|
||||
bl sub_80721A0
|
||||
bl IsCryFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08047480
|
||||
@@ -1000,7 +1000,7 @@ _08047482:
|
||||
ldr r1, _080474D4 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
ldr r1, _080474D8 @ =gUnknown_2021CD0
|
||||
bl sub_80453C0
|
||||
bl GetMonNick
|
||||
ldr r4, _080474DC @ =gUnknown_2021D18
|
||||
ldr r1, _080474E0 @ =gUnknown_841B6FD
|
||||
adds r0, r4, 0
|
||||
@@ -1014,14 +1014,14 @@ _08047482:
|
||||
movs r3, 0x3
|
||||
bl sub_8047A9C
|
||||
ldr r0, _080474E4 @ =0x00000103
|
||||
bl sub_8071C60
|
||||
bl PlayFanfare
|
||||
ldr r1, [r5]
|
||||
ldrb r0, [r1, 0x2]
|
||||
adds r0, 0x1
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, [r5]
|
||||
ldrb r0, [r0, 0x8]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldr r0, [r5]
|
||||
ldrb r0, [r0, 0x8]
|
||||
movs r1, 0x3
|
||||
@@ -1034,7 +1034,7 @@ _080474DC: .4byte gUnknown_2021D18
|
||||
_080474E0: .4byte gUnknown_841B6FD
|
||||
_080474E4: .4byte 0x00000103
|
||||
_080474E8:
|
||||
bl sub_8071C9C
|
||||
bl IsFanfareTaskInactive
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080474F4
|
||||
@@ -1042,7 +1042,7 @@ _080474E8:
|
||||
_080474F4:
|
||||
b _08047644
|
||||
_080474F6:
|
||||
bl sub_8071C9C
|
||||
bl IsFanfareTaskInactive
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08047502
|
||||
@@ -1057,7 +1057,7 @@ _08047504:
|
||||
ldr r1, _08047538 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
ldr r1, _0804753C @ =gUnknown_2021CD0
|
||||
bl sub_80453C0
|
||||
bl GetMonNick
|
||||
ldr r4, _08047540 @ =gUnknown_2021D18
|
||||
ldr r1, _08047544 @ =gUnknown_841B716
|
||||
adds r0, r4, 0
|
||||
@@ -1138,7 +1138,7 @@ _080475A8:
|
||||
adds r0, r6
|
||||
ldr r1, _0804762C @ =gUnknown_2021D04
|
||||
mov r10, r1
|
||||
bl sub_80453C0
|
||||
bl GetMonNick
|
||||
mov r1, r9
|
||||
ldr r0, [r1]
|
||||
ldrb r0, [r0, 0x4]
|
||||
@@ -1147,7 +1147,7 @@ _080475A8:
|
||||
adds r0, r1, 0
|
||||
adds r0, r6
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r5, r0, 0
|
||||
lsls r5, 16
|
||||
lsrs r5, 16
|
||||
@@ -1158,7 +1158,7 @@ _080475A8:
|
||||
muls r1, r0
|
||||
adds r0, r1, 0
|
||||
adds r0, r6
|
||||
bl sub_803F720
|
||||
bl GetMonGender
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -1171,7 +1171,7 @@ _080475A8:
|
||||
adds r0, r6
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
str r0, [sp]
|
||||
ldr r0, _08047630 @ =sub_80472A0
|
||||
str r0, [sp, 0x4]
|
||||
@@ -1193,7 +1193,7 @@ _08047634:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_08047644:
|
||||
ldr r0, _08047650 @ =gUnknown_3000E74
|
||||
ldr r1, [r0]
|
||||
@@ -1215,20 +1215,20 @@ _08047654:
|
||||
ldrb r0, [r0, 0x8]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
ldr r0, [r5]
|
||||
bl sub_8002BC4
|
||||
ldr r0, _080476AC @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
bl Free
|
||||
ldr r0, _080476AC @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
bl sub_812B484
|
||||
_08047684:
|
||||
bl sub_8077578
|
||||
bl RunTasks
|
||||
bl sub_8002DE8
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
add sp, 0xC
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -1239,7 +1239,7 @@ _08047684:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080476A8: .4byte gUnknown_2037AB8
|
||||
_080476AC: .4byte sub_80567DC
|
||||
_080476AC: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_8047338
|
||||
|
||||
thumb_func_start sub_80476B0
|
||||
@@ -1269,7 +1269,7 @@ _080476D0:
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x1
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -1279,8 +1279,8 @@ _080476D0:
|
||||
bl sub_80722CC
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_800838C
|
||||
bl sub_80479C8
|
||||
bl StartSpriteAnim
|
||||
bl CreateRandomEggShardSprite
|
||||
_08047700:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1322,7 +1322,7 @@ _08047738:
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x2
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -1332,7 +1332,7 @@ _08047738:
|
||||
bl sub_80722CC
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
_08047764:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1358,7 +1358,7 @@ sub_804776C: @ 804776C
|
||||
asrs r0, 16
|
||||
cmp r0, 0x26
|
||||
ble _080477E4
|
||||
ldr r0, _080477D0 @ =sub_804782C
|
||||
ldr r0, _080477D0 @ =SpriteCB_Egg_3
|
||||
str r0, [r4, 0x1C]
|
||||
strh r6, [r4, 0x2E]
|
||||
ldr r5, _080477D4 @ =gUnknown_3000E74
|
||||
@@ -1369,7 +1369,7 @@ sub_804776C: @ 804776C
|
||||
ldr r1, _080477D8 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
ldr r4, _080477DC @ =gUnknown_202063C
|
||||
ldr r3, [r5]
|
||||
@@ -1391,7 +1391,7 @@ sub_804776C: @ 804776C
|
||||
strh r0, [r1, 0x26]
|
||||
b _08047826
|
||||
.align 2, 0
|
||||
_080477D0: .4byte sub_804782C
|
||||
_080477D0: .4byte SpriteCB_Egg_3
|
||||
_080477D4: .4byte gUnknown_3000E74
|
||||
_080477D8: .4byte gUnknown_2024284
|
||||
_080477DC: .4byte gUnknown_202063C
|
||||
@@ -1405,7 +1405,7 @@ _080477E4:
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x2
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -1415,9 +1415,9 @@ _080477E4:
|
||||
bl sub_80722CC
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_800838C
|
||||
bl sub_80479C8
|
||||
bl sub_80479C8
|
||||
bl StartSpriteAnim
|
||||
bl CreateRandomEggShardSprite
|
||||
bl CreateRandomEggShardSprite
|
||||
_08047818:
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r4, r1]
|
||||
@@ -1431,8 +1431,8 @@ _08047826:
|
||||
bx r0
|
||||
thumb_func_end sub_804776C
|
||||
|
||||
thumb_func_start sub_804782C
|
||||
sub_804782C: @ 804782C
|
||||
thumb_func_start SpriteCB_Egg_3
|
||||
SpriteCB_Egg_3: @ 804782C
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
ldrh r0, [r1, 0x2E]
|
||||
@@ -1442,7 +1442,7 @@ sub_804782C: @ 804782C
|
||||
asrs r0, 16
|
||||
cmp r0, 0x32
|
||||
ble _08047846
|
||||
ldr r0, _0804784C @ =sub_8047850
|
||||
ldr r0, _0804784C @ =SpriteCB_Egg_4
|
||||
str r0, [r1, 0x1C]
|
||||
movs r0, 0
|
||||
strh r0, [r1, 0x2E]
|
||||
@@ -1450,11 +1450,11 @@ _08047846:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804784C: .4byte sub_8047850
|
||||
thumb_func_end sub_804782C
|
||||
_0804784C: .4byte SpriteCB_Egg_4
|
||||
thumb_func_end SpriteCB_Egg_3
|
||||
|
||||
thumb_func_start sub_8047850
|
||||
sub_8047850: @ 8047850
|
||||
thumb_func_start SpriteCB_Egg_4
|
||||
SpriteCB_Egg_4: @ 8047850
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
@@ -1469,14 +1469,14 @@ sub_8047850: @ 8047850
|
||||
adds r0, r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_08047870:
|
||||
ldrh r0, [r5, 0x2E]
|
||||
cmp r0, 0x3
|
||||
bhi _0804788C
|
||||
movs r4, 0
|
||||
_08047878:
|
||||
bl sub_80479C8
|
||||
bl CreateRandomEggShardSprite
|
||||
lsls r0, r4, 16
|
||||
movs r1, 0x80
|
||||
lsls r1, 9
|
||||
@@ -1505,7 +1505,7 @@ _0804788C:
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, _080478CC @ =sub_80478D0
|
||||
ldr r0, _080478CC @ =SpriteCB_Egg_5
|
||||
str r0, [r5, 0x1C]
|
||||
strh r4, [r5, 0x2E]
|
||||
_080478BA:
|
||||
@@ -1516,11 +1516,11 @@ _080478BA:
|
||||
.align 2, 0
|
||||
_080478C4: .4byte 0x0000ffff
|
||||
_080478C8: .4byte gUnknown_2037AB8
|
||||
_080478CC: .4byte sub_80478D0
|
||||
thumb_func_end sub_8047850
|
||||
_080478CC: .4byte SpriteCB_Egg_5
|
||||
thumb_func_end SpriteCB_Egg_4
|
||||
|
||||
thumb_func_start sub_80478D0
|
||||
sub_80478D0: @ 80478D0
|
||||
thumb_func_start SpriteCB_Egg_5
|
||||
SpriteCB_Egg_5: @ 80478D0
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
@@ -1549,7 +1549,7 @@ sub_80478D0: @ 80478D0
|
||||
lsls r0, 2
|
||||
adds r0, r4
|
||||
movs r1, 0x1
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
_0804790C:
|
||||
movs r2, 0x2E
|
||||
ldrsh r0, [r5, r2]
|
||||
@@ -1562,7 +1562,7 @@ _0804790C:
|
||||
adds r0, r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_08047926:
|
||||
movs r1, 0x2E
|
||||
ldrsh r0, [r5, r1]
|
||||
@@ -1599,10 +1599,10 @@ _08047960: .4byte gUnknown_202063C
|
||||
_08047964: .4byte gUnknown_3000E74
|
||||
_08047968: .4byte 0x0000ffff
|
||||
_0804796C: .4byte nullsub_8
|
||||
thumb_func_end sub_80478D0
|
||||
thumb_func_end SpriteCB_Egg_5
|
||||
|
||||
thumb_func_start sub_8047970
|
||||
sub_8047970: @ 8047970
|
||||
thumb_func_start SpriteCB_EggShard
|
||||
SpriteCB_EggShard: @ 8047970
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
ldrh r0, [r2, 0x30]
|
||||
@@ -1644,15 +1644,15 @@ _0804799C:
|
||||
cmp r0, 0
|
||||
ble _080479C2
|
||||
adds r0, r2, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080479C2:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8047970
|
||||
thumb_func_end SpriteCB_EggShard
|
||||
|
||||
thumb_func_start sub_80479C8
|
||||
sub_80479C8: @ 80479C8
|
||||
thumb_func_start CreateRandomEggShardSprite
|
||||
CreateRandomEggShardSprite: @ 80479C8
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
ldr r2, _08047A14 @ =gUnknown_82601BC
|
||||
@@ -1667,7 +1667,7 @@ sub_80479C8: @ 80479C8
|
||||
ldrh r4, [r0]
|
||||
adds r3, 0x1
|
||||
strb r3, [r6, 0x7]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
movs r1, 0xC0
|
||||
lsls r1, 10
|
||||
@@ -1684,7 +1684,7 @@ sub_80479C8: @ 80479C8
|
||||
movs r1, 0x3C
|
||||
adds r2, r5, 0
|
||||
adds r3, r4, 0
|
||||
bl sub_8047A1C
|
||||
bl CreateEggShardSprite
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -1692,10 +1692,10 @@ sub_80479C8: @ 80479C8
|
||||
.align 2, 0
|
||||
_08047A14: .4byte gUnknown_82601BC
|
||||
_08047A18: .4byte gUnknown_3000E74
|
||||
thumb_func_end sub_80479C8
|
||||
thumb_func_end CreateRandomEggShardSprite
|
||||
|
||||
thumb_func_start sub_8047A1C
|
||||
sub_8047A1C: @ 8047A1C
|
||||
thumb_func_start CreateEggShardSprite
|
||||
CreateEggShardSprite: @ 8047A1C
|
||||
push {r4-r6,lr}
|
||||
mov r6, r10
|
||||
mov r5, r9
|
||||
@@ -1731,7 +1731,7 @@ sub_8047A1C: @ 8047A1C
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
movs r3, 0x4
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
@@ -1746,7 +1746,7 @@ sub_8047A1C: @ 8047A1C
|
||||
mov r1, r9
|
||||
strh r1, [r0, 0x34]
|
||||
mov r1, r10
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
@@ -1757,7 +1757,7 @@ sub_8047A1C: @ 8047A1C
|
||||
.align 2, 0
|
||||
_08047A94: .4byte gUnknown_8260184
|
||||
_08047A98: .4byte gUnknown_202063C
|
||||
thumb_func_end sub_8047A1C
|
||||
thumb_func_end CreateEggShardSprite
|
||||
|
||||
thumb_func_start sub_8047A9C
|
||||
sub_8047A9C: @ 8047A9C
|
||||
@@ -1780,7 +1780,7 @@ sub_8047A9C: @ 8047A9C
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xFF
|
||||
str r3, [sp, 0x14]
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r2, _08047B08 @ =gUnknown_3000E74
|
||||
ldr r1, [r2]
|
||||
movs r0, 0
|
||||
|
||||
+130
-130
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80F5950
|
||||
sub_80F5950: @ 80F5950
|
||||
thumb_func_start SetEvoSparklesMatrices
|
||||
SetEvoSparklesMatrices: @ 80F5950
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
movs r4, 0
|
||||
@@ -22,7 +22,7 @@ _080F5958:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80073BC
|
||||
bl SetOamMatrix
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
@@ -34,10 +34,10 @@ _080F5958:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5984: .4byte gUnknown_841EF10
|
||||
thumb_func_end sub_80F5950
|
||||
thumb_func_end SetEvoSparklesMatrices
|
||||
|
||||
thumb_func_start sub_80F5988
|
||||
sub_80F5988: @ 80F5988
|
||||
thumb_func_start SpriteCB_PreEvoSparkleSet1
|
||||
SpriteCB_PreEvoSparkleSet1: @ 80F5988
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x22
|
||||
@@ -59,7 +59,7 @@ sub_80F5988: @ 80F5988
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -73,7 +73,7 @@ _080F59C2:
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
ldrh r0, [r4, 0x3A]
|
||||
adds r0, 0x4
|
||||
@@ -130,15 +130,15 @@ _080F5A22:
|
||||
b _080F5A3C
|
||||
_080F5A36:
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080F5A3C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5988
|
||||
thumb_func_end SpriteCB_PreEvoSparkleSet1
|
||||
|
||||
thumb_func_start sub_80F5A44
|
||||
sub_80F5A44: @ 80F5A44
|
||||
thumb_func_start CreatePreEvoSparkleSet1
|
||||
CreatePreEvoSparkleSet1: @ 80F5A44
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -146,7 +146,7 @@ sub_80F5A44: @ 80F5A44
|
||||
movs r1, 0x78
|
||||
movs r2, 0x58
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -173,7 +173,7 @@ sub_80F5A44: @ 80F5A44
|
||||
strb r0, [r2, 0x3]
|
||||
adds r4, 0x1C
|
||||
adds r3, r4
|
||||
ldr r0, _080F5A9C @ =sub_80F5988
|
||||
ldr r0, _080F5A9C @ =SpriteCB_PreEvoSparkleSet1
|
||||
str r0, [r3]
|
||||
_080F5A8E:
|
||||
pop {r4,r5}
|
||||
@@ -182,11 +182,11 @@ _080F5A8E:
|
||||
.align 2, 0
|
||||
_080F5A94: .4byte gUnknown_841EEF8
|
||||
_080F5A98: .4byte gUnknown_202063C
|
||||
_080F5A9C: .4byte sub_80F5988
|
||||
thumb_func_end sub_80F5A44
|
||||
_080F5A9C: .4byte SpriteCB_PreEvoSparkleSet1
|
||||
thumb_func_end CreatePreEvoSparkleSet1
|
||||
|
||||
thumb_func_start sub_80F5AA0
|
||||
sub_80F5AA0: @ 80F5AA0
|
||||
thumb_func_start SpriteCB_PreEvoSparkleSet2
|
||||
SpriteCB_PreEvoSparkleSet2: @ 80F5AA0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x22
|
||||
@@ -207,7 +207,7 @@ sub_80F5AA0: @ 80F5AA0
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0
|
||||
@@ -221,14 +221,14 @@ _080F5AD8:
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x3C
|
||||
ldrsh r0, [r4, r1]
|
||||
lsls r0, 26
|
||||
lsrs r0, 24
|
||||
movs r1, 0x28
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
adds r0, 0x8
|
||||
strh r0, [r4, 0x38]
|
||||
ldrh r0, [r4, 0x3C]
|
||||
@@ -237,15 +237,15 @@ _080F5AD8:
|
||||
b _080F5B0C
|
||||
_080F5B06:
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080F5B0C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5AA0
|
||||
thumb_func_end SpriteCB_PreEvoSparkleSet2
|
||||
|
||||
thumb_func_start sub_80F5B14
|
||||
sub_80F5B14: @ 80F5B14
|
||||
thumb_func_start CreatePreEvoSparkleSet2
|
||||
CreatePreEvoSparkleSet2: @ 80F5B14
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -253,7 +253,7 @@ sub_80F5B14: @ 80F5B14
|
||||
movs r1, 0x78
|
||||
movs r2, 0x8
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -286,7 +286,7 @@ sub_80F5B14: @ 80F5B14
|
||||
strb r0, [r2]
|
||||
adds r4, 0x1C
|
||||
adds r3, r4
|
||||
ldr r0, _080F5B78 @ =sub_80F5AA0
|
||||
ldr r0, _080F5B78 @ =SpriteCB_PreEvoSparkleSet2
|
||||
str r0, [r3]
|
||||
_080F5B6A:
|
||||
pop {r4,r5}
|
||||
@@ -295,11 +295,11 @@ _080F5B6A:
|
||||
.align 2, 0
|
||||
_080F5B70: .4byte gUnknown_841EEF8
|
||||
_080F5B74: .4byte gUnknown_202063C
|
||||
_080F5B78: .4byte sub_80F5AA0
|
||||
thumb_func_end sub_80F5B14
|
||||
_080F5B78: .4byte SpriteCB_PreEvoSparkleSet2
|
||||
thumb_func_end CreatePreEvoSparkleSet2
|
||||
|
||||
thumb_func_start sub_80F5B7C
|
||||
sub_80F5B7C: @ 80F5B7C
|
||||
thumb_func_start SpriteCB_PostEvoSparkleSet1
|
||||
SpriteCB_PostEvoSparkleSet1: @ 80F5B7C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x38
|
||||
@@ -311,14 +311,14 @@ sub_80F5B7C: @ 80F5B7C
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x3A]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r2, 0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
strh r0, [r4, 0x24]
|
||||
ldrh r0, [r4, 0x38]
|
||||
ldrh r1, [r4, 0x34]
|
||||
@@ -330,15 +330,15 @@ sub_80F5B7C: @ 80F5B7C
|
||||
b _080F5BBE
|
||||
_080F5BB8:
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080F5BBE:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5B7C
|
||||
thumb_func_end SpriteCB_PostEvoSparkleSet1
|
||||
|
||||
thumb_func_start sub_80F5BC4
|
||||
sub_80F5BC4: @ 80F5BC4
|
||||
thumb_func_start CreatePostEvoSparkleSet1
|
||||
CreatePostEvoSparkleSet1: @ 80F5BC4
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -348,7 +348,7 @@ sub_80F5BC4: @ 80F5BC4
|
||||
movs r1, 0x78
|
||||
movs r2, 0x38
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -379,7 +379,7 @@ sub_80F5BC4: @ 80F5BC4
|
||||
strb r0, [r2]
|
||||
adds r4, 0x1C
|
||||
adds r3, r4
|
||||
ldr r0, _080F5C28 @ =sub_80F5B7C
|
||||
ldr r0, _080F5C28 @ =SpriteCB_PostEvoSparkleSet1
|
||||
str r0, [r3]
|
||||
_080F5C1A:
|
||||
pop {r4-r6}
|
||||
@@ -388,11 +388,11 @@ _080F5C1A:
|
||||
.align 2, 0
|
||||
_080F5C20: .4byte gUnknown_841EEF8
|
||||
_080F5C24: .4byte gUnknown_202063C
|
||||
_080F5C28: .4byte sub_80F5B7C
|
||||
thumb_func_end sub_80F5BC4
|
||||
_080F5C28: .4byte SpriteCB_PostEvoSparkleSet1
|
||||
thumb_func_end CreatePostEvoSparkleSet1
|
||||
|
||||
thumb_func_start sub_80F5C2C
|
||||
sub_80F5C2C: @ 80F5C2C
|
||||
thumb_func_start SpriteCB_PostEvoSparkleSet2
|
||||
SpriteCB_PostEvoSparkleSet2: @ 80F5C2C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldrh r1, [r4, 0x3C]
|
||||
@@ -413,7 +413,7 @@ _080F5C40:
|
||||
lsrs r0, 24
|
||||
movs r5, 0x38
|
||||
ldrsh r1, [r4, r5]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
negs r0, r0
|
||||
strh r0, [r4, 0x26]
|
||||
movs r0, 0x34
|
||||
@@ -496,15 +496,15 @@ _080F5CD6:
|
||||
b _080F5CF6
|
||||
_080F5CF0:
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_080F5CF6:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5C2C
|
||||
thumb_func_end SpriteCB_PostEvoSparkleSet2
|
||||
|
||||
thumb_func_start sub_80F5CFC
|
||||
sub_80F5CFC: @ 80F5CFC
|
||||
thumb_func_start CreatePostEvoSparkleSet2
|
||||
CreatePostEvoSparkleSet2: @ 80F5CFC
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
@@ -512,12 +512,12 @@ sub_80F5CFC: @ 80F5CFC
|
||||
movs r1, 0x78
|
||||
movs r2, 0x38
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x40
|
||||
beq _080F5D6C
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r6, _080F5D7C @ =gUnknown_202063C
|
||||
lsls r5, r4, 4
|
||||
adds r5, r4
|
||||
@@ -532,7 +532,7 @@ sub_80F5CFC: @ 80F5CFC
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
strh r1, [r4, 0x34]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x3F
|
||||
ands r1, r0
|
||||
adds r1, 0x30
|
||||
@@ -555,7 +555,7 @@ sub_80F5CFC: @ 80F5CFC
|
||||
strb r0, [r4]
|
||||
adds r6, 0x1C
|
||||
adds r5, r6
|
||||
ldr r0, _080F5D80 @ =sub_80F5C2C
|
||||
ldr r0, _080F5D80 @ =SpriteCB_PostEvoSparkleSet2
|
||||
str r0, [r5]
|
||||
_080F5D6C:
|
||||
pop {r3}
|
||||
@@ -566,32 +566,32 @@ _080F5D6C:
|
||||
.align 2, 0
|
||||
_080F5D78: .4byte gUnknown_841EEF8
|
||||
_080F5D7C: .4byte gUnknown_202063C
|
||||
_080F5D80: .4byte sub_80F5C2C
|
||||
thumb_func_end sub_80F5CFC
|
||||
_080F5D80: .4byte SpriteCB_PostEvoSparkleSet2
|
||||
thumb_func_end CreatePostEvoSparkleSet2
|
||||
|
||||
thumb_func_start sub_80F5D84
|
||||
sub_80F5D84: @ 80F5D84
|
||||
thumb_func_start LoadEvoSparkleSpriteAndPal
|
||||
LoadEvoSparkleSpriteAndPal: @ 80F5D84
|
||||
push {lr}
|
||||
ldr r0, _080F5D98 @ =gUnknown_841EEC4
|
||||
bl sub_800F034
|
||||
ldr r0, _080F5D9C @ =gUnknown_841EED4
|
||||
bl sub_8008974
|
||||
bl LoadSpritePalettes
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5D98: .4byte gUnknown_841EEC4
|
||||
_080F5D9C: .4byte gUnknown_841EED4
|
||||
thumb_func_end sub_80F5D84
|
||||
thumb_func_end LoadEvoSparkleSpriteAndPal
|
||||
|
||||
thumb_func_start sub_80F5DA0
|
||||
sub_80F5DA0: @ 80F5DA0
|
||||
thumb_func_start LaunchTask_PreEvoSparklesSet1
|
||||
LaunchTask_PreEvoSparklesSet1: @ 80F5DA0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
ldr r0, _080F5DC8 @ =sub_80F5DD0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F5DCC @ =gUnknown_3005090
|
||||
@@ -606,7 +606,7 @@ sub_80F5DA0: @ 80F5DA0
|
||||
.align 2, 0
|
||||
_080F5DC8: .4byte sub_80F5DD0
|
||||
_080F5DCC: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80F5DA0
|
||||
thumb_func_end LaunchTask_PreEvoSparklesSet1
|
||||
|
||||
thumb_func_start sub_80F5DD0
|
||||
sub_80F5DD0: @ 80F5DD0
|
||||
@@ -615,7 +615,7 @@ sub_80F5DD0: @ 80F5DD0
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_80F5950
|
||||
bl SetEvoSparklesMatrices
|
||||
ldr r0, _080F5E14 @ =gUnknown_3005090
|
||||
lsls r5, r4, 2
|
||||
adds r5, r4
|
||||
@@ -632,8 +632,8 @@ sub_80F5DD0: @ 80F5DD0
|
||||
movs r1, 0xA
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
ldr r0, _080F5E1C @ =sub_80F5E20
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F5E1C @ =EvoTask_CreatePreEvoSparkleSet1
|
||||
str r0, [r5]
|
||||
movs r0, 0x85
|
||||
bl sub_80722CC
|
||||
@@ -644,11 +644,11 @@ sub_80F5DD0: @ 80F5DD0
|
||||
.align 2, 0
|
||||
_080F5E14: .4byte gUnknown_3005090
|
||||
_080F5E18: .4byte 0x00007fff
|
||||
_080F5E1C: .4byte sub_80F5E20
|
||||
_080F5E1C: .4byte EvoTask_CreatePreEvoSparkleSet1
|
||||
thumb_func_end sub_80F5DD0
|
||||
|
||||
thumb_func_start sub_80F5E20
|
||||
sub_80F5E20: @ 80F5E20
|
||||
thumb_func_start EvoTask_CreatePreEvoSparkleSet1
|
||||
EvoTask_CreatePreEvoSparkleSet1: @ 80F5E20
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -678,7 +678,7 @@ _080F5E48:
|
||||
adds r0, r1
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80F5A44
|
||||
bl CreatePreEvoSparkleSet1
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -698,18 +698,18 @@ _080F5E78: .4byte gUnknown_3005090
|
||||
_080F5E7C:
|
||||
movs r0, 0x60
|
||||
strh r0, [r1, 0x26]
|
||||
ldr r0, _080F5E8C @ =sub_80F5E90
|
||||
ldr r0, _080F5E8C @ =EvoTask_WaitForPre1SparklesToGoUp
|
||||
str r0, [r1]
|
||||
_080F5E84:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5E8C: .4byte sub_80F5E90
|
||||
thumb_func_end sub_80F5E20
|
||||
_080F5E8C: .4byte EvoTask_WaitForPre1SparklesToGoUp
|
||||
thumb_func_end EvoTask_CreatePreEvoSparkleSet1
|
||||
|
||||
thumb_func_start sub_80F5E90
|
||||
sub_80F5E90: @ 80F5E90
|
||||
thumb_func_start EvoTask_WaitForPre1SparklesToGoUp
|
||||
EvoTask_WaitForPre1SparklesToGoUp: @ 80F5E90
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -730,19 +730,19 @@ sub_80F5E90: @ 80F5E90
|
||||
_080F5EB0: .4byte gUnknown_3005090
|
||||
_080F5EB4:
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080F5EBA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5E90
|
||||
thumb_func_end EvoTask_WaitForPre1SparklesToGoUp
|
||||
|
||||
thumb_func_start sub_80F5EC0
|
||||
sub_80F5EC0: @ 80F5EC0
|
||||
push {lr}
|
||||
ldr r0, _080F5ED4 @ =sub_80F5ED8
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -757,7 +757,7 @@ sub_80F5ED8: @ 80F5ED8
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_80F5950
|
||||
bl SetEvoSparklesMatrices
|
||||
ldr r1, _080F5F04 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -765,7 +765,7 @@ sub_80F5ED8: @ 80F5ED8
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x26]
|
||||
ldr r1, _080F5F08 @ =sub_80F5F0C
|
||||
ldr r1, _080F5F08 @ =EvoTask_CreatePreEvoSparklesSet2
|
||||
str r1, [r0]
|
||||
movs r0, 0xB0
|
||||
bl sub_80722CC
|
||||
@@ -774,11 +774,11 @@ sub_80F5ED8: @ 80F5ED8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5F04: .4byte gUnknown_3005090
|
||||
_080F5F08: .4byte sub_80F5F0C
|
||||
_080F5F08: .4byte EvoTask_CreatePreEvoSparklesSet2
|
||||
thumb_func_end sub_80F5ED8
|
||||
|
||||
thumb_func_start sub_80F5F0C
|
||||
sub_80F5F0C: @ 80F5F0C
|
||||
thumb_func_start EvoTask_CreatePreEvoSparklesSet2
|
||||
EvoTask_CreatePreEvoSparklesSet2: @ 80F5F0C
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -798,7 +798,7 @@ sub_80F5F0C: @ 80F5F0C
|
||||
_080F5F2C:
|
||||
lsls r0, r4, 28
|
||||
lsrs r0, 24
|
||||
bl sub_80F5B14
|
||||
bl CreatePreEvoSparkleSet2
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -824,14 +824,14 @@ _080F5F58:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5F60: .4byte sub_80F5F64
|
||||
thumb_func_end sub_80F5F0C
|
||||
thumb_func_end EvoTask_CreatePreEvoSparklesSet2
|
||||
|
||||
thumb_func_start sub_80F5F64
|
||||
sub_80F5F64: @ 80F5F64
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F5F64
|
||||
@@ -841,7 +841,7 @@ sub_80F5F74: @ 80F5F74
|
||||
push {lr}
|
||||
ldr r0, _080F5F88 @ =sub_80F5F8C
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -856,7 +856,7 @@ sub_80F5F8C: @ 80F5F8C
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_80F5950
|
||||
bl SetEvoSparklesMatrices
|
||||
ldr r1, _080F5FB8 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -864,7 +864,7 @@ sub_80F5F8C: @ 80F5F8C
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x26]
|
||||
ldr r1, _080F5FBC @ =sub_80F5FC0
|
||||
ldr r1, _080F5FBC @ =EvoTask_CreatePostEvoSparklesSet1
|
||||
str r1, [r0]
|
||||
movs r0, 0x5F
|
||||
bl sub_80722CC
|
||||
@@ -873,11 +873,11 @@ sub_80F5F8C: @ 80F5F8C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F5FB8: .4byte gUnknown_3005090
|
||||
_080F5FBC: .4byte sub_80F5FC0
|
||||
_080F5FBC: .4byte EvoTask_CreatePostEvoSparklesSet1
|
||||
thumb_func_end sub_80F5F8C
|
||||
|
||||
thumb_func_start sub_80F5FC0
|
||||
sub_80F5FC0: @ 80F5FC0
|
||||
thumb_func_start EvoTask_CreatePostEvoSparklesSet1
|
||||
EvoTask_CreatePostEvoSparklesSet1: @ 80F5FC0
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -898,7 +898,7 @@ _080F5FE0:
|
||||
lsls r0, r4, 28
|
||||
lsrs r0, 24
|
||||
movs r1, 0x4
|
||||
bl sub_80F5BC4
|
||||
bl CreatePostEvoSparkleSet1
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -918,7 +918,7 @@ _080F6006:
|
||||
lsls r0, r4, 28
|
||||
lsrs r0, 24
|
||||
movs r1, 0x8
|
||||
bl sub_80F5BC4
|
||||
bl CreatePostEvoSparkleSet1
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -944,27 +944,27 @@ _080F6034:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F603C: .4byte sub_80F6040
|
||||
thumb_func_end sub_80F5FC0
|
||||
thumb_func_end EvoTask_CreatePostEvoSparklesSet1
|
||||
|
||||
thumb_func_start sub_80F6040
|
||||
sub_80F6040: @ 80F6040
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F6040
|
||||
|
||||
thumb_func_start sub_80F6050
|
||||
sub_80F6050: @ 80F6050
|
||||
thumb_func_start LaunchTask_PostEvoSparklesSet2AndFlash
|
||||
LaunchTask_PostEvoSparklesSet2AndFlash: @ 80F6050
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
ldr r0, _080F6078 @ =sub_80F6080
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F607C @ =gUnknown_3005090
|
||||
@@ -979,7 +979,7 @@ sub_80F6050: @ 80F6050
|
||||
.align 2, 0
|
||||
_080F6078: .4byte sub_80F6080
|
||||
_080F607C: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80F6050
|
||||
thumb_func_end LaunchTask_PostEvoSparklesSet2AndFlash
|
||||
|
||||
thumb_func_start sub_80F6080
|
||||
sub_80F6080: @ 80F6080
|
||||
@@ -988,7 +988,7 @@ sub_80F6080: @ 80F6080
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_80F5950
|
||||
bl SetEvoSparklesMatrices
|
||||
ldr r0, _080F60CC @ =gUnknown_3005090
|
||||
lsls r5, r4, 2
|
||||
adds r5, r4
|
||||
@@ -1007,7 +1007,7 @@ sub_80F6080: @ 80F6080
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F60E0 @ =sub_80F60E4
|
||||
str r0, [r5]
|
||||
movs r0, 0xC3
|
||||
@@ -1047,10 +1047,10 @@ sub_80F60E4: @ 80F60E4
|
||||
beq _080F6134
|
||||
cmp r2, 0x31
|
||||
bgt _080F6144
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x7
|
||||
ands r0, r1
|
||||
bl sub_80F5CFC
|
||||
bl CreatePostEvoSparkleSet2
|
||||
b _080F6144
|
||||
.align 2, 0
|
||||
_080F611C: .4byte gUnknown_3005090
|
||||
@@ -1058,7 +1058,7 @@ _080F6120:
|
||||
movs r4, 0
|
||||
_080F6122:
|
||||
adds r0, r4, 0
|
||||
bl sub_80F5CFC
|
||||
bl CreatePostEvoSparkleSet2
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -1072,7 +1072,7 @@ _080F6134:
|
||||
movs r1, 0x10
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080F6144:
|
||||
ldr r0, _080F615C @ =gUnknown_3005090
|
||||
adds r1, r5, r6
|
||||
@@ -1110,7 +1110,7 @@ sub_80F6170: @ 80F6170
|
||||
cmp r0, 0
|
||||
bne _080F6188
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080F6188:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1126,7 +1126,7 @@ sub_80F6190: @ 80F6190
|
||||
lsrs r4, 16
|
||||
ldr r0, _080F61B8 @ =sub_80F61C0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F61BC @ =gUnknown_3005090
|
||||
@@ -1150,7 +1150,7 @@ sub_80F61C0: @ 80F61C0
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_80F5950
|
||||
bl SetEvoSparklesMatrices
|
||||
ldr r0, _080F620C @ =gUnknown_3005090
|
||||
lsls r5, r4, 2
|
||||
adds r5, r4
|
||||
@@ -1169,7 +1169,7 @@ sub_80F61C0: @ 80F61C0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080F6220 @ =sub_80F6224
|
||||
str r0, [r5]
|
||||
movs r0, 0xC3
|
||||
@@ -1209,10 +1209,10 @@ sub_80F6224: @ 80F6224
|
||||
beq _080F6274
|
||||
cmp r2, 0x31
|
||||
bgt _080F6284
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x7
|
||||
ands r0, r1
|
||||
bl sub_80F5CFC
|
||||
bl CreatePostEvoSparkleSet2
|
||||
b _080F6284
|
||||
.align 2, 0
|
||||
_080F625C: .4byte gUnknown_3005090
|
||||
@@ -1220,7 +1220,7 @@ _080F6260:
|
||||
movs r4, 0
|
||||
_080F6262:
|
||||
adds r0, r4, 0
|
||||
bl sub_80F5CFC
|
||||
bl CreatePostEvoSparkleSet2
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -1234,7 +1234,7 @@ _080F6274:
|
||||
movs r1, 0x10
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080F6284:
|
||||
ldr r0, _080F629C @ =gUnknown_3005090
|
||||
adds r1, r5, r6
|
||||
@@ -1292,7 +1292,7 @@ _080F62CE:
|
||||
bls _080F62CE
|
||||
adds r0, r3, 0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
mov r8, r0
|
||||
mov r0, r8
|
||||
lsls r0, 24
|
||||
@@ -1317,7 +1317,7 @@ _080F62CE:
|
||||
movs r0, 0x1E
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80073BC
|
||||
bl SetOamMatrix
|
||||
movs r0, 0x10
|
||||
ldrsh r1, [r6, r0]
|
||||
adds r0, r4, 0
|
||||
@@ -1329,7 +1329,7 @@ _080F62CE:
|
||||
movs r0, 0x1F
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80073BC
|
||||
bl SetOamMatrix
|
||||
ldr r1, _080F63F4 @ =gUnknown_202063C
|
||||
mov r9, r1
|
||||
lsls r2, r5, 4
|
||||
@@ -1461,7 +1461,7 @@ sub_80F6424: @ 80F6424
|
||||
cmp r0, 0
|
||||
beq _080F6448
|
||||
adds r0, r3, 0
|
||||
bl sub_80F6640
|
||||
bl PreEvoVisible_PostEvoInvisible_KillTask
|
||||
b _080F646A
|
||||
.align 2, 0
|
||||
_080F6444: .4byte gUnknown_3005090
|
||||
@@ -1472,7 +1472,7 @@ _080F6448:
|
||||
cmp r0, 0x80
|
||||
bne _080F645A
|
||||
adds r0, r3, 0
|
||||
bl sub_80F6590
|
||||
bl PreEvoInvisible_PostEvoVisible_KillTask
|
||||
b _080F646A
|
||||
_080F645A:
|
||||
adds r0, r1, 0x2
|
||||
@@ -1507,12 +1507,12 @@ sub_80F6474: @ 80F6474
|
||||
adds r5, r1, 0
|
||||
cmp r0, 0
|
||||
beq _080F64A0
|
||||
ldr r0, _080F649C @ =sub_80F6640
|
||||
ldr r0, _080F649C @ =PreEvoVisible_PostEvoInvisible_KillTask
|
||||
str r0, [r2]
|
||||
b _080F6584
|
||||
.align 2, 0
|
||||
_080F6498: .4byte gUnknown_3005090
|
||||
_080F649C: .4byte sub_80F6640
|
||||
_080F649C: .4byte PreEvoVisible_PostEvoInvisible_KillTask
|
||||
_080F64A0:
|
||||
movs r6, 0
|
||||
movs r7, 0x12
|
||||
@@ -1616,7 +1616,7 @@ _080F653A:
|
||||
movs r0, 0x1E
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80073BC
|
||||
bl SetOamMatrix
|
||||
movs r3, 0x10
|
||||
ldrsh r1, [r5, r3]
|
||||
adds r0, r4, 0
|
||||
@@ -1628,7 +1628,7 @@ _080F653A:
|
||||
movs r0, 0x1F
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80073BC
|
||||
bl SetOamMatrix
|
||||
cmp r6, 0x2
|
||||
bne _080F6584
|
||||
ldr r0, _080F658C @ =sub_80F6424
|
||||
@@ -1642,8 +1642,8 @@ _080F6584:
|
||||
_080F658C: .4byte sub_80F6424
|
||||
thumb_func_end sub_80F6474
|
||||
|
||||
thumb_func_start sub_80F6590
|
||||
sub_80F6590: @ 80F6590
|
||||
thumb_func_start PreEvoInvisible_PostEvoVisible_KillTask
|
||||
PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
@@ -1721,7 +1721,7 @@ sub_80F6590: @ 80F6590
|
||||
negs r2, r2
|
||||
ands r2, r3
|
||||
strb r2, [r1]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
@@ -1730,10 +1730,10 @@ sub_80F6590: @ 80F6590
|
||||
.align 2, 0
|
||||
_080F6638: .4byte gUnknown_202063C
|
||||
_080F663C: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80F6590
|
||||
thumb_func_end PreEvoInvisible_PostEvoVisible_KillTask
|
||||
|
||||
thumb_func_start sub_80F6640
|
||||
sub_80F6640: @ 80F6640
|
||||
thumb_func_start PreEvoVisible_PostEvoInvisible_KillTask
|
||||
PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
@@ -1811,7 +1811,7 @@ sub_80F6640: @ 80F6640
|
||||
movs r3, 0x4
|
||||
orrs r2, r3
|
||||
strb r2, [r1]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
@@ -1820,6 +1820,6 @@ sub_80F6640: @ 80F6640
|
||||
.align 2, 0
|
||||
_080F66E8: .4byte gUnknown_202063C
|
||||
_080F66EC: .4byte gUnknown_3005090
|
||||
thumb_func_end sub_80F6640
|
||||
thumb_func_end PreEvoVisible_PostEvoInvisible_KillTask
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+299
-299
File diff suppressed because it is too large
Load Diff
+183
-183
File diff suppressed because it is too large
Load Diff
+111
-111
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_805A5A8
|
||||
sub_805A5A8: @ 805A5A8
|
||||
thumb_func_start move_tilemap_camera_to_upper_left_corner_
|
||||
move_tilemap_camera_to_upper_left_corner_: @ 805A5A8
|
||||
movs r1, 0
|
||||
strb r1, [r0, 0x2]
|
||||
strb r1, [r0, 0x3]
|
||||
@@ -15,10 +15,10 @@ sub_805A5A8: @ 805A5A8
|
||||
movs r1, 0x1
|
||||
strb r1, [r0, 0x4]
|
||||
bx lr
|
||||
thumb_func_end sub_805A5A8
|
||||
thumb_func_end move_tilemap_camera_to_upper_left_corner_
|
||||
|
||||
thumb_func_start sub_805A5B8
|
||||
sub_805A5B8: @ 805A5B8
|
||||
thumb_func_start tilemap_move_something
|
||||
tilemap_move_something: @ 805A5B8
|
||||
ldrb r3, [r0, 0x2]
|
||||
adds r3, r1
|
||||
strb r3, [r0, 0x2]
|
||||
@@ -33,10 +33,10 @@ sub_805A5B8: @ 805A5B8
|
||||
ands r1, r3
|
||||
strb r1, [r0, 0x3]
|
||||
bx lr
|
||||
thumb_func_end sub_805A5B8
|
||||
thumb_func_end tilemap_move_something
|
||||
|
||||
thumb_func_start sub_805A5D4
|
||||
sub_805A5D4: @ 805A5D4
|
||||
thumb_func_start coords8_add
|
||||
coords8_add: @ 805A5D4
|
||||
ldrb r3, [r0]
|
||||
adds r3, r1
|
||||
strb r3, [r0]
|
||||
@@ -44,21 +44,21 @@ sub_805A5D4: @ 805A5D4
|
||||
adds r1, r2
|
||||
strb r1, [r0, 0x1]
|
||||
bx lr
|
||||
thumb_func_end sub_805A5D4
|
||||
thumb_func_end coords8_add
|
||||
|
||||
thumb_func_start sub_805A5E4
|
||||
sub_805A5E4: @ 805A5E4
|
||||
thumb_func_start move_tilemap_camera_to_upper_left_corner
|
||||
move_tilemap_camera_to_upper_left_corner: @ 805A5E4
|
||||
push {lr}
|
||||
ldr r0, _0805A5F0 @ =gUnknown_3000E90
|
||||
bl sub_805A5A8
|
||||
bl move_tilemap_camera_to_upper_left_corner_
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A5F0: .4byte gUnknown_3000E90
|
||||
thumb_func_end sub_805A5E4
|
||||
thumb_func_end move_tilemap_camera_to_upper_left_corner
|
||||
|
||||
thumb_func_start sub_805A5F4
|
||||
sub_805A5F4: @ 805A5F4
|
||||
thumb_func_start FieldUpdateBgTilemapScroll
|
||||
FieldUpdateBgTilemapScroll: @ 805A5F4
|
||||
push {r4,r5,lr}
|
||||
ldr r1, _0805A64C @ =gUnknown_3000E90
|
||||
ldr r0, _0805A650 @ =gUnknown_3000E98
|
||||
@@ -76,24 +76,24 @@ sub_805A5F4: @ 805A5F4
|
||||
lsrs r5, 16
|
||||
movs r0, 0x14
|
||||
adds r1, r5, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
movs r0, 0x16
|
||||
adds r1, r4, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x18
|
||||
adds r1, r5, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1A
|
||||
adds r1, r4, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1C
|
||||
adds r1, r5, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1E
|
||||
adds r1, r4, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -101,7 +101,7 @@ sub_805A5F4: @ 805A5F4
|
||||
_0805A64C: .4byte gUnknown_3000E90
|
||||
_0805A650: .4byte gUnknown_3000E98
|
||||
_0805A654: .4byte gUnknown_3000E9A
|
||||
thumb_func_end sub_805A5F4
|
||||
thumb_func_end FieldUpdateBgTilemapScroll
|
||||
|
||||
thumb_func_start sub_805A658
|
||||
sub_805A658: @ 805A658
|
||||
@@ -127,8 +127,8 @@ _0805A67C: .4byte gUnknown_3000E98
|
||||
_0805A680: .4byte gUnknown_3000E9A
|
||||
thumb_func_end sub_805A658
|
||||
|
||||
thumb_func_start sub_805A684
|
||||
sub_805A684: @ 805A684
|
||||
thumb_func_start DrawWholeMapView
|
||||
DrawWholeMapView: @ 805A684
|
||||
push {lr}
|
||||
ldr r0, _0805A6A0 @ =gUnknown_3005008
|
||||
ldr r1, [r0]
|
||||
@@ -138,16 +138,16 @@ sub_805A684: @ 805A684
|
||||
ldrsh r1, [r1, r2]
|
||||
ldr r2, _0805A6A4 @ =gUnknown_2036DFC
|
||||
ldr r2, [r2]
|
||||
bl sub_805A6A8
|
||||
bl DrawWholeMapViewInternal
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A6A0: .4byte gUnknown_3005008
|
||||
_0805A6A4: .4byte gUnknown_2036DFC
|
||||
thumb_func_end sub_805A684
|
||||
thumb_func_end DrawWholeMapView
|
||||
|
||||
thumb_func_start sub_805A6A8
|
||||
sub_805A6A8: @ 805A6A8
|
||||
thumb_func_start DrawWholeMapViewInternal
|
||||
DrawWholeMapViewInternal: @ 805A6A8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -216,10 +216,10 @@ _0805A6EE:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A728: .4byte gUnknown_3000E90
|
||||
thumb_func_end sub_805A6A8
|
||||
thumb_func_end DrawWholeMapViewInternal
|
||||
|
||||
thumb_func_start sub_805A72C
|
||||
sub_805A72C: @ 805A72C
|
||||
thumb_func_start RedrawMapSlicesForCameraUpdate
|
||||
RedrawMapSlicesForCameraUpdate: @ 805A72C
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
adds r6, r1, 0
|
||||
@@ -230,25 +230,25 @@ sub_805A72C: @ 805A72C
|
||||
ble _0805A744
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A87C
|
||||
bl RedrawMapSliceWest
|
||||
_0805A744:
|
||||
cmp r6, 0
|
||||
bge _0805A750
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A824
|
||||
bl RedrawMapSliceEast
|
||||
_0805A750:
|
||||
cmp r7, 0
|
||||
ble _0805A75C
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A778
|
||||
bl RedrawMapSliceNorth
|
||||
_0805A75C:
|
||||
cmp r7, 0
|
||||
bge _0805A768
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A7D8
|
||||
bl RedrawMapSliceSouth
|
||||
_0805A768:
|
||||
movs r0, 0x1
|
||||
strb r0, [r5, 0x4]
|
||||
@@ -257,10 +257,10 @@ _0805A768:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A774: .4byte gUnknown_2036DFC
|
||||
thumb_func_end sub_805A72C
|
||||
thumb_func_end RedrawMapSlicesForCameraUpdate
|
||||
|
||||
thumb_func_start sub_805A778
|
||||
sub_805A778: @ 805A778
|
||||
thumb_func_start RedrawMapSliceNorth
|
||||
RedrawMapSliceNorth: @ 805A778
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
adds r7, r1, 0
|
||||
@@ -311,10 +311,10 @@ _0805A7A6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A7D4: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_805A778
|
||||
thumb_func_end RedrawMapSliceNorth
|
||||
|
||||
thumb_func_start sub_805A7D8
|
||||
sub_805A7D8: @ 805A7D8
|
||||
thumb_func_start RedrawMapSliceSouth
|
||||
RedrawMapSliceSouth: @ 805A7D8
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
adds r7, r1, 0
|
||||
@@ -353,10 +353,10 @@ _0805A7F6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A820: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_805A7D8
|
||||
thumb_func_end RedrawMapSliceSouth
|
||||
|
||||
thumb_func_start sub_805A824
|
||||
sub_805A824: @ 805A824
|
||||
thumb_func_start RedrawMapSliceEast
|
||||
RedrawMapSliceEast: @ 805A824
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -401,10 +401,10 @@ _0805A844:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A878: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_805A824
|
||||
thumb_func_end RedrawMapSliceEast
|
||||
|
||||
thumb_func_start sub_805A87C
|
||||
sub_805A87C: @ 805A87C
|
||||
thumb_func_start RedrawMapSliceWest
|
||||
RedrawMapSliceWest: @ 805A87C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -460,17 +460,17 @@ _0805A8AE:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805A8E4: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_805A87C
|
||||
thumb_func_end RedrawMapSliceWest
|
||||
|
||||
thumb_func_start sub_805A8E8
|
||||
sub_805A8E8: @ 805A8E8
|
||||
thumb_func_start CurrentMapDrawMetatileAt
|
||||
CurrentMapDrawMetatileAt: @ 805A8E8
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
ldr r0, _0805A914 @ =gUnknown_3000E90
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805AAE8
|
||||
bl MapPosToBgTilemapOffset
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
blt _0805A90E
|
||||
@@ -488,7 +488,7 @@ _0805A90E:
|
||||
.align 2, 0
|
||||
_0805A914: .4byte gUnknown_3000E90
|
||||
_0805A918: .4byte gUnknown_2036DFC
|
||||
thumb_func_end sub_805A8E8
|
||||
thumb_func_end CurrentMapDrawMetatileAt
|
||||
|
||||
thumb_func_start sub_805A91C
|
||||
sub_805A91C: @ 805A91C
|
||||
@@ -499,14 +499,14 @@ sub_805A91C: @ 805A91C
|
||||
ldr r0, _0805A944 @ =gUnknown_3000E90
|
||||
adds r1, r3, 0
|
||||
adds r2, r4, 0
|
||||
bl sub_805AAE8
|
||||
bl MapPosToBgTilemapOffset
|
||||
cmp r0, 0
|
||||
blt _0805A93E
|
||||
lsls r2, r0, 16
|
||||
lsrs r2, 16
|
||||
movs r0, 0x1
|
||||
adds r1, r5, 0
|
||||
bl sub_805A9B4
|
||||
bl DrawMetatile
|
||||
_0805A93E:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -563,7 +563,7 @@ _0805A98C:
|
||||
lsls r1, r4, 4
|
||||
adds r1, r5, r1
|
||||
mov r2, r8
|
||||
bl sub_805A9B4
|
||||
bl DrawMetatile
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
@@ -573,8 +573,8 @@ _0805A98C:
|
||||
_0805A9B0: .4byte 0xfffffd80
|
||||
thumb_func_end sub_805A948
|
||||
|
||||
thumb_func_start sub_805A9B4
|
||||
sub_805A9B4: @ 805A9B4
|
||||
thumb_func_start DrawMetatile
|
||||
DrawMetatile: @ 805A9B4
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
lsls r2, 16
|
||||
@@ -710,11 +710,11 @@ _0805AAA2:
|
||||
strh r0, [r3]
|
||||
_0805AABE:
|
||||
movs r0, 0x1
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x3
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -723,10 +723,10 @@ _0805AAD8: .4byte gUnknown_300501C
|
||||
_0805AADC: .4byte 0x00003014
|
||||
_0805AAE0: .4byte gUnknown_3005014
|
||||
_0805AAE4: .4byte gUnknown_3005018
|
||||
thumb_func_end sub_805A9B4
|
||||
thumb_func_end DrawMetatile
|
||||
|
||||
thumb_func_start sub_805AAE8
|
||||
sub_805AAE8: @ 805AAE8
|
||||
thumb_func_start MapPosToBgTilemapOffset
|
||||
MapPosToBgTilemapOffset: @ 805AAE8
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _0805AB18 @ =gUnknown_3005008
|
||||
@@ -768,10 +768,10 @@ _0805AB2A:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_805AAE8
|
||||
thumb_func_end MapPosToBgTilemapOffset
|
||||
|
||||
thumb_func_start sub_805AB30
|
||||
sub_805AB30: @ 805AB30
|
||||
thumb_func_start CameraUpdateCallback
|
||||
CameraUpdateCallback: @ 805AB30
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
ldr r2, [r3, 0x4]
|
||||
@@ -793,10 +793,10 @@ _0805AB50:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805AB54: .4byte gUnknown_202063C
|
||||
thumb_func_end sub_805AB30
|
||||
thumb_func_end CameraUpdateCallback
|
||||
|
||||
thumb_func_start sub_805AB58
|
||||
sub_805AB58: @ 805AB58
|
||||
thumb_func_start ResetCameraUpdateInfo
|
||||
ResetCameraUpdateInfo: @ 805AB58
|
||||
ldr r1, _0805AB6C @ =gUnknown_3005050
|
||||
movs r0, 0
|
||||
str r0, [r1, 0x8]
|
||||
@@ -808,10 +808,10 @@ sub_805AB58: @ 805AB58
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0805AB6C: .4byte gUnknown_3005050
|
||||
thumb_func_end sub_805AB58
|
||||
thumb_func_end ResetCameraUpdateInfo
|
||||
|
||||
thumb_func_start sub_805AB70
|
||||
sub_805AB70: @ 805AB70
|
||||
thumb_func_start InitCameraUpdateCallback
|
||||
InitCameraUpdateCallback: @ 805AB70
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -824,14 +824,14 @@ sub_805AB70: @ 805AB70
|
||||
lsls r0, 2
|
||||
ldr r1, _0805ABA8 @ =gUnknown_202063C
|
||||
adds r0, r1
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0805AB8C:
|
||||
adds r0, r5, 0
|
||||
bl sub_805F950
|
||||
bl AddCameraObject
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [r4, 0x4]
|
||||
ldr r0, _0805ABAC @ =sub_805AB30
|
||||
ldr r0, _0805ABAC @ =CameraUpdateCallback
|
||||
str r0, [r4]
|
||||
movs r0, 0
|
||||
pop {r4,r5}
|
||||
@@ -840,11 +840,11 @@ _0805AB8C:
|
||||
.align 2, 0
|
||||
_0805ABA4: .4byte gUnknown_3005050
|
||||
_0805ABA8: .4byte gUnknown_202063C
|
||||
_0805ABAC: .4byte sub_805AB30
|
||||
thumb_func_end sub_805AB70
|
||||
_0805ABAC: .4byte CameraUpdateCallback
|
||||
thumb_func_end InitCameraUpdateCallback
|
||||
|
||||
thumb_func_start sub_805ABB0
|
||||
sub_805ABB0: @ 805ABB0
|
||||
thumb_func_start CameraUpdate
|
||||
CameraUpdate: @ 805ABB0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -936,26 +936,26 @@ _0805AC44:
|
||||
_0805AC54:
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8059530
|
||||
bl CameraMove
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_805F924
|
||||
bl UpdateFieldObjectsForCameraUpdate
|
||||
ldr r6, _0805ACA8 @ =gUnknown_3000E90
|
||||
lsls r4, 1
|
||||
lsls r5, 1
|
||||
adds r0, r6, 0
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805A5B8
|
||||
bl tilemap_move_something
|
||||
adds r0, r6, 0
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_805A72C
|
||||
bl RedrawMapSlicesForCameraUpdate
|
||||
_0805AC7E:
|
||||
ldr r0, _0805ACA8 @ =gUnknown_3000E90
|
||||
adds r1, r7, 0
|
||||
mov r2, r8
|
||||
bl sub_805A5D4
|
||||
bl coords8_add
|
||||
ldr r1, _0805ACAC @ =gUnknown_300506C
|
||||
ldrh r0, [r1]
|
||||
subs r0, r7
|
||||
@@ -975,20 +975,20 @@ _0805ACA4: .4byte gUnknown_3005050
|
||||
_0805ACA8: .4byte gUnknown_3000E90
|
||||
_0805ACAC: .4byte gUnknown_300506C
|
||||
_0805ACB0: .4byte gUnknown_3005068
|
||||
thumb_func_end sub_805ABB0
|
||||
thumb_func_end CameraUpdate
|
||||
|
||||
thumb_func_start sub_805ACB4
|
||||
sub_805ACB4: @ 805ACB4
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
bl sub_8059530
|
||||
bl CameraMove
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
lsls r1, r5, 16
|
||||
asrs r1, 16
|
||||
bl sub_805F924
|
||||
bl sub_805A684
|
||||
bl UpdateFieldObjectsForCameraUpdate
|
||||
bl DrawWholeMapView
|
||||
ldr r1, _0805ACE8 @ =gUnknown_300506C
|
||||
lsls r4, 4
|
||||
ldrh r0, [r1]
|
||||
@@ -1100,23 +1100,23 @@ _0805AD84:
|
||||
_0805AD94:
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_8059530
|
||||
bl CameraMove
|
||||
ldr r4, _0805ADD0 @ =gUnknown_3000E90
|
||||
lsls r5, 1
|
||||
lsls r6, 1
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_805A5B8
|
||||
bl tilemap_move_something
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
adds r2, r6, 0
|
||||
bl sub_805A72C
|
||||
bl RedrawMapSlicesForCameraUpdate
|
||||
_0805ADB6:
|
||||
ldr r0, _0805ADD0 @ =gUnknown_3000E90
|
||||
adds r1, r7, 0
|
||||
mov r2, r8
|
||||
bl sub_805A5D4
|
||||
bl coords8_add
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
@@ -1127,17 +1127,17 @@ _0805ADCC: .4byte gUnknown_3005050
|
||||
_0805ADD0: .4byte gUnknown_3000E90
|
||||
thumb_func_end sub_805ACF0
|
||||
|
||||
thumb_func_start sub_805ADD4
|
||||
sub_805ADD4: @ 805ADD4
|
||||
thumb_func_start SetCameraPanningCallback
|
||||
SetCameraPanningCallback: @ 805ADD4
|
||||
ldr r1, _0805ADDC @ =gUnknown_3000EA0
|
||||
str r0, [r1]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0805ADDC: .4byte gUnknown_3000EA0
|
||||
thumb_func_end sub_805ADD4
|
||||
thumb_func_end SetCameraPanningCallback
|
||||
|
||||
thumb_func_start sub_805ADE0
|
||||
sub_805ADE0: @ 805ADE0
|
||||
thumb_func_start SetCameraPanning
|
||||
SetCameraPanning: @ 805ADE0
|
||||
ldr r2, _0805ADF0 @ =gUnknown_3000E98
|
||||
strh r0, [r2]
|
||||
ldr r0, _0805ADF4 @ =gUnknown_3000E9A
|
||||
@@ -1149,12 +1149,12 @@ sub_805ADE0: @ 805ADE0
|
||||
.align 2, 0
|
||||
_0805ADF0: .4byte gUnknown_3000E98
|
||||
_0805ADF4: .4byte gUnknown_3000E9A
|
||||
thumb_func_end sub_805ADE0
|
||||
thumb_func_end SetCameraPanning
|
||||
|
||||
thumb_func_start sub_805ADF8
|
||||
sub_805ADF8: @ 805ADF8
|
||||
thumb_func_start InstallCameraPanAheadCallback
|
||||
InstallCameraPanAheadCallback: @ 805ADF8
|
||||
ldr r1, _0805AE14 @ =gUnknown_3000EA0
|
||||
ldr r0, _0805AE18 @ =sub_805AE74
|
||||
ldr r0, _0805AE18 @ =CameraPanningCB_PanAhead
|
||||
str r0, [r1]
|
||||
ldr r1, _0805AE1C @ =gUnknown_3000E9C
|
||||
movs r0, 0
|
||||
@@ -1168,14 +1168,14 @@ sub_805ADF8: @ 805ADF8
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0805AE14: .4byte gUnknown_3000EA0
|
||||
_0805AE18: .4byte sub_805AE74
|
||||
_0805AE18: .4byte CameraPanningCB_PanAhead
|
||||
_0805AE1C: .4byte gUnknown_3000E9C
|
||||
_0805AE20: .4byte gUnknown_3000E98
|
||||
_0805AE24: .4byte gUnknown_3000E9A
|
||||
thumb_func_end sub_805ADF8
|
||||
thumb_func_end InstallCameraPanAheadCallback
|
||||
|
||||
thumb_func_start sub_805AE28
|
||||
sub_805AE28: @ 805AE28
|
||||
thumb_func_start UpdateCameraPanning
|
||||
UpdateCameraPanning: @ 805AE28
|
||||
push {lr}
|
||||
ldr r0, _0805AE58 @ =gUnknown_3000EA0
|
||||
ldr r0, [r0]
|
||||
@@ -1208,16 +1208,16 @@ _0805AE64: .4byte gUnknown_3000E98
|
||||
_0805AE68: .4byte gUnknown_2021BCA
|
||||
_0805AE6C: .4byte gUnknown_3005068
|
||||
_0805AE70: .4byte gUnknown_3000E9A
|
||||
thumb_func_end sub_805AE28
|
||||
thumb_func_end UpdateCameraPanning
|
||||
|
||||
thumb_func_start sub_805AE74
|
||||
sub_805AE74: @ 805AE74
|
||||
thumb_func_start CameraPanningCB_PanAhead
|
||||
CameraPanningCB_PanAhead: @ 805AE74
|
||||
push {lr}
|
||||
ldr r0, _0805AE84 @ =gUnknown_2036E2C
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0805AE88
|
||||
bl sub_805ADF8
|
||||
bl InstallCameraPanAheadCallback
|
||||
b _0805AF10
|
||||
.align 2, 0
|
||||
_0805AE84: .4byte gUnknown_2036E2C
|
||||
@@ -1242,7 +1242,7 @@ _0805AEA8:
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
_0805AEAE:
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@@ -1294,6 +1294,6 @@ _0805AF0E:
|
||||
_0805AF10:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805AE74
|
||||
thumb_func_end CameraPanningCB_PanAhead
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+60
-60
@@ -56,7 +56,7 @@ sub_806C8BC: @ 806C8BC
|
||||
bl sub_8059D70
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sub_8069A64
|
||||
bl ScriptContext1_IsScriptSetUp
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806C908
|
||||
@@ -320,7 +320,7 @@ sub_806CAC8: @ 806CAC8
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
bl sub_8069A54
|
||||
bl sub_805C6C4
|
||||
bl player_get_direction_lower_nybble
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
mov r4, sp
|
||||
@@ -606,7 +606,7 @@ _0806CD22:
|
||||
sub_806CD30: @ 806CD30
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8069A64
|
||||
bl ScriptContext1_IsScriptSetUp
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -629,7 +629,7 @@ _0806CD54:
|
||||
ldrb r0, [r4, 0x2]
|
||||
cmp r0, 0
|
||||
beq _0806CDC0
|
||||
bl sub_805C6C4
|
||||
bl player_get_direction_lower_nybble
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrb r1, [r4, 0x2]
|
||||
@@ -665,8 +665,8 @@ _0806CDA6:
|
||||
bl sub_8069998
|
||||
_0806CDB0:
|
||||
ldr r0, _0806CDBC @ =gUnknown_81A7ADB
|
||||
bl sub_8069AE4
|
||||
bl sub_8069940
|
||||
bl ScriptContext1_SetupScript
|
||||
bl ScriptContext2_Enable
|
||||
b _0806CDEA
|
||||
.align 2, 0
|
||||
_0806CDBC: .4byte gUnknown_81A7ADB
|
||||
@@ -677,17 +677,17 @@ _0806CDC0:
|
||||
cmp r0, 0
|
||||
beq _0806CDEA
|
||||
ldr r0, _0806CDF0 @ =gUnknown_81A7ADB
|
||||
bl sub_8069AE4
|
||||
bl sub_8069940
|
||||
bl ScriptContext1_SetupScript
|
||||
bl ScriptContext2_Enable
|
||||
ldr r4, _0806CDF4 @ =sub_806CDF8
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806CDEA
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x8
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
_0806CDEA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -702,7 +702,7 @@ sub_806CDF8: @ 806CDF8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8069958
|
||||
bl ScriptContext2_IsEnabled
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806CE18
|
||||
@@ -710,7 +710,7 @@ sub_806CDF8: @ 806CDF8
|
||||
bl sub_80722CC
|
||||
bl sub_806F258
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0806CE18:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -722,8 +722,8 @@ sub_806CE20: @ 806CE20
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r1, r4, 0x2
|
||||
bl sub_805C538
|
||||
bl sub_805C700
|
||||
bl PlayerGetDestCoords
|
||||
bl PlayerGetZCoord
|
||||
strb r0, [r4, 0x4]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -736,23 +736,23 @@ sub_806CE38: @ 806CE38
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
adds r1, r5, 0x2
|
||||
bl sub_805C4F4
|
||||
bl GetXYCoordsOneStepInFrontOfPlayer
|
||||
mov r4, sp
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
movs r2, 0
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8058D44
|
||||
bl MapGridGetZCoordAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
beq _0806CE6A
|
||||
bl sub_805C700
|
||||
bl PlayerGetZCoord
|
||||
_0806CE6A:
|
||||
strb r0, [r5, 0x4]
|
||||
add sp, 0x4
|
||||
@@ -769,7 +769,7 @@ sub_806CE74: @ 806CE74
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -808,7 +808,7 @@ _0806CEB8:
|
||||
bl sub_80722CC
|
||||
_0806CECA:
|
||||
adds r0, r4, 0
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
movs r0, 0x1
|
||||
_0806CED2:
|
||||
pop {r4}
|
||||
@@ -876,7 +876,7 @@ sub_806CF38: @ 806CF38
|
||||
bl sub_8058F78
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8059EC4
|
||||
bl MetatileBehavior_IsCounter
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806CF60
|
||||
@@ -901,7 +901,7 @@ _0806CF60:
|
||||
lsrs r1, 16
|
||||
_0806CF7E:
|
||||
ldrb r2, [r4, 0x4]
|
||||
bl sub_805F894
|
||||
bl GetFieldObjectIdByXYZ
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0x10
|
||||
@@ -947,7 +947,7 @@ _0806CFBC:
|
||||
ldr r0, _0806CFF0 @ =gUnknown_20370D4
|
||||
strh r6, [r0]
|
||||
adds r0, r3, 0
|
||||
bl sub_805FC38
|
||||
bl GetFieldObjectScriptPointerByFieldObjectId
|
||||
_0806CFDE:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
@@ -973,7 +973,7 @@ sub_806CFF4: @ 806CFF4
|
||||
ldrh r0, [r4]
|
||||
ldrh r1, [r4, 0x2]
|
||||
ldrb r2, [r4, 0x4]
|
||||
bl sub_805F894
|
||||
bl GetFieldObjectIdByXYZ
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x10
|
||||
@@ -989,7 +989,7 @@ sub_806CFF4: @ 806CFF4
|
||||
bne _0806D078
|
||||
_0806D02A:
|
||||
adds r0, r7, 0
|
||||
bl sub_8059EC4
|
||||
bl MetatileBehavior_IsCounter
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1011,7 +1011,7 @@ _0806D02A:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
ldrb r2, [r4, 0x4]
|
||||
bl sub_805F894
|
||||
bl GetFieldObjectIdByXYZ
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x10
|
||||
@@ -1033,7 +1033,7 @@ _0806D078:
|
||||
lsls r0, 2
|
||||
ldr r1, _0806D098 @ =gUnknown_2036E38
|
||||
adds r0, r1
|
||||
bl sub_8063D68
|
||||
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806D0A0
|
||||
@@ -1057,10 +1057,10 @@ _0806D0A0:
|
||||
mov r1, r8
|
||||
strh r1, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_805FC38
|
||||
bl GetFieldObjectScriptPointerByFieldObjectId
|
||||
adds r1, r0, 0
|
||||
ldrb r0, [r4]
|
||||
bl sub_8069D8C
|
||||
bl GetRamScript
|
||||
adds r1, r0, 0
|
||||
_0806D0C8:
|
||||
pop {r3}
|
||||
@@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4
|
||||
lsrs r2, 16
|
||||
ldrb r3, [r0, 0x4]
|
||||
adds r0, r4, 0
|
||||
bl sub_806DEEC
|
||||
bl FindInvisibleMapObjectByPosition
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _0806D164
|
||||
@@ -1214,7 +1214,7 @@ sub_806D1F0: @ 806D1F0
|
||||
ldr r0, _0806D210 @ =gUnknown_20370D4
|
||||
strh r5, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_8059EF4
|
||||
bl MetatileBehavior_IsPC
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1337,7 +1337,7 @@ _0806D304: .4byte gUnknown_81C549C
|
||||
_0806D308:
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8059ED8
|
||||
bl MetatileBehavior_IsPlayerFacingTVScreen
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1760,7 +1760,7 @@ sub_806D660: @ 806D660
|
||||
bl sub_806DDC0
|
||||
cmp r0, 0
|
||||
beq _0806D68C
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
movs r0, 0x1
|
||||
b _0806D68E
|
||||
.align 2, 0
|
||||
@@ -1810,7 +1810,7 @@ sub_806D698: @ 806D698
|
||||
cmp r0, 0x1
|
||||
bne _0806D6EC
|
||||
ldr r0, _0806D6E8 @ =gUnknown_81A8CED
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
b _0806D730
|
||||
.align 2, 0
|
||||
_0806D6E0: .4byte gUnknown_203ADFA
|
||||
@@ -1823,7 +1823,7 @@ _0806D6EC:
|
||||
cmp r0, 0x1
|
||||
bne _0806D704
|
||||
ldr r0, _0806D700 @ =gUnknown_81A8DFD
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
b _0806D730
|
||||
.align 2, 0
|
||||
_0806D700: .4byte gUnknown_81A8DFD
|
||||
@@ -1835,7 +1835,7 @@ _0806D704:
|
||||
movs r0, 0xD
|
||||
bl sub_8054E90
|
||||
ldr r0, _0806D71C @ =gUnknown_81BF546
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
b _0806D730
|
||||
.align 2, 0
|
||||
_0806D71C: .4byte gUnknown_81BF546
|
||||
@@ -1933,7 +1933,7 @@ sub_806D79C: @ 806D79C
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _0806D7E0
|
||||
bl sub_80A0618
|
||||
bl overworld_poison
|
||||
cmp r0, 0x1
|
||||
beq _0806D7E0
|
||||
cmp r0, 0x1
|
||||
@@ -2116,7 +2116,7 @@ sub_806D908: @ 806D908
|
||||
lsrs r1, 24
|
||||
ldr r2, _0806D924 @ =gUnknown_20370D4
|
||||
strh r1, [r2]
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
bl sub_80699E0
|
||||
bl sub_8069A20
|
||||
pop {r0}
|
||||
@@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928
|
||||
lsrs r2, 16
|
||||
ldrb r3, [r0, 0x4]
|
||||
adds r0, r4, 0
|
||||
bl sub_806DEEC
|
||||
bl FindInvisibleMapObjectByPosition
|
||||
cmp r0, 0
|
||||
bne _0806D950
|
||||
movs r0, 0
|
||||
@@ -2333,7 +2333,7 @@ _0806DAC4:
|
||||
bne _0806DAE4
|
||||
bl sub_80559E4
|
||||
ldr r0, _0806DAE0 @ =gUnknown_81C1361
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
movs r0, 0x1
|
||||
b _0806DAEE
|
||||
.align 2, 0
|
||||
@@ -2553,7 +2553,7 @@ sub_806DC54: @ 806DC54
|
||||
cmp r0, 0x7F
|
||||
bne _0806DC78
|
||||
ldrb r0, [r4, 0x5]
|
||||
bl sub_8055454
|
||||
bl copy_saved_warp2_bank_and_enter_x_to_warp1
|
||||
b _0806DCC4
|
||||
.align 2, 0
|
||||
_0806DC74: .4byte gUnknown_2036DFC
|
||||
@@ -2564,7 +2564,7 @@ _0806DC78:
|
||||
ldrsb r1, [r4, r1]
|
||||
movs r2, 0x5
|
||||
ldrsb r2, [r4, r2]
|
||||
bl sub_80553C8
|
||||
bl warp1_set_2
|
||||
movs r1, 0
|
||||
ldrsh r0, [r5, r1]
|
||||
movs r2, 0x2
|
||||
@@ -2572,7 +2572,7 @@ _0806DC78:
|
||||
bl sub_805550C
|
||||
ldrb r0, [r4, 0x7]
|
||||
ldrb r1, [r4, 0x6]
|
||||
bl sub_8055238
|
||||
bl get_mapheader_by_bank_and_number
|
||||
ldr r1, [r0, 0x4]
|
||||
ldrb r0, [r4, 0x5]
|
||||
ldr r1, [r1, 0x8]
|
||||
@@ -2591,7 +2591,7 @@ _0806DC78:
|
||||
lsls r2, 24
|
||||
asrs r2, 24
|
||||
adds r3, r7, 0
|
||||
bl sub_80553E8
|
||||
bl saved_warp2_set
|
||||
_0806DCC4:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -2723,7 +2723,7 @@ _0806DD96:
|
||||
b _0806DDB8
|
||||
_0806DDB0:
|
||||
adds r0, r1, 0
|
||||
bl sub_8069B48
|
||||
bl ScriptContext2_RunNewScript
|
||||
_0806DDB6:
|
||||
movs r0, 0
|
||||
_0806DDB8:
|
||||
@@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28
|
||||
ldr r2, [r4]
|
||||
ldrb r1, [r2, 0x5]
|
||||
ldrb r2, [r2, 0x4]
|
||||
bl sub_805E4C8
|
||||
bl RemoveFieldObjectByLocalIdAndMap
|
||||
ldrb r0, [r5, 0x8]
|
||||
ldr r2, [r4]
|
||||
ldrb r1, [r2, 0x5]
|
||||
@@ -2855,8 +2855,8 @@ _0806DE92:
|
||||
bne _0806DEB0
|
||||
bl sub_8112364
|
||||
ldr r0, [r4, 0xC]
|
||||
bl sub_8069AE4
|
||||
bl sub_8069940
|
||||
bl ScriptContext1_SetupScript
|
||||
bl ScriptContext2_Enable
|
||||
_0806DEB0:
|
||||
adds r4, 0x10
|
||||
subs r5, 0x1
|
||||
@@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4
|
||||
_0806DEE8: .4byte gUnknown_2036DFC
|
||||
thumb_func_end sub_806DEC4
|
||||
|
||||
thumb_func_start sub_806DEEC
|
||||
sub_806DEEC: @ 806DEEC
|
||||
thumb_func_start FindInvisibleMapObjectByPosition
|
||||
FindInvisibleMapObjectByPosition: @ 806DEEC
|
||||
push {r4-r7,lr}
|
||||
lsls r1, 16
|
||||
lsrs r7, r1, 16
|
||||
@@ -2938,10 +2938,10 @@ _0806DF34:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DEEC
|
||||
thumb_func_end FindInvisibleMapObjectByPosition
|
||||
|
||||
thumb_func_start sub_806DF3C
|
||||
sub_806DF3C: @ 806DF3C
|
||||
thumb_func_start dive_warp
|
||||
dive_warp: @ 806DF3C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r1, 16
|
||||
@@ -3001,7 +3001,7 @@ _0806DFB2:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DF3C
|
||||
thumb_func_end dive_warp
|
||||
|
||||
thumb_func_start sub_806DFB8
|
||||
sub_806DFB8: @ 806DFB8
|
||||
@@ -3011,7 +3011,7 @@ sub_806DFB8: @ 806DFB8
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -3079,11 +3079,11 @@ _0806E046:
|
||||
bx r1
|
||||
thumb_func_end sub_806DFB8
|
||||
|
||||
thumb_func_start sub_806E050
|
||||
sub_806E050: @ 806E050
|
||||
thumb_func_start GetFieldObjectScriptPointerForComparison
|
||||
GetFieldObjectScriptPointerForComparison: @ 806E050
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -3106,13 +3106,13 @@ sub_806E050: @ 806E050
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E050
|
||||
thumb_func_end GetFieldObjectScriptPointerForComparison
|
||||
|
||||
thumb_func_start sub_806E08C
|
||||
sub_806E08C: @ 806E08C
|
||||
push {r4,lr}
|
||||
sub sp, 0x8
|
||||
bl sub_805C6E4
|
||||
bl player_get_direction_upper_nybble
|
||||
mov r4, sp
|
||||
mov r0, sp
|
||||
bl sub_806CE20
|
||||
|
||||
+7
-7
@@ -49,15 +49,15 @@ sub_805AF54: @ 805AF54
|
||||
bne _0805AF6A
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
b _0805AF7A
|
||||
_0805AF6A:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
subs r1, r4, 0x1
|
||||
adds r0, r5, 0
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
_0805AF7A:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -179,7 +179,7 @@ sub_805B028: @ 805B028
|
||||
cmp r0, 0
|
||||
bne _0805B056
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0805B056:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -280,14 +280,14 @@ sub_805B0E8: @ 805B0E8
|
||||
mov r8, r3
|
||||
ldr r4, _0805B134 @ =sub_805B028
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _0805B13C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
@@ -606,7 +606,7 @@ _0805B348:
|
||||
sub_805B350: @ 805B350
|
||||
push {lr}
|
||||
ldr r0, _0805B360 @ =sub_805B028
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
|
||||
+531
-531
File diff suppressed because it is too large
Load Diff
+150
-150
File diff suppressed because it is too large
Load Diff
+173
-173
File diff suppressed because it is too large
Load Diff
+245
-245
File diff suppressed because it is too large
Load Diff
+973
-973
File diff suppressed because it is too large
Load Diff
+26
-26
@@ -99,7 +99,7 @@ _080693EA:
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08069402:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -113,7 +113,7 @@ sub_806940C: @ 806940C
|
||||
push {lr}
|
||||
ldr r0, _0806941C @ =sub_8069370
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -124,12 +124,12 @@ _0806941C: .4byte sub_8069370
|
||||
sub_8069420: @ 8069420
|
||||
push {lr}
|
||||
ldr r0, _08069438 @ =sub_8069370
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
beq _08069434
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_08069434:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -146,7 +146,7 @@ sub_806943C: @ 806943C
|
||||
cmp r0, 0
|
||||
bne _0806945C
|
||||
adds r0, r1, 0
|
||||
bl sub_80694C8
|
||||
bl textbox_fdecode_auto_and_task_add
|
||||
movs r0, 0x2
|
||||
strb r0, [r4]
|
||||
movs r0, 0x1
|
||||
@@ -161,8 +161,8 @@ _0806945E:
|
||||
bx r1
|
||||
thumb_func_end sub_806943C
|
||||
|
||||
thumb_func_start sub_8069464
|
||||
sub_8069464: @ 8069464
|
||||
thumb_func_start ShowFieldAutoScrollMessage
|
||||
ShowFieldAutoScrollMessage: @ 8069464
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
ldr r2, _08069480 @ =gUnknown_203709C
|
||||
@@ -172,7 +172,7 @@ sub_8069464: @ 8069464
|
||||
movs r0, 0x3
|
||||
strb r0, [r2]
|
||||
adds r0, r1, 0
|
||||
bl sub_80694C8
|
||||
bl textbox_fdecode_auto_and_task_add
|
||||
movs r0, 0x1
|
||||
b _08069486
|
||||
.align 2, 0
|
||||
@@ -182,7 +182,7 @@ _08069484:
|
||||
_08069486:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8069464
|
||||
thumb_func_end ShowFieldAutoScrollMessage
|
||||
|
||||
thumb_func_start sub_806948C
|
||||
sub_806948C: @ 806948C
|
||||
@@ -190,7 +190,7 @@ sub_806948C: @ 806948C
|
||||
ldr r2, _080694A0 @ =gUnknown_203709C
|
||||
movs r1, 0x3
|
||||
strb r1, [r2]
|
||||
bl sub_80694C8
|
||||
bl textbox_fdecode_auto_and_task_add
|
||||
movs r0, 0x1
|
||||
pop {r1}
|
||||
bx r1
|
||||
@@ -207,7 +207,7 @@ sub_80694A4: @ 80694A4
|
||||
bne _080694C0
|
||||
movs r0, 0x2
|
||||
strb r0, [r1]
|
||||
bl sub_80694E4
|
||||
bl textbox_auto_and_task_add
|
||||
movs r0, 0x1
|
||||
b _080694C2
|
||||
.align 2, 0
|
||||
@@ -219,8 +219,8 @@ _080694C2:
|
||||
bx r1
|
||||
thumb_func_end sub_80694A4
|
||||
|
||||
thumb_func_start sub_80694C8
|
||||
sub_80694C8: @ 80694C8
|
||||
thumb_func_start textbox_fdecode_auto_and_task_add
|
||||
textbox_fdecode_auto_and_task_add: @ 80694C8
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
ldr r0, _080694E0 @ =gUnknown_2021D18
|
||||
@@ -232,20 +232,20 @@ sub_80694C8: @ 80694C8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080694E0: .4byte gUnknown_2021D18
|
||||
thumb_func_end sub_80694C8
|
||||
thumb_func_end textbox_fdecode_auto_and_task_add
|
||||
|
||||
thumb_func_start sub_80694E4
|
||||
sub_80694E4: @ 80694E4
|
||||
thumb_func_start textbox_auto_and_task_add
|
||||
textbox_auto_and_task_add: @ 80694E4
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_80F6D5C
|
||||
bl sub_806940C
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80694E4
|
||||
thumb_func_end textbox_auto_and_task_add
|
||||
|
||||
thumb_func_start sub_80694F4
|
||||
sub_80694F4: @ 80694F4
|
||||
thumb_func_start HideFieldMessageBox
|
||||
HideFieldMessageBox: @ 80694F4
|
||||
push {lr}
|
||||
bl sub_8069420
|
||||
movs r0, 0
|
||||
@@ -258,19 +258,19 @@ sub_80694F4: @ 80694F4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0806950C: .4byte gUnknown_203709C
|
||||
thumb_func_end sub_80694F4
|
||||
thumb_func_end HideFieldMessageBox
|
||||
|
||||
thumb_func_start sub_8069510
|
||||
sub_8069510: @ 8069510
|
||||
thumb_func_start textbox_any_visible
|
||||
textbox_any_visible: @ 8069510
|
||||
ldr r0, _08069518 @ =gUnknown_203709C
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08069518: .4byte gUnknown_203709C
|
||||
thumb_func_end sub_8069510
|
||||
thumb_func_end textbox_any_visible
|
||||
|
||||
thumb_func_start sub_806951C
|
||||
sub_806951C: @ 806951C
|
||||
thumb_func_start IsFieldMessageBoxHidden
|
||||
IsFieldMessageBoxHidden: @ 806951C
|
||||
push {lr}
|
||||
ldr r0, _0806952C @ =gUnknown_203709C
|
||||
ldrb r0, [r0]
|
||||
@@ -285,7 +285,7 @@ _08069530:
|
||||
_08069532:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806951C
|
||||
thumb_func_end IsFieldMessageBoxHidden
|
||||
|
||||
thumb_func_start sub_8069538
|
||||
sub_8069538: @ 8069538
|
||||
|
||||
+247
-247
File diff suppressed because it is too large
Load Diff
+24
-24
@@ -5,11 +5,11 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80A0460
|
||||
sub_80A0460: @ 80A0460
|
||||
thumb_func_start .gcc2_compiled._0
|
||||
.gcc2_compiled._0: @ 80A0460
|
||||
push {lr}
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
cmp r1, 0
|
||||
@@ -26,7 +26,7 @@ _080A047C:
|
||||
_080A047E:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80A0460
|
||||
thumb_func_end .gcc2_compiled._0
|
||||
|
||||
thumb_func_start sub_80A0484
|
||||
sub_80A0484: @ 80A0484
|
||||
@@ -35,12 +35,12 @@ sub_80A0484: @ 80A0484
|
||||
movs r5, 0
|
||||
_080A048A:
|
||||
adds r0, r4, 0
|
||||
bl sub_80A0460
|
||||
bl .gcc2_compiled._0
|
||||
cmp r0, 0
|
||||
beq _080A04A8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _080A04A8
|
||||
movs r0, 0
|
||||
@@ -83,9 +83,9 @@ sub_80A04B8: @ 80A04B8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r5, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r0, r5, 0
|
||||
bl sub_8008D28
|
||||
bl StringGetEnd10
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -105,18 +105,18 @@ sub_80A0504: @ 80A0504
|
||||
ldr r0, _080A0540 @ =gUnknown_2024284
|
||||
adds r4, r1, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_80A0460
|
||||
bl .gcc2_compiled._0
|
||||
cmp r0, 0
|
||||
beq _080A0544
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
bne _080A0544
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x37
|
||||
bl sub_803FBE8
|
||||
bl sub_812085C
|
||||
bl GetMonData
|
||||
bl pokemon_ailments_get_primary
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -183,7 +183,7 @@ _080A05A0:
|
||||
strh r0, [r4]
|
||||
b _080A05F6
|
||||
_080A05A6:
|
||||
bl sub_806951C
|
||||
bl IsFieldMessageBoxHidden
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A05F6
|
||||
@@ -217,9 +217,9 @@ _080A05E8:
|
||||
ldr r0, _080A05FC @ =gUnknown_20370D0
|
||||
strh r1, [r0]
|
||||
_080A05EC:
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A05F6:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -233,16 +233,16 @@ sub_80A0600: @ 80A0600
|
||||
push {lr}
|
||||
ldr r0, _080A0614 @ =sub_80A054C
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl sub_8069B28
|
||||
bl CreateTask
|
||||
bl ScriptContext1_Stop
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A0614: .4byte sub_80A054C
|
||||
thumb_func_end sub_80A0600
|
||||
|
||||
thumb_func_start sub_80A0618
|
||||
sub_80A0618: @ 80A0618
|
||||
thumb_func_start overworld_poison
|
||||
overworld_poison: @ 80A0618
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
ldr r4, _080A0684 @ =gUnknown_2024284
|
||||
@@ -252,20 +252,20 @@ sub_80A0618: @ 80A0618
|
||||
_080A0624:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x5
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, 0
|
||||
beq _080A0668
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x37
|
||||
bl sub_803FBE8
|
||||
bl sub_812085C
|
||||
bl GetMonData
|
||||
bl pokemon_ailments_get_primary
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080A0668
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
str r0, [sp]
|
||||
cmp r0, 0
|
||||
beq _080A065A
|
||||
@@ -311,6 +311,6 @@ _080A0692:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80A0618
|
||||
thumb_func_end overworld_poison
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+65
-65
@@ -186,7 +186,7 @@ _0807EF14:
|
||||
ldrsh r0, [r4, r3]
|
||||
cmp r0, 0x1
|
||||
bne _0807EF64
|
||||
bl sub_8087E64
|
||||
bl remove_some_task
|
||||
movs r0, 0x2
|
||||
strh r0, [r4]
|
||||
b _0807EF76
|
||||
@@ -195,12 +195,12 @@ _0807EF5C: .4byte gUnknown_2039600
|
||||
_0807EF60: .4byte gUnknown_2038700
|
||||
_0807EF64:
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _0807EF76
|
||||
_0807EF6C:
|
||||
bl sub_8087EA4
|
||||
bl dp12_8087EA4
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0807EF76:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -213,13 +213,13 @@ sub_807EF7C: @ 807EF7C
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _0807EFA0 @ =sub_807EEB8
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807EF98
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0807EF98:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -233,13 +233,13 @@ sub_807EFA4: @ 807EFA4
|
||||
push {r4,lr}
|
||||
ldr r4, _0807EFC4 @ =sub_807EF7C
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807EFBC
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
_0807EFBC:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -264,7 +264,7 @@ sub_807EFC8: @ 807EFC8
|
||||
lsrs r7, r0, 24
|
||||
ldr r0, _0807F00C @ =sub_807EEB8
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
lsls r0, r2, 2
|
||||
@@ -328,7 +328,7 @@ _0807F042:
|
||||
movs r1, 0x50
|
||||
bl sub_807EFC8
|
||||
bl sub_807EFA4
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -375,7 +375,7 @@ sub_807F0B0: @ 807F0B0
|
||||
bl sub_8055FD4
|
||||
ldr r0, _0807F0C4 @ =sub_807F0C8
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -393,8 +393,8 @@ sub_807F0C8: @ 807F0C8
|
||||
cmp r0, 0x1
|
||||
bne _0807F0E4
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl sub_8069B34
|
||||
bl DestroyTask
|
||||
bl EnableBothScriptContexts
|
||||
_0807F0E4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -406,7 +406,7 @@ sub_807F0EC: @ 807F0EC
|
||||
push {lr}
|
||||
ldr r0, _0807F10C @ =sub_807F204
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0807F110 @ =gUnknown_3005090
|
||||
@@ -428,7 +428,7 @@ sub_807F114: @ 807F114
|
||||
push {lr}
|
||||
ldr r0, _0807F134 @ =sub_807F204
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0807F138 @ =gUnknown_3005090
|
||||
@@ -456,31 +456,31 @@ sub_807F13C: @ 807F13C
|
||||
ldr r0, _0807F19C @ =gUnknown_3005098
|
||||
adds r4, r0
|
||||
movs r0, 0
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4]
|
||||
movs r0, 0x48
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x2]
|
||||
movs r0, 0x4A
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x4]
|
||||
movs r0, 0x50
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x6]
|
||||
movs r0, 0x52
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x8]
|
||||
movs r0, 0x40
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xA]
|
||||
movs r0, 0x44
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xC]
|
||||
movs r0, 0x42
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xE]
|
||||
movs r0, 0x46
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x10]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -501,31 +501,31 @@ sub_807F1A0: @ 807F1A0
|
||||
adds r4, r0
|
||||
ldrh r1, [r4]
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x2]
|
||||
movs r0, 0x48
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x4]
|
||||
movs r0, 0x4A
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x6]
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x8]
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xA]
|
||||
movs r0, 0x40
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xC]
|
||||
movs r0, 0x44
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xE]
|
||||
movs r0, 0x42
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x10]
|
||||
movs r0, 0x46
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -566,50 +566,50 @@ _0807F236:
|
||||
movs r1, 0x80
|
||||
lsls r1, 6
|
||||
movs r0, 0
|
||||
bl sub_8000AF4
|
||||
bl SetGpuRegBits
|
||||
movs r1, 0x80
|
||||
lsls r1, 7
|
||||
movs r0, 0
|
||||
bl sub_8000AF4
|
||||
bl SetGpuRegBits
|
||||
movs r1, 0x14
|
||||
ldrsh r0, [r5, r1]
|
||||
cmp r0, 0
|
||||
bne _0807F280
|
||||
movs r0, 0x40
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0807F27C @ =0x0000f0ff
|
||||
movs r0, 0x42
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x44
|
||||
movs r1, 0xFF
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x46
|
||||
movs r1, 0xFF
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _0807F2A0
|
||||
.align 2, 0
|
||||
_0807F27C: .4byte 0x0000f0ff
|
||||
_0807F280:
|
||||
movs r0, 0x40
|
||||
movs r1, 0x78
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x44
|
||||
movs r1, 0xFF
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0807F2B8 @ =0x000078ff
|
||||
movs r0, 0x42
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x46
|
||||
movs r1, 0xFF
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_0807F2A0:
|
||||
movs r0, 0x48
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
movs r1, 0x3F
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1
|
||||
strh r0, [r5, 0x12]
|
||||
b _0807F2F4
|
||||
@@ -618,7 +618,7 @@ _0807F2B8: .4byte 0x000078ff
|
||||
_0807F2BC:
|
||||
ldr r0, _0807F2CC @ =sub_807F2FC
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r0, 0x2
|
||||
strh r0, [r5, 0x12]
|
||||
b _0807F2F4
|
||||
@@ -626,7 +626,7 @@ _0807F2BC:
|
||||
_0807F2CC: .4byte sub_807F2FC
|
||||
_0807F2D0:
|
||||
ldr r0, _0807F2E4 @ =sub_807F2FC
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807F2F4
|
||||
@@ -639,7 +639,7 @@ _0807F2E8:
|
||||
adds r0, r4, 0
|
||||
bl sub_807F1A0
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0807F2F4:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -660,7 +660,7 @@ sub_807F2FC: @ 807F2FC
|
||||
ldr r4, _0807F348 @ =gUnknown_3005098
|
||||
adds r6, r0, r4
|
||||
ldr r0, _0807F34C @ =sub_807F204
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
@@ -681,7 +681,7 @@ sub_807F2FC: @ 807F2FC
|
||||
cmp r0, 0x78
|
||||
ble _0807F36C
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _0807F39A
|
||||
.align 2, 0
|
||||
_0807F348: .4byte gUnknown_3005098
|
||||
@@ -698,13 +698,13 @@ _0807F350:
|
||||
cmp r1, 0
|
||||
bge _0807F36C
|
||||
mov r0, r8
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _0807F39A
|
||||
_0807F36C:
|
||||
lsls r4, 16
|
||||
lsrs r1, r4, 16
|
||||
movs r0, 0x40
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
lsls r1, r7, 16
|
||||
asrs r1, 8
|
||||
movs r0, 0xF0
|
||||
@@ -712,7 +712,7 @@ _0807F36C:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x42
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
asrs r4, 16
|
||||
cmp r4, 0x59
|
||||
bgt _0807F394
|
||||
@@ -767,7 +767,7 @@ _0807F3DC: .4byte gUnknown_3005090
|
||||
_0807F3E0:
|
||||
adds r0, r7, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r5, _0807F424 @ =gUnknown_2021D18
|
||||
adds r0, r5, 0
|
||||
mov r1, r8
|
||||
@@ -872,9 +872,9 @@ _0807F4A8:
|
||||
bl sub_80F77CC
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r5, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
@@ -945,7 +945,7 @@ _0807F542:
|
||||
ldr r1, _0807F580 @ =gUnknown_2036E38
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
bl sub_805F218
|
||||
bl FieldObjectTurn
|
||||
ldr r1, _0807F584 @ =gUnknown_3005090
|
||||
lsls r0, r6, 2
|
||||
adds r0, r6
|
||||
@@ -967,7 +967,7 @@ _0807F588:
|
||||
adds r4, r2
|
||||
ldrb r5, [r4, 0xA]
|
||||
adds r0, r5, 0
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -984,9 +984,9 @@ _0807F5B6:
|
||||
cmp r0, 0x1
|
||||
bne _0807F5E4
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _0807F5CC @ =gUnknown_81A8D97
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
b _0807F5E4
|
||||
.align 2, 0
|
||||
_0807F5CC: .4byte gUnknown_81A8D97
|
||||
@@ -995,9 +995,9 @@ _0807F5D0:
|
||||
cmp r0, 0x1
|
||||
bne _0807F5E4
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _0807F5EC @ =gUnknown_81A8DD8
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
_0807F5E4:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -1009,11 +1009,11 @@ _0807F5EC: .4byte gUnknown_81A8DD8
|
||||
thumb_func_start sub_807F5F0
|
||||
sub_807F5F0: @ 807F5F0
|
||||
push {lr}
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
bl sub_807DB38
|
||||
ldr r0, _0807F618 @ =sub_807F45C
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0807F61C @ =gUnknown_3005090
|
||||
|
||||
+180
-180
File diff suppressed because it is too large
Load Diff
+17
-17
@@ -39,7 +39,7 @@ sub_806E83C: @ 806E83C
|
||||
lsls r1, 3
|
||||
ldr r0, _0806E874 @ =gUnknown_3005098
|
||||
adds r4, r1, r0
|
||||
bl sub_8069958
|
||||
bl ScriptContext2_IsEnabled
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806E86C
|
||||
@@ -67,14 +67,14 @@ sub_806E87C: @ 806E87C
|
||||
push {r4,r5,lr}
|
||||
ldr r5, _0806E8C4 @ =sub_806E810
|
||||
adds r0, r5, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
bne _0806E8A6
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0806E8C8 @ =gUnknown_3005090
|
||||
@@ -86,13 +86,13 @@ sub_806E87C: @ 806E87C
|
||||
_0806E8A6:
|
||||
ldr r4, _0806E8CC @ =sub_806E83C
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806E8BC
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
_0806E8BC:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -109,7 +109,7 @@ sub_806E8D0: @ 806E8D0
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _0806E908 @ =sub_806E810
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0xFF
|
||||
@@ -147,11 +147,11 @@ _0806E912:
|
||||
sub_806E918: @ 806E918
|
||||
push {lr}
|
||||
ldr r0, _0806E948 @ =sub_806E810
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
ldr r0, _0806E94C @ =sub_806E83C
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0xFF
|
||||
@@ -286,7 +286,7 @@ _0806EA12:
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r5, 0x4]
|
||||
@@ -298,7 +298,7 @@ _0806EA2A:
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
ldrh r2, [r0]
|
||||
movs r3, 0
|
||||
@@ -386,7 +386,7 @@ _0806EAB0:
|
||||
ldrsh r0, [r0, r3]
|
||||
movs r2, 0
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
b _0806EB3E
|
||||
.align 2, 0
|
||||
_0806EAF0: .4byte 0x0000035a
|
||||
@@ -422,7 +422,7 @@ _0806EB04:
|
||||
ldrsh r0, [r0, r3]
|
||||
movs r2, 0
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
ldr r0, _0806EB50 @ =0x00004001
|
||||
movs r1, 0x1
|
||||
bl sub_806E584
|
||||
@@ -454,7 +454,7 @@ sub_806EB54: @ 806EB54
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
ldrh r2, [r0]
|
||||
movs r3, 0
|
||||
@@ -501,7 +501,7 @@ _0806EB8E:
|
||||
ldrsh r1, [r4, r2]
|
||||
ldr r2, _0806EBE0 @ =0x00000212
|
||||
movs r3, 0x4
|
||||
bl sub_80DC23C
|
||||
bl ash
|
||||
b _0806EBF6
|
||||
.align 2, 0
|
||||
_0806EBD8: .4byte gUnknown_3005098
|
||||
@@ -515,7 +515,7 @@ _0806EBE4:
|
||||
ldrsh r1, [r4, r2]
|
||||
ldr r2, _0806EC00 @ =0x00000206
|
||||
movs r3, 0x4
|
||||
bl sub_80DC23C
|
||||
bl ash
|
||||
_0806EBF6:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -546,7 +546,7 @@ _0806EC20:
|
||||
bl sub_8058FA4
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl sub_805A8E8
|
||||
bl CurrentMapDrawMetatileAt
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -570,7 +570,7 @@ sub_806EC40: @ 806EC40
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
|
||||
+34
-34
@@ -9,14 +9,14 @@
|
||||
sub_8079C08: @ 8079C08
|
||||
push {r4-r6,lr}
|
||||
ldr r0, _08079CCC @ =sub_8079E0C
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
cmp r6, 0
|
||||
bne _08079CC4
|
||||
movs r0, 0x90
|
||||
lsls r0, 5
|
||||
bl sub_80089B8
|
||||
bl AllocSpritePalette
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
@@ -90,7 +90,7 @@ sub_8079C08: @ 8079C08
|
||||
strb r0, [r1]
|
||||
ldr r0, _08079CEC @ =sub_8079DBC
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r1, _08079CF0 @ =0x000006c9
|
||||
adds r4, r1
|
||||
strb r0, [r4]
|
||||
@@ -111,8 +111,8 @@ _08079CEC: .4byte sub_8079DBC
|
||||
_08079CF0: .4byte 0x000006c9
|
||||
thumb_func_end sub_8079C08
|
||||
|
||||
thumb_func_start sub_8079CF4
|
||||
sub_8079CF4: @ 8079CF4
|
||||
thumb_func_start weather_set
|
||||
weather_set: @ 8079CF4
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -122,7 +122,7 @@ sub_8079CF4: @ 8079CF4
|
||||
beq _08079D0A
|
||||
cmp r4, 0xD
|
||||
beq _08079D0A
|
||||
bl sub_807B004
|
||||
bl play_some_sound
|
||||
_08079D0A:
|
||||
ldr r1, _08079D4C @ =gUnknown_2037F34
|
||||
ldr r2, _08079D50 @ =0x000006d1
|
||||
@@ -162,7 +162,7 @@ _08079D50: .4byte 0x000006d1
|
||||
_08079D54: .4byte gUnknown_83C2BC0
|
||||
_08079D58: .4byte 0x000006d3
|
||||
_08079D5C: .4byte 0x000006ce
|
||||
thumb_func_end sub_8079CF4
|
||||
thumb_func_end weather_set
|
||||
|
||||
thumb_func_start sub_8079D60
|
||||
sub_8079D60: @ 8079D60
|
||||
@@ -170,7 +170,7 @@ sub_8079D60: @ 8079D60
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_807B004
|
||||
bl play_some_sound
|
||||
ldr r0, _08079D84 @ =gUnknown_2037F34
|
||||
movs r2, 0xDA
|
||||
lsls r2, 3
|
||||
@@ -193,7 +193,7 @@ sub_8079D8C: @ 8079D8C
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_807B004
|
||||
bl play_some_sound
|
||||
ldr r1, _08079DB8 @ =gUnknown_2037F34
|
||||
movs r2, 0xDA
|
||||
lsls r2, 3
|
||||
@@ -1068,7 +1068,7 @@ _0807A428:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x10
|
||||
mov r2, r8
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
adds r0, r6, 0
|
||||
adds r0, 0x10
|
||||
lsls r0, 16
|
||||
@@ -1217,7 +1217,7 @@ _0807A544:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x10
|
||||
adds r2, r6, 0
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x10
|
||||
lsls r0, 16
|
||||
@@ -1317,7 +1317,7 @@ sub_807A5F8: @ 807A5F8
|
||||
lsls r1, 1
|
||||
movs r0, 0
|
||||
adds r2, r7, 0
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
ldr r0, [sp]
|
||||
lsls r1, r0, 27
|
||||
lsrs r1, 27
|
||||
@@ -1424,7 +1424,7 @@ _0807A6E4:
|
||||
ldrh r3, [r1]
|
||||
movs r1, 0x10
|
||||
adds r2, r7, 0
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
adds r4, 0x1
|
||||
mov r9, r4
|
||||
_0807A6F8:
|
||||
@@ -1584,8 +1584,8 @@ _0807A810: .4byte 0x000006c6
|
||||
_0807A814: .4byte 0x000006c2
|
||||
thumb_func_end sub_807A7C4
|
||||
|
||||
thumb_func_start sub_807A818
|
||||
sub_807A818: @ 807A818
|
||||
thumb_func_start fade_screen
|
||||
fade_screen: @ 807A818
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
@@ -1663,7 +1663,7 @@ _0807A896:
|
||||
str r4, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _0807A8BC @ =gUnknown_2037F34
|
||||
ldr r3, _0807A8C0 @ =0x000006c6
|
||||
adds r0, r3
|
||||
@@ -1699,7 +1699,7 @@ _0807A8E8:
|
||||
str r4, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_0807A8FA:
|
||||
ldr r4, _0807A934 @ =gUnknown_2037F34
|
||||
ldr r1, _0807A938 @ =0x000006c6
|
||||
@@ -1735,7 +1735,7 @@ _0807A934: .4byte gUnknown_2037F34
|
||||
_0807A938: .4byte 0x000006c6
|
||||
_0807A93C: .4byte 0x000006ca
|
||||
_0807A940: .4byte 0x000006cb
|
||||
thumb_func_end sub_807A818
|
||||
thumb_func_end fade_screen
|
||||
|
||||
thumb_func_start sub_807A944
|
||||
sub_807A944: @ 807A944
|
||||
@@ -1816,7 +1816,7 @@ _0807A9C2:
|
||||
adds r0, r6, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _0807A9E8 @ =gUnknown_2037F34
|
||||
ldr r3, _0807A9EC @ =0x000006c6
|
||||
adds r0, r3
|
||||
@@ -1851,7 +1851,7 @@ _0807AA14:
|
||||
adds r0, r6, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_0807AA24:
|
||||
ldr r4, _0807AA60 @ =gUnknown_2037F34
|
||||
ldr r1, _0807AA64 @ =0x000006c6
|
||||
@@ -1997,7 +1997,7 @@ _0807AB20:
|
||||
lsrs r3, 17
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x10
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
b _0807AB68
|
||||
.align 2, 0
|
||||
_0807AB4C: .4byte gUnknown_20375F8
|
||||
@@ -2010,7 +2010,7 @@ _0807AB58:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x10
|
||||
movs r2, 0xC
|
||||
bl sub_8045274
|
||||
bl BlendPalette
|
||||
_0807AB68:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -2076,7 +2076,7 @@ sub_807ABC0: @ 807ABC0
|
||||
adds r1, r2
|
||||
lsrs r1, 16
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldrb r0, [r4]
|
||||
bl sub_807AA8C
|
||||
pop {r4}
|
||||
@@ -2342,7 +2342,7 @@ sub_807ADB0: @ 807ADB0
|
||||
lsls r1, 8
|
||||
orrs r1, r0
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -2470,7 +2470,7 @@ _0807AEC4:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, [r4]
|
||||
ldr r2, _0807AEF4 @ =0x00000734
|
||||
adds r0, r5, r2
|
||||
@@ -2561,8 +2561,8 @@ _0807AF92:
|
||||
bx r0
|
||||
thumb_func_end sub_807AF00
|
||||
|
||||
thumb_func_start sub_807AF98
|
||||
sub_807AF98: @ 807AF98
|
||||
thumb_func_start weather_get_current
|
||||
weather_get_current: @ 807AF98
|
||||
ldr r0, _0807AFA4 @ =gUnknown_2037F34
|
||||
movs r1, 0xDA
|
||||
lsls r1, 3
|
||||
@@ -2571,7 +2571,7 @@ sub_807AF98: @ 807AF98
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0807AFA4: .4byte gUnknown_2037F34
|
||||
thumb_func_end sub_807AF98
|
||||
thumb_func_end weather_get_current
|
||||
|
||||
thumb_func_start sub_807AFA8
|
||||
sub_807AFA8: @ 807AFA8
|
||||
@@ -2625,10 +2625,10 @@ _0807AFFA:
|
||||
_0807B000: .4byte 0x000006dd
|
||||
thumb_func_end sub_807AFA8
|
||||
|
||||
thumb_func_start sub_807B004
|
||||
sub_807B004: @ 807B004
|
||||
thumb_func_start play_some_sound
|
||||
play_some_sound: @ 807B004
|
||||
push {lr}
|
||||
bl sub_807244C
|
||||
bl IsSpecialSEPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807B042
|
||||
@@ -2658,7 +2658,7 @@ _0807B03C:
|
||||
_0807B042:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_807B004
|
||||
thumb_func_end play_some_sound
|
||||
|
||||
thumb_func_start sub_807B048
|
||||
sub_807B048: @ 807B048
|
||||
@@ -2837,7 +2837,7 @@ sub_807B174: @ 807B174
|
||||
bl sub_807B130
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8079CF4
|
||||
bl weather_set
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_807B174
|
||||
@@ -2860,7 +2860,7 @@ sub_807B1A4: @ 807B1A4
|
||||
bl sub_807B130
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8079CF4
|
||||
bl weather_set
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_807B1A4
|
||||
|
||||
+86
-86
@@ -211,7 +211,7 @@ sub_807B438: @ 807B438
|
||||
cmp r0, 0x1
|
||||
beq _0807B4F4
|
||||
ldr r0, _0807B4B8 @ =gUnknown_83C65D4
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
ldr r0, _0807B4BC @ =gUnknown_83C2D00
|
||||
bl sub_807ABC0
|
||||
movs r5, 0
|
||||
@@ -220,7 +220,7 @@ _0807B456:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0xFF
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0x40
|
||||
@@ -318,7 +318,7 @@ _0807B51C:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807B52A
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807B52A:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -327,7 +327,7 @@ _0807B52A:
|
||||
bls _0807B51C
|
||||
movs r0, 0x90
|
||||
lsls r0, 5
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldr r0, _0807B550 @ =gUnknown_83C2BBC
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0807B554 @ =0x000006de
|
||||
@@ -529,17 +529,17 @@ sub_807B6BC: @ 807B6BC
|
||||
thumb_func_start sub_807B6C0
|
||||
sub_807B6C0: @ 807B6C0
|
||||
push {lr}
|
||||
ldr r0, _0807B6D0 @ =sub_807B6D4
|
||||
ldr r0, _0807B6D0 @ =task50_0807B6D4
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0807B6D0: .4byte sub_807B6D4
|
||||
_0807B6D0: .4byte task50_0807B6D4
|
||||
thumb_func_end sub_807B6C0
|
||||
|
||||
thumb_func_start sub_807B6D4
|
||||
sub_807B6D4: @ 807B6D4
|
||||
thumb_func_start task50_0807B6D4
|
||||
task50_0807B6D4: @ 807B6D4
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -572,17 +572,17 @@ _0807B714:
|
||||
strh r0, [r4, 0xA]
|
||||
strh r0, [r4, 0xC]
|
||||
movs r0, 0x48
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xE]
|
||||
ldr r1, _0807B764 @ =0x00003f3f
|
||||
movs r0, 0x48
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0x9E
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
@@ -599,7 +599,7 @@ _0807B740:
|
||||
_0807B752:
|
||||
ldrh r1, [r4, 0xA]
|
||||
movs r0, 0x54
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0xA
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0xF
|
||||
@@ -630,32 +630,32 @@ _0807B768:
|
||||
_0807B78E:
|
||||
ldrh r1, [r4, 0xA]
|
||||
movs r0, 0x54
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _0807B7C2
|
||||
_0807B798:
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xE]
|
||||
movs r0, 0x48
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_0807B7B0:
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
b _0807B7C2
|
||||
_0807B7B8:
|
||||
bl sub_8069B34
|
||||
bl EnableBothScriptContexts
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0807B7C2:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_807B6D4
|
||||
thumb_func_end task50_0807B6D4
|
||||
|
||||
thumb_func_start sub_807B7C8
|
||||
sub_807B7C8: @ 807B7C8
|
||||
@@ -932,7 +932,7 @@ _0807B964:
|
||||
strh r0, [r7, 0x34]
|
||||
adds r0, r7, 0
|
||||
movs r1, 0
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
mov r3, r8
|
||||
strh r3, [r7, 0x36]
|
||||
adds r2, r7, 0
|
||||
@@ -1045,7 +1045,7 @@ _0807BAAE:
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
movs r0, 0x1
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r1, _0807BAF8 @ =gUnknown_2021BC8
|
||||
@@ -1211,7 +1211,7 @@ _0807BBFC:
|
||||
sub_807BC08: @ 807BC08
|
||||
push {lr}
|
||||
ldr r0, _0807BC14 @ =gUnknown_83C66CC
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1244,7 +1244,7 @@ _0807BC32:
|
||||
movs r3, 0x2
|
||||
ldrsh r2, [r2, r3]
|
||||
movs r3, 0x4E
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x40
|
||||
@@ -1469,7 +1469,7 @@ _0807BDF0:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807BDFE
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807BDFE:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -1484,7 +1484,7 @@ _0807BE0A:
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
ldr r0, _0807BE28 @ =0x00001206
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1550,7 +1550,7 @@ sub_807BE7C: @ 807BE7C
|
||||
mov r8, r2
|
||||
adds r7, r1, r3
|
||||
_0807BE98:
|
||||
bl sub_807BEE8
|
||||
bl snowflakes_progress2
|
||||
movs r4, 0
|
||||
mov r1, r8
|
||||
ldr r0, [r1]
|
||||
@@ -1591,8 +1591,8 @@ _0807BEE0: .4byte 0x000006d2
|
||||
_0807BEE4: .4byte 0x000006e4
|
||||
thumb_func_end sub_807BE7C
|
||||
|
||||
thumb_func_start sub_807BEE8
|
||||
sub_807BEE8: @ 807BEE8
|
||||
thumb_func_start snowflakes_progress2
|
||||
snowflakes_progress2: @ 807BEE8
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _0807BF18 @ =gUnknown_83C2BBC
|
||||
ldr r5, [r0]
|
||||
@@ -1601,7 +1601,7 @@ sub_807BEE8: @ 807BEE8
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _0807BF10
|
||||
bl sub_807BF88
|
||||
bl snowflakes_progress
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807BF10
|
||||
@@ -1620,7 +1620,7 @@ _0807BF10:
|
||||
_0807BF18: .4byte gUnknown_83C2BBC
|
||||
_0807BF1C: .4byte 0x000006cc
|
||||
_0807BF20: .4byte 0x000006d2
|
||||
thumb_func_end sub_807BEE8
|
||||
thumb_func_end snowflakes_progress2
|
||||
|
||||
thumb_func_start sub_807BF24
|
||||
sub_807BF24: @ 807BF24
|
||||
@@ -1650,7 +1650,7 @@ _0807BF44:
|
||||
adds r0, 0x1
|
||||
strh r0, [r3]
|
||||
_0807BF56:
|
||||
bl sub_807BF88
|
||||
bl snowflakes_progress
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807BF80
|
||||
@@ -1675,8 +1675,8 @@ _0807BF82:
|
||||
bx r1
|
||||
thumb_func_end sub_807BF24
|
||||
|
||||
thumb_func_start sub_807BF88
|
||||
sub_807BF88: @ 807BF88
|
||||
thumb_func_start snowflakes_progress
|
||||
snowflakes_progress: @ 807BF88
|
||||
push {r4,lr}
|
||||
ldr r0, _0807BFA4 @ =gUnknown_83C2BBC
|
||||
ldr r1, [r0]
|
||||
@@ -1711,10 +1711,10 @@ _0807BFB0:
|
||||
ldrb r2, [r2]
|
||||
cmp r0, r2
|
||||
bcs _0807BFD6
|
||||
bl sub_807C004
|
||||
bl snowflake_add
|
||||
b _0807BFDA
|
||||
_0807BFD6:
|
||||
bl sub_807C070
|
||||
bl snowflake_remove
|
||||
_0807BFDA:
|
||||
ldr r0, _0807BFF8 @ =gUnknown_83C2BBC
|
||||
ldr r0, [r0]
|
||||
@@ -1736,16 +1736,16 @@ _0807BFF2:
|
||||
_0807BFF8: .4byte gUnknown_83C2BBC
|
||||
_0807BFFC: .4byte 0x000006e4
|
||||
_0807C000: .4byte 0x000006e5
|
||||
thumb_func_end sub_807BF88
|
||||
thumb_func_end snowflakes_progress
|
||||
|
||||
thumb_func_start sub_807C004
|
||||
sub_807C004: @ 807C004
|
||||
thumb_func_start snowflake_add
|
||||
snowflake_add: @ 807C004
|
||||
push {r4-r6,lr}
|
||||
ldr r0, _0807C058 @ =gUnknown_83C6704
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x4E
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0x40
|
||||
@@ -1790,10 +1790,10 @@ _0807C06A:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_807C004
|
||||
thumb_func_end snowflake_add
|
||||
|
||||
thumb_func_start sub_807C070
|
||||
sub_807C070: @ 807C070
|
||||
thumb_func_start snowflake_remove
|
||||
snowflake_remove: @ 807C070
|
||||
push {lr}
|
||||
ldr r0, _0807C084 @ =gUnknown_83C2BBC
|
||||
ldr r1, [r0]
|
||||
@@ -1815,18 +1815,18 @@ _0807C08C:
|
||||
adds r1, 0x60
|
||||
adds r1, r0
|
||||
ldr r0, [r1]
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
movs r0, 0x1
|
||||
_0807C0A0:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_807C070
|
||||
thumb_func_end snowflake_remove
|
||||
|
||||
thumb_func_start sub_807C0A4
|
||||
sub_807C0A4: @ 807C0A4
|
||||
push {r4-r7,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x36
|
||||
ldrsh r2, [r5, r1]
|
||||
lsls r1, r2, 2
|
||||
@@ -1872,7 +1872,7 @@ sub_807C0A4: @ 807C0A4
|
||||
lsls r0, 7
|
||||
strh r0, [r5, 0x2E]
|
||||
strh r7, [r5, 0x24]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r6, r0, 0
|
||||
@@ -1886,7 +1886,7 @@ sub_807C0A4: @ 807C0A4
|
||||
movs r1, 0x1
|
||||
bics r1, r6
|
||||
adds r0, r5, 0
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
strh r7, [r5, 0x34]
|
||||
movs r0, 0x1
|
||||
cmp r4, 0
|
||||
@@ -2389,7 +2389,7 @@ _0807C520:
|
||||
adds r1, r4, r2
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r5, 0xB4
|
||||
@@ -2435,7 +2435,7 @@ _0807C580:
|
||||
adds r0, r4, r1
|
||||
movs r5, 0x1
|
||||
strb r5, [r0]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ands r0, r5
|
||||
@@ -2448,7 +2448,7 @@ _0807C5A0: .4byte gUnknown_83C2BBC
|
||||
_0807C5A4: .4byte 0x000006ea
|
||||
_0807C5A8: .4byte 0x000006eb
|
||||
_0807C5AC:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _0807C614 @ =gUnknown_83C2BBC
|
||||
ldr r2, [r1]
|
||||
movs r1, 0x1
|
||||
@@ -2480,7 +2480,7 @@ _0807C5CA:
|
||||
movs r0, 0x14
|
||||
bl sub_807C85C
|
||||
_0807C5EE:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _0807C614 @ =gUnknown_83C2BBC
|
||||
ldr r4, [r1]
|
||||
lsls r0, 16
|
||||
@@ -2531,7 +2531,7 @@ _0807C63E:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807C688
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0xF
|
||||
@@ -2587,7 +2587,7 @@ _0807C6C8: .4byte gUnknown_83C2BBC
|
||||
_0807C6CC: .4byte 0x000006e6
|
||||
_0807C6D0: .4byte 0x000006cc
|
||||
_0807C6D4:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _0807C6F8 @ =gUnknown_83C2BBC
|
||||
ldr r2, [r1]
|
||||
lsls r0, 16
|
||||
@@ -2623,7 +2623,7 @@ _0807C704:
|
||||
bl sub_807C85C
|
||||
movs r0, 0x13
|
||||
bl sub_807A790
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0xF
|
||||
ands r1, r0
|
||||
adds r1, 0x1E
|
||||
@@ -2790,7 +2790,7 @@ sub_807C85C: @ 807C85C
|
||||
ldrb r0, [r5]
|
||||
cmp r0, 0
|
||||
bne _0807C88A
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r6, 0
|
||||
@@ -2826,11 +2826,11 @@ sub_807C898: @ 807C898
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0
|
||||
bne _0807C8F4
|
||||
bl sub_80723E0
|
||||
bl IsSEPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0807C8F8
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ands r4, r0
|
||||
cmp r4, 0
|
||||
beq _0807C8D8
|
||||
@@ -3179,14 +3179,14 @@ sub_807CB4C: @ 807CB4C
|
||||
str r0, [sp]
|
||||
str r1, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
movs r5, 0
|
||||
_0807CB70:
|
||||
ldr r0, _0807CBCC @ =gUnknown_83C6790
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0xFF
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -3272,7 +3272,7 @@ _0807CC1E:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807CC2C
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807CC2C:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -3280,7 +3280,7 @@ _0807CC2C:
|
||||
cmp r4, 0x13
|
||||
bls _0807CC1E
|
||||
ldr r0, _0807CC58 @ =0x00001201
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldr r0, _0807CC50 @ =gUnknown_83C2BBC
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0807CC54 @ =0x000006fb
|
||||
@@ -3332,7 +3332,7 @@ sub_807CC5C: @ 807CC5C
|
||||
movs r1, 0xFD
|
||||
lsls r1, 6
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_0807CCA4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -3499,7 +3499,7 @@ _0807CDD8:
|
||||
_0807CDE0:
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r0, [r4]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4]
|
||||
@@ -3518,7 +3518,7 @@ _0807CDF4:
|
||||
sub_807CDFC: @ 807CDFC
|
||||
push {lr}
|
||||
ldr r0, _0807CE08 @ =gUnknown_83C67B0
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -3542,7 +3542,7 @@ _0807CE20:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x4E
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -3630,7 +3630,7 @@ _0807CECC:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807CEDA
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807CEDA:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -3638,7 +3638,7 @@ _0807CEDA:
|
||||
cmp r4, 0x13
|
||||
bls _0807CECC
|
||||
ldr r0, _0807CF04 @ =0x00001202
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldr r0, _0807CF00 @ =gUnknown_83C2BBC
|
||||
ldr r0, [r0]
|
||||
movs r1, 0xE0
|
||||
@@ -4007,7 +4007,7 @@ sub_807D190: @ 807D190
|
||||
str r0, [sp]
|
||||
str r1, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
movs r6, 0
|
||||
_0807D1B4:
|
||||
adds r0, r6, 0
|
||||
@@ -4019,7 +4019,7 @@ _0807D1B4:
|
||||
ldr r0, _0807D208 @ =gUnknown_83C6804
|
||||
movs r1, 0
|
||||
movs r3, 0xFF
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x40
|
||||
@@ -4100,7 +4100,7 @@ _0807D260:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807D26E
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807D26E:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -4108,7 +4108,7 @@ _0807D26E:
|
||||
cmp r4, 0x13
|
||||
bls _0807D260
|
||||
ldr r0, _0807D298 @ =0x00001203
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
ldr r0, _0807D290 @ =gUnknown_83C2BBC
|
||||
ldr r0, [r0]
|
||||
ldr r1, _0807D294 @ =0x00000724
|
||||
@@ -4492,7 +4492,7 @@ _0807D55C:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807D56A
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807D56A:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -4506,7 +4506,7 @@ _0807D56A:
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
ldr r0, _0807D5D0 @ =0x00001204
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
_0807D586:
|
||||
ldr r0, _0807D5C8 @ =gUnknown_83C2BBC
|
||||
ldr r1, [r0]
|
||||
@@ -4525,7 +4525,7 @@ _0807D59C:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0807D5AA
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807D5AA:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -4561,7 +4561,7 @@ sub_807D5D8: @ 807D5D8
|
||||
cmp r0, 0
|
||||
bne _0807D686
|
||||
ldr r0, _0807D650 @ =gUnknown_83C6854
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
ldr r0, _0807D654 @ =gUnknown_83C2D20
|
||||
bl sub_807ABC0
|
||||
movs r7, 0
|
||||
@@ -4575,7 +4575,7 @@ _0807D5F8:
|
||||
ldr r0, _0807D658 @ =gUnknown_83C683C
|
||||
movs r1, 0
|
||||
movs r3, 0x1
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0x40
|
||||
@@ -4670,7 +4670,7 @@ _0807D6B8:
|
||||
ldr r0, _0807D748 @ =gUnknown_83C683C
|
||||
movs r2, 0xD0
|
||||
movs r3, 0x1
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0x40
|
||||
@@ -4713,12 +4713,12 @@ _0807D6B8:
|
||||
strh r0, [r1, 0x34]
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
ldr r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
movs r3, 0
|
||||
bl sub_80073F0
|
||||
bl CalcCenterToCornerVec
|
||||
ldr r1, [r4]
|
||||
ldr r0, _0807D758 @ =sub_807D7F8
|
||||
str r0, [r1, 0x1C]
|
||||
@@ -4955,7 +4955,7 @@ sub_807D8D4: @ 807D8D4
|
||||
cmp r5, 0
|
||||
bne _0807D90C
|
||||
ldr r0, _0807D91C @ =gUnknown_83C6870
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
movs r2, 0xE5
|
||||
lsls r2, 3
|
||||
adds r0, r4, r2
|
||||
@@ -5102,7 +5102,7 @@ sub_807D9E8: @ 807D9E8
|
||||
lsls r2, 16
|
||||
asrs r2, 16
|
||||
movs r3, 0
|
||||
bl sub_8006FE0
|
||||
bl CreateSpriteAtEnd
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0x40
|
||||
@@ -5166,7 +5166,7 @@ _0807DA76:
|
||||
cmp r1, r0
|
||||
bne _0807DA90
|
||||
adds r0, r2, r5
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807DA90:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
@@ -5174,7 +5174,7 @@ _0807DA90:
|
||||
cmp r4, 0x3F
|
||||
bls _0807DA76
|
||||
ldr r0, _0807DAB0 @ =0x00001205
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -5231,7 +5231,7 @@ _0807DAF4:
|
||||
cmp r0, 0x77
|
||||
ble _0807DB0E
|
||||
adds r0, r1, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
_0807DB0E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+59
-59
@@ -11,7 +11,7 @@ sub_80589C4: @ 80589C4
|
||||
ldrb r2, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
adds r0, r2, 0
|
||||
bl sub_8055238
|
||||
bl get_mapheader_by_bank_and_number
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80589C4
|
||||
@@ -21,7 +21,7 @@ sub_80589D4: @ 80589D4
|
||||
push {lr}
|
||||
ldr r0, _080589E4 @ =gUnknown_2036DFC
|
||||
bl sub_8058A00
|
||||
bl sub_8069C38
|
||||
bl mapheader_run_script_with_tag_x1
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -34,7 +34,7 @@ sub_80589E8: @ 80589E8
|
||||
ldr r0, _080589FC @ =gUnknown_2036DFC
|
||||
bl sub_8058A00
|
||||
bl sub_80591C4
|
||||
bl sub_8069C38
|
||||
bl mapheader_run_script_with_tag_x1
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -76,9 +76,9 @@ _08058A3E:
|
||||
ldr r0, [r5, 0xC]
|
||||
ldrh r1, [r5]
|
||||
ldrh r2, [r5, 0x4]
|
||||
bl sub_8058A70
|
||||
bl map_copy_with_padding
|
||||
adds r0, r6, 0
|
||||
bl sub_8058AC8
|
||||
bl mapheader_copy_mapdata_of_adjacent_maps
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -92,8 +92,8 @@ _08058A68: .4byte gUnknown_8352F18
|
||||
_08058A6C: .4byte gUnknown_8352F4C
|
||||
thumb_func_end sub_8058A00
|
||||
|
||||
thumb_func_start sub_8058A70
|
||||
sub_8058A70: @ 8058A70
|
||||
thumb_func_start map_copy_with_padding
|
||||
map_copy_with_padding: @ 8058A70
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -139,10 +139,10 @@ _08058AB8:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08058AC4: .4byte gUnknown_3005040
|
||||
thumb_func_end sub_8058A70
|
||||
thumb_func_end map_copy_with_padding
|
||||
|
||||
thumb_func_start sub_8058AC8
|
||||
sub_8058AC8: @ 8058AC8
|
||||
thumb_func_start mapheader_copy_mapdata_of_adjacent_maps
|
||||
mapheader_copy_mapdata_of_adjacent_maps: @ 8058AC8
|
||||
push {r4-r7,lr}
|
||||
adds r6, r0, 0
|
||||
ldr r2, _08058B00 @ =gUnknown_2036E24
|
||||
@@ -215,7 +215,7 @@ _08058B4C:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8058AC8
|
||||
thumb_func_end mapheader_copy_mapdata_of_adjacent_maps
|
||||
|
||||
thumb_func_start sub_8058B54
|
||||
sub_8058B54: @ 8058B54
|
||||
@@ -492,8 +492,8 @@ _08058D38:
|
||||
_08058D40: .4byte gUnknown_3005040
|
||||
thumb_func_end sub_8058CE0
|
||||
|
||||
thumb_func_start sub_8058D44
|
||||
sub_8058D44: @ 8058D44
|
||||
thumb_func_start MapGridGetZCoordAt
|
||||
MapGridGetZCoordAt: @ 8058D44
|
||||
push {r4-r7,lr}
|
||||
adds r2, r0, 0
|
||||
adds r7, r1, 0
|
||||
@@ -558,7 +558,7 @@ _08058DBE:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8058D44
|
||||
thumb_func_end MapGridGetZCoordAt
|
||||
|
||||
thumb_func_start sub_8058DC4
|
||||
sub_8058DC4: @ 8058DC4
|
||||
@@ -1450,8 +1450,8 @@ _08059432:
|
||||
bx r1
|
||||
thumb_func_end sub_8059334
|
||||
|
||||
thumb_func_start sub_805943C
|
||||
sub_805943C: @ 805943C
|
||||
thumb_func_start GetPostCameraMoveMapBorderId
|
||||
GetPostCameraMoveMapBorderId: @ 805943C
|
||||
push {r4,lr}
|
||||
adds r3, r1, 0
|
||||
ldr r1, _08059460 @ =gUnknown_3005008
|
||||
@@ -1471,10 +1471,10 @@ sub_805943C: @ 805943C
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08059460: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_805943C
|
||||
thumb_func_end GetPostCameraMoveMapBorderId
|
||||
|
||||
thumb_func_start sub_8059464
|
||||
sub_8059464: @ 8059464
|
||||
thumb_func_start CanCameraMoveInDirection
|
||||
CanCameraMoveInDirection: @ 8059464
|
||||
push {r4,r5,lr}
|
||||
ldr r1, _0805949C @ =gUnknown_3005008
|
||||
ldr r4, [r1]
|
||||
@@ -1510,7 +1510,7 @@ _080594A6:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8059464
|
||||
thumb_func_end CanCameraMoveInDirection
|
||||
|
||||
thumb_func_start sub_80594AC
|
||||
sub_80594AC: @ 80594AC
|
||||
@@ -1585,8 +1585,8 @@ _08059526:
|
||||
_0805952C: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_80594AC
|
||||
|
||||
thumb_func_start sub_8059530
|
||||
sub_8059530: @ 8059530
|
||||
thumb_func_start CameraMove
|
||||
CameraMove: @ 8059530
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -1603,7 +1603,7 @@ sub_8059530: @ 8059530
|
||||
strb r1, [r2]
|
||||
mov r0, r10
|
||||
mov r1, r9
|
||||
bl sub_805943C
|
||||
bl GetPostCameraMoveMapBorderId
|
||||
adds r7, r0, 0
|
||||
adds r0, r7, 0x1
|
||||
cmp r0, 0x1
|
||||
@@ -1684,7 +1684,7 @@ _080595E2:
|
||||
.align 2, 0
|
||||
_080595F8: .4byte gUnknown_3005008
|
||||
_080595FC: .4byte gUnknown_2036E18
|
||||
thumb_func_end sub_8059530
|
||||
thumb_func_end CameraMove
|
||||
|
||||
thumb_func_start sub_8059600
|
||||
sub_8059600: @ 8059600
|
||||
@@ -1988,8 +1988,8 @@ sub_80597EC: @ 80597EC
|
||||
_08059804: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_80597EC
|
||||
|
||||
thumb_func_start sub_8059808
|
||||
sub_8059808: @ 8059808
|
||||
thumb_func_start sav1_camera_get_focus_coords
|
||||
sav1_camera_get_focus_coords: @ 8059808
|
||||
ldr r2, _0805981C @ =gUnknown_3005008
|
||||
ldr r3, [r2]
|
||||
ldrh r2, [r3]
|
||||
@@ -2001,10 +2001,10 @@ sub_8059808: @ 8059808
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0805981C: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_8059808
|
||||
thumb_func_end sav1_camera_get_focus_coords
|
||||
|
||||
thumb_func_start sub_8059820
|
||||
sub_8059820: @ 8059820
|
||||
thumb_func_start SetCameraCoords
|
||||
SetCameraCoords: @ 8059820
|
||||
ldr r2, _0805982C @ =gUnknown_3005008
|
||||
ldr r2, [r2]
|
||||
strh r0, [r2]
|
||||
@@ -2012,10 +2012,10 @@ sub_8059820: @ 8059820
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0805982C: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_8059820
|
||||
thumb_func_end SetCameraCoords
|
||||
|
||||
thumb_func_start sub_8059830
|
||||
sub_8059830: @ 8059830
|
||||
thumb_func_start GetCameraCoords
|
||||
GetCameraCoords: @ 8059830
|
||||
ldr r2, _08059840 @ =gUnknown_3005008
|
||||
ldr r3, [r2]
|
||||
ldrh r2, [r3]
|
||||
@@ -2025,7 +2025,7 @@ sub_8059830: @ 8059830
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08059840: .4byte gUnknown_3005008
|
||||
thumb_func_end sub_8059830
|
||||
thumb_func_end GetCameraCoords
|
||||
|
||||
thumb_func_start sub_8059844
|
||||
sub_8059844: @ 8059844
|
||||
@@ -2048,7 +2048,7 @@ sub_8059844: @ 8059844
|
||||
lsrs r2, 16
|
||||
movs r0, 0x2
|
||||
adds r3, r5, 0
|
||||
bl sub_80017D0
|
||||
bl LoadBgTiles
|
||||
b _08059880
|
||||
_08059870:
|
||||
ldr r1, [r3, 0x4]
|
||||
@@ -2086,7 +2086,7 @@ sub_8059888: @ 8059888
|
||||
lsrs r2, 16
|
||||
movs r0, 0x2
|
||||
adds r3, r5, 0
|
||||
bl sub_80017D0
|
||||
bl LoadBgTiles
|
||||
b _080598C4
|
||||
_080598B4:
|
||||
ldr r1, [r3, 0x4]
|
||||
@@ -2128,7 +2128,7 @@ _080598F0:
|
||||
ldr r0, _08059900 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
adds r1, r5, 0
|
||||
bl sub_8071544
|
||||
bl TintPalette_GrayScale
|
||||
b _0805992C
|
||||
.align 2, 0
|
||||
_08059900: .4byte gUnknown_20371F8
|
||||
@@ -2137,7 +2137,7 @@ _08059904:
|
||||
ldr r0, _08059914 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
adds r1, r5, 0
|
||||
bl sub_80715F4
|
||||
bl TintPalette_SepiaTone
|
||||
b _0805992C
|
||||
.align 2, 0
|
||||
_08059914: .4byte gUnknown_20371F8
|
||||
@@ -2149,7 +2149,7 @@ _08059918:
|
||||
ldr r0, _08059940 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
adds r1, r5, 0
|
||||
bl sub_8071544
|
||||
bl TintPalette_GrayScale
|
||||
_0805992C:
|
||||
ldr r0, _08059940 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
@@ -2191,7 +2191,7 @@ _0805996C:
|
||||
ldr r0, _0805997C @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
lsls r1, r6, 4
|
||||
bl sub_8071544
|
||||
bl TintPalette_GrayScale
|
||||
b _080599AA
|
||||
.align 2, 0
|
||||
_0805997C: .4byte gUnknown_20371F8
|
||||
@@ -2200,7 +2200,7 @@ _08059980:
|
||||
ldr r0, _08059990 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
lsls r1, r6, 4
|
||||
bl sub_80715F4
|
||||
bl TintPalette_SepiaTone
|
||||
b _080599AA
|
||||
.align 2, 0
|
||||
_08059990: .4byte gUnknown_20371F8
|
||||
@@ -2213,7 +2213,7 @@ _08059994:
|
||||
ldr r0, _080599C0 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
adds r1, r5, 0
|
||||
bl sub_8071544
|
||||
bl TintPalette_GrayScale
|
||||
_080599AA:
|
||||
ldr r0, _080599C0 @ =gUnknown_20371F8
|
||||
adds r0, r4, r0
|
||||
@@ -2230,8 +2230,8 @@ _080599C0: .4byte gUnknown_20371F8
|
||||
_080599C4: .4byte gUnknown_20375F8
|
||||
thumb_func_end sub_8059948
|
||||
|
||||
thumb_func_start sub_80599C8
|
||||
sub_80599C8: @ 80599C8
|
||||
thumb_func_start apply_map_tileset_palette
|
||||
apply_map_tileset_palette: @ 80599C8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -2254,7 +2254,7 @@ sub_80599C8: @ 80599C8
|
||||
mov r0, sp
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x2
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, [r4, 0x8]
|
||||
adds r0, 0x2
|
||||
adds r5, 0x1
|
||||
@@ -2264,7 +2264,7 @@ sub_80599C8: @ 80599C8
|
||||
lsls r2, r4, 16
|
||||
lsrs r2, 16
|
||||
adds r1, r5, 0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
lsls r4, 15
|
||||
lsrs r4, 16
|
||||
adds r0, r5, 0
|
||||
@@ -2278,7 +2278,7 @@ _08059A1C:
|
||||
adds r0, 0xE0
|
||||
adds r1, r5, 0
|
||||
adds r2, r7, 0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
lsrs r1, r6, 17
|
||||
adds r0, r5, 0
|
||||
bl sub_80598CC
|
||||
@@ -2286,7 +2286,7 @@ _08059A1C:
|
||||
_08059A36:
|
||||
ldr r0, [r4, 0x8]
|
||||
mov r1, r8
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
lsrs r1, r6, 17
|
||||
mov r0, r8
|
||||
bl sub_80598CC
|
||||
@@ -2297,7 +2297,7 @@ _08059A46:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80599C8
|
||||
thumb_func_end apply_map_tileset_palette
|
||||
|
||||
thumb_func_start sub_8059A54
|
||||
sub_8059A54: @ 8059A54
|
||||
@@ -2324,8 +2324,8 @@ sub_8059A68: @ 8059A68
|
||||
bx r0
|
||||
thumb_func_end sub_8059A68
|
||||
|
||||
thumb_func_start sub_8059A7C
|
||||
sub_8059A7C: @ 8059A7C
|
||||
thumb_func_start copy_map_tileset2_to_vram_2
|
||||
copy_map_tileset2_to_vram_2: @ 8059A7C
|
||||
push {lr}
|
||||
ldr r0, [r0, 0x14]
|
||||
movs r1, 0xC0
|
||||
@@ -2335,7 +2335,7 @@ sub_8059A7C: @ 8059A7C
|
||||
bl sub_8059888
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8059A7C
|
||||
thumb_func_end copy_map_tileset2_to_vram_2
|
||||
|
||||
thumb_func_start sub_8059A90
|
||||
sub_8059A90: @ 8059A90
|
||||
@@ -2343,7 +2343,7 @@ sub_8059A90: @ 8059A90
|
||||
ldr r0, [r0, 0x10]
|
||||
movs r1, 0
|
||||
movs r2, 0xE0
|
||||
bl sub_80599C8
|
||||
bl apply_map_tileset_palette
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8059A90
|
||||
@@ -2354,13 +2354,13 @@ sub_8059AA0: @ 8059AA0
|
||||
ldr r0, [r0, 0x14]
|
||||
movs r1, 0x70
|
||||
movs r2, 0xC0
|
||||
bl sub_80599C8
|
||||
bl apply_map_tileset_palette
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8059AA0
|
||||
|
||||
thumb_func_start sub_8059AB0
|
||||
sub_8059AB0: @ 8059AB0
|
||||
thumb_func_start copy_map_tileset1_tileset2_to_vram
|
||||
copy_map_tileset1_tileset2_to_vram: @ 8059AB0
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
@@ -2380,10 +2380,10 @@ _08059AD2:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8059AB0
|
||||
thumb_func_end copy_map_tileset1_tileset2_to_vram
|
||||
|
||||
thumb_func_start sub_8059AD8
|
||||
sub_8059AD8: @ 8059AD8
|
||||
thumb_func_start apply_map_tileset1_tileset2_palette
|
||||
apply_map_tileset1_tileset2_palette: @ 8059AD8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
@@ -2395,6 +2395,6 @@ _08059AEA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8059AD8
|
||||
thumb_func_end apply_map_tileset1_tileset2_palette
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+26
-26
@@ -39,13 +39,13 @@ sub_8097898: @ 8097898
|
||||
cmp r0, 0x1
|
||||
beq _080978E0
|
||||
movs r0, 0x5F
|
||||
bl sub_80C97A8
|
||||
bl npc_before_player_of_type
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _08097904
|
||||
ldr r1, _080978D0 @ =gUnknown_3005024
|
||||
ldr r0, _080978D4 @ =sub_81248B0
|
||||
ldr r0, _080978D4 @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080978D8 @ =gUnknown_203B0C4
|
||||
ldr r0, _080978DC @ =sub_80979D0
|
||||
@@ -53,14 +53,14 @@ sub_8097898: @ 8097898
|
||||
.align 2, 0
|
||||
_080978CC: .4byte gUnknown_2039874
|
||||
_080978D0: .4byte gUnknown_3005024
|
||||
_080978D4: .4byte sub_81248B0
|
||||
_080978D4: .4byte hm_add_c3_launch_phase_2
|
||||
_080978D8: .4byte gUnknown_203B0C4
|
||||
_080978DC: .4byte sub_80979D0
|
||||
_080978E0:
|
||||
strb r0, [r4]
|
||||
_080978E2:
|
||||
ldr r1, _080978F4 @ =gUnknown_3005024
|
||||
ldr r0, _080978F8 @ =sub_81248B0
|
||||
ldr r0, _080978F8 @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080978FC @ =gUnknown_203B0C4
|
||||
ldr r0, _08097900 @ =sub_8097984
|
||||
@@ -70,14 +70,14 @@ _080978EC:
|
||||
b _08097970
|
||||
.align 2, 0
|
||||
_080978F4: .4byte gUnknown_3005024
|
||||
_080978F8: .4byte sub_81248B0
|
||||
_080978F8: .4byte hm_add_c3_launch_phase_2
|
||||
_080978FC: .4byte gUnknown_203B0C4
|
||||
_08097900: .4byte sub_8097984
|
||||
_08097904:
|
||||
ldr r4, _0809797C @ =gUnknown_2039A04
|
||||
adds r1, r4, 0x2
|
||||
adds r0, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
movs r7, 0
|
||||
adds r2, r4, 0
|
||||
ldr r0, _08097980 @ =0x0000ffff
|
||||
@@ -100,7 +100,7 @@ _08097924:
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
str r2, [sp]
|
||||
bl sub_8058D44
|
||||
bl MapGridGetZCoordAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, [sp]
|
||||
@@ -144,7 +144,7 @@ _08097980: .4byte 0x0000ffff
|
||||
sub_8097984: @ 8097984
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_8083444
|
||||
bl FieldEffectStart
|
||||
bl sub_811FB0C
|
||||
ldr r1, _0809799C @ =gUnknown_20386E0
|
||||
lsls r0, 24
|
||||
@@ -159,7 +159,7 @@ _0809799C: .4byte gUnknown_20386E0
|
||||
thumb_func_start sub_80979A0
|
||||
sub_80979A0: @ 80979A0
|
||||
push {lr}
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080979C8 @ =gUnknown_3005090
|
||||
@@ -190,7 +190,7 @@ sub_80979D0: @ 80979D0
|
||||
lsrs r0, 24
|
||||
str r0, [r1]
|
||||
ldr r0, _080979EC @ =gUnknown_81BDF6B
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -201,7 +201,7 @@ _080979EC: .4byte gUnknown_81BDF6B
|
||||
thumb_func_start sub_80979F0
|
||||
sub_80979F0: @ 80979F0
|
||||
push {lr}
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _08097A18 @ =gUnknown_3005090
|
||||
@@ -227,7 +227,7 @@ _08097A1C: .4byte sub_8097C6C
|
||||
sub_8097A20: @ 8097A20
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_80837FC
|
||||
bl FieldEffectActiveListRemove
|
||||
ldr r0, _08097A38 @ =gUnknown_2039874
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
@@ -238,7 +238,7 @@ sub_8097A20: @ 8097A20
|
||||
_08097A38: .4byte gUnknown_2039874
|
||||
_08097A3C:
|
||||
movs r0, 0x3A
|
||||
bl sub_8083444
|
||||
bl FieldEffectStart
|
||||
_08097A42:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -256,7 +256,7 @@ sub_8097A48: @ 8097A48
|
||||
ldr r4, _08097B38 @ =gUnknown_2039A04
|
||||
adds r1, r4, 0x2
|
||||
adds r0, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r8, r4
|
||||
ldr r0, _08097B3C @ =0x0000ffff
|
||||
mov r9, r0
|
||||
@@ -279,7 +279,7 @@ _08097A78:
|
||||
asrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8058D44
|
||||
bl MapGridGetZCoordAt
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r2, r8
|
||||
@@ -311,10 +311,10 @@ _08097ABC:
|
||||
lsrs r7, r0, 24
|
||||
cmp r7, 0x2
|
||||
bls _08097A68
|
||||
bl sub_805A684
|
||||
bl DrawWholeMapView
|
||||
ldr r4, _08097B40 @ =gUnknown_2039870
|
||||
movs r0, 0x8
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
movs r7, 0
|
||||
ldr r5, _08097B44 @ =gUnknown_202063C
|
||||
@@ -336,7 +336,7 @@ _08097AE2:
|
||||
adds r2, 0x14
|
||||
ldr r0, _08097B4C @ =gUnknown_83D414C
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r1, [r4]
|
||||
adds r1, r7
|
||||
strb r0, [r1]
|
||||
@@ -439,13 +439,13 @@ sub_8097BBC: @ 8097BBC
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x2E
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x32
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x2E
|
||||
ldrsh r1, [r4, r2]
|
||||
bl sub_8044E4C
|
||||
bl Cos
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x32]
|
||||
adds r0, 0x8
|
||||
@@ -494,7 +494,7 @@ _08097C1C:
|
||||
lsls r0, 2
|
||||
ldr r5, _08097C68 @ =gUnknown_202063C
|
||||
adds r0, r5
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -507,11 +507,11 @@ _08097C1C:
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
movs r1, 0x3A
|
||||
bl sub_80836D8
|
||||
bl FieldEffectStop
|
||||
ldr r0, [r6]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
bl sub_80696C0
|
||||
bl sub_806994C
|
||||
bl ScriptContext2_Disable
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -526,8 +526,8 @@ sub_8097C6C: @ 8097C6C
|
||||
movs r0, 0x79
|
||||
bl sub_80722CC
|
||||
movs r0, 0x2
|
||||
bl sub_80837FC
|
||||
bl sub_8069B34
|
||||
bl FieldEffectActiveListRemove
|
||||
bl EnableBothScriptContexts
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8097C6C
|
||||
|
||||
+71
-71
@@ -18,7 +18,7 @@ sub_80C9B2C: @ 80C9B2C
|
||||
cmp r0, 0
|
||||
bne _080C9B6C
|
||||
ldr r1, _080C9B5C @ =gUnknown_3005024
|
||||
ldr r0, _080C9B60 @ =sub_81248B0
|
||||
ldr r0, _080C9B60 @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080C9B64 @ =gUnknown_203B0C4
|
||||
ldr r0, _080C9B68 @ =sub_80C9B74
|
||||
@@ -29,7 +29,7 @@ sub_80C9B2C: @ 80C9B2C
|
||||
_080C9B54: .4byte gUnknown_2036DFC
|
||||
_080C9B58: .4byte 0x00000806
|
||||
_080C9B5C: .4byte gUnknown_3005024
|
||||
_080C9B60: .4byte sub_81248B0
|
||||
_080C9B60: .4byte hm_add_c3_launch_phase_2
|
||||
_080C9B64: .4byte gUnknown_203B0C4
|
||||
_080C9B68: .4byte sub_80C9B74
|
||||
_080C9B6C:
|
||||
@@ -42,7 +42,7 @@ _080C9B6E:
|
||||
thumb_func_start sub_80C9B74
|
||||
sub_80C9B74: @ 80C9B74
|
||||
push {r4,lr}
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -77,7 +77,7 @@ sub_80C9BB0: @ 80C9BB0
|
||||
ldr r0, _080C9BC8 @ =0x00000806
|
||||
bl sub_806E680
|
||||
ldr r0, _080C9BCC @ =gUnknown_81BFB5F
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -88,10 +88,10 @@ _080C9BCC: .4byte gUnknown_81BFB5F
|
||||
thumb_func_start sub_80C9BD0
|
||||
sub_80C9BD0: @ 80C9BD0
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C9BD0
|
||||
@@ -99,9 +99,9 @@ sub_80C9BD0: @ 80C9BD0
|
||||
thumb_func_start sub_80C9BE8
|
||||
sub_80C9BE8: @ 80C9BE8
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80C9BE8
|
||||
@@ -111,37 +111,37 @@ sub_80C9BFC: @ 80C9BFC
|
||||
push {lr}
|
||||
sub sp, 0x8
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0xC
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0xA
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x8
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x18
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x1A
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x14
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x16
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
mov r1, sp
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
@@ -172,22 +172,22 @@ sub_80C9BFC: @ 80C9BFC
|
||||
ldr r0, _080C9CD8 @ =0x810001ff
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
bl sub_8070528
|
||||
bl sub_80773BC
|
||||
bl sub_8006B10
|
||||
bl ResetPaletteFade
|
||||
bl ResetTasks
|
||||
bl ResetSpriteData
|
||||
movs r0, 0x1
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
ldr r0, _080C9CDC @ =sub_80C9BE8
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _080C9CE0 @ =sub_80C9BD0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
bl sub_80C9CE8
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080C9CC2
|
||||
ldr r0, _080C9CE4 @ =gUnknown_30030F0
|
||||
ldr r0, [r0, 0x8]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080C9CC2:
|
||||
add sp, 0x8
|
||||
pop {r0}
|
||||
@@ -206,10 +206,10 @@ _080C9CE4: .4byte gUnknown_30030F0
|
||||
thumb_func_start sub_80C9CE8
|
||||
sub_80C9CE8: @ 80C9CE8
|
||||
push {r4-r7,lr}
|
||||
bl sub_80561A0
|
||||
bl get_map_light_from_warp0
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sub_8056188
|
||||
bl sav1_map_get_light_level
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
movs r4, 0
|
||||
@@ -378,7 +378,7 @@ sub_80C9E1C: @ 80C9E1C
|
||||
push {lr}
|
||||
ldr r0, _080C9E2C @ =sub_80C9E30
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -410,7 +410,7 @@ sub_80C9E4C: @ 80C9E4C
|
||||
lsrs r4, 24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080C9EC8 @ =gUnknown_83F5A44
|
||||
ldr r1, _080C9ECC @ =0x0600c000
|
||||
bl LZ77UnCompVram
|
||||
@@ -420,27 +420,27 @@ sub_80C9E4C: @ 80C9E4C
|
||||
ldr r0, _080C9ED8 @ =gUnknown_83F5804
|
||||
movs r1, 0xE0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080C9EDC @ =gUnknown_83F5854
|
||||
movs r1, 0xE0
|
||||
movs r2, 0x10
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r1, _080C9EE0 @ =0x00003e41
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080C9EE4 @ =0x00001f0c
|
||||
movs r0, 0x8
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x8A
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080C9EE8 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -485,7 +485,7 @@ sub_80C9EF0: @ 80C9EF0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
cmp r4, 0x10
|
||||
bhi _080C9F24
|
||||
ldrh r0, [r5, 0xA]
|
||||
@@ -515,7 +515,7 @@ sub_80C9F38: @ 80C9F38
|
||||
lsrs r4, 24
|
||||
ldr r1, _080C9F74 @ =0x00001010
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080C9F78 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -534,7 +534,7 @@ sub_80C9F38: @ 80C9F38
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
movs r1, 0xE0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
b _080C9F92
|
||||
.align 2, 0
|
||||
_080C9F74: .4byte 0x00001010
|
||||
@@ -544,7 +544,7 @@ _080C9F80:
|
||||
ldr r0, _080C9F98 @ =gUnknown_83F5804
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080C9F9C @ =sub_80C9FA0
|
||||
str r0, [r4]
|
||||
movs r0, 0x8
|
||||
@@ -581,7 +581,7 @@ _080C9FC0: .4byte gUnknown_3005090
|
||||
_080C9FC4:
|
||||
ldr r0, _080C9FD0 @ =gUnknown_30030F0
|
||||
ldr r0, [r0, 0x8]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080C9FCC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -594,7 +594,7 @@ sub_80C9FD4: @ 80C9FD4
|
||||
push {lr}
|
||||
ldr r0, _080C9FE4 @ =sub_80C9FE8
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -626,7 +626,7 @@ sub_80CA004: @ 80CA004
|
||||
lsrs r4, 24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080CA080 @ =gUnknown_83F5A44
|
||||
ldr r1, _080CA084 @ =0x0600c000
|
||||
bl LZ77UnCompVram
|
||||
@@ -635,28 +635,28 @@ sub_80CA004: @ 80CA004
|
||||
bl LZ77UnCompVram
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080CA090 @ =0x00001f0c
|
||||
movs r0, 0x8
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x8A
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080CA094 @ =gUnknown_83F5804
|
||||
movs r1, 0xE0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080CA098 @ =gUnknown_83F5824
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r1, _080CA09C @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -708,7 +708,7 @@ sub_80CA0A4: @ 80CA0A4
|
||||
lsls r2, 17
|
||||
lsrs r2, 16
|
||||
movs r1, 0xE0
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
b _080CA0F4
|
||||
.align 2, 0
|
||||
_080CA0D8: .4byte gUnknown_3005090
|
||||
@@ -716,10 +716,10 @@ _080CA0DC: .4byte gUnknown_83F5844
|
||||
_080CA0E0:
|
||||
ldr r1, _080CA0FC @ =0x00001010
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _080CA100 @ =0x00003e41
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080CA104 @ =sub_80CA108
|
||||
str r0, [r4]
|
||||
_080CA0F4:
|
||||
@@ -752,7 +752,7 @@ sub_80CA108: @ 80CA108
|
||||
adds r1, r0
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
cmp r4, 0
|
||||
beq _080CA140
|
||||
ldrh r0, [r5, 0xA]
|
||||
@@ -765,10 +765,10 @@ _080CA140:
|
||||
ldr r0, _080CA158 @ =gUnknown_83F5824
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _080CA15C @ =gUnknown_30030F0
|
||||
ldr r0, [r0, 0x8]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080CA152:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -786,7 +786,7 @@ sub_80CA160: @ 80CA160
|
||||
lsrs r4, 24
|
||||
ldr r0, _080CA188 @ =sub_80CA190
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080CA18C @ =gUnknown_3005090
|
||||
@@ -841,9 +841,9 @@ _080CA1D8:
|
||||
ldr r2, [r0, 0xC]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5
|
||||
bl sub_80776E8
|
||||
bl SetWordTaskArg
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_80F8180
|
||||
ldrb r0, [r4, 0x6]
|
||||
bl sub_80F819C
|
||||
@@ -851,7 +851,7 @@ _080CA1D8:
|
||||
negs r0, r0
|
||||
movs r1, 0x10
|
||||
movs r2, 0
|
||||
bl sub_80714D4
|
||||
bl BlendPalettes
|
||||
b _080CA294
|
||||
.align 2, 0
|
||||
_080CA204: .4byte gUnknown_30030F0
|
||||
@@ -868,7 +868,7 @@ _080CA208:
|
||||
bl sub_8003F20
|
||||
b _080CA294
|
||||
_080CA224:
|
||||
bl sub_8001960
|
||||
bl IsDma3ManagerBusyWithBgCopy
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
@@ -879,14 +879,14 @@ _080CA224:
|
||||
adds r0, r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5
|
||||
bl sub_8077720
|
||||
bl sub_80006F4
|
||||
bl GetWordTaskArg
|
||||
bl SetVBlankCallback
|
||||
b _080CA294
|
||||
_080CA24E:
|
||||
bl sub_80704D0
|
||||
bl UpdatePaletteFade
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080CA2D2
|
||||
@@ -919,7 +919,7 @@ _080CA280:
|
||||
str r2, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080CA294:
|
||||
ldrh r0, [r4]
|
||||
adds r0, 0x1
|
||||
@@ -929,7 +929,7 @@ _080CA294:
|
||||
_080CA29C: .4byte gUnknown_30030F0
|
||||
_080CA2A0: .4byte 0x00007fff
|
||||
_080CA2A4:
|
||||
bl sub_80704D0
|
||||
bl UpdatePaletteFade
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080CA2D2
|
||||
|
||||
+4
-4
@@ -53,7 +53,7 @@ _080A0E22:
|
||||
b _080A0E32
|
||||
_080A0E2A:
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _080A0E42
|
||||
_080A0E32:
|
||||
ldrb r1, [r1, 0x2]
|
||||
@@ -62,7 +62,7 @@ _080A0E32:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_8001EC0
|
||||
bl Unused_AdjustBgMosaic
|
||||
_080A0E42:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -75,7 +75,7 @@ sub_80A0E48: @ 80A0E48
|
||||
bl sub_80722CC
|
||||
ldr r0, _080A0E5C @ =sub_80A0DD8
|
||||
movs r1, 0x50
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -86,7 +86,7 @@ _080A0E5C: .4byte sub_80A0DD8
|
||||
sub_80A0E60: @ 80A0E60
|
||||
push {lr}
|
||||
ldr r0, _080A0E70 @ =sub_80A0DD8
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
|
||||
+13
-13
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80E5684
|
||||
sub_80E5684: @ 80E5684
|
||||
thumb_func_start hm_prepare_dive_probably
|
||||
hm_prepare_dive_probably: @ 80E5684
|
||||
push {r4-r6,lr}
|
||||
bl sub_811FB0C
|
||||
lsls r0, 24
|
||||
@@ -16,7 +16,7 @@ sub_80E5684: @ 80E5684
|
||||
ldr r4, _080E56D0 @ =gUnknown_2024284
|
||||
adds r0, r4
|
||||
movs r1, 0x3A
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r5, r0, 0
|
||||
lsls r5, 16
|
||||
lsrs r5, 16
|
||||
@@ -26,7 +26,7 @@ sub_80E5684: @ 80E5684
|
||||
muls r0, r6
|
||||
adds r0, r4
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
@@ -47,7 +47,7 @@ _080E56D6:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80E5684
|
||||
thumb_func_end hm_prepare_dive_probably
|
||||
|
||||
thumb_func_start sub_80E56DC
|
||||
sub_80E56DC: @ 80E56DC
|
||||
@@ -126,7 +126,7 @@ _080E5768:
|
||||
adds r6, r0, r1
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x39
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
cmp r4, 0
|
||||
@@ -135,7 +135,7 @@ _080E5768:
|
||||
beq _080E5796
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x3A
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
cmp r0, r4
|
||||
bne _080E57A4
|
||||
_080E5796:
|
||||
@@ -152,7 +152,7 @@ _080E57A4:
|
||||
muls r0, r1
|
||||
add r0, r9
|
||||
movs r1, 0x3A
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0x5
|
||||
bl __udivsi3
|
||||
adds r3, r0, 0
|
||||
@@ -195,7 +195,7 @@ sub_80E57E8: @ 80E57E8
|
||||
ldr r1, _080E5834 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
movs r1, 0x3A
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r1, 0x5
|
||||
bl __udivsi3
|
||||
adds r3, r0, 0
|
||||
@@ -231,7 +231,7 @@ sub_80E583C: @ 80E583C
|
||||
ldr r1, _080E5888 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
ldr r1, _080E588C @ =gUnknown_2021CD0
|
||||
bl sub_81202E0
|
||||
bl GetMonNickname
|
||||
ldr r4, _080E5890 @ =gUnknown_2021D18
|
||||
ldr r1, _080E5894 @ =gUnknown_8416F27
|
||||
adds r0, r4, 0
|
||||
@@ -240,7 +240,7 @@ sub_80E583C: @ 80E583C
|
||||
movs r1, 0
|
||||
bl sub_81202F8
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r1, _080E5898 @ =gUnknown_3005090
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
@@ -286,7 +286,7 @@ sub_80E58A0: @ 80E58A0
|
||||
movs r1, 0
|
||||
bl sub_810F4D8
|
||||
movs r0, 0x6
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8121D0C
|
||||
ldr r1, _080E58F8 @ =gUnknown_3005090
|
||||
@@ -346,7 +346,7 @@ sub_80E5934: @ 80E5934
|
||||
movs r1, 0
|
||||
bl sub_81202F8
|
||||
movs r0, 0x2
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
ldr r1, _080E5968 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
sub_80D07EC: @ 80D07EC
|
||||
push {r4,lr}
|
||||
movs r0, 0x8
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D0808
|
||||
movs r0, 0x61
|
||||
bl sub_80C97A8
|
||||
bl npc_before_player_of_type
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -29,7 +29,7 @@ _080D080C:
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
ldr r1, _080D0830 @ =gUnknown_3005024
|
||||
ldr r0, _080D0834 @ =sub_81248B0
|
||||
ldr r0, _080D0834 @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080D0838 @ =gUnknown_203B0C4
|
||||
ldr r0, _080D083C @ =sub_80D0840
|
||||
@@ -42,7 +42,7 @@ _080D0826:
|
||||
.align 2, 0
|
||||
_080D082C: .4byte gUnknown_20370D0
|
||||
_080D0830: .4byte gUnknown_3005024
|
||||
_080D0834: .4byte sub_81248B0
|
||||
_080D0834: .4byte hm_add_c3_launch_phase_2
|
||||
_080D0838: .4byte gUnknown_203B0C4
|
||||
_080D083C: .4byte sub_80D0840
|
||||
thumb_func_end sub_80D07EC
|
||||
@@ -56,7 +56,7 @@ sub_80D0840: @ 80D0840
|
||||
lsrs r0, 24
|
||||
str r0, [r1]
|
||||
ldr r0, _080D085C @ =gUnknown_81BE16E
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -67,7 +67,7 @@ _080D085C: .4byte gUnknown_81BE16E
|
||||
thumb_func_start sub_80D0860
|
||||
sub_80D0860: @ 80D0860
|
||||
push {lr}
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080D0894 @ =gUnknown_3005090
|
||||
@@ -86,7 +86,7 @@ sub_80D0860: @ 80D0860
|
||||
ldr r1, _080D08A0 @ =gUnknown_2024284
|
||||
adds r0, r1
|
||||
ldr r1, _080D08A4 @ =gUnknown_2021CD0
|
||||
bl sub_81202E0
|
||||
bl GetMonNickname
|
||||
movs r0, 0
|
||||
pop {r1}
|
||||
bx r1
|
||||
@@ -102,8 +102,8 @@ _080D08A4: .4byte gUnknown_2021CD0
|
||||
sub_80D08A8: @ 80D08A8
|
||||
push {lr}
|
||||
movs r0, 0x28
|
||||
bl sub_80837FC
|
||||
bl sub_8069B34
|
||||
bl FieldEffectActiveListRemove
|
||||
bl EnableBothScriptContexts
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80D08A8
|
||||
|
||||
+16
-16
@@ -21,7 +21,7 @@ _080DE0C4: .4byte gUnknown_203B0A0
|
||||
thumb_func_start sub_80DE0C8
|
||||
sub_80DE0C8: @ 80DE0C8
|
||||
ldr r1, _080DE0D8 @ =gUnknown_3005024
|
||||
ldr r0, _080DE0DC @ =sub_81248B0
|
||||
ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080DE0E0 @ =gUnknown_203B0C4
|
||||
ldr r0, _080DE0E4 @ =sub_80DE0E8
|
||||
@@ -30,7 +30,7 @@ sub_80DE0C8: @ 80DE0C8
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080DE0D8: .4byte gUnknown_3005024
|
||||
_080DE0DC: .4byte sub_81248B0
|
||||
_080DE0DC: .4byte hm_add_c3_launch_phase_2
|
||||
_080DE0E0: .4byte gUnknown_203B0C4
|
||||
_080DE0E4: .4byte sub_80DE0E8
|
||||
thumb_func_end sub_80DE0C8
|
||||
@@ -39,7 +39,7 @@ _080DE0E4: .4byte sub_80DE0E8
|
||||
sub_80DE0E8: @ 80DE0E8
|
||||
push {lr}
|
||||
movs r0, 0x33
|
||||
bl sub_8083444
|
||||
bl FieldEffectStart
|
||||
bl sub_811FB0C
|
||||
ldr r1, _080DE100 @ =gUnknown_20386E0
|
||||
lsls r0, 24
|
||||
@@ -55,7 +55,7 @@ _080DE100: .4byte gUnknown_20386E0
|
||||
sub_80DE104: @ 80DE104
|
||||
push {lr}
|
||||
bl sub_807B05C
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080DE12C @ =gUnknown_3005090
|
||||
@@ -84,7 +84,7 @@ sub_80DE134: @ 80DE134
|
||||
ldr r4, _080DE1B8 @ =gUnknown_203AAB0
|
||||
movs r0, 0x80
|
||||
lsls r0, 3
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
str r1, [r4]
|
||||
ldr r4, _080DE1BC @ =gUnknown_20371F8
|
||||
@@ -97,7 +97,7 @@ sub_80DE134: @ 80DE134
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl CpuFastSet
|
||||
bl sub_805C768
|
||||
bl GetPlayerAvatarObjectId
|
||||
ldr r2, _080DE1C4 @ =gUnknown_202063C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -116,10 +116,10 @@ sub_80DE134: @ 80DE134
|
||||
movs r1, 0x4
|
||||
movs r2, 0
|
||||
movs r3, 0x8
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080DE1C8 @ =sub_80DE1D0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080DE1CC @ =gUnknown_3005090
|
||||
@@ -130,7 +130,7 @@ sub_80DE134: @ 80DE134
|
||||
movs r0, 0
|
||||
strh r0, [r1, 0x8]
|
||||
movs r0, 0x33
|
||||
bl sub_80837FC
|
||||
bl FieldEffectActiveListRemove
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -176,9 +176,9 @@ sub_80DE1D0: @ 80DE1D0
|
||||
bne _080DE228
|
||||
ldr r0, _080DE224 @ =gUnknown_203AAB0
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _080DE26C
|
||||
.align 2, 0
|
||||
_080DE21C: .4byte gUnknown_3005098
|
||||
@@ -190,7 +190,7 @@ _080DE228:
|
||||
adds r0, r5, r0
|
||||
ldr r1, _080DE260 @ =sub_80DE274
|
||||
str r1, [r0]
|
||||
bl sub_805C768
|
||||
bl GetPlayerAvatarObjectId
|
||||
ldr r2, _080DE264 @ =gUnknown_202063C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -209,7 +209,7 @@ _080DE228:
|
||||
movs r1, 0x4
|
||||
movs r2, 0x8
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080DE26C
|
||||
.align 2, 0
|
||||
_080DE260: .4byte sub_80DE274
|
||||
@@ -243,11 +243,11 @@ sub_80DE274: @ 80DE274
|
||||
bl CpuFastSet
|
||||
bl sub_807B070
|
||||
ldr r0, [r4]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r0, _080DE2BC @ =gUnknown_81BE564
|
||||
bl sub_8069AE4
|
||||
bl ScriptContext1_SetupScript
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080DE2AA:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
@@ -10,7 +10,7 @@ sub_80F66F0: @ 80F66F0
|
||||
push {lr}
|
||||
ldr r0, _080F6708 @ =gUnknown_2036DFC
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl sub_80561FC
|
||||
bl is_light_level_1_2_3_or_6
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -21,7 +21,7 @@ sub_80F66F0: @ 80F66F0
|
||||
_080F6708: .4byte gUnknown_2036DFC
|
||||
_080F670C:
|
||||
ldr r1, _080F6720 @ =gUnknown_3005024
|
||||
ldr r0, _080F6724 @ =sub_81248B0
|
||||
ldr r0, _080F6724 @ =hm_add_c3_launch_phase_2
|
||||
str r0, [r1]
|
||||
ldr r1, _080F6728 @ =gUnknown_203B0C4
|
||||
ldr r0, _080F672C @ =sub_80F6730
|
||||
@@ -32,7 +32,7 @@ _080F671A:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080F6720: .4byte gUnknown_3005024
|
||||
_080F6724: .4byte sub_81248B0
|
||||
_080F6724: .4byte hm_add_c3_launch_phase_2
|
||||
_080F6728: .4byte gUnknown_203B0C4
|
||||
_080F672C: .4byte sub_80F6730
|
||||
thumb_func_end sub_80F66F0
|
||||
@@ -42,7 +42,7 @@ sub_80F6730: @ 80F6730
|
||||
push {lr}
|
||||
bl sub_8054D08
|
||||
movs r0, 0x3F
|
||||
bl sub_8083444
|
||||
bl FieldEffectStart
|
||||
bl sub_811FB0C
|
||||
ldr r1, _080F674C @ =gUnknown_20386E0
|
||||
lsls r0, 24
|
||||
@@ -57,7 +57,7 @@ _080F674C: .4byte gUnknown_20386E0
|
||||
thumb_func_start sub_80F6750
|
||||
sub_80F6750: @ 80F6750
|
||||
push {lr}
|
||||
bl sub_80C97FC
|
||||
bl oei_task_add
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F6778 @ =gUnknown_3005090
|
||||
@@ -83,7 +83,7 @@ _080F677C: .4byte sub_80F6780
|
||||
sub_80F6780: @ 80F6780
|
||||
push {lr}
|
||||
movs r0, 0x3F
|
||||
bl sub_80837FC
|
||||
bl FieldEffectActiveListRemove
|
||||
bl sub_8085B64
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+40
-40
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8000968
|
||||
sub_8000968: @ 8000968
|
||||
thumb_func_start InitGpuRegManager
|
||||
InitGpuRegManager: @ 8000968
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -48,10 +48,10 @@ _080009B0: .4byte gUnknown_30000C1
|
||||
_080009B4: .4byte gUnknown_30000C2
|
||||
_080009B8: .4byte gUnknown_3000000
|
||||
_080009BC: .4byte gUnknown_3000060
|
||||
thumb_func_end sub_8000968
|
||||
thumb_func_end InitGpuRegManager
|
||||
|
||||
thumb_func_start sub_80009C0
|
||||
sub_80009C0: @ 80009C0
|
||||
thumb_func_start CopyBufferedValueToGpuReg
|
||||
CopyBufferedValueToGpuReg: @ 80009C0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -85,10 +85,10 @@ _080009FA:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08000A00: .4byte gUnknown_3000000
|
||||
thumb_func_end sub_80009C0
|
||||
thumb_func_end CopyBufferedValueToGpuReg
|
||||
|
||||
thumb_func_start sub_8000A04
|
||||
sub_8000A04: @ 8000A04
|
||||
thumb_func_start CopyBufferedValuesToGpuRegs
|
||||
CopyBufferedValuesToGpuRegs: @ 8000A04
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _08000A30 @ =gUnknown_30000C0
|
||||
ldrb r0, [r0]
|
||||
@@ -101,7 +101,7 @@ _08000A10:
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0xFF
|
||||
beq _08000A28
|
||||
bl sub_80009C0
|
||||
bl CopyBufferedValueToGpuReg
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
adds r5, 0x1
|
||||
@@ -114,10 +114,10 @@ _08000A28:
|
||||
.align 2, 0
|
||||
_08000A30: .4byte gUnknown_30000C0
|
||||
_08000A34: .4byte gUnknown_3000060
|
||||
thumb_func_end sub_8000A04
|
||||
thumb_func_end CopyBufferedValuesToGpuRegs
|
||||
|
||||
thumb_func_start sub_8000A38
|
||||
sub_8000A38: @ 8000A38
|
||||
thumb_func_start SetGpuReg
|
||||
SetGpuReg: @ 8000A38
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -146,7 +146,7 @@ sub_8000A38: @ 8000A38
|
||||
beq _08000A82
|
||||
_08000A6C:
|
||||
adds r0, r4, 0
|
||||
bl sub_80009C0
|
||||
bl CopyBufferedValueToGpuReg
|
||||
b _08000AB4
|
||||
.align 2, 0
|
||||
_08000A74: .4byte gUnknown_3000000
|
||||
@@ -190,10 +190,10 @@ _08000AB4:
|
||||
.align 2, 0
|
||||
_08000ABC: .4byte gUnknown_30000C0
|
||||
_08000AC0: .4byte gUnknown_3000060
|
||||
thumb_func_end sub_8000A38
|
||||
thumb_func_end SetGpuReg
|
||||
|
||||
thumb_func_start sub_8000AC4
|
||||
sub_8000AC4: @ 8000AC4
|
||||
thumb_func_start GetGpuReg
|
||||
GetGpuReg: @ 8000AC4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -222,10 +222,10 @@ _08000AEC:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08000AF0: .4byte 0x04000006
|
||||
thumb_func_end sub_8000AC4
|
||||
thumb_func_end GetGpuReg
|
||||
|
||||
thumb_func_start sub_8000AF4
|
||||
sub_8000AF4: @ 8000AF4
|
||||
thumb_func_start SetGpuRegBits
|
||||
SetGpuRegBits: @ 8000AF4
|
||||
push {lr}
|
||||
adds r2, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -236,15 +236,15 @@ sub_8000AF4: @ 8000AF4
|
||||
orrs r1, r2
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08000B10: .4byte gUnknown_3000000
|
||||
thumb_func_end sub_8000AF4
|
||||
thumb_func_end SetGpuRegBits
|
||||
|
||||
thumb_func_start sub_8000B14
|
||||
sub_8000B14: @ 8000B14
|
||||
thumb_func_start ClearGpuRegBits
|
||||
ClearGpuRegBits: @ 8000B14
|
||||
push {lr}
|
||||
adds r2, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -255,15 +255,15 @@ sub_8000B14: @ 8000B14
|
||||
ldrh r1, [r1]
|
||||
lsrs r2, 16
|
||||
bics r1, r2
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08000B30: .4byte gUnknown_3000000
|
||||
thumb_func_end sub_8000B14
|
||||
thumb_func_end ClearGpuRegBits
|
||||
|
||||
thumb_func_start sub_8000B34
|
||||
sub_8000B34: @ 8000B34
|
||||
thumb_func_start SyncRegIE
|
||||
SyncRegIE: @ 8000B34
|
||||
push {r4,r5,lr}
|
||||
ldr r5, _08000B58 @ =gUnknown_30000C1
|
||||
ldrb r0, [r5]
|
||||
@@ -288,10 +288,10 @@ _08000B58: .4byte gUnknown_30000C1
|
||||
_08000B5C: .4byte 0x04000208
|
||||
_08000B60: .4byte 0x04000200
|
||||
_08000B64: .4byte gUnknown_30000C2
|
||||
thumb_func_end sub_8000B34
|
||||
thumb_func_end SyncRegIE
|
||||
|
||||
thumb_func_start sub_8000B68
|
||||
sub_8000B68: @ 8000B68
|
||||
thumb_func_start EnableInterrupts
|
||||
EnableInterrupts: @ 8000B68
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -302,16 +302,16 @@ sub_8000B68: @ 8000B68
|
||||
ldr r1, _08000B90 @ =gUnknown_30000C1
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl sub_8000B34
|
||||
bl SyncRegIE
|
||||
ldrh r0, [r4]
|
||||
bl sub_8000BC0
|
||||
bl UpdateRegDispstatIntrBits
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08000B8C: .4byte gUnknown_30000C2
|
||||
_08000B90: .4byte gUnknown_30000C1
|
||||
thumb_func_end sub_8000B68
|
||||
thumb_func_end EnableInterrupts
|
||||
|
||||
thumb_func_start sub_8000B94
|
||||
sub_8000B94: @ 8000B94
|
||||
@@ -325,9 +325,9 @@ sub_8000B94: @ 8000B94
|
||||
ldr r1, _08000BBC @ =gUnknown_30000C1
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl sub_8000B34
|
||||
bl SyncRegIE
|
||||
ldrh r0, [r4]
|
||||
bl sub_8000BC0
|
||||
bl UpdateRegDispstatIntrBits
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -336,14 +336,14 @@ _08000BB8: .4byte gUnknown_30000C2
|
||||
_08000BBC: .4byte gUnknown_30000C1
|
||||
thumb_func_end sub_8000B94
|
||||
|
||||
thumb_func_start sub_8000BC0
|
||||
sub_8000BC0: @ 8000BC0
|
||||
thumb_func_start UpdateRegDispstatIntrBits
|
||||
UpdateRegDispstatIntrBits: @ 8000BC0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
movs r0, 0x4
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
movs r2, 0x18
|
||||
ands r2, r0
|
||||
movs r1, 0x1
|
||||
@@ -363,11 +363,11 @@ _08000BEC:
|
||||
cmp r2, r1
|
||||
beq _08000BF6
|
||||
movs r0, 0x4
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_08000BF6:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8000BC0
|
||||
thumb_func_end UpdateRegDispstatIntrBits
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+167
-167
@@ -8,9 +8,9 @@
|
||||
thumb_func_start sub_80F1DAC
|
||||
sub_80F1DAC: @ 80F1DAC
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F1DAC
|
||||
@@ -18,11 +18,11 @@ sub_80F1DAC: @ 80F1DAC
|
||||
thumb_func_start sub_80F1DC0
|
||||
sub_80F1DC0: @ 80F1DC0
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl RunTasks
|
||||
bl sub_8002DE8
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F1DC0
|
||||
@@ -60,11 +60,11 @@ _080F1E18:
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl sub_80F3610
|
||||
bl SetVBlankCallback
|
||||
bl ClearVramOamPltt_LoadHofPal
|
||||
ldr r4, _080F1E44 @ =gUnknown_203AB3C
|
||||
ldr r0, _080F1E48 @ =0x00002008
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r0, _080F1E4C @ =gUnknown_30030F0
|
||||
movs r1, 0x87
|
||||
@@ -84,14 +84,14 @@ _080F1E50:
|
||||
_080F1E56:
|
||||
ldr r1, _080F1E80 @ =0x00003f42
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0xE2
|
||||
lsls r1, 3
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
bl sub_80F36F8
|
||||
ldr r0, _080F1E84 @ =gUnknown_203AB3C
|
||||
ldr r1, [r0]
|
||||
@@ -108,14 +108,14 @@ _080F1E88:
|
||||
cmp r4, 0
|
||||
bne _080F1EF0
|
||||
ldr r0, _080F1EBC @ =sub_80F1DAC
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
str r4, [sp]
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_080F1EAA:
|
||||
ldr r1, _080F1EC0 @ =gUnknown_30030F0
|
||||
movs r0, 0x87
|
||||
@@ -129,7 +129,7 @@ _080F1EAA:
|
||||
_080F1EBC: .4byte sub_80F1DAC
|
||||
_080F1EC0: .4byte gUnknown_30030F0
|
||||
_080F1EC4:
|
||||
bl sub_80704D0
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _080F1EE8 @ =gUnknown_2037AB8
|
||||
ldrb r1, [r0, 0x7]
|
||||
movs r0, 0x80
|
||||
@@ -137,10 +137,10 @@ _080F1EC4:
|
||||
cmp r0, 0
|
||||
bne _080F1EF0
|
||||
ldr r0, _080F1EEC @ =sub_80F1DC0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x8F
|
||||
lsls r0, 1
|
||||
bl sub_80722A0
|
||||
bl PlayBGM
|
||||
movs r0, 0
|
||||
b _080F1EF2
|
||||
.align 2, 0
|
||||
@@ -165,7 +165,7 @@ sub_80F1EFC: @ 80F1EFC
|
||||
bne _080F1F2C
|
||||
ldr r0, _080F1F34 @ =sub_80F1F74
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F1F38 @ =gUnknown_3005090
|
||||
@@ -176,7 +176,7 @@ sub_80F1EFC: @ 80F1EFC
|
||||
strh r4, [r1, 0x8]
|
||||
ldr r4, _080F1F3C @ =gUnknown_203AB38
|
||||
movs r0, 0x78
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
_080F1F2C:
|
||||
pop {r4}
|
||||
@@ -197,7 +197,7 @@ sub_80F1F40: @ 80F1F40
|
||||
bne _080F1F66
|
||||
ldr r0, _080F1F6C @ =sub_80F1F74
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F1F70 @ =gUnknown_3005090
|
||||
@@ -243,13 +243,13 @@ _080F1F98:
|
||||
adds r6, r1, r0
|
||||
adds r0, r6, 0
|
||||
movs r1, 0xB
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _080F2064
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r1, r9
|
||||
ldr r3, [r1]
|
||||
lsls r4, r7, 2
|
||||
@@ -267,14 +267,14 @@ _080F1F98:
|
||||
strh r1, [r3, 0x8]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r2, r9
|
||||
ldr r1, [r2]
|
||||
adds r1, r4
|
||||
str r0, [r1]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
mov r5, r9
|
||||
ldr r1, [r5]
|
||||
adds r1, 0x4
|
||||
@@ -282,7 +282,7 @@ _080F1F98:
|
||||
str r0, [r1]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x38
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r2, [r5]
|
||||
adds r2, r4
|
||||
lsls r0, 1
|
||||
@@ -294,7 +294,7 @@ _080F1F98:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
movs r2, 0
|
||||
mov r6, r8
|
||||
lsls r5, r6, 2
|
||||
@@ -558,7 +558,7 @@ sub_80F2220: @ 80F2220
|
||||
ldr r0, _080F2258 @ =sub_80F1F40
|
||||
str r0, [r1]
|
||||
movs r0, 0x3
|
||||
bl sub_80DA364
|
||||
bl TrySavingData
|
||||
movs r0, 0x30
|
||||
bl sub_80722CC
|
||||
ldr r1, _080F225C @ =gUnknown_3005090
|
||||
@@ -786,7 +786,7 @@ sub_80F23A0: @ 80F23A0
|
||||
lsls r0, r2, 23
|
||||
lsrs r0, 23
|
||||
movs r1, 0
|
||||
bl sub_8071DF0
|
||||
bl PlayCry1
|
||||
_080F23F6:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
@@ -794,7 +794,7 @@ _080F23F6:
|
||||
bl sub_80F3194
|
||||
movs r0, 0x78
|
||||
strh r0, [r5, 0xE]
|
||||
ldr r0, _080F2420 @ =sub_80F2424
|
||||
ldr r0, _080F2420 @ =Task_Hof_TryDisplayAnotherMon
|
||||
str r0, [r5]
|
||||
_080F2408:
|
||||
pop {r4-r6}
|
||||
@@ -805,11 +805,11 @@ _080F2410: .4byte gUnknown_3005090
|
||||
_080F2414: .4byte gUnknown_203AB38
|
||||
_080F2418: .4byte gUnknown_202063C
|
||||
_080F241C: .4byte 0x000001ff
|
||||
_080F2420: .4byte sub_80F2424
|
||||
_080F2420: .4byte Task_Hof_TryDisplayAnotherMon
|
||||
thumb_func_end sub_80F23A0
|
||||
|
||||
thumb_func_start sub_80F2424
|
||||
sub_80F2424: @ 80F2424
|
||||
thumb_func_start Task_Hof_TryDisplayAnotherMon
|
||||
Task_Hof_TryDisplayAnotherMon: @ 80F2424
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -885,7 +885,7 @@ _080F2468:
|
||||
movs r1, 0
|
||||
movs r2, 0xC
|
||||
movs r3, 0xC
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0
|
||||
ldrsh r1, [r6, r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -913,7 +913,7 @@ _080F24F4:
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
add r0, r12
|
||||
ldr r1, _080F2510 @ =sub_80F2514
|
||||
ldr r1, _080F2510 @ =Task_Hof_PaletteFadeAndPrintWelcomeText
|
||||
str r1, [r0]
|
||||
_080F2500:
|
||||
add sp, 0x4
|
||||
@@ -924,11 +924,11 @@ _080F2500:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F2510: .4byte sub_80F2514
|
||||
thumb_func_end sub_80F2424
|
||||
_080F2510: .4byte Task_Hof_PaletteFadeAndPrintWelcomeText
|
||||
thumb_func_end Task_Hof_TryDisplayAnotherMon
|
||||
|
||||
thumb_func_start sub_80F2514
|
||||
sub_80F2514: @ 80F2514
|
||||
thumb_func_start Task_Hof_PaletteFadeAndPrintWelcomeText
|
||||
Task_Hof_PaletteFadeAndPrintWelcomeText: @ 80F2514
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -940,7 +940,7 @@ sub_80F2514: @ 80F2514
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
movs r3, 0
|
||||
lsls r1, r4, 2
|
||||
adds r0, r1, r4
|
||||
@@ -1002,7 +1002,7 @@ _080F25A0: .4byte gUnknown_3005098
|
||||
_080F25A4: .4byte gUnknown_202063C
|
||||
_080F25A8: .4byte gUnknown_3005090
|
||||
_080F25AC: .4byte sub_80F25B0
|
||||
thumb_func_end sub_80F2514
|
||||
thumb_func_end Task_Hof_PaletteFadeAndPrintWelcomeText
|
||||
|
||||
thumb_func_start sub_80F25B0
|
||||
sub_80F25B0: @ 80F25B0
|
||||
@@ -1083,10 +1083,10 @@ _080F2630:
|
||||
movs r1, 0
|
||||
movs r2, 0xC
|
||||
movs r3, 0xC
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
@@ -1145,7 +1145,7 @@ _080F26BC:
|
||||
lsls r1, 24
|
||||
lsrs r1, 16
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_080F26CE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1161,13 +1161,13 @@ sub_80F26D4: @ 80F26D4
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x3
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r0, _080F2748 @ =gUnknown_300500C
|
||||
ldr r0, [r0]
|
||||
ldrb r0, [r0, 0x8]
|
||||
@@ -1197,7 +1197,7 @@ sub_80F26D4: @ 80F26D4
|
||||
bl sub_814FF2C
|
||||
movs r0, 0x78
|
||||
strh r0, [r4, 0xE]
|
||||
ldr r0, _080F275C @ =sub_80F2760
|
||||
ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo
|
||||
str r0, [r4]
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
@@ -1209,11 +1209,11 @@ _080F274C: .4byte 0x0000ffff
|
||||
_080F2750: .4byte gUnknown_3005090
|
||||
_080F2754: .4byte gUnknown_840C234
|
||||
_080F2758: .4byte 0x0000021d
|
||||
_080F275C: .4byte sub_80F2760
|
||||
_080F275C: .4byte Task_Hof_WaitAndPrintPlayerInfo
|
||||
thumb_func_end sub_80F26D4
|
||||
|
||||
thumb_func_start sub_80F2760
|
||||
sub_80F2760: @ 80F2760
|
||||
thumb_func_start Task_Hof_WaitAndPrintPlayerInfo
|
||||
Task_Hof_WaitAndPrintPlayerInfo: @ 80F2760
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x10
|
||||
lsls r0, 24
|
||||
@@ -1259,7 +1259,7 @@ _080F27AC:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
bl sub_80F33DC
|
||||
@@ -1281,7 +1281,7 @@ _080F27AC:
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
ldr r0, _080F2800 @ =sub_80F2804
|
||||
ldr r0, _080F2800 @ =Task_Hof_ExitOnKeyPressed
|
||||
str r0, [r4]
|
||||
_080F27F4:
|
||||
add sp, 0x10
|
||||
@@ -1290,11 +1290,11 @@ _080F27F4:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F27FC: .4byte gUnknown_84160C8
|
||||
_080F2800: .4byte sub_80F2804
|
||||
thumb_func_end sub_80F2760
|
||||
_080F2800: .4byte Task_Hof_ExitOnKeyPressed
|
||||
thumb_func_end Task_Hof_WaitAndPrintPlayerInfo
|
||||
|
||||
thumb_func_start sub_80F2804
|
||||
sub_80F2804: @ 80F2804
|
||||
thumb_func_start Task_Hof_ExitOnKeyPressed
|
||||
Task_Hof_ExitOnKeyPressed: @ 80F2804
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -1305,13 +1305,13 @@ sub_80F2804: @ 80F2804
|
||||
cmp r0, 0
|
||||
beq _080F282A
|
||||
movs r0, 0x4
|
||||
bl sub_8071DBC
|
||||
bl FadeOutBGM
|
||||
ldr r0, _080F2834 @ =gUnknown_3005090
|
||||
lsls r1, r4, 2
|
||||
adds r1, r4
|
||||
lsls r1, 3
|
||||
adds r1, r0
|
||||
ldr r0, _080F2838 @ =sub_80F283C
|
||||
ldr r0, _080F2838 @ =Task_Hof_HandlePaletteOnExit
|
||||
str r0, [r1]
|
||||
_080F282A:
|
||||
pop {r4}
|
||||
@@ -1320,11 +1320,11 @@ _080F282A:
|
||||
.align 2, 0
|
||||
_080F2830: .4byte gUnknown_30030F0
|
||||
_080F2834: .4byte gUnknown_3005090
|
||||
_080F2838: .4byte sub_80F283C
|
||||
thumb_func_end sub_80F2804
|
||||
_080F2838: .4byte Task_Hof_HandlePaletteOnExit
|
||||
thumb_func_end Task_Hof_ExitOnKeyPressed
|
||||
|
||||
thumb_func_start sub_80F283C
|
||||
sub_80F283C: @ 80F283C
|
||||
thumb_func_start Task_Hof_HandlePaletteOnExit
|
||||
Task_Hof_HandlePaletteOnExit: @ 80F283C
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
adds r4, r0, 0
|
||||
@@ -1342,13 +1342,13 @@ sub_80F283C: @ 80F283C
|
||||
movs r1, 0x8
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r1, _080F2884 @ =gUnknown_3005090
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
lsls r0, 3
|
||||
adds r0, r1
|
||||
ldr r1, _080F2888 @ =sub_80F288C
|
||||
ldr r1, _080F2888 @ =Task_Hof_HandleExit
|
||||
str r1, [r0]
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
@@ -1358,11 +1358,11 @@ sub_80F283C: @ 80F283C
|
||||
_080F287C: .4byte gUnknown_20375F8
|
||||
_080F2880: .4byte gUnknown_20371F8
|
||||
_080F2884: .4byte gUnknown_3005090
|
||||
_080F2888: .4byte sub_80F288C
|
||||
thumb_func_end sub_80F283C
|
||||
_080F2888: .4byte Task_Hof_HandleExit
|
||||
thumb_func_end Task_Hof_HandlePaletteOnExit
|
||||
|
||||
thumb_func_start sub_80F288C
|
||||
sub_80F288C: @ 80F288C
|
||||
thumb_func_start Task_Hof_HandleExit
|
||||
Task_Hof_HandleExit: @ 80F288C
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -1396,25 +1396,25 @@ _080F28B6:
|
||||
ldrh r0, [r1, 0x10]
|
||||
bl sub_810C2E8
|
||||
movs r0, 0
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
movs r0, 0x3
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
bl sub_8003ECC
|
||||
movs r0, 0x1
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
movs r0, 0x3
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r4, _080F292C @ =gUnknown_203AB3C
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _080F290A
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
_080F290A:
|
||||
@@ -1422,7 +1422,7 @@ _080F290A:
|
||||
ldr r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _080F291A
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
movs r0, 0
|
||||
str r0, [r4]
|
||||
_080F291A:
|
||||
@@ -1436,7 +1436,7 @@ _080F2924: .4byte gUnknown_2037AB8
|
||||
_080F2928: .4byte gUnknown_3005090
|
||||
_080F292C: .4byte gUnknown_203AB3C
|
||||
_080F2930: .4byte gUnknown_203AB38
|
||||
thumb_func_end sub_80F288C
|
||||
thumb_func_end Task_Hof_HandleExit
|
||||
|
||||
thumb_func_start sub_80F2934
|
||||
sub_80F2934: @ 80F2934
|
||||
@@ -1458,7 +1458,7 @@ sub_80F2934: @ 80F2934
|
||||
movs r0, 0x3
|
||||
movs r1, 0x9
|
||||
movs r3, 0xB
|
||||
bl sub_805538C
|
||||
bl Overworld_SetWarpDestination
|
||||
bl sub_807E438
|
||||
bl sub_80559E4
|
||||
add sp, 0x4
|
||||
@@ -1497,11 +1497,11 @@ _080F299C:
|
||||
.4byte _080F2A58
|
||||
_080F29B4:
|
||||
movs r0, 0
|
||||
bl sub_80006F4
|
||||
bl sub_80F3610
|
||||
bl SetVBlankCallback
|
||||
bl ClearVramOamPltt_LoadHofPal
|
||||
ldr r4, _080F29D8 @ =gUnknown_203AB3C
|
||||
ldr r0, _080F29DC @ =0x00002008
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r0, _080F29E0 @ =gUnknown_30030F0
|
||||
movs r1, 0x87
|
||||
@@ -1520,13 +1520,13 @@ _080F29E4:
|
||||
_080F29EA:
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
bl sub_80F36F8
|
||||
b _080F2A42
|
||||
_080F2A08:
|
||||
@@ -1539,15 +1539,15 @@ _080F2A08:
|
||||
movs r2, 0
|
||||
bl sub_80A0A48
|
||||
ldr r0, _080F2A24 @ =sub_80F1DAC
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
b _080F2A42
|
||||
.align 2, 0
|
||||
_080F2A24: .4byte sub_80F1DAC
|
||||
_080F2A28:
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
bl sub_80A0A98
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@@ -1566,24 +1566,24 @@ _080F2A54: .4byte gUnknown_30030F0
|
||||
_080F2A58:
|
||||
ldr r1, _080F2A94 @ =0x00003f42
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0xE2
|
||||
lsls r1, 3
|
||||
movs r0, 0x52
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080F2A98 @ =sub_80F2AA4
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r4, _080F2A9C @ =gUnknown_203AB38
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r0, _080F2AA0 @ =sub_80F1DC0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080F2A8C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1868,7 +1868,7 @@ _080F2CB4:
|
||||
ldr r0, _080F2D08 @ =0xffff0000
|
||||
ldr r2, _080F2D0C @ =0x00007716
|
||||
movs r1, 0xC
|
||||
bl sub_80714D4
|
||||
bl BlendPalettes
|
||||
ldr r0, _080F2D10 @ =gUnknown_2021CD0
|
||||
ldr r1, _080F2D14 @ =gUnknown_3005090
|
||||
ldr r4, [sp, 0x14]
|
||||
@@ -2034,7 +2034,7 @@ _080F2DD0:
|
||||
str r0, [r2]
|
||||
ldr r2, _080F2E80 @ =0x00007716
|
||||
movs r1, 0xC
|
||||
bl sub_8071510
|
||||
bl BlendPalettesUnfaded
|
||||
movs r0, 0xC
|
||||
ldrsh r1, [r6, r0]
|
||||
lsls r0, r1, 2
|
||||
@@ -2048,12 +2048,12 @@ _080F2DD0:
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
beq _080F2E4A
|
||||
bl sub_80721C4
|
||||
bl StopCryAndClearCrySongs
|
||||
ldrh r0, [r4, 0x8]
|
||||
lsls r0, 23
|
||||
lsrs r0, 23
|
||||
movs r1, 0
|
||||
bl sub_8071DF0
|
||||
bl PlayCry1
|
||||
_080F2E4A:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
@@ -2146,11 +2146,11 @@ _080F2F00: .4byte gUnknown_30030F0
|
||||
_080F2F04: .4byte gUnknown_3005090
|
||||
_080F2F08: .4byte sub_80F2B6C
|
||||
_080F2F0C:
|
||||
bl sub_80721F0
|
||||
bl IsCryPlayingOrClearCrySongs
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F2F26
|
||||
bl sub_80721C4
|
||||
bl StopCryAndClearCrySongs
|
||||
ldr r0, _080F2F2C @ =gMPlay_BGM
|
||||
ldr r1, _080F2F30 @ =0x0000ffff
|
||||
movs r2, 0x80
|
||||
@@ -2169,11 +2169,11 @@ _080F2F38:
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080F2F7C
|
||||
bl sub_80721F0
|
||||
bl IsCryPlayingOrClearCrySongs
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F2F5A
|
||||
bl sub_80721C4
|
||||
bl StopCryAndClearCrySongs
|
||||
ldr r0, _080F2F6C @ =gMPlay_BGM
|
||||
ldr r1, _080F2F70 @ =0x0000ffff
|
||||
movs r2, 0x80
|
||||
@@ -2293,33 +2293,33 @@ sub_80F3030: @ 80F3030
|
||||
cmp r4, 0
|
||||
bne _080F3094
|
||||
movs r0, 0
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
movs r0, 0x3
|
||||
bl sub_80019D0
|
||||
bl HideBg
|
||||
bl sub_810F740
|
||||
bl sub_8003ECC
|
||||
movs r0, 0x1
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
movs r0, 0x3
|
||||
bl sub_8001FD4
|
||||
bl UnsetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r5, _080F309C @ =gUnknown_203AB3C
|
||||
ldr r0, [r5]
|
||||
cmp r0, 0
|
||||
beq _080F3082
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r4, [r5]
|
||||
_080F3082:
|
||||
ldr r5, _080F30A0 @ =gUnknown_203AB38
|
||||
ldr r0, [r5]
|
||||
cmp r0, 0
|
||||
beq _080F3090
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
str r4, [r5]
|
||||
_080F3090:
|
||||
bl sub_80CA5A0
|
||||
@@ -2425,9 +2425,9 @@ sub_80F313C: @ 80F313C
|
||||
lsrs r4, 24
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldr r0, _080F3190 @ =gUnknown_840C23C
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -2458,9 +2458,9 @@ sub_80F3194: @ 80F3194
|
||||
adds r7, r0, 0
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrh r0, [r7, 0x8]
|
||||
ldr r1, _080F3214 @ =0x000001ff
|
||||
ands r1, r0
|
||||
@@ -2471,7 +2471,7 @@ sub_80F3194: @ 80F3194
|
||||
add r4, sp, 0x1C
|
||||
ldr r1, _080F3218 @ =gUnknown_84160EC
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldrh r0, [r7, 0x8]
|
||||
lsls r0, 23
|
||||
lsrs r0, 23
|
||||
@@ -2524,7 +2524,7 @@ _080F322E:
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x3]
|
||||
mov r0, r8
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
ldr r0, _080F32B8 @ =gUnknown_840C23C
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -2626,7 +2626,7 @@ _080F32C4:
|
||||
muls r1, r2
|
||||
ldr r2, _080F3324 @ =gUnknown_8245EE0
|
||||
adds r1, r2
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r6, r0, 0
|
||||
ldrh r1, [r7, 0x8]
|
||||
adds r0, r4, 0
|
||||
@@ -2646,7 +2646,7 @@ _080F3328:
|
||||
lsls r0, r1, 23
|
||||
lsrs r0, 23
|
||||
ldr r1, [r7, 0x4]
|
||||
bl sub_803F78C
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
@@ -2679,7 +2679,7 @@ _080F3348:
|
||||
bl sub_812E51C
|
||||
ldr r1, _080F33D4 @ =gUnknown_84160F4
|
||||
add r0, sp, 0xC
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r6, r0, 0
|
||||
ldrb r1, [r7, 0x9]
|
||||
lsrs r1, 1
|
||||
@@ -2697,7 +2697,7 @@ _080F3348:
|
||||
bl sub_812E51C
|
||||
ldr r1, _080F33D8 @ =gUnknown_8416104
|
||||
add r0, sp, 0xC
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r6, r0, 0
|
||||
ldrh r1, [r7]
|
||||
movs r2, 0x2
|
||||
@@ -2743,14 +2743,14 @@ sub_80F33DC: @ 80F33DC
|
||||
str r0, [sp, 0x28]
|
||||
movs r0, 0x1
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldr r2, _080F35F0 @ =0x0000021d
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r3, 0xD
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
movs r7, 0
|
||||
str r7, [sp]
|
||||
str r7, [sp, 0x4]
|
||||
@@ -2981,8 +2981,8 @@ _080F3608: .4byte 0x00002710
|
||||
_080F360C: .4byte gUnknown_8415CE8
|
||||
thumb_func_end sub_80F33DC
|
||||
|
||||
thumb_func_start sub_80F3610
|
||||
sub_80F3610: @ 80F3610
|
||||
thumb_func_start ClearVramOamPltt_LoadHofPal
|
||||
ClearVramOamPltt_LoadHofPal: @ 80F3610
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -3050,11 +3050,11 @@ _080F3636:
|
||||
orrs r3, r0
|
||||
str r3, [r2, 0x8]
|
||||
ldr r0, [r2, 0x8]
|
||||
bl sub_8070528
|
||||
bl ResetPaletteFade
|
||||
ldr r0, _080F36B8 @ =gUnknown_840C39C
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -3065,24 +3065,24 @@ _080F3636:
|
||||
_080F36B0: .4byte 0x040000d4
|
||||
_080F36B4: .4byte 0x81000800
|
||||
_080F36B8: .4byte gUnknown_840C39C
|
||||
thumb_func_end sub_80F3610
|
||||
thumb_func_end ClearVramOamPltt_LoadHofPal
|
||||
|
||||
thumb_func_start sub_80F36BC
|
||||
sub_80F36BC: @ 80F36BC
|
||||
push {lr}
|
||||
bl sub_8087E64
|
||||
bl sub_80773BC
|
||||
bl sub_8006B10
|
||||
bl sub_80F6808
|
||||
bl sub_810BB8C
|
||||
bl sub_80088F0
|
||||
bl remove_some_task
|
||||
bl ResetTasks
|
||||
bl ResetSpriteData
|
||||
bl reset_temp_tile_data_buffers
|
||||
bl dp13_810BB8C
|
||||
bl FreeAllSpritePalettes
|
||||
ldr r1, _080F36EC @ =gUnknown_3003E58
|
||||
movs r0, 0x8
|
||||
strb r0, [r1]
|
||||
ldr r0, _080F36F0 @ =gUnknown_840C248
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
ldr r0, _080F36F4 @ =gUnknown_840C258
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -3104,36 +3104,36 @@ sub_80F36F8: @ 80F36F8
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x6
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
ldr r1, [r4]
|
||||
ldr r0, _080F376C @ =0x00001006
|
||||
adds r1, r0
|
||||
movs r0, 0x3
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001B90
|
||||
bl ChangeBgX
|
||||
movs r0, 0x3
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8001D08
|
||||
bl ChangeBgY
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -3174,12 +3174,12 @@ _080F37A4:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80F6878
|
||||
bl decompress_and_copy_tile_data_to_vram
|
||||
b _080F3854
|
||||
.align 2, 0
|
||||
_080F37B8: .4byte gUnknown_840C3BC
|
||||
_080F37BC:
|
||||
bl sub_80F682C
|
||||
bl free_temp_tile_data_buffers_if_possible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F3854
|
||||
@@ -3193,7 +3193,7 @@ _080F37C8:
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
str r4, [sp]
|
||||
movs r0, 0xB
|
||||
str r0, [sp, 0x4]
|
||||
@@ -3201,7 +3201,7 @@ _080F37C8:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x3
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
str r4, [sp]
|
||||
movs r0, 0x6
|
||||
str r0, [sp, 0x4]
|
||||
@@ -3209,18 +3209,18 @@ _080F37C8:
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0xE
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
str r4, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
movs r0, 0x3
|
||||
movs r1, 0x2
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002454
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x3
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b _080F3854
|
||||
_080F381E:
|
||||
bl sub_80F6C6C
|
||||
@@ -3230,13 +3230,13 @@ _080F3828:
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x3
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r0, _080F3850 @ =gUnknown_203AB3C
|
||||
ldr r1, [r0]
|
||||
movs r0, 0
|
||||
@@ -3337,7 +3337,7 @@ sub_80F38D8: @ 80F38D8
|
||||
cmp r0, 0x78
|
||||
ble _080F38EE
|
||||
adds r0, r5, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
b _080F3926
|
||||
_080F38EE:
|
||||
adds r0, r1, 0x1
|
||||
@@ -3347,7 +3347,7 @@ _080F38EE:
|
||||
ldrh r4, [r5, 0x2E]
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x3
|
||||
@@ -3379,7 +3379,7 @@ _080F392C: .4byte gUnknown_825E074
|
||||
thumb_func_start sub_80F3930
|
||||
sub_80F3930: @ 80F3930
|
||||
push {r4,lr}
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0xF0
|
||||
@@ -3387,7 +3387,7 @@ sub_80F3930: @ 80F3930
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
adds r2, r0, 0
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
@@ -3401,7 +3401,7 @@ sub_80F3930: @ 80F3930
|
||||
asrs r2, 16
|
||||
adds r1, r4, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 4
|
||||
@@ -3409,7 +3409,7 @@ sub_80F3930: @ 80F3930
|
||||
lsls r1, 2
|
||||
ldr r0, _080F39A4 @ =gUnknown_202063C
|
||||
adds r4, r1, r0
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x11
|
||||
@@ -3418,8 +3418,8 @@ sub_80F3930: @ 80F3930
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_800838C
|
||||
bl sub_8044EC8
|
||||
bl StartSpriteAnim
|
||||
bl Random
|
||||
movs r1, 0x3
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
|
||||
+27
-27
@@ -124,7 +124,7 @@ _0813B968:
|
||||
strh r0, [r1]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0813B990 @ =gUnknown_203F178
|
||||
movs r0, 0x2
|
||||
b _0813BB22
|
||||
@@ -137,19 +137,19 @@ _0813B994:
|
||||
lsls r2, 7
|
||||
movs r0, 0
|
||||
movs r3, 0
|
||||
bl sub_8000F44
|
||||
bl RequestDma3Fill
|
||||
ldr r0, _0813B9C8 @ =gUnknown_8464128
|
||||
movs r1, 0xA0
|
||||
lsls r1, 19
|
||||
movs r2, 0x20
|
||||
movs r3, 0
|
||||
bl sub_8000EAC
|
||||
bl RequestDma3Copy
|
||||
ldr r0, _0813B9CC @ =gUnknown_8464008
|
||||
ldr r1, _0813B9D0 @ =gUnknown_201FEE0
|
||||
movs r2, 0x90
|
||||
lsls r2, 1
|
||||
movs r3, 0
|
||||
bl sub_8000EAC
|
||||
bl RequestDma3Copy
|
||||
ldr r1, _0813B9D4 @ =gUnknown_203F178
|
||||
movs r0, 0x3
|
||||
b _0813BB22
|
||||
@@ -200,20 +200,20 @@ _0813BA3C: .4byte gUnknown_203F178
|
||||
_0813BA40:
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0813BA70 @ =0x00001f0c
|
||||
movs r0, 0x8
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r1, _0813BA74 @ =gUnknown_203F178
|
||||
movs r0, 0x5
|
||||
b _0813BB22
|
||||
@@ -239,7 +239,7 @@ _0813BA9C: .4byte gUnknown_203F178
|
||||
_0813BAA0:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
bl sub_813BC2C
|
||||
movs r1, 0
|
||||
ldr r5, _0813BAD0 @ =0x000001ff
|
||||
@@ -340,20 +340,20 @@ _0813BB70: .4byte 0x00007fff
|
||||
sub_813BB74: @ 813BB74
|
||||
push {r4,lr}
|
||||
movs r0, 0
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
ldr r4, _0813BBA8 @ =gUnknown_203F178
|
||||
strh r0, [r4, 0x8]
|
||||
movs r0, 0x8
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xA]
|
||||
movs r0, 0x10
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xC]
|
||||
movs r0, 0x12
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0xE]
|
||||
movs r0, 0x50
|
||||
bl sub_8000AC4
|
||||
bl GetGpuReg
|
||||
strh r0, [r4, 0x10]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -370,7 +370,7 @@ sub_813BBAC: @ 813BBAC
|
||||
movs r2, 0x80
|
||||
lsls r2, 7
|
||||
movs r3, 0
|
||||
bl sub_8000EAC
|
||||
bl RequestDma3Copy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -411,19 +411,19 @@ sub_813BBF4: @ 813BBF4
|
||||
ldr r4, _0813BC28 @ =gUnknown_203F178
|
||||
ldrh r1, [r4, 0x10]
|
||||
movs r0, 0x50
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xC]
|
||||
movs r0, 0x10
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xE]
|
||||
movs r0, 0x12
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0xA]
|
||||
movs r0, 0x8
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldrh r1, [r4, 0x8]
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -439,7 +439,7 @@ sub_813BC2C: @ 813BC2C
|
||||
movs r2, 0x80
|
||||
lsls r2, 7
|
||||
movs r3, 0
|
||||
bl sub_8000EAC
|
||||
bl RequestDma3Copy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -468,7 +468,7 @@ sub_813BC5C: @ 813BC5C
|
||||
movs r2, 0x80
|
||||
lsls r2, 7
|
||||
movs r3, 0
|
||||
bl sub_8000EAC
|
||||
bl RequestDma3Copy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1319,7 +1319,7 @@ _0813C2D4:
|
||||
add r9, r0
|
||||
adds r6, r1, 0
|
||||
adds r0, r6, 0
|
||||
bl sub_8006418
|
||||
bl GetKeypadIconTileOffset
|
||||
lsls r0, 24
|
||||
lsrs r0, 19
|
||||
ldr r1, _0813C344 @ =gUnknown_81EA700
|
||||
@@ -1341,12 +1341,12 @@ _0813C2D4:
|
||||
lsls r0, r2, 3
|
||||
strh r0, [r5, 0x6]
|
||||
adds r0, r6, 0
|
||||
bl sub_8006428
|
||||
bl GetKeypadIconWidth
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r6, 0
|
||||
bl sub_8006438
|
||||
bl GetKeypadIconHeight
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r7, [sp]
|
||||
@@ -1362,7 +1362,7 @@ _0813C2D4:
|
||||
movs r3, 0
|
||||
bl sub_8004AA4
|
||||
adds r0, r6, 0
|
||||
bl sub_8006428
|
||||
bl GetKeypadIconWidth
|
||||
b _0813C38E
|
||||
.align 2, 0
|
||||
_0813C344: .4byte gUnknown_81EA700
|
||||
|
||||
@@ -235,7 +235,7 @@ sub_812B35C: @ 812B35C
|
||||
push {lr}
|
||||
bl sub_812B4B8
|
||||
movs r0, 0x8
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0812B376
|
||||
@@ -253,7 +253,7 @@ _0812B376:
|
||||
_0812B388:
|
||||
ldr r0, _0812B3B0 @ =gUnknown_2036DFC
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl sub_805621C
|
||||
bl is_light_level_8_or_9
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0812B400
|
||||
@@ -282,7 +282,7 @@ _0812B3B8:
|
||||
bl sub_812B1F0
|
||||
b _0812B406
|
||||
_0812B3C8:
|
||||
bl sub_810B73C
|
||||
bl IsCurMapPokeCenter
|
||||
cmp r0, 0x1
|
||||
bne _0812B3D8
|
||||
movs r0, 0x10
|
||||
|
||||
+12
-12
@@ -20,9 +20,9 @@ sub_80CA53C: @ 80CA53C
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _080CA570 @ =sub_80F2978
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080CA564:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -42,11 +42,11 @@ sub_80CA574: @ 80CA574
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl sub_8069940
|
||||
bl BeginNormalPaletteFade
|
||||
bl ScriptContext2_Enable
|
||||
ldr r0, _080CA59C @ =sub_80CA53C
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -57,15 +57,15 @@ _080CA59C: .4byte sub_80CA53C
|
||||
thumb_func_start sub_80CA5A0
|
||||
sub_80CA5A0: @ 80CA5A0
|
||||
push {lr}
|
||||
ldr r0, _080CA5B4 @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
ldr r0, _080CA5B4 @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
ldr r1, _080CA5B8 @ =gUnknown_3005020
|
||||
ldr r0, _080CA5BC @ =sub_80CA5C0
|
||||
str r0, [r1]
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080CA5B4: .4byte sub_80567DC
|
||||
_080CA5B4: .4byte c2_exit_to_overworld_2_switch
|
||||
_080CA5B8: .4byte gUnknown_3005020
|
||||
_080CA5BC: .4byte sub_80CA5C0
|
||||
thumb_func_end sub_80CA5A0
|
||||
@@ -74,7 +74,7 @@ _080CA5BC: .4byte sub_80CA5C0
|
||||
sub_80CA5C0: @ 80CA5C0
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
bl sub_8055DC4
|
||||
bl sub_809D040
|
||||
bl sub_809D254
|
||||
@@ -84,10 +84,10 @@ sub_80CA5C0: @ 80CA5C0
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080CA5F4 @ =sub_80CA5F8
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -107,7 +107,7 @@ sub_80CA5F8: @ 80CA5F8
|
||||
cmp r0, 0
|
||||
bne _080CA610
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080CA610:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+282
-282
File diff suppressed because it is too large
Load Diff
+93
-93
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8099DA0
|
||||
sub_8099DA0: @ 8099DA0
|
||||
thumb_func_start GetBagItemQuantity
|
||||
GetBagItemQuantity: @ 8099DA0
|
||||
adds r1, r0, 0
|
||||
ldr r0, _08099DB8 @ =gUnknown_300500C
|
||||
ldr r0, [r0]
|
||||
@@ -21,7 +21,7 @@ sub_8099DA0: @ 8099DA0
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08099DB8: .4byte gUnknown_300500C
|
||||
thumb_func_end sub_8099DA0
|
||||
thumb_func_end GetBagItemQuantity
|
||||
|
||||
thumb_func_start sub_8099DBC
|
||||
sub_8099DBC: @ 8099DBC
|
||||
@@ -161,18 +161,18 @@ sub_8099E90: @ 8099E90
|
||||
bl sub_809C8A0
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, _08099EB4 @ =gUnknown_84162BD
|
||||
adds r0, r4, 0
|
||||
bl sub_8008DA4
|
||||
bl StringAppend
|
||||
b _08099EC4
|
||||
.align 2, 0
|
||||
_08099EB4: .4byte gUnknown_84162BD
|
||||
_08099EB8:
|
||||
bl sub_809A8BC
|
||||
bl ItemId_GetItem
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_08099EC4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -260,7 +260,7 @@ sub_8099F40: @ 8099F40
|
||||
lsls r1, 16
|
||||
lsrs r5, r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08099F5C
|
||||
@@ -270,7 +270,7 @@ _08099F58:
|
||||
b _08099FA6
|
||||
_08099F5C:
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
movs r2, 0
|
||||
@@ -289,7 +289,7 @@ _08099F76:
|
||||
cmp r0, r4
|
||||
bne _08099F98
|
||||
adds r0, r1, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, r5
|
||||
@@ -368,12 +368,12 @@ sub_809A000: @ 809A000
|
||||
lsls r1, 16
|
||||
lsrs r6, r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0809A050
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -393,7 +393,7 @@ _0809A032:
|
||||
cmp r0, r4
|
||||
bne _0809A05C
|
||||
adds r0, r1, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r0, r6
|
||||
@@ -441,14 +441,14 @@ sub_809A084: @ 809A084
|
||||
lsrs r1, 16
|
||||
mov r8, r1
|
||||
adds r0, r6, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0809A0A2
|
||||
b _0809A1CA
|
||||
_0809A0A2:
|
||||
adds r0, r6, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
@@ -468,7 +468,7 @@ _0809A0BE:
|
||||
cmp r0, r6
|
||||
bne _0809A0E8
|
||||
adds r0, r1, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r2, r8
|
||||
@@ -605,14 +605,14 @@ sub_809A1D8: @ 809A1D8
|
||||
lsls r1, 16
|
||||
lsrs r7, r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0809A258
|
||||
cmp r4, 0
|
||||
beq _0809A258
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
movs r2, 0
|
||||
@@ -631,7 +631,7 @@ _0809A20C:
|
||||
cmp r0, r4
|
||||
bne _0809A24C
|
||||
adds r0, r1, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, r7
|
||||
@@ -674,7 +674,7 @@ sub_809A260: @ 809A260
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -1149,7 +1149,7 @@ _0809A59E:
|
||||
adds r5, r1, r0
|
||||
_0809A5B0:
|
||||
adds r0, r5, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _0809A5C6
|
||||
@@ -1204,7 +1204,7 @@ _0809A604:
|
||||
bne _0809A622
|
||||
adds r0, r2, 0x2
|
||||
str r3, [sp]
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
ldr r3, [sp]
|
||||
cmp r0, 0
|
||||
@@ -1217,7 +1217,7 @@ _0809A622:
|
||||
bls _0809A66A
|
||||
adds r0, r1, 0x2
|
||||
str r3, [sp]
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
ldr r3, [sp]
|
||||
cmp r0, 0
|
||||
@@ -1240,7 +1240,7 @@ _0809A642:
|
||||
bne _0809A640
|
||||
adds r0, r1, 0x2
|
||||
str r3, [sp]
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
ldr r3, [sp]
|
||||
cmp r0, 0
|
||||
@@ -1268,7 +1268,7 @@ _0809A688:
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
ldr r1, [r5]
|
||||
adds r4, r1
|
||||
strh r0, [r4, 0x2]
|
||||
@@ -1281,7 +1281,7 @@ _0809A688:
|
||||
_0809A6A6:
|
||||
ldrb r0, [r5, 0x4]
|
||||
lsls r0, 2
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
mov r8, r0
|
||||
ldr r0, [r5]
|
||||
adds r0, r7
|
||||
@@ -1324,7 +1324,7 @@ _0809A6EA:
|
||||
bcc _0809A6EA
|
||||
_0809A704:
|
||||
mov r0, r8
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0809A70A:
|
||||
add sp, 0x4
|
||||
pop {r3-r5}
|
||||
@@ -1358,7 +1358,7 @@ _0809A73A:
|
||||
ldr r0, [r6]
|
||||
adds r0, r7
|
||||
adds r0, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsls r4, r5, 2
|
||||
cmp r0, 0
|
||||
@@ -1366,7 +1366,7 @@ _0809A73A:
|
||||
ldr r0, [r6]
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
beq _0809A774
|
||||
@@ -1434,7 +1434,7 @@ sub_809A7B4: @ 809A7B4
|
||||
ldr r0, [r0]
|
||||
adds r0, r1
|
||||
adds r0, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
pop {r1}
|
||||
@@ -1449,7 +1449,7 @@ sub_809A7DC: @ 809A7DC
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 21
|
||||
ldr r1, _0809A7F4 @ =gUnknown_2039884
|
||||
@@ -1466,7 +1466,7 @@ _0809A7F8:
|
||||
cmp r0, r4
|
||||
bne _0809A810
|
||||
adds r0, r1, 0x2
|
||||
bl sub_8099DA0
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
b _0809A81E
|
||||
@@ -1527,7 +1527,7 @@ _0809A85A:
|
||||
bne _0809A88C
|
||||
_0809A86E:
|
||||
movs r0, 0x4
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r4, r0, 0
|
||||
strh r5, [r4]
|
||||
ldr r0, _0809A8A0 @ =gUnknown_2036DFC
|
||||
@@ -1537,7 +1537,7 @@ _0809A86E:
|
||||
adds r1, r4, 0
|
||||
bl sub_8113550
|
||||
adds r0, r4, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0809A88C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1549,8 +1549,8 @@ _0809A89C: .4byte gUnknown_3005008
|
||||
_0809A8A0: .4byte gUnknown_2036DFC
|
||||
thumb_func_end sub_809A824
|
||||
|
||||
thumb_func_start sub_809A8A4
|
||||
sub_809A8A4: @ 809A8A4
|
||||
thumb_func_start SanitizeItemId
|
||||
SanitizeItemId: @ 809A8A4
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
@@ -1565,14 +1565,14 @@ _0809A8B6:
|
||||
_0809A8B8:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_809A8A4
|
||||
thumb_func_end SanitizeItemId
|
||||
|
||||
thumb_func_start sub_809A8BC
|
||||
sub_809A8BC: @ 809A8BC
|
||||
thumb_func_start ItemId_GetItem
|
||||
ItemId_GetItem: @ 809A8BC
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1583,15 +1583,15 @@ sub_809A8BC: @ 809A8BC
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A8D8: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A8BC
|
||||
thumb_func_end ItemId_GetItem
|
||||
|
||||
thumb_func_start sub_809A8DC
|
||||
sub_809A8DC: @ 809A8DC
|
||||
thumb_func_start itemid_get_number
|
||||
itemid_get_number: @ 809A8DC
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A8FC @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1603,15 +1603,15 @@ sub_809A8DC: @ 809A8DC
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A8FC: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A8DC
|
||||
thumb_func_end itemid_get_number
|
||||
|
||||
thumb_func_start sub_809A900
|
||||
sub_809A900: @ 809A900
|
||||
thumb_func_start itemid_get_market_price
|
||||
itemid_get_market_price: @ 809A900
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A920 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1623,15 +1623,15 @@ sub_809A900: @ 809A900
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A920: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A900
|
||||
thumb_func_end itemid_get_market_price
|
||||
|
||||
thumb_func_start sub_809A924
|
||||
sub_809A924: @ 809A924
|
||||
thumb_func_start ItemId_GetHoldEffect
|
||||
ItemId_GetHoldEffect: @ 809A924
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A944 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1643,15 +1643,15 @@ sub_809A924: @ 809A924
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A944: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A924
|
||||
thumb_func_end ItemId_GetHoldEffect
|
||||
|
||||
thumb_func_start sub_809A948
|
||||
sub_809A948: @ 809A948
|
||||
thumb_func_start ItemId_GetHoldEffectParam
|
||||
ItemId_GetHoldEffectParam: @ 809A948
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A968 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1663,15 +1663,15 @@ sub_809A948: @ 809A948
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A968: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A948
|
||||
thumb_func_end ItemId_GetHoldEffectParam
|
||||
|
||||
thumb_func_start sub_809A96C
|
||||
sub_809A96C: @ 809A96C
|
||||
thumb_func_start ItemId_GetDescription
|
||||
ItemId_GetDescription: @ 809A96C
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A98C @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1684,15 +1684,15 @@ sub_809A96C: @ 809A96C
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A98C: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A96C
|
||||
thumb_func_end ItemId_GetDescription
|
||||
|
||||
thumb_func_start sub_809A990
|
||||
sub_809A990: @ 809A990
|
||||
thumb_func_start itemid_is_unique
|
||||
itemid_is_unique: @ 809A990
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A9B0 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1704,15 +1704,15 @@ sub_809A990: @ 809A990
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A9B0: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A990
|
||||
thumb_func_end itemid_is_unique
|
||||
|
||||
thumb_func_start sub_809A9B4
|
||||
sub_809A9B4: @ 809A9B4
|
||||
thumb_func_start itemid_get_x19
|
||||
itemid_get_x19: @ 809A9B4
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A9D4 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1724,15 +1724,15 @@ sub_809A9B4: @ 809A9B4
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A9D4: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A9B4
|
||||
thumb_func_end itemid_get_x19
|
||||
|
||||
thumb_func_start sub_809A9D8
|
||||
sub_809A9D8: @ 809A9D8
|
||||
thumb_func_start ItemId_GetPocket
|
||||
ItemId_GetPocket: @ 809A9D8
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809A9F8 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1744,15 +1744,15 @@ sub_809A9D8: @ 809A9D8
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809A9F8: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A9D8
|
||||
thumb_func_end ItemId_GetPocket
|
||||
|
||||
thumb_func_start sub_809A9FC
|
||||
sub_809A9FC: @ 809A9FC
|
||||
thumb_func_start ItemId_GetType
|
||||
ItemId_GetType: @ 809A9FC
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809AA1C @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1764,15 +1764,15 @@ sub_809A9FC: @ 809A9FC
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809AA1C: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809A9FC
|
||||
thumb_func_end ItemId_GetType
|
||||
|
||||
thumb_func_start sub_809AA20
|
||||
sub_809AA20: @ 809AA20
|
||||
thumb_func_start ItemId_GetFieldFunc
|
||||
ItemId_GetFieldFunc: @ 809AA20
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809AA40 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1785,15 +1785,15 @@ sub_809AA20: @ 809AA20
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809AA40: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809AA20
|
||||
thumb_func_end ItemId_GetFieldFunc
|
||||
|
||||
thumb_func_start sub_809AA44
|
||||
sub_809AA44: @ 809AA44
|
||||
thumb_func_start ItemId_GetBattleUsage
|
||||
ItemId_GetBattleUsage: @ 809AA44
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809AA64 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1806,15 +1806,15 @@ sub_809AA44: @ 809AA44
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809AA64: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809AA44
|
||||
thumb_func_end ItemId_GetBattleUsage
|
||||
|
||||
thumb_func_start sub_809AA68
|
||||
sub_809AA68: @ 809AA68
|
||||
thumb_func_start ItemId_GetBattleFunc
|
||||
ItemId_GetBattleFunc: @ 809AA68
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809AA88 @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1827,15 +1827,15 @@ sub_809AA68: @ 809AA68
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809AA88: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809AA68
|
||||
thumb_func_end ItemId_GetBattleFunc
|
||||
|
||||
thumb_func_start sub_809AA8C
|
||||
sub_809AA8C: @ 809AA8C
|
||||
thumb_func_start ItemId_GetSecondaryId
|
||||
ItemId_GetSecondaryId: @ 809AA8C
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, _0809AAAC @ =gUnknown_83DB028
|
||||
bl sub_809A8A4
|
||||
bl SanitizeItemId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0x2C
|
||||
@@ -1848,6 +1848,6 @@ sub_809AA8C: @ 809AA8C
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0809AAAC: .4byte gUnknown_83DB028
|
||||
thumb_func_end sub_809AA8C
|
||||
thumb_func_end ItemId_GetSecondaryId
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
||||
+225
-225
File diff suppressed because it is too large
Load Diff
+27
-27
@@ -38,7 +38,7 @@ sub_80984FC: @ 80984FC
|
||||
movs r1, 0x28
|
||||
movs r2, 0x44
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r1, _08098524 @ =gUnknown_2039878
|
||||
strb r0, [r1]
|
||||
adds r0, r4, 0
|
||||
@@ -68,7 +68,7 @@ sub_8098528: @ 8098528
|
||||
strh r2, [r0, 0x26]
|
||||
ldr r2, _0809855C @ =sub_8098560
|
||||
str r2, [r0, 0x1C]
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -119,7 +119,7 @@ sub_8098580: @ 8098580
|
||||
beq _080985AA
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _080985B8 @ =sub_80985BC
|
||||
str r0, [r4, 0x1C]
|
||||
_080985AA:
|
||||
@@ -144,7 +144,7 @@ sub_80985BC: @ 80985BC
|
||||
beq _080985D8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _080985E0 @ =nullsub_8
|
||||
str r0, [r4, 0x1C]
|
||||
_080985D8:
|
||||
@@ -170,7 +170,7 @@ _080985EC:
|
||||
ldr r0, _08098628 @ =gUnknown_83D4250
|
||||
movs r2, 0x7
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r1, r7, r5
|
||||
strb r0, [r1]
|
||||
adds r4, r1, 0
|
||||
@@ -184,7 +184,7 @@ _080985EC:
|
||||
lsls r0, 2
|
||||
adds r0, r6
|
||||
movs r1, 0x2
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
b _0809863C
|
||||
.align 2, 0
|
||||
_08098620: .4byte gUnknown_2039879
|
||||
@@ -197,7 +197,7 @@ _0809862C:
|
||||
lsls r0, 2
|
||||
adds r0, r6
|
||||
movs r1, 0x1
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
_0809863C:
|
||||
ldrb r1, [r4]
|
||||
lsls r0, r1, 4
|
||||
@@ -302,14 +302,14 @@ sub_80986EC: @ 80986EC
|
||||
ldr r5, _08098714 @ =gUnknown_2039884
|
||||
movs r0, 0x90
|
||||
lsls r0, 1
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r5]
|
||||
cmp r0, 0
|
||||
beq _08098722
|
||||
ldr r4, _08098718 @ =gUnknown_2039888
|
||||
movs r0, 0x80
|
||||
lsls r0, 2
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0809871C
|
||||
@@ -320,7 +320,7 @@ _08098714: .4byte gUnknown_2039884
|
||||
_08098718: .4byte gUnknown_2039888
|
||||
_0809871C:
|
||||
ldr r0, [r5]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_08098722:
|
||||
movs r0, 0
|
||||
_08098724:
|
||||
@@ -373,7 +373,7 @@ sub_8098758: @ 8098758
|
||||
bl sub_8098974
|
||||
ldr r2, _080987FC @ =gUnknown_2039884
|
||||
ldr r1, [r2]
|
||||
bl sub_800EBB4
|
||||
bl LZDecompressWram
|
||||
ldr r1, _080987FC @ =gUnknown_2039884
|
||||
ldr r0, [r1]
|
||||
ldr r2, _08098800 @ =gUnknown_2039888
|
||||
@@ -394,7 +394,7 @@ sub_8098758: @ 8098758
|
||||
ands r1, r2
|
||||
orrs r1, r3
|
||||
str r1, [r0, 0x4]
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8098974
|
||||
@@ -404,7 +404,7 @@ sub_8098758: @ 8098758
|
||||
ands r1, r4
|
||||
orrs r1, r5
|
||||
str r1, [r0, 0x4]
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
ldr r0, _0809880C @ =gUnknown_83D427C
|
||||
mov r1, sp
|
||||
movs r2, 0xC
|
||||
@@ -415,16 +415,16 @@ sub_8098758: @ 8098758
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r2, _080987FC @ =gUnknown_2039884
|
||||
ldr r0, [r2]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r1, _08098800 @ =gUnknown_2039888
|
||||
ldr r0, [r1]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r4, 0
|
||||
b _08098812
|
||||
.align 2, 0
|
||||
@@ -464,7 +464,7 @@ sub_809881C: @ 809881C
|
||||
bl sub_8098974
|
||||
ldr r2, _080988C8 @ =gUnknown_2039884
|
||||
ldr r1, [r2]
|
||||
bl sub_800EBB4
|
||||
bl LZDecompressWram
|
||||
ldr r1, _080988C8 @ =gUnknown_2039884
|
||||
ldr r0, [r1]
|
||||
ldr r2, _080988CC @ =gUnknown_2039888
|
||||
@@ -485,7 +485,7 @@ sub_809881C: @ 809881C
|
||||
ands r1, r2
|
||||
orrs r1, r3
|
||||
str r1, [r0, 0x4]
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8098974
|
||||
@@ -495,7 +495,7 @@ sub_809881C: @ 809881C
|
||||
ands r1, r4
|
||||
orrs r1, r5
|
||||
str r1, [r0, 0x4]
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
mov r0, r8
|
||||
mov r1, sp
|
||||
movs r2, 0xC
|
||||
@@ -506,16 +506,16 @@ sub_809881C: @ 809881C
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r2, _080988C8 @ =gUnknown_2039884
|
||||
ldr r0, [r2]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
ldr r1, _080988CC @ =gUnknown_2039888
|
||||
ldr r0, [r1]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r4, 0
|
||||
b _080988DA
|
||||
.align 2, 0
|
||||
@@ -549,9 +549,9 @@ sub_80988E8: @ 80988E8
|
||||
adds r4, r1, 0
|
||||
adds r4, 0x66
|
||||
adds r0, r4, 0
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
adds r0, r4, 0
|
||||
bl sub_8008A30
|
||||
bl FreeSpritePaletteByTag
|
||||
adds r0, r4, 0
|
||||
adds r1, r4, 0
|
||||
adds r2, r6, 0
|
||||
@@ -595,7 +595,7 @@ sub_8098940: @ 8098940
|
||||
lsls r0, 2
|
||||
ldr r1, _08098970 @ =gUnknown_202063C
|
||||
adds r0, r1
|
||||
bl sub_8007804
|
||||
bl DestroySpriteAndFreeResources
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
_08098964:
|
||||
@@ -647,9 +647,9 @@ sub_80989A0: @ 80989A0
|
||||
adds r4, r1, 0
|
||||
adds r4, 0x66
|
||||
adds r0, r4, 0
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
adds r0, r4, 0
|
||||
bl sub_8008A30
|
||||
bl FreeSpritePaletteByTag
|
||||
adds r0, r4, 0
|
||||
adds r1, r4, 0
|
||||
adds r2, r6, 0
|
||||
|
||||
+115
-115
@@ -16,13 +16,13 @@ sub_810D3F4: @ 810D3F4
|
||||
bhi _0810D410
|
||||
ldr r6, _0810D418 @ =gUnknown_203ADBC
|
||||
movs r0, 0x14
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r6]
|
||||
cmp r0, 0
|
||||
bne _0810D41C
|
||||
_0810D410:
|
||||
adds r0, r4, 0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0810D462
|
||||
.align 2, 0
|
||||
_0810D418: .4byte gUnknown_203ADBC
|
||||
@@ -62,7 +62,7 @@ _0810D448:
|
||||
cmp r2, 0x2
|
||||
bls _0810D448
|
||||
adds r0, r5, 0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_0810D462:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -75,11 +75,11 @@ _0810D46C: .4byte sub_810D4A0
|
||||
thumb_func_start sub_810D470
|
||||
sub_810D470: @ 810D470
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80F67B8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl do_scheduled_bg_tilemap_copies_to_vram
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810D470
|
||||
@@ -87,9 +87,9 @@ sub_810D470: @ 810D470
|
||||
thumb_func_start sub_810D48C
|
||||
sub_810D48C: @ 810D48C
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810D48C
|
||||
@@ -159,25 +159,25 @@ _0810D4E8:
|
||||
.4byte _0810D668
|
||||
_0810D53C:
|
||||
bl sub_80BF768
|
||||
bl sub_80F6790
|
||||
bl clear_scheduled_bg_copies_to_vram
|
||||
b _0810D674
|
||||
_0810D546:
|
||||
bl sub_8087E64
|
||||
bl remove_some_task
|
||||
b _0810D674
|
||||
_0810D54C:
|
||||
bl sub_80088F0
|
||||
bl FreeAllSpritePalettes
|
||||
b _0810D674
|
||||
_0810D552:
|
||||
bl sub_8070528
|
||||
bl ResetPaletteFade
|
||||
b _0810D674
|
||||
_0810D558:
|
||||
bl sub_8006B10
|
||||
bl ResetSpriteData
|
||||
b _0810D674
|
||||
_0810D55E:
|
||||
bl sub_80984D8
|
||||
b _0810D674
|
||||
_0810D564:
|
||||
bl sub_80773BC
|
||||
bl ResetTasks
|
||||
b _0810D674
|
||||
_0810D56A:
|
||||
bl sub_810D71C
|
||||
@@ -229,7 +229,7 @@ _0810D5C6:
|
||||
_0810D5CC:
|
||||
ldr r0, _0810D5F8 @ =sub_810DEA0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -237,7 +237,7 @@ _0810D5CC:
|
||||
ldr r2, _0810D600 @ =gUnknown_203ADCC
|
||||
ldrh r1, [r2, 0x4]
|
||||
ldrh r2, [r2, 0x6]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
ldr r2, _0810D604 @ =gUnknown_3005090
|
||||
lsls r1, r4, 2
|
||||
adds r1, r4
|
||||
@@ -268,7 +268,7 @@ _0810D616:
|
||||
negs r0, r0
|
||||
movs r1, 0x10
|
||||
movs r2, 0
|
||||
bl sub_80714D4
|
||||
bl BlendPalettes
|
||||
b _0810D674
|
||||
.align 2, 0
|
||||
_0810D62C: .4byte gUnknown_203ADCC
|
||||
@@ -283,7 +283,7 @@ _0810D630:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _0810D674
|
||||
.align 2, 0
|
||||
_0810D64C: .4byte gUnknown_203ADCC
|
||||
@@ -316,9 +316,9 @@ _0810D674:
|
||||
_0810D684: .4byte gUnknown_30030F0
|
||||
_0810D688:
|
||||
ldr r0, _0810D698 @ =sub_810D48C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _0810D69C @ =sub_810D470
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x1
|
||||
b _0810D6A2
|
||||
.align 2, 0
|
||||
@@ -343,14 +343,14 @@ sub_810D6AC: @ 810D6AC
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _0810D6DC @ =sub_810D6E8
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r0, _0810D6E0 @ =sub_810D48C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
ldr r0, _0810D6E4 @ =sub_810D470
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -373,10 +373,10 @@ sub_810D6E8: @ 810D6E8
|
||||
bne _0810D70C
|
||||
ldr r0, _0810D718 @ =gUnknown_203ADCC
|
||||
ldr r0, [r0]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
bl sub_810DC40
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0810D70C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -394,7 +394,7 @@ sub_810D71C: @ 810D71C
|
||||
movs r4, 0x80
|
||||
lsls r4, 4
|
||||
adds r0, r4, 0
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r5]
|
||||
cmp r0, 0
|
||||
beq _0810D784
|
||||
@@ -409,20 +409,20 @@ sub_810D71C: @ 810D71C
|
||||
bl sub_8001658
|
||||
ldr r1, [r5]
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r1, 0x82
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
b _0810D786
|
||||
.align 2, 0
|
||||
@@ -460,18 +460,18 @@ _0810D7AC:
|
||||
beq _0810D800
|
||||
b _0810D814
|
||||
_0810D7B6:
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
ldr r1, _0810D7CC @ =gUnknown_8E85090
|
||||
str r4, [sp]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80F6878
|
||||
bl decompress_and_copy_tile_data_to_vram
|
||||
b _0810D806
|
||||
.align 2, 0
|
||||
_0810D7CC: .4byte gUnknown_8E85090
|
||||
_0810D7D0:
|
||||
bl sub_80F682C
|
||||
bl free_temp_tile_data_buffers_if_possible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -479,7 +479,7 @@ _0810D7D0:
|
||||
ldr r0, _0810D7E8 @ =gUnknown_8E85458
|
||||
ldr r1, _0810D7EC @ =gUnknown_203ADC0
|
||||
ldr r1, [r1]
|
||||
bl sub_800EBB4
|
||||
bl LZDecompressWram
|
||||
b _0810D806
|
||||
.align 2, 0
|
||||
_0810D7E8: .4byte gUnknown_8E85458
|
||||
@@ -488,13 +488,13 @@ _0810D7F0:
|
||||
ldr r0, _0810D7FC @ =gUnknown_8E85408
|
||||
movs r1, 0
|
||||
movs r2, 0x60
|
||||
bl sub_80703A8
|
||||
bl LoadCompressedPalette
|
||||
b _0810D806
|
||||
.align 2, 0
|
||||
_0810D7FC: .4byte gUnknown_8E85408
|
||||
_0810D800:
|
||||
ldr r0, _0810D810 @ =gUnknown_83D4240
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
_0810D806:
|
||||
ldr r1, [r5]
|
||||
ldrh r0, [r1, 0xC]
|
||||
@@ -505,7 +505,7 @@ _0810D806:
|
||||
_0810D810: .4byte gUnknown_83D4240
|
||||
_0810D814:
|
||||
ldr r0, _0810D828 @ =gUnknown_83D4248
|
||||
bl sub_800EC28
|
||||
bl LoadCompressedObjectPalette
|
||||
ldr r0, _0810D82C @ =gUnknown_203ADBC
|
||||
ldr r1, [r0]
|
||||
movs r0, 0
|
||||
@@ -529,14 +529,14 @@ sub_810D83C: @ 810D83C
|
||||
push {r4,lr}
|
||||
ldr r4, _0810D860 @ =gUnknown_203ADC4
|
||||
movs r0, 0xF8
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0810D868
|
||||
ldr r4, _0810D864 @ =gUnknown_203ADC8
|
||||
movs r0, 0xD9
|
||||
lsls r0, 1
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _0810D868
|
||||
@@ -569,7 +569,7 @@ _0810D87E:
|
||||
lsls r1, 2
|
||||
adds r0, r1
|
||||
ldrh r0, [r0]
|
||||
bl sub_809A8BC
|
||||
bl ItemId_GetItem
|
||||
ldr r1, _0810D93C @ =gUnknown_203ADC4
|
||||
ldr r2, [r1]
|
||||
lsls r1, r4, 3
|
||||
@@ -698,13 +698,13 @@ _0810D968:
|
||||
adds r0, r4, 0
|
||||
bl sub_80988E8
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x4
|
||||
bne _0810D9C4
|
||||
adds r0, r4, 0
|
||||
bl sub_8125A78
|
||||
bl ItemIdToBattleMoveId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0xD
|
||||
@@ -717,7 +717,7 @@ _0810D9BC: .4byte gUnknown_203ADBC
|
||||
_0810D9C0: .4byte gUnknown_8247094
|
||||
_0810D9C4:
|
||||
adds r0, r4, 0
|
||||
bl sub_809A96C
|
||||
bl ItemId_GetDescription
|
||||
adds r5, r0, 0
|
||||
b _0810D9DA
|
||||
_0810D9CE:
|
||||
@@ -736,7 +736,7 @@ _0810D9DA:
|
||||
strb r0, [r2, 0x5]
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r1, 0x3
|
||||
str r1, [sp]
|
||||
movs r0, 0x2
|
||||
@@ -839,7 +839,7 @@ sub_810DAB4: @ 810DAB4
|
||||
lsrs r0, 24
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_8107300
|
||||
bl ListMenuGetYCoordForPrintingArrowCursor
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r4, 0
|
||||
@@ -876,7 +876,7 @@ sub_810DAD4: @ 810DAD4
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
b _0810DB26
|
||||
_0810DB10:
|
||||
ldr r2, _0810DB30 @ =gUnknown_841623B
|
||||
@@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
|
||||
movs r1, 0x80
|
||||
movs r2, 0x8
|
||||
movs r3, 0x68
|
||||
bl sub_8133B40
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
|
||||
movs r1, 0xD4
|
||||
movs r2, 0x78
|
||||
movs r3, 0x98
|
||||
bl sub_8133B40
|
||||
bl AddScrollIndicatorArrowPairParametrized
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x8]
|
||||
add sp, 0x10
|
||||
@@ -991,7 +991,7 @@ sub_810DBD0: @ 810DBD0
|
||||
ldrb r0, [r1, 0x8]
|
||||
cmp r0, 0xFF
|
||||
beq _0810DBE6
|
||||
bl sub_8133C30
|
||||
bl RemoveScrollIndicatorArrowPair
|
||||
ldr r1, [r4]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1, 0x8]
|
||||
@@ -1056,25 +1056,25 @@ sub_810DC40: @ 810DC40
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0810DC4E
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0810DC4E:
|
||||
ldr r0, _0810DC80 @ =gUnknown_203ADC0
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0810DC5A
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0810DC5A:
|
||||
ldr r0, _0810DC84 @ =gUnknown_203ADC4
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0810DC66
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0810DC66:
|
||||
ldr r0, _0810DC88 @ =gUnknown_203ADC8
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0810DC72
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_0810DC72:
|
||||
bl sub_8003ECC
|
||||
pop {r0}
|
||||
@@ -1102,7 +1102,7 @@ sub_810DC8C: @ 810DC8C
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _0810DCC4
|
||||
.align 2, 0
|
||||
_0810DCB0: .4byte gUnknown_203ADCC
|
||||
@@ -1160,7 +1160,7 @@ sub_810DCE4: @ 810DCE4
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0810DD38
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
b _0810DD40
|
||||
.align 2, 0
|
||||
_0810DD28: .4byte gUnknown_3005098
|
||||
@@ -1170,12 +1170,12 @@ _0810DD34: .4byte gUnknown_203ADBC
|
||||
_0810DD38:
|
||||
subs r0, r4, 0x4
|
||||
ldr r0, [r0]
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_0810DD40:
|
||||
bl sub_810DBD0
|
||||
bl sub_810DC40
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_0810DD4E:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -1356,7 +1356,7 @@ sub_810DE6C: @ 810DE6C
|
||||
movs r3, 0x1E
|
||||
bl sub_80F6B08
|
||||
movs r0, 0x1
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x8
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1403,7 +1403,7 @@ sub_810DEA0: @ 810DEA0
|
||||
adds r4, 0x2
|
||||
mov r1, sp
|
||||
adds r2, r4, 0
|
||||
bl sub_81072D4
|
||||
bl get_coro_args_x18_x1A
|
||||
mov r0, sp
|
||||
ldrh r1, [r0]
|
||||
ldrh r0, [r4]
|
||||
@@ -1431,12 +1431,12 @@ _0810DF18: .4byte gUnknown_30030F0
|
||||
_0810DF1C: .4byte gUnknown_203ADBC
|
||||
_0810DF20:
|
||||
ldrb r0, [r6]
|
||||
bl sub_8107078
|
||||
bl ListMenuHandleInput
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r6]
|
||||
ldr r1, _0810DF44 @ =gUnknown_203ADD0
|
||||
adds r2, r1, 0x2
|
||||
bl sub_81072D4
|
||||
bl get_coro_args_x18_x1A
|
||||
movs r0, 0x2
|
||||
negs r0, r0
|
||||
cmp r4, r0
|
||||
@@ -1551,17 +1551,17 @@ sub_810DFE0: @ 810DFE0
|
||||
bl sub_810DD68
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_809A8BC
|
||||
bl ItemId_GetItem
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r4, _0810E0A8 @ =gUnknown_2021D18
|
||||
ldr r1, _0810E0AC @ =gUnknown_841633F
|
||||
adds r0, r4, 0
|
||||
bl sub_8008FCC
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r1, 0x3
|
||||
str r1, [sp]
|
||||
movs r0, 0x2
|
||||
@@ -1578,7 +1578,7 @@ sub_810DFE0: @ 810DFE0
|
||||
movs r4, 0x20
|
||||
negs r4, r4
|
||||
ldrb r0, [r6]
|
||||
bl sub_8107300
|
||||
bl ListMenuGetYCoordForPrintingArrowCursor
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
@@ -1625,16 +1625,16 @@ sub_810E0B4: @ 810E0B4
|
||||
ldr r0, _0810E11C @ =gUnknown_3005098
|
||||
adds r4, r0
|
||||
ldrb r0, [r4]
|
||||
bl sub_8107078
|
||||
bl ListMenuHandleInput
|
||||
ldrb r0, [r4]
|
||||
ldr r7, _0810E120 @ =gUnknown_203ADD0
|
||||
adds r2, r7, 0x2
|
||||
adds r1, r7, 0
|
||||
bl sub_81072D4
|
||||
bl get_coro_args_x18_x1A
|
||||
movs r5, 0x20
|
||||
negs r5, r5
|
||||
ldrb r0, [r4]
|
||||
bl sub_8107300
|
||||
bl ListMenuGetYCoordForPrintingArrowCursor
|
||||
adds r1, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
@@ -1746,7 +1746,7 @@ _0810E1C0:
|
||||
subs r2, r5, 0x4
|
||||
ldrh r1, [r2, 0x4]
|
||||
ldrh r2, [r2, 0x6]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6]
|
||||
@@ -1803,7 +1803,7 @@ _0810E234:
|
||||
subs r2, r5, 0x4
|
||||
ldrh r1, [r2, 0x4]
|
||||
ldrh r2, [r2, 0x6]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6]
|
||||
@@ -1865,7 +1865,7 @@ sub_810E274: @ 810E274
|
||||
movs r1, 0x2
|
||||
movs r2, 0x8
|
||||
movs r3, 0x2
|
||||
bl sub_810FB6C
|
||||
bl PrintTextArray
|
||||
movs r0, 0x2
|
||||
movs r1, 0x1
|
||||
bl sub_80F79D8
|
||||
@@ -1904,7 +1904,7 @@ sub_810E274: @ 810E274
|
||||
movs r3, 0
|
||||
bl sub_810EA34
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r0, 0x8
|
||||
negs r0, r0
|
||||
add r9, r0
|
||||
@@ -1933,7 +1933,7 @@ sub_810E358: @ 810E358
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r6, r5, 0
|
||||
bl sub_810FA04
|
||||
bl ProcessMenuInputNoWrapAround
|
||||
lsls r0, 24
|
||||
asrs r4, r0, 24
|
||||
movs r0, 0x2
|
||||
@@ -1982,7 +1982,7 @@ sub_810E3A4: @ 810E3A4
|
||||
movs r0, 0
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x4
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x10]
|
||||
ldrh r0, [r4, 0x2]
|
||||
@@ -1992,9 +1992,9 @@ sub_810E3A4: @ 810E3A4
|
||||
cmp r0, 0x1
|
||||
bne _0810E3F4
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
adds r0, r5, 0
|
||||
bl sub_810E418
|
||||
b _0810E40E
|
||||
@@ -2002,7 +2002,7 @@ sub_810E3A4: @ 810E3A4
|
||||
_0810E3F0: .4byte gUnknown_3005098
|
||||
_0810E3F4:
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrh r0, [r4, 0x2]
|
||||
bl sub_810E5E0
|
||||
bl sub_810DB98
|
||||
@@ -2200,7 +2200,7 @@ sub_810E578: @ 810E578
|
||||
movs r0, 0x2
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r5]
|
||||
ldr r4, _0810E5D8 @ =gUnknown_203ADD0
|
||||
adds r2, r4, 0x2
|
||||
@@ -2213,12 +2213,12 @@ sub_810E578: @ 810E578
|
||||
subs r4, 0x4
|
||||
ldrh r1, [r4, 0x4]
|
||||
ldrh r2, [r4, 0x6]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5]
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
adds r0, r6, 0
|
||||
bl sub_810DFB0
|
||||
pop {r4-r6}
|
||||
@@ -2281,7 +2281,7 @@ sub_810E5E0: @ 810E5E0
|
||||
movs r3, 0x8
|
||||
bl sub_810EA34
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x14
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -2308,7 +2308,7 @@ sub_810E670: @ 810E670
|
||||
movs r1, 0x11
|
||||
movs r2, 0xA
|
||||
movs r3, 0xA
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
ldr r0, _0810E6CC @ =gUnknown_2021CD0
|
||||
lsls r4, 16
|
||||
asrs r4, 16
|
||||
@@ -2380,14 +2380,14 @@ _0810E70C:
|
||||
movs r0, 0x1
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x3
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_810DAB4
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl sub_810DBD0
|
||||
adds r0, r5, 0
|
||||
bl sub_810E418
|
||||
@@ -2407,16 +2407,16 @@ _0810E750:
|
||||
movs r0, 0x1
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x3
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_810DAB4
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
bl sub_810DBD0
|
||||
adds r0, r6, 0
|
||||
bl sub_810DFB0
|
||||
@@ -2431,7 +2431,7 @@ sub_810E79C: @ 810E79C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8040C3C
|
||||
bl CalculatePlayerPartyCount
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E7DC
|
||||
@@ -2441,9 +2441,9 @@ sub_810E79C: @ 810E79C
|
||||
movs r0, 0
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x4
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldr r1, _0810E7D4 @ =gUnknown_841632A
|
||||
ldr r2, _0810E7D8 @ =sub_810E848
|
||||
adds r0, r4, 0
|
||||
@@ -2530,14 +2530,14 @@ sub_810E848: @ 810E848
|
||||
movs r1, 0
|
||||
bl sub_810F260
|
||||
movs r0, 0x5
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_810DAB4
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
adds r0, r4, 0
|
||||
bl sub_810DFB0
|
||||
_0810E892:
|
||||
@@ -2566,16 +2566,16 @@ sub_810E8A0: @ 810E8A0
|
||||
movs r0, 0
|
||||
bl sub_810EAF0
|
||||
movs r0, 0x4
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_810DAB4
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
adds r0, r5, 0
|
||||
bl sub_810DFB0
|
||||
pop {r4,r5}
|
||||
@@ -2606,28 +2606,28 @@ sub_810E8F0: @ 810E8F0
|
||||
movs r2, 0xB0
|
||||
bl sub_814FEAC
|
||||
movs r0, 0x2
|
||||
bl sub_8150408
|
||||
bl stdpal_get
|
||||
movs r1, 0xD0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r0, _0810E97C @ =gUnknown_841F408
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
movs r4, 0
|
||||
_0810E938:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r4, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x2
|
||||
bls _0810E938
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
movs r4, 0
|
||||
ldr r3, _0810E980 @ =gUnknown_203ADD8
|
||||
movs r2, 0xFF
|
||||
@@ -2803,7 +2803,7 @@ sub_810EA9C: @ 810EA9C
|
||||
lsls r2, 2
|
||||
movs r1, 0
|
||||
movs r3, 0xE
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810EA9C
|
||||
@@ -2827,7 +2827,7 @@ sub_810EAB4: @ 810EAB4
|
||||
ldr r2, _0810EAEC @ =0x000003a3
|
||||
movs r1, 0x1
|
||||
movs r3, 0xC
|
||||
bl sub_810F2E8
|
||||
bl SetWindowBorderStyle
|
||||
_0810EADC:
|
||||
ldrb r0, [r4]
|
||||
pop {r4}
|
||||
@@ -2851,7 +2851,7 @@ sub_810EAF0: @ 810EAF0
|
||||
movs r1, 0
|
||||
bl sub_810F4D8
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003E3C
|
||||
movs r0, 0xFF
|
||||
@@ -2899,7 +2899,7 @@ sub_810EB30: @ 810EB30
|
||||
movs r3, 0xB
|
||||
bl sub_80BF474
|
||||
movs r0, 0
|
||||
bl sub_80F67A4
|
||||
bl schedule_bg_copy_tilemap_to_vram
|
||||
add sp, 0x10
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
||||
+63
-63
@@ -26,7 +26,7 @@ _080A0FD8: .4byte gUnknown_203AD30
|
||||
_080A0FDC: .4byte gUnknown_3005090
|
||||
_080A0FE0:
|
||||
ldrh r0, [r1]
|
||||
bl sub_809A9FC
|
||||
bl ItemId_GetType
|
||||
_080A0FE6:
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
@@ -111,7 +111,7 @@ sub_80A1084: @ 80A1084
|
||||
bl sub_807DC00
|
||||
ldr r0, _080A1098 @ =sub_80A109C
|
||||
movs r1, 0x8
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -170,7 +170,7 @@ _080A10F8:
|
||||
adds r0, r7, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_080A1104:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -205,9 +205,9 @@ sub_80A112C: @ 80A112C
|
||||
movs r1, 0x1
|
||||
bl sub_80F6F54
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_80696C0
|
||||
bl sub_806994C
|
||||
bl ScriptContext2_Disable
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -219,7 +219,7 @@ sub_80A1150: @ 80A1150
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x4
|
||||
@@ -228,7 +228,7 @@ sub_80A1150: @ 80A1150
|
||||
b _080A117E
|
||||
_080A1168:
|
||||
adds r0, r4, 0
|
||||
bl sub_809AA20
|
||||
bl ItemId_GetFieldFunc
|
||||
ldr r1, _080A1178 @ =sub_80A1750
|
||||
cmp r0, r1
|
||||
beq _080A117C
|
||||
@@ -258,12 +258,12 @@ _080A1190: .4byte sub_80A1194
|
||||
thumb_func_start sub_80A1194
|
||||
sub_80A1194: @ 80A1194
|
||||
push {lr}
|
||||
bl sub_8068974
|
||||
bl sub_8069940
|
||||
bl player_bitmagic
|
||||
bl ScriptContext2_Enable
|
||||
bl sub_807DC00
|
||||
ldr r0, _080A11B8 @ =sub_80A11C0
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r1, _080A11BC @ =gUnknown_2031DE0
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
@@ -285,10 +285,10 @@ sub_80A11C0: @ 80A11C0
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080A11E0
|
||||
bl sub_8068A5C
|
||||
bl sub_806994C
|
||||
bl UnfreezeMapObjects
|
||||
bl ScriptContext2_Disable
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A11E0:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -342,7 +342,7 @@ sub_80A122C: @ 80A122C
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -438,7 +438,7 @@ sub_80A1304: @ 80A1304
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r0, 0x6
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A131C
|
||||
@@ -448,9 +448,9 @@ _080A131C:
|
||||
movs r0, 0x6
|
||||
bl sub_80BD5C8
|
||||
bl sub_80696C0
|
||||
bl sub_806994C
|
||||
bl ScriptContext2_Disable
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -500,7 +500,7 @@ sub_80A137C: @ 80A137C
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C4F4
|
||||
bl GetXYCoordsOneStepInFrontOfPlayer
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
ldrsh r0, [r0, r1]
|
||||
@@ -517,12 +517,12 @@ sub_80A137C: @ 80A137C
|
||||
cmp r0, 0
|
||||
bne _080A1404
|
||||
movs r0, 0x10
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A1404
|
||||
movs r0, 0x8
|
||||
bl sub_805C74C
|
||||
bl TestPlayerAvatarFlags
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A13D4
|
||||
@@ -573,12 +573,12 @@ sub_80A1410: @ 80A1410
|
||||
lsrs r4, 24
|
||||
ldr r0, _080A1434 @ =gUnknown_203AD30
|
||||
ldrh r0, [r0]
|
||||
bl sub_809AA8C
|
||||
bl ItemId_GetSecondaryId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_805D2C0
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -659,7 +659,7 @@ _080A14D0:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_080A14DC:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -718,7 +718,7 @@ _080A1554:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
adds r2, r4, 0
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_080A1560:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -743,7 +743,7 @@ _080A1578:
|
||||
movs r1, 0x11
|
||||
adds r2, r4, 0
|
||||
movs r3, 0
|
||||
bl sub_80413C0
|
||||
bl ExecuteTableBasedItemEffect_
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A1592
|
||||
@@ -753,7 +753,7 @@ _080A1592:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_080A1598:
|
||||
bl sub_8040C3C
|
||||
bl CalculatePlayerPartyCount
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
@@ -790,7 +790,7 @@ _080A15E8:
|
||||
ldr r3, _080A15FC @ =sub_80A1648
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
b _080A1638
|
||||
.align 2, 0
|
||||
_080A15F8: .4byte gUnknown_8416690
|
||||
@@ -821,7 +821,7 @@ _080A162C:
|
||||
ldr r3, _080A1644 @ =sub_80A112C
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_080A1638:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -861,7 +861,7 @@ sub_80A1674: @ 80A1674
|
||||
lsrs r4, r0, 24
|
||||
adds r5, r4, 0
|
||||
movs r0, 0
|
||||
bl sub_8071C10
|
||||
bl WaitFanfare
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A16C0
|
||||
@@ -889,7 +889,7 @@ _080A16B4:
|
||||
ldr r3, _080A16CC @ =sub_80A112C
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_080A16C0:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -947,14 +947,14 @@ sub_80A1718: @ 80A1718
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080A172C @ =gUnknown_3005E98
|
||||
ldr r1, _080A1730 @ =sub_8125A3C
|
||||
ldr r1, _080A1730 @ =dp05_pp_up
|
||||
str r1, [r2]
|
||||
bl sub_80A16D0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A172C: .4byte gUnknown_3005E98
|
||||
_080A1730: .4byte sub_8125A3C
|
||||
_080A1730: .4byte dp05_pp_up
|
||||
thumb_func_end sub_80A1718
|
||||
|
||||
thumb_func_start sub_80A1734
|
||||
@@ -1031,7 +1031,7 @@ _080A17B8:
|
||||
bl sub_80CCB68
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080A17D0 @ =sub_80A17E8
|
||||
str r0, [r5]
|
||||
_080A17C8:
|
||||
@@ -1068,19 +1068,19 @@ sub_80A17E8: @ 80A17E8
|
||||
bne _080A1812
|
||||
bl sub_80563F0
|
||||
bl sub_80A1184
|
||||
ldr r1, _080A181C @ =sub_80567DC
|
||||
ldr r1, _080A181C @ =c2_exit_to_overworld_2_switch
|
||||
movs r0, 0
|
||||
movs r2, 0x1
|
||||
bl sub_81317F8
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A1812:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A1818: .4byte gUnknown_2037AB8
|
||||
_080A181C: .4byte sub_80567DC
|
||||
_080A181C: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80A17E8
|
||||
|
||||
thumb_func_start sub_80A1820
|
||||
@@ -1109,7 +1109,7 @@ _080A1850:
|
||||
bl sub_80CCB68
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080A1868 @ =sub_80A1880
|
||||
str r0, [r5]
|
||||
_080A1860:
|
||||
@@ -1146,19 +1146,19 @@ sub_80A1880: @ 80A1880
|
||||
bne _080A18AA
|
||||
bl sub_80563F0
|
||||
bl sub_80A1184
|
||||
ldr r1, _080A18B4 @ =sub_80567DC
|
||||
ldr r1, _080A18B4 @ =c2_exit_to_overworld_2_switch
|
||||
movs r0, 0
|
||||
movs r2, 0x1
|
||||
bl sub_813CD50
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A18AA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A18B0: .4byte gUnknown_2037AB8
|
||||
_080A18B4: .4byte sub_80567DC
|
||||
_080A18B4: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80A1880
|
||||
|
||||
thumb_func_start sub_80A18B8
|
||||
@@ -1225,7 +1225,7 @@ _080A1930:
|
||||
bl sub_80CCB68
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080A1948 @ =sub_80A1960
|
||||
str r0, [r5]
|
||||
_080A1940:
|
||||
@@ -1261,18 +1261,18 @@ sub_80A1960: @ 80A1960
|
||||
bne _080A1988
|
||||
bl sub_80563F0
|
||||
bl sub_80A1184
|
||||
ldr r1, _080A1994 @ =sub_80567DC
|
||||
ldr r1, _080A1994 @ =c2_exit_to_overworld_2_switch
|
||||
movs r0, 0
|
||||
bl sub_815ABC4
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A1988:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A1990: .4byte gUnknown_2037AB8
|
||||
_080A1994: .4byte sub_80567DC
|
||||
_080A1994: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80A1960
|
||||
|
||||
thumb_func_start sub_80A1998
|
||||
@@ -1319,7 +1319,7 @@ sub_80A19E8: @ 80A19E8
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_80723E0
|
||||
bl IsSEPlaying
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A1A2A
|
||||
@@ -1331,7 +1331,7 @@ sub_80A19E8: @ 80A19E8
|
||||
bl sub_80A2294
|
||||
ldr r5, _080A1A38 @ =0x00004020
|
||||
ldrh r0, [r4]
|
||||
bl sub_809A948
|
||||
bl ItemId_GetHoldEffectParam
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
@@ -1363,12 +1363,12 @@ sub_80A1A44: @ 80A1A44
|
||||
movs r1, 0x1
|
||||
bl sub_809A1D8
|
||||
ldrh r0, [r4]
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8108DC8
|
||||
ldrh r0, [r4]
|
||||
bl sub_809A9D8
|
||||
bl ItemId_GetPocket
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_81089F4
|
||||
@@ -1581,7 +1581,7 @@ sub_80A1C08: @ 80A1C08
|
||||
ldr r3, _080A1C40 @ =sub_80A1C44
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1600,7 +1600,7 @@ sub_80A1C44: @ 80A1C44
|
||||
bl sub_80559E4
|
||||
bl sub_8085620
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1632,7 +1632,7 @@ _080A1C90:
|
||||
bl sub_80CCB68
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080A1CA8 @ =sub_80A1CC0
|
||||
str r0, [r5]
|
||||
_080A1CA0:
|
||||
@@ -1668,18 +1668,18 @@ sub_80A1CC0: @ 80A1CC0
|
||||
bne _080A1CE8
|
||||
bl sub_80563F0
|
||||
bl sub_80A1184
|
||||
ldr r1, _080A1CF4 @ =sub_80567DC
|
||||
ldr r1, _080A1CF4 @ =c2_exit_to_overworld_2_switch
|
||||
movs r0, 0
|
||||
bl sub_80BFF50
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A1CE8:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A1CF0: .4byte gUnknown_2037AB8
|
||||
_080A1CF4: .4byte sub_80567DC
|
||||
_080A1CF4: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80A1CC0
|
||||
|
||||
thumb_func_start sub_80A1CF8
|
||||
@@ -1716,7 +1716,7 @@ _080A1D3C:
|
||||
bl sub_80CCB68
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_807A818
|
||||
bl fade_screen
|
||||
ldr r0, _080A1D54 @ =sub_80A1D68
|
||||
str r0, [r5]
|
||||
_080A1D4C:
|
||||
@@ -1751,17 +1751,17 @@ sub_80A1D68: @ 80A1D68
|
||||
bne _080A1D8E
|
||||
bl sub_80563F0
|
||||
bl sub_80A1184
|
||||
ldr r0, _080A1D98 @ =sub_80567DC
|
||||
ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch
|
||||
bl sub_812C3AC
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080A1D8E:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A1D94: .4byte gUnknown_2037AB8
|
||||
_080A1D98: .4byte sub_80567DC
|
||||
_080A1D98: .4byte c2_exit_to_overworld_2_switch
|
||||
thumb_func_end sub_80A1D68
|
||||
|
||||
thumb_func_start sub_80A1D9C
|
||||
@@ -1837,7 +1837,7 @@ sub_80A1E1C: @ 80A1E1C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8040F6C
|
||||
bl IsPlayerPartyAndPokemonStorageFull
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A1E48
|
||||
@@ -1900,7 +1900,7 @@ sub_80A1E7C: @ 80A1E7C
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
movs r3, 0
|
||||
bl sub_80413C0
|
||||
bl ExecuteTableBasedItemEffect_
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0
|
||||
@@ -2379,7 +2379,7 @@ sub_80A2294: @ 80A2294
|
||||
lsls r5, 16
|
||||
lsrs r5, 16
|
||||
movs r0, 0x8
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r6, r0, 0
|
||||
strh r4, [r6]
|
||||
strh r5, [r6, 0x6]
|
||||
@@ -2387,7 +2387,7 @@ sub_80A2294: @ 80A2294
|
||||
beq _080A22C8
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x41
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
b _080A22CA
|
||||
_080A22C8:
|
||||
ldr r0, _080A22E4 @ =0x0000ffff
|
||||
@@ -2397,7 +2397,7 @@ _080A22CA:
|
||||
adds r1, r6, 0
|
||||
bl sub_8113550
|
||||
adds r0, r6, 0
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
|
||||
+26
-26
@@ -63,7 +63,7 @@ _0813ECFC:
|
||||
ldr r3, _0813ED14 @ =sub_813ED18
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
_0813ED08:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -83,9 +83,9 @@ sub_813ED18: @ 813ED18
|
||||
movs r1, 0x1
|
||||
bl sub_80F6F54
|
||||
bl sub_80696C0
|
||||
bl sub_806994C
|
||||
bl ScriptContext2_Disable
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -219,7 +219,7 @@ sub_813EE14: @ 813EE14
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
ldr r1, _0813EEC8 @ =gUnknown_3005090
|
||||
mov r2, r9
|
||||
lsls r0, r2, 2
|
||||
@@ -633,7 +633,7 @@ sub_813F108: @ 813F108
|
||||
adds r4, 0x2
|
||||
mov r0, sp
|
||||
adds r1, r4, 0
|
||||
bl sub_805C538
|
||||
bl PlayerGetDestCoords
|
||||
mov r0, sp
|
||||
ldrh r0, [r0]
|
||||
subs r0, 0x7
|
||||
@@ -953,7 +953,7 @@ sub_813F364: @ 813F364
|
||||
ldr r2, _0813F378 @ =gUnknown_8416476
|
||||
ldr r3, _0813F37C @ =sub_813F380
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -972,9 +972,9 @@ sub_813F380: @ 813F380
|
||||
movs r1, 0x1
|
||||
bl sub_80F6F54
|
||||
bl sub_80696C0
|
||||
bl sub_806994C
|
||||
bl ScriptContext2_Disable
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -988,7 +988,7 @@ sub_813F3A8: @ 813F3A8
|
||||
ldr r2, _0813F3BC @ =gUnknown_84164BE
|
||||
ldr r3, _0813F3C0 @ =sub_813F3C4
|
||||
movs r1, 0x2
|
||||
bl sub_80F7808
|
||||
bl DisplayItemMessageOnField
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1004,10 +1004,10 @@ sub_813F3C4: @ 813F3C4
|
||||
lsrs r4, 24
|
||||
bl sub_813F3FC
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _0813F3E8 @ =gUnknown_81A8D49
|
||||
bl sub_8069AE4
|
||||
bl sub_8069940
|
||||
bl ScriptContext1_SetupScript
|
||||
bl ScriptContext2_Enable
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1019,7 +1019,7 @@ _0813F3E8: .4byte gUnknown_81A8D49
|
||||
sub_813F3EC: @ 813F3EC
|
||||
push {lr}
|
||||
ldr r0, _0813F3F8 @ =gUnknown_84647FC
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -1031,7 +1031,7 @@ sub_813F3FC: @ 813F3FC
|
||||
push {lr}
|
||||
movs r0, 0xFA
|
||||
lsls r0, 3
|
||||
bl sub_800874C
|
||||
bl FreeSpriteTilesByTag
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813F3FC
|
||||
@@ -1048,7 +1048,7 @@ sub_813F40C: @ 813F40C
|
||||
movs r1, 0x78
|
||||
movs r2, 0x4C
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r0, _0813F468 @ =gUnknown_202063C
|
||||
@@ -1062,7 +1062,7 @@ sub_813F40C: @ 813F40C
|
||||
strb r0, [r4, 0x5]
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
movs r0, 0
|
||||
strh r5, [r4, 0x3C]
|
||||
strh r0, [r4, 0x2E]
|
||||
@@ -1091,7 +1091,7 @@ _0813F470:
|
||||
.4byte _0813F50C
|
||||
.4byte _0813F52C
|
||||
_0813F484:
|
||||
bl sub_805C6C4
|
||||
bl player_get_direction_lower_nybble
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@@ -1118,7 +1118,7 @@ _0813F4A4:
|
||||
strh r1, [r0, 0x30]
|
||||
strh r2, [r0, 0x32]
|
||||
movs r1, 0
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
b _0813F53E
|
||||
.align 2, 0
|
||||
_0813F4C0: .4byte gUnknown_202063C
|
||||
@@ -1134,7 +1134,7 @@ _0813F4C8:
|
||||
ldr r1, _0813F4E8 @ =0x0000ff9c
|
||||
strh r1, [r0, 0x32]
|
||||
movs r1, 0x3
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
b _0813F53E
|
||||
.align 2, 0
|
||||
_0813F4E4: .4byte gUnknown_202063C
|
||||
@@ -1150,7 +1150,7 @@ _0813F4EC:
|
||||
strh r1, [r0, 0x30]
|
||||
strh r2, [r0, 0x32]
|
||||
movs r1, 0x2
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
b _0813F53E
|
||||
.align 2, 0
|
||||
_0813F508: .4byte gUnknown_202063C
|
||||
@@ -1165,7 +1165,7 @@ _0813F50C:
|
||||
movs r1, 0x64
|
||||
strh r1, [r0, 0x32]
|
||||
movs r1, 0x1
|
||||
bl sub_800843C
|
||||
bl StartSpriteAffineAnim
|
||||
b _0813F53E
|
||||
.align 2, 0
|
||||
_0813F528: .4byte gUnknown_202063C
|
||||
@@ -1235,9 +1235,9 @@ _0813F594: .4byte sub_813F598
|
||||
sub_813F598: @ 813F598
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80077D8
|
||||
bl FreeSpriteOamMatrix
|
||||
adds r0, r4, 0
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1250,7 +1250,7 @@ sub_813F5AC: @ 813F5AC
|
||||
movs r1, 0x78
|
||||
movs r2, 0x4C
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
@@ -1269,7 +1269,7 @@ sub_813F5AC: @ 813F5AC
|
||||
str r0, [r1]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x4
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
movs r1, 0
|
||||
strh r1, [r4, 0x3C]
|
||||
strh r1, [r4, 0x2E]
|
||||
@@ -1339,7 +1339,7 @@ _0813F65C: .4byte sub_813F660
|
||||
thumb_func_start sub_813F660
|
||||
sub_813F660: @ 813F660
|
||||
push {lr}
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_813F660
|
||||
|
||||
+95
-95
@@ -8,9 +8,9 @@
|
||||
thumb_func_start sub_80E4620
|
||||
sub_80E4620: @ 80E4620
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E4620
|
||||
@@ -19,17 +19,17 @@ sub_80E4620: @ 80E4620
|
||||
sub_80E4634: @ 80E4634
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
bl sub_8069940
|
||||
bl ScriptContext2_Enable
|
||||
ldr r0, _080E465C @ =sub_80E4660
|
||||
movs r1, 0xA
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
movs r1, 0
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -49,12 +49,12 @@ sub_80E4660: @ 80E4660
|
||||
cmp r0, 0
|
||||
bne _080E4684
|
||||
ldr r0, _080E4690 @ =sub_80E478C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
ldr r1, _080E4694 @ =gUnknown_3005020
|
||||
ldr r0, _080E4698 @ =sub_807DD24
|
||||
str r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080E4684:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -76,7 +76,7 @@ sub_80E469C: @ 80E469C
|
||||
movs r0, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8001658
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
ldr r0, _080E4778 @ =gUnknown_83FFA44
|
||||
bl sub_8003B24
|
||||
lsls r0, 16
|
||||
@@ -88,16 +88,16 @@ _080E46C6:
|
||||
lsls r4, r5, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r5, 0x1
|
||||
cmp r5, 0x8
|
||||
bls _080E46C6
|
||||
movs r0, 0x7
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x1E
|
||||
str r0, [sp]
|
||||
movs r0, 0x14
|
||||
@@ -108,14 +108,14 @@ _080E46C6:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r0, _080E477C @ =gUnknown_203AAB4
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x99
|
||||
lsls r0, 2
|
||||
adds r1, r0
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
movs r2, 0xE0
|
||||
@@ -126,7 +126,7 @@ _080E46C6:
|
||||
ldr r0, _080E4780 @ =gUnknown_8E97DDC
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r1, _080E4784 @ =gUnknown_8E97DFC
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
@@ -138,21 +138,21 @@ _080E46C6:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x16
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x14
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_080E476C:
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
@@ -172,13 +172,13 @@ sub_80E478C: @ 80E478C
|
||||
push {r4,lr}
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl sub_8006B10
|
||||
bl sub_80088F0
|
||||
bl sub_80773BC
|
||||
bl SetGpuReg
|
||||
bl ResetSpriteData
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetTasks
|
||||
ldr r4, _080E47EC @ =gUnknown_203AAB4
|
||||
ldr r0, _080E47F0 @ =0x00000a6c
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
bl sub_80E4F54
|
||||
ldr r0, [r4]
|
||||
@@ -190,15 +190,15 @@ sub_80E478C: @ 80E478C
|
||||
strb r1, [r0]
|
||||
bl sub_80E50CC
|
||||
ldr r0, _080E47F8 @ =sub_80E4620
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_80E469C
|
||||
bl sub_80E5004
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _080E47FC @ =sub_80E4870
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -215,10 +215,10 @@ sub_80E4800: @ 80E4800
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl sub_8006B10
|
||||
bl sub_80088F0
|
||||
bl sub_80773BC
|
||||
bl SetGpuReg
|
||||
bl ResetSpriteData
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetTasks
|
||||
bl sub_80E50CC
|
||||
ldr r0, _080E485C @ =gUnknown_203AAB4
|
||||
ldr r0, [r0]
|
||||
@@ -228,19 +228,19 @@ sub_80E4800: @ 80E4800
|
||||
adds r0, r2
|
||||
strb r1, [r0]
|
||||
ldr r0, _080E4868 @ =sub_80E4620
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_80E469C
|
||||
bl sub_80E5004
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8070424
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl FillPalette
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _080E486C @ =sub_80E4870
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -275,11 +275,11 @@ _080E4882:
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
_080E489E:
|
||||
bl sub_8077578
|
||||
bl RunTasks
|
||||
bl sub_8002DE8
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -381,11 +381,11 @@ _080E49A8:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
bl sub_80E5444
|
||||
ldr r4, _080E49EC @ =gUnknown_203AAB4
|
||||
ldr r1, [r4]
|
||||
@@ -498,7 +498,7 @@ _080E4A88:
|
||||
adds r2, 0xE8
|
||||
adds r2, r1
|
||||
ldrh r1, [r2]
|
||||
bl sub_803E89C
|
||||
bl GiveMoveToMon
|
||||
lsls r0, 16
|
||||
ldr r1, _080E4AD4 @ =0xffff0000
|
||||
cmp r0, r1
|
||||
@@ -717,7 +717,7 @@ _080E4C5A:
|
||||
str r2, [sp]
|
||||
movs r1, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080E4EDA
|
||||
_080E4C70:
|
||||
ldr r0, _080E4CC8 @ =gUnknown_2037AB8
|
||||
@@ -736,7 +736,7 @@ _080E4C7E:
|
||||
adds r1, r2, r3
|
||||
ldr r6, _080E4CD4 @ =0x00000a6a
|
||||
adds r2, r6
|
||||
bl sub_81072D4
|
||||
bl get_coro_args_x18_x1A
|
||||
bl sub_8003ECC
|
||||
ldr r0, _080E4CD8 @ =gUnknown_2024284
|
||||
ldr r5, [r7]
|
||||
@@ -780,7 +780,7 @@ _080E4CE8:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
b _080E4EDA
|
||||
_080E4CFA:
|
||||
movs r0, 0x1
|
||||
@@ -789,7 +789,7 @@ _080E4CFA:
|
||||
str r1, [sp]
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
ldr r0, _080E4D14 @ =gUnknown_203AAB4
|
||||
ldr r1, [r0]
|
||||
ldrb r0, [r1]
|
||||
@@ -809,14 +809,14 @@ _080E4D26:
|
||||
bl sub_8003ECC
|
||||
ldr r0, _080E4D40 @ =gUnknown_203AAB4
|
||||
ldr r0, [r0]
|
||||
bl sub_8002BC4
|
||||
ldr r0, _080E4D44 @ =sub_80567DC
|
||||
bl sub_8000544
|
||||
bl Free
|
||||
ldr r0, _080E4D44 @ =c2_exit_to_overworld_2_switch
|
||||
bl SetMainCallback2
|
||||
b _080E4EDA
|
||||
.align 2, 0
|
||||
_080E4D3C: .4byte gUnknown_2037AB8
|
||||
_080E4D40: .4byte gUnknown_203AAB4
|
||||
_080E4D44: .4byte sub_80567DC
|
||||
_080E4D44: .4byte c2_exit_to_overworld_2_switch
|
||||
_080E4D48:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
@@ -824,11 +824,11 @@ _080E4D48:
|
||||
str r1, [sp]
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
ldr r0, _080E4D88 @ =gUnknown_203AAB4
|
||||
ldr r1, [r0]
|
||||
ldrb r0, [r1]
|
||||
@@ -874,7 +874,7 @@ _080E4DB4:
|
||||
adds r0, r5
|
||||
ldrb r1, [r2]
|
||||
adds r1, 0xD
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r2, _080E4E54 @ =gUnknown_2021D04
|
||||
@@ -886,7 +886,7 @@ _080E4DB4:
|
||||
mov r8, r3
|
||||
add r1, r8
|
||||
adds r0, r2, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, [r7]
|
||||
adds r0, r1, r4
|
||||
ldrb r0, [r0]
|
||||
@@ -895,7 +895,7 @@ _080E4DB4:
|
||||
ldr r2, _080E4E5C @ =0x00000261
|
||||
adds r1, r2
|
||||
ldrb r1, [r1]
|
||||
bl sub_8041064
|
||||
bl RemoveMonPPBonus
|
||||
ldr r3, [r7]
|
||||
adds r4, r3, r4
|
||||
ldrb r0, [r4]
|
||||
@@ -912,7 +912,7 @@ _080E4DB4:
|
||||
ldr r6, _080E4E5C @ =0x00000261
|
||||
adds r3, r6
|
||||
ldrb r2, [r3]
|
||||
bl sub_803E964
|
||||
bl SetMonMoveSlot
|
||||
ldr r0, _080E4E64 @ =gUnknown_2021CF0
|
||||
ldr r2, [r7]
|
||||
adds r4, r2, r4
|
||||
@@ -925,7 +925,7 @@ _080E4DB4:
|
||||
muls r2, r1
|
||||
adds r1, r2, 0
|
||||
add r1, r8
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r0, _080E4E68 @ =gUnknown_841E493
|
||||
bl sub_80E48C0
|
||||
ldr r1, [r7]
|
||||
@@ -952,14 +952,14 @@ _080E4E70:
|
||||
movs r0, 0x1F
|
||||
strb r0, [r1]
|
||||
adds r0, 0xE2
|
||||
bl sub_8071C60
|
||||
bl PlayFanfare
|
||||
b _080E4EDA
|
||||
.align 2, 0
|
||||
_080E4E88: .4byte gUnknown_841E4C0
|
||||
_080E4E8C: .4byte gUnknown_203AAB4
|
||||
_080E4E90:
|
||||
ldr r0, _080E4EA0 @ =0x00000101
|
||||
bl sub_8071C60
|
||||
bl PlayFanfare
|
||||
ldr r0, _080E4EA4 @ =gUnknown_203AAB4
|
||||
ldr r1, [r0]
|
||||
movs r0, 0x20
|
||||
@@ -968,7 +968,7 @@ _080E4E90:
|
||||
_080E4EA0: .4byte 0x00000101
|
||||
_080E4EA4: .4byte gUnknown_203AAB4
|
||||
_080E4EA8:
|
||||
bl sub_8071C9C
|
||||
bl IsFanfareTaskInactive
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080E4EDA
|
||||
@@ -1046,7 +1046,7 @@ sub_80E4F0C: @ 80E4F0C
|
||||
movs r3, 0x2
|
||||
bl sub_80E559C
|
||||
movs r0, 0x7
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x7
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
@@ -1130,7 +1130,7 @@ sub_80E4FAC: @ 80E4FAC
|
||||
_080E4FD0:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
ldrh r1, [r4, 0x32]
|
||||
adds r2, r0, 0
|
||||
muls r2, r1
|
||||
@@ -1140,7 +1140,7 @@ _080E4FD0:
|
||||
_080E4FE4:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8044E30
|
||||
bl Sin
|
||||
ldrh r1, [r4, 0x32]
|
||||
adds r2, r0, 0
|
||||
muls r2, r1
|
||||
@@ -1161,15 +1161,15 @@ sub_80E5004: @ 80E5004
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
ldr r0, _080E50B4 @ =gUnknown_83FF9F4
|
||||
bl sub_80086DC
|
||||
bl LoadSpriteSheet
|
||||
ldr r0, _080E50B8 @ =gUnknown_83FF9FC
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
ldr r0, _080E50BC @ =gUnknown_83FFA24
|
||||
mov r8, r0
|
||||
movs r1, 0xC8
|
||||
movs r2, 0x4
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r5, _080E50C0 @ =gUnknown_203AAB4
|
||||
ldr r1, [r5]
|
||||
strb r0, [r1, 0x3]
|
||||
@@ -1181,7 +1181,7 @@ sub_80E5004: @ 80E5004
|
||||
ldr r4, _080E50C4 @ =gUnknown_202063C
|
||||
adds r0, r4
|
||||
movs r1, 0x1
|
||||
bl sub_800838C
|
||||
bl StartSpriteAnim
|
||||
ldr r2, [r5]
|
||||
ldrb r1, [r2, 0x3]
|
||||
lsls r0, r1, 4
|
||||
@@ -1201,7 +1201,7 @@ sub_80E5004: @ 80E5004
|
||||
movs r1, 0xC8
|
||||
movs r2, 0x6C
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r1, [r5]
|
||||
strb r0, [r1, 0x3]
|
||||
ldr r2, [r5]
|
||||
@@ -1299,7 +1299,7 @@ _080E511A:
|
||||
muls r1, r7
|
||||
ldr r2, _080E51F0 @ =gUnknown_8247094
|
||||
adds r1, r2
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
adds r4, 0xD
|
||||
adds r5, 0x1
|
||||
ldr r0, [r6]
|
||||
@@ -1319,10 +1319,10 @@ _080E513C:
|
||||
adds r0, r1
|
||||
movs r1, 0x2
|
||||
mov r2, sp
|
||||
bl sub_803FBE8
|
||||
bl GetMonData
|
||||
ldr r0, _080E51F4 @ =gUnknown_2021CD0
|
||||
mov r1, sp
|
||||
bl sub_8008CF4
|
||||
bl StringCopy10
|
||||
ldr r0, [r4]
|
||||
ldrb r2, [r0, 0x1A]
|
||||
movs r1, 0xD
|
||||
@@ -1332,7 +1332,7 @@ _080E513C:
|
||||
adds r1, r7
|
||||
adds r0, r1
|
||||
ldr r1, _080E51F8 @ =gUnknown_84161C1
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r1, [r4]
|
||||
ldrb r0, [r1, 0x1A]
|
||||
adds r0, 0x1
|
||||
@@ -1409,7 +1409,7 @@ sub_80E5204: @ 80E5204
|
||||
ldr r1, _080E525C @ =0x00000263
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
bl sub_8107078
|
||||
bl ListMenuHandleInput
|
||||
ldr r0, _080E5260 @ =gUnknown_30030F0
|
||||
ldrh r1, [r0, 0x2E]
|
||||
movs r0, 0x1
|
||||
@@ -1436,7 +1436,7 @@ sub_80E5204: @ 80E5204
|
||||
lsls r3, 1
|
||||
adds r2, r3
|
||||
adds r1, r2
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r0, _080E526C @ =gUnknown_841E3FB
|
||||
bl sub_80E48C0
|
||||
b _080E529E
|
||||
@@ -1532,7 +1532,7 @@ sub_80E5300: @ 80E5300
|
||||
adds r3, 0x2
|
||||
adds r2, r3
|
||||
ldrh r2, [r2]
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
ldr r1, [r4]
|
||||
ldr r2, _080E533C @ =0x00000263
|
||||
adds r1, r2
|
||||
@@ -1702,19 +1702,19 @@ sub_80E5444: @ 80E5444
|
||||
movs r3, 0x22
|
||||
bl sub_8107D68
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x3
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x5
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x7
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -1751,7 +1751,7 @@ _080E54EA:
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -1822,7 +1822,7 @@ sub_80E5574: @ 80E5574
|
||||
cmp r4, r0
|
||||
beq _080E5594
|
||||
movs r0, 0x6
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x6
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -1915,7 +1915,7 @@ _080E5622:
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
_080E563E:
|
||||
mov r0, r8
|
||||
str r0, [sp]
|
||||
|
||||
+332
-332
File diff suppressed because it is too large
Load Diff
+152
-152
@@ -49,7 +49,7 @@ sub_80094D4: @ 80094D4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80094D4
|
||||
@@ -75,7 +75,7 @@ sub_80094E4: @ 80094E4
|
||||
ldr r0, _08009540 @ =gUnknown_8232578
|
||||
lsls r1, r5, 4
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r3, _08009544 @ =0x040000d4
|
||||
ldr r0, _08009548 @ =gUnknown_8232598
|
||||
str r0, [r3]
|
||||
@@ -119,7 +119,7 @@ _0800955C:
|
||||
lsls r0, r7, 2
|
||||
orrs r1, r0
|
||||
movs r0, 0xA
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _08009590
|
||||
_0800956E:
|
||||
lsls r1, r6, 8
|
||||
@@ -128,7 +128,7 @@ _0800956E:
|
||||
lsls r0, r7, 2
|
||||
orrs r1, r0
|
||||
movs r0, 0xC
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
b _08009590
|
||||
_08009580:
|
||||
lsls r1, r6, 8
|
||||
@@ -137,7 +137,7 @@ _08009580:
|
||||
lsls r0, r7, 2
|
||||
orrs r1, r0
|
||||
movs r0, 0xE
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
_08009590:
|
||||
mov r0, r8
|
||||
lsls r4, r0, 2
|
||||
@@ -146,13 +146,13 @@ _08009590:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
adds r4, 0x12
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
@@ -182,7 +182,7 @@ sub_80095BC: @ 80095BC
|
||||
mov r2, r8
|
||||
lsls r1, r2, 4
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r2, _0800962C @ =0x040000d4
|
||||
ldr r0, _08009630 @ =gUnknown_8232598
|
||||
str r0, [r2]
|
||||
@@ -207,7 +207,7 @@ sub_80095BC: @ 80095BC
|
||||
lsls r5, 2
|
||||
orrs r4, r5
|
||||
adds r1, r4, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
@@ -226,11 +226,11 @@ _0800963C: .4byte gUnknown_8231E20
|
||||
sub_8009640: @ 8009640
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
bl sub_8006B10
|
||||
bl sub_80088F0
|
||||
bl sub_80773BC
|
||||
bl ResetSpriteData
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetTasks
|
||||
ldr r0, _080096D4 @ =sub_800978C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_800A294
|
||||
ldr r1, _080096D8 @ =gUnknown_202271A
|
||||
ldr r2, _080096DC @ =0x00001111
|
||||
@@ -242,7 +242,7 @@ sub_8009640: @ 8009640
|
||||
bl sub_8044EE8
|
||||
movs r4, 0
|
||||
_08009670:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _080096E4 @ =gUnknown_300500C
|
||||
ldr r1, [r1]
|
||||
adds r1, 0xA
|
||||
@@ -261,22 +261,22 @@ _08009670:
|
||||
movs r1, 0xAA
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _080096E8 @ =sub_80094D4
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl CreateTask
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _080096EC @ =gUnknown_3000E58
|
||||
str r4, [r0]
|
||||
bl sub_8009708
|
||||
ldr r0, _080096F0 @ =sub_800A74C
|
||||
ldr r0, _080096F0 @ =task00_link_test
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
ldr r0, _080096F4 @ =sub_8009A8C
|
||||
bl sub_8000544
|
||||
bl CreateTask
|
||||
ldr r0, _080096F4 @ =c2_08009A8C
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -289,8 +289,8 @@ _080096E0: .4byte gUnknown_30030F0
|
||||
_080096E4: .4byte gUnknown_300500C
|
||||
_080096E8: .4byte sub_80094D4
|
||||
_080096EC: .4byte gUnknown_3000E58
|
||||
_080096F0: .4byte sub_800A74C
|
||||
_080096F4: .4byte sub_8009A8C
|
||||
_080096F0: .4byte task00_link_test
|
||||
_080096F4: .4byte c2_08009A8C
|
||||
thumb_func_end sub_8009640
|
||||
|
||||
thumb_func_start sub_80096F8
|
||||
@@ -323,7 +323,7 @@ sub_8009708: @ 8009708
|
||||
str r2, [r5, 0x4]
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x8
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0x8]
|
||||
strb r0, [r5, 0x13]
|
||||
@@ -370,9 +370,9 @@ _08009788: .4byte 0x00000844
|
||||
thumb_func_start sub_800978C
|
||||
sub_800978C: @ 800978C
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800978C
|
||||
@@ -401,8 +401,8 @@ _080097C4: .4byte gUnknown_3003F50
|
||||
_080097C8: .4byte 0x0000efff
|
||||
thumb_func_end sub_80097A0
|
||||
|
||||
thumb_func_start sub_80097CC
|
||||
sub_80097CC: @ 80097CC
|
||||
thumb_func_start task02_080097CC
|
||||
task02_080097CC: @ 80097CC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -422,14 +422,14 @@ sub_80097CC: @ 80097CC
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
adds r0, r2, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080097F6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080097FC: .4byte gUnknown_3005090
|
||||
_08009800: .4byte gUnknown_3003F84
|
||||
thumb_func_end sub_80097CC
|
||||
thumb_func_end task02_080097CC
|
||||
|
||||
thumb_func_start sub_8009804
|
||||
sub_8009804: @ 8009804
|
||||
@@ -449,7 +449,7 @@ sub_8009804: @ 8009804
|
||||
strb r4, [r0]
|
||||
ldr r0, _08009860 @ =gUnknown_3003F38
|
||||
strb r4, [r0]
|
||||
bl sub_800A550
|
||||
bl ResetBlockReceivedFlags
|
||||
bl sub_800A294
|
||||
ldr r0, _08009864 @ =gUnknown_3000E4C
|
||||
str r4, [r0]
|
||||
@@ -459,9 +459,9 @@ sub_8009804: @ 8009804
|
||||
strb r4, [r0]
|
||||
ldr r0, _08009870 @ =gUnknown_3003F34
|
||||
strh r4, [r0]
|
||||
ldr r0, _08009874 @ =sub_80097CC
|
||||
ldr r0, _08009874 @ =task02_080097CC
|
||||
movs r1, 0x2
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _0800987C
|
||||
.align 2, 0
|
||||
_0800984C: .4byte gUnknown_3003F3C
|
||||
@@ -474,7 +474,7 @@ _08009864: .4byte gUnknown_3000E4C
|
||||
_08009868: .4byte gUnknown_3003F28
|
||||
_0800986C: .4byte gUnknown_3003F24
|
||||
_08009870: .4byte gUnknown_3003F34
|
||||
_08009874: .4byte sub_80097CC
|
||||
_08009874: .4byte task02_080097CC
|
||||
_08009878:
|
||||
bl sub_80F86F4
|
||||
_0800987C:
|
||||
@@ -579,7 +579,7 @@ _08009938:
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x3
|
||||
bls _08009910
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
cmp r7, 0xF
|
||||
@@ -610,7 +610,7 @@ _08009958:
|
||||
movs r6, 0
|
||||
strh r0, [r4]
|
||||
adds r0, r5, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
ldrh r0, [r4]
|
||||
cmp r0, r8
|
||||
beq _08009994
|
||||
@@ -679,7 +679,7 @@ _080099FA:
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
movs r3, 0
|
||||
bl sub_8070588
|
||||
bl BeginNormalPaletteFade
|
||||
_08009A16:
|
||||
ldrh r1, [r4, 0x2E]
|
||||
movs r0, 0x8
|
||||
@@ -696,7 +696,7 @@ _08009A26:
|
||||
cmp r0, 0
|
||||
beq _08009A38
|
||||
movs r0, 0x1
|
||||
bl sub_80DA364
|
||||
bl TrySavingData
|
||||
_08009A38:
|
||||
ldrh r1, [r4, 0x2E]
|
||||
movs r0, 0x4
|
||||
@@ -720,7 +720,7 @@ _08009A46:
|
||||
orrs r1, r0
|
||||
_08009A60:
|
||||
adds r0, r2, 0
|
||||
bl sub_800A890
|
||||
bl SetLinkDebugValues
|
||||
_08009A66:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -736,21 +736,21 @@ _08009A84: .4byte gUnknown_300357C
|
||||
_08009A88: .4byte gUnknown_3003F80
|
||||
thumb_func_end sub_80099D0
|
||||
|
||||
thumb_func_start sub_8009A8C
|
||||
sub_8009A8C: @ 8009A8C
|
||||
thumb_func_start c2_08009A8C
|
||||
c2_08009A8C: @ 8009A8C
|
||||
push {lr}
|
||||
bl sub_80099D0
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl sub_80098E8
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8009A8C
|
||||
thumb_func_end c2_08009A8C
|
||||
|
||||
thumb_func_start sub_8009AB0
|
||||
sub_8009AB0: @ 8009AB0
|
||||
@@ -1148,8 +1148,8 @@ _08009D9A:
|
||||
cmp r0, 0
|
||||
beq _08009DDC
|
||||
_08009DBC:
|
||||
ldr r0, _08009DD8 @ =sub_800ACD4
|
||||
bl sub_8000544
|
||||
ldr r0, _08009DD8 @ =c2_800ACD4
|
||||
bl SetMainCallback2
|
||||
b _08009E3E
|
||||
.align 2, 0
|
||||
_08009DC4: .4byte gUnknown_2022118
|
||||
@@ -1157,7 +1157,7 @@ _08009DC8: .4byte gUnknown_3003ED0
|
||||
_08009DCC: .4byte gUnknown_3003EB8
|
||||
_08009DD0: .4byte gUnknown_202273C
|
||||
_08009DD4: .4byte gUnknown_82345C0
|
||||
_08009DD8: .4byte sub_800ACD4
|
||||
_08009DD8: .4byte c2_800ACD4
|
||||
_08009DDC:
|
||||
lsls r0, r6, 24
|
||||
lsrs r0, 24
|
||||
@@ -1198,7 +1198,7 @@ _08009E0E:
|
||||
adds r2, r3
|
||||
ldrh r2, [r2]
|
||||
movs r0, 0
|
||||
bl sub_800A448
|
||||
bl SendBlock
|
||||
b _08009E3E
|
||||
.align 2, 0
|
||||
_08009E2C: .4byte gUnknown_8234598
|
||||
@@ -1768,8 +1768,8 @@ _0800A24C:
|
||||
_0800A254: .4byte gUnknown_3000E54
|
||||
thumb_func_end sub_800A1F0
|
||||
|
||||
thumb_func_start sub_800A258
|
||||
sub_800A258: @ 800A258
|
||||
thumb_func_start GetLinkPlayerTrainerId
|
||||
GetLinkPlayerTrainerId: @ 800A258
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0800A26C @ =gUnknown_202273C
|
||||
@@ -1782,7 +1782,7 @@ sub_800A258: @ 800A258
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0800A26C: .4byte gUnknown_202273C
|
||||
thumb_func_end sub_800A258
|
||||
thumb_func_end GetLinkPlayerTrainerId
|
||||
|
||||
thumb_func_start sub_800A270
|
||||
sub_800A270: @ 800A270
|
||||
@@ -1832,7 +1832,7 @@ sub_800A2A8: @ 800A2A8
|
||||
.align 2, 0
|
||||
_0800A2BC: .4byte gUnknown_3000E08
|
||||
_0800A2C0:
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
strb r0, [r4, 0x9]
|
||||
movs r0, 0x1
|
||||
strb r0, [r4, 0x8]
|
||||
@@ -1960,7 +1960,7 @@ _0800A3A8: .4byte gUnknown_3003F80
|
||||
thumb_func_start sub_800A3AC
|
||||
sub_800A3AC: @ 800A3AC
|
||||
push {lr}
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
ldr r0, _0800A3C4 @ =0x00004444
|
||||
bl sub_8009E60
|
||||
ldr r1, _0800A3C8 @ =gUnknown_2022114
|
||||
@@ -2009,8 +2009,8 @@ sub_800A3F4: @ 800A3F4
|
||||
_0800A400: .4byte 0x0000aaaa
|
||||
thumb_func_end sub_800A3F4
|
||||
|
||||
thumb_func_start sub_800A404
|
||||
sub_800A404: @ 800A404
|
||||
thumb_func_start GetMultiplayerId
|
||||
GetMultiplayerId: @ 800A404
|
||||
push {lr}
|
||||
ldr r0, _0800A418 @ =gUnknown_3003F3C
|
||||
ldrb r0, [r0]
|
||||
@@ -2025,18 +2025,18 @@ sub_800A404: @ 800A404
|
||||
_0800A418: .4byte gUnknown_3003F3C
|
||||
_0800A41C: .4byte 0x04000128
|
||||
_0800A420:
|
||||
bl sub_80FA4C8
|
||||
bl rfu_get_multiplayer_id
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
_0800A428:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_800A404
|
||||
thumb_func_end GetMultiplayerId
|
||||
|
||||
thumb_func_start sub_800A42C
|
||||
sub_800A42C: @ 800A42C
|
||||
thumb_func_start bitmask_all_link_players_but_self
|
||||
bitmask_all_link_players_but_self: @ 800A42C
|
||||
push {lr}
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
@@ -2048,10 +2048,10 @@ sub_800A42C: @ 800A42C
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_800A42C
|
||||
thumb_func_end bitmask_all_link_players_but_self
|
||||
|
||||
thumb_func_start sub_800A448
|
||||
sub_800A448: @ 800A448
|
||||
thumb_func_start SendBlock
|
||||
SendBlock: @ 800A448
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r2, 16
|
||||
@@ -2073,7 +2073,7 @@ _0800A46A:
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_800A448
|
||||
thumb_func_end SendBlock
|
||||
|
||||
thumb_func_start sub_800A474
|
||||
sub_800A474: @ 800A474
|
||||
@@ -2144,8 +2144,8 @@ _0800A4E2:
|
||||
_0800A4E8: .4byte gUnknown_3003F80
|
||||
thumb_func_end sub_800A4BC
|
||||
|
||||
thumb_func_start sub_800A4EC
|
||||
sub_800A4EC: @ 800A4EC
|
||||
thumb_func_start GetBlockReceivedStatus
|
||||
GetBlockReceivedStatus: @ 800A4EC
|
||||
push {lr}
|
||||
ldr r0, _0800A510 @ =gUnknown_3003F3C
|
||||
ldrb r0, [r0]
|
||||
@@ -2173,7 +2173,7 @@ _0800A51C:
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_800A4EC
|
||||
thumb_func_end GetBlockReceivedStatus
|
||||
|
||||
thumb_func_start sub_800A524
|
||||
sub_800A524: @ 800A524
|
||||
@@ -2201,8 +2201,8 @@ _0800A548:
|
||||
_0800A54C: .4byte gUnknown_3003EBC
|
||||
thumb_func_end sub_800A524
|
||||
|
||||
thumb_func_start sub_800A550
|
||||
sub_800A550: @ 800A550
|
||||
thumb_func_start ResetBlockReceivedFlags
|
||||
ResetBlockReceivedFlags: @ 800A550
|
||||
push {r4,lr}
|
||||
ldr r0, _0800A56C @ =gUnknown_3003F3C
|
||||
ldrb r0, [r0]
|
||||
@@ -2234,10 +2234,10 @@ _0800A57E:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800A584: .4byte gUnknown_3003EBC
|
||||
thumb_func_end sub_800A550
|
||||
thumb_func_end ResetBlockReceivedFlags
|
||||
|
||||
thumb_func_start sub_800A588
|
||||
sub_800A588: @ 800A588
|
||||
thumb_func_start ResetBlockReceivedFlag
|
||||
ResetBlockReceivedFlag: @ 800A588
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@@ -2263,7 +2263,7 @@ _0800A5B2:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800A5B8: .4byte gUnknown_3003EBC
|
||||
thumb_func_end sub_800A588
|
||||
thumb_func_end ResetBlockReceivedFlag
|
||||
|
||||
thumb_func_start sub_800A5BC
|
||||
sub_800A5BC: @ 800A5BC
|
||||
@@ -2495,8 +2495,8 @@ _0800A744: .4byte 0x00002222
|
||||
_0800A748: .4byte gUnknown_3003F80
|
||||
thumb_func_end sub_800A720
|
||||
|
||||
thumb_func_start sub_800A74C
|
||||
sub_800A74C: @ 800A74C
|
||||
thumb_func_start task00_link_test
|
||||
task00_link_test: @ 800A74C
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x20
|
||||
ldr r1, _0800A86C @ =gUnknown_82345D0
|
||||
@@ -2532,7 +2532,7 @@ sub_800A74C: @ 800A74C
|
||||
movs r2, 0xA
|
||||
movs r3, 0x2
|
||||
bl sub_800A684
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0xF
|
||||
@@ -2551,7 +2551,7 @@ sub_800A74C: @ 800A74C
|
||||
movs r2, 0x2
|
||||
movs r3, 0x2
|
||||
bl sub_800A684
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0xF
|
||||
@@ -2629,10 +2629,10 @@ _0800A880: .4byte gUnknown_3004F70
|
||||
_0800A884: .4byte gUnknown_3003E6C
|
||||
_0800A888: .4byte gUnknown_3003EB0
|
||||
_0800A88C: .4byte gUnknown_3003F88
|
||||
thumb_func_end sub_800A74C
|
||||
thumb_func_end task00_link_test
|
||||
|
||||
thumb_func_start sub_800A890
|
||||
sub_800A890: @ 800A890
|
||||
thumb_func_start SetLinkDebugValues
|
||||
SetLinkDebugValues: @ 800A890
|
||||
ldr r2, _0800A89C @ =gUnknown_3003E6C
|
||||
str r0, [r2]
|
||||
ldr r0, _0800A8A0 @ =gUnknown_3003EB0
|
||||
@@ -2641,7 +2641,7 @@ sub_800A890: @ 800A890
|
||||
.align 2, 0
|
||||
_0800A89C: .4byte gUnknown_3003E6C
|
||||
_0800A8A0: .4byte gUnknown_3003EB0
|
||||
thumb_func_end sub_800A890
|
||||
thumb_func_end SetLinkDebugValues
|
||||
|
||||
thumb_func_start sub_800A8A4
|
||||
sub_800A8A4: @ 800A8A4
|
||||
@@ -2703,7 +2703,7 @@ sub_800A900: @ 800A900
|
||||
push {r4-r7,lr}
|
||||
ldr r1, _0800A934 @ =gUnknown_3003F40
|
||||
strb r0, [r1]
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _0800A938 @ =gUnknown_3003F60
|
||||
strb r0, [r1]
|
||||
ldr r4, _0800A93C @ =gUnknown_202273C
|
||||
@@ -2826,7 +2826,7 @@ _0800A9C2:
|
||||
mov r1, r8
|
||||
adds r0, r2, r1
|
||||
adds r1, r2, r7
|
||||
bl sub_8008E28
|
||||
bl StringCompare
|
||||
cmp r0, 0
|
||||
beq _0800A9F6
|
||||
_0800A9E6:
|
||||
@@ -2834,8 +2834,8 @@ _0800A9E6:
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl sub_80098B8
|
||||
ldr r0, _0800AA20 @ =sub_800ACD4
|
||||
bl sub_8000544
|
||||
ldr r0, _0800AA20 @ =c2_800ACD4
|
||||
bl SetMainCallback2
|
||||
_0800A9F6:
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 24
|
||||
@@ -2855,7 +2855,7 @@ _0800AA10: .4byte gUnknown_3003F40
|
||||
_0800AA14: .4byte gUnknown_20227C8
|
||||
_0800AA18: .4byte gUnknown_202273C
|
||||
_0800AA1C: .4byte gUnknown_3003EAC
|
||||
_0800AA20: .4byte sub_800ACD4
|
||||
_0800AA20: .4byte c2_800ACD4
|
||||
thumb_func_end sub_800A9A4
|
||||
|
||||
thumb_func_start sub_800AA24
|
||||
@@ -2926,7 +2926,7 @@ sub_800AA80: @ 800AA80
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _0800AA98
|
||||
bl sub_80FA28C
|
||||
bl task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
b _0800AAAC
|
||||
.align 2, 0
|
||||
_0800AA94: .4byte gUnknown_3003F3C
|
||||
@@ -2958,7 +2958,7 @@ sub_800AAC0: @ 800AAC0
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _0800AAD4
|
||||
bl sub_80FA28C
|
||||
bl task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
b _0800AAFC
|
||||
.align 2, 0
|
||||
_0800AAD0: .4byte gUnknown_3003F3C
|
||||
@@ -3192,8 +3192,8 @@ sub_800AC58: @ 800AC58
|
||||
ldr r0, _0800ACB0 @ =gUnknown_3003FA0
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r1, 0x5]
|
||||
ldr r0, _0800ACB4 @ =sub_800ACD4
|
||||
bl sub_8000544
|
||||
ldr r0, _0800ACB4 @ =c2_800ACD4
|
||||
bl SetMainCallback2
|
||||
_0800AC8E:
|
||||
ldr r1, _0800ACB8 @ =gUnknown_3003EAC
|
||||
movs r0, 0x1
|
||||
@@ -3209,7 +3209,7 @@ _0800ACA4: .4byte gUnknown_3003F38
|
||||
_0800ACA8: .4byte gUnknown_2022854
|
||||
_0800ACAC: .4byte gUnknown_3004F70
|
||||
_0800ACB0: .4byte gUnknown_3003FA0
|
||||
_0800ACB4: .4byte sub_800ACD4
|
||||
_0800ACB4: .4byte c2_800ACD4
|
||||
_0800ACB8: .4byte gUnknown_3003EAC
|
||||
thumb_func_end sub_800AC58
|
||||
|
||||
@@ -3228,12 +3228,12 @@ sub_800ACBC: @ 800ACBC
|
||||
_0800ACD0: .4byte gUnknown_2022854
|
||||
thumb_func_end sub_800ACBC
|
||||
|
||||
thumb_func_start sub_800ACD4
|
||||
sub_800ACD4: @ 800ACD4
|
||||
thumb_func_start c2_800ACD4
|
||||
c2_800ACD4: @ 800ACD4
|
||||
push {r4,lr}
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
ldr r0, _0800ADE0 @ =gMPlay_SE1
|
||||
bl m4aMPlayStop
|
||||
ldr r0, _0800ADE4 @ =gMPlay_SE2
|
||||
@@ -3243,16 +3243,16 @@ sub_800ACD4: @ 800ACD4
|
||||
ldr r0, _0800ADEC @ =gHeap
|
||||
movs r1, 0xE0
|
||||
lsls r1, 9
|
||||
bl sub_8002B80
|
||||
bl sub_8006B10
|
||||
bl sub_80088F0
|
||||
bl sub_8070A84
|
||||
bl InitHeap
|
||||
bl ResetSpriteData
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetPaletteFadeControl
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
movs r2, 0x2
|
||||
bl sub_8070424
|
||||
bl sub_80773BC
|
||||
bl sub_8087E64
|
||||
bl FillPalette
|
||||
bl ResetTasks
|
||||
bl remove_some_task
|
||||
ldr r1, _0800ADF0 @ =gUnknown_3003F3C
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0
|
||||
@@ -3267,7 +3267,7 @@ _0800AD2C:
|
||||
bl sub_80F85F8
|
||||
_0800AD30:
|
||||
ldr r0, _0800ADF8 @ =sub_800978C
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
movs r0, 0
|
||||
bl sub_8001618
|
||||
ldr r1, _0800ADFC @ =gUnknown_82345E8
|
||||
@@ -3277,57 +3277,57 @@ _0800AD30:
|
||||
ldr r4, _0800AE00 @ =gUnknown_2022860
|
||||
movs r0, 0x80
|
||||
lsls r0, 4
|
||||
bl sub_8002B9C
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
str r1, [r4]
|
||||
movs r0, 0x1
|
||||
bl sub_8001FA0
|
||||
bl SetBgTilemapBuffer
|
||||
ldr r0, _0800AE04 @ =gUnknown_82345F0
|
||||
bl sub_8003B24
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
beq _0800ADD8
|
||||
bl sub_8002C28
|
||||
bl sub_80F6808
|
||||
bl reset_temp_tile_data_buffers
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x10
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x12
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x14
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r0, 0x16
|
||||
movs r1, 0
|
||||
bl sub_8000A38
|
||||
bl SetGpuReg
|
||||
movs r1, 0xE0
|
||||
lsls r1, 8
|
||||
movs r0, 0
|
||||
bl sub_8000B14
|
||||
bl ClearGpuRegBits
|
||||
ldr r0, _0800AE08 @ =gUnknown_841F408
|
||||
movs r1, 0xF0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
ldr r1, _0800AE0C @ =gUnknown_3003530
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
ldr r0, _0800AE10 @ =sub_80094D4
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl sub_8071A94
|
||||
bl CreateTask
|
||||
bl StopMapMusic
|
||||
ldr r1, _0800AE14 @ =gUnknown_30030F0
|
||||
movs r0, 0
|
||||
str r0, [r1]
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _0800AE18 @ =sub_800AF2C
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_0800ADD8:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -3348,7 +3348,7 @@ _0800AE0C: .4byte gUnknown_3003530
|
||||
_0800AE10: .4byte sub_80094D4
|
||||
_0800AE14: .4byte gUnknown_30030F0
|
||||
_0800AE18: .4byte sub_800AF2C
|
||||
thumb_func_end sub_800ACD4
|
||||
thumb_func_end c2_800ACD4
|
||||
|
||||
thumb_func_start sub_800AE1C
|
||||
sub_800AE1C: @ 800AE1C
|
||||
@@ -3365,19 +3365,19 @@ sub_800AE1C: @ 800AE1C
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002040
|
||||
bl CopyToBgTilemapBuffer
|
||||
movs r0, 0x1
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r0, _0800AEC0 @ =gUnknown_8231EC4
|
||||
movs r1, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r4, _0800AEC4 @ =gUnknown_8234610
|
||||
str r4, [sp]
|
||||
str r5, [sp, 0x4]
|
||||
@@ -3398,9 +3398,9 @@ sub_800AE1C: @ 800AE1C
|
||||
movs r3, 0x2
|
||||
bl sub_812E51C
|
||||
movs r0, 0
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_8003F20
|
||||
@@ -3408,9 +3408,9 @@ sub_800AE1C: @ 800AE1C
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
movs r0, 0x1
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -3430,10 +3430,10 @@ sub_800AED0: @ 800AED0
|
||||
sub sp, 0xC
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldr r0, _0800AF24 @ =gUnknown_8234610
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -3446,9 +3446,9 @@ sub_800AED0: @ 800AED0
|
||||
movs r3, 0
|
||||
bl sub_812E51C
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_8003F20
|
||||
@@ -3456,7 +3456,7 @@ sub_800AED0: @ 800AED0
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
movs r0, 0
|
||||
bl sub_80019BC
|
||||
bl ShowBg
|
||||
add sp, 0xC
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -3757,8 +3757,8 @@ sub_800B110: @ 800B110
|
||||
cmp r0, 0
|
||||
beq _0800B160
|
||||
_0800B15A:
|
||||
ldr r0, _0800B174 @ =sub_800ACD4
|
||||
bl sub_8000544
|
||||
ldr r0, _0800B174 @ =c2_800ACD4
|
||||
bl SetMainCallback2
|
||||
_0800B160:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -3767,11 +3767,11 @@ _0800B160:
|
||||
_0800B168: .4byte gUnknown_2022118
|
||||
_0800B16C: .4byte gUnknown_202273C
|
||||
_0800B170: .4byte gUnknown_82345C0
|
||||
_0800B174: .4byte sub_800ACD4
|
||||
_0800B174: .4byte c2_800ACD4
|
||||
thumb_func_end sub_800B110
|
||||
|
||||
thumb_func_start sub_800B178
|
||||
sub_800B178: @ 800B178
|
||||
thumb_func_start HandleLinkConnection
|
||||
HandleLinkConnection: @ 800B178
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _0800B1B0 @ =gUnknown_3003F3C
|
||||
ldrb r0, [r0]
|
||||
@@ -3825,7 +3825,7 @@ _0800B1EE:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_800B178
|
||||
thumb_func_end HandleLinkConnection
|
||||
|
||||
thumb_func_start sub_800B1F4
|
||||
sub_800B1F4: @ 800B1F4
|
||||
@@ -3926,7 +3926,7 @@ sub_800B284: @ 800B284
|
||||
adds r2, 0x8
|
||||
ldrb r1, [r0, 0x1A]
|
||||
adds r0, r2, 0
|
||||
bl sub_80093BC
|
||||
bl ConvertInternationalString
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800B284
|
||||
@@ -3992,7 +3992,7 @@ sub_800B2F4: @ 800B2F4
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
movs r0, 0x80
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
ldr r0, _0800B360 @ =0x0400012a
|
||||
strh r4, [r0]
|
||||
movs r5, 0
|
||||
@@ -4238,7 +4238,7 @@ sub_800B4F0: @ 800B4F0
|
||||
movs r0, 0x41
|
||||
strh r0, [r1]
|
||||
movs r0, 0x40
|
||||
bl sub_8000B68
|
||||
bl EnableInterrupts
|
||||
_0800B50E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -4570,14 +4570,14 @@ _0800B77E:
|
||||
_0800B784: .4byte gUnknown_3000E64
|
||||
thumb_func_end sub_800B718
|
||||
|
||||
thumb_func_start sub_800B788
|
||||
sub_800B788: @ 800B788
|
||||
thumb_func_start Timer3Intr
|
||||
Timer3Intr: @ 800B788
|
||||
push {lr}
|
||||
bl sub_800BAF8
|
||||
bl sub_800B820
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800B788
|
||||
thumb_func_end Timer3Intr
|
||||
|
||||
thumb_func_start sub_800B798
|
||||
sub_800B798: @ 800B798
|
||||
|
||||
+166
-166
File diff suppressed because it is too large
Load Diff
+142
-142
@@ -271,9 +271,9 @@ _080F8818:
|
||||
strh r1, [r0, 0xA]
|
||||
ldr r0, _080F8868 @ =sub_80FA834
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080F8852:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -512,7 +512,7 @@ _080F8A0C:
|
||||
movs r1, 0x2
|
||||
strb r1, [r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _080F8A8A
|
||||
.align 2, 0
|
||||
_080F8A24: .4byte gUnknown_3005450
|
||||
@@ -547,7 +547,7 @@ _080F8A2C:
|
||||
movs r1, 0x8
|
||||
strh r1, [r0, 0xA]
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r4, _080F8A9C @ =gUnknown_203AC08
|
||||
ldrb r0, [r4, 0xF]
|
||||
cmp r0, 0
|
||||
@@ -559,7 +559,7 @@ _080F8A2C:
|
||||
_080F8A82:
|
||||
ldr r0, _080F8AA0 @ =sub_80FA834
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
_080F8A8A:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -756,7 +756,7 @@ _080F8C28:
|
||||
bne _080F8CE6
|
||||
strb r0, [r6, 0xC]
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _080F8C70 @ =gUnknown_3005090
|
||||
lsls r1, r5, 2
|
||||
adds r1, r5
|
||||
@@ -768,7 +768,7 @@ _080F8C28:
|
||||
beq _080F8C78
|
||||
ldr r0, _080F8C74 @ =sub_80FACF0
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _080F8CE6
|
||||
.align 2, 0
|
||||
_080F8C6C: .4byte 0x000008f6
|
||||
@@ -777,7 +777,7 @@ _080F8C74: .4byte sub_80FACF0
|
||||
_080F8C78:
|
||||
ldr r0, _080F8C84 @ =sub_80FA834
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _080F8CE6
|
||||
.align 2, 0
|
||||
_080F8C84: .4byte sub_80FA834
|
||||
@@ -815,13 +815,13 @@ _080F8C9C:
|
||||
strb r4, [r6, 0xC]
|
||||
ldr r0, _080F8CF8 @ =sub_80FA834
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
movs r1, 0x9A
|
||||
lsls r1, 4
|
||||
adds r0, r6, r1
|
||||
strb r4, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080F8CE6:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -905,7 +905,7 @@ _080F8D2A:
|
||||
bl rfu_UNI_clearRecvNewDataFlag
|
||||
_080F8D84:
|
||||
movs r0, 0x1
|
||||
bl sub_80FD3F0
|
||||
bl rfu_REQ_sendData_wrapper
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -958,7 +958,7 @@ _080F8DEC:
|
||||
bne _080F8E14
|
||||
ldr r0, _080F8E10 @ =sub_80F893C
|
||||
_080F8DF2:
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -966,7 +966,7 @@ _080F8DF2:
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x67
|
||||
ldrb r0, [r0]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_80F85F8
|
||||
b _080F8E34
|
||||
.align 2, 0
|
||||
@@ -975,7 +975,7 @@ _080F8E14:
|
||||
cmp r0, 0x2
|
||||
bne _080F8E34
|
||||
ldr r0, _080F8E6C @ =sub_80F8B34
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -983,7 +983,7 @@ _080F8E14:
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x67
|
||||
ldrb r0, [r0]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
bl sub_80F85F8
|
||||
_080F8E34:
|
||||
movs r5, 0
|
||||
@@ -993,16 +993,16 @@ _080F8E38:
|
||||
adds r0, r6
|
||||
ldr r4, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080F8E5A
|
||||
adds r0, r4, 0
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080F8E5A:
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
@@ -1030,7 +1030,7 @@ sub_80F8E74: @ 80F8E74
|
||||
bls _080F8E92
|
||||
ldr r0, _080F8E9C @ =sub_80F8738
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r1, _080F8EA0 @ =gUnknown_3005450
|
||||
adds r1, 0x67
|
||||
strb r0, [r1]
|
||||
@@ -1115,7 +1115,7 @@ sub_80F8F10: @ 80F8F10
|
||||
bls _080F8F2E
|
||||
ldr r0, _080F8F38 @ =sub_80F893C
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r1, _080F8F3C @ =gUnknown_3005450
|
||||
adds r1, 0x67
|
||||
strb r0, [r1]
|
||||
@@ -1410,7 +1410,7 @@ sub_80F911C: @ 80F911C
|
||||
bl rfu_REQ_recvData
|
||||
bl rfu_waitREQComplete
|
||||
movs r0, 0
|
||||
bl sub_80FD3F0
|
||||
bl rfu_REQ_sendData_wrapper
|
||||
b _080F91F6
|
||||
.align 2, 0
|
||||
_080F9138: .4byte gUnknown_3005450
|
||||
@@ -1484,7 +1484,7 @@ _080F91CC:
|
||||
ldrb r0, [r0]
|
||||
bl rfu_UNI_readySendData
|
||||
movs r0, 0x1
|
||||
bl sub_80FD3F0
|
||||
bl rfu_REQ_sendData_wrapper
|
||||
b _080F91F0
|
||||
.align 2, 0
|
||||
_080F91E4: .4byte gUnknown_3005450
|
||||
@@ -1785,7 +1785,7 @@ _080F93FA:
|
||||
strb r0, [r1]
|
||||
ldr r0, _080F9464 @ =sub_80FAA94
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _080F9476
|
||||
.align 2, 0
|
||||
_080F9444: .4byte gUnknown_3005450
|
||||
@@ -2237,8 +2237,8 @@ _080F97B0: .4byte 0x00000996
|
||||
_080F97B4: .4byte 0x000008f6
|
||||
thumb_func_end sub_80F9770
|
||||
|
||||
thumb_func_start sub_80F97B8
|
||||
sub_80F97B8: @ 80F97B8
|
||||
thumb_func_start rfu_func_080F97B8
|
||||
rfu_func_080F97B8: @ 80F97B8
|
||||
push {lr}
|
||||
ldr r0, _080F97F0 @ =gUnknown_3003F64
|
||||
ldrb r0, [r0]
|
||||
@@ -2271,7 +2271,7 @@ _080F97F0: .4byte gUnknown_3003F64
|
||||
_080F97F4: .4byte gUnknown_3005028
|
||||
_080F97F8: .4byte gUnknown_30030E4
|
||||
_080F97FC: .4byte gUnknown_3001188
|
||||
thumb_func_end sub_80F97B8
|
||||
thumb_func_end rfu_func_080F97B8
|
||||
|
||||
thumb_func_start sub_80F9800
|
||||
sub_80F9800: @ 80F9800
|
||||
@@ -2287,7 +2287,7 @@ sub_80F9808: @ 80F9808
|
||||
movs r2, 0
|
||||
ldr r0, _080F9820 @ =gUnknown_3005450
|
||||
ldr r1, [r0]
|
||||
ldr r0, _080F9824 @ =sub_80F97B8
|
||||
ldr r0, _080F9824 @ =rfu_func_080F97B8
|
||||
cmp r1, r0
|
||||
bne _080F9818
|
||||
movs r2, 0x1
|
||||
@@ -2297,7 +2297,7 @@ _080F9818:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080F9820: .4byte gUnknown_3005450
|
||||
_080F9824: .4byte sub_80F97B8
|
||||
_080F9824: .4byte rfu_func_080F97B8
|
||||
thumb_func_end sub_80F9808
|
||||
|
||||
thumb_func_start sub_80F9828
|
||||
@@ -2313,7 +2313,7 @@ sub_80F9828: @ 80F9828
|
||||
movs r3, 0x1
|
||||
bl AGBAssert
|
||||
_080F983E:
|
||||
ldr r0, _080F9858 @ =sub_80F97B8
|
||||
ldr r0, _080F9858 @ =rfu_func_080F97B8
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -2323,7 +2323,7 @@ _080F9848: .4byte gUnknown_3005450
|
||||
_080F984C: .4byte gUnknown_843ED94
|
||||
_080F9850: .4byte 0x000005c1
|
||||
_080F9854: .4byte gUnknown_843EDC4
|
||||
_080F9858: .4byte sub_80F97B8
|
||||
_080F9858: .4byte rfu_func_080F97B8
|
||||
thumb_func_end sub_80F9828
|
||||
|
||||
thumb_func_start sub_80F985C
|
||||
@@ -3179,7 +3179,7 @@ _080F9EC0:
|
||||
negs r4, r0
|
||||
orrs r4, r0
|
||||
lsrs r4, 31
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x7D
|
||||
strb r0, [r1]
|
||||
@@ -3218,7 +3218,7 @@ _080F9F14:
|
||||
lsls r0, 8
|
||||
bl sub_80F9D04
|
||||
ldr r0, _080F9F3C @ =gUnknown_3005450
|
||||
ldr r1, _080F9F40 @ =sub_80F9F44
|
||||
ldr r1, _080F9F40 @ =rfufunc_80F9F44
|
||||
str r1, [r0]
|
||||
adds r0, 0x5B
|
||||
movs r1, 0
|
||||
@@ -3234,11 +3234,11 @@ _080F9F2A:
|
||||
.align 2, 0
|
||||
_080F9F38: .4byte gUnknown_2022618
|
||||
_080F9F3C: .4byte gUnknown_3005450
|
||||
_080F9F40: .4byte sub_80F9F44
|
||||
_080F9F40: .4byte rfufunc_80F9F44
|
||||
thumb_func_end sub_80F9E60
|
||||
|
||||
thumb_func_start sub_80F9F44
|
||||
sub_80F9F44: @ 80F9F44
|
||||
thumb_func_start rfufunc_80F9F44
|
||||
rfufunc_80F9F44: @ 80F9F44
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _080F9F74 @ =gUnknown_3003F50
|
||||
ldrh r0, [r0]
|
||||
@@ -3266,7 +3266,7 @@ sub_80F9F44: @ 80F9F44
|
||||
_080F9F74: .4byte gUnknown_3003F50
|
||||
_080F9F78: .4byte gUnknown_3005450
|
||||
_080F9F7C:
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
ldr r1, _080F9FA0 @ =gUnknown_3003ED0
|
||||
lsls r0, 24
|
||||
lsrs r0, 20
|
||||
@@ -3287,7 +3287,7 @@ _080F9F98:
|
||||
.align 2, 0
|
||||
_080F9FA0: .4byte gUnknown_3003ED0
|
||||
_080F9FA4: .4byte sub_80F9FA8
|
||||
thumb_func_end sub_80F9F44
|
||||
thumb_func_end rfufunc_80F9F44
|
||||
|
||||
thumb_func_start sub_80F9FA8
|
||||
sub_80F9FA8: @ 80F9FA8
|
||||
@@ -3339,7 +3339,7 @@ _080F9FC8:
|
||||
adds r0, 0x7C
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
ldr r0, _080FA01C @ =sub_80FA020
|
||||
ldr r0, _080FA01C @ =rfufunc_80FA020
|
||||
mov r1, r12
|
||||
str r0, [r1]
|
||||
_080FA00C:
|
||||
@@ -3349,11 +3349,11 @@ _080FA00C:
|
||||
.align 2, 0
|
||||
_080FA014: .4byte gUnknown_3005450
|
||||
_080FA018: .4byte gUnknown_3003F50
|
||||
_080FA01C: .4byte sub_80FA020
|
||||
_080FA01C: .4byte rfufunc_80FA020
|
||||
thumb_func_end sub_80F9FA8
|
||||
|
||||
thumb_func_start sub_80FA020
|
||||
sub_80FA020: @ 80FA020
|
||||
thumb_func_start rfufunc_80FA020
|
||||
rfufunc_80FA020: @ 80FA020
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -3361,7 +3361,7 @@ sub_80FA020: @ 80FA020
|
||||
ldr r5, _080FA0C8 @ =gUnknown_3005450
|
||||
ldr r0, [r5, 0x70]
|
||||
mov r8, r0
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldrb r0, [r5, 0xC]
|
||||
@@ -3459,7 +3459,7 @@ _080FA0EC:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80FA020
|
||||
thumb_func_end rfufunc_80FA020
|
||||
|
||||
thumb_func_start sub_80FA0F8
|
||||
sub_80FA0F8: @ 80FA0F8
|
||||
@@ -3666,7 +3666,7 @@ sub_80FA25C: @ 80FA25C
|
||||
ldr r0, _080FA288 @ =sub_80FA224
|
||||
str r0, [r2]
|
||||
adds r0, r3, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FA27C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -3676,30 +3676,30 @@ _080FA284: .4byte 0x00000991
|
||||
_080FA288: .4byte sub_80FA224
|
||||
thumb_func_end sub_80FA25C
|
||||
|
||||
thumb_func_start sub_80FA28C
|
||||
sub_80FA28C: @ 80FA28C
|
||||
thumb_func_start task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
task_add_05_task_del_08FA224_when_no_RfuFunc: @ 80FA28C
|
||||
push {r4,lr}
|
||||
ldr r4, _080FA2AC @ =sub_80FA25C
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080FA2A4
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
_080FA2A4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080FA2AC: .4byte sub_80FA25C
|
||||
thumb_func_end sub_80FA28C
|
||||
thumb_func_end task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
|
||||
thumb_func_start sub_80FA2B0
|
||||
sub_80FA2B0: @ 80FA2B0
|
||||
push {r4,r5,lr}
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FA2DE
|
||||
@@ -3812,7 +3812,7 @@ _080FA384: .4byte sub_80FA2B0
|
||||
thumb_func_start sub_80FA388
|
||||
sub_80FA388: @ 80FA388
|
||||
push {r4,lr}
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FA3C4
|
||||
@@ -3982,8 +3982,8 @@ _080FA4C0: .4byte gUnknown_3005450
|
||||
_080FA4C4: .4byte 0x00000991
|
||||
thumb_func_end sub_80FA4A8
|
||||
|
||||
thumb_func_start sub_80FA4C8
|
||||
sub_80FA4C8: @ 80FA4C8
|
||||
thumb_func_start rfu_get_multiplayer_id
|
||||
rfu_get_multiplayer_id: @ 80FA4C8
|
||||
push {lr}
|
||||
ldr r1, _080FA4DC @ =gUnknown_3005450
|
||||
ldrb r0, [r1, 0xC]
|
||||
@@ -4001,7 +4001,7 @@ _080FA4E4:
|
||||
_080FA4E6:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80FA4C8
|
||||
thumb_func_end rfu_get_multiplayer_id
|
||||
|
||||
thumb_func_start sub_80FA4EC
|
||||
sub_80FA4EC: @ 80FA4EC
|
||||
@@ -4467,7 +4467,7 @@ sub_80FA834: @ 80FA834
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FA85C:
|
||||
ldr r2, _080FA888 @ =gUnknown_3005090
|
||||
lsls r1, r6, 2
|
||||
@@ -4508,7 +4508,7 @@ _080FA89E:
|
||||
bne _080FA8AA
|
||||
b _080FA9BC
|
||||
_080FA8AA:
|
||||
bl sub_800A550
|
||||
bl ResetBlockReceivedFlags
|
||||
bl sub_800B0B4
|
||||
b _080FA930
|
||||
_080FA8B4:
|
||||
@@ -4608,7 +4608,7 @@ _080FA956:
|
||||
_080FA968: .4byte gUnknown_3005090
|
||||
_080FA96C:
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r1, _080FA9C4 @ =gUnknown_3003F64
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
@@ -4753,7 +4753,7 @@ sub_80FAA58: @ 80FAA58
|
||||
adds r1, r4, 0
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
_080FAA84:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -4795,7 +4795,7 @@ sub_80FAA94: @ 80FAA94
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FAAD2:
|
||||
ldr r0, _080FAB04 @ =gUnknown_3005090
|
||||
lsls r2, r6, 2
|
||||
@@ -4838,7 +4838,7 @@ _080FAB24:
|
||||
b _080FACD6
|
||||
_080FAB2E:
|
||||
adds r0, r4, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
movs r0, 0xF0
|
||||
lsls r0, 7
|
||||
bl sub_80F9D04
|
||||
@@ -4859,7 +4859,7 @@ _080FAB4E:
|
||||
.align 2, 0
|
||||
_080FAB58: .4byte gUnknown_3003F50
|
||||
_080FAB5C:
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
asrs r0, r4
|
||||
@@ -4870,7 +4870,7 @@ _080FAB5C:
|
||||
b _080FACD6
|
||||
_080FAB70:
|
||||
adds r0, r4, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
lsls r2, r4, 8
|
||||
ldr r0, _080FAB9C @ =gUnknown_2022118
|
||||
adds r2, r0
|
||||
@@ -4958,7 +4958,7 @@ _080FAC04:
|
||||
ldr r1, _080FAC40 @ =gUnknown_2022618
|
||||
movs r0, 0
|
||||
movs r2, 0xA0
|
||||
bl sub_800A448
|
||||
bl SendBlock
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FACD6
|
||||
@@ -5000,7 +5000,7 @@ _080FAC78:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FACD6
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -5012,7 +5012,7 @@ _080FAC78:
|
||||
ldr r2, _080FACE4 @ =0x0100007e
|
||||
bl CpuSet
|
||||
movs r0, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
ldr r1, _080FACE8 @ =gUnknown_3005450
|
||||
movs r5, 0x9A
|
||||
lsls r5, 4
|
||||
@@ -5039,7 +5039,7 @@ _080FACC0:
|
||||
ble _080FACC0
|
||||
_080FACD0:
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FACD6:
|
||||
add sp, 0x4
|
||||
pop {r4-r7}
|
||||
@@ -5067,7 +5067,7 @@ sub_80FACF0: @ 80FACF0
|
||||
cmp r0, 0x1
|
||||
bhi _080FAD0E
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FAD0E:
|
||||
ldr r1, _080FAD30 @ =gUnknown_3005090
|
||||
lsls r0, r5, 2
|
||||
@@ -5098,7 +5098,7 @@ _080FAD3A:
|
||||
ldr r1, _080FAD50 @ =gUnknown_2022618
|
||||
movs r0, 0
|
||||
movs r2, 0x3C
|
||||
bl sub_800A448
|
||||
bl SendBlock
|
||||
b _080FAD5E
|
||||
.align 2, 0
|
||||
_080FAD50: .4byte gUnknown_2022618
|
||||
@@ -5113,7 +5113,7 @@ _080FAD5E:
|
||||
strh r0, [r4, 0x8]
|
||||
b _080FAD8A
|
||||
_080FAD66:
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
movs r4, 0x1
|
||||
adds r1, r4, 0
|
||||
ands r1, r0
|
||||
@@ -5122,11 +5122,11 @@ _080FAD66:
|
||||
ldr r0, _080FAD90 @ =gUnknown_2022118
|
||||
bl sub_80FA9FC
|
||||
movs r0, 0
|
||||
bl sub_800A588
|
||||
bl ResetBlockReceivedFlag
|
||||
ldr r0, _080FAD94 @ =gUnknown_3003F64
|
||||
strb r4, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FAD8A:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -5159,9 +5159,9 @@ sub_80FAD98: @ 80FAD98
|
||||
movs r0, 0x2
|
||||
strb r0, [r1]
|
||||
_080FADC0:
|
||||
ldr r4, _080FAE24 @ =sub_800ACD4
|
||||
ldr r4, _080FAE24 @ =c2_800ACD4
|
||||
adds r0, r4, 0
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
str r4, [r6, 0x8]
|
||||
ldrh r0, [r5, 0xA]
|
||||
lsls r4, r0, 16
|
||||
@@ -5201,7 +5201,7 @@ _080FAE14: .4byte gUnknown_3005E10
|
||||
_080FAE18: .4byte gUnknown_30030F0
|
||||
_080FAE1C: .4byte sub_814208C
|
||||
_080FAE20: .4byte gUnknown_3003F3C
|
||||
_080FAE24: .4byte sub_800ACD4
|
||||
_080FAE24: .4byte c2_800ACD4
|
||||
_080FAE28: .4byte 0x0000069e
|
||||
_080FAE2C: .4byte 0x000008d2
|
||||
_080FAE30:
|
||||
@@ -5239,8 +5239,8 @@ _080FAE6C: .4byte 0x0000069f
|
||||
_080FAE70: .4byte gUnknown_3005E10
|
||||
thumb_func_end sub_80FAD98
|
||||
|
||||
thumb_func_start sub_80FAE74
|
||||
sub_80FAE74: @ 80FAE74
|
||||
thumb_func_start rfu_REQ_recvData_then_sendData
|
||||
rfu_REQ_recvData_then_sendData: @ 80FAE74
|
||||
push {lr}
|
||||
ldr r0, _080FAE90 @ =gUnknown_3005E10
|
||||
ldrb r0, [r0, 0x6]
|
||||
@@ -5249,13 +5249,13 @@ sub_80FAE74: @ 80FAE74
|
||||
bl rfu_REQ_recvData
|
||||
bl rfu_waitREQComplete
|
||||
movs r0, 0
|
||||
bl sub_80FD3F0
|
||||
bl rfu_REQ_sendData_wrapper
|
||||
_080FAE8C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080FAE90: .4byte gUnknown_3005E10
|
||||
thumb_func_end sub_80FAE74
|
||||
thumb_func_end rfu_REQ_recvData_then_sendData
|
||||
|
||||
thumb_func_start sub_80FAE94
|
||||
sub_80FAE94: @ 80FAE94
|
||||
@@ -5265,7 +5265,7 @@ sub_80FAE94: @ 80FAE94
|
||||
ldr r1, _080FAECC @ =0x00000985
|
||||
adds r0, r4, r1
|
||||
strb r5, [r0]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_80FDA30
|
||||
@@ -5297,7 +5297,7 @@ _080FAEDC:
|
||||
adds r5, r0, 0
|
||||
b _080FAEE8
|
||||
_080FAEE4:
|
||||
bl sub_80FAE74
|
||||
bl rfu_REQ_recvData_then_sendData
|
||||
_080FAEE8:
|
||||
adds r0, r5, 0
|
||||
pop {r4,r5}
|
||||
@@ -5337,7 +5337,7 @@ sub_80FAF1C: @ 80FAF1C
|
||||
ldr r0, _080FAF2C @ =gUnknown_3005E00
|
||||
ldr r1, _080FAF30 @ =gUnknown_300500C
|
||||
ldr r1, [r1]
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -6542,7 +6542,7 @@ _080FB804:
|
||||
strb r0, [r1]
|
||||
ldr r0, _080FB82C @ =sub_80FC028
|
||||
movs r1, 0x2
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
b _080FB9C2
|
||||
.align 2, 0
|
||||
_080FB824: .4byte gUnknown_3005450
|
||||
@@ -6684,7 +6684,7 @@ _080FB934:
|
||||
cmp r0, 0
|
||||
bne _080FB95A
|
||||
ldr r0, _080FB974 @ =sub_80F8B34
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -6821,13 +6821,13 @@ sub_80FBA2C: @ 80FBA2C
|
||||
_080FBA34: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80FBA2C
|
||||
|
||||
thumb_func_start sub_80FBA38
|
||||
sub_80FBA38: @ 80FBA38
|
||||
thumb_func_start LinkVSync
|
||||
LinkVSync: @ 80FBA38
|
||||
push {lr}
|
||||
bl sub_80FDA14
|
||||
bl rfu_syncVBlank_
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80FBA38
|
||||
thumb_func_end LinkVSync
|
||||
|
||||
thumb_func_start sub_80FBA44
|
||||
sub_80FBA44: @ 80FBA44
|
||||
@@ -6850,9 +6850,9 @@ _080FBA60: .4byte 0x05000014
|
||||
thumb_func_start sub_80FBA64
|
||||
sub_80FBA64: @ 80FBA64
|
||||
push {lr}
|
||||
bl sub_8007320
|
||||
bl sub_8007610
|
||||
bl sub_8070474
|
||||
bl LoadOam
|
||||
bl ProcessSpriteCopyRequests
|
||||
bl TransferPlttBuffer
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80FBA64
|
||||
@@ -6860,12 +6860,12 @@ sub_80FBA64: @ 80FBA64
|
||||
thumb_func_start sub_80FBA78
|
||||
sub_80FBA78: @ 80FBA78
|
||||
push {r4,lr}
|
||||
bl sub_8006B10
|
||||
bl sub_80088F0
|
||||
bl sub_80773BC
|
||||
bl sub_8070528
|
||||
bl ResetSpriteData
|
||||
bl FreeAllSpritePalettes
|
||||
bl ResetTasks
|
||||
bl ResetPaletteFade
|
||||
ldr r0, _080FBAF4 @ =sub_80FBA64
|
||||
bl sub_80006F4
|
||||
bl SetVBlankCallback
|
||||
bl sub_8009480
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@@ -6881,7 +6881,7 @@ sub_80FBA78: @ 80FBA78
|
||||
bl sub_8044EE8
|
||||
movs r4, 0
|
||||
_080FBAB4:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
ldr r1, _080FBB04 @ =gUnknown_300500C
|
||||
ldr r1, [r1]
|
||||
adds r1, 0xA
|
||||
@@ -6893,14 +6893,14 @@ _080FBAB4:
|
||||
movs r1, 0xAA
|
||||
lsls r1, 5
|
||||
movs r0, 0
|
||||
bl sub_8000A38
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl SetGpuReg
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
bl sub_80FBB20
|
||||
ldr r0, _080FBB08 @ =sub_80FBB74
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_080FBAEC:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -6918,7 +6918,7 @@ _080FBB08: .4byte sub_80FBB74
|
||||
sub_80FBB0C: @ 80FBB0C
|
||||
push {lr}
|
||||
ldr r0, _080FBB1C @ =sub_80F8B34
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -6932,13 +6932,13 @@ sub_80FBB20: @ 80FBB20
|
||||
push {r4,lr}
|
||||
ldr r4, _080FBB44 @ =nullsub_89
|
||||
adds r0, r4, 0
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080FBB3E
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
ldr r1, _080FBB48 @ =gUnknown_3005450
|
||||
adds r1, 0x66
|
||||
strb r0, [r1]
|
||||
@@ -6955,7 +6955,7 @@ _080FBB48: .4byte gUnknown_3005450
|
||||
sub_80FBB4C: @ 80FBB4C
|
||||
push {lr}
|
||||
ldr r0, _080FBB6C @ =nullsub_89
|
||||
bl sub_8077650
|
||||
bl FuncIsActiveTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -6963,7 +6963,7 @@ sub_80FBB4C: @ 80FBB4C
|
||||
ldr r0, _080FBB70 @ =gUnknown_3005450
|
||||
adds r0, 0x66
|
||||
ldrb r0, [r0]
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FBB66:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -6975,10 +6975,10 @@ _080FBB70: .4byte gUnknown_3005450
|
||||
thumb_func_start sub_80FBB74
|
||||
sub_80FBB74: @ 80FBB74
|
||||
push {lr}
|
||||
bl sub_8077578
|
||||
bl sub_8006B5C
|
||||
bl sub_8006BA8
|
||||
bl sub_80704D0
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
bl UpdatePaletteFade
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80FBB74
|
||||
@@ -7068,7 +7068,7 @@ sub_80FBC00: @ 80FBC00
|
||||
strh r0, [r2, 0x12]
|
||||
ldr r0, _080FBC60 @ =sub_80F8B34
|
||||
movs r1, 0x1
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
adds r4, 0x67
|
||||
strb r0, [r4]
|
||||
_080FBC46:
|
||||
@@ -7133,7 +7133,7 @@ _080FBC8E:
|
||||
adds r1, r5
|
||||
adds r1, 0x15
|
||||
ldr r0, [sp]
|
||||
bl sub_8008E28
|
||||
bl StringCompare
|
||||
cmp r0, 0
|
||||
bne _080FBCD8
|
||||
cmp r10, r6
|
||||
@@ -7303,7 +7303,7 @@ sub_80FBDB8: @ 80FBDB8
|
||||
ldrb r0, [r5, 0xD]
|
||||
strh r0, [r6, 0x6]
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FBE08:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -7322,14 +7322,14 @@ sub_80FBE20: @ 80FBE20
|
||||
adds r6, r1, 0
|
||||
ldr r5, _080FBE50 @ =sub_80FBDB8
|
||||
adds r0, r5, 0
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0xFF
|
||||
bne _080FBE58
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r1, _080FBE54 @ =gUnknown_3005090
|
||||
@@ -7431,7 +7431,7 @@ _080FBEE8:
|
||||
bl sub_80FB9E4
|
||||
_080FBF10:
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _080FBF36
|
||||
_080FBF18:
|
||||
ldrh r0, [r4, 0x1E]
|
||||
@@ -7459,7 +7459,7 @@ _080FBF36:
|
||||
movs r0, 0x2
|
||||
bl sub_80FB9E4
|
||||
adds r0, r6, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FBF4E:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -7478,7 +7478,7 @@ sub_80FBF54: @ 80FBF54
|
||||
strb r1, [r0]
|
||||
ldr r0, _080FBF90 @ =sub_80FBE80
|
||||
movs r1, 0x3
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r4, r0, 2
|
||||
@@ -7488,7 +7488,7 @@ sub_80FBF54: @ 80FBF54
|
||||
adds r4, r0
|
||||
adds r0, r4, 0
|
||||
adds r1, r6, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
strh r5, [r4, 0x10]
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -7591,7 +7591,7 @@ sub_80FC028: @ 80FC028
|
||||
cmp r0, 0x4
|
||||
bne _080FC046
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FC046:
|
||||
ldr r1, _080FC0E4 @ =gUnknown_3005090
|
||||
lsls r0, r5, 2
|
||||
@@ -7611,7 +7611,7 @@ _080FC046:
|
||||
movs r0, 0x2
|
||||
bl sub_80FB9E4
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FC070:
|
||||
ldr r1, _080FC0E8 @ =0x00000985
|
||||
adds r0, r6, r1
|
||||
@@ -7662,7 +7662,7 @@ _080FC070:
|
||||
movs r0, 0xA
|
||||
strh r0, [r6, 0x4]
|
||||
adds r0, r5, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
b _080FC108
|
||||
.align 2, 0
|
||||
_080FC0E0: .4byte gUnknown_3005450
|
||||
@@ -7677,7 +7677,7 @@ _080FC0F8:
|
||||
movs r0, 0x2
|
||||
bl sub_80FB9E4
|
||||
mov r0, r8
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
_080FC108:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -7704,7 +7704,7 @@ sub_80FC114: @ 80FC114
|
||||
ldr r1, _080FC18C @ =0x00000119
|
||||
adds r0, r6, r1
|
||||
adds r1, r3, 0
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
movs r1, 0x85
|
||||
lsls r1, 1
|
||||
adds r0, r6, r1
|
||||
@@ -7714,7 +7714,7 @@ sub_80FC114: @ 80FC114
|
||||
bl sub_80FEB3C
|
||||
ldr r0, _080FC190 @ =sub_80FC028
|
||||
movs r1, 0x2
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r5, _080FC194 @ =gUnknown_3005090
|
||||
@@ -7724,7 +7724,7 @@ sub_80FC114: @ 80FC114
|
||||
adds r1, r5
|
||||
strh r4, [r1, 0xA]
|
||||
ldr r0, _080FC198 @ =sub_80F8B34
|
||||
bl sub_8077688
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
adds r2, r1, 0
|
||||
@@ -7838,7 +7838,7 @@ sub_80FC228: @ 80FC228
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
bl sub_800A4EC
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1C
|
||||
@@ -8911,7 +8911,7 @@ _080FC9FC:
|
||||
_080FCA16:
|
||||
movs r4, 0
|
||||
_080FCA18:
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r6, r4
|
||||
@@ -9390,7 +9390,7 @@ _080FCD8A:
|
||||
ldr r0, _080FCDD0 @ =gUnknown_843F284
|
||||
adds r1, r3, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
@@ -9403,7 +9403,7 @@ _080FCD8A:
|
||||
strh r0, [r4, 0x3C]
|
||||
ldr r0, _080FCDDC @ =gUnknown_843F274
|
||||
ldrh r0, [r0, 0x6]
|
||||
bl sub_8008804
|
||||
bl GetSpriteTileStartByTag
|
||||
strh r0, [r4, 0x3A]
|
||||
adds r4, 0x3E
|
||||
ldrb r0, [r4]
|
||||
@@ -9424,7 +9424,7 @@ _080FCDE4:
|
||||
ldr r0, _080FCE30 @ =gUnknown_843F284
|
||||
adds r1, r3, 0
|
||||
movs r3, 0
|
||||
bl sub_8006F8C
|
||||
bl CreateSprite
|
||||
ldr r4, _080FCE34 @ =gUnknown_203ACE4
|
||||
strb r0, [r4]
|
||||
ldr r5, _080FCE38 @ =gUnknown_202063C
|
||||
@@ -9437,7 +9437,7 @@ _080FCDE4:
|
||||
strh r1, [r0, 0x3C]
|
||||
ldr r0, _080FCE40 @ =gUnknown_843F274
|
||||
ldrh r0, [r0, 0x6]
|
||||
bl sub_8008804
|
||||
bl GetSpriteTileStartByTag
|
||||
ldrb r2, [r4]
|
||||
lsls r1, r2, 4
|
||||
adds r1, r2
|
||||
@@ -9488,7 +9488,7 @@ sub_80FCE44: @ 80FCE44
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r4
|
||||
bl sub_8007280
|
||||
bl DestroySprite
|
||||
ldr r3, _080FCE9C @ =gUnknown_30030F0
|
||||
movs r0, 0x84
|
||||
lsls r0, 3
|
||||
@@ -9519,16 +9519,16 @@ sub_80FCEA8: @ 80FCEA8
|
||||
push {r4,lr}
|
||||
ldr r4, _080FCED4 @ =gUnknown_843F274
|
||||
ldrh r0, [r4, 0x6]
|
||||
bl sub_8008804
|
||||
bl GetSpriteTileStartByTag
|
||||
lsls r0, 16
|
||||
ldr r1, _080FCED8 @ =0xffff0000
|
||||
cmp r0, r1
|
||||
bne _080FCEC0
|
||||
adds r0, r4, 0
|
||||
bl sub_800EBCC
|
||||
bl LoadCompressedObjectPic
|
||||
_080FCEC0:
|
||||
ldr r0, _080FCEDC @ =gUnknown_843F27C
|
||||
bl sub_8008928
|
||||
bl LoadSpritePalette
|
||||
ldr r1, _080FCEE0 @ =gUnknown_203ACE4
|
||||
movs r0, 0xFF
|
||||
strb r0, [r1]
|
||||
@@ -9933,7 +9933,7 @@ sub_80FD1A0: @ 80FD1A0
|
||||
b _080FD318
|
||||
_080FD1B6:
|
||||
movs r0, 0xF0
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [sp, 0x14]
|
||||
movs r4, 0
|
||||
b _080FD22C
|
||||
@@ -9977,7 +9977,7 @@ _080FD1F4:
|
||||
ldr r0, [sp, 0x1C]
|
||||
add r0, r10
|
||||
str r3, [sp, 0x18]
|
||||
bl sub_8008E28
|
||||
bl StringCompare
|
||||
ldr r3, [sp, 0x18]
|
||||
cmp r0, 0
|
||||
bne _080FD220
|
||||
@@ -10011,7 +10011,7 @@ _080FD24C: .4byte gUnknown_2022744
|
||||
_080FD250: .4byte 0x00003ba8
|
||||
_080FD254: .4byte gUnknown_3005008
|
||||
_080FD258:
|
||||
bl sub_800A404
|
||||
bl GetMultiplayerId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
@@ -10104,7 +10104,7 @@ _080FD302:
|
||||
movs r2, 0xF0
|
||||
bl memcpy
|
||||
ldr r0, [sp, 0x14]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
_080FD318:
|
||||
add sp, 0x20
|
||||
pop {r3-r5}
|
||||
@@ -10141,7 +10141,7 @@ _080FD350:
|
||||
adds r0, 0x4
|
||||
mov r1, r9
|
||||
movs r2, 0x7
|
||||
bl sub_8008E4C
|
||||
bl StringCompareN
|
||||
cmp r0, 0
|
||||
bne _080FD37C
|
||||
ldr r0, [r6]
|
||||
|
||||
+379
-379
File diff suppressed because it is too large
Load Diff
+74
-74
@@ -37,7 +37,7 @@ sub_8142420: @ 8142420
|
||||
movs r1, 0x3
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r4, 0x1
|
||||
movs r1, 0x11
|
||||
mov r10, r1
|
||||
@@ -65,7 +65,7 @@ _0814245E:
|
||||
movs r0, 0x3
|
||||
movs r1, 0x1
|
||||
lsrs r3, r5, 24
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
b _08142494
|
||||
_08142480:
|
||||
lsrs r2, r6, 24
|
||||
@@ -76,7 +76,7 @@ _08142480:
|
||||
movs r0, 0x3
|
||||
movs r1, 0x2
|
||||
lsrs r3, r5, 24
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
_08142494:
|
||||
movs r0, 0x80
|
||||
lsls r0, 17
|
||||
@@ -117,7 +117,7 @@ _081424C6:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
b _081424F6
|
||||
_081424DE:
|
||||
movs r0, 0x20
|
||||
@@ -130,10 +130,10 @@ _081424DE:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl sub_8002554
|
||||
bl FillBgTilemapBufferRect
|
||||
_081424F6:
|
||||
movs r0, 0
|
||||
bl sub_80020BC
|
||||
bl CopyBgTilemapBufferToVram
|
||||
add sp, 0xC
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -149,7 +149,7 @@ sub_8142504: @ 8142504
|
||||
bl sub_8008FCC
|
||||
movs r0, 0x1
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
movs r1, 0
|
||||
str r1, [sp]
|
||||
movs r0, 0x2
|
||||
@@ -168,7 +168,7 @@ sub_8142504: @ 8142504
|
||||
movs r2, 0xF
|
||||
bl sub_8150048
|
||||
movs r0, 0x1
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
bl sub_8003F20
|
||||
@@ -185,9 +185,9 @@ _0814255C: .4byte gUnknown_8466EF0
|
||||
sub_8142560: @ 8142560
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_815036C
|
||||
bl rbox_fill_rectangle
|
||||
movs r0, 0x1
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -195,8 +195,8 @@ sub_8142560: @ 8142560
|
||||
bx r0
|
||||
thumb_func_end sub_8142560
|
||||
|
||||
thumb_func_start sub_814257C
|
||||
sub_814257C: @ 814257C
|
||||
thumb_func_start mevent_0814257C
|
||||
mevent_0814257C: @ 814257C
|
||||
push {r4,lr}
|
||||
sub sp, 0xC
|
||||
adds r4, r0, 0
|
||||
@@ -273,7 +273,7 @@ _08142606:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_814257C
|
||||
thumb_func_end mevent_0814257C
|
||||
|
||||
thumb_func_start sub_8142610
|
||||
sub_8142610: @ 8142610
|
||||
@@ -468,14 +468,14 @@ _0814273A:
|
||||
add r1, sp, 0x4
|
||||
movs r2, 0x1
|
||||
movs r3, 0xA
|
||||
bl sub_8106ED0
|
||||
bl DoMysteryGiftListMenu
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
cmp r4, r0
|
||||
beq _0814278A
|
||||
movs r0, 0x2
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
movs r0, 0x2
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -533,7 +533,7 @@ _081427E2:
|
||||
strh r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrb r0, [r4]
|
||||
movs r2, 0
|
||||
str r2, [sp]
|
||||
@@ -555,7 +555,7 @@ _081427E2:
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
ldrb r0, [r4]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
b _0814287E
|
||||
.align 2, 0
|
||||
_08142828: .4byte gUnknown_8466D98
|
||||
@@ -618,9 +618,9 @@ _0814288C:
|
||||
movs r0, 0
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r4]
|
||||
bl sub_815036C
|
||||
bl rbox_fill_rectangle
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -632,9 +632,9 @@ _081428C2:
|
||||
movs r0, 0
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r4]
|
||||
bl sub_815036C
|
||||
bl rbox_fill_rectangle
|
||||
ldrb r0, [r4]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -694,7 +694,7 @@ _08142934:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x11
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrb r0, [r5]
|
||||
movs r2, 0
|
||||
str r2, [sp]
|
||||
@@ -716,7 +716,7 @@ _08142934:
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
ldrb r0, [r5]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r6]
|
||||
adds r0, 0x1
|
||||
strb r0, [r6]
|
||||
@@ -761,7 +761,7 @@ _081429D4:
|
||||
str r2, [sp]
|
||||
movs r2, 0x1
|
||||
movs r3, 0xA
|
||||
bl sub_8106ED0
|
||||
bl DoMysteryGiftListMenu
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
@@ -770,9 +770,9 @@ _081429D4:
|
||||
movs r0, 0
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r5]
|
||||
bl sub_815036C
|
||||
bl rbox_fill_rectangle
|
||||
ldrb r0, [r5]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -787,9 +787,9 @@ _08142A14:
|
||||
movs r0, 0
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r5]
|
||||
bl sub_815036C
|
||||
bl rbox_fill_rectangle
|
||||
ldrb r0, [r5]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8003F20
|
||||
@@ -835,9 +835,9 @@ sub_8142A58: @ 8142A58
|
||||
_08142A68:
|
||||
cmp r1, 0
|
||||
bne _08142A80
|
||||
bl sub_8143D6C
|
||||
bl sav1_get_mevent_buffer_1
|
||||
adds r4, r0, 0
|
||||
bl sub_8143D80
|
||||
bl sav1_get_mevent_buffer_2
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_8145654
|
||||
@@ -939,8 +939,8 @@ _08142B0E:
|
||||
_08142B1C: .4byte gUnknown_841EC99
|
||||
thumb_func_end sub_8142AFC
|
||||
|
||||
thumb_func_start sub_8142B20
|
||||
sub_8142B20: @ 8142B20
|
||||
thumb_func_start mevent_message_was_thrown_away
|
||||
mevent_message_was_thrown_away: @ 8142B20
|
||||
push {lr}
|
||||
cmp r1, 0
|
||||
beq _08142B30
|
||||
@@ -951,15 +951,15 @@ _08142B2C: .4byte gUnknown_841ED9C
|
||||
_08142B30:
|
||||
ldr r1, _08142B3C @ =gUnknown_841ED7B
|
||||
_08142B32:
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08142B3C: .4byte gUnknown_841ED7B
|
||||
thumb_func_end sub_8142B20
|
||||
thumb_func_end mevent_message_was_thrown_away
|
||||
|
||||
thumb_func_start sub_8142B40
|
||||
sub_8142B40: @ 8142B40
|
||||
thumb_func_start mevent_save_game
|
||||
mevent_save_game: @ 8142B40
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r4]
|
||||
@@ -987,7 +987,7 @@ _08142B6C:
|
||||
_08142B74: .4byte gUnknown_841ED2F
|
||||
_08142B78:
|
||||
movs r0, 0
|
||||
bl sub_80DA364
|
||||
bl TrySavingData
|
||||
b _08142B98
|
||||
_08142B80:
|
||||
ldr r0, _08142B88 @ =gUnknown_841ED50
|
||||
@@ -1021,10 +1021,10 @@ _08142BB2:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8142B40
|
||||
thumb_func_end mevent_save_game
|
||||
|
||||
thumb_func_start sub_8142BB8
|
||||
sub_8142BB8: @ 8142BB8
|
||||
thumb_func_start mevent_message
|
||||
mevent_message: @ 8142BB8
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r1, 24
|
||||
@@ -1176,10 +1176,10 @@ _08142CE0:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8142BB8
|
||||
thumb_func_end mevent_message
|
||||
|
||||
thumb_func_start sub_8142CE8
|
||||
sub_8142CE8: @ 8142CE8
|
||||
thumb_func_start mevent_08142CE8
|
||||
mevent_08142CE8: @ 8142CE8
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
adds r0, r1, 0
|
||||
@@ -1203,7 +1203,7 @@ _08142D06:
|
||||
_08142D0E:
|
||||
movs r0, 0x81
|
||||
lsls r0, 1
|
||||
bl sub_8071C60
|
||||
bl PlayFanfare
|
||||
strh r4, [r5]
|
||||
b _08142D28
|
||||
_08142D1A:
|
||||
@@ -1220,7 +1220,7 @@ _08142D28:
|
||||
strb r0, [r6]
|
||||
b _08142D46
|
||||
_08142D30:
|
||||
bl sub_8071C9C
|
||||
bl IsFanfareTaskInactive
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08142D46
|
||||
@@ -1235,10 +1235,10 @@ _08142D48:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8142CE8
|
||||
thumb_func_end mevent_08142CE8
|
||||
|
||||
thumb_func_start sub_8142D50
|
||||
sub_8142D50: @ 8142D50
|
||||
thumb_func_start mevent_message_stamp_card_etc_send_status
|
||||
mevent_message_stamp_card_etc_send_status: @ 8142D50
|
||||
push {r4,lr}
|
||||
adds r3, r0, 0
|
||||
ldr r1, _08142D6C @ =gUnknown_841E7BC
|
||||
@@ -1342,7 +1342,7 @@ _08142E12:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08142E1C: .4byte gUnknown_841EC6A
|
||||
thumb_func_end sub_8142D50
|
||||
thumb_func_end mevent_message_stamp_card_etc_send_status
|
||||
|
||||
thumb_func_start sub_8142E20
|
||||
sub_8142E20: @ 8142E20
|
||||
@@ -1355,18 +1355,18 @@ sub_8142E20: @ 8142E20
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
mov r0, sp
|
||||
bl sub_8142D50
|
||||
bl mevent_message_stamp_card_etc_send_status
|
||||
adds r1, r0, 0
|
||||
ldr r0, [sp]
|
||||
cmp r0, 0
|
||||
bne _08142E46
|
||||
adds r0, r4, 0
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
b _08142E4E
|
||||
_08142E46:
|
||||
adds r0, r4, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_8142CE8
|
||||
bl mevent_08142CE8
|
||||
_08142E4E:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
@@ -1374,12 +1374,12 @@ _08142E4E:
|
||||
bx r1
|
||||
thumb_func_end sub_8142E20
|
||||
|
||||
thumb_func_start sub_8142E58
|
||||
sub_8142E58: @ 8142E58
|
||||
thumb_func_start task_add_00_mystery_gift
|
||||
task_add_00_mystery_gift: @ 8142E58
|
||||
push {r4,lr}
|
||||
ldr r0, _08142E98 @ =sub_8142EA0
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r4, r0, 2
|
||||
@@ -1401,7 +1401,7 @@ sub_8142E58: @ 8142E58
|
||||
strh r0, [r4, 0x6]
|
||||
strb r1, [r4, 0xE]
|
||||
movs r0, 0x40
|
||||
bl sub_8002BB0
|
||||
bl AllocZeroed
|
||||
str r0, [r4, 0x10]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1409,7 +1409,7 @@ sub_8142E58: @ 8142E58
|
||||
.align 2, 0
|
||||
_08142E98: .4byte sub_8142EA0
|
||||
_08142E9C: .4byte gUnknown_3005098
|
||||
thumb_func_end sub_8142E58
|
||||
thumb_func_end task_add_00_mystery_gift
|
||||
|
||||
thumb_func_start sub_8142EA0
|
||||
sub_8142EA0: @ 8142EA0
|
||||
@@ -1530,7 +1530,7 @@ _08142FC0:
|
||||
adds r0, 0x9
|
||||
ldr r1, _08142FE0 @ =gUnknown_841E6DC
|
||||
_08142FC6:
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
cmp r0, 0
|
||||
bne _08142FD0
|
||||
b _081435C6
|
||||
@@ -1704,7 +1704,7 @@ _08143118:
|
||||
.4byte _0814313A
|
||||
.4byte _0814312C
|
||||
_0814312C:
|
||||
bl sub_80FA28C
|
||||
bl task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
ldrh r0, [r5]
|
||||
strb r0, [r5, 0xE]
|
||||
movs r0, 0xD
|
||||
@@ -1732,7 +1732,7 @@ _0814315C:
|
||||
strb r0, [r5, 0x8]
|
||||
ldr r0, _0814316C @ =gUnknown_2021CD0
|
||||
ldr r1, _08143170 @ =gUnknown_2022744
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
b _081435C6
|
||||
.align 2, 0
|
||||
_0814316C: .4byte gUnknown_2021CD0
|
||||
@@ -1760,7 +1760,7 @@ _08143198:
|
||||
bl sub_8144B58
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
cmp r0, 0
|
||||
bne _081431AE
|
||||
b _081435C6
|
||||
@@ -1848,7 +1848,7 @@ _08143242:
|
||||
bne _08143250
|
||||
ldr r0, _0814325C @ =gUnknown_2021CD0
|
||||
ldr r1, _08143260 @ =gUnknown_2022744
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
_08143250:
|
||||
movs r0, 0xF
|
||||
strb r0, [r5, 0x8]
|
||||
@@ -1862,7 +1862,7 @@ _08143264:
|
||||
ldrb r2, [r5, 0xD]
|
||||
ldrb r3, [r5, 0xE]
|
||||
mov r0, sp
|
||||
bl sub_8142BB8
|
||||
bl mevent_message
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _08143278
|
||||
@@ -1874,12 +1874,12 @@ _08143278:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
adds r2, r5, 0
|
||||
bl sub_8142CE8
|
||||
bl mevent_08142CE8
|
||||
b _08143292
|
||||
_0814328A:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
_08143292:
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
@@ -1910,7 +1910,7 @@ _081432BC:
|
||||
_081432C2:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
bl sub_8142B40
|
||||
bl mevent_save_game
|
||||
b _08143596
|
||||
_081432CC:
|
||||
adds r0, r5, 0
|
||||
@@ -2096,7 +2096,7 @@ _08143416:
|
||||
_08143422:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
bl sub_8142B40
|
||||
bl mevent_save_game
|
||||
cmp r0, 0
|
||||
bne _08143430
|
||||
b _081435C6
|
||||
@@ -2108,7 +2108,7 @@ _08143436:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
ldrb r1, [r5, 0xC]
|
||||
bl sub_8142B20
|
||||
bl mevent_message_was_thrown_away
|
||||
b _08143596
|
||||
_08143442:
|
||||
ldrb r0, [r5, 0xC]
|
||||
@@ -2227,10 +2227,10 @@ _08143514:
|
||||
strb r0, [r5, 0x8]
|
||||
b _081435C6
|
||||
_08143528:
|
||||
bl sub_80FA28C
|
||||
bl task_add_05_task_del_08FA224_when_no_RfuFunc
|
||||
ldr r0, _0814353C @ =gUnknown_2021CD0
|
||||
ldr r1, _08143540 @ =gUnknown_2022760
|
||||
bl sub_8008D84
|
||||
bl StringCopy
|
||||
movs r0, 0x22
|
||||
strb r0, [r5, 0x8]
|
||||
b _081435C6
|
||||
@@ -2274,7 +2274,7 @@ _0814358C:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x9
|
||||
ldr r1, _081435A8 @ =gUnknown_841E7BC
|
||||
bl sub_814257C
|
||||
bl mevent_0814257C
|
||||
_08143596:
|
||||
cmp r0, 0
|
||||
beq _081435C6
|
||||
@@ -2291,11 +2291,11 @@ _081435AC:
|
||||
bl sub_80098B8
|
||||
bl sub_812B484
|
||||
ldr r0, [r5, 0x10]
|
||||
bl sub_8002BC4
|
||||
bl Free
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
ldr r0, _081435D0 @ =sub_81422FC
|
||||
bl sub_8000544
|
||||
bl SetMainCallback2
|
||||
_081435C6:
|
||||
add sp, 0x4
|
||||
pop {r4,r5}
|
||||
|
||||
+97
-97
@@ -10,8 +10,8 @@ nullsub_90: @ 8106ECC
|
||||
bx lr
|
||||
thumb_func_end nullsub_90
|
||||
|
||||
thumb_func_start sub_8106ED0
|
||||
sub_8106ED0: @ 8106ED0
|
||||
thumb_func_start DoMysteryGiftListMenu
|
||||
DoMysteryGiftListMenu: @ 8106ED0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -74,7 +74,7 @@ _08106F34:
|
||||
strb r1, [r0, 0x10]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8106FF8
|
||||
bl ListMenuInit
|
||||
strb r0, [r4, 0x6]
|
||||
ldrb r0, [r4, 0x5]
|
||||
movs r1, 0x1
|
||||
@@ -87,7 +87,7 @@ _08106F60: .4byte gUnknown_203ACF4
|
||||
_08106F64: .4byte gUnknown_3005E70
|
||||
_08106F68:
|
||||
ldrb r0, [r5, 0x6]
|
||||
bl sub_8107078
|
||||
bl ListMenuHandleInput
|
||||
str r0, [r5]
|
||||
ldr r1, _08106FA4 @ =gUnknown_30030F0
|
||||
ldrh r0, [r1, 0x2E]
|
||||
@@ -114,7 +114,7 @@ _08106F92:
|
||||
cmp r6, 0
|
||||
bne _08106FA8
|
||||
ldrb r0, [r5, 0x5]
|
||||
bl sub_80040B8
|
||||
bl ClearWindowTilemap
|
||||
b _08106FBA
|
||||
.align 2, 0
|
||||
_08106FA4: .4byte gUnknown_30030F0
|
||||
@@ -158,22 +158,22 @@ _08106FE8:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8106ED0
|
||||
thumb_func_end DoMysteryGiftListMenu
|
||||
|
||||
thumb_func_start sub_8106FF8
|
||||
sub_8106FF8: @ 8106FF8
|
||||
thumb_func_start ListMenuInit
|
||||
ListMenuInit: @ 8106FF8
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
bl sub_8107348
|
||||
bl ListMenuInitInternal
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldrb r0, [r5, 0x10]
|
||||
bl sub_8003FA0
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r5, 0x10]
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -181,10 +181,10 @@ sub_8106FF8: @ 8106FF8
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8106FF8
|
||||
thumb_func_end ListMenuInit
|
||||
|
||||
thumb_func_start sub_8107024
|
||||
sub_8107024: @ 8107024
|
||||
thumb_func_start Unused_ListMenuInit2
|
||||
Unused_ListMenuInit2: @ 8107024
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x8
|
||||
adds r6, r0, 0
|
||||
@@ -195,7 +195,7 @@ sub_8107024: @ 8107024
|
||||
lsrs r1, 16
|
||||
lsls r2, 16
|
||||
lsrs r2, 16
|
||||
bl sub_8107348
|
||||
bl ListMenuInitInternal
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
ldrb r0, [r4, 0x4]
|
||||
@@ -211,7 +211,7 @@ _08107048:
|
||||
str r4, [sp]
|
||||
ldrb r4, [r5, 0x4]
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_8004000
|
||||
bl PutWindowRectTilemapOverridePalette
|
||||
adds r5, 0x8
|
||||
ldrb r0, [r5, 0x4]
|
||||
cmp r0, 0xFF
|
||||
@@ -225,10 +225,10 @@ _08107064:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8107024
|
||||
thumb_func_end Unused_ListMenuInit2
|
||||
|
||||
thumb_func_start sub_8107078
|
||||
sub_8107078: @ 8107078
|
||||
thumb_func_start ListMenuHandleInput
|
||||
ListMenuHandleInput: @ 8107078
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -331,14 +331,14 @@ _08107122:
|
||||
_0810712C:
|
||||
movs r3, 0x1
|
||||
_0810712E:
|
||||
bl sub_810799C
|
||||
bl ListMenuChangeSelection
|
||||
_08107132:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_08107136:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8107078
|
||||
thumb_func_end ListMenuHandleInput
|
||||
|
||||
thumb_func_start sub_810713C
|
||||
sub_810713C: @ 810713C
|
||||
@@ -368,10 +368,10 @@ _08107160:
|
||||
ldrb r1, [r1, 0x17]
|
||||
lsrs r1, 6
|
||||
subs r1, 0x2
|
||||
bl sub_8133CD4
|
||||
bl ListMenuRemoveCursorObject
|
||||
_08107170:
|
||||
adds r0, r4, 0
|
||||
bl sub_8077508
|
||||
bl DestroyTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -395,14 +395,14 @@ sub_8107180: @ 8107180
|
||||
lsrs r1, r2, 4
|
||||
orrs r1, r2
|
||||
lsrs r1, 24
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrh r1, [r4, 0x18]
|
||||
ldrh r3, [r4, 0xE]
|
||||
adds r0, r4, 0
|
||||
movs r2, 0
|
||||
bl sub_81074DC
|
||||
bl ListMenuPrintEntries
|
||||
adds r0, r4, 0
|
||||
bl sub_8107594
|
||||
bl ListMenuDrawCursor
|
||||
ldrb r0, [r4, 0x10]
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -508,7 +508,7 @@ sub_8107244: @ 8107244
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
movs r3, 0
|
||||
bl sub_810799C
|
||||
bl ListMenuChangeSelection
|
||||
_08107278:
|
||||
cmp r4, 0x80
|
||||
bne _08107288
|
||||
@@ -516,7 +516,7 @@ _08107278:
|
||||
movs r1, 0
|
||||
movs r2, 0x1
|
||||
movs r3, 0x1
|
||||
bl sub_810799C
|
||||
bl ListMenuChangeSelection
|
||||
_08107288:
|
||||
cmp r5, 0
|
||||
beq _08107292
|
||||
@@ -563,8 +563,8 @@ _081072CA:
|
||||
_081072D0: .4byte gUnknown_3005098
|
||||
thumb_func_end sub_81072AC
|
||||
|
||||
thumb_func_start sub_81072D4
|
||||
sub_81072D4: @ 81072D4
|
||||
thumb_func_start get_coro_args_x18_x1A
|
||||
get_coro_args_x18_x1A: @ 81072D4
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -588,10 +588,10 @@ _081072F6:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_081072FC: .4byte gUnknown_3005098
|
||||
thumb_func_end sub_81072D4
|
||||
thumb_func_end get_coro_args_x18_x1A
|
||||
|
||||
thumb_func_start sub_8107300
|
||||
sub_8107300: @ 8107300
|
||||
thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
|
||||
ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -626,10 +626,10 @@ sub_8107300: @ 8107300
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08107344: .4byte gUnknown_3005098
|
||||
thumb_func_end sub_8107300
|
||||
thumb_func_end ListMenuGetYCoordForPrintingArrowCursor
|
||||
|
||||
thumb_func_start sub_8107348
|
||||
sub_8107348: @ 8107348
|
||||
thumb_func_start ListMenuInitInternal
|
||||
ListMenuInitInternal: @ 8107348
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -642,7 +642,7 @@ sub_8107348: @ 8107348
|
||||
lsrs r6, 16
|
||||
ldr r0, _08107418 @ =nullsub_90
|
||||
movs r1, 0
|
||||
bl sub_807741C
|
||||
bl CreateTask
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -712,17 +712,17 @@ _081073E0:
|
||||
lsrs r1, r2, 4
|
||||
orrs r1, r2
|
||||
lsrs r1, 24
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrh r1, [r7, 0x18]
|
||||
ldrh r3, [r7, 0xE]
|
||||
adds r0, r7, 0
|
||||
movs r2, 0
|
||||
bl sub_81074DC
|
||||
bl ListMenuPrintEntries
|
||||
adds r0, r7, 0
|
||||
bl sub_8107594
|
||||
bl ListMenuDrawCursor
|
||||
adds r0, r7, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8107A74
|
||||
bl ListMenuCallSelectionChangedCallback
|
||||
mov r0, r8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
@@ -734,10 +734,10 @@ _08107418: .4byte nullsub_90
|
||||
_0810741C: .4byte gUnknown_3005098
|
||||
_08107420: .4byte gUnknown_3005E60
|
||||
_08107424: .4byte 0xfffc0fff
|
||||
thumb_func_end sub_8107348
|
||||
thumb_func_end ListMenuInitInternal
|
||||
|
||||
thumb_func_start sub_8107428
|
||||
sub_8107428: @ 8107428
|
||||
thumb_func_start ListMenuPrint
|
||||
ListMenuPrint: @ 8107428
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x18
|
||||
adds r4, r0, 0
|
||||
@@ -826,10 +826,10 @@ _081074D2:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8107428
|
||||
thumb_func_end ListMenuPrint
|
||||
|
||||
thumb_func_start sub_81074DC
|
||||
sub_81074DC: @ 81074DC
|
||||
thumb_func_start ListMenuPrintEntries
|
||||
ListMenuPrintEntries: @ 81074DC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -905,7 +905,7 @@ _08107562:
|
||||
adds r0, r4, 0
|
||||
adds r2, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl sub_8107428
|
||||
bl ListMenuPrint
|
||||
mov r0, r9
|
||||
adds r0, 0x1
|
||||
lsls r0, 16
|
||||
@@ -924,10 +924,10 @@ _08107584:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81074DC
|
||||
thumb_func_end ListMenuPrintEntries
|
||||
|
||||
thumb_func_start sub_8107594
|
||||
sub_8107594: @ 8107594
|
||||
thumb_func_start ListMenuDrawCursor
|
||||
ListMenuDrawCursor: @ 8107594
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -973,7 +973,7 @@ _081075E4:
|
||||
adds r0, r6, 0
|
||||
mov r2, r8
|
||||
adds r3, r7, 0
|
||||
bl sub_8107428
|
||||
bl ListMenuPrint
|
||||
b _08107680
|
||||
.align 2, 0
|
||||
_081075F4: .4byte gUnknown_841623B
|
||||
@@ -983,7 +983,7 @@ _081075F8:
|
||||
bne _08107608
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_810768C
|
||||
bl ListMenuAddCursorObject
|
||||
strb r0, [r6, 0x1E]
|
||||
_08107608:
|
||||
ldrb r5, [r6, 0x1E]
|
||||
@@ -1007,7 +1007,7 @@ _08107608:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0
|
||||
bl sub_8133CAC
|
||||
bl ListMenuUpdateCursorObject
|
||||
b _08107680
|
||||
.align 2, 0
|
||||
_0810763C: .4byte 0xffff0000
|
||||
@@ -1017,7 +1017,7 @@ _08107640:
|
||||
bne _08107650
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl sub_810768C
|
||||
bl ListMenuAddCursorObject
|
||||
strb r0, [r6, 0x1E]
|
||||
_08107650:
|
||||
ldrb r5, [r6, 0x1E]
|
||||
@@ -1040,17 +1040,17 @@ _08107650:
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x1
|
||||
bl sub_8133CAC
|
||||
bl ListMenuUpdateCursorObject
|
||||
_08107680:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8107594
|
||||
thumb_func_end ListMenuDrawCursor
|
||||
|
||||
thumb_func_start sub_810768C
|
||||
sub_810768C: @ 810768C
|
||||
thumb_func_start ListMenuAddCursorObject
|
||||
ListMenuAddCursorObject: @ 810768C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0xC
|
||||
adds r4, r0, 0
|
||||
@@ -1086,7 +1086,7 @@ sub_810768C: @ 810768C
|
||||
strb r0, [r1, 0xA]
|
||||
mov r0, sp
|
||||
adds r1, r5, 0
|
||||
bl sub_8133C90
|
||||
bl ListMenuAddCursorObjectInternal
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
add sp, 0xC
|
||||
@@ -1095,10 +1095,10 @@ sub_810768C: @ 810768C
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_081076E8: .4byte 0x0000ffff
|
||||
thumb_func_end sub_810768C
|
||||
thumb_func_end ListMenuAddCursorObject
|
||||
|
||||
thumb_func_start sub_81076EC
|
||||
sub_81076EC: @ 81076EC
|
||||
thumb_func_start ListMenuErasePrintedCursor
|
||||
ListMenuErasePrintedCursor: @ 81076EC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -1156,7 +1156,7 @@ sub_81076EC: @ 81076EC
|
||||
str r5, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
adds r0, r6, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
_08107768:
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
@@ -1164,10 +1164,10 @@ _08107768:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81076EC
|
||||
thumb_func_end ListMenuErasePrintedCursor
|
||||
|
||||
thumb_func_start sub_8107774
|
||||
sub_8107774: @ 8107774
|
||||
thumb_func_start ListMenuUpdateSelectedRowIndexAndScrollOffset
|
||||
ListMenuUpdateSelectedRowIndexAndScrollOffset: @ 8107774
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r1, 24
|
||||
@@ -1304,10 +1304,10 @@ _0810785C:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8107774
|
||||
thumb_func_end ListMenuUpdateSelectedRowIndexAndScrollOffset
|
||||
|
||||
thumb_func_start sub_8107864
|
||||
sub_8107864: @ 8107864
|
||||
thumb_func_start ListMenuScroll
|
||||
ListMenuScroll: @ 8107864
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -1328,12 +1328,12 @@ sub_8107864: @ 8107864
|
||||
lsrs r1, r2, 4
|
||||
orrs r1, r2
|
||||
lsrs r1, 24
|
||||
bl sub_800445C
|
||||
bl FillWindowPixelBuffer
|
||||
ldrh r1, [r6, 0x18]
|
||||
ldrh r3, [r6, 0xE]
|
||||
adds r0, r6, 0
|
||||
movs r2, 0
|
||||
bl sub_81074DC
|
||||
bl ListMenuPrintEntries
|
||||
b _0810798E
|
||||
_0810789E:
|
||||
ldrb r0, [r6, 0x17]
|
||||
@@ -1361,12 +1361,12 @@ _0810789E:
|
||||
orrs r3, r1
|
||||
lsrs r3, 24
|
||||
movs r1, 0x1
|
||||
bl sub_80044A8
|
||||
bl ScrollWindow
|
||||
ldrh r1, [r6, 0x18]
|
||||
adds r0, r6, 0
|
||||
movs r2, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_81074DC
|
||||
bl ListMenuPrintEntries
|
||||
ldrh r0, [r6, 0xE]
|
||||
adds r1, r0, 0
|
||||
muls r1, r4
|
||||
@@ -1401,7 +1401,7 @@ _0810789E:
|
||||
adds r0, r3, 0
|
||||
movs r2, 0
|
||||
adds r3, r4, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
b _0810798E
|
||||
_08107930:
|
||||
ldrb r0, [r6, 0x10]
|
||||
@@ -1415,7 +1415,7 @@ _08107930:
|
||||
orrs r3, r1
|
||||
lsrs r3, 24
|
||||
movs r1, 0
|
||||
bl sub_80044A8
|
||||
bl ScrollWindow
|
||||
ldrh r2, [r6, 0xE]
|
||||
subs r2, r7
|
||||
ldrh r1, [r6, 0x18]
|
||||
@@ -1426,7 +1426,7 @@ _08107930:
|
||||
lsrs r2, 16
|
||||
adds r0, r6, 0
|
||||
adds r3, r7, 0
|
||||
bl sub_81074DC
|
||||
bl ListMenuPrintEntries
|
||||
ldrb r0, [r6, 0x10]
|
||||
movs r1, 0x3
|
||||
bl sub_8004950
|
||||
@@ -1446,7 +1446,7 @@ _08107930:
|
||||
adds r0, r3, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8004378
|
||||
bl FillWindowPixelRect
|
||||
_0810798E:
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
@@ -1454,10 +1454,10 @@ _0810798E:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8107864
|
||||
thumb_func_end ListMenuScroll
|
||||
|
||||
thumb_func_start sub_810799C
|
||||
sub_810799C: @ 810799C
|
||||
thumb_func_start ListMenuChangeSelection
|
||||
ListMenuChangeSelection: @ 810799C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -1502,7 +1502,7 @@ _081079CE:
|
||||
_081079EA:
|
||||
adds r0, r4, 0
|
||||
mov r1, r9
|
||||
bl sub_8107774
|
||||
bl ListMenuUpdateSelectedRowIndexAndScrollOffset
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
orrs r5, r0
|
||||
@@ -1529,12 +1529,12 @@ _08107A16:
|
||||
_08107A1A:
|
||||
adds r0, r4, 0
|
||||
mov r1, r10
|
||||
bl sub_81076EC
|
||||
bl ListMenuErasePrintedCursor
|
||||
adds r0, r4, 0
|
||||
bl sub_8107594
|
||||
bl ListMenuDrawCursor
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_8107A74
|
||||
bl ListMenuCallSelectionChangedCallback
|
||||
ldrb r0, [r4, 0x10]
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -1542,16 +1542,16 @@ _08107A1A:
|
||||
_08107A3A:
|
||||
adds r0, r4, 0
|
||||
mov r1, r10
|
||||
bl sub_81076EC
|
||||
bl ListMenuErasePrintedCursor
|
||||
adds r0, r4, 0
|
||||
adds r1, r7, 0
|
||||
mov r2, r9
|
||||
bl sub_8107864
|
||||
bl ListMenuScroll
|
||||
adds r0, r4, 0
|
||||
bl sub_8107594
|
||||
bl ListMenuDrawCursor
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_8107A74
|
||||
bl ListMenuCallSelectionChangedCallback
|
||||
ldrb r0, [r4, 0x10]
|
||||
movs r1, 0x2
|
||||
bl sub_8003F20
|
||||
@@ -1566,10 +1566,10 @@ _08107A64:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_810799C
|
||||
thumb_func_end ListMenuChangeSelection
|
||||
|
||||
thumb_func_start sub_8107A74
|
||||
sub_8107A74: @ 8107A74
|
||||
thumb_func_start ListMenuCallSelectionChangedCallback
|
||||
ListMenuCallSelectionChangedCallback: @ 8107A74
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
lsls r1, 24
|
||||
@@ -1590,7 +1590,7 @@ _08107A96:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8107A74
|
||||
thumb_func_end ListMenuCallSelectionChangedCallback
|
||||
|
||||
thumb_func_start sub_8107A9C
|
||||
sub_8107A9C: @ 8107A9C
|
||||
@@ -1909,7 +1909,7 @@ sub_8107CD8: @ 8107CD8
|
||||
bl sub_80971CC
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1933,7 +1933,7 @@ sub_8107CF8: @ 8107CF8
|
||||
lsls r5, 16
|
||||
lsrs r5, 16
|
||||
movs r2, 0x1
|
||||
bl sub_8097054
|
||||
bl GetMonIconPtr
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x20
|
||||
str r0, [sp]
|
||||
@@ -1941,7 +1941,7 @@ sub_8107CF8: @ 8107CF8
|
||||
adds r0, r6, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_80041B8
|
||||
bl BlitBitmapToWindow
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -1969,7 +1969,7 @@ _08107D54:
|
||||
_08107D56:
|
||||
adds r1, r2, 0
|
||||
movs r2, 0x20
|
||||
bl sub_80703EC
|
||||
bl LoadPalette
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2006,7 +2006,7 @@ sub_8107D68: @ 8107D68
|
||||
adds r1, r5, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_80041F0
|
||||
bl BlitBitmapRectToWindow
|
||||
add sp, 0x18
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
+26
-26
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_804BFE4
|
||||
sub_804BFE4: @ 804BFE4
|
||||
thumb_func_start CheckForFlashMemory
|
||||
CheckForFlashMemory: @ 804BFE4
|
||||
push {lr}
|
||||
bl IdentifyFlash
|
||||
lsls r0, 16
|
||||
@@ -28,10 +28,10 @@ _0804C006:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804C00C: .4byte gUnknown_3005004
|
||||
thumb_func_end sub_804BFE4
|
||||
thumb_func_end CheckForFlashMemory
|
||||
|
||||
thumb_func_start sub_804C010
|
||||
sub_804C010: @ 804C010
|
||||
thumb_func_start ClearSav2
|
||||
ClearSav2: @ 804C010
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
mov r1, sp
|
||||
@@ -47,10 +47,10 @@ sub_804C010: @ 804C010
|
||||
.align 2, 0
|
||||
_0804C02C: .4byte gUnknown_2024588
|
||||
_0804C030: .4byte 0x010007d2
|
||||
thumb_func_end sub_804C010
|
||||
thumb_func_end ClearSav2
|
||||
|
||||
thumb_func_start sub_804C034
|
||||
sub_804C034: @ 804C034
|
||||
thumb_func_start ClearSav1
|
||||
ClearSav1: @ 804C034
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
mov r1, sp
|
||||
@@ -66,14 +66,14 @@ sub_804C034: @ 804C034
|
||||
.align 2, 0
|
||||
_0804C050: .4byte gUnknown_202552C
|
||||
_0804C054: .4byte 0x01001ef4
|
||||
thumb_func_end sub_804C034
|
||||
thumb_func_end ClearSav1
|
||||
|
||||
thumb_func_start sub_804C058
|
||||
sub_804C058: @ 804C058
|
||||
push {r4,r5,lr}
|
||||
ldr r4, _0804C08C @ =gUnknown_3005008
|
||||
ldr r5, [r4]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
movs r1, 0x7C
|
||||
ands r1, r0
|
||||
ldr r2, _0804C090 @ =gUnknown_300500C
|
||||
@@ -159,14 +159,14 @@ sub_804C0A4: @ 804C0A4
|
||||
movs r1, 0xE0
|
||||
lsls r1, 9
|
||||
adds r0, r5, 0
|
||||
bl sub_8002B80
|
||||
bl InitHeap
|
||||
ldr r0, [sp, 0x4]
|
||||
str r0, [r4, 0x10]
|
||||
ldr r1, [sp]
|
||||
str r1, [r4, 0xC]
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
adds r4, r0, 0
|
||||
bl sub_8044EC8
|
||||
bl Random
|
||||
lsls r4, 16
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -200,8 +200,8 @@ _0804C180: .4byte 0x000083d0
|
||||
_0804C184: .4byte gHeap + 0x4c8c
|
||||
thumb_func_end sub_804C0A4
|
||||
|
||||
thumb_func_start sub_804C188
|
||||
sub_804C188: @ 804C188
|
||||
thumb_func_start sav2_x1_query_bit1
|
||||
sav2_x1_query_bit1: @ 804C188
|
||||
ldr r0, _0804C194 @ =gUnknown_300500C
|
||||
ldr r0, [r0]
|
||||
ldrb r1, [r0, 0x9]
|
||||
@@ -210,10 +210,10 @@ sub_804C188: @ 804C188
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0804C194: .4byte gUnknown_300500C
|
||||
thumb_func_end sub_804C188
|
||||
thumb_func_end sav2_x1_query_bit1
|
||||
|
||||
thumb_func_start sub_804C198
|
||||
sub_804C198: @ 804C198
|
||||
thumb_func_start sav2_x9_clear_bit1
|
||||
sav2_x9_clear_bit1: @ 804C198
|
||||
ldr r0, _0804C1A8 @ =gUnknown_300500C
|
||||
ldr r2, [r0]
|
||||
ldrb r1, [r2, 0x9]
|
||||
@@ -223,7 +223,7 @@ sub_804C198: @ 804C198
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0804C1A8: .4byte gUnknown_300500C
|
||||
thumb_func_end sub_804C198
|
||||
thumb_func_end sav2_x9_clear_bit1
|
||||
|
||||
thumb_func_start sub_804C1AC
|
||||
sub_804C1AC: @ 804C1AC
|
||||
@@ -255,8 +255,8 @@ sub_804C1C0: @ 804C1C0
|
||||
_0804C1D8: .4byte gUnknown_300500C
|
||||
thumb_func_end sub_804C1C0
|
||||
|
||||
thumb_func_start sub_804C1DC
|
||||
sub_804C1DC: @ 804C1DC
|
||||
thumb_func_start sav2_gender2_inplace_and_xFE
|
||||
sav2_gender2_inplace_and_xFE: @ 804C1DC
|
||||
ldr r0, _0804C1EC @ =gUnknown_300500C
|
||||
ldr r2, [r0]
|
||||
ldrb r1, [r2, 0x9]
|
||||
@@ -266,10 +266,10 @@ sub_804C1DC: @ 804C1DC
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0804C1EC: .4byte gUnknown_300500C
|
||||
thumb_func_end sub_804C1DC
|
||||
thumb_func_end sav2_gender2_inplace_and_xFE
|
||||
|
||||
thumb_func_start sub_804C1F0
|
||||
sub_804C1F0: @ 804C1F0
|
||||
thumb_func_start copy_player_party_to_sav1
|
||||
copy_player_party_to_sav1: @ 804C1F0
|
||||
push {r4,lr}
|
||||
ldr r0, _0804C224 @ =gUnknown_3005008
|
||||
ldr r0, [r0]
|
||||
@@ -299,7 +299,7 @@ _0804C200:
|
||||
_0804C224: .4byte gUnknown_3005008
|
||||
_0804C228: .4byte gUnknown_2024029
|
||||
_0804C22C: .4byte gUnknown_2024284
|
||||
thumb_func_end sub_804C1F0
|
||||
thumb_func_end copy_player_party_to_sav1
|
||||
|
||||
thumb_func_start sub_804C230
|
||||
sub_804C230: @ 804C230
|
||||
@@ -418,7 +418,7 @@ _0804C2FC: .4byte gUnknown_2036E38
|
||||
thumb_func_start sub_804C300
|
||||
sub_804C300: @ 804C300
|
||||
push {lr}
|
||||
bl sub_804C1F0
|
||||
bl copy_player_party_to_sav1
|
||||
bl sub_804C270
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user