diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2023-06-30 10:34:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-30 08:34:33 -0600 |
| commit | a966aa178704ddb75726bdd45e28079417e782e4 (patch) | |
| tree | 9603e9de90eda2735085ec305d71b903a639b9e6 /data | |
| parent | 6537b5dc7847ce537b6a3410eee3812bcc65b67b (diff) | |
Add some more asset make and json files (#322)
Course outlines, course previews, unused traffic light, and
character portraits
Signed-off-by: Taggerung <tyler.taggerung@email.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/course_player_selection.s | 100 | ||||
| -rw-r--r-- | data/other_textures.s | 40 |
2 files changed, 60 insertions, 80 deletions
diff --git a/data/course_player_selection.s b/data/course_player_selection.s index b7c657b30..bf868d526 100644 --- a/data/course_player_selection.s +++ b/data/course_player_selection.s @@ -688,104 +688,84 @@ glabel gTextureBowserFace16 glabel gTextureBowserFace16_end .align 2, 0x00 -glabel gCoursePreviewMarioRaceway -.incbin "textures/standalone/course_preview_mario_raceway.rgba16.mio0" -glabel gCoursePreviewMarioRaceway_end +glabel gTextureCoursePreviewMarioRaceway +.incbin "assets/course_previews/gTextureCoursePreviewMarioRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewChocoMountain -.incbin "textures/standalone/course_preview_choco_mountain.rgba16.mio0" -glabel gCoursePreviewChocoMountain_end +glabel gTextureCoursePreviewChocoMountain +.incbin "assets/course_previews/gTextureCoursePreviewChocoMountain.mio0" .align 2, 0x00 -glabel gCoursePreviewBowsersCastle -.incbin "textures/standalone/course_preview_bowsers_castle.rgba16.mio0" -glabel gCoursePreviewBowsersCastle_end +glabel gTextureCoursePreviewBowsersCastle +.incbin "assets/course_previews/gTextureCoursePreviewBowsersCastle.mio0" .align 2, 0x00 -glabel gCoursePreviewBansheeBoardwalk -.incbin "textures/standalone/course_preview_banshee_boardwalk.rgba16.mio0" -glabel gCoursePreviewBansheeBoardwalk_end +glabel gTextureCoursePreviewBansheeBoardwalk +.incbin "assets/course_previews/gTextureCoursePreviewBansheeBoardwalk.mio0" .align 2, 0x00 -glabel gCoursePreviewYoshiValley -.incbin "textures/standalone/course_preview_yoshi_valley.rgba16.mio0" -glabel gCoursePreviewYoshiValley_end +glabel gTextureCoursePreviewYoshiValley +.incbin "assets/course_previews/gTextureCoursePreviewYoshiValley.mio0" .align 2, 0x00 -glabel gCoursePreviewFrappeSnowland -.incbin "textures/standalone/course_preview_frappe_snowland.rgba16.mio0" -glabel gCoursePreviewFrappeSnowland_end +glabel gTextureCoursePreviewFrappeSnowland +.incbin "assets/course_previews/gTextureCoursePreviewFrappeSnowland.mio0" .align 2, 0x00 -glabel gCoursePreviewKoopaTroopaBeach -.incbin "textures/standalone/course_preview_koopa_troopa_beach.rgba16.mio0" -glabel gCoursePreviewKoopaTroopaBeach_end +glabel gTextureCoursePreviewKoopaTroopaBeach +.incbin "assets/course_previews/gTextureCoursePreviewKoopaTroopaBeach.mio0" .align 2, 0x00 -glabel gCoursePreviewRoyalRaceway -.incbin "textures/standalone/course_preview_royal_raceway.rgba16.mio0" -glabel gCoursePreviewRoyalRaceway_end +glabel gTextureCoursePreviewRoyalRaceway +.incbin "assets/course_previews/gTextureCoursePreviewRoyalRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewLuigiRaceway -.incbin "textures/standalone/course_preview_luigi_raceway.rgba16.mio0" -glabel gCoursePreviewLuigiRaceway_end +glabel gTextureCoursePreviewLuigiRaceway +.incbin "assets/course_previews/gTextureCoursePreviewLuigiRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewMooMooFarm -.incbin "textures/standalone/course_preview_moo_moo_farm.rgba16.mio0" -glabel gCoursePreviewMooMooFarm_end +glabel gTextureCoursePreviewMooMooFarm +.incbin "assets/course_previews/gTextureCoursePreviewMooMooFarm.mio0" .align 2, 0x00 -glabel gCoursePreviewToadsTurnpike -.incbin "textures/standalone/course_preview_toads_turnpike.rgba16.mio0" -glabel gCoursePreviewToadsTurnpike_end +glabel gTextureCoursePreviewToadsTurnpike +.incbin "assets/course_previews/gTextureCoursePreviewToadsTurnpike.mio0" .align 2, 0x00 -glabel gCoursePreviewKalimariDesert -.incbin "textures/standalone/course_preview_kalimari_desert.rgba16.mio0" -glabel gCoursePreviewKalimariDesert_end +glabel gTextureCoursePreviewKalimariDesert +.incbin "assets/course_previews/gTextureCoursePreviewKalimariDesert.mio0" .align 2, 0x00 -glabel gCoursePreviewSherbetLand -.incbin "textures/standalone/course_preview_sherbet_land.rgba16.mio0" -glabel gCoursePreviewSherbetLand_end +glabel gTextureCoursePreviewSherbetLand +.incbin "assets/course_previews/gTextureCoursePreviewSherbetLand.mio0" .align 2, 0x00 -glabel gCoursePreviewRainbowRoad -.incbin "textures/standalone/course_preview_rainbow_road.rgba16.mio0" -glabel gCoursePreviewRainbowRoad_end +glabel gTextureCoursePreviewRainbowRoad +.incbin "assets/course_previews/gTextureCoursePreviewRainbowRoad.mio0" .align 2, 0x00 -glabel gCoursePreviewWarioStadium -.incbin "textures/standalone/course_preview_wario_stadium.rgba16.mio0" -glabel gCoursePreviewWarioStadium_end +glabel gTextureCoursePreviewWarioStadium +.incbin "assets/course_previews/gTextureCoursePreviewWarioStadium.mio0" .align 2, 0x00 -glabel gCoursePreviewBlockFort -.incbin "textures/standalone/course_preview_block_fort.rgba16.mio0" -glabel gCoursePreviewBlockFort_end +glabel gTextureCoursePreviewBlockFort +.incbin "assets/course_previews/gTextureCoursePreviewBlockFort.mio0" .align 2, 0x00 -glabel gCoursePreviewSkyscraper -.incbin "textures/standalone/course_preview_skyscraper.rgba16.mio0" -glabel gCoursePreviewSkyscraper_end +glabel gTextureCoursePreviewSkyscraper +.incbin "assets/course_previews/gTextureCoursePreviewSkyscraper.mio0" .align 2, 0x00 -glabel gCoursePreviewDoubleDeck -.incbin "textures/standalone/course_preview_double_deck.rgba16.mio0" -glabel gCoursePreviewDoubleDeck_end +glabel gTextureCoursePreviewDoubleDeck +.incbin "assets/course_previews/gTextureCoursePreviewDoubleDeck.mio0" .align 2, 0x00 -glabel gCoursePreviewDksJungleParkway -.incbin "textures/standalone/course_preview_dks_jungle_parkway.rgba16.mio0" -glabel gCoursePreviewDksJungleParkway_end +glabel gTextureCoursePreviewDksJungleParkway +.incbin "assets/course_previews/gTextureCoursePreviewDksJungleParkway.mio0" .align 2, 0x00 -glabel gCoursePreviewBigDonut -.incbin "textures/standalone/course_preview_big_donut.rgba16.mio0" -glabel gCoursePreviewBigDonut_end +glabel gTextureCoursePreviewBigDonut +.incbin "assets/course_previews/gTextureCoursePreviewBigDonut.mio0" .align 2, 0x00 glabel gTextureTrophyGold diff --git a/data/other_textures.s b/data/other_textures.s index af6bbe9b3..7841ebd7e 100644 --- a/data/other_textures.s +++ b/data/other_textures.s @@ -1604,80 +1604,80 @@ glabel gTextureLogoMarioKart64 .balign 4, 0x00 glabel gTextureCourseOutlineMarioRaceway -.incbin "textures/standalone/course_outline_mario_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineMarioRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineChocoMountain -.incbin "textures/standalone/course_outline_choco_mountain.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineChocoMountain.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBowsersCastle -.incbin "textures/standalone/course_outline_bowsers_castle.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBowsersCastle.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBansheeBoardwalk -.incbin "textures/standalone/course_outline_banshee_boardwalk.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBansheeBoardwalk.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineYoshiValley -.incbin "textures/standalone/course_outline_yoshi_valley.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineYoshiValley.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineFrappeSnowland -.incbin "textures/standalone/course_outline_frappe_snowland.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineFrappeSnowland.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineKoopaTroopaBeach -.incbin "textures/standalone/course_outline_koopa_troopa_beach.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineKoopaTroopaBeach.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineRoyalRaceway -.incbin "textures/standalone/course_outline_royal_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineRoyalRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineLuigiRaceway -.incbin "textures/standalone/course_outline_luigi_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineLuigiRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineMooMooFarm -.incbin "textures/standalone/course_outline_moo_moo_farm.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineMooMooFarm.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineToadsTurnpike -.incbin "textures/standalone/course_outline_toads_turnpike.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineToadsTurnpike.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineKalimariDesert -.incbin "textures/standalone/course_outline_kalimari_desert.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineKalimariDesert.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineSherbetLand -.incbin "textures/standalone/course_outline_sherbet_land.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineSherbetLand.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineRainbowRoad -.incbin "textures/standalone/course_outline_rainbow_road.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineRainbowRoad.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineWarioStadium -.incbin "textures/standalone/course_outline_wario_stadium.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineWarioStadium.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBlockFort -.incbin "textures/standalone/course_outline_block_fort.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBlockFort.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineSkyscraper -.incbin "textures/standalone/course_outline_skyscraper.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineSkyscraper.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineDoubleDeck -.incbin "textures/standalone/course_outline_double_deck.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineDoubleDeck.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineDksJungleParkway -.incbin "textures/standalone/course_outline_dks_jungle_parkway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineDksJungleParkway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBigDonut -.incbin "textures/standalone/course_outline_big_donut.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBigDonut.mio0" |
