Merge branch 'master' into trainer_card

.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

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
 

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

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