Merge pull request #273 from Rangi42/master

Clean up some data, using macros for multiline list entries

audio/engine_1.asm

@@ -1346,12 +1346,12 @@ Audio1_PlaySound::
 	ld [wMusicTempo + 1], a
 	ld [wMusicWaveInstrument], a
 	ld [wSfxWaveInstrument], a
-	ld d, $8
+	ld d, NUM_CHANNELS
 	ld hl, wChannelReturnAddresses
 	call .FillMem
 	ld hl, wChannelCommandPointers
 	call .FillMem
-	ld d, $4
+	ld d, NUM_MUSIC_CHANS
 	ld hl, wChannelSoundIDs
 	call .FillMem
 	ld hl, wChannelFlags1

audio/engine_2.asm

@@ -1409,12 +1409,12 @@ Audio2_PlaySound::
 	ld [wMusicTempo + 1], a
 	ld [wMusicWaveInstrument], a
 	ld [wSfxWaveInstrument], a
-	ld d, $8
+	ld d, NUM_CHANNELS
 	ld hl, wChannelReturnAddresses
 	call .FillMem
 	ld hl, wChannelCommandPointers
 	call .FillMem
-	ld d, $4
+	ld d, NUM_MUSIC_CHANS
 	ld hl, wChannelSoundIDs
 	call .FillMem
 	ld hl, wChannelFlags1

audio/engine_3.asm

@@ -1346,12 +1346,12 @@ Audio3_PlaySound::
 	ld [wMusicTempo + 1], a
 	ld [wMusicWaveInstrument], a
 	ld [wSfxWaveInstrument], a
-	ld d, $8
+	ld d, NUM_CHANNELS
 	ld hl, wChannelReturnAddresses
 	call .FillMem
 	ld hl, wChannelCommandPointers
 	call .FillMem
-	ld d, $4
+	ld d, NUM_MUSIC_CHANS
 	ld hl, wChannelSoundIDs
 	call .FillMem
 	ld hl, wChannelFlags1

constants/audio_constants.asm

@@ -1,4 +1,5 @@
 ; pitch
+; Audio[1|2|3]_Pitches indexes (see audio/notes.asm)
 	const_def
 	const C_ ; 0
 	const C# ; 1
@@ -14,15 +15,20 @@
 	const B_ ; B
 
 ; channel
+; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks,
+; and Audio[1|2|3]_HWChannelEnableMasks indexes (see audio/engine_[1|2|3].asm)
 	const_def
 	const Ch1 ; 0
 	const Ch2 ; 1
 	const Ch3 ; 2
 	const Ch4 ; 3
+NUM_MUSIC_CHANS EQU const_value
 	const Ch5 ; 4
 	const Ch6 ; 5
 	const Ch7 ; 6
 	const Ch8 ; 7
+NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
+NUM_CHANNELS EQU const_value
 
 ; HW sound channel register base addresses
 HW_CH1_BASE EQU LOW(rNR10)

constants/menu_constants.asm

@@ -58,16 +58,18 @@ CHOSE_SECOND_ITEM EQU 2
 	const PARTY_TO_DAYCARE ; 3
 
 ; party menu types
+; PartyMenuMessagePointers indexes
 	const_def
-	const NORMAL_PARTY_MENU    ; 0
+	const NORMAL_PARTY_MENU    ; $00
-	const USE_ITEM_PARTY_MENU  ; 1
+	const USE_ITEM_PARTY_MENU  ; $01
-	const BATTLE_PARTY_MENU    ; 2
+	const BATTLE_PARTY_MENU    ; $02
-	const TMHM_PARTY_MENU      ; 3
+	const TMHM_PARTY_MENU      ; $03
-	const SWAP_MONS_PARTY_MENU ; 4
+	const SWAP_MONS_PARTY_MENU ; $04
-	const EVO_STONE_PARTY_MENU ; 5
+	const EVO_STONE_PARTY_MENU ; $05
-
 ; party menu message IDs
-	const_def $F0
+; PartyMenuItemUseMessagePointers indexes
+	const_next $F0
+FIRST_PARTY_MENU_TEXT_ID EQU const_value
 	const ANTIDOTE_MSG         ; $F0
 	const BURN_HEAL_MSG        ; $F1
 	const ICE_HEAL_MSG         ; $F2

constants/move_effect_constants.asm

@@ -5,7 +5,7 @@
 
 	const_def
 	const NO_ADDITIONAL_EFFECT       ; $00
-	const_skip                       ; $01
+	const EFFECT_01                  ; $01 unused
 	const POISON_SIDE_EFFECT1        ; $02
 	const DRAIN_HP_EFFECT            ; $03
 	const BURN_SIDE_EFFECT1          ; $04
@@ -34,7 +34,7 @@
 	const THRASH_PETAL_DANCE_EFFECT  ; $1B
 	const SWITCH_AND_TELEPORT_EFFECT ; $1C
 	const TWO_TO_FIVE_ATTACKS_EFFECT ; $1D
-	const_skip                       ; $1E
+	const EFFECT_1E                  ; $1E unused
 	const FLINCH_SIDE_EFFECT1        ; $1F
 	const SLEEP_EFFECT               ; $20
 	const POISON_SIDE_EFFECT2        ; $21

constants/pokemon_data_constants.asm

@@ -28,3 +28,14 @@ HOF_TEAM_CAPACITY EQU 50
 
 MAX_EVOLUTIONS EQU 3
 EVOLUTION_SIZE EQU 4
+
+
+; wMonHGrowthRate values
+; GrowthRateTable indexes (see data/growth_rates.asm)
+	const_def
+	const GROWTH_MEDIUM_FAST
+	const GROWTH_SLIGHTLY_FAST
+	const GROWTH_SLIGHTLY_SLOW
+	const GROWTH_MEDIUM_SLOW
+	const GROWTH_FAST
+	const GROWTH_SLOW

constants/script_constants.asm

@@ -11,3 +11,22 @@ SLOTSCHERRY EQU $0A08
 SLOTSFISH   EQU $0E0C
 SLOTSBIRD   EQU $1210
 SLOTSMOUSE  EQU $1614
+
+; in game trade dialog sets
+	const_def
+	const TRADE_DIALOGSET_CASUAL
+	const TRADE_DIALOGSET_POLITE
+	const TRADE_DIALOGSET_HAPPY
+
+; badges
+; wObtainedBadges and wBeatGymFlags bits
+	const_def
+	const BIT_BOULDERBADGE ; 0
+	const BIT_CASCADEBADGE ; 1
+	const BIT_THUNDERBADGE ; 2
+	const BIT_RAINBOWBADGE ; 3
+	const BIT_SOULBADGE    ; 4
+	const BIT_MARSHBADGE   ; 5
+	const BIT_VOLCANOBADGE ; 6
+	const BIT_EARTHBADGE   ; 7
+NUM_BADGES EQU const_value

data/battle/always_happen_effects.asm

@@ -5,9 +5,9 @@ AlwaysHappenSideEffects:
 	db DREAM_EATER_EFFECT
 	db PAY_DAY_EFFECT
 	db TWO_TO_FIVE_ATTACKS_EFFECT
-	db $1E
+	db EFFECT_1E
 	db ATTACK_TWICE_EFFECT
 	db RECOIL_EFFECT
 	db TWINEEDLE_EFFECT
 	db RAGE_EFFECT
-	db -1
+	db -1 ; end

data/battle/critical_hit_moves.asm

@@ -3,4 +3,4 @@ HighCriticalMoves:
 	db RAZOR_LEAF
 	db CRABHAMMER
 	db SLASH
-	db $FF
+	db -1 ; end

data/battle/residual_effects_1.asm

@@ -17,4 +17,4 @@ ResidualEffects1:
 	db MIMIC_EFFECT
 	db LEECH_SEED_EFFECT
 	db SPLASH_EFFECT
-	db -1
+	db -1 ; end

data/battle/residual_effects_2.asm

@@ -2,7 +2,7 @@ ResidualEffects2:
 ; non-side effects not included in ResidualEffects1
 ; stat-affecting moves, sleep-inflicting moves, and Bide
 ; e.g., Meditate, Bide, Hypnosis
-	db $01
+	db EFFECT_01
 	db ATTACK_UP1_EFFECT
 	db DEFENSE_UP1_EFFECT
 	db SPEED_UP1_EFFECT
@@ -29,4 +29,4 @@ ResidualEffects2:
 	db SPECIAL_DOWN2_EFFECT
 	db ACCURACY_DOWN2_EFFECT
 	db EVASION_DOWN2_EFFECT
-	db -1
+	db -1 ; end

data/battle/set_damage_effects.asm

@@ -3,4 +3,4 @@ SetDamageEffects:
 ; e.g., Super Fang, Psywave
 	db SUPER_FANG_EFFECT
 	db SPECIAL_DAMAGE_EFFECT
-	db -1
+	db -1 ; end

data/battle/special_effects.asm

@@ -8,7 +8,7 @@ SpecialEffects:
 	db PAY_DAY_EFFECT
 	db SWIFT_EFFECT
 	db TWO_TO_FIVE_ATTACKS_EFFECT
-	db $1E
+	db EFFECT_1E
 	db CHARGE_EFFECT
 	db SUPER_FANG_EFFECT
 	db SPECIAL_DAMAGE_EFFECT
@@ -16,9 +16,9 @@ SpecialEffects:
 	db ATTACK_TWICE_EFFECT
 	db JUMP_KICK_EFFECT
 	db RECOIL_EFFECT
-	; fallthrough to Next EffectsArray
+	; fallthrough
 SpecialEffectsCont:
 ; damaging moves whose effect is executed prior to damage calculation
 	db THRASH_PETAL_DANCE_EFFECT
 	db TRAPPING_EFFECT
-	db -1
+	db -1 ; end

data/battle/unused_critical_hit_moves.asm

@@ -3,4 +3,4 @@ UnusedHighCriticalMoves:
 	db RAZOR_LEAF
 	db CRABHAMMER
 	db SLASH
-	db $FF
+	db -1 ; end

data/events/hidden_coins.asm

@@ -1,14 +1,19 @@
+hidden_coin: MACRO
+	db \1, \3, \2
+ENDM
+
 HiddenCoinCoords:
-	db GAME_CORNER,$08,$00
+; map id, x, y
-	db GAME_CORNER,$10,$01
+	hidden_coin GAME_CORNER,  0,  8
-	db GAME_CORNER,$0b,$03
+	hidden_coin GAME_CORNER,  1, 16
-	db GAME_CORNER,$0e,$03
+	hidden_coin GAME_CORNER,  3, 11
-	db GAME_CORNER,$0c,$04
+	hidden_coin GAME_CORNER,  3, 14
-	db GAME_CORNER,$0c,$09
+	hidden_coin GAME_CORNER,  4, 12
-	db GAME_CORNER,$0f,$09
+	hidden_coin GAME_CORNER,  9, 12
-	db GAME_CORNER,$0e,$10
+	hidden_coin GAME_CORNER,  9, 15
-	db GAME_CORNER,$10,$0a
+	hidden_coin GAME_CORNER, 16, 14
-	db GAME_CORNER,$07,$0b
+	hidden_coin GAME_CORNER, 10, 16
-	db GAME_CORNER,$08,$0f
+	hidden_coin GAME_CORNER, 11,  7
-	db GAME_CORNER,$0f,$0c
+	hidden_coin GAME_CORNER, 15,  8
-	db $ff
+	hidden_coin GAME_CORNER, 12, 15
+	db -1 ; end

data/events/hidden_item_coords.asm

@@ -1,57 +1,61 @@
+hidden_item: MACRO
+	db \1, \3, \2
+ENDM
+
 HiddenItemCoords:
-; map ID, then coords
+; map id, x, y
-	db VIRIDIAN_FOREST,$12,$01
+	hidden_item VIRIDIAN_FOREST,                1,  18
-	db VIRIDIAN_FOREST,$2a,$10
+	hidden_item VIRIDIAN_FOREST,               16,  42
-	db MT_MOON_B2F,$0c,$12
+	hidden_item MT_MOON_B2F,                   18,  12
-	db ROUTE_25,$03,$26
+	hidden_item ROUTE_25,                      38,   3
-	db ROUTE_9,$07,$0e
+	hidden_item ROUTE_9,                       14,   7
-	db SS_ANNE_KITCHEN,$09,$0d
+	hidden_item SS_ANNE_KITCHEN,               13,   9
-	db SS_ANNE_B1F_ROOMS,$01,$03
+	hidden_item SS_ANNE_B1F_ROOMS,              3,   1
-	db ROUTE_10,$11,$09
+	hidden_item ROUTE_10,                       9,  17
-	db ROUTE_10,$35,$10
+	hidden_item ROUTE_10,                      16,  53
-	db ROCKET_HIDEOUT_B1F,$0f,$15
+	hidden_item ROCKET_HIDEOUT_B1F,            21,  15
-	db ROCKET_HIDEOUT_B3F,$11,$1b
+	hidden_item ROCKET_HIDEOUT_B3F,            27,  17
-	db ROCKET_HIDEOUT_B4F,$01,$19
+	hidden_item ROCKET_HIDEOUT_B4F,            25,   1
-	db POKEMON_TOWER_5F,$0c,$04
+	hidden_item POKEMON_TOWER_5F,               4,  12
-	db ROUTE_13,$0e,$01
+	hidden_item ROUTE_13,                       1,  14
-	db ROUTE_13,$0d,$10
+	hidden_item ROUTE_13,                      16,  13
-	db POKEMON_MANSION_B1F,$09,$01
+	hidden_item POKEMON_MANSION_B1F,            1,   9
-	db SAFARI_ZONE_GATE,$01,$0a
+	hidden_item SAFARI_ZONE_GATE,              10,   1 ; inaccessible
-	db SAFARI_ZONE_WEST,$05,$06
+	hidden_item SAFARI_ZONE_WEST,               6,   5
-	db SILPH_CO_5F,$03,$0c
+	hidden_item SILPH_CO_5F,                   12,   3
-	db SILPH_CO_9F,$0f,$02
+	hidden_item SILPH_CO_9F,                    2,  15
-	db COPYCATS_HOUSE_2F,$01,$01
+	hidden_item COPYCATS_HOUSE_2F,              1,   1
-	db CERULEAN_CAVE_1F,$0b,$0e
+	hidden_item CERULEAN_CAVE_1F,              14,  11
-	db CERULEAN_CAVE_B1F,$03,$1b
+	hidden_item CERULEAN_CAVE_B1F,             27,   3
-	db POWER_PLANT,$10,$11
+	hidden_item POWER_PLANT,                   17,  16
-	db POWER_PLANT,$01,$0c
+	hidden_item POWER_PLANT,                   12,   1
-	db SEAFOAM_ISLANDS_B2F,$0f,$0f
+	hidden_item SEAFOAM_ISLANDS_B2F,           15,  15
-	db SEAFOAM_ISLANDS_B4F,$11,$19
+	hidden_item SEAFOAM_ISLANDS_B4F,           25,  17
-	db POKEMON_MANSION_1F,$10,$08
+	hidden_item POKEMON_MANSION_1F,             8,  16
-	db POKEMON_MANSION_3F,$09,$01
+	hidden_item POKEMON_MANSION_3F,             1,   9
-	db ROUTE_23,$2c,$09
+	hidden_item ROUTE_23,                       9,  44
-	db ROUTE_23,$46,$13
+	hidden_item ROUTE_23,                      19,  70
-	db ROUTE_23,$5a,$08
+	hidden_item ROUTE_23,                       8,  90
-	db VICTORY_ROAD_2F,$02,$05
+	hidden_item VICTORY_ROAD_2F,                5,   2
-	db VICTORY_ROAD_2F,$07,$1a
+	hidden_item VICTORY_ROAD_2F,               26,   7
-	db UNUSED_MAP_6F,$0b,$0e
+	hidden_item UNUSED_MAP_6F,                 14,  11
-	db VIRIDIAN_CITY,$04,$0e
+	hidden_item VIRIDIAN_CITY,                 14,   4
-	db ROUTE_11,$05,$30
+	hidden_item ROUTE_11,                      48,   5
-	db ROUTE_12,$3f,$02
+	hidden_item ROUTE_12,                       2,  63
-	db ROUTE_17,$0e,$0f
+	hidden_item ROUTE_17,                      15,  14
-	db ROUTE_17,$2d,$08
+	hidden_item ROUTE_17,                       8,  45
-	db ROUTE_17,$48,$11
+	hidden_item ROUTE_17,                      17,  72
-	db ROUTE_17,$5b,$04
+	hidden_item ROUTE_17,                       4,  91
-	db ROUTE_17,$79,$08
+	hidden_item ROUTE_17,                       8, 121
-	db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03
+	hidden_item UNDERGROUND_PATH_NORTH_SOUTH,   3,   4
-	db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04
+	hidden_item UNDERGROUND_PATH_NORTH_SOUTH,   4,  34
-	db UNDERGROUND_PATH_WEST_EAST,$02,$0c
+	hidden_item UNDERGROUND_PATH_WEST_EAST,    12,   2
-	db UNDERGROUND_PATH_WEST_EAST,$05,$15
+	hidden_item UNDERGROUND_PATH_WEST_EAST,    21,   5
-	db CELADON_CITY,$0f,$30
+	hidden_item CELADON_CITY,                  48,  15
-	db ROUTE_25,$01,$0a
+	hidden_item ROUTE_25,                      10,   1
-	db MT_MOON_B2F,$09,$21
+	hidden_item MT_MOON_B2F,                   33,   9
-	db SEAFOAM_ISLANDS_B3F,$10,$09
+	hidden_item SEAFOAM_ISLANDS_B3F,            9,  16
-	db VERMILION_CITY,$0b,$0e
+	hidden_item VERMILION_CITY,                14,  11
-	db CERULEAN_CITY,$08,$0f
+	hidden_item CERULEAN_CITY,                 15,   8
-	db ROUTE_4,$03,$28
+	hidden_item ROUTE_4,                       40,   3
-	db $ff
+	db -1 ; end

data/events/prizes.asm

@@ -1,12 +1,7 @@
 PrizeDifferentMenuPtrs:
-	dw PrizeMenuMon1Entries
+	dw PrizeMenuMon1Entries, PrizeMenuMon1Cost
-	dw PrizeMenuMon1Cost
+	dw PrizeMenuMon2Entries, PrizeMenuMon2Cost
-
+	dw PrizeMenuTMsEntries,  PrizeMenuTMsCost
-	dw PrizeMenuMon2Entries
-	dw PrizeMenuMon2Cost
-
-	dw PrizeMenuTMsEntries
-	dw PrizeMenuTMsCost
 
 NoThanksText:
 	db "NO THANKS@"

data/events/trades.asm

@@ -1,12 +1,12 @@
 TradeMons:
-; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
+; give mon, get mon, dialog id, nickname
-	db NIDORINO,  NIDORINA, 0,"TERRY@@@@@@"
+	db NIDORINO,   NIDORINA,  TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@"
-	db ABRA,      MR_MIME,  0,"MARCEL@@@@@"
+	db ABRA,       MR_MIME,   TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
-	db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
+	db BUTTERFREE, BEEDRILL,  TRADE_DIALOGSET_HAPPY,  "CHIKUCHIKU@"
-	db PONYTA,    SEEL,     0,"SAILOR@@@@@"
+	db PONYTA,     SEEL,      TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@"
-	db SPEAROW,   FARFETCHD,2,"DUX@@@@@@@@"
+	db SPEAROW,    FARFETCHD, TRADE_DIALOGSET_HAPPY,  "DUX@@@@@@@@"
-	db SLOWBRO,   LICKITUNG,0,"MARC@@@@@@@"
+	db SLOWBRO,    LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@"
-	db POLIWHIRL, JYNX,     1,"LOLA@@@@@@@"
+	db POLIWHIRL,  JYNX,      TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@"
-	db RAICHU,    ELECTRODE,1,"DORIS@@@@@@"
+	db RAICHU,     ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@"
-	db VENONAT,   TANGELA,  2,"CRINKLES@@@"
+	db VENONAT,    TANGELA,   TRADE_DIALOGSET_HAPPY,  "CRINKLES@@@"
-	db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
+	db NIDORAN_M,  NIDORAN_F, TRADE_DIALOGSET_HAPPY,  "SPOT@@@@@@@"

data/growth_rates.asm

@@ -1,12 +1,19 @@
-; each entry has the following scheme:
+growth_rate: MACRO
-; %AAAABBBB %SCCCCCCC %DDDDDDDD %EEEEEEEE
+; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5]
-; resulting in
+	dn \1, \2
-;  (a*n^3)/b + sign*c*n^2 + d*n - e
+	if \3 & $80 ; signed
-; where sign = -1 <=> S=1
+		db -\3 | $80
+	else
+		db \3
+	endc
+	db \4, \5
+ENDM
+
 GrowthRateTable:
-	db $11,$00,$00,$00 ; medium fast      n^3
+; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm)
-	db $34,$0A,$00,$1E ; (unused?)    3/4 n^3 + 10 n^2         - 30
+	growth_rate 1, 1,   0,   0,   0 ; Medium Fast
-	db $34,$14,$00,$46 ; (unused?)    3/4 n^3 + 20 n^2         - 70
+	growth_rate 3, 4,  10,   0,  30 ; Slightly Fast
-	db $65,$8F,$64,$8C ; medium slow: 6/5 n^3 - 15 n^2 + 100 n - 140
+	growth_rate 3, 4,  20,   0,  70 ; Slightly Slow
-	db $45,$00,$00,$00 ; fast:        4/5 n^3
+	growth_rate 6, 5, -15, 100, 140 ; Medium Slow
-	db $54,$00,$00,$00 ; slow:        5/4 n^3
+	growth_rate 4, 5,   0,   0,   0 ; Fast
+	growth_rate 5, 4,   0,   0,   0 ; Slow

data/items/guard_drink_items.asm

@@ -1,2 +1,5 @@
 GuardDrinksList:
-	db FRESH_WATER, SODA_POP, LEMONADE, $00
+	db FRESH_WATER
+	db SODA_POP
+	db LEMONADE
+	db 0 ; end

data/items/use_overworld.asm

@@ -6,4 +6,4 @@ UsableItems_CloseMenu:
 	db OLD_ROD
 	db GOOD_ROD
 	db SUPER_ROD
-	db $ff
+	db -1 ; end

data/items/use_party.asm

@@ -36,4 +36,4 @@ UsableItems_PartyMenu:
 	db MAX_ETHER
 	db ELIXER
 	db MAX_ELIXER
-	db $ff
+	db -1 ; end

data/items/vending_prices.asm

@@ -1,7 +1,10 @@
+vend_item: MACRO
+	db \1
+	money \2
+ENDM
+
 VendingPrices:
-	db FRESH_WATER
+; item id, price
-	money 200
+	vend_item FRESH_WATER, 200
-	db SODA_POP
+	vend_item SODA_POP,    300
-	money 300
+	vend_item LEMONADE,    350
-	db LEMONADE
-	money 350

data/maps/badge_maps.asm

@@ -1,10 +1,10 @@
 MapBadgeFlags:
-	db PEWTER_GYM,   %00000001
+	db PEWTER_GYM,    1 << BIT_BOULDERBADGE
-	db CERULEAN_GYM, %00000010
+	db CERULEAN_GYM,  1 << BIT_CASCADEBADGE
-	db VERMILION_GYM,%00000100
+	db VERMILION_GYM, 1 << BIT_THUNDERBADGE
-	db CELADON_GYM,  %00001000
+	db CELADON_GYM,   1 << BIT_RAINBOWBADGE
-	db FUCHSIA_GYM,  %00010000
+	db FUCHSIA_GYM,   1 << BIT_SOULBADGE
-	db SAFFRON_GYM,  %00100000
+	db SAFFRON_GYM,   1 << BIT_MARSHBADGE
-	db CINNABAR_GYM, %01000000
+	db CINNABAR_GYM,  1 << BIT_VOLCANOBADGE
-	db VIRIDIAN_GYM, %10000000
+	db VIRIDIAN_GYM,  1 << BIT_EARTHBADGE
-	db $ff
+	db -1 ; end

data/maps/dungeon_maps.asm

@@ -5,25 +5,18 @@ DungeonMaps1:
 	db ROCK_TUNNEL_1F
 	db SEAFOAM_ISLANDS_1F
 	db ROCK_TUNNEL_B1F
-	db $FF
+	db -1 ; end
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is in between or equal to each pair of maps
 DungeonMaps2:
 	; all MT_MOON maps
-	db MT_MOON_1F
+	db MT_MOON_1F, MT_MOON_B2F
-	db MT_MOON_B2F
-
 	; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
-	db SS_ANNE_1F
+	db SS_ANNE_1F, HALL_OF_FAME
-	db HALL_OF_FAME
-
 	; all POKEMON_TOWER maps and Lavender Town buildings
-	db LAVENDER_POKECENTER
+	db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
-	db LAVENDER_CUBONE_HOUSE
-
 	; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
 	; CERULEAN_CAVE maps, except for SILPH_CO_1F
-	db SILPH_CO_2F
+	db SILPH_CO_2F, CERULEAN_CAVE_1F
-	db CERULEAN_CAVE_1F
+	db -1 ; end
-	db $FF

data/maps/force_bike_surf.asm

@@ -1,11 +1,15 @@
+force_bike_surf: MACRO
+	db \1, \3, \2
+ENDM
+
 ForcedBikeOrSurfMaps:
-; map id, y, x
+; map id, x, y
-	db ROUTE_16,$0A,$11
+	force_bike_surf ROUTE_16,            17, 10
-	db ROUTE_16,$0B,$11
+	force_bike_surf ROUTE_16,            17, 11
-	db ROUTE_18,$08,$21
+	force_bike_surf ROUTE_18,            33,  8
-	db ROUTE_18,$09,$21
+	force_bike_surf ROUTE_18,            33,  9
-	db SEAFOAM_ISLANDS_B3F,$07,$12
+	force_bike_surf SEAFOAM_ISLANDS_B3F, 18,  7
-	db SEAFOAM_ISLANDS_B3F,$07,$13
+	force_bike_surf SEAFOAM_ISLANDS_B3F, 19,  7
-	db SEAFOAM_ISLANDS_B4F,$0E,$04
+	force_bike_surf SEAFOAM_ISLANDS_B4F,  4, 14
-	db SEAFOAM_ISLANDS_B4F,$0E,$05
+	force_bike_surf SEAFOAM_ISLANDS_B4F,  5, 14
-	db $FF ;end
+	db -1 ; end

data/maps/hide_show_data.asm

@@ -29,7 +29,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw Route15HS
-	dw Rout16eHS
+	dw Route16HS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -302,7 +302,7 @@ Route12HS:
 	db ROUTE_12, $0A, SHOW
 Route15HS:
 	db ROUTE_15, $0B, SHOW
-Rout16eHS:
+Route16HS:
 	db ROUTE_16, $07, SHOW
 Route22HS:
 	db ROUTE_22, $01, HIDE

data/maps/names.asm

@@ -1,107 +1,54 @@
 MapNames:
-PalletTownName:
+PalletTownName:      db "PALLET TOWN@"
-	db "PALLET TOWN@"
+ViridianCityName:    db "VIRIDIAN CITY@"
-ViridianCityName:
+PewterCityName:      db "PEWTER CITY@"
-	db "VIRIDIAN CITY@"
+CeruleanCityName:    db "CERULEAN CITY@"
-PewterCityName:
+LavenderTownName:    db "LAVENDER TOWN@"
-	db "PEWTER CITY@"
+VermilionCityName:   db "VERMILION CITY@"
-CeruleanCityName:
+CeladonCityName:     db "CELADON CITY@"
-	db "CERULEAN CITY@"
+FuchsiaCityName:     db "FUCHSIA CITY@"
-LavenderTownName:
+CinnabarIslandName:  db "CINNABAR ISLAND@"
-	db "LAVENDER TOWN@"
+IndigoPlateauName:   db "INDIGO PLATEAU@"
-VermilionCityName:
+SaffronCityName:     db "SAFFRON CITY@"
-	db "VERMILION CITY@"
+Route1Name:          db "ROUTE 1@"
-CeladonCityName:
+Route2Name:          db "ROUTE 2@"
-	db "CELADON CITY@"
+Route3Name:          db "ROUTE 3@"
-FuchsiaCityName:
+Route4Name:          db "ROUTE 4@"
-	db "FUCHSIA CITY@"
+Route5Name:          db "ROUTE 5@"
-CinnabarIslandName:
+Route6Name:          db "ROUTE 6@"
-	db "CINNABAR ISLAND@"
+Route7Name:          db "ROUTE 7@"
-IndigoPlateauName:
+Route8Name:          db "ROUTE 8@"
-	db "INDIGO PLATEAU@"
+Route9Name:          db "ROUTE 9@"
-SaffronCityName:
+Route10Name:         db "ROUTE 10@"
-	db "SAFFRON CITY@"
+Route11Name:         db "ROUTE 11@"
-Route1Name:
+Route12Name:         db "ROUTE 12@"
-	db "ROUTE 1@"
+Route13Name:         db "ROUTE 13@"
-Route2Name:
+Route14Name:         db "ROUTE 14@"
-	db "ROUTE 2@"
+Route15Name:         db "ROUTE 15@"
-Route3Name:
+Route16Name:         db "ROUTE 16@"
-	db "ROUTE 3@"
+Route17Name:         db "ROUTE 17@"
-Route4Name:
+Route18Name:         db "ROUTE 18@"
-	db "ROUTE 4@"
+Route19Name:         db "SEA ROUTE 19@"
-Route5Name:
+Route20Name:         db "SEA ROUTE 20@"
-	db "ROUTE 5@"
+Route21Name:         db "SEA ROUTE 21@"
-Route6Name:
+Route22Name:         db "ROUTE 22@"
-	db "ROUTE 6@"
+Route23Name:         db "ROUTE 23@"
-Route7Name:
+Route24Name:         db "ROUTE 24@"
-	db "ROUTE 7@"
+Route25Name:         db "ROUTE 25@"
-Route8Name:
+ViridianForestName:  db "VIRIDIAN FOREST@"
-	db "ROUTE 8@"
+MountMoonName:       db "MT.MOON@"
-Route9Name:
+RockTunnelName:      db "ROCK TUNNEL@"
-	db "ROUTE 9@"
+SeaCottageName:      db "SEA COTTAGE@"
-Route10Name:
+SSAnneName:          db "S.S.ANNE@"
-	db "ROUTE 10@"
+PokemonLeagueName:   db "#MON LEAGUE@"
-Route11Name:
+UndergroundPathName: db "UNDERGROUND PATH@"
-	db "ROUTE 11@"
+PokemonTowerName:    db "#MON TOWER@"
-Route12Name:
+SeafoamIslandsName:  db "SEAFOAM ISLANDS@"
-	db "ROUTE 12@"
+VictoryRoadName:     db "VICTORY ROAD@"
-Route13Name:
+DiglettsCaveName:    db "DIGLETT's CAVE@"
-	db "ROUTE 13@"
+RocketHQName:        db "ROCKET HQ@"
-Route14Name:
+SilphCoName:         db "SILPH CO.@"
-	db "ROUTE 14@"
+PokemonMansionName:  db "<PKMN> MANSION@"
-Route15Name:
+SafariZoneName:      db "SAFARI ZONE@"
-	db "ROUTE 15@"
+CeruleanCaveName:    db "CERULEAN CAVE@"
-Route16Name:
+PowerPlantName:      db "POWER PLANT@"
-	db "ROUTE 16@"
-Route17Name:
-	db "ROUTE 17@"
-Route18Name:
-	db "ROUTE 18@"
-Route19Name:
-	db "SEA ROUTE 19@"
-Route20Name:
-	db "SEA ROUTE 20@"
-Route21Name:
-	db "SEA ROUTE 21@"
-Route22Name:
-	db "ROUTE 22@"
-Route23Name:
-	db "ROUTE 23@"
-Route24Name:
-	db "ROUTE 24@"
-Route25Name:
-	db "ROUTE 25@"
-ViridianForestName:
-	db "VIRIDIAN FOREST@"
-MountMoonName:
-	db "MT.MOON@"
-RockTunnelName:
-	db "ROCK TUNNEL@"
-SeaCottageName:
-	db "SEA COTTAGE@"
-SSAnneName:
-	db "S.S.ANNE@"
-PokemonLeagueName:
-	db "#MON LEAGUE@"
-UndergroundPathName:
-	db "UNDERGROUND PATH@"
-PokemonTowerName:
-	db "#MON TOWER@"
-SeafoamIslandsName:
-	db "SEAFOAM ISLANDS@"
-VictoryRoadName:
-	db "VICTORY ROAD@"
-DiglettsCaveName:
-	db "DIGLETT's CAVE@"
-RocketHQName:
-	db "ROCKET HQ@"
-SilphCoName:
-	db "SILPH CO.@"
-PokemonMansionName:
-	db "<PKMN> MANSION@"
-SafariZoneName:
-	db "SAFARI ZONE@"
-CeruleanCaveName:
-	db "CERULEAN CAVE@"
-PowerPlantName:
-	db "POWER PLANT@"

data/maps/rest_house_maps.asm

@@ -2,4 +2,4 @@ SafariZoneRestHouses:
 	db SAFARI_ZONE_WEST_REST_HOUSE
 	db SAFARI_ZONE_EAST_REST_HOUSE
 	db SAFARI_ZONE_NORTH_REST_HOUSE
-	db -1
+	db -1 ; end

data/maps/special_warps.asm

@@ -2,118 +2,90 @@
 ; 00: target map ID
 ; 01: which dungeon warp in the source map was used
 DungeonWarpList:
-	db SEAFOAM_ISLANDS_B1F,$01
+	db SEAFOAM_ISLANDS_B1F, 1
-	db SEAFOAM_ISLANDS_B1F,$02
+	db SEAFOAM_ISLANDS_B1F, 2
-	db SEAFOAM_ISLANDS_B2F,$01
+	db SEAFOAM_ISLANDS_B2F, 1
-	db SEAFOAM_ISLANDS_B2F,$02
+	db SEAFOAM_ISLANDS_B2F, 2
-	db SEAFOAM_ISLANDS_B3F,$01
+	db SEAFOAM_ISLANDS_B3F, 1
-	db SEAFOAM_ISLANDS_B3F,$02
+	db SEAFOAM_ISLANDS_B3F, 2
-	db SEAFOAM_ISLANDS_B4F,$01
+	db SEAFOAM_ISLANDS_B4F, 1
-	db SEAFOAM_ISLANDS_B4F,$02
+	db SEAFOAM_ISLANDS_B4F, 2
-	db VICTORY_ROAD_2F,$02
+	db VICTORY_ROAD_2F,     2
-	db POKEMON_MANSION_1F,$01
+	db POKEMON_MANSION_1F,  1
-	db POKEMON_MANSION_1F,$02
+	db POKEMON_MANSION_1F,  2
-	db POKEMON_MANSION_2F,$03
+	db POKEMON_MANSION_2F,  3
-	db $FF
+	db -1 ; end
+
+
+fly_warp: MACRO
+	event_displacement \1_WIDTH, \2, \3
+	db ((\3) & $01) ;sub-block Y
+	db ((\2) & $01) ;sub-block X
+ENDM
 
 DungeonWarpData:
-	FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18
+	fly_warp SEAFOAM_ISLANDS_B1F, 18,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23
+	fly_warp SEAFOAM_ISLANDS_B1F, 23,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19
+	fly_warp SEAFOAM_ISLANDS_B2F, 19,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22
+	fly_warp SEAFOAM_ISLANDS_B2F, 22,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18
+	fly_warp SEAFOAM_ISLANDS_B3F, 18,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19
+	fly_warp SEAFOAM_ISLANDS_B3F, 19,  7
-	FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4
+	fly_warp SEAFOAM_ISLANDS_B4F,  4, 14
-	FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5
+	fly_warp SEAFOAM_ISLANDS_B4F,  5, 14
-	FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22
+	fly_warp VICTORY_ROAD_2F,     22, 16
-	FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16
+	fly_warp POKEMON_MANSION_1F,  16, 14
-	FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16
+	fly_warp POKEMON_MANSION_1F,  16, 14
-	FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18
+	fly_warp POKEMON_MANSION_2F,  18, 14
+
+
+special_warp_spec: MACRO
+	db \1
+	fly_warp \1, \2, \3
+	db \4
+ENDM
 
-;Format:
-;	db Map_id
-;	FLYWARP_DATA [Map Width][Y-pos][X-pos]
-;	db Tileset_id
 FirstMapSpec:
-	db REDS_HOUSE_2F
+	special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2
-	FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
-	db REDS_HOUSE_2
-
 TradeCenterSpec1:
-	db TRADE_CENTER
+	special_warp_spec TRADE_CENTER,  3, 4, CLUB
-	FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
-	db CLUB
-
 TradeCenterSpec2:                   
-	db TRADE_CENTER
+	special_warp_spec TRADE_CENTER,  6, 4, CLUB
-	FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
-	db CLUB
-
 ColosseumSpec1:                     
-	db COLOSSEUM
+	special_warp_spec COLOSSEUM,     3, 4, CLUB
-	FLYWARP_DATA COLOSSEUM_WIDTH,4,3
-	db CLUB
-
 ColosseumSpec2:                     
-	db COLOSSEUM
+	special_warp_spec COLOSSEUM,     6, 4, CLUB
-	FLYWARP_DATA COLOSSEUM_WIDTH,4,6
+
-	db CLUB
+
+fly_warp_spec: MACRO
+	db \1, 0
+	dw \2
+ENDM
 
 FlyWarpDataPtr:
-	db PALLET_TOWN, 0
+	fly_warp_spec PALLET_TOWN,     .PalletTown
-	dw PalletTownFlyWarp
+	fly_warp_spec VIRIDIAN_CITY,   .ViridianCity
-	db VIRIDIAN_CITY, 0
+	fly_warp_spec PEWTER_CITY,     .PewterCity
-	dw ViridianCityFlyWarp
+	fly_warp_spec CERULEAN_CITY,   .CeruleanCity
-	db PEWTER_CITY, 0
+	fly_warp_spec LAVENDER_TOWN,   .LavenderTown
-	dw PewterCityFlyWarp
+	fly_warp_spec VERMILION_CITY,  .VermilionCity
-	db CERULEAN_CITY, 0
+	fly_warp_spec CELADON_CITY,    .CeladonCity
-	dw CeruleanCityFlyWarp
+	fly_warp_spec FUCHSIA_CITY,    .FuchsiaCity
-	db LAVENDER_TOWN, 0
+	fly_warp_spec CINNABAR_ISLAND, .CinnabarIsland
-	dw LavenderTownFlyWarp
+	fly_warp_spec INDIGO_PLATEAU,  .IndigoPlateau
-	db VERMILION_CITY, 0
+	fly_warp_spec SAFFRON_CITY,    .SaffronCity
-	dw VermilionCityFlyWarp
+	fly_warp_spec ROUTE_4,         .Route4
-	db CELADON_CITY, 0
+	fly_warp_spec ROUTE_10,        .Route10
-	dw CeladonCityFlyWarp
-	db FUCHSIA_CITY, 0
-	dw FuchsiaCityFlyWarp
-	db CINNABAR_ISLAND, 0
-	dw CinnabarIslandFlyWarp
-	db INDIGO_PLATEAU, 0
-	dw IndigoPlateauFlyWarp
-	db SAFFRON_CITY, 0
-	dw SaffronCityFlyWarp
-	db ROUTE_4, 0
-	dw Route4FlyWarp
-	db ROUTE_10, 0
-	dw Route10FlyWarp
 
-; Original Format:
+.PalletTown:     fly_warp PALLET_TOWN,      5,  6
-;   [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block]
+.ViridianCity:   fly_warp VIRIDIAN_CITY,   23, 26
-; Macro Format:
+.PewterCity:     fly_warp PEWTER_CITY,     13, 26
-;   FLYWARP_DATA [Map Width][Y-pos][X-pos]
+.CeruleanCity:   fly_warp CERULEAN_CITY,   19, 18
-PalletTownFlyWarp:
+.LavenderTown:   fly_warp LAVENDER_TOWN,    3,  6
-	FLYWARP_DATA PALLET_TOWN_WIDTH,      6,  5
+.VermilionCity:  fly_warp VERMILION_CITY,  11,  4
-ViridianCityFlyWarp:
+.CeladonCity:    fly_warp CELADON_CITY,    41, 10
-	FLYWARP_DATA VIRIDIAN_CITY_WIDTH,   26, 23
+.FuchsiaCity:    fly_warp FUCHSIA_CITY,    19, 28
-PewterCityFlyWarp:
+.CinnabarIsland: fly_warp CINNABAR_ISLAND, 11, 12
-	FLYWARP_DATA PEWTER_CITY_WIDTH,     26, 13
+.IndigoPlateau:  fly_warp INDIGO_PLATEAU,   9,  6
-CeruleanCityFlyWarp:
+.SaffronCity:    fly_warp SAFFRON_CITY,     9, 30
-	FLYWARP_DATA CERULEAN_CITY_WIDTH,   18, 19
+.Route4:         fly_warp ROUTE_4,         11,  6
-LavenderTownFlyWarp:
+.Route10:        fly_warp ROUTE_10,        11, 20
-	FLYWARP_DATA LAVENDER_TOWN_WIDTH,    6,  3
-VermilionCityFlyWarp:
-	FLYWARP_DATA VERMILION_CITY_WIDTH,   4, 11
-CeladonCityFlyWarp:
-	FLYWARP_DATA CELADON_CITY_WIDTH,    10, 41
-FuchsiaCityFlyWarp:
-	FLYWARP_DATA FUCHSIA_CITY_WIDTH,    28, 19
-CinnabarIslandFlyWarp:
-	FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11
-IndigoPlateauFlyWarp:
-	FLYWARP_DATA INDIGO_PLATEAU_WIDTH,   6,  9
-SaffronCityFlyWarp:
-	FLYWARP_DATA SAFFRON_CITY_WIDTH,    30,  9
-Route4FlyWarp:
-	FLYWARP_DATA ROUTE_4_WIDTH,          6, 11
-Route10FlyWarp:
-	FLYWARP_DATA ROUTE_10_WIDTH,        20, 11

data/maps/town_map_entries.asm

@@ -1,101 +1,117 @@
-ExternalMapEntries:
+external_map: MACRO
-	EMAP $2,$B,PalletTownName
+	dn \1, \2
-	EMAP $2,$8,ViridianCityName
+	dw \3
-	EMAP $2,$3,PewterCityName
+ENDM
-	EMAP $A,$2,CeruleanCityName
-	EMAP $E,$5,LavenderTownName
-	EMAP $A,$9,VermilionCityName
-	EMAP $7,$5,CeladonCityName
-	EMAP $8,$D,FuchsiaCityName
-	EMAP $2,$F,CinnabarIslandName
-	EMAP $0,$2,IndigoPlateauName
-	EMAP $A,$5,SaffronCityName
-	EMAP $0,$0,PalletTownName ; unused
-	EMAP $2,$A,Route1Name
-	EMAP $2,$6,Route2Name
-	EMAP $4,$3,Route3Name
-	EMAP $8,$2,Route4Name
-	EMAP $A,$3,Route5Name
-	EMAP $A,$8,Route6Name
-	EMAP $8,$5,Route7Name
-	EMAP $D,$5,Route8Name
-	EMAP $D,$2,Route9Name
-	EMAP $E,$4,Route10Name
-	EMAP $C,$9,Route11Name
-	EMAP $E,$9,Route12Name
-	EMAP $D,$B,Route13Name
-	EMAP $B,$C,Route14Name
-	EMAP $A,$D,Route15Name
-	EMAP $5,$5,Route16Name
-	EMAP $4,$8,Route17Name
-	EMAP $6,$D,Route18Name
-	EMAP $6,$F,Route19Name
-	EMAP $4,$F,Route20Name
-	EMAP $2,$D,Route21Name
-	EMAP $0,$8,Route22Name
-	EMAP $0,$6,Route23Name
-	EMAP $A,$1,Route24Name
-	EMAP $B,$0,Route25Name
 
+; the appearance of towns and routes in the town map
+ExternalMapEntries:
+; x, y, name
+	external_map 11,  2, PalletTownName
+	external_map  8,  2, ViridianCityName
+	external_map  3,  2, PewterCityName
+	external_map  2, 10, CeruleanCityName
+	external_map  5, 14, LavenderTownName
+	external_map  9, 10, VermilionCityName
+	external_map  5,  7, CeladonCityName
+	external_map 13,  8, FuchsiaCityName
+	external_map 15,  2, CinnabarIslandName
+	external_map  2,  0, IndigoPlateauName
+	external_map  5, 10, SaffronCityName
+	external_map  0,  0, PalletTownName ; unused
+	external_map 10,  2, Route1Name
+	external_map  6,  2, Route2Name
+	external_map  3,  4, Route3Name
+	external_map  2,  8, Route4Name
+	external_map  3, 10, Route5Name
+	external_map  8, 10, Route6Name
+	external_map  5,  8, Route7Name
+	external_map  5, 13, Route8Name
+	external_map  2, 13, Route9Name
+	external_map  4, 14, Route10Name
+	external_map  9, 12, Route11Name
+	external_map  9, 14, Route12Name
+	external_map 11, 13, Route13Name
+	external_map 12, 11, Route14Name
+	external_map 13, 10, Route15Name
+	external_map  5,  5, Route16Name
+	external_map  8,  4, Route17Name
+	external_map 13,  6, Route18Name
+	external_map 15,  6, Route19Name
+	external_map 15,  4, Route20Name
+	external_map 13,  2, Route21Name
+	external_map  8,  0, Route22Name
+	external_map  6,  0, Route23Name
+	external_map  1, 10, Route24Name
+	external_map  0, 11, Route25Name
+
+
+internal_map: MACRO
+	db \1 + 1
+	dn \2, \3
+	dw \4
+ENDM
+
+; the appearance of buildings and dungeons in the town map
 InternalMapEntries:
-	IMAP OAKS_LAB,                      $2,$B,PalletTownName
+; maximum map id subject to this rule, x, y, name
-	IMAP VIRIDIAN_GYM,                  $2,$8,ViridianCityName
+	internal_map OAKS_LAB,                      11,  2, PalletTownName
-	IMAP VIRIDIAN_FOREST_SOUTH_GATE,    $2,$6,Route2Name
+	internal_map VIRIDIAN_GYM,                   8,  2, ViridianCityName
-	IMAP VIRIDIAN_FOREST,               $2,$4,ViridianForestName
+	internal_map VIRIDIAN_FOREST_SOUTH_GATE,     6,  2, Route2Name
-	IMAP PEWTER_POKECENTER,             $2,$3,PewterCityName
+	internal_map VIRIDIAN_FOREST,                4,  2, ViridianForestName
-	IMAP MT_MOON_B2F,                   $6,$2,MountMoonName
+	internal_map PEWTER_POKECENTER,              3,  2, PewterCityName
-	IMAP CERULEAN_MART,                 $A,$2,CeruleanCityName
+	internal_map MT_MOON_B2F,                    2,  6, MountMoonName
-	IMAP MT_MOON_POKECENTER,            $5,$2,Route4Name
+	internal_map CERULEAN_MART,                  2, 10, CeruleanCityName
-	IMAP CERULEAN_TRASHED_HOUSE_COPY,   $A,$2,CeruleanCityName
+	internal_map MT_MOON_POKECENTER,             2,  5, Route4Name
-	IMAP DAYCARE,                       $A,$4,Route5Name
+	internal_map CERULEAN_TRASHED_HOUSE_COPY,    2, 10, CeruleanCityName
-	IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name
+	internal_map DAYCARE,                        4, 10, Route5Name
-	IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name
+	internal_map UNDERGROUND_PATH_ROUTE_6_COPY,  6, 10, Route6Name
-	IMAP UNDERGROUND_PATH_ROUTE_8,      $B,$5,Route8Name
+	internal_map UNDERGROUND_PATH_ROUTE_7_COPY,  5,  9, Route7Name
-	IMAP ROCK_TUNNEL_1F,                $E,$3,RockTunnelName
+	internal_map UNDERGROUND_PATH_ROUTE_8,       5, 11, Route8Name
-	IMAP POWER_PLANT,                   $F,$4,PowerPlantName
+	internal_map ROCK_TUNNEL_1F,                 3, 14, RockTunnelName
-	IMAP ROUTE_11_GATE_2F,              $D,$9,Route11Name
+	internal_map POWER_PLANT,                    4, 15, PowerPlantName
-	IMAP ROUTE_12_GATE_1F,              $E,$7,Route12Name
+	internal_map ROUTE_11_GATE_2F,               9, 13, Route11Name
-	IMAP BILLS_HOUSE,                   $C,$0,SeaCottageName
+	internal_map ROUTE_12_GATE_1F,               7, 14, Route12Name
-	IMAP VERMILION_DOCK,                $A,$9,VermilionCityName
+	internal_map BILLS_HOUSE,                    0, 12, SeaCottageName
-	IMAP SS_ANNE_B1F_ROOMS,             $9,$A,SSAnneName
+	internal_map VERMILION_DOCK,                 9, 10, VermilionCityName
-	IMAP VICTORY_ROAD_1F,               $0,$4,VictoryRoadName
+	internal_map SS_ANNE_B1F_ROOMS,             10,  9, SSAnneName
-	IMAP HALL_OF_FAME,                  $0,$2,PokemonLeagueName
+	internal_map VICTORY_ROAD_1F,                4,  0, VictoryRoadName
-	IMAP UNDERGROUND_PATH_NORTH_SOUTH,  $A,$5,UndergroundPathName
+	internal_map HALL_OF_FAME,                   2,  0, PokemonLeagueName
-	IMAP CHAMPIONS_ROOM,                $0,$2,PokemonLeagueName
+	internal_map UNDERGROUND_PATH_NORTH_SOUTH,   5, 10, UndergroundPathName
-	IMAP UNDERGROUND_PATH_WEST_EAST,    $A,$5,UndergroundPathName
+	internal_map CHAMPIONS_ROOM,                 2,  0, PokemonLeagueName
-	IMAP CELADON_HOTEL,                 $7,$5,CeladonCityName
+	internal_map UNDERGROUND_PATH_WEST_EAST,     5, 10, UndergroundPathName
-	IMAP LAVENDER_POKECENTER,           $E,$5,LavenderTownName
+	internal_map CELADON_HOTEL,                  5,  7, CeladonCityName
-	IMAP POKEMON_TOWER_7F,              $F,$5,PokemonTowerName
+	internal_map LAVENDER_POKECENTER,            5, 14, LavenderTownName
-	IMAP LAVENDER_CUBONE_HOUSE,         $E,$5,LavenderTownName
+	internal_map POKEMON_TOWER_7F,               5, 15, PokemonTowerName
-	IMAP WARDENS_HOUSE,                 $8,$D,FuchsiaCityName
+	internal_map LAVENDER_CUBONE_HOUSE,          5, 14, LavenderTownName
-	IMAP SAFARI_ZONE_GATE,              $8,$C,SafariZoneName
+	internal_map WARDENS_HOUSE,                 13,  8, FuchsiaCityName
-	IMAP FUCHSIA_MEETING_ROOM,          $8,$D,FuchsiaCityName
+	internal_map SAFARI_ZONE_GATE,              12,  8, SafariZoneName
-	IMAP SEAFOAM_ISLANDS_B4F,           $5,$F,SeafoamIslandsName
+	internal_map FUCHSIA_MEETING_ROOM,          13,  8, FuchsiaCityName
-	IMAP VERMILION_OLD_ROD_HOUSE,       $A,$9,VermilionCityName
+	internal_map SEAFOAM_ISLANDS_B4F,           15,  5, SeafoamIslandsName
-	IMAP FUCHSIA_GOOD_ROD_HOUSE,        $8,$D,FuchsiaCityName
+	internal_map VERMILION_OLD_ROD_HOUSE,        9, 10, VermilionCityName
-	IMAP POKEMON_MANSION_1F,            $2,$F,PokemonMansionName
+	internal_map FUCHSIA_GOOD_ROD_HOUSE,        13,  8, FuchsiaCityName
-	IMAP CINNABAR_MART_COPY,            $2,$F,CinnabarIslandName
+	internal_map POKEMON_MANSION_1F,            15,  2, PokemonMansionName
-	IMAP INDIGO_PLATEAU_LOBBY,          $0,$2,IndigoPlateauName
+	internal_map CINNABAR_MART_COPY,            15,  2, CinnabarIslandName
-	IMAP MR_PSYCHICS_HOUSE,             $A,$5,SaffronCityName
+	internal_map INDIGO_PLATEAU_LOBBY,           2,  0, IndigoPlateauName
-	IMAP ROUTE_15_GATE_2F,              $9,$D,Route15Name
+	internal_map MR_PSYCHICS_HOUSE,              5, 10, SaffronCityName
-	IMAP ROUTE_16_FLY_HOUSE,            $4,$5,Route16Name
+	internal_map ROUTE_15_GATE_2F,              13,  9, Route15Name
-	IMAP ROUTE_12_SUPER_ROD_HOUSE,      $E,$A,Route12Name
+	internal_map ROUTE_16_FLY_HOUSE,             5,  4, Route16Name
-	IMAP ROUTE_18_GATE_2F,              $7,$D,Route18Name
+	internal_map ROUTE_12_SUPER_ROD_HOUSE,      10, 14, Route12Name
-	IMAP SEAFOAM_ISLANDS_1F,            $5,$F,SeafoamIslandsName
+	internal_map ROUTE_18_GATE_2F,              13,  7, Route18Name
-	IMAP ROUTE_22_GATE,                 $0,$7,Route22Name
+	internal_map SEAFOAM_ISLANDS_1F,            15,  5, SeafoamIslandsName
-	IMAP VICTORY_ROAD_2F,               $0,$4,VictoryRoadName
+	internal_map ROUTE_22_GATE,                  7,  0, Route22Name
-	IMAP ROUTE_12_GATE_2F,              $E,$7,Route12Name
+	internal_map VICTORY_ROAD_2F,                4,  0, VictoryRoadName
-	IMAP VERMILION_TRADE_HOUSE,         $A,$9,VermilionCityName
+	internal_map ROUTE_12_GATE_2F,               7, 14, Route12Name
-	IMAP DIGLETTS_CAVE,                 $3,$4,DiglettsCaveName
+	internal_map VERMILION_TRADE_HOUSE,          9, 10, VermilionCityName
-	IMAP VICTORY_ROAD_3F,               $0,$4,VictoryRoadName
+	internal_map DIGLETTS_CAVE,                  4,  3, DiglettsCaveName
-	IMAP UNUSED_MAP_CE,                 $7,$5,RocketHQName
+	internal_map VICTORY_ROAD_3F,                4,  0, VictoryRoadName
-	IMAP SILPH_CO_8F,                   $A,$5,SilphCoName
+	internal_map UNUSED_MAP_CE,                  5,  7, RocketHQName
-	IMAP POKEMON_MANSION_B1F,           $2,$F,PokemonMansionName
+	internal_map SILPH_CO_8F,                    5, 10, SilphCoName
-	IMAP SAFARI_ZONE_NORTH_REST_HOUSE,  $8,$C,SafariZoneName
+	internal_map POKEMON_MANSION_B1F,           15,  2, PokemonMansionName
-	IMAP CERULEAN_CAVE_1F,              $9,$1,CeruleanCaveName
+	internal_map SAFARI_ZONE_NORTH_REST_HOUSE,  12,  8, SafariZoneName
-	IMAP NAME_RATERS_HOUSE,             $E,$5,LavenderTownName
+	internal_map CERULEAN_CAVE_1F,               1,  9, CeruleanCaveName
-	IMAP CERULEAN_BADGE_HOUSE,          $A,$2,CeruleanCityName
+	internal_map NAME_RATERS_HOUSE,              5, 14, LavenderTownName
-	IMAP ROCK_TUNNEL_B1F,               $E,$3,RockTunnelName
+	internal_map CERULEAN_BADGE_HOUSE,           2, 10, CeruleanCityName
-	IMAP SILPH_CO_ELEVATOR,             $A,$5,SilphCoName
+	internal_map ROCK_TUNNEL_B1F,                3, 14, RockTunnelName
-	IMAP AGATHAS_ROOM,                  $0,$2,PokemonLeagueName
+	internal_map SILPH_CO_ELEVATOR,              5, 10, SilphCoName
-	db $FF
+	internal_map AGATHAS_ROOM,                   2,  0, PokemonLeagueName
+	db -1 ; end

data/moves/animation_special_effect_pointers.asm

@@ -1,81 +1,47 @@
-; Format: Special Effect ID (1 byte), Address (2 bytes)
+special_effect: MACRO
+	db \1
+	dw \2
+ENDM
+
 SpecialEffectPointers:
-	db SE_DARK_SCREEN_FLASH ; $FE
+; special effect id, effect routine address
-	dw AnimationFlashScreen
+	special_effect SE_DARK_SCREEN_FLASH, AnimationFlashScreen ; $FE
-	db SE_DARK_SCREEN_PALETTE ; $FD
+	special_effect SE_DARK_SCREEN_PALETTE, AnimationDarkScreenPalette ; $FD
-	dw AnimationDarkScreenPalette
+	special_effect SE_RESET_SCREEN_PALETTE, AnimationResetScreenPalette ; $FC
-	db SE_RESET_SCREEN_PALETTE ; $FC
+	special_effect SE_SHAKE_SCREEN, AnimationShakeScreen ; $FB
-	dw AnimationResetScreenPalette
+	special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA
-	db SE_SHAKE_SCREEN ; $FB
+	special_effect SE_DARKEN_MON_PALETTE, AnimationDarkenMonPalette ; $F9
-	dw AnimationShakeScreen
+	special_effect SE_FLASH_SCREEN_LONG, AnimationFlashScreenLong ; $F8
-	db SE_WATER_DROPLETS_EVERYWHERE ; $FA
+	special_effect SE_SLIDE_MON_UP, AnimationSlideMonUp ; $F7
-	dw AnimationWaterDropletsEverywhere
+	special_effect SE_SLIDE_MON_DOWN, AnimationSlideMonDown ; $F6
-	db SE_DARKEN_MON_PALETTE ; $F9
+	special_effect SE_FLASH_MON_PIC, AnimationFlashMonPic ; $F5
-	dw AnimationDarkenMonPalette
+	special_effect SE_SLIDE_MON_OFF, AnimationSlideMonOff ; $F4
-	db SE_FLASH_SCREEN_LONG ; $F8
+	special_effect SE_BLINK_MON, AnimationBlinkMon ; $F3
-	dw AnimationFlashScreenLong
+	special_effect SE_MOVE_MON_HORIZONTALLY, AnimationMoveMonHorizontally ; $F2
-	db SE_SLIDE_MON_UP ; $F7
+	special_effect SE_RESET_MON_POSITION, AnimationResetMonPosition ; $F1
-	dw AnimationSlideMonUp
+	special_effect SE_LIGHT_SCREEN_PALETTE, AnimationLightScreenPalette ; $F0
-	db SE_SLIDE_MON_DOWN ; $F6
+	special_effect SE_HIDE_MON_PIC, AnimationHideMonPic ; $EF
-	dw AnimationSlideMonDown
+	special_effect SE_SQUISH_MON_PIC, AnimationSquishMonPic ; $EE
-	db SE_FLASH_MON_PIC ; $F5
+	special_effect SE_SHOOT_BALLS_UPWARD, AnimationShootBallsUpward ; $ED
-	dw AnimationFlashMonPic
+	special_effect SE_SHOOT_MANY_BALLS_UPWARD, AnimationShootManyBallsUpward ; $EC
-	db SE_SLIDE_MON_OFF ; $F4
+	special_effect SE_BOUNCE_UP_AND_DOWN, AnimationBoundUpAndDown ; $EB
-	dw AnimationSlideMonOff
+	special_effect SE_MINIMIZE_MON, AnimationMinimizeMon ; $EA
-	db SE_BLINK_MON ; $F3
+	special_effect SE_SLIDE_MON_DOWN_AND_HIDE, AnimationSlideMonDownAndHide ; $E9
-	dw AnimationBlinkMon
+	special_effect SE_TRANSFORM_MON, AnimationTransformMon ; $E8
-	db SE_MOVE_MON_HORIZONTALLY ; $F2
+	special_effect SE_LEAVES_FALLING, AnimationLeavesFalling ; $E7
-	dw AnimationMoveMonHorizontally
+	special_effect SE_PETALS_FALLING, AnimationPetalsFalling ; $E6
-	db SE_RESET_MON_POSITION ; $F1
+	special_effect SE_SLIDE_MON_HALF_OFF, AnimationSlideMonHalfOff ; $E5
-	dw AnimationResetMonPosition
+	special_effect SE_SHAKE_ENEMY_HUD, AnimationShakeEnemyHUD ; $E4
-	db SE_LIGHT_SCREEN_PALETTE ; $F0
+	special_effect SE_SHAKE_ENEMY_HUD_2, AnimationShakeEnemyHUD ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4)
-	dw AnimationLightScreenPalette
+	special_effect SE_SPIRAL_BALLS_INWARD, AnimationSpiralBallsInward ; $E2
-	db SE_HIDE_MON_PIC ; $EF
+	special_effect SE_DELAY_ANIMATION_10, AnimationDelay10 ; $E1
-	dw AnimationHideMonPic
+	special_effect SE_FLASH_ENEMY_MON_PIC, AnimationFlashEnemyMonPic ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon
-	db SE_SQUISH_MON_PIC ; $EE
+	special_effect SE_HIDE_ENEMY_MON_PIC, AnimationHideEnemyMonPic ; $DF
-	dw AnimationSquishMonPic
+	special_effect SE_BLINK_ENEMY_MON, AnimationBlinkEnemyMon ; $DE
-	db SE_SHOOT_BALLS_UPWARD ; $ED
+	special_effect SE_SHOW_MON_PIC, AnimationShowMonPic ; $DD
-	dw AnimationShootBallsUpward
+	special_effect SE_SHOW_ENEMY_MON_PIC, AnimationShowEnemyMonPic ; $DC
-	db SE_SHOOT_MANY_BALLS_UPWARD ; $EC
+	special_effect SE_SLIDE_ENEMY_MON_OFF, AnimationSlideEnemyMonOff ; $DB
-	dw AnimationShootManyBallsUpward
+	special_effect SE_SHAKE_BACK_AND_FORTH, AnimationShakeBackAndForth ; $DA
-	db SE_BOUNCE_UP_AND_DOWN ; $EB
+	special_effect SE_SUBSTITUTE_MON, AnimationSubstitute ; $D9
-	dw AnimationBoundUpAndDown
+	special_effect SE_WAVY_SCREEN, AnimationWavyScreen ; $D8
-	db SE_MINIMIZE_MON ; $EA
+	db -1 ; end
-	dw AnimationMinimizeMon
-	db SE_SLIDE_MON_DOWN_AND_HIDE ; $E9
-	dw AnimationSlideMonDownAndHide
-	db SE_TRANSFORM_MON ; $E8
-	dw AnimationTransformMon
-	db SE_LEAVES_FALLING ; $E7
-	dw AnimationLeavesFalling
-	db SE_PETALS_FALLING ; $E6
-	dw AnimationPetalsFalling
-	db SE_SLIDE_MON_HALF_OFF ; $E5
-	dw AnimationSlideMonHalfOff
-	db SE_SHAKE_ENEMY_HUD ; $E4
-	dw AnimationShakeEnemyHUD
-	db SE_SHAKE_ENEMY_HUD_2 ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4)
-	dw AnimationShakeEnemyHUD
-	db SE_SPIRAL_BALLS_INWARD ; $E2
-	dw AnimationSpiralBallsInward
-	db SE_DELAY_ANIMATION_10 ; $E1
-	dw AnimationDelay10
-	db SE_FLASH_ENEMY_MON_PIC ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon
-	dw AnimationFlashEnemyMonPic
-	db SE_HIDE_ENEMY_MON_PIC ; $DF
-	dw AnimationHideEnemyMonPic
-	db SE_BLINK_ENEMY_MON ; $DE
-	dw AnimationBlinkEnemyMon
-	db SE_SHOW_MON_PIC ; $DD
-	dw AnimationShowMonPic
-	db SE_SHOW_ENEMY_MON_PIC ; $DC
-	dw AnimationShowEnemyMonPic
-	db SE_SLIDE_ENEMY_MON_OFF ; $DB
-	dw AnimationSlideEnemyMonOff
-	db SE_SHAKE_BACK_AND_FORTH ; $DA
-	dw AnimationShakeBackAndForth
-	db SE_SUBSTITUTE_MON ; $D9
-	dw AnimationSubstitute
-	db SE_WAVY_SCREEN ; $D8
-	dw AnimationWavyScreen
-	db $FF

data/moves/animation_special_effects.asm

@@ -1,75 +1,32 @@
-; Format: Animation ID (1 byte), Address (2 bytes)
+anim_special_effect: MACRO
+	db \1
+	dw \2
+ENDM
+
 AnimationIdSpecialEffects:
-	db MEGA_PUNCH
+; animation id, effect routine address
-	dw AnimationFlashScreen
+	anim_special_effect MEGA_PUNCH, AnimationFlashScreen
-
+	anim_special_effect GUILLOTINE, AnimationFlashScreen
-	db GUILLOTINE
+	anim_special_effect MEGA_KICK, AnimationFlashScreen
-	dw AnimationFlashScreen
+	anim_special_effect HEADBUTT, AnimationFlashScreen
-
+	anim_special_effect TAIL_WHIP, TailWhipAnimationUnused
-	db MEGA_KICK
+	anim_special_effect GROWL, DoGrowlSpecialEffects
-	dw AnimationFlashScreen
+	anim_special_effect DISABLE, AnimationFlashScreen
-
+	anim_special_effect BLIZZARD, DoBlizzardSpecialEffects
-	db HEADBUTT
+	anim_special_effect BUBBLEBEAM, AnimationFlashScreen
-	dw AnimationFlashScreen
+	anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks
-
+	anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks
-	db TAIL_WHIP
+	anim_special_effect REFLECT, AnimationFlashScreen
-	dw TailWhipAnimationUnused
+	anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects
-
+	anim_special_effect SPORE, AnimationFlashScreen
-	db GROWL
+	anim_special_effect EXPLOSION, DoExplodeSpecialEffects
-	dw DoGrowlSpecialEffects
+	anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects
-
+	anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon
-	db DISABLE
+	anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball
-	dw AnimationFlashScreen
+	anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball
-
+	anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects
-	db BLIZZARD
+	anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects
-	dw DoBlizzardSpecialEffects
+	anim_special_effect POOF_ANIM, DoPoofSpecialEffects
-
+	anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects
-	db BUBBLEBEAM
+	anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects
-	dw AnimationFlashScreen
+	db -1 ; end
-
-	db HYPER_BEAM
-	dw FlashScreenEveryFourFrameBlocks
-
-	db THUNDERBOLT
-	dw FlashScreenEveryEightFrameBlocks
-
-	db REFLECT
-	dw AnimationFlashScreen
-
-	db SELFDESTRUCT
-	dw DoExplodeSpecialEffects
-
-	db SPORE
-	dw AnimationFlashScreen
-
-	db EXPLOSION
-	dw DoExplodeSpecialEffects
-
-	db ROCK_SLIDE
-	dw DoRockSlideSpecialEffects
-
-	db TRADE_BALL_DROP_ANIM
-	dw TradeHidePokemon
-
-	db TRADE_BALL_SHAKE_ANIM
-	dw TradeShakePokeball
-
-	db TRADE_BALL_TILT_ANIM
-	dw TradeJumpPokeball
-
-	db TOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db SHAKE_ANIM
-	dw DoBallShakeSpecialEffects
-
-	db POOF_ANIM
-	dw DoPoofSpecialEffects
-
-	db GREATTOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db ULTRATOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db $FF ; terminator

data/moves/effects_pointers.asm

@@ -1,5 +1,5 @@
 MoveEffectPointerTable:
-	dw SleepEffect               ; unused effect
+	dw SleepEffect               ; EFFECT_01
 	dw PoisonEffect              ; POISON_SIDE_EFFECT1
 	dw DrainHPEffect             ; DRAIN_HP_EFFECT
 	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT1
@@ -28,7 +28,7 @@ MoveEffectPointerTable:
 	dw ThrashPetalDanceEffect    ; THRASH_PETAL_DANCE_EFFECT
 	dw SwitchAndTeleportEffect   ; SWITCH_AND_TELEPORT_EFFECT
 	dw TwoToFiveAttacksEffect    ; TWO_TO_FIVE_ATTACKS_EFFECT
-	dw TwoToFiveAttacksEffect    ; unused effect
+	dw TwoToFiveAttacksEffect    ; EFFECT_1E
 	dw FlinchSideEffect          ; FLINCH_SIDE_EFFECT1
 	dw SleepEffect               ; SLEEP_EFFECT
 	dw PoisonEffect              ; POISON_SIDE_EFFECT2

data/moves/grammar.asm

@@ -1,14 +1,72 @@
 ExclamationPointMoveSets:
-	db SWORDS_DANCE, GROWTH
+; set 0
-	db $00
+	db SWORDS_DANCE
-	db RECOVER, BIDE, SELFDESTRUCT, AMNESIA
+	db GROWTH
-	db $00
+	db 0 ; end set
-	db MEDITATE, AGILITY, TELEPORT, MIMIC, DOUBLE_TEAM, BARRAGE
+
-	db $00
+; set 1
-	db POUND, SCRATCH, VICEGRIP, WING_ATTACK, FLY, BIND, SLAM, HORN_ATTACK, BODY_SLAM
+	db RECOVER
-	db WRAP, THRASH, TAIL_WHIP, LEER, BITE, GROWL, ROAR, SING, PECK, COUNTER
+	db BIDE
-	db STRENGTH, ABSORB, STRING_SHOT, EARTHQUAKE, FISSURE, DIG, TOXIC, SCREECH, HARDEN
+	db SELFDESTRUCT
-	db MINIMIZE, WITHDRAW, DEFENSE_CURL, METRONOME, LICK, CLAMP, CONSTRICT, POISON_GAS
+	db AMNESIA
-	db LEECH_LIFE, BUBBLE, FLASH, SPLASH, ACID_ARMOR, FURY_SWIPES, REST, SHARPEN, SLASH, SUBSTITUTE
+	db 0 ; end set
-	db $00
+
-	db $FF ; terminator
+; set 2
+	db MEDITATE
+	db AGILITY
+	db TELEPORT
+	db MIMIC
+	db DOUBLE_TEAM
+	db BARRAGE
+	db 0 ; end set
+
+; set 3
+	db POUND
+	db SCRATCH
+	db VICEGRIP
+	db WING_ATTACK
+	db FLY
+	db BIND
+	db SLAM
+	db HORN_ATTACK
+	db BODY_SLAM
+	db WRAP
+	db THRASH
+	db TAIL_WHIP
+	db LEER
+	db BITE
+	db GROWL
+	db ROAR
+	db SING
+	db PECK
+	db COUNTER
+	db STRENGTH
+	db ABSORB
+	db STRING_SHOT
+	db EARTHQUAKE
+	db FISSURE
+	db DIG
+	db TOXIC
+	db SCREECH
+	db HARDEN
+	db MINIMIZE
+	db WITHDRAW
+	db DEFENSE_CURL
+	db METRONOME
+	db LICK
+	db CLAMP
+	db CONSTRICT
+	db POISON_GAS
+	db LEECH_LIFE
+	db BUBBLE
+	db FLASH
+	db SPLASH
+	db ACID_ARMOR
+	db FURY_SWIPES
+	db REST
+	db SHARPEN
+	db SLASH
+	db SUBSTITUTE
+	db 0 ; end set
+
+	db -1 ; end

data/moves/names.asm

@@ -164,4 +164,3 @@ MoveNames::
 	db "SLASH@"
 	db "SUBSTITUTE@"
 	db "STRUGGLE@"
-

data/pokemon/base_stats/abra.asm

@@ -11,7 +11,7 @@
 	dw AbraPicFront, AbraPicBack
 
 	db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/aerodactyl.asm

@@ -11,7 +11,7 @@
 	dw AerodactylPicFront, AerodactylPicBack
 
 	db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/alakazam.asm

@@ -11,7 +11,7 @@
 	dw AlakazamPicFront, AlakazamPicBack
 
 	db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/arbok.asm

@@ -11,7 +11,7 @@
 	dw ArbokPicFront, ArbokPicBack
 
 	db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/arcanine.asm

@@ -11,7 +11,7 @@
 	dw ArcaninePicFront, ArcaninePicBack
 
 	db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/articuno.asm

@@ -11,7 +11,7 @@
 	dw ArticunoPicFront, ArticunoPicBack
 
 	db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/beedrill.asm

@@ -11,7 +11,7 @@
 	dw BeedrillPicFront, BeedrillPicBack
 
 	db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/bellsprout.asm

@@ -11,7 +11,7 @@
 	dw BellsproutPicFront, BellsproutPicBack
 
 	db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/blastoise.asm

@@ -11,7 +11,7 @@
 	dw BlastoisePicFront, BlastoisePicBack
 
 	db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/bulbasaur.asm

@@ -11,7 +11,7 @@
 	dw BulbasaurPicFront, BulbasaurPicBack
 
 	db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/butterfree.asm

@@ -11,7 +11,7 @@
 	dw ButterfreePicFront, ButterfreePicBack
 
 	db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/caterpie.asm

@@ -11,7 +11,7 @@
 	dw CaterpiePicFront, CaterpiePicBack
 
 	db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm

data/pokemon/base_stats/chansey.asm

@@ -11,7 +11,7 @@
 	dw ChanseyPicFront, ChanseyPicBack
 
 	db POUND, DOUBLESLAP, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 4 ; growth rate
+	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/charizard.asm

@@ -11,7 +11,7 @@
 	dw CharizardPicFront, CharizardPicBack
 
 	db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   SWORDS_DANCE, MEGA_KICK,    TOXIC,        BODY_SLAM,    \

data/pokemon/base_stats/charmander.asm

@@ -11,7 +11,7 @@
 	dw CharmanderPicFront, CharmanderPicBack
 
 	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   SWORDS_DANCE, MEGA_KICK,    TOXIC,        BODY_SLAM,    \

data/pokemon/base_stats/charmeleon.asm

@@ -11,7 +11,7 @@
 	dw CharmeleonPicFront, CharmeleonPicBack
 
 	db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   SWORDS_DANCE, MEGA_KICK,    TOXIC,        BODY_SLAM,    \

data/pokemon/base_stats/clefable.asm

@@ -11,7 +11,7 @@
 	dw ClefablePicFront, ClefablePicBack
 
 	db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset
-	db 4 ; growth rate
+	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/clefairy.asm

@@ -11,7 +11,7 @@
 	dw ClefairyPicFront, ClefairyPicBack
 
 	db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 4 ; growth rate
+	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/cloyster.asm

@@ -11,7 +11,7 @@
 	dw CloysterPicFront, CloysterPicBack
 
 	db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    \

data/pokemon/base_stats/cubone.asm

@@ -11,7 +11,7 @@
 	dw CubonePicFront, CubonePicBack
 
 	db BONE_CLUB, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/dewgong.asm

@@ -11,7 +11,7 @@
 	dw DewgongPicFront, DewgongPicBack
 
 	db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/diglett.asm

@@ -11,7 +11,7 @@
 	dw DiglettPicFront, DiglettPicBack
 
 	db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/ditto.asm

@@ -11,7 +11,7 @@
 	dw DittoPicFront, DittoPicBack
 
 	db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm

data/pokemon/base_stats/dodrio.asm

@@ -11,7 +11,7 @@
 	dw DodrioPicFront, DodrioPicBack
 
 	db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm WHIRLWIND,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/doduo.asm

@@ -11,7 +11,7 @@
 	dw DoduoPicFront, DoduoPicBack
 
 	db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm WHIRLWIND,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/dragonair.asm

@@ -11,7 +11,7 @@
 	dw DragonairPicFront, DragonairPicBack
 
 	db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/dragonite.asm

@@ -11,7 +11,7 @@
 	dw DragonitePicFront, DragonitePicBack
 
 	db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/dratini.asm

@@ -11,7 +11,7 @@
 	dw DratiniPicFront, DratiniPicBack
 
 	db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \

data/pokemon/base_stats/drowzee.asm

@@ -11,7 +11,7 @@
 	dw DrowzeePicFront, DrowzeePicBack
 
 	db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/dugtrio.asm

@@ -11,7 +11,7 @@
 	dw DugtrioPicFront, DugtrioPicBack
 
 	db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/eevee.asm

@@ -11,7 +11,7 @@
 	dw EeveePicFront, EeveePicBack
 
 	db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/ekans.asm

@@ -11,7 +11,7 @@
 	dw EkansPicFront, EkansPicBack
 
 	db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/electabuzz.asm

@@ -11,7 +11,7 @@
 	dw ElectabuzzPicFront, ElectabuzzPicBack
 
 	db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/electrode.asm

@@ -11,7 +11,7 @@
 	dw ElectrodePicFront, ElectrodePicBack
 
 	db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        TAKE_DOWN,    HYPER_BEAM,   RAGE,         THUNDERBOLT,  \

data/pokemon/base_stats/exeggcute.asm

@@ -11,7 +11,7 @@
 	dw ExeggcutePicFront, ExeggcutePicBack
 
 	db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         PSYCHIC_M,    \

data/pokemon/base_stats/exeggutor.asm

@@ -11,7 +11,7 @@
 	dw ExeggutorPicFront, ExeggutorPicBack
 
 	db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   RAGE,         \

data/pokemon/base_stats/farfetchd.asm

@@ -11,7 +11,7 @@
 	dw FarfetchdPicFront, FarfetchdPicBack
 
 	db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    TOXIC,        BODY_SLAM,    \

data/pokemon/base_stats/fearow.asm

@@ -11,7 +11,7 @@
 	dw FearowPicFront, FearowPicBack
 
 	db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/flareon.asm

@@ -11,7 +11,7 @@
 	dw FlareonPicFront, FlareonPicBack
 
 	db TACKLE, SAND_ATTACK, QUICK_ATTACK, EMBER ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/gastly.asm

@@ -11,7 +11,7 @@
 	dw GastlyPicFront, GastlyPicBack
 
 	db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        RAGE,         MEGA_DRAIN,   THUNDERBOLT,  THUNDER,      \

data/pokemon/base_stats/gengar.asm

@@ -11,7 +11,7 @@
 	dw GengarPicFront, GengarPicBack
 
 	db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/geodude.asm

@@ -11,7 +11,7 @@
 	dw GeodudePicFront, GeodudePicBack
 
 	db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/gloom.asm

@@ -11,7 +11,7 @@
 	dw GloomPicFront, GloomPicBack
 
 	db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/golbat.asm

@@ -11,7 +11,7 @@
 	dw GolbatPicFront, GolbatPicBack
 
 	db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/goldeen.asm

@@ -11,7 +11,7 @@
 	dw GoldeenPicFront, GoldeenPicBack
 
 	db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        HORN_DRILL,   TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \

data/pokemon/base_stats/golduck.asm

@@ -11,7 +11,7 @@
 	dw GolduckPicFront, GolduckPicBack
 
 	db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/golem.asm

@@ -11,7 +11,7 @@
 	dw GolemPicFront, GolemPicBack
 
 	db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/graveler.asm

@@ -11,7 +11,7 @@
 	dw GravelerPicFront, GravelerPicBack
 
 	db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/grimer.asm

@@ -11,7 +11,7 @@
 	dw GrimerPicFront, GrimerPicBack
 
 	db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    RAGE,         MEGA_DRAIN,   THUNDERBOLT,  \

data/pokemon/base_stats/growlithe.asm

@@ -11,7 +11,7 @@
 	dw GrowlithePicFront, GrowlithePicBack
 
 	db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \

data/pokemon/base_stats/gyarados.asm

@@ -11,7 +11,7 @@
 	dw GyaradosPicFront, GyaradosPicBack
 
 	db BITE, DRAGON_RAGE, LEER, HYDRO_PUMP ; level 1 learnset
-	db 5 ; growth rate
+	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \

data/pokemon/base_stats/haunter.asm

@@ -11,7 +11,7 @@
 	dw HaunterPicFront, HaunterPicBack
 
 	db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        RAGE,         MEGA_DRAIN,   THUNDERBOLT,  THUNDER,      \

data/pokemon/base_stats/hitmonchan.asm

@@ -11,7 +11,7 @@
 	dw HitmonchanPicFront, HitmonchanPicBack
 
 	db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/hitmonlee.asm

@@ -11,7 +11,7 @@
 	dw HitmonleePicFront, HitmonleePicBack
 
 	db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/horsea.asm

@@ -11,7 +11,7 @@
 	dw HorseaPicFront, HorseaPicBack
 
 	db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    \

data/pokemon/base_stats/hypno.asm

@@ -11,7 +11,7 @@
 	dw HypnoPicFront, HypnoPicBack
 
 	db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/ivysaur.asm

@@ -11,7 +11,7 @@
 	dw IvysaurPicFront, IvysaurPicBack
 
 	db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \

data/pokemon/base_stats/jigglypuff.asm

@@ -11,7 +11,7 @@
 	dw JigglypuffPicFront, JigglypuffPicBack
 
 	db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 4 ; growth rate
+	db GROWTH_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/jolteon.asm

@@ -11,7 +11,7 @@
 	dw JolteonPicFront, JolteonPicBack
 
 	db TACKLE, SAND_ATTACK, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \

data/pokemon/base_stats/jynx.asm

@@ -11,7 +11,7 @@
 	dw JynxPicFront, JynxPicBack
 
 	db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \

data/pokemon/base_stats/kabuto.asm

@@ -11,7 +11,7 @@
 	dw KabutoPicFront, KabutoPicBack
 
 	db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \

data/pokemon/base_stats/kabutops.asm

@@ -11,7 +11,7 @@
 	dw KabutopsPicFront, KabutopsPicBack
 
 	db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset
-	db 0 ; growth rate
+	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   SWORDS_DANCE, MEGA_KICK,    TOXIC,        BODY_SLAM,    \

data/pokemon/base_stats/kadabra.asm

@@ -11,7 +11,7 @@
 	dw KadabraPicFront, KadabraPicBack
 
 	db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset
-	db 3 ; growth rate
+	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \