Allow course geography to shift (#475)

* Remove course vertex and packed from undefined syms
This commit is contained in:
MegaMech 2023-10-19 23:46:23 -06:00 committed by GitHub
parent 76dc587a34
commit a0f451f2a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 45 deletions

View File

@ -533,7 +533,7 @@ COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/cou
# Course vertices and displaylists are included together due to no alignment between the two files.
%/course_geography.inc.mio0.s: %/course_vertices.inc.mio0 %/course_displaylists_packed.inc.bin
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@

View File

@ -172,50 +172,6 @@ D_0F0BD350 = 0x0F0BD350;
D_0F0CCF50 = 0x0F0CCF50;
D_0F0D0E50 = 0x0F0D0E50;
d_course_mario_raceway_vertex = 0x0F000000;
d_course_moo_moo_farm_vertex = 0x0F000000;
d_course_luigi_raceway_vertex = 0x0F000000;
d_course_sherbet_land_vertex = 0x0F000000;
d_course_kalimari_desert_vertex = 0x0F000000;
d_course_koopa_troopa_beach_vertex = 0x0F000000;
d_course_choco_mountain_vertex = 0x0F000000;
d_course_frappe_snowland_vertex = 0x0F000000;
d_course_toads_turnpike_vertex = 0x0F000000;
d_course_banshee_boardwalk_vertex = 0x0F000000;
d_course_dks_jungle_parkway_vertex = 0x0F000000;
d_course_rainbow_road_vertex = 0x0F000000;
d_course_yoshi_valley_vertex = 0x0F000000;
d_course_bowsers_castle_vertex = 0x0F000000;
d_course_royal_raceway_vertex = 0x0F000000;
d_course_wario_stadium_vertex = 0x0F000000;
d_course_big_donut_vertex = 0x0F000000;
d_course_block_fort_vertex = 0x0F000000;
d_course_double_deck_vertex = 0x0F000000;
d_course_skyscraper_vertex = 0x0F000000;
d_course_luigi_raceway_packed = 0x0F009800;
d_course_mario_raceway_packed = 0x0F0096f4;
d_course_choco_mountain_packed = 0x0F00A0B4;
d_course_bowsers_castle_packed = 0x0f00e368;
d_course_banshee_boardwalk_packed = 0x0f0068e8;
d_course_yoshi_valley_packed = 0x0f007d90;
d_course_frappe_snowland_packed = 0x0f009d24;
d_course_royal_raceway_packed = 0x0f00ec60;
d_course_toads_turnpike_packed = 0x0f00a5d0;
d_course_kalimari_desert_packed = 0x0f00b394;
d_course_sherbet_land_packed = 0x0f0049f8;
d_course_rainbow_road_packed = 0x0f005a5c;
d_course_wario_stadium_packed = 0x0f00a9cc;
d_course_block_fort_packed = 0x0f0018d8;
d_course_skyscraper_packed = 0x0f001678;
d_course_double_deck_packed = 0x0f000cd4;
d_course_dks_jungle_parkway_packed = 0x0f00a45c;
d_course_big_donut_packed = 0x0f001b84;
d_course_koopa_troopa_beach_packed = 0x0f00fd78;
d_course_moo_moo_farm_packed = 0x0f00daec;
D_A4040004 = 0xA4040004;
D_A4040008 = 0xA4040008;
D_A404000C = 0xA404000C;