diff options
| author | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-12-05 21:41:58 -0700 |
|---|---|---|
| committer | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-12-05 21:41:58 -0700 |
| commit | 19135c9ee83643ea863d5725c22319e502938cac (patch) | |
| tree | ec4792402d73607e1c80e8b6a4cf766c5ac0e171 /courses | |
| parent | 7628e98e37d72aa508aa1af276ef8e3485df339c (diff) | |
load course dl textures from otr and move objects
Diffstat (limited to 'courses')
21 files changed, 1 insertions, 462 deletions
diff --git a/courses/all_course_offsets.h b/courses/all_course_offsets.h index 3deb7e79a..a94f34483 100644 --- a/courses/all_course_offsets.h +++ b/courses/all_course_offsets.h @@ -34,25 +34,4 @@ extern Gfx* sherbet_land_dls_2[]; extern Gfx* wario_stadium_dls[]; #endif -extern const course_texture banshee_boardwalk_textures[]; -extern const course_texture big_donut_textures[]; -extern const course_texture block_fort_textures[]; -extern const course_texture bowsers_castle_textures[]; -extern const course_texture choco_mountain_textures[]; -extern const course_texture double_deck_textures[]; -extern const course_texture frappe_snowland_textures[]; -extern const course_texture kalimari_desert_textures[]; -extern const course_texture koopa_troopa_beach_textures[]; -extern const course_texture luigi_raceway_textures[]; -extern const course_texture mario_raceway_textures[]; -extern const course_texture moo_moo_farm_textures[]; -extern const course_texture rainbow_road_textures[]; -extern const course_texture royal_raceway_textures[]; -extern const course_texture sherbet_land_textures[]; -extern const course_texture skyscraper_textures[]; -extern const course_texture toads_turnpike_textures[]; -extern const course_texture wario_stadium_textures[]; -extern const course_texture yoshi_valley_textures[]; -extern const course_texture dks_jungle_parkway_textures[]; - #endif diff --git a/courses/banshee_boardwalk/course_offsets.c b/courses/banshee_boardwalk/course_offsets.c index 3ddce786a..3ccec5dd7 100644 --- a/courses/banshee_boardwalk/course_offsets.c +++ b/courses/banshee_boardwalk/course_offsets.c @@ -9,32 +9,6 @@ #include <assets/banshee_boardwalk_data.h> #include <libultra/gbi.h> -const course_texture banshee_boardwalk_textures[] = { - { gTexture6447C4, 0x0106, 0x0800, 0x0 }, - { gTexture676FB0, 0x0525, 0x0800, 0x0 }, - { gTexture643B3C, 0x0798, 0x0800, 0x0 }, - { gTexture64BB60, 0x0169, 0x0800, 0x0 }, - { gTexture64BCCC, 0x0450, 0x0800, 0x0 }, - { gTexture64FBF4, 0x0274, 0x0800, 0x0 }, - { gTexture651B20, 0x041D, 0x0800, 0x0 }, - { gTexture66262C, 0x02F7, 0x0800, 0x0 }, - { gTexture668728, 0x01F5, 0x0800, 0x0 }, - { gTexture66A3DC, 0x07C5, 0x0800, 0x0 }, - { gTexture66CA98, 0x02C9, 0x0800, 0x0 }, - { gTexture66CD64, 0x02C0, 0x0800, 0x0 }, - { gTexture66D698, 0x0370, 0x0800, 0x0 }, - { gTexture66E608, 0x05E8, 0x0800, 0x0 }, - { gTexture67B388, 0x03D2, 0x0800, 0x0 }, - { gTextureSignWelcome0, 0x0A2E, 0x1000, 0x0 }, - { gTextureSignWelcome1, 0x0A0A, 0x1000, 0x0 }, - { gTextureSignWoodenBack0, 0x06EF, 0x1000, 0x0 }, - { gTextureSignWoodenBack1, 0x06D1, 0x1000, 0x0 }, - { gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 }, - { gTexture68D940, 0x057D, 0x0800, 0x0 }, - { gTexture685AC0, 0x07CC, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* banshee_boardwalk_dls[] = { d_course_banshee_boardwalk_dl_A0, d_course_banshee_boardwalk_dl_210, d_course_banshee_boardwalk_dl_160, d_course_banshee_boardwalk_dl_270, d_course_banshee_boardwalk_dl_358, d_course_banshee_boardwalk_dl_4F0, diff --git a/courses/big_donut/course_offsets.c b/courses/big_donut/course_offsets.c index e17299856..6ff63f913 100644 --- a/courses/big_donut/course_offsets.c +++ b/courses/big_donut/course_offsets.c @@ -1,8 +1,4 @@ #include <libultra/types.h> #include "course_offsets.h" -const course_texture big_donut_textures[] = { - { gTexture66ABA4, 0x0312, 0x0800, 0x0 }, { gTexture6747C4, 0x0145, 0x0800, 0x0 }, - { gTexture67490C, 0x021C, 0x0800, 0x0 }, { gTexture64BA50, 0x0110, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; + diff --git a/courses/block_fort/course_offsets.c b/courses/block_fort/course_offsets.c index facb98715..03416690a 100644 --- a/courses/block_fort/course_offsets.c +++ b/courses/block_fort/course_offsets.c @@ -1,10 +1,3 @@ #include <libultra/types.h> #include "course_offsets.h" #include <assets/other_textures.h> - -const course_texture block_fort_textures[] = { - { gTexture64286C, 0x010A, 0x0800, 0x0 }, { gTextureGrayCheckerboard, 0x010C, 0x0800, 0x0 }, - { gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 }, { gTexture64275C, 0x0110, 0x0800, 0x0 }, - { gTexture642978, 0x010D, 0x0800, 0x0 }, { gTexture6747C4, 0x0145, 0x0800, 0x0 }, - { gTexture6442D4, 0x0138, 0x0800, 0x0 }, { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; diff --git a/courses/bowsers_castle/course_offsets.c b/courses/bowsers_castle/course_offsets.c index 1ca988f68..1565c754c 100644 --- a/courses/bowsers_castle/course_offsets.c +++ b/courses/bowsers_castle/course_offsets.c @@ -2,38 +2,6 @@ #include "course_offsets.h" #include <assets/bowsers_castle_data.h> -const course_texture bowsers_castle_textures[] = { - { gTexture64313C, 0x01B8, 0x0800, 0x0 }, - { gTexture6528DC, 0x0278, 0x0800, 0x0 }, - { gTexture66ED38, 0x010E, 0x0800, 0x0 }, - { gTexture676C6C, 0x0110, 0x0800, 0x0 }, - { gTexture676EA8, 0x0108, 0x0800, 0x0 }, - { gTexture679D34, 0x0106, 0x0800, 0x0 }, - { gTextureGrass6, 0x023B, 0x0800, 0x0 }, - { gTexture6522E0, 0x05FC, 0x0800, 0x0 }, - { gTexture651F40, 0x039F, 0x0800, 0x0 }, - { gTextureRoofTile, 0x0129, 0x0800, 0x0 }, - { gTextureSignBowser0, 0x07D0, 0x1000, 0x0 }, - { gTextureSignBowser1, 0x064D, 0x1000, 0x0 }, - { gTexture66ABA4, 0x0312, 0x0800, 0x0 }, - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTexture6733CC, 0x020E, 0x0800, 0x0 }, - { gTexture673118, 0x02B1, 0x0800, 0x0 }, - { gTexture673FF8, 0x035B, 0x0800, 0x0 }, - { gTexture674B28, 0x0230, 0x0800, 0x0 }, - { gTextureSignGreenArrow, 0x025B, 0x1000, 0x0 }, - { gTexture68D834, 0x010A, 0x0800, 0x0 }, - { gTexture676D7C, 0x012C, 0x0800, 0x0 }, - { gTexture67ADF0, 0x0595, 0x0800, 0x0 }, - { gTexture67EFEC, 0x016F, 0x0800, 0x0 }, - { gTexture653DB0, 0x06AE, 0x0800, 0x0 }, - { gTexture66CA98, 0x02C9, 0x0800, 0x0 }, - { gTexture673990, 0x02D8, 0x0800, 0x0 }, - { gTexture67A370, 0x05AA, 0x0800, 0x0 }, - { gTexture67A91C, 0x04D1, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* bowsers_castle_dls[] = { d_course_bowsers_castle_dl_0, d_course_bowsers_castle_dl_230, d_course_bowsers_castle_dl_110, d_course_bowsers_castle_dl_398, d_course_bowsers_castle_dl_428, d_course_bowsers_castle_dl_640, diff --git a/courses/choco_mountain/course_offsets.c b/courses/choco_mountain/course_offsets.c index 198d346a9..99babf668 100644 --- a/courses/choco_mountain/course_offsets.c +++ b/courses/choco_mountain/course_offsets.c @@ -2,30 +2,6 @@ #include "course_offsets.h" #include <assets/choco_mountain_data.h> -const course_texture choco_mountain_textures[] = { - { gTexture64619C, 0x0124, 0x0800, 0x0 }, - { gTexture64647C, 0x0829, 0x1000, 0x0 }, - { gTexture647F4C, 0x05BC, 0x1000, 0x0 }, - { gTexture64FBF4, 0x0274, 0x0800, 0x0 }, - { gTexture653DB0, 0x06AE, 0x0800, 0x0 }, - { gTexture652B54, 0x0606, 0x0800, 0x0 }, - { gTexture65315C, 0x04A9, 0x0800, 0x0 }, - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, - { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, - { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 }, - { gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, - { gTexture6774D8, 0x0113, 0x0800, 0x0 }, - { gTextureSignFallingRocks, 0x012C, 0x0800, 0x0 }, - { gTextureSignBackside, 0x011E, 0x0800, 0x0 }, - { gTexture679C04, 0x012F, 0x0800, 0x0 }, - { gTexture67B864, 0x014C, 0x0800, 0x0 }, - { gTexture67DC20, 0x03EF, 0x0800, 0x0 }, - { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, - { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* choco_mountain_dls[] = { d_course_choco_mountain_dl_0, d_course_choco_mountain_dl_150, d_course_choco_mountain_dl_B0, d_course_choco_mountain_dl_208, d_course_choco_mountain_dl_2A8, d_course_choco_mountain_dl_410, diff --git a/courses/dks_jungle_parkway/course_offsets.c b/courses/dks_jungle_parkway/course_offsets.c index 347fe7277..587df1c59 100644 --- a/courses/dks_jungle_parkway/course_offsets.c +++ b/courses/dks_jungle_parkway/course_offsets.c @@ -2,34 +2,6 @@ #include "course_offsets.h" #include <assets/dks_jungle_parkway_data.h> -const course_texture dks_jungle_parkway_textures[] = { - { gTexture648508, 0x01FE, 0x1000, 0x0 }, - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, - { gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0 }, - { gTexture654460, 0x0B12, 0x1000, 0x0 }, - { gTexture654F74, 0x0A24, 0x1000, 0x0 }, - { gTexture655998, 0x059F, 0x0800, 0x0 }, - { gTexture655F38, 0x0BB9, 0x1000, 0x0 }, - { gTexture656AF4, 0x0AD3, 0x1000, 0x0 }, - { gTexture6575C8, 0x0DA7, 0x1000, 0x0 }, - { gTexture658370, 0x0DBA, 0x1000, 0x0 }, - { gTexture65912C, 0x0DBC, 0x1000, 0x0 }, - { gTexture659EE8, 0x0EF5, 0x1000, 0x0 }, - { gTexture65ADE0, 0x0D5A, 0x1000, 0x0 }, - { gTexture65BB3C, 0x0D9E, 0x1000, 0x0 }, - { gTexture65C8DC, 0x0CF5, 0x1000, 0x0 }, - { gTexture65D5D4, 0x0D18, 0x1000, 0x0 }, - { gTexture65E2EC, 0x02B0, 0x0800, 0x0 }, - { gTexture65EAEC, 0x034A, 0x0800, 0x0 }, - { gTexture65E59C, 0x054F, 0x1000, 0x0 }, - { gTexture65EE38, 0x0CDE, 0x1000, 0x0 }, - { gTexture65FB18, 0x03EE, 0x0800, 0x0 }, - { gTextureSignPinkArrow, 0x0198, 0x0800, 0x0 }, - { gTextureWaves0, 0x04D0, 0x0800, 0x0 }, - { gTexture683844, 0x0655, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* d_course_dks_jungle_parkway_unknown_dl_list[] = { d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180, d_course_dks_jungle_parkway_dl_310, d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628, diff --git a/courses/double_deck/course_offsets.c b/courses/double_deck/course_offsets.c index 66f70ded3..9a8b4abc6 100644 --- a/courses/double_deck/course_offsets.c +++ b/courses/double_deck/course_offsets.c @@ -1,8 +1,2 @@ #include <libultra/types.h> #include "course_offsets.h" - -const course_texture double_deck_textures[] = { - { gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 }, - { gTexture642978, 0x010D, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; diff --git a/courses/frappe_snowland/course_offsets.c b/courses/frappe_snowland/course_offsets.c index 76f5b4458..f832eb03e 100644 --- a/courses/frappe_snowland/course_offsets.c +++ b/courses/frappe_snowland/course_offsets.c @@ -2,14 +2,6 @@ #include "course_offsets.h" #include <assets/frappe_snowland_data.h> -const course_texture frappe_snowland_textures[] = { - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, { gTexture66CA98, 0x02C9, 0x0800, 0x0 }, - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, { gTexture675434, 0x0245, 0x0800, 0x0 }, - { gTexture677F04, 0x0213, 0x0800, 0x0 }, { gTexture678118, 0x0314, 0x0800, 0x0 }, - { gTexture679258, 0x04E3, 0x1000, 0x0 }, { gTexture67973C, 0x04C6, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* d_course_frappe_snowland_dl_list[] = { d_course_frappe_snowland_dl_0, d_course_frappe_snowland_dl_1B8, d_course_frappe_snowland_dl_C8, d_course_frappe_snowland_dl_298, d_course_frappe_snowland_dl_398, d_course_frappe_snowland_dl_540, diff --git a/courses/kalimari_desert/course_offsets.c b/courses/kalimari_desert/course_offsets.c index 78642e55b..2f7f876bd 100644 --- a/courses/kalimari_desert/course_offsets.c +++ b/courses/kalimari_desert/course_offsets.c @@ -2,22 +2,6 @@ #include "course_offsets.h" #include <assets/kalimari_desert_data.h> -const course_texture kalimari_desert_textures[] = { - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 }, - { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 }, - { gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, { gTexture67490C, 0x021C, 0x0800, 0x0 }, - { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 }, - { gTexture646CA8, 0x073A, 0x1000, 0x0 }, { gTexture6473E4, 0x05AD, 0x1000, 0x0 }, - { gTexture647994, 0x05B5, 0x1000, 0x0 }, { gTexture668920, 0x03D9, 0x0800, 0x0 }, - { gTextureRailroadTrack, 0x0B5B, 0x1000, 0x0 }, { gTextureRailroadCrossingTrack, 0x0208, 0x1000, 0x0 }, - { gTexture67291C, 0x059C, 0x0800, 0x0 }, { gTextureFenceBarbedWire, 0x021E, 0x1000, 0x0 }, - { gTexture67D304, 0x091C, 0x1000, 0x0 }, { gTexture67E010, 0x0415, 0x0800, 0x0 }, - { gTexture67EEAC, 0x0140, 0x0800, 0x0 }, { gTextureSignShellShot0, 0x038C, 0x1000, 0x0 }, - { gTextureSignShellShot1, 0x0247, 0x1000, 0x0 }, { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 }, - { gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 }, { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* kalimari_desert_dls[] = { d_course_kalimari_desert_dl_0, d_course_kalimari_desert_dl_258, d_course_kalimari_desert_dl_100, d_course_kalimari_desert_dl_310, d_course_kalimari_desert_dl_4A0, d_course_kalimari_desert_dl_778, diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c index 13a187933..50ab4c90c 100644 --- a/courses/koopa_troopa_beach/course_offsets.c +++ b/courses/koopa_troopa_beach/course_offsets.c @@ -3,26 +3,6 @@ #include <assets/koopa_troopa_beach_data.h> #include "animation.h" -const course_texture koopa_troopa_beach_textures[] = { - { gTexture643B3C, 0x0798, 0x0800, 0x0 }, - { gTexture66A3DC, 0x07C5, 0x0800, 0x0 }, - { gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 }, - { gTexture66DD38, 0x0330, 0x1000, 0x0 }, - { gTexture643430, 0x0604, 0x0800, 0x0 }, - { gTexture660D8C, 0x0126, 0x0800, 0x0 }, - { gTexture6609D0, 0x03BB, 0x1000, 0x0 }, - { gTextureGrass12, 0x0874, 0x0800, 0x0 }, - { gTexture66CA98, 0x02C9, 0x0800, 0x0 }, - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTexture67BEE8, 0x02D0, 0x0800, 0x0 }, - { gTextureSandFinish, 0x022E, 0x0800, 0x0 }, - { gTextureWheelSteamEngine, 0x020F, 0x0800, 0x0 }, - { gTexture669570, 0x0E6B, 0x1000, 0x0 }, - { gTextureWaves1, 0x05C4, 0x0800, 0x0 }, - { gTextureWaves2, 0x0488, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - Gfx* d_course_koopa_troopa_beach_dl_list1[] = { d_course_koopa_troopa_beach_dl_90, d_course_koopa_troopa_beach_dl_278, d_course_koopa_troopa_beach_dl_188, d_course_koopa_troopa_beach_dl_3C0, d_course_koopa_troopa_beach_dl_4B0, d_course_koopa_troopa_beach_dl_6E0, diff --git a/courses/luigi_raceway/course_offsets.c b/courses/luigi_raceway/course_offsets.c index 38abdbd7e..b740bcccd 100644 --- a/courses/luigi_raceway/course_offsets.c +++ b/courses/luigi_raceway/course_offsets.c @@ -2,50 +2,6 @@ #include "course_offsets.h" #include <assets/luigi_raceway_data.h> -const course_texture luigi_raceway_textures[] = { - { gTextureSignShellShot0, 0x038C, 0x1000, 0x0 }, - { gTextureSignShellShot1, 0x0247, 0x1000, 0x0 }, - { gTextureCheckerboardYellowBlue, 0x013A, 0x0800, 0x0 }, - { gTexture64619C, 0x0124, 0x0800, 0x0 }, - { gTextureCheckerboardBlueGreen, 0x0139, 0x0800, 0x0 }, - { gTextureGrass3, 0x0372, 0x0800, 0x0 }, - { gTextureFlagRed, 0x019E, 0x0800, 0x0 }, - { gTexture65100C, 0x0120, 0x0800, 0x0 }, - { gTexture65112C, 0x0150, 0x0800, 0x0 }, - { gTexture653608, 0x07A7, 0x0800, 0x0 }, - { gTextureGrass11, 0x01F8, 0x0800, 0x0 }, - { gTextureSignLuigiFace0, 0x05C9, 0x1000, 0x0 }, - { gTextureSignLuigiFace1, 0x065F, 0x1000, 0x0 }, - { gTexture66C7A8, 0x0149, 0x0800, 0x0 }, - { gTexture670AC8, 0x0FBF, 0x1000, 0x0 }, - { gTexture671A88, 0x012D, 0x0800, 0x0 }, - { gTexture6735DC, 0x03B1, 0x0800, 0x0 }, - { gTexture673C68, 0x038D, 0x0800, 0x0 }, - { gTexture6747C4, 0x0145, 0x0800, 0x0 }, - { gTextureRoad1, 0x02D2, 0x1000, 0x0 }, - { gTextureRoad2, 0x02AE, 0x1000, 0x0 }, - { gTextureRoadFinish1, 0x026B, 0x1000, 0x0 }, - { gTexture67BBD8, 0x0310, 0x0800, 0x0 }, - { gTexture68272C, 0x01F9, 0x1000, 0x0 }, - { gTexture682928, 0x01F9, 0x1000, 0x0 }, - { gTexture682B24, 0x01F9, 0x1000, 0x0 }, - { gTexture682D20, 0x01F9, 0x1000, 0x0 }, - { gTexture682F1C, 0x01F9, 0x1000, 0x0 }, - { gTexture683118, 0x01F9, 0x1000, 0x0 }, - { gTextureSignBlue64, 0x0567, 0x1000, 0x0 }, - { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 }, - { gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 }, - { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, - { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 }, - { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, - { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 }, - { gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, - { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, - { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* luigi_raceway_dls[] = { d_course_luigi_raceway_dl_0, d_course_luigi_raceway_dl_328, d_course_luigi_raceway_dl_1A8, d_course_luigi_raceway_dl_480, d_course_luigi_raceway_dl_6E0, d_course_luigi_raceway_dl_9F8, diff --git a/courses/mario_raceway/course_offsets.c b/courses/mario_raceway/course_offsets.c index 2a2526ad8..cc81a4dc9 100644 --- a/courses/mario_raceway/course_offsets.c +++ b/courses/mario_raceway/course_offsets.c @@ -2,40 +2,6 @@ #include "course_offsets.h" #include <assets/mario_raceway_data.h> -const course_texture mario_raceway_textures[] = { - { gTextureCheckerboardYellowPink, 0x0149, 0x0800, 0x0 }, - { gTexture64619C, 0x0124, 0x0800, 0x0 }, - { gTextureGrass1, 0x0125, 0x0800, 0x0 }, - { gTexture64BB60, 0x0169, 0x0800, 0x0 }, - { gTextureGrass7, 0x05DE, 0x0800, 0x0 }, - { gTextureGrass5, 0x023F, 0x0800, 0x0 }, - { gTextureFlagRed, 0x019E, 0x0800, 0x0 }, - { gTexture663F90, 0x0122, 0x0800, 0x0 }, - { gTexture6642A4, 0x0162, 0x0800, 0x0 }, - { gTexture6640B4, 0x01EF, 0x0800, 0x0 }, - { gTextureGrass10, 0x01F8, 0x0800, 0x0 }, - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, - { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, - { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 }, - { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, - { gTexture66C8F4, 0x01A1, 0x0800, 0x0 }, - { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 }, - { gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, - { gTexture670AC8, 0x0FBF, 0x1000, 0x0 }, - { gTexture674354, 0x046F, 0x0800, 0x0 }, - { gTextureRoad0, 0x0300, 0x1000, 0x0 }, - { gTextureRoadFinish0, 0x0338, 0x1000, 0x0 }, - { gTexture67B9B0, 0x0225, 0x0800, 0x0 }, - { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, - { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 }, - { gTextureSignShellShot0, 0x038C, 0x1000, 0x0 }, - { gTextureSignShellShot1, 0x0247, 0x1000, 0x0 }, - { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 }, - { gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - #ifndef TARGET_N64 const char* mario_raceway_dls[] = { #else diff --git a/courses/moo_moo_farm/course_offsets.c b/courses/moo_moo_farm/course_offsets.c index b5c43fc3e..32f40dfda 100644 --- a/courses/moo_moo_farm/course_offsets.c +++ b/courses/moo_moo_farm/course_offsets.c @@ -2,38 +2,6 @@ #include "course_offsets.h" #include <assets/moo_moo_farm_data.h> -const course_texture moo_moo_farm_textures[] = { - { gTextureWoodDoor0, 0x0294, 0x1000, 0x0 }, - { gTextureGrass2, 0x0415, 0x0800, 0x0 }, - { gTexture64AF50, 0x0140, 0x0800, 0x0 }, - { gTexture64B090, 0x0365, 0x0800, 0x0 }, - { gTexture64B54C, 0x038C, 0x0800, 0x0 }, - { gTexture64B3F8, 0x0153, 0x0800, 0x0 }, - { gTextureSignNintendo0, 0x0541, 0x1000, 0x0 }, - { gTextureSignNintendo1, 0x0512, 0x1000, 0x0 }, - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, - { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, - { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 }, - { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, - { gTexture674D58, 0x030C, 0x1000, 0x0 }, - { gTexture675064, 0x01BB, 0x0800, 0x0 }, - { gTexture675220, 0x0212, 0x0800, 0x0 }, - { gTexture6775EC, 0x0233, 0x1000, 0x0 }, - { gTexture683314, 0x02DC, 0x1000, 0x0 }, - { gTexture68CDA0, 0x0110, 0x0800, 0x0 }, - { gTexture6442D4, 0x0138, 0x0800, 0x0 }, - { gTexture64440C, 0x029D, 0x1000, 0x0 }, - { gTexture6446AC, 0x0116, 0x0800, 0x0 }, - { gTextureMooMooFarmSignLeft, 0x0A66, 0x1000, 0x0 }, - { gTextureMooMooFarmSignRight, 0x0A64, 0x1000, 0x0 }, - { gTexture64ACAC, 0x02A3, 0x0800, 0x0 }, - { gTexture66D698, 0x0370, 0x0800, 0x0 }, - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTextureWheelSteamEngineReal, 0x022F, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* moo_moo_farm_dls[] = { d_course_moo_moo_farm_dl_88, d_course_moo_moo_farm_dl_598, d_course_moo_moo_farm_dl_338, d_course_moo_moo_farm_dl_8A0, d_course_moo_moo_farm_dl_B00, d_course_moo_moo_farm_dl_FE0, diff --git a/courses/rainbow_road/course_offsets.c b/courses/rainbow_road/course_offsets.c index f7a6d8da5..579c5fef1 100644 --- a/courses/rainbow_road/course_offsets.c +++ b/courses/rainbow_road/course_offsets.c @@ -2,15 +2,6 @@ #include "course_offsets.h" #include <assets/rainbow_road_data.h> -const course_texture rainbow_road_textures[] = { - { gTextureStarOutline, 0x037A, 0x0800, 0x0 }, - { gTexture67A1B8, 0x01B7, 0x0800, 0x0 }, - { gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 }, - { gTexture662A34, 0x0106, 0x0800, 0x0 }, - { gTextureRainbow, 0x025D, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - Gfx* rainbow_road_dls[] = { d_course_rainbow_road_dl_D8, d_course_rainbow_road_dl_210, d_course_rainbow_road_dl_178, d_course_rainbow_road_dl_288, d_course_rainbow_road_dl_338, d_course_rainbow_road_dl_4A0, diff --git a/courses/royal_raceway/course_offsets.c b/courses/royal_raceway/course_offsets.c index 94f362ffd..108ee5825 100644 --- a/courses/royal_raceway/course_offsets.c +++ b/courses/royal_raceway/course_offsets.c @@ -2,53 +2,6 @@ #include "course_offsets.h" #include <assets/royal_raceway_data.h> -const course_texture royal_raceway_textures[] = { - { gTexture64619C, 0x0124, 0x0800, 0x0 }, - { gTexture645134, 0x052C, 0x0800, 0x0 }, - { gTextureWoodDoor1, 0x0903, 0x1000, 0x0 }, - { gTexture64BB60, 0x0169, 0x0800, 0x0 }, - { gTextureGrass3, 0x0372, 0x0800, 0x0 }, - { gTexture64F9E8, 0x020B, 0x1000, 0x0 }, - { gTextureFlagRed, 0x019E, 0x0800, 0x0 }, - { gTextureCrownJewelBlue, 0x0301, 0x0800, 0x0 }, - { gTextureCrown, 0x0106, 0x0800, 0x0 }, - { gTextureCrownJewelPink, 0x0313, 0x0800, 0x0 }, - { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 }, - { gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 }, - { gTexture6684F8, 0x010D, 0x0800, 0x0 }, - { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 }, - { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, - { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 }, - { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, - { gTexture66CA98, 0x02C9, 0x0800, 0x0 }, - { gTextureCheckerboardPink, 0x0157, 0x0800, 0x0 }, - { gTexture670AC8, 0x0FBF, 0x1000, 0x0 }, - { gTextureRoad0, 0x0300, 0x1000, 0x0 }, - { gTextureRoadFinish0, 0x0338, 0x1000, 0x0 }, - { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, - { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 }, - { gTextureCastleBricks, 0x0B33, 0x1000, 0x0 }, - { gTextureCastleBridge, 0x0428, 0x0800, 0x0 }, - { gTextureGrass8, 0x02CB, 0x0800, 0x0 }, - { gTextureGrass9, 0x0421, 0x0800, 0x0 }, - { gTexture6646B8, 0x0298, 0x1000, 0x0 }, - { gTexture664408, 0x02AE, 0x1000, 0x0 }, - { gTextureBricksRed, 0x0C55, 0x1000, 0x0 }, - { gTexture665C0C, 0x059D, 0x0800, 0x0 }, - { gTexture6661AC, 0x01F7, 0x0800, 0x0 }, - { gTexture6663A4, 0x05F6, 0x0800, 0x0 }, - { gTexture667BAC, 0x067A, 0x0800, 0x0 }, - { gTextureFlagRed2, 0x0186, 0x0800, 0x0 }, - { gTexture66DB60, 0x01D6, 0x0800, 0x0 }, - { gTextureStainglassPeach0, 0x0ED1, 0x1000, 0x0 }, - { gTextureStainglassPeach1, 0x0DA9, 0x1000, 0x0 }, - { gTextureFencePostWooden, 0x083D, 0x1000, 0x0 }, - { gTexture648508, 0x01FE, 0x1000, 0x0 }, - { gTexture6449D4, 0x075D, 0x0800, 0x0 }, - { gTexture67FE0C, 0x02DE, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* royal_raceway_dls[] = { d_course_royal_raceway_dl_0, d_course_royal_raceway_dl_360, d_course_royal_raceway_dl_258, d_course_royal_raceway_dl_470, d_course_royal_raceway_dl_6D0, d_course_royal_raceway_dl_A48, diff --git a/courses/sherbet_land/course_offsets.c b/courses/sherbet_land/course_offsets.c index b597ee828..b81dba828 100644 --- a/courses/sherbet_land/course_offsets.c +++ b/courses/sherbet_land/course_offsets.c @@ -3,15 +3,6 @@ #include <assets/sherbet_land_data.h> #include "animation.h" -const course_texture sherbet_land_textures[] = { - { gTexture643B3C, 0x0798, 0x0800, 0x0 }, { gTexture66D024, 0x04EA, 0x0800, 0x0 }, - { gTexture678118, 0x0314, 0x0800, 0x0 }, { gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 }, - { gTexture678CC8, 0x058E, 0x0800, 0x0 }, { gTexture67842C, 0x050E, 0x0800, 0x0 }, - { gTexture67893C, 0x038B, 0x0800, 0x0 }, { gTexture651984, 0x019C, 0x0800, 0x0 }, - { gTexture651428, 0x055B, 0x0800, 0x0 }, { gTexture662924, 0x0110, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* sherbet_land_dls[] = { d_course_sherbet_land_dl_0, d_course_sherbet_land_dl_158, d_course_sherbet_land_dl_C0, d_course_sherbet_land_dl_1A8, d_course_sherbet_land_dl_280, d_course_sherbet_land_dl_3B8, diff --git a/courses/skyscraper/course_offsets.c b/courses/skyscraper/course_offsets.c deleted file mode 100644 index c0c12aa88..000000000 --- a/courses/skyscraper/course_offsets.c +++ /dev/null @@ -1,29 +0,0 @@ -#include <libultra/types.h> -#include "course_offsets.h" - -const course_texture skyscraper_textures[] = { - { gTexture6457D8, 0x0160, 0x0800, 0x0 }, - { gTexture6462C0, 0x01B9, 0x0800, 0x0 }, - { gTexture6864E8, 0x0807, 0x1000, 0x0 }, - { gTexture686CF0, 0x08B7, 0x1000, 0x0 }, - { gTexture6875A8, 0x093F, 0x1000, 0x0 }, - { gTexture687EE8, 0x0883, 0x1000, 0x0 }, - { gTexture68876C, 0x0AC2, 0x1000, 0x0 }, - { gTexture689230, 0x09CE, 0x1000, 0x0 }, - { gTexture689C00, 0x0884, 0x1000, 0x0 }, - { gTexture68A484, 0x07D6, 0x1000, 0x0 }, - { gTexture68AC5C, 0x0A47, 0x1000, 0x0 }, - { gTexture68B6A4, 0x07C5, 0x1000, 0x0 }, - { gTexture68BE6C, 0x04A1, 0x1000, 0x0 }, - { gTexture68C310, 0x030D, 0x1000, 0x0 }, - { gTexture64B8D8, 0x0177, 0x0800, 0x0 }, - { gTexture645660, 0x0176, 0x0800, 0x0 }, - { gTextureNumberYellowBlue1, 0x01AE, 0x0800, 0x0 }, - { gTextureNumberYellowBlue2, 0x01C6, 0x0800, 0x0 }, - { gTextureNumberYellowBlue3, 0x01CC, 0x0800, 0x0 }, - { gTextureNumberYellowBlue4, 0x01E4, 0x0800, 0x0 }, - { gTexture668608, 0x0120, 0x0800, 0x0 }, - { gTexture67B75C, 0x0108, 0x0800, 0x0 }, - { gTexture6835F0, 0x0252, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; diff --git a/courses/toads_turnpike/course_offsets.c b/courses/toads_turnpike/course_offsets.c index b702ab56e..885d06bed 100644 --- a/courses/toads_turnpike/course_offsets.c +++ b/courses/toads_turnpike/course_offsets.c @@ -3,29 +3,6 @@ #include "course_offsets.h" #include <assets/toads_turnpike_data.h> -const course_texture toads_turnpike_textures[] = { - { gTexture645134, 0x052C, 0x0800, 0x0 }, - { gTexture64FE68, 0x0258, 0x1000, 0x0 }, - { gTexture6607C0, 0x0105, 0x0800, 0x0 }, - { gTexture6608C8, 0x0106, 0x0800, 0x0 }, - { gTextureGrass11, 0x01F8, 0x0800, 0x0 }, - { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 }, - { gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, - { gTexture671A88, 0x012D, 0x0800, 0x0 }, - { gTextureRoad2, 0x02AE, 0x1000, 0x0 }, - { gTextureRoad3, 0x0286, 0x1000, 0x0 }, - { gTextureRoad4, 0x0282, 0x1000, 0x0 }, - { gTextureRoadFinish0, 0x0338, 0x1000, 0x0 }, - { gTextureSignToadYellow, 0x0723, 0x1000, 0x0 }, - { gTextureSignToadGreen, 0x071F, 0x1000, 0x0 }, - { gTextureSignMergingLanes, 0x0118, 0x0800, 0x0 }, - { gTexture65127C, 0x01AB, 0x0800, 0x0 }, - { gTextureRoad5, 0x02B9, 0x1000, 0x0 }, - { gTextureSignToadRed, 0x0610, 0x1000, 0x0 }, - { gTexture668228, 0x0130, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - Gfx* d_course_toads_turnpike_dl_list[] = { d_course_toads_turnpike_dl_80, d_course_toads_turnpike_dl_1F8, d_course_toads_turnpike_dl_158, d_course_toads_turnpike_dl_2D0, d_course_toads_turnpike_dl_380, d_course_toads_turnpike_dl_4E8, diff --git a/courses/wario_stadium/course_offsets.c b/courses/wario_stadium/course_offsets.c index 137d468cf..3111bcba9 100644 --- a/courses/wario_stadium/course_offsets.c +++ b/courses/wario_stadium/course_offsets.c @@ -2,30 +2,6 @@ #include "course_offsets.h" #include <assets/wario_stadium_data.h> -const course_texture wario_stadium_textures[] = { - { gTexture67F15C, 0x02F1, 0x0800, 0x0 }, - { gTexture67F450, 0x0194, 0x0800, 0x0 }, - { gTextureSignWarioFace, 0x0825, 0x1000, 0x0 }, - { gTexture670AC8, 0x0FBF, 0x1000, 0x0 }, - { gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 }, - { gTexture64C11C, 0x0695, 0x0800, 0x0 }, - { gTexture64C7B4, 0x046C, 0x0800, 0x0 }, - { gTexture668228, 0x0130, 0x0800, 0x0 }, - { gTexture668358, 0x01A0, 0x0800, 0x0 }, - { gTexture66AEB8, 0x0201, 0x0800, 0x0 }, - { gTexture677A40, 0x0275, 0x0800, 0x0 }, - { gTexture67E428, 0x0A81, 0x1000, 0x0 }, - { gTexture643A34, 0x0106, 0x0800, 0x0 }, - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTexture68272C, 0x01F9, 0x1000, 0x0 }, - { gTexture682928, 0x01F9, 0x1000, 0x0 }, - { gTexture682B24, 0x01F9, 0x1000, 0x0 }, - { gTexture682D20, 0x01F9, 0x1000, 0x0 }, - { gTexture682F1C, 0x01F9, 0x1000, 0x0 }, - { gTexture683118, 0x01F9, 0x1000, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - const Gfx* wario_stadium_dls[] = { d_course_wario_stadium_dl_0, d_course_wario_stadium_dl_158, d_course_wario_stadium_dl_B8, d_course_wario_stadium_dl_1B8, d_course_wario_stadium_dl_2A0, d_course_wario_stadium_dl_440, diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c index 7518ece5d..b6b229ad3 100644 --- a/courses/yoshi_valley/course_offsets.c +++ b/courses/yoshi_valley/course_offsets.c @@ -20,24 +20,6 @@ extern u8 gTextureSignWoodRedArrow[]; extern u8 gTexture68DEC0[]; #endif -const course_texture yoshi_valley_textures[] = { - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0 }, - { gTexture65E2EC, 0x02B0, 0x0800, 0x0 }, - { gTexture6846DC, 0x04EA, 0x0800, 0x0 }, - { gTextureFenceRope, 0x0540, 0x0800, 0x0 }, - { gTexture685108, 0x04D4, 0x0800, 0x0 }, - { gTexture64CC20, 0x0EC3, 0x1000, 0x0 }, - { gTextureGrass4, 0x05C3, 0x0800, 0x0 }, - { gTexture6775EC, 0x0233, 0x1000, 0x0 }, - { gTexture68E2D0, 0x087F, 0x0800, 0x0 }, - { gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 }, - { gTexture643B3C, 0x0798, 0x0800, 0x0 }, - { gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 }, - { gTexture68DEC0, 0x0410, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - Gfx* d_course_yoshi_valley_dl_list[] = { d_course_yoshi_valley_dl_40, d_course_yoshi_valley_dl_3F0, d_course_yoshi_valley_dl_290, d_course_yoshi_valley_dl_4E8, d_course_yoshi_valley_dl_7A0, d_course_yoshi_valley_dl_BC0, |
