diff --git a/audio/cries.asm b/audio/cries.asm index a8b7d9b1..f416c537 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -1263,4 +1263,3 @@ Cry_22_Ch8: noise_note 1, 10, 2, 57 noise_note 8, 9, 1, 73 sound_ret - diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm index 68e00610..137451a8 100644 --- a/audio/cry_pointers.asm +++ b/audio/cry_pointers.asm @@ -40,4 +40,3 @@ Cries:: dba Cry_23 dba Cry_24 dba Cry_25 - diff --git a/audio/sfx.asm b/audio/sfx.asm index 62eb45e3..6decb622 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -2224,4 +2224,3 @@ Sfx_UnusedFanfare3_Ch8: note F_, 4 note F#, 6 sound_ret - diff --git a/audio/songs/title.asm b/audio/songs/title.asm index 134725ac..5ff7f8c9 100644 --- a/audio/songs/title.asm +++ b/audio/songs/title.asm @@ -164,7 +164,6 @@ Music_Title_Ch1:: note D_, 1 sound_ret - Music_Title_Ch2:: vibrato 16, 4, 6 duty_cycle 1 @@ -333,7 +332,6 @@ Music_Title_Ch2:: note D_, 1 sound_ret - Music_Title_Ch3:: note_type 12, 1, 0 octave 3 @@ -471,7 +469,6 @@ Music_Title_Ch3:: rest 5 sound_ret - Music_Title_Ch4:: toggle_noise 0 drum_speed 6 diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index dc9c4e86..0cdbe94d 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -186,4 +186,3 @@ DEF COLL_FF EQU $ff DEF LAND_TILE EQU 0 DEF WATER_TILE EQU 1 DEF WALL_TILE EQU 15 - diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm index f8a4341d..5ad7b70c 100644 --- a/constants/cry_constants.asm +++ b/constants/cry_constants.asm @@ -39,4 +39,3 @@ const CRY_23 ; 23 const CRY_24 ; 24 const CRY_25 ; 25 - diff --git a/data/battle/stat_multipliers.inc b/data/battle/stat_multipliers.inc index bf975a90..e5b33268 100644 --- a/data/battle/stat_multipliers.inc +++ b/data/battle/stat_multipliers.inc @@ -15,4 +15,3 @@ db 3, 1 ; +4 = 300% db 35, 10 ; +5 = 350% db 4, 1 ; +6 = 400% - diff --git a/data/battle_anims/oam.inc b/data/battle_anims/oam.inc index 40aea260..4de31455 100644 --- a/data/battle_anims/oam.inc +++ b/data/battle_anims/oam.inc @@ -587,14 +587,12 @@ BattleAnimOAMData: dbsprite -3, -1, 4, 4, $01, $0 dbsprite 1, -1, 4, 4, $01, X_FLIP | Y_FLIP - .OAMData_47: dbsprite -2, -2, 0, 0, $00, X_FLIP dbsprite 1, -2, 0, 0, $00, $0 dbsprite -2, 1, 0, 0, $00, X_FLIP | Y_FLIP dbsprite 1, 1, 0, 0, $00, Y_FLIP - .OAMData_48: dbsprite -1, -3, 4, 0, $00, $0 dbsprite -1, -2, 2, 0, $00, $0 diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 09eb67e5..68ace63b 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -207,4 +207,3 @@ SpriteSets: db SPRITE_SWIMMER_F db SPRITE_POKE_BALL db SPRITE_POKEDEX - diff --git a/data/mon_menu.inc b/data/mon_menu.inc index 3c61b9f2..67531658 100644 --- a/data/mon_menu.inc +++ b/data/mon_menu.inc @@ -80,4 +80,3 @@ MonMenuOptions: db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR db -1 - diff --git a/data/pokemon/base_stats/abra.inc b/data/pokemon/base_stats/abra.inc index 59a055cc..6df9d9cb 100644 --- a/data/pokemon/base_stats/abra.inc +++ b/data/pokemon/base_stats/abra.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 29, 30, 31, 32, 33, 34, 35, 40, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/aerodactyl.inc b/data/pokemon/base_stats/aerodactyl.inc index 52d0b103..c559d42a 100644 --- a/data/pokemon/base_stats/aerodactyl.inc +++ b/data/pokemon/base_stats/aerodactyl.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 23, 31, 32, 33, 34, 38, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/alakazam.inc b/data/pokemon/base_stats/alakazam.inc index 5a055e4e..3facbaf1 100644 --- a/data/pokemon/base_stats/alakazam.inc +++ b/data/pokemon/base_stats/alakazam.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 28, 29, 30, 31, 32, 33, 34, 35, 40, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/animon.inc b/data/pokemon/base_stats/animon.inc index bb9853c7..038d3eaf 100644 --- a/data/pokemon/base_stats/animon.inc +++ b/data/pokemon/base_stats/animon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/aqua.inc b/data/pokemon/base_stats/aqua.inc index 8f18369e..d6049535 100644 --- a/data/pokemon/base_stats/aqua.inc +++ b/data/pokemon/base_stats/aqua.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/aquaria.inc b/data/pokemon/base_stats/aquaria.inc index df7f8851..92f8d53e 100644 --- a/data/pokemon/base_stats/aquaria.inc +++ b/data/pokemon/base_stats/aquaria.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/arbok.inc b/data/pokemon/base_stats/arbok.inc index 5768bc11..4ad13038 100644 --- a/data/pokemon/base_stats/arbok.inc +++ b/data/pokemon/base_stats/arbok.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 21, 26, 27, 28, 31, 32, 34, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/arcanine.inc b/data/pokemon/base_stats/arcanine.inc index 86e1f0cb..6808e1ee 100644 --- a/data/pokemon/base_stats/arcanine.inc +++ b/data/pokemon/base_stats/arcanine.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 23, 28, 30, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/articuno.inc b/data/pokemon/base_stats/articuno.inc index 8f665ae3..39980e40 100644 --- a/data/pokemon/base_stats/articuno.inc +++ b/data/pokemon/base_stats/articuno.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 11, 12, 13, 14, 15, 20, 31, 32, 33, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/baririna.inc b/data/pokemon/base_stats/baririna.inc index 062dbf6d..8d4af17b 100644 --- a/data/pokemon/base_stats/baririna.inc +++ b/data/pokemon/base_stats/baririna.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/beedrill.inc b/data/pokemon/base_stats/beedrill.inc index 7f678532..2d677f1b 100644 --- a/data/pokemon/base_stats/beedrill.inc +++ b/data/pokemon/base_stats/beedrill.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 15, 20, 21, 31, 32, 33, 34, 39, 40, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/bellsprout.inc b/data/pokemon/base_stats/bellsprout.inc index 2e087499..ad4a9031 100644 --- a/data/pokemon/base_stats/bellsprout.inc +++ b/data/pokemon/base_stats/bellsprout.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/berurun.inc b/data/pokemon/base_stats/berurun.inc index 58356b48..aecf833e 100644 --- a/data/pokemon/base_stats/berurun.inc +++ b/data/pokemon/base_stats/berurun.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/betbaby.inc b/data/pokemon/base_stats/betbaby.inc index fd899aab..6f0d43da 100644 --- a/data/pokemon/base_stats/betbaby.inc +++ b/data/pokemon/base_stats/betbaby.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/blacky.inc b/data/pokemon/base_stats/blacky.inc index 46d633b3..f8d95580 100644 --- a/data/pokemon/base_stats/blacky.inc +++ b/data/pokemon/base_stats/blacky.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/blastoise.inc b/data/pokemon/base_stats/blastoise.inc index b88a2d17..995bddcd 100644 --- a/data/pokemon/base_stats/blastoise.inc +++ b/data/pokemon/base_stats/blastoise.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 26, 27, 28, 31, 32, 33, 34, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/bobo.inc b/data/pokemon/base_stats/bobo.inc index ff0fc236..14157b76 100644 --- a/data/pokemon/base_stats/bobo.inc +++ b/data/pokemon/base_stats/bobo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/bombseeker.inc b/data/pokemon/base_stats/bombseeker.inc index 6c8edfa6..ca6f9eb0 100644 --- a/data/pokemon/base_stats/bombseeker.inc +++ b/data/pokemon/base_stats/bombseeker.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/booby.inc b/data/pokemon/base_stats/booby.inc index a0fff88f..8b84e1f0 100644 --- a/data/pokemon/base_stats/booby.inc +++ b/data/pokemon/base_stats/booby.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/bulbasaur.inc b/data/pokemon/base_stats/bulbasaur.inc index b647152a..bd12469f 100644 --- a/data/pokemon/base_stats/bulbasaur.inc +++ b/data/pokemon/base_stats/bulbasaur.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/bulu.inc b/data/pokemon/base_stats/bulu.inc index da0d7bd8..feb2689c 100644 --- a/data/pokemon/base_stats/bulu.inc +++ b/data/pokemon/base_stats/bulu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/butterfree.inc b/data/pokemon/base_stats/butterfree.inc index 158d3ba4..2ed26ffd 100644 --- a/data/pokemon/base_stats/butterfree.inc +++ b/data/pokemon/base_stats/butterfree.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 21, 22, 29, 30, 31, 32, 33, 34, 39, 44, 46, 50 ; end - diff --git a/data/pokemon/base_stats/caterpie.inc b/data/pokemon/base_stats/caterpie.inc index eb0ad5f5..fb360fcb 100644 --- a/data/pokemon/base_stats/caterpie.inc +++ b/data/pokemon/base_stats/caterpie.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/chansey.inc b/data/pokemon/base_stats/chansey.inc index b5b96797..b2ebc559 100644 --- a/data/pokemon/base_stats/chansey.inc +++ b/data/pokemon/base_stats/chansey.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 37, 38, 40, 41, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/charizard.inc b/data/pokemon/base_stats/charizard.inc index d205b7dc..afd453d7 100644 --- a/data/pokemon/base_stats/charizard.inc +++ b/data/pokemon/base_stats/charizard.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 3, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 23, 26, 27, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/charmander.inc b/data/pokemon/base_stats/charmander.inc index 11453251..96681528 100644 --- a/data/pokemon/base_stats/charmander.inc +++ b/data/pokemon/base_stats/charmander.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 3, 5, 6, 8, 9, 10, 17, 18, 19, 20, 23, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/charmeleon.inc b/data/pokemon/base_stats/charmeleon.inc index b3ef5c41..fb74e19b 100644 --- a/data/pokemon/base_stats/charmeleon.inc +++ b/data/pokemon/base_stats/charmeleon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 3, 5, 6, 8, 9, 10, 17, 18, 19, 20, 23, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/clefable.inc b/data/pokemon/base_stats/clefable.inc index dcd9659b..4c435013 100644 --- a/data/pokemon/base_stats/clefable.inc +++ b/data/pokemon/base_stats/clefable.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/clefairy.inc b/data/pokemon/base_stats/clefairy.inc index 010d7849..6a4dbc4f 100644 --- a/data/pokemon/base_stats/clefairy.inc +++ b/data/pokemon/base_stats/clefairy.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/cloyster.inc b/data/pokemon/base_stats/cloyster.inc index 2c341647..6e3346da 100644 --- a/data/pokemon/base_stats/cloyster.inc +++ b/data/pokemon/base_stats/cloyster.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 15, 20, 30, 31, 32, 33, 34, 36, 39, 44, 47, 49, 50, 53 ; end - diff --git a/data/pokemon/base_stats/cubone.inc b/data/pokemon/base_stats/cubone.inc index fe7ef530..5dc6cf76 100644 --- a/data/pokemon/base_stats/cubone.inc +++ b/data/pokemon/base_stats/cubone.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 38, 40, 44, 50, 54 ; end - diff --git a/data/pokemon/base_stats/denryu.inc b/data/pokemon/base_stats/denryu.inc index 38f176f5..21833248 100644 --- a/data/pokemon/base_stats/denryu.inc +++ b/data/pokemon/base_stats/denryu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/devil.inc b/data/pokemon/base_stats/devil.inc index 3a800e3d..46483934 100644 --- a/data/pokemon/base_stats/devil.inc +++ b/data/pokemon/base_stats/devil.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/dewgong.inc b/data/pokemon/base_stats/dewgong.inc index 30dc1cd9..b666665d 100644 --- a/data/pokemon/base_stats/dewgong.inc +++ b/data/pokemon/base_stats/dewgong.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 31, 32, 34, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/diglett.inc b/data/pokemon/base_stats/diglett.inc index b5a36b3b..a53ef05d 100644 --- a/data/pokemon/base_stats/diglett.inc +++ b/data/pokemon/base_stats/diglett.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 26, 27, 28, 31, 32, 34, 44, 48, 50 ; end - diff --git a/data/pokemon/base_stats/ditto.inc b/data/pokemon/base_stats/ditto.inc index 7232649a..a9639d72 100644 --- a/data/pokemon/base_stats/ditto.inc +++ b/data/pokemon/base_stats/ditto.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/dodrio.inc b/data/pokemon/base_stats/dodrio.inc index 8e8fe891..53e36028 100644 --- a/data/pokemon/base_stats/dodrio.inc +++ b/data/pokemon/base_stats/dodrio.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 4, 6, 8, 9, 10, 15, 20, 31, 32, 33, 34, 40, 43, 44, 49, 50, 52 ; end - diff --git a/data/pokemon/base_stats/doduo.inc b/data/pokemon/base_stats/doduo.inc index e7aaef62..c493eb3a 100644 --- a/data/pokemon/base_stats/doduo.inc +++ b/data/pokemon/base_stats/doduo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 4, 6, 8, 9, 10, 20, 31, 32, 33, 34, 40, 43, 44, 49, 50, 52 ; end - diff --git a/data/pokemon/base_stats/donphan.inc b/data/pokemon/base_stats/donphan.inc index 6f26c957..94a841b1 100644 --- a/data/pokemon/base_stats/donphan.inc +++ b/data/pokemon/base_stats/donphan.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/dragonair.inc b/data/pokemon/base_stats/dragonair.inc index f37817bd..9db5a1ea 100644 --- a/data/pokemon/base_stats/dragonair.inc +++ b/data/pokemon/base_stats/dragonair.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 23, 24, 25, 31, 32, 33, 34, 38, 39, 40, 44, 45, 50, 53 ; end - diff --git a/data/pokemon/base_stats/dragonite.inc b/data/pokemon/base_stats/dragonite.inc index cde1577c..e95bd511 100644 --- a/data/pokemon/base_stats/dragonite.inc +++ b/data/pokemon/base_stats/dragonite.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 23, 24, 25, 31, 32, 33, 34, 38, 39, 40, 44, 45, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/dratini.inc b/data/pokemon/base_stats/dratini.inc index b3657c89..1a1f6998 100644 --- a/data/pokemon/base_stats/dratini.inc +++ b/data/pokemon/base_stats/dratini.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 20, 23, 24, 25, 31, 32, 33, 34, 38, 39, 40, 44, 45, 50, 53 ; end - diff --git a/data/pokemon/base_stats/drowzee.inc b/data/pokemon/base_stats/drowzee.inc index 133e791f..a07ac323 100644 --- a/data/pokemon/base_stats/drowzee.inc +++ b/data/pokemon/base_stats/drowzee.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 29, 30, 31, 32, 33, 34, 35, 40, 42, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/dugtrio.inc b/data/pokemon/base_stats/dugtrio.inc index a2bd9c9c..88be6841 100644 --- a/data/pokemon/base_stats/dugtrio.inc +++ b/data/pokemon/base_stats/dugtrio.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 26, 27, 28, 31, 32, 34, 44, 48, 50 ; end - diff --git a/data/pokemon/base_stats/dynabear.inc b/data/pokemon/base_stats/dynabear.inc index 244ecc54..4d363791 100644 --- a/data/pokemon/base_stats/dynabear.inc +++ b/data/pokemon/base_stats/dynabear.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/eevee.inc b/data/pokemon/base_stats/eevee.inc index d829acde..d4bedef8 100644 --- a/data/pokemon/base_stats/eevee.inc +++ b/data/pokemon/base_stats/eevee.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 31, 32, 33, 34, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/eifie.inc b/data/pokemon/base_stats/eifie.inc index 4922cb75..e972d27d 100644 --- a/data/pokemon/base_stats/eifie.inc +++ b/data/pokemon/base_stats/eifie.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/ekans.inc b/data/pokemon/base_stats/ekans.inc index 95137450..69573c92 100644 --- a/data/pokemon/base_stats/ekans.inc +++ b/data/pokemon/base_stats/ekans.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 21, 26, 27, 28, 31, 32, 34, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/eksing.inc b/data/pokemon/base_stats/eksing.inc index 7643e5e9..5c7a05bd 100644 --- a/data/pokemon/base_stats/eksing.inc +++ b/data/pokemon/base_stats/eksing.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/elebaby.inc b/data/pokemon/base_stats/elebaby.inc index adcd059b..26fddbfc 100644 --- a/data/pokemon/base_stats/elebaby.inc +++ b/data/pokemon/base_stats/elebaby.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/electabuzz.inc b/data/pokemon/base_stats/electabuzz.inc index 228ca9b0..40d5dcac 100644 --- a/data/pokemon/base_stats/electabuzz.inc +++ b/data/pokemon/base_stats/electabuzz.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 24, 25, 29, 30, 31, 32, 33, 34, 35, 39, 40, 44, 45, 46, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/electrode.inc b/data/pokemon/base_stats/electrode.inc index c5f963ea..f3bbca85 100644 --- a/data/pokemon/base_stats/electrode.inc +++ b/data/pokemon/base_stats/electrode.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 15, 20, 24, 25, 30, 31, 32, 33, 34, 36, 39, 40, 44, 45, 47, 50, 55 ; end - diff --git a/data/pokemon/base_stats/en.inc b/data/pokemon/base_stats/en.inc index 4cae6669..93bdc6eb 100644 --- a/data/pokemon/base_stats/en.inc +++ b/data/pokemon/base_stats/en.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/exeggcute.inc b/data/pokemon/base_stats/exeggcute.inc index 3e352bfe..9fd6df10 100644 --- a/data/pokemon/base_stats/exeggcute.inc +++ b/data/pokemon/base_stats/exeggcute.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 20, 29, 30, 31, 32, 33, 34, 36, 37, 44, 46, 47, 50 ; end - diff --git a/data/pokemon/base_stats/exeggutor.inc b/data/pokemon/base_stats/exeggutor.inc index ff06f603..071d9ecb 100644 --- a/data/pokemon/base_stats/exeggutor.inc +++ b/data/pokemon/base_stats/exeggutor.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 15, 20, 21, 22, 29, 30, 31, 32, 33, 34, 36, 37, 44, 46, 47, 50, 54 ; end - diff --git a/data/pokemon/base_stats/farfetchd.inc b/data/pokemon/base_stats/farfetchd.inc index d78d4278..6ce55341 100644 --- a/data/pokemon/base_stats/farfetchd.inc +++ b/data/pokemon/base_stats/farfetchd.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 3, 4, 6, 8, 9, 10, 20, 31, 32, 33, 34, 39, 40, 44, 50, 51, 52 ; end - diff --git a/data/pokemon/base_stats/fearow.inc b/data/pokemon/base_stats/fearow.inc index 7d9b7e26..b6741957 100644 --- a/data/pokemon/base_stats/fearow.inc +++ b/data/pokemon/base_stats/fearow.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 31, 32, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/flareon.inc b/data/pokemon/base_stats/flareon.inc index 66929f29..964efad3 100644 --- a/data/pokemon/base_stats/flareon.inc +++ b/data/pokemon/base_stats/flareon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/gastly.inc b/data/pokemon/base_stats/gastly.inc index c3049721..5c0e98d3 100644 --- a/data/pokemon/base_stats/gastly.inc +++ b/data/pokemon/base_stats/gastly.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 20, 21, 24, 25, 29, 31, 32, 34, 36, 42, 44, 46, 47, 50 ; end - diff --git a/data/pokemon/base_stats/gengar.inc b/data/pokemon/base_stats/gengar.inc index 86367528..b0a9ecbf 100644 --- a/data/pokemon/base_stats/gengar.inc +++ b/data/pokemon/base_stats/gengar.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 21, 24, 25, 29, 31, 32, 34, 35, 36, 40, 42, 44, 46, 47, 50, 54 ; end - diff --git a/data/pokemon/base_stats/geodude.inc b/data/pokemon/base_stats/geodude.inc index 7aa0baf1..3a6a2b5f 100644 --- a/data/pokemon/base_stats/geodude.inc +++ b/data/pokemon/base_stats/geodude.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 6, 8, 9, 10, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 36, 38, 44, 47, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/gift.inc b/data/pokemon/base_stats/gift.inc index 52ad299b..553f9810 100644 --- a/data/pokemon/base_stats/gift.inc +++ b/data/pokemon/base_stats/gift.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/gloom.inc b/data/pokemon/base_stats/gloom.inc index adb99fbf..2667e3e2 100644 --- a/data/pokemon/base_stats/gloom.inc +++ b/data/pokemon/base_stats/gloom.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/golbat.inc b/data/pokemon/base_stats/golbat.inc index 83863a93..0914eafb 100644 --- a/data/pokemon/base_stats/golbat.inc +++ b/data/pokemon/base_stats/golbat.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 21, 31, 32, 34, 39, 44, 50 ; end - diff --git a/data/pokemon/base_stats/goldeen.inc b/data/pokemon/base_stats/goldeen.inc index 13ab74c4..e7001b0b 100644 --- a/data/pokemon/base_stats/goldeen.inc +++ b/data/pokemon/base_stats/goldeen.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 9, 10, 11, 12, 13, 14, 20, 31, 32, 34, 39, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/golduck.inc b/data/pokemon/base_stats/golduck.inc index d259840f..298d6590 100644 --- a/data/pokemon/base_stats/golduck.inc +++ b/data/pokemon/base_stats/golduck.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 28, 31, 32, 34, 39, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/golem.inc b/data/pokemon/base_stats/golem.inc index 8bdc8950..7e59bbb6 100644 --- a/data/pokemon/base_stats/golem.inc +++ b/data/pokemon/base_stats/golem.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 36, 38, 44, 47, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/gongu.inc b/data/pokemon/base_stats/gongu.inc index 4b500990..1bfa7e81 100644 --- a/data/pokemon/base_stats/gongu.inc +++ b/data/pokemon/base_stats/gongu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/graveler.inc b/data/pokemon/base_stats/graveler.inc index e5665e8a..972f2e51 100644 --- a/data/pokemon/base_stats/graveler.inc +++ b/data/pokemon/base_stats/graveler.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 6, 8, 9, 10, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 36, 38, 44, 47, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/grimer.inc b/data/pokemon/base_stats/grimer.inc index 769ff052..d684daa5 100644 --- a/data/pokemon/base_stats/grimer.inc +++ b/data/pokemon/base_stats/grimer.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 20, 21, 24, 25, 31, 32, 34, 36, 38, 44, 47, 50 ; end - diff --git a/data/pokemon/base_stats/grotess.inc b/data/pokemon/base_stats/grotess.inc index 27974daf..636e4c0e 100644 --- a/data/pokemon/base_stats/grotess.inc +++ b/data/pokemon/base_stats/grotess.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/growlithe.inc b/data/pokemon/base_stats/growlithe.inc index 2243ee41..a0e6db6b 100644 --- a/data/pokemon/base_stats/growlithe.inc +++ b/data/pokemon/base_stats/growlithe.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 23, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/gyarados.inc b/data/pokemon/base_stats/gyarados.inc index 7247a5ae..1bee417b 100644 --- a/data/pokemon/base_stats/gyarados.inc +++ b/data/pokemon/base_stats/gyarados.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 15, 20, 23, 24, 25, 31, 32, 33, 34, 38, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/gyopin.inc b/data/pokemon/base_stats/gyopin.inc index 43075d1e..fef6d1fd 100644 --- a/data/pokemon/base_stats/gyopin.inc +++ b/data/pokemon/base_stats/gyopin.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/haganeil.inc b/data/pokemon/base_stats/haganeil.inc index fa09885e..3098457b 100644 --- a/data/pokemon/base_stats/haganeil.inc +++ b/data/pokemon/base_stats/haganeil.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/hanamogura.inc b/data/pokemon/base_stats/hanamogura.inc index 03f53aad..d4bf4f35 100644 --- a/data/pokemon/base_stats/hanamogura.inc +++ b/data/pokemon/base_stats/hanamogura.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/hanaryu.inc b/data/pokemon/base_stats/hanaryu.inc index 5b8f2cff..b33942b9 100644 --- a/data/pokemon/base_stats/hanaryu.inc +++ b/data/pokemon/base_stats/hanaryu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/haneei.inc b/data/pokemon/base_stats/haneei.inc index 026c5f3b..63206b53 100644 --- a/data/pokemon/base_stats/haneei.inc +++ b/data/pokemon/base_stats/haneei.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/haneko.inc b/data/pokemon/base_stats/haneko.inc index 69329eca..7b591c38 100644 --- a/data/pokemon/base_stats/haneko.inc +++ b/data/pokemon/base_stats/haneko.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/happa.inc b/data/pokemon/base_stats/happa.inc index a8d4c226..2f1c0f1f 100644 --- a/data/pokemon/base_stats/happa.inc +++ b/data/pokemon/base_stats/happa.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/happi.inc b/data/pokemon/base_stats/happi.inc index 5c2a7a49..7fab73c8 100644 --- a/data/pokemon/base_stats/happi.inc +++ b/data/pokemon/base_stats/happi.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/haunter.inc b/data/pokemon/base_stats/haunter.inc index 63395f71..8a30fdee 100644 --- a/data/pokemon/base_stats/haunter.inc +++ b/data/pokemon/base_stats/haunter.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 20, 21, 24, 25, 29, 31, 32, 34, 36, 42, 44, 46, 47, 50 ; end - diff --git a/data/pokemon/base_stats/helgaa.inc b/data/pokemon/base_stats/helgaa.inc index e4339ebc..d0a303b6 100644 --- a/data/pokemon/base_stats/helgaa.inc +++ b/data/pokemon/base_stats/helgaa.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/hinazu.inc b/data/pokemon/base_stats/hinazu.inc index e6369724..80113c3e 100644 --- a/data/pokemon/base_stats/hinazu.inc +++ b/data/pokemon/base_stats/hinazu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/hitmonchan.inc b/data/pokemon/base_stats/hitmonchan.inc index 26e111a3..91c7ff89 100644 --- a/data/pokemon/base_stats/hitmonchan.inc +++ b/data/pokemon/base_stats/hitmonchan.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 31, 32, 34, 35, 39, 40, 44, 50, 54 ; end - diff --git a/data/pokemon/base_stats/hitmonlee.inc b/data/pokemon/base_stats/hitmonlee.inc index d6091521..3f9538be 100644 --- a/data/pokemon/base_stats/hitmonlee.inc +++ b/data/pokemon/base_stats/hitmonlee.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 31, 32, 34, 35, 39, 40, 44, 50, 54 ; end - diff --git a/data/pokemon/base_stats/hoho.inc b/data/pokemon/base_stats/hoho.inc index 4b49c744..670ea137 100644 --- a/data/pokemon/base_stats/hoho.inc +++ b/data/pokemon/base_stats/hoho.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/honoguma.inc b/data/pokemon/base_stats/honoguma.inc index 40149b46..6eff7753 100644 --- a/data/pokemon/base_stats/honoguma.inc +++ b/data/pokemon/base_stats/honoguma.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/horsea.inc b/data/pokemon/base_stats/horsea.inc index cd908252..4c32b2fd 100644 --- a/data/pokemon/base_stats/horsea.inc +++ b/data/pokemon/base_stats/horsea.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 20, 31, 32, 34, 39, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/houou.inc b/data/pokemon/base_stats/houou.inc index 799c7f3f..6ec07d18 100644 --- a/data/pokemon/base_stats/houou.inc +++ b/data/pokemon/base_stats/houou.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/hypno.inc b/data/pokemon/base_stats/hypno.inc index 35622843..d121d600 100644 --- a/data/pokemon/base_stats/hypno.inc +++ b/data/pokemon/base_stats/hypno.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 29, 30, 31, 32, 33, 34, 35, 40, 42, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/ikari.inc b/data/pokemon/base_stats/ikari.inc index 1260670a..93a6d95c 100644 --- a/data/pokemon/base_stats/ikari.inc +++ b/data/pokemon/base_stats/ikari.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/ivysaur.inc b/data/pokemon/base_stats/ivysaur.inc index 6f815d99..d28317c9 100644 --- a/data/pokemon/base_stats/ivysaur.inc +++ b/data/pokemon/base_stats/ivysaur.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/jaranra.inc b/data/pokemon/base_stats/jaranra.inc index ef9c8f60..17d99a75 100644 --- a/data/pokemon/base_stats/jaranra.inc +++ b/data/pokemon/base_stats/jaranra.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/jigglypuff.inc b/data/pokemon/base_stats/jigglypuff.inc index 6dcfa90d..49b15a32 100644 --- a/data/pokemon/base_stats/jigglypuff.inc +++ b/data/pokemon/base_stats/jigglypuff.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/jolteon.inc b/data/pokemon/base_stats/jolteon.inc index 31f38905..0093a8a0 100644 --- a/data/pokemon/base_stats/jolteon.inc +++ b/data/pokemon/base_stats/jolteon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 24, 25, 31, 32, 33, 34, 39, 40, 44, 45, 50, 55 ; end - diff --git a/data/pokemon/base_stats/jynx.inc b/data/pokemon/base_stats/jynx.inc index a8d0eb80..ef94271e 100644 --- a/data/pokemon/base_stats/jynx.inc +++ b/data/pokemon/base_stats/jynx.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 29, 30, 31, 32, 33, 34, 35, 40, 44, 46, 50 ; end - diff --git a/data/pokemon/base_stats/kabuto.inc b/data/pokemon/base_stats/kabuto.inc index 00ef4cef..d7359d50 100644 --- a/data/pokemon/base_stats/kabuto.inc +++ b/data/pokemon/base_stats/kabuto.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 20, 31, 32, 33, 34, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/kabutops.inc b/data/pokemon/base_stats/kabutops.inc index 4c73947b..06bd6f7a 100644 --- a/data/pokemon/base_stats/kabutops.inc +++ b/data/pokemon/base_stats/kabutops.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 3, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 20, 31, 32, 33, 34, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/kadabra.inc b/data/pokemon/base_stats/kadabra.inc index e099c4e9..4cb66539 100644 --- a/data/pokemon/base_stats/kadabra.inc +++ b/data/pokemon/base_stats/kadabra.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 28, 29, 30, 31, 32, 33, 34, 35, 40, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/kakuna.inc b/data/pokemon/base_stats/kakuna.inc index a762b11d..bd4e929a 100644 --- a/data/pokemon/base_stats/kakuna.inc +++ b/data/pokemon/base_stats/kakuna.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/kangaskhan.inc b/data/pokemon/base_stats/kangaskhan.inc index 19069d95..596e7db8 100644 --- a/data/pokemon/base_stats/kangaskhan.inc +++ b/data/pokemon/base_stats/kangaskhan.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 24, 25, 26, 27, 31, 32, 34, 38, 40, 44, 48, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/kapoerer.inc b/data/pokemon/base_stats/kapoerer.inc index dd47e0bb..d61c59d2 100644 --- a/data/pokemon/base_stats/kapoerer.inc +++ b/data/pokemon/base_stats/kapoerer.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kingdra.inc b/data/pokemon/base_stats/kingdra.inc index 0efbc972..382adca8 100644 --- a/data/pokemon/base_stats/kingdra.inc +++ b/data/pokemon/base_stats/kingdra.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kingler.inc b/data/pokemon/base_stats/kingler.inc index a80f65d5..caebcf9a 100644 --- a/data/pokemon/base_stats/kingler.inc +++ b/data/pokemon/base_stats/kingler.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 11, 12, 13, 14, 15, 20, 31, 32, 34, 44, 50, 51, 53, 54 ; end - diff --git a/data/pokemon/base_stats/kireihana.inc b/data/pokemon/base_stats/kireihana.inc index cbf8a4cb..a0d7d303 100644 --- a/data/pokemon/base_stats/kireihana.inc +++ b/data/pokemon/base_stats/kireihana.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kirinriki.inc b/data/pokemon/base_stats/kirinriki.inc index 400a8077..08895093 100644 --- a/data/pokemon/base_stats/kirinriki.inc +++ b/data/pokemon/base_stats/kirinriki.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/koffing.inc b/data/pokemon/base_stats/koffing.inc index ffc1be76..a2882d75 100644 --- a/data/pokemon/base_stats/koffing.inc +++ b/data/pokemon/base_stats/koffing.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 20, 24, 25, 31, 32, 34, 36, 38, 44, 47, 50 ; end - diff --git a/data/pokemon/base_stats/kokumo.inc b/data/pokemon/base_stats/kokumo.inc index fa1efb9d..ea65838b 100644 --- a/data/pokemon/base_stats/kokumo.inc +++ b/data/pokemon/base_stats/kokumo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kotora.inc b/data/pokemon/base_stats/kotora.inc index b60e4f31..995cf837 100644 --- a/data/pokemon/base_stats/kotora.inc +++ b/data/pokemon/base_stats/kotora.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kounya.inc b/data/pokemon/base_stats/kounya.inc index d537820e..b7824635 100644 --- a/data/pokemon/base_stats/kounya.inc +++ b/data/pokemon/base_stats/kounya.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/krabby.inc b/data/pokemon/base_stats/krabby.inc index a1e78ed8..321f3ba6 100644 --- a/data/pokemon/base_stats/krabby.inc +++ b/data/pokemon/base_stats/krabby.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 11, 12, 13, 14, 20, 31, 32, 34, 44, 50, 51, 53, 54 ; end - diff --git a/data/pokemon/base_stats/kurusu.inc b/data/pokemon/base_stats/kurusu.inc index f8189b19..835bc034 100644 --- a/data/pokemon/base_stats/kurusu.inc +++ b/data/pokemon/base_stats/kurusu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/kyonpan.inc b/data/pokemon/base_stats/kyonpan.inc index 63011c8f..a0464f18 100644 --- a/data/pokemon/base_stats/kyonpan.inc +++ b/data/pokemon/base_stats/kyonpan.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/lapras.inc b/data/pokemon/base_stats/lapras.inc index dcf01414..64b1e4ee 100644 --- a/data/pokemon/base_stats/lapras.inc +++ b/data/pokemon/base_stats/lapras.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 22, 23, 24, 25, 29, 31, 32, 33, 34, 40, 44, 46, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/leafy.inc b/data/pokemon/base_stats/leafy.inc index f04cc6ec..d438c7ef 100644 --- a/data/pokemon/base_stats/leafy.inc +++ b/data/pokemon/base_stats/leafy.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/lickitung.inc b/data/pokemon/base_stats/lickitung.inc index 1f61a92a..2b8c5ce6 100644 --- a/data/pokemon/base_stats/lickitung.inc +++ b/data/pokemon/base_stats/lickitung.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 3, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 24, 25, 26, 27, 31, 32, 34, 38, 40, 44, 50, 51, 53, 54 ; end - diff --git a/data/pokemon/base_stats/lip.inc b/data/pokemon/base_stats/lip.inc index c86580ba..0add0408 100644 --- a/data/pokemon/base_stats/lip.inc +++ b/data/pokemon/base_stats/lip.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/machamp.inc b/data/pokemon/base_stats/machamp.inc index 691fc698..47176eca 100644 --- a/data/pokemon/base_stats/machamp.inc +++ b/data/pokemon/base_stats/machamp.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 38, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/machoke.inc b/data/pokemon/base_stats/machoke.inc index fc942ef5..248d4e58 100644 --- a/data/pokemon/base_stats/machoke.inc +++ b/data/pokemon/base_stats/machoke.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 38, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/machop.inc b/data/pokemon/base_stats/machop.inc index 530c77f8..8aa5c8f4 100644 --- a/data/pokemon/base_stats/machop.inc +++ b/data/pokemon/base_stats/machop.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 38, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/madame.inc b/data/pokemon/base_stats/madame.inc index e3de03ef..1f9b8ef5 100644 --- a/data/pokemon/base_stats/madame.inc +++ b/data/pokemon/base_stats/madame.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/magikarp.inc b/data/pokemon/base_stats/magikarp.inc index dbccb02e..a45bec44 100644 --- a/data/pokemon/base_stats/magikarp.inc +++ b/data/pokemon/base_stats/magikarp.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/magmar.inc b/data/pokemon/base_stats/magmar.inc index 4a417dcd..dc4347df 100644 --- a/data/pokemon/base_stats/magmar.inc +++ b/data/pokemon/base_stats/magmar.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 29, 30, 31, 32, 34, 35, 38, 40, 44, 46, 50, 54 ; end - diff --git a/data/pokemon/base_stats/magnemite.inc b/data/pokemon/base_stats/magnemite.inc index 8dad6c9e..59f22b32 100644 --- a/data/pokemon/base_stats/magnemite.inc +++ b/data/pokemon/base_stats/magnemite.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 20, 24, 25, 30, 31, 32, 33, 34, 39, 44, 45, 50, 55 ; end - diff --git a/data/pokemon/base_stats/magneton.inc b/data/pokemon/base_stats/magneton.inc index f789b651..e1e48eb4 100644 --- a/data/pokemon/base_stats/magneton.inc +++ b/data/pokemon/base_stats/magneton.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 15, 20, 24, 25, 30, 31, 32, 33, 34, 39, 44, 45, 50, 55 ; end - diff --git a/data/pokemon/base_stats/manbo1.inc b/data/pokemon/base_stats/manbo1.inc index 4e38a6f6..e3bfa135 100644 --- a/data/pokemon/base_stats/manbo1.inc +++ b/data/pokemon/base_stats/manbo1.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mankey.inc b/data/pokemon/base_stats/mankey.inc index c82f3dc6..474b4deb 100644 --- a/data/pokemon/base_stats/mankey.inc +++ b/data/pokemon/base_stats/mankey.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 16, 17, 18, 19, 20, 24, 25, 28, 31, 32, 34, 35, 39, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/maril.inc b/data/pokemon/base_stats/maril.inc index 32f94824..2039045f 100644 --- a/data/pokemon/base_stats/maril.inc +++ b/data/pokemon/base_stats/maril.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/marowak.inc b/data/pokemon/base_stats/marowak.inc index d8dab1dd..88399ca6 100644 --- a/data/pokemon/base_stats/marowak.inc +++ b/data/pokemon/base_stats/marowak.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 38, 40, 44, 50, 54 ; end - diff --git a/data/pokemon/base_stats/meowth.inc b/data/pokemon/base_stats/meowth.inc index 1806a088..b8f720d3 100644 --- a/data/pokemon/base_stats/meowth.inc +++ b/data/pokemon/base_stats/meowth.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 16, 20, 24, 25, 31, 32, 34, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/metapod.inc b/data/pokemon/base_stats/metapod.inc index 6aaa05ee..477a2f2c 100644 --- a/data/pokemon/base_stats/metapod.inc +++ b/data/pokemon/base_stats/metapod.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/mew.inc b/data/pokemon/base_stats/mew.inc index 9d080562..aabae855 100644 --- a/data/pokemon/base_stats/mew.inc +++ b/data/pokemon/base_stats/mew.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mewtwo.inc b/data/pokemon/base_stats/mewtwo.inc index d773b294..143c22aa 100644 --- a/data/pokemon/base_stats/mewtwo.inc +++ b/data/pokemon/base_stats/mewtwo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mikon.inc b/data/pokemon/base_stats/mikon.inc index eaf77fa8..5117e041 100644 --- a/data/pokemon/base_stats/mikon.inc +++ b/data/pokemon/base_stats/mikon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/miltank.inc b/data/pokemon/base_stats/miltank.inc index 565db810..f829ad19 100644 --- a/data/pokemon/base_stats/miltank.inc +++ b/data/pokemon/base_stats/miltank.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mitsuboshi.inc b/data/pokemon/base_stats/mitsuboshi.inc index aa6741f1..6a38ccbd 100644 --- a/data/pokemon/base_stats/mitsuboshi.inc +++ b/data/pokemon/base_stats/mitsuboshi.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mizuuo.inc b/data/pokemon/base_stats/mizuuo.inc index 4ee970e0..507d92f6 100644 --- a/data/pokemon/base_stats/mizuuo.inc +++ b/data/pokemon/base_stats/mizuuo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mokoko.inc b/data/pokemon/base_stats/mokoko.inc index 8e03228c..aef52071 100644 --- a/data/pokemon/base_stats/mokoko.inc +++ b/data/pokemon/base_stats/mokoko.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/moltres.inc b/data/pokemon/base_stats/moltres.inc index e9e1cec5..188a5e64 100644 --- a/data/pokemon/base_stats/moltres.inc +++ b/data/pokemon/base_stats/moltres.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 31, 32, 33, 34, 38, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/monja.inc b/data/pokemon/base_stats/monja.inc index ffe3f531..cbcd4e63 100644 --- a/data/pokemon/base_stats/monja.inc +++ b/data/pokemon/base_stats/monja.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/mrmime.inc b/data/pokemon/base_stats/mrmime.inc index 859feab6..20d6f22d 100644 --- a/data/pokemon/base_stats/mrmime.inc +++ b/data/pokemon/base_stats/mrmime.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 40, 44, 45, 46, 50, 55 ; end - diff --git a/data/pokemon/base_stats/muk.inc b/data/pokemon/base_stats/muk.inc index 319c5ee1..f58c2035 100644 --- a/data/pokemon/base_stats/muk.inc +++ b/data/pokemon/base_stats/muk.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 15, 20, 21, 24, 25, 31, 32, 34, 36, 38, 44, 47, 50 ; end - diff --git a/data/pokemon/base_stats/nameil.inc b/data/pokemon/base_stats/nameil.inc index ad8812e8..cc064e0c 100644 --- a/data/pokemon/base_stats/nameil.inc +++ b/data/pokemon/base_stats/nameil.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/natio.inc b/data/pokemon/base_stats/natio.inc index fedd462a..2be2fec2 100644 --- a/data/pokemon/base_stats/natio.inc +++ b/data/pokemon/base_stats/natio.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/naty.inc b/data/pokemon/base_stats/naty.inc index ee6307b6..634766cf 100644 --- a/data/pokemon/base_stats/naty.inc +++ b/data/pokemon/base_stats/naty.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/nidoking.inc b/data/pokemon/base_stats/nidoking.inc index be71dfc2..3cae5ecd 100644 --- a/data/pokemon/base_stats/nidoking.inc +++ b/data/pokemon/base_stats/nidoking.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 24, 25, 26, 27, 31, 32, 33, 34, 38, 40, 44, 48, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/nidoqueen.inc b/data/pokemon/base_stats/nidoqueen.inc index f8cf6f0b..7ad646ca 100644 --- a/data/pokemon/base_stats/nidoqueen.inc +++ b/data/pokemon/base_stats/nidoqueen.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 24, 25, 26, 27, 31, 32, 33, 34, 38, 40, 44, 48, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/nidoran_f.inc b/data/pokemon/base_stats/nidoran_f.inc index aeab3913..726c4a53 100644 --- a/data/pokemon/base_stats/nidoran_f.inc +++ b/data/pokemon/base_stats/nidoran_f.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 14, 20, 24, 25, 31, 32, 33, 34, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/nidoran_m.inc b/data/pokemon/base_stats/nidoran_m.inc index 829e9bb9..da2ae897 100644 --- a/data/pokemon/base_stats/nidoran_m.inc +++ b/data/pokemon/base_stats/nidoran_m.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 14, 20, 24, 25, 31, 32, 33, 34, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/nidorina.inc b/data/pokemon/base_stats/nidorina.inc index 247a03ef..f1795a96 100644 --- a/data/pokemon/base_stats/nidorina.inc +++ b/data/pokemon/base_stats/nidorina.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 24, 25, 31, 32, 33, 34, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/nidorino.inc b/data/pokemon/base_stats/nidorino.inc index fe89c83f..c312a29f 100644 --- a/data/pokemon/base_stats/nidorino.inc +++ b/data/pokemon/base_stats/nidorino.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 24, 25, 31, 32, 33, 34, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/ninetales.inc b/data/pokemon/base_stats/ninetales.inc index 0f002c3c..f6f9339a 100644 --- a/data/pokemon/base_stats/ninetales.inc +++ b/data/pokemon/base_stats/ninetales.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 15, 20, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/norowara.inc b/data/pokemon/base_stats/norowara.inc index 0857dded..1ebe0622 100644 --- a/data/pokemon/base_stats/norowara.inc +++ b/data/pokemon/base_stats/norowara.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/nyorotono.inc b/data/pokemon/base_stats/nyorotono.inc index efb31609..d87fac8a 100644 --- a/data/pokemon/base_stats/nyorotono.inc +++ b/data/pokemon/base_stats/nyorotono.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/nyula.inc b/data/pokemon/base_stats/nyula.inc index d6a3cfbd..a4d554dc 100644 --- a/data/pokemon/base_stats/nyula.inc +++ b/data/pokemon/base_stats/nyula.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/oddish.inc b/data/pokemon/base_stats/oddish.inc index be2da4b7..42b2fab7 100644 --- a/data/pokemon/base_stats/oddish.inc +++ b/data/pokemon/base_stats/oddish.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/okutank.inc b/data/pokemon/base_stats/okutank.inc index 31dc176a..ed9880c6 100644 --- a/data/pokemon/base_stats/okutank.inc +++ b/data/pokemon/base_stats/okutank.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/omanyte.inc b/data/pokemon/base_stats/omanyte.inc index 7fc17fff..ba273b1e 100644 --- a/data/pokemon/base_stats/omanyte.inc +++ b/data/pokemon/base_stats/omanyte.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 20, 31, 32, 33, 34, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/omastar.inc b/data/pokemon/base_stats/omastar.inc index 110f7f09..fac4e681 100644 --- a/data/pokemon/base_stats/omastar.inc +++ b/data/pokemon/base_stats/omastar.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 20, 31, 32, 33, 34, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/onix.inc b/data/pokemon/base_stats/onix.inc index 57e2a37c..ee10ddfc 100644 --- a/data/pokemon/base_stats/onix.inc +++ b/data/pokemon/base_stats/onix.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 26, 27, 28, 31, 32, 34, 36, 40, 44, 47, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/pachimee.inc b/data/pokemon/base_stats/pachimee.inc index 2623a6f3..4103b955 100644 --- a/data/pokemon/base_stats/pachimee.inc +++ b/data/pokemon/base_stats/pachimee.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/painter.inc b/data/pokemon/base_stats/painter.inc index c1d5814d..02f7f2bf 100644 --- a/data/pokemon/base_stats/painter.inc +++ b/data/pokemon/base_stats/painter.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/paon.inc b/data/pokemon/base_stats/paon.inc index be60ab8f..7aa94803 100644 --- a/data/pokemon/base_stats/paon.inc +++ b/data/pokemon/base_stats/paon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/para.inc b/data/pokemon/base_stats/para.inc index 84c5ea57..5f1c6219 100644 --- a/data/pokemon/base_stats/para.inc +++ b/data/pokemon/base_stats/para.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/paras.inc b/data/pokemon/base_stats/paras.inc index 2a289a37..521a9780 100644 --- a/data/pokemon/base_stats/paras.inc +++ b/data/pokemon/base_stats/paras.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 20, 21, 22, 28, 31, 32, 33, 34, 40, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/parasect.inc b/data/pokemon/base_stats/parasect.inc index 5d8492a6..ac061814 100644 --- a/data/pokemon/base_stats/parasect.inc +++ b/data/pokemon/base_stats/parasect.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 20, 21, 22, 28, 31, 32, 33, 34, 40, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/persian.inc b/data/pokemon/base_stats/persian.inc index 42d33847..9bdc471d 100644 --- a/data/pokemon/base_stats/persian.inc +++ b/data/pokemon/base_stats/persian.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 15, 16, 20, 24, 25, 31, 32, 34, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/pichu.inc b/data/pokemon/base_stats/pichu.inc index aa8b18a8..c70ac3f6 100644 --- a/data/pokemon/base_stats/pichu.inc +++ b/data/pokemon/base_stats/pichu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/pidgeot.inc b/data/pokemon/base_stats/pidgeot.inc index 1dfa802e..283f9b75 100644 --- a/data/pokemon/base_stats/pidgeot.inc +++ b/data/pokemon/base_stats/pidgeot.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 31, 32, 33, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/pidgeotto.inc b/data/pokemon/base_stats/pidgeotto.inc index 32544e75..06bcb070 100644 --- a/data/pokemon/base_stats/pidgeotto.inc +++ b/data/pokemon/base_stats/pidgeotto.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 20, 31, 32, 33, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/pidgey.inc b/data/pokemon/base_stats/pidgey.inc index 76c613c1..f62eb08c 100644 --- a/data/pokemon/base_stats/pidgey.inc +++ b/data/pokemon/base_stats/pidgey.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 20, 31, 32, 33, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/pikachu.inc b/data/pokemon/base_stats/pikachu.inc index 522efa15..30316b2c 100644 --- a/data/pokemon/base_stats/pikachu.inc +++ b/data/pokemon/base_stats/pikachu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 16, 17, 19, 20, 24, 25, 31, 32, 33, 34, 39, 40, 44, 45, 50, 55 ; end - diff --git a/data/pokemon/base_stats/pinsir.inc b/data/pokemon/base_stats/pinsir.inc index 15fb8ac0..7feb11d4 100644 --- a/data/pokemon/base_stats/pinsir.inc +++ b/data/pokemon/base_stats/pinsir.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 17, 19, 20, 31, 32, 34, 44, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/poliwag.inc b/data/pokemon/base_stats/poliwag.inc index c71c47bf..96343ad4 100644 --- a/data/pokemon/base_stats/poliwag.inc +++ b/data/pokemon/base_stats/poliwag.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 20, 29, 31, 32, 34, 40, 44, 46, 50, 53 ; end - diff --git a/data/pokemon/base_stats/poliwhirl.inc b/data/pokemon/base_stats/poliwhirl.inc index 8ef9f437..ac6d76de 100644 --- a/data/pokemon/base_stats/poliwhirl.inc +++ b/data/pokemon/base_stats/poliwhirl.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 26, 27, 29, 31, 32, 34, 35, 40, 44, 46, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/poliwrath.inc b/data/pokemon/base_stats/poliwrath.inc index e15d1f80..654c4abe 100644 --- a/data/pokemon/base_stats/poliwrath.inc +++ b/data/pokemon/base_stats/poliwrath.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 26, 27, 29, 31, 32, 34, 35, 40, 44, 46, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/ponyta.inc b/data/pokemon/base_stats/ponyta.inc index bdb45c34..b9f8900c 100644 --- a/data/pokemon/base_stats/ponyta.inc +++ b/data/pokemon/base_stats/ponyta.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 20, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/poponeko.inc b/data/pokemon/base_stats/poponeko.inc index 7041228a..7dc14699 100644 --- a/data/pokemon/base_stats/poponeko.inc +++ b/data/pokemon/base_stats/poponeko.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/porygon.inc b/data/pokemon/base_stats/porygon.inc index c86389ef..c902227b 100644 --- a/data/pokemon/base_stats/porygon.inc +++ b/data/pokemon/base_stats/porygon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 14, 15, 20, 24, 25, 29, 30, 31, 32, 33, 34, 39, 40, 44, 45, 46, 49, 50, 55 ; end - diff --git a/data/pokemon/base_stats/porygon2.inc b/data/pokemon/base_stats/porygon2.inc index dd0e5f7d..98c77d71 100644 --- a/data/pokemon/base_stats/porygon2.inc +++ b/data/pokemon/base_stats/porygon2.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/primeape.inc b/data/pokemon/base_stats/primeape.inc index beed2b17..789c0a2b 100644 --- a/data/pokemon/base_stats/primeape.inc +++ b/data/pokemon/base_stats/primeape.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 16, 17, 18, 19, 20, 24, 25, 28, 31, 32, 34, 35, 39, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/psyduck.inc b/data/pokemon/base_stats/psyduck.inc index 9844045c..4007ce76 100644 --- a/data/pokemon/base_stats/psyduck.inc +++ b/data/pokemon/base_stats/psyduck.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 28, 31, 32, 34, 39, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/puchicorn.inc b/data/pokemon/base_stats/puchicorn.inc index df8dfeec..19918d4d 100644 --- a/data/pokemon/base_stats/puchicorn.inc +++ b/data/pokemon/base_stats/puchicorn.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/pudie.inc b/data/pokemon/base_stats/pudie.inc index 18cbbdad..a11f258f 100644 --- a/data/pokemon/base_stats/pudie.inc +++ b/data/pokemon/base_stats/pudie.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/puku.inc b/data/pokemon/base_stats/puku.inc index c614ba3a..bf3ca197 100644 --- a/data/pokemon/base_stats/puku.inc +++ b/data/pokemon/base_stats/puku.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/pupurin.inc b/data/pokemon/base_stats/pupurin.inc index 4e5b3be0..1beb63ec 100644 --- a/data/pokemon/base_stats/pupurin.inc +++ b/data/pokemon/base_stats/pupurin.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/purakkusu.inc b/data/pokemon/base_stats/purakkusu.inc index 495a39c2..6e20dbdb 100644 --- a/data/pokemon/base_stats/purakkusu.inc +++ b/data/pokemon/base_stats/purakkusu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/py.inc b/data/pokemon/base_stats/py.inc index f2fcc9d6..d9e6af33 100644 --- a/data/pokemon/base_stats/py.inc +++ b/data/pokemon/base_stats/py.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/rai.inc b/data/pokemon/base_stats/rai.inc index 0d39a243..91e7ff6d 100644 --- a/data/pokemon/base_stats/rai.inc +++ b/data/pokemon/base_stats/rai.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/raichu.inc b/data/pokemon/base_stats/raichu.inc index c1213c45..345e266b 100644 --- a/data/pokemon/base_stats/raichu.inc +++ b/data/pokemon/base_stats/raichu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 15, 16, 17, 19, 20, 24, 25, 31, 32, 33, 34, 39, 40, 44, 45, 50, 55 ; end - diff --git a/data/pokemon/base_stats/raitora.inc b/data/pokemon/base_stats/raitora.inc index e312b8d7..5d639437 100644 --- a/data/pokemon/base_stats/raitora.inc +++ b/data/pokemon/base_stats/raitora.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/rapidash.inc b/data/pokemon/base_stats/rapidash.inc index 9676508c..f069d8ac 100644 --- a/data/pokemon/base_stats/rapidash.inc +++ b/data/pokemon/base_stats/rapidash.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 15, 20, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/raticate.inc b/data/pokemon/base_stats/raticate.inc index b3037da0..19a849db 100644 --- a/data/pokemon/base_stats/raticate.inc +++ b/data/pokemon/base_stats/raticate.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 15, 20, 24, 25, 28, 31, 32, 34, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/rattata.inc b/data/pokemon/base_stats/rattata.inc index 742fdb31..0d438dfe 100644 --- a/data/pokemon/base_stats/rattata.inc +++ b/data/pokemon/base_stats/rattata.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 14, 20, 24, 25, 28, 31, 32, 34, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/rediba.inc b/data/pokemon/base_stats/rediba.inc index 966ee8c5..556b8bf2 100644 --- a/data/pokemon/base_stats/rediba.inc +++ b/data/pokemon/base_stats/rediba.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/rhydon.inc b/data/pokemon/base_stats/rhydon.inc index 8829358e..e1a8545b 100644 --- a/data/pokemon/base_stats/rhydon.inc +++ b/data/pokemon/base_stats/rhydon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 24, 25, 26, 27, 28, 31, 32, 34, 38, 40, 44, 48, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/rhyhorn.inc b/data/pokemon/base_stats/rhyhorn.inc index 6f5cd757..b43d9aa4 100644 --- a/data/pokemon/base_stats/rhyhorn.inc +++ b/data/pokemon/base_stats/rhyhorn.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 20, 24, 25, 26, 27, 28, 31, 32, 34, 38, 40, 44, 48, 50, 54 ; end - diff --git a/data/pokemon/base_stats/rinrin.inc b/data/pokemon/base_stats/rinrin.inc index 60761122..25371235 100644 --- a/data/pokemon/base_stats/rinrin.inc +++ b/data/pokemon/base_stats/rinrin.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/sandshrew.inc b/data/pokemon/base_stats/sandshrew.inc index beb8a747..c1315c45 100644 --- a/data/pokemon/base_stats/sandshrew.inc +++ b/data/pokemon/base_stats/sandshrew.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 17, 19, 20, 26, 27, 28, 31, 32, 34, 39, 40, 44, 48, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/sandslash.inc b/data/pokemon/base_stats/sandslash.inc index 3aa2905b..9c0a684a 100644 --- a/data/pokemon/base_stats/sandslash.inc +++ b/data/pokemon/base_stats/sandslash.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 17, 19, 20, 26, 27, 28, 31, 32, 34, 39, 40, 44, 48, 50, 51, 54 ; end - diff --git a/data/pokemon/base_stats/scissors.inc b/data/pokemon/base_stats/scissors.inc index 8ee0f352..6beef6b2 100644 --- a/data/pokemon/base_stats/scissors.inc +++ b/data/pokemon/base_stats/scissors.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/scyther.inc b/data/pokemon/base_stats/scyther.inc index ba4d9f4c..ddbf858a 100644 --- a/data/pokemon/base_stats/scyther.inc +++ b/data/pokemon/base_stats/scyther.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 15, 20, 31, 32, 34, 39, 40, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/seadra.inc b/data/pokemon/base_stats/seadra.inc index 7810d619..22ad5135 100644 --- a/data/pokemon/base_stats/seadra.inc +++ b/data/pokemon/base_stats/seadra.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 15, 20, 31, 32, 34, 39, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/seaking.inc b/data/pokemon/base_stats/seaking.inc index a8541edd..a100685b 100644 --- a/data/pokemon/base_stats/seaking.inc +++ b/data/pokemon/base_stats/seaking.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 9, 10, 11, 12, 13, 14, 15, 20, 31, 32, 34, 39, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/seel.inc b/data/pokemon/base_stats/seel.inc index ac507a02..38a23228 100644 --- a/data/pokemon/base_stats/seel.inc +++ b/data/pokemon/base_stats/seel.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 20, 31, 32, 34, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/shellder.inc b/data/pokemon/base_stats/shellder.inc index 3f381d43..e911f8cb 100644 --- a/data/pokemon/base_stats/shellder.inc +++ b/data/pokemon/base_stats/shellder.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 20, 30, 31, 32, 33, 34, 36, 39, 44, 47, 49, 50, 53 ; end - diff --git a/data/pokemon/base_stats/shibirefugu.inc b/data/pokemon/base_stats/shibirefugu.inc index aa603ff9..721244f3 100644 --- a/data/pokemon/base_stats/shibirefugu.inc +++ b/data/pokemon/base_stats/shibirefugu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/slowbro.inc b/data/pokemon/base_stats/slowbro.inc index 483efc16..663d662b 100644 --- a/data/pokemon/base_stats/slowbro.inc +++ b/data/pokemon/base_stats/slowbro.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 26, 27, 28, 29, 30, 31, 32, 33, 34, 38, 39, 40, 44, 45, 46, 49, 50, 53, 54, 55 ; end - diff --git a/data/pokemon/base_stats/slowpoke.inc b/data/pokemon/base_stats/slowpoke.inc index 66839926..6be1bd97 100644 --- a/data/pokemon/base_stats/slowpoke.inc +++ b/data/pokemon/base_stats/slowpoke.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 16, 20, 26, 27, 28, 29, 30, 31, 32, 33, 34, 38, 39, 40, 44, 45, 46, 49, 50, 53, 54, 55 ; end - diff --git a/data/pokemon/base_stats/snorlax.inc b/data/pokemon/base_stats/snorlax.inc index 2e052a86..68932e76 100644 --- a/data/pokemon/base_stats/snorlax.inc +++ b/data/pokemon/base_stats/snorlax.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 24, 25, 26, 27, 29, 31, 32, 33, 34, 35, 36, 38, 40, 44, 46, 48, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/spearow.inc b/data/pokemon/base_stats/spearow.inc index abe4f20e..11836528 100644 --- a/data/pokemon/base_stats/spearow.inc +++ b/data/pokemon/base_stats/spearow.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 20, 31, 32, 34, 39, 43, 44, 50, 52 ; end - diff --git a/data/pokemon/base_stats/squirtle.inc b/data/pokemon/base_stats/squirtle.inc index e99064fd..d5ab17f2 100644 --- a/data/pokemon/base_stats/squirtle.inc +++ b/data/pokemon/base_stats/squirtle.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 28, 31, 32, 33, 34, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/starmie.inc b/data/pokemon/base_stats/starmie.inc index 5976ff41..3e386848 100644 --- a/data/pokemon/base_stats/starmie.inc +++ b/data/pokemon/base_stats/starmie.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 15, 20, 24, 25, 29, 30, 31, 32, 33, 34, 39, 40, 44, 45, 46, 49, 50, 53, 55 ; end - diff --git a/data/pokemon/base_stats/staryu.inc b/data/pokemon/base_stats/staryu.inc index e684cc84..95d710d5 100644 --- a/data/pokemon/base_stats/staryu.inc +++ b/data/pokemon/base_stats/staryu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 11, 12, 13, 14, 20, 24, 25, 29, 30, 31, 32, 33, 34, 39, 40, 44, 45, 46, 49, 50, 53, 55 ; end - diff --git a/data/pokemon/base_stats/sui.inc b/data/pokemon/base_stats/sui.inc index ada13cde..e890dd1f 100644 --- a/data/pokemon/base_stats/sui.inc +++ b/data/pokemon/base_stats/sui.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/sunny.inc b/data/pokemon/base_stats/sunny.inc index d3aadd4d..b81e088a 100644 --- a/data/pokemon/base_stats/sunny.inc +++ b/data/pokemon/base_stats/sunny.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/tail.inc b/data/pokemon/base_stats/tail.inc index 82cbafb7..80894e3e 100644 --- a/data/pokemon/base_stats/tail.inc +++ b/data/pokemon/base_stats/tail.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/tangela.inc b/data/pokemon/base_stats/tangela.inc index 4f6c9676..4fb8579d 100644 --- a/data/pokemon/base_stats/tangela.inc +++ b/data/pokemon/base_stats/tangela.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 20, 21, 22, 31, 32, 34, 40, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/tauros.inc b/data/pokemon/base_stats/tauros.inc index 063bd182..5e22aaf7 100644 --- a/data/pokemon/base_stats/tauros.inc +++ b/data/pokemon/base_stats/tauros.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 7, 8, 9, 10, 13, 14, 15, 20, 24, 25, 26, 27, 31, 32, 34, 38, 40, 44, 50, 54 ; end - diff --git a/data/pokemon/base_stats/tentacool.inc b/data/pokemon/base_stats/tentacool.inc index 634b564e..e82465bf 100644 --- a/data/pokemon/base_stats/tentacool.inc +++ b/data/pokemon/base_stats/tentacool.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 11, 12, 13, 14, 20, 21, 31, 32, 33, 34, 40, 44, 50, 51, 53 ; end - diff --git a/data/pokemon/base_stats/tentacruel.inc b/data/pokemon/base_stats/tentacruel.inc index 2ca77f74..31473cdb 100644 --- a/data/pokemon/base_stats/tentacruel.inc +++ b/data/pokemon/base_stats/tentacruel.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 11, 12, 13, 14, 15, 20, 21, 31, 32, 33, 34, 40, 44, 50, 51, 53 ; end - diff --git a/data/pokemon/base_stats/teppouo.inc b/data/pokemon/base_stats/teppouo.inc index 3179465b..b3dbc345 100644 --- a/data/pokemon/base_stats/teppouo.inc +++ b/data/pokemon/base_stats/teppouo.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/togepy.inc b/data/pokemon/base_stats/togepy.inc index 06491976..5d80d34b 100644 --- a/data/pokemon/base_stats/togepy.inc +++ b/data/pokemon/base_stats/togepy.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/tsubomitto.inc b/data/pokemon/base_stats/tsubomitto.inc index 6d0f954b..7e4db808 100644 --- a/data/pokemon/base_stats/tsubomitto.inc +++ b/data/pokemon/base_stats/tsubomitto.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/turban.inc b/data/pokemon/base_stats/turban.inc index bf2eb5a2..82e35718 100644 --- a/data/pokemon/base_stats/turban.inc +++ b/data/pokemon/base_stats/turban.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/twinz.inc b/data/pokemon/base_stats/twinz.inc index 64c22c79..37f919d6 100644 --- a/data/pokemon/base_stats/twinz.inc +++ b/data/pokemon/base_stats/twinz.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/twohead.inc b/data/pokemon/base_stats/twohead.inc index 51456ffe..ba13cff0 100644 --- a/data/pokemon/base_stats/twohead.inc +++ b/data/pokemon/base_stats/twohead.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/vaporeon.inc b/data/pokemon/base_stats/vaporeon.inc index 1ada54e8..e84ded21 100644 --- a/data/pokemon/base_stats/vaporeon.inc +++ b/data/pokemon/base_stats/vaporeon.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 11, 12, 13, 14, 15, 20, 31, 32, 33, 34, 39, 40, 44, 50, 53 ; end - diff --git a/data/pokemon/base_stats/venomoth.inc b/data/pokemon/base_stats/venomoth.inc index c8503d70..3b5e4ae1 100644 --- a/data/pokemon/base_stats/venomoth.inc +++ b/data/pokemon/base_stats/venomoth.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 21, 22, 29, 30, 31, 32, 33, 34, 39, 44, 46, 50 ; end - diff --git a/data/pokemon/base_stats/venonat.inc b/data/pokemon/base_stats/venonat.inc index e0140547..8f9c8a8b 100644 --- a/data/pokemon/base_stats/venonat.inc +++ b/data/pokemon/base_stats/venonat.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 10, 20, 21, 22, 29, 31, 32, 33, 34, 44, 46, 50 ; end - diff --git a/data/pokemon/base_stats/venusaur.inc b/data/pokemon/base_stats/venusaur.inc index 6171818b..c3b9b993 100644 --- a/data/pokemon/base_stats/venusaur.inc +++ b/data/pokemon/base_stats/venusaur.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/victreebel.inc b/data/pokemon/base_stats/victreebel.inc index 0dadcf34..c5dca3bd 100644 --- a/data/pokemon/base_stats/victreebel.inc +++ b/data/pokemon/base_stats/victreebel.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/vileplume.inc b/data/pokemon/base_stats/vileplume.inc index 9500d6d5..65a73b27 100644 --- a/data/pokemon/base_stats/vileplume.inc +++ b/data/pokemon/base_stats/vileplume.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 8, 9, 10, 15, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/volbear.inc b/data/pokemon/base_stats/volbear.inc index 19c3892d..dc736a7c 100644 --- a/data/pokemon/base_stats/volbear.inc +++ b/data/pokemon/base_stats/volbear.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/voltorb.inc b/data/pokemon/base_stats/voltorb.inc index fd8b0cd3..794338de 100644 --- a/data/pokemon/base_stats/voltorb.inc +++ b/data/pokemon/base_stats/voltorb.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 9, 20, 24, 25, 30, 31, 32, 33, 34, 36, 39, 44, 45, 47, 50, 55 ; end - diff --git a/data/pokemon/base_stats/vulpix.inc b/data/pokemon/base_stats/vulpix.inc index 8d23273e..2b93d0ef 100644 --- a/data/pokemon/base_stats/vulpix.inc +++ b/data/pokemon/base_stats/vulpix.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 8, 9, 10, 20, 28, 31, 32, 33, 34, 38, 39, 40, 44, 50 ; end - diff --git a/data/pokemon/base_stats/wartortle.inc b/data/pokemon/base_stats/wartortle.inc index 8e9aeb81..7fd19f16 100644 --- a/data/pokemon/base_stats/wartortle.inc +++ b/data/pokemon/base_stats/wartortle.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 28, 31, 32, 33, 34, 40, 44, 50, 53, 54 ; end - diff --git a/data/pokemon/base_stats/warwolf.inc b/data/pokemon/base_stats/warwolf.inc index 51cf942a..30961d65 100644 --- a/data/pokemon/base_stats/warwolf.inc +++ b/data/pokemon/base_stats/warwolf.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/wataneko.inc b/data/pokemon/base_stats/wataneko.inc index 8337e702..2d1c7a8b 100644 --- a/data/pokemon/base_stats/wataneko.inc +++ b/data/pokemon/base_stats/wataneko.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/weedle.inc b/data/pokemon/base_stats/weedle.inc index 4865a5bf..cc9ca6ce 100644 --- a/data/pokemon/base_stats/weedle.inc +++ b/data/pokemon/base_stats/weedle.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ; end - diff --git a/data/pokemon/base_stats/weepinbell.inc b/data/pokemon/base_stats/weepinbell.inc index dc297eac..256d39c3 100644 --- a/data/pokemon/base_stats/weepinbell.inc +++ b/data/pokemon/base_stats/weepinbell.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 3, 6, 9, 10, 20, 21, 22, 31, 32, 33, 34, 44, 50, 51 ; end - diff --git a/data/pokemon/base_stats/weezing.inc b/data/pokemon/base_stats/weezing.inc index a3c38205..2dd85f6f 100644 --- a/data/pokemon/base_stats/weezing.inc +++ b/data/pokemon/base_stats/weezing.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 6, 15, 20, 24, 25, 31, 32, 34, 36, 38, 44, 47, 50 ; end - diff --git a/data/pokemon/base_stats/wigglytuff.inc b/data/pokemon/base_stats/wigglytuff.inc index aff61e9f..8ecab49f 100644 --- a/data/pokemon/base_stats/wigglytuff.inc +++ b/data/pokemon/base_stats/wigglytuff.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/wolfman.inc b/data/pokemon/base_stats/wolfman.inc index f7ba8baa..1fcc67ea 100644 --- a/data/pokemon/base_stats/wolfman.inc +++ b/data/pokemon/base_stats/wolfman.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/yadoking.inc b/data/pokemon/base_stats/yadoking.inc index 3990ef58..b33b9be9 100644 --- a/data/pokemon/base_stats/yadoking.inc +++ b/data/pokemon/base_stats/yadoking.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/yamikarasu.inc b/data/pokemon/base_stats/yamikarasu.inc index f641a881..eb693477 100644 --- a/data/pokemon/base_stats/yamikarasu.inc +++ b/data/pokemon/base_stats/yamikarasu.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/yoroidori.inc b/data/pokemon/base_stats/yoroidori.inc index 0cfe5829..ade7ba9b 100644 --- a/data/pokemon/base_stats/yoroidori.inc +++ b/data/pokemon/base_stats/yoroidori.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 22, 24, 25, 29, 30, 31, 32, 33, 34, 35, 36, 38, 40, 44, 45, 46, 49, 50, 54, 55 ; end - diff --git a/data/pokemon/base_stats/zapdos.inc b/data/pokemon/base_stats/zapdos.inc index 7b3dcb59..846b31ba 100644 --- a/data/pokemon/base_stats/zapdos.inc +++ b/data/pokemon/base_stats/zapdos.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 15, 20, 24, 25, 31, 32, 33, 34, 39, 43, 44, 45, 50, 52, 55 ; end - diff --git a/data/pokemon/base_stats/zubat.inc b/data/pokemon/base_stats/zubat.inc index ad65bba6..f882e7ab 100644 --- a/data/pokemon/base_stats/zubat.inc +++ b/data/pokemon/base_stats/zubat.inc @@ -16,4 +16,3 @@ ; tm/hm learnset tmhm 2, 4, 6, 9, 10, 20, 21, 31, 32, 34, 39, 44, 50 ; end - diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index c6d6b6c4..14e003e0 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -263,4 +263,3 @@ PokemonCries:: mon_cry CRY_00, 0, 256 ; fd mon_cry CRY_00, 0, 256 ; fe mon_cry CRY_00, 0, 256 ; ff - diff --git a/data/sgb/blk_packets.inc b/data/sgb/blk_packets.inc index 09ea6682..32a7c5b9 100644 --- a/data/sgb/blk_packets.inc +++ b/data/sgb/blk_packets.inc @@ -70,4 +70,3 @@ BlkPacket_TitleScreen: attr_blk 1 attr_blk_data %111, 0,0,1, 00,00, 19,05 ds 8 - diff --git a/data/sgb/ctrl_packets.inc b/data/sgb/ctrl_packets.inc index e1cc7066..4b2eaf20 100644 --- a/data/sgb/ctrl_packets.inc +++ b/data/sgb/ctrl_packets.inc @@ -125,4 +125,3 @@ DataSndPacket8: db $60 ; rts db $ea ; nop db $ea ; nop - diff --git a/data/sgb/pal_packets.inc b/data/sgb/pal_packets.inc index 15aab47c..65b60c08 100644 --- a/data/sgb/pal_packets.inc +++ b/data/sgb/pal_packets.inc @@ -54,4 +54,3 @@ PalPacket_StartMenu: PalPacket_GFIntro: sgb_pal_set GAME_FREAK, ROUTE, ROUTE, ROUTE - diff --git a/data/tilesets/font_collision.inc b/data/tilesets/font_collision.inc index 4a37e4cb..39d420cc 100644 --- a/data/tilesets/font_collision.inc +++ b/data/tilesets/font_collision.inc @@ -126,4 +126,3 @@ tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, - diff --git a/data/tilesets/kanto_collision.inc b/data/tilesets/kanto_collision.inc index 04fe6919..15293fba 100644 --- a/data/tilesets/kanto_collision.inc +++ b/data/tilesets/kanto_collision.inc @@ -126,4 +126,3 @@ tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, tilecoll OLD_WALL, OLD_WALL, OLD_WALL, OLD_WALL, - diff --git a/data/tilesets/traditional_house_collision.inc b/data/tilesets/traditional_house_collision.inc index d5fbab17..ee8213b6 100644 --- a/data/tilesets/traditional_house_collision.inc +++ b/data/tilesets/traditional_house_collision.inc @@ -62,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR, tilecoll FLOOR, FLOOR, FLOOR, FLOOR, tilecoll FLOOR, FLOOR, FLOOR, FLOOR, - diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 08ebe282..8f56a697 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -36,7 +36,7 @@ AI_SwitchOrTryItem:: ld l, a call Random jp hl - + INCLUDE "data/trainers/ai_pointers.inc" JugglerAI: diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index dd35daf6..1c8de436 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -127,7 +127,6 @@ LoadBattleAnimGFX: pop bc ret - INCLUDE "data/battle_anims/framesets.inc" INCLUDE "data/battle_anims/oam.inc" diff --git a/engine/debug/field/change_tileset.inc b/engine/debug/field/change_tileset.inc index 8d2ab80e..e0109276 100644 --- a/engine/debug/field/change_tileset.inc +++ b/engine/debug/field/change_tileset.inc @@ -36,4 +36,3 @@ FieldDebug_ChangeTileset: db "セル１@" db "セル２@" db "セル３@" - diff --git a/engine/debug/field/change_transportation.inc b/engine/debug/field/change_transportation.inc index f2fb29fb..73d613c9 100644 --- a/engine/debug/field/change_transportation.inc +++ b/engine/debug/field/change_transportation.inc @@ -165,4 +165,3 @@ FieldDebug_SetSurfDirection: slow_step UP slow_step LEFT slow_step RIGHT - diff --git a/engine/debug/field/check_tile.inc b/engine/debug/field/check_tile.inc index 38b140cd..c963f670 100644 --- a/engine/debug/field/check_tile.inc +++ b/engine/debug/field/check_tile.inc @@ -61,4 +61,3 @@ FieldDebug_CheckTile: .HexadecimalNumbers: db "０１２３４５６７８９ＡＢＣＤＥＦ" - diff --git a/engine/debug/field/field_cut.inc b/engine/debug/field/field_cut.inc index 91b23a52..c62bd062 100644 --- a/engine/debug/field/field_cut.inc +++ b/engine/debug/field/field_cut.inc @@ -90,4 +90,3 @@ FieldDebug_FieldCut: db METATILE_CUT_NE_TREE_SE db METATILE_SMALL_TREE_SE db -1 - diff --git a/engine/debug/field/follow_npc_test.inc b/engine/debug/field/follow_npc_test.inc index 4d2587f1..fa48623f 100644 --- a/engine/debug/field/follow_npc_test.inc +++ b/engine/debug/field/follow_npc_test.inc @@ -99,4 +99,3 @@ MenuHeaderCutsceneTest: ; unreferenced db "つれあるかれデモ@" db "ライバルおねえさん@" db "さくせいちゅう@" - diff --git a/engine/debug/field/map_viewer.inc b/engine/debug/field/map_viewer.inc index 4dc1c96c..52db3a7f 100644 --- a/engine/debug/field/map_viewer.inc +++ b/engine/debug/field/map_viewer.inc @@ -429,4 +429,3 @@ DisplayBGEventDetails: and A_BUTTON | B_BUTTON | SELECT jr z, .WaitInput ret - diff --git a/engine/debug/field/minigames.inc b/engine/debug/field/minigames.inc index c146e708..07362201 100644 --- a/engine/debug/field/minigames.inc +++ b/engine/debug/field/minigames.inc @@ -83,4 +83,3 @@ FieldDebug_Minigames: text "で　" line "あそびますか？" done - diff --git a/engine/debug/field/mon_following.inc b/engine/debug/field/mon_following.inc index cb383195..fee6fdfe 100644 --- a/engine/debug/field/mon_following.inc +++ b/engine/debug/field/mon_following.inc @@ -57,4 +57,3 @@ FieldDebug_PokemonFollowing: .UnableText: text "だめです！！" done - diff --git a/engine/debug/field/move_to_entrance.inc b/engine/debug/field/move_to_entrance.inc index 8b128be1..a07f9611 100644 --- a/engine/debug/field/move_to_entrance.inc +++ b/engine/debug/field/move_to_entrance.inc @@ -44,4 +44,3 @@ FieldDebug_MoveToRoute1Entrance: text "とくていちてん　まで" next "うごかします" done - diff --git a/engine/debug/field/npc_movement_test.inc b/engine/debug/field/npc_movement_test.inc index 7e3f267e..51298286 100644 --- a/engine/debug/field/npc_movement_test.inc +++ b/engine/debug/field/npc_movement_test.inc @@ -52,4 +52,3 @@ FieldDebug_NPCMovementTest: .NotHereText: text "ここではだめです！" done - diff --git a/engine/debug/field/sprite_viewer.inc b/engine/debug/field/sprite_viewer.inc index 0c2229da..01e1c311 100644 --- a/engine/debug/field/sprite_viewer.inc +++ b/engine/debug/field/sprite_viewer.inc @@ -497,4 +497,3 @@ Datafc77e: Datafc78e: db 0, 8, $14, $20, 0, 0, $15, $20 db 8, 8, $16, $22, 8, 0, $17, $23 - diff --git a/engine/debug/field/toggle_npc_movement.inc b/engine/debug/field/toggle_npc_movement.inc index bfbc8f09..8a7e823d 100644 --- a/engine/debug/field/toggle_npc_movement.inc +++ b/engine/debug/field/toggle_npc_movement.inc @@ -36,4 +36,3 @@ FieldDebug_ToggleNPCMovement: db 2 db "とめる@" db "うごかす@" - diff --git a/engine/debug/field/toolgear.inc b/engine/debug/field/toolgear.inc index f075e66d..0eb60db2 100644 --- a/engine/debug/field/toolgear.inc +++ b/engine/debug/field/toolgear.inc @@ -94,4 +94,3 @@ OpenToolgearMenu: db "６０びょう@" db "２４じかん@" db "けす@" - diff --git a/engine/debug/field/unused_flag_menu.inc b/engine/debug/field/unused_flag_menu.inc index d4df79f6..1d4cb980 100644 --- a/engine/debug/field/unused_flag_menu.inc +++ b/engine/debug/field/unused_flag_menu.inc @@ -72,4 +72,3 @@ ENDM ld [bc], a inc bc ret - diff --git a/engine/debug/field/unused_priority_menu.inc b/engine/debug/field/unused_priority_menu.inc index defbfa9f..1cea2449 100644 --- a/engine/debug/field/unused_priority_menu.inc +++ b/engine/debug/field/unused_priority_menu.inc @@ -27,4 +27,3 @@ FieldDebug_UnusedSetPriority: db 2 db "ゆうせん@" db "ひゆうせん@" - diff --git a/engine/debug/field/unused_show_mon.inc b/engine/debug/field/unused_show_mon.inc index 87a677e6..a223faa4 100644 --- a/engine/debug/field/unused_show_mon.inc +++ b/engine/debug/field/unused_show_mon.inc @@ -12,4 +12,3 @@ FieldDebug_UnusedShowRandomMon: ; unreferenced inc a ld [wNumSetBits], a ret - diff --git a/engine/debug/field/vram_viewer.inc b/engine/debug/field/vram_viewer.inc index 6706e749..1f624a23 100644 --- a/engine/debug/field/vram_viewer.inc +++ b/engine/debug/field/vram_viewer.inc @@ -269,4 +269,3 @@ FieldDebug_DoClearEventFlags: pop hl and a ret - diff --git a/engine/debug/field/warp.inc b/engine/debug/field/warp.inc index 0897280b..ad588e59 100644 --- a/engine/debug/field/warp.inc +++ b/engine/debug/field/warp.inc @@ -67,8 +67,6 @@ DoTeleportAnimation: teleport_from step_end - .TeleportTo: teleport_to step_end - diff --git a/engine/debug/field_debug_menu.asm b/engine/debug/field_debug_menu.asm index 27aac6c2..f40d3bfd 100644 --- a/engine/debug/field_debug_menu.asm +++ b/engine/debug/field_debug_menu.asm @@ -294,4 +294,3 @@ INCLUDE "engine/debug/field/unused_show_mon.inc" INCLUDE "engine/debug/field/unused_priority_menu.inc" INCLUDE "engine/debug/field/vram_viewer.inc" - diff --git a/engine/events/breeder.asm b/engine/events/breeder.asm index 8f67f721..9f94c2da 100644 --- a/engine/events/breeder.asm +++ b/engine/events/breeder.asm @@ -191,7 +191,7 @@ _Breeder:: .MenuData: db STATICMENU_CURSOR db 3 - db "あずける@" ; Deposit + db "あずける@" ; Deposit db "ひきとる@" ; Withdraw db "やめる@" ; Cancel diff --git a/engine/games/memory_minigame.asm b/engine/games/memory_minigame.asm index 04d6fec3..4d038515 100644 --- a/engine/games/memory_minigame.asm +++ b/engine/games/memory_minigame.asm @@ -608,4 +608,3 @@ MemoryGame_AnimateCursor: add a, 9 ld [hl], a ret - diff --git a/engine/games/picross_minigame.asm b/engine/games/picross_minigame.asm index b7b318e1..2e486aa6 100644 --- a/engine/games/picross_minigame.asm +++ b/engine/games/picross_minigame.asm @@ -1900,4 +1900,3 @@ PicrossSprites: ; TODO: Setting fixed bank $C for now before Pokecenter_GFX is ripped picross_pattern PATTERN_TILESET, $c, Pokecenter_GFX + $200 picross_pattern PATTERN_NORMAL, PoliwrathSpriteGFX - diff --git a/engine/games/poker_minigame.asm b/engine/games/poker_minigame.asm index a196bbba..74962c2e 100644 --- a/engine/games/poker_minigame.asm +++ b/engine/games/poker_minigame.asm @@ -1672,4 +1672,3 @@ PokerMinigame_ShufflingTable: db $A6, $C2, $A7, $C2, $A8, $C2, $A9, $C2, $AA, $C2, $AB, $C2, $AC, $C2, $AD, $C2 db $AE, $C2, $AF, $C2, $B0, $C2, $B1, $C2, $B2, $C2, $B3, $C2, $C7, $C2, $DB, $C2 db $EF, $C2, $03, $C3, $17, $C3, $2B, $C3, $3F, $C3, $53, $C3, $67, $C3, $7B, $C3 - diff --git a/engine/gfx/set_title_decoration.asm b/engine/gfx/set_title_decoration.asm index 1a4f2fe3..a968440a 100644 --- a/engine/gfx/set_title_decoration.asm +++ b/engine/gfx/set_title_decoration.asm @@ -30,4 +30,3 @@ SetTitleBGDecorationBorder: dec c jr nz, .loop ret - diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 478b9acb..6286a401 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -1137,4 +1137,3 @@ ComposeMail_AnimateCursor: .YOffsets: db $00, $08, $18, $20, $30 - diff --git a/engine/movie/game_freak_intro.asm b/engine/movie/game_freak_intro.asm index 51dd6cae..fdb9f77f 100644 --- a/engine/movie/game_freak_intro.asm +++ b/engine/movie/game_freak_intro.asm @@ -222,7 +222,7 @@ GameFreakPresents_PlaceGameFreak: ret .game_freak -; G A M E F R E A K + ; G A M E F R E A K db $80, $81, $82, $83, $8d, $84, $85, $83, $81, $86 db "@" @@ -236,7 +236,7 @@ GameFreakPresents_PlacePresents: ret .presents -; P R E S E N T S + ; P R E S E N T S db $87, $88, $89, $8a, $8b, $8c db "@" diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 62d9b9fc..8d178573 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1772,4 +1772,3 @@ _NewPokedexEntry: and A_BUTTON | B_BUTTON jr z, .wait_for_input ret - diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 1bf4f37a..ff530a53 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -618,7 +618,7 @@ PlaceNonFaintStatus:: ld [hli], a ld [hl], 'ひ' ret - + SECTION "engine/pokemon/party_menu.asm@PartyMenu_ClearCursor", ROMX @@ -631,4 +631,4 @@ PartyMenu_ClearCursor:: add hl, bc dec a jr nz, .next - ret \ No newline at end of file + ret diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm index a9fa4669..eee9e7b5 100644 --- a/engine/tileset_anims.asm +++ b/engine/tileset_anims.asm @@ -206,4 +206,3 @@ endr ld l, c ld sp, hl ret - diff --git a/layout.link b/layout.link index 3bddd670..091bec7e 100644 --- a/layout.link +++ b/layout.link @@ -344,7 +344,7 @@ ROMX $1f "gfx/pokemon/pkmn_pics.asm@PKMN Pics 11" "gfx.asm@Annon Pic Ptrs and Pics" "gfx/pokemon/egg.asm" - + ROMX $20 "garbage.asm@Bank 20 Garbage"