mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 09:20:17 +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/audio/general.c
View file

@ -3,7 +3,7 @@
#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
#if PLATFORM_GC
#if !PLATFORM_N64
#define AUDIO_PRINTF osSyncPrintf
#elif IDO_PRINTF_WORKAROUND
#define AUDIO_PRINTF(args) (void)0
@ -858,7 +858,7 @@ NatureAmbienceDataIO sNatureAmbienceDataIO[20] = {
},
};
#if PLATFORM_GC
#if !PLATFORM_N64
u32 sOcarinaAllowedButtonMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT);
s32 sOcarinaAButtonMap = BTN_A;
s32 sOcarinaCUpButtonMap = BTN_CUP;

2
src/audio/sfx.c
View file

@ -342,7 +342,7 @@ void Audio_ChooseActiveSfx(u8 bankId) {
entry->sfxId, entry->posX, entry->posZ, *entry->posX, *entry->posY, *entry->posZ);
}
entry->priority = (u32)entry->dist + (SQ(0xFF - sfxImportance) * SQ(76));
#if PLATFORM_GC
#if !PLATFORM_N64
temp3 = entry->sfxId; // fake
entry->priority = entry->priority + temp3 - temp3;
#endif