ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add var const prefix for some missed var numbers

Browse Source
This commit is contained in:
Diegoisawesome 2019-01-21 22:34:01 -06:00
parent 6c1cb7219e
commit 900f294011
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/macros/event.inc
View File

@ -1626,11 +1626,11 @@
.endm .endm
.macro switch var:req .macro switch var:req
copyvar 0x8000, \var copyvar VAR_0x8000, \var
.endm .endm
.macro case condition:req, dest:req .macro case condition:req, dest:req
compare 0x8000, \condition compare VAR_0x8000, \condition
goto_if_eq \dest goto_if_eq \dest
.endm .endm
@ -1650,13 +1650,13 @@
.endm .endm
.macro giveitem_std item:req, amount=1, function=0 .macro giveitem_std item:req, amount=1, function=0
setorcopyvar 0x8000, \item setorcopyvar VAR_0x8000, \item
setorcopyvar 0x8001, \amount setorcopyvar VAR_0x8001, \amount
callstd \function callstd \function
.endm .endm
.macro givedecoration_std decoration:req .macro givedecoration_std decoration:req
setorcopyvar 0x8000, \decoration setorcopyvar VAR_0x8000, \decoration
callstd STD_OBTAIN_DECORATION callstd STD_OBTAIN_DECORATION
.endm .endm

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

@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
return return
PetalburgCity_Gym_EventScript_20495D:: @ 820495D PetalburgCity_Gym_EventScript_20495D:: @ 820495D
setorcopyvar 0x8015, 269 setorcopyvar VAR_0x8015, 269
specialvar VAR_RESULT, IsTrainerReadyForRematch specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq PetalburgCity_Gym_EventScript_204985 goto_if_eq PetalburgCity_Gym_EventScript_204985

1
include/constants/vars.h
View File

@ -297,5 +297,6 @@
#define VAR_MON_BOX_ID 0x8012 #define VAR_MON_BOX_ID 0x8012
#define VAR_MON_BOX_POS 0x8013 #define VAR_MON_BOX_POS 0x8013
#define VAR_0x8014 0x8014 #define VAR_0x8014 0x8014
#define VAR_0x8015 0x8015
#endif // GUARD_CONSTANTS_VARS_H #endif // GUARD_CONSTANTS_VARS_H