summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2020-09-30 16:19:51 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2020-09-30 16:19:51 -0400
commit2b882ccd4ffc0f15a03c2ec9871e74978a2b237d (patch)
tree32fdc247481ec1c6d6505eff296192a7242c429c
parent3caf2c526857044cbb2385d6f9f69eb859e20b8f (diff)
fix split
-rw-r--r--asm/code_80025390.s45
-rw-r--r--asm/code_800284B0.s (renamed from asm/code_80028554.s)45
-rw-r--r--obj_files.mk2
3 files changed, 46 insertions, 46 deletions
diff --git a/asm/code_80025390.s b/asm/code_80025390.s
index 7918521..a7e99ab 100644
--- a/asm/code_80025390.s
+++ b/asm/code_80025390.s
@@ -3577,48 +3577,3 @@ func_80028490:
/* 800284A4 00024104 B0 83 00 02 */ sth r4, 2(r3)
/* 800284A8 00024108 98 03 00 04 */ stb r0, 4(r3)
/* 800284AC 0002410C 4E 80 00 20 */ blr
-
-.global lbl_800284B0
-lbl_800284B0:
-/* 800284B0 00024110 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 800284B4 00024114 7C 08 02 A6 */ mflr r0
-/* 800284B8 00024118 2C 05 00 00 */ cmpwi r5, 0
-/* 800284BC 0002411C 90 01 00 34 */ stw r0, 0x34(r1)
-/* 800284C0 00024120 93 E1 00 2C */ stw r31, 0x2c(r1)
-/* 800284C4 00024124 7C BF 2B 78 */ mr r31, r5
-/* 800284C8 00024128 93 C1 00 28 */ stw r30, 0x28(r1)
-/* 800284CC 0002412C 7C DE 33 78 */ mr r30, r6
-/* 800284D0 00024130 93 A1 00 24 */ stw r29, 0x24(r1)
-/* 800284D4 00024134 7C 9D 23 78 */ mr r29, r4
-/* 800284D8 00024138 93 81 00 20 */ stw r28, 0x20(r1)
-/* 800284DC 0002413C 7C 7C 1B 78 */ mr r28, r3
-/* 800284E0 00024140 41 82 00 54 */ beq lbl_80028534
-/* 800284E4 00024144 3C 80 80 41 */ lis r4, lbl_80409720@ha
-/* 800284E8 00024148 7F E3 FB 78 */ mr r3, r31
-/* 800284EC 0002414C 38 84 97 20 */ addi r4, r4, lbl_80409720@l
-/* 800284F0 00024150 48 20 4B 3D */ bl func_8022D02C
-/* 800284F4 00024154 2C 03 00 00 */ cmpwi r3, 0
-/* 800284F8 00024158 7C 64 1B 78 */ mr r4, r3
-/* 800284FC 0002415C 40 81 00 38 */ ble lbl_80028534
-/* 80028500 00024160 38 00 00 01 */ li r0, 1
-/* 80028504 00024164 38 60 00 21 */ li r3, 0x21
-/* 80028508 00024168 B0 61 00 08 */ sth r3, 8(r1)
-/* 8002850C 0002416C 7F E3 FB 78 */ mr r3, r31
-/* 80028510 00024170 38 A1 00 08 */ addi r5, r1, 8
-/* 80028514 00024174 38 C0 00 03 */ li r6, 3
-/* 80028518 00024178 93 81 00 0C */ stw r28, 0xc(r1)
-/* 8002851C 0002417C 38 E0 00 01 */ li r7, 1
-/* 80028520 00024180 B0 01 00 10 */ sth r0, 0x10(r1)
-/* 80028524 00024184 93 A1 00 14 */ stw r29, 0x14(r1)
-/* 80028528 00024188 B0 01 00 18 */ sth r0, 0x18(r1)
-/* 8002852C 0002418C 93 C1 00 1C */ stw r30, 0x1c(r1)
-/* 80028530 00024190 48 20 1D 85 */ bl func_8022A2B4
-lbl_80028534:
-/* 80028534 00024194 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 80028538 00024198 83 E1 00 2C */ lwz r31, 0x2c(r1)
-/* 8002853C 0002419C 83 C1 00 28 */ lwz r30, 0x28(r1)
-/* 80028540 000241A0 83 A1 00 24 */ lwz r29, 0x24(r1)
-/* 80028544 000241A4 83 81 00 20 */ lwz r28, 0x20(r1)
-/* 80028548 000241A8 7C 08 03 A6 */ mtlr r0
-/* 8002854C 000241AC 38 21 00 30 */ addi r1, r1, 0x30
-/* 80028550 000241B0 4E 80 00 20 */ blr
diff --git a/asm/code_80028554.s b/asm/code_800284B0.s
index 9e2e72b..78e61a3 100644
--- a/asm/code_80028554.s
+++ b/asm/code_800284B0.s
@@ -2,6 +2,51 @@
.section .text, "ax" # 0x80006980 - 0x803E1E60
+.global lbl_800284B0
+lbl_800284B0:
+/* 800284B0 00024110 94 21 FF D0 */ stwu r1, -0x30(r1)
+/* 800284B4 00024114 7C 08 02 A6 */ mflr r0
+/* 800284B8 00024118 2C 05 00 00 */ cmpwi r5, 0
+/* 800284BC 0002411C 90 01 00 34 */ stw r0, 0x34(r1)
+/* 800284C0 00024120 93 E1 00 2C */ stw r31, 0x2c(r1)
+/* 800284C4 00024124 7C BF 2B 78 */ mr r31, r5
+/* 800284C8 00024128 93 C1 00 28 */ stw r30, 0x28(r1)
+/* 800284CC 0002412C 7C DE 33 78 */ mr r30, r6
+/* 800284D0 00024130 93 A1 00 24 */ stw r29, 0x24(r1)
+/* 800284D4 00024134 7C 9D 23 78 */ mr r29, r4
+/* 800284D8 00024138 93 81 00 20 */ stw r28, 0x20(r1)
+/* 800284DC 0002413C 7C 7C 1B 78 */ mr r28, r3
+/* 800284E0 00024140 41 82 00 54 */ beq lbl_80028534
+/* 800284E4 00024144 3C 80 80 41 */ lis r4, lbl_80409720@ha
+/* 800284E8 00024148 7F E3 FB 78 */ mr r3, r31
+/* 800284EC 0002414C 38 84 97 20 */ addi r4, r4, lbl_80409720@l
+/* 800284F0 00024150 48 20 4B 3D */ bl func_8022D02C
+/* 800284F4 00024154 2C 03 00 00 */ cmpwi r3, 0
+/* 800284F8 00024158 7C 64 1B 78 */ mr r4, r3
+/* 800284FC 0002415C 40 81 00 38 */ ble lbl_80028534
+/* 80028500 00024160 38 00 00 01 */ li r0, 1
+/* 80028504 00024164 38 60 00 21 */ li r3, 0x21
+/* 80028508 00024168 B0 61 00 08 */ sth r3, 8(r1)
+/* 8002850C 0002416C 7F E3 FB 78 */ mr r3, r31
+/* 80028510 00024170 38 A1 00 08 */ addi r5, r1, 8
+/* 80028514 00024174 38 C0 00 03 */ li r6, 3
+/* 80028518 00024178 93 81 00 0C */ stw r28, 0xc(r1)
+/* 8002851C 0002417C 38 E0 00 01 */ li r7, 1
+/* 80028520 00024180 B0 01 00 10 */ sth r0, 0x10(r1)
+/* 80028524 00024184 93 A1 00 14 */ stw r29, 0x14(r1)
+/* 80028528 00024188 B0 01 00 18 */ sth r0, 0x18(r1)
+/* 8002852C 0002418C 93 C1 00 1C */ stw r30, 0x1c(r1)
+/* 80028530 00024190 48 20 1D 85 */ bl func_8022A2B4
+lbl_80028534:
+/* 80028534 00024194 80 01 00 34 */ lwz r0, 0x34(r1)
+/* 80028538 00024198 83 E1 00 2C */ lwz r31, 0x2c(r1)
+/* 8002853C 0002419C 83 C1 00 28 */ lwz r30, 0x28(r1)
+/* 80028540 000241A0 83 A1 00 24 */ lwz r29, 0x24(r1)
+/* 80028544 000241A4 83 81 00 20 */ lwz r28, 0x20(r1)
+/* 80028548 000241A8 7C 08 03 A6 */ mtlr r0
+/* 8002854C 000241AC 38 21 00 30 */ addi r1, r1, 0x30
+/* 80028550 000241B0 4E 80 00 20 */ blr
+
.global func_80028554
func_80028554:
/* 80028554 000241B4 38 00 00 01 */ li r0, 1
diff --git a/obj_files.mk b/obj_files.mk
index b9a7507..c40eb09 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -16,7 +16,7 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/code_8000ADC0.o \
$(BUILD_DIR)/asm/code_80024914.o \
$(BUILD_DIR)/asm/code_80025390.o \
- $(BUILD_DIR)/asm/code_80028554.o \
+ $(BUILD_DIR)/asm/code_800284B0.o \
$(BUILD_DIR)/asm/code_8002A910.o \
$(BUILD_DIR)/asm/text_1.o \
$(BUILD_DIR)/asm/text_2.o \