Merge branch 'master' of https://github.com/pret/pokefirered into sync-rfu2

.gitignore

@@ -47,6 +47,9 @@ sound/**/*.bin
 sound/songs/midi/*.s
 src/data/items.h
 src/data/wild_encounters.h
+src/data/region_map/region_map_entries.h
+src/data/region_map/region_map_entry_strings.h
+src/data/region_map/porymap_config.json
 tags
 tools/agbcc
 tools/binutils
@@ -54,7 +57,8 @@ types_*.taghl
 !.github/calcrom/calcrom.pl
 !sound/programmable_wave_samples/*.pcm
 _Deparsed_XSubs.pm
-porymap.project.cfg
+porymap.*.cfg
+prefabs.json
 .vscode/*.*
 *.js
 *.sym

Makefile

@@ -81,6 +81,8 @@ ASM_SUBDIR = asm
 DATA_ASM_SUBDIR = data
 SONG_SUBDIR = sound/songs
 MID_SUBDIR = sound/songs/midi
+SAMPLE_SUBDIR = sound/direct_sound_samples
+CRY_SUBDIR = sound/direct_sound_samples/cries
 
 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
 ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
@@ -193,7 +195,8 @@ compare:
 	@$(MAKE) COMPARE=1
 
 mostlyclean: tidy
-	$(RM) sound/direct_sound_samples/*.bin
+	rm -f $(SAMPLE_SUBDIR)/*.bin
+	rm -f $(CRY_SUBDIR)/*.bin
 	$(RM) $(SONG_OBJS) $(MID_SUBDIR)/*.s
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 	$(RM) $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
@@ -229,7 +232,7 @@ include songs.mk
 %.gbapal: %.png ; $(GFX) $< $@
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
-sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
+$(CRY_SUBDIR)/%.bin: $(CRY_SUBDIR)/%.aif ; $(AIF) $< $@ --compress
 sound/%.bin: sound/%.aif ; $(AIF) $< $@
 sound/songs/%.s: sound/songs/%.mid
 	$(MID) $< $@
@@ -245,7 +248,7 @@ $(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
 $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
 
 $(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
-$(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
+$(C_BUILDDIR)/battle_anim_flying.o: CFLAGS += -ffreestanding
 
 $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet

asm/macros/battle_anim_script.inc

@@ -14,7 +14,7 @@
 	.byte 0x02
 	.4byte \template
 	.if \anim_battler == ANIM_TARGET
-	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
 	.else
 	.byte (\subpriority_offset & 0x7F)
 	.endif
@@ -34,20 +34,20 @@
 .Lcreatetask_\@_2:
 	.endm
 
-	.macro delay param0:req
+	.macro delay frames:req
 	.byte 0x4
-	.byte \param0
+	.byte \frames
 	.endm
 
 	.macro waitforvisualfinish
 	.byte 0x5
 	.endm
 
-	.macro hang1
+	.macro nop
 	.byte 0x6
 	.endm
 
-	.macro hang2
+	.macro nop2
 	.byte 0x7
 	.endm
 
@@ -79,30 +79,30 @@
 	.byte 0xd
 	.endm
 
-	.macro call param0:req
+	.macro call ptr:req
 	.byte 0xe
-	.4byte \param0
+	.4byte \ptr
 	.endm
 
 	.macro return
 	.byte 0xf
 	.endm
 
-	.macro setarg param0:req, param1:req
+	.macro setarg argId:req, value:req
 	.byte 0x10
-	.byte \param0
+	.byte \argId
-	.2byte \param1
+	.2byte \value
 	.endm
 
-	.macro choosetwoturnanim param0:req, param1:req
+	.macro choosetwoturnanim ptr1:req, ptr2:req
 	.byte 0x11
-	.4byte \param0
+	.4byte \ptr1
-	.4byte \param1
+	.4byte \ptr2
 	.endm
 
-	.macro jumpifmoveturn param0:req, ptr:req
+	.macro jumpifmoveturn value:req, ptr:req
 	.byte 0x12
-	.byte \param0
+	.byte \value
 	.4byte \ptr
 	.endm
 
@@ -144,13 +144,13 @@
 	.byte \pan
 	.endm
 
-	.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req
+	.macro panse se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
 	.byte 0x1b
 	.2byte \se
-	.byte \param1
+	.byte \currentPan
-	.byte \param2
+	.byte \targetPan
-	.byte \param3
+	.byte \incrementPan
-	.byte \param4
+	.byte \delay
 	.endm
 
 	.macro loopsewithpan se:req, pan:req, wait:req, times:req
@@ -168,9 +168,9 @@
 	.byte \wait
 	.endm
 
-	.macro setbldcnt param0:req
+	.macro setbldcnt bldcnt:req
 	.byte 0x1e
-	.2byte \param0
+	.2byte \bldcnt
 	.endm
 
 	.macro createsoundtask addr:req, argv:vararg
@@ -186,19 +186,19 @@
 	.byte 0x20
 	.endm
 
-	.macro jumpargeq param0:req, param1:req, ptr:req
+	.macro jumpargeq argId:req, value:req, ptr:req
 	.byte 0x21
-	.byte \param0
+	.byte \argId
-	.2byte \param1
+	.2byte \value
 	.4byte \ptr
 	.endm
 
-	.macro monbg_22 battler:req
+	.macro monbg_static battler:req
 	.byte 0x22
 	.byte \battler
 	.endm
 
-	.macro clearmonbg_23 battler:req
+	.macro clearmonbg_static battler:req
 	.byte 0x23
 	.byte \battler
 	.endm
@@ -208,41 +208,41 @@
 	.4byte \ptr
 	.endm
 
-	.macro fadetobgfromset param0:req, param1:req, param2:req
+	.macro fadetobgfromset bgOpponent:req, bgPlayer:req, bgContest:req
 	.byte 0x25
-	.byte \param0
+	.byte \bgOpponent
-	.byte \param1
+	.byte \bgPlayer
-	.byte \param2
+	.byte \bgContest
 	.endm
 
-	.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req
+	.macro panse_adjustnone se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
 	.byte 0x26
 	.2byte \se
-	.byte \param1
+	.byte \currentPan
-	.byte \param2
+	.byte \targetPan
-	.byte \param3
+	.byte \incrementPan
-	.byte \param4
+	.byte \delay
 	.endm
 
-	.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req
+	.macro panse_adjustall se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
 	.byte 0x27
 	.2byte \se
-	.byte \param1
+	.byte \currentPan
-	.byte \param2
+	.byte \targetPan
-	.byte \param3
+	.byte \incrementPan
-	.byte \param4
+	.byte \delay
 	.endm
 
-	.macro monbgprio_28 battler:req
+	.macro splitbgprio battler:req
 	.byte 0x28
 	.byte \battler
 	.endm
 
-	.macro monbgprio_29
+	.macro splitbgprio_all
 	.byte 0x29
 	.endm
 
-	.macro monbgprio_2A battler:req
+	.macro splitbgprio_foes battler:req
 	.byte 0x2a
 	.byte \battler
 	.endm
@@ -257,12 +257,12 @@
 	.byte \battler
 	.endm
 
-	.macro doublebattle_2D battler:req
+	.macro teamattack_moveback battler:req
 	.byte 0x2d
 	.byte \battler
 	.endm
 
-	.macro doublebattle_2E battler:req
+	.macro teamattack_movefwd battler:req
 	.byte 0x2e
 	.byte \battler
 	.endm

asm/macros/battle_script.inc

@@ -1282,16 +1282,16 @@
 	various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
 	.endm
 
-	.macro various8 battler:req
+	.macro getbattlersforrecall
-	various \battler, 8
+	various BS_ATTACKER, VARIOUS_GET_BATTLERS_FOR_RECALL
 	.endm
 
-	.macro returnopponentmon1toball battler:req
+	.macro returnopponentmon1toball
-	various \battler, VARIOUS_RETURN_OPPONENT_MON1
+	various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON1
 	.endm
 
-	.macro returnopponentmon2toball battler:req
+	.macro returnopponentmon2toball
-	various \battler, VARIOUS_RETURN_OPPONENT_MON2
+	various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON2
 	.endm
 
 	.macro checkpokeflute battler:req

asm/macros/event.inc

@@ -285,7 +285,7 @@
 	.endm
 
 	@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific 
-	@ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue.
+	@ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
 	.macro waitstate
 	.byte 0x27
 	.endm
@@ -476,7 +476,7 @@
 	formatwarp \map, \a, \b, \c
 	.endm
 
-	@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination.
+	@ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination.
 	@ Warp commands can be given either the id of which warp location to go to on the destination map
 	@ or a pair of x/y coordinates to go to directly on the destination map.
 	.macro setdynamicwarp map:req, a, b, c

asm/macros/map.inc

@@ -1,71 +1,123 @@
-	.macro map map_id
+@ Most of the macros in this file are for arranging map event data, and are output by mapjson using data from each map's JSON file.
+
+	@ Takes a MAP constant and outputs the map group and map number as separate bytes
+	.macro map map_id:req
 	.byte \map_id >> 8    @ map group
 	.byte \map_id & 0xFF  @ map num
 	.endm
 
-	.macro map_script type, address
+	@ Defines a map script. 'type' is any MAP_SCRIPT_* constant (see include/constants/map_scripts.h)
+	.macro map_script type:req, script:req
 	.byte \type
-	.4byte \address
+	.4byte \script
 	.endm
 
-	.macro map_script_2 word1, word2, address
+	@ Defines an entry in a map script table (for either ON_WARP_INTO_MAP_TABLE or ON_FRAME_TABLE)
-	.2byte \word1
+	.macro map_script_2 var:req, compare:req, script:req
-	.2byte \word2
+	.2byte \var
-	.4byte \address
+	.2byte \compare
+	.4byte \script
 	.endm
 
-	.macro object_event index:req, gfx:req, in_connection:req x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
+	@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
+	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
 	.byte \index
 	.byte \gfx
-	.byte \in_connection
+	.byte OBJ_KIND_NORMAL
-	.byte 0
+	.space 1  @ Padding
 	.2byte \x, \y
-	.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0
+	.byte \elevation
-	.2byte \trainer_type, \sight_radius_tree_etc
+	.byte \movement_type
+	.byte ((\y_radius << 4) | \x_radius)
+	.space 1  @ Padding
+	.2byte \trainer_type
+	.2byte \sight_radius_tree_etc
 	.4byte \script
-	.2byte \event_flag, 0
+	.2byte \event_flag
+	.space 2  @ Padding
 	inc _num_npcs
 	.endm
 
-	.macro warp_def x, y, byte, warp, map_id
+	@ Defines an object event template for map data, to be used by a clone object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
+	.macro clone_event index:req, gfx:req, x:req, y:req, target_local_id:req, target_map_id:req
+	.byte \index
+	.byte \gfx
+	.byte OBJ_KIND_CLONE
+	.space 1  @ Padding
 	.2byte \x, \y
-	.byte \byte, \warp
+	.byte \target_local_id
+	.space 3  @ Padding
+	.2byte \target_map_id & 0xFF  @ map num
+	.2byte \target_map_id >> 8    @ map group
+	.space 8  @ Padding
+	inc _num_npcs
+	.endm
+
+	@ Defines a warp event for map data. Mirrors the struct layout of WarpEvent in include/global.fieldmap.h
+	.macro warp_def x:req, y:req, elevation:req, warpId:req, map_id:req
+	.2byte \x, \y
+	.byte \elevation
+	.byte \warpId
 	.byte \map_id & 0xFF  @ map num
 	.byte \map_id >> 8    @ map group
 	inc _num_warps
 	.endm
 
-	.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
+	@ Defines a coord event for map data. Mirrors the struct layout of CoordEvent in include/global.fieldmap.h
+	.macro coord_event x:req, y:req, elevation:req, var:req, varValue:req, script:req
 	.2byte \x, \y
-	.byte \byte1, \byte2
+	.byte \elevation
-	.2byte \word1, \word2, \word3
+	.space 1  @ Padding
+	.2byte \var
+	.2byte \varValue
+	.space 2  @ Padding
 	.4byte \script
 	inc _num_traps
 	.endm
 
-	.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
+	@ Defines a generic background event for map data. Mirrors the struct layout of BgEvent in include/global.fieldmap.h
+	@ 'kind' is any BG_EVENT_* constant (see include/constants/event_bg.h).
+	@ 'arg6' is used differently depending on the bg event type. 'arg7' and 'arg8' are only used by bg_hidden_item_event.
+	@ See macros below.
+	.macro bg_event x:req, y, elevation:req, kind:req, arg6:req, arg7, arg8
 	.2byte \x, \y
-	.byte \byte, \kind
+	.byte \elevation
-	.2byte \word
+	.byte \kind
-	.if \kind < 5
+	.space 2  @ Padding
-	.4byte \arg6
+	.if \kind != BG_EVENT_HIDDEN_ITEM
+		.4byte \arg6
 	.else
-	.2byte \arg6
+		.2byte \arg6
-	.byte \arg7, \arg8
+		.byte \arg7
+		.byte \arg8
 	.endif
 	inc _num_signs
 	.endm
 
-	.macro bg_hidden_item_event x, y, height, item, flag, quantity, underfoot
+	@ Defines a background sign event for map data. 'facing_dir' is any of the BG_EVENT_PLAYER_FACING_* constants (see include/constants/event_bg.h)
-	bg_event \x, \y, \height, 7, 0, \item, \flag, \quantity | (\underfoot << 7)
+	.macro bg_sign_event x:req, y:req, elevation:req, facing_dir:req, script:req
+	bg_event \x, \y, \elevation, \facing_dir, \script
 	.endm
 
-	.macro map_events npcs, warps, traps, signs
+	@ Defines a background hidden item event for map data
+	.macro bg_hidden_item_event x:req, y:req, elevation:req, item:req, flag:req, quantity:req, underfoot:req
+	bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), \quantity | (\underfoot << 7)
+	.endm
+
+	@ Defines a background secret base event for map data.
+	@ Unused by FRLG
+	.macro bg_secret_base_event x:req, y:req, elevation:req, secret_base_id:req
+	bg_event \x, \y, \elevation, BG_EVENT_SECRET_BASE, \secret_base_id
+	.endm
+
+	@ Defines the table of event data for a map. Mirrors the struct layout of MapEvents in include/global.fieldmap.h
+	.macro map_events npcs:req, warps:req, traps:req, signs:req
 	.byte _num_npcs, _num_warps, _num_traps, _num_signs
 	.4byte \npcs, \warps, \traps, \signs
 	reset_map_events
 	.endm
 
+	@ Resets the event counters used to track how many events a map has. Run when the events table is created by map_events
 	.macro reset_map_events
 	.set _num_npcs, 0
 	.set _num_warps, 0
@@ -73,23 +125,28 @@
 	.set _num_signs, 0
 	.endm
 
+	@ Initialize the event counters for the first map
 	reset_map_events
 
+	@ Directions for connecting maps
+	@ The map.json files will only have e.g. "down" as direction data, and this will be appended to "connection_" by the connection macro
+	.equiv connection_down, CONNECTION_SOUTH
+	.equiv connection_up, CONNECTION_NORTH
+	.equiv connection_left, CONNECTION_WEST
+	.equiv connection_right, CONNECTION_EAST
+	.equiv connection_dive, CONNECTION_DIVE
+	.equiv connection_emerge, CONNECTION_EMERGE
 
-	.equiv connection_down, 1
+	@ Defines a map connection. Mirrors the struct layout of MapConnection in include/global.fieldmap.h
-	.equiv connection_up, 2
+	.macro connection direction:req, offset:req, map:req
-	.equiv connection_left, 3
+	.byte connection_\direction
-	.equiv connection_right, 4
+	.space 3  @ Padding
-	.equiv connection_dive, 5
-	.equiv connection_emerge, 6
-
-	.macro connection direction, offset, map, filler
-	.4byte connection_\direction
 	.4byte \offset
 	map \map
-	.space 2
+	.space 2  @ Padding
 	.endm
 
+	@ Defines the flags for a map header. Mirrors the layout of the bitfield in struct MapHeader in include/global.fieldmap.h
 	.macro map_header_flags allow_cycling:req, allow_escaping:req, allow_running:req, show_map_name:req
 	.byte \allow_cycling
 	.byte ((\show_map_name & 1) << 2) | ((\allow_running & 1) << 1) | ((\allow_escaping & 1) << 0)

charmap.txt

@@ -406,13 +406,9 @@ B_ATK_PREFIX2 = FD 2A
 B_DEF_PREFIX2 = FD 2B
 B_ATK_PREFIX3 = FD 2C
 B_DEF_PREFIX3 = FD 2D
-B_TRAINER2_CLASS = FD 2E
+B_TRAINER2_LOSE_TEXT = FD 2E
-B_TRAINER2_NAME = FD 2F
+B_TRAINER2_WIN_TEXT = FD 2F
-B_TRAINER2_LOSE_TEXT = FD 30
+B_BUFF3 = FD 30
-B_TRAINER2_WIN_TEXT = FD 31
-B_PARTNER_CLASS = FD 32
-B_PARTNER_NAME = FD 33
-B_BUFF3 = FD 34
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00

common_syms/berry_fix_program.txt

@@ -1,4 +1,4 @@
-gUnknown_3005EF0
+gMultibootStart
-gUnknown_3005EF4
+gMultibootStatus
-gUnknown_3005EF8
+gMultibootSize
-gUnknown_3005F00
+gMultibootParam

constants/gba_constants.inc

@@ -488,3 +488,26 @@
 	.set OAM_SIZE_8x32,          OAM_SIZE_1 | OAM_V_RECTANGLE
 	.set OAM_SIZE_16x32,         OAM_SIZE_2 | OAM_V_RECTANGLE
 	.set OAM_SIZE_32x64,         OAM_SIZE_3 | OAM_V_RECTANGLE
+
+@ BLDCNT
+
+	.set BLDCNT_TGT1_BG0,       1 << 0
+	.set BLDCNT_TGT1_BG1,       1 << 1
+	.set BLDCNT_TGT1_BG2,       1 << 2
+	.set BLDCNT_TGT1_BG3,       1 << 3
+	.set BLDCNT_TGT1_OBJ,       1 << 4
+	.set BLDCNT_TGT1_BD,        1 << 5
+	.set BLDCNT_TGT1_ALL,       BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD
+
+	.set BLDCNT_EFFECT_NONE,    0 << 6
+	.set BLDCNT_EFFECT_BLEND,   1 << 6
+	.set BLDCNT_EFFECT_LIGHTEN, 2 << 6
+	.set BLDCNT_EFFECT_DARKEN,  3 << 6
+
+	.set BLDCNT_TGT2_BG0,       1 << 8
+	.set BLDCNT_TGT2_BG1,       1 << 9
+	.set BLDCNT_TGT2_BG2,       1 << 10
+	.set BLDCNT_TGT2_BG3,       1 << 11
+	.set BLDCNT_TGT2_OBJ,       1 << 12
+	.set BLDCNT_TGT2_BD,        1 << 13
+	.set BLDCNT_TGT2_ALL,       BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD

data/battle_scripts_1.s

@@ -11,7 +11,7 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 #include "constants/game_stat.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 	.include "asm/macros/battle_script.inc"
 @ Define these here since misc_constants.inc conflicts with the C headers
 	.set NULL, 0
@@ -2964,20 +2964,20 @@ BattleScript_RivalBattleLostSkipMonRecall::
 	end2
 
 BattleScript_BattleTowerLost::
-	various8 BS_ATTACKER
+	getbattlersforrecall
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_BattleTowerLostLostSkipMonRecall
 	printfromtable gDoubleBattleRecallStrings
 	waitmessage B_WAIT_TIME_LONG
-	returnopponentmon1toball BS_ATTACKER
+	returnopponentmon1toball
 	waitstate
-	returnopponentmon2toball BS_ATTACKER
+	returnopponentmon2toball
 	waitstate
 BattleScript_BattleTowerLostLostSkipMonRecall::
 	trainerslidein BS_ATTACKER
 	waitstate
 	printstring STRINGID_TRAINER1WINTEXT
 	jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble
-	printstring STRINGID_TRAINER2NAME
+	printstring STRINGID_TRAINER2WINTEXT
 BattleScript_BattleTowerLostLostSkipDouble::
 	end2
 
@@ -2995,7 +2995,7 @@ BattleScript_BattleTowerTrainerBattleWon::
 	jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
 	printstring STRINGID_TRAINER1LOSETEXT
 	jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
-	printstring STRINGID_TRAINER2CLASS
+	printstring STRINGID_TRAINER2LOSETEXT
 BattleScript_BattleTowerEtcTrainerBattleWonSkipText::
 	pickup
 	end2

data/battle_scripts_2.s

@@ -9,7 +9,7 @@
 #include "constants/pokemon.h"
 #include "constants/songs.h"
 #include "constants/game_stat.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 	.include "asm/macros/battle_script.inc"
 @ Define these here since misc_constants.inc conflicts with the C headers
 	.set NULL, 0
@@ -209,7 +209,7 @@ BattleScript_PokeFluteEnd::
 	finishaction
 
 BattleScript_WatchesCarefully::
-	printfromtable gSafariPokeblockResultStringIds
+	printfromtable gSafariReactionStringIds
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION
 	end2

data/event_scripts.s

@@ -1175,16 +1175,16 @@ EventScript_ReleaseEnd::
 @ Unused
 EventScript_DelayedLookAround::
 	lockall
-	applymovement VAR_0x8004, Movement_WalkInPlaceFasterLeft
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8004, Movement_WalkInPlaceFasterUp
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8004, Movement_WalkInPlaceFasterRight
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8004, Movement_WalkInPlaceFasterDown
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 20
 	releaseall

data/field_effect_scripts.s

@@ -48,7 +48,7 @@ gFieldEffectScriptPointers::
 	.4byte gFldEffScript_UseWaterfall            @ FLDEFF_USE_WATERFALL
 	.4byte gFldEffScript_UseDive                 @ FLDEFF_USE_DIVE
 	.4byte gFldEffScript_Pokeball                @ FLDEFF_POKEBALL
-	.4byte gFldEffScript_HeartIcon               @ FLDEFF_X_ICON
+	.4byte gFldEffScript_XIcon                   @ FLDEFF_X_ICON
 	.4byte gFldEffScript_Nop47                   @ FLDEFF_NOP_47
 	.4byte gFldEffScript_Nop48                   @ FLDEFF_NOP_48
 	.4byte gFldEffScript_PopOutOfAsh             @ FLDEFF_POP_OUT_OF_ASH
@@ -256,7 +256,7 @@ gFldEffScript_Pokeball::
 	callnative FldEff_Pokeball
 	end 
 
-gFldEffScript_HeartIcon::
+gFldEffScript_XIcon::
 	callnative FldEff_XIcon
 	end 
 

data/maps.s

@@ -1,3 +1,4 @@
+#include "constants/global.h"
 #include "constants/layouts.h"
 #include "constants/maps.h"
 #include "constants/region_map_sections.h"

data/maps/BattleColosseum_2P/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 9,
       "y": 3,
@@ -34,15 +35,15 @@
       "x": 6,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     },
     {
       "x": 7,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     }
   ],
   "coord_events": [

data/maps/BattleColosseum_4P/map.json

@@ -20,29 +20,29 @@
       "x": 5,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     },
     {
       "x": 6,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     },
     {
       "x": 7,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     },
     {
       "x": 8,
       "y": 8,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     }
   ],
   "coord_events": [

data/maps/BirthIsland_Exterior/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_METEORITE",
       "x": 15,
       "y": 12,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 15,
       "y": 3,
@@ -48,7 +50,7 @@
       "y": 24,
       "elevation": 3,
       "dest_map": "MAP_BIRTH_ISLAND_HARBOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/BirthIsland_Harbor/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
@@ -48,7 +50,7 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 48,
       "y": 15,
@@ -40,6 +41,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 38,
       "y": 14,
@@ -53,6 +55,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
       "x": 36,
       "y": 14,
@@ -66,6 +69,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 11,
       "y": 18,
@@ -79,6 +83,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 18,
       "y": 22,
@@ -92,6 +97,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 30,
       "y": 24,
@@ -105,6 +111,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 26,
       "y": 19,
@@ -118,6 +125,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 38,
       "y": 31,
@@ -131,6 +139,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 9,
       "y": 30,
@@ -144,6 +153,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 52,
       "y": 22,
@@ -157,6 +167,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 40,
       "y": 35,
@@ -170,6 +181,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 25,
       "y": 10,
@@ -183,20 +195,15 @@
       "flag": "0"
     },
     {
+      "type": "clone",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
-      "in_connection": true,
       "x": -7,
       "y": 21,
-      "elevation": 7,
+      "target_local_id": 7,
-      "movement_type": "MOVEMENT_TYPE_NONE",
+      "target_map": "MAP_ROUTE16"
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "34",
-      "trainer_sight_or_berry_tree_id": "3",
-      "script": "0x0",
-      "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 3,
@@ -210,6 +217,7 @@
       "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 47,
       "y": 24,
@@ -229,91 +237,91 @@
       "y": 21,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_GAME_CORNER",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 11,
       "y": 14,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 15,
       "y": 14,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 30,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 48,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 39,
       "y": 20,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 11,
       "y": 30,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_GYM",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 37,
       "y": 29,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_RESTAURANT",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 41,
       "y": 29,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_HOUSE1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 49,
       "y": 29,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_HOTEL",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 29,
       "y": 5,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 30,
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 31,
       "y": 5,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     }
   ],
   "coord_events": [],
@@ -388,7 +396,7 @@
       "y": 20,
       "elevation": 3,
       "item": "ITEM_PP_UP",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_PP_UP",
       "quantity": 1,
       "underfoot": false
     }

data/maps/CeladonCity/scripts.inc

@@ -36,7 +36,7 @@ CeladonCity_EventScript_FatMan::
 	faceplayer
 	msgbox CeladonCity_Text_MyTrustedPalPoliwrath
 	closemessage
-	applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
+	applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -49,7 +49,7 @@ CeladonCity_EventScript_Poliwrath::
 	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry
-	applymovement LOCALID_POLIWRATH, Movement_FaceOriginalDirection
+	applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/CeladonCity_Condominiums_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MEOWTH",
       "x": 1,
       "y": 9,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY",
       "x": 5,
       "y": 13,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F",
       "x": 5,
       "y": 8,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 2,
       "y": 9,
@@ -74,42 +78,42 @@
       "y": 19,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 12,
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 13,
       "y": 19,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 4,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 12,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 2,
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 11
+      "dest_warp_id": "11"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Condominiums_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 6,
       "y": 6,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 5,
       "y": 6,
@@ -48,28 +50,28 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 2,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 11,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 12,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Condominiums_3F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 0,
       "y": 10,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 3,
       "y": 8,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 10,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 0,
       "y": 13,
@@ -74,28 +78,28 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 4,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 12,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 11,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Condominiums_Roof/map.json

@@ -21,21 +21,21 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 10,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 2,
       "y": 12,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Condominiums_RoofRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 3,
       "y": 5,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
@@ -48,21 +50,21 @@
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 6,
       "y": 10,
@@ -35,56 +36,56 @@
       "y": 15,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 14,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 3,
       "y": 15,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 9,
       "y": 15,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 10,
       "y": 14,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 11,
       "y": 15,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 6,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 4,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 5,
       "y": 10,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 8,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 11,
       "y": 6,
@@ -74,21 +78,21 @@
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 3,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     },
     {
       "x": 9,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_3F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 10,
       "y": 9,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 11,
       "y": 6,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 4,
       "y": 9,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 1,
       "y": 9,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 9,
       "y": 14,
@@ -87,21 +92,21 @@
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 2,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 3,
       "y": 2,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_4F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 6,
       "y": 6,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 10,
       "y": 11,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 3,
       "y": 13,
@@ -61,21 +64,21 @@
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 3,
       "y": 2,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 9,
       "y": 2,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_5F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 11,
       "y": 6,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 6,
       "y": 8,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 7,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
@@ -74,21 +78,21 @@
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 3,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_Elevator/map.json

@@ -20,15 +20,15 @@
       "x": 2,
       "y": 5,
       "elevation": 3,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     },
     {
       "x": 2,
       "y": 6,
       "elevation": 0,
-      "dest_map": "MAP_NONE",
+      "dest_map": "MAP_DYNAMIC",
-      "dest_warp_id": 127
+      "dest_warp_id": "WARP_ID_DYNAMIC"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_DepartmentStore_Roof/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 9,
       "y": 5,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 5,
       "y": 4,
@@ -48,7 +50,7 @@
       "y": 6,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_GameCorner/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 4,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 6,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 1,
       "y": 8,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 4,
       "y": 7,
@@ -81,6 +86,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 10,
@@ -94,6 +100,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 7,
       "y": 8,
@@ -107,6 +114,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 10,
       "y": 9,
@@ -120,6 +128,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 13,
       "y": 7,
@@ -133,6 +142,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 16,
       "y": 10,
@@ -146,6 +156,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 2,
@@ -165,28 +176,28 @@
       "y": 13,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 10,
       "y": 13,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 11,
       "y": 13,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 15,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_ROCKET_HIDEOUT_B1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],
@@ -197,7 +208,7 @@
       "y": 4,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS",
       "quantity": 10,
       "underfoot": false
     },
@@ -207,7 +218,7 @@
       "y": 8,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2",
       "quantity": 10,
       "underfoot": false
     },
@@ -217,7 +228,7 @@
       "y": 11,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3",
       "quantity": 20,
       "underfoot": false
     },
@@ -227,7 +238,7 @@
       "y": 12,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4",
       "quantity": 10,
       "underfoot": false
     },
@@ -237,7 +248,7 @@
       "y": 9,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5",
       "quantity": 10,
       "underfoot": false
     },
@@ -247,7 +258,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6",
       "quantity": 20,
       "underfoot": false
     },
@@ -257,7 +268,7 @@
       "y": 4,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7",
       "quantity": 10,
       "underfoot": false
     },
@@ -267,7 +278,7 @@
       "y": 3,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8",
       "quantity": 10,
       "underfoot": false
     },
@@ -277,7 +288,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9",
       "quantity": 10,
       "underfoot": false
     },
@@ -287,7 +298,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10",
       "quantity": 40,
       "underfoot": false
     },
@@ -297,7 +308,7 @@
       "y": 13,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11",
       "quantity": 100,
       "underfoot": false
     },
@@ -307,7 +318,7 @@
       "y": 12,
       "elevation": 3,
       "item": "ITEM_NONE",
-      "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12",
+      "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12",
       "quantity": 10,
       "underfoot": false
     },

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -106,7 +106,7 @@ CeladonCity_GameCorner_EventScript_BaldingMan::
 
 CeladonCity_GameCorner_EventScript_FaceSlotMachine::
 	closemessage
-	applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/CeladonCity_GameCorner_PrizeRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 6,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 6,
       "y": 7,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 4,
       "y": 2,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 2,
       "y": 2,
@@ -87,21 +92,21 @@
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 4,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 5,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Gym/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 11,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 9,
       "y": 10,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 10,
       "y": 7,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 2,
       "y": 6,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 5,
       "y": 4,
@@ -81,6 +86,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 7,
       "y": 4,
@@ -94,6 +100,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ERIKA",
       "x": 6,
       "y": 4,
@@ -107,6 +114,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 8,
       "y": 7,
@@ -120,6 +128,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 6,
       "y": 8,
@@ -133,6 +142,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 3,
       "y": 5,
@@ -146,6 +156,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 9,
       "y": 6,
@@ -165,21 +176,21 @@
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     },
     {
       "x": 6,
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     },
     {
       "x": 7,
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Hotel/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 5,
       "y": 4,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 3,
       "y": 6,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 9,
       "y": 7,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 2,
       "y": 6,
@@ -74,21 +78,21 @@
       "y": 10,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 9
+      "dest_warp_id": "9"
     },
     {
       "x": 4,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 9
+      "dest_warp_id": "9"
     },
     {
       "x": 5,
       "y": 10,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 9
+      "dest_warp_id": "9"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_House1/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 5,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 2,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 8,
       "y": 4,
@@ -61,21 +64,21 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 8
+      "dest_warp_id": "8"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 8
+      "dest_warp_id": "8"
     },
     {
       "x": 5,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 8
+      "dest_warp_id": "8"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 10,
       "y": 6,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 12,
       "y": 5,
@@ -74,28 +78,28 @@
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 7,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 8,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_PokemonCenter_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
@@ -74,21 +78,21 @@
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_UNION_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_TRADE_CENTER",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CeladonCity_Restaurant/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 12,
       "y": 7,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 11,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 9,
       "y": 4,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 2,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 3,
       "y": 7,
@@ -87,21 +92,21 @@
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     },
     {
       "x": 6,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     },
     {
       "x": 7,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CELADON_CITY",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCave_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 16,
@@ -42,6 +44,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 25,
       "y": 5,
@@ -55,6 +58,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 21,
@@ -68,6 +72,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 21,
@@ -81,6 +86,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 20,
@@ -94,6 +100,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 14,
       "y": 20,
@@ -107,6 +114,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 21,
@@ -120,6 +128,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 18,
@@ -139,56 +148,56 @@
       "y": 21,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     },
     {
       "x": 34,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 1,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_B1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 10,
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 5,
       "y": 15,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 30,
       "y": 10,
       "elevation": 4,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 24,
       "y": 11,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 2,
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_2F",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     }
   ],
   "coord_events": [],
@@ -199,7 +208,7 @@
       "y": 2,
       "elevation": 3,
       "item": "ITEM_ULTRA_BALL",
-      "flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL",
       "quantity": 1,
       "underfoot": false
     }

data/maps/CeruleanCave_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 18,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 29,
       "y": 16,
@@ -42,6 +44,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 33,
       "y": 12,
@@ -55,6 +58,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 10,
@@ -68,6 +72,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 9,
@@ -81,6 +86,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 25,
       "y": 11,
@@ -94,6 +100,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 28,
       "y": 20,
@@ -107,6 +114,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 30,
       "y": 20,
@@ -120,6 +128,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 13,
@@ -133,6 +142,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 23,
       "y": 16,
@@ -146,6 +156,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 6,
@@ -159,6 +170,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 12,
@@ -172,6 +184,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 20,
@@ -191,42 +204,42 @@
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 13,
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 7,
       "y": 14,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 26,
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 23,
       "y": 10,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     },
     {
       "x": 5,
       "y": 6,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 7
+      "dest_warp_id": "7"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCave_B1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 31,
       "y": 9,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MEWTWO",
       "x": 7,
       "y": 12,
@@ -55,6 +58,7 @@
       "flag": "FLAG_HIDE_MEWTWO"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 1,
@@ -68,6 +72,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 38,
       "y": 2,
@@ -81,6 +86,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 1,
@@ -94,6 +100,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 4,
@@ -107,6 +114,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 5,
@@ -120,6 +128,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 2,
       "y": 2,
@@ -133,6 +142,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 1,
@@ -146,6 +156,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 6,
       "y": 1,
@@ -159,6 +170,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 3,
       "y": 4,
@@ -178,7 +190,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity/map.json

@@ -37,6 +37,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 31,
       "y": 12,
@@ -50,6 +51,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 33,
       "y": 6,
@@ -63,6 +65,7 @@
       "flag": "FLAG_HIDE_CERULEAN_ROCKET"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 16,
       "y": 21,
@@ -76,6 +79,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 9,
       "y": 23,
@@ -89,6 +93,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
       "x": 32,
       "y": 29,
@@ -102,6 +107,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
       "y": 29,
@@ -115,6 +121,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 34,
       "y": 22,
@@ -128,6 +135,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 22,
       "y": 0,
@@ -141,6 +149,7 @@
       "flag": "FLAG_HIDE_CERULEAN_RIVAL"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 26,
       "y": 32,
@@ -154,20 +163,15 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "clone",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
-      "in_connection": true,
       "x": 50,
       "y": 18,
-      "elevation": 10,
+      "target_local_id": 10,
-      "movement_type": "MOVEMENT_TYPE_NONE",
+      "target_map": "MAP_ROUTE9"
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "27",
-      "trainer_sight_or_berry_tree_id": "3",
-      "script": "0x0",
-      "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 12,
       "y": 30,
@@ -181,6 +185,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 1,
       "y": 13,
@@ -200,98 +205,98 @@
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 30,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 15,
       "y": 17,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE3",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 22,
       "y": 19,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 31,
       "y": 21,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_GYM",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 13,
       "y": 28,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 29,
       "y": 28,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_MART",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 1,
       "y": 12,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CAVE_1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 10,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 31,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 31,
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE2",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 14,
       "y": 28,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 23,
       "y": 28,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE4",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 17,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY_HOUSE5",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [
@@ -380,7 +385,7 @@
       "y": 7,
       "elevation": 3,
       "item": "ITEM_RARE_CANDY",
-      "flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY",
+      "flag": "FLAG_HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY",
       "quantity": 1,
       "underfoot": false
     },

data/maps/CeruleanCity/scripts.inc

@@ -204,9 +204,9 @@ CeruleanCity_EventScript_NoRoomForTM28::
 CeruleanCity_EventScript_GruntTriggerTop::
 	lockall
 	setvar VAR_TEMP_1, 0
-	applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	goto CeruleanCity_EventScript_GruntTrigger
 	end
@@ -214,9 +214,9 @@ CeruleanCity_EventScript_GruntTriggerTop::
 CeruleanCity_EventScript_GruntTriggerBottom::
 	lockall
 	setvar VAR_TEMP_1, 1
-	applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	goto CeruleanCity_EventScript_GruntTrigger
 	end
@@ -235,7 +235,7 @@ CeruleanCity_EventScript_Policeman::
 	faceplayer
 	msgbox CeruleanCity_Text_PeopleHereWereRobbed
 	closemessage
-	applymovement LOCALID_POLICEMAN, Movement_FaceOriginalDirection
+	applymovement LOCALID_POLICEMAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -270,7 +270,7 @@ CeruleanCity_EventScript_Woman::
 	faceplayer
 	msgbox CeruleanCity_Text_WantBrightRedBicycle
 	closemessage
-	applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
+	applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -285,7 +285,7 @@ CeruleanCity_EventScript_Lass::
 	waitmessage
 	delay 40
 	playse SE_PIN
-	applymovement LOCALID_SLOWBRO, Movement_QuestionMark
+	applymovement LOCALID_SLOWBRO, Common_Movement_QuestionMark
 	waitmovement 0
 	delay 30
 	call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1

data/maps/CeruleanCity_BikeShop/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 9,
       "y": 3,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 9,
       "y": 7,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
@@ -61,21 +64,21 @@
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     },
     {
       "x": 6,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_Gym/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 10,
       "y": 12,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 4,
       "y": 7,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MISTY",
       "x": 8,
       "y": 6,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 16,
@@ -74,21 +78,21 @@
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 8,
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 9,
       "y": 18,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_House1/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 5,
@@ -35,28 +36,28 @@
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 3,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 4,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 3,
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 8
+      "dest_warp_id": "8"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_House2/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 1,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 7,
       "y": 6,
@@ -48,28 +50,28 @@
       "y": 7,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 3,
       "y": 7,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 1,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 4,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 9
+      "dest_warp_id": "9"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_House3/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 7,
       "y": 5,
@@ -48,21 +50,21 @@
       "y": 7,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 5,
       "y": 7,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_House4/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 5,
       "y": 3,
@@ -35,7 +36,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 12
+      "dest_warp_id": "12"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_House4/scripts.inc

@@ -40,7 +40,7 @@ CeruleanCity_House4_EventScript_News2::
 	end
 
 CeruleanCity_House4_EventScript_NewsNotSpread::
-	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
+	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox CeruleanCity_House4_Text_WishCouldShareNewsWithOthers
 	release
@@ -63,7 +63,7 @@ CeruleanCity_House4_EventScript_NewsSpread2::
 	end
 
 CeruleanCity_House4_EventScript_NewsDone::
-	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
+	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews
 	release
@@ -71,11 +71,11 @@ CeruleanCity_House4_EventScript_NewsDone::
 
 CeruleanCity_House4_EventScript_MovementReactionToNews::
 	playse SE_PIN
-	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_ExclamationMark
+	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
+	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_Delay48
+	applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_Delay48
 	waitmovement 0
 	return
 

data/maps/CeruleanCity_House5/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 7,
       "y": 4,
@@ -35,7 +36,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 13
+      "dest_warp_id": "13"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_Mart/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 9,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 1,
       "y": 7,
@@ -61,21 +64,21 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     },
     {
       "x": 5,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 6
+      "dest_warp_id": "6"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 5,
       "y": 4,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 4,
       "y": 8,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 3,
@@ -81,6 +86,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 2,
       "y": 1,
@@ -94,6 +100,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 3,
       "y": 1,
@@ -113,28 +120,28 @@
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 7,
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CERULEAN_CITY",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CeruleanCity_PokemonCenter_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
@@ -74,21 +78,21 @@
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_UNION_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_TRADE_CENTER",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 14,
       "y": 6,
@@ -40,6 +41,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 11,
       "y": 11,
@@ -53,6 +55,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 20,
       "y": 7,
@@ -66,6 +69,7 @@
       "flag": "FLAG_HIDE_CINNABAR_BILL"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 23,
       "y": 7,
@@ -85,35 +89,35 @@
       "y": 3,
       "elevation": 0,
       "dest_map": "MAP_POKEMON_MANSION_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 20,
       "y": 4,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_GYM",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 8,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 14,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 19,
       "y": 11,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_MART",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [

data/maps/CinnabarIsland/scripts.inc

@@ -94,9 +94,9 @@ CinnabarIsland_EventScript_BillScene::
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
 	playse SE_PIN
-	applymovement LOCALID_BILL, Movement_ExclamationMark
+	applymovement LOCALID_BILL, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement LOCALID_BILL, Movement_Delay48
+	applymovement LOCALID_BILL, Common_Movement_Delay48
 	waitmovement 0
 	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
 	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
@@ -107,12 +107,12 @@ CinnabarIsland_EventScript_BillScene::
 	end
 
 CinnabarIsland_EventScript_BillFacePlayer1::
-	applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 CinnabarIsland_EventScript_BillFacePlayer2::
-	applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
@@ -124,7 +124,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1::
 CinnabarIsland_EventScript_BillApproachPlayer2::
 	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	return
 
@@ -313,7 +313,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore::
 @ Triggered when VAR_TEMP_1 is 0
 CinnabarIsland_EventScript_GymDoorLocked::
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
 	msgbox CinnabarIsland_Text_DoorIsLocked

data/maps/CinnabarIsland_Gym/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 25,
       "y": 11,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 25,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 17,
       "y": 5,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 16,
       "y": 11,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 16,
       "y": 18,
@@ -81,6 +86,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 19,
@@ -94,6 +100,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 11,
@@ -107,6 +114,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BLAINE",
       "x": 5,
       "y": 4,
@@ -120,6 +128,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 24,
       "y": 20,
@@ -139,21 +148,21 @@
       "y": 23,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 25,
       "y": 23,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 26,
       "y": 23,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -271,13 +271,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
 	end
 
 CinnabarIsland_Gym_EventScript_QuinnApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_QuinnApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
 	waitmovement 0
 	return
@@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
 	end
 
 CinnabarIsland_Gym_EventScript_RamonApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_RamonApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight
 	waitmovement 0
 	return
@@ -496,13 +496,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek::
 	end
 
 CinnabarIsland_Gym_EventScript_DerekApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_DerekApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight
 	waitmovement 0
 	return
@@ -568,13 +568,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty::
 	end
 
 CinnabarIsland_Gym_EventScript_DustyApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_DustyApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight
 	waitmovement 0
 	return
@@ -640,13 +640,13 @@ CinnabarIsland_Gym_EventScript_BattleZac::
 	end
 
 CinnabarIsland_Gym_EventScript_ZacApproachLeft::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
 	waitmovement 0
 	return
 
 CinnabarIsland_Gym_EventScript_ZacApproachRight::
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
 	waitmovement 0
 	return

data/maps/CinnabarIsland_Mart/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 6,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 8,
       "y": 2,
@@ -61,21 +64,21 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 4,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 2,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 7,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 6,
@@ -68,6 +72,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 2,
       "y": 1,
@@ -81,6 +86,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 3,
       "y": 1,
@@ -94,6 +100,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 11,
       "y": 5,
@@ -113,28 +120,28 @@
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 6,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonCenter_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
@@ -74,21 +78,21 @@
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_UNION_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_TRADE_CENTER",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonLab_Entrance/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 4,
@@ -35,42 +36,42 @@
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 4,
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 5,
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 19,
       "y": 5,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 25,
       "y": 5,
       "elevation": 0,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 11,
       "y": 8,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 12,
       "y": 3,
@@ -48,7 +50,7 @@
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
-      "dest_warp_id": 5
+      "dest_warp_id": "5"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonLab_Lounge/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 3,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 4,
       "y": 6,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
@@ -61,7 +64,7 @@
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [],

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 5,
       "y": 4,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 10,
       "y": 3,
@@ -48,7 +50,7 @@
       "y": 9,
       "elevation": 3,
       "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     }
   ],
   "coord_events": [],

data/maps/DiglettsCave_B1F/map.json

@@ -21,14 +21,14 @@
       "y": 3,
       "elevation": 3,
       "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 82,
       "y": 71,
       "elevation": 3,
       "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/DiglettsCave_NorthEntrance/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 4,
       "y": 4,
@@ -35,14 +36,14 @@
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_DIGLETTS_CAVE_B1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
       "dest_map": "MAP_ROUTE2",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [],

data/maps/DiglettsCave_SouthEntrance/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 4,
       "y": 4,
@@ -35,14 +36,14 @@
       "y": 6,
       "elevation": 3,
       "dest_map": "MAP_ROUTE11",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 6,
       "y": 4,
       "elevation": 3,
       "dest_map": "MAP_DIGLETTS_CAVE_B1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 8,
       "y": 5,
@@ -40,6 +41,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 16,
       "y": 10,
@@ -53,18 +55,12 @@
       "flag": "0"
     },
     {
+      "type": "clone",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
-      "in_connection": true,
       "x": 32,
       "y": 9,
-      "elevation": 4,
+      "target_local_id": 4,
-      "movement_type": "MOVEMENT_TYPE_NONE",
+      "target_map": "MAP_FIVE_ISLAND_MEADOW"
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "56",
-      "trainer_sight_or_berry_tree_id": "3",
-      "script": "0x0",
-      "flag": "0"
     }
   ],
   "warp_events": [
@@ -73,28 +69,28 @@
       "y": 14,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_HARBOR",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 18,
       "y": 6,
       "elevation": 0,
       "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 12,
       "y": 6,
       "elevation": 0,
       "dest_map": "MAP_FIVE_ISLAND_HOUSE1",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 22,
       "y": 9,
       "elevation": 0,
       "dest_map": "MAP_FIVE_ISLAND_HOUSE2",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_Harbor/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
@@ -48,7 +50,7 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_House1/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 10,
       "y": 2,
@@ -35,7 +36,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_House2/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 3,
@@ -35,7 +36,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Entrance/map.json

@@ -21,14 +21,14 @@
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 5,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room1/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 5,
       "y": 4,
@@ -35,35 +36,35 @@
       "y": 2,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 5,
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 2,
@@ -48,7 +50,7 @@
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room11/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
@@ -35,7 +36,7 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room12/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
@@ -35,7 +36,7 @@
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room13/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
@@ -35,7 +36,7 @@
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room14/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
@@ -35,7 +36,7 @@
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room2/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room3/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room4/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 6,
       "y": 4,
@@ -35,28 +36,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room5/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room6/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room7/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room8/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9",
-      "dest_warp_id": 3
+      "dest_warp_id": "3"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_LostCave_Room9/map.json

@@ -21,28 +21,28 @@
       "y": 1,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 8,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 4
+      "dest_warp_id": "4"
     },
     {
       "x": 5,
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 2,
       "y": 5,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
-      "dest_warp_id": 2
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_Meadow/map.json

@@ -27,6 +27,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
       "x": 18,
       "y": 18,
@@ -40,6 +41,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 17,
       "y": 5,
@@ -53,6 +55,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 27,
@@ -66,6 +69,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 8,
       "y": 9,
@@ -79,6 +83,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 19,
       "y": 12,
@@ -92,6 +97,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 11,
@@ -105,6 +111,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 22,
@@ -124,7 +131,7 @@
       "y": 21,
       "elevation": 0,
       "dest_map": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_MemorialPillar/map.json

@@ -22,6 +22,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 8,
       "y": 44,
@@ -35,6 +36,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 6,
@@ -48,6 +50,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 14,
       "y": 17,
@@ -61,6 +64,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 17,
       "y": 31,
@@ -74,6 +78,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 47,
@@ -104,7 +109,7 @@
       "y": 52,
       "elevation": 3,
       "item": "ITEM_BIG_PEARL",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL",
       "quantity": 1,
       "underfoot": false
     },
@@ -114,7 +119,7 @@
       "y": 7,
       "elevation": 3,
       "item": "ITEM_RAZZ_BERRY",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY",
       "quantity": 1,
       "underfoot": false
     },
@@ -124,7 +129,7 @@
       "y": 22,
       "elevation": 3,
       "item": "ITEM_SITRUS_BERRY",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY",
       "quantity": 1,
       "underfoot": false
     },
@@ -134,7 +139,7 @@
       "y": 25,
       "elevation": 3,
       "item": "ITEM_BLUK_BERRY",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY",
       "quantity": 1,
       "underfoot": false
     }

data/maps/FiveIsland_MemorialPillar/scripts.inc

@@ -9,11 +9,11 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan::
 	goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42
 	msgbox FiveIsland_MemorialPillar_Text_ScrubScrub
 	closemessage
-	applymovement LOCALID_MEMORIAL_MAN, Movement_FacePlayer
+	applymovement LOCALID_MEMORIAL_MAN, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 45
 	msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy
-	applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix
 	release
@@ -54,10 +54,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
 	removeitem ITEM_LEMONADE
 	msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade
 	closemessage
-	applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight
+	applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 45
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
@@ -69,7 +69,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
 
 FiveIsland_MemorialPillar_EventScript_ReceivedTM42::
 	msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo
-	applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
 	return

data/maps/FiveIsland_PokemonCenter_1F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 9,
       "y": 4,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 4,
       "y": 8,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 2,
       "y": 1,
@@ -68,6 +72,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
+      "type": "object",
       "graphics_id": "0",
       "x": 3,
       "y": 1,
@@ -87,14 +92,14 @@
       "y": 8,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 1,
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_PokemonCenter_2F/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
@@ -29,6 +30,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
@@ -42,6 +44,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
@@ -55,6 +58,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
@@ -74,21 +78,21 @@
       "y": 6,
       "elevation": 4,
       "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     },
     {
       "x": 5,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_UNION_ROOM",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 9,
       "y": 1,
       "elevation": 0,
       "dest_map": "MAP_TRADE_CENTER",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_ResortGorgeous/map.json

@@ -22,6 +22,7 @@
   ],
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 44,
       "y": 10,
@@ -35,6 +36,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
       "y": 12,
@@ -48,6 +50,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 12,
       "y": 10,
@@ -61,6 +64,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 23,
       "y": 9,
@@ -74,6 +78,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 33,
       "y": 8,
@@ -87,6 +92,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 33,
       "y": 3,
@@ -100,6 +106,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 56,
       "y": 7,
@@ -113,6 +120,7 @@
       "flag": "0"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 39,
       "y": 9,
@@ -132,14 +140,14 @@
       "y": 13,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     },
     {
       "x": 39,
       "y": 8,
       "elevation": 0,
       "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
-      "dest_warp_id": 0
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [],
@@ -150,7 +158,7 @@
       "y": 7,
       "elevation": 3,
       "item": "ITEM_NEST_BALL",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL",
       "quantity": 1,
       "underfoot": false
     },
@@ -160,7 +168,7 @@
       "y": 11,
       "elevation": 3,
       "item": "ITEM_STARDUST",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST",
       "quantity": 1,
       "underfoot": false
     },
@@ -170,7 +178,7 @@
       "y": 12,
       "elevation": 3,
       "item": "ITEM_STAR_PIECE",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE",
       "quantity": 1,
       "underfoot": false
     },
@@ -180,7 +188,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_STARDUST",
-      "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2",
+      "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2",
       "quantity": 1,
       "underfoot": false
     },

data/maps/FiveIsland_ResortGorgeous/scripts.inc

@@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
 	closemessage
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	opendoor 39, 8
 	waitdooranim

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -16,6 +16,7 @@
   "connections": null,
   "object_events": [
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 4,
       "y": 4,
@@ -29,6 +30,7 @@
       "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
     },
     {
+      "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 2,
@@ -48,7 +50,7 @@
       "y": 7,
       "elevation": 3,
       "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
-      "dest_warp_id": 1
+      "dest_warp_id": "1"
     }
   ],
   "coord_events": [],

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -44,7 +44,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_MALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
+	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	textcolor NPC_TEXT_COLOR_FEMALE
 	msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -65,25 +65,25 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	end
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterDown
+	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
 	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
 	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return
 
 FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterLeft
+	applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
 	applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	return