Merge pull request #309 from PikalaxALT/master

Wild data, save functions, fix missing include
2025-04-09 05:44:44 -07:00 · 2015-08-17 11:58:57 -04:00
parent 9974a2c701 4831b4429e
commit 3cd79c55a3
458 changed files with 9949 additions and 9719 deletions
--- a/audio/engine.asm
+++ b/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]
--- a/battle/core.asm
+++ b/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
--- a/battle/effect_commands.asm
+++ b/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

--- a/constants.asm
+++ b/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"
--- a/constants/deco_constants.asm
+++ b/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
--- a/constants/engine_flags.asm
+++ b/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
--- a/constants/map_constants.asm
+++ b/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
--- a/constants/pokemon_data_constants.asm
+++ b/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
--- a/constants/radio_constants.asm
+++ b/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
--- a/constants/sfx_constants.asm
+++ b/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
--- a/constants/wram_constants.asm
+++ b/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
--- a/data/wild/fish.asm
+++ b/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

--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
--- a/data/wild/johto_water.asm
+++ b/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
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
--- a/data/wild/kanto_water.asm
+++ b/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
--- a/data/wild/swarm_grass.asm
+++ b/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
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -2,4 +2,4 @@

 	; No swarms encountered while surfing in Crystal
 	
-	db $ff ; end
+	db -1 ; end
--- a/engine/buena_phone_scripts.asm
+++ b/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
--- a/engine/color.asm
+++ b/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
--- a/Show More
+++ b/Show More