mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 11:54:39 +00:00
Code Issues Projects Releases Wiki Activity

Add all N64 version defines (#2095)

Browse source 
* Add all N64 ROMs to versions.h

* Remove OOT_ prefix from version defines

* Make it pretty
This commit is contained in:
cadmic 2024-08-26 08:43:59 -07:00 • committed by GitHub
parent c6d29691d0
commit 3795574878
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 50 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_common_data.c
View file

@ -23,16 +23,16 @@ void SaveContext_Init(void) {
gSaveContext.dogIsLost = true;
gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT;
gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL;
#if OOT_NTSC && OOT_VERSION < OOT_GC_US
#if OOT_NTSC && OOT_VERSION < GC_US
if (gCurrentRegion == REGION_JP) {
gSaveContext.language = LANGUAGE_JPN;
}
if (gCurrentRegion == REGION_US) {
gSaveContext.language = LANGUAGE_ENG;
}
#elif OOT_VERSION == OOT_GC_US || OOT_VERSION == OOT_GC_US_MQ
#elif OOT_VERSION == GC_US || OOT_VERSION == GC_US_MQ
gSaveContext.language = LANGUAGE_ENG;
#elif OOT_VERSION == OOT_GC_JP_CE
#elif OOT_VERSION == GC_JP_CE
gSaveContext.language = LANGUAGE_JPN;
#endif
}

6
src/code/z_message.c
View file

@ -3853,7 +3853,7 @@ void Message_DrawDebugText(PlayState* play, Gfx** p) {
void Message_Draw(PlayState* play) {
Gfx* plusOne;
Gfx* polyOpaP;
#if OOT_VERSION < OOT_GC_US
#if OOT_VERSION < GC_US
s32 pad;
#endif
#if OOT_DEBUG
@ -3905,7 +3905,7 @@ void Message_Update(PlayState* play) {
0x0400, 0x0400, 0x0200, 0x0000, 0x1038, 0x0008, 0x200A, 0x088B, 0x0007, 0x0009, 0x000A, 0x107E, 0x2008, 0x2007,
0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016,
};
#if OOT_VERSION < OOT_GC_US
#if OOT_VERSION < GC_US
static s32 sUnknown = 0;
#endif
static u8 D_80153D74 = 0;
@ -3918,7 +3918,7 @@ void Message_Update(PlayState* play) {
s16 averageY;
s16 playerFocusScreenPosY;
s16 actorFocusScreenPosY;
#if OOT_VERSION < OOT_GC_US
#if OOT_VERSION < GC_US
s32 pad[2];
#endif

4
src/code/z_play.c
View file

@ -171,9 +171,9 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
break;
default:
#if OOT_VERSION < OOT_GC_EU_MQ_DBG
#if OOT_VERSION < GC_EU_MQ_DBG
HUNGUP_AND_CRASH("../z_play.c", 2287);
#elif OOT_VERSION < OOT_GC_JP_CE
#elif OOT_VERSION < GC_JP_CE
HUNGUP_AND_CRASH("../z_play.c", 2290);
#else
HUNGUP_AND_CRASH("../z_play.c", 2293);