diff --git a/asm/assets/assets.s b/asm/assets/assets.s index 73a29400..8a166819 100755 --- a/asm/assets/assets.s +++ b/asm/assets/assets.s @@ -1,6 +1,5 @@ # This file was generated by generate_ld.py -.include "globals.inc" .include "macros.inc" .word 50 # Number of asset sections diff --git a/asm/assets/ucode_data.s b/asm/assets/ucode_data.s index 82e263dd..d3cd9401 100644 --- a/asm/assets/ucode_data.s +++ b/asm/assets/ucode_data.s @@ -1,6 +1,5 @@ # This file was generated by generate_ld.py -.include "globals.inc" .include "macros.inc" glabel rspUnknownDataStart diff --git a/asm/assets/ucode_text.s b/asm/assets/ucode_text.s index 4480ce61..945a6928 100644 --- a/asm/assets/ucode_text.s +++ b/asm/assets/ucode_text.s @@ -1,6 +1,5 @@ # This file was generated by generate_ld.py -.include "globals.inc" .include "macros.inc" glabel rspUnknownStart diff --git a/asm/entrypoint.s b/asm/entrypoint.s index ebe6ff30..a394c0a0 100644 --- a/asm/entrypoint.s +++ b/asm/entrypoint.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80000400 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/asm/gzip.s b/asm/gzip.s index 37fdcebb..9c87adbb 100644 --- a/asm/gzip.s +++ b/asm/gzip.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800C68C0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/asm/unknown_0251F0.s b/asm/unknown_0251F0.s index 297976ec..08d71085 100644 --- a/asm/unknown_0251F0.s +++ b/asm/unknown_0251F0.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800245F0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/asm/unknown_031D30.s b/asm/unknown_031D30.s index 33bfd6b9..5e1229be 100644 --- a/asm/unknown_031D30.s +++ b/asm/unknown_031D30.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80031130 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/asm/unknown_062930.s b/asm/unknown_062930.s index bd59e96e..5fb9a69a 100644 --- a/asm/unknown_062930.s +++ b/asm/unknown_062930.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80061D30 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 845310e2..174754cc 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -3,7 +3,6 @@ .section .text -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/globals.inc b/globals.inc deleted file mode 100755 index 5b467698..00000000 --- a/globals.inc +++ /dev/null @@ -1,78 +0,0 @@ -# globally accessible functions and data -# these will be accessible by C code and show up in the .map file - -.global EntryPoint -.global musicVolumeSliderPercentage -.global sfxVolumeSliderPercentage -.global MenuInit -.global MenuLoop -.global DrawMenuText -.global MenuLogosScreenInit -.global MenuLogoScreenLoop -.global MenuTitleScreenInit -.global MenuTitleScreenLoop -.global MenuOptionsInit -.global MenuOptionsLoop -.global MenuAudioOptionsInit -.global MenuAudioOptionsLoop -.global MenuSaveOptionsInit -.global MenuSaveOptionsLoop -.global MenuMagicCodesInit -.global MenuMagicCodesLoop -.global MenuMagicCodesListInit -.global MenuMagicCodesListLoop -.global MenuCharacterSelectInit -.global MenuCharacterSelectLoop -.global MenuGameSelectInit -.global MenuGameSelectLoop -.global MenuFileSelectInit -.global MenuFileSelectLoop -.global MenuTrackSelectInit -.global MenuTrackSelectLoop -.global MenuLoadNewAreaInit -.global MenuLoadNewAreaLoop -.global Menu11Init -.global Menu11Loop -.global MenuTrophyRaceRoundInit -.global MenuTrophyRaceRoundLoop -.global MenuTrophyRaceRankingsInit -.global MenuTrophyRaceRankingsLoop -.global Menu17Init -.global Menu17Loop -.global MenuGhostDataInit -.global MenuGhostDataLoop -.global MenuCreditsInit -.global MenuCreditsLoop -.global MenuBootInit -.global MenuBootLoop -.global MenuCautionInit -.global MenuCautionLoop -.global osCreateThread -.global osRecvMesg -.global osCreateMesgQueue -.global osStartThread -.global sqrtf -.global bcopy -.global osSetEventMsg -.global osSetTime -.global memcpy -.global strlen -.global strchr -.global osEepromRead -.global osEepromWrite -.global __ull_rshift -.global __ull_rem -.global __ull_div -.global __ll_lshift -.global __ll_div -.global __ll_mul -.global __ull_divremi -.global osViSetEventMsg -.global __osDisableInt -.global __osRestoreInt -.global __osEnqueueAndYield -.global __osPopThread -.global cosf -.global sinf -.global setupOSTasks - diff --git a/lib/asm/__osGetSR.s b/lib/asm/__osGetSR.s index 9abea28b..0523c887 100644 --- a/lib/asm/__osGetSR.s +++ b/lib/asm/__osGetSR.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D4570 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/__osProbeTLB.s b/lib/asm/__osProbeTLB.s index 3e3e9539..a461a278 100644 --- a/lib/asm/__osProbeTLB.s +++ b/lib/asm/__osProbeTLB.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D35B0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/__osSetFpcCsr.s b/lib/asm/__osSetFpcCsr.s index 35101507..5e6b0d44 100644 --- a/lib/asm/__osSetFpcCsr.s +++ b/lib/asm/__osSetFpcCsr.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D4580 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/__osSetSR.s b/lib/asm/__osSetSR.s index d252f9d4..86e40a66 100644 --- a/lib/asm/__osSetSR.s +++ b/lib/asm/__osSetSR.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D4560 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/bcopy.s b/lib/asm/bcopy.s index bfdd7f35..0ede373b 100644 --- a/lib/asm/bcopy.s +++ b/lib/asm/bcopy.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800C9DA0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/exception.s b/lib/asm/exception.s index 7d673408..c3b4b52d 100644 --- a/lib/asm/exception.s +++ b/lib/asm/exception.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D2CB0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/osInvalICache.s b/lib/asm/osInvalICache.s index 4e23d32e..8954b15a 100644 --- a/lib/asm/osInvalICache.s +++ b/lib/asm/osInvalICache.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D46B0 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/osMapTLBRdb.s b/lib/asm/osMapTLBRdb.s index 14874513..f0455e8e 100644 --- a/lib/asm/osMapTLBRdb.s +++ b/lib/asm/osMapTLBRdb.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D4730 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/lib/asm/osWritebackDCache.s b/lib/asm/osWritebackDCache.s index 5b9a25fc..942c6de5 100644 --- a/lib/asm/osWritebackDCache.s +++ b/lib/asm/osWritebackDCache.s @@ -1,7 +1,6 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800D4630 */ -.include "globals.inc" .include "macros.inc" .set noat # allow manual use of $at diff --git a/tools/asm_processor/prelude.inc b/tools/asm_processor/prelude.inc index 173701a2..4ac5fd3d 100755 --- a/tools/asm_processor/prelude.inc +++ b/tools/asm_processor/prelude.inc @@ -1,4 +1,3 @@ -.include "globals.inc" .include "macros.inc" # assembler directives diff --git a/tools/python/generate_assets.py b/tools/python/generate_assets.py index 0c8e1f56..df9abd42 100644 --- a/tools/python/generate_assets.py +++ b/tools/python/generate_assets.py @@ -23,7 +23,7 @@ class GenerateAssets: assets = assetsJSON['assets'] assetsTextFinal = '# This file was generated by generate_ld.py\n\n' - assetsTextFinal += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsTextFinal += '.include "macros.inc"\n\n' assetsText = 'glabel ASSETS_START\n\n' @@ -108,7 +108,7 @@ class GenerateAssets: # TODO: Will probably need to refactor this later. def generate_ucode_files(self): assetsUCodeText = '# This file was generated by generate_ld.py\n\n' - assetsUCodeText += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeText += '.include "macros.inc"\n\n' assetsUCodeText += self.generate_ucode_file('rspUnknownStart', 'ucode/ucode_unknown.bin') assetsUCodeText += self.generate_ucode_file('rspF3DDKRBootStart', 'ucode/ucode_boot.bin') assetsUCodeText += self.generate_ucode_file('rspF3DDKRDramStart', 'ucode/ucode_f3ddkr_dram.bin') @@ -119,7 +119,7 @@ class GenerateAssets: assetsFile.write(assetsUCodeText) assetsUCodeData = '# This file was generated by generate_ld.py\n\n' - assetsUCodeData += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeData += '.include "macros.inc"\n\n' assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin') assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataDramStart', 'ucode/data_f3ddkr_dram.bin') assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataFifoStart', 'ucode/data_f3ddkr_fifo.bin')