mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-24 01:31:28 -04:00
Code Issues Packages 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
6 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_n64dd_800AD4C0.c
+2 -4
View File
@@ -68,10 +68,8 @@ n64ddStruct_80121AF0* func_800ADB30(n64ddStruct_80121AF0* arg0) {
}
void func_800ADB8C(void) {
if (B_80121AF0 != NULL) {
if (B_80121AF0->unk_04 != NULL) {
B_80121AF0->unk_04();
}
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_04 != NULL)) {
B_80121AF0->unk_04();
}
B_80121AF0 = NULL;
}
src/code/z_kaleido_setup.c
+4 -8
View File
@@ -177,20 +177,16 @@ void KaleidoSetup_Init(PlayState* play) {
View_Init(&pauseCtx->view, play->state.gfxCtx);
#if PLATFORM_N64
if (B_80121AF0 != NULL) {
if (B_80121AF0->unk_3C != NULL) {
B_80121AF0->unk_3C();
}
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_3C != NULL)) {
B_80121AF0->unk_3C();
}
#endif
}
void KaleidoSetup_Destroy(PlayState* play) {
#if PLATFORM_N64
if (B_80121AF0 != NULL) {
if (B_80121AF0->unk_40 != NULL) {
B_80121AF0->unk_40();
}
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_40 != NULL)) {
B_80121AF0->unk_40();
}
#endif
}
src/code/z_scene_table.c
+1 -1
View File
@@ -196,7 +196,7 @@ SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = {
};
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);
return;
}
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
+5
View File
@@ -605,6 +605,11 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
} else if (curSection == 0x5B) {
if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
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) ||
CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
gSaveContext.save.info.inventory.gsTokens--;
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
+13
View File
@@ -1,3 +1,6 @@
#if PLATFORM_N64
#include "n64dd.h"
#endif
#include "z_kaleido_scope.h"
#include "assets/textures/parameter_static/parameter_static.h"
@@ -27,9 +30,19 @@ void PauseMapMark_Init(PlayState* play) {
gBossMarkState = 0;
gBossMarkScale = 1.0f;
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) {
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_38 != NULL)) {
B_80121AF0->unk_38(&gLoadedPauseMarkDataTable);
}
#endif
gLoadedPauseMarkDataTable = NULL;
}