diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-30 12:52:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 15:52:38 -0400 |
| commit | bdc11c2894d482208ba9acef6f572fb317ee69d2 (patch) | |
| tree | da4d2925be53a2479fafe0188feab2f05f390086 /src/code/z_construct.c | |
| parent | 80ed596c56e89c1de600caf2c4656f8205c529a1 (diff) | |
[ntsc-1.0/1.1] Match "game engine" files (#2244)
* [ntsc-1.0/1.1] Match "game engine" files
* Use R_START_BTN_X/R_START_BTN_Y
* Comment obvious bugs
* Move Magic_Fill comments
* Move EVENTINF_HORSES_INDEX printf inside #if
* Replace "this function"
Diffstat (limited to 'src/code/z_construct.c')
| -rw-r--r-- | src/code/z_construct.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c index e190e19d2..0720bc8b9 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -162,8 +162,13 @@ void Interface_Init(PlayState* play) { gSaveContext.timerY[timerId] = 46; // one row of hearts } } - - if ((gSaveContext.timerState >= TIMER_STATE_UP_INIT) && (gSaveContext.timerState <= TIMER_STATE_UP_FREEZE)) { +#if OOT_VERSION < PAL_1_0 + else if ((gSaveContext.timerState >= TIMER_STATE_UP_INIT) && (gSaveContext.timerState <= TIMER_STATE_UP_FREEZE)) +#else + // No "else" + if ((gSaveContext.timerState >= TIMER_STATE_UP_INIT) && (gSaveContext.timerState <= TIMER_STATE_UP_FREEZE)) +#endif + { gSaveContext.timerState = TIMER_STATE_OFF; PRINTF(T("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", "Timer Stop!!!!!!!!!!!!!!!!!!!!! = %d\n"), @@ -381,6 +386,10 @@ void Regs_InitDataImpl(void) { ZREG(65) = 21; ZREG(66) = 122; +#if OOT_VERSION < PAL_1_0 + R_START_BTN_X = 132; + R_START_BTN_Y = 17; +#endif R_ITEM_BTN_X(1) = C_LEFT_BUTTON_X; R_ITEM_BTN_X(2) = C_DOWN_BUTTON_X; R_ITEM_BTN_X(3) = C_RIGHT_BUTTON_X; |