Merge pull request #54 from n64brew/menu

It's time
n64brew · Dec 31, 2024 · fccc1a5 · fccc1a5
2 parents ec6ce8d + 639cfdb
commit fccc1a5
Show file tree

Hide file tree

Showing 81 changed files with 3,747 additions and 343 deletions.
diff --git a/Makefile b/Makefile
@@ -8,24 +8,34 @@ MINIGAME_DIR = code
 FILESYSTEM_DIR = filesystem
 MINIGAMEDSO_DIR = $(FILESYSTEM_DIR)/minigames
 
-SRC = main.c core.c minigame.c menu.c
+SRC = main.c core.c minigame.c menu.c logo.c savestate.c results.c setup.c title.c
 
 filesystem/squarewave.font64: MKFONT_FLAGS += --outline 1 --range all
+filesystem/squarewave_l.font64: MKFONT_FLAGS += --outline 1 --range all --size 20
+filesystem/squarewave_xl.font64: MKFONT_FLAGS += --outline 1 --range all --size 30
+filesystem/core/brewlogo.sprite: MKFONT_FLAGS += --format CI4 -c 2
+filesystem/core/dragon1.sprite: MKSPRITE_FLAGS += --format I4 -c 2
+filesystem/core/dragon2.sprite: MKSPRITE_FLAGS += --format I4 -c 2
+filesystem/core/dragon3.sprite: MKSPRITE_FLAGS += --format I4 -c 2
+filesystem/core/dragon4.sprite: MKSPRITE_FLAGS += --format I4 -c 2
+filesystem/core/dragon.wav64: AUDIOCONV_FLAGS += --wav-resample 32000 --wav-mono --wav-compress 3
 
 ###
 
 include $(N64_INST)/include/n64.mk
 include $(N64_INST)/include/t3d.mk
 
+N64_ROM_SAVETYPE = eeprom4k
+
 MINIGAMES_LIST = $(notdir $(wildcard $(MINIGAME_DIR)/*))
 DSO_LIST = $(addprefix $(MINIGAMEDSO_DIR)/, $(addsuffix .dso, $(MINIGAMES_LIST)))
 
 IMAGE_LIST = $(wildcard $(ASSETS_DIR)/*.png) $(wildcard $(ASSETS_DIR)/core/*.png)
 FONT_LIST  = $(wildcard $(ASSETS_DIR)/*.ttf)
-MODEL_LIST  = $(wildcard $(ASSETS_DIR)/*.glb)
+MODEL_LIST  = $(wildcard $(ASSETS_DIR)/*.glb) $(wildcard $(ASSETS_DIR)/core/*.glb)
 SOUND_LIST  = $(wildcard $(ASSETS_DIR)/*.wav) $(wildcard $(ASSETS_DIR)/core/*.wav)
 SOUND2_LIST  = $(wildcard $(ASSETS_DIR)/*.mp3) $(wildcard $(ASSETS_DIR)/core/*.mp3)
-MUSIC_LIST  = $(wildcard $(ASSETS_DIR)/*.xm)
+MUSIC_LIST  = $(wildcard $(ASSETS_DIR)/*.xm)  $(wildcard $(ASSETS_DIR)/core/*.xm)
 ASSETS_LIST += $(subst $(ASSETS_DIR),$(FILESYSTEM_DIR),$(IMAGE_LIST:%.png=%.sprite))
 ASSETS_LIST += $(subst $(ASSETS_DIR),$(FILESYSTEM_DIR),$(FONT_LIST:%.ttf=%.font64))
 ASSETS_LIST += $(subst $(ASSETS_DIR),$(FILESYSTEM_DIR),$(MODEL_LIST:%.glb=%.t3dm))
@@ -99,4 +109,4 @@ clean:
 
 -include $(wildcard $(BUILD_DIR)/*.d) $(wildcard $(BUILD_DIR)/*/*.d) $(wildcard $(BUILD_DIR)/*/*/*.d) $(wildcard $(BUILD_DIR)/*/*/*/*.d)
 
-.PHONY: all clean
+.PHONY: all clean
diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@ Welcome to this year's N64brew game jam. This year, we are creating a large coll
 
 Please ensure that you are using the **latest** `preview` branch of Libdragon, that you have [Tiny3D](https://github.com/HailToDodongo/tiny3d) installed, and that you are able to compile this ROM without issues. This template has both an OpenGL and [Tiny3D](https://github.com/HailToDodongo/tiny3d) example game. We also recommend that you fork this repository so that you can then perform a pull request for your final project (although you will lose the ability to make your repository private).
 
-Please note that the menu provided by the template **is not final** and will be changed in the final ROM.
-
 
 ### Starting a new minigame
 

diff --git a/assets/btnGame.i4.png b/assets/btnGame.i4.png
diff --git a/assets/btnGame.ia8.png b/assets/btnGame.ia8.png
diff --git a/assets/btnRound.ia8.png b/assets/btnRound.ia8.png
diff --git a/assets/btnWide.ia8.png b/assets/btnWide.ia8.png
diff --git a/assets/core/Box2_Corner.rgba32.png b/assets/core/Box2_Corner.rgba32.png
diff --git a/assets/core/Box2_Edge.rgba32.png b/assets/core/Box2_Edge.rgba32.png
diff --git a/assets/core/Box_Back.rgba32.png b/assets/core/Box_Back.rgba32.png
diff --git a/assets/core/Box_Corner.rgba32.png b/assets/core/Box_Corner.rgba32.png
diff --git a/assets/core/Box_Edge.rgba32.png b/assets/core/Box_Edge.rgba32.png
diff --git a/assets/core/CircleMask.i8.png b/assets/core/CircleMask.i8.png
diff --git a/assets/core/CircleProgress.i8.png b/assets/core/CircleProgress.i8.png
diff --git a/assets/core/Controller.rgba32.png b/assets/core/Controller.rgba32.png
diff --git a/assets/core/Crash.wav b/assets/core/Crash.wav
diff --git a/assets/core/Cross.rgba32.png b/assets/core/Cross.rgba32.png
diff --git a/assets/core/DrumRoll.wav b/assets/core/DrumRoll.wav
diff --git a/assets/core/Menus.xm b/assets/core/Menus.xm
diff --git a/assets/core/Point.wav b/assets/core/Point.wav
diff --git a/assets/core/Pointer.rgba32.png b/assets/core/Pointer.rgba32.png
diff --git a/assets/core/ResultsWinner.wav b/assets/core/ResultsWinner.wav
diff --git a/assets/core/Robot.rgba32.png b/assets/core/Robot.rgba32.png
diff --git a/assets/core/RouletteDone.wav b/assets/core/RouletteDone.wav
diff --git a/assets/core/RoulettePlayer.wav b/assets/core/RoulettePlayer.wav
diff --git a/assets/core/Tick.rgba32.png b/assets/core/Tick.rgba32.png
diff --git a/assets/core/ToyBox.rgba32.png b/assets/core/ToyBox.rgba32.png
diff --git a/assets/core/Trophy.rgba32.png b/assets/core/Trophy.rgba32.png
diff --git a/assets/core/beer.rgba16.png b/assets/core/beer.rgba16.png
diff --git a/assets/core/brew_logo.glb b/assets/core/brew_logo.glb
diff --git a/assets/core/brew_logo.png b/assets/core/brew_logo.png
diff --git a/assets/core/cursor.wav b/assets/core/cursor.wav
diff --git a/assets/core/dragon.mp3 b/assets/core/dragon.mp3
diff --git a/assets/core/dragon1.png b/assets/core/dragon1.png
diff --git a/assets/core/dragon2.png b/assets/core/dragon2.png
diff --git a/assets/core/dragon3.png b/assets/core/dragon3.png
diff --git a/assets/core/dragon4.png b/assets/core/dragon4.png
diff --git a/assets/core/foam_ref.ci8.png b/assets/core/foam_ref.ci8.png
diff --git a/assets/core/glass_back_1.rgba16.png b/assets/core/glass_back_1.rgba16.png
diff --git a/assets/core/glass_reflection_a.i8.png b/assets/core/glass_reflection_a.i8.png
diff --git a/assets/core/logo_env.i8.png b/assets/core/logo_env.i8.png
diff --git a/assets/core/menu_back.wav b/assets/core/menu_back.wav
diff --git a/assets/core/menu_confirm.wav b/assets/core/menu_confirm.wav
diff --git a/assets/core/player_join.wav b/assets/core/player_join.wav
diff --git a/assets/core/player_leave.wav b/assets/core/player_leave.wav
diff --git a/assets/core/title_confirm.wav b/assets/core/title_confirm.wav
diff --git a/assets/gradient.i8.png b/assets/gradient.i8.png
diff --git a/assets/iconPly.ia8.png b/assets/iconPly.ia8.png
diff --git a/assets/iconPlySelected.rgba32.png b/assets/iconPlySelected.rgba32.png
diff --git a/assets/iconStar.ia8.png b/assets/iconStar.ia8.png
diff --git a/assets/n64brew.ia8.png b/assets/n64brew.ia8.png
diff --git a/assets/pattern.i8.png b/assets/pattern.i8.png
diff --git a/assets/preview/boss_fight.m1v b/assets/preview/boss_fight.m1v
diff --git a/assets/slider.i8.png b/assets/slider.i8.png
diff --git a/assets/slider.ia4.png b/assets/slider.ia4.png
diff --git a/assets/squarewave_l.ttf b/assets/squarewave_l.ttf
diff --git a/assets/squarewave_xl.ttf b/assets/squarewave_xl.ttf
diff --git a/code/avanto/avanto.mk b/code/avanto/avanto.mk
@@ -43,14 +43,14 @@ $(FILESYSTEM_DIR)/avanto/%.sprite: $(ASSETS_DIR)/avanto/%.png
 	@echo "    [AVANTO SPRITE] $@"
 	$(N64_MKSPRITE) $(AVANTO MKSPRITE_FLAGS) -o $(dir $@) "$<"
 
-$(FILESYSTEM_DIR)/avanto/banner.font64: $(ASSETS_DIR)/squarewave.ttf
+# Generate both fonts at the same time form the same source.
+# Usage of pattern rules here is a trick:
+# https://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file
+$(FILESYSTEM_DIR)/avanto/banner%font64 $(FILESYSTEM_DIR)/avanto/timer%font64: $(ASSETS_DIR)/squarewave.ttf
 	@mkdir -p $(dir $@)
 	@echo "    [AVANTO FONT] $@"
 	$(N64_MKFONT) --outline 2 --range 20-5A -s 100 -o $(dir $@) "$<"
 	mv "$(dir $@)/squarewave.font64" "$@"
-
-$(FILESYSTEM_DIR)/avanto/timer.font64: $(ASSETS_DIR)/squarewave.ttf
-	@mkdir -p $(dir $@)
 	@echo "    [AVANTO FONT] $@"
 	$(N64_MKFONT) --outline 1 --range 30-39 -s 48 --ellipsis 30,3 -o $(dir $@) "$<"
 	mv "$(dir $@)/squarewave.font64" "$@"
diff --git a/code/old_gods/AF_Input.c b/code/old_gods/AF_Input.c
@@ -5,6 +5,7 @@ Input contains everything needed to collect input from the system from Libdragon
 =================*/
 #include <libdragon.h>
 #include "AF_Input.h"
+#include "../../core.h"
 #include "ECS/Entities/AF_ECS.h"
 
 // Key mappings for n64 controller to joypad_button struct, polled from libdragon
@@ -36,25 +37,25 @@ void AF_Input_Update(AF_Input* _input){
 	joypad_poll();
 
 		// Player 1
-        joypad_inputs_t inputs = joypad_get_inputs(JOYPAD_PORT_1);
-		joypad_buttons_t pressed1 = joypad_get_buttons_pressed(JOYPAD_PORT_1);
-        joypad_buttons_t held1 = joypad_get_buttons_held(JOYPAD_PORT_1);
+        joypad_inputs_t inputs = joypad_get_inputs(core_get_playercontroller(PLAYER_1));
+		joypad_buttons_t pressed1 = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_1));
+        joypad_buttons_t held1 = joypad_get_buttons_held(core_get_playercontroller(PLAYER_1));
 
 		// Player 2
-        joypad_inputs_t inputs2 = joypad_get_inputs(JOYPAD_PORT_2);
-		joypad_buttons_t pressed2 = joypad_get_buttons_pressed(JOYPAD_PORT_2);
-        joypad_buttons_t held2 = joypad_get_buttons_held(JOYPAD_PORT_2);
+        joypad_inputs_t inputs2 = joypad_get_inputs(core_get_playercontroller(PLAYER_2));
+		joypad_buttons_t pressed2 = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_2));
+        joypad_buttons_t held2 = joypad_get_buttons_held(core_get_playercontroller(PLAYER_2));
 
 
 		// Player 3
-        joypad_inputs_t inputs3 = joypad_get_inputs(JOYPAD_PORT_3);
-		joypad_buttons_t pressed3 = joypad_get_buttons_pressed(JOYPAD_PORT_3);
-        joypad_buttons_t held3 = joypad_get_buttons_held(JOYPAD_PORT_3);
+        joypad_inputs_t inputs3 = joypad_get_inputs(core_get_playercontroller(PLAYER_3));
+		joypad_buttons_t pressed3 = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_3));
+        joypad_buttons_t held3 = joypad_get_buttons_held(core_get_playercontroller(PLAYER_3));
 
 		// Player 4
-        joypad_inputs_t inputs4 = joypad_get_inputs(JOYPAD_PORT_4);
-		joypad_buttons_t pressed4 = joypad_get_buttons_pressed(JOYPAD_PORT_4);
-        joypad_buttons_t held4 = joypad_get_buttons_held(JOYPAD_PORT_4);
+        joypad_inputs_t inputs4 = joypad_get_inputs(core_get_playercontroller(PLAYER_4));
+		joypad_buttons_t pressed4 = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_4));
+        joypad_buttons_t held4 = joypad_get_buttons_held(core_get_playercontroller(PLAYER_4));
 
 		// flush the keys
 		for(int i = 0; i < AF_INPUT_KEYS_MAPPED; ++i){

diff --git a/code/paintball/src/player.cpp b/code/paintball/src/player.cpp
@@ -124,9 +124,9 @@ void Player::render(uint32_t id, T3DViewport &viewport, float deltaTime, MapRend
 
     t3d_mat4fp_from_srt_euler(
         matFP.get(),
-        (float[3]){0.12f+displayTemperature, 0.12f+displayTemperature, 0.12f+displayTemperature},
-        (float[3]){0.0f, direction, 0},
-        currentPos.v
+        T3DVec3{0.12f+displayTemperature, 0.12f+displayTemperature, 0.12f+displayTemperature},
+        T3DVec3{0.0f, direction, 0},
+        currentPos
     );
 
     rdpq_sync_pipe();

diff --git a/code/sb_halcyon/control/controls.h b/code/sb_halcyon/control/controls.h
@@ -23,30 +23,30 @@ void controllerData_rumbleFrames(ControllerData *data, uint8_t port, uint8_t fra
 
 void controllerData_getInputs(ControllerData *data, uint8_t port)
 {
-    data->pressed = joypad_get_buttons_pressed(port);
-    data->held = joypad_get_buttons_held(port);
-    data->released = joypad_get_buttons_released(port);
-    data->input = joypad_get_inputs(port);
+    data->pressed = joypad_get_buttons_pressed(core_get_playercontroller(port));
+    data->held = joypad_get_buttons_held(core_get_playercontroller(port));
+    data->released = joypad_get_buttons_released(core_get_playercontroller(port));
+    data->input = joypad_get_inputs(core_get_playercontroller(port));
 
     // Check if the rumble pak has been unplugged
-    if (!joypad_get_rumble_supported(port))
-        controllerData_rumbleStop(data, port);
+    if (!joypad_get_rumble_supported(core_get_playercontroller(port)))
+        controllerData_rumbleStop(data, core_get_playercontroller(port));
 }
 
 /* RUMBLE */
 
 // Set rumble to active state
 void controllerData_rumbleStart(ControllerData *data, uint8_t port)
 {
-    joypad_set_rumble_active(port, true);
+    joypad_set_rumble_active(core_get_playercontroller(port), true);
     data->rumble_time = 0;
     data->rumble_active = true;
 }
 
 // Reset rumble to idle state
 void controllerData_rumbleStop(ControllerData *data, uint8_t port)
 {
-    joypad_set_rumble_active(port, false);
+    joypad_set_rumble_active(core_get_playercontroller(port), false);
     data->rumble_time = 0;
     data->rumble_active = false;
 }
@@ -57,13 +57,13 @@ void controllerData_rumbleFrames(ControllerData *data, uint8_t port, uint8_t fra
 
     if (data->rumble_active == false)
     {
-        controllerData_rumbleStart(data, port);
+        controllerData_rumbleStart(data, core_get_playercontroller(port));
     }
 
     data->rumble_time++;
 
     if (data->rumble_time >= frames)
-        controllerData_rumbleStop(data, port);
+        controllerData_rumbleStop(data, core_get_playercontroller(port));
 }
 
 ///// 8 WAY /////

diff --git a/code/sb_holes/render.h b/code/sb_holes/render.h
@@ -84,9 +84,9 @@ void render_scene(game_data *game, scene_data *scene)
     if (game->scene == INTRO)
     {
 
-        players[0].btn.pressed = joypad_get_buttons_pressed(PLAYER_1);
-        players[0].btn.held = joypad_get_buttons_held(PLAYER_1);
-        players[0].btn.released = joypad_get_buttons_released(PLAYER_1);
+        players[0].btn.pressed = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_1));
+        players[0].btn.held = joypad_get_buttons_held(core_get_playercontroller(PLAYER_1));
+        players[0].btn.released = joypad_get_buttons_released(core_get_playercontroller(PLAYER_1));
         ui_intro(&players[0].btn);
         if (players[0].btn.pressed.start)
         {
@@ -121,9 +121,9 @@ void render_scene(game_data *game, scene_data *scene)
     }
     else if (game->scene == PAUSE)
     {
-        players[0].btn.pressed = joypad_get_buttons_pressed(PLAYER_1);
-        players[0].btn.held = joypad_get_buttons_held(PLAYER_1);
-        players[0].btn.released = joypad_get_buttons_released(PLAYER_1);
+        players[0].btn.pressed = joypad_get_buttons_pressed(core_get_playercontroller(PLAYER_1));
+        players[0].btn.held = joypad_get_buttons_held(core_get_playercontroller(PLAYER_1));
+        players[0].btn.released = joypad_get_buttons_released(core_get_playercontroller(PLAYER_1));
         ui_pause(&players[0].btn);
         if (players[0].btn.pressed.start)
             game->scene = GAMEPLAY;

diff --git a/code/sb_holes/ui.h b/code/sb_holes/ui.h
@@ -251,7 +251,7 @@ void ui_intro(control_data *control)
             ui_spriteDraw(TILE3, sprite_faceButtons0, 0, 152, 66);
         }
 
-        joypad_inputs_t joypad = joypad_get_inputs(PLAYER_1);
+        joypad_inputs_t joypad = joypad_get_inputs(core_get_playercontroller(PLAYER_1));
 
         ui_spriteDraw(TILE5, sprite_controlStick, 0, 134, 86);
         int stickX = 134 + (joypad.stick_x / 15);

diff --git a/code/sb_hot/control/controls.h b/code/sb_hot/control/controls.h
@@ -23,30 +23,30 @@ void controllerData_rumbleFrames(ControllerData *data, uint8_t port, uint8_t fra
 
 void controllerData_getInputs(ControllerData *data, uint8_t port)
 {
-    data->pressed = joypad_get_buttons_pressed(port);
-    data->held = joypad_get_buttons_held(port);
-    data->released = joypad_get_buttons_released(port);
-    data->input = joypad_get_inputs(port);
+    data->pressed = joypad_get_buttons_pressed(core_get_playercontroller(port));
+    data->held = joypad_get_buttons_held(core_get_playercontroller(port));
+    data->released = joypad_get_buttons_released(core_get_playercontroller(port));
+    data->input = joypad_get_inputs(core_get_playercontroller(port));
 
     // Check if the rumble pak has been unplugged
-    if (!joypad_get_rumble_supported(port))
-        controllerData_rumbleStop(data, port);
+    if (!joypad_get_rumble_supported(core_get_playercontroller(port)))
+        controllerData_rumbleStop(data, core_get_playercontroller(port));
 }
 
 /* RUMBLE */
 
 // Set rumble to active state
 void controllerData_rumbleStart(ControllerData *data, uint8_t port)
 {
-    joypad_set_rumble_active(port, true);
+    joypad_set_rumble_active(core_get_playercontroller(port), true);
     data->rumble_time = 0;
     data->rumble_active = true;
 }
 
 // Reset rumble to idle state
 void controllerData_rumbleStop(ControllerData *data, uint8_t port)
 {
-    joypad_set_rumble_active(port, false);
+    joypad_set_rumble_active(core_get_playercontroller(port), false);
     data->rumble_time = 0;
     data->rumble_active = false;
 }
@@ -57,13 +57,13 @@ void controllerData_rumbleFrames(ControllerData *data, uint8_t port, uint8_t fra
 
     if (data->rumble_active == false)
     {
-        controllerData_rumbleStart(data, port);
+        controllerData_rumbleStart(data, core_get_playercontroller(port));
     }
 
     data->rumble_time++;
 
     if (data->rumble_time >= frames)
-        controllerData_rumbleStop(data, port);
+        controllerData_rumbleStop(data, core_get_playercontroller(port));
 }
 
 ///// 8 WAY /////
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,8 +4,6 @@ Welcome to this year's N64brew game jam. This year, we are creating a large coll

		Please ensure that you are using the latest `preview` branch of Libdragon, that you have [Tiny3D](https://github.com/HailToDodongo/tiny3d) installed, and that you are able to compile this ROM without issues. This template has both an OpenGL and [Tiny3D](https://github.com/HailToDodongo/tiny3d) example game. We also recommend that you fork this repository so that you can then perform a pull request for your final project (although you will lose the ability to make your repository private).

		Please note that the menu provided by the template is not final and will be changed in the final ROM.


		### Starting a new minigame

Expand Down