mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-11 05:08:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ntsc-1.2] Match game.c, z_play.c, z_room.c (#2117)

Browse Source 
* Match z_room.c

* Match game.c and z_play.c

* Add undefined syms

* Rewrite condition based on other file matches
This commit is contained in:
cadmic
2024-09-03 22:46:41 -07:00
committed by GitHub
parent 87914c6cc6
commit e7cf2fceac
8 changed files with 174 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/game.c
+32 -3
View File
@@ -1,8 +1,9 @@
#include "global.h"
#if OOT_DEBUG
#include "fault.h"
#endif
#include "terminal.h"
#if PLATFORM_N64
#include "n64dd.h"
#endif
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
@@ -70,7 +71,11 @@ void GameState_SetFBFilter(Gfx** gfxP) {
}
void func_800C4344(GameState* gameState) {
#if OOT_DEBUG
#if PLATFORM_N64
if (B_80121AE2 != 0) {
func_801C86F0_unknown();
}
#elif OOT_DEBUG
Input* selectedInput;
s32 hexDumpSize;
u16 inputCompareValue;
@@ -238,6 +243,12 @@ void func_800C49F4(GraphicsContext* gfxCtx) {
newDlist = Gfx_Open(polyOpaP = POLY_OPA_DISP);
gSPDisplayList(OVERLAY_DISP++, newDlist);
#if PLATFORM_N64
if (B_80121AE2 != 0) {
func_801C7760_unknown(&newDlist);
}
#endif
gSPEndDisplayList(newDlist++);
Gfx_Close(polyOpaP, newDlist);
POLY_OPA_DISP = newDlist;
@@ -258,6 +269,15 @@ void GameState_Update(GameState* gameState) {
gameState->main(gameState);
#if PLATFORM_N64
if (B_80121AE2 != 0) {
func_801C86F0_unknown();
}
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_74 != NULL)) {
B_80121AF0->unk_74(gameState);
}
#endif
func_800C4344(gameState);
#if OOT_DEBUG
@@ -356,7 +376,11 @@ void GameState_InitArena(GameState* gameState, size_t size) {
} else {
THA_Init(&gameState->tha, NULL, 0);
PRINTF(T("ハイラル確保失敗\n", "Failure to secure Hyrule\n"));
#if PLATFORM_N64
HUNGUP_AND_CRASH("../game.c", 985);
#else
HUNGUP_AND_CRASH("../game.c", 999);
#endif
}
}
@@ -396,7 +420,12 @@ void GameState_Realloc(GameState* gameState, size_t size) {
#if OOT_DEBUG
SystemArena_Display();
#endif
#if PLATFORM_N64
HUNGUP_AND_CRASH("../game.c", 1030);
#else
HUNGUP_AND_CRASH("../game.c", 1044);
#endif
}
}