mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Match z_kaleido_debug.c, z_lmap_mark.c (#2077)

Browse source 
* Match z_kaleido_debug.c, z_lmap_mark.c

* consistent style for n64dd callbacks calls
This commit is contained in:
Dragorn421 2024-08-24 14:18:48 +02:00 • committed by GitHub
parent b40e51d8c8
commit ea40688e4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/n64dd.h
View file

@ -1,6 +1,7 @@
#ifndef N64DD_H #ifndef N64DD_H
#define N64DD_H #define N64DD_H
#include "z64pause.h"
#include "z64scene.h" #include "z64scene.h"
struct RegEditor; struct RegEditor;
@ -22,7 +23,9 @@ struct PlayState;
typedef struct n64ddStruct_80121AF0 { typedef struct n64ddStruct_80121AF0 {
void (*unk_00)(n64ddStruct_800FF4B0_pointers*, struct n64ddStruct_80121AF0*); void (*unk_00)(n64ddStruct_800FF4B0_pointers*, struct n64ddStruct_80121AF0*);
void (*unk_04)(void); void (*unk_04)(void);
char unk_08[0x34]; char unk_08[0x2C];
void (*unk_34)(PauseMapMarksData**);
void (*unk_38)(PauseMapMarksData**);
void (*unk_3C)(void); void (*unk_3C)(void);
void (*unk_40)(void); void (*unk_40)(void);
s32 (*unk_44)(struct PlayState*); s32 (*unk_44)(struct PlayState*);

6
src/code/code_n64dd_800AD4C0.c
View file

@ -68,10 +68,8 @@ n64ddStruct_80121AF0* func_800ADB30(n64ddStruct_80121AF0* arg0) {
} }
void func_800ADB8C(void) { void func_800ADB8C(void) {
if (B_80121AF0 != NULL) { if ((B_80121AF0 != NULL) && (B_80121AF0->unk_04 != NULL)) {
if (B_80121AF0->unk_04 != NULL) { B_80121AF0->unk_04();
B_80121AF0->unk_04();
}
} }
B_80121AF0 = NULL; B_80121AF0 = NULL;
} }

12
src/code/z_kaleido_setup.c
View file

@ -177,20 +177,16 @@ void KaleidoSetup_Init(PlayState* play) {
View_Init(&pauseCtx->view, play->state.gfxCtx); View_Init(&pauseCtx->view, play->state.gfxCtx);
#if PLATFORM_N64 #if PLATFORM_N64
if (B_80121AF0 != NULL) { if ((B_80121AF0 != NULL) && (B_80121AF0->unk_3C != NULL)) {
if (B_80121AF0->unk_3C != NULL) { B_80121AF0->unk_3C();
B_80121AF0->unk_3C();
}
} }
#endif #endif
} }
void KaleidoSetup_Destroy(PlayState* play) { void KaleidoSetup_Destroy(PlayState* play) {
#if PLATFORM_N64 #if PLATFORM_N64
if (B_80121AF0 != NULL) { if ((B_80121AF0 != NULL) && (B_80121AF0->unk_40 != NULL)) {
if (B_80121AF0->unk_40 != NULL) { B_80121AF0->unk_40();
B_80121AF0->unk_40();
}
} }
#endif #endif
} }

2
src/code/z_scene_table.c
View file

@ -196,7 +196,7 @@ SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = {
}; };
void Scene_Draw(PlayState* play) { void Scene_Draw(PlayState* play) {
if (B_80121AF0 != NULL && B_80121AF0->unk_6C != NULL) { if ((B_80121AF0 != NULL) && (B_80121AF0->unk_6C != NULL)) {
B_80121AF0->unk_6C(play, sSceneDrawConfigs); B_80121AF0->unk_6C(play, sSceneDrawConfigs);
return; return;
} }

5
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View file

@ -605,6 +605,11 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
} else if (curSection == 0x5B) { } else if (curSection == 0x5B) {
if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
gSaveContext.save.info.inventory.gsTokens++; gSaveContext.save.info.inventory.gsTokens++;
#if PLATFORM_N64
if (gSaveContext.save.info.inventory.gsTokens >= 100) {
gSaveContext.save.info.inventory.gsTokens = 100;
}
#endif
} else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN) || } else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN) ||
CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
gSaveContext.save.info.inventory.gsTokens--; gSaveContext.save.info.inventory.gsTokens--;

13
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View file

@ -1,3 +1,6 @@
#if PLATFORM_N64
#include "n64dd.h"
#endif
#include "z_kaleido_scope.h" #include "z_kaleido_scope.h"
#include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/parameter_static/parameter_static.h"
@ -27,9 +30,19 @@ void PauseMapMark_Init(PlayState* play) {
gBossMarkState = 0; gBossMarkState = 0;
gBossMarkScale = 1.0f; gBossMarkScale = 1.0f;
gLoadedPauseMarkDataTable = gPauseMapMarkDataTable; gLoadedPauseMarkDataTable = gPauseMapMarkDataTable;
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_34 != NULL)) {
B_80121AF0->unk_34(&gLoadedPauseMarkDataTable);
}
#endif
} }
void PauseMapMark_Clear(PlayState* play) { void PauseMapMark_Clear(PlayState* play) {
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_38 != NULL)) {
B_80121AF0->unk_38(&gLoadedPauseMarkDataTable);
}
#endif
gLoadedPauseMarkDataTable = NULL; gLoadedPauseMarkDataTable = NULL;
} }