From cf05bdf222fb6fe3a9df003dc48304998b56b692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 08:58:14 +0100 Subject: [PATCH] merge TRK_Hollywood_Revolution --- .../{__exception_80004380.s => __exception.s} | 0 .../cc_gdev_80496bd8.s | 10 -- .../cc_gdev_8055c728.s | 6 -- .../CircleBuffer.s} | 0 .../MWCriticalSection_gc.s} | 0 .../cc_gdev.s} | 16 ++++ .../{dispatch_800158f4.s => dispatch.s} | 34 +++++++ .../dispatch_80421ab8.s | 34 ------- .../{dolphin_trk_80015a14.s => dolphin_trk.s} | 28 ++++++ .../dolphin_trk_80421b28.s | 22 ----- .../dolphin_trk_8055c738.s | 6 -- ...trk_glue_80015d38.s => dolphin_trk_glue.s} | 84 +++++++++++++++++ .../dolphin_trk_glue_80421b68.s | 64 ------------- .../dolphin_trk_glue_804970f8.s | 6 -- .../dolphin_trk_glue_8055c740.s | 6 -- .../dolphin_trk_glue_8055e4c0.s | 8 -- .../{flush_cache_80015530.s => flush_cache.s} | 0 .../{main_TRK_80015568.s => main_TRK.s} | 6 ++ .../main_TRK_8055c730.s | 6 -- .../{mainloop_800155a4.s => mainloop.s} | 0 .../{mem_TRK_80015690.s => mem_TRK.s} | 0 ...mpc_7xx_603e_80016bdc.s => mpc_7xx_603e.s} | 0 .../{msg_80016f04.s => msg.s} | 22 +++++ asm/TRK_Hollywood_Revolution/msg_80421cd8.s | 16 ---- asm/TRK_Hollywood_Revolution/msg_8055c758.s | 6 -- .../{msgbuf_80016f68.s => msgbuf.s} | 22 +++++ .../msgbuf_80421d00.s | 16 ---- .../msgbuf_80497148.s | 6 -- .../{msghndlr_80017774.s => msghndlr.s} | 50 ++++++++++ .../msghndlr_80421d28.s | 40 -------- .../msghndlr_8055c760.s | 10 -- .../{mslsupp_800186f8.s => mslsupp.s} | 0 .../{notify_800160d0.s => notify.s} | 0 .../{nubevent_80016160.s => nubevent.s} | 20 ++++ .../nubevent_80421c50.s | 14 --- .../nubevent_80497120.s | 6 -- .../{nubinit_800162fc.s => nubinit.s} | 20 ++++ .../nubinit_80421c70.s | 14 --- .../nubinit_8055c748.s | 6 -- .../{serpoll_8001644c.s => serpoll.s} | 6 ++ .../serpoll_8055c750.s | 6 -- .../{support_80016584.s => support.s} | 24 +++++ .../support_80421c90.s | 24 ----- .../{targcont_80016ba8.s => targcont.s} | 0 ...et_options_8001a098.s => target_options.s} | 6 ++ .../target_options_8055c770.s | 6 -- .../{targimpl_80018884.s => targimpl.s} | 94 +++++++++++++++++++ .../targimpl_80407778.s | 52 ---------- .../targimpl_80421d90.s | 10 -- .../targimpl_80498af0.s | 26 ----- .../targimpl_8055c768.s | 6 -- .../{targsupp_80015034.s => targsupp.s} | 0 obj_files.mk | 78 +++++---------- 53 files changed, 458 insertions(+), 484 deletions(-) rename asm/TRK_Hollywood_Revolution/{__exception_80004380.s => __exception.s} (100%) delete mode 100644 asm/TRK_Hollywood_Revolution/cc_gdev_80496bd8.s delete mode 100644 asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.s rename asm/TRK_Hollywood_Revolution/{CircleBuffer_800152fc.s => custconn/CircleBuffer.s} (100%) rename asm/TRK_Hollywood_Revolution/{MWCriticalSection_gc_800152c4.s => custconn/MWCriticalSection_gc.s} (100%) rename asm/TRK_Hollywood_Revolution/{cc_gdev_80015054.s => custconn/cc_gdev.s} (96%) rename asm/TRK_Hollywood_Revolution/{dispatch_800158f4.s => dispatch.s} (86%) delete mode 100644 asm/TRK_Hollywood_Revolution/dispatch_80421ab8.s rename asm/TRK_Hollywood_Revolution/{dolphin_trk_80015a14.s => dolphin_trk.s} (95%) delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.s delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.s rename asm/TRK_Hollywood_Revolution/{dolphin_trk_glue_80015d38.s => dolphin_trk_glue.s} (88%) delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.s delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_glue_804970f8.s delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055c740.s delete mode 100644 asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055e4c0.s rename asm/TRK_Hollywood_Revolution/{flush_cache_80015530.s => flush_cache.s} (100%) rename asm/TRK_Hollywood_Revolution/{main_TRK_80015568.s => main_TRK.s} (87%) delete mode 100644 asm/TRK_Hollywood_Revolution/main_TRK_8055c730.s rename asm/TRK_Hollywood_Revolution/{mainloop_800155a4.s => mainloop.s} (100%) rename asm/TRK_Hollywood_Revolution/{mem_TRK_80015690.s => mem_TRK.s} (100%) rename asm/TRK_Hollywood_Revolution/{mpc_7xx_603e_80016bdc.s => mpc_7xx_603e.s} (100%) rename asm/TRK_Hollywood_Revolution/{msg_80016f04.s => msg.s} (76%) delete mode 100644 asm/TRK_Hollywood_Revolution/msg_80421cd8.s delete mode 100644 asm/TRK_Hollywood_Revolution/msg_8055c758.s rename asm/TRK_Hollywood_Revolution/{msgbuf_80016f68.s => msgbuf.s} (98%) delete mode 100644 asm/TRK_Hollywood_Revolution/msgbuf_80421d00.s delete mode 100644 asm/TRK_Hollywood_Revolution/msgbuf_80497148.s rename asm/TRK_Hollywood_Revolution/{msghndlr_80017774.s => msghndlr.s} (98%) delete mode 100644 asm/TRK_Hollywood_Revolution/msghndlr_80421d28.s delete mode 100644 asm/TRK_Hollywood_Revolution/msghndlr_8055c760.s rename asm/TRK_Hollywood_Revolution/{mslsupp_800186f8.s => mslsupp.s} (100%) rename asm/TRK_Hollywood_Revolution/{notify_800160d0.s => notify.s} (100%) rename asm/TRK_Hollywood_Revolution/{nubevent_80016160.s => nubevent.s} (93%) delete mode 100644 asm/TRK_Hollywood_Revolution/nubevent_80421c50.s delete mode 100644 asm/TRK_Hollywood_Revolution/nubevent_80497120.s rename asm/TRK_Hollywood_Revolution/{nubinit_800162fc.s => nubinit.s} (92%) delete mode 100644 asm/TRK_Hollywood_Revolution/nubinit_80421c70.s delete mode 100644 asm/TRK_Hollywood_Revolution/nubinit_8055c748.s rename asm/TRK_Hollywood_Revolution/{serpoll_8001644c.s => serpoll.s} (96%) delete mode 100644 asm/TRK_Hollywood_Revolution/serpoll_8055c750.s rename asm/TRK_Hollywood_Revolution/{support_80016584.s => support.s} (97%) delete mode 100644 asm/TRK_Hollywood_Revolution/support_80421c90.s rename asm/TRK_Hollywood_Revolution/{targcont_80016ba8.s => targcont.s} (100%) rename asm/TRK_Hollywood_Revolution/{target_options_8001a098.s => target_options.s} (78%) delete mode 100644 asm/TRK_Hollywood_Revolution/target_options_8055c770.s rename asm/TRK_Hollywood_Revolution/{targimpl_80018884.s => targimpl.s} (98%) delete mode 100644 asm/TRK_Hollywood_Revolution/targimpl_80407778.s delete mode 100644 asm/TRK_Hollywood_Revolution/targimpl_80421d90.s delete mode 100644 asm/TRK_Hollywood_Revolution/targimpl_80498af0.s delete mode 100644 asm/TRK_Hollywood_Revolution/targimpl_8055c768.s rename asm/TRK_Hollywood_Revolution/{targsupp_80015034.s => targsupp.s} (100%) diff --git a/asm/TRK_Hollywood_Revolution/__exception_80004380.s b/asm/TRK_Hollywood_Revolution/__exception.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/__exception_80004380.s rename to asm/TRK_Hollywood_Revolution/__exception.s diff --git a/asm/TRK_Hollywood_Revolution/cc_gdev_80496bd8.s b/asm/TRK_Hollywood_Revolution/cc_gdev_80496bd8.s deleted file mode 100644 index 5cbdcb7d..00000000 --- a/asm/TRK_Hollywood_Revolution/cc_gdev_80496bd8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global gRecvBuf -gRecvBuf: - .skip 0x500 - -.global gRecvCB -gRecvCB: - .skip 0x20 diff --git a/asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.s b/asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.s deleted file mode 100644 index d995814e..00000000 --- a/asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gIsInitialized -gIsInitialized: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/CircleBuffer_800152fc.s b/asm/TRK_Hollywood_Revolution/custconn/CircleBuffer.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/CircleBuffer_800152fc.s rename to asm/TRK_Hollywood_Revolution/custconn/CircleBuffer.s diff --git a/asm/TRK_Hollywood_Revolution/MWCriticalSection_gc_800152c4.s b/asm/TRK_Hollywood_Revolution/custconn/MWCriticalSection_gc.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/MWCriticalSection_gc_800152c4.s rename to asm/TRK_Hollywood_Revolution/custconn/MWCriticalSection_gc.s diff --git a/asm/TRK_Hollywood_Revolution/cc_gdev_80015054.s b/asm/TRK_Hollywood_Revolution/custconn/cc_gdev.s similarity index 96% rename from asm/TRK_Hollywood_Revolution/cc_gdev_80015054.s rename to asm/TRK_Hollywood_Revolution/custconn/cc_gdev.s index 0ad23ea9..5baaf216 100644 --- a/asm/TRK_Hollywood_Revolution/cc_gdev_80015054.s +++ b/asm/TRK_Hollywood_Revolution/custconn/cc_gdev.s @@ -205,3 +205,19 @@ gdev_cc_initinterrupts: /* 800152B8 000110F8 7C 08 03 A6 */ mtlr r0 /* 800152BC 000110FC 38 21 00 10 */ addi r1, r1, 0x10 /* 800152C0 00011100 4E 80 00 20 */ blr +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global gRecvBuf +gRecvBuf: + .skip 0x500 + +.global gRecvCB +gRecvCB: + .skip 0x20 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gIsInitialized +gIsInitialized: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/dispatch_800158f4.s b/asm/TRK_Hollywood_Revolution/dispatch.s similarity index 86% rename from asm/TRK_Hollywood_Revolution/dispatch_800158f4.s rename to asm/TRK_Hollywood_Revolution/dispatch.s index 29f42e99..5162f420 100644 --- a/asm/TRK_Hollywood_Revolution/dispatch_800158f4.s +++ b/asm/TRK_Hollywood_Revolution/dispatch.s @@ -114,3 +114,37 @@ lbl_800159F8: /* 80015A08 00011848 7C 08 03 A6 */ mtlr r0 /* 80015A0C 0001184C 38 21 00 10 */ addi r1, r1, 0x10 /* 80015A10 00011850 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@109" +"@109": + + .4byte lbl_800159F8 + .4byte lbl_8001593C + .4byte lbl_8001594C + .4byte lbl_8001595C + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_8001596C + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_8001597C + .4byte lbl_8001598C + .4byte lbl_8001599C + .4byte lbl_800159AC + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159F8 + .4byte lbl_800159EC + .4byte lbl_800159BC + .4byte lbl_800159CC + .4byte lbl_800159DC + .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/dispatch_80421ab8.s b/asm/TRK_Hollywood_Revolution/dispatch_80421ab8.s deleted file mode 100644 index bb8d2052..00000000 --- a/asm/TRK_Hollywood_Revolution/dispatch_80421ab8.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@109" -"@109": - - .4byte lbl_800159F8 - .4byte lbl_8001593C - .4byte lbl_8001594C - .4byte lbl_8001595C - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_8001596C - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_8001597C - .4byte lbl_8001598C - .4byte lbl_8001599C - .4byte lbl_800159AC - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159F8 - .4byte lbl_800159EC - .4byte lbl_800159BC - .4byte lbl_800159CC - .4byte lbl_800159DC - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_80015a14.s b/asm/TRK_Hollywood_Revolution/dolphin_trk.s similarity index 95% rename from asm/TRK_Hollywood_Revolution/dolphin_trk_80015a14.s rename to asm/TRK_Hollywood_Revolution/dolphin_trk.s index eebdad4b..8186a592 100644 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_80015a14.s +++ b/asm/TRK_Hollywood_Revolution/dolphin_trk.s @@ -242,3 +242,31 @@ __TRKreset: /* 80015D2C 00011B6C 38 80 00 00 */ li r4, 0x0 /* 80015D30 00011B70 38 A0 00 00 */ li r5, 0x0 /* 80015D34 00011B74 48 00 DA EC */ b OSResetSystem +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global TRK_ISR_OFFSETS +TRK_ISR_OFFSETS: + + .4byte 0x00000100 + .4byte 0x00000200 + .4byte 0x00000300 + .4byte 0x00000400 + .4byte 0x00000500 + .4byte 0x00000600 + .4byte 0x00000700 + .4byte 0x00000800 + .4byte 0x00000900 + .4byte 0x00000C00 + .4byte 0x00000D00 + .4byte 0x00000F00 + .4byte 0x00001300 + .4byte 0x00001400 + .4byte 0x00001700 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global lc_base +lc_base: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.s deleted file mode 100644 index 5b3ee656..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global TRK_ISR_OFFSETS -TRK_ISR_OFFSETS: - - .4byte 0x00000100 - .4byte 0x00000200 - .4byte 0x00000300 - .4byte 0x00000400 - .4byte 0x00000500 - .4byte 0x00000600 - .4byte 0x00000700 - .4byte 0x00000800 - .4byte 0x00000900 - .4byte 0x00000C00 - .4byte 0x00000D00 - .4byte 0x00000F00 - .4byte 0x00001300 - .4byte 0x00001400 - .4byte 0x00001700 - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.s deleted file mode 100644 index 7220baa7..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global lc_base -lc_base: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80015d38.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue.s similarity index 88% rename from asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80015d38.s rename to asm/TRK_Hollywood_Revolution/dolphin_trk_glue.s index 3c8274a7..fd18fe69 100644 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80015d38.s +++ b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue.s @@ -265,3 +265,87 @@ InitializeProgramEndTrap: /* 800160C4 00011F04 7C 08 03 A6 */ mtlr r0 /* 800160C8 00011F08 38 21 00 10 */ addi r1, r1, 0x10 /* 800160CC 00011F0C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421B68" +"@stringBase0_80421B68": + + .4byte 0x4465766B + .4byte 0x69742073 + .4byte 0x65742074 + .4byte 0x6F203A20 + .4byte 0x256C640A + .4byte 0x004D6574 + .4byte 0x726F5452 + .4byte 0x4B203A20 + .4byte 0x53697A65 + .4byte 0x6F662052 + .4byte 0x65706C79 + .4byte 0x202D2025 + .4byte 0x6C642062 + .4byte 0x79746573 + .4byte 0x0A004D65 + .4byte 0x74726F54 + .4byte 0x524B203A + .4byte 0x20536574 + .4byte 0x20746F20 + .4byte 0x4E444556 + .4byte 0x20686172 + .4byte 0x64776172 + .4byte 0x650A004D + .4byte 0x6574726F + .4byte 0x54524B20 + .4byte 0x3A205365 + .4byte 0x7420746F + .4byte 0x20554E4B + .4byte 0x4E4F574E + .4byte 0x20686172 + .4byte 0x64776172 + .4byte 0x652E2028 + .4byte 0x256C6429 + .4byte 0x0A004D65 + .4byte 0x74726F54 + .4byte 0x524B203A + .4byte 0x20496E76 + .4byte 0x616C6964 + .4byte 0x20686172 + .4byte 0x64776172 + .4byte 0x65204944 + .4byte 0x20706173 + .4byte 0x73656420 + .4byte 0x66726F6D + .4byte 0x204F530A + .4byte 0x004D6574 + .4byte 0x726F5452 + .4byte 0x4B203A20 + .4byte 0x44656661 + .4byte 0x756C7469 + .4byte 0x6E672074 + .4byte 0x6F204744 + .4byte 0x45562048 + .4byte 0x61726477 + .4byte 0x6172650A + .4byte 0x0025730A + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global gDBCommTable +gDBCommTable: + .skip 0x28 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global TRK_Use_BBA +TRK_Use_BBA: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global EndofProgramInstruction$631 +EndofProgramInstruction$631: + + .4byte 0x00454E44 + .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.s deleted file mode 100644 index 32d9b65a..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.s +++ /dev/null @@ -1,64 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421B68" -"@stringBase0_80421B68": - - .4byte 0x4465766B - .4byte 0x69742073 - .4byte 0x65742074 - .4byte 0x6F203A20 - .4byte 0x256C640A - .4byte 0x004D6574 - .4byte 0x726F5452 - .4byte 0x4B203A20 - .4byte 0x53697A65 - .4byte 0x6F662052 - .4byte 0x65706C79 - .4byte 0x202D2025 - .4byte 0x6C642062 - .4byte 0x79746573 - .4byte 0x0A004D65 - .4byte 0x74726F54 - .4byte 0x524B203A - .4byte 0x20536574 - .4byte 0x20746F20 - .4byte 0x4E444556 - .4byte 0x20686172 - .4byte 0x64776172 - .4byte 0x650A004D - .4byte 0x6574726F - .4byte 0x54524B20 - .4byte 0x3A205365 - .4byte 0x7420746F - .4byte 0x20554E4B - .4byte 0x4E4F574E - .4byte 0x20686172 - .4byte 0x64776172 - .4byte 0x652E2028 - .4byte 0x256C6429 - .4byte 0x0A004D65 - .4byte 0x74726F54 - .4byte 0x524B203A - .4byte 0x20496E76 - .4byte 0x616C6964 - .4byte 0x20686172 - .4byte 0x64776172 - .4byte 0x65204944 - .4byte 0x20706173 - .4byte 0x73656420 - .4byte 0x66726F6D - .4byte 0x204F530A - .4byte 0x004D6574 - .4byte 0x726F5452 - .4byte 0x4B203A20 - .4byte 0x44656661 - .4byte 0x756C7469 - .4byte 0x6E672074 - .4byte 0x6F204744 - .4byte 0x45562048 - .4byte 0x61726477 - .4byte 0x6172650A - .4byte 0x0025730A - .4byte 0 - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_804970f8.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_804970f8.s deleted file mode 100644 index ce14ef26..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_804970f8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global gDBCommTable -gDBCommTable: - .skip 0x28 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055c740.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055c740.s deleted file mode 100644 index 93adc59b..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055c740.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global TRK_Use_BBA -TRK_Use_BBA: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055e4c0.s b/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055e4c0.s deleted file mode 100644 index e1ef4672..00000000 --- a/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055e4c0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global EndofProgramInstruction$631 -EndofProgramInstruction$631: - - .4byte 0x00454E44 - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/flush_cache_80015530.s b/asm/TRK_Hollywood_Revolution/flush_cache.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/flush_cache_80015530.s rename to asm/TRK_Hollywood_Revolution/flush_cache.s diff --git a/asm/TRK_Hollywood_Revolution/main_TRK_80015568.s b/asm/TRK_Hollywood_Revolution/main_TRK.s similarity index 87% rename from asm/TRK_Hollywood_Revolution/main_TRK_80015568.s rename to asm/TRK_Hollywood_Revolution/main_TRK.s index 74838491..94d55ddc 100644 --- a/asm/TRK_Hollywood_Revolution/main_TRK_80015568.s +++ b/asm/TRK_Hollywood_Revolution/main_TRK.s @@ -20,3 +20,9 @@ lbl_8001558C: /* 80015598 000113D8 7C 08 03 A6 */ mtlr r0 /* 8001559C 000113DC 38 21 00 10 */ addi r1, r1, 0x10 /* 800155A0 000113E0 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global TRK_mainError +TRK_mainError: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/main_TRK_8055c730.s b/asm/TRK_Hollywood_Revolution/main_TRK_8055c730.s deleted file mode 100644 index 58714cea..00000000 --- a/asm/TRK_Hollywood_Revolution/main_TRK_8055c730.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global TRK_mainError -TRK_mainError: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/mainloop_800155a4.s b/asm/TRK_Hollywood_Revolution/mainloop.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/mainloop_800155a4.s rename to asm/TRK_Hollywood_Revolution/mainloop.s diff --git a/asm/TRK_Hollywood_Revolution/mem_TRK_80015690.s b/asm/TRK_Hollywood_Revolution/mem_TRK.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/mem_TRK_80015690.s rename to asm/TRK_Hollywood_Revolution/mem_TRK.s diff --git a/asm/TRK_Hollywood_Revolution/mpc_7xx_603e_80016bdc.s b/asm/TRK_Hollywood_Revolution/mpc_7xx_603e.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/mpc_7xx_603e_80016bdc.s rename to asm/TRK_Hollywood_Revolution/mpc_7xx_603e.s diff --git a/asm/TRK_Hollywood_Revolution/msg_80016f04.s b/asm/TRK_Hollywood_Revolution/msg.s similarity index 76% rename from asm/TRK_Hollywood_Revolution/msg_80016f04.s rename to asm/TRK_Hollywood_Revolution/msg.s index 0c36fceb..da901e74 100644 --- a/asm/TRK_Hollywood_Revolution/msg_80016f04.s +++ b/asm/TRK_Hollywood_Revolution/msg.s @@ -32,3 +32,25 @@ lbl_80016F54: /* 80016F5C 00012D9C 7C 08 03 A6 */ mtlr r0 /* 80016F60 00012DA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80016F64 00012DA4 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421CD8" +"@stringBase0_80421CD8": + + .4byte 0x4D657472 + .4byte 0x6F54524B + .4byte 0x202D2054 + .4byte 0x524B5F57 + .4byte 0x72697465 + .4byte 0x55415254 + .4byte 0x4E207265 + .4byte 0x7475726E + .4byte 0x65642025 + .4byte 0x6C640A00 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gPacketSeq +gPacketSeq: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/msg_80421cd8.s b/asm/TRK_Hollywood_Revolution/msg_80421cd8.s deleted file mode 100644 index 1684a019..00000000 --- a/asm/TRK_Hollywood_Revolution/msg_80421cd8.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421CD8" -"@stringBase0_80421CD8": - - .4byte 0x4D657472 - .4byte 0x6F54524B - .4byte 0x202D2054 - .4byte 0x524B5F57 - .4byte 0x72697465 - .4byte 0x55415254 - .4byte 0x4E207265 - .4byte 0x7475726E - .4byte 0x65642025 - .4byte 0x6C640A00 diff --git a/asm/TRK_Hollywood_Revolution/msg_8055c758.s b/asm/TRK_Hollywood_Revolution/msg_8055c758.s deleted file mode 100644 index 1aedb8f9..00000000 --- a/asm/TRK_Hollywood_Revolution/msg_8055c758.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gPacketSeq -gPacketSeq: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/msgbuf_80016f68.s b/asm/TRK_Hollywood_Revolution/msgbuf.s similarity index 98% rename from asm/TRK_Hollywood_Revolution/msgbuf_80016f68.s rename to asm/TRK_Hollywood_Revolution/msgbuf.s index 729daeaf..2baa7819 100644 --- a/asm/TRK_Hollywood_Revolution/msgbuf_80016f68.s +++ b/asm/TRK_Hollywood_Revolution/msgbuf.s @@ -652,3 +652,25 @@ lbl_8001775C: /* 80017768 000135A8 7C 08 03 A6 */ mtlr r0 /* 8001776C 000135AC 38 21 00 30 */ addi r1, r1, 0x30 /* 80017770 000135B0 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421D00" +"@stringBase0_80421D00": + + .4byte 0x4D657472 + .4byte 0x6F54524B + .4byte 0x202D2045 + .4byte 0x52524F52 + .4byte 0x203A204E + .4byte 0x6F206275 + .4byte 0x66666572 + .4byte 0x20617661 + .4byte 0x696C6162 + .4byte 0x6C650A00 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global gTRKMsgBufs +gTRKMsgBufs: + .skip 0x19A8 diff --git a/asm/TRK_Hollywood_Revolution/msgbuf_80421d00.s b/asm/TRK_Hollywood_Revolution/msgbuf_80421d00.s deleted file mode 100644 index a5537253..00000000 --- a/asm/TRK_Hollywood_Revolution/msgbuf_80421d00.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421D00" -"@stringBase0_80421D00": - - .4byte 0x4D657472 - .4byte 0x6F54524B - .4byte 0x202D2045 - .4byte 0x52524F52 - .4byte 0x203A204E - .4byte 0x6F206275 - .4byte 0x66666572 - .4byte 0x20617661 - .4byte 0x696C6162 - .4byte 0x6C650A00 diff --git a/asm/TRK_Hollywood_Revolution/msgbuf_80497148.s b/asm/TRK_Hollywood_Revolution/msgbuf_80497148.s deleted file mode 100644 index 305d295b..00000000 --- a/asm/TRK_Hollywood_Revolution/msgbuf_80497148.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global gTRKMsgBufs -gTRKMsgBufs: - .skip 0x19A8 diff --git a/asm/TRK_Hollywood_Revolution/msghndlr_80017774.s b/asm/TRK_Hollywood_Revolution/msghndlr.s similarity index 98% rename from asm/TRK_Hollywood_Revolution/msghndlr_80017774.s rename to asm/TRK_Hollywood_Revolution/msghndlr.s index 3c367b14..08e32b5a 100644 --- a/asm/TRK_Hollywood_Revolution/msghndlr_80017774.s +++ b/asm/TRK_Hollywood_Revolution/msghndlr.s @@ -1198,3 +1198,53 @@ lbl_80018694: /* 800186EC 0001452C 7C 08 03 A6 */ mtlr r0 /* 800186F0 00014530 38 21 00 50 */ addi r1, r1, 0x50 /* 800186F4 00014534 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@781_80421D28" +"@781_80421D28": + + .4byte lbl_80017AE4 + .4byte lbl_80017B04 + .4byte lbl_80017ADC + .4byte lbl_80017B04 + .4byte lbl_80017AEC + .4byte lbl_80017AF4 + .4byte lbl_80017AFC + +.global "@826_80421D44" +"@826_80421D44": + + .4byte lbl_80017CF4 + .4byte lbl_80017D14 + .4byte lbl_80017CEC + .4byte lbl_80017D14 + .4byte lbl_80017CFC + .4byte lbl_80017D04 + .4byte lbl_80017D0C + +.global "@stringBase0_80421D60" +"@stringBase0_80421D60": + + .4byte 0x0A4D6574 + .4byte 0x726F5452 + .4byte 0x4B204F70 + .4byte 0x74696F6E + .4byte 0x203A2053 + .4byte 0x65726961 + .4byte 0x6C494F20 + .4byte 0x2D200045 + .4byte 0x6E61626C + .4byte 0x650A0044 + .4byte 0x69736162 + .4byte 0x6C650A00 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global g_CurrentSequence +g_CurrentSequence: + .skip 0x4 + +.global IsTRKConnected +IsTRKConnected: + .skip 0x4 diff --git a/asm/TRK_Hollywood_Revolution/msghndlr_80421d28.s b/asm/TRK_Hollywood_Revolution/msghndlr_80421d28.s deleted file mode 100644 index 1fb23095..00000000 --- a/asm/TRK_Hollywood_Revolution/msghndlr_80421d28.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@781_80421D28" -"@781_80421D28": - - .4byte lbl_80017AE4 - .4byte lbl_80017B04 - .4byte lbl_80017ADC - .4byte lbl_80017B04 - .4byte lbl_80017AEC - .4byte lbl_80017AF4 - .4byte lbl_80017AFC - -.global "@826_80421D44" -"@826_80421D44": - - .4byte lbl_80017CF4 - .4byte lbl_80017D14 - .4byte lbl_80017CEC - .4byte lbl_80017D14 - .4byte lbl_80017CFC - .4byte lbl_80017D04 - .4byte lbl_80017D0C - -.global "@stringBase0_80421D60" -"@stringBase0_80421D60": - - .4byte 0x0A4D6574 - .4byte 0x726F5452 - .4byte 0x4B204F70 - .4byte 0x74696F6E - .4byte 0x203A2053 - .4byte 0x65726961 - .4byte 0x6C494F20 - .4byte 0x2D200045 - .4byte 0x6E61626C - .4byte 0x650A0044 - .4byte 0x69736162 - .4byte 0x6C650A00 diff --git a/asm/TRK_Hollywood_Revolution/msghndlr_8055c760.s b/asm/TRK_Hollywood_Revolution/msghndlr_8055c760.s deleted file mode 100644 index ab0238db..00000000 --- a/asm/TRK_Hollywood_Revolution/msghndlr_8055c760.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global g_CurrentSequence -g_CurrentSequence: - .skip 0x4 - -.global IsTRKConnected -IsTRKConnected: - .skip 0x4 diff --git a/asm/TRK_Hollywood_Revolution/mslsupp_800186f8.s b/asm/TRK_Hollywood_Revolution/mslsupp.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/mslsupp_800186f8.s rename to asm/TRK_Hollywood_Revolution/mslsupp.s diff --git a/asm/TRK_Hollywood_Revolution/notify_800160d0.s b/asm/TRK_Hollywood_Revolution/notify.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/notify_800160d0.s rename to asm/TRK_Hollywood_Revolution/notify.s diff --git a/asm/TRK_Hollywood_Revolution/nubevent_80016160.s b/asm/TRK_Hollywood_Revolution/nubevent.s similarity index 93% rename from asm/TRK_Hollywood_Revolution/nubevent_80016160.s rename to asm/TRK_Hollywood_Revolution/nubevent.s index f76743e6..e1a7864f 100644 --- a/asm/TRK_Hollywood_Revolution/nubevent_80016160.s +++ b/asm/TRK_Hollywood_Revolution/nubevent.s @@ -124,3 +124,23 @@ TRKConstructEvent: TRKDestructEvent: /* 800162F4 00012134 80 63 00 08 */ lwz r3, 0x8(r3) /* 800162F8 00012138 48 00 0D 50 */ b TRK_ReleaseBuffer +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421C50" +"@stringBase0_80421C50": + + .4byte 0x4D657472 + .4byte 0x6F54524B + .4byte 0x202D2045 + .4byte 0x76656E74 + .4byte 0x20517565 + .4byte 0x75652066 + .4byte 0x756C6C0A + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global gTRKEventQueue +gTRKEventQueue: + .skip 0x28 diff --git a/asm/TRK_Hollywood_Revolution/nubevent_80421c50.s b/asm/TRK_Hollywood_Revolution/nubevent_80421c50.s deleted file mode 100644 index cde855f2..00000000 --- a/asm/TRK_Hollywood_Revolution/nubevent_80421c50.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421C50" -"@stringBase0_80421C50": - - .4byte 0x4D657472 - .4byte 0x6F54524B - .4byte 0x202D2045 - .4byte 0x76656E74 - .4byte 0x20517565 - .4byte 0x75652066 - .4byte 0x756C6C0A - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/nubevent_80497120.s b/asm/TRK_Hollywood_Revolution/nubevent_80497120.s deleted file mode 100644 index 01847c23..00000000 --- a/asm/TRK_Hollywood_Revolution/nubevent_80497120.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global gTRKEventQueue -gTRKEventQueue: - .skip 0x28 diff --git a/asm/TRK_Hollywood_Revolution/nubinit_800162fc.s b/asm/TRK_Hollywood_Revolution/nubinit.s similarity index 92% rename from asm/TRK_Hollywood_Revolution/nubinit_800162fc.s rename to asm/TRK_Hollywood_Revolution/nubinit.s index 521090a1..f6586d67 100644 --- a/asm/TRK_Hollywood_Revolution/nubinit_800162fc.s +++ b/asm/TRK_Hollywood_Revolution/nubinit.s @@ -109,3 +109,23 @@ lbl_80016434: lbl_80016444: /* 80016444 00012284 38 21 00 10 */ addi r1, r1, 0x10 /* 80016448 00012288 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421C70" +"@stringBase0_80421C70": + + .4byte 0x4D657472 + .4byte 0x6F54524B + .4byte 0x20666F72 + .4byte 0x20526576 + .4byte 0x6F6C7574 + .4byte 0x696F6E20 + .4byte 0x76302E34 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gTRKBigEndian +gTRKBigEndian: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/nubinit_80421c70.s b/asm/TRK_Hollywood_Revolution/nubinit_80421c70.s deleted file mode 100644 index 2fbc7250..00000000 --- a/asm/TRK_Hollywood_Revolution/nubinit_80421c70.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421C70" -"@stringBase0_80421C70": - - .4byte 0x4D657472 - .4byte 0x6F54524B - .4byte 0x20666F72 - .4byte 0x20526576 - .4byte 0x6F6C7574 - .4byte 0x696F6E20 - .4byte 0x76302E34 - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/nubinit_8055c748.s b/asm/TRK_Hollywood_Revolution/nubinit_8055c748.s deleted file mode 100644 index 5b80a211..00000000 --- a/asm/TRK_Hollywood_Revolution/nubinit_8055c748.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gTRKBigEndian -gTRKBigEndian: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/serpoll_8001644c.s b/asm/TRK_Hollywood_Revolution/serpoll.s similarity index 96% rename from asm/TRK_Hollywood_Revolution/serpoll_8001644c.s rename to asm/TRK_Hollywood_Revolution/serpoll.s index 33f5267a..e2dfbf83 100644 --- a/asm/TRK_Hollywood_Revolution/serpoll_8001644c.s +++ b/asm/TRK_Hollywood_Revolution/serpoll.s @@ -97,3 +97,9 @@ TRKProcessInput: /* 80016578 000123B8 7C 08 03 A6 */ mtlr r0 /* 8001657C 000123BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80016580 000123C0 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gTRKInputPendingPtr +gTRKInputPendingPtr: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/serpoll_8055c750.s b/asm/TRK_Hollywood_Revolution/serpoll_8055c750.s deleted file mode 100644 index ac03e31d..00000000 --- a/asm/TRK_Hollywood_Revolution/serpoll_8055c750.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gTRKInputPendingPtr -gTRKInputPendingPtr: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/support_80016584.s b/asm/TRK_Hollywood_Revolution/support.s similarity index 97% rename from asm/TRK_Hollywood_Revolution/support_80016584.s rename to asm/TRK_Hollywood_Revolution/support.s index 8bcc6ccc..336c1028 100644 --- a/asm/TRK_Hollywood_Revolution/support_80016584.s +++ b/asm/TRK_Hollywood_Revolution/support.s @@ -472,3 +472,27 @@ lbl_80016B7C: /* 80016B9C 000129DC 7C 08 03 A6 */ mtlr r0 /* 80016BA0 000129E0 38 21 00 70 */ addi r1, r1, 0x70 /* 80016BA4 000129E4 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@stringBase0_80421C90" +"@stringBase0_80421C90": + + .4byte 0x4D657472 + .4byte 0x6F54524B + .4byte 0x202D2062 + .4byte 0x61642072 + .4byte 0x65706C79 + .4byte 0x2073697A + .4byte 0x6520256C + .4byte 0x640A004D + .4byte 0x6574726F + .4byte 0x54524B20 + .4byte 0x2D206661 + .4byte 0x696C6564 + .4byte 0x20696E20 + .4byte 0x52657175 + .4byte 0x65737453 + .4byte 0x656E640A + .4byte 0 + .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/support_80421c90.s b/asm/TRK_Hollywood_Revolution/support_80421c90.s deleted file mode 100644 index 039eafda..00000000 --- a/asm/TRK_Hollywood_Revolution/support_80421c90.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@stringBase0_80421C90" -"@stringBase0_80421C90": - - .4byte 0x4D657472 - .4byte 0x6F54524B - .4byte 0x202D2062 - .4byte 0x61642072 - .4byte 0x65706C79 - .4byte 0x2073697A - .4byte 0x6520256C - .4byte 0x640A004D - .4byte 0x6574726F - .4byte 0x54524B20 - .4byte 0x2D206661 - .4byte 0x696C6564 - .4byte 0x20696E20 - .4byte 0x52657175 - .4byte 0x65737453 - .4byte 0x656E640A - .4byte 0 - .4byte 0 diff --git a/asm/TRK_Hollywood_Revolution/targcont_80016ba8.s b/asm/TRK_Hollywood_Revolution/targcont.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/targcont_80016ba8.s rename to asm/TRK_Hollywood_Revolution/targcont.s diff --git a/asm/TRK_Hollywood_Revolution/target_options_8001a098.s b/asm/TRK_Hollywood_Revolution/target_options.s similarity index 78% rename from asm/TRK_Hollywood_Revolution/target_options_8001a098.s rename to asm/TRK_Hollywood_Revolution/target_options.s index 271deaca..04a42f82 100644 --- a/asm/TRK_Hollywood_Revolution/target_options_8001a098.s +++ b/asm/TRK_Hollywood_Revolution/target_options.s @@ -11,3 +11,9 @@ GetUseSerialIO: /* 8001A0A4 00015EE4 4E 80 00 20 */ blr /* 8001A0A8 00015EE8 00 00 00 00 */ .4byte 0x00000000 /* 8001A0AC 00015EEC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global bUseSerialIO +bUseSerialIO: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/target_options_8055c770.s b/asm/TRK_Hollywood_Revolution/target_options_8055c770.s deleted file mode 100644 index 76af0af6..00000000 --- a/asm/TRK_Hollywood_Revolution/target_options_8055c770.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global bUseSerialIO -bUseSerialIO: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/targimpl_80018884.s b/asm/TRK_Hollywood_Revolution/targimpl.s similarity index 98% rename from asm/TRK_Hollywood_Revolution/targimpl_80018884.s rename to asm/TRK_Hollywood_Revolution/targimpl.s index eee1e007..0d84815d 100644 --- a/asm/TRK_Hollywood_Revolution/targimpl_80018884.s +++ b/asm/TRK_Hollywood_Revolution/targimpl.s @@ -1803,3 +1803,97 @@ lbl_8001A088: lbl_8001A090: /* 8001A090 00015ED0 90 C3 00 00 */ stw r6, 0x0(r3) /* 8001A094 00015ED4 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global gTRKMemMap +gTRKMemMap: + + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0x00000001 + +.global "@984" +"@984": + + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + +.global "@999" +"@999": + + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + +.global "@1022" +"@1022": + + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global gTRKExceptionStatus +gTRKExceptionStatus: + + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global gTRKRestoreFlags +gTRKRestoreFlags: + .skip 0x10 + +.global gTRKStepStatus +gTRKStepStatus: + .skip 0x18 + +.global gTRKSaveState +gTRKSaveState: + .skip 0x98 + +.global TRKvalue128_temp +TRKvalue128_temp: + .skip 0x10 + +.global gTRKState +gTRKState: + .skip 0xA8 + +.global gTRKCPUState +gTRKCPUState: + .skip 0x438 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global TRK_saved_exceptionID +TRK_saved_exceptionID: + .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/targimpl_80407778.s b/asm/TRK_Hollywood_Revolution/targimpl_80407778.s deleted file mode 100644 index 86430cdf..00000000 --- a/asm/TRK_Hollywood_Revolution/targimpl_80407778.s +++ /dev/null @@ -1,52 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global gTRKMemMap -gTRKMemMap: - - .4byte 0 - .4byte 0xFFFFFFFF - .4byte 0x00000001 - .4byte 0x00000001 - -.global "@984" -"@984": - - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - -.global "@999" -"@999": - - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - -.global "@1022" -"@1022": - - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 - .4byte 0x60000000 diff --git a/asm/TRK_Hollywood_Revolution/targimpl_80421d90.s b/asm/TRK_Hollywood_Revolution/targimpl_80421d90.s deleted file mode 100644 index 0cb68961..00000000 --- a/asm/TRK_Hollywood_Revolution/targimpl_80421d90.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global gTRKExceptionStatus -gTRKExceptionStatus: - - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01000000 diff --git a/asm/TRK_Hollywood_Revolution/targimpl_80498af0.s b/asm/TRK_Hollywood_Revolution/targimpl_80498af0.s deleted file mode 100644 index e2d2d6bf..00000000 --- a/asm/TRK_Hollywood_Revolution/targimpl_80498af0.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global gTRKRestoreFlags -gTRKRestoreFlags: - .skip 0x10 - -.global gTRKStepStatus -gTRKStepStatus: - .skip 0x18 - -.global gTRKSaveState -gTRKSaveState: - .skip 0x98 - -.global TRKvalue128_temp -TRKvalue128_temp: - .skip 0x10 - -.global gTRKState -gTRKState: - .skip 0xA8 - -.global gTRKCPUState -gTRKCPUState: - .skip 0x438 diff --git a/asm/TRK_Hollywood_Revolution/targimpl_8055c768.s b/asm/TRK_Hollywood_Revolution/targimpl_8055c768.s deleted file mode 100644 index 0e285f65..00000000 --- a/asm/TRK_Hollywood_Revolution/targimpl_8055c768.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global TRK_saved_exceptionID -TRK_saved_exceptionID: - .skip 0x8 diff --git a/asm/TRK_Hollywood_Revolution/targsupp_80015034.s b/asm/TRK_Hollywood_Revolution/targsupp.s similarity index 100% rename from asm/TRK_Hollywood_Revolution/targsupp_80015034.s rename to asm/TRK_Hollywood_Revolution/targsupp.s diff --git a/obj_files.mk b/obj_files.mk index 51b5b320..b7a56e1d 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -81,35 +81,36 @@ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/ios.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/locale.o \ $(BUILD_DIR)/asm/MSL_C++.PPCEABI.bare.H/msl_thread.o \ \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/__exception_80004380.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/__exception.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targsupp.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/custconn/cc_gdev.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/custconn/MWCriticalSection_gc.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/custconn/CircleBuffer.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/flush_cache.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/main_TRK.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mainloop.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mem_TRK.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dispatch.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/notify.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubevent.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubinit.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/serpoll.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/support.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targcont.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mpc_7xx_603e.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msg.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msgbuf.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msghndlr.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mslsupp.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl.o \ +$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/target_options.o \ +\ $(BUILD_DIR)/asm/os/__start_800062c0.o \ $(BUILD_DIR)/asm/os/__ppc_eabi_init_80006620.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targsupp_80015034.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/cc_gdev_80015054.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/MWCriticalSection_gc_800152c4.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/CircleBuffer_800152fc.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/flush_cache_80015530.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/main_TRK_80015568.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mainloop_800155a4.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mem_TRK_80015690.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dispatch_800158f4.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_80015a14.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80015d38.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/notify_800160d0.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubevent_80016160.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubinit_800162fc.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/serpoll_8001644c.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/support_80016584.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targcont_80016ba8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mpc_7xx_603e_80016bdc.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msg_80016f04.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msgbuf_80016f68.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msghndlr_80017774.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mslsupp_800186f8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_80018884.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/target_options_8001a098.o \ $(BUILD_DIR)/asm/base/PPCArch_8001a0b0.o \ $(BUILD_DIR)/asm/os/OS_8001a2c0.o \ $(BUILD_DIR)/asm/os/OSAlarm_8001b7a0.o \ @@ -2983,7 +2984,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_80407778.o \ $(BUILD_DIR)/asm/os/OSCrc_80407800.o \ $(BUILD_DIR)/asm/mtx/quat_80407840.o \ $(BUILD_DIR)/asm/dvd/dvdFatal_80407850.o \ @@ -3218,16 +3218,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dispatch_80421ab8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_80421b28.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_80421b68.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubevent_80421c50.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubinit_80421c70.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/support_80421c90.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msg_80421cd8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msgbuf_80421d00.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msghndlr_80421d28.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_80421d90.o \ $(BUILD_DIR)/asm/base/PPCArch_80421da0.o \ $(BUILD_DIR)/asm/os/OS_80421dd8.o \ $(BUILD_DIR)/asm/os/OSAlarm_804221e8.o \ @@ -5068,11 +5058,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/cc_gdev_80496bd8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_804970f8.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubevent_80497120.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msgbuf_80497148.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_80498af0.o \ $(BUILD_DIR)/asm/os/OS_804990a0.o \ $(BUILD_DIR)/asm/os/OSError_80499110.o \ $(BUILD_DIR)/asm/os/OSExec_80499160.o \ @@ -5699,16 +5684,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/cc_gdev_8055c728.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/main_TRK_8055c730.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_8055c738.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055c740.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/nubinit_8055c748.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/serpoll_8055c750.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msg_8055c758.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/msghndlr_8055c760.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl_8055c768.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/target_options_8055c770.o \ $(BUILD_DIR)/asm/os/OS_8055c778.o \ $(BUILD_DIR)/asm/os/OSAlarm_8055c7c0.o \ $(BUILD_DIR)/asm/os/OSAlloc_8055c7c8.o \ @@ -5961,7 +5936,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \ -$(BUILD_DIR)/asm/TRK_Hollywood_Revolution/dolphin_trk_glue_8055e4c0.o \ $(BUILD_DIR)/asm/os/OS_8055e4c8.o \ $(BUILD_DIR)/asm/os/OSFatal_8055e4d0.o \ $(BUILD_DIR)/asm/os/OSFont_8055e510.o \