Merge pull request #15 from yenatch/master

add type interaction
This commit is contained in:
Bryan Bishop 2012-05-28 17:40:03 -07:00
commit cfb8bb4d7f

125
main.asm
View File

@ -3289,7 +3289,130 @@ INCBIN "baserom.gbc",$30000,$34000 - $30000
SECTION "bankD",DATA,BANK[$D]
INCBIN "baserom.gbc",$34000,$38000 - $34000
INCBIN "baserom.gbc",$34000,$34BB1 - $34000
TypeEffects: ; 0x34BB1
; format: attacking type, defending type, damage multiplier
; multiplier is a (decimal) fixed-point number
; $14 is *2.0
; $05 is *0.5
; $00 is *0
db NORMAL,ROCK,$05
db NORMAL,STEEL,$05
db FIRE,FIRE,$05
db FIRE,WATER,$05
db FIRE,GRASS,$14
db FIRE,ICE,$14
db FIRE,BUG,$14
db FIRE,ROCK,$05
db FIRE,DRAGON,$05
db FIRE,STEEL,$14
db WATER,FIRE,$14
db WATER,WATER,$05
db WATER,GRASS,$05
db WATER,GROUND,$14
db WATER,ROCK,$14
db WATER,DRAGON,$05
db ELECTRIC,WATER,$14
db ELECTRIC,ELECTRIC,$05
db ELECTRIC,GRASS,$05
db ELECTRIC,GROUND,$00
db ELECTRIC,FLYING,$14
db ELECTRIC,DRAGON,$05
db GRASS,FIRE,$05
db GRASS,WATER,$14
db GRASS,GRASS,$05
db GRASS,POISON,$05
db GRASS,GROUND,$14
db GRASS,FLYING,$05
db GRASS,BUG,$05
db GRASS,ROCK,$14
db GRASS,DRAGON,$05
db GRASS,STEEL,$05
db ICE,WATER,$05
db ICE,GRASS,$14
db ICE,ICE,$05
db ICE,GROUND,$14
db ICE,FLYING,$14
db ICE,DRAGON,$14
db ICE,STEEL,$05
db ICE,FIRE,$05
db FIGHTING,NORMAL,$14
db FIGHTING,ICE,$14
db FIGHTING,POISON,$05
db FIGHTING,FLYING,$05
db FIGHTING,PSYCHIC,$05
db FIGHTING,BUG,$05
db FIGHTING,ROCK,$14
db FIGHTING,DARK,$14
db FIGHTING,STEEL,$14
db POISON,GRASS,$14
db POISON,POISON,$05
db POISON,GROUND,$05
db POISON,ROCK,$05
db POISON,GHOST,$05
db POISON,STEEL,$00
db GROUND,FIRE,$14
db GROUND,ELECTRIC,$14
db GROUND,GRASS,$05
db GROUND,POISON,$14
db GROUND,FLYING,$00
db GROUND,BUG,$05
db GROUND,ROCK,$14
db GROUND,STEEL,$14
db FLYING,ELECTRIC,$05
db FLYING,GRASS,$14
db FLYING,FIGHTING,$14
db FLYING,BUG,$14
db FLYING,ROCK,$05
db FLYING,STEEL,$05
db PSYCHIC,FIGHTING,$14
db PSYCHIC,POISON,$14
db PSYCHIC,PSYCHIC,$05
db PSYCHIC,DARK,$00
db PSYCHIC,STEEL,$05
db BUG,FIRE,$05
db BUG,GRASS,$14
db BUG,FIGHTING,$05
db BUG,POISON,$05
db BUG,FLYING,$05
db BUG,PSYCHIC,$14
db BUG,GHOST,$05
db BUG,DARK,$14
db BUG,STEEL,$05
db ROCK,FIRE,$14
db ROCK,ICE,$14
db ROCK,FIGHTING,$05
db ROCK,GROUND,$05
db ROCK,FLYING,$14
db ROCK,BUG,$14
db ROCK,STEEL,$05
db GHOST,NORMAL,$00
db GHOST,PSYCHIC,$14
db GHOST,DARK,$05
db GHOST,STEEL,$05
db GHOST,GHOST,$14
db DRAGON,DRAGON,$14
db DRAGON,STEEL,$05
db DARK,FIGHTING,$05
db DARK,PSYCHIC,$14
db DARK,GHOST,$14
db DARK,DARK,$05
db DARK,STEEL,$05
db STEEL,FIRE,$05
db STEEL,WATER,$05
db STEEL,ELECTRIC,$05
db STEEL,ICE,$14
db STEEL,ROCK,$14
db STEEL,STEEL,$05
db $FE ; foresight
db NORMAL,GHOST,$00
db FIGHTING,GHOST,$00
db $FF ; end
; 0x34CFD
INCBIN "baserom.gbc",$34CFD,$38000 - $34CFD
SECTION "bankE",DATA,BANK[$E]