From 9346a22c6303a67658da4880e3da7e35a0f30f40 Mon Sep 17 00:00:00 2001
From: petrie911 <69443847+petrie911@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:58:59 -0600
Subject: [PATCH] Asset names and headers (#131)
* assets and such
* here goes
* here goes again
* once more
* once more
* type fixing
* type fixing
* type fixing
* here goes
* here goes
* format
---
include/assets.h | 42 +-
include/assets/ast_7_ti_1.h | 8 +
include/assets/ast_7_ti_2.h | 8 +
include/assets/ast_8_ti.h | 8 +
include/assets/ast_9_ti.h | 8 +
include/assets/ast_A_ti.h | 8 +
include/assets/ast_allies.h | 25 +
include/assets/ast_andross.h | 65 +++
include/assets/ast_aquas.h | 8 +
include/assets/ast_area_6.h | 8 +
include/assets/ast_arwing.h | 8 +
include/assets/ast_bg_planet.h | 8 +
include/assets/ast_bg_space.h | 8 +
include/assets/ast_blue_marine.h | 8 +
include/assets/ast_bolse.h | 8 +
include/assets/ast_common.h | 88 +++
include/assets/ast_corneria.h | 8 +
include/assets/ast_ending.h | 8 +
include/assets/ast_ending_award_back.h | 8 +
include/assets/ast_ending_award_front.h | 8 +
include/assets/ast_ending_expert.h | 8 +
include/assets/ast_enmy_planet.h | 8 +
include/assets/ast_enmy_space.h | 8 +
include/assets/ast_font.h | 33 ++
include/assets/ast_font_3d.h | 8 +
include/assets/ast_fortuna.h | 8 +
include/assets/ast_great_fox.h | 16 +
include/assets/ast_katina.h | 8 +
include/assets/ast_landmaster.h | 8 +
include/assets/ast_logo.h | 14 +
include/assets/ast_macbeth.h | 8 +
include/assets/ast_map.h | 8 +
include/assets/ast_menu.h | 8 +
include/assets/ast_meteo.h | 8 +
include/assets/ast_option.h | 8 +
include/assets/ast_radio.h | 8 +
include/assets/ast_sector_x.h | 8 +
include/assets/ast_sector_y.h | 8 +
include/assets/ast_sector_z.h | 8 +
include/assets/ast_solar.h | 8 +
include/assets/ast_star_wolf.h | 29 +
include/assets/ast_titania.h | 8 +
include/assets/ast_title.h | 8 +
include/assets/ast_training.h | 8 +
include/assets/ast_ve1_boss.h | 8 +
include/assets/ast_venom_1.h | 8 +
include/assets/ast_venom_2.h | 8 +
include/assets/ast_versus.h | 8 +
include/assets/ast_vs_player.h | 8 +
include/assets/ast_warp_zone.h | 8 +
include/assets/ast_zoness.h | 8 +
include/assets/namefix.py | 13 +
include/prevent_context_reordering.h | 133 +++++
include/sf64dma.h | 106 ++--
segfinder.py | 117 ++++
src/assets/{ast_DE5D50.c => ast_radio.c} | 0
src/main/dmatable.c | 110 ++--
src/main/fox_context.c | 132 +----
src/main/fox_demo.c | 23 +-
src/main/fox_load.c | 10 +-
src/main/fox_load_inits.c | 570 ++++++++++----------
src/overlays/ovl_ending/fox_end2.c | 2 +-
src/overlays/ovl_ending/fox_end2_data.c | 2 +-
src/overlays/ovl_i1/fox_co.c | 2 +-
src/overlays/ovl_i1/{sf_ve1.c => fox_ve1.c} | 3 +-
src/overlays/ovl_i1/sf_ve1.h | 20 -
src/overlays/ovl_i4/fox_fo.c | 21 +-
src/overlays/ovl_i6/fox_andross.c | 16 +-
yamls/us/assets.yaml | 101 ++--
yamls/us/main.yaml | 1 +
yamls/us/overlays.yaml | 17 +-
71 files changed, 1406 insertions(+), 649 deletions(-)
create mode 100644 include/assets/ast_7_ti_1.h
create mode 100644 include/assets/ast_7_ti_2.h
create mode 100644 include/assets/ast_8_ti.h
create mode 100644 include/assets/ast_9_ti.h
create mode 100644 include/assets/ast_A_ti.h
create mode 100644 include/assets/ast_allies.h
create mode 100644 include/assets/ast_andross.h
create mode 100644 include/assets/ast_aquas.h
create mode 100644 include/assets/ast_area_6.h
create mode 100644 include/assets/ast_arwing.h
create mode 100644 include/assets/ast_bg_planet.h
create mode 100644 include/assets/ast_bg_space.h
create mode 100644 include/assets/ast_blue_marine.h
create mode 100644 include/assets/ast_bolse.h
create mode 100644 include/assets/ast_common.h
create mode 100644 include/assets/ast_corneria.h
create mode 100644 include/assets/ast_ending.h
create mode 100644 include/assets/ast_ending_award_back.h
create mode 100644 include/assets/ast_ending_award_front.h
create mode 100644 include/assets/ast_ending_expert.h
create mode 100644 include/assets/ast_enmy_planet.h
create mode 100644 include/assets/ast_enmy_space.h
create mode 100644 include/assets/ast_font.h
create mode 100644 include/assets/ast_font_3d.h
create mode 100644 include/assets/ast_fortuna.h
create mode 100644 include/assets/ast_great_fox.h
create mode 100644 include/assets/ast_katina.h
create mode 100644 include/assets/ast_landmaster.h
create mode 100644 include/assets/ast_logo.h
create mode 100644 include/assets/ast_macbeth.h
create mode 100644 include/assets/ast_map.h
create mode 100644 include/assets/ast_menu.h
create mode 100644 include/assets/ast_meteo.h
create mode 100644 include/assets/ast_option.h
create mode 100644 include/assets/ast_radio.h
create mode 100644 include/assets/ast_sector_x.h
create mode 100644 include/assets/ast_sector_y.h
create mode 100644 include/assets/ast_sector_z.h
create mode 100644 include/assets/ast_solar.h
create mode 100644 include/assets/ast_star_wolf.h
create mode 100644 include/assets/ast_titania.h
create mode 100644 include/assets/ast_title.h
create mode 100644 include/assets/ast_training.h
create mode 100644 include/assets/ast_ve1_boss.h
create mode 100644 include/assets/ast_venom_1.h
create mode 100644 include/assets/ast_venom_2.h
create mode 100644 include/assets/ast_versus.h
create mode 100644 include/assets/ast_vs_player.h
create mode 100644 include/assets/ast_warp_zone.h
create mode 100644 include/assets/ast_zoness.h
create mode 100644 include/assets/namefix.py
create mode 100644 include/prevent_context_reordering.h
create mode 100644 segfinder.py
rename src/assets/{ast_DE5D50.c => ast_radio.c} (100%)
rename src/overlays/ovl_i1/{sf_ve1.c => fox_ve1.c} (99%)
delete mode 100644 src/overlays/ovl_i1/sf_ve1.h
diff --git a/include/assets.h b/include/assets.h
index d139775d..3e2ad210 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -7,7 +7,7 @@
#include "sf64object.h"
#include "sf64player.h"
-// ast_873CB0
+// ast_common
extern u16 D_1002040[];
extern u16 D_10032A0[];
extern u16 D_10041C0[];
@@ -88,7 +88,7 @@ extern Gfx D_1031630[];
extern Gfx D_1031EC0[];
extern Gfx D_1032780[];
-// ast_8A68C0, ast_8AE0A0
+// ast_bg_space, ast_bg_planet
extern Gfx D_2000000[];
extern Gfx D_2000890[];
extern Gfx D_2001090[];
@@ -121,7 +121,7 @@ extern Gfx D_200F910[];
extern Gfx D_20101A0[];
extern Gfx D_20112C0[];
-// ast_8BFC00, ast_8D99F0, ast_8E1F80, ast_8E92D0
+// ast_arwing, ast_landmaster, ast_blue_marine, ast_vs_player
extern Gfx D_3006940[];
extern Gfx D_301AD60[];
extern Gfx D_301AEF0[];
@@ -149,7 +149,7 @@ extern u16 D_3007500[];
extern u8 D_300A470[];
extern u16 D_300B218[];
-extern u8 D_5007F60[];
+
extern Gfx D_3001C90[];
extern u16 D_3002E80[];
@@ -246,7 +246,7 @@ extern Vec3f D_302F008[];
extern Triangle D_302F044[];
extern Vec3f D_302F098[];
-// ast_918430, ast_922730
+// ast_enmy_planet, ast_enmy_space
extern Animation D_4000080;
extern Limb* D_400014C[];
extern Animation D_40001A4;
@@ -262,7 +262,7 @@ extern Animation D_400A30C;
extern Limb* D_400A398[];
extern Gfx D_400B390[];
-// ast_CD2410
+// ast_font
extern u8 D_5000000[];
extern u8 D_5000080[];
extern u8 D_5000100[];
@@ -273,6 +273,7 @@ extern u8 D_5000400[];
extern u8 D_5000480[];
extern u8 D_50021F0[];
extern u16 D_50077B0[];
+extern u8 D_5007F60[];
extern u8 D_5009F60[];
extern u8 D_500A050[];
extern u8 D_500A140[];
@@ -285,10 +286,10 @@ extern u8 D_500A6E0[];
extern u8 D_500A7D0[];
extern Gfx D_500B600[];
-/* ast_961CE0, ast_9A1460, ast_9D2FD0, ast_A1D0F0, ast_A4FBB0,
- * ast_A58F60, ast_A8B470, ast_AB4000, ast_ACF960, ast_AE60A0*,
- * ast_B0AA00, ast_B1CA50, ast_B2CA50, ast_B612E0, ast_B84560,
- * ast_BB11D0, ast_BC23D0, ast_BFC510, ast_C48F40, ast_DDC010
+/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
+ * ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,
+ * ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
+ * ast_katina, ast_macbeth, ast_title, ast_menu, ast_training
*/
extern Gfx D_60005B0[];
extern u16 D_6000900[];
@@ -944,7 +945,7 @@ extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
-// ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600
+// ast_7_ti_2, ast_7_ti_1, ast_warp_zone, ast_versus, ast_ending
extern u8 D_7000F10[];
extern u8 D_7001030[];
extern u8 D_7001270[];
@@ -975,7 +976,8 @@ extern u8 D_70118E0[];
extern u16 D_70123F8[];
extern u16 D_70123F8[];
-// ast_9EB5E0, ast_CA9DE0, ast_D43400, ast_D68480, ast_D91F10
+// ast_8_ti, ast_option, ast_ending_award_front, ast_ending_award_back, ast_reward
+extern u8 D_8000000[];
extern u16 D_8000680[];
extern u8 D_80006A0[];
extern u16 D_80017A0[];
@@ -1021,7 +1023,7 @@ extern u16 D_800E170[];
extern Gfx D_8015550[];
extern Gfx D_8015DF0[];
-// ast_9F4880, ast_AE60A0, ast_CDDCA0
+// ast_9_ti, ast_ve1_boss, ast_font_3d
extern Gfx D_9002CF0[];
extern u16 D_9003330[];
extern u16 D_9003890[];
@@ -1039,12 +1041,12 @@ extern Gfx D_9023290[];
extern Gfx D_90234D0[];
extern Gfx D_9023AD0[];
-// ast_A049A0
+// ast_A_ti
extern Gfx D_A000000[];
// segment B is unused
-// ast_CE9E70
+// ast_andross
extern Gfx D_C017440[];
extern ObjectInit* D_C0356A4[];
extern u16* D_C037E3C[];
@@ -1057,7 +1059,7 @@ extern f32 D_C038DC0[];
extern f32 D_C038F24[];
extern Gfx D_C039208[];
-// ast_955270
+// ast_allies
extern Gfx D_D000000[];
extern u16 D_D000170[];
extern u16 D_D001090[];
@@ -1075,21 +1077,23 @@ extern Gfx D_D00B5C0[];
extern Gfx D_D00B720[];
extern Gfx D_D00B880[];
-// ast_92EC40
+// ast_great_fox
+extern Gfx D_E000000[];
+extern Gfx D_E003AB0[];
extern Gfx D_E00DFB0[];
extern u16 D_E00E100[];
extern u16 D_E00F020[];
extern u16 D_E00FF40[];
extern u16 D_E010E60[];
-// ast_D25100
+// ast_logo
extern u16 D_F000000[];
extern u16 D_F000800[];
extern u16 D_F001000[];
extern u16 D_F001800[];
extern u16 D_F002000[];
-// ast_940AD0
+// ast_star_wolf
extern u16 D_F000000[];
extern u16 D_F000F20[];
extern u16 D_F001E40[];
diff --git a/include/assets/ast_7_ti_1.h b/include/assets/ast_7_ti_1.h
new file mode 100644
index 00000000..9fc9d9bc
--- /dev/null
+++ b/include/assets/ast_7_ti_1.h
@@ -0,0 +1,8 @@
+#ifndef AST_7_TI_1_H
+#define AST_7_TI_1_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h
new file mode 100644
index 00000000..8d721892
--- /dev/null
+++ b/include/assets/ast_7_ti_2.h
@@ -0,0 +1,8 @@
+#ifndef AST_7_TI_2_H
+#define AST_7_TI_2_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_8_ti.h b/include/assets/ast_8_ti.h
new file mode 100644
index 00000000..c1c0bd49
--- /dev/null
+++ b/include/assets/ast_8_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_8_TI_H
+#define AST_8_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_9_ti.h b/include/assets/ast_9_ti.h
new file mode 100644
index 00000000..3e51eace
--- /dev/null
+++ b/include/assets/ast_9_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_9_TI_H
+#define AST_9_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_A_ti.h b/include/assets/ast_A_ti.h
new file mode 100644
index 00000000..91c8057e
--- /dev/null
+++ b/include/assets/ast_A_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_A_TI_H
+#define AST_A_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_allies.h b/include/assets/ast_allies.h
new file mode 100644
index 00000000..76bc7c30
--- /dev/null
+++ b/include/assets/ast_allies.h
@@ -0,0 +1,25 @@
+#ifndef AST_ALLIES_H
+#define AST_ALLIES_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern Gfx D_D000000[];
+extern u16 D_D000170[];
+extern u16 D_D001090[];
+extern u16 D_D001FB0[];
+extern u16 D_D002ED0[];
+extern u16 D_D003DF0[];
+extern u16 D_D004D10[];
+extern u16 D_D005C30[];
+extern u16 D_D006B50[];
+extern u16 D_D007A70[];
+extern u16 D_D008990[];
+extern Gfx D_D0098B0[];
+extern Gfx D_D009A40[];
+extern Gfx D_D00B5C0[];
+extern Gfx D_D00B720[];
+extern Gfx D_D00B880[];
+
+#endif
diff --git a/include/assets/ast_andross.h b/include/assets/ast_andross.h
new file mode 100644
index 00000000..414e9b18
--- /dev/null
+++ b/include/assets/ast_andross.h
@@ -0,0 +1,65 @@
+#ifndef AST_ANDROSS_H
+#define AST_ANDROSS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern Gfx D_C001880[];
+extern Animation D_C00208C;
+extern Animation D_C002654;
+extern Animation D_C002B08;
+extern Gfx D_C002B20[];
+extern Gfx D_C002F00[];
+extern Gfx D_C0043D0[];
+extern Gfx D_C004860[];
+extern Animation D_C006F08;
+extern Animation D_C00DE48;
+extern Animation D_C00E598;
+extern Gfx D_C015740[];
+extern Animation D_C017050;
+extern Animation D_C017430;
+extern Gfx D_C017440[];
+extern Vtx D_C017598[];
+extern Animation D_C018BC4;
+extern Limb* D_C01CC3C[];
+extern Gfx D_C022520[];
+extern Animation D_C023B54;
+extern Animation D_C0240D0;
+extern Animation D_C025C00;
+extern Animation D_C029F74;
+extern Animation D_C02E494;
+extern Animation D_C02EDA0;
+extern Animation D_C030244;
+extern Animation D_C033780;
+extern Animation D_C033D98;
+extern ObjectInit D_C0356A4[];
+extern ObjectInit D_C036310[];
+extern ObjectInit D_C036B6C[];
+extern ObjectInit D_C03733C[];
+extern u16* D_C037E3C[];
+extern f32 D_C037FCC[];
+extern f32 D_C0380C0[];
+extern f32 D_C0381B4[];
+extern f32 D_C0382A8[];
+extern f32 D_C03839C[];
+extern f32 D_C038490[];
+extern f32 D_C038584[];
+extern f32 D_C038678[];
+extern f32 D_C03876C[];
+extern f32 D_C038860[];
+extern f32 D_C038954[];
+extern f32 D_C038A48[];
+extern Gfx D_C038AC4[];
+extern f32 D_C038B40[];
+extern f32 D_C038B40[];
+extern f32 D_C038BA4[];
+extern f32 D_C038BD8[];
+extern f32 D_C038DC0[];
+extern f32 D_C038F24[];
+extern Vtx D_C038FE8[];
+extern Gfx D_C039208[];
+extern u32 D_C039290[];
+extern u32 D_C03A290[];
+
+#endif
diff --git a/include/assets/ast_aquas.h b/include/assets/ast_aquas.h
new file mode 100644
index 00000000..918cd5f6
--- /dev/null
+++ b/include/assets/ast_aquas.h
@@ -0,0 +1,8 @@
+#ifndef AST_AQUAS_H
+#define AST_AQUAS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_area_6.h b/include/assets/ast_area_6.h
new file mode 100644
index 00000000..608d0f60
--- /dev/null
+++ b/include/assets/ast_area_6.h
@@ -0,0 +1,8 @@
+#ifndef AST_AREA_6_H
+#define AST_AREA_6_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_arwing.h b/include/assets/ast_arwing.h
new file mode 100644
index 00000000..2cfeeef6
--- /dev/null
+++ b/include/assets/ast_arwing.h
@@ -0,0 +1,8 @@
+#ifndef AST_ARWING_H
+#define AST_ARWING_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bg_planet.h b/include/assets/ast_bg_planet.h
new file mode 100644
index 00000000..f18c0db9
--- /dev/null
+++ b/include/assets/ast_bg_planet.h
@@ -0,0 +1,8 @@
+#ifndef AST_BG_PLANET_H
+#define AST_BG_PLANET_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bg_space.h b/include/assets/ast_bg_space.h
new file mode 100644
index 00000000..dac2f9b6
--- /dev/null
+++ b/include/assets/ast_bg_space.h
@@ -0,0 +1,8 @@
+#ifndef AST_BG_SPACE_H
+#define AST_BG_SPACE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_blue_marine.h b/include/assets/ast_blue_marine.h
new file mode 100644
index 00000000..138afcff
--- /dev/null
+++ b/include/assets/ast_blue_marine.h
@@ -0,0 +1,8 @@
+#ifndef AST_BLUE_MARINE_H
+#define AST_BLUE_MARINE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bolse.h b/include/assets/ast_bolse.h
new file mode 100644
index 00000000..4e0dcabc
--- /dev/null
+++ b/include/assets/ast_bolse.h
@@ -0,0 +1,8 @@
+#ifndef AST_BOLSE_H
+#define AST_BOLSE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_common.h b/include/assets/ast_common.h
new file mode 100644
index 00000000..b52390cf
--- /dev/null
+++ b/include/assets/ast_common.h
@@ -0,0 +1,88 @@
+#ifndef AST_COMMON_H
+#define AST_COMMON_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern u16 D_1002040[];
+extern u16 D_10032A0[];
+extern u16 D_10041C0[];
+extern u16 D_10050E0[];
+extern u16 D_1006000[];
+extern u16 D_1006F20[];
+extern u16 D_1007E40[];
+extern u16 D_1008D60[];
+extern u16 D_1009C80[];
+extern u16 D_100ABA0[];
+extern u16 D_100BAC0[];
+extern u16 D_100C9E0[];
+extern u16 D_100D900[];
+extern u16 D_100E820[];
+extern u8 D_1011A40[];
+extern u16 D_1011AB0[];
+extern u8 D_1011E80[];
+extern u16 D_1011EC0[];
+extern u8 D_1011ED0[];
+extern u16 D_1011F08[];
+extern Gfx D_1011F20[];
+extern u8 D_10127D0[];
+extern u16 D_1012898[];
+extern u8 D_10128C0[];
+extern u16 D_1012988[];
+extern u8 D_10129C0[];
+extern u16 D_1013090[];
+extern u8 D_1013170[];
+extern u16 D_1013570[];
+extern Gfx D_1015510[];
+extern Gfx D_1015980[];
+extern Gfx D_1016580[];
+extern Gfx D_1016870[];
+extern Gfx D_10177C0[];
+extern Gfx D_10182C0[];
+extern u16 D_10190C0[]; // A texture of some sort.
+extern Gfx D_10194C0[];
+extern Gfx D_1019820[];
+extern Gfx D_1019CA0[];
+extern Gfx D_101A570[];
+extern Gfx D_101A8E0[];
+extern Gfx D_101ABD0[];
+extern Gfx D_101AD20[];
+extern Gfx D_101AED0[];
+extern Gfx D_101C2E0[];
+extern Gfx D_101C2E0[];
+extern Gfx D_101CAE0[];
+extern Gfx D_101CD70[];
+extern u16 D_101D070[];
+extern Gfx D_101DC10[];
+extern Gfx D_1021E20[];
+extern Gfx D_1022120[];
+extern Gfx D_1022E80[];
+extern Gfx D_10231A0[];
+extern Gfx D_1023700[];
+extern Gfx D_1023750[];
+extern Gfx D_1023C80[];
+extern Gfx D_1024230[];
+extern Gfx D_1024290[];
+extern Gfx D_1024410[];
+extern Gfx D_1024570[];
+extern Gfx D_10246D0[];
+extern Gfx D_1024830[];
+extern u8 D_1024A58[];
+extern Gfx D_1024AC0[];
+extern Gfx D_1024F60[];
+extern Gfx D_1025800[];
+extern Gfx D_1026090[];
+extern Gfx D_1028230[];
+extern Gfx D_1029780[];
+extern Gfx D_102A010[];
+extern Gfx D_102A8A0[];
+extern Gfx D_102ED50[];
+extern Gfx D_102F5E0[];
+extern Gfx D_102FE80[];
+extern u16 D_102FF08[];
+extern Gfx D_1031630[];
+extern Gfx D_1031EC0[];
+extern Gfx D_1032780[];
+
+#endif
diff --git a/include/assets/ast_corneria.h b/include/assets/ast_corneria.h
new file mode 100644
index 00000000..756cb732
--- /dev/null
+++ b/include/assets/ast_corneria.h
@@ -0,0 +1,8 @@
+#ifndef AST_CORNERIA_H
+#define AST_CORNERIA_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_ending.h b/include/assets/ast_ending.h
new file mode 100644
index 00000000..22c1e0fe
--- /dev/null
+++ b/include/assets/ast_ending.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENDING_H
+#define AST_ENDING_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_ending_award_back.h b/include/assets/ast_ending_award_back.h
new file mode 100644
index 00000000..b1a1329b
--- /dev/null
+++ b/include/assets/ast_ending_award_back.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENDING_AWARD_BACK_H
+#define AST_ENDING_AWARD_BACK_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_ending_award_front.h b/include/assets/ast_ending_award_front.h
new file mode 100644
index 00000000..ec1ab7b1
--- /dev/null
+++ b/include/assets/ast_ending_award_front.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENDING_AWARD_FRONT_H
+#define AST_ENDING_AWARD_FRONT_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_ending_expert.h b/include/assets/ast_ending_expert.h
new file mode 100644
index 00000000..a6d4b248
--- /dev/null
+++ b/include/assets/ast_ending_expert.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENDING_EXPERT_H
+#define AST_ENDING_EXPERT_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_enmy_planet.h b/include/assets/ast_enmy_planet.h
new file mode 100644
index 00000000..be93ccaa
--- /dev/null
+++ b/include/assets/ast_enmy_planet.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENMY_PLANET_H
+#define AST_ENMY_PLANET_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_enmy_space.h b/include/assets/ast_enmy_space.h
new file mode 100644
index 00000000..2ed27749
--- /dev/null
+++ b/include/assets/ast_enmy_space.h
@@ -0,0 +1,8 @@
+#ifndef AST_ENMY_SPACE_H
+#define AST_ENMY_SPACE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_font.h b/include/assets/ast_font.h
new file mode 100644
index 00000000..10ef1bb6
--- /dev/null
+++ b/include/assets/ast_font.h
@@ -0,0 +1,33 @@
+#ifndef AST_FONT_H
+#define AST_FONT_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern u8 D_5000000[];
+extern u8 D_5000080[];
+extern u8 D_5000100[];
+extern u8 D_5000180[];
+extern u16 D_5000200[];
+extern u8 D_5000280[];
+extern u16 D_5000300[];
+extern u8 D_5000380[];
+extern u8 D_5000400[];
+extern u8 D_5000480[];
+extern u8 D_50021F0[];
+extern u16 D_50077B0[];
+extern u8 D_5007F60[];
+extern u8 D_5009F60[];
+extern u8 D_500A050[];
+extern u8 D_500A140[];
+extern u8 D_500A230[];
+extern u8 D_500A320[];
+extern u8 D_500A410[];
+extern u8 D_500A500[];
+extern u8 D_500A5F0[];
+extern u8 D_500A6E0[];
+extern u8 D_500A7D0[];
+extern Gfx D_500B600[];
+
+#endif
diff --git a/include/assets/ast_font_3d.h b/include/assets/ast_font_3d.h
new file mode 100644
index 00000000..ce76188d
--- /dev/null
+++ b/include/assets/ast_font_3d.h
@@ -0,0 +1,8 @@
+#ifndef AST_FONT_3D_H
+#define AST_FONT_3D_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_fortuna.h b/include/assets/ast_fortuna.h
new file mode 100644
index 00000000..793619da
--- /dev/null
+++ b/include/assets/ast_fortuna.h
@@ -0,0 +1,8 @@
+#ifndef AST_FORTUNA_H
+#define AST_FORTUNA_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_great_fox.h b/include/assets/ast_great_fox.h
new file mode 100644
index 00000000..460306bb
--- /dev/null
+++ b/include/assets/ast_great_fox.h
@@ -0,0 +1,16 @@
+#ifndef AST_GREAT_FOX_H
+#define AST_GREAT_FOX_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern Gfx D_E000000[];
+extern Gfx D_E003AB0[];
+extern Gfx D_E00DFB0[];
+extern u16 D_E00E100[];
+extern u16 D_E00F020[];
+extern u16 D_E00FF40[];
+extern u16 D_E010E60[];
+
+#endif
diff --git a/include/assets/ast_katina.h b/include/assets/ast_katina.h
new file mode 100644
index 00000000..4ccbe831
--- /dev/null
+++ b/include/assets/ast_katina.h
@@ -0,0 +1,8 @@
+#ifndef AST_KATINA_H
+#define AST_KATINA_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_landmaster.h b/include/assets/ast_landmaster.h
new file mode 100644
index 00000000..88163169
--- /dev/null
+++ b/include/assets/ast_landmaster.h
@@ -0,0 +1,8 @@
+#ifndef AST_LANDMASTER_H
+#define AST_LANDMASTER_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_logo.h b/include/assets/ast_logo.h
new file mode 100644
index 00000000..99df299c
--- /dev/null
+++ b/include/assets/ast_logo.h
@@ -0,0 +1,14 @@
+#ifndef AST_LOGO_H
+#define AST_LOGO_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern u16 D_F000000[];
+extern u16 D_F000800[];
+extern u16 D_F001000[];
+extern u16 D_F001800[];
+extern u16 D_F002000[];
+
+#endif
diff --git a/include/assets/ast_macbeth.h b/include/assets/ast_macbeth.h
new file mode 100644
index 00000000..c148718b
--- /dev/null
+++ b/include/assets/ast_macbeth.h
@@ -0,0 +1,8 @@
+#ifndef AST_MACBETH_H
+#define AST_MACBETH_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_map.h b/include/assets/ast_map.h
new file mode 100644
index 00000000..b8f915a4
--- /dev/null
+++ b/include/assets/ast_map.h
@@ -0,0 +1,8 @@
+#ifndef AST_MAP_H
+#define AST_MAP_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_menu.h b/include/assets/ast_menu.h
new file mode 100644
index 00000000..ef4681e3
--- /dev/null
+++ b/include/assets/ast_menu.h
@@ -0,0 +1,8 @@
+#ifndef AST_MENU_H
+#define AST_MENU_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_meteo.h b/include/assets/ast_meteo.h
new file mode 100644
index 00000000..c0b8336c
--- /dev/null
+++ b/include/assets/ast_meteo.h
@@ -0,0 +1,8 @@
+#ifndef AST_METEO_H
+#define AST_METEO_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_option.h b/include/assets/ast_option.h
new file mode 100644
index 00000000..1ab2d451
--- /dev/null
+++ b/include/assets/ast_option.h
@@ -0,0 +1,8 @@
+#ifndef AST_OPTION_H
+#define AST_OPTION_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_radio.h b/include/assets/ast_radio.h
new file mode 100644
index 00000000..0339dc28
--- /dev/null
+++ b/include/assets/ast_radio.h
@@ -0,0 +1,8 @@
+#ifndef AST_RADIO_H
+#define AST_RADIO_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_sector_x.h b/include/assets/ast_sector_x.h
new file mode 100644
index 00000000..f4c3d1d1
--- /dev/null
+++ b/include/assets/ast_sector_x.h
@@ -0,0 +1,8 @@
+#ifndef AST_SECTOR_X_H
+#define AST_SECTOR_X_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_sector_y.h b/include/assets/ast_sector_y.h
new file mode 100644
index 00000000..5e3a43b5
--- /dev/null
+++ b/include/assets/ast_sector_y.h
@@ -0,0 +1,8 @@
+#ifndef AST_SECTOR_Y_H
+#define AST_SECTOR_Y_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_sector_z.h b/include/assets/ast_sector_z.h
new file mode 100644
index 00000000..0e1a98f4
--- /dev/null
+++ b/include/assets/ast_sector_z.h
@@ -0,0 +1,8 @@
+#ifndef AST_SECTOR_Z_H
+#define AST_SECTOR_Z_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_solar.h b/include/assets/ast_solar.h
new file mode 100644
index 00000000..3a371c9c
--- /dev/null
+++ b/include/assets/ast_solar.h
@@ -0,0 +1,8 @@
+#ifndef AST_SOLAR_H
+#define AST_SOLAR_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_star_wolf.h b/include/assets/ast_star_wolf.h
new file mode 100644
index 00000000..a6ade860
--- /dev/null
+++ b/include/assets/ast_star_wolf.h
@@ -0,0 +1,29 @@
+#ifndef AST_STAR_WOLF_H
+#define AST_STAR_WOLF_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern u16 D_F000000[];
+extern u16 D_F000F20[];
+extern u16 D_F001E40[];
+extern u16 D_F002D60[];
+extern u16 D_F003C80[];
+extern u16 D_F004BA0[];
+extern u16 D_F005AC0[];
+extern u16 D_F0069E0[];
+extern u16 D_F007900[];
+extern u16 D_F008820[];
+extern u16 D_F009740[];
+extern u16 D_F00A660[];
+extern u16 D_F00B580[];
+extern u16 D_F00C4A0[];
+extern u16 D_F00D3C0[];
+extern u16 D_F00E2E0[];
+extern Gfx D_F00F200[];
+extern Gfx D_F0103D0[];
+extern Gfx D_F014180[];
+extern Gfx D_F014310[];
+
+#endif
diff --git a/include/assets/ast_titania.h b/include/assets/ast_titania.h
new file mode 100644
index 00000000..52a650ad
--- /dev/null
+++ b/include/assets/ast_titania.h
@@ -0,0 +1,8 @@
+#ifndef AST_TITANIA_H
+#define AST_TITANIA_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_title.h b/include/assets/ast_title.h
new file mode 100644
index 00000000..a5dbd6c2
--- /dev/null
+++ b/include/assets/ast_title.h
@@ -0,0 +1,8 @@
+#ifndef AST_TITLE_H
+#define AST_TITLE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_training.h b/include/assets/ast_training.h
new file mode 100644
index 00000000..a75d5b08
--- /dev/null
+++ b/include/assets/ast_training.h
@@ -0,0 +1,8 @@
+#ifndef AST_TRAINING_H
+#define AST_TRAINING_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_ve1_boss.h b/include/assets/ast_ve1_boss.h
new file mode 100644
index 00000000..4e6c91a5
--- /dev/null
+++ b/include/assets/ast_ve1_boss.h
@@ -0,0 +1,8 @@
+#ifndef AST_VE1_BOSS_H
+#define AST_VE1_BOSS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_venom_1.h b/include/assets/ast_venom_1.h
new file mode 100644
index 00000000..da493725
--- /dev/null
+++ b/include/assets/ast_venom_1.h
@@ -0,0 +1,8 @@
+#ifndef AST_VENOM_1_H
+#define AST_VENOM_1_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_venom_2.h b/include/assets/ast_venom_2.h
new file mode 100644
index 00000000..b8051371
--- /dev/null
+++ b/include/assets/ast_venom_2.h
@@ -0,0 +1,8 @@
+#ifndef AST_VENOM_2_H
+#define AST_VENOM_2_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_versus.h b/include/assets/ast_versus.h
new file mode 100644
index 00000000..3540bf76
--- /dev/null
+++ b/include/assets/ast_versus.h
@@ -0,0 +1,8 @@
+#ifndef AST_VERSUS_H
+#define AST_VERSUS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_vs_player.h b/include/assets/ast_vs_player.h
new file mode 100644
index 00000000..dab26a2f
--- /dev/null
+++ b/include/assets/ast_vs_player.h
@@ -0,0 +1,8 @@
+#ifndef AST_VS_PLAYER_H
+#define AST_VS_PLAYER_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_warp_zone.h b/include/assets/ast_warp_zone.h
new file mode 100644
index 00000000..e69ccb18
--- /dev/null
+++ b/include/assets/ast_warp_zone.h
@@ -0,0 +1,8 @@
+#ifndef AST_WARP_ZONE_H
+#define AST_WARP_ZONE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_zoness.h b/include/assets/ast_zoness.h
new file mode 100644
index 00000000..2831a3ed
--- /dev/null
+++ b/include/assets/ast_zoness.h
@@ -0,0 +1,8 @@
+#ifndef AST_ZONESS_H
+#define AST_ZONESS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/namefix.py b/include/assets/namefix.py
new file mode 100644
index 00000000..2fc6a60d
--- /dev/null
+++ b/include/assets/namefix.py
@@ -0,0 +1,13 @@
+import os
+
+for subdir, dirs, files in os.walk('.'):
+ for file in files:
+ with open(file, 'r') as header:
+ htxt = header.read()
+
+ name = str.upper(file[4:-2])
+ print(name)
+ htxt = htxt.replace("FIX.", name)
+ print(htxt)
+ with open(file, 'w') as header:
+ header.write(htxt)
diff --git a/include/prevent_context_reordering.h b/include/prevent_context_reordering.h
new file mode 100644
index 00000000..29b0c0b7
--- /dev/null
+++ b/include/prevent_context_reordering.h
@@ -0,0 +1,133 @@
+#ifndef PREVENT_CONTEXT_REORDERING_H
+#define PREVENT_CONTEXT_REORDERING_H
+
+extern int Dummyhalf;
+struct Dummy0 {int x;};
+struct Dummy1 {int x;};
+struct Dummy2 {int x;};
+struct Dummy3 {int x;};
+struct Dummy4 {int x;};
+struct Dummy5 {int x;};
+struct Dummy6 {int x;};
+struct Dummy7 {int x;};
+struct Dummy8 {int x;};
+struct Dummy9 {int x;};
+struct Dummy10 {int x;};
+struct Dummy11 {int x;};
+struct Dummy12 {int x;};
+struct Dummy13 {int x;};
+struct Dummy14 {int x;};
+struct Dummy15 {int x;};
+struct Dummy16 {int x;};
+struct Dummy17 {int x;};
+struct Dummy18 {int x;};
+struct Dummy19 {int x;};
+struct Dummy20 {int x;};
+struct Dummy21 {int x;};
+struct Dummy22 {int x;};
+struct Dummy23 {int x;};
+struct Dummy24 {int x;};
+struct Dummy25 {int x;};
+struct Dummy26 {int x;};
+struct Dummy27 {int x;};
+struct Dummy28 {int x;};
+struct Dummy29 {int x;};
+struct Dummy30 {int x;};
+struct Dummy31 {int x;};
+struct Dummy32 {int x;};
+struct Dummy33 {int x;};
+struct Dummy34 {int x;};
+struct Dummy35 {int x;};
+struct Dummy36 {int x;};
+struct Dummy37 {int x;};
+struct Dummy38 {int x;};
+struct Dummy39 {int x;};
+struct Dummy40 {int x;};
+struct Dummy41 {int x;};
+struct Dummy42 {int x;};
+struct Dummy43 {int x;};
+struct Dummy44 {int x;};
+struct Dummy45 {int x;};
+struct Dummy46 {int x;};
+struct Dummy47 {int x;};
+struct Dummy48 {int x;};
+struct Dummy49 {int x;};
+struct Dummy50 {int x;};
+struct Dummy51 {int x;};
+struct Dummy52 {int x;};
+struct Dummy53 {int x;};
+struct Dummy54 {int x;};
+struct Dummy55 {int x;};
+struct Dummy56 {int x;};
+struct Dummy57 {int x;};
+struct Dummy58 {int x;};
+struct Dummy59 {int x;};
+struct Dummy60 {int x;};
+struct Dummy61 {int x;};
+struct Dummy62 {int x;};
+struct Dummy63 {int x;};
+struct Dummy64 {int x;};
+struct Dummy65 {int x;};
+struct Dummy66 {int x;};
+struct Dummy67 {int x;};
+struct Dummy68 {int x;};
+struct Dummy69 {int x;};
+struct Dummy70 {int x;};
+struct Dummy71 {int x;};
+struct Dummy72 {int x;};
+// struct Dummy73 {int x;};
+// struct Dummy75 { int x; };
+// struct Dummy76 { int x; };
+// struct Dummy77 { int x; };
+// struct Dummy78 { int x; };
+// struct Dummy79 { int x; };
+// struct Dummy80 { int x; };
+// struct Dummy81 { int x; };
+// struct Dummy82 { int x; };
+// struct Dummy83 { int x; };
+// struct Dummy84 { int x; };
+// struct Dummy85 { int x; };
+// struct Dummy86 { int x; };
+// struct Dummy87 { int x; };
+// struct Dummy88 { int x; };
+// struct Dummy89 { int x; };
+// struct Dummy90 { int x; };
+// struct Dummy91 { int x; };
+// struct Dummy92 { int x; };
+// struct Dummy93 { int x; };
+// struct Dummy94 { int x; };
+// struct Dummy95 { int x; };
+// struct Dummy96 { int x; };
+// struct Dummy97 { int x; };
+// struct Dummy98 { int x; };
+// struct Dummy99 { int x; };
+// struct Dummy100 { int x; };
+// struct Dummy101 { int x; };
+// struct Dummy102 { int x; };
+// struct Dummy103 { int x; };
+// struct Dummy104 { int x; };
+// struct Dummy105 { int x; };
+// struct Dummy106 { int x; };
+// struct Dummy107 { int x; };
+// struct Dummy108 { int x; };
+// struct Dummy109 { int x; };
+// struct Dummy110 { int x; };
+// struct Dummy111 { int x; };
+// struct Dummy112 { int x; };
+// struct Dummy113 { int x; };
+// struct Dummy114 { int x; };
+// struct Dummy115 { int x; };
+// struct Dummy116 { int x; };
+// struct Dummy117 { int x; };
+// struct Dummy118 { int x; };
+// struct Dummy119 { int x; };
+// struct Dummy120 { int x; };
+// struct Dummy121 { int x; };
+// struct Dummy122 { int x; };
+// struct Dummy123 { int x; };
+// struct Dummy124 { int x; };
+// struct Dummy125 { int x; };
+// struct Dummy126 { int x; };
+// struct Dummy127 { int x; };
+
+#endif
diff --git a/include/sf64dma.h b/include/sf64dma.h
index 3770a8c7..f946f805 100644
--- a/include/sf64dma.h
+++ b/include/sf64dma.h
@@ -93,9 +93,9 @@ typedef struct {
extern DmaEntry gDmaTable[]; // 178A70
extern OverlayInit sNoOvl_Logo[1]; // sets segment 15 with no overlay
-extern OverlayInit sOvlending_Credits[6]; // overlay EF0260
+extern OverlayInit sOvlending_Ending[6]; // overlay EF0260
extern OverlayInit sOvlmenu_Title[1]; // EBFBE0
-extern OverlayInit sOvlmenu_Menu[1]; // EBFBE0
+extern OverlayInit sOvlmenu_Option[1]; // EBFBE0
extern OverlayInit sOvlmenu_Map[1]; // EBFBE0
extern OverlayInit sOvlmenu_State5[1]; // EBFBE0
extern OverlayInit sOvli1_Corneria[1]; // fox_i1
@@ -111,8 +111,8 @@ extern OverlayInit sOvli6_SectorY[1]; // E9F1D0
extern OverlayInit sOvli3_Solar[1]; // i3
extern OverlayInit sOvli3_Zoness[1]; // i3
extern OverlayInit sOvli1_Venom1[1]; // fox_i1
-extern OverlayInit sOvli6_Venom2[1]; // E9F1D0
-extern OverlayInit sOvli6_VenomSW[2]; // E9F1D0
+extern OverlayInit sOvli6_Andross[1]; // E9F1D0
+extern OverlayInit sOvli6_Venom2[2]; // E9F1D0
extern OverlayInit sOvli2_Setup20[1]; // fox_i2
extern OverlayInit sOvli4_Bolse[1]; // i4
extern OverlayInit sOvli4_Katina[1]; // i4
@@ -127,55 +127,55 @@ DECLARE_SEGMENT(dma_table);
DECLARE_SEGMENT(audio_seq);
DECLARE_SEGMENT(audio_bank);
DECLARE_SEGMENT(audio_table);
-DECLARE_SEGMENT(ast_873CB0);
-DECLARE_SEGMENT(ast_8A68C0);
-DECLARE_SEGMENT(ast_8AE0A0);
-DECLARE_SEGMENT(ast_8BFC00);
-DECLARE_SEGMENT(ast_8D99F0);
-DECLARE_SEGMENT(ast_8E1F80);
-DECLARE_SEGMENT(ast_8E92D0);
-DECLARE_SEGMENT(ast_918430);
-DECLARE_SEGMENT(ast_922730);
-DECLARE_SEGMENT(ast_92EC40);
-DECLARE_SEGMENT(ast_940AD0);
-DECLARE_SEGMENT(ast_955270);
-DECLARE_SEGMENT(ast_961CE0);
-DECLARE_SEGMENT(ast_9A1460);
-DECLARE_SEGMENT(ast_9D2FD0);
-DECLARE_SEGMENT(ast_9DD390);
-DECLARE_SEGMENT(ast_9EB5E0);
-DECLARE_SEGMENT(ast_9F4880);
-DECLARE_SEGMENT(ast_A049A0);
-DECLARE_SEGMENT(ast_A0E340);
-DECLARE_SEGMENT(ast_A1D0F0);
-DECLARE_SEGMENT(ast_A4FBB0);
-DECLARE_SEGMENT(ast_A58F60);
-DECLARE_SEGMENT(ast_A8B470);
-DECLARE_SEGMENT(ast_AB4000);
-DECLARE_SEGMENT(ast_ACF960);
-DECLARE_SEGMENT(ast_AE60A0);
-DECLARE_SEGMENT(ast_B0AA00);
-DECLARE_SEGMENT(ast_B1CA50);
-DECLARE_SEGMENT(ast_B2CA50);
-DECLARE_SEGMENT(ast_B612E0);
-DECLARE_SEGMENT(ast_B84560);
-DECLARE_SEGMENT(ast_BB11D0);
-DECLARE_SEGMENT(ast_BC23D0);
-DECLARE_SEGMENT(ast_BFA740);
-DECLARE_SEGMENT(ast_BFC510);
-DECLARE_SEGMENT(ast_C48F40);
-DECLARE_SEGMENT(ast_CA9DE0);
-DECLARE_SEGMENT(ast_CBFE70);
-DECLARE_SEGMENT(ast_CD2410);
-DECLARE_SEGMENT(ast_CDDCA0);
-DECLARE_SEGMENT(ast_CE9E70);
-DECLARE_SEGMENT(ast_D25100);
-DECLARE_SEGMENT(ast_D27600);
-DECLARE_SEGMENT(ast_D43400);
-DECLARE_SEGMENT(ast_D68480);
-DECLARE_SEGMENT(ast_D91F10);
-DECLARE_SEGMENT(ast_DDC010);
-DECLARE_SEGMENT(ast_DE5D50);
+DECLARE_SEGMENT(ast_common);
+DECLARE_SEGMENT(ast_bg_space);
+DECLARE_SEGMENT(ast_bg_planet);
+DECLARE_SEGMENT(ast_arwing);
+DECLARE_SEGMENT(ast_landmaster);
+DECLARE_SEGMENT(ast_blue_marine);
+DECLARE_SEGMENT(ast_vs_player);
+DECLARE_SEGMENT(ast_enmy_planet);
+DECLARE_SEGMENT(ast_enmy_space);
+DECLARE_SEGMENT(ast_great_fox);
+DECLARE_SEGMENT(ast_star_wolf);
+DECLARE_SEGMENT(ast_allies);
+DECLARE_SEGMENT(ast_corneria);
+DECLARE_SEGMENT(ast_meteo);
+DECLARE_SEGMENT(ast_titania);
+DECLARE_SEGMENT(ast_7_ti_2);
+DECLARE_SEGMENT(ast_8_ti);
+DECLARE_SEGMENT(ast_9_ti);
+DECLARE_SEGMENT(ast_A_ti);
+DECLARE_SEGMENT(ast_7_ti_1);
+DECLARE_SEGMENT(ast_sector_x);
+DECLARE_SEGMENT(ast_sector_z);
+DECLARE_SEGMENT(ast_aquas);
+DECLARE_SEGMENT(ast_area_6);
+DECLARE_SEGMENT(ast_venom_1);
+DECLARE_SEGMENT(ast_venom_2);
+DECLARE_SEGMENT(ast_ve1_boss);
+DECLARE_SEGMENT(ast_bolse);
+DECLARE_SEGMENT(ast_fortuna);
+DECLARE_SEGMENT(ast_sector_y);
+DECLARE_SEGMENT(ast_solar);
+DECLARE_SEGMENT(ast_zoness);
+DECLARE_SEGMENT(ast_katina);
+DECLARE_SEGMENT(ast_macbeth);
+DECLARE_SEGMENT(ast_warp_zone);
+DECLARE_SEGMENT(ast_title);
+DECLARE_SEGMENT(ast_menu);
+DECLARE_SEGMENT(ast_option);
+DECLARE_SEGMENT(ast_versus);
+DECLARE_SEGMENT(ast_font);
+DECLARE_SEGMENT(ast_font_3d);
+DECLARE_SEGMENT(ast_andross);
+DECLARE_SEGMENT(ast_logo);
+DECLARE_SEGMENT(ast_ending);
+DECLARE_SEGMENT(ast_ending_award_front);
+DECLARE_SEGMENT(ast_ending_award_back);
+DECLARE_SEGMENT(ast_reward);
+DECLARE_SEGMENT(ast_training);
+DECLARE_SEGMENT(ast_radio);
DECLARE_SEGMENT(ovl_i1);
DECLARE_SEGMENT(ovl_i2);
DECLARE_SEGMENT(ovl_i3);
diff --git a/segfinder.py b/segfinder.py
new file mode 100644
index 00000000..5afbe8e4
--- /dev/null
+++ b/segfinder.py
@@ -0,0 +1,117 @@
+import re
+import os
+
+ovl_setup_dict = {"_co":"Corneria", "_me":"Meteo", "_sy":"SectorY", "_sx":"SectorX", "_sz":"SectorZ",
+ "_zo":"Zoness", "_fo":"Fortuna", "_ka":"Katina", "_bo":"Bolse", "_ve1":"Venom1",
+ "_andross":"Andross", "_ve2":"Venom2", "_so":"Solar", "_aq":"Aquas", "_ti":"Titania",
+ "_ti_cs":"Titania", "_a6":"Area6", "_title":"Title", "_option":"Option", "_map":"Map",
+ "_ending_1":"Ending", "_ending_2":"Ending","_tr":"Training","_tr360":"Training", "_ma":"Macbeth"}
+
+def fetch_ovl_setup(ovl_name):
+ with open("src/main/fox_load_inits.c", "r") as setup_file:
+ setups = setup_file.readlines()
+ setup_name = ovl_setup_dict["_" + '_'.join(ovl_name.split("_")[1:])]
+ assets = [None] * 16
+ for i, line in enumerate(setups):
+ if setup_name not in line:
+ continue
+ setup_count = int(line.split('[')[1][0])
+ while(setup_count > 0):
+ for j in range(16):
+ if "ROM_SEGMENT" in setups[i + j + 1]:
+ asset_name = setups[i + j + 1].split(')')[0].split('(')[1]
+ if assets[j] and assets[j] != asset_name:
+ assets[j] = "segment_conflict"
+ else:
+ assets[j] = asset_name
+ setup_count -= 1
+ i += 16
+ break
+ print(assets)
+ return assets
+
+def find_segment_symbols(ovl_path):
+ seg_regex = re.compile(r'D_[1-9A-F]0[0-9A-F]{5}(?=[^0-9A-F])')
+ with open(ovl_path, 'r') as ovl_file:
+ ovl_src = ovl_file.read()
+ segs_all = seg_regex.findall(ovl_src)
+ segs_all = list(set(segs_all))
+ return segs_all
+
+def find_symbol_def(seg, ovl_path):
+ with open(ovl_path, 'r') as ovl_file:
+ ovl_src = ovl_file.readlines()
+ sym_def = None
+ for i, line in enumerate(ovl_src):
+ if seg in line and "extern" in line:
+ sym_def = line
+ # print("Definition found in overlay.")
+ break
+ if not sym_def:
+ with open("include/assets.h", "r") as var_file:
+ var_defs = var_file.readlines()
+ for i, line in enumerate(var_defs):
+ if seg in line and "extern" in line:
+ sym_def = line
+ # print("Definition found in assets.")
+ break
+ if not sym_def:
+ sym_def = seg + " undefined\n"
+ print("No definition found for " + seg + " in expected places.")
+ return sym_def
+
+def make_symbol_defs(ovl_path):
+ symbols = find_segment_symbols(ovl_path)
+ defs = []
+ for seg in symbols:
+ defs += [find_symbol_def(seg, ovl_path)]
+ return defs
+
+def get_seg_number(sym):
+ return int(sym[2], 16)
+
+def create_headers(ovl_path):
+ assets = fetch_ovl_setup(ovl_path.split('/')[-1].rstrip('.c'))
+ symbols = find_segment_symbols(ovl_path)
+ sym_defs = make_symbol_defs(ovl_path)
+ for i, asset in enumerate(assets):
+ if not asset or asset == "segment_conflict":
+ continue
+ with open("include/assets/" + asset + ".h", 'r') as header_src:
+ header_txt = header_src.readlines()
+ for symbol, defn in zip(symbols, sym_defs):
+ if i == get_seg_number(symbol) and defn not in header_txt:
+ header_txt = header_txt[:-1] + [defn] + header_txt[-1:]
+ with open("include/assets/" + asset + ".h", 'w') as header_src:
+ header_src.writelines(header_txt)
+ return sym_defs
+
+def prune_assets(defn):
+ with open("include/assets.h", "r") as ast_file:
+ ast_text = ast_file.readlines()
+ if defn in ast_text:
+ ast_text.remove(defn)
+ with open("include/assets.h", "w") as ast_file:
+ ast_file.writelines(ast_text)
+ return
+
+def create_all_headers(overlay_dir):
+ sym_defs = []
+ for subdir, dirs, files in os.walk(overlay_dir):
+ for file in files:
+ if file.endswith('.c') and "_i" not in file and "unused" not in file:
+ sym_defs += create_headers(subdir + os.sep + file)
+ for defn in sym_defs:
+ prune_assets(defn)
+ return
+
+
+
+
+
+
+# fetch_ovl_setup("fox_ti_cs")
+# print(find_segment_symbols("src/overlays/ovl_i3/fox_zo.c"))
+# create_headers("src/overlays/ovl_i5/fox_ti_cs.c")
+
+create_all_headers('src/overlays')
\ No newline at end of file
diff --git a/src/assets/ast_DE5D50.c b/src/assets/ast_radio.c
similarity index 100%
rename from src/assets/ast_DE5D50.c
rename to src/assets/ast_radio.c
diff --git a/src/main/dmatable.c b/src/main/dmatable.c
index ffad9109..f69585ea 100644
--- a/src/main/dmatable.c
+++ b/src/main/dmatable.c
@@ -12,55 +12,67 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(audio_seq), { SEGMENT_ROM_START(audio_seq), SEGMENT_ROM_END(audio_seq) }, false },
{ SEGMENT_ROM_START(audio_bank), { SEGMENT_ROM_START(audio_bank), SEGMENT_ROM_END(audio_bank) }, false },
{ SEGMENT_ROM_START(audio_table), { SEGMENT_ROM_START(audio_table), SEGMENT_ROM_END(audio_table) }, false },
- { SEGMENT_ROM_START(ast_873CB0), { SEGMENT_ROM_START(ast_873CB0), SEGMENT_ROM_END(ast_873CB0) }, false },
- { SEGMENT_ROM_START(ast_8A68C0), { SEGMENT_ROM_START(ast_8A68C0), SEGMENT_ROM_END(ast_8A68C0) }, false },
- { SEGMENT_ROM_START(ast_8AE0A0), { SEGMENT_ROM_START(ast_8AE0A0), SEGMENT_ROM_END(ast_8AE0A0) }, false },
- { SEGMENT_ROM_START(ast_8BFC00), { SEGMENT_ROM_START(ast_8BFC00), SEGMENT_ROM_END(ast_8BFC00) }, false },
- { SEGMENT_ROM_START(ast_8D99F0), { SEGMENT_ROM_START(ast_8D99F0), SEGMENT_ROM_END(ast_8D99F0) }, false },
- { SEGMENT_ROM_START(ast_8E1F80), { SEGMENT_ROM_START(ast_8E1F80), SEGMENT_ROM_END(ast_8E1F80) }, false },
- { SEGMENT_ROM_START(ast_8E92D0), { SEGMENT_ROM_START(ast_8E92D0), SEGMENT_ROM_END(ast_8E92D0) }, false },
- { SEGMENT_ROM_START(ast_918430), { SEGMENT_ROM_START(ast_918430), SEGMENT_ROM_END(ast_918430) }, false },
- { SEGMENT_ROM_START(ast_922730), { SEGMENT_ROM_START(ast_922730), SEGMENT_ROM_END(ast_922730) }, false },
- { SEGMENT_ROM_START(ast_92EC40), { SEGMENT_ROM_START(ast_92EC40), SEGMENT_ROM_END(ast_92EC40) }, false },
- { SEGMENT_ROM_START(ast_940AD0), { SEGMENT_ROM_START(ast_940AD0), SEGMENT_ROM_END(ast_940AD0) }, false },
- { SEGMENT_ROM_START(ast_955270), { SEGMENT_ROM_START(ast_955270), SEGMENT_ROM_END(ast_955270) }, false },
- { SEGMENT_ROM_START(ast_961CE0), { SEGMENT_ROM_START(ast_961CE0), SEGMENT_ROM_END(ast_961CE0) }, false },
- { SEGMENT_ROM_START(ast_9A1460), { SEGMENT_ROM_START(ast_9A1460), SEGMENT_ROM_END(ast_9A1460) }, false },
- { SEGMENT_ROM_START(ast_9D2FD0), { SEGMENT_ROM_START(ast_9D2FD0), SEGMENT_ROM_END(ast_9D2FD0) }, false },
- { SEGMENT_ROM_START(ast_9DD390), { SEGMENT_ROM_START(ast_9DD390), SEGMENT_ROM_END(ast_9DD390) }, false },
- { SEGMENT_ROM_START(ast_9EB5E0), { SEGMENT_ROM_START(ast_9EB5E0), SEGMENT_ROM_END(ast_9EB5E0) }, false },
- { SEGMENT_ROM_START(ast_9F4880), { SEGMENT_ROM_START(ast_9F4880), SEGMENT_ROM_END(ast_9F4880) }, false },
- { SEGMENT_ROM_START(ast_A049A0), { SEGMENT_ROM_START(ast_A049A0), SEGMENT_ROM_END(ast_A049A0) }, false },
- { SEGMENT_ROM_START(ast_A0E340), { SEGMENT_ROM_START(ast_A0E340), SEGMENT_ROM_END(ast_A0E340) }, false },
- { SEGMENT_ROM_START(ast_A1D0F0), { SEGMENT_ROM_START(ast_A1D0F0), SEGMENT_ROM_END(ast_A1D0F0) }, false },
- { SEGMENT_ROM_START(ast_A4FBB0), { SEGMENT_ROM_START(ast_A4FBB0), SEGMENT_ROM_END(ast_A4FBB0) }, false },
- { SEGMENT_ROM_START(ast_A58F60), { SEGMENT_ROM_START(ast_A58F60), SEGMENT_ROM_END(ast_A58F60) }, false },
- { SEGMENT_ROM_START(ast_A8B470), { SEGMENT_ROM_START(ast_A8B470), SEGMENT_ROM_END(ast_A8B470) }, false },
- { SEGMENT_ROM_START(ast_AB4000), { SEGMENT_ROM_START(ast_AB4000), SEGMENT_ROM_END(ast_AB4000) }, false },
- { SEGMENT_ROM_START(ast_ACF960), { SEGMENT_ROM_START(ast_ACF960), SEGMENT_ROM_END(ast_ACF960) }, false },
- { SEGMENT_ROM_START(ast_AE60A0), { SEGMENT_ROM_START(ast_AE60A0), SEGMENT_ROM_END(ast_AE60A0) }, false },
- { SEGMENT_ROM_START(ast_B0AA00), { SEGMENT_ROM_START(ast_B0AA00), SEGMENT_ROM_END(ast_B0AA00) }, false },
- { SEGMENT_ROM_START(ast_B1CA50), { SEGMENT_ROM_START(ast_B1CA50), SEGMENT_ROM_END(ast_B1CA50) }, false },
- { SEGMENT_ROM_START(ast_B2CA50), { SEGMENT_ROM_START(ast_B2CA50), SEGMENT_ROM_END(ast_B2CA50) }, false },
- { SEGMENT_ROM_START(ast_B612E0), { SEGMENT_ROM_START(ast_B612E0), SEGMENT_ROM_END(ast_B612E0) }, false },
- { SEGMENT_ROM_START(ast_B84560), { SEGMENT_ROM_START(ast_B84560), SEGMENT_ROM_END(ast_B84560) }, false },
- { SEGMENT_ROM_START(ast_BB11D0), { SEGMENT_ROM_START(ast_BB11D0), SEGMENT_ROM_END(ast_BB11D0) }, false },
- { SEGMENT_ROM_START(ast_BC23D0), { SEGMENT_ROM_START(ast_BC23D0), SEGMENT_ROM_END(ast_BC23D0) }, false },
- { SEGMENT_ROM_START(ast_BFA740), { SEGMENT_ROM_START(ast_BFA740), SEGMENT_ROM_END(ast_BFA740) }, false },
- { SEGMENT_ROM_START(ast_BFC510), { SEGMENT_ROM_START(ast_BFC510), SEGMENT_ROM_END(ast_BFC510) }, false },
- { SEGMENT_ROM_START(ast_C48F40), { SEGMENT_ROM_START(ast_C48F40), SEGMENT_ROM_END(ast_C48F40) }, false },
- { SEGMENT_ROM_START(ast_CA9DE0), { SEGMENT_ROM_START(ast_CA9DE0), SEGMENT_ROM_END(ast_CA9DE0) }, false },
- { SEGMENT_ROM_START(ast_CBFE70), { SEGMENT_ROM_START(ast_CBFE70), SEGMENT_ROM_END(ast_CBFE70) }, false },
- { SEGMENT_ROM_START(ast_CD2410), { SEGMENT_ROM_START(ast_CD2410), SEGMENT_ROM_END(ast_CD2410) }, false },
- { SEGMENT_ROM_START(ast_CDDCA0), { SEGMENT_ROM_START(ast_CDDCA0), SEGMENT_ROM_END(ast_CDDCA0) }, false },
- { SEGMENT_ROM_START(ast_CE9E70), { SEGMENT_ROM_START(ast_CE9E70), SEGMENT_ROM_END(ast_CE9E70) }, false },
- { SEGMENT_ROM_START(ast_D25100), { SEGMENT_ROM_START(ast_D25100), SEGMENT_ROM_END(ast_D25100) }, false },
- { SEGMENT_ROM_START(ast_D27600), { SEGMENT_ROM_START(ast_D27600), SEGMENT_ROM_END(ast_D27600) }, false },
- { SEGMENT_ROM_START(ast_D43400), { SEGMENT_ROM_START(ast_D43400), SEGMENT_ROM_END(ast_D43400) }, false },
- { SEGMENT_ROM_START(ast_D68480), { SEGMENT_ROM_START(ast_D68480), SEGMENT_ROM_END(ast_D68480) }, false },
- { SEGMENT_ROM_START(ast_D91F10), { SEGMENT_ROM_START(ast_D91F10), SEGMENT_ROM_END(ast_D91F10) }, false },
- { SEGMENT_ROM_START(ast_DDC010), { SEGMENT_ROM_START(ast_DDC010), SEGMENT_ROM_END(ast_DDC010) }, false },
- { SEGMENT_ROM_START(ast_DE5D50), { SEGMENT_ROM_START(ast_DE5D50), SEGMENT_ROM_END(ast_DE5D50) }, false },
+ { SEGMENT_ROM_START(ast_common), { SEGMENT_ROM_START(ast_common), SEGMENT_ROM_END(ast_common) }, false },
+ { SEGMENT_ROM_START(ast_bg_space), { SEGMENT_ROM_START(ast_bg_space), SEGMENT_ROM_END(ast_bg_space) }, false },
+ { SEGMENT_ROM_START(ast_bg_planet), { SEGMENT_ROM_START(ast_bg_planet), SEGMENT_ROM_END(ast_bg_planet) }, false },
+ { SEGMENT_ROM_START(ast_arwing), { SEGMENT_ROM_START(ast_arwing), SEGMENT_ROM_END(ast_arwing) }, false },
+ { SEGMENT_ROM_START(ast_landmaster),
+ { SEGMENT_ROM_START(ast_landmaster), SEGMENT_ROM_END(ast_landmaster) },
+ false },
+ { SEGMENT_ROM_START(ast_blue_marine),
+ { SEGMENT_ROM_START(ast_blue_marine), SEGMENT_ROM_END(ast_blue_marine) },
+ false },
+ { SEGMENT_ROM_START(ast_vs_player), { SEGMENT_ROM_START(ast_vs_player), SEGMENT_ROM_END(ast_vs_player) }, false },
+ { SEGMENT_ROM_START(ast_enmy_planet),
+ { SEGMENT_ROM_START(ast_enmy_planet), SEGMENT_ROM_END(ast_enmy_planet) },
+ false },
+ { SEGMENT_ROM_START(ast_enmy_space),
+ { SEGMENT_ROM_START(ast_enmy_space), SEGMENT_ROM_END(ast_enmy_space) },
+ false },
+ { SEGMENT_ROM_START(ast_great_fox), { SEGMENT_ROM_START(ast_great_fox), SEGMENT_ROM_END(ast_great_fox) }, false },
+ { SEGMENT_ROM_START(ast_star_wolf), { SEGMENT_ROM_START(ast_star_wolf), SEGMENT_ROM_END(ast_star_wolf) }, false },
+ { SEGMENT_ROM_START(ast_allies), { SEGMENT_ROM_START(ast_allies), SEGMENT_ROM_END(ast_allies) }, false },
+ { SEGMENT_ROM_START(ast_corneria), { SEGMENT_ROM_START(ast_corneria), SEGMENT_ROM_END(ast_corneria) }, false },
+ { SEGMENT_ROM_START(ast_meteo), { SEGMENT_ROM_START(ast_meteo), SEGMENT_ROM_END(ast_meteo) }, false },
+ { SEGMENT_ROM_START(ast_titania), { SEGMENT_ROM_START(ast_titania), SEGMENT_ROM_END(ast_titania) }, false },
+ { SEGMENT_ROM_START(ast_7_ti_2), { SEGMENT_ROM_START(ast_7_ti_2), SEGMENT_ROM_END(ast_7_ti_2) }, false },
+ { SEGMENT_ROM_START(ast_8_ti), { SEGMENT_ROM_START(ast_8_ti), SEGMENT_ROM_END(ast_8_ti) }, false },
+ { SEGMENT_ROM_START(ast_9_ti), { SEGMENT_ROM_START(ast_9_ti), SEGMENT_ROM_END(ast_9_ti) }, false },
+ { SEGMENT_ROM_START(ast_A_ti), { SEGMENT_ROM_START(ast_A_ti), SEGMENT_ROM_END(ast_A_ti) }, false },
+ { SEGMENT_ROM_START(ast_7_ti_1), { SEGMENT_ROM_START(ast_7_ti_1), SEGMENT_ROM_END(ast_7_ti_1) }, false },
+ { SEGMENT_ROM_START(ast_sector_x), { SEGMENT_ROM_START(ast_sector_x), SEGMENT_ROM_END(ast_sector_x) }, false },
+ { SEGMENT_ROM_START(ast_sector_z), { SEGMENT_ROM_START(ast_sector_z), SEGMENT_ROM_END(ast_sector_z) }, false },
+ { SEGMENT_ROM_START(ast_aquas), { SEGMENT_ROM_START(ast_aquas), SEGMENT_ROM_END(ast_aquas) }, false },
+ { SEGMENT_ROM_START(ast_area_6), { SEGMENT_ROM_START(ast_area_6), SEGMENT_ROM_END(ast_area_6) }, false },
+ { SEGMENT_ROM_START(ast_venom_1), { SEGMENT_ROM_START(ast_venom_1), SEGMENT_ROM_END(ast_venom_1) }, false },
+ { SEGMENT_ROM_START(ast_venom_2), { SEGMENT_ROM_START(ast_venom_2), SEGMENT_ROM_END(ast_venom_2) }, false },
+ { SEGMENT_ROM_START(ast_ve1_boss), { SEGMENT_ROM_START(ast_ve1_boss), SEGMENT_ROM_END(ast_ve1_boss) }, false },
+ { SEGMENT_ROM_START(ast_bolse), { SEGMENT_ROM_START(ast_bolse), SEGMENT_ROM_END(ast_bolse) }, false },
+ { SEGMENT_ROM_START(ast_fortuna), { SEGMENT_ROM_START(ast_fortuna), SEGMENT_ROM_END(ast_fortuna) }, false },
+ { SEGMENT_ROM_START(ast_sector_y), { SEGMENT_ROM_START(ast_sector_y), SEGMENT_ROM_END(ast_sector_y) }, false },
+ { SEGMENT_ROM_START(ast_solar), { SEGMENT_ROM_START(ast_solar), SEGMENT_ROM_END(ast_solar) }, false },
+ { SEGMENT_ROM_START(ast_zoness), { SEGMENT_ROM_START(ast_zoness), SEGMENT_ROM_END(ast_zoness) }, false },
+ { SEGMENT_ROM_START(ast_katina), { SEGMENT_ROM_START(ast_katina), SEGMENT_ROM_END(ast_katina) }, false },
+ { SEGMENT_ROM_START(ast_macbeth), { SEGMENT_ROM_START(ast_macbeth), SEGMENT_ROM_END(ast_macbeth) }, false },
+ { SEGMENT_ROM_START(ast_warp_zone), { SEGMENT_ROM_START(ast_warp_zone), SEGMENT_ROM_END(ast_warp_zone) }, false },
+ { SEGMENT_ROM_START(ast_title), { SEGMENT_ROM_START(ast_title), SEGMENT_ROM_END(ast_title) }, false },
+ { SEGMENT_ROM_START(ast_menu), { SEGMENT_ROM_START(ast_menu), SEGMENT_ROM_END(ast_menu) }, false },
+ { SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
+ { SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
+ { SEGMENT_ROM_START(ast_font), { SEGMENT_ROM_START(ast_font), SEGMENT_ROM_END(ast_font) }, false },
+ { SEGMENT_ROM_START(ast_font_3d), { SEGMENT_ROM_START(ast_font_3d), SEGMENT_ROM_END(ast_font_3d) }, false },
+ { SEGMENT_ROM_START(ast_andross), { SEGMENT_ROM_START(ast_andross), SEGMENT_ROM_END(ast_andross) }, false },
+ { SEGMENT_ROM_START(ast_logo), { SEGMENT_ROM_START(ast_logo), SEGMENT_ROM_END(ast_logo) }, false },
+ { SEGMENT_ROM_START(ast_ending), { SEGMENT_ROM_START(ast_ending), SEGMENT_ROM_END(ast_ending) }, false },
+ { SEGMENT_ROM_START(ast_ending_award_front),
+ { SEGMENT_ROM_START(ast_ending_award_front), SEGMENT_ROM_END(ast_ending_award_front) },
+ false },
+ { SEGMENT_ROM_START(ast_ending_award_back),
+ { SEGMENT_ROM_START(ast_ending_award_back), SEGMENT_ROM_END(ast_ending_award_back) },
+ false },
+ { SEGMENT_ROM_START(ast_reward), { SEGMENT_ROM_START(ast_reward), SEGMENT_ROM_END(ast_reward) }, false },
+ { SEGMENT_ROM_START(ast_training), { SEGMENT_ROM_START(ast_training), SEGMENT_ROM_END(ast_training) }, false },
+ { SEGMENT_ROM_START(ast_radio), { SEGMENT_ROM_START(ast_radio), SEGMENT_ROM_END(ast_radio) }, false },
{ SEGMENT_ROM_START(ovl_i1), { SEGMENT_ROM_START(ovl_i1), SEGMENT_ROM_END(ovl_i1) }, false },
{ SEGMENT_ROM_START(ovl_i2), { SEGMENT_ROM_START(ovl_i2), SEGMENT_ROM_END(ovl_i2) }, false },
{ SEGMENT_ROM_START(ovl_i3), { SEGMENT_ROM_START(ovl_i3), SEGMENT_ROM_END(ovl_i3) }, false },
diff --git a/src/main/fox_context.c b/src/main/fox_context.c
index 7bebccf6..b4c6f266 100644
--- a/src/main/fox_context.c
+++ b/src/main/fox_context.c
@@ -1,134 +1,4 @@
-// clang-format off
-// extern int Dummyhalf;
-struct Dummy0 {int x;};
-struct Dummy1 {int x;};
-struct Dummy2 {int x;};
-struct Dummy3 {int x;};
-struct Dummy4 {int x;};
-struct Dummy5 {int x;};
-struct Dummy6 {int x;};
-struct Dummy7 {int x;};
-struct Dummy8 {int x;};
-struct Dummy9 {int x;};
-struct Dummy10 {int x;};
-struct Dummy11 {int x;};
-struct Dummy12 {int x;};
-struct Dummy13 {int x;};
-struct Dummy14 {int x;};
-struct Dummy15 {int x;};
-struct Dummy16 {int x;};
-struct Dummy17 {int x;};
-struct Dummy18 {int x;};
-struct Dummy19 {int x;};
-struct Dummy20 {int x;};
-struct Dummy21 {int x;};
-struct Dummy22 {int x;};
-struct Dummy23 {int x;};
-struct Dummy24 {int x;};
-struct Dummy25 {int x;};
-struct Dummy26 {int x;};
-struct Dummy27 {int x;};
-struct Dummy28 {int x;};
-struct Dummy29 {int x;};
-struct Dummy30 {int x;};
-struct Dummy31 {int x;};
-struct Dummy32 {int x;};
-struct Dummy33 {int x;};
-struct Dummy34 {int x;};
-struct Dummy35 {int x;};
-struct Dummy36 {int x;};
-struct Dummy37 {int x;};
-struct Dummy38 {int x;};
-struct Dummy39 {int x;};
-struct Dummy40 {int x;};
-struct Dummy41 {int x;};
-struct Dummy42 {int x;};
-struct Dummy43 {int x;};
-struct Dummy44 {int x;};
-struct Dummy45 {int x;};
-struct Dummy46 {int x;};
-struct Dummy47 {int x;};
-struct Dummy48 {int x;};
-struct Dummy49 {int x;};
-struct Dummy50 {int x;};
-struct Dummy51 {int x;};
-struct Dummy52 {int x;};
-struct Dummy53 {int x;};
-struct Dummy54 {int x;};
-struct Dummy55 {int x;};
-struct Dummy56 {int x;};
-struct Dummy57 {int x;};
-struct Dummy58 {int x;};
-struct Dummy59 {int x;};
-struct Dummy60 {int x;};
-struct Dummy61 {int x;};
-struct Dummy62 {int x;};
-struct Dummy63 {int x;};
-struct Dummy64 {int x;};
-struct Dummy65 {int x;};
-struct Dummy66 {int x;};
-struct Dummy67 {int x;};
-struct Dummy68 {int x;};
-struct Dummy69 {int x;};
-struct Dummy70 {int x;};
-struct Dummy71 {int x;};
-struct Dummy72 {int x;};
-struct Dummy73 {int x;};
-// struct Dummy75 { int x; };
-// struct Dummy76 { int x; };
-// struct Dummy77 { int x; };
-// struct Dummy78 { int x; };
-// struct Dummy79 { int x; };
-// struct Dummy80 { int x; };
-// struct Dummy81 { int x; };
-// struct Dummy82 { int x; };
-// struct Dummy83 { int x; };
-// struct Dummy84 { int x; };
-// struct Dummy85 { int x; };
-// struct Dummy86 { int x; };
-// struct Dummy87 { int x; };
-// struct Dummy88 { int x; };
-// struct Dummy89 { int x; };
-// struct Dummy90 { int x; };
-// struct Dummy91 { int x; };
-// struct Dummy92 { int x; };
-// struct Dummy93 { int x; };
-// struct Dummy94 { int x; };
-// struct Dummy95 { int x; };
-// struct Dummy96 { int x; };
-// struct Dummy97 { int x; };
-// struct Dummy98 { int x; };
-// struct Dummy99 { int x; };
-// struct Dummy100 { int x; };
-// struct Dummy101 { int x; };
-// struct Dummy102 { int x; };
-// struct Dummy103 { int x; };
-// struct Dummy104 { int x; };
-// struct Dummy105 { int x; };
-// struct Dummy106 { int x; };
-// struct Dummy107 { int x; };
-// struct Dummy108 { int x; };
-// struct Dummy109 { int x; };
-// struct Dummy110 { int x; };
-// struct Dummy111 { int x; };
-// struct Dummy112 { int x; };
-// struct Dummy113 { int x; };
-// struct Dummy114 { int x; };
-// struct Dummy115 { int x; };
-// struct Dummy116 { int x; };
-// struct Dummy117 { int x; };
-// struct Dummy118 { int x; };
-// struct Dummy119 { int x; };
-// struct Dummy120 { int x; };
-// struct Dummy121 { int x; };
-// struct Dummy122 { int x; };
-// struct Dummy123 { int x; };
-// struct Dummy124 { int x; };
-// struct Dummy125 { int x; };
-// struct Dummy126 { int x; };
-// struct Dummy127 { int x; };
-// clang-format on
-
+#include "prevent_context_reordering.h"
#include "sys.h"
#include "sf64level.h"
#include "sf64object.h"
diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c
index 2d50c177..c4439d33 100644
--- a/src/main/fox_demo.c
+++ b/src/main/fox_demo.c
@@ -9,17 +9,22 @@
extern Gfx D_1024AC0[];
extern Gfx D_60320E0[];
extern Gfx D_7010970[];
-extern Gfx D_E000000[];
-extern Gfx D_E003AB0[];
extern s32 D_800C9E90[];
-extern Animation D_60265B4[];
-extern Animation D_602B8DC[];
-extern Animation D_60034C4[];
-extern Animation D_602A2CC[];
-extern Animation D_602CEB4[];
-extern Animation D_602B778[];
+extern Animation D_60265B4;
+extern Animation D_602B8DC;
+extern Animation D_60034C4;
+extern Animation D_602A2CC;
+extern Animation D_602CEB4;
+extern Animation D_602B778;
+
+extern f32 D_80178454;
+extern f32 D_80178458;
+extern f32 D_80178464;
+extern f32 D_80178468;
+extern f32 D_80178474;
+extern f32 D_80178478;
extern Gfx D_400AAE0[];
extern Gfx D_6000D80[];
@@ -122,7 +127,7 @@ f32 D_800CA1D4[] = {
};
Animation* D_800CA1F4[] = {
- D_60265B4, D_602B8DC, D_60034C4, D_602A2CC, D_602CEB4, D_602B778, &D_601F3B8,
+ &D_60265B4, &D_602B8DC, &D_60034C4, &D_602A2CC, &D_602CEB4, &D_602B778, &D_601F3B8,
};
void func_80048AC0(s32 teamId) {
diff --git a/src/main/fox_load.c b/src/main/fox_load.c
index 8edb00e8..7786dd77 100644
--- a/src/main/fox_load.c
+++ b/src/main/fox_load.c
@@ -104,7 +104,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
}
break;
case OVL_SETUP_MENU:
- changeOvl = Overlay_Init(&sOvlmenu_Menu[ovlStage]);
+ changeOvl = Overlay_Init(&sOvlmenu_Option[ovlStage]);
break;
case OVL_SETUP_MAP:
changeOvl = Overlay_Init(&sOvlmenu_Map[ovlStage]);
@@ -149,7 +149,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
changeOvl = Overlay_Init(&sOvli3_Zoness[ovlStage]);
break;
case OVL_SETUP_VENOM_ANDROSS:
- changeOvl = Overlay_Init(&sOvli6_Venom2[ovlStage]);
+ changeOvl = Overlay_Init(&sOvli6_Andross[ovlStage]);
break;
case OVL_SETUP_TRAINING:
changeOvl = Overlay_Init(&sOvli1_Training[ovlStage]);
@@ -158,7 +158,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
changeOvl = Overlay_Init(&sOvli1_Venom1[ovlStage]);
break;
case OVL_SETUP_VENOM_2:
- changeOvl = Overlay_Init(&sOvli6_VenomSW[ovlStage]);
+ changeOvl = Overlay_Init(&sOvli6_Venom2[ovlStage]);
break;
case OVL_SETUP_20:
changeOvl = Overlay_Init(&sOvli2_Setup20[ovlStage]);
@@ -185,7 +185,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
}
break;
case OVL_SETUP_CREDITS:
- changeOvl = Overlay_Init(&sOvlending_Credits[ovlStage]);
+ changeOvl = Overlay_Init(&sOvlending_Ending[ovlStage]);
break;
default:
(void) "DMA MODE ERROR %d\n";
@@ -197,5 +197,5 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
void Overlay_InitDma(void) {
Lib_DmaRead(SEGMENT_ROM_START(dma_table), SEGMENT_VRAM_START(dma_table), SEGMENT_ROM_SIZE(dma_table));
- Overlay_LoadSegment(SEGMENT_ROM_START(ast_DE5D50), SEGMENT_VRAM_START(ast_DE5D50), SEGMENT_ROM_SIZE(ast_DE5D50));
+ Overlay_LoadSegment(SEGMENT_ROM_START(ast_radio), SEGMENT_VRAM_START(ast_radio), SEGMENT_ROM_SIZE(ast_radio));
}
diff --git a/src/main/fox_load_inits.c b/src/main/fox_load_inits.c
index 5423bcc2..b13672ed 100644
--- a/src/main/fox_load_inits.c
+++ b/src/main/fox_load_inits.c
@@ -37,35 +37,35 @@ OverlayInit sNoOvl_Logo[1] = {
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_D25100) } },
+ /* 0xF */ ROM_SEGMENT(ast_logo) } },
};
-OverlayInit sOvlending_Credits[6] = {
+OverlayInit sOvlending_Ending[6] = {
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BFC510),
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
- /* 0x8 */ ROM_SEGMENT(ast_D43400),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_title),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
+ /* 0x8 */ ROM_SEGMENT(ast_ending_award_front),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
@@ -78,10 +78,10 @@ OverlayInit sOvlending_Credits[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BFC510),
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
- /* 0x8 */ ROM_SEGMENT(ast_D68480),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_title),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
+ /* 0x8 */ ROM_SEGMENT(ast_ending_award_back),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
@@ -94,10 +94,10 @@ OverlayInit sOvlending_Credits[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BFC510),
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
- /* 0x8 */ ROM_SEGMENT(ast_D91F10),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_title),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
+ /* 0x8 */ ROM_SEGMENT(ast_reward),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
@@ -110,32 +110,32 @@ OverlayInit sOvlending_Credits[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BFC510),
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_title),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
- /* 0x7 */ ROM_SEGMENT(ast_D27600),
- /* 0x8 */ ROM_SEGMENT(ast_D91F10),
- /* 0x9 */ ROM_SEGMENT(ast_CDDCA0),
+ /* 0x7 */ ROM_SEGMENT(ast_ending),
+ /* 0x8 */ ROM_SEGMENT(ast_reward),
+ /* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
@@ -143,10 +143,10 @@ OverlayInit sOvlmenu_Title[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BFC510),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -154,21 +154,21 @@ OverlayInit sOvlmenu_Title[1] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
-OverlayInit sOvlmenu_Menu[1] = {
+OverlayInit sOvlmenu_Option[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_C48F40),
- /* 0x7 */ ROM_SEGMENT(ast_CBFE70),
- /* 0x8 */ ROM_SEGMENT(ast_CA9DE0),
- /* 0x9 */ ROM_SEGMENT(ast_CDDCA0),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_menu),
+ /* 0x7 */ ROM_SEGMENT(ast_versus),
+ /* 0x8 */ ROM_SEGMENT(ast_option),
+ /* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
@@ -181,13 +181,13 @@ OverlayInit sOvlmenu_Map[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_C48F40),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_menu),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
- /* 0x9 */ ROM_SEGMENT(ast_CDDCA0),
+ /* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
@@ -202,14 +202,14 @@ OverlayInit sOvlmenu_State5[1] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
- /* 0xC */ ROM_SEGMENT(ast_CE9E70),
+ /* 0xC */ ROM_SEGMENT(ast_andross),
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
@@ -217,12 +217,12 @@ OverlayInit sOvlmenu_State5[1] = {
OverlayInit sOvli1_Corneria[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_961CE0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_corneria),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -236,64 +236,64 @@ OverlayInit sOvli1_Corneria[1] = {
OverlayInit sOvli2_Meteo[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9A1460),
- /* 0x7 */ ROM_SEGMENT(ast_BFA740),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_meteo),
+ /* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9A1460),
- /* 0x7 */ ROM_SEGMENT(ast_BFA740),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_meteo),
+ /* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli5_Titania[6] = {
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_A0E340),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_1),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_9DD390),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
@@ -303,14 +303,14 @@ OverlayInit sOvli5_Titania[6] = {
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_9DD390),
- /* 0x8 */ ROM_SEGMENT(ast_9EB5E0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
+ /* 0x8 */ ROM_SEGMENT(ast_8_ti),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
@@ -319,15 +319,15 @@ OverlayInit sOvli5_Titania[6] = {
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_9DD390),
- /* 0x8 */ ROM_SEGMENT(ast_9EB5E0),
- /* 0x9 */ ROM_SEGMENT(ast_9F4880),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
+ /* 0x8 */ ROM_SEGMENT(ast_8_ti),
+ /* 0x9 */ ROM_SEGMENT(ast_9_ti),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
@@ -335,101 +335,101 @@ OverlayInit sOvli5_Titania[6] = {
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_9DD390),
- /* 0x8 */ ROM_SEGMENT(ast_9EB5E0),
- /* 0x9 */ ROM_SEGMENT(ast_9F4880),
- /* 0xA */ ROM_SEGMENT(ast_A049A0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
+ /* 0x8 */ ROM_SEGMENT(ast_8_ti),
+ /* 0x9 */ ROM_SEGMENT(ast_9_ti),
+ /* 0xA */ ROM_SEGMENT(ast_A_ti),
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_9D2FD0),
- /* 0x7 */ ROM_SEGMENT(ast_9DD390),
- /* 0x8 */ ROM_SEGMENT(ast_9EB5E0),
- /* 0x9 */ ROM_SEGMENT(ast_9F4880),
- /* 0xA */ ROM_SEGMENT(ast_A049A0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_titania),
+ /* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
+ /* 0x8 */ ROM_SEGMENT(ast_8_ti),
+ /* 0x9 */ ROM_SEGMENT(ast_9_ti),
+ /* 0xA */ ROM_SEGMENT(ast_A_ti),
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli2_SectorX[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A1D0F0),
- /* 0x7 */ ROM_SEGMENT(ast_BFA740),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_sector_x),
+ /* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A1D0F0),
- /* 0x7 */ ROM_SEGMENT(ast_BFA740),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_sector_x),
+ /* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli4_SectorZ[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A4FBB0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_sector_z),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli3_Aquas[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8E1F80),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A58F60),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_blue_marine),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_aquas),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -437,18 +437,18 @@ OverlayInit sOvli3_Aquas[1] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli3_Area6[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A8B470),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -456,18 +456,18 @@ OverlayInit sOvli3_Area6[1] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli4_Fortuna[2] = {
{ OVERLAY_OFFSETS(ovl_i4),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B1CA50),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -476,14 +476,14 @@ OverlayInit sOvli4_Fortuna[2] = {
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_940AD0) } },
+ /* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
{ OVERLAY_OFFSETS(ovl_i4),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B1CA50),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -491,18 +491,18 @@ OverlayInit sOvli4_Fortuna[2] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli3_Unk4[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_A8B470),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -510,18 +510,18 @@ OverlayInit sOvli3_Unk4[1] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli6_SectorY[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B2CA50),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_sector_y),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -535,88 +535,88 @@ OverlayInit sOvli6_SectorY[1] = {
OverlayInit sOvli3_Solar[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B612E0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_solar),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli3_Zoness[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B84560),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_zoness),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli1_Venom1[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_AB4000),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_venom_1),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
- /* 0x9 */ ROM_SEGMENT(ast_AE60A0),
+ /* 0x9 */ ROM_SEGMENT(ast_ve1_boss),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
-OverlayInit sOvli6_Venom2[1] = {
+OverlayInit sOvli6_Andross[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_ACF960),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
- /* 0xC */ ROM_SEGMENT(ast_CE9E70),
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xC */ ROM_SEGMENT(ast_andross),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
-OverlayInit sOvli6_VenomSW[2] = {
+OverlayInit sOvli6_Venom2[2] = {
{ OVERLAY_OFFSETS(ovl_i6),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_ACF960),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -625,14 +625,14 @@ OverlayInit sOvli6_VenomSW[2] = {
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_940AD0) } },
+ /* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
{ OVERLAY_OFFSETS(ovl_i6),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_ACF960),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -640,18 +640,18 @@ OverlayInit sOvli6_VenomSW[2] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli2_Setup20[1] = {
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_AE60A0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_ve1_boss),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -665,12 +665,12 @@ OverlayInit sOvli2_Setup20[1] = {
OverlayInit sOvli4_Bolse[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_B0AA00),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_bolse),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -679,52 +679,52 @@ OverlayInit sOvli4_Bolse[1] = {
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_940AD0) } },
+ /* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
OverlayInit sOvli4_Katina[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BB11D0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_katina),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_940AD0) } },
+ /* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
OverlayInit sOvli5_Macbeth[2] = {
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BC23D0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
- /* 0xD */ ROM_SEGMENT(ast_955270),
+ /* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8D99F0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_BC23D0),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_landmaster),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -732,18 +732,18 @@ OverlayInit sOvli5_Macbeth[2] = {
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
- /* 0xE */ ROM_SEGMENT(ast_92EC40),
+ /* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvli1_Training[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8BFC00),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
- /* 0x6 */ ROM_SEGMENT(ast_DDC010),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_arwing),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x6 */ ROM_SEGMENT(ast_training),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
@@ -752,18 +752,18 @@ OverlayInit sOvli1_Training[1] = {
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
- /* 0xF */ ROM_SEGMENT(ast_940AD0) } },
+ /* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
OverlayInit sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
- /* 0x3 */ ROM_SEGMENT(ast_8E92D0),
- /* 0x4 */ ROM_SEGMENT(ast_918430),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_planet),
+ /* 0x3 */ ROM_SEGMENT(ast_vs_player),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
- /* 0x7 */ ROM_SEGMENT(ast_CBFE70),
+ /* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
@@ -773,13 +773,13 @@ OverlayInit sOvli2_Versus[2] = {
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
- { /* 0x1 */ ROM_SEGMENT(ast_873CB0),
- /* 0x2 */ ROM_SEGMENT(ast_8A68C0),
- /* 0x3 */ ROM_SEGMENT(ast_8E92D0),
- /* 0x4 */ ROM_SEGMENT(ast_922730),
- /* 0x5 */ ROM_SEGMENT(ast_CD2410),
+ { /* 0x1 */ ROM_SEGMENT(ast_common),
+ /* 0x2 */ ROM_SEGMENT(ast_bg_space),
+ /* 0x3 */ ROM_SEGMENT(ast_vs_player),
+ /* 0x4 */ ROM_SEGMENT(ast_enmy_space),
+ /* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
- /* 0x7 */ ROM_SEGMENT(ast_CBFE70),
+ /* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index 849d60d8..c2ec16d3 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -148,7 +148,7 @@ void func_ending_8018D638(u32 arg0, AssetInfo* asset) {
if (!D_800D2F68) {
TextureRect_16bRGBA(&gMasterDisp, D_8025080 + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
} else {
- TextureRect_16bRGBA(&gMasterDisp, D_8000000 + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
+ TextureRect_16bRGBA(&gMasterDisp, D_8000000_RGBA + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
}
}
} else {
diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c
index fdb1447e..d320ff9e 100644
--- a/src/overlays/ovl_ending/fox_end2_data.c
+++ b/src/overlays/ovl_ending/fox_end2_data.c
@@ -106,7 +106,7 @@ extern Gfx D_700E9E0[];
extern u16 D_700EA38[];
extern Gfx D_7010970[];
extern Gfx D_7016540[];
-extern u16 D_8000000[];
+extern u16 D_8000000_RGBA[];
extern u16 D_8025080[];
// clang-format off
diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c
index 97f92a43..51ef6bca 100644
--- a/src/overlays/ovl_i1/fox_co.c
+++ b/src/overlays/ovl_i1/fox_co.c
@@ -2550,7 +2550,7 @@ void func_i1_8018F6F8(Actor* actor, s32 arg1) {
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
-extern Gfx* D_30184D8;
+extern Gfx D_30184D8[];
void func_i1_8018F880(Player* player) {
s32 i;
diff --git a/src/overlays/ovl_i1/sf_ve1.c b/src/overlays/ovl_i1/fox_ve1.c
similarity index 99%
rename from src/overlays/ovl_i1/sf_ve1.c
rename to src/overlays/ovl_i1/fox_ve1.c
index 84200d84..3021a8de 100644
--- a/src/overlays/ovl_i1/sf_ve1.c
+++ b/src/overlays/ovl_i1/fox_ve1.c
@@ -1,5 +1,4 @@
#include "global.h"
-#include "sf_ve1.h"
extern Limb* D_900D164[];
extern Limb* D_901C0F4[];
@@ -2336,7 +2335,7 @@ void func_i1_80194398(Boss* boss) {
}
#else
void func_i1_80194398(Boss* boss);
-#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80194398.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/fox_ve1/func_i1_80194398.s")
#endif
void func_i1_80198310(Boss* boss) {
diff --git a/src/overlays/ovl_i1/sf_ve1.h b/src/overlays/ovl_i1/sf_ve1.h
deleted file mode 100644
index d7e6fa98..00000000
--- a/src/overlays/ovl_i1/sf_ve1.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef OVL_VE1_H
-#define OVL_VE1_H
-
-#include "global.h"
-
-typedef struct {
- /* 0x00 */ char pad_0[0xC];
- /* 0x0C */ f32 unkC;
- /* 0x10 */ char pad_10[0x38];
- /* 0x48 */ s32 unk48;
-} UnkStruct_func_i1_801924A8;
-
-typedef struct {
- /* 0x00 */ char pad_0[0x10];
- /* 0x10 */ f32 unk10;
- /* 0x14 */ char pad_14[0x3C];
- /* 0x50 */ s32 unk50;
-} UnkStruct_func_i1_80192CB0;
-
-#endif
diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c
index dcc8a4c6..41e40c18 100644
--- a/src/overlays/ovl_i4/fox_fo.c
+++ b/src/overlays/ovl_i4/fox_fo.c
@@ -90,7 +90,6 @@ void func_i4_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } };
Vec3f D_i4_8019EE1C[] = { { -1000.0f, 300.0f, 0 }, { 0.0f, 500.0f, 0 } };
-Vec3f D_i4_8019EE34 = { 0.0f, 0.0f, -10000 };
void func_i4_80187960(Actor* actor) {
s32 i;
@@ -367,7 +366,7 @@ void func_i4_80187960(Actor* actor) {
actor3->unk_0E6 = 0;
actor3->state = 2;
if (actor->iwork[0] == 130) {
- Vec3f sp50 = D_i4_8019EE34;
+ Vec3f sp50 = { 0.0f, 0.0f, -10000 };
Actor_Initialize(actor19);
Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y, player->unk_138, 0);
@@ -496,12 +495,12 @@ void func_i4_80188AD0(Actor* actor) {
}
}
-void func_i4_80188DA0(s32 arg0, Vec3f* arg1, void* ptr) {
+void func_i4_80188DA0(s32 limbIndex, Vec3f* rot, void* ptr) {
Vec3f vec = { 0.0f, 0.0f, 0.0f };
Actor* actor = (Actor*) ptr;
if (actor->state == 1) {
- switch (arg0) {
+ switch (limbIndex) {
case 1:
Matrix_MultVec3f(gCalcMatrix, &vec, actor->vwork);
Matrix_GetYRPAngles(gCalcMatrix, &actor->vwork[6]);
@@ -535,31 +534,31 @@ void func_i4_80188DA0(s32 arg0, Vec3f* arg1, void* ptr) {
}
}
-s32 func_i4_80188F08(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* ptr) {
+s32 func_i4_80188F08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* ptr) {
Actor* actor = (Actor*) ptr;
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
- if ((actor->state != 0) && (arg0 != 8)) {
- *arg1 = NULL;
+ if ((actor->state != 0) && (limbIndex != 8)) {
+ *dList = NULL;
}
- switch (arg0) {
+ switch (limbIndex) {
case 1:
case 2:
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case 5:
- arg3->x += actor->fwork[0];
+ rot->x += actor->fwork[0];
break;
case 6:
- arg3->x += actor->fwork[0];
+ rot->x += actor->fwork[0];
break;
case 7:
- arg3->x += actor->fwork[0] * 0.7f;
+ rot->x += actor->fwork[0] * 0.7f;
break;
}
diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c
index 029157d7..af89113c 100644
--- a/src/overlays/ovl_i6/fox_andross.c
+++ b/src/overlays/ovl_i6/fox_andross.c
@@ -160,9 +160,9 @@ void func_i6_801878A8() {
}
}
-extern ObjectInit* D_C036310;
-extern ObjectInit* D_C036B6C;
-extern ObjectInit* D_C03733C;
+extern ObjectInit D_C036310[];
+extern ObjectInit D_C036B6C[];
+extern ObjectInit D_C03733C[];
void func_i6_80187C5C(void) {
Actor* actor;
@@ -1273,8 +1273,8 @@ void func_i6_8018B8C0(Boss* boss) {
}
}
-extern Vtx* D_C017598;
-extern Vtx* D_C038FE8;
+extern Vtx D_C017598[];
+extern Vtx D_C038FE8[];
void func_i6_8018BDD8(void) {
s32 i;
@@ -1284,8 +1284,8 @@ void func_i6_8018BDD8(void) {
Vtx* sp74;
Vtx* sp70;
- sp74 = SEGMENTED_TO_VIRTUAL(&D_C038FE8);
- sp70 = SEGMENTED_TO_VIRTUAL(&D_C017598);
+ sp74 = SEGMENTED_TO_VIRTUAL(D_C038FE8);
+ sp70 = SEGMENTED_TO_VIRTUAL(D_C017598);
for (i = 0; i < 17; i++) {
if (i == 0 || i == 16) {
@@ -3336,7 +3336,7 @@ void func_i6_80193380(Object_80* obj80) {
case 0:
if (fabsf(obj80->obj.pos.z - gPlayer[0].unk_138) < 1800.0f) {
obj80->state = 1;
- obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_C038AC4);
+ obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_C038AC4);
}
break;
case 1:
diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml
index 8d972cbe..ec403fde 100644
--- a/yamls/us/assets.yaml
+++ b/yamls/us/assets.yaml
@@ -10,175 +10,175 @@
type: bin
start: 0x137730
- - name: ast_873CB0 #1
+ - name: ast_common #1
type: bin
start: 0x873CB0
- - name: ast_8A68C0 #2
+ - name: ast_bg_space #2
type: bin
start: 0x8A68C0
- - name: ast_8AE0A0 #2
+ - name: ast_bg_planet #2
type: bin
start: 0x8AE0A0
- - name: ast_8BFC00 #3
+ - name: ast_arwing #3
type: bin
start: 0x8BFC00
- - name: ast_8D99F0 #3
+ - name: ast_landmaster #3
type: bin
start: 0x8D99F0
- - name: ast_8E1F80 #3
+ - name: ast_blue_marine #3
type: bin
start: 0x8E1F80
- - name: ast_8E92D0 #3
+ - name: ast_vs_player #3
type: bin
start: 0x8E92D0
- - name: ast_918430 #4
+ - name: ast_enmy_planet #4
type: bin
start: 0x918430
- - name: ast_922730 #4
+ - name: ast_enmy_space #4
type: bin
start: 0x922730
- - name: ast_92EC40 #E
+ - name: ast_great_fox #E
type: bin
start: 0x92EC40
- - name: ast_940AD0 #F
+ - name: ast_star_wolf #F
type: bin
start: 0x940AD0
- - name: ast_955270 #D
+ - name: ast_allies #D
type: bin
start: 0x955270
- - name: ast_961CE0 #6
+ - name: ast_corneria #6
type: bin
start: 0x961CE0
- - name: ast_9A1460 #6
+ - name: ast_meteo #6
type: bin
start: 0x9A1460
- - name: ast_9D2FD0 #6
+ - name: ast_titania #6
type: bin
start: 0x9D2FD0
- - name: ast_9DD390 #7
+ - name: ast_7_ti_2 #7
type: bin
start: 0x9DD390
- - name: ast_9EB5E0 #8
+ - name: ast_8_ti #8
type: bin
start: 0x9EB5E0
- - name: ast_9F4880 #9
+ - name: ast_9_ti #9
type: bin
start: 0x9F4880
- - name: ast_A049A0 #A
+ - name: ast_A_ti #A
type: bin
start: 0xA049A0
- - name: ast_A0E340 #7
+ - name: ast_7_ti_1 #7
type: bin
start: 0xA0E340
- - name: ast_A1D0F0 #6
+ - name: ast_sector_x #6
type: bin
start: 0xA1D0F0
- - name: ast_A4FBB0 #6
+ - name: ast_sector_z #6
type: bin
start: 0xA4FBB0
- - name: ast_A58F60 #6
+ - name: ast_aquas #6
type: bin
start: 0xA58F60
- - name: ast_A8B470 #6
+ - name: ast_area_6 #6
type: bin
start: 0xA8B470
- - name: ast_AB4000 #6
+ - name: ast_venom_1 #6
type: bin
start: 0xAB4000
- - name: ast_ACF960 #6
+ - name: ast_venom_2 #6
type: bin
start: 0xACF960
- - name: ast_AE60A0 #6, #9
+ - name: ast_ve1_boss #6, #9
type: bin
start: 0xAE60A0
- - name: ast_B0AA00 #6
+ - name: ast_bolse #6
type: bin
start: 0xB0AA00
- - name: ast_B1CA50 #6
+ - name: ast_fortuna #6
type: bin
start: 0xB1CA50
- - name: ast_B2CA50 #6
+ - name: ast_sector_y #6
type: bin
start: 0xB2CA50
- - name: ast_B612E0 #6
+ - name: ast_solar #6
type: bin
start: 0xB612E0
- - name: ast_B84560 #6
+ - name: ast_zoness #6
type: bin
start: 0xB84560
- - name: ast_BB11D0 #6
+ - name: ast_katina #6
type: bin
start: 0xBB11D0
- - name: ast_BC23D0 #6
+ - name: ast_macbeth #6
type: bin
start: 0xBC23D0
- - name: ast_BFA740 #7
+ - name: ast_warp_zone #7
type: bin
start: 0xBFA740
- - name: ast_BFC510 #6
+ - name: ast_title #6
type: bin
start: 0xBFC510
- - name: ast_C48F40 #6
+ - name: ast_menu #6
type: bin
start: 0xC48F40
- - name: ast_CA9DE0 #8
+ - name: ast_option #8
type: bin
start: 0xCA9DE0
- - name: ast_CBFE70 #7
+ - name: ast_versus #7
type: bin
start: 0xCBFE70
- - name: ast_CD2410 #5
+ - name: ast_font #5
type: bin
start: 0xCD2410
- - name: ast_CDDCA0 #9
+ - name: ast_font_3d #9
type: bin
start: 0xCDDCA0
- - name: ast_CE9E70 #C
+ - name: ast_andross #C
type: bin
start: 0xCE9E70
- - name: ast_D25100 #F
+ - name: ast_logo #F
type: bin
start: 0xD25100
# width: 128
@@ -190,30 +190,31 @@
# - [0xD26900, ia8, nintendo_logo_3, 128, 16]
# - [0xD27100, ia8, nintendo_logo_4, 128, 10]
- - name: ast_D27600 #7
+ - name: ast_ending #7
type: bin
start: 0xD27600
- - name: ast_D43400 #8
+ - name: ast_ending_award_front #8
type: bin
start: 0xD43400
- - name: ast_D68480 #8
+ - name: ast_ending_award_back #8
type: bin
start: 0xD68480
- - name: ast_D91F10 #8
+ - name: ast_reward #8
type: bin
start: 0xD91F10
- - name: ast_DDC010 #6
+ - name: ast_training #6
type: bin
start: 0xDDC010
- - name: ast_DE5D50
+ - name: ast_radio
type: code
dir: assets
start: 0xDE5D50
vram: 0x80179010
+ follows_vram: dma_table
subsegments:
- - [0xDE5D50, .data, ast_DE5D50]
+ - [0xDE5D50, .data, ast_radio]
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 90c39aee..8b80806b 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -385,5 +385,6 @@
dir: main
start: 0xDE480
vram: 0x80178A70
+ follows_vram: main
subsegments:
- [0xDE480, .data, dmatable]
diff --git a/yamls/us/overlays.yaml b/yamls/us/overlays.yaml
index fbcd025c..9fadb5a3 100644
--- a/yamls/us/overlays.yaml
+++ b/yamls/us/overlays.yaml
@@ -3,32 +3,34 @@
dir: overlays/ovl_i1
start: 0xDF4260
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0xA10
exclusive_ram_id: overlay
symbol_name_format: i1_$VRAM
subsegments:
- [0xDF4260, c, fox_i1]
- [0xDF4270, c, fox_co]
- - [0xDFEE30, c, sf_ve1]
+ - [0xDFEE30, c, fox_ve1]
- [0xE05620, c, fox_tr]
- [0xE05990, c, fox_tr360]
- [0xE06510, .data, fox_i1]
- [0xE06520, .data, fox_co]
- - [0xE06880, .data, sf_ve1]
+ - [0xE06880, .data, fox_ve1]
- [0xE07B90, .data, fox_tr360]
- [0xE07C30, .rodata, fox_co]
- - [0xE07FF0, .rodata, sf_ve1]
+ - [0xE07FF0, .rodata, fox_ve1]
- [0xE08380, .rodata, fox_tr]
- [0xE083C0, .rodata, fox_tr360]
- { start: 0xE08400, type: .bss, vram: 0x8019B6C0, name: fox_i1 }
- { type: .bss, vram: 0x8019B6D0, name: fox_co }
- - { type: .bss, vram: 0x8019B7F0, name: sf_ve1 }
+ - { type: .bss, vram: 0x8019B7F0, name: fox_ve1 }
- name: ovl_i2
type: code
dir: overlays/ovl_i2
start: 0xE08400
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x40
exclusive_ram_id: overlay
symbol_name_format: i2_$VRAM
@@ -49,6 +51,7 @@
dir: overlays/ovl_i3
start: 0xE16C50
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x2220
exclusive_ram_id: overlay
symbol_name_format: i3_$VRAM
@@ -78,6 +81,7 @@
dir: overlays/ovl_i4
start: 0xE51970
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x1B0
exclusive_ram_id: overlay
symbol_name_format: i4_$VRAM
@@ -107,6 +111,7 @@
dir: overlays/ovl_i5
start: 0xE6A810
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0xAF80
exclusive_ram_id: overlay
symbol_name_format: i5_$VRAM
@@ -136,6 +141,7 @@
dir: overlays/ovl_i6
start: 0xE9F1D0
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x520
exclusive_ram_id: overlay
symbol_name_format: i6_$VRAM
@@ -164,6 +170,7 @@
dir: overlays/ovl_menu
start: 0xEBFBE0
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x17590
exclusive_ram_id: overlay
symbol_name_format: menu_$VRAM
@@ -190,6 +197,7 @@
dir: overlays/ovl_ending
start: 0xEF0260
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x2710
exclusive_ram_id: overlay
symbol_name_format: ending_$VRAM
@@ -208,6 +216,7 @@
dir: overlays/ovl_unused
start: 0xEFFA40
vram: 0x80187520
+ follows_vram: ast_radio
bss_size: 0x10
exclusive_ram_id: overlay
symbol_name_format: unused_$VRAM