Merge pull request #309 from PikalaxALT/master

Wild data, save functions, fix missing include

audio/engine.asm

@@ -805,7 +805,7 @@ LoadNote: ; e83d1
 
 Functione8466: ; e8466
 ; handle vibrato and other things
-; unknowns: wc292, $c294
+; unknowns: wc292, wc294
 	ld hl, Channel1Flags2 - Channel1
 	add hl, bc
 	bit 2, [hl]

battle/core.asm

@@ -2365,7 +2365,7 @@ Function3cf14: ; 3cf14
 	ld de, SFX_KINESIS
 	call PlaySFX
 	call Function3d432
-	ld de, SFX_UNKNOWN_2A
+	ld de, SFX_FAINT
 	call PlaySFX
 	hlcoord 1, 0
 	lb bc, 4, 10
@@ -4388,7 +4388,7 @@ Function3dc5b: ; 3dc5b
 	ld de, SFX_KINESIS
 	call PlaySFX
 	call WaitSFX
-	ld de, SFX_UNKNOWN_2A
+	ld de, SFX_FAINT
 	call PlaySFX
 	call WaitSFX
 	call Function3d432
@@ -8441,7 +8441,7 @@ Function3f54e: ; 3f54e
 	ld a, [OtherTrainerClass]
 	and a
 	jr nz, .asm_3f55a
-	ld a, [wd22e]
+	ld a, [TempWildMonSpecies]
 	ld [CurPartySpecies], a
 
 .asm_3f55a
@@ -8658,7 +8658,7 @@ Function3f6d0: ; 3f6d0
 	ld [IsInBattle], a
 	ld [BattleType], a
 	ld [AttackMissed], a
-	ld [wd22e], a
+	ld [TempWildMonSpecies], a
 	ld [OtherTrainerClass], a
 	ld [wd266], a
 	ld [wd267], a
@@ -8824,9 +8824,9 @@ Function3f836: ; 3f836
 	call GetSRAMBank
 	call Function3f85f
 	call CloseSRAM
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	xor a
-	ld bc, $0168
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	call Function3200
 	ld b, $8

battle/effect_commands.asm

@@ -6448,7 +6448,7 @@ BattleCommand8c: ; 363b8
 	jp BattleTextBox
 
 .stat
-	TX_FAR UnknownText_0x1c0cc6
+	text_jump UnknownText_0x1c0cc6
 	start_asm
 
 	ld hl, .up
@@ -6459,11 +6459,11 @@ BattleCommand8c: ; 363b8
 	ret
 
 .wayup
-	TX_FAR UnknownText_0x1c0cd0
+	text_jump UnknownText_0x1c0cd0
 	db "@"
 
 .up
-	TX_FAR UnknownText_0x1c0ce0
+	text_jump UnknownText_0x1c0ce0
 	db "@"
 
 ; 363e9
@@ -6482,7 +6482,7 @@ BattleCommand8d: ; 363e9
 	jp BattleTextBox
 
 .stat
-	TX_FAR UnknownText_0x1c0ceb
+	text_jump UnknownText_0x1c0ceb
 	start_asm
 
 	ld hl, .fell
@@ -6493,10 +6493,10 @@ BattleCommand8d: ; 363e9
 	ret
 
 .sharplyfell
-	TX_FAR UnknownText_0x1c0cf5
+	text_jump UnknownText_0x1c0cf5
 	db "@"
 .fell
-	TX_FAR UnknownText_0x1c0d06
+	text_jump UnknownText_0x1c0d06
 	db "@"
 
 ; 3641a
@@ -7804,7 +7804,7 @@ BattleCommand39: ; 36b4d
 	jp EndMoveEffect
 
 .UsedText
-	TX_FAR UnknownText_0x1c0d0e ; "[USER]"
+	text_jump UnknownText_0x1c0d0e ; "[USER]"
 	start_asm
 
 	ld a, BATTLE_VARS_MOVE_ANIM
@@ -7837,32 +7837,32 @@ BattleCommand39: ; 36b4d
 
 .RazorWind
 ; 'made a whirlwind!'
-	TX_FAR UnknownText_0x1c0d12
+	text_jump UnknownText_0x1c0d12
 	db "@"
 
 .Solarbeam
 ; 'took in sunlight!'
-	TX_FAR UnknownText_0x1c0d26
+	text_jump UnknownText_0x1c0d26
 	db "@"
 
 .SkullBash
 ; 'lowered its head!'
-	TX_FAR UnknownText_0x1c0d3a
+	text_jump UnknownText_0x1c0d3a
 	db "@"
 
 .SkyAttack
 ; 'is glowing!'
-	TX_FAR UnknownText_0x1c0d4e
+	text_jump UnknownText_0x1c0d4e
 	db "@"
 
 .Fly
 ; 'flew up high!'
-	TX_FAR UnknownText_0x1c0d5c
+	text_jump UnknownText_0x1c0d5c
 	db "@"
 
 .Dig
 ; 'dug a hole!'
-	TX_FAR UnknownText_0x1c0d6c
+	text_jump UnknownText_0x1c0d6c
 	db "@"
 ; 36c2c
 

constants.asm

@@ -25,3 +25,4 @@ INCLUDE "constants/pokemon_data_constants.asm"
 INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/std_constants.asm"
 INCLUDE "constants/deco_constants.asm"
+INCLUDE "constants/radio_constants.asm"

constants/deco_constants.asm

@@ -1,105 +1,105 @@
-const_value = 1
-	const DECO_PLANT
-	const DECO_BED
-	const DECO_CARPET
-	const DECO_POSTER
-	const DECO_DOLL
-	const DECO_BIGDOLL
-
-const_value = 1
-	const PUT_IT_AWAY
-	const MAGNAPLANT
-	const TROPICPLANT
-	const JUMBOPLANT
-	const TOWN_MAP_D
-	const FAMICOM
-	const SUPER_NES
-	const NINTENDO_64
-	const VIRTUAL_BOY
-	const GOLD_TROPHY
-	const SILVER_TROPHY
-	const SURF_PIKA_DOLL
-	const _BED
-	const _CARPET
-	const _POSTER
-	const _DOLL
-	const BIG_
-	const FEATHERY_BED
-	const PIKACHU_BED
-	const PINK_BED
-	const POLKADOT_BED
-	const RED_CARPET
-	const BLUE_CARPET
-	const YELLOW_CARPET
-	const GREEN_CARPET
-
-const_value = 1
-	const SET_UP_BED
-	const PUT_AWAY_BED
-	const SET_UP_CARPET
-	const PUT_AWAY_CARPET
-	const SET_UP_PLANT
-	const PUT_AWAY_PLANT
-	const SET_UP_POSTER
-	const PUT_AWAY_POSTER
-	const SET_UP_CONSOLE
-	const PUT_AWAY_CONSOLE
-	const SET_UP_BIG_DOLL
-	const PUT_AWAY_BIG_DOLL
-	const SET_UP_DOLL
-	const PUT_AWAY_DOLL
-	const SET_UP_ORNAMENT
-	const PUT_AWAY_ORNAMENT
-
-const_value = 2
-	const DECO_FEATHERY_BED ; 2
-	const DECO_PINK_BED ; 3
-	const DECO_POLKADOT_BED ; 4
-	const DECO_PIKACHU_BED ; 5
-const_value = const_value + 1
-	const DECO_RED_CARPET ; 7
-	const DECO_BLUE_CARPET ; 8
-	const DECO_YELLOW_CARPET ; 9
-	const DECO_GREEN_CARPET ; a
-const_value = const_value + 1
-	const DECO_MAGNAPLANT ; c
-	const DECO_TROPICPLANT ; d
-	const DECO_JUMBOPLANT ; e
-const_value = const_value + 1
-	const DECO_TOWN_MAP ; 10
-	const DECO_PIKACHU_POSTER ; 11
-	const DECO_CLEFAIRY_POSTER ; 12
-	const DECO_JIGGLYPUFF_POSTER ; 13
-const_value = const_value + 1
-	const DECO_FAMICOM ; 15
-	const DECO_SNES ; 16
-	const DECO_N64 ; 17
-	const DECO_VIRTUAL_BOY ; 18
-const_value = const_value + 1
-	const DECO_BIG_SNORLAX_DOLL ; 1a
-	const DECO_BIG_ONIX_DOLL ; 1b
-	const DECO_BIG_LAPRAS_DOLL ; 1c
-const_value = const_value + 1
-	const DECO_PIKACHU_DOLL ; 1e
-	const DECO_SURF_PIKACHU_DOLL ; 1f
-	const DECO_CLEFAIRY_DOLL ; 20
-	const DECO_JIGGLYPUFF_DOLL ; 21
-	const DECO_BULBASAUR_DOLL ; 22
-	const DECO_CHARMANDER_DOLL ; 23
-	const DECO_SQUIRTLE_DOLL ; 24
-	const DECO_POLIWAG_DOLL ; 25
-	const DECO_DIGLETT_DOLL ; 26
-	const DECO_STARMIE_DOLL ; 27
-	const DECO_MAGIKARP_DOLL ; 28
-	const DECO_ODDISH_DOLL ; 29
-	const DECO_GENGAR_DOLL ; 2a
-	const DECO_SHELLDER_DOLL ; 2b
-	const DECO_GRIMER_DOLL ; 2c
-	const DECO_VOLTORB_DOLL ; 2d
-	const DECO_WEEDLE_DOLL ; 2e
-	const DECO_UNOWN_DOLL ; 2f
-	const DECO_GEODUDE_DOLL ; 30
-	const DECO_MACHOP_DOLL ; 31
-	const DECO_TENTACOOL_DOLL ; 32
-	const DECO_GOLD_TROPHY_DOLL ; 33
-	const DECO_SILVER_TROPHY_DOLL ; 34
+const_value = 1
+	const DECO_PLANT
+	const DECO_BED
+	const DECO_CARPET
+	const DECO_POSTER
+	const DECO_DOLL
+	const DECO_BIGDOLL
+
+const_value = 1
+	const PUT_IT_AWAY
+	const MAGNAPLANT
+	const TROPICPLANT
+	const JUMBOPLANT
+	const TOWN_MAP_D
+	const FAMICOM
+	const SUPER_NES
+	const NINTENDO_64
+	const VIRTUAL_BOY
+	const GOLD_TROPHY
+	const SILVER_TROPHY
+	const SURF_PIKA_DOLL
+	const _BED
+	const _CARPET
+	const _POSTER
+	const _DOLL
+	const BIG_
+	const FEATHERY_BED
+	const PIKACHU_BED
+	const PINK_BED
+	const POLKADOT_BED
+	const RED_CARPET
+	const BLUE_CARPET
+	const YELLOW_CARPET
+	const GREEN_CARPET
+
+const_value = 1
+	const SET_UP_BED
+	const PUT_AWAY_BED
+	const SET_UP_CARPET
+	const PUT_AWAY_CARPET
+	const SET_UP_PLANT
+	const PUT_AWAY_PLANT
+	const SET_UP_POSTER
+	const PUT_AWAY_POSTER
+	const SET_UP_CONSOLE
+	const PUT_AWAY_CONSOLE
+	const SET_UP_BIG_DOLL
+	const PUT_AWAY_BIG_DOLL
+	const SET_UP_DOLL
+	const PUT_AWAY_DOLL
+	const SET_UP_ORNAMENT
+	const PUT_AWAY_ORNAMENT
+
+const_value = 2
+	const DECO_FEATHERY_BED ; 2
+	const DECO_PINK_BED ; 3
+	const DECO_POLKADOT_BED ; 4
+	const DECO_PIKACHU_BED ; 5
+const_value = const_value + 1
+	const DECO_RED_CARPET ; 7
+	const DECO_BLUE_CARPET ; 8
+	const DECO_YELLOW_CARPET ; 9
+	const DECO_GREEN_CARPET ; a
+const_value = const_value + 1
+	const DECO_MAGNAPLANT ; c
+	const DECO_TROPICPLANT ; d
+	const DECO_JUMBOPLANT ; e
+const_value = const_value + 1
+	const DECO_TOWN_MAP ; 10
+	const DECO_PIKACHU_POSTER ; 11
+	const DECO_CLEFAIRY_POSTER ; 12
+	const DECO_JIGGLYPUFF_POSTER ; 13
+const_value = const_value + 1
+	const DECO_FAMICOM ; 15
+	const DECO_SNES ; 16
+	const DECO_N64 ; 17
+	const DECO_VIRTUAL_BOY ; 18
+const_value = const_value + 1
+	const DECO_BIG_SNORLAX_DOLL ; 1a
+	const DECO_BIG_ONIX_DOLL ; 1b
+	const DECO_BIG_LAPRAS_DOLL ; 1c
+const_value = const_value + 1
+	const DECO_PIKACHU_DOLL ; 1e
+	const DECO_SURF_PIKACHU_DOLL ; 1f
+	const DECO_CLEFAIRY_DOLL ; 20
+	const DECO_JIGGLYPUFF_DOLL ; 21
+	const DECO_BULBASAUR_DOLL ; 22
+	const DECO_CHARMANDER_DOLL ; 23
+	const DECO_SQUIRTLE_DOLL ; 24
+	const DECO_POLIWAG_DOLL ; 25
+	const DECO_DIGLETT_DOLL ; 26
+	const DECO_STARMIE_DOLL ; 27
+	const DECO_MAGIKARP_DOLL ; 28
+	const DECO_ODDISH_DOLL ; 29
+	const DECO_GENGAR_DOLL ; 2a
+	const DECO_SHELLDER_DOLL ; 2b
+	const DECO_GRIMER_DOLL ; 2c
+	const DECO_VOLTORB_DOLL ; 2d
+	const DECO_WEEDLE_DOLL ; 2e
+	const DECO_UNOWN_DOLL ; 2f
+	const DECO_GEODUDE_DOLL ; 30
+	const DECO_MACHOP_DOLL ; 31
+	const DECO_TENTACOOL_DOLL ; 32
+	const DECO_GOLD_TROPHY_DOLL ; 33
+	const DECO_SILVER_TROPHY_DOLL ; 34

constants/engine_flags.asm

@@ -162,3 +162,4 @@
 	const ENGINE_KRIS_IN_CABLE_CLUB
 	const ENGINE_DUNSPARCE_SWARM ; a0
 	const ENGINE_YANMA_SWARM
+NUM_ENGINE_FLAGS EQU const_value

constants/map_constants.asm

@@ -1,5 +1,8 @@
-GROUP_N_A EQU -1
-MAP_N_A   EQU -1
+GROUP_N_A  EQU -1
+MAP_N_A    EQU -1
+
+GROUP_NONE EQU 0
+MAP_NONE   EQU 0
 
 ; map group ids
 	const_def
@@ -706,8 +709,8 @@ const_value SET 1
 	const MAPOBJECT_SPRITE ; 1
 	const MAPOBJECT_Y_COORD ; 2
 	const MAPOBJECT_X_COORD ; 3
-	const MAPOBJECT_FACING ; 4
-	const MAPOBJECT_MOVEMENT ; 5
+	const MAPOBJECT_MOVEMENT ; 4
+	const MAPOBJECT_RADIUS ; 5
 	const MAPOBJECT_HOUR ; 6
 	const MAPOBJECT_TIMEOFDAY ; 7
 	const MAPOBJECT_COLOR ; 8
@@ -753,3 +756,77 @@ OW_RIGHT EQU $c
 	const SIGNPOST_IFNOTSET
 	const SIGNPOST_ITEM
 	const SIGNPOST_COPY
+
+; I'm relocating spawn constants here, so that they can be used anywhere in the disassembly.
+
+
+const_value = -1
+	const SPAWN_N_A
+
+	const SPAWN_HOME
+	const SPAWN_DEBUG
+
+	const SPAWN_PALLET
+	const SPAWN_VIRIDIAN
+	const SPAWN_PEWTER
+	const SPAWN_CERULEAN
+	const SPAWN_ROCK_TUNNEL
+	const SPAWN_VERMILION
+	const SPAWN_LAVENDER
+	const SPAWN_SAFFRON
+	const SPAWN_CELADON
+	const SPAWN_FUCHSIA
+	const SPAWN_CINNABAR
+	const SPAWN_INDIGO
+
+	const SPAWN_NEW_BARK
+	const SPAWN_CHERRYGROVE
+	const SPAWN_VIOLET
+	const SPAWN_UNION_CAVE
+	const SPAWN_AZALEA
+	const SPAWN_CIANWOOD
+	const SPAWN_GOLDENROD
+	const SPAWN_OLIVINE
+	const SPAWN_ECRUTEAK
+	const SPAWN_MAHOGANY
+	const SPAWN_LAKE
+	const SPAWN_BLACKTHORN
+	const SPAWN_MT_SILVER
+	const SPAWN_FAST_SHIP
+NUM_SPAWNS EQU const_value
+
+	const_def
+	const SPRITEMOVEFN_00
+	const SPRITEMOVEFN_01
+	const SPRITEMOVEFN_02
+	const SPRITEMOVEFN_03
+	const SPRITEMOVEFN_04
+	const SPRITEMOVEFN_05
+	const SPRITEMOVEFN_06
+	const SPRITEMOVEFN_07
+	const SPRITEMOVEFN_08
+	const SPRITEMOVEFN_09
+	const SPRITEMOVEFN_0A
+	const SPRITEMOVEFN_0B
+	const SPRITEMOVEFN_0C
+	const SPRITEMOVEFN_0D
+	const SPRITEMOVEFN_0E
+	const SPRITEMOVEFN_0F
+	const SPRITEMOVEFN_10
+	const SPRITEMOVEFN_11
+	const SPRITEMOVEFN_12
+	const SPRITEMOVEFN_13
+	const SPRITEMOVEFN_14
+	const SPRITEMOVEFN_15
+	const SPRITEMOVEFN_16
+	const SPRITEMOVEFN_17
+	const SPRITEMOVEFN_18
+	const SPRITEMOVEFN_19
+	const SPRITEMOVEFN_1A
+	const SPRITEMOVEFN_1B
+	const SPRITEMOVEFN_1C
+	const SPRITEMOVEFN_1D
+	const SPRITEMOVEFN_1E
+	const SPRITEMOVEFN_1F
+	const SPRITEMOVEFN_20
+	const SPRITEMOVEFN_21

constants/pokemon_data_constants.asm

@@ -93,3 +93,9 @@ const_value SET 1
 	const ATK_GT_DEF
 	const ATK_LT_DEF
 	const ATK_EQ_DEF
+
+NUM_GRASSMON EQU 7
+NUM_WATERMON EQU 3
+
+GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
+WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2

constants/radio_constants.asm

@@ -0,0 +1,18 @@
+	const_def
+	const OAKS_POKEMON_TALK
+	const POKEDEX_SHOW
+	const POKEMON_MUSIC
+	const LUCKY_CHANNEL
+	const BUENAS_PASSWORD
+	const PLACES_AND_PEOPLE
+	const LETS_ALL_SING
+	const ROCKET_RADIO
+	const POKE_FLUTE_RADIO
+	const UNOWN_RADIO
+	const EVOLUTION_RADIO
+
+	const_def
+	const BUENA_MON
+	const BUENA_ITEM
+	const BUENA_MOVE
+	const BUENA_STRING

constants/sfx_constants.asm

@@ -42,7 +42,7 @@
 	const SFX_ELEVATOR_END
 	const SFX_THROW_BALL
 	const SFX_BALL_POOF
-	const SFX_UNKNOWN_2A
+	const SFX_FAINT
 	const SFX_RUN
 	const SFX_SLOT_MACHINE_START
 	const SFX_FANFARE

constants/wram_constants.asm

@@ -3,6 +3,7 @@
 PARTYMON   EQU 0
 OTPARTYMON EQU 1
 BOXMON     EQU 2
+BREEDMON   EQU 3
 WILDMON    EQU 4
 
 ; Options: ; cfcc

data/wild/fish.asm

@@ -233,193 +233,193 @@ FishGroup1:
 FishGroup1_Old: ; 924e3
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, KRABBY,     10
+	db -1, KRABBY,     10
 FishGroup1_Good: ; 924ec
 	db $59, MAGIKARP,   20
 	db $b2, KRABBY,     20
 	db $e6, KRABBY,     20
-	db $ff, $0,         0
+	db -1, $0,         0
 FishGroup1_Super: ; 924f8
 	db $66, KRABBY,     40
 	db $b2, $0,         1
 	db $e6, KRABBY,     40
-	db $ff, KINGLER,    40
+	db -1, KINGLER,    40
 
 FishGroup2:
 FishGroup2_Old: ; 92504
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, TENTACOOL,  10
+	db -1, TENTACOOL,  10
 FishGroup2_Good: ; 9250d
 	db $59, MAGIKARP,   20
 	db $b2, TENTACOOL,  20
 	db $e6, CHINCHOU,   20
-	db $ff, $0,         2
+	db -1, $0,         2
 FishGroup2_Super: ; 92519
 	db $66, CHINCHOU,   40
 	db $b2, $0,         3
 	db $e6, TENTACRUEL, 40
-	db $ff, LANTURN,    40
+	db -1, LANTURN,    40
 
 FishGroup3:
 FishGroup3_Old: ; 92525
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, GOLDEEN,    10
+	db -1, GOLDEEN,    10
 FishGroup3_Good: ; 9252e
 	db $59, MAGIKARP,   20
 	db $b2, GOLDEEN,    20
 	db $e6, GOLDEEN,    20
-	db $ff, $0,         4
+	db -1, $0,         4
 FishGroup3_Super: ; 9253a
 	db $66, GOLDEEN,    40
 	db $b2, $0,         5
 	db $e6, MAGIKARP,   40
-	db $ff, SEAKING,    40
+	db -1, SEAKING,    40
 
 FishGroup4:
 FishGroup4_Old: ; 92546
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, POLIWAG,    10
+	db -1, POLIWAG,    10
 FishGroup4_Good: ; 9254f
 	db $59, MAGIKARP,   20
 	db $b2, POLIWAG,    20
 	db $e6, POLIWAG,    20
-	db $ff, $0,         6
+	db -1, $0,         6
 FishGroup4_Super: ; 9255b
 	db $66, POLIWAG,    40
 	db $b2, $0,         7
 	db $e6, MAGIKARP,   40
-	db $ff, POLIWAG,    40
+	db -1, POLIWAG,    40
 
 FishGroup5:
 FishGroup5_Old: ; 92567
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, MAGIKARP,   10
+	db -1, MAGIKARP,   10
 FishGroup5_Good: ; 92570
 	db $59, MAGIKARP,   20
 	db $b2, MAGIKARP,   20
 	db $e6, MAGIKARP,   20
-	db $ff, $0,         8
+	db -1, $0,         8
 FishGroup5_Super: ; 9257c
 	db $66, MAGIKARP,   40
 	db $b2, $0,         9
 	db $e6, MAGIKARP,   40
-	db $ff, DRAGONAIR,  40
+	db -1, DRAGONAIR,  40
 
 FishGroup6:
 FishGroup6_Old: ; 92588
 	db $b3, MAGIKARP,   5
 	db $d9, MAGIKARP,   5
-	db $ff, QWILFISH,   5
+	db -1, QWILFISH,   5
 FishGroup6_Good: ; 92591
 	db $59, MAGIKARP,   20
 	db $b2, QWILFISH,   20
 	db $e6, QWILFISH,   20
-	db $ff, $0,         10
+	db -1, $0,         10
 FishGroup6_Super: ; 9259d
 	db $66, QWILFISH,   40
 	db $b2, $0,         11
 	db $e6, QWILFISH,   40
-	db $ff, QWILFISH,   40
+	db -1, QWILFISH,   40
 
 FishGroup7:
 FishGroup7_Old: ; 925a9
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, REMORAID,   10
+	db -1, REMORAID,   10
 FishGroup7_Good: ; 925b2
 	db $59, MAGIKARP,   20
 	db $b2, REMORAID,   20
 	db $e6, REMORAID,   20
-	db $ff, $0,         12
+	db -1, $0,         12
 FishGroup7_Super: ; 925be
 	db $66, REMORAID,   40
 	db $b2, $0,         13
 	db $e6, REMORAID,   40
-	db $ff, REMORAID,   40
+	db -1, REMORAID,   40
 
 FishGroup8:
 FishGroup8_Old: ; 925ca
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, MAGIKARP,   10
+	db -1, MAGIKARP,   10
 FishGroup8_Good: ; 925d3
 	db $59, MAGIKARP,   20
 	db $b2, MAGIKARP,   20
 	db $e6, MAGIKARP,   20
-	db $ff, $0,         14
+	db -1, $0,         14
 FishGroup8_Super: ; 925df
 	db $66, MAGIKARP,   40
 	db $b2, $0,         15
 	db $e6, MAGIKARP,   40
-	db $ff, MAGIKARP,   40
+	db -1, MAGIKARP,   40
 
 FishGroup9:
 FishGroup9_Old: ; 925eb
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, MAGIKARP,   10
+	db -1, MAGIKARP,   10
 FishGroup9_Good: ; 925f4
 	db $59, MAGIKARP,   10
 	db $b2, MAGIKARP,   10
 	db $e6, MAGIKARP,   10
-	db $ff, $0,         16
+	db -1, $0,         16
 FishGroup9_Super: ; 92600
 	db $66, MAGIKARP,   10
 	db $b2, $0,         17
 	db $e6, MAGIKARP,   10
-	db $ff, DRAGONAIR,  10
+	db -1, DRAGONAIR,  10
 
 FishGroup10:
 FishGroup10_Old: ; 9260c
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, KRABBY,     10
+	db -1, KRABBY,     10
 FishGroup10_Good: ; 92615
 	db $59, MAGIKARP,   20
 	db $b2, KRABBY,     20
 	db $e6, KRABBY,     20
-	db $ff, $0,         18
+	db -1, $0,         18
 FishGroup10_Super: ; 92621
 	db $66, KRABBY,     40
 	db $b2, $0,         19
 	db $e6, KINGLER,    40
-	db $ff, SEADRA,     40
+	db -1, SEADRA,     40
 
 FishGroup11:
 FishGroup11_Old: ; 9262d
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, TENTACOOL,  10
+	db -1, TENTACOOL,  10
 FishGroup11_Good: ; 92636
 	db $59, MAGIKARP,   20
 	db $b2, TENTACOOL,  20
 	db $e6, TENTACOOL,  20
-	db $ff, $0,         20
+	db -1, $0,         20
 FishGroup11_Super: ; 92642
 	db $66, TENTACOOL,  40
 	db $b2, $0,         21
 	db $e6, MAGIKARP,   40
-	db $ff, QWILFISH,   40
+	db -1, QWILFISH,   40
 
 FishGroup12:
 FishGroup12_Old: ; 9264e
 	db $b3, MAGIKARP,   10
 	db $d9, MAGIKARP,   10
-	db $ff, POLIWAG,    10
+	db -1, POLIWAG,    10
 FishGroup12_Good: ; 92657
 	db $59, MAGIKARP,   20
 	db $b2, POLIWAG,    20
 	db $e6, POLIWAG,    20
-	db $ff, $0,         6
+	db -1, $0,         6
 FishGroup12_Super: ; 92663
 	db $66, POLIWAG,    40
 	db $b2, $0,         7
 	db $e6, MAGIKARP,   40
-	db $ff, REMORAID,   40
+	db -1, REMORAID,   40
 
 ; 9266f
 

data/wild/johto_water.asm

@@ -1,231 +1,231 @@
 ; Johto Pokémon in water
 
-	db GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
-	db $05 ; encounter rate
-	db 15,WOOPER
-	db 20,QUAGSIRE
-	db 15,QUAGSIRE
+	map RUINS_OF_ALPH_OUTSIDE
+	db 2 percent ; encounter rate
+	db 15, WOOPER
+	db 20, QUAGSIRE
+	db 15, QUAGSIRE
 
-	db GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F
-	db $05 ; encounter rate
-	db 15,WOOPER
-	db 20,QUAGSIRE
-	db 15,QUAGSIRE
+	map UNION_CAVE_1F
+	db 2 percent ; encounter rate
+	db 15, WOOPER
+	db 20, QUAGSIRE
+	db 15, QUAGSIRE
 
-	db GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F
-	db $05 ; encounter rate
-	db 15,WOOPER
-	db 20,QUAGSIRE
-	db 15,QUAGSIRE
+	map UNION_CAVE_B1F
+	db 2 percent ; encounter rate
+	db 15, WOOPER
+	db 20, QUAGSIRE
+	db 15, QUAGSIRE
 
-	db GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F
-	db $0a ; encounter rate
-	db 15,TENTACOOL
-	db 20,QUAGSIRE
-	db 20,TENTACRUEL
+	map UNION_CAVE_B2F
+	db 4 percent ; encounter rate
+	db 15, TENTACOOL
+	db 20, QUAGSIRE
+	db 20, TENTACRUEL
 
-	db GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
-	db $05 ; encounter rate
-	db 15,SLOWPOKE
-	db 20,SLOWPOKE
-	db 10,SLOWPOKE
+	map SLOWPOKE_WELL_B1F
+	db 2 percent ; encounter rate
+	db 15, SLOWPOKE
+	db 20, SLOWPOKE
+	db 10, SLOWPOKE
 
-	db GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F
-	db $05 ; encounter rate
-	db 15,SLOWPOKE
-	db 20,SLOWPOKE
-	db 20,SLOWBRO
+	map SLOWPOKE_WELL_B2F
+	db 2 percent ; encounter rate
+	db 15, SLOWPOKE
+	db 20, SLOWPOKE
+	db 20, SLOWBRO
 
-	db GROUP_ILEX_FOREST, MAP_ILEX_FOREST
-	db $05 ; encounter rate
-	db 15,PSYDUCK
-	db 10,PSYDUCK
-	db 15,GOLDUCK
+	map ILEX_FOREST
+	db 2 percent ; encounter rate
+	db 15, PSYDUCK
+	db 10, PSYDUCK
+	db 15, GOLDUCK
 
-	db GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE
-	db $0a ; encounter rate
-	db 15,GOLDEEN
-	db 20,MARILL
-	db 20,SEAKING
+	map MOUNT_MORTAR_1F_OUTSIDE
+	db 4 percent ; encounter rate
+	db 15, GOLDEEN
+	db 20, MARILL
+	db 20, SEAKING
 
-	db GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE
-	db $05 ; encounter rate
-	db 20,GOLDEEN
-	db 25,MARILL
-	db 25,SEAKING
+	map MOUNT_MORTAR_2F_INSIDE
+	db 2 percent ; encounter rate
+	db 20, GOLDEEN
+	db 25, MARILL
+	db 25, SEAKING
 
-	db GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F
-	db $05 ; encounter rate
-	db 15,GOLDEEN
-	db 20,MARILL
-	db 20,SEAKING
+	map MOUNT_MORTAR_B1F
+	db 2 percent ; encounter rate
+	db 15, GOLDEEN
+	db 20, MARILL
+	db 20, SEAKING
 
-	db GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW
-	db $0a ; encounter rate
-	db 20,TENTACOOL
-	db 15,HORSEA
-	db 20,TENTACRUEL
+	map WHIRL_ISLAND_SW
+	db 4 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, HORSEA
+	db 20, TENTACRUEL
 
-	db GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F
-	db $0a ; encounter rate
-	db 15,HORSEA
-	db 20,HORSEA
-	db 20,TENTACRUEL
+	map WHIRL_ISLAND_B2F
+	db 4 percent ; encounter rate
+	db 15, HORSEA
+	db 20, HORSEA
+	db 20, TENTACRUEL
 
-	db GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER
-	db $0a ; encounter rate
-	db 20,HORSEA
-	db 20,TENTACRUEL
-	db 20,SEADRA
+	map WHIRL_ISLAND_LUGIA_CHAMBER
+	db 4 percent ; encounter rate
+	db 20, HORSEA
+	db 20, TENTACRUEL
+	db 20, SEADRA
 
-	db GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2
-	db $05 ; encounter rate
-	db 35,SEAKING
-	db 35,GOLDUCK
-	db 35,GOLDEEN
+	map SILVER_CAVE_ROOM_2
+	db 2 percent ; encounter rate
+	db 35, SEAKING
+	db 35, GOLDUCK
+	db 35, GOLDEEN
 
-	db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
-	db $05 ; encounter rate
-	db 15,MAGIKARP
-	db 10,MAGIKARP
-	db 5,MAGIKARP
+	map DARK_CAVE_VIOLET_ENTRANCE
+	db 2 percent ; encounter rate
+	db 15, MAGIKARP
+	db 10, MAGIKARP
+	db 5, MAGIKARP
 
-	db GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE
-	db $05 ; encounter rate
-	db 15,MAGIKARP
-	db 10,MAGIKARP
-	db 5,MAGIKARP
+	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	db 2 percent ; encounter rate
+	db 15, MAGIKARP
+	db 10, MAGIKARP
+	db 5, MAGIKARP
 
-	db GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F
-	db $0a ; encounter rate
-	db 15,MAGIKARP
-	db 10,MAGIKARP
-	db 10,DRATINI
+	map DRAGONS_DEN_B1F
+	db 4 percent ; encounter rate
+	db 15, MAGIKARP
+	db 10, MAGIKARP
+	db 10, DRATINI
 
-	db GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT
-	db $05 ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map OLIVINE_PORT
+	db 2 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_ROUTE_30, MAP_ROUTE_30
-	db $05 ; encounter rate
-	db 20,POLIWAG
-	db 15,POLIWAG
-	db 20,POLIWHIRL
+	map ROUTE_30
+	db 2 percent ; encounter rate
+	db 20, POLIWAG
+	db 15, POLIWAG
+	db 20, POLIWHIRL
 
-	db GROUP_ROUTE_31, MAP_ROUTE_31
-	db $05 ; encounter rate
-	db 20,POLIWAG
-	db 15,POLIWAG
-	db 20,POLIWHIRL
+	map ROUTE_31
+	db 2 percent ; encounter rate
+	db 20, POLIWAG
+	db 15, POLIWAG
+	db 20, POLIWHIRL
 
-	db GROUP_ROUTE_32, MAP_ROUTE_32
-	db $0f ; encounter rate
-	db 15,TENTACOOL
-	db 20,QUAGSIRE
-	db 20,TENTACRUEL
+	map ROUTE_32
+	db 6 percent ; encounter rate
+	db 15, TENTACOOL
+	db 20, QUAGSIRE
+	db 20, TENTACRUEL
 
-	db GROUP_ROUTE_34, MAP_ROUTE_34
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map ROUTE_34
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_ROUTE_35, MAP_ROUTE_35
-	db $0a ; encounter rate
-	db 20,PSYDUCK
-	db 15,PSYDUCK
-	db 20,GOLDUCK
+	map ROUTE_35
+	db 4 percent ; encounter rate
+	db 20, PSYDUCK
+	db 15, PSYDUCK
+	db 20, GOLDUCK
 
-	db GROUP_ROUTE_40, MAP_ROUTE_40
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map ROUTE_40
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_ROUTE_41, MAP_ROUTE_41
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 20,TENTACRUEL
-	db 20,MANTINE
+	map ROUTE_41
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 20, TENTACRUEL
+	db 20, MANTINE
 
-	db GROUP_ROUTE_42, MAP_ROUTE_42
-	db $0a ; encounter rate
-	db 20,GOLDEEN
-	db 15,GOLDEEN
-	db 20,SEAKING
+	map ROUTE_42
+	db 4 percent ; encounter rate
+	db 20, GOLDEEN
+	db 15, GOLDEEN
+	db 20, SEAKING
 
-	db GROUP_ROUTE_43, MAP_ROUTE_43
-	db $05 ; encounter rate
-	db 20,MAGIKARP
-	db 15,MAGIKARP
-	db 10,MAGIKARP
+	map ROUTE_43
+	db 2 percent ; encounter rate
+	db 20, MAGIKARP
+	db 15, MAGIKARP
+	db 10, MAGIKARP
 
-	db GROUP_ROUTE_44, MAP_ROUTE_44
-	db $05 ; encounter rate
-	db 25,POLIWAG
-	db 20,POLIWAG
-	db 25,POLIWHIRL
+	map ROUTE_44
+	db 2 percent ; encounter rate
+	db 25, POLIWAG
+	db 20, POLIWAG
+	db 25, POLIWHIRL
 
-	db GROUP_ROUTE_45, MAP_ROUTE_45
-	db $05 ; encounter rate
-	db 20,MAGIKARP
-	db 15,MAGIKARP
-	db 5,MAGIKARP
+	map ROUTE_45
+	db 2 percent ; encounter rate
+	db 20, MAGIKARP
+	db 15, MAGIKARP
+	db 5, MAGIKARP
 
-	db GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map NEW_BARK_TOWN
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map CHERRYGROVE_CITY
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_VIOLET_CITY, MAP_VIOLET_CITY
-	db $05 ; encounter rate
-	db 20,POLIWAG
-	db 15,POLIWAG
-	db 20,POLIWHIRL
+	map VIOLET_CITY
+	db 2 percent ; encounter rate
+	db 20, POLIWAG
+	db 15, POLIWAG
+	db 20, POLIWHIRL
 
-	db GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map CIANWOOD_CITY
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map OLIVINE_CITY
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
-	db $05 ; encounter rate
-	db 20,POLIWAG
-	db 15,POLIWAG
-	db 20,POLIWHIRL
+	map ECRUTEAK_CITY
+	db 2 percent ; encounter rate
+	db 20, POLIWAG
+	db 15, POLIWAG
+	db 20, POLIWHIRL
 
-	db GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE
-	db $0f ; encounter rate
-	db 15,MAGIKARP
-	db 10,MAGIKARP
-	db 15,GYARADOS
+	map LAKE_OF_RAGE
+	db 6 percent ; encounter rate
+	db 15, MAGIKARP
+	db 10, MAGIKARP
+	db 15, GYARADOS
 
-	db GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	db $0a ; encounter rate
-	db 15,MAGIKARP
-	db 10,MAGIKARP
-	db 5,MAGIKARP
+	map BLACKTHORN_CITY
+	db 4 percent ; encounter rate
+	db 15, MAGIKARP
+	db 10, MAGIKARP
+	db 5, MAGIKARP
 
-	db GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE
-	db $05 ; encounter rate
-	db 35,POLIWHIRL
-	db 40,POLIWHIRL
-	db 35,POLIWAG
+	map SILVER_CAVE_OUTSIDE
+	db 2 percent ; encounter rate
+	db 35, POLIWHIRL
+	db 40, POLIWHIRL
+	db 35, POLIWAG
 
-	db $ff ; end
+	db -1 ; end

data/wild/kanto_water.asm

@@ -1,147 +1,147 @@
 ; Kanto Pokémon in water
 
-	db GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS
-	db $0a ; encounter rate
-	db 20,GOLDEEN
-	db 20,SLOWPOKE
-	db 20,SEAKING
+	map TOHJO_FALLS
+	db 4 percent ; encounter rate
+	db 20, GOLDEEN
+	db 20, SLOWPOKE
+	db 20, SEAKING
 
-	db GROUP_VERMILION_PORT, MAP_VERMILION_PORT
-	db $05 ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map VERMILION_PORT
+	db 2 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_ROUTE_4, MAP_ROUTE_4
-	db $0a ; encounter rate
-	db 10,GOLDEEN
-	db 5,GOLDEEN
-	db 10,SEAKING
+	map ROUTE_4
+	db 4 percent ; encounter rate
+	db 10, GOLDEEN
+	db 5, GOLDEEN
+	db 10, SEAKING
 
-	db GROUP_ROUTE_6, MAP_ROUTE_6
-	db $05 ; encounter rate
-	db 10,PSYDUCK
-	db 5,PSYDUCK
-	db 10,GOLDUCK
+	map ROUTE_6
+	db 2 percent ; encounter rate
+	db 10, PSYDUCK
+	db 5, PSYDUCK
+	db 10, GOLDUCK
 
-	db GROUP_ROUTE_9, MAP_ROUTE_9
-	db $0a ; encounter rate
-	db 15,GOLDEEN
-	db 10,GOLDEEN
-	db 15,SEAKING
+	map ROUTE_9
+	db 4 percent ; encounter rate
+	db 15, GOLDEEN
+	db 10, GOLDEEN
+	db 15, SEAKING
 
-	db GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH
-	db $0a ; encounter rate
-	db 15,GOLDEEN
-	db 10,GOLDEEN
-	db 15,SEAKING
+	map ROUTE_10_NORTH
+	db 4 percent ; encounter rate
+	db 15, GOLDEEN
+	db 10, GOLDEEN
+	db 15, SEAKING
 
-	db GROUP_ROUTE_12, MAP_ROUTE_12
-	db $0f ; encounter rate
-	db 25,TENTACOOL
-	db 25,QUAGSIRE
-	db 25,TENTACRUEL
+	map ROUTE_12
+	db 6 percent ; encounter rate
+	db 25, TENTACOOL
+	db 25, QUAGSIRE
+	db 25, TENTACRUEL
 
-	db GROUP_ROUTE_13, MAP_ROUTE_13
-	db $0f ; encounter rate
-	db 25,TENTACOOL
-	db 25,QUAGSIRE
-	db 25,TENTACRUEL
+	map ROUTE_13
+	db 6 percent ; encounter rate
+	db 25, TENTACOOL
+	db 25, QUAGSIRE
+	db 25, TENTACRUEL
 
-	db GROUP_ROUTE_19, MAP_ROUTE_19
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map ROUTE_19
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_ROUTE_20, MAP_ROUTE_20
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map ROUTE_20
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_ROUTE_21, MAP_ROUTE_21
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map ROUTE_21
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_ROUTE_22, MAP_ROUTE_22
-	db $05 ; encounter rate
-	db 10,POLIWAG
-	db 5,POLIWAG
-	db 10,POLIWHIRL
+	map ROUTE_22
+	db 2 percent ; encounter rate
+	db 10, POLIWAG
+	db 5, POLIWAG
+	db 10, POLIWHIRL
 
-	db GROUP_ROUTE_24, MAP_ROUTE_24
-	db $0a ; encounter rate
-	db 10,GOLDEEN
-	db 5,GOLDEEN
-	db 10,SEAKING
+	map ROUTE_24
+	db 4 percent ; encounter rate
+	db 10, GOLDEEN
+	db 5, GOLDEEN
+	db 10, SEAKING
 
-	db GROUP_ROUTE_25, MAP_ROUTE_25
-	db $0a ; encounter rate
-	db 10,GOLDEEN
-	db 5,GOLDEEN
-	db 10,SEAKING
+	map ROUTE_25
+	db 4 percent ; encounter rate
+	db 10, GOLDEEN
+	db 5, GOLDEEN
+	db 10, SEAKING
 
-	db GROUP_ROUTE_26, MAP_ROUTE_26
-	db $0f ; encounter rate
-	db 30,TENTACOOL
-	db 25,TENTACOOL
-	db 30,TENTACRUEL
+	map ROUTE_26
+	db 6 percent ; encounter rate
+	db 30, TENTACOOL
+	db 25, TENTACOOL
+	db 30, TENTACRUEL
 
-	db GROUP_ROUTE_27, MAP_ROUTE_27
-	db $0f ; encounter rate
-	db 20,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACRUEL
+	map ROUTE_27
+	db 6 percent ; encounter rate
+	db 20, TENTACOOL
+	db 15, TENTACOOL
+	db 20, TENTACRUEL
 
-	db GROUP_ROUTE_28, MAP_ROUTE_28
-	db $05 ; encounter rate
-	db 40,POLIWAG
-	db 35,POLIWAG
-	db 40,POLIWHIRL
+	map ROUTE_28
+	db 2 percent ; encounter rate
+	db 40, POLIWAG
+	db 35, POLIWAG
+	db 40, POLIWHIRL
 
-	db GROUP_PALLET_TOWN, MAP_PALLET_TOWN
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map PALLET_TOWN
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
-	db $05 ; encounter rate
-	db 10,POLIWAG
-	db 5,POLIWAG
-	db 10,POLIWHIRL
+	map VIRIDIAN_CITY
+	db 2 percent ; encounter rate
+	db 10, POLIWAG
+	db 5, POLIWAG
+	db 10, POLIWHIRL
 
-	db GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
-	db $0a ; encounter rate
-	db 10,GOLDEEN
-	db 5,GOLDEEN
-	db 10,SEAKING
+	map CERULEAN_CITY
+	db 4 percent ; encounter rate
+	db 10, GOLDEEN
+	db 5, GOLDEEN
+	db 10, SEAKING
 
-	db GROUP_VERMILION_CITY, MAP_VERMILION_CITY
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map VERMILION_CITY
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db GROUP_CELADON_CITY, MAP_CELADON_CITY
-	db $05 ; encounter rate
-	db 20,GRIMER
-	db 15,GRIMER
-	db 15,MUK
+	map CELADON_CITY
+	db 2 percent ; encounter rate
+	db 20, GRIMER
+	db 15, GRIMER
+	db 15, MUK
 
-	db GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
-	db $05 ; encounter rate
-	db 20,MAGIKARP
-	db 15,MAGIKARP
-	db 10,MAGIKARP
+	map FUCHSIA_CITY
+	db 2 percent ; encounter rate
+	db 20, MAGIKARP
+	db 15, MAGIKARP
+	db 10, MAGIKARP
 
-	db GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
-	db $0f ; encounter rate
-	db 35,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACRUEL
+	map CINNABAR_ISLAND
+	db 6 percent ; encounter rate
+	db 35, TENTACOOL
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
 
-	db $ff ; end
+	db -1 ; end

data/wild/swarm_grass.asm

@@ -1,59 +1,59 @@
 ; swarms in grass
 
 ; Dunsparce swarm
-	db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
-	db $0a,$0a,$0a ; encounter rates: morn/day/nite
+	map DARK_CAVE_VIOLET_ENTRANCE
+	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
-	db 3,GEODUDE
-	db 3,DUNSPARCE
-	db 2,ZUBAT
-	db 2,GEODUDE
-	db 2,DUNSPARCE
-	db 4,DUNSPARCE
-	db 4,DUNSPARCE
+	db 3, GEODUDE
+	db 3, DUNSPARCE
+	db 2, ZUBAT
+	db 2, GEODUDE
+	db 2, DUNSPARCE
+	db 4, DUNSPARCE
+	db 4, DUNSPARCE
 	; day
-	db 3,GEODUDE
-	db 3,DUNSPARCE
-	db 2,ZUBAT
-	db 2,GEODUDE
-	db 2,DUNSPARCE
-	db 4,DUNSPARCE
-	db 4,DUNSPARCE
+	db 3, GEODUDE
+	db 3, DUNSPARCE
+	db 2, ZUBAT
+	db 2, GEODUDE
+	db 2, DUNSPARCE
+	db 4, DUNSPARCE
+	db 4, DUNSPARCE
 	; nite
-	db 3,GEODUDE
-	db 3,DUNSPARCE
-	db 2,ZUBAT
-	db 2,GEODUDE
-	db 2,DUNSPARCE
-	db 4,DUNSPARCE
-	db 4,DUNSPARCE
+	db 3, GEODUDE
+	db 3, DUNSPARCE
+	db 2, ZUBAT
+	db 2, GEODUDE
+	db 2, DUNSPARCE
+	db 4, DUNSPARCE
+	db 4, DUNSPARCE
 
 ; Yanma swarm
-	db GROUP_ROUTE_35, MAP_ROUTE_35
-	db $19,$19,$19 ; encounter rates: morn/day/nite
+	map ROUTE_35
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	db 12,NIDORAN_M
-	db 12,NIDORAN_F
-	db 12,YANMA
-	db 14,YANMA
-	db 14,PIDGEY
-	db 10,DITTO
-	db 10,DITTO
+	db 12, NIDORAN_M
+	db 12, NIDORAN_F
+	db 12, YANMA
+	db 14, YANMA
+	db 14, PIDGEY
+	db 10, DITTO
+	db 10, DITTO
 	; day
-	db 12,NIDORAN_M
-	db 12,NIDORAN_F
-	db 12,YANMA
-	db 14,YANMA
-	db 14,PIDGEY
-	db 10,DITTO
-	db 10,DITTO
+	db 12, NIDORAN_M
+	db 12, NIDORAN_F
+	db 12, YANMA
+	db 14, YANMA
+	db 14, PIDGEY
+	db 10, DITTO
+	db 10, DITTO
 	; nite
-	db 12,NIDORAN_M
-	db 12,NIDORAN_F
-	db 12,YANMA
-	db 14,YANMA
-	db 14,HOOTHOOT
-	db 10,DITTO
-	db 10,DITTO
+	db 12, NIDORAN_M
+	db 12, NIDORAN_F
+	db 12, YANMA
+	db 14, YANMA
+	db 14, HOOTHOOT
+	db 10, DITTO
+	db 10, DITTO
 
-	db $ff ; end
+	db -1 ; end

data/wild/swarm_water.asm

@@ -2,4 +2,4 @@
 
 	; No swarms encountered while surfing in Crystal
 	
-	db $ff ; end
+	db -1 ; end

engine/buena_phone_scripts.asm

@@ -1,4 +1,4 @@
-UnknownScript_0xa0b14:
+BuenaPhoneScript1:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue UnknownScript_0xa0b73
 	checkcode VAR_HOUR
@@ -6,7 +6,7 @@ UnknownScript_0xa0b14:
 	scall UnknownScript_0xa0b32
 	jump UnknownScript_0xa0c0e
 
-UnknownScript_0xa0b26:
+BuenaPhoneScript2:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue UnknownScript_0xa0b73
 	scall UnknownScript_0xa0b4f

engine/color.asm

@@ -297,7 +297,7 @@ Function8bec: ; 8bec
 	ld a, [EnemyLightScreenCount]
 	ld c, a
 	ld a, [EnemyReflectCount]
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld de, $0014
 .asm_8c04
 	and a
@@ -661,8 +661,8 @@ endr
 
 
 Function9699: ; 9699
-	ld hl, AttrMap
-	ld bc, $0168
+	hlcoord 0, 0, AttrMap
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
 	ret
@@ -694,7 +694,7 @@ Function96b3: ; 96b3
 	ret
 
 .asm_96d0
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld de, VBGMap0
 	ld b, $12
 	ld a, $1

engine/credits.asm

@@ -527,7 +527,7 @@ Function109a95: ; 109a95 (42:5a95)
 	ld a, $c
 	ld [hBGMapAddress], a ; $ff00+$d6
 	ld a, $28
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld bc, $168
 	call ByteFill
 	ld a, $7f
@@ -540,7 +540,7 @@ Function109a95: ; 109a95 (42:5a95)
 	hlcoord 0, 17
 	ld a, $20
 	call Function109b1d
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld bc, $50
 	xor a
 	call ByteFill
@@ -560,7 +560,7 @@ Function109a95: ; 109a95 (42:5a95)
 	xor a
 	ld [hBGMapMode], a ; $ff00+$d4
 	ld [hBGMapAddress], a ; $ff00+$d6
-	ld hl, TileMap
+	hlcoord 0, 0
 	call Function109aff
 	call Function3200
 	ret

engine/diploma.asm

@@ -14,8 +14,8 @@ Function1dd709: ; 1dd709
 	ld de, VTiles2
 	call Decompress
 	ld hl, Tilemap_1ddc4b
-	ld de, TileMap
-	ld bc, $0168
+	decoord 0, 0
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ld de, String_1dd760
 	hlcoord 2, 5
@@ -54,13 +54,13 @@ String_1dd768:
 ; 1dd7ae
 
 Function1dd7ae: ; 1dd7ae
-	ld hl, TileMap
-	ld bc, $0168
+	hlcoord 0, 0
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $7f
 	call ByteFill
 	ld hl, Tilemap_1dddb3
-	ld de, TileMap
-	ld bc, $0168
+	decoord 0, 0
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ld de, String_1dd7fa
 	hlcoord 8, 0

engine/engine_flags.asm

@@ -29,9 +29,9 @@
 	dwb StatusFlags, %01000000 ; credits skip
 	dwb StatusFlags, %10000000 ; bug contest on   ; $10
 	dwb StatusFlags2, %00000100 ; bug contest timer
-	dwb StatusFlags2, %00000010 ; rockets in radio tower
-	dwb StatusFlags2, %00000001 ; bike shop call enabled (1024 bike steps reqd)
-	dwb StatusFlags2, %00010000
+	dwb StatusFlags2, %00000010
+	dwb StatusFlags2, %00000001 ; rockets in radio tower
+	dwb StatusFlags2, %00010000 ; bike shop call enabled (1024 bike steps reqd)
 	dwb StatusFlags2, %00100000 ; give pokerus; berry -> berry juice when trading?
 	dwb StatusFlags2, %01000000
 	dwb StatusFlags2, %10000000 ; rockets in mahogany
@@ -115,8 +115,8 @@
 	dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
 	dwb WeeklyFlags, %00010000 ; tea in blues house
 	dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
-	dwb WeeklyFlags, %01000000
-	dwb WeeklyFlags, %10000000
+	dwb WeeklyFlags, %01000000 ; move tutor
+	dwb WeeklyFlags, %10000000 ; buenas password
 
 	dwb SwarmFlags, %00000001 ; $60
 	dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
@@ -128,69 +128,69 @@
 	dwb wdbf3, %00000100 ; have gs ball after kurt examined it
 
 	; rematches
-	dwb wdc4c, %00000001 ; jack
-	dwb wdc4c, %00000010 ; huey
-	dwb wdc4c, %00000100 ; gaven
-	dwb wdc4c, %00001000 ; beth  ; $68
-	dwb wdc4c, %00010000 ; jose
-	dwb wdc4c, %00100000 ; reena
-	dwb wdc4c, %01000000 ; joey
-	dwb wdc4c, %10000000 ; wade
-	dwb wdc4c + 1, %00000001 ; ralph
-	dwb wdc4c + 1, %00000010 ; liz
-	dwb wdc4c + 1, %00000100 ; anthony
-	dwb wdc4c + 1, %00001000 ; todd  ; $70
-	dwb wdc4c + 1, %00010000 ; gina
-	dwb wdc4c + 1, %00100000 ; arnie
-	dwb wdc4c + 1, %01000000 ; alan
-	dwb wdc4c + 1, %10000000 ; dana
-	dwb wdc4c + 2, %00000001 ; chad
-	dwb wdc4c + 2, %00000010 ; tully
-	dwb wdc4c + 2, %00000100 ; brent
-	dwb wdc4c + 2, %00001000 ; tiffany  ; $78
-	dwb wdc4c + 2, %00010000 ; vance
-	dwb wdc4c + 2, %00100000 ; wilton
-	dwb wdc4c + 2, %01000000 ; parry
-	dwb wdc4c + 2, %10000000 ; erin
+	dwb wDailyRematchFlags, %00000001 ; jack
+	dwb wDailyRematchFlags, %00000010 ; huey
+	dwb wDailyRematchFlags, %00000100 ; gaven
+	dwb wDailyRematchFlags, %00001000 ; beth  ; $68
+	dwb wDailyRematchFlags, %00010000 ; jose
+	dwb wDailyRematchFlags, %00100000 ; reena
+	dwb wDailyRematchFlags, %01000000 ; joey
+	dwb wDailyRematchFlags, %10000000 ; wade
+	dwb wDailyRematchFlags + 1, %00000001 ; ralph
+	dwb wDailyRematchFlags + 1, %00000010 ; liz
+	dwb wDailyRematchFlags + 1, %00000100 ; anthony
+	dwb wDailyRematchFlags + 1, %00001000 ; todd  ; $70
+	dwb wDailyRematchFlags + 1, %00010000 ; gina
+	dwb wDailyRematchFlags + 1, %00100000 ; arnie
+	dwb wDailyRematchFlags + 1, %01000000 ; alan
+	dwb wDailyRematchFlags + 1, %10000000 ; dana
+	dwb wDailyRematchFlags + 2, %00000001 ; chad
+	dwb wDailyRematchFlags + 2, %00000010 ; tully
+	dwb wDailyRematchFlags + 2, %00000100 ; brent
+	dwb wDailyRematchFlags + 2, %00001000 ; tiffany  ; $78
+	dwb wDailyRematchFlags + 2, %00010000 ; vance
+	dwb wDailyRematchFlags + 2, %00100000 ; wilton
+	dwb wDailyRematchFlags + 2, %01000000 ; parry
+	dwb wDailyRematchFlags + 2, %10000000 ; erin
 
-	dwb wdc50, %00000001 ; beverly has nugget
-	dwb wdc50, %00000010 ; jose has star piece
-	dwb wdc50, %00000100 ; wade has item (see bittable1 $032b-e)
-	dwb wdc50, %00001000 ; gina has leaf stone  ; $80
-	dwb wdc50, %00010000 ; alan has fire stone
-	dwb wdc50, %00100000 ; liz has thunderstone
-	dwb wdc50, %01000000 ; derek has nugget
-	dwb wdc50, %10000000 ; tully has water stone
+	dwb wDailyPhoneItemFlags, %00000001 ; beverly has nugget
+	dwb wDailyPhoneItemFlags, %00000010 ; jose has star piece
+	dwb wDailyPhoneItemFlags, %00000100 ; wade has item (see bittable1 $032b-e)
+	dwb wDailyPhoneItemFlags, %00001000 ; gina has leaf stone  ; $80
+	dwb wDailyPhoneItemFlags, %00010000 ; alan has fire stone
+	dwb wDailyPhoneItemFlags, %00100000 ; liz has thunderstone
+	dwb wDailyPhoneItemFlags, %01000000 ; derek has nugget
+	dwb wDailyPhoneItemFlags, %10000000 ; tully has water stone
 
-	dwb wdc50 + 1, %00000001 ; tiffany has pink bow
-	dwb wdc50 + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
+	dwb wDailyPhoneItemFlags + 1, %00000001 ; tiffany has pink bow
+	dwb wDailyPhoneItemFlags + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
 
-	dwb wdc54, %00000001
-	dwb wdc54, %00000010  ; $88
-	dwb wdc54, %00000100
-	dwb wdc54, %00001000
-	dwb wdc54, %00010000
-	dwb wdc54, %00100000
-	dwb wdc54, %01000000
-	dwb wdc54, %10000000
+	dwb wDailyPhoneTimeOfDayFlags, %00000001
+	dwb wDailyPhoneTimeOfDayFlags, %00000010  ; $88
+	dwb wDailyPhoneTimeOfDayFlags, %00000100
+	dwb wDailyPhoneTimeOfDayFlags, %00001000
+	dwb wDailyPhoneTimeOfDayFlags, %00010000
+	dwb wDailyPhoneTimeOfDayFlags, %00100000
+	dwb wDailyPhoneTimeOfDayFlags, %01000000
+	dwb wDailyPhoneTimeOfDayFlags, %10000000
 
-	dwb wdc54 + 1, %00000001
-	dwb wdc54 + 1, %00000010  ; $90
-	dwb wdc54 + 1, %00000100
-	dwb wdc54 + 1, %00001000
-	dwb wdc54 + 1, %00010000
-	dwb wdc54 + 1, %00100000
-	dwb wdc54 + 1, %01000000
-	dwb wdc54 + 1, %10000000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000001
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000010  ; $90
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000100
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00001000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00010000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00100000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %01000000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %10000000
 
-	dwb wdc54 + 2, %00000001
-	dwb wdc54 + 2, %00000010  ; $98
-	dwb wdc54 + 2, %00000100
-	dwb wdc54 + 2, %00001000
-	dwb wdc54 + 2, %00010000
-	dwb wdc54 + 2, %00100000
-	dwb wdc54 + 2, %01000000
-	dwb wdc54 + 2, %10000000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000001
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000010  ; $98
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000100
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00001000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00010000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00100000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %01000000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %10000000
 
 	dwb wd45b, %00000100 ; female player has been transformed into male
 

engine/events_2.asm

@@ -105,7 +105,7 @@ Function97cc0:: ; 97cc0
 	ld hl, StatusFlags2
 	bit 2, [hl]
 	jr nz, .asm_97cdb
-	callba Function2a0e7
+	callba TryWildEncounter
 	jr nz, .asm_97ce2
 	jr .asm_97ce6
 
@@ -167,10 +167,10 @@ Function97cfd:: ; 97cfd
 ; 97d23
 
 Function97d23: ; 97d23
-	call Function97d64
+	call TryWildEncounter_BugContest
 	ret nc
 	call Function97d31
-	callba Function2a1df
+	callba CheckRepelEffect
 	ret
 ; 97d31
 
@@ -196,7 +196,7 @@ Function97d31:: ; 97d31
 
 ; Species
 	ld a, [hli]
-	ld [wd22e], a
+	ld [TempWildMonSpecies], a
 
 ; Min level
 	ld a, [hli]
@@ -228,16 +228,16 @@ Function97d31:: ; 97d31
 	ret
 ; 97d64
 
-Function97d64: ; 97d64
+TryWildEncounter_BugContest: ; 97d64
 	ld a, [StandingTile]
-	call Function188e
+	call CheckSuperTallGrassTile
 	ld b, $66
 	jr z, .asm_97d70
 	ld b, $33
 
 .asm_97d70
-	callba Function2a124
-	callba Function2a138
+	callba ApplyMusicEffectOnEncounterRate
+	callba ApplyCleanseTagEffectOnEncounterRate
 	call Random
 	ld a, [hRandomAdd]
 	cp b

engine/map_objects.asm

@@ -2,44 +2,44 @@
 INCLUDE "engine/facings.asm"
 
 ObjectStruct3_Data:: ; 4273
-	db $00, $00, $01, $02, $00, $00
-	db $06, $00, $01, $0c, $00, $00
-	db $03, $00, $01, $00, $00, $00
-	db $04, $00, $01, $00, $00, $00
-	db $01, $00, $01, $00, $00, $00
-	db $02, $00, $01, $00, $00, $00
-	db $06, $00, $01, $00, $00, $00
-	db $06, $01, $01, $00, $00, $00
-	db $06, $02, $01, $00, $00, $00
-	db $06, $03, $01, $00, $00, $00
-	db $05, $00, $01, $00, $00, $00
-	db $07, $00, $01, $02, $00, $00
-	db $08, $00, $01, $00, $00, $00
-	db $09, $00, $01, $00, $00, $00
-	db $0a, $00, $01, $00, $00, $00
-	db $0b, $00, $01, $00, $00, $00
-	db $0c, $00, $01, $00, $00, $00
-	db $0d, $00, $01, $00, $00, $00
-	db $0e, $00, $01, $00, $00, $00
-	db $0f, $00, $01, $02, $00, $00
-	db $10, $00, $01, $02, $00, $00
-	db $15, $00, $09, $2e, $01, $c0
-	db $16, $00, $0a, $2e, $00, $00
-	db $06, $00, $01, $0c, $00, $00
-	db $06, $00, $01, $2e, $10, $00
-	db $11, $00, $01, $2e, $00, $40
-	db $12, $00, $01, $02, $00, $00
-	db $13, $00, $00, $8e, $01, $00
-	db $14, $00, $08, $8e, $02, $00
-	db $17, $00, $00, $82, $00, $00
-	db $19, $02, $01, $00, $00, $00
-	db $18, $03, $01, $00, $00, $00
-	db $11, $00, $0c, $2e, $01, $c0
-	db $11, $00, $0d, $2e, $01, $c0
-	db $1a, $00, $0e, $8e, $01, $00
-	db $1b, $00, $0f, $8e, $02, $00
-	db $03, $00, $01, $00, $00, $20
-	db $00, $00, $01, $00, $00, $00
+	db $00, $00, $01, $02, $00, $00 ; 00
+	db $06, $00, $01, $0c, $00, $00 ; 01
+	db $03, $00, $01, $00, $00, $00 ; 02
+	db $04, $00, $01, $00, $00, $00 ; 03
+	db $01, $00, $01, $00, $00, $00 ; 04
+	db $02, $00, $01, $00, $00, $00 ; 05
+	db $06, $00, $01, $00, $00, $00 ; 06
+	db $06, $01, $01, $00, $00, $00 ; 07
+	db $06, $02, $01, $00, $00, $00 ; 08
+	db $06, $03, $01, $00, $00, $00 ; 09
+	db $05, $00, $01, $00, $00, $00 ; 0a
+	db $07, $00, $01, $02, $00, $00 ; 0b
+	db $08, $00, $01, $00, $00, $00 ; 0c
+	db $09, $00, $01, $00, $00, $00 ; 0d
+	db $0a, $00, $01, $00, $00, $00 ; 0e
+	db $0b, $00, $01, $00, $00, $00 ; 0f
+	db $0c, $00, $01, $00, $00, $00 ; 10
+	db $0d, $00, $01, $00, $00, $00 ; 11
+	db $0e, $00, $01, $00, $00, $00 ; 12
+	db $0f, $00, $01, $02, $00, $00 ; 13
+	db $10, $00, $01, $02, $00, $00 ; 14
+	db $15, $00, $09, $2e, $01, $c0 ; 15
+	db $16, $00, $0a, $2e, $00, $00 ; 16
+	db $06, $00, $01, $0c, $00, $00 ; 17
+	db $06, $00, $01, $2e, $10, $00 ; 18
+	db $11, $00, $01, $2e, $00, $40 ; 19
+	db $12, $00, $01, $02, $00, $00 ; 1a
+	db $13, $00, $00, $8e, $01, $00 ; 1b
+	db $14, $00, $08, $8e, $02, $00 ; 1c
+	db $17, $00, $00, $82, $00, $00 ; 1d
+	db $19, $02, $01, $00, $00, $00 ; 1e
+	db $18, $03, $01, $00, $00, $00 ; 1f
+	db $11, $00, $0c, $2e, $01, $c0 ; 20
+	db $11, $00, $0d, $2e, $01, $c0 ; 21
+	db $1a, $00, $0e, $8e, $01, $00 ; 22
+	db $1b, $00, $0f, $8e, $02, $00 ; 23
+	db $03, $00, $01, $00, $00, $20 ; 24
+	db $00, $00, $01, $00, $00, $00 ; 25
 ; 4357
 
 
@@ -238,40 +238,40 @@ endr
 ; 445f
 
 Pointers445f: ; 445f
-	dw Function44a3
-	dw Function44a3
-	dw Function44b5
-	dw Function44aa
-	dw Function44c1
-	dw Function44aa
-	dw Function4508
-	dw Function44aa
-	dw Function4529
-	dw Function44aa
-	dw Function4539
-	dw Function44a3
-	dw Function456e
-	dw Function456e
-	dw Function457b
-	dw Function44a3
-	dw Function4582
-	dw Function4582
-	dw Function4589
-	dw Function4589
-	dw Function4590
-	dw Function45a4
-	dw Function45ab
-	dw Function44aa
-	dw Function45be
-	dw Function45be
-	dw Function45c5
-	dw Function45c5
-	dw Function45da
-	dw Function44a3
-	dw Function45ed
-	dw Function44a3
-	dw Function44e4
-	dw Function44aa
+	dw Function44a3 ; 00
+	dw Function44a3 ; 01
+	dw Function44b5 ; 02
+	dw Function44aa ; 03
+	dw Function44c1 ; 04
+	dw Function44aa ; 05
+	dw Function4508 ; 06
+	dw Function44aa ; 07
+	dw Function4529 ; 08
+	dw Function44aa ; 09
+	dw Function4539 ; 0a
+	dw Function44a3 ; 0b
+	dw Function456e ; 0c
+	dw Function456e ; 0d
+	dw Function457b ; 0e
+	dw Function44a3 ; 0f
+	dw Function4582 ; 10
+	dw Function4582 ; 11
+	dw Function4589 ; 12
+	dw Function4589 ; 13
+	dw Function4590 ; 14
+	dw Function45a4 ; 15
+	dw Function45ab ; 16
+	dw Function44aa ; 17
+	dw Function45be ; 18
+	dw Function45be ; 19
+	dw Function45c5 ; 1a
+	dw Function45c5 ; 1b
+	dw Function45da ; 1c
+	dw Function44a3 ; 1d
+	dw Function45ed ; 1e
+	dw Function44a3 ; 1f
+	dw Function44e4 ; 20
+	dw Function44aa ; 21
 ; 44a3
 
 Function44a3: ; 44a3
@@ -626,7 +626,7 @@ Function463f: ; 463f
 ; 4661
 
 Function4661: ; 4661
-	call Function188e
+	call CheckSuperTallGrassTile
 	jr z, .set
 	call Function1875
 	jr c, .reset
@@ -835,7 +835,7 @@ Function4769: ; 4769
 	jr z, .ok
 	push bc
 	call GetMapObject
-	ld hl, MAPOBJECT_FACING
+	ld hl, MAPOBJECT_MOVEMENT
 	add hl, bc
 	ld a, [hl]
 	pop bc
@@ -944,34 +944,34 @@ Function47dd: ; 47dd
 ; 47e9
 
 .Pointers ; 47e9
-	dw Function4821
-	dw Function4822
-	dw Function482c
-	dw Function4838
-	dw Function4842
-	dw Function4851
-	dw Function4869
-	dw Function487c
-	dw Function4882
-	dw Function4888
-	dw Function488e
-	dw Function4891
-	dw Function4894
-	dw Function4897
-	dw Function489d
-	dw Function48a0
-	dw Function48a6
-	dw Function48ac
-	dw Function48ff
-	dw Function49e5
-	dw Function4a21
-	dw Function4958
-	dw Function496e
-	dw Function4abc
-	dw Function498d
-	dw Function4984
-	dw Function4a46
-	dw Function4a89
+	dw Function4821 ; 00
+	dw Function4822 ; 01
+	dw Function482c ; 02
+	dw Function4838 ; 03
+	dw Function4842 ; 04
+	dw Function4851 ; 05
+	dw Function4869 ; 06
+	dw Function487c ; 07
+	dw Function4882 ; 08
+	dw Function4888 ; 09
+	dw Function488e ; 0a
+	dw Function4891 ; 0b
+	dw Function4894 ; 0c
+	dw Function4897 ; 0d
+	dw Function489d ; 0e
+	dw Function48a0 ; 0f
+	dw Function48a6 ; 10
+	dw Function48ac ; 11
+	dw Function48ff ; 12
+	dw Function49e5 ; 13
+	dw Function4a21 ; 14
+	dw Function4958 ; 15
+	dw Function496e ; 16
+	dw Function4abc ; 17
+	dw Function498d ; 18
+	dw Function4984 ; 19
+	dw Function4a46 ; 1a
+	dw Function4a89 ; 1b
 ; 4821
 
 Function4821: ; 4821
@@ -3293,7 +3293,7 @@ Function58e3: ; 58e3
 	jp z, Function5903
 	push bc
 	call GetMapObject
-	ld hl, MAPOBJECT_FACING
+	ld hl, MAPOBJECT_MOVEMENT
 	add hl, bc
 	ld a, [hl]
 	pop bc

engine/map_setup.asm

@@ -333,7 +333,7 @@ MapSetupCommands: ; 15440
 	dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
 	dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
 	dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
-	dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27
+	dbw BANK(JumpRoamMons), JumpRoamMons ; 27
 	dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
 	dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
 	dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
@@ -439,7 +439,7 @@ Function1551a: ; 1551a (5:551a)
 	ret
 
 Function1554e: ; 1554e (5:554e)
-	call Function1852
+	call CheckOnWater
 	jr nz, .ret_nc
 	ld a, [PlayerState]
 	cp PLAYER_SURF

engine/map_triggers.asm

@@ -87,5 +87,5 @@ ENDM
 	trigger_def MOUNT_MOON_SQUARE,                      wMountMoonSquareTrigger
 	trigger_def MOBILE_TRADE_ROOM_MOBILE,               wMobileTradeRoomMobileTrigger
 	trigger_def MOBILE_BATTLE_ROOM,                     wMobileBattleRoomTrigger
-	db $ff
+	db -1
 ; 4d15b

engine/more_phone_scripts.asm

@@ -27,7 +27,7 @@ UnknownScript_0xa0036:
 	farjump UnknownScript_0xa0055
 
 UnknownScript_0xa003e:
-	special Function2a51f
+	special RandomPhoneWildMon
 	farscall UnknownScript_0xbde3f
 	if_equal $0, UnknownScript_0xa0051
 	farscall UnknownScript_0xa017a
@@ -37,7 +37,7 @@ UnknownScript_0xa0051:
 	farjump UnknownScript_0xa006c
 
 UnknownScript_0xa0055:
-	special Function2a51f
+	special RandomPhoneWildMon
 	farscall UnknownScript_0xbde3f
 	if_equal $0, UnknownScript_0xa0068
 	farscall UnknownScript_0xa0226
@@ -851,7 +851,7 @@ UnknownScript_0xa059c:
 	farjump UnknownScript_0xa053a
 
 UnknownScript_0xa05a0:
-	special Function2a4ab
+	special RandomPhoneRareWildMon
 	end
 
 UnknownScript_0xa05a4:
@@ -1653,7 +1653,7 @@ UnknownScript_0xa0b04:
 	farwritetext UnknownText_0x17717c
 	end
 
-UnknownScript_0xa0b09:
+BikeShopPhoneScript:
 	farwritetext UnknownText_0x174000
 	clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
 	specialphonecall ELMCALL_NONE

engine/movement.asm

@@ -727,7 +727,7 @@ Function5412: ; 5412
 	ld hl, OBJECT_STANDING_TILE
 	add hl, bc
 	ld a, [hl]
-	call Function188e
+	call CheckSuperTallGrassTile
 	jr z, .asm_542d
 
 	call Function1875

engine/pack.asm

@@ -1404,7 +1404,7 @@ Function10955: ; 10955
 	hlcoord 5, 1
 	lb bc, 11, 15
 	call ClearBox
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld a, $28
 	ld c, $14
 .asm_1098a
@@ -1489,8 +1489,8 @@ Function10a1d: ; 10a1d
 ; 10a2a
 
 Function10a2a: ; 10a2a
-	ld hl, TileMap
-	ld bc, $0168
+	hlcoord 0, 0
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $7f
 	call ByteFill
 	ret

engine/phone_scripts.asm

@@ -298,7 +298,7 @@ ElmPhoneScript2: ; 0xbd081
 
 ; Jack
 
-UnknownScript_0xbd0d0:
+JackPhoneScript1:
 	trainertotext SCHOOLBOY, JACK1, $0
 	checkflag ENGINE_JACK
 	iftrue UnknownScript_0xbd0f3
@@ -317,7 +317,7 @@ UnknownScript_0xbd0f3:
 	displaylocation NATIONAL_PARK, $2
 	farjump UnknownScript_0xa0a2d
 
-UnknownScript_0xbd0fa:
+JackPhoneScript2:
 	trainertotext SCHOOLBOY, JACK1, $0
 	farscall UnknownScript_0xbe1b6
 	farscall UnknownScript_0xbde3f
@@ -350,7 +350,7 @@ UnknownScript_0xbd13b:
 
 ; Beverly
 
-UnknownScript_0xbd13f:
+BeverlyPhoneScript1:
 	trainertotext POKEFANF, BEVERLY1, $0
 	farscall UnknownScript_0xbe0b6
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
@@ -361,7 +361,7 @@ UnknownScript_0xbd151:
 	displaylocation NATIONAL_PARK, $2
 	farjump UnknownScript_0xa0aa5
 
-UnknownScript_0xbd158:
+BeverlyPhoneScript2:
 	trainertotext POKEFANF, BEVERLY1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
@@ -379,7 +379,7 @@ UnknownScript_0xbd172:
 
 ; Huey
 
-UnknownScript_0xbd17c:
+HueyPhoneScript1:
 	trainertotext SAILOR, HUEY1, $0
 	checkflag ENGINE_HUEY
 	iftrue UnknownScript_0xbd1a2
@@ -399,7 +399,7 @@ UnknownScript_0xbd1a2:
 	displaylocation LIGHTHOUSE, $2
 	farjump UnknownScript_0xa0a32
 
-UnknownScript_0xbd1a9:
+HueyPhoneScript2:
 	trainertotext SAILOR, HUEY1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_HUEY
@@ -423,7 +423,7 @@ UnknownScript_0xbd1d0:
 
 ; Gaven
 
-UnknownScript_0xbd1da:
+GavenPhoneScript1:
 	trainertotext COOLTRAINERM, GAVEN3, $0
 	checkflag ENGINE_GAVEN
 	iftrue UnknownScript_0xbd1fd
@@ -442,7 +442,7 @@ UnknownScript_0xbd1fd:
 	displaylocation ROUTE_26, $2
 	farjump UnknownScript_0xa0a37
 
-UnknownScript_0xbd204:
+GavenPhoneScript2:
 	trainertotext COOLTRAINERM, GAVEN3, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_GAVEN
@@ -470,7 +470,7 @@ UnknownScript_0xbd239:
 
 ; Beth
 
-UnknownScript_0xbd23d:
+BethPhoneScript1:
 	trainertotext COOLTRAINERF, BETH1, $0
 	checkflag ENGINE_BETH
 	iftrue UnknownScript_0xbd260
@@ -489,7 +489,7 @@ UnknownScript_0xbd260:
 	displaylocation ROUTE_26, $2
 	farjump UnknownScript_0xa0a3c
 
-UnknownScript_0xbd267:
+BethPhoneScript2:
 	trainertotext COOLTRAINERF, BETH1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_BETH
@@ -512,7 +512,7 @@ UnknownScript_0xbd28a:
 
 ; Jose
 
-UnknownScript_0xbd294:
+JosePhoneScript1:
 	trainertotext BIRD_KEEPER, JOSE2, $0
 	checkflag ENGINE_JOSE
 	iftrue UnknownScript_0xbd2bd
@@ -537,7 +537,7 @@ UnknownScript_0xbd2c4:
 	displaylocation ROUTE_27, $2
 	farjump UnknownScript_0xa0a41
 
-UnknownScript_0xbd2cb:
+JosePhoneScript2:
 	trainertotext BIRD_KEEPER, JOSE2, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_JOSE
@@ -574,7 +574,7 @@ UnknownScript_0xbd312:
 
 ; Reena
 
-UnknownScript_0xbd31c:
+ReenaPhoneScript1:
 	trainertotext COOLTRAINERF, REENA1, $0
 	checkflag ENGINE_REENA
 	iftrue UnknownScript_0xbd33f
@@ -593,7 +593,7 @@ UnknownScript_0xbd33f:
 	displaylocation ROUTE_27, $2
 	farjump UnknownScript_0xa0a46
 
-UnknownScript_0xbd346:
+ReenaPhoneScript2:
 	trainertotext COOLTRAINERF, REENA1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_REENA
@@ -616,7 +616,7 @@ UnknownScript_0xbd369:
 
 ; Joey
 
-UnknownScript_0xbd373:
+JoeyPhoneScript1:
 	trainertotext YOUNGSTER, JOEY1, $0
 	checkflag ENGINE_JOEY
 	iftrue UnknownScript_0xbd399
@@ -636,7 +636,7 @@ UnknownScript_0xbd399:
 	displaylocation ROUTE_30, $2
 	farjump UnknownScript_0xa0a4b
 
-UnknownScript_0xbd3a0:
+JoeyPhoneScript2:
 	trainertotext YOUNGSTER, JOEY1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_JOEY
@@ -660,7 +660,7 @@ UnknownScript_0xbd3c7:
 
 ; Wade
 
-UnknownScript_0xbd3d1:
+WadePhoneScript1:
 	trainertotext BUG_CATCHER, WADE1, $0
 	checkflag ENGINE_WADE
 	iftrue UnknownScript_0xbd41a
@@ -698,7 +698,7 @@ UnknownScript_0xbd421:
 	displaylocation ROUTE_31, $2
 	farjump UnknownScript_0xa0ab5
 
-UnknownScript_0xbd428:
+WadePhoneScript2:
 	trainertotext BUG_CATCHER, WADE1, $0
 	farscall UnknownScript_0xbe1b6
 	farscall UnknownScript_0xbde3f
@@ -776,7 +776,7 @@ UnknownScript_0xbd4ce:
 
 ; Ralph
 
-UnknownScript_0xbd4d2:
+RalphPhoneScript1:
 	trainertotext FISHER, RALPH1, $0
 	checkflag ENGINE_RALPH
 	iftrue UnknownScript_0xbd4fb
@@ -801,7 +801,7 @@ UnknownScript_0xbd502:
 	displaylocation ROUTE_32, $2
 	farjump UnknownScript_0xa0af5
 
-UnknownScript_0xbd509:
+RalphPhoneScript2:
 	trainertotext FISHER, RALPH1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_FLYPOINT_GOLDENROD
@@ -841,7 +841,7 @@ UnknownScript_0xbd55c:
 
 ; Liz
 
-UnknownScript_0xbd560:
+LizPhoneScript1:
 	trainertotext PICNICKER, LIZ1, $0
 	checkflag ENGINE_LIZ
 	iftrue UnknownScript_0xbd586
@@ -861,7 +861,7 @@ UnknownScript_0xbd586:
 	displaylocation ROUTE_32, $2
 	farjump UnknownScript_0xa0a5a
 
-UnknownScript_0xbd58d:
+LizPhoneScript2:
 	trainertotext PICNICKER, LIZ1, $0
 	farscall UnknownScript_0xbde45
 	if_equal $0, UnknownScript_0xbd5d0
@@ -946,7 +946,7 @@ UnknownScript_0xbd630:
 
 ; Anthony
 
-UnknownScript_0xbd634:
+AnthonyPhoneScript1:
 	trainertotext HIKER, ANTHONY2, $0
 	checkflag ENGINE_ANTHONY
 	iftrue UnknownScript_0xbd65d
@@ -971,7 +971,7 @@ UnknownScript_0xbd664:
 	displaylocation ROUTE_33, $2
 	farjump UnknownScript_0xa0afa
 
-UnknownScript_0xbd66b:
+AnthonyPhoneScript2:
 	trainertotext HIKER, ANTHONY2, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_FLYPOINT_GOLDENROD
@@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
 	iftrue UnknownScript_0xbd6bd
 	setflag ENGINE_DUNSPARCE_SWARM
 	pokenamemem DUNSPARCE, $1
-	loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
+	loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE
 	displaylocation DARK_CAVE, $2
 	farjump UnknownScript_0xa05de
 
@@ -1010,7 +1010,7 @@ UnknownScript_0xbd6bd:
 
 ; Todd
 
-UnknownScript_0xbd6c1:
+ToddPhoneScript1:
 	trainertotext CAMPER, TODD1, $0
 	checkflag ENGINE_TODD
 	iftrue UnknownScript_0xbd6ea
@@ -1034,7 +1034,7 @@ UnknownScript_0xbd6ea:
 UnknownScript_0xbd6f1:
 	farjump UnknownScript_0xa0b04
 
-UnknownScript_0xbd6f5:
+ToddPhoneScript2:
 	trainertotext CAMPER, TODD1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_TODD
@@ -1072,7 +1072,7 @@ UnknownScript_0xbd73c:
 
 ; Gina
 
-UnknownScript_0xbd743:
+GinaPhoneScript1:
 	trainertotext PICNICKER, GINA1, $0
 	checkflag ENGINE_GINA
 	iftrue UnknownScript_0xbd776
@@ -1102,7 +1102,7 @@ UnknownScript_0xbd77d:
 	displaylocation ROUTE_34, $2
 	farjump UnknownScript_0xa0abd
 
-UnknownScript_0xbd784:
+GinaPhoneScript2:
 	trainertotext PICNICKER, GINA1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
@@ -1147,7 +1147,7 @@ UnknownScript_0xbd7dd:
 
 ; Irwin
 
-UnknownScript_0xbd7e7:
+IrwinPhoneScript1:
 	trainertotext JUGGLER, IRWIN1, $0
 	farscall UnknownScript_0xbde4e
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
@@ -1157,7 +1157,7 @@ UnknownScript_0xbd7e7:
 UnknownScript_0xbd7f9:
 	farjump UnknownScript_0xa05be
 
-UnknownScript_0xbd7fd:
+IrwinPhoneScript2:
 	trainertotext JUGGLER, IRWIN1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
@@ -1169,7 +1169,7 @@ UnknownScript_0xbd80f:
 
 ; Arnie
 
-UnknownScript_0xbd813:
+ArniePhoneScript1:
 	trainertotext BUG_CATCHER, ARNIE1, $0
 	checkflag ENGINE_ARNIE
 	iftrue UnknownScript_0xbd83c
@@ -1194,7 +1194,7 @@ UnknownScript_0xbd843:
 	displaylocation ROUTE_35, $2
 	farjump UnknownScript_0xa0aff
 
-UnknownScript_0xbd84a:
+ArniePhoneScript2:
 	trainertotext BUG_CATCHER, ARNIE1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_ARNIE
@@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
 	iftrue UnknownScript_0xbd8a2
 	setflag ENGINE_YANMA_SWARM
 	pokenamemem YANMA, $1
-	loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35
+	loadwilddata $1, ROUTE_35
 	displaylocation ROUTE_35, $2
 	farjump UnknownScript_0xa05ce
 
@@ -1236,7 +1236,7 @@ UnknownScript_0xbd8a2:
 
 ; Alan
 
-UnknownScript_0xbd8a6:
+AlanPhoneScript1:
 	trainertotext SCHOOLBOY, ALAN1, $0
 	checkflag ENGINE_ALAN
 	iftrue UnknownScript_0xbd8cf
@@ -1261,7 +1261,7 @@ UnknownScript_0xbd8d6:
 	displaylocation ROUTE_36, $2
 	farjump UnknownScript_0xa0ac5
 
-UnknownScript_0xbd8dd:
+AlanPhoneScript2:
 	trainertotext SCHOOLBOY, ALAN1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_ALAN
@@ -1299,7 +1299,7 @@ UnknownScript_0xbd926:
 
 ; Dana
 
-UnknownScript_0xbd930:
+DanaPhoneScript1:
 	trainertotext LASS, DANA1, $0
 	checkflag ENGINE_DANA
 	iftrue UnknownScript_0xbd959
@@ -1324,7 +1324,7 @@ UnknownScript_0xbd960:
 	displaylocation ROUTE_38, $2
 	farjump UnknownScript_0xa0acd
 
-UnknownScript_0xbd967:
+DanaPhoneScript2:
 	trainertotext LASS, DANA1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_DANA
@@ -1367,7 +1367,7 @@ UnknownScript_0xbd9bc:
 
 ; Chad
 
-UnknownScript_0xbd9c6:
+ChadPhoneScript1:
 	trainertotext SCHOOLBOY, CHAD1, $0
 	checkflag ENGINE_CHAD
 	iftrue UnknownScript_0xbd9e9
@@ -1386,7 +1386,7 @@ UnknownScript_0xbd9e9:
 	displaylocation ROUTE_38, $2
 	farjump UnknownScript_0xa0a7d
 
-UnknownScript_0xbd9f0:
+ChadPhoneScript2:
 	trainertotext SCHOOLBOY, CHAD1, $0
 	farscall UnknownScript_0xbe1b6
 	farscall UnknownScript_0xbde3f
@@ -1417,7 +1417,7 @@ UnknownScript_0xbda2d:
 UnknownScript_0xbda31:
 	farjump UnknownScript_0xa0754
 
-UnknownScript_0xbda35:
+DerekPhoneScript1:
 	trainertotext POKEFANM, DEREK1, $0
 	farscall UnknownScript_0xbde4e
 	checkflag ENGINE_DEREK_HAS_NUGGET
@@ -1441,7 +1441,7 @@ UnknownScript_0xbda67:
 	displaylocation ROUTE_39, $2
 	farjump UnknownScript_0xa0ad5
 
-UnknownScript_0xbda6e:
+DerekPhoneScript2:
 	trainertotext POKEFANM, DEREK1, $0
 	farscall UnknownScript_0xbe1b6
 	farscall UnknownScript_0xbde3f
@@ -1466,7 +1466,7 @@ UnknownScript_0xbdaa2:
 	displaylocation ROUTE_39, $2
 	farjump UnknownScript_0xa05e6
 
-UnknownScript_0xbdaac:
+TullyPhoneScript1:
 	trainertotext FISHER, TULLY1, $0
 	checkflag ENGINE_TULLY
 	iftrue UnknownScript_0xbdad5
@@ -1491,7 +1491,7 @@ UnknownScript_0xbdadc:
 	displaylocation ROUTE_42, $2
 	farjump UnknownScript_0xa0add
 
-UnknownScript_0xbdae3:
+TullyPhoneScript2:
 	trainertotext FISHER, TULLY1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_TULLY
@@ -1527,7 +1527,7 @@ UnknownScript_0xbdb2c:
 	displaylocation ROUTE_42, $2
 	farjump UnknownScript_0xa05e6
 
-UnknownScript_0xbdb36:
+BrentPhoneScript1:
 	trainertotext POKEMANIAC, BRENT1, $0
 	checkflag ENGINE_BRENT
 	iftrue UnknownScript_0xbdb59
@@ -1546,7 +1546,7 @@ UnknownScript_0xbdb59:
 	displaylocation ROUTE_43, $2
 	farjump UnknownScript_0xa0a87
 
-UnknownScript_0xbdb60:
+BrentPhoneScript2:
 	trainertotext POKEMANIAC, BRENT1, $0
 	farscall UnknownScript_0xbe1b6
 	farscall UnknownScript_0xbde3f
@@ -1572,7 +1572,7 @@ UnknownScript_0xbdb8b:
 UnknownScript_0xbdb95:
 	farjump UnknownScript_0xa07ce
 
-UnknownScript_0xbdb99:
+TiffanyPhoneScript1:
 	trainertotext PICNICKER, TIFFANY3, $0
 	checkflag ENGINE_TIFFANY
 	iftrue UnknownScript_0xbdbc2
@@ -1597,7 +1597,7 @@ UnknownScript_0xbdbc9:
 	displaylocation ROUTE_43, $2
 	farjump UnknownScript_0xa0ae5
 
-UnknownScript_0xbdbd0:
+TiffanyPhoneScript2:
 	trainertotext PICNICKER, TIFFANY3, $0
 	farscall UnknownScript_0xbde45
 	if_equal $0, UnknownScript_0xbdc21
@@ -1673,7 +1673,7 @@ UnknownScript_0xbdc69:
 
 ; Vance
 
-UnknownScript_0xbdc73:
+VancePhoneScript1:
 	trainertotext BIRD_KEEPER, VANCE1, $0
 	checkflag ENGINE_VANCE
 	iftrue UnknownScript_0xbdc96
@@ -1692,7 +1692,7 @@ UnknownScript_0xbdc96:
 	displaylocation ROUTE_44, $2
 	farjump UnknownScript_0xa0a91
 
-UnknownScript_0xbdc9d:
+VancePhoneScript2:
 	trainertotext BIRD_KEEPER, VANCE1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_VANCE
@@ -1714,7 +1714,7 @@ UnknownScript_0xbdcc4:
 	setflag ENGINE_VANCE
 	farjump UnknownScript_0xa0376
 
-UnknownScript_0xbdcce:
+WiltonPhoneScript1:
 	trainertotext FISHER, WILTON1, $0
 	checkflag ENGINE_WILTON
 	iftrue UnknownScript_0xbdcf7
@@ -1739,7 +1739,7 @@ UnknownScript_0xbdcfe:
 	displaylocation ROUTE_44, $2
 	farjump UnknownScript_0xa0aed
 
-UnknownScript_0xbdd05:
+WiltonPhoneScript2:
 	trainertotext FISHER, WILTON1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_WILTON
@@ -1792,19 +1792,19 @@ UnknownScript_0xbdd6d:
 
 ; Kenji
 
-UnknownScript_0xbdd71:
+KenjiPhoneScript1:
 	trainertotext BLACKBELT_T, KENJI3, $0
 	farscall UnknownScript_0xbde4e
 	farjump UnknownScript_0xa09ee
 
-UnknownScript_0xbdd7d:
+KenjiPhoneScript2:
 	trainertotext BLACKBELT_T, KENJI3, $0
 	farscall UnknownScript_0xbe1b6
 	farjump UnknownScript_0xa064c
 
 ; Parry
 
-UnknownScript_0xbdd89:
+ParryPhoneScript1:
 	trainertotext HIKER, PARRY1, $0
 	checkflag ENGINE_PARRY
 	iftrue UnknownScript_0xbddac
@@ -1823,7 +1823,7 @@ UnknownScript_0xbddac:
 	displaylocation ROUTE_45, $2
 	farjump UnknownScript_0xa0a9b
 
-UnknownScript_0xbddb3:
+ParryPhoneScript2:
 	trainertotext HIKER, PARRY1, $0
 	farscall UnknownScript_0xbe1b6
 	checkflag ENGINE_PARRY
@@ -1847,7 +1847,7 @@ UnknownScript_0xbddda:
 
 ; Erin
 
-UnknownScript_0xbdde4:
+ErinPhoneScript1:
 	trainertotext PICNICKER, ERIN1, $0
 	checkflag ENGINE_ERIN
 	iftrue UnknownScript_0xbde07
@@ -1866,7 +1866,7 @@ UnknownScript_0xbde07:
 	displaylocation ROUTE_46, $2
 	farjump UnknownScript_0xa0aa0
 
-UnknownScript_0xbde0e:
+ErinPhoneScript2:
 	trainertotext PICNICKER, ERIN1, $0
 	farscall UnknownScript_0xbe41e
 	checkflag ENGINE_ERIN

engine/pokedex.asm

@@ -212,7 +212,7 @@ Function4013c: ; 4013c (10:413c)
 	ld [hBGMapMode], a ; $ff00+$d4
 	call ClearSprites
 	xor a
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld bc, $168
 	call ByteFill
 	callba Function1de171
@@ -725,7 +725,7 @@ Function4050a: ; 4050a (10:450a)
 	xor a
 	ld [hBGMapMode], a ; $ff00+$d4
 	xor a
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld bc, $168
 	call ByteFill
 	call Function41ae1
@@ -1071,10 +1071,10 @@ Function4074c: ; 4074c (10:474c)
 	ld de, Unknown_407f2
 	call Function40acd
 	ld a, $32
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld bc, $168
 	call ByteFill
-	ld hl, TileMap
+	hlcoord 0, 0
 	lb bc, 7, 7
 	call Function40ad5
 	hlcoord 0, 9
@@ -1135,7 +1135,7 @@ Unknown_407f2: ; 407f2
 
 Function407fd: ; 407fd
 	call Function40aa6
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld bc, $0f12
 	call Function40ad5
 	hlcoord 19, 0
@@ -1259,7 +1259,7 @@ String_4094c: ; 4094c
 
 Function40962: ; 40962 (10:4962)
 	call Function40aa6
-	ld hl, TileMap
+	hlcoord 0, 0
 	lb bc, 7, 7
 	call Function40ad5
 	hlcoord 0, 11
@@ -1387,9 +1387,9 @@ Unknown_40a3e: ; 40a3e
 ; 40aa6
 
 Function40aa6: ; 40aa6
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld a, $32
-	ld bc, $0168
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ret
 ; 40ab2

engine/predef.asm

@@ -79,7 +79,7 @@ PredefPointers:: ; 856b
 	add_predef Functioncbcdd
 	add_predef Predef2F
 	add_predef Function9853 ; $30
-	add_predef Function864c
+	add_predef Predef_LoadSGBLayout
 	add_predef Function91d11
 	add_predef CheckContestMon
 	add_predef Function8c20f

engine/scripting.asm

@@ -475,7 +475,7 @@ Script_loadmenudata: ; 0x96efa
 	ld de, LoadMenuDataHeader
 	ld a, [ScriptBank]
 	call Call_a_de
-	call DrawOnMap
+	call UpdateSprites
 	ret
 ; 0x96f0f
 
@@ -483,7 +483,7 @@ Script_writebackup: ; 0x96f0f
 ; script command 0x50
 
 	call WriteBackup
-	call DrawOnMap
+	call UpdateSprites
 	ret
 ; 0x96f16
 
@@ -1212,7 +1212,7 @@ ApplyPersonFacing: ; 0x9728b
 	jr nz, .asm_972b5 ; 0x972b0 $3
 	call Function972bc
 .asm_972b5
-	call DrawOnMap
+	call UpdateSprites
 	ret
 .not_visible
 	pop de
@@ -1222,8 +1222,8 @@ ApplyPersonFacing: ; 0x9728b
 
 Function972bc: ; 0x972bc
 	call Function217a
-	ld hl, TileMap
-	ld bc, $0168
+	hlcoord 0, 0
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 .asm_972c5
 	res 7, [hl]
 	inc hl
@@ -1470,7 +1470,7 @@ Script_loadpikachudata: ; 0x973f0
 ; script command 0x5a
 
 	ld a, PIKACHU
-	ld [wd22e], a
+	ld [TempWildMonSpecies], a
 	ld a, 5
 	ld [CurPartyLevel], a
 	ret
@@ -1505,7 +1505,7 @@ Script_loadpokedata: ; 0x97412
 	ld a, $80
 	ld [wd459], a
 	call GetScriptByte
-	ld [wd22e], a
+	ld [TempWildMonSpecies], a
 	call GetScriptByte
 	ld [CurPartyLevel], a
 	ret
@@ -2970,7 +2970,7 @@ Script_reloadmappart:: ; 0x97ae3
 	call Function2173
 	call Function2914
 	callba Function104061
-	call DrawOnMap
+	call UpdateSprites
 	ret
 ; 0x97af6
 

engine/spawn_points.asm

@@ -4,46 +4,42 @@ SpawnPoints: ; 0x152ab
 	const_def
 
 spawn: MACRO
-; name, map, y, x
-\1\@ EQUS "SPAWN_\1"
-	const \1\@
-	map \2
-	db \3, \4
+; map, y, x
+	map \1
+	db \2, \3
 ENDM
 
-	spawn HOME,        KRISS_HOUSE_2F,              3,  3
-	spawn DEBUG,       VIRIDIAN_POKECENTER_1F,      5,  3
+	spawn KRISS_HOUSE_2F,              3,  3
+	spawn VIRIDIAN_POKECENTER_1F,      5,  3
 
-	spawn PALLET,      PALLET_TOWN,                 5,  6
-	spawn VIRIDIAN,    VIRIDIAN_CITY,              23, 26
-	spawn PEWTER,      PEWTER_CITY,                13, 26
-	spawn CERULEAN,    CERULEAN_CITY,              19, 22
-	spawn ROCK_TUNNEL, ROUTE_10_NORTH,             11,  2
-	spawn VERMILION,   VERMILION_CITY,              9,  6
-	spawn LAVENDER,    LAVENDER_TOWN,               5,  6
-	spawn SAFFRON,     SAFFRON_CITY,                9, 30
-	spawn CELADON,     CELADON_CITY,               29, 10
-	spawn FUCHSIA,     FUCHSIA_CITY,               19, 28
-	spawn CINNABAR,    CINNABAR_ISLAND,            11, 12
-	spawn INDIGO,      ROUTE_23,                    9,  6
+	spawn PALLET_TOWN,                 5,  6
+	spawn VIRIDIAN_CITY,              23, 26
+	spawn PEWTER_CITY,                13, 26
+	spawn CERULEAN_CITY,              19, 22
+	spawn ROUTE_10_NORTH,             11,  2
+	spawn VERMILION_CITY,              9,  6
+	spawn LAVENDER_TOWN,               5,  6
+	spawn SAFFRON_CITY,                9, 30
+	spawn CELADON_CITY,               29, 10
+	spawn FUCHSIA_CITY,               19, 28
+	spawn CINNABAR_ISLAND,            11, 12
+	spawn ROUTE_23,                    9,  6
 
-	spawn NEW_BARK,    NEW_BARK_TOWN,              13,  6
-	spawn CHERRYGROVE, CHERRYGROVE_CITY,           29,  4
-	spawn VIOLET,      VIOLET_CITY,                31, 26
-	spawn UNION_CAVE,  ROUTE_32,                   11, 74
-	spawn AZALEA,      AZALEA_TOWN,                15, 10
-	spawn CIANWOOD,    CIANWOOD_CITY,              23, 44
-	spawn GOLDENROD,   GOLDENROD_CITY,             15, 28
-	spawn OLIVINE,     OLIVINE_CITY,               13, 22
-	spawn ECRUTEAK,    ECRUTEAK_CITY,              23, 28
-	spawn MAHOGANY,    MAHOGANY_TOWN,              15, 14
-	spawn LAKE,        LAKE_OF_RAGE,               21, 29
-	spawn BLACKTHORN,  BLACKTHORN_CITY,            21, 30
-	spawn MT_SILVER,   SILVER_CAVE_OUTSIDE,        23, 20
-	spawn FAST_SHIP,   FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
-NUM_SPAWNS EQU const_value
-const_value = -1
-	spawn N_A,         N_A,                        -1, -1
+	spawn NEW_BARK_TOWN,              13,  6
+	spawn CHERRYGROVE_CITY,           29,  4
+	spawn VIOLET_CITY,                31, 26
+	spawn ROUTE_32,                   11, 74
+	spawn AZALEA_TOWN,                15, 10
+	spawn CIANWOOD_CITY,              23, 44
+	spawn GOLDENROD_CITY,             15, 28
+	spawn OLIVINE_CITY,               13, 22
+	spawn ECRUTEAK_CITY,              23, 28
+	spawn MAHOGANY_TOWN,              15, 14
+	spawn LAKE_OF_RAGE,               21, 29
+	spawn BLACKTHORN_CITY,            21, 30
+	spawn SILVER_CAVE_OUTSIDE,        23, 20
+	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
+	spawn N_A,                        -1, -1
 
 
 
@@ -93,7 +89,7 @@ IsSpawnPoint: ; 15344
 
 .next
 	push bc
-	ld bc, 4
+	ld bc, 4 ; length of a spawn table entry
 	add hl, bc
 	pop bc
 	inc c

engine/specials.asm

@@ -75,7 +75,7 @@ SpecialsPointers:: ; c029
 	add_special WhiteBGMap
 	add_special UpdateTimePals
 	add_special ClearTileMap
-	add_special DrawOnMap
+	add_special UpdateSprites
 	add_special Special_ReplaceKrisSprite
 	add_special Special_GameCornerPrizeMonCheckDex
 	add_special SpecialSeenMon
@@ -110,9 +110,9 @@ SpecialsPointers:: ; c029
 	add_special SpecialNameRater
 	add_special Functionc2da
 	add_special GetFirstPokemonHappiness
-	add_special Function71ac
-	add_special Function2a4ab
-	add_special Function2a51f
+	add_special CheckFirstMonIsEgg
+	add_special RandomPhoneRareWildMon
+	add_special RandomPhoneWildMon
 	add_special RandomPhoneMon
 	add_special RunCallback_04
 	add_special Functionfb841

engine/std_scripts.asm

@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall ELMCALL_WEIRDBROADCAST
-	domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
+	domaptrigger MAHOGANY_TOWN, $1
 	end
 
 BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
 	setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
 	setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
-	warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
+	warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
 	applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
 
 BugContestResultsScript:
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
 BugContestResults_CleanUp
 	loadmovesprites
 	dotrigger $0
-	domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
+	domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A

home.asm

@@ -215,9 +215,9 @@ INCLUDE "home/copy2.asm"
 Function309d:: ; 309d
 	ld a, [rSVBK]
 	push af
-	ld a, 2
+	ld a, BANK(w2_d000)
 	ld [rSVBK], a
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld de, w2_d000
 	ld bc, TileMapEnd - TileMap
 	call CopyBytes
@@ -238,10 +238,10 @@ Function30b4:: ; 30b4
 Function30bf:: ; 30bf
 	ld a, [rSVBK]
 	push af
-	ld a, 2
+	ld a, BANK(w2_d000)
 	ld [rSVBK], a
 	ld hl, w2_d000
-	ld de, TileMap
+	decoord 0, 0
 	ld bc, TileMapEnd - TileMap
 	call CopyBytes
 	pop af
@@ -251,9 +251,11 @@ Function30bf:: ; 30bf
 
 
 CopyName1:: ; 30d6
+; Copies the name from de to StringBuffer2
 	ld hl, StringBuffer2
 
 CopyName2:: ; 30d9
+; Copies the name from de to hl
 .loop
 	ld a, [de]
 	inc de
@@ -271,7 +273,7 @@ IsInArray:: ; 30e1
 	ld c, a
 .loop
 	ld a, [hl]
-	cp $ff
+	cp -1
 	jr z, .NotInArray
 	cp c
 	jr z, .InArray
@@ -300,17 +302,6 @@ SkipNames:: ; 0x30f4
 	ret
 ; 0x30fe
 
-AddNTimes:: ; 0x30fe
-; Add bc * a to hl.
-	and a
-	ret z
-.loop
-	add hl, bc
-	dec a
-	jr nz, .loop
-	ret
-; 0x3105
-
 
 INCLUDE "home/math.asm"
 
@@ -626,11 +617,11 @@ Function3246:: ; 3246
 	di
 	ld a, $1
 	ld [rVBK], a
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	call Function327b
 	ld a, $0
 	ld [rVBK], a
-	ld hl, TileMap
+	hlcoord 0, 0
 	call Function327b
 .wait2
 	ld a, [rLY]
@@ -727,7 +718,7 @@ ClearPalettes:: ; 3317
 	ld a, [rSVBK]
 	push af
 
-	ld a, 5
+	ld a, BANK(BGPals)
 	ld [rSVBK], a
 
 ; Fill BGPals and OBPals with $ffff (white)
@@ -761,7 +752,7 @@ GetSGBLayout:: ; 3340
 	ret z
 
 .sgb
-	predef_jump Function864c ; LoadSGBLayout
+	predef_jump Predef_LoadSGBLayout ; LoadSGBLayout
 ; 334e
 
 
@@ -1273,11 +1264,11 @@ Function3599:: ; 3599
 ; 35b0
 
 Function35b0:: ; 35b0
-	ld hl, wdbf9 + 3
+	ld hl, wCurrentCaller + 3
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wdbf9 + 2]
+	ld a, [wCurrentCaller + 2]
 	and a
 	jr z, .asm_35d3
 
@@ -1311,7 +1302,7 @@ Function35b0:: ; 35b0
 .asm_35d5
 	pop af
 	ld d, a
-	ld a, [wdbf9 + 2]
+	ld a, [wCurrentCaller + 2]
 	sub d
 	inc a
 	scf
@@ -2153,11 +2144,11 @@ endr
 ; 3f20
 
 Function3f20:: ; 3f20
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld b, $6
 	ld c, $14
 	call Function3f35
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld b, $4
 	ld c, $12
 	call Function3f47

home/battle.asm

@@ -312,7 +312,7 @@ BattleTextBox:: ; 3ac3
 	push hl
 	call SpeechTextBox
 	call MobileTextBorder
-	call DrawOnMap
+	call UpdateSprites
 	call Function321c
 	pop hl
 	call PrintTextBoxText

home/map.asm

@@ -97,7 +97,7 @@ GetMapTrigger:: ; 2147
 
 Function2173:: ; 2173
 	call Function217a
-	call Functiondb1
+	call FarCallSwapTextboxPalettes
 	ret
 ; 217a
 
@@ -110,7 +110,7 @@ Function217a:: ; 217a
 
 	call Function2198
 	ld a, $60
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld bc, TileMapEnd - TileMap
 	call ByteFill
 
@@ -1143,7 +1143,7 @@ ObjectEvent:: ; 0x26ef
 ; 0x26f2
 
 ObjectEventText::
-	TX_FAR _ObjectEventText
+	text_jump _ObjectEventText
 	db "@"
 ; 0x26f7
 
@@ -1200,11 +1200,11 @@ Function271e:: ; 271e
 
 
 Function272a:: ; 272a
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld de, BGMapBuffer
 	call Function27b7
 	ld c, $28
-	call Functiondbd
+	call FarCallScrollBGMapPalettes
 	ld a, [wd152]
 	ld e, a
 	ld a, [wd153]
@@ -1220,7 +1220,7 @@ Function2748:: ; 2748
 	ld de, BGMapBuffer
 	call Function27b7
 	ld c, $28
-	call Functiondbd
+	call FarCallScrollBGMapPalettes
 	ld a, [wd152]
 	ld l, a
 	ld a, [wd153]
@@ -1239,11 +1239,11 @@ Function2748:: ; 2748
 ; 2771
 
 Function2771:: ; 2771
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld de, BGMapBuffer
 	call Function27c0
 	ld c, $24
-	call Functiondbd
+	call FarCallScrollBGMapPalettes
 	ld a, [wd152]
 	ld e, a
 	ld a, [wd153]
@@ -1259,7 +1259,7 @@ Function278f:: ; 278f
 	ld de, BGMapBuffer
 	call Function27c0
 	ld c, $24
-	call Functiondbd
+	call FarCallScrollBGMapPalettes
 	ld a, [wd152]
 	ld e, a
 	and $e0
@@ -1966,7 +1966,7 @@ FadeToMenu:: ; 2b29
 Function2b3c:: ; 2b3c
 	call WhiteBGMap
 	call Function2bae
-	call DrawOnMap
+	call UpdateSprites
 	call Function1d7d
 	call Functiond90
 	jr Function2b5c
@@ -1976,7 +1976,7 @@ Function2b4d:: ; 2b4d
 	call WhiteBGMap
 	call Function1d7d
 	call Function2bae
-	call DrawOnMap
+	call UpdateSprites
 	call Functiond90
 ; 2b5c
 
@@ -2003,7 +2003,7 @@ Function2b74:: ; 0x2b74
 	call TextBox
 	ld hl, VramState
 	set 0, [hl]
-	call DrawOnMap
+	call UpdateSprites
 	call Function3200
 	ld b, $9
 	call GetSGBLayout

home/map_objects.asm

@@ -84,7 +84,7 @@ Function184a:: ; 184a
 	ret
 ; 1852
 
-Function1852:: ; 1852
+CheckOnWater:: ; 1852
 	ld a, [StandingTile]
 	call GetTileCollision
 	sub 1
@@ -147,7 +147,7 @@ Function1875:: ; 1875
 	ret
 ; 188e
 
-Function188e:: ; 188e
+CheckSuperTallGrassTile:: ; 188e
 	cp $14
 	ret z
 	cp $1c
@@ -549,7 +549,7 @@ Function1a71:: ; 1a71
 	ld d, 0
 	ld hl, ObjectStruct3_Data + 1
 rept OBJECT_STRUCT_3_DATA_WIDTH
-	add hl,de
+	add hl, de
 endr
 	ld b, h
 	ld c, l
@@ -623,7 +623,7 @@ ResetVramState_Bit0:: ; 1acc
 ; 1ad2
 
 
-DrawOnMap:: ; 1ad2
+UpdateSprites:: ; 1ad2
 	ld a, [VramState]
 	bit 0, a
 	ret z

home/math.asm

@@ -1,3 +1,14 @@
+AddNTimes:: ; 0x30fe
+; Add bc * a to hl.
+	and a
+	ret z
+.loop
+	add hl, bc
+	dec a
+	jr nz, .loop
+	ret
+; 0x3105
+
 SimpleMultiply:: ; 3105
 ; Return a * c.
 	and a

home/menu.asm

@@ -75,7 +75,7 @@ InterpretMenu2:: ; 0x1d81
 	xor a
 	ld [hBGMapMode], a
 	call Function1cbb
-	call DrawOnMap
+	call UpdateSprites
 	call Function1c89
 	call Function321c
 	call Function1c66

home/movement.asm

@@ -209,7 +209,7 @@ WriteBackup:: ; 0x1c17
 	push af
 	call ExitMenu
 	call Function321c
-	call DrawOnMap
+	call UpdateSprites
 	pop af
 	ret
 

home/palettes.asm

@@ -323,23 +323,23 @@ Special_ReloadSpritesNoPalettes:: ; d91
 ; db1
 
 
-Functiondb1:: ; db1
+FarCallSwapTextboxPalettes:: ; db1
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(Function4c000)
+	ld a, BANK(SwapTextboxPalettes)
 	rst Bankswitch
-	call Function4c000
+	call SwapTextboxPalettes
 	pop af
 	rst Bankswitch
 	ret
 ; dbd
 
-Functiondbd:: ; dbd
+FarCallScrollBGMapPalettes:: ; dbd
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(Function4c03f)
+	ld a, BANK(ScrollBGMapPalettes)
 	rst Bankswitch
-	call Function4c03f
+	call ScrollBGMapPalettes
 	pop af
 	rst Bankswitch
 	ret

home/text.asm

@@ -37,7 +37,7 @@ Functionfb8::
 ClearTileMap:: ; fc8
 ; Fill TileMap with blank tiles.
 
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld a, " "
 	ld bc, TileMapEnd - TileMap
 	call ByteFill
@@ -52,7 +52,7 @@ ClearTileMap:: ; fc8
 
 ClearScreen:: ; fdb
 	ld a, TEXTBOX_PAL
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	jr ClearTileMap
@@ -163,7 +163,7 @@ TestText:: ; 1048
 	done
 ; 1052
 
-Function1052:: ; 1052
+RadioTerminator:: ; 1052
 	ld hl, .stop
 	ret
 .stop	db "@"
@@ -181,14 +181,14 @@ Function105a:: ; 105a
 
 PrintTextBoxText:: ; 1065
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
-	call Function13e5
+	call PlaceWholeStringInBoxAtOnce
 	ret
 ; 106c
 
 SetUpTextBox:: ; 106c
 	push hl
 	call SpeechTextBox
-	call DrawOnMap
+	call UpdateSprites
 	call Function321c
 	pop hl
 	ret
@@ -478,7 +478,7 @@ Char16:: ; 12b9
 	jr .asm_12c4
 
 .asm_12d1
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld de, SCREEN_WIDTH
 	ld a, c
 .asm_12d8
@@ -697,7 +697,7 @@ Function13e0:: ; 13e0
 ; 13e5
 
 
-Function13e5:: ; 13e5
+PlaceWholeStringInBoxAtOnce:: ; 13e5
 	ld a, [TextBoxFrame + 1]
 	push af
 	set 1, a
@@ -780,7 +780,7 @@ Text_00:: ; 143e
 ; 1449
 
 Text_01:: ; 1449
-; TX_RAM
+; text_from_ram
 ; write text from a ram address
 ; little endian
 ; [$01][addr]
@@ -798,7 +798,7 @@ Text_01:: ; 1449
 ; 1455
 
 Text_16:: ; 1455
-; TX_FAR
+; text_jump
 ; write text from a different bank
 ; little endian
 ; [$16][addr][bank]

home/tilemap.asm

@@ -186,7 +186,7 @@ endr
 	xor a
 	ld b, a
 	add hl, bc
-	ld bc, TileMap
+	bccoord 0, 0
 	add hl, bc
 	ret
 ; 1d19
@@ -216,7 +216,7 @@ endr
 	xor a
 	ld b, a
 	add hl, bc
-	ld bc, AttrMap
+	bccoord 0, 0, AttrMap
 	add hl, bc
 	ret
 ; 1d35

home/video.asm

@@ -169,7 +169,7 @@ UpdateBGMap:: ; 164c
 	ld a, 1
 	ld [rVBK], a
 
-	ld hl, AttrMap
+	hlcoord 0, 0, AttrMap
 	call .update
 
 	ld a, 0
@@ -178,7 +178,7 @@ UpdateBGMap:: ; 164c
 
 
 .Tiles
-	ld hl, TileMap
+	hlcoord 0, 0
 
 
 .update

home/window.asm

@@ -83,7 +83,7 @@ Function2e31:: ; 2e31
 	ld [hBGMapMode], a
 	ld a, $1
 	ld [hOAMUpdate], a
-	call DrawOnMap
+	call UpdateSprites
 	xor a
 	ld [hOAMUpdate], a
 	call DelayFrame

items/item_effects.asm

@@ -1912,7 +1912,7 @@ Functionf24a: ; f24a (3:724a)
 Functionf279: ; f279 (3:7279)
 	xor a
 	ld [hBGMapMode], a
-	ld hl, TileMap
+	hlcoord 0, 0
 	ld bc, TileMapEnd - TileMap
 	ld a, " "
 	call ByteFill

macros/enum.asm

@@ -31,6 +31,6 @@ const_value = const_value + 1
 ENDM
 
 shift_const: MACRO
-\1 EQU 1 << const_value
+\1 EQU (1 << const_value)
 const_value = const_value + 1
 ENDM

macros/event.asm

@@ -120,16 +120,14 @@ ptcallasm: macro
 	enum checkmaptriggers_command
 checkmaptriggers: macro
 	db checkmaptriggers_command
-	db \1 ; map_group
-	db \2 ; map_id
+	map \1 ; map
 	endm
 
 	enum domaptrigger_command
 domaptrigger: macro
 	db domaptrigger_command
-	db \1 ; map_group
-	db \2 ; map_id
-	db \3 ; trigger_id
+	map \1 ; map
+	db \2 ; trigger_id
 	endm
 
 	enum checktriggers_command
@@ -385,24 +383,21 @@ xycompare: macro
 warpmod: macro
 	db warpmod_command
 	db \1 ; warp_id
-	db \2 ; map_group
-	db \3 ; map_id
+	map \2 ; map
 	endm
 
 	enum blackoutmod_command
 blackoutmod: macro
 	db blackoutmod_command
-	db \1 ; map_group
-	db \2 ; map_id
+	map \1 ; map
 	endm
 
 	enum warp_command
 warp: macro
 	db warp_command
-	db \1 ; map_group
-	db \2 ; map_id
-	db \3 ; x
-	db \4 ; y
+	map \1 ; map
+	db \2 ; x
+	db \3 ; y
 	endm
 
 	enum readmoney_command
@@ -997,8 +992,7 @@ verbosegiveitem2: macro
 loadwilddata: macro
 	db loadwilddata_command
 	db \1 ; flag
-	db \2 ; map_group
-	db \3 ; map_id
+	map \2 ; map
 	endm
 
 	enum halloffame_command
@@ -1015,10 +1009,9 @@ credits: macro
 warpfacing: macro
 	db warpfacing_command
 	db \1 ; facing
-	db \2 ; map_group
-	db \3 ; map_id
-	db \4 ; x
-	db \5 ; y
+	map \2 ; map
+	db \3 ; x
+	db \4 ; y
 	endm
 
 	enum storetext_command

macros/map.asm

@@ -1,12 +1,5 @@
 map: MACRO
-; This is a silly hack to get around an rgbds bug.
-
-; Ideally:
-;	db GROUP_\1, MAP_\1
-
-\1\@  EQUS "GROUP_\1"
-\1\@2 EQUS "MAP_\1"
-	db \1\@, \1\@2
+	db GROUP_\1, MAP_\1
 ENDM
 
 roam_map: MACRO
@@ -23,16 +16,17 @@ roam_map: MACRO
 	db 0
 ENDM
 
-
 person_event: macro
 	db \1 ; sprite
 	db \2 ; y
 	db \3 ; x
-	db \4 ; facing
-	db \5 ; movement
-	db \6 ; clock_hour
-	db \7 ; clock_daytime
-	db \8 ; color_function
+	db \4 ; movement function
+	dn \5, \6 ; radius: y, x
+	db \7 ; clock_hour
+	db \8 ; clock_daytime
+	shift
+	dn \8, \9 ; color_function
+	shift
 	db \9 ; sight_range
 	shift
 	dw \9 ; pointer
@@ -61,8 +55,7 @@ warp_def: macro
 	db \1 ; y
 	db \2 ; x
 	db \3 ; warp_to
-	db \4 ; map group
-	db \5 ; map number
+	map \4 ; map
 	endm
 
 
@@ -164,16 +157,23 @@ endc
 ENDM
 
 mapgroup: MACRO
-; map id, height, width
-\1\@  EQUS "GROUP_\1"
-\1\@2 EQUS "MAP_\1"
-\1\@ EQU const_value
-	enum \1\@2
+GROUP_\1 EQU const_value
+	enum MAP_\1
 \1_HEIGHT EQU \2
 \1_WIDTH EQU \3
 ENDM
+; map id, height, width
+; \1\@  EQUS "GROUP_\1"
+; \1\@_2 EQUS "MAP_\1"
+; \1\@ EQU const_value
+	; enum \1\@_2
 
 newgroup: MACRO
 const_value = const_value + 1
 	enum_start 1
 ENDM
+
+elevfloor: MACRO
+	db \1, \2
+	map \3
+ENDM

macros/movement.asm

@@ -359,12 +359,12 @@ __enum__ = $51
 
 	enum movement_fish_got_bite
 fish_got_bite: macro
-	db movement_fish_got_bite
+	db movement_fish_got_bite ; $51
 	endm
 
 	enum movement_fish_got_bite_2
 fish_got_bite_2: macro
-	db movement_fish_got_bite_2
+	db movement_fish_got_bite_2 ; $52
 	endm
 
 	enum movement_hide_emote
@@ -382,3 +382,10 @@ step_shake: macro
 	db movement_step_shake ; $55
 	db \1 ; displacement
 	endm
+
+__enum__ = $57
+	enum movement_rock_smash
+rock_smash: macro
+	db movement_rock_smash ; $57
+	db \1
+	endm

macros/text.asm

@@ -12,19 +12,19 @@ page   EQUS "db $50,"     ; Start a new Pokedex page.
 dex    EQUS "db $e8, $50" ; End a Pokedex entry.
 
 
-TX_RAM: MACRO
-	db 1
-	dw \1
-	ENDM
+TX_RAM EQU $01
+TX_FAR EQU $16
 
-TX_FAR: MACRO
-	db $16
+text_jump: MACRO
+	db TX_FAR
 	dw \1
 	db BANK(\1)
 	ENDM
 
-
-text_from_ram EQUS "TX_RAM"
+text_from_ram: MACRO
+	db TX_RAM
+	dw \1
+	ENDM
 
 text_dunno1: macro
 	db 5
@@ -81,4 +81,3 @@ current_day: macro
 	db $15
 	endm
 
-text_jump EQUS "TX_FAR"

macros/trainer.asm

@@ -1,11 +1,11 @@
-trainerclass: MACRO
-	enum \1
-const_value = 1
-ENDM
-
-trainer: MACRO
-	; flag, group, id, seen text, win text, lost text, talk-again text
-	dw \1
-	db \2, \3
-	dw \4, \5, \6, \7
-ENDM
+trainerclass: MACRO
+	enum \1
+const_value = 1
+ENDM
+
+trainer: MACRO
+	; flag, group, id, seen text, win text, lost text, talk-again text
+	dw \1
+	db \2, \3
+	dw \4, \5, \6, \7
+ENDM

maps/AzaleaGym.asm

@@ -27,7 +27,7 @@ BugsyScript_0x18ec1e:
 	scall AzaleaGymTriggerRockets
 .FightDone
 	checkevent EVENT_GOT_TM49_FURY_CUTTER
-	iftrue UnknownScript_0x18ec6d
+	iftrue .GotFuryCutter
 	setevent EVENT_BEAT_TWINS_AMY_AND_MAY
 	setevent EVENT_BEAT_BUG_CATCHER_BENNY
 	setevent EVENT_BEAT_BUG_CATCHER_AL
@@ -35,17 +35,17 @@ BugsyScript_0x18ec1e:
 	writetext UnknownText_0x18ee2b
 	keeptextopen
 	verbosegiveitem TM_FURY_CUTTER, 1
-	iffalse UnknownScript_0x18ec71
+	iffalse .NoRoomForFuryCutter
 	setevent EVENT_GOT_TM49_FURY_CUTTER
 	writetext UnknownText_0x18eefa
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x18ec6d:
+.GotFuryCutter:
 	writetext UnknownText_0x18ef98
 	closetext
-UnknownScript_0x18ec71:
+.NoRoomForFuryCutter:
 	loadmovesprites
 	end
 
@@ -61,9 +61,9 @@ AzaleaGymTriggerRockets:
 	jumpstd radiotowerrockets
 
 TrainerTwinsAmyandmay1:
-	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, TwinsAmyandmay1Script
+	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
 
-TwinsAmyandmay1Script:
+.AfterScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f1fc
@@ -72,9 +72,9 @@ TwinsAmyandmay1Script:
 	end
 
 TrainerTwinsAmyandmay2:
-	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, TwinsAmyandmay2Script
+	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
 
-TwinsAmyandmay2Script:
+.AfterScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f269
@@ -83,9 +83,9 @@ TwinsAmyandmay2Script:
 	end
 
 TrainerBug_catcherBug_catcher_benny:
-	trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, Bug_catcherBug_catcher_bennyScript
+	trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
 
-Bug_catcherBug_catcher_bennyScript:
+.AfterScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f053
@@ -94,9 +94,9 @@ Bug_catcherBug_catcher_bennyScript:
 	end
 
 TrainerBug_catcherAl:
-	trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, Bug_catcherAlScript
+	trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
 
-Bug_catcherAlScript:
+.AfterScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f0d3
@@ -105,9 +105,9 @@ Bug_catcherAlScript:
 	end
 
 TrainerBug_catcherJosh:
-	trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, Bug_catcherJoshScript
+	trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
 
-Bug_catcherJoshScript:
+.AfterScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f17e
@@ -358,8 +358,8 @@ AzaleaGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
-	warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
+	warp_def $f, $4, 5, AZALEA_TOWN
+	warp_def $f, $5, 5, AZALEA_TOWN
 
 .XYTriggers:
 	db 0
@@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
 
 .PersonEvents:
 	db 7
-	person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
-	person_event SPRITE_BUG_CATCHER, 7, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
-	person_event SPRITE_BUG_CATCHER, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
-	person_event SPRITE_BUG_CATCHER, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
-	person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
-	person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
-	person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1
+	person_event SPRITE_BUGSY, 11, 9, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
+	person_event SPRITE_BUG_CATCHER, 7, 9, $a, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
+	person_event SPRITE_BUG_CATCHER, 12, 12, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
+	person_event SPRITE_BUG_CATCHER, 6, 4, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
+	person_event SPRITE_TWIN, 14, 8, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
+	person_event SPRITE_TWIN, 14, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
+	person_event SPRITE_GYM_GUY, 17, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1

maps/AzaleaMart.asm

@@ -46,8 +46,8 @@ AzaleaMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
-	warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
+	warp_def $7, $2, 3, AZALEA_TOWN
+	warp_def $7, $3, 3, AZALEA_TOWN
 
 .XYTriggers:
 	db 0
@@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
 
 .PersonEvents:
 	db 3
-	person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
-	person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
-	person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1
+	person_event SPRITE_CLERK, 7, 5, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
+	person_event SPRITE_COOLTRAINER_M, 9, 6, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
+	person_event SPRITE_BUG_CATCHER, 6, 11, $5, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1

maps/AzaleaPokeCenter1F.asm

@@ -78,9 +78,9 @@ AzaleaPokeCenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
-	warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
-	warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
+	warp_def $7, $3, 1, AZALEA_TOWN
+	warp_def $7, $4, 1, AZALEA_TOWN
+	warp_def $7, $0, 1, POKECENTER_2F
 
 .XYTriggers:
 	db 0
@@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1
-	person_event SPRITE_GENTLEMAN, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
-	person_event SPRITE_FISHING_GURU, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
-	person_event SPRITE_POKEFAN_F, 8, 5, OW_DOWN | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1
+	person_event SPRITE_NURSE, 5, 7, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
+	person_event SPRITE_GENTLEMAN, 10, 13, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
+	person_event SPRITE_FISHING_GURU, 5, 10, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
+	person_event SPRITE_POKEFAN_F, 8, 5, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1

maps/AzaleaTown.asm

@@ -452,14 +452,14 @@ AzaleaTown_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F
-	warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN
-	warp_def $5, $15, 2, GROUP_AZALEA_MART, MAP_AZALEA_MART
-	warp_def $5, $9, 1, GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE
-	warp_def $f, $a, 1, GROUP_AZALEA_GYM, MAP_AZALEA_GYM
-	warp_def $7, $1f, 1, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
-	warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
-	warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
+	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
 
 .XYTriggers:
 	db 3
@@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
 
 .PersonEvents:
 	db 12
-	person_event SPRITE_AZALEA_ROCKET, 13, 35, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	person_event SPRITE_GRAMPS, 13, 25, OW_DOWN | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
-	person_event SPRITE_TEACHER, 17, 19, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
-	person_event SPRITE_YOUNGSTER, 13, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
-	person_event SPRITE_SLOWPOKE, 21, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 22, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 33, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 19, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_FRUIT_TREE, 6, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
-	person_event SPRITE_AZALEA_ROCKET, 14, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
-	person_event SPRITE_AZALEA_ROCKET, 20, 14, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
-	person_event SPRITE_KURT_OUTSIDE, 9, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
+	person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	person_event SPRITE_GRAMPS, 13, 25, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
+	person_event SPRITE_TEACHER, 17, 19, $4, 2, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
+	person_event SPRITE_YOUNGSTER, 13, 11, $5, 0, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
+	person_event SPRITE_SLOWPOKE, 21, 12, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 13, 22, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 13, 33, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 19, 19, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_FRUIT_TREE, 6, 12, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
+	person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
+	person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
+	person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

maps/BattleTower1F.asm

@@ -102,9 +102,9 @@ UnknownScript_0x9e44e:
 	special Function170687
 UnknownScript_0x9e454:
 	musicfadeout MUSIC_NONE, $8
-	domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0
-	domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0
-	domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0
+	domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
+	domaptrigger BATTLE_TOWER_ELEVATOR, $0
+	domaptrigger BATTLE_TOWER_HALLWAY, $0
 	follow $2, PLAYER
 	applymovement $2, MovementData_0x9e571
 	writebyte $a
@@ -797,9 +797,9 @@ BattleTower1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
-	warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
-	warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR
+	warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE
+	warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
+	warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
 
 .XYTriggers:
 	db 0
@@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_RECEPTIONIST, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1
-	person_event SPRITE_YOUNGSTER, 13, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1
-	person_event SPRITE_COOLTRAINER_F, 13, 8, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1
-	person_event SPRITE_BUG_CATCHER, 7, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1
-	person_event SPRITE_GRANNY, 7, 18, OW_UP | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1
+	person_event SPRITE_RECEPTIONIST, 10, 11, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
+	person_event SPRITE_YOUNGSTER, 13, 18, $9, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
+	person_event SPRITE_COOLTRAINER_F, 13, 8, $5, 0, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
+	person_event SPRITE_BUG_CATCHER, 7, 5, $2, 1, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
+	person_event SPRITE_GRANNY, 7, 18, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1

maps/BattleTowerBattleRoom.asm

@@ -85,14 +85,14 @@ UnknownScript_0x9f4a3:
 	special Function170687
 	loadmovesprites
 	special FadeBlackBGMap
-	warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
+	warpfacing $1, BATTLE_TOWER_1F, $7, $7
 	loadfont
 	jump UnknownScript_0x9e4b0
 
 UnknownScript_0x9f4c2:
 	pause 60
 	special Special_BattleTowerFade
-	warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
+	warpfacing $1, BATTLE_TOWER_1F, $7, $7
 	writebyte $4
 	special Function170687
 	loadfont
@@ -104,7 +104,7 @@ UnknownScript_0x9f4c2:
 UnknownScript_0x9f4d9:
 	pause 60
 	special Special_BattleTowerFade
-	warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
+	warpfacing $1, BATTLE_TOWER_1F, $7, $7
 BattleTowerBattleRoomScript_0x9f4e4:
 	loadfont
 	writetext UnknownText_0x9eaef
@@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
-	warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
+	warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
+	warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
 
 .XYTriggers:
 	db 0
@@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1
+	person_event SPRITE_YOUNGSTER, 4, 8, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+	person_event SPRITE_RECEPTIONIST, 10, 5, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1

maps/BattleTowerElevator.asm

@@ -49,8 +49,8 @@ BattleTowerElevator_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
-	warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
+	warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
+	warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
 
 .XYTriggers:
 	db 0
@@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_RECEPTIONIST, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1
+	person_event SPRITE_RECEPTIONIST, 6, 5, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1

maps/BattleTowerHallway.asm

@@ -81,12 +81,12 @@ BattleTowerHallway_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR
-	warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $7, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $9, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
-	warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
+	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
 
 .XYTriggers:
 	db 0
@@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1
+	person_event SPRITE_RECEPTIONIST, 6, 15, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1

maps/BattleTowerOutside.asm

@@ -128,10 +128,10 @@ BattleTowerOutside_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
-	warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
-	warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
-	warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
+	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
 
 .XYTriggers:
 	db 0
@@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_STANDING_YOUNGSTER, 16, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1
-	person_event SPRITE_BUENA, 15, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1
-	person_event SPRITE_SAILOR, 22, 16, OW_UP | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	person_event SPRITE_LASS, 28, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1
+	person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
+	person_event SPRITE_BUENA, 15, 17, $2, 1, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
+	person_event SPRITE_SAILOR, 22, 16, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	person_event SPRITE_LASS, 28, 16, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, ObjectEvent, -1

maps/BillsHouse.asm

@@ -356,8 +356,8 @@ BillsHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25
-	warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25
+	warp_def $7, $2, 1, ROUTE_25
+	warp_def $7, $3, 1, ROUTE_25
 
 .XYTriggers:
 	db 0
@@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1
+	person_event SPRITE_GRAMPS, 7, 6, $7, 2, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1

maps/BlackthornCity.asm

@@ -309,14 +309,14 @@ BlackthornCity_MapEventHeader:
 
 .Warps:
 	db 8
-	warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
-	warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE
-	warp_def $17, $1d, 1, GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE, MAP_BLACKTHORN_DODRIO_TRADE_HOUSE
-	warp_def $1d, $f, 2, GROUP_BLACKTHORN_MART, MAP_BLACKTHORN_MART
-	warp_def $1d, $15, 1, GROUP_BLACKTHORN_POKECENTER_1F, MAP_BLACKTHORN_POKECENTER_1F
-	warp_def $1f, $9, 1, GROUP_MOVE_DELETERS_HOUSE, MAP_MOVE_DELETERS_HOUSE
-	warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
-	warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
+	warp_def $b, $12, 1, BLACKTHORN_GYM_1F
+	warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
+	warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_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
 
 .XYTriggers:
 	db 0
@@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
 
 .PersonEvents:
 	db 9
-	person_event SPRITE_SUPER_NERD, 16, 22, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
-	person_event SPRITE_SUPER_NERD, 16, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
-	person_event SPRITE_GRAMPS, 6, 24, OW_UP | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
-	person_event SPRITE_GRAMPS, 6, 25, OW_LEFT | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
-	person_event SPRITE_BLACK_BELT, 35, 28, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1
-	person_event SPRITE_COOLTRAINER_F, 29, 13, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1
-	person_event SPRITE_YOUNGSTER, 19, 17, OW_UP | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1
-	person_event SPRITE_YOUNGSTER, 24, 26, OW_UP | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
-	person_event SPRITE_COOLTRAINER_F, 23, 39, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1
+	person_event SPRITE_SUPER_NERD, 16, 22, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
+	person_event SPRITE_SUPER_NERD, 16, 23, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
+	person_event SPRITE_GRAMPS, 6, 24, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
+	person_event SPRITE_GRAMPS, 6, 25, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
+	person_event SPRITE_BLACK_BELT, 35, 28, $5, 0, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
+	person_event SPRITE_COOLTRAINER_F, 29, 13, $5, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
+	person_event SPRITE_YOUNGSTER, 19, 17, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
+	person_event SPRITE_YOUNGSTER, 24, 26, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
+	person_event SPRITE_COOLTRAINER_F, 23, 39, $7, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1

maps/BlackthornDodrioTradeHouse.asm

@@ -22,8 +22,8 @@ BlackthornDodrioTradeHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
+	warp_def $7, $2, 3, BLACKTHORN_CITY
+	warp_def $7, $3, 3, BLACKTHORN_CITY
 
 .XYTriggers:
 	db 0
@@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_LASS, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1
+	person_event SPRITE_LASS, 7, 6, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, Emy, -1

maps/BlackthornDragonSpeechHouse.asm

@@ -47,8 +47,8 @@ BlackthornDragonSpeechHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $3, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
+	warp_def $7, $2, 2, BLACKTHORN_CITY
+	warp_def $7, $3, 2, BLACKTHORN_CITY
 
 .XYTriggers:
 	db 0
@@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_GRANNY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1
-	person_event SPRITE_EKANS, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1
+	person_event SPRITE_GRANNY, 7, 6, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
+	person_event SPRITE_EKANS, 9, 9, $16, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1

maps/BlackthornGym1F.asm

@@ -386,13 +386,13 @@ BlackthornGym1F_MapEventHeader:
 
 .Warps:
 	db 7
-	warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $1, 1, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
-	warp_def $9, $7, 2, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
-	warp_def $6, $2, 3, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
-	warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
-	warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
+	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
 
 .XYTriggers:
 	db 0
@@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_CLAIR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1
-	person_event SPRITE_COOLTRAINER_M, 10, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1
-	person_event SPRITE_COOLTRAINER_M, 18, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermPaul, -1
-	person_event SPRITE_COOLTRAINER_F, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfLola, -1
-	person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackthornGymGuyScript, -1
+	person_event SPRITE_CLAIR, 7, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
+	person_event SPRITE_COOLTRAINER_M, 10, 10, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
+	person_event SPRITE_COOLTRAINER_M, 18, 5, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
+	person_event SPRITE_COOLTRAINER_F, 6, 13, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
+	person_event SPRITE_GYM_GUY, 19, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1

maps/BlackthornGym2F.asm

@@ -131,11 +131,11 @@ BlackthornGym2F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $1, 3, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
-	warp_def $9, $7, 4, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
-	warp_def $5, $2, 5, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
-	warp_def $7, $8, 6, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
-	warp_def $3, $8, 7, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
+	warp_def $7, $1, 3, BLACKTHORN_GYM_1F
+	warp_def $9, $7, 4, BLACKTHORN_GYM_1F
+	warp_def $5, $2, 5, BLACKTHORN_GYM_1F
+	warp_def $7, $8, 6, BLACKTHORN_GYM_1F
+	warp_def $3, $8, 7, BLACKTHORN_GYM_1F
 
 .XYTriggers:
 	db 0
@@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
 
 .PersonEvents:
 	db 8
-	person_event SPRITE_COOLTRAINER_M, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1
-	person_event SPRITE_COOLTRAINER_F, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1
-	person_event SPRITE_BOULDER, 6, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
-	person_event SPRITE_BOULDER, 7, 6, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
-	person_event SPRITE_BOULDER, 20, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
-	person_event SPRITE_BOULDER, 7, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
-	person_event SPRITE_BOULDER, 5, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
-	person_event SPRITE_BOULDER, 18, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
+	person_event SPRITE_COOLTRAINER_M, 5, 8, $9, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
+	person_event SPRITE_COOLTRAINER_F, 15, 8, $8, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
+	person_event SPRITE_BOULDER, 6, 12, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
+	person_event SPRITE_BOULDER, 7, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
+	person_event SPRITE_BOULDER, 20, 10, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
+	person_event SPRITE_BOULDER, 7, 7, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
+	person_event SPRITE_BOULDER, 5, 10, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
+	person_event SPRITE_BOULDER, 18, 12, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1

maps/BlackthornMart.asm

@@ -47,8 +47,8 @@ BlackthornMart_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
+	warp_def $7, $2, 4, BLACKTHORN_CITY
+	warp_def $7, $3, 4, BLACKTHORN_CITY
 
 .XYTriggers:
 	db 0
@@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
 
 .PersonEvents:
 	db 3
-	person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1
-	person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1
-	person_event SPRITE_BLACK_BELT, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1
+	person_event SPRITE_CLERK, 7, 5, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
+	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
+	person_event SPRITE_BLACK_BELT, 6, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1

maps/BlackthornPokeCenter1F.asm

@@ -49,9 +49,9 @@ BlackthornPokeCenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $4, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
-	warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
+	warp_def $7, $3, 5, BLACKTHORN_CITY
+	warp_def $7, $4, 5, BLACKTHORN_CITY
+	warp_def $7, $0, 1, POKECENTER_2F
 
 .XYTriggers:
 	db 0
@@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1
-	person_event SPRITE_GENTLEMAN, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1
-	person_event SPRITE_TWIN, 8, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x195b7f, -1
-	person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x195b82, -1
+	person_event SPRITE_NURSE, 5, 7, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
+	person_event SPRITE_GENTLEMAN, 7, 9, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
+	person_event SPRITE_TWIN, 8, 5, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
+	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, 0, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1

maps/BluesHouse.asm

@@ -147,8 +147,8 @@ BluesHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
-	warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
+	warp_def $7, $2, 2, PALLET_TOWN
+	warp_def $7, $3, 2, PALLET_TOWN
 
 .XYTriggers:
 	db 0
@@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_DAISY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1
+	person_event SPRITE_DAISY, 7, 6, $3, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1

maps/BrunosRoom.asm

@@ -132,10 +132,10 @@ BrunosRoom_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM
-	warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM
-	warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM
-	warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM
+	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
 
 .XYTriggers:
 	db 0
@@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_BRUNO, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1
+	person_event SPRITE_BRUNO, 11, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1

maps/BurnedTower1F.asm

@@ -283,20 +283,20 @@ BurnedTower1F_MapEventHeader:
 
 .Warps:
 	db 14
-	warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
-	warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
-	warp_def $9, $a, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $5, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $6, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $6, $4, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $4, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $5, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $7, $a, 3, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $e, $5, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $e, $4, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $e, $e, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
-	warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
+	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
 
 .XYTriggers:
 	db 1
@@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_ROCK, 8, 19, OW_LEFT | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1
-	person_event SPRITE_SUPER_NERD, 16, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
-	person_event SPRITE_SILVER, 13, 12, OW_LEFT | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
-	person_event SPRITE_MORTY, 18, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
-	person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
+	person_event SPRITE_ROCK, 8, 19, $18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
+	person_event SPRITE_SUPER_NERD, 16, 16, $3, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
+	person_event SPRITE_SILVER, 13, 12, $8, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+	person_event SPRITE_MORTY, 18, 18, $2, 1, 1, -1, -1, 8 + PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
+	person_event SPRITE_POKE_BALL, 6, 18, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP

maps/BurnedTowerB1F.asm

@@ -78,8 +78,8 @@ UnknownScript_0x18616b:
 	dotrigger $1
 	setevent EVENT_RELEASED_THE_BEASTS
 	special InitRoamMons
-	domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1
-	domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
+	domaptrigger ECRUTEAK_GYM, $1
+	domaptrigger CIANWOOD_CITY, $1
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -235,12 +235,12 @@ BurnedTowerB1F_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $9, $a, 3, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
-	warp_def $7, $11, 7, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
-	warp_def $8, $a, 9, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
-	warp_def $d, $3, 10, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
-	warp_def $e, $11, 12, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
-	warp_def $f, $7, 14, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
+	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
 
 .XYTriggers:
 	db 1
@@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
 
 .PersonEvents:
 	db 9
-	person_event SPRITE_BOULDER, 12, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1
-	person_event SPRITE_RAIKOU, 7, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	person_event SPRITE_ENTEI, 7, 16, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	person_event SPRITE_SUICUNE, 8, 14, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	person_event SPRITE_RAIKOU, 7, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	person_event SPRITE_ENTEI, 7, 16, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	person_event SPRITE_SUICUNE, 8, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	person_event SPRITE_POKE_BALL, 8, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
-	person_event SPRITE_SUPER_NERD, 16, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
+	person_event SPRITE_BOULDER, 12, 21, $19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
+	person_event SPRITE_RAIKOU, 7, 11, $16, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	person_event SPRITE_ENTEI, 7, 16, $16, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	person_event SPRITE_SUICUNE, 8, 14, $16, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	person_event SPRITE_RAIKOU, 7, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	person_event SPRITE_ENTEI, 7, 16, $6, 0, 0, -1, -1, 8 + PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	person_event SPRITE_SUICUNE, 8, 14, $6, 0, 0, -1, -1, 8 + PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	person_event SPRITE_POKE_BALL, 8, 20, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
+	person_event SPRITE_SUPER_NERD, 16, 14, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

maps/CeladonCafe.asm

@@ -206,8 +206,8 @@ CeladonCafe_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
+	warp_def $7, $6, 9, CELADON_CITY
+	warp_def $7, $7, 9, CELADON_CITY
 
 .XYTriggers:
 	db 0
@@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_SUPER_NERD, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1
-	person_event SPRITE_FISHER, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1
-	person_event SPRITE_FISHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1
-	person_event SPRITE_FISHER, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1
-	person_event SPRITE_TEACHER, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1
+	person_event SPRITE_SUPER_NERD, 7, 13, $8, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
+	person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
+	person_event SPRITE_FISHER, 11, 5, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
+	person_event SPRITE_FISHER, 6, 5, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
+	person_event SPRITE_TEACHER, 7, 8, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1

maps/CeladonCity.asm

@@ -231,15 +231,15 @@ CeladonCity_MapEventHeader:
 
 .Warps:
 	db 9
-	warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
-	warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
-	warp_def $3, $10, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
-	warp_def $3, $11, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
-	warp_def $9, $1d, 1, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F
-	warp_def $13, $12, 1, GROUP_CELADON_GAME_CORNER, MAP_CELADON_GAME_CORNER
-	warp_def $13, $17, 1, GROUP_CELADON_GAME_CORNER_PRIZE_ROOM, MAP_CELADON_GAME_CORNER_PRIZE_ROOM
-	warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM
-	warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE
+	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
 
 .XYTriggers:
 	db 0
@@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
 
 .PersonEvents:
 	db 9
-	person_event SPRITE_FISHER, 15, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1
-	person_event SPRITE_POLIWAG, 15, 31, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1
-	person_event SPRITE_TEACHER, 28, 24, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1
-	person_event SPRITE_GRAMPS, 20, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1
-	person_event SPRITE_GRAMPS, 35, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1
-	person_event SPRITE_YOUNGSTER, 17, 22, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1
-	person_event SPRITE_YOUNGSTER, 37, 28, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1
-	person_event SPRITE_TEACHER, 18, 10, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1
-	person_event SPRITE_LASS, 26, 11, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1
+	person_event SPRITE_FISHER, 15, 30, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
+	person_event SPRITE_POLIWAG, 15, 31, $16, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
+	person_event SPRITE_TEACHER, 28, 24, $5, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
+	person_event SPRITE_GRAMPS, 20, 18, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
+	person_event SPRITE_GRAMPS, 35, 12, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
+	person_event SPRITE_YOUNGSTER, 17, 22, $5, 0, 2, -1, -1, 8 + PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
+	person_event SPRITE_YOUNGSTER, 37, 28, $7, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
+	person_event SPRITE_TEACHER, 18, 10, $2, 2, 2, -1, -1, 8 + PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
+	person_event SPRITE_LASS, 26, 11, $4, 2, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1

maps/CeladonDeptStore1F.asm

@@ -74,10 +74,10 @@ CeladonDeptStore1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	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
 
 .XYTriggers:
 	db 0
@@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
 
 .PersonEvents:
 	db 3
-	person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1
-	person_event SPRITE_GENTLEMAN, 8, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1
-	person_event SPRITE_TEACHER, 7, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1
+	person_event SPRITE_RECEPTIONIST, 5, 14, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
+	person_event SPRITE_GENTLEMAN, 8, 15, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
+	person_event SPRITE_TEACHER, 7, 9, $5, 0, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1

maps/CeladonDeptStore2F.asm

@@ -68,9 +68,9 @@ CeladonDeptStore2F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
-	warp_def $0, $f, 3, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	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
 
 .XYTriggers:
 	db 0
@@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1
-	person_event SPRITE_CLERK, 9, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1
-	person_event SPRITE_POKEFAN_M, 6, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x70bbd, -1
-	person_event SPRITE_YOUNGSTER, 6, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70bc0, -1
+	person_event SPRITE_CLERK, 9, 17, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
+	person_event SPRITE_CLERK, 9, 18, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
+	person_event SPRITE_POKEFAN_M, 6, 9, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
+	person_event SPRITE_YOUNGSTER, 6, 10, $8, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1

maps/CeladonDeptStore3F.asm

@@ -93,9 +93,9 @@ CeladonDeptStore3F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
-	warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	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
 
 .XYTriggers:
 	db 0
@@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_CLERK, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1
-	person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1
-	person_event SPRITE_GAMEBOY_KID, 5, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x70d34, -1
-	person_event SPRITE_GAMEBOY_KID, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GameboyKidScript_0x70d3f, -1
-	person_event SPRITE_SUPER_NERD, 8, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x70d4a, -1
+	person_event SPRITE_CLERK, 5, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
+	person_event SPRITE_YOUNGSTER, 8, 10, $4, 1, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
+	person_event SPRITE_GAMEBOY_KID, 5, 13, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
+	person_event SPRITE_GAMEBOY_KID, 5, 14, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
+	person_event SPRITE_SUPER_NERD, 8, 17, $2, 1, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1

maps/CeladonDeptStore4F.asm

@@ -51,9 +51,9 @@ CeladonDeptStore4F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
-	warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	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
 
 .XYTriggers:
 	db 0
@@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
 
 .PersonEvents:
 	db 3
-	person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1
-	person_event SPRITE_SUPER_NERD, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1
-	person_event SPRITE_YOUNGSTER, 6, 12, OW_UP | $3, $0, -1, -1, $0, 0, YoungsterScript_0x70f18, -1
+	person_event SPRITE_CLERK, 9, 17, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
+	person_event SPRITE_SUPER_NERD, 10, 11, $5, 0, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
+	person_event SPRITE_YOUNGSTER, 6, 12, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1

maps/CeladonDeptStore5F.asm

@@ -70,9 +70,9 @@ CeladonDeptStore5F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
-	warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	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
 
 .XYTriggers:
 	db 0
@@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_CLERK, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1
-	person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1
-	person_event SPRITE_GENTLEMAN, 9, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1
-	person_event SPRITE_SAILOR, 8, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1
-	person_event SPRITE_TEACHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1
+	person_event SPRITE_CLERK, 9, 11, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
+	person_event SPRITE_CLERK, 9, 12, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
+	person_event SPRITE_GENTLEMAN, 9, 17, $2, 1, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
+	person_event SPRITE_SAILOR, 8, 7, $2, 1, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
+	person_event SPRITE_TEACHER, 11, 5, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1

maps/CeladonDeptStore6F.asm

@@ -151,8 +151,8 @@ CeladonDeptStore6F_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
-	warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
+	warp_def $0, $f, 2, CELADON_DEPT_STORE_5F
+	warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
 
 .XYTriggers:
 	db 0
@@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_SUPER_NERD, 6, 13, OW_UP | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1
-	person_event SPRITE_YOUNGSTER, 9, 16, OW_DOWN | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1
+	person_event SPRITE_SUPER_NERD, 6, 13, $7, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
+	person_event SPRITE_YOUNGSTER, 9, 16, $2, 1, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1

maps/CeladonDeptStoreElevator.asm

@@ -20,12 +20,12 @@ UnknownScript_0x713bd:
 
 Elevator_0x713be:
 	db 6 ; floors
-	db _1F,  4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
-	db _2F,  3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
-	db _3F,  3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
-	db _4F,  3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
-	db _5F,  3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
-	db _6F,  2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
+	elevfloor _1F,  4, CELADON_DEPT_STORE_1F
+	elevfloor _2F,  3, CELADON_DEPT_STORE_2F
+	elevfloor _3F,  3, CELADON_DEPT_STORE_3F
+	elevfloor _4F,  3, CELADON_DEPT_STORE_4F
+	elevfloor _5F,  3, CELADON_DEPT_STORE_5F
+	elevfloor _6F,  2, CELADON_DEPT_STORE_6F
 	db $ff ; end
 
 
@@ -35,8 +35,8 @@ CeladonDeptStoreElevator_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
-	warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
+	warp_def $3, $1, 255, CELADON_DEPT_STORE_1F
+	warp_def $3, $2, 255, CELADON_DEPT_STORE_1F
 
 .XYTriggers:
 	db 0

maps/CeladonGameCorner.asm

@@ -276,8 +276,8 @@ CeladonGameCorner_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $d, $e, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $d, $f, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY
+	warp_def $d, $e, 6, CELADON_CITY
+	warp_def $d, $f, 6, CELADON_CITY
 
 .XYTriggers:
 	db 0
@@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
 
 .PersonEvents:
 	db 9
-	person_event SPRITE_CLERK, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1
-	person_event SPRITE_RECEPTIONIST, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1
-	person_event SPRITE_POKEFAN_M, 14, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x72123, -1
-	person_event SPRITE_TEACHER, 11, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7212e, -1
-	person_event SPRITE_FISHING_GURU, 11, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x72139, -1
-	person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 2, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
-	person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 4, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
-	person_event SPRITE_GYM_GUY, 7, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CeladonGymGuyScript, -1
-	person_event SPRITE_GRAMPS, 12, 6, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x72190, -1
+	person_event SPRITE_CLERK, 6, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
+	person_event SPRITE_RECEPTIONIST, 6, 7, $6, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
+	person_event SPRITE_POKEFAN_M, 14, 18, $8, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
+	person_event SPRITE_TEACHER, 11, 21, $9, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
+	person_event SPRITE_FISHING_GURU, 11, 15, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
+	person_event SPRITE_FISHER, 14, 12, $8, 0, 0, -1, 2, 8 + PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
+	person_event SPRITE_FISHER, 14, 12, $8, 0, 0, -1, 4, 8 + PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
+	person_event SPRITE_GYM_GUY, 7, 15, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
+	person_event SPRITE_GRAMPS, 12, 6, $8, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1

maps/CeladonGameCornerPrizeRoom.asm

@@ -271,8 +271,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $5, $2, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $5, $3, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY
+	warp_def $5, $2, 7, CELADON_CITY
+	warp_def $5, $3, 7, CELADON_CITY
 
 .XYTriggers:
 	db 0
@@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_GENTLEMAN, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1
-	person_event SPRITE_PHARMACIST, 8, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1
+	person_event SPRITE_GENTLEMAN, 6, 4, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
+	person_event SPRITE_PHARMACIST, 8, 8, $4, 1, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1

maps/CeladonGym.asm

@@ -265,8 +265,8 @@ CeladonGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $11, $4, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $11, $5, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY
+	warp_def $11, $4, 8, CELADON_CITY
+	warp_def $11, $5, 8, CELADON_CITY
 
 .XYTriggers:
 	db 0
@@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
 
 .PersonEvents:
 	db 6
-	person_event SPRITE_ERIKA, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1
-	person_event SPRITE_LASS, 12, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1
-	person_event SPRITE_LASS, 12, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTanya, -1
-	person_event SPRITE_BUENA, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBeautyJulia, -1
-	person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe1, -1
-	person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe2, -1
+	person_event SPRITE_ERIKA, 7, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
+	person_event SPRITE_LASS, 12, 11, $8, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
+	person_event SPRITE_LASS, 12, 6, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
+	person_event SPRITE_BUENA, 9, 7, $9, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
+	person_event SPRITE_TWIN, 14, 8, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
+	person_event SPRITE_TWIN, 14, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1

maps/CeladonMansion1F.asm

@@ -74,11 +74,11 @@ CeladonMansion1F_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $0, $3, 3, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
-	warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
+	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
 
 .XYTriggers:
 	db 0
@@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_GRANNY, 9, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1
-	person_event SPRITE_GROWLITHE, 10, 6, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1
-	person_event SPRITE_CLEFAIRY, 8, 7, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1
-	person_event SPRITE_GROWLITHE, 8, 8, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1
+	person_event SPRITE_GRANNY, 9, 5, $3, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
+	person_event SPRITE_GROWLITHE, 10, 6, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
+	person_event SPRITE_CLEFAIRY, 8, 7, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
+	person_event SPRITE_GROWLITHE, 8, 8, $16, 0, 2, -1, -1, 8 + PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1

maps/CeladonMansion2F.asm

@@ -55,10 +55,10 @@ CeladonMansion2F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $0, 4, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
-	warp_def $0, $1, 2, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
-	warp_def $0, $6, 3, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
-	warp_def $0, $7, 5, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
+	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
 
 .XYTriggers:
 	db 0

maps/CeladonMansion3F.asm

@@ -189,10 +189,10 @@ CeladonMansion3F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $0, $0, 1, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
-	warp_def $0, $1, 2, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
-	warp_def $0, $6, 3, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
-	warp_def $0, $7, 2, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
+	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
 
 .XYTriggers:
 	db 0
@@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_COOLTRAINER_M, 10, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1
-	person_event SPRITE_GYM_GUY, 8, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1
-	person_event SPRITE_SUPER_NERD, 11, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x716bc, -1
-	person_event SPRITE_FISHER, 8, 4, OW_UP | $3, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x716bf, -1
+	person_event SPRITE_COOLTRAINER_M, 10, 7, $3, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
+	person_event SPRITE_GYM_GUY, 8, 7, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
+	person_event SPRITE_SUPER_NERD, 11, 4, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
+	person_event SPRITE_FISHER, 8, 4, $7, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1

maps/CeladonMansionRoof.asm

@@ -36,9 +36,9 @@ CeladonMansionRoof_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $1, $1, 1, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
-	warp_def $1, $6, 4, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
-	warp_def $5, $2, 1, GROUP_CELADON_MANSION_ROOF_HOUSE, MAP_CELADON_MANSION_ROOF_HOUSE
+	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
 
 .XYTriggers:
 	db 0
@@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_FISHER, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1
+	person_event SPRITE_FISHER, 9, 11, $4, 1, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1

maps/CeladonMansionRoofHouse.asm

@@ -119,8 +119,8 @@ CeladonMansionRoofHouse_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $7, $2, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
-	warp_def $7, $3, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
+	warp_def $7, $2, 3, CELADON_MANSION_ROOF
+	warp_def $7, $3, 3, CELADON_MANSION_ROOF
 
 .XYTriggers:
 	db 0
@@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_PHARMACIST, 6, 7, OW_UP | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1
+	person_event SPRITE_PHARMACIST, 6, 7, $6, 2, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1

maps/CeladonPokeCenter1F.asm

@@ -144,9 +144,9 @@ CeladonPokeCenter1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $7, $3, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $7, $4, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY
-	warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
+	warp_def $7, $3, 5, CELADON_CITY
+	warp_def $7, $4, 5, CELADON_CITY
+	warp_def $7, $0, 1, POKECENTER_2F
 
 .XYTriggers:
 	db 0
@@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1
-	person_event SPRITE_GENTLEMAN, 9, 5, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1
-	person_event SPRITE_PHARMACIST, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PharmacistScript_0x71e2b, -1
-	person_event SPRITE_COOLTRAINER_F, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x71e28, -1
-	person_event SPRITE_SUPER_NERD, 7, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
+	person_event SPRITE_NURSE, 5, 7, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
+	person_event SPRITE_GENTLEMAN, 9, 5, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
+	person_event SPRITE_PHARMACIST, 7, 4, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
+	person_event SPRITE_COOLTRAINER_F, 10, 12, $5, 0, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
+	person_event SPRITE_SUPER_NERD, 7, 8, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH

maps/CeladonPokeCenter2FBeta.asm

@@ -11,7 +11,7 @@ CeladonPokeCenter2FBeta_MapEventHeader:
 
 .Warps:
 	db 1
-	warp_def $7, $0, 3, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F
+	warp_def $7, $0, 3, CELADON_POKECENTER_1F
 
 .XYTriggers:
 	db 0

maps/CeruleanCity.asm

@@ -275,12 +275,12 @@ CeruleanCity_MapEventHeader:
 
 .Warps:
 	db 6
-	warp_def $f, $7, 1, GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE, MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE
-	warp_def $11, $1c, 1, GROUP_CERULEAN_POLICE_STATION, MAP_CERULEAN_POLICE_STATION
-	warp_def $13, $d, 1, GROUP_CERULEAN_TRADE_SPEECH_HOUSE, MAP_CERULEAN_TRADE_SPEECH_HOUSE
-	warp_def $15, $13, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F
-	warp_def $17, $1e, 1, GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM
-	warp_def $1d, $19, 2, GROUP_CERULEAN_MART, MAP_CERULEAN_MART
+	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
 
 .XYTriggers:
 	db 0
@@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
 
 .PersonEvents:
 	db 6
-	person_event SPRITE_COOLTRAINER_M, 27, 19, OW_DOWN | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1
-	person_event SPRITE_SUPER_NERD, 19, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1
-	person_event SPRITE_SLOWPOKE, 28, 24, OW_DOWN | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1
-	person_event SPRITE_COOLTRAINER_F, 28, 25, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1
-	person_event SPRITE_FISHER, 30, 34, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1
-	person_event SPRITE_YOUNGSTER, 16, 10, OW_DOWN | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1
+	person_event SPRITE_COOLTRAINER_M, 27, 19, $2, 2, 2, -1, -1, 8 + PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
+	person_event SPRITE_SUPER_NERD, 19, 27, $2, 1, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
+	person_event SPRITE_SLOWPOKE, 28, 24, $1, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
+	person_event SPRITE_COOLTRAINER_F, 28, 25, $8, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
+	person_event SPRITE_FISHER, 30, 34, $5, 0, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
+	person_event SPRITE_YOUNGSTER, 16, 10, $3, 0, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1

maps/CeruleanGym.asm

@@ -43,8 +43,8 @@ UnknownScript_0x1883de:
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
 	dotrigger $0
-	domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1
-	domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0
+	domaptrigger ROUTE_25, $1
+	domaptrigger POWER_PLANT, $0
 	waitbutton
 	special RestartMapMusic
 	pause 15
@@ -363,8 +363,8 @@ CeruleanGym_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $f, $4, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
-	warp_def $f, $5, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
+	warp_def $f, $4, 5, CERULEAN_CITY
+	warp_def $f, $5, 5, CERULEAN_CITY
 
 .XYTriggers:
 	db 0
@@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
 
 .PersonEvents:
 	db 6
-	person_event SPRITE_ROCKET, 14, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
-	person_event SPRITE_MISTY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
-	person_event SPRITE_SWIMMER_GIRL, 10, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	person_event SPRITE_SWIMMER_GIRL, 13, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	person_event SPRITE_SWIMMER_GUY, 13, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
-	person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
+	person_event SPRITE_ROCKET, 14, 8, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
+	person_event SPRITE_MISTY, 7, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
+	person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	person_event SPRITE_SWIMMER_GUY, 13, 12, $8, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
+	person_event SPRITE_GYM_GUY, 17, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM