Implemented warp debug menu feature

2026-08-20 14:24:55 -04:00 · 2024-03-01 18:42:05 -05:00
parent 8dcca10fed
commit beec29217c
13 changed files with 1094 additions and 25 deletions
@@ -0,0 +1,97 @@
+#include "patches.h"
+#include "input.h"
+#include "z64debug_display.h"
+
+void Message_FindMessage(PlayState* play, u16 textId);
+extern SceneEntranceTableEntry sSceneEntranceTable[];
+
+char text_buffer[1024];
+
+void do_warp(PlayState* play, u16 entrance){
+    play->nextEntrance = entrance;
+    gSaveContext.save.entrance = play->nextEntrance;
+    play->state.running = false;
+    play->state.init = gGameStateOverlayTable[GAMESTATE_PLAY].init;
+    play->state.size = gGameStateOverlayTable[GAMESTATE_PLAY].instanceSize;
+
+    // Gets the ingame name, may be useful for mods later on
+    // SceneEntranceTableEntry* scene_entrance_table_entry = &sSceneEntranceTable[entrance >> 9];
+    // if (scene_entrance_table_entry->table) {
+    //     EntranceTableEntry* entrance_table_entry = scene_entrance_table_entry->table[0];
+    //     recomp_printf("entrance_table_entry: 0x%08X\n", (uintptr_t)entrance_table_entry);
+    //     int scene_id = ABS(entrance_table_entry->sceneId);
+    //     recomp_printf("scene_id: %d\n", scene_id);
+
+    //     SceneTableEntry* scene = &gSceneTable[scene_id];
+    //     int title_text_id = scene->titleTextId;
+    //     recomp_printf("title_text_id: %d\n", title_text_id);
+        
+    //     recomp_printf("play->msgCtx.messageEntryTable: 0x%08X\n", (uintptr_t)play->msgCtx.messageEntryTableNes);
+
+    //     Message_FindMessageNES(play, title_text_id);
+
+    //     recomp_printf("font->messageStart: 0x%08X font->messageEnd: 0x%08X\n", play->msgCtx.font.messageStart, play->msgCtx.font.messageEnd);
+
+    //     DmaRequest req;
+    //     req.vromAddr = play->msgCtx.font.messageStart + SEGMENT_ROM_START(message_data_static);
+    //     req.dramAddr = text_buffer;
+    //     req.size = play->msgCtx.font.messageEnd;
+    //     recomp_printf("dma from vrom 0x%08X to vram 0x%08x of 0x%04X bytes\n", req.vromAddr, req.dramAddr, req.size);
+    //     DmaMgr_ProcessMsg(&req);
+
+    //     if (text_buffer[2] != (char)0xFE) {
+    //         recomp_printf("Invalid text\n");
+    //         *(volatile int*)0 = 0;
+    //     }
+
+    //     recomp_printf("text_buffer: %s\n", text_buffer + 11);
+    // }
+    // int scene = (entrance & 0xFF00) >> 8;
+}
+
+void debug_play_update(PlayState* play) {
+    u16 pending_warp = recomp_get_pending_warp();
+    if (pending_warp != 0xFFFF) {
+        do_warp(play, pending_warp);
+    }
+}
+
+extern Input D_801F6C18;
+
+// @recomp Patched to add a point to modify state before the frame's update.
+void Play_Main(GameState* thisx) {
+    static Input* prevInput = NULL;
+    PlayState* this = (PlayState*)thisx;
+
+    // @recomp
+    debug_play_update(this);
+    
+    // @recomp avoid unused variable warning
+    (void)prevInput;
+
+    prevInput = CONTROLLER1(&this->state);
+    DebugDisplay_Init();
+
+    {
+        GraphicsContext* gfxCtx = this->state.gfxCtx;
+
+        if (1) {
+            this->state.gfxCtx = NULL;
+        }
+        Play_Update(this);
+        this->state.gfxCtx = gfxCtx;
+    }
+
+    {
+        Input input = *CONTROLLER1(&this->state);
+
+        if (1) {
+            *CONTROLLER1(&this->state) = D_801F6C18;
+        }
+        Play_Draw(this);
+        *CONTROLLER1(&this->state) = input;
+    }
+
+    CutsceneManager_Update();
+    CutsceneManager_ClearWaiting();
+}
@@ -16,5 +16,6 @@ DECLARE_FUNC(void, recomp_puts, const char* data, u32 size);
 DECLARE_FUNC(void, recomp_exit);
 DECLARE_FUNC(void, recomp_handle_quicksave_actions, OSMesgQueue* enter_mq, OSMesgQueue* exit_mq);
 DECLARE_FUNC(void, recomp_handle_quicksave_actions_main, OSMesgQueue* enter_mq, OSMesgQueue* exit_mq);
+DECLARE_FUNC(u16, recomp_get_pending_warp);

 #endif
@@ -1,5 +1,8 @@
 __start = 0x80000000;

+/* Static symbols that aren't in the elf */
+sSceneEntranceTable = 0x801C5720;
+
 /* Dummy addresses that get recompiled into function calls */
 recomp_puts = 0x81000000;
 recomp_exit = 0x81000004;
@@ -9,3 +12,4 @@ osRecvMesg_recomp = 0x81000010;
 osSendMesg_recomp = 0x81000014;
 recomp_get_gyro_deltas = 0x81000018;
 recomp_get_aspect_ratio = 0x8100001C;
+recomp_get_pending_warp = 0x81000020;