Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-10-01 14:48:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matched overlay 3

Browse Source
This commit is contained in:
AnonymousRandomPerson
2024-05-19 22:16:58 -04:00
parent f76b7570a1
commit 6992e15708
6 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
asm/include/overlay_01.inc
View File

@@ -275,6 +275,7 @@
.public sub_0202065C
.public sub_0202380C_EU
.public sub_020245D0
.public sub_020253E0_JP
.public sub_02025404
.public sub_0202544C
.public sub_02025480

30
asm/main_0200C4CC.s
View File

@@ -33200,10 +33200,10 @@ _02025B7C: .word _020AFD04
arm_func_start sub_02025B80
sub_02025B80: ; 0x02025B80
ldr r1, _02025B8C ; =_020AFD04
#if defined(EUROPE) || defined(JAPAN)
str r0, [r1, #4]
#else
#ifdef NORTH_AMERICA
str r0, [r1, #8]
#else
str r0, [r1, #4]
#endif
bx lr
.align 2, 0
@@ -33842,10 +33842,10 @@ sub_02026020: ; 0x02026020
arm_func_start sub_02026038
sub_02026038: ; 0x02026038
ldr r1, _02026044 ; =_020AFD04
#if defined(EUROPE) || defined(JAPAN)
str r0, [r1, #4]
#else
#ifdef NORTH_AMERICA
str r0, [r1, #8]
#else
str r0, [r1, #4]
#endif
bx lr
.align 2, 0
@@ -34308,10 +34308,10 @@ sub_0202654C: ; 0x0202654C
stmdb sp!, {r3, lr}
ldr r1, _02026590 ; =_020AFD04
mov r3, r0
#if defined(EUROPE) || defined(JAPAN)
ldr r1, [r1, #4]
#else
#ifdef NORTH_AMERICA
ldr r1, [r1, #8]
#else
ldr r1, [r1, #4]
#endif
cmp r1, #2
blt _0202657C
@@ -35433,10 +35433,10 @@ sub_02026C68: ; 0x02026C68
bhi _02026CA4
ldr ip, _02026E38 ; =_020AFD04
sub r3, r3, #0x40
#if defined(EUROPE) || defined(JAPAN)
ldr ip, [ip, #4]
#else
#ifdef NORTH_AMERICA
ldr ip, [ip, #8]
#else
ldr ip, [ip, #4]
#endif
mov r3, r3, lsl #0x10
mov r3, r3, asr #0x10
@@ -35447,10 +35447,10 @@ sub_02026C68: ; 0x02026C68
b _02026E18
_02026CA4:
ldr ip, _02026E38 ; =_020AFD04
#if defined(EUROPE) || defined(JAPAN)
ldr ip, [ip, #4]
#else
#ifdef NORTH_AMERICA
ldr ip, [ip, #8]
#else
ldr ip, [ip, #4]
#endif
cmp ip, #3
bne _02026D40

26
asm/main_02054C24.s
View File

@@ -16163,10 +16163,10 @@ _02061E74:
b _02061EE8
_02061E80:
str r6, [sp, #4]
#if defined(EUROPE) || defined(JAPAN)
ldr r2, _02062298 ; =0x00003C42
#else
#ifdef NORTH_AMERICA
mov r2, #0x3c40
#else
ldr r2, _02062298 ; =0x00003C42
#endif
b _02061EE8
_02061E8C:
@@ -23380,10 +23380,10 @@ _02067AF8:
ldr r5, _02067C68 ; =JOB_MENU_ITEMS_6
str r1, [r4, #0xe48]
str r0, [r4, #0xef4]
#if defined(EUROPE) || defined(JAPAN)
ldr r6, _02067FF0 ; =0x0000380F
#else
#ifdef NORTH_AMERICA
rsb r6, r8, #0x3a40
#else
ldr r6, _02067FF0 ; =0x0000380F
#endif
mov r7, sb
b _02067BC4
@@ -23431,10 +23431,10 @@ _02067BA0:
ldr r1, [r1, r2, lsl #3]
ldr r5, _02067C88 ; =JOB_MENU_ITEMS_8
str r1, [r4, #0xe48]
#if defined(EUROPE) || defined(JAPAN)
ldr r6, _02068014 ; =0x000037B5
#else
#ifdef NORTH_AMERICA
add r6, r8, #0x3580
#else
ldr r6, _02068014 ; =0x000037B5
#endif
str r0, [r4, #0xef4]
mov r7, sb
@@ -23663,12 +23663,12 @@ _02067E70:
add r0, r0, #0x2e4
add r0, r0, #0xc00
bl sub_02047150
#if defined(EUROPE) || defined(JAPAN)
ldr r1, _02068678 ; =0x00003826
mov r0, #0x1c
#else
#ifdef NORTH_AMERICA
mov r0, #0x1c
rsb r1, r0, #0x3840
#else
ldr r1, _02068678 ; =0x00003826
mov r0, #0x1c
#endif
mov r2, #0
bl sub_02046BE8

30
asm/overlay_01.s
View File

@@ -4585,7 +4585,7 @@ _0232CD80:
add r1, r7, #0x20
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -4770,7 +4770,7 @@ ov01_0232CF84: ; 0x0232CF84
add r1, r5, #0x20
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -4942,7 +4942,7 @@ ov01_0232D1F4: ; 0x0232D1F4
add r1, r5, #0x20
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -5283,7 +5283,7 @@ ov01_0232D664: ; 0x0232D664
add r1, r5, #0x38
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -5751,7 +5751,7 @@ _0232DD2C:
add r1, sl, #8
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -5891,7 +5891,7 @@ ov01_0232DF18: ; 0x0232DF18
add r1, r5, #8
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -6010,7 +6010,7 @@ ov01_0232E0A4: ; 0x0232E0A4
add r1, r5, #8
mov r2, #0x14
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -6447,7 +6447,7 @@ _0232E72C:
add r0, r5, #0x42
mov r2, #0xa
#ifdef JAPAN
bl StrncpyName
bl sub_020253E0_JP
#else
bl sub_0202544C
#endif
@@ -20028,12 +20028,12 @@ _0233933C:
ldrb r0, [r4, #0x28 + OV01_02338EC4_LOAD_OFFSET_2]
cmp r0, #0
bne _023397F8
#if defined(EUROPE) || defined(JAPAN)
ldr r1, _02339F74 ; =0x00003766
mov r0, #0x1c
#else
#ifdef NORTH_AMERICA
mov r0, #0x1c
rsb r1, r0, #0x3780
#else
ldr r1, _02339F74 ; =0x00003766
mov r0, #0x1c
#endif
mov r2, #0
bl sub_02046BE8
@@ -22010,10 +22010,10 @@ _0233ABC4:
bgt _0233ABE4
sub r0, r0, #0x63
cmp r5, r0
#if defined(EUROPE) || defined(JAPAN)
ldrge r0, _0233B4F8 ; =0x00003782
#else
#ifdef NORTH_AMERICA
movge r0, #0x3780
#else
ldrge r0, _0233B4F8 ; =0x00003782
#endif
ldmgeia sp!, {r3, r4, r5, pc}
_0233ABE4:

45
asm/overlay_03.s
View File

@@ -2452,12 +2452,12 @@ _0233EABC: ; jump table
b _0233ED28 ; case 9
b _0233ED5C ; case 10
_0233EAE8:
#if defined(EUROPE) || defined(JAPAN)
ldr r1, _0233F5DC ; =0x00003882
mov r0, #0x1c
#else
#ifdef NORTH_AMERICA
mov r0, #0x1c
mov r1, #0x3880
#else
ldr r1, _0233F5DC ; =0x00003882
mov r0, #0x1c
#endif
bl sub_02066468
ldr r0, _0233EE08 ; =ov03_02346BC0
@@ -2625,12 +2625,12 @@ _0233ED28:
str r1, [r0]
b _0233F2C4
_0233ED5C:
#if defined(EUROPE) || defined(JAPAN)
ldr r1, _0233F604 ; =0x000038A6
mov r0, #0x1c
#else
#ifdef NORTH_AMERICA
mov r0, #0x1c
rsb r1, r0, #0x38c0
#else
ldr r1, _0233F604 ; =0x000038A6
mov r0, #0x1c
#endif
bl sub_02066468
ldr r0, _0233EE08 ; =ov03_02346BC0
@@ -2714,7 +2714,7 @@ _0233EE54: .word 0x00000321
_0233EE58: .word 0x00000323
_0233EE5C: .word ov03_02346A64
_0233EE60: .word ov03_02346A68
#if defined(EUROPE) || defined(JAPAN)
#ifndef NORTH_AMERICA
_0233F5DC: .word 0x00003880 + OV03_0233DE58_OFFSET
#endif
_0233EE64: .word 0x00003853 + OV03_0233DE58_OFFSET
@@ -2726,7 +2726,7 @@ _0233EE78: .word 0x000003F3
_0233EE7C: .word 0x000038A1 + OV03_0233DE58_OFFSET
_0233EE80: .word 0x000038A3 + OV03_0233DE58_OFFSET
_0233EE84: .word 0x000003F5
#if defined(EUROPE) || defined(JAPAN)
#ifndef NORTH_AMERICA
_0233F604: .word 0x000038A4 + OV03_0233DE58_OFFSET
#endif
_0233EE88: .word 0x000003F6
@@ -5476,12 +5476,12 @@ _02341478:
bl sub_0205B6CC
cmp r0, #0
bne _023414B4
#ifdef EUROPE
ldr r1, _023424E0 ; =0x0000389E
mov r0, #0x1c
#else
#ifdef NORTH_AMERICA
mov r0, #0x1c
add r1, r0, #0x3880
#else
ldr r1, _023424E0 ; =0x0000389E
mov r0, #0x1c
#endif
bl sub_02066468
mov r0, r4
@@ -6106,7 +6106,7 @@ _02341D50: .word 0x0000385E + OV03_02340DB4_OFFSET
_02341D54: .word 0x0000386F + OV03_02340DB4_OFFSET
_02341D58: .word 0x00003870 + OV03_02340DB4_OFFSET
_02341D5C: .word 0x00001004
#if defined(EUROPE) || defined(JAPAN)
#ifndef NORTH_AMERICA
_023424E0: .word 0x0000389C + OV03_02340DB4_OFFSET
#endif
_02341D60: .word 0x0000389D + OV03_02340DB4_OFFSET
@@ -8478,7 +8478,7 @@ _02343FA8: .word 0x0000388A + OV03_02340DB4_OFFSET
_02343FAC: .word 0x00005112
_02343FB0: .word 0x0000511A
#ifndef EUROPE
_02343FB4: .word 0x000038A2
_02343FB4: .word 0x000038A2 + OV03_02340DB4_OFFSET
#endif
_02343FB8: .word 0x00005013
_02343FBC: .word 0x0000388B + OV03_02340DB4_OFFSET
@@ -9015,12 +9015,12 @@ _02344674:
str r0, [sp]
mov r0, #0
ldr r2, _023446FC ; =ov03_023467A4
#if defined(EUROPE) || defined(JAPAN)
ldr r3, _02344E7C ; =0x000038C2
mov r1, r0
#else
#ifdef NORTH_AMERICA
mov r1, r0
mov r3, #0x38c0
#else
ldr r3, _02344E7C ; =0x000038C2
mov r1, r0
#endif
bl sub_020663C8
mov r0, #0xb
@@ -9049,8 +9049,11 @@ _023446E0:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_023446E8: .word ov03_02346BD4
#ifdef EUROPE
#if defined(EUROPE)
_023446EC: .word 0x000038BF
#elif defined(JAPAN)
_023446EC: .word 0x000034FB
_023446F0: .word 0x000034FC
#else
_023446EC: .word 0x000038BD
_023446F0: .word 0x000038BE

6
asm/overlay_29_022F7388.s
View File

@@ -1221,10 +1221,10 @@ _022F80F4:
cmp r0, #3
cmpne r0, #2
beq _022F8234
#if defined(EUROPE) || defined(JAPAN)
cmp r1, #0
#else
#ifdef NORTH_AMERICA
cmp r2, #0
#else
cmp r1, #0
#endif
ble _022F8220
mov r0, r4