diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 14:31:58 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 14:31:58 -0400 |
commit | 5106f9a218925320e0807bcd8b45e299d49f5214 (patch) | |
tree | 8be90314fd2ed4e0792dc12bc57653b5feac5799 /arm9/modules/75 | |
parent | 877cfc467bc97b98e6c7e69cf98a30137427b8c8 (diff) |
Fixup pokemon substructs and fill out MON_DATA_ defines
Diffstat (limited to 'arm9/modules/75')
-rw-r--r-- | arm9/modules/75/asm/module_75.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index c6baf422..e4c70c65 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -434,15 +434,15 @@ MOD75_021E6F00: ; 0x021E6F00 mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x11 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -938,7 +938,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a mov r2, #7 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x45 lsl r1, r1, #2 str r0, [r4, r1] @@ -959,7 +959,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a add r2, #0x40 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x47 lsl r1, r1, #2 str r0, [r4, r1] @@ -968,7 +968,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a lsl r2, r2, #2 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x12 lsl r1, r1, #4 str r0, [r4, r1] @@ -7623,7 +7623,7 @@ MOD75_021EA7BC: ; 0x021EA7BC mov r1, #0x1a lsl r2, r2, #2 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r7, _021EA7F4 ; =0x00000404 add r6, r0, #0 mov r4, #0 @@ -7640,7 +7640,7 @@ _021EA7D4: cmp r4, #8 blo _021EA7D4 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _021EA7F4: .word 0x00000404 |