nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into aManchipelago

Browse Source
This commit is contained in:
aMannus
2025-10-15 09:37:51 +02:00
parent 95555a4360 56ab4c51fd
commit 5492cdc207
273 changed files with 6101 additions and 3191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/include/functions.h
View File

@@ -10,7 +10,7 @@ extern "C"
{
#endif
#include "luslog.h"
#include <libultraship/log/luslog.h>
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
#if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)

2
soh/include/macros.h
View File

@@ -1,7 +1,7 @@
#ifndef MACROS_H
#define MACROS_H
#include <endianness.h>
#include <ship/utils/binarytools/endianness.h>
// Upstream TODO: Document reasoning for change
// #ifndef __GNUC__

2
soh/include/z64.h
View File

@@ -1522,7 +1522,7 @@ typedef struct {
/* 0x34 */ s32 isEnabled;
} StickDirectionPrompt;
typedef struct {
typedef struct FileChooseContext {
/* 0x00000 */ GameState state;
/* 0x000A4 */ Vtx* windowVtx;
/* 0x000A8 */ u8* staticSegment;

2
soh/include/z64audio.h
View File

@@ -5,7 +5,7 @@
extern "C" {
#endif
#include <endianness.h>
#include <ship/utils/binarytools/endianness.h>
#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))

2
soh/include/z64save.h
View File

@@ -7,7 +7,7 @@
#include "soh/Enhancements/randomizer/randomizerTypes.h"
#include "soh/Enhancements/gameplaystats.h"
#include "soh/Enhancements/randomizer/randomizer_entrance.h"
#include "soh/Enhancements/boss-rush/BossRushTypes.h"
#include "soh/Enhancements/boss-rush/BossRush.h"
typedef enum {
/* 0x0 */ MAGIC_STATE_IDLE, // Regular gameplay