diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-28 08:00:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-28 08:00:00 -0400 |
| commit | 6f3986ed64996be8e9812c44be54bf4ef5ff3b1f (patch) | |
| tree | 7e103bfa2ead8631bc9e98e47586238ac080ac87 /arm9/modules/11/asm/module_11.s | |
| parent | beabf27ffdfc12888c058e0706f30ad1d6856ece (diff) | |
| parent | f4e8c9289b47f1bf3cb83b96074f4f3e540d51ac (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/11/asm/module_11.s')
| -rw-r--r-- | arm9/modules/11/asm/module_11.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index c238c469..338eaadb 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -26862,7 +26862,7 @@ _0223A994: mov r1, #0xc mov r2, #0 bl GetMonData - ldr r1, _0223ABAC ; =0x020ECAC4 + ldr r1, _0223ABAC ; =gGameLanguage ldrb r1, [r1] cmp r1, r0 beq _0223A9C2 @@ -27111,7 +27111,7 @@ _0223AB9C: .word 0x00002E4C _0223ABA0: .word 0x00002FCC _0223ABA4: .word 0x00003144 _0223ABA8: .word 0x00000467 -_0223ABAC: .word 0x020ECAC4 +_0223ABAC: .word gGameLanguage _0223ABB0: .word 0x0000219C _0223ABB4: .word 0x00002DA4 _0223ABB8: .word 0x0225DCC0 @@ -78236,13 +78236,13 @@ MOD11_02253A74: ; 0x02253A74 thumb_func_start MOD11_02253A78 MOD11_02253A78: ; 0x02253A78 - ldr r3, _02253A84 ; =0x020CE34C + ldr r3, _02253A84 ; =MI_CpuFill8 add r0, #0x80 mov r1, #0 mov r2, #8 bx r3 nop -_02253A84: .word 0x020CE34C +_02253A84: .word MI_CpuFill8 thumb_func_start MOD11_02253A88 MOD11_02253A88: ; 0x02253A88 |