dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect UBFIX checks (#2206)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90
2025-11-16 11:33:16 +01:00
committed by GitHub
parent b231424527
commit f8e7a2db5f
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/LilycoveCity_ContestLobby/scripts.inc
View File

@@ -349,7 +349,7 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType::
@ Functionally unused @ Functionally unused
LilycoveCity_ContestLobby_EventScript_SetDebug:: LilycoveCity_ContestLobby_EventScript_SetDebug::
setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
#if UBFIX #ifdef UBFIX
setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
#else #else
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE

2
data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
View File

@@ -76,7 +76,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall::
applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
waitmovement 0 waitmovement 0
msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN
#if UBFIX #ifdef UBFIX
setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
#else #else
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE

2
data/maps/SkyPillar_2F/scripts.inc
View File

@@ -6,7 +6,7 @@ SkyPillar_2F_MapScripts::
SkyPillar_2F_OnTransition: SkyPillar_2F_OnTransition:
call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_2F_EventScript_CleanFloor call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_2F_EventScript_CleanFloor
#if UBFIX #ifdef UBFIX
setvar VAR_ICE_STEP_COUNT, 1 setvar VAR_ICE_STEP_COUNT, 1
#else #else
copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE

2
data/maps/SkyPillar_4F/scripts.inc
View File

@@ -6,7 +6,7 @@ SkyPillar_4F_MapScripts::
SkyPillar_4F_OnTransition: SkyPillar_4F_OnTransition:
call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_4F_EventScript_CleanFloor call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_4F_EventScript_CleanFloor
#if UBFIX #ifdef UBFIX
setvar VAR_ICE_STEP_COUNT, 1 setvar VAR_ICE_STEP_COUNT, 1
#else #else
copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE

2
data/scripts/cave_hole.inc
View File

@@ -3,7 +3,7 @@ CaveHole_CheckFallDownHole:
.2byte 0 .2byte 0
CaveHole_FixCrackedGround: CaveHole_FixCrackedGround:
#if UBFIX #ifdef UBFIX
setvar VAR_ICE_STEP_COUNT, 1 setvar VAR_ICE_STEP_COUNT, 1
#else #else
copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE