Add segment_names.h

Set_get_bparam_changes

.gitignore

@@ -70,3 +70,48 @@ build/*
 !/sound/**/*custom*/**/*.aiff
 !/assets/**/*custom*.bin
 !/assets/**/*custom*/**/*.bin
+!/textures/crash_custom/*.png
+
+# Specific assets
+!/actors/breath_meter/breath_meter_*.png
+!/actors/coin/coin_*.ia8.png
+!/textures/segment2/light_quarter_circle.ia16.png
+!/textures/segment2/segment2.hud_char_j.rgba16.png
+!/textures/segment2/segment2.hud_char_q.rgba16.png
+!/textures/segment2/segment2.hud_char_v.rgba16.png
+!/textures/segment2/segment2.hud_char_x.rgba16.png
+!/textures/segment2/segment2.hud_char_z.rgba16.png
+!/textures/segment2/segment2.umlaut_us.rgba16.png
+!/textures/segment2/segment2.beta_key.rgba16.png
+!/textures/segment2/segment2.decimal_point.rgba16.png
+!/textures/segment2/segment2.exclamation.rgba16.png
+!/textures/segment2/segment2.double_exclamation.rgba16.png
+!/textures/segment2/segment2.question.rgba16.png
+!/textures/segment2/segment2.ampersand.rgba16.png
+!/textures/segment2/segment2.percent.rgba16.png
+!/textures/segment2/segment2.minus.rgba16.png
+!/textures/segment2/segment2.minus2.rgba16.png
+!/textures/segment2/segment2.yellow_coin.rgba16.png
+!/textures/segment2/segment2.blue_coin.rgba16.png
+!/textures/segment2/segment2.red_coin.rgba16.png
+!/textures/segment2/segment2.silver_coin.*.png
+!/textures/segment2/shadow_quarter_circle_64.ia8.png
+!/textures/segment2/shadow_quarter_square_64.ia8.png
+
+
+
+# libultra
+
+!/lib/*.a
+lib/libs2d_engine.a
+!/lib/gcclib/*.a
+!/lib/gcclib/divbreak/*.a
+!/lib/gcclib/nocheck/*.a
+!/lib/gcclib/trap/*.a
+!/lib/n64/*.a
+!/lib/ique/*.a
+
+!/lib/PR/hvqm/*.o
+
+# .orig files
+*.orig

.vscode/c_cpp_properties.json

@@ -0,0 +1,39 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/include/n64/**",
+                "${workspaceFolder}/include/**",
+                "${workspaceFolder}/textures/**",
+                "${workspaceFolder}/**"
+            ],
+            "forcedInclude": [
+                "${workspaceFolder}/include/types.h",
+                "${workspaceFolder}/include/n64/ultra64.h",
+                "${workspaceFolder}/include/sm64.h",
+                "${workspaceFolder}/include/config.h",
+                "${workspaceFolder}/include/make_const_nonconst.h",
+                "${workspaceFolder}/include/geo_commands.h",
+                "${workspaceFolder}/include/level_commands.h",
+                "${workspaceFolder}/include/segment_symbols.h",
+                "${workspaceFolder}/include/command_macros_base.h",
+                "${workspaceFolder}/include/object_constants.h"
+            ],
+            "defines": [
+                "TARGET_N64=1",
+                "VERSION_US=1",
+                "F3DEX_GBI_2=1",
+                "F3DZEX_GBI_2=1",
+                "F3DEX_GBI_SHARED=1",
+                "NON_MATCHING=1",
+                "AVOID_UB=1"
+            ],
+            "compilerPath": "/usr/bin/mips-linux-gnu-gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x64"
+        }
+    ],
+    "version": 4
+}

CHANGES

@@ -274,12 +274,12 @@ Refresh #7
 38.) Fix BBH texture (#908)
 
 Refresh #6
-1.) Make tools work on MinGW (#804) 
-2.) Document mario_misc (#628) 
-3.) add patch_libmalloc.py script to work around compiler crashes (#811) 
-4.) Label the coffins file. (#829) 
-5.) Convert enhancements into patches (#827) 
-6.) Document Tweester.inc.c (#840) 
+1.) Make tools work on MinGW (#804)
+2.) Document mario_misc (#628)
+3.) add patch_libmalloc.py script to work around compiler crashes (#811)
+4.) Label the coffins file. (#829)
+5.) Convert enhancements into patches (#827)
+6.) Document Tweester.inc.c (#840)
 7.) EU OK and cleanup EU (#782)
 
 Refresh #5
@@ -310,21 +310,21 @@ Refresh #4
 10.) Very minor white space fixes in Mario.c (#752)
 11.) Renamed GRAVITY to OBJ_PHYSICS (#755)
 12.) Use defined macros instead of literal values for interactions in behavior_data.c (#754)
-13.) iQue Player console detection + full support (#756) 
-14.) Fix Goddard Mario head for little endian etc. (#757) 
+13.) iQue Player console detection + full support (#756)
+14.) Fix Goddard Mario head for little endian etc. (#757)
 15.) Small bits of audio doc (#749)
-16.) Update diff script (#750) 
-17.) Nicer format for course/dialog text, enum for dialog IDs (#753) 
+16.) Update diff script (#750)
+17.) Nicer format for course/dialog text, enum for dialog IDs (#753)
 18.) first-diff: store most recent mtime during check (#759)
 19.) Use Lights1 struct for light values (#760)
-20.) Detect mips64-elf in diff.py (#761) 
-21.) Name display lists in gd renderer.c (#764) 
-22.) Document a variety of PU type crashes. (#765) 
-23.) Label object_behaviors. (#716) 
-24.) Update swoop.inc.c (#767) 
-25.) Label tilting_pyramid.inc.c (#768) 
-26.) Label red_coin.inc.c (#770) 
-27.) Use more level defines (#758) 
+20.) Detect mips64-elf in diff.py (#761)
+21.) Name display lists in gd renderer.c (#764)
+22.) Document a variety of PU type crashes. (#765)
+23.) Label object_behaviors. (#716)
+24.) Update swoop.inc.c (#767)
+25.) Label tilting_pyramid.inc.c (#768)
+26.) Label red_coin.inc.c (#770)
+27.) Use more level defines (#758)
 28.) Named Mario actions 6, 7, and 8 and noted causes of hands-free holding glitch (#769)
 
 Refresh #3
@@ -370,7 +370,7 @@ Changes from Refresh #1:
 6.) Merge ucode.bin and ucode_unk.bin
 7.) 64-bit fixes
 8.) [AUDIO] Match func_80316928
-9.) Documented bug in Tuxie's mother's code 
+9.) Documented bug in Tuxie's mother's code
 10.) [AUDIO] Slightly closer matching for process_level_music_dynamics
 11.) Name channel scripts in sequence 0
 12.) Nicer error message when sha1sum doesn't match

CODEOWNERS

@@ -0,0 +1,12 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+*       @Reonu
+*       @thecozies
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+
+# You can also use email addresses if you prefer.

Makefile.split

@@ -44,12 +44,12 @@ SEG_FILES := \
     $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \
     $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf)
 
-MIO0_FILES := \
-    $(SEGMENTS:%=$(BUILD_DIR)/bin/%.mio0) \
-    $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.mio0) \
-    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.mio0)
+YAY0_FILES := \
+    $(SEGMENTS:%=$(BUILD_DIR)/bin/%.szp) \
+    $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.szp) \
+    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp)
 
-MIO0_OBJ_FILES := $(MIO0_FILES:.mio0=.mio0.o)
+YAY0_OBJ_FILES := $(YAY0_FILES:.szp=.szp.o)
 
 
 # --------------------------------------
@@ -66,7 +66,7 @@ KING_BOBOMB_DIRS := king_bobomb water_bubble
 BOO_DIRS         := bookend book chair small_key mad_piano boo haunted_cage
 MR_I_DIRS        := mr_i_eyeball mr_i_iris swoop snufit dorrie scuttlebug
 HOOT_DIRS        := yellow_sphere_small hoot yoshi_egg thwomp bullet_bill heave_ho
-COINS_DIRS       := mist explosion butterfly coin warp_pipe door bowser_key flame blue_fish pebble leaves warp_collision mario_cap power_meter mushroom_1up star sand dirt transparent_star white_particle wooden_signpost tree
+COINS_DIRS       := mist explosion butterfly coin warp_pipe door bowser_key flame blue_fish pebble leaves mario_cap breath_meter power_meter mushroom_1up star sand dirt transparent_star white_particle wooden_signpost tree
 BUBBA_DIRS       := bubba wiggler wiggler_body_part lakitu_enemy spiny_egg spiny
 SKEETER_DIRS     := skeeter seaweed water_mine cyan_fish bub water_ring treasure_chest
 KLEPTO_DIRS      := klepto eyerok pokey tornado
@@ -76,7 +76,7 @@ MOLE_DIRS        := monty_mole_hole monty_mole smoke ukiki fwoosh
 LAKITU_DIRS      := lakitu_cameraman toad mips boo_castle
 PEACH_DIRS       := bird peach yoshi
 BOWSER_DIRS      := bowser_flame impact_ring yellow_sphere bowser bomb impact_smoke
-MARIO_DIRS       := mario bubble walk_smoke burn_smoke stomp_smoke water_wave sparkle water_splash white_particle_small sparkle_animation
+MARIO_DIRS       := mario bubble walk_smoke burn_smoke small_water_splash water_wave sparkle water_splash white_particle_small sparkle_animation
 
 # Actor Textures
 AMP_CHUCKYA_TEXTURES            := $(foreach dir,$(AMP_DIRS),        $(wildcard actors/$(dir)/*.png))
@@ -152,7 +152,7 @@ $(BUILD_DIR)/levels/%/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
 
 # TODO: Generate these rules from the level configs?
 
-define level_rules = 
+define level_rules =
     $(1)_SEG7_FILES     := $$(patsubst %.png,%.inc.c,$$(wildcard levels/$(1)/*.png))
     $$(BUILD_DIR)/levels/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/,$$($(1)_SEG7_FILES))
     $$(BUILD_DIR)/levels/$(1)/leveldata.elf: TEXTURE_BIN := $(2)
@@ -266,5 +266,5 @@ $(BUILD_DIR)/src/goddard/renderer.o: $(addprefix $(BUILD_DIR)/,$(patsubst %.png,
 IPL3_TEXTURE_FILES          := $(wildcard $(TEXTURE_DIR)/ipl3_raw/*.png)
 IPL3_RAW_FILES              := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(IPL3_TEXTURE_FILES)))
 
-CRASH_TEXTURE_FILES         := $(wildcard $(TEXTURE_DIR)/crash_screen/*.png)
+CRASH_TEXTURE_FILES         := $(wildcard $(TEXTURE_DIR)/crash_custom/*.png)
 CRASH_TEXTURE_C_FILES       := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES)))

README.md

@@ -1,193 +1,191 @@
-# Super Mario 64
+# ![](https://i.imgur.com/CeOukzk.gif) HackerSM64 ![](https://i.imgur.com/s0LUbTo.gif)
+
+**[Thank you to Kaze Emanuar for these major optimizations!](https://www.youtube.com/watch?v=uYPH-NH3B6k)
+
+**AFTER CLONING THE REPO, CHECK OUT THE `include/config.h` FILE BEFORE ANYTHING ELSE! IT THERE'S A LOT OF STUFF IN THIS REPO THAT CAN BE TOGGLED THERE.**
+
+HackerSM64 now has a discord server! https://discord.gg/brETAakcXr
+
+This repo needs BOTH an US ROM and a JP ROM in order to build. Place baserom.us.z64 in the repo as usual and ALSO place baserom.jp.z64
+
+This repo needs gcc in order to be able to build it. To install it, run `sudo apt install gcc-mips-linux-gnu`
+
+This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in `config.h`):
+
+**Lighting Engine by Wiseguy**
+- Lighting Engine is available on a separate branch `(lighting-engine)`. Instructions on how to use it are in the readme of that branch.
+- Alternatively, the main repo has `Puppylights` available, which is a more lightweight, but limited lighting library intended to be used to modify existing light properties. You can look at `puppylights.c` to find out how to use it.
+
+**Puppycam**
+- Puppycam is available on the master branch now, you can toogle it in config.h. *
+
+**Collision:**
+- Slope fix and exposed ceilings fix
+- No false ledgegrabs fix *
+- Jump kick fix *
+- Configurable wallkick angle, in degrees *
+- Possibility of disabling BLJs *
+- Hanging fix (mario can grab hangable ceilings from any state, instead of only jump or double jump) *
+- Increased maximum pole length (The game will read bparam1 and bparam2 together as a single value, so you can have a very long pole) *
+- Platform Displacement 2 by Arthurtilly *
+- Water Surface Type patch by thecozies
+- Better Wall Collision With Rounded Corners by FramePerfection, merged by Cheezepin & Arceveti
+- Automatically calculate the optimal collision distance for an object based on its vertices, by Kaze *
+
+**Common Hack Changes:**
+- Better extended boundaries by anonymous_moose
+- Mario head skip *
+- Peach letter cutscene skip *
+- Exit course while moving *
+- Toggle to disable fall damage and the fall damage sound *
+- Nonstop stars *
+- Removed course-specific camera processing *
+- You can increase the number of frames that you have to perform a firsty *
+- Ability to set Mario's movement speed when hanging from a ceiling *
+- Tighter hanging controls (mario will face the direction of the analog stick directly while hanging from a ceiling) *
+- reonucam3: custom camera by me. This is included as a .patch file in the enhancements folder, you need to apply it if you want this camera.
+  This video shows a rundown of the features: https://youtu.be/TQNkznX9Z3k
+- Ability to disable Mario getting suck in snow or sand
+
+**Hacker QOL:**
+- Global, non-level based, star IDs (off by default) *
+- Debug mode: prints mario's coordinates, angle and speed, and a FPS counter.
+- Automatic console/emulator detection. If emulator is detected, LODs are disabled. *
+- Ability to configure whether there's a 100 coin star at all and how many coins are required to spawn it *
+- Ability to easily change the warp that EXIT COURSE takes you to via config.h, or disable it entirely. *
+- 16 bit model IDs by someone2639. This means you can have up to 65536 models (lol). You can set the maximum number of model IDs in `config.h`.
+- Apply_patch.sh improved
+- Removed the ifdef hell in `file_select.c` and `ingame_menu.c`
+- Added Blake's custom function for object model stuff: `obj_set_model` and `obj_has_model`
+- Added function to get the model ID from an object: `obj_get_model_id` (by Arceveti)
+- The "far" variable is now u16, allowing you to increase the farclip (the max distance at which geometry is rendered). However, when increasing the farclip, make sure to increase the nearclip by the same ratio, or rendering will break on console and LLE plugins.
+- Many general use defines for object struct members, meant for use in custom object behaviors. Check `object_fields.h` for more info on this. (By MrComit)
+- Included `actors/group0.c` in `behavior_data.c`
+- The internal ROM name is now set with a define in `config.h` to make it simpler
+- There is a `gIsConsole` variable that is 1 when running on console and 0 when running on emulator. This way you can wrap your code in a console check.
+- Expanded audio heap allows for a larger concurrent note count and the importing of more m64 sequences and sound banks (By ArcticJaguar725) *
+- You can set a test level in config.h in order to boot straight into it, so you can quickly test the level you're working on. *
+- Allows all surfaces in the game to have a `force` parameter. Activating this doesn't REQUIRE you to set `force` for every surface: If you don't set, it will default to 0x0000 rather than crashing. Increases RAM usage of collision. *
+- The clown font includes the entire English alphabet.
+- Colored ia4 text support. Format: `"@XXXXXXXX[YOUR TEXT]@--------"` (By ArcticJaguar725)
+  - Example Text: `"@FF0000FFRED @00FF00FFGREEN @0000FFFFBLUE @FFFFFF00INVISIBLE @--------NORMAL"`
+  - NOTE: It is not mandatory to reset the text color with `"@--------"`, but text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset.
+- Toggle visiblity of collision surfaces and object hitboxes with Visual Surface Debug. `config.h` has VISUAL_DEBUG which can be turned on to enable this feature.
+- Workaround for infinite death loops caused by using the wrong warp type for death warps. Mario's HP will be restored when being warped to any warp if (and only if) he was warped while dead. *
+
+**Other Bugfixes:**
+- Castle music fix (Fixes the castle music sometimes triggering after getting a dialog) *
+- bparam4 fix (the game no longer uses bparam4 to check if an object is mario and therefore you can safely use it)
+- Instant warp offset fix (makes the instant warp offset work even when warping to a different area) *
+- haveyourcake, also known as cake screen fix. Made by Wiseguy and ported/PR'd by Cheezepin
+- Tree particle fix (Whether a tree uses snow particles or not is decided via the model IDs instead of the course number) *
+- Coordinate overflow fix by falcobuster. Your levels will render correctly on console and LLE emulators even when using 2x or 4x bounds, while not hurting anything on HLE plugins. *This is automatic now, you don't have to set WORLD_SCALE manually.*
+- A couple vanilla texture fixes
+- Smoke fix (the smoke texture uses the correct texture format)
+
+**Neat Misc. Changes:**
+- Instant Input patch by Wiseguy (Removes all input lag caused by plugins supporting framebuffer)
+  - This means that you'll have to do your framebuffer effects on buffer 0 for emulator, but NOT for console. You can use the `gIsConsole` variable to check for console when doing your framebuffer effects.
+- Widescreen (16:9) support toggleable by pressing `L` in the pause menu. *
+- S2DEX engine by someone2639! To use it, compile with `make TEXT_ENGINE=s2dex_text_engine` or just set `TEXT_ENGINE` to `s2dex_text_engine` in the makefile.
+- ia8 coins (64x64), the vanilla coin texture is upgraded to accomodate. *
+- ia8 30 FPS (64x64) coins (Textures by InTheBeef, cleaned up by Arceveti). *
+- Floombas! Simply just retextured goombas with custom behaviors (does not overwrite standard goombas). *
+- HD texture support for intro splash screen (with floombas if enabled). *
+- Mario's silhouette is shown when behind most surfaces (By Frame#5375, Axollyon, AloXado320, Wiseguy, Arceveti) *
+- Skybox size modifier. You can have 2x, 3x and 4x size skyboxes (you can select the skybox size in `config.h`.) Please note that this might affect console performance, especially 4x mode. 2x or 3x mode is recommended if aiming for console. By CowQuack *
+- You can set the black border size to different values for console and emulator. It's set to 0 by default for both. *
+- This repo supports much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more configuration info. (By ArcticJaguar725) *
+- Fazana's "puppyprint" text engine. *
+  - Use `print_small_text` to print normal text. The two last params are aligment and how many characters to print (-1 means PRINT_ALL).
+  - Use `render_multi_image` to draw large texture rectangles consisting of multiple images on the screen.
+  - More info in `puppyprint.c`
+- Wiseguy's Farcall TLB mapping allows to store executable code inside uncompressed segments, that can be loaded and ran as needed, instead of it having to be loaded at all times. See `farcall.h` in the include folder for instructions and details.
+
+# UltraSM64
 
 - This repo contains a full decompilation of Super Mario 64 (J), (U), (E), and (SH).
 - Naming and documentation of the source code and data structures are in progress.
+- It has been edited to allow for the usage of the final "N64 OS" library, version ``2.0L``
+- Shindou Rumble Pak code is on for all regions.
+- Targeting the iQue Player is supported.
+- Saving to 32kbyte/256kbit SRAM is supported.
+- Newer compression options are supported.
+- UNFLoader (flashcart USB library) is supported, allowing for debugging on EverDrive/64Drive.
+- It has been patched with someone2639's shiftable segments patch
+- Wiseguy's instant input patch has been added to allow for less input lag on emulation (Does not affect console)
+  This does mean that any framebuffer effects will have to be done on buffer 0 if targeting emulators
+- Automatic console and emulator detection: Use the `gIsConsole` variable to wrap your code in an emulator check.
+- Separate defines for emulator and console black border height.
+- Getting HVQM FMV support to work with the game is WIP.
 
-It builds the following ROMs:
+Requirements are the same as regular SM64, however a GCC MIPS cross compiler is also required. If you're on Debian-like Linux, you can use the ``gcc-mips-linux-gnu`` package. The toolchain that comes with my SDK is also supported.
 
-* sm64.jp.z64 `sha1: 8a20a5c83d6ceb0f0506cfc9fa20d8f438cafe51`
-* sm64.us.z64 `sha1: 9bef1128717f958171a4afac3ed78ee2bb4e86ce`
-* sm64.eu.z64 `sha1: 4ac5721683d0e0b6bbb561b58a71740845dceea9`
-* sm64.sh.z64 `sha1: 3f319ae697533a255a1003d09202379d78d5a2e0`
+## Additional Prerequisites
 
-This repo does not include all assets necessary for compiling the ROMs.
-A prior copy of the game is required to extract the assets.
+BinPNG (the CI texture converter) requires some python3 dependencies. Use pip to install them.
 
-## Quick Start (for Ubuntu)
+``pip install pypng bitstring``
 
-1. Install prerequisites: `sudo apt install -y build-essential git binutils-mips-linux-gnu python3`
-2. Clone the repo from within Linux: `git clone https://github.com/n64decomp/sm64.git`
-3. Place a Super Mario 64 ROM called `baserom.<VERSION>.z64` into the project folder for asset extraction, where `VERSION` can be `us`, `jp`, `eu`, or `sh`.
-4. Run `make` to build. Qualify the version through `make VERSION=<VERSION>`. Add `-j4` to improve build speed (hardware dependent).
+## UNFLoader support
 
-Ensure the repo path length does not exceed 255 characters. Long path names result in build errors.
+The repository supports UNFLoader for debugging.
+To build with UNF, run make with ``UNF=1``.
 
-## Installation
+Further instructions can be found at the [official repository](https://github.com/buu342/N64-UNFLoader)
 
-### Windows
+**NOTE: Closing the UNFLoader window will result in your game eventually hanging due to lacking a USB device to send messages to, so beware of that**
 
-Install WSL and a distro of your choice following
-[Windows Subsystem for Linux Installation Guide for Windows 10.](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
-We recommend either Debian or Ubuntu 18.04 Linux distributions under WSL.
-Note: WSL1 does not currently support Ubuntu 20.04.
+## Multi-Save support
+The repository supports SRAM in addition to EEPROM. The standard save data functions are #ifdef'd to accommedate this.
+To build with SRAM support, run make with ``SAVETYPE=sram``.
 
-Next, clone the SM64 repo from within the Linux shell:
-`git clone https://github.com/n64decomp/sm64.git`
+I may attempt FlashRAM in the future.
 
-Then continue following the directions in the [Linux](#linux) installation section below.
+## Multi-Console support
+The repository supports targeting the iQue Player in addition to the N64. The iQue libultra is ***NOT*** compatible with N64 in many ways, so it is currently NOT possible to have one build for both consoles.
+To target iQue, run make with the ``CONSOLE=bb`` argument.
 
-### Linux
+## Compression
 
-There are 3 steps to set up a working build.
+The repo also supports RNC (Rob Northen Compression). RNC has two methods.
 
-#### Step 1: Install dependencies
+Method 1 is designed to compress as small as possible, while method 2 is designed so that decompression is as fast as possible.
 
-The build system has the following package requirements:
- * binutils-mips
- * capstone
- * pkgconf
- * python3 >= 3.6
+Method 1 is the current default, and is the best all-rounder in terms of speed and ratio.
 
-Dependency installation instructions for common Linux distros are provided below:
+Both methods are fast. Method 1 has better compression than 2, so I suggest using method 1 if using RNC.
 
-##### Debian / Ubuntu
-To install build dependencies:
-```
-sudo apt install -y binutils-mips-linux-gnu build-essential git libcapstone-dev pkgconf python3
-```
+To switch to RNC, run make with either ``COMPRESS=rnc1`` or ``COMPRESS=rnc2``, depending on preferred method.
 
-##### Arch Linux
-To install build dependencies:
-```
-sudo pacman -S base-devel capstone python
-```
-Install the following AUR packages:
-* [mips64-elf-binutils](https://aur.archlinux.org/packages/mips64-elf-binutils) (AUR)
+The repository also supports using DEFLATE compression. This boasts a better compression ratio, but at a slight cost to load times.
+On average I'd estimate that the bottleneck on decompression is about 1-2 seconds.
 
+To switch to gzip, run make with the ``COMPRESS=gzip`` argument.
 
-##### Other Linux distributions
+The repo also supports gziping with ``libdeflate-gzip``. This compresses at a slightly better ratio than standard ``gzip``, with no real downside from a decompression standpoint.
 
-Most modern Linux distributions should have equivalent packages to the other two listed above.
-You may have to use a different version of GNU binutils. Listed below are fully compatible binutils
-distributions with support in the makefile, and examples of distros that offer them:
+To use ``libdeflate-gzip``, first clone the [repo](https://github.com/ebiggers/libdeflate), then `make` and `make install` it.
 
-* `mips64-elf-` (Arch AUR)
-* `mips-linux-gnu-` (Ubuntu and other Debian-based distros)
-* `mips64-linux-gnu-` (RHEL/CentOS/Fedora)
+Then run make for sm64 with ``GZIPVER=libdef`` in addition to ``COMPRESS=gzip``
 
-You may also use [Docker](#docker-installation) to handle installing an image with minimal dependencies.
+The repo also supports building a ROM with no compression.
+This is not recommended as it increases ROM size significantly, with little point other than load times decreased to almost nothing.
+To switch to no compression, run make with the ``COMPRESS=uncomp`` argument.
 
-#### Step 2: Copy baserom(s) for asset extraction
+## FAQ
 
-For each version (jp/us/eu/sh) for which you want to build a ROM, put an existing ROM at
-`./baserom.<VERSION>.z64` for asset extraction.
+Q: Why in the hell are you bundling your own build of ``ld``?
 
-##### Step 3: Build the ROM
+A: Newer binutils (Like the one bundled with Ubuntu, 2.34) break linking with libultra builds due to local asm symbols.
+This puts me at a crossroads of either touching leaked code and requiring GCC, or just using an older linker that works just fine.
+I went with the latter.
+Thanks to "someone2639" for this hacky-ass idea
 
-Run `make` to build the ROM (defaults to `VERSION=us`).
-Other examples:
-```
-make VERSION=jp -j4       # build (J) version instead with 4 jobs
-make VERSION=eu COMPARE=0 # build (EU) version but do not compare ROM hashes
-```
+Q: Will this allow me to use FlashRAM/Transfer Pak/microcode swapping/Other Cool N64 Features?
 
-Resulting artifacts can be found in the `build` directory.
+A: Theoretically, all yes.
 
-The full list of configurable variables are listed below, with the default being the first listed:
+## Installation help
 
-* ``VERSION``: ``us``, ``jp``, ``eu``, ``sh``
-* ``GRUCODE``: ``f3d_old``, ``f3d_new``, ``f3dex``, ``f3dex2``, ``f3dzex``
-* ``COMPARE``: ``1`` (compare ROM hash), ``0`` (do not compare ROM hash)
-* ``NON_MATCHING``: Use functionally equivalent C implementations for non-matchings (Currently there aren't any non-matchings, but this will apply to iQue). Also will avoid instances of undefined behavior.
-* ``CROSS``: Cross-compiler tool prefix (Example: ``mips64-elf-``).
-
-### macOS
-
-With macOS, you may either use Homebrew or [Docker](#docker-installation).
-
-#### Homebrew
-
-#### Step 1: Install dependencies
-Install [Homebrew](https://brew.sh) and the following dependencies:
-```
-brew update
-brew install capstone coreutils make pkg-config tehzz/n64-dev/mips64-elf-binutils
-```
-
-#### Step 2: Copy baserom(s) for asset extraction
-
-For each version (jp/us/eu/sh) for which you want to build a ROM, put an existing ROM at
-`./baserom.<VERSION>.z64` for asset extraction.
-
-##### Step 3: Build the ROM
-
-Use Homebrew's GNU make because the version included with macOS is too old.
-
-```
-gmake VERSION=jp -j4       # build (J) version instead with 4 jobs
-```
-
-### Docker Installation
-
-#### Create Docker image
-
-After installing and starting Docker, create the docker image. This only needs to be done once.
-```
-docker build -t sm64 .
-```
-
-#### Build
-
-To build, mount the local filesystem into the Docker container and build the ROM with `docker run sm64 make`.
-
-##### macOS example for (U):
-```
-docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4
-```
-
-##### Linux example for (U):
-For a Linux host, Docker needs to be instructed which user should own the output files:
-```
-docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 --user $UID:$GID sm64 make VERSION=us -j4
-```
-
-Resulting artifacts can be found in the `build` directory.
-
-## Project Structure
-	
-	sm64
-	├── actors: object behaviors, geo layout, and display lists
-	├── asm: handwritten assembly code, rom header
-	│   └── non_matchings: asm for non-matching sections
-	├── assets: animation and demo data
-	│   ├── anims: animation data
-	│   └── demos: demo data
-	├── bin: C files for ordering display lists and textures
-	├── build: output directory
-	├── data: behavior scripts, misc. data
-	├── doxygen: documentation infrastructure
-	├── enhancements: example source modifications
-	├── include: header files
-	├── levels: level scripts, geo layout, and display lists
-	├── lib: SDK library code
-	├── rsp: audio and Fast3D RSP assembly code
-	├── sound: sequences, sound samples, and sound banks
-	├── src: C source code for game
-	│   ├── audio: audio code
-	│   ├── buffers: stacks, heaps, and task buffers
-	│   ├── engine: script processing engines and utils
-	│   ├── game: behaviors and rest of game source
-	│   ├── goddard: Mario intro screen
-	│   └── menu: title screen and file, act, and debug level selection menus
-	├── text: dialog, level names, act names
-	├── textures: skybox and generic texture data
-	└── tools: build tools
-
-## Contributing
-
-Pull requests are welcome. For major changes, please open an issue first to
-discuss what you would like to change.
-
-Run `clang-format` on your code to ensure it meets the project's coding standards.
-
-Official Discord: [discord.gg/DuYH3Fh](https://discord.gg/DuYH3Fh)
+Go read the original SM64 repo README.md

actors/amp/geo.inc.c

@@ -3,49 +3,49 @@ const GeoLayout dAmpGeo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 16384),
       GEO_OPEN_NODE(),
-         GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpEyeDl),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpEyeDl),
             GEO_OPEN_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
                GEO_OPEN_NODE(),
                   GEO_SWITCH_CASE(2, geo_switch_anim_state),
                   GEO_OPEN_NODE(),
-                     GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
-                     GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
                   GEO_CLOSE_NODE(),
                GEO_CLOSE_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
                GEO_OPEN_NODE(),
                   GEO_SWITCH_CASE(2, geo_switch_anim_state),
                   GEO_OPEN_NODE(),
-                     GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
-                     GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
                   GEO_CLOSE_NODE(),
                GEO_CLOSE_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
                GEO_OPEN_NODE(),
                   GEO_SWITCH_CASE(2, geo_switch_anim_state),
                   GEO_OPEN_NODE(),
-                     GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
-                     GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
                   GEO_CLOSE_NODE(),
                GEO_CLOSE_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
                GEO_OPEN_NODE(),
                   GEO_SWITCH_CASE(2, geo_switch_anim_state),
                   GEO_OPEN_NODE(),
-                     GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
-                     GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
+                     GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
                   GEO_CLOSE_NODE(),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
-            GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpMouthDl),
-            GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpMouthDl),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
             GEO_OPEN_NODE(),
                GEO_BILLBOARD(),
                GEO_OPEN_NODE(),
-                  GEO_DISPLAY_LIST(LAYER_ALPHA, dAmpBodyDl),
+                  GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, dAmpBodyDl),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),

actors/amp/model.inc.c

@@ -148,352 +148,3 @@ const Gfx dAmpBodyDl[] = {
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
-
-/**
- * Everything beyond this point is unused, and seems to be an attempt at a 3D modelled
- * amp. The model and attempt are overall slightly buggy, with misread lights and a slightly
- * broken model.
- */
-
-UNUSED static const Lights1 dAmpUnused3DLights = gdSPDefLights1(
-    0x33, 0x3f, 0x00,
-    0xcf, 0xff, 0x00, 0x28, 0x28, 0x28
-);
-
-UNUSED static const Vtx dAmpUnused3DVtx01[] = {
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   240,   -160,      0}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   240,    160,      0}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx02[] = {
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   240,   -160,      0}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   240,    160,      0}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx03[] = {
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   240,   -160,      0}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0x00}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   240,    160,      0}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx04[] = {
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0x00}}},
-    {{{   240,    160,      0}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0x00}}},
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0x1e, 0x00, 0x00}}},
-    {{{   280,      0,     35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0xff}}},
-    {{{   240,   -160,      0}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0xff}}},
-    {{{   280,      0,    -35}, 0, {     0,      0}, {0x7b, 0xe2, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx05[] = {
-    {{{  -184,    -54,    -54}, 0, {     0,      0}, {0x8b, 0xde, 0xde, 0x00}}},
-    {{{  -184,    -76,      0}, 0, {     0,      0}, {0x8b, 0xd0, 0x00, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,   -100,   -100}, 0, {     0,      0}, {0xa6, 0xc1, 0xc1, 0xff}}},
-    {{{  -141,   -141,      0}, 0, {     0,      0}, {0xa6, 0xa7, 0x00, 0xff}}},
-    {{{   -76,   -130,   -130}, 0, {     0,      0}, {0xd0, 0xae, 0xae, 0xff}}},
-    {{{   -76,   -184,      0}, 0, {     0,      0}, {0xd0, 0x8b, 0x00, 0xff}}},
-    {{{     0,   -141,   -141}, 0, {     0,      0}, {0x00, 0xa7, 0xa7, 0xff}}},
-    {{{     0,   -200,      0}, 0, {     0,      0}, {0x00, 0x81, 0x00, 0xff}}},
-    {{{    76,   -130,   -130}, 0, {     0,      0}, {0x30, 0xae, 0xae, 0xff}}},
-    {{{    76,   -184,      0}, 0, {     0,      0}, {0x30, 0x8b, 0x00, 0xff}}},
-    {{{   141,   -100,   -100}, 0, {     0,      0}, {0x5a, 0xc1, 0xc1, 0xff}}},
-    {{{   141,   -141,      0}, 0, {     0,      0}, {0x5a, 0xa7, 0x00, 0xff}}},
-    {{{   184,    -54,    -54}, 0, {     0,      0}, {0x75, 0xde, 0xde, 0xff}}},
-    {{{   184,    -76,      0}, 0, {     0,      0}, {0x75, 0xd0, 0x00, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx06[] = {
-    {{{  -184,      0,    -76}, 0, {     0,      0}, {0x8b, 0x00, 0xd0, 0xff}}},
-    {{{  -184,    -54,    -54}, 0, {     0,      0}, {0x8b, 0xde, 0xde, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,      0,   -141}, 0, {     0,      0}, {0xa6, 0x00, 0xa7, 0xff}}},
-    {{{  -141,   -100,   -100}, 0, {     0,      0}, {0xa6, 0xc1, 0xc1, 0xff}}},
-    {{{   -76,      0,   -184}, 0, {     0,      0}, {0xd0, 0x00, 0x8b, 0xff}}},
-    {{{   -76,   -130,   -130}, 0, {     0,      0}, {0xd0, 0xae, 0xae, 0xff}}},
-    {{{     0,      0,   -200}, 0, {     0,      0}, {0x00, 0x00, 0x81, 0xff}}},
-    {{{     0,   -141,   -141}, 0, {     0,      0}, {0x00, 0xa7, 0xa7, 0xff}}},
-    {{{    76,      0,   -184}, 0, {     0,      0}, {0x30, 0x00, 0x8b, 0xff}}},
-    {{{    76,   -130,   -130}, 0, {     0,      0}, {0x30, 0xae, 0xae, 0xff}}},
-    {{{   141,      0,   -141}, 0, {     0,      0}, {0x5a, 0x00, 0xa7, 0xff}}},
-    {{{   141,   -100,   -100}, 0, {     0,      0}, {0x5a, 0xc1, 0xc1, 0xff}}},
-    {{{   184,      0,    -76}, 0, {     0,      0}, {0x75, 0x00, 0xd0, 0xff}}},
-    {{{   184,    -54,    -54}, 0, {     0,      0}, {0x75, 0xde, 0xde, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx07[] = {
-    {{{  -184,     54,    -54}, 0, {     0,      0}, {0x8b, 0x22, 0xde, 0xff}}},
-    {{{  -184,      0,    -76}, 0, {     0,      0}, {0x8b, 0x00, 0xd0, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,    100,   -100}, 0, {     0,      0}, {0xa6, 0x3f, 0xc1, 0xff}}},
-    {{{  -141,      0,   -141}, 0, {     0,      0}, {0xa6, 0x00, 0xa7, 0xff}}},
-    {{{   -76,    130,   -130}, 0, {     0,      0}, {0xd0, 0x52, 0xae, 0xff}}},
-    {{{   -76,      0,   -184}, 0, {     0,      0}, {0xd0, 0x00, 0x8b, 0xff}}},
-    {{{     0,    141,   -141}, 0, {     0,      0}, {0x00, 0x59, 0xa7, 0xff}}},
-    {{{     0,      0,   -200}, 0, {     0,      0}, {0x00, 0x00, 0x81, 0xff}}},
-    {{{    76,    130,   -130}, 0, {     0,      0}, {0x30, 0x52, 0xae, 0xff}}},
-    {{{    76,      0,   -184}, 0, {     0,      0}, {0x30, 0x00, 0x8b, 0xff}}},
-    {{{   141,    100,   -100}, 0, {     0,      0}, {0x5a, 0x3f, 0xc1, 0xff}}},
-    {{{   141,      0,   -141}, 0, {     0,      0}, {0x5a, 0x00, 0xa7, 0xff}}},
-    {{{   184,     54,    -54}, 0, {     0,      0}, {0x75, 0x22, 0xde, 0xff}}},
-    {{{   184,      0,    -76}, 0, {     0,      0}, {0x75, 0x00, 0xd0, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx08[] = {
-    {{{  -184,     76,      0}, 0, {     0,      0}, {0x8b, 0x30, 0x00, 0xff}}},
-    {{{  -184,     54,    -54}, 0, {     0,      0}, {0x8b, 0x22, 0xde, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,    141,      0}, 0, {     0,      0}, {0xa6, 0x59, 0x00, 0xff}}},
-    {{{  -141,    100,   -100}, 0, {     0,      0}, {0xa6, 0x3f, 0xc1, 0xff}}},
-    {{{   -76,    184,      0}, 0, {     0,      0}, {0xd0, 0x75, 0x00, 0xff}}},
-    {{{   -76,    130,   -130}, 0, {     0,      0}, {0xd0, 0x52, 0xae, 0xff}}},
-    {{{     0,    200,      0}, 0, {     0,      0}, {0x00, 0x7f, 0x00, 0xff}}},
-    {{{     0,    141,   -141}, 0, {     0,      0}, {0x00, 0x59, 0xa7, 0xff}}},
-    {{{    76,    184,      0}, 0, {     0,      0}, {0x30, 0x75, 0x00, 0xff}}},
-    {{{    76,    130,   -130}, 0, {     0,      0}, {0x30, 0x52, 0xae, 0xff}}},
-    {{{   141,    141,      0}, 0, {     0,      0}, {0x5a, 0x59, 0x00, 0xff}}},
-    {{{   141,    100,   -100}, 0, {     0,      0}, {0x5a, 0x3f, 0xc1, 0xff}}},
-    {{{   184,     76,      0}, 0, {     0,      0}, {0x75, 0x30, 0x00, 0xff}}},
-    {{{   184,     54,    -54}, 0, {     0,      0}, {0x75, 0x22, 0xde, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx09[] = {
-    {{{  -184,     54,     54}, 0, {     0,      0}, {0x8b, 0x22, 0x22, 0xff}}},
-    {{{  -184,     76,      0}, 0, {     0,      0}, {0x8b, 0x30, 0x00, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,    100,    100}, 0, {     0,      0}, {0xa6, 0x3f, 0x3f, 0xff}}},
-    {{{  -141,    141,      0}, 0, {     0,      0}, {0xa6, 0x59, 0x00, 0xff}}},
-    {{{   -76,    130,    130}, 0, {     0,      0}, {0xd0, 0x52, 0x52, 0xff}}},
-    {{{   -76,    184,      0}, 0, {     0,      0}, {0xd0, 0x75, 0x00, 0xff}}},
-    {{{     0,    141,    141}, 0, {     0,      0}, {0x00, 0x59, 0x59, 0xff}}},
-    {{{     0,    200,      0}, 0, {     0,      0}, {0x00, 0x7f, 0x00, 0xff}}},
-    {{{    76,    130,    130}, 0, {     0,      0}, {0x30, 0x52, 0x52, 0xff}}},
-    {{{    76,    184,      0}, 0, {     0,      0}, {0x30, 0x75, 0x00, 0xff}}},
-    {{{   141,    100,    100}, 0, {     0,      0}, {0x5a, 0x3f, 0x3f, 0xff}}},
-    {{{   141,    141,      0}, 0, {     0,      0}, {0x5a, 0x59, 0x00, 0xff}}},
-    {{{   184,     54,     54}, 0, {     0,      0}, {0x75, 0x22, 0x22, 0xff}}},
-    {{{   184,     76,      0}, 0, {     0,      0}, {0x75, 0x30, 0x00, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx10[] = {
-    {{{  -184,      0,     76}, 0, {     0,      0}, {0x8b, 0x00, 0x30, 0xff}}},
-    {{{  -184,     54,     54}, 0, {     0,      0}, {0x8b, 0x22, 0x22, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,      0,    141}, 0, {     0,      0}, {0xa6, 0x00, 0x59, 0xff}}},
-    {{{  -141,    100,    100}, 0, {     0,      0}, {0xa6, 0x3f, 0x3f, 0xff}}},
-    {{{   -76,      0,    184}, 0, {     0,      0}, {0xd0, 0x00, 0x75, 0xff}}},
-    {{{   -76,    130,    130}, 0, {     0,      0}, {0xd0, 0x52, 0x52, 0xff}}},
-    {{{     0,      0,    200}, 0, {     0,      0}, {0x00, 0x00, 0x7f, 0xff}}},
-    {{{     0,    141,    141}, 0, {     0,      0}, {0x00, 0x59, 0x59, 0xff}}},
-    {{{    76,      0,    184}, 0, {     0,      0}, {0x30, 0x00, 0x75, 0xff}}},
-    {{{    76,    130,    130}, 0, {     0,      0}, {0x30, 0x52, 0x52, 0xff}}},
-    {{{   141,      0,    141}, 0, {     0,      0}, {0x5a, 0x00, 0x59, 0xff}}},
-    {{{   141,    100,    100}, 0, {     0,      0}, {0x5a, 0x3f, 0x3f, 0xff}}},
-    {{{   184,      0,     76}, 0, {     0,      0}, {0x75, 0x00, 0x30, 0xff}}},
-    {{{   184,     54,     54}, 0, {     0,      0}, {0x75, 0x22, 0x22, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx11[] = {
-    {{{  -184,    -54,     54}, 0, {     0,      0}, {0x8b, 0xde, 0x22, 0xff}}},
-    {{{  -184,      0,     76}, 0, {     0,      0}, {0x8b, 0x00, 0x30, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,   -100,    100}, 0, {     0,      0}, {0xa6, 0xc1, 0x3f, 0xff}}},
-    {{{  -141,      0,    141}, 0, {     0,      0}, {0xa6, 0x00, 0x59, 0xff}}},
-    {{{   -76,   -130,    130}, 0, {     0,      0}, {0xd0, 0xae, 0x52, 0xff}}},
-    {{{   -76,      0,    184}, 0, {     0,      0}, {0xd0, 0x00, 0x75, 0xff}}},
-    {{{     0,   -141,    141}, 0, {     0,      0}, {0x00, 0xa7, 0x59, 0xff}}},
-    {{{     0,      0,    200}, 0, {     0,      0}, {0x00, 0x00, 0x7f, 0xff}}},
-    {{{    76,   -130,    130}, 0, {     0,      0}, {0x30, 0xae, 0x52, 0xff}}},
-    {{{    76,      0,    184}, 0, {     0,      0}, {0x30, 0x00, 0x75, 0xff}}},
-    {{{   141,   -100,    100}, 0, {     0,      0}, {0x5a, 0xc1, 0x3f, 0xff}}},
-    {{{   141,      0,    141}, 0, {     0,      0}, {0x5a, 0x00, 0x59, 0xff}}},
-    {{{   184,    -54,     54}, 0, {     0,      0}, {0x75, 0xde, 0x22, 0xff}}},
-    {{{   184,      0,     76}, 0, {     0,      0}, {0x75, 0x00, 0x30, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx12[] = {
-    {{{  -184,    -76,      0}, 0, {     0,      0}, {0x8b, 0xd0, 0x00, 0xff}}},
-    {{{  -184,    -54,     54}, 0, {     0,      0}, {0x8b, 0xde, 0x22, 0x00}}},
-    {{{  -200,      0,      0}, 0, {     0,      0}, {0x81, 0x00, 0x00, 0x00}}},
-    {{{  -141,   -141,      0}, 0, {     0,      0}, {0xa6, 0xa7, 0x00, 0xff}}},
-    {{{  -141,   -100,    100}, 0, {     0,      0}, {0xa6, 0xc1, 0x3f, 0xff}}},
-    {{{   -76,   -184,      0}, 0, {     0,      0}, {0xd0, 0x8b, 0x00, 0xff}}},
-    {{{   -76,   -130,    130}, 0, {     0,      0}, {0xd0, 0xae, 0x52, 0xff}}},
-    {{{     0,   -200,      0}, 0, {     0,      0}, {0x00, 0x81, 0x00, 0xff}}},
-    {{{     0,   -141,    141}, 0, {     0,      0}, {0x00, 0xa7, 0x59, 0xff}}},
-    {{{    76,   -184,      0}, 0, {     0,      0}, {0x30, 0x8b, 0x00, 0xff}}},
-    {{{    76,   -130,    130}, 0, {     0,      0}, {0x30, 0xae, 0x52, 0xff}}},
-    {{{   141,   -141,      0}, 0, {     0,      0}, {0x5a, 0xa7, 0x00, 0xff}}},
-    {{{   141,   -100,    100}, 0, {     0,      0}, {0x5a, 0xc1, 0x3f, 0xff}}},
-    {{{   184,    -76,      0}, 0, {     0,      0}, {0x75, 0xd0, 0x00, 0xff}}},
-    {{{   184,    -54,     54}, 0, {     0,      0}, {0x75, 0xde, 0x22, 0xff}}},
-    {{{   200,      0,      0}, 0, {     0,      0}, {0x7f, 0x00, 0x00, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx13[] = {
-    {{{   -37,     90,    205}, 0, {     0,      0}, {0xcc, 0x00, 0x73, 0x00}}},
-    {{{  -129,     90,    163}, 0, {     0,      0}, {0xcc, 0x00, 0x73, 0x00}}},
-    {{{  -129,    -90,    163}, 0, {     0,      0}, {0xcc, 0x00, 0x73, 0x00}}},
-    {{{   -37,    -90,    205}, 0, {     0,      0}, {0xcc, 0x00, 0x73, 0xff}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx14[] = {
-    {{{   112,     -7,    182}, 0, {     0,      0}, {0x4c, 0xd8, 0x5c, 0x00}}},
-    {{{    66,   -139,    162}, 0, {     0,      0}, {0x4c, 0xd8, 0x5c, 0x00}}},
-    {{{   175,    -77,     98}, 0, {     0,      0}, {0x4c, 0xd8, 0x5c, 0x00}}},
-};
-
-UNUSED static const Vtx dAmpUnused3DVtx15[] = {
-    {{{    63,     90,    198}, 0, {     0,      0}, {0x08, 0x00, 0x7e, 0x00}}},
-    {{{   -35,     90,    205}, 0, {     0,      0}, {0x08, 0x00, 0x7e, 0x00}}},
-    {{{   -35,    -90,    205}, 0, {     0,      0}, {0x08, 0x00, 0x7e, 0x00}}},
-    {{{    63,    -90,    198}, 0, {     0,      0}, {0x08, 0x00, 0x7e, 0xff}}},
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl1[] = {
-    gsSPLight(&dAmpUnused3DLights.l, 1),
-    gsSPLight(&dAmpUnused3DLights.a, 2),
-    gsSPVertex(dAmpUnused3DVtx01, 6, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl2[] = {
-    gsSPLight(&dAmpUnused3DLights.l, 1),
-    gsSPLight(&dAmpUnused3DLights.a, 2),
-    gsSPVertex(dAmpUnused3DVtx02, 6, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl3[] = {
-    gsSPLight(&dAmpUnused3DLights.l, 1),
-    gsSPLight(&dAmpUnused3DLights.a, 2),
-    gsSPVertex(dAmpUnused3DVtx03, 6, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl4[] = {
-    gsSPLight(&dAmpUnused3DLights.l, 1),
-    gsSPLight(&dAmpUnused3DLights.a, 2),
-    gsSPVertex(dAmpUnused3DVtx04, 6, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DModelDl[] = {
-    //! Vertex interpreted as light
-    gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
-    gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
-    gsSPVertex(dAmpUnused3DVtx05, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx06, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx07, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx08, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx09, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx10, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx11, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPVertex(dAmpUnused3DVtx12, 16, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
-    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
-    gsSP2Triangles( 4,  5,  6, 0x0,  6,  5,  7, 0x0),
-    gsSP2Triangles( 6,  7,  8, 0x0,  8,  7,  9, 0x0),
-    gsSP2Triangles( 8,  9, 10, 0x0, 10,  9, 11, 0x0),
-    gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
-    gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl5[] = {
-    //! Vertex interpreted as light
-    gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
-    gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
-    gsSPVertex(dAmpUnused3DVtx13, 4, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl6[] = {
-    //! Vertex interpreted as light
-    gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
-    gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
-    gsSPVertex(dAmpUnused3DVtx14, 3, 0),
-    gsSP1Triangle( 0,  1,  2, 0x0),
-    gsSPEndDisplayList(),
-};
-
-UNUSED const Gfx dAmpUnused3DElectricDl7[] = {
-    //! Vertex interpreted as light
-    gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
-    gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
-    gsSPVertex(dAmpUnused3DVtx15, 4, 0),
-    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
-    gsSPEndDisplayList(),
-};

actors/bird/geo.inc.c

@@ -4,20 +4,20 @@ const GeoLayout birds_geo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 16384),
       GEO_OPEN_NODE(),
-         GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000670),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000670),
             GEO_OPEN_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 1, -12, 37, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 1, -12, 37, NULL),
                GEO_OPEN_NODE(),
-                  GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000528),
+                  GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000528),
                GEO_CLOSE_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 1, -12, -37, NULL),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 1, -12, -37, NULL),
                GEO_OPEN_NODE(),
-                  GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000600),
+                  GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000600),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
-            GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000598),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000598),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),

actors/blargg/anims/table.inc.c

@@ -1,4 +1,4 @@
-// unreferenced
+// unreferenced animation
 // 0x0500616C
 const struct Animation *const blargg_seg5_anims_0500616C[] = {
     &blargg_seg5_anim_05006154,

actors/blue_fish/geo.inc.c

@@ -4,11 +4,11 @@ const GeoLayout fish_shadow_geo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 16384),
       GEO_OPEN_NODE(),
-         GEO_ANIMATED_PART(LAYER_OPAQUE, -16, 0, 0, NULL),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
             GEO_OPEN_NODE(),
-               GEO_ANIMATED_PART(LAYER_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
@@ -20,11 +20,11 @@ const GeoLayout fish_shadow_geo[] = {
 const GeoLayout fish_geo[] = {
    GEO_SCALE(0x00, 16384),
    GEO_OPEN_NODE(),
-      GEO_ANIMATED_PART(LAYER_OPAQUE, -16, 0, 0, NULL),
+      GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
       GEO_OPEN_NODE(),
-         GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),

actors/bobomb/model.inc.c

@@ -180,7 +180,7 @@ static const Lights1 bobomb_seg8_lights_08022E00 = gdSPDefLights1(
 );
 
 // Unreferenced light group
-static const Lights1 bobomb_lights_unused = gdSPDefLights1(
+UNUSED static const Lights1 bobomb_lights_unused = gdSPDefLights1(
     0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x28, 0x28, 0x28
 );

actors/boo/geo.inc.c

@@ -12,6 +12,5 @@ const GeoLayout boo_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };

actors/boo_castle/geo.inc.c

@@ -12,6 +12,5 @@ const GeoLayout boo_castle_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };

actors/bookend/geo.inc.c

@@ -24,6 +24,5 @@ const GeoLayout bookend_part_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };

actors/bowser/flames_data.inc.c

@@ -2,97 +2,97 @@
 
 const s16 dBowserFlamesOrientationValues[] = {
 //   posX, posY, posZ,   rotY,   rotX
-        0,  280,   80, 0x00E9, 0x1A96, 
-        0,  278,   83, 0x00EC, 0x1C7F, 
-        0,  273,   92, 0x00F9, 0x20BF, 
-        0,  268,  102, 0x010F, 0x2519, 
-        0,  263,  109, 0x011D, 0x2751, 
-        0,  263,  110, 0x011C, 0x2714, 
-        0,  265,  106, 0x0112, 0x2601, 
-        0,  268,  102, 0x0109, 0x24C0, 
-        0,  271,   96, 0x00FF, 0x2358, 
-        0,  274,   90, 0x00F7, 0x21CB, 
-        0,  277,   84, 0x00EE, 0x201C, 
-        0,  280,   78, 0x00E7, 0x1E4E, 
-        0,  284,   71, 0x00DF, 0x1C64, 
-        0,  288,   63, 0x00D9, 0x1A61, 
-        0,  291,   56, 0x00D3, 0x184B, 
-        0,  295,   48, 0x00CF, 0x1622, 
-        0,  298,   40, 0x00CA, 0x13E9, 
-        0,  301,   32, 0x00C7, 0x11A5, 
-        0,  304,   23, 0x00C4, 0x0F59, 
-        0,  308,   15, 0x00C1, 0x0D08, 
-        0,  311,    7, 0x00C0, 0x0AB5, 
-        0,  313,    0, 0x00C0, 0x0863, 
-        0,  315,   -8, 0x00BF, 0x0615, 
-        0,  317,  -15, 0x00CE, 0x03A3, 
-        0,  319,  -22, 0x00F8, 0x00ED, 
-        0,  320,  -29, 0x0131, 0xFFFF, 
-        0,  322,  -36, 0x0172, 0xFFFF, 
-        0,  322,  -40, 0x01B5, 0xFFFF, 
-        0,  323,  -45, 0x01ED, 0xFFFF, 
-        0,  323,  -48, 0x0213, 0xFFFF, 
-        0,  323,  -51, 0x0219, 0xFFFF, 
-        0,  323,  -52, 0x01F2, 0xFFFF, 
-        0,  323,  -51, 0x018F, 0xFFFF, 
-        0,  323,  -49, 0x00E5, 0xFFFF, 
-        0,  322,  -45, 0xFFFF, 0xFFFF, 
-        0,  320,  -35, 0xFFFF, 0xFFFF, 
-        0,  317,  -23, 0xFFFF, 0xFFFF, 
-        0,  312,   -7, 0xFFFF, 0xFFFF, 
-        0,  306,   11, 0xFFFF, 0xFFFF, 
-        0,  299,   31, 0xFFFF, 0xFFFF, 
-        0,  288,   51, 0xFFFF, 0xFFFF, 
-        0,  278,   70, 0xFFFF, 0xFFFF, 
-        0,  267,   89, 0xFFFF, 0xFFFF, 
-        0,  256,  106, 0xFFFF, 0x023A, 
-        0,  244,  120, 0xFFFF, 0x04AA, 
-        0,  236,  132, 0xFFFF, 0x069F, 
-        0,  229,  139, 0xFFFF, 0x0803, 
-        0,  224,  144, 0xFFFF, 0x08C0, 
-        0,  222,  147, 0xFFFF, 0x0928, 
-        0,  221,  148, 0xFFFF, 0x099D, 
-        0,  221,  149, 0xFFFF, 0x0A16, 
-        0,  221,  150, 0xFFFF, 0x0A8D, 
-        0,  221,  150, 0xFFFF, 0x0AF6, 
-        0,  222,  150, 0xFFFF, 0x0B4A, 
-        0,  222,  150, 0xFFFF, 0x0B84, 
-        0,  222,  149, 0x020A, 0x0BA0, 
-        0,  223,  149, 0x0524, 0x0B9E, 
-        0,  225,  148, 0x07EC, 0x0B84, 
-        0,  226,  147, 0x0A3F, 0x0B57, 
-        0,  227,  145, 0x0BFB, 0x0B1F, 
-        0,  228,  144, 0x0D00, 0x0AE5, 
-        0,  230,  142, 0x0D6F, 0x0AA0, 
-        0,  232,  140, 0x0D8B, 0x0A48, 
-        0,  233,  138, 0x0D5D, 0x09DE, 
-        0,  236,  136, 0x0CED, 0x096A, 
-        0,  238,  134, 0x0C49, 0x08EA, 
-        0,  239,  132, 0x0B76, 0x0863, 
-        0,  241,  130, 0x0A80, 0x07D9, 
-        0,  244,  128, 0x0970, 0x074E, 
-        0,  246,  125, 0x084E, 0x06C7, 
-        0,  248,  122, 0x0723, 0x0649, 
-        0,  251,  120, 0x05F8, 0x05D7, 
-        0,  253,  117, 0x04D6, 0x0579, 
-        0,  254,  114, 0x03C3, 0x0532, 
-        0,  256,  111, 0x02C9, 0x0509, 
-        0,  259,  108, 0x01F0, 0x0504, 
-        0,  261,  105, 0x0141, 0x0525, 
-        0,  262,  103, 0x00C3, 0x0572, 
-        0,  264,  100, 0x006E, 0x0619, 
-        0,  267,   97, 0x0032, 0x0734, 
-        0,  268,   95, 0x000C, 0x08AF, 
-        0,  269,   93, 0xFFFF, 0x0A74, 
-        0,  272,   90, 0xFFFF, 0x0C70, 
-        0,  273,   88, 0xFFFF, 0x0E8E, 
-        0,  274,   86, 0x0014, 0x10B6, 
-        0,  275,   84, 0x0032, 0x12DA, 
-        0,  277,   82, 0x0056, 0x14E1, 
-        0,  277,   82, 0x007E, 0x16B9, 
-        0,  278,   80, 0x00A4, 0x184B, 
-        0,  278,   80, 0x00C6, 0x1983, 
-        0,  279,   80, 0x00DF, 0x1A4D, 
-        0,  280,   80, 0x00E9, 0x1A96, 
+        0,  280,   80, 0x00E9, 0x1A96,
+        0,  278,   83, 0x00EC, 0x1C7F,
+        0,  273,   92, 0x00F9, 0x20BF,
+        0,  268,  102, 0x010F, 0x2519,
+        0,  263,  109, 0x011D, 0x2751,
+        0,  263,  110, 0x011C, 0x2714,
+        0,  265,  106, 0x0112, 0x2601,
+        0,  268,  102, 0x0109, 0x24C0,
+        0,  271,   96, 0x00FF, 0x2358,
+        0,  274,   90, 0x00F7, 0x21CB,
+        0,  277,   84, 0x00EE, 0x201C,
+        0,  280,   78, 0x00E7, 0x1E4E,
+        0,  284,   71, 0x00DF, 0x1C64,
+        0,  288,   63, 0x00D9, 0x1A61,
+        0,  291,   56, 0x00D3, 0x184B,
+        0,  295,   48, 0x00CF, 0x1622,
+        0,  298,   40, 0x00CA, 0x13E9,
+        0,  301,   32, 0x00C7, 0x11A5,
+        0,  304,   23, 0x00C4, 0x0F59,
+        0,  308,   15, 0x00C1, 0x0D08,
+        0,  311,    7, 0x00C0, 0x0AB5,
+        0,  313,    0, 0x00C0, 0x0863,
+        0,  315,   -8, 0x00BF, 0x0615,
+        0,  317,  -15, 0x00CE, 0x03A3,
+        0,  319,  -22, 0x00F8, 0x00ED,
+        0,  320,  -29, 0x0131, 0xFFFF,
+        0,  322,  -36, 0x0172, 0xFFFF,
+        0,  322,  -40, 0x01B5, 0xFFFF,
+        0,  323,  -45, 0x01ED, 0xFFFF,
+        0,  323,  -48, 0x0213, 0xFFFF,
+        0,  323,  -51, 0x0219, 0xFFFF,
+        0,  323,  -52, 0x01F2, 0xFFFF,
+        0,  323,  -51, 0x018F, 0xFFFF,
+        0,  323,  -49, 0x00E5, 0xFFFF,
+        0,  322,  -45, 0xFFFF, 0xFFFF,
+        0,  320,  -35, 0xFFFF, 0xFFFF,
+        0,  317,  -23, 0xFFFF, 0xFFFF,
+        0,  312,   -7, 0xFFFF, 0xFFFF,
+        0,  306,   11, 0xFFFF, 0xFFFF,
+        0,  299,   31, 0xFFFF, 0xFFFF,
+        0,  288,   51, 0xFFFF, 0xFFFF,
+        0,  278,   70, 0xFFFF, 0xFFFF,
+        0,  267,   89, 0xFFFF, 0xFFFF,
+        0,  256,  106, 0xFFFF, 0x023A,
+        0,  244,  120, 0xFFFF, 0x04AA,
+        0,  236,  132, 0xFFFF, 0x069F,
+        0,  229,  139, 0xFFFF, 0x0803,
+        0,  224,  144, 0xFFFF, 0x08C0,
+        0,  222,  147, 0xFFFF, 0x0928,
+        0,  221,  148, 0xFFFF, 0x099D,
+        0,  221,  149, 0xFFFF, 0x0A16,
+        0,  221,  150, 0xFFFF, 0x0A8D,
+        0,  221,  150, 0xFFFF, 0x0AF6,
+        0,  222,  150, 0xFFFF, 0x0B4A,
+        0,  222,  150, 0xFFFF, 0x0B84,
+        0,  222,  149, 0x020A, 0x0BA0,
+        0,  223,  149, 0x0524, 0x0B9E,
+        0,  225,  148, 0x07EC, 0x0B84,
+        0,  226,  147, 0x0A3F, 0x0B57,
+        0,  227,  145, 0x0BFB, 0x0B1F,
+        0,  228,  144, 0x0D00, 0x0AE5,
+        0,  230,  142, 0x0D6F, 0x0AA0,
+        0,  232,  140, 0x0D8B, 0x0A48,
+        0,  233,  138, 0x0D5D, 0x09DE,
+        0,  236,  136, 0x0CED, 0x096A,
+        0,  238,  134, 0x0C49, 0x08EA,
+        0,  239,  132, 0x0B76, 0x0863,
+        0,  241,  130, 0x0A80, 0x07D9,
+        0,  244,  128, 0x0970, 0x074E,
+        0,  246,  125, 0x084E, 0x06C7,
+        0,  248,  122, 0x0723, 0x0649,
+        0,  251,  120, 0x05F8, 0x05D7,
+        0,  253,  117, 0x04D6, 0x0579,
+        0,  254,  114, 0x03C3, 0x0532,
+        0,  256,  111, 0x02C9, 0x0509,
+        0,  259,  108, 0x01F0, 0x0504,
+        0,  261,  105, 0x0141, 0x0525,
+        0,  262,  103, 0x00C3, 0x0572,
+        0,  264,  100, 0x006E, 0x0619,
+        0,  267,   97, 0x0032, 0x0734,
+        0,  268,   95, 0x000C, 0x08AF,
+        0,  269,   93, 0xFFFF, 0x0A74,
+        0,  272,   90, 0xFFFF, 0x0C70,
+        0,  273,   88, 0xFFFF, 0x0E8E,
+        0,  274,   86, 0x0014, 0x10B6,
+        0,  275,   84, 0x0032, 0x12DA,
+        0,  277,   82, 0x0056, 0x14E1,
+        0,  277,   82, 0x007E, 0x16B9,
+        0,  278,   80, 0x00A4, 0x184B,
+        0,  278,   80, 0x00C6, 0x1983,
+        0,  279,   80, 0x00DF, 0x1A4D,
+        0,  280,   80, 0x00E9, 0x1A96,
         0,    0,    0, 0x0000, 0x0000,
 };

actors/bowser/geo.inc.c

@@ -110,11 +110,7 @@ const GeoLayout bowser_geo_0000D8[] = {
 const GeoLayout bowser_geo_000424[] = {
    GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400),
    GEO_OPEN_NODE(),
-#if BUGFIX_BOWSER_FADING_OUT
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358),
-#else
-      GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210),
-#endif
       GEO_OPEN_NODE(),
          GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL),
          GEO_OPEN_NODE(),
@@ -200,11 +196,7 @@ const GeoLayout bowser_geo_000424[] = {
                   GEO_OPEN_NODE(),
                      GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8),
                   GEO_CLOSE_NODE(),
-#if BUGFIX_BOWSER_FADING_OUT
                   GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948),
-#else
-                  GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0),
-#endif
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
@@ -226,11 +218,7 @@ const GeoLayout bowser_geo_000424[] = {
 const GeoLayout bowser_geo_000770[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
-#if BUGFIX_BOWSER_FADING_OUT
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358),
-#else
-      GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210),
-#endif
       GEO_OPEN_NODE(),
          GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL),
          GEO_OPEN_NODE(),
@@ -316,11 +304,7 @@ const GeoLayout bowser_geo_000770[] = {
                   GEO_OPEN_NODE(),
                      GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8),
                   GEO_CLOSE_NODE(),
-#if BUGFIX_BOWSER_FADING_OUT
                   GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948),
-#else
-                  GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0),
-#endif
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
@@ -338,24 +322,18 @@ const GeoLayout bowser_geo_000770[] = {
    GEO_RETURN(),
 };
 
-#ifndef VERSION_JP
 // 0x0D000AB8
 const GeoLayout bowser_shadow_geo[] = {
    GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400),
    GEO_RETURN(),
 };
-#endif
 
 // 0x0D000AB8 / 0AC4
 const GeoLayout bowser_geo[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
       GEO_ASM(0, geo_update_layer_transparency),
-#ifndef VERSION_JP
       GEO_SWITCH_CASE(3, geo_switch_anim_state),
-#else
-      GEO_SWITCH_CASE(2, geo_switch_anim_state),
-#endif
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
@@ -369,13 +347,11 @@ const GeoLayout bowser_geo[] = {
             GEO_BRANCH(1, bowser_geo_000424),
          GEO_CLOSE_NODE(),
 
-#ifndef VERSION_JP
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
             GEO_ASM(0, geo_bits_bowser_coloring),
             GEO_BRANCH(1, bowser_shadow_geo),
          GEO_CLOSE_NODE(),
-#endif
       GEO_CLOSE_NODE(),
 
    GEO_CLOSE_NODE(),
@@ -387,11 +363,7 @@ const GeoLayout bowser_geo_no_shadow[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
       GEO_ASM(0, geo_update_layer_transparency),
-#ifndef VERSION_JP
       GEO_SWITCH_CASE(3, geo_switch_anim_state),
-#else
-      GEO_SWITCH_CASE(2, geo_switch_anim_state),
-#endif
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
@@ -405,13 +377,11 @@ const GeoLayout bowser_geo_no_shadow[] = {
             GEO_BRANCH(1, bowser_geo_000770),
          GEO_CLOSE_NODE(),
 
-#ifndef VERSION_JP
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
             GEO_ASM(0, geo_bits_bowser_coloring),
             GEO_BRANCH(1, bowser_shadow_geo),
          GEO_CLOSE_NODE(),
-#endif
       GEO_CLOSE_NODE(),
 
    GEO_CLOSE_NODE(),

actors/bowser/model.inc.c

@@ -52,13 +52,13 @@ ALIGNED8 static const Texture bowser_seg6_texture_06025C38[] = {
 
 // unreferenced, seen in pre-Spaceworld 1995 B-roll footage build
 // 0x06026438
-ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = {
+UNUSED ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = {
 #include "actors/bowser/bowser_blue_eye_unused.rgba16.inc.c"
 };
 
 // unreferenced (stubbed texture? possibly original texture for mouth)
 // 0x06027438
-ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = {
+UNUSED ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = {
 #include "actors/bowser/bowser_mouth_unused.rgba16.inc.c"
 };
 
@@ -1184,7 +1184,6 @@ const Gfx bowser_seg6_dl_0603B8D0[] = {
     gsSPEndDisplayList(),
 };
 
-#if BUGFIX_BOWSER_FADING_OUT
 // 0x0603B948 - 0x0603B9C8
 const Gfx bowser_seg6_dl_0603B948[] = {
     gsDPPipeSync(),
@@ -1204,7 +1203,6 @@ const Gfx bowser_seg6_dl_0603B948[] = {
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
-#endif
 
 // 0x0603B948
 static const Vtx bowser_seg6_vertex_0603B948[] = {
@@ -2870,7 +2868,6 @@ const Gfx bowser_seg6_dl_06040210[] = {
     gsSPEndDisplayList(),
 };
 
-#if BUGFIX_BOWSER_FADING_OUT
 // 0x06040358 - 0x06040428
 const Gfx bowser_seg6_dl_06040358[] = {
     gsDPPipeSync(),
@@ -2900,7 +2897,6 @@ const Gfx bowser_seg6_dl_06040358[] = {
     gsSPDisplayList(bowser_seg6_dl_060401F0),
     gsSPEndDisplayList(),
 };
-#endif
 
 // 0x060402D8
 static const Vtx bowser_seg6_vertex_060402D8[] = {

actors/bowser_flame/model.inc.c

@@ -120,7 +120,7 @@ const Gfx flame_seg6_dl_0601C108[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06000000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06000000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -132,7 +132,7 @@ const Gfx flame_seg6_dl_0601C1A8[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06002000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06002000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06002000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -144,7 +144,7 @@ const Gfx flame_seg6_dl_0601C248[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06004000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06004000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06004000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -156,7 +156,7 @@ const Gfx flame_seg6_dl_0601C2E8[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06006000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06006000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06006000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -168,7 +168,7 @@ const Gfx flame_seg6_dl_0601C388[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06008000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06008000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06008000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -180,7 +180,7 @@ const Gfx flame_seg6_dl_0601C428[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_0600A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_0600A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -192,7 +192,7 @@ const Gfx flame_seg6_dl_0601C4C8[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_0600C000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600C000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_0600C000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -204,7 +204,7 @@ const Gfx flame_seg6_dl_0601C568[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_0600E000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600E000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_0600E000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -216,7 +216,7 @@ const Gfx flame_seg6_dl_0601C608[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06010000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06010000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06010000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -228,7 +228,7 @@ const Gfx flame_seg6_dl_0601C6A8[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06012000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06012000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06012000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -240,7 +240,7 @@ const Gfx flame_seg6_dl_0601C748[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06014000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06014000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06014000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -252,7 +252,7 @@ const Gfx flame_seg6_dl_0601C7E8[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06016000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06016000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06016000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -264,7 +264,7 @@ const Gfx flame_seg6_dl_0601C888[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_06018000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_06018000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_06018000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),
@@ -276,7 +276,7 @@ const Gfx flame_seg6_dl_0601C928[] = {
     gsDPLoadTextureBlock(flame_seg6_texture_0601A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
     gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock((u8*)flame_seg6_texture_0601A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock((Texture*)flame_seg6_texture_0601A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(flame_seg6_dl_0601C0C8),
     gsSPDisplayList(flame_seg6_dl_0601C0E0),
     gsSPEndDisplayList(),