Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 15:42:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matched arm9 EU

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-11-11 00:46:55 -05:00
parent e926928a12
commit c411e0ccee
6 changed files with 142 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/include/main_0200C4CC.inc
View File

@ -61,12 +61,8 @@
.public OS_IRQTable
.public OSi_ReferSymbol
.public ov00_022BE0C8
.public ov00_022C2340
.public ov00_022C23B0
.public ov00_022C23EC
.public ov00_022C2450
.public ov00_022C24DC
.public ov01_02337B3C
.public ov01_02337B68
.public ov01_02337BA0
.public ov01_02337C54
.public ov01_02337E0C
@ -78,6 +74,11 @@
.public ov03_0233CDD8
.public ov03_0233CDE4
.public ov10_022BDADC
.public ov10_022C2340
.public ov10_022C23B0
.public ov10_022C23EC
.public ov10_022C2450
.public ov10_022C24DC
.public ov10_022C2528
.public ov11_022E6E68
.public ov11_022E82CC
@ -100,7 +101,6 @@
.public ov29_02353538
.public OverlayIsLoaded
.public PointsToZero
.public PositionHasMonster
.public PROTEIN_STAT_BOOST
.public Rand16Bit
.public Rand32Bit

10
asm/itcm.s
View File

@ -1457,8 +1457,13 @@ GetKeyN2MSwitch: ; 0x01FF9434
sub sp, sp, #8
ldr r2, _01FF9464 ; =_020A2CF8
add r3, sp, #0
#ifdef EUROPE
ldr ip, [r2, #8]
ldr r2, [r2, #0xc]
#else
ldr ip, [r2]
ldr r2, [r2, #4]
#endif
str ip, [sp]
str r2, [sp, #4]
ldr r1, [r3, r1, lsl #2]
@ -1530,8 +1535,13 @@ GetKeyM2NSwitch: ; 0x01FF950C
sub sp, sp, #8
ldr r2, _01FF953C ; =_020A2CF8
add r3, sp, #0
#ifdef EUROPE
ldr ip, [r2]
ldr r2, [r2, #4]
#else
ldr ip, [r2, #8]
ldr r2, [r2, #0xc]
#endif
str ip, [sp]
str r2, [sp, #4]
ldr r1, [r3, r1, lsl #2]

114
asm/main_0200C4CC.s
View File

@ -116780,24 +116780,29 @@ _0206A5D8:
add sp, sp, #0x20c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
#ifdef EUROPE
#define SUB_02069DC0_OFFSET 2
#else
#define SUB_02069DC0_OFFSET 0
#endif
_0206A5E0: .word _020B0B48
_0206A5E4: .word 0x00001001
_0206A5E8: .word 0x00003001
_0206A5EC: .word 0x00004004
_0206A5F0: .word sub_0206A628
_0206A5F4: .word PositionHasMonster
_0206A5F8: .word 0x000037A8
_0206A5F4: .word ov01_02337B68
_0206A5F8: .word 0x000037A8 + SUB_02069DC0_OFFSET
_0206A5FC: .word 0x00002001
_0206A600: .word 0x000038C9
_0206A604: .word 0x0000379F
_0206A608: .word 0x00003793
_0206A600: .word 0x000038C9 + SUB_02069DC0_OFFSET
_0206A604: .word 0x0000379F + SUB_02069DC0_OFFSET
_0206A608: .word 0x00003793 + SUB_02069DC0_OFFSET
_0206A60C: .word 0x0000023B
_0206A610: .word 0x00004002
_0206A614: .word 0x00004001
_0206A618: .word 0x0000379E
_0206A618: .word 0x0000379E + SUB_02069DC0_OFFSET
_0206A61C: .word 0x00004003
_0206A620: .word 0x00000239
_0206A624: .word 0x000037A0
_0206A624: .word 0x000037A0 + SUB_02069DC0_OFFSET
arm_func_end sub_02069DC0
arm_func_start sub_0206A628
@ -117130,7 +117135,11 @@ _0206AA24:
ldmia sp!, {r4, pc}
.align 2, 0
_0206AA34: .word MAP_MARKER_PLACEMENTS
#ifdef EUROPE
_0206AA38: .word 0xFFFFFEC6
#else
_0206AA38: .word 0xFFFFFED2
#endif
_0206AA3C: .word _020A94C6
arm_func_end sub_0206A9DC
@ -117226,7 +117235,7 @@ _0206AB5C:
str r3, [r2, #0x34]
ldr r1, [r1, #8]
strb r3, [r1, #0x31]
bl ov00_022C2340
bl ov10_022C2340
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
_0206AB90: .word _020B0B4C
@ -117405,7 +117414,7 @@ sub_0206ADB8: ; 0x0206ADB8
cmp r0, #0
moveq r0, #0
beq _0206B9B4
bl ov00_022C23EC
bl ov10_022C23EC
ldr r0, _0206B9BC ; =_020B0B4C
ldr r8, [r0, #8]
ldrb r0, [r8, #0x30]
@ -117878,7 +117887,7 @@ _0206B408:
strh r2, [r0, #0x10]
strh r2, [r0, #0x12]
ldr r0, _0206B9C8 ; =sub_0206BFA8
bl ov00_022C2450
bl ov10_022C2450
mov r0, #0x8000
str r0, [r6, #0x30]
mov r0, #0x6000
@ -117975,7 +117984,7 @@ _0206B580:
str r0, [r6, #0x1c]
ldr r0, _0206B9D4 ; =sub_0206BEAC
mov r1, r6
bl ov00_022C2450
bl ov10_022C2450
_0206B658:
add r4, r4, #1
cmp r4, #3
@ -118270,7 +118279,7 @@ sub_0206BA5C: ; 0x0206BA5C
ldr r0, [r0, #8]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
bl ov00_022C23B0
bl ov10_022C23B0
ldr r0, _0206BB8C ; =_020B0B4C
ldr r5, [r0, #8]
cmp r5, #0
@ -118632,7 +118641,7 @@ _0206BF68:
mov r0, r4
bl sub_0206BB94
mov r0, r6
bl ov00_022C24DC
bl ov10_022C24DC
ldmia sp!, {r4, r5, r6, pc}
_0206BF7C:
ldr r1, [r4, #8]
@ -118706,7 +118715,7 @@ _0206C078:
mov r0, r4
bl sub_0206BB94
mov r0, r6
bl ov00_022C24DC
bl ov10_022C24DC
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0206C08C:
ldr r0, [r4, #0x38]
@ -167356,14 +167365,52 @@ _020998F8:
.byte 0x79, 0x7A, 0x65, 0x2E, 0x63, 0x00, 0x00, 0x00
.global _0209990C
_0209990C:
.word _020997CC
#ifdef EUROPE
.word _020997D8
.byte 0x96, 0x00, 0x00, 0x00
.word _020997D0
.word _020997DC
.byte 0x97, 0x00, 0x00, 0x00
.word _020997C4
.byte 0xBA, 0x00, 0x00, 0x00
.word _020997C0
.byte 0x8D, 0x00, 0x00, 0x00
.word _020997D0
.byte 0xBF, 0x00, 0x00, 0x00
.word _020997CC
.byte 0x91, 0x00, 0x00, 0x00
.word _020997E0
.byte 0x92, 0x00, 0x00, 0x00
.word _020997D4
.byte 0x93, 0x00, 0x00, 0x00
.word _020997C8
.byte 0x94, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global _0209995C
_0209995C:
.word _020997D8
.byte 0x96, 0x00, 0x00, 0x00
.word _020997DC
.byte 0x97, 0x00, 0x00, 0x00
.word _020997C4
.byte 0xBA, 0x00, 0x00, 0x00
.word _020997C0
.byte 0x8D, 0x00, 0x00, 0x00
.word _020997D0
.byte 0xBF, 0x00, 0x00, 0x00
.word _020997CC
.byte 0xB8, 0x00, 0x00, 0x00
.word _020997E0
.byte 0x91, 0x00, 0x00, 0x00
.word _020997D4
#else
.word _020997D8
.byte 0x96, 0x00, 0x00, 0x00
.word _020997DC
.byte 0x97, 0x00, 0x00, 0x00
.word _020997C4
.byte 0xBA, 0x00, 0x00, 0x00
.word _020997D0
.byte 0x8D, 0x00, 0x00, 0x00
.word _020997D4
.byte 0xBF, 0x00, 0x00, 0x00
.word _020997DC
@ -167392,6 +167439,7 @@ _0209995C:
.word _020997D8
.byte 0x91, 0x00, 0x00, 0x00
.word _020997E0
#endif
.byte 0xB7, 0x00, 0x00, 0x00
.word _020997C8
.byte 0x93, 0x00, 0x00, 0x00
@ -182661,7 +182709,7 @@ _020AF5E8:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global _020AF694
_020AF694:
.byte 0xFF, 0x00, 0x00, 0x00
.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
#ifdef EUROPE
.word _02092EBC
@ -182669,7 +182717,6 @@ _020AF694:
.word _02092ED0
.word _02092E80
.word _02092E94
.byte 0x00, 0x00, 0x00, 0x00
#endif
; debug related
@ -183472,7 +183519,7 @@ _020B09D0:
.byte 0x00, 0x00, 0x00, 0x00
#ifdef EUROPE
.word _020A32DC
.word _020A328C
.word _020A328C_EU
.word _020A329C
.word _020A32AC
.word _020A32BC
@ -183484,12 +183531,40 @@ _020B09D0:
#endif
.global UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE:
#ifdef EUROPE
.word _020A2C94
#else
.word _020A2C90
#endif
.word UNOWN_SPECIES_ADDITIONAL_CHARS
.word _020A2CF4
.word _020A2CF0
.word _020A2CEC
.word _020A2CE8
#ifdef EUROPE
.word _020A2CE0
.word _020A2CC4
.word _020A2CA0
.word _020A2CC8
.word _020A2CCC
.word _020A2CA8
.word _020A2CA4
.word _020A2C90
.word _020A2C98
.word _020A2CAC
.word _020A2CBC
.word _020A2CB8
.word _020A2CB4
.word _020A2CE4
.word _020A2CDC
.word _020A2CD4
.word _020A2CD8
.word _020A2C8C
.word _020A2C9C
.word _020A2CB0
.word _020A2CD0
.word _020A2CC0
#else
.word _020A2CE4
.word _020A2CE0
.word _020A2CDC
@ -183512,6 +183587,7 @@ UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE:
.word _020A2C98
.word _020A2C94
.word _020A2CC4
#endif
.global TEAM_MEMBER_TABLE_PTR
TEAM_MEMBER_TABLE_PTR:
.byte 0x00, 0x00, 0x00, 0x00

25
asm/overlay_00.s
View File

@ -6959,10 +6959,6 @@ _022C2328:
bne _022C2358
str r1, [sp]
mov r0, #0
arm_func_end ov00_022C2248
arm_func_start ov00_022C2340
ov00_022C2340: ; 0x022C2340
str r0, [sp, #4]
mov r0, sl
mov r1, r7
@ -6996,10 +6992,6 @@ _022C2384:
mov r2, r8
bl ov00_022C1ED4
cmp r0, #0
arm_func_end ov00_022C2340
arm_func_start ov00_022C23B0
ov00_022C23B0: ; 0x022C23B0
bne _022C23E8
mov r0, sl
mov r1, sb
@ -7017,10 +7009,6 @@ _022C23C8:
bl ov00_022C1ED4
_022C23E8:
cmp r0, #0
arm_func_end ov00_022C23B0
arm_func_start ov00_022C23EC
ov00_022C23EC: ; 0x022C23EC
addne sp, sp, #0x14
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r0, [sp, #8]
@ -7044,17 +7032,13 @@ ov00_022C23EC: ; 0x022C23EC
.align 2, 0
_022C243C: .word ov00_0231804C
_022C2440: .word 0x0000FFFE
arm_func_end ov00_022C23EC
arm_func_end ov00_022C2248
arm_func_start ov00_022C2444
ov00_022C2444: ; 0x022C2444
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
mov r3, #0x24
arm_func_end ov00_022C2444
arm_func_start ov00_022C2450
ov00_022C2450: ; 0x022C2450
mla r3, r2, r3, r5
ldr r0, [r5]
ldrb r6, [r3, #0xad]
@ -7092,10 +7076,6 @@ _022C24C4:
blx r1
_022C24D8:
ldrh r0, [r4, #8]
arm_func_end ov00_022C2450
arm_func_start ov00_022C24DC
ov00_022C24DC: ; 0x022C24DC
cmp r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r3, [r5]
@ -7113,7 +7093,7 @@ _022C24F8:
mov r0, r5
bl ov00_022C18C0
ldmia sp!, {r4, r5, r6, pc}
arm_func_end ov00_022C24DC
arm_func_end ov00_022C2444
arm_func_start ov00_022C251C
ov00_022C251C: ; 0x022C251C
@ -108745,7 +108725,6 @@ ov00_023187D0:
.global ov00_023187D8
ov00_023187D8:
#ifdef EUROPE
.byte 0x43, 0x32, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00
.byte 0x41, 0x79, 0x43, 0x75, 0x48, 0x72, 0x47, 0x53, 0x4A, 0x4D, 0x4B, 0x56, 0x34, 0x71, 0x6A, 0x61
#else
.byte 0x48, 0x61, 0x75, 0x5a, 0x6e, 0x37, 0x78, 0x32, 0x51, 0x6a, 0x41, 0x4a

33
asm/overlay_01.s
View File

@ -22154,10 +22154,15 @@ ov01_0233B880:
.word ov01_02333CB8
.global MAIN_DEBUG_MENU_2
MAIN_DEBUG_MENU_2:
.byte 0x86, 0x3C, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x87, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x88, 0x3C, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x89, 0x3C, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x3C, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x85, 0x3C, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
#ifdef EUROPE
#define MAIN_DEBUG_MENU_2_OFFSET 2
#else
#define MAIN_DEBUG_MENU_2_OFFSET 0
#endif
.byte 0x86 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x87 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x88 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x89 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x85 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.global ov01_0233B8C8
ov01_0233B8C8:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x1C, 0x07, 0x01, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -22328,7 +22333,11 @@ ov01_0233BD0C:
.word ov07_0233F758
.global ov01_0233BD1C
ov01_0233BD1C:
#ifdef EUROPE
.byte 0xD8, 0x36, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD9, 0x36, 0x00, 0x00
#else
.byte 0xD6, 0x36, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD7, 0x36, 0x00, 0x00
#endif
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global ov01_0233BD34
ov01_0233BD34:
@ -22385,8 +22394,14 @@ ov01_0233BE48:
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00
.global ov01_0233BE70
ov01_0233BE70:
#ifdef EUROPE
.byte 0x5C, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x5D, 0x37, 0x00, 0x00
#else
.byte 0x5A, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x5B, 0x37, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x5B, 0x37, 0x00, 0x00
#endif
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global ov01_0233BE88
ov01_0233BE88:
.byte 0x2F, 0x77, 0x65, 0x62, 0x2F, 0x63, 0x6F, 0x6D, 0x6D, 0x6F, 0x6E, 0x2F, 0x73, 0x65, 0x74, 0x50
@ -22491,9 +22506,17 @@ ov01_0233C0D8:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov01_0233C0E0
ov01_0233C0E0:
#ifdef EUROPE
.byte 0xAC, 0x01, 0x80, 0x00
.byte 0xAD, 0x01, 0x80, 0x00, 0xAE, 0x01, 0x80, 0x00, 0xAF, 0x01, 0x80, 0x00, 0xB0, 0x01, 0x80, 0x00
.byte 0xAC, 0x01, 0x80, 0x00, 0xAD, 0x01, 0x80, 0x00, 0xAE, 0x01, 0x80, 0x00, 0xAF, 0x01, 0x80, 0x00
.byte 0xB0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
#else
.byte 0x68, 0x05, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x39, 0x09, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
#endif
.global ov01_0233C100
ov01_0233C100:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

2
main.lsf
View File

@ -205,10 +205,10 @@ Overlay OVY_29
Object asm/overlay_29_022F7388.o
Object src/overlay_29_022FC99C.o
Object asm/overlay_29_022FC9C0.o
Object src/overlay_29_022FEEB8_eu.o
Object asm/overlay_29_022FE4BC.o
Object src/overlay_29_022FED98.o
Object asm/overlay_29_022FEDBC.o
Object src/overlay_29_022FEEB8_eu.o
Object src/overlay_29_023000E4.o
Object asm/overlay_29_02300108.o
Object src/overlay_29_02302A38.o