remove includes for bss reordering that are no longer needed.

.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": ""
 }

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"

src/main/fox_97F80.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "prevent_bss_reordering.h"
 
 f32 __dx1;
 f32 __dx2;

src/main/fox_bg.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "prevent_bss_reordering.h"
 
 extern f32 D_i3_801C4188;
 

src/main/fox_display.c

@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "global.h"
 
 s16 D_80161410;

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) {

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"

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

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"

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"

src/main/sys_math.c

@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "sys.h"
 
 s32 sSeededRandSeed3;

src/main/sys_memory.c

@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "sys.h"
 
 s32 sMemoryBuffer[0x2200];

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"

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"
 

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"

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"

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"

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"
 

src/overlays/ovl_i4/fox_ka.c

@@ -1,4 +1,3 @@
-// #include "prevent_bss_reordering.h"
 #include "global.h"
 #include "assets/ast_katina.h"
 

src/overlays/ovl_i5/fox_ground.c

@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "assets/ast_titania.h"
 

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"

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"

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"

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"

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];