diff --git a/asm/Dolphin/targcont.s b/asm/Dolphin/targcont.s deleted file mode 100644 index 43230f677..000000000 --- a/asm/Dolphin/targcont.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 0x800056C0 - 0x80472F00 -.global TRKTargetContinue -TRKTargetContinue: -/* 800C09BC 000BD8FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C09C0 000BD900 7C 08 02 A6 */ mflr r0 -/* 800C09C4 000BD904 38 60 00 00 */ li r3, 0 -/* 800C09C8 000BD908 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C09CC 000BD90C 4B FF D9 A5 */ bl TRKTargetSetStopped -/* 800C09D0 000BD910 4B FF FB A9 */ bl UnreserveEXI2Port -/* 800C09D4 000BD914 4B FF D7 51 */ bl TRKSwapAndGo -/* 800C09D8 000BD918 4B FF FB D1 */ bl ReserveEXI2Port -/* 800C09DC 000BD91C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C09E0 000BD920 38 60 00 00 */ li r3, 0 -/* 800C09E4 000BD924 7C 08 03 A6 */ mtlr r0 -/* 800C09E8 000BD928 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C09EC 000BD92C 4E 80 00 20 */ blr diff --git a/obj_files.mk b/obj_files.mk index 5bf575acb..a6c0b521c 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -256,7 +256,7 @@ TEXT_O_FILES:=\ $(BUILD_DIR)/asm/Dolphin/dolphin_trk.o\ $(BUILD_DIR)/asm/Dolphin/main_TRK.o\ $(BUILD_DIR)/asm/Dolphin/dolphin_trk_glue.o\ - $(BUILD_DIR)/asm/Dolphin/targcont.o\ + $(BUILD_DIR)/src/Dolphin/targcont.o\ $(BUILD_DIR)/asm/Dolphin/target_options.o\ $(BUILD_DIR)/asm/Dolphin/mslsupp.o\ $(BUILD_DIR)/src/Dolphin/UDP_Stubs.o\ diff --git a/src/Dolphin/targcont.c b/src/Dolphin/targcont.c index caf33272f..22fcf03f2 100644 --- a/src/Dolphin/targcont.c +++ b/src/Dolphin/targcont.c @@ -1,28 +1,21 @@ - +extern void TRKTargetSetStopped(unsigned int); +extern void UnreserveEXI2Port(); +extern void TRKSwapAndGo(); +extern void ReserveEXI2Port(); /* * --INFO-- * Address: 800C09BC * Size: 000034 */ -void TRKTargetContinue(void) +unsigned int TRKTargetContinue(void) + { -/* -.loc_0x0: - stwu r1, -0x10(r1) - mflr r0 - li r3, 0 - stw r0, 0x14(r1) - bl -0x265C - bl -0x458 - bl -0x28B0 - bl -0x430 - lwz r0, 0x14(r1) - li r3, 0 - mtlr r0 - addi r1, r1, 0x10 - blr -*/ + TRKTargetSetStopped(0); + UnreserveEXI2Port(); + TRKSwapAndGo(); + ReserveEXI2Port(); + return 0; } /*