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/80/asm | |
| parent | 877cfc467bc97b98e6c7e69cf98a30137427b8c8 (diff) | |
Fixup pokemon substructs and fill out MON_DATA_ defines
Diffstat (limited to 'arm9/modules/80/asm')
| -rw-r--r-- | arm9/modules/80/asm/module_80.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 6ec0721a..ca042f7e 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1425,7 +1425,7 @@ _0222DFE4: mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E118 ; =0x00000B34 mov r2, #0x25 str r0, [r4, r1] @@ -1433,14 +1433,14 @@ _0222DFE4: mov r1, #0x1a lsl r2, r2, #4 mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E11C ; =0x00000B3C ldr r2, _0222E120 ; =0x00000265 str r0, [r4, r1] mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x2d lsl r1, r1, #6 str r0, [r4, r1] @@ -1448,7 +1448,7 @@ _0222DFE4: mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E128 ; =0x00000B38 str r0, [r4, r1] mov r0, #4 @@ -1661,17 +1661,17 @@ MOD80_0222E25C: ; 0x0222E25C bl MOD80_0222E7F0 ldr r0, _0222E2D4 ; =0x00000B38 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x2d lsl r0, r0, #6 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222E2D8 ; =0x00000B3C ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222E2DC ; =0x00000B34 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0xb3 lsl r0, r0, #4 ldr r0, [r4, r0] |