From 0366bf315b1832d205cae960973b3039d781048a Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Mon, 1 Apr 2024 17:32:21 -0300 Subject: [PATCH] remove includes for bss reordering that are no longer needed. --- .vscode/settings.json | 3 ++- src/main/fox_360.c | 1 - src/main/fox_97F80.c | 1 - src/main/fox_bg.c | 1 - src/main/fox_display.c | 1 - src/main/fox_edisplay.c | 13 ++++++------- src/main/fox_enmy.c | 1 - src/main/fox_hud.c | 23 ++++------------------- src/main/fox_play.c | 1 - src/main/fox_versus.c | 2 -- src/main/sys_math.c | 1 - src/main/sys_memory.c | 1 - src/overlays/ovl_ending/fox_end1.c | 1 - src/overlays/ovl_i1/fox_ve1.c | 1 - src/overlays/ovl_i3/fox_aq.c | 1 - src/overlays/ovl_i3/fox_so.c | 1 - src/overlays/ovl_i3/fox_zo.c | 1 - src/overlays/ovl_i4/fox_bo.c | 2 -- src/overlays/ovl_i4/fox_ka.c | 1 - src/overlays/ovl_i5/fox_ground.c | 1 - src/overlays/ovl_i5/fox_ma.c | 2 -- src/overlays/ovl_i5/fox_ti.c | 1 - src/overlays/ovl_i6/fox_andross.c | 1 - src/overlays/ovl_menu/fox_map.c | 1 - src/overlays/ovl_menu/fox_option.c | 1 - 25 files changed, 12 insertions(+), 52 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bbadaec6..b0a698fa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -125,7 +125,8 @@ "ast_zoness.h": "c", "ast_solar.h": "c", "ast_ve1_boss.h": "c", - "ast_arwing.h": "c" + "ast_arwing.h": "c", + "ast_ending_award_back.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/src/main/fox_360.c b/src/main/fox_360.c index e4d951ff..92589a6d 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_katina.h" #include "assets/ast_venom_2.h" diff --git a/src/main/fox_97F80.c b/src/main/fox_97F80.c index e2687b35..196eceb7 100644 --- a/src/main/fox_97F80.c +++ b/src/main/fox_97F80.c @@ -1,5 +1,4 @@ #include "global.h" -#include "prevent_bss_reordering.h" f32 __dx1; f32 __dx2; diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index b685aa15..b60bd69f 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -1,5 +1,4 @@ #include "global.h" -#include "prevent_bss_reordering.h" extern f32 D_i3_801C4188; diff --git a/src/main/fox_display.c b/src/main/fox_display.c index a2e7eb24..9b72b43a 100644 --- a/src/main/fox_display.c +++ b/src/main/fox_display.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" s16 D_80161410; diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 84b9c2a1..a25e6293 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -1,12 +1,5 @@ #include "global.h" -#include "prevent_bss_reordering.h" -Vec3f D_801615D0; -Vec3f D_801615E0; -s32 D_801615EC; -Matrix D_801615F0; -WingInfo D_80161630; - #include "fox_edisplay_assets.h" #include "assets/ast_katina.h" #include "assets/ast_venom_2.h" @@ -27,6 +20,12 @@ WingInfo D_80161630; #include "assets/ast_ve1_boss.h" #include "assets/ast_zoness.h" +Vec3f D_801615D0; +Vec3f D_801615E0; +s32 D_801615EC; +Matrix D_801615F0; +WingInfo D_80161630; + char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; void func_800596C0(void) { diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index a8dbcc03..f28ed725 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_corneria.h" #include "assets/ast_sector_x.h" diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index cadea344..e380d1e7 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -1,11 +1,4 @@ -// #include "prevent_bss_reordering.h" #include "sf64math.h" -// BSS section range: -// D_801616A0 <==> D_80161910 - -// BSS SECTION START - -// placed before global.h for reordering reasons typedef struct { /* 0x00 */ u8* unk_00; @@ -27,17 +20,16 @@ s32 D_80161704; s32 D_80161708; s32 D_8016170C; s32 D_80161710; -s32 gTotalHits; // 0x80161714 +s32 gTotalHits; s32 D_80161718; s32 D_8016171C; f32 D_80161720[3]; s32 D_8016172C; s32 D_80161730; -s32 gShowBossHealth; // 0x80161734 +s32 gShowBossHealth; s32 D_80161738[4]; s32 D_80161748[4]; s32 D_80161758; -// gap = 0x4 bytes, probably padding s32 D_80161760[4]; f32 D_80161770; f32 D_80161774; @@ -56,9 +48,8 @@ f32 D_801617A4; f32 D_801617A8; f32 D_801617AC; s32 D_801617B0; -s32 gMedalStatus; // 0x801617B4 -s32 gMedalFlashTimer; // 0x801617B8 -// gap = 0x4 bytes, probably padding +s32 gMedalStatus; +s32 gMedalFlashTimer; s32 D_801617C0[10]; s32 D_801617E8[10]; s32 D_80161810[10]; @@ -67,8 +58,6 @@ s32 D_80161860[20]; f32 D_801618B0[20]; s32 D_80161900[20]; -// BSS SECTION END - #include "global.h" #include "assets/ast_bg_space.h" @@ -98,8 +87,6 @@ s32 D_80161900[20]; void func_80087788(void); -// Segmented addresses - extern u8 D_ME_6000000[]; extern u8 D_KA_6000000[]; extern u8 D_SO_6000000[]; @@ -108,8 +95,6 @@ extern u8 D_BO_6000000[]; extern u8 D_VE1_6000D80[]; extern u8 D_VE2_60012D0[]; -// DATA SECTION START - s16 D_800D1970 = 0; // unused diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 92460d8b..5693b75c 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -1,4 +1,3 @@ -// #include "prevent_bss_reordering2.h" #include "global.h" #include "fox_map.h" #include "assets/ast_corneria.h" diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index a96019db..7d75419c 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1,5 +1,3 @@ -#include "prevent_bss_reordering2.h" -#include "prevent_bss_reordering.h" #include "global.h" #include "fox_option.h" #include "assets/ast_vs_menu.h" diff --git a/src/main/sys_math.c b/src/main/sys_math.c index 2cd5c35b..5e9c8591 100644 --- a/src/main/sys_math.c +++ b/src/main/sys_math.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "sys.h" s32 sSeededRandSeed3; diff --git a/src/main/sys_memory.c b/src/main/sys_memory.c index 9520e9a8..a40dc13c 100644 --- a/src/main/sys_memory.c +++ b/src/main/sys_memory.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "sys.h" s32 sMemoryBuffer[0x2200]; diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c index 4100cf90..6e1c928f 100644 --- a/src/overlays/ovl_ending/fox_end1.c +++ b/src/overlays/ovl_ending/fox_end1.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_title.h" #include "assets/ast_ending_award_front.h" diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c index b39401db..b0a8a922 100644 --- a/src/overlays/ovl_i1/fox_ve1.c +++ b/src/overlays/ovl_i1/fox_ve1.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_ve1_boss.h" diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index 19321211..9f717e5a 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -1,4 +1,3 @@ -// #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_blue_marine.h" #include "assets/ast_aquas.h" diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index a68d9ec4..b0f091de 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_bg_planet.h" #include "assets/ast_solar.h" diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 3295e22d..ab0b7157 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_enmy_planet.h" #include "assets/ast_zoness.h" diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c index 3e6a9f1c..9156720d 100644 --- a/src/overlays/ovl_i4/fox_bo.c +++ b/src/overlays/ovl_i4/fox_bo.c @@ -1,5 +1,3 @@ -//#include "prevent_bss_reordering.h" -// #include "prevent_bss_reordering2.h" #include "global.h" #include "assets/ast_bolse.h" diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index c261e1bf..252629aa 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -1,4 +1,3 @@ -// #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_katina.h" diff --git a/src/overlays/ovl_i5/fox_ground.c b/src/overlays/ovl_i5/fox_ground.c index 81072e5d..54dd765f 100644 --- a/src/overlays/ovl_i5/fox_ground.c +++ b/src/overlays/ovl_i5/fox_ground.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_titania.h" diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 16d11df7..e6206d0f 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1,6 +1,4 @@ -#include "prevent_bss_reordering.h" #include "global.h" -#include "prevent_bss_reordering.h" #include "assets/ast_macbeth.h" #include "assets/ast_landmaster.h" #include "assets/ast_enmy_planet.h" diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index 11c87aea..37cd6ce7 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -1,4 +1,3 @@ -// #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_bg_planet.h" #include "assets/ast_titania.h" diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index 98348b9b..99a8f20e 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering2.h" #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_venom_2.h" diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index a13f8e7e..682a97cb 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -9,7 +9,6 @@ #include "global.h" #include "fox_map.h" #include "fox_option.h" -// #include "prevent_bss_reordering2.h" #include "assets/ast_map.h" #include "assets/ast_font.h" #include "assets/ast_font_3d.h" diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index b639021b..e066f904 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -6,7 +6,6 @@ #include "mods.h" #include "global.h" -// #include "prevent_bss_reordering.h" #include "fox_option.h" extern s32 D_menu_801B81A8[][3];