diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-22 21:59:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-22 21:59:32 +0100 |
| commit | 524db6068e40db9221fa1ef8214009c2f1ace3c8 (patch) | |
| tree | 845639b20a44976fc89bbd89899b4ba055c022ca | |
| parent | b6e5b4ee1ae8b2bac2cbf143b7bc7cd65afd08ab (diff) | |
| parent | 900f294011ea0eb06c48c28b4b4aea51e5cf32b7 (diff) | |
Merge branch 'master' into trainer_card
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | asm/macros/event.inc | 10 | ||||
| -rw-r--r-- | data/maps/PetalburgCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 302d10a72..52c8e35d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: apt: true install: - pushd $HOME - - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r49/devkitARM_r49-linux.tar.xz + - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r50/devkitARM_r50-linux.tar.xz - tar xJf devkitARM*.tar.xz - travis_retry git clone https://github.com/pret/agbcc.git - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR diff --git a/asm/macros/event.inc b/asm/macros/event.inc index ba851d70a..091c32a2a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1626,11 +1626,11 @@ .endm .macro switch var:req - copyvar 0x8000, \var + copyvar VAR_0x8000, \var .endm .macro case condition:req, dest:req - compare 0x8000, \condition + compare VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1650,13 +1650,13 @@ .endm .macro giveitem_std item:req, amount=1, function=0 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd \function .endm .macro givedecoration_std decoration:req - setorcopyvar 0x8000, \decoration + setorcopyvar VAR_0x8000, \decoration callstd STD_OBTAIN_DECORATION .endm diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 66dfab92a..915cdc93e 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 return PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar 0x8015, 269 + setorcopyvar VAR_0x8015, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 diff --git a/include/constants/vars.h b/include/constants/vars.h index 30df01f55..c055c5baf 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -297,5 +297,6 @@ #define VAR_MON_BOX_ID 0x8012 #define VAR_MON_BOX_POS 0x8013 #define VAR_0x8014 0x8014 +#define VAR_0x8015 0x8015 #endif // GUARD_CONSTANTS_VARS_H |