Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-12-01 09:00:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into unk_0205298C

Browse Source
This commit is contained in:
Revo 2022-09-02 12:15:28 -04:00 committed by GitHub
commit d2c10b8844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
153 changed files with 4345 additions and 4784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -13,7 +13,6 @@ include common.mk
include filesystem.mk
$(ASM_OBJS): MWASFLAGS += -DPM_ASM -include config.h
$(C_OBJS): MWCFLAGS += -include global.h
$(BUILD_DIR)/asm/nitrocrypto.o: MWCCVER := 1.2/sp2p3
$(BUILD_DIR)/lib/msl/src/*.o: EXCCFLAGS := -Cpp_exceptions on

4
asm/macros/script.inc
View File

@ -525,7 +525,7 @@
.short \bgm
.endm
.macro scrcmd_081 arg0
.macro stop_bgm arg0
.short 81
.short \arg0
.endm
@ -547,7 +547,7 @@
.short \frames
.endm
.macro scrcmd_085 arg0
.macro fade_in_bgm arg0
.short 85
.short \arg0
.endm

6
asm/overlay_01_021E5900.s
View File

@ -39,7 +39,7 @@ ov01_021E5924: ; 0x021E5924
mov r1, #0
ldr r5, _021E5B9C ; =0x00DCE6A1
str r1, [sp, #4]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r6]
add r4, r0, #0
cmp r1, #3
@ -333,7 +333,7 @@ _021E5BE0: .word 0x00000578
thumb_func_start ov01_021E5BE4
ov01_021E5BE4: ; 0x021E5BE4
push {r4, lr}
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
bl ov01_021E5ED4
cmp r0, #0
@ -368,7 +368,7 @@ ov01_021E5C24: ; 0x021E5C24
push {r3, r4, r5, r6, r7, lr}
add r6, r1, #0
ldr r5, _021E5E7C ; =0x002AAACF
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r0, [r4, #0x2c]
bl ov01_021F50F0

2
asm/overlay_100.s
View File

@ -1435,7 +1435,7 @@ _021E6428:
ov100_Phone_OvyInit: ; 0x021E642C
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #0
bl sub_0200616C

10
asm/overlay_101.s
View File

@ -15,7 +15,7 @@
ov101_021E7740: ; 0x021E7740
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, _021E7790 ; =FS_OVERLAY_ID(OVY_26)
mov r1, #2
@ -12473,7 +12473,7 @@ _021ED7E4:
ov101_TownMap_OvyInit: ; 0x021ED7F8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, _021ED8A4 ; =FS_OVERLAY_ID(OVY_100)
mov r1, #2
@ -14533,7 +14533,7 @@ _021EE8E4: .word 0x00030100
ov101_021EE8E8: ; 0x021EE8E8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #2
add r5, r0, #0
mov r0, #3
@ -16532,7 +16532,7 @@ _021EF844: .word 0x00000941
ov101_021EF848: ; 0x021EF848
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #3
mov r1, #0x5b
@ -26617,7 +26617,7 @@ _021F447C: .word 0x0000099F
ov101_021F4480: ; 0x021F4480
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #2
add r5, r0, #0
mov r0, #3

2
asm/overlay_102.s
View File

@ -193,7 +193,7 @@ ov102_021E7888: ; 0x021E7888
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
bl sub_02090D70
str r0, [r4, #4]

2
asm/overlay_103.s
View File

@ -21,7 +21,7 @@ ov103_021EC940: ; 0x021EC940
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #8]
ldr r0, [r0]
bl Sav2_PlayerData_GetOptionsAddr

2
asm/overlay_104.s
View File

@ -24,7 +24,7 @@ ov104_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #0x59
ldrb r1, [r5]

2
asm/overlay_105.s
View File

@ -22,7 +22,7 @@ ov105_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
add r0, r4, #0
ldrb r1, [r5]

4
asm/overlay_108.s
View File

@ -7,7 +7,7 @@
ov108_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -5979,7 +5979,7 @@ _021E8862:
lsl r2, r2, #0xe
bl CreateHeap
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x53
add r6, r0, #0
add r0, r4, #0

2
asm/overlay_109.s
View File

@ -34,7 +34,7 @@ _021E5912:
mov r0, #0x60
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #0x10]
add r0, r4, #0
bl ov109_021E5A70

2
asm/overlay_110.s
View File

@ -35,7 +35,7 @@ _021E5912:
mov r0, #0x61
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0
str r0, [r4, #0x10]
mov r0, #0x4a

2
asm/overlay_111.s
View File

@ -699,7 +699,7 @@ ov111_021E5E34: ; 0x021E5E34
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021E5E46
bl GF_AssertFail

4
asm/overlay_112.s
View File

@ -3946,7 +3946,7 @@ ov112_021E76CC: ; 0x021E76CC
add r5, r0, #0
bl memset
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r5, #0x20]
add r0, r5, #0
@ -26674,7 +26674,7 @@ _021F2DE0: .word 0xFFFFFBFF
ov112_021F2DE4: ; 0x021F2DE4
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021F2DF4
bl GF_AssertFail

2
asm/overlay_113.s
View File

@ -34,7 +34,7 @@ _021E5912:
mov r0, #0x98
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov113_021E5A7C

14
asm/overlay_12.s
View File

@ -10,7 +10,7 @@ ov12_022378C0: ; 0x022378C0
sub sp, #0x24
add r4, r1, #0
add r6, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r4]
add r5, r0, #0
cmp r1, #0xf
@ -755,7 +755,7 @@ ov12_02237F18: ; 0x02237F18
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r7, r0, #0
bl sub_02026E8C
add r5, r0, #0
@ -1320,7 +1320,7 @@ ov12_0223843C: ; 0x0223843C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r3, _02238778 ; =0x0000244C
mov r2, #0x67
ldr r1, [r4, r3]
@ -4771,7 +4771,7 @@ ov12_0223A0D4: ; 0x0223A0D4
bl OverlayManager_CreateAndGetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r2, _0223A20C ; =0x00002490
mov r0, #0
@ -4970,7 +4970,7 @@ ov12_0223A260: ; 0x0223A260
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r4, #0x2c]
mov r1, #4
tst r1, r0
@ -5163,7 +5163,7 @@ _0223A3EA:
ov12_0223A3F0: ; 0x0223A3F0
push {r4, r5, r6, r7, lr}
sub sp, #0xc
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r7, r0, #0
ldr r0, [r7]
mov r1, #4
@ -5405,7 +5405,7 @@ _0223A5E0: .word 0x000001B2
thumb_func_start ov12_0223A5E4
ov12_0223A5E4: ; 0x0223A5E4
push {r4, r5, r6, lr}
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x66
lsl r1, r1, #2
ldr r6, [r0, r1]

2
asm/overlay_121.s
View File

@ -232,7 +232,7 @@ _021E5AE8: .word 0x0000025E
ov121_021E5AEC: ; 0x021E5AEC
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #1
add r4, r0, #0
mov r0, #3

2
asm/overlay_122.s
View File

@ -5106,7 +5106,7 @@ _021E8090: .word 0x04001000
ov122_021E8094: ; 0x021E8094
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021E80A4
bl GF_AssertFail

2
asm/overlay_124.s
View File

@ -26,7 +26,7 @@ _02260C42:
mul r0, r1
add r4, r4, r0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r5, #0xc]
mov r0, #0

2
asm/overlay_14.s
View File

@ -21,7 +21,7 @@ ov14_021E5900: ; 0x021E5900
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
ldr r0, [r0]
bl GetStoragePCPointer

2
asm/overlay_15.s
View File

@ -46,7 +46,7 @@ ov15_BagApp_init: ; 0x021F9380
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x8d
lsl r1, r1, #2
str r0, [r4, r1]

2
asm/overlay_16.s
View File

@ -803,7 +803,7 @@ ov16_0220196C: ; 0x0220196C
mov r0, #0x82
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov16_02201A34

2
asm/overlay_17.s
View File

@ -69,7 +69,7 @@ _02201C22:
mov r0, #0x83
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov17_02201D30

2
asm/overlay_18.s
View File

@ -262,7 +262,7 @@ ov18_021E5AA0: ; 0x021E5AA0
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
ldr r0, _021E5B50 ; =0x0000085C
mov r1, #5

4
asm/overlay_37.s
View File

@ -82,7 +82,7 @@ _021E5916:
add r3, r0, #0
bl BeginNormalPaletteFade
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #8]
mov r0, #0x4e
mov r1, #0x27
@ -302,7 +302,7 @@ ov37_021E5B94: ; 0x021E5B94
bl OverlayManager_GetData
add r6, r0, #0
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r7]
cmp r0, #3

2
asm/overlay_39_thumb.s
View File

@ -2410,7 +2410,7 @@ ov39_02228140: ; 0x02228140
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
mov r0, #0x7c
bl BgConfig_Alloc

8
asm/overlay_41.s
View File

@ -2083,7 +2083,7 @@ ov41_02246DE0: ; 0x02246DE0
bl Main_SetVBlankIntrCB
bl HBlankInterruptDisable
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r5, #0xc]
ldr r1, _02246EF4 ; =0x000006DC
@ -2188,7 +2188,7 @@ ov41_02246F08: ; 0x02246F08
add r4, r0, #0
add r0, r7, #0
mov r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r5]
cmp r1, #0xc
bhi _02246FD6
@ -2470,7 +2470,7 @@ ov41_02247150: ; 0x02247150
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #0x1b
lsl r0, r0, #6
@ -12399,7 +12399,7 @@ ov41_0224BA10: ; 0x0224BA10
bl Main_SetVBlankIntrCB
bl HBlankInterruptDisable
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r0, [r4]
ldr r1, [r4, #4]

2
asm/overlay_43.s
View File

@ -24,7 +24,7 @@ ov43_02229EE0: ; 0x02229EE0
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x9f
lsl r1, r1, #2
str r0, [r4, r1]

10
asm/overlay_44.s
View File

@ -843,7 +843,7 @@ ov44_0222A4B4: ; 0x0222A4B4
_0222A4C8:
b _0222A600
_0222A4CA:
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
bl sub_02039998
cmp r0, #0
@ -1156,7 +1156,7 @@ ov44_0222A758: ; 0x0222A758
add r4, r0, #0
bl ov44_0222A68C
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
mov r0, #0xd3
lsl r0, r0, #2
@ -18241,7 +18241,7 @@ _02232EA4: .word ov44_0223688C
ov44_02232EA8: ; 0x02232EA8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, _02232F5C ; =FS_OVERLAY_ID(OVY_42)
mov r1, #2
@ -18325,7 +18325,7 @@ ov44_02232F64: ; 0x02232F64
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r7, r0, #0
ldr r0, [r5]
cmp r0, #4
@ -18482,7 +18482,7 @@ ov44_022330A8: ; 0x022330A8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r0, #0
add r1, r0, #0
bl Main_SetVBlankIntrCB

2
asm/overlay_45_thumb.s
View File

@ -33,7 +33,7 @@ _02229F18:
sub r1, r1, #1
bne _02229F18
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r0, [r4, #4]
mov r1, #0x6f

8
asm/overlay_46.s
View File

@ -22,7 +22,7 @@ ov46_02258800: ; 0x02258800
add r5, r0, #0
bl memset
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r0, [r4]
ldr r1, _0225891C ; =0x0000047D
@ -148,7 +148,7 @@ ov46_0225892C: ; 0x0225892C
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
ldr r0, [r4]
cmp r0, #0xf
@ -581,7 +581,7 @@ ov46_02258CB4: ; 0x02258CB4
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0]
mov r1, #0x77
str r0, [r4]
@ -680,7 +680,7 @@ ov46_02258DA8: ; 0x02258DA8
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
ldr r0, [r4]
cmp r0, #0xa

6
asm/overlay_47.s
View File

@ -8,7 +8,7 @@ ov47_02258800: ; 0x02258800
push {r3, r4, r5, r6, lr}
sub sp, #4
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -82,7 +82,7 @@ ov47_02258898: ; 0x02258898
bl OverlayManager_GetData
add r7, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r4]
cmp r0, #4
@ -215,7 +215,7 @@ ov47_022589A8: ; 0x022589A8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
mov r0, #0
add r1, r0, #0

6
asm/overlay_48.s
View File

@ -8,7 +8,7 @@ ov48_02258800: ; 0x02258800
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -135,7 +135,7 @@ ov48_02258920: ; 0x02258920
bl OverlayManager_GetData
add r7, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r4]
cmp r0, #6
@ -243,7 +243,7 @@ ov48_022589FC: ; 0x022589FC
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r0, #0
add r1, r0, #0
bl Main_SetVBlankIntrCB

6
asm/overlay_49.s
View File

@ -2587,7 +2587,7 @@ ov49_02259AA4: ; 0x02259AA4
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #0x3a
add r5, r0, #0
mov r0, #3
@ -2806,7 +2806,7 @@ ov49_02259C90: ; 0x02259C90
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r5]
cmp r0, #8
bhi _02259D58
@ -3106,7 +3106,7 @@ ov49_02259EF8: ; 0x02259EF8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldrb r1, [r4, #1]
str r1, [r0, #0x18]
mov r0, #0

2
asm/overlay_53.s
View File

@ -29,7 +29,7 @@ ov53_OakSpeech_OvyInit: ; 0x021E5900
mov r0, #0x50
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr

2
asm/overlay_54.s
View File

@ -7,7 +7,7 @@
ov54_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #3
mov r1, #0x26

4
asm/overlay_55.s
View File

@ -28,7 +28,7 @@ _021E5920:
ov55_021E5924: ; 0x021E5924
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #1
add r5, r0, #0
mov r0, #3
@ -85,7 +85,7 @@ ov55_021E598C: ; 0x021E598C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r6]
cmp r0, #4

2
asm/overlay_56.s
View File

@ -23,7 +23,7 @@ ov56_021E5C20: ; 0x021E5C20
mov r0, #0x29
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #0x1c]
ldrh r0, [r0]
ldr r1, _021E5C98 ; =0x0000FFFF

2
asm/overlay_57.s
View File

@ -38,7 +38,7 @@ ov57_022378DC: ; 0x022378DC
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
mov r0, #0xb4
mov r1, #0x34

2
asm/overlay_58.s
View File

@ -45,7 +45,7 @@ ov58_022378E4: ; 0x022378E4
mov r0, #0x85
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov58_02237B40

4
asm/overlay_59.s
View File

@ -34,7 +34,7 @@ _02237D52:
mov r0, #0x86
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov59_02237E94
@ -5682,7 +5682,7 @@ _0223A8F2:
mov r0, #0x86
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #4]
add r0, r4, #0
bl ov59_0223A9E4

2
asm/overlay_63.s
View File

@ -38,7 +38,7 @@ ov63_0221BE20: ; 0x0221BE20
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
mov r0, #0
mov r1, #0x1b

2
asm/overlay_64.s
View File

@ -44,7 +44,7 @@ ov64_021E5900: ; 0x021E5900
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
bl Sav2_HOF_GetNumRecords
mov r1, #0x6e

4
asm/overlay_65.s
View File

@ -1816,7 +1816,7 @@ ov65_0221CD74: ; 0x0221CD74
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r4, #0x68]
str r1, [r0, #0x24]
add r0, r4, #0
@ -2212,7 +2212,7 @@ ov65_0221D0EC: ; 0x0221D0EC
push {r4, r5, r6, lr}
add r5, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
mov r2, #6
ldr r0, _0221D1B0 ; =0x00000674

2
asm/overlay_67.s
View File

@ -7,7 +7,7 @@
ov67_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #2
add r5, r0, #0
mov r0, #3

2
asm/overlay_68.s
View File

@ -23,7 +23,7 @@ ov68_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
add r0, r4, #0
bl ov68_021E5A58

2
asm/overlay_69.s
View File

@ -52,7 +52,7 @@ _021E5960:
lsl r0, r0, #8
str r1, [r5, r0]
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
bl sub_0202CA44
str r0, [r5, #4]

2
asm/overlay_70.s
View File

@ -1983,7 +1983,7 @@ ov70_02238818: ; 0x02238818
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0
str r0, [r4]
add r0, r4, #0

2
asm/overlay_71.s
View File

@ -37,7 +37,7 @@ _02246970:
b _02246B06
_022469A6:
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
mov r0, #0
str r0, [r4, #4]

2
asm/overlay_72.s
View File

@ -1091,7 +1091,7 @@ ov72_02238144: ; 0x02238144
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0
str r0, [r4]
add r0, r4, #0

4
asm/overlay_73.s
View File

@ -55,7 +55,7 @@ _021E5916:
bl BgConfig_Alloc
str r0, [r4]
add r0, r7, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #8]
ldr r1, [r0]
ldr r0, _021E5AA0 ; =0x00004A0C
@ -5114,7 +5114,7 @@ ov73_021E8148: ; 0x021E8148
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0
str r0, [r4]
add r0, r4, #0

16
asm/overlay_74_thumb.s
View File

@ -3192,7 +3192,7 @@ ov74_MainMenu_AppInit: ; 0x02228920
mov r1, #0
bl sub_0200FBF4
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Save_MysteryGift_get
@ -4241,7 +4241,7 @@ ov74_02229200: ; 0x02229200
bl BgConfig_Alloc
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #8]
bl Sav2_PlayerData_GetProfileAddr
@ -5611,7 +5611,7 @@ ov74_02229D1C: ; 0x02229D1C
cmp r0, #0
bne _02229D48
bl ov74_0222CD7C
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
add r1, r4, #0
bl sub_02038148
@ -6216,7 +6216,7 @@ ov74_0222A174: ; 0x0222A174
add r0, r6, #0
add r4, #0x8c
add r5, #0xdc
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [sp]
add r0, r4, #0
@ -7893,7 +7893,7 @@ _0222AEE8:
mov r1, #0x1d
str r1, [r4, r0]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr
@ -14267,7 +14267,7 @@ _0222E216: ; jump table
.short _0222E79C - _0222E216 - 2 ; case 30
_0222E254:
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r0, #8]
ldr r0, _0222E5A4 ; =0x00002BA4
str r1, [r4, r0]
@ -16942,7 +16942,7 @@ _0222F7F6: ; jump table
.short _0222FB2C - _0222F7F6 - 2 ; case 30
_0222F834:
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [r0, #8]
ldr r0, _0222FB50 ; =0x00002BA4
str r1, [r4, r0]
@ -24546,7 +24546,7 @@ ov74_02233230: ; 0x02233230
mov r1, #0
bl sub_0200FBF4
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #0x10]
bl Sav2_PlayerData_GetProfileAddr

4
asm/overlay_75.s
View File

@ -29,7 +29,7 @@ ov75_02246960: ; 0x02246960
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr
@ -825,7 +825,7 @@ ov75_02246F0C: ; 0x02246F0C
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
mov r0, #0x74
bl BgConfig_Alloc

3194
asm/overlay_76.s
View File

File diff suppressed because it is too large Load Diff

2
asm/overlay_78.s
View File

@ -21,7 +21,7 @@ ov78_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
ldr r0, [r5]
bl Save_GetPartyLeadAlive

2
asm/overlay_81.s
View File

@ -41,7 +41,7 @@ ov81_0223DD60: ; 0x0223DD60
str r0, [r4, #0x4c]
str r5, [r4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r3, #0x6f
mov r2, #0xf
ldr r1, [r0]

2
asm/overlay_82.s
View File

@ -32,7 +32,7 @@ ov82_0223DD60: ; 0x0223DD60
str r0, [r5, #0x48]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
add r0, r5, #0
ldr r1, [r4]

4
asm/overlay_83.s
View File

@ -28,7 +28,7 @@ ov83_0223DD60: ; 0x0223DD60
str r0, [r5, #0x4c]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r1, [r4]
ldr r0, _0223DE48 ; =0x0000050C
@ -9985,7 +9985,7 @@ ov83_02242FE8: ; 0x02242FE8
str r0, [r5, #0x4c]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
mov r0, #0xaf
ldr r1, [r4]

2
asm/overlay_84.s
View File

@ -34,7 +34,7 @@ ov84_0223DD60: ; 0x0223DD60
str r0, [r1]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
add r0, r5, #0
ldr r1, [r4]

4
asm/overlay_85.s
View File

@ -8,7 +8,7 @@ ov85_021E5900: ; 0x021E5900
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r5, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
mov r0, #1
add r1, r0, #0
@ -6453,7 +6453,7 @@ ov85_021E88AC: ; 0x021E88AC
sub sp, #0xc
add r5, r1, #0
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
ldr r0, [r5]
cmp r0, #0

2
asm/overlay_86.s
View File

@ -50,7 +50,7 @@ ov86_021E5900: ; 0x021E5900
bl BgConfig_Alloc
str r0, [r5, #0xc]
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
mov r0, #0x89
ldr r1, [r4]

2
asm/overlay_87.s
View File

@ -27,7 +27,7 @@ ov87_021E5900: ; 0x021E5900
str r0, [r4, #0x58]
add r0, r5, #0
str r5, [r4]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r1, #0x5a
add r2, r5, #0

6
asm/overlay_88.s
View File

@ -8,7 +8,7 @@ ov88_02258800: ; 0x02258800
push {r4, r5, lr}
sub sp, #0xc
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -102,7 +102,7 @@ ov88_022588C4: ; 0x022588C4
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
ldr r0, [r5]
cmp r0, #4
@ -255,7 +255,7 @@ ov88_022589FC: ; 0x022589FC
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r0, #2
lsl r0, r0, #8
add r0, r4, r0

2
asm/overlay_89.s
View File

@ -50,7 +50,7 @@ ov89_02258800: ; 0x02258800
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
ldr r0, [r0]
bl ov45_0222A2C8

6
asm/overlay_91.s
View File

@ -7,7 +7,7 @@
ov91_0225C540: ; 0x0225C540
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #3
mov r1, #0x6a
@ -48,7 +48,7 @@ ov91_0225C58C: ; 0x0225C58C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
add r0, r4, #0
add r0, #8
@ -588,7 +588,7 @@ ov91_0225C9EC: ; 0x0225C9EC
bl OverlayManager_GetData
add r6, r0, #0
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r4]
cmp r0, #0
beq _0225CA0A

2
asm/overlay_92.s
View File

@ -689,7 +689,7 @@ ov92_0225CAB4: ; 0x0225CAB4
str r0, [sp, #4]
bl memset
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, [sp, #4]
ldr r6, [sp, #4]
add r1, #0x88

6
asm/overlay_93_thumb_1.s
View File

@ -7,7 +7,7 @@
ov93_0225C540: ; 0x0225C540
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #3
mov r1, #0x75
@ -36,7 +36,7 @@ ov93_0225C574: ; 0x0225C574
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r6, r0, #0
add r0, r5, #0
bl ov93_0225C730
@ -348,7 +348,7 @@ ov93_0225C768: ; 0x0225C768
add r1, #0x98
str r0, [r1]
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
add r0, r5, #0
bl ov93_022626FC

2
asm/overlay_93_thumb_2.s
View File

@ -5435,7 +5435,7 @@ ov93_02262598: ; 0x02262598
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
mov r0, #1
pop {r3, r4, r5, pc}

2
asm/overlay_95.s
View File

@ -2609,7 +2609,7 @@ ov95_021E6D70: ; 0x021E6D70
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
ldr r0, [r0, #0x10]
bl Options_GetTextFrameDelay

2
asm/overlay_96.s
View File

@ -28,7 +28,7 @@ PokeathlonCourseApplication_OvyInit: ; 0x021E5900
lsl r0, r0, #2
str r1, [r4, r0]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r2, #0x7e
lsl r2, r2, #2
add r5, sp, #4

6
asm/overlay_97.s
View File

@ -103,7 +103,7 @@ _0221E66E:
cmp r0, #0
beq _0221E68A
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r1, r0, #0
add r0, r4, #0
bl ov97_0221E98C
@ -150,7 +150,7 @@ ov97_0221E69C: ; 0x0221E69C
ov97_0221E6DC: ; 0x0221E6DC
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
_0221E6E6:
add r0, r5, #0
@ -173,7 +173,7 @@ ov97_0221E700: ; 0x0221E700
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r7, r0, #0
add r0, r4, #0
mov r1, #0x34

8
asm/overlay_99.s
View File

@ -12,7 +12,7 @@ ov99_021E5900: ; 0x021E5900
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021E591C
bl GF_AssertFail
@ -1829,7 +1829,7 @@ ov99_021E677C: ; 0x021E677C
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021E6798
bl GF_AssertFail
@ -3993,7 +3993,7 @@ ov99_021E7818: ; 0x021E7818
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bl GX_DisableEngineBLayers
bl GX_DisableEngineALayers
@ -5363,7 +5363,7 @@ ov99_021E8304: ; 0x021E8304
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
bne _021E831E
bl GF_AssertFail

2
asm/overlay_trainer_card_main.s
View File

@ -54,7 +54,7 @@ TrainerCardMainApp_OvyInit: ; 0x021E5AC0
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r1, r4, #0
add r1, #0xe4
str r0, [r1]

6
asm/overlay_trainer_card_signature.s
View File

@ -90,17 +90,17 @@ _021E80D6:
add r3, r0, #0
bl BeginNormalPaletteFade
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
bl Save_TrainerCard_get
bl TrainerCard_GetSignature
ldr r1, _021E8238 ; =0x00005B98
str r0, [r4, r1]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
bl Sav2_GameStats_get
str r0, [r4, #8]
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
bl Sav2_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
add r0, r4, #0

114
asm/scrcmd_10.s
View File

@ -1,114 +0,0 @@
.include "asm/macros.inc"
.include "global.inc"
.text
thumb_func_start ScrCmd_AnimApricornTree
ScrCmd_AnimApricornTree: ; 0x0204BC98
push {r4, r5, r6, lr}
add r5, r0, #0
bl ScriptReadHalfword
add r6, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
mov r1, #0xa
bl FieldSysGetAttrAddr
add r4, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
add r1, r6, #0
bl GetVarPointer
add r5, #0x80
add r2, r0, #0
ldr r0, [r5]
ldr r1, [r4]
bl FieldSys_AnimApricornTree
mov r0, #1
pop {r4, r5, r6, pc}
thumb_func_end ScrCmd_AnimApricornTree
thumb_func_start ScrCmd_ApricornTreeGetApricorn
ScrCmd_ApricornTreeGetApricorn: ; 0x0204BCCC
push {r4, r5, r6, lr}
add r5, r0, #0
bl ScriptReadHalfword
add r6, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
mov r1, #0xa
bl FieldSysGetAttrAddr
add r4, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
add r1, r6, #0
bl GetVarPointer
add r5, #0x80
add r6, r0, #0
ldr r0, [r5]
ldr r1, [r4]
bl FieldSys_ApricornTree_GetApricorn
strh r0, [r6]
mov r0, #0
pop {r4, r5, r6, pc}
.balign 4, 0
thumb_func_end ScrCmd_ApricornTreeGetApricorn
thumb_func_start ScrCmd_GiveApricornFromTree
ScrCmd_GiveApricornFromTree: ; 0x0204BD04
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
add r7, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl GetVarPointer
add r5, #0x80
add r6, r0, #0
ldr r0, [r5]
ldr r0, [r0, #0xc]
bl Save_ApricornBox_get
; this looks like an inline
lsl r1, r7, #0x18
lsr r5, r1, #0x18
add r1, r5, #0
str r0, [sp]
bl ApricornBox_CountApricorn
add r0, r4, r0
cmp r0, #0x63
bgt _0204BD6E
ldr r0, [sp]
add r1, r5, #0
add r2, r4, #0
bl ApricornBox_GiveApricorn
mov r0, #1
b _0204BD70
_0204BD6E:
mov r0, #0
_0204BD70:
strh r0, [r6]
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end ScrCmd_GiveApricornFromTree

484
asm/scrcmd_6.s
View File

@ -1,484 +0,0 @@
.include "asm/macros.inc"
.include "global.inc"
.text
thumb_func_start ScrCmd_575
ScrCmd_575: ; 0x0204910C
push {r3, r4, r5, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r5, r0, #0
add r0, r4, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl GetVarPointer
add r4, r0, #0
add r0, r5, #0
bl sub_02005F94
strh r0, [r4]
mov r0, #0
pop {r3, r4, r5, pc}
thumb_func_end ScrCmd_575
thumb_func_start ScrCmd_PlayBGM
ScrCmd_PlayBGM: ; 0x02049134
push {r3, lr}
bl ScriptReadHalfword
bl PlayBGM
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_PlayBGM
thumb_func_start ScrCmd_081
ScrCmd_081: ; 0x02049144
push {r3, lr}
bl ScriptReadHalfword
bl GF_GetCurrentPlayingBGM
mov r1, #0
bl StopBGM
mov r0, #0
pop {r3, pc}
thumb_func_end ScrCmd_081
thumb_func_start ScrCmd_ResetBGM
ScrCmd_ResetBGM: ; 0x02049158
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
ldr r1, [r0, #0x20]
ldr r1, [r1]
bl GetMapMusic
bl PlayBGM
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_ResetBGM
thumb_func_start ScrCmd_083
ScrCmd_083: ; 0x02049170
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl Fsys_SetSavedMusicId
mov r0, #0
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_083
thumb_func_start ScrCmd_FadeOutBGM
ScrCmd_FadeOutBGM: ; 0x02049188
push {r3, r4, r5, lr}
add r5, r0, #0
bl ScriptReadHalfword
add r4, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r4, #0
bl GF_SndStartFadeOutBGM
ldr r1, _020491AC ; =sub_020491B0
add r0, r5, #0
bl SetupNativeScript
mov r0, #1
pop {r3, r4, r5, pc}
.balign 4, 0
_020491AC: .word sub_020491B0
thumb_func_end ScrCmd_FadeOutBGM
thumb_func_start sub_020491B0
sub_020491B0: ; 0x020491B0
push {r3, lr}
bl GF_SndGetFadeTimer
cmp r0, #0
bne _020491BE
mov r0, #1
pop {r3, pc}
_020491BE:
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end sub_020491B0
thumb_func_start ScrCmd_085
ScrCmd_085: ; 0x020491C4
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
mov r0, #0x7f
mov r2, #0
bl GF_SndStartFadeInBGM
ldr r1, _020491E4 ; =sub_020491B0
add r0, r4, #0
bl SetupNativeScript
mov r0, #1
pop {r4, pc}
nop
_020491E4: .word sub_020491B0
thumb_func_end ScrCmd_085
thumb_func_start ScrCmd_086
ScrCmd_086: ; 0x020491E8
push {r3, lr}
ldr r1, [r0, #8]
add r3, r1, #1
str r3, [r0, #8]
ldrb r2, [r1]
add r1, r3, #1
str r1, [r0, #8]
ldrb r1, [r3]
add r0, r2, #0
bl sub_020053A8
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_086
thumb_func_start ScrCmd_TempBGM
ScrCmd_TempBGM: ; 0x02049204
push {r3, lr}
bl ScriptReadHalfword
bl sub_02005E44
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_TempBGM
thumb_func_start ScrCmd_088
ScrCmd_088: ; 0x02049214
push {r3, lr}
ldr r2, [r0, #8]
add r1, r2, #1
str r1, [r0, #8]
ldrb r0, [r2]
bl GF_SND_BGM_DisableSet
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_088
thumb_func_start ScrCmd_PlaySE
ScrCmd_PlaySE: ; 0x02049228
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl VarGet
bl PlaySE
mov r0, #0
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_PlaySE
thumb_func_start ScrCmd_StopSE
ScrCmd_StopSE: ; 0x02049244
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl VarGet
mov r1, #0
bl StopSE
mov r0, #0
pop {r4, pc}
thumb_func_end ScrCmd_StopSE
thumb_func_start ScrCmd_WaitSE
ScrCmd_WaitSE: ; 0x02049260
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
str r0, [r4, #0x64]
ldr r1, _02049284 ; =sub_02049288
add r0, r4, #0
bl SetupNativeScript
mov r0, #1
pop {r4, pc}
nop
_02049284: .word sub_02049288
thumb_func_end ScrCmd_WaitSE
thumb_func_start sub_02049288
sub_02049288: ; 0x02049288
push {r3, lr}
ldr r0, [r0, #0x64]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl IsSEPlaying
cmp r0, #0
bne _0204929C
mov r0, #1
pop {r3, pc}
_0204929C:
mov r0, #0
pop {r3, pc}
thumb_func_end sub_02049288
thumb_func_start ScrCmd_PlayCry
ScrCmd_PlayCry: ; 0x020492A0
push {r3, r4, r5, lr}
sub sp, #8
add r5, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
add r4, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0
ldr r0, [r5]
bl VarGet
mov r1, #0x20
str r1, [sp]
mov r2, #0
add r1, r4, #0
mov r3, #0x64
str r2, [sp, #4]
bl PlayCryEx
mov r0, #0
add sp, #8
pop {r3, r4, r5, pc}
.balign 4, 0
thumb_func_end ScrCmd_PlayCry
thumb_func_start ScrCmd_WaitCry
ScrCmd_WaitCry: ; 0x020492E0
push {r3, lr}
ldr r1, _020492EC ; =ScrNative_WaitCry
bl SetupNativeScript
mov r0, #1
pop {r3, pc}
.balign 4, 0
_020492EC: .word ScrNative_WaitCry
thumb_func_end ScrCmd_WaitCry
thumb_func_start ScrNative_WaitCry
ScrNative_WaitCry: ; 0x020492F0
push {r3, lr}
bl IsCryFinished
cmp r0, #0
bne _020492FE
mov r0, #1
pop {r3, pc}
_020492FE:
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrNative_WaitCry
thumb_func_start ScrCmd_PlayFanfare
ScrCmd_PlayFanfare: ; 0x02049304
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl VarGet
bl PlayFanfare
mov r0, #0
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_PlayFanfare
thumb_func_start ScrCmd_WaitFanfare
ScrCmd_WaitFanfare: ; 0x02049320
push {r3, lr}
ldr r1, _0204932C ; =ScrNative_WaitFanfare
bl SetupNativeScript
mov r0, #1
pop {r3, pc}
.balign 4, 0
_0204932C: .word ScrNative_WaitFanfare
thumb_func_end ScrCmd_WaitFanfare
thumb_func_start ScrNative_WaitFanfare
ScrNative_WaitFanfare: ; 0x02049330
push {r3, lr}
bl IsFanfarePlaying
cmp r0, #0
bne _0204933E
mov r0, #1
pop {r3, pc}
_0204933E:
mov r0, #0
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrNative_WaitFanfare
thumb_func_start ScrCmd_ChatotHasCry
ScrCmd_ChatotHasCry: ; 0x02049344
push {r3, r4, r5, lr}
add r5, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl GetVarPointer
add r5, #0x80
add r4, r0, #0
ldr r0, [r5]
ldr r0, [r0, #0xc]
bl Sav2_Chatot_get
bl Chatot_checkCry
cmp r0, #1
bne _02049374
mov r0, #1
strh r0, [r4]
mov r0, #0
pop {r3, r4, r5, pc}
_02049374:
mov r0, #0
strh r0, [r4]
pop {r3, r4, r5, pc}
.balign 4, 0
thumb_func_end ScrCmd_ChatotHasCry
thumb_func_start ScrCmd_ChatotStartRecording
ScrCmd_ChatotStartRecording: ; 0x0204937C
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl GetVarPointer
add r4, r0, #0
bl sub_02005518
cmp r0, #0
bne _0204939C
bl GF_AssertFail
_0204939C:
bl Chatot_startRecording
cmp r0, #0
bne _020493AC
mov r0, #1
strh r0, [r4]
mov r0, #0
pop {r4, pc}
_020493AC:
mov r0, #0
strh r0, [r4]
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_ChatotStartRecording
thumb_func_start ScrCmd_ChatotStopRecording
ScrCmd_ChatotStopRecording: ; 0x020493B4
push {r3, lr}
bl Chatot_stopRecording
mov r0, #1
pop {r3, pc}
.balign 4, 0
thumb_func_end ScrCmd_ChatotStopRecording
thumb_func_start ScrCmd_ChatotSaveRecording
ScrCmd_ChatotSaveRecording: ; 0x020493C0
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
ldr r0, [r0, #0xc]
bl Sav2_Chatot_get
bl Chatot_saveRecording
mov r0, #1
pop {r3, pc}
thumb_func_end ScrCmd_ChatotSaveRecording
thumb_func_start ScrCmd_093
ScrCmd_093: ; 0x020493D4
push {r3, lr}
mov r1, #0
mov r0, #0x3f
add r2, r1, #0
bl sub_02004EC4
mov r0, #1
pop {r3, pc}
thumb_func_end ScrCmd_093
thumb_func_start ScrCmd_544
ScrCmd_544: ; 0x020493E4
push {r3, r4, r5, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
add r5, r0, #0
add r0, r4, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl VarGet
add r1, r0, #0
add r0, r5, #0
bl GF_SetVolumeBySeqNo
mov r0, #0
pop {r3, r4, r5, pc}
.balign 4, 0
thumb_func_end ScrCmd_544
thumb_func_start ScrCmd_664
ScrCmd_664: ; 0x02049418
mov r0, #1
bx lr
thumb_func_end ScrCmd_664
thumb_func_start ScrCmd_665
ScrCmd_665: ; 0x0204941C
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r1, r0, #0
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl sub_02055198
mov r0, #1
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_665
thumb_func_start ScrCmd_666
ScrCmd_666: ; 0x02049440
push {r4, lr}
add r4, r0, #0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl GetVarPointer
add r4, r0, #0
bl GF_GetCurrentPlayingBGM
strh r0, [r4]
mov r0, #0
pop {r4, pc}
.balign 4, 0
thumb_func_end ScrCmd_666

2
asm/unk_020192D0.s
View File

@ -61,7 +61,7 @@ sub_020192D0: ; 0x020192D0
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r5]
ldr r1, _02019358 ; =0x0000047D
mov r0, #0xb

2
asm/unk_0203DE74.s
View File

@ -21,7 +21,7 @@ sFieldSysPtr:
Field_Continue_AppInit: ; 0x0203DE74
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_new

2
asm/unk_0203E348.s
View File

@ -28,7 +28,7 @@ _020FA1D4:
_020FA1E4:
.word ov68_021E5900, ov68_021E5968, ov68_021E5A3C, FS_OVERLAY_ID(OVY_68)
_020FA1F4:
.word ov76_021E5900, ov76_021E5B60, ov76_021E5AA0, FS_OVERLAY_ID(OVY_76)
.word CreditsApp_OvyInit, CreditsApp_OvyExec, CreditsApp_OvyExit, FS_OVERLAY_ID(credits)
_020FA204:
.word ov64_021E5900, ov64_021E5A18, ov64_021E59C8, FS_OVERLAY_ID(OVY_64)
_020FA214:

2
asm/unk_02078E30.s
View File

@ -1703,7 +1703,7 @@ sub_02079BD8: ; 0x02079BD8
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r1, _02079CC8 ; =0x00000654
str r0, [r4, r1]
mov r0, #0xc

10
asm/unk_02082908.s
View File

@ -108,7 +108,7 @@ _0208291E:
ldr r0, [r4, r0]
bl sub_020831A4
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r1, r0, #0
add r0, r4, #0
bl sub_02083160
@ -743,7 +743,7 @@ sub_02082EE8: ; 0x02082EE8
bl OverlayManager_GetData
add r4, r0, #0
ldr r0, [sp, #0x10]
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #0x56
lsl r0, r0, #2
@ -1253,7 +1253,7 @@ sub_02083334: ; 0x02083334
sub sp, #0x10
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r7, r0, #0
ldr r0, _020834E4 ; =0x0000045C
mov r1, #4
@ -1468,7 +1468,7 @@ sub_020834FC: ; 0x020834FC
sub sp, #0x14
add r5, r0, #0
add r0, r1, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r4, r0, #0
ldr r0, [r4, #0x44]
cmp r0, #0
@ -2993,7 +2993,7 @@ _02084122:
add r0, r5, r0
bl sub_02083F18
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x46
lsl r1, r1, #2
ldrh r2, [r5, r1]

2
asm/unk_020850F4.s
View File

@ -32,7 +32,7 @@ sub_020850F4: ; 0x020850F4
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
add r5, r0, #0
mov r0, #0xee
lsl r0, r0, #2

4
asm/unk_02087A78.s
View File

@ -17,7 +17,7 @@
thumb_func_start sub_02087A78
sub_02087A78: ; 0x02087A78
push {r3, lr}
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #0x14]
pop {r3, pc}
.balign 4, 0
@ -50,7 +50,7 @@ sub_02087A8C: ; 0x02087A8C
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4, #0x28]
ldr r0, [r0, #0xc]
ldr r1, _02087B00 ; =0x00004170

2
asm/unk_02088288.s
View File

@ -83,7 +83,7 @@ sub_02088298: ; 0x02088298
add r4, r0, #0
bl memset
add r0, r6, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
mov r1, #0x8b
lsl r1, r1, #2
str r0, [r4, r1]

702
asm/unk_02090C94.s
View File

@ -1,702 +0,0 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/maps.h"
.include "asm/macros.inc"
.include "global.inc"
.text
thumb_func_start sub_02090C94
sub_02090C94: ; 0x02090C94
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
add r7, r1, #0
ldr r0, [sp, #0x18]
mov r1, #0x28
add r6, r2, #0
str r3, [sp]
bl AllocFromHeap
add r4, r0, #0
strb r5, [r4]
strb r7, [r4, #1]
add r0, r6, #0
bl Sav2_Pokedex_get
str r0, [r4, #0xc]
add r0, r6, #0
bl SaveData_EasyChat_get
str r0, [r4, #0x10]
add r0, r6, #0
bl SavArray_Flags_get
bl CheckGameClearFlag
strb r0, [r4, #4]
mov r1, #0
strb r1, [r4, #5]
mov r0, #1
strb r0, [r4, #2]
strb r1, [r4, #3]
add r0, r6, #0
bl Sav2_PlayerData_GetOptionsAddr
bl Options_GetFrame
str r0, [r4, #8]
ldr r0, [sp]
cmp r5, #2
str r0, [r4, #0x24]
bne _02090CF2
add r0, r4, #0
add r0, #0x14
mov r1, #3
bl MailMsg_init_withBank
b _02090D02
_02090CF2:
ldr r0, _02090D08 ; =0x0000FFFF
mov r1, #0
add r2, r4, #0
_02090CF8:
add r1, r1, #1
strh r0, [r2, #0x1c]
add r2, r2, #2
cmp r1, #2
blt _02090CF8
_02090D02:
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
nop
_02090D08: .word 0x0000FFFF
thumb_func_end sub_02090C94
thumb_func_start sub_02090D0C
sub_02090D0C: ; 0x02090D0C
ldr r3, _02090D10 ; =FreeToHeap
bx r3
.balign 4, 0
_02090D10: .word FreeToHeap
thumb_func_end sub_02090D0C
thumb_func_start sub_02090D14
sub_02090D14: ; 0x02090D14
strh r1, [r0, #0x1c]
bx lr
thumb_func_end sub_02090D14
thumb_func_start sub_02090D18
sub_02090D18: ; 0x02090D18
strh r1, [r0, #0x1c]
strh r2, [r0, #0x1e]
bx lr
.balign 4, 0
thumb_func_end sub_02090D18
thumb_func_start sub_02090D20
sub_02090D20: ; 0x02090D20
ldrh r2, [r1]
strh r2, [r0, #0x14]
ldrh r2, [r1, #2]
strh r2, [r0, #0x16]
ldrh r2, [r1, #4]
strh r2, [r0, #0x18]
ldrh r1, [r1, #6]
strh r1, [r0, #0x1a]
bx lr
.balign 4, 0
thumb_func_end sub_02090D20
thumb_func_start sub_02090D34
sub_02090D34: ; 0x02090D34
mov r1, #1
strb r1, [r0, #2]
mov r1, #0
strb r1, [r0, #3]
bx lr
.balign 4, 0
thumb_func_end sub_02090D34
thumb_func_start sub_02090D40
sub_02090D40: ; 0x02090D40
mov r1, #1
strb r1, [r0, #5]
bx lr
.balign 4, 0
thumb_func_end sub_02090D40
thumb_func_start sub_02090D48
sub_02090D48: ; 0x02090D48
ldrb r0, [r0, #2]
bx lr
thumb_func_end sub_02090D48
thumb_func_start sub_02090D4C
sub_02090D4C: ; 0x02090D4C
ldrb r0, [r0, #3]
bx lr
thumb_func_end sub_02090D4C
thumb_func_start sub_02090D50
sub_02090D50: ; 0x02090D50
ldrh r0, [r0, #0x1c]
bx lr
thumb_func_end sub_02090D50
thumb_func_start sub_02090D54
sub_02090D54: ; 0x02090D54
ldrh r2, [r0, #0x1c]
strh r2, [r1]
ldrh r0, [r0, #0x1e]
strh r0, [r1, #2]
bx lr
.balign 4, 0
thumb_func_end sub_02090D54
thumb_func_start sub_02090D60
sub_02090D60: ; 0x02090D60
add r2, r0, #0
ldr r3, _02090D6C ; =MailMsg_copy
add r2, #0x14
add r0, r1, #0
add r1, r2, #0
bx r3
.balign 4, 0
_02090D6C: .word MailMsg_copy
thumb_func_end sub_02090D60
thumb_func_start sub_02090D70
sub_02090D70: ; 0x02090D70
ldrb r0, [r0]
bx lr
thumb_func_end sub_02090D70
thumb_func_start sub_02090D74
sub_02090D74: ; 0x02090D74
ldrb r0, [r0, #1]
bx lr
thumb_func_end sub_02090D74
thumb_func_start sub_02090D78
sub_02090D78: ; 0x02090D78
ldr r0, [r0, #8]
bx lr
thumb_func_end sub_02090D78
thumb_func_start sub_02090D7C
sub_02090D7C: ; 0x02090D7C
ldr r0, [r0, #0xc]
bx lr
thumb_func_end sub_02090D7C
thumb_func_start sub_02090D80
sub_02090D80: ; 0x02090D80
ldr r0, [r0, #0x10]
bx lr
thumb_func_end sub_02090D80
thumb_func_start sub_02090D84
sub_02090D84: ; 0x02090D84
ldrb r0, [r0, #4]
bx lr
thumb_func_end sub_02090D84
thumb_func_start sub_02090D88
sub_02090D88: ; 0x02090D88
ldrb r0, [r0, #5]
bx lr
thumb_func_end sub_02090D88
thumb_func_start sub_02090D8C
sub_02090D8C: ; 0x02090D8C
ldrb r3, [r0]
cmp r3, #0
beq _02090D9C
cmp r3, #1
beq _02090DA2
cmp r3, #2
beq _02090DAC
bx lr
_02090D9C:
ldrh r0, [r0, #0x1c]
strh r0, [r1]
bx lr
_02090DA2:
ldrh r2, [r0, #0x1c]
strh r2, [r1]
ldrh r0, [r0, #0x1e]
strh r0, [r1, #2]
bx lr
_02090DAC:
ldrh r1, [r0, #0x14]
strh r1, [r2]
ldrh r1, [r0, #0x16]
strh r1, [r2, #2]
ldrh r1, [r0, #0x18]
strh r1, [r2, #4]
ldrh r0, [r0, #0x1a]
strh r0, [r2, #6]
bx lr
.balign 4, 0
thumb_func_end sub_02090D8C
thumb_func_start sub_02090DC0
sub_02090DC0: ; 0x02090DC0
push {r3, lr}
ldrb r3, [r0]
cmp r3, #0
beq _02090DD0
cmp r3, #1
beq _02090DE0
cmp r3, #2
b _02090DF8
_02090DD0:
ldrh r1, [r1]
ldrh r0, [r0, #0x1c]
cmp r1, r0
bne _02090DDC
mov r0, #1
pop {r3, pc}
_02090DDC:
mov r0, #0
pop {r3, pc}
_02090DE0:
ldrh r3, [r1]
ldrh r2, [r0, #0x1c]
cmp r3, r2
bne _02090DF4
ldrh r1, [r1, #2]
ldrh r0, [r0, #0x1e]
cmp r1, r0
bne _02090DF4
mov r0, #1
pop {r3, pc}
_02090DF4:
mov r0, #0
pop {r3, pc}
_02090DF8:
add r0, #0x14
add r1, r2, #0
bl MailMsg_compare
pop {r3, pc}
.balign 4, 0
thumb_func_end sub_02090DC0
thumb_func_start sub_02090E04
sub_02090E04: ; 0x02090E04
push {r4, r5, r6, lr}
add r5, r0, #0
add r4, r1, #0
add r6, r2, #0
bl sub_02090DC0
cmp r0, #0
bne _02090E18
mov r0, #1
b _02090E1A
_02090E18:
mov r0, #0
_02090E1A:
strb r0, [r5, #3]
mov r1, #0
strb r1, [r5, #2]
add r2, r5, #0
_02090E22:
ldrh r0, [r4]
add r1, r1, #1
add r4, r4, #2
strh r0, [r2, #0x1c]
add r2, r2, #2
cmp r1, #2
blt _02090E22
ldrh r0, [r6]
strh r0, [r5, #0x14]
ldrh r0, [r6, #2]
strh r0, [r5, #0x16]
ldrh r0, [r6, #4]
strh r0, [r5, #0x18]
ldrh r0, [r6, #6]
strh r0, [r5, #0x1a]
pop {r4, r5, r6, pc}
.balign 4, 0
thumb_func_end sub_02090E04
thumb_func_start sub_02090E44
sub_02090E44: ; 0x02090E44
push {r3, lr}
cmp r0, #0
beq _02090E50
ldr r0, [r0, #0x24]
cmp r0, #0
bne _02090E54
_02090E50:
mov r0, #0
pop {r3, pc}
_02090E54:
bl sub_020183F0
pop {r3, pc}
.balign 4, 0
thumb_func_end sub_02090E44
thumb_func_start sub_02090E5C
sub_02090E5C: ; 0x02090E5C
ldr r3, _02090E64 ; =sub_02018410
ldr r0, [r0, #0x24]
bx r3
nop
_02090E64: .word sub_02018410
thumb_func_end sub_02090E5C
thumb_func_start sub_02090E68
sub_02090E68: ; 0x02090E68
push {r3, r4, r5, r6, r7, lr}
sub sp, #8
add r5, r0, #0
add r7, r1, #0
add r6, r2, #0
str r3, [sp]
bl Sav2_Mailbox_get
str r0, [sp, #4]
ldr r0, [sp, #0x20]
mov r1, #0x20
bl AllocFromHeapAtEnd
mov r1, #0
mov r2, #0x20
add r4, r0, #0
bl MI_CpuFill8
ldr r0, [sp]
strb r0, [r4, #0xf]
ldr r0, [sp, #4]
strb r6, [r4, #0xe]
str r0, [r4, #0x18]
mov r0, #1
strh r0, [r4]
str r7, [r4, #8]
mov r0, #0
strh r0, [r4, #0xc]
ldr r0, [sp, #0x20]
str r5, [r4, #0x10]
bl Mail_new
str r0, [r4, #0x14]
bl Mail_init
ldr r0, [r4, #0x14]
mov r1, #0xff
add r2, r6, #0
add r3, r5, #0
bl Mail_SetNewMessageDetails
add r0, r4, #0
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end sub_02090E68
thumb_func_start sub_02090EC0
sub_02090EC0: ; 0x02090EC0
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
add r5, r1, #0
add r0, r3, #0
mov r1, #0x20
add r6, r2, #0
str r3, [sp]
bl AllocFromHeapAtEnd
mov r1, #0
mov r2, #0x20
add r4, r0, #0
bl MI_CpuFill8
mov r0, #0
strh r0, [r4]
str r5, [r4, #8]
strh r6, [r4, #0xc]
add r0, r7, #0
str r7, [r4, #0x10]
bl Sav2_Mailbox_get
ldr r3, [sp]
add r1, r5, #0
add r2, r6, #0
str r0, [r4, #0x18]
bl Mailbox_AllocAndFetchMailI
str r0, [r4, #0x14]
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end sub_02090EC0
thumb_func_start sub_02090F00
sub_02090F00: ; 0x02090F00
push {r3, r4, r5, r6, r7, lr}
add r7, r2, #0
add r5, r0, #0
add r6, r1, #0
add r0, r7, #0
mov r1, #0x20
bl AllocFromHeapAtEnd
mov r1, #0
mov r2, #0x20
add r4, r0, #0
bl MI_CpuFill8
mov r0, #0
strh r0, [r4]
str r5, [r4, #0x10]
add r0, r7, #0
bl Mail_new
str r0, [r4, #0x14]
ldr r2, [r4, #0x14]
add r0, r6, #0
mov r1, #0xaa
bl GetMonData
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end sub_02090F00
thumb_func_start sub_02090F38
sub_02090F38: ; 0x02090F38
push {r3, r4, r5, r6, r7, lr}
add r7, r2, #0
add r5, r0, #0
add r6, r1, #0
add r0, r7, #0
mov r1, #0x20
bl AllocFromHeapAtEnd
mov r1, #0
mov r2, #0x20
add r4, r0, #0
bl MI_CpuFill8
mov r0, #0
strh r0, [r4]
add r0, r7, #0
str r5, [r4, #0x10]
bl Mail_new
add r1, r6, #0
str r0, [r4, #0x14]
bl Mail_SetType
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end sub_02090F38
thumb_func_start sub_02090F6C
sub_02090F6C: ; 0x02090F6C
ldr r0, [r0, #4]
bx lr
thumb_func_end sub_02090F6C
thumb_func_start sub_02090F70
sub_02090F70: ; 0x02090F70
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
bl sub_02090F6C
cmp r0, #0
bne _02090F82
mov r0, #0
pop {r3, r4, r5, pc}
_02090F82:
ldr r2, [r5, #0x14]
add r0, r4, #0
mov r1, #0xaa
bl SetMonData
mov r0, #1
pop {r3, r4, r5, pc}
thumb_func_end sub_02090F70
thumb_func_start sub_02090F90
sub_02090F90: ; 0x02090F90
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
cmp r0, #0
beq _02090F9E
bl FreeToHeap
_02090F9E:
add r0, r4, #0
bl FreeToHeap
pop {r4, pc}
.balign 4, 0
thumb_func_end sub_02090F90
thumb_func_start sub_02090FA8
sub_02090FA8: ; 0x02090FA8
push {r3, r4, r5, r6, r7, lr}
add r5, r1, #0
mov r1, #0
add r7, r0, #0
add r4, r2, #0
str r1, [sp]
bl Mailbox_GetFirstEmptySlotIdx
add r6, r0, #0
mov r0, #0
mvn r0, r0
cmp r6, r0
beq _02091002
add r0, r4, #0
bl Mail_new
add r4, r0, #0
add r0, r5, #0
mov r1, #0xaa
add r2, r4, #0
bl GetMonData
add r0, r7, #0
mov r1, #0
add r2, r6, #0
add r3, r4, #0
bl Mailbox_CopyMailToSlotI
add r0, r4, #0
bl Mail_init
add r0, r5, #0
mov r1, #0xaa
add r2, r4, #0
bl SetMonData
add r0, r5, #0
mov r1, #6
add r2, sp, #0
bl SetMonData
add r0, r4, #0
bl FreeToHeap
add r0, r6, #0
_02091002:
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end sub_02090FA8
thumb_func_start sub_02091004
sub_02091004: ; 0x02091004
push {r3, r4, r5, r6, r7, lr}
add r5, r1, #0
add r4, r2, #0
mov r1, #0
add r2, r5, #0
add r7, r0, #0
str r1, [sp]
bl Mailbox_AllocAndFetchMailI
add r6, r0, #0
bne _02091020
mov r0, #0
mvn r0, r0
pop {r3, r4, r5, r6, r7, pc}
_02091020:
bl Mail_GetType
bl MailToItemId
str r0, [sp]
add r0, r4, #0
mov r1, #0xaa
add r2, r6, #0
bl SetMonData
add r0, r4, #0
mov r1, #6
add r2, sp, #0
bl SetMonData
add r0, r7, #0
mov r1, #0
add r2, r5, #0
bl Mailbox_DeleteSlotI
add r0, r6, #0
bl FreeToHeap
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end sub_02091004
thumb_func_start sub_02091054
sub_02091054: ; 0x02091054
push {r4, lr}
add r4, r0, #0
cmp r4, #0x51
blo _02091060
bl GF_AssertFail
_02091060:
ldr r0, _02091068 ; =_02105F04
lsl r1, r4, #2
ldrb r0, [r0, r1]
pop {r4, pc}
.balign 4, 0
_02091068: .word _02105F04
thumb_func_end sub_02091054
thumb_func_start sub_0209106C
sub_0209106C: ; 0x0209106C
push {r4, lr}
add r4, r0, #0
cmp r4, #0x51
blo _02091078
bl GF_AssertFail
_02091078:
ldr r0, _02091080 ; =_02105F04 + 1
lsl r1, r4, #2
ldrb r0, [r0, r1]
pop {r4, pc}
.balign 4, 0
_02091080: .word _02105F04 + 1
thumb_func_end sub_0209106C
thumb_func_start sub_02091084
sub_02091084: ; 0x02091084
push {r4, lr}
add r4, r0, #0
cmp r4, #0x51
blo _02091090
bl GF_AssertFail
_02091090:
ldr r0, _02091098 ; =_02105F04 + 2
lsl r1, r4, #2
ldrb r0, [r0, r1]
pop {r4, pc}
.balign 4, 0
_02091098: .word _02105F04 + 2
thumb_func_end sub_02091084
thumb_func_start sub_0209109C
sub_0209109C: ; 0x0209109C
push {r4, lr}
add r4, r0, #0
cmp r4, #0x51
blo _020910A8
bl GF_AssertFail
_020910A8:
cmp r4, #0x32
blo _020910B0
cmp r4, #0x4d
bls _020910B4
_020910B0:
mov r0, #0
pop {r4, pc}
_020910B4:
mov r0, #1
pop {r4, pc}
thumb_func_end sub_0209109C
thumb_func_start sub_020910B8
sub_020910B8: ; 0x020910B8
push {r4, lr}
add r4, r0, #0
cmp r4, #0x51
blo _020910C4
bl GF_AssertFail
_020910C4:
ldr r0, _020910D4 ; =_02105F04
lsl r1, r4, #2
add r0, r0, r1
ldrb r0, [r0, #3]
lsl r0, r0, #0x18
lsr r0, r0, #0x1a
pop {r4, pc}
nop
_020910D4: .word _02105F04
thumb_func_end sub_020910B8
.rodata
_02105F04:
.byte 0x27, 0x00, 0x35, 0x01, 0x28, 0x01, 0x35, 0x01, 0x29, 0x02, 0x36, 0x05
.byte 0x2A, 0x03, 0x37, 0x09, 0x2B, 0x04, 0x38, 0x0D, 0x2C, 0x05, 0x39, 0x12, 0x2D, 0x06, 0x3A, 0x16
.byte 0x2F, 0x07, 0x3B, 0x19, 0x2E, 0x08, 0x3C, 0x1D, 0x31, 0x09, 0x3D, 0x21, 0x30, 0x0A, 0x3E, 0x25
.byte 0x33, 0x0B, 0x3F, 0x2A, 0x32, 0x0C, 0x40, 0x2E, 0x34, 0x0D, 0x41, 0x32, 0x35, 0x0E, 0x42, 0x36
.byte 0x36, 0x0F, 0x43, 0x3A, 0x37, 0x10, 0x44, 0x3E, 0x38, 0x11, 0x49, 0x42, 0x39, 0x12, 0x4A, 0x46
.byte 0x3A, 0x13, 0x4B, 0x4A, 0x3B, 0x14, 0x4C, 0x4E, 0x3C, 0x15, 0x45, 0x52, 0x3D, 0x16, 0x46, 0x56
.byte 0x3E, 0x17, 0x47, 0x5A, 0x3F, 0x18, 0x48, 0x5E, 0x40, 0x19, 0x4D, 0x61, 0x41, 0x1A, 0x4E, 0x65
.byte 0x42, 0x1B, 0x4F, 0x69, 0x43, 0x1C, 0x50, 0x6D, 0x44, 0x1D, 0x51, 0x71, 0x45, 0x1E, 0x52, 0x75
.byte 0x46, 0x1F, 0x53, 0x79, 0x47, 0x20, 0x54, 0x7D, 0x48, 0x21, 0x55, 0x81, 0x49, 0x22, 0x56, 0x85
.byte 0x4A, 0x23, 0x57, 0x8A, 0x4B, 0x24, 0x58, 0x8E, 0x4C, 0x25, 0x59, 0x91, 0x4D, 0x26, 0x5A, 0x95
.byte 0x4E, 0x27, 0x5B, 0x99, 0x4F, 0x28, 0x5C, 0x9D, 0x50, 0x29, 0x5D, 0xA1, 0x51, 0x2A, 0x5E, 0xA5
.byte 0x52, 0x2B, 0x5F, 0xA9, 0x53, 0x2C, 0x60, 0xAD, 0x54, 0x2D, 0x61, 0xB1, 0x55, 0x2E, 0x62, 0xB5
.byte 0x56, 0x2F, 0x63, 0xB9, 0x57, 0x30, 0x64, 0xBD, 0x58, 0x31, 0x65, 0xC1, 0x59, 0x32, 0x66, 0x00
.byte 0x5A, 0x33, 0x67, 0x00, 0x5B, 0x34, 0x68, 0x00, 0x5C, 0x35, 0x69, 0x00, 0x5D, 0x36, 0x6A, 0x00
.byte 0x5E, 0x37, 0x6B, 0x00, 0x5F, 0x38, 0x6C, 0x00, 0x60, 0x39, 0x6D, 0x00, 0x61, 0x3A, 0x6E, 0x00
.byte 0x62, 0x3B, 0x6F, 0x00, 0x63, 0x3C, 0x70, 0x00, 0x64, 0x3D, 0x71, 0x00, 0x65, 0x3E, 0x72, 0x00
.byte 0x66, 0x3F, 0x73, 0x00, 0x67, 0x40, 0x74, 0x00, 0x68, 0x41, 0x75, 0x00, 0x69, 0x42, 0x76, 0x00
.byte 0x6A, 0x43, 0x77, 0x00, 0x6B, 0x44, 0x78, 0x00, 0x6C, 0x45, 0x79, 0x00, 0x6D, 0x46, 0x7A, 0x00
.byte 0x6E, 0x47, 0x7B, 0x00, 0x6F, 0x48, 0x7C, 0x00, 0x70, 0x49, 0x7D, 0x00, 0x71, 0x4A, 0x7E, 0x00
.byte 0x72, 0x4B, 0x7F, 0x00, 0x73, 0x4C, 0x80, 0x00, 0x74, 0x4D, 0x81, 0x00, 0x75, 0x4E, 0x82, 0xC4
.byte 0x76, 0x4F, 0x83, 0xC8, 0x77, 0x50, 0x84, 0xCC

2
asm/unk_020915B0.s
View File

@ -97,7 +97,7 @@ sub_02091634: ; 0x02091634
lsl r2, r2, #0xc
bl CreateHeap
add r0, r4, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
mov r1, #0x30
bl sub_020915F0

2
asm/unk_02091CDC.s
View File

@ -30,7 +30,7 @@ App_DeleteSave_Init: ; 0x02091CDC
mov r0, #0
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #0x30]
mov r0, #1

2
asm/unk_020921A4.s
View File

@ -30,7 +30,7 @@ sub_020921A4: ; 0x020921A4
mov r0, #0
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
ldr r0, [r0, #8]
str r0, [r4, #0x34]
mov r0, #1

2
asm/unk_020965A4.s
View File

@ -26,7 +26,7 @@ sub_020965A4: ; 0x020965A4
add r0, r4, #0
bl sub_02096884
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
cmp r0, #0
bne _020965DC

2
asm/unk_02097B78.s
View File

@ -26,7 +26,7 @@ sub_02097B78: ; 0x02097B78
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetParentWork
bl OverlayManager_GetArgs
str r0, [r4]
mov r0, #1
pop {r3, r4, r5, pc}

25
common.mk
View File

@ -42,7 +42,8 @@ MKFXCONST := $(TOOLSDIR)/gen_fx_consts/gen_fx_consts$(EXE)
# Decompiled NitroSDK tools
COMPSTATIC := $(TOOLSDIR)/compstatic/compstatic$(EXE)
NTRMERGE := $(TOOLSDIR)/ntr_merge_elf/ntr_merge_elf.sh
NTRMERGE := $(TOOLSDIR)/ntr_merge_elf/ntr_merge_elf.sh
ASM_PROCESSOR := $(TOOLSDIR)/asm_processor/compile.sh
NATIVE_TOOLS := \
$(JSONPROC) \
@ -75,15 +76,17 @@ LIB_ASM_BUILDDIR := $(addprefix $(BUILD_DIR)/,$(LIB_ASM_SUBDIR))
C_SRCS := $(foreach dname,$(SRC_SUBDIR),$(wildcard $(dname)/*.c))
ASM_SRCS := $(foreach dname,$(ASM_SUBDIR),$(wildcard $(dname)/*.s))
GLOBAL_ASM_SRCS != grep -rl 'GLOBAL_ASM(' $(C_SRCS)
LIB_C_SRCS := $(foreach dname,$(LIB_SRC_SUBDIR),$(wildcard $(dname)/*.c))
LIB_ASM_SRCS := $(foreach dname,$(LIB_ASM_SUBDIR),$(wildcard $(dname)/*.s))
ALL_SRCS := $(C_SRCS) $(ASM_SRCS) $(LIB_C_SRCS) $(LIB_ASM_SRCS)
ALL_SRCS := $(C_SRCS) $(ASM_SRCS) $(GLOBAL_ASM_SRCS) $(LIB_C_SRCS) $(LIB_ASM_SRCS)
C_OBJS = $(C_SRCS:%.c=$(BUILD_DIR)/%.o)
ASM_OBJS = $(ASM_SRCS:%.s=$(BUILD_DIR)/%.o)
GLOBAL_ASM_OBJS = $(GLOBAL_ASM_SRCS:%.c=$(BUILD_DIR)/%.o)
LIB_C_OBJS = $(LIB_C_SRCS:%.c=$(BUILD_DIR)/%.o)
LIB_ASM_OBJS = $(LIB_ASM_SRCS:%.s=$(BUILD_DIR)/%.o)
ALL_GAME_OBJS = $(C_OBJS) $(ASM_OBJS)
ALL_GAME_OBJS = $(C_OBJS) $(ASM_OBJS) $(GLOBAL_ASM_OBJS)
ALL_LIB_OBJS = $(LIB_C_OBJS) $(LIB_ASM_OBJS)
ALL_OBJS = $(ALL_GAME_OBJS) $(ALL_LIB_OBJS)
@ -105,6 +108,11 @@ MWASFLAGS = $(DEFINES) -proc $(PROC_S) -gccinc -i . -i ./include -i $(W
MWLDFLAGS := -w off -proc $(PROC) -nopic -nopid -interworking -map closure,unused -symtab sort -m _start -msgstyle gcc
ARFLAGS := rcS
$(C_OBJS): MWCFLAGS += -include global.h
MW_COMPILE = $(WINE) $(MWCC) $(MWCFLAGS)
MW_ASSEMBLE = $(WINE) $(MWAS) $(MWASFLAGS)
export MWCIncludes := lib/include
LSF := $(addsuffix .lsf,$(NEFNAME))
@ -145,13 +153,17 @@ endef
endif
DEPFLAGS := -gccdep -MD
DEPFILES := $(ALL_OBJS:%.o=%.d)
MW_COMPILE += $(DEPFLAGS)
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(MW_COMPILE)" "$(MW_ASSEMBLE)"
BUILD_C ?= $(MW_COMPILE) -c -o
$(DEPFILES):
$(BUILD_DIR)/lib/NitroSDK/%.o: MWCCVER := 2.0/sp2p3
$(BUILD_DIR)/%.o: %.c
$(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.d
$(WINE) $(MWCC) $(MWCFLAGS) $(DEPFLAGS) -c -o $@ $<
$(BUILD_C) $@ $<
@$(call fixdep,$(BUILD_DIR)/$*.d)
$(BUILD_DIR)/%.o: %.s
@ -161,8 +173,11 @@ $(BUILD_DIR)/%.o: %.s $(BUILD_DIR)/%.d
include $(wildcard $(DEPFILES))
else
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(MW_COMPILE)" "$(MW_ASSEMBLE)"
BUILD_C ?= $(MW_COMPILE) -c -o
$(BUILD_DIR)/%.o: %.c
$(WINE) $(MWCC) $(MWCFLAGS) -c -o $@ $<
$(BUILD_C) $@ $<
$(BUILD_DIR)/%.o: %.s
$(WINE) $(MWAS) $(MWASFLAGS) -o $@ $<

20
files/fielddata/script/scr_seq/scr_seq_0003.s
View File

@ -1346,7 +1346,7 @@ scr_seq_0003_028:
.byte 0x2d
.byte 0x00, 0x58, 0x32, 0x00, 0x35, 0x00, 0x61, 0x00, 0x02, 0x00, 0x35, 0x00, 0x61, 0x00, 0x02, 0x00
scr_seq_0003_029:
scrcmd_081 0
stop_bgm 0
get_player_gender VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
call_if_eq _12D6
@ -1364,49 +1364,49 @@ _12DC:
return
scr_seq_0003_031:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_RIVAL1
endstd
end
scr_seq_0003_070:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_RIVAL2
endstd
end
scr_seq_0003_042:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_MINAKI
endstd
end
scr_seq_0003_044:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_IBUKI
endstd
end
scr_seq_0003_036:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_TSURETEKE1
endstd
end
scr_seq_0003_037:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_TSURETEKE2
endstd
end
scr_seq_0003_065:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_G_PICHU
endstd
end
scr_seq_0003_067:
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_MAIKO_THEME
endstd
end
@ -1420,7 +1420,7 @@ scr_seq_0003_066:
scr_seq_0003_068:
scr_seq_0003_071:
fade_out_bgm 0, 30
scrcmd_081 0
stop_bgm 0
reset_bgm
endstd
end

6
files/fielddata/script/scr_seq/scr_seq_0021_D17R0110.s
View File

@ -132,7 +132,7 @@ scr_seq_D17R0110_006:
apply_movement obj_D17R0110_dancer_5, _0790
wait_movement
wait 16, VAR_SPECIAL_RESULT
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_MAIKO_MAI
wait 18, VAR_SPECIAL_RESULT
apply_movement obj_D17R0110_dancer, _07A0
@ -309,7 +309,7 @@ scr_seq_D17R0110_006:
wait 60, VAR_SPECIAL_RESULT
scrcmd_762 1
scrcmd_763
scrcmd_081 0
stop_bgm 0
scrcmd_756
setvar VAR_TEMP_x400B, 123
fade_screen 6, 1, 0, RGB_WHITE
@ -323,7 +323,7 @@ scr_seq_D17R0110_006:
wait_fade
wait 20, VAR_SPECIAL_RESULT
scrcmd_764
scrcmd_081 30
stop_bgm 30
apply_movement obj_D17R0110_dancer, _0798
wait_movement
scrcmd_726

2
files/fielddata/script/scr_seq/scr_seq_0034_D23R0106.s
View File

@ -39,7 +39,7 @@ scr_seq_D23R0106_001:
wait_se SEQ_SE_DP_KAIDAN2
clearflag FLAG_ROCKET_TAKEOVER_ACTIVE
fade_out_bgm 0, 30
scrcmd_081 0
stop_bgm 0
wait 15, VAR_SPECIAL_RESULT
reset_bgm
fade_screen 6, 1, 1, RGB_BLACK

2
files/fielddata/script/scr_seq/scr_seq_0088_D35R0101.s
View File

@ -67,7 +67,7 @@ _010F:
end
scr_seq_D35R0101_006:
scrcmd_081 0
stop_bgm 0
play_bgm SEQ_GS_D_AJITO
scrcmd_609
lockall

2
files/fielddata/script/scr_seq/scr_seq_0090_D35R0103.s
View File

@ -296,7 +296,7 @@ scr_seq_D35R0103_003:
show_person obj_D35R0103_rocketm_4
move_person_facing obj_D35R0103_rkanbuw, 32, 1, 30, DIR_EAST
move_person_facing obj_D35R0103_rocketm_4, 30, 1, 30, DIR_NORTH
scrcmd_081 0
stop_bgm 0
play_bgm SEQ_GS_EYE_ROCKET
scrcmd_602 0
scrcmd_603

2
files/fielddata/script/scr_seq/scr_seq_0092_D36R0101.s
View File

@ -1645,7 +1645,7 @@ _1803:
_1816:
scrcmd_609
lockall
scrcmd_081 0
stop_bgm 0
clearflag FLAG_HIDE_ILEX_FOREST_SPIKY_EAR_PICHU
show_person obj_D36R0101_tsure_poke_static_pichu_spiky
apply_movement obj_D36R0101_tsure_poke_static_pichu_spiky, _1C44

6
files/fielddata/script/scr_seq/scr_seq_0104_D40R0107.s
View File

@ -146,7 +146,7 @@ scr_seq_D40R0107_005:
apply_movement obj_D40R0107_dancer_2, _09A8
wait_movement
wait 16, VAR_SPECIAL_RESULT
scrcmd_081 0
stop_bgm 0
temp_bgm SEQ_GS_E_MAIKO_MAI
wait 18, VAR_SPECIAL_RESULT
apply_movement obj_D40R0107_dancer_5, _09B8
@ -373,7 +373,7 @@ scr_seq_D40R0107_005:
play_se SEQ_SE_GS_SUZUNOONPA2
wait_movement
fade_out_bgm 0, 100
scrcmd_081 0
stop_bgm 0
wait 32, VAR_SPECIAL_RESULT
apply_movement obj_D40R0107_dancer_5, _0B2C
apply_movement obj_D40R0107_dancer_3, _0B24
@ -425,7 +425,7 @@ scr_seq_D40R0107_005:
wait_fade
wait 59, VAR_SPECIAL_RESULT
scrcmd_764
scrcmd_081 15
stop_bgm 15
scrcmd_769
scrcmd_768
wait 16, VAR_SPECIAL_RESULT

4
files/fielddata/script/scr_seq/scr_seq_0114_D45R0102.s
View File

@ -77,7 +77,7 @@ scr_seq_D45R0102_001:
buffer_players_name 0
gender_msgbox msg_0131_D45R0102_00014, msg_0131_D45R0102_00013
closemsg
scrcmd_081 0
stop_bgm 0
play_se SEQ_SE_PL_FR03
play_bgm SEQ_GS_SENKYO
npc_msg msg_0131_D45R0102_00002
@ -105,7 +105,7 @@ scr_seq_D45R0102_001:
apply_movement obj_D45R0102_var_1, _0380
wait_movement
fade_out_bgm 0, 30
scrcmd_081 0
stop_bgm 0
play_se SEQ_SE_PL_FR03
npc_msg msg_0131_D45R0102_00005
stop_se SEQ_SE_PL_FR03

2
files/fielddata/script/scr_seq/scr_seq_0124_D49R0102.s
View File

@ -206,7 +206,7 @@ _03DB:
wait_button_or_walk_away
closemsg
touchscreen_menu_show
scrcmd_081 0
stop_bgm 0
reset_bgm
scrcmd_726
releaseall

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