Merge branch 'develop/2.3.0' of https://github.com/Reonu/HackerSM64 into develop/2.1.0-painting-objects

Update libpl

.clang-format

@@ -1,4 +1,5 @@
 IndentWidth: 4
+Language: Cpp
 AlignAfterOpenBracket: Align
 SortIncludes: false
 ColumnLimit: 104
@@ -8,8 +9,10 @@ AllowShortIfStatementsOnASingleLine: false
 BinPackArguments: true
 BinPackParameters: true
 SpaceAfterCStyleCast: true
+BreakBeforeBraces: Attach
 BreakBeforeTernaryOperators: true
 BreakBeforeBinaryOperators: NonAssignment
 Cpp11BracedListStyle: false
 IndentCaseLabels: true
 AlignTrailingComments: true
+UseTab: Never

.clang-tidy

@@ -0,0 +1,6 @@
+---
+Checks: '-*,readability-braces-around-statements'
+WarningsAsErrors: ''
+HeaderFilterRegex: '(src|include|enhancements)\/.*\.h$'
+FormatStyle: 'file'
+CheckOptions:

.gitattributes

@@ -0,0 +1,23 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# List text files in case git doesn't characterize correctly
+*.c text eol=lf
+*.h text eol=lf
+*.s text eol=lf
+*.in text eol=lf
+*.js text eol=lf
+*.md text eol=lf
+*.py text eol=lf
+*.sh text eol=lf
+*.ld text eol=lf
+*.inc text eol=lf
+*.txt text eol=lf
+*.json text eol=lf
+*.yaml text eol=lf
+
+# Same for binary
+*.bin binary
+*.m64 binary
+*.png binary
+*.aiff binary

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/libpl"]
+	path = lib/libpl
+	url = https://gitlab.com/parallel-launcher/libpl.git

.vscode/c_cpp_properties.json

@@ -0,0 +1,39 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/include/n64/**",
+                "${workspaceFolder}/include/**",
+                "${workspaceFolder}/textures/**",
+                "${workspaceFolder}/build/us_n64/**",
+                "${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_NON_GBI_2=1",
+                "F3DEX_GBI_SHARED=1",
+                "LIBPL=1"
+            ],
+            "compilerPath": "/usr/bin/mips-linux-gnu-gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x86"
+        }
+    ],
+    "version": 4
+}

CODEOWNERS

@@ -0,0 +1,13 @@
+# 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
+*       @gheskett
+
+# 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.

Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu:22.04 as build
+
+RUN apt-get update && \
+    apt-get install -y \
+        binutils-mips-linux-gnu \
+        bsdextrautils \
+        build-essential \
+        gcc-mips-linux-gnu \
+        libcapstone-dev \
+        pkgconf \
+        python3
+
+RUN mkdir /hackersm64
+WORKDIR /hackersm64
+ENV PATH="/hackersm64/tools:${PATH}"
+
+CMD echo 'Usage: docker run --rm -v ${PWD}:/hackersm64 hackersm64 make VERSION=us -j4\n' \
+         'See https://github.com/HackerN64/HackerSM64/blob/master/README.md for more information'

Jenkinsfile

@@ -1,45 +0,0 @@
-pipeline {
-  agent any
-  stages {
-    stage('Build Tools') {
-      steps {
-        sh 'make -j4 -C tools/'
-      }
-    }
-    stage('Extract Assets') {
-      steps {
-        sh 'ln -s "$ROMS_DIR/Super Mario 64 (J) [!].z64" baserom.jp.z64'
-        sh 'ln -s "$ROMS_DIR/Super Mario 64 (U) [!].z64" baserom.us.z64'
-        sh 'ln -s "$ROMS_DIR/Super Mario 64 (E) (M3) [!].z64" baserom.eu.z64'
-        // verify no assets were committed to repo
-        sh '[ -z "$(find {actors,levels,textures}/ -name \'*.png\')" ]'
-        sh '[ -z "$(find assets/ -name \'*.m64\' -or \'*.bin\')" ]'
-        sh './extract_assets.py jp us eu'
-      }
-    }
-    stage('Build J Source') {
-      steps {
-        sh 'make -j4 VERSION=jp'
-      }
-    }
-    stage('Build U Source') {
-      steps {
-        sh 'make -j4 VERSION=us'
-      }
-    }
-    stage('Build J Source, NON_MATCHING') {
-      steps {
-        sh 'make -j4 VERSION=jp NON_MATCHING=1'
-      }
-    }
-    stage('Build U Source, NON_MATCHING') {
-      steps {
-        sh 'make -j4 VERSION=us NON_MATCHING=1'
-      }
-    }
-  }
-  environment {
-    QEMU_IRIX = credentials('qemu-irix')
-    ROMS_DIR = credentials('roms')
-  }
-}

Makefile.split

@@ -2,10 +2,16 @@
 # General Rules
 # --------------------------------------
 
-# obtain a list of segments from the *.s files in bin directory
-SEGMENTS := $(notdir $(basename $(wildcard bin/*.s))) $(addprefix $(VERSION)/,$(notdir $(basename $(wildcard bin/$(VERSION)/*.s))))
-ACTORS := $(filter %/,$(wildcard actors/*/))
-TEXTURE_DIRS := $(addprefix textures/,$(SEGMENTS)) $(ACTORS) textures/intro_raw
+# obtain a list of segments from the *.c files in bin directory
+SEGMENTS := \
+    $(notdir $(basename $(wildcard bin/*.c))) \
+    $(addprefix $(VERSION)/,$(notdir $(basename $(wildcard bin/$(VERSION)/*.c)))) \
+    $(addsuffix _skybox,$(notdir $(basename $(wildcard textures/skyboxes/*.png))))
+
+# Directories containing PNG files
+TEXTURE_DIRS := \
+    $(wildcard textures/*/) \
+    $(filter %/,$(wildcard actors/*/))
 
 # NOTE: textures assume naming convention "texture.<encoding>.png" generates "texture.<encoding>"
 
@@ -32,12 +38,21 @@ ACTOR_GROUPS := \
     common1
 
 LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS))
-MIO0_FILES := $(addprefix $(MIO0_DIR)/,$(addsuffix .mio0,$(SEGMENTS) $(ACTOR_GROUPS) $(LEVEL_FILES)))
-MIO0_OBJ_FILES := $(MIO0_FILES:.mio0=.mio0.o)
 
-SEGMENT_ELF_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .elf,$(SEGMENTS)))
-ACTOR_ELF_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .elf,$(ACTOR_GROUPS)))
-LEVEL_ELF_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .elf,$(LEVEL_FILES)))
+LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level_dir)leveldata.elf)
+
+SEG_FILES := \
+    $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \
+    $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \
+    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf)
+
+YAY0_FILES := \
+    $(SEGMENTS:%=$(BUILD_DIR)/bin/%.szp) \
+    $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.szp) \
+    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp)
+
+YAY0_OBJ_FILES := $(YAY0_FILES:.szp=.szp.o)
+
 
 # --------------------------------------
 # Actor Rules
@@ -53,8 +68,8 @@ 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
-BUBBA_DIRS       := bubba wiggler lakitu_enemy spiny_egg spiny
+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
 SEA_DIRS         := clam_shell manta sushi unagi whirlpool
@@ -63,231 +78,195 @@ 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_waves 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 Files
-AMP_CHUCKYA_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-BOBOMBS_BUBBLE_FILES         := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KING_BOBOMB_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-BOO_BOOKEND_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOO_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-CAPSWITCH_SPRINGBOARD_FILES  := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CAPSWITCH_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-COINS_PIPE_FILES             := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(COINS_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-BOWSER_FLAMES_FILES          := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOWSER_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-BUBBA_WIGGLER_FILES          := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BUBBA_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-BULLY_BLARGG_FILES           := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BULLY_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-CHILLYCHIEF_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CHILLYCHIEF_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-HOOT_THWOMP_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(HOOT_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-KOOPA_LOG_FILES              := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KOOPA_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-KLEPTO_EYEROK_FILES          := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KLEPTO_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-LAKITU_TOAD_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(LAKITU_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-MARIO_WATER_FILES            := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MARIO_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-MOLE_UKIKI_FILES             := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MOLE_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-MR_I_SWOOP_FILES             := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MR_I_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-PEACH_TOADSTOOL_FILES        := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(PEACH_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-SEA_CREATURES_FILES          := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SEA_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-SKEETER_FISH_FILES           := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SKEETER_DIRS)),$(basename $(wildcard $(dir)/*.png)))
-SPINDRIFT_PENGUIN_FILES      := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SPINDRIFT_DIRS)),$(basename $(wildcard $(dir)/*.png)))
+# Actor Textures
+AMP_CHUCKYA_TEXTURES            := $(foreach dir,$(AMP_DIRS),        $(wildcard actors/$(dir)/*.png))
+BOBOMBS_BUBBLE_TEXTURES         := $(foreach dir,$(KING_BOBOMB_DIRS),$(wildcard actors/$(dir)/*.png))
+BOO_BOOKEND_TEXTURES            := $(foreach dir,$(BOO_DIRS),        $(wildcard actors/$(dir)/*.png))
+CAPSWITCH_SPRINGBOARD_TEXTURES  := $(foreach dir,$(CAPSWITCH_DIRS),  $(wildcard actors/$(dir)/*.png))
+COINS_PIPE_TEXTURES             := $(foreach dir,$(COINS_DIRS),      $(wildcard actors/$(dir)/*.png))
+BOWSER_FLAMES_TEXTURES          := $(foreach dir,$(BOWSER_DIRS),     $(wildcard actors/$(dir)/*.png))
+BUBBA_WIGGLER_TEXTURES          := $(foreach dir,$(BUBBA_DIRS),      $(wildcard actors/$(dir)/*.png))
+BULLY_BLARGG_TEXTURES           := $(foreach dir,$(BULLY_DIRS),      $(wildcard actors/$(dir)/*.png))
+CHILLYCHIEF_TEXTURES            := $(foreach dir,$(CHILLYCHIEF_DIRS),$(wildcard actors/$(dir)/*.png))
+HOOT_THWOMP_TEXTURES            := $(foreach dir,$(HOOT_DIRS),       $(wildcard actors/$(dir)/*.png))
+KOOPA_LOG_TEXTURES              := $(foreach dir,$(KOOPA_DIRS),      $(wildcard actors/$(dir)/*.png))
+KLEPTO_EYEROK_TEXTURES          := $(foreach dir,$(KLEPTO_DIRS),     $(wildcard actors/$(dir)/*.png))
+LAKITU_TOAD_TEXTURES            := $(foreach dir,$(LAKITU_DIRS),     $(wildcard actors/$(dir)/*.png))
+MARIO_WATER_TEXTURES            := $(foreach dir,$(MARIO_DIRS),      $(wildcard actors/$(dir)/*.png))
+MOLE_UKIKI_TEXTURES             := $(foreach dir,$(MOLE_DIRS),       $(wildcard actors/$(dir)/*.png))
+MR_I_SWOOP_TEXTURES             := $(foreach dir,$(MR_I_DIRS),       $(wildcard actors/$(dir)/*.png))
+PEACH_TOADSTOOL_TEXTURES        := $(foreach dir,$(PEACH_DIRS),      $(wildcard actors/$(dir)/*.png))
+SEA_CREATURES_TEXTURES          := $(foreach dir,$(SEA_DIRS),        $(wildcard actors/$(dir)/*.png))
+SKEETER_FISH_TEXTURES           := $(foreach dir,$(SKEETER_DIRS),    $(wildcard actors/$(dir)/*.png))
+SPINDRIFT_PENGUIN_TEXTURES      := $(foreach dir,$(SPINDRIFT_DIRS),  $(wildcard actors/$(dir)/*.png))
 
 # Actor dependencies
-$(BUILD_DIR)/bin/group0.o: $(addprefix $(BUILD_DIR)/,$(MARIO_WATER_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MARIO_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group1.o: $(addprefix $(BUILD_DIR)/,$(HOOT_THWOMP_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(HOOT_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group2.o: $(addprefix $(BUILD_DIR)/,$(BULLY_BLARGG_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BULLY_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group3.o: $(addprefix $(BUILD_DIR)/,$(BOBOMBS_BUBBLE_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KING_BOBOMB_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group4.o: $(addprefix $(BUILD_DIR)/,$(SEA_CREATURES_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SEA_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group5.o: $(addprefix $(BUILD_DIR)/,$(KLEPTO_EYEROK_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KLEPTO_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group6.o: $(addprefix $(BUILD_DIR)/,$(MOLE_UKIKI_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MOLE_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group7.o: $(addprefix $(BUILD_DIR)/,$(SPINDRIFT_PENGUIN_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SPINDRIFT_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group8.o: $(addprefix $(BUILD_DIR)/,$(CAPSWITCH_SPRINGBOARD_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CAPSWITCH_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group9.o: $(addprefix $(BUILD_DIR)/,$(BOO_BOOKEND_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOO_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group10.o: $(addprefix $(BUILD_DIR)/,$(PEACH_TOADSTOOL_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(PEACH_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group11.o: $(addprefix $(BUILD_DIR)/,$(BUBBA_WIGGLER_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BUBBA_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group12.o: $(addprefix $(BUILD_DIR)/,$(BOWSER_FLAMES_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOWSER_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group13.o: $(addprefix $(BUILD_DIR)/,$(SKEETER_FISH_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SKEETER_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group14.o: $(addprefix $(BUILD_DIR)/,$(KOOPA_LOG_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KOOPA_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group15.o: $(addprefix $(BUILD_DIR)/,$(LAKITU_TOAD_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(LAKITU_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group16.o: $(addprefix $(BUILD_DIR)/,$(CHILLYCHIEF_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CHILLYCHIEF_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/group17.o: $(addprefix $(BUILD_DIR)/,$(MR_I_SWOOP_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MR_I_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/common0.o: $(addprefix $(BUILD_DIR)/,$(AMP_CHUCKYA_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(wildcard $(dir)/*.s))
-$(BUILD_DIR)/bin/common1.o: $(addprefix $(BUILD_DIR)/,$(COINS_PIPE_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(COINS_DIRS)),$(wildcard $(dir)/*.s))
+$(BUILD_DIR)/actors/group0.o:  $(MARIO_WATER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group1.o:  $(HOOT_THWOMP_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group2.o:  $(BULLY_BLARGG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group3.o:  $(BOBOMBS_BUBBLE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group4.o:  $(SEA_CREATURES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group5.o:  $(KLEPTO_EYEROK_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group6.o:  $(MOLE_UKIKI_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group7.o:  $(SPINDRIFT_PENGUIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group8.o:  $(CAPSWITCH_SPRINGBOARD_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group9.o:  $(BOO_BOOKEND_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group10.o: $(PEACH_TOADSTOOL_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group11.o: $(BUBBA_WIGGLER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group12.o: $(BOWSER_FLAMES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group13.o: $(SKEETER_FISH_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group14.o: $(KOOPA_LOG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group15.o: $(LAKITU_TOAD_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group16.o: $(CHILLYCHIEF_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/group17.o: $(MR_I_SWOOP_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/common0.o: $(AMP_CHUCKYA_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/actors/common1.o: $(COINS_PIPE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
 
 # Actor Elf Files
-$(BUILD_DIR)/bin/group0.elf: SEGMENT_ADDRESS := 0x04000000
-$(BUILD_DIR)/bin/group1.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group2.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group3.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group4.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group5.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group6.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group7.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group8.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group9.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group10.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group11.elf: SEGMENT_ADDRESS := 0x05000000
-$(BUILD_DIR)/bin/group12.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/group13.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/group14.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/group15.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/group16.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/group17.elf: SEGMENT_ADDRESS := 0x06000000
-$(BUILD_DIR)/bin/common0.elf: SEGMENT_ADDRESS := 0x08000000
-$(BUILD_DIR)/bin/common1.elf: SEGMENT_ADDRESS := 0x03000000
+$(BUILD_DIR)/actors/group0.elf:  SEGMENT_ADDRESS := 0x04000000
+$(BUILD_DIR)/actors/group1.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group2.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group3.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group4.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group5.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group6.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group7.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group8.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group9.elf:  SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group10.elf: SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group11.elf: SEGMENT_ADDRESS := 0x05000000
+$(BUILD_DIR)/actors/group12.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/group13.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/group14.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/group15.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/group16.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/group17.elf: SEGMENT_ADDRESS := 0x06000000
+$(BUILD_DIR)/actors/common0.elf: SEGMENT_ADDRESS := 0x08000000
+$(BUILD_DIR)/actors/common1.elf: SEGMENT_ADDRESS := 0x03000000
 
 # --------------------------------------
 # Level Rules
 # --------------------------------------
 
-# Using these rules:
-# When defining a level, define the 3 variables needed and copy the rules
-# as-is.
+$(BUILD_DIR)/levels/%/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
+
 # TODO: Generate these rules from the level configs?
 
-define level_rules = 
-    $(1)_SEG7_FILES     := $$(basename $$(notdir $$(wildcard levels/$(1)/*.png)))
-    $(1)_SEG7_FILES_RAW := $(shell find levels/$(1)/ -type f -iname '*')
-    $$(BUILD_DIR)/bin/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/levels/$(1)/,$$($(1)_SEG7_FILES)) $$($(1)_SEG7_FILES_RAW)
-    $$(BUILD_DIR)/bin/$(1)/leveldata.elf: SEGMENT_ADDRESS := $(2)
-    $$(BUILD_DIR)/bin/$(1)/leveldata.elf: TEXTURE_BIN := $(3)
+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)
 endef
 
-$(eval $(call level_rules,bbh,0x07000000,spooky)) # BBH (Big Boo's Haunt)
-$(eval $(call level_rules,ccm,0x07000000,snow)) # CCM (Cool Cool Mountain)
-$(eval $(call level_rules,castle_inside,0x07000000,inside)) # Castle Inside (Inside Princess Peach's Castle)
-$(eval $(call level_rules,hmc,0x07000000,cave))# HMC (Hazy Maze Cave)
-$(eval $(call level_rules,ssl,0x07000000,generic)) # SSL (Shifting Sand Land)
-$(eval $(call level_rules,bob,0x07000000,generic)) # BOB (Bob-Omb Battlefield)
-$(eval $(call level_rules,sl,0x07000000,snow)) # SL (Snowman's Land)
-$(eval $(call level_rules,wdw,0x07000000,grass)) # WDW (Wet Dry World)
-$(eval $(call level_rules,jrb,0x07000000,water)) # JRB (Jolly Roger Bay)
-$(eval $(call level_rules,thi,0x07000000,grass)) # THI (Tiny Huge Island)
-$(eval $(call level_rules,ttc,0x07000000,machine)) # TTC (Tick Tock Clock)
-$(eval $(call level_rules,rr,0x07000000,sky)) # RR (Rainbow Ride)
-$(eval $(call level_rules,castle_grounds,0x07000000,outside)) # Castle Grounds (Outside Princess Peach's Castle)
-$(eval $(call level_rules,bitdw,0x07000000,sky)) # BitDW (Bowser in the Dark World)
-$(eval $(call level_rules,vcutm,0x07000000,outside)) # VCUTM (Vanish Cap under the Moat)
-$(eval $(call level_rules,bitfs,0x07000000,sky)) # BITFS (Bowser in the Fire Sea)
-$(eval $(call level_rules,sa,0x07000000,inside)) # SA (The Secret Aquarium)
-$(eval $(call level_rules,bits,0x07000000,sky)) # BITS (Bowser in the Sky)
-$(eval $(call level_rules,lll,0x07000000,fire)) # LLL (Lethal Lava Land)
-$(eval $(call level_rules,ddd,0x07000000,water)) # DDD (Dire Dire Docks)
-$(eval $(call level_rules,wf,0x07000000,grass)) # WF (Whomp's Fortress)
-$(eval $(call level_rules,ending,0x07000000,generic)) # Ending
-$(eval $(call level_rules,castle_courtyard,0x07000000,outside)) # Castle Courtyard (The Courtyard of Princess Peach's Castle)
-$(eval $(call level_rules,pss,0x07000000,mountain)) # PSS (The Princess's Secret Slide)
-$(eval $(call level_rules,cotmc,0x07000000,cave)) # COTMC (Cavern of the Metal Cap)
-$(eval $(call level_rules,totwc,0x07000000,sky)) # TOTWC (Tower of the Wing Cap)
-$(eval $(call level_rules,bowser_1,0x07000000,generic)) # BOWSER_1 (Bowser in the Dark World [Boss Area])
-$(eval $(call level_rules,wmotr,0x07000000,generic)) # WMOTR (Wing Mario over the Rainbow)
-$(eval $(call level_rules,bowser_2,0x07000000,fire)) # BOWSER_2 (Bowser in the Fire Sea [Boss Area])
-$(eval $(call level_rules,bowser_3,0x07000000,generic)) # BOWSER_3 (Bowser in the Sky [Boss Area])
-$(eval $(call level_rules,totwc,0x07000000,sky)) # TOTWC (Tower of the Wing Cap)
-$(eval $(call level_rules,ttm,0x07000000,mountain)) # TTM (Tall Tall Mountain)
-$(eval $(call level_rules,intro,0x07000000,generic)) # Intro (Super Mario 64 Logo)
-$(eval $(call level_rules,menu,0x07000000,generic)) # Menu (File Select)
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
+$(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
+	$(call print,Preprocessing level make rules:,$<,$@)
+	$(V)$(CPP) $(CPPFLAGS) $(VERSION_CFLAGS) -I . -o $@ $<
+include $(BUILD_DIR)/level_rules.mk
+endif
+endif
+
+# --------------------------------------
+# Extra Level Rules
+# --------------------------------------
+$(eval $(call level_rules,intro,generic)) # Intro (Super Mario 64 Logo)
+$(eval $(call level_rules,menu,generic)) # Menu (File Select)
+
+# --------------------------------------
+# Cake Texture Rules
+# --------------------------------------
+
+# Ending cake textures are generated in a special way
+$(BUILD_DIR)/levels/ending/cake_eu.inc.c: levels/ending/cake_eu.png
+	$(call print,Splitting:,$<,$@)
+	$(V)$(SKYCONV) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
+$(BUILD_DIR)/levels/ending/cake.inc.c: levels/ending/cake.png
+	$(call print,Splitting:,$<,$@)
+	$(V)$(SKYCONV) --type cake --split $^ $(BUILD_DIR)/levels/ending
 
 # --------------------------------------
 # Texture Bin Rules
 # --------------------------------------
 
 # Others
-SEGMENT2_FILES               := $(basename $(wildcard $(TEXTURE_DIR)/segment2/*.png))
-TITLE_SCREEN_BG_FILES        := $(basename $(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png))
-SPOOKY_FILES                 := $(basename $(wildcard $(TEXTURE_DIR)/spooky/*.png))
-GENERIC_FILES                := $(basename $(wildcard $(TEXTURE_DIR)/generic/*.png))
-OUTSIDE_FILES                := $(basename $(wildcard $(TEXTURE_DIR)/outside/*.png))
-SNOW_FILES                   := $(basename $(wildcard $(TEXTURE_DIR)/snow/*.png))
-EFFECT_FILES                 := $(basename $(wildcard $(TEXTURE_DIR)/effect/*.png))
-CAVE_FILES                   := $(basename $(wildcard $(TEXTURE_DIR)/cave/*.png))
-INSIDE_FILES                 := $(basename $(wildcard $(TEXTURE_DIR)/inside/*.png))
-WATER_FILES                  := $(basename $(wildcard $(TEXTURE_DIR)/water/*.png))
-FIRE_TEXTURES_FILES          := $(basename $(wildcard $(TEXTURE_DIR)/fire/*.png))
-SKY_FILES                    := $(basename $(wildcard $(TEXTURE_DIR)/sky/*.png))
-MACHINE_FILES                := $(basename $(wildcard $(TEXTURE_DIR)/machine/*.png))
-MOUNTAIN_FILES               := $(basename $(wildcard $(TEXTURE_DIR)/mountain/*.png))
-GRASS_FILES                  := $(basename $(wildcard $(TEXTURE_DIR)/grass/*.png))
+SEGMENT2_TEXTURES               := $(wildcard $(TEXTURE_DIR)/segment2/*.png)
+TITLE_SCREEN_BG_TEXTURES        := $(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png)
+SPOOKY_TEXTURES                 := $(wildcard $(TEXTURE_DIR)/spooky/*.png)
+GENERIC_TEXTURES                := $(wildcard $(TEXTURE_DIR)/generic/*.png)
+OUTSIDE_TEXTURES                := $(wildcard $(TEXTURE_DIR)/outside/*.png)
+SNOW_TEXTURES                   := $(wildcard $(TEXTURE_DIR)/snow/*.png)
+EFFECT_TEXTURES                 := $(wildcard $(TEXTURE_DIR)/effect/*.png)
+CAVE_TEXTURES                   := $(wildcard $(TEXTURE_DIR)/cave/*.png)
+INSIDE_TEXTURES                 := $(wildcard $(TEXTURE_DIR)/inside/*.png)
+WATER_TEXTURES                  := $(wildcard $(TEXTURE_DIR)/water/*.png)
+FIRE_TEXTURES_TEXTURES          := $(wildcard $(TEXTURE_DIR)/fire/*.png)
+SKY_TEXTURES                    := $(wildcard $(TEXTURE_DIR)/sky/*.png)
+MACHINE_TEXTURES                := $(wildcard $(TEXTURE_DIR)/machine/*.png)
+MOUNTAIN_TEXTURES               := $(wildcard $(TEXTURE_DIR)/mountain/*.png)
+GRASS_TEXTURES                  := $(wildcard $(TEXTURE_DIR)/grass/*.png)
 
 # Texture Files
-$(BUILD_DIR)/bin/segment2.o: $(addprefix $(BUILD_DIR)/,$(SEGMENT2_FILES))
-$(BUILD_DIR)/bin/title_screen_bg.o: $(addprefix $(BUILD_DIR)/,$(TITLE_SCREEN_BG_FILES))
-$(BUILD_DIR)/bin/spooky.o: $(addprefix $(BUILD_DIR)/,$(SPOOKY_FILES))
-$(BUILD_DIR)/bin/generic.o: $(addprefix $(BUILD_DIR)/,$(GENERIC_FILES))
-$(BUILD_DIR)/bin/outside.o: $(addprefix $(BUILD_DIR)/,$(OUTSIDE_FILES))
-$(BUILD_DIR)/bin/snow.o: $(addprefix $(BUILD_DIR)/,$(SNOW_FILES))
-$(BUILD_DIR)/bin/effect.o: $(addprefix $(BUILD_DIR)/,$(EFFECT_FILES))
-$(BUILD_DIR)/bin/cave.o: $(addprefix $(BUILD_DIR)/,$(CAVE_FILES))
-$(BUILD_DIR)/bin/inside.o: $(addprefix $(BUILD_DIR)/,$(INSIDE_FILES))
-$(BUILD_DIR)/bin/water.o: $(addprefix $(BUILD_DIR)/,$(WATER_FILES))
-$(BUILD_DIR)/bin/fire.o: $(addprefix $(BUILD_DIR)/,$(FIRE_TEXTURES_FILES))
-$(BUILD_DIR)/bin/sky.o: $(addprefix $(BUILD_DIR)/,$(SKY_FILES))
-$(BUILD_DIR)/bin/machine.o: $(addprefix $(BUILD_DIR)/,$(MACHINE_FILES))
-$(BUILD_DIR)/bin/mountain.o: $(addprefix $(BUILD_DIR)/,$(MOUNTAIN_FILES))
-$(BUILD_DIR)/bin/grass.o: $(addprefix $(BUILD_DIR)/,$(GRASS_FILES))
+$(BUILD_DIR)/bin/segment2.o:        $(SEGMENT2_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/title_screen_bg.o: $(TITLE_SCREEN_BG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/spooky.o:          $(SPOOKY_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/generic.o:         $(GENERIC_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/outside.o:         $(OUTSIDE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/snow.o:            $(SNOW_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/effect.o:          $(EFFECT_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/cave.o:            $(CAVE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/inside.o:          $(INSIDE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/water.o:           $(WATER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/fire.o:            $(FIRE_TEXTURES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/sky.o:             $(SKY_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/machine.o:         $(MACHINE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/mountain.o:        $(MOUNTAIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
+$(BUILD_DIR)/bin/grass.o:           $(GRASS_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
 
 # Others
-$(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000
-$(BUILD_DIR)/bin/title_screen_bg.elf: SEGMENT_ADDRESS := 0x0A000000
+$(BUILD_DIR)/bin/segment2.elf:           SEGMENT_ADDRESS := 0x02000000
+$(BUILD_DIR)/bin/title_screen_bg.elf:    SEGMENT_ADDRESS := 0x0A000000
 $(BUILD_DIR)/bin/debug_level_select.elf: SEGMENT_ADDRESS := 0x07000000
-$(BUILD_DIR)/bin/effect.elf: SEGMENT_ADDRESS := 0x0B000000
-$(BUILD_DIR)/bin/spooky.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/generic.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/outside.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/snow.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/cave.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/inside.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/water.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/fire.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/sky.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
-$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
-
+$(BUILD_DIR)/bin/effect.elf:             SEGMENT_ADDRESS := 0x0B000000
+$(BUILD_DIR)/bin/spooky.elf:             SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/generic.elf:            SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/outside.elf:            SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/snow.elf:               SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/cave.elf:               SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/inside.elf:             SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/water.elf:              SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/fire.elf:               SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/sky.elf:                SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/machine.elf:            SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/mountain.elf:           SEGMENT_ADDRESS := 0x09000000
+$(BUILD_DIR)/bin/grass.elf:              SEGMENT_ADDRESS := 0x09000000
 # EU segment 19 translations
-$(BUILD_DIR)/bin/$(VERSION)/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
-$(BUILD_DIR)/bin/$(VERSION)/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
-$(BUILD_DIR)/bin/$(VERSION)/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/eu/translation_de.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/eu/translation_en.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/eu/translation_fr.elf:  SEGMENT_ADDRESS := 0x19000000
 
 # --------------------------------------
 # Skybox Rules
 # --------------------------------------
 
-# Skybox Files
-BBH_SKYBOX_FILES             := $(basename $(wildcard $(TEXTURE_DIR)/bbh_skybox/*.png))
-BIDW_SKYBOX_FILES            := $(basename $(wildcard $(TEXTURE_DIR)/bidw_skybox/*.png))
-BITFS_SKYBOX_FILES           := $(basename $(wildcard $(TEXTURE_DIR)/bitfs_skybox/*.png))
-BITS_SKYBOX_FILES            := $(basename $(wildcard $(TEXTURE_DIR)/bits_skybox/*.png))
-CCM_SKYBOX_FILES             := $(basename $(wildcard $(TEXTURE_DIR)/ccm_skybox/*.png))
-CLOUD_FLOOR_SKYBOX_FILES     := $(basename $(wildcard $(TEXTURE_DIR)/cloud_floor_skybox/*.png))
-CLOUDS_SKYBOX_FILES          := $(basename $(wildcard $(TEXTURE_DIR)/clouds_skybox/*.png))
-SSL_SKYBOX_FILES             := $(basename $(wildcard $(TEXTURE_DIR)/ssl_skybox/*.png))
-WATER_SKYBOX_FILES           := $(basename $(wildcard $(TEXTURE_DIR)/water_skybox/*.png))
-WDW_SKYBOX_FILES             := $(basename $(wildcard $(TEXTURE_DIR)/wdw_skybox/*.png))
+$(BUILD_DIR)/bin/%_skybox.c: textures/skyboxes/%.png
+	$(call print,Splitting:,$<,$@)
+	$(V)$(SKYCONV) --type sky --split $^ $(BUILD_DIR)/bin
 
-# Skybox Files
-$(BUILD_DIR)/bin/bbh_skybox.o: $(addprefix $(BUILD_DIR)/,$(BBH_SKYBOX_FILES))
-$(BUILD_DIR)/bin/bidw_skybox.o: $(addprefix $(BUILD_DIR)/,$(BIDW_SKYBOX_FILES))
-$(BUILD_DIR)/bin/bitfs_skybox.o: $(addprefix $(BUILD_DIR)/,$(BITFS_SKYBOX_FILES))
-$(BUILD_DIR)/bin/bits_skybox.o: $(addprefix $(BUILD_DIR)/,$(BITS_SKYBOX_FILES))
-$(BUILD_DIR)/bin/ccm_skybox.o: $(addprefix $(BUILD_DIR)/,$(CCM_SKYBOX_FILES))
-$(BUILD_DIR)/bin/cloud_floor_skybox.o: $(addprefix $(BUILD_DIR)/,$(CLOUD_FLOOR_SKYBOX_FILES))
-$(BUILD_DIR)/bin/clouds_skybox.o: $(addprefix $(BUILD_DIR)/,$(CLOUDS_SKYBOX_FILES))
-$(BUILD_DIR)/bin/ssl_skybox.o: $(addprefix $(BUILD_DIR)/,$(SSL_SKYBOX_FILES))
-$(BUILD_DIR)/bin/water_skybox.o: $(addprefix $(BUILD_DIR)/,$(WATER_SKYBOX_FILES))
-$(BUILD_DIR)/bin/wdw_skybox.o: $(addprefix $(BUILD_DIR)/,$(WDW_SKYBOX_FILES))
-
-# Skybox Files
-$(BUILD_DIR)/bin/bbh_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/bidw_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/bitfs_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/bits_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/ccm_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/cloud_floor_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/clouds_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/ssl_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/water_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
-$(BUILD_DIR)/bin/wdw_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
+$(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
 
 # --------------------------------------
 # Misc Rules
 # --------------------------------------
 
-# intro_raw textures are not compressed
-INTRO_RAW_FILES              := $(basename $(notdir $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)))
-$(BUILD_DIR)/data/goddard_tex_dl.o: $(addprefix $(BUILD_DIR)/textures/intro_raw/,$(INTRO_RAW_FILES))
+# intro and ipl3 textures are not compressed
+INTRO_RAW_FILES              := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
+$(BUILD_DIR)/src/goddard/renderer.o: $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(INTRO_RAW_FILES)))
+
+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_custom/*.png)
+CRASH_TEXTURE_C_FILES       := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES)))

README.md

@@ -1,82 +1,213 @@
-# Super Mario 64
+# ![](https://i.imgur.com/CeOukzk.gif) HackerSM64 ![](https://i.imgur.com/s0LUbTo.gif)
 
-This repo contains a full decompilation of Super Mario 64 (J) and (U).
-The source and data have been decompiled but complete naming and documentation
-all of the code and data is still a work in progress. Decompiling the (E) ROM
-is also an ongoing effort.
+**AFTER CLONING THE REPO, CHECK OUT THE `include/config` FOLDER BEFORE ANYTHING ELSE! THERE'S A LOT OF STUFF IN THIS REPO THAT CAN BE TOGGLED THERE.**
 
-It builds the following ROMs:
+HackerSM64 now has a discord server! https://discord.gg/brETAakcXr
 
-* sm64.jp.z64 `sha1: 8a20a5c83d6ceb0f0506cfc9fa20d8f438cafe51`
-* sm64.us.z64 `sha1: 9bef1128717f958171a4afac3ed78ee2bb4e86ce`
+This repo requires BOTH a US ROM and a JP ROM in order to build. Place baserom.us.z64 in the repo as usual and ALSO include baserom.jp.z64.
 
-This repo does not include all assets necessary for compiling the ROMs.
-A prior copy of the game is required to extract the required assets.
+This repo needs gcc in order to be able to build it. To install it, run `sudo apt install gcc-mips-linux-gnu`
 
-## Installation
+This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in the config files):
 
-### Linux
+**Credits**
+- **ArcticJaguar725**: Most audio configuration and layout changes, colored ia4 text, floombas, various bugfixes, and more
+- **CowQuack**: Adjustable skybox sizes, area-specific skybox function
+- **thecozies**: Water surface types, general maintenance, and time
+- **MrComit**: General use object defines, JUMP_KICK_FIX
+- **aglab2**: Bugfixes (particularly puppycam), refactor stuff
+- **someone2639**: math.s and crash screen disam, stack trace, map packing, shiftable segments 2, S2DEX engine
+- **Arthurtilly**: Platform Displacement 2
+- **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
+- **Reonu**: Starting the project/repo, widescreen, reonucam, various defines for hacker QoL
+- **JoshDuMan**: Decomp guy, general assistance
+- **Arceveti**: Silhouette, shadow optimizations, better hanging, breath meter, painting objects, 4 controller support, implementation of frameperfection's rounded corners fix, naming most unknowns, various hacker QOL improvements, and various optimizations/fixes
+- **axollyon**: Console testing, bugfixes, idea-guying, and had a hand in silhouettes
+- **Wiseguy**:  World scale reimplementation, silhouette, graph node optimisations, instant input patch, cake screen fix, segmented code support, and various optimizations/fixes
+- **Kaze**: Graph node optimisations, automatic optimal collision distance
+- **Pyro Jay**: Texture improvements, repo banner art, some QoL stuff
+- **CrashOveride**: creating the [ultrasm64](https://github.com/CrashOveride95/ultrasm64) repo
+- **falcobuster**: Original coordinate overflow fix (world scale), ASM version of extended bounds, emulator detector
+- **anonymous_moose**: porting falco's extended bounds to decomp
+- **tuxlovesyou**: `LOAD_MIO0_TEXTURE` macro and moral support
+- **devwizard**: the PJ64 pre-v3.0 detection part of the emulator detector
 
-1. For each version (jp/us/eu) that you want to build a ROM for, put an existing ROM at
-`./baserom.<version>.z64` for asset extraction.
+Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 
-2. Install the following packages:
+**Lighting Engine by Wiseguy**
+- Lighting Engine is available on a separate branch ([base/lighting-engine](https://github.com/Reonu/HackerSM64/tree/base/lighting-engine)). Instructions on how to use it are in the readme of that branch.
 
-__Debian / Ubuntu__
-* git
-* binutils-mips-linux-gnu / mips64-elf (>= 2.27)
-* python3 (>= 3.7)
-* build-essential
-* pkg-config
-* zlib1g-dev
-* libaudiofile-dev
+**Puppycam**
+- Puppycam is available on the master branch now, you can toggle it in `config/config_camera.h`. *
 
-__Arch Linux__
-* base-devel
-* python
-* audiofile
-* [mips64-elf-binutils](https://aur.archlinux.org/packages/mips64-elf-binutils) (AUR)
-* [qemu-irix-git](https://aur.archlinux.org/packages/qemu-irix-git) (AUR)
+**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 *
+- 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 Reonu. 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
 
-3. Install qemu-irix
+**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/config_menu.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/config_game.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 `include/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/config_rom.h` to make it simpler
+- There is a `gEmulator` variable to detect console or specific emulators and emulator versions
+- 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/config_debug.h` in order to boot straight into it, so you can quickly test the level you're working on. *
+- Allow 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/config_debug.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. *
 
-  3.a Options:
-     1. Clone https://github.com/n64decomp/qemu-irix to somewhere and follow its
-        install instructions in the README.
-     2. Optionally, grab the prebuilt qemu-irix from the Releases section.
-     3. (Arch) Use AUR package [qemu-irix-git](https://aur.archlinux.org/packages/qemu-irix-git)
+**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) *
+- Adjustable world scale. You can change the geometry scaling of your level, which allow large levels to render correctly on console and LLE emulators while not hurting anything on HLE plugins.
+- A couple vanilla texture fixes
+- Smoke fix (the smoke texture uses the correct texture format)
 
-  3.b (For options 1 or 2), copy executable `qemu-irix` from irix-linux-user to
-      somewhere convenient with a relatively short path.
-```
-mkdir -p /opt/qemu-irix/bin
-cp irix-linux-user/qemu-irix /opt/qemu-irix/bin
-```
+**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 `gEmulator` 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 (64x64) coins, the vanilla coin texture is upgraded to accomodate. *
+- ia8 (64x64) 30 FPS coins (Textures by InTheBeef, cleaned up by Arceveti). *
+- Floombas! Simply just retextured goombas with customizable 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/config_graphics.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 a 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 details and 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.
+- Red Coin Stars now support up to 99 red coins! In addition, multi-area red coin missions can now be created by setting the 2nd behavior paramater of the red coin star to the number of reds required for the star to spawn.
+# UltraSM64
 
-  3.c Define `QEMU_IRIX` environment variable in your `~/.bashrc` to point to
-      this qemu-irix executable.
-```
-export QEMU_IRIX=/opt/qemu-irix/bin/qemu-irix
-```
+- 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 `gEmulator` 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.
 
-6. Run `make` to build the ROM (defaults to us version). Make sure your path to
-   the repo is not too long or else this process will error, as the emulated
-   IDO compiler cannot handle paths longer than 255 characters.
-Build examples:
-```
-make VERSION=jp -j4       # build (J) version instead with 4 jobs
-make VERSION=eu COMPARE=0 # non-matching EU version still WIP
+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.
 
-## Windows
+## Additional Prerequisites
 
-For Windows, install WSL and a distro of your choice and follow the Linux guide.
+BinPNG (the CI texture converter) requires some python3 dependencies. Use pip to install them.
 
-## Contributing
+``pip install pypng bitstring``
 
-Pull requests are welcome. For major changes, please open an issue first to
-discuss what you would like to change.
+## UNFLoader support
 
-Run clang-format on your code to ensure it meets the project's coding standards.
+The repository supports UNFLoader for debugging.
+To build with UNF, run make with ``UNF=1``.
 
-Official discord: https://discord.gg/27JtCWs
+Further instructions can be found at the [official repository](https://github.com/buu342/N64-UNFLoader)
+
+**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**
+
+## 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``.
+
+I may attempt FlashRAM in the future.
+
+## 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.
+
+## Compression
+
+The repo also supports RNC (Rob Northen Compression). RNC has two methods.
+
+Method 1 is designed to compress as small as possible, while method 2 is designed so that decompression is as fast as possible.
+
+Method 1 is the current default, and is the best all-rounder in terms of speed and ratio.
+
+Both methods are fast. Method 1 has better compression than 2, so I suggest using method 1 if using RNC.
+
+To switch to RNC, run make with either ``COMPRESS=rnc1`` or ``COMPRESS=rnc2``, depending on preferred method.
+
+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.
+
+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.
+
+To use ``libdeflate-gzip``, first clone the [repo](https://github.com/ebiggers/libdeflate), then `make` and `make install` it.
+
+Then run make for sm64 with ``GZIPVER=libdef`` in addition to ``COMPRESS=gzip``
+
+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.
+
+## FAQ
+
+Q: Why in the hell are you bundling your own build of ``ld``?
+
+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
+
+Q: Will this allow me to use FlashRAM/Transfer Pak/microcode swapping/Other Cool N64 Features?
+
+A: Theoretically, all yes.
+
+## Installation help
+
+Go read the original SM64 repo README.md

VERSION.txt

@@ -0,0 +1 @@
+v2.2.0

actors/amp/anims/animation.inc.c

@@ -0,0 +1,51 @@
+static const s16 dAmpAnimValue[] = {
+    0x0000, 0x0000, 0x0D79, 0x1AF2, 0x286B, 0x35E4, 0x435D, 0x50D6,
+    0x5E50, 0x6BC9, 0x7942, 0x86BE, 0x9437, 0xA1B0, 0xAF2A, 0xBCA3,
+    0xCA1C, 0xD795, 0xE50E, 0xF287, 0x1872, 0x0000, 0x1AF2, 0x35E4,
+    0x50D6, 0x6BC9, 0x86BE, 0xA1B0, 0xBCA3, 0xD795, 0xF287, 0x0D79,
+    0x286B, 0x435D, 0x5E50, 0x7942, 0x9437, 0xAF2A, 0xCA1C, 0xE50E,
+    0x0000, 0x1AF2, 0x35E4, 0x50D6, 0x6BC9, 0x86BE, 0xA1B0, 0xBCA3,
+    0xD795, 0xF287, 0x0D79, 0x286B, 0x435D, 0x5E50, 0x7942, 0x9437,
+    0xAF2A, 0xCA1C, 0xE50E, 0x8001, 0x5793, 0x2F28, 0x06BC, 0xDE52,
+    0xB5E6, 0x8D7B, 0x650C, 0x3CA1, 0x1435, 0xEBCB, 0xC35F, 0x9AF4,
+    0x7285, 0x4A1A, 0x21AE, 0xF944, 0xD0D8, 0xA86D, 0x3FFF, 0x0000,
+    0x0D7C, 0x1AF9, 0x2876, 0x35F3, 0x4370, 0x50ED, 0x5E6A, 0x6BE7,
+    0x7964, 0x86E3, 0x9460, 0xA1DD, 0xAF5A, 0xBCD7, 0xCA54, 0xD7D1,
+    0xE54E, 0xF2CB, 0xC001, 0x3FFF, 0x0000, 0x0D7B, 0x1AF7, 0x2873,
+    0x35EF, 0x436B, 0x50E6, 0x5E62, 0x6BDE, 0x795A, 0x86D9, 0x9455,
+    0xA1D0, 0xAF4C, 0xBCC8, 0xCA44, 0xD7C0, 0xE53B, 0xF2B7, 0xC001,
+    0x3FFF, 0xC001, 0xCD7A, 0xDAF2, 0xE86B, 0xF5E3, 0x035B, 0x10D3,
+    0x1E4C, 0x2BC4, 0x393D, 0x46B5, 0x542E, 0x61A6, 0x6F1F, 0x7C97,
+    0x8A13, 0x978B, 0xA504, 0xB27D, 0xC001, 0x3FFF, 0x4D79, 0x5AF2,
+    0x686C, 0x75E5, 0x8362, 0x90DB, 0x9E55, 0xABCF, 0xB948, 0xC6C2,
+    0xD43B, 0xE1B5, 0xEF2F, 0xFCA8, 0x0A21, 0x179A, 0x2514, 0x328D,
+    0xC001, 0x3FFF,
+};
+
+static const u16 dAmpAnimIndex[] = {
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x00A1,
+    0x0001, 0x0000, 0x0013, 0x008D, 0x0001, 0x00A0,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0013, 0x0001,
+    0x0001, 0x0000, 0x0013, 0x0079, 0x0001, 0x008C,
+    0x0001, 0x0014, 0x0001, 0x0000, 0x0013, 0x0015,
+    0x0001, 0x0000, 0x0013, 0x0064, 0x0001, 0x0077,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0013, 0x0028,
+    0x0001, 0x0000, 0x0013, 0x004F, 0x0001, 0x0062,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0013, 0x003B,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0078,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0063,
+    0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x004E,
+};
+
+static const struct Animation dAmpAnimation = {
+    0,
+    0,
+    0,
+    0,
+    0x13,
+    ANIMINDEX_NUMPARTS(dAmpAnimIndex),
+    dAmpAnimValue,
+    dAmpAnimIndex,
+    0,
+};

actors/amp/anims/data.inc.c

@@ -0,0 +1 @@
+#include "animation.inc.c"

actors/amp/anims/table.inc.c

@@ -0,0 +1,3 @@
+const struct Animation *const dAmpAnimsList[] = {
+    &dAmpAnimation,
+};

actors/amp/collision.s

@@ -1,2 +0,0 @@
-# Amp
-

actors/amp/geo.inc.c

@@ -0,0 +1,55 @@
+const GeoLayout dAmpGeo[] = {
+   GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xC8, 100),
+   GEO_OPEN_NODE(),
+      GEO_SCALE(0x00, 16384),
+      GEO_OPEN_NODE(),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
+         GEO_OPEN_NODE(),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpEyeDl),
+            GEO_OPEN_NODE(),
+               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_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_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_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_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_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_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_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_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_OCCLUDE_SILHOUETTE_ALPHA, dAmpBodyDl),
+               GEO_CLOSE_NODE(),
+            GEO_CLOSE_NODE(),
+         GEO_CLOSE_NODE(),
+      GEO_CLOSE_NODE(),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};

actors/amp/geo.s

@@ -1,54 +0,0 @@
-glabel amp_geo # 0x0F000028
-   geo_shadow SHADOW_CIRCLE_4_VERTS, 0xC8, 100
-   geo_open_node
-      geo_scale 0x00, 16384
-      geo_open_node
-         geo_animated_part LAYER_OPAQUE, 0, 0, 0
-         geo_open_node
-            geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002C88
-            geo_open_node
-               geo_animated_part LAYER_OPAQUE, 0, 0, 0
-               geo_open_node
-                  geo_switch_case 2, geo_switch_anim_state
-                  geo_open_node
-                     geo_animated_part LAYER_OPAQUE, 0, 0, 0
-                     geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002BA0
-                  geo_close_node
-               geo_close_node
-               geo_animated_part LAYER_OPAQUE, 0, 0, 0
-               geo_open_node
-                  geo_switch_case 2, geo_switch_anim_state
-                  geo_open_node
-                     geo_animated_part LAYER_OPAQUE, 0, 0, 0
-                     geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002BA0
-                  geo_close_node
-               geo_close_node
-               geo_animated_part LAYER_OPAQUE, 0, 0, 0
-               geo_open_node
-                  geo_switch_case 2, geo_switch_anim_state
-                  geo_open_node
-                     geo_animated_part LAYER_OPAQUE, 0, 0, 0
-                     geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002BA0
-                  geo_close_node
-               geo_close_node
-               geo_animated_part LAYER_OPAQUE, 0, 0, 0
-               geo_open_node
-                  geo_switch_case 2, geo_switch_anim_state
-                  geo_open_node
-                     geo_animated_part LAYER_OPAQUE, 0, 0, 0
-                     geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002BA0
-                  geo_close_node
-               geo_close_node
-            geo_close_node
-            geo_animated_part LAYER_ALPHA, 0, 0, 0, amp_seg8_dl_08002D70
-            geo_animated_part LAYER_OPAQUE, 0, 0, 0
-            geo_open_node
-               geo_billboard
-               geo_open_node
-                  geo_display_list LAYER_ALPHA, amp_seg8_dl_08002E58
-               geo_close_node
-            geo_close_node
-         geo_close_node
-      geo_close_node
-   geo_close_node
-   geo_end