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

.gitignore

@@ -2149,6 +2149,3 @@ lib/libs2d_engine.a
 
 # :Zone_Identifier files
 *Zone.Identifier
-
-# user-specific config file
-include/config/config_local.h

Makefile

@@ -269,7 +269,7 @@ BUILD_DIR_BASE := build
 # BUILD_DIR is the location where all build artifacts are placed
 BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)_$(CONSOLE)
 
-COMPRESS ?= yay0
+COMPRESS ?= rnc1
 $(eval $(call validate-option,COMPRESS,mio0 yay0 gzip rnc1 rnc2 uncomp))
 ifeq ($(COMPRESS),gzip)
   DEFINES += GZIP=1
@@ -399,9 +399,6 @@ GODDARD_C_FILES   := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c))
 S_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.s))
 GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c
 
-# Ignore all .inc.c files
-C_FILES           := $(filter-out %.inc.c,$(C_FILES))
-
 # Sound files
 SOUND_BANK_FILES    := $(wildcard sound/sound_banks/*.json)
 SOUND_SAMPLE_DIRS   := $(wildcard sound/samples/*)
@@ -444,8 +441,6 @@ else ifneq ($(call find-command,mips-linux-gnu-ld),)
   CROSS := mips-linux-gnu-
 else ifneq ($(call find-command,mips64-linux-gnu-ld),)
   CROSS := mips64-linux-gnu-
-else ifneq ($(call find-command,mips64-none-elf-ld),)
-  CROSS := mips64-none-elf-
 else ifneq ($(call find-command,mips-ld),)
   CROSS := mips-
 else
@@ -553,13 +548,7 @@ ifneq (,$(call find-command,armips))
 else
   RSPASM              := $(TOOLS_DIR)/armips
 endif
-
-ifneq (,$(call find-command,wslview))
-    EMULATOR = "/mnt/c/Program Files (x86)/parallel-launcher/parallel-launcher.exe"
-else
-    EMULATOR = parallel-launcher
-endif
-
+EMULATOR = mupen64plus
 EMU_FLAGS =
 
 ifneq (,$(call find-command,wslview))
@@ -780,7 +769,7 @@ endif
 
 $(BUILD_DIR)/%.table: %.aiff
 	$(call print,Extracting codebook:,$<,$@)
-	$(V)$(AIFF_EXTRACT_CODEBOOK) $< $@
+	$(V)$(AIFF_EXTRACT_CODEBOOK) $< >$@
 
 $(BUILD_DIR)/%.aifc: $(BUILD_DIR)/%.table %.aiff
 	$(call print,Encoding ADPCM:,$(word 2,$^),$@)
@@ -924,7 +913,7 @@ $(BUILD_DIR)/asm/debug/map.o: asm/debug/map.s $(BUILD_DIR)/sm64_prelim.elf
 # Link SM64 ELF file
 $(ELF): $(BUILD_DIR)/sm64_prelim.elf $(BUILD_DIR)/asm/debug/map.o $(O_FILES) $(YAY0_OBJ_FILES) $(SEG_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/libz.a $(BUILD_DIR)/libgoddard.a
 	@$(PRINT) "$(GREEN)Linking ELF file:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T $(BUILD_DIR)/$(LD_SCRIPT) -T goddard.txt -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc
+	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T $(BUILD_DIR)/$(LD_SCRIPT) -T goddard.txt -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc -lrtc
 
 # Build ROM
 ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))

README.md

@@ -21,7 +21,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - **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 optimisation, better hanging, breath meter, 4 controller support
+- **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

VERSION.txt

@@ -1 +1 @@
-v2.3.0
+v2.2.0

actors/common1.h

@@ -226,6 +226,9 @@ extern const Gfx mushroom_1up_seg3_dl_0302A660[];
 // number
 extern const GeoLayout number_geo[];
 
+// painting
+extern const GeoLayout painting_geo[];
+
 // pebble
 extern const Gfx pebble_seg3_dl_0301CB00[];
 

actors/common1_geo.c

@@ -18,6 +18,7 @@
 #include "leaves/geo.inc.c"
 #include "mario_cap/geo.inc.c"
 #include "number/geo.inc.c"
+#include "painting/geo.inc.c"
 #include "mushroom_1up/geo.inc.c"
 #include "star/geo.inc.c"
 #include "dirt/geo.inc.c"

actors/painting/geo.inc.c

@@ -0,0 +1,9 @@
+#include "game/paintings.h"
+
+const GeoLayout painting_geo[] = {
+   GEO_CULLING_RADIUS(2000),
+   GEO_OPEN_NODE(),
+      GEO_ASM(0, geo_painting_draw),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};

data/behavior_data.c

@@ -8,6 +8,7 @@
 #include "game/behavior_actions.h"
 #include "game/mario_actions_cutscene.h"
 #include "game/mario_misc.h"
+#include "game/paintings.h"
 #include "game/object_helpers.h"
 #include "game/debug.h"
 #include "menu/file_select.h"
@@ -2227,16 +2228,6 @@ const BehaviorScript bhvWaterLevelPillar[] = {
     END_LOOP(),
 };
 
-const BehaviorScript bhvDddWarp[] = {
-    BEGIN(OBJ_LIST_SURFACE),
-    OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
-    SET_FLOAT(oCollisionDistance, 30000),
-    BEGIN_LOOP(),
-        CALL_NATIVE(bhv_ddd_warp_loop),
-        CALL_NATIVE(load_object_collision_model),
-    END_LOOP(),
-};
-
 const BehaviorScript bhvMoatGrills[] = {
     BEGIN(OBJ_LIST_SURFACE),
 #ifdef UNLOCK_ALL
@@ -2694,7 +2685,7 @@ const BehaviorScript bhvSushiShark[] = {
 
 const BehaviorScript bhvJrbSlidingBox[] = {
     BEGIN(OBJ_LIST_SURFACE),
-    OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_NO_AUTO_DISPLACEMENT),
+    OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
     LOAD_COLLISION_DATA(jrb_seg7_collision_floating_box),
     SET_HOME(),
     BEGIN_LOOP(),
@@ -3494,6 +3485,15 @@ const BehaviorScript bhvUnlockDoorStar[] = {
     END_LOOP(),
 };
 
+const BehaviorScript bhvPainting[] = {
+    BEGIN(OBJ_LIST_LEVEL),
+    OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
+    CALL_NATIVE(bhv_painting_init),
+    BEGIN_LOOP(),
+        CALL_NATIVE(bhv_painting_loop),
+    END_LOOP(),
+};
+
 const BehaviorScript bhvInstantActiveWarp[] = {
     BREAK(),
 };
@@ -5437,7 +5437,11 @@ const BehaviorScript bhvTTCPendulum[] = {
 
 const BehaviorScript bhvTTCTreadmill[] = {
     BEGIN(OBJ_LIST_SURFACE),
-    OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_NO_AUTO_DISPLACEMENT)),
+#ifdef PLATFORM_DISPLACEMENT_2
+    OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_VELOCITY_PLATFORM)),
+#else
+    OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),
+#endif
     SET_FLOAT(oCollisionDistance, 750),
     CALL_NATIVE(bhv_ttc_treadmill_init),
     DELAY(1),

extract_assets.py

@@ -177,15 +177,9 @@ def main():
         # presence of the correct roms automatically
 
     # Make sure tools exist
-    tools = [ "n64graphics", "skyconv", "mio0", "aifc_decode" ]
-    if os.name == 'nt':
-        tools = [tool + ".exe" for tool in tools]
-        make = "mingw32-make"
-    else:
-        make = "make"
-
-    cmd = [make, "-s", "-C", "tools/"] + tools
-    subprocess.check_call(cmd)
+    subprocess.check_call(
+        ["make", "-s", "-C", "tools/", "n64graphics", "skyconv", "mio0", "aifc_decode"]
+    )
 
     # Go through the assets in roughly alphabetical order (but assets in the same
     # mio0 file still go together).

include/behavior_data.h

@@ -173,7 +173,6 @@ extern const BehaviorScript bhvBowserKeyUnlockDoor[];
 extern const BehaviorScript bhvBowserKeyCourseExit[];
 extern const BehaviorScript bhvInvisibleObjectsUnderBridge[];
 extern const BehaviorScript bhvWaterLevelPillar[];
-extern const BehaviorScript bhvDddWarp[];
 extern const BehaviorScript bhvMoatGrills[];
 extern const BehaviorScript bhvClockMinuteHand[];
 extern const BehaviorScript bhvClockHourHand[];
@@ -294,6 +293,7 @@ extern const BehaviorScript bhvYellowBall[];
 extern const BehaviorScript bhvMario[];
 extern const BehaviorScript bhvToadMessage[];
 extern const BehaviorScript bhvUnlockDoorStar[];
+extern const BehaviorScript bhvPainting[];
 extern const BehaviorScript bhvInstantActiveWarp[];
 extern const BehaviorScript bhvAirborneWarp[];
 extern const BehaviorScript bhvHardAirKnockBackWarp[];

include/config.h

@@ -19,10 +19,6 @@
 #include "config/config_objects.h"
 #include "config/config_rom.h"
 
-// Local config - include a gitignore'd config file that's specific to just the user (if the file exists)
-#if __has_include("config/config_local.h")
-    #include "config/config_local.h"
-#endif
 
-// WARNING: Compatibility safeguards - don't remove this file unless you know what you're doing
+/* WARNING: Compatibility safeguards - don't remove this file unless you know what you're doing */
 #include "config/config_safeguards.h"

include/config/config_game.h

@@ -7,7 +7,7 @@
 /**
  * Enables some mechanics that change behavior depending on hardcoded level numbers.
  * TODO: separate this into separate defines, behavior params, or make these mechanics otherwise dynamic.
-*/
+ */
 // #define ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS
 
 /**

include/config/config_movement.h

@@ -136,8 +136,14 @@
  */
 #define BUGFIX_DIALOG_TIME_STOP
 
+/**
+ * Enables Platform Displacement 2, an upgrade to the physics involving moving platforms and how Mario interacts with them.
+ */
+#define PLATFORM_DISPLACEMENT_2
+
 /**
  * Inertia defines; allow Mario to preserve his momemtum when leaving moving platforms.
+ * These require Platform Displacement 2 to be enabled.
  */
 #define MARIO_INERTIA_UPWARD
 // #define MARIO_INERTIA_LATERAL

include/ique/PR/gbi.h

@@ -1837,6 +1837,7 @@ typedef union {
 /*
  * Macros to assemble the graphics display list
  */
+#define SIZEOF_GFX_CMD(_cmd) sizeof((Gfx[]){gs##_cmd})
 
 /*
  * DMA macros

include/level_commands.h

@@ -46,7 +46,7 @@ enum LevelCommands {
     /*0x24*/ LEVEL_CMD_PLACE_OBJECT,
     /*0x25*/ LEVEL_CMD_INIT_MARIO,
     /*0x26*/ LEVEL_CMD_CREATE_WARP_NODE,
-    /*0x27*/ LEVEL_CMD_CREATE_PAINTING_WARP_NODE,
+    /*0x27*/ LEVEL_CMD_27,
     /*0x28*/ LEVEL_CMD_CREATE_INSTANT_WARP,
     /*0x29*/ LEVEL_CMD_LOAD_AREA,
     /*0x2A*/ LEVEL_CMD_UNLOAD_AREA,
@@ -112,6 +112,8 @@ enum WarpCheckpointFlags {
     WARP_CHECKPOINT    = (1 << 7), // 0x80
 };
 
+#define WARP_DEST_LEVEL_NUM_MASK 0x7F
+
 // Head defines
 enum GoddardScene {
     REGULAR_FACE = 0x2,
@@ -363,8 +365,12 @@ enum GoddardScene {
     CMD_BBBB(LEVEL_CMD_CREATE_WARP_NODE, 0x08, id, destLevel), \
     CMD_BBBB(destArea, destNode, flags, 0x00)
 
+// Backwards compatibility:
 #define PAINTING_WARP_NODE(id, destLevel, destArea, destNode, flags) \
-    CMD_BBBB(LEVEL_CMD_CREATE_PAINTING_WARP_NODE, 0x08, id, destLevel), \
+    WARP_NODE(id, destLevel, destArea, destNode, flags)
+
+#define CMD27(id, destLevel, destArea, destNode, flags) \
+    CMD_BBBB(LEVEL_CMD_27, 0x08, id, destLevel), \
     CMD_BBBB(destArea, destNode, flags, 0x00)
 
 #define INSTANT_WARP(index, destArea, displaceX, displaceY, displaceZ) \

include/model_ids.h

@@ -550,6 +550,8 @@
 #define MODEL_SILVER_COIN_NO_SHADOW       0xE3        // silver_coin_no_shadow_geo
 #endif
 
+#define MODEL_PAINTING                    0xE4
+
 // Menu Models (overwrites Level Geometry IDs)
 #define MODEL_MAIN_MENU_MARIO_SAVE_BUTTON         MODEL_LEVEL_GEOMETRY_03   // main_menu_geo_0001D0
 #define MODEL_MAIN_MENU_RED_ERASE_BUTTON          MODEL_LEVEL_GEOMETRY_04   // main_menu_geo_000290

include/n64/PR/gbi.h

@@ -1861,6 +1861,7 @@ typedef union {
 /*
  * Macros to assemble the graphics display list
  */
+#define SIZEOF_GFX_CMD(_cmd) sizeof((Gfx[]){gs##_cmd})
 
 /*
  * DMA macros

include/object_constants.h

@@ -47,7 +47,7 @@ enum ObjFlags {
     OBJ_FLAG_1000                              = (1 << 12), // 0x00001000
     OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO            = (1 << 13), // 0x00002000
     OBJ_FLAG_PERSISTENT_RESPAWN                = (1 << 14), // 0x00004000
-    OBJ_FLAG_NO_AUTO_DISPLACEMENT              = (1 << 15), // 0x00008000
+    OBJ_FLAG_VELOCITY_PLATFORM                 = (1 << 15), // 0x00008000
     OBJ_FLAG_DONT_CALC_COLL_DIST               = (1 << 16), // 0x00010000
     OBJ_FLAG_SILHOUETTE                        = (1 << 19), // 0x00080000
     OBJ_FLAG_OCCLUDE_SILHOUETTE                = (1 << 20), // 0x00100000
@@ -2062,10 +2062,11 @@ enum oActionsSnowmansBottom {
     #define WATER_BOMB_ACT_EXPLODE                          0x3
 
 /* TTC Painting Clock Arm */
-    /* oAction */
-    #define CLOCK_ARM_ACT_CHECK_DEFAULT                     0x0
-    #define CLOCK_ARM_ACT_MOVING                            0x1
-    #define CLOCK_ARM_ACT_STOP                              0x2
+enum oActionsTTCPaintingClockArm {
+    TTC_PAINTING_CLOCK_ARM_WAIT,
+    TTC_PAINTING_CLOCK_ARM_ACT_MOVING,
+    TTC_PAINTING_CLOCK_ARM_ACT_STOPPED,
+};
 
 /* TTC rotating solid */
     /* oBehParams2ndByte */