diff options
| author | Thomas <doodrabbit@hotmail.com> | 2021-12-17 20:57:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 20:57:03 -0500 |
| commit | af67eaffa7ab1a347a6f0e59ed7f1e107749d15a (patch) | |
| tree | b9f90f7b047b3dc5a411dbf65117bf07b237a37d /arm9/modules/05/asm | |
| parent | 3ab18655ca1311019212b3a2a9dbe32e5fbee55d (diff) | |
| parent | 44cd7753b5dde323d1e8274b2dc8a5599729e83f (diff) | |
Real-match math_util.c
Diffstat (limited to 'arm9/modules/05/asm')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021D74E0.s | 2 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 6 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E2E88.s | 2 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021EC458.s | 4 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021F5C44.s | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 4b30f2d3..1ebf4312 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -960,7 +960,7 @@ MOD05_021D7CF0: ; 0x021D7CF0 str r0, [r5, #0x2c] ldr r0, [r5, #0x1c] ldr r0, [r0] - bl MapHeader_GetField1 + bl MapHeader_GetMoveModelBank add r4, r0, #0 ldr r0, [r5, #0x30] cmp r0, #0 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 7af8c0ec..26329d91 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -1772,13 +1772,13 @@ MOD05_021D8F38: ; 0x021D8F38 cmp r0, #1 bne _021D8F7A ldr r0, [r4, #0xc] - bl FUN_02029FC8 + bl Sav2_GameStats_get add r5, r0, #0 mov r1, #0xb - bl FUN_0202A0E8 + bl GameStats_Inc add r0, r5, #0 mov r1, #0xf - bl FUN_0202A170 + bl GameStats_AddSpecial ldr r1, _021D8F80 ; =0x000007EF add r0, r4, #0 mov r2, #0 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 9a7c0b1f..eba8807c 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -601,7 +601,7 @@ MOD05_021E331C: ; 0x021E331C add r4, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_02034944 + bl MapHeader_IsBuilding cmp r0, #0 bne _021E333E ldr r0, [r4, #0x1c] diff --git a/arm9/modules/05/asm/mod05_021EC458.s b/arm9/modules/05/asm/mod05_021EC458.s index 216dfbb7..d1b57a92 100644 --- a/arm9/modules/05/asm/mod05_021EC458.s +++ b/arm9/modules/05/asm/mod05_021EC458.s @@ -150,9 +150,9 @@ MOD05_021EC57C: ; 0x021EC57C add r0, r7, #0 add r6, r1, #0 add r4, r2, #0 - bl FUN_02029FC8 + bl Sav2_GameStats_get mov r1, #0x28 - bl FUN_0202A0E8 + bl GameStats_Inc add r0, r4, #0 bl MOD05_021EC49C add r1, r0, #0 diff --git a/arm9/modules/05/asm/mod05_021F5C44.s b/arm9/modules/05/asm/mod05_021F5C44.s index 5bf30612..494fc941 100644 --- a/arm9/modules/05/asm/mod05_021F5C44.s +++ b/arm9/modules/05/asm/mod05_021F5C44.s @@ -86,9 +86,9 @@ _021F5CBA: lsr r2, r2, #0x10 bl FUN_02061208 ldr r0, [r4, #0xc] - bl FUN_02029FC8 + bl Sav2_GameStats_get mov r1, #0xa - bl FUN_0202A0E8 + bl GameStats_Inc ldr r2, [r5, #0x10] add r0, r4, #0 add r1, r6, #0 @@ -439,9 +439,9 @@ MOD05_021F5F5C: ; 0x021F5F5C str r0, [r4, #0xc] ldr r0, [r4, #0x20] ldr r0, [r0, #0xc] - bl FUN_02029FC8 + bl Sav2_GameStats_get mov r1, #0x49 - bl FUN_0202A0E8 + bl GameStats_Inc ldr r0, [r4, #0x1c] bl MOD05_021F61B0 add r2, r0, #0 |