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

Fix copyvar with non-var argument

Browse Source
This commit is contained in:
Martin Griffin
2025-11-06 11:15:13 +00:00
committed by Philipp AUER
parent fdcaac9175
commit 1a9fbbcfba
6 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
asm/macros/event.inc
View File

@@ -169,7 +169,10 @@
.endm .endm
@ Copies the value of source into destination. @ Copies the value of source into destination.
.macro copyvar destination:req, source:req .macro copyvar destination:req, source:req, warn=TRUE
.if \warn && !((\source >= VARS_START && \source <= VARS_END) || (\source >= SPECIAL_VARS_START && \source <= SPECIAL_VARS_END))
.warning "copyvar with a value that is not a VAR_ constant; did you mean setvar instead?"
.endif
.byte SCR_OP_COPYVAR .byte SCR_OP_COPYVAR
.2byte \destination .2byte \destination
.2byte \source .2byte \source

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

@@ -349,7 +349,11 @@ 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
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 #if UBFIX
setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
#else
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
#endif
additem ITEM_CONTEST_PASS additem ITEM_CONTEST_PASS
setvar VAR_0x800B, 8 setvar VAR_0x800B, 8
setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER

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

@@ -76,7 +76,11 @@ 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
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 #if UBFIX
setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
#else
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
#endif
releaseall releaseall
end end

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

@@ -6,7 +6,11 @@ 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
copyvar VAR_ICE_STEP_COUNT, 1 #if UBFIX
setvar VAR_ICE_STEP_COUNT, 1
#else
copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
#endif
end end
SkyPillar_2F_EventScript_CleanFloor:: SkyPillar_2F_EventScript_CleanFloor::

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

@@ -6,7 +6,11 @@ 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
copyvar VAR_ICE_STEP_COUNT, 1 #if UBFIX
setvar VAR_ICE_STEP_COUNT, 1
#else
copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
#endif
end end
SkyPillar_4F_EventScript_CleanFloor:: SkyPillar_4F_EventScript_CleanFloor::

6
data/scripts/cave_hole.inc
View File

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