Merge pull request #397 from mid-kid/master

A few more labels and comments
This commit is contained in:
Marcus Huderle 2017-11-21 17:15:25 -08:00 committed by GitHub
commit b97287be29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
288 changed files with 517 additions and 655 deletions

View File

@ -320,22 +320,22 @@ AI_Smart: ; 386be
.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
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 @@ AI_Smart_LockOn: ; 3881d
; 388a6
AI_Smart_Explosion: ; 388a6
AI_Smart_Selfdestruct: ; 388a6
; Selfdestruct, Explosion
; Unless this is the enemy's last Pokemon...
@ -904,7 +904,7 @@ AI_Smart_AccuracyDown: ; 38985
; 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 @@ AI_Smart_Bide: ; 38a1e
; 38a2a
AI_Smart_Whirlwind: ; 38a2a
AI_Smart_ForceSwitch: ; 38a2a
; Whirlwind, Roar.
; Discourage this move if the player has not shown
@ -1044,7 +1044,7 @@ AI_Smart_Ohko: ; 38a60
; 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 @@ AI_Aggressive: ; 39369
ret
.RecklessMoves:
db EFFECT_EXPLOSION
db EFFECT_SELFDESTRUCT
db EFFECT_RAMPAGE
db EFFECT_MULTI_HIT
db EFFECT_DOUBLE_HIT
@ -3539,7 +3539,7 @@ endr
jr .checkmove
.RiskyMoves:
db EFFECT_EXPLOSION
db EFFECT_SELFDESTRUCT
db EFFECT_OHKO
db $ff
; 39502

View File

@ -903,7 +903,7 @@ MoveEffectPriorities: ; 3c5df
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 @@ ExitBattle: ; 3f69e
call ShowLinkBattleParticipantsAfterEnd
ld c, 150
call DelayFrames
call DetermineMobileBattleResult
call DisplayLinkBattleResult
ret
.not_linked
@ -8737,7 +8737,7 @@ ShowLinkBattleParticipantsAfterEnd: ; 3f759
ret
; 3f77c
DetermineMobileBattleResult: ; 3f77c
DisplayLinkBattleResult: ; 3f77c
callba CheckMobileBattleError
jp c, .Mobile_InvalidBattle
call IsMobileBattle2

View File

@ -26,7 +26,7 @@ BattleCommandPointers: ; 3fd28
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

View File

@ -2167,7 +2167,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
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 @@ BattleCommand_FailureText: ; 35023
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 @@ BattleCommand_CheckDestinyBond: ; 351c0
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 @@ BattleCommand_DamageCalc: ; 35612
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 @@ SelfInflictDamageToSubstitute: ; 35de0
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 @@ BattleCommand_EndLoop: ; 369b6
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 @@ CheckSubstituteOpp: ; 37378
; 37380
BattleCommand_SelfDestruct: ; 37380
callba TrainerRankings_SelfDestruct
BattleCommand_Selfdestruct: ; 37380
callba TrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld c, 3

View File

@ -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 @@ NormalHit:
kingsrock
endmove
Sing:
SleepPowder:
Hypnosis:
LovelyKiss:
Spore:
DoSleep:
checkobedience
usedmovetext
@ -67,10 +27,6 @@ DoSleep:
sleeptarget
endmove
PoisonSting:
Smog:
Sludge:
SludgeBomb:
PoisonHit:
checkobedience
usedmovetext
@ -92,10 +48,6 @@ PoisonHit:
poisontarget
endmove
Absorb:
MegaDrain:
LeechLife:
GigaDrain:
LeechHit:
checkobedience
usedmovetext
@ -117,10 +69,6 @@ LeechHit:
kingsrock
endmove
FirePunch:
Ember:
Flamethrower:
FireBlast:
BurnHit:
checkobedience
usedmovetext
@ -142,10 +90,6 @@ BurnHit:
burntarget
endmove
IcePunch:
IceBeam:
Blizzard:
PowderSnow:
FreezeHit:
checkobedience
usedmovetext
@ -167,14 +111,6 @@ FreezeHit:
freezetarget
endmove
Thunderpunch:
BodySlam:
Thundershock:
Thunderbolt:
Lick:
ZapCannon:
Spark:
Dragonbreath:
ParalyzeHit:
checkobedience
usedmovetext
@ -197,7 +133,6 @@ ParalyzeHit:
endmove
Selfdestruct:
Explosion:
checkobedience
usedmovetext
doturn
@ -245,8 +180,6 @@ MirrorMove:
mirrormove
endmove
Meditate:
Sharpen:
AttackUp:
checkobedience
usedmovetext
@ -259,8 +192,6 @@ AttackUp:
statupfailtext
endmove
Harden:
Withdraw:
DefenseUp:
checkobedience
usedmovetext
@ -285,7 +216,6 @@ SpeedUp:
statupfailtext
endmove
Growth:
SpecialAttackUp:
checkobedience
usedmovetext
@ -322,8 +252,6 @@ AccuracyUp:
statupfailtext
endmove
DoubleTeam:
Minimize:
EvasionUp:
checkobedience
usedmovetext
@ -337,7 +265,6 @@ EvasionUp:
statupfailtext
endmove
SwordsDance:
AttackUp2:
checkobedience
usedmovetext
@ -350,8 +277,6 @@ AttackUp2:
statupfailtext
endmove
Barrier:
AcidArmor:
DefenseUp2:
checkobedience
usedmovetext
@ -364,7 +289,6 @@ DefenseUp2:
statupfailtext
endmove
Agility:
SpeedUp2:
checkobedience
usedmovetext
@ -389,7 +313,6 @@ SpecialAttackUp2:
statupfailtext
endmove
Amnesia:
SpecialDefenseUp2:
checkobedience
usedmovetext
@ -426,7 +349,6 @@ EvasionUp2:
statupfailtext
endmove
Growl:
AttackDown:
checkobedience
usedmovetext
@ -440,8 +362,6 @@ AttackDown:
statdownfailtext
endmove
TailWhip:
Leer:
DefenseDown:
checkobedience
usedmovetext
@ -455,7 +375,6 @@ DefenseDown:
statdownfailtext
endmove
StringShot:
SpeedDown:
checkobedience
usedmovetext
@ -495,10 +414,6 @@ SpecialDefenseDown:
statdownfailtext
endmove
SandAttack:
Smokescreen:
Kinesis:
Flash:
AccuracyDown:
checkobedience
usedmovetext
@ -512,7 +427,6 @@ AccuracyDown:
statdownfailtext
endmove
SweetScent:
EvasionDown:
checkobedience
usedmovetext
@ -526,7 +440,6 @@ EvasionDown:
statdownfailtext
endmove
Charm:
AttackDown2:
checkobedience
usedmovetext
@ -540,7 +453,6 @@ AttackDown2:
statdownfailtext
endmove
Screech:
DefenseDown2:
checkobedience
usedmovetext
@ -554,8 +466,6 @@ DefenseDown2:
statdownfailtext
endmove
CottonSpore:
ScaryFace:
SpeedDown2:
checkobedience
usedmovetext
@ -621,7 +531,6 @@ EvasionDown2:
statdownfailtext
endmove
AuroraBeam:
AttackDownHit:
checkobedience
usedmovetext
@ -644,9 +553,6 @@ AttackDownHit:
statdownmessage
endmove
Acid:
IronTail:
RockSmash:
DefenseDownHit:
checkobedience
usedmovetext
@ -670,10 +576,6 @@ DefenseDownHit:
statdownmessage
endmove
Bubblebeam:
Constrict:
Bubble:
IcyWind:
SpeedDownHit:
checkobedience
usedmovetext
@ -718,9 +620,6 @@ SpecialAttackDownHit:
statdownmessage
endmove
PsychicM:
Crunch:
ShadowBall:
SpecialDefenseDownHit:
checkobedience
usedmovetext
@ -743,8 +642,6 @@ SpecialDefenseDownHit:
statdownmessage
endmove
MudSlap:
Octazooka:
AccuracyDownHit:
checkobedience
usedmovetext
@ -789,7 +686,6 @@ EvasionDownHit:
statdownmessage
endmove
SteelWing:
DefenseUpHit:
checkobedience
usedmovetext
@ -812,7 +708,6 @@ DefenseUpHit:
statupmessage
endmove
MetalClaw:
AttackUpHit:
checkobedience
usedmovetext
@ -835,7 +730,6 @@ AttackUpHit:
statupmessage
endmove
Ancientpower:
AllUpHit:
checkobedience
usedmovetext
@ -885,7 +779,7 @@ Conversion:
conversion
endmove
Haze:
ResetStats:
checkobedience
usedmovetext
doturn
@ -908,9 +802,6 @@ Bide:
kingsrock
endmove
Thrash:
PetalDance:
Outrage:
Rampage:
checkrampage
checkobedience
@ -934,8 +825,7 @@ Rampage:
kingsrock
endmove
Whirlwind:
Roar:
ForceSwitch:
checkobedience
usedmovetext
doturn
@ -943,16 +833,6 @@ Roar:
forceswitch
endmove
Doubleslap:
CometPunch:
FuryAttack:
PinMissile:
SpikeCannon:
Barrage:
FurySwipes:
BoneRush:
DoubleKick:
Bonemerang:
MultiHit:
checkobedience
usedmovetext
@ -979,7 +859,6 @@ MultiHit:
kingsrock
endmove
Twineedle:
PoisonMultiHit:
checkobedience
usedmovetext
@ -1008,13 +887,6 @@ PoisonMultiHit:
poisontarget
endmove
RollingKick:
Headbutt:
Bite:
LowKick:
BoneClub:
RockSlide:
HyperFang:
FlinchHit:
checkobedience
usedmovetext
@ -1036,9 +908,6 @@ FlinchHit:
flinchtarget
endmove
Guillotine:
HornDrill:
Fissure:
OHKOHit:
checkobedience
usedmovetext
@ -1054,10 +923,6 @@ OHKOHit:
buildopponentrage
endmove
TakeDown:
DoubleEdge:
Submission:
Struggle:
RecoilHit:
checkobedience
usedmovetext
@ -1087,16 +952,12 @@ Mist:
endmove
FocusEnergy:
CriticalUp:
checkobedience
usedmovetext
doturn
focusenergy
endmove
Supersonic:
ConfuseRay:
SweetKiss:
DoConfuse:
checkobedience
usedmovetext
@ -1106,10 +967,6 @@ DoConfuse:
confuse
endmove
Psybeam:
Confusion:
DizzyPunch:
Dynamicpunch:
ConfuseHit:
checkobedience
usedmovetext
@ -1131,10 +988,6 @@ ConfuseHit:
confusetarget
endmove
Recover:
Softboiled:
Rest:
MilkDrink:
Heal:
checkobedience
usedmovetext
@ -1151,7 +1004,6 @@ Transform:
LightScreen:
Reflect:
Screen:
checkobedience
usedmovetext
doturn
@ -1179,8 +1031,6 @@ TriAttack:
endmove
Toxic:
Poisonpowder:
PoisonGas:
DoPoison:
checkobedience
usedmovetext
@ -1191,9 +1041,6 @@ DoPoison:
poison
endmove
StunSpore:
ThunderWave:
Glare:
DoParalyze:
checkobedience
usedmovetext
@ -1338,7 +1185,6 @@ RazorWind:
endmove
Fly:
Dig:
checkcharge
checkobedience
doturn
@ -1361,11 +1207,7 @@ Dig:
kingsrock
endmove
Bind:
Wrap:
FireSpin:
Clamp:
Whirlpool:
TrapTarget:
checkobedience
usedmovetext
doturn
@ -1387,10 +1229,6 @@ Whirlpool:
endmove
SuperFang:
Sonicboom:
DragonRage:
SeismicToss:
NightShade:
Psywave:
StaticDamage:
checkobedience
@ -1407,7 +1245,6 @@ StaticDamage:
kingsrock
endmove
Flail:
Reversal:
checkobedience
usedmovetext
@ -1484,7 +1321,6 @@ Conversion2:
conversion2
endmove
MindReader:
LockOn:
checkobedience
usedmovetext
@ -1607,7 +1443,6 @@ Thief:
kingsrock
endmove
SpiderWeb:
MeanLook:
checkobedience
usedmovetext
@ -1652,7 +1487,6 @@ Curse:
endmove
Protect:
Detect:
checkobedience
usedmovetext
doturn

View File

@ -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

View File

@ -28,9 +28,9 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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 @@ ENDM
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

View File

@ -4,7 +4,6 @@ INCLUDE "gbhw.asm"
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"

View File

@ -171,7 +171,7 @@ SUBSTATUS_CURLED EQU 0
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 @@ SUBSTATUS_CURLED EQU 0
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 @@ SUBSTATUS_CURLED EQU 0
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 @@ SUBSTATUS_CURLED EQU 0
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 @@ SUBSTATUS_CURLED EQU 0
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

View File

@ -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

View File

@ -142,6 +142,7 @@ NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 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

View File

@ -1,53 +0,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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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,"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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,"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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,"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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."

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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-"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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,"

View File

@ -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,"

View File

@ -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"

View File

@ -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,"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

Some files were not shown because too many files have changed in this diff Show More