diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-28 01:47:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 17:47:39 -0600 |
| commit | a1f0d32d666c07d0754d97f107a5be59153768fd (patch) | |
| tree | fcc84d9daa940274be8cf76715be902d93338e64 /src/data/some_data.c | |
| parent | bb3cbe0500197f894c83230a9a170a2cbe7aa3e8 (diff) | |
Update decomp clang (#67)
* Update menus.c (#634)
* Update common_data.yml (#635)
* Renames for screenId and other changes (#636)
* screenId renames
* Rename surface map to collision mesh (#637)
* Rename some stack vars (#638)
* Fix syntax error (#639)
* Rename some stack vars
* Update collision.c
* Collision Documentation (#640)
* Collision related renames
* update doxygen (#649)
* change bool (#644)
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
* Update (#642)
* Delete trig_tables_bss.c (#650)
* fix typo audio (#656)
* fix typo src actor (#657)
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
* fix typo include (#658)
* fix course (#659)
* fix typo debug (#660)
* fix typo data (#661)
* replace number with const (#665)
* fix typo buffers (#655)
* fix typo buffers
* tweak ld file
* rename to sMemoryPool
* add a warning
---------
* fix typo src (#654)
* fix typo src
* fix non matcing
* Update code_80091750.c
---------
* fix typo racing (#653)
* fix typo racing
* get it match
* replace G_LINE3D to G_QUAD
---------
* fix typo src (#652)
* fix ending typo (#651)
* Action more info when it doesn't match and fix first diff (#662)
* Update linux-compile.yml
* fix first-diff
* Update first-diff.py
---------
* document texture of kart (#663)
* document texture of kart
* change screenPlayerId to screenId
* some documentation around object
* Revert "some documentation around object"
This reverts commit cbb39078e036bf2a417bed67359e910213acab28.
* more rename
---------
* Make evaluate_collision_players_palm_tree better (#667)
This matches just the same as before, but using those two casts instead of
shifts seems more likely to be accurate to the original source code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
* add fedora instruciton (#666)
* start documenting animation (#668)
* start documenting animation
* Update course_data.c
* change comment
* update libultra asm (#648)
* update libultra asm
* fix gcc __osThreadTail
---------
* Document Vehicles (#641)
* start doc collision
* fix merge
* finish rename fonction related to vehicle
* document around waypoint of vehicle
* make some modification
* make some change and rename one
* copy_ to oldPos
* doc smoke ferry and train
* some rename
* fix some renaming
* precise index
* rename a funciton
* simplify waypoint_vehicles
* change some name
* change some name
* rename move_to_point_direction
* fix some conflict
* Update code_80005FD0.c
* Update code_80005FD0.h
---------
* Label a save info loop (#645)
* save info
* more gcc progress
* fix a value and do a rename (#669)
* 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
---------
* Update linkonly_generator.py (#670)
* format more file
* update
* fix compilation issue
* remove course_metadata folder
* re add course metadata folder
* fix banshee bordwalk crash
* fix windows eurk
* Update CMakeLists.txt
---------
Diffstat (limited to 'src/data/some_data.c')
| -rw-r--r-- | src/data/some_data.c | 1616 |
1 files changed, 597 insertions, 1019 deletions
diff --git a/src/data/some_data.c b/src/data/some_data.c index 7fd4adaac..da59d9bac 100644 --- a/src/data/some_data.c +++ b/src/data/some_data.c @@ -4,184 +4,184 @@ #include "some_data.h" Vtx D_800E49C0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E4AC0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E4BC0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E4CC0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E4DC0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E4EC0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0x60 }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0x60 } } }, }; Vtx D_800E4FD0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E50D0[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E51D0[] = { - {{{ 9, 0, 9 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, 0 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, 0 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, 9 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 0, 9 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, 0 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, 0 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, 9 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx D_800E5210[] = { - {{{ 9, 0, 0 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -9 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -9 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, 0 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 0, 0 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -9 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -9 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, 0 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx gBalloonVertexPlane1[] = { - {{{ 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 18, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 9, -6 }, 0, { 4032, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 1984 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 18, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; Vtx gBalloonVertexPlane2[] = { - {{{ 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - {{{ -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, + { { { 9, 9, -6 }, 0, { 4032, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { 9, 0, -6 }, 0, { 4032, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 0, -6 }, 0, { 0, 1792 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, + { { { -9, 9, -6 }, 0, { 0, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF } } }, }; // Moved to OTR asset see some_data.yml @@ -191,28 +191,26 @@ Vtx gBalloonVertexPlane2[] = { // #include "assets/code/some_data/gTLUTOnomatopoeia.rgba16.inc.c" // }; -u8 *gCourseOutlineTextures[] = { - gTextureCourseOutlineMarioRaceway, gTextureCourseOutlineChocoMountain, gTextureCourseOutlineBowsersCastle, gTextureCourseOutlineBansheeBoardwalk, - gTextureCourseOutlineYoshiValley, gTextureCourseOutlineFrappeSnowland, gTextureCourseOutlineKoopaTroopaBeach, gTextureCourseOutlineRoyalRaceway, - gTextureCourseOutlineLuigiRaceway, gTextureCourseOutlineMooMooFarm, gTextureCourseOutlineToadsTurnpike, gTextureCourseOutlineKalimariDesert, - gTextureCourseOutlineSherbetLand, gTextureCourseOutlineRainbowRoad, gTextureCourseOutlineWarioStadium, gTextureCourseOutlineBlockFort, - gTextureCourseOutlineSkyscraper, gTextureCourseOutlineDoubleDeck, gTextureCourseOutlineDksJungleParkway, gTextureCourseOutlineBigDonut, +u8* gCourseOutlineTextures[] = { + gTextureCourseOutlineMarioRaceway, gTextureCourseOutlineChocoMountain, gTextureCourseOutlineBowsersCastle, + gTextureCourseOutlineBansheeBoardwalk, gTextureCourseOutlineYoshiValley, gTextureCourseOutlineFrappeSnowland, + gTextureCourseOutlineKoopaTroopaBeach, gTextureCourseOutlineRoyalRaceway, gTextureCourseOutlineLuigiRaceway, + gTextureCourseOutlineMooMooFarm, gTextureCourseOutlineToadsTurnpike, gTextureCourseOutlineKalimariDesert, + gTextureCourseOutlineSherbetLand, gTextureCourseOutlineRainbowRoad, gTextureCourseOutlineWarioStadium, + gTextureCourseOutlineBlockFort, gTextureCourseOutlineSkyscraper, gTextureCourseOutlineDoubleDeck, + gTextureCourseOutlineDksJungleParkway, gTextureCourseOutlineBigDonut, }; s16 D_800E5520[] = { - 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, - 0x0800, 0x0800, 0x0c00, 0x0800, 0x1000, 0x0c00, - 0x0800, 0x0c00, 0x0800, 0x0800, 0x0800, 0x0800, - 0x0800, 0x0800, + 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0c00, 0x0800, + 0x1000, 0x0c00, 0x0800, 0x0c00, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, }; s16 D_800E5548[] = { - 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, - 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, - 0x0040, 0x0060, 0x0040, 0x0040, 0x0080, 0x0040, 0x0040, 0x0060, - 0x0040, 0x0040, 0x0040, 0x0060, 0x0040, 0x0040, 0x0040, 0x0040, - 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, + 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0060, 0x0040, 0x0040, 0x0080, 0x0040, + 0x0040, 0x0060, 0x0040, 0x0040, 0x0040, 0x0060, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, + 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0000, 0x0000, 0x0000, 0x0000, }; u16 D_800E55A0[] = { @@ -225,47 +223,37 @@ u16 D_800E55B0[] = { }; u8 D_800E55D0[][3] = { - { 0x64, 0x64, 0x64 }, - { 0x96, 0x96, 0x73 }, - { 0xc8, 0xc8, 0x82 }, - { 0xff, 0xff, 0x96 }, - { 0xc8, 0xc8, 0x82 }, - { 0x96, 0x96, 0x73 }, - { 0x00, 0x00, 0x00 }, - { 0x01, 0x02, 0x03 }, - { 0x02, 0x01, 0x00 }, - { 0x04, 0x05, 0x06 }, - { 0x05, 0x04, 0x00 }, - { 0x07, 0x08, 0x09 }, - { 0x08, 0x07, 0x00 }, + { 0x64, 0x64, 0x64 }, { 0x96, 0x96, 0x73 }, { 0xc8, 0xc8, 0x82 }, { 0xff, 0xff, 0x96 }, { 0xc8, 0xc8, 0x82 }, + { 0x96, 0x96, 0x73 }, { 0x00, 0x00, 0x00 }, { 0x01, 0x02, 0x03 }, { 0x02, 0x01, 0x00 }, { 0x04, 0x05, 0x06 }, + { 0x05, 0x04, 0x00 }, { 0x07, 0x08, 0x09 }, { 0x08, 0x07, 0x00 }, }; s32 D_800E55F8[] = { - 0x000000ff, 0x000000ed, 0x000000d7, 0x000000bf, - 0x000000a2, 0x00000082, 0x00000061, 0x0000003a, + 0x000000ff, 0x000000ed, 0x000000d7, 0x000000bf, 0x000000a2, 0x00000082, 0x00000061, 0x0000003a, }; s32 D_800E5618[] = { - 0x000000ff, 0x000000d7, 0x000000a2, 0x00000061, + 0x000000ff, + 0x000000d7, + 0x000000a2, + 0x00000061, }; s8 D_800E5628[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x27, 0x33, 0x32, 0xff, 0x37, 0xff, 0x26, 0x29, 0x2a, 0x31, 0x2e, 0x25, 0x2b, 0x24, 0x2d, - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x2c, 0x36, 0x3c, 0x2f, 0x3d, 0x28, - 0x30, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, - 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x39, 0xff, 0x3a, 0x3b, 0x34, - 0x38, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, - 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0xff, 0xff, 0xff, 0x35, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x27, 0x33, 0x32, 0xff, 0x37, + 0xff, 0x26, 0x29, 0x2a, 0x31, 0x2e, 0x25, 0x2b, 0x24, 0x2d, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x2c, 0x36, 0x3c, 0x2f, 0x3d, 0x28, 0x30, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x39, 0xff, 0x3a, 0x3b, + 0x34, 0x38, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, + 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0xff, 0xff, 0xff, 0x35, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; Vec3s gFireBreathsSpawns[] = { @@ -277,84 +265,56 @@ Vec3s gFireBreathsSpawns[] = { // Referenced in code_80071F00/func_80076884, but that function is unused s16 D_800E5740[] = { - 0x0662, 0x0014, 0xfb52, 0x06db, 0x0014, 0xfb57, 0x067d, 0x0014, - 0xfb86, 0x06e2, 0x0014, 0xfaff, 0x06cd, 0x0014, 0xfb93, 0x06fb, - 0x0014, 0xfb4b, 0x067d, 0x0014, 0xfb1e, 0x062f, 0x0014, 0xfb39, - 0x0656, 0x0014, 0xfb00, 0x06f5, 0x0014, 0xfad3, 0x064b, 0x0014, - 0xfb72, 0x06fe, 0x0014, 0xfb7d, 0x0715, 0x0014, 0xfb1b, 0x066f, - 0x0014, 0xfac7, 0x0662, 0x0014, 0xfb52, 0x0000, + 0x0662, 0x0014, 0xfb52, 0x06db, 0x0014, 0xfb57, 0x067d, 0x0014, 0xfb86, 0x06e2, 0x0014, 0xfaff, + 0x06cd, 0x0014, 0xfb93, 0x06fb, 0x0014, 0xfb4b, 0x067d, 0x0014, 0xfb1e, 0x062f, 0x0014, 0xfb39, + 0x0656, 0x0014, 0xfb00, 0x06f5, 0x0014, 0xfad3, 0x064b, 0x0014, 0xfb72, 0x06fe, 0x0014, 0xfb7d, + 0x0715, 0x0014, 0xfb1b, 0x066f, 0x0014, 0xfac7, 0x0662, 0x0014, 0xfb52, 0x0000, }; // Referenced in code_80071F00/func_80076884, but that function is unused s16 D_800E579C[] = { - 0xff96, 0xffce, 0xfcca, 0xffa7, 0xffce, 0xfd1d, 0xff6e, 0xffce, - 0xfd5b, 0xff96, 0xffce, 0xfc65, 0xff4b, 0xffce, 0xfcdb, 0xff59, - 0xffce, 0xfc7f, 0x0065, 0xffce, 0xfc77, 0x00ab, 0xffce, 0xfcd7, - 0x0060, 0xffce, 0xfcbd, 0x0064, 0xffce, 0xfd03, 0x006d, 0xffce, - 0xfd52, 0x00b8, 0xffce, 0xfd33, 0x00ab, 0xffce, 0xfc65, 0xff96, - 0xffce, 0xfcca, 0xffa7, 0xffce, 0xfd1d, 0x0000, + 0xff96, 0xffce, 0xfcca, 0xffa7, 0xffce, 0xfd1d, 0xff6e, 0xffce, 0xfd5b, 0xff96, 0xffce, 0xfc65, + 0xff4b, 0xffce, 0xfcdb, 0xff59, 0xffce, 0xfc7f, 0x0065, 0xffce, 0xfc77, 0x00ab, 0xffce, 0xfcd7, + 0x0060, 0xffce, 0xfcbd, 0x0064, 0xffce, 0xfd03, 0x006d, 0xffce, 0xfd52, 0x00b8, 0xffce, 0xfd33, + 0x00ab, 0xffce, 0xfc65, 0xff96, 0xffce, 0xfcca, 0xffa7, 0xffce, 0xfd1d, 0x0000, }; // Referenced in code_80071F00/func_80076884, but that function is unused s16 D_800E57F8[] = { - 0x06e8, 0xffce, 0x0023, 0x07e3, 0xffcf, 0xffd4, 0x084d, 0xffce, - 0x006e, 0x07e3, 0xffcd, 0x00e0, 0x0638, 0xffca, 0x02ae, 0x0603, - 0xffce, 0x00af, 0x01f7, 0xffcc, 0x01c8, 0x0266, 0xffcc, 0x0179, - 0x070e, 0xffd0, 0xff6e, 0x070e, 0xffcf, 0xffd3, 0x070e, 0xffce, - 0x0087, 0x07ea, 0xffd0, 0xff6a, 0x07ea, 0xffce, 0x003c, 0x082c, - 0xffcf, 0xffb9, 0x023f, 0xffca, 0x02bb, 0x0000, + 0x06e8, 0xffce, 0x0023, 0x07e3, 0xffcf, 0xffd4, 0x084d, 0xffce, 0x006e, 0x07e3, 0xffcd, 0x00e0, + 0x0638, 0xffca, 0x02ae, 0x0603, 0xffce, 0x00af, 0x01f7, 0xffcc, 0x01c8, 0x0266, 0xffcc, 0x0179, + 0x070e, 0xffd0, 0xff6e, 0x070e, 0xffcf, 0xffd3, 0x070e, 0xffce, 0x0087, 0x07ea, 0xffd0, 0xff6a, + 0x07ea, 0xffce, 0x003c, 0x082c, 0xffcf, 0xffb9, 0x023f, 0xffca, 0x02bb, 0x0000, }; ThwompSpawn gThomwpSpawns50CC[] = { - { 0x03b6, 0xf92a, 0x0001, 0x0000 }, - { 0x0352, 0xf95c, 0x0002, 0x0000 }, - { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, - { 0x04b0, 0xf592, 0x0003, 0x0001 }, - { 0x091a, 0xf5b0, 0x0004, 0x0000 }, - { 0x0596, 0xf92f, 0x0006, 0x0000 }, - { 0x082a, 0xf9f2, 0x0005, 0x0000 }, - { 0x073a, 0xf9f2, 0x0005, 0x0001 }, + { 0x03b6, 0xf92a, 0x0001, 0x0000 }, { 0x0352, 0xf95c, 0x0002, 0x0000 }, { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, + { 0x04b0, 0xf592, 0x0003, 0x0001 }, { 0x091a, 0xf5b0, 0x0004, 0x0000 }, { 0x0596, 0xf92f, 0x0006, 0x0000 }, + { 0x082a, 0xf9f2, 0x0005, 0x0000 }, { 0x073a, 0xf9f2, 0x0005, 0x0001 }, }; - ThwompSpawn gThwompSpawns100CCExtra[] = { - { 0x0320, 0xf92a, 0x0001, 0x0000 }, - { 0x044c, 0xf92a, 0x0001, 0x0001 }, - { 0x02bc, 0xf95c, 0x0002, 0x0000 }, - { 0x04b0, 0xf8f8, 0x0002, 0x0001 }, - { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, - { 0x04b0, 0xf592, 0x0003, 0x0001 }, - { 0x091a, 0xf5bf, 0x0004, 0x0000 }, - { 0x091a, 0xf597, 0x0004, 0x0001 }, - { 0x0596, 0xf92f, 0x0006, 0x0000 }, - { 0x082a, 0xf9f2, 0x0005, 0x0000 }, - { 0x073a, 0xf9f2, 0x0005, 0x0001 }, + { 0x0320, 0xf92a, 0x0001, 0x0000 }, { 0x044c, 0xf92a, 0x0001, 0x0001 }, { 0x02bc, 0xf95c, 0x0002, 0x0000 }, + { 0x04b0, 0xf8f8, 0x0002, 0x0001 }, { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, { 0x04b0, 0xf592, 0x0003, 0x0001 }, + { 0x091a, 0xf5bf, 0x0004, 0x0000 }, { 0x091a, 0xf597, 0x0004, 0x0001 }, { 0x0596, 0xf92f, 0x0006, 0x0000 }, + { 0x082a, 0xf9f2, 0x0005, 0x0000 }, { 0x073a, 0xf9f2, 0x0005, 0x0001 }, }; - ThwompSpawn gThomwpSpawns150CC[] = { - { 0x0320, 0xf92a, 0x0001, 0x0000 }, - { 0x044c, 0xf92a, 0x0001, 0x0001 }, - { 0x02bc, 0xf95c, 0x0002, 0x0000 }, - { 0x04b0, 0xf8f8, 0x0002, 0x0001 }, - { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, - { 0x04b0, 0xf592, 0x0003, 0x0001 }, - { 0x091a, 0xf5c9, 0x0004, 0x0000 }, - { 0x091a, 0xf5ab, 0x0004, 0x0001 }, - { 0x091a, 0xf58d, 0x0004, 0x0002 }, - { 0x0596, 0xf92f, 0x0006, 0x0000 }, - { 0x082a, 0xf9f2, 0x0005, 0x0000 }, - { 0x073a, 0xf9f2, 0x0005, 0x0001 }, + { 0x0320, 0xf92a, 0x0001, 0x0000 }, { 0x044c, 0xf92a, 0x0001, 0x0001 }, { 0x02bc, 0xf95c, 0x0002, 0x0000 }, + { 0x04b0, 0xf8f8, 0x0002, 0x0001 }, { 0x04b0, 0xf5ba, 0x0003, 0x0000 }, { 0x04b0, 0xf592, 0x0003, 0x0001 }, + { 0x091a, 0xf5c9, 0x0004, 0x0000 }, { 0x091a, 0xf5ab, 0x0004, 0x0001 }, { 0x091a, 0xf58d, 0x0004, 0x0002 }, + { 0x0596, 0xf92f, 0x0006, 0x0000 }, { 0x082a, 0xf9f2, 0x0005, 0x0000 }, { 0x073a, 0xf9f2, 0x0005, 0x0001 }, }; f32 D_800E594C[][2] = { - { -8.0, 8.0 }, - { 8.0, 8.0 }, - { 0.0, 0.0 }, - { 8.0, -8.0 }, + { -8.0, 8.0 }, + { 8.0, 8.0 }, + { 0.0, 0.0 }, + { 8.0, -8.0 }, { -8.0, -8.0 }, // This feels super fake, but it matches - { -0.0, 0.0 }, + { -0.0, 0.0 }, }; s16 D_800E597C[] = { 0x0000, 0x0000, 0x4000, 0x8000, 0x8000, 0xc000 }; @@ -363,29 +323,18 @@ s16 D_800E597C[] = { 0x0000, 0x0000, 0x4000, 0x8000, 0x8000, 0xc000 }; SplineData D_800E5988 = { 0x0016, { - {{ 0x0005, 0x0011, 0x0032 }, 0x0028 }, - {{ 0x0005, 0x000d, 0x0014 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0000 }, 0x0028 }, - {{ 0x0014, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x0028 }, - {{ 0x0014, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0028 }, - {{ 0x0014, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x0028 }, - {{ 0x0014, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0014 }, 0x0028 }, - {{ 0x0005, 0x000a, 0x001e }, 0x0028 }, - {{ 0x0005, 0x0011, 0x0028 }, 0x0028 }, - {{ 0x0005, 0x0011, 0x0032 }, 0x0028 }, - {{ 0x0005, 0x0011, 0x0032 }, 0x0028 }, + { { 0x0005, 0x0011, 0x0032 }, 0x0028 }, { { 0x0005, 0x000d, 0x0014 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0000 }, 0x0028 }, { { 0x0014, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffe2 }, 0x0028 }, { { 0xffec, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffe2 }, 0x0028 }, { { 0x0014, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0x001e }, 0x0028 }, { { 0xffec, 0x000a, 0x0032 }, 0x0028 }, + { { 0x0000, 0x0011, 0x001e }, 0x0028 }, { { 0x0014, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffe2 }, 0x0028 }, { { 0xffec, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffe2 }, 0x0028 }, { { 0x0014, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffe2 }, 0x0028 }, { { 0xffec, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0014 }, 0x0028 }, { { 0x0005, 0x000a, 0x001e }, 0x0028 }, + { { 0x0005, 0x0011, 0x0028 }, 0x0028 }, { { 0x0005, 0x0011, 0x0032 }, 0x0028 }, + { { 0x0005, 0x0011, 0x0032 }, 0x0028 }, }, }; @@ -393,30 +342,18 @@ SplineData D_800E5988 = { SplineData D_800E5A44 = { 0x0017, { - {{ 0x0000, 0x0011, 0xffce }, 0x0028 }, - {{ 0x0014, 0x000d, 0xffd8 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffec }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0028 }, - {{ 0x0014, 0x000a, 0x0028 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0032 }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0028 }, - {{ 0xffec, 0x000a, 0x0014 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0000 }, 0x0028 }, - {{ 0xfff6, 0x000a, 0x0014 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0028 }, 0x0028 }, - {{ 0x000a, 0x000a, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0046 }, 0x0028 }, - {{ 0xfff6, 0x0017, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x000f, 0x0028 }, 0x0028 }, - {{ 0x000a, 0x000d, 0x001e }, 0x0028 }, - {{ 0x0000, 0x0011, 0x000a }, 0x0028 }, - {{ 0xfff6, 0x000d, 0x001e }, 0x0028 }, - {{ 0x0000, 0x0011, 0x0028 }, 0x0028 }, - {{ 0x000a, 0x000d, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x000d, 0x0046 }, 0x0028 }, - {{ 0x0000, 0x0011, 0xffce }, 0x0028 }, + { { 0x0000, 0x0011, 0xffce }, 0x0028 }, { { 0x0014, 0x000d, 0xffd8 }, 0x0028 }, + { { 0x0000, 0x0011, 0xffec }, 0x0028 }, { { 0xffec, 0x000a, 0x0000 }, 0x0028 }, + { { 0x0000, 0x0011, 0x001e }, 0x0028 }, { { 0x0014, 0x000a, 0x0028 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0032 }, 0x0028 }, { { 0xffec, 0x000a, 0x0032 }, 0x0028 }, + { { 0x0000, 0x0011, 0x001e }, 0x0028 }, { { 0xffec, 0x000a, 0x0014 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0000 }, 0x0028 }, { { 0xfff6, 0x000a, 0x0014 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0028 }, 0x0028 }, { { 0x000a, 0x000a, 0x0032 }, 0x0028 }, + { { 0x0000, 0x0011, 0x0046 }, 0x0028 }, { { 0xfff6, 0x0017, 0x0032 }, 0x0028 }, + { { 0x0000, 0x000f, 0x0028 }, 0x0028 }, { { 0x000a, 0x000d, 0x001e }, 0x0028 }, + { { 0x0000, 0x0011, 0x000a }, 0x0028 }, { { 0xfff6, 0x000d, 0x001e }, 0x0028 }, + { { 0x0000, 0x0011, 0x0028 }, 0x0028 }, { { 0x000a, 0x000d, 0x0032 }, 0x0028 }, + { { 0x0000, 0x000d, 0x0046 }, 0x0028 }, { { 0x0000, 0x0011, 0xffce }, 0x0028 }, }, }; @@ -424,31 +361,19 @@ SplineData D_800E5A44 = { SplineData D_800E5B08 = { 0x0018, { - {{ 0xfff1, 0x000a, 0x0000 }, 0x0014 }, - {{ 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x0000, 0x000a, 0xfff1 }, 0x0014 }, - {{ 0x000a, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x000f, 0x000a, 0x0000 }, 0x0014 }, - {{ 0x000a, 0x000a, 0x000a }, 0x0014 }, - {{ 0x0000, 0x000a, 0x000f }, 0x0014 }, - {{ 0xfff6, 0x000a, 0x000a }, 0x0014 }, - {{ 0xfff1, 0x000a, 0x0000 }, 0x0014 }, - {{ 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x0000, 0x000a, 0xfff1 }, 0x0014 }, - {{ 0x000a, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x000f, 0x000a, 0x0000 }, 0x0014 }, - {{ 0x000a, 0x000a, 0x000a }, 0x0014 }, - {{ 0x0000, 0x000a, 0x000f }, 0x0014 }, - {{ 0xfff6, 0x000a, 0x000a }, 0x0014 }, - {{ 0xfff1, 0x000a, 0x0000 }, 0x0014 }, - {{ 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x0000, 0x000a, 0xfff1 }, 0x0014 }, - {{ 0x000a, 0x000a, 0xfff6 }, 0x0014 }, - {{ 0x000f, 0x000a, 0x0000 }, 0x0014 }, - {{ 0x000a, 0x000a, 0x000a }, 0x0014 }, - {{ 0x0000, 0x000a, 0x000f }, 0x0014 }, - {{ 0xfff6, 0x000a, 0x000a }, 0x0014 }, - {{ 0xfff1, 0x000a, 0x0000 }, 0x0014 }, + { { 0xfff1, 0x000a, 0x0000 }, 0x0014 }, { { 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x0000, 0x000a, 0xfff1 }, 0x0014 }, { { 0x000a, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x000f, 0x000a, 0x0000 }, 0x0014 }, { { 0x000a, 0x000a, 0x000a }, 0x0014 }, + { { 0x0000, 0x000a, 0x000f }, 0x0014 }, { { 0xfff6, 0x000a, 0x000a }, 0x0014 }, + { { 0xfff1, 0x000a, 0x0000 }, 0x0014 }, { { 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x0000, 0x000a, 0xfff1 }, 0x0014 }, { { 0x000a, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x000f, 0x000a, 0x0000 }, 0x0014 }, { { 0x000a, 0x000a, 0x000a }, 0x0014 }, + { { 0x0000, 0x000a, 0x000f }, 0x0014 }, { { 0xfff6, 0x000a, 0x000a }, 0x0014 }, + { { 0xfff1, 0x000a, 0x0000 }, 0x0014 }, { { 0xfff6, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x0000, 0x000a, 0xfff1 }, 0x0014 }, { { 0x000a, 0x000a, 0xfff6 }, 0x0014 }, + { { 0x000f, 0x000a, 0x0000 }, 0x0014 }, { { 0x000a, 0x000a, 0x000a }, 0x0014 }, + { { 0x0000, 0x000a, 0x000f }, 0x0014 }, { { 0xfff6, 0x000a, 0x000a }, 0x0014 }, + { { 0xfff1, 0x000a, 0x0000 }, 0x0014 }, }, }; @@ -456,29 +381,18 @@ SplineData D_800E5B08 = { SplineData D_800E5BD4 = { 0x0016, { - {{ 0x0005, 0x0011, 0x0032 }, 0x001e }, - {{ 0x0005, 0x000d, 0x0014 }, 0x001e }, - {{ 0x0000, 0x0011, 0x0000 }, 0x001e }, - {{ 0x0014, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x001e }, - {{ 0xffec, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x001e }, - {{ 0x0014, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0x001e }, 0x001e }, - {{ 0xffec, 0x000a, 0x0032 }, 0x001e }, - {{ 0x0000, 0x0011, 0x001e }, 0x001e }, - {{ 0x0014, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x001e }, - {{ 0xffec, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x001e }, - {{ 0x0014, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0xffe2 }, 0x001e }, - {{ 0xffec, 0x000a, 0x0000 }, 0x001e }, - {{ 0x0000, 0x0011, 0x0014 }, 0x001e }, - {{ 0x0005, 0x000a, 0x001e }, 0x001e }, - {{ 0x0005, 0x0011, 0x0028 }, 0x001e }, - {{ 0x0005, 0x0011, 0x0032 }, 0x001e }, - {{ 0x0005, 0x0011, 0x0032 }, 0x001e }, + { { 0x0005, 0x0011, 0x0032 }, 0x001e }, { { 0x0005, 0x000d, 0x0014 }, 0x001e }, + { { 0x0000, 0x0011, 0x0000 }, 0x001e }, { { 0x0014, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0xffe2 }, 0x001e }, { { 0xffec, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0xffe2 }, 0x001e }, { { 0x0014, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0x001e }, 0x001e }, { { 0xffec, 0x000a, 0x0032 }, 0x001e }, + { { 0x0000, 0x0011, 0x001e }, 0x001e }, { { 0x0014, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0xffe2 }, 0x001e }, { { 0xffec, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0xffe2 }, 0x001e }, { { 0x0014, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0xffe2 }, 0x001e }, { { 0xffec, 0x000a, 0x0000 }, 0x001e }, + { { 0x0000, 0x0011, 0x0014 }, 0x001e }, { { 0x0005, 0x000a, 0x001e }, 0x001e }, + { { 0x0005, 0x0011, 0x0028 }, 0x001e }, { { 0x0005, 0x0011, 0x0032 }, 0x001e }, + { { 0x0005, 0x0011, 0x0032 }, 0x001e }, }, }; @@ -486,30 +400,18 @@ SplineData D_800E5BD4 = { SplineData D_800E5C90 = { 0x0017, { - {{ 0x0000, 0x0011, 0xffce }, 0x0019 }, - {{ 0x0014, 0x000d, 0xffd8 }, 0x0019 }, - {{ 0x0000, 0x0011, 0xffec }, 0x0019 }, - {{ 0xffec, 0x000a, 0x0000 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0019 }, - {{ 0x0014, 0x000a, 0x0028 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x0032 }, 0x0019 }, - {{ 0xffec, 0x000a, 0x0032 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x001e }, 0x0019 }, - {{ 0xffec, 0x000a, 0x0014 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x0000 }, 0x0019 }, - {{ 0xfff6, 0x000a, 0x0014 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x0028 }, 0x0019 }, - {{ 0x000a, 0x000a, 0x0032 }, 0x0019 }, - {{ 0x0000, 0x0011, 0x0046 }, 0x0019 }, - {{ 0xfff6, 0x0017, 0x0032 }, 0x0019 }, - {{ 0x0000, 0x000f, 0x0028 }, 0x0019 }, - {{ 0x000a, 0x000d, 0x001e }, 0x0019 }, - {{ 0x0000, 0x0011, 0x000a }, 0x0019 }, - {{ 0xfff6, 0x000d, 0x001e }, 0x0019 }, - {{ 0x0000, 0x0011, 0x0028 }, 0x0019 }, - {{ 0x000a, 0x000d, 0x0032 }, 0x0019 }, - {{ 0x0000, 0x000d, 0x0046 }, 0x0019 }, - {{ 0x0000, 0x0011, 0xffce }, 0x0019 }, + { { 0x0000, 0x0011, 0xffce }, 0x0019 }, { { 0x0014, 0x000d, 0xffd8 }, 0x0019 }, + { { 0x0000, 0x0011, 0xffec }, 0x0019 }, { { 0xffec, 0x000a, 0x0000 }, 0x0019 }, + { { 0x0000, 0x0011, 0x001e }, 0x0019 }, { { 0x0014, 0x000a, 0x0028 }, 0x0019 }, + { { 0x0000, 0x0011, 0x0032 }, 0x0019 }, { { 0xffec, 0x000a, 0x0032 }, 0x0019 }, + { { 0x0000, 0x0011, 0x001e }, 0x0019 }, { { 0xffec, 0x000a, 0x0014 }, 0x0019 }, + { { 0x0000, 0x0011, 0x0000 }, 0x0019 }, { { 0xfff6, 0x000a, 0x0014 }, 0x0019 }, + { { 0x0000, 0x0011, 0x0028 }, 0x0019 }, { { 0x000a, 0x000a, 0x0032 }, 0x0019 }, + { { 0x0000, 0x0011, 0x0046 }, 0x0019 }, { { 0xfff6, 0x0017, 0x0032 }, 0x0019 }, + { { 0x0000, 0x000f, 0x0028 }, 0x0019 }, { { 0x000a, 0x000d, 0x001e }, 0x0019 }, + { { 0x0000, 0x0011, 0x000a }, 0x0019 }, { { 0xfff6, 0x000d, 0x001e }, 0x0019 }, + { { 0x0000, 0x0011, 0x0028 }, 0x0019 }, { { 0x000a, 0x000d, 0x0032 }, 0x0019 }, + { { 0x0000, 0x000d, 0x0046 }, 0x0019 }, { { 0x0000, 0x0011, 0xffce }, 0x0019 }, }, }; @@ -517,10 +419,10 @@ SplineData D_800E5C90 = { SplineData D_800E5D54 = { 0x0004, { - {{ 0x0000, 0x0010, 0x0000 }, 0x0032 }, - {{ 0x0000, 0x0010, 0x0002 }, 0x0000 }, - {{ 0x0000, 0x0010, 0x0004 }, 0x0000 }, - {{ 0x0000, 0x0010, 0x0006 }, 0x0000 }, + { { 0x0000, 0x0010, 0x0000 }, 0x0032 }, + { { 0x0000, 0x0010, 0x0002 }, 0x0000 }, + { { 0x0000, 0x0010, 0x0004 }, 0x0000 }, + { { 0x0000, 0x0010, 0x0006 }, 0x0000 }, }, }; @@ -528,23 +430,19 @@ SplineData D_800E5D54 = { SplineData D_800E5D78 = { 0x0004, { - {{ 0x0000, 0x0000, 0x0000 }, 0x000a }, - {{ 0x0000, 0x0000, 0x0000 }, 0x000a }, - {{ 0x0000, 0x0000, 0x0000 }, 0x000a }, - {{ 0x0000, 0x0000, 0x0000 }, 0x000a }, + { { 0x0000, 0x0000, 0x0000 }, 0x000a }, + { { 0x0000, 0x0000, 0x0000 }, 0x000a }, + { { 0x0000, 0x0000, 0x0000 }, 0x000a }, + { { 0x0000, 0x0000, 0x0000 }, 0x000a }, }, }; // Note the use of the plain SplineData type here. Since these are pointers, we don't care // about their internal array size -SplineData *D_800E5D9C[] = { - &D_800E5988, &D_800E5A44, - &D_800E5B08, &D_800E5BD4, - &D_800E5C90 -}; +SplineData* D_800E5D9C[] = { &D_800E5988, &D_800E5A44, &D_800E5B08, &D_800E5BD4, &D_800E5C90 }; // Unused -SplineData *D_800E5DB0 = &D_800E5988; +SplineData* D_800E5DB0 = &D_800E5988; s8 D_800E5DB4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -554,223 +452,130 @@ s8 D_800E5DB4[] = { }; YVFlagPoleSpawn D_800E5DF4[] = { - {{ 0xfc7a, 0x0046, 0xfa82 }, 0x3800 }, - {{ 0xfc4c, 0x0046, 0xfa03 }, 0x3800 }, - {{ 0xf786, 0x0000, 0x02d3 }, 0x0400 }, - {{ 0xf76f, 0x0000, 0x02f9 }, 0x0400 }, + { { 0xfc7a, 0x0046, 0xfa82 }, 0x3800 }, + { { 0xfc4c, 0x0046, 0xfa03 }, 0x3800 }, + { { 0xf786, 0x0000, 0x02d3 }, 0x0400 }, + { { 0xf76f, 0x0000, 0x02f9 }, 0x0400 }, }; HegdehogSpawn gHedgehogSpawns[] = { - {{ 0xf96d, 0xffb0, 0xffa8 }, 0x0009 }, - {{ 0xf99c, 0xffa3, 0xff6d }, 0x0009 }, - {{ 0xf9a4, 0xffaa, 0xff94 }, 0x0009 }, - {{ 0xf974, 0xffbb, 0xffe2 }, 0x0009 }, - {{ 0xfb35, 0xffe5, 0xfc23 }, 0x001a }, - {{ 0xfb13, 0xffd7, 0xfc90 }, 0x001a }, - {{ 0xfac2, 0xffc4, 0xfcc2 }, 0x001a }, - {{ 0xfa6b, 0xffb2, 0xfcaf }, 0x001a }, - {{ 0xfa2c, 0xffa2, 0xfcfa }, 0x001a }, - {{ 0xfa53, 0xffa9, 0xfcf0 }, 0x001a }, - {{ 0xfa30, 0xffa7, 0xfcac }, 0x001a }, - {{ 0xfaeb, 0xffd1, 0xfc78 }, 0x001a }, - {{ 0xf5e5, 0xffc8, 0xfefd }, 0x001c }, - {{ 0xf643, 0xffa2, 0xfe3a }, 0x001c }, - {{ 0xf653, 0xfffd, 0xffc7 }, 0x001c }, + { { 0xf96d, 0xffb0, 0xffa8 }, 0x0009 }, { { 0xf99c, 0xffa3, 0xff6d }, 0x0009 }, + { { 0xf9a4, 0xffaa, 0xff94 }, 0x0009 }, { { 0xf974, 0xffbb, 0xffe2 }, 0x0009 }, + { { 0xfb35, 0xffe5, 0xfc23 }, 0x001a }, { { 0xfb13, 0xffd7, 0xfc90 }, 0x001a }, + { { 0xfac2, 0xffc4, 0xfcc2 }, 0x001a }, { { 0xfa6b, 0xffb2, 0xfcaf }, 0x001a }, + { { 0xfa2c, 0xffa2, 0xfcfa }, 0x001a }, { { 0xfa53, 0xffa9, 0xfcf0 }, 0x001a }, + { { 0xfa30, 0xffa7, 0xfcac }, 0x001a }, { { 0xfaeb, 0xffd1, 0xfc78 }, 0x001a }, + { { 0xf5e5, 0xffc8, 0xfefd }, 0x001c }, { { 0xf643, 0xffa2, 0xfe3a }, 0x001c }, + { { 0xf653, 0xfffd, 0xffc7 }, 0x001c }, }; Vec3s gHedgehogPatrolPoints[] = { - { 0xf98e, 0xffaa, 0xff8e }, - { 0xf983, 0xffa3, 0xff69 }, - { 0xf97e, 0xffb5, 0xffc6 }, - { 0xf98d, 0xffb9, 0xffe6 }, - { 0xfb56, 0xffe7, 0xfc19 }, - { 0xfb43, 0xffe0, 0xfca0 }, - { 0xfb1f, 0xffd9, 0xfc61 }, - { 0xfabd, 0xffc5, 0xfc9e }, - { 0xfa6d, 0xffb5, 0xfc85 }, - { 0xfa1b, 0xffa1, 0xfcd7 }, - { 0xfa48, 0xffa8, 0xfcca }, - { 0xf9ff, 0xffa4, 0xfcaa }, - { 0xf5c0, 0xffd1, 0xff0f }, - { 0xf637, 0xffa7, 0xfe73 }, - { 0xf615, 0xfffd, 0xffbe }, + { 0xf98e, 0xffaa, 0xff8e }, { 0xf983, 0xffa3, 0xff69 }, { 0xf97e, 0xffb5, 0xffc6 }, { 0xf98d, 0xffb9, 0xffe6 }, + { 0xfb56, 0xffe7, 0xfc19 }, { 0xfb43, 0xffe0, 0xfca0 }, { 0xfb1f, 0xffd9, 0xfc61 }, { 0xfabd, 0xffc5, 0xfc9e }, + { 0xfa6d, 0xffb5, 0xfc85 }, { 0xfa1b, 0xffa1, 0xfcd7 }, { 0xfa48, 0xffa8, 0xfcca }, { 0xf9ff, 0xffa4, 0xfcaa }, + { 0xf5c0, 0xffd1, 0xff0f }, { 0xf637, 0xffa7, 0xfe73 }, { 0xf615, 0xfffd, 0xffbe }, }; SnowmanSpawn gSnowmanSpawns[] = { - {{ 0x02b9, 0x0000, 0xf96c }, 0x0003 }, - {{ 0x0052, 0x0000, 0xf73b }, 0x0005 }, - {{ 0x001b, 0x0005, 0xf7ed }, 0x0005 }, - {{ 0xfd70, 0x0000, 0xf939 }, 0x0005 }, - {{ 0xfa27, 0x0000, 0xffad }, 0x0008 }, - {{ 0xf995, 0x0000, 0xffe7 }, 0x0008 }, - {{ 0xf9f5, 0x0000, 0xffec }, 0x0008 }, - {{ 0xfa5b, 0x0000, 0xfff6 }, 0x0008 }, - {{ 0xfa22, 0x0000, 0x003d }, 0x0008 }, - {{ 0xfa6b, 0x0000, 0x004f }, 0x0008 }, - {{ 0xf9ce, 0x0000, 0x0047 }, 0x0008 }, - {{ 0xfa41, 0x0000, 0x009d }, 0x0008 }, - {{ 0xf9fd, 0x0000, 0x00af }, 0x0008 }, - {{ 0xfa34, 0x0000, 0x012f }, 0x0008 }, - {{ 0xfa5e, 0x0000, 0x0166 }, 0x0008 }, - {{ 0xfa1a, 0x0000, 0x01aa }, 0x0008 }, - {{ 0xfd67, 0x0000, 0x033e }, 0x000a }, - {{ 0xfd43, 0x0003, 0x0355 }, 0x000a }, - {{ 0xfda6, 0x0000, 0x03a1 }, 0x000a }, + { { 0x02b9, 0x0000, 0xf96c }, 0x0003 }, { { 0x0052, 0x0000, 0xf73b }, 0x0005 }, + { { 0x001b, 0x0005, 0xf7ed }, 0x0005 }, { { 0xfd70, 0x0000, 0xf939 }, 0x0005 }, + { { 0xfa27, 0x0000, 0xffad }, 0x0008 }, { { 0xf995, 0x0000, 0xffe7 }, 0x0008 }, + { { 0xf9f5, 0x0000, 0xffec }, 0x0008 }, { { 0xfa5b, 0x0000, 0xfff6 }, 0x0008 }, + { { 0xfa22, 0x0000, 0x003d }, 0x0008 }, { { 0xfa6b, 0x0000, 0x004f }, 0x0008 }, + { { 0xf9ce, 0x0000, 0x0047 }, 0x0008 }, { { 0xfa41, 0x0000, 0x009d }, 0x0008 }, + { { 0xf9fd, 0x0000, 0x00af }, 0x0008 }, { { 0xfa34, 0x0000, 0x012f }, 0x0008 }, + { { 0xfa5e, 0x0000, 0x0166 }, 0x0008 }, { { 0xfa1a, 0x0000, 0x01aa }, 0x0008 }, + { { 0xfd67, 0x0000, 0x033e }, 0x000a }, { { 0xfd43, 0x0003, 0x0355 }, 0x000a }, + { { 0xfda6, 0x0000, 0x03a1 }, 0x000a }, }; CrabSpawn gCrabSpawns[] = { - { 0xf8ef, 0xf97e, 0x0271, 0x0252 }, - { 0xf8c4, 0xf9ac, 0x02f5, 0x02e4 }, - { 0xfa3a, 0xfa53, 0x0732, 0x0729 }, - { 0xfa76, 0xfa51, 0x07af, 0x07aa }, - { 0xfa40, 0xfa77, 0x0840, 0x0834 }, - { 0xfa93, 0xfac9, 0x0868, 0x0858 }, - { 0x00da, 0x0045, 0x02b5, 0x02b8 }, - { 0x00eb, 0x0018, 0x0210, 0x01f5 }, - { 0x010c, 0x0065, 0x0196, 0x018a }, + { 0xf8ef, 0xf97e, 0x0271, 0x0252 }, { 0xf8c4, 0xf9ac, 0x02f5, 0x02e4 }, { 0xfa3a, 0xfa53, 0x0732, 0x0729 }, + { 0xfa76, 0xfa51, 0x07af, 0x07aa }, { 0xfa40, 0xfa77, 0x0840, 0x0834 }, { 0xfa93, 0xfac9, 0x0868, 0x0858 }, + { 0x00da, 0x0045, 0x02b5, 0x02b8 }, { 0x00eb, 0x0018, 0x0210, 0x01f5 }, { 0x010c, 0x0065, 0x0196, 0x018a }, { 0x00df, 0x0056, 0x013e, 0x0134 }, }; // Appears to be unused, may have been a different set of crabs at some point? s16 D_800E5FD0[] = { - 0x017e, 0x012f, 0x0462, 0x0491, 0x008f, 0x011a, 0x042e, 0x03df, - 0x0154, 0x00d7, 0x0363, 0x03a7, 0x007b, 0x00ba, 0x035a, 0x0337, - 0x00e1, 0x0056, 0x02c0, 0x02e9, 0x008f, 0x0056, 0x0232, 0x0245, - 0x0190, 0x044c, 0x01f4, 0x03e8, 0x015e, 0x0384, 0x012c, 0x0320, - 0x0000, 0x0000, 0x0032, 0x0032, 0x0064, 0x0064, 0xffce, 0x0032, - 0xff9c, 0x0064, 0x0032, 0xffce, 0x0064, 0xff6a, 0xffce, 0xff9c, - 0xff9c, 0x0000, + 0x017e, 0x012f, 0x0462, 0x0491, 0x008f, 0x011a, 0x042e, 0x03df, 0x0154, 0x00d7, 0x0363, 0x03a7, 0x007b, + 0x00ba, 0x035a, 0x0337, 0x00e1, 0x0056, 0x02c0, 0x02e9, 0x008f, 0x0056, 0x0232, 0x0245, 0x0190, 0x044c, + 0x01f4, 0x03e8, 0x015e, 0x0384, 0x012c, 0x0320, 0x0000, 0x0000, 0x0032, 0x0032, 0x0064, 0x0064, 0xffce, + 0x0032, 0xff9c, 0x0064, 0x0032, 0xffce, 0x0064, 0xff6a, 0xffce, 0xff9c, 0xff9c, 0x0000, }; // Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature -SplineData D_800E6034 = { - 0x0016, - { - {{ 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, - {{ 0x0032, 0x0082, 0x00c8 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0000 }, 0x0028 }, - {{ 0x00c8, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0xff38, 0x0032, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0x00c8, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0xff38, 0x0064, 0x01f4 }, 0x0028 }, - {{ 0x0000, 0x00fa, 0x012c }, 0x0028 }, - {{ 0x00c8, 0x0032, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0xff38, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0x00c8, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0xff38, 0x00fa, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x00c8 }, 0x0028 }, - {{ 0x0032, 0x0064, 0x012c }, 0x0028 }, - {{ 0x0032, 0x00aa, 0x0190 }, 0x0028 }, - {{ 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, - {{ 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, - } -}; +SplineData D_800E6034 = { 0x0016, + { + { { 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, { { 0x0032, 0x0082, 0x00c8 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0000 }, 0x0028 }, { { 0x00c8, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0xff38, 0x0032, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0x00c8, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0xff38, 0x0064, 0x01f4 }, 0x0028 }, + { { 0x0000, 0x00fa, 0x012c }, 0x0028 }, { { 0x00c8, 0x0032, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0xff38, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0x00c8, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0xff38, 0x00fa, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x00c8 }, 0x0028 }, { { 0x0032, 0x0064, 0x012c }, 0x0028 }, + { { 0x0032, 0x00aa, 0x0190 }, 0x0028 }, { { 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, + { { 0x0032, 0x00aa, 0x01f4 }, 0x0028 }, + } }; // Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature -SplineData D_800E60F0 = { - 0x0017, - { - {{ 0x0000, 0x00aa, 0xfe0c }, 0x0028 }, - {{ 0x00c8, 0x0082, 0xfe70 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xff38 }, 0x0028 }, - {{ 0xff38, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0x00c8, 0x0064, 0x0190 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x01f4 }, 0x0028 }, - {{ 0xff38, 0x0064, 0x01f4 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0xff38, 0x0064, 0x00c8 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0000 }, 0x0028 }, - {{ 0xff9c, 0x0064, 0x00c8 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0190 }, 0x0028 }, - {{ 0x0064, 0x0064, 0x01f4 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x02bc }, 0x0028 }, - {{ 0xff9c, 0x00e6, 0x01f4 }, 0x0028 }, - {{ 0x0000, 0x0096, 0x0190 }, 0x0028 }, - {{ 0x0064, 0x0082, 0x012c }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0064 }, 0x0028 }, - {{ 0xff9c, 0x0082, 0x012c }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0190 }, 0x0028 }, - {{ 0x0064, 0x0082, 0x01f4 }, 0x0028 }, - {{ 0x0000, 0x0082, 0x02bc }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfe0c }, 0x0028 }, - } -}; +SplineData D_800E60F0 = { 0x0017, + { + { { 0x0000, 0x00aa, 0xfe0c }, 0x0028 }, { { 0x00c8, 0x0082, 0xfe70 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xff38 }, 0x0028 }, { { 0xff38, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0x00c8, 0x0064, 0x0190 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x01f4 }, 0x0028 }, { { 0xff38, 0x0064, 0x01f4 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0xff38, 0x0064, 0x00c8 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0000 }, 0x0028 }, { { 0xff9c, 0x0064, 0x00c8 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0190 }, 0x0028 }, { { 0x0064, 0x0064, 0x01f4 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x02bc }, 0x0028 }, { { 0xff9c, 0x00e6, 0x01f4 }, 0x0028 }, + { { 0x0000, 0x0096, 0x0190 }, 0x0028 }, { { 0x0064, 0x0082, 0x012c }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0064 }, 0x0028 }, { { 0xff9c, 0x0082, 0x012c }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0190 }, 0x0028 }, { { 0x0064, 0x0082, 0x01f4 }, 0x0028 }, + { { 0x0000, 0x0082, 0x02bc }, 0x0028 }, { { 0x0000, 0x00aa, 0xfe0c }, 0x0028 }, + } }; // Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature -SplineData D_800E61B4 = { - 0x0018, - { - {{ 0xff6a, 0x0064, 0x0000 }, 0x0014 }, - {{ 0xff96, 0x0096, 0xff96 }, 0x0014 }, - {{ 0x0000, 0x0050, 0xff6a }, 0x0014 }, - {{ 0x006a, 0x0096, 0xff96 }, 0x0014 }, - {{ 0x0096, 0x0064, 0x0000 }, 0x0014 }, - {{ 0x006a, 0x0096, 0x006a }, 0x0014 }, - {{ 0x0000, 0x0064, 0x0096 }, 0x0014 }, - {{ 0xff96, 0x0064, 0x006a }, 0x0014 }, - {{ 0xff6a, 0x0082, 0x0000 }, 0x0014 }, - {{ 0xff96, 0x0050, 0xff96 }, 0x0014 }, - {{ 0x0000, 0x0064, 0xff6a }, 0x0014 }, - {{ 0x006a, 0x008c, 0xff96 }, 0x0014 }, - {{ 0x0096, 0x0064, 0x0000 }, 0x0014 }, - {{ 0x006a, 0x0064, 0x006a }, 0x0014 }, - {{ 0x0000, 0x0096, 0x0096 }, 0x0014 }, - {{ 0xff96, 0x0050, 0x006a }, 0x0014 }, - {{ 0xff6a, 0x0064, 0x0000 }, 0x0014 }, - {{ 0xff96, 0x0096, 0xff96 }, 0x0014 }, - {{ 0x0000, 0x0064, 0xff6a }, 0x0014 }, - {{ 0x006a, 0x0078, 0xff96 }, 0x0014 }, - {{ 0x0096, 0x0064, 0x0000 }, 0x0014 }, - {{ 0x006a, 0x0028, 0x006a }, 0x0014 }, - {{ 0x0000, 0x0064, 0x0096 }, 0x0014 }, - {{ 0xff96, 0x0064, 0x006a }, 0x0014 }, - {{ 0xff6a, 0x0064, 0x0000 }, 0x0014 }, - } -}; +SplineData D_800E61B4 = { 0x0018, + { + { { 0xff6a, 0x0064, 0x0000 }, 0x0014 }, { { 0xff96, 0x0096, 0xff96 }, 0x0014 }, + { { 0x0000, 0x0050, 0xff6a }, 0x0014 }, { { 0x006a, 0x0096, 0xff96 }, 0x0014 }, + { { 0x0096, 0x0064, 0x0000 }, 0x0014 }, { { 0x006a, 0x0096, 0x006a }, 0x0014 }, + { { 0x0000, 0x0064, 0x0096 }, 0x0014 }, { { 0xff96, 0x0064, 0x006a }, 0x0014 }, + { { 0xff6a, 0x0082, 0x0000 }, 0x0014 }, { { 0xff96, 0x0050, 0xff96 }, 0x0014 }, + { { 0x0000, 0x0064, 0xff6a }, 0x0014 }, { { 0x006a, 0x008c, 0xff96 }, 0x0014 }, + { { 0x0096, 0x0064, 0x0000 }, 0x0014 }, { { 0x006a, 0x0064, 0x006a }, 0x0014 }, + { { 0x0000, 0x0096, 0x0096 }, 0x0014 }, { { 0xff96, 0x0050, 0x006a }, 0x0014 }, + { { 0xff6a, 0x0064, 0x0000 }, 0x0014 }, { { 0xff96, 0x0096, 0xff96 }, 0x0014 }, + { { 0x0000, 0x0064, 0xff6a }, 0x0014 }, { { 0x006a, 0x0078, 0xff96 }, 0x0014 }, + { { 0x0096, 0x0064, 0x0000 }, 0x0014 }, { { 0x006a, 0x0028, 0x006a }, 0x0014 }, + { { 0x0000, 0x0064, 0x0096 }, 0x0014 }, { { 0xff96, 0x0064, 0x006a }, 0x0014 }, + { { 0xff6a, 0x0064, 0x0000 }, 0x0014 }, + } }; // Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature -SplineData D_800E6280 = { - 0x0016, - { - {{ 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, - {{ 0xffce, 0x0082, 0xff38 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x0000 }, 0x0028 }, - {{ 0xff38, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0x00c8, 0x0032, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0xff38, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, - {{ 0x00c8, 0x0064, 0xfe0c }, 0x0028 }, - {{ 0x0000, 0x00fa, 0xfed4 }, 0x0028 }, - {{ 0xff38, 0x0032, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0x00c8, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0xff38, 0x0064, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0x012c }, 0x0028 }, - {{ 0x00c8, 0x00fa, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x00aa, 0xff38 }, 0x0028 }, - {{ 0xffce, 0x0064, 0xfed4 }, 0x0028 }, - {{ 0xffce, 0x00aa, 0xfe70 }, 0x0028 }, - {{ 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, - {{ 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, - } -}; +SplineData D_800E6280 = { 0x0016, + { + { { 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, { { 0xffce, 0x0082, 0xff38 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x0000 }, 0x0028 }, { { 0xff38, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0x00c8, 0x0032, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0xff38, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xfed4 }, 0x0028 }, { { 0x00c8, 0x0064, 0xfe0c }, 0x0028 }, + { { 0x0000, 0x00fa, 0xfed4 }, 0x0028 }, { { 0xff38, 0x0032, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0x00c8, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0xff38, 0x0064, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0x012c }, 0x0028 }, { { 0x00c8, 0x00fa, 0x0000 }, 0x0028 }, + { { 0x0000, 0x00aa, 0xff38 }, 0x0028 }, { { 0xffce, 0x0064, 0xfed4 }, 0x0028 }, + { { 0xffce, 0x00aa, 0xfe70 }, 0x0028 }, { { 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, + { { 0xffce, 0x00aa, 0xfe0c }, 0x0028 }, + } }; // Note the use of the plain SplineData type here. Since these are pointers, we don't care // about their internal array size -SplineData *D_800E633C[] = { - &D_800E6034, &D_800E60F0, - &D_800E61B4, &D_800E6280 -}; +SplineData* D_800E633C[] = { &D_800E6034, &D_800E60F0, &D_800E61B4, &D_800E6280 }; // Might be Cheep Cheep related? Vec3s D_800E634C[] = { @@ -779,514 +584,287 @@ Vec3s D_800E634C[] = { { 0xf380, 0x0013, 0xfe14 }, }; -MoleSpawnUnion gMoleSpawns = { - { - { 0x0303, 0x0014, 0xf81a }, - { 0x0327, 0x000f, 0xf7f1 }, - { 0x034f, 0x0012, 0xf808 }, - { 0x0391, 0x000e, 0xf7fa }, - { 0x03ab, 0x0015, 0xf833 }, - { 0x03ad, 0x0011, 0xf818 }, - { 0x03e2, 0x0011, 0xf836 }, - { 0x035f, 0x0016, 0xf826 }, - { 0x05dc, 0x0002, 0x0474 }, - { 0x05e6, 0x000f, 0x041a }, - { 0x0649, 0x0015, 0x03a7 }, - { 0x0509, 0x0003, 0x04f5 }, - { 0x05bc, 0x0016, 0x0416 }, - { 0x0564, 0x000c, 0x0482 }, - { 0x0511, 0x0013, 0x0492 }, - { 0x0635, 0x000b, 0x03ec }, - { 0x0586, 0x0003, 0x04a1 }, - { 0x057d, 0x0004, 0x04e6 }, - { 0x05b7, 0x0008, 0x045e }, - { 0x02bd, 0x0002, 0x04ff }, - { 0x032b, 0x0008, 0x04fe }, - { 0x0317, 0x0010, 0x04cd }, - { 0x036c, 0x000f, 0x04f2 }, - { 0x03d8, 0x0017, 0x04e0 }, - { 0x037b, 0x0014, 0x04da }, - { 0x0398, 0x000f, 0x0518 }, - { 0x0337, 0x0006, 0x052f }, - { 0x02cd, 0x0008, 0x04d7 }, - { 0x02b7, 0x0013, 0x0498 }, - { 0x0274, 0x0008, 0x04a7 }, - { 0x02d4, 0x0004, 0x053b }, - } -}; +MoleSpawnUnion gMoleSpawns = { { + { 0x0303, 0x0014, 0xf81a }, { 0x0327, 0x000f, 0xf7f1 }, { 0x034f, 0x0012, 0xf808 }, { 0x0391, 0x000e, 0xf7fa }, + { 0x03ab, 0x0015, 0xf833 }, { 0x03ad, 0x0011, 0xf818 }, { 0x03e2, 0x0011, 0xf836 }, { 0x035f, 0x0016, 0xf826 }, + { 0x05dc, 0x0002, 0x0474 }, { 0x05e6, 0x000f, 0x041a }, { 0x0649, 0x0015, 0x03a7 }, { 0x0509, 0x0003, 0x04f5 }, + { 0x05bc, 0x0016, 0x0416 }, { 0x0564, 0x000c, 0x0482 }, { 0x0511, 0x0013, 0x0492 }, { 0x0635, 0x000b, 0x03ec }, + { 0x0586, 0x0003, 0x04a1 }, { 0x057d, 0x0004, 0x04e6 }, { 0x05b7, 0x0008, 0x045e }, { 0x02bd, 0x0002, 0x04ff }, + { 0x032b, 0x0008, 0x04fe }, { 0x0317, 0x0010, 0x04cd }, { 0x036c, 0x000f, 0x04f2 }, { 0x03d8, 0x0017, 0x04e0 }, + { 0x037b, 0x0014, 0x04da }, { 0x0398, 0x000f, 0x0518 }, { 0x0337, 0x0006, 0x052f }, { 0x02cd, 0x0008, 0x04d7 }, + { 0x02b7, 0x0013, 0x0498 }, { 0x0274, 0x0008, 0x04a7 }, { 0x02d4, 0x0004, 0x053b }, +} }; // Referenced by D_800E6724, which is unused -SplineData D_800E641C = { - 0x0016, - { - {{ 0x0014, 0x0000, 0x00c8 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0050 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0050, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xff88 }, 0x0050 }, - {{ 0xffb0, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xff88 }, 0x0050 }, - {{ 0x0050, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0078 }, 0x0050 }, - {{ 0xffb0, 0x0000, 0x00c8 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0078 }, 0x0050 }, - {{ 0x0050, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xff88 }, 0x0050 }, - {{ 0xffb0, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xff88 }, 0x0050 }, - {{ 0x0050, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xff88 }, 0x0050 }, - {{ 0xffb0, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0050 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0078 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x00a0 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x00c8 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x00c8 }, 0x0050 }, - } -}; +SplineData D_800E641C = { 0x0016, + { + { { 0x0014, 0x0000, 0x00c8 }, 0x0050 }, { { 0x0014, 0x0000, 0x0050 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0000 }, 0x0050 }, { { 0x0050, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xff88 }, 0x0050 }, { { 0xffb0, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xff88 }, 0x0050 }, { { 0x0050, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0078 }, 0x0050 }, { { 0xffb0, 0x0000, 0x00c8 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0078 }, 0x0050 }, { { 0x0050, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xff88 }, 0x0050 }, { { 0xffb0, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xff88 }, 0x0050 }, { { 0x0050, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xff88 }, 0x0050 }, { { 0xffb0, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0050 }, 0x0050 }, { { 0x0014, 0x0000, 0x0078 }, 0x0050 }, + { { 0x0014, 0x0000, 0x00a0 }, 0x0050 }, { { 0x0014, 0x0000, 0x00c8 }, 0x0050 }, + { { 0x0014, 0x0000, 0x00c8 }, 0x0050 }, + } }; // Referenced by D_800E6724, which is unused -SplineData D_800E64D8 = { - 0x0017, - { - {{ 0x0000, 0x0000, 0xffce }, 0x0050 }, - {{ 0x0014, 0x0000, 0xffd8 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffec }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x001e }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0028 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0032 }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x001e }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0014 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0000 }, 0x0050 }, - {{ 0xfff6, 0x0000, 0x0014 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0028 }, 0x0050 }, - {{ 0x000a, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0046 }, 0x0050 }, - {{ 0xfff6, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0028 }, 0x0050 }, - {{ 0x000a, 0x0000, 0x001e }, 0x0050 }, - {{ 0x0000, 0x0000, 0x000a }, 0x0050 }, - {{ 0xfff6, 0x0000, 0x001e }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0028 }, 0x0050 }, - {{ 0x000a, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0046 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffce }, 0x0050 }, - } -}; +SplineData D_800E64D8 = { 0x0017, + { + { { 0x0000, 0x0000, 0xffce }, 0x0050 }, { { 0x0014, 0x0000, 0xffd8 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffec }, 0x0050 }, { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0x001e }, 0x0050 }, { { 0x0014, 0x0000, 0x0028 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0032 }, 0x0050 }, { { 0xffec, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0000, 0x0000, 0x001e }, 0x0050 }, { { 0xffec, 0x0000, 0x0014 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0000 }, 0x0050 }, { { 0xfff6, 0x0000, 0x0014 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0028 }, 0x0050 }, { { 0x000a, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0046 }, 0x0050 }, { { 0xfff6, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0028 }, 0x0050 }, { { 0x000a, 0x0000, 0x001e }, 0x0050 }, + { { 0x0000, 0x0000, 0x000a }, 0x0050 }, { { 0xfff6, 0x0000, 0x001e }, 0x0050 }, + { { 0x0000, 0x0000, 0x0028 }, 0x0050 }, { { 0x000a, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0046 }, 0x0050 }, { { 0x0000, 0x0000, 0xffce }, 0x0050 }, + } }; // Something related to the penguins in Sherbet Land, not sure of its exact nature -SplineData D_800E659C = { - 0x0018, - { - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffec }, 0x0050 }, - {{ 0x000e, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x000e, 0x0000, 0x000e }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0014 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0x000e }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffec }, 0x0050 }, - {{ 0x000e, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x000e, 0x0000, 0x000e }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0014 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0x000e }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffec }, 0x0050 }, - {{ 0x000e, 0x0000, 0xfff2 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x000e, 0x0000, 0x000e }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0014 }, 0x0050 }, - {{ 0xfff2, 0x0000, 0x000e }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - } -}; +SplineData D_800E659C = { 0x0018, + { + { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, { { 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffec }, 0x0050 }, { { 0x000e, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, { { 0x000e, 0x0000, 0x000e }, 0x0050 }, + { { 0x0000, 0x0000, 0x0014 }, 0x0050 }, { { 0xfff2, 0x0000, 0x000e }, 0x0050 }, + { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, { { 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffec }, 0x0050 }, { { 0x000e, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, { { 0x000e, 0x0000, 0x000e }, 0x0050 }, + { { 0x0000, 0x0000, 0x0014 }, 0x0050 }, { { 0xfff2, 0x0000, 0x000e }, 0x0050 }, + { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, { { 0xfff2, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffec }, 0x0050 }, { { 0x000e, 0x0000, 0xfff2 }, 0x0050 }, + { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, { { 0x000e, 0x0000, 0x000e }, 0x0050 }, + { { 0x0000, 0x0000, 0x0014 }, 0x0050 }, { { 0xfff2, 0x0000, 0x000e }, 0x0050 }, + { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, + } }; // Something related to the penguins in Sherbet Land, not sure of its exact nature -SplineData D_800E6668 = { - 0x0016, - { - {{ 0x0005, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0005, 0x0000, 0x0014 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffe2 }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffe2 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x001e }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x001e }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffe2 }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffe2 }, 0x0050 }, - {{ 0x0014, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0xffe2 }, 0x0050 }, - {{ 0xffec, 0x0000, 0x0000 }, 0x0050 }, - {{ 0x0000, 0x0000, 0x0014 }, 0x0050 }, - {{ 0x0005, 0x0000, 0x001e }, 0x0050 }, - {{ 0x0005, 0x0000, 0x0028 }, 0x0050 }, - {{ 0x0005, 0x0000, 0x0032 }, 0x0050 }, - {{ 0x0005, 0x0000, 0x0032 }, 0x0050 }, - } -}; +SplineData D_800E6668 = { 0x0016, + { + { { 0x0005, 0x0000, 0x0032 }, 0x0050 }, { { 0x0005, 0x0000, 0x0014 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0000 }, 0x0050 }, { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffe2 }, 0x0050 }, { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffe2 }, 0x0050 }, { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0x001e }, 0x0050 }, { { 0xffec, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0000, 0x0000, 0x001e }, 0x0050 }, { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffe2 }, 0x0050 }, { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffe2 }, 0x0050 }, { { 0x0014, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0xffe2 }, 0x0050 }, { { 0xffec, 0x0000, 0x0000 }, 0x0050 }, + { { 0x0000, 0x0000, 0x0014 }, 0x0050 }, { { 0x0005, 0x0000, 0x001e }, 0x0050 }, + { { 0x0005, 0x0000, 0x0028 }, 0x0050 }, { { 0x0005, 0x0000, 0x0032 }, 0x0050 }, + { { 0x0005, 0x0000, 0x0032 }, 0x0050 }, + } }; // Appears to be unused // Note the use of the plain SplineData type here. Since these are pointers, we don't care // about their internal array size -SplineData *D_800E6724[] = { &D_800E641C, &D_800E64D8 }; +SplineData* D_800E6724[] = { &D_800E641C, &D_800E64D8 }; -SplineData *D_800E672C[] = { &D_800E659C, &D_800E6668 }; +SplineData* D_800E672C[] = { &D_800E659C, &D_800E6668 }; // I believe they're the positions of the static neon signs in rainbow road Vec3f D_800E6734[] = { - { 1443.0, 1044.0, -5478.0 }, - { 1678.0, 1012.0, -4840.0 }, - { -3924.0, 921.0, 2566.0 }, - { -3311.0, 790.0, 3524.0 }, - { -1284.0, 1341.0, 4527.0 }, - { 2268.0, 1041.0, 4456.0 }, - { 2820.0, 1109.0, 1985.0 }, + { 1443.0, 1044.0, -5478.0 }, { 1678.0, 1012.0, -4840.0 }, { -3924.0, 921.0, 2566.0 }, { -3311.0, 790.0, 3524.0 }, + { -1284.0, 1341.0, 4527.0 }, { 2268.0, 1041.0, 4456.0 }, { 2820.0, 1109.0, 1985.0 }, }; // This should really be `extern Vec3s gTorchSpawns[];` s16 gTorchSpawns[] = { - 0xfda6, 0xffa0, 0x0068, - 0xfd1f, 0xffa1, 0x0136, - 0xfcb0, 0xffa6, 0x021d, - 0xfca3, 0xffb0, 0x0302, - 0xfd43, 0xffc4, 0x03b0, - 0xfe52, 0xffd8, 0x039c, - 0xff25, 0xffed, 0x0320, - 0xffca, 0xfff8, 0x0270, -}; - -SplineData D_800E67B8 = { - 0x000d, - { - {{ 0x0096, 0x00cc, 0xfe0c }, 0x0014 }, - {{ 0x0064, 0x0068, 0xfed4 }, 0x0014 }, - {{ 0x0032, 0x0036, 0xff9c }, 0x0028 }, - {{ 0x0004, 0x000b, 0xfff2 }, 0x0028 }, - {{ 0x0004, 0x0010, 0xfff6 }, 0x001e }, - {{ 0x0004, 0x000e, 0xfff8 }, 0x001e }, - {{ 0x0004, 0x0010, 0xfffa }, 0x001e }, - {{ 0x0004, 0x000e, 0xfffc }, 0x0032 }, - {{ 0x0004, 0x0010, 0xfffe }, 0x0032 }, - {{ 0x0004, 0x000e, 0x0000 }, 0x0032 }, - {{ 0xfff6, 0x0010, 0x000a }, 0x0028 }, - {{ 0xffce, 0x002c, 0x0064 }, 0x0000 }, - {{ 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, - {{ 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, - {{ 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, - } -}; + 0xfda6, 0xffa0, 0x0068, 0xfd1f, 0xffa1, 0x0136, 0xfcb0, 0xffa6, 0x021d, 0xfca3, 0xffb0, 0x0302, + 0xfd43, 0xffc4, 0x03b0, 0xfe52, 0xffd8, 0x039c, 0xff25, 0xffed, 0x0320, 0xffca, 0xfff8, 0x0270, +}; + +SplineData D_800E67B8 = { 0x000d, + { + { { 0x0096, 0x00cc, 0xfe0c }, 0x0014 }, + { { 0x0064, 0x0068, 0xfed4 }, 0x0014 }, + { { 0x0032, 0x0036, 0xff9c }, 0x0028 }, + { { 0x0004, 0x000b, 0xfff2 }, 0x0028 }, + { { 0x0004, 0x0010, 0xfff6 }, 0x001e }, + { { 0x0004, 0x000e, 0xfff8 }, 0x001e }, + { { 0x0004, 0x0010, 0xfffa }, 0x001e }, + { { 0x0004, 0x000e, 0xfffc }, 0x0032 }, + { { 0x0004, 0x0010, 0xfffe }, 0x0032 }, + { { 0x0004, 0x000e, 0x0000 }, 0x0032 }, + { { 0xfff6, 0x0010, 0x000a }, 0x0028 }, + { { 0xffce, 0x002c, 0x0064 }, 0x0000 }, + { { 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, + { { 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, + { { 0xfc19, 0x03eb, 0x01f4 }, 0x0000 }, + } }; // Appears to be related to Lakitu waving the checkered flag -SplineData D_800E6834 = { - 0x0014, - { - {{ 0x0014, 0x0012, 0x001e }, 0x0028 }, - {{ 0x0000, 0x0012, 0x0014 }, 0x0028 }, - {{ 0xffec, 0x0012, 0x000a }, 0x0028 }, - {{ 0x0000, 0x0012, 0x0000 }, 0x0028 }, - {{ 0x0014, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0xffe2 }, 0x0028 }, - {{ 0x0014, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0x001e }, 0x0028 }, - {{ 0xffec, 0x000b, 0x0032 }, 0x0028 }, - {{ 0x0000, 0x0012, 0x001e }, 0x0028 }, - {{ 0x0014, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0xffe2 }, 0x0028 }, - {{ 0x0014, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0xffe2 }, 0x0028 }, - {{ 0xffec, 0x000b, 0x0000 }, 0x0028 }, - {{ 0x0000, 0x0012, 0x001e }, 0x0028 }, - {{ 0x0014, 0x0012, 0x001e }, 0x0028 }, - } -}; +SplineData D_800E6834 = { 0x0014, + { + { { 0x0014, 0x0012, 0x001e }, 0x0028 }, { { 0x0000, 0x0012, 0x0014 }, 0x0028 }, + { { 0xffec, 0x0012, 0x000a }, 0x0028 }, { { 0x0000, 0x0012, 0x0000 }, 0x0028 }, + { { 0x0014, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0xffe2 }, 0x0028 }, + { { 0xffec, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0xffe2 }, 0x0028 }, + { { 0x0014, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0x001e }, 0x0028 }, + { { 0xffec, 0x000b, 0x0032 }, 0x0028 }, { { 0x0000, 0x0012, 0x001e }, 0x0028 }, + { { 0x0014, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0xffe2 }, 0x0028 }, + { { 0xffec, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0xffe2 }, 0x0028 }, + { { 0x0014, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0xffe2 }, 0x0028 }, + { { 0xffec, 0x000b, 0x0000 }, 0x0028 }, { { 0x0000, 0x0012, 0x001e }, 0x0028 }, + { { 0x0014, 0x0012, 0x001e }, 0x0028 }, + } }; // Unused struct? -SplineData D_800E68E0 = { - 0x000c, - { - {{ 0x001e, 0x0018, 0x0078 }, 0x000a }, - {{ 0x0014, 0x0013, 0x0050 }, 0x000a }, - {{ 0x000a, 0x000e, 0x0032 }, 0x000a }, - {{ 0x0005, 0x000d, 0x0014 }, 0x001e }, - {{ 0x0000, 0x000d ,0x000a }, 0x001e }, - {{ 0x0000, 0x000d ,0x0000 }, 0x001e }, - {{ 0x0000, 0x000e, 0xfffb }, 0x000a }, - {{ 0x0000, 0x0010, 0xfff6 }, 0x000a }, - {{ 0x0000, 0x001d, 0xffce }, 0x000a }, - {{ 0x0000, 0x0036, 0xff9c }, 0x000a }, - {{ 0x0000, 0x0068, 0xff38 }, 0x0000 }, - {{ 0x0000, 0x00cc, 0xfe0c }, 0x0000 }, - {{ 0x0000, 0x00cc, 0xfe0c }, 0x0000 }, - } -}; +SplineData D_800E68E0 = { 0x000c, + { + { { 0x001e, 0x0018, 0x0078 }, 0x000a }, + { { 0x0014, 0x0013, 0x0050 }, 0x000a }, + { { 0x000a, 0x000e, 0x0032 }, 0x000a }, + { { 0x0005, 0x000d, 0x0014 }, 0x001e }, + { { 0x0000, 0x000d, 0x000a }, 0x001e }, + { { 0x0000, 0x000d, 0x0000 }, 0x001e }, + { { 0x0000, 0x000e, 0xfffb }, 0x000a }, + { { 0x0000, 0x0010, 0xfff6 }, 0x000a }, + { { 0x0000, 0x001d, 0xffce }, 0x000a }, + { { 0x0000, 0x0036, 0xff9c }, 0x000a }, + { { 0x0000, 0x0068, 0xff38 }, 0x0000 }, + { { 0x0000, 0x00cc, 0xfe0c }, 0x0000 }, + { { 0x0000, 0x00cc, 0xfe0c }, 0x0000 }, + } }; // Appears to be related to Lakitu Second Lap animation -SplineData D_800E694C = { - 0x000b, - { - {{ 0x0032, 0x0014, 0x0050 }, 0x000a }, - {{ 0x0014, 0x0013, 0x0028 }, 0x000a }, - {{ 0x0000, 0x0012, 0x001e }, 0x000a }, - {{ 0xfff8, 0x0011, 0x0014 }, 0x001e }, - {{ 0xfff4, 0x0010, 0x000a }, 0x001e }, - {{ 0x0000, 0x000f, 0x0000 }, 0x001e }, - {{ 0x000c, 0x000f, 0x000a }, 0x000a }, - {{ 0x0008, 0x0010, 0x0014 }, 0x000a }, - {{ 0x0000, 0x0011, 0x001e }, 0x000a }, - {{ 0xffec, 0x0012, 0x0028 }, 0x000a }, - {{ 0xffc4, 0x0013, 0x0064 }, 0x000a }, - {{ 0xffc4, 0x0013, 0x0064 }, 0x000a }, - } -}; +SplineData D_800E694C = { 0x000b, + { + { { 0x0032, 0x0014, 0x0050 }, 0x000a }, + { { 0x0014, 0x0013, 0x0028 }, 0x000a }, + { { 0x0000, 0x0012, 0x001e }, 0x000a }, + { { 0xfff8, 0x0011, 0x0014 }, 0x001e }, + { { 0xfff4, 0x0010, 0x000a }, 0x001e }, + { { 0x0000, 0x000f, 0x0000 }, 0x001e }, + { { 0x000c, 0x000f, 0x000a }, 0x000a }, + { { 0x0008, 0x0010, 0x0014 }, 0x000a }, + { { 0x0000, 0x0011, 0x001e }, 0x000a }, + { { 0xffec, 0x0012, 0x0028 }, 0x000a }, + { { 0xffc4, 0x0013, 0x0064 }, 0x000a }, + { { 0xffc4, 0x0013, 0x0064 }, 0x000a }, + } }; // Appears to be related to Lakitu Reverse animation -SplineData D_800E69B0 = { - 0x0007, - { - {{ 0x001e, 0x000e, 0x0032 }, 0x0028 }, - {{ 0x000a, 0x0010, 0x0014 }, 0x0028 }, - {{ 0x0005, 0x0011, 0x000a }, 0x003c }, - {{ 0x0002, 0x0012, 0x0000 }, 0x003c }, - {{ 0x0000, 0x0012, 0x0000 }, 0x003c }, - {{ 0x0000, 0x0012, 0x0000 }, 0x0000 }, - {{ 0x0000, 0x0012, 0x0000 }, 0x0000 }, - {{ 0x0000, 0x0012, 0x0000 }, 0x0000 }, - } -}; +SplineData D_800E69B0 = { 0x0007, + { + { { 0x001e, 0x000e, 0x0032 }, 0x0028 }, + { { 0x000a, 0x0010, 0x0014 }, 0x0028 }, + { { 0x0005, 0x0011, 0x000a }, 0x003c }, + { { 0x0002, 0x0012, 0x0000 }, 0x003c }, + { { 0x0000, 0x0012, 0x0000 }, 0x003c }, + { { 0x0000, 0x0012, 0x0000 }, 0x0000 }, + { { 0x0000, 0x0012, 0x0000 }, 0x0000 }, + { { 0x0000, 0x0012, 0x0000 }, 0x0000 }, + } }; // Might be related to Lakitu doing the countdown? -SplineData D_800E69F4 = { - 0x0007, - { - {{ 0x0000, 0x0012, 0xfffb }, 0x0014 }, - {{ 0x0000, 0x0012, 0xfff6 }, 0x0014 }, - {{ 0x0000, 0x0012, 0x0005 }, 0x0010 }, - {{ 0xfff6, 0x0017, 0x000a }, 0x000a }, - {{ 0xfff1, 0x0017, 0x0014 }, 0x000a }, - {{ 0xffec, 0x001c, 0x001e }, 0x0000 }, - {{ 0xffe2, 0x0026, 0x00c8 }, 0x0000 }, - {{ 0xffe2, 0x0026, 0x00c8 }, 0x0000 }, - } -}; +SplineData D_800E69F4 = { 0x0007, + { + { { 0x0000, 0x0012, 0xfffb }, 0x0014 }, + { { 0x0000, 0x0012, 0xfff6 }, 0x0014 }, + { { 0x0000, 0x0012, 0x0005 }, 0x0010 }, + { { 0xfff6, 0x0017, 0x000a }, 0x000a }, + { { 0xfff1, 0x0017, 0x0014 }, 0x000a }, + { { 0xffec, 0x001c, 0x001e }, 0x0000 }, + { { 0xffe2, 0x0026, 0x00c8 }, 0x0000 }, + { { 0xffe2, 0x0026, 0x00c8 }, 0x0000 }, + } }; CloudData gLuigiRacewayClouds[] = { - { 0x04fa, 0xfff6, 0x0096, 0x0000 }, - { 0x4718, 0x003c, 0x007d, 0x0000 }, - { 0x5550, 0x0046, 0x0096, 0x0000 }, - { 0x954c, 0x002d, 0x004b, 0x0000 }, - { 0xae2e, 0x0028, 0x004b, 0x0000 }, - { 0x0e38, 0x001e, 0x0032, 0x0001 }, - { 0xa384, 0x0032, 0x0064, 0x0001 }, - { 0xd548, 0x001e, 0x0032, 0x0001 }, - { 0x31c4, 0x0032, 0x0064, 0x0002 }, - { 0x7ff8, 0x0037, 0x0064, 0x0002 }, - { 0xaaa0, 0x004b, 0x0096, 0x0002 }, - { 0xb8d8, 0xfff9, 0x0064, 0x0002 }, - { 0xee2a, 0x003c, 0x0050, 0x0002 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x04fa, 0xfff6, 0x0096, 0x0000 }, { 0x4718, 0x003c, 0x007d, 0x0000 }, { 0x5550, 0x0046, 0x0096, 0x0000 }, + { 0x954c, 0x002d, 0x004b, 0x0000 }, { 0xae2e, 0x0028, 0x004b, 0x0000 }, { 0x0e38, 0x001e, 0x0032, 0x0001 }, + { 0xa384, 0x0032, 0x0064, 0x0001 }, { 0xd548, 0x001e, 0x0032, 0x0001 }, { 0x31c4, 0x0032, 0x0064, 0x0002 }, + { 0x7ff8, 0x0037, 0x0064, 0x0002 }, { 0xaaa0, 0x004b, 0x0096, 0x0002 }, { 0xb8d8, 0xfff9, 0x0064, 0x0002 }, + { 0xee2a, 0x003c, 0x0050, 0x0002 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; CloudData gYoshiValleyMooMooFarmClouds[] = { - { 0x00b6, 0x0050, 0x0041, 0x0000 }, - { 0x4718, 0x003c, 0x0064, 0x0000 }, - { 0x18e2, 0x0032, 0x004b, 0x0000 }, - { 0x7ff8, 0x0037, 0x0064, 0x0000 }, - { 0x9ff6, 0x002d, 0x0032, 0x0000 }, - { 0xc710, 0x0046, 0x003c, 0x0000 }, - { 0x0aaa, 0x001e, 0x0064, 0x0001 }, - { 0x5c6c, 0x0046, 0x0046, 0x0001 }, - { 0x31c4, 0x0028, 0x0050, 0x0002 }, - { 0xf1b8, 0x0028, 0x004b, 0x0002 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x00b6, 0x0050, 0x0041, 0x0000 }, { 0x4718, 0x003c, 0x0064, 0x0000 }, { 0x18e2, 0x0032, 0x004b, 0x0000 }, + { 0x7ff8, 0x0037, 0x0064, 0x0000 }, { 0x9ff6, 0x002d, 0x0032, 0x0000 }, { 0xc710, 0x0046, 0x003c, 0x0000 }, + { 0x0aaa, 0x001e, 0x0064, 0x0001 }, { 0x5c6c, 0x0046, 0x0046, 0x0001 }, { 0x31c4, 0x0028, 0x0050, 0x0002 }, + { 0xf1b8, 0x0028, 0x004b, 0x0002 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; CloudData gKoopaTroopaBeachClouds[] = { - { 0x1554, 0x001e, 0x00c8, 0x0000 }, - { 0xce2c, 0x001e, 0x00c8, 0x0000 }, - { 0xa384, 0x001e, 0x00c8, 0x0001 }, - { 0x070c, 0x001e, 0x00c8, 0x0001 }, - { 0x4718, 0x001e, 0x00c8, 0x0002 }, - { 0x8714, 0x001e, 0x00c8, 0x0003 }, + { 0x1554, 0x001e, 0x00c8, 0x0000 }, { 0xce2c, 0x001e, 0x00c8, 0x0000 }, { 0xa384, 0x001e, 0x00c8, 0x0001 }, + { 0x070c, 0x001e, 0x00c8, 0x0001 }, { 0x4718, 0x001e, 0x00c8, 0x0002 }, { 0x8714, 0x001e, 0x00c8, 0x0003 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; CloudData gRoyalRacewayClouds[] = { - { 0x60b0, 0x003c, 0x007d, 0x0000 }, - { 0xb8d8, 0x0037, 0x0064, 0x0000 }, - { 0xd548, 0x000a, 0x0082, 0x0000 }, - { 0xf1b8, 0x0023, 0x0064, 0x0000 }, - { 0x04fa, 0x0046, 0x0096, 0x0001 }, - { 0x4718, 0x003c, 0x007d, 0x0001 }, - { 0x954c, 0x002d, 0x004b, 0x0001 }, - { 0x0e38, 0x001e, 0x0032, 0x0002 }, - { 0x8880, 0x0046, 0x0096, 0x0002 }, - { 0x31c4, 0x0032, 0x0064, 0x0003 }, - { 0x5056, 0x0028, 0x004b, 0x0003 }, - { 0x7ff8, 0x0037, 0x0064, 0x0003 }, - { 0xaaa0, 0x004b, 0x0096, 0x0003 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x60b0, 0x003c, 0x007d, 0x0000 }, { 0xb8d8, 0x0037, 0x0064, 0x0000 }, { 0xd548, 0x000a, 0x0082, 0x0000 }, + { 0xf1b8, 0x0023, 0x0064, 0x0000 }, { 0x04fa, 0x0046, 0x0096, 0x0001 }, { 0x4718, 0x003c, 0x007d, 0x0001 }, + { 0x954c, 0x002d, 0x004b, 0x0001 }, { 0x0e38, 0x001e, 0x0032, 0x0002 }, { 0x8880, 0x0046, 0x0096, 0x0002 }, + { 0x31c4, 0x0032, 0x0064, 0x0003 }, { 0x5056, 0x0028, 0x004b, 0x0003 }, { 0x7ff8, 0x0037, 0x0064, 0x0003 }, + { 0xaaa0, 0x004b, 0x0096, 0x0003 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; CloudData gSherbetLandClouds[] = { - { 0x4718, 0x003c, 0x007d, 0x0000 }, - { 0x5550, 0x0046, 0x0096, 0x0000 }, - { 0x954c, 0x002d, 0x004b, 0x0000 }, - { 0xf546, 0x0028, 0x004b, 0x0000 }, - { 0x0e38, 0x001e, 0x0032, 0x0001 }, - { 0x0222, 0x0032, 0x0064, 0x0002 }, - { 0x1ffe, 0x0028, 0x004b, 0x0002 }, - { 0x31c4, 0x0032, 0x0064, 0x0002 }, - { 0x7ff8, 0x0037, 0x0064, 0x0002 }, - { 0xaaa0, 0x004b, 0x0096, 0x0002 }, - { 0xb8d8, 0x0037, 0x0064, 0x0002 }, - { 0xdff2, 0x001e, 0x0032, 0x0002 }, + { 0x4718, 0x003c, 0x007d, 0x0000 }, { 0x5550, 0x0046, 0x0096, 0x0000 }, { 0x954c, 0x002d, 0x004b, 0x0000 }, + { 0xf546, 0x0028, 0x004b, 0x0000 }, { 0x0e38, 0x001e, 0x0032, 0x0001 }, { 0x0222, 0x0032, 0x0064, 0x0002 }, + { 0x1ffe, 0x0028, 0x004b, 0x0002 }, { 0x31c4, 0x0032, 0x0064, 0x0002 }, { 0x7ff8, 0x0037, 0x0064, 0x0002 }, + { 0xaaa0, 0x004b, 0x0096, 0x0002 }, { 0xb8d8, 0x0037, 0x0064, 0x0002 }, { 0xdff2, 0x001e, 0x0032, 0x0002 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; CloudData gKalimariDesertClouds[] = { - { 0x1ffe, 0x0028, 0x004b, 0x0000 }, - { 0x60b0, 0x003c, 0x007d, 0x0000 }, - { 0xb8d8, 0x0037, 0x0064, 0x0000 }, - { 0x4718, 0x003c, 0x007d, 0x0001 }, - { 0x954c, 0x002d, 0x004b, 0x0001 }, - { 0xf546, 0x0028, 0x004b, 0x0001 }, - { 0x0e38, 0x001e, 0x0032, 0x0002 }, - { 0xa384, 0x0032, 0x0064, 0x0002 }, - { 0xddd0, 0x0046, 0x0096, 0x0002 }, - { 0x0222, 0x0032, 0x0064, 0x0003 }, - { 0x31c4, 0x0032, 0x0064, 0x0003 }, - { 0x7ff8, 0x0037, 0x0064, 0x0003 }, - { 0xaaa0, 0x004b, 0x0096, 0x0003 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x1ffe, 0x0028, 0x004b, 0x0000 }, { 0x60b0, 0x003c, 0x007d, 0x0000 }, { 0xb8d8, 0x0037, 0x0064, 0x0000 }, + { 0x4718, 0x003c, 0x007d, 0x0001 }, { 0x954c, 0x002d, 0x004b, 0x0001 }, { 0xf546, 0x0028, 0x004b, 0x0001 }, + { 0x0e38, 0x001e, 0x0032, 0x0002 }, { 0xa384, 0x0032, 0x0064, 0x0002 }, { 0xddd0, 0x0046, 0x0096, 0x0002 }, + { 0x0222, 0x0032, 0x0064, 0x0003 }, { 0x31c4, 0x0032, 0x0064, 0x0003 }, { 0x7ff8, 0x0037, 0x0064, 0x0003 }, + { 0xaaa0, 0x004b, 0x0096, 0x0003 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; StarData gToadsTurnpikeRainbowRoadStars[] = { - { 0x0222, 0x0032, 0x000a, 0x0000 }, - { 0x04fa, 0x0046, 0x000f, 0x0000 }, - { 0x093e, 0x000a, 0x0014, 0x0000 }, - { 0x0e38, 0x001e, 0x000f, 0x0000 }, - { 0x11c6, 0x0028, 0x0014, 0x0000 }, - { 0x1554, 0xfff6, 0x000f, 0x0000 }, - { 0x1ddc, 0x000a, 0x0011, 0x0000 }, - { 0x1ffe, 0x0030, 0x0019, 0x0000 }, - { 0x271a, 0x0046, 0x0014, 0x0000 }, - { 0x27d0, 0xfff1, 0x0016, 0x0000 }, - { 0x2c14, 0x0014, 0x000f, 0x0000 }, - { 0x31c4, 0x0032, 0x0016, 0x0000 }, - { 0x327a, 0x0000, 0x000a, 0x0000 }, - { 0x3a4c, 0x000f, 0x0016, 0x0000 }, - { 0x3ffc, 0x002d, 0x0011, 0x0000 }, - { 0x40b2, 0xffdd, 0x0016, 0x0000 }, - { 0x4440, 0x0037, 0x0014, 0x0000 }, - { 0x4718, 0x003c, 0x000c, 0x0000 }, - { 0x4718, 0x0050, 0x000c, 0x0000 }, - { 0x4aa6, 0xfff6, 0x000f, 0x0000 }, - { 0x5056, 0x0028, 0x000a, 0x0000 }, - { 0x5550, 0x0046, 0x000f, 0x0000 }, - { 0x60b0, 0x003c, 0x0016, 0x0000 }, - { 0x6388, 0xffdd, 0x0019, 0x0000 }, - { 0x64f4, 0x0023, 0x0011, 0x0000 }, - { 0x6aa4, 0x004b, 0x0014, 0x0000 }, - { 0x7054, 0x002d, 0x0019, 0x0000 }, - { 0x7498, 0x0014, 0x0012, 0x0000 }, - { 0x7bb4, 0xfff1, 0x001b, 0x0000 }, - { 0x7ff8, 0x0037, 0x000a, 0x0000 }, - { 0x8386, 0x0041, 0x0014, 0x0000 }, - { 0x8880, 0x0046, 0x000f, 0x0000 }, - { 0x954c, 0x002d, 0x0011, 0x0000 }, - { 0x98da, 0x003c, 0x000f, 0x0000 }, - { 0x9dd4, 0x0000, 0x000a, 0x0000 }, - { 0xa384, 0x0046, 0x000f, 0x0000 }, - { 0xa43a, 0x0032, 0x0017, 0x0000 }, - { 0xaaa0, 0x004b, 0x000f, 0x0000 }, - { 0xae2e, 0x0028, 0x0011, 0x0000 }, - { 0xb1bc, 0x0023, 0x0014, 0x0000 }, - { 0xb8d8, 0xfff1, 0x000a, 0x0000 }, - { 0xbc66, 0xffe2, 0x000f, 0x0000 }, - { 0xc710, 0x001e, 0x000c, 0x0000 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, + { 0x0222, 0x0032, 0x000a, 0x0000 }, { 0x04fa, 0x0046, 0x000f, 0x0000 }, { 0x093e, 0x000a, 0x0014, 0x0000 }, + { 0x0e38, 0x001e, 0x000f, 0x0000 }, { 0x11c6, 0x0028, 0x0014, 0x0000 }, { 0x1554, 0xfff6, 0x000f, 0x0000 }, + { 0x1ddc, 0x000a, 0x0011, 0x0000 }, { 0x1ffe, 0x0030, 0x0019, 0x0000 }, { 0x271a, 0x0046, 0x0014, 0x0000 }, + { 0x27d0, 0xfff1, 0x0016, 0x0000 }, { 0x2c14, 0x0014, 0x000f, 0x0000 }, { 0x31c4, 0x0032, 0x0016, 0x0000 }, + { 0x327a, 0x0000, 0x000a, 0x0000 }, { 0x3a4c, 0x000f, 0x0016, 0x0000 }, { 0x3ffc, 0x002d, 0x0011, 0x0000 }, + { 0x40b2, 0xffdd, 0x0016, 0x0000 }, { 0x4440, 0x0037, 0x0014, 0x0000 }, { 0x4718, 0x003c, 0x000c, 0x0000 }, + { 0x4718, 0x0050, 0x000c, 0x0000 }, { 0x4aa6, 0xfff6, 0x000f, 0x0000 }, { 0x5056, 0x0028, 0x000a, 0x0000 }, + { 0x5550, 0x0046, 0x000f, 0x0000 }, { 0x60b0, 0x003c, 0x0016, 0x0000 }, { 0x6388, 0xffdd, 0x0019, 0x0000 }, + { 0x64f4, 0x0023, 0x0011, 0x0000 }, { 0x6aa4, 0x004b, 0x0014, 0x0000 }, { 0x7054, 0x002d, 0x0019, 0x0000 }, + { 0x7498, 0x0014, 0x0012, 0x0000 }, { 0x7bb4, 0xfff1, 0x001b, 0x0000 }, { 0x7ff8, 0x0037, 0x000a, 0x0000 }, + { 0x8386, 0x0041, 0x0014, 0x0000 }, { 0x8880, 0x0046, 0x000f, 0x0000 }, { 0x954c, 0x002d, 0x0011, 0x0000 }, + { 0x98da, 0x003c, 0x000f, 0x0000 }, { 0x9dd4, 0x0000, 0x000a, 0x0000 }, { 0xa384, 0x0046, 0x000f, 0x0000 }, + { 0xa43a, 0x0032, 0x0017, 0x0000 }, { 0xaaa0, 0x004b, 0x000f, 0x0000 }, { 0xae2e, 0x0028, 0x0011, 0x0000 }, + { 0xb1bc, 0x0023, 0x0014, 0x0000 }, { 0xb8d8, 0xfff1, 0x000a, 0x0000 }, { 0xbc66, 0xffe2, 0x000f, 0x0000 }, + { 0xc710, 0x001e, 0x000c, 0x0000 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, }; StarData gWarioStadiumStars[] = { - { 0x0222, 0x0050, 0x000a, 0x0000 }, - { 0x04fa, 0x0064, 0x000f, 0x0000 }, - { 0x093e, 0x005a, 0x0014, 0x0000 }, - { 0x0e38, 0x003c, 0x000f, 0x0000 }, - { 0x11c6, 0x0046, 0x0014, 0x0000 }, - { 0x1554, 0x0078, 0x000f, 0x0000 }, - { 0x1c70, 0x001e, 0x0011, 0x0000 }, - { 0x1ffe, 0x0046, 0x0011, 0x0000 }, - { 0x271a, 0x0064, 0x0014, 0x0000 }, - { 0x2c14, 0x0032, 0x000f, 0x0000 }, - { 0x31c4, 0x0050, 0x000a, 0x0000 }, - { 0x3996, 0x0019, 0x000c, 0x0000 }, - { 0x3a4c, 0x0037, 0x0016, 0x0000 }, - { 0x3bb8, 0x0019, 0x000c, 0x0000 }, - { 0x3ffc, 0x004b, 0x0011, 0x0000 }, - { 0x4440, 0x0055, 0x0014, 0x0000 }, - { 0x4718, 0x005a, 0x000c, 0x0000 }, - { 0x4aa6, 0x003c, 0x000f, 0x0000 }, - { 0x5056, 0x0046, 0x000a, 0x0000 }, - { 0x5550, 0x0064, 0x000f, 0x0000 }, - { 0x60b0, 0x005a, 0x0016, 0x0000 }, - { 0x64f4, 0x0041, 0x0014, 0x0000 }, - { 0x6aa4, 0x0069, 0x0014, 0x0000 }, - { 0x7054, 0x004b, 0x0014, 0x0000 }, - { 0x71c0, 0x0078, 0x0012, 0x0000 }, - { 0x7498, 0x003c, 0x0012, 0x0000 }, - { 0x7ff8, 0x0055, 0x000a, 0x0000 }, - { 0x8714, 0x0073, 0x000a, 0x0000 }, - { 0x8880, 0x0064, 0x000f, 0x0000 }, - { 0x954c, 0x004b, 0x0011, 0x0000 }, - { 0x98da, 0x003c, 0x000f, 0x0000 }, - { 0x9dd4, 0x0032, 0x000a, 0x0000 }, - { 0xa384, 0x0050, 0x000a, 0x0000 }, - { 0xa43a, 0x006e, 0x000a, 0x0000 }, - { 0xaaa0, 0x0069, 0x000f, 0x0000 }, - { 0xae2e, 0x0046, 0x0011, 0x0000 }, - { 0xb1bc, 0x0041, 0x0014, 0x0000 }, - { 0xb8d8, 0x0055, 0x000a, 0x0000 }, - { 0xbc66, 0x003c, 0x000f, 0x0000 }, - { 0xc710, 0x0064, 0x000a, 0x0000 }, - { 0xffff, 0x0000, 0x0000, 0x0000 }, - { 0x0000, 0x0000, 0x0000, 0x0000 }, + { 0x0222, 0x0050, 0x000a, 0x0000 }, { 0x04fa, 0x0064, 0x000f, 0x0000 }, { 0x093e, 0x005a, 0x0014, 0x0000 }, + { 0x0e38, 0x003c, 0x000f, 0x0000 }, { 0x11c6, 0x0046, 0x0014, 0x0000 }, { 0x1554, 0x0078, 0x000f, 0x0000 }, + { 0x1c70, 0x001e, 0x0011, 0x0000 }, { 0x1ffe, 0x0046, 0x0011, 0x0000 }, { 0x271a, 0x0064, 0x0014, 0x0000 }, + { 0x2c14, 0x0032, 0x000f, 0x0000 }, { 0x31c4, 0x0050, 0x000a, 0x0000 }, { 0x3996, 0x0019, 0x000c, 0x0000 }, + { 0x3a4c, 0x0037, 0x0016, 0x0000 }, { 0x3bb8, 0x0019, 0x000c, 0x0000 }, { 0x3ffc, 0x004b, 0x0011, 0x0000 }, + { 0x4440, 0x0055, 0x0014, 0x0000 }, { 0x4718, 0x005a, 0x000c, 0x0000 }, { 0x4aa6, 0x003c, 0x000f, 0x0000 }, + { 0x5056, 0x0046, 0x000a, 0x0000 }, { 0x5550, 0x0064, 0x000f, 0x0000 }, { 0x60b0, 0x005a, 0x0016, 0x0000 }, + { 0x64f4, 0x0041, 0x0014, 0x0000 }, { 0x6aa4, 0x0069, 0x0014, 0x0000 }, { 0x7054, 0x004b, 0x0014, 0x0000 }, + { 0x71c0, 0x0078, 0x0012, 0x0000 }, { 0x7498, 0x003c, 0x0012, 0x0000 }, { 0x7ff8, 0x0055, 0x000a, 0x0000 }, + { 0x8714, 0x0073, 0x000a, 0x0000 }, { 0x8880, 0x0064, 0x000f, 0x0000 }, { 0x954c, 0x004b, 0x0011, 0x0000 }, + { 0x98da, 0x003c, 0x000f, 0x0000 }, { 0x9dd4, 0x0032, 0x000a, 0x0000 }, { 0xa384, 0x0050, 0x000a, 0x0000 }, + { 0xa43a, 0x006e, 0x000a, 0x0000 }, { 0xaaa0, 0x0069, 0x000f, 0x0000 }, { 0xae2e, 0x0046, 0x0011, 0x0000 }, + { 0xb1bc, 0x0041, 0x0014, 0x0000 }, { 0xb8d8, 0x0055, 0x000a, 0x0000 }, { 0xbc66, 0x003c, 0x000f, 0x0000 }, + { 0xc710, 0x0064, 0x000a, 0x0000 }, { 0xffff, 0x0000, 0x0000, 0x0000 }, { 0x0000, 0x0000, 0x0000, 0x0000 }, }; u8 D_800E6F30[][3] = { - { 0xc8, 0x01, 0x00 }, - { 0x00, 0x70, 0x01 }, - { 0x10, 0x79, 0x51 }, - { 0x00, 0x59, 0x70 }, - { 0x70, 0x55, 0x00 }, - { 0x7a, 0x7e, 0x00 }, - { 0x77, 0x2c, 0x24 }, - { 0x30, 0x14, 0x58 }, + { 0xc8, 0x01, 0x00 }, { 0x00, 0x70, 0x01 }, { 0x10, 0x79, 0x51 }, { 0x00, 0x59, 0x70 }, + { 0x70, 0x55, 0x00 }, { 0x7a, 0x7e, 0x00 }, { 0x77, 0x2c, 0x24 }, { 0x30, 0x14, 0x58 }, }; u8 D_800E6F48[][3] = { - { 0xdc, 0x00, 0x00 }, - { 0x00, 0x8c, 0x06 }, - { 0x00, 0x00, 0x51 }, - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x00 }, + { 0xdc, 0x00, 0x00 }, { 0x00, 0x8c, 0x06 }, { 0x00, 0x00, 0x51 }, { 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, }; |