Split base stats

battle/effect_commands.asm

@@ -136,7 +136,7 @@ BattleCommand_CheckTurn: ; 34084
 	ld [wKickCounter], a
 	ld [AlreadyDisobeyed], a
 	ld [AlreadyFailed], a
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 
 	ld a, 10 ; 1.0
 	ld [TypeModifier], a
@@ -2114,10 +2114,10 @@ BattleCommand_LowerSub: ; 34eee
 	ret
 
 .rollout_rampage
-	ld a, [wc73e]
+	ld a, [wSomeoneIsRampaging]
 	and a
 	ld a, 0
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 	ret
 
 ; 34f57
@@ -6600,7 +6600,7 @@ BattleCommand_Rampage: ; 36751
 	inc a
 	ld [de], a
 	ld a, 1
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 	ret
 
 ; 36778

battle/effects/rollout.asm

@@ -36,17 +36,17 @@ BattleCommand_RolloutPower: ; 37734
 	ld hl, PlayerRolloutCount
 	ld a, [hBattleTurn]
 	and a
-	jr z, .asm_37747
+	jr z, .got_rollout_count
 	ld hl, EnemyRolloutCount
 
-.asm_37747
+.got_rollout_count
 	ld a, [hl]
 	and a
-	jr nz, .asm_37750
+	jr nz, .skip_set_rampage
 	ld a, 1
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 
-.asm_37750
+.skip_set_rampage
 	ld a, [AttackMissed]
 	and a
 	jr z, .hit
@@ -61,38 +61,39 @@ BattleCommand_RolloutPower: ; 37734
 	ld a, [hl]
 	ld b, a
 	cp MAX_ROLLOUT_COUNT
-	jr c, .asm_3776e
+	jr c, .not_done_with_rollout
 
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	res SUBSTATUS_ROLLOUT, [hl]
-	jr .asm_37775
+	jr .done_with_substatus_flag
 
-.asm_3776e
+.not_done_with_rollout
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	set SUBSTATUS_ROLLOUT, [hl]
 
-.asm_37775
+.done_with_substatus_flag
 	ld a, BATTLE_VARS_SUBSTATUS2
 	call GetBattleVar
 	bit SUBSTATUS_CURLED, a
-	jr z, .asm_3777f
+	jr z, .not_curled
 	inc b
-.asm_3777f
+.not_curled
+.loop
 	dec b
-	jr z, .asm_37790
+	jr z, .done_damage
 
 	ld hl, CurDamage + 1
 	sla [hl]
 	dec hl
 	rl [hl]
-	jr nc, .asm_3777f
+	jr nc, .loop
 
 	ld a, $ff
 	ld [hli], a
 	ld [hl], a
 
-.asm_37790
+.done_damage
 	ret
 ; 37791

constants/cgb_constants.asm

@@ -17,7 +17,7 @@
 	const SCGB_0F
 	const SCGB_10
 	const SCGB_11
-	const SCGB_12
+	const SCGB_POKEPIC
 	const SCGB_13
 	const SCGB_PACKPALS
 	const SCGB_TRAINER_CARD

data/base_stats/abra.asm

@@ -0,0 +1,22 @@
+	db ABRA ; 063
+
+	db  25,  20,  15,  90, 105,  55
+	;   hp  atk  def  spd  sat  sdf
+
+	db PSYCHIC, PSYCHIC
+	db 200 ; catch rate
+	db 73 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 63 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 5, 5 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
+	; end

data/base_stats/aerodactyl.asm

@@ -0,0 +1,22 @@
+	db AERODACTYL ; 142
+
+	db  80, 105,  65, 130,  60,  75
+	;   hp  atk  def  spd  sat  sdf
+
+	db ROCK, FLYING
+	db 45 ; catch rate
+	db 202 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 31 ; gender
+	db 100 ; unknown
+	db 35 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db FAST ; growth rate
+	dn AVIAN, AVIAN ; egg groups
+
+	; tmhm
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER
+	; end

data/base_stats/aipom.asm

@@ -0,0 +1,22 @@
+	db AIPOM ; 190
+
+	db  55,  70,  55,  85,  40,  55
+	;   hp  atk  def  spd  sat  sdf
+
+	db NORMAL, NORMAL
+	db 45 ; catch rate
+	db 94 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 5, 5 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db SLOW ; growth rate
+	dn FIELD, FIELD ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT
+	; end

data/base_stats/alakazam.asm

@@ -0,0 +1,22 @@
+	db ALAKAZAM ; 065
+
+	db  55,  50,  45, 120, 135,  85
+	;   hp  atk  def  spd  sat  sdf
+
+	db PSYCHIC, PSYCHIC
+	db 50 ; catch rate
+	db 186 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 63 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
+	; end

data/base_stats/ampharos.asm

@@ -0,0 +1,22 @@
+	db AMPHAROS ; 181
+
+	db  90,  75,  75,  55, 115,  90
+	;   hp  atk  def  spd  sat  sdf
+
+	db ELECTRIC, ELECTRIC
+	db 45 ; catch rate
+	db 194 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn MONSTER, FIELD ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
+	; end

data/base_stats/arbok.asm

@@ -0,0 +1,22 @@
+	db ARBOK ; 024
+
+	db  60,  85,  69,  80,  65,  79
+	;   hp  atk  def  spd  sat  sdf
+
+	db POISON, POISON
+	db 90 ; catch rate
+	db 147 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_FAST ; growth rate
+	dn FIELD, REPTILE ; egg groups
+
+	; tmhm
+	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
+	; end

data/base_stats/arcanine.asm

@@ -0,0 +1,22 @@
+	db ARCANINE ; 059
+
+	db  90, 110,  80,  95, 100,  80
+	;   hp  atk  def  spd  sat  sdf
+
+	db FIRE, FIRE
+	db 75 ; catch rate
+	db 213 ; base exp
+	db BURNT_BERRY ; item 1
+	db BURNT_BERRY ; item 2
+	db 63 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db FAST ; growth rate
+	dn FIELD, FIELD ; egg groups
+
+	; tmhm
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
+	; end

data/base_stats/ariados.asm

@@ -0,0 +1,22 @@
+	db ARIADOS ; 168
+
+	db  70,  90,  70,  40,  60,  60
+	;   hp  atk  def  spd  sat  sdf
+
+	db BUG, POISON
+	db 90 ; catch rate
+	db 134 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 15 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db SLOW ; growth rate
+	dn INSECT, INSECT ; egg groups
+
+	; tmhm
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
+	; end

data/base_stats/articuno.asm

@@ -0,0 +1,22 @@
+	db ARTICUNO ; 144
+
+	db  90,  85, 100,  85,  95, 125
+	;   hp  atk  def  spd  sat  sdf
+
+	db ICE, FLYING
+	db 3 ; catch rate
+	db 215 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 255 ; gender
+	db 100 ; unknown
+	db 80 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db FAST ; growth rate
+	dn NO_EGGS, NO_EGGS ; egg groups
+
+	; tmhm
+	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM
+	; end

data/base_stats/azumarill.asm

@@ -0,0 +1,22 @@
+	db AZUMARILL ; 184
+
+	db 100,  50,  80,  50,  50,  80
+	;   hp  atk  def  spd  sat  sdf
+
+	db WATER, WATER
+	db 75 ; catch rate
+	db 153 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db SLOW ; growth rate
+	dn AMPHIBIAN, FAIRY ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
+	; end

data/base_stats/bayleef.asm

@@ -0,0 +1,22 @@
+	db BAYLEEF ; 153
+
+	db  60,  62,  80,  60,  63,  80
+	;   hp  atk  def  spd  sat  sdf
+
+	db GRASS, GRASS
+	db 45 ; catch rate
+	db 141 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 31 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 6, 6 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn MONSTER, PLANT ; egg groups
+
+	; tmhm
+	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
+	; end

data/base_stats/beedrill.asm

@@ -0,0 +1,22 @@
+	db BEEDRILL ; 015
+
+	db  65,  80,  40,  75,  45,  80
+	;   hp  atk  def  spd  sat  sdf
+
+	db BUG, POISON
+	db 45 ; catch rate
+	db 159 ; base exp
+	db NO_ITEM ; item 1
+	db POISON_BARB ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 15 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_FAST ; growth rate
+	dn INSECT, INSECT ; egg groups
+
+	; tmhm
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT
+	; end

data/base_stats/bellossom.asm

@@ -0,0 +1,22 @@
+	db BELLOSSOM ; 182
+
+	db  75,  80,  85,  50,  90, 100
+	;   hp  atk  def  spd  sat  sdf
+
+	db GRASS, GRASS
+	db 45 ; catch rate
+	db 184 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn PLANT, PLANT ; egg groups
+
+	; tmhm
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH
+	; end

data/base_stats/bellsprout.asm

@@ -0,0 +1,22 @@
+	db BELLSPROUT ; 069
+
+	db  50,  75,  35,  40,  70,  30
+	;   hp  atk  def  spd  sat  sdf
+
+	db GRASS, POISON
+	db 255 ; catch rate
+	db 84 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 127 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 5, 5 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn PLANT, PLANT ; egg groups
+
+	; tmhm
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
+	; end

data/base_stats/blastoise.asm

@@ -0,0 +1,22 @@
+	db BLASTOISE ; 009
+
+	db  79,  83, 100,  78,  85, 105
+	;   hp  atk  def  spd  sat  sdf
+
+	db WATER, WATER
+	db 45 ; catch rate
+	db 210 ; base exp
+	db NO_ITEM ; item 1
+	db NO_ITEM ; item 2
+	db 31 ; gender
+	db 100 ; unknown
+	db 20 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db MEDIUM_SLOW ; growth rate
+	dn MONSTER, AMPHIBIAN ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
+	; end

data/base_stats/blissey.asm

@@ -0,0 +1,22 @@
+	db BLISSEY ; 242
+
+	db 255,  10,  10,  55,  75, 135
+	;   hp  atk  def  spd  sat  sdf
+
+	db NORMAL, NORMAL
+	db 30 ; catch rate
+	db 255 ; base exp
+	db NO_ITEM ; item 1
+	db LUCKY_EGG ; item 2
+	db 254 ; gender
+	db 100 ; unknown
+	db 40 ; step cycles to hatch
+	db 5 ; unknown
+	dn 7, 7 ; frontpic dimensions
+	db 0, 0, 0, 0 ; padding
+	db SLOW ; growth rate
+	dn FAIRY, FAIRY ; egg groups
+
+	; tmhm
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	; end