From 4614b9028225bc41829a9e0dc6739f3be53ddd77 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 2 Oct 2022 18:14:55 -0700 Subject: [PATCH] Match and link CWarp --- asm/Kyoto/Particles/CWarp.s | 8 ++++---- asm/MetroidPrime/CFlameWarp.s | 5 ++--- obj_files.mk | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/asm/Kyoto/Particles/CWarp.s b/asm/Kyoto/Particles/CWarp.s index b0fe3b74..25651a51 100644 --- a/asm/Kyoto/Particles/CWarp.s +++ b/asm/Kyoto/Particles/CWarp.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803EE2F8 -lbl_803EE2F8: +.global __vt__5CWarp +__vt__5CWarp: # ROM: 0x3EB2F8 .4byte 0 .4byte 0 @@ -25,9 +25,9 @@ __dt__5CWarpFv: /* 80336FD0 00333F30 93 E1 00 0C */ stw r31, 0xc(r1) /* 80336FD4 00333F34 7C 7F 1B 79 */ or. r31, r3, r3 /* 80336FD8 00333F38 41 82 00 1C */ beq lbl_80336FF4 -/* 80336FDC 00333F3C 3C A0 80 3F */ lis r5, lbl_803EE2F8@ha +/* 80336FDC 00333F3C 3C A0 80 3F */ lis r5, __vt__5CWarp@ha /* 80336FE0 00333F40 7C 80 07 35 */ extsh. r0, r4 -/* 80336FE4 00333F44 38 05 E2 F8 */ addi r0, r5, lbl_803EE2F8@l +/* 80336FE4 00333F44 38 05 E2 F8 */ addi r0, r5, __vt__5CWarp@l /* 80336FE8 00333F48 90 1F 00 00 */ stw r0, 0(r31) /* 80336FEC 00333F4C 40 81 00 08 */ ble lbl_80336FF4 /* 80336FF0 00333F50 4B FD E9 41 */ bl Free__7CMemoryFPCv diff --git a/asm/MetroidPrime/CFlameWarp.s b/asm/MetroidPrime/CFlameWarp.s index 0b5746b9..84764116 100644 --- a/asm/MetroidPrime/CFlameWarp.s +++ b/asm/MetroidPrime/CFlameWarp.s @@ -572,9 +572,9 @@ lbl_801B570C: .global __ct__10CFlameWarpFfRC9CVector3fb __ct__10CFlameWarpFfRC9CVector3fb: -/* 801B5728 001B2688 3C C0 80 3F */ lis r6, lbl_803EE2F8@ha +/* 801B5728 001B2688 3C C0 80 3F */ lis r6, __vt__5CWarp@ha /* 801B572C 001B268C 39 03 00 08 */ addi r8, r3, 8 -/* 801B5730 001B2690 38 06 E2 F8 */ addi r0, r6, lbl_803EE2F8@l +/* 801B5730 001B2690 38 06 E2 F8 */ addi r0, r6, __vt__5CWarp@l /* 801B5734 001B2694 3C C0 80 3E */ lis r6, lbl_803E51C8@ha /* 801B5738 001B2698 90 03 00 00 */ stw r0, 0(r3) /* 801B573C 001B269C 38 E6 51 C8 */ addi r7, r6, lbl_803E51C8@l @@ -949,4 +949,3 @@ lbl_803D1638: # ROM: 0x3CE638 .asciz "??(??)" .balign 4 - diff --git a/obj_files.mk b/obj_files.mk index 0b2f9aa3..3736c140 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -541,7 +541,7 @@ KYOTO_1 :=\ $(BUILD_DIR)/asm/Kyoto/Particles/CSpawnSystemKeyframeData.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CUVElement.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CVectorElement.o\ - $(BUILD_DIR)/asm/Kyoto/Particles/CWarp.o\ + $(BUILD_DIR)/src/Kyoto/Particles/CWarp.o\ $(BUILD_DIR)/asm/Kyoto/Math/CPlane.o\ $(BUILD_DIR)/asm/Kyoto/Math/CSphere.o\ $(BUILD_DIR)/asm/Kyoto/Math/CAABox.o\