966 files changed, 5092 insertions, 4561 deletions

diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 91ff79f2b..d52086b08 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -13,7 +13,7 @@
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
 ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
 ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
-; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
+; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
 ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - Footprints (see gfx/footprints.asm)
diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm
index 49ba362d7..e0f913fab 100644
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -1,5 +1,5 @@
 spawn: MACRO
-; map, y, x
+; map, x, y
 	map \1
 	db \2, \3
 ENDM
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 69f902eb0..52d788987 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1,11 +1,14 @@
 # Bugs and Glitches
 
+These are known bugs and glitches in the original Pokémon Crystal game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash.
+
 
 ## Contents
 
 - [Thick Club and Light Ball can decrease damage done with boosted (Special) Attack](#thick-club-and-light-ball-can-decrease-damage-done-with-boosted-special-attack)
 - [Metal Powder can increase damage taken with boosted (Special) Defense](#metal-powder-can-increase-damage-taken-with-boosted-special-defense)
 - [Belly Drum sharply boosts Attack even with under 50% HP](#belly-drum-sharply-boosts-attack-even-with-under-50-hp)
+- [Confusion damage is affected by type-boosting items and Explosion/Self-Destruct doubling](#confusion-damage-is-affected-by-type-boosting-items-and-explosionself-destruct-doubling)
 - [Moves that lower Defense can do so after breaking a Substitute](#moves-that-lower-defense-can-do-so-after-breaking-a-substitute)
 - [Counter and Mirror Coat still work if the opponent uses an item](#counter-and-mirror-coat-still-work-if-the-opponent-uses-an-item)
 - [A Disabled but PP Up–enhanced move may not trigger Struggle](#a-disabled-but-pp-upenhanced-move-may-not-trigger-struggle)
@@ -27,6 +30,7 @@
 - [Dragon Scale, not Dragon Fang, boosts Dragon-type moves](#dragon-scale-not-dragon-fang-boosts-dragon-type-moves)
 - [Daisy's grooming doesn't always increase happiness](#daisys-grooming-doesnt-always-increase-happiness)
 - [Magikarp in Lake of Rage are shorter, not longer](#magikarp-in-lake-of-rage-are-shorter-not-longer)
+- [Magikarp length limits have a unit conversion error](#magikarp-length-limits-have-a-unit-conversion-error)
 - [Magikarp lengths can be miscalculated](#magikarp-lengths-can-be-miscalculated)
 - [Battle transitions fail to account for the enemy's level](#battle-transitions-fail-to-account-for-the-enemys-level)
 - [Slot machine payout sound effects cut each other off](#slot-machine-payout-sound-effects-cut-each-other-off)
@@ -49,11 +53,12 @@
 - [`TryObjectEvent` arbitrary code execution](#tryobjectevent-arbitrary-code-execution)
 - [`Special_CheckBugContestContestantFlag` can read beyond its data table](#special_checkbugcontestcontestantflag-can-read-beyond-its-data-table)
 - [`ClearWRAM` only clears WRAM bank 1](#clearwram-only-clears-wram-bank-1)
-- [`GetForestTreeFrame` works, but it's still bad](#getforesttreeframe-works-but-its-still-bad)
 
 
 ## Thick Club and Light Ball can decrease damage done with boosted (Special) Attack
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450))
 
 This is a bug with `SpeciesItemBoost` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
@@ -88,6 +93,8 @@ This is a bug with `SpeciesItemBoost` in [engine/battle/effect_commands.asm](/en
 
 ## Metal Powder can increase damage taken with boosted (Special) Defense
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450))
 
 This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
@@ -144,6 +151,8 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en
 
 ## Belly Drum sharply boosts Attack even with under 50% HP
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y))
 
 This is a bug with `BattleCommand_BellyDrum` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
@@ -180,8 +189,19 @@ BattleCommand_BellyDrum: ; 37c1a
 ```
 
 
+## Confusion damage is affected by type-boosting items and Explosion/Self-Destruct doubling
+
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
+([Video](https://twitter.com/crystal_rby/status/874626362287562752))
+
+*To do:* Identify specific code causing this bug and fix it.
+
+
 ## Moves that lower Defense can do so after breaking a Substitute
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=OGwKPRJLaaI))
 
 This bug affects Acid, Iron Tail, and Rock Smash.
@@ -218,6 +238,8 @@ DefenseDownHit:
 
 ## Counter and Mirror Coat still work if the opponent uses an item
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=uRYyzKRatFk))
 
 *To do:* Identify specific code causing this bug and fix it.
@@ -225,6 +247,8 @@ DefenseDownHit:
 
 ## A Disabled but PP Up–enhanced move may not trigger Struggle
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=1v9x4SgMggs))
 
 This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engine/battle/core.asm):
@@ -250,6 +274,8 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 
 ## A Pokémon that fainted from Pursuit will have its old status condition when revived
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=tiRvw-Nb2ME))
 
 *To do:* Identify specific code causing this bug and fix it.
@@ -257,6 +283,8 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 
 ## Lock-On and Mind Reader don't always bypass Fly and Dig
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider Web, Transform, and stat-lowering effects of moves like String Shot or Bubble during the semi-invulnerable turn of Fly or Dig.
 
 This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
@@ -275,6 +303,8 @@ CheckHiddenOpponent: ; 37daa
 
 ## Beat Up can desynchronize link battles
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=202-iAsrIa8))
 
 This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
@@ -310,6 +340,8 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm]
 
 ## Present damage is incorrect in link battles
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 ([Video](https://www.youtube.com/watch?v=XJaQoKtrEuw))
 
 This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility.
@@ -661,6 +693,8 @@ FastBallMultiplier:
 
 ## Dragon Scale, not Dragon Fang, boosts Dragon-type moves
 
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
 This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm):
 
 ```asm
@@ -751,6 +785,43 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 **Fix:** Change both `jr z, .Happiness` to `jr nz, .Happiness`.
 
 
+## Magikarp length limits have a unit conversion error
+
+This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](/engine/battle/core.asm):
+
+```asm
+; Get Magikarp's length
+	ld de, EnemyMonDVs
+	ld bc, PlayerID
+	callfar CalcMagikarpLength
+
+; No reason to keep going if length > 1536 (i.e. if length / 256 != 6)
+	ld a, [wMagikarpLength]
+	cp HIGH(1536) ; this compares to 6'0'', should be cp 5
+	jr nz, .CheckMagikarpArea
+
+; 5% chance of skipping both size checks
+	call Random
+	cp 5 percent
+	jr c, .CheckMagikarpArea
+; Try again if length > 1615
+	ld a, [wMagikarpLength + 1]
+	cp LOW(1616) ; this compares to 6'80'', should be cp 3
+	jr nc, .GenerateDVs
+
+; 20% chance of skipping this check
+	call Random
+	cp 20 percent - 1
+	jr c, .CheckMagikarpArea
+; Try again if length > 1599
+	ld a, [wMagikarpLength + 1]
+	cp LOW(1600) ; this compares to 6'64'', should be cp 2
+	jr nc, .GenerateDVs
+```
+
+**Fix:** Change the three `cp` instructions to use their commented values.
+
+
 ## Magikarp lengths can be miscalculated
 
 This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm):
@@ -1410,46 +1481,3 @@ ClearWRAM:: ; 25a
 ```
 
 **Fix:** Change `jr nc, .bank_loop` to `jr c, .bank_loop`.
-
-
-## `GetForestTreeFrame` works, but it's still bad
-
-In [tilesets/animations.asm](/tilesets/animations.asm):
-
-```asm
-GetForestTreeFrame: ; fc54c
-; Return 0 if a is even, or 2 if odd.
-	and a
-	jr z, .even
-	cp 1
-	jr z, .odd
-	cp 2
-	jr z, .even
-	cp 3
-	jr z, .odd
-	cp 4
-	jr z, .even
-	cp 5
-	jr z, .odd
-	cp 6
-	jr z, .even
-.odd
-	ld a, 2
-	scf
-	ret
-.even
-	xor a
-	ret
-; fc56d
-```
-
-**Fix:**
-
-```asm
-GetForestTreeFrame: ; fc54c
-; Return 0 if a is even, or 2 if odd.
-	and 1
-	add a
-	ret
-; fc56d
-```
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
new file mode 100644
index 000000000..21a222743
--- /dev/null
+++ b/docs/design_flaws.md
@@ -0,0 +1,512 @@
+# Design Flaws
+
+These are parts of the code that do not work *incorrectly*, like [bugs and glitches](/docs/bugs_and_glitches.md), but that clearly exist just to work around a problem. In other words, with a slightly different design, the code would not need to exist at all. Design flaws may be exceptions to a usual rule, such as "tables of pointers in different banks use `dba`" ([one exception](#pic-banks-are-offset-by-pics_fix), [and another](#pokédex-entry-banks-are-derived-from-their-species-ids)) or "graphics used as a unit are stored and loaded contiguously" ([a notable exception](#footprints-are-split-into-top-and-bottom-halves)).
+
+
+## Contents
+
+- [Pic banks are offset by `PICS_FIX`](#pic-banks-are-offset-by-pics_fix)
+- [`PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address](#pokemonpicpointers-and-unownpicpointers-are-assumed-to-start-at-the-same-address)
+- [Footprints are split into top and bottom halves](#footprints-are-split-into-top-and-bottom-halves)
+- [Pokédex entry banks are derived from their species IDs](#pokédex-entry-banks-are-derived-from-their-species-ids)
+- [`ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items](#item_c3-and-item_dc-break-up-the-continuous-sequence-of-tm-items)
+- [`GetForestTreeFrame` works, but it's still bad](#getforesttreeframe-works-but-its-still-bad)
+
+
+## Pic banks are offset by `PICS_FIX`
+
+[data/pokemon/pic_pointers.asm](/data/pokemon/pic_pointers.asm), [data/pokemon/unown_pic_pointers.asm](/data/pokemon/unown_pic_pointers.asm), and [data/trainers/pic_pointers.asm](/data/trainers/pic_pointers.asm) all have to use `dba_pic` instead of `dba`. This is a macro in [macros/data.asm](/macros/data.asm) that offsets banks by `PICS_FIX`:
+
+```asm
+dba_pic: MACRO ; dbw bank, address
+	db BANK(\1) - PICS_FIX
+	dw \1
+ENDM
+```
+
+The offset is translated into a correct bank by `FixPicBank` in [gfx/load_pics.asm](/gfx/load_pics.asm):
+
+```asm
+FixPicBank: ; 511c5
+; This is a thing for some reason.
+
+PICS_FIX EQU $36
+GLOBAL PICS_FIX
+
+	push hl
+	push bc
+	sub BANK(Pics_1) - PICS_FIX
+	ld c, a
+	ld b, 0
+	ld hl, .PicsBanks
+	add hl, bc
+	ld a, [hl]
+	pop bc
+	pop hl
+	ret
+
+.PicsBanks: ; 511d4
+	db BANK(Pics_1) + 0
+	db BANK(Pics_1) + 1
+	db BANK(Pics_1) + 2
+	db BANK(Pics_1) + 3
+	db BANK(Pics_1) + 4
+	db BANK(Pics_1) + 5
+	db BANK(Pics_1) + 6
+	db BANK(Pics_1) + 7
+	db BANK(Pics_1) + 8
+	db BANK(Pics_1) + 9
+	db BANK(Pics_1) + 10
+	db BANK(Pics_1) + 11
+	db BANK(Pics_1) + 12
+	db BANK(Pics_1) + 13
+	db BANK(Pics_1) + 14
+	db BANK(Pics_1) + 15
+	db BANK(Pics_1) + 16
+	db BANK(Pics_1) + 17
+	db BANK(Pics_1) + 18
+	db BANK(Pics_1) + 19
+	db BANK(Pics_1) + 20
+	db BANK(Pics_1) + 21
+	db BANK(Pics_1) + 22
+	db BANK(Pics_1) + 23
+```
+
+**Fix:** Use `dba` instead of `dba_pic`, and don't call `FixPicBank` to modify `a`.
+
+
+## `PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address
+
+In [gfx/pics.asm](/gfx/pics.asm):
+
+```asm
+; PokemonPicPointers and UnownPicPointers are assumed to start at the same
+; address, but in different banks. This is enforced in pokecrystal.link.
+
+SECTION "Pic Pointers", ROMX
+
+INCLUDE "data/pokemon/pic_pointers.asm"
+
+
+SECTION "Unown Pic Pointers", ROMX
+
+INCLUDE "data/pokemon/unown_pic_pointers.asm"
+```
+
+In [pokecrystal.link](/pokecrystal.link):
+
+```
+ROMX $48
+	org $4000
+	"Pic Pointers"
+	"Pics 1"
+ROMX $49
+	org $4000
+	"Unown Pic Pointers"
+	"Pics 2"
+```
+
+Two routines in [gfx/load_pics.asm](/gfx/load_pics.asm) make this assumption; `GetFrontpicPointer`:
+
+```asm
+	ld a, [CurPartySpecies]
+	cp UNOWN
+	jr z, .unown
+	ld a, [CurPartySpecies]
+	ld d, BANK(PokemonPicPointers)
+	jr .ok
+
+.unown
+	ld a, [UnownLetter]
+	ld d, BANK(UnownPicPointers)
+
+.ok
+	ld hl, PokemonPicPointers ; UnownPicPointers
+	dec a
+	ld bc, 6
+	call AddNTimes
+```
+
+And `GetMonBackpic`:
+
+```asm
+	; These are assumed to be at the same
+	; address in their respective banks.
+	GLOBAL PokemonPicPointers,  UnownPicPointers
+	ld hl, PokemonPicPointers ; UnownPicPointers
+	ld a, b
+	ld d, BANK(PokemonPicPointers)
+	cp UNOWN
+	jr nz, .ok
+	ld a, c
+	ld d, BANK(UnownPicPointers)
+.ok
+	dec a
+	ld bc, 6
+	call AddNTimes
+```
+
+**Fix:**
+
+Don't enforce `org $4000` in pokecrystal.link.
+
+Modify `GetFrontpicPointer`:
+
+```asm
+	ld a, [CurPartySpecies]
+	cp UNOWN
+	jr z, .unown
+	ld a, [CurPartySpecies]
+	ld hl, PokemonPicPointers
+	ld d, BANK(PokemonPicPointers)
+	jr .ok
+
+.unown
+	ld a, [UnownLetter]
+	ld hl, UnownPicPointers
+	ld d, BANK(UnownPicPointers)
+
+.ok
+	dec a
+	ld bc, 6
+	call AddNTimes
+```
+
+And `GetMonBackpic`:
+
+```asm
+	GLOBAL PokemonPicPointers, UnownPicPointers
+	ld a, b
+	ld hl, PokemonPicPointers
+	ld d, BANK(PokemonPicPointers)
+	cp UNOWN
+	jr nz, .ok
+	ld a, c
+	ld hl, UnownPicPointers
+	ld d, BANK(UnownPicPointers)
+.ok
+	dec a
+	ld bc, 6
+	call AddNTimes
+```
+
+
+## Footprints are split into top and bottom halves
+
+In [gfx/footprints.asm](/gfx/footprints.asm):
+
+```asm
+; Footprints are 2x2 tiles each, but are stored as a 16x64-tile image
+; (32 rows of 8 footprints per row).
+; That means there's a row of the top two tiles for eight footprints,
+; then a row of the bottom two tiles for those eight footprints.
+
+; These macros help extract the first and the last two tiles, respectively.
+footprint_top    EQUS "0,                 2 * LEN_1BPP_TILE"
+footprint_bottom EQUS "2 * LEN_1BPP_TILE, 2 * LEN_1BPP_TILE"
+
+; Entries correspond to Pokémon species, two apiece, 8 tops then 8 bottoms
+
+; 001-008 top halves
+INCBIN "gfx/footprints/bulbasaur.1bpp",  footprint_top
+INCBIN "gfx/footprints/ivysaur.1bpp",    footprint_top
+INCBIN "gfx/footprints/venusaur.1bpp",   footprint_top
+INCBIN "gfx/footprints/charmander.1bpp", footprint_top
+INCBIN "gfx/footprints/charmeleon.1bpp", footprint_top
+INCBIN "gfx/footprints/charizard.1bpp",  footprint_top
+INCBIN "gfx/footprints/squirtle.1bpp",   footprint_top
+INCBIN "gfx/footprints/wartortle.1bpp",  footprint_top
+; 001-008 bottom halves
+INCBIN "gfx/footprints/bulbasaur.1bpp",  footprint_bottom
+INCBIN "gfx/footprints/ivysaur.1bpp",    footprint_bottom
+INCBIN "gfx/footprints/venusaur.1bpp",   footprint_bottom
+INCBIN "gfx/footprints/charmander.1bpp", footprint_bottom
+INCBIN "gfx/footprints/charmeleon.1bpp", footprint_bottom
+INCBIN "gfx/footprints/charizard.1bpp",  footprint_bottom
+INCBIN "gfx/footprints/squirtle.1bpp",   footprint_bottom
+INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
+...
+```
+
+`Pokedex_LoadAnyFootprint` in [engine/pokedex.asm](/engine/pokedex.asm):
+
+```asm
+	push hl
+	ld e, l
+	ld d, h
+	ld hl, VTiles2 tile $62
+	lb bc, BANK(Footprints), 2
+	call Request1bpp
+	pop hl
+
+	; Whoever was editing footprints forgot to fix their
+	; tile editor. Now each bottom half is 8 tiles off.
+	ld de, 8 tiles
+	add hl, de
+
+	ld e, l
+	ld d, h
+	ld hl, VTiles2 tile $64
+	lb bc, BANK(Footprints), 2
+	call Request1bpp
+```
+
+**Fix:**
+
+Store footprints contiguously:
+
+```asm
+INCBIN "gfx/footprints/bulbasaur.1bpp"
+INCBIN "gfx/footprints/ivysaur.1bpp"
+INCBIN "gfx/footprints/venusaur.1bpp"
+INCBIN "gfx/footprints/charmander.1bpp"
+INCBIN "gfx/footprints/charmeleon.1bpp"
+INCBIN "gfx/footprints/charizard.1bpp"
+INCBIN "gfx/footprints/squirtle.1bpp"
+INCBIN "gfx/footprints/wartortle.1bpp"
+...
+```
+
+Modify `Pokedex_LoadAnyFootprint`:
+
+```asm
+	ld e, l
+	ld d, h
+	ld hl, VTiles2 tile $62
+	lb bc, BANK(Footprints), 4
+	call Request1bpp
+```
+
+
+## Pokédex entry banks are derived from their species IDs
+
+`PokedexDataPointerTable` in [data/pokemon/dex_entry_pointers.asm](/data/pokemon/dex_entry_pointers.asm) is a table of `dw`, not `dba`, yet there are four banks used for Pokédex entries. The correct bank is derived from the species ID at the beginning of each Pokémon's base stats. (This is the only use the base stat species ID has.)
+
+Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex_2.asm](/engine/pokedex_2.asm):
+
+```asm
+GetDexEntryPointer: ; 44333
+; return dex entry pointer b:de
+	push hl
+	ld hl, PokedexDataPointerTable
+	ld a, b
+	dec a
+	ld d, 0
+	ld e, a
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	push de
+	rlca
+	rlca
+	and $3
+	ld hl, .PokedexEntryBanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld b, [hl]
+	pop de
+	pop hl
+	ret
+
+.PokedexEntryBanks: ; 44351
+
+GLOBAL PokedexEntries1
+GLOBAL PokedexEntries2
+GLOBAL PokedexEntries3
+GLOBAL PokedexEntries4
+
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+`GetPokedexEntryBank` in [engine/item_effects.asm](/engine/item_effects.asm):
+
+```asm
+GetPokedexEntryBank:
+	push hl
+	push de
+	ld a, [EnemyMonSpecies]
+	rlca
+	rlca
+	and 3
+	ld hl, .PokedexEntryBanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld a, [hl]
+	pop de
+	pop hl
+	ret
+
+.PokedexEntryBanks:
+
+GLOBAL PokedexEntries1
+GLOBAL PokedexEntries2
+GLOBAL PokedexEntries3
+GLOBAL PokedexEntries4
+
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+And `PokedexShow_GetDexEntryBank` in [engine/radio.asm](/engine/radio.asm):
+
+```asm
+PokedexShow_GetDexEntryBank:
+	push hl
+	push de
+	ld a, [CurPartySpecies]
+	dec a
+	rlca
+	rlca
+	and 3
+	ld hl, .pokedexbanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld a, [hl]
+	pop de
+	pop hl
+	ret
+
+.pokedexbanks
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+**Fix:** Use `dba` instead of `dw` in `PokedexDataPointerTable`, and modify the code that accesses it to match.
+
+
+## `ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items
+
+[constants/item_constants.asm](/constants/item_constants.asm) defined the 50 TMs in order with `add_tm`, but `ITEM_C3` and `ITEM_DC` break up that sequence.
+
+```asm
+	add_tm DYNAMICPUNCH ; $BF
+	...
+	add_tm ROLLOUT      ; $C2
+	const ITEM_C3       ; $C3
+	add_tm ROAR         ; $C4
+	...
+	add_tm DIG          ; $DB
+	const ITEM_DC       ; $DC
+	add_tm PSYCHIC_M    ; $DD
+	...
+	add_tm NIGHTMARE    ; $F2
+NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
+```
+
+`GetTMHMNumber` and `GetNumberedTMHM` in [engine/items.asm](/engine/items.asm) have to compensate for this:
+
+```asm
+GetTMHMNumber:: ; d407
+; Return the number of a TM/HM by item id c.
+	ld a, c
+; Skip any dummy items.
+	cp ITEM_C3 ; TM04-05
+	jr c, .done
+	cp ITEM_DC ; TM28-29
+	jr c, .skip
+	dec a
+.skip
+	dec a
+.done
+	sub TM01
+	inc a
+	ld c, a
+	ret
+
+GetNumberedTMHM: ; d417
+; Return the item id of a TM/HM by number c.
+	ld a, c
+; Skip any gaps.
+	cp ITEM_C3 - (TM01 - 1)
+	jr c, .done
+	cp ITEM_DC - (TM01 - 1) - 1
+	jr c, .skip_one
+.skip_two
+	inc a
+.skip_one
+	inc a
+.done
+	add TM01
+	dec a
+	ld c, a
+	ret
+```
+
+**Fix:**
+
+Move `ITEM_C3` and `ITEM_DC` above all the TMs in every table of item data.
+
+Modify engine/items.asm:
+
+```asm
+GetTMHMNumber:: ; d407
+; Return the number of a TM/HM by item id c.
+	ld a, c
+	sub TM01
+	inc a
+	ld c, a
+	ret
+
+GetNumberedTMHM: ; d417
+; Return the item id of a TM/HM by number c.
+	ld a, c
+	add TM01
+	dec a
+	ld c, a
+	ret
+```
+
+
+## `GetForestTreeFrame` works, but it's still bad
+
+In [tilesets/animations.asm](/tilesets/animations.asm):
+
+```asm
+GetForestTreeFrame: ; fc54c
+; Return 0 if a is even, or 2 if odd.
+	and a
+	jr z, .even
+	cp 1
+	jr z, .odd
+	cp 2
+	jr z, .even
+	cp 3
+	jr z, .odd
+	cp 4
+	jr z, .even
+	cp 5
+	jr z, .odd
+	cp 6
+	jr z, .even
+.odd
+	ld a, 2
+	scf
+	ret
+.even
+	xor a
+	ret
+; fc56d
+```
+
+**Fix:**
+
+```asm
+GetForestTreeFrame: ; fc54c
+; Return 0 if a is even, or 2 if odd.
+	and 1
+	add a
+	ret
+; fc56d
+```
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index fa8fa308b..4206c7a86 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -60,17 +60,17 @@ Callback types:
 
 ## `.Warps: db` *N*
 
-- **`warp_def` *y*, *x*, *warp_id*, *map***
+- **`warp_def` *x*, *y*, *warp_id*, *map***
 
 
 ## `.CoordEvents: db` *N*
 
-- **`coord_event` *scene id*, *y*, *x*, *script***
+- **`coord_event` *x*, *y*, *scene id*, *script***
 
 
 ## `.BGEvents: db` *N*
 
-- **`bg_event` *y*, *x*, *type*, *script***
+- **`bg_event` *x*, *y*, *type*, *script***
 
 BG event types:
 
@@ -90,7 +90,7 @@ BG event types:
 
 ## `.ObjectEvents: db` *N*
 
-- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
+- **`object_event` *x*, *y*, *sprite*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
 
 Movement types:
 
diff --git a/engine/events/crystal_unown.asm b/engine/events/crystal_unown.asm
index 352306055..09d44bb9a 100644
--- a/engine/events/crystal_unown.asm
+++ b/engine/events/crystal_unown.asm
@@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e
 
 Special_DisplayUnownWords: ; 8ae68
 	ld a, [ScriptVar]
-	ld hl, .MenuDataHeader_Escape
+	ld hl, .MenuDataHeaders_UnownWalls
 	and a
 	jr z, .load
 
@@ -153,8 +153,6 @@ Special_DisplayUnownWords: ; 8ae68
 	ret
 ; 8aebc
 
-.UnownText: ; 8aebc
-
 unownwall: MACRO
 rept _NARG
 if \1 == "-"
@@ -180,36 +178,35 @@ endr
 	db $ff
 ENDM
 
-.UnownText_Escape:
+.UnownText: ; 8aebc
+;.UnownText_Escape:
 	; db      $08, $44, $04, $00, $2e, $08, $ff
 	unownwall "E", "S", "C", "A", "P", "E"
-.UnownText_Light:
+;.UnownText_Light:
 	; db      $26, $20, $0c, $0e, $46, $ff
 	unownwall "L", "I", "G", "H", "T"
-.UnownText_Water:
+;.UnownText_Water:
 	; db      $4c, $00, $46, $08, $42, $ff
 	unownwall "W", "A", "T", "E", "R"
-.UnownText_Ho_Oh:
+;.UnownText_Ho_Oh:
 	; db      $0e, $2c, $64, $2c, $0e, $ff
 	unownwall "H", "O", "-", "O", "H"
 ; 8aed5
 
-.MenuDataHeader_Escape: ; 0x8aed5
+.MenuDataHeaders_UnownWalls: ; 0x8aed5
+;.MenuDataHeader_Escape:
 	db $40 ; flags
 	db 04, 03 ; start coords
 	db 09, 16 ; end coords
-
-.MenuDataHeader_Light: ; 0x8aeda
+;.MenuDataHeader_Light:
 	db $40 ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
-
-.MenuDataHeader_Water: ; 0x8aedf
+;.MenuDataHeader_Water:
 	db $40 ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
-
-.MenuDataHeader_Ho_Oh: ; 0x8aee4
+;.MenuDataHeader_Ho_Oh:
 	db $40 ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
diff --git a/engine/items.asm b/engine/items.asm
index dcaf10356..503a76c6b 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -455,15 +455,12 @@ CheckTMHM: ; d3fb
 
 GetTMHMNumber:: ; d407
 ; Return the number of a TM/HM by item id c.
-
 	ld a, c
-
 ; Skip any dummy items.
 	cp ITEM_C3 ; TM04-05
 	jr c, .done
 	cp ITEM_DC ; TM28-29
 	jr c, .skip
-
 	dec a
 .skip
 	dec a
@@ -475,15 +472,12 @@ GetTMHMNumber:: ; d407
 
 GetNumberedTMHM: ; d417
 ; Return the item id of a TM/HM by number c.
-
 	ld a, c
-
 ; Skip any gaps.
 	cp ITEM_C3 - (TM01 - 1)
 	jr c, .done
 	cp ITEM_DC - (TM01 - 1) - 1
 	jr c, .skip_one
-
 .skip_two
 	inc a
 .skip_one
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm
index b060f5b4b..3c826b8b7 100644
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -77,13 +77,13 @@ PokeAnims: ; d0042
 
 .Slow:   pokeanim StereoCry, Setup2, Play
 .Normal: pokeanim StereoCry, Setup, Play
-.Menu:   pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
-.Trade:  pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
-.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
-.Hatch:  pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
-.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
+.Menu:   pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
+.Trade:  pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play
+.Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play
+.Hatch:  pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
+.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
 .Egg1:   pokeanim Setup, Play
-.Egg2:   pokeanim Extra, Play
+.Egg2:   pokeanim Idle, Play
 
 
 AnimateFrontpic: ; d008e
@@ -151,7 +151,7 @@ ENDM
 	setup_command PokeAnim_Wait
 	setup_command PokeAnim_Setup
 	setup_command PokeAnim_Setup2
-	setup_command PokeAnim_Extra
+	setup_command PokeAnim_Idle
 	setup_command PokeAnim_Play
 	setup_command PokeAnim_Play2
 	setup_command PokeAnim_Cry
@@ -198,7 +198,7 @@ PokeAnim_Setup2: ; d011d
 	ret
 ; d012f
 
-PokeAnim_Extra: ; d012f
+PokeAnim_Idle: ; d012f
 	ld c, TRUE
 	ld b, 0
 	call PokeAnim_InitAnim
@@ -360,18 +360,18 @@ PokeAnim_InitPicAttributes: ; d01d6
 PokeAnim_InitAnim: ; d0228
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(wPokeAnimExtraFlag)
+	ld a, BANK(wPokeAnimIdleFlag)
 	ld [rSVBK], a
 	push bc
-	ld hl, wPokeAnimExtraFlag
-	ld bc, wPokeAnimStructEnd - wPokeAnimExtraFlag
+	ld hl, wPokeAnimIdleFlag
+	ld bc, wPokeAnimStructEnd - wPokeAnimIdleFlag
 	xor a
 	call ByteFill
 	pop bc
 	ld a, b
 	ld [wPokeAnimSpeed], a
 	ld a, c
-	ld [wPokeAnimExtraFlag], a
+	ld [wPokeAnimIdleFlag], a
 	call GetMonAnimPointer
 	call GetMonFramesPointer
 	call GetMonBitmaskPointer
@@ -949,20 +949,20 @@ GetMonAnimPointer: ; d055c
 
 	ld c, BANK(UnownAnimations)
 	ld hl, UnownAnimationPointers
-	ld de, UnownAnimationExtraPointers
+	ld de, UnownAnimationIdlePointers
 	call PokeAnim_IsUnown
 	jr z, .unown
 	ld c, BANK(PicAnimations)
 	ld hl, AnimationPointers
-	ld de, AnimationExtraPointers
+	ld de, AnimationIdlePointers
 .unown
 
-	ld a, [wPokeAnimExtraFlag]
+	ld a, [wPokeAnimIdleFlag]
 	and a
-	jr z, .extras
+	jr z, .idles
 	ld h, d
 	ld l, e
-.extras
+.idles
 
 	ld a, [wPokeAnimSpeciesOrUnown]
 	dec a
@@ -982,12 +982,12 @@ GetMonAnimPointer: ; d055c
 .egg
 	ld hl, EggAnimation
 	ld c, BANK(EggAnimation)
-	ld a, [wPokeAnimExtraFlag]
+	ld a, [wPokeAnimIdleFlag]
 	and a
-	jr z, .extras_egg
-	ld hl, EggAnimationExtra
-	ld c, BANK(EggAnimationExtra)
-.extras_egg
+	jr z, .idles_egg
+	ld hl, EggAnimationIdle
+	ld c, BANK(EggAnimationIdle)
+.idles_egg
 
 	ld a, c
 	ld [wPokeAnimPointerBank], a
diff --git a/engine/player_object.asm b/engine/player_object.asm
index e11a30036..6d5cb7e84 100755
--- a/engine/player_object.asm
+++ b/engine/player_object.asm
@@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071
 ; A dummy map object used to initialize the player object.
 ; Shorter than the actual amount copied by two bytes.
 ; Said bytes seem to be unused.
-	object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
+	object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
 
 CopyDECoordsToMapObject:: ; 807e
 	push de
diff --git a/gfx/pokemon/abra/anim0.asm b/gfx/pokemon/abra/anim.asm
index 9d37567ac..9d37567ac 100644
--- a/gfx/pokemon/abra/anim0.asm
+++ b/gfx/pokemon/abra/anim.asm
diff --git a/gfx/pokemon/abra/anim1.asm b/gfx/pokemon/abra/anim_idle.asm
index 796e57f88..796e57f88 100644
--- a/gfx/pokemon/abra/anim1.asm
+++ b/gfx/pokemon/abra/anim_idle.asm
diff --git a/gfx/pokemon/aerodactyl/anim0.asm b/gfx/pokemon/aerodactyl/anim.asm
index 515cba043..515cba043 100644
--- a/gfx/pokemon/aerodactyl/anim0.asm
+++ b/gfx/pokemon/aerodactyl/anim.asm
diff --git a/gfx/pokemon/aerodactyl/anim1.asm b/gfx/pokemon/aerodactyl/anim_idle.asm
index 4394a8e0c..4394a8e0c 100644
--- a/gfx/pokemon/aerodactyl/anim1.asm
+++ b/gfx/pokemon/aerodactyl/anim_idle.asm
diff --git a/gfx/pokemon/aipom/anim0.asm b/gfx/pokemon/aipom/anim.asm
index 99556d958..99556d958 100644
--- a/gfx/pokemon/aipom/anim0.asm
+++ b/gfx/pokemon/aipom/anim.asm
diff --git a/gfx/pokemon/aipom/anim1.asm b/gfx/pokemon/aipom/anim_idle.asm
index 9685b665d..9685b665d 100644
--- a/gfx/pokemon/aipom/anim1.asm
+++ b/gfx/pokemon/aipom/anim_idle.asm
diff --git a/gfx/pokemon/alakazam/anim0.asm b/gfx/pokemon/alakazam/anim.asm
index fb87afbfe..fb87afbfe 100644
--- a/gfx/pokemon/alakazam/anim0.asm
+++ b/gfx/pokemon/alakazam/anim.asm
diff --git a/gfx/pokemon/alakazam/anim1.asm b/gfx/pokemon/alakazam/anim_idle.asm
index 52cf585fb..52cf585fb 100644
--- a/gfx/pokemon/alakazam/anim1.asm
+++ b/gfx/pokemon/alakazam/anim_idle.asm
diff --git a/gfx/pokemon/ampharos/anim0.asm b/gfx/pokemon/ampharos/anim.asm
index 5e3d6538e..5e3d6538e 100644
--- a/gfx/pokemon/ampharos/anim0.asm
+++ b/gfx/pokemon/ampharos/anim.asm
diff --git a/gfx/pokemon/ampharos/anim1.asm b/gfx/pokemon/ampharos/anim_idle.asm
index 6dcb40d61..6dcb40d61 100644
--- a/gfx/pokemon/ampharos/anim1.asm
+++ b/gfx/pokemon/ampharos/anim_idle.asm
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
index 04d0be9ce..8efba2c30 100644
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@@ -1,253 +1,253 @@
 PicAnimations:
-BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim0.asm"
-IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim0.asm"
-VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim0.asm"
-CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim0.asm"
-CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim0.asm"
-CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim0.asm"
-SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim0.asm"
-WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim0.asm"
-BlastoiseAnimation:  INCLUDE "gfx/pokemon/blastoise/anim0.asm"
-CaterpieAnimation:   INCLUDE "gfx/pokemon/caterpie/anim0.asm"
-MetapodAnimation:    INCLUDE "gfx/pokemon/metapod/anim0.asm"
-ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim0.asm"
-WeedleAnimation:     INCLUDE "gfx/pokemon/weedle/anim0.asm"
-KakunaAnimation:     INCLUDE "gfx/pokemon/kakuna/anim0.asm"
-BeedrillAnimation:   INCLUDE "gfx/pokemon/beedrill/anim0.asm"
-PidgeyAnimation:     INCLUDE "gfx/pokemon/pidgey/anim0.asm"
-PidgeottoAnimation:  INCLUDE "gfx/pokemon/pidgeotto/anim0.asm"
-PidgeotAnimation:    INCLUDE "gfx/pokemon/pidgeot/anim0.asm"
-RattataAnimation:    INCLUDE "gfx/pokemon/rattata/anim0.asm"
-RaticateAnimation:   INCLUDE "gfx/pokemon/raticate/anim0.asm"
-SpearowAnimation:    INCLUDE "gfx/pokemon/spearow/anim0.asm"
-FearowAnimation:     INCLUDE "gfx/pokemon/fearow/anim0.asm"
-EkansAnimation:      INCLUDE "gfx/pokemon/ekans/anim0.asm"
-ArbokAnimation:      INCLUDE "gfx/pokemon/arbok/anim0.asm"
-PikachuAnimation:    INCLUDE "gfx/pokemon/pikachu/anim0.asm"
-RaichuAnimation:     INCLUDE "gfx/pokemon/raichu/anim0.asm"
-SandshrewAnimation:  INCLUDE "gfx/pokemon/sandshrew/anim0.asm"
-SandslashAnimation:  INCLUDE "gfx/pokemon/sandslash/anim0.asm"
-NidoranFAnimation:   INCLUDE "gfx/pokemon/nidoran_f/anim0.asm"
-NidorinaAnimation:   INCLUDE "gfx/pokemon/nidorina/anim0.asm"
-NidoqueenAnimation:  INCLUDE "gfx/pokemon/nidoqueen/anim0.asm"
-NidoranMAnimation:   INCLUDE "gfx/pokemon/nidoran_m/anim0.asm"
-NidorinoAnimation:   INCLUDE "gfx/pokemon/nidorino/anim0.asm"
-NidokingAnimation:   INCLUDE "gfx/pokemon/nidoking/anim0.asm"
-ClefairyAnimation:   INCLUDE "gfx/pokemon/clefairy/anim0.asm"
-ClefableAnimation:   INCLUDE "gfx/pokemon/clefable/anim0.asm"
-VulpixAnimation:     INCLUDE "gfx/pokemon/vulpix/anim0.asm"
-NinetalesAnimation:  INCLUDE "gfx/pokemon/ninetales/anim0.asm"
-JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim0.asm"
-WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim0.asm"
-ZubatAnimation:      INCLUDE "gfx/pokemon/zubat/anim0.asm"
-GolbatAnimation:     INCLUDE "gfx/pokemon/golbat/anim0.asm"
-OddishAnimation:     INCLUDE "gfx/pokemon/oddish/anim0.asm"
-GloomAnimation:      INCLUDE "gfx/pokemon/gloom/anim0.asm"
-VileplumeAnimation:  INCLUDE "gfx/pokemon/vileplume/anim0.asm"
-ParasAnimation:      INCLUDE "gfx/pokemon/paras/anim0.asm"
-ParasectAnimation:   INCLUDE "gfx/pokemon/parasect/anim0.asm"
-VenonatAnimation:    INCLUDE "gfx/pokemon/venonat/anim0.asm"
-VenomothAnimation:   INCLUDE "gfx/pokemon/venomoth/anim0.asm"
-DiglettAnimation:    INCLUDE "gfx/pokemon/diglett/anim0.asm"
-DugtrioAnimation:    INCLUDE "gfx/pokemon/dugtrio/anim0.asm"
-MeowthAnimation:     INCLUDE "gfx/pokemon/meowth/anim0.asm"
-PersianAnimation:    INCLUDE "gfx/pokemon/persian/anim0.asm"
-PsyduckAnimation:    INCLUDE "gfx/pokemon/psyduck/anim0.asm"
-GolduckAnimation:    INCLUDE "gfx/pokemon/golduck/anim0.asm"
-MankeyAnimation:     INCLUDE "gfx/pokemon/mankey/anim0.asm"
-PrimeapeAnimation:   INCLUDE "gfx/pokemon/primeape/anim0.asm"
-GrowlitheAnimation:  INCLUDE "gfx/pokemon/growlithe/anim0.asm"
-ArcanineAnimation:   INCLUDE "gfx/pokemon/arcanine/anim0.asm"
-PoliwagAnimation:    INCLUDE "gfx/pokemon/poliwag/anim0.asm"
-PoliwhirlAnimation:  INCLUDE "gfx/pokemon/poliwhirl/anim0.asm"
-PoliwrathAnimation:  INCLUDE "gfx/pokemon/poliwrath/anim0.asm"
-AbraAnimation:       INCLUDE "gfx/pokemon/abra/anim0.asm"
-KadabraAnimation:    INCLUDE "gfx/pokemon/kadabra/anim0.asm"
-AlakazamAnimation:   INCLUDE "gfx/pokemon/alakazam/anim0.asm"
-MachopAnimation:     INCLUDE "gfx/pokemon/machop/anim0.asm"
-MachokeAnimation:    INCLUDE "gfx/pokemon/machoke/anim0.asm"
-MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim0.asm"
-BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim0.asm"
-WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim0.asm"
-VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim0.asm"
-TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim0.asm"
-TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim0.asm"
-GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim0.asm"
-GravelerAnimation:   INCLUDE "gfx/pokemon/graveler/anim0.asm"
-GolemAnimation:      INCLUDE "gfx/pokemon/golem/anim0.asm"
-PonytaAnimation:     INCLUDE "gfx/pokemon/ponyta/anim0.asm"
-RapidashAnimation:   INCLUDE "gfx/pokemon/rapidash/anim0.asm"
-SlowpokeAnimation:   INCLUDE "gfx/pokemon/slowpoke/anim0.asm"
-SlowbroAnimation:    INCLUDE "gfx/pokemon/slowbro/anim0.asm"
-MagnemiteAnimation:  INCLUDE "gfx/pokemon/magnemite/anim0.asm"
-MagnetonAnimation:   INCLUDE "gfx/pokemon/magneton/anim0.asm"
-FarfetchDAnimation:  INCLUDE "gfx/pokemon/farfetch_d/anim0.asm"
-DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim0.asm"
-DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim0.asm"
-SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim0.asm"
-DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim0.asm"
-GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim0.asm"
-MukAnimation:        INCLUDE "gfx/pokemon/muk/anim0.asm"
-ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim0.asm"
-CloysterAnimation:   INCLUDE "gfx/pokemon/cloyster/anim0.asm"
-GastlyAnimation:     INCLUDE "gfx/pokemon/gastly/anim0.asm"
-HaunterAnimation:    INCLUDE "gfx/pokemon/haunter/anim0.asm"
-GengarAnimation:     INCLUDE "gfx/pokemon/gengar/anim0.asm"
-OnixAnimation:       INCLUDE "gfx/pokemon/onix/anim0.asm"
-DrowzeeAnimation:    INCLUDE "gfx/pokemon/drowzee/anim0.asm"
-HypnoAnimation:      INCLUDE "gfx/pokemon/hypno/anim0.asm"
-KrabbyAnimation:     INCLUDE "gfx/pokemon/krabby/anim0.asm"
-KinglerAnimation:    INCLUDE "gfx/pokemon/kingler/anim0.asm"
-VoltorbAnimation:    INCLUDE "gfx/pokemon/voltorb/anim0.asm"
-ElectrodeAnimation:  INCLUDE "gfx/pokemon/electrode/anim0.asm"
-ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim0.asm"
-ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim0.asm"
-CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim0.asm"
-MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim0.asm"
-HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim0.asm"
-HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim0.asm"
-LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim0.asm"
-KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim0.asm"
-WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim0.asm"
-RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim0.asm"
-RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim0.asm"
-ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim0.asm"
-TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim0.asm"
-KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim0.asm"
-HorseaAnimation:     INCLUDE "gfx/pokemon/horsea/anim0.asm"
-SeadraAnimation:     INCLUDE "gfx/pokemon/seadra/anim0.asm"
-GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim0.asm"
-SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim0.asm"
-StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim0.asm"
-StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim0.asm"
-MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim0.asm"
-ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim0.asm"
-JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim0.asm"
-ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim0.asm"
-MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim0.asm"
-PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim0.asm"
-TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim0.asm"
-MagikarpAnimation:   INCLUDE "gfx/pokemon/magikarp/anim0.asm"
-GyaradosAnimation:   INCLUDE "gfx/pokemon/gyarados/anim0.asm"
-LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim0.asm"
-DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim0.asm"
-EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim0.asm"
-VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim0.asm"
-JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim0.asm"
-FlareonAnimation:    INCLUDE "gfx/pokemon/flareon/anim0.asm"
-PorygonAnimation:    INCLUDE "gfx/pokemon/porygon/anim0.asm"
-OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim0.asm"
-OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim0.asm"
-KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim0.asm"
-KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim0.asm"
-AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim0.asm"
-SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim0.asm"
-ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim0.asm"
-ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim0.asm"
-MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim0.asm"
-DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim0.asm"
-DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim0.asm"
-DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim0.asm"
-MewtwoAnimation:     INCLUDE "gfx/pokemon/mewtwo/anim0.asm"
-MewAnimation:        INCLUDE "gfx/pokemon/mew/anim0.asm"
-ChikoritaAnimation:  INCLUDE "gfx/pokemon/chikorita/anim0.asm"
-BayleefAnimation:    INCLUDE "gfx/pokemon/bayleef/anim0.asm"
-MeganiumAnimation:   INCLUDE "gfx/pokemon/meganium/anim0.asm"
-CyndaquilAnimation:  INCLUDE "gfx/pokemon/cyndaquil/anim0.asm"
-QuilavaAnimation:    INCLUDE "gfx/pokemon/quilava/anim0.asm"
-TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim0.asm"
-TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim0.asm"
-CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim0.asm"
-FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim0.asm"
-SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim0.asm"
-FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim0.asm"
-HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim0.asm"
-NoctowlAnimation:    INCLUDE "gfx/pokemon/noctowl/anim0.asm"
-LedybaAnimation:     INCLUDE "gfx/pokemon/ledyba/anim0.asm"
-LedianAnimation:     INCLUDE "gfx/pokemon/ledian/anim0.asm"
-SpinarakAnimation:   INCLUDE "gfx/pokemon/spinarak/anim0.asm"
-AriadosAnimation:    INCLUDE "gfx/pokemon/ariados/anim0.asm"
-CrobatAnimation:     INCLUDE "gfx/pokemon/crobat/anim0.asm"
-ChinchouAnimation:   INCLUDE "gfx/pokemon/chinchou/anim0.asm"
-LanturnAnimation:    INCLUDE "gfx/pokemon/lanturn/anim0.asm"
-PichuAnimation:      INCLUDE "gfx/pokemon/pichu/anim0.asm"
-CleffaAnimation:     INCLUDE "gfx/pokemon/cleffa/anim0.asm"
-IgglybuffAnimation:  INCLUDE "gfx/pokemon/igglybuff/anim0.asm"
-TogepiAnimation:     INCLUDE "gfx/pokemon/togepi/anim0.asm"
-TogeticAnimation:    INCLUDE "gfx/pokemon/togetic/anim0.asm"
-NatuAnimation:       INCLUDE "gfx/pokemon/natu/anim0.asm"
-XatuAnimation:       INCLUDE "gfx/pokemon/xatu/anim0.asm"
-MareepAnimation:     INCLUDE "gfx/pokemon/mareep/anim0.asm"
-FlaaffyAnimation:    INCLUDE "gfx/pokemon/flaaffy/anim0.asm"
-AmpharosAnimation:   INCLUDE "gfx/pokemon/ampharos/anim0.asm"
-BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim0.asm"
-MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim0.asm"
-AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim0.asm"
-SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim0.asm"
-PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim0.asm"
-HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim0.asm"
-SkiploomAnimation:   INCLUDE "gfx/pokemon/skiploom/anim0.asm"
-JumpluffAnimation:   INCLUDE "gfx/pokemon/jumpluff/anim0.asm"
-AipomAnimation:      INCLUDE "gfx/pokemon/aipom/anim0.asm"
-SunkernAnimation:    INCLUDE "gfx/pokemon/sunkern/anim0.asm"
-SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim0.asm"
-YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim0.asm"
-WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim0.asm"
-QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim0.asm"
-EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim0.asm"
-UmbreonAnimation:    INCLUDE "gfx/pokemon/umbreon/anim0.asm"
-MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim0.asm"
-SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim0.asm"
-MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim0.asm"
-UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim0.asm"
-WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim0.asm"
-GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim0.asm"
-PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim0.asm"
-ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim0.asm"
-DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim0.asm"
-GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim0.asm"
-SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim0.asm"
-SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim0.asm"
-GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim0.asm"
-QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim0.asm"
-ScizorAnimation:     INCLUDE "gfx/pokemon/scizor/anim0.asm"
-ShuckleAnimation:    INCLUDE "gfx/pokemon/shuckle/anim0.asm"
-HeracrossAnimation:  INCLUDE "gfx/pokemon/heracross/anim0.asm"
-SneaselAnimation:    INCLUDE "gfx/pokemon/sneasel/anim0.asm"
-TeddiursaAnimation:  INCLUDE "gfx/pokemon/teddiursa/anim0.asm"
-UrsaringAnimation:   INCLUDE "gfx/pokemon/ursaring/anim0.asm"
-SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim0.asm"
-MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim0.asm"
-SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim0.asm"
-PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim0.asm"
-CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim0.asm"
-RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim0.asm"
-OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim0.asm"
-DelibirdAnimation:   INCLUDE "gfx/pokemon/delibird/anim0.asm"
-MantineAnimation:    INCLUDE "gfx/pokemon/mantine/anim0.asm"
-SkarmoryAnimation:   INCLUDE "gfx/pokemon/skarmory/anim0.asm"
-HoundourAnimation:   INCLUDE "gfx/pokemon/houndour/anim0.asm"
-HoundoomAnimation:   INCLUDE "gfx/pokemon/houndoom/anim0.asm"
-KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim0.asm"
-PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim0.asm"
-DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim0.asm"
-Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim0.asm"
-StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim0.asm"
-SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim0.asm"
-TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim0.asm"
-HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim0.asm"
-SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim0.asm"
-ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim0.asm"
-MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim0.asm"
-MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim0.asm"
-BlisseyAnimation:    INCLUDE "gfx/pokemon/blissey/anim0.asm"
-RaikouAnimation:     INCLUDE "gfx/pokemon/raikou/anim0.asm"
-EnteiAnimation:      INCLUDE "gfx/pokemon/entei/anim0.asm"
-SuicuneAnimation:    INCLUDE "gfx/pokemon/suicune/anim0.asm"
-LarvitarAnimation:   INCLUDE "gfx/pokemon/larvitar/anim0.asm"
-PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim0.asm"
-TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim0.asm"
-LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim0.asm"
-HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim0.asm"
-CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim0.asm"
-EggAnimation:        INCLUDE "gfx/pokemon/egg/anim0.asm"
+BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
+IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim.asm"
+VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim.asm"
+CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim.asm"
+CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm"
+CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim.asm"
+SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim.asm"
+WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim.asm"
+BlastoiseAnimation:  INCLUDE "gfx/pokemon/blastoise/anim.asm"
+CaterpieAnimation:   INCLUDE "gfx/pokemon/caterpie/anim.asm"
+MetapodAnimation:    INCLUDE "gfx/pokemon/metapod/anim.asm"
+ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm"
+WeedleAnimation:     INCLUDE "gfx/pokemon/weedle/anim.asm"
+KakunaAnimation:     INCLUDE "gfx/pokemon/kakuna/anim.asm"
+BeedrillAnimation:   INCLUDE "gfx/pokemon/beedrill/anim.asm"
+PidgeyAnimation:     INCLUDE "gfx/pokemon/pidgey/anim.asm"
+PidgeottoAnimation:  INCLUDE "gfx/pokemon/pidgeotto/anim.asm"
+PidgeotAnimation:    INCLUDE "gfx/pokemon/pidgeot/anim.asm"
+RattataAnimation:    INCLUDE "gfx/pokemon/rattata/anim.asm"
+RaticateAnimation:   INCLUDE "gfx/pokemon/raticate/anim.asm"
+SpearowAnimation:    INCLUDE "gfx/pokemon/spearow/anim.asm"
+FearowAnimation:     INCLUDE "gfx/pokemon/fearow/anim.asm"
+EkansAnimation:      INCLUDE "gfx/pokemon/ekans/anim.asm"
+ArbokAnimation:      INCLUDE "gfx/pokemon/arbok/anim.asm"
+PikachuAnimation:    INCLUDE "gfx/pokemon/pikachu/anim.asm"
+RaichuAnimation:     INCLUDE "gfx/pokemon/raichu/anim.asm"
+SandshrewAnimation:  INCLUDE "gfx/pokemon/sandshrew/anim.asm"
+SandslashAnimation:  INCLUDE "gfx/pokemon/sandslash/anim.asm"
+NidoranFAnimation:   INCLUDE "gfx/pokemon/nidoran_f/anim.asm"
+NidorinaAnimation:   INCLUDE "gfx/pokemon/nidorina/anim.asm"
+NidoqueenAnimation:  INCLUDE "gfx/pokemon/nidoqueen/anim.asm"
+NidoranMAnimation:   INCLUDE "gfx/pokemon/nidoran_m/anim.asm"
+NidorinoAnimation:   INCLUDE "gfx/pokemon/nidorino/anim.asm"
+NidokingAnimation:   INCLUDE "gfx/pokemon/nidoking/anim.asm"
+ClefairyAnimation:   INCLUDE "gfx/pokemon/clefairy/anim.asm"
+ClefableAnimation:   INCLUDE "gfx/pokemon/clefable/anim.asm"
+VulpixAnimation:     INCLUDE "gfx/pokemon/vulpix/anim.asm"
+NinetalesAnimation:  INCLUDE "gfx/pokemon/ninetales/anim.asm"
+JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim.asm"
+WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim.asm"
+ZubatAnimation:      INCLUDE "gfx/pokemon/zubat/anim.asm"
+GolbatAnimation:     INCLUDE "gfx/pokemon/golbat/anim.asm"
+OddishAnimation:     INCLUDE "gfx/pokemon/oddish/anim.asm"
+GloomAnimation:      INCLUDE "gfx/pokemon/gloom/anim.asm"
+VileplumeAnimation:  INCLUDE "gfx/pokemon/vileplume/anim.asm"
+ParasAnimation:      INCLUDE "gfx/pokemon/paras/anim.asm"
+ParasectAnimation:   INCLUDE "gfx/pokemon/parasect/anim.asm"
+VenonatAnimation:    INCLUDE "gfx/pokemon/venonat/anim.asm"
+VenomothAnimation:   INCLUDE "gfx/pokemon/venomoth/anim.asm"
+DiglettAnimation:    INCLUDE "gfx/pokemon/diglett/anim.asm"
+DugtrioAnimation:    INCLUDE "gfx/pokemon/dugtrio/anim.asm"
+MeowthAnimation:     INCLUDE "gfx/pokemon/meowth/anim.asm"
+PersianAnimation:    INCLUDE "gfx/pokemon/persian/anim.asm"
+PsyduckAnimation:    INCLUDE "gfx/pokemon/psyduck/anim.asm"
+GolduckAnimation:    INCLUDE "gfx/pokemon/golduck/anim.asm"
+MankeyAnimation:     INCLUDE "gfx/pokemon/mankey/anim.asm"
+PrimeapeAnimation:   INCLUDE "gfx/pokemon/primeape/anim.asm"
+GrowlitheAnimation:  INCLUDE "gfx/pokemon/growlithe/anim.asm"
+ArcanineAnimation:   INCLUDE "gfx/pokemon/arcanine/anim.asm"
+PoliwagAnimation:    INCLUDE "gfx/pokemon/poliwag/anim.asm"
+PoliwhirlAnimation:  INCLUDE "gfx/pokemon/poliwhirl/anim.asm"
+PoliwrathAnimation:  INCLUDE "gfx/pokemon/poliwrath/anim.asm"
+AbraAnimation:       INCLUDE "gfx/pokemon/abra/anim.asm"
+KadabraAnimation:    INCLUDE "gfx/pokemon/kadabra/anim.asm"
+AlakazamAnimation:   INCLUDE "gfx/pokemon/alakazam/anim.asm"
+MachopAnimation:     INCLUDE "gfx/pokemon/machop/anim.asm"
+MachokeAnimation:    INCLUDE "gfx/pokemon/machoke/anim.asm"
+MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim.asm"
+BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm"
+WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm"
+VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm"
+TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim.asm"
+TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm"
+GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim.asm"
+GravelerAnimation:   INCLUDE "gfx/pokemon/graveler/anim.asm"
+GolemAnimation:      INCLUDE "gfx/pokemon/golem/anim.asm"
+PonytaAnimation:     INCLUDE "gfx/pokemon/ponyta/anim.asm"
+RapidashAnimation:   INCLUDE "gfx/pokemon/rapidash/anim.asm"
+SlowpokeAnimation:   INCLUDE "gfx/pokemon/slowpoke/anim.asm"
+SlowbroAnimation:    INCLUDE "gfx/pokemon/slowbro/anim.asm"
+MagnemiteAnimation:  INCLUDE "gfx/pokemon/magnemite/anim.asm"
+MagnetonAnimation:   INCLUDE "gfx/pokemon/magneton/anim.asm"
+FarfetchDAnimation:  INCLUDE "gfx/pokemon/farfetch_d/anim.asm"
+DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim.asm"
+DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim.asm"
+SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim.asm"
+DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim.asm"
+GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim.asm"
+MukAnimation:        INCLUDE "gfx/pokemon/muk/anim.asm"
+ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim.asm"
+CloysterAnimation:   INCLUDE "gfx/pokemon/cloyster/anim.asm"
+GastlyAnimation:     INCLUDE "gfx/pokemon/gastly/anim.asm"
+HaunterAnimation:    INCLUDE "gfx/pokemon/haunter/anim.asm"
+GengarAnimation:     INCLUDE "gfx/pokemon/gengar/anim.asm"
+OnixAnimation:       INCLUDE "gfx/pokemon/onix/anim.asm"
+DrowzeeAnimation:    INCLUDE "gfx/pokemon/drowzee/anim.asm"
+HypnoAnimation:      INCLUDE "gfx/pokemon/hypno/anim.asm"
+KrabbyAnimation:     INCLUDE "gfx/pokemon/krabby/anim.asm"
+KinglerAnimation:    INCLUDE "gfx/pokemon/kingler/anim.asm"
+VoltorbAnimation:    INCLUDE "gfx/pokemon/voltorb/anim.asm"
+ElectrodeAnimation:  INCLUDE "gfx/pokemon/electrode/anim.asm"
+ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim.asm"
+ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim.asm"
+CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim.asm"
+MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim.asm"
+HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim.asm"
+HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim.asm"
+LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim.asm"
+KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim.asm"
+WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim.asm"
+RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim.asm"
+RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim.asm"
+ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim.asm"
+TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim.asm"
+KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm"
+HorseaAnimation:     INCLUDE "gfx/pokemon/horsea/anim.asm"
+SeadraAnimation:     INCLUDE "gfx/pokemon/seadra/anim.asm"
+GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim.asm"
+SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim.asm"
+StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim.asm"
+StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim.asm"
+MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim.asm"
+ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim.asm"
+JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim.asm"
+ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm"
+MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim.asm"
+PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim.asm"
+TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim.asm"
+MagikarpAnimation:   INCLUDE "gfx/pokemon/magikarp/anim.asm"
+GyaradosAnimation:   INCLUDE "gfx/pokemon/gyarados/anim.asm"
+LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim.asm"
+DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim.asm"
+EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim.asm"
+VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim.asm"
+JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim.asm"
+FlareonAnimation:    INCLUDE "gfx/pokemon/flareon/anim.asm"
+PorygonAnimation:    INCLUDE "gfx/pokemon/porygon/anim.asm"
+OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim.asm"
+OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim.asm"
+KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim.asm"
+KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim.asm"
+AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim.asm"
+SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim.asm"
+ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim.asm"
+ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim.asm"
+MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim.asm"
+DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim.asm"
+DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim.asm"
+DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim.asm"
+MewtwoAnimation:     INCLUDE "gfx/pokemon/mewtwo/anim.asm"
+MewAnimation:        INCLUDE "gfx/pokemon/mew/anim.asm"
+ChikoritaAnimation:  INCLUDE "gfx/pokemon/chikorita/anim.asm"
+BayleefAnimation:    INCLUDE "gfx/pokemon/bayleef/anim.asm"
+MeganiumAnimation:   INCLUDE "gfx/pokemon/meganium/anim.asm"
+CyndaquilAnimation:  INCLUDE "gfx/pokemon/cyndaquil/anim.asm"
+QuilavaAnimation:    INCLUDE "gfx/pokemon/quilava/anim.asm"
+TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim.asm"
+TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim.asm"
+CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim.asm"
+FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim.asm"
+SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim.asm"
+FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim.asm"
+HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim.asm"
+NoctowlAnimation:    INCLUDE "gfx/pokemon/noctowl/anim.asm"
+LedybaAnimation:     INCLUDE "gfx/pokemon/ledyba/anim.asm"
+LedianAnimation:     INCLUDE "gfx/pokemon/ledian/anim.asm"
+SpinarakAnimation:   INCLUDE "gfx/pokemon/spinarak/anim.asm"
+AriadosAnimation:    INCLUDE "gfx/pokemon/ariados/anim.asm"
+CrobatAnimation:     INCLUDE "gfx/pokemon/crobat/anim.asm"
+ChinchouAnimation:   INCLUDE "gfx/pokemon/chinchou/anim.asm"
+LanturnAnimation:    INCLUDE "gfx/pokemon/lanturn/anim.asm"
+PichuAnimation:      INCLUDE "gfx/pokemon/pichu/anim.asm"
+CleffaAnimation:     INCLUDE "gfx/pokemon/cleffa/anim.asm"
+IgglybuffAnimation:  INCLUDE "gfx/pokemon/igglybuff/anim.asm"
+TogepiAnimation:     INCLUDE "gfx/pokemon/togepi/anim.asm"
+TogeticAnimation:    INCLUDE "gfx/pokemon/togetic/anim.asm"
+NatuAnimation:       INCLUDE "gfx/pokemon/natu/anim.asm"
+XatuAnimation:       INCLUDE "gfx/pokemon/xatu/anim.asm"
+MareepAnimation:     INCLUDE "gfx/pokemon/mareep/anim.asm"
+FlaaffyAnimation:    INCLUDE "gfx/pokemon/flaaffy/anim.asm"
+AmpharosAnimation:   INCLUDE "gfx/pokemon/ampharos/anim.asm"
+BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim.asm"
+MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim.asm"
+AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim.asm"
+SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim.asm"
+PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim.asm"
+HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim.asm"
+SkiploomAnimation:   INCLUDE "gfx/pokemon/skiploom/anim.asm"
+JumpluffAnimation:   INCLUDE "gfx/pokemon/jumpluff/anim.asm"
+AipomAnimation:      INCLUDE "gfx/pokemon/aipom/anim.asm"
+SunkernAnimation:    INCLUDE "gfx/pokemon/sunkern/anim.asm"
+SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim.asm"
+YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
+WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim.asm"
+QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim.asm"
+EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim.asm"
+UmbreonAnimation:    INCLUDE "gfx/pokemon/umbreon/anim.asm"
+MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim.asm"
+SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim.asm"
+MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm"
+UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim.asm"
+WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim.asm"
+GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim.asm"
+PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim.asm"
+ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim.asm"
+DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim.asm"
+GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim.asm"
+SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim.asm"
+SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim.asm"
+GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim.asm"
+QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim.asm"
+ScizorAnimation:     INCLUDE "gfx/pokemon/scizor/anim.asm"
+ShuckleAnimation:    INCLUDE "gfx/pokemon/shuckle/anim.asm"
+HeracrossAnimation:  INCLUDE "gfx/pokemon/heracross/anim.asm"
+SneaselAnimation:    INCLUDE "gfx/pokemon/sneasel/anim.asm"
+TeddiursaAnimation:  INCLUDE "gfx/pokemon/teddiursa/anim.asm"
+UrsaringAnimation:   INCLUDE "gfx/pokemon/ursaring/anim.asm"
+SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim.asm"
+MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim.asm"
+SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim.asm"
+PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim.asm"
+CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim.asm"
+RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim.asm"
+OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim.asm"
+DelibirdAnimation:   INCLUDE "gfx/pokemon/delibird/anim.asm"
+MantineAnimation:    INCLUDE "gfx/pokemon/mantine/anim.asm"
+SkarmoryAnimation:   INCLUDE "gfx/pokemon/skarmory/anim.asm"
+HoundourAnimation:   INCLUDE "gfx/pokemon/houndour/anim.asm"
+HoundoomAnimation:   INCLUDE "gfx/pokemon/houndoom/anim.asm"
+KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim.asm"
+PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim.asm"
+DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim.asm"
+Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim.asm"
+StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim.asm"
+SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim.asm"
+TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim.asm"
+HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim.asm"
+SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim.asm"
+ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim.asm"
+MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim.asm"
+MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim.asm"
+BlisseyAnimation:    INCLUDE "gfx/pokemon/blissey/anim.asm"
+RaikouAnimation:     INCLUDE "gfx/pokemon/raikou/anim.asm"
+EnteiAnimation:      INCLUDE "gfx/pokemon/entei/anim.asm"
+SuicuneAnimation:    INCLUDE "gfx/pokemon/suicune/anim.asm"
+LarvitarAnimation:   INCLUDE "gfx/pokemon/larvitar/anim.asm"
+PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim.asm"
+TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim.asm"
+LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim.asm"
+HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim.asm"
+CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim.asm"
+EggAnimation:        INCLUDE "gfx/pokemon/egg/anim.asm"
diff --git a/gfx/pokemon/arbok/anim0.asm b/gfx/pokemon/arbok/anim.asm
index 0ceceacac..0ceceacac 100644
--- a/gfx/pokemon/arbok/anim0.asm
+++ b/gfx/pokemon/arbok/anim.asm
diff --git a/gfx/pokemon/arbok/anim1.asm b/gfx/pokemon/arbok/anim_idle.asm
index c9f85e238..c9f85e238 100644
--- a/gfx/pokemon/arbok/anim1.asm
+++ b/gfx/pokemon/arbok/anim_idle.asm
diff --git a/gfx/pokemon/arcanine/anim0.asm b/gfx/pokemon/arcanine/anim.asm
index 0dc0dcacc..0dc0dcacc 100644
--- a/gfx/pokemon/arcanine/anim0.asm
+++ b/gfx/pokemon/arcanine/anim.asm
diff --git a/gfx/pokemon/arcanine/anim1.asm b/gfx/pokemon/arcanine/anim_idle.asm
index e178a2d24..e178a2d24 100644
--- a/gfx/pokemon/arcanine/anim1.asm
+++ b/gfx/pokemon/arcanine/anim_idle.asm
diff --git a/gfx/pokemon/ariados/anim0.asm b/gfx/pokemon/ariados/anim.asm
index 9a4d30385..9a4d30385 100644
--- a/gfx/pokemon/ariados/anim0.asm
+++ b/gfx/pokemon/ariados/anim.asm
diff --git a/gfx/pokemon/ariados/anim1.asm b/gfx/pokemon/ariados/anim_idle.asm
index 6b9f416be..6b9f416be 100644
--- a/gfx/pokemon/ariados/anim1.asm
+++ b/gfx/pokemon/ariados/anim_idle.asm
diff --git a/gfx/pokemon/articuno/anim0.asm b/gfx/pokemon/articuno/anim.asm
index ccb583766..ccb583766 100644
--- a/gfx/pokemon/articuno/anim0.asm
+++ b/gfx/pokemon/articuno/anim.asm
diff --git a/gfx/pokemon/articuno/anim1.asm b/gfx/pokemon/articuno/anim_idle.asm
index 634d8daff..634d8daff 100644
--- a/gfx/pokemon/articuno/anim1.asm
+++ b/gfx/pokemon/articuno/anim_idle.asm
diff --git a/gfx/pokemon/azumarill/anim0.asm b/gfx/pokemon/azumarill/anim.asm
index bbe46d4b7..bbe46d4b7 100644
--- a/gfx/pokemon/azumarill/anim0.asm
+++ b/gfx/pokemon/azumarill/anim.asm
diff --git a/gfx/pokemon/azumarill/anim1.asm b/gfx/pokemon/azumarill/anim_idle.asm
index 070e6145f..070e6145f 100644
--- a/gfx/pokemon/azumarill/anim1.asm
+++ b/gfx/pokemon/azumarill/anim_idle.asm
diff --git a/gfx/pokemon/bayleef/anim0.asm b/gfx/pokemon/bayleef/anim.asm
index de54fe495..de54fe495 100644
--- a/gfx/pokemon/bayleef/anim0.asm
+++ b/gfx/pokemon/bayleef/anim.asm
diff --git a/gfx/pokemon/bayleef/anim1.asm b/gfx/pokemon/bayleef/anim_idle.asm
index 59d3f1762..59d3f1762 100644
--- a/gfx/pokemon/bayleef/anim1.asm
+++ b/gfx/pokemon/bayleef/anim_idle.asm
diff --git a/gfx/pokemon/beedrill/anim0.asm b/gfx/pokemon/beedrill/anim.asm
index 036fbb738..036fbb738 100644
--- a/gfx/pokemon/beedrill/anim0.asm
+++ b/gfx/pokemon/beedrill/anim.asm
diff --git a/gfx/pokemon/beedrill/anim1.asm b/gfx/pokemon/beedrill/anim_idle.asm
index 8205f9a8c..8205f9a8c 100644
--- a/gfx/pokemon/beedrill/anim1.asm
+++ b/gfx/pokemon/beedrill/anim_idle.asm
diff --git a/gfx/pokemon/bellossom/anim0.asm b/gfx/pokemon/bellossom/anim.asm
index 7aa2e3568..7aa2e3568 100644
--- a/gfx/pokemon/bellossom/anim0.asm
+++ b/gfx/pokemon/bellossom/anim.asm
diff --git a/gfx/pokemon/bellossom/anim1.asm b/gfx/pokemon/bellossom/anim_idle.asm
index 322fa3758..322fa3758 100644
--- a/gfx/pokemon/bellossom/anim1.asm
+++ b/gfx/pokemon/bellossom/anim_idle.asm
diff --git a/gfx/pokemon/bellsprout/anim0.asm b/gfx/pokemon/bellsprout/anim.asm
index 9a71b29ac..9a71b29ac 100644
--- a/gfx/pokemon/bellsprout/anim0.asm
+++ b/gfx/pokemon/bellsprout/anim.asm
diff --git a/gfx/pokemon/bellsprout/anim1.asm b/gfx/pokemon/bellsprout/anim_idle.asm
index 31ad26997..31ad26997 100644
--- a/gfx/pokemon/bellsprout/anim1.asm
+++ b/gfx/pokemon/bellsprout/anim_idle.asm
diff --git a/gfx/pokemon/blastoise/anim0.asm b/gfx/pokemon/blastoise/anim.asm
index 2d8b464d0..2d8b464d0 100644
--- a/gfx/pokemon/blastoise/anim0.asm
+++ b/gfx/pokemon/blastoise/anim.asm
diff --git a/gfx/pokemon/blastoise/anim1.asm b/gfx/pokemon/blastoise/anim_idle.asm
index b25c75e5a..b25c75e5a 100644
--- a/gfx/pokemon/blastoise/anim1.asm
+++ b/gfx/pokemon/blastoise/anim_idle.asm
diff --git a/gfx/pokemon/blissey/anim0.asm b/gfx/pokemon/blissey/anim.asm
index 097ecc094..097ecc094 100644
--- a/gfx/pokemon/blissey/anim0.asm
+++ b/gfx/pokemon/blissey/anim.asm
diff --git a/gfx/pokemon/blissey/anim1.asm b/gfx/pokemon/blissey/anim_idle.asm
index 846d85003..846d85003 100644
--- a/gfx/pokemon/blissey/anim1.asm
+++ b/gfx/pokemon/blissey/anim_idle.asm
diff --git a/gfx/pokemon/bulbasaur/anim0.asm b/gfx/pokemon/bulbasaur/anim.asm
index e5c1cbe1e..e5c1cbe1e 100644
--- a/gfx/pokemon/bulbasaur/anim0.asm
+++ b/gfx/pokemon/bulbasaur/anim.asm
diff --git a/gfx/pokemon/bulbasaur/anim1.asm b/gfx/pokemon/bulbasaur/anim_idle.asm
index cfc0f54e9..cfc0f54e9 100644
--- a/gfx/pokemon/bulbasaur/anim1.asm
+++ b/gfx/pokemon/bulbasaur/anim_idle.asm
diff --git a/gfx/pokemon/butterfree/anim0.asm b/gfx/pokemon/butterfree/anim.asm
index d31161a28..d31161a28 100644
--- a/gfx/pokemon/butterfree/anim0.asm
+++ b/gfx/pokemon/butterfree/anim.asm
diff --git a/gfx/pokemon/butterfree/anim1.asm b/gfx/pokemon/butterfree/anim_idle.asm
index 1eb152f28..1eb152f28 100644
--- a/gfx/pokemon/butterfree/anim1.asm
+++ b/gfx/pokemon/butterfree/anim_idle.asm
diff --git a/gfx/pokemon/caterpie/anim0.asm b/gfx/pokemon/caterpie/anim.asm
index a5cf5f238..a5cf5f238 100644
--- a/gfx/pokemon/caterpie/anim0.asm
+++ b/gfx/pokemon/caterpie/anim.asm
diff --git a/gfx/pokemon/caterpie/anim1.asm b/gfx/pokemon/caterpie/anim_idle.asm
index e75b83f5c..e75b83f5c 100644
--- a/gfx/pokemon/caterpie/anim1.asm
+++ b/gfx/pokemon/caterpie/anim_idle.asm
diff --git a/gfx/pokemon/celebi/anim0.asm b/gfx/pokemon/celebi/anim.asm
index 9f218a43e..9f218a43e 100644
--- a/gfx/pokemon/celebi/anim0.asm
+++ b/gfx/pokemon/celebi/anim.asm
diff --git a/gfx/pokemon/celebi/anim1.asm b/gfx/pokemon/celebi/anim_idle.asm
index 6162488db..6162488db 100644
--- a/gfx/pokemon/celebi/anim1.asm
+++ b/gfx/pokemon/celebi/anim_idle.asm
diff --git a/gfx/pokemon/chansey/anim0.asm b/gfx/pokemon/chansey/anim.asm
index 75de3b32b..75de3b32b 100644
--- a/gfx/pokemon/chansey/anim0.asm
+++ b/gfx/pokemon/chansey/anim.asm
diff --git a/gfx/pokemon/chansey/anim1.asm b/gfx/pokemon/chansey/anim_idle.asm
index a78f8cf88..a78f8cf88 100644
--- a/gfx/pokemon/chansey/anim1.asm
+++ b/gfx/pokemon/chansey/anim_idle.asm
diff --git a/gfx/pokemon/charizard/anim0.asm b/gfx/pokemon/charizard/anim.asm
index b258e35c7..b258e35c7 100644
--- a/gfx/pokemon/charizard/anim0.asm
+++ b/gfx/pokemon/charizard/anim.asm
diff --git a/gfx/pokemon/charizard/anim1.asm b/gfx/pokemon/charizard/anim_idle.asm
index daffccb9d..daffccb9d 100644
--- a/gfx/pokemon/charizard/anim1.asm
+++ b/gfx/pokemon/charizard/anim_idle.asm
diff --git a/gfx/pokemon/charmander/anim0.asm b/gfx/pokemon/charmander/anim.asm
index 72a0fe83d..72a0fe83d 100644
--- a/gfx/pokemon/charmander/anim0.asm
+++ b/gfx/pokemon/charmander/anim.asm
diff --git a/gfx/pokemon/charmander/anim1.asm b/gfx/pokemon/charmander/anim_idle.asm
index 219b5407f..219b5407f 100644
--- a/gfx/pokemon/charmander/anim1.asm
+++ b/gfx/pokemon/charmander/anim_idle.asm
diff --git a/gfx/pokemon/charmeleon/anim0.asm b/gfx/pokemon/charmeleon/anim.asm
index 30eeae979..30eeae979 100644
--- a/gfx/pokemon/charmeleon/anim0.asm
+++ b/gfx/pokemon/charmeleon/anim.asm
diff --git a/gfx/pokemon/charmeleon/anim1.asm b/gfx/pokemon/charmeleon/anim_idle.asm
index d3320e33c..d3320e33c 100644
--- a/gfx/pokemon/charmeleon/anim1.asm
+++ b/gfx/pokemon/charmeleon/anim_idle.asm
diff --git a/gfx/pokemon/chikorita/anim0.asm b/gfx/pokemon/chikorita/anim.asm
index 2b8fa7d35..2b8fa7d35 100644
--- a/gfx/pokemon/chikorita/anim0.asm
+++ b/gfx/pokemon/chikorita/anim.asm
diff --git a/gfx/pokemon/chikorita/anim1.asm b/gfx/pokemon/chikorita/anim_idle.asm
index 9003c3ff2..9003c3ff2 100644
--- a/gfx/pokemon/chikorita/anim1.asm
+++ b/gfx/pokemon/chikorita/anim_idle.asm
diff --git a/gfx/pokemon/chinchou/anim0.asm b/gfx/pokemon/chinchou/anim.asm
index f765c151a..f765c151a 100644
--- a/gfx/pokemon/chinchou/anim0.asm
+++ b/gfx/pokemon/chinchou/anim.asm
diff --git a/gfx/pokemon/chinchou/anim1.asm b/gfx/pokemon/chinchou/anim_idle.asm
index bf38f8d87..bf38f8d87 100644
--- a/gfx/pokemon/chinchou/anim1.asm
+++ b/gfx/pokemon/chinchou/anim_idle.asm
diff --git a/gfx/pokemon/clefable/anim0.asm b/gfx/pokemon/clefable/anim.asm
index d442807e8..d442807e8 100644
--- a/gfx/pokemon/clefable/anim0.asm
+++ b/gfx/pokemon/clefable/anim.asm
diff --git a/gfx/pokemon/clefable/anim1.asm b/gfx/pokemon/clefable/anim_idle.asm
index 2b024ffd8..2b024ffd8 100644
--- a/gfx/pokemon/clefable/anim1.asm
+++ b/gfx/pokemon/clefable/anim_idle.asm
diff --git a/gfx/pokemon/clefairy/anim0.asm b/gfx/pokemon/clefairy/anim.asm
index 9905c4fcc..9905c4fcc 100644
--- a/gfx/pokemon/clefairy/anim0.asm
+++ b/gfx/pokemon/clefairy/anim.asm
diff --git a/gfx/pokemon/clefairy/anim1.asm b/gfx/pokemon/clefairy/anim_idle.asm
index c93613467..c93613467 100644
--- a/gfx/pokemon/clefairy/anim1.asm
+++ b/gfx/pokemon/clefairy/anim_idle.asm
diff --git a/gfx/pokemon/cleffa/anim0.asm b/gfx/pokemon/cleffa/anim.asm
index 37f3da590..37f3da590 100644
--- a/gfx/pokemon/cleffa/anim0.asm
+++ b/gfx/pokemon/cleffa/anim.asm
diff --git a/gfx/pokemon/cleffa/anim1.asm b/gfx/pokemon/cleffa/anim_idle.asm
index 129f123c2..129f123c2 100644
--- a/gfx/pokemon/cleffa/anim1.asm
+++ b/gfx/pokemon/cleffa/anim_idle.asm
diff --git a/gfx/pokemon/cloyster/anim0.asm b/gfx/pokemon/cloyster/anim.asm
index cc338f014..cc338f014 100644
--- a/gfx/pokemon/cloyster/anim0.asm
+++ b/gfx/pokemon/cloyster/anim.asm
diff --git a/gfx/pokemon/cloyster/anim1.asm b/gfx/pokemon/cloyster/anim_idle.asm
index e872bbc59..e872bbc59 100644
--- a/gfx/pokemon/cloyster/anim1.asm
+++ b/gfx/pokemon/cloyster/anim_idle.asm
diff --git a/gfx/pokemon/corsola/anim0.asm b/gfx/pokemon/corsola/anim.asm
index 68182e18e..68182e18e 100644
--- a/gfx/pokemon/corsola/anim0.asm
+++ b/gfx/pokemon/corsola/anim.asm
diff --git a/gfx/pokemon/corsola/anim1.asm b/gfx/pokemon/corsola/anim_idle.asm
index 6360176ca..6360176ca 100644
--- a/gfx/pokemon/corsola/anim1.asm
+++ b/gfx/pokemon/corsola/anim_idle.asm
diff --git a/gfx/pokemon/crobat/anim0.asm b/gfx/pokemon/crobat/anim.asm
index 99888ab81..99888ab81 100644
--- a/gfx/pokemon/crobat/anim0.asm
+++ b/gfx/pokemon/crobat/anim.asm
diff --git a/gfx/pokemon/crobat/anim1.asm b/gfx/pokemon/crobat/anim_idle.asm
index ec1dae2ac..ec1dae2ac 100644
--- a/gfx/pokemon/crobat/anim1.asm
+++ b/gfx/pokemon/crobat/anim_idle.asm
diff --git a/gfx/pokemon/croconaw/anim0.asm b/gfx/pokemon/croconaw/anim.asm
index c487abfd9..c487abfd9 100644
--- a/gfx/pokemon/croconaw/anim0.asm
+++ b/gfx/pokemon/croconaw/anim.asm
diff --git a/gfx/pokemon/croconaw/anim1.asm b/gfx/pokemon/croconaw/anim_idle.asm
index 78bd8518e..78bd8518e 100644
--- a/gfx/pokemon/croconaw/anim1.asm
+++ b/gfx/pokemon/croconaw/anim_idle.asm
diff --git a/gfx/pokemon/cubone/anim0.asm b/gfx/pokemon/cubone/anim.asm
index 2af8c522c..2af8c522c 100644
--- a/gfx/pokemon/cubone/anim0.asm
+++ b/gfx/pokemon/cubone/anim.asm
diff --git a/gfx/pokemon/cubone/anim1.asm b/gfx/pokemon/cubone/anim_idle.asm
index fb3b0b3ba..fb3b0b3ba 100644
--- a/gfx/pokemon/cubone/anim1.asm
+++ b/gfx/pokemon/cubone/anim_idle.asm
diff --git a/gfx/pokemon/cyndaquil/anim0.asm b/gfx/pokemon/cyndaquil/anim.asm
index b069cc300..b069cc300 100644
--- a/gfx/pokemon/cyndaquil/anim0.asm
+++ b/gfx/pokemon/cyndaquil/anim.asm
diff --git a/gfx/pokemon/cyndaquil/anim1.asm b/gfx/pokemon/cyndaquil/anim_idle.asm
index 43c4d495a..43c4d495a 100644
--- a/gfx/pokemon/cyndaquil/anim1.asm
+++ b/gfx/pokemon/cyndaquil/anim_idle.asm
diff --git a/gfx/pokemon/delibird/anim0.asm b/gfx/pokemon/delibird/anim.asm
index 3431ad1ae..3431ad1ae 100644
--- a/gfx/pokemon/delibird/anim0.asm
+++ b/gfx/pokemon/delibird/anim.asm
diff --git a/gfx/pokemon/delibird/anim1.asm b/gfx/pokemon/delibird/anim_idle.asm
index 8a416cc61..8a416cc61 100644
--- a/gfx/pokemon/delibird/anim1.asm
+++ b/gfx/pokemon/delibird/anim_idle.asm
diff --git a/gfx/pokemon/dewgong/anim0.asm b/gfx/pokemon/dewgong/anim.asm
index b7c3efecf..b7c3efecf 100644
--- a/gfx/pokemon/dewgong/anim0.asm
+++ b/gfx/pokemon/dewgong/anim.asm
diff --git a/gfx/pokemon/dewgong/anim1.asm b/gfx/pokemon/dewgong/anim_idle.asm
index 0357ce660..0357ce660 100644
--- a/gfx/pokemon/dewgong/anim1.asm
+++ b/gfx/pokemon/dewgong/anim_idle.asm
diff --git a/gfx/pokemon/diglett/anim0.asm b/gfx/pokemon/diglett/anim.asm
index a4d79bd56..a4d79bd56 100644
--- a/gfx/pokemon/diglett/anim0.asm
+++ b/gfx/pokemon/diglett/anim.asm
diff --git a/gfx/pokemon/diglett/anim1.asm b/gfx/pokemon/diglett/anim_idle.asm
index bd2a27e03..bd2a27e03 100644
--- a/gfx/pokemon/diglett/anim1.asm
+++ b/gfx/pokemon/diglett/anim_idle.asm
diff --git a/gfx/pokemon/ditto/anim0.asm b/gfx/pokemon/ditto/anim.asm
index 53f3f9afa..53f3f9afa 100644
--- a/gfx/pokemon/ditto/anim0.asm
+++ b/gfx/pokemon/ditto/anim.asm
diff --git a/gfx/pokemon/ditto/anim1.asm b/gfx/pokemon/ditto/anim_idle.asm
index 195808be1..195808be1 100644
--- a/gfx/pokemon/ditto/anim1.asm
+++ b/gfx/pokemon/ditto/anim_idle.asm
diff --git a/gfx/pokemon/dodrio/anim0.asm b/gfx/pokemon/dodrio/anim.asm
index 539f896d7..539f896d7 100644
--- a/gfx/pokemon/dodrio/anim0.asm
+++ b/gfx/pokemon/dodrio/anim.asm
diff --git a/gfx/pokemon/dodrio/anim1.asm b/gfx/pokemon/dodrio/anim_idle.asm
index a921058f3..a921058f3 100644
--- a/gfx/pokemon/dodrio/anim1.asm
+++ b/gfx/pokemon/dodrio/anim_idle.asm
diff --git a/gfx/pokemon/doduo/anim0.asm b/gfx/pokemon/doduo/anim.asm
index cd38ca192..cd38ca192 100644
--- a/gfx/pokemon/doduo/anim0.asm
+++ b/gfx/pokemon/doduo/anim.asm
diff --git a/gfx/pokemon/doduo/anim1.asm b/gfx/pokemon/doduo/anim_idle.asm
index 89715cae8..89715cae8 100644
--- a/gfx/pokemon/doduo/anim1.asm
+++ b/gfx/pokemon/doduo/anim_idle.asm
diff --git a/gfx/pokemon/donphan/anim0.asm b/gfx/pokemon/donphan/anim.asm
index fbfbd8d17..fbfbd8d17 100644
--- a/gfx/pokemon/donphan/anim0.asm
+++ b/gfx/pokemon/donphan/anim.asm
diff --git a/gfx/pokemon/donphan/anim1.asm b/gfx/pokemon/donphan/anim_idle.asm
index 341013ce9..341013ce9 100644
--- a/gfx/pokemon/donphan/anim1.asm
+++ b/gfx/pokemon/donphan/anim_idle.asm
diff --git a/gfx/pokemon/dragonair/anim0.asm b/gfx/pokemon/dragonair/anim.asm
index b7a2be64d..b7a2be64d 100644
--- a/gfx/pokemon/dragonair/anim0.asm
+++ b/gfx/pokemon/dragonair/anim.asm
diff --git a/gfx/pokemon/dragonair/anim1.asm b/gfx/pokemon/dragonair/anim_idle.asm
index afea7ab43..afea7ab43 100644
--- a/gfx/pokemon/dragonair/anim1.asm
+++ b/gfx/pokemon/dragonair/anim_idle.asm
diff --git a/gfx/pokemon/dragonite/anim0.asm b/gfx/pokemon/dragonite/anim.asm
index 9dd6bf84a..9dd6bf84a 100644
--- a/gfx/pokemon/dragonite/anim0.asm
+++ b/gfx/pokemon/dragonite/anim.asm
diff --git a/gfx/pokemon/dragonite/anim1.asm b/gfx/pokemon/dragonite/anim_idle.asm
index fe0d7edbb..fe0d7edbb 100644
--- a/gfx/pokemon/dragonite/anim1.asm
+++ b/gfx/pokemon/dragonite/anim_idle.asm
diff --git a/gfx/pokemon/dratini/anim0.asm b/gfx/pokemon/dratini/anim.asm
index f844a2eec..f844a2eec 100644
--- a/gfx/pokemon/dratini/anim0.asm
+++ b/gfx/pokemon/dratini/anim.asm
diff --git a/gfx/pokemon/dratini/anim1.asm b/gfx/pokemon/dratini/anim_idle.asm
index 441340446..441340446 100644
--- a/gfx/pokemon/dratini/anim1.asm
+++ b/gfx/pokemon/dratini/anim_idle.asm
diff --git a/gfx/pokemon/drowzee/anim0.asm b/gfx/pokemon/drowzee/anim.asm
index badc99074..badc99074 100644
--- a/gfx/pokemon/drowzee/anim0.asm
+++ b/gfx/pokemon/drowzee/anim.asm
diff --git a/gfx/pokemon/drowzee/anim1.asm b/gfx/pokemon/drowzee/anim_idle.asm
index 247ecb8fe..247ecb8fe 100644
--- a/gfx/pokemon/drowzee/anim1.asm
+++ b/gfx/pokemon/drowzee/anim_idle.asm
diff --git a/gfx/pokemon/dugtrio/anim0.asm b/gfx/pokemon/dugtrio/anim.asm
index 7b5038620..7b5038620 100644
--- a/gfx/pokemon/dugtrio/anim0.asm
+++ b/gfx/pokemon/dugtrio/anim.asm
diff --git a/gfx/pokemon/dugtrio/anim1.asm b/gfx/pokemon/dugtrio/anim_idle.asm
index 1b32b854c..1b32b854c 100644
--- a/gfx/pokemon/dugtrio/anim1.asm
+++ b/gfx/pokemon/dugtrio/anim_idle.asm
diff --git a/gfx/pokemon/dunsparce/anim0.asm b/gfx/pokemon/dunsparce/anim.asm
index b4217afbd..b4217afbd 100644
--- a/gfx/pokemon/dunsparce/anim0.asm
+++ b/gfx/pokemon/dunsparce/anim.asm
diff --git a/gfx/pokemon/dunsparce/anim1.asm b/gfx/pokemon/dunsparce/anim_idle.asm
index f5d6d9b05..f5d6d9b05 100644
--- a/gfx/pokemon/dunsparce/anim1.asm
+++ b/gfx/pokemon/dunsparce/anim_idle.asm
diff --git a/gfx/pokemon/eevee/anim0.asm b/gfx/pokemon/eevee/anim.asm
index 537cefb83..537cefb83 100644
--- a/gfx/pokemon/eevee/anim0.asm
+++ b/gfx/pokemon/eevee/anim.asm
diff --git a/gfx/pokemon/eevee/anim1.asm b/gfx/pokemon/eevee/anim_idle.asm
index 0f50b3cb8..0f50b3cb8 100644
--- a/gfx/pokemon/eevee/anim1.asm
+++ b/gfx/pokemon/eevee/anim_idle.asm
diff --git a/gfx/pokemon/egg/anim0.asm b/gfx/pokemon/egg/anim.asm
index 1ded66327..1ded66327 100644
--- a/gfx/pokemon/egg/anim0.asm
+++ b/gfx/pokemon/egg/anim.asm
diff --git a/gfx/pokemon/egg/anim1.asm b/gfx/pokemon/egg/anim_idle.asm
index 634736c6b..634736c6b 100644
--- a/gfx/pokemon/egg/anim1.asm
+++ b/gfx/pokemon/egg/anim_idle.asm
diff --git a/gfx/pokemon/ekans/anim0.asm b/gfx/pokemon/ekans/anim.asm
index 9728434c0..9728434c0 100644
--- a/gfx/pokemon/ekans/anim0.asm
+++ b/gfx/pokemon/ekans/anim.asm
diff --git a/gfx/pokemon/ekans/anim1.asm b/gfx/pokemon/ekans/anim_idle.asm
index 660a4f971..660a4f971 100644
--- a/gfx/pokemon/ekans/anim1.asm
+++ b/gfx/pokemon/ekans/anim_idle.asm
diff --git a/gfx/pokemon/electabuzz/anim0.asm b/gfx/pokemon/electabuzz/anim.asm
index 4e2a550ed..4e2a550ed 100644
--- a/gfx/pokemon/electabuzz/anim0.asm
+++ b/gfx/pokemon/electabuzz/anim.asm
diff --git a/gfx/pokemon/electabuzz/anim1.asm b/gfx/pokemon/electabuzz/anim_idle.asm
index efff4b3db..efff4b3db 100644
--- a/gfx/pokemon/electabuzz/anim1.asm
+++ b/gfx/pokemon/electabuzz/anim_idle.asm
diff --git a/gfx/pokemon/electrode/anim0.asm b/gfx/pokemon/electrode/anim.asm
index 18b31e305..18b31e305 100644
--- a/gfx/pokemon/electrode/anim0.asm
+++ b/gfx/pokemon/electrode/anim.asm
diff --git a/gfx/pokemon/electrode/anim1.asm b/gfx/pokemon/electrode/anim_idle.asm
index 30d1b1788..30d1b1788 100644
--- a/gfx/pokemon/electrode/anim1.asm
+++ b/gfx/pokemon/electrode/anim_idle.asm
diff --git a/gfx/pokemon/elekid/anim0.asm b/gfx/pokemon/elekid/anim.asm
index 590dccf14..590dccf14 100644
--- a/gfx/pokemon/elekid/anim0.asm
+++ b/gfx/pokemon/elekid/anim.asm
diff --git a/gfx/pokemon/elekid/anim1.asm b/gfx/pokemon/elekid/anim_idle.asm
index cd10626f6..cd10626f6 100644
--- a/gfx/pokemon/elekid/anim1.asm
+++ b/gfx/pokemon/elekid/anim_idle.asm
diff --git a/gfx/pokemon/entei/anim0.asm b/gfx/pokemon/entei/anim.asm
index 66c2c128d..66c2c128d 100644
--- a/gfx/pokemon/entei/anim0.asm
+++ b/gfx/pokemon/entei/anim.asm
diff --git a/gfx/pokemon/entei/anim1.asm b/gfx/pokemon/entei/anim_idle.asm
index f20e5d072..f20e5d072 100644
--- a/gfx/pokemon/entei/anim1.asm
+++ b/gfx/pokemon/entei/anim_idle.asm
diff --git a/gfx/pokemon/espeon/anim0.asm b/gfx/pokemon/espeon/anim.asm
index 8a54a9b97..8a54a9b97 100644
--- a/gfx/pokemon/espeon/anim0.asm
+++ b/gfx/pokemon/espeon/anim.asm
diff --git a/gfx/pokemon/espeon/anim1.asm b/gfx/pokemon/espeon/anim_idle.asm
index 33c88d1b4..33c88d1b4 100644
--- a/gfx/pokemon/espeon/anim1.asm
+++ b/gfx/pokemon/espeon/anim_idle.asm
diff --git a/gfx/pokemon/exeggcute/anim0.asm b/gfx/pokemon/exeggcute/anim.asm
index 0f0c10729..0f0c10729 100644
--- a/gfx/pokemon/exeggcute/anim0.asm
+++ b/gfx/pokemon/exeggcute/anim.asm
diff --git a/gfx/pokemon/exeggcute/anim1.asm b/gfx/pokemon/exeggcute/anim_idle.asm
index ef839f5d1..ef839f5d1 100644
--- a/gfx/pokemon/exeggcute/anim1.asm
+++ b/gfx/pokemon/exeggcute/anim_idle.asm
diff --git a/gfx/pokemon/exeggutor/anim0.asm b/gfx/pokemon/exeggutor/anim.asm
index 92f11a117..92f11a117 100644
--- a/gfx/pokemon/exeggutor/anim0.asm
+++ b/gfx/pokemon/exeggutor/anim.asm
diff --git a/gfx/pokemon/exeggutor/anim1.asm b/gfx/pokemon/exeggutor/anim_idle.asm
index 3e5542c97..3e5542c97 100644
--- a/gfx/pokemon/exeggutor/anim1.asm
+++ b/gfx/pokemon/exeggutor/anim_idle.asm
diff --git a/gfx/pokemon/extra_pointers.asm b/gfx/pokemon/extra_pointers.asm
deleted file mode 100644
index 7afd95148..000000000
--- a/gfx/pokemon/extra_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-AnimationExtraPointers:
-	dw BulbasaurAnimationExtra
-	dw IvysaurAnimationExtra
-	dw VenusaurAnimationExtra
-	dw CharmanderAnimationExtra
-	dw CharmeleonAnimationExtra
-	dw CharizardAnimationExtra
-	dw SquirtleAnimationExtra
-	dw WartortleAnimationExtra
-	dw BlastoiseAnimationExtra
-	dw CaterpieAnimationExtra
-	dw MetapodAnimationExtra
-	dw ButterfreeAnimationExtra
-	dw WeedleAnimationExtra
-	dw KakunaAnimationExtra
-	dw BeedrillAnimationExtra
-	dw PidgeyAnimationExtra
-	dw PidgeottoAnimationExtra
-	dw PidgeotAnimationExtra
-	dw RattataAnimationExtra
-	dw RaticateAnimationExtra
-	dw SpearowAnimationExtra
-	dw FearowAnimationExtra
-	dw EkansAnimationExtra
-	dw ArbokAnimationExtra
-	dw PikachuAnimationExtra
-	dw RaichuAnimationExtra
-	dw SandshrewAnimationExtra
-	dw SandslashAnimationExtra
-	dw NidoranFAnimationExtra
-	dw NidorinaAnimationExtra
-	dw NidoqueenAnimationExtra
-	dw NidoranMAnimationExtra
-	dw NidorinoAnimationExtra
-	dw NidokingAnimationExtra
-	dw ClefairyAnimationExtra
-	dw ClefableAnimationExtra
-	dw VulpixAnimationExtra
-	dw NinetalesAnimationExtra
-	dw JigglypuffAnimationExtra
-	dw WigglytuffAnimationExtra
-	dw ZubatAnimationExtra
-	dw GolbatAnimationExtra
-	dw OddishAnimationExtra
-	dw GloomAnimationExtra
-	dw VileplumeAnimationExtra
-	dw ParasAnimationExtra
-	dw ParasectAnimationExtra
-	dw VenonatAnimationExtra
-	dw VenomothAnimationExtra
-	dw DiglettAnimationExtra
-	dw DugtrioAnimationExtra
-	dw MeowthAnimationExtra
-	dw PersianAnimationExtra
-	dw PsyduckAnimationExtra
-	dw GolduckAnimationExtra
-	dw MankeyAnimationExtra
-	dw PrimeapeAnimationExtra
-	dw GrowlitheAnimationExtra
-	dw ArcanineAnimationExtra
-	dw PoliwagAnimationExtra
-	dw PoliwhirlAnimationExtra
-	dw PoliwrathAnimationExtra
-	dw AbraAnimationExtra
-	dw KadabraAnimationExtra
-	dw AlakazamAnimationExtra
-	dw MachopAnimationExtra
-	dw MachokeAnimationExtra
-	dw MachampAnimationExtra
-	dw BellsproutAnimationExtra
-	dw WeepinbellAnimationExtra
-	dw VictreebelAnimationExtra
-	dw TentacoolAnimationExtra
-	dw TentacruelAnimationExtra
-	dw GeodudeAnimationExtra
-	dw GravelerAnimationExtra
-	dw GolemAnimationExtra
-	dw PonytaAnimationExtra
-	dw RapidashAnimationExtra
-	dw SlowpokeAnimationExtra
-	dw SlowbroAnimationExtra
-	dw MagnemiteAnimationExtra
-	dw MagnetonAnimationExtra
-	dw FarfetchDAnimationExtra
-	dw DoduoAnimationExtra
-	dw DodrioAnimationExtra
-	dw SeelAnimationExtra
-	dw DewgongAnimationExtra
-	dw GrimerAnimationExtra
-	dw MukAnimationExtra
-	dw ShellderAnimationExtra
-	dw CloysterAnimationExtra
-	dw GastlyAnimationExtra
-	dw HaunterAnimationExtra
-	dw GengarAnimationExtra
-	dw OnixAnimationExtra
-	dw DrowzeeAnimationExtra
-	dw HypnoAnimationExtra
-	dw KrabbyAnimationExtra
-	dw KinglerAnimationExtra
-	dw VoltorbAnimationExtra
-	dw ElectrodeAnimationExtra
-	dw ExeggcuteAnimationExtra
-	dw ExeggutorAnimationExtra
-	dw CuboneAnimationExtra
-	dw MarowakAnimationExtra
-	dw HitmonleeAnimationExtra
-	dw HitmonchanAnimationExtra
-	dw LickitungAnimationExtra
-	dw KoffingAnimationExtra
-	dw WeezingAnimationExtra
-	dw RhyhornAnimationExtra
-	dw RhydonAnimationExtra
-	dw ChanseyAnimationExtra
-	dw TangelaAnimationExtra
-	dw KangaskhanAnimationExtra
-	dw HorseaAnimationExtra
-	dw SeadraAnimationExtra
-	dw GoldeenAnimationExtra
-	dw SeakingAnimationExtra
-	dw StaryuAnimationExtra
-	dw StarmieAnimationExtra
-	dw MrMimeAnimationExtra
-	dw ScytherAnimationExtra
-	dw JynxAnimationExtra
-	dw ElectabuzzAnimationExtra
-	dw MagmarAnimationExtra
-	dw PinsirAnimationExtra
-	dw TaurosAnimationExtra
-	dw MagikarpAnimationExtra
-	dw GyaradosAnimationExtra
-	dw LaprasAnimationExtra
-	dw DittoAnimationExtra
-	dw EeveeAnimationExtra
-	dw VaporeonAnimationExtra
-	dw JolteonAnimationExtra
-	dw FlareonAnimationExtra
-	dw PorygonAnimationExtra
-	dw OmanyteAnimationExtra
-	dw OmastarAnimationExtra
-	dw KabutoAnimationExtra
-	dw KabutopsAnimationExtra
-	dw AerodactylAnimationExtra
-	dw SnorlaxAnimationExtra
-	dw ArticunoAnimationExtra
-	dw ZapdosAnimationExtra
-	dw MoltresAnimationExtra
-	dw DratiniAnimationExtra
-	dw DragonairAnimationExtra
-	dw DragoniteAnimationExtra
-	dw MewtwoAnimationExtra
-	dw MewAnimationExtra
-	dw ChikoritaAnimationExtra
-	dw BayleefAnimationExtra
-	dw MeganiumAnimationExtra
-	dw CyndaquilAnimationExtra
-	dw QuilavaAnimationExtra
-	dw TyphlosionAnimationExtra
-	dw TotodileAnimationExtra
-	dw CroconawAnimationExtra
-	dw FeraligatrAnimationExtra
-	dw SentretAnimationExtra
-	dw FurretAnimationExtra
-	dw HoothootAnimationExtra
-	dw NoctowlAnimationExtra
-	dw LedybaAnimationExtra
-	dw LedianAnimationExtra
-	dw SpinarakAnimationExtra
-	dw AriadosAnimationExtra
-	dw CrobatAnimationExtra
-	dw ChinchouAnimationExtra
-	dw LanturnAnimationExtra
-	dw PichuAnimationExtra
-	dw CleffaAnimationExtra
-	dw IgglybuffAnimationExtra
-	dw TogepiAnimationExtra
-	dw TogeticAnimationExtra
-	dw NatuAnimationExtra
-	dw XatuAnimationExtra
-	dw MareepAnimationExtra
-	dw FlaaffyAnimationExtra
-	dw AmpharosAnimationExtra
-	dw BellossomAnimationExtra
-	dw MarillAnimationExtra
-	dw AzumarillAnimationExtra
-	dw SudowoodoAnimationExtra
-	dw PolitoedAnimationExtra
-	dw HoppipAnimationExtra
-	dw SkiploomAnimationExtra
-	dw JumpluffAnimationExtra
-	dw AipomAnimationExtra
-	dw SunkernAnimationExtra
-	dw SunfloraAnimationExtra
-	dw YanmaAnimationExtra
-	dw WooperAnimationExtra
-	dw QuagsireAnimationExtra
-	dw EspeonAnimationExtra
-	dw UmbreonAnimationExtra
-	dw MurkrowAnimationExtra
-	dw SlowkingAnimationExtra
-	dw MisdreavusAnimationExtra
-	dw UnownAnimationExtra
-	dw WobbuffetAnimationExtra
-	dw GirafarigAnimationExtra
-	dw PinecoAnimationExtra
-	dw ForretressAnimationExtra
-	dw DunsparceAnimationExtra
-	dw GligarAnimationExtra
-	dw SteelixAnimationExtra
-	dw SnubbullAnimationExtra
-	dw GranbullAnimationExtra
-	dw QwilfishAnimationExtra
-	dw ScizorAnimationExtra
-	dw ShuckleAnimationExtra
-	dw HeracrossAnimationExtra
-	dw SneaselAnimationExtra
-	dw TeddiursaAnimationExtra
-	dw UrsaringAnimationExtra
-	dw SlugmaAnimationExtra
-	dw MagcargoAnimationExtra
-	dw SwinubAnimationExtra
-	dw PiloswineAnimationExtra
-	dw CorsolaAnimationExtra
-	dw RemoraidAnimationExtra
-	dw OctilleryAnimationExtra
-	dw DelibirdAnimationExtra
-	dw MantineAnimationExtra
-	dw SkarmoryAnimationExtra
-	dw HoundourAnimationExtra
-	dw HoundoomAnimationExtra
-	dw KingdraAnimationExtra
-	dw PhanpyAnimationExtra
-	dw DonphanAnimationExtra
-	dw Porygon2AnimationExtra
-	dw StantlerAnimationExtra
-	dw SmeargleAnimationExtra
-	dw TyrogueAnimationExtra
-	dw HitmontopAnimationExtra
-	dw SmoochumAnimationExtra
-	dw ElekidAnimationExtra
-	dw MagbyAnimationExtra
-	dw MiltankAnimationExtra
-	dw BlisseyAnimationExtra
-	dw RaikouAnimationExtra
-	dw EnteiAnimationExtra
-	dw SuicuneAnimationExtra
-	dw LarvitarAnimationExtra
-	dw PupitarAnimationExtra
-	dw TyranitarAnimationExtra
-	dw LugiaAnimationExtra
-	dw HoOhAnimationExtra
-	dw CelebiAnimationExtra
diff --git a/gfx/pokemon/extras.asm b/gfx/pokemon/extras.asm
deleted file mode 100644
index 88cb6a77b..000000000
--- a/gfx/pokemon/extras.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurAnimationExtra:  INCLUDE "gfx/pokemon/bulbasaur/anim1.asm"
-IvysaurAnimationExtra:    INCLUDE "gfx/pokemon/ivysaur/anim1.asm"
-VenusaurAnimationExtra:   INCLUDE "gfx/pokemon/venusaur/anim1.asm"
-CharmanderAnimationExtra: INCLUDE "gfx/pokemon/charmander/anim1.asm"
-CharmeleonAnimationExtra: INCLUDE "gfx/pokemon/charmeleon/anim1.asm"
-CharizardAnimationExtra:  INCLUDE "gfx/pokemon/charizard/anim1.asm"
-SquirtleAnimationExtra:   INCLUDE "gfx/pokemon/squirtle/anim1.asm"
-WartortleAnimationExtra:  INCLUDE "gfx/pokemon/wartortle/anim1.asm"
-BlastoiseAnimationExtra:  INCLUDE "gfx/pokemon/blastoise/anim1.asm"
-CaterpieAnimationExtra:   INCLUDE "gfx/pokemon/caterpie/anim1.asm"
-MetapodAnimationExtra:    INCLUDE "gfx/pokemon/metapod/anim1.asm"
-ButterfreeAnimationExtra: INCLUDE "gfx/pokemon/butterfree/anim1.asm"
-WeedleAnimationExtra:     INCLUDE "gfx/pokemon/weedle/anim1.asm"
-KakunaAnimationExtra:     INCLUDE "gfx/pokemon/kakuna/anim1.asm"
-BeedrillAnimationExtra:   INCLUDE "gfx/pokemon/beedrill/anim1.asm"
-PidgeyAnimationExtra:     INCLUDE "gfx/pokemon/pidgey/anim1.asm"
-PidgeottoAnimationExtra:  INCLUDE "gfx/pokemon/pidgeotto/anim1.asm"
-PidgeotAnimationExtra:    INCLUDE "gfx/pokemon/pidgeot/anim1.asm"
-RattataAnimationExtra:    INCLUDE "gfx/pokemon/rattata/anim1.asm"
-RaticateAnimationExtra:   INCLUDE "gfx/pokemon/raticate/anim1.asm"
-SpearowAnimationExtra:    INCLUDE "gfx/pokemon/spearow/anim1.asm"
-FearowAnimationExtra:     INCLUDE "gfx/pokemon/fearow/anim1.asm"
-EkansAnimationExtra:      INCLUDE "gfx/pokemon/ekans/anim1.asm"
-ArbokAnimationExtra:      INCLUDE "gfx/pokemon/arbok/anim1.asm"
-PikachuAnimationExtra:    INCLUDE "gfx/pokemon/pikachu/anim1.asm"
-RaichuAnimationExtra:     INCLUDE "gfx/pokemon/raichu/anim1.asm"
-SandshrewAnimationExtra:  INCLUDE "gfx/pokemon/sandshrew/anim1.asm"
-SandslashAnimationExtra:  INCLUDE "gfx/pokemon/sandslash/anim1.asm"
-NidoranFAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_f/anim1.asm"
-NidorinaAnimationExtra:   INCLUDE "gfx/pokemon/nidorina/anim1.asm"
-NidoqueenAnimationExtra:  INCLUDE "gfx/pokemon/nidoqueen/anim1.asm"
-NidoranMAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_m/anim1.asm"
-NidorinoAnimationExtra:   INCLUDE "gfx/pokemon/nidorino/anim1.asm"
-NidokingAnimationExtra:   INCLUDE "gfx/pokemon/nidoking/anim1.asm"
-ClefairyAnimationExtra:   INCLUDE "gfx/pokemon/clefairy/anim1.asm"
-ClefableAnimationExtra:   INCLUDE "gfx/pokemon/clefable/anim1.asm"
-VulpixAnimationExtra:     INCLUDE "gfx/pokemon/vulpix/anim1.asm"
-NinetalesAnimationExtra:  INCLUDE "gfx/pokemon/ninetales/anim1.asm"
-JigglypuffAnimationExtra: INCLUDE "gfx/pokemon/jigglypuff/anim1.asm"
-WigglytuffAnimationExtra: INCLUDE "gfx/pokemon/wigglytuff/anim1.asm"
-ZubatAnimationExtra:      INCLUDE "gfx/pokemon/zubat/anim1.asm"
-GolbatAnimationExtra:     INCLUDE "gfx/pokemon/golbat/anim1.asm"
-OddishAnimationExtra:     INCLUDE "gfx/pokemon/oddish/anim1.asm"
-GloomAnimationExtra:      INCLUDE "gfx/pokemon/gloom/anim1.asm"
-VileplumeAnimationExtra:  INCLUDE "gfx/pokemon/vileplume/anim1.asm"
-ParasAnimationExtra:      INCLUDE "gfx/pokemon/paras/anim1.asm"
-ParasectAnimationExtra:   INCLUDE "gfx/pokemon/parasect/anim1.asm"
-VenonatAnimationExtra:    INCLUDE "gfx/pokemon/venonat/anim1.asm"
-VenomothAnimationExtra:   INCLUDE "gfx/pokemon/venomoth/anim1.asm"
-DiglettAnimationExtra:    INCLUDE "gfx/pokemon/diglett/anim1.asm"
-DugtrioAnimationExtra:    INCLUDE "gfx/pokemon/dugtrio/anim1.asm"
-MeowthAnimationExtra:     INCLUDE "gfx/pokemon/meowth/anim1.asm"
-PersianAnimationExtra:    INCLUDE "gfx/pokemon/persian/anim1.asm"
-PsyduckAnimationExtra:    INCLUDE "gfx/pokemon/psyduck/anim1.asm"
-GolduckAnimationExtra:    INCLUDE "gfx/pokemon/golduck/anim1.asm"
-MankeyAnimationExtra:     INCLUDE "gfx/pokemon/mankey/anim1.asm"
-PrimeapeAnimationExtra:   INCLUDE "gfx/pokemon/primeape/anim1.asm"
-GrowlitheAnimationExtra:  INCLUDE "gfx/pokemon/growlithe/anim1.asm"
-ArcanineAnimationExtra:   INCLUDE "gfx/pokemon/arcanine/anim1.asm"
-PoliwagAnimationExtra:    INCLUDE "gfx/pokemon/poliwag/anim1.asm"
-PoliwhirlAnimationExtra:  INCLUDE "gfx/pokemon/poliwhirl/anim1.asm"
-PoliwrathAnimationExtra:  INCLUDE "gfx/pokemon/poliwrath/anim1.asm"
-AbraAnimationExtra:       INCLUDE "gfx/pokemon/abra/anim1.asm"
-KadabraAnimationExtra:    INCLUDE "gfx/pokemon/kadabra/anim1.asm"
-AlakazamAnimationExtra:   INCLUDE "gfx/pokemon/alakazam/anim1.asm"
-MachopAnimationExtra:     INCLUDE "gfx/pokemon/machop/anim1.asm"
-MachokeAnimationExtra:    INCLUDE "gfx/pokemon/machoke/anim1.asm"
-MachampAnimationExtra:    INCLUDE "gfx/pokemon/machamp/anim1.asm"
-BellsproutAnimationExtra: INCLUDE "gfx/pokemon/bellsprout/anim1.asm"
-WeepinbellAnimationExtra: INCLUDE "gfx/pokemon/weepinbell/anim1.asm"
-VictreebelAnimationExtra: INCLUDE "gfx/pokemon/victreebel/anim1.asm"
-TentacoolAnimationExtra:  INCLUDE "gfx/pokemon/tentacool/anim1.asm"
-TentacruelAnimationExtra: INCLUDE "gfx/pokemon/tentacruel/anim1.asm"
-GeodudeAnimationExtra:    INCLUDE "gfx/pokemon/geodude/anim1.asm"
-GravelerAnimationExtra:   INCLUDE "gfx/pokemon/graveler/anim1.asm"
-GolemAnimationExtra:      INCLUDE "gfx/pokemon/golem/anim1.asm"
-PonytaAnimationExtra:     INCLUDE "gfx/pokemon/ponyta/anim1.asm"
-RapidashAnimationExtra:   INCLUDE "gfx/pokemon/rapidash/anim1.asm"
-SlowpokeAnimationExtra:   INCLUDE "gfx/pokemon/slowpoke/anim1.asm"
-SlowbroAnimationExtra:    INCLUDE "gfx/pokemon/slowbro/anim1.asm"
-MagnemiteAnimationExtra:  INCLUDE "gfx/pokemon/magnemite/anim1.asm"
-MagnetonAnimationExtra:   INCLUDE "gfx/pokemon/magneton/anim1.asm"
-FarfetchDAnimationExtra:  INCLUDE "gfx/pokemon/farfetch_d/anim1.asm"
-DoduoAnimationExtra:      INCLUDE "gfx/pokemon/doduo/anim1.asm"
-DodrioAnimationExtra:     INCLUDE "gfx/pokemon/dodrio/anim1.asm"
-SeelAnimationExtra:       INCLUDE "gfx/pokemon/seel/anim1.asm"
-DewgongAnimationExtra:    INCLUDE "gfx/pokemon/dewgong/anim1.asm"
-GrimerAnimationExtra:     INCLUDE "gfx/pokemon/grimer/anim1.asm"
-MukAnimationExtra:        INCLUDE "gfx/pokemon/muk/anim1.asm"
-ShellderAnimationExtra:   INCLUDE "gfx/pokemon/shellder/anim1.asm"
-CloysterAnimationExtra:   INCLUDE "gfx/pokemon/cloyster/anim1.asm"
-GastlyAnimationExtra:     INCLUDE "gfx/pokemon/gastly/anim1.asm"
-HaunterAnimationExtra:    INCLUDE "gfx/pokemon/haunter/anim1.asm"
-GengarAnimationExtra:     INCLUDE "gfx/pokemon/gengar/anim1.asm"
-OnixAnimationExtra:       INCLUDE "gfx/pokemon/onix/anim1.asm"
-DrowzeeAnimationExtra:    INCLUDE "gfx/pokemon/drowzee/anim1.asm"
-HypnoAnimationExtra:      INCLUDE "gfx/pokemon/hypno/anim1.asm"
-KrabbyAnimationExtra:     INCLUDE "gfx/pokemon/krabby/anim1.asm"
-KinglerAnimationExtra:    INCLUDE "gfx/pokemon/kingler/anim1.asm"
-VoltorbAnimationExtra:    INCLUDE "gfx/pokemon/voltorb/anim1.asm"
-ElectrodeAnimationExtra:  INCLUDE "gfx/pokemon/electrode/anim1.asm"
-ExeggcuteAnimationExtra:  INCLUDE "gfx/pokemon/exeggcute/anim1.asm"
-ExeggutorAnimationExtra:  INCLUDE "gfx/pokemon/exeggutor/anim1.asm"
-CuboneAnimationExtra:     INCLUDE "gfx/pokemon/cubone/anim1.asm"
-MarowakAnimationExtra:    INCLUDE "gfx/pokemon/marowak/anim1.asm"
-HitmonleeAnimationExtra:  INCLUDE "gfx/pokemon/hitmonlee/anim1.asm"
-HitmonchanAnimationExtra: INCLUDE "gfx/pokemon/hitmonchan/anim1.asm"
-LickitungAnimationExtra:  INCLUDE "gfx/pokemon/lickitung/anim1.asm"
-KoffingAnimationExtra:    INCLUDE "gfx/pokemon/koffing/anim1.asm"
-WeezingAnimationExtra:    INCLUDE "gfx/pokemon/weezing/anim1.asm"
-RhyhornAnimationExtra:    INCLUDE "gfx/pokemon/rhyhorn/anim1.asm"
-RhydonAnimationExtra:     INCLUDE "gfx/pokemon/rhydon/anim1.asm"
-ChanseyAnimationExtra:    INCLUDE "gfx/pokemon/chansey/anim1.asm"
-TangelaAnimationExtra:    INCLUDE "gfx/pokemon/tangela/anim1.asm"
-KangaskhanAnimationExtra: INCLUDE "gfx/pokemon/kangaskhan/anim1.asm"
-HorseaAnimationExtra:     INCLUDE "gfx/pokemon/horsea/anim1.asm"
-SeadraAnimationExtra:     INCLUDE "gfx/pokemon/seadra/anim1.asm"
-GoldeenAnimationExtra:    INCLUDE "gfx/pokemon/goldeen/anim1.asm"
-SeakingAnimationExtra:    INCLUDE "gfx/pokemon/seaking/anim1.asm"
-StaryuAnimationExtra:     INCLUDE "gfx/pokemon/staryu/anim1.asm"
-StarmieAnimationExtra:    INCLUDE "gfx/pokemon/starmie/anim1.asm"
-MrMimeAnimationExtra:     INCLUDE "gfx/pokemon/mr__mime/anim1.asm"
-ScytherAnimationExtra:    INCLUDE "gfx/pokemon/scyther/anim1.asm"
-JynxAnimationExtra:       INCLUDE "gfx/pokemon/jynx/anim1.asm"
-ElectabuzzAnimationExtra: INCLUDE "gfx/pokemon/electabuzz/anim1.asm"
-MagmarAnimationExtra:     INCLUDE "gfx/pokemon/magmar/anim1.asm"
-PinsirAnimationExtra:     INCLUDE "gfx/pokemon/pinsir/anim1.asm"
-TaurosAnimationExtra:     INCLUDE "gfx/pokemon/tauros/anim1.asm"
-MagikarpAnimationExtra:   INCLUDE "gfx/pokemon/magikarp/anim1.asm"
-GyaradosAnimationExtra:   INCLUDE "gfx/pokemon/gyarados/anim1.asm"
-LaprasAnimationExtra:     INCLUDE "gfx/pokemon/lapras/anim1.asm"
-DittoAnimationExtra:      INCLUDE "gfx/pokemon/ditto/anim1.asm"
-EeveeAnimationExtra:      INCLUDE "gfx/pokemon/eevee/anim1.asm"
-VaporeonAnimationExtra:   INCLUDE "gfx/pokemon/vaporeon/anim1.asm"
-JolteonAnimationExtra:    INCLUDE "gfx/pokemon/jolteon/anim1.asm"
-FlareonAnimationExtra:    INCLUDE "gfx/pokemon/flareon/anim1.asm"
-PorygonAnimationExtra:    INCLUDE "gfx/pokemon/porygon/anim1.asm"
-OmanyteAnimationExtra:    INCLUDE "gfx/pokemon/omanyte/anim1.asm"
-OmastarAnimationExtra:    INCLUDE "gfx/pokemon/omastar/anim1.asm"
-KabutoAnimationExtra:     INCLUDE "gfx/pokemon/kabuto/anim1.asm"
-KabutopsAnimationExtra:   INCLUDE "gfx/pokemon/kabutops/anim1.asm"
-AerodactylAnimationExtra: INCLUDE "gfx/pokemon/aerodactyl/anim1.asm"
-SnorlaxAnimationExtra:    INCLUDE "gfx/pokemon/snorlax/anim1.asm"
-ArticunoAnimationExtra:   INCLUDE "gfx/pokemon/articuno/anim1.asm"
-ZapdosAnimationExtra:     INCLUDE "gfx/pokemon/zapdos/anim1.asm"
-MoltresAnimationExtra:    INCLUDE "gfx/pokemon/moltres/anim1.asm"
-DratiniAnimationExtra:    INCLUDE "gfx/pokemon/dratini/anim1.asm"
-DragonairAnimationExtra:  INCLUDE "gfx/pokemon/dragonair/anim1.asm"
-DragoniteAnimationExtra:  INCLUDE "gfx/pokemon/dragonite/anim1.asm"
-MewtwoAnimationExtra:     INCLUDE "gfx/pokemon/mewtwo/anim1.asm"
-MewAnimationExtra:        INCLUDE "gfx/pokemon/mew/anim1.asm"
-ChikoritaAnimationExtra:  INCLUDE "gfx/pokemon/chikorita/anim1.asm"
-BayleefAnimationExtra:    INCLUDE "gfx/pokemon/bayleef/anim1.asm"
-MeganiumAnimationExtra:   INCLUDE "gfx/pokemon/meganium/anim1.asm"
-CyndaquilAnimationExtra:  INCLUDE "gfx/pokemon/cyndaquil/anim1.asm"
-QuilavaAnimationExtra:    INCLUDE "gfx/pokemon/quilava/anim1.asm"
-TyphlosionAnimationExtra: INCLUDE "gfx/pokemon/typhlosion/anim1.asm"
-TotodileAnimationExtra:   INCLUDE "gfx/pokemon/totodile/anim1.asm"
-CroconawAnimationExtra:   INCLUDE "gfx/pokemon/croconaw/anim1.asm"
-FeraligatrAnimationExtra: INCLUDE "gfx/pokemon/feraligatr/anim1.asm"
-SentretAnimationExtra:    INCLUDE "gfx/pokemon/sentret/anim1.asm"
-FurretAnimationExtra:     INCLUDE "gfx/pokemon/furret/anim1.asm"
-HoothootAnimationExtra:   INCLUDE "gfx/pokemon/hoothoot/anim1.asm"
-NoctowlAnimationExtra:    INCLUDE "gfx/pokemon/noctowl/anim1.asm"
-LedybaAnimationExtra:     INCLUDE "gfx/pokemon/ledyba/anim1.asm"
-LedianAnimationExtra:     INCLUDE "gfx/pokemon/ledian/anim1.asm"
-SpinarakAnimationExtra:   INCLUDE "gfx/pokemon/spinarak/anim1.asm"
-AriadosAnimationExtra:    INCLUDE "gfx/pokemon/ariados/anim1.asm"
-CrobatAnimationExtra:     INCLUDE "gfx/pokemon/crobat/anim1.asm"
-ChinchouAnimationExtra:   INCLUDE "gfx/pokemon/chinchou/anim1.asm"
-LanturnAnimationExtra:    INCLUDE "gfx/pokemon/lanturn/anim1.asm"
-PichuAnimationExtra:      INCLUDE "gfx/pokemon/pichu/anim1.asm"
-CleffaAnimationExtra:     INCLUDE "gfx/pokemon/cleffa/anim1.asm"
-IgglybuffAnimationExtra:  INCLUDE "gfx/pokemon/igglybuff/anim1.asm"
-TogepiAnimationExtra:     INCLUDE "gfx/pokemon/togepi/anim1.asm"
-TogeticAnimationExtra:    INCLUDE "gfx/pokemon/togetic/anim1.asm"
-NatuAnimationExtra:       INCLUDE "gfx/pokemon/natu/anim1.asm"
-XatuAnimationExtra:       INCLUDE "gfx/pokemon/xatu/anim1.asm"
-MareepAnimationExtra:     INCLUDE "gfx/pokemon/mareep/anim1.asm"
-FlaaffyAnimationExtra:    INCLUDE "gfx/pokemon/flaaffy/anim1.asm"
-AmpharosAnimationExtra:   INCLUDE "gfx/pokemon/ampharos/anim1.asm"
-BellossomAnimationExtra:  INCLUDE "gfx/pokemon/bellossom/anim1.asm"
-MarillAnimationExtra:     INCLUDE "gfx/pokemon/marill/anim1.asm"
-AzumarillAnimationExtra:  INCLUDE "gfx/pokemon/azumarill/anim1.asm"
-SudowoodoAnimationExtra:  INCLUDE "gfx/pokemon/sudowoodo/anim1.asm"
-PolitoedAnimationExtra:   INCLUDE "gfx/pokemon/politoed/anim1.asm"
-HoppipAnimationExtra:     INCLUDE "gfx/pokemon/hoppip/anim1.asm"
-SkiploomAnimationExtra:   INCLUDE "gfx/pokemon/skiploom/anim1.asm"
-JumpluffAnimationExtra:   INCLUDE "gfx/pokemon/jumpluff/anim1.asm"
-AipomAnimationExtra:      INCLUDE "gfx/pokemon/aipom/anim1.asm"
-SunkernAnimationExtra:    INCLUDE "gfx/pokemon/sunkern/anim1.asm"
-SunfloraAnimationExtra:   INCLUDE "gfx/pokemon/sunflora/anim1.asm"
-YanmaAnimationExtra:      INCLUDE "gfx/pokemon/yanma/anim1.asm"
-WooperAnimationExtra:     INCLUDE "gfx/pokemon/wooper/anim1.asm"
-QuagsireAnimationExtra:   INCLUDE "gfx/pokemon/quagsire/anim1.asm"
-EspeonAnimationExtra:     INCLUDE "gfx/pokemon/espeon/anim1.asm"
-UmbreonAnimationExtra:    INCLUDE "gfx/pokemon/umbreon/anim1.asm"
-MurkrowAnimationExtra:    INCLUDE "gfx/pokemon/murkrow/anim1.asm"
-SlowkingAnimationExtra:   INCLUDE "gfx/pokemon/slowking/anim1.asm"
-MisdreavusAnimationExtra: INCLUDE "gfx/pokemon/misdreavus/anim1.asm"
-UnownAnimationExtra:      INCLUDE "gfx/pokemon/unown/anim1.asm"
-WobbuffetAnimationExtra:  INCLUDE "gfx/pokemon/wobbuffet/anim1.asm"
-GirafarigAnimationExtra:  INCLUDE "gfx/pokemon/girafarig/anim1.asm"
-PinecoAnimationExtra:     INCLUDE "gfx/pokemon/pineco/anim1.asm"
-ForretressAnimationExtra: INCLUDE "gfx/pokemon/forretress/anim1.asm"
-DunsparceAnimationExtra:  INCLUDE "gfx/pokemon/dunsparce/anim1.asm"
-GligarAnimationExtra:     INCLUDE "gfx/pokemon/gligar/anim1.asm"
-SteelixAnimationExtra:    INCLUDE "gfx/pokemon/steelix/anim1.asm"
-SnubbullAnimationExtra:   INCLUDE "gfx/pokemon/snubbull/anim1.asm"
-GranbullAnimationExtra:   INCLUDE "gfx/pokemon/granbull/anim1.asm"
-QwilfishAnimationExtra:   INCLUDE "gfx/pokemon/qwilfish/anim1.asm"
-ScizorAnimationExtra:     INCLUDE "gfx/pokemon/scizor/anim1.asm"
-ShuckleAnimationExtra:    INCLUDE "gfx/pokemon/shuckle/anim1.asm"
-HeracrossAnimationExtra:  INCLUDE "gfx/pokemon/heracross/anim1.asm"
-SneaselAnimationExtra:    INCLUDE "gfx/pokemon/sneasel/anim1.asm"
-TeddiursaAnimationExtra:  INCLUDE "gfx/pokemon/teddiursa/anim1.asm"
-UrsaringAnimationExtra:   INCLUDE "gfx/pokemon/ursaring/anim1.asm"
-SlugmaAnimationExtra:     INCLUDE "gfx/pokemon/slugma/anim1.asm"
-MagcargoAnimationExtra:   INCLUDE "gfx/pokemon/magcargo/anim1.asm"
-SwinubAnimationExtra:     INCLUDE "gfx/pokemon/swinub/anim1.asm"
-PiloswineAnimationExtra:  INCLUDE "gfx/pokemon/piloswine/anim1.asm"
-CorsolaAnimationExtra:    INCLUDE "gfx/pokemon/corsola/anim1.asm"
-RemoraidAnimationExtra:   INCLUDE "gfx/pokemon/remoraid/anim1.asm"
-OctilleryAnimationExtra:  INCLUDE "gfx/pokemon/octillery/anim1.asm"
-DelibirdAnimationExtra:   INCLUDE "gfx/pokemon/delibird/anim1.asm"
-MantineAnimationExtra:    INCLUDE "gfx/pokemon/mantine/anim1.asm"
-SkarmoryAnimationExtra:   INCLUDE "gfx/pokemon/skarmory/anim1.asm"
-HoundourAnimationExtra:   INCLUDE "gfx/pokemon/houndour/anim1.asm"
-HoundoomAnimationExtra:   INCLUDE "gfx/pokemon/houndoom/anim1.asm"
-KingdraAnimationExtra:    INCLUDE "gfx/pokemon/kingdra/anim1.asm"
-PhanpyAnimationExtra:     INCLUDE "gfx/pokemon/phanpy/anim1.asm"
-DonphanAnimationExtra:    INCLUDE "gfx/pokemon/donphan/anim1.asm"
-Porygon2AnimationExtra:   INCLUDE "gfx/pokemon/porygon2/anim1.asm"
-StantlerAnimationExtra:   INCLUDE "gfx/pokemon/stantler/anim1.asm"
-SmeargleAnimationExtra:   INCLUDE "gfx/pokemon/smeargle/anim1.asm"
-TyrogueAnimationExtra:    INCLUDE "gfx/pokemon/tyrogue/anim1.asm"
-HitmontopAnimationExtra:  INCLUDE "gfx/pokemon/hitmontop/anim1.asm"
-SmoochumAnimationExtra:   INCLUDE "gfx/pokemon/smoochum/anim1.asm"
-ElekidAnimationExtra:     INCLUDE "gfx/pokemon/elekid/anim1.asm"
-MagbyAnimationExtra:      INCLUDE "gfx/pokemon/magby/anim1.asm"
-MiltankAnimationExtra:    INCLUDE "gfx/pokemon/miltank/anim1.asm"
-BlisseyAnimationExtra:    INCLUDE "gfx/pokemon/blissey/anim1.asm"
-RaikouAnimationExtra:     INCLUDE "gfx/pokemon/raikou/anim1.asm"
-EnteiAnimationExtra:      INCLUDE "gfx/pokemon/entei/anim1.asm"
-SuicuneAnimationExtra:    INCLUDE "gfx/pokemon/suicune/anim1.asm"
-LarvitarAnimationExtra:   INCLUDE "gfx/pokemon/larvitar/anim1.asm"
-PupitarAnimationExtra:    INCLUDE "gfx/pokemon/pupitar/anim1.asm"
-TyranitarAnimationExtra:  INCLUDE "gfx/pokemon/tyranitar/anim1.asm"
-LugiaAnimationExtra:      INCLUDE "gfx/pokemon/lugia/anim1.asm"
-HoOhAnimationExtra:       INCLUDE "gfx/pokemon/ho_oh/anim1.asm"
-CelebiAnimationExtra:     INCLUDE "gfx/pokemon/celebi/anim1.asm"
-EggAnimationExtra:        INCLUDE "gfx/pokemon/egg/anim1.asm"
diff --git a/gfx/pokemon/farfetch_d/anim0.asm b/gfx/pokemon/farfetch_d/anim.asm
index 4dac6c1a4..4dac6c1a4 100644
--- a/gfx/pokemon/farfetch_d/anim0.asm
+++ b/gfx/pokemon/farfetch_d/anim.asm
diff --git a/gfx/pokemon/farfetch_d/anim1.asm b/gfx/pokemon/farfetch_d/anim_idle.asm
index 5dcfaa89d..5dcfaa89d 100644
--- a/gfx/pokemon/farfetch_d/anim1.asm
+++ b/gfx/pokemon/farfetch_d/anim_idle.asm
diff --git a/gfx/pokemon/fearow/anim0.asm b/gfx/pokemon/fearow/anim.asm
index 3a689af18..3a689af18 100644
--- a/gfx/pokemon/fearow/anim0.asm
+++ b/gfx/pokemon/fearow/anim.asm
diff --git a/gfx/pokemon/fearow/anim1.asm b/gfx/pokemon/fearow/anim_idle.asm
index 0233782c9..0233782c9 100644
--- a/gfx/pokemon/fearow/anim1.asm
+++ b/gfx/pokemon/fearow/anim_idle.asm
diff --git a/gfx/pokemon/feraligatr/anim0.asm b/gfx/pokemon/feraligatr/anim.asm
index 1a0cebd2e..1a0cebd2e 100644
--- a/gfx/pokemon/feraligatr/anim0.asm
+++ b/gfx/pokemon/feraligatr/anim.asm
diff --git a/gfx/pokemon/feraligatr/anim1.asm b/gfx/pokemon/feraligatr/anim_idle.asm
index c1c39258d..c1c39258d 100644
--- a/gfx/pokemon/feraligatr/anim1.asm
+++ b/gfx/pokemon/feraligatr/anim_idle.asm
diff --git a/gfx/pokemon/flaaffy/anim0.asm b/gfx/pokemon/flaaffy/anim.asm
index c9f1f4e7e..c9f1f4e7e 100644
--- a/gfx/pokemon/flaaffy/anim0.asm
+++ b/gfx/pokemon/flaaffy/anim.asm
diff --git a/gfx/pokemon/flaaffy/anim1.asm b/gfx/pokemon/flaaffy/anim_idle.asm
index b9ec0d483..b9ec0d483 100644
--- a/gfx/pokemon/flaaffy/anim1.asm
+++ b/gfx/pokemon/flaaffy/anim_idle.asm
diff --git a/gfx/pokemon/flareon/anim0.asm b/gfx/pokemon/flareon/anim.asm
index dbefae362..dbefae362 100644
--- a/gfx/pokemon/flareon/anim0.asm
+++ b/gfx/pokemon/flareon/anim.asm
diff --git a/gfx/pokemon/flareon/anim1.asm b/gfx/pokemon/flareon/anim_idle.asm
index 431573106..431573106 100644
--- a/gfx/pokemon/flareon/anim1.asm
+++ b/gfx/pokemon/flareon/anim_idle.asm
diff --git a/gfx/pokemon/forretress/anim0.asm b/gfx/pokemon/forretress/anim.asm
index 74c8e2e12..74c8e2e12 100644
--- a/gfx/pokemon/forretress/anim0.asm
+++ b/gfx/pokemon/forretress/anim.asm
diff --git a/gfx/pokemon/forretress/anim1.asm b/gfx/pokemon/forretress/anim_idle.asm
index 4fafa1a3e..4fafa1a3e 100644
--- a/gfx/pokemon/forretress/anim1.asm
+++ b/gfx/pokemon/forretress/anim_idle.asm
diff --git a/gfx/pokemon/furret/anim0.asm b/gfx/pokemon/furret/anim.asm
index 8503d74ec..8503d74ec 100644
--- a/gfx/pokemon/furret/anim0.asm
+++ b/gfx/pokemon/furret/anim.asm
diff --git a/gfx/pokemon/furret/anim1.asm b/gfx/pokemon/furret/anim_idle.asm
index e175bf7cc..e175bf7cc 100644
--- a/gfx/pokemon/furret/anim1.asm
+++ b/gfx/pokemon/furret/anim_idle.asm
diff --git a/gfx/pokemon/gastly/anim0.asm b/gfx/pokemon/gastly/anim.asm
index d9414d188..d9414d188 100644
--- a/gfx/pokemon/gastly/anim0.asm
+++ b/gfx/pokemon/gastly/anim.asm
diff --git a/gfx/pokemon/gastly/anim1.asm b/gfx/pokemon/gastly/anim_idle.asm
index 65dc17abf..65dc17abf 100644
--- a/gfx/pokemon/gastly/anim1.asm
+++ b/gfx/pokemon/gastly/anim_idle.asm
diff --git a/gfx/pokemon/gengar/anim0.asm b/gfx/pokemon/gengar/anim.asm
index 842c47c76..842c47c76 100644
--- a/gfx/pokemon/gengar/anim0.asm
+++ b/gfx/pokemon/gengar/anim.asm
diff --git a/gfx/pokemon/gengar/anim1.asm b/gfx/pokemon/gengar/anim_idle.asm
index 09df5dca3..09df5dca3 100644
--- a/gfx/pokemon/gengar/anim1.asm
+++ b/gfx/pokemon/gengar/anim_idle.asm
diff --git a/gfx/pokemon/geodude/anim0.asm b/gfx/pokemon/geodude/anim.asm
index 3c54bc94e..3c54bc94e 100644
--- a/gfx/pokemon/geodude/anim0.asm
+++ b/gfx/pokemon/geodude/anim.asm
diff --git a/gfx/pokemon/geodude/anim1.asm b/gfx/pokemon/geodude/anim_idle.asm
index 4ec72d9b1..4ec72d9b1 100644
--- a/gfx/pokemon/geodude/anim1.asm
+++ b/gfx/pokemon/geodude/anim_idle.asm
diff --git a/gfx/pokemon/girafarig/anim0.asm b/gfx/pokemon/girafarig/anim.asm
index 3a7ebd9fe..3a7ebd9fe 100644
--- a/gfx/pokemon/girafarig/anim0.asm
+++ b/gfx/pokemon/girafarig/anim.asm
diff --git a/gfx/pokemon/girafarig/anim1.asm b/gfx/pokemon/girafarig/anim_idle.asm
index 95b1131ca..95b1131ca 100644
--- a/gfx/pokemon/girafarig/anim1.asm
+++ b/gfx/pokemon/girafarig/anim_idle.asm
diff --git a/gfx/pokemon/gligar/anim0.asm b/gfx/pokemon/gligar/anim.asm
index 1dabf6cbd..1dabf6cbd 100644
--- a/gfx/pokemon/gligar/anim0.asm
+++ b/gfx/pokemon/gligar/anim.asm
diff --git a/gfx/pokemon/gligar/anim1.asm b/gfx/pokemon/gligar/anim_idle.asm
index 0cc7c0916..0cc7c0916 100644
--- a/gfx/pokemon/gligar/anim1.asm
+++ b/gfx/pokemon/gligar/anim_idle.asm
diff --git a/gfx/pokemon/gloom/anim0.asm b/gfx/pokemon/gloom/anim.asm
index 89c6805b9..89c6805b9 100644
--- a/gfx/pokemon/gloom/anim0.asm
+++ b/gfx/pokemon/gloom/anim.asm
diff --git a/gfx/pokemon/gloom/anim1.asm b/gfx/pokemon/gloom/anim_idle.asm
index cdb6c5191..cdb6c5191 100644
--- a/gfx/pokemon/gloom/anim1.asm
+++ b/gfx/pokemon/gloom/anim_idle.asm
diff --git a/gfx/pokemon/golbat/anim0.asm b/gfx/pokemon/golbat/anim.asm
index cb04c1a3b..cb04c1a3b 100644
--- a/gfx/pokemon/golbat/anim0.asm
+++ b/gfx/pokemon/golbat/anim.asm
diff --git a/gfx/pokemon/golbat/anim1.asm b/gfx/pokemon/golbat/anim_idle.asm
index 689aed3fd..689aed3fd 100644
--- a/gfx/pokemon/golbat/anim1.asm
+++ b/gfx/pokemon/golbat/anim_idle.asm
diff --git a/gfx/pokemon/goldeen/anim0.asm b/gfx/pokemon/goldeen/anim.asm
index c93141feb..c93141feb 100644
--- a/gfx/pokemon/goldeen/anim0.asm
+++ b/gfx/pokemon/goldeen/anim.asm
diff --git a/gfx/pokemon/goldeen/anim1.asm b/gfx/pokemon/goldeen/anim_idle.asm
index f31dfd1b2..f31dfd1b2 100644
--- a/gfx/pokemon/goldeen/anim1.asm
+++ b/gfx/pokemon/goldeen/anim_idle.asm
diff --git a/gfx/pokemon/golduck/anim0.asm b/gfx/pokemon/golduck/anim.asm
index 41ce17c55..41ce17c55 100644
--- a/gfx/pokemon/golduck/anim0.asm
+++ b/gfx/pokemon/golduck/anim.asm
diff --git a/gfx/pokemon/golduck/anim1.asm b/gfx/pokemon/golduck/anim_idle.asm
index a73476ca9..a73476ca9 100644
--- a/gfx/pokemon/golduck/anim1.asm
+++ b/gfx/pokemon/golduck/anim_idle.asm
diff --git a/gfx/pokemon/golem/anim0.asm b/gfx/pokemon/golem/anim.asm
index ef21ec211..ef21ec211 100644
--- a/gfx/pokemon/golem/anim0.asm
+++ b/gfx/pokemon/golem/anim.asm
diff --git a/gfx/pokemon/golem/anim1.asm b/gfx/pokemon/golem/anim_idle.asm
index 9d3c23ba3..9d3c23ba3 100644
--- a/gfx/pokemon/golem/anim1.asm
+++ b/gfx/pokemon/golem/anim_idle.asm
diff --git a/gfx/pokemon/granbull/anim0.asm b/gfx/pokemon/granbull/anim.asm
index 2f412479f..2f412479f 100644
--- a/gfx/pokemon/granbull/anim0.asm
+++ b/gfx/pokemon/granbull/anim.asm
diff --git a/gfx/pokemon/granbull/anim1.asm b/gfx/pokemon/granbull/anim_idle.asm
index 22e166977..22e166977 100644
--- a/gfx/pokemon/granbull/anim1.asm
+++ b/gfx/pokemon/granbull/anim_idle.asm
diff --git a/gfx/pokemon/graveler/anim0.asm b/gfx/pokemon/graveler/anim.asm
index 8c0fba1ac..8c0fba1ac 100644
--- a/gfx/pokemon/graveler/anim0.asm
+++ b/gfx/pokemon/graveler/anim.asm
diff --git a/gfx/pokemon/graveler/anim1.asm b/gfx/pokemon/graveler/anim_idle.asm
index e4ebc15e0..e4ebc15e0 100644
--- a/gfx/pokemon/graveler/anim1.asm
+++ b/gfx/pokemon/graveler/anim_idle.asm
diff --git a/gfx/pokemon/grimer/anim0.asm b/gfx/pokemon/grimer/anim.asm
index c8edda489..c8edda489 100644
--- a/gfx/pokemon/grimer/anim0.asm
+++ b/gfx/pokemon/grimer/anim.asm
diff --git a/gfx/pokemon/grimer/anim1.asm b/gfx/pokemon/grimer/anim_idle.asm
index 50829935e..50829935e 100644
--- a/gfx/pokemon/grimer/anim1.asm
+++ b/gfx/pokemon/grimer/anim_idle.asm
diff --git a/gfx/pokemon/growlithe/anim0.asm b/gfx/pokemon/growlithe/anim.asm
index 333c08e67..333c08e67 100644
--- a/gfx/pokemon/growlithe/anim0.asm
+++ b/gfx/pokemon/growlithe/anim.asm
diff --git a/gfx/pokemon/growlithe/anim1.asm b/gfx/pokemon/growlithe/anim_idle.asm
index bce18fa44..bce18fa44 100644
--- a/gfx/pokemon/growlithe/anim1.asm
+++ b/gfx/pokemon/growlithe/anim_idle.asm
diff --git a/gfx/pokemon/gyarados/anim0.asm b/gfx/pokemon/gyarados/anim.asm
index 89195fa31..89195fa31 100644
--- a/gfx/pokemon/gyarados/anim0.asm
+++ b/gfx/pokemon/gyarados/anim.asm
diff --git a/gfx/pokemon/gyarados/anim1.asm b/gfx/pokemon/gyarados/anim_idle.asm
index b33c52080..b33c52080 100644
--- a/gfx/pokemon/gyarados/anim1.asm
+++ b/gfx/pokemon/gyarados/anim_idle.asm
diff --git a/gfx/pokemon/haunter/anim0.asm b/gfx/pokemon/haunter/anim.asm
index a46d0f0bc..a46d0f0bc 100644
--- a/gfx/pokemon/haunter/anim0.asm
+++ b/gfx/pokemon/haunter/anim.asm
diff --git a/gfx/pokemon/haunter/anim1.asm b/gfx/pokemon/haunter/anim_idle.asm
index bf439b1e1..bf439b1e1 100644
--- a/gfx/pokemon/haunter/anim1.asm
+++ b/gfx/pokemon/haunter/anim_idle.asm
diff --git a/gfx/pokemon/heracross/anim0.asm b/gfx/pokemon/heracross/anim.asm
index 5bba06fad..5bba06fad 100644
--- a/gfx/pokemon/heracross/anim0.asm
+++ b/gfx/pokemon/heracross/anim.asm
diff --git a/gfx/pokemon/heracross/anim1.asm b/gfx/pokemon/heracross/anim_idle.asm
index 6c402379c..6c402379c 100644
--- a/gfx/pokemon/heracross/anim1.asm
+++ b/gfx/pokemon/heracross/anim_idle.asm
diff --git a/gfx/pokemon/hitmonchan/anim0.asm b/gfx/pokemon/hitmonchan/anim.asm
index b6ddd647e..b6ddd647e 100644
--- a/gfx/pokemon/hitmonchan/anim0.asm
+++ b/gfx/pokemon/hitmonchan/anim.asm
diff --git a/gfx/pokemon/hitmonchan/anim1.asm b/gfx/pokemon/hitmonchan/anim_idle.asm
index 6f67577a0..6f67577a0 100644
--- a/gfx/pokemon/hitmonchan/anim1.asm
+++ b/gfx/pokemon/hitmonchan/anim_idle.asm
diff --git a/gfx/pokemon/hitmonlee/anim0.asm b/gfx/pokemon/hitmonlee/anim.asm
index 4260d7753..4260d7753 100644
--- a/gfx/pokemon/hitmonlee/anim0.asm
+++ b/gfx/pokemon/hitmonlee/anim.asm
diff --git a/gfx/pokemon/hitmonlee/anim1.asm b/gfx/pokemon/hitmonlee/anim_idle.asm
index 4d7d191bf..4d7d191bf 100644
--- a/gfx/pokemon/hitmonlee/anim1.asm
+++ b/gfx/pokemon/hitmonlee/anim_idle.asm
diff --git a/gfx/pokemon/hitmontop/anim0.asm b/gfx/pokemon/hitmontop/anim.asm
index 195f1554b..195f1554b 100644
--- a/gfx/pokemon/hitmontop/anim0.asm
+++ b/gfx/pokemon/hitmontop/anim.asm
diff --git a/gfx/pokemon/hitmontop/anim1.asm b/gfx/pokemon/hitmontop/anim_idle.asm
index 3b4f17403..3b4f17403 100644
--- a/gfx/pokemon/hitmontop/anim1.asm
+++ b/gfx/pokemon/hitmontop/anim_idle.asm
diff --git a/gfx/pokemon/ho_oh/anim0.asm b/gfx/pokemon/ho_oh/anim.asm
index 5ae27b487..5ae27b487 100644
--- a/gfx/pokemon/ho_oh/anim0.asm
+++ b/gfx/pokemon/ho_oh/anim.asm
diff --git a/gfx/pokemon/ho_oh/anim1.asm b/gfx/pokemon/ho_oh/anim_idle.asm
index d7808f281..d7808f281 100644
--- a/gfx/pokemon/ho_oh/anim1.asm
+++ b/gfx/pokemon/ho_oh/anim_idle.asm
diff --git a/gfx/pokemon/hoothoot/anim0.asm b/gfx/pokemon/hoothoot/anim.asm
index 813faf909..813faf909 100644
--- a/gfx/pokemon/hoothoot/anim0.asm
+++ b/gfx/pokemon/hoothoot/anim.asm
diff --git a/gfx/pokemon/hoothoot/anim1.asm b/gfx/pokemon/hoothoot/anim_idle.asm
index 4aaf1a124..4aaf1a124 100644
--- a/gfx/pokemon/hoothoot/anim1.asm
+++ b/gfx/pokemon/hoothoot/anim_idle.asm
diff --git a/gfx/pokemon/hoppip/anim0.asm b/gfx/pokemon/hoppip/anim.asm
index 6af60ab0b..6af60ab0b 100644
--- a/gfx/pokemon/hoppip/anim0.asm
+++ b/gfx/pokemon/hoppip/anim.asm
diff --git a/gfx/pokemon/hoppip/anim1.asm b/gfx/pokemon/hoppip/anim_idle.asm
index d0281ca1c..d0281ca1c 100644
--- a/gfx/pokemon/hoppip/anim1.asm
+++ b/gfx/pokemon/hoppip/anim_idle.asm
diff --git a/gfx/pokemon/horsea/anim0.asm b/gfx/pokemon/horsea/anim.asm
index 18d51863c..18d51863c 100644
--- a/gfx/pokemon/horsea/anim0.asm
+++ b/gfx/pokemon/horsea/anim.asm
diff --git a/gfx/pokemon/horsea/anim1.asm b/gfx/pokemon/horsea/anim_idle.asm
index 2475abfdb..2475abfdb 100644
--- a/gfx/pokemon/horsea/anim1.asm
+++ b/gfx/pokemon/horsea/anim_idle.asm
diff --git a/gfx/pokemon/houndoom/anim0.asm b/gfx/pokemon/houndoom/anim.asm
index 60ad08726..60ad08726 100644
--- a/gfx/pokemon/houndoom/anim0.asm
+++ b/gfx/pokemon/houndoom/anim.asm
diff --git a/gfx/pokemon/houndoom/anim1.asm b/gfx/pokemon/houndoom/anim_idle.asm
index 78fa8610c..78fa8610c 100644
--- a/gfx/pokemon/houndoom/anim1.asm
+++ b/gfx/pokemon/houndoom/anim_idle.asm
diff --git a/gfx/pokemon/houndour/anim0.asm b/gfx/pokemon/houndour/anim.asm
index 2235850c0..2235850c0 100644
--- a/gfx/pokemon/houndour/anim0.asm
+++ b/gfx/pokemon/houndour/anim.asm
diff --git a/gfx/pokemon/houndour/anim1.asm b/gfx/pokemon/houndour/anim_idle.asm
index dd8318689..dd8318689 100644
--- a/gfx/pokemon/houndour/anim1.asm
+++ b/gfx/pokemon/houndour/anim_idle.asm
diff --git a/gfx/pokemon/hypno/anim0.asm b/gfx/pokemon/hypno/anim.asm
index b6c3e6463..b6c3e6463 100644
--- a/gfx/pokemon/hypno/anim0.asm
+++ b/gfx/pokemon/hypno/anim.asm
diff --git a/gfx/pokemon/hypno/anim1.asm b/gfx/pokemon/hypno/anim_idle.asm
index 4d981c442..4d981c442 100644
--- a/gfx/pokemon/hypno/anim1.asm
+++ b/gfx/pokemon/hypno/anim_idle.asm
diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm
new file mode 100644
index 000000000..34345fe77
--- /dev/null
+++ b/gfx/pokemon/idle_pointers.asm
@@ -0,0 +1,252 @@
+AnimationIdlePointers:
+	dw BulbasaurAnimationIdle
+	dw IvysaurAnimationIdle
+	dw VenusaurAnimationIdle
+	dw CharmanderAnimationIdle
+	dw CharmeleonAnimationIdle
+	dw CharizardAnimationIdle
+	dw SquirtleAnimationIdle
+	dw WartortleAnimationIdle
+	dw BlastoiseAnimationIdle
+	dw CaterpieAnimationIdle
+	dw MetapodAnimationIdle
+	dw ButterfreeAnimationIdle
+	dw WeedleAnimationIdle
+	dw KakunaAnimationIdle
+	dw BeedrillAnimationIdle
+	dw PidgeyAnimationIdle
+	dw PidgeottoAnimationIdle
+	dw PidgeotAnimationIdle
+	dw RattataAnimationIdle
+	dw RaticateAnimationIdle
+	dw SpearowAnimationIdle
+	dw FearowAnimationIdle
+	dw EkansAnimationIdle
+	dw ArbokAnimationIdle
+	dw PikachuAnimationIdle
+	dw RaichuAnimationIdle
+	dw SandshrewAnimationIdle
+	dw SandslashAnimationIdle
+	dw NidoranFAnimationIdle
+	dw NidorinaAnimationIdle
+	dw NidoqueenAnimationIdle
+	dw NidoranMAnimationIdle
+	dw NidorinoAnimationIdle
+	dw NidokingAnimationIdle
+	dw ClefairyAnimationIdle
+	dw ClefableAnimationIdle
+	dw VulpixAnimationIdle
+	dw NinetalesAnimationIdle
+	dw JigglypuffAnimationIdle
+	dw WigglytuffAnimationIdle
+	dw ZubatAnimationIdle
+	dw GolbatAnimationIdle
+	dw OddishAnimationIdle
+	dw GloomAnimationIdle
+	dw VileplumeAnimationIdle
+	dw ParasAnimationIdle
+	dw ParasectAnimationIdle
+	dw VenonatAnimationIdle
+	dw VenomothAnimationIdle
+	dw DiglettAnimationIdle
+	dw DugtrioAnimationIdle
+	dw MeowthAnimationIdle
+	dw PersianAnimationIdle
+	dw PsyduckAnimationIdle
+	dw GolduckAnimationIdle
+	dw MankeyAnimationIdle
+	dw PrimeapeAnimationIdle
+	dw GrowlitheAnimationIdle
+	dw ArcanineAnimationIdle
+	dw PoliwagAnimationIdle
+	dw PoliwhirlAnimationIdle
+	dw PoliwrathAnimationIdle
+	dw AbraAnimationIdle
+	dw KadabraAnimationIdle
+	dw AlakazamAnimationIdle
+	dw MachopAnimationIdle
+	dw MachokeAnimationIdle
+	dw MachampAnimationIdle
+	dw BellsproutAnimationIdle
+	dw WeepinbellAnimationIdle
+	dw VictreebelAnimationIdle
+	dw TentacoolAnimationIdle
+	dw TentacruelAnimationIdle
+	dw GeodudeAnimationIdle
+	dw GravelerAnimationIdle
+	dw GolemAnimationIdle
+	dw PonytaAnimationIdle
+	dw RapidashAnimationIdle
+	dw SlowpokeAnimationIdle
+	dw SlowbroAnimationIdle
+	dw MagnemiteAnimationIdle
+	dw MagnetonAnimationIdle
+	dw FarfetchDAnimationIdle
+	dw DoduoAnimationIdle
+	dw DodrioAnimationIdle
+	dw SeelAnimationIdle
+	dw DewgongAnimationIdle
+	dw GrimerAnimationIdle
+	dw MukAnimationIdle
+	dw ShellderAnimationIdle
+	dw CloysterAnimationIdle
+	dw GastlyAnimationIdle
+	dw HaunterAnimationIdle
+	dw GengarAnimationIdle
+	dw OnixAnimationIdle
+	dw DrowzeeAnimationIdle
+	dw HypnoAnimationIdle
+	dw KrabbyAnimationIdle
+	dw KinglerAnimationIdle
+	dw VoltorbAnimationIdle
+	dw ElectrodeAnimationIdle
+	dw ExeggcuteAnimationIdle
+	dw ExeggutorAnimationIdle
+	dw CuboneAnimationIdle
+	dw MarowakAnimationIdle
+	dw HitmonleeAnimationIdle
+	dw HitmonchanAnimationIdle
+	dw LickitungAnimationIdle
+	dw KoffingAnimationIdle
+	dw WeezingAnimationIdle
+	dw RhyhornAnimationIdle
+	dw RhydonAnimationIdle
+	dw ChanseyAnimationIdle
+	dw TangelaAnimationIdle
+	dw KangaskhanAnimationIdle
+	dw HorseaAnimationIdle
+	dw SeadraAnimationIdle
+	dw GoldeenAnimationIdle
+	dw SeakingAnimationIdle
+	dw StaryuAnimationIdle
+	dw StarmieAnimationIdle
+	dw MrMimeAnimationIdle
+	dw ScytherAnimationIdle
+	dw JynxAnimationIdle
+	dw ElectabuzzAnimationIdle
+	dw MagmarAnimationIdle
+	dw PinsirAnimationIdle
+	dw TaurosAnimationIdle
+	dw MagikarpAnimationIdle
+	dw GyaradosAnimationIdle
+	dw LaprasAnimationIdle
+	dw DittoAnimationIdle
+	dw EeveeAnimationIdle
+	dw VaporeonAnimationIdle
+	dw JolteonAnimationIdle
+	dw FlareonAnimationIdle
+	dw PorygonAnimationIdle
+	dw OmanyteAnimationIdle
+	dw OmastarAnimationIdle
+	dw KabutoAnimationIdle
+	dw KabutopsAnimationIdle
+	dw AerodactylAnimationIdle
+	dw SnorlaxAnimationIdle
+	dw ArticunoAnimationIdle
+	dw ZapdosAnimationIdle
+	dw MoltresAnimationIdle
+	dw DratiniAnimationIdle
+	dw DragonairAnimationIdle
+	dw DragoniteAnimationIdle
+	dw MewtwoAnimationIdle
+	dw MewAnimationIdle
+	dw ChikoritaAnimationIdle
+	dw BayleefAnimationIdle
+	dw MeganiumAnimationIdle
+	dw CyndaquilAnimationIdle
+	dw QuilavaAnimationIdle
+	dw TyphlosionAnimationIdle
+	dw TotodileAnimationIdle
+	dw CroconawAnimationIdle
+	dw FeraligatrAnimationIdle
+	dw SentretAnimationIdle
+	dw FurretAnimationIdle
+	dw HoothootAnimationIdle
+	dw NoctowlAnimationIdle
+	dw LedybaAnimationIdle
+	dw LedianAnimationIdle
+	dw SpinarakAnimationIdle
+	dw AriadosAnimationIdle
+	dw CrobatAnimationIdle
+	dw ChinchouAnimationIdle
+	dw LanturnAnimationIdle
+	dw PichuAnimationIdle
+	dw CleffaAnimationIdle
+	dw IgglybuffAnimationIdle
+	dw TogepiAnimationIdle
+	dw TogeticAnimationIdle
+	dw NatuAnimationIdle
+	dw XatuAnimationIdle
+	dw MareepAnimationIdle
+	dw FlaaffyAnimationIdle
+	dw AmpharosAnimationIdle
+	dw BellossomAnimationIdle
+	dw MarillAnimationIdle
+	dw AzumarillAnimationIdle
+	dw SudowoodoAnimationIdle
+	dw PolitoedAnimationIdle
+	dw HoppipAnimationIdle
+	dw SkiploomAnimationIdle
+	dw JumpluffAnimationIdle
+	dw AipomAnimationIdle
+	dw SunkernAnimationIdle
+	dw SunfloraAnimationIdle
+	dw YanmaAnimationIdle
+	dw WooperAnimationIdle
+	dw QuagsireAnimationIdle
+	dw EspeonAnimationIdle
+	dw UmbreonAnimationIdle
+	dw MurkrowAnimationIdle
+	dw SlowkingAnimationIdle
+	dw MisdreavusAnimationIdle
+	dw UnownAnimationIdle
+	dw WobbuffetAnimationIdle
+	dw GirafarigAnimationIdle
+	dw PinecoAnimationIdle
+	dw ForretressAnimationIdle
+	dw DunsparceAnimationIdle
+	dw GligarAnimationIdle
+	dw SteelixAnimationIdle
+	dw SnubbullAnimationIdle
+	dw GranbullAnimationIdle
+	dw QwilfishAnimationIdle
+	dw ScizorAnimationIdle
+	dw ShuckleAnimationIdle
+	dw HeracrossAnimationIdle
+	dw SneaselAnimationIdle
+	dw TeddiursaAnimationIdle
+	dw UrsaringAnimationIdle
+	dw SlugmaAnimationIdle
+	dw MagcargoAnimationIdle
+	dw SwinubAnimationIdle
+	dw PiloswineAnimationIdle
+	dw CorsolaAnimationIdle
+	dw RemoraidAnimationIdle
+	dw OctilleryAnimationIdle
+	dw DelibirdAnimationIdle
+	dw MantineAnimationIdle
+	dw SkarmoryAnimationIdle
+	dw HoundourAnimationIdle
+	dw HoundoomAnimationIdle
+	dw KingdraAnimationIdle
+	dw PhanpyAnimationIdle
+	dw DonphanAnimationIdle
+	dw Porygon2AnimationIdle
+	dw StantlerAnimationIdle
+	dw SmeargleAnimationIdle
+	dw TyrogueAnimationIdle
+	dw HitmontopAnimationIdle
+	dw SmoochumAnimationIdle
+	dw ElekidAnimationIdle
+	dw MagbyAnimationIdle
+	dw MiltankAnimationIdle
+	dw BlisseyAnimationIdle
+	dw RaikouAnimationIdle
+	dw EnteiAnimationIdle
+	dw SuicuneAnimationIdle
+	dw LarvitarAnimationIdle
+	dw PupitarAnimationIdle
+	dw TyranitarAnimationIdle
+	dw LugiaAnimationIdle
+	dw HoOhAnimationIdle
+	dw CelebiAnimationIdle
diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm
new file mode 100644
index 000000000..952aae2e3
--- /dev/null
+++ b/gfx/pokemon/idles.asm
@@ -0,0 +1,252 @@
+BulbasaurAnimationIdle:  INCLUDE "gfx/pokemon/bulbasaur/anim_idle.asm"
+IvysaurAnimationIdle:    INCLUDE "gfx/pokemon/ivysaur/anim_idle.asm"
+VenusaurAnimationIdle:   INCLUDE "gfx/pokemon/venusaur/anim_idle.asm"
+CharmanderAnimationIdle: INCLUDE "gfx/pokemon/charmander/anim_idle.asm"
+CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm"
+CharizardAnimationIdle:  INCLUDE "gfx/pokemon/charizard/anim_idle.asm"
+SquirtleAnimationIdle:   INCLUDE "gfx/pokemon/squirtle/anim_idle.asm"
+WartortleAnimationIdle:  INCLUDE "gfx/pokemon/wartortle/anim_idle.asm"
+BlastoiseAnimationIdle:  INCLUDE "gfx/pokemon/blastoise/anim_idle.asm"
+CaterpieAnimationIdle:   INCLUDE "gfx/pokemon/caterpie/anim_idle.asm"
+MetapodAnimationIdle:    INCLUDE "gfx/pokemon/metapod/anim_idle.asm"
+ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm"
+WeedleAnimationIdle:     INCLUDE "gfx/pokemon/weedle/anim_idle.asm"
+KakunaAnimationIdle:     INCLUDE "gfx/pokemon/kakuna/anim_idle.asm"
+BeedrillAnimationIdle:   INCLUDE "gfx/pokemon/beedrill/anim_idle.asm"
+PidgeyAnimationIdle:     INCLUDE "gfx/pokemon/pidgey/anim_idle.asm"
+PidgeottoAnimationIdle:  INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm"
+PidgeotAnimationIdle:    INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm"
+RattataAnimationIdle:    INCLUDE "gfx/pokemon/rattata/anim_idle.asm"
+RaticateAnimationIdle:   INCLUDE "gfx/pokemon/raticate/anim_idle.asm"
+SpearowAnimationIdle:    INCLUDE "gfx/pokemon/spearow/anim_idle.asm"
+FearowAnimationIdle:     INCLUDE "gfx/pokemon/fearow/anim_idle.asm"
+EkansAnimationIdle:      INCLUDE "gfx/pokemon/ekans/anim_idle.asm"
+ArbokAnimationIdle:      INCLUDE "gfx/pokemon/arbok/anim_idle.asm"
+PikachuAnimationIdle:    INCLUDE "gfx/pokemon/pikachu/anim_idle.asm"
+RaichuAnimationIdle:     INCLUDE "gfx/pokemon/raichu/anim_idle.asm"
+SandshrewAnimationIdle:  INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm"
+SandslashAnimationIdle:  INCLUDE "gfx/pokemon/sandslash/anim_idle.asm"
+NidoranFAnimationIdle:   INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm"
+NidorinaAnimationIdle:   INCLUDE "gfx/pokemon/nidorina/anim_idle.asm"
+NidoqueenAnimationIdle:  INCLUDE "gfx/pokemon/nidoqueen/anim_idle.asm"
+NidoranMAnimationIdle:   INCLUDE "gfx/pokemon/nidoran_m/anim_idle.asm"
+NidorinoAnimationIdle:   INCLUDE "gfx/pokemon/nidorino/anim_idle.asm"
+NidokingAnimationIdle:   INCLUDE "gfx/pokemon/nidoking/anim_idle.asm"
+ClefairyAnimationIdle:   INCLUDE "gfx/pokemon/clefairy/anim_idle.asm"
+ClefableAnimationIdle:   INCLUDE "gfx/pokemon/clefable/anim_idle.asm"
+VulpixAnimationIdle:     INCLUDE "gfx/pokemon/vulpix/anim_idle.asm"
+NinetalesAnimationIdle:  INCLUDE "gfx/pokemon/ninetales/anim_idle.asm"
+JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm"
+WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm"
+ZubatAnimationIdle:      INCLUDE "gfx/pokemon/zubat/anim_idle.asm"
+GolbatAnimationIdle:     INCLUDE "gfx/pokemon/golbat/anim_idle.asm"
+OddishAnimationIdle:     INCLUDE "gfx/pokemon/oddish/anim_idle.asm"
+GloomAnimationIdle:      INCLUDE "gfx/pokemon/gloom/anim_idle.asm"
+VileplumeAnimationIdle:  INCLUDE "gfx/pokemon/vileplume/anim_idle.asm"
+ParasAnimationIdle:      INCLUDE "gfx/pokemon/paras/anim_idle.asm"
+ParasectAnimationIdle:   INCLUDE "gfx/pokemon/parasect/anim_idle.asm"
+VenonatAnimationIdle:    INCLUDE "gfx/pokemon/venonat/anim_idle.asm"
+VenomothAnimationIdle:   INCLUDE "gfx/pokemon/venomoth/anim_idle.asm"
+DiglettAnimationIdle:    INCLUDE "gfx/pokemon/diglett/anim_idle.asm"
+DugtrioAnimationIdle:    INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm"
+MeowthAnimationIdle:     INCLUDE "gfx/pokemon/meowth/anim_idle.asm"
+PersianAnimationIdle:    INCLUDE "gfx/pokemon/persian/anim_idle.asm"
+PsyduckAnimationIdle:    INCLUDE "gfx/pokemon/psyduck/anim_idle.asm"
+GolduckAnimationIdle:    INCLUDE "gfx/pokemon/golduck/anim_idle.asm"
+MankeyAnimationIdle:     INCLUDE "gfx/pokemon/mankey/anim_idle.asm"
+PrimeapeAnimationIdle:   INCLUDE "gfx/pokemon/primeape/anim_idle.asm"
+GrowlitheAnimationIdle:  INCLUDE "gfx/pokemon/growlithe/anim_idle.asm"
+ArcanineAnimationIdle:   INCLUDE "gfx/pokemon/arcanine/anim_idle.asm"
+PoliwagAnimationIdle:    INCLUDE "gfx/pokemon/poliwag/anim_idle.asm"
+PoliwhirlAnimationIdle:  INCLUDE "gfx/pokemon/poliwhirl/anim_idle.asm"
+PoliwrathAnimationIdle:  INCLUDE "gfx/pokemon/poliwrath/anim_idle.asm"
+AbraAnimationIdle:       INCLUDE "gfx/pokemon/abra/anim_idle.asm"
+KadabraAnimationIdle:    INCLUDE "gfx/pokemon/kadabra/anim_idle.asm"
+AlakazamAnimationIdle:   INCLUDE "gfx/pokemon/alakazam/anim_idle.asm"
+MachopAnimationIdle:     INCLUDE "gfx/pokemon/machop/anim_idle.asm"
+MachokeAnimationIdle:    INCLUDE "gfx/pokemon/machoke/anim_idle.asm"
+MachampAnimationIdle:    INCLUDE "gfx/pokemon/machamp/anim_idle.asm"
+BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm"
+WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm"
+VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
+TentacoolAnimationIdle:  INCLUDE "gfx/pokemon/tentacool/anim_idle.asm"
+TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm"
+GeodudeAnimationIdle:    INCLUDE "gfx/pokemon/geodude/anim_idle.asm"
+GravelerAnimationIdle:   INCLUDE "gfx/pokemon/graveler/anim_idle.asm"
+GolemAnimationIdle:      INCLUDE "gfx/pokemon/golem/anim_idle.asm"
+PonytaAnimationIdle:     INCLUDE "gfx/pokemon/ponyta/anim_idle.asm"
+RapidashAnimationIdle:   INCLUDE "gfx/pokemon/rapidash/anim_idle.asm"
+SlowpokeAnimationIdle:   INCLUDE "gfx/pokemon/slowpoke/anim_idle.asm"
+SlowbroAnimationIdle:    INCLUDE "gfx/pokemon/slowbro/anim_idle.asm"
+MagnemiteAnimationIdle:  INCLUDE "gfx/pokemon/magnemite/anim_idle.asm"
+MagnetonAnimationIdle:   INCLUDE "gfx/pokemon/magneton/anim_idle.asm"
+FarfetchDAnimationIdle:  INCLUDE "gfx/pokemon/farfetch_d/anim_idle.asm"
+DoduoAnimationIdle:      INCLUDE "gfx/pokemon/doduo/anim_idle.asm"
+DodrioAnimationIdle:     INCLUDE "gfx/pokemon/dodrio/anim_idle.asm"
+SeelAnimationIdle:       INCLUDE "gfx/pokemon/seel/anim_idle.asm"
+DewgongAnimationIdle:    INCLUDE "gfx/pokemon/dewgong/anim_idle.asm"
+GrimerAnimationIdle:     INCLUDE "gfx/pokemon/grimer/anim_idle.asm"
+MukAnimationIdle:        INCLUDE "gfx/pokemon/muk/anim_idle.asm"
+ShellderAnimationIdle:   INCLUDE "gfx/pokemon/shellder/anim_idle.asm"
+CloysterAnimationIdle:   INCLUDE "gfx/pokemon/cloyster/anim_idle.asm"
+GastlyAnimationIdle:     INCLUDE "gfx/pokemon/gastly/anim_idle.asm"
+HaunterAnimationIdle:    INCLUDE "gfx/pokemon/haunter/anim_idle.asm"
+GengarAnimationIdle:     INCLUDE "gfx/pokemon/gengar/anim_idle.asm"
+OnixAnimationIdle:       INCLUDE "gfx/pokemon/onix/anim_idle.asm"
+DrowzeeAnimationIdle:    INCLUDE "gfx/pokemon/drowzee/anim_idle.asm"
+HypnoAnimationIdle:      INCLUDE "gfx/pokemon/hypno/anim_idle.asm"
+KrabbyAnimationIdle:     INCLUDE "gfx/pokemon/krabby/anim_idle.asm"
+KinglerAnimationIdle:    INCLUDE "gfx/pokemon/kingler/anim_idle.asm"
+VoltorbAnimationIdle:    INCLUDE "gfx/pokemon/voltorb/anim_idle.asm"
+ElectrodeAnimationIdle:  INCLUDE "gfx/pokemon/electrode/anim_idle.asm"
+ExeggcuteAnimationIdle:  INCLUDE "gfx/pokemon/exeggcute/anim_idle.asm"
+ExeggutorAnimationIdle:  INCLUDE "gfx/pokemon/exeggutor/anim_idle.asm"
+CuboneAnimationIdle:     INCLUDE "gfx/pokemon/cubone/anim_idle.asm"
+MarowakAnimationIdle:    INCLUDE "gfx/pokemon/marowak/anim_idle.asm"
+HitmonleeAnimationIdle:  INCLUDE "gfx/pokemon/hitmonlee/anim_idle.asm"
+HitmonchanAnimationIdle: INCLUDE "gfx/pokemon/hitmonchan/anim_idle.asm"
+LickitungAnimationIdle:  INCLUDE "gfx/pokemon/lickitung/anim_idle.asm"
+KoffingAnimationIdle:    INCLUDE "gfx/pokemon/koffing/anim_idle.asm"
+WeezingAnimationIdle:    INCLUDE "gfx/pokemon/weezing/anim_idle.asm"
+RhyhornAnimationIdle:    INCLUDE "gfx/pokemon/rhyhorn/anim_idle.asm"
+RhydonAnimationIdle:     INCLUDE "gfx/pokemon/rhydon/anim_idle.asm"
+ChanseyAnimationIdle:    INCLUDE "gfx/pokemon/chansey/anim_idle.asm"
+TangelaAnimationIdle:    INCLUDE "gfx/pokemon/tangela/anim_idle.asm"
+KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm"
+HorseaAnimationIdle:     INCLUDE "gfx/pokemon/horsea/anim_idle.asm"
+SeadraAnimationIdle:     INCLUDE "gfx/pokemon/seadra/anim_idle.asm"
+GoldeenAnimationIdle:    INCLUDE "gfx/pokemon/goldeen/anim_idle.asm"
+SeakingAnimationIdle:    INCLUDE "gfx/pokemon/seaking/anim_idle.asm"
+StaryuAnimationIdle:     INCLUDE "gfx/pokemon/staryu/anim_idle.asm"
+StarmieAnimationIdle:    INCLUDE "gfx/pokemon/starmie/anim_idle.asm"
+MrMimeAnimationIdle:     INCLUDE "gfx/pokemon/mr__mime/anim_idle.asm"
+ScytherAnimationIdle:    INCLUDE "gfx/pokemon/scyther/anim_idle.asm"
+JynxAnimationIdle:       INCLUDE "gfx/pokemon/jynx/anim_idle.asm"
+ElectabuzzAnimationIdle: INCLUDE "gfx/pokemon/electabuzz/anim_idle.asm"
+MagmarAnimationIdle:     INCLUDE "gfx/pokemon/magmar/anim_idle.asm"
+PinsirAnimationIdle:     INCLUDE "gfx/pokemon/pinsir/anim_idle.asm"
+TaurosAnimationIdle:     INCLUDE "gfx/pokemon/tauros/anim_idle.asm"
+MagikarpAnimationIdle:   INCLUDE "gfx/pokemon/magikarp/anim_idle.asm"
+GyaradosAnimationIdle:   INCLUDE "gfx/pokemon/gyarados/anim_idle.asm"
+LaprasAnimationIdle:     INCLUDE "gfx/pokemon/lapras/anim_idle.asm"
+DittoAnimationIdle:      INCLUDE "gfx/pokemon/ditto/anim_idle.asm"
+EeveeAnimationIdle:      INCLUDE "gfx/pokemon/eevee/anim_idle.asm"
+VaporeonAnimationIdle:   INCLUDE "gfx/pokemon/vaporeon/anim_idle.asm"
+JolteonAnimationIdle:    INCLUDE "gfx/pokemon/jolteon/anim_idle.asm"
+FlareonAnimationIdle:    INCLUDE "gfx/pokemon/flareon/anim_idle.asm"
+PorygonAnimationIdle:    INCLUDE "gfx/pokemon/porygon/anim_idle.asm"
+OmanyteAnimationIdle:    INCLUDE "gfx/pokemon/omanyte/anim_idle.asm"
+OmastarAnimationIdle:    INCLUDE "gfx/pokemon/omastar/anim_idle.asm"
+KabutoAnimationIdle:     INCLUDE "gfx/pokemon/kabuto/anim_idle.asm"
+KabutopsAnimationIdle:   INCLUDE "gfx/pokemon/kabutops/anim_idle.asm"
+AerodactylAnimationIdle: INCLUDE "gfx/pokemon/aerodactyl/anim_idle.asm"
+SnorlaxAnimationIdle:    INCLUDE "gfx/pokemon/snorlax/anim_idle.asm"
+ArticunoAnimationIdle:   INCLUDE "gfx/pokemon/articuno/anim_idle.asm"
+ZapdosAnimationIdle:     INCLUDE "gfx/pokemon/zapdos/anim_idle.asm"
+MoltresAnimationIdle:    INCLUDE "gfx/pokemon/moltres/anim_idle.asm"
+DratiniAnimationIdle:    INCLUDE "gfx/pokemon/dratini/anim_idle.asm"
+DragonairAnimationIdle:  INCLUDE "gfx/pokemon/dragonair/anim_idle.asm"
+DragoniteAnimationIdle:  INCLUDE "gfx/pokemon/dragonite/anim_idle.asm"
+MewtwoAnimationIdle:     INCLUDE "gfx/pokemon/mewtwo/anim_idle.asm"
+MewAnimationIdle:        INCLUDE "gfx/pokemon/mew/anim_idle.asm"
+ChikoritaAnimationIdle:  INCLUDE "gfx/pokemon/chikorita/anim_idle.asm"
+BayleefAnimationIdle:    INCLUDE "gfx/pokemon/bayleef/anim_idle.asm"
+MeganiumAnimationIdle:   INCLUDE "gfx/pokemon/meganium/anim_idle.asm"
+CyndaquilAnimationIdle:  INCLUDE "gfx/pokemon/cyndaquil/anim_idle.asm"
+QuilavaAnimationIdle:    INCLUDE "gfx/pokemon/quilava/anim_idle.asm"
+TyphlosionAnimationIdle: INCLUDE "gfx/pokemon/typhlosion/anim_idle.asm"
+TotodileAnimationIdle:   INCLUDE "gfx/pokemon/totodile/anim_idle.asm"
+CroconawAnimationIdle:   INCLUDE "gfx/pokemon/croconaw/anim_idle.asm"
+FeraligatrAnimationIdle: INCLUDE "gfx/pokemon/feraligatr/anim_idle.asm"
+SentretAnimationIdle:    INCLUDE "gfx/pokemon/sentret/anim_idle.asm"
+FurretAnimationIdle:     INCLUDE "gfx/pokemon/furret/anim_idle.asm"
+HoothootAnimationIdle:   INCLUDE "gfx/pokemon/hoothoot/anim_idle.asm"
+NoctowlAnimationIdle:    INCLUDE "gfx/pokemon/noctowl/anim_idle.asm"
+LedybaAnimationIdle:     INCLUDE "gfx/pokemon/ledyba/anim_idle.asm"
+LedianAnimationIdle:     INCLUDE "gfx/pokemon/ledian/anim_idle.asm"
+SpinarakAnimationIdle:   INCLUDE "gfx/pokemon/spinarak/anim_idle.asm"
+AriadosAnimationIdle:    INCLUDE "gfx/pokemon/ariados/anim_idle.asm"
+CrobatAnimationIdle:     INCLUDE "gfx/pokemon/crobat/anim_idle.asm"
+ChinchouAnimationIdle:   INCLUDE "gfx/pokemon/chinchou/anim_idle.asm"
+LanturnAnimationIdle:    INCLUDE "gfx/pokemon/lanturn/anim_idle.asm"
+PichuAnimationIdle:      INCLUDE "gfx/pokemon/pichu/anim_idle.asm"
+CleffaAnimationIdle:     INCLUDE "gfx/pokemon/cleffa/anim_idle.asm"
+IgglybuffAnimationIdle:  INCLUDE "gfx/pokemon/igglybuff/anim_idle.asm"
+TogepiAnimationIdle:     INCLUDE "gfx/pokemon/togepi/anim_idle.asm"
+TogeticAnimationIdle:    INCLUDE "gfx/pokemon/togetic/anim_idle.asm"
+NatuAnimationIdle:       INCLUDE "gfx/pokemon/natu/anim_idle.asm"
+XatuAnimationIdle:       INCLUDE "gfx/pokemon/xatu/anim_idle.asm"
+MareepAnimationIdle:     INCLUDE "gfx/pokemon/mareep/anim_idle.asm"
+FlaaffyAnimationIdle:    INCLUDE "gfx/pokemon/flaaffy/anim_idle.asm"
+AmpharosAnimationIdle:   INCLUDE "gfx/pokemon/ampharos/anim_idle.asm"
+BellossomAnimationIdle:  INCLUDE "gfx/pokemon/bellossom/anim_idle.asm"
+MarillAnimationIdle:     INCLUDE "gfx/pokemon/marill/anim_idle.asm"
+AzumarillAnimationIdle:  INCLUDE "gfx/pokemon/azumarill/anim_idle.asm"
+SudowoodoAnimationIdle:  INCLUDE "gfx/pokemon/sudowoodo/anim_idle.asm"
+PolitoedAnimationIdle:   INCLUDE "gfx/pokemon/politoed/anim_idle.asm"
+HoppipAnimationIdle:     INCLUDE "gfx/pokemon/hoppip/anim_idle.asm"
+SkiploomAnimationIdle:   INCLUDE "gfx/pokemon/skiploom/anim_idle.asm"
+JumpluffAnimationIdle:   INCLUDE "gfx/pokemon/jumpluff/anim_idle.asm"
+AipomAnimationIdle:      INCLUDE "gfx/pokemon/aipom/anim_idle.asm"
+SunkernAnimationIdle:    INCLUDE "gfx/pokemon/sunkern/anim_idle.asm"
+SunfloraAnimationIdle:   INCLUDE "gfx/pokemon/sunflora/anim_idle.asm"
+YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
+WooperAnimationIdle:     INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
+QuagsireAnimationIdle:   INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
+EspeonAnimationIdle:     INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
+UmbreonAnimationIdle:    INCLUDE "gfx/pokemon/umbreon/anim_idle.asm"
+MurkrowAnimationIdle:    INCLUDE "gfx/pokemon/murkrow/anim_idle.asm"
+SlowkingAnimationIdle:   INCLUDE "gfx/pokemon/slowking/anim_idle.asm"
+MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm"
+UnownAnimationIdle:      INCLUDE "gfx/pokemon/unown/anim_idle.asm"
+WobbuffetAnimationIdle:  INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm"
+GirafarigAnimationIdle:  INCLUDE "gfx/pokemon/girafarig/anim_idle.asm"
+PinecoAnimationIdle:     INCLUDE "gfx/pokemon/pineco/anim_idle.asm"
+ForretressAnimationIdle: INCLUDE "gfx/pokemon/forretress/anim_idle.asm"
+DunsparceAnimationIdle:  INCLUDE "gfx/pokemon/dunsparce/anim_idle.asm"
+GligarAnimationIdle:     INCLUDE "gfx/pokemon/gligar/anim_idle.asm"
+SteelixAnimationIdle:    INCLUDE "gfx/pokemon/steelix/anim_idle.asm"
+SnubbullAnimationIdle:   INCLUDE "gfx/pokemon/snubbull/anim_idle.asm"
+GranbullAnimationIdle:   INCLUDE "gfx/pokemon/granbull/anim_idle.asm"
+QwilfishAnimationIdle:   INCLUDE "gfx/pokemon/qwilfish/anim_idle.asm"
+ScizorAnimationIdle:     INCLUDE "gfx/pokemon/scizor/anim_idle.asm"
+ShuckleAnimationIdle:    INCLUDE "gfx/pokemon/shuckle/anim_idle.asm"
+HeracrossAnimationIdle:  INCLUDE "gfx/pokemon/heracross/anim_idle.asm"
+SneaselAnimationIdle:    INCLUDE "gfx/pokemon/sneasel/anim_idle.asm"
+TeddiursaAnimationIdle:  INCLUDE "gfx/pokemon/teddiursa/anim_idle.asm"
+UrsaringAnimationIdle:   INCLUDE "gfx/pokemon/ursaring/anim_idle.asm"
+SlugmaAnimationIdle:     INCLUDE "gfx/pokemon/slugma/anim_idle.asm"
+MagcargoAnimationIdle:   INCLUDE "gfx/pokemon/magcargo/anim_idle.asm"
+SwinubAnimationIdle:     INCLUDE "gfx/pokemon/swinub/anim_idle.asm"
+PiloswineAnimationIdle:  INCLUDE "gfx/pokemon/piloswine/anim_idle.asm"
+CorsolaAnimationIdle:    INCLUDE "gfx/pokemon/corsola/anim_idle.asm"
+RemoraidAnimationIdle:   INCLUDE "gfx/pokemon/remoraid/anim_idle.asm"
+OctilleryAnimationIdle:  INCLUDE "gfx/pokemon/octillery/anim_idle.asm"
+DelibirdAnimationIdle:   INCLUDE "gfx/pokemon/delibird/anim_idle.asm"
+MantineAnimationIdle:    INCLUDE "gfx/pokemon/mantine/anim_idle.asm"
+SkarmoryAnimationIdle:   INCLUDE "gfx/pokemon/skarmory/anim_idle.asm"
+HoundourAnimationIdle:   INCLUDE "gfx/pokemon/houndour/anim_idle.asm"
+HoundoomAnimationIdle:   INCLUDE "gfx/pokemon/houndoom/anim_idle.asm"
+KingdraAnimationIdle:    INCLUDE "gfx/pokemon/kingdra/anim_idle.asm"
+PhanpyAnimationIdle:     INCLUDE "gfx/pokemon/phanpy/anim_idle.asm"
+DonphanAnimationIdle:    INCLUDE "gfx/pokemon/donphan/anim_idle.asm"
+Porygon2AnimationIdle:   INCLUDE "gfx/pokemon/porygon2/anim_idle.asm"
+StantlerAnimationIdle:   INCLUDE "gfx/pokemon/stantler/anim_idle.asm"
+SmeargleAnimationIdle:   INCLUDE "gfx/pokemon/smeargle/anim_idle.asm"
+TyrogueAnimationIdle:    INCLUDE "gfx/pokemon/tyrogue/anim_idle.asm"
+HitmontopAnimationIdle:  INCLUDE "gfx/pokemon/hitmontop/anim_idle.asm"
+SmoochumAnimationIdle:   INCLUDE "gfx/pokemon/smoochum/anim_idle.asm"
+ElekidAnimationIdle:     INCLUDE "gfx/pokemon/elekid/anim_idle.asm"
+MagbyAnimationIdle:      INCLUDE "gfx/pokemon/magby/anim_idle.asm"
+MiltankAnimationIdle:    INCLUDE "gfx/pokemon/miltank/anim_idle.asm"
+BlisseyAnimationIdle:    INCLUDE "gfx/pokemon/blissey/anim_idle.asm"
+RaikouAnimationIdle:     INCLUDE "gfx/pokemon/raikou/anim_idle.asm"
+EnteiAnimationIdle:      INCLUDE "gfx/pokemon/entei/anim_idle.asm"
+SuicuneAnimationIdle:    INCLUDE "gfx/pokemon/suicune/anim_idle.asm"
+LarvitarAnimationIdle:   INCLUDE "gfx/pokemon/larvitar/anim_idle.asm"
+PupitarAnimationIdle:    INCLUDE "gfx/pokemon/pupitar/anim_idle.asm"
+TyranitarAnimationIdle:  INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm"
+LugiaAnimationIdle:      INCLUDE "gfx/pokemon/lugia/anim_idle.asm"
+HoOhAnimationIdle:       INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm"
+CelebiAnimationIdle:     INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
+EggAnimationIdle:        INCLUDE "gfx/pokemon/egg/anim_idle.asm"
diff --git a/gfx/pokemon/igglybuff/anim0.asm b/gfx/pokemon/igglybuff/anim.asm
index 0b2430e44..0b2430e44 100644
--- a/gfx/pokemon/igglybuff/anim0.asm
+++ b/gfx/pokemon/igglybuff/anim.asm
diff --git a/gfx/pokemon/igglybuff/anim1.asm b/gfx/pokemon/igglybuff/anim_idle.asm
index 338a0ab2d..338a0ab2d 100644
--- a/gfx/pokemon/igglybuff/anim1.asm
+++ b/gfx/pokemon/igglybuff/anim_idle.asm
diff --git a/gfx/pokemon/ivysaur/anim0.asm b/gfx/pokemon/ivysaur/anim.asm
index 65e89f5ab..65e89f5ab 100644
--- a/gfx/pokemon/ivysaur/anim0.asm
+++ b/gfx/pokemon/ivysaur/anim.asm
diff --git a/gfx/pokemon/ivysaur/anim1.asm b/gfx/pokemon/ivysaur/anim_idle.asm
index 3df18b2cd..3df18b2cd 100644
--- a/gfx/pokemon/ivysaur/anim1.asm
+++ b/gfx/pokemon/ivysaur/anim_idle.asm
diff --git a/gfx/pokemon/jigglypuff/anim0.asm b/gfx/pokemon/jigglypuff/anim.asm
index ada7e0d99..ada7e0d99 100644
--- a/gfx/pokemon/jigglypuff/anim0.asm
+++ b/gfx/pokemon/jigglypuff/anim.asm
diff --git a/gfx/pokemon/jigglypuff/anim1.asm b/gfx/pokemon/jigglypuff/anim_idle.asm
index 40584de87..40584de87 100644
--- a/gfx/pokemon/jigglypuff/anim1.asm
+++ b/gfx/pokemon/jigglypuff/anim_idle.asm
diff --git a/gfx/pokemon/jolteon/anim0.asm b/gfx/pokemon/jolteon/anim.asm
index c4c01e60a..c4c01e60a 100644
--- a/gfx/pokemon/jolteon/anim0.asm
+++ b/gfx/pokemon/jolteon/anim.asm
diff --git a/gfx/pokemon/jolteon/anim1.asm b/gfx/pokemon/jolteon/anim_idle.asm
index 0b5481afd..0b5481afd 100644
--- a/gfx/pokemon/jolteon/anim1.asm
+++ b/gfx/pokemon/jolteon/anim_idle.asm
diff --git a/gfx/pokemon/jumpluff/anim0.asm b/gfx/pokemon/jumpluff/anim.asm
index c4161560e..c4161560e 100644
--- a/gfx/pokemon/jumpluff/anim0.asm
+++ b/gfx/pokemon/jumpluff/anim.asm
diff --git a/gfx/pokemon/jumpluff/anim1.asm b/gfx/pokemon/jumpluff/anim_idle.asm
index 5013b953f..5013b953f 100644
--- a/gfx/pokemon/jumpluff/anim1.asm
+++ b/gfx/pokemon/jumpluff/anim_idle.asm
diff --git a/gfx/pokemon/jynx/anim0.asm b/gfx/pokemon/jynx/anim.asm
index 78f0e63ed..78f0e63ed 100644
--- a/gfx/pokemon/jynx/anim0.asm
+++ b/gfx/pokemon/jynx/anim.asm
diff --git a/gfx/pokemon/jynx/anim1.asm b/gfx/pokemon/jynx/anim_idle.asm
index 42f42859c..42f42859c 100644
--- a/gfx/pokemon/jynx/anim1.asm
+++ b/gfx/pokemon/jynx/anim_idle.asm
diff --git a/gfx/pokemon/kabuto/anim0.asm b/gfx/pokemon/kabuto/anim.asm
index de308c900..de308c900 100644
--- a/gfx/pokemon/kabuto/anim0.asm
+++ b/gfx/pokemon/kabuto/anim.asm
diff --git a/gfx/pokemon/kabuto/anim1.asm b/gfx/pokemon/kabuto/anim_idle.asm
index 0e347c87d..0e347c87d 100644
--- a/gfx/pokemon/kabuto/anim1.asm
+++ b/gfx/pokemon/kabuto/anim_idle.asm
diff --git a/gfx/pokemon/kabutops/anim0.asm b/gfx/pokemon/kabutops/anim.asm
index f5812126a..f5812126a 100644
--- a/gfx/pokemon/kabutops/anim0.asm
+++ b/gfx/pokemon/kabutops/anim.asm
diff --git a/gfx/pokemon/kabutops/anim1.asm b/gfx/pokemon/kabutops/anim_idle.asm
index 32a70f827..32a70f827 100644
--- a/gfx/pokemon/kabutops/anim1.asm
+++ b/gfx/pokemon/kabutops/anim_idle.asm
diff --git a/gfx/pokemon/kadabra/anim0.asm b/gfx/pokemon/kadabra/anim.asm
index 9b132e26b..9b132e26b 100644
--- a/gfx/pokemon/kadabra/anim0.asm
+++ b/gfx/pokemon/kadabra/anim.asm
diff --git a/gfx/pokemon/kadabra/anim1.asm b/gfx/pokemon/kadabra/anim_idle.asm
index eabcdb07d..eabcdb07d 100644
--- a/gfx/pokemon/kadabra/anim1.asm
+++ b/gfx/pokemon/kadabra/anim_idle.asm
diff --git a/gfx/pokemon/kakuna/anim0.asm b/gfx/pokemon/kakuna/anim.asm
index b67e66e26..b67e66e26 100644
--- a/gfx/pokemon/kakuna/anim0.asm
+++ b/gfx/pokemon/kakuna/anim.asm
diff --git a/gfx/pokemon/kakuna/anim1.asm b/gfx/pokemon/kakuna/anim_idle.asm
index a7ca98540..a7ca98540 100644
--- a/gfx/pokemon/kakuna/anim1.asm
+++ b/gfx/pokemon/kakuna/anim_idle.asm
diff --git a/gfx/pokemon/kangaskhan/anim0.asm b/gfx/pokemon/kangaskhan/anim.asm
index 34363f893..34363f893 100644
--- a/gfx/pokemon/kangaskhan/anim0.asm
+++ b/gfx/pokemon/kangaskhan/anim.asm
diff --git a/gfx/pokemon/kangaskhan/anim1.asm b/gfx/pokemon/kangaskhan/anim_idle.asm
index 0da29ec4a..0da29ec4a 100644
--- a/gfx/pokemon/kangaskhan/anim1.asm
+++ b/gfx/pokemon/kangaskhan/anim_idle.asm
diff --git a/gfx/pokemon/kingdra/anim0.asm b/gfx/pokemon/kingdra/anim.asm
index c7bc2991f..c7bc2991f 100644
--- a/gfx/pokemon/kingdra/anim0.asm
+++ b/gfx/pokemon/kingdra/anim.asm
diff --git a/gfx/pokemon/kingdra/anim1.asm b/gfx/pokemon/kingdra/anim_idle.asm
index 2ec7e99ae..2ec7e99ae 100644
--- a/gfx/pokemon/kingdra/anim1.asm
+++ b/gfx/pokemon/kingdra/anim_idle.asm
diff --git a/gfx/pokemon/kingler/anim0.asm b/gfx/pokemon/kingler/anim.asm
index 2be7b62be..2be7b62be 100644
--- a/gfx/pokemon/kingler/anim0.asm
+++ b/gfx/pokemon/kingler/anim.asm
diff --git a/gfx/pokemon/kingler/anim1.asm b/gfx/pokemon/kingler/anim_idle.asm
index 25af73bc9..25af73bc9 100644
--- a/gfx/pokemon/kingler/anim1.asm
+++ b/gfx/pokemon/kingler/anim_idle.asm
diff --git a/gfx/pokemon/koffing/anim0.asm b/gfx/pokemon/koffing/anim.asm
index fc574f528..fc574f528 100644
--- a/gfx/pokemon/koffing/anim0.asm
+++ b/gfx/pokemon/koffing/anim.asm
diff --git a/gfx/pokemon/koffing/anim1.asm b/gfx/pokemon/koffing/anim_idle.asm
index e0e81b4d3..e0e81b4d3 100644
--- a/gfx/pokemon/koffing/anim1.asm
+++ b/gfx/pokemon/koffing/anim_idle.asm
diff --git a/gfx/pokemon/krabby/anim0.asm b/gfx/pokemon/krabby/anim.asm
index 22f5657e5..22f5657e5 100644
--- a/gfx/pokemon/krabby/anim0.asm
+++ b/gfx/pokemon/krabby/anim.asm
diff --git a/gfx/pokemon/krabby/anim1.asm b/gfx/pokemon/krabby/anim_idle.asm
index 0b89ffc33..0b89ffc33 100644
--- a/gfx/pokemon/krabby/anim1.asm
+++ b/gfx/pokemon/krabby/anim_idle.asm
diff --git a/gfx/pokemon/lanturn/anim0.asm b/gfx/pokemon/lanturn/anim.asm
index 18882deb5..18882deb5 100644
--- a/gfx/pokemon/lanturn/anim0.asm
+++ b/gfx/pokemon/lanturn/anim.asm
diff --git a/gfx/pokemon/lanturn/anim1.asm b/gfx/pokemon/lanturn/anim_idle.asm
index d57dd04b1..d57dd04b1 100644
--- a/gfx/pokemon/lanturn/anim1.asm
+++ b/gfx/pokemon/lanturn/anim_idle.asm
diff --git a/gfx/pokemon/lapras/anim0.asm b/gfx/pokemon/lapras/anim.asm
index 9ae8f4e5c..9ae8f4e5c 100644
--- a/gfx/pokemon/lapras/anim0.asm
+++ b/gfx/pokemon/lapras/anim.asm
diff --git a/gfx/pokemon/lapras/anim1.asm b/gfx/pokemon/lapras/anim_idle.asm
index 790cccf05..790cccf05 100644
--- a/gfx/pokemon/lapras/anim1.asm
+++ b/gfx/pokemon/lapras/anim_idle.asm
diff --git a/gfx/pokemon/larvitar/anim0.asm b/gfx/pokemon/larvitar/anim.asm
index bb861f733..bb861f733 100644
--- a/gfx/pokemon/larvitar/anim0.asm
+++ b/gfx/pokemon/larvitar/anim.asm
diff --git a/gfx/pokemon/larvitar/anim1.asm b/gfx/pokemon/larvitar/anim_idle.asm
index 2b87de7be..2b87de7be 100644
--- a/gfx/pokemon/larvitar/anim1.asm
+++ b/gfx/pokemon/larvitar/anim_idle.asm
diff --git a/gfx/pokemon/ledian/anim0.asm b/gfx/pokemon/ledian/anim.asm
index ece77ff44..ece77ff44 100644
--- a/gfx/pokemon/ledian/anim0.asm
+++ b/gfx/pokemon/ledian/anim.asm
diff --git a/gfx/pokemon/ledian/anim1.asm b/gfx/pokemon/ledian/anim_idle.asm
index cf5a0e011..cf5a0e011 100644
--- a/gfx/pokemon/ledian/anim1.asm
+++ b/gfx/pokemon/ledian/anim_idle.asm
diff --git a/gfx/pokemon/ledyba/anim0.asm b/gfx/pokemon/ledyba/anim.asm
index ac4c8e154..ac4c8e154 100644
--- a/gfx/pokemon/ledyba/anim0.asm
+++ b/gfx/pokemon/ledyba/anim.asm
diff --git a/gfx/pokemon/ledyba/anim1.asm b/gfx/pokemon/ledyba/anim_idle.asm
index d493c5fbc..d493c5fbc 100644
--- a/gfx/pokemon/ledyba/anim1.asm
+++ b/gfx/pokemon/ledyba/anim_idle.asm
diff --git a/gfx/pokemon/lickitung/anim0.asm b/gfx/pokemon/lickitung/anim.asm
index 2fb31e50b..2fb31e50b 100644
--- a/gfx/pokemon/lickitung/anim0.asm
+++ b/gfx/pokemon/lickitung/anim.asm
diff --git a/gfx/pokemon/lickitung/anim1.asm b/gfx/pokemon/lickitung/anim_idle.asm
index cf0355a03..cf0355a03 100644
--- a/gfx/pokemon/lickitung/anim1.asm
+++ b/gfx/pokemon/lickitung/anim_idle.asm
diff --git a/gfx/pokemon/lugia/anim0.asm b/gfx/pokemon/lugia/anim.asm
index 3c3c021a5..3c3c021a5 100644
--- a/gfx/pokemon/lugia/anim0.asm
+++ b/gfx/pokemon/lugia/anim.asm
diff --git a/gfx/pokemon/lugia/anim1.asm b/gfx/pokemon/lugia/anim_idle.asm
index 31f2ea09c..31f2ea09c 100644
--- a/gfx/pokemon/lugia/anim1.asm
+++ b/gfx/pokemon/lugia/anim_idle.asm
diff --git a/gfx/pokemon/machamp/anim0.asm b/gfx/pokemon/machamp/anim.asm
index 6202aefe5..6202aefe5 100644
--- a/gfx/pokemon/machamp/anim0.asm
+++ b/gfx/pokemon/machamp/anim.asm
diff --git a/gfx/pokemon/machamp/anim1.asm b/gfx/pokemon/machamp/anim_idle.asm
index 5171d3966..5171d3966 100644
--- a/gfx/pokemon/machamp/anim1.asm
+++ b/gfx/pokemon/machamp/anim_idle.asm
diff --git a/gfx/pokemon/machoke/anim0.asm b/gfx/pokemon/machoke/anim.asm
index 6d89ab174..6d89ab174 100644
--- a/gfx/pokemon/machoke/anim0.asm
+++ b/gfx/pokemon/machoke/anim.asm
diff --git a/gfx/pokemon/machoke/anim1.asm b/gfx/pokemon/machoke/anim_idle.asm
index c79f108d7..c79f108d7 100644
--- a/gfx/pokemon/machoke/anim1.asm
+++ b/gfx/pokemon/machoke/anim_idle.asm
diff --git a/gfx/pokemon/machop/anim0.asm b/gfx/pokemon/machop/anim.asm
index 8fee766ce..8fee766ce 100644
--- a/gfx/pokemon/machop/anim0.asm
+++ b/gfx/pokemon/machop/anim.asm
diff --git a/gfx/pokemon/machop/anim1.asm b/gfx/pokemon/machop/anim_idle.asm
index 20658284d..20658284d 100644
--- a/gfx/pokemon/machop/anim1.asm
+++ b/gfx/pokemon/machop/anim_idle.asm
diff --git a/gfx/pokemon/magby/anim0.asm b/gfx/pokemon/magby/anim.asm
index b0f8c7a10..b0f8c7a10 100644
--- a/gfx/pokemon/magby/anim0.asm
+++ b/gfx/pokemon/magby/anim.asm
diff --git a/gfx/pokemon/magby/anim1.asm b/gfx/pokemon/magby/anim_idle.asm
index 20b2b7997..20b2b7997 100644
--- a/gfx/pokemon/magby/anim1.asm
+++ b/gfx/pokemon/magby/anim_idle.asm
diff --git a/gfx/pokemon/magcargo/anim0.asm b/gfx/pokemon/magcargo/anim.asm
index d6bf7543a..d6bf7543a 100644
--- a/gfx/pokemon/magcargo/anim0.asm
+++ b/gfx/pokemon/magcargo/anim.asm
diff --git a/gfx/pokemon/magcargo/anim1.asm b/gfx/pokemon/magcargo/anim_idle.asm
index 3c76a44df..3c76a44df 100644
--- a/gfx/pokemon/magcargo/anim1.asm
+++ b/gfx/pokemon/magcargo/anim_idle.asm
diff --git a/gfx/pokemon/magikarp/anim0.asm b/gfx/pokemon/magikarp/anim.asm
index f06f21a40..f06f21a40 100644
--- a/gfx/pokemon/magikarp/anim0.asm
+++ b/gfx/pokemon/magikarp/anim.asm
diff --git a/gfx/pokemon/magikarp/anim1.asm b/gfx/pokemon/magikarp/anim_idle.asm
index 7c3f5cb76..7c3f5cb76 100644
--- a/gfx/pokemon/magikarp/anim1.asm
+++ b/gfx/pokemon/magikarp/anim_idle.asm
diff --git a/gfx/pokemon/magmar/anim0.asm b/gfx/pokemon/magmar/anim.asm
index 8fde5d3b5..8fde5d3b5 100644
--- a/gfx/pokemon/magmar/anim0.asm
+++ b/gfx/pokemon/magmar/anim.asm
diff --git a/gfx/pokemon/magmar/anim1.asm b/gfx/pokemon/magmar/anim_idle.asm
index 784bdcd3d..784bdcd3d 100644
--- a/gfx/pokemon/magmar/anim1.asm
+++ b/gfx/pokemon/magmar/anim_idle.asm
diff --git a/gfx/pokemon/magnemite/anim0.asm b/gfx/pokemon/magnemite/anim.asm
index 4f038b0ed..4f038b0ed 100644
--- a/gfx/pokemon/magnemite/anim0.asm
+++ b/gfx/pokemon/magnemite/anim.asm
diff --git a/gfx/pokemon/magnemite/anim1.asm b/gfx/pokemon/magnemite/anim_idle.asm
index a41239563..a41239563 100644
--- a/gfx/pokemon/magnemite/anim1.asm
+++ b/gfx/pokemon/magnemite/anim_idle.asm
diff --git a/gfx/pokemon/magneton/anim0.asm b/gfx/pokemon/magneton/anim.asm
index 26b34d4ec..26b34d4ec 100644
--- a/gfx/pokemon/magneton/anim0.asm
+++ b/gfx/pokemon/magneton/anim.asm
diff --git a/gfx/pokemon/magneton/anim1.asm b/gfx/pokemon/magneton/anim_idle.asm
index 6045d8fae..6045d8fae 100644
--- a/gfx/pokemon/magneton/anim1.asm
+++ b/gfx/pokemon/magneton/anim_idle.asm
diff --git a/gfx/pokemon/mankey/anim0.asm b/gfx/pokemon/mankey/anim.asm
index 7d6ef1fa5..7d6ef1fa5 100644
--- a/gfx/pokemon/mankey/anim0.asm
+++ b/gfx/pokemon/mankey/anim.asm
diff --git a/gfx/pokemon/mankey/anim1.asm b/gfx/pokemon/mankey/anim_idle.asm
index c5874fc6d..c5874fc6d 100644
--- a/gfx/pokemon/mankey/anim1.asm
+++ b/gfx/pokemon/mankey/anim_idle.asm
diff --git a/gfx/pokemon/mantine/anim0.asm b/gfx/pokemon/mantine/anim.asm
index d0a51de3e..d0a51de3e 100644
--- a/gfx/pokemon/mantine/anim0.asm
+++ b/gfx/pokemon/mantine/anim.asm
diff --git a/gfx/pokemon/mantine/anim1.asm b/gfx/pokemon/mantine/anim_idle.asm
index f552b1f09..f552b1f09 100644
--- a/gfx/pokemon/mantine/anim1.asm
+++ b/gfx/pokemon/mantine/anim_idle.asm
diff --git a/gfx/pokemon/mareep/anim0.asm b/gfx/pokemon/mareep/anim.asm
index e74a78cad..e74a78cad 100644
--- a/gfx/pokemon/mareep/anim0.asm
+++ b/gfx/pokemon/mareep/anim.asm
diff --git a/gfx/pokemon/mareep/anim1.asm b/gfx/pokemon/mareep/anim_idle.asm
index 21d7a79f8..21d7a79f8 100644
--- a/gfx/pokemon/mareep/anim1.asm
+++ b/gfx/pokemon/mareep/anim_idle.asm
diff --git a/gfx/pokemon/marill/anim0.asm b/gfx/pokemon/marill/anim.asm
index 5b8c7fc2a..5b8c7fc2a 100644
--- a/gfx/pokemon/marill/anim0.asm
+++ b/gfx/pokemon/marill/anim.asm
diff --git a/gfx/pokemon/marill/anim1.asm b/gfx/pokemon/marill/anim_idle.asm
index 3be2dd1dc..3be2dd1dc 100644
--- a/gfx/pokemon/marill/anim1.asm
+++ b/gfx/pokemon/marill/anim_idle.asm
diff --git a/gfx/pokemon/marowak/anim0.asm b/gfx/pokemon/marowak/anim.asm
index 23c9d2f92..23c9d2f92 100644
--- a/gfx/pokemon/marowak/anim0.asm
+++ b/gfx/pokemon/marowak/anim.asm
diff --git a/gfx/pokemon/marowak/anim1.asm b/gfx/pokemon/marowak/anim_idle.asm
index 5cdcd7594..5cdcd7594 100644
--- a/gfx/pokemon/marowak/anim1.asm
+++ b/gfx/pokemon/marowak/anim_idle.asm
diff --git a/gfx/pokemon/meganium/anim0.asm b/gfx/pokemon/meganium/anim.asm
index adf80db8f..adf80db8f 100644
--- a/gfx/pokemon/meganium/anim0.asm
+++ b/gfx/pokemon/meganium/anim.asm
diff --git a/gfx/pokemon/meganium/anim1.asm b/gfx/pokemon/meganium/anim_idle.asm
index f28c9d97a..f28c9d97a 100644
--- a/gfx/pokemon/meganium/anim1.asm
+++ b/gfx/pokemon/meganium/anim_idle.asm
diff --git a/gfx/pokemon/meowth/anim0.asm b/gfx/pokemon/meowth/anim.asm
index ff95e9c6d..ff95e9c6d 100644
--- a/gfx/pokemon/meowth/anim0.asm
+++ b/gfx/pokemon/meowth/anim.asm
diff --git a/gfx/pokemon/meowth/anim1.asm b/gfx/pokemon/meowth/anim_idle.asm
index 7f1e9eba8..7f1e9eba8 100644
--- a/gfx/pokemon/meowth/anim1.asm
+++ b/gfx/pokemon/meowth/anim_idle.asm
diff --git a/gfx/pokemon/metapod/anim0.asm b/gfx/pokemon/metapod/anim.asm
index da76c7094..da76c7094 100644
--- a/gfx/pokemon/metapod/anim0.asm
+++ b/gfx/pokemon/metapod/anim.asm
diff --git a/gfx/pokemon/metapod/anim1.asm b/gfx/pokemon/metapod/anim_idle.asm
index e22d46cb7..e22d46cb7 100644
--- a/gfx/pokemon/metapod/anim1.asm
+++ b/gfx/pokemon/metapod/anim_idle.asm
diff --git a/gfx/pokemon/mew/anim0.asm b/gfx/pokemon/mew/anim.asm
index b01e307de..b01e307de 100644
--- a/gfx/pokemon/mew/anim0.asm
+++ b/gfx/pokemon/mew/anim.asm
diff --git a/gfx/pokemon/mew/anim1.asm b/gfx/pokemon/mew/anim_idle.asm
index c22e552cb..c22e552cb 100644
--- a/gfx/pokemon/mew/anim1.asm
+++ b/gfx/pokemon/mew/anim_idle.asm
diff --git a/gfx/pokemon/mewtwo/anim0.asm b/gfx/pokemon/mewtwo/anim.asm
index 78682c111..78682c111 100644
--- a/gfx/pokemon/mewtwo/anim0.asm
+++ b/gfx/pokemon/mewtwo/anim.asm
diff --git a/gfx/pokemon/mewtwo/anim1.asm b/gfx/pokemon/mewtwo/anim_idle.asm
index a80a56899..a80a56899 100644
--- a/gfx/pokemon/mewtwo/anim1.asm
+++ b/gfx/pokemon/mewtwo/anim_idle.asm
diff --git a/gfx/pokemon/miltank/anim0.asm b/gfx/pokemon/miltank/anim.asm
index 6d12f2d5d..6d12f2d5d 100644
--- a/gfx/pokemon/miltank/anim0.asm
+++ b/gfx/pokemon/miltank/anim.asm
diff --git a/gfx/pokemon/miltank/anim1.asm b/gfx/pokemon/miltank/anim_idle.asm
index a6a76db7b..a6a76db7b 100644
--- a/gfx/pokemon/miltank/anim1.asm
+++ b/gfx/pokemon/miltank/anim_idle.asm
diff --git a/gfx/pokemon/misdreavus/anim0.asm b/gfx/pokemon/misdreavus/anim.asm
index d833c96fb..d833c96fb 100644
--- a/gfx/pokemon/misdreavus/anim0.asm
+++ b/gfx/pokemon/misdreavus/anim.asm
diff --git a/gfx/pokemon/misdreavus/anim1.asm b/gfx/pokemon/misdreavus/anim_idle.asm
index 3f0ee9517..3f0ee9517 100644
--- a/gfx/pokemon/misdreavus/anim1.asm
+++ b/gfx/pokemon/misdreavus/anim_idle.asm
diff --git a/gfx/pokemon/moltres/anim0.asm b/gfx/pokemon/moltres/anim.asm
index 220626749..220626749 100644
--- a/gfx/pokemon/moltres/anim0.asm
+++ b/gfx/pokemon/moltres/anim.asm
diff --git a/gfx/pokemon/moltres/anim1.asm b/gfx/pokemon/moltres/anim_idle.asm
index 258191b6e..258191b6e 100644
--- a/gfx/pokemon/moltres/anim1.asm
+++ b/gfx/pokemon/moltres/anim_idle.asm
diff --git a/gfx/pokemon/mr__mime/anim0.asm b/gfx/pokemon/mr__mime/anim.asm
index fcb597a5a..fcb597a5a 100644
--- a/gfx/pokemon/mr__mime/anim0.asm
+++ b/gfx/pokemon/mr__mime/anim.asm
diff --git a/gfx/pokemon/mr__mime/anim1.asm b/gfx/pokemon/mr__mime/anim_idle.asm
index c3747ac1e..c3747ac1e 100644
--- a/gfx/pokemon/mr__mime/anim1.asm
+++ b/gfx/pokemon/mr__mime/anim_idle.asm
diff --git a/gfx/pokemon/muk/anim0.asm b/gfx/pokemon/muk/anim.asm
index 1bacba421..1bacba421 100644
--- a/gfx/pokemon/muk/anim0.asm
+++ b/gfx/pokemon/muk/anim.asm
diff --git a/gfx/pokemon/muk/anim1.asm b/gfx/pokemon/muk/anim_idle.asm
index db37bf515..db37bf515 100644
--- a/gfx/pokemon/muk/anim1.asm
+++ b/gfx/pokemon/muk/anim_idle.asm
diff --git a/gfx/pokemon/murkrow/anim0.asm b/gfx/pokemon/murkrow/anim.asm
index 8f0ca6a72..8f0ca6a72 100644
--- a/gfx/pokemon/murkrow/anim0.asm
+++ b/gfx/pokemon/murkrow/anim.asm
diff --git a/gfx/pokemon/murkrow/anim1.asm b/gfx/pokemon/murkrow/anim_idle.asm
index 85e2f9c56..85e2f9c56 100644
--- a/gfx/pokemon/murkrow/anim1.asm
+++ b/gfx/pokemon/murkrow/anim_idle.asm
diff --git a/gfx/pokemon/natu/anim0.asm b/gfx/pokemon/natu/anim.asm
index 22c2659db..22c2659db 100644
--- a/gfx/pokemon/natu/anim0.asm
+++ b/gfx/pokemon/natu/anim.asm
diff --git a/gfx/pokemon/natu/anim1.asm b/gfx/pokemon/natu/anim_idle.asm
index a4a974877..a4a974877 100644
--- a/gfx/pokemon/natu/anim1.asm
+++ b/gfx/pokemon/natu/anim_idle.asm
diff --git a/gfx/pokemon/nidoking/anim0.asm b/gfx/pokemon/nidoking/anim.asm
index a32945d49..a32945d49 100644
--- a/gfx/pokemon/nidoking/anim0.asm
+++ b/gfx/pokemon/nidoking/anim.asm
diff --git a/gfx/pokemon/nidoking/anim1.asm b/gfx/pokemon/nidoking/anim_idle.asm
index 4e56028e1..4e56028e1 100644
--- a/gfx/pokemon/nidoking/anim1.asm
+++ b/gfx/pokemon/nidoking/anim_idle.asm
diff --git a/gfx/pokemon/nidoqueen/anim0.asm b/gfx/pokemon/nidoqueen/anim.asm
index bd9d8eee8..bd9d8eee8 100644
--- a/gfx/pokemon/nidoqueen/anim0.asm
+++ b/gfx/pokemon/nidoqueen/anim.asm
diff --git a/gfx/pokemon/nidoqueen/anim1.asm b/gfx/pokemon/nidoqueen/anim_idle.asm
index 1cc934c42..1cc934c42 100644
--- a/gfx/pokemon/nidoqueen/anim1.asm
+++ b/gfx/pokemon/nidoqueen/anim_idle.asm
diff --git a/gfx/pokemon/nidoran_f/anim0.asm b/gfx/pokemon/nidoran_f/anim.asm
index 623db13d1..623db13d1 100644
--- a/gfx/pokemon/nidoran_f/anim0.asm
+++ b/gfx/pokemon/nidoran_f/anim.asm
diff --git a/gfx/pokemon/nidoran_f/anim1.asm b/gfx/pokemon/nidoran_f/anim_idle.asm
index 348179aac..348179aac 100644
--- a/gfx/pokemon/nidoran_f/anim1.asm
+++ b/gfx/pokemon/nidoran_f/anim_idle.asm
diff --git a/gfx/pokemon/nidoran_m/anim0.asm b/gfx/pokemon/nidoran_m/anim.asm
index 9b8a38133..9b8a38133 100644
--- a/gfx/pokemon/nidoran_m/anim0.asm
+++ b/gfx/pokemon/nidoran_m/anim.asm
diff --git a/gfx/pokemon/nidoran_m/anim1.asm b/gfx/pokemon/nidoran_m/anim_idle.asm
index 20b437f6a..20b437f6a 100644
--- a/gfx/pokemon/nidoran_m/anim1.asm
+++ b/gfx/pokemon/nidoran_m/anim_idle.asm
diff --git a/gfx/pokemon/nidorina/anim0.asm b/gfx/pokemon/nidorina/anim.asm
index 6ab079db4..6ab079db4 100644
--- a/gfx/pokemon/nidorina/anim0.asm
+++ b/gfx/pokemon/nidorina/anim.asm
diff --git a/gfx/pokemon/nidorina/anim1.asm b/gfx/pokemon/nidorina/anim_idle.asm
index 6afb1cbc8..6afb1cbc8 100644
--- a/gfx/pokemon/nidorina/anim1.asm
+++ b/gfx/pokemon/nidorina/anim_idle.asm
diff --git a/gfx/pokemon/nidorino/anim0.asm b/gfx/pokemon/nidorino/anim.asm
index 16a6cb1dc..16a6cb1dc 100644
--- a/gfx/pokemon/nidorino/anim0.asm
+++ b/gfx/pokemon/nidorino/anim.asm
diff --git a/gfx/pokemon/nidorino/anim1.asm b/gfx/pokemon/nidorino/anim_idle.asm
index 40e17f454..40e17f454 100644
--- a/gfx/pokemon/nidorino/anim1.asm
+++ b/gfx/pokemon/nidorino/anim_idle.asm
diff --git a/gfx/pokemon/ninetales/anim0.asm b/gfx/pokemon/ninetales/anim.asm
index 0d691ee9d..0d691ee9d 100644
--- a/gfx/pokemon/ninetales/anim0.asm
+++ b/gfx/pokemon/ninetales/anim.asm
diff --git a/gfx/pokemon/ninetales/anim1.asm b/gfx/pokemon/ninetales/anim_idle.asm
index 68d1e8051..68d1e8051 100644
--- a/gfx/pokemon/ninetales/anim1.asm
+++ b/gfx/pokemon/ninetales/anim_idle.asm
diff --git a/gfx/pokemon/noctowl/anim0.asm b/gfx/pokemon/noctowl/anim.asm
index ce19c30a5..ce19c30a5 100644
--- a/gfx/pokemon/noctowl/anim0.asm
+++ b/gfx/pokemon/noctowl/anim.asm
diff --git a/gfx/pokemon/noctowl/anim1.asm b/gfx/pokemon/noctowl/anim_idle.asm
index 4fe81f336..4fe81f336 100644
--- a/gfx/pokemon/noctowl/anim1.asm
+++ b/gfx/pokemon/noctowl/anim_idle.asm
diff --git a/gfx/pokemon/octillery/anim0.asm b/gfx/pokemon/octillery/anim.asm
index 2405d46a1..2405d46a1 100644
--- a/gfx/pokemon/octillery/anim0.asm
+++ b/gfx/pokemon/octillery/anim.asm
diff --git a/gfx/pokemon/octillery/anim1.asm b/gfx/pokemon/octillery/anim_idle.asm
index 0903a867a..0903a867a 100644
--- a/gfx/pokemon/octillery/anim1.asm
+++ b/gfx/pokemon/octillery/anim_idle.asm
diff --git a/gfx/pokemon/oddish/anim0.asm b/gfx/pokemon/oddish/anim.asm
index 338771fce..338771fce 100644
--- a/gfx/pokemon/oddish/anim0.asm
+++ b/gfx/pokemon/oddish/anim.asm
diff --git a/gfx/pokemon/oddish/anim1.asm b/gfx/pokemon/oddish/anim_idle.asm
index 92d041ff5..92d041ff5 100644
--- a/gfx/pokemon/oddish/anim1.asm
+++ b/gfx/pokemon/oddish/anim_idle.asm
diff --git a/gfx/pokemon/omanyte/anim0.asm b/gfx/pokemon/omanyte/anim.asm
index 5863efecc..5863efecc 100644
--- a/gfx/pokemon/omanyte/anim0.asm
+++ b/gfx/pokemon/omanyte/anim.asm
diff --git a/gfx/pokemon/omanyte/anim1.asm b/gfx/pokemon/omanyte/anim_idle.asm
index ffdce5abd..ffdce5abd 100644
--- a/gfx/pokemon/omanyte/anim1.asm
+++ b/gfx/pokemon/omanyte/anim_idle.asm
diff --git a/gfx/pokemon/omastar/anim0.asm b/gfx/pokemon/omastar/anim.asm
index 76d8c3aa8..76d8c3aa8 100644
--- a/gfx/pokemon/omastar/anim0.asm
+++ b/gfx/pokemon/omastar/anim.asm
diff --git a/gfx/pokemon/omastar/anim1.asm b/gfx/pokemon/omastar/anim_idle.asm
index 60bcf04d2..60bcf04d2 100644
--- a/gfx/pokemon/omastar/anim1.asm
+++ b/gfx/pokemon/omastar/anim_idle.asm
diff --git a/gfx/pokemon/onix/anim0.asm b/gfx/pokemon/onix/anim.asm
index a5b18f5b6..a5b18f5b6 100644
--- a/gfx/pokemon/onix/anim0.asm
+++ b/gfx/pokemon/onix/anim.asm
diff --git a/gfx/pokemon/onix/anim1.asm b/gfx/pokemon/onix/anim_idle.asm
index e4ae7acac..e4ae7acac 100644
--- a/gfx/pokemon/onix/anim1.asm
+++ b/gfx/pokemon/onix/anim_idle.asm
diff --git a/gfx/pokemon/paras/anim0.asm b/gfx/pokemon/paras/anim.asm
index 6fcc935e9..6fcc935e9 100644
--- a/gfx/pokemon/paras/anim0.asm
+++ b/gfx/pokemon/paras/anim.asm
diff --git a/gfx/pokemon/paras/anim1.asm b/gfx/pokemon/paras/anim_idle.asm
index 3ce495f04..3ce495f04 100644
--- a/gfx/pokemon/paras/anim1.asm
+++ b/gfx/pokemon/paras/anim_idle.asm
diff --git a/gfx/pokemon/parasect/anim0.asm b/gfx/pokemon/parasect/anim.asm
index e9e253cee..e9e253cee 100644
--- a/gfx/pokemon/parasect/anim0.asm
+++ b/gfx/pokemon/parasect/anim.asm
diff --git a/gfx/pokemon/parasect/anim1.asm b/gfx/pokemon/parasect/anim_idle.asm
index 8275690a6..8275690a6 100644
--- a/gfx/pokemon/parasect/anim1.asm
+++ b/gfx/pokemon/parasect/anim_idle.asm
diff --git a/gfx/pokemon/persian/anim0.asm b/gfx/pokemon/persian/anim.asm
index ae771c09c..ae771c09c 100644
--- a/gfx/pokemon/persian/anim0.asm
+++ b/gfx/pokemon/persian/anim.asm
diff --git a/gfx/pokemon/persian/anim1.asm b/gfx/pokemon/persian/anim_idle.asm
index ca9129bfa..ca9129bfa 100644
--- a/gfx/pokemon/persian/anim1.asm
+++ b/gfx/pokemon/persian/anim_idle.asm
diff --git a/gfx/pokemon/phanpy/anim0.asm b/gfx/pokemon/phanpy/anim.asm
index 7ec513762..7ec513762 100644
--- a/gfx/pokemon/phanpy/anim0.asm
+++ b/gfx/pokemon/phanpy/anim.asm
diff --git a/gfx/pokemon/phanpy/anim1.asm b/gfx/pokemon/phanpy/anim_idle.asm
index 43148da49..43148da49 100644
--- a/gfx/pokemon/phanpy/anim1.asm
+++ b/gfx/pokemon/phanpy/anim_idle.asm
diff --git a/gfx/pokemon/pichu/anim0.asm b/gfx/pokemon/pichu/anim.asm
index 50a1ae73c..50a1ae73c 100644
--- a/gfx/pokemon/pichu/anim0.asm
+++ b/gfx/pokemon/pichu/anim.asm
diff --git a/gfx/pokemon/pichu/anim1.asm b/gfx/pokemon/pichu/anim_idle.asm
index dd39adcab..dd39adcab 100644
--- a/gfx/pokemon/pichu/anim1.asm
+++ b/gfx/pokemon/pichu/anim_idle.asm
diff --git a/gfx/pokemon/pidgeot/anim0.asm b/gfx/pokemon/pidgeot/anim.asm
index 34d5d3a98..34d5d3a98 100644
--- a/gfx/pokemon/pidgeot/anim0.asm
+++ b/gfx/pokemon/pidgeot/anim.asm
diff --git a/gfx/pokemon/pidgeot/anim1.asm b/gfx/pokemon/pidgeot/anim_idle.asm
index 6ba60e83e..6ba60e83e 100644
--- a/gfx/pokemon/pidgeot/anim1.asm
+++ b/gfx/pokemon/pidgeot/anim_idle.asm
diff --git a/gfx/pokemon/pidgeotto/anim0.asm b/gfx/pokemon/pidgeotto/anim.asm
index 53008855f..53008855f 100644
--- a/gfx/pokemon/pidgeotto/anim0.asm
+++ b/gfx/pokemon/pidgeotto/anim.asm
diff --git a/gfx/pokemon/pidgeotto/anim1.asm b/gfx/pokemon/pidgeotto/anim_idle.asm
index 95a27bb15..95a27bb15 100644
--- a/gfx/pokemon/pidgeotto/anim1.asm
+++ b/gfx/pokemon/pidgeotto/anim_idle.asm
diff --git a/gfx/pokemon/pidgey/anim0.asm b/gfx/pokemon/pidgey/anim.asm
index 4ca6553d2..4ca6553d2 100644
--- a/gfx/pokemon/pidgey/anim0.asm
+++ b/gfx/pokemon/pidgey/anim.asm
diff --git a/gfx/pokemon/pidgey/anim1.asm b/gfx/pokemon/pidgey/anim_idle.asm
index 25a55fb45..25a55fb45 100644
--- a/gfx/pokemon/pidgey/anim1.asm
+++ b/gfx/pokemon/pidgey/anim_idle.asm
diff --git a/gfx/pokemon/pikachu/anim0.asm b/gfx/pokemon/pikachu/anim.asm
index 6a1ac0954..6a1ac0954 100644
--- a/gfx/pokemon/pikachu/anim0.asm
+++ b/gfx/pokemon/pikachu/anim.asm
diff --git a/gfx/pokemon/pikachu/anim1.asm b/gfx/pokemon/pikachu/anim_idle.asm
index 0454a2855..0454a2855 100644
--- a/gfx/pokemon/pikachu/anim1.asm
+++ b/gfx/pokemon/pikachu/anim_idle.asm
diff --git a/gfx/pokemon/piloswine/anim0.asm b/gfx/pokemon/piloswine/anim.asm
index 5b57b3ef9..5b57b3ef9 100644
--- a/gfx/pokemon/piloswine/anim0.asm
+++ b/gfx/pokemon/piloswine/anim.asm
diff --git a/gfx/pokemon/piloswine/anim1.asm b/gfx/pokemon/piloswine/anim_idle.asm
index c1cba5ee2..c1cba5ee2 100644
--- a/gfx/pokemon/piloswine/anim1.asm
+++ b/gfx/pokemon/piloswine/anim_idle.asm
diff --git a/gfx/pokemon/pineco/anim0.asm b/gfx/pokemon/pineco/anim.asm
index 4579032ec..4579032ec 100644
--- a/gfx/pokemon/pineco/anim0.asm
+++ b/gfx/pokemon/pineco/anim.asm
diff --git a/gfx/pokemon/pineco/anim1.asm b/gfx/pokemon/pineco/anim_idle.asm
index f1b4e949e..f1b4e949e 100644
--- a/gfx/pokemon/pineco/anim1.asm
+++ b/gfx/pokemon/pineco/anim_idle.asm
diff --git a/gfx/pokemon/pinsir/anim0.asm b/gfx/pokemon/pinsir/anim.asm
index f45752006..f45752006 100644
--- a/gfx/pokemon/pinsir/anim0.asm
+++ b/gfx/pokemon/pinsir/anim.asm
diff --git a/gfx/pokemon/pinsir/anim1.asm b/gfx/pokemon/pinsir/anim_idle.asm
index 73895c2e0..73895c2e0 100644
--- a/gfx/pokemon/pinsir/anim1.asm
+++ b/gfx/pokemon/pinsir/anim_idle.asm
diff --git a/gfx/pokemon/politoed/anim0.asm b/gfx/pokemon/politoed/anim.asm
index 72347714f..72347714f 100644
--- a/gfx/pokemon/politoed/anim0.asm
+++ b/gfx/pokemon/politoed/anim.asm
diff --git a/gfx/pokemon/politoed/anim1.asm b/gfx/pokemon/politoed/anim_idle.asm
index 8ec01df37..8ec01df37 100644
--- a/gfx/pokemon/politoed/anim1.asm
+++ b/gfx/pokemon/politoed/anim_idle.asm
diff --git a/gfx/pokemon/poliwag/anim0.asm b/gfx/pokemon/poliwag/anim.asm
index 8446897c0..8446897c0 100644
--- a/gfx/pokemon/poliwag/anim0.asm
+++ b/gfx/pokemon/poliwag/anim.asm
diff --git a/gfx/pokemon/poliwag/anim1.asm b/gfx/pokemon/poliwag/anim_idle.asm
index 839e57e87..839e57e87 100644
--- a/gfx/pokemon/poliwag/anim1.asm
+++ b/gfx/pokemon/poliwag/anim_idle.asm
diff --git a/gfx/pokemon/poliwhirl/anim0.asm b/gfx/pokemon/poliwhirl/anim.asm
index 14cb89029..14cb89029 100644
--- a/gfx/pokemon/poliwhirl/anim0.asm
+++ b/gfx/pokemon/poliwhirl/anim.asm
diff --git a/gfx/pokemon/poliwhirl/anim1.asm b/gfx/pokemon/poliwhirl/anim_idle.asm
index 72ba07245..72ba07245 100644
--- a/gfx/pokemon/poliwhirl/anim1.asm
+++ b/gfx/pokemon/poliwhirl/anim_idle.asm
diff --git a/gfx/pokemon/poliwrath/anim0.asm b/gfx/pokemon/poliwrath/anim.asm
index 2b5fb0eef..2b5fb0eef 100644
--- a/gfx/pokemon/poliwrath/anim0.asm
+++ b/gfx/pokemon/poliwrath/anim.asm
diff --git a/gfx/pokemon/poliwrath/anim1.asm b/gfx/pokemon/poliwrath/anim_idle.asm
index f709ea35c..f709ea35c 100644
--- a/gfx/pokemon/poliwrath/anim1.asm
+++ b/gfx/pokemon/poliwrath/anim_idle.asm
diff --git a/gfx/pokemon/ponyta/anim0.asm b/gfx/pokemon/ponyta/anim.asm
index 34c3a82b6..34c3a82b6 100644
--- a/gfx/pokemon/ponyta/anim0.asm
+++ b/gfx/pokemon/ponyta/anim.asm
diff --git a/gfx/pokemon/ponyta/anim1.asm b/gfx/pokemon/ponyta/anim_idle.asm
index 10c9f42dd..10c9f42dd 100644
--- a/gfx/pokemon/ponyta/anim1.asm
+++ b/gfx/pokemon/ponyta/anim_idle.asm
diff --git a/gfx/pokemon/porygon/anim0.asm b/gfx/pokemon/porygon/anim.asm
index 0246a5621..0246a5621 100644
--- a/gfx/pokemon/porygon/anim0.asm
+++ b/gfx/pokemon/porygon/anim.asm
diff --git a/gfx/pokemon/porygon/anim1.asm b/gfx/pokemon/porygon/anim_idle.asm
index 89af5d13f..89af5d13f 100644
--- a/gfx/pokemon/porygon/anim1.asm
+++ b/gfx/pokemon/porygon/anim_idle.asm
diff --git a/gfx/pokemon/porygon2/anim0.asm b/gfx/pokemon/porygon2/anim.asm
index b94920e29..b94920e29 100644
--- a/gfx/pokemon/porygon2/anim0.asm
+++ b/gfx/pokemon/porygon2/anim.asm
diff --git a/gfx/pokemon/porygon2/anim1.asm b/gfx/pokemon/porygon2/anim_idle.asm
index b3a029047..b3a029047 100644
--- a/gfx/pokemon/porygon2/anim1.asm
+++ b/gfx/pokemon/porygon2/anim_idle.asm
diff --git a/gfx/pokemon/primeape/anim0.asm b/gfx/pokemon/primeape/anim.asm
index a2a427059..a2a427059 100644
--- a/gfx/pokemon/primeape/anim0.asm
+++ b/gfx/pokemon/primeape/anim.asm
diff --git a/gfx/pokemon/primeape/anim1.asm b/gfx/pokemon/primeape/anim_idle.asm
index 7d1c8a2d7..7d1c8a2d7 100644
--- a/gfx/pokemon/primeape/anim1.asm
+++ b/gfx/pokemon/primeape/anim_idle.asm
diff --git a/gfx/pokemon/psyduck/anim0.asm b/gfx/pokemon/psyduck/anim.asm
index da6f3aec6..da6f3aec6 100644
--- a/gfx/pokemon/psyduck/anim0.asm
+++ b/gfx/pokemon/psyduck/anim.asm
diff --git a/gfx/pokemon/psyduck/anim1.asm b/gfx/pokemon/psyduck/anim_idle.asm
index 2fabc5b19..2fabc5b19 100644
--- a/gfx/pokemon/psyduck/anim1.asm
+++ b/gfx/pokemon/psyduck/anim_idle.asm
diff --git a/gfx/pokemon/pupitar/anim0.asm b/gfx/pokemon/pupitar/anim.asm
index c3ea44bc9..c3ea44bc9 100644
--- a/gfx/pokemon/pupitar/anim0.asm
+++ b/gfx/pokemon/pupitar/anim.asm
diff --git a/gfx/pokemon/pupitar/anim1.asm b/gfx/pokemon/pupitar/anim_idle.asm
index efc0f3bb4..efc0f3bb4 100644
--- a/gfx/pokemon/pupitar/anim1.asm
+++ b/gfx/pokemon/pupitar/anim_idle.asm
diff --git a/gfx/pokemon/quagsire/anim0.asm b/gfx/pokemon/quagsire/anim.asm
index 852780069..852780069 100644
--- a/gfx/pokemon/quagsire/anim0.asm
+++ b/gfx/pokemon/quagsire/anim.asm
diff --git a/gfx/pokemon/quagsire/anim1.asm b/gfx/pokemon/quagsire/anim_idle.asm
index f5c2ed31b..f5c2ed31b 100644
--- a/gfx/pokemon/quagsire/anim1.asm
+++ b/gfx/pokemon/quagsire/anim_idle.asm
diff --git a/gfx/pokemon/quilava/anim0.asm b/gfx/pokemon/quilava/anim.asm
index b5df67978..b5df67978 100644
--- a/gfx/pokemon/quilava/anim0.asm
+++ b/gfx/pokemon/quilava/anim.asm
diff --git a/gfx/pokemon/quilava/anim1.asm b/gfx/pokemon/quilava/anim_idle.asm
index 09f187796..09f187796 100644
--- a/gfx/pokemon/quilava/anim1.asm
+++ b/gfx/pokemon/quilava/anim_idle.asm
diff --git a/gfx/pokemon/qwilfish/anim0.asm b/gfx/pokemon/qwilfish/anim.asm
index 6e5d62d04..6e5d62d04 100644
--- a/gfx/pokemon/qwilfish/anim0.asm
+++ b/gfx/pokemon/qwilfish/anim.asm
diff --git a/gfx/pokemon/qwilfish/anim1.asm b/gfx/pokemon/qwilfish/anim_idle.asm
index 4330e80cc..4330e80cc 100644
--- a/gfx/pokemon/qwilfish/anim1.asm
+++ b/gfx/pokemon/qwilfish/anim_idle.asm
diff --git a/gfx/pokemon/raichu/anim0.asm b/gfx/pokemon/raichu/anim.asm
index a7312c7ae..a7312c7ae 100644
--- a/gfx/pokemon/raichu/anim0.asm
+++ b/gfx/pokemon/raichu/anim.asm
diff --git a/gfx/pokemon/raichu/anim1.asm b/gfx/pokemon/raichu/anim_idle.asm
index 87f07ce9c..87f07ce9c 100644
--- a/gfx/pokemon/raichu/anim1.asm
+++ b/gfx/pokemon/raichu/anim_idle.asm
diff --git a/gfx/pokemon/raikou/anim0.asm b/gfx/pokemon/raikou/anim.asm
index 91931b3ef..91931b3ef 100644
--- a/gfx/pokemon/raikou/anim0.asm
+++ b/gfx/pokemon/raikou/anim.asm
diff --git a/gfx/pokemon/raikou/anim1.asm b/gfx/pokemon/raikou/anim_idle.asm
index ec54577cd..ec54577cd 100644
--- a/gfx/pokemon/raikou/anim1.asm
+++ b/gfx/pokemon/raikou/anim_idle.asm
diff --git a/gfx/pokemon/rapidash/anim0.asm b/gfx/pokemon/rapidash/anim.asm
index 6fe29db8f..6fe29db8f 100644
--- a/gfx/pokemon/rapidash/anim0.asm
+++ b/gfx/pokemon/rapidash/anim.asm
diff --git a/gfx/pokemon/rapidash/anim1.asm b/gfx/pokemon/rapidash/anim_idle.asm
index 0105673c9..0105673c9 100644
--- a/gfx/pokemon/rapidash/anim1.asm
+++ b/gfx/pokemon/rapidash/anim_idle.asm
diff --git a/gfx/pokemon/raticate/anim0.asm b/gfx/pokemon/raticate/anim.asm
index ad6450f27..ad6450f27 100644
--- a/gfx/pokemon/raticate/anim0.asm
+++ b/gfx/pokemon/raticate/anim.asm
diff --git a/gfx/pokemon/raticate/anim1.asm b/gfx/pokemon/raticate/anim_idle.asm
index 3ff83aa1c..3ff83aa1c 100644
--- a/gfx/pokemon/raticate/anim1.asm
+++ b/gfx/pokemon/raticate/anim_idle.asm
diff --git a/gfx/pokemon/rattata/anim0.asm b/gfx/pokemon/rattata/anim.asm
index 0c72f16f9..0c72f16f9 100644
--- a/gfx/pokemon/rattata/anim0.asm
+++ b/gfx/pokemon/rattata/anim.asm
diff --git a/gfx/pokemon/rattata/anim1.asm b/gfx/pokemon/rattata/anim_idle.asm
index a760b136e..a760b136e 100644
--- a/gfx/pokemon/rattata/anim1.asm
+++ b/gfx/pokemon/rattata/anim_idle.asm
diff --git a/gfx/pokemon/remoraid/anim0.asm b/gfx/pokemon/remoraid/anim.asm
index 5fca75d12..5fca75d12 100644
--- a/gfx/pokemon/remoraid/anim0.asm
+++ b/gfx/pokemon/remoraid/anim.asm
diff --git a/gfx/pokemon/remoraid/anim1.asm b/gfx/pokemon/remoraid/anim_idle.asm
index cb14bb7a7..cb14bb7a7 100644
--- a/gfx/pokemon/remoraid/anim1.asm
+++ b/gfx/pokemon/remoraid/anim_idle.asm
diff --git a/gfx/pokemon/rhydon/anim0.asm b/gfx/pokemon/rhydon/anim.asm
index 77d736a55..77d736a55 100644
--- a/gfx/pokemon/rhydon/anim0.asm
+++ b/gfx/pokemon/rhydon/anim.asm
diff --git a/gfx/pokemon/rhydon/anim1.asm b/gfx/pokemon/rhydon/anim_idle.asm
index b572a54ed..b572a54ed 100644
--- a/gfx/pokemon/rhydon/anim1.asm
+++ b/gfx/pokemon/rhydon/anim_idle.asm
diff --git a/gfx/pokemon/rhyhorn/anim0.asm b/gfx/pokemon/rhyhorn/anim.asm
index b966557c4..b966557c4 100644
--- a/gfx/pokemon/rhyhorn/anim0.asm
+++ b/gfx/pokemon/rhyhorn/anim.asm
diff --git a/gfx/pokemon/rhyhorn/anim1.asm b/gfx/pokemon/rhyhorn/anim_idle.asm
index 66e53642e..66e53642e 100644
--- a/gfx/pokemon/rhyhorn/anim1.asm
+++ b/gfx/pokemon/rhyhorn/anim_idle.asm
diff --git a/gfx/pokemon/sandshrew/anim0.asm b/gfx/pokemon/sandshrew/anim.asm
index 01827dda4..01827dda4 100644
--- a/gfx/pokemon/sandshrew/anim0.asm
+++ b/gfx/pokemon/sandshrew/anim.asm
diff --git a/gfx/pokemon/sandshrew/anim1.asm b/gfx/pokemon/sandshrew/anim_idle.asm
index 545b445bd..545b445bd 100644
--- a/gfx/pokemon/sandshrew/anim1.asm
+++ b/gfx/pokemon/sandshrew/anim_idle.asm
diff --git a/gfx/pokemon/sandslash/anim0.asm b/gfx/pokemon/sandslash/anim.asm
index 040c0c429..040c0c429 100644
--- a/gfx/pokemon/sandslash/anim0.asm
+++ b/gfx/pokemon/sandslash/anim.asm
diff --git a/gfx/pokemon/sandslash/anim1.asm b/gfx/pokemon/sandslash/anim_idle.asm
index b3480762d..b3480762d 100644
--- a/gfx/pokemon/sandslash/anim1.asm
+++ b/gfx/pokemon/sandslash/anim_idle.asm
diff --git a/gfx/pokemon/scizor/anim0.asm b/gfx/pokemon/scizor/anim.asm
index d269c91d1..d269c91d1 100644
--- a/gfx/pokemon/scizor/anim0.asm
+++ b/gfx/pokemon/scizor/anim.asm
diff --git a/gfx/pokemon/scizor/anim1.asm b/gfx/pokemon/scizor/anim_idle.asm
index 744d6cafc..744d6cafc 100644
--- a/gfx/pokemon/scizor/anim1.asm
+++ b/gfx/pokemon/scizor/anim_idle.asm
diff --git a/gfx/pokemon/scyther/anim0.asm b/gfx/pokemon/scyther/anim.asm
index 572161065..572161065 100644
--- a/gfx/pokemon/scyther/anim0.asm
+++ b/gfx/pokemon/scyther/anim.asm
diff --git a/gfx/pokemon/scyther/anim1.asm b/gfx/pokemon/scyther/anim_idle.asm
index e251a964d..e251a964d 100644
--- a/gfx/pokemon/scyther/anim1.asm
+++ b/gfx/pokemon/scyther/anim_idle.asm
diff --git a/gfx/pokemon/seadra/anim0.asm b/gfx/pokemon/seadra/anim.asm
index d06adbdb0..d06adbdb0 100644
--- a/gfx/pokemon/seadra/anim0.asm
+++ b/gfx/pokemon/seadra/anim.asm
diff --git a/gfx/pokemon/seadra/anim1.asm b/gfx/pokemon/seadra/anim_idle.asm
index d4c171276..d4c171276 100644
--- a/gfx/pokemon/seadra/anim1.asm
+++ b/gfx/pokemon/seadra/anim_idle.asm
diff --git a/gfx/pokemon/seaking/anim0.asm b/gfx/pokemon/seaking/anim.asm
index a147346e2..a147346e2 100644
--- a/gfx/pokemon/seaking/anim0.asm
+++ b/gfx/pokemon/seaking/anim.asm
diff --git a/gfx/pokemon/seaking/anim1.asm b/gfx/pokemon/seaking/anim_idle.asm
index 3d949a4bb..3d949a4bb 100644
--- a/gfx/pokemon/seaking/anim1.asm
+++ b/gfx/pokemon/seaking/anim_idle.asm
diff --git a/gfx/pokemon/seel/anim0.asm b/gfx/pokemon/seel/anim.asm
index ea92a35be..ea92a35be 100644
--- a/gfx/pokemon/seel/anim0.asm
+++ b/gfx/pokemon/seel/anim.asm
diff --git a/gfx/pokemon/seel/anim1.asm b/gfx/pokemon/seel/anim_idle.asm
index c601e55e5..c601e55e5 100644
--- a/gfx/pokemon/seel/anim1.asm
+++ b/gfx/pokemon/seel/anim_idle.asm
diff --git a/gfx/pokemon/sentret/anim0.asm b/gfx/pokemon/sentret/anim.asm
index 8080c7303..8080c7303 100644
--- a/gfx/pokemon/sentret/anim0.asm
+++ b/gfx/pokemon/sentret/anim.asm
diff --git a/gfx/pokemon/sentret/anim1.asm b/gfx/pokemon/sentret/anim_idle.asm
index 9fcaecad0..9fcaecad0 100644
--- a/gfx/pokemon/sentret/anim1.asm
+++ b/gfx/pokemon/sentret/anim_idle.asm
diff --git a/gfx/pokemon/shellder/anim0.asm b/gfx/pokemon/shellder/anim.asm
index 71aa3d358..71aa3d358 100644
--- a/gfx/pokemon/shellder/anim0.asm
+++ b/gfx/pokemon/shellder/anim.asm
diff --git a/gfx/pokemon/shellder/anim1.asm b/gfx/pokemon/shellder/anim_idle.asm
index c32e9d19c..c32e9d19c 100644
--- a/gfx/pokemon/shellder/anim1.asm
+++ b/gfx/pokemon/shellder/anim_idle.asm
diff --git a/gfx/pokemon/shuckle/anim0.asm b/gfx/pokemon/shuckle/anim.asm
index 148d2bf7d..148d2bf7d 100644
--- a/gfx/pokemon/shuckle/anim0.asm
+++ b/gfx/pokemon/shuckle/anim.asm
diff --git a/gfx/pokemon/shuckle/anim1.asm b/gfx/pokemon/shuckle/anim_idle.asm
index 4dd072951..4dd072951 100644
--- a/gfx/pokemon/shuckle/anim1.asm
+++ b/gfx/pokemon/shuckle/anim_idle.asm
diff --git a/gfx/pokemon/skarmory/anim0.asm b/gfx/pokemon/skarmory/anim.asm
index 64c2bfaf0..64c2bfaf0 100644
--- a/gfx/pokemon/skarmory/anim0.asm
+++ b/gfx/pokemon/skarmory/anim.asm
diff --git a/gfx/pokemon/skarmory/anim1.asm b/gfx/pokemon/skarmory/anim_idle.asm
index 1853c881f..1853c881f 100644
--- a/gfx/pokemon/skarmory/anim1.asm
+++ b/gfx/pokemon/skarmory/anim_idle.asm
diff --git a/gfx/pokemon/skiploom/anim0.asm b/gfx/pokemon/skiploom/anim.asm
index 2ab6422e5..2ab6422e5 100644
--- a/gfx/pokemon/skiploom/anim0.asm
+++ b/gfx/pokemon/skiploom/anim.asm
diff --git a/gfx/pokemon/skiploom/anim1.asm b/gfx/pokemon/skiploom/anim_idle.asm
index d26d1717e..d26d1717e 100644
--- a/gfx/pokemon/skiploom/anim1.asm
+++ b/gfx/pokemon/skiploom/anim_idle.asm
diff --git a/gfx/pokemon/slowbro/anim0.asm b/gfx/pokemon/slowbro/anim.asm
index cc288a464..cc288a464 100644
--- a/gfx/pokemon/slowbro/anim0.asm
+++ b/gfx/pokemon/slowbro/anim.asm
diff --git a/gfx/pokemon/slowbro/anim1.asm b/gfx/pokemon/slowbro/anim_idle.asm
index 9e793ee00..9e793ee00 100644
--- a/gfx/pokemon/slowbro/anim1.asm
+++ b/gfx/pokemon/slowbro/anim_idle.asm
diff --git a/gfx/pokemon/slowking/anim0.asm b/gfx/pokemon/slowking/anim.asm
index d7ab700bd..d7ab700bd 100644
--- a/gfx/pokemon/slowking/anim0.asm
+++ b/gfx/pokemon/slowking/anim.asm
diff --git a/gfx/pokemon/slowking/anim1.asm b/gfx/pokemon/slowking/anim_idle.asm
index 36fd7cd7a..36fd7cd7a 100644
--- a/gfx/pokemon/slowking/anim1.asm
+++ b/gfx/pokemon/slowking/anim_idle.asm
diff --git a/gfx/pokemon/slowpoke/anim0.asm b/gfx/pokemon/slowpoke/anim.asm
index fa391743c..fa391743c 100644
--- a/gfx/pokemon/slowpoke/anim0.asm
+++ b/gfx/pokemon/slowpoke/anim.asm
diff --git a/gfx/pokemon/slowpoke/anim1.asm b/gfx/pokemon/slowpoke/anim_idle.asm
index 805a281c5..805a281c5 100644
--- a/gfx/pokemon/slowpoke/anim1.asm
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
diff --git a/gfx/pokemon/slugma/anim0.asm b/gfx/pokemon/slugma/anim.asm
index 1c867ec37..1c867ec37 100644
--- a/gfx/pokemon/slugma/anim0.asm
+++ b/gfx/pokemon/slugma/anim.asm
diff --git a/gfx/pokemon/slugma/anim1.asm b/gfx/pokemon/slugma/anim_idle.asm
index 5bfe4e799..5bfe4e799 100644
--- a/gfx/pokemon/slugma/anim1.asm
+++ b/gfx/pokemon/slugma/anim_idle.asm
diff --git a/gfx/pokemon/smeargle/anim0.asm b/gfx/pokemon/smeargle/anim.asm
index 2144197fc..2144197fc 100644
--- a/gfx/pokemon/smeargle/anim0.asm
+++ b/gfx/pokemon/smeargle/anim.asm
diff --git a/gfx/pokemon/smeargle/anim1.asm b/gfx/pokemon/smeargle/anim_idle.asm
index 178b14959..178b14959 100644
--- a/gfx/pokemon/smeargle/anim1.asm
+++ b/gfx/pokemon/smeargle/anim_idle.asm
diff --git a/gfx/pokemon/smoochum/anim0.asm b/gfx/pokemon/smoochum/anim.asm
index 39f5e7ebe..39f5e7ebe 100644
--- a/gfx/pokemon/smoochum/anim0.asm
+++ b/gfx/pokemon/smoochum/anim.asm
diff --git a/gfx/pokemon/smoochum/anim1.asm b/gfx/pokemon/smoochum/anim_idle.asm
index 5ba02f113..5ba02f113 100644
--- a/gfx/pokemon/smoochum/anim1.asm
+++ b/gfx/pokemon/smoochum/anim_idle.asm
diff --git a/gfx/pokemon/sneasel/anim0.asm b/gfx/pokemon/sneasel/anim.asm
index 5b7f3fb79..5b7f3fb79 100644
--- a/gfx/pokemon/sneasel/anim0.asm
+++ b/gfx/pokemon/sneasel/anim.asm
diff --git a/gfx/pokemon/sneasel/anim1.asm b/gfx/pokemon/sneasel/anim_idle.asm
index 1d3e3a41d..1d3e3a41d 100644
--- a/gfx/pokemon/sneasel/anim1.asm
+++ b/gfx/pokemon/sneasel/anim_idle.asm
diff --git a/gfx/pokemon/snorlax/anim0.asm b/gfx/pokemon/snorlax/anim.asm
index 3825f3bca..3825f3bca 100644
--- a/gfx/pokemon/snorlax/anim0.asm
+++ b/gfx/pokemon/snorlax/anim.asm
diff --git a/gfx/pokemon/snorlax/anim1.asm b/gfx/pokemon/snorlax/anim_idle.asm
index 4969f8f1f..4969f8f1f 100644
--- a/gfx/pokemon/snorlax/anim1.asm
+++ b/gfx/pokemon/snorlax/anim_idle.asm
diff --git a/gfx/pokemon/snubbull/anim0.asm b/gfx/pokemon/snubbull/anim.asm
index d97f9b354..d97f9b354 100644
--- a/gfx/pokemon/snubbull/anim0.asm
+++ b/gfx/pokemon/snubbull/anim.asm
diff --git a/gfx/pokemon/snubbull/anim1.asm b/gfx/pokemon/snubbull/anim_idle.asm
index 08cae5b71..08cae5b71 100644
--- a/gfx/pokemon/snubbull/anim1.asm
+++ b/gfx/pokemon/snubbull/anim_idle.asm
diff --git a/gfx/pokemon/spearow/anim0.asm b/gfx/pokemon/spearow/anim.asm
index 35780c784..35780c784 100644
--- a/gfx/pokemon/spearow/anim0.asm
+++ b/gfx/pokemon/spearow/anim.asm
diff --git a/gfx/pokemon/spearow/anim1.asm b/gfx/pokemon/spearow/anim_idle.asm
index ed487ecc3..ed487ecc3 100644
--- a/gfx/pokemon/spearow/anim1.asm
+++ b/gfx/pokemon/spearow/anim_idle.asm
diff --git a/gfx/pokemon/spinarak/anim0.asm b/gfx/pokemon/spinarak/anim.asm
index be299fc49..be299fc49 100644
--- a/gfx/pokemon/spinarak/anim0.asm
+++ b/gfx/pokemon/spinarak/anim.asm
diff --git a/gfx/pokemon/spinarak/anim1.asm b/gfx/pokemon/spinarak/anim_idle.asm
index c605578ef..c605578ef 100644
--- a/gfx/pokemon/spinarak/anim1.asm
+++ b/gfx/pokemon/spinarak/anim_idle.asm
diff --git a/gfx/pokemon/squirtle/anim0.asm b/gfx/pokemon/squirtle/anim.asm
index 9969d4263..9969d4263 100644
--- a/gfx/pokemon/squirtle/anim0.asm
+++ b/gfx/pokemon/squirtle/anim.asm
diff --git a/gfx/pokemon/squirtle/anim1.asm b/gfx/pokemon/squirtle/anim_idle.asm
index de24c37a6..de24c37a6 100644
--- a/gfx/pokemon/squirtle/anim1.asm
+++ b/gfx/pokemon/squirtle/anim_idle.asm
diff --git a/gfx/pokemon/stantler/anim0.asm b/gfx/pokemon/stantler/anim.asm
index 8f4c133d8..8f4c133d8 100644
--- a/gfx/pokemon/stantler/anim0.asm
+++ b/gfx/pokemon/stantler/anim.asm
diff --git a/gfx/pokemon/stantler/anim1.asm b/gfx/pokemon/stantler/anim_idle.asm
index 7444d761a..7444d761a 100644
--- a/gfx/pokemon/stantler/anim1.asm
+++ b/gfx/pokemon/stantler/anim_idle.asm
diff --git a/gfx/pokemon/starmie/anim0.asm b/gfx/pokemon/starmie/anim.asm
index c81477807..c81477807 100644
--- a/gfx/pokemon/starmie/anim0.asm
+++ b/gfx/pokemon/starmie/anim.asm
diff --git a/gfx/pokemon/starmie/anim1.asm b/gfx/pokemon/starmie/anim_idle.asm
index 7508e6e10..7508e6e10 100644
--- a/gfx/pokemon/starmie/anim1.asm
+++ b/gfx/pokemon/starmie/anim_idle.asm
diff --git a/gfx/pokemon/staryu/anim0.asm b/gfx/pokemon/staryu/anim.asm
index d257949e7..d257949e7 100644
--- a/gfx/pokemon/staryu/anim0.asm
+++ b/gfx/pokemon/staryu/anim.asm
diff --git a/gfx/pokemon/staryu/anim1.asm b/gfx/pokemon/staryu/anim_idle.asm
index 184806574..184806574 100644
--- a/gfx/pokemon/staryu/anim1.asm
+++ b/gfx/pokemon/staryu/anim_idle.asm
diff --git a/gfx/pokemon/steelix/anim0.asm b/gfx/pokemon/steelix/anim.asm
index 9acb2af0a..9acb2af0a 100644
--- a/gfx/pokemon/steelix/anim0.asm
+++ b/gfx/pokemon/steelix/anim.asm
diff --git a/gfx/pokemon/steelix/anim1.asm b/gfx/pokemon/steelix/anim_idle.asm
index 3c1de78fb..3c1de78fb 100644
--- a/gfx/pokemon/steelix/anim1.asm
+++ b/gfx/pokemon/steelix/anim_idle.asm
diff --git a/gfx/pokemon/sudowoodo/anim0.asm b/gfx/pokemon/sudowoodo/anim.asm
index 8e974a074..8e974a074 100644
--- a/gfx/pokemon/sudowoodo/anim0.asm
+++ b/gfx/pokemon/sudowoodo/anim.asm
diff --git a/gfx/pokemon/sudowoodo/anim1.asm b/gfx/pokemon/sudowoodo/anim_idle.asm
index e42e960f9..e42e960f9 100644
--- a/gfx/pokemon/sudowoodo/anim1.asm
+++ b/gfx/pokemon/sudowoodo/anim_idle.asm
diff --git a/gfx/pokemon/suicune/anim0.asm b/gfx/pokemon/suicune/anim.asm
index 0f2528116..0f2528116 100644
--- a/gfx/pokemon/suicune/anim0.asm
+++ b/gfx/pokemon/suicune/anim.asm
diff --git a/gfx/pokemon/suicune/anim1.asm b/gfx/pokemon/suicune/anim_idle.asm
index 9e018683a..9e018683a 100644
--- a/gfx/pokemon/suicune/anim1.asm
+++ b/gfx/pokemon/suicune/anim_idle.asm
diff --git a/gfx/pokemon/sunflora/anim0.asm b/gfx/pokemon/sunflora/anim.asm
index aad8ddadd..aad8ddadd 100644
--- a/gfx/pokemon/sunflora/anim0.asm
+++ b/gfx/pokemon/sunflora/anim.asm
diff --git a/gfx/pokemon/sunflora/anim1.asm b/gfx/pokemon/sunflora/anim_idle.asm
index e78d5449e..e78d5449e 100644
--- a/gfx/pokemon/sunflora/anim1.asm
+++ b/gfx/pokemon/sunflora/anim_idle.asm
diff --git a/gfx/pokemon/sunkern/anim0.asm b/gfx/pokemon/sunkern/anim.asm
index c282b1fb2..c282b1fb2 100644
--- a/gfx/pokemon/sunkern/anim0.asm
+++ b/gfx/pokemon/sunkern/anim.asm
diff --git a/gfx/pokemon/sunkern/anim1.asm b/gfx/pokemon/sunkern/anim_idle.asm
index f92d267a1..f92d267a1 100644
--- a/gfx/pokemon/sunkern/anim1.asm
+++ b/gfx/pokemon/sunkern/anim_idle.asm
diff --git a/gfx/pokemon/swinub/anim0.asm b/gfx/pokemon/swinub/anim.asm
index f1d93138a..f1d93138a 100644
--- a/gfx/pokemon/swinub/anim0.asm
+++ b/gfx/pokemon/swinub/anim.asm
diff --git a/gfx/pokemon/swinub/anim1.asm b/gfx/pokemon/swinub/anim_idle.asm
index 5fe97a2ba..5fe97a2ba 100644
--- a/gfx/pokemon/swinub/anim1.asm
+++ b/gfx/pokemon/swinub/anim_idle.asm
diff --git a/gfx/pokemon/tangela/anim0.asm b/gfx/pokemon/tangela/anim.asm
index 57a237afe..57a237afe 100644
--- a/gfx/pokemon/tangela/anim0.asm
+++ b/gfx/pokemon/tangela/anim.asm
diff --git a/gfx/pokemon/tangela/anim1.asm b/gfx/pokemon/tangela/anim_idle.asm
index 7d8b2550f..7d8b2550f 100644
--- a/gfx/pokemon/tangela/anim1.asm
+++ b/gfx/pokemon/tangela/anim_idle.asm
diff --git a/gfx/pokemon/tauros/anim0.asm b/gfx/pokemon/tauros/anim.asm
index 52c9264c3..52c9264c3 100644
--- a/gfx/pokemon/tauros/anim0.asm
+++ b/gfx/pokemon/tauros/anim.asm
diff --git a/gfx/pokemon/tauros/anim1.asm b/gfx/pokemon/tauros/anim_idle.asm
index ab6608d0d..ab6608d0d 100644
--- a/gfx/pokemon/tauros/anim1.asm
+++ b/gfx/pokemon/tauros/anim_idle.asm
diff --git a/gfx/pokemon/teddiursa/anim0.asm b/gfx/pokemon/teddiursa/anim.asm
index 78bbeae60..78bbeae60 100644
--- a/gfx/pokemon/teddiursa/anim0.asm
+++ b/gfx/pokemon/teddiursa/anim.asm
diff --git a/gfx/pokemon/teddiursa/anim1.asm b/gfx/pokemon/teddiursa/anim_idle.asm
index 85cae5284..85cae5284 100644
--- a/gfx/pokemon/teddiursa/anim1.asm
+++ b/gfx/pokemon/teddiursa/anim_idle.asm
diff --git a/gfx/pokemon/tentacool/anim0.asm b/gfx/pokemon/tentacool/anim.asm
index 19b7d3a14..19b7d3a14 100644
--- a/gfx/pokemon/tentacool/anim0.asm
+++ b/gfx/pokemon/tentacool/anim.asm
diff --git a/gfx/pokemon/tentacool/anim1.asm b/gfx/pokemon/tentacool/anim_idle.asm
index 4e9ba0b11..4e9ba0b11 100644
--- a/gfx/pokemon/tentacool/anim1.asm
+++ b/gfx/pokemon/tentacool/anim_idle.asm
diff --git a/gfx/pokemon/tentacruel/anim0.asm b/gfx/pokemon/tentacruel/anim.asm
index 4fed8e9d4..4fed8e9d4 100644
--- a/gfx/pokemon/tentacruel/anim0.asm
+++ b/gfx/pokemon/tentacruel/anim.asm
diff --git a/gfx/pokemon/tentacruel/anim1.asm b/gfx/pokemon/tentacruel/anim_idle.asm
index fd8d510b4..fd8d510b4 100644
--- a/gfx/pokemon/tentacruel/anim1.asm
+++ b/gfx/pokemon/tentacruel/anim_idle.asm
diff --git a/gfx/pokemon/togepi/anim0.asm b/gfx/pokemon/togepi/anim.asm
index a09192323..a09192323 100644
--- a/gfx/pokemon/togepi/anim0.asm
+++ b/gfx/pokemon/togepi/anim.asm
diff --git a/gfx/pokemon/togepi/anim1.asm b/gfx/pokemon/togepi/anim_idle.asm
index e3bd76591..e3bd76591 100644
--- a/gfx/pokemon/togepi/anim1.asm
+++ b/gfx/pokemon/togepi/anim_idle.asm
diff --git a/gfx/pokemon/togetic/anim0.asm b/gfx/pokemon/togetic/anim.asm
index cd1ac8f9b..cd1ac8f9b 100644
--- a/gfx/pokemon/togetic/anim0.asm
+++ b/gfx/pokemon/togetic/anim.asm
diff --git a/gfx/pokemon/togetic/anim1.asm b/gfx/pokemon/togetic/anim_idle.asm
index 543befa82..543befa82 100644
--- a/gfx/pokemon/togetic/anim1.asm
+++ b/gfx/pokemon/togetic/anim_idle.asm
diff --git a/gfx/pokemon/totodile/anim0.asm b/gfx/pokemon/totodile/anim.asm
index c320f4646..c320f4646 100644
--- a/gfx/pokemon/totodile/anim0.asm
+++ b/gfx/pokemon/totodile/anim.asm
diff --git a/gfx/pokemon/totodile/anim1.asm b/gfx/pokemon/totodile/anim_idle.asm
index 35379db93..35379db93 100644
--- a/gfx/pokemon/totodile/anim1.asm
+++ b/gfx/pokemon/totodile/anim_idle.asm
diff --git a/gfx/pokemon/typhlosion/anim0.asm b/gfx/pokemon/typhlosion/anim.asm
index bb4b30d6c..bb4b30d6c 100644
--- a/gfx/pokemon/typhlosion/anim0.asm
+++ b/gfx/pokemon/typhlosion/anim.asm
diff --git a/gfx/pokemon/typhlosion/anim1.asm b/gfx/pokemon/typhlosion/anim_idle.asm
index 2f7ed3abc..2f7ed3abc 100644
--- a/gfx/pokemon/typhlosion/anim1.asm
+++ b/gfx/pokemon/typhlosion/anim_idle.asm
diff --git a/gfx/pokemon/tyranitar/anim0.asm b/gfx/pokemon/tyranitar/anim.asm
index f345bdd8e..f345bdd8e 100644
--- a/gfx/pokemon/tyranitar/anim0.asm
+++ b/gfx/pokemon/tyranitar/anim.asm
diff --git a/gfx/pokemon/tyranitar/anim1.asm b/gfx/pokemon/tyranitar/anim_idle.asm
index 29788fd1d..29788fd1d 100644
--- a/gfx/pokemon/tyranitar/anim1.asm
+++ b/gfx/pokemon/tyranitar/anim_idle.asm
diff --git a/gfx/pokemon/tyrogue/anim0.asm b/gfx/pokemon/tyrogue/anim.asm
index e1470d816..e1470d816 100644
--- a/gfx/pokemon/tyrogue/anim0.asm
+++ b/gfx/pokemon/tyrogue/anim.asm
diff --git a/gfx/pokemon/tyrogue/anim1.asm b/gfx/pokemon/tyrogue/anim_idle.asm
index da73f62e3..da73f62e3 100644
--- a/gfx/pokemon/tyrogue/anim1.asm
+++ b/gfx/pokemon/tyrogue/anim_idle.asm
diff --git a/gfx/pokemon/umbreon/anim0.asm b/gfx/pokemon/umbreon/anim.asm
index 541539979..541539979 100644
--- a/gfx/pokemon/umbreon/anim0.asm
+++ b/gfx/pokemon/umbreon/anim.asm
diff --git a/gfx/pokemon/umbreon/anim1.asm b/gfx/pokemon/umbreon/anim_idle.asm
index adb0158e2..adb0158e2 100644
--- a/gfx/pokemon/umbreon/anim1.asm
+++ b/gfx/pokemon/umbreon/anim_idle.asm
diff --git a/gfx/pokemon/unown/anim0.asm b/gfx/pokemon/unown/anim.asm
index 510d2751c..510d2751c 100644
--- a/gfx/pokemon/unown/anim0.asm
+++ b/gfx/pokemon/unown/anim.asm
diff --git a/gfx/pokemon/unown/anim1.asm b/gfx/pokemon/unown/anim_idle.asm
index 3d0f65488..3d0f65488 100644
--- a/gfx/pokemon/unown/anim1.asm
+++ b/gfx/pokemon/unown/anim_idle.asm
diff --git a/gfx/pokemon/unown_a/anim0.asm b/gfx/pokemon/unown_a/anim.asm
index 7243ed0fb..7243ed0fb 100644
--- a/gfx/pokemon/unown_a/anim0.asm
+++ b/gfx/pokemon/unown_a/anim.asm
diff --git a/gfx/pokemon/unown_a/anim1.asm b/gfx/pokemon/unown_a/anim_idle.asm
index d995ba44d..d995ba44d 100644
--- a/gfx/pokemon/unown_a/anim1.asm
+++ b/gfx/pokemon/unown_a/anim_idle.asm
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
index cb5bf0aa2..ea4d46410 100644
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -1,27 +1,27 @@
 UnownAnimations:
-UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim0.asm"
-UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim0.asm"
-UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim0.asm"
-UnownDAnimation: INCLUDE "gfx/pokemon/unown_d/anim0.asm"
-UnownEAnimation: INCLUDE "gfx/pokemon/unown_e/anim0.asm"
-UnownFAnimation: INCLUDE "gfx/pokemon/unown_f/anim0.asm"
-UnownGAnimation: INCLUDE "gfx/pokemon/unown_g/anim0.asm"
-UnownHAnimation: INCLUDE "gfx/pokemon/unown_h/anim0.asm"
-UnownIAnimation: INCLUDE "gfx/pokemon/unown_i/anim0.asm"
-UnownJAnimation: INCLUDE "gfx/pokemon/unown_j/anim0.asm"
-UnownKAnimation: INCLUDE "gfx/pokemon/unown_k/anim0.asm"
-UnownLAnimation: INCLUDE "gfx/pokemon/unown_l/anim0.asm"
-UnownMAnimation: INCLUDE "gfx/pokemon/unown_m/anim0.asm"
-UnownNAnimation: INCLUDE "gfx/pokemon/unown_n/anim0.asm"
-UnownOAnimation: INCLUDE "gfx/pokemon/unown_o/anim0.asm"
-UnownPAnimation: INCLUDE "gfx/pokemon/unown_p/anim0.asm"
-UnownQAnimation: INCLUDE "gfx/pokemon/unown_q/anim0.asm"
-UnownRAnimation: INCLUDE "gfx/pokemon/unown_r/anim0.asm"
-UnownSAnimation: INCLUDE "gfx/pokemon/unown_s/anim0.asm"
-UnownTAnimation: INCLUDE "gfx/pokemon/unown_t/anim0.asm"
-UnownUAnimation: INCLUDE "gfx/pokemon/unown_u/anim0.asm"
-UnownVAnimation: INCLUDE "gfx/pokemon/unown_v/anim0.asm"
-UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim0.asm"
-UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim0.asm"
-UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim0.asm"
-UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim0.asm"
+UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
+UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
+UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"
+UnownDAnimation: INCLUDE "gfx/pokemon/unown_d/anim.asm"
+UnownEAnimation: INCLUDE "gfx/pokemon/unown_e/anim.asm"
+UnownFAnimation: INCLUDE "gfx/pokemon/unown_f/anim.asm"
+UnownGAnimation: INCLUDE "gfx/pokemon/unown_g/anim.asm"
+UnownHAnimation: INCLUDE "gfx/pokemon/unown_h/anim.asm"
+UnownIAnimation: INCLUDE "gfx/pokemon/unown_i/anim.asm"
+UnownJAnimation: INCLUDE "gfx/pokemon/unown_j/anim.asm"
+UnownKAnimation: INCLUDE "gfx/pokemon/unown_k/anim.asm"
+UnownLAnimation: INCLUDE "gfx/pokemon/unown_l/anim.asm"
+UnownMAnimation: INCLUDE "gfx/pokemon/unown_m/anim.asm"
+UnownNAnimation: INCLUDE "gfx/pokemon/unown_n/anim.asm"
+UnownOAnimation: INCLUDE "gfx/pokemon/unown_o/anim.asm"
+UnownPAnimation: INCLUDE "gfx/pokemon/unown_p/anim.asm"
+UnownQAnimation: INCLUDE "gfx/pokemon/unown_q/anim.asm"
+UnownRAnimation: INCLUDE "gfx/pokemon/unown_r/anim.asm"
+UnownSAnimation: INCLUDE "gfx/pokemon/unown_s/anim.asm"
+UnownTAnimation: INCLUDE "gfx/pokemon/unown_t/anim.asm"
+UnownUAnimation: INCLUDE "gfx/pokemon/unown_u/anim.asm"
+UnownVAnimation: INCLUDE "gfx/pokemon/unown_v/anim.asm"
+UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim.asm"
+UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim.asm"
+UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim.asm"
+UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim.asm"
diff --git a/gfx/pokemon/unown_b/anim0.asm b/gfx/pokemon/unown_b/anim.asm
index 7683b9e84..7683b9e84 100644
--- a/gfx/pokemon/unown_b/anim0.asm
+++ b/gfx/pokemon/unown_b/anim.asm
diff --git a/gfx/pokemon/unown_b/anim1.asm b/gfx/pokemon/unown_b/anim_idle.asm
index b8e03b299..b8e03b299 100644
--- a/gfx/pokemon/unown_b/anim1.asm
+++ b/gfx/pokemon/unown_b/anim_idle.asm
diff --git a/gfx/pokemon/unown_c/anim0.asm b/gfx/pokemon/unown_c/anim.asm
index 1e8b894ab..1e8b894ab 100644
--- a/gfx/pokemon/unown_c/anim0.asm
+++ b/gfx/pokemon/unown_c/anim.asm
diff --git a/gfx/pokemon/unown_c/anim1.asm b/gfx/pokemon/unown_c/anim_idle.asm
index fcf07ced3..fcf07ced3 100644
--- a/gfx/pokemon/unown_c/anim1.asm
+++ b/gfx/pokemon/unown_c/anim_idle.asm
diff --git a/gfx/pokemon/unown_d/anim0.asm b/gfx/pokemon/unown_d/anim.asm
index 51c3b2de1..51c3b2de1 100644
--- a/gfx/pokemon/unown_d/anim0.asm
+++ b/gfx/pokemon/unown_d/anim.asm
diff --git a/gfx/pokemon/unown_d/anim1.asm b/gfx/pokemon/unown_d/anim_idle.asm
index 17604ce36..17604ce36 100644
--- a/gfx/pokemon/unown_d/anim1.asm
+++ b/gfx/pokemon/unown_d/anim_idle.asm
diff --git a/gfx/pokemon/unown_e/anim0.asm b/gfx/pokemon/unown_e/anim.asm
index 0a58feb4d..0a58feb4d 100644
--- a/gfx/pokemon/unown_e/anim0.asm
+++ b/gfx/pokemon/unown_e/anim.asm
diff --git a/gfx/pokemon/unown_e/anim1.asm b/gfx/pokemon/unown_e/anim_idle.asm
index 53db93c1f..53db93c1f 100644
--- a/gfx/pokemon/unown_e/anim1.asm
+++ b/gfx/pokemon/unown_e/anim_idle.asm
diff --git a/gfx/pokemon/unown_extra_pointers.asm b/gfx/pokemon/unown_extra_pointers.asm
deleted file mode 100644
index 5b466064d..000000000
--- a/gfx/pokemon/unown_extra_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimationExtraPointers:
-	dw UnownAAnimationExtra
-	dw UnownBAnimationExtra
-	dw UnownCAnimationExtra
-	dw UnownDAnimationExtra
-	dw UnownEAnimationExtra
-	dw UnownFAnimationExtra
-	dw UnownGAnimationExtra
-	dw UnownHAnimationExtra
-	dw UnownIAnimationExtra
-	dw UnownJAnimationExtra
-	dw UnownKAnimationExtra
-	dw UnownLAnimationExtra
-	dw UnownMAnimationExtra
-	dw UnownNAnimationExtra
-	dw UnownOAnimationExtra
-	dw UnownPAnimationExtra
-	dw UnownQAnimationExtra
-	dw UnownRAnimationExtra
-	dw UnownSAnimationExtra
-	dw UnownTAnimationExtra
-	dw UnownUAnimationExtra
-	dw UnownVAnimationExtra
-	dw UnownWAnimationExtra
-	dw UnownXAnimationExtra
-	dw UnownYAnimationExtra
-	dw UnownZAnimationExtra
diff --git a/gfx/pokemon/unown_extras.asm b/gfx/pokemon/unown_extras.asm
deleted file mode 100644
index 218a539fe..000000000
--- a/gfx/pokemon/unown_extras.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownAAnimationExtra: INCLUDE "gfx/pokemon/unown_a/anim1.asm"
-UnownBAnimationExtra: INCLUDE "gfx/pokemon/unown_b/anim1.asm"
-UnownCAnimationExtra: INCLUDE "gfx/pokemon/unown_c/anim1.asm"
-UnownDAnimationExtra: INCLUDE "gfx/pokemon/unown_d/anim1.asm"
-UnownEAnimationExtra: INCLUDE "gfx/pokemon/unown_e/anim1.asm"
-UnownFAnimationExtra: INCLUDE "gfx/pokemon/unown_f/anim1.asm"
-UnownGAnimationExtra: INCLUDE "gfx/pokemon/unown_g/anim1.asm"
-UnownHAnimationExtra: INCLUDE "gfx/pokemon/unown_h/anim1.asm"
-UnownIAnimationExtra: INCLUDE "gfx/pokemon/unown_i/anim1.asm"
-UnownJAnimationExtra: INCLUDE "gfx/pokemon/unown_j/anim1.asm"
-UnownKAnimationExtra: INCLUDE "gfx/pokemon/unown_k/anim1.asm"
-UnownLAnimationExtra: INCLUDE "gfx/pokemon/unown_l/anim1.asm"
-UnownMAnimationExtra: INCLUDE "gfx/pokemon/unown_m/anim1.asm"
-UnownNAnimationExtra: INCLUDE "gfx/pokemon/unown_n/anim1.asm"
-UnownOAnimationExtra: INCLUDE "gfx/pokemon/unown_o/anim1.asm"
-UnownPAnimationExtra: INCLUDE "gfx/pokemon/unown_p/anim1.asm"
-UnownQAnimationExtra: INCLUDE "gfx/pokemon/unown_q/anim1.asm"
-UnownRAnimationExtra: INCLUDE "gfx/pokemon/unown_r/anim1.asm"
-UnownSAnimationExtra: INCLUDE "gfx/pokemon/unown_s/anim1.asm"
-UnownTAnimationExtra: INCLUDE "gfx/pokemon/unown_t/anim1.asm"
-UnownUAnimationExtra: INCLUDE "gfx/pokemon/unown_u/anim1.asm"
-UnownVAnimationExtra: INCLUDE "gfx/pokemon/unown_v/anim1.asm"
-UnownWAnimationExtra: INCLUDE "gfx/pokemon/unown_w/anim1.asm"
-UnownXAnimationExtra: INCLUDE "gfx/pokemon/unown_x/anim1.asm"
-UnownYAnimationExtra: INCLUDE "gfx/pokemon/unown_y/anim1.asm"
-UnownZAnimationExtra: INCLUDE "gfx/pokemon/unown_z/anim1.asm"
diff --git a/gfx/pokemon/unown_f/anim0.asm b/gfx/pokemon/unown_f/anim.asm
index f81c298a6..f81c298a6 100644
--- a/gfx/pokemon/unown_f/anim0.asm
+++ b/gfx/pokemon/unown_f/anim.asm
diff --git a/gfx/pokemon/unown_f/anim1.asm b/gfx/pokemon/unown_f/anim_idle.asm
index a75176981..a75176981 100644
--- a/gfx/pokemon/unown_f/anim1.asm
+++ b/gfx/pokemon/unown_f/anim_idle.asm
diff --git a/gfx/pokemon/unown_g/anim0.asm b/gfx/pokemon/unown_g/anim.asm
index 48100274f..48100274f 100644
--- a/gfx/pokemon/unown_g/anim0.asm
+++ b/gfx/pokemon/unown_g/anim.asm
diff --git a/gfx/pokemon/unown_g/anim1.asm b/gfx/pokemon/unown_g/anim_idle.asm
index 45906aed4..45906aed4 100644
--- a/gfx/pokemon/unown_g/anim1.asm
+++ b/gfx/pokemon/unown_g/anim_idle.asm
diff --git a/gfx/pokemon/unown_h/anim0.asm b/gfx/pokemon/unown_h/anim.asm
index fdee3822b..fdee3822b 100644
--- a/gfx/pokemon/unown_h/anim0.asm
+++ b/gfx/pokemon/unown_h/anim.asm
diff --git a/gfx/pokemon/unown_h/anim1.asm b/gfx/pokemon/unown_h/anim_idle.asm
index e6fb90d5e..e6fb90d5e 100644
--- a/gfx/pokemon/unown_h/anim1.asm
+++ b/gfx/pokemon/unown_h/anim_idle.asm
diff --git a/gfx/pokemon/unown_i/anim0.asm b/gfx/pokemon/unown_i/anim.asm
index 38e19a0c9..38e19a0c9 100644
--- a/gfx/pokemon/unown_i/anim0.asm
+++ b/gfx/pokemon/unown_i/anim.asm
diff --git a/gfx/pokemon/unown_i/anim1.asm b/gfx/pokemon/unown_i/anim_idle.asm
index 1d5ce67ad..1d5ce67ad 100644
--- a/gfx/pokemon/unown_i/anim1.asm
+++ b/gfx/pokemon/unown_i/anim_idle.asm
diff --git a/gfx/pokemon/unown_idle_pointers.asm b/gfx/pokemon/unown_idle_pointers.asm
new file mode 100644
index 000000000..5b922b0a9
--- /dev/null
+++ b/gfx/pokemon/unown_idle_pointers.asm
@@ -0,0 +1,27 @@
+UnownAnimationIdlePointers:
+	dw UnownAAnimationIdle
+	dw UnownBAnimationIdle
+	dw UnownCAnimationIdle
+	dw UnownDAnimationIdle
+	dw UnownEAnimationIdle
+	dw UnownFAnimationIdle
+	dw UnownGAnimationIdle
+	dw UnownHAnimationIdle
+	dw UnownIAnimationIdle
+	dw UnownJAnimationIdle
+	dw UnownKAnimationIdle
+	dw UnownLAnimationIdle
+	dw UnownMAnimationIdle
+	dw UnownNAnimationIdle
+	dw UnownOAnimationIdle
+	dw UnownPAnimationIdle
+	dw UnownQAnimationIdle
+	dw UnownRAnimationIdle
+	dw UnownSAnimationIdle
+	dw UnownTAnimationIdle
+	dw UnownUAnimationIdle
+	dw UnownVAnimationIdle
+	dw UnownWAnimationIdle
+	dw UnownXAnimationIdle
+	dw UnownYAnimationIdle
+	dw UnownZAnimationIdle
diff --git a/gfx/pokemon/unown_idles.asm b/gfx/pokemon/unown_idles.asm
new file mode 100644
index 000000000..6964a485b
--- /dev/null
+++ b/gfx/pokemon/unown_idles.asm
@@ -0,0 +1,26 @@
+UnownAAnimationIdle: INCLUDE "gfx/pokemon/unown_a/anim_idle.asm"
+UnownBAnimationIdle: INCLUDE "gfx/pokemon/unown_b/anim_idle.asm"
+UnownCAnimationIdle: INCLUDE "gfx/pokemon/unown_c/anim_idle.asm"
+UnownDAnimationIdle: INCLUDE "gfx/pokemon/unown_d/anim_idle.asm"
+UnownEAnimationIdle: INCLUDE "gfx/pokemon/unown_e/anim_idle.asm"
+UnownFAnimationIdle: INCLUDE "gfx/pokemon/unown_f/anim_idle.asm"
+UnownGAnimationIdle: INCLUDE "gfx/pokemon/unown_g/anim_idle.asm"
+UnownHAnimationIdle: INCLUDE "gfx/pokemon/unown_h/anim_idle.asm"
+UnownIAnimationIdle: INCLUDE "gfx/pokemon/unown_i/anim_idle.asm"
+UnownJAnimationIdle: INCLUDE "gfx/pokemon/unown_j/anim_idle.asm"
+UnownKAnimationIdle: INCLUDE "gfx/pokemon/unown_k/anim_idle.asm"
+UnownLAnimationIdle: INCLUDE "gfx/pokemon/unown_l/anim_idle.asm"
+UnownMAnimationIdle: INCLUDE "gfx/pokemon/unown_m/anim_idle.asm"
+UnownNAnimationIdle: INCLUDE "gfx/pokemon/unown_n/anim_idle.asm"
+UnownOAnimationIdle: INCLUDE "gfx/pokemon/unown_o/anim_idle.asm"
+UnownPAnimationIdle: INCLUDE "gfx/pokemon/unown_p/anim_idle.asm"
+UnownQAnimationIdle: INCLUDE "gfx/pokemon/unown_q/anim_idle.asm"
+UnownRAnimationIdle: INCLUDE "gfx/pokemon/unown_r/anim_idle.asm"
+UnownSAnimationIdle: INCLUDE "gfx/pokemon/unown_s/anim_idle.asm"
+UnownTAnimationIdle: INCLUDE "gfx/pokemon/unown_t/anim_idle.asm"
+UnownUAnimationIdle: INCLUDE "gfx/pokemon/unown_u/anim_idle.asm"
+UnownVAnimationIdle: INCLUDE "gfx/pokemon/unown_v/anim_idle.asm"
+UnownWAnimationIdle: INCLUDE "gfx/pokemon/unown_w/anim_idle.asm"
+UnownXAnimationIdle: INCLUDE "gfx/pokemon/unown_x/anim_idle.asm"
+UnownYAnimationIdle: INCLUDE "gfx/pokemon/unown_y/anim_idle.asm"
+UnownZAnimationIdle: INCLUDE "gfx/pokemon/unown_z/anim_idle.asm"
diff --git a/gfx/pokemon/unown_j/anim0.asm b/gfx/pokemon/unown_j/anim.asm
index 3a7467d45..3a7467d45 100644
--- a/gfx/pokemon/unown_j/anim0.asm
+++ b/gfx/pokemon/unown_j/anim.asm
diff --git a/gfx/pokemon/unown_j/anim1.asm b/gfx/pokemon/unown_j/anim_idle.asm
index d46b36028..d46b36028 100644
--- a/gfx/pokemon/unown_j/anim1.asm
+++ b/gfx/pokemon/unown_j/anim_idle.asm
diff --git a/gfx/pokemon/unown_k/anim0.asm b/gfx/pokemon/unown_k/anim.asm
index 0948f212d..0948f212d 100644
--- a/gfx/pokemon/unown_k/anim0.asm
+++ b/gfx/pokemon/unown_k/anim.asm
diff --git a/gfx/pokemon/unown_k/anim1.asm b/gfx/pokemon/unown_k/anim_idle.asm
index 8f8a4acb1..8f8a4acb1 100644
--- a/gfx/pokemon/unown_k/anim1.asm
+++ b/gfx/pokemon/unown_k/anim_idle.asm
diff --git a/gfx/pokemon/unown_l/anim0.asm b/gfx/pokemon/unown_l/anim.asm
index 7b4e5e21c..7b4e5e21c 100644
--- a/gfx/pokemon/unown_l/anim0.asm
+++ b/gfx/pokemon/unown_l/anim.asm
diff --git a/gfx/pokemon/unown_l/anim1.asm b/gfx/pokemon/unown_l/anim_idle.asm
index 859dec2ec..859dec2ec 100644
--- a/gfx/pokemon/unown_l/anim1.asm
+++ b/gfx/pokemon/unown_l/anim_idle.asm
diff --git a/gfx/pokemon/unown_m/anim0.asm b/gfx/pokemon/unown_m/anim.asm
index bb5292446..bb5292446 100644
--- a/gfx/pokemon/unown_m/anim0.asm
+++ b/gfx/pokemon/unown_m/anim.asm
diff --git a/gfx/pokemon/unown_m/anim1.asm b/gfx/pokemon/unown_m/anim_idle.asm
index 710300f20..710300f20 100644
--- a/gfx/pokemon/unown_m/anim1.asm
+++ b/gfx/pokemon/unown_m/anim_idle.asm
diff --git a/gfx/pokemon/unown_n/anim0.asm b/gfx/pokemon/unown_n/anim.asm
index 1f6924926..1f6924926 100644
--- a/gfx/pokemon/unown_n/anim0.asm
+++ b/gfx/pokemon/unown_n/anim.asm
diff --git a/gfx/pokemon/unown_n/anim1.asm b/gfx/pokemon/unown_n/anim_idle.asm
index 5275e3463..5275e3463 100644
--- a/gfx/pokemon/unown_n/anim1.asm
+++ b/gfx/pokemon/unown_n/anim_idle.asm
diff --git a/gfx/pokemon/unown_o/anim0.asm b/gfx/pokemon/unown_o/anim.asm
index 581d47b9d..581d47b9d 100644
--- a/gfx/pokemon/unown_o/anim0.asm
+++ b/gfx/pokemon/unown_o/anim.asm
diff --git a/gfx/pokemon/unown_o/anim1.asm b/gfx/pokemon/unown_o/anim_idle.asm
index fec231c84..fec231c84 100644
--- a/gfx/pokemon/unown_o/anim1.asm
+++ b/gfx/pokemon/unown_o/anim_idle.asm
diff --git a/gfx/pokemon/unown_p/anim0.asm b/gfx/pokemon/unown_p/anim.asm
index 0cbaf30ed..0cbaf30ed 100644
--- a/gfx/pokemon/unown_p/anim0.asm
+++ b/gfx/pokemon/unown_p/anim.asm
diff --git a/gfx/pokemon/unown_p/anim1.asm b/gfx/pokemon/unown_p/anim_idle.asm
index 51e0e0941..51e0e0941 100644
--- a/gfx/pokemon/unown_p/anim1.asm
+++ b/gfx/pokemon/unown_p/anim_idle.asm
diff --git a/gfx/pokemon/unown_q/anim0.asm b/gfx/pokemon/unown_q/anim.asm
index 555f61cf3..555f61cf3 100644
--- a/gfx/pokemon/unown_q/anim0.asm
+++ b/gfx/pokemon/unown_q/anim.asm
diff --git a/gfx/pokemon/unown_q/anim1.asm b/gfx/pokemon/unown_q/anim_idle.asm
index a17caa474..a17caa474 100644
--- a/gfx/pokemon/unown_q/anim1.asm
+++ b/gfx/pokemon/unown_q/anim_idle.asm
diff --git a/gfx/pokemon/unown_r/anim0.asm b/gfx/pokemon/unown_r/anim.asm
index fde5a58ab..fde5a58ab 100644
--- a/gfx/pokemon/unown_r/anim0.asm
+++ b/gfx/pokemon/unown_r/anim.asm
diff --git a/gfx/pokemon/unown_r/anim1.asm b/gfx/pokemon/unown_r/anim_idle.asm
index b1db8166a..b1db8166a 100644
--- a/gfx/pokemon/unown_r/anim1.asm
+++ b/gfx/pokemon/unown_r/anim_idle.asm
diff --git a/gfx/pokemon/unown_s/anim0.asm b/gfx/pokemon/unown_s/anim.asm
index 9cac3910d..9cac3910d 100644
--- a/gfx/pokemon/unown_s/anim0.asm
+++ b/gfx/pokemon/unown_s/anim.asm
diff --git a/gfx/pokemon/unown_s/anim1.asm b/gfx/pokemon/unown_s/anim_idle.asm
index 49483f8f5..49483f8f5 100644
--- a/gfx/pokemon/unown_s/anim1.asm
+++ b/gfx/pokemon/unown_s/anim_idle.asm
diff --git a/gfx/pokemon/unown_t/anim0.asm b/gfx/pokemon/unown_t/anim.asm
index feba7be07..feba7be07 100644
--- a/gfx/pokemon/unown_t/anim0.asm
+++ b/gfx/pokemon/unown_t/anim.asm
diff --git a/gfx/pokemon/unown_t/anim1.asm b/gfx/pokemon/unown_t/anim_idle.asm
index d295d6830..d295d6830 100644
--- a/gfx/pokemon/unown_t/anim1.asm
+++ b/gfx/pokemon/unown_t/anim_idle.asm
diff --git a/gfx/pokemon/unown_u/anim0.asm b/gfx/pokemon/unown_u/anim.asm
index 12c53636d..12c53636d 100644
--- a/gfx/pokemon/unown_u/anim0.asm
+++ b/gfx/pokemon/unown_u/anim.asm
diff --git a/gfx/pokemon/unown_u/anim1.asm b/gfx/pokemon/unown_u/anim_idle.asm
index 834e75999..834e75999 100644
--- a/gfx/pokemon/unown_u/anim1.asm
+++ b/gfx/pokemon/unown_u/anim_idle.asm
diff --git a/gfx/pokemon/unown_v/anim0.asm b/gfx/pokemon/unown_v/anim.asm
index acc500009..acc500009 100644
--- a/gfx/pokemon/unown_v/anim0.asm
+++ b/gfx/pokemon/unown_v/anim.asm
diff --git a/gfx/pokemon/unown_v/anim1.asm b/gfx/pokemon/unown_v/anim_idle.asm
index 818f727ea..818f727ea 100644
--- a/gfx/pokemon/unown_v/anim1.asm
+++ b/gfx/pokemon/unown_v/anim_idle.asm
diff --git a/gfx/pokemon/unown_w/anim0.asm b/gfx/pokemon/unown_w/anim.asm
index 620ff03e5..620ff03e5 100644
--- a/gfx/pokemon/unown_w/anim0.asm
+++ b/gfx/pokemon/unown_w/anim.asm
diff --git a/gfx/pokemon/unown_w/anim1.asm b/gfx/pokemon/unown_w/anim_idle.asm
index b43d44bbc..b43d44bbc 100644
--- a/gfx/pokemon/unown_w/anim1.asm
+++ b/gfx/pokemon/unown_w/anim_idle.asm
diff --git a/gfx/pokemon/unown_x/anim0.asm b/gfx/pokemon/unown_x/anim.asm
index 0bb204da6..0bb204da6 100644
--- a/gfx/pokemon/unown_x/anim0.asm
+++ b/gfx/pokemon/unown_x/anim.asm
diff --git a/gfx/pokemon/unown_x/anim1.asm b/gfx/pokemon/unown_x/anim_idle.asm
index 22b15a504..22b15a504 100644
--- a/gfx/pokemon/unown_x/anim1.asm
+++ b/gfx/pokemon/unown_x/anim_idle.asm
diff --git a/gfx/pokemon/unown_y/anim0.asm b/gfx/pokemon/unown_y/anim.asm
index e65aa4134..e65aa4134 100644
--- a/gfx/pokemon/unown_y/anim0.asm
+++ b/gfx/pokemon/unown_y/anim.asm
diff --git a/gfx/pokemon/unown_y/anim1.asm b/gfx/pokemon/unown_y/anim_idle.asm
index e1a9a2acb..e1a9a2acb 100644
--- a/gfx/pokemon/unown_y/anim1.asm
+++ b/gfx/pokemon/unown_y/anim_idle.asm
diff --git a/gfx/pokemon/unown_z/anim0.asm b/gfx/pokemon/unown_z/anim.asm
index 197978f9b..197978f9b 100644
--- a/gfx/pokemon/unown_z/anim0.asm
+++ b/gfx/pokemon/unown_z/anim.asm
diff --git a/gfx/pokemon/unown_z/anim1.asm b/gfx/pokemon/unown_z/anim_idle.asm
index 4eb7513f6..4eb7513f6 100644
--- a/gfx/pokemon/unown_z/anim1.asm
+++ b/gfx/pokemon/unown_z/anim_idle.asm
diff --git a/gfx/pokemon/ursaring/anim0.asm b/gfx/pokemon/ursaring/anim.asm
index f571913ea..f571913ea 100644
--- a/gfx/pokemon/ursaring/anim0.asm
+++ b/gfx/pokemon/ursaring/anim.asm
diff --git a/gfx/pokemon/ursaring/anim1.asm b/gfx/pokemon/ursaring/anim_idle.asm
index 01ebc0f1a..01ebc0f1a 100644
--- a/gfx/pokemon/ursaring/anim1.asm
+++ b/gfx/pokemon/ursaring/anim_idle.asm
diff --git a/gfx/pokemon/vaporeon/anim0.asm b/gfx/pokemon/vaporeon/anim.asm
index d13f1dd94..d13f1dd94 100644
--- a/gfx/pokemon/vaporeon/anim0.asm
+++ b/gfx/pokemon/vaporeon/anim.asm
diff --git a/gfx/pokemon/vaporeon/anim1.asm b/gfx/pokemon/vaporeon/anim_idle.asm
index 79c386650..79c386650 100644
--- a/gfx/pokemon/vaporeon/anim1.asm
+++ b/gfx/pokemon/vaporeon/anim_idle.asm
diff --git a/gfx/pokemon/venomoth/anim0.asm b/gfx/pokemon/venomoth/anim.asm
index ba6014d59..ba6014d59 100644
--- a/gfx/pokemon/venomoth/anim0.asm
+++ b/gfx/pokemon/venomoth/anim.asm
diff --git a/gfx/pokemon/venomoth/anim1.asm b/gfx/pokemon/venomoth/anim_idle.asm
index 619c19b73..619c19b73 100644
--- a/gfx/pokemon/venomoth/anim1.asm
+++ b/gfx/pokemon/venomoth/anim_idle.asm
diff --git a/gfx/pokemon/venonat/anim0.asm b/gfx/pokemon/venonat/anim.asm
index 508cbd84a..508cbd84a 100644
--- a/gfx/pokemon/venonat/anim0.asm
+++ b/gfx/pokemon/venonat/anim.asm
diff --git a/gfx/pokemon/venonat/anim1.asm b/gfx/pokemon/venonat/anim_idle.asm
index ecd7a45f1..ecd7a45f1 100644
--- a/gfx/pokemon/venonat/anim1.asm
+++ b/gfx/pokemon/venonat/anim_idle.asm
diff --git a/gfx/pokemon/venusaur/anim0.asm b/gfx/pokemon/venusaur/anim.asm
index 9ee74b6c0..9ee74b6c0 100644
--- a/gfx/pokemon/venusaur/anim0.asm
+++ b/gfx/pokemon/venusaur/anim.asm
diff --git a/gfx/pokemon/venusaur/anim1.asm b/gfx/pokemon/venusaur/anim_idle.asm
index 6eebd7cd3..6eebd7cd3 100644
--- a/gfx/pokemon/venusaur/anim1.asm
+++ b/gfx/pokemon/venusaur/anim_idle.asm
diff --git a/gfx/pokemon/victreebel/anim0.asm b/gfx/pokemon/victreebel/anim.asm
index ec490f7fb..ec490f7fb 100644
--- a/gfx/pokemon/victreebel/anim0.asm
+++ b/gfx/pokemon/victreebel/anim.asm
diff --git a/gfx/pokemon/victreebel/anim1.asm b/gfx/pokemon/victreebel/anim_idle.asm
index 121550865..121550865 100644
--- a/gfx/pokemon/victreebel/anim1.asm
+++ b/gfx/pokemon/victreebel/anim_idle.asm
diff --git a/gfx/pokemon/vileplume/anim0.asm b/gfx/pokemon/vileplume/anim.asm
index 98c2a86de..98c2a86de 100644
--- a/gfx/pokemon/vileplume/anim0.asm
+++ b/gfx/pokemon/vileplume/anim.asm
diff --git a/gfx/pokemon/vileplume/anim1.asm b/gfx/pokemon/vileplume/anim_idle.asm
index e57622363..e57622363 100644
--- a/gfx/pokemon/vileplume/anim1.asm
+++ b/gfx/pokemon/vileplume/anim_idle.asm
diff --git a/gfx/pokemon/voltorb/anim0.asm b/gfx/pokemon/voltorb/anim.asm
index fdb49b9af..fdb49b9af 100644
--- a/gfx/pokemon/voltorb/anim0.asm
+++ b/gfx/pokemon/voltorb/anim.asm
diff --git a/gfx/pokemon/voltorb/anim1.asm b/gfx/pokemon/voltorb/anim_idle.asm
index be799fe4a..be799fe4a 100644
--- a/gfx/pokemon/voltorb/anim1.asm
+++ b/gfx/pokemon/voltorb/anim_idle.asm
diff --git a/gfx/pokemon/vulpix/anim0.asm b/gfx/pokemon/vulpix/anim.asm
index 878054202..878054202 100644
--- a/gfx/pokemon/vulpix/anim0.asm
+++ b/gfx/pokemon/vulpix/anim.asm
diff --git a/gfx/pokemon/vulpix/anim1.asm b/gfx/pokemon/vulpix/anim_idle.asm
index f7c9e3671..f7c9e3671 100644
--- a/gfx/pokemon/vulpix/anim1.asm
+++ b/gfx/pokemon/vulpix/anim_idle.asm
diff --git a/gfx/pokemon/wartortle/anim0.asm b/gfx/pokemon/wartortle/anim.asm
index 832b87b88..832b87b88 100644
--- a/gfx/pokemon/wartortle/anim0.asm
+++ b/gfx/pokemon/wartortle/anim.asm
diff --git a/gfx/pokemon/wartortle/anim1.asm b/gfx/pokemon/wartortle/anim_idle.asm
index 40c4fcd14..40c4fcd14 100644
--- a/gfx/pokemon/wartortle/anim1.asm
+++ b/gfx/pokemon/wartortle/anim_idle.asm
diff --git a/gfx/pokemon/weedle/anim0.asm b/gfx/pokemon/weedle/anim.asm
index 5d959a772..5d959a772 100644
--- a/gfx/pokemon/weedle/anim0.asm
+++ b/gfx/pokemon/weedle/anim.asm
diff --git a/gfx/pokemon/weedle/anim1.asm b/gfx/pokemon/weedle/anim_idle.asm
index 30dcb9185..30dcb9185 100644
--- a/gfx/pokemon/weedle/anim1.asm
+++ b/gfx/pokemon/weedle/anim_idle.asm
diff --git a/gfx/pokemon/weepinbell/anim0.asm b/gfx/pokemon/weepinbell/anim.asm
index 6f710d29a..6f710d29a 100644
--- a/gfx/pokemon/weepinbell/anim0.asm
+++ b/gfx/pokemon/weepinbell/anim.asm
diff --git a/gfx/pokemon/weepinbell/anim1.asm b/gfx/pokemon/weepinbell/anim_idle.asm
index 0e56c9cc1..0e56c9cc1 100644
--- a/gfx/pokemon/weepinbell/anim1.asm
+++ b/gfx/pokemon/weepinbell/anim_idle.asm
diff --git a/gfx/pokemon/weezing/anim0.asm b/gfx/pokemon/weezing/anim.asm
index e64ca5d37..e64ca5d37 100644
--- a/gfx/pokemon/weezing/anim0.asm
+++ b/gfx/pokemon/weezing/anim.asm
diff --git a/gfx/pokemon/weezing/anim1.asm b/gfx/pokemon/weezing/anim_idle.asm
index 1ba31dd74..1ba31dd74 100644
--- a/gfx/pokemon/weezing/anim1.asm
+++ b/gfx/pokemon/weezing/anim_idle.asm
diff --git a/gfx/pokemon/wigglytuff/anim0.asm b/gfx/pokemon/wigglytuff/anim.asm
index 53b468fdd..53b468fdd 100644
--- a/gfx/pokemon/wigglytuff/anim0.asm
+++ b/gfx/pokemon/wigglytuff/anim.asm
diff --git a/gfx/pokemon/wigglytuff/anim1.asm b/gfx/pokemon/wigglytuff/anim_idle.asm
index b99bf002c..b99bf002c 100644
--- a/gfx/pokemon/wigglytuff/anim1.asm
+++ b/gfx/pokemon/wigglytuff/anim_idle.asm
diff --git a/gfx/pokemon/wobbuffet/anim0.asm b/gfx/pokemon/wobbuffet/anim.asm
index 340f3df46..340f3df46 100644
--- a/gfx/pokemon/wobbuffet/anim0.asm
+++ b/gfx/pokemon/wobbuffet/anim.asm
diff --git a/gfx/pokemon/wobbuffet/anim1.asm b/gfx/pokemon/wobbuffet/anim_idle.asm
index 8a3564daa..8a3564daa 100644
--- a/gfx/pokemon/wobbuffet/anim1.asm
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
diff --git a/gfx/pokemon/wooper/anim0.asm b/gfx/pokemon/wooper/anim.asm
index 2c9becf9e..2c9becf9e 100644
--- a/gfx/pokemon/wooper/anim0.asm
+++ b/gfx/pokemon/wooper/anim.asm
diff --git a/gfx/pokemon/wooper/anim1.asm b/gfx/pokemon/wooper/anim_idle.asm
index 3f152d035..3f152d035 100644
--- a/gfx/pokemon/wooper/anim1.asm
+++ b/gfx/pokemon/wooper/anim_idle.asm
diff --git a/gfx/pokemon/xatu/anim0.asm b/gfx/pokemon/xatu/anim.asm
index 002f905b8..002f905b8 100644
--- a/gfx/pokemon/xatu/anim0.asm
+++ b/gfx/pokemon/xatu/anim.asm
diff --git a/gfx/pokemon/xatu/anim1.asm b/gfx/pokemon/xatu/anim_idle.asm
index 3fa8d7875..3fa8d7875 100644
--- a/gfx/pokemon/xatu/anim1.asm
+++ b/gfx/pokemon/xatu/anim_idle.asm
diff --git a/gfx/pokemon/yanma/anim0.asm b/gfx/pokemon/yanma/anim.asm
index 4f1aaa929..4f1aaa929 100644
--- a/gfx/pokemon/yanma/anim0.asm
+++ b/gfx/pokemon/yanma/anim.asm
diff --git a/gfx/pokemon/yanma/anim1.asm b/gfx/pokemon/yanma/anim_idle.asm
index 75464b3f1..75464b3f1 100644
--- a/gfx/pokemon/yanma/anim1.asm
+++ b/gfx/pokemon/yanma/anim_idle.asm
diff --git a/gfx/pokemon/zapdos/anim0.asm b/gfx/pokemon/zapdos/anim.asm
index a22540c2a..a22540c2a 100644
--- a/gfx/pokemon/zapdos/anim0.asm
+++ b/gfx/pokemon/zapdos/anim.asm
diff --git a/gfx/pokemon/zapdos/anim1.asm b/gfx/pokemon/zapdos/anim_idle.asm
index 3d8c8fd57..3d8c8fd57 100644
--- a/gfx/pokemon/zapdos/anim1.asm
+++ b/gfx/pokemon/zapdos/anim_idle.asm
diff --git a/gfx/pokemon/zubat/anim0.asm b/gfx/pokemon/zubat/anim.asm
index a34a66671..a34a66671 100644
--- a/gfx/pokemon/zubat/anim0.asm
+++ b/gfx/pokemon/zubat/anim.asm
diff --git a/gfx/pokemon/zubat/anim1.asm b/gfx/pokemon/zubat/anim_idle.asm
index cfba587f9..cfba587f9 100644
--- a/gfx/pokemon/zubat/anim1.asm
+++ b/gfx/pokemon/zubat/anim_idle.asm
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 6ab4a3f61..e9703531d 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -10,39 +10,39 @@ scene_script: MACRO
 ENDM
 
 warp_def: MACRO
-;\1: y: top to bottom, starts at 0
-;\2: x: left to right, starts at 0
+;\1: x: left to right, starts at 0
+;\2: y: top to bottom, starts at 0
 ;\3: warp destination: starts at 1
 ;\4: map id: from constants/map_constants.asm
-	db \1, \2, \3
+	db \2, \1, \3
 	map \4
 ENDM
 
 coord_event: MACRO
-;\1: scene id: controlled by setscene/setmapscene
+;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: x: left to right, starts at 0
+;\3: scene id: controlled by setscene/setmapscene
 ;\4: script pointer
-	db \1, \2, \3, $0
+	db \3, \2, \1, $0
 	dw \4
 	db $0, $0
 ENDM
 
 bg_event: MACRO
-;\1: y: top to bottom, starts at 0
-;\2: x: left to right, starts at 0
+;\1: x: left to right, starts at 0
+;\2: y: top to bottom, starts at 0
 ;\3: function: a BGEVENT_* constant
 ;\4: script pointer
-	db \1, \2, \3
+	db \2, \1, \3
 	dw \4
 ENDM
 
 object_event: MACRO
-;\1: sprite: a SPRITE_* constant
+;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: x: left to right, starts at 0
+;\3: sprite: a SPRITE_* constant
 ;\4: movement function: a SPRITEMOVEDATA_* constant
-;\5, \6: movement radius: y, x
+;\5, \6: movement radius: x, y
 ;\7, \8: hour limits: h1, h2 (0-23)
 ;  * if h1 < h2, the object_event will only appear from h1 to h2
 ;  * if h1 > h2, the object_event will not appear from h2 to h1
@@ -54,8 +54,8 @@ object_event: MACRO
 ;\11: sight range: applies to OBJECTTYPE_TRAINER
 ;\12: script pointer
 ;\13: event flag: an EVENT_* constant, or -1 to always appear
-	db \1, \2 + 4, \3 + 4, \4
-	dn \5, \6
+	db \3, \2 + 4, \1 + 4, \4
+	dn \6, \5
 	db \7, \8
 	shift
 	dn \8, \9
diff --git a/main.asm b/main.asm
index 727453db8..d28bdf559 100644
--- a/main.asm
+++ b/main.asm
@@ -416,12 +416,12 @@ SECTION "Pic Animations 1", ROMX
 INCLUDE "engine/pic_animation.asm"
 INCLUDE "gfx/pokemon/anim_pointers.asm"
 INCLUDE "gfx/pokemon/anims.asm"
-INCLUDE "gfx/pokemon/extra_pointers.asm"
-INCLUDE "gfx/pokemon/extras.asm"
+INCLUDE "gfx/pokemon/idle_pointers.asm"
+INCLUDE "gfx/pokemon/idles.asm"
 INCLUDE "gfx/pokemon/unown_anim_pointers.asm"
 INCLUDE "gfx/pokemon/unown_anims.asm"
-INCLUDE "gfx/pokemon/unown_extra_pointers.asm"
-INCLUDE "gfx/pokemon/unown_extras.asm"
+INCLUDE "gfx/pokemon/unown_idle_pointers.asm"
+INCLUDE "gfx/pokemon/unown_idles.asm"
 INCLUDE "gfx/pokemon/bitmask_pointers.asm"
 INCLUDE "gfx/pokemon/bitmasks.asm"
 INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index c9d5d9763..1e36df96f 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -367,23 +367,23 @@ AzaleaGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 5, AZALEA_TOWN
-	warp_def $f, $5, 5, AZALEA_TOWN
+	warp_def 4, 15, 5, AZALEA_TOWN
+	warp_def 5, 15, 5, AZALEA_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue
-	bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue
+	bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
+	bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
-	object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
-	object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
-	object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
-	object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
-	object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
-	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
+	object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
+	object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
+	object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
+	object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
+	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
+	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
+	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 01abee35a..8d9374955 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -51,8 +51,8 @@ AzaleaMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, AZALEA_TOWN
-	warp_def $7, $3, 3, AZALEA_TOWN
+	warp_def 2, 7, 3, AZALEA_TOWN
+	warp_def 3, 7, 3, AZALEA_TOWN
 
 .CoordEvents:
 	db 0
@@ -62,6 +62,6 @@ AzaleaMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
-	object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
-	object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
+	object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
+	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index f369c3bff..e4d950442 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -82,9 +82,9 @@ AzaleaPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, AZALEA_TOWN
-	warp_def $7, $4, 1, AZALEA_TOWN
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, AZALEA_TOWN
+	warp_def 4, 7, 1, AZALEA_TOWN
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -94,7 +94,7 @@ AzaleaPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
-	object_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
-	object_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
-	object_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
+	object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
+	object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
+	object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index cf576d81d..ba1ee1a2c 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -461,44 +461,44 @@ AzaleaTown_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $9, $f, 1, AZALEA_POKECENTER_1F
-	warp_def $d, $15, 1, CHARCOAL_KILN
-	warp_def $5, $15, 2, AZALEA_MART
-	warp_def $5, $9, 1, KURTS_HOUSE
-	warp_def $f, $a, 1, AZALEA_GYM
-	warp_def $7, $1f, 1, SLOWPOKE_WELL_B1F
-	warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE
-	warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE
+	warp_def 15, 9, 1, AZALEA_POKECENTER_1F
+	warp_def 21, 13, 1, CHARCOAL_KILN
+	warp_def 21, 5, 2, AZALEA_MART
+	warp_def 9, 5, 1, KURTS_HOUSE
+	warp_def 10, 15, 1, AZALEA_GYM
+	warp_def 31, 7, 1, SLOWPOKE_WELL_B1F
+	warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE
+	warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
 .CoordEvents:
 	db 3
-	coord_event 1, $a, $5, AzaleaTownRivalBattleScene1
-	coord_event 1, $b, $5, AzaleaTownRivalBattleScene2
-	coord_event 2, $6, $9, AzaleaTownCelebiScene
+	coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
+	coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
+	coord_event 9, 6, 2, AzaleaTownCelebiScene
 
 .BGEvents:
 	db 9
-	bg_event 9, 19, BGEVENT_READ, AzaleaTownSign
-	bg_event 9, 10, BGEVENT_READ, KurtsHouseSign
-	bg_event 15, 14, BGEVENT_READ, AzaleaGymSign
-	bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign
-	bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign
-	bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign
-	bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign
-	bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign
-	bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
+	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
+	bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
+	bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
+	bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign
+	bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign
+	bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign
+	bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign
+	bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
+	bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
-	object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
-	object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
-	object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
-	object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
-	object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
+	object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
+	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
+	object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
+	object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
+	object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
+	object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ad7708c96..0e44eab3a 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -799,9 +799,9 @@ BattleTower1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE
-	warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
-	warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
+	warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE
+	warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE
+	warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR
 
 .CoordEvents:
 	db 0
@@ -812,8 +812,8 @@ BattleTower1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
-	object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
-	object_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
-	object_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
-	object_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
+	object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
+	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
+	object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
+	object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
+	object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index ffc4237f9..acd8bfa66 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -146,8 +146,8 @@ BattleTowerBattleRoom_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
-	warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
+	warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY
+	warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY
 
 .CoordEvents:
 	db 0
@@ -157,5 +157,5 @@ BattleTowerBattleRoom_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	object_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+	object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index c2d51f5fc..2327b31fa 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -50,8 +50,8 @@ BattleTowerElevator_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
-	warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
+	warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY
+	warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY
 
 .CoordEvents:
 	db 0
@@ -61,4 +61,4 @@ BattleTowerElevator_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
+	object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index dc60a0440..41a3beb83 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -84,12 +84,12 @@ BattleTowerHallway_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR
-	warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR
+	warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 
 .CoordEvents:
 	db 0
@@ -99,4 +99,4 @@ BattleTowerHallway_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
+	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index 9cf15d915..6ed01da6f 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -132,10 +132,10 @@ BattleTowerOutside_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE
-	warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE
-	warp_def $9, $8, 1, BATTLE_TOWER_1F
-	warp_def $9, $9, 2, BATTLE_TOWER_1F
+	warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
+	warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
+	warp_def 8, 9, 1, BATTLE_TOWER_1F
+	warp_def 9, 9, 2, BATTLE_TOWER_1F
 
 .CoordEvents:
 	db 0
@@ -146,7 +146,7 @@ BattleTowerOutside_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
-	object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
-	object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
+	object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
+	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index b8afadd08..0dc2a7cd0 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -359,8 +359,8 @@ BillsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_25
-	warp_def $7, $3, 1, ROUTE_25
+	warp_def 2, 7, 1, ROUTE_25
+	warp_def 3, 7, 1, ROUTE_25
 
 .CoordEvents:
 	db 0
@@ -370,4 +370,4 @@ BillsHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
+	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index d0a52c88c..c5cd10235 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -318,36 +318,36 @@ BlackthornCity_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $b, $12, 1, BLACKTHORN_GYM_1F
-	warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
-	warp_def $17, $1d, 1, BLACKTHORN_EMYS_HOUSE
-	warp_def $1d, $f, 2, BLACKTHORN_MART
-	warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F
-	warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE
-	warp_def $9, $24, 2, ICE_PATH_1F
-	warp_def $1, $14, 1, DRAGONS_DEN_1F
+	warp_def 18, 11, 1, BLACKTHORN_GYM_1F
+	warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
+	warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE
+	warp_def 15, 29, 2, BLACKTHORN_MART
+	warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F
+	warp_def 9, 31, 1, MOVE_DELETERS_HOUSE
+	warp_def 36, 9, 2, ICE_PATH_1F
+	warp_def 20, 1, 1, DRAGONS_DEN_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 7
-	bg_event 24, 34, BGEVENT_READ, BlackthornCitySign
-	bg_event 13, 17, BGEVENT_READ, BlackthornGymSign
-	bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign
-	bg_event 3, 21, BGEVENT_READ, DragonDensSign
-	bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips
-	bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign
-	bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign
+	bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
+	bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
+	bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
+	bg_event 21, 3, BGEVENT_READ, DragonDensSign
+	bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips
+	bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
+	bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
-	object_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
-	object_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
-	object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
-	object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
-	object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
-	object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
-	object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
-	object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
+	object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
+	object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
+	object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
+	object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
+	object_event 24, 31, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
+	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
+	object_event 13, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
+	object_event 22, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
+	object_event 35, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 3c2619988..2e8bbfa0b 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -53,8 +53,8 @@ BlackthornDragonSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, BLACKTHORN_CITY
-	warp_def $7, $3, 2, BLACKTHORN_CITY
+	warp_def 2, 7, 2, BLACKTHORN_CITY
+	warp_def 3, 7, 2, BLACKTHORN_CITY
 
 .CoordEvents:
 	db 0
@@ -64,5 +64,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
-	object_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
+	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
+	object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 98b67537b..c74db5f89 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -25,17 +25,17 @@ BlackthornEmysHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, BLACKTHORN_CITY
-	warp_def $7, $3, 3, BLACKTHORN_CITY
+	warp_def 2, 7, 3, BLACKTHORN_CITY
+	warp_def 3, 7, 3, BLACKTHORN_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, EmysHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
+	object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 714ea46d3..c640c2c06 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -392,26 +392,26 @@ BlackthornGym1F_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $11, $4, 1, BLACKTHORN_CITY
-	warp_def $11, $5, 1, BLACKTHORN_CITY
-	warp_def $7, $1, 1, BLACKTHORN_GYM_2F
-	warp_def $9, $7, 2, BLACKTHORN_GYM_2F
-	warp_def $6, $2, 3, BLACKTHORN_GYM_2F
-	warp_def $7, $7, 4, BLACKTHORN_GYM_2F
-	warp_def $6, $7, 5, BLACKTHORN_GYM_2F
+	warp_def 4, 17, 1, BLACKTHORN_CITY
+	warp_def 5, 17, 1, BLACKTHORN_CITY
+	warp_def 1, 7, 1, BLACKTHORN_GYM_2F
+	warp_def 7, 9, 2, BLACKTHORN_GYM_2F
+	warp_def 2, 6, 3, BLACKTHORN_GYM_2F
+	warp_def 7, 7, 4, BLACKTHORN_GYM_2F
+	warp_def 7, 6, 5, BLACKTHORN_GYM_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, BlackthornGymStatue
-	bg_event 15, 6, BGEVENT_READ, BlackthornGymStatue
+	bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
+	bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
-	object_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
-	object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
+	object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
+	object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
+	object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
+	object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
+	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index a9ee60bef..6aa55a0e5 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -133,11 +133,11 @@ BlackthornGym2F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $1, 3, BLACKTHORN_GYM_1F
-	warp_def $9, $7, 4, BLACKTHORN_GYM_1F
-	warp_def $5, $2, 5, BLACKTHORN_GYM_1F ; hole
-	warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole
-	warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole
+	warp_def 1, 7, 3, BLACKTHORN_GYM_1F
+	warp_def 7, 9, 4, BLACKTHORN_GYM_1F
+	warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole
+	warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole
+	warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole
 
 .CoordEvents:
 	db 0
@@ -147,11 +147,11 @@ BlackthornGym2F_MapEventHeader:
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
-	object_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
-	object_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
-	object_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
-	object_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
-	object_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
+	object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
+	object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
+	object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
+	object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
+	object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index ac350c45d..d6bf89c2c 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -52,8 +52,8 @@ BlackthornMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, BLACKTHORN_CITY
-	warp_def $7, $3, 4, BLACKTHORN_CITY
+	warp_def 2, 7, 4, BLACKTHORN_CITY
+	warp_def 3, 7, 4, BLACKTHORN_CITY
 
 .CoordEvents:
 	db 0
@@ -63,6 +63,6 @@ BlackthornMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
-	object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
+	object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 3f6c76ffe..af2a4e00b 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -55,9 +55,9 @@ BlackthornPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, BLACKTHORN_CITY
-	warp_def $7, $4, 5, BLACKTHORN_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 5, BLACKTHORN_CITY
+	warp_def 4, 7, 5, BLACKTHORN_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -67,7 +67,7 @@ BlackthornPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
-	object_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
-	object_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
+	object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
+	object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 367b255b8..9a40a68f6 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -150,8 +150,8 @@ BluesHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, PALLET_TOWN
-	warp_def $7, $3, 2, PALLET_TOWN
+	warp_def 2, 7, 2, PALLET_TOWN
+	warp_def 3, 7, 2, PALLET_TOWN
 
 .CoordEvents:
 	db 0
@@ -161,4 +161,4 @@ BluesHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
+	object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 8ac5547de..784f06185 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -130,10 +130,10 @@ BrunosRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $4, 3, KOGAS_ROOM
-	warp_def $11, $5, 4, KOGAS_ROOM
-	warp_def $2, $4, 1, KARENS_ROOM
-	warp_def $2, $5, 2, KARENS_ROOM
+	warp_def 4, 17, 3, KOGAS_ROOM
+	warp_def 5, 17, 4, KOGAS_ROOM
+	warp_def 4, 2, 1, KARENS_ROOM
+	warp_def 5, 2, 2, KARENS_ROOM
 
 .CoordEvents:
 	db 0
@@ -143,4 +143,4 @@ BrunosRoom_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
+	object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 25adf9358..69b71d9e3 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -285,34 +285,34 @@ BurnedTower1F_MapEventHeader:
 
 .Warps:
 	db 14
-	warp_def $f, $9, 13, ECRUTEAK_CITY
-	warp_def $f, $a, 13, ECRUTEAK_CITY
-	warp_def $9, $a,  1, BURNED_TOWER_B1F
-	warp_def $5, $5,  1, BURNED_TOWER_B1F
-	warp_def $6, $5,  1, BURNED_TOWER_B1F
-	warp_def $6, $4,  1, BURNED_TOWER_B1F
-	warp_def $4, $f,  2, BURNED_TOWER_B1F
-	warp_def $5, $f,  2, BURNED_TOWER_B1F
-	warp_def $7, $a,  3, BURNED_TOWER_B1F
-	warp_def $e, $5,  4, BURNED_TOWER_B1F
-	warp_def $e, $4,  4, BURNED_TOWER_B1F
-	warp_def $e, $e,  5, BURNED_TOWER_B1F
-	warp_def $e, $f,  5, BURNED_TOWER_B1F
-	warp_def $f, $7,  6, BURNED_TOWER_B1F
+	warp_def 9, 15, 13, ECRUTEAK_CITY
+	warp_def 10, 15, 13, ECRUTEAK_CITY
+	warp_def 10, 9,  1, BURNED_TOWER_B1F
+	warp_def 5, 5,  1, BURNED_TOWER_B1F
+	warp_def 5, 6,  1, BURNED_TOWER_B1F
+	warp_def 4, 6,  1, BURNED_TOWER_B1F
+	warp_def 15, 4,  2, BURNED_TOWER_B1F
+	warp_def 15, 5,  2, BURNED_TOWER_B1F
+	warp_def 10, 7,  3, BURNED_TOWER_B1F
+	warp_def 5, 14,  4, BURNED_TOWER_B1F
+	warp_def 4, 14,  4, BURNED_TOWER_B1F
+	warp_def 14, 14,  5, BURNED_TOWER_B1F
+	warp_def 15, 14,  5, BURNED_TOWER_B1F
+	warp_def 7, 15,  6, BURNED_TOWER_B1F
 
 .CoordEvents:
 	db 1
-	coord_event 1, $9, $b, BurnedTowerRivalBattleScript
+	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
 
 .BGEvents:
 	db 2
-	bg_event  7,  8, BGEVENT_ITEM, BurnedTower1FHiddenEther
-	bg_event 11, 13, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
+	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
+	bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
-	object_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
-	object_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
-	object_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
-	object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
+	object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
+	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
+	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+	object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
+	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 0946a43d8..07f5c3d6e 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -241,28 +241,28 @@ BurnedTowerB1F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $9, $a, 3, BURNED_TOWER_1F
-	warp_def $7, $11, 7, BURNED_TOWER_1F
-	warp_def $8, $a, 9, BURNED_TOWER_1F
-	warp_def $d, $3, 10, BURNED_TOWER_1F
-	warp_def $e, $11, 12, BURNED_TOWER_1F
-	warp_def $f, $7, 14, BURNED_TOWER_1F
+	warp_def 10, 9, 3, BURNED_TOWER_1F
+	warp_def 17, 7, 7, BURNED_TOWER_1F
+	warp_def 10, 8, 9, BURNED_TOWER_1F
+	warp_def 3, 13, 10, BURNED_TOWER_1F
+	warp_def 17, 14, 12, BURNED_TOWER_1F
+	warp_def 7, 15, 14, BURNED_TOWER_1F
 
 .CoordEvents:
 	db 1
-	coord_event 0, $6, $a, ReleaseTheBeasts
+	coord_event 10, 6, 0, ReleaseTheBeasts
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
-	object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
-	object_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
+	object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
+	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
+	object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 7751c69ff..de89b1953 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -213,21 +213,21 @@ CeladonCafe_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $6, 9, CELADON_CITY
-	warp_def $7, $7, 9, CELADON_CITY
+	warp_def 6, 7, 9, CELADON_CITY
+	warp_def 7, 7, 9, CELADON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 5, BGEVENT_READ, EatathonContestPoster
-	bg_event 1, 7, BGEVENT_READ, CeladonCafeTrashcan
+	bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
+	bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
-	object_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
-	object_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
-	object_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
-	object_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
+	object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
+	object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
+	object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
+	object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
+	object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 680875e42..bfc5265ea 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -240,38 +240,38 @@ CeladonCity_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $9, $4, 1, CELADON_DEPT_STORE_1F
-	warp_def $9, $10, 1, CELADON_MANSION_1F
-	warp_def $3, $10, 3, CELADON_MANSION_1F
-	warp_def $3, $11, 3, CELADON_MANSION_1F
-	warp_def $9, $1d, 1, CELADON_POKECENTER_1F
-	warp_def $13, $12, 1, CELADON_GAME_CORNER
-	warp_def $13, $17, 1, CELADON_GAME_CORNER_PRIZE_ROOM
-	warp_def $1d, $a, 1, CELADON_GYM
-	warp_def $1d, $19, 1, CELADON_CAFE
+	warp_def 4, 9, 1, CELADON_DEPT_STORE_1F
+	warp_def 16, 9, 1, CELADON_MANSION_1F
+	warp_def 16, 3, 3, CELADON_MANSION_1F
+	warp_def 17, 3, 3, CELADON_MANSION_1F
+	warp_def 29, 9, 1, CELADON_POKECENTER_1F
+	warp_def 18, 19, 1, CELADON_GAME_CORNER
+	warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
+	warp_def 10, 29, 1, CELADON_GYM
+	warp_def 25, 29, 1, CELADON_CAFE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 8
-	bg_event 21, 23, BGEVENT_READ, CeladonCitySign
-	bg_event 31, 11, BGEVENT_READ, CeladonGymSign
-	bg_event 9, 6, BGEVENT_READ, CeladonCityDeptStoreSign
-	bg_event 9, 13, BGEVENT_READ, CeladonCityMansionSign
-	bg_event 21, 19, BGEVENT_READ, CeladonCityGameCornerSign
-	bg_event 21, 29, BGEVENT_READ, CeladonCityTrainerTips
-	bg_event 9, 30, BGEVENT_READ, CeladonCityPokecenterSign
-	bg_event 21, 37, BGEVENT_ITEM, CeladonCityHiddenPpUp
+	bg_event 23, 21, BGEVENT_READ, CeladonCitySign
+	bg_event 11, 31, BGEVENT_READ, CeladonGymSign
+	bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign
+	bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign
+	bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign
+	bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips
+	bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
+	bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
-	object_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
-	object_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
-	object_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
-	object_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
-	object_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
-	object_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
-	object_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
-	object_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
+	object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
+	object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
+	object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
+	object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
+	object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
+	object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
+	object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
+	object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
+	object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 6a1a7e358..7bf379a0e 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -79,21 +79,21 @@ CeladonDeptStore1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $7, 1, CELADON_CITY
-	warp_def $7, $8, 1, CELADON_CITY
-	warp_def $0, $f, 2, CELADON_DEPT_STORE_2F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 7, 7, 1, CELADON_CITY
+	warp_def 8, 7, 1, CELADON_CITY
+	warp_def 15, 0, 2, CELADON_DEPT_STORE_2F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore1FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
-	object_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
-	object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
+	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
+	object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
+	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 916b89efb..db93e4ee7 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -74,21 +74,21 @@ CeladonDeptStore2F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, CELADON_DEPT_STORE_3F
-	warp_def $0, $f, 3, CELADON_DEPT_STORE_1F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, CELADON_DEPT_STORE_3F
+	warp_def 15, 0, 3, CELADON_DEPT_STORE_1F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore2FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore2FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
-	object_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
-	object_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
-	object_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
+	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
+	object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
+	object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
+	object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 38510ec1a..cf941d4c8 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -100,22 +100,22 @@ CeladonDeptStore3F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, CELADON_DEPT_STORE_2F
-	warp_def $0, $f, 2, CELADON_DEPT_STORE_4F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, CELADON_DEPT_STORE_2F
+	warp_def 15, 0, 2, CELADON_DEPT_STORE_4F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore3FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore3FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
-	object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
-	object_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
-	object_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
-	object_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
+	object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
+	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
+	object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
+	object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
+	object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index fe3942113..dff331264 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -56,20 +56,20 @@ CeladonDeptStore4F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, CELADON_DEPT_STORE_5F
-	warp_def $0, $f, 2, CELADON_DEPT_STORE_3F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, CELADON_DEPT_STORE_5F
+	warp_def 15, 0, 2, CELADON_DEPT_STORE_3F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore4FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore4FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
-	object_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
-	object_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
+	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
+	object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
+	object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index eda2ec693..b0fa491b5 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -77,22 +77,22 @@ CeladonDeptStore5F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, CELADON_DEPT_STORE_4F
-	warp_def $0, $f, 1, CELADON_DEPT_STORE_6F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, CELADON_DEPT_STORE_4F
+	warp_def 15, 0, 1, CELADON_DEPT_STORE_6F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore5FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore5FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
-	object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
-	object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
-	object_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
-	object_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
+	object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
+	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
+	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
+	object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
+	object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 256b8541f..c94ef993e 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -153,22 +153,22 @@ CeladonDeptStore6F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $0, $f, 2, CELADON_DEPT_STORE_5F
-	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_def 15, 0, 2, CELADON_DEPT_STORE_5F
+	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 0, 14, BGEVENT_READ, CeladonDeptStore6FDirectory
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton
-	bg_event 1, 8, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 1, 9, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 1, 10, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 1, 11, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+	bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
-	object_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
+	object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
+	object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index 44c37ae9f..d199bb734 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -33,15 +33,15 @@ CeladonDeptStoreElevator_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, -1, CELADON_DEPT_STORE_1F
-	warp_def $3, $2, -1, CELADON_DEPT_STORE_1F
+	warp_def 1, 3, -1, CELADON_DEPT_STORE_1F
+	warp_def 2, 3, -1, CELADON_DEPT_STORE_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 0, 3, BGEVENT_READ, CeladonDeptStoreElevatorScript
+	bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
 
 .ObjectEvents:
 	db 0
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index d5e17050b..d35b1a45b 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -287,61 +287,61 @@ CeladonGameCorner_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $e, 6, CELADON_CITY
-	warp_def $d, $f, 6, CELADON_CITY
+	warp_def 14, 13, 6, CELADON_CITY
+	warp_def 15, 13, 6, CELADON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 38
-	bg_event 6, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 7, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 8, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 9, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 10, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 11, 1, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
+	bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
 	bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 7, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 8, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 9, 6, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
-	bg_event 10, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 11, 6, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
-	bg_event 6, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
+	bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
+	bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 8, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 9, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 10, 7, BGEVENT_READ, CeladonGameCornerSlotMachineScript
-	bg_event 11, 7, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 6, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 8, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 9, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 10, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 11, 12, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 6, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 8, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 9, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 10, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 11, 13, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 6, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 8, 18, BGEVENT_READ, CeladonGameCornerLighterScript
-	bg_event 9, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 10, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 11, 18, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 0, 15, BGEVENT_READ, CeladonGameCornerPoster1Script
-	bg_event 0, 9, BGEVENT_READ, CeladonGameCornerPoster2Script
+	bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript
+	bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript
+	bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
+	bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
-	object_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
-	object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
-	object_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
-	object_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
-	object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
-	object_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
+	object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
+	object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
+	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
+	object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
+	object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
+	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
+	object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index d40f3eecc..7f74c684f 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -275,18 +275,18 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $5, $2, 7, CELADON_CITY
-	warp_def $5, $3, 7, CELADON_CITY
+	warp_def 2, 5, 7, CELADON_CITY
+	warp_def 3, 5, 7, CELADON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 2, BGEVENT_READ, GoldenrodGameCornerTMVendor
-	bg_event 1, 4, BGEVENT_READ, GoldenrodGameCornerPokemonVendor
+	bg_event 2, 1, BGEVENT_READ, GoldenrodGameCornerTMVendor
+	bg_event 4, 1, BGEVENT_READ, GoldenrodGameCornerPokemonVendor
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
-	object_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
+	object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
+	object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 4cff86dfc..cabb2d45c 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -273,22 +273,22 @@ CeladonGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 8, CELADON_CITY
-	warp_def $11, $5, 8, CELADON_CITY
+	warp_def 4, 17, 8, CELADON_CITY
+	warp_def 5, 17, 8, CELADON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, CeladonGymStatue
-	bg_event 15, 6, BGEVENT_READ, CeladonGymStatue
+	bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
+	bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
-	object_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
-	object_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
-	object_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
-	object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
-	object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
+	object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
+	object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
+	object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
+	object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
+	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
+	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 452ba96e8..892401afe 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -80,24 +80,24 @@ CeladonMansion1F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $6, 2, CELADON_CITY
-	warp_def $9, $7, 2, CELADON_CITY
-	warp_def $0, $3, 3, CELADON_CITY
-	warp_def $0, $0, 1, CELADON_MANSION_2F
-	warp_def $0, $7, 4, CELADON_MANSION_2F
+	warp_def 6, 9, 2, CELADON_CITY
+	warp_def 7, 9, 2, CELADON_CITY
+	warp_def 3, 0, 3, CELADON_CITY
+	warp_def 0, 0, 1, CELADON_MANSION_2F
+	warp_def 7, 0, 4, CELADON_MANSION_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 8, 5, BGEVENT_UP, CeladonMansionManagersSuiteSign
-	bg_event 3, 0, BGEVENT_READ, CeladonMansion1fBookshelf
-	bg_event 3, 2, BGEVENT_READ, CeladonMansion1fBookshelf
+	bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
+	bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
+	bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
-	object_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
-	object_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
-	object_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
+	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
+	object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
+	object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
+	object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm
index d63ef1be6..7af437c21 100644
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -55,19 +55,19 @@ CeladonMansion2F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $0, 4, CELADON_MANSION_1F
-	warp_def $0, $1, 2, CELADON_MANSION_3F
-	warp_def $0, $6, 3, CELADON_MANSION_3F
-	warp_def $0, $7, 5, CELADON_MANSION_1F
+	warp_def 0, 0, 4, CELADON_MANSION_1F
+	warp_def 1, 0, 2, CELADON_MANSION_3F
+	warp_def 6, 0, 3, CELADON_MANSION_3F
+	warp_def 7, 0, 5, CELADON_MANSION_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 3, 0, BGEVENT_READ, CeladonMansion2FComputer
-	bg_event 8, 5, BGEVENT_UP, CeladonMansion2FSign
-	bg_event 3, 2, BGEVENT_READ, CeladonMansion2FBookshelf
+	bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
+	bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
+	bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
 
 .ObjectEvents:
 	db 0
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index dfa41c582..5274b5b38 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -195,24 +195,24 @@ CeladonMansion3F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $0, 1, CELADON_MANSION_ROOF
-	warp_def $0, $1, 2, CELADON_MANSION_2F
-	warp_def $0, $6, 3, CELADON_MANSION_2F
-	warp_def $0, $7, 2, CELADON_MANSION_ROOF
+	warp_def 0, 0, 1, CELADON_MANSION_ROOF
+	warp_def 1, 0, 2, CELADON_MANSION_2F
+	warp_def 6, 0, 3, CELADON_MANSION_2F
+	warp_def 7, 0, 2, CELADON_MANSION_ROOF
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 8, 5, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
-	bg_event 3, 4, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
-	bg_event 6, 1, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
-	bg_event 3, 1, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
+	bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
+	bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
+	bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
+	bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
-	object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
-	object_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
-	object_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
+	object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
+	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
+	object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
+	object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 8458a9d87..bf53f8b4f 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -39,17 +39,17 @@ CeladonMansionRoof_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $1, $1, 1, CELADON_MANSION_3F
-	warp_def $1, $6, 4, CELADON_MANSION_3F
-	warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE
+	warp_def 1, 1, 1, CELADON_MANSION_3F
+	warp_def 6, 1, 4, CELADON_MANSION_3F
+	warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 1, 6, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
+	bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
+	object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 4cb750df7..6fdd96afe 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -122,8 +122,8 @@ CeladonMansionRoofHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, CELADON_MANSION_ROOF
-	warp_def $7, $3, 3, CELADON_MANSION_ROOF
+	warp_def 2, 7, 3, CELADON_MANSION_ROOF
+	warp_def 3, 7, 3, CELADON_MANSION_ROOF
 
 .CoordEvents:
 	db 0
@@ -133,4 +133,4 @@ CeladonMansionRoofHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+	object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 32fdf2010..2c2a594e6 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -151,9 +151,9 @@ CeladonPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, CELADON_CITY
-	warp_def $7, $4, 5, CELADON_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 5, CELADON_CITY
+	warp_def 4, 7, 5, CELADON_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -163,8 +163,8 @@ CeladonPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
-	object_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
-	object_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
-	object_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
-	object_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
+	object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
+	object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
+	object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
+	object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index 10a192b93..2dcb0e1eb 100644
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ CeladonPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, CELADON_POKECENTER_1F
+	warp_def 0, 7, 3, CELADON_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index fc0bd60f6..47a991d21 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -281,12 +281,12 @@ CeruleanCity_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $f, $7, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
-	warp_def $11, $1c, 1, CERULEAN_POLICE_STATION
-	warp_def $13, $d, 1, CERULEAN_TRADE_SPEECH_HOUSE
-	warp_def $15, $13, 1, CERULEAN_POKECENTER_1F
-	warp_def $17, $1e, 1, CERULEAN_GYM
-	warp_def $1d, $19, 2, CERULEAN_MART
+	warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
+	warp_def 28, 17, 1, CERULEAN_POLICE_STATION
+	warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
+	warp_def 19, 21, 1, CERULEAN_POKECENTER_1F
+	warp_def 30, 23, 1, CERULEAN_GYM
+	warp_def 25, 29, 2, CERULEAN_MART
 
 .CoordEvents:
 	db 0
@@ -294,20 +294,20 @@ CeruleanCity_MapEventHeader:
 .BGEvents:
 	db 9
 	bg_event 23, 23, BGEVENT_READ, CeruleanCitySign
-	bg_event 25, 27, BGEVENT_READ, CeruleanGymSign
-	bg_event 29, 11, BGEVENT_READ, CeruleanBikeShopSign
-	bg_event 17, 25, BGEVENT_READ, CeruleanPoliceSign
-	bg_event 7, 23, BGEVENT_READ, CeruleanCapeSign
-	bg_event 29, 14, BGEVENT_READ, CeruleanLockedDoor
-	bg_event 21, 20, BGEVENT_READ, CeruleanCityPokecenterSign
-	bg_event 29, 26, BGEVENT_READ, CeruleanCityMartSign
-	bg_event 12, 2, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
+	bg_event 27, 25, BGEVENT_READ, CeruleanGymSign
+	bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign
+	bg_event 25, 17, BGEVENT_READ, CeruleanPoliceSign
+	bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign
+	bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor
+	bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign
+	bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
+	bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
-	object_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
-	object_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
-	object_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
-	object_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
-	object_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
+	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
+	object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
+	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
+	object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
+	object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
+	object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index b014199b7..59a1b72b9 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -369,23 +369,23 @@ CeruleanGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 5, CERULEAN_CITY
-	warp_def $f, $5, 5, CERULEAN_CITY
+	warp_def 4, 15, 5, CERULEAN_CITY
+	warp_def 5, 15, 5, CERULEAN_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 8, 3, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
-	bg_event 13, 2, BGEVENT_READ, CeruleanGymStatue1
-	bg_event 13, 6, BGEVENT_READ, CeruleanGymStatue2
+	bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
+	bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
+	bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
-	object_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
+	object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 92c40682f..5c8beb81b 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -22,8 +22,8 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, CERULEAN_CITY
-	warp_def $7, $3, 1, CERULEAN_CITY
+	warp_def 2, 7, 1, CERULEAN_CITY
+	warp_def 3, 7, 1, CERULEAN_CITY
 
 .CoordEvents:
 	db 0
@@ -33,4 +33,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index b2674dd46..b9d2226ff 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -51,8 +51,8 @@ CeruleanMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, CERULEAN_CITY
-	warp_def $7, $3, 6, CERULEAN_CITY
+	warp_def 2, 7, 6, CERULEAN_CITY
+	warp_def 3, 7, 6, CERULEAN_CITY
 
 .CoordEvents:
 	db 0
@@ -62,6 +62,6 @@ CeruleanMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
+	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
+	object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 83e64fca5..2e03275d4 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -68,9 +68,9 @@ CeruleanPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 4, CERULEAN_CITY
-	warp_def $7, $4, 4, CERULEAN_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 4, CERULEAN_CITY
+	warp_def 4, 7, 4, CERULEAN_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -80,6 +80,6 @@ CeruleanPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
-	object_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
-	object_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
+	object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
+	object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index ba25a36b3..a0c49e759 100644
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ CeruleanPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 1, CERULEAN_POKECENTER_1F
+	warp_def 0, 7, 1, CERULEAN_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index 8e3271e4e..77ff3baf8 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -49,8 +49,8 @@ CeruleanPoliceStation_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, CERULEAN_CITY
-	warp_def $7, $3, 2, CERULEAN_CITY
+	warp_def 2, 7, 2, CERULEAN_CITY
+	warp_def 3, 7, 2, CERULEAN_CITY
 
 .CoordEvents:
 	db 0
@@ -60,6 +60,6 @@ CeruleanPoliceStation_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
-	object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
-	object_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
+	object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
+	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
+	object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 16c043862..289358996 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -59,8 +59,8 @@ CeruleanTradeSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, CERULEAN_CITY
-	warp_def $7, $3, 3, CERULEAN_CITY
+	warp_def 2, 7, 3, CERULEAN_CITY
+	warp_def 3, 7, 3, CERULEAN_CITY
 
 .CoordEvents:
 	db 0
@@ -70,7 +70,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
-	object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
-	object_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
-	object_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
+	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
+	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
+	object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
+	object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index cfad6ab1d..2b5942001 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -154,20 +154,20 @@ CharcoalKiln_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, AZALEA_TOWN
-	warp_def $7, $3, 2, AZALEA_TOWN
+	warp_def 2, 7, 2, AZALEA_TOWN
+	warp_def 3, 7, 2, AZALEA_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, CharcoalKilnBookshelf
+	bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
 	bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
-	bg_event 1, 7, BGEVENT_READ, CharcoalKilnRadio
+	bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
-	object_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
-	object_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
+	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
+	object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
+	object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 0b6f01283..d87d52165 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -552,28 +552,28 @@ CherrygroveCity_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $3, $17, 2, CHERRYGROVE_MART
-	warp_def $3, $1d, 1, CHERRYGROVE_POKECENTER_1F
-	warp_def $7, $11, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
-	warp_def $9, $19, 1, GUIDE_GENTS_HOUSE
-	warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
+	warp_def 23, 3, 2, CHERRYGROVE_MART
+	warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F
+	warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
+	warp_def 25, 9, 1, GUIDE_GENTS_HOUSE
+	warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
 .CoordEvents:
 	db 2
-	coord_event 1, $6, $21, CherrygroveSilverSceneNorth
-	coord_event 1, $7, $21, CherrygroveSilverSceneSouth
+	coord_event 33, 6, 1, CherrygroveSilverSceneNorth
+	coord_event 33, 7, 1, CherrygroveSilverSceneSouth
 
 .BGEvents:
 	db 4
-	bg_event 8, 30, BGEVENT_READ, CherrygroveCitySign
-	bg_event 9, 23, BGEVENT_READ, GuideGentsHouseSign
-	bg_event 3, 24, BGEVENT_READ, CherrygroveCityMartSign
-	bg_event 3, 30, BGEVENT_READ, CherrygroveCityPokecenterSign
+	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
+	bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign
+	bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign
+	bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
-	object_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
-	object_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
-	object_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
-	object_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
+	object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
+	object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
+	object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
+	object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
+	object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index 411e77d09..1b32f92b2 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -47,18 +47,18 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, CHERRYGROVE_CITY
-	warp_def $7, $3, 5, CHERRYGROVE_CITY
+	warp_def 2, 7, 5, CHERRYGROVE_CITY
+	warp_def 3, 7, 5, CHERRYGROVE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
-	object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
+	object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
+	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index 409624fe1..084092251 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -50,18 +50,18 @@ CherrygroveGymSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, CHERRYGROVE_CITY
-	warp_def $7, $3, 3, CHERRYGROVE_CITY
+	warp_def 2, 7, 3, CHERRYGROVE_CITY
+	warp_def 3, 7, 3, CHERRYGROVE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
-	object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
+	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index e835dbee2..caee8ba37 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -77,8 +77,8 @@ CherrygroveMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, CHERRYGROVE_CITY
-	warp_def $7, $3, 1, CHERRYGROVE_CITY
+	warp_def 2, 7, 1, CHERRYGROVE_CITY
+	warp_def 3, 7, 1, CHERRYGROVE_CITY
 
 .CoordEvents:
 	db 0
@@ -88,6 +88,6 @@ CherrygroveMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
-	object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
+	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index f9b111012..30e6c179c 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -74,9 +74,9 @@ CherrygrovePokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 2, CHERRYGROVE_CITY
-	warp_def $7, $4, 2, CHERRYGROVE_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 2, CHERRYGROVE_CITY
+	warp_def 4, 7, 2, CHERRYGROVE_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -86,7 +86,7 @@ CherrygrovePokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
-	object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
-	object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
-	object_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
+	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
+	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
+	object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 23ea94742..86c958205 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -386,40 +386,40 @@ CianwoodCity_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $29, $11, 1, MANIAS_HOUSE
-	warp_def $2b, $8, 1, CIANWOOD_GYM
-	warp_def $2b, $17, 1, CIANWOOD_POKECENTER_1F
-	warp_def $2f, $f, 1, CIANWOOD_PHARMACY
-	warp_def $1f, $9, 1, CIANWOOD_CITY_PHOTO_STUDIO
-	warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
-	warp_def $11, $5, 1, POKE_SEERS_HOUSE
+	warp_def 17, 41, 1, MANIAS_HOUSE
+	warp_def 8, 43, 1, CIANWOOD_GYM
+	warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F
+	warp_def 15, 47, 1, CIANWOOD_PHARMACY
+	warp_def 9, 31, 1, CIANWOOD_CITY_PHOTO_STUDIO
+	warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
+	warp_def 5, 17, 1, POKE_SEERS_HOUSE
 
 .CoordEvents:
 	db 1
-	coord_event 1, $10, $b, CianwoodCitySuicuneAndEusine
+	coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
 
 .BGEvents:
 	db 8
-	bg_event 34, 20, BGEVENT_READ, CianwoodCitySign
-	bg_event 45, 7, BGEVENT_READ, CianwoodGymSign
-	bg_event 43, 24, BGEVENT_READ, CianwoodPokecenterSign
-	bg_event 47, 19, BGEVENT_READ, CianwoodPharmacySign
-	bg_event 32, 8, BGEVENT_READ, CianwoodPhotoStudioSign
-	bg_event 24, 8, BGEVENT_READ, CianwoodPokeSeerSign
-	bg_event 19, 4, BGEVENT_ITEM, CianwoodCityHiddenRevive
-	bg_event 29, 5, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
+	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
+	bg_event 7, 45, BGEVENT_READ, CianwoodGymSign
+	bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign
+	bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign
+	bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign
+	bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign
+	bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
+	bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
-	object_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
-	object_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
-	object_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
-	object_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
-	object_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+	object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
+	object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
+	object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
+	object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
+	object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
+	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm
index 0a901ff28..3a20c63e6 100644
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodCityPhotoStudio.asm
@@ -54,8 +54,8 @@ CianwoodCityPhotoStudio_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, CIANWOOD_CITY
-	warp_def $7, $3, 5, CIANWOOD_CITY
+	warp_def 2, 7, 5, CIANWOOD_CITY
+	warp_def 3, 7, 5, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
@@ -65,4 +65,4 @@ CianwoodCityPhotoStudio_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
+	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 34c6df728..0323fc0eb 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -311,25 +311,25 @@ CianwoodGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 2, CIANWOOD_CITY
-	warp_def $11, $5, 2, CIANWOOD_CITY
+	warp_def 4, 17, 2, CIANWOOD_CITY
+	warp_def 5, 17, 2, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, CianwoodGymStatue
-	bg_event 15, 6, BGEVENT_READ, CianwoodGymStatue
+	bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
+	bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
-	object_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
-	object_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
-	object_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
-	object_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
-	object_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
+	object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
+	object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
+	object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
+	object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
+	object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 2457ef435..9a0cf5b7a 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -67,19 +67,19 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, CIANWOOD_CITY
-	warp_def $7, $3, 6, CIANWOOD_CITY
+	warp_def 2, 7, 6, CIANWOOD_CITY
+	warp_def 3, 7, 6, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
-	object_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
-	object_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
+	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
+	object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
+	object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 4a6cf826e..629294333 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -78,17 +78,17 @@ CianwoodPharmacy_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, CIANWOOD_CITY
-	warp_def $7, $3, 4, CIANWOOD_CITY
+	warp_def 2, 7, 4, CIANWOOD_CITY
+	warp_def 3, 7, 4, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CianwoodPharmacyBookshelf
+	bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
+	object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index ab39de7ca..3bf9a1b3a 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -137,9 +137,9 @@ CianwoodPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 3, CIANWOOD_CITY
-	warp_def $7, $4, 3, CIANWOOD_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 3, CIANWOOD_CITY
+	warp_def 4, 7, 3, CIANWOOD_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -149,7 +149,7 @@ CianwoodPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
-	object_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
-	object_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
-	object_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
+	object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
+	object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
+	object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index f5723a4fd..50b26a8f5 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -133,18 +133,18 @@ CinnabarIsland_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $b, $b, 1, CINNABAR_POKECENTER_1F
+	warp_def 11, 11, 1, CINNABAR_POKECENTER_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 11, 12, BGEVENT_READ, CinnabarIslandPokecenterSign
-	bg_event 11, 9, BGEVENT_READ, CinnabarIslandGymSign
+	bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign
+	bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign
 	bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
-	bg_event 1, 9, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
+	bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
+	object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index a079b8df0..e74bd85ab 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -40,9 +40,9 @@ CinnabarPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, CINNABAR_ISLAND
-	warp_def $7, $4, 1, CINNABAR_ISLAND
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, CINNABAR_ISLAND
+	warp_def 4, 7, 1, CINNABAR_ISLAND
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -52,6 +52,6 @@ CinnabarPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
-	object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
-	object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
+	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index 3ef9d77c7..1e110c8fe 100644
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ CinnabarPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, CINNABAR_POKECENTER_1F
+	warp_def 0, 7, 3, CINNABAR_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index b17f10d30..647e16541 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -68,8 +68,8 @@ Colosseum_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 3, POKECENTER_2F
-	warp_def $7, $5, 3, POKECENTER_2F
+	warp_def 4, 7, 3, POKECENTER_2F
+	warp_def 5, 7, 3, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -77,9 +77,9 @@ Colosseum_MapEventHeader:
 .BGEvents:
 	db 2
 	bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
-	bg_event 4, 5, BGEVENT_LEFT, MapColosseumSignpost1Script
+	bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
+	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
+	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index e1df41b43..925f7683a 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -78,9 +78,9 @@ CopycatsHouse1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $2, 8, SAFFRON_CITY
-	warp_def $7, $3, 8, SAFFRON_CITY
-	warp_def $0, $2, 1, COPYCATS_HOUSE_2F
+	warp_def 2, 7, 8, SAFFRON_CITY
+	warp_def 3, 7, 8, SAFFRON_CITY
+	warp_def 2, 0, 1, COPYCATS_HOUSE_2F
 
 .CoordEvents:
 	db 0
@@ -90,6 +90,6 @@ CopycatsHouse1F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
-	object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
-	object_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
+	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
+	object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 73fe945e5..5456973dc 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -366,21 +366,21 @@ CopycatsHouse2F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $0, $3, 3, COPYCATS_HOUSE_1F
+	warp_def 3, 0, 3, COPYCATS_HOUSE_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CopycatsHouse2FBookshelf
+	bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 	bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
-	object_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
-	object_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
-	object_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
+	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
+	object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
+	object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
+	object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index f82311dd0..c4ec8bbe2 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -343,25 +343,25 @@ DanceTheatre_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $5, 8, ECRUTEAK_CITY
-	warp_def $d, $6, 8, ECRUTEAK_CITY
+	warp_def 5, 13, 8, ECRUTEAK_CITY
+	warp_def 6, 13, 8, ECRUTEAK_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 6, 5, BGEVENT_UP, MapDanceTheatreSignpost1Script
+	bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 	bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
-	object_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
-	object_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
-	object_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
-	object_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
-	object_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
-	object_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
-	object_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
-	object_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
+	object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
+	object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
+	object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
+	object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
+	object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
+	object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
+	object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
+	object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
+	object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index e003d2951..bd6272298 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -67,8 +67,8 @@ DarkCaveBlackthornEntrance_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $17, 1, ROUTE_45
-	warp_def $19, $3, 2, DARK_CAVE_VIOLET_ENTRANCE
+	warp_def 23, 3, 1, ROUTE_45
+	warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
 
 .CoordEvents:
 	db 0
@@ -78,6 +78,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
-	object_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
-	object_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
+	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
+	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
+	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 03ab3b072..b1e629a54 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -40,24 +40,24 @@ DarkCaveVioletEntrance_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $f, $3, 3, ROUTE_31
-	warp_def $1, $11, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
-	warp_def $21, $23, 3, ROUTE_46
+	warp_def 3, 15, 3, ROUTE_31
+	warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
+	warp_def 35, 33, 3, ROUTE_46
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 3, 26, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
+	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
-	object_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
-	object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
-	object_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
+	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
+	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
+	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
+	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index fc7865f98..0d06cea93 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -161,20 +161,20 @@ DayCare_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $5, $0, 3, ROUTE_34
-	warp_def $6, $0, 4, ROUTE_34
-	warp_def $7, $2, 5, ROUTE_34
-	warp_def $7, $3, 5, ROUTE_34
+	warp_def 0, 5, 3, ROUTE_34
+	warp_def 0, 6, 4, ROUTE_34
+	warp_def 2, 7, 5, ROUTE_34
+	warp_def 3, 7, 5, ROUTE_34
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, DayCareBookshelf
+	bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
 	bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
-	object_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
+	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 53c3f73dd..04277b792 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -29,20 +29,20 @@ DiglettsCave_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $21, $3, 10, VERMILION_CITY
-	warp_def $1f, $5, 5, DIGLETTS_CAVE
-	warp_def $5, $f, 5, ROUTE_2
-	warp_def $3, $11, 6, DIGLETTS_CAVE
-	warp_def $21, $11, 2, DIGLETTS_CAVE
-	warp_def $3, $3, 4, DIGLETTS_CAVE
+	warp_def 3, 33, 10, VERMILION_CITY
+	warp_def 5, 31, 5, DIGLETTS_CAVE
+	warp_def 15, 5, 5, ROUTE_2
+	warp_def 17, 3, 6, DIGLETTS_CAVE
+	warp_def 17, 33, 2, DIGLETTS_CAVE
+	warp_def 3, 3, 4, DIGLETTS_CAVE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 11, 6, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
+	bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
+	object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 0e805f230..1df424ca1 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -674,8 +674,8 @@ DragonShrine_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $9, $4, 2, DRAGONS_DEN_B1F
-	warp_def $9, $5, 2, DRAGONS_DEN_B1F
+	warp_def 4, 9, 2, DRAGONS_DEN_B1F
+	warp_def 5, 9, 2, DRAGONS_DEN_B1F
 
 .CoordEvents:
 	db 0
@@ -685,7 +685,7 @@ DragonShrine_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
+	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
+	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
+	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
+	object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm
index 46f6a30a5..8ab1c9bb4 100644
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -11,10 +11,10 @@ DragonsDen1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $5, $3, 8, BLACKTHORN_CITY
-	warp_def $3, $3, 4, DRAGONS_DEN_1F
-	warp_def $f, $5, 1, DRAGONS_DEN_B1F
-	warp_def $d, $5, 2, DRAGONS_DEN_1F
+	warp_def 3, 5, 8, BLACKTHORN_CITY
+	warp_def 3, 3, 4, DRAGONS_DEN_1F
+	warp_def 5, 15, 1, DRAGONS_DEN_B1F
+	warp_def 5, 13, 2, DRAGONS_DEN_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index c638132f5..8f87735db 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -412,28 +412,28 @@ DragonsDenB1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $14, 3, DRAGONS_DEN_1F
-	warp_def $1d, $13, 1, DRAGON_SHRINE
+	warp_def 20, 3, 3, DRAGONS_DEN_1F
+	warp_def 19, 29, 1, DRAGON_SHRINE
 
 .CoordEvents:
 	db 1
-	coord_event 1, $1e, $13, DragonsDenB1F_ClairScene
+	coord_event 19, 30, 1, DragonsDenB1F_ClairScene
 
 .BGEvents:
 	db 4
-	bg_event 24, 18, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
-	bg_event 29, 33, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
-	bg_event 17, 21, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
-	bg_event 15, 31, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
+	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
+	bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
+	bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
+	bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
-	object_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
-	object_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
-	object_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
-	object_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
-	object_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
-	object_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
-	object_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
-	object_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
+	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
+	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
+	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
+	object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
+	object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
+	object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
+	object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
+	object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
+	object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 7da92ec0f..3ed66a713 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -418,24 +418,24 @@ EarlsPokemonAcademy_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $3, 3, VIOLET_CITY
-	warp_def $f, $4, 3, VIOLET_CITY
+	warp_def 3, 15, 3, VIOLET_CITY
+	warp_def 4, 15, 3, VIOLET_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 1, 0, BGEVENT_READ, AcademyBookshelf
+	bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
 	bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
-	bg_event 0, 3, BGEVENT_READ, AcademyBlackboard
-	bg_event 0, 4, BGEVENT_READ, AcademyBlackboard
+	bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
+	bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
-	object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
-	object_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
-	object_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
-	object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
-	object_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
+	object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
+	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
+	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
+	object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
+	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
+	object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 9e359419b..322b403f6 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -265,42 +265,42 @@ EcruteakCity_MapEventHeader:
 
 .Warps:
 	db 15
-	warp_def $1a, $23, 1, ROUTE_42_ECRUTEAK_GATE
-	warp_def $1b, $23, 2, ROUTE_42_ECRUTEAK_GATE
-	warp_def $b, $12, 1, ECRUTEAK_HOUSE
-	warp_def $2, $14, 1, WISE_TRIOS_ROOM
-	warp_def $3, $14, 2, WISE_TRIOS_ROOM
-	warp_def $1b, $17, 1, ECRUTEAK_POKECENTER_1F
-	warp_def $15, $5, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
-	warp_def $15, $17, 1, DANCE_THEATRE
-	warp_def $15, $1d, 2, ECRUTEAK_MART
-	warp_def $1b, $6, 1, ECRUTEAK_GYM
-	warp_def $1b, $d, 1, ECRUTEAK_ITEMFINDER_HOUSE
-	warp_def $7, $25, 1, TIN_TOWER_1F
-	warp_def $5, $5, 1, BURNED_TOWER_1F
-	warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE
-	warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE
+	warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
+	warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
+	warp_def 18, 11, 1, ECRUTEAK_HOUSE
+	warp_def 20, 2, 1, WISE_TRIOS_ROOM
+	warp_def 20, 3, 2, WISE_TRIOS_ROOM
+	warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F
+	warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
+	warp_def 23, 21, 1, DANCE_THEATRE
+	warp_def 29, 21, 2, ECRUTEAK_MART
+	warp_def 6, 27, 1, ECRUTEAK_GYM
+	warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
+	warp_def 37, 7, 1, TIN_TOWER_1F
+	warp_def 5, 5, 1, BURNED_TOWER_1F
+	warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
+	warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 8
-	bg_event 21, 15, BGEVENT_READ, EcruteakCitySign
-	bg_event 10, 38, BGEVENT_READ, TinTowerSign
-	bg_event 28, 8, BGEVENT_READ, EcruteakGymSign
+	bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
+	bg_event 38, 10, BGEVENT_READ, TinTowerSign
+	bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
 	bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign
-	bg_event 10, 2, BGEVENT_READ, BurnedTowerSign
-	bg_event 27, 24, BGEVENT_READ, EcruteakCityPokecenterSign
-	bg_event 21, 30, BGEVENT_READ, EcruteakCityMartSign
-	bg_event 14, 23, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
+	bg_event 2, 10, BGEVENT_READ, BurnedTowerSign
+	bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign
+	bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
+	bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
-	object_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
-	object_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
-	object_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
-	object_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
-	object_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1
-	object_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
+	object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
+	object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
+	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
+	object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
+	object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
+	object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1
+	object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 6f54bb4bd..491aaff7b 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -392,54 +392,54 @@ EcruteakGym_MapEventHeader:
 
 .Warps:
 	db 33
-	warp_def $11, $4, 10, ECRUTEAK_CITY
-	warp_def $11, $5, 10, ECRUTEAK_CITY
-	warp_def $e, $4, 4, ECRUTEAK_GYM
-	warp_def $4, $2, 3, ECRUTEAK_GYM
-	warp_def $4, $3, 3, ECRUTEAK_GYM
-	warp_def $4, $4, 3, ECRUTEAK_GYM
-	warp_def $5, $4, 3, ECRUTEAK_GYM
-	warp_def $7, $6, 3, ECRUTEAK_GYM
-	warp_def $4, $7, 3, ECRUTEAK_GYM
-	warp_def $6, $2, 3, ECRUTEAK_GYM
-	warp_def $6, $3, 3, ECRUTEAK_GYM
-	warp_def $6, $4, 3, ECRUTEAK_GYM
-	warp_def $6, $5, 3, ECRUTEAK_GYM
-	warp_def $6, $7, 3, ECRUTEAK_GYM
-	warp_def $7, $7, 3, ECRUTEAK_GYM
-	warp_def $8, $4, 3, ECRUTEAK_GYM
-	warp_def $8, $5, 3, ECRUTEAK_GYM
-	warp_def $8, $6, 3, ECRUTEAK_GYM
-	warp_def $8, $7, 3, ECRUTEAK_GYM
-	warp_def $8, $2, 3, ECRUTEAK_GYM
-	warp_def $9, $2, 3, ECRUTEAK_GYM
-	warp_def $a, $2, 3, ECRUTEAK_GYM
-	warp_def $b, $2, 3, ECRUTEAK_GYM
-	warp_def $a, $4, 3, ECRUTEAK_GYM
-	warp_def $a, $5, 3, ECRUTEAK_GYM
-	warp_def $c, $2, 3, ECRUTEAK_GYM
-	warp_def $c, $3, 3, ECRUTEAK_GYM
-	warp_def $c, $4, 3, ECRUTEAK_GYM
-	warp_def $c, $5, 3, ECRUTEAK_GYM
-	warp_def $a, $7, 3, ECRUTEAK_GYM
-	warp_def $b, $7, 3, ECRUTEAK_GYM
-	warp_def $c, $7, 3, ECRUTEAK_GYM
-	warp_def $d, $7, 3, ECRUTEAK_GYM
+	warp_def 4, 17, 10, ECRUTEAK_CITY
+	warp_def 5, 17, 10, ECRUTEAK_CITY
+	warp_def 4, 14, 4, ECRUTEAK_GYM
+	warp_def 2, 4, 3, ECRUTEAK_GYM
+	warp_def 3, 4, 3, ECRUTEAK_GYM
+	warp_def 4, 4, 3, ECRUTEAK_GYM
+	warp_def 4, 5, 3, ECRUTEAK_GYM
+	warp_def 6, 7, 3, ECRUTEAK_GYM
+	warp_def 7, 4, 3, ECRUTEAK_GYM
+	warp_def 2, 6, 3, ECRUTEAK_GYM
+	warp_def 3, 6, 3, ECRUTEAK_GYM
+	warp_def 4, 6, 3, ECRUTEAK_GYM
+	warp_def 5, 6, 3, ECRUTEAK_GYM
+	warp_def 7, 6, 3, ECRUTEAK_GYM
+	warp_def 7, 7, 3, ECRUTEAK_GYM
+	warp_def 4, 8, 3, ECRUTEAK_GYM
+	warp_def 5, 8, 3, ECRUTEAK_GYM
+	warp_def 6, 8, 3, ECRUTEAK_GYM
+	warp_def 7, 8, 3, ECRUTEAK_GYM
+	warp_def 2, 8, 3, ECRUTEAK_GYM
+	warp_def 2, 9, 3, ECRUTEAK_GYM
+	warp_def 2, 10, 3, ECRUTEAK_GYM
+	warp_def 2, 11, 3, ECRUTEAK_GYM
+	warp_def 4, 10, 3, ECRUTEAK_GYM
+	warp_def 5, 10, 3, ECRUTEAK_GYM
+	warp_def 2, 12, 3, ECRUTEAK_GYM
+	warp_def 3, 12, 3, ECRUTEAK_GYM
+	warp_def 4, 12, 3, ECRUTEAK_GYM
+	warp_def 5, 12, 3, ECRUTEAK_GYM
+	warp_def 7, 10, 3, ECRUTEAK_GYM
+	warp_def 7, 11, 3, ECRUTEAK_GYM
+	warp_def 7, 12, 3, ECRUTEAK_GYM
+	warp_def 7, 13, 3, ECRUTEAK_GYM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, EcruteakGymStatue
-	bg_event 15, 6, BGEVENT_READ, EcruteakGymStatue
+	bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
+	bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
-	object_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
-	object_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
-	object_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
-	object_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
-	object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
-	object_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
+	object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
+	object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
+	object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
+	object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
+	object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
+	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
+	object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
index 5cf1efc2a..274cc99e3 100644
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -283,23 +283,23 @@ EcruteakHouse_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $11, $4, 3, ECRUTEAK_CITY
-	warp_def $11, $5, 3, ECRUTEAK_CITY
-	warp_def $3, $5, 4, ECRUTEAK_HOUSE
-	warp_def $f, $11, 3, ECRUTEAK_HOUSE
-	warp_def $3, $11, 3, WISE_TRIOS_ROOM
+	warp_def 4, 17, 3, ECRUTEAK_CITY
+	warp_def 5, 17, 3, ECRUTEAK_CITY
+	warp_def 5, 3, 4, ECRUTEAK_HOUSE
+	warp_def 17, 15, 3, ECRUTEAK_HOUSE
+	warp_def 17, 3, 3, WISE_TRIOS_ROOM
 
 .CoordEvents:
 	db 2
-	coord_event 0, $7, $4, EcruteakHouse_CoordEvent1
-	coord_event 0, $7, $5, EcruteakHouse_CoordEvent2
+	coord_event 4, 7, 0, EcruteakHouse_CoordEvent1
+	coord_event 5, 7, 0, EcruteakHouse_CoordEvent2
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
-	object_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
-	object_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
-	object_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
+	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
+	object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
+	object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
+	object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index f10824a75..011976f7e 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -168,17 +168,17 @@ EcruteakItemfinderHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 11, ECRUTEAK_CITY
-	warp_def $7, $4, 11, ECRUTEAK_CITY
+	warp_def 3, 7, 11, ECRUTEAK_CITY
+	warp_def 4, 7, 11, ECRUTEAK_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 1, 2, BGEVENT_READ, ItemFinderHouseRadio
+	bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
-	object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
+	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
+	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 57f06d99e..e33ce1bf4 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -50,17 +50,17 @@ EcruteakLugiaSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 7, ECRUTEAK_CITY
-	warp_def $7, $4, 7, ECRUTEAK_CITY
+	warp_def 3, 7, 7, ECRUTEAK_CITY
+	warp_def 4, 7, 7, ECRUTEAK_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 1, 2, BGEVENT_READ, LugiaSpeechHouseRadio
+	bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
-	object_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
+	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
+	object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index b41c4a2d3..6859ce5b9 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -51,8 +51,8 @@ EcruteakMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 9, ECRUTEAK_CITY
-	warp_def $7, $3, 9, ECRUTEAK_CITY
+	warp_def 2, 7, 9, ECRUTEAK_CITY
+	warp_def 3, 7, 9, ECRUTEAK_CITY
 
 .CoordEvents:
 	db 0
@@ -62,6 +62,6 @@ EcruteakMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
-	object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
-	object_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
+	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
+	object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index c680fece0..da661209f 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -212,9 +212,9 @@ EcruteakPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 6, ECRUTEAK_CITY
-	warp_def $7, $4, 6, ECRUTEAK_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 6, ECRUTEAK_CITY
+	warp_def 4, 7, 6, ECRUTEAK_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -224,8 +224,8 @@ EcruteakPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
-	object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
-	object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
-	object_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
-	object_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
+	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
+	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
+	object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
+	object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index c8dcb1b29..72e3f68e2 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -89,19 +89,19 @@ ElmsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, NEW_BARK_TOWN
-	warp_def $7, $3, 4, NEW_BARK_TOWN
+	warp_def 2, 7, 4, NEW_BARK_TOWN
+	warp_def 3, 7, 4, NEW_BARK_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, ElmsHousePC
-	bg_event 1, 6, BGEVENT_READ, ElmsHouseBookshelf
-	bg_event 1, 7, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, ElmsHousePC
+	bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
-	object_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
+	object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
+	object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 631969785..13c8b367e 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1376,44 +1376,44 @@ ElmsLab_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $b, $4, 1, NEW_BARK_TOWN
-	warp_def $b, $5, 1, NEW_BARK_TOWN
+	warp_def 4, 11, 1, NEW_BARK_TOWN
+	warp_def 5, 11, 1, NEW_BARK_TOWN
 
 .CoordEvents:
 	db 8
-	coord_event 1, $6, $4, LabTryToLeaveScript
-	coord_event 1, $6, $5, LabTryToLeaveScript
-	coord_event 3, $5, $4, MeetCopScript
-	coord_event 3, $5, $5, MeetCopScript2
-	coord_event 5, $8, $4, AideScript_WalkPotions1
-	coord_event 5, $8, $5, AideScript_WalkPotions2
-	coord_event 6, $8, $4, AideScript_WalkBalls1
-	coord_event 6, $8, $5, AideScript_WalkBalls2
+	coord_event 4, 6, 1, LabTryToLeaveScript
+	coord_event 5, 6, 1, LabTryToLeaveScript
+	coord_event 4, 5, 3, MeetCopScript
+	coord_event 5, 5, 3, MeetCopScript2
+	coord_event 4, 8, 5, AideScript_WalkPotions1
+	coord_event 5, 8, 5, AideScript_WalkPotions2
+	coord_event 4, 8, 6, AideScript_WalkBalls1
+	coord_event 5, 8, 6, AideScript_WalkBalls2
 
 .BGEvents:
 	db 16
-	bg_event 1, 2, BGEVENT_READ, ElmsLabHealingMachine
-	bg_event 1, 6, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 1, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 1, 8, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 1, 9, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 0, BGEVENT_READ, ElmsLabTravelTip1
-	bg_event 7, 1, BGEVENT_READ, ElmsLabTravelTip2
-	bg_event 7, 2, BGEVENT_READ, ElmsLabTravelTip3
-	bg_event 7, 3, BGEVENT_READ, ElmsLabTravelTip4
-	bg_event 7, 6, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
+	bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1
+	bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2
+	bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3
+	bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4
+	bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf
 	bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 8, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 9, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 3, 9, BGEVENT_READ, ElmsLabTrashcan
-	bg_event 0, 5, BGEVENT_READ, ElmsLabWindow
-	bg_event 5, 3, BGEVENT_DOWN, ElmsLabPC
+	bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan
+	bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
+	bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
-	object_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
-	object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
-	object_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
-	object_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
-	object_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
+	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
+	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+	object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+	object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+	object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index f2e4337c3..869cb147c 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -291,30 +291,30 @@ FastShip1F_MapEventHeader:
 
 .Warps:
 	db 12
-	warp_def $1, $19, -1, FAST_SHIP_1F
-	warp_def $8, $1b, 1, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def $8, $17, 2, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def $8, $13, 3, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def $8, $f, 1, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def $f, $f, 2, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def $f, $13, 4, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def $f, $17, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def $f, $1b, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def $d, $3, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def $c, $6, 1, FAST_SHIP_B1F
-	warp_def $e, $1e, 2, FAST_SHIP_B1F
+	warp_def 25, 1, -1, FAST_SHIP_1F
+	warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
+	warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
+	warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
+	warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
+	warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
+	warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
+	warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
+	warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
+	warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
+	warp_def 6, 12, 1, FAST_SHIP_B1F
+	warp_def 30, 14, 2, FAST_SHIP_B1F
 
 .CoordEvents:
 	db 2
-	coord_event 2, $6, $18, WorriedGrandpaSceneLeft
-	coord_event 2, $6, $19, WorriedGrandpaSceneRight
+	coord_event 24, 6, 2, WorriedGrandpaSceneLeft
+	coord_event 25, 6, 2, WorriedGrandpaSceneRight
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
-	object_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
-	object_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
-	object_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
+	object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
+	object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
+	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
+	object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 73c8838db..498e65f70 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -454,29 +454,29 @@ FastShipB1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $b, $5, 11, FAST_SHIP_1F
-	warp_def $d, $1f, 12, FAST_SHIP_1F
+	warp_def 5, 11, 11, FAST_SHIP_1F
+	warp_def 31, 13, 12, FAST_SHIP_1F
 
 .CoordEvents:
 	db 2
-	coord_event 0, $7, $1e, UnknownScript_0x7673c
-	coord_event 0, $7, $1f, UnknownScript_0x76751
+	coord_event 30, 7, 0, UnknownScript_0x7673c
+	coord_event 31, 7, 0, UnknownScript_0x76751
 
 .BGEvents:
 	db 1
-	bg_event 9, 27, BGEVENT_READ, FashShipB1FTrashcan
+	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
-	object_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
-	object_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+	object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+	object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 013b2ad17..1bd1c91f1 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -272,25 +272,25 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $2, 2, FAST_SHIP_1F
-	warp_def $c, $2, 3, FAST_SHIP_1F
-	warp_def $18, $2, 4, FAST_SHIP_1F
+	warp_def 2, 0, 2, FAST_SHIP_1F
+	warp_def 2, 12, 3, FAST_SHIP_1F
+	warp_def 2, 24, 4, FAST_SHIP_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 13, 6, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 19, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 31, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
-	object_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
+	object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index b2df6d420..efccd7d92 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -468,30 +468,30 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $7, $2, 8, FAST_SHIP_1F
-	warp_def $7, $3, 8, FAST_SHIP_1F
-	warp_def $13, $2, 9, FAST_SHIP_1F
-	warp_def $13, $3, 9, FAST_SHIP_1F
-	warp_def $21, $2, 10, FAST_SHIP_1F
-	warp_def $21, $3, 10, FAST_SHIP_1F
+	warp_def 2, 7, 8, FAST_SHIP_1F
+	warp_def 3, 7, 8, FAST_SHIP_1F
+	warp_def 2, 19, 9, FAST_SHIP_1F
+	warp_def 3, 19, 9, FAST_SHIP_1F
+	warp_def 2, 33, 10, FAST_SHIP_1F
+	warp_def 3, 33, 10, FAST_SHIP_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 25, 4, BGEVENT_READ, FastShipCaptainsCabinTrashcan
+	bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
-	object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
-	object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
-	object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
-	object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
+	object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
+	object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
+	object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
+	object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index ab2febc5f..8af9a2e3f 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -228,24 +228,24 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $0, $2, 5, FAST_SHIP_1F
-	warp_def $13, $2, 6, FAST_SHIP_1F
-	warp_def $13, $3, 6, FAST_SHIP_1F
-	warp_def $1f, $2, 7, FAST_SHIP_1F
-	warp_def $1f, $3, 7, FAST_SHIP_1F
+	warp_def 2, 0, 5, FAST_SHIP_1F
+	warp_def 2, 19, 6, FAST_SHIP_1F
+	warp_def 3, 19, 6, FAST_SHIP_1F
+	warp_def 2, 31, 7, FAST_SHIP_1F
+	warp_def 3, 31, 7, FAST_SHIP_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 7, BGEVENT_READ, FastShipBed
-	bg_event 2, 7, BGEVENT_READ, FastShipBed
+	bg_event 7, 1, BGEVENT_READ, FastShipBed
+	bg_event 7, 2, BGEVENT_READ, FastShipBed
 	bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 9507e9a26..01cdea5b5 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -48,18 +48,18 @@ FightingDojo_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $b, $4, 1, SAFFRON_CITY
-	warp_def $b, $5, 1, SAFFRON_CITY
+	warp_def 4, 11, 1, SAFFRON_CITY
+	warp_def 5, 11, 1, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 4, BGEVENT_READ, MapFightingDojoSignpost0Script
-	bg_event 0, 5, BGEVENT_READ, MapFightingDojoSignpost1Script
+	bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
+	bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
-	object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
+	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm
index 3a0758a39..a1e468976 100644
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -33,8 +33,8 @@ FuchsiaBillSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, FUCHSIA_CITY
-	warp_def $7, $3, 4, FUCHSIA_CITY
+	warp_def 2, 7, 4, FUCHSIA_CITY
+	warp_def 3, 7, 4, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
@@ -44,5 +44,5 @@ FuchsiaBillSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1
-	object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1
+	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1
+	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 97a6f2363..79824c76d 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -130,35 +130,35 @@ FuchsiaCity_MapEventHeader:
 
 .Warps:
 	db 11
-	warp_def $d, $5, 2, FUCHSIA_MART
-	warp_def $d, $16, 1, SAFARI_ZONE_MAIN_OFFICE
-	warp_def $1b, $8, 1, FUCHSIA_GYM
-	warp_def $1b, $b, 1, FUCHSIA_BILL_SPEECH_HOUSE
-	warp_def $1b, $13, 1, FUCHSIA_POKECENTER_1F
-	warp_def $1b, $1b, 1, SAFARI_ZONE_WARDENS_HOME
-	warp_def $3, $12, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_def $16, $25, 1, ROUTE_15_FUCHSIA_GATE
-	warp_def $17, $25, 2, ROUTE_15_FUCHSIA_GATE
-	warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE
-	warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE
+	warp_def 5, 13, 2, FUCHSIA_MART
+	warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
+	warp_def 8, 27, 1, FUCHSIA_GYM
+	warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE
+	warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F
+	warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
+	warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
+	warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE
+	warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE
+	warp_def 7, 35, 1, ROUTE_19___FUCHSIA_GATE
+	warp_def 8, 35, 2, ROUTE_19___FUCHSIA_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 8
-	bg_event 15, 21, BGEVENT_READ, FuchsiaCitySign
-	bg_event 29, 5, BGEVENT_READ, FuchsiaGymSign
-	bg_event 15, 25, BGEVENT_READ, SafariZoneOfficeSign
-	bg_event 29, 27, BGEVENT_READ, WardensHomeSign
-	bg_event 5, 17, BGEVENT_READ, SafariZoneClosedSign
-	bg_event 15, 13, BGEVENT_READ, NoLitteringSign
-	bg_event 27, 20, BGEVENT_READ, FuchsiaCityPokecenterSign
-	bg_event 13, 6, BGEVENT_READ, FuchsiaCityMartSign
+	bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
+	bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
+	bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
+	bg_event 27, 29, BGEVENT_READ, WardensHomeSign
+	bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign
+	bg_event 13, 15, BGEVENT_READ, NoLitteringSign
+	bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
+	bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
-	object_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
-	object_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
-	object_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
+	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
+	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
+	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
+	object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 7d3caac18..8aaf6e364 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -386,22 +386,22 @@ FuchsiaGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 3, FUCHSIA_CITY
-	warp_def $11, $5, 3, FUCHSIA_CITY
+	warp_def 4, 17, 3, FUCHSIA_CITY
+	warp_def 5, 17, 3, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, FuchsiaGymStatue
-	bg_event 15, 6, BGEVENT_READ, FuchsiaGymStatue
+	bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
+	bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
-	object_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
-	object_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
-	object_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
-	object_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
-	object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
+	object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
+	object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
+	object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
+	object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
+	object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
+	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 05266ecee..48ffdba5f 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -43,8 +43,8 @@ FuchsiaMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, FUCHSIA_CITY
-	warp_def $7, $3, 1, FUCHSIA_CITY
+	warp_def 2, 7, 1, FUCHSIA_CITY
+	warp_def 3, 7, 1, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
@@ -54,6 +54,6 @@ FuchsiaMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
-	object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
-	object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
+	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 7afc161e2..eca4aa8e0 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -94,9 +94,9 @@ FuchsiaPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, FUCHSIA_CITY
-	warp_def $7, $4, 5, FUCHSIA_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 5, FUCHSIA_CITY
+	warp_def 4, 7, 5, FUCHSIA_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -106,7 +106,7 @@ FuchsiaPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
-	object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
-	object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
-	object_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
+	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
+	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
+	object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index 90cb6de5d..619022047 100644
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ FuchsiaPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, FUCHSIA_POKECENTER_1F
+	warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 1d83e2dfe..c8838afe5 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -108,24 +108,24 @@ GoldenrodBikeShop_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, GOLDENROD_CITY
-	warp_def $7, $3, 2, GOLDENROD_CITY
+	warp_def 2, 7, 2, GOLDENROD_CITY
+	warp_def 3, 7, 2, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 9
-	bg_event 2, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 3, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 3, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 5, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 5, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 6, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 6, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 6, 7, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
+	object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm
index 71e44841a..2032c5b1e 100644
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -248,20 +248,20 @@ GoldenrodBillsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, GOLDENROD_CITY
-	warp_def $7, $3, 4, GOLDENROD_CITY
+	warp_def 2, 7, 4, GOLDENROD_CITY
+	warp_def 3, 7, 4, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, BillsHouseBookshelf2
+	bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
 	bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
-	bg_event 1, 7, BGEVENT_READ, BillsHouseRadio
+	bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL
-	object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1
-	object_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1
+	object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL
+	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1
+	object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index d629d86c9..8e324a9bb 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -560,54 +560,54 @@ GoldenrodCity_MapEventHeader:
 
 .Warps:
 	db 15
-	warp_def $7, $18, 1, GOLDENROD_GYM
-	warp_def $1d, $1d, 1, GOLDENROD_BIKE_SHOP
-	warp_def $15, $1f, 1, GOLDENROD_HAPPINESS_RATER
-	warp_def $19, $5, 1, GOLDENROD_BILLS_HOUSE
-	warp_def $d, $9, 2, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_def $5, $1d, 1, GOLDENROD_FLOWER_SHOP
-	warp_def $9, $21, 1, GOLDENROD_PP_SPEECH_HOUSE
-	warp_def $7, $f, 1, GOLDENROD_NAME_RATER
-	warp_def $1b, $18, 1, GOLDENROD_DEPT_STORE_1F
-	warp_def $15, $e, 1, GOLDENROD_GAME_CORNER
-	warp_def $f, $5, 1, RADIO_TOWER_1F
-	warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE
-	warp_def $5, $9, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $1d, $b, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F
+	warp_def 24, 7, 1, GOLDENROD_GYM
+	warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP
+	warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER
+	warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE
+	warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION
+	warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP
+	warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE
+	warp_def 15, 7, 1, GOLDENROD_NAME_RATER
+	warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F
+	warp_def 14, 21, 1, GOLDENROD_GAME_CORNER
+	warp_def 5, 15, 1, RADIO_TOWER_1F
+	warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE
+	warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 12
-	bg_event 14, 10, BGEVENT_READ, GoldenrodCityStationSign
-	bg_event 17, 4, BGEVENT_READ, GoldenrodCityRadioTowerSign
-	bg_event 27, 26, BGEVENT_READ, GoldenrodDeptStoreSign
-	bg_event 9, 26, BGEVENT_READ, GoldenrodGymSign
-	bg_event 18, 22, BGEVENT_READ, GoldenrodCitySign
-	bg_event 30, 28, BGEVENT_READ, GoldenrodCityBikeShopSign
-	bg_event 22, 16, BGEVENT_READ, GoldenrodCityGameCornerSign
-	bg_event 7, 12, BGEVENT_READ, GoldenrodCityNameRaterSign
-	bg_event 6, 8, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
-	bg_event 30, 12, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
-	bg_event 27, 16, BGEVENT_UP, GoldenrodCityPokecenterSign
-	bg_event 6, 30, BGEVENT_READ, GoldenrodCityFlowerShopSign
+	bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
+	bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
+	bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
+	bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign
+	bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign
+	bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign
+	bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign
+	bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign
+	bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
+	bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
+	bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
+	bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
 
 .ObjectEvents:
 	db 15
-	object_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
-	object_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
+	object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
+	object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+	object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 9fd609dee..27bf60e58 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -84,22 +84,22 @@ GoldenrodDeptStore1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $7, 9, GOLDENROD_CITY
-	warp_def $7, $8, 9, GOLDENROD_CITY
-	warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_2F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 7, 7, 9, GOLDENROD_CITY
+	warp_def 8, 7, 9, GOLDENROD_CITY
+	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore1FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
-	object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
-	object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
-	object_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
+	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
+	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
+	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
+	object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index d1d827c52..b22e89026 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -106,22 +106,22 @@ GoldenrodDeptStore2F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_3F
-	warp_def $0, $f, 3, GOLDENROD_DEPT_STORE_1F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F
+	warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore2FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
-	object_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
-	object_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
-	object_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
+	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
+	object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
+	object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
+	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
+	object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 94765e409..27bc44953 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -62,20 +62,20 @@ GoldenrodDeptStore3F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_2F
-	warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_4F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F
+	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore3FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
-	object_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
-	object_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
+	object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
+	object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
+	object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index c12de0391..94705ac98 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -83,21 +83,21 @@ GoldenrodDeptStore4F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_5F
-	warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_3F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F
+	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore4FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
-	object_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
-	object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
-	object_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
+	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
+	object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
+	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
+	object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 7c358cd18..70e7ab046 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -223,23 +223,23 @@ GoldenrodDeptStore5F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_4F
-	warp_def $0, $f, 1, GOLDENROD_DEPT_STORE_6F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F
+	warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore5FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
-	object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
-	object_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
-	object_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
-	object_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
-	object_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
+	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
+	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
+	object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
+	object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
+	object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
+	object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index f3fd44501..82d04ccc8 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -155,23 +155,23 @@ GoldenrodDeptStore6F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_5F
-	warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_def $0, $d, 1, GOLDENROD_DEPT_STORE_ROOF
+	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F
+	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore6FDirectory
-	bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
-	bg_event 1, 8, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 1, 9, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 1, 10, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 1, 11, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
+	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
+	bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
-	object_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
+	object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
+	object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index a52f68ab5..da3dd0765 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -115,9 +115,9 @@ GoldenrodDeptStoreB1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $2, $11, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
+	warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
 
 .CoordEvents:
 	db 0
@@ -127,11 +127,11 @@ GoldenrodDeptStoreB1F_MapEventHeader:
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
-	object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
-	object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
-	object_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
-	object_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
-	object_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
-	object_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
-	object_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
+	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
+	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
+	object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
+	object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
+	object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
+	object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index f951e7028..9b6a2158b 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -62,15 +62,15 @@ GoldenrodDeptStoreElevator_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F
-	warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F
+	warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F
+	warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 0, 3, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
+	bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index f60970e64..b384d43f1 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -217,25 +217,25 @@ GoldenrodDeptStoreRoof_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $1, $d, 3, GOLDENROD_DEPT_STORE_6F
+	warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 3, 15, BGEVENT_RIGHT, Binoculars1
-	bg_event 5, 15, BGEVENT_RIGHT, Binoculars2
-	bg_event 6, 15, BGEVENT_RIGHT, Binoculars3
-	bg_event 0, 3, BGEVENT_UP, PokeDollVendingMachine
+	bg_event 15, 3, BGEVENT_RIGHT, Binoculars1
+	bg_event 15, 5, BGEVENT_RIGHT, Binoculars2
+	bg_event 15, 6, BGEVENT_RIGHT, Binoculars3
+	bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
-	object_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
-	object_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
-	object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
-	object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
-	object_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
-	object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
-	object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
+	object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
+	object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
+	object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
+	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
+	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
+	object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
+	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
+	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 974484112..e35ac3352 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -165,8 +165,8 @@ GoldenrodFlowerShop_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, GOLDENROD_CITY
-	warp_def $7, $3, 6, GOLDENROD_CITY
+	warp_def 2, 7, 6, GOLDENROD_CITY
+	warp_def 3, 7, 6, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
@@ -176,5 +176,5 @@ GoldenrodFlowerShop_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
-	object_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
+	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
+	object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 8a57e3ef0..fc0216504 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -448,8 +448,8 @@ GoldenrodGameCorner_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $2, 10, GOLDENROD_CITY
-	warp_def $d, $3, 10, GOLDENROD_CITY
+	warp_def 2, 13, 10, GOLDENROD_CITY
+	warp_def 3, 13, 10, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
@@ -457,48 +457,48 @@ GoldenrodGameCorner_MapEventHeader:
 .BGEvents:
 	db 31
 	bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 8, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 9, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 10, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 11, 6, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
 	bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
+	bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript
-	bg_event 8, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 9, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 10, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 11, 7, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 8, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 9, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 10, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 11, 12, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 7, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 8, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 9, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 10, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 11, 13, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 6, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 7, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 8, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 9, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 10, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 11, 18, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 1, 12, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
+	bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
+	bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13, 11, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
-	object_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
-	object_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
-	object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
-	object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
-	object_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
-	object_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
-	object_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
-	object_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
-	object_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
-	object_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
-	object_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
+	object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
+	object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
+	object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
+	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	object_event 11, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
+	object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
+	object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
+	object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
+	object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
+	object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
+	object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 19bb2400b..4446e653a 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -385,23 +385,23 @@ GoldenrodGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $2, 1, GOLDENROD_CITY
-	warp_def $11, $3, 1, GOLDENROD_CITY
+	warp_def 2, 17, 1, GOLDENROD_CITY
+	warp_def 3, 17, 1, GOLDENROD_CITY
 
 .CoordEvents:
 	db 1
-	coord_event 1, $5, $8, WhitneyCriesScript
+	coord_event 8, 5, 1, WhitneyCriesScript
 
 .BGEvents:
 	db 2
-	bg_event 15, 1, BGEVENT_READ, GoldenrodGymStatue
-	bg_event 15, 4, BGEVENT_READ, GoldenrodGymStatue
+	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
+	bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
-	object_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
-	object_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
-	object_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
-	object_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
-	object_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
+	object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
+	object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
+	object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
+	object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
+	object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
+	object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index bc7229ca2..667698662 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -142,20 +142,20 @@ GoldenrodHappinessRater_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, GOLDENROD_CITY
-	warp_def $7, $3, 3, GOLDENROD_CITY
+	warp_def 2, 7, 3, GOLDENROD_CITY
+	warp_def 3, 7, 3, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, HappinessRatersHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
-	bg_event 1, 7, BGEVENT_READ, HappinessRatersHouseRadio
+	bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
-	object_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
-	object_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
+	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
+	object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
+	object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index 83984a694..8b114fd1c 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -170,19 +170,19 @@ GoldenrodMagnetTrainStation_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $8, 5, GOLDENROD_CITY
-	warp_def $11, $9, 5, GOLDENROD_CITY
-	warp_def $5, $6, 4, SAFFRON_TRAIN_STATION
-	warp_def $5, $b, 3, SAFFRON_TRAIN_STATION
+	warp_def 8, 17, 5, GOLDENROD_CITY
+	warp_def 9, 17, 5, GOLDENROD_CITY
+	warp_def 6, 5, 4, SAFFRON_TRAIN_STATION
+	warp_def 11, 5, 3, SAFFRON_TRAIN_STATION
 
 .CoordEvents:
 	db 1
-	coord_event 0, $6, $b, Script_ArriveFromSaffron
+	coord_event 11, 6, 0, Script_ArriveFromSaffron
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
-	object_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
+	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
+	object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index 3b0ef46a2..259e0fbb7 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -30,18 +30,18 @@ GoldenrodNameRater_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 8, GOLDENROD_CITY
-	warp_def $7, $3, 8, GOLDENROD_CITY
+	warp_def 2, 7, 8, GOLDENROD_CITY
+	warp_def 3, 7, 8, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, GoldenrodNameRaterBookshelf
+	bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
 	bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
-	bg_event 1, 7, BGEVENT_READ, GoldenrodNameRaterRadio
+	bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
+	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index 2d303adbe..d8e898a79 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -57,19 +57,19 @@ GoldenrodPPSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 7, GOLDENROD_CITY
-	warp_def $7, $3, 7, GOLDENROD_CITY
+	warp_def 2, 7, 7, GOLDENROD_CITY
+	warp_def 3, 7, 7, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
+	bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
 	bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
-	bg_event 1, 7, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
+	bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
-	object_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
+	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
+	object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 535ee02f8..a3e639409 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -274,20 +274,20 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $1f, $0, 3, GOLDENROD_POKECENTER_1F
-	warp_def $1f, $1, 3, GOLDENROD_POKECENTER_1F
+	warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F
+	warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 26, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
-	bg_event 28, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
-	bg_event 26, 3, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
+	bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
+	bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
+	bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1
-	object_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1
-	object_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1
+	object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1
+	object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1
+	object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index d44c1b01e..617d54327 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -810,23 +810,23 @@ GoldenrodPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $3, 15, GOLDENROD_CITY
-	warp_def $7, $4, 15, GOLDENROD_CITY
-	warp_def $6, $0, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 15, GOLDENROD_CITY
+	warp_def 4, 7, 15, GOLDENROD_CITY
+	warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 2
-	coord_event 0, $7, $3, GoldenrodPokecenter1F_GSBallSceneLeft
-	coord_event 0, $7, $4, GoldenrodPokecenter1F_GSBallSceneRight
+	coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
+	coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
-	object_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
-	object_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
-	object_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
+	object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
+	object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
+	object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 49bcdd88c..debf98bfa 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -652,32 +652,32 @@ GoldenrodUnderground_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $2, $3, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $22, $3, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $6, $12, 4, GOLDENROD_UNDERGROUND
-	warp_def $1f, $15, 3, GOLDENROD_UNDERGROUND
-	warp_def $1f, $16, 3, GOLDENROD_UNDERGROUND
-	warp_def $1b, $16, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 18, 6, 4, GOLDENROD_UNDERGROUND
+	warp_def 21, 31, 3, GOLDENROD_UNDERGROUND
+	warp_def 22, 31, 3, GOLDENROD_UNDERGROUND
+	warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 6, 18, BGEVENT_READ, BasementDoorScript
-	bg_event 6, 19, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
-	bg_event 13, 6, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
-	bg_event 18, 4, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
-	bg_event 8, 17, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
+	bg_event 18, 6, BGEVENT_READ, BasementDoorScript
+	bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
+	bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
+	bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
+	bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
-	object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
-	object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
-	object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
-	object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
-	object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
-	object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
-	object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
-	object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
+	object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
+	object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
+	object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
+	object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
+	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
+	object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+	object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
+	object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
+	object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 56213e6a8..f3b7f4946 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -935,40 +935,40 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $3, $17, 6, GOLDENROD_UNDERGROUND
-	warp_def $a, $16, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def $a, $17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def $19, $5, 2, GOLDENROD_UNDERGROUND
-	warp_def $1d, $4, 14, GOLDENROD_CITY
-	warp_def $1d, $5, 14, GOLDENROD_CITY
-	warp_def $19, $15, 1, GOLDENROD_UNDERGROUND
-	warp_def $1d, $14, 13, GOLDENROD_CITY
-	warp_def $1d, $15, 13, GOLDENROD_CITY
+	warp_def 23, 3, 6, GOLDENROD_UNDERGROUND
+	warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
+	warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
+	warp_def 5, 25, 2, GOLDENROD_UNDERGROUND
+	warp_def 4, 29, 14, GOLDENROD_CITY
+	warp_def 5, 29, 14, GOLDENROD_CITY
+	warp_def 21, 25, 1, GOLDENROD_UNDERGROUND
+	warp_def 20, 29, 13, GOLDENROD_CITY
+	warp_def 21, 29, 13, GOLDENROD_CITY
 
 .CoordEvents:
 	db 2
-	coord_event 0, $4, $13, UndergroundSilverScene1
-	coord_event 0, $5, $13, UndergroundSilverScene2
+	coord_event 19, 4, 0, UndergroundSilverScene1
+	coord_event 19, 5, 0, UndergroundSilverScene2
 
 .BGEvents:
 	db 6
-	bg_event 1, 16, BGEVENT_READ, Switch1Script
-	bg_event 1, 10, BGEVENT_READ, Switch2Script
-	bg_event 1, 2, BGEVENT_READ, Switch3Script
-	bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript
-	bg_event 9, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
-	bg_event 8, 1, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
+	bg_event 16, 1, BGEVENT_READ, Switch1Script
+	bg_event 10, 1, BGEVENT_READ, Switch2Script
+	bg_event 2, 1, BGEVENT_READ, Switch3Script
+	bg_event 20, 11, BGEVENT_READ, EmergencySwitchScript
+	bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
+	bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
-	object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
-	object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
-	object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
+	object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
+	object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
+	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index f6f27cd1a..03841736b 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -216,9 +216,9 @@ GoldenrodUndergroundWarehouse_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $c, $2, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $c, $3, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F
+	warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
 
 .CoordEvents:
 	db 0
@@ -228,10 +228,10 @@ GoldenrodUndergroundWarehouse_MapEventHeader:
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_ROCKET, 8, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
-	object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
+	object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index c8d6ed1c4..ee9ef7533 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -33,17 +33,17 @@ GuideGentsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, CHERRYGROVE_CITY
-	warp_def $7, $3, 4, CHERRYGROVE_CITY
+	warp_def 2, 7, 4, CHERRYGROVE_CITY
+	warp_def 3, 7, 4, CHERRYGROVE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, GuideGentsHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
+	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index e795feea8..c9bfdac9d 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -116,8 +116,8 @@ HallOfFame_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $4, 3, LANCES_ROOM
-	warp_def $d, $5, 4, LANCES_ROOM
+	warp_def 4, 13, 3, LANCES_ROOM
+	warp_def 5, 13, 4, LANCES_ROOM
 
 .CoordEvents:
 	db 0
@@ -127,4 +127,4 @@ HallOfFame_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index d0341d0e1..ac49f10aa 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -25,10 +25,10 @@ IcePath1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $13, $4, 1, ROUTE_44
-	warp_def $1b, $24, 7, BLACKTHORN_CITY
-	warp_def $5, $25, 1, ICE_PATH_B1F
-	warp_def $d, $25, 7, ICE_PATH_B1F
+	warp_def 4, 19, 1, ROUTE_44
+	warp_def 36, 27, 7, BLACKTHORN_CITY
+	warp_def 37, 5, 1, ICE_PATH_B1F
+	warp_def 37, 13, 7, ICE_PATH_B1F
 
 .CoordEvents:
 	db 0
@@ -38,6 +38,6 @@ IcePath1F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
-	object_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
-	object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
+	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
+	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
+	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 3c818c766..78c5dc659 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -85,26 +85,26 @@ IcePathB1F_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $f, $3, 3, ICE_PATH_1F
-	warp_def $3, $11, 1, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def $19, $5, 4, ICE_PATH_1F
-	warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
+	warp_def 3, 15, 3, ICE_PATH_1F
+	warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
+	warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+	warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+	warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+	warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+	warp_def 5, 25, 4, ICE_PATH_1F
+	warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 30, 17, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
+	bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_BOULDER, 7, 11, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
-	object_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
-	object_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
-	object_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
-	object_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
+	object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
+	object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
+	object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
+	object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
+	object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 68b32a7e6..c171147cd 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -21,16 +21,16 @@ IcePathB2FBlackthornSide_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $3, 8, ICE_PATH_B1F
-	warp_def $3, $3, 2, ICE_PATH_B3F
+	warp_def 3, 15, 8, ICE_PATH_B1F
+	warp_def 3, 3, 2, ICE_PATH_B3F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 10, 2, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
+	bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
+	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 60a36ac40..80ae7f938 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -37,25 +37,25 @@ IcePathB2FMahoganySide_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $1, $11, 2, ICE_PATH_B1F
-	warp_def $b, $9, 1, ICE_PATH_B3F
-	warp_def $4, $b, 3, ICE_PATH_B1F
-	warp_def $6, $4, 4, ICE_PATH_B1F
-	warp_def $c, $4, 5, ICE_PATH_B1F
-	warp_def $c, $c, 6, ICE_PATH_B1F
+	warp_def 17, 1, 2, ICE_PATH_B1F
+	warp_def 9, 11, 1, ICE_PATH_B3F
+	warp_def 11, 4, 3, ICE_PATH_B1F
+	warp_def 4, 6, 4, ICE_PATH_B1F
+	warp_def 4, 12, 5, ICE_PATH_B1F
+	warp_def 12, 12, 6, ICE_PATH_B1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 17, 0, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
+	bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_BOULDER, 3, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
-	object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
-	object_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
-	object_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
-	object_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
-	object_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
+	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A
+	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
+	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
+	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
+	object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
+	object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 64d448956..cfdf2387b 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -21,8 +21,8 @@ IcePathB3F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $5, $3, 2, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_def $5, $f, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
+	warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
+	warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
 
 .CoordEvents:
 	db 0
@@ -32,5 +32,5 @@ IcePathB3F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
-	object_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
+	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
+	object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index fc9bbca86..7bbba6562 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -945,31 +945,31 @@ IlexForest_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $1, 3, ROUTE_34_ILEX_FOREST_GATE
-	warp_def $2a, $3, 1, ILEX_FOREST_AZALEA_GATE
-	warp_def $2b, $3, 2, ILEX_FOREST_AZALEA_GATE
+	warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
+	warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE
+	warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 17, 3, BGEVENT_READ, MapIlexForestSignpost0Script
-	bg_event 7, 11, BGEVENT_ITEM, IlexForestHiddenEther
-	bg_event 14, 22, BGEVENT_ITEM, IlexForestHiddenSuperPotion
-	bg_event 17, 1, BGEVENT_ITEM, IlexForestHiddenFullHeal
-	bg_event 22, 8, BGEVENT_UP, MapIlexForestSignpost4Script
+	bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
+	bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
+	bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
+	bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
+	bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
-	object_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
-	object_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
-	object_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
-	object_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
-	object_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
-	object_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
-	object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
-	object_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
-	object_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
-	object_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
+	object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
+	object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
+	object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
+	object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
+	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
+	object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
+	object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
+	object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
+	object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
+	object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
+	object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 76a2925de..0bb508be3 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -36,10 +36,10 @@ IlexForestAzaleaGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 2, ILEX_FOREST
-	warp_def $5, $0, 3, ILEX_FOREST
-	warp_def $4, $9, 7, AZALEA_TOWN
-	warp_def $5, $9, 8, AZALEA_TOWN
+	warp_def 0, 4, 2, ILEX_FOREST
+	warp_def 0, 5, 3, ILEX_FOREST
+	warp_def 9, 4, 7, AZALEA_TOWN
+	warp_def 9, 5, 8, AZALEA_TOWN
 
 .CoordEvents:
 	db 0
@@ -49,5 +49,5 @@ IlexForestAzaleaGate_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
-	object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
+	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index dc657df20..879e1dd8b 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -308,24 +308,24 @@ IndigoPlateauPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $d, $5, 1, ROUTE_23
-	warp_def $d, $6, 2, ROUTE_23
-	warp_def $d, $0, 1, POKECENTER_2F
-	warp_def $3, $e, 1, WILLS_ROOM
+	warp_def 5, 13, 1, ROUTE_23
+	warp_def 6, 13, 2, ROUTE_23
+	warp_def 0, 13, 1, POKECENTER_2F
+	warp_def 14, 3, 1, WILLS_ROOM
 
 .CoordEvents:
 	db 2
-	coord_event 0, $4, $10, PlateauRivalBattle1
-	coord_event 0, $4, $11, PlateauRivalBattle2
+	coord_event 16, 4, 0, PlateauRivalBattle1
+	coord_event 17, 4, 0, PlateauRivalBattle2
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
-	object_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
-	object_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
-	object_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
-	object_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
-	object_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
+	object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
+	object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
+	object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
+	object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
+	object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
+	object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index a24500d24..cba4aed9a 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -138,10 +138,10 @@ KarensRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $4, 3, BRUNOS_ROOM
-	warp_def $11, $5, 4, BRUNOS_ROOM
-	warp_def $2, $4, 1, LANCES_ROOM
-	warp_def $2, $5, 2, LANCES_ROOM
+	warp_def 4, 17, 3, BRUNOS_ROOM
+	warp_def 5, 17, 4, BRUNOS_ROOM
+	warp_def 4, 2, 1, LANCES_ROOM
+	warp_def 5, 2, 2, LANCES_ROOM
 
 .CoordEvents:
 	db 0
@@ -151,4 +151,4 @@ KarensRoom_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
+	object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 15d7185ab..d621ed342 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -135,10 +135,10 @@ KogasRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $4, 2, WILLS_ROOM
-	warp_def $11, $5, 3, WILLS_ROOM
-	warp_def $2, $4, 1, BRUNOS_ROOM
-	warp_def $2, $5, 2, BRUNOS_ROOM
+	warp_def 4, 17, 2, WILLS_ROOM
+	warp_def 5, 17, 3, WILLS_ROOM
+	warp_def 4, 2, 1, BRUNOS_ROOM
+	warp_def 5, 2, 2, BRUNOS_ROOM
 
 .CoordEvents:
 	db 0
@@ -148,4 +148,4 @@ KogasRoom_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
+	object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
index 20d5d0b7e..24092cc4f 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -391,26 +391,26 @@ KrissHouse1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $6, 2, NEW_BARK_TOWN
-	warp_def $7, $7, 2, NEW_BARK_TOWN
-	warp_def $0, $9, 1, KRISS_HOUSE_2F
+	warp_def 6, 7, 2, NEW_BARK_TOWN
+	warp_def 7, 7, 2, NEW_BARK_TOWN
+	warp_def 9, 0, 1, KRISS_HOUSE_2F
 
 .CoordEvents:
 	db 2
-	coord_event 0, $4, $8, UnknownScript_0x7a4d8
-	coord_event 0, $4, $9, UnknownScript_0x7a4db
+	coord_event 8, 4, 0, UnknownScript_0x7a4d8
+	coord_event 9, 4, 0, UnknownScript_0x7a4db
 
 .BGEvents:
 	db 4
-	bg_event 1, 0, BGEVENT_READ, StoveScript
+	bg_event 0, 1, BGEVENT_READ, StoveScript
 	bg_event 1, 1, BGEVENT_READ, SinkScript
-	bg_event 1, 2, BGEVENT_READ, FridgeScript
-	bg_event 1, 4, BGEVENT_READ, TVScript
+	bg_event 2, 1, BGEVENT_READ, FridgeScript
+	bg_event 4, 1, BGEVENT_READ, TVScript
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
-	object_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
+	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
+	object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
+	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
+	object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
+	object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
index 528dc505f..65d5fdaee 100644
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -122,21 +122,21 @@ KrissHouse2F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $0, $7, 3, KRISS_HOUSE_1F
+	warp_def 7, 0, 3, KRISS_HOUSE_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 1, 2, BGEVENT_UP, KrissHousePC
-	bg_event 1, 3, BGEVENT_READ, KrissHouseRadio
-	bg_event 1, 5, BGEVENT_READ, KrissHouseBookshelf
-	bg_event 0, 6, BGEVENT_IFSET, KrissHousePoster
+	bg_event 2, 1, BGEVENT_UP, KrissHousePC
+	bg_event 3, 1, BGEVENT_READ, KrissHouseRadio
+	bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf
+	bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
-	object_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
-	object_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
-	object_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
+	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
+	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
+	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
+	object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
index 44dbd8449..0cd9f77dc 100644
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -104,19 +104,19 @@ KrissNeighborsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, NEW_BARK_TOWN
-	warp_def $7, $3, 3, NEW_BARK_TOWN
+	warp_def 2, 7, 3, NEW_BARK_TOWN
+	warp_def 3, 7, 3, NEW_BARK_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, KrissNeighborsHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
-	bg_event 1, 7, BGEVENT_READ, KrissNeighborsHouseRadio
+	bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
-	object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
+	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index ffbc78ea1..6c1d6a9eb 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -682,26 +682,26 @@ KurtsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 4, AZALEA_TOWN
-	warp_def $7, $4, 4, AZALEA_TOWN
+	warp_def 3, 7, 4, AZALEA_TOWN
+	warp_def 4, 7, 4, AZALEA_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 7
-	bg_event 1, 6, BGEVENT_READ, KurtsHouseRadio
-	bg_event 0, 8, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 0, 9, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 1, 5, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 1, 2, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 1, 3, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 1, 4, BGEVENT_READ, KurtsHouseCelebiStatue
+	bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio
+	bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_KURT, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
-	object_event SPRITE_TWIN, 3, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
-	object_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
-	object_event SPRITE_KURT, 3, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
-	object_event SPRITE_TWIN, 4, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
+	object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
+	object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
+	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
+	object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
+	object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 80200cebc..50e7f05d0 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -502,31 +502,31 @@ LakeOfRage_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $7, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
-	warp_def $1f, $1b, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
+	warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
+	warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 27, 21, BGEVENT_READ, MapLakeOfRageSignpost0Script
-	bg_event 31, 25, BGEVENT_READ, MapLakeOfRageSignpost1Script
-	bg_event 28, 11, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
+	bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
+	bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
+	bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
 	bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
-	bg_event 5, 35, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
+	bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
-	object_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
-	object_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
-	object_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
-	object_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
-	object_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
-	object_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
-	object_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
+	object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
+	object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
+	object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
+	object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
+	object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
+	object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
+	object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
+	object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index e5a88623d..1d41eaa43 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -73,17 +73,17 @@ LakeOfRageHiddenPowerHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, LAKE_OF_RAGE
-	warp_def $7, $3, 1, LAKE_OF_RAGE
+	warp_def 2, 7, 1, LAKE_OF_RAGE
+	warp_def 3, 7, 1, LAKE_OF_RAGE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, HiddenPowerHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
+	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 0ac776aa1..cc494c8c5 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -211,17 +211,17 @@ LakeOfRageMagikarpHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, LAKE_OF_RAGE
-	warp_def $7, $3, 2, LAKE_OF_RAGE
+	warp_def 2, 7, 2, LAKE_OF_RAGE
+	warp_def 3, 7, 2, LAKE_OF_RAGE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, MagikarpHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
+	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 17c8628ad..f185af0dc 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -343,21 +343,21 @@ LancesRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $17, $4, 3, KARENS_ROOM
-	warp_def $17, $5, 4, KARENS_ROOM
-	warp_def $1, $4, 1, HALL_OF_FAME
-	warp_def $1, $5, 2, HALL_OF_FAME
+	warp_def 4, 23, 3, KARENS_ROOM
+	warp_def 5, 23, 4, KARENS_ROOM
+	warp_def 4, 1, 1, HALL_OF_FAME
+	warp_def 5, 1, 2, HALL_OF_FAME
 
 .CoordEvents:
 	db 2
-	coord_event 1, $5, $4, Script_ApproachLanceFromLeft
-	coord_event 1, $5, $5, Script_ApproachLanceFromRight
+	coord_event 4, 5, 1, Script_ApproachLanceFromLeft
+	coord_event 5, 5, 1, Script_ApproachLanceFromRight
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
-	object_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
-	object_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
+	object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 6a15dd7df..424a802c9 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -227,21 +227,21 @@ LavRadioTower1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 7, LAVENDER_TOWN
-	warp_def $7, $3, 7, LAVENDER_TOWN
+	warp_def 2, 7, 7, LAVENDER_TOWN
+	warp_def 3, 7, 7, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 11, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
-	bg_event 0, 5, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
+	bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
+	bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
-	object_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
-	object_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
-	object_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
-	object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+	object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
+	object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
+	object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
+	object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
+	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index d8f88c659..34c8572de 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -53,8 +53,8 @@ LavenderMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, LAVENDER_TOWN
-	warp_def $7, $3, 5, LAVENDER_TOWN
+	warp_def 2, 7, 5, LAVENDER_TOWN
+	warp_def 3, 7, 5, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
@@ -64,6 +64,6 @@ LavenderMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
-	object_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
-	object_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
+	object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
+	object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 94eb4935b..d41354143 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -29,8 +29,8 @@ LavenderNameRater_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, LAVENDER_TOWN
-	warp_def $7, $3, 4, LAVENDER_TOWN
+	warp_def 2, 7, 4, LAVENDER_TOWN
+	warp_def 3, 7, 4, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
@@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
+	object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index 3c0f40b20..307eabe1c 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -86,9 +86,9 @@ LavenderPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, LAVENDER_TOWN
-	warp_def $7, $4, 1, LAVENDER_TOWN
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, LAVENDER_TOWN
+	warp_def 4, 7, 1, LAVENDER_TOWN
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -98,7 +98,7 @@ LavenderPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
-	object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
-	object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
-	object_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
+	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
+	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
+	object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index 459b1e5a4..bacb7e91b 100644
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ LavenderPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, LAVENDER_POKECENTER_1F
+	warp_def 0, 7, 3, LAVENDER_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 2e0123061..e75726abd 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -111,29 +111,29 @@ LavenderTown_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $5, $5, 1, LAVENDER_POKECENTER_1F
-	warp_def $9, $5, 1, MR_FUJIS_HOUSE
-	warp_def $d, $3, 1, LAVENDER_TOWN_SPEECH_HOUSE
-	warp_def $d, $7, 1, LAVENDER_NAME_RATER
-	warp_def $5, $1, 2, LAVENDER_MART
-	warp_def $b, $d, 1, SOUL_HOUSE
-	warp_def $5, $e, 1, LAV_RADIO_TOWER_1F
+	warp_def 5, 5, 1, LAVENDER_POKECENTER_1F
+	warp_def 5, 9, 1, MR_FUJIS_HOUSE
+	warp_def 3, 13, 1, LAVENDER_TOWN_SPEECH_HOUSE
+	warp_def 7, 13, 1, LAVENDER_NAME_RATER
+	warp_def 1, 5, 2, LAVENDER_MART
+	warp_def 13, 11, 1, SOUL_HOUSE
+	warp_def 14, 5, 1, LAV_RADIO_TOWER_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 3, 11, BGEVENT_READ, LavenderTownSign
-	bg_event 7, 15, BGEVENT_READ, KantoRadioStationSign
-	bg_event 9, 3, BGEVENT_READ, VolunteerPokemonHouseSign
-	bg_event 13, 15, BGEVENT_READ, SoulHouseSign
-	bg_event 5, 6, BGEVENT_READ, LavenderPokecenterSignText
-	bg_event 5, 2, BGEVENT_READ, LavenderMartSignText
+	bg_event 11, 3, BGEVENT_READ, LavenderTownSign
+	bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign
+	bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign
+	bg_event 15, 13, BGEVENT_READ, SoulHouseSign
+	bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText
+	bg_event 2, 5, BGEVENT_READ, LavenderMartSignText
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
-	object_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
-	object_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
-	object_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
+	object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
+	object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
+	object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
+	object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm
index d55546110..1cb093dda 100644
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderTownSpeechHouse.asm
@@ -34,17 +34,17 @@ LavenderTownSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, LAVENDER_TOWN
-	warp_def $7, $3, 3, LAVENDER_TOWN
+	warp_def 2, 7, 3, LAVENDER_TOWN
+	warp_def 3, 7, 3, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1
+	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 9bef8263a..a8de6e987 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -378,23 +378,23 @@ MahoganyGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 3, MAHOGANY_TOWN
-	warp_def $11, $5, 3, MAHOGANY_TOWN
+	warp_def 4, 17, 3, MAHOGANY_TOWN
+	warp_def 5, 17, 3, MAHOGANY_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 3, BGEVENT_READ, MahoganyGymStatue
-	bg_event 15, 6, BGEVENT_READ, MahoganyGymStatue
+	bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue
+	bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
-	object_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
-	object_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
-	object_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
-	object_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
-	object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
-	object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
+	object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
+	object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
+	object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
+	object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
+	object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
+	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
+	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 5ae14cbd8..a25277fd9 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -226,9 +226,9 @@ MahoganyMart1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, MAHOGANY_TOWN
-	warp_def $7, $4, 1, MAHOGANY_TOWN
-	warp_def $3, $7, 1, TEAM_ROCKET_BASE_B1F
+	warp_def 3, 7, 1, MAHOGANY_TOWN
+	warp_def 4, 7, 1, MAHOGANY_TOWN
+	warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F
 
 .CoordEvents:
 	db 0
@@ -238,8 +238,8 @@ MahoganyMart1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+	object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index 9eead5301..055a4b566 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -59,9 +59,9 @@ MahoganyPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 4, MAHOGANY_TOWN
-	warp_def $7, $4, 4, MAHOGANY_TOWN
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 4, MAHOGANY_TOWN
+	warp_def 4, 7, 4, MAHOGANY_TOWN
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -71,7 +71,7 @@ MahoganyPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
-	object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
-	object_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
-	object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
+	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
+	object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
+	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 3ced3ac77..8d90d58a6 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -66,8 +66,8 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, MAHOGANY_TOWN
-	warp_def $7, $3, 2, MAHOGANY_TOWN
+	warp_def 2, 7, 2, MAHOGANY_TOWN
+	warp_def 3, 7, 2, MAHOGANY_TOWN
 
 .CoordEvents:
 	db 0
@@ -77,5 +77,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
-	object_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
+	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
+	object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 93df069e8..ba907383d 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -250,27 +250,27 @@ MahoganyTown_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $b, 1, MAHOGANY_MART_1F
-	warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
-	warp_def $d, $6, 1, MAHOGANY_GYM
-	warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F
-	warp_def $1, $9, 3, ROUTE_43_MAHOGANY_GATE
+	warp_def 11, 7, 1, MAHOGANY_MART_1F
+	warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
+	warp_def 6, 13, 1, MAHOGANY_GYM
+	warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F
+	warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE
 
 .CoordEvents:
 	db 2
-	coord_event 0, $8, $13, UnknownScript_0x190013
-	coord_event 0, $9, $13, UnknownScript_0x190013
+	coord_event 19, 8, 0, UnknownScript_0x190013
+	coord_event 19, 9, 0, UnknownScript_0x190013
 
 .BGEvents:
 	db 4
-	bg_event 5, 1, BGEVENT_READ, MahoganyTownSign
-	bg_event 7, 9, BGEVENT_READ, MahoganyTownRagecandybarSign
-	bg_event 13, 3, BGEVENT_READ, MahoganyGymSign
-	bg_event 13, 16, BGEVENT_READ, MahoganyTownPokecenterSign
+	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
+	bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
+	bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
+	bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
-	object_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
-	object_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	object_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
+	object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
+	object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
+	object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
+	object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 2c868e6d2..d60d1081d 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -204,8 +204,8 @@ ManiasHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, CIANWOOD_CITY
-	warp_def $7, $3, 1, CIANWOOD_CITY
+	warp_def 2, 7, 1, CIANWOOD_CITY
+	warp_def 3, 7, 1, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
@@ -215,4 +215,4 @@ ManiasHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
+	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 4983c3fa4..870321f3d 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -72,15 +72,15 @@ MobileBattleRoom_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 6, POKECENTER_2F
-	warp_def $7, $5, 6, POKECENTER_2F
+	warp_def 4, 7, 6, POKECENTER_2F
+	warp_def 5, 7, 6, POKECENTER_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 2, 4, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
+	bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 1ccd70ade..1003d4ea5 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -40,15 +40,15 @@ MobileTradeRoomMobile_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 5, POKECENTER_2F
-	warp_def $7, $5, 5, POKECENTER_2F
+	warp_def 4, 7, 5, POKECENTER_2F
+	warp_def 5, 7, 5, POKECENTER_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 2, 4, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
+	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 1f7301ebb..73306f424 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -166,14 +166,14 @@ MountMoon_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $3, $3, 1, ROUTE_3
-	warp_def $f, $f, 1, ROUTE_4
-	warp_def $3, $d, 7, MOUNT_MOON
-	warp_def $b, $f, 8, MOUNT_MOON
-	warp_def $5, $19, 1, MOUNT_MOON_SQUARE
-	warp_def $f, $19, 2, MOUNT_MOON_SQUARE
-	warp_def $3, $19, 3, MOUNT_MOON
-	warp_def $d, $19, 4, MOUNT_MOON
+	warp_def 3, 3, 1, ROUTE_3
+	warp_def 15, 15, 1, ROUTE_4
+	warp_def 13, 3, 7, MOUNT_MOON
+	warp_def 15, 11, 8, MOUNT_MOON
+	warp_def 25, 5, 1, MOUNT_MOON_SQUARE
+	warp_def 25, 15, 2, MOUNT_MOON_SQUARE
+	warp_def 25, 3, 3, MOUNT_MOON
+	warp_def 25, 13, 4, MOUNT_MOON
 
 .CoordEvents:
 	db 0
@@ -183,4 +183,4 @@ MountMoon_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
+	object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index cc4e5bbfb..ade5a35ff 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -33,8 +33,8 @@ MountMoonGiftShop_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 3, MOUNT_MOON_SQUARE
-	warp_def $7, $4, 3, MOUNT_MOON_SQUARE
+	warp_def 3, 7, 3, MOUNT_MOON_SQUARE
+	warp_def 4, 7, 3, MOUNT_MOON_SQUARE
 
 .CoordEvents:
 	db 0
@@ -44,7 +44,7 @@ MountMoonGiftShop_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
-	object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 0bfff1457..3e13b58ea 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -139,21 +139,21 @@ MountMoonSquare_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $14, 5, MOUNT_MOON
-	warp_def $b, $16, 6, MOUNT_MOON
-	warp_def $7, $d, 1, MOUNT_MOON_GIFT_SHOP
+	warp_def 20, 5, 5, MOUNT_MOON
+	warp_def 22, 11, 6, MOUNT_MOON
+	warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP
 
 .CoordEvents:
 	db 1
-	coord_event 0, $b, $7, ClefairyDance
+	coord_event 7, 11, 0, ClefairyDance
 
 .BGEvents:
 	db 2
 	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
-	bg_event 7, 17, BGEVENT_READ, DontLitterSign
+	bg_event 17, 7, BGEVENT_READ, DontLitterSign
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
+	object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 2c594870e..659d7a54d 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -123,29 +123,29 @@ MountMortar1FInside_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $2f, $b, 5, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $2f, $1d, 6, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $27, $5, 8, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $29, $21, 9, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $13, $3, 1, MOUNT_MORTAR_B1F
-	warp_def $9, $9, 2, MOUNT_MORTAR_2F_INSIDE
+	warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 3, 19, 1, MOUNT_MORTAR_B1F
+	warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 11, 30, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel
+	bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel
 
 .ObjectEvents:
 	db 10
-	object_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
-	object_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
-	object_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
-	object_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
-	object_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
-	object_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
-	object_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
-	object_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
-	object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
-	object_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
+	object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
+	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
+	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
+	object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
+	object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
+	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
+	object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
+	object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
+	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
+	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index 0cda940bb..faa9930d2 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -25,24 +25,24 @@ MountMortar1FOutside_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $21, $3, 3, ROUTE_42
-	warp_def $21, $11, 4, ROUTE_42
-	warp_def $21, $25, 5, ROUTE_42
-	warp_def $5, $11, 1, MOUNT_MORTAR_2F_INSIDE
-	warp_def $15, $b, 1, MOUNT_MORTAR_1F_INSIDE
-	warp_def $15, $1d, 2, MOUNT_MORTAR_1F_INSIDE
-	warp_def $1d, $11, 2, MOUNT_MORTAR_B1F
-	warp_def $d, $7, 3, MOUNT_MORTAR_1F_INSIDE
-	warp_def $d, $21, 4, MOUNT_MORTAR_1F_INSIDE
+	warp_def 3, 33, 3, ROUTE_42
+	warp_def 17, 33, 4, ROUTE_42
+	warp_def 37, 33, 5, ROUTE_42
+	warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE
+	warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE
+	warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE
+	warp_def 17, 29, 2, MOUNT_MORTAR_B1F
+	warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
+	warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 22, 25, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
+	bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
-	object_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
+	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
+	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index cc159273d..106e51f5a 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -73,22 +73,22 @@ MountMortar2FInside_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $21, $11, 4, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $5, $3, 6, MOUNT_MORTAR_1F_INSIDE
+	warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 8, 24, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
+	bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
-	object_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
-	object_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
-	object_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
-	object_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
-	object_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
-	object_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1
+	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
+	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
+	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
+	object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
+	object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
+	object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
+	object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 3b7764961..ad00662f8 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -141,22 +141,22 @@ MountMortarB1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $3, 5, MOUNT_MORTAR_1F_INSIDE
-	warp_def $1d, $13, 7, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
+	warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 6, 4, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
+	bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
-	object_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
-	object_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
-	object_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
-	object_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
-	object_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
-	object_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
+	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
+	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
+	object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
+	object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
+	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
+	object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 7845e98f5..a6a50d2dd 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -25,17 +25,17 @@ MoveDeletersHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, BLACKTHORN_CITY
-	warp_def $7, $3, 6, BLACKTHORN_CITY
+	warp_def 2, 7, 6, BLACKTHORN_CITY
+	warp_def 3, 7, 6, BLACKTHORN_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, MoveDeletersHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
+	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index df4b2fb8a..856b62503 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -85,21 +85,21 @@ MrFujisHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, LAVENDER_TOWN
-	warp_def $7, $3, 2, LAVENDER_TOWN
+	warp_def 2, 7, 2, LAVENDER_TOWN
+	warp_def 3, 7, 2, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, MrFujisHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
-	object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
-	object_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
-	object_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
-	object_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
+	object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
+	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
+	object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
+	object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
+	object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index bd0650481..f808d44c8 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -378,21 +378,21 @@ MrPokemonsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, ROUTE_30
-	warp_def $7, $3, 2, ROUTE_30
+	warp_def 2, 7, 2, ROUTE_30
+	warp_def 3, 7, 2, ROUTE_30
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 1, 0, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
+	bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
 	bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
-	bg_event 1, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 1, 7, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 4, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
+	bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
+	bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
+	bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
-	object_event SPRITE_OAK, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
+	object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
+	object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 77f82b91e..75bd52ae5 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -53,17 +53,17 @@ MrPsychicsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, SAFFRON_CITY
-	warp_def $7, $3, 5, SAFFRON_CITY
+	warp_def 2, 7, 5, SAFFRON_CITY
+	warp_def 3, 7, 5, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, MrPsychicsHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
+	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 86538fe0d..fe1547ea5 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -520,34 +520,34 @@ NationalPark_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $12, $21, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $13, $21, 2, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_def $2f, $b, 2, ROUTE_35_NATIONAL_PARK_GATE
+	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
+	warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 44, 14, BGEVENT_READ, MapNationalParkSignpost0Script
-	bg_event 31, 27, BGEVENT_READ, MapNationalParkSignpost1Script
-	bg_event 47, 6, BGEVENT_ITEM, NationalParkHiddenFullHeal
-	bg_event 4, 12, BGEVENT_READ, MapNationalParkSignpost3Script
+	bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
+	bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
+	bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
+	bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
 
 .ObjectEvents:
 	db 14
-	object_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
-	object_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
-	object_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
-	object_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
-	object_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
-	object_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
-	object_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
-	object_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
-	object_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
-	object_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
-	object_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
-	object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
-	object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
+	object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
+	object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
+	object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
+	object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
+	object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
+	object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
+	object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
+	object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
+	object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
+	object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
+	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index 9cebf82fd..5d7831529 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -227,32 +227,32 @@ NationalParkBugContest_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $12, $21, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $13, $21, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_def $2f, $b, 1, ROUTE_35_NATIONAL_PARK_GATE
+	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
+	warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 44, 14, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
-	bg_event 31, 27, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
-	bg_event 47, 6, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
-	bg_event 4, 12, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
+	bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
+	bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
+	bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
+	bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
-	object_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
-	object_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
-	object_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
-	object_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
-	object_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
-	object_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
-	object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
-	object_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
-	object_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
-	object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
+	object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
+	object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
+	object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
+	object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
+	object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
+	object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
+	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
+	object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
+	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 3ad5cd2bf..56b5f14db 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -287,25 +287,25 @@ NewBarkTown_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $3, $6, 1, ELMS_LAB
-	warp_def $5, $d, 1, KRISS_HOUSE_1F
-	warp_def $b, $3, 1, KRISS_NEIGHBORS_HOUSE
-	warp_def $d, $b, 1, ELMS_HOUSE
+	warp_def 6, 3, 1, ELMS_LAB
+	warp_def 13, 5, 1, KRISS_HOUSE_1F
+	warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE
+	warp_def 11, 13, 1, ELMS_HOUSE
 
 .CoordEvents:
 	db 2
-	coord_event 0, $8, $1, NewBarkTown_TeacherStopsYouScene1
-	coord_event 0, $9, $1, NewBarkTown_TeacherStopsYouScene2
+	coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
+	coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
 
 .BGEvents:
 	db 4
 	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
-	bg_event 5, 11, BGEVENT_READ, MapNewBarkTownSignpost1Script
+	bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
 	bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
-	bg_event 13, 9, BGEVENT_READ, MapNewBarkTownSignpost3Script
+	bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
-	object_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
-	object_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
+	object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
+	object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
+	object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index d2b67c0a0..17da0485d 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -262,34 +262,34 @@ OaksLab_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $b, $4, 3, PALLET_TOWN
-	warp_def $b, $5, 3, PALLET_TOWN
+	warp_def 4, 11, 3, PALLET_TOWN
+	warp_def 5, 11, 3, PALLET_TOWN
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 16
-	bg_event 1, 6, BGEVENT_READ, OaksLabBookshelf
-	bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 1, 8, BGEVENT_READ, OaksLabBookshelf
-	bg_event 1, 9, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 0, BGEVENT_READ, OaksLabBookshelf
+	bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
 	bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 2, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 3, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 6, BGEVENT_READ, OaksLabBookshelf
+	bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
+	bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf
+	bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf
 	bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 8, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 9, BGEVENT_READ, OaksLabBookshelf
-	bg_event 0, 4, BGEVENT_READ, OaksLabPoster1
-	bg_event 0, 5, BGEVENT_READ, OaksLabPoster2
-	bg_event 3, 9, BGEVENT_READ, OaksLabTrashcan
-	bg_event 1, 0, BGEVENT_READ, OaksLabPC
+	bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf
+	bg_event 4, 0, BGEVENT_READ, OaksLabPoster1
+	bg_event 5, 0, BGEVENT_READ, OaksLabPoster2
+	bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
+	bg_event 0, 1, BGEVENT_READ, OaksLabPC
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
-	object_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
-	object_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
-	object_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
+	object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
+	object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
+	object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
+	object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index fef87b535..1aea5f518 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -84,8 +84,8 @@ OlivineCafe_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 7, OLIVINE_CITY
-	warp_def $7, $3, 7, OLIVINE_CITY
+	warp_def 2, 7, 7, OLIVINE_CITY
+	warp_def 3, 7, 7, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
@@ -95,6 +95,6 @@ OlivineCafe_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
-	object_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
-	object_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
+	object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
+	object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
+	object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index fbed4e323..2e5129bc5 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -293,36 +293,36 @@ OlivineCity_MapEventHeader:
 
 .Warps:
 	db 11
-	warp_def $15, $d, 1, OLIVINE_POKECENTER_1F
-	warp_def $b, $a, 1, OLIVINE_GYM
-	warp_def $b, $19, 1, OLIVINE_TIMS_HOUSE
-	warp_def $0, $0, 1, OLIVINE_HOUSE_BETA
-	warp_def $b, $1d, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE
-	warp_def $f, $d, 1, OLIVINE_GOOD_ROD_HOUSE
-	warp_def $15, $7, 1, OLIVINE_CAFE
-	warp_def $11, $13, 2, OLIVINE_MART
-	warp_def $1b, $1d, 1, OLIVINE_LIGHTHOUSE_1F
-	warp_def $1b, $13, 1, OLIVINE_PORT_PASSAGE
-	warp_def $1b, $14, 2, OLIVINE_PORT_PASSAGE
+	warp_def 13, 21, 1, OLIVINE_POKECENTER_1F
+	warp_def 10, 11, 1, OLIVINE_GYM
+	warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE
+	warp_def 0, 0, 1, OLIVINE_HOUSE_BETA
+	warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE
+	warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE
+	warp_def 7, 21, 1, OLIVINE_CAFE
+	warp_def 19, 17, 2, OLIVINE_MART
+	warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F
+	warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE
+	warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE
 
 .CoordEvents:
 	db 2
-	coord_event 0, $c, $d, UnknownScript_0x1a8833
-	coord_event 0, $d, $d, UnknownScript_0x1a886b
+	coord_event 13, 12, 0, UnknownScript_0x1a8833
+	coord_event 13, 13, 0, UnknownScript_0x1a886b
 
 .BGEvents:
 	db 7
-	bg_event 11, 17, BGEVENT_READ, OlivineCitySign
-	bg_event 24, 20, BGEVENT_READ, OlivineCityPortSign
-	bg_event 11, 7, BGEVENT_READ, OlivineGymSign
-	bg_event 28, 30, BGEVENT_READ, OlivineLighthouseSign
-	bg_event 23, 3, BGEVENT_READ, OlivineCityBattleTowerSign
-	bg_event 21, 14, BGEVENT_READ, OlivineCityPokecenterSign
-	bg_event 17, 20, BGEVENT_READ, OlivineCityMartSign
+	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
+	bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign
+	bg_event 7, 11, BGEVENT_READ, OlivineGymSign
+	bg_event 30, 28, BGEVENT_READ, OlivineLighthouseSign
+	bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign
+	bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign
+	bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
-	object_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
-	object_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
-	object_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
+	object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
+	object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
+	object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
+	object_event 10, 11, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 8fe953932..4e5285c77 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -88,8 +88,8 @@ OlivineGoodRodHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, OLIVINE_CITY
-	warp_def $7, $3, 6, OLIVINE_CITY
+	warp_def 2, 7, 6, OLIVINE_CITY
+	warp_def 3, 7, 6, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
@@ -99,4 +99,4 @@ OlivineGoodRodHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
+	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 128cbca70..cb87bdd85 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -203,18 +203,18 @@ OlivineGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 2, OLIVINE_CITY
-	warp_def $f, $5, 2, OLIVINE_CITY
+	warp_def 4, 15, 2, OLIVINE_CITY
+	warp_def 5, 15, 2, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 13, 3, BGEVENT_READ, OlivineGymStatue
-	bg_event 13, 6, BGEVENT_READ, OlivineGymStatue
+	bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
+	bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
-	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
+	object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
+	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 23b568cf0..d1171bbef 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -45,18 +45,18 @@ OlivineHouseBeta_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, OLIVINE_CITY
-	warp_def $7, $3, 4, OLIVINE_CITY
+	warp_def 2, 7, 4, OLIVINE_CITY
+	warp_def 3, 7, 4, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, OlivineHouseBetaBookshelf1
+	bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1
 	bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
-	object_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
+	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
+	object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 4c5ead8cc..3fd387dcf 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -42,11 +42,11 @@ OlivineLighthouse1F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $11, $a, 9, OLIVINE_CITY
-	warp_def $11, $b, 9, OLIVINE_CITY
-	warp_def $b, $3, 1, OLIVINE_LIGHTHOUSE_2F
-	warp_def $d, $10, 3, OLIVINE_LIGHTHOUSE_2F
-	warp_def $d, $11, 4, OLIVINE_LIGHTHOUSE_2F
+	warp_def 10, 17, 9, OLIVINE_CITY
+	warp_def 11, 17, 9, OLIVINE_CITY
+	warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
+	warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
+	warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
 
 .CoordEvents:
 	db 0
@@ -56,5 +56,5 @@ OlivineLighthouse1F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
-	object_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
+	object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
+	object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index be2632285..0961a4427 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -210,12 +210,12 @@ OlivineLighthouse2F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $b, $3, 3, OLIVINE_LIGHTHOUSE_1F
-	warp_def $3, $5, 2, OLIVINE_LIGHTHOUSE_3F
-	warp_def $d, $10, 4, OLIVINE_LIGHTHOUSE_1F
-	warp_def $d, $11, 5, OLIVINE_LIGHTHOUSE_1F
-	warp_def $b, $10, 4, OLIVINE_LIGHTHOUSE_3F
-	warp_def $b, $11, 5, OLIVINE_LIGHTHOUSE_3F
+	warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
+	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
+	warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
+	warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F
+	warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
+	warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
 
 .CoordEvents:
 	db 0
@@ -225,5 +225,5 @@ OlivineLighthouse2F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
-	object_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
+	object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
+	object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 500dab0c9..2c6662029 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -118,15 +118,15 @@ OlivineLighthouse3F_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $3, $d, 1, OLIVINE_LIGHTHOUSE_4F
-	warp_def $3, $5, 2, OLIVINE_LIGHTHOUSE_2F
-	warp_def $5, $9, 4, OLIVINE_LIGHTHOUSE_4F
-	warp_def $b, $10, 5, OLIVINE_LIGHTHOUSE_2F
-	warp_def $b, $11, 6, OLIVINE_LIGHTHOUSE_2F
-	warp_def $9, $10, 5, OLIVINE_LIGHTHOUSE_4F
-	warp_def $9, $11, 6, OLIVINE_LIGHTHOUSE_4F
-	warp_def $3, $8, 7, OLIVINE_LIGHTHOUSE_4F
-	warp_def $3, $9, 8, OLIVINE_LIGHTHOUSE_4F
+	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
+	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
+	warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
+	warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F
+	warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F
+	warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F
+	warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F
+	warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
+	warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
 
 .CoordEvents:
 	db 0
@@ -136,7 +136,7 @@ OlivineLighthouse3F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
-	object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
-	object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
-	object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
+	object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
+	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
+	object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
+	object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index 321c7a96f..34d03971d 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -87,16 +87,16 @@ OlivineLighthouse4F_MapEventHeader:
 
 .Warps:
 	db 10
-	warp_def $3, $d, 1, OLIVINE_LIGHTHOUSE_3F
-	warp_def $5, $3, 2, OLIVINE_LIGHTHOUSE_5F
-	warp_def $7, $9, 3, OLIVINE_LIGHTHOUSE_5F
-	warp_def $5, $9, 3, OLIVINE_LIGHTHOUSE_3F
-	warp_def $9, $10, 6, OLIVINE_LIGHTHOUSE_3F
-	warp_def $9, $11, 7, OLIVINE_LIGHTHOUSE_3F
-	warp_def $3, $8, 8, OLIVINE_LIGHTHOUSE_3F
-	warp_def $3, $9, 9, OLIVINE_LIGHTHOUSE_3F
-	warp_def $7, $10, 4, OLIVINE_LIGHTHOUSE_5F
-	warp_def $7, $11, 5, OLIVINE_LIGHTHOUSE_5F
+	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
+	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
+	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
+	warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F
+	warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F
+	warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F
+	warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F
+	warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F
+	warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
+	warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
 
 .CoordEvents:
 	db 0
@@ -106,5 +106,5 @@ OlivineLighthouse4F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
-	object_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
+	object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
+	object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 5b29a089e..e7c4a7884 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -97,25 +97,25 @@ OlivineLighthouse5F_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_6F
-	warp_def $5, $3, 2, OLIVINE_LIGHTHOUSE_4F
-	warp_def $7, $9, 3, OLIVINE_LIGHTHOUSE_4F
-	warp_def $7, $10, 9, OLIVINE_LIGHTHOUSE_4F
-	warp_def $7, $11, 10, OLIVINE_LIGHTHOUSE_4F
-	warp_def $5, $10, 2, OLIVINE_LIGHTHOUSE_6F
-	warp_def $5, $11, 3, OLIVINE_LIGHTHOUSE_6F
+	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
+	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
+	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
+	warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F
+	warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F
+	warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
+	warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 13, 3, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
+	bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
-	object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
-	object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
-	object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
-	object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
+	object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
+	object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
+	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
+	object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
+	object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 713d08d43..686764bfd 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -263,9 +263,9 @@ OlivineLighthouse6F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_5F
-	warp_def $5, $10, 6, OLIVINE_LIGHTHOUSE_5F
-	warp_def $5, $11, 7, OLIVINE_LIGHTHOUSE_5F
+	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
+	warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
+	warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
 
 .CoordEvents:
 	db 0
@@ -275,6 +275,6 @@ OlivineLighthouse6F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
-	object_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
-	object_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
+	object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
+	object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
+	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index db193c7e4..b486e0867 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -51,8 +51,8 @@ OlivineMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 8, OLIVINE_CITY
-	warp_def $7, $3, 8, OLIVINE_CITY
+	warp_def 2, 7, 8, OLIVINE_CITY
+	warp_def 3, 7, 8, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
@@ -62,6 +62,6 @@ OlivineMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
-	object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
+	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
+	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index fd4bf2556..81f172258 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -53,9 +53,9 @@ OlivinePokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, OLIVINE_CITY
-	warp_def $7, $4, 1, OLIVINE_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, OLIVINE_CITY
+	warp_def 4, 7, 1, OLIVINE_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -65,7 +65,7 @@ OlivinePokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
-	object_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
-	object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
-	object_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
+	object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
+	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
+	object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index d0972ced3..f34281e43 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -391,23 +391,23 @@ OlivinePort_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $b, 5, OLIVINE_PORT_PASSAGE
-	warp_def $17, $7, 1, FAST_SHIP_1F
+	warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE
+	warp_def 7, 23, 1, FAST_SHIP_1F
 
 .CoordEvents:
 	db 1
-	coord_event 0, $f, $7, UnknownScript_0x7491f
+	coord_event 7, 15, 0, UnknownScript_0x7491f
 
 .BGEvents:
 	db 1
-	bg_event 22, 1, BGEVENT_ITEM, OlivinePortHiddenProtein
+	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	object_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	object_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	object_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
+	object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 08f4532c0..e79db48cc 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -25,11 +25,11 @@ OlivinePortPassage_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $0, $f, 10, OLIVINE_CITY
-	warp_def $0, $10, 11, OLIVINE_CITY
-	warp_def $4, $f, 4, OLIVINE_PORT_PASSAGE
-	warp_def $2, $3, 3, OLIVINE_PORT_PASSAGE
-	warp_def $e, $3, 1, OLIVINE_PORT
+	warp_def 15, 0, 10, OLIVINE_CITY
+	warp_def 16, 0, 11, OLIVINE_CITY
+	warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE
+	warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE
+	warp_def 3, 14, 1, OLIVINE_PORT
 
 .CoordEvents:
 	db 0
@@ -39,4 +39,4 @@ OlivinePortPassage_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
+	object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index f3537224b..b1217a545 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -45,18 +45,18 @@ OlivinePunishmentSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, OLIVINE_CITY
-	warp_def $7, $3, 5, OLIVINE_CITY
+	warp_def 2, 7, 5, OLIVINE_CITY
+	warp_def 3, 7, 5, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
+	bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
 	bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
-	object_event SPRITE_LASS, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
+	object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
+	object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 96ea2636b..33c5a746c 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -25,17 +25,17 @@ OlivineTimsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, OLIVINE_CITY
-	warp_def $7, $3, 3, OLIVINE_CITY
+	warp_def 2, 7, 3, OLIVINE_CITY
+	warp_def 3, 7, 3, OLIVINE_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, TimsHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
+	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index b7f48f47d..f11cf6d65 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -75,21 +75,21 @@ PalletTown_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $5, 1, REDS_HOUSE_1F
-	warp_def $5, $d, 1, BLUES_HOUSE
-	warp_def $b, $c, 1, OAKS_LAB
+	warp_def 5, 5, 1, REDS_HOUSE_1F
+	warp_def 13, 5, 1, BLUES_HOUSE
+	warp_def 12, 11, 1, OAKS_LAB
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 9, 7, BGEVENT_READ, PalletTownSign
-	bg_event 5, 3, BGEVENT_READ, RedsHouseSign
+	bg_event 7, 9, BGEVENT_READ, PalletTownSign
+	bg_event 3, 5, BGEVENT_READ, RedsHouseSign
 	bg_event 13, 13, BGEVENT_READ, OaksLabSign
-	bg_event 5, 11, BGEVENT_READ, BluesHouseSign
+	bg_event 11, 5, BGEVENT_READ, BluesHouseSign
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
-	object_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
+	object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
+	object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 04d5c0d8f..44ea440a7 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -158,29 +158,29 @@ PewterCity_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $d, $1d, 1, PEWTER_NIDORAN_SPEECH_HOUSE
-	warp_def $11, $10, 1, PEWTER_GYM
-	warp_def $11, $17, 2, PEWTER_MART
-	warp_def $19, $d, 1, PEWTER_POKECENTER_1F
-	warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE
+	warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
+	warp_def 16, 17, 1, PEWTER_GYM
+	warp_def 23, 17, 2, PEWTER_MART
+	warp_def 13, 25, 1, PEWTER_POKECENTER_1F
+	warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 7
-	bg_event 23, 25, BGEVENT_READ, PewterCitySign
-	bg_event 17, 11, BGEVENT_READ, PewterGymSign
-	bg_event 9, 15, BGEVENT_READ, PewterMuseumSign
-	bg_event 19, 33, BGEVENT_READ, PewterCityMtMoonGiftShopSign
-	bg_event 29, 19, BGEVENT_READ, PewterCityWelcomeSign
-	bg_event 25, 14, BGEVENT_READ, PewterCityPokecenterSign
-	bg_event 17, 24, BGEVENT_READ, PewterCityMartSign
+	bg_event 25, 23, BGEVENT_READ, PewterCitySign
+	bg_event 11, 17, BGEVENT_READ, PewterGymSign
+	bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
+	bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign
+	bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign
+	bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
+	bg_event 24, 17, BGEVENT_READ, PewterCityMartSign
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
-	object_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
-	object_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
-	object_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
-	object_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
+	object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
+	object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
+	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
+	object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
+	object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 524113ba3..ca94d9e9f 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -214,19 +214,19 @@ PewterGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $4, 2, PEWTER_CITY
-	warp_def $d, $5, 2, PEWTER_CITY
+	warp_def 4, 13, 2, PEWTER_CITY
+	warp_def 5, 13, 2, PEWTER_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 11, 2, BGEVENT_READ, PewterGymStatue
-	bg_event 11, 7, BGEVENT_READ, PewterGymStatue
+	bg_event 2, 11, BGEVENT_READ, PewterGymStatue
+	bg_event 7, 11, BGEVENT_READ, PewterGymStatue
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
-	object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
-	object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
+	object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
+	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
+	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index be92c8cac..f34ac5a46 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -51,8 +51,8 @@ PewterMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, PEWTER_CITY
-	warp_def $7, $3, 3, PEWTER_CITY
+	warp_def 2, 7, 3, PEWTER_CITY
+	warp_def 3, 7, 3, PEWTER_CITY
 
 .CoordEvents:
 	db 0
@@ -62,6 +62,6 @@ PewterMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
-	object_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
-	object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
+	object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
+	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 34ac90b23..f6b96845b 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -34,8 +34,8 @@ PewterNidoranSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, PEWTER_CITY
-	warp_def $7, $3, 1, PEWTER_CITY
+	warp_def 2, 7, 1, PEWTER_CITY
+	warp_def 3, 7, 1, PEWTER_CITY
 
 .CoordEvents:
 	db 0
@@ -45,5 +45,5 @@ PewterNidoranSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
-	object_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
+	object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
+	object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 1ab45da18..b587e3b0d 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -73,9 +73,9 @@ PewterPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 4, PEWTER_CITY
-	warp_def $7, $4, 4, PEWTER_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 4, PEWTER_CITY
+	warp_def 4, 7, 4, PEWTER_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -85,8 +85,8 @@ PewterPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
-	object_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
-	object_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
-	object_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
-	object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
+	object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
+	object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
+	object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
+	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index 33c22b063..6e7809106 100644
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ PewterPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, PEWTER_POKECENTER_1F
+	warp_def 0, 7, 3, PEWTER_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 3b7c60f93..2f9bd429b 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -26,17 +26,17 @@ PewterSnoozeSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, PEWTER_CITY
-	warp_def $7, $3, 5, PEWTER_CITY
+	warp_def 2, 7, 5, PEWTER_CITY
+	warp_def 3, 7, 5, PEWTER_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
+	object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index 0c79865aa..9b9052ee8 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -22,8 +22,8 @@ PokeSeersHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 7, CIANWOOD_CITY
-	warp_def $7, $3, 7, CIANWOOD_CITY
+	warp_def 2, 7, 7, CIANWOOD_CITY
+	warp_def 3, 7, 7, CIANWOOD_CITY
 
 .CoordEvents:
 	db 0
@@ -33,4 +33,4 @@ PokeSeersHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
+	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index ad4682cc5..ece34605d 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1028,23 +1028,23 @@ Pokecenter2F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $7, $0, -1, POKECENTER_2F
-	warp_def $0, $5, 1, TRADE_CENTER
-	warp_def $0, $9, 1, COLOSSEUM
-	warp_def $2, $d, 1, TIME_CAPSULE
-	warp_def $0, $6, 1, MOBILE_TRADE_ROOM_MOBILE
-	warp_def $0, $a, 1, MOBILE_BATTLE_ROOM
+	warp_def 0, 7, -1, POKECENTER_2F
+	warp_def 5, 0, 1, TRADE_CENTER
+	warp_def 9, 0, 1, COLOSSEUM
+	warp_def 13, 2, 1, TIME_CAPSULE
+	warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE
+	warp_def 10, 0, 1, MOBILE_BATTLE_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 3, 7, BGEVENT_READ, MapPokecenter2FSignpost0Script
+	bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
-	object_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
-	object_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
-	object_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
+	object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
+	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
+	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
+	object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index db04c88fd..4740f745b 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -302,22 +302,22 @@ PokemonFanClub_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, VERMILION_CITY
-	warp_def $7, $3, 3, VERMILION_CITY
+	warp_def 2, 7, 3, VERMILION_CITY
+	warp_def 3, 7, 3, VERMILION_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 7, BGEVENT_READ, MapPokemonFanClubSignpost0Script
-	bg_event 0, 9, BGEVENT_READ, MapPokemonFanClubSignpost1Script
+	bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
+	bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
-	object_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
-	object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
-	object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
-	object_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
-	object_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
+	object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
+	object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
+	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
+	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
+	object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
+	object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 9445f4c97..371ef6c58 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -394,24 +394,24 @@ PowerPlant_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $2, 2, ROUTE_10_NORTH
-	warp_def $11, $3, 2, ROUTE_10_NORTH
+	warp_def 2, 17, 2, ROUTE_10_NORTH
+	warp_def 3, 17, 2, ROUTE_10_NORTH
 
 .CoordEvents:
 	db 1
-	coord_event 1, $c, $5, PowerPlantGuardPhoneScript
+	coord_event 5, 12, 1, PowerPlantGuardPhoneScript
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, PowerPlantBookshelf
+	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
 	bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
-	object_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
-	object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
-	object_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
-	object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
-	object_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
-	object_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
+	object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
+	object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
+	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
+	object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
+	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
+	object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
+	object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 56e1b0510..febce1a36 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -478,23 +478,23 @@ RadioTower1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $2, 11, GOLDENROD_CITY
-	warp_def $7, $3, 11, GOLDENROD_CITY
-	warp_def $0, $f, 2, RADIO_TOWER_2F
+	warp_def 2, 7, 11, GOLDENROD_CITY
+	warp_def 3, 7, 11, GOLDENROD_CITY
+	warp_def 15, 0, 2, RADIO_TOWER_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 3, BGEVENT_READ, MapRadioTower1FSignpost0Script
-	bg_event 0, 13, BGEVENT_READ, MapRadioTower1FSignpost1Script
+	bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
+	bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
-	object_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
+	object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index bf267dc67..7942063f9 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -716,31 +716,31 @@ RadioTower2F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $0, $0, 1, RADIO_TOWER_3F
-	warp_def $0, $f, 3, RADIO_TOWER_1F
+	warp_def 0, 0, 1, RADIO_TOWER_3F
+	warp_def 15, 0, 3, RADIO_TOWER_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 0, 3, BGEVENT_READ, MapRadioTower2FSignpost0Script
-	bg_event 0, 5, BGEVENT_READ, MapRadioTower2FSignpost1Script
-	bg_event 1, 9, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 1, 10, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 1, 11, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 0, 13, BGEVENT_READ, MapRadioTower2FSignpost5Script
+	bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
+	bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
+	bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
-	object_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
-	object_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
-	object_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
-	object_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
+	object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
+	object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
+	object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
+	object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index dc14a2912..5a0e360c5 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -334,25 +334,25 @@ RadioTower3F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $0, 1, RADIO_TOWER_2F
-	warp_def $0, $7, 2, RADIO_TOWER_4F
-	warp_def $0, $11, 4, RADIO_TOWER_4F
+	warp_def 0, 0, 1, RADIO_TOWER_2F
+	warp_def 7, 0, 2, RADIO_TOWER_4F
+	warp_def 17, 0, 4, RADIO_TOWER_4F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 0, 3, BGEVENT_READ, MapRadioTower3FSignpost0Script
-	bg_event 0, 9, BGEVENT_READ, MapRadioTower3FSignpost1Script
-	bg_event 2, 14, BGEVENT_UP, MapRadioTower3FSignpost2Script
+	bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
+	bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
+	bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
-	object_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
-	object_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
+	object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
+	object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 4066bf75d..3beb7211c 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -251,25 +251,25 @@ RadioTower4F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $0, 1, RADIO_TOWER_5F
-	warp_def $0, $9, 2, RADIO_TOWER_3F
-	warp_def $0, $c, 2, RADIO_TOWER_5F
-	warp_def $0, $11, 3, RADIO_TOWER_3F
+	warp_def 0, 0, 1, RADIO_TOWER_5F
+	warp_def 9, 0, 2, RADIO_TOWER_3F
+	warp_def 12, 0, 2, RADIO_TOWER_5F
+	warp_def 17, 0, 3, RADIO_TOWER_3F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 0, 7, BGEVENT_READ, MapRadioTower4FSignpost0Script
-	bg_event 0, 15, BGEVENT_READ, MapRadioTower4FSignpost1Script
+	bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
+	bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
-	object_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
-	object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
+	object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
+	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index e09b280e1..c73d53de2 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -426,26 +426,26 @@ RadioTower5F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $0, $0, 1, RADIO_TOWER_4F
-	warp_def $0, $c, 3, RADIO_TOWER_4F
+	warp_def 0, 0, 1, RADIO_TOWER_4F
+	warp_def 12, 0, 3, RADIO_TOWER_4F
 
 .CoordEvents:
 	db 2
-	coord_event 0, $3, $0, FakeDirectorScript
-	coord_event 1, $5, $10, RadioTower5FRocketBossScene
+	coord_event 0, 3, 0, FakeDirectorScript
+	coord_event 16, 5, 1, RadioTower5FRocketBossScene
 
 .BGEvents:
 	db 5
-	bg_event 0, 3, BGEVENT_READ, MapRadioTower5FSignpost0Script
-	bg_event 0, 11, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 0, 15, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 1, 16, BGEVENT_READ, RadioTower5FBookshelf
-	bg_event 1, 17, BGEVENT_READ, RadioTower5FBookshelf
+	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
+	bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
+	bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
+	bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
+	bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
-	object_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
+	object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
+	object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index 9d7408386..07f23a582 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -80,19 +80,19 @@ RedsHouse1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $2, 1, PALLET_TOWN
-	warp_def $7, $3, 1, PALLET_TOWN
-	warp_def $0, $7, 1, REDS_HOUSE_2F
+	warp_def 2, 7, 1, PALLET_TOWN
+	warp_def 3, 7, 1, PALLET_TOWN
+	warp_def 7, 0, 1, REDS_HOUSE_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 1, 0, BGEVENT_READ, RedsHouse1FBookshelf
+	bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf
 	bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf
-	bg_event 1, 2, BGEVENT_READ, RedsHouse1FTV
+	bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
+	object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm
index 6919b7fe0..073985eaa 100644
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -31,15 +31,15 @@ RedsHouse2F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $0, $7, 3, REDS_HOUSE_1F
+	warp_def 7, 0, 3, REDS_HOUSE_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 5, 3, BGEVENT_READ, RedsHouse2FN64Script
-	bg_event 1, 0, BGEVENT_READ, RedsHouse2FPCScript
+	bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script
+	bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript
 
 .ObjectEvents:
 	db 0
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 32b274ca5..3f2f57f20 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -29,22 +29,22 @@ RockTunnel1F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $3, $f, 1, ROUTE_9
-	warp_def $19, $b, 1, ROUTE_10_SOUTH
-	warp_def $3, $5, 3, ROCK_TUNNEL_B1F
-	warp_def $9, $f, 2, ROCK_TUNNEL_B1F
-	warp_def $3, $1b, 4, ROCK_TUNNEL_B1F
-	warp_def $d, $1b, 1, ROCK_TUNNEL_B1F
+	warp_def 15, 3, 1, ROUTE_9
+	warp_def 11, 25, 1, ROUTE_10_SOUTH
+	warp_def 5, 3, 3, ROCK_TUNNEL_B1F
+	warp_def 15, 9, 2, ROCK_TUNNEL_B1F
+	warp_def 27, 3, 4, ROCK_TUNNEL_B1F
+	warp_def 27, 13, 1, ROCK_TUNNEL_B1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 4, 24, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
-	bg_event 15, 21, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
+	bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
+	bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
-	object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
+	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index e4b820d5d..6d20a92f2 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -29,20 +29,20 @@ RockTunnelB1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $3, $3, 6, ROCK_TUNNEL_1F
-	warp_def $9, $11, 4, ROCK_TUNNEL_1F
-	warp_def $3, $17, 3, ROCK_TUNNEL_1F
-	warp_def $17, $19, 5, ROCK_TUNNEL_1F
+	warp_def 3, 3, 6, ROCK_TUNNEL_1F
+	warp_def 17, 9, 4, ROCK_TUNNEL_1F
+	warp_def 23, 3, 3, ROCK_TUNNEL_1F
+	warp_def 25, 23, 5, ROCK_TUNNEL_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 14, 4, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
+	bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
-	object_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
-	object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
+	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
+	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
+	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 0f898163c..d079ba955 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -92,10 +92,10 @@ Route1_MapEventHeader:
 
 .BGEvents:
 	db 1
-	bg_event 27, 7, BGEVENT_READ, Route1Sign
+	bg_event 7, 27, BGEVENT_READ, Route1Sign
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
-	object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
-	object_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+	object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
+	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
+	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index 48aaa4bdc..918d3af57 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -21,16 +21,16 @@ Route10North_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $1, $b, 1, ROUTE_10_POKECENTER_1F
-	warp_def $9, $3, 1, POWER_PLANT
+	warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F
+	warp_def 3, 9, 1, POWER_PLANT
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 11, 5, BGEVENT_READ, PowerPlantSign
-	bg_event 1, 12, BGEVENT_READ, Route10PokecenterSign
+	bg_event 5, 11, BGEVENT_READ, PowerPlantSign
+	bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign
 
 .ObjectEvents:
 	db 0
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 09474c902..c0bd2b5ec 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -86,9 +86,9 @@ Route10Pokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, ROUTE_10_NORTH
-	warp_def $7, $4, 1, ROUTE_10_NORTH
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, ROUTE_10_NORTH
+	warp_def 4, 7, 1, ROUTE_10_NORTH
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -98,7 +98,7 @@ Route10Pokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
-	object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
-	object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
-	object_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
+	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
+	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
+	object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index 047e42c78..5a13e4025 100644
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -11,7 +11,7 @@ Route10Pokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, ROUTE_10_POKECENTER_1F
+	warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index ac8c56357..2c904beff 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -81,16 +81,16 @@ Route10South_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $1, $6, 2, ROCK_TUNNEL_1F
+	warp_def 6, 1, 2, ROCK_TUNNEL_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 3, 5, BGEVENT_READ, Route10Sign
+	bg_event 5, 3, BGEVENT_READ, Route10Sign
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
-	object_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
+	object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
+	object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 9aa324439..903cf1009 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -158,13 +158,13 @@ Route11_MapEventHeader:
 
 .BGEvents:
 	db 2
-	bg_event 7, 3, BGEVENT_READ, Route11Sign
-	bg_event 5, 32, BGEVENT_ITEM, Route11HiddenRevive
+	bg_event 3, 7, BGEVENT_READ, Route11Sign
+	bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
-	object_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
-	object_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
-	object_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
-	object_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
+	object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
+	object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
+	object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
+	object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
+	object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 3d55a2852..240ff0bb5 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -173,22 +173,22 @@ Route12_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $21, $b, 1, ROUTE_12_SUPER_ROD_HOUSE
+	warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 27, 11, BGEVENT_READ, Route12Sign
-	bg_event 9, 13, BGEVENT_READ, FishingSpotSign
-	bg_event 13, 14, BGEVENT_ITEM, Route12HiddenElixer
+	bg_event 11, 27, BGEVENT_READ, Route12Sign
+	bg_event 13, 9, BGEVENT_READ, FishingSpotSign
+	bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
-	object_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
-	object_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
-	object_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
-	object_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
-	object_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
+	object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
+	object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
+	object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
+	object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
+	object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
+	object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index a349641e0..b951102e1 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -85,8 +85,8 @@ Route12SuperRodHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_12
-	warp_def $7, $3, 1, ROUTE_12
+	warp_def 2, 7, 1, ROUTE_12
+	warp_def 3, 7, 1, ROUTE_12
 
 .CoordEvents:
 	db 0
@@ -96,4 +96,4 @@ Route12SuperRodHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
+	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 3111b82f6..59107f67f 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -204,15 +204,15 @@ Route13_MapEventHeader:
 
 .BGEvents:
 	db 4
-	bg_event 13, 29, BGEVENT_READ, Route13TrainerTips
-	bg_event 11, 41, BGEVENT_READ, Route13Sign
-	bg_event 13, 17, BGEVENT_READ, Route13DirectionsSign
-	bg_event 13, 30, BGEVENT_ITEM, Route13HiddenCalcium
+	bg_event 29, 13, BGEVENT_READ, Route13TrainerTips
+	bg_event 41, 11, BGEVENT_READ, Route13Sign
+	bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign
+	bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
-	object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
-	object_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
-	object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1
-	object_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
+	object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
+	object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
+	object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
+	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1
+	object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 411f5029a..e16f62e91 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -130,7 +130,7 @@ Route14_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
-	object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
-	object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
-	object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
+	object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
+	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
+	object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
+	object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 8eb5bbb84..59232fd8f 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -207,22 +207,22 @@ Route15_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $4, $2, 3, ROUTE_15_FUCHSIA_GATE
-	warp_def $5, $2, 4, ROUTE_15_FUCHSIA_GATE
+	warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE
+	warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 9, 19, BGEVENT_READ, Route15Sign
+	bg_event 19, 9, BGEVENT_READ, Route15Sign
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
-	object_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1
-	object_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1
-	object_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
-	object_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1
-	object_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1
-	object_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
+	object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
+	object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1
+	object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1
+	object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
+	object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1
+	object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1
+	object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index f78fab3ae..292131d91 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -25,10 +25,10 @@ Route15FuchsiaGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 8, FUCHSIA_CITY
-	warp_def $5, $0, 9, FUCHSIA_CITY
-	warp_def $4, $9, 1, ROUTE_15
-	warp_def $5, $9, 2, ROUTE_15
+	warp_def 0, 4, 8, FUCHSIA_CITY
+	warp_def 0, 5, 9, FUCHSIA_CITY
+	warp_def 9, 4, 1, ROUTE_15
+	warp_def 9, 5, 2, ROUTE_15
 
 .CoordEvents:
 	db 0
@@ -38,4 +38,4 @@ Route15FuchsiaGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
diff --git a/maps/Route16.asm b/maps/Route16.asm
index abbd7d7e2..e08bf0a25 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -34,11 +34,11 @@ Route16_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $1, $3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
-	warp_def $6, $e, 3, ROUTE_16_GATE
-	warp_def $7, $e, 4, ROUTE_16_GATE
-	warp_def $6, $9, 1, ROUTE_16_GATE
-	warp_def $7, $9, 2, ROUTE_16_GATE
+	warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
+	warp_def 14, 6, 3, ROUTE_16_GATE
+	warp_def 14, 7, 4, ROUTE_16_GATE
+	warp_def 9, 6, 1, ROUTE_16_GATE
+	warp_def 9, 7, 2, ROUTE_16_GATE
 
 .CoordEvents:
 	db 0
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 4b3164b23..8f48fe4b3 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -28,17 +28,17 @@ Route16FuchsiaSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_16
-	warp_def $7, $3, 1, ROUTE_16
+	warp_def 2, 7, 1, ROUTE_16
+	warp_def 3, 7, 1, ROUTE_16
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
+	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 3ce10b391..eb57b0662 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -66,19 +66,19 @@ Route16Gate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 4, ROUTE_16
-	warp_def $5, $0, 5, ROUTE_16
-	warp_def $4, $9, 2, ROUTE_16
-	warp_def $5, $9, 3, ROUTE_16
+	warp_def 0, 4, 4, ROUTE_16
+	warp_def 0, 5, 5, ROUTE_16
+	warp_def 9, 4, 2, ROUTE_16
+	warp_def 9, 5, 3, ROUTE_16
 
 .CoordEvents:
 	db 2
-	coord_event 0, $4, $5, UnknownScript_0x733ed
-	coord_event 0, $5, $5, UnknownScript_0x733ed
+	coord_event 5, 4, 0, UnknownScript_0x733ed
+	coord_event 5, 5, 0, UnknownScript_0x733ed
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 147e5238c..c8be61da2 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -140,20 +140,20 @@ Route17_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $52, $11, 1, ROUTE_17_18_GATE
-	warp_def $53, $11, 2, ROUTE_17_18_GATE
+	warp_def 17, 82, 1, ROUTE_17_18_GATE
+	warp_def 17, 83, 2, ROUTE_17_18_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 54, 9, BGEVENT_ITEM, Route17HiddenMaxEther
-	bg_event 77, 8, BGEVENT_ITEM, Route17HiddenMaxElixer
+	bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
+	bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
-	object_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
-	object_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
-	object_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
+	object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
+	object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
+	object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
+	object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm
index 610362396..9a8a076dd 100644
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -57,19 +57,19 @@ Route1718Gate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 1, ROUTE_17
-	warp_def $5, $0, 2, ROUTE_17
-	warp_def $4, $9, 1, ROUTE_18
-	warp_def $5, $9, 2, ROUTE_18
+	warp_def 0, 4, 1, ROUTE_17
+	warp_def 0, 5, 2, ROUTE_17
+	warp_def 9, 4, 1, ROUTE_18
+	warp_def 9, 5, 2, ROUTE_18
 
 .CoordEvents:
 	db 2
-	coord_event 0, $4, $5, UnknownScript_0x73611
-	coord_event 0, $5, $5, UnknownScript_0x73611
+	coord_event 5, 4, 0, UnknownScript_0x73611
+	coord_event 5, 5, 0, UnknownScript_0x73611
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 75ce7ca65..04a0cc843 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -83,17 +83,17 @@ Route18_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $6, $2, 3, ROUTE_17_18_GATE
-	warp_def $7, $2, 4, ROUTE_17_18_GATE
+	warp_def 2, 6, 3, ROUTE_17_18_GATE
+	warp_def 2, 7, 4, ROUTE_17_18_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 5, 9, BGEVENT_READ, Route18Sign
+	bg_event 9, 5, BGEVENT_READ, Route18Sign
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
-	object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
+	object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
+	object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
diff --git a/maps/Route19.asm b/maps/Route19.asm
index e0e62a5b8..7681b39c2 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -240,21 +240,21 @@ Route19_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $3, $7, 3, ROUTE_19___FUCHSIA_GATE
+	warp_def 7, 3, 3, ROUTE_19___FUCHSIA_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 13, 11, BGEVENT_READ, Route19Sign
-	bg_event 1, 11, BGEVENT_READ, CarefulSwimmingSign
+	bg_event 11, 13, BGEVENT_READ, Route19Sign
+	bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
-	object_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
-	object_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
-	object_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
-	object_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
-	object_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
+	object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
+	object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
+	object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
+	object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
+	object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
+	object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 5bbf83c8c..c366c63d5 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -51,10 +51,10 @@ Route19FuchsiaGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 10, FUCHSIA_CITY
-	warp_def $0, $5, 11, FUCHSIA_CITY
-	warp_def $7, $4, 1, ROUTE_19
-	warp_def $7, $5, 1, ROUTE_19
+	warp_def 4, 0, 10, FUCHSIA_CITY
+	warp_def 5, 0, 11, FUCHSIA_CITY
+	warp_def 4, 7, 1, ROUTE_19
+	warp_def 5, 7, 1, ROUTE_19
 
 .CoordEvents:
 	db 0
@@ -64,4 +64,4 @@ Route19FuchsiaGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
diff --git a/maps/Route2.asm b/maps/Route2.asm
index cceac50f7..47abdc9f5 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -152,31 +152,31 @@ Route2_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $f, $f, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
-	warp_def $1f, $f, 3, ROUTE_2_GATE
-	warp_def $1b, $10, 1, ROUTE_2_GATE
-	warp_def $1b, $11, 2, ROUTE_2_GATE
-	warp_def $7, $c, 3, DIGLETTS_CAVE
+	warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
+	warp_def 15, 31, 3, ROUTE_2_GATE
+	warp_def 16, 27, 1, ROUTE_2_GATE
+	warp_def 17, 27, 2, ROUTE_2_GATE
+	warp_def 12, 7, 3, DIGLETTS_CAVE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 51, 7, BGEVENT_READ, Route2Sign
-	bg_event 9, 11, BGEVENT_READ, MapRoute2Signpost1Script
-	bg_event 23, 7, BGEVENT_ITEM, Route2HiddenMaxEther
-	bg_event 14, 4, BGEVENT_ITEM, Route2HiddenFullHeal
-	bg_event 27, 4, BGEVENT_ITEM, Route2HiddenFullRestore
-	bg_event 30, 11, BGEVENT_ITEM, Route2HiddenRevive
+	bg_event 7, 51, BGEVENT_READ, Route2Sign
+	bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
+	bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
+	bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
+	bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
+	bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
-	object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
-	object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
-	object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
-	object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
-	object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
-	object_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
-	object_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
+	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
+	object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
+	object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
+	object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
+	object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+	object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
+	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
+	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 1bdac9b3c..7137999fe 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -118,17 +118,17 @@ Route20_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $26, 1, SEAFOAM_GYM
+	warp_def 38, 7, 1, SEAFOAM_GYM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 11, 37, BGEVENT_READ, CinnabarGymSign
+	bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
-	object_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
-	object_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
+	object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
+	object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
+	object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
diff --git a/maps/Route21.asm b/maps/Route21.asm
index b68c3c27b..97acd08ec 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -104,6 +104,6 @@ Route21_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
-	object_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
-	object_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
+	object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
+	object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
+	object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
diff --git a/maps/Route22.asm b/maps/Route22.asm
index 8e349ec34..3c5aead91 100644
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -21,14 +21,14 @@ Route22_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $d, 1, VICTORY_ROAD_GATE
+	warp_def 13, 5, 1, VICTORY_ROAD_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 7, 15, BGEVENT_READ, VictoryRoadEntranceSign
+	bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign
 
 .ObjectEvents:
 	db 0
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 1c0e2aa8e..87ba72d9c 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -28,17 +28,17 @@ Route23_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $5, $9, 1, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def $5, $a, 2, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def $d, $9, 10, VICTORY_ROAD
-	warp_def $d, $a, 10, VICTORY_ROAD
+	warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
+	warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
+	warp_def 9, 13, 10, VICTORY_ROAD
+	warp_def 10, 13, 10, VICTORY_ROAD
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 7, 11, BGEVENT_READ, IndigoPlateauSign
+	bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign
 
 .ObjectEvents:
 	db 0
diff --git a/maps/Route24.asm b/maps/Route24.asm
index 5a98bb650..07740a467 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -133,4 +133,4 @@ Route24_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_ROCKET, 7, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
+	object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
diff --git a/maps/Route25.asm b/maps/Route25.asm
index ca6576771..ce37fe894 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -436,28 +436,28 @@ Route25_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $2f, 1, BILLS_HOUSE
+	warp_def 47, 5, 1, BILLS_HOUSE
 
 .CoordEvents:
 	db 2
-	coord_event 1, $6, $2a, UnknownScript_0x19eea0
-	coord_event 1, $7, $2a, UnknownScript_0x19eee0
+	coord_event 42, 6, 1, UnknownScript_0x19eea0
+	coord_event 42, 7, 1, UnknownScript_0x19eee0
 
 .BGEvents:
 	db 2
-	bg_event 5, 45, BGEVENT_READ, BillsHouseSign
-	bg_event 5, 4, BGEVENT_ITEM, Route25HiddenPotion
+	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
+	bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
-	object_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
-	object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
-	object_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1
-	object_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
-	object_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
-	object_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
-	object_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
-	object_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
-	object_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1
-	object_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
+	object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+	object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
+	object_event 16, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1
+	object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
+	object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
+	object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
+	object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
+	object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
+	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1
+	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 91fcc9fab..4af45fe1f 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -418,24 +418,24 @@ Route26_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $7, 3, VICTORY_ROAD_GATE
-	warp_def $39, $f, 1, ROUTE_26_HEAL_SPEECH_HOUSE
-	warp_def $47, $5, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE
+	warp_def 7, 5, 3, VICTORY_ROAD_GATE
+	warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE
+	warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 6, 8, BGEVENT_READ, Route26Sign
+	bg_event 8, 6, BGEVENT_READ, Route26Sign
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
-	object_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
-	object_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
-	object_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
-	object_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
-	object_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
-	object_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
-	object_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
+	object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
+	object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
+	object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
+	object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
+	object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
+	object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
+	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
+	object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm
index da946711d..d304ce29f 100644
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ b/maps/Route26DayofWeekSiblingsHouse.asm
@@ -76,8 +76,8 @@ Route26DayofWeekSiblingsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, ROUTE_26
-	warp_def $7, $3, 3, ROUTE_26
+	warp_def 2, 7, 3, ROUTE_26
+	warp_def 3, 7, 3, ROUTE_26
 
 .CoordEvents:
 	db 0
@@ -87,4 +87,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
+	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
index 11a8cc50d..15f888fb6 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -54,17 +54,17 @@ Route26HealSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, ROUTE_26
-	warp_def $7, $3, 2, ROUTE_26
+	warp_def 2, 7, 2, ROUTE_26
+	warp_def 3, 7, 2, ROUTE_26
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, Route26HealHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
+	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
diff --git a/maps/Route27.asm b/maps/Route27.asm
index e58ae3656..3afac9155 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -473,27 +473,27 @@ Route27_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $21, 1, ROUTE_27_SANDSTORM_HOUSE
-	warp_def $5, $1a, 1, TOHJO_FALLS
-	warp_def $5, $24, 2, TOHJO_FALLS
+	warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
+	warp_def 26, 5, 1, TOHJO_FALLS
+	warp_def 36, 5, 2, TOHJO_FALLS
 
 .CoordEvents:
 	db 2
-	coord_event 0, $a, $12, UnknownScript_0x1a0873
-	coord_event 0, $a, $13, UnknownScript_0x1a0881
+	coord_event 18, 10, 0, UnknownScript_0x1a0873
+	coord_event 19, 10, 0, UnknownScript_0x1a0881
 
 .BGEvents:
 	db 1
-	bg_event 7, 25, BGEVENT_READ, TohjoFallsSign
+	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
-	object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
-	object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
-	object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
-	object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
-	object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
-	object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
-	object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1
+	object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
+	object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
+	object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
+	object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
+	object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
+	object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
+	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
+	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
+	object_event 21, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 5e43f661c..e66f41f4e 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -99,17 +99,17 @@ Route27SandstormHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_27
-	warp_def $7, $3, 1, ROUTE_27
+	warp_def 2, 7, 1, ROUTE_27
+	warp_def 3, 7, 1, ROUTE_27
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, SandstormHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
+	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
diff --git a/maps/Route28.asm b/maps/Route28.asm
index eb87b2701..8b76bc407 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -22,16 +22,16 @@ Route28_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $7, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE
-	warp_def $5, $21, 7, VICTORY_ROAD_GATE
+	warp_def 7, 3, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE
+	warp_def 33, 5, 7, VICTORY_ROAD_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 5, 31, BGEVENT_READ, Route28Sign
-	bg_event 2, 25, BGEVENT_ITEM, Route28HiddenRareCandy
+	bg_event 31, 5, BGEVENT_READ, Route28Sign
+	bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy
 
 .ObjectEvents:
 	db 0
diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm
index e8da9da02..fe833982d 100644
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -76,18 +76,18 @@ Route28FamousSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_28
-	warp_def $7, $3, 1, ROUTE_28
+	warp_def 2, 7, 1, ROUTE_28
+	warp_def 3, 7, 1, ROUTE_28
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, CelebrityHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
-	object_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
+	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
+	object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
diff --git a/maps/Route29.asm b/maps/Route29.asm
index a7bb9ecc5..cd91a1f3e 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -421,25 +421,25 @@ Route29_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $1, $1b, 3, ROUTE_29_46_GATE
+	warp_def 27, 1, 3, ROUTE_29_46_GATE
 
 .CoordEvents:
 	db 2
-	coord_event 1, $8, $35, Route29Tutorial1
-	coord_event 1, $9, $35, Route29Tutorial2
+	coord_event 53, 8, 1, Route29Tutorial1
+	coord_event 53, 9, 1, Route29Tutorial2
 
 .BGEvents:
 	db 2
-	bg_event 7, 51, BGEVENT_READ, Route29Sign1
-	bg_event 5, 3, BGEVENT_READ, Route29Sign2
+	bg_event 51, 7, BGEVENT_READ, Route29Sign1
+	bg_event 3, 5, BGEVENT_READ, Route29Sign2
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
-	object_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
-	object_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
-	object_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
-	object_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
-	object_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
-	object_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
-	object_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
+	object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
+	object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
+	object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
+	object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
+	object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
+	object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
+	object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
+	object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm
index a3d824eec..c90aa3150 100644
--- a/maps/Route2946Gate.asm
+++ b/maps/Route2946Gate.asm
@@ -42,10 +42,10 @@ Route2946Gate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 1, ROUTE_46
-	warp_def $0, $5, 2, ROUTE_46
-	warp_def $7, $4, 1, ROUTE_29
-	warp_def $7, $5, 1, ROUTE_29
+	warp_def 4, 0, 1, ROUTE_46
+	warp_def 5, 0, 2, ROUTE_46
+	warp_def 4, 7, 1, ROUTE_29
+	warp_def 5, 7, 1, ROUTE_29
 
 .CoordEvents:
 	db 0
@@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1
-	object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1
+	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 954714590..7607bc1fc 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -31,10 +31,10 @@ Route2Gate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 3, ROUTE_2
-	warp_def $0, $5, 4, ROUTE_2
-	warp_def $7, $4, 2, ROUTE_2
-	warp_def $7, $5, 2, ROUTE_2
+	warp_def 4, 0, 3, ROUTE_2
+	warp_def 5, 0, 4, ROUTE_2
+	warp_def 4, 7, 2, ROUTE_2
+	warp_def 5, 7, 2, ROUTE_2
 
 .CoordEvents:
 	db 0
@@ -44,4 +44,4 @@ Route2Gate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
+	object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm
index 4ff8e2a18..e42337e6a 100644
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -58,8 +58,8 @@ Route2NuggetSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_2
-	warp_def $7, $3, 1, ROUTE_2
+	warp_def 2, 7, 1, ROUTE_2
+	warp_def 3, 7, 1, ROUTE_2
 
 .CoordEvents:
 	db 0
@@ -69,4 +69,4 @@ Route2NuggetSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
+	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 0df90cd80..e0498e167 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -138,18 +138,18 @@ Route3_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $1, $34, 1, MOUNT_MOON
+	warp_def 52, 1, 1, MOUNT_MOON
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 13, 49, BGEVENT_READ, MapRoute3Signpost0Script
+	bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
-	object_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
-	object_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
-	object_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
+	object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
+	object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
+	object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
+	object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 293238095..74db65a31 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -413,30 +413,30 @@ Route30_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $27, $7, 1, ROUTE_30_BERRY_SPEECH_HOUSE
-	warp_def $5, $11, 1, MR_POKEMONS_HOUSE
+	warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE
+	warp_def 17, 5, 1, MR_POKEMONS_HOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 43, 9, BGEVENT_READ, Route30Sign
-	bg_event 29, 13, BGEVENT_READ, MrPokemonsHouseDirectionsSign
-	bg_event 5, 15, BGEVENT_READ, MrPokemonsHouseSign
-	bg_event 21, 3, BGEVENT_READ, Route30TrainerTips
-	bg_event 9, 14, BGEVENT_ITEM, Route30HiddenPotion
+	bg_event 9, 43, BGEVENT_READ, Route30Sign
+	bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
+	bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
+	bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
+	bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
-	object_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
-	object_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
-	object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
-	object_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
-	object_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
-	object_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
-	object_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
-	object_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
+	object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
+	object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
+	object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
+	object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
+	object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
+	object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
+	object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
+	object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
+	object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm
index 55dbff282..a912fd529 100644
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -52,17 +52,17 @@ Route30BerrySpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, ROUTE_30
-	warp_def $7, $3, 1, ROUTE_30
+	warp_def 2, 7, 1, ROUTE_30
+	warp_def 3, 7, 1, ROUTE_30
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
diff --git a/maps/Route31.asm b/maps/Route31.asm
index efd236b28..e5498917f 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -422,24 +422,24 @@ Route31_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $6, $4, 3, ROUTE_31_VIOLET_GATE
-	warp_def $7, $4, 4, ROUTE_31_VIOLET_GATE
-	warp_def $5, $22, 1, DARK_CAVE_VIOLET_ENTRANCE
+	warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE
+	warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE
+	warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 5, 7, BGEVENT_READ, Route31Sign
-	bg_event 5, 31, BGEVENT_READ, DarkCaveSign
+	bg_event 7, 5, BGEVENT_READ, Route31Sign
+	bg_event 31, 5, BGEVENT_READ, DarkCaveSign
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
-	object_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
-	object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
-	object_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
-	object_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
-	object_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
-	object_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
+	object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
+	object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
+	object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
+	object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
+	object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
+	object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
+	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 404a216e2..4195528ff 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -33,10 +33,10 @@ Route31VioletGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 8, VIOLET_CITY
-	warp_def $5, $0, 9, VIOLET_CITY
-	warp_def $4, $9, 1, ROUTE_31
-	warp_def $5, $9, 2, ROUTE_31
+	warp_def 0, 4, 8, VIOLET_CITY
+	warp_def 0, 5, 9, VIOLET_CITY
+	warp_def 9, 4, 1, ROUTE_31
+	warp_def 9, 5, 2, ROUTE_31
 
 .CoordEvents:
 	db 0
@@ -46,5 +46,5 @@ Route31VioletGate_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
+	object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 43df9f0a3..659ea40db 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -936,38 +936,38 @@ Route32_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $49, $b, 1, ROUTE_32_POKECENTER_1F
-	warp_def $2, $4, 3, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def $3, $4, 4, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def $4f, $6, 4, UNION_CAVE_1F
+	warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F
+	warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
+	warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
+	warp_def 6, 79, 4, UNION_CAVE_1F
 
 .CoordEvents:
 	db 2
-	coord_event 0, $8, $12, Route32CooltrainerMStopsYouScene
-	coord_event 1, $47, $7, Route32WannaBuyASlowpokeTailScript
+	coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
+	coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
 
 .BGEvents:
 	db 6
-	bg_event  5, 13, BGEVENT_READ, Route32Sign
-	bg_event  1,  9, BGEVENT_READ, Route32RuinsSign
-	bg_event 84, 10, BGEVENT_READ, Route32UnionCaveSign
-	bg_event 73, 12, BGEVENT_READ, Route32PokecenterSign
-	bg_event 67, 12, BGEVENT_ITEM, Route32HiddenGreatBall
-	bg_event 40, 11, BGEVENT_ITEM, Route32HiddenSuperPotion
+	bg_event 13, 5, BGEVENT_READ, Route32Sign
+	bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
+	bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
+	bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign
+	bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
+	bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
 
 .ObjectEvents:
 	db 14
-	object_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
-	object_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
-	object_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
-	object_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1
-	object_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
-	object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
-	object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
-	object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
-	object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
-	object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
-	object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
-	object_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
-	object_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
+	object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
+	object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
+	object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
+	object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1
+	object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
+	object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
+	object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
+	object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
+	object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
+	object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
+	object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
+	object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
+	object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index a65239d31..a29d79b8d 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -100,9 +100,9 @@ Route32Pokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, ROUTE_32
-	warp_def $7, $4, 1, ROUTE_32
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, ROUTE_32
+	warp_def 4, 7, 1, ROUTE_32
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -112,6 +112,6 @@ Route32Pokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
-	object_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
+	object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
+	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index 8b9dcede0..6bfa8ec27 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -52,10 +52,10 @@ Route32RuinsOfAlphGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 10, RUINS_OF_ALPH_OUTSIDE
-	warp_def $5, $0, 11, RUINS_OF_ALPH_OUTSIDE
-	warp_def $4, $9, 2, ROUTE_32
-	warp_def $5, $9, 3, ROUTE_32
+	warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
+	warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
+	warp_def 9, 4, 2, ROUTE_32
+	warp_def 9, 5, 3, ROUTE_32
 
 .CoordEvents:
 	db 0
@@ -65,6 +65,6 @@ Route32RuinsOfAlphGate_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
-	object_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
-	object_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
+	object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
+	object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
diff --git a/maps/Route33.asm b/maps/Route33.asm
index e92e0cbb1..fbc7b3190 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -200,7 +200,7 @@ Route33_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $9, $b, 3, UNION_CAVE_1F
+	warp_def 11, 9, 3, UNION_CAVE_1F
 
 .CoordEvents:
 	db 0
@@ -211,6 +211,6 @@ Route33_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
-	object_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
-	object_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
+	object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
+	object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
+	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 633e9984a..144973036 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -768,35 +768,35 @@ Route34_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE
-	warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE
-	warp_def $e, $b, 1, DAY_CARE
-	warp_def $f, $b, 2, DAY_CARE
-	warp_def $f, $d, 3, DAY_CARE
+	warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
+	warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
+	warp_def 11, 14, 1, DAY_CARE
+	warp_def 11, 15, 2, DAY_CARE
+	warp_def 13, 15, 3, DAY_CARE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 5
-	bg_event 6, 12, BGEVENT_READ, Route34Sign
-	bg_event 33, 13, BGEVENT_READ, Route34TrainerTips
-	bg_event 13, 10, BGEVENT_READ, DayCareSign
-	bg_event 32, 8, BGEVENT_ITEM, Route34HiddenRareCandy
-	bg_event 19, 17, BGEVENT_ITEM, Route34HiddenSuperPotion
+	bg_event 12, 6, BGEVENT_READ, Route34Sign
+	bg_event 13, 33, BGEVENT_READ, Route34TrainerTips
+	bg_event 10, 13, BGEVENT_READ, DayCareSign
+	bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
+	bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion
 
 .ObjectEvents:
 	db 13
-	object_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
-	object_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
-	object_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
-	object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
-	object_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
-	object_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
-	object_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
-	object_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
-	object_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
-	object_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
-	object_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
-	object_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
-	object_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
+	object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
+	object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
+	object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
+	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
+	object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
+	object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
+	object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
+	object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
+	object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
+	object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
+	object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
+	object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
+	object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 799cb4d9e..18b010bff 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -141,21 +141,21 @@ Route34IlexForestGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 1, ROUTE_34
-	warp_def $0, $5, 2, ROUTE_34
-	warp_def $7, $4, 1, ILEX_FOREST
-	warp_def $7, $5, 1, ILEX_FOREST
+	warp_def 4, 0, 1, ROUTE_34
+	warp_def 5, 0, 2, ROUTE_34
+	warp_def 4, 7, 1, ILEX_FOREST
+	warp_def 5, 7, 1, ILEX_FOREST
 
 .CoordEvents:
 	db 1
-	coord_event 0, $7, $4, UnknownScript_0x62d3d
+	coord_event 4, 7, 0, UnknownScript_0x62d3d
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
-	object_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
-	object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	object_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
+	object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
+	object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
+	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
+	object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 59a5d57e9..becb45ad0 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -468,28 +468,28 @@ Route35_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $21, $9, 1, ROUTE_35_GOLDENROD_GATE
-	warp_def $21, $a, 2, ROUTE_35_GOLDENROD_GATE
-	warp_def $5, $3, 3, ROUTE_35_NATIONAL_PARK_GATE
+	warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE
+	warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE
+	warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 7, 1, BGEVENT_READ, Route35Sign
-	bg_event 31, 11, BGEVENT_READ, Route35Sign
+	bg_event 1, 7, BGEVENT_READ, Route35Sign
+	bg_event 11, 31, BGEVENT_READ, Route35Sign
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
-	object_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
-	object_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
-	object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1
-	object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1
-	object_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
-	object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie1, -1
-	object_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
-	object_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
-	object_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
-	object_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
+	object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
+	object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
+	object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
+	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1
+	object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1
+	object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
+	object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie1, -1
+	object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
+	object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
+	object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
+	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index bfc8e688d..77820e889 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -201,10 +201,10 @@ Route35GoldenrodGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 1, ROUTE_35
-	warp_def $0, $5, 2, ROUTE_35
-	warp_def $7, $4, 12, GOLDENROD_CITY
-	warp_def $7, $5, 12, GOLDENROD_CITY
+	warp_def 4, 0, 1, ROUTE_35
+	warp_def 5, 0, 2, ROUTE_35
+	warp_def 4, 7, 12, GOLDENROD_CITY
+	warp_def 5, 7, 12, GOLDENROD_CITY
 
 .CoordEvents:
 	db 0
@@ -214,6 +214,6 @@ Route35GoldenrodGate_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
-	object_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
-	object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
+	object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
+	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index c3c38a34f..cf68bbcc2 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -443,20 +443,20 @@ Route35NationalParkGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $3, 3, NATIONAL_PARK
-	warp_def $0, $4, 4, NATIONAL_PARK
-	warp_def $7, $3, 3, ROUTE_35
-	warp_def $7, $4, 3, ROUTE_35
+	warp_def 3, 0, 3, NATIONAL_PARK
+	warp_def 4, 0, 4, NATIONAL_PARK
+	warp_def 3, 7, 3, ROUTE_35
+	warp_def 4, 7, 3, ROUTE_35
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 0, 5, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+	bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
-	object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
+	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 86f7ca9fe..4076725b4 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -665,31 +665,31 @@ Route36_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $8, $12, 3, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $9, $12, 4, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE
+	warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
+	warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
+	warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
 
 .CoordEvents:
 	db 2
-	coord_event 1, $7, $14, Route36SuicuneScript
-	coord_event 1, $7, $16, Route36SuicuneScript
+	coord_event 20, 7, 1, Route36SuicuneScript
+	coord_event 22, 7, 1, Route36SuicuneScript
 
 .BGEvents:
 	db 4
-	bg_event 1, 29, BGEVENT_READ, Route36TrainerTips2
-	bg_event 11, 45, BGEVENT_READ, RuinsOfAlphNorthSign
-	bg_event 7, 55, BGEVENT_READ, Route36Sign
-	bg_event 7, 21, BGEVENT_READ, Route36TrainerTips1
+	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
+	bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
+	bg_event 55, 7, BGEVENT_READ, Route36Sign
+	bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
-	object_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
-	object_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
-	object_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
-	object_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
-	object_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
-	object_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
-	object_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
-	object_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
+	object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
+	object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
+	object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
+	object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
+	object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
+	object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
+	object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
+	object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
+	object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 8640b49cf..88d7abb14 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -856,29 +856,29 @@ Route36NationalParkGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 1, NATIONAL_PARK
-	warp_def $5, $0, 2, NATIONAL_PARK
-	warp_def $4, $9, 1, ROUTE_36
-	warp_def $5, $9, 2, ROUTE_36
+	warp_def 0, 4, 1, NATIONAL_PARK
+	warp_def 0, 5, 2, NATIONAL_PARK
+	warp_def 9, 4, 1, ROUTE_36
+	warp_def 9, 5, 2, ROUTE_36
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 0, 6, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+	bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
-	object_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
-	object_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
-	object_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
-	object_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
-	object_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
-	object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
-	object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
-	object_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
-	object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
-	object_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
+	object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
+	object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
+	object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
+	object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
+	object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
+	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
+	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
+	object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
+	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
+	object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index a41d6b558..316b2d4b4 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -40,10 +40,10 @@ Route36RuinsOfAlphGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 3, ROUTE_36
-	warp_def $0, $5, 4, ROUTE_36
-	warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE
-	warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE
+	warp_def 4, 0, 3, ROUTE_36
+	warp_def 5, 0, 4, ROUTE_36
+	warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
+	warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
 
 .CoordEvents:
 	db 0
@@ -53,5 +53,5 @@ Route36RuinsOfAlphGate_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
-	object_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
+	object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 5be5bb297..190656869 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -250,15 +250,15 @@ Route37_MapEventHeader:
 
 .BGEvents:
 	db 2
-	bg_event 3, 5, BGEVENT_READ, Route37Sign
-	bg_event 2, 4, BGEVENT_ITEM, Route37HiddenEther
+	bg_event 5, 3, BGEVENT_READ, Route37Sign
+	bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
-	object_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
-	object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
-	object_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
-	object_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
-	object_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
-	object_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
+	object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
+	object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
+	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
+	object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
+	object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
+	object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
+	object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index c4b957465..526bf3e36 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -478,23 +478,23 @@ Route38_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $8, $23, 1, ROUTE_38_ECRUTEAK_GATE
-	warp_def $9, $23, 2, ROUTE_38_ECRUTEAK_GATE
+	warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
+	warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 7, 33, BGEVENT_READ, Route38Sign
-	bg_event 13, 5, BGEVENT_READ, Route38TrainerTips
+	bg_event 33, 7, BGEVENT_READ, Route38Sign
+	bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
-	object_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
-	object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
-	object_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
-	object_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
-	object_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
-	object_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
+	object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
+	object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
+	object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
+	object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
+	object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
+	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
+	object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index a926c1e1c..8e117196c 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -30,10 +30,10 @@ Route38EcruteakGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 1, ROUTE_38
-	warp_def $5, $0, 2, ROUTE_38
-	warp_def $4, $9, 14, ECRUTEAK_CITY
-	warp_def $5, $9, 15, ECRUTEAK_CITY
+	warp_def 0, 4, 1, ROUTE_38
+	warp_def 0, 5, 2, ROUTE_38
+	warp_def 9, 4, 14, ECRUTEAK_CITY
+	warp_def 9, 5, 15, ECRUTEAK_CITY
 
 .CoordEvents:
 	db 0
@@ -43,4 +43,4 @@ Route38EcruteakGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 1ab22b0d7..6545dd77d 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -350,28 +350,28 @@ Route39_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, 1, ROUTE_39_BARN
-	warp_def $3, $5, 1, ROUTE_39_FARMHOUSE
+	warp_def 1, 3, 1, ROUTE_39_BARN
+	warp_def 5, 3, 1, ROUTE_39_FARMHOUSE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 31, 5, BGEVENT_READ, Route39TrainerTips
-	bg_event 5, 9, BGEVENT_READ, MoomooFarmSign
-	bg_event 7, 15, BGEVENT_READ, Route39Sign
-	bg_event 13, 5, BGEVENT_ITEM, Route39HiddenNugget
+	bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
+	bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
+	bg_event 15, 7, BGEVENT_READ, Route39Sign
+	bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
 
 .ObjectEvents:
 	db 10
-	object_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
-	object_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
-	object_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
-	object_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
-	object_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
-	object_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1
+	object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
+	object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
+	object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
+	object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
+	object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
+	object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index ba6f56c1f..a7cfe5405 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -194,8 +194,8 @@ Route39Barn_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 1, ROUTE_39
-	warp_def $7, $4, 1, ROUTE_39
+	warp_def 3, 7, 1, ROUTE_39
+	warp_def 4, 7, 1, ROUTE_39
 
 .CoordEvents:
 	db 0
@@ -205,6 +205,6 @@ Route39Barn_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
-	object_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
-	object_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
+	object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
+	object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
+	object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 194a43312..77531a70d 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -198,18 +198,18 @@ Route39Farmhouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, ROUTE_39
-	warp_def $7, $3, 2, ROUTE_39
+	warp_def 2, 7, 2, ROUTE_39
+	warp_def 3, 7, 2, ROUTE_39
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, FarmhouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
-	object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
+	object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
+	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index e4797656e..bd6ea62e5 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -127,19 +127,19 @@ Route4_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $2, 2, MOUNT_MOON
+	warp_def 2, 5, 2, MOUNT_MOON
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 7, 3, BGEVENT_READ, MtMoonSquareSign
-	bg_event 3, 10, BGEVENT_ITEM, Route4HiddenUltraBall
+	bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign
+	bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
-	object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
-	object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
-	object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
+	object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
+	object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
+	object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
+	object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 5b33783c5..73f089bd2 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -343,27 +343,27 @@ Route40_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $9, 1, ROUTE_40_BATTLE_TOWER_GATE
+	warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 10, 14, BGEVENT_READ, Route40Sign
-	bg_event 8, 7, BGEVENT_ITEM, Route40HiddenHyperPotion
+	bg_event 14, 10, BGEVENT_READ, Route40Sign
+	bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
 
 .ObjectEvents:
 	db 12
-	object_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
-	object_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
-	object_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
-	object_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1
-	object_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
-	object_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
-	object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
-	object_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
-	object_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
+	object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
+	object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
+	object_event 10, 25, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1
+	object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
+	object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
+	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
+	object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
+	object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 6ffd98416..f37b78669 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -76,10 +76,10 @@ Route40BattleTowerGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $4, 1, ROUTE_40
-	warp_def $7, $5, 1, ROUTE_40
-	warp_def $0, $4, 1, BATTLE_TOWER_OUTSIDE
-	warp_def $0, $5, 2, BATTLE_TOWER_OUTSIDE
+	warp_def 4, 7, 1, ROUTE_40
+	warp_def 5, 7, 1, ROUTE_40
+	warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE
+	warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE
 
 .CoordEvents:
 	db 0
@@ -89,5 +89,5 @@ Route40BattleTowerGate_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	object_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
+	object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 7ba8d9972..95618e692 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -347,27 +347,27 @@ Route41_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $c, 1, WHIRL_ISLAND_NW
-	warp_def $13, $24, 1, WHIRL_ISLAND_NE
-	warp_def $25, $c, 1, WHIRL_ISLAND_SW
-	warp_def $2d, $24, 1, WHIRL_ISLAND_SE
+	warp_def 12, 17, 1, WHIRL_ISLAND_NW
+	warp_def 36, 19, 1, WHIRL_ISLAND_NE
+	warp_def 12, 37, 1, WHIRL_ISLAND_SW
+	warp_def 36, 45, 1, WHIRL_ISLAND_SE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 35, 9, BGEVENT_ITEM, Route41HiddenMaxEther
+	bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
 
 .ObjectEvents:
 	db 10
-	object_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
-	object_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
-	object_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
-	object_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1
-	object_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1
-	object_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
-	object_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1
-	object_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1
-	object_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1
-	object_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
+	object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
+	object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
+	object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
+	object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1
+	object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1
+	object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
+	object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1
+	object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1
+	object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1
+	object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 40feaa927..ccf174b17 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -325,32 +325,32 @@ Route42_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $8, $0, 3, ROUTE_42_ECRUTEAK_GATE
-	warp_def $9, $0, 4, ROUTE_42_ECRUTEAK_GATE
-	warp_def $5, $a, 1, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
+	warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
+	warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
+	warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
 
 .CoordEvents:
 	db 1
-	coord_event 1, $e, $18, Route42SuicuneScript
+	coord_event 24, 14, 1, Route42SuicuneScript
 
 .BGEvents:
 	db 5
-	bg_event 10, 4, BGEVENT_READ, Route42Sign1
-	bg_event 5, 7, BGEVENT_READ, MtMortarSign1
-	bg_event 9, 45, BGEVENT_READ, MtMortarSign2
-	bg_event 8, 54, BGEVENT_READ, Route42Sign2
-	bg_event 11, 16, BGEVENT_ITEM, Route42HiddenMaxPotion
+	bg_event 4, 10, BGEVENT_READ, Route42Sign1
+	bg_event 7, 5, BGEVENT_READ, MtMortarSign1
+	bg_event 45, 9, BGEVENT_READ, MtMortarSign2
+	bg_event 54, 8, BGEVENT_READ, Route42Sign2
+	bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1
-	object_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
-	object_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
-	object_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
-	object_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
-	object_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
-	object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
-	object_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
-	object_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
+	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1
+	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
+	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
+	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
+	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
+	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
+	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
+	object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
+	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index b7cbf6c6f..89bf4b494 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -25,10 +25,10 @@ Route42EcruteakGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 1, ECRUTEAK_CITY
-	warp_def $5, $0, 2, ECRUTEAK_CITY
-	warp_def $4, $9, 1, ROUTE_42
-	warp_def $5, $9, 2, ROUTE_42
+	warp_def 0, 4, 1, ECRUTEAK_CITY
+	warp_def 0, 5, 2, ECRUTEAK_CITY
+	warp_def 9, 4, 1, ROUTE_42
+	warp_def 9, 5, 2, ROUTE_42
 
 .CoordEvents:
 	db 0
@@ -38,4 +38,4 @@ Route42EcruteakGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 871cd133c..b76ebaead 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -506,28 +506,28 @@ Route43_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $33, $9, 1, ROUTE_43_MAHOGANY_GATE
-	warp_def $33, $a, 2, ROUTE_43_MAHOGANY_GATE
-	warp_def $23, $11, 3, ROUTE_43_GATE
-	warp_def $1f, $11, 1, ROUTE_43_GATE
-	warp_def $1f, $12, 2, ROUTE_43_GATE
+	warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE
+	warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE
+	warp_def 17, 35, 3, ROUTE_43_GATE
+	warp_def 17, 31, 1, ROUTE_43_GATE
+	warp_def 18, 31, 2, ROUTE_43_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 3, 13, BGEVENT_READ, Route43Sign1
-	bg_event 49, 11, BGEVENT_READ, Route43Sign2
-	bg_event 38, 16, BGEVENT_READ, Route43TrainerTips
+	bg_event 13, 3, BGEVENT_READ, Route43Sign1
+	bg_event 11, 49, BGEVENT_READ, Route43Sign2
+	bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
-	object_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1
-	object_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
-	object_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
-	object_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1
-	object_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
-	object_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
-	object_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
+	object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
+	object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1
+	object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
+	object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
+	object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1
+	object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
+	object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
+	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 04542679b..58bb163ef 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -253,10 +253,10 @@ Route43Gate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 4, ROUTE_43
-	warp_def $0, $5, 5, ROUTE_43
-	warp_def $7, $4, 3, ROUTE_43
-	warp_def $7, $5, 3, ROUTE_43
+	warp_def 4, 0, 4, ROUTE_43
+	warp_def 5, 0, 5, ROUTE_43
+	warp_def 4, 7, 3, ROUTE_43
+	warp_def 5, 7, 3, ROUTE_43
 
 .CoordEvents:
 	db 0
@@ -266,6 +266,6 @@ Route43Gate_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
-	object_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index e4b6396c1..5cbd1d617 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -44,10 +44,10 @@ Route43MahoganyGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 1, ROUTE_43
-	warp_def $0, $5, 2, ROUTE_43
-	warp_def $7, $4, 5, MAHOGANY_TOWN
-	warp_def $7, $5, 5, MAHOGANY_TOWN
+	warp_def 4, 0, 1, ROUTE_43
+	warp_def 5, 0, 2, ROUTE_43
+	warp_def 4, 7, 5, MAHOGANY_TOWN
+	warp_def 5, 7, 5, MAHOGANY_TOWN
 
 .CoordEvents:
 	db 0
@@ -57,4 +57,4 @@ Route43MahoganyGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 29ff0399a..4f9261a59 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -513,27 +513,27 @@ Route44_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $38, 1, ICE_PATH_1F
+	warp_def 56, 7, 1, ICE_PATH_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 7, 53, BGEVENT_READ, Route44Sign1
-	bg_event 10, 6, BGEVENT_READ, Route44Sign2
-	bg_event 9, 32, BGEVENT_ITEM, Route44HiddenElixer
+	bg_event 53, 7, BGEVENT_READ, Route44Sign1
+	bg_event 6, 10, BGEVENT_READ, Route44Sign2
+	bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
 
 .ObjectEvents:
 	db 11
-	object_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
-	object_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
-	object_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
-	object_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
-	object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
-	object_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
-	object_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
-	object_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
-	object_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
-	object_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
-	object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
+	object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
+	object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
+	object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
+	object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
+	object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
+	object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
+	object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
+	object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
+	object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
+	object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
+	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 592719890..38b7f77f2 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -538,28 +538,28 @@ Route45_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $2, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
+	warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 4, 10, BGEVENT_READ, Route45Sign
-	bg_event 80, 13, BGEVENT_ITEM, Route45HiddenPpUp
+	bg_event 10, 4, BGEVENT_READ, Route45Sign
+	bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp
 
 .ObjectEvents:
 	db 13
-	object_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
-	object_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
-	object_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
-	object_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
-	object_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
-	object_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
-	object_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
-	object_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
-	object_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
-	object_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
-	object_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
-	object_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
-	object_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1
+	object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
+	object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
+	object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
+	object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
+	object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
+	object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
+	object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
+	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
+	object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
+	object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
+	object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
+	object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
+	object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 89d6ac61e..36dad82d3 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -256,22 +256,22 @@ Route46_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $21, $7, 1, ROUTE_29_46_GATE
-	warp_def $21, $8, 2, ROUTE_29_46_GATE
-	warp_def $5, $e, 3, DARK_CAVE_VIOLET_ENTRANCE
+	warp_def 7, 33, 1, ROUTE_29_46_GATE
+	warp_def 8, 33, 2, ROUTE_29_46_GATE
+	warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 27, 9, BGEVENT_READ, Route46Sign
+	bg_event 9, 27, BGEVENT_READ, Route46Sign
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
-	object_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
-	object_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
-	object_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
-	object_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
-	object_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
+	object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
+	object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
+	object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
+	object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
+	object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
+	object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
diff --git a/maps/Route5.asm b/maps/Route5.asm
index 047774506..7976fbe79 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -45,10 +45,10 @@ Route5_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE
-	warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE
-	warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
+	warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
+	warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE
+	warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE
+	warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
 
 .CoordEvents:
 	db 0
@@ -56,8 +56,8 @@ Route5_MapEventHeader:
 .BGEvents:
 	db 2
 	bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign
-	bg_event 11, 10, BGEVENT_READ, HouseForSaleSign
+	bg_event 10, 11, BGEVENT_READ, HouseForSaleSign
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+	object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm
index 513adfac2..320ddef89 100644
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -66,18 +66,18 @@ Route5CleanseTagSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, ROUTE_5
-	warp_def $7, $3, 4, ROUTE_5
+	warp_def 2, 7, 4, ROUTE_5
+	warp_def 3, 7, 4, ROUTE_5
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, HouseForSaleBookshelf
+	bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
 	bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
-	object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1
+	object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
+	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1
diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm
index ebd84823e..e47ce7628 100644
--- a/maps/Route5SaffronCityGate.asm
+++ b/maps/Route5SaffronCityGate.asm
@@ -26,10 +26,10 @@ Route5SaffronCityGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 2, ROUTE_5
-	warp_def $0, $5, 3, ROUTE_5
-	warp_def $7, $4, 9, SAFFRON_CITY
-	warp_def $7, $5, 9, SAFFRON_CITY
+	warp_def 4, 0, 2, ROUTE_5
+	warp_def 5, 0, 3, ROUTE_5
+	warp_def 4, 7, 9, SAFFRON_CITY
+	warp_def 5, 7, 9, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
@@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index ee47e150e..954b16ecb 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -25,9 +25,9 @@ Route5UndergroundPathEntrance_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, ROUTE_5
-	warp_def $7, $4, 1, ROUTE_5
-	warp_def $3, $4, 1, UNDERGROUND_PATH
+	warp_def 3, 7, 1, ROUTE_5
+	warp_def 4, 7, 1, ROUTE_5
+	warp_def 4, 3, 1, UNDERGROUND_PATH
 
 .CoordEvents:
 	db 0
@@ -37,4 +37,4 @@ Route5UndergroundPathEntrance_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
+	object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 884470930..d19033031 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -97,18 +97,18 @@ Route6_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
-	warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE
+	warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+	warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 5, 19, BGEVENT_READ, Route6UndergroundPathSign
+	bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
-	object_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
-	object_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
+	object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+	object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
+	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 25f234e82..713e1476e 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -63,10 +63,10 @@ Route6SaffronGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 12, SAFFRON_CITY
-	warp_def $0, $5, 13, SAFFRON_CITY
-	warp_def $7, $4, 2, ROUTE_6
-	warp_def $7, $5, 2, ROUTE_6
+	warp_def 4, 0, 12, SAFFRON_CITY
+	warp_def 5, 0, 13, SAFFRON_CITY
+	warp_def 4, 7, 2, ROUTE_6
+	warp_def 5, 7, 2, ROUTE_6
 
 .CoordEvents:
 	db 0
@@ -76,4 +76,4 @@ Route6SaffronGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
+	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm
index 3088ae330..126406e10 100644
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -11,9 +11,9 @@ Route6UndergroundPathEntrance_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, ROUTE_6
-	warp_def $7, $4, 1, ROUTE_6
-	warp_def $3, $4, 2, UNDERGROUND_PATH
+	warp_def 3, 7, 1, ROUTE_6
+	warp_def 4, 7, 1, ROUTE_6
+	warp_def 4, 3, 2, UNDERGROUND_PATH
 
 .CoordEvents:
 	db 0
diff --git a/maps/Route7.asm b/maps/Route7.asm
index c412b4a46..54887e894 100644
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -40,16 +40,16 @@ Route7_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $6, $f, 1, ROUTE_7_SAFFRON_GATE
-	warp_def $7, $f, 2, ROUTE_7_SAFFRON_GATE
+	warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE
+	warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 11, 5, BGEVENT_READ, Route7UndergroundPathSign
-	bg_event 9, 6, BGEVENT_READ, Route7LockedDoor
+	bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign
+	bg_event 6, 9, BGEVENT_READ, Route7LockedDoor
 
 .ObjectEvents:
 	db 0
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 1b5a02785..c72a3a571 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -51,10 +51,10 @@ Route7SaffronGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 1, ROUTE_7
-	warp_def $5, $0, 2, ROUTE_7
-	warp_def $4, $9, 10, SAFFRON_CITY
-	warp_def $5, $9, 11, SAFFRON_CITY
+	warp_def 0, 4, 1, ROUTE_7
+	warp_def 0, 5, 2, ROUTE_7
+	warp_def 9, 4, 10, SAFFRON_CITY
+	warp_def 9, 5, 11, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
@@ -64,4 +64,4 @@ Route7SaffronGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 66a207130..1ad467aba 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -178,22 +178,22 @@ Route8_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $4, $4, 3, ROUTE_8_SAFFRON_GATE
-	warp_def $5, $4, 4, ROUTE_8_SAFFRON_GATE
+	warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE
+	warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 7, 11, BGEVENT_READ, Route8UndergroundPathSign
-	bg_event 5, 10, BGEVENT_READ, Route8LockedDoor
+	bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
+	bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
-	object_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
-	object_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
-	object_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
-	object_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
-	object_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
+	object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
+	object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
+	object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
+	object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
+	object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
+	object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index 5fc04c8ad..7dc6507ed 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -25,10 +25,10 @@ Route8SaffronGate_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $0, 14, SAFFRON_CITY
-	warp_def $5, $0, 15, SAFFRON_CITY
-	warp_def $4, $9, 1, ROUTE_8
-	warp_def $5, $9, 2, ROUTE_8
+	warp_def 0, 4, 14, SAFFRON_CITY
+	warp_def 0, 5, 15, SAFFRON_CITY
+	warp_def 9, 4, 1, ROUTE_8
+	warp_def 9, 5, 2, ROUTE_8
 
 .CoordEvents:
 	db 0
@@ -38,4 +38,4 @@ Route8SaffronGate_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
+	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
diff --git a/maps/Route9.asm b/maps/Route9.asm
index d3a28a088..1b377ceeb 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -212,21 +212,21 @@ Route9_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $f, $30, 1, ROCK_TUNNEL_1F
+	warp_def 48, 15, 1, ROCK_TUNNEL_1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 7, 15, BGEVENT_READ, Route9Sign
-	bg_event 15, 41, BGEVENT_ITEM, Route9HiddenEther
+	bg_event 15, 7, BGEVENT_READ, Route9Sign
+	bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
-	object_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
-	object_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
-	object_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1
-	object_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
-	object_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1
+	object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
+	object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
+	object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
+	object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1
+	object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
+	object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index bf84025fe..355b5591c 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -149,23 +149,23 @@ RuinsOfAlphAerodactylChamber_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $3, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_def $9, $4, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_def $3, $3, 8, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $3, $4, 9, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $0, $4, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
+	warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
+	warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
-	bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
-	bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
-	bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
+	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
+	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
+	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
+	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index 56197802b..8e2822d0b 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -38,22 +38,22 @@ RuinsOfAlphAerodactylItemRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $9, $3, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def $9, $4, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def $1, $3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
-	warp_def $1, $4, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
+	warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
+	warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
-	bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm
index c31cc563b..b19ad5cc2 100644
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -11,9 +11,9 @@ RuinsOfAlphAerodactylWordRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $9, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_def $5, $a, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_def $b, $11, 8, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
+	warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
+	warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
 
 .CoordEvents:
 	db 0
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index ec334e397..52915317d 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -150,23 +150,23 @@ RuinsOfAlphHoOhChamber_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $3, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def $9, $4, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def $3, $3, 2, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $3, $4, 3, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $0, $4, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
+	warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
+	warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
-	bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
-	bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
-	bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
+	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
+	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
+	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
+	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 643dde195..01c34011e 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -38,22 +38,22 @@ RuinsOfAlphHoOhItemRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $9, $3, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def $9, $4, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def $1, $3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-	warp_def $1, $4, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
+	warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
+	warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
+	warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
+	warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-	bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm
index 059025e6b..079c7859f 100644
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -11,9 +11,9 @@ RuinsOfAlphHoOhWordRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $9, $9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_def $9, $a, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_def $15, $11, 2, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
+	warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
+	warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
 
 .CoordEvents:
 	db 0
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 5fa6714a5..e0f9b4ad8 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -82,50 +82,50 @@ RuinsOfAlphInnerChamber_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $d, $a, 5, RUINS_OF_ALPH_OUTSIDE
-	warp_def $f, $3, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def $f, $4, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def $3, $f, 3, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def $3, $10, 4, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def $15, $3, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def $15, $4, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
+	warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
+	warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER
+	warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER
+	warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER
+	warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER
+	warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 26
-	bg_event 3, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 3, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 3, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 3, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 3, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 3, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 13, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 13, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 18, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 24, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	object_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	object_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
+	object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
+	object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
+	object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 15a9e90c4..e4f3f16c5 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -261,25 +261,25 @@ RuinsOfAlphKabutoChamber_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $3, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_def $9, $4, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_def $3, $3, 4, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $3, $4, 5, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $0, $4, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
+	warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
+	warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
-	bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
-	bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
-	bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
+	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
+	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
+	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
+	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
+	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
+	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	object_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
+	object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
+	object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index 45afbcc45..910f5837c 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -38,22 +38,22 @@ RuinsOfAlphKabutoItemRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $9, $3, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def $9, $4, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def $1, $3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
-	warp_def $1, $4, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
+	warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
+	warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
+	warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
+	warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
-	bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
+	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
+	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm
index f872baedb..fc6c21f9a 100644
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -11,9 +11,9 @@ RuinsOfAlphKabutoWordRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $5, $9, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_def $5, $a, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_def $b, $11, 4, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
+	warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
+	warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
 
 .CoordEvents:
 	db 0
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 80ad32c32..994f69edd 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -150,23 +150,23 @@ RuinsOfAlphOmanyteChamber_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $3, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_def $9, $4, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_def $3, $3, 6, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $3, $4, 7, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $0, $4, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
+	warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
+	warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 6
-	bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
-	bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
-	bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
-	bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
+	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
+	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
+	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
+	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
+	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
+	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
 
 .ObjectEvents:
 	db 0
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 0f3eb7e16..292dbac4d 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -38,22 +38,22 @@ RuinsOfAlphOmanyteItemRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $9, $3, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def $9, $4, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def $1, $3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
-	warp_def $1, $4, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
+	warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
+	warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
+	warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
+	warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
-	bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
+	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
+	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
-	object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm
index 205e7575d..4ed4e32bc 100644
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -11,9 +11,9 @@ RuinsOfAlphOmanyteWordRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $9, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_def $7, $a, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_def $d, $11, 6, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
+	warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
+	warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
 
 .CoordEvents:
 	db 0
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 8e6ecf49b..478a2b9d0 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -288,33 +288,33 @@ RuinsOfAlphOutside_MapEventHeader:
 
 .Warps:
 	db 11
-	warp_def $11, $2, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def $7, $e, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def $1d, $2, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def $21, $10, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def $d, $a, 1, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def $b, $11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
-	warp_def $13, $6, 1, UNION_CAVE_B1F
-	warp_def $1b, $6, 2, UNION_CAVE_B1F
-	warp_def $5, $7, 3, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE
+	warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
+	warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
+	warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
+	warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
+	warp_def 6, 19, 1, UNION_CAVE_B1F
+	warp_def 6, 27, 2, UNION_CAVE_B1F
+	warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE
+	warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
+	warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
 
 .CoordEvents:
 	db 2
-	coord_event 1, $e, $b, RuinsOfAlphOutsideScientistScene1
-	coord_event 1, $f, $a, RuinsOfAlphOutsideScientistScene2
+	coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
+	coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
 
 .BGEvents:
 	db 3
-	bg_event 8, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
-	bg_event 16, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
-	bg_event 12, 18, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
+	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
+	bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
+	bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
-	object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
-	object_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
-	object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
-	object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+	object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
+	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
+	object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
+	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index f4b62563a..223b2bd62 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -398,20 +398,20 @@ RuinsOfAlphResearchCenter_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, RUINS_OF_ALPH_OUTSIDE
-	warp_def $7, $3, 6, RUINS_OF_ALPH_OUTSIDE
+	warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 5, 6, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
-	bg_event 4, 3, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
-	bg_event 1, 7, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
+	bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
+	bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
+	bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
-	object_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
-	object_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
+	object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
+	object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
+	object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm
index 77e40f8e2..d1b4e6f1a 100644
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -11,8 +11,8 @@ SafariZoneBeta_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $17, $9, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_def $17, $a, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
+	warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
+	warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
 
 .CoordEvents:
 	db 0
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index 0ffc13b75..e2ba63f2e 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -11,10 +11,10 @@ SafariZoneFuchsiaGateBeta_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $4, 1, SAFARI_ZONE_BETA
-	warp_def $0, $5, 2, SAFARI_ZONE_BETA
-	warp_def $7, $4, 7, FUCHSIA_CITY
-	warp_def $7, $5, 7, FUCHSIA_CITY
+	warp_def 4, 0, 1, SAFARI_ZONE_BETA
+	warp_def 5, 0, 2, SAFARI_ZONE_BETA
+	warp_def 4, 7, 7, FUCHSIA_CITY
+	warp_def 5, 7, 7, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm
index 1fd5e0b55..2c7ac5e3d 100644
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -11,8 +11,8 @@ SafariZoneMainOffice_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, FUCHSIA_CITY
-	warp_def $7, $3, 2, FUCHSIA_CITY
+	warp_def 2, 7, 2, FUCHSIA_CITY
+	warp_def 3, 7, 2, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index f1c768e33..487dff77d 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -82,19 +82,19 @@ SafariZoneWardensHome_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, FUCHSIA_CITY
-	warp_def $7, $3, 6, FUCHSIA_CITY
+	warp_def 2, 7, 6, FUCHSIA_CITY
+	warp_def 3, 7, 6, FUCHSIA_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 4
-	bg_event 1, 0, BGEVENT_READ, WardensHomeBookshelf
+	bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf
 	bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf
-	bg_event 0, 7, BGEVENT_READ, WardenPhoto
-	bg_event 0, 9, BGEVENT_READ, SafariZonePhoto
+	bg_event 7, 0, BGEVENT_READ, WardenPhoto
+	bg_event 9, 0, BGEVENT_READ, SafariZonePhoto
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
+	object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 14334d12d..490a269b9 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -271,43 +271,43 @@ SaffronCity_MapEventHeader:
 
 .Warps:
 	db 15
-	warp_def $3, $1a, 1, FIGHTING_DOJO
-	warp_def $3, $22, 1, SAFFRON_GYM
-	warp_def $b, $19, 2, SAFFRON_MART
-	warp_def $1d, $9, 1, SAFFRON_POKECENTER_1F
-	warp_def $1d, $1b, 1, MR_PSYCHICS_HOUSE
-	warp_def $3, $8, 2, SAFFRON_TRAIN_STATION
-	warp_def $15, $12, 1, SILPH_CO_1F
-	warp_def $b, $9, 1, COPYCATS_HOUSE_1F
-	warp_def $3, $12, 3, ROUTE_5_SAFFRON_CITY_GATE
-	warp_def $18, $0, 3, ROUTE_7_SAFFRON_GATE
-	warp_def $19, $0, 4, ROUTE_7_SAFFRON_GATE
-	warp_def $21, $10, 1, ROUTE_6_SAFFRON_GATE
-	warp_def $21, $11, 2, ROUTE_6_SAFFRON_GATE
-	warp_def $16, $27, 1, ROUTE_8_SAFFRON_GATE
-	warp_def $17, $27, 2, ROUTE_8_SAFFRON_GATE
+	warp_def 26, 3, 1, FIGHTING_DOJO
+	warp_def 34, 3, 1, SAFFRON_GYM
+	warp_def 25, 11, 2, SAFFRON_MART
+	warp_def 9, 29, 1, SAFFRON_POKECENTER_1F
+	warp_def 27, 29, 1, MR_PSYCHICS_HOUSE
+	warp_def 8, 3, 2, SAFFRON_TRAIN_STATION
+	warp_def 18, 21, 1, SILPH_CO_1F
+	warp_def 9, 11, 1, COPYCATS_HOUSE_1F
+	warp_def 18, 3, 3, ROUTE_5_SAFFRON_CITY_GATE
+	warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE
+	warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE
+	warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE
+	warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE
+	warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE
+	warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 8
-	bg_event 5, 21, BGEVENT_READ, SaffronCitySign
-	bg_event 5, 33, BGEVENT_READ, SaffronGymSign
-	bg_event 5, 25, BGEVENT_READ, FightingDojoSign
-	bg_event 21, 15, BGEVENT_READ, SilphCoSign
-	bg_event 29, 25, BGEVENT_READ, MrPsychicsHouseSign
-	bg_event 5, 11, BGEVENT_READ, SaffronCityMagnetTrainStationSign
-	bg_event 29, 10, BGEVENT_READ, SaffronCityPokecenterSign
-	bg_event 11, 26, BGEVENT_READ, SaffronCityMartSign
+	bg_event 21, 5, BGEVENT_READ, SaffronCitySign
+	bg_event 33, 5, BGEVENT_READ, SaffronGymSign
+	bg_event 25, 5, BGEVENT_READ, FightingDojoSign
+	bg_event 15, 21, BGEVENT_READ, SilphCoSign
+	bg_event 25, 29, BGEVENT_READ, MrPsychicsHouseSign
+	bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign
+	bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
+	bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
-	object_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
-	object_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
-	object_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
-	object_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
-	object_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
-	object_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
-	object_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
+	object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
+	object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
+	object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
+	object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
+	object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
+	object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
+	object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
+	object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index a780ef4da..008356172 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -296,51 +296,51 @@ SaffronGym_MapEventHeader:
 
 .Warps:
 	db 32
-	warp_def $11, $8, 2, SAFFRON_CITY
-	warp_def $11, $9, 2, SAFFRON_CITY
-	warp_def $f, $b, 18, SAFFRON_GYM
-	warp_def $f, $13, 19, SAFFRON_GYM
-	warp_def $b, $13, 20, SAFFRON_GYM
-	warp_def $b, $1, 21, SAFFRON_GYM
-	warp_def $3, $5, 22, SAFFRON_GYM
-	warp_def $5, $b, 23, SAFFRON_GYM
-	warp_def $f, $1, 24, SAFFRON_GYM
-	warp_def $3, $13, 25, SAFFRON_GYM
-	warp_def $11, $f, 26, SAFFRON_GYM
-	warp_def $11, $5, 27, SAFFRON_GYM
-	warp_def $9, $5, 28, SAFFRON_GYM
-	warp_def $3, $9, 29, SAFFRON_GYM
-	warp_def $9, $f, 30, SAFFRON_GYM
-	warp_def $5, $f, 31, SAFFRON_GYM
-	warp_def $5, $1, 32, SAFFRON_GYM
-	warp_def $11, $13, 3, SAFFRON_GYM
-	warp_def $9, $13, 4, SAFFRON_GYM
-	warp_def $9, $1, 5, SAFFRON_GYM
-	warp_def $5, $5, 6, SAFFRON_GYM
-	warp_def $3, $b, 7, SAFFRON_GYM
-	warp_def $11, $1, 8, SAFFRON_GYM
-	warp_def $5, $13, 9, SAFFRON_GYM
-	warp_def $f, $f, 10, SAFFRON_GYM
-	warp_def $f, $5, 11, SAFFRON_GYM
-	warp_def $b, $5, 12, SAFFRON_GYM
-	warp_def $5, $9, 13, SAFFRON_GYM
-	warp_def $b, $f, 14, SAFFRON_GYM
-	warp_def $3, $f, 15, SAFFRON_GYM
-	warp_def $3, $1, 16, SAFFRON_GYM
-	warp_def $9, $b, 17, SAFFRON_GYM
+	warp_def 8, 17, 2, SAFFRON_CITY
+	warp_def 9, 17, 2, SAFFRON_CITY
+	warp_def 11, 15, 18, SAFFRON_GYM
+	warp_def 19, 15, 19, SAFFRON_GYM
+	warp_def 19, 11, 20, SAFFRON_GYM
+	warp_def 1, 11, 21, SAFFRON_GYM
+	warp_def 5, 3, 22, SAFFRON_GYM
+	warp_def 11, 5, 23, SAFFRON_GYM
+	warp_def 1, 15, 24, SAFFRON_GYM
+	warp_def 19, 3, 25, SAFFRON_GYM
+	warp_def 15, 17, 26, SAFFRON_GYM
+	warp_def 5, 17, 27, SAFFRON_GYM
+	warp_def 5, 9, 28, SAFFRON_GYM
+	warp_def 9, 3, 29, SAFFRON_GYM
+	warp_def 15, 9, 30, SAFFRON_GYM
+	warp_def 15, 5, 31, SAFFRON_GYM
+	warp_def 1, 5, 32, SAFFRON_GYM
+	warp_def 19, 17, 3, SAFFRON_GYM
+	warp_def 19, 9, 4, SAFFRON_GYM
+	warp_def 1, 9, 5, SAFFRON_GYM
+	warp_def 5, 5, 6, SAFFRON_GYM
+	warp_def 11, 3, 7, SAFFRON_GYM
+	warp_def 1, 17, 8, SAFFRON_GYM
+	warp_def 19, 5, 9, SAFFRON_GYM
+	warp_def 15, 15, 10, SAFFRON_GYM
+	warp_def 5, 15, 11, SAFFRON_GYM
+	warp_def 5, 11, 12, SAFFRON_GYM
+	warp_def 9, 5, 13, SAFFRON_GYM
+	warp_def 15, 11, 14, SAFFRON_GYM
+	warp_def 15, 3, 15, SAFFRON_GYM
+	warp_def 1, 3, 16, SAFFRON_GYM
+	warp_def 11, 9, 17, SAFFRON_GYM
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 15, 8, BGEVENT_READ, SaffronGymStatue
+	bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
-	object_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
-	object_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
-	object_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
-	object_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
-	object_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
+	object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
+	object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
+	object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
+	object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
+	object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
+	object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index c1ce96b4f..34f936298 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -43,8 +43,8 @@ SaffronMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, SAFFRON_CITY
-	warp_def $7, $3, 3, SAFFRON_CITY
+	warp_def 2, 7, 3, SAFFRON_CITY
+	warp_def 3, 7, 3, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
@@ -54,6 +54,6 @@ SaffronMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
-	object_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
-	object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
+	object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
+	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index 9b4608e7b..39d6ad8bb 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -117,9 +117,9 @@ SaffronPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 4, SAFFRON_CITY
-	warp_def $7, $4, 4, SAFFRON_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 4, SAFFRON_CITY
+	warp_def 4, 7, 4, SAFFRON_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -129,7 +129,7 @@ SaffronPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
-	object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
-	object_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
-	object_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
+	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
+	object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
+	object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index ea6adcb2f..fd0835f50 100644
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ SaffronPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, SAFFRON_POKECENTER_1F
+	warp_def 0, 7, 3, SAFFRON_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index df7d7c6de..19c35a37c 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -221,21 +221,21 @@ SaffronTrainStation_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $8, 6, SAFFRON_CITY
-	warp_def $11, $9, 6, SAFFRON_CITY
-	warp_def $5, $6, 4, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_def $5, $b, 3, GOLDENROD_MAGNET_TRAIN_STATION
+	warp_def 8, 17, 6, SAFFRON_CITY
+	warp_def 9, 17, 6, SAFFRON_CITY
+	warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
+	warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
 
 .CoordEvents:
 	db 1
-	coord_event 0, $6, $b, Script_ArriveFromGoldenrod
+	coord_event 11, 6, 0, Script_ArriveFromGoldenrod
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
-	object_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
-	object_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
-	object_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
+	object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
+	object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index fc7806a0b..f08ba0b8f 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -163,7 +163,7 @@ SeafoamGym_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $5, $5, 1, ROUTE_20
+	warp_def 5, 5, 1, ROUTE_20
 
 .CoordEvents:
 	db 0
@@ -173,5 +173,5 @@ SeafoamGym_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
-	object_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
+	object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
+	object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 4b87d0df4..f714ba24c 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -61,8 +61,8 @@ SilphCo1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 7, SAFFRON_CITY
-	warp_def $7, $3, 7, SAFFRON_CITY
+	warp_def 2, 7, 7, SAFFRON_CITY
+	warp_def 3, 7, 7, SAFFRON_CITY
 
 .CoordEvents:
 	db 0
@@ -72,5 +72,5 @@ SilphCo1F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
-	object_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
+	object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
+	object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index b838c9349..6a381bf3b 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -21,8 +21,8 @@ SilverCaveItemRooms_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $d, 3, SILVER_CAVE_ROOM_2
-	warp_def $f, $7, 4, SILVER_CAVE_ROOM_2
+	warp_def 13, 3, 3, SILVER_CAVE_ROOM_2
+	warp_def 7, 15, 4, SILVER_CAVE_ROOM_2
 
 .CoordEvents:
 	db 0
@@ -32,5 +32,5 @@ SilverCaveItemRooms_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
-	object_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
+	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 798363c52..52f1c1b16 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -29,17 +29,17 @@ SilverCaveOutside_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $13, $17, 1, SILVER_CAVE_POKECENTER_1F
-	warp_def $b, $12, 1, SILVER_CAVE_ROOM_1
+	warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F
+	warp_def 18, 11, 1, SILVER_CAVE_ROOM_1
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 19, 24, BGEVENT_READ, MtSilverPokecenterSign
-	bg_event 13, 17, BGEVENT_READ, MtSilverSign
-	bg_event 25, 9, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
+	bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign
+	bg_event 17, 13, BGEVENT_READ, MtSilverSign
+	bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
 
 .ObjectEvents:
 	db 0
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index a1bc54a3f..4363edcfc 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -35,9 +35,9 @@ SilverCavePokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, SILVER_CAVE_OUTSIDE
-	warp_def $7, $4, 1, SILVER_CAVE_OUTSIDE
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE
+	warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -47,5 +47,5 @@ SilverCavePokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
-	object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
+	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 57212bf38..7879184ee 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -37,20 +37,20 @@ SilverCaveRoom1_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $21, $9, 2, SILVER_CAVE_OUTSIDE
-	warp_def $1, $f, 1, SILVER_CAVE_ROOM_2
+	warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE
+	warp_def 15, 1, 1, SILVER_CAVE_ROOM_2
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 23, 16, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
-	bg_event 12, 17, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
+	bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
+	bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
-	object_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
-	object_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
-	object_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
+	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
+	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
+	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
+	object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 5ee1d4bf6..ec33e2be8 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -29,20 +29,20 @@ SilverCaveRoom2_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $1f, $11, 2, SILVER_CAVE_ROOM_1
-	warp_def $5, $b, 1, SILVER_CAVE_ROOM_3
-	warp_def $15, $d, 1, SILVER_CAVE_ITEM_ROOMS
-	warp_def $3, $17, 2, SILVER_CAVE_ITEM_ROOMS
+	warp_def 17, 31, 2, SILVER_CAVE_ROOM_1
+	warp_def 11, 5, 1, SILVER_CAVE_ROOM_3
+	warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
+	warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 31, 14, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
+	bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
-	object_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
-	object_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
+	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
+	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
+	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 717f0532b..7daab6ba8 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -56,7 +56,7 @@ SilverCaveRoom3_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $21, $9, 2, SILVER_CAVE_ROOM_2
+	warp_def 9, 33, 2, SILVER_CAVE_ROOM_2
 
 .CoordEvents:
 	db 0
@@ -66,4 +66,4 @@ SilverCaveRoom3_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
+	object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index dbee08ab8..c4357abf1 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -326,8 +326,8 @@ SlowpokeWellB1F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $11, 6, AZALEA_TOWN
-	warp_def $b, $7, 1, SLOWPOKE_WELL_B2F
+	warp_def 17, 15, 6, AZALEA_TOWN
+	warp_def 7, 11, 1, SLOWPOKE_WELL_B2F
 
 .CoordEvents:
 	db 0
@@ -337,12 +337,12 @@ SlowpokeWellB1F_MapEventHeader:
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
-	object_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
-	object_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
-	object_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
-	object_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
+	object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
+	object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
+	object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 21910a5fe..c30261b25 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -67,7 +67,7 @@ SlowpokeWellB2F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $b, $9, 2, SLOWPOKE_WELL_B1F
+	warp_def 9, 11, 2, SLOWPOKE_WELL_B1F
 
 .CoordEvents:
 	db 0
@@ -77,5 +77,5 @@ SlowpokeWellB2F_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
-	object_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
+	object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
+	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index 4a2ddc61a..4bd994c93 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -78,8 +78,8 @@ SoulHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 6, LAVENDER_TOWN
-	warp_def $7, $5, 6, LAVENDER_TOWN
+	warp_def 4, 7, 6, LAVENDER_TOWN
+	warp_def 5, 7, 6, LAVENDER_TOWN
 
 .CoordEvents:
 	db 0
@@ -89,7 +89,7 @@ SoulHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
-	object_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
-	object_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
-	object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
+	object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
+	object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
+	object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
+	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index a0345f72a..cafee1eea 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -108,25 +108,25 @@ SproutTower1F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $f, $9, 7, VIOLET_CITY
-	warp_def $f, $a, 7, VIOLET_CITY
-	warp_def $4, $6, 1, SPROUT_TOWER_2F
-	warp_def $6, $2, 2, SPROUT_TOWER_2F
-	warp_def $3, $11, 3, SPROUT_TOWER_2F
+	warp_def 9, 15, 7, VIOLET_CITY
+	warp_def 10, 15, 7, VIOLET_CITY
+	warp_def 6, 4, 1, SPROUT_TOWER_2F
+	warp_def 2, 6, 2, SPROUT_TOWER_2F
+	warp_def 17, 3, 3, SPROUT_TOWER_2F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 15, 7, BGEVENT_READ, MapSproutTower1FSignpost1Script
-	bg_event 15, 12, BGEVENT_READ, MapSproutTower1FSignpost1Script
+	bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
+	bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
-	object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
-	object_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
-	object_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
-	object_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
-	object_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
+	object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
+	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
+	object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
+	object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
+	object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
+	object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 4c202eb80..bf3611ead 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -90,20 +90,20 @@ SproutTower2F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $6, 3, SPROUT_TOWER_1F
-	warp_def $6, $2, 4, SPROUT_TOWER_1F
-	warp_def $3, $11, 5, SPROUT_TOWER_1F
-	warp_def $e, $a, 1, SPROUT_TOWER_3F
+	warp_def 6, 4, 3, SPROUT_TOWER_1F
+	warp_def 2, 6, 4, SPROUT_TOWER_1F
+	warp_def 17, 3, 5, SPROUT_TOWER_1F
+	warp_def 10, 14, 1, SPROUT_TOWER_3F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 15, 12, BGEVENT_READ, MapSproutTower2FSignpost0Script
+	bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
-	object_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
-	object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
+	object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
+	object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index c92926585..33dd4dcd8 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -335,27 +335,27 @@ SproutTower3F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $e, $a, 4, SPROUT_TOWER_2F
+	warp_def 10, 14, 4, SPROUT_TOWER_2F
 
 .CoordEvents:
 	db 1
-	coord_event 0, $9, $b, UnknownScript_0x184947
+	coord_event 11, 9, 0, UnknownScript_0x184947
 
 .BGEvents:
 	db 6
-	bg_event 1, 8, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 1, 11, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 0, 9, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 0, 10, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 15, 5, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 15, 14, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
+	bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
+	bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
-	object_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
-	object_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
-	object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
-	object_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
-	object_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
-	object_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
+	object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
+	object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
+	object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
+	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
+	object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
+	object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
+	object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index c96d26104..464215210 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -733,65 +733,65 @@ TeamRocketBaseB1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $2, $1b, 3, MAHOGANY_MART_1F
-	warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F
-	warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F
-	warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F
+	warp_def 27, 2, 3, MAHOGANY_MART_1F
+	warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F
+	warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F
+	warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F
 
 .CoordEvents:
 	db 30
 	; There are five security cameras in the base.
 	; Walking in front of one triggers two Rocket Grunts.
-	coord_event 0, $2, $18, SecurityCamera1a
-	coord_event 0, $3, $18, SecurityCamera1b
-	coord_event 0, $2, $6, SecurityCamera2a
-	coord_event 0, $3, $6, SecurityCamera2b
-	coord_event 0, $6, $18, SecurityCamera3a
-	coord_event 0, $7, $18, SecurityCamera3b
-	coord_event 0, $10, $16, SecurityCamera4
-	coord_event 0, $10, $8, SecurityCamera5
+	coord_event 24, 2, 0, SecurityCamera1a
+	coord_event 24, 3, 0, SecurityCamera1b
+	coord_event 6, 2, 0, SecurityCamera2a
+	coord_event 6, 3, 0, SecurityCamera2b
+	coord_event 24, 6, 0, SecurityCamera3a
+	coord_event 24, 7, 0, SecurityCamera3b
+	coord_event 22, 16, 0, SecurityCamera4
+	coord_event 8, 16, 0, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
-	coord_event 0, $7, $2, ExplodingTrap1
-	coord_event 0, $7, $3, ExplodingTrap2
-	coord_event 0, $7, $4, ExplodingTrap3
-	coord_event 0, $8, $1, ExplodingTrap4
-	coord_event 0, $8, $3, ExplodingTrap5
-	coord_event 0, $8, $5, ExplodingTrap6
-	coord_event 0, $9, $3, ExplodingTrap7
-	coord_event 0, $9, $4, ExplodingTrap8
-	coord_event 0, $a, $1, ExplodingTrap9
-	coord_event 0, $a, $2, ExplodingTrap10
-	coord_event 0, $a, $3, ExplodingTrap11
-	coord_event 0, $a, $5, ExplodingTrap12
-	coord_event 0, $b, $2, ExplodingTrap13
-	coord_event 0, $b, $4, ExplodingTrap14
-	coord_event 0, $c, $1, ExplodingTrap15
-	coord_event 0, $c, $2, ExplodingTrap16
-	coord_event 0, $c, $4, ExplodingTrap17
-	coord_event 0, $c, $5, ExplodingTrap18
-	coord_event 0, $d, $1, ExplodingTrap19
-	coord_event 0, $d, $3, ExplodingTrap20
-	coord_event 0, $d, $4, ExplodingTrap21
-	coord_event 0, $d, $5, ExplodingTrap22
+	coord_event 2, 7, 0, ExplodingTrap1
+	coord_event 3, 7, 0, ExplodingTrap2
+	coord_event 4, 7, 0, ExplodingTrap3
+	coord_event 1, 8, 0, ExplodingTrap4
+	coord_event 3, 8, 0, ExplodingTrap5
+	coord_event 5, 8, 0, ExplodingTrap6
+	coord_event 3, 9, 0, ExplodingTrap7
+	coord_event 4, 9, 0, ExplodingTrap8
+	coord_event 1, 10, 0, ExplodingTrap9
+	coord_event 2, 10, 0, ExplodingTrap10
+	coord_event 3, 10, 0, ExplodingTrap11
+	coord_event 5, 10, 0, ExplodingTrap12
+	coord_event 2, 11, 0, ExplodingTrap13
+	coord_event 4, 11, 0, ExplodingTrap14
+	coord_event 1, 12, 0, ExplodingTrap15
+	coord_event 2, 12, 0, ExplodingTrap16
+	coord_event 4, 12, 0, ExplodingTrap17
+	coord_event 5, 12, 0, ExplodingTrap18
+	coord_event 1, 13, 0, ExplodingTrap19
+	coord_event 3, 13, 0, ExplodingTrap20
+	coord_event 4, 13, 0, ExplodingTrap21
+	coord_event 5, 13, 0, ExplodingTrap22
 
 .BGEvents:
 	db 9
-	bg_event 11, 19, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
-	bg_event 1, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 1, 6, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 15, 8, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 15, 22, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 5, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 11, 20, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
-	bg_event 11, 21, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
-	bg_event 11, 3, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
+	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
+	bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
+	bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
+	bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
-	object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
-	object_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
-	object_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
+	object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
+	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
+	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
+	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 12930b544..0ed2c67f0 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -915,63 +915,63 @@ TeamRocketBaseB2F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $e, $3, 2, TEAM_ROCKET_BASE_B1F
-	warp_def $2, $3, 1, TEAM_ROCKET_BASE_B3F
-	warp_def $2, $1b, 2, TEAM_ROCKET_BASE_B3F
-	warp_def $6, $3, 3, TEAM_ROCKET_BASE_B3F
-	warp_def $e, $1b, 4, TEAM_ROCKET_BASE_B3F
+	warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F
+	warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F
+	warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F
+	warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F
+	warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F
 
 .CoordEvents:
 	db 9
-	coord_event 0, $e, $5, LanceHealsScript1
-	coord_event 0, $d, $4, LanceHealsScript2
-	coord_event 1, $b, $e, UnknownScript_0x6cf95
-	coord_event 1, $b, $f, UnknownScript_0x6cf9c
-	coord_event 2, $c, $e, UnknownScript_0x6d075
-	coord_event 2, $c, $f, UnknownScript_0x6d075
-	coord_event 2, $3, $c, UnknownScript_0x6d07a
-	coord_event 2, $a, $c, UnknownScript_0x6d07a
-	coord_event 2, $b, $c, UnknownScript_0x6d07a
+	coord_event 5, 14, 0, LanceHealsScript1
+	coord_event 4, 13, 0, LanceHealsScript2
+	coord_event 14, 11, 1, UnknownScript_0x6cf95
+	coord_event 15, 11, 1, UnknownScript_0x6cf9c
+	coord_event 14, 12, 2, UnknownScript_0x6d075
+	coord_event 15, 12, 2, UnknownScript_0x6d075
+	coord_event 12, 3, 2, UnknownScript_0x6d07a
+	coord_event 12, 10, 2, UnknownScript_0x6d07a
+	coord_event 12, 11, 2, UnknownScript_0x6d07a
 
 .BGEvents:
 	db 23
-	bg_event 12, 14, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
-	bg_event 12, 15, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
-	bg_event 9, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 9, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 9, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 9, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 9, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 9, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 8, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 7, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 6, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 5, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 4, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 5, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 6, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 7, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 8, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 7, 26, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
+	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
+	bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
+	bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
 
 .ObjectEvents:
 	db 14
-	object_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
-	object_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
-	object_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	object_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
-	object_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
-	object_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
-	object_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
+	object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
+	object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
+	object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
+	object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
+	object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index f366f35aa..63729ce63 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -571,43 +571,43 @@ TeamRocketBaseB3F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $2, $3, 2, TEAM_ROCKET_BASE_B2F
-	warp_def $2, $1b, 3, TEAM_ROCKET_BASE_B2F
-	warp_def $6, $3, 4, TEAM_ROCKET_BASE_B2F
-	warp_def $e, $1b, 5, TEAM_ROCKET_BASE_B2F
+	warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F
+	warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F
+	warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F
+	warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F
 
 .CoordEvents:
 	db 3
-	coord_event 2, $8, $a, UnknownScript_0x6e04b
-	coord_event 2, $8, $b, UnknownScript_0x6e052
-	coord_event 1, $a, $8, RocketBaseRival
+	coord_event 10, 8, 2, UnknownScript_0x6e04b
+	coord_event 11, 8, 2, UnknownScript_0x6e052
+	coord_event 8, 10, 1, RocketBaseRival
 
 .BGEvents:
 	db 10
-	bg_event 9, 10, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 9, 11, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 1, 10, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 1, 11, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 1, 12, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 1, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 5, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 6, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 7, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
 
 .ObjectEvents:
 	db 14
-	object_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
-	object_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
-	object_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
-	object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
-	object_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
-	object_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
-	object_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
-	object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
+	object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
+	object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
+	object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
+	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
+	object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
+	object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
+	object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 03c22bad3..c24c1606a 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -59,8 +59,8 @@ TimeCapsule_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 4, POKECENTER_2F
-	warp_def $7, $5, 4, POKECENTER_2F
+	warp_def 4, 7, 4, POKECENTER_2F
+	warp_def 5, 7, 4, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -68,9 +68,9 @@ TimeCapsule_MapEventHeader:
 .BGEvents:
 	db 2
 	bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
-	bg_event 4, 5, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
+	bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
+	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
+	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 1d0340a0b..ab23a7b3e 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -528,9 +528,9 @@ TinTower1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $f, $9, 12, ECRUTEAK_CITY
-	warp_def $f, $a, 12, ECRUTEAK_CITY
-	warp_def $2, $a, 2, TIN_TOWER_2F
+	warp_def 9, 15, 12, ECRUTEAK_CITY
+	warp_def 10, 15, 12, ECRUTEAK_CITY
+	warp_def 10, 2, 2, TIN_TOWER_2F
 
 .CoordEvents:
 	db 0
@@ -540,13 +540,13 @@ TinTower1F_MapEventHeader:
 
 .ObjectEvents:
 	db 10
-	object_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
-	object_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
-	object_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
-	object_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
-	object_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
+	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
+	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
+	object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
+	object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm
index e572e6907..d980cc891 100644
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -11,8 +11,8 @@ TinTower2F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $e, $a, 1, TIN_TOWER_3F
-	warp_def $2, $a, 3, TIN_TOWER_1F
+	warp_def 10, 14, 1, TIN_TOWER_3F
+	warp_def 10, 2, 3, TIN_TOWER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index c3d36d9cf..7e6263538 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -17,8 +17,8 @@ TinTower3F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $e, $a, 1, TIN_TOWER_2F
-	warp_def $2, $10, 2, TIN_TOWER_4F
+	warp_def 10, 14, 1, TIN_TOWER_2F
+	warp_def 16, 2, 2, TIN_TOWER_4F
 
 .CoordEvents:
 	db 0
@@ -28,4 +28,4 @@ TinTower3F_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
+	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index e04404c5d..34d1be488 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -29,20 +29,20 @@ TinTower4F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $4, $2, 2, TIN_TOWER_5F
-	warp_def $2, $10, 2, TIN_TOWER_3F
-	warp_def $e, $2, 3, TIN_TOWER_5F
-	warp_def $f, $11, 4, TIN_TOWER_5F
+	warp_def 2, 4, 2, TIN_TOWER_5F
+	warp_def 16, 2, 2, TIN_TOWER_3F
+	warp_def 2, 14, 3, TIN_TOWER_5F
+	warp_def 17, 15, 4, TIN_TOWER_5F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 6, 11, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
+	bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
-	object_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
-	object_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
+	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
+	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index b3448203f..d8991932c 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -25,19 +25,19 @@ TinTower5F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $f, $b, 2, TIN_TOWER_6F
-	warp_def $4, $2, 1, TIN_TOWER_4F
-	warp_def $e, $2, 3, TIN_TOWER_4F
-	warp_def $f, $11, 4, TIN_TOWER_4F
+	warp_def 11, 15, 2, TIN_TOWER_6F
+	warp_def 2, 4, 1, TIN_TOWER_4F
+	warp_def 2, 14, 3, TIN_TOWER_4F
+	warp_def 17, 15, 4, TIN_TOWER_4F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 14, 16, BGEVENT_ITEM, TinTower5FHiddenFullRestore
-	bg_event 15, 3, BGEVENT_ITEM, TinTower5FHiddenCarbos
+	bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore
+	bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
+	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index 0d297498f..025ee8988 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -17,8 +17,8 @@ TinTower6F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $9, $3, 1, TIN_TOWER_7F
-	warp_def $f, $b, 1, TIN_TOWER_5F
+	warp_def 3, 9, 1, TIN_TOWER_7F
+	warp_def 11, 15, 1, TIN_TOWER_5F
 
 .CoordEvents:
 	db 0
@@ -28,4 +28,4 @@ TinTower6F_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
+	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index f7be3a5d8..981e247d1 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -17,11 +17,11 @@ TinTower7F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $3, 1, TIN_TOWER_6F
-	warp_def $f, $a, 1, TIN_TOWER_8F
-	warp_def $7, $c, 4, TIN_TOWER_7F
-	warp_def $3, $8, 3, TIN_TOWER_7F
-	warp_def $9, $6, 5, TIN_TOWER_9F
+	warp_def 3, 9, 1, TIN_TOWER_6F
+	warp_def 10, 15, 1, TIN_TOWER_8F
+	warp_def 12, 7, 4, TIN_TOWER_7F
+	warp_def 8, 3, 3, TIN_TOWER_7F
+	warp_def 6, 9, 5, TIN_TOWER_9F
 
 .CoordEvents:
 	db 0
@@ -31,4 +31,4 @@ TinTower7F_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
+	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index bdbdca1b7..d8413bd0b 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -25,12 +25,12 @@ TinTower8F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $5, $2, 2, TIN_TOWER_7F
-	warp_def $b, $2, 1, TIN_TOWER_9F
-	warp_def $7, $10, 2, TIN_TOWER_9F
-	warp_def $3, $a, 3, TIN_TOWER_9F
-	warp_def $f, $e, 6, TIN_TOWER_9F
-	warp_def $9, $6, 7, TIN_TOWER_9F
+	warp_def 2, 5, 2, TIN_TOWER_7F
+	warp_def 2, 11, 1, TIN_TOWER_9F
+	warp_def 16, 7, 2, TIN_TOWER_9F
+	warp_def 10, 3, 3, TIN_TOWER_9F
+	warp_def 14, 15, 6, TIN_TOWER_9F
+	warp_def 6, 9, 7, TIN_TOWER_9F
 
 .CoordEvents:
 	db 0
@@ -40,6 +40,6 @@ TinTower8F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
-	object_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
-	object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
+	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
+	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index 83431425c..5b3280474 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -27,13 +27,13 @@ TinTower9F_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $3, $c, 2, TIN_TOWER_8F
-	warp_def $5, $2, 3, TIN_TOWER_8F
-	warp_def $7, $c, 4, TIN_TOWER_8F
-	warp_def $9, $7, 1, TIN_TOWER_ROOF
-	warp_def $7, $10, 5, TIN_TOWER_7F
-	warp_def $d, $6, 5, TIN_TOWER_8F
-	warp_def $d, $8, 6, TIN_TOWER_8F
+	warp_def 12, 3, 2, TIN_TOWER_8F
+	warp_def 2, 5, 3, TIN_TOWER_8F
+	warp_def 12, 7, 4, TIN_TOWER_8F
+	warp_def 7, 9, 1, TIN_TOWER_ROOF
+	warp_def 16, 7, 5, TIN_TOWER_7F
+	warp_def 6, 13, 5, TIN_TOWER_8F
+	warp_def 8, 13, 6, TIN_TOWER_8F
 
 .CoordEvents:
 	db 0
@@ -43,4 +43,4 @@ TinTower9F_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
+	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 0a70a58ee..8d5eed029 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -50,7 +50,7 @@ TinTowerRoof_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $d, $9, 4, TIN_TOWER_9F
+	warp_def 9, 13, 4, TIN_TOWER_9F
 
 .CoordEvents:
 	db 0
@@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
+	object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 2f3589e16..18d55bd3a 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -17,8 +17,8 @@ TohjoFalls_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $d, 2, ROUTE_27
-	warp_def $f, $19, 3, ROUTE_27
+	warp_def 13, 15, 2, ROUTE_27
+	warp_def 25, 15, 3, ROUTE_27
 
 .CoordEvents:
 	db 0
@@ -28,4 +28,4 @@ TohjoFalls_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index ebd3d8a3a..fe9e43ce4 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -59,8 +59,8 @@ TradeCenter_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $4, 2, POKECENTER_2F
-	warp_def $7, $5, 2, POKECENTER_2F
+	warp_def 4, 7, 2, POKECENTER_2F
+	warp_def 5, 7, 2, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -68,9 +68,9 @@ TradeCenter_MapEventHeader:
 .BGEvents:
 	db 2
 	bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
-	bg_event 4, 5, BGEVENT_LEFT, MapTradeCenterSignpost1Script
+	bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
-	object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
+	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
+	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index d62a0673f..bcfb08bb0 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -143,23 +143,23 @@ TrainerHouse1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $d, $2, 3, VIRIDIAN_CITY
-	warp_def $d, $3, 3, VIRIDIAN_CITY
-	warp_def $2, $8, 1, TRAINER_HOUSE_B1F
+	warp_def 2, 13, 3, VIRIDIAN_CITY
+	warp_def 3, 13, 3, VIRIDIAN_CITY
+	warp_def 8, 2, 1, TRAINER_HOUSE_B1F
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 0, 5, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
-	bg_event 0, 7, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
-	bg_event 10, 7, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
+	bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
+	bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
+	bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
-	object_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
-	object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
-	object_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
-	object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
+	object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
+	object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
+	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
+	object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
+	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 43d3bcd38..c4219a991 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -175,16 +175,16 @@ TrainerHouseB1F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $4, $9, 3, TRAINER_HOUSE_1F
+	warp_def 9, 4, 3, TRAINER_HOUSE_1F
 
 .CoordEvents:
 	db 1
-	coord_event 0, $3, $7, TrainerHouseReceptionistScript
+	coord_event 7, 3, 0, TrainerHouseReceptionistScript
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 6bf10e6fa..557a478be 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -19,16 +19,16 @@ UndergroundPath_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+	warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
+	warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 9, 3, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
-	bg_event 19, 1, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
+	bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
+	bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
 
 .ObjectEvents:
 	db 0
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 54200c8d8..dfc9a9f65 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -205,10 +205,10 @@ UnionCave1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $13, $5, 3, UNION_CAVE_B1F
-	warp_def $21, $3, 4, UNION_CAVE_B1F
-	warp_def $1f, $11, 1, ROUTE_33
-	warp_def $3, $11, 4, ROUTE_32
+	warp_def 5, 19, 3, UNION_CAVE_B1F
+	warp_def 3, 33, 4, UNION_CAVE_B1F
+	warp_def 17, 31, 1, ROUTE_33
+	warp_def 17, 3, 4, ROUTE_32
 
 .CoordEvents:
 	db 0
@@ -218,12 +218,12 @@ UnionCave1F_MapEventHeader:
 
 .ObjectEvents:
 	db 9
-	object_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
-	object_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
-	object_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
-	object_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
-	object_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
-	object_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
-	object_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
-	object_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
-	object_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
+	object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
+	object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
+	object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
+	object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
+	object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
+	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
+	object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
+	object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
+	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index e3c7ac5f0..b232aa6e4 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -158,11 +158,11 @@ UnionCaveB1F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $3, $3, 7, RUINS_OF_ALPH_OUTSIDE
-	warp_def $b, $3, 8, RUINS_OF_ALPH_OUTSIDE
-	warp_def $13, $7, 1, UNION_CAVE_1F
-	warp_def $21, $3, 2, UNION_CAVE_1F
-	warp_def $1f, $11, 1, UNION_CAVE_B2F
+	warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
+	warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
+	warp_def 7, 19, 1, UNION_CAVE_1F
+	warp_def 3, 33, 2, UNION_CAVE_1F
+	warp_def 17, 31, 1, UNION_CAVE_B2F
 
 .CoordEvents:
 	db 0
@@ -172,10 +172,10 @@ UnionCaveB1F_MapEventHeader:
 
 .ObjectEvents:
 	db 7
-	object_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
-	object_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
-	object_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
-	object_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
-	object_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
-	object_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
-	object_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
+	object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
+	object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
+	object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
+	object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
+	object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
+	object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
+	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index b08424670..8aa4ddd5e 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -147,7 +147,7 @@ UnionCaveB2F_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $3, $5, 5, UNION_CAVE_B1F
+	warp_def 5, 3, 5, UNION_CAVE_B1F
 
 .CoordEvents:
 	db 0
@@ -157,9 +157,9 @@ UnionCaveB2F_MapEventHeader:
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
-	object_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
-	object_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
-	object_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
-	object_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
-	object_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
+	object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
+	object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
+	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
+	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
+	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
+	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index e9a683162..90baf28b0 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -273,36 +273,36 @@ VermilionCity_MapEventHeader:
 
 .Warps:
 	db 10
-	warp_def $5, $5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE
-	warp_def $5, $9, 1, VERMILION_POKECENTER_1F
-	warp_def $d, $7, 1, POKEMON_FAN_CLUB
-	warp_def $d, $d, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
-	warp_def $d, $15, 2, VERMILION_MART
-	warp_def $11, $15, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE
-	warp_def $13, $a, 1, VERMILION_GYM
-	warp_def $1f, $13, 1, VERMILION_PORT_PASSAGE
-	warp_def $1f, $14, 2, VERMILION_PORT_PASSAGE
-	warp_def $7, $22, 1, DIGLETTS_CAVE
+	warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE
+	warp_def 9, 5, 1, VERMILION_POKECENTER_1F
+	warp_def 7, 13, 1, POKEMON_FAN_CLUB
+	warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
+	warp_def 21, 13, 2, VERMILION_MART
+	warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE
+	warp_def 10, 19, 1, VERMILION_GYM
+	warp_def 19, 31, 1, VERMILION_PORT_PASSAGE
+	warp_def 20, 31, 2, VERMILION_PORT_PASSAGE
+	warp_def 34, 7, 1, DIGLETTS_CAVE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 8
-	bg_event 3, 25, BGEVENT_READ, VermilionCitySign
-	bg_event 19, 5, BGEVENT_READ, VermilionGymSign
-	bg_event 13, 5, BGEVENT_READ, PokemonFanClubSign
-	bg_event 9, 33, BGEVENT_READ, VermilionCityDiglettsCaveSign
-	bg_event 15, 27, BGEVENT_READ, VermilionCityPortSign
-	bg_event 5, 10, BGEVENT_READ, VermilionCityPokecenterSign
-	bg_event 13, 22, BGEVENT_READ, VermilionCityMartSign
-	bg_event 19, 12, BGEVENT_ITEM, VermilionCityHiddenFullHeal
+	bg_event 25, 3, BGEVENT_READ, VermilionCitySign
+	bg_event 5, 19, BGEVENT_READ, VermilionGymSign
+	bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
+	bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign
+	bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign
+	bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign
+	bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
+	bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
-	object_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
-	object_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
-	object_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
-	object_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
-	object_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1
+	object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
+	object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
+	object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
+	object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
+	object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
+	object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 3bd2a6590..7c86eba76 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -266,36 +266,36 @@ VermilionGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 7, VERMILION_CITY
-	warp_def $11, $5, 7, VERMILION_CITY
+	warp_def 4, 17, 7, VERMILION_CITY
+	warp_def 5, 17, 7, VERMILION_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 17
-	bg_event 7, 1, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 3, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 5, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
 	bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 1, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 3, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 5, BGEVENT_READ, MapVermilionGymSignpost14Script
 	bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
 	bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 11, 1, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 11, 3, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 11, 5, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 11, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 11, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 15, 3, BGEVENT_READ, VermilionGymStatue
-	bg_event 15, 6, BGEVENT_READ, VermilionGymStatue
+	bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
+	bg_event 6, 15, BGEVENT_READ, VermilionGymStatue
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
-	object_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
-	object_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
-	object_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
-	object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
+	object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
+	object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
+	object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
+	object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
+	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
index 0901e7670..5682dc084 100644
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
@@ -26,8 +26,8 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 6, VERMILION_CITY
-	warp_def $7, $3, 6, VERMILION_CITY
+	warp_def 2, 7, 6, VERMILION_CITY
+	warp_def 3, 7, 6, VERMILION_CITY
 
 .CoordEvents:
 	db 0
@@ -37,4 +37,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1
+	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm
index 58a058aa1..c2d3fd2f2 100644
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionHouseFishingSpeechHouse.asm
@@ -56,16 +56,16 @@ VermilionHouseFishingSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, VERMILION_CITY
-	warp_def $7, $3, 1, VERMILION_CITY
+	warp_def 2, 7, 1, VERMILION_CITY
+	warp_def 3, 7, 1, VERMILION_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 1
-	bg_event 0, 3, BGEVENT_READ, FishingDudesHousePhoto
+	bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
+	object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index 7c5359ae3..d1eae85c3 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -39,18 +39,18 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, VERMILION_CITY
-	warp_def $7, $3, 4, VERMILION_CITY
+	warp_def 2, 7, 4, VERMILION_CITY
+	warp_def 3, 7, 4, VERMILION_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 1, 0, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
-	object_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
+	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
+	object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 0825c71d8..87cb81e66 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -42,8 +42,8 @@ VermilionMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 5, VERMILION_CITY
-	warp_def $7, $3, 5, VERMILION_CITY
+	warp_def 2, 7, 5, VERMILION_CITY
+	warp_def 3, 7, 5, VERMILION_CITY
 
 .CoordEvents:
 	db 0
@@ -53,6 +53,6 @@ VermilionMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
-	object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
-	object_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
+	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
+	object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 3cc524994..354716b85 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -82,9 +82,9 @@ VermilionPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 2, VERMILION_CITY
-	warp_def $7, $4, 2, VERMILION_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 2, VERMILION_CITY
+	warp_def 4, 7, 2, VERMILION_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -94,7 +94,7 @@ VermilionPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
-	object_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
-	object_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
-	object_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
+	object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
+	object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
+	object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index 0fa256231..281198a7d 100644
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ VermilionPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, VERMILION_POKECENTER_1F
+	warp_def 0, 7, 3, VERMILION_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 011f1560e..8d7af46a8 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -305,19 +305,19 @@ VermilionPort_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $5, $9, 5, VERMILION_PORT_PASSAGE
-	warp_def $11, $7, 1, FAST_SHIP_1F
+	warp_def 9, 5, 5, VERMILION_PORT_PASSAGE
+	warp_def 7, 17, 1, FAST_SHIP_1F
 
 .CoordEvents:
 	db 1
-	coord_event 0, $b, $7, UnknownScript_0x74e20
+	coord_event 7, 11, 0, UnknownScript_0x74e20
 
 .BGEvents:
 	db 1
-	bg_event 13, 16, BGEVENT_ITEM, VermilionPortHiddenIron
+	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	object_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
-	object_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
+	object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+	object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
+	object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 1b6aa8ac1..e728d387a 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -24,11 +24,11 @@ VermilionPortPassage_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $0, $f, 8, VERMILION_CITY
-	warp_def $0, $10, 9, VERMILION_CITY
-	warp_def $4, $f, 4, VERMILION_PORT_PASSAGE
-	warp_def $2, $3, 3, VERMILION_PORT_PASSAGE
-	warp_def $e, $3, 1, VERMILION_PORT
+	warp_def 15, 0, 8, VERMILION_CITY
+	warp_def 16, 0, 9, VERMILION_CITY
+	warp_def 15, 4, 4, VERMILION_PORT_PASSAGE
+	warp_def 3, 2, 3, VERMILION_PORT_PASSAGE
+	warp_def 3, 14, 1, VERMILION_PORT
 
 .CoordEvents:
 	db 0
@@ -38,4 +38,4 @@ VermilionPortPassage_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
+	object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index a2533a2ed..ef8bd3ead 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -246,32 +246,32 @@ VictoryRoad_MapEventHeader:
 
 .Warps:
 	db 10
-	warp_def $43, $9, 5, VICTORY_ROAD_GATE
-	warp_def $31, $1, 3, VICTORY_ROAD
-	warp_def $23, $1, 2, VICTORY_ROAD
-	warp_def $1f, $d, 5, VICTORY_ROAD
-	warp_def $11, $d, 4, VICTORY_ROAD
-	warp_def $21, $11, 7, VICTORY_ROAD
-	warp_def $13, $11, 6, VICTORY_ROAD
-	warp_def $b, $0, 9, VICTORY_ROAD
-	warp_def $1b, $0, 8, VICTORY_ROAD
-	warp_def $5, $d, 3, ROUTE_23
+	warp_def 9, 67, 5, VICTORY_ROAD_GATE
+	warp_def 1, 49, 3, VICTORY_ROAD
+	warp_def 1, 35, 2, VICTORY_ROAD
+	warp_def 13, 31, 5, VICTORY_ROAD
+	warp_def 13, 17, 4, VICTORY_ROAD
+	warp_def 17, 33, 7, VICTORY_ROAD
+	warp_def 17, 19, 6, VICTORY_ROAD
+	warp_def 0, 11, 9, VICTORY_ROAD
+	warp_def 0, 27, 8, VICTORY_ROAD
+	warp_def 13, 5, 3, ROUTE_23
 
 .CoordEvents:
 	db 2
-	coord_event 0, $8, $c, UnknownScript_0x74492
-	coord_event 0, $8, $d, UnknownScript_0x744b5
+	coord_event 12, 8, 0, UnknownScript_0x74492
+	coord_event 13, 8, 0, UnknownScript_0x744b5
 
 .BGEvents:
 	db 2
-	bg_event 29, 3, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
-	bg_event 65, 3, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
+	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
+	bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
-	object_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
-	object_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
-	object_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
-	object_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
-	object_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
+	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
+	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
+	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
+	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
+	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
+	object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 10bc70b99..95011fd5e 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -103,24 +103,24 @@ VictoryRoadGate_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $7, $11, 1, ROUTE_22
-	warp_def $7, $12, 1, ROUTE_22
-	warp_def $11, $9, 1, ROUTE_26
-	warp_def $11, $a, 1, ROUTE_26
-	warp_def $0, $9, 1, VICTORY_ROAD
-	warp_def $0, $a, 1, VICTORY_ROAD
-	warp_def $7, $1, 2, ROUTE_28
-	warp_def $7, $2, 2, ROUTE_28
+	warp_def 17, 7, 1, ROUTE_22
+	warp_def 18, 7, 1, ROUTE_22
+	warp_def 9, 17, 1, ROUTE_26
+	warp_def 10, 17, 1, ROUTE_26
+	warp_def 9, 0, 1, VICTORY_ROAD
+	warp_def 10, 0, 1, VICTORY_ROAD
+	warp_def 1, 7, 2, ROUTE_28
+	warp_def 2, 7, 2, ROUTE_28
 
 .CoordEvents:
 	db 1
-	coord_event 0, $b, $a, VictoryRoadGateBadgeCheckScene
+	coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
-	object_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
-	object_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
+	object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
+	object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
+	object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index e6ff519a4..34939ff3e 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -284,36 +284,36 @@ VioletCity_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $11, $9, 2, VIOLET_MART
-	warp_def $11, $12, 1, VIOLET_GYM
-	warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY
-	warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE
-	warp_def $19, $1f, 1, VIOLET_POKECENTER_1F
-	warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE
-	warp_def $5, $17, 1, SPROUT_TOWER_1F
-	warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE
-	warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE
+	warp_def 9, 17, 2, VIOLET_MART
+	warp_def 18, 17, 1, VIOLET_GYM
+	warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY
+	warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE
+	warp_def 31, 25, 1, VIOLET_POKECENTER_1F
+	warp_def 21, 29, 1, VIOLET_KYLES_HOUSE
+	warp_def 23, 5, 1, SPROUT_TOWER_1F
+	warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE
+	warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 7
-	bg_event 20, 24, BGEVENT_READ, VioletCitySign
-	bg_event 17, 15, BGEVENT_READ, VioletGymSign
-	bg_event  8, 24, BGEVENT_READ, SproutTowerSign
-	bg_event 17, 27, BGEVENT_READ, EarlsPokemonAcademySign
-	bg_event 25, 32, BGEVENT_READ, VioletCityPokecenterSign
-	bg_event 17, 10, BGEVENT_READ, VioletCityMartSign
-	bg_event 14, 37, BGEVENT_ITEM, VioletCityHiddenHyperPotion
+	bg_event 24, 20, BGEVENT_READ, VioletCitySign
+	bg_event 15, 17, BGEVENT_READ, VioletGymSign
+	bg_event 24, 8, BGEVENT_READ, SproutTowerSign
+	bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign
+	bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign
+	bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
+	bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion
 
 .ObjectEvents:
 	db 8
-	object_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
-	object_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
-	object_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
-	object_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
-	object_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
-	object_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
-	object_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
-	object_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
+	object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
+	object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
+	object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
+	object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
+	object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
+	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
+	object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
+	object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 239cdcd7a..84effea16 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -287,20 +287,20 @@ VioletGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 2, VIOLET_CITY
-	warp_def $f, $5, 2, VIOLET_CITY
+	warp_def 4, 15, 2, VIOLET_CITY
+	warp_def 5, 15, 2, VIOLET_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 13, 3, BGEVENT_READ, VioletGymStatue
-	bg_event 13, 6, BGEVENT_READ, VioletGymStatue
+	bg_event 3, 13, BGEVENT_READ, VioletGymStatue
+	bg_event 6, 13, BGEVENT_READ, VioletGymStatue
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
-	object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
-	object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
-	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
+	object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
+	object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
+	object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
+	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index fb3bfc5d5..2fa0e84b3 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -38,8 +38,8 @@ VioletKylesHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 6, VIOLET_CITY
-	warp_def $7, $4, 6, VIOLET_CITY
+	warp_def 3, 7, 6, VIOLET_CITY
+	warp_def 4, 7, 6, VIOLET_CITY
 
 .CoordEvents:
 	db 0
@@ -49,5 +49,5 @@ VioletKylesHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
-	object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
+	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
+	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index c28c00869..ffb19d838 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -54,8 +54,8 @@ VioletMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, VIOLET_CITY
-	warp_def $7, $3, 1, VIOLET_CITY
+	warp_def 2, 7, 1, VIOLET_CITY
+	warp_def 3, 7, 1, VIOLET_CITY
 
 .CoordEvents:
 	db 0
@@ -65,6 +65,6 @@ VioletMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
-	object_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
-	object_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
+	object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
+	object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 14cdb7c0f..ae047457a 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -50,8 +50,8 @@ VioletNicknameSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 4, VIOLET_CITY
-	warp_def $7, $4, 4, VIOLET_CITY
+	warp_def 3, 7, 4, VIOLET_CITY
+	warp_def 4, 7, 4, VIOLET_CITY
 
 .CoordEvents:
 	db 0
@@ -61,6 +61,6 @@ VioletNicknameSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
-	object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
-	object_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
+	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
+	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
+	object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 8ddef8239..e4c6e8df6 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -221,9 +221,9 @@ VioletPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, VIOLET_CITY
-	warp_def $7, $4, 5, VIOLET_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 5, VIOLET_CITY
+	warp_def 4, 7, 5, VIOLET_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -233,8 +233,8 @@ VioletPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 5
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
-	object_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
-	object_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
-	object_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
-	object_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
+	object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
+	object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
+	object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
+	object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index df827c91a..5b5e077cb 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -221,11 +221,11 @@ ViridianCity_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $20, 1, VIRIDIAN_GYM
-	warp_def $9, $15, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
-	warp_def $f, $17, 1, TRAINER_HOUSE_1F
-	warp_def $13, $1d, 2, VIRIDIAN_MART
-	warp_def $19, $17, 1, VIRIDIAN_POKECENTER_1F
+	warp_def 32, 7, 1, VIRIDIAN_GYM
+	warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
+	warp_def 23, 15, 1, TRAINER_HOUSE_1F
+	warp_def 29, 19, 2, VIRIDIAN_MART
+	warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F
 
 .CoordEvents:
 	db 0
@@ -233,15 +233,15 @@ ViridianCity_MapEventHeader:
 .BGEvents:
 	db 6
 	bg_event 17, 17, BGEVENT_READ, ViridianCitySign
-	bg_event 7, 27, BGEVENT_READ, ViridianGymSign
-	bg_event 1, 19, BGEVENT_READ, ViridianCityWelcomeSign
-	bg_event 15, 21, BGEVENT_READ, TrainerHouseSign
-	bg_event 25, 24, BGEVENT_READ, ViridianCityPokecenterSign
-	bg_event 19, 30, BGEVENT_READ, ViridianCityMartSign
+	bg_event 27, 7, BGEVENT_READ, ViridianGymSign
+	bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign
+	bg_event 21, 15, BGEVENT_READ, TrainerHouseSign
+	bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign
+	bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1
-	object_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1
-	object_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1
-	object_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1
+	object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1
+	object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1
+	object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1
+	object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 3be7a126e..bf6a99290 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -175,18 +175,18 @@ ViridianGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 1, VIRIDIAN_CITY
-	warp_def $11, $5, 1, VIRIDIAN_CITY
+	warp_def 4, 17, 1, VIRIDIAN_CITY
+	warp_def 5, 17, 1, VIRIDIAN_CITY
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 2
-	bg_event 13, 3, BGEVENT_READ, ViridianGymStatue
-	bg_event 13, 6, BGEVENT_READ, ViridianGymStatue
+	bg_event 3, 13, BGEVENT_READ, ViridianGymStatue
+	bg_event 6, 13, BGEVENT_READ, ViridianGymStatue
 
 .ObjectEvents:
 	db 2
-	object_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
-	object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
+	object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
+	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index c2235496a..049ee3e35 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -42,8 +42,8 @@ ViridianMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, VIRIDIAN_CITY
-	warp_def $7, $3, 4, VIRIDIAN_CITY
+	warp_def 2, 7, 4, VIRIDIAN_CITY
+	warp_def 3, 7, 4, VIRIDIAN_CITY
 
 .CoordEvents:
 	db 0
@@ -53,6 +53,6 @@ ViridianMart_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
-	object_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
-	object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
+	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
+	object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
+	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index f5df4ad2f..8403fbc1c 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -67,8 +67,8 @@ ViridianNicknameSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, VIRIDIAN_CITY
-	warp_def $7, $3, 2, VIRIDIAN_CITY
+	warp_def 2, 7, 2, VIRIDIAN_CITY
+	warp_def 3, 7, 2, VIRIDIAN_CITY
 
 .CoordEvents:
 	db 0
@@ -78,7 +78,7 @@ ViridianNicknameSpeechHouse_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
-	object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
-	object_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
-	object_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
+	object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
+	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
+	object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
+	object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 213e64962..54ca8d696 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -77,9 +77,9 @@ ViridianPokecenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, VIRIDIAN_CITY
-	warp_def $7, $4, 5, VIRIDIAN_CITY
-	warp_def $7, $0, 1, POKECENTER_2F
+	warp_def 3, 7, 5, VIRIDIAN_CITY
+	warp_def 4, 7, 5, VIRIDIAN_CITY
+	warp_def 0, 7, 1, POKECENTER_2F
 
 .CoordEvents:
 	db 0
@@ -89,7 +89,7 @@ ViridianPokecenter1F_MapEventHeader:
 
 .ObjectEvents:
 	db 4
-	object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
-	object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
-	object_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
-	object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
+	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
+	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
+	object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
+	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index 037160cb3..2b119c1bb 100644
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -11,7 +11,7 @@ ViridianPokecenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, VIRIDIAN_POKECENTER_1F
+	warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index be315317c..011b0ac8f 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -49,30 +49,30 @@ WhirlIslandB1F_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $5, $5, 2, WHIRL_ISLAND_NW
-	warp_def $3, $23, 2, WHIRL_ISLAND_NE
-	warp_def $9, $1d, 3, WHIRL_ISLAND_NE
-	warp_def $1f, $9, 3, WHIRL_ISLAND_SW
-	warp_def $1f, $17, 2, WHIRL_ISLAND_SW
-	warp_def $1d, $1f, 2, WHIRL_ISLAND_SE
-	warp_def $15, $19, 1, WHIRL_ISLAND_B2F
-	warp_def $1b, $d, 2, WHIRL_ISLAND_B2F
-	warp_def $15, $11, 1, WHIRL_ISLAND_CAVE
+	warp_def 5, 5, 2, WHIRL_ISLAND_NW
+	warp_def 35, 3, 2, WHIRL_ISLAND_NE
+	warp_def 29, 9, 3, WHIRL_ISLAND_NE
+	warp_def 9, 31, 3, WHIRL_ISLAND_SW
+	warp_def 23, 31, 2, WHIRL_ISLAND_SW
+	warp_def 31, 29, 2, WHIRL_ISLAND_SE
+	warp_def 25, 21, 1, WHIRL_ISLAND_B2F
+	warp_def 13, 27, 2, WHIRL_ISLAND_B2F
+	warp_def 17, 21, 1, WHIRL_ISLAND_CAVE
 
 .CoordEvents:
 	db 0
 
 .BGEvents:
 	db 3
-	bg_event 4, 30, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
-	bg_event 18, 36, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
-	bg_event 23, 2, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
+	bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
+	bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
+	bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
-	object_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
-	object_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
-	object_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
-	object_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
-	object_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1
+	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
+	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
+	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
+	object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
+	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
+	object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index c8cda6d8f..34632a517 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -25,10 +25,10 @@ WhirlIslandB2F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $5, $b, 7, WHIRL_ISLAND_B1F
-	warp_def $b, $7, 8, WHIRL_ISLAND_B1F
-	warp_def $19, $7, 1, WHIRL_ISLAND_LUGIA_CHAMBER
-	warp_def $1f, $d, 5, WHIRL_ISLAND_SW
+	warp_def 11, 5, 7, WHIRL_ISLAND_B1F
+	warp_def 7, 11, 8, WHIRL_ISLAND_B1F
+	warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
+	warp_def 13, 31, 5, WHIRL_ISLAND_SW
 
 .CoordEvents:
 	db 0
@@ -38,6 +38,6 @@ WhirlIslandB2F_MapEventHeader:
 
 .ObjectEvents:
 	db 3
-	object_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
-	object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
-	object_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
+	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
+	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm
index c46746119..4c3af9b8c 100644
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -11,8 +11,8 @@ WhirlIslandCave_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $5, $7, 9, WHIRL_ISLAND_B1F
-	warp_def $d, $3, 4, WHIRL_ISLAND_NW
+	warp_def 7, 5, 9, WHIRL_ISLAND_B1F
+	warp_def 3, 13, 4, WHIRL_ISLAND_NW
 
 .CoordEvents:
 	db 0
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index 86402b6ab..39285cc15 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -49,7 +49,7 @@ WhirlIslandLugiaChamber_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $d, $9, 3, WHIRL_ISLAND_B2F
+	warp_def 9, 13, 3, WHIRL_ISLAND_B2F
 
 .CoordEvents:
 	db 0
@@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
+	object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index fa3b019fd..7ed3e883c 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -17,9 +17,9 @@ WhirlIslandNE_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $d, $3, 2, ROUTE_41
-	warp_def $3, $11, 2, WHIRL_ISLAND_B1F
-	warp_def $b, $d, 3, WHIRL_ISLAND_B1F
+	warp_def 3, 13, 2, ROUTE_41
+	warp_def 17, 3, 2, WHIRL_ISLAND_B1F
+	warp_def 13, 11, 3, WHIRL_ISLAND_B1F
 
 .CoordEvents:
 	db 0
@@ -29,4 +29,4 @@ WhirlIslandNE_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
+	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm
index ce64f2154..ed40fe8d5 100644
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -11,10 +11,10 @@ WhirlIslandNW_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $5, 1, ROUTE_41
-	warp_def $3, $5, 1, WHIRL_ISLAND_B1F
-	warp_def $f, $3, 4, WHIRL_ISLAND_SW
-	warp_def $f, $7, 2, WHIRL_ISLAND_CAVE
+	warp_def 5, 7, 1, ROUTE_41
+	warp_def 5, 3, 1, WHIRL_ISLAND_B1F
+	warp_def 3, 15, 4, WHIRL_ISLAND_SW
+	warp_def 7, 15, 2, WHIRL_ISLAND_CAVE
 
 .CoordEvents:
 	db 0
diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm
index 7e03568d1..edc3aa418 100644
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -11,8 +11,8 @@ WhirlIslandSE_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $5, 4, ROUTE_41
-	warp_def $3, $5, 6, WHIRL_ISLAND_B1F
+	warp_def 5, 13, 4, ROUTE_41
+	warp_def 5, 3, 6, WHIRL_ISLAND_B1F
 
 .CoordEvents:
 	db 0
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index c66f05245..e1c212d75 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -17,11 +17,11 @@ WhirlIslandSW_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $5, 3, ROUTE_41
-	warp_def $3, $11, 5, WHIRL_ISLAND_B1F
-	warp_def $3, $3, 4, WHIRL_ISLAND_B1F
-	warp_def $f, $3, 3, WHIRL_ISLAND_NW
-	warp_def $f, $11, 4, WHIRL_ISLAND_B2F
+	warp_def 5, 7, 3, ROUTE_41
+	warp_def 17, 3, 5, WHIRL_ISLAND_B1F
+	warp_def 3, 3, 4, WHIRL_ISLAND_B1F
+	warp_def 3, 15, 3, WHIRL_ISLAND_NW
+	warp_def 17, 15, 4, WHIRL_ISLAND_B2F
 
 .CoordEvents:
 	db 0
@@ -31,4 +31,4 @@ WhirlIslandSW_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
+	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 55b132356..d72451638 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -134,9 +134,9 @@ WillsRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $11, $5, 4, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def $2, $4, 1, KOGAS_ROOM
-	warp_def $2, $5, 2, KOGAS_ROOM
+	warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
+	warp_def 4, 2, 1, KOGAS_ROOM
+	warp_def 5, 2, 2, KOGAS_ROOM
 
 .CoordEvents:
 	db 0
@@ -146,4 +146,4 @@ WillsRoom_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
+	object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 593638297..ab072fb36 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -350,22 +350,22 @@ WiseTriosRoom_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $4, $7, 4, ECRUTEAK_CITY
-	warp_def $5, $7, 5, ECRUTEAK_CITY
-	warp_def $4, $1, 5, ECRUTEAK_HOUSE
+	warp_def 7, 4, 4, ECRUTEAK_CITY
+	warp_def 7, 5, 5, ECRUTEAK_CITY
+	warp_def 1, 4, 5, ECRUTEAK_HOUSE
 
 .CoordEvents:
 	db 1
-	coord_event 0, $4, $7, UnknownScript_0x985a3
+	coord_event 7, 4, 0, UnknownScript_0x985a3
 
 .BGEvents:
 	db 0
 
 .ObjectEvents:
 	db 6
-	object_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
diff --git a/wram.asm b/wram.asm
index 963edbb73..de6301173 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2794,7 +2794,7 @@ wPokeAnimGraphicStartTile:: db
 wPokeAnimCoord:: dw
 wPokeAnimFrontpicHeight:: db
 ; PokeAnim Data
-wPokeAnimExtraFlag:: db
+wPokeAnimIdleFlag:: db
 wPokeAnimSpeed:: db
 wPokeAnimPointerBank:: db
 wPokeAnimPointerAddr:: dw