shithub: pokecrystal

Download patch

ref: 739bb3c1363de40ea0f4320e041da1488b084c41
parent: 14e0da51164d418b9eb347ed21a2a753393e8883
author: PikalaxALT <[email protected]>
date: Wed Nov 4 06:19:58 EST 2015

Replace party struct relative values with EQUS constants

--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -250,7 +250,7 @@
 	ld d, a
 	ld e, 0
 	ld hl, OTPartyMon1Level
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 .next
 	ld a, [hl]
 	cp e
@@ -685,7 +685,7 @@
 	inc d
 .fainted
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec c
@@ -710,7 +710,7 @@
 	push af
 	ld a, [CurOTMon]
 	ld hl, OTPartyMon1Status
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -754,7 +754,7 @@
 AI_HealStatus: ; 384e0
 	ld a, [CurOTMon]
 	ld hl, OTPartyMon1Status
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hl], a
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -1719,7 +1719,7 @@
 	ld b, a
 	ld c, 0
 	ld hl, OTPartyMon1HP
-	ld de, OTPartyMon2 - OTPartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 
 .loop
 	push hl
@@ -1933,7 +1933,7 @@
 	ld b, a
 	ld c, 0
 	ld hl, PartyMon1HP
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 
 .loop
 	ld a, [CurBattleMon]
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -2295,7 +2295,7 @@
 .asm_3ceb5
 	push hl
 	push bc
-	ld bc, PartyMon1HP - PartyMon1
+	ld bc, MON_HP
 	add hl, bc
 	ld a, [hli]
 	or [hl]
@@ -2305,7 +2305,7 @@
 
 	push hl
 	push bc
-	ld bc, PartyMon1Item - PartyMon1
+	ld bc, MON_ITEM
 	add hl, bc
 	pop bc
 	ld a, [hl]
@@ -2320,7 +2320,7 @@
 .asm_3ced1
 	sla c
 	push de
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	pop de
 	dec b
@@ -2384,7 +2384,7 @@
 	ld b, a
 	xor a
 	ld hl, OTPartyMon1HP
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 
 .loop
 	or [hl]
@@ -4062,7 +4062,7 @@
 
 
 Function3da0d: ; 3da0d
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld de, BattleMonSpecies
 	ld bc, 1 + 1 + NUM_MOVES ; species, item, moves ; BattleMonDVs - BattleMonSpecies
@@ -4265,7 +4265,7 @@
 	call Call_PlayBattleAnim
 
 .asm_3dbbc
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld b, h
 	ld c, l
@@ -5608,7 +5608,7 @@
 	jr .asm_3e4e2
 
 .asm_3e4dd
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call GetPartyParamLocation
 
 .asm_3e4e2
@@ -5867,7 +5867,7 @@
 	push hl
 	call .asm_3e6a5
 	pop hl
-	ld bc, PartyMon1PP - PartyMon1Moves
+	ld bc, (MON_PP) - (MON_MOVES)
 	add hl, bc
 	call .asm_3e6a5
 
@@ -7424,7 +7424,7 @@
 .asm_3ee89
 	push hl
 	push bc
-	ld a, PartyMon1PokerusStatus - PartyMon1
+	ld a, MON_PKRUS
 	call GetPartyParamLocation
 	ld a, [hl]
 	and a
@@ -7489,7 +7489,7 @@
 	dec a
 	call nz, DoubleExp
 	push bc
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld a, [hl]
 	cp LUCKY_EGG
@@ -7574,7 +7574,7 @@
 	predef CopyPkmnToTempMon
 	callab CalcLevel
 	pop bc
-	ld hl, PartyMon1Level - PartyMon1
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	cp MAX_LEVEL
@@ -7587,7 +7587,7 @@
 	ld a, d
 	ld [CurPartyLevel], a
 	ld [hl], a
-	ld hl, PartyMon1Species - PartyMon1
+	ld hl, MON_SPECIES
 	add hl, bc
 	ld a, [hl]
 	ld [CurSpecies], a
@@ -7733,7 +7733,7 @@
 	cp b
 	jr z, .asm_3f0d1
 	ld [CurPartyMon], a
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld b, h
 	ld c, l
@@ -8577,7 +8577,7 @@
 	ld b, a
 .partyloop
 	push bc
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
 	or [hl]
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -706,7 +706,7 @@
 
 	; If the monster's id doesn't match the player's,
 	; some conditions need to be met.
-	ld a, PartyMon1ID - PartyMon1
+	ld a, MON_ID
 	call BattlePartyAttr
 
 	ld a, [PlayerID]
@@ -1949,7 +1949,7 @@
 .next
 	srl b
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	inc e
@@ -1987,7 +1987,7 @@
 
 	push hl
 	push bc
-	ld bc, PartyMon1HP - PartyMon1
+	ld bc, MON_HP
 	add hl, bc
 	pop bc
 	ld a, [hli]
@@ -2022,7 +2022,7 @@
 	ret z
 
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 
@@ -2136,7 +2136,7 @@
 
 .asm_34b00
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	srl b
@@ -2266,7 +2266,7 @@
 	srl b
 	pop hl
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	jr .loop
@@ -3358,7 +3358,7 @@
 
 
 DittoMetalPowder: ; 352b1
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hBattleTurn]
 	and a
@@ -3633,7 +3633,7 @@
 	ld h, a
 
 	push hl
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call BattlePartyAttr
 
 	ld a, [hBattleTurn]
@@ -4840,7 +4840,7 @@
 	bit SUBSTATUS_TRANSFORMED, [hl]
 	jp nz, .asm_35b10
 
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call UserPartyAttr
 	ld d, h
 	ld e, l
@@ -5118,7 +5118,7 @@
 	ld a, [AttackMissed]
 	and a
 	jp nz, .asm_35c91
-	ld bc, PartyMon2 - PartyMon1 ; ????
+	ld bc, PARTYMON_STRUCT_LENGTH ; ????
 	ld hl, EnemyMonMoves
 	ld a, [hBattleTurn]
 	and a
@@ -5166,7 +5166,7 @@
 	sub b
 	ld [hl], a
 	push af
-	ld a, PartyMon1PP - PartyMon1
+	ld a, MON_PP
 	call OpponentPartyAttr
 	ld d, b
 	pop af
@@ -5262,7 +5262,7 @@
 	ld [hl], a
 	ld h, d
 	ld l, e
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld d, PartyEnd - PartySpecies
 .asm_35ce9
 	ld [hl], a
@@ -7418,7 +7418,7 @@
 	ld a, [PartyCount]
 	ld d, a
 	ld e, 0
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 .asm_3699d
 	ld a, [CurBattleMon]
 	cp e
@@ -9286,7 +9286,7 @@
 	jr z, .done
 
 .party
-	ld a, PartyMon1Status - PartyMon1
+	ld a, MON_STATUS
 	call UserPartyAttr
 	res FRZ, [hl]
 
@@ -9408,7 +9408,7 @@
 
 
 Function377f5: ; 377f5
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hl]
 	ld [CurPartySpecies], a
@@ -9937,7 +9937,7 @@
 
 .next
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	inc c
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -265,6 +265,7 @@
 MON_MOVES              EQUS "PartyMon1Moves - PartyMon1"
 MON_ID                 EQUS "PartyMon1ID - PartyMon1"
 MON_EXP                EQUS "PartyMon1Exp - PartyMon1"
+MON_STAT_EXP           EQUS "PartyMon1StatExp - PartyMon1"
 MON_HP_EXP             EQUS "PartyMon1HPExp - PartyMon1"
 MON_ATK_EXP            EQUS "PartyMon1AtkExp - PartyMon1"
 MON_DEF_EXP            EQUS "PartyMon1DefExp - PartyMon1"
@@ -274,8 +275,11 @@
 MON_PP                 EQUS "PartyMon1PP - PartyMon1"
 MON_HAPPINESS          EQUS "PartyMon1Happiness - PartyMon1"
 MON_PKRUS              EQUS "PartyMon1PokerusStatus - PartyMon1"
+MON_CAUGHTDATA         EQUS "PartyMon1CaughtData - PartyMon1"
+MON_CAUGHTLEVEL        EQUS "PartyMon1CaughtLevel - PartyMon1"
 MON_CAUGHTTIME         EQUS "PartyMon1CaughtTime - PartyMon1"
 MON_CAUGHTGENDER       EQUS "PartyMon1CaughtGender - PartyMon1"
+MON_CAUGHTLOCATION     EQUS "PartyMon1CaughtLocation - PartyMon1"
 MON_LEVEL              EQUS "PartyMon1Level - PartyMon1"
 MON_STATUS             EQUS "PartyMon1Status - PartyMon1"
 MON_HP                 EQUS "PartyMon1HP - PartyMon1"
@@ -285,5 +289,6 @@
 MON_SPD                EQUS "PartyMon1Speed - PartyMon1"
 MON_SAT                EQUS "PartyMon1SpclAtk - PartyMon1"
 MON_SDF                EQUS "PartyMon1SpclDef - PartyMon1"
-BOXMON_STRUCT_LENGTH   EQUS "PartyMon1Status - PartyMon1"
+BOXMON_STRUCT_LENGTH   EQUS "PartyMon1End - PartyMon1"
 PARTYMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1"
+SCRATCHMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1Item"
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -121,7 +121,7 @@
 	; Check if Pkmn was already loaded before
 	; Check current and the 2 previous teams
 	; includes check if item is double at the current team
-	ld bc, party_struct_length + PKMN_NAME_LENGTH
+	ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ld b, a
@@ -164,17 +164,17 @@
 	cp b
 	jr z, .FindARandomBattleTowerPkmn
 
-	ld bc, party_struct_length + PKMN_NAME_LENGTH
+	ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH
 	call CopyBytes
 
 	ld a, [wNamedObjectIndexBuffer]
 	push af
 	push de
-	ld hl, - (party_struct_length + PKMN_NAME_LENGTH)
+	ld hl, - (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH)
 	add hl, de
 	ld a, [hl]
 	ld [wNamedObjectIndexBuffer], a
-	ld bc, party_struct_length
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	push hl
 	call GetPokemonName
--- a/data/evos_attacks.asm
+++ b/data/evos_attacks.asm
@@ -10,3389 +10,3389 @@
 EvosAttacks::
 
 BulbasaurEvosAttacks:
-	db EVOLVE_LEVEL,16,IVYSAUR
+	db EVOLVE_LEVEL, 16, IVYSAUR
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 4,GROWL
-	db 7,LEECH_SEED
-	db 10,VINE_WHIP
-	db 15,POISONPOWDER
-	db 15,SLEEP_POWDER
-	db 20,RAZOR_LEAF
-	db 25,SWEET_SCENT
-	db 32,GROWTH
-	db 39,SYNTHESIS
-	db 46,SOLARBEAM
+	db 1, TACKLE
+	db 4, GROWL
+	db 7, LEECH_SEED
+	db 10, VINE_WHIP
+	db 15, POISONPOWDER
+	db 15, SLEEP_POWDER
+	db 20, RAZOR_LEAF
+	db 25, SWEET_SCENT
+	db 32, GROWTH
+	db 39, SYNTHESIS
+	db 46, SOLARBEAM
 	db 0 ; no more level-up moves
 
 IvysaurEvosAttacks:
-	db EVOLVE_LEVEL,32,VENUSAUR
+	db EVOLVE_LEVEL, 32, VENUSAUR
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,LEECH_SEED
-	db 4,GROWL
-	db 7,LEECH_SEED
-	db 10,VINE_WHIP
-	db 15,POISONPOWDER
-	db 15,SLEEP_POWDER
-	db 22,RAZOR_LEAF
-	db 29,SWEET_SCENT
-	db 38,GROWTH
-	db 47,SYNTHESIS
-	db 56,SOLARBEAM
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, LEECH_SEED
+	db 4, GROWL
+	db 7, LEECH_SEED
+	db 10, VINE_WHIP
+	db 15, POISONPOWDER
+	db 15, SLEEP_POWDER
+	db 22, RAZOR_LEAF
+	db 29, SWEET_SCENT
+	db 38, GROWTH
+	db 47, SYNTHESIS
+	db 56, SOLARBEAM
 	db 0 ; no more level-up moves
 
 VenusaurEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,LEECH_SEED
-	db 1,VINE_WHIP
-	db 4,GROWL
-	db 7,LEECH_SEED
-	db 10,VINE_WHIP
-	db 15,POISONPOWDER
-	db 15,SLEEP_POWDER
-	db 22,RAZOR_LEAF
-	db 29,SWEET_SCENT
-	db 41,GROWTH
-	db 53,SYNTHESIS
-	db 65,SOLARBEAM
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, LEECH_SEED
+	db 1, VINE_WHIP
+	db 4, GROWL
+	db 7, LEECH_SEED
+	db 10, VINE_WHIP
+	db 15, POISONPOWDER
+	db 15, SLEEP_POWDER
+	db 22, RAZOR_LEAF
+	db 29, SWEET_SCENT
+	db 41, GROWTH
+	db 53, SYNTHESIS
+	db 65, SOLARBEAM
 	db 0 ; no more level-up moves
 
 CharmanderEvosAttacks:
-	db EVOLVE_LEVEL,16,CHARMELEON
+	db EVOLVE_LEVEL, 16, CHARMELEON
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,GROWL
-	db 7,EMBER
-	db 13,SMOKESCREEN
-	db 19,RAGE
-	db 25,SCARY_FACE
-	db 31,FLAMETHROWER
-	db 37,SLASH
-	db 43,DRAGON_RAGE
-	db 49,FIRE_SPIN
+	db 1, SCRATCH
+	db 1, GROWL
+	db 7, EMBER
+	db 13, SMOKESCREEN
+	db 19, RAGE
+	db 25, SCARY_FACE
+	db 31, FLAMETHROWER
+	db 37, SLASH
+	db 43, DRAGON_RAGE
+	db 49, FIRE_SPIN
 	db 0 ; no more level-up moves
 
 CharmeleonEvosAttacks:
-	db EVOLVE_LEVEL,36,CHARIZARD
+	db EVOLVE_LEVEL, 36, CHARIZARD
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,GROWL
-	db 1,EMBER
-	db 7,EMBER
-	db 13,SMOKESCREEN
-	db 20,RAGE
-	db 27,SCARY_FACE
-	db 34,FLAMETHROWER
-	db 41,SLASH
-	db 48,DRAGON_RAGE
-	db 55,FIRE_SPIN
+	db 1, SCRATCH
+	db 1, GROWL
+	db 1, EMBER
+	db 7, EMBER
+	db 13, SMOKESCREEN
+	db 20, RAGE
+	db 27, SCARY_FACE
+	db 34, FLAMETHROWER
+	db 41, SLASH
+	db 48, DRAGON_RAGE
+	db 55, FIRE_SPIN
 	db 0 ; no more level-up moves
 
 CharizardEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,GROWL
-	db 1,EMBER
-	db 1,SMOKESCREEN
-	db 7,EMBER
-	db 13,SMOKESCREEN
-	db 20,RAGE
-	db 27,SCARY_FACE
-	db 34,FLAMETHROWER
-	db 36,WING_ATTACK
-	db 44,SLASH
-	db 54,DRAGON_RAGE
-	db 64,FIRE_SPIN
+	db 1, SCRATCH
+	db 1, GROWL
+	db 1, EMBER
+	db 1, SMOKESCREEN
+	db 7, EMBER
+	db 13, SMOKESCREEN
+	db 20, RAGE
+	db 27, SCARY_FACE
+	db 34, FLAMETHROWER
+	db 36, WING_ATTACK
+	db 44, SLASH
+	db 54, DRAGON_RAGE
+	db 64, FIRE_SPIN
 	db 0 ; no more level-up moves
 
 SquirtleEvosAttacks:
-	db EVOLVE_LEVEL,16,WARTORTLE
+	db EVOLVE_LEVEL, 16, WARTORTLE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 4,TAIL_WHIP
-	db 7,BUBBLE
-	db 10,WITHDRAW
-	db 13,WATER_GUN
-	db 18,BITE
-	db 23,RAPID_SPIN
-	db 28,PROTECT
-	db 33,RAIN_DANCE
-	db 40,SKULL_BASH
-	db 47,HYDRO_PUMP
+	db 1, TACKLE
+	db 4, TAIL_WHIP
+	db 7, BUBBLE
+	db 10, WITHDRAW
+	db 13, WATER_GUN
+	db 18, BITE
+	db 23, RAPID_SPIN
+	db 28, PROTECT
+	db 33, RAIN_DANCE
+	db 40, SKULL_BASH
+	db 47, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 WartortleEvosAttacks:
-	db EVOLVE_LEVEL,36,BLASTOISE
+	db EVOLVE_LEVEL, 36, BLASTOISE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 1,BUBBLE
-	db 4,TAIL_WHIP
-	db 7,BUBBLE
-	db 10,WITHDRAW
-	db 13,WATER_GUN
-	db 19,BITE
-	db 25,RAPID_SPIN
-	db 31,PROTECT
-	db 37,RAIN_DANCE
-	db 45,SKULL_BASH
-	db 53,HYDRO_PUMP
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 1, BUBBLE
+	db 4, TAIL_WHIP
+	db 7, BUBBLE
+	db 10, WITHDRAW
+	db 13, WATER_GUN
+	db 19, BITE
+	db 25, RAPID_SPIN
+	db 31, PROTECT
+	db 37, RAIN_DANCE
+	db 45, SKULL_BASH
+	db 53, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 BlastoiseEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 1,BUBBLE
-	db 1,WITHDRAW
-	db 4,TAIL_WHIP
-	db 7,BUBBLE
-	db 10,WITHDRAW
-	db 13,WATER_GUN
-	db 19,BITE
-	db 25,RAPID_SPIN
-	db 31,PROTECT
-	db 42,RAIN_DANCE
-	db 55,SKULL_BASH
-	db 68,HYDRO_PUMP
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 1, BUBBLE
+	db 1, WITHDRAW
+	db 4, TAIL_WHIP
+	db 7, BUBBLE
+	db 10, WITHDRAW
+	db 13, WATER_GUN
+	db 19, BITE
+	db 25, RAPID_SPIN
+	db 31, PROTECT
+	db 42, RAIN_DANCE
+	db 55, SKULL_BASH
+	db 68, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 CaterpieEvosAttacks:
-	db EVOLVE_LEVEL,7,METAPOD
+	db EVOLVE_LEVEL, 7, METAPOD
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,STRING_SHOT
+	db 1, TACKLE
+	db 1, STRING_SHOT
 	db 0 ; no more level-up moves
 
 MetapodEvosAttacks:
-	db EVOLVE_LEVEL,10,BUTTERFREE
+	db EVOLVE_LEVEL, 10, BUTTERFREE
 	db 0 ; no more evolutions
-	db 1,HARDEN
-	db 7,HARDEN
+	db 1, HARDEN
+	db 7, HARDEN
 	db 0 ; no more level-up moves
 
 ButterfreeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONFUSION
-	db 10,CONFUSION
-	db 13,POISONPOWDER
-	db 14,STUN_SPORE
-	db 15,SLEEP_POWDER
-	db 18,SUPERSONIC
-	db 23,WHIRLWIND
-	db 28,GUST
-	db 34,PSYBEAM
-	db 40,SAFEGUARD
+	db 1, CONFUSION
+	db 10, CONFUSION
+	db 13, POISONPOWDER
+	db 14, STUN_SPORE
+	db 15, SLEEP_POWDER
+	db 18, SUPERSONIC
+	db 23, WHIRLWIND
+	db 28, GUST
+	db 34, PSYBEAM
+	db 40, SAFEGUARD
 	db 0 ; no more level-up moves
 
 WeedleEvosAttacks:
-	db EVOLVE_LEVEL,7,KAKUNA
+	db EVOLVE_LEVEL, 7, KAKUNA
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 1,STRING_SHOT
+	db 1, POISON_STING
+	db 1, STRING_SHOT
 	db 0 ; no more level-up moves
 
 KakunaEvosAttacks:
-	db EVOLVE_LEVEL,10,BEEDRILL
+	db EVOLVE_LEVEL, 10, BEEDRILL
 	db 0 ; no more evolutions
-	db 1,HARDEN
-	db 7,HARDEN
+	db 1, HARDEN
+	db 7, HARDEN
 	db 0 ; no more level-up moves
 
 BeedrillEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,FURY_ATTACK
-	db 10,FURY_ATTACK
-	db 15,FOCUS_ENERGY
-	db 20,TWINEEDLE
-	db 25,RAGE
-	db 30,PURSUIT
-	db 35,PIN_MISSILE
-	db 40,AGILITY
+	db 1, FURY_ATTACK
+	db 10, FURY_ATTACK
+	db 15, FOCUS_ENERGY
+	db 20, TWINEEDLE
+	db 25, RAGE
+	db 30, PURSUIT
+	db 35, PIN_MISSILE
+	db 40, AGILITY
 	db 0 ; no more level-up moves
 
 PidgeyEvosAttacks:
-	db EVOLVE_LEVEL,18,PIDGEOTTO
+	db EVOLVE_LEVEL, 18, PIDGEOTTO
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 5,SAND_ATTACK
-	db 9,GUST
-	db 15,QUICK_ATTACK
-	db 21,WHIRLWIND
-	db 29,WING_ATTACK
-	db 37,AGILITY
-	db 47,MIRROR_MOVE
+	db 1, TACKLE
+	db 5, SAND_ATTACK
+	db 9, GUST
+	db 15, QUICK_ATTACK
+	db 21, WHIRLWIND
+	db 29, WING_ATTACK
+	db 37, AGILITY
+	db 47, MIRROR_MOVE
 	db 0 ; no more level-up moves
 
 PidgeottoEvosAttacks:
-	db EVOLVE_LEVEL,36,PIDGEOT
+	db EVOLVE_LEVEL, 36, PIDGEOT
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SAND_ATTACK
-	db 1,GUST
-	db 5,SAND_ATTACK
-	db 9,GUST
-	db 15,QUICK_ATTACK
-	db 23,WHIRLWIND
-	db 33,WING_ATTACK
-	db 43,AGILITY
-	db 55,MIRROR_MOVE
+	db 1, TACKLE
+	db 1, SAND_ATTACK
+	db 1, GUST
+	db 5, SAND_ATTACK
+	db 9, GUST
+	db 15, QUICK_ATTACK
+	db 23, WHIRLWIND
+	db 33, WING_ATTACK
+	db 43, AGILITY
+	db 55, MIRROR_MOVE
 	db 0 ; no more level-up moves
 
 PidgeotEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SAND_ATTACK
-	db 1,GUST
-	db 1,QUICK_ATTACK
-	db 5,SAND_ATTACK
-	db 9,GUST
-	db 15,QUICK_ATTACK
-	db 23,WHIRLWIND
-	db 33,WING_ATTACK
-	db 46,AGILITY
-	db 61,MIRROR_MOVE
+	db 1, TACKLE
+	db 1, SAND_ATTACK
+	db 1, GUST
+	db 1, QUICK_ATTACK
+	db 5, SAND_ATTACK
+	db 9, GUST
+	db 15, QUICK_ATTACK
+	db 23, WHIRLWIND
+	db 33, WING_ATTACK
+	db 46, AGILITY
+	db 61, MIRROR_MOVE
 	db 0 ; no more level-up moves
 
 RattataEvosAttacks:
-	db EVOLVE_LEVEL,20,RATICATE
+	db EVOLVE_LEVEL, 20, RATICATE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 7,QUICK_ATTACK
-	db 13,HYPER_FANG
-	db 20,FOCUS_ENERGY
-	db 27,PURSUIT
-	db 34,SUPER_FANG
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 7, QUICK_ATTACK
+	db 13, HYPER_FANG
+	db 20, FOCUS_ENERGY
+	db 27, PURSUIT
+	db 34, SUPER_FANG
 	db 0 ; no more level-up moves
 
 RaticateEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 1,QUICK_ATTACK
-	db 7,QUICK_ATTACK
-	db 13,HYPER_FANG
-	db 20,SCARY_FACE
-	db 30,PURSUIT
-	db 40,SUPER_FANG
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 1, QUICK_ATTACK
+	db 7, QUICK_ATTACK
+	db 13, HYPER_FANG
+	db 20, SCARY_FACE
+	db 30, PURSUIT
+	db 40, SUPER_FANG
 	db 0 ; no more level-up moves
 
 SpearowEvosAttacks:
-	db EVOLVE_LEVEL,20,FEAROW
+	db EVOLVE_LEVEL, 20, FEAROW
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,GROWL
-	db 7,LEER
-	db 13,FURY_ATTACK
-	db 25,PURSUIT
-	db 31,MIRROR_MOVE
-	db 37,DRILL_PECK
-	db 43,AGILITY
+	db 1, PECK
+	db 1, GROWL
+	db 7, LEER
+	db 13, FURY_ATTACK
+	db 25, PURSUIT
+	db 31, MIRROR_MOVE
+	db 37, DRILL_PECK
+	db 43, AGILITY
 	db 0 ; no more level-up moves
 
 FearowEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,GROWL
-	db 1,LEER
-	db 1,FURY_ATTACK
-	db 7,LEER
-	db 13,FURY_ATTACK
-	db 26,PURSUIT
-	db 32,MIRROR_MOVE
-	db 40,DRILL_PECK
-	db 47,AGILITY
+	db 1, PECK
+	db 1, GROWL
+	db 1, LEER
+	db 1, FURY_ATTACK
+	db 7, LEER
+	db 13, FURY_ATTACK
+	db 26, PURSUIT
+	db 32, MIRROR_MOVE
+	db 40, DRILL_PECK
+	db 47, AGILITY
 	db 0 ; no more level-up moves
 
 EkansEvosAttacks:
-	db EVOLVE_LEVEL,22,ARBOK
+	db EVOLVE_LEVEL, 22, ARBOK
 	db 0 ; no more evolutions
-	db 1,WRAP
-	db 1,LEER
-	db 9,POISON_STING
-	db 15,BITE
-	db 23,GLARE
-	db 29,SCREECH
-	db 37,ACID
-	db 43,HAZE
+	db 1, WRAP
+	db 1, LEER
+	db 9, POISON_STING
+	db 15, BITE
+	db 23, GLARE
+	db 29, SCREECH
+	db 37, ACID
+	db 43, HAZE
 	db 0 ; no more level-up moves
 
 ArbokEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WRAP
-	db 1,LEER
-	db 1,POISON_STING
-	db 1,BITE
-	db 9,POISON_STING
-	db 15,BITE
-	db 25,GLARE
-	db 33,SCREECH
-	db 43,ACID
-	db 51,HAZE
+	db 1, WRAP
+	db 1, LEER
+	db 1, POISON_STING
+	db 1, BITE
+	db 9, POISON_STING
+	db 15, BITE
+	db 25, GLARE
+	db 33, SCREECH
+	db 43, ACID
+	db 51, HAZE
 	db 0 ; no more level-up moves
 
 PikachuEvosAttacks:
-	db EVOLVE_ITEM,THUNDERSTONE,RAICHU
+	db EVOLVE_ITEM, THUNDERSTONE, RAICHU
 	db 0 ; no more evolutions
-	db 1,THUNDERSHOCK
-	db 1,GROWL
-	db 6,TAIL_WHIP
-	db 8,THUNDER_WAVE
-	db 11,QUICK_ATTACK
-	db 15,DOUBLE_TEAM
-	db 20,SLAM
-	db 26,THUNDERBOLT
-	db 33,AGILITY
-	db 41,THUNDER
-	db 50,LIGHT_SCREEN
+	db 1, THUNDERSHOCK
+	db 1, GROWL
+	db 6, TAIL_WHIP
+	db 8, THUNDER_WAVE
+	db 11, QUICK_ATTACK
+	db 15, DOUBLE_TEAM
+	db 20, SLAM
+	db 26, THUNDERBOLT
+	db 33, AGILITY
+	db 41, THUNDER
+	db 50, LIGHT_SCREEN
 	db 0 ; no more level-up moves
 
 RaichuEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,THUNDERSHOCK
-	db 1,TAIL_WHIP
-	db 1,QUICK_ATTACK
-	db 1,THUNDERBOLT
+	db 1, THUNDERSHOCK
+	db 1, TAIL_WHIP
+	db 1, QUICK_ATTACK
+	db 1, THUNDERBOLT
 	db 0 ; no more level-up moves
 
 SandshrewEvosAttacks:
-	db EVOLVE_LEVEL,22,SANDSLASH
+	db EVOLVE_LEVEL, 22, SANDSLASH
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 6,DEFENSE_CURL
-	db 11,SAND_ATTACK
-	db 17,POISON_STING
-	db 23,SLASH
-	db 30,SWIFT
-	db 37,FURY_SWIPES
-	db 45,SANDSTORM
+	db 1, SCRATCH
+	db 6, DEFENSE_CURL
+	db 11, SAND_ATTACK
+	db 17, POISON_STING
+	db 23, SLASH
+	db 30, SWIFT
+	db 37, FURY_SWIPES
+	db 45, SANDSTORM
 	db 0 ; no more level-up moves
 
 SandslashEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,DEFENSE_CURL
-	db 1,SAND_ATTACK
-	db 6,DEFENSE_CURL
-	db 11,SAND_ATTACK
-	db 17,POISON_STING
-	db 24,SLASH
-	db 33,SWIFT
-	db 42,FURY_SWIPES
-	db 52,SANDSTORM
+	db 1, SCRATCH
+	db 1, DEFENSE_CURL
+	db 1, SAND_ATTACK
+	db 6, DEFENSE_CURL
+	db 11, SAND_ATTACK
+	db 17, POISON_STING
+	db 24, SLASH
+	db 33, SWIFT
+	db 42, FURY_SWIPES
+	db 52, SANDSTORM
 	db 0 ; no more level-up moves
 
 NidoranFEvosAttacks:
-	db EVOLVE_LEVEL,16,NIDORINA
+	db EVOLVE_LEVEL, 16, NIDORINA
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,TACKLE
-	db 8,SCRATCH
-	db 12,DOUBLE_KICK
-	db 17,POISON_STING
-	db 23,TAIL_WHIP
-	db 30,BITE
-	db 38,FURY_SWIPES
+	db 1, GROWL
+	db 1, TACKLE
+	db 8, SCRATCH
+	db 12, DOUBLE_KICK
+	db 17, POISON_STING
+	db 23, TAIL_WHIP
+	db 30, BITE
+	db 38, FURY_SWIPES
 	db 0 ; no more level-up moves
 
 NidorinaEvosAttacks:
-	db EVOLVE_ITEM,MOON_STONE,NIDOQUEEN
+	db EVOLVE_ITEM, MOON_STONE, NIDOQUEEN
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,TACKLE
-	db 8,SCRATCH
-	db 12,DOUBLE_KICK
-	db 19,POISON_STING
-	db 27,TAIL_WHIP
-	db 36,BITE
-	db 46,FURY_SWIPES
+	db 1, GROWL
+	db 1, TACKLE
+	db 8, SCRATCH
+	db 12, DOUBLE_KICK
+	db 19, POISON_STING
+	db 27, TAIL_WHIP
+	db 36, BITE
+	db 46, FURY_SWIPES
 	db 0 ; no more level-up moves
 
 NidoqueenEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCRATCH
-	db 1,DOUBLE_KICK
-	db 1,TAIL_WHIP
-	db 23,BODY_SLAM
+	db 1, TACKLE
+	db 1, SCRATCH
+	db 1, DOUBLE_KICK
+	db 1, TAIL_WHIP
+	db 23, BODY_SLAM
 	db 0 ; no more level-up moves
 
 NidoranMEvosAttacks:
-	db EVOLVE_LEVEL,16,NIDORINO
+	db EVOLVE_LEVEL, 16, NIDORINO
 	db 0 ; no more evolutions
-	db 1,LEER
-	db 1,TACKLE
-	db 8,HORN_ATTACK
-	db 12,DOUBLE_KICK
-	db 17,POISON_STING
-	db 23,FOCUS_ENERGY
-	db 30,FURY_ATTACK
-	db 38,HORN_DRILL
+	db 1, LEER
+	db 1, TACKLE
+	db 8, HORN_ATTACK
+	db 12, DOUBLE_KICK
+	db 17, POISON_STING
+	db 23, FOCUS_ENERGY
+	db 30, FURY_ATTACK
+	db 38, HORN_DRILL
 	db 0 ; no more level-up moves
 
 NidorinoEvosAttacks:
-	db EVOLVE_ITEM,MOON_STONE,NIDOKING
+	db EVOLVE_ITEM, MOON_STONE, NIDOKING
 	db 0 ; no more evolutions
-	db 1,LEER
-	db 1,TACKLE
-	db 8,HORN_ATTACK
-	db 12,DOUBLE_KICK
-	db 19,POISON_STING
-	db 27,FOCUS_ENERGY
-	db 36,FURY_ATTACK
-	db 46,HORN_DRILL
+	db 1, LEER
+	db 1, TACKLE
+	db 8, HORN_ATTACK
+	db 12, DOUBLE_KICK
+	db 19, POISON_STING
+	db 27, FOCUS_ENERGY
+	db 36, FURY_ATTACK
+	db 46, HORN_DRILL
 	db 0 ; no more level-up moves
 
 NidokingEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,HORN_ATTACK
-	db 1,DOUBLE_KICK
-	db 1,POISON_STING
-	db 23,THRASH
+	db 1, TACKLE
+	db 1, HORN_ATTACK
+	db 1, DOUBLE_KICK
+	db 1, POISON_STING
+	db 23, THRASH
 	db 0 ; no more level-up moves
 
 ClefairyEvosAttacks:
-	db EVOLVE_ITEM,MOON_STONE,CLEFABLE
+	db EVOLVE_ITEM, MOON_STONE, CLEFABLE
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,GROWL
-	db 4,ENCORE
-	db 8,SING
-	db 13,DOUBLESLAP
-	db 19,MINIMIZE
-	db 26,DEFENSE_CURL
-	db 34,METRONOME
-	db 43,MOONLIGHT
-	db 53,LIGHT_SCREEN
+	db 1, POUND
+	db 1, GROWL
+	db 4, ENCORE
+	db 8, SING
+	db 13, DOUBLESLAP
+	db 19, MINIMIZE
+	db 26, DEFENSE_CURL
+	db 34, METRONOME
+	db 43, MOONLIGHT
+	db 53, LIGHT_SCREEN
 	db 0 ; no more level-up moves
 
 ClefableEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SING
-	db 1,DOUBLESLAP
-	db 1,METRONOME
-	db 1,MOONLIGHT
+	db 1, SING
+	db 1, DOUBLESLAP
+	db 1, METRONOME
+	db 1, MOONLIGHT
 	db 0 ; no more level-up moves
 
 VulpixEvosAttacks:
-	db EVOLVE_ITEM,FIRE_STONE,NINETALES
+	db EVOLVE_ITEM, FIRE_STONE, NINETALES
 	db 0 ; no more evolutions
-	db 1,EMBER
-	db 1,TAIL_WHIP
-	db 7,QUICK_ATTACK
-	db 13,ROAR
-	db 19,CONFUSE_RAY
-	db 25,SAFEGUARD
-	db 31,FLAMETHROWER
-	db 37,FIRE_SPIN
+	db 1, EMBER
+	db 1, TAIL_WHIP
+	db 7, QUICK_ATTACK
+	db 13, ROAR
+	db 19, CONFUSE_RAY
+	db 25, SAFEGUARD
+	db 31, FLAMETHROWER
+	db 37, FIRE_SPIN
 	db 0 ; no more level-up moves
 
 NinetalesEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,EMBER
-	db 1,QUICK_ATTACK
-	db 1,CONFUSE_RAY
-	db 1,SAFEGUARD
-	db 43,FIRE_SPIN
+	db 1, EMBER
+	db 1, QUICK_ATTACK
+	db 1, CONFUSE_RAY
+	db 1, SAFEGUARD
+	db 43, FIRE_SPIN
 	db 0 ; no more level-up moves
 
 JigglypuffEvosAttacks:
-	db EVOLVE_ITEM,MOON_STONE,WIGGLYTUFF
+	db EVOLVE_ITEM, MOON_STONE, WIGGLYTUFF
 	db 0 ; no more evolutions
-	db 1,SING
-	db 4,DEFENSE_CURL
-	db 9,POUND
-	db 14,DISABLE
-	db 19,ROLLOUT
-	db 24,DOUBLESLAP
-	db 29,REST
-	db 34,BODY_SLAM
-	db 39,DOUBLE_EDGE
+	db 1, SING
+	db 4, DEFENSE_CURL
+	db 9, POUND
+	db 14, DISABLE
+	db 19, ROLLOUT
+	db 24, DOUBLESLAP
+	db 29, REST
+	db 34, BODY_SLAM
+	db 39, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 WigglytuffEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SING
-	db 1,DISABLE
-	db 1,DEFENSE_CURL
-	db 1,DOUBLESLAP
+	db 1, SING
+	db 1, DISABLE
+	db 1, DEFENSE_CURL
+	db 1, DOUBLESLAP
 	db 0 ; no more level-up moves
 
 ZubatEvosAttacks:
-	db EVOLVE_LEVEL,22,GOLBAT
+	db EVOLVE_LEVEL, 22, GOLBAT
 	db 0 ; no more evolutions
-	db 1,LEECH_LIFE
-	db 6,SUPERSONIC
-	db 12,BITE
-	db 19,CONFUSE_RAY
-	db 27,WING_ATTACK
-	db 36,MEAN_LOOK
-	db 46,HAZE
+	db 1, LEECH_LIFE
+	db 6, SUPERSONIC
+	db 12, BITE
+	db 19, CONFUSE_RAY
+	db 27, WING_ATTACK
+	db 36, MEAN_LOOK
+	db 46, HAZE
 	db 0 ; no more level-up moves
 
 GolbatEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,CROBAT
+	db EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT
 	db 0 ; no more evolutions
-	db 1,SCREECH
-	db 1,LEECH_LIFE
-	db 1,SUPERSONIC
-	db 6,SUPERSONIC
-	db 12,BITE
-	db 19,CONFUSE_RAY
-	db 30,WING_ATTACK
-	db 42,MEAN_LOOK
-	db 55,HAZE
+	db 1, SCREECH
+	db 1, LEECH_LIFE
+	db 1, SUPERSONIC
+	db 6, SUPERSONIC
+	db 12, BITE
+	db 19, CONFUSE_RAY
+	db 30, WING_ATTACK
+	db 42, MEAN_LOOK
+	db 55, HAZE
 	db 0 ; no more level-up moves
 
 OddishEvosAttacks:
-	db EVOLVE_LEVEL,21,GLOOM
+	db EVOLVE_LEVEL, 21, GLOOM
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 7,SWEET_SCENT
-	db 14,POISONPOWDER
-	db 16,STUN_SPORE
-	db 18,SLEEP_POWDER
-	db 23,ACID
-	db 32,MOONLIGHT
-	db 39,PETAL_DANCE
+	db 1, ABSORB
+	db 7, SWEET_SCENT
+	db 14, POISONPOWDER
+	db 16, STUN_SPORE
+	db 18, SLEEP_POWDER
+	db 23, ACID
+	db 32, MOONLIGHT
+	db 39, PETAL_DANCE
 	db 0 ; no more level-up moves
 
 GloomEvosAttacks:
-	db EVOLVE_ITEM,LEAF_STONE,VILEPLUME
-	db EVOLVE_ITEM,SUN_STONE,BELLOSSOM
+	db EVOLVE_ITEM, LEAF_STONE, VILEPLUME
+	db EVOLVE_ITEM, SUN_STONE, BELLOSSOM
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 1,SWEET_SCENT
-	db 1,POISONPOWDER
-	db 7,SWEET_SCENT
-	db 14,POISONPOWDER
-	db 16,STUN_SPORE
-	db 18,SLEEP_POWDER
-	db 24,ACID
-	db 35,MOONLIGHT
-	db 44,PETAL_DANCE
+	db 1, ABSORB
+	db 1, SWEET_SCENT
+	db 1, POISONPOWDER
+	db 7, SWEET_SCENT
+	db 14, POISONPOWDER
+	db 16, STUN_SPORE
+	db 18, SLEEP_POWDER
+	db 24, ACID
+	db 35, MOONLIGHT
+	db 44, PETAL_DANCE
 	db 0 ; no more level-up moves
 
 VileplumeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 1,SWEET_SCENT
-	db 1,STUN_SPORE
-	db 1,PETAL_DANCE
+	db 1, ABSORB
+	db 1, SWEET_SCENT
+	db 1, STUN_SPORE
+	db 1, PETAL_DANCE
 	db 0 ; no more level-up moves
 
 ParasEvosAttacks:
-	db EVOLVE_LEVEL,24,PARASECT
+	db EVOLVE_LEVEL, 24, PARASECT
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 7,STUN_SPORE
-	db 13,POISONPOWDER
-	db 19,LEECH_LIFE
-	db 25,SPORE
-	db 31,SLASH
-	db 37,GROWTH
-	db 43,GIGA_DRAIN
+	db 1, SCRATCH
+	db 7, STUN_SPORE
+	db 13, POISONPOWDER
+	db 19, LEECH_LIFE
+	db 25, SPORE
+	db 31, SLASH
+	db 37, GROWTH
+	db 43, GIGA_DRAIN
 	db 0 ; no more level-up moves
 
 ParasectEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,STUN_SPORE
-	db 1,POISONPOWDER
-	db 7,STUN_SPORE
-	db 13,POISONPOWDER
-	db 19,LEECH_LIFE
-	db 28,SPORE
-	db 37,SLASH
-	db 46,GROWTH
-	db 55,GIGA_DRAIN
+	db 1, SCRATCH
+	db 1, STUN_SPORE
+	db 1, POISONPOWDER
+	db 7, STUN_SPORE
+	db 13, POISONPOWDER
+	db 19, LEECH_LIFE
+	db 28, SPORE
+	db 37, SLASH
+	db 46, GROWTH
+	db 55, GIGA_DRAIN
 	db 0 ; no more level-up moves
 
 VenonatEvosAttacks:
-	db EVOLVE_LEVEL,31,VENOMOTH
+	db EVOLVE_LEVEL, 31, VENOMOTH
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,DISABLE
-	db 1,FORESIGHT
-	db 9,SUPERSONIC
-	db 17,CONFUSION
-	db 20,POISONPOWDER
-	db 25,LEECH_LIFE
-	db 28,STUN_SPORE
-	db 33,PSYBEAM
-	db 36,SLEEP_POWDER
-	db 41,PSYCHIC_M
+	db 1, TACKLE
+	db 1, DISABLE
+	db 1, FORESIGHT
+	db 9, SUPERSONIC
+	db 17, CONFUSION
+	db 20, POISONPOWDER
+	db 25, LEECH_LIFE
+	db 28, STUN_SPORE
+	db 33, PSYBEAM
+	db 36, SLEEP_POWDER
+	db 41, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 VenomothEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,DISABLE
-	db 1,FORESIGHT
-	db 1,SUPERSONIC
-	db 9,SUPERSONIC
-	db 17,CONFUSION
-	db 20,POISONPOWDER
-	db 25,LEECH_LIFE
-	db 28,STUN_SPORE
-	db 31,GUST
-	db 36,PSYBEAM
-	db 42,SLEEP_POWDER
-	db 52,PSYCHIC_M
+	db 1, TACKLE
+	db 1, DISABLE
+	db 1, FORESIGHT
+	db 1, SUPERSONIC
+	db 9, SUPERSONIC
+	db 17, CONFUSION
+	db 20, POISONPOWDER
+	db 25, LEECH_LIFE
+	db 28, STUN_SPORE
+	db 31, GUST
+	db 36, PSYBEAM
+	db 42, SLEEP_POWDER
+	db 52, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 DiglettEvosAttacks:
-	db EVOLVE_LEVEL,26,DUGTRIO
+	db EVOLVE_LEVEL, 26, DUGTRIO
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 5,GROWL
-	db 9,MAGNITUDE
-	db 17,DIG
-	db 25,SAND_ATTACK
-	db 33,SLASH
-	db 41,EARTHQUAKE
-	db 49,FISSURE
+	db 1, SCRATCH
+	db 5, GROWL
+	db 9, MAGNITUDE
+	db 17, DIG
+	db 25, SAND_ATTACK
+	db 33, SLASH
+	db 41, EARTHQUAKE
+	db 49, FISSURE
 	db 0 ; no more level-up moves
 
 DugtrioEvosAttacks:
 	db 0 ; no more evolutions
 if _CRYSTAL
-	db 1,TRI_ATTACK
+	db 1, TRI_ATTACK
 endc
-	db 1,SCRATCH
-	db 1,GROWL
-	db 1,MAGNITUDE
-	db 5,GROWL
-	db 9,MAGNITUDE
-	db 17,DIG
-	db 25,SAND_ATTACK
-	db 37,SLASH
-	db 49,EARTHQUAKE
-	db 61,FISSURE
+	db 1, SCRATCH
+	db 1, GROWL
+	db 1, MAGNITUDE
+	db 5, GROWL
+	db 9, MAGNITUDE
+	db 17, DIG
+	db 25, SAND_ATTACK
+	db 37, SLASH
+	db 49, EARTHQUAKE
+	db 61, FISSURE
 	db 0 ; no more level-up moves
 
 MeowthEvosAttacks:
-	db EVOLVE_LEVEL,28,PERSIAN
+	db EVOLVE_LEVEL, 28, PERSIAN
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,GROWL
-	db 11,BITE
-	db 20,PAY_DAY
-	db 28,FAINT_ATTACK
-	db 35,SCREECH
-	db 41,FURY_SWIPES
-	db 46,SLASH
+	db 1, SCRATCH
+	db 1, GROWL
+	db 11, BITE
+	db 20, PAY_DAY
+	db 28, FAINT_ATTACK
+	db 35, SCREECH
+	db 41, FURY_SWIPES
+	db 46, SLASH
 	db 0 ; no more level-up moves
 
 PersianEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,GROWL
-	db 1,BITE
-	db 11,BITE
-	db 20,PAY_DAY
-	db 29,FAINT_ATTACK
-	db 38,SCREECH
-	db 46,FURY_SWIPES
-	db 53,SLASH
+	db 1, SCRATCH
+	db 1, GROWL
+	db 1, BITE
+	db 11, BITE
+	db 20, PAY_DAY
+	db 29, FAINT_ATTACK
+	db 38, SCREECH
+	db 46, FURY_SWIPES
+	db 53, SLASH
 	db 0 ; no more level-up moves
 
 PsyduckEvosAttacks:
-	db EVOLVE_LEVEL,33,GOLDUCK
+	db EVOLVE_LEVEL, 33, GOLDUCK
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 5,TAIL_WHIP
-	db 10,DISABLE
-	db 16,CONFUSION
-	db 23,SCREECH
-	db 31,PSYCH_UP
-	db 40,FURY_SWIPES
-	db 50,HYDRO_PUMP
+	db 1, SCRATCH
+	db 5, TAIL_WHIP
+	db 10, DISABLE
+	db 16, CONFUSION
+	db 23, SCREECH
+	db 31, PSYCH_UP
+	db 40, FURY_SWIPES
+	db 50, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 GolduckEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,TAIL_WHIP
-	db 1,DISABLE
-	db 1,CONFUSION
-	db 5,TAIL_WHIP
-	db 10,DISABLE
-	db 16,CONFUSION
-	db 23,SCREECH
-	db 31,PSYCH_UP
-	db 44,FURY_SWIPES
-	db 58,HYDRO_PUMP
+	db 1, SCRATCH
+	db 1, TAIL_WHIP
+	db 1, DISABLE
+	db 1, CONFUSION
+	db 5, TAIL_WHIP
+	db 10, DISABLE
+	db 16, CONFUSION
+	db 23, SCREECH
+	db 31, PSYCH_UP
+	db 44, FURY_SWIPES
+	db 58, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 MankeyEvosAttacks:
-	db EVOLVE_LEVEL,28,PRIMEAPE
+	db EVOLVE_LEVEL, 28, PRIMEAPE
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 9,LOW_KICK
-	db 15,KARATE_CHOP
-	db 21,FURY_SWIPES
-	db 27,FOCUS_ENERGY
-	db 33,SEISMIC_TOSS
-	db 39,CROSS_CHOP
-	db 45,SCREECH
-	db 51,THRASH
+	db 1, SCRATCH
+	db 1, LEER
+	db 9, LOW_KICK
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 33, SEISMIC_TOSS
+	db 39, CROSS_CHOP
+	db 45, SCREECH
+	db 51, THRASH
 	db 0 ; no more level-up moves
 
 PrimeapeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 1,LOW_KICK
-	db 1,RAGE
-	db 9,LOW_KICK
-	db 15,KARATE_CHOP
-	db 21,FURY_SWIPES
-	db 27,FOCUS_ENERGY
-	db 28,RAGE
-	db 36,SEISMIC_TOSS
-	db 45,CROSS_CHOP
-	db 54,SCREECH
-	db 63,THRASH
+	db 1, SCRATCH
+	db 1, LEER
+	db 1, LOW_KICK
+	db 1, RAGE
+	db 9, LOW_KICK
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 28, RAGE
+	db 36, SEISMIC_TOSS
+	db 45, CROSS_CHOP
+	db 54, SCREECH
+	db 63, THRASH
 	db 0 ; no more level-up moves
 
 GrowlitheEvosAttacks:
-	db EVOLVE_ITEM,FIRE_STONE,ARCANINE
+	db EVOLVE_ITEM, FIRE_STONE, ARCANINE
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,ROAR
-	db 9,EMBER
-	db 18,LEER
-	db 26,TAKE_DOWN
-	db 34,FLAME_WHEEL
-	db 42,AGILITY
-	db 50,FLAMETHROWER
+	db 1, BITE
+	db 1, ROAR
+	db 9, EMBER
+	db 18, LEER
+	db 26, TAKE_DOWN
+	db 34, FLAME_WHEEL
+	db 42, AGILITY
+	db 50, FLAMETHROWER
 	db 0 ; no more level-up moves
 
 ArcanineEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ROAR
-	db 1,LEER
-	db 1,TAKE_DOWN
-	db 1,FLAME_WHEEL
-	db 50,EXTREMESPEED
+	db 1, ROAR
+	db 1, LEER
+	db 1, TAKE_DOWN
+	db 1, FLAME_WHEEL
+	db 50, EXTREMESPEED
 	db 0 ; no more level-up moves
 
 PoliwagEvosAttacks:
-	db EVOLVE_LEVEL,25,POLIWHIRL
+	db EVOLVE_LEVEL, 25, POLIWHIRL
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 7,HYPNOSIS
-	db 13,WATER_GUN
-	db 19,DOUBLESLAP
-	db 25,RAIN_DANCE
-	db 31,BODY_SLAM
-	db 37,BELLY_DRUM
-	db 43,HYDRO_PUMP
+	db 1, BUBBLE
+	db 7, HYPNOSIS
+	db 13, WATER_GUN
+	db 19, DOUBLESLAP
+	db 25, RAIN_DANCE
+	db 31, BODY_SLAM
+	db 37, BELLY_DRUM
+	db 43, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 PoliwhirlEvosAttacks:
-	db EVOLVE_ITEM,WATER_STONE,POLIWRATH
-	db EVOLVE_TRADE,KINGS_ROCK,POLITOED
+	db EVOLVE_ITEM, WATER_STONE, POLIWRATH
+	db EVOLVE_TRADE, KINGS_ROCK, POLITOED
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,HYPNOSIS
-	db 1,WATER_GUN
-	db 7,HYPNOSIS
-	db 13,WATER_GUN
-	db 19,DOUBLESLAP
-	db 27,RAIN_DANCE
-	db 35,BODY_SLAM
-	db 43,BELLY_DRUM
-	db 51,HYDRO_PUMP
+	db 1, BUBBLE
+	db 1, HYPNOSIS
+	db 1, WATER_GUN
+	db 7, HYPNOSIS
+	db 13, WATER_GUN
+	db 19, DOUBLESLAP
+	db 27, RAIN_DANCE
+	db 35, BODY_SLAM
+	db 43, BELLY_DRUM
+	db 51, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 PoliwrathEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 1,HYPNOSIS
-	db 1,DOUBLESLAP
-	db 1,SUBMISSION
-	db 35,SUBMISSION
-	db 51,MIND_READER
+	db 1, WATER_GUN
+	db 1, HYPNOSIS
+	db 1, DOUBLESLAP
+	db 1, SUBMISSION
+	db 35, SUBMISSION
+	db 51, MIND_READER
 	db 0 ; no more level-up moves
 
 AbraEvosAttacks:
-	db EVOLVE_LEVEL,16,KADABRA
+	db EVOLVE_LEVEL, 16, KADABRA
 	db 0 ; no more evolutions
-	db 1,TELEPORT
+	db 1, TELEPORT
 	db 0 ; no more level-up moves
 
 KadabraEvosAttacks:
-	db EVOLVE_TRADE,$ff,ALAKAZAM
+	db EVOLVE_TRADE, $ff, ALAKAZAM
 	db 0 ; no more evolutions
-	db 1,TELEPORT
-	db 1,KINESIS
-	db 1,CONFUSION
-	db 16,CONFUSION
-	db 18,DISABLE
-	db 21,PSYBEAM
-	db 26,RECOVER
-	db 31,FUTURE_SIGHT
-	db 38,PSYCHIC_M
-	db 45,REFLECT
+	db 1, TELEPORT
+	db 1, KINESIS
+	db 1, CONFUSION
+	db 16, CONFUSION
+	db 18, DISABLE
+	db 21, PSYBEAM
+	db 26, RECOVER
+	db 31, FUTURE_SIGHT
+	db 38, PSYCHIC_M
+	db 45, REFLECT
 	db 0 ; no more level-up moves
 
 AlakazamEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TELEPORT
-	db 1,KINESIS
-	db 1,CONFUSION
-	db 16,CONFUSION
-	db 18,DISABLE
-	db 21,PSYBEAM
-	db 26,RECOVER
-	db 31,FUTURE_SIGHT
-	db 38,PSYCHIC_M
-	db 45,REFLECT
+	db 1, TELEPORT
+	db 1, KINESIS
+	db 1, CONFUSION
+	db 16, CONFUSION
+	db 18, DISABLE
+	db 21, PSYBEAM
+	db 26, RECOVER
+	db 31, FUTURE_SIGHT
+	db 38, PSYCHIC_M
+	db 45, REFLECT
 	db 0 ; no more level-up moves
 
 MachopEvosAttacks:
-	db EVOLVE_LEVEL,28,MACHOKE
+	db EVOLVE_LEVEL, 28, MACHOKE
 	db 0 ; no more evolutions
-	db 1,LOW_KICK
-	db 1,LEER
-	db 7,FOCUS_ENERGY
-	db 13,KARATE_CHOP
-	db 19,SEISMIC_TOSS
-	db 25,FORESIGHT
-	db 31,VITAL_THROW
-	db 37,CROSS_CHOP
-	db 43,SCARY_FACE
-	db 49,SUBMISSION
+	db 1, LOW_KICK
+	db 1, LEER
+	db 7, FOCUS_ENERGY
+	db 13, KARATE_CHOP
+	db 19, SEISMIC_TOSS
+	db 25, FORESIGHT
+	db 31, VITAL_THROW
+	db 37, CROSS_CHOP
+	db 43, SCARY_FACE
+	db 49, SUBMISSION
 	db 0 ; no more level-up moves
 
 MachokeEvosAttacks:
-	db EVOLVE_TRADE,$ff,MACHAMP
+	db EVOLVE_TRADE, $ff, MACHAMP
 	db 0 ; no more evolutions
-	db 1,LOW_KICK
-	db 1,LEER
-	db 1,FOCUS_ENERGY
-	db 8,FOCUS_ENERGY
-	db 15,KARATE_CHOP
-	db 19,SEISMIC_TOSS
-	db 25,FORESIGHT
-	db 34,VITAL_THROW
-	db 43,CROSS_CHOP
-	db 52,SCARY_FACE
-	db 61,SUBMISSION
+	db 1, LOW_KICK
+	db 1, LEER
+	db 1, FOCUS_ENERGY
+	db 8, FOCUS_ENERGY
+	db 15, KARATE_CHOP
+	db 19, SEISMIC_TOSS
+	db 25, FORESIGHT
+	db 34, VITAL_THROW
+	db 43, CROSS_CHOP
+	db 52, SCARY_FACE
+	db 61, SUBMISSION
 	db 0 ; no more level-up moves
 
 MachampEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,LOW_KICK
-	db 1,LEER
-	db 1,FOCUS_ENERGY
-	db 8,FOCUS_ENERGY
-	db 15,KARATE_CHOP
-	db 19,SEISMIC_TOSS
-	db 25,FORESIGHT
-	db 34,VITAL_THROW
-	db 43,CROSS_CHOP
-	db 52,SCARY_FACE
-	db 61,SUBMISSION
+	db 1, LOW_KICK
+	db 1, LEER
+	db 1, FOCUS_ENERGY
+	db 8, FOCUS_ENERGY
+	db 15, KARATE_CHOP
+	db 19, SEISMIC_TOSS
+	db 25, FORESIGHT
+	db 34, VITAL_THROW
+	db 43, CROSS_CHOP
+	db 52, SCARY_FACE
+	db 61, SUBMISSION
 	db 0 ; no more level-up moves
 
 BellsproutEvosAttacks:
-	db EVOLVE_LEVEL,21,WEEPINBELL
+	db EVOLVE_LEVEL, 21, WEEPINBELL
 	db 0 ; no more evolutions
-	db 1,VINE_WHIP
-	db 6,GROWTH
-	db 11,WRAP
-	db 15,SLEEP_POWDER
-	db 17,POISONPOWDER
-	db 19,STUN_SPORE
-	db 23,ACID
-	db 30,SWEET_SCENT
-	db 37,RAZOR_LEAF
-	db 45,SLAM
+	db 1, VINE_WHIP
+	db 6, GROWTH
+	db 11, WRAP
+	db 15, SLEEP_POWDER
+	db 17, POISONPOWDER
+	db 19, STUN_SPORE
+	db 23, ACID
+	db 30, SWEET_SCENT
+	db 37, RAZOR_LEAF
+	db 45, SLAM
 	db 0 ; no more level-up moves
 
 WeepinbellEvosAttacks:
-	db EVOLVE_ITEM,LEAF_STONE,VICTREEBEL
+	db EVOLVE_ITEM, LEAF_STONE, VICTREEBEL
 	db 0 ; no more evolutions
-	db 1,VINE_WHIP
-	db 1,GROWTH
-	db 1,WRAP
-	db 6,GROWTH
-	db 11,WRAP
-	db 15,SLEEP_POWDER
-	db 17,POISONPOWDER
-	db 19,STUN_SPORE
-	db 24,ACID
-	db 33,SWEET_SCENT
-	db 42,RAZOR_LEAF
-	db 54,SLAM
+	db 1, VINE_WHIP
+	db 1, GROWTH
+	db 1, WRAP
+	db 6, GROWTH
+	db 11, WRAP
+	db 15, SLEEP_POWDER
+	db 17, POISONPOWDER
+	db 19, STUN_SPORE
+	db 24, ACID
+	db 33, SWEET_SCENT
+	db 42, RAZOR_LEAF
+	db 54, SLAM
 	db 0 ; no more level-up moves
 
 VictreebelEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,VINE_WHIP
-	db 1,SLEEP_POWDER
-	db 1,SWEET_SCENT
-	db 1,RAZOR_LEAF
+	db 1, VINE_WHIP
+	db 1, SLEEP_POWDER
+	db 1, SWEET_SCENT
+	db 1, RAZOR_LEAF
 	db 0 ; no more level-up moves
 
 TentacoolEvosAttacks:
-	db EVOLVE_LEVEL,30,TENTACRUEL
+	db EVOLVE_LEVEL, 30, TENTACRUEL
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 6,SUPERSONIC
-	db 12,CONSTRICT
-	db 19,ACID
-	db 25,BUBBLEBEAM
-	db 30,WRAP
-	db 36,BARRIER
-	db 43,SCREECH
-	db 49,HYDRO_PUMP
+	db 1, POISON_STING
+	db 6, SUPERSONIC
+	db 12, CONSTRICT
+	db 19, ACID
+	db 25, BUBBLEBEAM
+	db 30, WRAP
+	db 36, BARRIER
+	db 43, SCREECH
+	db 49, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 TentacruelEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 1,SUPERSONIC
-	db 1,CONSTRICT
-	db 6,SUPERSONIC
-	db 12,CONSTRICT
-	db 19,ACID
-	db 25,BUBBLEBEAM
-	db 30,WRAP
-	db 38,BARRIER
-	db 47,SCREECH
-	db 55,HYDRO_PUMP
+	db 1, POISON_STING
+	db 1, SUPERSONIC
+	db 1, CONSTRICT
+	db 6, SUPERSONIC
+	db 12, CONSTRICT
+	db 19, ACID
+	db 25, BUBBLEBEAM
+	db 30, WRAP
+	db 38, BARRIER
+	db 47, SCREECH
+	db 55, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 GeodudeEvosAttacks:
-	db EVOLVE_LEVEL,25,GRAVELER
+	db EVOLVE_LEVEL, 25, GRAVELER
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 6,DEFENSE_CURL
-	db 11,ROCK_THROW
-	db 16,MAGNITUDE
-	db 21,SELFDESTRUCT
-	db 26,HARDEN
-	db 31,ROLLOUT
-	db 36,EARTHQUAKE
-	db 41,EXPLOSION
+	db 1, TACKLE
+	db 6, DEFENSE_CURL
+	db 11, ROCK_THROW
+	db 16, MAGNITUDE
+	db 21, SELFDESTRUCT
+	db 26, HARDEN
+	db 31, ROLLOUT
+	db 36, EARTHQUAKE
+	db 41, EXPLOSION
 	db 0 ; no more level-up moves
 
 GravelerEvosAttacks:
-	db EVOLVE_TRADE,$ff,GOLEM
+	db EVOLVE_TRADE, $ff, GOLEM
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,DEFENSE_CURL
-	db 1,ROCK_THROW
-	db 6,DEFENSE_CURL
-	db 11,ROCK_THROW
-	db 16,MAGNITUDE
-	db 21,SELFDESTRUCT
-	db 27,HARDEN
-	db 34,ROLLOUT
-	db 41,EARTHQUAKE
-	db 48,EXPLOSION
+	db 1, TACKLE
+	db 1, DEFENSE_CURL
+	db 1, ROCK_THROW
+	db 6, DEFENSE_CURL
+	db 11, ROCK_THROW
+	db 16, MAGNITUDE
+	db 21, SELFDESTRUCT
+	db 27, HARDEN
+	db 34, ROLLOUT
+	db 41, EARTHQUAKE
+	db 48, EXPLOSION
 	db 0 ; no more level-up moves
 
 GolemEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,DEFENSE_CURL
-	db 1,ROCK_THROW
-	db 1,MAGNITUDE
-	db 6,DEFENSE_CURL
-	db 11,ROCK_THROW
-	db 16,MAGNITUDE
-	db 21,SELFDESTRUCT
-	db 27,HARDEN
-	db 34,ROLLOUT
-	db 41,EARTHQUAKE
-	db 48,EXPLOSION
+	db 1, TACKLE
+	db 1, DEFENSE_CURL
+	db 1, ROCK_THROW
+	db 1, MAGNITUDE
+	db 6, DEFENSE_CURL
+	db 11, ROCK_THROW
+	db 16, MAGNITUDE
+	db 21, SELFDESTRUCT
+	db 27, HARDEN
+	db 34, ROLLOUT
+	db 41, EARTHQUAKE
+	db 48, EXPLOSION
 	db 0 ; no more level-up moves
 
 PonytaEvosAttacks:
-	db EVOLVE_LEVEL,40,RAPIDASH
+	db EVOLVE_LEVEL, 40, RAPIDASH
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 4,GROWL
-	db 8,TAIL_WHIP
-	db 13,EMBER
-	db 19,STOMP
-	db 26,FIRE_SPIN
-	db 34,TAKE_DOWN
-	db 43,AGILITY
-	db 53,FIRE_BLAST
+	db 1, TACKLE
+	db 4, GROWL
+	db 8, TAIL_WHIP
+	db 13, EMBER
+	db 19, STOMP
+	db 26, FIRE_SPIN
+	db 34, TAKE_DOWN
+	db 43, AGILITY
+	db 53, FIRE_BLAST
 	db 0 ; no more level-up moves
 
 RapidashEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,TAIL_WHIP
-	db 1,EMBER
-	db 4,GROWL
-	db 8,TAIL_WHIP
-	db 13,EMBER
-	db 19,STOMP
-	db 26,FIRE_SPIN
-	db 34,TAKE_DOWN
-	db 40,FURY_ATTACK
-	db 47,AGILITY
-	db 61,FIRE_BLAST
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, TAIL_WHIP
+	db 1, EMBER
+	db 4, GROWL
+	db 8, TAIL_WHIP
+	db 13, EMBER
+	db 19, STOMP
+	db 26, FIRE_SPIN
+	db 34, TAKE_DOWN
+	db 40, FURY_ATTACK
+	db 47, AGILITY
+	db 61, FIRE_BLAST
 	db 0 ; no more level-up moves
 
 SlowpokeEvosAttacks:
-	db EVOLVE_LEVEL,37,SLOWBRO
-	db EVOLVE_TRADE,KINGS_ROCK,SLOWKING
+	db EVOLVE_LEVEL, 37, SLOWBRO
+	db EVOLVE_TRADE, KINGS_ROCK, SLOWKING
 	db 0 ; no more evolutions
-	db 1,CURSE
-	db 1,TACKLE
-	db 6,GROWL
-	db 15,WATER_GUN
-	db 20,CONFUSION
-	db 29,DISABLE
-	db 34,HEADBUTT
-	db 43,AMNESIA
-	db 48,PSYCHIC_M
+	db 1, CURSE
+	db 1, TACKLE
+	db 6, GROWL
+	db 15, WATER_GUN
+	db 20, CONFUSION
+	db 29, DISABLE
+	db 34, HEADBUTT
+	db 43, AMNESIA
+	db 48, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 SlowbroEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CURSE
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,WATER_GUN
-	db 6,GROWL
-	db 15,WATER_GUN
-	db 20,CONFUSION
-	db 29,DISABLE
-	db 34,HEADBUTT
-	db 37,WITHDRAW
-	db 46,AMNESIA
-	db 54,PSYCHIC_M
+	db 1, CURSE
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, WATER_GUN
+	db 6, GROWL
+	db 15, WATER_GUN
+	db 20, CONFUSION
+	db 29, DISABLE
+	db 34, HEADBUTT
+	db 37, WITHDRAW
+	db 46, AMNESIA
+	db 54, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 MagnemiteEvosAttacks:
-	db EVOLVE_LEVEL,30,MAGNETON
+	db EVOLVE_LEVEL, 30, MAGNETON
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 6,THUNDERSHOCK
-	db 11,SUPERSONIC
-	db 16,SONICBOOM
-	db 21,THUNDER_WAVE
-	db 27,LOCK_ON
-	db 33,SWIFT
-	db 39,SCREECH
-	db 45,ZAP_CANNON
+	db 1, TACKLE
+	db 6, THUNDERSHOCK
+	db 11, SUPERSONIC
+	db 16, SONICBOOM
+	db 21, THUNDER_WAVE
+	db 27, LOCK_ON
+	db 33, SWIFT
+	db 39, SCREECH
+	db 45, ZAP_CANNON
 	db 0 ; no more level-up moves
 
 MagnetonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,THUNDERSHOCK
-	db 1,SUPERSONIC
-	db 1,SONICBOOM
-	db 6,THUNDERSHOCK
-	db 11,SUPERSONIC
-	db 16,SONICBOOM
-	db 21,THUNDER_WAVE
-	db 27,LOCK_ON
+	db 1, TACKLE
+	db 1, THUNDERSHOCK
+	db 1, SUPERSONIC
+	db 1, SONICBOOM
+	db 6, THUNDERSHOCK
+	db 11, SUPERSONIC
+	db 16, SONICBOOM
+	db 21, THUNDER_WAVE
+	db 27, LOCK_ON
 if _CRYSTAL
-	db 35,TRI_ATTACK
+	db 35, TRI_ATTACK
 else
-	db 35,SWIFT
+	db 35, SWIFT
 endc
-	db 43,SCREECH
-	db 53,ZAP_CANNON
+	db 43, SCREECH
+	db 53, ZAP_CANNON
 	db 0 ; no more level-up moves
 
 FarfetchDEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 7,SAND_ATTACK
-	db 13,LEER
-	db 19,FURY_ATTACK
-	db 25,SWORDS_DANCE
-	db 31,AGILITY
-	db 37,SLASH
-	db 44,FALSE_SWIPE
+	db 1, PECK
+	db 7, SAND_ATTACK
+	db 13, LEER
+	db 19, FURY_ATTACK
+	db 25, SWORDS_DANCE
+	db 31, AGILITY
+	db 37, SLASH
+	db 44, FALSE_SWIPE
 	db 0 ; no more level-up moves
 
 DoduoEvosAttacks:
-	db EVOLVE_LEVEL,31,DODRIO
+	db EVOLVE_LEVEL, 31, DODRIO
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,GROWL
-	db 9,PURSUIT
-	db 13,FURY_ATTACK
-	db 21,TRI_ATTACK
-	db 25,RAGE
-	db 33,DRILL_PECK
-	db 37,AGILITY
+	db 1, PECK
+	db 1, GROWL
+	db 9, PURSUIT
+	db 13, FURY_ATTACK
+	db 21, TRI_ATTACK
+	db 25, RAGE
+	db 33, DRILL_PECK
+	db 37, AGILITY
 	db 0 ; no more level-up moves
 
 DodrioEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,GROWL
-	db 1,PURSUIT
-	db 1,FURY_ATTACK
-	db 9,PURSUIT
-	db 13,FURY_ATTACK
-	db 21,TRI_ATTACK
-	db 25,RAGE
-	db 38,DRILL_PECK
-	db 47,AGILITY
+	db 1, PECK
+	db 1, GROWL
+	db 1, PURSUIT
+	db 1, FURY_ATTACK
+	db 9, PURSUIT
+	db 13, FURY_ATTACK
+	db 21, TRI_ATTACK
+	db 25, RAGE
+	db 38, DRILL_PECK
+	db 47, AGILITY
 	db 0 ; no more level-up moves
 
 SeelEvosAttacks:
-	db EVOLVE_LEVEL,34,DEWGONG
+	db EVOLVE_LEVEL, 34, DEWGONG
 	db 0 ; no more evolutions
-	db 1,HEADBUTT
-	db 5,GROWL
-	db 16,AURORA_BEAM
-	db 21,REST
-	db 32,TAKE_DOWN
-	db 37,ICE_BEAM
-	db 48,SAFEGUARD
+	db 1, HEADBUTT
+	db 5, GROWL
+	db 16, AURORA_BEAM
+	db 21, REST
+	db 32, TAKE_DOWN
+	db 37, ICE_BEAM
+	db 48, SAFEGUARD
 	db 0 ; no more level-up moves
 
 DewgongEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HEADBUTT
-	db 1,GROWL
-	db 1,AURORA_BEAM
-	db 5,GROWL
-	db 16,AURORA_BEAM
-	db 21,REST
-	db 32,TAKE_DOWN
-	db 43,ICE_BEAM
-	db 60,SAFEGUARD
+	db 1, HEADBUTT
+	db 1, GROWL
+	db 1, AURORA_BEAM
+	db 5, GROWL
+	db 16, AURORA_BEAM
+	db 21, REST
+	db 32, TAKE_DOWN
+	db 43, ICE_BEAM
+	db 60, SAFEGUARD
 	db 0 ; no more level-up moves
 
 GrimerEvosAttacks:
-	db EVOLVE_LEVEL,38,MUK
+	db EVOLVE_LEVEL, 38, MUK
 	db 0 ; no more evolutions
-	db 1,POISON_GAS
-	db 1,POUND
-	db 5,HARDEN
-	db 10,DISABLE
-	db 16,SLUDGE
-	db 23,MINIMIZE
-	db 31,SCREECH
-	db 40,ACID_ARMOR
-	db 50,SLUDGE_BOMB
+	db 1, POISON_GAS
+	db 1, POUND
+	db 5, HARDEN
+	db 10, DISABLE
+	db 16, SLUDGE
+	db 23, MINIMIZE
+	db 31, SCREECH
+	db 40, ACID_ARMOR
+	db 50, SLUDGE_BOMB
 	db 0 ; no more level-up moves
 
 MukEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POISON_GAS
-	db 1,POUND
-	db 1,HARDEN
-	db 33,HARDEN
-	db 37,DISABLE
-	db 45,SLUDGE
-	db 23,MINIMIZE
-	db 31,SCREECH
-	db 45,ACID_ARMOR
-	db 60,SLUDGE_BOMB
+	db 1, POISON_GAS
+	db 1, POUND
+	db 1, HARDEN
+	db 33, HARDEN
+	db 37, DISABLE
+	db 45, SLUDGE
+	db 23, MINIMIZE
+	db 31, SCREECH
+	db 45, ACID_ARMOR
+	db 60, SLUDGE_BOMB
 	db 0 ; no more level-up moves
 
 ShellderEvosAttacks:
-	db EVOLVE_ITEM,WATER_STONE,CLOYSTER
+	db EVOLVE_ITEM, WATER_STONE, CLOYSTER
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,WITHDRAW
-	db 9,SUPERSONIC
-	db 17,AURORA_BEAM
-	db 25,PROTECT
-	db 33,LEER
-	db 41,CLAMP
-	db 49,ICE_BEAM
+	db 1, TACKLE
+	db 1, WITHDRAW
+	db 9, SUPERSONIC
+	db 17, AURORA_BEAM
+	db 25, PROTECT
+	db 33, LEER
+	db 41, CLAMP
+	db 49, ICE_BEAM
 	db 0 ; no more level-up moves
 
 CloysterEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WITHDRAW
-	db 1,SUPERSONIC
-	db 1,AURORA_BEAM
-	db 1,PROTECT
+	db 1, WITHDRAW
+	db 1, SUPERSONIC
+	db 1, AURORA_BEAM
+	db 1, PROTECT
 if _CRYSTAL
-	db 33,SPIKES
+	db 33, SPIKES
 endc
-	db 41,SPIKE_CANNON
+	db 41, SPIKE_CANNON
 	db 0 ; no more level-up moves
 
 GastlyEvosAttacks:
-	db EVOLVE_LEVEL,25,HAUNTER
+	db EVOLVE_LEVEL, 25, HAUNTER
 	db 0 ; no more evolutions
-	db 1,HYPNOSIS
-	db 1,LICK
-	db 8,SPITE
-	db 13,MEAN_LOOK
-	db 16,CURSE
-	db 21,NIGHT_SHADE
-	db 28,CONFUSE_RAY
-	db 33,DREAM_EATER
-	db 36,DESTINY_BOND
+	db 1, HYPNOSIS
+	db 1, LICK
+	db 8, SPITE
+	db 13, MEAN_LOOK
+	db 16, CURSE
+	db 21, NIGHT_SHADE
+	db 28, CONFUSE_RAY
+	db 33, DREAM_EATER
+	db 36, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 HaunterEvosAttacks:
-	db EVOLVE_TRADE,$ff,GENGAR
+	db EVOLVE_TRADE, $ff, GENGAR
 	db 0 ; no more evolutions
-	db 1,HYPNOSIS
-	db 1,LICK
-	db 1,SPITE
-	db 8,SPITE
-	db 13,MEAN_LOOK
-	db 16,CURSE
-	db 21,NIGHT_SHADE
-	db 31,CONFUSE_RAY
-	db 39,DREAM_EATER
-	db 48,DESTINY_BOND
+	db 1, HYPNOSIS
+	db 1, LICK
+	db 1, SPITE
+	db 8, SPITE
+	db 13, MEAN_LOOK
+	db 16, CURSE
+	db 21, NIGHT_SHADE
+	db 31, CONFUSE_RAY
+	db 39, DREAM_EATER
+	db 48, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 GengarEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HYPNOSIS
-	db 1,LICK
-	db 1,SPITE
-	db 8,SPITE
-	db 13,MEAN_LOOK
-	db 16,CURSE
-	db 21,NIGHT_SHADE
-	db 31,CONFUSE_RAY
-	db 39,DREAM_EATER
-	db 48,DESTINY_BOND
+	db 1, HYPNOSIS
+	db 1, LICK
+	db 1, SPITE
+	db 8, SPITE
+	db 13, MEAN_LOOK
+	db 16, CURSE
+	db 21, NIGHT_SHADE
+	db 31, CONFUSE_RAY
+	db 39, DREAM_EATER
+	db 48, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 OnixEvosAttacks:
-	db EVOLVE_TRADE,METAL_COAT,STEELIX
+	db EVOLVE_TRADE, METAL_COAT, STEELIX
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCREECH
-	db 10,BIND
-	db 14,ROCK_THROW
-	db 23,HARDEN
-	db 27,RAGE
-	db 36,SANDSTORM
-	db 40,SLAM
+	db 1, TACKLE
+	db 1, SCREECH
+	db 10, BIND
+	db 14, ROCK_THROW
+	db 23, HARDEN
+	db 27, RAGE
+	db 36, SANDSTORM
+	db 40, SLAM
 	db 0 ; no more level-up moves
 
 DrowzeeEvosAttacks:
-	db EVOLVE_LEVEL,26,HYPNO
+	db EVOLVE_LEVEL, 26, HYPNO
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,HYPNOSIS
-	db 10,DISABLE
-	db 18,CONFUSION
-	db 25,HEADBUTT
-	db 31,POISON_GAS
-	db 36,MEDITATE
-	db 40,PSYCHIC_M
-	db 43,PSYCH_UP
-	db 45,FUTURE_SIGHT
+	db 1, POUND
+	db 1, HYPNOSIS
+	db 10, DISABLE
+	db 18, CONFUSION
+	db 25, HEADBUTT
+	db 31, POISON_GAS
+	db 36, MEDITATE
+	db 40, PSYCHIC_M
+	db 43, PSYCH_UP
+	db 45, FUTURE_SIGHT
 	db 0 ; no more level-up moves
 
 HypnoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,HYPNOSIS
-	db 1,DISABLE
-	db 1,CONFUSION
-	db 10,DISABLE
-	db 18,CONFUSION
-	db 25,HEADBUTT
-	db 33,POISON_GAS
-	db 40,MEDITATE
-	db 49,PSYCHIC_M
-	db 55,PSYCH_UP
-	db 60,FUTURE_SIGHT
+	db 1, POUND
+	db 1, HYPNOSIS
+	db 1, DISABLE
+	db 1, CONFUSION
+	db 10, DISABLE
+	db 18, CONFUSION
+	db 25, HEADBUTT
+	db 33, POISON_GAS
+	db 40, MEDITATE
+	db 49, PSYCHIC_M
+	db 55, PSYCH_UP
+	db 60, FUTURE_SIGHT
 	db 0 ; no more level-up moves
 
 KrabbyEvosAttacks:
-	db EVOLVE_LEVEL,28,KINGLER
+	db EVOLVE_LEVEL, 28, KINGLER
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 5,LEER
-	db 12,VICEGRIP
-	db 16,HARDEN
-	db 23,STOMP
-	db 27,GUILLOTINE
-	db 34,PROTECT
-	db 41,CRABHAMMER
+	db 1, BUBBLE
+	db 5, LEER
+	db 12, VICEGRIP
+	db 16, HARDEN
+	db 23, STOMP
+	db 27, GUILLOTINE
+	db 34, PROTECT
+	db 41, CRABHAMMER
 	db 0 ; no more level-up moves
 
 KinglerEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,LEER
-	db 1,VICEGRIP
-	db 5,LEER
-	db 12,VICEGRIP
-	db 16,HARDEN
-	db 23,STOMP
-	db 27,GUILLOTINE
-	db 38,PROTECT
-	db 49,CRABHAMMER
+	db 1, BUBBLE
+	db 1, LEER
+	db 1, VICEGRIP
+	db 5, LEER
+	db 12, VICEGRIP
+	db 16, HARDEN
+	db 23, STOMP
+	db 27, GUILLOTINE
+	db 38, PROTECT
+	db 49, CRABHAMMER
 	db 0 ; no more level-up moves
 
 VoltorbEvosAttacks:
-	db EVOLVE_LEVEL,30,ELECTRODE
+	db EVOLVE_LEVEL, 30, ELECTRODE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 9,SCREECH
-	db 17,SONICBOOM
-	db 23,SELFDESTRUCT
-	db 29,ROLLOUT
-	db 33,LIGHT_SCREEN
-	db 37,SWIFT
-	db 39,EXPLOSION
-	db 41,MIRROR_COAT
+	db 1, TACKLE
+	db 9, SCREECH
+	db 17, SONICBOOM
+	db 23, SELFDESTRUCT
+	db 29, ROLLOUT
+	db 33, LIGHT_SCREEN
+	db 37, SWIFT
+	db 39, EXPLOSION
+	db 41, MIRROR_COAT
 	db 0 ; no more level-up moves
 
 ElectrodeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCREECH
-	db 1,SONICBOOM
-	db 1,SELFDESTRUCT
-	db 9,SCREECH
-	db 17,SONICBOOM
-	db 23,SELFDESTRUCT
-	db 29,ROLLOUT
-	db 34,LIGHT_SCREEN
-	db 40,SWIFT
-	db 44,EXPLOSION
-	db 48,MIRROR_COAT
+	db 1, TACKLE
+	db 1, SCREECH
+	db 1, SONICBOOM
+	db 1, SELFDESTRUCT
+	db 9, SCREECH
+	db 17, SONICBOOM
+	db 23, SELFDESTRUCT
+	db 29, ROLLOUT
+	db 34, LIGHT_SCREEN
+	db 40, SWIFT
+	db 44, EXPLOSION
+	db 48, MIRROR_COAT
 	db 0 ; no more level-up moves
 
 ExeggcuteEvosAttacks:
-	db EVOLVE_ITEM,LEAF_STONE,EXEGGUTOR
+	db EVOLVE_ITEM, LEAF_STONE, EXEGGUTOR
 	db 0 ; no more evolutions
-	db 1,BARRAGE
-	db 1,HYPNOSIS
-	db 7,REFLECT
-	db 13,LEECH_SEED
-	db 19,CONFUSION
-	db 25,STUN_SPORE
-	db 31,POISONPOWDER
-	db 37,SLEEP_POWDER
-	db 43,SOLARBEAM
+	db 1, BARRAGE
+	db 1, HYPNOSIS
+	db 7, REFLECT
+	db 13, LEECH_SEED
+	db 19, CONFUSION
+	db 25, STUN_SPORE
+	db 31, POISONPOWDER
+	db 37, SLEEP_POWDER
+	db 43, SOLARBEAM
 	db 0 ; no more level-up moves
 
 ExeggutorEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BARRAGE
-	db 1,HYPNOSIS
-	db 1,CONFUSION
-	db 19,STOMP
-	db 31,EGG_BOMB
+	db 1, BARRAGE
+	db 1, HYPNOSIS
+	db 1, CONFUSION
+	db 19, STOMP
+	db 31, EGG_BOMB
 	db 0 ; no more level-up moves
 
 CuboneEvosAttacks:
-	db EVOLVE_LEVEL,28,MAROWAK
+	db EVOLVE_LEVEL, 28, MAROWAK
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 5,TAIL_WHIP
-	db 9,BONE_CLUB
-	db 13,HEADBUTT
-	db 17,LEER
-	db 21,FOCUS_ENERGY
-	db 25,BONEMERANG
-	db 29,RAGE
-	db 33,FALSE_SWIPE
-	db 37,THRASH
-	db 41,BONE_RUSH
+	db 1, GROWL
+	db 5, TAIL_WHIP
+	db 9, BONE_CLUB
+	db 13, HEADBUTT
+	db 17, LEER
+	db 21, FOCUS_ENERGY
+	db 25, BONEMERANG
+	db 29, RAGE
+	db 33, FALSE_SWIPE
+	db 37, THRASH
+	db 41, BONE_RUSH
 	db 0 ; no more level-up moves
 
 MarowakEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,TAIL_WHIP
-	db 1,BONE_CLUB
-	db 1,HEADBUTT
-	db 5,TAIL_WHIP
-	db 9,BONE_CLUB
-	db 13,HEADBUTT
-	db 17,LEER
-	db 21,FOCUS_ENERGY
-	db 25,BONEMERANG
-	db 32,RAGE
-	db 39,FALSE_SWIPE
-	db 46,THRASH
-	db 53,BONE_RUSH
+	db 1, GROWL
+	db 1, TAIL_WHIP
+	db 1, BONE_CLUB
+	db 1, HEADBUTT
+	db 5, TAIL_WHIP
+	db 9, BONE_CLUB
+	db 13, HEADBUTT
+	db 17, LEER
+	db 21, FOCUS_ENERGY
+	db 25, BONEMERANG
+	db 32, RAGE
+	db 39, FALSE_SWIPE
+	db 46, THRASH
+	db 53, BONE_RUSH
 	db 0 ; no more level-up moves
 
 HitmonleeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,DOUBLE_KICK
-	db 6,MEDITATE
-	db 11,ROLLING_KICK
-	db 16,JUMP_KICK
-	db 21,FOCUS_ENERGY
-	db 26,HI_JUMP_KICK
-	db 31,MIND_READER
-	db 36,FORESIGHT
-	db 41,ENDURE
-	db 46,MEGA_KICK
-	db 51,REVERSAL
+	db 1, DOUBLE_KICK
+	db 6, MEDITATE
+	db 11, ROLLING_KICK
+	db 16, JUMP_KICK
+	db 21, FOCUS_ENERGY
+	db 26, HI_JUMP_KICK
+	db 31, MIND_READER
+	db 36, FORESIGHT
+	db 41, ENDURE
+	db 46, MEGA_KICK
+	db 51, REVERSAL
 	db 0 ; no more level-up moves
 
 HitmonchanEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,COMET_PUNCH
-	db 7,AGILITY
-	db 13,PURSUIT
-	db 26,THUNDERPUNCH
-	db 26,ICE_PUNCH
-	db 26,FIRE_PUNCH
-	db 32,MACH_PUNCH
-	db 38,MEGA_PUNCH
-	db 44,DETECT
-	db 50,COUNTER
+	db 1, COMET_PUNCH
+	db 7, AGILITY
+	db 13, PURSUIT
+	db 26, THUNDERPUNCH
+	db 26, ICE_PUNCH
+	db 26, FIRE_PUNCH
+	db 32, MACH_PUNCH
+	db 38, MEGA_PUNCH
+	db 44, DETECT
+	db 50, COUNTER
 	db 0 ; no more level-up moves
 
 LickitungEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,LICK
-	db 7,SUPERSONIC
-	db 13,DEFENSE_CURL
-	db 19,STOMP
-	db 25,WRAP
-	db 31,DISABLE
-	db 37,SLAM
-	db 43,SCREECH
+	db 1, LICK
+	db 7, SUPERSONIC
+	db 13, DEFENSE_CURL
+	db 19, STOMP
+	db 25, WRAP
+	db 31, DISABLE
+	db 37, SLAM
+	db 43, SCREECH
 	db 0 ; no more level-up moves
 
 KoffingEvosAttacks:
-	db EVOLVE_LEVEL,35,WEEZING
+	db EVOLVE_LEVEL, 35, WEEZING
 	db 0 ; no more evolutions
-	db 1,POISON_GAS
-	db 1,TACKLE
-	db 9,SMOG
-	db 17,SELFDESTRUCT
-	db 21,SLUDGE
-	db 25,SMOKESCREEN
-	db 33,HAZE
-	db 41,EXPLOSION
-	db 45,DESTINY_BOND
+	db 1, POISON_GAS
+	db 1, TACKLE
+	db 9, SMOG
+	db 17, SELFDESTRUCT
+	db 21, SLUDGE
+	db 25, SMOKESCREEN
+	db 33, HAZE
+	db 41, EXPLOSION
+	db 45, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 WeezingEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POISON_GAS
-	db 1,TACKLE
-	db 1,SMOG
-	db 1,SELFDESTRUCT
-	db 9,SMOG
-	db 17,SELFDESTRUCT
-	db 21,SLUDGE
-	db 25,SMOKESCREEN
-	db 33,HAZE
-	db 44,EXPLOSION
-	db 51,DESTINY_BOND
+	db 1, POISON_GAS
+	db 1, TACKLE
+	db 1, SMOG
+	db 1, SELFDESTRUCT
+	db 9, SMOG
+	db 17, SELFDESTRUCT
+	db 21, SLUDGE
+	db 25, SMOKESCREEN
+	db 33, HAZE
+	db 44, EXPLOSION
+	db 51, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 RhyhornEvosAttacks:
-	db EVOLVE_LEVEL,42,RHYDON
+	db EVOLVE_LEVEL, 42, RHYDON
 	db 0 ; no more evolutions
-	db 1,HORN_ATTACK
-	db 1,TAIL_WHIP
-	db 13,STOMP
-	db 19,FURY_ATTACK
-	db 31,SCARY_FACE
-	db 37,HORN_DRILL
-	db 49,TAKE_DOWN
-	db 55,EARTHQUAKE
+	db 1, HORN_ATTACK
+	db 1, TAIL_WHIP
+	db 13, STOMP
+	db 19, FURY_ATTACK
+	db 31, SCARY_FACE
+	db 37, HORN_DRILL
+	db 49, TAKE_DOWN
+	db 55, EARTHQUAKE
 	db 0 ; no more level-up moves
 
 RhydonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HORN_ATTACK
-	db 1,TAIL_WHIP
-	db 1,STOMP
-	db 1,FURY_ATTACK
-	db 13,STOMP
-	db 19,FURY_ATTACK
-	db 31,SCARY_FACE
-	db 37,HORN_DRILL
-	db 54,TAKE_DOWN
-	db 65,EARTHQUAKE
+	db 1, HORN_ATTACK
+	db 1, TAIL_WHIP
+	db 1, STOMP
+	db 1, FURY_ATTACK
+	db 13, STOMP
+	db 19, FURY_ATTACK
+	db 31, SCARY_FACE
+	db 37, HORN_DRILL
+	db 54, TAKE_DOWN
+	db 65, EARTHQUAKE
 	db 0 ; no more level-up moves
 
 ChanseyEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,BLISSEY
+	db EVOLVE_HAPPINESS, TR_ANYTIME, BLISSEY
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 5,GROWL
-	db 9,TAIL_WHIP
-	db 13,SOFTBOILED
-	db 17,DOUBLESLAP
-	db 23,MINIMIZE
-	db 29,SING
-	db 35,EGG_BOMB
-	db 41,DEFENSE_CURL
-	db 49,LIGHT_SCREEN
-	db 57,DOUBLE_EDGE
+	db 1, POUND
+	db 5, GROWL
+	db 9, TAIL_WHIP
+	db 13, SOFTBOILED
+	db 17, DOUBLESLAP
+	db 23, MINIMIZE
+	db 29, SING
+	db 35, EGG_BOMB
+	db 41, DEFENSE_CURL
+	db 49, LIGHT_SCREEN
+	db 57, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 TangelaEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONSTRICT
-	db 4,SLEEP_POWDER
-	db 10,ABSORB
-	db 13,POISONPOWDER
-	db 19,VINE_WHIP
-	db 25,BIND
-	db 31,MEGA_DRAIN
-	db 34,STUN_SPORE
-	db 40,SLAM
-	db 46,GROWTH
+	db 1, CONSTRICT
+	db 4, SLEEP_POWDER
+	db 10, ABSORB
+	db 13, POISONPOWDER
+	db 19, VINE_WHIP
+	db 25, BIND
+	db 31, MEGA_DRAIN
+	db 34, STUN_SPORE
+	db 40, SLAM
+	db 46, GROWTH
 	db 0 ; no more level-up moves
 
 KangaskhanEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,COMET_PUNCH
-	db 7,LEER
-	db 13,BITE
-	db 19,TAIL_WHIP
-	db 25,MEGA_PUNCH
-	db 31,RAGE
-	db 37,ENDURE
-	db 43,DIZZY_PUNCH
-	db 49,REVERSAL
+	db 1, COMET_PUNCH
+	db 7, LEER
+	db 13, BITE
+	db 19, TAIL_WHIP
+	db 25, MEGA_PUNCH
+	db 31, RAGE
+	db 37, ENDURE
+	db 43, DIZZY_PUNCH
+	db 49, REVERSAL
 	db 0 ; no more level-up moves
 
 HorseaEvosAttacks:
-	db EVOLVE_LEVEL,32,SEADRA
+	db EVOLVE_LEVEL, 32, SEADRA
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 8,SMOKESCREEN
-	db 15,LEER
-	db 22,WATER_GUN
-	db 29,TWISTER
-	db 36,AGILITY
-	db 43,HYDRO_PUMP
+	db 1, BUBBLE
+	db 8, SMOKESCREEN
+	db 15, LEER
+	db 22, WATER_GUN
+	db 29, TWISTER
+	db 36, AGILITY
+	db 43, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 SeadraEvosAttacks:
-	db EVOLVE_TRADE,DRAGON_SCALE,KINGDRA
+	db EVOLVE_TRADE, DRAGON_SCALE, KINGDRA
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,SMOKESCREEN
-	db 1,LEER
-	db 1,WATER_GUN
-	db 8,SMOKESCREEN
-	db 15,LEER
-	db 22,WATER_GUN
-	db 29,TWISTER
-	db 40,AGILITY
-	db 51,HYDRO_PUMP
+	db 1, BUBBLE
+	db 1, SMOKESCREEN
+	db 1, LEER
+	db 1, WATER_GUN
+	db 8, SMOKESCREEN
+	db 15, LEER
+	db 22, WATER_GUN
+	db 29, TWISTER
+	db 40, AGILITY
+	db 51, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 GoldeenEvosAttacks:
-	db EVOLVE_LEVEL,33,SEAKING
+	db EVOLVE_LEVEL, 33, SEAKING
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,TAIL_WHIP
-	db 10,SUPERSONIC
-	db 15,HORN_ATTACK
-	db 24,FLAIL
-	db 29,FURY_ATTACK
-	db 38,WATERFALL
-	db 43,HORN_DRILL
-	db 52,AGILITY
+	db 1, PECK
+	db 1, TAIL_WHIP
+	db 10, SUPERSONIC
+	db 15, HORN_ATTACK
+	db 24, FLAIL
+	db 29, FURY_ATTACK
+	db 38, WATERFALL
+	db 43, HORN_DRILL
+	db 52, AGILITY
 	db 0 ; no more level-up moves
 
 SeakingEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,TAIL_WHIP
-	db 1,TAIL_WHIP
-	db 10,SUPERSONIC
-	db 15,HORN_ATTACK
-	db 24,FLAIL
-	db 29,FURY_ATTACK
-	db 41,WATERFALL
-	db 49,HORN_DRILL
-	db 61,AGILITY
+	db 1, PECK
+	db 1, TAIL_WHIP
+	db 1, TAIL_WHIP
+	db 10, SUPERSONIC
+	db 15, HORN_ATTACK
+	db 24, FLAIL
+	db 29, FURY_ATTACK
+	db 41, WATERFALL
+	db 49, HORN_DRILL
+	db 61, AGILITY
 	db 0 ; no more level-up moves
 
 StaryuEvosAttacks:
-	db EVOLVE_ITEM,WATER_STONE,STARMIE
+	db EVOLVE_ITEM, WATER_STONE, STARMIE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,HARDEN
-	db 7,WATER_GUN
-	db 13,RAPID_SPIN
-	db 19,RECOVER
-	db 25,SWIFT
-	db 31,BUBBLEBEAM
-	db 37,MINIMIZE
-	db 43,LIGHT_SCREEN
-	db 50,HYDRO_PUMP
+	db 1, TACKLE
+	db 1, HARDEN
+	db 7, WATER_GUN
+	db 13, RAPID_SPIN
+	db 19, RECOVER
+	db 25, SWIFT
+	db 31, BUBBLEBEAM
+	db 37, MINIMIZE
+	db 43, LIGHT_SCREEN
+	db 50, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 StarmieEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,RAPID_SPIN
-	db 1,RECOVER
-	db 1,BUBBLEBEAM
-	db 37,CONFUSE_RAY
+	db 1, TACKLE
+	db 1, RAPID_SPIN
+	db 1, RECOVER
+	db 1, BUBBLEBEAM
+	db 37, CONFUSE_RAY
 	db 0 ; no more level-up moves
 
 MrMimeEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BARRIER
-	db 6,CONFUSION
-	db 11,SUBSTITUTE
-	db 16,MEDITATE
-	db 21,DOUBLESLAP
-	db 26,LIGHT_SCREEN
-	db 26,REFLECT
-	db 31,ENCORE
-	db 36,PSYBEAM
-	db 41,BATON_PASS
-	db 46,SAFEGUARD
+	db 1, BARRIER
+	db 6, CONFUSION
+	db 11, SUBSTITUTE
+	db 16, MEDITATE
+	db 21, DOUBLESLAP
+	db 26, LIGHT_SCREEN
+	db 26, REFLECT
+	db 31, ENCORE
+	db 36, PSYBEAM
+	db 41, BATON_PASS
+	db 46, SAFEGUARD
 	db 0 ; no more level-up moves
 
 ScytherEvosAttacks:
-	db EVOLVE_TRADE,METAL_COAT,SCIZOR
+	db EVOLVE_TRADE, METAL_COAT, SCIZOR
 	db 0 ; no more evolutions
-	db 1,QUICK_ATTACK
-	db 1,LEER
-	db 6,FOCUS_ENERGY
-	db 12,PURSUIT
-	db 18,FALSE_SWIPE
-	db 24,AGILITY
-	db 30,WING_ATTACK
-	db 36,SLASH
-	db 42,SWORDS_DANCE
-	db 48,DOUBLE_TEAM
+	db 1, QUICK_ATTACK
+	db 1, LEER
+	db 6, FOCUS_ENERGY
+	db 12, PURSUIT
+	db 18, FALSE_SWIPE
+	db 24, AGILITY
+	db 30, WING_ATTACK
+	db 36, SLASH
+	db 42, SWORDS_DANCE
+	db 48, DOUBLE_TEAM
 	db 0 ; no more level-up moves
 
 JynxEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,LICK
-	db 1,LOVELY_KISS
-	db 1,POWDER_SNOW
-	db 9,LOVELY_KISS
-	db 13,POWDER_SNOW
-	db 21,DOUBLESLAP
-	db 25,ICE_PUNCH
-	db 35,MEAN_LOOK
-	db 41,BODY_SLAM
-	db 51,PERISH_SONG
-	db 57,BLIZZARD
+	db 1, POUND
+	db 1, LICK
+	db 1, LOVELY_KISS
+	db 1, POWDER_SNOW
+	db 9, LOVELY_KISS
+	db 13, POWDER_SNOW
+	db 21, DOUBLESLAP
+	db 25, ICE_PUNCH
+	db 35, MEAN_LOOK
+	db 41, BODY_SLAM
+	db 51, PERISH_SONG
+	db 57, BLIZZARD
 	db 0 ; no more level-up moves
 
 ElectabuzzEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,QUICK_ATTACK
-	db 1,LEER
-	db 1,THUNDERPUNCH
-	db 9,THUNDERPUNCH
-	db 17,LIGHT_SCREEN
-	db 25,SWIFT
-	db 36,SCREECH
-	db 47,THUNDERBOLT
-	db 58,THUNDER
+	db 1, QUICK_ATTACK
+	db 1, LEER
+	db 1, THUNDERPUNCH
+	db 9, THUNDERPUNCH
+	db 17, LIGHT_SCREEN
+	db 25, SWIFT
+	db 36, SCREECH
+	db 47, THUNDERBOLT
+	db 58, THUNDER
 	db 0 ; no more level-up moves
 
 MagmarEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,EMBER
-	db 1,LEER
-	db 1,SMOG
-	db 1,FIRE_PUNCH
-	db 7,LEER
-	db 13,SMOG
-	db 19,FIRE_PUNCH
-	db 25,SMOKESCREEN
-	db 33,SUNNY_DAY
-	db 41,FLAMETHROWER
-	db 49,CONFUSE_RAY
-	db 57,FIRE_BLAST
+	db 1, EMBER
+	db 1, LEER
+	db 1, SMOG
+	db 1, FIRE_PUNCH
+	db 7, LEER
+	db 13, SMOG
+	db 19, FIRE_PUNCH
+	db 25, SMOKESCREEN
+	db 33, SUNNY_DAY
+	db 41, FLAMETHROWER
+	db 49, CONFUSE_RAY
+	db 57, FIRE_BLAST
 	db 0 ; no more level-up moves
 
 PinsirEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,VICEGRIP
-	db 7,FOCUS_ENERGY
-	db 13,BIND
-	db 19,SEISMIC_TOSS
-	db 25,HARDEN
-	db 31,GUILLOTINE
-	db 37,SUBMISSION
-	db 43,SWORDS_DANCE
+	db 1, VICEGRIP
+	db 7, FOCUS_ENERGY
+	db 13, BIND
+	db 19, SEISMIC_TOSS
+	db 25, HARDEN
+	db 31, GUILLOTINE
+	db 37, SUBMISSION
+	db 43, SWORDS_DANCE
 	db 0 ; no more level-up moves
 
 TaurosEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 4,TAIL_WHIP
-	db 8,RAGE
-	db 13,HORN_ATTACK
-	db 19,SCARY_FACE
-	db 26,PURSUIT
-	db 34,REST
-	db 43,THRASH
-	db 53,TAKE_DOWN
+	db 1, TACKLE
+	db 4, TAIL_WHIP
+	db 8, RAGE
+	db 13, HORN_ATTACK
+	db 19, SCARY_FACE
+	db 26, PURSUIT
+	db 34, REST
+	db 43, THRASH
+	db 53, TAKE_DOWN
 	db 0 ; no more level-up moves
 
 MagikarpEvosAttacks:
-	db EVOLVE_LEVEL,20,GYARADOS
+	db EVOLVE_LEVEL, 20, GYARADOS
 	db 0 ; no more evolutions
-	db 1,SPLASH
-	db 15,TACKLE
-	db 30,FLAIL
+	db 1, SPLASH
+	db 15, TACKLE
+	db 30, FLAIL
 	db 0 ; no more level-up moves
 
 GyaradosEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,THRASH
-	db 20,BITE
-	db 25,DRAGON_RAGE
-	db 30,LEER
-	db 35,TWISTER
-	db 40,HYDRO_PUMP
-	db 45,RAIN_DANCE
-	db 50,HYPER_BEAM
+	db 1, THRASH
+	db 20, BITE
+	db 25, DRAGON_RAGE
+	db 30, LEER
+	db 35, TWISTER
+	db 40, HYDRO_PUMP
+	db 45, RAIN_DANCE
+	db 50, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 LaprasEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 1,GROWL
-	db 1,SING
-	db 8,MIST
-	db 15,BODY_SLAM
-	db 22,CONFUSE_RAY
-	db 29,PERISH_SONG
-	db 36,ICE_BEAM
-	db 43,RAIN_DANCE
-	db 50,SAFEGUARD
-	db 57,HYDRO_PUMP
+	db 1, WATER_GUN
+	db 1, GROWL
+	db 1, SING
+	db 8, MIST
+	db 15, BODY_SLAM
+	db 22, CONFUSE_RAY
+	db 29, PERISH_SONG
+	db 36, ICE_BEAM
+	db 43, RAIN_DANCE
+	db 50, SAFEGUARD
+	db 57, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 DittoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TRANSFORM
+	db 1, TRANSFORM
 	db 0 ; no more level-up moves
 
 EeveeEvosAttacks:
-	db EVOLVE_ITEM,THUNDERSTONE,JOLTEON
-	db EVOLVE_ITEM,WATER_STONE,VAPOREON
-	db EVOLVE_ITEM,FIRE_STONE,FLAREON
-	db EVOLVE_HAPPINESS,TR_MORNDAY,ESPEON
-	db EVOLVE_HAPPINESS,TR_NITE,UMBREON
+	db EVOLVE_ITEM, THUNDERSTONE, JOLTEON
+	db EVOLVE_ITEM, WATER_STONE, VAPOREON
+	db EVOLVE_ITEM, FIRE_STONE, FLAREON
+	db EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON
+	db EVOLVE_HAPPINESS, TR_NITE, UMBREON
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,GROWL
-	db 23,QUICK_ATTACK
-	db 30,BITE
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, GROWL
+	db 23, QUICK_ATTACK
+	db 30, BITE
 if _CRYSTAL
-	db 36,BATON_PASS
+	db 36, BATON_PASS
 else
-	db 36,FOCUS_ENERGY
+	db 36, FOCUS_ENERGY
 endc
-	db 42,TAKE_DOWN
+	db 42, TAKE_DOWN
 	db 0 ; no more level-up moves
 
 VaporeonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,WATER_GUN
-	db 23,QUICK_ATTACK
-	db 30,BITE
-	db 36,AURORA_BEAM
-	db 42,HAZE
-	db 47,ACID_ARMOR
-	db 52,HYDRO_PUMP
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, WATER_GUN
+	db 23, QUICK_ATTACK
+	db 30, BITE
+	db 36, AURORA_BEAM
+	db 42, HAZE
+	db 47, ACID_ARMOR
+	db 52, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 JolteonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,THUNDERSHOCK
-	db 23,QUICK_ATTACK
-	db 30,DOUBLE_KICK
-	db 36,PIN_MISSILE
-	db 42,THUNDER_WAVE
-	db 47,AGILITY
-	db 52,THUNDER
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, THUNDERSHOCK
+	db 23, QUICK_ATTACK
+	db 30, DOUBLE_KICK
+	db 36, PIN_MISSILE
+	db 42, THUNDER_WAVE
+	db 47, AGILITY
+	db 52, THUNDER
 	db 0 ; no more level-up moves
 
 FlareonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,EMBER
-	db 23,QUICK_ATTACK
-	db 30,BITE
-	db 36,FIRE_SPIN
-	db 42,SMOG
-	db 47,LEER
-	db 52,FLAMETHROWER
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, EMBER
+	db 23, QUICK_ATTACK
+	db 30, BITE
+	db 36, FIRE_SPIN
+	db 42, SMOG
+	db 47, LEER
+	db 52, FLAMETHROWER
 	db 0 ; no more level-up moves
 
 PorygonEvosAttacks:
-	db EVOLVE_TRADE,UP_GRADE,PORYGON2
+	db EVOLVE_TRADE, UP_GRADE, PORYGON2
 	db 0 ; no more evolutions
-	db 1,CONVERSION2
-	db 1,TACKLE
-	db 1,CONVERSION
-	db 9,AGILITY
-	db 12,PSYBEAM
-	db 20,RECOVER
-	db 24,SHARPEN
-	db 32,LOCK_ON
-	db 36,TRI_ATTACK
-	db 44,ZAP_CANNON
+	db 1, CONVERSION2
+	db 1, TACKLE
+	db 1, CONVERSION
+	db 9, AGILITY
+	db 12, PSYBEAM
+	db 20, RECOVER
+	db 24, SHARPEN
+	db 32, LOCK_ON
+	db 36, TRI_ATTACK
+	db 44, ZAP_CANNON
 	db 0 ; no more level-up moves
 
 OmanyteEvosAttacks:
-	db EVOLVE_LEVEL,40,OMASTAR
+	db EVOLVE_LEVEL, 40, OMASTAR
 	db 0 ; no more evolutions
-	db 1,CONSTRICT
-	db 1,WITHDRAW
-	db 13,BITE
-	db 19,WATER_GUN
-	db 31,LEER
-	db 37,PROTECT
-	db 49,ANCIENTPOWER
-	db 55,HYDRO_PUMP
+	db 1, CONSTRICT
+	db 1, WITHDRAW
+	db 13, BITE
+	db 19, WATER_GUN
+	db 31, LEER
+	db 37, PROTECT
+	db 49, ANCIENTPOWER
+	db 55, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 OmastarEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONSTRICT
-	db 1,WITHDRAW
-	db 1,BITE
-	db 13,BITE
-	db 19,WATER_GUN
-	db 31,LEER
-	db 37,PROTECT
-	db 40,SPIKE_CANNON
-	db 54,ANCIENTPOWER
-	db 65,HYDRO_PUMP
+	db 1, CONSTRICT
+	db 1, WITHDRAW
+	db 1, BITE
+	db 13, BITE
+	db 19, WATER_GUN
+	db 31, LEER
+	db 37, PROTECT
+	db 40, SPIKE_CANNON
+	db 54, ANCIENTPOWER
+	db 65, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 KabutoEvosAttacks:
-	db EVOLVE_LEVEL,40,KABUTOPS
+	db EVOLVE_LEVEL, 40, KABUTOPS
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,HARDEN
-	db 10,ABSORB
-	db 19,LEER
-	db 28,SAND_ATTACK
-	db 37,ENDURE
-	db 46,MEGA_DRAIN
-	db 55,ANCIENTPOWER
+	db 1, SCRATCH
+	db 1, HARDEN
+	db 10, ABSORB
+	db 19, LEER
+	db 28, SAND_ATTACK
+	db 37, ENDURE
+	db 46, MEGA_DRAIN
+	db 55, ANCIENTPOWER
 	db 0 ; no more level-up moves
 
 KabutopsEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,HARDEN
-	db 1,ABSORB
-	db 10,ABSORB
-	db 19,LEER
-	db 28,SAND_ATTACK
-	db 37,ENDURE
-	db 40,SLASH
-	db 51,MEGA_DRAIN
-	db 65,ANCIENTPOWER
+	db 1, SCRATCH
+	db 1, HARDEN
+	db 1, ABSORB
+	db 10, ABSORB
+	db 19, LEER
+	db 28, SAND_ATTACK
+	db 37, ENDURE
+	db 40, SLASH
+	db 51, MEGA_DRAIN
+	db 65, ANCIENTPOWER
 	db 0 ; no more level-up moves
 
 AerodactylEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WING_ATTACK
-	db 8,AGILITY
-	db 15,BITE
-	db 22,SUPERSONIC
-	db 29,ANCIENTPOWER
-	db 36,SCARY_FACE
-	db 43,TAKE_DOWN
-	db 50,HYPER_BEAM
+	db 1, WING_ATTACK
+	db 8, AGILITY
+	db 15, BITE
+	db 22, SUPERSONIC
+	db 29, ANCIENTPOWER
+	db 36, SCARY_FACE
+	db 43, TAKE_DOWN
+	db 50, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 SnorlaxEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 8,AMNESIA
-	db 15,DEFENSE_CURL
-	db 22,BELLY_DRUM
-	db 29,HEADBUTT
-	db 36,SNORE
-	db 36,REST
-	db 43,BODY_SLAM
-	db 50,ROLLOUT
-	db 57,HYPER_BEAM
+	db 1, TACKLE
+	db 8, AMNESIA
+	db 15, DEFENSE_CURL
+	db 22, BELLY_DRUM
+	db 29, HEADBUTT
+	db 36, SNORE
+	db 36, REST
+	db 43, BODY_SLAM
+	db 50, ROLLOUT
+	db 57, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 ArticunoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,GUST
-	db 1,POWDER_SNOW
-	db 13,MIST
-	db 25,AGILITY
-	db 37,MIND_READER
-	db 49,ICE_BEAM
-	db 61,REFLECT
-	db 73,BLIZZARD
+	db 1, GUST
+	db 1, POWDER_SNOW
+	db 13, MIST
+	db 25, AGILITY
+	db 37, MIND_READER
+	db 49, ICE_BEAM
+	db 61, REFLECT
+	db 73, BLIZZARD
 	db 0 ; no more level-up moves
 
 ZapdosEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,THUNDERSHOCK
-	db 13,THUNDER_WAVE
-	db 25,AGILITY
-	db 37,DETECT
-	db 49,DRILL_PECK
-	db 61,LIGHT_SCREEN
-	db 73,THUNDER
+	db 1, PECK
+	db 1, THUNDERSHOCK
+	db 13, THUNDER_WAVE
+	db 25, AGILITY
+	db 37, DETECT
+	db 49, DRILL_PECK
+	db 61, LIGHT_SCREEN
+	db 73, THUNDER
 	db 0 ; no more level-up moves
 
 MoltresEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WING_ATTACK
-	db 1,EMBER
-	db 13,FIRE_SPIN
-	db 25,AGILITY
-	db 37,ENDURE
-	db 49,FLAMETHROWER
-	db 61,SAFEGUARD
-	db 73,SKY_ATTACK
+	db 1, WING_ATTACK
+	db 1, EMBER
+	db 13, FIRE_SPIN
+	db 25, AGILITY
+	db 37, ENDURE
+	db 49, FLAMETHROWER
+	db 61, SAFEGUARD
+	db 73, SKY_ATTACK
 	db 0 ; no more level-up moves
 
 DratiniEvosAttacks:
-	db EVOLVE_LEVEL,30,DRAGONAIR
+	db EVOLVE_LEVEL, 30, DRAGONAIR
 	db 0 ; no more evolutions
-	db 1,WRAP
-	db 1,LEER
-	db 8,THUNDER_WAVE
-	db 15,TWISTER
-	db 22,DRAGON_RAGE
-	db 29,SLAM
-	db 36,AGILITY
-	db 43,SAFEGUARD
-	db 50,OUTRAGE
-	db 57,HYPER_BEAM
+	db 1, WRAP
+	db 1, LEER
+	db 8, THUNDER_WAVE
+	db 15, TWISTER
+	db 22, DRAGON_RAGE
+	db 29, SLAM
+	db 36, AGILITY
+	db 43, SAFEGUARD
+	db 50, OUTRAGE
+	db 57, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 DragonairEvosAttacks:
-	db EVOLVE_LEVEL,55,DRAGONITE
+	db EVOLVE_LEVEL, 55, DRAGONITE
 	db 0 ; no more evolutions
-	db 1,WRAP
-	db 1,LEER
-	db 1,THUNDER_WAVE
-	db 1,TWISTER
-	db 8,THUNDER_WAVE
-	db 15,TWISTER
-	db 22,DRAGON_RAGE
-	db 29,SLAM
-	db 38,AGILITY
-	db 47,SAFEGUARD
-	db 56,OUTRAGE
-	db 65,HYPER_BEAM
+	db 1, WRAP
+	db 1, LEER
+	db 1, THUNDER_WAVE
+	db 1, TWISTER
+	db 8, THUNDER_WAVE
+	db 15, TWISTER
+	db 22, DRAGON_RAGE
+	db 29, SLAM
+	db 38, AGILITY
+	db 47, SAFEGUARD
+	db 56, OUTRAGE
+	db 65, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 DragoniteEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WRAP
-	db 1,LEER
-	db 1,THUNDER_WAVE
-	db 1,TWISTER
-	db 8,THUNDER_WAVE
-	db 15,TWISTER
-	db 22,DRAGON_RAGE
-	db 29,SLAM
-	db 38,AGILITY
-	db 47,SAFEGUARD
-	db 55,WING_ATTACK
-	db 61,OUTRAGE
-	db 75,HYPER_BEAM
+	db 1, WRAP
+	db 1, LEER
+	db 1, THUNDER_WAVE
+	db 1, TWISTER
+	db 8, THUNDER_WAVE
+	db 15, TWISTER
+	db 22, DRAGON_RAGE
+	db 29, SLAM
+	db 38, AGILITY
+	db 47, SAFEGUARD
+	db 55, WING_ATTACK
+	db 61, OUTRAGE
+	db 75, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 MewtwoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONFUSION
-	db 1,DISABLE
-	db 11,BARRIER
-	db 22,SWIFT
-	db 33,PSYCH_UP
-	db 44,FUTURE_SIGHT
-	db 55,MIST
-	db 66,PSYCHIC_M
-	db 77,AMNESIA
-	db 88,RECOVER
-	db 99,SAFEGUARD
+	db 1, CONFUSION
+	db 1, DISABLE
+	db 11, BARRIER
+	db 22, SWIFT
+	db 33, PSYCH_UP
+	db 44, FUTURE_SIGHT
+	db 55, MIST
+	db 66, PSYCHIC_M
+	db 77, AMNESIA
+	db 88, RECOVER
+	db 99, SAFEGUARD
 	db 0 ; no more level-up moves
 
 MewEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 10,TRANSFORM
-	db 20,MEGA_PUNCH
-	db 30,METRONOME
-	db 40,PSYCHIC_M
-	db 50,ANCIENTPOWER
+	db 1, POUND
+	db 10, TRANSFORM
+	db 20, MEGA_PUNCH
+	db 30, METRONOME
+	db 40, PSYCHIC_M
+	db 50, ANCIENTPOWER
 	db 0 ; no more level-up moves
 
 ChikoritaEvosAttacks:
-	db EVOLVE_LEVEL,16,BAYLEEF
+	db EVOLVE_LEVEL, 16, BAYLEEF
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 8,RAZOR_LEAF
-	db 12,REFLECT
-	db 15,POISONPOWDER
-	db 22,SYNTHESIS
-	db 29,BODY_SLAM
-	db 36,LIGHT_SCREEN
-	db 43,SAFEGUARD
-	db 50,SOLARBEAM
+	db 1, TACKLE
+	db 1, GROWL
+	db 8, RAZOR_LEAF
+	db 12, REFLECT
+	db 15, POISONPOWDER
+	db 22, SYNTHESIS
+	db 29, BODY_SLAM
+	db 36, LIGHT_SCREEN
+	db 43, SAFEGUARD
+	db 50, SOLARBEAM
 	db 0 ; no more level-up moves
 
 BayleefEvosAttacks:
-	db EVOLVE_LEVEL,32,MEGANIUM
+	db EVOLVE_LEVEL, 32, MEGANIUM
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,RAZOR_LEAF
-	db 1,REFLECT
-	db 8,RAZOR_LEAF
-	db 12,REFLECT
-	db 15,POISONPOWDER
-	db 23,SYNTHESIS
-	db 31,BODY_SLAM
-	db 39,LIGHT_SCREEN
-	db 47,SAFEGUARD
-	db 55,SOLARBEAM
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, RAZOR_LEAF
+	db 1, REFLECT
+	db 8, RAZOR_LEAF
+	db 12, REFLECT
+	db 15, POISONPOWDER
+	db 23, SYNTHESIS
+	db 31, BODY_SLAM
+	db 39, LIGHT_SCREEN
+	db 47, SAFEGUARD
+	db 55, SOLARBEAM
 	db 0 ; no more level-up moves
 
 MeganiumEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,RAZOR_LEAF
-	db 1,REFLECT
-	db 8,RAZOR_LEAF
-	db 12,REFLECT
-	db 15,POISONPOWDER
-	db 23,SYNTHESIS
-	db 31,BODY_SLAM
-	db 41,LIGHT_SCREEN
-	db 51,SAFEGUARD
-	db 61,SOLARBEAM
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, RAZOR_LEAF
+	db 1, REFLECT
+	db 8, RAZOR_LEAF
+	db 12, REFLECT
+	db 15, POISONPOWDER
+	db 23, SYNTHESIS
+	db 31, BODY_SLAM
+	db 41, LIGHT_SCREEN
+	db 51, SAFEGUARD
+	db 61, SOLARBEAM
 	db 0 ; no more level-up moves
 
 CyndaquilEvosAttacks:
-	db EVOLVE_LEVEL,14,QUILAVA
+	db EVOLVE_LEVEL, 14, QUILAVA
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,LEER
-	db 6,SMOKESCREEN
-	db 12,EMBER
-	db 19,QUICK_ATTACK
-	db 27,FLAME_WHEEL
-	db 36,SWIFT
-	db 46,FLAMETHROWER
+	db 1, TACKLE
+	db 1, LEER
+	db 6, SMOKESCREEN
+	db 12, EMBER
+	db 19, QUICK_ATTACK
+	db 27, FLAME_WHEEL
+	db 36, SWIFT
+	db 46, FLAMETHROWER
 	db 0 ; no more level-up moves
 
 QuilavaEvosAttacks:
-	db EVOLVE_LEVEL,36,TYPHLOSION
+	db EVOLVE_LEVEL, 36, TYPHLOSION
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,LEER
-	db 1,SMOKESCREEN
-	db 6,SMOKESCREEN
-	db 12,EMBER
-	db 21,QUICK_ATTACK
-	db 31,FLAME_WHEEL
-	db 42,SWIFT
-	db 54,FLAMETHROWER
+	db 1, TACKLE
+	db 1, LEER
+	db 1, SMOKESCREEN
+	db 6, SMOKESCREEN
+	db 12, EMBER
+	db 21, QUICK_ATTACK
+	db 31, FLAME_WHEEL
+	db 42, SWIFT
+	db 54, FLAMETHROWER
 	db 0 ; no more level-up moves
 
 TyphlosionEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,LEER
-	db 1,SMOKESCREEN
-	db 1,EMBER
-	db 6,SMOKESCREEN
-	db 12,EMBER
-	db 21,QUICK_ATTACK
-	db 31,FLAME_WHEEL
-	db 45,SWIFT
-	db 60,FLAMETHROWER
+	db 1, TACKLE
+	db 1, LEER
+	db 1, SMOKESCREEN
+	db 1, EMBER
+	db 6, SMOKESCREEN
+	db 12, EMBER
+	db 21, QUICK_ATTACK
+	db 31, FLAME_WHEEL
+	db 45, SWIFT
+	db 60, FLAMETHROWER
 	db 0 ; no more level-up moves
 
 TotodileEvosAttacks:
-	db EVOLVE_LEVEL,18,CROCONAW
+	db EVOLVE_LEVEL, 18, CROCONAW
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 7,RAGE
-	db 13,WATER_GUN
-	db 20,BITE
-	db 27,SCARY_FACE
-	db 35,SLASH
-	db 43,SCREECH
-	db 52,HYDRO_PUMP
+	db 1, SCRATCH
+	db 1, LEER
+	db 7, RAGE
+	db 13, WATER_GUN
+	db 20, BITE
+	db 27, SCARY_FACE
+	db 35, SLASH
+	db 43, SCREECH
+	db 52, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 CroconawEvosAttacks:
-	db EVOLVE_LEVEL,30,FERALIGATR
+	db EVOLVE_LEVEL, 30, FERALIGATR
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 1,RAGE
-	db 7,RAGE
-	db 13,WATER_GUN
-	db 21,BITE
-	db 28,SCARY_FACE
-	db 37,SLASH
-	db 45,SCREECH
-	db 55,HYDRO_PUMP
+	db 1, SCRATCH
+	db 1, LEER
+	db 1, RAGE
+	db 7, RAGE
+	db 13, WATER_GUN
+	db 21, BITE
+	db 28, SCARY_FACE
+	db 37, SLASH
+	db 45, SCREECH
+	db 55, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 FeraligatrEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 1,RAGE
-	db 1,WATER_GUN
-	db 7,RAGE
-	db 13,WATER_GUN
-	db 21,BITE
-	db 28,SCARY_FACE
-	db 38,SLASH
-	db 47,SCREECH
-	db 58,HYDRO_PUMP
+	db 1, SCRATCH
+	db 1, LEER
+	db 1, RAGE
+	db 1, WATER_GUN
+	db 7, RAGE
+	db 13, WATER_GUN
+	db 21, BITE
+	db 28, SCARY_FACE
+	db 38, SLASH
+	db 47, SCREECH
+	db 58, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 SentretEvosAttacks:
-	db EVOLVE_LEVEL,15,FURRET
+	db EVOLVE_LEVEL, 15, FURRET
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 5,DEFENSE_CURL
-	db 11,QUICK_ATTACK
-	db 17,FURY_SWIPES
-	db 25,SLAM
-	db 33,REST
-	db 41,AMNESIA
+	db 1, TACKLE
+	db 5, DEFENSE_CURL
+	db 11, QUICK_ATTACK
+	db 17, FURY_SWIPES
+	db 25, SLAM
+	db 33, REST
+	db 41, AMNESIA
 	db 0 ; no more level-up moves
 
 FurretEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,DEFENSE_CURL
-	db 1,QUICK_ATTACK
-	db 5,DEFENSE_CURL
-	db 11,QUICK_ATTACK
-	db 18,FURY_SWIPES
-	db 28,SLAM
-	db 38,REST
-	db 48,AMNESIA
+	db 1, SCRATCH
+	db 1, DEFENSE_CURL
+	db 1, QUICK_ATTACK
+	db 5, DEFENSE_CURL
+	db 11, QUICK_ATTACK
+	db 18, FURY_SWIPES
+	db 28, SLAM
+	db 38, REST
+	db 48, AMNESIA
 	db 0 ; no more level-up moves
 
 HoothootEvosAttacks:
-	db EVOLVE_LEVEL,20,NOCTOWL
+	db EVOLVE_LEVEL, 20, NOCTOWL
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 6,FORESIGHT
-	db 11,PECK
-	db 16,HYPNOSIS
-	db 22,REFLECT
-	db 28,TAKE_DOWN
-	db 34,CONFUSION
-	db 48,DREAM_EATER
+	db 1, TACKLE
+	db 1, GROWL
+	db 6, FORESIGHT
+	db 11, PECK
+	db 16, HYPNOSIS
+	db 22, REFLECT
+	db 28, TAKE_DOWN
+	db 34, CONFUSION
+	db 48, DREAM_EATER
 	db 0 ; no more level-up moves
 
 NoctowlEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,FORESIGHT
-	db 1,PECK
-	db 6,FORESIGHT
-	db 11,PECK
-	db 16,HYPNOSIS
-	db 25,REFLECT
-	db 33,TAKE_DOWN
-	db 41,CONFUSION
-	db 57,DREAM_EATER
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, FORESIGHT
+	db 1, PECK
+	db 6, FORESIGHT
+	db 11, PECK
+	db 16, HYPNOSIS
+	db 25, REFLECT
+	db 33, TAKE_DOWN
+	db 41, CONFUSION
+	db 57, DREAM_EATER
 	db 0 ; no more level-up moves
 
 LedybaEvosAttacks:
-	db EVOLVE_LEVEL,18,LEDIAN
+	db EVOLVE_LEVEL, 18, LEDIAN
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 8,SUPERSONIC
-	db 15,COMET_PUNCH
-	db 22,LIGHT_SCREEN
-	db 22,REFLECT
-	db 22,SAFEGUARD
-	db 29,BATON_PASS
-	db 36,SWIFT
-	db 43,AGILITY
-	db 50,DOUBLE_EDGE
+	db 1, TACKLE
+	db 8, SUPERSONIC
+	db 15, COMET_PUNCH
+	db 22, LIGHT_SCREEN
+	db 22, REFLECT
+	db 22, SAFEGUARD
+	db 29, BATON_PASS
+	db 36, SWIFT
+	db 43, AGILITY
+	db 50, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 LedianEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SUPERSONIC
-	db 8,SUPERSONIC
-	db 15,COMET_PUNCH
-	db 24,LIGHT_SCREEN
-	db 24,REFLECT
-	db 24,SAFEGUARD
-	db 33,BATON_PASS
-	db 42,SWIFT
-	db 51,AGILITY
-	db 60,DOUBLE_EDGE
+	db 1, TACKLE
+	db 1, SUPERSONIC
+	db 8, SUPERSONIC
+	db 15, COMET_PUNCH
+	db 24, LIGHT_SCREEN
+	db 24, REFLECT
+	db 24, SAFEGUARD
+	db 33, BATON_PASS
+	db 42, SWIFT
+	db 51, AGILITY
+	db 60, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 SpinarakEvosAttacks:
-	db EVOLVE_LEVEL,22,ARIADOS
+	db EVOLVE_LEVEL, 22, ARIADOS
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 1,STRING_SHOT
-	db 6,SCARY_FACE
-	db 11,CONSTRICT
-	db 17,NIGHT_SHADE
-	db 23,LEECH_LIFE
-	db 30,FURY_SWIPES
-	db 37,SPIDER_WEB
+	db 1, POISON_STING
+	db 1, STRING_SHOT
+	db 6, SCARY_FACE
+	db 11, CONSTRICT
+	db 17, NIGHT_SHADE
+	db 23, LEECH_LIFE
+	db 30, FURY_SWIPES
+	db 37, SPIDER_WEB
 if _CRYSTAL
-	db 45,AGILITY
+	db 45, AGILITY
 else
-	db 45,SCREECH
+	db 45, SCREECH
 endc
-	db 53,PSYCHIC_M
+	db 53, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 AriadosEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 1,STRING_SHOT
-	db 1,SCARY_FACE
-	db 1,CONSTRICT
-	db 6,SCARY_FACE
-	db 11,CONSTRICT
-	db 17,NIGHT_SHADE
-	db 25,LEECH_LIFE
-	db 34,FURY_SWIPES
-	db 43,SPIDER_WEB
+	db 1, POISON_STING
+	db 1, STRING_SHOT
+	db 1, SCARY_FACE
+	db 1, CONSTRICT
+	db 6, SCARY_FACE
+	db 11, CONSTRICT
+	db 17, NIGHT_SHADE
+	db 25, LEECH_LIFE
+	db 34, FURY_SWIPES
+	db 43, SPIDER_WEB
 if _CRYSTAL
-	db 53,AGILITY
+	db 53, AGILITY
 else
-	db 53,SCREECH
+	db 53, SCREECH
 endc
-	db 63,PSYCHIC_M
+	db 63, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 CrobatEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCREECH
-	db 1,LEECH_LIFE
-	db 1,SUPERSONIC
-	db 6,SUPERSONIC
-	db 12,BITE
-	db 19,CONFUSE_RAY
-	db 30,WING_ATTACK
-	db 42,MEAN_LOOK
-	db 55,HAZE
+	db 1, SCREECH
+	db 1, LEECH_LIFE
+	db 1, SUPERSONIC
+	db 6, SUPERSONIC
+	db 12, BITE
+	db 19, CONFUSE_RAY
+	db 30, WING_ATTACK
+	db 42, MEAN_LOOK
+	db 55, HAZE
 	db 0 ; no more level-up moves
 
 ChinchouEvosAttacks:
-	db EVOLVE_LEVEL,27,LANTURN
+	db EVOLVE_LEVEL, 27, LANTURN
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,THUNDER_WAVE
-	db 5,SUPERSONIC
-	db 13,FLAIL
-	db 17,WATER_GUN
-	db 25,SPARK
-	db 29,CONFUSE_RAY
-	db 37,TAKE_DOWN
-	db 41,HYDRO_PUMP
+	db 1, BUBBLE
+	db 1, THUNDER_WAVE
+	db 5, SUPERSONIC
+	db 13, FLAIL
+	db 17, WATER_GUN
+	db 25, SPARK
+	db 29, CONFUSE_RAY
+	db 37, TAKE_DOWN
+	db 41, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 LanturnEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,THUNDER_WAVE
-	db 1,SUPERSONIC
-	db 5,SUPERSONIC
-	db 13,FLAIL
-	db 17,WATER_GUN
-	db 25,SPARK
-	db 33,CONFUSE_RAY
-	db 45,TAKE_DOWN
-	db 53,HYDRO_PUMP
+	db 1, BUBBLE
+	db 1, THUNDER_WAVE
+	db 1, SUPERSONIC
+	db 5, SUPERSONIC
+	db 13, FLAIL
+	db 17, WATER_GUN
+	db 25, SPARK
+	db 33, CONFUSE_RAY
+	db 45, TAKE_DOWN
+	db 53, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 PichuEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,PIKACHU
+	db EVOLVE_HAPPINESS, TR_ANYTIME, PIKACHU
 	db 0 ; no more evolutions
-	db 1,THUNDERSHOCK
-	db 1,CHARM
-	db 6,TAIL_WHIP
-	db 8,THUNDER_WAVE
-	db 11,SWEET_KISS
+	db 1, THUNDERSHOCK
+	db 1, CHARM
+	db 6, TAIL_WHIP
+	db 8, THUNDER_WAVE
+	db 11, SWEET_KISS
 	db 0 ; no more level-up moves
 
 CleffaEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,CLEFAIRY
+	db EVOLVE_HAPPINESS, TR_ANYTIME, CLEFAIRY
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,CHARM
-	db 4,ENCORE
-	db 8,SING
-	db 13,SWEET_KISS
+	db 1, POUND
+	db 1, CHARM
+	db 4, ENCORE
+	db 8, SING
+	db 13, SWEET_KISS
 	db 0 ; no more level-up moves
 
 IgglybuffEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,JIGGLYPUFF
+	db EVOLVE_HAPPINESS, TR_ANYTIME, JIGGLYPUFF
 	db 0 ; no more evolutions
-	db 1,SING
-	db 1,CHARM
-	db 4,DEFENSE_CURL
-	db 9,POUND
-	db 14,SWEET_KISS
+	db 1, SING
+	db 1, CHARM
+	db 4, DEFENSE_CURL
+	db 9, POUND
+	db 14, SWEET_KISS
 	db 0 ; no more level-up moves
 
 TogepiEvosAttacks:
-	db EVOLVE_HAPPINESS,TR_ANYTIME,TOGETIC
+	db EVOLVE_HAPPINESS, TR_ANYTIME, TOGETIC
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,CHARM
-	db 7,METRONOME
-	db 18,SWEET_KISS
-	db 25,ENCORE
-	db 31,SAFEGUARD
-	db 38,DOUBLE_EDGE
+	db 1, GROWL
+	db 1, CHARM
+	db 7, METRONOME
+	db 18, SWEET_KISS
+	db 25, ENCORE
+	db 31, SAFEGUARD
+	db 38, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 TogeticEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,CHARM
-	db 7,METRONOME
-	db 18,SWEET_KISS
-	db 25,ENCORE
-	db 31,SAFEGUARD
-	db 38,DOUBLE_EDGE
+	db 1, GROWL
+	db 1, CHARM
+	db 7, METRONOME
+	db 18, SWEET_KISS
+	db 25, ENCORE
+	db 31, SAFEGUARD
+	db 38, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 NatuEvosAttacks:
-	db EVOLVE_LEVEL,25,XATU
+	db EVOLVE_LEVEL, 25, XATU
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,LEER
-	db 10,NIGHT_SHADE
-	db 20,TELEPORT
-	db 30,FUTURE_SIGHT
-	db 40,CONFUSE_RAY
-	db 50,PSYCHIC_M
+	db 1, PECK
+	db 1, LEER
+	db 10, NIGHT_SHADE
+	db 20, TELEPORT
+	db 30, FUTURE_SIGHT
+	db 40, CONFUSE_RAY
+	db 50, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 XatuEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 1,LEER
-	db 1,NIGHT_SHADE
-	db 10,NIGHT_SHADE
-	db 20,TELEPORT
-	db 35,FUTURE_SIGHT
-	db 50,CONFUSE_RAY
-	db 65,PSYCHIC_M
+	db 1, PECK
+	db 1, LEER
+	db 1, NIGHT_SHADE
+	db 10, NIGHT_SHADE
+	db 20, TELEPORT
+	db 35, FUTURE_SIGHT
+	db 50, CONFUSE_RAY
+	db 65, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 MareepEvosAttacks:
-	db EVOLVE_LEVEL,15,FLAAFFY
+	db EVOLVE_LEVEL, 15, FLAAFFY
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 9,THUNDERSHOCK
-	db 16,THUNDER_WAVE
-	db 23,COTTON_SPORE
-	db 30,LIGHT_SCREEN
-	db 37,THUNDER
+	db 1, TACKLE
+	db 1, GROWL
+	db 9, THUNDERSHOCK
+	db 16, THUNDER_WAVE
+	db 23, COTTON_SPORE
+	db 30, LIGHT_SCREEN
+	db 37, THUNDER
 	db 0 ; no more level-up moves
 
 FlaaffyEvosAttacks:
-	db EVOLVE_LEVEL,30,AMPHAROS
+	db EVOLVE_LEVEL, 30, AMPHAROS
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,THUNDERSHOCK
-	db 9,THUNDERSHOCK
-	db 18,THUNDER_WAVE
-	db 27,COTTON_SPORE
-	db 36,LIGHT_SCREEN
-	db 45,THUNDER
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, THUNDERSHOCK
+	db 9, THUNDERSHOCK
+	db 18, THUNDER_WAVE
+	db 27, COTTON_SPORE
+	db 36, LIGHT_SCREEN
+	db 45, THUNDER
 	db 0 ; no more level-up moves
 
 AmpharosEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,THUNDERSHOCK
-	db 1,THUNDER_WAVE
-	db 9,THUNDERSHOCK
-	db 18,THUNDER_WAVE
-	db 27,COTTON_SPORE
-	db 30,THUNDERPUNCH
-	db 42,LIGHT_SCREEN
-	db 57,THUNDER
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, THUNDERSHOCK
+	db 1, THUNDER_WAVE
+	db 9, THUNDERSHOCK
+	db 18, THUNDER_WAVE
+	db 27, COTTON_SPORE
+	db 30, THUNDERPUNCH
+	db 42, LIGHT_SCREEN
+	db 57, THUNDER
 	db 0 ; no more level-up moves
 
 BellossomEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 1,SWEET_SCENT
-	db 1,STUN_SPORE
-	db 1,PETAL_DANCE
-	db 55,SOLARBEAM
+	db 1, ABSORB
+	db 1, SWEET_SCENT
+	db 1, STUN_SPORE
+	db 1, PETAL_DANCE
+	db 55, SOLARBEAM
 	db 0 ; no more level-up moves
 
 MarillEvosAttacks:
-	db EVOLVE_LEVEL,18,AZUMARILL
+	db EVOLVE_LEVEL, 18, AZUMARILL
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 3,DEFENSE_CURL
-	db 6,TAIL_WHIP
-	db 10,WATER_GUN
-	db 15,ROLLOUT
-	db 21,BUBBLEBEAM
-	db 28,DOUBLE_EDGE
-	db 36,RAIN_DANCE
+	db 1, TACKLE
+	db 3, DEFENSE_CURL
+	db 6, TAIL_WHIP
+	db 10, WATER_GUN
+	db 15, ROLLOUT
+	db 21, BUBBLEBEAM
+	db 28, DOUBLE_EDGE
+	db 36, RAIN_DANCE
 	db 0 ; no more level-up moves
 
 AzumarillEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,DEFENSE_CURL
-	db 1,TAIL_WHIP
-	db 1,WATER_GUN
-	db 3,DEFENSE_CURL
-	db 6,TAIL_WHIP
-	db 10,WATER_GUN
-	db 15,ROLLOUT
-	db 25,BUBBLEBEAM
-	db 36,DOUBLE_EDGE
-	db 48,RAIN_DANCE
+	db 1, TACKLE
+	db 1, DEFENSE_CURL
+	db 1, TAIL_WHIP
+	db 1, WATER_GUN
+	db 3, DEFENSE_CURL
+	db 6, TAIL_WHIP
+	db 10, WATER_GUN
+	db 15, ROLLOUT
+	db 25, BUBBLEBEAM
+	db 36, DOUBLE_EDGE
+	db 48, RAIN_DANCE
 	db 0 ; no more level-up moves
 
 SudowoodoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ROCK_THROW
-	db 1,MIMIC
-	db 10,FLAIL
-	db 19,LOW_KICK
-	db 28,ROCK_SLIDE
-	db 37,FAINT_ATTACK
-	db 46,SLAM
+	db 1, ROCK_THROW
+	db 1, MIMIC
+	db 10, FLAIL
+	db 19, LOW_KICK
+	db 28, ROCK_SLIDE
+	db 37, FAINT_ATTACK
+	db 46, SLAM
 	db 0 ; no more level-up moves
 
 PolitoedEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 1,HYPNOSIS
-	db 1,DOUBLESLAP
-	db 1,PERISH_SONG
-	db 35,PERISH_SONG
-	db 51,SWAGGER
+	db 1, WATER_GUN
+	db 1, HYPNOSIS
+	db 1, DOUBLESLAP
+	db 1, PERISH_SONG
+	db 35, PERISH_SONG
+	db 51, SWAGGER
 	db 0 ; no more level-up moves
 
 HoppipEvosAttacks:
-	db EVOLVE_LEVEL,18,SKIPLOOM
+	db EVOLVE_LEVEL, 18, SKIPLOOM
 	db 0 ; no more evolutions
-	db 1,SPLASH
+	db 1, SPLASH
 if _CRYSTAL
-	db 5,SYNTHESIS
+	db 5, SYNTHESIS
 else
-	db 1,SYNTHESIS
+	db 1, SYNTHESIS
 endc
-	db 5,TAIL_WHIP
-	db 10,TACKLE
-	db 13,POISONPOWDER
-	db 15,STUN_SPORE
-	db 17,SLEEP_POWDER
-	db 20,LEECH_SEED
-	db 25,COTTON_SPORE
-	db 30,MEGA_DRAIN
+	db 5, TAIL_WHIP
+	db 10, TACKLE
+	db 13, POISONPOWDER
+	db 15, STUN_SPORE
+	db 17, SLEEP_POWDER
+	db 20, LEECH_SEED
+	db 25, COTTON_SPORE
+	db 30, MEGA_DRAIN
 	db 0 ; no more level-up moves
 
 SkiploomEvosAttacks:
-	db EVOLVE_LEVEL,27,JUMPLUFF
+	db EVOLVE_LEVEL, 27, JUMPLUFF
 	db 0 ; no more evolutions
-	db 1,SPLASH
-	db 1,SYNTHESIS
-	db 1,TAIL_WHIP
-	db 1,TACKLE
+	db 1, SPLASH
+	db 1, SYNTHESIS
+	db 1, TAIL_WHIP
+	db 1, TACKLE
 if _CRYSTAL
-	db 5,SYNTHESIS
+	db 5, SYNTHESIS
 endc
-	db 5,TAIL_WHIP
-	db 10,TACKLE
-	db 13,POISONPOWDER
-	db 15,STUN_SPORE
-	db 17,SLEEP_POWDER
-	db 22,LEECH_SEED
-	db 29,COTTON_SPORE
-	db 36,MEGA_DRAIN
+	db 5, TAIL_WHIP
+	db 10, TACKLE
+	db 13, POISONPOWDER
+	db 15, STUN_SPORE
+	db 17, SLEEP_POWDER
+	db 22, LEECH_SEED
+	db 29, COTTON_SPORE
+	db 36, MEGA_DRAIN
 	db 0 ; no more level-up moves
 
 JumpluffEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SPLASH
-	db 1,SYNTHESIS
-	db 1,TAIL_WHIP
-	db 1,TACKLE
+	db 1, SPLASH
+	db 1, SYNTHESIS
+	db 1, TAIL_WHIP
+	db 1, TACKLE
 if _CRYSTAL
-	db 5,SYNTHESIS
+	db 5, SYNTHESIS
 endc
-	db 5,TAIL_WHIP
-	db 10,TACKLE
-	db 13,POISONPOWDER
-	db 15,STUN_SPORE
-	db 17,SLEEP_POWDER
-	db 22,LEECH_SEED
-	db 33,COTTON_SPORE
-	db 44,MEGA_DRAIN
+	db 5, TAIL_WHIP
+	db 10, TACKLE
+	db 13, POISONPOWDER
+	db 15, STUN_SPORE
+	db 17, SLEEP_POWDER
+	db 22, LEECH_SEED
+	db 33, COTTON_SPORE
+	db 44, MEGA_DRAIN
 	db 0 ; no more level-up moves
 
 AipomEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,TAIL_WHIP
-	db 6,SAND_ATTACK
-	db 12,BATON_PASS
-	db 19,FURY_SWIPES
-	db 27,SWIFT
-	db 36,SCREECH
-	db 46,AGILITY
+	db 1, SCRATCH
+	db 1, TAIL_WHIP
+	db 6, SAND_ATTACK
+	db 12, BATON_PASS
+	db 19, FURY_SWIPES
+	db 27, SWIFT
+	db 36, SCREECH
+	db 46, AGILITY
 	db 0 ; no more level-up moves
 
 SunkernEvosAttacks:
-	db EVOLVE_ITEM,SUN_STONE,SUNFLORA
+	db EVOLVE_ITEM, SUN_STONE, SUNFLORA
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 4,GROWTH
-	db 10,MEGA_DRAIN
-	db 19,SUNNY_DAY
-	db 31,SYNTHESIS
-	db 46,GIGA_DRAIN
+	db 1, ABSORB
+	db 4, GROWTH
+	db 10, MEGA_DRAIN
+	db 19, SUNNY_DAY
+	db 31, SYNTHESIS
+	db 46, GIGA_DRAIN
 	db 0 ; no more level-up moves
 
 SunfloraEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ABSORB
-	db 1,POUND
-	db 4,GROWTH
-	db 10,RAZOR_LEAF
-	db 19,SUNNY_DAY
-	db 31,PETAL_DANCE
-	db 46,SOLARBEAM
+	db 1, ABSORB
+	db 1, POUND
+	db 4, GROWTH
+	db 10, RAZOR_LEAF
+	db 19, SUNNY_DAY
+	db 31, PETAL_DANCE
+	db 46, SOLARBEAM
 	db 0 ; no more level-up moves
 
 YanmaEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,FORESIGHT
-	db 7,QUICK_ATTACK
-	db 13,DOUBLE_TEAM
-	db 19,SONICBOOM
-	db 25,DETECT
-	db 31,SUPERSONIC
+	db 1, TACKLE
+	db 1, FORESIGHT
+	db 7, QUICK_ATTACK
+	db 13, DOUBLE_TEAM
+	db 19, SONICBOOM
+	db 25, DETECT
+	db 31, SUPERSONIC
 if _CRYSTAL
-	db 37,WING_ATTACK
+	db 37, WING_ATTACK
 else
-	db 37,SWIFT
+	db 37, SWIFT
 endc
-	db 43,SCREECH
+	db 43, SCREECH
 	db 0 ; no more level-up moves
 
 WooperEvosAttacks:
-	db EVOLVE_LEVEL,20,QUAGSIRE
+	db EVOLVE_LEVEL, 20, QUAGSIRE
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 1,TAIL_WHIP
-	db 11,SLAM
-	db 21,AMNESIA
-	db 31,EARTHQUAKE
-	db 41,RAIN_DANCE
-	db 51,MIST
-	db 51,HAZE
+	db 1, WATER_GUN
+	db 1, TAIL_WHIP
+	db 11, SLAM
+	db 21, AMNESIA
+	db 31, EARTHQUAKE
+	db 41, RAIN_DANCE
+	db 51, MIST
+	db 51, HAZE
 	db 0 ; no more level-up moves
 
 QuagsireEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 1,TAIL_WHIP
-	db 11,SLAM
-	db 23,AMNESIA
-	db 35,EARTHQUAKE
-	db 47,RAIN_DANCE
-	db 59,MIST
-	db 59,HAZE
+	db 1, WATER_GUN
+	db 1, TAIL_WHIP
+	db 11, SLAM
+	db 23, AMNESIA
+	db 35, EARTHQUAKE
+	db 47, RAIN_DANCE
+	db 59, MIST
+	db 59, HAZE
 	db 0 ; no more level-up moves
 
 EspeonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,CONFUSION
-	db 23,QUICK_ATTACK
-	db 30,SWIFT
-	db 36,PSYBEAM
-	db 42,PSYCH_UP
-	db 47,PSYCHIC_M
-	db 52,MORNING_SUN
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, CONFUSION
+	db 23, QUICK_ATTACK
+	db 30, SWIFT
+	db 36, PSYBEAM
+	db 42, PSYCH_UP
+	db 47, PSYCHIC_M
+	db 52, MORNING_SUN
 	db 0 ; no more level-up moves
 
 UmbreonEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,TAIL_WHIP
-	db 8,SAND_ATTACK
-	db 16,PURSUIT
-	db 23,QUICK_ATTACK
-	db 30,CONFUSE_RAY
-	db 36,FAINT_ATTACK
-	db 42,MEAN_LOOK
-	db 47,SCREECH
-	db 52,MOONLIGHT
+	db 1, TACKLE
+	db 1, TAIL_WHIP
+	db 8, SAND_ATTACK
+	db 16, PURSUIT
+	db 23, QUICK_ATTACK
+	db 30, CONFUSE_RAY
+	db 36, FAINT_ATTACK
+	db 42, MEAN_LOOK
+	db 47, SCREECH
+	db 52, MOONLIGHT
 	db 0 ; no more level-up moves
 
 MurkrowEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PECK
-	db 11,PURSUIT
-	db 16,HAZE
-	db 26,NIGHT_SHADE
-	db 31,FAINT_ATTACK
-	db 41,MEAN_LOOK
+	db 1, PECK
+	db 11, PURSUIT
+	db 16, HAZE
+	db 26, NIGHT_SHADE
+	db 31, FAINT_ATTACK
+	db 41, MEAN_LOOK
 	db 0 ; no more level-up moves
 
 SlowkingEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CURSE
-	db 1,TACKLE
-	db 6,GROWL
-	db 15,WATER_GUN
-	db 20,CONFUSION
-	db 29,DISABLE
-	db 34,HEADBUTT
-	db 43,SWAGGER
-	db 48,PSYCHIC_M
+	db 1, CURSE
+	db 1, TACKLE
+	db 6, GROWL
+	db 15, WATER_GUN
+	db 20, CONFUSION
+	db 29, DISABLE
+	db 34, HEADBUTT
+	db 43, SWAGGER
+	db 48, PSYCHIC_M
 	db 0 ; no more level-up moves
 
 MisdreavusEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,GROWL
-	db 1,PSYWAVE
-	db 6,SPITE
-	db 12,CONFUSE_RAY
-	db 19,MEAN_LOOK
-	db 27,PSYBEAM
-	db 36,PAIN_SPLIT
-	db 46,PERISH_SONG
+	db 1, GROWL
+	db 1, PSYWAVE
+	db 6, SPITE
+	db 12, CONFUSE_RAY
+	db 19, MEAN_LOOK
+	db 27, PSYBEAM
+	db 36, PAIN_SPLIT
+	db 46, PERISH_SONG
 	db 0 ; no more level-up moves
 
 UnownEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HIDDEN_POWER
+	db 1, HIDDEN_POWER
 	db 0 ; no more level-up moves
 
 WobbuffetEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,COUNTER
-	db 1,MIRROR_COAT
-	db 1,SAFEGUARD
-	db 1,DESTINY_BOND
+	db 1, COUNTER
+	db 1, MIRROR_COAT
+	db 1, SAFEGUARD
+	db 1, DESTINY_BOND
 	db 0 ; no more level-up moves
 
 GirafarigEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 1,CONFUSION
-	db 1,STOMP
-	db 7,CONFUSION
-	db 13,STOMP
-	db 20,AGILITY
-	db 30,BATON_PASS
-	db 41,PSYBEAM
-	db 54,CRUNCH
+	db 1, TACKLE
+	db 1, GROWL
+	db 1, CONFUSION
+	db 1, STOMP
+	db 7, CONFUSION
+	db 13, STOMP
+	db 20, AGILITY
+	db 30, BATON_PASS
+	db 41, PSYBEAM
+	db 54, CRUNCH
 	db 0 ; no more level-up moves
 
 PinecoEvosAttacks:
-	db EVOLVE_LEVEL,31,FORRETRESS
+	db EVOLVE_LEVEL, 31, FORRETRESS
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,PROTECT
-	db 8,SELFDESTRUCT
-	db 15,TAKE_DOWN
-	db 22,RAPID_SPIN
-	db 29,BIDE
-	db 36,EXPLOSION
-	db 43,SPIKES
-	db 50,DOUBLE_EDGE
+	db 1, TACKLE
+	db 1, PROTECT
+	db 8, SELFDESTRUCT
+	db 15, TAKE_DOWN
+	db 22, RAPID_SPIN
+	db 29, BIDE
+	db 36, EXPLOSION
+	db 43, SPIKES
+	db 50, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 ForretressEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,PROTECT
-	db 1,SELFDESTRUCT
-	db 8,SELFDESTRUCT
-	db 15,TAKE_DOWN
-	db 22,RAPID_SPIN
-	db 29,BIDE
-	db 39,EXPLOSION
-	db 49,SPIKES
-	db 59,DOUBLE_EDGE
+	db 1, TACKLE
+	db 1, PROTECT
+	db 1, SELFDESTRUCT
+	db 8, SELFDESTRUCT
+	db 15, TAKE_DOWN
+	db 22, RAPID_SPIN
+	db 29, BIDE
+	db 39, EXPLOSION
+	db 49, SPIKES
+	db 59, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 DunsparceEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,RAGE
-	db 5,DEFENSE_CURL
-	db 13,GLARE
-	db 18,SPITE
-	db 26,PURSUIT
-	db 30,SCREECH
-	db 38,TAKE_DOWN
+	db 1, RAGE
+	db 5, DEFENSE_CURL
+	db 13, GLARE
+	db 18, SPITE
+	db 26, PURSUIT
+	db 30, SCREECH
+	db 38, TAKE_DOWN
 	db 0 ; no more level-up moves
 
 GligarEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POISON_STING
-	db 6,SAND_ATTACK
-	db 13,HARDEN
-	db 20,QUICK_ATTACK
-	db 28,FAINT_ATTACK
-	db 36,SLASH
-	db 44,SCREECH
-	db 52,GUILLOTINE
+	db 1, POISON_STING
+	db 6, SAND_ATTACK
+	db 13, HARDEN
+	db 20, QUICK_ATTACK
+	db 28, FAINT_ATTACK
+	db 36, SLASH
+	db 44, SCREECH
+	db 52, GUILLOTINE
 	db 0 ; no more level-up moves
 
 SteelixEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCREECH
-	db 10,BIND
-	db 14,ROCK_THROW
-	db 23,HARDEN
-	db 27,RAGE
-	db 36,SANDSTORM
-	db 40,SLAM
-	db 49,CRUNCH
+	db 1, TACKLE
+	db 1, SCREECH
+	db 10, BIND
+	db 14, ROCK_THROW
+	db 23, HARDEN
+	db 27, RAGE
+	db 36, SANDSTORM
+	db 40, SLAM
+	db 49, CRUNCH
 	db 0 ; no more level-up moves
 
 SnubbullEvosAttacks:
-	db EVOLVE_LEVEL,23,GRANBULL
+	db EVOLVE_LEVEL, 23, GRANBULL
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCARY_FACE
-	db 4,TAIL_WHIP
-	db 8,CHARM
-	db 13,BITE
-	db 19,LICK
-	db 26,ROAR
-	db 34,RAGE
-	db 43,TAKE_DOWN
+	db 1, TACKLE
+	db 1, SCARY_FACE
+	db 4, TAIL_WHIP
+	db 8, CHARM
+	db 13, BITE
+	db 19, LICK
+	db 26, ROAR
+	db 34, RAGE
+	db 43, TAKE_DOWN
 	db 0 ; no more level-up moves
 
 GranbullEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,SCARY_FACE
-	db 4,TAIL_WHIP
-	db 8,CHARM
-	db 13,BITE
-	db 19,LICK
-	db 28,ROAR
-	db 38,RAGE
-	db 51,TAKE_DOWN
+	db 1, TACKLE
+	db 1, SCARY_FACE
+	db 4, TAIL_WHIP
+	db 8, CHARM
+	db 13, BITE
+	db 19, LICK
+	db 28, ROAR
+	db 38, RAGE
+	db 51, TAKE_DOWN
 	db 0 ; no more level-up moves
 
 QwilfishEvosAttacks:
 	db 0 ; no more evolutions
 if _CRYSTAL
-	db 1,SPIKES
+	db 1, SPIKES
 endc
-	db 1,TACKLE
-	db 1,POISON_STING
-	db 10,HARDEN
-	db 10,MINIMIZE
-	db 19,WATER_GUN
-	db 28,PIN_MISSILE
-	db 37,TAKE_DOWN
-	db 46,HYDRO_PUMP
+	db 1, TACKLE
+	db 1, POISON_STING
+	db 10, HARDEN
+	db 10, MINIMIZE
+	db 19, WATER_GUN
+	db 28, PIN_MISSILE
+	db 37, TAKE_DOWN
+	db 46, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 ScizorEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,QUICK_ATTACK
-	db 1,LEER
-	db 6,FOCUS_ENERGY
-	db 12,PURSUIT
-	db 18,FALSE_SWIPE
-	db 24,AGILITY
-	db 30,METAL_CLAW
-	db 36,SLASH
-	db 42,SWORDS_DANCE
-	db 48,DOUBLE_TEAM
+	db 1, QUICK_ATTACK
+	db 1, LEER
+	db 6, FOCUS_ENERGY
+	db 12, PURSUIT
+	db 18, FALSE_SWIPE
+	db 24, AGILITY
+	db 30, METAL_CLAW
+	db 36, SLASH
+	db 42, SWORDS_DANCE
+	db 48, DOUBLE_TEAM
 	db 0 ; no more level-up moves
 
 ShuckleEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONSTRICT
-	db 1,WITHDRAW
-	db 9,WRAP
-	db 14,ENCORE
-	db 23,SAFEGUARD
-	db 28,BIDE
-	db 37,REST
+	db 1, CONSTRICT
+	db 1, WITHDRAW
+	db 9, WRAP
+	db 14, ENCORE
+	db 23, SAFEGUARD
+	db 28, BIDE
+	db 37, REST
 	db 0 ; no more level-up moves
 
 HeracrossEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,LEER
-	db 6,HORN_ATTACK
-	db 12,ENDURE
-	db 19,FURY_ATTACK
-	db 27,COUNTER
-	db 35,TAKE_DOWN
-	db 44,REVERSAL
-	db 54,MEGAHORN
+	db 1, TACKLE
+	db 1, LEER
+	db 6, HORN_ATTACK
+	db 12, ENDURE
+	db 19, FURY_ATTACK
+	db 27, COUNTER
+	db 35, TAKE_DOWN
+	db 44, REVERSAL
+	db 54, MEGAHORN
 	db 0 ; no more level-up moves
 
 SneaselEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 9,QUICK_ATTACK
-	db 17,SCREECH
-	db 25,FAINT_ATTACK
-	db 33,FURY_SWIPES
-	db 41,AGILITY
-	db 49,SLASH
-	db 57,BEAT_UP
+	db 1, SCRATCH
+	db 1, LEER
+	db 9, QUICK_ATTACK
+	db 17, SCREECH
+	db 25, FAINT_ATTACK
+	db 33, FURY_SWIPES
+	db 41, AGILITY
+	db 49, SLASH
+	db 57, BEAT_UP
 if _CRYSTAL
-	db 65,METAL_CLAW
+	db 65, METAL_CLAW
 endc
 	db 0 ; no more level-up moves
 
 TeddiursaEvosAttacks:
-	db EVOLVE_LEVEL,30,URSARING
+	db EVOLVE_LEVEL, 30, URSARING
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 8,LICK
-	db 15,FURY_SWIPES
-	db 22,FAINT_ATTACK
-	db 29,REST
-	db 36,SLASH
-	db 43,SNORE
-	db 50,THRASH
+	db 1, SCRATCH
+	db 1, LEER
+	db 8, LICK
+	db 15, FURY_SWIPES
+	db 22, FAINT_ATTACK
+	db 29, REST
+	db 36, SLASH
+	db 43, SNORE
+	db 50, THRASH
 	db 0 ; no more level-up moves
 
 UrsaringEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SCRATCH
-	db 1,LEER
-	db 1,LICK
-	db 1,FURY_SWIPES
-	db 8,LICK
-	db 15,FURY_SWIPES
-	db 22,FAINT_ATTACK
-	db 29,REST
-	db 39,SLASH
-	db 49,SNORE
-	db 59,THRASH
+	db 1, SCRATCH
+	db 1, LEER
+	db 1, LICK
+	db 1, FURY_SWIPES
+	db 8, LICK
+	db 15, FURY_SWIPES
+	db 22, FAINT_ATTACK
+	db 29, REST
+	db 39, SLASH
+	db 49, SNORE
+	db 59, THRASH
 	db 0 ; no more level-up moves
 
 SlugmaEvosAttacks:
-	db EVOLVE_LEVEL,38,MAGCARGO
+	db EVOLVE_LEVEL, 38, MAGCARGO
 	db 0 ; no more evolutions
-	db 1,SMOG
-	db 8,EMBER
-	db 15,ROCK_THROW
-	db 22,HARDEN
-	db 29,AMNESIA
-	db 36,FLAMETHROWER
-	db 43,ROCK_SLIDE
-	db 50,BODY_SLAM
+	db 1, SMOG
+	db 8, EMBER
+	db 15, ROCK_THROW
+	db 22, HARDEN
+	db 29, AMNESIA
+	db 36, FLAMETHROWER
+	db 43, ROCK_SLIDE
+	db 50, BODY_SLAM
 	db 0 ; no more level-up moves
 
 MagcargoEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SMOG
-	db 1,EMBER
-	db 1,ROCK_THROW
-	db 8,EMBER
-	db 15,ROCK_THROW
-	db 22,HARDEN
-	db 29,AMNESIA
-	db 36,FLAMETHROWER
-	db 48,ROCK_SLIDE
-	db 60,BODY_SLAM
+	db 1, SMOG
+	db 1, EMBER
+	db 1, ROCK_THROW
+	db 8, EMBER
+	db 15, ROCK_THROW
+	db 22, HARDEN
+	db 29, AMNESIA
+	db 36, FLAMETHROWER
+	db 48, ROCK_SLIDE
+	db 60, BODY_SLAM
 	db 0 ; no more level-up moves
 
 SwinubEvosAttacks:
-	db EVOLVE_LEVEL,33,PILOSWINE
+	db EVOLVE_LEVEL, 33, PILOSWINE
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 10,POWDER_SNOW
-	db 19,ENDURE
-	db 28,TAKE_DOWN
-	db 37,MIST
-	db 46,BLIZZARD
+	db 1, TACKLE
+	db 10, POWDER_SNOW
+	db 19, ENDURE
+	db 28, TAKE_DOWN
+	db 37, MIST
+	db 46, BLIZZARD
 if _CRYSTAL
-	db 55,AMNESIA
+	db 55, AMNESIA
 endc
 	db 0 ; no more level-up moves
 
 PiloswineEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HORN_ATTACK
-	db 1,POWDER_SNOW
-	db 1,ENDURE
-	db 10,POWDER_SNOW
-	db 19,ENDURE
-	db 28,TAKE_DOWN
-	db 33,FURY_ATTACK
-	db 42,MIST
-	db 56,BLIZZARD
+	db 1, HORN_ATTACK
+	db 1, POWDER_SNOW
+	db 1, ENDURE
+	db 10, POWDER_SNOW
+	db 19, ENDURE
+	db 28, TAKE_DOWN
+	db 33, FURY_ATTACK
+	db 42, MIST
+	db 56, BLIZZARD
 if _CRYSTAL
-	db 70,AMNESIA
+	db 70, AMNESIA
 endc
 	db 0 ; no more level-up moves
 
 CorsolaEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 7,HARDEN
-	db 13,BUBBLE
-	db 19,RECOVER
-	db 25,BUBBLEBEAM
-	db 31,SPIKE_CANNON
-	db 37,MIRROR_COAT
-	db 43,ANCIENTPOWER
+	db 1, TACKLE
+	db 7, HARDEN
+	db 13, BUBBLE
+	db 19, RECOVER
+	db 25, BUBBLEBEAM
+	db 31, SPIKE_CANNON
+	db 37, MIRROR_COAT
+	db 43, ANCIENTPOWER
 	db 0 ; no more level-up moves
 
 RemoraidEvosAttacks:
-	db EVOLVE_LEVEL,25,OCTILLERY
+	db EVOLVE_LEVEL, 25, OCTILLERY
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 11,LOCK_ON
-	db 22,PSYBEAM
-	db 22,AURORA_BEAM
-	db 22,BUBBLEBEAM
-	db 33,FOCUS_ENERGY
-	db 44,ICE_BEAM
-	db 55,HYPER_BEAM
+	db 1, WATER_GUN
+	db 11, LOCK_ON
+	db 22, PSYBEAM
+	db 22, AURORA_BEAM
+	db 22, BUBBLEBEAM
+	db 33, FOCUS_ENERGY
+	db 44, ICE_BEAM
+	db 55, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 OctilleryEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,WATER_GUN
-	db 11,CONSTRICT
-	db 22,PSYBEAM
-	db 22,AURORA_BEAM
-	db 22,BUBBLEBEAM
-	db 25,OCTAZOOKA
-	db 38,FOCUS_ENERGY
-	db 54,ICE_BEAM
-	db 70,HYPER_BEAM
+	db 1, WATER_GUN
+	db 11, CONSTRICT
+	db 22, PSYBEAM
+	db 22, AURORA_BEAM
+	db 22, BUBBLEBEAM
+	db 25, OCTAZOOKA
+	db 38, FOCUS_ENERGY
+	db 54, ICE_BEAM
+	db 70, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 DelibirdEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,PRESENT
+	db 1, PRESENT
 	db 0 ; no more level-up moves
 
 MantineEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,BUBBLE
-	db 10,SUPERSONIC
-	db 18,BUBBLEBEAM
-	db 25,TAKE_DOWN
-	db 32,AGILITY
-	db 40,WING_ATTACK
-	db 49,CONFUSE_RAY
+	db 1, TACKLE
+	db 1, BUBBLE
+	db 10, SUPERSONIC
+	db 18, BUBBLEBEAM
+	db 25, TAKE_DOWN
+	db 32, AGILITY
+	db 40, WING_ATTACK
+	db 49, CONFUSE_RAY
 	db 0 ; no more level-up moves
 
 SkarmoryEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,LEER
-	db 1,PECK
-	db 13,SAND_ATTACK
-	db 19,SWIFT
-	db 25,AGILITY
-	db 37,FURY_ATTACK
-	db 49,STEEL_WING
+	db 1, LEER
+	db 1, PECK
+	db 13, SAND_ATTACK
+	db 19, SWIFT
+	db 25, AGILITY
+	db 37, FURY_ATTACK
+	db 49, STEEL_WING
 	db 0 ; no more level-up moves
 
 HoundourEvosAttacks:
-	db EVOLVE_LEVEL,24,HOUNDOOM
+	db EVOLVE_LEVEL, 24, HOUNDOOM
 	db 0 ; no more evolutions
-	db 1,LEER
-	db 1,EMBER
-	db 7,ROAR
-	db 13,SMOG
-	db 20,BITE
-	db 27,FAINT_ATTACK
-	db 35,FLAMETHROWER
-	db 43,CRUNCH
+	db 1, LEER
+	db 1, EMBER
+	db 7, ROAR
+	db 13, SMOG
+	db 20, BITE
+	db 27, FAINT_ATTACK
+	db 35, FLAMETHROWER
+	db 43, CRUNCH
 	db 0 ; no more level-up moves
 
 HoundoomEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,LEER
-	db 1,EMBER
-	db 7,ROAR
-	db 13,SMOG
-	db 20,BITE
-	db 30,FAINT_ATTACK
-	db 41,FLAMETHROWER
-	db 52,CRUNCH
+	db 1, LEER
+	db 1, EMBER
+	db 7, ROAR
+	db 13, SMOG
+	db 20, BITE
+	db 30, FAINT_ATTACK
+	db 41, FLAMETHROWER
+	db 52, CRUNCH
 	db 0 ; no more level-up moves
 
 KingdraEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BUBBLE
-	db 1,SMOKESCREEN
-	db 1,LEER
-	db 1,WATER_GUN
-	db 8,SMOKESCREEN
-	db 15,LEER
-	db 22,WATER_GUN
-	db 29,TWISTER
-	db 40,AGILITY
-	db 51,HYDRO_PUMP
+	db 1, BUBBLE
+	db 1, SMOKESCREEN
+	db 1, LEER
+	db 1, WATER_GUN
+	db 8, SMOKESCREEN
+	db 15, LEER
+	db 22, WATER_GUN
+	db 29, TWISTER
+	db 40, AGILITY
+	db 51, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 PhanpyEvosAttacks:
-	db EVOLVE_LEVEL,25,DONPHAN
+	db EVOLVE_LEVEL, 25, DONPHAN
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 1,GROWL
-	db 9,DEFENSE_CURL
-	db 17,FLAIL
-	db 25,TAKE_DOWN
-	db 33,ROLLOUT
-	db 41,ENDURE
-	db 49,DOUBLE_EDGE
+	db 1, TACKLE
+	db 1, GROWL
+	db 9, DEFENSE_CURL
+	db 17, FLAIL
+	db 25, TAKE_DOWN
+	db 33, ROLLOUT
+	db 41, ENDURE
+	db 49, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 DonphanEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,HORN_ATTACK
-	db 1,GROWL
-	db 9,DEFENSE_CURL
-	db 17,FLAIL
-	db 25,FURY_ATTACK
-	db 33,ROLLOUT
-	db 41,RAPID_SPIN
-	db 49,EARTHQUAKE
+	db 1, HORN_ATTACK
+	db 1, GROWL
+	db 9, DEFENSE_CURL
+	db 17, FLAIL
+	db 25, FURY_ATTACK
+	db 33, ROLLOUT
+	db 41, RAPID_SPIN
+	db 49, EARTHQUAKE
 	db 0 ; no more level-up moves
 
 Porygon2EvosAttacks:
 	db 0 ; no more evolutions
-	db 1,CONVERSION2
-	db 1,TACKLE
-	db 1,CONVERSION
-	db 9,AGILITY
-	db 12,PSYBEAM
-	db 20,RECOVER
-	db 24,DEFENSE_CURL
-	db 32,LOCK_ON
-	db 36,TRI_ATTACK
-	db 44,ZAP_CANNON
+	db 1, CONVERSION2
+	db 1, TACKLE
+	db 1, CONVERSION
+	db 9, AGILITY
+	db 12, PSYBEAM
+	db 20, RECOVER
+	db 24, DEFENSE_CURL
+	db 32, LOCK_ON
+	db 36, TRI_ATTACK
+	db 44, ZAP_CANNON
 	db 0 ; no more level-up moves
 
 StantlerEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 8,LEER
-	db 15,HYPNOSIS
-	db 23,STOMP
-	db 31,SAND_ATTACK
-	db 40,TAKE_DOWN
-	db 49,CONFUSE_RAY
+	db 1, TACKLE
+	db 8, LEER
+	db 15, HYPNOSIS
+	db 23, STOMP
+	db 31, SAND_ATTACK
+	db 40, TAKE_DOWN
+	db 49, CONFUSE_RAY
 	db 0 ; no more level-up moves
 
 SmeargleEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SKETCH
-	db 11,SKETCH
-	db 21,SKETCH
-	db 31,SKETCH
-	db 41,SKETCH
-	db 51,SKETCH
-	db 61,SKETCH
-	db 71,SKETCH
-	db 81,SKETCH
-	db 91,SKETCH
+	db 1, SKETCH
+	db 11, SKETCH
+	db 21, SKETCH
+	db 31, SKETCH
+	db 41, SKETCH
+	db 51, SKETCH
+	db 61, SKETCH
+	db 71, SKETCH
+	db 81, SKETCH
+	db 91, SKETCH
 	db 0 ; no more level-up moves
 
 TyrogueEvosAttacks:
-	db EVOLVE_STAT,20,ATK_LT_DEF,HITMONCHAN
-	db EVOLVE_STAT,20,ATK_GT_DEF,HITMONLEE
-	db EVOLVE_STAT,20,ATK_EQ_DEF,HITMONTOP
+	db EVOLVE_STAT, 20, ATK_LT_DEF, HITMONCHAN
+	db EVOLVE_STAT, 20, ATK_GT_DEF, HITMONLEE
+	db EVOLVE_STAT, 20, ATK_EQ_DEF, HITMONTOP
 	db 0 ; no more evolutions
-	db 1,TACKLE
+	db 1, TACKLE
 	db 0 ; no more level-up moves
 
 HitmontopEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,ROLLING_KICK
-	db 7,FOCUS_ENERGY
-	db 13,PURSUIT
-	db 19,QUICK_ATTACK
-	db 25,RAPID_SPIN
-	db 31,COUNTER
-	db 37,AGILITY
-	db 43,DETECT
-	db 49,TRIPLE_KICK
+	db 1, ROLLING_KICK
+	db 7, FOCUS_ENERGY
+	db 13, PURSUIT
+	db 19, QUICK_ATTACK
+	db 25, RAPID_SPIN
+	db 31, COUNTER
+	db 37, AGILITY
+	db 43, DETECT
+	db 49, TRIPLE_KICK
 	db 0 ; no more level-up moves
 
 SmoochumEvosAttacks:
-	db EVOLVE_LEVEL,30,JYNX
+	db EVOLVE_LEVEL, 30, JYNX
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 1,LICK
-	db 9,SWEET_KISS
-	db 13,POWDER_SNOW
-	db 21,CONFUSION
-	db 25,SING
-	db 33,MEAN_LOOK
-	db 37,PSYCHIC_M
-	db 45,PERISH_SONG
-	db 49,BLIZZARD
+	db 1, POUND
+	db 1, LICK
+	db 9, SWEET_KISS
+	db 13, POWDER_SNOW
+	db 21, CONFUSION
+	db 25, SING
+	db 33, MEAN_LOOK
+	db 37, PSYCHIC_M
+	db 45, PERISH_SONG
+	db 49, BLIZZARD
 	db 0 ; no more level-up moves
 
 ElekidEvosAttacks:
-	db EVOLVE_LEVEL,30,ELECTABUZZ
+	db EVOLVE_LEVEL, 30, ELECTABUZZ
 	db 0 ; no more evolutions
-	db 1,QUICK_ATTACK
-	db 1,LEER
-	db 9,THUNDERPUNCH
-	db 17,LIGHT_SCREEN
-	db 25,SWIFT
-	db 33,SCREECH
-	db 41,THUNDERBOLT
-	db 49,THUNDER
+	db 1, QUICK_ATTACK
+	db 1, LEER
+	db 9, THUNDERPUNCH
+	db 17, LIGHT_SCREEN
+	db 25, SWIFT
+	db 33, SCREECH
+	db 41, THUNDERBOLT
+	db 49, THUNDER
 	db 0 ; no more level-up moves
 
 MagbyEvosAttacks:
-	db EVOLVE_LEVEL,30,MAGMAR
+	db EVOLVE_LEVEL, 30, MAGMAR
 	db 0 ; no more evolutions
-	db 1,EMBER
-	db 7,LEER
-	db 13,SMOG
-	db 19,FIRE_PUNCH
-	db 25,SMOKESCREEN
-	db 31,SUNNY_DAY
-	db 37,FLAMETHROWER
-	db 43,CONFUSE_RAY
-	db 49,FIRE_BLAST
+	db 1, EMBER
+	db 7, LEER
+	db 13, SMOG
+	db 19, FIRE_PUNCH
+	db 25, SMOKESCREEN
+	db 31, SUNNY_DAY
+	db 37, FLAMETHROWER
+	db 43, CONFUSE_RAY
+	db 49, FIRE_BLAST
 	db 0 ; no more level-up moves
 
 MiltankEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,TACKLE
-	db 4,GROWL
-	db 8,DEFENSE_CURL
-	db 13,STOMP
-	db 19,MILK_DRINK
-	db 26,BIDE
-	db 34,ROLLOUT
-	db 43,BODY_SLAM
-	db 53,HEAL_BELL
+	db 1, TACKLE
+	db 4, GROWL
+	db 8, DEFENSE_CURL
+	db 13, STOMP
+	db 19, MILK_DRINK
+	db 26, BIDE
+	db 34, ROLLOUT
+	db 43, BODY_SLAM
+	db 53, HEAL_BELL
 	db 0 ; no more level-up moves
 
 BlisseyEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,POUND
-	db 4,GROWL
-	db 7,TAIL_WHIP
-	db 10,SOFTBOILED
-	db 13,DOUBLESLAP
-	db 18,MINIMIZE
-	db 23,SING
-	db 28,EGG_BOMB
-	db 33,DEFENSE_CURL
-	db 40,LIGHT_SCREEN
-	db 47,DOUBLE_EDGE
+	db 1, POUND
+	db 4, GROWL
+	db 7, TAIL_WHIP
+	db 10, SOFTBOILED
+	db 13, DOUBLESLAP
+	db 18, MINIMIZE
+	db 23, SING
+	db 28, EGG_BOMB
+	db 33, DEFENSE_CURL
+	db 40, LIGHT_SCREEN
+	db 47, DOUBLE_EDGE
 	db 0 ; no more level-up moves
 
 RaikouEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
-	db 11,THUNDERSHOCK
-	db 21,ROAR
-	db 31,QUICK_ATTACK
-	db 41,SPARK
-	db 51,REFLECT
-	db 61,CRUNCH
-	db 71,THUNDER
+	db 1, BITE
+	db 1, LEER
+	db 11, THUNDERSHOCK
+	db 21, ROAR
+	db 31, QUICK_ATTACK
+	db 41, SPARK
+	db 51, REFLECT
+	db 61, CRUNCH
+	db 71, THUNDER
 	db 0 ; no more level-up moves
 
 EnteiEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
-	db 11,EMBER
-	db 21,ROAR
-	db 31,FIRE_SPIN
-	db 41,STOMP
-	db 51,FLAMETHROWER
-	db 61,SWAGGER
-	db 71,FIRE_BLAST
+	db 1, BITE
+	db 1, LEER
+	db 11, EMBER
+	db 21, ROAR
+	db 31, FIRE_SPIN
+	db 41, STOMP
+	db 51, FLAMETHROWER
+	db 61, SWAGGER
+	db 71, FIRE_BLAST
 	db 0 ; no more level-up moves
 
 SuicuneEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
+	db 1, BITE
+	db 1, LEER
 if _CRYSTAL
-	db 11,BUBBLEBEAM
-	db 21,RAIN_DANCE
-	db 31,GUST
-	db 41,AURORA_BEAM
+	db 11, BUBBLEBEAM
+	db 21, RAIN_DANCE
+	db 31, GUST
+	db 41, AURORA_BEAM
 else
-	db 11,WATER_GUN
-	db 21,ROAR
-	db 31,GUST
-	db 41,BUBBLEBEAM
+	db 11, WATER_GUN
+	db 21, ROAR
+	db 31, GUST
+	db 41, BUBBLEBEAM
 endc
-	db 51,MIST
-	db 61,MIRROR_COAT
-	db 71,HYDRO_PUMP
+	db 51, MIST
+	db 61, MIRROR_COAT
+	db 71, HYDRO_PUMP
 	db 0 ; no more level-up moves
 
 LarvitarEvosAttacks:
-	db EVOLVE_LEVEL,30,PUPITAR
+	db EVOLVE_LEVEL, 30, PUPITAR
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
-	db 8,SANDSTORM
-	db 15,SCREECH
-	db 22,ROCK_SLIDE
-	db 29,THRASH
-	db 36,SCARY_FACE
-	db 43,CRUNCH
-	db 50,EARTHQUAKE
-	db 57,HYPER_BEAM
+	db 1, BITE
+	db 1, LEER
+	db 8, SANDSTORM
+	db 15, SCREECH
+	db 22, ROCK_SLIDE
+	db 29, THRASH
+	db 36, SCARY_FACE
+	db 43, CRUNCH
+	db 50, EARTHQUAKE
+	db 57, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 PupitarEvosAttacks:
-	db EVOLVE_LEVEL,55,TYRANITAR
+	db EVOLVE_LEVEL, 55, TYRANITAR
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
-	db 1,SANDSTORM
-	db 1,SCREECH
-	db 8,SANDSTORM
-	db 15,SCREECH
-	db 22,ROCK_SLIDE
-	db 29,THRASH
-	db 38,SCARY_FACE
-	db 47,CRUNCH
-	db 56,EARTHQUAKE
-	db 65,HYPER_BEAM
+	db 1, BITE
+	db 1, LEER
+	db 1, SANDSTORM
+	db 1, SCREECH
+	db 8, SANDSTORM
+	db 15, SCREECH
+	db 22, ROCK_SLIDE
+	db 29, THRASH
+	db 38, SCARY_FACE
+	db 47, CRUNCH
+	db 56, EARTHQUAKE
+	db 65, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 TyranitarEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,BITE
-	db 1,LEER
-	db 1,SANDSTORM
-	db 1,SCREECH
-	db 8,SANDSTORM
-	db 15,SCREECH
-	db 22,ROCK_SLIDE
-	db 29,THRASH
-	db 38,SCARY_FACE
-	db 47,CRUNCH
-	db 61,EARTHQUAKE
-	db 75,HYPER_BEAM
+	db 1, BITE
+	db 1, LEER
+	db 1, SANDSTORM
+	db 1, SCREECH
+	db 8, SANDSTORM
+	db 15, SCREECH
+	db 22, ROCK_SLIDE
+	db 29, THRASH
+	db 38, SCARY_FACE
+	db 47, CRUNCH
+	db 61, EARTHQUAKE
+	db 75, HYPER_BEAM
 	db 0 ; no more level-up moves
 
 LugiaEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,AEROBLAST
-	db 11,SAFEGUARD
-	db 22,GUST
-	db 33,RECOVER
-	db 44,HYDRO_PUMP
-	db 55,RAIN_DANCE
-	db 66,SWIFT
-	db 77,WHIRLWIND
-	db 88,ANCIENTPOWER
-	db 99,FUTURE_SIGHT
+	db 1, AEROBLAST
+	db 11, SAFEGUARD
+	db 22, GUST
+	db 33, RECOVER
+	db 44, HYDRO_PUMP
+	db 55, RAIN_DANCE
+	db 66, SWIFT
+	db 77, WHIRLWIND
+	db 88, ANCIENTPOWER
+	db 99, FUTURE_SIGHT
 	db 0 ; no more level-up moves
 
 HoOhEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,SACRED_FIRE
-	db 11,SAFEGUARD
-	db 22,GUST
-	db 33,RECOVER
-	db 44,FIRE_BLAST
-	db 55,SUNNY_DAY
-	db 66,SWIFT
-	db 77,WHIRLWIND
-	db 88,ANCIENTPOWER
-	db 99,FUTURE_SIGHT
+	db 1, SACRED_FIRE
+	db 11, SAFEGUARD
+	db 22, GUST
+	db 33, RECOVER
+	db 44, FIRE_BLAST
+	db 55, SUNNY_DAY
+	db 66, SWIFT
+	db 77, WHIRLWIND
+	db 88, ANCIENTPOWER
+	db 99, FUTURE_SIGHT
 	db 0 ; no more level-up moves
 
 CelebiEvosAttacks:
 	db 0 ; no more evolutions
-	db 1,LEECH_SEED
-	db 1,CONFUSION
-	db 1,RECOVER
-	db 1,HEAL_BELL
-	db 10,SAFEGUARD
-	db 20,ANCIENTPOWER
-	db 30,FUTURE_SIGHT
-	db 40,BATON_PASS
-	db 50,PERISH_SONG
+	db 1, LEECH_SEED
+	db 1, CONFUSION
+	db 1, RECOVER
+	db 1, HEAL_BELL
+	db 10, SAFEGUARD
+	db 20, ANCIENTPOWER
+	db 30, FUTURE_SIGHT
+	db 40, BATON_PASS
+	db 50, PERISH_SONG
 	db 0 ; no more level-up moves
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -44,7 +44,7 @@
 	call AddNTimes
 
 	ld de, OddEggSpecies
-	ld bc, party_struct_length + 2 * PKMN_NAME_LENGTH
+	ld bc, PARTYMON_STRUCT_LENGTH + 2 * PKMN_NAME_LENGTH
 	call CopyBytes
 
 	ld a, EGG_TICKET
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -15,7 +15,7 @@
 .fruit
 	writetext HeyItsFruitText
 	copybytetovar CurFruit
-	giveitem $ff, 1
+	giveitem ITEM_FROM_MEM, 1
 	iffalse .packisfull
 	keeptextopen
 	writetext ObtainedFruitText
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -43,7 +43,7 @@
 	add_predef GiveEgg
 	add_predef Functionc6e0
 	add_predef CalcPkmnStats
-	add_predef Functione17b
+	add_predef CalcPkmnStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
 	add_predef Function28eef ; $ 10
--- a/event/battle_tower.asm
+++ b/event/battle_tower.asm
@@ -302,7 +302,7 @@
 
 .nextmon: ; 8b31a
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	inc de
 	pop bc
--- a/event/dratini.asm
+++ b/event/dratini.asm
@@ -12,7 +12,7 @@
 	call GetNthPartyMon
 	ld a, [bc]
 	ld c, a
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 .CheckForDratini
 ; start at the end of the party and search backwards for a Dratini
 	ld a, [hl]
@@ -59,7 +59,7 @@
 	call GetFarByte
 
 	; get the address of the move's PP and update the PP
-	ld hl, PartyMon1PP - PartyMon1Moves
+	ld hl, (MON_PP) - (MON_MOVES)
 	add hl, de
 	ld [hl], a
 
@@ -100,7 +100,7 @@
 	jr z, .EmptyParty
 	dec a
 	ret z
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 .loop
 	add hl, de
 	dec a
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -16,7 +16,7 @@
 	; Now let's compute its length based on its DVs and ID.
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	push hl
 	ld bc, MON_DVS
--- a/event/move_deleter.asm
+++ b/event/move_deleter.asm
@@ -12,7 +12,7 @@
 	jr z, .asm_2c5bc
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Moves + 1
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	and a
@@ -116,7 +116,7 @@
 	ld hl, PartyMon1Moves
 	add hl, bc
 	ld a, [CurPartyMon]
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	push bc
@@ -145,7 +145,7 @@
 	ld hl, PartyMon1PP
 	add hl, bc
 	ld a, [CurPartyMon]
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	inc b
--- a/event/name_rater.asm
+++ b/event/name_rater.asm
@@ -91,7 +91,7 @@
 	jr c, .nope
 
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld de, PlayerID
--- a/event/poke_seer.asm
+++ b/event/poke_seer.asm
@@ -97,7 +97,7 @@
 ; 4f134
 
 ReadCaughtData: ; 4f134
-	ld a, PartyMon1CaughtData - PartyMon1
+	ld a, MON_CAUGHTDATA
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [wd03b], a
@@ -109,7 +109,7 @@
 	ld a, 1
 	ld [wd002], a
 
-	ld a, PartyMon1ID - PartyMon1
+	ld a, MON_ID
 	call GetPartyParamLocation
 	ld a, [PlayerID]
 	cp [hl]
@@ -358,7 +358,7 @@
 
 
 SeerAdvice: ; 4f2b4
-	ld a, PartyMon1Level - PartyMon1
+	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [wd038 + 2]
 	ld c, a
@@ -426,7 +426,7 @@
 
 
 GetCaughtGender: ; 4f301
-	ld hl, PartyMon1CaughtGender - PartyMon1
+	ld hl, MON_CAUGHTGENDER
 	add hl, bc
 
 	ld a, [hl]
--- a/event/unown.asm
+++ b/event/unown.asm
@@ -38,7 +38,7 @@
 	dec a
 	ld [CurPartyMon], a
 	push bc
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	pop bc
 	ld a, [hl]
--- a/home.asm
+++ b/home.asm
@@ -1965,7 +1965,7 @@
 
 GetPartyLocation:: ; 3927
 ; Add the length of a PartyMon struct to hl a times.
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	jp AddNTimes
 ; 392d
 
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -573,7 +573,7 @@
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1Happiness
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 
 	ld a, FRIEND_BALL_HAPPINESS
@@ -1198,7 +1198,7 @@
 
 	jp c, .asm_ee38
 
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 
 	ld a, [hl]
@@ -1239,7 +1239,7 @@
 
 	call Functioneed9
 
-	ld a, PartyMon1StatExp - PartyMon1
+	ld a, MON_STAT_EXP
 	call GetPartyParamLocation
 
 	add hl, bc
@@ -1281,11 +1281,11 @@
 
 
 Functionee8c: ; ee8c
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
-	ld a, PartyMon1HPExp - 1 - PartyMon1
+	ld a, MON_EXP + 2
 	call GetPartyParamLocation
 	ld b, $1
 	predef_jump CalcPkmnStats
@@ -1338,11 +1338,11 @@
 ; eeeb
 
 Table_eeeb: ; eeeb
-	db HP_UP,   PartyMon1HPExp  - PartyMon1StatExp
-	db PROTEIN, PartyMon1AtkExp - PartyMon1StatExp
-	db IRON,    PartyMon1DefExp - PartyMon1StatExp
-	db CARBOS,  PartyMon1SpdExp - PartyMon1StatExp
-	db CALCIUM, PartyMon1SpcExp - PartyMon1StatExp
+	db HP_UP,    (MON_HP_EXP) - (MON_STAT_EXP)
+	db PROTEIN, (MON_ATK_EXP) - (MON_STAT_EXP)
+	db IRON,    (MON_DEF_EXP) - (MON_STAT_EXP)
+	db CARBOS,  (MON_SPD_EXP) - (MON_STAT_EXP)
+	db CALCIUM, (MON_SPC_EXP) - (MON_STAT_EXP)
 ; eef5
 
 
@@ -1350,7 +1350,7 @@
 	ld a, [CurPartySpecies]
 	ld [CurSpecies], a
 	ld [wd265], a
-	ld a, PartyMon1Level - PartyMon1
+	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [hl]
 	ld [CurPartyLevel], a
@@ -1370,7 +1370,7 @@
 
 	call Functioneef5
 
-	ld a, PartyMon1Level - PartyMon1
+	ld a, MON_LEVEL
 	call GetPartyParamLocation
 
 	ld a, [hl]
@@ -1385,7 +1385,7 @@
 	callba CalcExpAtLevel
 
 	pop de
-	ld a, PartyMon1Exp - PartyMon1
+	ld a, MON_EXP
 	call GetPartyParamLocation
 
 	ld a, [hMultiplicand]
@@ -1395,7 +1395,7 @@
 	ld a, [$ffb6]
 	ld [hl], a
 
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld b, a
@@ -1403,7 +1403,7 @@
 	push bc
 	call Functionee8c
 
-	ld a, PartyMon1MaxHP + 1 - PartyMon1
+	ld a, MON_MAXHP + 1
 	call GetPartyParamLocation
 
 	pop bc
@@ -1503,7 +1503,7 @@
 	ld a, $1
 	ret z
 	call Functionf058
-	ld a, PartyMon1Status - PartyMon1
+	ld a, MON_STATUS
 	call GetPartyParamLocation
 	ld a, [hl]
 	and c
@@ -1542,7 +1542,7 @@
 Functionf01e: ; f01e (3:701e)
 	call Functionf2a6
 	ret nc
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [BattleMonHP], a
@@ -1724,7 +1724,7 @@
 	xor a
 	ld [Danger], a
 	call Functionf2c3
-	ld a, PartyMon1Status - PartyMon1
+	ld a, MON_STATUS
 	call GetPartyParamLocation
 	xor a
 	ld [hli], a
@@ -1960,7 +1960,7 @@
 Functionf2c3: ; f2c3 (3:72c3)
 	call Functionf36f
 asm_f2c6: ; f2c6 (3:72c6)
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld [hl], d
 	inc hl
@@ -1968,7 +1968,7 @@
 	jp Functionf328
 
 Functionf2d1: ; f2d1 (3:72d1)
-	ld a, PartyMon1HP + 1 - PartyMon1
+	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
 	add e
@@ -1978,11 +1978,11 @@
 	ld [hl], a
 	jr c, .asm_f2f5
 	call Functionf328
-	ld a, PartyMon1HP + 1 - PartyMon1
+	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
-	ld a, PartyMon1MaxHP + 1 - PartyMon1
+	ld a, MON_MAXHP + 1
 	call GetPartyParamLocation
 	ld a, [de]
 	sub [hl]
@@ -1997,7 +1997,7 @@
 	ret
 
 Functionf2f9: ; f2f9 (3:72f9)
-	ld a, PartyMon1HP + 1 - PartyMon1
+	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
 	sub e
@@ -2035,7 +2035,7 @@
 	ret
 
 Functionf328: ; f328 (3:7328)
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [wd1ef], a
@@ -2061,7 +2061,7 @@
 ; f348
 
 Functionf348: ; f348 (3:7348)
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [wd1ed], a
@@ -2078,7 +2078,7 @@
 
 Functionf35f: ; f35f (3:735f)
 	push hl
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [Buffer2], a
@@ -2096,7 +2096,7 @@
 
 Functionf378: ; f378 (3:7378)
 	push bc
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [hDividend + 0], a
@@ -2408,7 +2408,7 @@
 
 
 .Functionf554
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	ld c, PARTY_LENGTH
 
 .loop
@@ -2555,7 +2555,7 @@
 	ld [CurMoveNum], a
 	jr nz, .loop
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call GetMthMoveOfNthPartymon
 
 	push hl
@@ -2625,7 +2625,7 @@
 .asm_f677
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld de, BattleMonMoves
 	ld b, NUM_MOVES
@@ -2641,7 +2641,7 @@
 	rept NUM_MOVES + 2 ; BattleMonPP - BattleMonMoves
 	inc de
 	endr
-	ld bc, PartyMon1PP - PartyMon1Moves
+	ld bc, (MON_PP) - (MON_MOVES)
 	add hl, bc
 	ld a, [hl]
 	ld [de], a
@@ -2674,7 +2674,7 @@
 .moveLoop
 	push bc
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call GetMthMoveOfNthPartymon
 	ld a, [hl]
 	and a
@@ -2710,7 +2710,7 @@
 	ld [MonType], a
 	call Functionf8ec
 	ld hl, PartyMon1PP
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call GetMthMoveOfNthPartymon
 	ld a, [wd265]
 	ld b, a
@@ -3105,13 +3105,13 @@
 
 
 Functionf84c: ; f84c
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call GetPartyParamLocation
 	push hl
 	ld de, Buffer1
 	predef FillPP
 	pop hl
-	ld bc, PartyMon1PP - PartyMon1Moves
+	ld bc, (MON_PP) - (MON_MOVES)
 	add hl, bc
 	ld de, Buffer1
 	ld b, 0
@@ -3193,10 +3193,10 @@
 ; f8b9
 
 Functionf8b9: ; f8b9
-	ld a, PartyMon1PP - PartyMon1
+	ld a, MON_PP
 	call GetPartyParamLocation
 	push hl
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call GetPartyParamLocation
 	pop de
 	xor a ; PARTYMON
@@ -3239,7 +3239,7 @@
 	and a
 
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	jr z, .got_partymon ; PARTYMON
 
 	ld hl, OTPartyMon1Moves
@@ -3279,7 +3279,7 @@
 	pop hl
 
 	push bc
-	ld bc, PartyMon1PP - PartyMon1Moves
+	ld bc, (MON_PP) - (MON_MOVES)
 	ld a, [MonType]
 	cp WILDMON
 	jr nz, .notwild
--- a/main.asm
+++ b/main.asm
@@ -1598,7 +1598,7 @@
 
 .loop
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld d, h
@@ -1642,7 +1642,7 @@
 .learn
 	ld a, [wd262]
 	ld [hl], a
-	ld bc, PartyMon1PP - PartyMon1Moves
+	ld bc, (MON_PP) - (MON_MOVES)
 	add hl, bc
 
 	push hl
@@ -2681,7 +2681,7 @@
 
 GetFirstPokemonHappiness: ; 718d
 	ld hl, PartyMon1Happiness
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, PartySpecies
 .loop
 	ld a, [de]
@@ -2729,7 +2729,7 @@
 
 	push bc
 	ld hl, PartyMon1Happiness
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	pop bc
@@ -2838,7 +2838,7 @@
 
 .next
 	push de
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	pop de
 	dec c
@@ -2945,10 +2945,10 @@
 
 ; Caught data.
 	ld b, 0
-	callba SetPkmnCaughtData
+	callba SetPartymonCaughtData
 
 ; Holding a Berry.
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [PartyCount]
 	dec a
 	push af
@@ -3012,7 +3012,7 @@
 
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 
 ; OT ID
@@ -3044,7 +3044,7 @@
 	jr c, .fainted
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Happiness
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	cp 150
@@ -4444,21 +4444,21 @@
 ; c677
 
 HealPartyMon: ; c677
-	ld a, PartyMon1Species - PartyMon1
+	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
 
-	ld hl, PartyMon1Status - PartyMon1Species
+	ld hl, MON_STATUS
 	add hl, de
 	xor a
 	ld [hli], a
 	ld [hl], a
 
-	ld hl, PartyMon1MaxHP - PartyMon1Species
+	ld hl, MON_MAXHP
 	add hl, de
 
-	; bc = PartyMon1HP - PartyMon1Species
+	; bc = MON_HP
 	ld b, h
 	ld c, l
 rept 2
@@ -4626,7 +4626,7 @@
 	cp a, EGG
 	jr z, .next
 
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Moves
 	ld a, e
 	call AddNTimes
@@ -8005,7 +8005,7 @@
 .initializeStats
 	ld a, [$ffae]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 GeneratePartyMonStats: ; d906
 	ld e, l
@@ -8157,7 +8157,7 @@
 	ld a, $1
 	ld c, a
 	ld b, $0
-	call Functione17b
+	call CalcPkmnStatC
 	ld a, [$ffb5]
 	ld [de], a
 	inc de
@@ -8243,7 +8243,7 @@
 	ld hl, PartyMon1DVs
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	predef GetUnownLetter
 	callab Functionfba18
@@ -8303,7 +8303,7 @@
 	ld hl, PartyMon1Species
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld e, l
 	ld d, h
@@ -8341,7 +8341,7 @@
 	ld hl, PartyMon1Happiness
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld [hl], BASE_HAPPINESS
 .owned
@@ -8352,7 +8352,7 @@
 	ld hl, PartyMon1DVs
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	predef GetUnownLetter
 	callab Functionfba18
@@ -8415,11 +8415,11 @@
 	ld a, [wd10b]
 	dec a
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [PartyCount]
 	jr nz, .asm_db97
 	ld hl, sBoxMon1Species
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	ld a, [sBoxCount]
 
 .asm_db97
@@ -8433,13 +8433,13 @@
 	ld a, [wd10b]
 	and a
 	ld hl, sBoxMon1Species
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	jr z, .asm_dbb7
 	cp $2
 	ld hl, wBreedMon1Species
 	jr z, .asm_dbbd
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 
 .asm_dbb7
 	ld a, [CurPartyMon]
@@ -8446,7 +8446,7 @@
 	call AddNTimes
 
 .asm_dbbd
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes
 	ld a, [wd10b]
 	cp $3
@@ -8599,11 +8599,11 @@
 Functiondcb6: ; dcb6
 	ld a, b
 	ld hl, sBoxMons
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	call AddNTimes
 	ld b, h
 	ld c, l
-	ld hl, sBoxMon1PP - sBoxMon1
+	ld hl, MON_PP
 	add hl, bc
 	push hl
 	push bc
@@ -8611,7 +8611,7 @@
 	ld bc, NUM_MOVES
 	call CopyBytes
 	pop bc
-	ld hl, sBoxMon1Moves - sBoxMon1
+	ld hl, MON_MOVES
 	add hl, bc
 	push hl
 	ld de, TempMonMoves
@@ -8764,7 +8764,7 @@
 	ld hl, PartyMon1Moves
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -8795,7 +8795,7 @@
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -8829,9 +8829,9 @@
 	call CopyBytes
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	jp CopyBytes
 
 
@@ -8980,7 +8980,7 @@
 	call .asm_df5f
 
 	ld hl, sBoxMons
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 
 .asm_df5f
 	ld a, [sBoxCount]
@@ -9062,7 +9062,7 @@
 	ld [CurPartySpecies], a
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Species
 	call AddNTimes
 	ld a, [CurPartySpecies]
@@ -9083,7 +9083,7 @@
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1Happiness
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [wc2cc]
 	bit 1, a
@@ -9096,7 +9096,7 @@
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1HP
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hli], a
@@ -9168,12 +9168,12 @@
 	call CopyDataUntil
 
 	ld hl, PartyMons
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wd10b]
 	and a
 	jr z, .asm_e0a5
 	ld hl, sBoxMons
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 
 .asm_e0a5
 	ld a, [CurPartyMon]
@@ -9183,13 +9183,13 @@
 	ld a, [wd10b]
 	and a
 	jr z, .asm_e0bc
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	ld bc, sBoxMonOT
 	jr .asm_e0c3
 
 .asm_e0bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	ld bc, PartyMonOT
 
@@ -9232,7 +9232,7 @@
 	cp [hl]
 	jr z, .asm_e131
 	ld hl, s0_a600
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	push hl
 	add hl, bc
@@ -9242,11 +9242,11 @@
 .asm_e11a
 	push bc
 	push hl
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	pop hl
 	push hl
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	add hl, bc
 	pop de
 	pop bc
@@ -9260,26 +9260,26 @@
 ; e134
 
 Functione134: ; e134
-	ld a, PartyMon1Level - PartyMon1
+	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [hl]
-	ld [PartyMon1Level - PartyMon1], a ; wow
-	ld a, PartyMon1Species - PartyMon1
+	ld [MON_LEVEL], a ; wow
+	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld a, [hl]
 	ld [CurSpecies], a
 	call GetBaseData
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
 	push de
-	ld a, PartyMon1Exp + 2 - PartyMon1
+	ld a, MON_EXP + 2
 	call GetPartyParamLocation
 	ld b, $1
 	call CalcPkmnStats
 	pop de
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [de]
 	inc de
@@ -9296,24 +9296,29 @@
 ; results in $ffb5 and $ffb6 are saved in [de]
 
 	ld c, $0
-.asm_e169
+.loop
 	inc c
-	call Functione17b
-	ld a, [$ffb5]
+	call CalcPkmnStatC
+	ld a, [hMultiplicand + 1]
 	ld [de], a
 	inc de
-	ld a, [$ffb6]
+	ld a, [hMultiplicand + 2]
 	ld [de], a
 	inc de
 	ld a, c
-	cp $6
-	jr nz, .asm_e169
+	cp STAT_SDEF
+	jr nz, .loop
 	ret
 ; e17b
 
-Functione17b: ; e17b
+CalcPkmnStatC: ; e17b
 ; 'c' is 1-6 and points to the BaseStat
-
+; 1: HP
+; 2: Attack
+; 3: Defense
+; 4: Speed
+; 5: SpAtk
+; 6: SpDef
 	push hl
 	push de
 	push bc
@@ -9329,17 +9334,17 @@
 	pop hl
 	push hl
 	ld a, c
-	cp $6
-	jr nz, .asm_e193
+	cp STAT_SDEF
+	jr nz, .not_spdef
 rept 2
 	dec hl
 endr
 
-.asm_e193
+.not_spdef
 	sla c
 	ld a, d
 	and a
-	jr z, .asm_e1a5
+	jr z, .SkipSqrt
 	add hl, bc
 	push de
 	ld a, [hld]
@@ -9348,24 +9353,25 @@
 	callba GetSquareRoot
 	pop de
 
-.asm_e1a5
+.SkipSqrt
 	srl c
 	pop hl
 	push bc
-	ld bc, NAME_LENGTH
+	ld bc, (MON_DVS) - (MON_HP_EXP) + 1
 	add hl, bc
 	pop bc
 	ld a, c
-	cp $2
-	jr z, .asm_e1e3
-	cp $3
-	jr z, .asm_e1ea
-	cp $4
-	jr z, .asm_e1ef
-	cp $5
-	jr z, .asm_e1f7
-	cp $6
-	jr z, .asm_e1f7
+	cp STAT_ATK
+	jr z, .Attack
+	cp STAT_DEF
+	jr z, .Defense
+	cp STAT_SPD
+	jr z, .Speed
+	cp STAT_SATK
+	jr z, .Special
+	cp STAT_SDEF
+	jr z, .Special
+; DV_HP = (DV_ATK & 1) << 3 + (DV_DEF & 1) << 2 + (DV_SPD & 1) << 1 + (DV_SPC & 1)
 	push bc
 	ld a, [hl]
 	swap a
@@ -9391,39 +9397,39 @@
 	and $1
 	add b
 	pop bc
-	jr .asm_e1fb
+	jr .GotDV
 
-.asm_e1e3
+.Attack
 	ld a, [hl]
 	swap a
 	and $f
-	jr .asm_e1fb
+	jr .GotDV
 
-.asm_e1ea
+.Defense
 	ld a, [hl]
 	and $f
-	jr .asm_e1fb
+	jr .GotDV
 
-.asm_e1ef
+.Speed
 	inc hl
 	ld a, [hl]
 	swap a
 	and $f
-	jr .asm_e1fb
+	jr .GotDV
 
-.asm_e1f7
+.Special
 	inc hl
 	ld a, [hl]
 	and $f
 
-.asm_e1fb
-	ld d, $0
+.GotDV
+	ld d, 0
 	add e
 	ld e, a
-	jr nc, .asm_e202
+	jr nc, .no_overflow_1
 	inc d
 
-.asm_e202
+.no_overflow_1
 	sla e
 	rl d
 	srl b
@@ -9430,10 +9436,10 @@
 	srl b
 	ld a, b
 	add e
-	jr nc, .asm_e20f
+	jr nc, .no_overflow_2
 	inc d
 
-.asm_e20f
+.no_overflow_2
 	ld [hMultiplicand + 2], a
 	ld a, d
 	ld [hMultiplicand + 1], a
@@ -9448,55 +9454,55 @@
 	ld [hDividend + 1], a
 	ld a, [hProduct + 3]
 	ld [hDividend + 2], a
-	ld a, $64
+	ld a, 100
 	ld [hDivisor], a
-	ld a, $3
+	ld a, 3
 	ld b, a
 	call Divide
 	ld a, c
-	cp $1
-	ld a, $5
-	jr nz, .asm_e24e
+	cp STAT_HP
+	ld a, 5
+	jr nz, .not_hp
 	ld a, [CurPartyLevel]
 	ld b, a
 	ld a, [hQuotient + 2]
 	add b
-	ld [$ffb6], a
-	jr nc, .asm_e24c
+	ld [hMultiplicand + 2], a
+	jr nc, .no_overflow_3
 	ld a, [hQuotient + 1]
 	inc a
-	ld [$ffb5], a
+	ld [hMultiplicand + 1], a
 
-.asm_e24c
-	ld a, $a
+.no_overflow_3
+	ld a, 10
 
-.asm_e24e
+.not_hp
 	ld b, a
-	ld a, [$ffb6]
+	ld a, [hQuotient + 2]
 	add b
-	ld [$ffb6], a
-	jr nc, .asm_e25b
-	ld a, [$ffb5]
+	ld [hMultiplicand + 2], a
+	jr nc, .no_overflow_4
+	ld a, [hQuotient + 1]
 	inc a
-	ld [$ffb5], a
+	ld [hMultiplicand + 1], a
 
-.asm_e25b
-	ld a, [$ffb5]
-	cp $4
-	jr nc, .asm_e26b
-	cp $3
-	jr c, .asm_e273
-	ld a, [$ffb6]
-	cp $e8
-	jr c, .asm_e273
+.no_overflow_4
+	ld a, [hQuotient + 1]
+	cp (1000 / $100) + 1
+	jr nc, .max_stat
+	cp 1000 / $100
+	jr c, .stat_value_okay
+	ld a, [hQuotient + 2]
+	cp 1000 % $100
+	jr c, .stat_value_okay
 
-.asm_e26b
-	ld a, $3
-	ld [$ffb5], a
-	ld a, $e7
-	ld [$ffb6], a
+.max_stat
+	ld a, 999 / $100
+	ld [hMultiplicand + 1], a
+	ld a, 999 % $100
+	ld [hMultiplicand + 2], a
 
-.asm_e273
+.stat_value_okay
 	pop bc
 	pop de
 	pop hl
@@ -9528,7 +9534,7 @@
 	jr z, .done
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [CurItem]
 	ld [hl], a
@@ -9613,20 +9619,20 @@
 	push bc
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, 01001 / $100
 	ld [hli], a
 	ld [hl], 01001 % $100
 	pop bc
-	callba SetPkmnCaughtData
-	jr .asm_e3b2
+	callba SetPartymonCaughtData
+	jr .skip_nickname
 
 .asm_e35e
 	ld a, BANK(sBoxMonOT)
 	call GetSRAMBank
 	ld de, sBoxMonOT
-.asm_e366
+.loop
 	ld a, [ScriptBank]
 	call GetFarByte
 	ld [de], a
@@ -9633,7 +9639,7 @@
 	inc hl
 	inc de
 	cp "@"
-	jr nz, .asm_e366
+	jr nz, .loop
 	ld a, [ScriptBank]
 	call GetFarByte
 	ld b, a
@@ -9643,8 +9649,8 @@
 	call Random
 	ld [hl], a
 	call CloseSRAM
-	callba Function4db92
-	jr .asm_e3b2
+	callba SetBoxMonCaughtData
+	jr .skip_nickname
 
 .asm_e390
 	pop de
@@ -9663,10 +9669,10 @@
 .asm_e3a6
 	callba GiveANickname_YesNo
 	pop de
-	jr c, .asm_e3b2
-	call Functione3de
+	jr c, .skip_nickname
+	call InitNickname
 
-.asm_e3b2
+.skip_nickname
 	pop bc
 	pop de
 	ld a, b
@@ -9699,7 +9705,7 @@
 	db "@"
 ; 0xe3de
 
-Functione3de: ; e3de
+InitNickname: ; e3de
 	push de
 	call LoadMenuDataHeader_0x1d75
 	call DisableSpriteUpdates
@@ -9911,7 +9917,7 @@
 
 CheckCurPartyMonFainted: ; e538
 	ld hl, PartyMon1HP
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	ld b, $0
 .loop
 	ld a, [CurPartyMon]
@@ -10187,7 +10193,7 @@
 	ld [CurPartySpecies], a
 	call GetBaseData
 	xor a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wContestMon
 	call ByteFill
 	xor a
@@ -10298,7 +10304,7 @@
 
 
 KnowsMove: ; f9ea
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call GetPartyParamLocation
 	ld a, [wd262]
 	ld b, a
@@ -13485,7 +13491,7 @@
 
 GetPartyItemLocation: ; 12cd7
 	push af
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	pop af
 	ret
@@ -13530,12 +13536,12 @@
 	ld [de], a
 	ld a, [CurPartyMon]
 	ld hl, s0_a600
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld hl, DefaultFlypoint
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	ld a, BANK(s0_a600)
 	call GetSRAMBank
 	call CopyBytes
@@ -13847,7 +13853,7 @@
 ; 0x12f05
 
 Function12f05: ; 12f05
-	ld a, PartyMon1MaxHP - PartyMon1
+	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld [hDividend + 0], a
@@ -13857,7 +13863,7 @@
 	ld [hDivisor], a
 	ld b, $2
 	call Divide
-	ld a, PartyMon1HP + 1 - PartyMon1
+	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hQuotient + 2]
 	sub [hl]
@@ -14119,7 +14125,7 @@
 
 .asm_130de
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	push hl
@@ -14274,7 +14280,7 @@
 
 Function13235: ; 13235
 	ld hl, PartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld a, [wcfa9]
@@ -15553,7 +15559,7 @@
 	ld [hl], a
 
 .does_not_have_pokerus
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	dec c
 	jr nz, .loop
@@ -15762,7 +15768,7 @@
 .asm_13a9c
 	ld [CurSpecies], a
 	call GetBaseData
-	ld hl, PartyMon1Level - PartyMon1
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	cp MIN_LEVEL
@@ -15777,16 +15783,16 @@
 .asm_13ab5
 	ld [CurPartyLevel], a
 
-	ld hl, PartyMon1MaxHP - PartyMon1
+	ld hl, MON_MAXHP
 	add hl, bc
 	ld d, h
 	ld e, l
-	ld hl, PartyMon1Exp + 2 - PartyMon1
+	ld hl, MON_EXP + 2
 	add hl, bc
 	ld b, $1
 	predef CalcPkmnStats
 	pop hl
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop de
 	inc e
@@ -15889,7 +15895,7 @@
 .asm_13b60
 	pop hl
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec b
@@ -19788,7 +19794,7 @@
 	callba CheckCurPartyMonFainted
 	jr c, .asm_167e9
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld d, [hl]
@@ -20194,7 +20200,7 @@
 	ld hl, wEggOT
 	call CopyBytes
 	ld hl, PartyMon1
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Function16a31
 	ld hl, wEggMon
 	ld bc, wEggMonEnd - wEggMon
@@ -20203,14 +20209,14 @@
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld b, h
 	ld c, l
-	ld hl, PartyMon1ID + 1 - PartyMon1
+	ld hl, MON_ID + 1
 	add hl, bc
 	push hl
-	ld hl, PartyMon1MaxHP - PartyMon1
+	ld hl, MON_MAXHP
 	add hl, bc
 	ld d, h
 	ld e, l
@@ -20219,7 +20225,7 @@
 	ld b, $0
 	predef CalcPkmnStats
 	pop bc
-	ld hl, PartyMon1HP - PartyMon1
+	ld hl, MON_HP
 	add hl, bc
 	xor a
 	ld [hli], a
@@ -20926,7 +20932,7 @@
 
 .next
 	push de
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	pop de
 	jr .loop
@@ -20967,7 +20973,7 @@
 	callba MobileFn_10608d
 	ld a, [CurPartyMon]
 	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	ld [CurPartySpecies], a
@@ -20996,22 +21002,22 @@
 	call GetBaseData
 	ld a, [CurPartyMon]
 	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	push hl
-	ld bc, PartyMon1MaxHP - PartyMon1
+	ld bc, MON_MAXHP
 	add hl, bc
 	ld d, h
 	ld e, l
 	pop hl
 	push hl
-	ld bc, PartyMon1Level - PartyMon1
+	ld bc, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	ld [CurPartyLevel], a
 	pop hl
 	push hl
-	ld bc, PartyMon1Status - PartyMon1
+	ld bc, MON_STATUS
 	add hl, bc
 	xor a
 	ld [hli], a
@@ -21018,16 +21024,16 @@
 	ld [hl], a
 	pop hl
 	push hl
-	ld bc, PartyMon1Exp + 2 - PartyMon1
+	ld bc, MON_EXP + 2
 	add hl, bc
 	ld b, $0
 	predef CalcPkmnStats
 	pop bc
-	ld hl, PartyMon1MaxHP - PartyMon1
+	ld hl, MON_MAXHP
 	add hl, bc
 	ld d, h
 	ld e, l
-	ld hl, PartyMon1HP - PartyMon1
+	ld hl, MON_HP
 	add hl, bc
 	ld a, [de]
 	inc de
@@ -21034,7 +21040,7 @@
 	ld [hli], a
 	ld a, [de]
 	ld [hl], a
-	ld hl, PartyMon1ID - PartyMon1
+	ld hl, MON_ID
 	add hl, bc
 	ld a, [PlayerID]
 	ld [hli], a
@@ -21082,7 +21088,7 @@
 	ld hl, CurPartyMon
 	inc [hl]
 	pop hl
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	pop de
 	jp Function16f7a
@@ -24244,7 +24250,7 @@
 	ld a, [wLinkMode]
 	and a
 	jr nz, .skip
-	ld a, PartyMon1Moves - PartyMon1
+	ld a, MON_MOVES
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
@@ -24279,7 +24285,7 @@
 	and a
 	jr nz, .skip2
 	push hl
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld d, [hl]
 	callba ItemIsMail
@@ -27902,7 +27908,7 @@
 .asm_284db
 	push bc
 	call Function284f6
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec c
@@ -28010,7 +28016,7 @@
 	add hl, bc
 	ld c, $5
 	ld b, $1
-	predef Functione17b
+	predef CalcPkmnStatC
 
 	pop bc
 	pop de
@@ -28108,7 +28114,7 @@
 
 .next
 	pop de
-	ld hl, PartyMon1StatsEnd - PartyMon1Item
+	ld hl, (SCRATCHMON_STRUCT_LENGTH)
 	add hl, de
 	ld d, h
 	ld e, l
@@ -28281,7 +28287,7 @@
 	add hl, bc
 	ld c, $5
 	ld b, $1
-	predef Functione17b
+	predef CalcPkmnStatC
 	pop bc
 	pop hl
 	ld a, [$ffb5]
@@ -28294,7 +28300,7 @@
 	add hl, bc
 	ld c, $6
 	ld b, $1
-	predef Functione17b
+	predef CalcPkmnStatC
 	pop bc
 	pop hl
 	ld a, [$ffb5]
@@ -28971,13 +28977,13 @@
 .asm_28c7b
 	ld hl, s0_a600
 	ld a, [DefaultFlypoint]
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	ld a, BANK(s0_a600)
 	call GetSRAMBank
 	ld d, h
 	ld e, l
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	add hl, bc
 	ld a, [DefaultFlypoint]
 	ld c, a
@@ -28987,7 +28993,7 @@
 	cp $6
 	jr z, .asm_28ca6
 	push bc
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	pop bc
 	jr .asm_28c96
@@ -28996,15 +29002,15 @@
 	ld hl, s0_a600
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	push hl
 	ld hl, wc9f4
 	ld a, [wd003]
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	pop de
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	call CloseSRAM
 	ld hl, PlayerName
@@ -29139,7 +29145,7 @@
 	ld a, c
 	call GetPartyLocation
 	ld de, TempMonSpecies
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	predef Functionda96
 	ld a, [PartyCount]
@@ -30829,7 +30835,7 @@
 	pop bc
 	pop hl
 	jr c, .mon_has_mail
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	add hl, de
 	dec b
 	jr nz, .itemloop
@@ -31601,7 +31607,7 @@
 ApplyCleanseTagEffectOnEncounterRate:: ; 2a138
 ; Cleanse Tag halves encounter rate.
 	ld hl, PartyMon1Item
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	ld a, [PartyCount]
 	ld c, a
 .loop
@@ -31738,7 +31744,7 @@
 	jr z, .encounter
 ; Get the first Pokemon in your party that isn't fainted.
 	ld hl, PartyMon1HP
-	ld bc, PartyMon2 - PartyMon1 - 1
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 .loop
 	ld a, [hli]
 	or [hl]
@@ -33978,7 +33984,7 @@
 	ld hl, PartyMon1PokerusStatus
 	ld a, [PartyCount]
 	ld b, a
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 .loopMons
 	ld a, [hl]
 	and $f
@@ -34104,7 +34110,7 @@
 	ld a, [hl]
 	cp SHUCKLE
 	jr nz, .loopMon
-	ld bc, PartyMon1Item - PartyMon1Species
+	ld bc, MON_ITEM
 	add hl, bc
 	ld a, [hl]
 	cp BERRY
@@ -34112,7 +34118,7 @@
 
 .loopMon
 	pop hl
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop af
 	dec a
@@ -34149,7 +34155,7 @@
 	call DelayFrame
 	ld b, 6
 	ld hl, PartyMon1HP
-	ld de, PartyMon2 - PartyMon1 - 1
+	ld de, PARTYMON_STRUCT_LENGTH - 1
 
 .loop
 	ld a, [hli]
@@ -34160,7 +34166,7 @@
 	jr nz, .loop
 
 .okay
-	ld de, PartyMon1Level - PartyMon1HP
+	ld de, (MON_LEVEL) - (MON_HP)
 	add hl, de
 	ld a, [hl]
 	ld [BattleMonLevel], a
@@ -34614,7 +34620,7 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1Moves
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -34633,14 +34639,14 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, OTPartyMon1PP - OTPartyMon1
+	ld hl, MON_PP
 	add hl, de
 	push hl
-	ld hl, OTPartyMon1Moves - OTPartyMon1
+	ld hl, MON_MOVES
 	add hl, de
 	pop de
 
@@ -34690,7 +34696,7 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1Item
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -34721,7 +34727,7 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1Item
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -34734,7 +34740,7 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1Moves
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -34753,15 +34759,15 @@
 	ld a, [OTPartyCount]
 	dec a
 	ld hl, OTPartyMon1
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, OTPartyMon1PP - OTPartyMon1
+	ld hl, MON_PP
 	add hl, de
 
 	push hl
-	ld hl, OTPartyMon1Moves - OTPartyMon1
+	ld hl, MON_MOVES
 	add hl, de
 	pop de
 
@@ -35242,11 +35248,11 @@
 
 	ld a, [CurPartyMon]
 	ld hl, PartyMons
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld e, l
 	ld d, h
-	ld bc, PartyMon1MaxHP - PartyMon1
+	ld bc, MON_MAXHP
 	add hl, bc
 	ld a, [hli]
 	ld b, a
@@ -35267,7 +35273,7 @@
 	ld [hl], a
 
 	ld hl, TempMonSpecies
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 
 	ld a, [CurSpecies]
@@ -35370,7 +35376,7 @@
 	push hl
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	cp EVERSTONE
@@ -35437,7 +35443,7 @@
 	ld d, a
 	ld hl, PartyMon1Moves
 	ld a, [CurPartyMon]
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 
 	ld b, NUM_MOVES
@@ -35560,7 +35566,7 @@
 	jr z, .NextMove
 	push hl
 	ld a, [hl]
-	ld hl, PartyMon1PP - PartyMon1Moves
+	ld hl, (MON_PP) - (MON_MOVES)
 	add hl, de
 	push hl
 	dec a
@@ -35583,12 +35589,12 @@
 
 ShiftMoves: ; 4256e
 	ld c, NUM_MOVES - 1
-.asm_42570
+.loop
 	inc de
 	ld a, [de]
 	ld [hli], a
 	dec c
-	jr nz, .asm_42570
+	jr nz, .loop
 	ret
 ; 42577
 
@@ -35608,7 +35614,7 @@
 ; if a pre-evolution is found.
 
 	ld c, 0
-.asm_42583
+.loop ; For each Pokemon...
 	ld hl, EvosAttacksPointers
 	ld b, 0
 rept 2
@@ -35617,33 +35623,33 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-.asm_4258d
+.loop2 ; For each evolution...
 	ld a, [hli]
 	and a
-	jr z, .asm_425a2
-	cp EVOLVE_STAT
-	jr nz, .asm_42596
+	jr z, .no_evolve ; If we jump, this Pokemon does not evolve into CurPartySpecies.
+	cp EVOLVE_STAT ; This evolution type has the extra parameter of stat comparison.
+	jr nz, .not_tyrogue
 	inc hl
 
-.asm_42596
+.not_tyrogue
 	inc hl
 	ld a, [CurPartySpecies]
 	cp [hl]
-	jr z, .asm_425aa
+	jr z, .found_preevo
 	inc hl
 	ld a, [hl]
 	and a
-	jr nz, .asm_4258d
+	jr nz, .loop2
 
-.asm_425a2
+.no_evolve
 	inc c
 	ld a, c
 	cp NUM_POKEMON
-	jr c, .asm_42583
+	jr c, .loop
 	and a
 	ret
 
-.asm_425aa
+.found_preevo
 	inc c
 	ld a, c
 	ld [CurPartySpecies], a
@@ -36173,7 +36179,7 @@
 
 
 Function4456e: ; 4456e
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld d, [hl]
 	callba ItemIsMail
@@ -36181,25 +36187,25 @@
 	call Function44648
 	cp $a
 	jr nc, .asm_445be
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	ld hl, s0_a835
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld a, [CurPartyMon]
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	ld hl, s0_a600
 	call AddNTimes
 	push hl
 	ld a, BANK(s0_a834)
 	call GetSRAMBank
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	pop hl
 	xor a
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call ByteFill
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld [hl], $0
 	ld hl, s0_a834
@@ -36219,7 +36225,7 @@
 	ld a, b
 	push bc
 	ld hl, s0_a835
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	push hl
 	add hl, bc
@@ -36230,7 +36236,7 @@
 	cp $9
 	jr z, .done
 	push bc
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	pop bc
 	inc b
@@ -36239,7 +36245,7 @@
 	ld h, d
 	ld l, e
 	xor a
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call ByteFill
 	ld hl, s0_a834
 	dec [hl]
@@ -36249,7 +36255,7 @@
 ReadMailMessage: ; 445f4
 	ld a, b
 	ld hl, s0_a835
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -36261,12 +36267,12 @@
 	call GetSRAMBank
 	push bc
 	ld a, b
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	ld hl, s0_a835
 	call AddNTimes
 	push hl
 	ld a, [CurPartyMon]
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	ld hl, s0_a600
 	call AddNTimes
 	ld d, h
@@ -36273,15 +36279,15 @@
 	ld e, l
 	pop hl
 	push hl
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	pop hl
-	ld de, PartyMon1StatsEnd - PartyMon1Moves
+	ld de, (PARTYMON_STRUCT_LENGTH) - (MON_MOVES)
 	add hl, de
 	ld d, [hl]
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld [hl], d
 	call CloseSRAM
@@ -36305,7 +36311,7 @@
 	jr c, .asm_446c6
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, [hl]
 	callba ItemIsMail
@@ -36315,7 +36321,7 @@
 	call GetSRAMBank
 	ld a, [CurPartyMon]
 	ld hl, s0_a600
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -36369,7 +36375,7 @@
 	push af
 	push bc
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	ld [hl], b
@@ -36395,7 +36401,7 @@
 	call CopyBytes
 	pop af
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ld [de], a
@@ -36418,11 +36424,11 @@
 	call GetSRAMBank
 	ld hl, s0_a600
 	ld de, s0_a71a
-	ld bc, 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 6 * (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	ld hl, s0_a834
 	ld de, s0_aa0b
-	ld bc, 1 + 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 1 + 10 * (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	jp CloseSRAM
 ; 44745
@@ -36432,11 +36438,11 @@
 	call GetSRAMBank
 	ld hl, s0_a71a
 	ld de, s0_a600
-	ld bc, 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 6 * (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	ld hl, s0_aa0b
 	ld de, s0_a834
-	ld bc, 1 + 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 1 + 10 * (SCRATCHMON_STRUCT_LENGTH)
 	call CopyBytes
 	jp CloseSRAM
 
@@ -36445,11 +36451,11 @@
 	call GetSRAMBank
 	xor a
 	ld hl, s0_a600
-	ld bc, 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 6 * (SCRATCHMON_STRUCT_LENGTH)
 	call ByteFill
 	xor a
 	ld hl, s0_a834
-	ld bc, 1 + 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
+	ld bc, 1 + 10 * (SCRATCHMON_STRUCT_LENGTH)
 	call ByteFill
 	jp CloseSRAM
 ; 44781 (11:4781)
@@ -36469,7 +36475,7 @@
 	pop de
 	pop hl
 	ret c
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	dec e
 	jr nz, .asm_4478b
@@ -36683,7 +36689,7 @@
 	ld a, [CurPartySpecies]
 	cp EGG
 	jr z, .asm_44923
-	ld a, PartyMon1Item - PartyMon1
+	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld a, [hl]
 	and a
@@ -41136,7 +41142,7 @@
 	ret c ; found!
 
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call UpdateOTPointer
@@ -41163,7 +41169,7 @@
 
 .loop
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call UpdateOTPointer
@@ -41227,7 +41233,7 @@
 
 .loopboxmon
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call UpdateOTPointer
@@ -41271,7 +41277,7 @@
 	jr nz, .notfound ; species doesn't match
 
 ; check ID number
-	ld bc, PartyMon1ID - PartyMon1Species
+	ld bc, MON_ID
 	add hl, bc ; now hl points to ID number
 	ld a, [PlayerID]
 	cp [hl]
@@ -41360,7 +41366,7 @@
 	call Function4a8dc
 	ret c
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call Function4a91e
@@ -41382,7 +41388,7 @@
 
 .asm_4a87c
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call Function4a91e
@@ -41433,7 +41439,7 @@
 
 .asm_4a8c4
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	call Function4a91e
@@ -41818,7 +41824,7 @@
 
 Function4ab06: ; 4ab06
 	ld a, [CurPartyMon]
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1HP
 	call AddNTimes
 	ld a, [hli]
@@ -43285,7 +43291,7 @@
 	ld b, a
 ; Check each monster in the party for Pokerus
 	ld hl, PartyMon1PokerusStatus
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 .Check
 	ld a, [hl]
 	and $0f ; only the bottom nybble is used
@@ -43318,7 +43324,7 @@
 	cp EGG
 	call nz, .CompareLuckyNumberToMonID
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec d
@@ -43343,7 +43349,7 @@
 
 .SkipOpenBoxMon
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1 ; box_struct_length
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec d
@@ -43390,7 +43396,7 @@
 
 .SkipBoxMon
 	push bc
-	ld bc, sBoxMon2 - sBoxMon1 ; box_struct_length
+	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
 	pop bc
 	dec d
@@ -43538,7 +43544,7 @@
 CheckPartyFullAfterContest: ; 4d9e5
 	ld a, [wContestMon]
 	and a
-	jp z, Function4db35
+	jp z, .DidntCatchAnything
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
 	call GetBaseData
@@ -43545,7 +43551,7 @@
 	ld hl, PartyCount
 	ld a, [hl]
 	cp 6
-	jp nc, Function4daa3
+	jp nc, .TryAddToBox
 	inc a
 	ld [hl], a
 	ld c, a
@@ -43559,12 +43565,12 @@
 	ld hl, PartyMon1Species
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld hl, wContestMon
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	ld a, [PartyCount]
 	dec a
@@ -43582,7 +43588,7 @@
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 	call GiveANickname_YesNo
-	jr c, .asm_4da66
+	jr c, .Party_SkipNickname
 	ld a, [PartyCount]
 	dec a
 	ld [CurPartyMon], a
@@ -43589,9 +43595,9 @@
 	xor a
 	ld [MonType], a
 	ld de, wd050
-	callab Functione3de
+	callab InitNickname
 
-.asm_4da66
+.Party_SkipNickname
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMonNicknames
@@ -43623,7 +43629,7 @@
 	ret
 ; 4daa3
 
-Function4daa3: ; 4daa3
+.TryAddToBox: ; 4daa3
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld hl, sBoxCount
@@ -43630,12 +43636,12 @@
 	ld a, [hl]
 	cp MONS_PER_BOX
 	call CloseSRAM
-	jr nc, .asm_4db08
+	jr nc, .BoxFull
 	xor a
 	ld [CurPartyMon], a
 	ld hl, wContestMon
 	ld de, wd018
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes
 	ld hl, PlayerName
 	ld de, wd00d
@@ -43647,14 +43653,14 @@
 	call GetPokemonName
 	call GiveANickname_YesNo
 	ld hl, StringBuffer1
-	jr c, .asm_4daf7
+	jr c, .Box_SkipNickname
 	ld a, BOXMON
 	ld [MonType], a
 	ld de, wd050
-	callab Functione3de
+	callab InitNickname
 	ld hl, wd050
 
-.asm_4daf7
+.Box_SkipNickname
 	ld a, BANK(sBoxMonNicknames)
 	call GetSRAMBank
 	ld de, sBoxMonNicknames
@@ -43662,7 +43668,7 @@
 	call CopyBytes
 	call CloseSRAM
 
-.asm_4db08
+.BoxFull
 	ld a, BANK(sBoxMon1Level)
 	call GetSRAMBank
 	ld a, [sBoxMon1Level]
@@ -43685,7 +43691,7 @@
 	ret
 ; 4db35
 
-Function4db35: ; 4db35
+.DidntCatchAnything: ; 4db35
 	ld a, $2
 	ld [ScriptVar], a
 	ret
@@ -43724,10 +43730,10 @@
 	ld a, [MapNumber]
 	ld c, a
 	cp MAP_POKECENTER_2F
-	jr nz, .asm_4db78
+	jr nz, .NotPokeCenter2F
 	ld a, b
 	cp GROUP_POKECENTER_2F
-	jr nz, .asm_4db78
+	jr nz, .NotPokeCenter2F
 
 	ld a, [BackupMapGroup]
 	ld b, a
@@ -43734,7 +43740,7 @@
 	ld a, [BackupMapNumber]
 	ld c, a
 
-.asm_4db78
+.NotPokeCenter2F
 	call GetWorldMapLocation
 	ld b, a
 	ld a, [PlayerGender]
@@ -43753,18 +43759,18 @@
 	ret
 ; 4db92
 
-Function4db92: ; 4db92
+SetBoxMonCaughtData: ; 4db92
 	push bc
 	ld a, BANK(sBoxMon1CaughtLevel)
 	call GetSRAMBank
 	ld hl, sBoxMon1CaughtLevel
 	pop bc
-	call Function4dbaf
+	call SetPkmnCaughtData
 	call CloseSRAM
 	ret
 ; 4dba3
 
-SetPkmnCaughtData: ; 4dba3
+SetPartymonCaughtData: ; 4dba3
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1CaughtLevel
@@ -43771,7 +43777,7 @@
 	push bc
 	call GetPartyLocation
 	pop bc
-Function4dbaf: ; 4dbaf
+SetPkmnCaughtData: ; 4dbaf
 	xor a
 	ld [hli], a
 	ld a, $7e
@@ -43818,7 +43824,7 @@
 	ret z
 	ld a, c
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [PlayerID]
 	cp [hl]
@@ -43847,7 +43853,7 @@
 	dec a
 	push hl
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	ld a, b
@@ -43880,7 +43886,7 @@
 	dec a
 	push hl
 	push bc
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	ld a, b
@@ -44810,7 +44816,7 @@
 Function4e2bf: ; 4e2bf (13:62bf)
 	ld a, [CurPartyMon]
 	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld b, h
 	ld c, l
@@ -45067,12 +45073,12 @@
 
 
 Function4e53f: ; 4e53f
-	ld hl, PartyMon1HP - PartyMon1
+	ld hl, MON_HP
 	add hl, bc
 	ld a, [hli]
 	or [hl]
 	jr z, .asm_4e552
-	ld hl, PartyMon1Status - PartyMon1
+	ld hl, MON_STATUS
 	add hl, bc
 	ld a, [hl]
 	and (1 << FRZ) | SLP
@@ -46091,7 +46097,7 @@
 
 Function50117: ; 50117
 	ld a, b
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1HP
 	call AddNTimes
 	ld a, [hli]
@@ -46130,7 +46136,7 @@
 	jr z, .asm_5016b
 	push hl
 	ld a, b
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1HP
 	call AddNTimes
 	ld e, l
@@ -46173,7 +46179,7 @@
 	jr z, .asm_501a7
 	push hl
 	ld a, b
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Level
 	call AddNTimes
 	ld e, l
@@ -46214,7 +46220,7 @@
 	jr z, .asm_501d5
 	push hl
 	ld a, b
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Status
 	call AddNTimes
 	ld e, l
@@ -46303,7 +46309,7 @@
 	jr z, .asm_5025d
 	push hl
 	ld a, b
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Species
 	call AddNTimes
 	ld a, [hl]
@@ -46918,13 +46924,13 @@
 ; 5062e
 
 Function5062e: ; 5062e
-	ld a, PartyMon1Status - PartyMon1
+	ld a, MON_STATUS
 	call GetPartyParamLocation
 	ld a, [hl]
 	and 1 << PSN
 	ret z
 
-	ld a, PartyMon1HP - PartyMon1
+	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
 	ld b, a
@@ -46942,7 +46948,7 @@
 	or c
 	jr nz, .not_fainted
 
-	ld a, PartyMon1Status - PartyMon1
+	ld a, MON_STATUS
 	call GetPartyParamLocation
 	ld [hl], 0
 	ld c, 2
@@ -47238,7 +47244,7 @@
 ; 507fb
 
 CheckAnyFaintedMon: ; 507fb
-	ld de, PartyMon2 - PartyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 	ld bc, PartySpecies
 	ld hl, PartyMon1HP
 	ld a, [PartyCount]
@@ -47311,11 +47317,11 @@
 
 	ld a, [MonType]
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	and a
 	jr z, .copywholestruct
 	ld hl, OTPartyMon1Species
-	ld bc, OTPartyMon2 - OTPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	cp OTPARTYMON
 	jr z, .copywholestruct
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -47326,7 +47332,7 @@
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld de, TempMon
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 
 .done
@@ -47680,7 +47686,7 @@
 
 ; 0: PartyMon
 	ld hl, PartyMon1DVs
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [MonType]
 	and a
 	jr z, .PartyMon
@@ -47692,7 +47698,7 @@
 
 ; 2: sBoxMon
 	ld hl, sBoxMon1DVs
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	dec a
 	jr z, .sBoxMon
 
@@ -48972,7 +48978,7 @@
 	dec a
 	ld [wd265], a
 	ld hl, sBoxMons
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	ld de, wd018
 	call Function513e0
 	ld hl, wd01a
@@ -49010,7 +49016,7 @@
 	dec a
 	ld [wd265], a
 	ld hl, PartyMons
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, wd018
 	call Function513e0
 	ret
@@ -53401,18 +53407,18 @@
 
 	ld a, c
 	ld hl, PartyMons
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld c, l
 	ld b, h
 
-	ld hl, PartyMon1Species - PartyMon1
+	ld hl, MON_SPECIES
 	add hl, bc
 	ld a, [hl]
 	ld [de], a
 	inc de
 
-	ld hl, PartyMon1ID - PartyMon1
+	ld hl, MON_ID
 	add hl, bc
 	ld a, [hli]
 	ld [de], a
@@ -53421,7 +53427,7 @@
 	ld [de], a
 	inc de
 
-	ld hl, PartyMon1DVs - PartyMon1
+	ld hl, MON_DVS
 	add hl, bc
 	ld a, [hli]
 	ld [de], a
@@ -53430,7 +53436,7 @@
 	ld [de], a
 	inc de
 
-	ld hl, PartyMon1Level - PartyMon1
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	ld [de], a
@@ -58156,7 +58162,7 @@
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	ld a, [hl]
@@ -65078,7 +65084,7 @@
 ReadPartyMonMail: ; b9229
 	ld a, [CurPartyMon]
 	ld hl, s0_a600
-	ld bc, PartyMon1StatsEnd - PartyMon1Item
+	ld bc, (SCRATCHMON_STRUCT_LENGTH)
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -69880,7 +69886,7 @@
 	call Functione2f18
 	jp c, BillsPCDepositFuncCancel
 	call Functione307c
-	jr c, .asm_e24c1
+	jr c, .no_overflow_31
 	ld a, $0
 	ld [wJumptableIndex], a
 	xor a
@@ -69887,7 +69893,7 @@
 	ld [wcb2b], a
 	ld [wcb2a], a
 	ret
-.asm_e24c1
+.no_overflow_31
 	ld de, PCString_WhatsUp
 	call Functione2a6e
 	ret
@@ -70004,11 +70010,11 @@
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
-	jr nz, .asm_e25b9
+	jr nz, .no_overflow_49
 	call Functione25c8
 	call DelayFrame
 	jr .asm_e25a7
-.asm_e25b9
+.no_overflow_49
 	call ClearSprites
 	pop af
 	ld [hInMenu], a
@@ -71520,7 +71526,7 @@
 	ld hl, sBoxMonOT
 	call Functione3376
 	ld hl, sBoxMons
-	ld bc, sBoxMon2 - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld de, wd018
@@ -71872,7 +71878,7 @@
 	ld hl, sBoxMonOT
 	call Functione3376
 	ld hl, sBoxMons
-	ld bc, sBoxMon1End - sBoxMon1
+	ld bc, BOXMON_STRUCT_LENGTH
 	call Functione3389
 	call CloseSRAM
 	callba Function5088b
@@ -71907,7 +71913,7 @@
 	ld hl, PartyMonOT
 	call Functione3376
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functione3389
 	xor a
 	ld [wd10b], a
@@ -75736,7 +75742,7 @@
 .asm_fb59c
 	ld b, h
 	ld c, l
-	ld hl, OTPartyMon1Level - OTPartyMon1
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	cp 101
@@ -76698,19 +76704,19 @@
 	call Functionfcdf4
 
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdd7
 	ld de, wc6ff
 	call Functionfce0f
 
 	ld hl, PartyMon1DVs
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdd7
 	ld de, wc6fd
 	call Functionfce0f
 
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdd7
 	ld b, h
 	ld c, l
@@ -76729,7 +76735,7 @@
 	ld [wc733], a
 
 	ld hl, PartyMon1Level
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdd7
 	ld a, [hl]
 	ld [CurPartyLevel], a
@@ -76749,7 +76755,7 @@
 	jr c, .asm_fcd1c
 	ld b, 1
 .asm_fcd1c
-	callba SetPkmnCaughtData
+	callba SetPartymonCaughtData
 
 	ld e, TRADE_NICK
 	call GetTradeAttribute
@@ -76783,7 +76789,7 @@
 	call Functionfce0f
 
 	ld hl, PartyMon1DVs
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdde
 	ld hl, wc72f
 	call Functionfce0f
@@ -76794,7 +76800,7 @@
 	call Functionfce15
 
 	ld hl, PartyMon1ID
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdde
 	ld hl, wc731
 	call Functionfce0f
@@ -76803,7 +76809,7 @@
 	call GetTradeAttribute
 	push hl
 	ld hl, PartyMon1Item
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call Functionfcdde
 	pop hl
 	ld a, [hl]
@@ -79685,17 +79691,17 @@
 	cp EGG
 	jr z, .asm_10513e
 	push hl
-	ld hl, PartyMon1Level - PartyMon1
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	ld [de], a
 	inc de
-	ld hl, PartyMon1Species - PartyMon1
+	ld hl, MON_SPECIES
 	add hl, bc
 	ld a, [hl]
 	ld [de], a
 	inc de
-	ld hl, PartyMon1Moves - PartyMon1
+	ld hl, MON_MOVES
 	add hl, bc
 	push bc
 	ld bc, NUM_MOVES
@@ -79704,7 +79710,7 @@
 	pop hl
 .asm_10513e
 	push hl
-	ld hl, PartyMon2 - PartyMon1
+	ld hl, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	ld b, h
 	ld c, l
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -62,7 +62,7 @@
 	iftrue UnknownScript_0x194e94
 	writetext UnknownText_0x195196
 	keeptextopen
-	giveitem TM_DRAGONBREATH, $1
+	giveitem TM_DRAGONBREATH, 1
 	iffalse UnknownScript_0x194e8e
 	itemtotext TM_DRAGONBREATH, $0
 	writetext UnknownText_0x1951bf
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -86,7 +86,7 @@
 CeladonCafeTrashcan:
 	checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
 	iftrue .TrashEmpty
-	giveitem LEFTOVERS, $1
+	giveitem LEFTOVERS, 1
 	iffalse .PackFull
 	loadfont
 	itemtotext LEFTOVERS, $0
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -36,7 +36,7 @@
 .FreshWater
 	checkmoney $0, 200
 	if_equal $2, .NotEnoughMoney
-	giveitem FRESH_WATER, $1
+	giveitem FRESH_WATER, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 200
 	itemtotext FRESH_WATER, $0
@@ -45,7 +45,7 @@
 .SodaPop
 	checkmoney $0, 300
 	if_equal $2, .NotEnoughMoney
-	giveitem SODA_POP, $1
+	giveitem SODA_POP, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 300
 	itemtotext SODA_POP, $0
@@ -54,7 +54,7 @@
 .Lemonade
 	checkmoney $0, 350
 	if_equal $2, .NotEnoughMoney
-	giveitem LEMONADE, $1
+	giveitem LEMONADE, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 350
 	itemtotext LEMONADE, $0
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -49,7 +49,7 @@
 	loadfont
 	writetext UnknownText_0x18c9bf
 	keeptextopen
-	giveitem TM_DRAGONBREATH, $1
+	giveitem TM_DRAGONBREATH, 1
 	iffalse UnknownScript_0x18c8f4
 	itemtotext TM_DRAGONBREATH, $0
 	writetext UnknownText_0x18c9fb
@@ -122,7 +122,7 @@
 	end
 
 PokeBallScript_0x18c95a:
-	giveitem DRAGON_FANG, $1
+	giveitem DRAGON_FANG, 1
 	iffalse UnknownScript_0x18c970
 	disappear $2
 	loadfont
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -499,7 +499,7 @@
 	keeptextopen
 	itemtotext POKE_BALL, $1
 	scall AideScript_ReceiveTheBalls
-	giveitem POKE_BALL, $5
+	giveitem POKE_BALL, 5
 	writetext AideText_ExplainBalls
 	keeptextopen
 	itemnotify
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -22,7 +22,7 @@
 .FreshWater
 	checkmoney $0, 200
 	if_equal $2, .NotEnoughMoney
-	giveitem FRESH_WATER, $1
+	giveitem FRESH_WATER, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 200
 	itemtotext FRESH_WATER, $0
@@ -31,7 +31,7 @@
 .SodaPop
 	checkmoney $0, 300
 	if_equal $2, .NotEnoughMoney
-	giveitem SODA_POP, $1
+	giveitem SODA_POP, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 300
 	itemtotext SODA_POP, $0
@@ -40,7 +40,7 @@
 .Lemonade
 	checkmoney $0, 350
 	if_equal $2, .NotEnoughMoney
-	giveitem LEMONADE, $1
+	giveitem LEMONADE, 1
 	iffalse .NotEnoughSpace
 	takemoney $0, 350
 	itemtotext LEMONADE, $0
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -64,7 +64,7 @@
 	itemtotext TM_THUNDER, $0
 	scall UnknownScript_0x56ca1
 	iffalse UnknownScript_0x56cbd
-	giveitem TM_THUNDER, $1
+	giveitem TM_THUNDER, 1
 	iffalse UnknownScript_0x56cb7
 	takecoins 5500
 	jump UnknownScript_0x56ca6
@@ -75,7 +75,7 @@
 	itemtotext TM_BLIZZARD, $0
 	scall UnknownScript_0x56ca1
 	iffalse UnknownScript_0x56cbd
-	giveitem TM_BLIZZARD, $1
+	giveitem TM_BLIZZARD, 1
 	iffalse UnknownScript_0x56cb7
 	takecoins 5500
 	jump UnknownScript_0x56ca6
@@ -86,7 +86,7 @@
 	itemtotext TM_FIRE_BLAST, $0
 	scall UnknownScript_0x56ca1
 	iffalse UnknownScript_0x56cbd
-	giveitem TM_FIRE_BLAST, $1
+	giveitem TM_FIRE_BLAST, 1
 	iffalse UnknownScript_0x56cb7
 	takecoins 5500
 	jump UnknownScript_0x56ca6
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -106,7 +106,7 @@
 	end
 
 UnknownScript_0x61051:
-	giveitem EON_MAIL, $1
+	giveitem EON_MAIL, 1
 	writetext UnknownText_0x6252a
 	closetext
 	loadmovesprites
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -85,7 +85,7 @@
 UnknownScript_0x7007a:
 	returnafterbattle
 	loadfont
-	giveitem RED_SCALE, $1
+	giveitem RED_SCALE, 1
 	waitbutton
 	writetext UnknownText_0x703df
 	playsound SFX_ITEM
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -56,7 +56,7 @@
 	iffalse UnknownScript_0x190072
 	checkmoney $0, 300
 	if_equal $2, UnknownScript_0x19006c
-	giveitem RAGECANDYBAR, $1
+	giveitem RAGECANDYBAR, 1
 	iffalse UnknownScript_0x190078
 	waitbutton
 	playsound SFX_TRANSACTION
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -28,7 +28,7 @@
 	writetext UnknownText_0x196fa8
 	keeptextopen
 	waitbutton
-	giveitem MYSTERY_EGG, $1
+	giveitem MYSTERY_EGG, 1
 	writetext UnknownText_0x196fd2
 	playsound SFX_KEY_ITEM
 	waitbutton
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -69,7 +69,7 @@
 	writetext UnknownText_0x191c5a
 	keeptextopen
 	waitbutton
-	giveitem LOST_ITEM, $1
+	giveitem LOST_ITEM, 1
 	iffalse UnknownScript_0x191865
 	disappear $6
 	writetext UnknownText_0x191d0a
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -25,7 +25,7 @@
 	iffalse UnknownScript_0x9cf02
 	checkmoney $0, 500
 	if_equal $2, UnknownScript_0x9cef6
-	giveitem MOOMOO_MILK, $1
+	giveitem MOOMOO_MILK, 1
 	iffalse UnknownScript_0x9cefc
 	takemoney $0, 500
 	special Function24ae8
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -6527,7 +6527,7 @@
 	jr nz, .asm_102c05
 
 .asm_102bfa
-	ld bc, OTPartyMon1Level - OTPartyMon1
+	ld bc, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
 	cp MAX_LEVEL + 1
@@ -6718,7 +6718,7 @@
 	call SetSeenAndCaughtMon
 	ld a, [wcd4c]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1Happiness
 	call AddNTimes
 	ld [hl], BASE_HAPPINESS
@@ -6729,7 +6729,7 @@
 	jr nz, .asm_102d98
 	ld a, [wcd4c]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, PartyMon1DVs
 	call AddNTimes
 	predef GetUnownLetter
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -4101,7 +4101,7 @@
 	call SimpleMultiply
 	ld hl, wcd50
 	ld [hl], a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, PartyMon1Level
 	ld a, [PartyCount]
 .asm_119daf
@@ -4143,7 +4143,7 @@
 	ld a, $1
 	ld [rSVBK], a ; $ff00+$70
 	ld hl, PartyMon1Level
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, PartySpecies
 	ld a, [PartyCount]
 .asm_119deb
@@ -7867,7 +7867,7 @@
 	ld a, $ff
 	ld [bc], a
 	ld hl, PartyMon1Species
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, e
 	ld [wcd2a], a
 .loop2
@@ -7881,7 +7881,7 @@
 	ld l, a
 	ld a, [wcd23]
 	ld h, a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	ld hl, PartyMonOT
 	ld bc, NAME_LENGTH
@@ -7920,7 +7920,7 @@
 	ld a, "@"
 	ld [de], a
 	ld hl, s0_a600
-	ld bc, party_struct_length - 1
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 	ld a, [wcd2a]
 .loop5
 	add hl, bc
@@ -7935,7 +7935,7 @@
 	ld l, a
 	ld a, [wcd29]
 	ld h, a
-	ld bc, party_struct_length - 1
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 	call CopyBytes
 	call CloseSRAM
 	ret
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -431,7 +431,7 @@
 	ld [bc], a
 	inc bc
 	push bc
-	ld bc, party_struct_length
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	push de
 	ld a, [BGMapBuffer]
@@ -648,7 +648,7 @@
 	ld hl, BT_OTrainer ; $d100
 	ld de, wBT_OTTempCopy ; $c608
 	ld bc, BT_OTrainerEnd - BT_OTrainer ; $e0 = $a + $1 + 3*$3b + $24
-                                        ;	  = $a + $1 + BATTLETOWER_NROFPKMNS * (party_struct_length + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
+                                        ;	  = $a + $1 + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
 	call CopyBytes
 	pop af
 	ld [rSVBK], a
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -410,7 +410,7 @@
 	ld hl, PartyMon1DVs
 	ld a, [PartyCount]
 	dec a
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	predef GetUnownLetter
 	callab Functionfba18
@@ -2398,7 +2398,7 @@
 	ld a, [hli]
 	ld b, a
 	push hl
-	callba SetPkmnCaughtData
+	callba SetPartymonCaughtData
 	pop hl
 	pop bc
 	jr .asm_17df5e
@@ -2585,7 +2585,7 @@
 	ld b, a
 	push hl
 	call CloseSRAM
-	callba Function4db92
+	callba SetBoxMonCaughtData
 	ld a, $1
 	call GetSRAMBank
 	pop hl
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -615,7 +615,7 @@
 
 .asm_91f5
 	ld hl, PartyMon1DVs
-	ld bc, PartyMon2 - PartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld c, l
--- a/sram.asm
+++ b/sram.asm
@@ -9,12 +9,12 @@
 
 SECTION "SRAM Bank 0", SRAM [$a600], BANK [0]
 
-s0_a600:: ds 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
-s0_a71a:: ds 6 * (party_struct_length + PartyMon1 - PartyMon1Item)
+s0_a600:: ds 6 * (SCRATCHMON_STRUCT_LENGTH)
+s0_a71a:: ds 6 * (SCRATCHMON_STRUCT_LENGTH)
 s0_a834:: ds 1
-s0_a835:: ds 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
+s0_a835:: ds 10 * (SCRATCHMON_STRUCT_LENGTH)
 s0_aa0b:: ds 1
-s0_aa0c:: ds 10 * (party_struct_length + PartyMon1 - PartyMon1Item)
+s0_aa0c:: ds 10 * (SCRATCHMON_STRUCT_LENGTH)
 
 sMysteryGiftItem:: ds 1
 s0_abe3:: ds 1
--- a/wram.asm
+++ b/wram.asm
@@ -4,7 +4,6 @@
 	ds ((\1) + 7) / 8
 ENDM
 
-box_struct_length EQU 24 + NUM_MOVES * 2 ; 32
 box_struct: MACRO
 \1Species::        db
 \1Item::           db
@@ -30,7 +29,6 @@
 \1End::
 ENDM
 
-party_struct_length EQU box_struct_length + 16
 party_struct: MACRO
 	box_struct \1
 \1Status::         db
@@ -76,7 +74,7 @@
 \1Species::         ds MONS_PER_BOX + 1
 \1Mons::
 \1Mon1::            box_struct \1Mon1
-\1Mon2::            ds box_struct_length * (MONS_PER_BOX +- 1)
+\1Mon2::            ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX +- 1)
 \1MonOT::           ds NAME_LENGTH * MONS_PER_BOX
 \1MonNicknames::    ds PKMN_NAME_LENGTH * MONS_PER_BOX
 \1MonNicknamesEnd::
@@ -129,7 +127,6 @@
                       ds 1 ; c131
                       ds 1 ; c132
 ENDM
-GLOBAL box_struct_length, party_struct_length
 
 INCLUDE "vram.asm"
 
@@ -885,15 +882,15 @@
 
 
 RSSET 0 ; Offsets for wBT_OTTempCopy:: @ $c608
-wBT_OTTempCopy_0			RB 10	                 ; $c608
+wBT_OTTempCopy_0			RB NAME_LENGTH + -1      ; $c608
 wBT_OTTempCopy_TrainerClass	RB 1	                 ; $c608 + $a = $c612
-wBT_OTTempCopy_Pkmn1		RB party_struct_length   ; $c608 + $b = $c613
+wBT_OTTempCopy_Pkmn1		RB $30 ; PARTYMON_STRUCT_LENGTH   ; $c608 + $b = $c613
 wBT_OTTempCopy_Pkmn1Name	RB PKMN_NAME_LENGTH + -1 ; $c608 + $45 = $c64d
 wBT_OTTempCopy_45           RB 1
-wBT_OTTempCopy_Pkmn2		RB party_struct_length   ; $c608 + $46 = $c64e
+wBT_OTTempCopy_Pkmn2		RB $30 ; PARTYMON_STRUCT_LENGTH   ; $c608 + $46 = $c64e
 wBT_OTTempCopy_Pkmn2Name	RB PKMN_NAME_LENGTH + -1 ; $c608 + $76 = $c67e
 wBT_OTTempCopy_80           RB 1
-wBT_OTTempCopy_Pkmn3		RB party_struct_length   ; $c608 + $81 = $c689
+wBT_OTTempCopy_Pkmn3		RB $30 ; PARTYMON_STRUCT_LENGTH   ; $c608 + $81 = $c689
 wBT_OTTempCopy_Pkmn3Name	RB PKMN_NAME_LENGTH + -1 ; $c608 + $b1 = $c6b9
 wBT_OTTempCopy_BB           RB 1