mirror of
https://github.com/HarbourMasters/Starship
synced 2026-09-02 18:52:52 -04:00
support for EU rev 0, updates to tools, other cleanup (#255)
* srceu * remove warning * and some cleanup
This commit is contained in:
petrie911
+64
-78
@@ -6,82 +6,68 @@
|
||||
{ NULL, { NULL, NULL }, false }
|
||||
|
||||
DmaEntry gDmaTable[90] = {
|
||||
{ SEGMENT_ROM_START(makerom), { SEGMENT_ROM_START(makerom), SEGMENT_ROM_END(makerom) }, false },
|
||||
{ SEGMENT_ROM_START(main), { SEGMENT_ROM_START(main), SEGMENT_ROM_END(main) }, false },
|
||||
{ SEGMENT_ROM_START(dma_table), { SEGMENT_ROM_START(dma_table), SEGMENT_ROM_END(dma_table) }, false },
|
||||
{ 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_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_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, 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_map), { SEGMENT_ROM_START(ast_map), SEGMENT_ROM_END(ast_map) }, false },
|
||||
{ SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
|
||||
{ SEGMENT_ROM_START(ast_vs_menu), { SEGMENT_ROM_START(ast_vs_menu), SEGMENT_ROM_END(ast_vs_menu) }, false },
|
||||
{ SEGMENT_ROM_START(ast_text), { SEGMENT_ROM_START(ast_text), SEGMENT_ROM_END(ast_text) }, 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_ending_expert),
|
||||
{ SEGMENT_ROM_START(ast_ending_expert), SEGMENT_ROM_END(ast_ending_expert) },
|
||||
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 },
|
||||
{ SEGMENT_ROM_START(ovl_i4), { SEGMENT_ROM_START(ovl_i4), SEGMENT_ROM_END(ovl_i4) }, false },
|
||||
{ SEGMENT_ROM_START(ovl_i5), { SEGMENT_ROM_START(ovl_i5), SEGMENT_ROM_END(ovl_i5) }, false },
|
||||
{ SEGMENT_ROM_START(ovl_i6), { SEGMENT_ROM_START(ovl_i6), SEGMENT_ROM_END(ovl_i6) }, false },
|
||||
{ SEGMENT_ROM_START(ovl_menu), { SEGMENT_ROM_START(ovl_menu), SEGMENT_ROM_END(ovl_menu) }, false },
|
||||
{ SEGMENT_ROM_START(ovl_ending), { SEGMENT_ROM_START(ovl_ending), SEGMENT_ROM_END(ovl_ending) }, false },
|
||||
{ SEGMENT_ROM_START(ovl_unused), { SEGMENT_ROM_START(ovl_unused), SEGMENT_ROM_END(ovl_unused) }, false },
|
||||
DMA_ENTRY(makerom),
|
||||
DMA_ENTRY(main),
|
||||
DMA_ENTRY(dma_table),
|
||||
DMA_ENTRY(audio_seq),
|
||||
DMA_ENTRY(audio_bank),
|
||||
DMA_ENTRY(audio_table),
|
||||
DMA_ENTRY(ast_common),
|
||||
DMA_ENTRY(ast_bg_space),
|
||||
DMA_ENTRY(ast_bg_planet),
|
||||
DMA_ENTRY(ast_arwing),
|
||||
DMA_ENTRY(ast_landmaster),
|
||||
DMA_ENTRY(ast_blue_marine),
|
||||
DMA_ENTRY(ast_versus),
|
||||
DMA_ENTRY(ast_enmy_planet),
|
||||
DMA_ENTRY(ast_enmy_space),
|
||||
DMA_ENTRY(ast_great_fox),
|
||||
DMA_ENTRY(ast_star_wolf),
|
||||
DMA_ENTRY(ast_allies),
|
||||
DMA_ENTRY(ast_corneria),
|
||||
DMA_ENTRY(ast_meteo),
|
||||
DMA_ENTRY(ast_titania),
|
||||
DMA_ENTRY(ast_7_ti_2),
|
||||
DMA_ENTRY(ast_8_ti),
|
||||
DMA_ENTRY(ast_9_ti),
|
||||
DMA_ENTRY(ast_A_ti),
|
||||
DMA_ENTRY(ast_7_ti_1),
|
||||
DMA_ENTRY(ast_sector_x),
|
||||
DMA_ENTRY(ast_sector_z),
|
||||
DMA_ENTRY(ast_aquas),
|
||||
DMA_ENTRY(ast_area_6),
|
||||
DMA_ENTRY(ast_venom_1),
|
||||
DMA_ENTRY(ast_venom_2),
|
||||
DMA_ENTRY(ast_ve1_boss),
|
||||
DMA_ENTRY(ast_bolse),
|
||||
DMA_ENTRY(ast_fortuna),
|
||||
DMA_ENTRY(ast_sector_y),
|
||||
DMA_ENTRY(ast_solar),
|
||||
DMA_ENTRY(ast_zoness),
|
||||
DMA_ENTRY(ast_katina),
|
||||
DMA_ENTRY(ast_macbeth),
|
||||
DMA_ENTRY(ast_warp_zone),
|
||||
DMA_ENTRY(ast_title),
|
||||
DMA_ENTRY(ast_map),
|
||||
DMA_ENTRY(ast_option),
|
||||
DMA_ENTRY(ast_vs_menu),
|
||||
DMA_ENTRY(ast_text),
|
||||
DMA_ENTRY(ast_font_3d),
|
||||
DMA_ENTRY(ast_andross),
|
||||
DMA_ENTRY(ast_logo),
|
||||
DMA_ENTRY(ast_ending),
|
||||
DMA_ENTRY(ast_ending_award_front),
|
||||
DMA_ENTRY(ast_ending_award_back),
|
||||
DMA_ENTRY(ast_ending_expert),
|
||||
DMA_ENTRY(ast_training),
|
||||
DMA_ENTRY(ast_radio),
|
||||
DMA_ENTRY(ovl_i1),
|
||||
DMA_ENTRY(ovl_i2),
|
||||
DMA_ENTRY(ovl_i3),
|
||||
DMA_ENTRY(ovl_i4),
|
||||
DMA_ENTRY(ovl_i5),
|
||||
DMA_ENTRY(ovl_i6),
|
||||
DMA_ENTRY(ovl_menu),
|
||||
DMA_ENTRY(ovl_ending),
|
||||
DMA_ENTRY(ovl_unused),
|
||||
};
|
||||
|
||||
@@ -20,9 +20,9 @@ void Graphics_NMIWipe(void) {
|
||||
Graphics_FillRectangle(&gMasterDisp, SCREEN_MARGIN, SCREEN_MARGIN,
|
||||
MIN(SCREEN_WIDTH - 2 * SCREEN_MARGIN, sWipeBarLength) + SCREEN_MARGIN,
|
||||
SCREEN_HEIGHT / 4 + SCREEN_MARGIN / 2, 0, 0, 0, 255);
|
||||
Graphics_FillRectangle(&gMasterDisp,
|
||||
SCREEN_WIDTH - SCREEN_MARGIN - MIN(SCREEN_WIDTH - 2 * SCREEN_MARGIN, sWipeBarLength),
|
||||
SCREEN_HEIGHT / 4 + SCREEN_MARGIN / 2, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2, 0, 0, 0, 255);
|
||||
Graphics_FillRectangle(
|
||||
&gMasterDisp, SCREEN_WIDTH - SCREEN_MARGIN - MIN(SCREEN_WIDTH - 2 * SCREEN_MARGIN, sWipeBarLength),
|
||||
SCREEN_HEIGHT / 4 + SCREEN_MARGIN / 2, SCREEN_WIDTH - SCREEN_MARGIN, SCREEN_HEIGHT / 2, 0, 0, 0, 255);
|
||||
Graphics_FillRectangle(&gMasterDisp, SCREEN_MARGIN, SCREEN_HEIGHT / 2,
|
||||
MIN(SCREEN_WIDTH - 2 * SCREEN_MARGIN, sWipeBarLength) + SCREEN_MARGIN,
|
||||
3 * SCREEN_HEIGHT / 4 - SCREEN_MARGIN / 2, 0, 0, 0, 255);
|
||||
|
||||
Reference in New Issue
Block a user