Split out mon collision masks

1 files changed, 2 insertions, 162 deletions

diff --git a/main.asm b/main.asm
index 19b7a44..50c0610 100755
--- a/main.asm
+++ b/main.asm
@@ -12414,7 +12414,7 @@ Data_1298b: ; 0x1298b
 INCLUDE "data/catchem_timer_values.asm"
 INCLUDE "data/mon_gfx_pointers.asm"
 INCLUDE "data/mon_animated_sprite_types.asm"
-INCLUDE "data/collision/mon_collision_masks.asm"
+INCLUDE "data/collision/mon_collision_mask_pointers.asm"
 
 Data_13685: ; 0x13685
 ; Each 3-byte entry is related to an evolution line. Don't know what this is for, yet.
@@ -38715,167 +38715,7 @@ DiglettBonusTilemap_GameBoy: ; 0xcf800
 
 SECTION "bank34", ROMX, BANK[$34]
 
-MagikarpAnimatedCollisionMask: ; 0xd04000
-	INCBIN "data/collision/mon_masks/magikarp_collision.1bpp"
-LaprasAnimatedCollisionMask: ; 0xd04080
-	INCBIN "data/collision/mon_masks/lapras_collision.1bpp"
-DittoAnimatedCollisionMask: ; 0xd04100
-	INCBIN "data/collision/mon_masks/ditto_collision.1bpp"
-EeveeAnimatedCollisionMask: ; 0xd04180
-	INCBIN "data/collision/mon_masks/eevee_collision.1bpp"
-PorygonAnimatedCollisionMask: ; 0xd04200
-	INCBIN "data/collision/mon_masks/porygon_collision.1bpp"
-OmanyteAnimatedCollisionMask: ; 0xd04280
-	INCBIN "data/collision/mon_masks/omanyte_collision.1bpp"
-KabutoAnimatedCollisionMask: ; 0xd04300
-	INCBIN "data/collision/mon_masks/kabuto_collision.1bpp"
-AerodactylAnimatedCollisionMask: ; 0xd04380
-	INCBIN "data/collision/mon_masks/aerodactyl_collision.1bpp"
-SnorlaxAnimatedCollisionMask: ; 0xd04400
-	INCBIN "data/collision/mon_masks/snorlax_collision.1bpp"
-ArticunoAnimatedCollisionMask: ; 0xd04480
-	INCBIN "data/collision/mon_masks/articuno_collision.1bpp"
-ZapdosAnimatedCollisionMask: ; 0xd04500
-	INCBIN "data/collision/mon_masks/zapdos_collision.1bpp"
-MoltresAnimatedCollisionMask: ; 0xd04580
-	INCBIN "data/collision/mon_masks/moltres_collision.1bpp"
-DratiniAnimatedCollisionMask: ; 0xd04600
-	INCBIN "data/collision/mon_masks/dratini_collision.1bpp"
-MewtwoAnimatedCollisionMask: ; 0xd04680
-	INCBIN "data/collision/mon_masks/mewtwo_collision.1bpp"
-MewAnimatedCollisionMask: ; 0xd04700
-	INCBIN "data/collision/mon_masks/mew_collision.1bpp"
-
-	ds $80 ; free space
-
-LickitungAnimatedCollisionMask: ; 0xd0800
-	INCBIN "data/collision/mon_masks/lickitung_collision.1bpp"
-KoffingAnimatedCollisionMask: ; 0xd0880
-	INCBIN "data/collision/mon_masks/koffing_collision.1bpp"
-RhyhornAnimatedCollisionMask: ; 0xd0900
-	INCBIN "data/collision/mon_masks/rhyhorn_collision.1bpp"
-ChanseyAnimatedCollisionMask: ; 0xd0980
-	INCBIN "data/collision/mon_masks/chansey_collision.1bpp"
-TangelaAnimatedCollisionMask: ; 0xd0A00
-	INCBIN "data/collision/mon_masks/tangela_collision.1bpp"
-KangaskhanAnimatedCollisionMask: ; 0xd0A80
-	INCBIN "data/collision/mon_masks/kangaskhan_collision.1bpp"
-HorseaAnimatedCollisionMask: ; 0xd0B00
-	INCBIN "data/collision/mon_masks/horsea_collision.1bpp"
-GoldeenAnimatedCollisionMask: ; 0xd0B80
-	INCBIN "data/collision/mon_masks/goldeen_collision.1bpp"
-StaryuAnimatedCollisionMask: ; 0xd0C00
-	INCBIN "data/collision/mon_masks/staryu_collision.1bpp"
-MrMimeAnimatedCollisionMask: ; 0xd0C80
-	INCBIN "data/collision/mon_masks/mrmime_collision.1bpp"
-ScytherAnimatedCollisionMask: ; 0xd0D00
-	INCBIN "data/collision/mon_masks/scyther_collision.1bpp"
-JynxAnimatedCollisionMask: ; 0xd0D80
-	INCBIN "data/collision/mon_masks/jynx_collision.1bpp"
-ElectabuzzAnimatedCollisionMask: ; 0xd0E00
-	INCBIN "data/collision/mon_masks/electabuzz_collision.1bpp"
-MagmarAnimatedCollisionMask: ; 0xd0E80
-	INCBIN "data/collision/mon_masks/magmar_collision.1bpp"
-PinsirAnimatedCollisionMask: ; 0xd0F00
-	INCBIN "data/collision/mon_masks/pinsir_collision.1bpp"
-TaurosAnimatedCollisionMask: ; 0xd0F80
-	INCBIN "data/collision/mon_masks/tauros_collision.1bpp"
-SlowpokeAnimatedCollisionMask: ; 0xd1000
-	INCBIN "data/collision/mon_masks/slowpoke_collision.1bpp"
-MagnemiteAnimatedCollisionMask: ; 0xd1080
-	INCBIN "data/collision/mon_masks/magnemite_collision.1bpp"
-FarfetchdAnimatedCollisionMask: ; 0xd1100
-	INCBIN "data/collision/mon_masks/farfetchd_collision.1bpp"
-DoduoAnimatedCollisionMask: ; 0xd1180
-	INCBIN "data/collision/mon_masks/doduo_collision.1bpp"
-SeelAnimatedCollisionMask: ; 0xd1200
-	INCBIN "data/collision/mon_masks/seel_collision.1bpp"
-GrimerAnimatedCollisionMask: ; 0xd1280
-	INCBIN "data/collision/mon_masks/grimer_collision.1bpp"
-ShellderAnimatedCollisionMask: ; 0xd1300
-	INCBIN "data/collision/mon_masks/shellder_collision.1bpp"
-GastlyAnimatedCollisionMask: ; 0xd1380
-	INCBIN "data/collision/mon_masks/gastly_collision.1bpp"
-OnixAnimatedCollisionMask: ; 0xd1400
-	INCBIN "data/collision/mon_masks/onix_collision.1bpp"
-DrowzeeAnimatedCollisionMask: ; 0xd1480
-	INCBIN "data/collision/mon_masks/drowzee_collision.1bpp"
-KrabbyAnimatedCollisionMask: ; 0xd1500
-	INCBIN "data/collision/mon_masks/krabby_collision.1bpp"
-VoltorbAnimatedCollisionMask: ; 0xd1580
-	INCBIN "data/collision/mon_masks/voltorb_collision.1bpp"
-ExeggcuteAnimatedCollisionMask: ; 0xd1600
-	INCBIN "data/collision/mon_masks/exeggcute_collision.1bpp"
-CuboneAnimatedCollisionMask: ; 0xd1680
-	INCBIN "data/collision/mon_masks/cubone_collision.1bpp"
-HitmonleeAnimatedCollisionMask: ; 0xd1700
-	INCBIN "data/collision/mon_masks/hitmonlee_collision.1bpp"
-HitmonchanAnimatedCollisionMask: ; 0xd1780
-	INCBIN "data/collision/mon_masks/hitmonchan_collision.1bpp"
-ZubatAnimatedCollisionMask: ; 0xd1800
-	INCBIN "data/collision/mon_masks/zubat_collision.1bpp"
-OddishAnimatedCollisionMask: ; 0xd1880
-	INCBIN "data/collision/mon_masks/oddish_collision.1bpp"
-ParasAnimatedCollisionMask: ; 0xd1900
-	INCBIN "data/collision/mon_masks/paras_collision.1bpp"
-VenonatAnimatedCollisionMask: ; 0xd1980
-	INCBIN "data/collision/mon_masks/venonat_collision.1bpp"
-DiglettAnimatedCollisionMask: ; 0xd1A00
-	INCBIN "data/collision/mon_masks/diglett_collision.1bpp"
-MeowthAnimatedCollisionMask: ; 0xd1A80
-	INCBIN "data/collision/mon_masks/meowth_collision.1bpp"
-PsyduckAnimatedCollisionMask: ; 0xd1B00
-	INCBIN "data/collision/mon_masks/psyduck_collision.1bpp"
-MankeyAnimatedCollisionMask: ; 0xd1B80
-	INCBIN "data/collision/mon_masks/mankey_collision.1bpp"
-GrowlitheAnimatedCollisionMask: ; 0xd1C00
-	INCBIN "data/collision/mon_masks/growlithe_collision.1bpp"
-PoliwagAnimatedCollisionMask: ; 0xd1C80
-	INCBIN "data/collision/mon_masks/poliwag_collision.1bpp"
-AbraAnimatedCollisionMask: ; 0xd1D00
-	INCBIN "data/collision/mon_masks/abra_collision.1bpp"
-MachopAnimatedCollisionMask: ; 0xd1D80
-	INCBIN "data/collision/mon_masks/machop_collision.1bpp"
-BellsproutAnimatedCollisionMask: ; 0xd1E00
-	INCBIN "data/collision/mon_masks/bellsprout_collision.1bpp"
-TentacoolAnimatedCollisionMask: ; 0xd1E80
-	INCBIN "data/collision/mon_masks/tentacool_collision.1bpp"
-GeodudeAnimatedCollisionMask: ; 0xd1F00
-	INCBIN "data/collision/mon_masks/geodude_collision.1bpp"
-PonytaAnimatedCollisionMask: ; 0xd1F80
-	INCBIN "data/collision/mon_masks/ponyta_collision.1bpp"
-BulbasaurAnimatedCollisionMask: ; 0xd2000
-	INCBIN "data/collision/mon_masks/bulbasaur_collision.1bpp"
-CharmanderAnimatedCollisionMask: ; 0xd2080
-	INCBIN "data/collision/mon_masks/charmander_collision.1bpp"
-SquirtleAnimatedCollisionMask: ; 0xd2100
-	INCBIN "data/collision/mon_masks/squirtle_collision.1bpp"
-CaterpieAnimatedCollisionMask: ; 0xd2180
-	INCBIN "data/collision/mon_masks/caterpie_collision.1bpp"
-WeedleAnimatedCollisionMask: ; 0xd2200
-	INCBIN "data/collision/mon_masks/weedle_collision.1bpp"
-PidgeyAnimatedCollisionMask: ; 0xd2280
-	INCBIN "data/collision/mon_masks/pidgey_collision.1bpp"
-RattataAnimatedCollisionMask: ; 0xd2300
-	INCBIN "data/collision/mon_masks/rattata_collision.1bpp"
-SpearowAnimatedCollisionMask: ; 0xd2380
-	INCBIN "data/collision/mon_masks/spearow_collision.1bpp"
-EkansAnimatedCollisionMask: ; 0xd2400
-	INCBIN "data/collision/mon_masks/ekans_collision.1bpp"
-PikachuAnimatedCollisionMask: ; 0xd2480
-	INCBIN "data/collision/mon_masks/pikachu_collision.1bpp"
-SandshrewAnimatedCollisionMask: ; 0xd2500
-	INCBIN "data/collision/mon_masks/sandshrew_collision.1bpp"
-NidoranfAnimatedCollisionMask: ; 0xd2580
-	INCBIN "data/collision/mon_masks/nidoranf_collision.1bpp"
-NidoranmAnimatedCollisionMask: ; 0xd2600
-	INCBIN "data/collision/mon_masks/nidoranm_collision.1bpp"
-ClefairyAnimatedCollisionMask: ; 0xd2680
-	INCBIN "data/collision/mon_masks/clefairy_collision.1bpp"
-VulpixAnimatedCollisionMask: ; 0xd2700
-	INCBIN "data/collision/mon_masks/vulpix_collision.1bpp"
-JigglypuffAnimatedCollisionMask: ; 0xd2780
-	INCBIN "data/collision/mon_masks/jigglypuff_collision.1bpp"
+INCLUDE "data/collision/mon_collision_masks.asm"
 
 	dr $d2800, $d3000