Split type matchup off into a file

This sets precedent for including constants in context.
2013-02-04 16:22:10 -05:00
parent 0935908367
commit 28b56c51bb
2 changed files with 130 additions and 119 deletions
--- a/main.asm
+++ b/main.asm
@@ -5976,125 +5976,8 @@ SECTION "bankD",DATA,BANK[$D]

 INCBIN "baserom.gbc",$34000,$34bb1 - $34000

-TypeEffects: ; 34bb1
-; multiplier /= 10 (20 = 2.0 etc)
-
-;	  attacker  defender	*=
-
-	db NORMAL,	 ROCK,		05
-	db NORMAL,	 STEEL,		05
-	db FIRE,	 FIRE,		05
-	db FIRE,	 WATER,		05
-	db FIRE,	 GRASS,		20
-	db FIRE,	 ICE,		20
-	db FIRE,	 BUG,		20
-	db FIRE,	 ROCK,		05
-	db FIRE,	 DRAGON,	05
-	db FIRE,	 STEEL,		20
-	db WATER,	 FIRE,		20
-	db WATER,	 WATER,		05
-	db WATER,	 GRASS,		05
-	db WATER,	 GROUND,	20
-	db WATER,	 ROCK,		20
-	db WATER,	 DRAGON,	05
-	db ELECTRIC, WATER,		20
-	db ELECTRIC, ELECTRIC,	05
-	db ELECTRIC, GRASS,		05
-	db ELECTRIC, GROUND,	00
-	db ELECTRIC, FLYING,	20
-	db ELECTRIC, DRAGON,	05
-	db GRASS,	 FIRE,		05
-	db GRASS,	 WATER,		20
-	db GRASS,	 GRASS,		05
-	db GRASS,	 POISON,	05
-	db GRASS,	 GROUND,	20
-	db GRASS,	 FLYING,	05
-	db GRASS,	 BUG,		05
-	db GRASS,	 ROCK,		20
-	db GRASS,	 DRAGON,	05
-	db GRASS,	 STEEL,		05
-	db ICE,		 WATER,		05
-	db ICE,		 GRASS,		20
-	db ICE,		 ICE,		05
-	db ICE,		 GROUND,	20
-	db ICE,		 FLYING,	20
-	db ICE,		 DRAGON,	20
-	db ICE,		 STEEL,		05
-	db ICE,		 FIRE,		05
-	db FIGHTING, NORMAL,	20
-	db FIGHTING, ICE,		20
-	db FIGHTING, POISON,	05
-	db FIGHTING, FLYING,	05
-	db FIGHTING, PSYCHIC,	05
-	db FIGHTING, BUG,		05
-	db FIGHTING, ROCK,		20
-	db FIGHTING, DARK,		20
-	db FIGHTING, STEEL,		20
-	db POISON,	 GRASS,		20
-	db POISON,	 POISON,	05
-	db POISON,	 GROUND,	05
-	db POISON,	 ROCK,		05
-	db POISON,	 GHOST,		05
-	db POISON,	 STEEL,		00
-	db GROUND,	 FIRE,		20
-	db GROUND,	 ELECTRIC,	20
-	db GROUND,	 GRASS,		05
-	db GROUND,	 POISON,	20
-	db GROUND,	 FLYING,	00
-	db GROUND,	 BUG,		05
-	db GROUND,	 ROCK,		20
-	db GROUND,	 STEEL,		20
-	db FLYING,	 ELECTRIC,	05
-	db FLYING,	 GRASS,		20
-	db FLYING,	 FIGHTING,	20
-	db FLYING,	 BUG,		20
-	db FLYING,	 ROCK,		05
-	db FLYING,	 STEEL,		05
-	db PSYCHIC,	 FIGHTING,	20
-	db PSYCHIC,	 POISON,	20
-	db PSYCHIC,	 PSYCHIC,	05
-	db PSYCHIC,	 DARK,		00
-	db PSYCHIC,	 STEEL,		05
-	db BUG,		 FIRE,		05
-	db BUG,		 GRASS,		20
-	db BUG,		 FIGHTING,	05
-	db BUG,		 POISON,	05
-	db BUG,		 FLYING,	05
-	db BUG,		 PSYCHIC,	20
-	db BUG,		 GHOST,		05
-	db BUG,		 DARK,		20
-	db BUG,		 STEEL,		05
-	db ROCK,	 FIRE,		20
-	db ROCK,	 ICE,		20
-	db ROCK,	 FIGHTING,	05
-	db ROCK,	 GROUND,	05
-	db ROCK,	 FLYING,	20
-	db ROCK,	 BUG,		20
-	db ROCK,	 STEEL,		05
-	db GHOST,	 NORMAL,	00
-	db GHOST,	 PSYCHIC,	20
-	db GHOST,	 DARK,		05
-	db GHOST,	 STEEL,		05
-	db GHOST,	 GHOST,		20
-	db DRAGON,	 DRAGON,	20
-	db DRAGON,	 STEEL,		05
-	db DARK,	 FIGHTING,	05
-	db DARK,	 PSYCHIC,	20
-	db DARK,	 GHOST,		20
-	db DARK,	 DARK,		05
-	db DARK,	 STEEL,		05
-	db STEEL,	 FIRE,		05
-	db STEEL,	 WATER,		05
-	db STEEL,	 ELECTRIC,	05
-	db STEEL,	 ICE,		20
-	db STEEL,	 ROCK,		20
-	db STEEL,	 STEEL,		05
-
-	db $fe ; foresight
-	db NORMAL,	 GHOST,		00
-	db FIGHTING, GHOST,		00
-
-	db $ff ; end
+TypeMatchup: ; 34bb1
+INCLUDE "data/type_matchup.asm"
 ; 34cfd

 INCBIN "baserom.gbc",$34cfd,$38000 - $34cfd