shithub: pokered

Download patch

ref: 74b45506dfbdf69c3f0c525e340c906b04add607
parent: 5c7534fcede88aa9fdd39e319ed25ebe1979dbd9
author: IIMarckus <iimarckus@gmail.com>
date: Sun Apr 10 18:04:15 EDT 2011

Add attack characteristics data.

hg-commit-id: 2dbe132df9b8


--- a/constants.asm
+++ b/constants.asm
@@ -856,3 +856,20 @@
 EV_LEVEL	EQU 1
 EV_ITEM 	EQU 2
 EV_TRADE	EQU 3
+
+; Elemental types
+NORMAL EQU $00
+FIGHTING EQU $01
+FLYING EQU $02
+POISON EQU $03
+GROUND EQU $04
+ROCK EQU $05
+BUG EQU $07
+GHOST EQU $08
+FIRE EQU $14
+WATER EQU $15
+GRASS EQU $16
+ELECTRIC EQU $17
+PSYCHIC EQU $18
+ICE EQU $19
+DRAGON EQU $1A
--- a/pokered.asm
+++ b/pokered.asm
@@ -2327,7 +2327,7 @@
 	db 0
 
 Route25Mons:
-	db $0F
+	db 15
 	db 8,WEEDLE
 	db 9,KAKUNA
 	db 13,PIDGEY
@@ -2342,7 +2342,7 @@
 	db 0
 
 Route9Mons:
-	db $0F
+	db 15
 	db 16,RATTATA
 	db 16,SPEAROW
 	db 14,RATTATA
@@ -2357,7 +2357,7 @@
 	db 0
 
 Route5Mons:
-	db $0F
+	db 15
 	db 13,ODDISH
 	db 13,PIDGEY
 	db 15,PIDGEY
@@ -2372,7 +2372,7 @@
 	db 0
 
 Route6Mons:
-	db $0F
+	db 15
 	db 13,ODDISH
 	db 13,PIDGEY
 	db 15,PIDGEY
@@ -2387,7 +2387,7 @@
 	db 0
 
 Route11Mons:
-	db $0F
+	db 15
 	db 14,EKANS
 	db 15,SPEAROW
 	db 12,EKANS
@@ -2402,7 +2402,7 @@
 	db 0
 
 TunnelMonsB1:
-	db $0F
+	db 15
 	db 16,ZUBAT
 	db 17,ZUBAT
 	db 17,GEODUDE
@@ -2417,7 +2417,7 @@
 	db 0
 
 TunnelMonsB2:
-	db $0F
+	db 15
 	db 16,ZUBAT
 	db 17,ZUBAT
 	db 17,GEODUDE
@@ -2432,7 +2432,7 @@
 	db 0
 
 Route10Mons:
-	db $0F
+	db 15
 	db 16,VOLTORB
 	db 16,SPEAROW
 	db 14,VOLTORB
@@ -2447,7 +2447,7 @@
 	db 0
 
 Route12Mons:
-	db $0F
+	db 15
 	db 24,ODDISH
 	db 25,PIDGEY
 	db 23,PIDGEY
@@ -2462,7 +2462,7 @@
 	db 0
 
 Route8Mons:
-	db $0F
+	db 15
 	db 18,PIDGEY
 	db 18,MANKEY
 	db 17,EKANS
@@ -2477,7 +2477,7 @@
 	db 0
 
 Route7Mons:
-	db $0F
+	db 15
 	db 19,PIDGEY
 	db 19,ODDISH
 	db 17,MANKEY
@@ -2545,7 +2545,7 @@
 	db 0
 
 TowerMons6:
-	db $0F
+	db 15
 	db 21,GASTLY
 	db 22,GASTLY
 	db 23,GASTLY
@@ -2560,7 +2560,7 @@
 	db 0
 
 TowerMons7:
-	db $0F
+	db 15
 	db 21,GASTLY
 	db 22,GASTLY
 	db 23,GASTLY
@@ -2590,7 +2590,7 @@
 	db 0
 
 Route14Mons:
-	db $0F
+	db 15
 	db 24,ODDISH
 	db 26,PIDGEY
 	db 23,DITTO
@@ -2605,7 +2605,7 @@
 	db 0
 
 Route15Mons:
-	db $0F
+	db 15
 	db 24,ODDISH
 	db 26,DITTO
 	db 23,PIDGEY
@@ -2740,7 +2740,7 @@
 	db 40,  TENTACOOL
 
 IslandMons1:
-	db $0F
+	db 15
 	db 30,SEEL
 	db 30,SLOWPOKE
 	db 30,SHELLDER
@@ -2915,7 +2915,7 @@
 	db 0
 
 DungeonMons2:
-	db $0F
+	db 15
 	db 51,DODRIO
 	db 51,VENOMOTH
 	db 51,KADABRA
@@ -2990,7 +2990,7 @@
 	db 0
 
 PlateauMons3:
-	db $0F
+	db 15
 	db 24,MACHOP
 	db 26,GEODUDE
 	db 22,ZUBAT
@@ -3005,7 +3005,7 @@
 	db 0
 
 PlateauMons1:
-	db $0F
+	db 15
 	db 24,MACHOP
 	db 26,GEODUDE
 	db 22,ZUBAT
@@ -3069,10 +3069,177 @@
 INCBIN "baserom.gbc",$34000,$4000
 
 SECTION "bankE",DATA,BANK[$E]
-INCBIN "baserom.gbc",$38000,$1C53
 
+Attacks: ; 4000
+; characteristics of each attack
+db POUND       ,$00,$28,NORMAL,$FF,35
+db KARATE_CHOP ,$00,$32,NORMAL,$FF,25
+db DOUBLESLAP  ,$1D,$0F,NORMAL,$D8,10
+db COMET_PUNCH ,$1D,$12,NORMAL,$D8,15
+db MEGA_PUNCH  ,$00,$50,NORMAL,$D8,20
+db PAY_DAY     ,$10,$28,NORMAL,$FF,20
+db FIRE_PUNCH  ,$04,$4B,FIRE,$FF,15
+db ICE_PUNCH   ,$05,$4B,ICE,$FF,15
+db THUNDERPUNCH,$06,$4B,ELECTRIC,$FF,15
+db SCRATCH     ,$00,$28,NORMAL,$FF,35
+db VICEGRIP    ,$00,$37,NORMAL,$FF,30
+db GUILLOTINE  ,$26,$01,NORMAL,$4C,5
+db RAZOR_WIND  ,$27,$50,NORMAL,$BF,10
+db SWORDS_DANCE,$32,$00,NORMAL,$FF,30
+db CUT         ,$00,$32,NORMAL,$F2,30
+db GUST        ,$00,$28,NORMAL,$FF,35
+db WING_ATTACK ,$00,$23,FLYING,$FF,35
+db WHIRLWIND   ,$1C,$00,NORMAL,$D8,20
+db FLY         ,$2B,$46,FLYING,$F2,15
+db BIND        ,$2A,$0F,NORMAL,$BF,20
+db SLAM        ,$00,$50,NORMAL,$BF,20
+db VINE_WHIP   ,$00,$23,GRASS,$FF,10
+db STOMP       ,$25,$41,NORMAL,$FF,20
+db DOUBLE_KICK ,$2C,$1E,FIGHTING,$FF,30
+db MEGA_KICK   ,$00,$78,NORMAL,$BF,5
+db JUMP_KICK   ,$2D,$46,FIGHTING,$F2,25
+db ROLLING_KICK,$25,$3C,FIGHTING,$D8,15
+db SAND_ATTACK ,$16,$00,NORMAL,$FF,15
+db HEADBUTT    ,$25,$46,NORMAL,$FF,15
+db HORN_ATTACK ,$00,$41,NORMAL,$FF,25
+db FURY_ATTACK ,$1D,$0F,NORMAL,$D8,20
+db HORN_DRILL  ,$26,$01,NORMAL,$4C,5
+db TACKLE      ,$00,$23,NORMAL,$F2,35
+db BODY_SLAM   ,$24,$55,NORMAL,$FF,15
+db WRAP        ,$2A,$0F,NORMAL,$D8,20
+db TAKE_DOWN   ,$30,$5A,NORMAL,$D8,20
+db THRASH      ,$1B,$5A,NORMAL,$FF,20
+db DOUBLE_EDGE ,$30,$64,NORMAL,$FF,15
+db TAIL_WHIP   ,$13,$00,NORMAL,$FF,30
+db POISON_STING,$02,$0F,POISON,$FF,35
+db TWINEEDLE   ,$4D,$19,BUG,$FF,20
+db PIN_MISSILE ,$1D,$0E,BUG,$D8,20
+db LEER        ,$13,$00,NORMAL,$FF,30
+db BITE        ,$1F,$3C,NORMAL,$FF,25
+db GROWL       ,$12,$00,NORMAL,$FF,40
+db ROAR        ,$1C,$00,NORMAL,$FF,20
+db SING        ,$20,$00,NORMAL,$8C,15
+db SUPERSONIC  ,$31,$00,NORMAL,$8C,20
+db SONICBOOM   ,$29,$01,NORMAL,$E5,20
+db DISABLE     ,$56,$00,NORMAL,$8C,20
+db ACID        ,$45,$28,POISON,$FF,30
+db EMBER       ,$04,$28,FIRE,$FF,25
+db FLAMETHROWER,$04,$5F,FIRE,$FF,15
+db MIST        ,$2E,$00,ICE,$FF,30
+db WATER_GUN   ,$00,$28,WATER,$FF,25
+db HYDRO_PUMP  ,$00,$78,WATER,$CC,5
+db SURF        ,$00,$5F,WATER,$FF,15
+db ICE_BEAM    ,$05,$5F,ICE,$FF,10
+db BLIZZARD    ,$05,$78,ICE,$E5,5
+db PSYBEAM     ,$4C,$41,PSYCHIC,$FF,20
+db BUBBLEBEAM  ,$46,$41,WATER,$FF,20
+db AURORA_BEAM ,$44,$41,ICE,$FF,20
+db HYPER_BEAM  ,$50,$96,NORMAL,$E5,5
+db PECK        ,$00,$23,FLYING,$FF,35
+db DRILL_PECK  ,$00,$50,FLYING,$FF,20
+db SUBMISSION  ,$30,$50,FIGHTING,$CC,25
+db LOW_KICK    ,$25,$32,FIGHTING,$E5,20
+db COUNTER     ,$00,$01,FIGHTING,$FF,20
+db SEISMIC_TOSS,$29,$01,FIGHTING,$FF,20
+db STRENGTH    ,$00,$50,NORMAL,$FF,15
+db ABSORB      ,$03,$14,GRASS,$FF,20
+db MEGA_DRAIN  ,$03,$28,GRASS,$FF,10
+db LEECH_SEED  ,$54,$00,GRASS,$E5,10
+db GROWTH      ,$0D,$00,NORMAL,$FF,40
+db RAZOR_LEAF  ,$00,$37,GRASS,$F2,25
+db SOLARBEAM   ,$27,$78,GRASS,$FF,10
+db POISONPOWDER,$42,$00,POISON,$BF,35
+db STUN_SPORE  ,$43,$00,GRASS,$BF,30
+db SLEEP_POWDER,$20,$00,GRASS,$BF,15
+db PETAL_DANCE ,$1B,$46,GRASS,$FF,20
+db STRING_SHOT ,$14,$00,BUG,$F2,40
+db DRAGON_RAGE ,$29,$01,DRAGON,$FF,10
+db FIRE_SPIN   ,$2A,$0F,FIRE,$B2,15
+db THUNDERSHOCK,$06,$28,ELECTRIC,$FF,30
+db THUNDERBOLT ,$06,$5F,ELECTRIC,$FF,15
+db THUNDER_WAVE,$43,$00,ELECTRIC,$FF,20
+db THUNDER     ,$06,$78,ELECTRIC,$B2,10
+db ROCK_THROW  ,$00,$32,ROCK,$A5,15
+db EARTHQUAKE  ,$00,$64,GROUND,$FF,10
+db FISSURE     ,$26,$01,GROUND,$4C,5
+db DIG         ,$27,$64,GROUND,$FF,10
+db TOXIC       ,$42,$00,POISON,$D8,10
+db CONFUSION   ,$4C,$32,PSYCHIC,$FF,25
+db PSYCHIC_M   ,$47,$5A,PSYCHIC,$FF,10
+db HYPNOSIS    ,$20,$00,PSYCHIC,$99,20
+db MEDITATE    ,$0A,$00,PSYCHIC,$FF,40
+db AGILITY     ,$34,$00,PSYCHIC,$FF,30
+db QUICK_ATTACK,$00,$28,NORMAL,$FF,30
+db RAGE        ,$51,$14,NORMAL,$FF,20
+db TELEPORT    ,$1C,$00,PSYCHIC,$FF,20
+db NIGHT_SHADE ,$29,$00,GHOST,$FF,15
+db MIMIC       ,$52,$00,NORMAL,$FF,10
+db SCREECH     ,$3B,$00,NORMAL,$D8,40
+db DOUBLE_TEAM ,$0F,$00,NORMAL,$FF,15
+db RECOVER     ,$38,$00,NORMAL,$FF,20
+db HARDEN      ,$0B,$00,NORMAL,$FF,30
+db MINIMIZE    ,$0F,$00,NORMAL,$FF,20
+db SMOKESCREEN ,$16,$00,NORMAL,$FF,20
+db CONFUSE_RAY ,$31,$00,GHOST,$FF,10
+db WITHDRAW    ,$0B,$00,WATER,$FF,40
+db DEFENSE_CURL,$0B,$00,NORMAL,$FF,40
+db BARRIER     ,$33,$00,PSYCHIC,$FF,30
+db LIGHT_SCREEN,$40,$00,PSYCHIC,$FF,30
+db HAZE        ,$19,$00,ICE,$FF,30
+db REFLECT     ,$41,$00,PSYCHIC,$FF,20
+db FOCUS_ENERGY,$2F,$00,NORMAL,$FF,30
+db BIDE        ,$1A,$00,NORMAL,$FF,10
+db METRONOME   ,$53,$00,NORMAL,$FF,10
+db MIRROR_MOVE ,$09,$00,FLYING,$FF,20
+db SELFDESTRUCT,$07,$82,NORMAL,$FF,5
+db EGG_BOMB    ,$00,$64,NORMAL,$BF,10
+db LICK        ,$24,$14,GHOST,$FF,30
+db SMOG        ,$21,$14,POISON,$B2,20
+db SLUDGE      ,$21,$41,POISON,$FF,20
+db BONE_CLUB   ,$1F,$41,GROUND,$D8,20
+db FIRE_BLAST  ,$22,$78,FIRE,$D8,5
+db WATERFALL   ,$00,$50,WATER,$FF,15
+db CLAMP       ,$2A,$23,WATER,$BF,10
+db SWIFT       ,$11,$3C,NORMAL,$FF,20
+db SKULL_BASH  ,$27,$64,NORMAL,$FF,15
+db SPIKE_CANNON,$1D,$14,NORMAL,$FF,15
+db CONSTRICT   ,$46,$0A,NORMAL,$FF,35
+db AMNESIA     ,$35,$00,PSYCHIC,$FF,20
+db KINESIS     ,$16,$00,PSYCHIC,$CC,15
+db SOFTBOILED  ,$38,$00,NORMAL,$FF,10
+db HI_JUMP_KICK,$2D,$55,FIGHTING,$E5,20
+db GLARE       ,$43,$00,NORMAL,$BF,30
+db DREAM_EATER ,$08,$64,PSYCHIC,$FF,15
+db POISON_GAS  ,$42,$00,POISON,$8C,40
+db BARRAGE     ,$1D,$0F,NORMAL,$D8,20
+db LEECH_LIFE  ,$03,$14,BUG,$FF,15
+db LOVELY_KISS ,$20,$00,NORMAL,$BF,10
+db SKY_ATTACK  ,$27,$8C,FLYING,$E5,5
+db TRANSFORM   ,$39,$00,NORMAL,$FF,10
+db BUBBLE      ,$46,$14,WATER,$FF,30
+db DIZZY_PUNCH ,$00,$46,NORMAL,$FF,10
+db SPORE       ,$20,$00,GRASS,$FF,15
+db FLASH       ,$16,$00,NORMAL,$B2,20
+db PSYWAVE     ,$29,$01,PSYCHIC,$CC,15
+db SPLASH      ,$55,$00,NORMAL,$FF,40
+db ACID_ARMOR  ,$33,$00,POISON,$FF,40
+db CRABHAMMER  ,$00,$5A,WATER,$D8,10
+db EXPLOSION   ,$07,$AA,NORMAL,$FF,5
+db FURY_SWIPES ,$1D,$12,NORMAL,$CC,15
+db BONEMERANG  ,$2C,$32,GROUND,$E5,10
+db REST        ,$38,$00,PSYCHIC,$FF,10
+db ROCK_SLIDE  ,$00,$4B,ROCK,$E5,10
+db HYPER_FANG  ,$1F,$50,NORMAL,$E5,15
+db SHARPEN     ,$0A,$00,NORMAL,$FF,30
+db CONVERSION  ,$18,$00,NORMAL,$FF,30
+db TRI_ATTACK  ,$00,$50,NORMAL,$FF,10
+db SUPER_FANG  ,$28,$01,NORMAL,$E5,10
+db SLASH       ,$00,$46,NORMAL,$FF,20
+db SUBSTITUTE  ,$4F,$00,NORMAL,$FF,10
+db STRUGGLE    ,$30,$32,NORMAL,$FF,10
 ; trainer data: from 5C53 to 652E
 
+INCBIN "baserom.gbc",$383DE,$39C53 - $383DE
 ReadTrainer: ; 5C53
 
 ; don't change any moves in a link battle