experimental: use engine as main src dir

Makefile

@@ -33,33 +33,23 @@ $(eval $(call validate-option,VERSION,jp us eu sh cn))
 
 ifeq      ($(VERSION),jp)
   DEFINES   += VERSION_JP=1
-  OPT_FLAGS := -g
-  GRUCODE   ?= f3d_old
-  LIBULTRA ?= D
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/us_jp
 else ifeq ($(VERSION),us)
   DEFINES   += VERSION_US=1
-  OPT_FLAGS := -g
-  GRUCODE   ?= f3d_old
-  LIBULTRA ?= D
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/us_jp
 else ifeq ($(VERSION),eu)
   DEFINES   += VERSION_EU=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= F
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/eu
 else ifeq ($(VERSION),sh)
   DEFINES   += VERSION_SH=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= H
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/sh
 else ifeq ($(VERSION),cn)
   DEFINES   += VERSION_CN=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= BB
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/sh
 endif
 
@@ -121,7 +111,7 @@ ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new
 endif
 
 # Whether to hide commands or not
-VERBOSE ?= 0
+VERBOSE ?= 1
 ifeq ($(VERBOSE),0)
   V := @
 endif
@@ -305,7 +295,7 @@ endif
 
 # C compiler options
 CFLAGS = -G 0 $(TARGET_CFLAGS) $(DEF_INC_CFLAGS)
-CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-trigraphs
+CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
 CFLAGS += -Wno-missing-braces
 
 ASFLAGS     := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(foreach d,$(DEFINES),--defsym $(d))
@@ -336,7 +326,7 @@ else
   RSPASM              := $(TOOLS_DIR)/armips
 endif
 ENDIAN_BITWIDTH       := $(BUILD_DIR)/endian-and-bitwidth
-EMULATOR = mupen64plus
+EMULATOR = ares
 EMU_FLAGS = --noosd
 LOADER = loader64
 LOADER_FLAGS = -vwf
@@ -428,7 +418,7 @@ DUMMY != mkdir -p $(ALL_DIRS)
 $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
-$(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
+$(BUILD_DIR)/src/engine/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 
 
 #==============================================================================#

actors/blue_fish/model.inc.c

@@ -1,7 +1,7 @@
 // Blue Fish
 
 // 0x0301B5C8
-static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
+ALIGNED8 static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
     0x3f, 0x3f, 0x3f,
     0xff, 0xff, 0xff, 0x28, 0x28, 0x28
 );

bin/eu/translation_de.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/eu/translation_en.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/eu/translation_fr.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/segment2.c

@@ -4,7 +4,7 @@
 #include "config.h"
 #include "macros.h"
 #include "types.h"
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
@@ -12016,6 +12016,7 @@ static const Vtx vertex_billboard_num[] = {
 // 0x0200EFF0 - 0x0200F038
 const Gfx dl_billboard_num_begin[] = {
     gsDPPipeSync(),
+    gsDPSetTextureFilter(G_TF_POINT),
     gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
@@ -12033,6 +12034,7 @@ const Gfx dl_billboard_num_end[] = {
     gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsDPSetTextureFilter(G_TF_BILERP),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };

data/behavior_data.c

@@ -3,13 +3,13 @@
 #include "sm64.h"
 
 #include "object_constants.h"
-#include "game/object_list_processor.h"
-#include "game/interaction.h"
-#include "game/behavior_actions.h"
-#include "game/mario_actions_cutscene.h"
-#include "game/mario_misc.h"
-#include "game/object_helpers.h"
-#include "game/debug.h"
+#include "engine/object_list_processor.h"
+#include "engine/interaction.h"
+#include "engine/behavior_actions.h"
+#include "engine/mario_actions_cutscene.h"
+#include "engine/mario_misc.h"
+#include "engine/object_helpers.h"
+#include "engine/debug.h"
 #include "menu/file_select.h"
 #include "engine/surface_load.h"
 

include/geo_commands.h

@@ -3,12 +3,12 @@
 
 #include "command_macros_base.h"
 
-#include "game/shadow.h"
-#include "game/object_helpers.h"
-#include "game/behavior_actions.h"
-#include "game/segment2.h"
-#include "game/mario_misc.h"
-#include "game/mario_actions_cutscene.h"
+#include "engine/shadow.h"
+#include "engine/object_helpers.h"
+#include "engine/behavior_actions.h"
+#include "engine/segment2.h"
+#include "engine/mario_misc.h"
+#include "engine/mario_actions_cutscene.h"
 
 // sky background params
 #define BACKGROUND_OCEAN_SKY        0

include/moving_texture_macros.h

@@ -1,7 +1,7 @@
 #ifndef MOVING_TEXTURE_MACROS_H
 #define MOVING_TEXTURE_MACROS_H
 
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // From gMovingTextureIdList
 #define TEXTURE_WATER            0

levels/bbh/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bbh/header.h

@@ -2,7 +2,7 @@
 #define BBH_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout geo_bbh_0005B0[];

levels/bbh/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bitdw/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bitdw/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bitfs/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bitfs/script.c

@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bits/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bits/script.c

@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bob/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bob/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"