ref: b97287be2923a037cd9aa5f3b35887feb31b0c03
parent: 88f1b8165b4e0ce0e416e26d7cb7b3105b8f8c31
parent: e5f9fddb86cd005d0dbcbb0fd1d4a04d3e6fee45
author: Marcus Huderle <[email protected]>
date: Tue Nov 21 12:15:25 EST 2017
Merge pull request #397 from mid-kid/master A few more labels and comments
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -320,15 +320,15 @@
.table_386f2
dbw EFFECT_SLEEP, AI_Smart_Sleep
dbw EFFECT_LEECH_HIT, AI_Smart_LeechHit
- dbw EFFECT_EXPLOSION, AI_Smart_Explosion
+ dbw EFFECT_SELFDESTRUCT, AI_Smart_Selfdestruct
dbw EFFECT_DREAM_EATER, AI_Smart_DreamEater
dbw EFFECT_MIRROR_MOVE, AI_Smart_MirrorMove
dbw EFFECT_EVASION_UP, AI_Smart_EvasionUp
dbw EFFECT_ALWAYS_HIT, AI_Smart_AlwaysHit
dbw EFFECT_ACCURACY_DOWN, AI_Smart_AccuracyDown
- dbw EFFECT_HAZE, AI_Smart_Haze
+ dbw EFFECT_RESET_STATS, AI_Smart_ResetStats
dbw EFFECT_BIDE, AI_Smart_Bide
- dbw EFFECT_WHIRLWIND, AI_Smart_Whirlwind
+ dbw EFFECT_FORCE_SWITCH, AI_Smart_ForceSwitch
dbw EFFECT_HEAL, AI_Smart_Heal
dbw EFFECT_TOXIC, AI_Smart_Toxic
dbw EFFECT_LIGHT_SCREEN, AI_Smart_LightScreen
@@ -335,7 +335,7 @@
dbw EFFECT_OHKO, AI_Smart_Ohko
dbw EFFECT_RAZOR_WIND, AI_Smart_RazorWind
dbw EFFECT_SUPER_FANG, AI_Smart_SuperFang
- dbw EFFECT_BIND, AI_Smart_Bind
+ dbw EFFECT_TRAP_TARGET, AI_Smart_TrapTarget
dbw EFFECT_UNUSED_2B, AI_Smart_Unused2B
dbw EFFECT_CONFUSE, AI_Smart_Confuse
dbw EFFECT_SP_DEF_UP_2, AI_Smart_SpDefenseUp2
@@ -565,7 +565,7 @@
; 388a6
-AI_Smart_Explosion: ; 388a6
+AI_Smart_Selfdestruct: ; 388a6
; Selfdestruct, Explosion
; Unless this is the enemy's last Pokemon...
@@ -904,7 +904,7 @@
; 389f5
-AI_Smart_Haze: ; 389f5
+AI_Smart_ResetStats: ; 389f5
; 85% chance to encourage this move if any of enemy's stat levels is lower than -2.
push hl
@@ -960,7 +960,7 @@
; 38a2a
-AI_Smart_Whirlwind: ; 38a2a
+AI_Smart_ForceSwitch: ; 38a2a
; Whirlwind, Roar.
; Discourage this move if the player has not shown
@@ -1044,7 +1044,7 @@
; 38a71
-AI_Smart_Bind: ; 38a71
+AI_Smart_TrapTarget: ; 38a71
; Bind, Wrap, Fire Spin, Clamp
; 50% chance to discourage this move if the player is already trapped.
@@ -3317,7 +3317,7 @@
ret
.RecklessMoves:
- db EFFECT_EXPLOSION
+ db EFFECT_SELFDESTRUCT
db EFFECT_RAMPAGE
db EFFECT_MULTI_HIT
db EFFECT_DOUBLE_HIT
@@ -3539,7 +3539,7 @@
jr .checkmove
.RiskyMoves:
- db EFFECT_EXPLOSION
+ db EFFECT_SELFDESTRUCT
db EFFECT_OHKO
db $ff
; 39502
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -903,7 +903,7 @@
db EFFECT_PROTECT, 3
db EFFECT_ENDURE, 3
db EFFECT_PRIORITY_HIT, 2
- db EFFECT_WHIRLWIND, 0
+ db EFFECT_FORCE_SWITCH, 0
db EFFECT_COUNTER, 0
db EFFECT_MIRROR_COAT, 0
db -1
@@ -8640,7 +8640,7 @@
call ShowLinkBattleParticipantsAfterEnd
ld c, 150
call DelayFrames
- call DetermineMobileBattleResult
+ call DisplayLinkBattleResult
ret
.not_linked
@@ -8737,7 +8737,7 @@
ret
; 3f77c
-DetermineMobileBattleResult: ; 3f77c
+DisplayLinkBattleResult: ; 3f77c
callba CheckMobileBattleError
jp c, .Mobile_InvalidBattle
call IsMobileBattle2
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -26,7 +26,7 @@
dw BattleCommand_BurnTarget ; 3608c
dw BattleCommand_FreezeTarget ; 36102
dw BattleCommand_ParalyzeTarget ; 36165
- dw BattleCommand_SelfDestruct ; 37380
+ dw BattleCommand_Selfdestruct ; 37380
dw BattleCommand_MirrorMove ; 373c9
dw BattleCommand_StatUp ; 361e4
dw BattleCommand_StatDown ; 362e3
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -2167,7 +2167,7 @@
jr z, .conversion
cp EFFECT_DOUBLE_HIT
jr z, .doublehit
- cp EFFECT_TWINEEDLE
+ cp EFFECT_POISON_MULTI_HIT
jr z, .twineedle
cp EFFECT_TRIPLE_KICK
jr z, .triplekick
@@ -2315,7 +2315,7 @@
jr z, .multihit
cp EFFECT_DOUBLE_HIT
jr z, .multihit
- cp EFFECT_TWINEEDLE
+ cp EFFECT_POISON_MULTI_HIT
jr z, .multihit
jp EndMoveEffect
@@ -2661,7 +2661,7 @@
jr z, .multiple_hit_raise_sub
cp EFFECT_DOUBLE_HIT
jr z, .multiple_hit_raise_sub
- cp EFFECT_TWINEEDLE
+ cp EFFECT_POISON_MULTI_HIT
jr z, .multiple_hit_raise_sub
cp EFFECT_TRIPLE_KICK
jr z, .multiple_hit_raise_sub
@@ -3434,14 +3434,14 @@
call GetBattleVar
; Selfdestruct and Explosion halve defense.
- cp EFFECT_EXPLOSION
- jr nz, .dont_explode
+ cp EFFECT_SELFDESTRUCT
+ jr nz, .dont_selfdestruct
srl c
- jr nz, .dont_explode
+ jr nz, .dont_selfdestruct
inc c
-.dont_explode
+.dont_selfdestruct
; Variable-hit moves and Conversion can have a power of 0.
cp EFFECT_MULTI_HIT
@@ -4919,7 +4919,7 @@
jr z, .ok
cp EFFECT_DOUBLE_HIT
jr z, .ok
- cp EFFECT_TWINEEDLE
+ cp EFFECT_POISON_MULTI_HIT
jr z, .ok
cp EFFECT_TRIPLE_KICK
jr z, .ok
@@ -6999,7 +6999,7 @@
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
ld a, [hl]
- cp EFFECT_TWINEEDLE
+ cp EFFECT_POISON_MULTI_HIT
jr z, .twineedle
cp EFFECT_DOUBLE_HIT
ld a, 1
@@ -8605,8 +8605,8 @@
; 37380
-BattleCommand_SelfDestruct: ; 37380
- callba TrainerRankings_SelfDestruct
+BattleCommand_Selfdestruct: ; 37380
+ callba TrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld c, 3
--- a/battle/moves/move_effects.asm
+++ b/battle/moves/move_effects.asm
@@ -1,38 +1,3 @@
-Pound:
-KarateChop:
-MegaPunch:
-Scratch:
-Vicegrip:
-Cut:
-WingAttack:
-Slam:
-VineWhip:
-MegaKick:
-HornAttack:
-Tackle:
-WaterGun:
-HydroPump:
-Surf:
-Peck:
-DrillPeck:
-Strength:
-RazorLeaf:
-RockThrow:
-EggBomb:
-Waterfall:
-Crabhammer:
-Slash:
-Aeroblast:
-Megahorn:
-CrossChop:
-Swift:
-FaintAttack:
-VitalThrow:
-JumpKick:
-HiJumpKick:
-QuickAttack:
-MachPunch:
-Extremespeed:
NormalHit:
checkobedience
usedmovetext
@@ -53,11 +18,6 @@
kingsrock
endmove
-Sing:
-SleepPowder:
-Hypnosis:
-LovelyKiss:
-Spore:
DoSleep:
checkobedience
usedmovetext
@@ -67,10 +27,6 @@
sleeptarget
endmove
-PoisonSting:
-Smog:
-Sludge:
-SludgeBomb:
PoisonHit:
checkobedience
usedmovetext
@@ -92,10 +48,6 @@
poisontarget
endmove
-Absorb:
-MegaDrain:
-LeechLife:
-GigaDrain:
LeechHit:
checkobedience
usedmovetext
@@ -117,10 +69,6 @@
kingsrock
endmove
-FirePunch:
-Ember:
-Flamethrower:
-FireBlast:
BurnHit:
checkobedience
usedmovetext
@@ -142,10 +90,6 @@
burntarget
endmove
-IcePunch:
-IceBeam:
-Blizzard:
-PowderSnow:
FreezeHit:
checkobedience
usedmovetext
@@ -167,14 +111,6 @@
freezetarget
endmove
-Thunderpunch:
-BodySlam:
-Thundershock:
-Thunderbolt:
-Lick:
-ZapCannon:
-Spark:
-Dragonbreath:
ParalyzeHit:
checkobedience
usedmovetext
@@ -197,7 +133,6 @@
endmove
Selfdestruct:
-Explosion:
checkobedience
usedmovetext
doturn
@@ -245,8 +180,6 @@
mirrormove
endmove
-Meditate:
-Sharpen:
AttackUp:
checkobedience
usedmovetext
@@ -259,8 +192,6 @@
statupfailtext
endmove
-Harden:
-Withdraw:
DefenseUp:
checkobedience
usedmovetext
@@ -285,7 +216,6 @@
statupfailtext
endmove
-Growth:
SpecialAttackUp:
checkobedience
usedmovetext
@@ -322,8 +252,6 @@
statupfailtext
endmove
-DoubleTeam:
-Minimize:
EvasionUp:
checkobedience
usedmovetext
@@ -337,7 +265,6 @@
statupfailtext
endmove
-SwordsDance:
AttackUp2:
checkobedience
usedmovetext
@@ -350,8 +277,6 @@
statupfailtext
endmove
-Barrier:
-AcidArmor:
DefenseUp2:
checkobedience
usedmovetext
@@ -364,7 +289,6 @@
statupfailtext
endmove
-Agility:
SpeedUp2:
checkobedience
usedmovetext
@@ -389,7 +313,6 @@
statupfailtext
endmove
-Amnesia:
SpecialDefenseUp2:
checkobedience
usedmovetext
@@ -426,7 +349,6 @@
statupfailtext
endmove
-Growl:
AttackDown:
checkobedience
usedmovetext
@@ -440,8 +362,6 @@
statdownfailtext
endmove
-TailWhip:
-Leer:
DefenseDown:
checkobedience
usedmovetext
@@ -455,7 +375,6 @@
statdownfailtext
endmove
-StringShot:
SpeedDown:
checkobedience
usedmovetext
@@ -495,10 +414,6 @@
statdownfailtext
endmove
-SandAttack:
-Smokescreen:
-Kinesis:
-Flash:
AccuracyDown:
checkobedience
usedmovetext
@@ -512,7 +427,6 @@
statdownfailtext
endmove
-SweetScent:
EvasionDown:
checkobedience
usedmovetext
@@ -526,7 +440,6 @@
statdownfailtext
endmove
-Charm:
AttackDown2:
checkobedience
usedmovetext
@@ -540,7 +453,6 @@
statdownfailtext
endmove
-Screech:
DefenseDown2:
checkobedience
usedmovetext
@@ -554,8 +466,6 @@
statdownfailtext
endmove
-CottonSpore:
-ScaryFace:
SpeedDown2:
checkobedience
usedmovetext
@@ -621,7 +531,6 @@
statdownfailtext
endmove
-AuroraBeam:
AttackDownHit:
checkobedience
usedmovetext
@@ -644,9 +553,6 @@
statdownmessage
endmove
-Acid:
-IronTail:
-RockSmash:
DefenseDownHit:
checkobedience
usedmovetext
@@ -670,10 +576,6 @@
statdownmessage
endmove
-Bubblebeam:
-Constrict:
-Bubble:
-IcyWind:
SpeedDownHit:
checkobedience
usedmovetext
@@ -718,9 +620,6 @@
statdownmessage
endmove
-PsychicM:
-Crunch:
-ShadowBall:
SpecialDefenseDownHit:
checkobedience
usedmovetext
@@ -743,8 +642,6 @@
statdownmessage
endmove
-MudSlap:
-Octazooka:
AccuracyDownHit:
checkobedience
usedmovetext
@@ -789,7 +686,6 @@
statdownmessage
endmove
-SteelWing:
DefenseUpHit:
checkobedience
usedmovetext
@@ -812,7 +708,6 @@
statupmessage
endmove
-MetalClaw:
AttackUpHit:
checkobedience
usedmovetext
@@ -835,7 +730,6 @@
statupmessage
endmove
-Ancientpower:
AllUpHit:
checkobedience
usedmovetext
@@ -885,7 +779,7 @@
conversion
endmove
-Haze:
+ResetStats:
checkobedience
usedmovetext
doturn
@@ -908,9 +802,6 @@
kingsrock
endmove
-Thrash:
-PetalDance:
-Outrage:
Rampage:
checkrampage
checkobedience
@@ -934,8 +825,7 @@
kingsrock
endmove
-Whirlwind:
-Roar:
+ForceSwitch:
checkobedience
usedmovetext
doturn
@@ -943,16 +833,6 @@
forceswitch
endmove
-Doubleslap:
-CometPunch:
-FuryAttack:
-PinMissile:
-SpikeCannon:
-Barrage:
-FurySwipes:
-BoneRush:
-DoubleKick:
-Bonemerang:
MultiHit:
checkobedience
usedmovetext
@@ -979,7 +859,6 @@
kingsrock
endmove
-Twineedle:
PoisonMultiHit:
checkobedience
usedmovetext
@@ -1008,13 +887,6 @@
poisontarget
endmove
-RollingKick:
-Headbutt:
-Bite:
-LowKick:
-BoneClub:
-RockSlide:
-HyperFang:
FlinchHit:
checkobedience
usedmovetext
@@ -1036,9 +908,6 @@
flinchtarget
endmove
-Guillotine:
-HornDrill:
-Fissure:
OHKOHit:
checkobedience
usedmovetext
@@ -1054,10 +923,6 @@
buildopponentrage
endmove
-TakeDown:
-DoubleEdge:
-Submission:
-Struggle:
RecoilHit:
checkobedience
usedmovetext
@@ -1087,7 +952,6 @@
endmove
FocusEnergy:
-CriticalUp:
checkobedience
usedmovetext
doturn
@@ -1094,9 +958,6 @@
focusenergy
endmove
-Supersonic:
-ConfuseRay:
-SweetKiss:
DoConfuse:
checkobedience
usedmovetext
@@ -1106,10 +967,6 @@
confuse
endmove
-Psybeam:
-Confusion:
-DizzyPunch:
-Dynamicpunch:
ConfuseHit:
checkobedience
usedmovetext
@@ -1131,10 +988,6 @@
confusetarget
endmove
-Recover:
-Softboiled:
-Rest:
-MilkDrink:
Heal:
checkobedience
usedmovetext
@@ -1151,7 +1004,6 @@
LightScreen:
Reflect:
-Screen:
checkobedience
usedmovetext
doturn
@@ -1179,8 +1031,6 @@
endmove
Toxic:
-Poisonpowder:
-PoisonGas:
DoPoison:
checkobedience
usedmovetext
@@ -1191,9 +1041,6 @@
poison
endmove
-StunSpore:
-ThunderWave:
-Glare:
DoParalyze:
checkobedience
usedmovetext
@@ -1338,7 +1185,6 @@
endmove
Fly:
-Dig:
checkcharge
checkobedience
doturn
@@ -1361,11 +1207,7 @@
kingsrock
endmove
-Bind:
-Wrap:
-FireSpin:
-Clamp:
-Whirlpool:
+TrapTarget:
checkobedience
usedmovetext
doturn
@@ -1387,10 +1229,6 @@
endmove
SuperFang:
-Sonicboom:
-DragonRage:
-SeismicToss:
-NightShade:
Psywave:
StaticDamage:
checkobedience
@@ -1407,7 +1245,6 @@
kingsrock
endmove
-Flail:
Reversal:
checkobedience
usedmovetext
@@ -1484,7 +1321,6 @@
conversion2
endmove
-MindReader:
LockOn:
checkobedience
usedmovetext
@@ -1607,7 +1443,6 @@
kingsrock
endmove
-SpiderWeb:
MeanLook:
checkobedience
usedmovetext
@@ -1652,7 +1487,6 @@
endmove
Protect:
-Detect:
checkobedience
usedmovetext
doturn
--- a/battle/moves/move_effects_pointers.asm
+++ b/battle/moves/move_effects_pointers.asm
@@ -5,28 +5,28 @@
dw BurnHit
dw FreezeHit
dw ParalyzeHit
- dw Explosion
+ dw Selfdestruct
dw DreamEater
dw MirrorMove
dw AttackUp
dw DefenseUp
dw SpeedUp
- dw Growth
+ dw SpecialAttackUp
dw SpecialDefenseUp
dw AccuracyUp
dw EvasionUp
dw NormalHit
- dw Growl
+ dw AttackDown
dw DefenseDown
- dw StringShot
+ dw SpeedDown
dw SpecialAttackDown
dw SpecialDefenseDown
dw AccuracyDown
- dw SweetScent
- dw Haze
+ dw EvasionDown
+ dw ResetStats
dw Bide
dw Rampage
- dw Whirlwind
+ dw ForceSwitch
dw MultiHit
dw Conversion
dw FlinchHit
@@ -40,7 +40,7 @@
dw RazorWind
dw SuperFang
dw StaticDamage
- dw Bind
+ dw TrapTarget
dw NormalHit
dw MultiHit
dw NormalHit
@@ -48,16 +48,16 @@
dw FocusEnergy
dw RecoilHit
dw DoConfuse
- dw SwordsDance
+ dw AttackUp2
dw DefenseUp2
- dw Agility
+ dw SpeedUp2
dw SpecialAttackUp2
- dw Amnesia
+ dw SpecialDefenseUp2
dw AccuracyUp2
dw EvasionUp2
dw Transform
- dw Charm
- dw Screech
+ dw AttackDown2
+ dw DefenseDown2
dw SpeedDown2
dw SpecialAttackDown2
dw SpecialDefenseDown2
@@ -66,7 +66,7 @@
dw Reflect
dw DoPoison
dw DoParalyze
- dw AuroraBeam
+ dw AttackDownHit
dw DefenseDownHit
dw SpeedDownHit
dw SpecialAttackDownHit
@@ -75,7 +75,7 @@
dw EvasionDownHit
dw SkyAttack
dw ConfuseHit
- dw Twineedle
+ dw PoisonMultiHit
dw NormalHit
dw Substitute
dw HyperBeam
@@ -136,9 +136,9 @@
dw HiddenPower
dw RainDance
dw SunnyDay
- dw SteelWing
- dw MetalClaw
- dw Ancientpower
+ dw DefenseUpHit
+ dw AttackUpHit
+ dw AllUpHit
dw FakeOut
dw BellyDrum
dw PsychUp
--- a/battle/moves/moves.asm
+++ b/battle/moves/moves.asm
@@ -28,9 +28,9 @@
move CUT, EFFECT_NORMAL_HIT, 50, NORMAL, 95, 30, 0
move GUST, EFFECT_GUST, 40, FLYING, 100, 35, 0
move WING_ATTACK, EFFECT_NORMAL_HIT, 60, FLYING, 100, 35, 0
- move WHIRLWIND, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0
+ move WHIRLWIND, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0
move FLY, EFFECT_FLY, 70, FLYING, 95, 15, 0
- move BIND, EFFECT_BIND, 15, NORMAL, 75, 20, 0
+ move BIND, EFFECT_TRAP_TARGET, 15, NORMAL, 75, 20, 0
move SLAM, EFFECT_NORMAL_HIT, 80, NORMAL, 75, 20, 0
move VINE_WHIP, EFFECT_NORMAL_HIT, 35, GRASS, 100, 10, 0
move STOMP, EFFECT_STOMP, 65, NORMAL, 100, 20, 30
@@ -45,18 +45,18 @@
move HORN_DRILL, EFFECT_OHKO, 1, NORMAL, 30, 5, 0
move TACKLE, EFFECT_NORMAL_HIT, 35, NORMAL, 95, 35, 0
move BODY_SLAM, EFFECT_PARALYZE_HIT, 85, NORMAL, 100, 15, 30
- move WRAP, EFFECT_BIND, 15, NORMAL, 85, 20, 0
+ move WRAP, EFFECT_TRAP_TARGET, 15, NORMAL, 85, 20, 0
move TAKE_DOWN, EFFECT_RECOIL_HIT, 90, NORMAL, 85, 20, 0
move THRASH, EFFECT_RAMPAGE, 90, NORMAL, 100, 20, 0
move DOUBLE_EDGE, EFFECT_RECOIL_HIT, 120, NORMAL, 100, 15, 0
move TAIL_WHIP, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0
move POISON_STING, EFFECT_POISON_HIT, 15, POISON, 100, 35, 30
- move TWINEEDLE, EFFECT_TWINEEDLE, 25, BUG, 100, 20, 20
+ move TWINEEDLE, EFFECT_POISON_MULTI_HIT, 25, BUG, 100, 20, 20
move PIN_MISSILE, EFFECT_MULTI_HIT, 14, BUG, 85, 20, 0
move LEER, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0
move BITE, EFFECT_FLINCH_HIT, 60, DARK, 100, 25, 30
move GROWL, EFFECT_ATTACK_DOWN, 0, NORMAL, 100, 40, 0
- move ROAR, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0
+ move ROAR, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0
move SING, EFFECT_SLEEP, 0, NORMAL, 55, 15, 0
move SUPERSONIC, EFFECT_CONFUSE, 0, NORMAL, 55, 20, 0
move SONICBOOM, EFFECT_STATIC_DAMAGE, 20, NORMAL, 90, 20, 0
@@ -93,7 +93,7 @@
move PETAL_DANCE, EFFECT_RAMPAGE, 70, GRASS, 100, 20, 0
move STRING_SHOT, EFFECT_SPEED_DOWN, 0, BUG, 95, 40, 0
move DRAGON_RAGE, EFFECT_STATIC_DAMAGE, 40, DRAGON, 100, 10, 0
- move FIRE_SPIN, EFFECT_BIND, 15, FIRE, 70, 15, 0
+ move FIRE_SPIN, EFFECT_TRAP_TARGET, 15, FIRE, 70, 15, 0
move THUNDERSHOCK, EFFECT_PARALYZE_HIT, 40, ELECTRIC, 100, 30, 10
move THUNDERBOLT, EFFECT_PARALYZE_HIT, 95, ELECTRIC, 100, 15, 10
move THUNDER_WAVE, EFFECT_PARALYZE, 0, ELECTRIC, 100, 20, 0
@@ -124,13 +124,13 @@
move DEFENSE_CURL, EFFECT_DEFENSE_CURL, 0, NORMAL, 100, 40, 0
move BARRIER, EFFECT_DEFENSE_UP_2, 0, PSYCHIC, 100, 30, 0
move LIGHT_SCREEN, EFFECT_LIGHT_SCREEN, 0, PSYCHIC, 100, 30, 0
- move HAZE, EFFECT_HAZE, 0, ICE, 100, 30, 0
+ move HAZE, EFFECT_RESET_STATS, 0, ICE, 100, 30, 0
move REFLECT, EFFECT_REFLECT, 0, PSYCHIC, 100, 20, 0
move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY, 0, NORMAL, 100, 30, 0
move BIDE, EFFECT_BIDE, 0, NORMAL, 100, 10, 0
move METRONOME, EFFECT_METRONOME, 0, NORMAL, 100, 10, 0
move MIRROR_MOVE, EFFECT_MIRROR_MOVE, 0, FLYING, 100, 20, 0
- move SELFDESTRUCT, EFFECT_EXPLOSION, 200, NORMAL, 100, 5, 0
+ move SELFDESTRUCT, EFFECT_SELFDESTRUCT, 200, NORMAL, 100, 5, 0
move EGG_BOMB, EFFECT_NORMAL_HIT, 100, NORMAL, 75, 10, 0
move LICK, EFFECT_PARALYZE_HIT, 20, GHOST, 100, 30, 30
move SMOG, EFFECT_POISON_HIT, 20, POISON, 70, 20, 40
@@ -138,7 +138,7 @@
move BONE_CLUB, EFFECT_FLINCH_HIT, 65, GROUND, 85, 20, 10
move FIRE_BLAST, EFFECT_BURN_HIT, 120, FIRE, 85, 5, 10
move WATERFALL, EFFECT_NORMAL_HIT, 80, WATER, 100, 15, 0
- move CLAMP, EFFECT_BIND, 35, WATER, 75, 10, 0
+ move CLAMP, EFFECT_TRAP_TARGET, 35, WATER, 75, 10, 0
move SWIFT, EFFECT_ALWAYS_HIT, 60, NORMAL, 100, 20, 0
move SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, 100, 15, 0
move SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, 100, 15, 0
@@ -163,7 +163,7 @@
move SPLASH, EFFECT_SPLASH, 0, NORMAL, 100, 40, 0
move ACID_ARMOR, EFFECT_DEFENSE_UP_2, 0, POISON, 100, 40, 0
move CRABHAMMER, EFFECT_NORMAL_HIT, 90, WATER, 85, 10, 0
- move EXPLOSION, EFFECT_EXPLOSION, 250, NORMAL, 100, 5, 0
+ move EXPLOSION, EFFECT_SELFDESTRUCT, 250, NORMAL, 100, 5, 0
move FURY_SWIPES, EFFECT_MULTI_HIT, 18, NORMAL, 80, 15, 0
move BONEMERANG, EFFECT_DOUBLE_HIT, 50, GROUND, 90, 10, 0
move REST, EFFECT_HEAL, 0, PSYCHIC, 100, 10, 0
@@ -221,7 +221,7 @@
move MILK_DRINK, EFFECT_HEAL, 0, NORMAL, 100, 10, 0
move SPARK, EFFECT_PARALYZE_HIT, 65, ELECTRIC, 100, 20, 30
move FURY_CUTTER, EFFECT_FURY_CUTTER, 10, BUG, 95, 20, 0
- move STEEL_WING, EFFECT_STEEL_WING, 70, STEEL, 90, 25, 10
+ move STEEL_WING, EFFECT_DEFENSE_UP_HIT, 70, STEEL, 90, 25, 10
move MEAN_LOOK, EFFECT_MEAN_LOOK, 0, NORMAL, 100, 5, 0
move ATTRACT, EFFECT_ATTRACT, 0, NORMAL, 100, 15, 0
move SLEEP_TALK, EFFECT_SLEEP_TALK, 0, NORMAL, 100, 10, 0
@@ -242,7 +242,7 @@
move RAPID_SPIN, EFFECT_RAPID_SPIN, 20, NORMAL, 100, 40, 0
move SWEET_SCENT, EFFECT_EVASION_DOWN, 0, NORMAL, 100, 20, 0
move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 75, 15, 30
- move METAL_CLAW, EFFECT_METAL_CLAW, 50, STEEL, 95, 35, 10
+ move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 50, STEEL, 95, 35, 10
move VITAL_THROW, EFFECT_ALWAYS_HIT, 70, FIGHTING, 100, 10, 0
move MORNING_SUN, EFFECT_MORNING_SUN, 0, NORMAL, 100, 5, 0
move SYNTHESIS, EFFECT_SYNTHESIS, 0, GRASS, 100, 5, 0
@@ -256,9 +256,9 @@
move MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC, 100, 20, 0
move PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, 100, 10, 0
move EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, 100, 5, 0
- move ANCIENTPOWER, EFFECT_ANCIENTPOWER, 60, ROCK, 100, 5, 10
+ move ANCIENTPOWER, EFFECT_ALL_UP_HIT, 60, ROCK, 100, 5, 10
move SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20
move FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC, 90, 15, 0
move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50
- move WHIRLPOOL, EFFECT_BIND, 15, WATER, 70, 15, 0
+ move WHIRLPOOL, EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0
move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0
--- a/constants.asm
+++ b/constants.asm
@@ -4,7 +4,6 @@
INCLUDE "hram.asm"
INCLUDE "constants/wram_constants.asm"
-INCLUDE "constants/sram_constants.asm"
INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/type_constants.asm"
INCLUDE "constants/move_constants.asm"
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -171,7 +171,7 @@
const EFFECT_BURN_HIT
const EFFECT_FREEZE_HIT
const EFFECT_PARALYZE_HIT
- const EFFECT_EXPLOSION
+ const EFFECT_SELFDESTRUCT
const EFFECT_DREAM_EATER
const EFFECT_MIRROR_MOVE
const EFFECT_ATTACK_UP
@@ -189,10 +189,10 @@
const EFFECT_SP_DEF_DOWN
const EFFECT_ACCURACY_DOWN
const EFFECT_EVASION_DOWN
- const EFFECT_HAZE
+ const EFFECT_RESET_STATS
const EFFECT_BIDE
const EFFECT_RAMPAGE
- const EFFECT_WHIRLWIND
+ const EFFECT_FORCE_SWITCH
const EFFECT_MULTI_HIT
const EFFECT_CONVERSION
const EFFECT_FLINCH_HIT
@@ -206,7 +206,7 @@
const EFFECT_RAZOR_WIND
const EFFECT_SUPER_FANG
const EFFECT_STATIC_DAMAGE
- const EFFECT_BIND
+ const EFFECT_TRAP_TARGET
const EFFECT_UNUSED_2B
const EFFECT_DOUBLE_HIT
const EFFECT_JUMP_KICK
@@ -241,7 +241,7 @@
const EFFECT_EVASION_DOWN_HIT
const EFFECT_SKY_ATTACK
const EFFECT_CONFUSE_HIT
- const EFFECT_TWINEEDLE
+ const EFFECT_POISON_MULTI_HIT
const EFFECT_UNUSED_4E
const EFFECT_SUBSTITUTE
const EFFECT_HYPER_BEAM
@@ -302,9 +302,9 @@
const EFFECT_HIDDEN_POWER
const EFFECT_RAIN_DANCE
const EFFECT_SUNNY_DAY
- const EFFECT_STEEL_WING
- const EFFECT_METAL_CLAW
- const EFFECT_ANCIENTPOWER
+ const EFFECT_DEFENSE_UP_HIT
+ const EFFECT_ATTACK_UP_HIT
+ const EFFECT_ALL_UP_HIT
const EFFECT_FAKE_OUT
const EFFECT_BELLY_DRUM
const EFFECT_PSYCH_UP
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -1,7 +1,7 @@
const_def
- const BATTLETOWERACTION_00
- const BATTLETOWERACTION_01
- const BATTLETOWERACTION_02
+ const BATTLETOWERACTION_CHECK_EXPLANATION_READ
+ const BATTLETOWERACTION_SET_EXPLANATION_READ
+ const BATTLETOWERACTION_GET_CHALLENGE_STATE
const BATTLETOWERACTION_SAVE_AND_QUIT
const BATTLETOWERACTION_CHALLENGECANCELED
const BATTLETOWERACTION_05
@@ -13,7 +13,7 @@
const BATTLETOWERACTION_CHECKMOBILEEVENT
const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5
const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5
- const BATTLETOWERACTION_EGGTICKET ; egg ticket
+ const BATTLETOWERACTION_EGGTICKET
const BATTLETOWERACTION_0F ; check w3_d090
const BATTLETOWERACTION_10 ; dw based on 5:a800
const BATTLETOWERACTION_11 ; store 0 in 5:aa8d
@@ -23,8 +23,8 @@
const BATTLETOWERACTION_15 ; set 0, [s1_be4f]
const BATTLETOWERACTION_16 ; update time in SRAM bank 5
const BATTLETOWERACTION_17 ; check time in SRAM bank 5
- const BATTLETOWERACTION_18 ; level check
- const BATTLETOWERACTION_19 ; ubers check
+ const BATTLETOWERACTION_LEVEL_CHECK
+ const BATTLETOWERACTION_UBERS_CHECK
const BATTLETOWERACTION_RESETDATA ; clear data
const BATTLETOWERACTION_GIVEREWARD ; give reward
const BATTLETOWERACTION_1C ; set won challenge
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -142,6 +142,7 @@
WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY)
MOBILE_EVENT_OBJECT_GS_BALL EQU $b
+MOBILE_LOGIN_PASSWORD_LENGTH EQU 17
MALE EQU 0
FEMALE EQU 1
--- a/constants/sram_constants.asm
+++ /dev/null
@@ -1,53 +1,0 @@
-; Mobile bank 5
-
-; sMobileEventIndex EQU $a000 ; moved to 1:BE3C in English
-sTrainerRankings EQU $a001
-sTrainerRankingGameTimeHOF EQU $a001
-sTrainerRankingStepCountHOF EQU $a005
-sTrainerRankingHealingsHOF EQU $a009
-sTrainerRankingBattlesHOF EQU $a00d
-sTrainerRankingStepCount EQU $a010
-sTrainerRankingBattleTowerWins EQU $a014
-sTrainerRankingTMsHMsTaught EQU $a018
-sTrainerRankingBattles EQU $a01b
-sTrainerRankingWildBattles EQU $a01e
-sTrainerRankingTrainerBattles EQU $a021
-sTrainerRankingUnused1 EQU $a024
-sTrainerRankingHOFEntries EQU $a027
-sTrainerRankingWildMonsCaught EQU $a02a
-sTrainerRankingHookedEncounters EQU $a02d
-sTrainerRankingEggsHatched EQU $a030
-sTrainerRankingMonsEvolved EQU $a033
-sTrainerRankingFruitPicked EQU $a036
-sTrainerRankingHealings EQU $a039
-sTrainerRankingMysteryGift EQU $a03c
-sTrainerRankingTrades EQU $a03f
-sTrainerRankingFly EQU $a042
-sTrainerRankingSurf EQU $a045
-sTrainerRankingWaterfall EQU $a048
-sTrainerRankingWhiteOuts EQU $a04b
-sTrainerRankingLuckyNumberShow EQU $a04e
-sTrainerRankingPhoneCalls EQU $a051
-sTrainerRankingUnused2 EQU $a054
-sTrainerRankingLinkBattles EQU $a057
-sTrainerRankingSplash EQU $a05a
-sTrainerRankingTreeEncounters EQU $a05d
-sTrainerRankingUnused3 EQU $a060
-sTrainerRankingColosseumWins EQU $a063
-sTrainerRankingColosseumLosses EQU $a066
-sTrainerRankingColosseumDraws EQU $a069
-sTrainerRankingSelfDestruct EQU $a06c
-sTrainerRankingCurrentSlotsStreak EQU $a06f
-sTrainerRankingLongestSlotsStreak EQU $a071
-sTrainerRankingTotalSlotsPayouts EQU $a073
-sTrainerRankingTotalBattlePayouts EQU $a077
-sTrainerRankingLongestMagikarp EQU $a07b
-sTrainerRankingShortestMagikarp EQU $a07d
-sTrainerRankingBugContestScore EQU $a07f
-sTrainerRankingsChecksum EQU $a081
-sTrainerRankingsEnd EQU $a083
-; sMobileEventIndexBackup EQU $a083 ; moved to 1:BE44 in English
-sTrainerRankingsBackup EQU $a084
-
-sMobileLoginPassword EQU $aa4b
-LOGIN_PASSWORD_LENGTH EQU 17
--- a/data/pokedex/entries/001.asm
+++ b/data/pokedex/entries/001.asm
@@ -1,6 +1,6 @@
; BulbasaurPokedexEntry: ; 0x181695
db "SEED@" ; species name
- dw 204, 150 ; height, width
+ dw 204, 150 ; height, weight
db "While it is young,"
next "it uses the"
--- a/data/pokedex/entries/002.asm
+++ b/data/pokedex/entries/002.asm
@@ -1,6 +1,6 @@
; IvysaurPokedexEntry: ; 0x181702
db "SEED@" ; species name
- dw 303, 290 ; height, width
+ dw 303, 290 ; height, weight
db "The bulb on its"
next "back grows as it"
--- a/data/pokedex/entries/003.asm
+++ b/data/pokedex/entries/003.asm
@@ -1,6 +1,6 @@
; VenusaurPokedexEntry: ; 0x181773
db "SEED@" ; species name
- dw 607, 2210 ; height, width
+ dw 607, 2210 ; height, weight
db "As it warms it-"
next "self and absorbs"
--- a/data/pokedex/entries/004.asm
+++ b/data/pokedex/entries/004.asm
@@ -1,6 +1,6 @@
; CharmanderPokedexEntry: ; 0x1817db
db "LIZARD@" ; species name
- dw 200, 190 ; height, width
+ dw 200, 190 ; height, weight
db "If it's healthy,"
next "the flame on the"
--- a/data/pokedex/entries/005.asm
+++ b/data/pokedex/entries/005.asm
@@ -1,6 +1,6 @@
; CharmeleonPokedexEntry: ; 0x18184a
db "FLAME@" ; species name
- dw 307, 420 ; height, width
+ dw 307, 420 ; height, weight
db "If it becomes"
next "agitated during"
--- a/data/pokedex/entries/006.asm
+++ b/data/pokedex/entries/006.asm
@@ -1,6 +1,6 @@
; CharizardPokedexEntry: ; 0x1818b3
db "FLAME@" ; species name
- dw 507, 2000 ; height, width
+ dw 507, 2000 ; height, weight
db "It uses its wings"
next "to fly high. The"
--- a/data/pokedex/entries/007.asm
+++ b/data/pokedex/entries/007.asm
@@ -1,6 +1,6 @@
; SquirtlePokedexEntry: ; 0x181926
db "TINYTURTLE@" ; species name
- dw 108, 200 ; height, width
+ dw 108, 200 ; height, weight
db "When it feels"
next "threatened, it"
--- a/data/pokedex/entries/008.asm
+++ b/data/pokedex/entries/008.asm
@@ -1,6 +1,6 @@
; WartortlePokedexEntry: ; 0x181993
db "TURTLE@" ; species name
- dw 303, 500 ; height, width
+ dw 303, 500 ; height, weight
db "Its long, furry"
next "tail is a symbol"
--- a/data/pokedex/entries/009.asm
+++ b/data/pokedex/entries/009.asm
@@ -1,6 +1,6 @@
; BlastoisePokedexEntry: ; 0x1819f9
db "SHELLFISH@" ; species name
- dw 503, 1890 ; height, width
+ dw 503, 1890 ; height, weight
db "It firmly plants"
next "its feet on the"
--- a/data/pokedex/entries/010.asm
+++ b/data/pokedex/entries/010.asm
@@ -1,6 +1,6 @@
; CaterpiePokedexEntry: ; 0x181a60
db "WORM@" ; species name
- dw 100, 60 ; height, width
+ dw 100, 60 ; height, weight
db "It crawls into"
next "foliage where it"
--- a/data/pokedex/entries/011.asm
+++ b/data/pokedex/entries/011.asm
@@ -1,6 +1,6 @@
; MetapodPokedexEntry: ; 0x181ace
db "COCOON@" ; species name
- dw 204, 220 ; height, width
+ dw 204, 220 ; height, weight
db "This is its pre-"
next "evolved form. At"
--- a/data/pokedex/entries/012.asm
+++ b/data/pokedex/entries/012.asm
@@ -1,6 +1,6 @@
; ButterfreePokedexEntry: ; 0x181b45
db "BUTTERFLY@" ; species name
- dw 307, 710 ; height, width
+ dw 307, 710 ; height, weight
db "It flits from"
next "flower to flower,"
--- a/data/pokedex/entries/013.asm
+++ b/data/pokedex/entries/013.asm
@@ -1,6 +1,6 @@
; WeedlePokedexEntry: ; 0x181bb4
db "HAIRY BUG@" ; species name
- dw 100, 70 ; height, width
+ dw 100, 70 ; height, weight
db "The barb on top of"
next "its head secretes"
--- a/data/pokedex/entries/014.asm
+++ b/data/pokedex/entries/014.asm
@@ -1,6 +1,6 @@
; KakunaPokedexEntry: ; 0x181c23
db "COCOON@" ; species name
- dw 200, 220 ; height, width
+ dw 200, 220 ; height, weight
db "Nearly incapable"
next "of movement, it"
--- a/data/pokedex/entries/015.asm
+++ b/data/pokedex/entries/015.asm
@@ -1,6 +1,6 @@
; BeedrillPokedexEntry: ; 0x181c8a
db "POISON BEE@" ; species name
- dw 303, 650 ; height, width
+ dw 303, 650 ; height, weight
db "It uses sharp,"
next "poisonous stings"
--- a/data/pokedex/entries/016.asm
+++ b/data/pokedex/entries/016.asm
@@ -1,6 +1,6 @@
; PidgeyPokedexEntry: ; 0x181cfa
db "TINY BIRD@" ; species name
- dw 100, 40 ; height, width
+ dw 100, 40 ; height, weight
db "It rapidly flaps"
next "its wings in the"
--- a/data/pokedex/entries/017.asm
+++ b/data/pokedex/entries/017.asm
@@ -1,6 +1,6 @@
; PidgeottoPokedexEntry: ; 0x181d75
db "BIRD@" ; species name
- dw 307, 660 ; height, width
+ dw 307, 660 ; height, weight
db "It slowly flies in"
next "a circular pat-"
--- a/data/pokedex/entries/018.asm
+++ b/data/pokedex/entries/018.asm
@@ -1,6 +1,6 @@
; PidgeotPokedexEntry: ; 0x181dd7
db "BIRD@" ; species name
- dw 411, 870 ; height, width
+ dw 411, 870 ; height, weight
db "Its outstanding"
next "vision allows it"
--- a/data/pokedex/entries/019.asm
+++ b/data/pokedex/entries/019.asm
@@ -1,6 +1,6 @@
; RattataPokedexEntry: ; 0x181e3d
db "RAT@" ; species name
- dw 100, 80 ; height, width
+ dw 100, 80 ; height, weight
db "This #MON's"
next "impressive vital-"
--- a/data/pokedex/entries/020.asm
+++ b/data/pokedex/entries/020.asm
@@ -1,6 +1,6 @@
; RaticatePokedexEntry: ; 0x181ea3
db "RAT@" ; species name
- dw 204, 410 ; height, width
+ dw 204, 410 ; height, weight
db "The webs on its"
next "hind legs enable"
--- a/data/pokedex/entries/021.asm
+++ b/data/pokedex/entries/021.asm
@@ -1,6 +1,6 @@
; SpearowPokedexEntry: ; 0x181f03
db "TINY BIRD@" ; species name
- dw 100, 40 ; height, width
+ dw 100, 40 ; height, weight
db "To protect its"
next "territory, it"
--- a/data/pokedex/entries/022.asm
+++ b/data/pokedex/entries/022.asm
@@ -1,6 +1,6 @@
; FearowPokedexEntry: ; 0x181f64
db "BEAK@" ; species name
- dw 311, 840 ; height, width
+ dw 311, 840 ; height, weight
db "It uses its long"
next "beak to attack. It"
--- a/data/pokedex/entries/023.asm
+++ b/data/pokedex/entries/023.asm
@@ -1,6 +1,6 @@
; EkansPokedexEntry: ; 0x181fd4
db "SNAKE@" ; species name
- dw 607, 150 ; height, width
+ dw 607, 150 ; height, weight
db "It flutters the"
next "tip of its tongue"
--- a/data/pokedex/entries/024.asm
+++ b/data/pokedex/entries/024.asm
@@ -1,6 +1,6 @@
; ArbokPokedexEntry: ; 0x18203d
db "COBRA@" ; species name
- dw 1106, 1430 ; height, width
+ dw 1106, 1430 ; height, weight
db "To intimidate"
next "foes, it spreads"
--- a/data/pokedex/entries/025.asm
+++ b/data/pokedex/entries/025.asm
@@ -1,6 +1,6 @@
; PikachuPokedexEntry: ; 0x1820ad
db "MOUSE@" ; species name
- dw 104, 130 ; height, width
+ dw 104, 130 ; height, weight
db "When it is anger-"
next "ed, it immediately"
--- a/data/pokedex/entries/026.asm
+++ b/data/pokedex/entries/026.asm
@@ -1,6 +1,6 @@
; RaichuPokedexEntry: ; 0x182117
db "MOUSE@" ; species name
- dw 207, 660 ; height, width
+ dw 207, 660 ; height, weight
db "If its electric"
next "pouches run empty,"
--- a/data/pokedex/entries/027.asm
+++ b/data/pokedex/entries/027.asm
@@ -1,6 +1,6 @@
; SandshrewPokedexEntry: ; 0x182184
db "MOUSE@" ; species name
- dw 200, 260 ; height, width
+ dw 200, 260 ; height, weight
db "It prefers dry,"
next "sandy places"
--- a/data/pokedex/entries/028.asm
+++ b/data/pokedex/entries/028.asm
@@ -1,6 +1,6 @@
; SandslashPokedexEntry: ; 0x1821e7
db "MOUSE@" ; species name
- dw 303, 650 ; height, width
+ dw 303, 650 ; height, weight
db "Adept at climbing"
next "trees, it rolls"
--- a/data/pokedex/entries/029.asm
+++ b/data/pokedex/entries/029.asm
@@ -1,6 +1,6 @@
; NidoranFPokedexEntry: ; 0x18224b
db "POISON PIN@" ; species name
- dw 104, 150 ; height, width
+ dw 104, 150 ; height, weight
db "Small and very"
next "docile, it pro-"
--- a/data/pokedex/entries/030.asm
+++ b/data/pokedex/entries/030.asm
@@ -1,6 +1,6 @@
; NidorinaPokedexEntry: ; 0x1822b6
db "POISON PIN@" ; species name
- dw 207, 440 ; height, width
+ dw 207, 440 ; height, weight
db "It has a docile"
next "nature. If it is"
--- a/data/pokedex/entries/031.asm
+++ b/data/pokedex/entries/031.asm
@@ -1,6 +1,6 @@
; NidoqueenPokedexEntry: ; 0x18232e
db "DRILL@" ; species name
- dw 403, 1320 ; height, width
+ dw 403, 1320 ; height, weight
db "The hard scales"
next "that cover its"
--- a/data/pokedex/entries/032.asm
+++ b/data/pokedex/entries/032.asm
@@ -1,6 +1,6 @@
; NidoranMPokedexEntry: ; 0x182392
db "POISON PIN@" ; species name
- dw 108, 200 ; height, width
+ dw 108, 200 ; height, weight
db "It constantly"
next "moves its large"
--- a/data/pokedex/entries/033.asm
+++ b/data/pokedex/entries/033.asm
@@ -1,6 +1,6 @@
; NidorinoPokedexEntry: ; 0x1823fd
db "POISON PIN@" ; species name
- dw 211, 430 ; height, width
+ dw 211, 430 ; height, weight
db "It is easily"
next "agitated and uses"
--- a/data/pokedex/entries/034.asm
+++ b/data/pokedex/entries/034.asm
@@ -1,6 +1,6 @@
; NidokingPokedexEntry: ; 0x182463
db "DRILL@" ; species name
- dw 407, 1370 ; height, width
+ dw 407, 1370 ; height, weight
db "It uses its thick"
next "arms, legs and"
--- a/data/pokedex/entries/035.asm
+++ b/data/pokedex/entries/035.asm
@@ -1,6 +1,6 @@
; ClefairyPokedexEntry: ; 0x1824c8
db "FAIRY@" ; species name
- dw 200, 170 ; height, width
+ dw 200, 170 ; height, weight
db "Though rarely"
next "seen, it becomes"
--- a/data/pokedex/entries/036.asm
+++ b/data/pokedex/entries/036.asm
@@ -1,6 +1,6 @@
; ClefablePokedexEntry: ; 0x182530
db "FAIRY@" ; species name
- dw 403, 880 ; height, width
+ dw 403, 880 ; height, weight
db "Said to live in"
next "quiet, remote"
--- a/data/pokedex/entries/037.asm
+++ b/data/pokedex/entries/037.asm
@@ -1,6 +1,6 @@
; VulpixPokedexEntry: ; 0x18259b
db "FOX@" ; species name
- dw 200, 220 ; height, width
+ dw 200, 220 ; height, weight
db "As its body grows"
next "larger, its six"
--- a/data/pokedex/entries/038.asm
+++ b/data/pokedex/entries/038.asm
@@ -1,6 +1,6 @@
; NinetalesPokedexEntry: ; 0x18260c
db "FOX@" ; species name
- dw 307, 440 ; height, width
+ dw 307, 440 ; height, weight
db "It is said to live"
next "a thousand years,"
--- a/data/pokedex/entries/039.asm
+++ b/data/pokedex/entries/039.asm
@@ -1,6 +1,6 @@
; JigglypuffPokedexEntry: ; 0x182673
db "BALLOON@" ; species name
- dw 108, 120 ; height, width
+ dw 108, 120 ; height, weight
db "It rolls its cute"
next "eyes as it sings a"
--- a/data/pokedex/entries/040.asm
+++ b/data/pokedex/entries/040.asm
@@ -1,6 +1,6 @@
; WigglytuffPokedexEntry: ; 0x1826e9
db "BALLOON@" ; species name
- dw 303, 260 ; height, width
+ dw 303, 260 ; height, weight
db "The rich, fluffy"
next "fur that covers"
--- a/data/pokedex/entries/041.asm
+++ b/data/pokedex/entries/041.asm
@@ -1,6 +1,6 @@
; ZubatPokedexEntry: ; 0x18275d
db "BAT@" ; species name
- dw 207, 170 ; height, width
+ dw 207, 170 ; height, weight
db "During the day, it"
next "gathers with"
--- a/data/pokedex/entries/042.asm
+++ b/data/pokedex/entries/042.asm
@@ -1,6 +1,6 @@
; GolbatPokedexEntry: ; 0x1827c4
db "BAT@" ; species name
- dw 503, 1210 ; height, width
+ dw 503, 1210 ; height, weight
db "When it plunges"
next "its fangs into its"
--- a/data/pokedex/entries/043.asm
+++ b/data/pokedex/entries/043.asm
@@ -1,6 +1,6 @@
; OddishPokedexEntry: ; 0x182836
db "WEED@" ; species name
- dw 108, 120 ; height, width
+ dw 108, 120 ; height, weight
db "During the day, it"
next "stays in the cold"
--- a/data/pokedex/entries/044.asm
+++ b/data/pokedex/entries/044.asm
@@ -1,6 +1,6 @@
; GloomPokedexEntry: ; 0x1828a6
db "WEED@" ; species name
- dw 207, 190 ; height, width
+ dw 207, 190 ; height, weight
db "The smell from its"
next "drool-like syrup"
--- a/data/pokedex/entries/045.asm
+++ b/data/pokedex/entries/045.asm
@@ -1,6 +1,6 @@
; VileplumePokedexEntry: ; 0x182918
db "FLOWER@" ; species name
- dw 311, 410 ; height, width
+ dw 311, 410 ; height, weight
db "By shaking its big"
next "petals, it scat-"
--- a/data/pokedex/entries/046.asm
+++ b/data/pokedex/entries/046.asm
@@ -1,6 +1,6 @@
; ParasPokedexEntry: ; 0x18297f
db "MUSHROOM@" ; species name
- dw 100, 120 ; height, width
+ dw 100, 120 ; height, weight
db "The tochukaso"
next "growing on this"
--- a/data/pokedex/entries/047.asm
+++ b/data/pokedex/entries/047.asm
@@ -1,6 +1,6 @@
; ParasectPokedexEntry: ; 0x1829e2
db "MUSHROOM@" ; species name
- dw 303, 650 ; height, width
+ dw 303, 650 ; height, weight
db "When nothing's"
next "left to extract"
--- a/data/pokedex/entries/048.asm
+++ b/data/pokedex/entries/048.asm
@@ -1,6 +1,6 @@
; VenonatPokedexEntry: ; 0x182a53
db "INSECT@" ; species name
- dw 303, 660 ; height, width
+ dw 303, 660 ; height, weight
db "The small bugs it"
next "eats appear only"
--- a/data/pokedex/entries/049.asm
+++ b/data/pokedex/entries/049.asm
@@ -1,6 +1,6 @@
; VenomothPokedexEntry: ; 0x182abf
db "POISONMOTH@" ; species name
- dw 411, 280 ; height, width
+ dw 411, 280 ; height, weight
db "The scales it"
next "scatters will"
--- a/data/pokedex/entries/050.asm
+++ b/data/pokedex/entries/050.asm
@@ -1,6 +1,6 @@
; DiglettPokedexEntry: ; 0x182b30
db "MOLE@" ; species name
- dw 8, 20 ; height, width
+ dw 8, 20 ; height, weight
db "It digs under-"
next "ground and chews"
--- a/data/pokedex/entries/051.asm
+++ b/data/pokedex/entries/051.asm
@@ -1,6 +1,6 @@
; DugtrioPokedexEntry: ; 0x182b9d
db "MOLE@" ; species name
- dw 204, 730 ; height, width
+ dw 204, 730 ; height, weight
db "These DIGLETT"
next "triplets dig over"
--- a/data/pokedex/entries/052.asm
+++ b/data/pokedex/entries/052.asm
@@ -1,6 +1,6 @@
; MeowthPokedexEntry: ; 0x182c08
db "SCRATCHCAT@" ; species name
- dw 104, 90 ; height, width
+ dw 104, 90 ; height, weight
db "It loves things"
next "that sparkle. When"
--- a/data/pokedex/entries/053.asm
+++ b/data/pokedex/entries/053.asm
@@ -1,6 +1,6 @@
; PersianPokedexEntry: ; 0x182c78
db "CLASSY CAT@" ; species name
- dw 303, 710 ; height, width
+ dw 303, 710 ; height, weight
db "Behind its lithe,"
next "elegant appearance"
--- a/data/pokedex/entries/054.asm
+++ b/data/pokedex/entries/054.asm
@@ -1,6 +1,6 @@
; PsyduckPokedexEntry: ; 0x182cee
db "DUCK@" ; species name
- dw 207, 430 ; height, width
+ dw 207, 430 ; height, weight
db "The only time it"
next "can use its psy-"
--- a/data/pokedex/entries/055.asm
+++ b/data/pokedex/entries/055.asm
@@ -1,6 +1,6 @@
; GolduckPokedexEntry: ; 0x182d55
db "DUCK@" ; species name
- dw 507, 1690 ; height, width
+ dw 507, 1690 ; height, weight
db "It swims grace-"
next "fully along on the"
--- a/data/pokedex/entries/056.asm
+++ b/data/pokedex/entries/056.asm
@@ -1,6 +1,6 @@
; MankeyPokedexEntry: ; 0x182dbd
db "PIG MONKEY@" ; species name
- dw 108, 620 ; height, width
+ dw 108, 620 ; height, weight
db "It lives in groups"
next "in the treetops."
--- a/data/pokedex/entries/057.asm
+++ b/data/pokedex/entries/057.asm
@@ -1,6 +1,6 @@
; PrimeapePokedexEntry: ; 0x182e39
db "PIG MONKEY@" ; species name
- dw 303, 710 ; height, width
+ dw 303, 710 ; height, weight
db "It will beat up"
next "anyone who makes"
--- a/data/pokedex/entries/058.asm
+++ b/data/pokedex/entries/058.asm
@@ -1,6 +1,6 @@
; GrowlithePokedexEntry: ; 0x182eaa
db "PUPPY@" ; species name
- dw 204, 420 ; height, width
+ dw 204, 420 ; height, weight
db "It controls a big"
next "territory. If it"
--- a/data/pokedex/entries/059.asm
+++ b/data/pokedex/entries/059.asm
@@ -1,6 +1,6 @@
; ArcaninePokedexEntry: ; 0x182f1c
db "LEGENDARY@" ; species name
- dw 603, 3420 ; height, width
+ dw 603, 3420 ; height, weight
db "An ancient picture"
next "scroll shows that"
--- a/data/pokedex/entries/060.asm
+++ b/data/pokedex/entries/060.asm
@@ -1,6 +1,6 @@
; PoliwagPokedexEntry: ; 0x182f91
db "TADPOLE@" ; species name
- dw 200, 270 ; height, width
+ dw 200, 270 ; height, weight
db "The swirl on its"
next "belly is its"
--- a/data/pokedex/entries/061.asm
+++ b/data/pokedex/entries/061.asm
@@ -1,6 +1,6 @@
; PoliwhirlPokedexEntry: ; 0x182ffd
db "TADPOLE@" ; species name
- dw 303, 440 ; height, width
+ dw 303, 440 ; height, weight
db "Though it is"
next "skilled at walk-"
--- a/data/pokedex/entries/062.asm
+++ b/data/pokedex/entries/062.asm
@@ -1,6 +1,6 @@
; PoliwrathPokedexEntry: ; 0x183066
db "TADPOLE@" ; species name
- dw 403, 1190 ; height, width
+ dw 403, 1190 ; height, weight
db "It can use its"
next "well-developed"
--- a/data/pokedex/entries/063.asm
+++ b/data/pokedex/entries/063.asm
@@ -1,6 +1,6 @@
; AbraPokedexEntry: ; 0x1830d5
db "PSI@" ; species name
- dw 211, 430 ; height, width
+ dw 211, 430 ; height, weight
db "It hypnotizes"
next "itself so that it"
--- a/data/pokedex/entries/064.asm
+++ b/data/pokedex/entries/064.asm
@@ -1,6 +1,6 @@
; KadabraPokedexEntry: ; 0x18313c
db "PSI@" ; species name
- dw 403, 1250 ; height, width
+ dw 403, 1250 ; height, weight
db "When it closes its"
next "eyes, twice as"
--- a/data/pokedex/entries/065.asm
+++ b/data/pokedex/entries/065.asm
@@ -1,6 +1,6 @@
; AlakazamPokedexEntry: ; 0x1b8000
db "PSI@" ; species name
- dw 411, 1060 ; height, width
+ dw 411, 1060 ; height, weight
db "It has an IQ of"
next "5000. It calcu-"
--- a/data/pokedex/entries/066.asm
+++ b/data/pokedex/entries/066.asm
@@ -1,6 +1,6 @@
; MachopPokedexEntry: ; 0x1b8065
db "SUPERPOWER@" ; species name
- dw 207, 430 ; height, width
+ dw 207, 430 ; height, weight
db "It trains by"
next "lifting rocks in"
--- a/data/pokedex/entries/067.asm
+++ b/data/pokedex/entries/067.asm
@@ -1,6 +1,6 @@
; MachokePokedexEntry: ; 0x1b80cb
db "SUPERPOWER@" ; species name
- dw 411, 1550 ; height, width
+ dw 411, 1550 ; height, weight
db "This tough #MON"
next "always stays in"
--- a/data/pokedex/entries/068.asm
+++ b/data/pokedex/entries/068.asm
@@ -1,6 +1,6 @@
; MachampPokedexEntry: ; 0x1b8133
db "SUPERPOWER@" ; species name
- dw 503, 2870 ; height, width
+ dw 503, 2870 ; height, weight
db "With four arms"
next "that react more"
--- a/data/pokedex/entries/069.asm
+++ b/data/pokedex/entries/069.asm
@@ -1,6 +1,6 @@
; BellsproutPokedexEntry: ; 0x1b81a1
db "FLOWER@" ; species name
- dw 204, 90 ; height, width
+ dw 204, 90 ; height, weight
db "If it notices"
next "anything that"
--- a/data/pokedex/entries/070.asm
+++ b/data/pokedex/entries/070.asm
@@ -1,6 +1,6 @@
; WeepinbellPokedexEntry: ; 0x1b81fd
db "FLYCATCHER@" ; species name
- dw 303, 140 ; height, width
+ dw 303, 140 ; height, weight
db "When it's hungry,"
next "it swings its"
--- a/data/pokedex/entries/071.asm
+++ b/data/pokedex/entries/071.asm
@@ -1,6 +1,6 @@
; VictreebelPokedexEntry: ; 0x1b826e
db "FLYCATCHER@" ; species name
- dw 507, 340 ; height, width
+ dw 507, 340 ; height, weight
db "Once ingested into"
next "this #MON's"
--- a/data/pokedex/entries/072.asm
+++ b/data/pokedex/entries/072.asm
@@ -1,6 +1,6 @@
; TentacoolPokedexEntry: ; 0x1b82d1
db "JELLYFISH@" ; species name
- dw 211, 1000 ; height, width
+ dw 211, 1000 ; height, weight
db "As it floats along"
next "on the waves, it"
--- a/data/pokedex/entries/073.asm
+++ b/data/pokedex/entries/073.asm
@@ -1,6 +1,6 @@
; TentacruelPokedexEntry: ; 0x1b8337
db "JELLYFISH@" ; species name
- dw 503, 1210 ; height, width
+ dw 503, 1210 ; height, weight
db "When its 80 feel-"
next "ers absorb water,"
--- a/data/pokedex/entries/074.asm
+++ b/data/pokedex/entries/074.asm
@@ -1,6 +1,6 @@
; GeodudePokedexEntry: ; 0x1b83a1
db "ROCK@" ; species name
- dw 104, 440 ; height, width
+ dw 104, 440 ; height, weight
db "Proud of their"
next "sturdy bodies,"
--- a/data/pokedex/entries/075.asm
+++ b/data/pokedex/entries/075.asm
@@ -1,6 +1,6 @@
; GravelerPokedexEntry: ; 0x1b840c
db "ROCK@" ; species name
- dw 303, 2320 ; height, width
+ dw 303, 2320 ; height, weight
db "It travels by rol-"
next "ling on mountain"
--- a/data/pokedex/entries/076.asm
+++ b/data/pokedex/entries/076.asm
@@ -1,6 +1,6 @@
; GolemPokedexEntry: ; 0x1b8481
db "MEGATON@" ; species name
- dw 407, 6620 ; height, width
+ dw 407, 6620 ; height, weight
db "Its rock-like body"
next "is so durable,"
--- a/data/pokedex/entries/077.asm
+++ b/data/pokedex/entries/077.asm
@@ -1,6 +1,6 @@
; PonytaPokedexEntry: ; 0x1b84f2
db "FIRE HORSE@" ; species name
- dw 303, 660 ; height, width
+ dw 303, 660 ; height, weight
db "Training by"
next "jumping over grass"
--- a/data/pokedex/entries/078.asm
+++ b/data/pokedex/entries/078.asm
@@ -1,6 +1,6 @@
; RapidashPokedexEntry: ; 0x1b855e
db "FIRE HORSE@" ; species name
- dw 507, 2090 ; height, width
+ dw 507, 2090 ; height, weight
db "It just loves to"
next "gallop. The faster"
--- a/data/pokedex/entries/079.asm
+++ b/data/pokedex/entries/079.asm
@@ -1,6 +1,6 @@
; SlowpokePokedexEntry: ; 0x1b85d3
db "DOPEY@" ; species name
- dw 311, 790 ; height, width
+ dw 311, 790 ; height, weight
db "It is always so"
next "absent-minded that"
--- a/data/pokedex/entries/080.asm
+++ b/data/pokedex/entries/080.asm
@@ -1,6 +1,6 @@
; SlowbroPokedexEntry: ; 0x1b8635
db "HERMITCRAB@" ; species name
- dw 503, 1730 ; height, width
+ dw 503, 1730 ; height, weight
db "An attached"
next "SHELLDER won't let"
--- a/data/pokedex/entries/081.asm
+++ b/data/pokedex/entries/081.asm
@@ -1,6 +1,6 @@
; MagnemitePokedexEntry: ; 0x1b869d
db "MAGNET@" ; species name
- dw 100, 130 ; height, width
+ dw 100, 130 ; height, weight
db "The electricity"
next "emitted by the"
--- a/data/pokedex/entries/082.asm
+++ b/data/pokedex/entries/082.asm
@@ -1,6 +1,6 @@
; MagnetonPokedexEntry: ; 0x1b870a
db "MAGNET@" ; species name
- dw 303, 1320 ; height, width
+ dw 303, 1320 ; height, weight
db "When many"
next "MAGNETON gather"
--- a/data/pokedex/entries/083.asm
+++ b/data/pokedex/entries/083.asm
@@ -1,6 +1,6 @@
; FarfetchDPokedexEntry: ; 0x1b876c
db "WILD DUCK@" ; species name
- dw 207, 330 ; height, width
+ dw 207, 330 ; height, weight
db "In order to pre-"
next "vent their"
--- a/data/pokedex/entries/084.asm
+++ b/data/pokedex/entries/084.asm
@@ -1,6 +1,6 @@
; DoduoPokedexEntry: ; 0x1b87d7
db "TWIN BIRD@" ; species name
- dw 407, 860 ; height, width
+ dw 407, 860 ; height, weight
db "It lives on a"
next "grassy plain where"
--- a/data/pokedex/entries/085.asm
+++ b/data/pokedex/entries/085.asm
@@ -1,6 +1,6 @@
; DodrioPokedexEntry: ; 0x1b884a
db "TRIPLEBIRD@" ; species name
- dw 511, 1880 ; height, width
+ dw 511, 1880 ; height, weight
db "An enemy that"
next "takes its eyes off"
--- a/data/pokedex/entries/086.asm
+++ b/data/pokedex/entries/086.asm
@@ -1,6 +1,6 @@
; SeelPokedexEntry: ; 0x1b88bf
db "SEA LION@" ; species name
- dw 307, 1980 ; height, width
+ dw 307, 1980 ; height, weight
db "The light blue fur"
next "that covers it"
--- a/data/pokedex/entries/087.asm
+++ b/data/pokedex/entries/087.asm
@@ -1,6 +1,6 @@
; DewgongPokedexEntry: ; 0x1b8934
db "SEA LION@" ; species name
- dw 507, 2650 ; height, width
+ dw 507, 2650 ; height, weight
db "It sleeps under"
next "shallow ocean"
--- a/data/pokedex/entries/088.asm
+++ b/data/pokedex/entries/088.asm
@@ -1,6 +1,6 @@
; GrimerPokedexEntry: ; 0x1b89a2
db "SLUDGE@" ; species name
- dw 211, 660 ; height, width
+ dw 211, 660 ; height, weight
db "When two of these"
next "#MON's bodies"
--- a/data/pokedex/entries/089.asm
+++ b/data/pokedex/entries/089.asm
@@ -1,6 +1,6 @@
; MukPokedexEntry: ; 0x1b89fc
db "SLUDGE@" ; species name
- dw 311, 660 ; height, width
+ dw 311, 660 ; height, weight
db "As it moves, a"
next "very strong poison"
--- a/data/pokedex/entries/090.asm
+++ b/data/pokedex/entries/090.asm
@@ -1,6 +1,6 @@
; ShellderPokedexEntry: ; 0x1b8a68
db "BIVALVE@" ; species name
- dw 100, 90 ; height, width
+ dw 100, 90 ; height, weight
db "Clamping on to an"
next "opponent reveals"
--- a/data/pokedex/entries/091.asm
+++ b/data/pokedex/entries/091.asm
@@ -1,6 +1,6 @@
; CloysterPokedexEntry: ; 0x1b8ad9
db "BIVALVE@" ; species name
- dw 411, 2920 ; height, width
+ dw 411, 2920 ; height, weight
db "Even a missile"
next "can't break the"
--- a/data/pokedex/entries/092.asm
+++ b/data/pokedex/entries/092.asm
@@ -1,6 +1,6 @@
; GastlyPokedexEntry: ; 0x1b8b4a
db "GAS@" ; species name
- dw 403, 2 ; height, width
+ dw 403, 2 ; height, weight
db "It wraps its op-"
next "ponent in its gas-"
--- a/data/pokedex/entries/093.asm
+++ b/data/pokedex/entries/093.asm
@@ -1,6 +1,6 @@
; HaunterPokedexEntry: ; 0x1b8bbd
db "GAS@" ; species name
- dw 503, 2 ; height, width
+ dw 503, 2 ; height, weight
db "It hides in the"
next "dark, planning to"
--- a/data/pokedex/entries/094.asm
+++ b/data/pokedex/entries/094.asm
@@ -1,6 +1,6 @@
; GengarPokedexEntry: ; 0x1b8c25
db "SHADOW@" ; species name
- dw 411, 890 ; height, width
+ dw 411, 890 ; height, weight
db "Hiding in people's"
next "shadows at night,"
--- a/data/pokedex/entries/095.asm
+++ b/data/pokedex/entries/095.asm
@@ -1,6 +1,6 @@
; OnixPokedexEntry: ; 0x1b8c98
db "ROCK SNAKE@" ; species name
- dw 2810, 4630 ; height, width
+ dw 2810, 4630 ; height, weight
db "As it digs through"
next "the ground, it"
--- a/data/pokedex/entries/096.asm
+++ b/data/pokedex/entries/096.asm
@@ -1,6 +1,6 @@
; DrowzeePokedexEntry: ; 0x1b8d0a
db "HYPNOSIS@" ; species name
- dw 303, 710 ; height, width
+ dw 303, 710 ; height, weight
db "When it twitches"
next "its nose, it can"
--- a/data/pokedex/entries/097.asm
+++ b/data/pokedex/entries/097.asm
@@ -1,6 +1,6 @@
; HypnoPokedexEntry: ; 0x1b8d80
db "HYPNOSIS@" ; species name
- dw 503, 1670 ; height, width
+ dw 503, 1670 ; height, weight
db "The longer it"
next "swings its"
--- a/data/pokedex/entries/098.asm
+++ b/data/pokedex/entries/098.asm
@@ -1,6 +1,6 @@
; KrabbyPokedexEntry: ; 0x1b8ddd
db "RIVER CRAB@" ; species name
- dw 104, 140 ; height, width
+ dw 104, 140 ; height, weight
db "If it is unable"
next "to find food, it"
--- a/data/pokedex/entries/099.asm
+++ b/data/pokedex/entries/099.asm
@@ -1,6 +1,6 @@
; KinglerPokedexEntry: ; 0x1b8e45
db "PINCER@" ; species name
- dw 403, 1320 ; height, width
+ dw 403, 1320 ; height, weight
db "Its oversized claw"
next "is very powerful,"
--- a/data/pokedex/entries/100.asm
+++ b/data/pokedex/entries/100.asm
@@ -1,6 +1,6 @@
; VoltorbPokedexEntry: ; 0x1b8eb0
db "BALL@" ; species name
- dw 108, 230 ; height, width
+ dw 108, 230 ; height, weight
db "During the study"
next "of this #MON,"
--- a/data/pokedex/entries/101.asm
+++ b/data/pokedex/entries/101.asm
@@ -1,6 +1,6 @@
; ElectrodePokedexEntry: ; 0x1b8f19
db "BALL@" ; species name
- dw 311, 1470 ; height, width
+ dw 311, 1470 ; height, weight
db "The more energy it"
next "charges up, the"
--- a/data/pokedex/entries/102.asm
+++ b/data/pokedex/entries/102.asm
@@ -1,6 +1,6 @@
; ExeggcutePokedexEntry: ; 0x1b8f84
db "EGG@" ; species name
- dw 104, 60 ; height, width
+ dw 104, 60 ; height, weight
db "If even one is"
next "separated from the"
--- a/data/pokedex/entries/103.asm
+++ b/data/pokedex/entries/103.asm
@@ -1,6 +1,6 @@
; ExeggutorPokedexEntry: ; 0x1b8ff6
db "COCONUT@" ; species name
- dw 607, 2650 ; height, width
+ dw 607, 2650 ; height, weight
db "Living in a good"
next "environment makes"
--- a/data/pokedex/entries/104.asm
+++ b/data/pokedex/entries/104.asm
@@ -1,6 +1,6 @@
; CubonePokedexEntry: ; 0x1b9068
db "LONELY@" ; species name
- dw 104, 140 ; height, width
+ dw 104, 140 ; height, weight
db "It lost its mother"
next "after its birth."
--- a/data/pokedex/entries/105.asm
+++ b/data/pokedex/entries/105.asm
@@ -1,6 +1,6 @@
; MarowakPokedexEntry: ; 0x1b90d2
db "BONEKEEPER@" ; species name
- dw 303, 990 ; height, width
+ dw 303, 990 ; height, weight
db "Somewhere in the"
next "world is a ceme-"
--- a/data/pokedex/entries/106.asm
+++ b/data/pokedex/entries/106.asm
@@ -1,6 +1,6 @@
; HitmonleePokedexEntry: ; 0x1b913f
db "KICKING@" ; species name
- dw 411, 1100 ; height, width
+ dw 411, 1100 ; height, weight
db "It is also called"
next "the Kick Master."
--- a/data/pokedex/entries/107.asm
+++ b/data/pokedex/entries/107.asm
@@ -1,6 +1,6 @@
; HitmonchanPokedexEntry: ; 0x1b91a4
db "PUNCHING@" ; species name
- dw 407, 1110 ; height, width
+ dw 407, 1110 ; height, weight
db "To increase the"
next "strength of all"
--- a/data/pokedex/entries/108.asm
+++ b/data/pokedex/entries/108.asm
@@ -1,6 +1,6 @@
; LickitungPokedexEntry: ; 0x1b9210
db "LICKING@" ; species name
- dw 311, 1440 ; height, width
+ dw 311, 1440 ; height, weight
db "It has a tongue"
next "that is over 6'6''"
--- a/data/pokedex/entries/109.asm
+++ b/data/pokedex/entries/109.asm
@@ -1,6 +1,6 @@
; KoffingPokedexEntry: ; 0x1b9276
db "POISON GAS@" ; species name
- dw 200, 20 ; height, width
+ dw 200, 20 ; height, weight
db "If one gets close"
next "enough to it when"
--- a/data/pokedex/entries/110.asm
+++ b/data/pokedex/entries/110.asm
@@ -1,6 +1,6 @@
; WeezingPokedexEntry: ; 0x1b92ec
db "POISON GAS@" ; species name
- dw 311, 210 ; height, width
+ dw 311, 210 ; height, weight
db "When it inhales"
next "poisonous gases"
--- a/data/pokedex/entries/111.asm
+++ b/data/pokedex/entries/111.asm
@@ -1,6 +1,6 @@
; RhyhornPokedexEntry: ; 0x1b935d
db "SPIKES@" ; species name
- dw 303, 2540 ; height, width
+ dw 303, 2540 ; height, weight
db "It can remember"
next "only one thing at"
--- a/data/pokedex/entries/112.asm
+++ b/data/pokedex/entries/112.asm
@@ -1,6 +1,6 @@
; RhydonPokedexEntry: ; 0x1b93c5
db "DRILL@" ; species name
- dw 603, 2650 ; height, width
+ dw 603, 2650 ; height, weight
db "By lightly spin-"
next "ning its drill-"
--- a/data/pokedex/entries/113.asm
+++ b/data/pokedex/entries/113.asm
@@ -1,6 +1,6 @@
; ChanseyPokedexEntry: ; 0x1b942e
db "EGG@" ; species name
- dw 307, 760 ; height, width
+ dw 307, 760 ; height, weight
db "People try to"
next "catch it for its"
--- a/data/pokedex/entries/114.asm
+++ b/data/pokedex/entries/114.asm
@@ -1,6 +1,6 @@
; TangelaPokedexEntry: ; 0x1b948c
db "VINE@" ; species name
- dw 303, 770 ; height, width
+ dw 303, 770 ; height, weight
db "During battle, it"
next "constantly moves"
--- a/data/pokedex/entries/115.asm
+++ b/data/pokedex/entries/115.asm
@@ -1,6 +1,6 @@
; KangaskhanPokedexEntry: ; 0x1b94f6
db "PARENT@" ; species name
- dw 703, 1760 ; height, width
+ dw 703, 1760 ; height, weight
db "To avoid"
next "crushing the"
--- a/data/pokedex/entries/116.asm
+++ b/data/pokedex/entries/116.asm
@@ -1,6 +1,6 @@
; HorseaPokedexEntry: ; 0x1b9553
db "DRAGON@" ; species name
- dw 104, 180 ; height, width
+ dw 104, 180 ; height, weight
db "When they're in a"
next "safe location,"
--- a/data/pokedex/entries/117.asm
+++ b/data/pokedex/entries/117.asm
@@ -1,6 +1,6 @@
; SeadraPokedexEntry: ; 0x1b95b8
db "DRAGON@" ; species name
- dw 311, 550 ; height, width
+ dw 311, 550 ; height, weight
db "The male raises"
next "the young. If it"
--- a/data/pokedex/entries/118.asm
+++ b/data/pokedex/entries/118.asm
@@ -1,6 +1,6 @@
; GoldeenPokedexEntry: ; 0x1b9626
db "GOLDFISH@" ; species name
- dw 200, 330 ; height, width
+ dw 200, 330 ; height, weight
db "During spawning"
next "season, they swim"
--- a/data/pokedex/entries/119.asm
+++ b/data/pokedex/entries/119.asm
@@ -1,6 +1,6 @@
; SeakingPokedexEntry: ; 0x1b9690
db "GOLDFISH@" ; species name
- dw 403, 860 ; height, width
+ dw 403, 860 ; height, weight
db "When autumn comes,"
next "the males patrol"
--- a/data/pokedex/entries/120.asm
+++ b/data/pokedex/entries/120.asm
@@ -1,6 +1,6 @@
; StaryuPokedexEntry: ; 0x1b9702
db "STARSHAPE@" ; species name
- dw 207, 760 ; height, width
+ dw 207, 760 ; height, weight
db "When the stars"
next "twinkle at night,"
--- a/data/pokedex/entries/121.asm
+++ b/data/pokedex/entries/121.asm
@@ -1,6 +1,6 @@
; StarmiePokedexEntry: ; 0x1b9776
db "MYSTERIOUS@" ; species name
- dw 307, 1760 ; height, width
+ dw 307, 1760 ; height, weight
db "It is said that it"
next "uses the seven-"
--- a/data/pokedex/entries/122.asm
+++ b/data/pokedex/entries/122.asm
@@ -1,6 +1,6 @@
; MrMimePokedexEntry: ; 0x1b97ea
db "BARRIER@" ; species name
- dw 403, 1200 ; height, width
+ dw 403, 1200 ; height, weight
db "It uses the"
next "mysterious"
--- a/data/pokedex/entries/123.asm
+++ b/data/pokedex/entries/123.asm
@@ -1,6 +1,6 @@
; ScytherPokedexEntry: ; 0x1b9851
db "MANTIS@" ; species name
- dw 411, 1230 ; height, width
+ dw 411, 1230 ; height, weight
db "It's very proud of"
next "its speed. It"
--- a/data/pokedex/entries/124.asm
+++ b/data/pokedex/entries/124.asm
@@ -1,6 +1,6 @@
; JynxPokedexEntry: ; 0x1b98c5
db "HUMANSHAPE@" ; species name
- dw 407, 900 ; height, width
+ dw 407, 900 ; height, weight
db "It has several"
next "different cry pat-"
--- a/data/pokedex/entries/125.asm
+++ b/data/pokedex/entries/125.asm
@@ -1,6 +1,6 @@
; ElectabuzzPokedexEntry: ; 0x1b992a
db "ELECTRIC@" ; species name
- dw 307, 660 ; height, width
+ dw 307, 660 ; height, weight
db "When two"
next "ELECTABUZZ touch,"
--- a/data/pokedex/entries/126.asm
+++ b/data/pokedex/entries/126.asm
@@ -1,6 +1,6 @@
; MagmarPokedexEntry: ; 0x1b9994
db "SPITFIRE@" ; species name
- dw 403, 980 ; height, width
+ dw 403, 980 ; height, weight
db "It moves more"
next "frequently in hot"
--- a/data/pokedex/entries/127.asm
+++ b/data/pokedex/entries/127.asm
@@ -1,6 +1,6 @@
; PinsirPokedexEntry: ; 0x1b99fb
db "STAGBEETLE@" ; species name
- dw 411, 1210 ; height, width
+ dw 411, 1210 ; height, weight
db "When the tempera-"
next "ture drops at"
--- a/data/pokedex/entries/128.asm
+++ b/data/pokedex/entries/128.asm
@@ -1,6 +1,6 @@
; TaurosPokedexEntry: ; 0x1b9a6f
db "WILD BULL@" ; species name
- dw 407, 1950 ; height, width
+ dw 407, 1950 ; height, weight
db "These violent"
next "#MON fight"
--- a/data/pokedex/entries/129.asm
+++ b/data/pokedex/entries/129.asm
@@ -1,6 +1,6 @@
; MagikarpPokedexEntry: ; 0x1cc000
db "FISH@" ; species name
- dw 211, 220 ; height, width
+ dw 211, 220 ; height, weight
db "This weak and"
next "pathetic #MON"
--- a/data/pokedex/entries/130.asm
+++ b/data/pokedex/entries/130.asm
@@ -1,6 +1,6 @@
; GyaradosPokedexEntry: ; 0x1cc065
db "ATROCIOUS@" ; species name
- dw 2104, 5180 ; height, width
+ dw 2104, 5180 ; height, weight
db "It appears when-"
next "ever there is"
--- a/data/pokedex/entries/131.asm
+++ b/data/pokedex/entries/131.asm
@@ -1,6 +1,6 @@
; LaprasPokedexEntry: ; 0x1cc0cd
db "TRANSPORT@" ; species name
- dw 802, 4850 ; height, width
+ dw 802, 4850 ; height, weight
db "This gentle"
next "#MON loves to"
--- a/data/pokedex/entries/132.asm
+++ b/data/pokedex/entries/132.asm
@@ -1,6 +1,6 @@
; DittoPokedexEntry: ; 0x1cc13c
db "TRANSFORM@" ; species name
- dw 100, 90 ; height, width
+ dw 100, 90 ; height, weight
db "When it encount-"
next "ers another DITTO,"
--- a/data/pokedex/entries/133.asm
+++ b/data/pokedex/entries/133.asm
@@ -1,6 +1,6 @@
; EeveePokedexEntry: ; 0x1cc1b2
db "EVOLUTION@" ; species name
- dw 100, 140 ; height, width
+ dw 100, 140 ; height, weight
db "Its ability to"
next "evolve into many"
--- a/data/pokedex/entries/134.asm
+++ b/data/pokedex/entries/134.asm
@@ -1,6 +1,6 @@
; VaporeonPokedexEntry: ; 0x1cc224
db "BUBBLE JET@" ; species name
- dw 303, 640 ; height, width
+ dw 303, 640 ; height, weight
db "As it uses the"
next "fins on the tip"
--- a/data/pokedex/entries/135.asm
+++ b/data/pokedex/entries/135.asm
@@ -1,6 +1,6 @@
; JolteonPokedexEntry: ; 0x1cc28b
db "LIGHTNING@" ; species name
- dw 207, 540 ; height, width
+ dw 207, 540 ; height, weight
db "The negatively"
next "charged ions"
--- a/data/pokedex/entries/136.asm
+++ b/data/pokedex/entries/136.asm
@@ -1,6 +1,6 @@
; FlareonPokedexEntry: ; 0x1cc2ec
db "FLAME@" ; species name
- dw 211, 550 ; height, width
+ dw 211, 550 ; height, weight
db "Once it has stored"
next "up enough heat,"
--- a/data/pokedex/entries/137.asm
+++ b/data/pokedex/entries/137.asm
@@ -1,6 +1,6 @@
; PorygonPokedexEntry: ; 0x1cc353
db "VIRTUAL@" ; species name
- dw 207, 800 ; height, width
+ dw 207, 800 ; height, weight
db "An artificial"
next "#MON created"
--- a/data/pokedex/entries/138.asm
+++ b/data/pokedex/entries/138.asm
@@ -1,6 +1,6 @@
; OmanytePokedexEntry: ; 0x1cc3c1
db "SPIRAL@" ; species name
- dw 104, 170 ; height, width
+ dw 104, 170 ; height, weight
db "In prehistoric"
next "times, it swam on"
--- a/data/pokedex/entries/139.asm
+++ b/data/pokedex/entries/139.asm
@@ -1,6 +1,6 @@
; OmastarPokedexEntry: ; 0x1cc42e
db "SPIRAL@" ; species name
- dw 303, 770 ; height, width
+ dw 303, 770 ; height, weight
db "Its heavy shell"
next "allowed it to"
--- a/data/pokedex/entries/140.asm
+++ b/data/pokedex/entries/140.asm
@@ -1,6 +1,6 @@
; KabutoPokedexEntry: ; 0x1cc497
db "SHELLFISH@" ; species name
- dw 108, 250 ; height, width
+ dw 108, 250 ; height, weight
db "Three hundred"
next "million years ago,"
--- a/data/pokedex/entries/141.asm
+++ b/data/pokedex/entries/141.asm
@@ -1,6 +1,6 @@
; KabutopsPokedexEntry: ; 0x1cc507
db "SHELLFISH@" ; species name
- dw 403, 890 ; height, width
+ dw 403, 890 ; height, weight
db "It was able to"
next "swim quickly thro-"
--- a/data/pokedex/entries/142.asm
+++ b/data/pokedex/entries/142.asm
@@ -1,6 +1,6 @@
; AerodactylPokedexEntry: ; 0x1cc576
db "FOSSIL@" ; species name
- dw 511, 1300 ; height, width
+ dw 511, 1300 ; height, weight
db "In prehistoric"
next "times, this"
--- a/data/pokedex/entries/143.asm
+++ b/data/pokedex/entries/143.asm
@@ -1,6 +1,6 @@
; SnorlaxPokedexEntry: ; 0x1cc5cf
db "SLEEPING@" ; species name
- dw 611, 10140 ; height, width
+ dw 611, 10140 ; height, weight
db "This #MON's"
next "stomach is so"
--- a/data/pokedex/entries/144.asm
+++ b/data/pokedex/entries/144.asm
@@ -1,6 +1,6 @@
; ArticunoPokedexEntry: ; 0x1cc632
db "FREEZE@" ; species name
- dw 507, 1220 ; height, width
+ dw 507, 1220 ; height, weight
db "Legendary bird"
next "#MON. As it"
--- a/data/pokedex/entries/145.asm
+++ b/data/pokedex/entries/145.asm
@@ -1,6 +1,6 @@
; ZapdosPokedexEntry: ; 0x1cc697
db "ELECTRIC@" ; species name
- dw 503, 1160 ; height, width
+ dw 503, 1160 ; height, weight
db "Legendary bird"
next "#MON. They say"
--- a/data/pokedex/entries/146.asm
+++ b/data/pokedex/entries/146.asm
@@ -1,6 +1,6 @@
; MoltresPokedexEntry: ; 0x1cc706
db "FLAME@" ; species name
- dw 607, 1320 ; height, width
+ dw 607, 1320 ; height, weight
db "Legendary bird"
next "#MON. It is"
--- a/data/pokedex/entries/147.asm
+++ b/data/pokedex/entries/147.asm
@@ -1,6 +1,6 @@
; DratiniPokedexEntry: ; 0x1cc761
db "DRAGON@" ; species name
- dw 511, 70 ; height, width
+ dw 511, 70 ; height, weight
db "It sheds many lay-"
next "ers of skin as it"
--- a/data/pokedex/entries/148.asm
+++ b/data/pokedex/entries/148.asm
@@ -1,6 +1,6 @@
; DragonairPokedexEntry: ; 0x1cc7dc
db "DRAGON@" ; species name
- dw 1301, 360 ; height, width
+ dw 1301, 360 ; height, weight
db "It is called the"
next "divine #MON."
--- a/data/pokedex/entries/149.asm
+++ b/data/pokedex/entries/149.asm
@@ -1,6 +1,6 @@
; DragonitePokedexEntry: ; 0x1cc843
db "DRAGON@" ; species name
- dw 703, 4630 ; height, width
+ dw 703, 4630 ; height, weight
db "It is said that"
next "somewhere in the"
--- a/data/pokedex/entries/150.asm
+++ b/data/pokedex/entries/150.asm
@@ -1,6 +1,6 @@
; MewtwoPokedexEntry: ; 0x1cc8ae
db "GENETIC@" ; species name
- dw 607, 2690 ; height, width
+ dw 607, 2690 ; height, weight
db "Said to rest qui-"
next "etly in an"
--- a/data/pokedex/entries/151.asm
+++ b/data/pokedex/entries/151.asm
@@ -1,6 +1,6 @@
; MewPokedexEntry: ; 0x1cc915
db "NEW SPECIE@" ; species name
- dw 104, 90 ; height, width
+ dw 104, 90 ; height, weight
db "Because it can"
next "learn any move,"
--- a/data/pokedex/entries/152.asm
+++ b/data/pokedex/entries/152.asm
@@ -1,6 +1,6 @@
; ChikoritaPokedexEntry: ; 0x1cc988
db "LEAF@" ; species name
- dw 211, 140 ; height, width
+ dw 211, 140 ; height, weight
db "It loves to bask"
next "in the sunlight."
--- a/data/pokedex/entries/153.asm
+++ b/data/pokedex/entries/153.asm
@@ -1,6 +1,6 @@
; BayleefPokedexEntry: ; 0x1cc9e9
db "LEAF@" ; species name
- dw 311, 350 ; height, width
+ dw 311, 350 ; height, weight
db "The scent that"
next "wafts from the"
--- a/data/pokedex/entries/154.asm
+++ b/data/pokedex/entries/154.asm
@@ -1,6 +1,6 @@
; MeganiumPokedexEntry: ; 0x1cca54
db "HERB@" ; species name
- dw 511, 2220 ; height, width
+ dw 511, 2220 ; height, weight
db "Anyone who stands"
next "beside it becomes"
--- a/data/pokedex/entries/155.asm
+++ b/data/pokedex/entries/155.asm
@@ -1,6 +1,6 @@
; CyndaquilPokedexEntry: ; 0x1ccabd
db "FIRE MOUSE@" ; species name
- dw 108, 170 ; height, width
+ dw 108, 170 ; height, weight
db "The fire that"
next "spouts from its"
--- a/data/pokedex/entries/156.asm
+++ b/data/pokedex/entries/156.asm
@@ -1,6 +1,6 @@
; QuilavaPokedexEntry: ; 0x1ccb33
db "VOLCANO@" ; species name
- dw 211, 420 ; height, width
+ dw 211, 420 ; height, weight
db "Before battle, it"
next "turns its back on"
--- a/data/pokedex/entries/157.asm
+++ b/data/pokedex/entries/157.asm
@@ -1,6 +1,6 @@
; TyphlosionPokedexEntry: ; 0x1ccba0
db "VOLCANO@" ; species name
- dw 507, 1750 ; height, width
+ dw 507, 1750 ; height, weight
db "When heat from its"
next "body causes the"
--- a/data/pokedex/entries/158.asm
+++ b/data/pokedex/entries/158.asm
@@ -1,6 +1,6 @@
; TotodilePokedexEntry: ; 0x1ccc14
db "BIG JAW@" ; species name
- dw 200, 210 ; height, width
+ dw 200, 210 ; height, weight
db "This rough critter"
next "chomps at any"
--- a/data/pokedex/entries/159.asm
+++ b/data/pokedex/entries/159.asm
@@ -1,6 +1,6 @@
; CroconawPokedexEntry: ; 0x1ccc84
db "BIG JAW@" ; species name
- dw 307, 550 ; height, width
+ dw 307, 550 ; height, weight
db "The tips of its"
next "fangs are slanted"
--- a/data/pokedex/entries/160.asm
+++ b/data/pokedex/entries/160.asm
@@ -1,6 +1,6 @@
; FeraligatrPokedexEntry: ; 0x1cccf9
db "BIG JAW@" ; species name
- dw 707, 1960 ; height, width
+ dw 707, 1960 ; height, weight
db "Although it has a"
next "massive body, its"
--- a/data/pokedex/entries/161.asm
+++ b/data/pokedex/entries/161.asm
@@ -1,6 +1,6 @@
; SentretPokedexEntry: ; 0x1ccd6b
db "SCOUT@" ; species name
- dw 207, 130 ; height, width
+ dw 207, 130 ; height, weight
db "When acting as a"
next "lookout, it warns"
--- a/data/pokedex/entries/162.asm
+++ b/data/pokedex/entries/162.asm
@@ -1,6 +1,6 @@
; FurretPokedexEntry: ; 0x1ccddd
db "LONG BODY@" ; species name
- dw 511, 720 ; height, width
+ dw 511, 720 ; height, weight
db "It lives in narrow"
next "burrows that fit"
--- a/data/pokedex/entries/163.asm
+++ b/data/pokedex/entries/163.asm
@@ -1,6 +1,6 @@
; HoothootPokedexEntry: ; 0x1cce58
db "OWL@" ; species name
- dw 204, 470 ; height, width
+ dw 204, 470 ; height, weight
db "It begins to hoot"
next "at the same time"
--- a/data/pokedex/entries/164.asm
+++ b/data/pokedex/entries/164.asm
@@ -1,6 +1,6 @@
; NoctowlPokedexEntry: ; 0x1cceb9
db "OWL@" ; species name
- dw 503, 900 ; height, width
+ dw 503, 900 ; height, weight
db "Its extremely soft"
next "feathers make no"
--- a/data/pokedex/entries/165.asm
+++ b/data/pokedex/entries/165.asm
@@ -1,6 +1,6 @@
; LedybaPokedexEntry: ; 0x1ccf2c
db "FIVE STAR@" ; species name
- dw 303, 240 ; height, width
+ dw 303, 240 ; height, weight
db "It is timid and"
next "clusters together"
--- a/data/pokedex/entries/166.asm
+++ b/data/pokedex/entries/166.asm
@@ -1,6 +1,6 @@
; LedianPokedexEntry: ; 0x1ccfa0
db "FIVE STAR@" ; species name
- dw 407, 780 ; height, width
+ dw 407, 780 ; height, weight
db "In the daytime"
next "when it gets warm,"
--- a/data/pokedex/entries/167.asm
+++ b/data/pokedex/entries/167.asm
@@ -1,6 +1,6 @@
; SpinarakPokedexEntry: ; 0x1cd012
db "STRINGSPIT@" ; species name
- dw 108, 190 ; height, width
+ dw 108, 190 ; height, weight
db "If prey becomes"
next "ensnared in its"
--- a/data/pokedex/entries/168.asm
+++ b/data/pokedex/entries/168.asm
@@ -1,6 +1,6 @@
; AriadosPokedexEntry: ; 0x1cd083
db "LONG LEG@" ; species name
- dw 307, 740 ; height, width
+ dw 307, 740 ; height, weight
db "Rather than mak-"
next "ing a nest in one"
--- a/data/pokedex/entries/169.asm
+++ b/data/pokedex/entries/169.asm
@@ -1,6 +1,6 @@
; CrobatPokedexEntry: ; 0x1cd0f5
db "BAT@" ; species name
- dw 511, 1650 ; height, width
+ dw 511, 1650 ; height, weight
db "As a result of its"
next "pursuit of faster,"
--- a/data/pokedex/entries/170.asm
+++ b/data/pokedex/entries/170.asm
@@ -1,6 +1,6 @@
; ChinchouPokedexEntry: ; 0x1cd165
db "ANGLER@" ; species name
- dw 108, 260 ; height, width
+ dw 108, 260 ; height, weight
db "Its antennae, whi-"
next "ch evolved from a"
--- a/data/pokedex/entries/171.asm
+++ b/data/pokedex/entries/171.asm
@@ -1,6 +1,6 @@
; LanturnPokedexEntry: ; 0x1cd1de
db "LIGHT@" ; species name
- dw 311, 500 ; height, width
+ dw 311, 500 ; height, weight
db "This #MON uses"
next "the bright part of"
--- a/data/pokedex/entries/172.asm
+++ b/data/pokedex/entries/172.asm
@@ -1,6 +1,6 @@
; PichuPokedexEntry: ; 0x1cd243
db "TINY MOUSE@" ; species name
- dw 100, 40 ; height, width
+ dw 100, 40 ; height, weight
db "It is unskilled at"
next "storing electric"
--- a/data/pokedex/entries/173.asm
+++ b/data/pokedex/entries/173.asm
@@ -1,6 +1,6 @@
; CleffaPokedexEntry: ; 0x1cd2bc
db "STARSHAPE@" ; species name
- dw 100, 70 ; height, width
+ dw 100, 70 ; height, weight
db "If the impact site"
next "of a meteorite is"
--- a/data/pokedex/entries/174.asm
+++ b/data/pokedex/entries/174.asm
@@ -1,6 +1,6 @@
; IgglybuffPokedexEntry: ; 0x1cd32c
db "BALLOON@" ; species name
- dw 100, 20 ; height, width
+ dw 100, 20 ; height, weight
db "Instead of walking"
next "with its short"
--- a/data/pokedex/entries/175.asm
+++ b/data/pokedex/entries/175.asm
@@ -1,6 +1,6 @@
; TogepiPokedexEntry: ; 0x1cd396
db "SPIKE BALL@" ; species name
- dw 100, 30 ; height, width
+ dw 100, 30 ; height, weight
db "It is considered"
next "to be a symbol of"
--- a/data/pokedex/entries/176.asm
+++ b/data/pokedex/entries/176.asm
@@ -1,6 +1,6 @@
; TogeticPokedexEntry: ; 0x1cd402
db "HAPPINESS@" ; species name
- dw 200, 70 ; height, width
+ dw 200, 70 ; height, weight
db "Although it does"
next "not flap its wings"
--- a/data/pokedex/entries/177.asm
+++ b/data/pokedex/entries/177.asm
@@ -1,6 +1,6 @@
; NatuPokedexEntry: ; 0x1cd47d
db "LITTLE BIRD@" ; species name
- dw 8, 40 ; height, width
+ dw 8, 40 ; height, weight
db "It is extremely"
next "good at climbing"
--- a/data/pokedex/entries/178.asm
+++ b/data/pokedex/entries/178.asm
@@ -1,6 +1,6 @@
; XatuPokedexEntry: ; 0x1cd4e9
db "MYSTIC@" ; species name
- dw 411, 330 ; height, width
+ dw 411, 330 ; height, weight
db "Once it begins to"
next "meditate at sun-"
--- a/data/pokedex/entries/179.asm
+++ b/data/pokedex/entries/179.asm
@@ -1,6 +1,6 @@
; MareepPokedexEntry: ; 0x1cd551
db "WOOL@" ; species name
- dw 200, 170 ; height, width
+ dw 200, 170 ; height, weight
db "It stores lots of"
next "air in its soft"
--- a/data/pokedex/entries/180.asm
+++ b/data/pokedex/entries/180.asm
@@ -1,6 +1,6 @@
; FlaaffyPokedexEntry: ; 0x1cd5b8
db "WOOL@" ; species name
- dw 207, 290 ; height, width
+ dw 207, 290 ; height, weight
db "Because of its"
next "rubbery, electric-"
--- a/data/pokedex/entries/181.asm
+++ b/data/pokedex/entries/181.asm
@@ -1,6 +1,6 @@
; AmpharosPokedexEntry: ; 0x1cd626
db "LIGHT@" ; species name
- dw 407, 1360 ; height, width
+ dw 407, 1360 ; height, weight
db "When it gets dark,"
next "the light from its"
--- a/data/pokedex/entries/182.asm
+++ b/data/pokedex/entries/182.asm
@@ -1,6 +1,6 @@
; BellossomPokedexEntry: ; 0x1cd69a
db "FLOWER@" ; species name
- dw 104, 130 ; height, width
+ dw 104, 130 ; height, weight
db "When these dance"
next "together, their"
--- a/data/pokedex/entries/183.asm
+++ b/data/pokedex/entries/183.asm
@@ -1,6 +1,6 @@
; MarillPokedexEntry: ; 0x1cd705
db "AQUAMOUSE@" ; species name
- dw 104, 190 ; height, width
+ dw 104, 190 ; height, weight
db "The fur on its"
next "body naturally"
--- a/data/pokedex/entries/184.asm
+++ b/data/pokedex/entries/184.asm
@@ -1,6 +1,6 @@
; AzumarillPokedexEntry: ; 0x1cd771
db "AQUARABBIT@" ; species name
- dw 207, 630 ; height, width
+ dw 207, 630 ; height, weight
db "The bubble-like"
next "pattern on its"
--- a/data/pokedex/entries/185.asm
+++ b/data/pokedex/entries/185.asm
@@ -1,6 +1,6 @@
; SudowoodoPokedexEntry: ; 0x1cd7d9
db "IMITATION@" ; species name
- dw 311, 840 ; height, width
+ dw 311, 840 ; height, weight
db "If a tree branch"
next "shakes when there"
--- a/data/pokedex/entries/186.asm
+++ b/data/pokedex/entries/186.asm
@@ -1,6 +1,6 @@
; PolitoedPokedexEntry: ; 0x1cd84b
db "FROG@" ; species name
- dw 307, 750 ; height, width
+ dw 307, 750 ; height, weight
db "When it expands"
next "its throat to"
--- a/data/pokedex/entries/187.asm
+++ b/data/pokedex/entries/187.asm
@@ -1,6 +1,6 @@
; HoppipPokedexEntry: ; 0x1cd8b5
db "COTTONWEED@" ; species name
- dw 104, 10 ; height, width
+ dw 104, 10 ; height, weight
db "It can be carried"
next "away on even the"
--- a/data/pokedex/entries/188.asm
+++ b/data/pokedex/entries/188.asm
@@ -1,6 +1,6 @@
; SkiploomPokedexEntry: ; 0x1cd928
db "COTTONWEED@" ; species name
- dw 200, 20 ; height, width
+ dw 200, 20 ; height, weight
db "As soon as it"
next "rains, it closes"
--- a/data/pokedex/entries/189.asm
+++ b/data/pokedex/entries/189.asm
@@ -1,6 +1,6 @@
; JumpluffPokedexEntry: ; 0x1cd998
db "COTTONWEED@" ; species name
- dw 207, 70 ; height, width
+ dw 207, 70 ; height, weight
db "Even in the fierc-"
next "est wind, it can"
--- a/data/pokedex/entries/190.asm
+++ b/data/pokedex/entries/190.asm
@@ -1,6 +1,6 @@
; AipomPokedexEntry: ; 0x1cda11
db "LONG TAIL@" ; species name
- dw 207, 250 ; height, width
+ dw 207, 250 ; height, weight
db "It uses its tail"
next "to hang on to tree"
--- a/data/pokedex/entries/191.asm
+++ b/data/pokedex/entries/191.asm
@@ -1,6 +1,6 @@
; SunkernPokedexEntry: ; 0x1cda87
db "SEED@" ; species name
- dw 100, 40 ; height, width
+ dw 100, 40 ; height, weight
db "It is very weak."
next "Its only means of"
--- a/data/pokedex/entries/192.asm
+++ b/data/pokedex/entries/192.asm
@@ -1,6 +1,6 @@
; SunfloraPokedexEntry: ; 0x1cdaef
db "SUN@" ; species name
- dw 207, 190 ; height, width
+ dw 207, 190 ; height, weight
db "As the hot season"
next "approaches, the"
--- a/data/pokedex/entries/193.asm
+++ b/data/pokedex/entries/193.asm
@@ -1,6 +1,6 @@
; YanmaPokedexEntry: ; 0x1d0000
db "CLEAR WING@" ; species name
- dw 311, 840 ; height, width
+ dw 311, 840 ; height, weight
db "It can see in all"
next "directions without"
--- a/data/pokedex/entries/194.asm
+++ b/data/pokedex/entries/194.asm
@@ -1,6 +1,6 @@
; WooperPokedexEntry: ; 0x1d0078
db "WATER FISH@" ; species name
- dw 104, 190 ; height, width
+ dw 104, 190 ; height, weight
db "A mucous"
next "membrane covers"
--- a/data/pokedex/entries/195.asm
+++ b/data/pokedex/entries/195.asm
@@ -1,6 +1,6 @@
; QuagsirePokedexEntry: ; 0x1d00dd
db "WATER FISH@" ; species name
- dw 407, 1650 ; height, width
+ dw 407, 1650 ; height, weight
db "Its body is always"
next "slimy. It often"
--- a/data/pokedex/entries/196.asm
+++ b/data/pokedex/entries/196.asm
@@ -1,6 +1,6 @@
; EspeonPokedexEntry: ; 0x1d0155
db "SUN@" ; species name
- dw 211, 580 ; height, width
+ dw 211, 580 ; height, weight
db "The tip of its"
next "forked tail"
--- a/data/pokedex/entries/197.asm
+++ b/data/pokedex/entries/197.asm
@@ -1,6 +1,6 @@
; UmbreonPokedexEntry: ; 0x1d01af
db "MOONLIGHT@" ; species name
- dw 303, 600 ; height, width
+ dw 303, 600 ; height, weight
db "On the night of a"
next "full moon, or when"
--- a/data/pokedex/entries/198.asm
+++ b/data/pokedex/entries/198.asm
@@ -1,6 +1,6 @@
; MurkrowPokedexEntry: ; 0x1d021e
db "DARKNESS@" ; species name
- dw 108, 50 ; height, width
+ dw 108, 50 ; height, weight
db "It hides any shiny"
next "object it finds in"
--- a/data/pokedex/entries/199.asm
+++ b/data/pokedex/entries/199.asm
@@ -1,6 +1,6 @@
; SlowkingPokedexEntry: ; 0x1d0292
db "ROYAL@" ; species name
- dw 607, 1750 ; height, width
+ dw 607, 1750 ; height, weight
db "Every time it ya-"
next "wns, SHELLDER"
--- a/data/pokedex/entries/200.asm
+++ b/data/pokedex/entries/200.asm
@@ -1,6 +1,6 @@
; MisdreavusPokedexEntry: ; 0x1d0301
db "SCREECH@" ; species name
- dw 204, 20 ; height, width
+ dw 204, 20 ; height, weight
db "It loves to watch"
next "people it's scar-"
--- a/data/pokedex/entries/201.asm
+++ b/data/pokedex/entries/201.asm
@@ -1,6 +1,6 @@
; UnownPokedexEntry: ; 0x1d0373
db "SYMBOL@" ; species name
- dw 108, 110 ; height, width
+ dw 108, 110 ; height, weight
db "Because different"
next "types of UNOWN"
--- a/data/pokedex/entries/202.asm
+++ b/data/pokedex/entries/202.asm
@@ -1,6 +1,6 @@
; WobbuffetPokedexEntry: ; 0x1d03dd
db "PATIENT@" ; species name
- dw 403, 630 ; height, width
+ dw 403, 630 ; height, weight
db "In order to con-"
next "ceal its black"
--- a/data/pokedex/entries/203.asm
+++ b/data/pokedex/entries/203.asm
@@ -1,6 +1,6 @@
; GirafarigPokedexEntry: ; 0x1d0446
db "LONG NECK@" ; species name
- dw 411, 910 ; height, width
+ dw 411, 910 ; height, weight
db "When it is in"
next "danger, its tail"
--- a/data/pokedex/entries/204.asm
+++ b/data/pokedex/entries/204.asm
@@ -1,6 +1,6 @@
; PinecoPokedexEntry: ; 0x1d04b0
db "BAGWORM@" ; species name
- dw 200, 160 ; height, width
+ dw 200, 160 ; height, weight
db "It spits out a"
next "fluid that it uses"
--- a/data/pokedex/entries/205.asm
+++ b/data/pokedex/entries/205.asm
@@ -1,6 +1,6 @@
; ForretressPokedexEntry: ; 0x1d0524
db "BAGWORM@" ; species name
- dw 311, 2770 ; height, width
+ dw 311, 2770 ; height, weight
db "Usually found"
next "hanging on to a"
--- a/data/pokedex/entries/206.asm
+++ b/data/pokedex/entries/206.asm
@@ -1,6 +1,6 @@
; DunsparcePokedexEntry: ; 0x1d0593
db "LAND SNAKE@" ; species name
- dw 411, 310 ; height, width
+ dw 411, 310 ; height, weight
db "It hides deep"
next "inside caves where"
--- a/data/pokedex/entries/207.asm
+++ b/data/pokedex/entries/207.asm
@@ -1,6 +1,6 @@
; GligarPokedexEntry: ; 0x1d0604
db "FLYSCORPIO@" ; species name
- dw 307, 1430 ; height, width
+ dw 307, 1430 ; height, weight
db "It builds its nest"
next "on a steep cliff."
--- a/data/pokedex/entries/208.asm
+++ b/data/pokedex/entries/208.asm
@@ -1,6 +1,6 @@
; SteelixPokedexEntry: ; 0x1d067c
db "IRON SNAKE@" ; species name
- dw 3002, 8820 ; height, width
+ dw 3002, 8820 ; height, weight
db "The many small"
next "metal particles"
--- a/data/pokedex/entries/209.asm
+++ b/data/pokedex/entries/209.asm
@@ -1,6 +1,6 @@
; SnubbullPokedexEntry: ; 0x1d06e0
db "FAIRY@" ; species name
- dw 200, 170 ; height, width
+ dw 200, 170 ; height, weight
db "In truth, it is a"
next "cowardly #MON."
--- a/data/pokedex/entries/210.asm
+++ b/data/pokedex/entries/210.asm
@@ -1,6 +1,6 @@
; GranbullPokedexEntry: ; 0x1d074a
db "FAIRY@" ; species name
- dw 407, 1070 ; height, width
+ dw 407, 1070 ; height, weight
db "It can make most"
next "any #MON run"
--- a/data/pokedex/entries/211.asm
+++ b/data/pokedex/entries/211.asm
@@ -1,6 +1,6 @@
; QwilfishPokedexEntry: ; 0x1d07b1
db "BALLOON@" ; species name
- dw 108, 90 ; height, width
+ dw 108, 90 ; height, weight
db "When faced with a"
next "larger opponent,"
--- a/data/pokedex/entries/212.asm
+++ b/data/pokedex/entries/212.asm
@@ -1,6 +1,6 @@
; ScizorPokedexEntry: ; 0x1d0821
db "SCISSORS@" ; species name
- dw 511, 2600 ; height, width
+ dw 511, 2600 ; height, weight
db "This #MON's"
next "pincers, which"
--- a/data/pokedex/entries/213.asm
+++ b/data/pokedex/entries/213.asm
@@ -1,6 +1,6 @@
; ShucklePokedexEntry: ; 0x1d088e
db "MOLD@" ; species name
- dw 200, 450 ; height, width
+ dw 200, 450 ; height, weight
db "The fluid secreted"
next "by its toes carves"
--- a/data/pokedex/entries/214.asm
+++ b/data/pokedex/entries/214.asm
@@ -1,6 +1,6 @@
; HeracrossPokedexEntry: ; 0x1d0907
db "SINGLEHORN@" ; species name
- dw 411, 1190 ; height, width
+ dw 411, 1190 ; height, weight
db "With its Herculean"
next "powers, it can"
--- a/data/pokedex/entries/215.asm
+++ b/data/pokedex/entries/215.asm
@@ -1,6 +1,6 @@
; SneaselPokedexEntry: ; 0x1d097a
db "SHARP CLAW@" ; species name
- dw 211, 620 ; height, width
+ dw 211, 620 ; height, weight
db "This cunning"
next "#MON hides"
--- a/data/pokedex/entries/216.asm
+++ b/data/pokedex/entries/216.asm
@@ -1,6 +1,6 @@
; TeddiursaPokedexEntry: ; 0x1d09da
db "LITTLE BEAR@" ; species name
- dw 200, 190 ; height, width
+ dw 200, 190 ; height, weight
db "It always licks"
next "honey. Its palm"
--- a/data/pokedex/entries/217.asm
+++ b/data/pokedex/entries/217.asm
@@ -1,6 +1,6 @@
; UrsaringPokedexEntry: ; 0x1d0a41
db "HIBERNANT@" ; species name
- dw 511, 2770 ; height, width
+ dw 511, 2770 ; height, weight
db "Although it has a"
next "large body, it is"
--- a/data/pokedex/entries/218.asm
+++ b/data/pokedex/entries/218.asm
@@ -1,6 +1,6 @@
; SlugmaPokedexEntry: ; 0x1d0ab8
db "LAVA@" ; species name
- dw 204, 770 ; height, width
+ dw 204, 770 ; height, weight
db "These group to-"
next "gether in areas"
--- a/data/pokedex/entries/219.asm
+++ b/data/pokedex/entries/219.asm
@@ -1,6 +1,6 @@
; MagcargoPokedexEntry: ; 0x1d0b21
db "LAVA@" ; species name
- dw 207, 1210 ; height, width
+ dw 207, 1210 ; height, weight
db "Its body is as hot"
next "as lava and is"
--- a/data/pokedex/entries/220.asm
+++ b/data/pokedex/entries/220.asm
@@ -1,6 +1,6 @@
; SwinubPokedexEntry: ; 0x1d0b8d
db "PIG@" ; species name
- dw 104, 140 ; height, width
+ dw 104, 140 ; height, weight
db "It uses the tip of"
next "its nose to dig"
--- a/data/pokedex/entries/221.asm
+++ b/data/pokedex/entries/221.asm
@@ -1,6 +1,6 @@
; PiloswinePokedexEntry: ; 0x1d0c01
db "SWINE@" ; species name
- dw 307, 1230 ; height, width
+ dw 307, 1230 ; height, weight
db "Although its legs"
next "are short, its"
--- a/data/pokedex/entries/222.asm
+++ b/data/pokedex/entries/222.asm
@@ -1,6 +1,6 @@
; CorsolaPokedexEntry: ; 0x1d0c68
db "CORAL@" ; species name
- dw 200, 110 ; height, width
+ dw 200, 110 ; height, weight
db "The points on its"
next "head absorb"
--- a/data/pokedex/entries/223.asm
+++ b/data/pokedex/entries/223.asm
@@ -1,6 +1,6 @@
; RemoraidPokedexEntry: ; 0x1d0cd3
db "JET@" ; species name
- dw 200, 260 ; height, width
+ dw 200, 260 ; height, weight
db "To escape from an"
next "attacker, it may"
--- a/data/pokedex/entries/224.asm
+++ b/data/pokedex/entries/224.asm
@@ -1,6 +1,6 @@
; OctilleryPokedexEntry: ; 0x1d0d42
db "JET@" ; species name
- dw 211, 630 ; height, width
+ dw 211, 630 ; height, weight
db "Its instinct is to"
next "bury itself in"
--- a/data/pokedex/entries/225.asm
+++ b/data/pokedex/entries/225.asm
@@ -1,6 +1,6 @@
; DelibirdPokedexEntry: ; 0x1d0db1
db "DELIVERY@" ; species name
- dw 211, 350 ; height, width
+ dw 211, 350 ; height, weight
db "It always carries"
next "its food with it,"
--- a/data/pokedex/entries/226.asm
+++ b/data/pokedex/entries/226.asm
@@ -1,6 +1,6 @@
; MantinePokedexEntry: ; 0x1d0e25
db "KITE@" ; species name
- dw 611, 4850 ; height, width
+ dw 611, 4850 ; height, weight
db "It swims along"
next "freely, eating"
--- a/data/pokedex/entries/227.asm
+++ b/data/pokedex/entries/227.asm
@@ -1,6 +1,6 @@
; SkarmoryPokedexEntry: ; 0x1d0e8c
db "ARMOR BIRD@" ; species name
- dw 507, 1110 ; height, width
+ dw 507, 1110 ; height, weight
db "The feathers that"
next "it sheds are very"
--- a/data/pokedex/entries/228.asm
+++ b/data/pokedex/entries/228.asm
@@ -1,6 +1,6 @@
; HoundourPokedexEntry: ; 0x1d0eff
db "DARK@" ; species name
- dw 200, 240 ; height, width
+ dw 200, 240 ; height, weight
db "Around dawn, its"
next "ominous howl"
--- a/data/pokedex/entries/229.asm
+++ b/data/pokedex/entries/229.asm
@@ -1,6 +1,6 @@
; HoundoomPokedexEntry: ; 0x1d0f66
db "DARK@" ; species name
- dw 407, 770 ; height, width
+ dw 407, 770 ; height, weight
db "The pungent-"
next "smelling flame"
--- a/data/pokedex/entries/230.asm
+++ b/data/pokedex/entries/230.asm
@@ -1,6 +1,6 @@
; KingdraPokedexEntry: ; 0x1d0fd1
db "DRAGON@" ; species name
- dw 511, 3350 ; height, width
+ dw 511, 3350 ; height, weight
db "It stores energy"
next "by sleeping at"
--- a/data/pokedex/entries/231.asm
+++ b/data/pokedex/entries/231.asm
@@ -1,6 +1,6 @@
; PhanpyPokedexEntry: ; 0x1d1038
db "LONG NOSE@" ; species name
- dw 108, 740 ; height, width
+ dw 108, 740 ; height, weight
db "During the desert-"
next "ed morning hours,"
--- a/data/pokedex/entries/232.asm
+++ b/data/pokedex/entries/232.asm
@@ -1,6 +1,6 @@
; DonphanPokedexEntry: ; 0x1d10ac
db "ARMOR@" ; species name
- dw 307, 2650 ; height, width
+ dw 307, 2650 ; height, weight
db "Because this"
next "#MON's skin is"
--- a/data/pokedex/entries/233.asm
+++ b/data/pokedex/entries/233.asm
@@ -1,6 +1,6 @@
; Porygon2PokedexEntry: ; 0x1d110c
db "VIRTUAL@" ; species name
- dw 200, 720 ; height, width
+ dw 200, 720 ; height, weight
db "This manmade"
next "#MON evolved"
--- a/data/pokedex/entries/234.asm
+++ b/data/pokedex/entries/234.asm
@@ -1,6 +1,6 @@
; StantlerPokedexEntry: ; 0x1d1174
db "BIG HORN@" ; species name
- dw 407, 1570 ; height, width
+ dw 407, 1570 ; height, weight
db "The round balls"
next "found on the"
--- a/data/pokedex/entries/235.asm
+++ b/data/pokedex/entries/235.asm
@@ -1,6 +1,6 @@
; SmearglePokedexEntry: ; 0x1d11e0
db "PAINTER@" ; species name
- dw 311, 1280 ; height, width
+ dw 311, 1280 ; height, weight
db "The color of the"
next "mysterious fluid"
--- a/data/pokedex/entries/236.asm
+++ b/data/pokedex/entries/236.asm
@@ -1,6 +1,6 @@
; TyroguePokedexEntry: ; 0x1d124b
db "SCUFFLE@" ; species name
- dw 204, 460 ; height, width
+ dw 204, 460 ; height, weight
db "To brush up on its"
next "fighting skills,"
--- a/data/pokedex/entries/237.asm
+++ b/data/pokedex/entries/237.asm
@@ -1,6 +1,6 @@
; HitmontopPokedexEntry: ; 0x1d12c0
db "HANDSTAND@" ; species name
- dw 407, 1060 ; height, width
+ dw 407, 1060 ; height, weight
db "After doing a"
next "handstand to"
--- a/data/pokedex/entries/238.asm
+++ b/data/pokedex/entries/238.asm
@@ -1,6 +1,6 @@
; SmoochumPokedexEntry: ; 0x1d132b
db "KISS@" ; species name
- dw 104, 130 ; height, width
+ dw 104, 130 ; height, weight
db "The sensitivity of"
next "its lips develops"
--- a/data/pokedex/entries/239.asm
+++ b/data/pokedex/entries/239.asm
@@ -1,6 +1,6 @@
; ElekidPokedexEntry: ; 0x1d1398
db "ELECTRIC@" ; species name
- dw 200, 520 ; height, width
+ dw 200, 520 ; height, weight
db "It loves violent"
next "thunder. The space"
--- a/data/pokedex/entries/240.asm
+++ b/data/pokedex/entries/240.asm
@@ -1,6 +1,6 @@
; MagbyPokedexEntry: ; 0x1d140e
db "LIVE COAL@" ; species name
- dw 204, 470 ; height, width
+ dw 204, 470 ; height, weight
db "It naturally spits"
next "an 1100-degree"
--- a/data/pokedex/entries/241.asm
+++ b/data/pokedex/entries/241.asm
@@ -1,6 +1,6 @@
; MiltankPokedexEntry: ; 0x1d1482
db "MILK COW@" ; species name
- dw 311, 1660 ; height, width
+ dw 311, 1660 ; height, weight
db "In order to milk a"
next "MILTANK, one must"
--- a/data/pokedex/entries/242.asm
+++ b/data/pokedex/entries/242.asm
@@ -1,6 +1,6 @@
; BlisseyPokedexEntry: ; 0x1d14f7
db "HAPPINESS@" ; species name
- dw 411, 1030 ; height, width
+ dw 411, 1030 ; height, weight
db "Biting into one"
next "of the delicious"
--- a/data/pokedex/entries/243.asm
+++ b/data/pokedex/entries/243.asm
@@ -1,6 +1,6 @@
; RaikouPokedexEntry: ; 0x1d156b
db "THUNDER@" ; species name
- dw 603, 3920 ; height, width
+ dw 603, 3920 ; height, weight
db "This rough #MON"
next "stores energy"
--- a/data/pokedex/entries/244.asm
+++ b/data/pokedex/entries/244.asm
@@ -1,6 +1,6 @@
; EnteiPokedexEntry: ; 0x1d15dd
db "VOLCANO@" ; species name
- dw 607, 4370 ; height, width
+ dw 607, 4370 ; height, weight
db "This brawny"
next "#MON courses"
--- a/data/pokedex/entries/245.asm
+++ b/data/pokedex/entries/245.asm
@@ -1,6 +1,6 @@
; SuicunePokedexEntry: ; 0x1d1642
db "AURORA@" ; species name
- dw 607, 4120 ; height, width
+ dw 607, 4120 ; height, weight
db "This divine"
next "#MON blows"
--- a/data/pokedex/entries/246.asm
+++ b/data/pokedex/entries/246.asm
@@ -1,6 +1,6 @@
; LarvitarPokedexEntry: ; 0x1d169c
db "ROCK SKIN@" ; species name
- dw 200, 1590 ; height, width
+ dw 200, 1590 ; height, weight
db "Born deep under-"
next "ground, this"
--- a/data/pokedex/entries/247.asm
+++ b/data/pokedex/entries/247.asm
@@ -1,6 +1,6 @@
; PupitarPokedexEntry: ; 0x1d1709
db "HARD SHELL@" ; species name
- dw 311, 3350 ; height, width
+ dw 311, 3350 ; height, weight
db "It will not stay"
next "still, even while"
--- a/data/pokedex/entries/248.asm
+++ b/data/pokedex/entries/248.asm
@@ -1,6 +1,6 @@
; TyranitarPokedexEntry: ; 0x1d177b
db "ARMOR@" ; species name
- dw 607, 4450 ; height, width
+ dw 607, 4450 ; height, weight
db "In just one of its"
next "mighty hands, it"
--- a/data/pokedex/entries/249.asm
+++ b/data/pokedex/entries/249.asm
@@ -1,6 +1,6 @@
; LugiaPokedexEntry: ; 0x1d17e9
db "DIVING@" ; species name
- dw 1701, 4760 ; height, width
+ dw 1701, 4760 ; height, weight
db "It has an incred-"
next "ible ability to"
--- a/data/pokedex/entries/250.asm
+++ b/data/pokedex/entries/250.asm
@@ -1,6 +1,6 @@
; HoOhPokedexEntry: ; 0x1d185d
db "RAINBOW@" ; species name
- dw 1206, 4390 ; height, width
+ dw 1206, 4390 ; height, weight
db "It will reveal"
next "itself before a"
--- a/data/pokedex/entries/251.asm
+++ b/data/pokedex/entries/251.asm
@@ -1,6 +1,6 @@
; CelebiPokedexEntry: ; 0x1d18cc
db "TIMETRAVEL@" ; species name
- dw 200, 110 ; height, width
+ dw 200, 110 ; height, weight
db "Revered as a"
next "guardian of the"
--- a/engine/landmarks.asm
+++ b/engine/landmarks.asm
@@ -197,7 +197,7 @@
SafariZoneName: db "SAFARI ZONE@"
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
PokemonMansionName: db "#MON¯MANSION@"
-CeruleanCaveNane: db "CERULEAN¯CAVE@"
+CeruleanCaveName: db "CERULEAN¯CAVE@"
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -869,7 +869,7 @@
predef FrontpicPredef
hlcoord 0, 0
ld d, $0
- ld e, $2
+ ld e, ANIM_MON_MENU
predef LoadMonAnimation
ld hl, wcf64
set 6, [hl]
binary files /dev/null b/gfx/font/overworld.png differ
binary files /dev/null b/gfx/font/space.png differ
--- a/gfx/load_pics.asm
+++ b/gfx/load_pics.asm
@@ -70,7 +70,7 @@
xor a
ld [hBGMapMode], a
call _GetFrontpic
- call Function51103
+ call GetAnimatedFrontpic
pop af
ld [rSVBK], a
ret
@@ -83,7 +83,7 @@
ld b, a
push bc
call GetFrontpicPointer
- ld a, $6
+ ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld a, b
ld de, wDecompressScratch + $800
@@ -91,7 +91,7 @@
pop bc
ld hl, wDecompressScratch
ld de, wDecompressScratch + $800
- call Function512ab
+ call PadFrontpic
pop hl
push hl
ld de, wDecompressScratch
@@ -131,8 +131,8 @@
pop bc
ret
-Function51103: ; 51103
- ld a, $1
+GetAnimatedFrontpic: ; 51103
+ ld a, BANK(VTiles3)
ld [rVBK], a
push hl
ld de, wDecompressScratch
@@ -144,7 +144,7 @@
ld de, 7 * 7 tiles
add hl, de
push hl
- ld a, $1
+ ld a, BANK(BasePicSize)
ld hl, BasePicSize
call GetFarWRAMByte
pop hl
@@ -163,7 +163,7 @@
push hl
push bc
- call Function5114f
+ call LoadFrontpicTiles
pop bc
pop hl
ld de, wDecompressScratch
@@ -174,7 +174,7 @@
ld [rVBK], a
ret
-Function5114f: ; 5114f
+LoadFrontpicTiles: ; 5114f
ld hl, wDecompressScratch
swap c
ld a, c
@@ -186,13 +186,13 @@
push bc
call LoadFrontpic
pop bc
-.asm_51161
+.loop
push bc
ld c, $0
call LoadFrontpic
pop bc
dec b
- jr nz, .asm_51161
+ jr nz, .loop
ret
GetBackpic: ; 5116c
@@ -413,7 +413,7 @@
pop de
ret
-Function512ab: ; 512ab
+PadFrontpic: ; 512ab
ld a, b
cp 6
jr z, .six
--- a/gfx/pics/animation.asm
+++ b/gfx/pics/animation.asm
@@ -123,7 +123,7 @@
SetUpPokeAnim: ; d00b4
ld a, [rSVBK]
push af
- ld a, $2
+ ld a, BANK(wPokeAnimSceneIndex)
ld [rSVBK], a
ld a, [wPokeAnimSceneIndex]
ld c, a
@@ -313,7 +313,7 @@
PokeAnim_InitPicAttributes: ; d01d6
ld a, [rSVBK]
push af
- ld a, $2
+ ld a, BANK(wPokeAnimSceneIndex)
ld [rSVBK], a
push bc
@@ -366,7 +366,7 @@
PokeAnim_InitAnim: ; d0228
ld a, [rSVBK]
push af
- ld a, $2
+ ld a, BANK(wPokeAnimExtraFlag)
ld [rSVBK], a
push bc
ld hl, wPokeAnimExtraFlag
@@ -1007,7 +1007,7 @@
PokeAnim_GetFrontpicDims: ; d05b4
ld a, [rSVBK]
push af
- ld a, $1
+ ld a, BANK(CurPartySpecies)
ld [rSVBK], a
ld a, [CurPartySpecies]
ld [CurSpecies], a
binary files a/gfx/unknown/1065ad.png /dev/null differ
binary files a/gfx/unknown/106dad.png /dev/null differ
--- a/main.asm
+++ b/main.asm
@@ -5492,6 +5492,23 @@
INCLUDE "misc/mobile_41.asm"
+LoadOverworldFont:: ; 106594
+ ld de, .font
+ ld hl, VTiles1
+ lb bc, BANK(.font), $80
+ call Get2bpp
+ ld de, .space
+ ld hl, VTiles2 tile $7f
+ lb bc, BANK(.space), 1
+ call Get2bpp
+ ret
+; 1065ad
+
+.font
+INCBIN "gfx/font/overworld.2bpp"
+.space
+INCBIN "gfx/font/space.2bpp"
+
SECTION "bank42", ROMX
INCLUDE "misc/mobile_42.asm"
@@ -5500,6 +5517,8 @@
IntroLogoGFX: ; 109407
INCBIN "gfx/intro/logo.2bpp.lz"
+
+SECTION "bank43", ROMX
INCLUDE "misc/unused_title.asm"
--- a/maps.asm
+++ b/maps.asm
@@ -444,7 +444,7 @@
INCLUDE "maps/PewterGym.asm"
INCLUDE "maps/PewterMart.asm"
INCLUDE "maps/PewterPokeCenter1F.asm"
-INCLUDE "maps/PewterPokeCEnter2FBeta.asm"
+INCLUDE "maps/PewterPokeCenter2FBeta.asm"
INCLUDE "maps/PewterSnoozeSpeechHouse.asm"
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -20,7 +20,7 @@
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
iffalse .SkipEverything
- writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
+ writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
@@ -56,13 +56,13 @@
end
ReceptionistScript_0x9e3e2:
- writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
+ writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
- writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [s1_be4f]
+ writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f]
special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
@@ -87,7 +87,7 @@
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
- writebyte BATTLETOWERACTION_01 ; set 1, [s1_be4f]
+ writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f]
special BattleTowerAction
special Function1700b0
if_equal $a, Script_Menu_ChallengeExplanationCancel
@@ -148,7 +148,7 @@
Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
- writebyte BATTLETOWERACTION_01
+ writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
@@ -174,7 +174,7 @@
iffalse Script_Menu_ChallengeExplanationCancel
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- writebyte BATTLETOWERACTION_01
+ writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
@@ -188,10 +188,10 @@
end
UnreferencedScript_0x9e4ea:
- writebyte BATTLETOWERACTION_18
+ writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
- writebyte BATTLETOWERACTION_19
+ writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-PewterPokeCEnter2FBeta_MapScriptHeader:
-.MapTriggers:
- db 0
-
-.MapCallbacks:
- db 0
-
-PewterPokeCEnter2FBeta_MapEventHeader:
- ; filler
- db 0, 0
-
-.Warps:
- db 1
- warp_def $7, $0, 3, PEWTER_POKECENTER_1F
-
-.XYTriggers:
- db 0
-
-.Signposts:
- db 0
-
-.PersonEvents:
- db 0
--- /dev/null
+++ b/maps/PewterPokeCenter2FBeta.asm
@@ -1,0 +1,23 @@
+PewterPokeCenter2FBeta_MapScriptHeader:
+.MapTriggers:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+PewterPokeCenter2FBeta_MapEventHeader:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 1
+ warp_def $7, $0, 3, PEWTER_POKECENTER_1F
+
+.XYTriggers:
+ db 0
+
+.Signposts:
+ db 0
+
+.PersonEvents:
+ db 0
--- a/maps/blockdata_1.asm
+++ b/maps/blockdata_1.asm
@@ -57,7 +57,7 @@
CeruleanPokeCenter2FBeta_BlockData:
Route10PokeCenter2FBeta_BlockData:
VermilionPokeCenter2FBeta_BlockData:
-PewterPokeCEnter2FBeta_BlockData:
+PewterPokeCenter2FBeta_BlockData:
FuchsiaPokeCenter2FBeta_BlockData:
LavenderPokeCenter2FBeta_BlockData:
CeladonPokeCenter2FBeta_BlockData:
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -303,7 +303,7 @@
map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header PewterPokeCEnter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -474,7 +474,7 @@
map_header_2 PewterGym, PEWTER_GYM, $0, 0
map_header_2 PewterMart, PEWTER_MART, $0, 0
map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0
- map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0
+ map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0
map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0
map_header_2 OlivinePort, OLIVINE_PORT, $a, 0
map_header_2 VermilionPort, VERMILION_PORT, $a, 0
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -952,9 +952,9 @@
.dw ; 170696 (5c:4696)
- dw Function17075f ; 0x00
- dw Function170788 ; 0x01
- dw Function170778 ; 0x02
+ dw BattleTowerAction_CheckExplanationRead ; 0x00
+ dw BattleTowerAction_SetExplanationRead ; 0x01
+ dw BattleTowerAction_GetChallengeState ; 0x02
dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03
dw BattleTowerAction_SetByteToCancelChallenge ; 0x04
dw Function1707ac ; 0x05
@@ -966,7 +966,7 @@
dw CheckMobileEventIndex ; 0x0b
dw Function1708c8 ; 0x0c
dw Function1708f0 ; 0x0d
- dw Function17093c ; 0x0e
+ dw BattleTowerAction_EggTicket ; 0x0e
dw Function1709aa ; 0x0f
dw Function1709bb ; 0x10
dw Function170a9c ; 0x11
@@ -976,8 +976,8 @@
dw Function170ad7 ; 0x15
dw Function170807 ; 0x16
dw Function17081d ; 0x17
- dw Function170ae8 ; 0x18
- dw Function170b16 ; 0x19
+ dw BattleTowerAction_LevelCheck ; 0x18
+ dw BattleTowerAction_UbersCheck ; 0x19
dw ResetBattleTowerTrainersSRAM ; 0x1a
dw BattleTower_GiveReward ; 0x1b
dw Function17071b ; 0x1c
@@ -1073,7 +1073,7 @@
call CloseSRAM
ret
-Function17075f: ; 17075f (5c:475f) BattleTowerAction $00
+BattleTowerAction_CheckExplanationRead: ; 17075f (5c:475f) BattleTowerAction $00
call BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar]
and a
@@ -1087,7 +1087,7 @@
call CloseSRAM
ret
-Function170778: ; 170778 (5c:4778) BattleTowerAction $02
+BattleTowerAction_GetChallengeState: ; 170778 (5c:4778) BattleTowerAction $02
ld hl, sBattleTowerChallengeState
ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank
@@ -1096,7 +1096,7 @@
call CloseSRAM
ret
-Function170788: ; 170788 (5c:4788) BattleTowerAction $01
+BattleTowerAction_SetExplanationRead: ; 170788 (5c:4788) BattleTowerAction $01
ld a, BANK(s1_be4f)
call GetSRAMBank
ld a, [s1_be4f]
@@ -1344,7 +1344,7 @@
; 17093c
-Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e
+BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e
xor a
ld [ScriptVar], a
ld a, EGG_TICKET
@@ -1600,7 +1600,7 @@
call CloseSRAM
ret
-Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18
+BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18
ld a, $5
call GetSRAMBank
ld a, [$b2fb]
@@ -1611,7 +1611,7 @@
ld [wcd4f], a
xor a
ld [ScriptVar], a
- callba Function119d93 ; level check
+ callba BattleTower_LevelCheck ; level check
ret nc
ld a, $5
call GetSRAMBank
@@ -1620,7 +1620,7 @@
ld [ScriptVar], a
ret
-Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19
+BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
ld a, $5
call GetSRAMBank
ld a, [$b2fb]
@@ -1631,7 +1631,7 @@
ld [wcd4f], a
xor a
ld [ScriptVar], a
- callba Function119dd1 ; ubers check
+ callba BattleTower_UbersCheck
ret nc
ld a, $5
call GetSRAMBank
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -4084,7 +4084,7 @@
Function101a4f: ; 101a4f
ld a, 1
ld [wDisableTextAcceleration], a
- callba DetermineMobileBattleResult
+ callba DisplayLinkBattleResult
xor a
ld [wDisableTextAcceleration], a
callba CleanUpBattleRAM
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -5,7 +5,7 @@
; Copies certain values at the time the player enters the Hall of Fame.
TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
- ld a, $5
+ ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
ld hl, GameTimeHours
@@ -36,7 +36,7 @@
; 105f33
TrainerRankings_MagikarpLength: mobile ; 105f33
- ld a, $5
+ ld a, BANK(sTrainerRankingLongestMagikarp)
call GetSRAMBank
ld de, Buffer1
ld hl, sTrainerRankingLongestMagikarp
@@ -104,7 +104,7 @@
; 105f79
TrainerRankings_BugContestScore: mobile ; 105f79
- ld a, $5
+ ld a, BANK(sTrainerRankingBugContestScore)
call GetSRAMBank
ld a, [hProduct]
ld hl, sTrainerRankingBugContestScore
@@ -133,7 +133,7 @@
; 105f9f
TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
- ld a, $5
+ ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
; Increment the current streak
@@ -173,7 +173,7 @@
; 105fd0
TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
- ld a, $5
+ ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
ld hl, sTrainerRankingCurrentSlotsStreak
xor a
@@ -185,7 +185,7 @@
; 105fe3
TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
- ld a, $5
+ ld a, BANK(sTrainerRankingTotalSlotsPayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalSlotsPayouts + 3
ld a, e
@@ -213,7 +213,7 @@
; 106008
TrainerRankings_AddToBattlePayouts: mobile ; 106008
- ld a, $5
+ ld a, BANK(sTrainerRankingTotalBattlePayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalBattlePayouts + 3
ld a, [bc]
@@ -381,13 +381,13 @@
jr TrainerRankings_Increment3Byte
; 10610d
-; Counts uses of both SelfDestruct and Explosion.
-TrainerRankings_SelfDestruct: mobile ; 10610d
+; Counts uses of both Selfdestruct and Explosion.
+TrainerRankings_Selfdestruct: mobile ; 10610d
; Only counts if it’s the player’s turn
ld a, [hBattleTurn]
and a
ret nz
- ld hl, sTrainerRankingSelfDestruct
+ ld hl, sTrainerRankingSelfdestruct
jr TrainerRankings_Increment3Byte
; 106117
@@ -416,7 +416,7 @@
; Increments a big-endian value of bc + 1 bytes at hl
TrainerRankings_Increment: ; 10612d
- ld a, $5
+ ld a, BANK(sTrainerRankings)
call GetSRAMBank
push hl
push de
@@ -453,7 +453,7 @@
; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
UpdateTrainerRankingsChecksum2: mobile ; 106155
- ld a, $5
+ ld a, BANK(sTrainerRankings)
call GetSRAMBank
call UpdateTrainerRankingsChecksum
call CloseSRAM
@@ -1113,21 +1113,3 @@
GFX_106514:
INCBIN "gfx/unknown/106514.2bpp"
-
-
-LoadOverworldFont:: ; 106594
- ld de, .font
- ld hl, VTiles1
- lb bc, BANK(.font), $80
- call Get2bpp
- ld de, .space
- ld hl, VTiles2 tile $7f
- lb bc, BANK(.space), 1
- call Get2bpp
- ret
-; 1065ad
-
-.font
-INCBIN "gfx/unknown/1065ad.2bpp"
-.space
-INCBIN "gfx/unknown/106dad.2bpp"
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7249,13 +7249,13 @@
call PlaceString
ld a, $1e
ld [wcd4e], a
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld a, [wcd4f]
ld [sMobileLoginPassword], a
ld hl, $c708
ld de, sMobileLoginPassword + 1
- ld bc, LOGIN_PASSWORD_LENGTH
+ ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call CopyBytes
call CloseSRAM
ld a, [wcd4f]
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -1320,9 +1320,9 @@
ld a, [wcd38]
and a
jr nz, .asm_118a30
- call Function119d93
+ call BattleTower_LevelCheck
ret c
- call Function119dd1
+ call BattleTower_UbersCheck
ret c
.asm_118a30
@@ -3991,7 +3991,7 @@
db "CANCEL@"
; 119d93
-Function119d93: ; 119d93 (46:5d93)
+BattleTower_LevelCheck: ; 119d93 (46:5d93)
ld a, [rSVBK]
push af
ld a, $1
@@ -4035,7 +4035,7 @@
scf
ret
-Function119dd1: ; 119dd1 (46:5dd1)
+BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
ld a, [rSVBK]
push af
ld a, [wcd4f]
@@ -4224,10 +4224,10 @@
ret
Function119ec2: ; 119ec2 (46:5ec2)
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
- ld [sMobileLoginPassword + LOGIN_PASSWORD_LENGTH], a
+ ld [sMobileLoginPassword + MOBILE_LOGIN_PASSWORD_LENGTH], a
ld de, sMobileLoginPassword + 1
.loop
ld a, [de]
@@ -4395,7 +4395,7 @@
; 11a00e
Function11a00e: ; 11a00e
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld a, [sMobileLoginPassword]
and a
@@ -4404,7 +4404,7 @@
call CloseSRAM
and a
ret nz
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
ld [sMobileLoginPassword], a
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -4688,7 +4688,7 @@
ret nz
.asm_17f5a1
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
ld [sMobileLoginPassword], a
--- a/misc/mobile_menu.asm
+++ b/misc/mobile_menu.asm
@@ -441,11 +441,11 @@
ld a, [wMenuCursorY]
cp $2
jr z, .dont_delete_password
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld hl, sMobileLoginPassword
xor a
- ld bc, LOGIN_PASSWORD_LENGTH
+ ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call ByteFill
call CloseSRAM
ld hl, UnknownText_0x4a35d
--- a/misc/unused_title.asm
+++ b/misc/unused_title.asm
@@ -1,6 +1,3 @@
-
-SECTION "bank43", ROMX
-
UnusedTitleScreen: ; 10c000
call ClearBGPalettes
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -356,3 +356,5 @@
"Boxes 1-7"
SRAM $03
"Boxes 8-14"
+SRAM $05
+ "SRAM Mobile"
--- a/sram.asm
+++ b/sram.asm
@@ -243,3 +243,57 @@
box sBox12
box sBox13
box sBox14
+
+SECTION "SRAM Mobile", SRAM, BANK [5]
+ds 1 ; Former location for sMobileEventIndex, moved to 1:BE3C in English
+sTrainerRankings:: ; a001
+sTrainerRankingGameTimeHOF:: ds 4
+sTrainerRankingStepCountHOF:: ds 4
+sTrainerRankingHealingsHOF:: ds 4
+sTrainerRankingBattlesHOF:: ds 3
+sTrainerRankingStepCount:: ds 4
+sTrainerRankingBattleTowerWins:: ds 4
+sTrainerRankingTMsHMsTaught:: ds 3
+sTrainerRankingBattles:: ds 3
+sTrainerRankingWildBattles:: ds 3
+sTrainerRankingTrainerBattles:: ds 3
+sTrainerRankingUnused1:: ds 3
+sTrainerRankingHOFEntries:: ds 3
+sTrainerRankingWildMonsCaught:: ds 3
+sTrainerRankingHookedEncounters:: ds 3
+sTrainerRankingEggsHatched:: ds 3
+sTrainerRankingMonsEvolved:: ds 3
+sTrainerRankingFruitPicked:: ds 3
+sTrainerRankingHealings:: ds 3
+sTrainerRankingMysteryGift:: ds 3
+sTrainerRankingTrades:: ds 3
+sTrainerRankingFly:: ds 3
+sTrainerRankingSurf:: ds 3
+sTrainerRankingWaterfall:: ds 3
+sTrainerRankingWhiteOuts:: ds 3
+sTrainerRankingLuckyNumberShow:: ds 3
+sTrainerRankingPhoneCalls:: ds 3
+sTrainerRankingUnused2:: ds 3
+sTrainerRankingLinkBattles:: ds 3
+sTrainerRankingSplash:: ds 3
+sTrainerRankingTreeEncounters:: ds 3
+sTrainerRankingUnused3:: ds 3
+sTrainerRankingColosseumWins:: ds 3
+sTrainerRankingColosseumLosses:: ds 3
+sTrainerRankingColosseumDraws:: ds 3
+sTrainerRankingSelfdestruct:: ds 3
+sTrainerRankingCurrentSlotsStreak:: ds 2
+sTrainerRankingLongestSlotsStreak:: ds 2
+sTrainerRankingTotalSlotsPayouts:: ds 4
+sTrainerRankingTotalBattlePayouts:: ds 4
+sTrainerRankingLongestMagikarp:: ds 2
+sTrainerRankingShortestMagikarp:: ds 2
+sTrainerRankingBugContestScore:: ds 2
+sTrainerRankingsChecksum:: ds 2
+sTrainerRankingsEnd:: ; a083
+ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English
+sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings
+
+ds $945
+; aa4b
+sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH
--- a/tilesets/roof.pal
+++ b/tilesets/roof.pal
@@ -1,133 +1,160 @@
+; group 0 (unused)
RGB 21, 21, 21
RGB 11, 11, 11
RGB 21, 21, 21
RGB 11, 11, 11
+; group 1
RGB 14, 17, 31
RGB 07, 11, 15
RGB 09, 09, 17
RGB 05, 07, 13
+; group 2
RGB 12, 19, 00
RGB 06, 10, 00
RGB 06, 09, 07
RGB 04, 05, 06
+; group 3
RGB 21, 21, 21
RGB 11, 11, 11
RGB 21, 21, 21
RGB 17, 08, 07
+; group 4
RGB 31, 19, 00
RGB 27, 10, 05
RGB 15, 07, 02
RGB 11, 04, 02
+; group 5
RGB 11, 10, 16
RGB 05, 06, 07
RGB 03, 04, 08
RGB 00, 00, 00
+; group 6
RGB 31, 10, 00
RGB 18, 06, 00
RGB 18, 05, 09
RGB 17, 08, 07
+; group 7
RGB 17, 27, 31
RGB 05, 15, 31
RGB 07, 08, 22
RGB 07, 07, 16
+; group 8
RGB 22, 20, 10
RGB 17, 14, 03
RGB 11, 11, 05
RGB 10, 09, 07
+; group 9
RGB 31, 08, 04
RGB 09, 09, 08
RGB 18, 05, 09
RGB 09, 09, 08
+; group 10
RGB 24, 14, 31
RGB 13, 07, 21
RGB 12, 03, 18
RGB 09, 03, 15
+; group 11
RGB 25, 25, 00
RGB 20, 17, 08
RGB 12, 12, 00
RGB 10, 09, 05
+; group 12
RGB 27, 23, 01
RGB 23, 11, 00
RGB 15, 11, 01
RGB 11, 10, 01
+; group 13
RGB 27, 28, 31
RGB 17, 19, 22
RGB 14, 14, 18
RGB 10, 09, 13
+; group 14
RGB 19, 19, 16
RGB 10, 12, 15
RGB 09, 09, 11
RGB 04, 05, 07
+; group 15
RGB 14, 17, 31
RGB 07, 11, 15
RGB 09, 13, 19
RGB 07, 07, 16
+; group 16
RGB 21, 21, 21
RGB 13, 13, 13
RGB 11, 11, 19
RGB 07, 07, 12
+; group 17
RGB 31, 18, 29
RGB 17, 13, 20
RGB 14, 06, 12
RGB 11, 03, 10
+; group 18
RGB 23, 15, 31
RGB 16, 05, 31
RGB 12, 07, 17
RGB 08, 06, 10
+; group 19
RGB 21, 21, 25
RGB 16, 16, 16
RGB 13, 13, 13
RGB 07, 07, 07
+; group 20
RGB 21, 21, 21
RGB 11, 11, 11
RGB 21, 21, 21
RGB 11, 11, 11
+; group 21
RGB 19, 31, 15
RGB 31, 22, 02
RGB 12, 13, 09
RGB 09, 12, 03
+; group 22
RGB 15, 10, 31
RGB 07, 05, 15
RGB 06, 05, 17
RGB 02, 02, 08
+; group 23
RGB 21, 31, 07
RGB 13, 25, 04
RGB 09, 14, 08
RGB 06, 10, 04
+; group 24
RGB 20, 31, 14
RGB 11, 23, 05
RGB 09, 13, 08
RGB 06, 09, 04
+; group 25
RGB 31, 26, 00
RGB 31, 15, 00
RGB 13, 13, 01
RGB 08, 08, 01
+; group 26
RGB 31, 14, 28
RGB 31, 05, 21
RGB 14, 07, 17
--- a/tilesets/roofs.asm
+++ b/tilesets/roofs.asm
@@ -18,18 +18,19 @@
; 1c021
MapGroupRoofs: ; 1c021i
- db -1 ; group 1
- db 3 ; group 2
- db 2 ; group 3
- db -1 ; group 4
- db 1 ; group 5
- db 2 ; group 6
+ db -1 ; group 0 (unused)
+ db 3 ; group 1
+ db 2 ; group 2
+ db -1 ; group 3
+ db 1 ; group 4
+ db 2 ; group 5
+ db -1 ; group 6
db -1 ; group 7
- db -1 ; group 8
+ db 2 ; group 8
db 2 ; group 9
- db 2 ; group 10
- db 1 ; group 11
- db 4 ; group 12
+ db 1 ; group 10
+ db 4 ; group 11
+ db -1 ; group 12
db -1 ; group 13
db -1 ; group 14
db -1 ; group 15
@@ -36,15 +37,14 @@
db -1 ; group 16
db -1 ; group 17
db -1 ; group 18
- db -1 ; group 19
- db 0 ; group 20
+ db 0 ; group 19
+ db -1 ; group 20
db -1 ; group 21
- db -1 ; group 22
- db 3 ; group 23
- db -1 ; group 24
- db 0 ; group 25
- db -1 ; group 26
- db 0 ; group 27
+ db 3 ; group 22
+ db -1 ; group 23
+ db 0 ; group 24
+ db -1 ; group 25
+ db 0 ; group 26
; 1c03c
Roofs: ; 1c03c