Merge branch 'master' into document-eventscripts

Makefile

@@ -121,7 +121,8 @@ else
 NODEP := 1
 endif
 
-C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
+C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
+C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
 C_ASM_SRCS += $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)
@@ -229,7 +230,7 @@ endif
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=
 else
-$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include -I tools/agbcc/include $(C_SUBDIR)/$*.c)
+$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include $(C_SUBDIR)/$*.c)
 endif
 
 ifeq ($(DINFO),1)
@@ -245,7 +246,7 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_asm_dep :=
 else
-$(C_BUILDDIR)/%.o: c_asm_dep = $(shell $(SCANINC) -I "" $(C_SUBDIR)/$*.s)
+$(C_BUILDDIR)/%.o: c_asm_dep = $(shell [[ -f $(C_SUBDIR)/$*.s ]] && $(SCANINC) -I "" $(C_SUBDIR)/$*.s)
 endif
 
 $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s $$(c_asm_dep)

asm/macros/event.inc

@@ -902,15 +902,15 @@
 	.4byte \text
 	.endm
 
-	@ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes.
+	@ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters
-	.macro givemon species:req, level:req, item:req, unknown1:req, unknown2:req, unknown3:req
+	.macro givemon species:req, level:req, item:req
 	.byte 0x79
 	.2byte \species
 	.byte \level
 	.2byte \item
-	.4byte \unknown1
+	.4byte 0x0
-	.4byte \unknown2
+	.4byte 0x0
-	.byte \unknown3
+	.byte 0
 	.endm
 
 	.macro giveegg species:req

berry_fix/payload/Makefile

@@ -156,7 +156,7 @@ $(OBJ_DIR)/sym_bss.ld: sym_bss.txt
 	$(RAMSCRGEN) .bss $< ENGLISH > $@
 
 $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
-	$(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms,../../tools/agbcc/lib > $@
+	$(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@
 
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@

build_tools.sh

@@ -1,12 +1,8 @@
 #!/bin/sh
-make -C tools/gbagfx CXX=${1:-g++}
+
-make -C tools/scaninc CXX=${1:-g++}
+echo "This script is deprecated. Next time, run \"make tools\" instead."
-make -C tools/preproc CXX=${1:-g++}
+for dname in tools/*; do
-make -C tools/bin2c CXX=${1:-g++}
+  if [ -f ${dname}/Makefile ]; then
-make -C tools/rsfont CXX=${1:-g++}
+    make -C ${dname} CXX=${1:-g++} --no-print-directory
-make -C tools/aif2pcm CXX=${1:-g++}
+  fi
-make -C tools/ramscrgen CXX=${1:-g++}
+done
-make -C tools/gbafix CXX=${1:-g++}
-make -C tools/mid2agb CXX=${1:-g++}
-make -C tools/mapjson CXX=${1:-g++}
-make -C tools/jsonproc CXX=${1:-g++}

charmap.txt

@@ -990,7 +990,16 @@ PH_NURSE_SOLO = 61 02
 
 A_BUTTON = F8 00
 B_BUTTON = F8 01
+L_BUTTON = F8 02
+R_BUTTON = F8 03
+START_BUTTON = F8 04
+SELECT_BUTTON = F8 05
+DPAD_UP = F8 06
+DPAD_DOWN = F8 07
+DPAD_LEFT = F8 08
+DPAD_RIGHT = F8 09
 DPAD_UPDOWN = F8 0A
+DPAD_LEFTRIGHT = F8 0B
 DPAD_NONE = F8 0C
 
 UP_ARROW_2 = F9 00

constants/berry_constants.inc

@@ -1,6 +0,0 @@
-	.set BERRY_FIRMNESS_UNKNOWN,    0
-	.set BERRY_FIRMNESS_VERY_SOFT,  1
-	.set BERRY_FIRMNESS_SOFT,       2
-	.set BERRY_FIRMNESS_HARD,       3
-	.set BERRY_FIRMNESS_VERY_HARD,  4
-	.set BERRY_FIRMNESS_SUPER_HARD, 5

constants/constants.inc

@@ -2,5 +2,4 @@
 	.include "constants/global.inc"
 	.include "constants/contest_constants.inc"
 	.include "constants/pokemon_data_constants.inc"
-	.include "constants/berry_constants.inc"
 	.include "constants/contest_move_effects.inc"

data/ereader_helpers.s

@@ -1,53 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_08625B6C:: @ 8625B6C
-@ apparently e-reader trainer data? idk
-	.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
-	.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
-	.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
-	.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
-	.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
-	.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-
-	.byte 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e
-	.byte 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
-	.byte 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01, 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00
-	.byte 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02
-	.byte 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16, 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
-	.byte 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00
-	.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00, 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00
-	.byte 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e
-	.byte 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18
-	.byte 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff, 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00, 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
-	.byte 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00
-	.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00
-	.byte 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0
-	.byte 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff

data/ereader_screen.s

@@ -1,7 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_0862609C:: @ 862609C
-	.incbin "data/unknown_jp_62609C.bin"

data/event_scripts.s

@@ -1,6 +1,7 @@
 #include "constants/global.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_setup.h"
+#include "constants/berry.h"
 #include "constants/contest.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
@@ -633,86 +634,86 @@ Std_MsgboxAutoclose:: @ 8271494
 	return
 
 EventScript_ResetAllBerries:: @ 827149D
-	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
+	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
+	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
+	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
+	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
+	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
+	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
+	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
+	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
+	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
+	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
+	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
+	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
+	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
+	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
+	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
+	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
+	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
+	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
+	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
+	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
+	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
+	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
+	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
+	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
+	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
+	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
+	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
+	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
+	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
+	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
+	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
+	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
+	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
+	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
+	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
+	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
+	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
+	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
+	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
+	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
+	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
+	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
+	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
+	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
+	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
+	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
+	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
+	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
+	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
+	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
+	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
+	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
+	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
+	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
+	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
+	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
+	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
+	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
+	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
+	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
+	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
+	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
@@ -3241,139 +3242,139 @@ gContestPaintingTough3::
 	.string "The mighty tough\n"
 	.string "hyper POKéMON {STR_VAR_1}$"
 
-gUnknown_0827ECBC:: @ 27ECBC
+gTrickHouse_Mechadoll_Oddish:: @ 27ECBC
 	.string "ODDISH$"
 
-gUnknown_0827ECC3:: @ 27ECC3
+gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3
 	.string "POOCHYENA$"
 
-gUnknown_0827ECCD:: @ 27ECCD
+gTrickHouse_Mechadoll_Taillow:: @ 27ECCD
 	.string "TAILLOW$"
 
-gUnknown_0827ECD5:: @ 27ECD5
+gTrickHouse_Mechadoll_Azurill:: @ 27ECD5
 	.string "AZURILL$"
 
-gUnknown_0827ECDD:: @ 27ECDD
+gTrickHouse_Mechadoll_Lotad:: @ 27ECDD
 	.string "LOTAD$"
 
-gUnknown_0827ECE3:: @ 27ECE3
+gTrickHouse_Mechadoll_Wingull:: @ 27ECE3
 	.string "WINGULL$"
 
-gUnknown_0827ECEB:: @ 27ECEB
+gTrickHouse_Mechadoll_Dustox:: @ 27ECEB
 	.string "DUSTOX$"
 
-gUnknown_0827ECF2:: @ 27ECF2
+gTrickHouse_Mechadoll_Zubat:: @ 27ECF2
 	.string "ZUBAT$"
 
-gUnknown_0827ECF8:: @ 27ECF8
+gTrickHouse_Mechadoll_Nincada:: @ 27ECF8
 	.string "NINCADA$"
 
-gUnknown_0827ED00:: @ 27ED00
+gTrickHouse_Mechadoll_Ralts:: @ 27ED00
 	.string "RALTS$"
 
-gUnknown_0827ED06:: @ 27ED06
+gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06
 	.string "ZIGZAGOON$"
 
-gUnknown_0827ED10:: @ 27ED10
+gTrickHouse_Mechadoll_Slakoth:: @ 27ED10
 	.string "SLAKOTH$"
 
-gUnknown_0827ED18:: @ 27ED18
+gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18
 	.string "POOCHYENA$"
 
-gUnknown_0827ED22:: @ 27ED22
+gTrickHouse_Mechadoll_Shroomish:: @ 27ED22
 	.string "SHROOMISH$"
 
-gUnknown_0827ED2C:: @ 27ED2C
+gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C
 	.string "ZIGZAGOON$"
 
-gUnknown_0827ED36:: @ 27ED36
+gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36
 	.string "POOCHYENA$"
 
-gUnknown_0827ED40:: @ 27ED40
+gTrickHouse_Mechadoll_Zubat2:: @ 27ED40
 	.string "ZUBAT$"
 
-gUnknown_0827ED46:: @ 27ED46
+gTrickHouse_Mechadoll_Carvanha:: @ 27ED46
 	.string "CARVANHA$"
 
-gUnknown_0827ED4F:: @ 27ED4F
+gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F
 	.string "BURN HEAL$"
 
-gUnknown_0827ED59:: @ 27ED59
+gTrickHouse_Mechadoll_HarborMail:: @ 27ED59
 	.string "HARBOR MAIL$"
 
-gUnknown_0827ED65:: @ 27ED65
+gTrickHouse_Mechadoll_SamePrice:: @ 27ED65
 	.string "Same price$"
 
-gUnknown_0827ED70:: @ 27ED70
+gTrickHouse_Mechadoll_60Yen:: @ 27ED70
 	.string "¥60$"
 
-gUnknown_0827ED74:: @ 27ED74
+gTrickHouse_Mechadoll_55Yen:: @ 27ED74
 	.string "¥55$"
 
-gUnknown_0827ED78:: @ 27ED78
+gTrickHouse_Mechadoll_Nothing:: @ 27ED78
 	.string "Nothing$"
 
-gUnknown_0827ED80:: @ 27ED80
+gTrickHouse_Mechadoll_CostMore:: @ 27ED80
 	.string "They will cost more.$"
 
-gUnknown_0827ED95:: @ 27ED95
+gTrickHouse_Mechadoll_CostLess:: @ 27ED95
 	.string "They will cost less.$"
 
-gUnknown_0827EDAA:: @ 27EDAA
+gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA
 	.string "Same price$"
 
-gUnknown_0827EDB5:: @ 27EDB5
+gTrickHouse_Mechadoll_Male:: @ 27EDB5
 	.string "Male$"
 
-gUnknown_0827EDBA:: @ 27EDBA
+gTrickHouse_Mechadoll_Female:: @ 27EDBA
 	.string "Female$"
 
-gUnknown_0827EDC1:: @ 27EDC1
+gTrickHouse_Mechadoll_Neither:: @ 27EDC1
 	.string "Neither$"
 
-gUnknown_0827EDC9:: @ 27EDC9
+gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9
 	.string "Elderly men$"
 
-gUnknown_0827EDD5:: @ 27EDD5
+gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5
 	.string "Elderly ladies$"
 
-gUnknown_0827EDE4:: @ 27EDE4
+gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4
 	.string "Same number$"
 
-gUnknown_0827EDF0:: @ 27EDF0
+gTrickHouse_Mechadoll_None:: @ 27EDF0
 	.string "None$"
 
-gUnknown_0827EDF5:: @ 27EDF5
+gTrickHouse_Mechadoll_One:: @ 27EDF5
 	.string "1$"
 
-gUnknown_0827EDF7:: @ 27EDF7
+gTrickHouse_Mechadoll_Two:: @ 27EDF7
 	.string "2$"
 
-gUnknown_0827EDF9:: @ 27EDF9
+gTrickHouse_Mechadoll_Two2:: @ 27EDF9
 	.string "2$"
 
-gUnknown_0827EDFB:: @ 27EDFB
+gTrickHouse_Mechadoll_Three:: @ 27EDFB
 	.string "3$"
 
-gUnknown_0827EDFD:: @ 27EDFD
+gTrickHouse_Mechadoll_Four:: @ 27EDFD
 	.string "4$"
 
-gUnknown_0827EDFF:: @ 27EDFF
+gTrickHouse_Mechadoll_Six:: @ 27EDFF
 	.string "6$"
 
-gUnknown_0827EE01:: @ 27EE01
+gTrickHouse_Mechadoll_Seven:: @ 27EE01
 	.string "7$"
 
-gUnknown_0827EE03:: @ 27EE03
+gTrickHouse_Mechadoll_Eight:: @ 27EE03
 	.string "8$"
 
-gUnknown_0827EE05:: @ 27EE05
+gTrickHouse_Mechadoll_Six2:: @ 27EE05
 	.string "6$"
 
-gUnknown_0827EE07:: @ 27EE07
+gTrickHouse_Mechadoll_Seven2:: @ 27EE07
 	.string "7$"
 
-gUnknown_0827EE09:: @ 27EE09
+gTrickHouse_Mechadoll_Eight2:: @ 27EE09
 	.string "8$"
 
 	.include "data/scripts/tv.inc"
@@ -4338,17 +4339,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
 	goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
 	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	end
 

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
 
 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -880,71 +880,71 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
-	turnvobject 0, 4
+	turnvobject 0, DIR_EAST
-	turnvobject 2, 4
+	turnvobject 2, DIR_EAST
-	turnvobject 4, 4
+	turnvobject 4, DIR_EAST
-	turnvobject 6, 4
+	turnvobject 6, DIR_EAST
-	turnvobject 8, 4
+	turnvobject 8, DIR_EAST
-	turnvobject 10, 3
+	turnvobject 10, DIR_WEST
-	turnvobject 12, 3
+	turnvobject 12, DIR_WEST
-	turnvobject 14, 3
+	turnvobject 14, DIR_WEST
-	turnvobject 16, 3
+	turnvobject 16, DIR_WEST
-	turnvobject 18, 3
+	turnvobject 18, DIR_WEST
-	turnvobject 20, 4
+	turnvobject 20, DIR_EAST
-	turnvobject 22, 4
+	turnvobject 22, DIR_EAST
-	turnvobject 24, 4
+	turnvobject 24, DIR_EAST
-	turnvobject 26, 4
+	turnvobject 26, DIR_EAST
-	turnvobject 28, 4
+	turnvobject 28, DIR_EAST
-	turnvobject 30, 4
+	turnvobject 30, DIR_EAST
 	delay 20
-	turnvobject 0, 1
+	turnvobject 0, DIR_SOUTH
-	turnvobject 2, 1
+	turnvobject 2, DIR_SOUTH
-	turnvobject 4, 1
+	turnvobject 4, DIR_SOUTH
-	turnvobject 6, 1
+	turnvobject 6, DIR_SOUTH
-	turnvobject 8, 1
+	turnvobject 8, DIR_SOUTH
-	turnvobject 10, 1
+	turnvobject 10, DIR_SOUTH
-	turnvobject 12, 1
+	turnvobject 12, DIR_SOUTH
-	turnvobject 14, 1
+	turnvobject 14, DIR_SOUTH
-	turnvobject 16, 1
+	turnvobject 16, DIR_SOUTH
-	turnvobject 18, 1
+	turnvobject 18, DIR_SOUTH
-	turnvobject 20, 1
+	turnvobject 20, DIR_SOUTH
-	turnvobject 22, 1
+	turnvobject 22, DIR_SOUTH
-	turnvobject 24, 1
+	turnvobject 24, DIR_SOUTH
-	turnvobject 26, 1
+	turnvobject 26, DIR_SOUTH
-	turnvobject 28, 1
+	turnvobject 28, DIR_SOUTH
-	turnvobject 30, 1
+	turnvobject 30, DIR_SOUTH
 	delay 20
-	turnvobject 1, 4
+	turnvobject 1, DIR_EAST
-	turnvobject 3, 4
+	turnvobject 3, DIR_EAST
-	turnvobject 5, 4
+	turnvobject 5, DIR_EAST
-	turnvobject 7, 4
+	turnvobject 7, DIR_EAST
-	turnvobject 9, 4
+	turnvobject 9, DIR_EAST
-	turnvobject 11, 3
+	turnvobject 11, DIR_WEST
-	turnvobject 13, 3
+	turnvobject 13, DIR_WEST
-	turnvobject 15, 3
+	turnvobject 15, DIR_WEST
-	turnvobject 17, 3
+	turnvobject 17, DIR_WEST
-	turnvobject 19, 3
+	turnvobject 19, DIR_WEST
-	turnvobject 21, 4
+	turnvobject 21, DIR_EAST
-	turnvobject 23, 4
+	turnvobject 23, DIR_EAST
-	turnvobject 25, 4
+	turnvobject 25, DIR_EAST
-	turnvobject 27, 3
+	turnvobject 27, DIR_WEST
-	turnvobject 31, 3
+	turnvobject 31, DIR_WEST
 	delay 20
-	turnvobject 1, 1
+	turnvobject 1, DIR_SOUTH
-	turnvobject 3, 1
+	turnvobject 3, DIR_SOUTH
-	turnvobject 5, 1
+	turnvobject 5, DIR_SOUTH
-	turnvobject 7, 1
+	turnvobject 7, DIR_SOUTH
-	turnvobject 9, 1
+	turnvobject 9, DIR_SOUTH
-	turnvobject 11, 1
+	turnvobject 11, DIR_SOUTH
-	turnvobject 13, 1
+	turnvobject 13, DIR_SOUTH
-	turnvobject 15, 1
+	turnvobject 15, DIR_SOUTH
-	turnvobject 17, 1
+	turnvobject 17, DIR_SOUTH
-	turnvobject 19, 1
+	turnvobject 19, DIR_SOUTH
-	turnvobject 21, 1
+	turnvobject 21, DIR_SOUTH
-	turnvobject 23, 1
+	turnvobject 23, DIR_SOUTH
-	turnvobject 25, 1
+	turnvobject 25, DIR_SOUTH
-	turnvobject 27, 1
+	turnvobject 27, DIR_SOUTH
-	turnvobject 31, 1
+	turnvobject 31, DIR_SOUTH
 	delay 20
 	return
 

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
 
 BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
 
 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -12,10 +12,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
 	compare VAR_0x8006, 1
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
 	setobjectxy 1, 8, 7
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
 
 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
 
 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707

data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc

@@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
 
 BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2

data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc

@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
 	setvar VAR_TEMP_4, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891

data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc

@@ -110,7 +110,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 16
-	setvar VAR_0x8009, 75
+	setvar VAR_0x8009, DECOR_KISS_POSTER
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -119,7 +119,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, 103
+	setvar VAR_0x8009, DECOR_KISS_CUSHION
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -128,7 +128,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, 87
+	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -137,7 +137,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 79
+	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -146,7 +146,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 84
+	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -155,7 +155,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 85
+	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -164,7 +164,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 86
+	setvar VAR_0x8009, DECOR_DITTO_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -173,7 +173,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 80
+	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -182,7 +182,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 81
+	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -191,7 +191,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
 	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, 82
+	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -224,7 +224,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, 113
+	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -233,7 +233,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, 111
+	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -242,7 +242,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 114
+	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -251,7 +251,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 115
+	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -260,7 +260,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
 	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, 116
+	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -294,7 +294,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 64
+	setvar VAR_0x8009, ITEM_PROTEIN
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -303,7 +303,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 67
+	setvar VAR_0x8009, ITEM_CALCIUM
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -312,7 +312,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 65
+	setvar VAR_0x8009, ITEM_IRON
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -321,7 +321,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 70
+	setvar VAR_0x8009, ITEM_ZINC
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -330,7 +330,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 66
+	setvar VAR_0x8009, ITEM_CARBOS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -339,7 +339,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
 	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 63
+	setvar VAR_0x8009, ITEM_HP_UP
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -376,7 +376,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 200
+	setvar VAR_0x8009, ITEM_LEFTOVERS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -385,7 +385,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 180
+	setvar VAR_0x8009, ITEM_WHITE_HERB
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -394,7 +394,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 183
+	setvar VAR_0x8009, ITEM_QUICK_CLAW
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -403,7 +403,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, 185
+	setvar VAR_0x8009, ITEM_MENTAL_HERB
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -412,7 +412,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 179
+	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -421,7 +421,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 186
+	setvar VAR_0x8009, ITEM_CHOICE_BAND
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -430,7 +430,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 187
+	setvar VAR_0x8009, ITEM_KINGS_ROCK
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -439,7 +439,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 196
+	setvar VAR_0x8009, ITEM_FOCUS_BAND
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 
@@ -448,7 +448,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
 	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 198
+	setvar VAR_0x8009, ITEM_SCOPE_LENS
 	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
 	end
 

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
 
 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
 
 BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	compare VAR_TEMP_C, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
 	setobjectxyperm 2, 0, 0

data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
 	setvar VAR_0x8004, 14
 	special sub_8161F74
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
 	return

data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
 	setvar VAR_0x8004, 14
 	special sub_8161F74
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
 	return

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
 
 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
 
 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
 	.2byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23

data/maps/BattleFrontier_Lounge1/scripts.inc

@@ -29,7 +29,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
 
 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, 412
+	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
 	special sub_8139D98
 	compare VAR_0x8005, 90

data/maps/BattleFrontier_Lounge5/scripts.inc

@@ -14,7 +14,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6
 	compare VAR_0x8004, 255
 	goto_if_eq BattleFrontier_Lounge5_EventScript_26460D
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, 412
+	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq BattleFrontier_Lounge5_EventScript_264603
 	special sub_813A7B8
 	waitmessage

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -112,7 +112,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
 
 BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
 	msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
-	givedecoration_std 42
+	givedecoration_std DECOR_SILVER_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_RECEIVED_SILVER_SHIELD
@@ -155,7 +155,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
 
 BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
 	msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
-	givedecoration_std 43
+	givedecoration_std DECOR_GOLD_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
 	setflag FLAG_RECEIVED_GOLD_SHIELD

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
 	.2byte 0
 
 EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
 	.2byte 0
 
 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
 	.2byte 0
 
 EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431

data/maps/EverGrandeCity_Hall1/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
 	.2byte 0
 
 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall2/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
 	.2byte 0
 
 EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall3/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
 	.2byte 0
 
 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall4/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
 	.2byte 0
 
 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_Hall5/scripts.inc

@@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
 	.2byte 0
 
 EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 

data/maps/EverGrandeCity_HallOfFame/scripts.inc

@@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
 	.2byte 0
 
 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
 	.2byte 0
 
 EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -30,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
 	.2byte 0
 
 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
 
 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85

data/maps/LilycoveCity/scripts.inc

@@ -37,7 +37,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
 	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
 	random 10
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc

@@ -87,42 +87,42 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4
-	setvar VAR_TEMP_0, 26
+	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF
-	setvar VAR_TEMP_0, 27
+	setvar VAR_TEMP_0, ITEM_SODA_POP
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA
-	setvar VAR_TEMP_0, 28
+	setvar VAR_TEMP_0, ITEM_LEMONADE
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305
-	checkmoney 0xc8, 0
+	checkmoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313
-	checkmoney 0x15e, 0
+	checkmoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A
-	takemoney 0xc8, 0
+	takemoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321
-	takemoney 0x12c, 0
+	takemoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328
-	takemoney 0x15e, 0
+	takemoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -10,7 +10,7 @@ LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
 
 LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
 	setobjectxy 7, 16, 2
-	turnobject 7, 2
+	turnobject 7, DIR_NORTH
 	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
 	applymovement 1, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
-	givedecoration_std 44
+	givedecoration_std DECOR_GLASS_ORNAMENT
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT

data/maps/LittlerootTown/scripts.inc

@@ -208,7 +208,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
 	addobject 8
 	addobject 7
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_EventScript_1E8004
 	goto LittlerootTown_EventScript_1E8013
 	end

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A
 	return
 

data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc

@@ -22,7 +22,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
@@ -35,7 +35,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
 	return
 
@@ -49,7 +49,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA
 	return
 

data/maps/LittlerootTown_MaysHouse_2F/scripts.inc

@@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
 
 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
@@ -36,7 +36,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
 
 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
 	checkplayergender
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
 	return
 
@@ -50,7 +50,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
 
 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
 	checkplayergender
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FEMALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -48,18 +48,18 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
 	.2byte 0
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	addobject 2
 	addobject 3
-	turnobject 3, 2
+	turnobject 3, DIR_NORTH
 	setobjectxy 3, 5, 5
-	turnobject 2, 1
+	turnobject 2, DIR_SOUTH
 	setobjectxy 2, 6, 4
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	setobjectxy 1, 10, 10
 	end
 
@@ -72,15 +72,15 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
 	addobject 5
 	addobject 6
 	addobject 3
-	turnobject 4, 1
+	turnobject 4, DIR_SOUTH
 	setobjectxy 4, 8, 4
-	turnobject 5, 1
+	turnobject 5, DIR_SOUTH
 	setobjectxy 5, 9, 4
-	turnobject 6, 1
+	turnobject 6, DIR_SOUTH
 	setobjectxy 6, 10, 4
-	turnobject 2, 1
+	turnobject 2, DIR_SOUTH
 	setobjectxy 2, 6, 4
-	turnobject 3, 4
+	turnobject 3, DIR_EAST
 	setobjectxy 3, 5, 5
 	end
 
@@ -335,7 +335,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
 	bufferspeciesname 0, SPECIES_CYNDAQUIL
 	setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
-	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
 	compare VAR_RESULT, 1
@@ -380,7 +380,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
 	bufferspeciesname 0, SPECIES_TOTODILE
 	setvar VAR_TEMP_1, SPECIES_TOTODILE
-	givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_TOTODILE, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
 	compare VAR_RESULT, 1
@@ -425,7 +425,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
 	bufferspeciesname 0, SPECIES_CHIKORITA
 	setvar VAR_TEMP_1, SPECIES_CHIKORITA
-	givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_CHIKORITA, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
 	compare VAR_RESULT, 1

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -34,11 +34,11 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9950
 	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 0x3e8, 0
+	checkmoney 1000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
 	givecoins 50
-	takemoney 0x3e8, 0
+	takemoney 1000, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -54,11 +54,11 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9500
 	goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1
-	checkmoney 0x2710, 0
+	checkmoney 10000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
 	givecoins 500
-	takemoney 0x2710, 0
+	takemoney 10000, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -136,17 +136,17 @@ MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B
 
 MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67
 	setvar VAR_TEMP_1, 1
-	bufferdecorationname 0, 88
+	bufferdecorationname 0, DECOR_TREECKO_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75
 	setvar VAR_TEMP_1, 2
-	bufferdecorationname 0, 89
+	bufferdecorationname 0, DECOR_TORCHIC_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83
 	setvar VAR_TEMP_1, 3
-	bufferdecorationname 0, 90
+	bufferdecorationname 0, DECOR_MUDKIP_DOLL
 	goto MauvilleCity_GameCorner_EventScript_20FD91
 
 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91
@@ -163,12 +163,12 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 88
+	bufferdecorationname 1, DECOR_TREECKO_DOLL
-	checkdecorspace 88
+	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 88
+	givedecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -179,12 +179,12 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 89
+	bufferdecorationname 1, DECOR_TORCHIC_DOLL
-	checkdecorspace 89
+	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 89
+	givedecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -195,12 +195,12 @@ MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79
-	bufferdecorationname 1, 90
+	bufferdecorationname 1, DECOR_MUDKIP_DOLL
-	checkdecorspace 90
+	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87
 	takecoins 1000
-	givedecoration 90
+	givedecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT
@@ -413,34 +413,34 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
 	end
 
 MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C
-	bufferdecorationname 1, 88
+	bufferdecorationname 1, DECOR_TREECKO_DOLL
-	checkdecorspace 88
+	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 88
+	givedecoration_std DECOR_TREECKO_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
 MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6
-	bufferdecorationname 1, 89
+	bufferdecorationname 1, DECOR_TORCHIC_DOLL
-	checkdecorspace 89
+	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 89
+	givedecoration_std DECOR_TORCHIC_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end
 
 MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
-	bufferdecorationname 1, 90
+	bufferdecorationname 1, DECOR_MUDKIP_DOLL
-	checkdecorspace 90
+	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA
 	msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT
-	givedecoration_std 90
+	givedecoration_std DECOR_MUDKIP_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_210213
 	end

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -300,11 +300,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	removeobject 8
 	removeobject 9
 	setobjectxy 3, 5, 6
-	turnobject 3, 1
+	turnobject 3, DIR_SOUTH
 	setobjectxy 2, 11, 8
-	turnobject 2, 2
+	turnobject 2, DIR_NORTH
 	setobjectxy 1, 6, 2
-	turnobject 1, 2
+	turnobject 1, DIR_NORTH
 	call MossdeepCity_SpaceCenter_2F_EventScript_224131
 	fadescreen 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT
@@ -331,11 +331,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
-	turnobject 4, 2
+	turnobject 4, DIR_NORTH
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
-	turnobject 4, 4
+	turnobject 4, DIR_EAST
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -85,7 +85,7 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
 
 MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
 	setvar VAR_TEMP_1, SPECIES_BELDUM
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_222895
 	compare VAR_RESULT, 1

data/maps/MtChimney/scripts.inc

@@ -104,7 +104,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
 	msgbox MtChimney_Text_22FE04, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_22EF69
-	checkmoney 0xc8, 0
+	checkmoney 200, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_22EF76
 	msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT
@@ -129,7 +129,7 @@ MtChimney_EventScript_22EF51:: @ 822EF51
 	end
 
 MtChimney_EventScript_22EF5E:: @ 822EF5E
-	takemoney 0xc8, 0
+	takemoney 200, 0
 	updatemoneybox 0, 0
 	return
 

data/maps/PetalburgCity_Gym/scripts.inc

@@ -78,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B
 	.2byte 0
 
 PetalburgCity_Gym_EventScript_204995:: @ 8204995
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 PetalburgCity_Gym_MapScript2_20499A: @ 820499A

data/maps/PetalburgCity_WallysHouse/scripts.inc

@@ -8,8 +8,8 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
 	.2byte 0
 
 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
-	turnobject EVENT_OBJ_ID_PLAYER, 4
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST
-	turnobject 1, 3
+	turnobject 1, DIR_WEST
 	end
 
 PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247

data/maps/Route109_SeashoreHouse/scripts.inc

@@ -49,14 +49,14 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460
 	end
 
 Route109_SeashoreHouse_EventScript_269484:: @ 8269484
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_2694C8
 	checkitemspace ITEM_SODA_POP, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_2694D5
 	msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
-	takemoney 0x12c, 0
+	takemoney 300, 0
 	updatemoneybox 0, 0
 	giveitem_std ITEM_SODA_POP
 	hidemoneybox

data/maps/Route110_TrickHouseEnd/scripts.inc

@@ -23,7 +23,7 @@ Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
 Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	end
 
 Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
@@ -182,11 +182,11 @@ Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
 	goto Route110_TrickHouseEnd_EventScript_26AFC7
 
 Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
-	givedecoration_std 31
+	givedecoration_std DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
-	givedecoration_std 32
+	givedecoration_std DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
@@ -233,7 +233,7 @@ Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
 
 Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	lockall
-	turnobject 1, 3
+	turnobject 1, DIR_WEST
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -248,7 +248,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089
 	waitmovement 0
 	delay 4
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
 	releaseall
 	end
 

data/maps/Route110_TrickHouseEntrance/scripts.inc

@@ -132,8 +132,8 @@ Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	turnobject 1, 4
+	turnobject 1, DIR_EAST
-	turnobject EVENT_OBJ_ID_PLAYER, 3
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST
 	end
 
 Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
@@ -189,13 +189,13 @@ Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
 Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
 	addobject 1
 	setobjectxy 1, 5, 2
-	turnobject 1, 2
+	turnobject 1, DIR_NORTH
 	end
 
 Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
 	addobject 1
 	setobjectxy 1, 5, 2
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
@@ -457,11 +457,11 @@ Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
 	goto Route110_TrickHouseEntrance_EventScript_26A092
 
 Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
-	givedecoration_std 31
+	givedecoration_std DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
-	givedecoration_std 32
+	givedecoration_std DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A

data/maps/Route111/scripts.inc

@@ -128,7 +128,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	removeobject 45
 	delay 16
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	delay 16
 	special StartMirageTowerDisintegration
 	waitstate

data/maps/Route113_GlassWorkshop/scripts.inc

@@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7
 	end
 
 Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
-	setvar VAR_0x8008, 39
+	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 250
 	compare VAR_ASH_GATHER_COUNT, 250
@@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
 	end
 
 Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
-	setvar VAR_0x8008, 40
+	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
@@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
 	end
 
 Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
-	setvar VAR_0x8008, 41
+	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 500
 	compare VAR_ASH_GATHER_COUNT, 500
@@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
 	end
 
 Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
-	setvar VAR_0x8008, 43
+	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
@@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
 	end
 
 Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
-	setvar VAR_0x8008, 42
+	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, 1000
 	compare VAR_ASH_GATHER_COUNT, 1000
@@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
 
 Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 13
+	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, VAR_0x8008
 	setvar VAR_0x800A, 6000
 	compare VAR_ASH_GATHER_COUNT, 6000
@@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 
 Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 6
+	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, VAR_0x8008
 	setvar VAR_0x800A, 8000
 	compare VAR_ASH_GATHER_COUNT, 8000
@@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC
 
 Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6
 	setvar VAR_0x800A, 250
-	subvar VAR_0x800A, 16456
+	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 0, VAR_0x800A
 	msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE
-	subvar VAR_0x800A, 16456
+	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 1, VAR_0x800A
 	message Route113_GlassWorkshop_Text_26F543
 	waitmessage
@@ -247,50 +247,50 @@ Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
 
 Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 39
+	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 40
+	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 41
+	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 43
+	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F133:: @ 826F133
 	setvar VAR_0x8009, 0
-	setvar VAR_0x8008, 42
+	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F147:: @ 826F147
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 13
+	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
-	bufferdecorationname 0, 13
+	bufferdecorationname 0, DECOR_PRETTY_CHAIR
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 
 Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B
 	setvar VAR_0x8009, 1
-	setvar VAR_0x8008, 6
+	setvar VAR_0x8008, DECOR_PRETTY_DESK
-	bufferdecorationname 0, 6
+	bufferdecorationname 0, DECOR_PRETTY_DESK
 	goto Route113_GlassWorkshop_EventScript_26F16F
 	end
 

data/maps/Route114/scripts.inc

@@ -32,7 +32,7 @@ Route114_EventScript_1F2582:: @ 81F2582
 	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
 	random 5
 	addvar VAR_RESULT, 15
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/Route114_LanettesHouse/scripts.inc

@@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2
 	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF
 	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT
-	givedecoration_std 99
+	givedecoration_std DECOR_LOTAD_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq Route114_LanettesHouse_EventScript_272067
 	setflag FLAG_RECEIVED_DOLL_LANETTE

data/maps/Route119_WeatherInstitute_2F/scripts.inc

@@ -84,7 +84,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
 	msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, SPECIES_CASTFORM
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
 	compare VAR_RESULT, 0
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085
 	compare VAR_RESULT, 1

data/maps/Route120/scripts.inc

@@ -120,27 +120,27 @@ Route120_EventScript_1F5527:: @ 81F5527
 	end
 
 Route120_EventScript_1F55CA:: @ 81F55CA
-	setvar VAR_0x8004, 143
+	setvar VAR_0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55D5:: @ 81F55D5
-	setvar VAR_0x8004, 144
+	setvar VAR_0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55E0:: @ 81F55E0
-	setvar VAR_0x8004, 145
+	setvar VAR_0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55EB:: @ 81F55EB
-	setvar VAR_0x8004, 146
+	setvar VAR_0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_1F5601
 	end
 
 Route120_EventScript_1F55F6:: @ 81F55F6
-	setvar VAR_0x8004, 147
+	setvar VAR_0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_1F5601
 	end
 

data/maps/Route121_SafariZoneEntrance/scripts.inc

@@ -61,12 +61,12 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA
 	call Route121_SafariZoneEntrance_EventScript_22BCBF
-	checkmoney 0x1f4, 0
+	checkmoney 500, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8
 	playse SE_REGI
 	msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
-	takemoney 0x1f4, 0
+	takemoney 500, 0
 	updatemoneybox 0, 0
 	msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4

data/maps/Route123_BerryMastersHouse/scripts.inc

@@ -14,7 +14,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -22,7 +22,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
 	msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
 Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
 	msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT
 	random 10
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc

@@ -223,23 +223,23 @@ Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84
-	setvar VAR_0x8008, 48
+	setvar VAR_0x8008, ITEM_RED_SHARD
-	setvar VAR_0x8009, 95
+	setvar VAR_0x8009, ITEM_FIRE_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93
-	setvar VAR_0x8008, 50
+	setvar VAR_0x8008, ITEM_YELLOW_SHARD
-	setvar VAR_0x8009, 96
+	setvar VAR_0x8009, ITEM_THUNDER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2
-	setvar VAR_0x8008, 49
+	setvar VAR_0x8008, ITEM_BLUE_SHARD
-	setvar VAR_0x8009, 97
+	setvar VAR_0x8009, ITEM_WATER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1
-	setvar VAR_0x8008, 51
+	setvar VAR_0x8008, ITEM_GREEN_SHARD
-	setvar VAR_0x8009, 98
+	setvar VAR_0x8009, ITEM_LEAF_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
 
 Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0

data/maps/RustboroCity_DevonCorp_2F/scripts.inc

@@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C
 
 RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
 	setvar VAR_TEMP_1, SPECIES_LILEEP
-	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E
 	compare VAR_RESULT, 1
@@ -206,7 +206,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
 
 RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
 	setvar VAR_TEMP_1, SPECIES_ANORITH
-	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11
 	compare VAR_RESULT, 1

data/maps/RustboroCity_DevonCorp_3F/scripts.inc

@@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
-	turnobject EVENT_OBJ_ID_PLAYER, 4
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST
 	end
 
 RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464

data/maps/RustboroCity_Flat1_2F/scripts.inc

@@ -73,7 +73,7 @@ RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221
 	end
 
 RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238
-	turnobject 6, 4
+	turnobject 6, DIR_EAST
 	return
 
 RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D

data/maps/SkyPillar_Top/scripts.inc

@@ -40,7 +40,7 @@ SkyPillar_Top_MapScript2_239713: @ 8239713
 	.2byte 0
 
 SkyPillar_Top_EventScript_23971D:: @ 823971D
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 	end
 
 SkyPillar_Top_EventScript_239722:: @ 8239722
@@ -71,7 +71,7 @@ SkyPillar_Top_EventScript_239768:: @ 8239768
 	end
 
 SkyPillar_Top_EventScript_239771:: @ 8239771
-	setvar VAR_0x8004, 406
+	setvar VAR_0x8004, SPECIES_RAYQUAZA
 	goto SkyPillar_Top_EventScript_239785
 	end
 

data/maps/SlateportCity/scripts.inc

@@ -769,77 +769,77 @@ SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
 
 SlateportCity_EventScript_1DD46E:: @ 81DD46E
 	bufferitemname 0, ITEM_ENERGY_POWDER
-	setvar VAR_0x8008, 30
+	setvar VAR_0x8008, ITEM_ENERGY_POWDER
 	setvar VAR_0x8009, 50
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD482:: @ 81DD482
 	bufferitemname 0, ITEM_ENERGY_ROOT
-	setvar VAR_0x8008, 31
+	setvar VAR_0x8008, ITEM_ENERGY_ROOT
 	setvar VAR_0x8009, 80
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD496:: @ 81DD496
 	bufferitemname 0, ITEM_HEAL_POWDER
-	setvar VAR_0x8008, 32
+	setvar VAR_0x8008, ITEM_HEAL_POWDER
 	setvar VAR_0x8009, 50
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD4AA:: @ 81DD4AA
 	bufferitemname 0, ITEM_REVIVAL_HERB
-	setvar VAR_0x8008, 33
+	setvar VAR_0x8008, ITEM_REVIVAL_HERB
 	setvar VAR_0x8009, 300
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD4BE:: @ 81DD4BE
 	bufferitemname 0, ITEM_PROTEIN
-	setvar VAR_0x8008, 64
+	setvar VAR_0x8008, ITEM_PROTEIN
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD4D2:: @ 81DD4D2
 	bufferitemname 0, ITEM_IRON
-	setvar VAR_0x8008, 65
+	setvar VAR_0x8008, ITEM_IRON
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD4E6:: @ 81DD4E6
 	bufferitemname 0, ITEM_CARBOS
-	setvar VAR_0x8008, 66
+	setvar VAR_0x8008, ITEM_CARBOS
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD4FA:: @ 81DD4FA
 	bufferitemname 0, ITEM_CALCIUM
-	setvar VAR_0x8008, 67
+	setvar VAR_0x8008, ITEM_CALCIUM
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD50E:: @ 81DD50E
 	bufferitemname 0, ITEM_ZINC
-	setvar VAR_0x8008, 70
+	setvar VAR_0x8008, ITEM_ZINC
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD522:: @ 81DD522
 	bufferitemname 0, ITEM_HP_UP
-	setvar VAR_0x8008, 63
+	setvar VAR_0x8008, ITEM_HP_UP
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_1DD557
 	end
 
 SlateportCity_EventScript_1DD536:: @ 81DD536
 	bufferitemname 0, ITEM_PP_UP
-	setvar VAR_0x8008, 69
+	setvar VAR_0x8008, ITEM_PP_UP
 	setvar VAR_0x8009, 3000
 	goto SlateportCity_EventScript_1DD557
 	end

data/maps/SlateportCity_BattleTentCorridor/scripts.inc

@@ -12,10 +12,10 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
 	compare VAR_0x8006, 1
 	goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56
 	setobjectxy 1, 2, 2
-	turnobject 1, 1
+	turnobject 1, DIR_SOUTH
 
 SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B

data/maps/SlateportCity_BattleTentLobby/scripts.inc

@@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
 
 SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F

data/maps/SlateportCity_House1/scripts.inc

@@ -28,7 +28,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9
 
 SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, 412
+	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq SlateportCity_House1_EventScript_209B46
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	special TV_CheckMonOTIDEqualsPlayerID

data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc

@@ -34,11 +34,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
-	checkmoney 0x32, 0
+	checkmoney 50, 0
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18
 	playse SE_REGI
-	takemoney 0x32, 0
+	takemoney 50, 0
 	updatemoneybox 0, 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1

data/maps/SootopolisCity/scripts.inc

@@ -179,11 +179,11 @@ SootopolisCity_EventScript_1E58E5:: @ 81E58E5
 	end
 
 SootopolisCity_EventScript_1E58FC:: @ 81E58FC
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	return
 
 SootopolisCity_EventScript_1E5901:: @ 81E5901
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	setvar VAR_SKY_PILLAR_STATE, 3
 	return
 
@@ -748,7 +748,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
 	msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
+	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull

data/maps/SootopolisCity_House6/scripts.inc

@@ -9,7 +9,7 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C
 	compare VAR_RESULT, 0
 	call_if_eq SootopolisCity_House6_EventScript_226F99
 	msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT
-	givedecoration_std 117
+	givedecoration_std DECOR_WAILMER_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_House6_EventScript_226FAD
 	setflag FLAG_RECEIVED_WAILMER_DOLL
@@ -27,7 +27,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3
 	end
 
 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD
-	bufferdecorationname 1, 117
+	bufferdecorationname 1, DECOR_WAILMER_DOLL
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT
 	release

data/maps/VerdanturfTown_BattleTentLobby/scripts.inc

@@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
 
 VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
 	setvar VAR_TEMP_1, 1
-	turnobject EVENT_OBJ_ID_PLAYER, 2
+	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
 VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF

data/mystery_event_msg.s

@@ -2,6 +2,7 @@
 #include "constants/items.h"
 #include "constants/map_scripts.h"
 #include "constants/moves.h"
+#include "constants/region_map_sections.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/vars.h"
@@ -19,7 +20,7 @@ MysteryEventScript_StampCard:: @ 8674CB0
 	specialvar VAR_0x8008, sub_813986C
 	setorcopyvar VAR_RESULT, 0
 	specialvar VAR_0x8009, sub_813986C
-	subvar VAR_0x8008, 32777
+	subvar VAR_0x8008, VAR_0x8009
 	buffernumberstring 0, VAR_0x8008
 	lock
 	faceplayer
@@ -66,7 +67,7 @@ SurfPichu_FullParty: @ 8674D73
 SurfPichu_GiveEgg: @ 8674D7E
 	giveegg SPECIES_PICHU
 	setmonobedient VAR_EVENT_PICHU_SLOT
-	setmonmetlocation VAR_EVENT_PICHU_SLOT, 255
+	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
 	vgoto_if 1, SurfPichu_Slot1
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2

data/scripts/cable_club.inc

@@ -99,7 +99,7 @@ MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
 OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD
-	turnobject VAR_0x8007, 3
+	turnobject VAR_0x8007, DIR_WEST
 
 OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD
 	end

data/scripts/contest_hall.inc

@@ -261,7 +261,7 @@ LinkContestRoom1_EventScript_27A091:: @ 827A091
 	return
 
 LinkContestRoom1_EventScript_27A097:: @ 827A097
-	buffercontesttypestring 1, 32776
+	buffercontesttypestring 1, VAR_0x8008
 	bufferstdstring 2, VAR_0x8009
 	call LinkContestRoom1_EventScript_27A0B1
 	lockall
@@ -1012,71 +1012,71 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
 	return
 
 LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
-	turnvobject 0, 1
+	turnvobject 0, DIR_SOUTH
-	turnvobject 2, 1
+	turnvobject 2, DIR_SOUTH
-	turnvobject 4, 4
+	turnvobject 4, DIR_EAST
-	turnvobject 6, 1
+	turnvobject 6, DIR_SOUTH
-	turnvobject 8, 1
+	turnvobject 8, DIR_SOUTH
-	turnvobject 10, 1
+	turnvobject 10, DIR_SOUTH
-	turnvobject 12, 1
+	turnvobject 12, DIR_SOUTH
-	turnvobject 14, 1
+	turnvobject 14, DIR_SOUTH
-	turnvobject 16, 1
+	turnvobject 16, DIR_SOUTH
-	turnvobject 18, 1
+	turnvobject 18, DIR_SOUTH
-	turnvobject 20, 4
+	turnvobject 20, DIR_EAST
-	turnvobject 22, 4
+	turnvobject 22, DIR_EAST
-	turnvobject 25, 4
+	turnvobject 25, DIR_EAST
-	turnvobject 27, 3
+	turnvobject 27, DIR_WEST
-	turnvobject 28, 4
+	turnvobject 28, DIR_EAST
 	delay 10
-	turnvobject 0, 4
+	turnvobject 0, DIR_EAST
-	turnvobject 2, 4
+	turnvobject 2, DIR_EAST
-	turnvobject 4, 4
+	turnvobject 4, DIR_EAST
-	turnvobject 6, 4
+	turnvobject 6, DIR_EAST
-	turnvobject 8, 4
+	turnvobject 8, DIR_EAST
-	turnvobject 10, 3
+	turnvobject 10, DIR_WEST
-	turnvobject 12, 3
+	turnvobject 12, DIR_WEST
-	turnvobject 14, 3
+	turnvobject 14, DIR_WEST
-	turnvobject 16, 3
+	turnvobject 16, DIR_WEST
-	turnvobject 18, 3
+	turnvobject 18, DIR_WEST
-	turnvobject 20, 1
+	turnvobject 20, DIR_SOUTH
-	turnvobject 22, 1
+	turnvobject 22, DIR_SOUTH
-	turnvobject 25, 2
+	turnvobject 25, DIR_NORTH
-	turnvobject 27, 2
+	turnvobject 27, DIR_NORTH
-	turnvobject 28, 2
+	turnvobject 28, DIR_NORTH
 	delay 10
-	turnvobject 1, 2
+	turnvobject 1, DIR_NORTH
-	turnvobject 3, 2
+	turnvobject 3, DIR_NORTH
-	turnvobject 5, 2
+	turnvobject 5, DIR_NORTH
-	turnvobject 7, 2
+	turnvobject 7, DIR_NORTH
-	turnvobject 9, 4
+	turnvobject 9, DIR_EAST
-	turnvobject 11, 2
+	turnvobject 11, DIR_NORTH
-	turnvobject 15, 2
+	turnvobject 15, DIR_NORTH
-	turnvobject 13, 2
+	turnvobject 13, DIR_NORTH
-	turnvobject 17, 2
+	turnvobject 17, DIR_NORTH
-	turnvobject 19, 2
+	turnvobject 19, DIR_NORTH
-	turnvobject 21, 3
+	turnvobject 21, DIR_WEST
-	turnvobject 23, 3
+	turnvobject 23, DIR_WEST
-	turnvobject 24, 3
+	turnvobject 24, DIR_WEST
-	turnvobject 26, 4
+	turnvobject 26, DIR_EAST
-	turnvobject 29, 3
+	turnvobject 29, DIR_WEST
-	turnvobject 30, 3
+	turnvobject 30, DIR_WEST
 	delay 10
-	turnvobject 1, 4
+	turnvobject 1, DIR_EAST
-	turnvobject 3, 4
+	turnvobject 3, DIR_EAST
-	turnvobject 5, 4
+	turnvobject 5, DIR_EAST
-	turnvobject 7, 4
+	turnvobject 7, DIR_EAST
-	turnvobject 9, 4
+	turnvobject 9, DIR_EAST
-	turnvobject 11, 3
+	turnvobject 11, DIR_WEST
-	turnvobject 15, 3
+	turnvobject 15, DIR_WEST
-	turnvobject 13, 3
+	turnvobject 13, DIR_WEST
-	turnvobject 17, 3
+	turnvobject 17, DIR_WEST
-	turnvobject 19, 3
+	turnvobject 19, DIR_WEST
-	turnvobject 21, 1
+	turnvobject 21, DIR_SOUTH
-	turnvobject 23, 1
+	turnvobject 23, DIR_SOUTH
-	turnvobject 24, 1
+	turnvobject 24, DIR_SOUTH
-	turnvobject 26, 2
+	turnvobject 26, DIR_NORTH
-	turnvobject 29, 2
+	turnvobject 29, DIR_NORTH
-	turnvobject 30, 2
+	turnvobject 30, DIR_NORTH
 	delay 10
 	return
 

include/battle.h

@@ -37,7 +37,6 @@
 #define B_ACTION_NONE                   0xFF
 
 #define MAX_TRAINER_ITEMS 4
-#define MAX_MON_MOVES 4
 
 // array entries for battle communication
 #define MULTIUSE_STATE          0x0
@@ -180,19 +179,19 @@ struct AI_ThinkingStruct
     u8 aiState;
     u8 movesetIndex;
     u16 moveConsidered;
-    s8 score[4];
+    s8 score[MAX_MON_MOVES];
     u32 funcResult;
     u32 aiFlags;
     u8 aiAction;
     u8 aiLogicId;
     u8 filler12[6];
-    u8 simulatedRNG[4];
+    u8 simulatedRNG[MAX_MON_MOVES];
 };
 
 struct UsedMoves
 {
-    u16 moves[MAX_BATTLERS_COUNT];
+    u16 moves[MAX_MON_MOVES];
-    u16 unknown[MAX_BATTLERS_COUNT];
+    u16 unknown[MAX_MON_MOVES];
 };
 
 struct BattleHistory

include/battle_controllers.h

@@ -97,16 +97,16 @@ struct HpAndStatus
 
 struct MovePpInfo
 {
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
-    u8 pp[4];
+    u8 pp[MAX_MON_MOVES];
     u8 ppBonuses;
 };
 
 struct ChooseMoveStruct
 {
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
-    u8 currentPp[4];
+    u8 currentPp[MAX_MON_MOVES];
-    u8 maxPp[4];
+    u8 maxPp[MAX_MON_MOVES];
     u16 species;
     u8 monType1;
     u8 monType2;

include/battle_tower.h

@@ -7,7 +7,7 @@ struct RSBattleTowerRecord
     /*0x01*/ u8 facilityClass;
     /*0x02*/ u16 winStreak;
     /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
-    /*0x0C*/ u8 trainerId[4];
+    /*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
     /*0x10*/ u16 greeting[6];
     /*0x1C*/ struct BattleTowerPokemon party[3];
     /*0xA0*/ u32 checksum;
@@ -27,7 +27,7 @@ struct BattleFrontierTrainer
 struct FacilityMon
 {
     u16 species;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 itemTableId;
     u8 evSpread;
     u8 nature;

include/berry.h

@@ -1,39 +1,6 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-#define BERRY_NONE 0
-
-enum
-{
-    BERRY_FIRMNESS_UNKNOWN,
-    BERRY_FIRMNESS_VERY_SOFT,
-    BERRY_FIRMNESS_SOFT,
-    BERRY_FIRMNESS_HARD,
-    BERRY_FIRMNESS_VERY_HARD,
-    BERRY_FIRMNESS_SUPER_HARD,
-};
-
-enum
-{
-    FLAVOR_SPICY,
-    FLAVOR_DRY,
-    FLAVOR_SWEET,
-    FLAVOR_BITTER,
-    FLAVOR_SOUR,
-    FLAVOR_COUNT
-};
-
-enum
-{
-    BERRY_STAGE_NO_BERRY, // there is no tree planted and the soil is completely flat.
-    BERRY_STAGE_PLANTED,
-    BERRY_STAGE_SPROUTED,
-    BERRY_STAGE_TALLER,
-    BERRY_STAGE_FLOWERING,
-    BERRY_STAGE_BERRIES,
-    BERRY_STAGE_SPARKLING = 0xFF,
-};
-
 void ClearEnigmaBerries(void);
 void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);

include/constants/berry.h

@@ -0,0 +1,28 @@
+#ifndef GUARD_CONSTANTS_BERRY_H
+#define GUARD_CONSTANTS_BERRY_H
+
+#define BERRY_NONE 0
+
+#define BERRY_FIRMNESS_UNKNOWN     0
+#define BERRY_FIRMNESS_VERY_SOFT   1
+#define BERRY_FIRMNESS_SOFT        2
+#define BERRY_FIRMNESS_HARD        3
+#define BERRY_FIRMNESS_VERY_HARD   4
+#define BERRY_FIRMNESS_SUPER_HARD  5
+
+#define FLAVOR_SPICY   0
+#define FLAVOR_DRY     1
+#define FLAVOR_SWEET   2
+#define FLAVOR_BITTER  3
+#define FLAVOR_SOUR    4
+#define FLAVOR_COUNT   5
+
+#define BERRY_STAGE_NO_BERRY    0  // there is no tree planted and the soil is completely flat.
+#define BERRY_STAGE_PLANTED     1
+#define BERRY_STAGE_SPROUTED    2
+#define BERRY_STAGE_TALLER      3
+#define BERRY_STAGE_FLOWERING   4
+#define BERRY_STAGE_BERRIES     5
+#define BERRY_STAGE_SPARKLING   255
+
+#endif // GUARD_CONSTANTS_BERRY_H

include/constants/global.h

@@ -54,6 +54,7 @@
 
 #define TRAINER_ID_LENGTH 4
 #define PARTY_SIZE 6
+#define MAX_MON_MOVES 4
 
 // string lengths
 #define ITEM_NAME_LENGTH 14

include/contest.h

@@ -227,7 +227,7 @@ struct ContestPokemon
     u8 aiPool_Cute:1; // 0x10
     u8 aiPool_Smart:1; // 0x20
     u8 aiPool_Tough:1; // 0x40
-    /*0x1E*/ u16 moves[4]; // moves
+    /*0x1E*/ u16 moves[MAX_MON_MOVES]; // moves
     /*0x26*/ u8 cool; // cool
     /*0x27*/ u8 beauty; // beauty
     /*0x28*/ u8 cute; // cute

include/data.h

@@ -34,7 +34,7 @@ struct TrainerMonNoItemCustomMoves
     u16 iv;
     u8 lvl;
     u16 species;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
 };
 
 struct TrainerMonItemCustomMoves
@@ -43,7 +43,7 @@ struct TrainerMonItemCustomMoves
     u8 lvl;
     u16 species;
     u16 heldItem;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
 };
 
 union TrainerMonPtr

include/ereader_helpers.h

@@ -1,51 +1,34 @@
 #ifndef GUARD_EREADER_HELPERS_H
 #define GUARD_EREADER_HELPERS_H
 
-struct Unk81D38FC
+#include "trainer_hill.h"
+
+struct EReaderTrainerHillTrainer
 {
     u8 unk0;
-    u8 filler_1[3];
+    struct TrainerHillTrainer unk4;
-    u8 unk4[0x148];
+    struct TrHillDisplay unk14C;
-    u8 unk14C[0x124];
+    u32 checksum;
-    int checksum;
+}; // size=0x274
-};
 
 struct EReaderTrainerHillSet
 {
-    u8 unk_0;
+    u8 count;
-    u8 unk_1;
+    u8 id;
-    u8 unk_2;
+    u16 dummy;
-    u8 unk_3;
+    u32 checksum;
-    int checksum;
+    struct EReaderTrainerHillTrainer unk_8[6];
-    struct Unk81D38FC unk_8[6];
     u8 unk_ec0[40];
-};
+}; // size = 0xf00
-
-struct Unk81D3998Sub
-{
-    u8 unk_000[4];
-    u8 unk_004[0x148];
-    u8 unk_14C[0x148];
-    u8 unk_294[0x124];
-};
-
-struct Unk81D3998
-{
-    u8 unk_000;
-    u8 unk_001;
-    u8 unk_002;
-    int checksum;
-    struct Unk81D3998Sub unk_008[4];
-};
 
 bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
 bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
 bool32 ReadTrainerHillAndValidate(void);
-int sub_81D3D70(u8, u32, u32*, u32*);
+int EReaderHandleTransfer(u8, u32, u32*, u32*);
 void sub_81D3F9C(void);
 void sub_81D3FAC(void);
-void sub_81D41A0(void);
+void EReaderHelper_SaveRegsState(void);
-void sub_81D41F4(void);
+void EReaderHelper_RestoreRegsState(void);
 void sub_81D4238(void);
 
 #endif // GUARD_EREADER_HELPERS_H

include/global.h

@@ -210,7 +210,7 @@ struct BerryCrush
 struct ApprenticeMon
 {
     u16 species;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u16 item;
 };
 
@@ -232,7 +232,7 @@ struct BattleTowerPokemon
 {
     u16 species;
     u16 heldItem;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 level;
     u8 ppBonuses;
     u8 hpEV;
@@ -255,6 +255,8 @@ struct BattleTowerPokemon
     u8 friendship;
 };
 
+#define NULL_BATTLE_TOWER_POKEMON { .nickname = __("$$$$$$$$$$$") }
+
 struct EmeraldBattleTowerRecord
 {
     /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100
@@ -286,7 +288,7 @@ struct BattleTowerEReaderTrainer
 
 struct FrontierMonData
 {
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 evs[6];
     u8 nature;
 };
@@ -942,7 +944,7 @@ struct SaveBlock1
     /*0x2B94*/ u8 outbreakPokemonLevel;
     /*0x2B95*/ u8 outbreakUnk1;
     /*0x2B96*/ u16 outbreakUnk2;
-    /*0x2B98*/ u16 outbreakPokemonMoves[4];
+    /*0x2B98*/ u16 outbreakPokemonMoves[MAX_MON_MOVES];
     /*0x2BA0*/ u8 outbreakUnk4;
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;

include/global.tv.h

@@ -482,7 +482,7 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u8 var02;
         /*0x03*/ u8 var03;
-        /*0x04*/ u16 moves[4];
+        /*0x04*/ u16 moves[MAX_MON_MOVES];
         /*0x0C*/ u16 species;
         /*0x0E*/ u16 var0E;
         /*0x10*/ u8 locationMapNum;