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

Split overlay 10 data for EU

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-10-31 23:14:30 -04:00
parent d9b97a4218
commit 543bcef15b
2 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
asm/main_0200C4CC.s
View File

@@ -8989,8 +8989,13 @@ _02013450: .word _020AF700
GetMoveName: ; 0x02013454
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
ldr ip, _02013474 ; =StringFromMessageId
mov r0, r0, lsr #0x10
@@ -9056,8 +9061,13 @@ _0201351C: ; jump table
b _020136F4 ; case 5
_02013534:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -9069,8 +9079,13 @@ _02013534:
b _02013730
_02013564:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -9095,8 +9110,13 @@ _02013564:
b _02013730
_020135C8:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -9121,8 +9141,13 @@ _020135C8:
b _02013730
_0201362C:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -9147,8 +9172,13 @@ _0201362C:
b _02013730
_02013690:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -9173,8 +9203,13 @@ _02013690:
b _02013730
_020136F4:
ldrh r0, [r6, #4]
#ifdef EUROPE
add r0, r0, #0xff0
add r0, r0, #0x1000
#else
add r0, r0, #0xee
add r0, r0, #0x1f00
#endif
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl StringFromMessageId
@@ -11916,8 +11951,8 @@ _020159C0:
b _020159C0
_020159E0:
ldr r0, [sp, #0x44]
ldr r1, _02015D0C ; =_02098FC0
bl StrcmpTag
ldr r1, _02015DEC ; =_02099404_EU
bl StrcmpTagVeneer
cmp r0, #0
beq _02015A0C
ldr r0, [sp, #0x48]
@@ -11928,15 +11963,15 @@ _020159E0:
b _02015B08
_02015A0C:
ldr r0, [sp, #0x44]
ldr r1, _02015DEC ; =_02098FC0
bl StrcmpTag
ldr r1, _02015D0C ; =_02098FC0
bl StrcmpTagVeneer
cmp r0, #0
beq _02015B08
ldr r0, [sp, #0x48]
bl StoiTag
bl StoiTagVeneer
ldr r0, [sp, #0x4c]
bl StoiTag
ldr r1, _02015DF0 ; =_020AF710
bl StoiTagVeneer
ldr r1, _02015D10 ; =_020AF710
add ip, r5, #2
ldr r1, [r1]
ldr r8, [sp, #0x10]
@@ -12450,22 +12485,22 @@ _02015CD8:
ldrb r0, [r6]
cmp r0, #0
bne _020158E0
ldr r0, [sp, #0x2c]
ldr r0, [sp, #0x2c + SUB_0201578C_STACK_OFFSET]
add r7, r7, #0x18
add r0, r0, #1
str r0, [sp, #0x2c]
str r0, [sp, #0x2c + SUB_0201578C_STACK_OFFSET]
b _020157B8
_02015CF8:
ldr r0, [sp, #0x2c]
ldr r0, [sp, #0x2c + SUB_0201578C_STACK_OFFSET]
add sp, sp, #0x2f8
add sp, sp, #0x400
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_02015D08: .word _02098FBC
_02015D0C: .word _02098FC0
#ifdef EUROPE
_02015DEC: .word 0x02099408
_02015DEC: .word _02099404_EU
#endif
_02015D0C: .word _02098FC0
_02015D10: .word _020AF710
_02015D14: .word _02098EE0
arm_func_end sub_0201578C
@@ -166553,6 +166588,8 @@ _02098FA8:
_02098FBC:
.byte 0x5B, 0x52, 0x5D, 0x00
#ifdef EUROPE
.global _02099404_EU
_02099404_EU:
.byte 0x46, 0x00, 0x00, 0x00
#endif
.global _02098FC0

19
asm/overlay_10.s
View File

@@ -5723,7 +5723,7 @@ ov10_022C159C: ; 0x022C159C
#ifdef EUROPE
#define OV10_022C159C_STACK_OFFSET #0x154
#else
#define OV10_022C159C_STACK_OFFSET #0x154
#define OV10_022C159C_STACK_OFFSET #0x54
#endif
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, OV10_022C159C_STACK_OFFSET
@@ -5777,10 +5777,11 @@ _022C15F4:
bl sub_02025010_EU
ldr r1, _022C16D0 ; =ov10_022DC00C
add r0, sp, #0x154
add r2, sp, #0x54
#else
ldr r1, _022C16D0 ; =ov10_022DC00C
mov r2, r8
add r2, sp, #0x54
add r0, sp, #0x54
#endif
bl SprintfStatic__022C183C
mov r0, sl
@@ -16651,14 +16652,24 @@ ov10_022DBFFC:
.byte 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.global ov10_022DC00C
ov10_022DC00C:
.byte 0x4C, 0x76, 0x2E, 0x20, 0x25, 0x64, 0x00, 0x00
#ifdef EUROPE
.byte 0x25, 0x73, 0x00, 0x00
#else
.byte 0x4C, 0x76, 0x2E, 0x20
.byte 0x25, 0x64, 0x00, 0x00
#endif
.global ov10_022DC014
ov10_022DC014:
.byte 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x33, 0x5D, 0x2F, 0x5B, 0x76, 0x61, 0x6C
.byte 0x75, 0x65, 0x3A, 0x31, 0x3A, 0x33, 0x5D, 0x00
.global ov10_022DC02C
ov10_022DC02C:
.byte 0x4C, 0x76, 0x2E, 0x20, 0x25, 0x64, 0x20, 0x5B
#ifdef EUROPE
.byte 0x25, 0x73, 0x20, 0x5B
#else
.byte 0x4C, 0x76, 0x2E, 0x20
.byte 0x25, 0x64, 0x20, 0x5B
#endif
.byte 0x43, 0x4C, 0x55, 0x4D, 0x5F, 0x53, 0x45, 0x54, 0x3A, 0x34, 0x34, 0x5D, 0x5B, 0x76, 0x61, 0x6C
.byte 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x33, 0x5D, 0x2F, 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x31
.byte 0x3A, 0x33, 0x5D, 0x00