summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/MI_init.s17
-rw-r--r--arm9/asm/MI_uncompress.s50
-rw-r--r--arm9/asm/MI_wram.s12
-rw-r--r--arm9/asm/error_handling.s17
-rw-r--r--arm9/asm/unk_02038C78.s2
-rw-r--r--arm9/asm/unk_0204AB0C.s2
-rw-r--r--arm9/asm/unk_0206ABC4.s38
7 files changed, 21 insertions, 117 deletions
diff --git a/arm9/asm/MI_init.s b/arm9/asm/MI_init.s
deleted file mode 100644
index 282dde3b..00000000
--- a/arm9/asm/MI_init.s
+++ /dev/null
@@ -1,17 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start MI_Init
-MI_Init: ; 0x020CE648
- stmdb sp!, {lr}
- sub sp, sp, #0x4
- mov r0, #0x3
- bl MI_SetWramBank
- mov r0, #0x0
- bl MI_StopDma
- add sp, sp, #0x4
- ldmfd sp!, {lr}
- bx lr
-
diff --git a/arm9/asm/MI_uncompress.s b/arm9/asm/MI_uncompress.s
deleted file mode 100644
index 5f736e14..00000000
--- a/arm9/asm/MI_uncompress.s
+++ /dev/null
@@ -1,50 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start MI_UncompressLZ8
-MI_UncompressLZ8: ; 0x020CE528
- stmdb sp!, {r4-r6,lr}
- ldr r5, [r0], #0x4
- mov r2, r5, lsr #0x8
-_020CE534:
- cmp r2, #0x0
- ble _020CE5B4
- ldrb lr, [r0], #0x1
- mov r4, #0x8
-_020CE544:
- subs r4, r4, #0x1
- blt _020CE534
- tst lr, #0x80
- bne _020CE568
- ldrb r6, [r0], #0x1
- .word 0xE1416096
- add r1, r1, #0x1
- sub r2, r2, #0x1
- b _020CE5A4
-_020CE568:
- ldrb r5, [r0, #0x0]
- mov r6, #0x3
- add r3, r6, r5, asr #0x4
- ldrb r6, [r0], #0x1
- and r5, r6, #0xf
- mov r12, r5, lsl #0x8
- ldrb r6, [r0], #0x1
- orr r5, r6, r12
- add r12, r5, #0x1
- sub r2, r2, r3
-_020CE590:
- ldrb r5, [r1, -r12]
- .word 0xE1415095
- add r1, r1, #0x1
- subs r3, r3, #0x1
- bgt _020CE590
-_020CE5A4:
- cmp r2, #0x0
- movgt lr, lr, lsl #0x1
- bgt _020CE544
- b _020CE534
-_020CE5B4:
- ldmia sp!, {r4-r6,lr}
- bx lr
diff --git a/arm9/asm/MI_wram.s b/arm9/asm/MI_wram.s
deleted file mode 100644
index 3f245464..00000000
--- a/arm9/asm/MI_wram.s
+++ /dev/null
@@ -1,12 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start MI_SetWramBank
-MI_SetWramBank:
- ldr r1, _020CD870 ; =0x04000247
- strb r0, [r1, #0x0]
- bx lr
- .balign 4
-_020CD870: .word 0x04000247
diff --git a/arm9/asm/error_handling.s b/arm9/asm/error_handling.s
deleted file mode 100644
index d6330897..00000000
--- a/arm9/asm/error_handling.s
+++ /dev/null
@@ -1,17 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- thumb_func_start ErrorHandling
-ErrorHandling: ; 0x02020C2C
- push {r3, lr}
- bl FUN_02031810
- cmp r0, #0x0
- beq _02020C42
- bl OS_GetProcMode
- cmp r0, #0x12
- beq _02020C42
- bl PrintErrorMessageAndReset
-_02020C42:
- pop {r3, pc}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 73daf808..d16d93f2 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -2143,7 +2143,7 @@ _02039628: .word 0x00001388
FUN_0203962C: ; 0x0203962C
push {r3, lr}
mov r1, #0x9
- bl FUN_0206AC74
+ bl TrainerData_GetAttr
cmp r0, #0x0
beq _0203963C
mov r0, #0x1
diff --git a/arm9/asm/unk_0204AB0C.s b/arm9/asm/unk_0204AB0C.s
index 5da6e8d4..45702b12 100644
--- a/arm9/asm/unk_0204AB0C.s
+++ b/arm9/asm/unk_0204AB0C.s
@@ -304,7 +304,7 @@ _0204AD0A:
FUN_0204AD0C: ; 0x0204AD0C
push {r3-r5, lr}
mov r1, #0x1
- bl FUN_0206AC74
+ bl TrainerData_GetAttr
lsl r0, r0, #0x18
lsr r5, r0, #0x18
ldr r0, _0204AD38 ; =0x0000044D
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index 9d8b12d8..b4b3d88e 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -5,13 +5,13 @@
.global UNK_020F8010
UNK_020F8010: ; 0x020F8010
- .byte 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
- .byte 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02
- .byte 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02
- .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
- .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00
- .byte 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x00, 0x00
+ .byte 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0
+ .byte 0, 1, 1, 0, 0, 1, 1, 2, 0, 1, 1, 0, 0, 0, 1, 2
+ .byte 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 2
+ .byte 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0
+ .byte 0, 0, 1, 0, 0, 1, 2, 0, 1, 0, 1, 0, 1, 1, 1, 0
+ .byte 1, 0, 2, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0
+ .byte 1, 0, 0, 0
.text
@@ -43,7 +43,7 @@ _0206ABF4:
cmp r0, #0x0
beq _0206AC48
add r1, sp, #0x14
- bl FUN_0206ADE0
+ bl TrainerData_ReadTrData
ldr r3, [sp, #0x8]
add r6, sp, #0x14
add r3, #0x28
@@ -77,7 +77,7 @@ _0206AC3E:
ldr r0, [sp, #0x0]
ldr r2, [sp, #0x4]
add r1, r7, #0x0
- bl FUN_0206AE0C
+ bl LoadTrainerParty
_0206AC48:
ldr r0, [sp, #0x8]
add r7, r7, #0x1
@@ -100,13 +100,13 @@ _0206AC48:
nop
_0206AC70: .word 0x0000022F
- thumb_func_start FUN_0206AC74
-FUN_0206AC74: ; 0x0206AC74
+ thumb_func_start TrainerData_GetAttr
+TrainerData_GetAttr: ; 0x0206AC74
push {r4-r5, lr}
sub sp, #0x34
add r5, r1, #0x0
add r1, sp, #0x0
- bl FUN_0206ADE0
+ bl TrainerData_ReadTrData
cmp r5, #0x9
bhi _0206ACCC
add r0, r5, r5
@@ -293,8 +293,8 @@ _0206ADD6:
nop
_0206ADDC: .word 0x0000022E
- thumb_func_start FUN_0206ADE0
-FUN_0206ADE0: ; 0x0206ADE0
+ thumb_func_start TrainerData_ReadTrData
+TrainerData_ReadTrData: ; 0x0206ADE0
ldr r3, _0206ADEC ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
@@ -303,8 +303,8 @@ FUN_0206ADE0: ; 0x0206ADE0
nop
_0206ADEC: .word ReadWholeNarcMemberByIdPair
- thumb_func_start FUN_0206ADF0
-FUN_0206ADF0: ; 0x0206ADF0
+ thumb_func_start TrainerData_ReadTrPoke
+TrainerData_ReadTrPoke: ; 0x0206ADF0
ldr r3, _0206ADFC ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
@@ -321,8 +321,8 @@ FUN_0206AE00: ; 0x0206AE00
nop
_0206AE08: .word UNK_020F8010
- thumb_func_start FUN_0206AE0C
-FUN_0206AE0C: ; 0x0206AE0C
+ thumb_func_start LoadTrainerParty
+LoadTrainerParty: ; 0x0206AE0C
push {r3-r7, lr}
sub sp, #0x50
add r7, r1, #0x0
@@ -345,7 +345,7 @@ FUN_0206AE0C: ; 0x0206AE0C
add r0, r4, r6
ldr r0, [r0, #0x18]
ldr r1, [sp, #0x4c]
- bl FUN_0206ADF0
+ bl TrainerData_ReadTrPoke
mov r0, #0x34
add r5, r7, #0x0
mul r5, r0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:38:25 +0000