mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-07-01 12:29:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Asset names and headers (#131)

Browse Source 
* assets and such

* here goes

* here goes again

* once more

* once more

* type fixing

* type fixing

* type fixing

* here goes

* here goes

* format
This commit is contained in:
petrie911
2024-02-16 18:58:59 -06:00
committed by GitHub
parent 324115177e
commit 9346a22c63
71 changed files with 1406 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/ast_DE5D50.c → src/assets/ast_radio.c
View File
src/main/dmatable.c
+61 -49
View File
@@ -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 },
src/main/fox_context.c
+1 -131
View File
@@ -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"
src/main/fox_demo.c
+14 -9
View File
@@ -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) {
src/main/fox_load.c
+5 -5
View File
@@ -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));
}
src/main/fox_load_inits.c
+285 -285
View File
@@ -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,
src/overlays/ovl_ending/fox_end2.c
+1 -1
View File
@@ -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 {
src/overlays/ovl_ending/fox_end2_data.c
+1 -1
View File
@@ -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
src/overlays/ovl_i1/fox_co.c
+1 -1
View File
@@ -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;
src/overlays/ovl_i1/sf_ve1.c → src/overlays/ovl_i1/fox_ve1.c
+1 -2
View File
@@ -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) {
src/overlays/ovl_i1/sf_ve1.h
-20
View File
@@ -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
src/overlays/ovl_i4/fox_fo.c
+10 -11
View File
@@ -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;
}
src/overlays/ovl_i6/fox_andross.c
+8 -8
View File
@@ -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: