ref: 18e4701dfcdd0788f46ecbb2260e0e9e02565a84
parent: 4cccc2fdf80af4962f233f20c3ddd9a8f3fd13ca
author: IIMarckus <iimarckus@gmail.com>
date: Tue Oct 26 03:37:56 EDT 2010
whitespace changes hg-commit-id: b1a92aa2875c
--- a/pokered.asm
+++ b/pokered.asm
@@ -59,7 +59,7 @@
RHYHORN EQU $12
LAPRAS EQU $13
ARCANINE EQU $14
-MEW EQU $15
+MEW EQU $15
GYARADOS EQU $16
SHELLDER EQU $17
TENTACOOL EQU $18
@@ -150,7 +150,7 @@
MEWTWO EQU $83
SNORLAX EQU $84
MAGIKARP EQU $85
-MUK EQU $88
+MUK EQU $88
KINGLER EQU $8A
CLOYSTER EQU $8B
ELECTRODE EQU $8D
@@ -196,51 +196,51 @@
; sometimes it's necessary to add $C8 to these values
YOUNGSTER EQU $01
BUG_CATCHER EQU $02
-LASS EQU $03
-SAILOR EQU $04
+LASS EQU $03
+SAILOR EQU $04
JR__TRAINER_M EQU $05
JR__TRAINER_F EQU $06
POKEMANIAC EQU $07
SUPER_NERD EQU $08
-HIKER EQU $09
-BIKER EQU $0A
+HIKER EQU $09
+BIKER EQU $0A
BURGLAR EQU $0B
ENGINEER EQU $0C
JUGGLER_X EQU $0D
-FISHER EQU $0E
+FISHER EQU $0E
SWIMMER EQU $0F
CUE_BALL EQU $10
GAMBLER EQU $11
-BEAUTY EQU $12
-PSYCHIC_T EQU $13
-ROCKER EQU $14
+BEAUTY EQU $12
+PSYCHIC_TR EQU $13
+ROCKER EQU $14
JUGGLER EQU $15
-TAMER EQU $16
+TAMER EQU $16
BIRD_KEEPER EQU $17
BLACKBELT EQU $18
-SONY1 EQU $19
+SONY1 EQU $19
PROF_OAK EQU $1A
-CHIEF EQU $1B
+CHIEF EQU $1B
SCIENTIST EQU $1C
GIOVANNI EQU $1D
-ROCKET EQU $1E
+ROCKET EQU $1E
COOLTRAINER_M EQU $1F
COOLTRAINER_F EQU $20
-BRUNO EQU $21
-BROCK EQU $22
-MISTY EQU $23
+BRUNO EQU $21
+BROCK EQU $22
+MISTY EQU $23
LT__SURGE EQU $24
-ERIKA EQU $25
-KOGA EQU $26
-BLAINE EQU $27
+ERIKA EQU $25
+KOGA EQU $26
+BLAINE EQU $27
SABRINA EQU $28
GENTLEMAN EQU $29
-SONY2 EQU $2A
-SONY3 EQU $2B
+SONY2 EQU $2A
+SONY3 EQU $2B
LORELEI EQU $2C
CHANNELER EQU $2D
-AGATHA EQU $2E
-LANCE EQU $2F
+AGATHA EQU $2E
+LANCE EQU $2F
; pokemon dex numbers
DEX_BULBASAUR EQU 1
@@ -331,7 +331,7 @@
DEX_SEEL EQU 86
DEX_DEWGONG EQU 87
DEX_GRIMER EQU 88
-DEX_MUK EQU 89
+DEX_MUK EQU 89
DEX_SHELLDER EQU 90
DEX_CLOYSTER EQU 91
DEX_GASTLY EQU 92
@@ -393,18 +393,18 @@
DEX_DRAGONAIR EQU 148
DEX_DRAGONITE EQU 149
DEX_MEWTWO EQU 150
-DEX_MEW EQU 151
+DEX_MEW EQU 151
; move name constants
-POUND EQU $01
-KARATE_CHOP EQU $02
-DOUBLESLAP EQU $03
-COMET_PUNCH EQU $04
-MEGA_PUNCH EQU $05
-PAY_DAY EQU $06
-FIRE_PUNCH EQU $07
-ICE_PUNCH EQU $08
+POUND EQU $01
+KARATE_CHOP EQU $02
+DOUBLESLAP EQU $03
+COMET_PUNCH EQU $04
+MEGA_PUNCH EQU $05
+PAY_DAY EQU $06
+FIRE_PUNCH EQU $07
+ICE_PUNCH EQU $08
THUNDERPUNCH EQU $09
SCRATCH EQU $0A
VICEGRIP EQU $0B
@@ -411,15 +411,15 @@
GUILLOTINE EQU $0C
RAZOR_WIND EQU $0D
SWORDS_DANCE EQU $0E
-CUT EQU $0F
-GUST EQU $10
+CUT EQU $0F
+GUST EQU $10
WING_ATTACK EQU $11
WHIRLWIND EQU $12
-FLY EQU $13
-BIND EQU $14
-SLAM EQU $15
+FLY EQU $13
+BIND EQU $14
+SLAM EQU $15
VINE_WHIP EQU $16
-STOMP EQU $17
+STOMP EQU $17
DOUBLE_KICK EQU $18
MEGA_KICK EQU $19
JUMP_KICK EQU $1A
@@ -431,7 +431,7 @@
HORN_DRILL EQU $20
TACKLE EQU $21
BODY_SLAM EQU $22
-WRAP EQU $23
+WRAP EQU $23
TAKE_DOWN EQU $24
THRASH EQU $25
DOUBLE_EDGE EQU $26
@@ -439,21 +439,21 @@
POISON_STING EQU $28
TWINEEDLE EQU $29
PIN_MISSILE EQU $2A
-LEER EQU $2B
-BITE EQU $2C
-GROWL EQU $2D
-ROAR EQU $2E
-SING EQU $2F
+LEER EQU $2B
+BITE EQU $2C
+GROWL EQU $2D
+ROAR EQU $2E
+SING EQU $2F
SUPERSONIC EQU $30
SONICBOOM EQU $31
DISABLE EQU $32
-ACID EQU $33
-EMBER EQU $34
+ACID EQU $33
+EMBER EQU $34
FLAMETHROWER EQU $35
-MIST EQU $36
+MIST EQU $36
WATER_GUN EQU $37
HYDRO_PUMP EQU $38
-SURF EQU $39
+SURF EQU $39
ICE_BEAM EQU $3A
BLIZZARD EQU $3B
PSYBEAM EQU $3C
@@ -460,7 +460,7 @@
BUBBLEBEAM EQU $3D
AURORA_BEAM EQU $3E
HYPER_BEAM EQU $3F
-PECK EQU $40
+PECK EQU $40
DRILL_PECK EQU $41
SUBMISSION EQU $42
LOW_KICK EQU $43
@@ -487,8 +487,8 @@
ROCK_THROW EQU $58
EARTHQUAKE EQU $59
FISSURE EQU $5A
-DIG EQU $5B
-TOXIC EQU $5C
+DIG EQU $5B
+TOXIC EQU $5C
CONFUSION EQU $5D
PSYCHIC_M EQU $5E
HYPNOSIS EQU $5F
@@ -495,10 +495,10 @@
MEDITATE EQU $60
AGILITY EQU $61
QUICK_ATTACK EQU $62
-RAGE EQU $63
+RAGE EQU $63
TELEPORT EQU $64
NIGHT_SHADE EQU $65
-MIMIC EQU $66
+MIMIC EQU $66
SCREECH EQU $67
DOUBLE_TEAM EQU $68
RECOVER EQU $69
@@ -510,22 +510,22 @@
DEFENSE_CURL EQU $6F
BARRIER EQU $70
LIGHT_SCREEN EQU $71
-HAZE EQU $72
+HAZE EQU $72
REFLECT EQU $73
FOCUS_ENERGY EQU $74
-BIDE EQU $75
+BIDE EQU $75
METRONOME EQU $76
MIRROR_MOVE EQU $77
SELFDESTRUCT EQU $78
EGG_BOMB EQU $79
-LICK EQU $7A
-SMOG EQU $7B
+LICK EQU $7A
+SMOG EQU $7B
SLUDGE EQU $7C
BONE_CLUB EQU $7D
FIRE_BLAST EQU $7E
WATERFALL EQU $7F
-CLAMP EQU $80
-SWIFT EQU $81
+CLAMP EQU $80
+SWIFT EQU $81
SKULL_BASH EQU $82
SPIKE_CANNON EQU $83
CONSTRICT EQU $84
@@ -533,7 +533,7 @@
KINESIS EQU $86
SOFTBOILED EQU $87
HI_JUMP_KICK EQU $88
-GLARE EQU $89
+GLARE EQU $89
DREAM_EATER EQU $8A
POISON_GAS EQU $8B
BARRAGE EQU $8C
@@ -543,8 +543,8 @@
TRANSFORM EQU $90
BUBBLE EQU $91
DIZZY_PUNCH EQU $92
-SPORE EQU $93
-FLASH EQU $94
+SPORE EQU $93
+FLASH EQU $94
PSYWAVE EQU $95
SPLASH EQU $96
ACID_ARMOR EQU $97
@@ -552,7 +552,7 @@
EXPLOSION EQU $99
FURY_SWIPES EQU $9A
BONEMERANG EQU $9B
-REST EQU $9C
+REST EQU $9C
ROCK_SLIDE EQU $9D
HYPER_FANG EQU $9E
SHARPEN EQU $9F
@@ -559,7 +559,7 @@
CONVERSION EQU $A0
TRI_ATTACK EQU $A1
SUPER_FANG EQU $A2
-SLASH EQU $A3
+SLASH EQU $A3
SUBSTITUTE EQU $A4
STRUGGLE EQU $A5