summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/09/asm/module_09.s34
-rw-r--r--arm9/modules/11/asm/module_11.s24
-rw-r--r--arm9/modules/12/asm/module_12.s18
-rw-r--r--arm9/modules/75/asm/module_75.s10
-rw-r--r--arm9/modules/76/asm/module_76.s18
5 files changed, 52 insertions, 52 deletions
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 50557058..abb23468 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2691,23 +2691,23 @@ _022133E4:
strb r0, [r5, #3]
ldrh r0, [r5]
ldrb r1, [r5, #3]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
strb r0, [r5, #3]
ldrh r0, [r5]
mov r1, #3
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #4]
ldrh r0, [r5]
mov r1, #1
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #5]
ldrh r0, [r5]
mov r1, #4
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #6]
ldrh r0, [r5]
mov r1, #2
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #7]
_02213450:
add r0, r4, #1
@@ -3311,7 +3311,7 @@ _022138AC:
ldrh r0, [r1, #0x24]
_022138AE:
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
bl FUN_02083114
mov r1, #0xa
bl _s32_div_f
@@ -6111,7 +6111,7 @@ MOD09_02215060: ; 0x02215060
ldr r5, [r6, r0]
add r0, r2, #0
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
bl FUN_0208315C
ldr r3, [r6]
add r7, r0, #0
@@ -7741,7 +7741,7 @@ _02215E4C:
ldr r0, [r5]
mov r1, #5
ldrh r0, [r0, #0x24]
- bl FUN_0206AB18
+ bl GetWazaAttr
add r1, sp, #0x14
strb r0, [r1, #2]
ldrb r0, [r1, #2]
@@ -7917,7 +7917,7 @@ MOD09_02215ED0: ; 0x02215ED0
_0221600C:
ldrh r0, [r1, #0x24]
mov r1, #5
- bl FUN_0206AB18
+ bl GetWazaAttr
add r4, r0, #0
mov r0, #0
str r0, [sp]
@@ -7938,7 +7938,7 @@ _0221600C:
ldr r0, [r5]
mov r1, #4
ldrh r0, [r0, #0x24]
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
add r0, r5, #0
mov r1, #6
@@ -7946,7 +7946,7 @@ _0221600C:
ldr r0, [r5]
mov r1, #2
ldrh r0, [r0, #0x24]
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
add r0, r5, #0
mov r1, #7
@@ -7954,7 +7954,7 @@ _0221600C:
ldr r0, [r5]
mov r1, #1
ldrh r0, [r0, #0x24]
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
add r0, r5, #0
mov r1, #0xa
@@ -8227,7 +8227,7 @@ MOD09_022161B0: ; 0x022161B0
_022162BE:
ldrh r0, [r1, #0x24]
mov r1, #5
- bl FUN_0206AB18
+ bl GetWazaAttr
add r4, r0, #0
mov r0, #0
str r0, [sp]
@@ -10080,7 +10080,7 @@ MOD09_022171AC: ; 0x022171AC
_02217242:
ldrh r0, [r1, #0x24]
mov r1, #1
- bl FUN_0206AB18
+ bl GetWazaAttr
ldr r1, _0221726C ; =0x00002020
add r2, r0, #0
ldr r1, [r5, r1]
@@ -10302,7 +10302,7 @@ _02217400:
cmp r0, #0
beq _02217436
mov r1, #3
- bl FUN_0206AB18
+ bl GetWazaAttr
add r3, r0, #0
ldr r1, _02217444 ; =0x0000201C
lsl r3, r3, #0x18
@@ -10347,7 +10347,7 @@ _02217460:
lsl r1, r4, #2
add r6, r7, r1
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
add r3, r0, #0
ldr r1, _022174D8 ; =0x0000200C
ldr r2, _022174DC ; =0x0000B010
@@ -10377,7 +10377,7 @@ _0221749E:
cmp r0, #0
beq _022174D6
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
add r3, r0, #0
ldr r1, _022174E4 ; =0x0000201C
add r3, #0x12
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 5b67e5a9..3badbb92 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -24831,7 +24831,7 @@ MOD11_022399C8: ; 0x022399C8
ldr r0, [r4, r0]
lsl r0, r0, #4
add r0, r2, r0
- bl FUN_0206AB58
+ bl GetAttrFromWazaTbl
mov r1, #0x4d
lsl r1, r1, #2
str r0, [r4, r1]
@@ -31770,7 +31770,7 @@ MOD11_0223D1DC: ; 0x0223D1DC
_0223D216:
ldr r0, _0223D230 ; =0x000003DE
add r0, r4, r0
- bl FUN_0206AB04
+ bl LoadAllWazaTbl
mov r0, #5
bl FUN_0206EB50
ldr r1, _0223D234 ; =0x00002120
@@ -44615,7 +44615,7 @@ _022435AA:
add r1, #0x30
ldrh r0, [r0, #0xc]
ldrb r1, [r1]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
pop {r4, r5, r6, pc}
_022435BE:
add r4, #0x34
@@ -46006,7 +46006,7 @@ _02243F70:
add r1, #0x30
ldrh r0, [r0, #0xc]
ldrb r1, [r1]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
add r4, #0x2c
ldrb r1, [r4, r6]
add r1, r5, r1
@@ -58785,7 +58785,7 @@ _0224A0C8:
add r2, r5, r1
ldr r1, _0224A338 ; =0x00002D70
ldrb r1, [r2, r1]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
add r1, r4, r7
add r2, r5, r1
ldr r1, _0224A33C ; =0x00002D6C
@@ -59496,7 +59496,7 @@ _0224A61E:
add r2, r6, r1
ldr r1, _0224A868 ; =0x00002D70
ldrb r1, [r2, r1]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
ldr r1, [sp, #8]
add r1, r4, r1
add r2, r6, r1
@@ -79668,7 +79668,7 @@ MOD11_022545B4: ; 0x022545B4
ldrh r6, [r0, #0x10]
mov r1, #9
add r0, r6, #0
- bl FUN_0206AB18
+ bl GetWazaAttr
mov r1, #0x40
tst r0, r1
bne _022545D4
@@ -79680,7 +79680,7 @@ _022545D6:
strb r0, [r4]
add r0, r6, #0
mov r1, #9
- bl FUN_0206AB18
+ bl GetWazaAttr
mov r1, #0x80
tst r0, r1
beq _022545EC
@@ -81704,7 +81704,7 @@ _0225557E:
ldr r0, _022555D8 ; =0x00002D4C
ldrb r1, [r4, r1]
ldrh r0, [r6, r0]
- bl FUN_0206AB30
+ bl WazaGetMaxPp
strb r0, [r5, #0x10]
ldr r0, [sp, #0x10]
add r6, r6, #2
@@ -90106,7 +90106,7 @@ _0225978A:
cmp r0, #0
beq _022597A4
add r1, r7, #0
- bl FUN_0206AB18
+ bl GetWazaAttr
add r1, r0, #0
add r0, r5, #0
add r2, r4, #0
@@ -92090,7 +92090,7 @@ _0225A7CE:
cmp r0, #0
beq _0225A814
mov r1, #3
- bl FUN_0206AB18
+ bl GetWazaAttr
str r0, [sp, #0x3c]
bl FUN_0206E12C
str r0, [sp, #0x40]
@@ -92378,7 +92378,7 @@ _0225AA24:
cmp r0, #0
beq _0225AA9E
mov r1, #3
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
ldr r0, _0225AAB4 ; =0x00004E35
ldr r1, _0225AAB8 ; =0x0225F72C
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 6862284e..2256bd99 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -979,7 +979,7 @@ _0222DE9E:
cmp r0, #0
beq _0222DEBE
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
add r3, r0, #0
b _0222DEC0
_0222DEBE:
@@ -10758,13 +10758,13 @@ _02232C2C:
ldr r1, [sp, #0x20]
add r4, r6, r1
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
mov r1, #0x4b
lsl r1, r1, #2
strb r0, [r4, r1]
ldrh r0, [r7]
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
mov r1, #0x13
lsl r1, r1, #4
strb r0, [r4, r1]
@@ -16965,7 +16965,7 @@ MOD12_02235C44: ; 0x02235C44
add r4, r0, #0
add r0, r1, #0
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
lsl r1, r4, #2
add r2, r4, r1
ldr r1, _02235C5C ; =0x022454E4
@@ -21837,7 +21837,7 @@ _022380B8:
ldr r0, _022380F8 ; =0x00000236
ldrh r0, [r7, r0]
strh r0, [r5]
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #2]
mov r0, #0x23
lsl r0, r0, #4
@@ -22518,7 +22518,7 @@ _022385D2:
ldr r0, [sp, #0xc]
mov r1, #0xb
ldrh r0, [r0]
- bl FUN_0206AB18
+ bl GetWazaAttr
bl MOD12_02235AC4
strb r0, [r7, #0xc]
ldr r0, [sp, #8]
@@ -22554,7 +22554,7 @@ _0223862C:
ldr r0, [sp, #0xc]
mov r1, #0xb
ldrh r0, [r0]
- bl FUN_0206AB18
+ bl GetWazaAttr
bl MOD12_02235AF0
strb r0, [r7, #0xc]
_0223863E:
@@ -23983,11 +23983,11 @@ _02239080:
bne _022390BA
ldrh r0, [r5]
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #0xa]
ldrh r0, [r5]
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
strb r0, [r5, #0xb]
b _022390BE
_022390BA:
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index e4c70c65..cb2b9ef0 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -8193,7 +8193,7 @@ MOD75_021EAB44: ; 0x021EAB44
bl FUN_02021A20
ldr r0, [sp, #0x10]
mov r1, #0
- bl FUN_0206AB30
+ bl WazaGetMaxPp
add r7, r0, #0
mov r0, #0x45
lsl r0, r0, #2
@@ -8237,7 +8237,7 @@ MOD75_021EAB44: ; 0x021EAB44
bl FUN_0201BDE0
ldr r0, [sp, #0x10]
mov r1, #2
- bl FUN_0206AB18
+ bl GetWazaAttr
lsl r0, r0, #0x10
lsr r7, r0, #0x10
cmp r7, #1
@@ -8292,7 +8292,7 @@ _021EACC6:
bl FUN_0201BDE0
ldr r0, [sp, #0x10]
mov r1, #4
- bl FUN_0206AB18
+ bl GetWazaAttr
lsl r0, r0, #0x10
lsr r7, r0, #0x10
bne _021EAD30
@@ -10986,12 +10986,12 @@ MOD75_021EC2B8: ; 0x021EC2B8
bl FUN_0206EA30
mov r1, #3
add r4, r0, #0
- bl FUN_0206AB18
+ bl GetWazaAttr
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0
mov r1, #1
- bl FUN_0206AB18
+ bl GetWazaAttr
lsl r0, r0, #0x10
lsr r4, r0, #0x10
bl FUN_0206E12C
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index e40f2c19..7ebae410 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -813,7 +813,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
add r0, r4, #0
bl MOD76_021D8514
mov r1, #0
- bl FUN_0206AB30
+ bl WazaGetMaxPp
str r0, [sp]
ldr r1, [r4]
add r2, sp, #0
@@ -1444,7 +1444,7 @@ MOD76_021D800C: ; 0x021D800C
_021D8050:
add r0, r4, #0
mov r1, #2
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
cmp r2, #1
bhi _021D8072
@@ -1474,7 +1474,7 @@ _021D8080:
bl MOD76_021D7CC8
add r0, r4, #0
mov r1, #4
- bl FUN_0206AB18
+ bl GetWazaAttr
add r2, r0, #0
bne _021D80B0
mov r1, #0x21
@@ -1504,7 +1504,7 @@ _021D80BE:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #0
- bl FUN_0206AB30
+ bl WazaGetMaxPp
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -1608,7 +1608,7 @@ MOD76_021D81AC: ; 0x021D81AC
beq _021D8222
add r0, r4, #0
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
bl FUN_0208315C
add r6, r0, #0
mov r0, #0
@@ -1770,7 +1770,7 @@ MOD76_021D8300: ; 0x021D8300
beq _021D8344
add r0, r4, #0
mov r1, #0xa
- bl FUN_0206AB18
+ bl GetWazaAttr
bl FUN_02083114
mov r1, #0xa
bl _s32_div_f
@@ -2656,13 +2656,13 @@ MOD76_021D89E4: ; 0x021D89E4
bne _021D8A00
add r0, r1, #0
mov r1, #3
- bl FUN_0206AB18
+ bl GetWazaAttr
add r6, r0, #0
b _021D8A0C
_021D8A00:
add r0, r1, #0
mov r1, #0xb
- bl FUN_0206AB18
+ bl GetWazaAttr
add r6, r0, #0
add r6, #0x12
_021D8A0C:
@@ -2925,7 +2925,7 @@ MOD76_021D8BF8: ; 0x021D8BF8
add r5, r0, #0
add r0, r1, #0
mov r1, #1
- bl FUN_0206AB18
+ bl GetWazaAttr
add r4, r0, #0
bl FUN_0206E2A8
add r6, r0, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 07:19:43 +0000