diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-26 03:30:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 03:30:42 +0100 |
| commit | ee7aa44008bebf78301dd0f9d99306dc1a1b6502 (patch) | |
| tree | 962ac39843c509cd6cbff6a85287258a3a9f3a5b /arm9/modules/36 | |
| parent | 10bb8f2d4317fd606fef6c0d3b7345fd324fe583 (diff) | |
| parent | 7d10ba28169226bf00b741f7d01bc3386b383343 (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/36')
| -rw-r--r-- | arm9/modules/36/asm/module_36.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 6a1e0245..b0353507 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -984,7 +984,7 @@ MOD36_02254F5C: ; 0x02254F5C bl FUN_02016B90 cmp r0, #0 bne _02254F70 - bl ErrorHandling + bl GF_AssertFail _02254F70: add r0, r5, #0 bl MOD20_022538A0 @@ -1003,7 +1003,7 @@ _02254F70: bl FUN_02016B90 cmp r0, #0 bne _02254F9E - bl ErrorHandling + bl GF_AssertFail _02254F9E: mov r0, #0 str r0, [sp] @@ -1037,7 +1037,7 @@ _02254F9E: bl FUN_02016B90 cmp r0, #0 bne _02254FEA - bl ErrorHandling + bl GF_AssertFail _02254FEA: add r0, r4, #0 lsr r1, r6, #5 @@ -1064,7 +1064,7 @@ _02254FEA: bl FUN_02016B90 cmp r0, #0 bne _02255028 - bl ErrorHandling + bl GF_AssertFail _02255028: add sp, #0x14 pop {r3, r4, r5, r6, pc} |