Basic minimap functionality

Author: mkst

Makefile

@@ -416,11 +416,8 @@ ifeq ($(COMPILER),gcc)
   CC        := $(CROSS)gcc
 endif
 
-ifeq ($(TARGET_N64),1)
-  TARGET_CFLAGS := -nostdinc -I include/libc -DTARGET_N64 -D_LANGUAGE_C
-  CC_CFLAGS := -fno-builtin
-endif
-
+TARGET_CFLAGS := -nostdinc -I include/libc -DTARGET_N64 -D_LANGUAGE_C
+CC_CFLAGS := -fno-builtin
 INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I .
 
 # Check code syntax with host compiler
@@ -495,8 +492,8 @@ ifeq ($(TARGET_WEB),1)
   PLATFORM_LDFLAGS := -lm -no-pie -s TOTAL_MEMORY=20MB -g4 --source-map-base http://localhost:8080/ -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']"
 endif
 ifeq ($(TARGET_N3DS),1)
-  CTRULIB  :=  $(DEVKITPRO)/libctru
-  LIBDIRS  := $(CTRULIB)
+  CTRULIB := $(DEVKITPRO)/libctru
+  LIBDIRS := $(CTRULIB)
   export LIBPATHS  :=  $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
   PLATFORM_CFLAGS  := -mtp=soft -DTARGET_N3DS -DARM11 -DosGetTime=n64_osGetTime -D_3DS -march=armv6k -mtune=mpcore -mfloat-abi=hard -mword-relocations -fomit-frame-pointer -ffast-math $(foreach dir,$(LIBDIRS),-I$(dir)/include)
   PLATFORM_LDFLAGS := $(LIBPATHS) -lcitro3d -lctru -lm -specs=3dsx.specs -g -marm -mthumb-interwork -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
@@ -891,8 +888,8 @@ SMDH_DESCRIPTION ?= Super Mario 64 3DS Port
 SMDH_AUTHOR ?= mkst
 SMDH_ICON := icon.smdh
 
-$(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(BUILD_DIR)/src/pc/gfx/shader.shbin.o $(SMDH_ICON)
-	$(LD) -L $(BUILD_DIR) -o $@.elf $(O_FILES) $(BUILD_DIR)/src/pc/gfx/shader.shbin.o $(MINIMAP_T3X_O) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS)
+$(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(BUILD_DIR)/src/pc/gfx/shader.shbin.o $(MINIMAP_O) $(SMDH_ICON)
+	$(LD) -L $(BUILD_DIR) -o $@.elf $(O_FILES) $(BUILD_DIR)/src/pc/gfx/shader.shbin.o $(MINIMAP_O) $(MINIMAP_T3X_O) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS)
 	3dsxtool $@.elf $@ --smdh=$(BUILD_DIR)/$(SMDH_ICON)
 
 # stolen from /opt/devkitpro/devkitARM/base_tools
@@ -901,9 +898,11 @@ define bin2o
 endef
 
 # TODO: simplify dependency chain
-$(BUILD_DIR)/src/pc/gfx/gfx_citro3d.o: $(BUILD_DIR)/src/pc/gfx/gfx_3ds.o
-$(BUILD_DIR)/src/pc/gfx/gfx_3ds.o: $(BUILD_DIR)/src/pc/gfx/gfx_3ds_menu.o
+$(BUILD_DIR)/src/pc/gfx/gfx_citro3d.o: $(MINIMAP_O)
+$(BUILD_DIR)/src/pc/gfx/gfx_3ds.o: $(MINIMAP_O)
+$(BUILD_DIR)/src/pc/gfx/gfx_3ds_minimap.o: $(MINIMAP_O)
 $(BUILD_DIR)/src/pc/gfx/gfx_3ds_menu.o: $(MINIMAP_T3X_HEADERS)
+$(MINIMAP_O): $(MINIMAP_T3X_HEADERS)
 
 %.t3x.o $(BUILD_DIR)/%_t3x.h: %.t3x
 	$(bin2o)
@@ -914,7 +913,6 @@ $(BUILD_DIR)/src/pc/gfx/gfx_3ds_menu.o: $(MINIMAP_T3X_HEADERS)
 %.t3s: %.png
 	@printf -- "-f rgba -z auto\n../../../../../$(<)\n" > $(BUILD_DIR)/$@
 
-
 %.smdh: %.png
 	smdhtool --create "$(SMDH_TITLE)" "$(SMDH_DESCRIPTION)" "$(SMDH_AUTHOR)" $< $(BUILD_DIR)/$@
 

README.md

@@ -16,6 +16,7 @@ A prior copy of the game is required to extract the assets.
  - Experimental Stereo 3D support; add build flag `ENABLE_N3DS_3D_MODE=1` to try it out
  - Support injection of [SMDH](https://www.3dbrew.org/wiki/SMDH) file into the .3dsx
      - Change the `icon.png` in the base of this repository before building.
+ - Experimental Mini-Map; bottom screen displays an overview of the current level
 
 ## Building
 

enhancements/60fps.patch

@@ -607,10 +607,10 @@ index 7a83b53..3b21da5 100644
 
  extern s8 gEnvFxMode;
 diff --git a/src/game/hud.c b/src/game/hud.c
-index 5d78cfc..70649c9 100644
+index 9dc514e..5d864a5 100644
 --- a/src/game/hud.c
 +++ b/src/game/hud.c
-@@ -57,6 +57,20 @@ static struct UnusedHUDStruct sUnusedHUDValues = { 0x00, 0x0A, 0x00 };
+@@ -61,6 +61,20 @@ static struct UnusedHUDStruct sUnusedHUDValues = { 0x00, 0x0A, 0x00 };
 
  static struct CameraHUD sCameraHUD = { CAM_STATUS_NONE };
 
@@ -631,15 +631,15 @@ index 5d78cfc..70649c9 100644
  /**
   * Renders a rgba16 16x16 glyph texture from a table list.
   */
-@@ -109,6 +123,7 @@ void render_power_meter_health_segment(s16 numHealthWedges) {
+@@ -113,6 +127,7 @@ void render_power_meter_health_segment(s16 numHealthWedges) {
   */
  void render_dl_power_meter(s16 numHealthWedges) {
      Mtx *mtx;
 +    f32 interpolatedY;
 
      mtx = alloc_display_list(sizeof(Mtx));
 
-@@ -116,7 +131,15 @@ void render_dl_power_meter(s16 numHealthWedges) {
+@@ -120,7 +135,15 @@ void render_dl_power_meter(s16 numHealthWedges) {
          return;
      }
 
@@ -657,7 +657,7 @@ index 5d78cfc..70649c9 100644
      gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx++),
                G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH);
 diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
-index 04047a1..4712035 100644
+index b9a43df..281e0f3 100644
 --- a/src/game/ingame_menu.c
 +++ b/src/game/ingame_menu.c
 @@ -111,6 +111,41 @@ u8 gMenuHoldKeyIndex = 0;
@@ -1857,18 +1857,15 @@ index 2d49d06..31cb72f 100644
          gSPDisplayList(displayListIter++, &intro_seg7_dl_0700B3A0);
          gSPPopMatrix(displayListIter++, G_MTX_MODELVIEW);
 diff --git a/src/pc/gfx/gfx_citro3d.c b/src/pc/gfx/gfx_citro3d.c
-index 3e17666..a4143fc 100644
+index 805623c..b12d1bc 100644
 --- a/src/pc/gfx/gfx_citro3d.c
 +++ b/src/pc/gfx/gfx_citro3d.c
-@@ -823,14 +823,10 @@ static void gfx_citro3d_on_resize(void)
+@@ -849,11 +849,7 @@ static void gfx_citro3d_on_resize(void)
 
  static void gfx_citro3d_end_frame(void)
  {
 -    float target_fps = 30.0f;
 -
-     // TOOD: draw the minimap here
-     gfx_3ds_menu_draw(sVboBuffer, sBufIdx, gShowConfigMenu);
-     
      C3D_FrameEnd(0);
 -    if (C3D_GetProcessingTime() < 1000.0f / target_fps)
 -        gspWaitForVBlank();

enhancements/puppycam.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index db5b620..52177e0 100644
+index 7014d66..eb86fba 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -264,7 +264,7 @@ else
@@ -11,7 +11,7 @@ index db5b620..52177e0 100644
  endif
  endif
 
-@@ -648,6 +648,8 @@ $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
+@@ -665,6 +665,8 @@ $(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
@@ -92,7 +92,7 @@ index 0000000..dc4481e
 +#endif // TARGET_N64
 diff --git a/enhancements/puppycam.inc.c b/enhancements/puppycam.inc.c
 new file mode 100644
-index 0000000..eedb206
+index 0000000..f75b329
 --- /dev/null
 +++ b/enhancements/puppycam.inc.c
 @@ -0,0 +1,1058 @@
@@ -1813,7 +1813,7 @@ index f56ed02..36bb6d9 100644
  extern struct Object *gCutsceneFocus;
  extern struct Object *gSecondCameraFocus;
 diff --git a/src/game/game_init.c b/src/game/game_init.c
-index 3ce5f2d..856388b 100644
+index 3ce5f2d..b12b8df 100644
 --- a/src/game/game_init.c
 +++ b/src/game/game_init.c
 @@ -20,6 +20,8 @@
@@ -1834,7 +1834,7 @@ index 3ce5f2d..856388b 100644
  #ifdef TARGET_N64
      rendering_init();
 diff --git a/src/game/hud.c b/src/game/hud.c
-index 5d78cfc..2a9b874 100644
+index 9dc514e..1355475 100644
 --- a/src/game/hud.c
 +++ b/src/game/hud.c
 @@ -13,6 +13,7 @@
@@ -1845,18 +1845,18 @@ index 5d78cfc..2a9b874 100644
 
  /* @file hud.c
   * This file implements HUD rendering and power meter animations.
-@@ -472,7 +473,8 @@ void render_hud(void) {
- 
-         if (hudDisplayFlags & HUD_DISPLAY_FLAG_CAMERA_AND_POWER) {
-             render_hud_power_meter();
+@@ -502,7 +503,8 @@ void render_hud(void) {
+             gDPSetHud(gDisplayListHead++, 1);
+             gDPSet2d(gDisplayListHead++, 0);
+ #endif
 -            render_hud_camera_status();
 +            if (!newcam_active)
 +                render_hud_camera_status();
          }
 
          if (hudDisplayFlags & HUD_DISPLAY_FLAG_TIMER) {
 diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
-index 04047a1..dee4fb9 100644
+index b9a43df..f6f2d7f 100644
 --- a/src/game/ingame_menu.c
 +++ b/src/game/ingame_menu.c
 @@ -22,6 +22,7 @@
@@ -2258,4 +2258,3 @@ index 00f3fae..038216d 100644
 +extern s16 rightstick[2];
 
  #endif
-

include/PR/gbi.h

@@ -4809,6 +4809,13 @@ typedef union {
 									\
 	_g->words.w0 = _SHIFTL(G_SPECIAL_2, 24, 8); \
 }
+#define gDPSetHud(pkt, mode) \
+{ \
+	Gfx *_g = (Gfx *)(pkt);	\
+									\
+	_g->words.w0 = _SHIFTL(G_SPECIAL_3, 24, 8); \
+	_g->words.w1 = (unsigned int)(mode); \
+}
 
 #endif
 

src/game/area.c

@@ -367,7 +367,7 @@ void render_game(void) {
 
 #ifdef ENABLE_N3DS_3D_MODE
         gDPForceFlush(gDisplayListHead++); // flush 3D scene
-        gDPSet2d(gDisplayListHead++, 1); // HUD is 2D
+        gDPSetHud(gDisplayListHead++, 1); // set hud mode
 #endif
         gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_8032CF00));
 
@@ -379,7 +379,7 @@ void render_game(void) {
         render_text_labels();
 #ifdef ENABLE_N3DS_3D_MODE
         gDPForceFlush(gDisplayListHead++); // flush hud
-        gDPSet2d(gDisplayListHead++, 0); // reset 2D mode
+        gDPSetHud(gDisplayListHead++, 0); // reset hud mode
 #endif
         do_cutscene_handler();
         print_displaying_credits_entry();

src/game/hud.c

@@ -43,7 +43,11 @@ static s16 sPowerMeterStoredHealth;
 
 static struct PowerMeterHUD sPowerMeterHUD = {
     POWER_METER_HIDDEN,
+#if ENABLE_N3DS_3D_MODE
+    160,
+#else
     140,
+#endif
     166,
     1.0,
 };
@@ -259,16 +263,26 @@ void render_hud_power_meter(void) {
 #ifdef VERSION_JP
 #define HUD_TOP_Y 210
 #else
+#ifdef ENABLE_N3DS_3D_MODE
+#define HUD_TOP_Y 220
+#else
 #define HUD_TOP_Y 209
 #endif
+#endif
 
 /**
  * Renders the amount of lives Mario has.
  */
 void render_hud_mario_lives(void) {
+#ifdef ENABLE_N3DS_3D_MODE
+    print_text(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(42), HUD_TOP_Y, ","); // 'Mario Head' glyph
+    print_text(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(58), HUD_TOP_Y, "*"); // 'X' glyph
+    print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(74), HUD_TOP_Y, "%d", gHudDisplay.lives);
+#else
     print_text(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(22), HUD_TOP_Y, ","); // 'Mario Head' glyph
     print_text(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(38), HUD_TOP_Y, "*"); // 'X' glyph
     print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(54), HUD_TOP_Y, "%d", gHudDisplay.lives);
+#endif
 }
 
 /**
@@ -283,8 +297,12 @@ void render_hud_coins(void) {
 #ifdef VERSION_JP
 #define HUD_STARS_X 73
 #else
+#ifdef ENABLE_N3DS_3D_MODE
+#define HUD_STARS_X 98
+#else
 #define HUD_STARS_X 78
 #endif
+#endif
 
 /**
  * Renders the amount of stars collected.
@@ -380,9 +398,14 @@ void render_hud_camera_status(void) {
     s32 y;
 
     cameraLUT = segmented_to_virtual(&main_hud_camera_lut);
+
+#ifdef ENABLE_N3DS_3D_MODE
+    x = GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(74);
+    y = 215;
+#else
     x = GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(54);
     y = 205;
-
+#endif
     if (sCameraHUD.status == CAM_STATUS_NONE) {
         return;
     }
@@ -468,7 +491,17 @@ void render_hud(void) {
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_CAMERA_AND_POWER) {
+#ifdef ENABLE_N3DS_3D_MODE
+            gDPForceFlush(gDisplayListHead++);
+            gDPSetHud(gDisplayListHead++, 0);
+            gDPSet2d(gDisplayListHead++, 1);
+#endif
             render_hud_power_meter();
+#ifdef ENABLE_N3DS_3D_MODE
+            gDPForceFlush(gDisplayListHead++);
+            gDPSetHud(gDisplayListHead++, 1);
+            gDPSet2d(gDisplayListHead++, 0);
+#endif
             render_hud_camera_status();
         }