Merge pull request #262 from PikalaxALT/pikalax_work

Decompile bag.s

1 files changed, 33 insertions, 33 deletions

diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index 59d25787..ec4049ab 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -473,7 +473,7 @@ MOD75_021E6FA4: ; 0x021E6FA4
 	add r0, #0xc4
 	ldr r0, [r0]
 	ldr r0, [r0]
-	bl FUN_0206F158
+	bl Sav2_Bag_get
 	add r1, r4, #0
 	add r1, #0xc8
 	str r0, [r1]
@@ -1040,8 +1040,8 @@ _021E743E:
 	bx lr
 	thumb_func_end MOD75_021E7420
 
-	thumb_func_start MOD75_021E7448
-MOD75_021E7448: ; 0x021E7448
+	thumb_func_start MOD75_GetItemName
+MOD75_GetItemName: ; 0x021E7448
 	add r3, r1, #0
 	add r1, r2, #0
 	add r2, r3, #0
@@ -1049,10 +1049,10 @@ MOD75_021E7448: ; 0x021E7448
 	bx r3
 	nop
 _021E7454: .word ReadMsgDataIntoString
-	thumb_func_end MOD75_021E7448
+	thumb_func_end MOD75_GetItemName
 
-	thumb_func_start MOD75_021E7458
-MOD75_021E7458: ; 0x021E7458
+	thumb_func_start MOD75_GetTMHMMoveName
+MOD75_GetTMHMMoveName: ; 0x021E7458
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
 	add r4, r1, #0
@@ -1063,7 +1063,7 @@ MOD75_021E7458: ; 0x021E7458
 	add r2, r4, #0
 	bl ReadMsgDataIntoString
 	pop {r3, r4, r5, pc}
-	thumb_func_end MOD75_021E7458
+	thumb_func_end MOD75_GetTMHMMoveName
 
 	thumb_func_start MOD75_021E7470
 MOD75_021E7470: ; 0x021E7470
@@ -1233,7 +1233,7 @@ MOD75_021E7580: ; 0x021E7580
 	ldrb r0, [r0, r1]
 	mov r1, #6
 	add r0, r0, #3
-	bl FUN_02012838
+	bl ListMenu_ctor
 	mov r1, #0x16
 	lsl r1, r1, #4
 	str r0, [r5, r1]
@@ -1243,7 +1243,7 @@ MOD75_021E7580: ; 0x021E7580
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x23
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	ldrb r3, [r4, #8]
 	cmp r3, #3
 	bne _021E764A
@@ -1272,7 +1272,7 @@ _021E75CE:
 	ldr r0, [r5, r0]
 	ldr r1, [r7, r1]
 	mov r3, #6
-	bl MOD75_021E7458
+	bl MOD75_GetTMHMMoveName
 	mov r0, #0x16
 	mov r1, #0x59
 	lsl r0, r0, #4
@@ -1280,7 +1280,7 @@ _021E75CE:
 	ldr r0, [r5, r0]
 	ldr r1, [r7, r1]
 	add r2, r6, #0
-	bl FUN_020128A0
+	bl ListMenu_AddItem
 	ldr r0, [sp]
 	ldrb r1, [r4, #8]
 	add r0, r0, #4
@@ -1300,7 +1300,7 @@ _021E761A:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x22
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	mov r1, #0x16
 	lsl r1, r1, #4
 	ldr r0, [r5, r1]
@@ -1309,7 +1309,7 @@ _021E761A:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x23
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	add r0, r6, #3
 	add sp, #8
 	strb r0, [r4, #9]
@@ -1340,7 +1340,7 @@ _021E7658:
 	ldr r0, [r5, r0]
 	ldr r1, [r7, r1]
 	mov r3, #6
-	bl MOD75_021E7448
+	bl MOD75_GetItemName
 	mov r0, #0x16
 	mov r1, #0x59
 	lsl r0, r0, #4
@@ -1348,7 +1348,7 @@ _021E7658:
 	ldr r0, [r5, r0]
 	ldr r1, [r7, r1]
 	add r2, r6, #0
-	bl FUN_020128A0
+	bl ListMenu_AddItem
 	ldr r0, [sp, #4]
 	ldrb r3, [r4, #8]
 	add r0, r0, #4
@@ -1377,7 +1377,7 @@ _021E76A4:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x22
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	b _021E76E0
 _021E76CC:
 	mov r1, #0x16
@@ -1388,7 +1388,7 @@ _021E76CC:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x2b
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 _021E76E0:
 	mov r1, #0x16
 	lsl r1, r1, #4
@@ -1398,7 +1398,7 @@ _021E76E0:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x23
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	add r0, r6, #3
 	add sp, #8
 	strb r0, [r4, #9]
@@ -1412,7 +1412,7 @@ _021E76FC:
 	add r3, r2, #0
 	ldr r1, [r5, r1]
 	sub r3, #0x23
-	bl FUN_02012880
+	bl ListMenu_ItemFromMsgData
 	add r0, r6, #2
 	strb r0, [r4, #9]
 	add sp, #8
@@ -1795,7 +1795,7 @@ _021E79C6:
 	add r0, r4, #0
 	add r0, #0xc8
 	ldr r0, [r0]
-	bl FUN_0206EBC4
+	bl Bag_GetRegisteredItem
 	ldr r2, [r6]
 	lsl r1, r5, #2
 	ldrh r1, [r2, r1]
@@ -1915,7 +1915,7 @@ MOD75_021E7AA4: ; 0x021E7AA4
 	mov r0, #0x16
 	lsl r0, r0, #4
 	ldr r0, [r4, r0]
-	bl FUN_02012870
+	bl ListMenu_dtor
 	mov r0, #0x57
 	mov r1, #0
 	lsl r0, r0, #2
@@ -2834,7 +2834,7 @@ _021E81D2:
 	mov r0, #0x16
 	lsl r0, r0, #4
 	ldr r0, [r5, r0]
-	bl FUN_02012870
+	bl ListMenu_dtor
 _021E8206:
 	add r0, r5, #0
 	add r0, #0xc4
@@ -3900,7 +3900,7 @@ MOD75_021E89F0: ; 0x021E89F0
 	mov r0, #0x16
 	lsl r0, r0, #4
 	ldr r0, [r4, r0]
-	bl FUN_02012870
+	bl ListMenu_dtor
 	add r0, r4, #0
 	bl MOD75_021E7580
 _021E8A3C:
@@ -4209,7 +4209,7 @@ _021E8C84:
 	add r0, r5, #0
 	add r0, #0xc8
 	ldr r0, [r0]
-	bl FUN_0206EBC4
+	bl Bag_GetRegisteredItem
 	add r1, r5, #0
 	add r1, #0xc4
 	ldr r1, [r1]
@@ -5004,7 +5004,7 @@ MOD75_021E92BC: ; 0x021E92BC
 	ldrh r2, [r2]
 	ldrh r3, [r4, r3]
 	sub r1, r1, #3
-	bl FUN_0206EE20
+	bl Pocket_TakeItem
 	add r0, r4, #0
 	add r0, #0xc4
 	ldr r3, [r0]
@@ -5026,7 +5026,7 @@ MOD75_021E92BC: ; 0x021E92BC
 	mov r0, #0x16
 	lsl r0, r0, #4
 	ldr r0, [r4, r0]
-	bl FUN_02012870
+	bl ListMenu_dtor
 	add r0, r4, #0
 	bl MOD75_021E7580
 	add r0, r4, #0
@@ -5226,7 +5226,7 @@ MOD75_021E947C: ; 0x021E947C
 	add r2, #0x66
 	ldrh r2, [r2]
 	sub r1, r1, #3
-	bl FUN_0206EF10
+	bl Pocket_GetQuantity
 	cmp r0, #1
 	bne _021E94BA
 	add r0, r4, #0
@@ -5604,7 +5604,7 @@ MOD75_021E97A8: ; 0x021E97A8
 	add r1, #0x66
 	ldrh r1, [r1]
 	ldr r0, [r0]
-	bl FUN_0206EBCC
+	bl Bag_SetRegisteredItem
 	mov r0, #0x57
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
@@ -5629,7 +5629,7 @@ MOD75_021E97E4: ; 0x021E97E4
 	add r0, #0xc8
 	ldr r0, [r0]
 	mov r1, #0
-	bl FUN_0206EBCC
+	bl Bag_SetRegisteredItem
 	mov r0, #0x57
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
@@ -5954,7 +5954,7 @@ _021E9A6E:
 	add r2, #0x66
 	ldrh r2, [r2]
 	sub r1, r1, #3
-	bl FUN_0206EF10
+	bl Pocket_GetQuantity
 	cmp r0, #1
 	bne _021E9AF4
 	mov r0, #0x45
@@ -8881,7 +8881,7 @@ _021EB180:
 _021EB1B0:
 	add r0, r7, #0
 	mov r1, #6
-	bl FUN_02012838
+	bl ListMenu_ctor
 	mov r1, #0x55
 	lsl r1, r1, #2
 	mov r4, #0
@@ -8901,7 +8901,7 @@ _021EB1C4:
 	lsl r1, r1, #2
 	ldr r0, [r5, r0]
 	ldr r1, [r3, r1]
-	bl FUN_020128A0
+	bl ListMenu_AddItem
 	add r0, r4, #1
 	lsl r0, r0, #0x10
 	lsr r4, r0, #0x10
@@ -9112,7 +9112,7 @@ _021EB37A:
 	mov r0, #0x55
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl FUN_02012870
+	bl ListMenu_dtor
 	add r0, r5, #0
 	add r0, #0xb4
 	bl FUN_02019178