Merge branch 'develop' into aManchipelago

2025-10-15 09:37:51 +02:00
parent 95555a4360 56ab4c51fd
commit 5492cdc207
273 changed files with 6101 additions and 3191 deletions
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -1522,7 +1522,7 @@ typedef struct {
    /* 0x34 */ s32 isEnabled;
 } StickDirectionPrompt;

-typedef struct {
+typedef struct FileChooseContext {
    /* 0x00000 */ GameState state;
    /* 0x000A4 */ Vtx* windowVtx;
    /* 0x000A8 */ u8* staticSegment;