update clang and add action (#664)

* update clang and add action

* try clang on course folder only

* forget two file

* Update course_displaylists.inc.c

* forget few other file

* Update course_vertices.inc.c

* format all code while get it match

* second pass

* format other dir

* disable clang format on bad ido code

* fix some tabulation

* revert format on tool dir

* Update clang-format.yml

* ignore gbi.h

* add some read me instruction

* fix error

* format and fixing error

* Update README.md

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875 2024-08-24 23:27:53 +02:00 committed by GitHub
parent 368c276e1e
commit 17a6f4bb3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
405 changed files with 190745 additions and 207588 deletions

View File

@ -1,18 +1,23 @@
IndentWidth: 4
Language: Cpp
AlignAfterOpenBracket: Align
SortIncludes: false
ColumnLimit: 104
PointerAlignment: Right
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
BinPackArguments: true
BinPackParameters: true
SpaceAfterCStyleCast: true
UseTab: Never
ColumnLimit: 120
PointerAlignment: Left
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: NonAssignment
SpaceAfterCStyleCast: true
Cpp11BracedListStyle: false
IndentCaseLabels: true
BinPackArguments: true
BinPackParameters: true
AlignAfterOpenBracket: Align
AlignOperands: true
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: None
AllowShortBlocksOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AlignEscapedNewlines: Left
AlignTrailingComments: true
UseTab: Never
SortIncludes: false

View File

@ -1,6 +1,9 @@
---
Checks: '-*,readability-braces-around-statements'
Checks: '-*,readability-braces-around-statements,readability-inconsistent-declaration-parameter-name'
WarningsAsErrors: ''
HeaderFilterRegex: '(src|include|enhancements)\/.*\.h$'
HeaderFilterRegex: '(src|include)\/.*\.h$'
FormatStyle: 'file'
CheckOptions:
# Require argument names to match exactly (instead of allowing a name to be a prefix/suffix of another)
# Note: 'true' is expected by clang-tidy 12+ but '1' is used for compatibility with older versions
- key: readability-inconsistent-declaration-parameter-name.Strict
value: 1

21
.github/workflows/clang-format.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: clang-format Check
on: [push, pull_request]
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
strategy:
matrix:
path:
- include
- data
- courses
- src
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: "18"
check-path: ${{ matrix.path }}
exclude-regex: "gbi.h"

View File

@ -434,6 +434,9 @@ doc:
@$(PRINT) "$(GREEN)Documentation generated in docs/html$(NO_COL)\n"
@$(PRINT) "$(GREEN)Results can be viewed by opening docs/html/index.html in a web browser$(NO_COL)\n"
format:
@$(PYTHON) $(TOOLS_DIR)/format.py -j $(N_THREADS)
clean:
$(RM) -r $(BUILD_DIR)

View File

@ -95,6 +95,7 @@ Documentation generated using [Doxygen](https://www.doxygen.nl/index.html). Run
Pull requests are welcome. For major changes, please discuss in the Discord.
Run `clang-format` on your code to ensure it meets the project's coding standards.
Run `make format` to ensure it meets the project's coding standards.
If code needs to avoid formatting place `// clang-format off` before the code and `// clang-format on` after.
Official Discord: [discord.gg/DuYH3Fh](https://discord.gg/DuYH3Fh)

View File

@ -31,25 +31,25 @@ extern CourseVtx d_course_royal_raceway_vertex[0x2072];
extern CourseVtx d_course_sherbet_land_vertex[0xA76];
extern CourseVtx d_course_wario_stadium_vertex[0x17B3];
#define d_course_big_donut_vertex_count ARRAY_COUNT(d_course_big_donut_vertex)
#define d_course_block_fort_vertex_count ARRAY_COUNT(d_course_block_fort_vertex)
#define d_course_double_deck_vertex_count ARRAY_COUNT(d_course_double_deck_vertex)
#define d_course_skyscraper_vertex_count ARRAY_COUNT(d_course_skyscraper_vertex)
#define d_course_choco_mountain_vertex_count ARRAY_COUNT(d_course_choco_mountain_vertex)
#define d_course_frappe_snowland_vertex_count ARRAY_COUNT(d_course_frappe_snowland_vertex)
#define d_course_mario_raceway_vertex_count ARRAY_COUNT(d_course_mario_raceway_vertex)
#define d_course_toads_turnpike_vertex_count ARRAY_COUNT(d_course_toads_turnpike_vertex)
#define d_course_kalimari_desert_vertex_count ARRAY_COUNT(d_course_kalimari_desert_vertex)
#define d_course_big_donut_vertex_count ARRAY_COUNT(d_course_big_donut_vertex)
#define d_course_block_fort_vertex_count ARRAY_COUNT(d_course_block_fort_vertex)
#define d_course_double_deck_vertex_count ARRAY_COUNT(d_course_double_deck_vertex)
#define d_course_skyscraper_vertex_count ARRAY_COUNT(d_course_skyscraper_vertex)
#define d_course_choco_mountain_vertex_count ARRAY_COUNT(d_course_choco_mountain_vertex)
#define d_course_frappe_snowland_vertex_count ARRAY_COUNT(d_course_frappe_snowland_vertex)
#define d_course_mario_raceway_vertex_count ARRAY_COUNT(d_course_mario_raceway_vertex)
#define d_course_toads_turnpike_vertex_count ARRAY_COUNT(d_course_toads_turnpike_vertex)
#define d_course_kalimari_desert_vertex_count ARRAY_COUNT(d_course_kalimari_desert_vertex)
#define d_course_koopa_troopa_beach_vertex_count ARRAY_COUNT(d_course_koopa_troopa_beach_vertex)
#define d_course_luigi_raceway_vertex_count ARRAY_COUNT(d_course_luigi_raceway_vertex)
#define d_course_moo_moo_farm_vertex_count ARRAY_COUNT(d_course_moo_moo_farm_vertex)
#define d_course_banshee_boardwalk_vertex_count ARRAY_COUNT(d_course_banshee_boardwalk_vertex)
#define d_course_luigi_raceway_vertex_count ARRAY_COUNT(d_course_luigi_raceway_vertex)
#define d_course_moo_moo_farm_vertex_count ARRAY_COUNT(d_course_moo_moo_farm_vertex)
#define d_course_banshee_boardwalk_vertex_count ARRAY_COUNT(d_course_banshee_boardwalk_vertex)
#define d_course_dks_jungle_parkway_vertex_count ARRAY_COUNT(d_course_dks_jungle_parkway_vertex)
#define d_course_rainbow_road_vertex_count ARRAY_COUNT(d_course_rainbow_road_vertex)
#define d_course_yoshi_valley_vertex_count ARRAY_COUNT(d_course_yoshi_valley_vertex)
#define d_course_bowsers_castle_vertex_count ARRAY_COUNT(d_course_bowsers_castle_vertex)
#define d_course_royal_raceway_vertex_count ARRAY_COUNT(d_course_royal_raceway_vertex)
#define d_course_sherbet_land_vertex_count ARRAY_COUNT(d_course_sherbet_land_vertex)
#define d_course_wario_stadium_vertex_count ARRAY_COUNT(d_course_wario_stadium_vertex)
#define d_course_rainbow_road_vertex_count ARRAY_COUNT(d_course_rainbow_road_vertex)
#define d_course_yoshi_valley_vertex_count ARRAY_COUNT(d_course_yoshi_valley_vertex)
#define d_course_bowsers_castle_vertex_count ARRAY_COUNT(d_course_bowsers_castle_vertex)
#define d_course_royal_raceway_vertex_count ARRAY_COUNT(d_course_royal_raceway_vertex)
#define d_course_sherbet_land_vertex_count ARRAY_COUNT(d_course_sherbet_land_vertex)
#define d_course_wario_stadium_vertex_count ARRAY_COUNT(d_course_wario_stadium_vertex)
#endif // ALL_COURSE_MODEL_H

View File

@ -3,17 +3,17 @@
#include "course_offsets.h"
extern Gfx *banshee_boardwalk_dls[];
extern Gfx *bowsers_castle_dls[];
extern Gfx *choco_mountain_dls[];
extern Gfx *kalimari_desert_dls[];
extern Gfx *luigi_raceway_dls[];
extern Gfx *mario_raceway_dls[];
extern Gfx *moo_moo_farm_dls[];
extern Gfx *royal_raceway_dls[];
extern Gfx *sherbet_land_dls[];
extern Gfx *sherbet_land_dls_2[];
extern Gfx *wario_stadium_dls[];
extern Gfx* banshee_boardwalk_dls[];
extern Gfx* bowsers_castle_dls[];
extern Gfx* choco_mountain_dls[];
extern Gfx* kalimari_desert_dls[];
extern Gfx* luigi_raceway_dls[];
extern Gfx* mario_raceway_dls[];
extern Gfx* moo_moo_farm_dls[];
extern Gfx* royal_raceway_dls[];
extern Gfx* sherbet_land_dls[];
extern Gfx* sherbet_land_dls_2[];
extern Gfx* wario_stadium_dls[];
extern Gfx toads_turnpike_dl_0[];
extern Gfx toads_turnpike_dl_1[];

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -28,130 +28,64 @@ extern u8 gTexture68D940[];
extern u8 gTexture685AC0[];
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},
{ 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,
d_course_banshee_boardwalk_dl_408,
d_course_banshee_boardwalk_dl_540,
d_course_banshee_boardwalk_dl_620,
d_course_banshee_boardwalk_dl_7C0,
d_course_banshee_boardwalk_dl_6D0,
d_course_banshee_boardwalk_dl_870,
d_course_banshee_boardwalk_dl_940,
d_course_banshee_boardwalk_dl_AD0,
d_course_banshee_boardwalk_dl_9E0,
d_course_banshee_boardwalk_dl_B80,
d_course_banshee_boardwalk_dl_C30,
d_course_banshee_boardwalk_dl_D80,
d_course_banshee_boardwalk_dl_CD0,
d_course_banshee_boardwalk_dl_E10,
d_course_banshee_boardwalk_dl_EE0,
d_course_banshee_boardwalk_dl_1000,
d_course_banshee_boardwalk_dl_F50,
d_course_banshee_boardwalk_dl_1070,
d_course_banshee_boardwalk_dl_1160,
d_course_banshee_boardwalk_dl_12A8,
d_course_banshee_boardwalk_dl_11C8,
d_course_banshee_boardwalk_dl_12E8,
d_course_banshee_boardwalk_dl_13F0,
d_course_banshee_boardwalk_dl_1520,
d_course_banshee_boardwalk_dl_1448,
d_course_banshee_boardwalk_dl_1580,
d_course_banshee_boardwalk_dl_1678,
d_course_banshee_boardwalk_dl_17A0,
d_course_banshee_boardwalk_dl_16B8,
d_course_banshee_boardwalk_dl_1820,
d_course_banshee_boardwalk_dl_18D8,
d_course_banshee_boardwalk_dl_1A30,
d_course_banshee_boardwalk_dl_1940,
d_course_banshee_boardwalk_dl_1B00,
d_course_banshee_boardwalk_dl_1BA0,
d_course_banshee_boardwalk_dl_1CC8,
d_course_banshee_boardwalk_dl_1C20,
d_course_banshee_boardwalk_dl_1D90,
d_course_banshee_boardwalk_dl_1E28,
d_course_banshee_boardwalk_dl_1F40,
d_course_banshee_boardwalk_dl_1EA0,
d_course_banshee_boardwalk_dl_2028,
d_course_banshee_boardwalk_dl_20A0,
d_course_banshee_boardwalk_dl_21C8,
d_course_banshee_boardwalk_dl_2138,
d_course_banshee_boardwalk_dl_22D8,
d_course_banshee_boardwalk_dl_2340,
d_course_banshee_boardwalk_dl_24E8,
d_course_banshee_boardwalk_dl_2448,
d_course_banshee_boardwalk_dl_2610,
d_course_banshee_boardwalk_dl_2650,
d_course_banshee_boardwalk_dl_2790,
d_course_banshee_boardwalk_dl_2718,
d_course_banshee_boardwalk_dl_2868,
d_course_banshee_boardwalk_dl_28A8,
d_course_banshee_boardwalk_dl_2A18,
d_course_banshee_boardwalk_dl_2980,
d_course_banshee_boardwalk_dl_2AE0,
d_course_banshee_boardwalk_dl_2B88,
d_course_banshee_boardwalk_dl_2CE0,
d_course_banshee_boardwalk_dl_2C30,
d_course_banshee_boardwalk_dl_2DB0,
d_course_banshee_boardwalk_dl_2E20,
d_course_banshee_boardwalk_dl_2FA0,
d_course_banshee_boardwalk_dl_2EE0,
d_course_banshee_boardwalk_dl_3050,
d_course_banshee_boardwalk_dl_3100,
d_course_banshee_boardwalk_dl_32B0,
d_course_banshee_boardwalk_dl_3200,
d_course_banshee_boardwalk_dl_3390,
d_course_banshee_boardwalk_dl_3468,
d_course_banshee_boardwalk_dl_3660,
d_course_banshee_boardwalk_dl_35A0,
d_course_banshee_boardwalk_dl_3710,
d_course_banshee_boardwalk_dl_37F0,
d_course_banshee_boardwalk_dl_3980,
d_course_banshee_boardwalk_dl_3920,
d_course_banshee_boardwalk_dl_3A20,
d_course_banshee_boardwalk_dl_3AF8,
d_course_banshee_boardwalk_dl_3C40,
d_course_banshee_boardwalk_dl_3C00,
d_course_banshee_boardwalk_dl_3CD0,
d_course_banshee_boardwalk_dl_3D98,
d_course_banshee_boardwalk_dl_3EF0,
d_course_banshee_boardwalk_dl_3EB0,
d_course_banshee_boardwalk_dl_3F60,
d_course_banshee_boardwalk_dl_4038,
d_course_banshee_boardwalk_dl_4188,
d_course_banshee_boardwalk_dl_4118,
d_course_banshee_boardwalk_dl_41F0,
d_course_banshee_boardwalk_dl_42D0,
d_course_banshee_boardwalk_dl_4428,
d_course_banshee_boardwalk_dl_43A8,
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,
d_course_banshee_boardwalk_dl_408, d_course_banshee_boardwalk_dl_540, d_course_banshee_boardwalk_dl_620,
d_course_banshee_boardwalk_dl_7C0, d_course_banshee_boardwalk_dl_6D0, d_course_banshee_boardwalk_dl_870,
d_course_banshee_boardwalk_dl_940, d_course_banshee_boardwalk_dl_AD0, d_course_banshee_boardwalk_dl_9E0,
d_course_banshee_boardwalk_dl_B80, d_course_banshee_boardwalk_dl_C30, d_course_banshee_boardwalk_dl_D80,
d_course_banshee_boardwalk_dl_CD0, d_course_banshee_boardwalk_dl_E10, d_course_banshee_boardwalk_dl_EE0,
d_course_banshee_boardwalk_dl_1000, d_course_banshee_boardwalk_dl_F50, d_course_banshee_boardwalk_dl_1070,
d_course_banshee_boardwalk_dl_1160, d_course_banshee_boardwalk_dl_12A8, d_course_banshee_boardwalk_dl_11C8,
d_course_banshee_boardwalk_dl_12E8, d_course_banshee_boardwalk_dl_13F0, d_course_banshee_boardwalk_dl_1520,
d_course_banshee_boardwalk_dl_1448, d_course_banshee_boardwalk_dl_1580, d_course_banshee_boardwalk_dl_1678,
d_course_banshee_boardwalk_dl_17A0, d_course_banshee_boardwalk_dl_16B8, d_course_banshee_boardwalk_dl_1820,
d_course_banshee_boardwalk_dl_18D8, d_course_banshee_boardwalk_dl_1A30, d_course_banshee_boardwalk_dl_1940,
d_course_banshee_boardwalk_dl_1B00, d_course_banshee_boardwalk_dl_1BA0, d_course_banshee_boardwalk_dl_1CC8,
d_course_banshee_boardwalk_dl_1C20, d_course_banshee_boardwalk_dl_1D90, d_course_banshee_boardwalk_dl_1E28,
d_course_banshee_boardwalk_dl_1F40, d_course_banshee_boardwalk_dl_1EA0, d_course_banshee_boardwalk_dl_2028,
d_course_banshee_boardwalk_dl_20A0, d_course_banshee_boardwalk_dl_21C8, d_course_banshee_boardwalk_dl_2138,
d_course_banshee_boardwalk_dl_22D8, d_course_banshee_boardwalk_dl_2340, d_course_banshee_boardwalk_dl_24E8,
d_course_banshee_boardwalk_dl_2448, d_course_banshee_boardwalk_dl_2610, d_course_banshee_boardwalk_dl_2650,
d_course_banshee_boardwalk_dl_2790, d_course_banshee_boardwalk_dl_2718, d_course_banshee_boardwalk_dl_2868,
d_course_banshee_boardwalk_dl_28A8, d_course_banshee_boardwalk_dl_2A18, d_course_banshee_boardwalk_dl_2980,
d_course_banshee_boardwalk_dl_2AE0, d_course_banshee_boardwalk_dl_2B88, d_course_banshee_boardwalk_dl_2CE0,
d_course_banshee_boardwalk_dl_2C30, d_course_banshee_boardwalk_dl_2DB0, d_course_banshee_boardwalk_dl_2E20,
d_course_banshee_boardwalk_dl_2FA0, d_course_banshee_boardwalk_dl_2EE0, d_course_banshee_boardwalk_dl_3050,
d_course_banshee_boardwalk_dl_3100, d_course_banshee_boardwalk_dl_32B0, d_course_banshee_boardwalk_dl_3200,
d_course_banshee_boardwalk_dl_3390, d_course_banshee_boardwalk_dl_3468, d_course_banshee_boardwalk_dl_3660,
d_course_banshee_boardwalk_dl_35A0, d_course_banshee_boardwalk_dl_3710, d_course_banshee_boardwalk_dl_37F0,
d_course_banshee_boardwalk_dl_3980, d_course_banshee_boardwalk_dl_3920, d_course_banshee_boardwalk_dl_3A20,
d_course_banshee_boardwalk_dl_3AF8, d_course_banshee_boardwalk_dl_3C40, d_course_banshee_boardwalk_dl_3C00,
d_course_banshee_boardwalk_dl_3CD0, d_course_banshee_boardwalk_dl_3D98, d_course_banshee_boardwalk_dl_3EF0,
d_course_banshee_boardwalk_dl_3EB0, d_course_banshee_boardwalk_dl_3F60, d_course_banshee_boardwalk_dl_4038,
d_course_banshee_boardwalk_dl_4188, d_course_banshee_boardwalk_dl_4118, d_course_banshee_boardwalk_dl_41F0,
d_course_banshee_boardwalk_dl_42D0, d_course_banshee_boardwalk_dl_4428, d_course_banshee_boardwalk_dl_43A8,
d_course_banshee_boardwalk_dl_4480,
};

File diff suppressed because it is too large Load Diff

View File

@ -22,29 +22,13 @@ Gfx d_course_big_donut_dl[] = {
// Item box spawn locations
struct ActorSpawnData d_course_big_donut_item_box_spawns[] = {
{{ -40, 222, 824 }, {0} },
{{ 125, 200, 573 }, {0} },
{{ -302, 251, 889 }, {0} },
{{ 38, 203, 654 }, {0} },
{{ 22, 207, 716 }, {0} },
{{ 110, 205, 682 }, {0} },
{{ 681, 205, 53 }, {1} },
{{ 759, 218, -253 }, {1} },
{{ 798, 221, 172 }, {1} },
{{ 557, 200, -111 }, {1} },
{{ 629, 201, -126 }, {1} },
{{ 704, 207, -137 }, {1} },
{{ -111, 200, -554 }, {2} },
{{ 72, 250, -933 }, {2} },
{{ -25, 207, -705 }, {2} },
{{ -21, 225, -843 }, {2} },
{{ -83, 220, -807 }, {2} },
{{ -49, 214, -775 }, {2} },
{{ -807, 220, 53 }, {3} },
{{ -859, 242, 300 }, {3} },
{{ -672, 207, -219 }, {3} },
{{ -885, 108, -59 }, {3} },
{{ -793, 103, -33 }, {3} },
{{ -757, 214, 166 }, {3} },
{{ -32768, 0, 0 }, {0} },
{ { -40, 222, 824 }, { 0 } }, { { 125, 200, 573 }, { 0 } }, { { -302, 251, 889 }, { 0 } },
{ { 38, 203, 654 }, { 0 } }, { { 22, 207, 716 }, { 0 } }, { { 110, 205, 682 }, { 0 } },
{ { 681, 205, 53 }, { 1 } }, { { 759, 218, -253 }, { 1 } }, { { 798, 221, 172 }, { 1 } },
{ { 557, 200, -111 }, { 1 } }, { { 629, 201, -126 }, { 1 } }, { { 704, 207, -137 }, { 1 } },
{ { -111, 200, -554 }, { 2 } }, { { 72, 250, -933 }, { 2 } }, { { -25, 207, -705 }, { 2 } },
{ { -21, 225, -843 }, { 2 } }, { { -83, 220, -807 }, { 2 } }, { { -49, 214, -775 }, { 2 } },
{ { -807, 220, 53 }, { 3 } }, { { -859, 242, 300 }, { 3 } }, { { -672, 207, -219 }, { 3 } },
{ { -885, 108, -59 }, { 3 } }, { { -793, 103, -33 }, { 3 } }, { { -757, 214, 166 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};

View File

@ -7,17 +7,18 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_big_donut_packed_dl_0[] =
{
Gfx d_course_big_donut_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture64BA50),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000000, 32, 0),
@ -77,35 +78,33 @@ Gfx d_course_big_donut_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_210[] =
{
Gfx d_course_big_donut_packed_dl_210[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_0),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_220[] =
{
Gfx d_course_big_donut_packed_dl_220[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_210),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_230[] =
{
Gfx d_course_big_donut_packed_dl_230[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_220),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_240[] =
{
Gfx d_course_big_donut_packed_dl_240[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C00, 32, 0),
@ -165,23 +164,23 @@ Gfx d_course_big_donut_packed_dl_240[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_450[] =
{
Gfx d_course_big_donut_packed_dl_450[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_240),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_460[] =
{
Gfx d_course_big_donut_packed_dl_460[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001800, 32, 0),
@ -379,23 +378,23 @@ Gfx d_course_big_donut_packed_dl_460[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_AC0[] =
{
Gfx d_course_big_donut_packed_dl_AC0[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_460),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_AD0[] =
{
Gfx d_course_big_donut_packed_dl_AD0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture66ABA4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040037C0, 9, 0),
@ -406,17 +405,18 @@ Gfx d_course_big_donut_packed_dl_AD0[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_B58[] =
{
Gfx d_course_big_donut_packed_dl_B58[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003850, 32, 0),
@ -467,15 +467,13 @@ Gfx d_course_big_donut_packed_dl_B58[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_D20[] =
{
Gfx d_course_big_donut_packed_dl_D20[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_B58),
gsSPDisplayList(d_course_big_donut_packed_dl_AD0),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_D38[] =
{
Gfx d_course_big_donut_packed_dl_D38[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
@ -500,23 +498,23 @@ Gfx d_course_big_donut_packed_dl_D38[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_DE8[] =
{
Gfx d_course_big_donut_packed_dl_DE8[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_D38),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_DF8[] =
{
Gfx d_course_big_donut_packed_dl_DF8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040044D0, 16, 0),
@ -527,17 +525,18 @@ Gfx d_course_big_donut_packed_dl_DF8[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_E80[] =
{
Gfx d_course_big_donut_packed_dl_E80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040045D0, 16, 0),
@ -548,17 +547,18 @@ Gfx d_course_big_donut_packed_dl_E80[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_F08[] =
{
Gfx d_course_big_donut_packed_dl_F08[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040046D0, 16, 0),
@ -569,17 +569,18 @@ Gfx d_course_big_donut_packed_dl_F08[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_F90[] =
{
Gfx d_course_big_donut_packed_dl_F90[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040047D0, 16, 0),
@ -590,8 +591,7 @@ Gfx d_course_big_donut_packed_dl_F90[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1018[] =
{
Gfx d_course_big_donut_packed_dl_1018[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_F90),
gsSPDisplayList(d_course_big_donut_packed_dl_F08),
gsSPDisplayList(d_course_big_donut_packed_dl_E80),
@ -599,18 +599,13 @@ Gfx d_course_big_donut_packed_dl_1018[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1040[] =
{
gsSPDisplayList(d_course_big_donut_packed_dl_1018),
gsSPDisplayList(d_course_big_donut_packed_dl_DE8),
gsSPDisplayList(d_course_big_donut_packed_dl_D20),
gsSPDisplayList(d_course_big_donut_packed_dl_AC0),
gsSPDisplayList(d_course_big_donut_packed_dl_450),
gsSPEndDisplayList(),
Gfx d_course_big_donut_packed_dl_1040[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_1018), gsSPDisplayList(d_course_big_donut_packed_dl_DE8),
gsSPDisplayList(d_course_big_donut_packed_dl_D20), gsSPDisplayList(d_course_big_donut_packed_dl_AC0),
gsSPDisplayList(d_course_big_donut_packed_dl_450), gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1070[] =
{
Gfx d_course_big_donut_packed_dl_1070[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_1040),
gsSPEndDisplayList(),
};

View File

@ -7,9 +7,7 @@ extern u8 gTexture67490C[];
extern u8 gTexture64BA50[];
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},
{ gTexture66ABA4, 0x0312, 0x0800, 0x0 }, { gTexture6747C4, 0x0145, 0x0800, 0x0 },
{ gTexture67490C, 0x021C, 0x0800, 0x0 }, { gTexture64BA50, 0x0110, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};

File diff suppressed because it is too large Load Diff

View File

@ -17,41 +17,17 @@ Gfx d_course_block_fort_dl[] = {
// Item box spawn locations
struct ActorSpawnData d_course_block_fort_item_box_spawns[] = {
{{ -38, 0, 744 }, {0} },
{{ 29, 0, 710 }, {0} },
{{ -13, 0, 685 }, {0} },
{{ -553, 47, 543 }, {0} },
{{ -527, 47, 526 }, {0} },
{{ -141, 47, 153 }, {0} },
{{ -185, 47, 179 }, {0} },
{{ -388, 92, 366 }, {0} },
{{ -428, 92, 424 }, {0} },
{{ -724, 0, -50 }, {1} },
{{ -679, 0, -4 }, {1} },
{{ -736, 0, 37 }, {1} },
{{ -554, 47, -550 }, {1} },
{{ -530, 47, -536 }, {1} },
{{ -170, 47, -172 }, {1} },
{{ -138, 47, -133 }, {1} },
{{ -433, 92, -429 }, {1} },
{{ -379, 92, -390 }, {1} },
{{ -61, 0, -728 }, {2} },
{{ -17, 0, -670 }, {2} },
{{ 26, 0, -708 }, {2} },
{{ 549, 47, -548 }, {2} },
{{ 527, 47, -532 }, {2} },
{{ 148, 47, -146 }, {2} },
{{ 192, 47, -181 }, {2} },
{{ 471, 92, -455 }, {2} },
{{ 414, 92, -426 }, {2} },
{{ 728, 0, -36 }, {3} },
{{ 676, 0, -4 }, {3} },
{{ 700, 0, 31 }, {3} },
{{ 140, 47, 163 }, {3} },
{{ 178, 47, 201 }, {3} },
{{ 529, 47, 532 }, {3} },
{{ 554, 47, 557 }, {3} },
{{ 470, 92, 482 }, {3} },
{{ 438, 92, 442 }, {3} },
{{ -32768, 0, 0 }, {0} },
{ { -38, 0, 744 }, { 0 } }, { { 29, 0, 710 }, { 0 } }, { { -13, 0, 685 }, { 0 } },
{ { -553, 47, 543 }, { 0 } }, { { -527, 47, 526 }, { 0 } }, { { -141, 47, 153 }, { 0 } },
{ { -185, 47, 179 }, { 0 } }, { { -388, 92, 366 }, { 0 } }, { { -428, 92, 424 }, { 0 } },
{ { -724, 0, -50 }, { 1 } }, { { -679, 0, -4 }, { 1 } }, { { -736, 0, 37 }, { 1 } },
{ { -554, 47, -550 }, { 1 } }, { { -530, 47, -536 }, { 1 } }, { { -170, 47, -172 }, { 1 } },
{ { -138, 47, -133 }, { 1 } }, { { -433, 92, -429 }, { 1 } }, { { -379, 92, -390 }, { 1 } },
{ { -61, 0, -728 }, { 2 } }, { { -17, 0, -670 }, { 2 } }, { { 26, 0, -708 }, { 2 } },
{ { 549, 47, -548 }, { 2 } }, { { 527, 47, -532 }, { 2 } }, { { 148, 47, -146 }, { 2 } },
{ { 192, 47, -181 }, { 2 } }, { { 471, 92, -455 }, { 2 } }, { { 414, 92, -426 }, { 2 } },
{ { 728, 0, -36 }, { 3 } }, { { 676, 0, -4 }, { 3 } }, { { 700, 0, 31 }, { 3 } },
{ { 140, 47, 163 }, { 3 } }, { { 178, 47, 201 }, { 3 } }, { { 529, 47, 532 }, { 3 } },
{ { 554, 47, 557 }, { 3 } }, { { 470, 92, 482 }, { 3 } }, { { 438, 92, 442 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};

View File

@ -7,8 +7,7 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_block_fort_packed_dl_0[] =
{
Gfx d_course_block_fort_packed_dl_0[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x04000000, 3, 0),
@ -17,11 +16,13 @@ Gfx d_course_block_fort_packed_dl_0[] =
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000030, 20, 0),
@ -34,17 +35,18 @@ Gfx d_course_block_fort_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_B8[] =
{
Gfx d_course_block_fort_packed_dl_B8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000170, 16, 0),
@ -56,17 +58,18 @@ Gfx d_course_block_fort_packed_dl_B8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_148[] =
{
Gfx d_course_block_fort_packed_dl_148[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000270, 16, 0),
@ -78,17 +81,18 @@ Gfx d_course_block_fort_packed_dl_148[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1D8[] =
{
Gfx d_course_block_fort_packed_dl_1D8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000370, 16, 0),
@ -100,17 +104,18 @@ Gfx d_course_block_fort_packed_dl_1D8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_268[] =
{
Gfx d_course_block_fort_packed_dl_268[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000470, 32, 0),
@ -129,17 +134,18 @@ Gfx d_course_block_fort_packed_dl_268[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_330[] =
{
Gfx d_course_block_fort_packed_dl_330[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040006F0, 32, 0),
@ -157,8 +163,7 @@ Gfx d_course_block_fort_packed_dl_330[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_3F0[] =
{
Gfx d_course_block_fort_packed_dl_3F0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_330),
gsSPDisplayList(d_course_block_fort_packed_dl_268),
gsSPDisplayList(d_course_block_fort_packed_dl_1D8),
@ -168,17 +173,18 @@ Gfx d_course_block_fort_packed_dl_3F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_428[] =
{
Gfx d_course_block_fort_packed_dl_428[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000930, 24, 0),
@ -191,17 +197,18 @@ Gfx d_course_block_fort_packed_dl_428[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_4C0[] =
{
Gfx d_course_block_fort_packed_dl_4C0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000AB0, 24, 0),
@ -214,17 +221,18 @@ Gfx d_course_block_fort_packed_dl_4C0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_558[] =
{
Gfx d_course_block_fort_packed_dl_558[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C30, 20, 0),
@ -237,17 +245,18 @@ Gfx d_course_block_fort_packed_dl_558[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_5F0[] =
{
Gfx d_course_block_fort_packed_dl_5F0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000D70, 18, 0),
@ -260,8 +269,7 @@ Gfx d_course_block_fort_packed_dl_5F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_688[] =
{
Gfx d_course_block_fort_packed_dl_688[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_5F0),
gsSPDisplayList(d_course_block_fort_packed_dl_558),
gsSPDisplayList(d_course_block_fort_packed_dl_4C0),
@ -269,17 +277,18 @@ Gfx d_course_block_fort_packed_dl_688[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_6B0[] =
{
Gfx d_course_block_fort_packed_dl_6B0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000E90, 32, 0),
@ -303,17 +312,18 @@ Gfx d_course_block_fort_packed_dl_6B0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_7A0[] =
{
Gfx d_course_block_fort_packed_dl_7A0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001290, 16, 0),
@ -324,17 +334,18 @@ Gfx d_course_block_fort_packed_dl_7A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_828[] =
{
Gfx d_course_block_fort_packed_dl_828[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001390, 16, 0),
@ -345,17 +356,18 @@ Gfx d_course_block_fort_packed_dl_828[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_8B0[] =
{
Gfx d_course_block_fort_packed_dl_8B0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001490, 16, 0),
@ -366,17 +378,18 @@ Gfx d_course_block_fort_packed_dl_8B0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_938[] =
{
Gfx d_course_block_fort_packed_dl_938[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001590, 16, 0),
@ -387,27 +400,24 @@ Gfx d_course_block_fort_packed_dl_938[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_9C0[] =
{
gsSPDisplayList(d_course_block_fort_packed_dl_938),
gsSPDisplayList(d_course_block_fort_packed_dl_8B0),
gsSPDisplayList(d_course_block_fort_packed_dl_828),
gsSPDisplayList(d_course_block_fort_packed_dl_7A0),
gsSPDisplayList(d_course_block_fort_packed_dl_6B0),
gsSPEndDisplayList(),
Gfx d_course_block_fort_packed_dl_9C0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_938), gsSPDisplayList(d_course_block_fort_packed_dl_8B0),
gsSPDisplayList(d_course_block_fort_packed_dl_828), gsSPDisplayList(d_course_block_fort_packed_dl_7A0),
gsSPDisplayList(d_course_block_fort_packed_dl_6B0), gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_9F0[] =
{
Gfx d_course_block_fort_packed_dl_9F0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001690, 12, 0),
@ -416,7 +426,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001750, 32, 0),
@ -448,7 +459,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001D50, 32, 0),
@ -471,7 +483,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP1Triangle(9, 11, 12, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002020, 11, 0),
@ -483,17 +496,18 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_C80[] =
{
Gfx d_course_block_fort_packed_dl_C80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040020D0, 12, 0),
@ -502,7 +516,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002190, 32, 0),
@ -534,7 +549,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002790, 30, 0),
@ -557,7 +573,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP1Triangle(15, 17, 18, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002AA0, 11, 0),
@ -569,17 +586,18 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_F10[] =
{
Gfx d_course_block_fort_packed_dl_F10[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002B50, 12, 0),
@ -588,7 +606,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002C10, 30, 0),
@ -621,7 +640,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003210, 32, 0),
@ -644,7 +664,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP1Triangle(9, 11, 12, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040034E0, 11, 0),
@ -656,17 +677,18 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_11A8[] =
{
Gfx d_course_block_fort_packed_dl_11A8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003590, 12, 0),
@ -675,7 +697,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003650, 32, 0),
@ -714,7 +737,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003D30, 32, 0),
@ -740,7 +764,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP1Triangle(19, 21, 22, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040040A0, 17, 0),
@ -755,8 +780,7 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_14A0[] =
{
Gfx d_course_block_fort_packed_dl_14A0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_11A8),
gsSPDisplayList(d_course_block_fort_packed_dl_F10),
gsSPDisplayList(d_course_block_fort_packed_dl_C80),
@ -764,8 +788,7 @@ Gfx d_course_block_fort_packed_dl_14A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_14C8[] =
{
Gfx d_course_block_fort_packed_dl_14C8[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x040041B0, 31, 0),
@ -791,29 +814,22 @@ Gfx d_course_block_fort_packed_dl_14C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1580[] =
{
Gfx d_course_block_fort_packed_dl_1580[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_14C8),
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1590[] =
{
gsSPDisplayList(d_course_block_fort_packed_dl_1580),
gsSPDisplayList(d_course_block_fort_packed_dl_14A0),
gsSPDisplayList(d_course_block_fort_packed_dl_9C0),
gsSPDisplayList(d_course_block_fort_packed_dl_688),
gsSPDisplayList(d_course_block_fort_packed_dl_3F0),
gsSPEndDisplayList(),
Gfx d_course_block_fort_packed_dl_1590[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_1580), gsSPDisplayList(d_course_block_fort_packed_dl_14A0),
gsSPDisplayList(d_course_block_fort_packed_dl_9C0), gsSPDisplayList(d_course_block_fort_packed_dl_688),
gsSPDisplayList(d_course_block_fort_packed_dl_3F0), gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_15C0[] =
{
Gfx d_course_block_fort_packed_dl_15C0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_1590),
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_15D0[] =
{
Gfx d_course_block_fort_packed_dl_15D0[] = {
gsSPEndDisplayList(),
};

View File

@ -10,12 +10,8 @@ extern u8 gTexture6747C4[];
extern u8 gTexture6442D4[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -32,144 +32,72 @@ extern u8 gTexture67A370[];
extern u8 gTexture67A91C[];
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},
{ 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,
d_course_bowsers_castle_dl_4F0,
d_course_bowsers_castle_dl_7A0,
d_course_bowsers_castle_dl_860,
d_course_bowsers_castle_dl_9F8,
d_course_bowsers_castle_dl_8E8,
d_course_bowsers_castle_dl_AE0,
d_course_bowsers_castle_dl_B88,
d_course_bowsers_castle_dl_D20,
d_course_bowsers_castle_dl_C08,
d_course_bowsers_castle_dl_E00,
d_course_bowsers_castle_dl_EA8,
d_course_bowsers_castle_dl_1040,
d_course_bowsers_castle_dl_F08,
d_course_bowsers_castle_dl_1138,
d_course_bowsers_castle_dl_11F0,
d_course_bowsers_castle_dl_1290,
d_course_bowsers_castle_dl_1248,
d_course_bowsers_castle_dl_12D0,
d_course_bowsers_castle_dl_1330,
d_course_bowsers_castle_dl_1370,
d_course_bowsers_castle_dl_1350,
d_course_bowsers_castle_dl_13A0,
d_course_bowsers_castle_dl_13C0,
d_course_bowsers_castle_dl_1448,
d_course_bowsers_castle_dl_13E0,
d_course_bowsers_castle_dl_1488,
d_course_bowsers_castle_dl_14B0,
d_course_bowsers_castle_dl_1590,
d_course_bowsers_castle_dl_1520,
d_course_bowsers_castle_dl_1608,
d_course_bowsers_castle_dl_1690,
d_course_bowsers_castle_dl_1788,
d_course_bowsers_castle_dl_1710,
d_course_bowsers_castle_dl_17D0,
d_course_bowsers_castle_dl_1818,
d_course_bowsers_castle_dl_18C0,
d_course_bowsers_castle_dl_1860,
d_course_bowsers_castle_dl_1928,
d_course_bowsers_castle_dl_1960,
d_course_bowsers_castle_dl_19F8,
d_course_bowsers_castle_dl_19A8,
d_course_bowsers_castle_dl_1A40,
d_course_bowsers_castle_dl_1A90,
d_course_bowsers_castle_dl_1B10,
d_course_bowsers_castle_dl_1AD8,
d_course_bowsers_castle_dl_1B58,
d_course_bowsers_castle_dl_1BB0,
d_course_bowsers_castle_dl_1C38,
d_course_bowsers_castle_dl_1C10,
d_course_bowsers_castle_dl_1C60,
d_course_bowsers_castle_dl_1C98,
d_course_bowsers_castle_dl_1DF8,
d_course_bowsers_castle_dl_1CD0,
d_course_bowsers_castle_dl_1EB0,
d_course_bowsers_castle_dl_1FA0,
d_course_bowsers_castle_dl_2130,
d_course_bowsers_castle_dl_2008,
d_course_bowsers_castle_dl_21F0,
d_course_bowsers_castle_dl_22E8,
d_course_bowsers_castle_dl_24B8,
d_course_bowsers_castle_dl_2398,
d_course_bowsers_castle_dl_2578,
d_course_bowsers_castle_dl_2688,
d_course_bowsers_castle_dl_2880,
d_course_bowsers_castle_dl_2760,
d_course_bowsers_castle_dl_2958,
d_course_bowsers_castle_dl_2A60,
d_course_bowsers_castle_dl_2C48,
d_course_bowsers_castle_dl_2B80,
d_course_bowsers_castle_dl_2D08,
d_course_bowsers_castle_dl_2DF8,
d_course_bowsers_castle_dl_2FB0,
d_course_bowsers_castle_dl_2F30,
d_course_bowsers_castle_dl_3050,
d_course_bowsers_castle_dl_3158,
d_course_bowsers_castle_dl_32C0,
d_course_bowsers_castle_dl_3230,
d_course_bowsers_castle_dl_3338,
d_course_bowsers_castle_dl_3480,
d_course_bowsers_castle_dl_35D0,
d_course_bowsers_castle_dl_3508,
d_course_bowsers_castle_dl_3678,
d_course_bowsers_castle_dl_37D8,
d_course_bowsers_castle_dl_39E0,
d_course_bowsers_castle_dl_38F8,
d_course_bowsers_castle_dl_3B00,
d_course_bowsers_castle_dl_3C08,
d_course_bowsers_castle_dl_3EA8,
d_course_bowsers_castle_dl_3D78,
d_course_bowsers_castle_dl_3FF0,
d_course_bowsers_castle_dl_40F0,
d_course_bowsers_castle_dl_4358,
d_course_bowsers_castle_dl_4278,
d_course_bowsers_castle_dl_4488,
d_course_bowsers_castle_dl_45D8,
d_course_bowsers_castle_dl_4820,
d_course_bowsers_castle_dl_4748,
d_course_bowsers_castle_dl_4998,
d_course_bowsers_castle_dl_4A98,
d_course_bowsers_castle_dl_4CE8,
d_course_bowsers_castle_dl_4C00,
d_course_bowsers_castle_dl_4EA8,
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,
d_course_bowsers_castle_dl_4F0, d_course_bowsers_castle_dl_7A0, d_course_bowsers_castle_dl_860,
d_course_bowsers_castle_dl_9F8, d_course_bowsers_castle_dl_8E8, d_course_bowsers_castle_dl_AE0,
d_course_bowsers_castle_dl_B88, d_course_bowsers_castle_dl_D20, d_course_bowsers_castle_dl_C08,
d_course_bowsers_castle_dl_E00, d_course_bowsers_castle_dl_EA8, d_course_bowsers_castle_dl_1040,
d_course_bowsers_castle_dl_F08, d_course_bowsers_castle_dl_1138, d_course_bowsers_castle_dl_11F0,
d_course_bowsers_castle_dl_1290, d_course_bowsers_castle_dl_1248, d_course_bowsers_castle_dl_12D0,
d_course_bowsers_castle_dl_1330, d_course_bowsers_castle_dl_1370, d_course_bowsers_castle_dl_1350,
d_course_bowsers_castle_dl_13A0, d_course_bowsers_castle_dl_13C0, d_course_bowsers_castle_dl_1448,
d_course_bowsers_castle_dl_13E0, d_course_bowsers_castle_dl_1488, d_course_bowsers_castle_dl_14B0,
d_course_bowsers_castle_dl_1590, d_course_bowsers_castle_dl_1520, d_course_bowsers_castle_dl_1608,
d_course_bowsers_castle_dl_1690, d_course_bowsers_castle_dl_1788, d_course_bowsers_castle_dl_1710,
d_course_bowsers_castle_dl_17D0, d_course_bowsers_castle_dl_1818, d_course_bowsers_castle_dl_18C0,
d_course_bowsers_castle_dl_1860, d_course_bowsers_castle_dl_1928, d_course_bowsers_castle_dl_1960,
d_course_bowsers_castle_dl_19F8, d_course_bowsers_castle_dl_19A8, d_course_bowsers_castle_dl_1A40,
d_course_bowsers_castle_dl_1A90, d_course_bowsers_castle_dl_1B10, d_course_bowsers_castle_dl_1AD8,
d_course_bowsers_castle_dl_1B58, d_course_bowsers_castle_dl_1BB0, d_course_bowsers_castle_dl_1C38,
d_course_bowsers_castle_dl_1C10, d_course_bowsers_castle_dl_1C60, d_course_bowsers_castle_dl_1C98,
d_course_bowsers_castle_dl_1DF8, d_course_bowsers_castle_dl_1CD0, d_course_bowsers_castle_dl_1EB0,
d_course_bowsers_castle_dl_1FA0, d_course_bowsers_castle_dl_2130, d_course_bowsers_castle_dl_2008,
d_course_bowsers_castle_dl_21F0, d_course_bowsers_castle_dl_22E8, d_course_bowsers_castle_dl_24B8,
d_course_bowsers_castle_dl_2398, d_course_bowsers_castle_dl_2578, d_course_bowsers_castle_dl_2688,
d_course_bowsers_castle_dl_2880, d_course_bowsers_castle_dl_2760, d_course_bowsers_castle_dl_2958,
d_course_bowsers_castle_dl_2A60, d_course_bowsers_castle_dl_2C48, d_course_bowsers_castle_dl_2B80,
d_course_bowsers_castle_dl_2D08, d_course_bowsers_castle_dl_2DF8, d_course_bowsers_castle_dl_2FB0,
d_course_bowsers_castle_dl_2F30, d_course_bowsers_castle_dl_3050, d_course_bowsers_castle_dl_3158,
d_course_bowsers_castle_dl_32C0, d_course_bowsers_castle_dl_3230, d_course_bowsers_castle_dl_3338,
d_course_bowsers_castle_dl_3480, d_course_bowsers_castle_dl_35D0, d_course_bowsers_castle_dl_3508,
d_course_bowsers_castle_dl_3678, d_course_bowsers_castle_dl_37D8, d_course_bowsers_castle_dl_39E0,
d_course_bowsers_castle_dl_38F8, d_course_bowsers_castle_dl_3B00, d_course_bowsers_castle_dl_3C08,
d_course_bowsers_castle_dl_3EA8, d_course_bowsers_castle_dl_3D78, d_course_bowsers_castle_dl_3FF0,
d_course_bowsers_castle_dl_40F0, d_course_bowsers_castle_dl_4358, d_course_bowsers_castle_dl_4278,
d_course_bowsers_castle_dl_4488, d_course_bowsers_castle_dl_45D8, d_course_bowsers_castle_dl_4820,
d_course_bowsers_castle_dl_4748, d_course_bowsers_castle_dl_4998, d_course_bowsers_castle_dl_4A98,
d_course_bowsers_castle_dl_4CE8, d_course_bowsers_castle_dl_4C00, d_course_bowsers_castle_dl_4EA8,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -24,124 +24,60 @@ extern u8 gTextureSignYoshi[];
extern u8 gTextureCheckerboardBlueGray[];
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},
{ 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,
d_course_choco_mountain_dl_330,
d_course_choco_mountain_dl_4D8,
d_course_choco_mountain_dl_588,
d_course_choco_mountain_dl_6C0,
d_course_choco_mountain_dl_618,
d_course_choco_mountain_dl_750,
d_course_choco_mountain_dl_7E8,
d_course_choco_mountain_dl_908,
d_course_choco_mountain_dl_878,
d_course_choco_mountain_dl_990,
d_course_choco_mountain_dl_A28,
d_course_choco_mountain_dl_BB8,
d_course_choco_mountain_dl_B10,
d_course_choco_mountain_dl_C40,
d_course_choco_mountain_dl_D30,
d_course_choco_mountain_dl_EA0,
d_course_choco_mountain_dl_DF8,
d_course_choco_mountain_dl_F38,
d_course_choco_mountain_dl_1000,
d_course_choco_mountain_dl_1150,
d_course_choco_mountain_dl_10A8,
d_course_choco_mountain_dl_11D8,
d_course_choco_mountain_dl_1280,
d_course_choco_mountain_dl_13E0,
d_course_choco_mountain_dl_1330,
d_course_choco_mountain_dl_1488,
d_course_choco_mountain_dl_1528,
d_course_choco_mountain_dl_16B8,
d_course_choco_mountain_dl_15E8,
d_course_choco_mountain_dl_1788,
d_course_choco_mountain_dl_1810,
d_course_choco_mountain_dl_1970,
d_course_choco_mountain_dl_18B8,
d_course_choco_mountain_dl_1A40,
d_course_choco_mountain_dl_1AC8,
d_course_choco_mountain_dl_1C18,
d_course_choco_mountain_dl_1B70,
d_course_choco_mountain_dl_1CC8,
d_course_choco_mountain_dl_1D50,
d_course_choco_mountain_dl_1E98,
d_course_choco_mountain_dl_1E08,
d_course_choco_mountain_dl_1F40,
d_course_choco_mountain_dl_1FE0,
d_course_choco_mountain_dl_2168,
d_course_choco_mountain_dl_20C8,
d_course_choco_mountain_dl_2228,
d_course_choco_mountain_dl_22D8,
d_course_choco_mountain_dl_2468,
d_course_choco_mountain_dl_23C8,
d_course_choco_mountain_dl_2538,
d_course_choco_mountain_dl_2600,
d_course_choco_mountain_dl_2780,
d_course_choco_mountain_dl_26D8,
d_course_choco_mountain_dl_2840,
d_course_choco_mountain_dl_2908,
d_course_choco_mountain_dl_2A88,
d_course_choco_mountain_dl_29B8,
d_course_choco_mountain_dl_2B38,
d_course_choco_mountain_dl_2C08,
d_course_choco_mountain_dl_2D50,
d_course_choco_mountain_dl_2C98,
d_course_choco_mountain_dl_2DE8,
d_course_choco_mountain_dl_2EA0,
d_course_choco_mountain_dl_2FD0,
d_course_choco_mountain_dl_2F28,
d_course_choco_mountain_dl_3070,
d_course_choco_mountain_dl_3120,
d_course_choco_mountain_dl_32B0,
d_course_choco_mountain_dl_31D8,
d_course_choco_mountain_dl_3368,
d_course_choco_mountain_dl_3438,
d_course_choco_mountain_dl_3618,
d_course_choco_mountain_dl_3550,
d_course_choco_mountain_dl_36F0,
d_course_choco_mountain_dl_37D0,
d_course_choco_mountain_dl_39A8,
d_course_choco_mountain_dl_38E8,
d_course_choco_mountain_dl_3A80,
d_course_choco_mountain_dl_3B60,
d_course_choco_mountain_dl_3CB8,
d_course_choco_mountain_dl_3C18,
d_course_choco_mountain_dl_3D70,
d_course_choco_mountain_dl_3E18,
d_course_choco_mountain_dl_3FA8,
d_course_choco_mountain_dl_3EE0,
d_course_choco_mountain_dl_4090,
d_course_choco_mountain_dl_4138,
d_course_choco_mountain_dl_42C8,
d_course_choco_mountain_dl_41F8,
d_course_choco_mountain_dl_43C8,
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,
d_course_choco_mountain_dl_330, d_course_choco_mountain_dl_4D8, d_course_choco_mountain_dl_588,
d_course_choco_mountain_dl_6C0, d_course_choco_mountain_dl_618, d_course_choco_mountain_dl_750,
d_course_choco_mountain_dl_7E8, d_course_choco_mountain_dl_908, d_course_choco_mountain_dl_878,
d_course_choco_mountain_dl_990, d_course_choco_mountain_dl_A28, d_course_choco_mountain_dl_BB8,
d_course_choco_mountain_dl_B10, d_course_choco_mountain_dl_C40, d_course_choco_mountain_dl_D30,
d_course_choco_mountain_dl_EA0, d_course_choco_mountain_dl_DF8, d_course_choco_mountain_dl_F38,
d_course_choco_mountain_dl_1000, d_course_choco_mountain_dl_1150, d_course_choco_mountain_dl_10A8,
d_course_choco_mountain_dl_11D8, d_course_choco_mountain_dl_1280, d_course_choco_mountain_dl_13E0,
d_course_choco_mountain_dl_1330, d_course_choco_mountain_dl_1488, d_course_choco_mountain_dl_1528,
d_course_choco_mountain_dl_16B8, d_course_choco_mountain_dl_15E8, d_course_choco_mountain_dl_1788,
d_course_choco_mountain_dl_1810, d_course_choco_mountain_dl_1970, d_course_choco_mountain_dl_18B8,
d_course_choco_mountain_dl_1A40, d_course_choco_mountain_dl_1AC8, d_course_choco_mountain_dl_1C18,
d_course_choco_mountain_dl_1B70, d_course_choco_mountain_dl_1CC8, d_course_choco_mountain_dl_1D50,
d_course_choco_mountain_dl_1E98, d_course_choco_mountain_dl_1E08, d_course_choco_mountain_dl_1F40,
d_course_choco_mountain_dl_1FE0, d_course_choco_mountain_dl_2168, d_course_choco_mountain_dl_20C8,
d_course_choco_mountain_dl_2228, d_course_choco_mountain_dl_22D8, d_course_choco_mountain_dl_2468,
d_course_choco_mountain_dl_23C8, d_course_choco_mountain_dl_2538, d_course_choco_mountain_dl_2600,
d_course_choco_mountain_dl_2780, d_course_choco_mountain_dl_26D8, d_course_choco_mountain_dl_2840,
d_course_choco_mountain_dl_2908, d_course_choco_mountain_dl_2A88, d_course_choco_mountain_dl_29B8,
d_course_choco_mountain_dl_2B38, d_course_choco_mountain_dl_2C08, d_course_choco_mountain_dl_2D50,
d_course_choco_mountain_dl_2C98, d_course_choco_mountain_dl_2DE8, d_course_choco_mountain_dl_2EA0,
d_course_choco_mountain_dl_2FD0, d_course_choco_mountain_dl_2F28, d_course_choco_mountain_dl_3070,
d_course_choco_mountain_dl_3120, d_course_choco_mountain_dl_32B0, d_course_choco_mountain_dl_31D8,
d_course_choco_mountain_dl_3368, d_course_choco_mountain_dl_3438, d_course_choco_mountain_dl_3618,
d_course_choco_mountain_dl_3550, d_course_choco_mountain_dl_36F0, d_course_choco_mountain_dl_37D0,
d_course_choco_mountain_dl_39A8, d_course_choco_mountain_dl_38E8, d_course_choco_mountain_dl_3A80,
d_course_choco_mountain_dl_3B60, d_course_choco_mountain_dl_3CB8, d_course_choco_mountain_dl_3C18,
d_course_choco_mountain_dl_3D70, d_course_choco_mountain_dl_3E18, d_course_choco_mountain_dl_3FA8,
d_course_choco_mountain_dl_3EE0, d_course_choco_mountain_dl_4090, d_course_choco_mountain_dl_4138,
d_course_choco_mountain_dl_42C8, d_course_choco_mountain_dl_41F8, d_course_choco_mountain_dl_43C8,
};

File diff suppressed because it is too large Load Diff

View File

@ -4,145 +4,303 @@
#include "all_course_model.h"
#include "all_course_packed.h"
struct CourseTable gCourseTable[] = {{
_course_mario_raceway_dl_mio0SegmentRomStart, _course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd,
d_course_mario_raceway_vertex, d_course_mario_raceway_vertex_count,
d_course_mario_raceway_packed, d_course_mario_raceway_packed_end,
mario_raceway_textures, 0, 0x0000,
}, {
_course_choco_mountain_dl_mio0SegmentRomStart, _course_choco_mountain_dl_mio0SegmentRomEnd,
_choco_mountain_vertexSegmentRomStart, _choco_mountain_vertexSegmentRomEnd,
_course_choco_mountain_offsetsSegmentRomStart, _course_choco_mountain_offsetsSegmentRomEnd,
d_course_choco_mountain_vertex, d_course_choco_mountain_vertex_count,
d_course_choco_mountain_packed, d_course_choco_mountain_packed_end,
choco_mountain_textures, 1, 0x0000,
}, {
_course_bowsers_castle_dl_mio0SegmentRomStart, _course_bowsers_castle_dl_mio0SegmentRomEnd,
_bowsers_castle_vertexSegmentRomStart, _bowsers_castle_vertexSegmentRomEnd,
_course_bowsers_castle_offsetsSegmentRomStart, _course_bowsers_castle_offsetsSegmentRomEnd,
d_course_bowsers_castle_vertex, d_course_bowsers_castle_vertex_count,
d_course_bowsers_castle_packed, d_course_bowsers_castle_packed_end,
bowsers_castle_textures, 0, 0x0000,
}, {
_course_banshee_boardwalk_dl_mio0SegmentRomStart, _course_banshee_boardwalk_dl_mio0SegmentRomEnd,
_banshee_boardwalk_vertexSegmentRomStart, _banshee_boardwalk_vertexSegmentRomEnd,
_course_banshee_boardwalk_offsetsSegmentRomStart, _course_banshee_boardwalk_offsetsSegmentRomEnd,
d_course_banshee_boardwalk_vertex, d_course_banshee_boardwalk_vertex_count,
d_course_banshee_boardwalk_packed, d_course_banshee_boardwalk_packed_end,
banshee_boardwalk_textures, 1, 0x0000,
}, {
_course_yoshi_valley_dl_mio0SegmentRomStart, _course_yoshi_valley_dl_mio0SegmentRomEnd,
_yoshi_valley_vertexSegmentRomStart, _yoshi_valley_vertexSegmentRomEnd,
_course_yoshi_valley_offsetsSegmentRomStart, _course_yoshi_valley_offsetsSegmentRomEnd,
d_course_yoshi_valley_vertex, d_course_yoshi_valley_vertex_count,
d_course_yoshi_valley_packed, d_course_yoshi_valley_packed_end,
yoshi_valley_textures, 0, 0x0000,
}, {
_course_frappe_snowland_dl_mio0SegmentRomStart, _course_frappe_snowland_dl_mio0SegmentRomEnd,
_frappe_snowland_vertexSegmentRomStart, _frappe_snowland_vertexSegmentRomEnd,
_course_frappe_snowland_offsetsSegmentRomStart, _course_frappe_snowland_offsetsSegmentRomEnd,
d_course_frappe_snowland_vertex, d_course_frappe_snowland_vertex_count,
d_course_frappe_snowland_packed, d_course_frappe_snowland_packed_end,
frappe_snowland_textures, 0, 0x0000,
}, {
_course_koopa_troopa_beach_dl_mio0SegmentRomStart, _course_koopa_troopa_beach_dl_mio0SegmentRomEnd,
_koopa_troopa_beach_vertexSegmentRomStart, _koopa_troopa_beach_vertexSegmentRomEnd,
_course_koopa_troopa_beach_offsetsSegmentRomStart, _course_koopa_troopa_beach_offsetsSegmentRomEnd,
d_course_koopa_troopa_beach_vertex, d_course_koopa_troopa_beach_vertex_count,
d_course_koopa_troopa_beach_packed, d_course_koopa_troopa_beach_packed_end,
koopa_troopa_beach_textures, 0, 0x0000,
}, {
_course_royal_raceway_dl_mio0SegmentRomStart, _course_royal_raceway_dl_mio0SegmentRomEnd,
_royal_raceway_vertexSegmentRomStart, _royal_raceway_vertexSegmentRomEnd,
_course_royal_raceway_offsetsSegmentRomStart, _course_royal_raceway_offsetsSegmentRomEnd,
d_course_royal_raceway_vertex, d_course_royal_raceway_vertex_count,
d_course_royal_raceway_packed, d_course_royal_raceway_packed_end,
royal_raceway_textures, 0, 0x0000,
}, {
_course_luigi_raceway_dl_mio0SegmentRomStart, _course_luigi_raceway_dl_mio0SegmentRomEnd,
_luigi_raceway_vertexSegmentRomStart, _luigi_raceway_vertexSegmentRomEnd,
_course_luigi_raceway_offsetsSegmentRomStart, _course_luigi_raceway_offsetsSegmentRomEnd,
d_course_luigi_raceway_vertex, d_course_luigi_raceway_vertex_count,
d_course_luigi_raceway_packed, d_course_luigi_raceway_packed_end,
luigi_raceway_textures, 0, 0x0000,
}, {
_course_moo_moo_farm_dl_mio0SegmentRomStart, _course_moo_moo_farm_dl_mio0SegmentRomEnd,
_moo_moo_farm_vertexSegmentRomStart, _moo_moo_farm_vertexSegmentRomEnd,
_course_moo_moo_farm_offsetsSegmentRomStart, _course_moo_moo_farm_offsetsSegmentRomEnd,
d_course_moo_moo_farm_vertex, d_course_moo_moo_farm_vertex_count,
d_course_moo_moo_farm_packed, d_course_moo_moo_farm_packed_end,
moo_moo_farm_textures, 0, 0x0000,
}, {
_course_toads_turnpike_dl_mio0SegmentRomStart, _course_toads_turnpike_dl_mio0SegmentRomEnd,
_toads_turnpike_vertexSegmentRomStart, _toads_turnpike_vertexSegmentRomEnd,
_course_toads_turnpike_offsetsSegmentRomStart, _course_toads_turnpike_offsetsSegmentRomEnd,
d_course_toads_turnpike_vertex, d_course_toads_turnpike_vertex_count,
d_course_toads_turnpike_packed, d_course_toads_turnpike_packed_end,
toads_turnpike_textures, 0, 0x0000,
}, {
_course_kalimari_desert_dl_mio0SegmentRomStart, _course_kalimari_desert_dl_mio0SegmentRomEnd,
_kalimari_desert_vertexSegmentRomStart, _kalimari_desert_vertexSegmentRomEnd,
_course_kalimari_desert_offsetsSegmentRomStart, _course_kalimari_desert_offsetsSegmentRomEnd,
d_course_kalimari_desert_vertex, d_course_kalimari_desert_vertex_count,
d_course_kalimari_desert_packed, d_course_kalimari_desert_packed_end,
kalimari_desert_textures, 0, 0x0000,
}, {
_course_sherbet_land_dl_mio0SegmentRomStart, _course_sherbet_land_dl_mio0SegmentRomEnd,
_sherbet_land_vertexSegmentRomStart, _sherbet_land_vertexSegmentRomEnd,
_course_sherbet_land_offsetsSegmentRomStart, _course_sherbet_land_offsetsSegmentRomEnd,
d_course_sherbet_land_vertex, d_course_sherbet_land_vertex_count,
d_course_sherbet_land_packed, d_course_sherbet_land_packed_end,
sherbet_land_textures, 0, 0x0000,
}, {
_course_rainbow_road_dl_mio0SegmentRomStart, _course_rainbow_road_dl_mio0SegmentRomEnd,
_rainbow_road_vertexSegmentRomStart, _rainbow_road_vertexSegmentRomEnd,
_course_rainbow_road_offsetsSegmentRomStart, _course_rainbow_road_offsetsSegmentRomEnd,
d_course_rainbow_road_vertex, d_course_rainbow_road_vertex_count,
d_course_rainbow_road_packed, d_course_rainbow_road_packed_end,
rainbow_road_textures, 0, 0x0000,
}, {
_course_wario_stadium_dl_mio0SegmentRomStart, _course_wario_stadium_dl_mio0SegmentRomEnd,
_wario_stadium_vertexSegmentRomStart, _wario_stadium_vertexSegmentRomEnd,
_course_wario_stadium_offsetsSegmentRomStart, _course_wario_stadium_offsetsSegmentRomEnd,
d_course_wario_stadium_vertex, d_course_wario_stadium_vertex_count,
d_course_wario_stadium_packed, d_course_wario_stadium_packed_end,
wario_stadium_textures, 0, 0x0000,
}, {
_course_block_fort_dl_mio0SegmentRomStart, _course_block_fort_dl_mio0SegmentRomEnd,
_block_fort_vertexSegmentRomStart, _block_fort_vertexSegmentRomEnd,
_course_block_fort_offsetsSegmentRomStart, _course_block_fort_offsetsSegmentRomEnd,
d_course_block_fort_vertex, d_course_block_fort_vertex_count,
d_course_block_fort_packed, d_course_block_fort_packed_end,
block_fort_textures, 0, 0x0000,
}, {
_course_skyscraper_dl_mio0SegmentRomStart, _course_skyscraper_dl_mio0SegmentRomEnd,
_skyscraper_vertexSegmentRomStart, _skyscraper_vertexSegmentRomEnd,
_course_skyscraper_offsetsSegmentRomStart, _course_skyscraper_offsetsSegmentRomEnd,
d_course_skyscraper_vertex, d_course_skyscraper_vertex_count,
d_course_skyscraper_packed, d_course_skyscraper_packed_end,
skyscraper_textures, 0, 0x0000,
}, {
_course_double_deck_dl_mio0SegmentRomStart, _course_double_deck_dl_mio0SegmentRomEnd,
_double_deck_vertexSegmentRomStart, _double_deck_vertexSegmentRomEnd,
_course_double_deck_offsetsSegmentRomStart, _course_double_deck_offsetsSegmentRomEnd,
d_course_double_deck_vertex, d_course_double_deck_vertex_count,
d_course_double_deck_packed, d_course_double_deck_packed_end,
double_deck_textures, 0, 0x0000,
}, {
_course_dks_jungle_parkway_dl_mio0SegmentRomStart, _course_dks_jungle_parkway_dl_mio0SegmentRomEnd,
_dks_jungle_parkway_vertexSegmentRomStart, _dks_jungle_parkway_vertexSegmentRomEnd,
_course_dks_jungle_parkway_offsetsSegmentRomStart, _course_dks_jungle_parkway_offsetsSegmentRomEnd,
d_course_dks_jungle_parkway_vertex, d_course_dks_jungle_parkway_vertex_count,
d_course_dks_jungle_parkway_packed, d_course_dks_jungle_parkway_packed_end,
dks_jungle_parkway_textures, 0, 0x0000,
}, {
_course_big_donut_dl_mio0SegmentRomStart, _course_big_donut_dl_mio0SegmentRomEnd,
_big_donut_vertexSegmentRomStart, _big_donut_vertexSegmentRomEnd,
_course_big_donut_offsetsSegmentRomStart, _course_big_donut_offsetsSegmentRomEnd,
d_course_big_donut_vertex, d_course_big_donut_vertex_count,
d_course_big_donut_packed, d_course_big_donut_packed_end,
big_donut_textures, 0, 0x0000,
}};
struct CourseTable gCourseTable[] = { {
_course_mario_raceway_dl_mio0SegmentRomStart,
_course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart,
_mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart,
_course_mario_raceway_offsetsSegmentRomEnd,
d_course_mario_raceway_vertex,
d_course_mario_raceway_vertex_count,
d_course_mario_raceway_packed,
d_course_mario_raceway_packed_end,
mario_raceway_textures,
0,
0x0000,
},
{
_course_choco_mountain_dl_mio0SegmentRomStart,
_course_choco_mountain_dl_mio0SegmentRomEnd,
_choco_mountain_vertexSegmentRomStart,
_choco_mountain_vertexSegmentRomEnd,
_course_choco_mountain_offsetsSegmentRomStart,
_course_choco_mountain_offsetsSegmentRomEnd,
d_course_choco_mountain_vertex,
d_course_choco_mountain_vertex_count,
d_course_choco_mountain_packed,
d_course_choco_mountain_packed_end,
choco_mountain_textures,
1,
0x0000,
},
{
_course_bowsers_castle_dl_mio0SegmentRomStart,
_course_bowsers_castle_dl_mio0SegmentRomEnd,
_bowsers_castle_vertexSegmentRomStart,
_bowsers_castle_vertexSegmentRomEnd,
_course_bowsers_castle_offsetsSegmentRomStart,
_course_bowsers_castle_offsetsSegmentRomEnd,
d_course_bowsers_castle_vertex,
d_course_bowsers_castle_vertex_count,
d_course_bowsers_castle_packed,
d_course_bowsers_castle_packed_end,
bowsers_castle_textures,
0,
0x0000,
},
{
_course_banshee_boardwalk_dl_mio0SegmentRomStart,
_course_banshee_boardwalk_dl_mio0SegmentRomEnd,
_banshee_boardwalk_vertexSegmentRomStart,
_banshee_boardwalk_vertexSegmentRomEnd,
_course_banshee_boardwalk_offsetsSegmentRomStart,
_course_banshee_boardwalk_offsetsSegmentRomEnd,
d_course_banshee_boardwalk_vertex,
d_course_banshee_boardwalk_vertex_count,
d_course_banshee_boardwalk_packed,
d_course_banshee_boardwalk_packed_end,
banshee_boardwalk_textures,
1,
0x0000,
},
{
_course_yoshi_valley_dl_mio0SegmentRomStart,
_course_yoshi_valley_dl_mio0SegmentRomEnd,
_yoshi_valley_vertexSegmentRomStart,
_yoshi_valley_vertexSegmentRomEnd,
_course_yoshi_valley_offsetsSegmentRomStart,
_course_yoshi_valley_offsetsSegmentRomEnd,
d_course_yoshi_valley_vertex,
d_course_yoshi_valley_vertex_count,
d_course_yoshi_valley_packed,
d_course_yoshi_valley_packed_end,
yoshi_valley_textures,
0,
0x0000,
},
{
_course_frappe_snowland_dl_mio0SegmentRomStart,
_course_frappe_snowland_dl_mio0SegmentRomEnd,
_frappe_snowland_vertexSegmentRomStart,
_frappe_snowland_vertexSegmentRomEnd,
_course_frappe_snowland_offsetsSegmentRomStart,
_course_frappe_snowland_offsetsSegmentRomEnd,
d_course_frappe_snowland_vertex,
d_course_frappe_snowland_vertex_count,
d_course_frappe_snowland_packed,
d_course_frappe_snowland_packed_end,
frappe_snowland_textures,
0,
0x0000,
},
{
_course_koopa_troopa_beach_dl_mio0SegmentRomStart,
_course_koopa_troopa_beach_dl_mio0SegmentRomEnd,
_koopa_troopa_beach_vertexSegmentRomStart,
_koopa_troopa_beach_vertexSegmentRomEnd,
_course_koopa_troopa_beach_offsetsSegmentRomStart,
_course_koopa_troopa_beach_offsetsSegmentRomEnd,
d_course_koopa_troopa_beach_vertex,
d_course_koopa_troopa_beach_vertex_count,
d_course_koopa_troopa_beach_packed,
d_course_koopa_troopa_beach_packed_end,
koopa_troopa_beach_textures,
0,
0x0000,
},
{
_course_royal_raceway_dl_mio0SegmentRomStart,
_course_royal_raceway_dl_mio0SegmentRomEnd,
_royal_raceway_vertexSegmentRomStart,
_royal_raceway_vertexSegmentRomEnd,
_course_royal_raceway_offsetsSegmentRomStart,
_course_royal_raceway_offsetsSegmentRomEnd,
d_course_royal_raceway_vertex,
d_course_royal_raceway_vertex_count,
d_course_royal_raceway_packed,
d_course_royal_raceway_packed_end,
royal_raceway_textures,
0,
0x0000,
},
{
_course_luigi_raceway_dl_mio0SegmentRomStart,
_course_luigi_raceway_dl_mio0SegmentRomEnd,
_luigi_raceway_vertexSegmentRomStart,
_luigi_raceway_vertexSegmentRomEnd,
_course_luigi_raceway_offsetsSegmentRomStart,
_course_luigi_raceway_offsetsSegmentRomEnd,
d_course_luigi_raceway_vertex,
d_course_luigi_raceway_vertex_count,
d_course_luigi_raceway_packed,
d_course_luigi_raceway_packed_end,
luigi_raceway_textures,
0,
0x0000,
},
{
_course_moo_moo_farm_dl_mio0SegmentRomStart,
_course_moo_moo_farm_dl_mio0SegmentRomEnd,
_moo_moo_farm_vertexSegmentRomStart,
_moo_moo_farm_vertexSegmentRomEnd,
_course_moo_moo_farm_offsetsSegmentRomStart,
_course_moo_moo_farm_offsetsSegmentRomEnd,
d_course_moo_moo_farm_vertex,
d_course_moo_moo_farm_vertex_count,
d_course_moo_moo_farm_packed,
d_course_moo_moo_farm_packed_end,
moo_moo_farm_textures,
0,
0x0000,
},
{
_course_toads_turnpike_dl_mio0SegmentRomStart,
_course_toads_turnpike_dl_mio0SegmentRomEnd,
_toads_turnpike_vertexSegmentRomStart,
_toads_turnpike_vertexSegmentRomEnd,
_course_toads_turnpike_offsetsSegmentRomStart,
_course_toads_turnpike_offsetsSegmentRomEnd,
d_course_toads_turnpike_vertex,
d_course_toads_turnpike_vertex_count,
d_course_toads_turnpike_packed,
d_course_toads_turnpike_packed_end,
toads_turnpike_textures,
0,
0x0000,
},
{
_course_kalimari_desert_dl_mio0SegmentRomStart,
_course_kalimari_desert_dl_mio0SegmentRomEnd,
_kalimari_desert_vertexSegmentRomStart,
_kalimari_desert_vertexSegmentRomEnd,
_course_kalimari_desert_offsetsSegmentRomStart,
_course_kalimari_desert_offsetsSegmentRomEnd,
d_course_kalimari_desert_vertex,
d_course_kalimari_desert_vertex_count,
d_course_kalimari_desert_packed,
d_course_kalimari_desert_packed_end,
kalimari_desert_textures,
0,
0x0000,
},
{
_course_sherbet_land_dl_mio0SegmentRomStart,
_course_sherbet_land_dl_mio0SegmentRomEnd,
_sherbet_land_vertexSegmentRomStart,
_sherbet_land_vertexSegmentRomEnd,
_course_sherbet_land_offsetsSegmentRomStart,
_course_sherbet_land_offsetsSegmentRomEnd,
d_course_sherbet_land_vertex,
d_course_sherbet_land_vertex_count,
d_course_sherbet_land_packed,
d_course_sherbet_land_packed_end,
sherbet_land_textures,
0,
0x0000,
},
{
_course_rainbow_road_dl_mio0SegmentRomStart,
_course_rainbow_road_dl_mio0SegmentRomEnd,
_rainbow_road_vertexSegmentRomStart,
_rainbow_road_vertexSegmentRomEnd,
_course_rainbow_road_offsetsSegmentRomStart,
_course_rainbow_road_offsetsSegmentRomEnd,
d_course_rainbow_road_vertex,
d_course_rainbow_road_vertex_count,
d_course_rainbow_road_packed,
d_course_rainbow_road_packed_end,
rainbow_road_textures,
0,
0x0000,
},
{
_course_wario_stadium_dl_mio0SegmentRomStart,
_course_wario_stadium_dl_mio0SegmentRomEnd,
_wario_stadium_vertexSegmentRomStart,
_wario_stadium_vertexSegmentRomEnd,
_course_wario_stadium_offsetsSegmentRomStart,
_course_wario_stadium_offsetsSegmentRomEnd,
d_course_wario_stadium_vertex,
d_course_wario_stadium_vertex_count,
d_course_wario_stadium_packed,
d_course_wario_stadium_packed_end,
wario_stadium_textures,
0,
0x0000,
},
{
_course_block_fort_dl_mio0SegmentRomStart,
_course_block_fort_dl_mio0SegmentRomEnd,
_block_fort_vertexSegmentRomStart,
_block_fort_vertexSegmentRomEnd,
_course_block_fort_offsetsSegmentRomStart,
_course_block_fort_offsetsSegmentRomEnd,
d_course_block_fort_vertex,
d_course_block_fort_vertex_count,
d_course_block_fort_packed,
d_course_block_fort_packed_end,
block_fort_textures,
0,
0x0000,
},
{
_course_skyscraper_dl_mio0SegmentRomStart,
_course_skyscraper_dl_mio0SegmentRomEnd,
_skyscraper_vertexSegmentRomStart,
_skyscraper_vertexSegmentRomEnd,
_course_skyscraper_offsetsSegmentRomStart,
_course_skyscraper_offsetsSegmentRomEnd,
d_course_skyscraper_vertex,
d_course_skyscraper_vertex_count,
d_course_skyscraper_packed,
d_course_skyscraper_packed_end,
skyscraper_textures,
0,
0x0000,
},
{
_course_double_deck_dl_mio0SegmentRomStart,
_course_double_deck_dl_mio0SegmentRomEnd,
_double_deck_vertexSegmentRomStart,
_double_deck_vertexSegmentRomEnd,
_course_double_deck_offsetsSegmentRomStart,
_course_double_deck_offsetsSegmentRomEnd,
d_course_double_deck_vertex,
d_course_double_deck_vertex_count,
d_course_double_deck_packed,
d_course_double_deck_packed_end,
double_deck_textures,
0,
0x0000,
},
{
_course_dks_jungle_parkway_dl_mio0SegmentRomStart,
_course_dks_jungle_parkway_dl_mio0SegmentRomEnd,
_dks_jungle_parkway_vertexSegmentRomStart,
_dks_jungle_parkway_vertexSegmentRomEnd,
_course_dks_jungle_parkway_offsetsSegmentRomStart,
_course_dks_jungle_parkway_offsetsSegmentRomEnd,
d_course_dks_jungle_parkway_vertex,
d_course_dks_jungle_parkway_vertex_count,
d_course_dks_jungle_parkway_packed,
d_course_dks_jungle_parkway_packed_end,
dks_jungle_parkway_textures,
0,
0x0000,
},
{
_course_big_donut_dl_mio0SegmentRomStart,
_course_big_donut_dl_mio0SegmentRomEnd,
_big_donut_vertexSegmentRomStart,
_big_donut_vertexSegmentRomEnd,
_course_big_donut_offsetsSegmentRomStart,
_course_big_donut_offsetsSegmentRomEnd,
d_course_big_donut_vertex,
d_course_big_donut_vertex_count,
d_course_big_donut_packed,
d_course_big_donut_packed_end,
big_donut_textures,
0,
0x0000,
} };

View File

@ -6,19 +6,19 @@
// dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
struct CourseTable {
u8 *dlRomStart; // 0x00 ROM start for segment 6 DL data
u8 *dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8 *vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8 *vertexRomEnd; // 0x0C ROM end for segment 7?
u8 *offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8 *offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
CourseVtx *vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8 *packedStart; // 0x20 packed display list start address
u8 *finalDisplaylistOffset; // 0x24
u32 *textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
u8* dlRomStart; // 0x00 ROM start for segment 6 DL data
u8* dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8* vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8* vertexRomEnd; // 0x0C ROM end for segment 7?
u8* offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8* offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
CourseVtx* vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8* packedStart; // 0x20 packed display list start address
u8* finalDisplaylistOffset; // 0x24
u32* textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
};
extern struct CourseTable gCourseTable[];

File diff suppressed because it is too large Load Diff

View File

@ -188,7 +188,7 @@ extern u8 d_course_dks_jungle_parkway_kiwano_tlut[];
extern Vtx d_course_dks_jungle_parkway_kiwano_model[];
extern Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[];
extern Gfx d_course_dks_jungle_parkway_dl_13C30[];
extern Gfx *d_course_dks_jungle_parkway_unknown_dl_list[];
extern Gfx* d_course_dks_jungle_parkway_unknown_dl_list[];
extern struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[];
extern struct UnkActorSpawnData d_course_dks_jungle_parkway_tree_spawn[];
extern TrackSections d_course_dks_jungle_parkway_addr[];

File diff suppressed because it is too large Load Diff

View File

@ -27,29 +27,29 @@ extern u8 gTextureWaves0[];
extern u8 gTexture683844[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

View File

@ -15,47 +15,19 @@ Gfx d_course_double_deck_dl[] = {
// Item box spawn locations.
struct ActorSpawnData d_course_double_deck_item_box_spawns[] = {
{{ -331, 0, 675 }, { 0 }},
{{ 18, 30, 295 }, { 0 }},
{{ -685, 0, -279 }, { 0 }},
{{ -329, 0, 731 }, { 0 }},
{{ 17, 30, 346 }, { 0 }},
{{ -741, 0, -280 }, { 0 }},
{{ -367, 30, 13 }, { 0 }},
{{ -315, 30, 2 }, { 0 }},
{{ -625, 0, -276 }, { 0 }},
{{ -259, 30, -12 }, { 0 }},
{{ 22, 30, 245 }, { 0 }},
{{ -341, 0, 619 }, { 0 }},
{{ 350, 0, -605 }, { 1 }},
{{ 732, 0, 277 }, { 1 }},
{{ 248, 30, 48 }, { 1 }},
{{ 56, 30, -340 }, { 1 }},
{{ 670, 0, 286 }, { 1 }},
{{ 356, 0, -658 }, { 1 }},
{{ 48, 30, -283 }, { 1 }},
{{ 626, 0, 288 }, { 1 }},
{{ 292, 30, 56 }, { 1 }},
{{ 337, 30, 58 }, { 1 }},
{{ 54, 30, -248 }, { 1 }},
{{ 363, 0, -709 }, { 1 }},
{{ 341, 60, -726 }, { 2 }},
{{ 352, 60, -682 }, { 2 }},
{{ 698, 60, 430 }, { 2 }},
{{ 660, 60, 439 }, { 2 }},
{{ 280, 90, 290 }, { 2 }},
{{ 236, 90, 246 }, { 2 }},
{{ 351, 60, -632 }, { 2 }},
{{ 616, 60, 456 }, { 2 }},
{{ 324, 90, 331 }, { 2 }},
{{ -233, 90, -235 }, { 3 }},
{{ -281, 90, -280 }, { 3 }},
{{ -688, 60, -395 }, { 3 }},
{{ -735, 60, -390 }, { 3 }},
{{ -434, 60, 707 }, { 3 }},
{{ -422, 60, 663 }, { 3 }},
{{ -435, 60, 618 }, { 3 }},
{{ -626, 60, -405 }, { 3 }},
{{ -312, 90, -320 }, { 3 }},
{{ -32768, 0, 0 }, { 0 }},
{ { -331, 0, 675 }, { 0 } }, { { 18, 30, 295 }, { 0 } }, { { -685, 0, -279 }, { 0 } },
{ { -329, 0, 731 }, { 0 } }, { { 17, 30, 346 }, { 0 } }, { { -741, 0, -280 }, { 0 } },
{ { -367, 30, 13 }, { 0 } }, { { -315, 30, 2 }, { 0 } }, { { -625, 0, -276 }, { 0 } },
{ { -259, 30, -12 }, { 0 } }, { { 22, 30, 245 }, { 0 } }, { { -341, 0, 619 }, { 0 } },
{ { 350, 0, -605 }, { 1 } }, { { 732, 0, 277 }, { 1 } }, { { 248, 30, 48 }, { 1 } },
{ { 56, 30, -340 }, { 1 } }, { { 670, 0, 286 }, { 1 } }, { { 356, 0, -658 }, { 1 } },
{ { 48, 30, -283 }, { 1 } }, { { 626, 0, 288 }, { 1 } }, { { 292, 30, 56 }, { 1 } },
{ { 337, 30, 58 }, { 1 } }, { { 54, 30, -248 }, { 1 } }, { { 363, 0, -709 }, { 1 } },
{ { 341, 60, -726 }, { 2 } }, { { 352, 60, -682 }, { 2 } }, { { 698, 60, 430 }, { 2 } },
{ { 660, 60, 439 }, { 2 } }, { { 280, 90, 290 }, { 2 } }, { { 236, 90, 246 }, { 2 } },
{ { 351, 60, -632 }, { 2 } }, { { 616, 60, 456 }, { 2 } }, { { 324, 90, 331 }, { 2 } },
{ { -233, 90, -235 }, { 3 } }, { { -281, 90, -280 }, { 3 } }, { { -688, 60, -395 }, { 3 } },
{ { -735, 60, -390 }, { 3 } }, { { -434, 60, 707 }, { 3 } }, { { -422, 60, 663 }, { 3 } },
{ { -435, 60, 618 }, { 3 } }, { { -626, 60, -405 }, { 3 } }, { { -312, 90, -320 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};

View File

@ -7,17 +7,18 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_double_deck_packed_dl_0[] =
{
Gfx d_course_double_deck_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000000, 32, 0),
@ -77,17 +78,18 @@ Gfx d_course_double_deck_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_210[] =
{
Gfx d_course_double_deck_packed_dl_210[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C00, 32, 0),
@ -131,24 +133,24 @@ Gfx d_course_double_deck_packed_dl_210[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_3A0[] =
{
Gfx d_course_double_deck_packed_dl_3A0[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_210),
gsSPDisplayList(d_course_double_deck_packed_dl_0),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_3B8[] =
{
Gfx d_course_double_deck_packed_dl_3B8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001250, 32, 0),
@ -199,8 +201,7 @@ Gfx d_course_double_deck_packed_dl_3B8[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_580[] =
{
Gfx d_course_double_deck_packed_dl_580[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x04001C50, 3, 0),
@ -209,11 +210,13 @@ Gfx d_course_double_deck_packed_dl_580[] =
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001C80, 32, 0),
@ -252,27 +255,23 @@ Gfx d_course_double_deck_packed_dl_580[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_708[] =
{
Gfx d_course_double_deck_packed_dl_708[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_580),
gsSPDisplayList(d_course_double_deck_packed_dl_3B8),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_720[] =
{
Gfx d_course_double_deck_packed_dl_720[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_708),
gsSPDisplayList(d_course_double_deck_packed_dl_3A0),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_738[] =
{
Gfx d_course_double_deck_packed_dl_738[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_720),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_748[] =
{
Gfx d_course_double_deck_packed_dl_748[] = {
gsSPEndDisplayList(),
};

View File

@ -5,7 +5,7 @@ extern u8 gTextureGrayCobblestone[];
extern u8 gTexture642978[];
const course_texture double_deck_textures[] = {
{gTextureGrayCobblestone, 0x010C, 0x0800, 0x0},
{gTexture642978, 0x010D, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 },
{ gTexture642978, 0x010D, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -88,7 +88,7 @@ extern Gfx d_course_frappe_snowland_dl_tree[];
extern Gfx d_course_frappe_snowland_dl_76A0[];
extern struct ActorSpawnData d_course_frappe_snowland_tree_spawns[];
extern struct ActorSpawnData d_course_frappe_snowland_item_box_spawns[];
extern Gfx *d_course_frappe_snowland_dl_list[];
extern Gfx* d_course_frappe_snowland_dl_list[];
extern TrackSections d_course_frappe_snowland_addr[];
#endif

File diff suppressed because it is too large Load Diff

View File

@ -11,13 +11,9 @@ extern u8 gTexture679258[];
extern u8 gTexture67973C[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -29,113 +29,47 @@ extern u8 gTextureSignKoopaAir0[];
extern u8 gTextureSignKoopaAir1[];
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},
{ 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,
d_course_kalimari_desert_dl_5C0,
d_course_kalimari_desert_dl_858,
d_course_kalimari_desert_dl_A58,
d_course_kalimari_desert_dl_CD0,
d_course_kalimari_desert_dl_B38,
d_course_kalimari_desert_dl_DD0,
d_course_kalimari_desert_dl_F68,
d_course_kalimari_desert_dl_1258,
d_course_kalimari_desert_dl_1030,
d_course_kalimari_desert_dl_1350,
d_course_kalimari_desert_dl_14C0,
d_course_kalimari_desert_dl_17C8,
d_course_kalimari_desert_dl_1588,
d_course_kalimari_desert_dl_18C8,
d_course_kalimari_desert_dl_1A58,
d_course_kalimari_desert_dl_1D48,
d_course_kalimari_desert_dl_1B38,
d_course_kalimari_desert_dl_1E80,
d_course_kalimari_desert_dl_2000,
d_course_kalimari_desert_dl_22D8,
d_course_kalimari_desert_dl_20E0,
d_course_kalimari_desert_dl_2458,
d_course_kalimari_desert_dl_25D0,
d_course_kalimari_desert_dl_2868,
d_course_kalimari_desert_dl_26E8,
d_course_kalimari_desert_dl_29C0,
d_course_kalimari_desert_dl_2B40,
d_course_kalimari_desert_dl_2DE8,
d_course_kalimari_desert_dl_2C88,
d_course_kalimari_desert_dl_2F30,
d_course_kalimari_desert_dl_3068,
d_course_kalimari_desert_dl_32F8,
d_course_kalimari_desert_dl_31C0,
d_course_kalimari_desert_dl_3460,
d_course_kalimari_desert_dl_3590,
d_course_kalimari_desert_dl_3818,
d_course_kalimari_desert_dl_3718,
d_course_kalimari_desert_dl_3998,
d_course_kalimari_desert_dl_3AC0,
d_course_kalimari_desert_dl_3DB8,
d_course_kalimari_desert_dl_3CA0,
d_course_kalimari_desert_dl_3FB0,
d_course_kalimari_desert_dl_40A8,
d_course_kalimari_desert_dl_4358,
d_course_kalimari_desert_dl_4280,
d_course_kalimari_desert_dl_4538,
d_course_kalimari_desert_dl_4630,
d_course_kalimari_desert_dl_49E0,
d_course_kalimari_desert_dl_4908,
d_course_kalimari_desert_dl_4BA0,
d_course_kalimari_desert_dl_4CF0,
d_course_kalimari_desert_dl_4FB0,
d_course_kalimari_desert_dl_4EF8,
d_course_kalimari_desert_dl_5100,
d_course_kalimari_desert_dl_5208,
d_course_kalimari_desert_dl_5470,
d_course_kalimari_desert_dl_53A0,
d_course_kalimari_desert_dl_55C8,
d_course_kalimari_desert_dl_5730,
d_course_kalimari_desert_dl_5978,
d_course_kalimari_desert_dl_5898,
d_course_kalimari_desert_dl_5AD0,
d_course_kalimari_desert_dl_5BE8,
d_course_kalimari_desert_dl_5DF8,
d_course_kalimari_desert_dl_5D20,
d_course_kalimari_desert_dl_5F20,
d_course_kalimari_desert_dl_6028,
d_course_kalimari_desert_dl_62F8,
d_course_kalimari_desert_dl_61B0,
d_course_kalimari_desert_dl_63E0,
d_course_kalimari_desert_dl_65B0,
d_course_kalimari_desert_dl_6838,
d_course_kalimari_desert_dl_66F0,
d_course_kalimari_desert_dl_6940,
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,
d_course_kalimari_desert_dl_5C0, d_course_kalimari_desert_dl_858, d_course_kalimari_desert_dl_A58,
d_course_kalimari_desert_dl_CD0, d_course_kalimari_desert_dl_B38, d_course_kalimari_desert_dl_DD0,
d_course_kalimari_desert_dl_F68, d_course_kalimari_desert_dl_1258, d_course_kalimari_desert_dl_1030,
d_course_kalimari_desert_dl_1350, d_course_kalimari_desert_dl_14C0, d_course_kalimari_desert_dl_17C8,
d_course_kalimari_desert_dl_1588, d_course_kalimari_desert_dl_18C8, d_course_kalimari_desert_dl_1A58,
d_course_kalimari_desert_dl_1D48, d_course_kalimari_desert_dl_1B38, d_course_kalimari_desert_dl_1E80,
d_course_kalimari_desert_dl_2000, d_course_kalimari_desert_dl_22D8, d_course_kalimari_desert_dl_20E0,
d_course_kalimari_desert_dl_2458, d_course_kalimari_desert_dl_25D0, d_course_kalimari_desert_dl_2868,
d_course_kalimari_desert_dl_26E8, d_course_kalimari_desert_dl_29C0, d_course_kalimari_desert_dl_2B40,
d_course_kalimari_desert_dl_2DE8, d_course_kalimari_desert_dl_2C88, d_course_kalimari_desert_dl_2F30,
d_course_kalimari_desert_dl_3068, d_course_kalimari_desert_dl_32F8, d_course_kalimari_desert_dl_31C0,
d_course_kalimari_desert_dl_3460, d_course_kalimari_desert_dl_3590, d_course_kalimari_desert_dl_3818,
d_course_kalimari_desert_dl_3718, d_course_kalimari_desert_dl_3998, d_course_kalimari_desert_dl_3AC0,
d_course_kalimari_desert_dl_3DB8, d_course_kalimari_desert_dl_3CA0, d_course_kalimari_desert_dl_3FB0,
d_course_kalimari_desert_dl_40A8, d_course_kalimari_desert_dl_4358, d_course_kalimari_desert_dl_4280,
d_course_kalimari_desert_dl_4538, d_course_kalimari_desert_dl_4630, d_course_kalimari_desert_dl_49E0,
d_course_kalimari_desert_dl_4908, d_course_kalimari_desert_dl_4BA0, d_course_kalimari_desert_dl_4CF0,
d_course_kalimari_desert_dl_4FB0, d_course_kalimari_desert_dl_4EF8, d_course_kalimari_desert_dl_5100,
d_course_kalimari_desert_dl_5208, d_course_kalimari_desert_dl_5470, d_course_kalimari_desert_dl_53A0,
d_course_kalimari_desert_dl_55C8, d_course_kalimari_desert_dl_5730, d_course_kalimari_desert_dl_5978,
d_course_kalimari_desert_dl_5898, d_course_kalimari_desert_dl_5AD0, d_course_kalimari_desert_dl_5BE8,
d_course_kalimari_desert_dl_5DF8, d_course_kalimari_desert_dl_5D20, d_course_kalimari_desert_dl_5F20,
d_course_kalimari_desert_dl_6028, d_course_kalimari_desert_dl_62F8, d_course_kalimari_desert_dl_61B0,
d_course_kalimari_desert_dl_63E0, d_course_kalimari_desert_dl_65B0, d_course_kalimari_desert_dl_6838,
d_course_kalimari_desert_dl_66F0, d_course_kalimari_desert_dl_6940,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -332,7 +332,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_168F0[];
extern Vtx d_course_koopa_troopa_beach_bird_wing_3_model[];
extern Gfx d_course_koopa_troopa_beach_dl_16990[];
extern u32 d_course_koopa_troopa_beach_unk4[];
extern Animation *d_course_koopa_troopa_beach_unk_data5[];
extern Animation* d_course_koopa_troopa_beach_unk_data5[];
extern u32 d_course_koopa_troopa_beach_unk_data6[];
extern Lights1 d_course_koopa_troopa_beach_light2;
extern Vtx d_course_koopa_troopa_beach_tree_model[];
@ -367,7 +367,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_18D68[];
extern struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[];
extern struct ActorSpawnData d_course_koopa_troopa_beach_tree_spawn[];
extern TrackSections d_course_koopa_troopa_beach_addr[];
extern Gfx *d_course_koopa_troopa_beach_dl_list1[];
extern Gfx *d_course_koopa_troopa_beach_dl_list2[];
extern Gfx* d_course_koopa_troopa_beach_dl_list1[];
extern Gfx* d_course_koopa_troopa_beach_dl_list2[];
#endif

File diff suppressed because it is too large Load Diff

View File

@ -19,21 +19,21 @@ extern u8 gTextureWaves1[];
extern u8 gTextureWaves2[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -44,168 +44,88 @@ extern u8 gTextureSignYoshi[];
extern u8 gTextureCheckerboardBlueGray[];
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},
{ 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,
d_course_luigi_raceway_dl_868,
d_course_luigi_raceway_dl_B48,
d_course_luigi_raceway_dl_D80,
d_course_luigi_raceway_dl_1058,
d_course_luigi_raceway_dl_EE8,
d_course_luigi_raceway_dl_1198,
d_course_luigi_raceway_dl_1398,
d_course_luigi_raceway_dl_16D8,
d_course_luigi_raceway_dl_1538,
d_course_luigi_raceway_dl_1888,
d_course_luigi_raceway_dl_1B00,
d_course_luigi_raceway_dl_1E30,
d_course_luigi_raceway_dl_1C78,
d_course_luigi_raceway_dl_1FD0,
d_course_luigi_raceway_dl_2240,
d_course_luigi_raceway_dl_2518,
d_course_luigi_raceway_dl_2348,
d_course_luigi_raceway_dl_2658,
d_course_luigi_raceway_dl_2860,
d_course_luigi_raceway_dl_2BC0,
d_course_luigi_raceway_dl_2978,
d_course_luigi_raceway_dl_2D00,
d_course_luigi_raceway_dl_2F08,
d_course_luigi_raceway_dl_32C0,
d_course_luigi_raceway_dl_2FF8,
d_course_luigi_raceway_dl_3408,
d_course_luigi_raceway_dl_3610,
d_course_luigi_raceway_dl_3928,
d_course_luigi_raceway_dl_36A8,
d_course_luigi_raceway_dl_3AB0,
d_course_luigi_raceway_dl_3C18,
d_course_luigi_raceway_dl_3EB0,
d_course_luigi_raceway_dl_3CA0,
d_course_luigi_raceway_dl_4058,
d_course_luigi_raceway_dl_4198,
d_course_luigi_raceway_dl_4440,
d_course_luigi_raceway_dl_4240,
d_course_luigi_raceway_dl_4638,
d_course_luigi_raceway_dl_4720,
d_course_luigi_raceway_dl_4A18,
d_course_luigi_raceway_dl_4828,
d_course_luigi_raceway_dl_4C60,
d_course_luigi_raceway_dl_4CF8,
d_course_luigi_raceway_dl_4FD8,
d_course_luigi_raceway_dl_4E38,
d_course_luigi_raceway_dl_5220,
d_course_luigi_raceway_dl_52D0,
d_course_luigi_raceway_dl_5558,
d_course_luigi_raceway_dl_5420,
d_course_luigi_raceway_dl_5728,
d_course_luigi_raceway_dl_57F8,
d_course_luigi_raceway_dl_5A60,
d_course_luigi_raceway_dl_5940,
d_course_luigi_raceway_dl_5BA0,
d_course_luigi_raceway_dl_5CB8,
d_course_luigi_raceway_dl_5F08,
d_course_luigi_raceway_dl_5E10,
d_course_luigi_raceway_dl_6018,
d_course_luigi_raceway_dl_6150,
d_course_luigi_raceway_dl_6350,
d_course_luigi_raceway_dl_6288,
d_course_luigi_raceway_dl_6400,
d_course_luigi_raceway_dl_6558,
d_course_luigi_raceway_dl_6608,
d_course_luigi_raceway_dl_65B0,
d_course_luigi_raceway_dl_6658,
d_course_luigi_raceway_dl_66B8,
d_course_luigi_raceway_dl_67A0,
d_course_luigi_raceway_dl_6708,
d_course_luigi_raceway_dl_6810,
d_course_luigi_raceway_dl_68C0,
d_course_luigi_raceway_dl_6A00,
d_course_luigi_raceway_dl_6930,
d_course_luigi_raceway_dl_6A90,
d_course_luigi_raceway_dl_6B58,
d_course_luigi_raceway_dl_6DA0,
d_course_luigi_raceway_dl_6C40,
d_course_luigi_raceway_dl_6EB0,
d_course_luigi_raceway_dl_6FF0,
d_course_luigi_raceway_dl_7248,
d_course_luigi_raceway_dl_7110,
d_course_luigi_raceway_dl_7388,
d_course_luigi_raceway_dl_74B0,
d_course_luigi_raceway_dl_7750,
d_course_luigi_raceway_dl_75F0,
d_course_luigi_raceway_dl_7928,
d_course_luigi_raceway_dl_7A18,
d_course_luigi_raceway_dl_7CD0,
d_course_luigi_raceway_dl_7BB0,
d_course_luigi_raceway_dl_7EE8,
d_course_luigi_raceway_dl_7FA0,
d_course_luigi_raceway_dl_8260,
d_course_luigi_raceway_dl_8158,
d_course_luigi_raceway_dl_8450,
d_course_luigi_raceway_dl_8508,
d_course_luigi_raceway_dl_8790,
d_course_luigi_raceway_dl_86F8,
d_course_luigi_raceway_dl_8958,
d_course_luigi_raceway_dl_8A70,
d_course_luigi_raceway_dl_8D68,
d_course_luigi_raceway_dl_8CC8,
d_course_luigi_raceway_dl_8F00,
d_course_luigi_raceway_dl_9058,
d_course_luigi_raceway_dl_9408,
d_course_luigi_raceway_dl_9310,
d_course_luigi_raceway_dl_95A0,
d_course_luigi_raceway_dl_97B0,
d_course_luigi_raceway_dl_9AD0,
d_course_luigi_raceway_dl_99C0,
d_course_luigi_raceway_dl_9C50,
d_course_luigi_raceway_dl_9E58,
d_course_luigi_raceway_dl_A178,
d_course_luigi_raceway_dl_A028,
d_course_luigi_raceway_dl_A320,
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,
d_course_luigi_raceway_dl_868, d_course_luigi_raceway_dl_B48, d_course_luigi_raceway_dl_D80,
d_course_luigi_raceway_dl_1058, d_course_luigi_raceway_dl_EE8, d_course_luigi_raceway_dl_1198,
d_course_luigi_raceway_dl_1398, d_course_luigi_raceway_dl_16D8, d_course_luigi_raceway_dl_1538,
d_course_luigi_raceway_dl_1888, d_course_luigi_raceway_dl_1B00, d_course_luigi_raceway_dl_1E30,
d_course_luigi_raceway_dl_1C78, d_course_luigi_raceway_dl_1FD0, d_course_luigi_raceway_dl_2240,
d_course_luigi_raceway_dl_2518, d_course_luigi_raceway_dl_2348, d_course_luigi_raceway_dl_2658,
d_course_luigi_raceway_dl_2860, d_course_luigi_raceway_dl_2BC0, d_course_luigi_raceway_dl_2978,
d_course_luigi_raceway_dl_2D00, d_course_luigi_raceway_dl_2F08, d_course_luigi_raceway_dl_32C0,
d_course_luigi_raceway_dl_2FF8, d_course_luigi_raceway_dl_3408, d_course_luigi_raceway_dl_3610,
d_course_luigi_raceway_dl_3928, d_course_luigi_raceway_dl_36A8, d_course_luigi_raceway_dl_3AB0,
d_course_luigi_raceway_dl_3C18, d_course_luigi_raceway_dl_3EB0, d_course_luigi_raceway_dl_3CA0,
d_course_luigi_raceway_dl_4058, d_course_luigi_raceway_dl_4198, d_course_luigi_raceway_dl_4440,
d_course_luigi_raceway_dl_4240, d_course_luigi_raceway_dl_4638, d_course_luigi_raceway_dl_4720,
d_course_luigi_raceway_dl_4A18, d_course_luigi_raceway_dl_4828, d_course_luigi_raceway_dl_4C60,
d_course_luigi_raceway_dl_4CF8, d_course_luigi_raceway_dl_4FD8, d_course_luigi_raceway_dl_4E38,
d_course_luigi_raceway_dl_5220, d_course_luigi_raceway_dl_52D0, d_course_luigi_raceway_dl_5558,
d_course_luigi_raceway_dl_5420, d_course_luigi_raceway_dl_5728, d_course_luigi_raceway_dl_57F8,
d_course_luigi_raceway_dl_5A60, d_course_luigi_raceway_dl_5940, d_course_luigi_raceway_dl_5BA0,
d_course_luigi_raceway_dl_5CB8, d_course_luigi_raceway_dl_5F08, d_course_luigi_raceway_dl_5E10,
d_course_luigi_raceway_dl_6018, d_course_luigi_raceway_dl_6150, d_course_luigi_raceway_dl_6350,
d_course_luigi_raceway_dl_6288, d_course_luigi_raceway_dl_6400, d_course_luigi_raceway_dl_6558,
d_course_luigi_raceway_dl_6608, d_course_luigi_raceway_dl_65B0, d_course_luigi_raceway_dl_6658,
d_course_luigi_raceway_dl_66B8, d_course_luigi_raceway_dl_67A0, d_course_luigi_raceway_dl_6708,
d_course_luigi_raceway_dl_6810, d_course_luigi_raceway_dl_68C0, d_course_luigi_raceway_dl_6A00,
d_course_luigi_raceway_dl_6930, d_course_luigi_raceway_dl_6A90, d_course_luigi_raceway_dl_6B58,
d_course_luigi_raceway_dl_6DA0, d_course_luigi_raceway_dl_6C40, d_course_luigi_raceway_dl_6EB0,
d_course_luigi_raceway_dl_6FF0, d_course_luigi_raceway_dl_7248, d_course_luigi_raceway_dl_7110,
d_course_luigi_raceway_dl_7388, d_course_luigi_raceway_dl_74B0, d_course_luigi_raceway_dl_7750,
d_course_luigi_raceway_dl_75F0, d_course_luigi_raceway_dl_7928, d_course_luigi_raceway_dl_7A18,
d_course_luigi_raceway_dl_7CD0, d_course_luigi_raceway_dl_7BB0, d_course_luigi_raceway_dl_7EE8,
d_course_luigi_raceway_dl_7FA0, d_course_luigi_raceway_dl_8260, d_course_luigi_raceway_dl_8158,
d_course_luigi_raceway_dl_8450, d_course_luigi_raceway_dl_8508, d_course_luigi_raceway_dl_8790,
d_course_luigi_raceway_dl_86F8, d_course_luigi_raceway_dl_8958, d_course_luigi_raceway_dl_8A70,
d_course_luigi_raceway_dl_8D68, d_course_luigi_raceway_dl_8CC8, d_course_luigi_raceway_dl_8F00,
d_course_luigi_raceway_dl_9058, d_course_luigi_raceway_dl_9408, d_course_luigi_raceway_dl_9310,
d_course_luigi_raceway_dl_95A0, d_course_luigi_raceway_dl_97B0, d_course_luigi_raceway_dl_9AD0,
d_course_luigi_raceway_dl_99C0, d_course_luigi_raceway_dl_9C50, d_course_luigi_raceway_dl_9E58,
d_course_luigi_raceway_dl_A178, d_course_luigi_raceway_dl_A028, d_course_luigi_raceway_dl_A320,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -34,106 +34,61 @@ extern u8 gTextureSignKoopaAir0[];
extern u8 gTextureSignKoopaAir1[];
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},
{ 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 },
};
const Gfx *mario_raceway_dls[] = {
d_course_mario_raceway_dl_0,
d_course_mario_raceway_dl_1D0,
d_course_mario_raceway_dl_E8,
d_course_mario_raceway_dl_2C8,
d_course_mario_raceway_dl_3A8,
d_course_mario_raceway_dl_568,
d_course_mario_raceway_dl_478,
d_course_mario_raceway_dl_668,
d_course_mario_raceway_dl_750,
d_course_mario_raceway_dl_928,
d_course_mario_raceway_dl_828,
d_course_mario_raceway_dl_A00,
d_course_mario_raceway_dl_B08,
d_course_mario_raceway_dl_DC8,
d_course_mario_raceway_dl_C20,
d_course_mario_raceway_dl_F60,
d_course_mario_raceway_dl_10A8,
d_course_mario_raceway_dl_1408,
d_course_mario_raceway_dl_1210,
d_course_mario_raceway_dl_15C8,
d_course_mario_raceway_dl_1740,
d_course_mario_raceway_dl_1A30,
d_course_mario_raceway_dl_1850,
d_course_mario_raceway_dl_1B70,
d_course_mario_raceway_dl_1CF8,
d_course_mario_raceway_dl_1F68,
d_course_mario_raceway_dl_1DE0,
d_course_mario_raceway_dl_20A0,
d_course_mario_raceway_dl_21E8,
d_course_mario_raceway_dl_2418,
d_course_mario_raceway_dl_22E0,
d_course_mario_raceway_dl_2558,
d_course_mario_raceway_dl_2680,
d_course_mario_raceway_dl_28B0,
d_course_mario_raceway_dl_2790,
d_course_mario_raceway_dl_2A10,
d_course_mario_raceway_dl_2B40,
d_course_mario_raceway_dl_2DC0,
d_course_mario_raceway_dl_2C98,
d_course_mario_raceway_dl_2EF8,
d_course_mario_raceway_dl_3038,
d_course_mario_raceway_dl_32D8,
d_course_mario_raceway_dl_31F0,
d_course_mario_raceway_dl_3458,
d_course_mario_raceway_dl_35D0,
d_course_mario_raceway_dl_3830,
d_course_mario_raceway_dl_3748,
d_course_mario_raceway_dl_3960,
d_course_mario_raceway_dl_3AA0,
d_course_mario_raceway_dl_3D68,
d_course_mario_raceway_dl_3C08,
d_course_mario_raceway_dl_3EB8,
d_course_mario_raceway_dl_4038,
d_course_mario_raceway_dl_42A0,
d_course_mario_raceway_dl_4150,
d_course_mario_raceway_dl_43D8,
d_course_mario_raceway_dl_44F8,
d_course_mario_raceway_dl_4738,
d_course_mario_raceway_dl_4610,
d_course_mario_raceway_dl_4840,
d_course_mario_raceway_dl_4910,
d_course_mario_raceway_dl_4B78,
d_course_mario_raceway_dl_4A60,
d_course_mario_raceway_dl_4CD8,
d_course_mario_raceway_dl_4DC8,
d_course_mario_raceway_dl_4FF0,
d_course_mario_raceway_dl_4ED0,
d_course_mario_raceway_dl_5150,
const Gfx* mario_raceway_dls[] = {
d_course_mario_raceway_dl_0, d_course_mario_raceway_dl_1D0, d_course_mario_raceway_dl_E8,
d_course_mario_raceway_dl_2C8, d_course_mario_raceway_dl_3A8, d_course_mario_raceway_dl_568,
d_course_mario_raceway_dl_478, d_course_mario_raceway_dl_668, d_course_mario_raceway_dl_750,
d_course_mario_raceway_dl_928, d_course_mario_raceway_dl_828, d_course_mario_raceway_dl_A00,
d_course_mario_raceway_dl_B08, d_course_mario_raceway_dl_DC8, d_course_mario_raceway_dl_C20,
d_course_mario_raceway_dl_F60, d_course_mario_raceway_dl_10A8, d_course_mario_raceway_dl_1408,
d_course_mario_raceway_dl_1210, d_course_mario_raceway_dl_15C8, d_course_mario_raceway_dl_1740,
d_course_mario_raceway_dl_1A30, d_course_mario_raceway_dl_1850, d_course_mario_raceway_dl_1B70,
d_course_mario_raceway_dl_1CF8, d_course_mario_raceway_dl_1F68, d_course_mario_raceway_dl_1DE0,
d_course_mario_raceway_dl_20A0, d_course_mario_raceway_dl_21E8, d_course_mario_raceway_dl_2418,
d_course_mario_raceway_dl_22E0, d_course_mario_raceway_dl_2558, d_course_mario_raceway_dl_2680,
d_course_mario_raceway_dl_28B0, d_course_mario_raceway_dl_2790, d_course_mario_raceway_dl_2A10,
d_course_mario_raceway_dl_2B40, d_course_mario_raceway_dl_2DC0, d_course_mario_raceway_dl_2C98,
d_course_mario_raceway_dl_2EF8, d_course_mario_raceway_dl_3038, d_course_mario_raceway_dl_32D8,
d_course_mario_raceway_dl_31F0, d_course_mario_raceway_dl_3458, d_course_mario_raceway_dl_35D0,
d_course_mario_raceway_dl_3830, d_course_mario_raceway_dl_3748, d_course_mario_raceway_dl_3960,
d_course_mario_raceway_dl_3AA0, d_course_mario_raceway_dl_3D68, d_course_mario_raceway_dl_3C08,
d_course_mario_raceway_dl_3EB8, d_course_mario_raceway_dl_4038, d_course_mario_raceway_dl_42A0,
d_course_mario_raceway_dl_4150, d_course_mario_raceway_dl_43D8, d_course_mario_raceway_dl_44F8,
d_course_mario_raceway_dl_4738, d_course_mario_raceway_dl_4610, d_course_mario_raceway_dl_4840,
d_course_mario_raceway_dl_4910, d_course_mario_raceway_dl_4B78, d_course_mario_raceway_dl_4A60,
d_course_mario_raceway_dl_4CD8, d_course_mario_raceway_dl_4DC8, d_course_mario_raceway_dl_4FF0,
d_course_mario_raceway_dl_4ED0, d_course_mario_raceway_dl_5150,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -32,128 +32,67 @@ extern u8 gTexture66EBF0[];
extern u8 gTextureWheelSteamEngineReal[];
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},
{ 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,
d_course_moo_moo_farm_dl_D70,
d_course_moo_moo_farm_dl_12B8,
d_course_moo_moo_farm_dl_1530,
d_course_moo_moo_farm_dl_1A20,
d_course_moo_moo_farm_dl_1790,
d_course_moo_moo_farm_dl_1D00,
d_course_moo_moo_farm_dl_1F58,
d_course_moo_moo_farm_dl_2470,
d_course_moo_moo_farm_dl_2190,
d_course_moo_moo_farm_dl_27A8,
d_course_moo_moo_farm_dl_2A10,
d_course_moo_moo_farm_dl_2F20,
d_course_moo_moo_farm_dl_2C38,
d_course_moo_moo_farm_dl_3238,
d_course_moo_moo_farm_dl_34A0,
d_course_moo_moo_farm_dl_39F8,
d_course_moo_moo_farm_dl_36B8,
d_course_moo_moo_farm_dl_3CB0,
d_course_moo_moo_farm_dl_3EB8,
d_course_moo_moo_farm_dl_4428,
d_course_moo_moo_farm_dl_4098,
d_course_moo_moo_farm_dl_46D8,
d_course_moo_moo_farm_dl_4910,
d_course_moo_moo_farm_dl_4E00,
d_course_moo_moo_farm_dl_4AD0,
d_course_moo_moo_farm_dl_5040,
d_course_moo_moo_farm_dl_5290,
d_course_moo_moo_farm_dl_5758,
d_course_moo_moo_farm_dl_5458,
d_course_moo_moo_farm_dl_5990,
d_course_moo_moo_farm_dl_5BF8,
d_course_moo_moo_farm_dl_60A8,
d_course_moo_moo_farm_dl_5DF0,
d_course_moo_moo_farm_dl_62D0,
d_course_moo_moo_farm_dl_6548,
d_course_moo_moo_farm_dl_6A70,
d_course_moo_moo_farm_dl_6778,
d_course_moo_moo_farm_dl_6CB8,
d_course_moo_moo_farm_dl_6FF0,
d_course_moo_moo_farm_dl_74C8,
d_course_moo_moo_farm_dl_7218,
d_course_moo_moo_farm_dl_7718,
d_course_moo_moo_farm_dl_7A80,
d_course_moo_moo_farm_dl_7F78,
d_course_moo_moo_farm_dl_7CD8,
d_course_moo_moo_farm_dl_81E8,
d_course_moo_moo_farm_dl_84D0,
d_course_moo_moo_farm_dl_89A0,
d_course_moo_moo_farm_dl_8728,
d_course_moo_moo_farm_dl_8C00,
d_course_moo_moo_farm_dl_8F18,
d_course_moo_moo_farm_dl_93D0,
d_course_moo_moo_farm_dl_9178,
d_course_moo_moo_farm_dl_9640,
d_course_moo_moo_farm_dl_9938,
d_course_moo_moo_farm_dl_9DF8,
d_course_moo_moo_farm_dl_9BB0,
d_course_moo_moo_farm_dl_A010,
d_course_moo_moo_farm_dl_A2C0,
d_course_moo_moo_farm_dl_A7B0,
d_course_moo_moo_farm_dl_A568,
d_course_moo_moo_farm_dl_A9C8,
d_course_moo_moo_farm_dl_ACB0,
d_course_moo_moo_farm_dl_B230,
d_course_moo_moo_farm_dl_B020,
d_course_moo_moo_farm_dl_B478,
d_course_moo_moo_farm_dl_B798,
d_course_moo_moo_farm_dl_BCE8,
d_course_moo_moo_farm_dl_BB00,
d_course_moo_moo_farm_dl_BF10,
d_course_moo_moo_farm_dl_C180,
d_course_moo_moo_farm_dl_C6D8,
d_course_moo_moo_farm_dl_C4F8,
d_course_moo_moo_farm_dl_C950,
d_course_moo_moo_farm_dl_CBC8,
d_course_moo_moo_farm_dl_D140,
d_course_moo_moo_farm_dl_CF58,
d_course_moo_moo_farm_dl_D408,
d_course_moo_moo_farm_dl_D6B0,
d_course_moo_moo_farm_dl_DC70,
d_course_moo_moo_farm_dl_DA50,
d_course_moo_moo_farm_dl_DF60,
d_course_moo_moo_farm_dl_E1D8,
d_course_moo_moo_farm_dl_E708,
d_course_moo_moo_farm_dl_E4B0,
d_course_moo_moo_farm_dl_EA18,
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,
d_course_moo_moo_farm_dl_D70, d_course_moo_moo_farm_dl_12B8, d_course_moo_moo_farm_dl_1530,
d_course_moo_moo_farm_dl_1A20, d_course_moo_moo_farm_dl_1790, d_course_moo_moo_farm_dl_1D00,
d_course_moo_moo_farm_dl_1F58, d_course_moo_moo_farm_dl_2470, d_course_moo_moo_farm_dl_2190,
d_course_moo_moo_farm_dl_27A8, d_course_moo_moo_farm_dl_2A10, d_course_moo_moo_farm_dl_2F20,
d_course_moo_moo_farm_dl_2C38, d_course_moo_moo_farm_dl_3238, d_course_moo_moo_farm_dl_34A0,
d_course_moo_moo_farm_dl_39F8, d_course_moo_moo_farm_dl_36B8, d_course_moo_moo_farm_dl_3CB0,
d_course_moo_moo_farm_dl_3EB8, d_course_moo_moo_farm_dl_4428, d_course_moo_moo_farm_dl_4098,
d_course_moo_moo_farm_dl_46D8, d_course_moo_moo_farm_dl_4910, d_course_moo_moo_farm_dl_4E00,
d_course_moo_moo_farm_dl_4AD0, d_course_moo_moo_farm_dl_5040, d_course_moo_moo_farm_dl_5290,
d_course_moo_moo_farm_dl_5758, d_course_moo_moo_farm_dl_5458, d_course_moo_moo_farm_dl_5990,
d_course_moo_moo_farm_dl_5BF8, d_course_moo_moo_farm_dl_60A8, d_course_moo_moo_farm_dl_5DF0,
d_course_moo_moo_farm_dl_62D0, d_course_moo_moo_farm_dl_6548, d_course_moo_moo_farm_dl_6A70,
d_course_moo_moo_farm_dl_6778, d_course_moo_moo_farm_dl_6CB8, d_course_moo_moo_farm_dl_6FF0,
d_course_moo_moo_farm_dl_74C8, d_course_moo_moo_farm_dl_7218, d_course_moo_moo_farm_dl_7718,
d_course_moo_moo_farm_dl_7A80, d_course_moo_moo_farm_dl_7F78, d_course_moo_moo_farm_dl_7CD8,
d_course_moo_moo_farm_dl_81E8, d_course_moo_moo_farm_dl_84D0, d_course_moo_moo_farm_dl_89A0,
d_course_moo_moo_farm_dl_8728, d_course_moo_moo_farm_dl_8C00, d_course_moo_moo_farm_dl_8F18,
d_course_moo_moo_farm_dl_93D0, d_course_moo_moo_farm_dl_9178, d_course_moo_moo_farm_dl_9640,
d_course_moo_moo_farm_dl_9938, d_course_moo_moo_farm_dl_9DF8, d_course_moo_moo_farm_dl_9BB0,
d_course_moo_moo_farm_dl_A010, d_course_moo_moo_farm_dl_A2C0, d_course_moo_moo_farm_dl_A7B0,
d_course_moo_moo_farm_dl_A568, d_course_moo_moo_farm_dl_A9C8, d_course_moo_moo_farm_dl_ACB0,
d_course_moo_moo_farm_dl_B230, d_course_moo_moo_farm_dl_B020, d_course_moo_moo_farm_dl_B478,
d_course_moo_moo_farm_dl_B798, d_course_moo_moo_farm_dl_BCE8, d_course_moo_moo_farm_dl_BB00,
d_course_moo_moo_farm_dl_BF10, d_course_moo_moo_farm_dl_C180, d_course_moo_moo_farm_dl_C6D8,
d_course_moo_moo_farm_dl_C4F8, d_course_moo_moo_farm_dl_C950, d_course_moo_moo_farm_dl_CBC8,
d_course_moo_moo_farm_dl_D140, d_course_moo_moo_farm_dl_CF58, d_course_moo_moo_farm_dl_D408,
d_course_moo_moo_farm_dl_D6B0, d_course_moo_moo_farm_dl_DC70, d_course_moo_moo_farm_dl_DA50,
d_course_moo_moo_farm_dl_DF60, d_course_moo_moo_farm_dl_E1D8, d_course_moo_moo_farm_dl_E708,
d_course_moo_moo_farm_dl_E4B0, d_course_moo_moo_farm_dl_EA18,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -93,12 +93,12 @@ extern Gfx d_course_rainbow_road_dl_15F18[];
extern s16 d_rainbow_road_chomp_angle[];
extern AnimationLimbVector d_rainbow_road_chomp_animation_matrix[];
extern Animation d_rainbow_road_unk2;
extern Animation *d_rainbow_road_unk3[];
extern Animation* d_rainbow_road_unk3[];
extern u32 d_rainbow_road_unk4[];
extern u32 d_rainbow_road_unk5[];
extern Gfx d_course_rainbow_road_dl_16220[];
extern struct ActorSpawnData d_course_rainbow_road_item_box_spawns[];
extern TrackSections d_course_rainbow_road_addr[];
extern Gfx *d_course_rainbow_road_dl_list[];
extern Gfx* d_course_rainbow_road_dl_list[];
#endif

View File

@ -7,8 +7,7 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_rainbow_road_packed_dl_0[] =
{
Gfx d_course_rainbow_road_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04000000, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -108,8 +107,7 @@ Gfx d_course_rainbow_road_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_308[] =
{
Gfx d_course_rainbow_road_packed_dl_308[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04001500, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -162,8 +160,7 @@ Gfx d_course_rainbow_road_packed_dl_308[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_498[] =
{
Gfx d_course_rainbow_road_packed_dl_498[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04001F80, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -204,8 +201,7 @@ Gfx d_course_rainbow_road_packed_dl_498[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_5C8[] =
{
Gfx d_course_rainbow_road_packed_dl_5C8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04002780, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -253,8 +249,7 @@ Gfx d_course_rainbow_road_packed_dl_5C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_730[] =
{
Gfx d_course_rainbow_road_packed_dl_730[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04003100, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -318,8 +313,7 @@ Gfx d_course_rainbow_road_packed_dl_730[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_918[] =
{
Gfx d_course_rainbow_road_packed_dl_918[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04003DC0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -360,8 +354,7 @@ Gfx d_course_rainbow_road_packed_dl_918[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_A48[] =
{
Gfx d_course_rainbow_road_packed_dl_A48[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x040045A0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -405,8 +398,7 @@ Gfx d_course_rainbow_road_packed_dl_A48[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_B90[] =
{
Gfx d_course_rainbow_road_packed_dl_B90[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04004E20, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -472,8 +464,7 @@ Gfx d_course_rainbow_road_packed_dl_B90[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_D88[] =
{
Gfx d_course_rainbow_road_packed_dl_D88[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04005BA0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -512,8 +503,7 @@ Gfx d_course_rainbow_road_packed_dl_D88[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_EA8[] =
{
Gfx d_course_rainbow_road_packed_dl_EA8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04006320, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -557,8 +547,7 @@ Gfx d_course_rainbow_road_packed_dl_EA8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_FF0[] =
{
Gfx d_course_rainbow_road_packed_dl_FF0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04006BA0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -608,8 +597,7 @@ Gfx d_course_rainbow_road_packed_dl_FF0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1168[] =
{
Gfx d_course_rainbow_road_packed_dl_1168[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x040075A0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -666,8 +654,7 @@ Gfx d_course_rainbow_road_packed_dl_1168[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1318[] =
{
Gfx d_course_rainbow_road_packed_dl_1318[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1168),
gsSPDisplayList(d_course_rainbow_road_packed_dl_FF0),
gsSPDisplayList(d_course_rainbow_road_packed_dl_EA8),
@ -683,20 +670,17 @@ Gfx d_course_rainbow_road_packed_dl_1318[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1380[] =
{
Gfx d_course_rainbow_road_packed_dl_1380[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1318),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1390[] =
{
Gfx d_course_rainbow_road_packed_dl_1390[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1380),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_13A0[] =
{
Gfx d_course_rainbow_road_packed_dl_13A0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008100, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -748,8 +732,7 @@ Gfx d_course_rainbow_road_packed_dl_13A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1528[] =
{
Gfx d_course_rainbow_road_packed_dl_1528[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008A80, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -778,8 +761,7 @@ Gfx d_course_rainbow_road_packed_dl_1528[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_15F8[] =
{
Gfx d_course_rainbow_road_packed_dl_15F8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008F00, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -802,8 +784,7 @@ Gfx d_course_rainbow_road_packed_dl_15F8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1698[] =
{
Gfx d_course_rainbow_road_packed_dl_1698[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009300, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -830,8 +811,7 @@ Gfx d_course_rainbow_road_packed_dl_1698[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1758[] =
{
Gfx d_course_rainbow_road_packed_dl_1758[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009740, 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -865,25 +845,28 @@ Gfx d_course_rainbow_road_packed_dl_1758[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1850[] =
{
Gfx d_course_rainbow_road_packed_dl_1850[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTextureCheckerboardBlackWhite),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04009B80, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTextureRainbow),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04009BC0, 30, 0),
@ -906,8 +889,7 @@ Gfx d_course_rainbow_road_packed_dl_1850[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1978[] =
{
Gfx d_course_rainbow_road_packed_dl_1978[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009EE0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -931,8 +913,7 @@ Gfx d_course_rainbow_road_packed_dl_1978[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1A20[] =
{
Gfx d_course_rainbow_road_packed_dl_1A20[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400A260, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@ -968,8 +949,7 @@ Gfx d_course_rainbow_road_packed_dl_1A20[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1B28[] =
{
Gfx d_course_rainbow_road_packed_dl_1B28[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400A8C0, 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -991,8 +971,7 @@ Gfx d_course_rainbow_road_packed_dl_1B28[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1BC0[] =
{
Gfx d_course_rainbow_road_packed_dl_1BC0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400AC60, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@ -1017,8 +996,7 @@ Gfx d_course_rainbow_road_packed_dl_1BC0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1C70[] =
{
Gfx d_course_rainbow_road_packed_dl_1C70[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400B080, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1045,8 +1023,7 @@ Gfx d_course_rainbow_road_packed_dl_1C70[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1D30[] =
{
Gfx d_course_rainbow_road_packed_dl_1D30[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400B440, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1078,8 +1055,7 @@ Gfx d_course_rainbow_road_packed_dl_1D30[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1E18[] =
{
Gfx d_course_rainbow_road_packed_dl_1E18[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1D30),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1C70),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1BC0),
@ -1095,15 +1071,16 @@ Gfx d_course_rainbow_road_packed_dl_1E18[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1E80[] =
{
Gfx d_course_rainbow_road_packed_dl_1E80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTexture662A34),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x0400B930, 30, 0),
@ -1123,11 +1100,13 @@ Gfx d_course_rainbow_road_packed_dl_1E80[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTexture67A1B8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x0400BC50, 10, 0),
@ -1138,14 +1117,12 @@ Gfx d_course_rainbow_road_packed_dl_1E80[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1FB8[] =
{
Gfx d_course_rainbow_road_packed_dl_1FB8[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1E80),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1FC8[] =
{
Gfx d_course_rainbow_road_packed_dl_1FC8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400BCF0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1168,14 +1145,12 @@ Gfx d_course_rainbow_road_packed_dl_1FC8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_2068[] =
{
Gfx d_course_rainbow_road_packed_dl_2068[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1FC8),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_2078[] =
{
Gfx d_course_rainbow_road_packed_dl_2078[] = {
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x0400C0F0, 24, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1187,14 +1162,12 @@ Gfx d_course_rainbow_road_packed_dl_2078[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20C0[] =
{
Gfx d_course_rainbow_road_packed_dl_20C0[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_2078),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20D0[] =
{
Gfx d_course_rainbow_road_packed_dl_20D0[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_20C0),
gsSPDisplayList(d_course_rainbow_road_packed_dl_2068),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1FB8),
@ -1202,8 +1175,7 @@ Gfx d_course_rainbow_road_packed_dl_20D0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20F8[] =
{
Gfx d_course_rainbow_road_packed_dl_20F8[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_20D0),
gsSPEndDisplayList(),
};

View File

@ -8,10 +8,10 @@ extern u8 gTexture662A34[];
extern u8 gTextureRainbow[];
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},
{ gTextureStarOutline, 0x037A, 0x0800, 0x0 },
{ gTexture67A1B8, 0x01B7, 0x0800, 0x0 },
{ gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 },
{ gTexture662A34, 0x0106, 0x0800, 0x0 },
{ gTextureRainbow, 0x025D, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -47,183 +47,95 @@ extern u8 gTexture6449D4[];
extern u8 gTexture67FE0C[];
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},
{ 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,
d_course_royal_raceway_dl_8E0,
d_course_royal_raceway_dl_B40,
d_course_royal_raceway_dl_DA0,
d_course_royal_raceway_dl_1180,
d_course_royal_raceway_dl_F40,
d_course_royal_raceway_dl_12C0,
d_course_royal_raceway_dl_1538,
d_course_royal_raceway_dl_1850,
d_course_royal_raceway_dl_1610,
d_course_royal_raceway_dl_19B0,
d_course_royal_raceway_dl_1BB8,
d_course_royal_raceway_dl_1E88,
d_course_royal_raceway_dl_1C40,
d_course_royal_raceway_dl_2018,
d_course_royal_raceway_dl_21A8,
d_course_royal_raceway_dl_2428,
d_course_royal_raceway_dl_2210,
d_course_royal_raceway_dl_25F0,
d_course_royal_raceway_dl_26F0,
d_course_royal_raceway_dl_29A0,
d_course_royal_raceway_dl_27B8,
d_course_royal_raceway_dl_2B78,
d_course_royal_raceway_dl_2C20,
d_course_royal_raceway_dl_2FE0,
d_course_royal_raceway_dl_2DD0,
d_course_royal_raceway_dl_31F8,
d_course_royal_raceway_dl_33B0,
d_course_royal_raceway_dl_3748,
d_course_royal_raceway_dl_3580,
d_course_royal_raceway_dl_3960,
d_course_royal_raceway_dl_3AD8,
d_course_royal_raceway_dl_3D38,
d_course_royal_raceway_dl_3BA8,
d_course_royal_raceway_dl_3ED8,
d_course_royal_raceway_dl_3FA0,
d_course_royal_raceway_dl_41D8,
d_course_royal_raceway_dl_4048,
d_course_royal_raceway_dl_4380,
d_course_royal_raceway_dl_4438,
d_course_royal_raceway_dl_45A0,
d_course_royal_raceway_dl_44C0,
d_course_royal_raceway_dl_46A0,
d_course_royal_raceway_dl_4750,
d_course_royal_raceway_dl_4930,
d_course_royal_raceway_dl_4800,
d_course_royal_raceway_dl_4A38,
d_course_royal_raceway_dl_4AE0,
d_course_royal_raceway_dl_4D00,
d_course_royal_raceway_dl_4BA8,
d_course_royal_raceway_dl_4DF8,
d_course_royal_raceway_dl_4EC0,
d_course_royal_raceway_dl_50F0,
d_course_royal_raceway_dl_4F80,
d_course_royal_raceway_dl_51D0,
d_course_royal_raceway_dl_52F0,
d_course_royal_raceway_dl_54F8,
d_course_royal_raceway_dl_53B8,
d_course_royal_raceway_dl_5598,
d_course_royal_raceway_dl_56C0,
d_course_royal_raceway_dl_5890,
d_course_royal_raceway_dl_5758,
d_course_royal_raceway_dl_5900,
d_course_royal_raceway_dl_5A40,
d_course_royal_raceway_dl_5CA0,
d_course_royal_raceway_dl_5B28,
d_course_royal_raceway_dl_5D08,
d_course_royal_raceway_dl_5EB8,
d_course_royal_raceway_dl_6118,
d_course_royal_raceway_dl_5FD8,
d_course_royal_raceway_dl_61B0,
d_course_royal_raceway_dl_6378,
d_course_royal_raceway_dl_6780,
d_course_royal_raceway_dl_6538,
d_course_royal_raceway_dl_68C8,
d_course_royal_raceway_dl_6BC0,
d_course_royal_raceway_dl_70C0,
d_course_royal_raceway_dl_6E20,
d_course_royal_raceway_dl_72B8,
d_course_royal_raceway_dl_75C0,
d_course_royal_raceway_dl_78E8,
d_course_royal_raceway_dl_7778,
d_course_royal_raceway_dl_7AD0,
d_course_royal_raceway_dl_7BD8,
d_course_royal_raceway_dl_7ED8,
d_course_royal_raceway_dl_7DB0,
d_course_royal_raceway_dl_8068,
d_course_royal_raceway_dl_81C0,
d_course_royal_raceway_dl_84A0,
d_course_royal_raceway_dl_8398,
d_course_royal_raceway_dl_8620,
d_course_royal_raceway_dl_8770,
d_course_royal_raceway_dl_88B0,
d_course_royal_raceway_dl_8838,
d_course_royal_raceway_dl_8930,
d_course_royal_raceway_dl_89F0,
d_course_royal_raceway_dl_8CD8,
d_course_royal_raceway_dl_8C58,
d_course_royal_raceway_dl_8EB8,
d_course_royal_raceway_dl_8FA8,
d_course_royal_raceway_dl_92D0,
d_course_royal_raceway_dl_9218,
d_course_royal_raceway_dl_94E8,
d_course_royal_raceway_dl_9678,
d_course_royal_raceway_dl_99A0,
d_course_royal_raceway_dl_9900,
d_course_royal_raceway_dl_9B30,
d_course_royal_raceway_dl_9D58,
d_course_royal_raceway_dl_A0A8,
d_course_royal_raceway_dl_9FE8,
d_course_royal_raceway_dl_A200,
d_course_royal_raceway_dl_A478,
d_course_royal_raceway_dl_A728,
d_course_royal_raceway_dl_A600,
d_course_royal_raceway_dl_A8A8,
d_course_royal_raceway_dl_A9D0,
d_course_royal_raceway_dl_AC28,
d_course_royal_raceway_dl_AB28,
d_course_royal_raceway_dl_AD90,
d_course_royal_raceway_dl_AE70,
d_course_royal_raceway_dl_B040,
d_course_royal_raceway_dl_AFB0,
d_course_royal_raceway_dl_B188,
d_course_royal_raceway_dl_B230,
d_course_royal_raceway_dl_B3E8,
d_course_royal_raceway_dl_B2E0,
d_course_royal_raceway_dl_B508,
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,
d_course_royal_raceway_dl_8E0, d_course_royal_raceway_dl_B40, d_course_royal_raceway_dl_DA0,
d_course_royal_raceway_dl_1180, d_course_royal_raceway_dl_F40, d_course_royal_raceway_dl_12C0,
d_course_royal_raceway_dl_1538, d_course_royal_raceway_dl_1850, d_course_royal_raceway_dl_1610,
d_course_royal_raceway_dl_19B0, d_course_royal_raceway_dl_1BB8, d_course_royal_raceway_dl_1E88,
d_course_royal_raceway_dl_1C40, d_course_royal_raceway_dl_2018, d_course_royal_raceway_dl_21A8,
d_course_royal_raceway_dl_2428, d_course_royal_raceway_dl_2210, d_course_royal_raceway_dl_25F0,
d_course_royal_raceway_dl_26F0, d_course_royal_raceway_dl_29A0, d_course_royal_raceway_dl_27B8,
d_course_royal_raceway_dl_2B78, d_course_royal_raceway_dl_2C20, d_course_royal_raceway_dl_2FE0,
d_course_royal_raceway_dl_2DD0, d_course_royal_raceway_dl_31F8, d_course_royal_raceway_dl_33B0,
d_course_royal_raceway_dl_3748, d_course_royal_raceway_dl_3580, d_course_royal_raceway_dl_3960,
d_course_royal_raceway_dl_3AD8, d_course_royal_raceway_dl_3D38, d_course_royal_raceway_dl_3BA8,
d_course_royal_raceway_dl_3ED8, d_course_royal_raceway_dl_3FA0, d_course_royal_raceway_dl_41D8,
d_course_royal_raceway_dl_4048, d_course_royal_raceway_dl_4380, d_course_royal_raceway_dl_4438,
d_course_royal_raceway_dl_45A0, d_course_royal_raceway_dl_44C0, d_course_royal_raceway_dl_46A0,
d_course_royal_raceway_dl_4750, d_course_royal_raceway_dl_4930, d_course_royal_raceway_dl_4800,
d_course_royal_raceway_dl_4A38, d_course_royal_raceway_dl_4AE0, d_course_royal_raceway_dl_4D00,
d_course_royal_raceway_dl_4BA8, d_course_royal_raceway_dl_4DF8, d_course_royal_raceway_dl_4EC0,
d_course_royal_raceway_dl_50F0, d_course_royal_raceway_dl_4F80, d_course_royal_raceway_dl_51D0,
d_course_royal_raceway_dl_52F0, d_course_royal_raceway_dl_54F8, d_course_royal_raceway_dl_53B8,
d_course_royal_raceway_dl_5598, d_course_royal_raceway_dl_56C0, d_course_royal_raceway_dl_5890,
d_course_royal_raceway_dl_5758, d_course_royal_raceway_dl_5900, d_course_royal_raceway_dl_5A40,
d_course_royal_raceway_dl_5CA0, d_course_royal_raceway_dl_5B28, d_course_royal_raceway_dl_5D08,
d_course_royal_raceway_dl_5EB8, d_course_royal_raceway_dl_6118, d_course_royal_raceway_dl_5FD8,
d_course_royal_raceway_dl_61B0, d_course_royal_raceway_dl_6378, d_course_royal_raceway_dl_6780,
d_course_royal_raceway_dl_6538, d_course_royal_raceway_dl_68C8, d_course_royal_raceway_dl_6BC0,
d_course_royal_raceway_dl_70C0, d_course_royal_raceway_dl_6E20, d_course_royal_raceway_dl_72B8,
d_course_royal_raceway_dl_75C0, d_course_royal_raceway_dl_78E8, d_course_royal_raceway_dl_7778,
d_course_royal_raceway_dl_7AD0, d_course_royal_raceway_dl_7BD8, d_course_royal_raceway_dl_7ED8,
d_course_royal_raceway_dl_7DB0, d_course_royal_raceway_dl_8068, d_course_royal_raceway_dl_81C0,
d_course_royal_raceway_dl_84A0, d_course_royal_raceway_dl_8398, d_course_royal_raceway_dl_8620,
d_course_royal_raceway_dl_8770, d_course_royal_raceway_dl_88B0, d_course_royal_raceway_dl_8838,
d_course_royal_raceway_dl_8930, d_course_royal_raceway_dl_89F0, d_course_royal_raceway_dl_8CD8,
d_course_royal_raceway_dl_8C58, d_course_royal_raceway_dl_8EB8, d_course_royal_raceway_dl_8FA8,
d_course_royal_raceway_dl_92D0, d_course_royal_raceway_dl_9218, d_course_royal_raceway_dl_94E8,
d_course_royal_raceway_dl_9678, d_course_royal_raceway_dl_99A0, d_course_royal_raceway_dl_9900,
d_course_royal_raceway_dl_9B30, d_course_royal_raceway_dl_9D58, d_course_royal_raceway_dl_A0A8,
d_course_royal_raceway_dl_9FE8, d_course_royal_raceway_dl_A200, d_course_royal_raceway_dl_A478,
d_course_royal_raceway_dl_A728, d_course_royal_raceway_dl_A600, d_course_royal_raceway_dl_A8A8,
d_course_royal_raceway_dl_A9D0, d_course_royal_raceway_dl_AC28, d_course_royal_raceway_dl_AB28,
d_course_royal_raceway_dl_AD90, d_course_royal_raceway_dl_AE70, d_course_royal_raceway_dl_B040,
d_course_royal_raceway_dl_AFB0, d_course_royal_raceway_dl_B188, d_course_royal_raceway_dl_B230,
d_course_royal_raceway_dl_B3E8, d_course_royal_raceway_dl_B2E0, d_course_royal_raceway_dl_B508,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -204,7 +204,7 @@ extern Animation d_course_sherbet_land_unk_data7;
extern s16 d_course_sherbet_land_unk_data8[];
extern AnimationLimbVector d_course_sherbet_land_unk_data9[];
extern Animation d_course_sherbet_land_unk_data10;
extern Animation *d_course_sherbet_land_unk_data11[];
extern Animation* d_course_sherbet_land_unk_data11[];
extern u32 d_course_sherbet_land_unk_data12[];
extern Gfx d_course_sherbet_land_dl_9AE8[];
extern struct ActorSpawnData d_course_sherbet_land_item_box_spawns[];

File diff suppressed because it is too large Load Diff

View File

@ -14,165 +14,64 @@ extern u8 gTexture651428[];
extern u8 gTexture662924[];
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},
{ 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,
d_course_sherbet_land_dl_310,
d_course_sherbet_land_dl_400,
d_course_sherbet_land_dl_4E8,
d_course_sherbet_land_dl_638,
d_course_sherbet_land_dl_560,
d_course_sherbet_land_dl_6A0,
d_course_sherbet_land_dl_768,
d_course_sherbet_land_dl_880,
d_course_sherbet_land_dl_7A0,
d_course_sherbet_land_dl_8E8,
d_course_sherbet_land_dl_9A0,
d_course_sherbet_land_dl_B08,
d_course_sherbet_land_dl_A28,
d_course_sherbet_land_dl_BC0,
d_course_sherbet_land_dl_C88,
d_course_sherbet_land_dl_DF0,
d_course_sherbet_land_dl_D10,
d_course_sherbet_land_dl_EC8,
d_course_sherbet_land_dl_F68,
d_course_sherbet_land_dl_10D8,
d_course_sherbet_land_dl_1028,
d_course_sherbet_land_dl_11C8,
d_course_sherbet_land_dl_1238,
d_course_sherbet_land_dl_1368,
d_course_sherbet_land_dl_12F0,
d_course_sherbet_land_dl_1440,
d_course_sherbet_land_dl_1480,
d_course_sherbet_land_dl_1508,
d_course_sherbet_land_dl_14C0,
d_course_sherbet_land_dl_1570,
d_course_sherbet_land_dl_1598,
d_course_sherbet_land_dl_1638,
d_course_sherbet_land_dl_15F0,
d_course_sherbet_land_dl_1698,
d_course_sherbet_land_dl_16C0,
d_course_sherbet_land_dl_1778,
d_course_sherbet_land_dl_1730,
d_course_sherbet_land_dl_17D8,
d_course_sherbet_land_dl_1828,
d_course_sherbet_land_dl_18E8,
d_course_sherbet_land_dl_18A0,
d_course_sherbet_land_dl_1920,
d_course_sherbet_land_dl_19A0,
d_course_sherbet_land_dl_1A58,
d_course_sherbet_land_dl_19F0,
d_course_sherbet_land_dl_1A90,
d_course_sherbet_land_dl_1AF8,
d_course_sherbet_land_dl_1BA8,
d_course_sherbet_land_dl_1B50,
d_course_sherbet_land_dl_1C20,
d_course_sherbet_land_dl_1C48,
d_course_sherbet_land_dl_1D60,
d_course_sherbet_land_dl_1D08,
d_course_sherbet_land_dl_1E10,
d_course_sherbet_land_dl_1E88,
d_course_sherbet_land_dl_2010,
d_course_sherbet_land_dl_1F70,
d_course_sherbet_land_dl_20D0,
d_course_sherbet_land_dl_2190,
d_course_sherbet_land_dl_22F8,
d_course_sherbet_land_dl_2288,
d_course_sherbet_land_dl_2370,
d_course_sherbet_land_dl_2438,
d_course_sherbet_land_dl_25A0,
d_course_sherbet_land_dl_2530,
d_course_sherbet_land_dl_25F8,
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,
d_course_sherbet_land_dl_310, d_course_sherbet_land_dl_400, d_course_sherbet_land_dl_4E8,
d_course_sherbet_land_dl_638, d_course_sherbet_land_dl_560, d_course_sherbet_land_dl_6A0,
d_course_sherbet_land_dl_768, d_course_sherbet_land_dl_880, d_course_sherbet_land_dl_7A0,
d_course_sherbet_land_dl_8E8, d_course_sherbet_land_dl_9A0, d_course_sherbet_land_dl_B08,
d_course_sherbet_land_dl_A28, d_course_sherbet_land_dl_BC0, d_course_sherbet_land_dl_C88,
d_course_sherbet_land_dl_DF0, d_course_sherbet_land_dl_D10, d_course_sherbet_land_dl_EC8,
d_course_sherbet_land_dl_F68, d_course_sherbet_land_dl_10D8, d_course_sherbet_land_dl_1028,
d_course_sherbet_land_dl_11C8, d_course_sherbet_land_dl_1238, d_course_sherbet_land_dl_1368,
d_course_sherbet_land_dl_12F0, d_course_sherbet_land_dl_1440, d_course_sherbet_land_dl_1480,
d_course_sherbet_land_dl_1508, d_course_sherbet_land_dl_14C0, d_course_sherbet_land_dl_1570,
d_course_sherbet_land_dl_1598, d_course_sherbet_land_dl_1638, d_course_sherbet_land_dl_15F0,
d_course_sherbet_land_dl_1698, d_course_sherbet_land_dl_16C0, d_course_sherbet_land_dl_1778,
d_course_sherbet_land_dl_1730, d_course_sherbet_land_dl_17D8, d_course_sherbet_land_dl_1828,
d_course_sherbet_land_dl_18E8, d_course_sherbet_land_dl_18A0, d_course_sherbet_land_dl_1920,
d_course_sherbet_land_dl_19A0, d_course_sherbet_land_dl_1A58, d_course_sherbet_land_dl_19F0,
d_course_sherbet_land_dl_1A90, d_course_sherbet_land_dl_1AF8, d_course_sherbet_land_dl_1BA8,
d_course_sherbet_land_dl_1B50, d_course_sherbet_land_dl_1C20, d_course_sherbet_land_dl_1C48,
d_course_sherbet_land_dl_1D60, d_course_sherbet_land_dl_1D08, d_course_sherbet_land_dl_1E10,
d_course_sherbet_land_dl_1E88, d_course_sherbet_land_dl_2010, d_course_sherbet_land_dl_1F70,
d_course_sherbet_land_dl_20D0, d_course_sherbet_land_dl_2190, d_course_sherbet_land_dl_22F8,
d_course_sherbet_land_dl_2288, d_course_sherbet_land_dl_2370, d_course_sherbet_land_dl_2438,
d_course_sherbet_land_dl_25A0, d_course_sherbet_land_dl_2530, d_course_sherbet_land_dl_25F8,
};
const Gfx *sherbet_land_dls_2[] = {
d_course_sherbet_land_dl_26D0,
d_course_sherbet_land_dl_28A0,
d_course_sherbet_land_dl_27F0,
d_course_sherbet_land_dl_2918,
d_course_sherbet_land_dl_2A38,
d_course_sherbet_land_dl_2BE0,
d_course_sherbet_land_dl_2B08,
d_course_sherbet_land_dl_2C58,
d_course_sherbet_land_dl_2D78,
d_course_sherbet_land_dl_2F48,
d_course_sherbet_land_dl_2E28,
d_course_sherbet_land_dl_2FE8,
d_course_sherbet_land_dl_30E0,
d_course_sherbet_land_dl_3260,
d_course_sherbet_land_dl_3150,
d_course_sherbet_land_dl_3320,
d_course_sherbet_land_dl_33E0,
d_course_sherbet_land_dl_35A8,
d_course_sherbet_land_dl_3490,
d_course_sherbet_land_dl_36A8,
d_course_sherbet_land_dl_3770,
d_course_sherbet_land_dl_3940,
d_course_sherbet_land_dl_3840,
d_course_sherbet_land_dl_3A50,
d_course_sherbet_land_dl_3AE0,
d_course_sherbet_land_dl_3C48,
d_course_sherbet_land_dl_3BA8,
d_course_sherbet_land_dl_3D40,
d_course_sherbet_land_dl_3D98,
d_course_sherbet_land_dl_3EB8,
d_course_sherbet_land_dl_3E58,
d_course_sherbet_land_dl_3FA0,
d_course_sherbet_land_dl_3FC0,
d_course_sherbet_land_dl_3FE8,
d_course_sherbet_land_dl_3FD8,
d_course_sherbet_land_dl_4000,
d_course_sherbet_land_dl_4010,
d_course_sherbet_land_dl_4020,
d_course_sherbet_land_dl_4018,
d_course_sherbet_land_dl_4028,
d_course_sherbet_land_dl_4030,
d_course_sherbet_land_dl_4040,
d_course_sherbet_land_dl_4038,
d_course_sherbet_land_dl_4048,
d_course_sherbet_land_dl_4050,
d_course_sherbet_land_dl_4060,
d_course_sherbet_land_dl_4058,
d_course_sherbet_land_dl_4068,
d_course_sherbet_land_dl_4070,
d_course_sherbet_land_dl_4080,
d_course_sherbet_land_dl_4078,
d_course_sherbet_land_dl_4088,
d_course_sherbet_land_dl_4090,
d_course_sherbet_land_dl_40A0,
d_course_sherbet_land_dl_4098,
d_course_sherbet_land_dl_40A8,
d_course_sherbet_land_dl_40B0,
d_course_sherbet_land_dl_41B8,
d_course_sherbet_land_dl_4180,
d_course_sherbet_land_dl_4280,
d_course_sherbet_land_dl_42E0,
d_course_sherbet_land_dl_4470,
d_course_sherbet_land_dl_43C8,
d_course_sherbet_land_dl_4570,
d_course_sherbet_land_dl_4618,
d_course_sherbet_land_dl_4798,
d_course_sherbet_land_dl_4710,
d_course_sherbet_land_dl_4868,
d_course_sherbet_land_dl_4930,
d_course_sherbet_land_dl_4A98,
d_course_sherbet_land_dl_4A20,
d_course_sherbet_land_dl_4B20,
const Gfx* sherbet_land_dls_2[] = {
d_course_sherbet_land_dl_26D0, d_course_sherbet_land_dl_28A0, d_course_sherbet_land_dl_27F0,
d_course_sherbet_land_dl_2918, d_course_sherbet_land_dl_2A38, d_course_sherbet_land_dl_2BE0,
d_course_sherbet_land_dl_2B08, d_course_sherbet_land_dl_2C58, d_course_sherbet_land_dl_2D78,
d_course_sherbet_land_dl_2F48, d_course_sherbet_land_dl_2E28, d_course_sherbet_land_dl_2FE8,
d_course_sherbet_land_dl_30E0, d_course_sherbet_land_dl_3260, d_course_sherbet_land_dl_3150,
d_course_sherbet_land_dl_3320, d_course_sherbet_land_dl_33E0, d_course_sherbet_land_dl_35A8,
d_course_sherbet_land_dl_3490, d_course_sherbet_land_dl_36A8, d_course_sherbet_land_dl_3770,
d_course_sherbet_land_dl_3940, d_course_sherbet_land_dl_3840, d_course_sherbet_land_dl_3A50,
d_course_sherbet_land_dl_3AE0, d_course_sherbet_land_dl_3C48, d_course_sherbet_land_dl_3BA8,
d_course_sherbet_land_dl_3D40, d_course_sherbet_land_dl_3D98, d_course_sherbet_land_dl_3EB8,
d_course_sherbet_land_dl_3E58, d_course_sherbet_land_dl_3FA0, d_course_sherbet_land_dl_3FC0,
d_course_sherbet_land_dl_3FE8, d_course_sherbet_land_dl_3FD8, d_course_sherbet_land_dl_4000,
d_course_sherbet_land_dl_4010, d_course_sherbet_land_dl_4020, d_course_sherbet_land_dl_4018,
d_course_sherbet_land_dl_4028, d_course_sherbet_land_dl_4030, d_course_sherbet_land_dl_4040,
d_course_sherbet_land_dl_4038, d_course_sherbet_land_dl_4048, d_course_sherbet_land_dl_4050,
d_course_sherbet_land_dl_4060, d_course_sherbet_land_dl_4058, d_course_sherbet_land_dl_4068,
d_course_sherbet_land_dl_4070, d_course_sherbet_land_dl_4080, d_course_sherbet_land_dl_4078,
d_course_sherbet_land_dl_4088, d_course_sherbet_land_dl_4090, d_course_sherbet_land_dl_40A0,
d_course_sherbet_land_dl_4098, d_course_sherbet_land_dl_40A8, d_course_sherbet_land_dl_40B0,
d_course_sherbet_land_dl_41B8, d_course_sherbet_land_dl_4180, d_course_sherbet_land_dl_4280,
d_course_sherbet_land_dl_42E0, d_course_sherbet_land_dl_4470, d_course_sherbet_land_dl_43C8,
d_course_sherbet_land_dl_4570, d_course_sherbet_land_dl_4618, d_course_sherbet_land_dl_4798,
d_course_sherbet_land_dl_4710, d_course_sherbet_land_dl_4868, d_course_sherbet_land_dl_4930,
d_course_sherbet_land_dl_4A98, d_course_sherbet_land_dl_4A20, d_course_sherbet_land_dl_4B20,
};

File diff suppressed because it is too large Load Diff

View File

@ -26,29 +26,13 @@ Gfx d_course_skyscraper_dl[] = {
// Item box spawn locations
struct ActorSpawnData d_course_skyscraper_item_box_spawns[] = {
{{ -18, 480, 365 }, { 0 }},
{{ -272, 480, 312 }, { 0 }},
{{ -312, 480, 359 }, { 0 }},
{{ -293, 480, 337 }, { 0 }},
{{ 12, 480, 360 }, { 0 }},
{{ 363, 480, 14 }, { 1 }},
{{ 288, 480, 309 }, { 1 }},
{{ 308, 480, 326 }, { 1 }},
{{ 325, 480, 345 }, { 1 }},
{{ 364, 480, -9 }, { 1 }},
{{ 11, 480, -361 }, { 2 }},
{{ 281, 480, -306 }, { 2 }},
{{ 303, 480, -316 }, { 2 }},
{{ 336, 480, -324 }, { 2 }},
{{ -11, 480, -363 }, { 2 }},
{{ -357, 480, -5 }, { 3 }},
{{ -318, 480, -267 }, { 3 }},
{{ -357, 480, -312 }, { 3 }},
{{ -339, 480, -288 }, { 3 }},
{{ -354, 480, 18 }, { 3 }},
{{ -66, 485, 0 }, { 4 }},
{{ 0, 485, -67 }, { 4 }},
{{ 66, 485, 1 }, { 4 }},
{{ 1, 485, 67 }, { 4 }},
{{ -32768, 0, 0 }, { 0 }},
{ { -18, 480, 365 }, { 0 } }, { { -272, 480, 312 }, { 0 } }, { { -312, 480, 359 }, { 0 } },
{ { -293, 480, 337 }, { 0 } }, { { 12, 480, 360 }, { 0 } }, { { 363, 480, 14 }, { 1 } },
{ { 288, 480, 309 }, { 1 } }, { { 308, 480, 326 }, { 1 } }, { { 325, 480, 345 }, { 1 } },
{ { 364, 480, -9 }, { 1 } }, { { 11, 480, -361 }, { 2 } }, { { 281, 480, -306 }, { 2 } },
{ { 303, 480, -316 }, { 2 } }, { { 336, 480, -324 }, { 2 } }, { { -11, 480, -363 }, { 2 } },
{ { -357, 480, -5 }, { 3 } }, { { -318, 480, -267 }, { 3 } }, { { -357, 480, -312 }, { 3 } },
{ { -339, 480, -288 }, { 3 } }, { { -354, 480, 18 }, { 3 } }, { { -66, 485, 0 }, { 4 } },
{ { 0, 485, -67 }, { 4 } }, { { 66, 485, 1 }, { 4 } }, { { 1, 485, 67 }, { 4 } },
{ { -32768, 0, 0 }, { 0 } },
};

View File

@ -7,17 +7,18 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_skyscraper_packed_dl_0[] =
{
Gfx d_course_skyscraper_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture64B8D8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000000, 32, 0),
@ -82,35 +83,33 @@ Gfx d_course_skyscraper_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_238[] =
{
Gfx d_course_skyscraper_packed_dl_238[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_0),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_248[] =
{
Gfx d_course_skyscraper_packed_dl_248[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_238),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_258[] =
{
Gfx d_course_skyscraper_packed_dl_258[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_248),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_268[] =
{
Gfx d_course_skyscraper_packed_dl_268[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture645660),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000D00, 32, 0),
@ -146,42 +145,49 @@ Gfx d_course_skyscraper_packed_dl_268[] =
gsSP2Triangles(20, 22, 23, 0, 24, 25, 26, 0),
gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTextureNumberYellowBlue1),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040014E0, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTextureNumberYellowBlue2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001520, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTextureNumberYellowBlue3),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001560, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTextureNumberYellowBlue4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040015A0, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6457D8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040015E0, 32, 0),
@ -201,23 +207,23 @@ Gfx d_course_skyscraper_packed_dl_268[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_570[] =
{
Gfx d_course_skyscraper_packed_dl_570[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_268),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_580[] =
{
Gfx d_course_skyscraper_packed_dl_580[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture67B75C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001960, 30, 0),
@ -250,23 +256,23 @@ Gfx d_course_skyscraper_packed_dl_580[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_6B8[] =
{
Gfx d_course_skyscraper_packed_dl_6B8[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_580),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_6C8[] =
{
Gfx d_course_skyscraper_packed_dl_6C8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6835F0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
gsSPVertex(0x04001E80, 32, 0),
@ -326,17 +332,18 @@ Gfx d_course_skyscraper_packed_dl_6C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_8D8[] =
{
Gfx d_course_skyscraper_packed_dl_8D8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6835F0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
gsSPVertex(0x04002960, 32, 0),
@ -413,24 +420,24 @@ Gfx d_course_skyscraper_packed_dl_8D8[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_B70[] =
{
Gfx d_course_skyscraper_packed_dl_B70[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_8D8),
gsSPDisplayList(d_course_skyscraper_packed_dl_6C8),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_B88[] =
{
Gfx d_course_skyscraper_packed_dl_B88[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture668608),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003680, 32, 0),
@ -451,23 +458,23 @@ Gfx d_course_skyscraper_packed_dl_B88[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_C60[] =
{
Gfx d_course_skyscraper_packed_dl_C60[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_B88),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_C70[] =
{
Gfx d_course_skyscraper_packed_dl_C70[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6864E8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x040038E0, 12, 0),
@ -476,7 +483,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture686CF0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x040039A0, 8, 0),
@ -484,7 +492,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6875A8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003A20, 8, 0),
@ -492,7 +501,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture687EE8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003AA0, 8, 0),
@ -500,7 +510,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68876C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003B20, 16, 0),
@ -510,7 +521,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture689230),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003C20, 16, 0),
@ -520,7 +532,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture689C00),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003D20, 12, 0),
@ -529,7 +542,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68A484),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003DE0, 20, 0),
@ -540,7 +554,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68AC5C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003F20, 12, 0),
@ -549,7 +564,8 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68B6A4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04003FE0, 8, 0),
@ -557,14 +573,16 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68BE6C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04004060, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture68C310),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x040040A0, 4, 0),
@ -572,23 +590,23 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_FE8[] =
{
Gfx d_course_skyscraper_packed_dl_FE8[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_C70),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_FF8[] =
{
Gfx d_course_skyscraper_packed_dl_FF8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSSTexture6462C0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040040E0, 32, 0),
@ -608,14 +626,12 @@ Gfx d_course_skyscraper_packed_dl_FF8[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_10C8[] =
{
Gfx d_course_skyscraper_packed_dl_10C8[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_FF8),
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_10D8[] =
{
Gfx d_course_skyscraper_packed_dl_10D8[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_10C8),
gsSPDisplayList(d_course_skyscraper_packed_dl_FE8),
gsSPDisplayList(d_course_skyscraper_packed_dl_C60),
@ -625,8 +641,7 @@ Gfx d_course_skyscraper_packed_dl_10D8[] =
gsSPEndDisplayList(),
};
Gfx d_course_skyscraper_packed_dl_1110[] =
{
Gfx d_course_skyscraper_packed_dl_1110[] = {
gsSPDisplayList(d_course_skyscraper_packed_dl_10D8),
gsSPEndDisplayList(),
};

View File

@ -26,28 +26,28 @@ extern u8 gTexture67B75C[];
extern u8 gTexture6835F0[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

View File

@ -5,24 +5,20 @@
/*
* This file is required for data alignment
*
*/
*/
StaffGhost d_mario_raceway_staff_ghost[] = {
#include "courses/mario_raceway/staff_ghost.inc.c"
#include "courses/mario_raceway/staff_ghost.inc.c"
};
StaffGhost d_luigi_raceway_staff_ghost[1046] = {
#include "courses/luigi_raceway/staff_ghost.inc.c"
#include "courses/luigi_raceway/staff_ghost.inc.c"
};
StaffGhost d_royal_raceway_staff_ghost[] = {
#include "courses/royal_raceway/staff_ghost.inc.c"
#include "courses/royal_raceway/staff_ghost.inc.c"
};
// Unknown data. Perhaps colour or lights
s32 D_0F4FCAD0[] = {
0x00000000, 0xc8c8c8c8,
0xc8c80000, 0x00007b39, 0x6f6f6f6f, 0x6f6f6f6f,
0x3f7b0000, 0x0000c8c8, 0xc8c8c8c8, 0xc8000000
};
s32 D_0F4FCAD0[] = { 0x00000000, 0xc8c8c8c8, 0xc8c80000, 0x00007b39, 0x6f6f6f6f,
0x6f6f6f6f, 0x3f7b0000, 0x0000c8c8, 0xc8c8c8c8, 0xc8000000 };

File diff suppressed because it is too large Load Diff

View File

@ -391,7 +391,7 @@ extern Gfx d_course_toads_turnpike_dl_23858[];
extern Gfx d_course_toads_turnpike_dl_238A0[];
extern Gfx d_course_toads_turnpike_dl_238E8[];
extern Gfx d_course_toads_turnpike_dl_23930[];
extern Gfx *d_course_toads_turnpike_dl_list[];
extern Gfx* d_course_toads_turnpike_dl_list[];
extern struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[];
extern TrackSections d_course_toads_turnpike_addr[];

File diff suppressed because it is too large Load Diff

View File

@ -25,26 +25,26 @@ extern u8 gTextureSignToadRed[];
extern u8 gTexture668228[];
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},
{ 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 },
};
const Gfx toads_turnpike_dl_0[] = {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -24,136 +24,64 @@ extern u8 gTexture682F1C[];
extern u8 gTexture683118[];
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},
{ 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,
d_course_wario_stadium_dl_350,
d_course_wario_stadium_dl_4C0,
d_course_wario_stadium_dl_5E8,
d_course_wario_stadium_dl_798,
d_course_wario_stadium_dl_668,
d_course_wario_stadium_dl_830,
d_course_wario_stadium_dl_940,
d_course_wario_stadium_dl_AB0,
d_course_wario_stadium_dl_990,
d_course_wario_stadium_dl_B60,
d_course_wario_stadium_dl_C08,
d_course_wario_stadium_dl_D60,
d_course_wario_stadium_dl_C70,
d_course_wario_stadium_dl_E30,
d_course_wario_stadium_dl_ED0,
d_course_wario_stadium_dl_1068,
d_course_wario_stadium_dl_F70,
d_course_wario_stadium_dl_1158,
d_course_wario_stadium_dl_11F8,
d_course_wario_stadium_dl_13C0,
d_course_wario_stadium_dl_12E0,
d_course_wario_stadium_dl_14A0,
d_course_wario_stadium_dl_1590,
d_course_wario_stadium_dl_1708,
d_course_wario_stadium_dl_1630,
d_course_wario_stadium_dl_17A8,
d_course_wario_stadium_dl_1868,
d_course_wario_stadium_dl_19E0,
d_course_wario_stadium_dl_1908,
d_course_wario_stadium_dl_1AB8,
d_course_wario_stadium_dl_1B48,
d_course_wario_stadium_dl_1CA8,
d_course_wario_stadium_dl_1BB0,
d_course_wario_stadium_dl_1D68,
d_course_wario_stadium_dl_1DF8,
d_course_wario_stadium_dl_1FD8,
d_course_wario_stadium_dl_1E70,
d_course_wario_stadium_dl_20A8,
d_course_wario_stadium_dl_21A8,
d_course_wario_stadium_dl_2308,
d_course_wario_stadium_dl_2218,
d_course_wario_stadium_dl_23B0,
d_course_wario_stadium_dl_2490,
d_course_wario_stadium_dl_2610,
d_course_wario_stadium_dl_2530,
d_course_wario_stadium_dl_2698,
d_course_wario_stadium_dl_2798,
d_course_wario_stadium_dl_2928,
d_course_wario_stadium_dl_2870,
d_course_wario_stadium_dl_29D0,
d_course_wario_stadium_dl_2AB0,
d_course_wario_stadium_dl_2C30,
d_course_wario_stadium_dl_2B60,
d_course_wario_stadium_dl_2CE0,
d_course_wario_stadium_dl_2DC0,
d_course_wario_stadium_dl_2FB8,
d_course_wario_stadium_dl_2E70,
d_course_wario_stadium_dl_3098,
d_course_wario_stadium_dl_31B0,
d_course_wario_stadium_dl_3368,
d_course_wario_stadium_dl_3260,
d_course_wario_stadium_dl_3450,
d_course_wario_stadium_dl_3550,
d_course_wario_stadium_dl_36D8,
d_course_wario_stadium_dl_3600,
d_course_wario_stadium_dl_37A8,
d_course_wario_stadium_dl_3890,
d_course_wario_stadium_dl_3A10,
d_course_wario_stadium_dl_3980,
d_course_wario_stadium_dl_3AD0,
d_course_wario_stadium_dl_3BB0,
d_course_wario_stadium_dl_3D90,
d_course_wario_stadium_dl_3CF8,
d_course_wario_stadium_dl_3E80,
d_course_wario_stadium_dl_3F78,
d_course_wario_stadium_dl_40F0,
d_course_wario_stadium_dl_4060,
d_course_wario_stadium_dl_41D0,
d_course_wario_stadium_dl_4270,
d_course_wario_stadium_dl_43E0,
d_course_wario_stadium_dl_4340,
d_course_wario_stadium_dl_44B0,
d_course_wario_stadium_dl_4550,
d_course_wario_stadium_dl_47F0,
d_course_wario_stadium_dl_46E0,
d_course_wario_stadium_dl_4948,
d_course_wario_stadium_dl_4A78,
d_course_wario_stadium_dl_4BE8,
d_course_wario_stadium_dl_4B30,
d_course_wario_stadium_dl_4C60,
d_course_wario_stadium_dl_4D40,
d_course_wario_stadium_dl_4EF0,
d_course_wario_stadium_dl_4E30,
d_course_wario_stadium_dl_4F80,
d_course_wario_stadium_dl_5090,
d_course_wario_stadium_dl_51E8,
d_course_wario_stadium_dl_5168,
d_course_wario_stadium_dl_5270,
d_course_wario_stadium_dl_5338,
d_course_wario_stadium_dl_54E8,
d_course_wario_stadium_dl_5460,
d_course_wario_stadium_dl_5588,
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,
d_course_wario_stadium_dl_350, d_course_wario_stadium_dl_4C0, d_course_wario_stadium_dl_5E8,
d_course_wario_stadium_dl_798, d_course_wario_stadium_dl_668, d_course_wario_stadium_dl_830,
d_course_wario_stadium_dl_940, d_course_wario_stadium_dl_AB0, d_course_wario_stadium_dl_990,
d_course_wario_stadium_dl_B60, d_course_wario_stadium_dl_C08, d_course_wario_stadium_dl_D60,
d_course_wario_stadium_dl_C70, d_course_wario_stadium_dl_E30, d_course_wario_stadium_dl_ED0,
d_course_wario_stadium_dl_1068, d_course_wario_stadium_dl_F70, d_course_wario_stadium_dl_1158,
d_course_wario_stadium_dl_11F8, d_course_wario_stadium_dl_13C0, d_course_wario_stadium_dl_12E0,
d_course_wario_stadium_dl_14A0, d_course_wario_stadium_dl_1590, d_course_wario_stadium_dl_1708,
d_course_wario_stadium_dl_1630, d_course_wario_stadium_dl_17A8, d_course_wario_stadium_dl_1868,
d_course_wario_stadium_dl_19E0, d_course_wario_stadium_dl_1908, d_course_wario_stadium_dl_1AB8,
d_course_wario_stadium_dl_1B48, d_course_wario_stadium_dl_1CA8, d_course_wario_stadium_dl_1BB0,
d_course_wario_stadium_dl_1D68, d_course_wario_stadium_dl_1DF8, d_course_wario_stadium_dl_1FD8,
d_course_wario_stadium_dl_1E70, d_course_wario_stadium_dl_20A8, d_course_wario_stadium_dl_21A8,
d_course_wario_stadium_dl_2308, d_course_wario_stadium_dl_2218, d_course_wario_stadium_dl_23B0,
d_course_wario_stadium_dl_2490, d_course_wario_stadium_dl_2610, d_course_wario_stadium_dl_2530,
d_course_wario_stadium_dl_2698, d_course_wario_stadium_dl_2798, d_course_wario_stadium_dl_2928,
d_course_wario_stadium_dl_2870, d_course_wario_stadium_dl_29D0, d_course_wario_stadium_dl_2AB0,
d_course_wario_stadium_dl_2C30, d_course_wario_stadium_dl_2B60, d_course_wario_stadium_dl_2CE0,
d_course_wario_stadium_dl_2DC0, d_course_wario_stadium_dl_2FB8, d_course_wario_stadium_dl_2E70,
d_course_wario_stadium_dl_3098, d_course_wario_stadium_dl_31B0, d_course_wario_stadium_dl_3368,
d_course_wario_stadium_dl_3260, d_course_wario_stadium_dl_3450, d_course_wario_stadium_dl_3550,
d_course_wario_stadium_dl_36D8, d_course_wario_stadium_dl_3600, d_course_wario_stadium_dl_37A8,
d_course_wario_stadium_dl_3890, d_course_wario_stadium_dl_3A10, d_course_wario_stadium_dl_3980,
d_course_wario_stadium_dl_3AD0, d_course_wario_stadium_dl_3BB0, d_course_wario_stadium_dl_3D90,
d_course_wario_stadium_dl_3CF8, d_course_wario_stadium_dl_3E80, d_course_wario_stadium_dl_3F78,
d_course_wario_stadium_dl_40F0, d_course_wario_stadium_dl_4060, d_course_wario_stadium_dl_41D0,
d_course_wario_stadium_dl_4270, d_course_wario_stadium_dl_43E0, d_course_wario_stadium_dl_4340,
d_course_wario_stadium_dl_44B0, d_course_wario_stadium_dl_4550, d_course_wario_stadium_dl_47F0,
d_course_wario_stadium_dl_46E0, d_course_wario_stadium_dl_4948, d_course_wario_stadium_dl_4A78,
d_course_wario_stadium_dl_4BE8, d_course_wario_stadium_dl_4B30, d_course_wario_stadium_dl_4C60,
d_course_wario_stadium_dl_4D40, d_course_wario_stadium_dl_4EF0, d_course_wario_stadium_dl_4E30,
d_course_wario_stadium_dl_4F80, d_course_wario_stadium_dl_5090, d_course_wario_stadium_dl_51E8,
d_course_wario_stadium_dl_5168, d_course_wario_stadium_dl_5270, d_course_wario_stadium_dl_5338,
d_course_wario_stadium_dl_54E8, d_course_wario_stadium_dl_5460, d_course_wario_stadium_dl_5588,
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -164,7 +164,7 @@ extern Gfx d_course_yoshi_valley_dl_145D0[];
extern s16 d_course_yoshi_valley_unk1[];
extern AnimationLimbVector d_course_yoshi_valley_unk2[];
extern Animation d_course_yoshi_valley_unk3;
extern Animation *d_course_yoshi_valley_unk4[];
extern Animation* d_course_yoshi_valley_unk4[];
extern u32 d_course_yoshi_valley_unk5[];
extern u32 d_course_yoshi_valley_unk6[];
extern u8 d_course_yoshi_valley_hedgehog_tlut[];
@ -186,6 +186,6 @@ extern Gfx d_course_yoshi_valley_dl_18020[];
extern struct ActorSpawnData d_course_yoshi_valley_tree_spawn[];
extern struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[];
extern TrackSections d_course_yoshi_valley_addr[];
extern Gfx *d_course_yoshi_valley_dl_list[];
extern Gfx* d_course_yoshi_valley_dl_list[];
#endif

File diff suppressed because it is too large Load Diff

View File

@ -17,19 +17,19 @@ extern u8 gTextureSignWoodRedArrow[];
extern u8 gTexture68DEC0[];
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},
{ 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 },
};

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More