mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 09:50:50 +00:00
Code Issues Projects Releases Wiki Activity

Clean up uses of !PLATFORM_N64 vs PLATFORM_GC (#2134)

Browse source 
* Clean up uses of !PLATFORM_N64 vs PLATFORM_GC

* Put N64 button colors first
This commit is contained in:
cadmic 2024-09-06 02:18:59 -07:00 • committed by GitHub
parent 3faa1c6acc
commit 53b2110373
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -2261,7 +2261,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_0;
}
#if PLATFORM_GC
#if !PLATFORM_N64
BossMo_SfxTest();
#endif
}
@ -3051,7 +3051,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
CLOSE_DISPS(gfxCtx, "../z_boss_mo.c", 7482);
}
#if PLATFORM_GC
#if !PLATFORM_N64
void BossMo_SfxTest(void) {
// Appears to be a test function for sound effects.
static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };

2
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -16,7 +16,7 @@
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)
#if PLATFORM_N64
#if !PLATFORM_GC
#define CURSOR_COLOR_R 0
#define CURSOR_COLOR_G 80
#define CURSOR_COLOR_B 255

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View file

@ -2,7 +2,7 @@
#include "assets/textures/parameter_static/parameter_static.h"
#include "assets/textures/icon_item_static/icon_item_static.h"
#if PLATFORM_N64
#if !PLATFORM_GC
#define KALEIDO_COLOR_COLLECT_UNK_R 80
#define KALEIDO_COLOR_COLLECT_UNK_G 150
#define KALEIDO_COLOR_COLLECT_UNK_B 255

8
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -15,7 +15,7 @@
#include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h"
#include "terminal.h"
#if PLATFORM_N64
#if !PLATFORM_GC
#define KALEIDO_COLOR_PROMPT_UNK_R 100
#define KALEIDO_COLOR_PROMPT_UNK_G 100
#define KALEIDO_COLOR_PROMPT_UNK_B 255
@ -3663,7 +3663,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->state = PAUSE_STATE_CLOSING;
WREG(2) = -6240;
func_800F64E0(0);
#if PLATFORM_GC && OOT_NTSC
#if !PLATFORM_N64 && OOT_NTSC
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
#endif
} else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
@ -3811,7 +3811,7 @@ void KaleidoScope_Update(PlayState* play) {
WREG(2) = -6240;
YREG(8) = pauseCtx->unk_204;
func_800F64E0(0);
#if PLATFORM_GC && OOT_NTSC
#if !PLATFORM_N64 && OOT_NTSC
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
#endif
} else {
@ -3839,7 +3839,7 @@ void KaleidoScope_Update(PlayState* play) {
gSaveContext.buttonStatus[3] = BTN_ENABLED;
gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE;
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL);
#if PLATFORM_GC && OOT_NTSC
#if !PLATFORM_N64 && OOT_NTSC
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
#endif
}