diff options
| author | IIMarckus <iimarckus@gmail.com> | 2015-06-23 12:24:51 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2015-06-23 12:24:51 -0600 |
| commit | 4d532beee6310c8cfd1d8f7d26d623d176fb0027 (patch) | |
| tree | 6f5a67a40da7909284279d4566783c4ded59c90f | |
| parent | 47938939fe299d9ce3d2d167a1af42096d71a8fe (diff) | |
Remove trailing newlines.
889 files changed, 1 insertions, 1301 deletions
@@ -169,5 +169,3 @@ SECTION "Cries", ROMX, BANK[CRIES] CryHeaders:: INCLUDE "audio/cry_headers.asm" INCLUDE "audio/cries.asm" - - diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 3d06b88df..8c88a1954 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -67,5 +67,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a note D_, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f5118 ; f518a - - diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 55365d9a7..6fb5ec97c 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -661,5 +661,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea note F#, 2 loopchannel 0, Music_AzaleaTown_branch_f5aea ; f5b03 - - diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm index f4031b20d..3a7b89487 100644 --- a/audio/music/battletowerlobby.asm +++ b/audio/music/battletowerlobby.asm @@ -311,5 +311,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612 note F_, 4 loopchannel 0, Music_BattleTowerLobby_branch_179612 ; 17961d - - diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index 20782b846..a7001d967 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -695,5 +695,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76 note C#, 1 endchannel ; 178b81 - - diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 0a1a68fda..af47ded6c 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -519,5 +519,3 @@ Music_Bicycle_branch_ee34c: ; ee34c note F_, 2 loopchannel 0, Music_Bicycle_branch_ee34b ; ee35e - - diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm index 6961159b3..aeea404d4 100644 --- a/audio/music/buenaspassword.asm +++ b/audio/music/buenaspassword.asm @@ -643,5 +643,3 @@ Music_BuenasPassword_branch_178424: ; 178424 note D_, 1 endchannel ; 17843b - - diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index f52d50458..ee2d594ab 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -672,4 +672,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2 note D_, 2 endchannel ; f7ef3 - diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index 358a76c08..02a6e8cbc 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -263,5 +263,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7 note G_, 4 loopchannel 0, Music_BurnedTower_branch_f6be7 ; f6bf2 - - diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index 12db4dada..915a99c6d 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -394,5 +394,3 @@ Music_CeladonCity_branch_f4510: ; f4510 note B_, 2 endchannel ; f4518 - - diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index a6da88930..2f4ae83d1 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -789,5 +789,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e note E_, 2 endchannel ; ead99 - - diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index 9751bd047..2ed2990d5 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -308,5 +308,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d note G_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5c4d ; f5c60 - - diff --git a/audio/music/clair.asm b/audio/music/clair.asm index 65808d6ac..4b5de2cc2 100644 --- a/audio/music/clair.asm +++ b/audio/music/clair.asm @@ -441,5 +441,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e note G_, 1 endchannel ; 1fc87 - - diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index 7b0f48150..98c4583fb 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -176,5 +176,3 @@ Music_ContestResults_branch_efbed: ; efbed note G_, 1 loopchannel 0, Music_ContestResults_branch_efbed ; efc01 - - diff --git a/audio/music/credits.asm b/audio/music/credits.asm index f14f51342..d5fbc2202 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1692,5 +1692,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d note D_, 1 endchannel ; 1fa8d - - diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm index 8e97c8183..d19714dc2 100644 --- a/audio/music/crystalopening.asm +++ b/audio/music/crystalopening.asm @@ -362,5 +362,3 @@ Music_CrystalOpening_Ch4: ; 178810 note __, 16 endchannel ; 178889 - - diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index a21f1a867..1a5ed3e69 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -309,5 +309,3 @@ Music_DancingHall_branch_efae3: ; efae3 note D_, 1 loopchannel 0, Music_DancingHall_branch_efae3 ; efb3e - - diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 813c9dd53..42fdab99d 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -490,5 +490,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee note C#, 2 loopchannel 0, Music_DarkCave_branch_ea4ee ; ea50d - - diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 44f3fc5a5..da0c507a0 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -178,5 +178,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd note F#, 4 loopchannel 0, Music_DragonsDen_branch_eedbd ; eedcb - - diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index 20a2c9fc8..02ba20553 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -672,5 +672,3 @@ Music_EcruteakCity_branch_ef569: ; ef569 note B_, 1 endchannel ; ef5b1 - - diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 86d8a7b86..23eb1f508 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -540,5 +540,3 @@ Music_ElmsLab_branch_ea2b9: ; ea2b9 note G_, 4 loopchannel 0, Music_ElmsLab_branch_ea2b9 ; ea2be - - diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index 29605f389..05d199c84 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -208,5 +208,3 @@ Music_Evolution_branch_f07f0: ; f07f0 note E_, 2 loopchannel 0, Music_Evolution_branch_f07f0 ; f07fd - - diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 4dd29e0a4..3ac16a1ec 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -819,5 +819,3 @@ Music_GameCorner_branch_ee10f: ; ee10f note F#, 2 endchannel ; ee119 - - diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index 0a94a9956..e0e919d5c 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -485,5 +485,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d note G_, 1 endchannel ; eb676 - - diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index 686382d66..7c4742439 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -617,5 +617,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8 note __, 13 endchannel ; f7308 - - diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index a7567d51f..64b133bae 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -220,5 +220,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8 note C_, 16 endchannel ; f7411 - - diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 089ef90d6..c41eab9aa 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -572,5 +572,3 @@ Music_Gym_branch_f4afa: ; f4afa loopchannel 8, Music_Gym_branch_f4afa loopchannel 0, Music_Gym_branch_f4ac7 ; f4b0c - - diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index 0085b71e4..d78f7db38 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -428,5 +428,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b loopchannel 3, Music_GymLeaderVictory_branch_f480b endchannel ; f4815 - - diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 26b249a98..6812fde53 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -175,5 +175,3 @@ Music_HallOfFame_branch_f0677: ; f0677 note A#, 1 loopchannel 0, Music_HallOfFame_branch_f0677 ; f0697 - - diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm index 53509fff2..7b50731d6 100644 --- a/audio/music/healpokemon.asm +++ b/audio/music/healpokemon.asm @@ -52,5 +52,3 @@ Music_HealPokemon_Ch3: ; f06d4 note __, 2 endchannel ; f06e1 - - diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index b76539a9f..e6cc1e6c7 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -188,5 +188,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee92a ; ee94b - - diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index f6faa6c19..310e2313e 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -1030,5 +1030,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 note D#, 2 endchannel ; ea9c1 - - diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index 86736a626..4a4895400 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -1346,5 +1346,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 note A#, 2 endchannel ; f66c3 - - diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index a3e0ef9ee..505687382 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -588,5 +588,3 @@ Music_JohtoWildBattle_branch_f6055: ; f6055 loopchannel 4, Music_JohtoWildBattle_branch_f6055 endchannel ; f605c - - diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index 402e87a1f..f0acc8906 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -30,5 +30,3 @@ Music_JohtoWildBattleNight_Ch3: ; f608f notetype $c, $11 loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 ; f6096 - - diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 17fce2d6d..18735043b 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -614,5 +614,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note F_, 2 loopchannel 0, Music_KantoGymBattle_branch_ec965 ; ec9fa - - diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index ad639d07f..e246cc3d0 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -1538,5 +1538,3 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a note G_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ece5a ; ed06d - - diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index 6569695d6..c23a867e3 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -1224,5 +1224,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e note G_, 16 loopchannel 0, Music_KantoWildBattle_branch_ed39e ; ed5c6 - - diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index 8a57ab381..0224fe149 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -325,5 +325,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b note D_, 1 loopchannel 0, Music_LakeOfRage_branch_ee83b ; ee852 - - diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index 2abd29318..8cb9ee7d2 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -37,5 +37,3 @@ Music_LakeOfRageRocketRadio_Ch3: ; ef5e5 note __, 4 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 ; ef5f0 - - diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 3e79400e7..05ad7e602 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -519,5 +519,3 @@ Music_LavenderTown_branch_ef941: ; ef941 note F_, 2 loopchannel 0, Music_LavenderTown_branch_ef941 ; ef9bc - - diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 74abfcde3..14f22bbda 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -312,5 +312,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1 note A_, 2 loopchannel 0, Music_Lighthouse_branch_ee6b1 ; ee6c5 - - diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index 7f08f2ffc..bbf319ddb 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -329,5 +329,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1 note G_, 2 endchannel ; eefb2 - - diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index a213b49cb..f6dad7a23 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -118,5 +118,3 @@ Music_LookHiker_branch_f749a: ; f749a note G_, 2 loopchannel 0, Music_LookHiker_branch_f749a ; f74a2 - - diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 511204f1a..bbad6dca1 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -271,5 +271,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec note E_, 8 loopchannel 0, Music_LookKimonoGirl_branch_f7aec ; f7b13 - - diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 17f44173c..6ff40f377 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -117,5 +117,3 @@ Music_LookLass_branch_ed81f: ; ed81f note C#, 1 loopchannel 0, Music_LookLass_branch_ed81f ; ed82d - - diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm index 4aac6e690..23441f6ba 100644 --- a/audio/music/lookmysticalman.asm +++ b/audio/music/lookmysticalman.asm @@ -617,5 +617,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df note D_, 1 endchannel ; 1786e8 - - diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 31ff6e676..f61f15333 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -140,5 +140,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8 note C#, 8 loopchannel 0, Music_LookOfficer_branch_ed8c8 ; ed8dd - - diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index 5bbc86390..a79ceb9d8 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -162,5 +162,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70 note __, 1 endchannel ; ebeab - - diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index d86eb0747..ac386ef53 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -358,5 +358,3 @@ Music_LookRival_branch_f5118: ; f5118 note D_, 2 loopchannel 0, Music_LookRival_branch_f5118 ; f5127 - - diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index d02c7f5f2..4f1331961 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -414,5 +414,3 @@ Music_RocketTheme_branch_f7664: ; f7664 note F#, 2 endchannel ; f766d - - diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index f815d212c..b1a5599b8 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -180,5 +180,3 @@ Music_LookSage_branch_ee430: ; ee430 note G#, 1 loopchannel 0, Music_LookSage_branch_ee430 ; ee45f - - diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index f9ffb2295..5d885493a 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -297,5 +297,3 @@ Music_LookYoungster_branch_f67ae: ; f67ae ; f6810 db $ff - - diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index 232c0ca4a..729604a24 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -288,5 +288,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e note G_, 2 endchannel ; ef72f - - diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index 8ed8d4d6f..8de463201 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -145,5 +145,3 @@ Music_MainMenu_branch_f79a5: ; f79a5 note D_, 1 loopchannel 0, Music_MainMenu_branch_f79a5 ; f79b8 - - diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm index 6c0c7ca7b..eb807abf7 100644 --- a/audio/music/mobileadapter.asm +++ b/audio/music/mobileadapter.asm @@ -668,4 +668,3 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60 note D_, 1 endchannel ; 1ff6c - diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm index 90086aa67..a03ddb0eb 100644 --- a/audio/music/mobileadaptermenu.asm +++ b/audio/music/mobileadaptermenu.asm @@ -280,5 +280,3 @@ Music_MobileAdapterMenu_branch_178146: ; 178146 note A_, 4 endchannel ; 178153 - - diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm index 0adc750ad..abb274fc1 100644 --- a/audio/music/mobilecenter.asm +++ b/audio/music/mobilecenter.asm @@ -486,4 +486,3 @@ Music_MobileCenter_branch_179813: ; 179813 note C#, 1 loopchannel 0, Music_MobileCenter_branch_179813 ; 17982d - diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 5ae89e853..4e3280405 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -110,5 +110,3 @@ Music_Mom_branch_f6c56: ; f6c56 note __, 1 loopchannel 0, Music_Mom_branch_f6c56 ; f6c72 - - diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index c697daa78..4471b2934 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -141,5 +141,3 @@ Music_MtMoon_branch_edbc3: ; edbc3 note A#, 8 loopchannel 0, Music_MtMoon_branch_edbc3 ; edbd8 - - diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index d990cb0f0..ce9f080aa 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -108,5 +108,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b loopchannel 2, Music_MtMoonSquare_branch_f489b loopchannel 0, Music_MtMoonSquare_branch_f4862 ; f48ae - - diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index 7e7ccf28b..2f1be5d37 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -666,5 +666,3 @@ Music_NationalPark_branch_f57c8: ; f57c8 note D#, 1 loopchannel 0, Music_NationalPark_branch_f57bd ; f57e8 - - diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index 90fb91b4a..fe9804db8 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -330,5 +330,3 @@ Music_NewBarkTown_branch_eb408: ; eb408 note E_, 1 loopchannel 0, Music_NewBarkTown_branch_eb408 ; eb453 - - diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm index 1cd933673..c8b10a07b 100644 --- a/audio/music/nothing.asm +++ b/audio/music/nothing.asm @@ -11,4 +11,3 @@ Music_Nothing_Ch3: ; e91af Music_Nothing_Ch4: ; e91af endchannel ; e91b0 - diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 6518cbd9f..1f2c4651b 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -359,5 +359,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d note A_, 8 loopchannel 0, Music_PalletTown_branch_f4c2d ; f4c9f - - diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index 9256fe54c..5f7ac0575 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -230,5 +230,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05 note G_, 4 endchannel ; f7c16 - - diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 9ea5c7da5..3f8c26b6a 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -412,5 +412,3 @@ Music_PokemonCenter_branch_ed792: ; ed792 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed792 ; ed79b - - diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index 4cab1f28b..e9f1deb49 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -234,5 +234,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d note A#, 4 endchannel ; ee569 - - diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 7abf53f91..b0ddd8c66 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -134,5 +134,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06 note A_, 2 loopchannel 0, Music_PokemonLullaby_branch_f6e06 ; f6e23 - - diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index c939dd880..32909bbb7 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -467,5 +467,3 @@ Music_PokemonMarch_branch_f704c: ; f704c note C#, 2 endchannel ; f7055 - - diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index 1f35ee2ea..6d685f037 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -265,4 +265,3 @@ Music_PostCredits_branch_cfe5a: ; cfe5a note F_, 2 loopchannel 0, Music_PostCredits_branch_cfe5a ; cff04 - diff --git a/audio/music/printer.asm b/audio/music/printer.asm index eed309721..b2775bf0d 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -319,4 +319,3 @@ Music_Printer_branch_f0823: ; f0823 note __, 1 loopchannel 0, Music_Printer_branch_f0823 ; f0941 - diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index c2b676082..c9ebb4e9f 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -321,5 +321,3 @@ Music_ProfOak_branch_f4f69: ; f4f69 note B_, 2 endchannel ; f4f79 - - diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index f12d846c9..153016f5c 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -309,5 +309,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 ; f4dea - - diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index 343c884a7..0d8f11c94 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -867,5 +867,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65 loopchannel 2, Music_RivalBattle_branch_e9b65 endchannel ; e9b6f - - diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index c6566f26d..3317b49ad 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -1038,5 +1038,3 @@ Music_RocketBattle_branch_ea033: ; ea033 note A_, 2 endchannel ; ea040 - - diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index 90f1fa82a..c564a2591 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -311,5 +311,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb note A_, 4 endchannel ; eece8 - - diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 3f53452e2..b781d31fc 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -480,5 +480,3 @@ Music_RocketTheme_branch_f78de: ; f78de callchannel Music_RocketTheme_branch_f765c loopchannel 0, Music_RocketTheme_branch_f78c3 ; f78fd - - diff --git a/audio/music/route1.asm b/audio/music/route1.asm index ab4faecb9..5bb8b98db 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -651,5 +651,3 @@ Music_Route1_branch_ec20c: ; ec20c note __, 3 loopchannel 0, Music_Route1_branch_ec20c ; ec2ca - - diff --git a/audio/music/route12.asm b/audio/music/route12.asm index 0a35ab6b6..3ed8b07b1 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -458,5 +458,3 @@ Music_Route12_branch_ec717: ; ec717 note C#, 1 endchannel ; ec720 - - diff --git a/audio/music/route2.asm b/audio/music/route2.asm index bb0ad13ba..699cb846f 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -526,5 +526,3 @@ Music_Route2_branch_edb17: ; edb17 note D#, 4 loopchannel 0, Music_Route2_branch_edaef ; edb29 - - diff --git a/audio/music/route26.asm b/audio/music/route26.asm index 577f7807c..218db41c5 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -673,5 +673,3 @@ Music_Route26_branch_ef2b0: ; ef2b0 note E_, 2 endchannel ; ef2d0 - - diff --git a/audio/music/route29.asm b/audio/music/route29.asm index 3703e62ed..188eef089 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -524,5 +524,3 @@ Music_Route29_branch_f05b0: ; f05b0 note F_, 4 loopchannel 0, Music_Route29_branch_f05b0 ; f05bf - - diff --git a/audio/music/route3.asm b/audio/music/route3.asm index 5f7e66d99..4c314f0f3 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -508,5 +508,3 @@ Music_Route3_branch_ec4f0: ; ec4f0 note C#, 1 loopchannel 0, Music_Route3_branch_ec4f0 ; ec506 - - diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 0ea33abb9..a816d854f 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -677,4 +677,3 @@ Music_Route30_branch_efee1: ; efee1 notetype $c endchannel ; efef5 - diff --git a/audio/music/route36.asm b/audio/music/route36.asm index cd605db58..c7cd9a448 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -526,5 +526,3 @@ Music_Route36_branch_e9741: ; e9741 notetype $c endchannel ; e974f - - diff --git a/audio/music/route37.asm b/audio/music/route37.asm index a8d40ccf8..46f8db893 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -436,5 +436,3 @@ Music_Route37_branch_eeb6b: ; eeb6b note D#, 1 endchannel ; eeb75 - - diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index 615211260..5b4adc40a 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -48,5 +48,3 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 note __, 10 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 ; ebde1 - - diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index a9676b603..811564a28 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -77,5 +77,3 @@ Music_RuinsOfAlphRadio_branch_eee35: ; eee35 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 ; eee3e - - diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index a0fc13fbc..8fe04d633 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -360,5 +360,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e note F#, 2 endchannel ; edd6d - - diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index b587ad044..b4752acd9 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -245,5 +245,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f note F#, 4 loopchannel 0, Music_SproutTower_branch_f6a7f ; f6a99 - - diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index ae10d6395..ac4df638e 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -1185,5 +1185,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7 note C_, 2 endchannel ; eb2d3 - - diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index 61ccc3eb9..3ddf13451 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -24,5 +24,3 @@ Music_SuccessfulCapture_Ch3: ; f4626 notetype $c, $25 jumpchannel Music_SuccessfulCapture_branch_f45cf ; f462c - - diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm index 0c0dbb585..9340edc5a 100644 --- a/audio/music/suicunebattle.asm +++ b/audio/music/suicunebattle.asm @@ -2058,5 +2058,3 @@ Music_SuicuneBattle_branch_179182: ; 179182 note E_, 2 loopchannel 0, Music_SuicuneBattle_branch_179182 ; 17948b - - diff --git a/audio/music/surf.asm b/audio/music/surf.asm index 27c77e0f0..03c886699 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -733,5 +733,3 @@ Music_Surf_branch_f54c8: ; f54c8 note __, 3 endchannel ; f54e8 - - diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index e9dd5c314..984170ac6 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -294,5 +294,3 @@ Music_TinTower_branch_f694c: ; f694c note F_, 2 loopchannel 0, Music_TinTower_branch_f694c ; f6974 - - diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 20bf6b428..d46102b6d 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1177,5 +1177,3 @@ Music_TitleScreen_branch_ebd93: ; ebd93 note C_, 4 endchannel ; ebd9e - - diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 5cea28fcd..e577195d3 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -234,4 +234,3 @@ Music_TrainerVictory_branch_ebfb1: ; ebfb1 note B_, 2 endchannel ; ebfc3 - diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index c412cdc3c..1fb163e48 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -264,5 +264,3 @@ Music_UnionCave_branch_f5da9: ; f5da9 loopchannel 0, Music_UnionCave_branch_f5da9 loopchannel 0, Music_UnionCave_branch_f5da9 ; unused ; f5dc5 - - diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index fd9bffec7..c571b10b2 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -346,5 +346,3 @@ Music_VermilionCity_branch_eb7f5: ; eb7f5 note C#, 1 endchannel ; eb808 - - diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index babb91de1..58c5e21b2 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -203,5 +203,3 @@ Music_VictoryRoad_branch_f6d63: ; f6d63 note D#, 1 loopchannel 0, Music_VictoryRoad_branch_f6d63 ; f6d79 - - diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index c8580a2ab..740438c6a 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -780,5 +780,3 @@ Music_VioletCity_branch_f037a: ; f037a note D#, 2 endchannel ; f0386 - - diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index 82236a5f5..3f00794b7 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -796,5 +796,3 @@ Music_ViridianCity_branch_f434b: ; f434b note F#, 2 endchannel ; f435b - - diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index 10b52e90b..acb13e285 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -187,5 +187,3 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4 note C#, 2 endchannel ; f4602 - - diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 01dbca09c..d0f24fea2 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -210,4 +210,3 @@ dbw BANK(Sfx_4NoteDitty), Sfx_4NoteDitty dbw BANK(Sfx_Twinkle), Sfx_Twinkle ; e94e9 - diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 4d25c837f..425d6911b 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -3597,5 +3597,3 @@ AI_50_50: ; 39527 cp $80 ; 1/2 ret ; 3952d - - diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 54a269dfe..f5b895d0f 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1506,5 +1506,3 @@ Functioncc96e: ; cc96e .asm_cc9a0 ret ; cc9a1 - - diff --git a/battle/anim_gfx.asm b/battle/anim_gfx.asm index f95365188..c84dda83f 100644 --- a/battle/anim_gfx.asm +++ b/battle/anim_gfx.asm @@ -39,4 +39,3 @@ AnimObj37GFX: INCBIN "gfx/fx/037.2bpp.lz" AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz" AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz" ; 8640e - diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 776e09812..4f32bd932 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -6451,4 +6451,3 @@ ENDM object_gfx NULL, 1 object_gfx NULL, 1 ; cfd9e - diff --git a/battle/anims.asm b/battle/anims.asm index 9fcde859e..0f3ba748b 100644 --- a/battle/anims.asm +++ b/battle/anims.asm @@ -5307,4 +5307,3 @@ BattleAnim_WaterGun_branch_cbcd2: ; cbcd2 anim_wait 1 anim_ret ; cbcdd - diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 80462f984..8dfe30db6 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -2932,5 +2932,3 @@ Functionc9066: ; c9066 (32:5066) ld a, e ret ; c906f (32:506f) - - diff --git a/battle/core.asm b/battle/core.asm index 472687a13..c522bbd85 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -9525,4 +9525,3 @@ BattleStartMessage: ; 3fc8b ret ; 3fd26 - diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 96331f9eb..7c1fa738a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -10683,4 +10683,3 @@ Function37ed5: ; 37ed5 pop hl ret ; 37ee2 - diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index f117c5108..65376a4aa 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -95,4 +95,3 @@ BattleCommand54: ; 37588 ld hl, WontRiseAnymoreText jp StdBattleTextBox ; 37618 - diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index 9d99c8236..026fde417 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -15,4 +15,3 @@ BattleCommand5a: ; 3766f ld hl, BracedItselfText jp StdBattleTextBox ; 37683 - diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index 84c10670b..775fbd78d 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -21,4 +21,3 @@ BattleCommand57: ; 376a0 .failed jp Function37354 ; 376c2 - diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index 213892945..6815377d0 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -59,4 +59,3 @@ MetronomeExcepts: ; 37454 db THIEF db -1 ; 37462 - diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index 2a32e7e81..32a1998bb 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -50,4 +50,3 @@ BattleCommand1b: ; 373c9 call BattleCommandaa jp ResetTurn ; 37418 - diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index 01f17ff71..da39affc1 100644 --- a/battle/effects/nightmare.asm +++ b/battle/effects/nightmare.asm @@ -36,4 +36,3 @@ BattleCommand52: ; 37536 call AnimateFailedMove jp PrintButItFailed ; 37563 - diff --git a/battle/effects/perish_song.asm b/battle/effects/perish_song.asm index 423d299fa..95391f3bd 100644 --- a/battle/effects/perish_song.asm +++ b/battle/effects/perish_song.asm @@ -38,4 +38,3 @@ BattleCommand58: ; 376c2 call AnimateFailedMove jp PrintButItFailed ; 376f8 - diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index be9284135..eaf011ffe 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -78,4 +78,3 @@ ProtectChance: ; 3762c scf ret ; 3766f - diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index f709c7988..3826734b4 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -96,4 +96,3 @@ BattleCommand5c: ; 37734 .asm_37790 ret ; 37791 - diff --git a/battle/effects/sandstorm.asm b/battle/effects/sandstorm.asm index b4f782721..a33db7f8c 100644 --- a/battle/effects/sandstorm.asm +++ b/battle/effects/sandstorm.asm @@ -17,4 +17,3 @@ BattleCommand59: ; 376f8 call AnimateFailedMove jp PrintButItFailed ; 37718 - diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index 2d9357941..68894b1c1 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -25,4 +25,3 @@ BattleCommand56: ; 37683 .failed jp Function37354 ; 376a0 - diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index 83b954eaf..dbbe0396b 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -114,4 +114,3 @@ BattleCommand50: ; 37492 ld hl, EnemyMonItem ret ; 37517 - diff --git a/battle/hidden_power.asm b/battle/hidden_power.asm index 4d1ad9dc3..58e4599dd 100644 --- a/battle/hidden_power.asm +++ b/battle/hidden_power.asm @@ -109,4 +109,3 @@ HiddenPowerDamage: ; fbced ld d, a ret ; fbd54 - diff --git a/battle/magikarp_length.asm b/battle/magikarp_length.asm index 991e78b27..160912c53 100644 --- a/battle/magikarp_length.asm +++ b/battle/magikarp_length.asm @@ -212,4 +212,3 @@ CalcMagikarpLength: ; fbbfc dwb 65410, 2 dwb 65510, 1 ; not used ; fbcd2 - diff --git a/battle/move_names.asm b/battle/move_names.asm index a0f03627c..e4470a998 100644 --- a/battle/move_names.asm +++ b/battle/move_names.asm @@ -249,4 +249,3 @@ db "ROCK SMASH@" db "WHIRLPOOL@" db "BEAT UP@" - diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index 1e3bd4586..29fd27983 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -2237,7 +2237,3 @@ DefenseCurl: statmessageuser statupfailtext endmove - - - - diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index 4f955444a..3f364f521 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -155,4 +155,3 @@ dw BeatUp dw Fly dw DefenseCurl - diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index 3877e9960..ac9f49300 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -262,4 +262,3 @@ ENDM move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 move WHIRLPOOL, EFFECT_BIND, 15, WATER, 70, 15, 0 move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 - diff --git a/constants.asm b/constants.asm index 8b0b8978d..5531ca088 100644 --- a/constants.asm +++ b/constants.asm @@ -23,4 +23,3 @@ INCLUDE "constants/animation_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/misc_constants.asm" - diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 54ab3c162..ea57f7230 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -60,4 +60,3 @@ ANIM_BG_PSYCHIC EQU $29 ANIM_BG_VIBRATE_MON EQU $33 ANIM_BG_WOBBLE_MON EQU $34 - diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 826a33c17..22b09ad24 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -160,4 +160,3 @@ ENGINE_9E EQU $9e ENGINE_KRIS_IN_CABLE_CLUB EQU $9f ENGINE_DUNSPARCE_SWARM EQU $a0 ENGINE_YANMA_SWARM EQU $a1 - diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index a149bdff5..b10700d43 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -37,4 +37,3 @@ ANIM_GFX_SHINE EQU 36 ANIM_GFX_ANGELS EQU 37 ANIM_GFX_WAVE EQU 38 ANIM_GFX_AEROBLAST EQU 39 - diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index f7600ea7d..592e966ad 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -100,4 +100,3 @@ KANTO_LANDMARK EQU const_value const TOHJO_FALLS const ROUTE_28 const FAST_SHIP - diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 22609ef71..030b89840 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1805,4 +1805,3 @@ OBJECT_30 EQU $1e OBJECT_31 EQU $1f OBJECT_32 EQU $20 ; 33-39 are not used - diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 092fcd366..d88b0b560 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -256,4 +256,3 @@ const_value SET const_value + -1 const NUM_ATTACKS ; $fb - diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 04c320415..1224456d3 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -104,4 +104,3 @@ MUSIC_BATTLE_TOWER_LOBBY EQU 101 MUSIC_MOBILE_CENTER EQU 102 MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold - diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index afce2b595..ba106611a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -254,4 +254,3 @@ const_value set 1 const CELEBI EGG EQU 253 - diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 86d33f235..449447b5b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -86,5 +86,3 @@ TR_NITE EQU 3 ATK_GT_DEF EQU 1 ATK_LT_DEF EQU 2 ATK_EQ_DEF EQU 3 - - diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index b7635a038..8107d56c5 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -206,4 +206,3 @@ SFX_UNKNOWN_CB EQU $cb SFX_TWO_PC_BEEPS EQU $cc SFX_4_NOTE_DITTY EQU $cd SFX_TWINKLE EQU $ce - diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index c52cdfa39..baed9fc56 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -68,4 +68,3 @@ PLAYER_BIKE EQU 1 PLAYER_SLIP EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 - diff --git a/contents.asm b/contents.asm index 2bea33066..af277dcad 100644 --- a/contents.asm +++ b/contents.asm @@ -127,5 +127,3 @@ CRIES EQU $3C ; misc.o MISC_CRYSTAL EQU $5E - - diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 778051b83..5a1b6d857 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -5964,6 +5964,3 @@ BattleTowerMons10: bigdw 214 ; SAtk bigdw 214 ; SDef db "RANTA-N@@@@" - - - diff --git a/data/egg_moves_crystal.asm b/data/egg_moves_crystal.asm index f307e67a0..50fbb1471 100644 --- a/data/egg_moves_crystal.asm +++ b/data/egg_moves_crystal.asm @@ -1,3 +1,2 @@ INCLUDE "pokecrystal.asm" INCLUDE "data/egg_moves.asm" - diff --git a/data/evos_attacks_crystal.asm b/data/evos_attacks_crystal.asm index 5f2628db5..22ec9d84c 100644 --- a/data/evos_attacks_crystal.asm +++ b/data/evos_attacks_crystal.asm @@ -1,3 +1,2 @@ INCLUDE "pokecrystal.asm" INCLUDE "data/evos_attacks.asm" - diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm index 65e173198..dd6d36ab8 100644 --- a/data/odd_eggs.asm +++ b/data/odd_eggs.asm @@ -481,4 +481,3 @@ OddEgg2: bigdw 9 ; SAtk bigdw 9 ; SDef db "EGG@@@@@@@@" - diff --git a/data/pokedex/entries.asm b/data/pokedex/entries.asm index 50dccd9c1..e77469d9d 100644 --- a/data/pokedex/entries.asm +++ b/data/pokedex/entries.asm @@ -23,4 +23,3 @@ SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] PokedexEntries4:: INCLUDE "data/pokedex/entries_4.asm" - diff --git a/data/pokedex/entries/001.asm b/data/pokedex/entries/001.asm index 299b9d387..6e8bd6c11 100644 --- a/data/pokedex/entries/001.asm +++ b/data/pokedex/entries/001.asm @@ -8,5 +8,3 @@ page "stored in the" next "seeds on its back" next "in order to grow.@" -; 0x181702 - diff --git a/data/pokedex/entries/002.asm b/data/pokedex/entries/002.asm index 140ca6bde..c83c7f2aa 100644 --- a/data/pokedex/entries/002.asm +++ b/data/pokedex/entries/002.asm @@ -8,5 +8,3 @@ page "The bulb gives off" next "a pleasant aroma" next "when it blooms.@" -; 0x181773 - diff --git a/data/pokedex/entries/003.asm b/data/pokedex/entries/003.asm index ed7fdde27..d45aa65c4 100644 --- a/data/pokedex/entries/003.asm +++ b/data/pokedex/entries/003.asm @@ -8,5 +8,3 @@ page "flower petals" next "release a pleasant" next "fragrance.@" -; 0x1817db - diff --git a/data/pokedex/entries/004.asm b/data/pokedex/entries/004.asm index 1452f6208..8467d11dc 100644 --- a/data/pokedex/entries/004.asm +++ b/data/pokedex/entries/004.asm @@ -8,5 +8,3 @@ page "will burn vigor-" next "ously, even if it" next "gets a bit wet.@" -; 0x18184a - diff --git a/data/pokedex/entries/005.asm b/data/pokedex/entries/005.asm index bd0e9dac5..591899bec 100644 --- a/data/pokedex/entries/005.asm +++ b/data/pokedex/entries/005.asm @@ -8,5 +8,3 @@ page "intense flames," next "incinerating its" next "surroundings.@" -; 0x1818b3 - diff --git a/data/pokedex/entries/006.asm b/data/pokedex/entries/006.asm index e0cadfb8e..4dae824c3 100644 --- a/data/pokedex/entries/006.asm +++ b/data/pokedex/entries/006.asm @@ -8,5 +8,3 @@ page "fire increases as" next "it gains exper-" next "ience in battle.@" -; 0x181926 - diff --git a/data/pokedex/entries/007.asm b/data/pokedex/entries/007.asm index a02173d66..6b349351b 100644 --- a/data/pokedex/entries/007.asm +++ b/data/pokedex/entries/007.asm @@ -8,5 +8,3 @@ page "inside its shell" next "and sprays water" next "from its mouth.@" -; 0x181993 - diff --git a/data/pokedex/entries/008.asm b/data/pokedex/entries/008.asm index 72871a561..3bb6f882b 100644 --- a/data/pokedex/entries/008.asm +++ b/data/pokedex/entries/008.asm @@ -8,5 +8,3 @@ page "making it quite" next "popular among" next "older people.@" -; 0x1819f9 - diff --git a/data/pokedex/entries/009.asm b/data/pokedex/entries/009.asm index 4ca3a99b8..906de289e 100644 --- a/data/pokedex/entries/009.asm +++ b/data/pokedex/entries/009.asm @@ -8,5 +8,3 @@ page "shooting water" next "from the jets on" next "its back.@" -; 0x181a60 - diff --git a/data/pokedex/entries/010.asm b/data/pokedex/entries/010.asm index ccdc9c0ef..a727c5b5a 100644 --- a/data/pokedex/entries/010.asm +++ b/data/pokedex/entries/010.asm @@ -8,5 +8,3 @@ page "among leaves that" next "are the same color" next "as its body.@" -; 0x181ace - diff --git a/data/pokedex/entries/011.asm b/data/pokedex/entries/011.asm index d93280727..c4e8ae199 100644 --- a/data/pokedex/entries/011.asm +++ b/data/pokedex/entries/011.asm @@ -8,5 +8,3 @@ page "only harden, so it" next "remains motionless" next "to avoid attack.@" -; 0x181b45 - diff --git a/data/pokedex/entries/012.asm b/data/pokedex/entries/012.asm index ef345aca6..986e9a59d 100644 --- a/data/pokedex/entries/012.asm +++ b/data/pokedex/entries/012.asm @@ -8,5 +8,3 @@ page "It can even" next "identify distant" next "flowers in bloom.@" -; 0x181bb4 - diff --git a/data/pokedex/entries/013.asm b/data/pokedex/entries/013.asm index 89908939d..d814f3d5b 100644 --- a/data/pokedex/entries/013.asm +++ b/data/pokedex/entries/013.asm @@ -8,5 +8,3 @@ page "It uses this toxic" next "barb to protect" next "itself.@" -; 0x181c23 - diff --git a/data/pokedex/entries/014.asm b/data/pokedex/entries/014.asm index c6bd19d24..90d240022 100644 --- a/data/pokedex/entries/014.asm +++ b/data/pokedex/entries/014.asm @@ -8,5 +8,3 @@ page "stout trees while" next "waiting for its" next "evolution.@" -; 0x181c8a - diff --git a/data/pokedex/entries/015.asm b/data/pokedex/entries/015.asm index 5d8d060e4..d121aee59 100644 --- a/data/pokedex/entries/015.asm +++ b/data/pokedex/entries/015.asm @@ -8,5 +8,3 @@ page "then takes the" next "victim back to its" next "nest for food.@" -; 0x181cfa - diff --git a/data/pokedex/entries/016.asm b/data/pokedex/entries/016.asm index 3222c5a72..3d0bd3fde 100644 --- a/data/pokedex/entries/016.asm +++ b/data/pokedex/entries/016.asm @@ -8,5 +8,3 @@ page "a dust cloud that" next "drives insect prey" next "out into the open.@" -; 0x181d75 - diff --git a/data/pokedex/entries/017.asm b/data/pokedex/entries/017.asm index 72550788f..1050f47db 100644 --- a/data/pokedex/entries/017.asm +++ b/data/pokedex/entries/017.asm @@ -8,5 +8,3 @@ page "while keeping a" next "sharp lookout for" next "prey.@" -; 0x181dd7 - diff --git a/data/pokedex/entries/018.asm b/data/pokedex/entries/018.asm index 4e9c6b54a..124554e09 100644 --- a/data/pokedex/entries/018.asm +++ b/data/pokedex/entries/018.asm @@ -8,5 +8,3 @@ page "MAGIKARP, even" next "while flying at" next "3300 feet.@" -; 0x181e3d - diff --git a/data/pokedex/entries/019.asm b/data/pokedex/entries/019.asm index c8b44042e..e90107dd6 100644 --- a/data/pokedex/entries/019.asm +++ b/data/pokedex/entries/019.asm @@ -8,5 +8,3 @@ page "live anywhere. It" next "also multiplies" next "very quickly.@" -; 0x181ea3 - diff --git a/data/pokedex/entries/020.asm b/data/pokedex/entries/020.asm index 2a0cb2861..bbc2f5efb 100644 --- a/data/pokedex/entries/020.asm +++ b/data/pokedex/entries/020.asm @@ -8,5 +8,3 @@ page "rivers. It search-" next "es wide areas for" next "food.@" -; 0x181f03 - diff --git a/data/pokedex/entries/021.asm b/data/pokedex/entries/021.asm index dbfd79bf9..d0cdf7649 100644 --- a/data/pokedex/entries/021.asm +++ b/data/pokedex/entries/021.asm @@ -8,5 +8,3 @@ page "ceaselessly," next "making high-" next "pitched cries.@" -; 0x181f64 - diff --git a/data/pokedex/entries/022.asm b/data/pokedex/entries/022.asm index b47860334..4d7343cec 100644 --- a/data/pokedex/entries/022.asm +++ b/data/pokedex/entries/022.asm @@ -8,5 +8,3 @@ page "long reach, so it" next "must be treated" next "with caution.@" -; 0x181fd4 - diff --git a/data/pokedex/entries/023.asm b/data/pokedex/entries/023.asm index 40e71fb17..8999c7e31 100644 --- a/data/pokedex/entries/023.asm +++ b/data/pokedex/entries/023.asm @@ -8,5 +8,3 @@ page "scent of prey," next "then swallows the" next "prey whole.@" -; 0x18203d - diff --git a/data/pokedex/entries/024.asm b/data/pokedex/entries/024.asm index c8d83f43e..c0ae23db4 100644 --- a/data/pokedex/entries/024.asm +++ b/data/pokedex/entries/024.asm @@ -8,5 +8,3 @@ page "makes eerie sounds" next "by expelling air" next "from its mouth.@" -; 0x1820ad - diff --git a/data/pokedex/entries/025.asm b/data/pokedex/entries/025.asm index b0dd180dc..4dde0e32c 100644 --- a/data/pokedex/entries/025.asm +++ b/data/pokedex/entries/025.asm @@ -8,5 +8,3 @@ page "energy stored in" next "the pouches in its" next "cheeks.@" -; 0x182117 - diff --git a/data/pokedex/entries/026.asm b/data/pokedex/entries/026.asm index 65fffc0b9..8c628b09e 100644 --- a/data/pokedex/entries/026.asm +++ b/data/pokedex/entries/026.asm @@ -8,5 +8,3 @@ page "to gather electri-" next "city from the" next "atmosphere.@" -; 0x182184 - diff --git a/data/pokedex/entries/027.asm b/data/pokedex/entries/027.asm index a52fd2c14..d598bf619 100644 --- a/data/pokedex/entries/027.asm +++ b/data/pokedex/entries/027.asm @@ -8,5 +8,3 @@ page "the sand to" next "protect itself" next "when threatened.@" -; 0x1821e7 - diff --git a/data/pokedex/entries/028.asm b/data/pokedex/entries/028.asm index 37abbf54a..0e1bd277b 100644 --- a/data/pokedex/entries/028.asm +++ b/data/pokedex/entries/028.asm @@ -8,5 +8,3 @@ page "then attacks its" next "enemies from" next "above.@" -; 0x18224b - diff --git a/data/pokedex/entries/029.asm b/data/pokedex/entries/029.asm index ad4816de2..af9a29f39 100644 --- a/data/pokedex/entries/029.asm +++ b/data/pokedex/entries/029.asm @@ -8,5 +8,3 @@ page "its small, poison-" next "ous horn when" next "attacked.@" -; 0x1822b6 - diff --git a/data/pokedex/entries/030.asm b/data/pokedex/entries/030.asm index 50fb9fcba..2ff33e328 100644 --- a/data/pokedex/entries/030.asm +++ b/data/pokedex/entries/030.asm @@ -8,5 +8,3 @@ page "attack, it raises" next "the barbs that are" next "all over its body.@" -; 0x18232e - diff --git a/data/pokedex/entries/031.asm b/data/pokedex/entries/031.asm index 3df9bee0d..e3768d616 100644 --- a/data/pokedex/entries/031.asm +++ b/data/pokedex/entries/031.asm @@ -8,5 +8,3 @@ page "as excellent" next "protection from" next "any attack.@" -; 0x182392 - diff --git a/data/pokedex/entries/032.asm b/data/pokedex/entries/032.asm index a61159e2f..c2f05979b 100644 --- a/data/pokedex/entries/032.asm +++ b/data/pokedex/entries/032.asm @@ -8,5 +8,3 @@ page "directions in" next "order to detect" next "danger right away.@" -; 0x1823fd - diff --git a/data/pokedex/entries/033.asm b/data/pokedex/entries/033.asm index 3b55e179d..a4a786165 100644 --- a/data/pokedex/entries/033.asm +++ b/data/pokedex/entries/033.asm @@ -8,5 +8,3 @@ page "offense as soon as" next "it notices an" next "attacker.@" -; 0x182463 - diff --git a/data/pokedex/entries/034.asm b/data/pokedex/entries/034.asm index 5dd0ec3ec..a11de88b4 100644 --- a/data/pokedex/entries/034.asm +++ b/data/pokedex/entries/034.asm @@ -8,5 +8,3 @@ page "forcefully. Melee" next "combat is its" next "specialty.@" -; 0x1824c8 - diff --git a/data/pokedex/entries/035.asm b/data/pokedex/entries/035.asm index 4c830828c..40a2a510c 100644 --- a/data/pokedex/entries/035.asm +++ b/data/pokedex/entries/035.asm @@ -8,5 +8,3 @@ page "for some reason," next "on the night of a " next "full moon.@" -; 0x182530 - diff --git a/data/pokedex/entries/036.asm b/data/pokedex/entries/036.asm index b077f4200..58d1c33be 100644 --- a/data/pokedex/entries/036.asm +++ b/data/pokedex/entries/036.asm @@ -8,5 +8,3 @@ page "type of fairy has" next "a strong aversion" next "to being seen.@" -; 0x18259b - diff --git a/data/pokedex/entries/037.asm b/data/pokedex/entries/037.asm index 82f96fa38..79758798a 100644 --- a/data/pokedex/entries/037.asm +++ b/data/pokedex/entries/037.asm @@ -8,5 +8,3 @@ page "more beautiful," next "with a more luxur-" next "ious coat of fur.@" -; 0x18260c - diff --git a/data/pokedex/entries/038.asm b/data/pokedex/entries/038.asm index 7a0b920cc..02fac1261 100644 --- a/data/pokedex/entries/038.asm +++ b/data/pokedex/entries/038.asm @@ -8,5 +8,3 @@ page "tails is loaded" next "with supernatural" next "powers.@" -; 0x182673 - diff --git a/data/pokedex/entries/039.asm b/data/pokedex/entries/039.asm index bd82e78b3..2b4e410fe 100644 --- a/data/pokedex/entries/039.asm +++ b/data/pokedex/entries/039.asm @@ -8,5 +8,3 @@ page "Its gentle song" next "puts anyone who" next "hears it to sleep.@" -; 0x1826e9 - diff --git a/data/pokedex/entries/040.asm b/data/pokedex/entries/040.asm index b286443fe..de325c70c 100644 --- a/data/pokedex/entries/040.asm +++ b/data/pokedex/entries/040.asm @@ -8,5 +8,3 @@ page "good that anyone" next "who feels it can't" next "stop touching it.@" -; 0x18275d - diff --git a/data/pokedex/entries/041.asm b/data/pokedex/entries/041.asm index af8ff5f9f..a01dd6983 100644 --- a/data/pokedex/entries/041.asm +++ b/data/pokedex/entries/041.asm @@ -8,5 +8,3 @@ page "from the ceilings" next "of old buildings" next "and caves.@" -; 0x1827c4 - diff --git a/data/pokedex/entries/042.asm b/data/pokedex/entries/042.asm index 947176126..5a9d8475c 100644 --- a/data/pokedex/entries/042.asm +++ b/data/pokedex/entries/042.asm @@ -8,5 +8,3 @@ page "draws and gulps" next "down more than ten" next "ounces of blood.@" -; 0x182836 - diff --git a/data/pokedex/entries/043.asm b/data/pokedex/entries/043.asm index 89b2243d7..4826c0828 100644 --- a/data/pokedex/entries/043.asm +++ b/data/pokedex/entries/043.asm @@ -8,5 +8,3 @@ page "avoid the sun." next "It grows by bath-" next "ing in moonlight.@" -; 0x1828a6 - diff --git a/data/pokedex/entries/044.asm b/data/pokedex/entries/044.asm index 0e1c0bced..95d613698 100644 --- a/data/pokedex/entries/044.asm +++ b/data/pokedex/entries/044.asm @@ -8,5 +8,3 @@ page "its petals is so" next "bad, it may make" next "opponents faint.@" -; 0x182918 - diff --git a/data/pokedex/entries/045.asm b/data/pokedex/entries/045.asm index 07b2afbce..fab0eb08d 100644 --- a/data/pokedex/entries/045.asm +++ b/data/pokedex/entries/045.asm @@ -8,5 +8,3 @@ page "into the air," next "turning the air" next "yellow.@" -; 0x18297f - diff --git a/data/pokedex/entries/046.asm b/data/pokedex/entries/046.asm index cca0a6bd3..4ffdb324c 100644 --- a/data/pokedex/entries/046.asm +++ b/data/pokedex/entries/046.asm @@ -8,5 +8,3 @@ page "orders it to" next "extract juice from" next "tree trunks.@" -; 0x1829e2 - diff --git a/data/pokedex/entries/047.asm b/data/pokedex/entries/047.asm index 10ee37924..91362b132 100644 --- a/data/pokedex/entries/047.asm +++ b/data/pokedex/entries/047.asm @@ -8,5 +8,3 @@ page "mushrooms on its" next "back leave spores" next "on the bug's egg.@" -; 0x182a53 - diff --git a/data/pokedex/entries/048.asm b/data/pokedex/entries/048.asm index 2a57a58e9..0091dfb3b 100644 --- a/data/pokedex/entries/048.asm +++ b/data/pokedex/entries/048.asm @@ -8,5 +8,3 @@ page "sleeps in a hole" next "in a tree until" next "night falls.@" -; 0x182abf - diff --git a/data/pokedex/entries/049.asm b/data/pokedex/entries/049.asm index 813a46174..96ed4f918 100644 --- a/data/pokedex/entries/049.asm +++ b/data/pokedex/entries/049.asm @@ -8,5 +8,3 @@ page "who touches them," next "making that person" next "unable to stand.@" -; 0x182b30 - diff --git a/data/pokedex/entries/050.asm b/data/pokedex/entries/050.asm index b6ff3e44e..9d94d1e29 100644 --- a/data/pokedex/entries/050.asm +++ b/data/pokedex/entries/050.asm @@ -8,5 +8,3 @@ page "sticking its head" next "out only when the" next "sun isn't bright.@" -; 0x182b9d - diff --git a/data/pokedex/entries/051.asm b/data/pokedex/entries/051.asm index a5e204f5a..ccf3785e8 100644 --- a/data/pokedex/entries/051.asm +++ b/data/pokedex/entries/051.asm @@ -8,5 +8,3 @@ page "level. No one" next "knows what it's" next "like underground.@" -; 0x182c08 - diff --git a/data/pokedex/entries/052.asm b/data/pokedex/entries/052.asm index 933d944dc..e471fe20b 100644 --- a/data/pokedex/entries/052.asm +++ b/data/pokedex/entries/052.asm @@ -8,5 +8,3 @@ page "object, the gold" next "coin on its head" next "shines too.@" -; 0x182c78 - diff --git a/data/pokedex/entries/053.asm b/data/pokedex/entries/053.asm index 2f4fff6c9..0a95c9db0 100644 --- a/data/pokedex/entries/053.asm +++ b/data/pokedex/entries/053.asm @@ -8,5 +8,3 @@ page "side. It will tear" next "apart its prey on" next "a mere whim.@" -; 0x182cee - diff --git a/data/pokedex/entries/054.asm b/data/pokedex/entries/054.asm index 3802f2853..1d9158d20 100644 --- a/data/pokedex/entries/054.asm +++ b/data/pokedex/entries/054.asm @@ -8,5 +8,3 @@ page "its sleeping brain" next "cells happen to" next "wake.@" -; 0x182d55 - diff --git a/data/pokedex/entries/055.asm b/data/pokedex/entries/055.asm index 80bbb362d..c0b94e583 100644 --- a/data/pokedex/entries/055.asm +++ b/data/pokedex/entries/055.asm @@ -8,5 +8,3 @@ page "rivers and lakes" next "of which it is so" next "fond.@" -; 0x182dbd - diff --git a/data/pokedex/entries/056.asm b/data/pokedex/entries/056.asm index c82e4fea3..4802533f8 100644 --- a/data/pokedex/entries/056.asm +++ b/data/pokedex/entries/056.asm @@ -8,5 +8,3 @@ page "of its group, it" next "becomes infuriated" next "by its loneliness.@" -; 0x182e39 - diff --git a/data/pokedex/entries/057.asm b/data/pokedex/entries/057.asm index c4e988a2a..1106a79c6 100644 --- a/data/pokedex/entries/057.asm +++ b/data/pokedex/entries/057.asm @@ -8,5 +8,3 @@ page "has to chase them" next "until the end of" next "the world.@" -; 0x182eaa - diff --git a/data/pokedex/entries/058.asm b/data/pokedex/entries/058.asm index f86bd1450..2cdefa166 100644 --- a/data/pokedex/entries/058.asm +++ b/data/pokedex/entries/058.asm @@ -8,5 +8,3 @@ page "smell, it roars" next "loudly to force" next "out the intruder.@" -; 0x182f1c - diff --git a/data/pokedex/entries/059.asm b/data/pokedex/entries/059.asm index d96b98f56..d8c704ac3 100644 --- a/data/pokedex/entries/059.asm +++ b/data/pokedex/entries/059.asm @@ -8,5 +8,3 @@ page "attracted to its" next "movement as it ran" next "through prairies.@" -; 0x182f91 - diff --git a/data/pokedex/entries/060.asm b/data/pokedex/entries/060.asm index 5a65c2ff8..522336841 100644 --- a/data/pokedex/entries/060.asm +++ b/data/pokedex/entries/060.asm @@ -8,5 +8,3 @@ page "through the skin." next "It looks clearer" next "after it eats.@" -; 0x182ffd - diff --git a/data/pokedex/entries/061.asm b/data/pokedex/entries/061.asm index aa1d3108e..64c5fedcf 100644 --- a/data/pokedex/entries/061.asm +++ b/data/pokedex/entries/061.asm @@ -8,5 +8,3 @@ page "live underwater" next "where there is" next "less danger.@" -; 0x183066 - diff --git a/data/pokedex/entries/062.asm b/data/pokedex/entries/062.asm index f496abd4f..759359825 100644 --- a/data/pokedex/entries/062.asm +++ b/data/pokedex/entries/062.asm @@ -8,5 +8,3 @@ page "run on the surface" next "of the water for a" next "split second.@" -; 0x1830d5 - diff --git a/data/pokedex/entries/063.asm b/data/pokedex/entries/063.asm index 154061ae3..9fc53a541 100644 --- a/data/pokedex/entries/063.asm +++ b/data/pokedex/entries/063.asm @@ -8,5 +8,3 @@ page "when it senses" next "danger, even" next "if it is asleep.@" -; 0x18313c - diff --git a/data/pokedex/entries/064.asm b/data/pokedex/entries/064.asm index 4a11eac1e..96ae02b15 100644 --- a/data/pokedex/entries/064.asm +++ b/data/pokedex/entries/064.asm @@ -8,5 +8,3 @@ page "cles come out of" next "the surface of its" next "body.@" -; 0x1831a2 - diff --git a/data/pokedex/entries/065.asm b/data/pokedex/entries/065.asm index 5e37ce288..4cc789cd0 100644 --- a/data/pokedex/entries/065.asm +++ b/data/pokedex/entries/065.asm @@ -8,5 +8,3 @@ page "in order to gain" next "the edge in every" next "battle.@" -; 0x1b8065 - diff --git a/data/pokedex/entries/066.asm b/data/pokedex/entries/066.asm index 9d0fc0a27..ad286c433 100644 --- a/data/pokedex/entries/066.asm +++ b/data/pokedex/entries/066.asm @@ -8,5 +8,3 @@ page "can even pick up a" next "GRAVELER with" next "ease.@" -; 0x1b80cb - diff --git a/data/pokedex/entries/067.asm b/data/pokedex/entries/067.asm index 02ab56ef7..ba4dc9edf 100644 --- a/data/pokedex/entries/067.asm +++ b/data/pokedex/entries/067.asm @@ -8,5 +8,3 @@ page "muscles become" next "thicker after" next "every battle.@" -; 0x1b8133 - diff --git a/data/pokedex/entries/068.asm b/data/pokedex/entries/068.asm index d971888d8..636e7a640 100644 --- a/data/pokedex/entries/068.asm +++ b/data/pokedex/entries/068.asm @@ -8,5 +8,3 @@ page "can think, it can" next "execute many" next "punches at once.@" -; 0x1b81a1 - diff --git a/data/pokedex/entries/069.asm b/data/pokedex/entries/069.asm index 4447bcb51..1e5d9cb3f 100644 --- a/data/pokedex/entries/069.asm +++ b/data/pokedex/entries/069.asm @@ -8,5 +8,3 @@ page "immediately flings" next "its vine at the" next "object.@" -; 0x1b81fd - diff --git a/data/pokedex/entries/070.asm b/data/pokedex/entries/070.asm index 91b55c298..87bd8f534 100644 --- a/data/pokedex/entries/070.asm +++ b/data/pokedex/entries/070.asm @@ -8,5 +8,3 @@ page "leaves, slicing up" next "any unlucky object" next "nearby for food.@" -; 0x1b826e - diff --git a/data/pokedex/entries/071.asm b/data/pokedex/entries/071.asm index 30cd3fccb..aa66bd172 100644 --- a/data/pokedex/entries/071.asm +++ b/data/pokedex/entries/071.asm @@ -8,5 +8,3 @@ page "hardest object" next "will melt into" next "nothing.@" -; 0x1b82d1 - diff --git a/data/pokedex/entries/072.asm b/data/pokedex/entries/072.asm index f0b8eaa2a..faf474c0f 100644 --- a/data/pokedex/entries/072.asm +++ b/data/pokedex/entries/072.asm @@ -8,5 +8,3 @@ page "feelers to stab" next "anything it" next "touches.@" -; 0x1b8337 - diff --git a/data/pokedex/entries/073.asm b/data/pokedex/entries/073.asm index 040bba5b2..4f9fbfd9b 100644 --- a/data/pokedex/entries/073.asm +++ b/data/pokedex/entries/073.asm @@ -8,5 +8,3 @@ page "become like a net" next "to entangle its" next "prey.@" -; 0x1b83a1 - diff --git a/data/pokedex/entries/074.asm b/data/pokedex/entries/074.asm index b9edb3bdb..ad0a4283c 100644 --- a/data/pokedex/entries/074.asm +++ b/data/pokedex/entries/074.asm @@ -8,5 +8,3 @@ page "each other in a" next "contest to prove" next "whose is harder.@" -; 0x1b840c - diff --git a/data/pokedex/entries/075.asm b/data/pokedex/entries/075.asm index 136692839..dfb7151e3 100644 --- a/data/pokedex/entries/075.asm +++ b/data/pokedex/entries/075.asm @@ -8,5 +8,3 @@ page "too much speed, it" next "stops by running" next "into huge rocks.@" -; 0x1b8481 - diff --git a/data/pokedex/entries/076.asm b/data/pokedex/entries/076.asm index 46d4e404b..67effbebc 100644 --- a/data/pokedex/entries/076.asm +++ b/data/pokedex/entries/076.asm @@ -8,5 +8,3 @@ page "dynamite blasts" next "fail to scratch" next "its rugged hide.@" -; 0x1b84f2 - diff --git a/data/pokedex/entries/077.asm b/data/pokedex/entries/077.asm index 0135d7d6b..337196c4c 100644 --- a/data/pokedex/entries/077.asm +++ b/data/pokedex/entries/077.asm @@ -8,5 +8,3 @@ page "every day has made" next "it a world-class" next "jumper.@" -; 0x1b855e - diff --git a/data/pokedex/entries/078.asm b/data/pokedex/entries/078.asm index 644a83196..ea18d56da 100644 --- a/data/pokedex/entries/078.asm +++ b/data/pokedex/entries/078.asm @@ -8,5 +8,3 @@ page "er the swaying" next "flames of its mane" next "will become.@" -; 0x1b85d3 - diff --git a/data/pokedex/entries/079.asm b/data/pokedex/entries/079.asm index 552a2d245..b1379ca0c 100644 --- a/data/pokedex/entries/079.asm +++ b/data/pokedex/entries/079.asm @@ -8,5 +8,3 @@ page "even if its" next "flavorful tail is" next "bitten.@" -; 0x1b8635 - diff --git a/data/pokedex/entries/080.asm b/data/pokedex/entries/080.asm index 442e3bc27..064c5cbc5 100644 --- a/data/pokedex/entries/080.asm +++ b/data/pokedex/entries/080.asm @@ -8,5 +8,3 @@ page "tasty flavor that" next "oozes out of its" next "tail.@" -; 0x1b869d - diff --git a/data/pokedex/entries/081.asm b/data/pokedex/entries/081.asm index 13f27ee29..90d68161b 100644 --- a/data/pokedex/entries/081.asm +++ b/data/pokedex/entries/081.asm @@ -8,5 +8,3 @@ page "of its body cause" next "it to become a" next "strong magnet.@" -; 0x1b870a - diff --git a/data/pokedex/entries/082.asm b/data/pokedex/entries/082.asm index 2a769478c..7bc4748bc 100644 --- a/data/pokedex/entries/082.asm +++ b/data/pokedex/entries/082.asm @@ -8,5 +8,3 @@ page "resulting magnetic" next "storm disrupts" next "radio waves.@" -; 0x1b876c - diff --git a/data/pokedex/entries/083.asm b/data/pokedex/entries/083.asm index e380d0799..1d10325a2 100644 --- a/data/pokedex/entries/083.asm +++ b/data/pokedex/entries/083.asm @@ -8,5 +8,3 @@ page "people have made" next "an effort to breed" next "these #MON.@" -; 0x1b87d7 - diff --git a/data/pokedex/entries/084.asm b/data/pokedex/entries/084.asm index c9e476a97..505c7f7b9 100644 --- a/data/pokedex/entries/084.asm +++ b/data/pokedex/entries/084.asm @@ -8,5 +8,3 @@ page "way. If it sees an" next "enemy, it runs" next "away at 60 mph.@" -; 0x1b884a - diff --git a/data/pokedex/entries/085.asm b/data/pokedex/entries/085.asm index 44a159c8f..8c3e6695c 100644 --- a/data/pokedex/entries/085.asm +++ b/data/pokedex/entries/085.asm @@ -8,5 +8,3 @@ page "heads--even for a" next "second--will get" next "pecked severely.@" -; 0x1b88bf - diff --git a/data/pokedex/entries/086.asm b/data/pokedex/entries/086.asm index 08fb67d40..7a4a61c90 100644 --- a/data/pokedex/entries/086.asm +++ b/data/pokedex/entries/086.asm @@ -8,5 +8,3 @@ page "against the cold." next "It loves iceberg-" next "filled oceans.@" -; 0x1b8934 - diff --git a/data/pokedex/entries/087.asm b/data/pokedex/entries/087.asm index 8cd936c57..1f66bddf7 100644 --- a/data/pokedex/entries/087.asm +++ b/data/pokedex/entries/087.asm @@ -8,5 +8,3 @@ page "day, then looks" next "for food at night" next "when it's cold.@" -; 0x1b89a2 - diff --git a/data/pokedex/entries/088.asm b/data/pokedex/entries/088.asm index be9673224..83303b694 100644 --- a/data/pokedex/entries/088.asm +++ b/data/pokedex/entries/088.asm @@ -8,5 +8,3 @@ page "together, new" next "poisons are" next "created.@" -; 0x1b89fc - diff --git a/data/pokedex/entries/089.asm b/data/pokedex/entries/089.asm index ee2656dd0..a52d81d15 100644 --- a/data/pokedex/entries/089.asm +++ b/data/pokedex/entries/089.asm @@ -8,5 +8,3 @@ page "making the ground" next "there barren for" next "three years.@" -; 0x1b8a68 - diff --git a/data/pokedex/entries/090.asm b/data/pokedex/entries/090.asm index d573cae91..8c3681f2b 100644 --- a/data/pokedex/entries/090.asm +++ b/data/pokedex/entries/090.asm @@ -8,5 +8,3 @@ page "parts, so it uses" next "this move only as" next "a last resort.@" -; 0x1b8ad9 - diff --git a/data/pokedex/entries/091.asm b/data/pokedex/entries/091.asm index 7e6c21ddd..666990fbe 100644 --- a/data/pokedex/entries/091.asm +++ b/data/pokedex/entries/091.asm @@ -8,5 +8,3 @@ page "stab opponents." next "They're even hard-" next "er than its shell.@" -; 0x1b8b4a - diff --git a/data/pokedex/entries/092.asm b/data/pokedex/entries/092.asm index 74f9a655b..1dd903d1f 100644 --- a/data/pokedex/entries/092.asm +++ b/data/pokedex/entries/092.asm @@ -8,5 +8,3 @@ page "weakening its prey" next "by poisoning it" next "through the skin.@" -; 0x1b8bbd - diff --git a/data/pokedex/entries/093.asm b/data/pokedex/entries/093.asm index ef1ff419a..86c76c9d7 100644 --- a/data/pokedex/entries/093.asm +++ b/data/pokedex/entries/093.asm @@ -8,5 +8,3 @@ page "the next living" next "thing that wanders" next "close by.@" -; 0x1b8c25 - diff --git a/data/pokedex/entries/094.asm b/data/pokedex/entries/094.asm index 9f374edd6..d58b4467f 100644 --- a/data/pokedex/entries/094.asm +++ b/data/pokedex/entries/094.asm @@ -8,5 +8,3 @@ page "heat. The chill it" next "causes makes the" next "victims shake.@" -; 0x1b8c98 - diff --git a/data/pokedex/entries/095.asm b/data/pokedex/entries/095.asm index bf036c445..2ea4708ef 100644 --- a/data/pokedex/entries/095.asm +++ b/data/pokedex/entries/095.asm @@ -8,5 +8,3 @@ page "objects. This is" next "what makes its" next "body so solid.@" -; 0x1b8d0a - diff --git a/data/pokedex/entries/096.asm b/data/pokedex/entries/096.asm index 1ee6646b9..c2bf2d5be 100644 --- a/data/pokedex/entries/096.asm +++ b/data/pokedex/entries/096.asm @@ -8,5 +8,3 @@ page "is sleeping and" next "what that person" next "is dreaming about.@" -; 0x1b8d80 - diff --git a/data/pokedex/entries/097.asm b/data/pokedex/entries/097.asm index ddc6a71fa..474c8b0c7 100644 --- a/data/pokedex/entries/097.asm +++ b/data/pokedex/entries/097.asm @@ -8,5 +8,3 @@ page "longer the effects" next "of its hypnosis" next "last.@" -; 0x1b8ddd - diff --git a/data/pokedex/entries/098.asm b/data/pokedex/entries/098.asm index 85e6f8c3d..479238b9d 100644 --- a/data/pokedex/entries/098.asm +++ b/data/pokedex/entries/098.asm @@ -8,5 +8,3 @@ page "nutrients by" next "swallowing a" next "mouthful of sand.@" -; 0x1b8e45 - diff --git a/data/pokedex/entries/099.asm b/data/pokedex/entries/099.asm index e558dcdb4..a14e313cd 100644 --- a/data/pokedex/entries/099.asm +++ b/data/pokedex/entries/099.asm @@ -8,5 +8,3 @@ page "in battle, the" next "claw just gets in" next "the way.@" -; 0x1b8eb0 - diff --git a/data/pokedex/entries/100.asm b/data/pokedex/entries/100.asm index 99d351a39..021bc95ff 100644 --- a/data/pokedex/entries/100.asm +++ b/data/pokedex/entries/100.asm @@ -8,5 +8,3 @@ page "that its compo-" next "nents are not" next "found in nature.@" -; 0x1b8f19 - diff --git a/data/pokedex/entries/101.asm b/data/pokedex/entries/101.asm index 4c093460e..b91c45323 100644 --- a/data/pokedex/entries/101.asm +++ b/data/pokedex/entries/101.asm @@ -8,5 +8,3 @@ page "But this also" next "makes it more" next "likely to explode.@" -; 0x1b8f84 - diff --git a/data/pokedex/entries/102.asm b/data/pokedex/entries/102.asm index 853c52de5..2b20da627 100644 --- a/data/pokedex/entries/102.asm +++ b/data/pokedex/entries/102.asm @@ -8,5 +8,3 @@ page "bond between the" next "six will make them" next "rejoin instantly.@" -; 0x1b8ff6 - diff --git a/data/pokedex/entries/103.asm b/data/pokedex/entries/103.asm index 6fc78c00c..f39447ecf 100644 --- a/data/pokedex/entries/103.asm +++ b/data/pokedex/entries/103.asm @@ -8,5 +8,3 @@ page "heads. A head that" next "drops off becomes" next "an EXEGGCUTE.@" -; 0x1b9068 - diff --git a/data/pokedex/entries/104.asm b/data/pokedex/entries/104.asm index 3288d8117..e52d34202 100644 --- a/data/pokedex/entries/104.asm +++ b/data/pokedex/entries/104.asm @@ -8,5 +8,3 @@ page "mother's skull," next "never revealing" next "its true face.@" -; 0x1b90d2 - diff --git a/data/pokedex/entries/105.asm b/data/pokedex/entries/105.asm index cd987271e..74ae80300 100644 --- a/data/pokedex/entries/105.asm +++ b/data/pokedex/entries/105.asm @@ -8,5 +8,3 @@ page "MAROWAK. It gets" next "its bones from" next "those graves.@" -; 0x1b913f - diff --git a/data/pokedex/entries/106.asm b/data/pokedex/entries/106.asm index edbce8213..1a00fca2c 100644 --- a/data/pokedex/entries/106.asm +++ b/data/pokedex/entries/106.asm @@ -8,5 +8,3 @@ page "elastic legs to" next "execute every" next "known kick.@" -; 0x1b91a4 - diff --git a/data/pokedex/entries/107.asm b/data/pokedex/entries/107.asm index 93abedee0..26fc4cdb6 100644 --- a/data/pokedex/entries/107.asm +++ b/data/pokedex/entries/107.asm @@ -8,5 +8,3 @@ page "it spins its arms" next "just before making" next "contact.@" -; 0x1b9210 - diff --git a/data/pokedex/entries/108.asm b/data/pokedex/entries/108.asm index 8ba734493..b69015afa 100644 --- a/data/pokedex/entries/108.asm +++ b/data/pokedex/entries/108.asm @@ -8,5 +8,3 @@ page "long tongue to" next "lick its body" next "clean.@" -; 0x1b9276 - diff --git a/data/pokedex/entries/109.asm b/data/pokedex/entries/109.asm index f12f8b948..cd247c691 100644 --- a/data/pokedex/entries/109.asm +++ b/data/pokedex/entries/109.asm @@ -8,5 +8,3 @@ page "ous gas, the gas" next "swirling inside it" next "can be seen.@" -; 0x1b92ec - diff --git a/data/pokedex/entries/110.asm b/data/pokedex/entries/110.asm index 2536b4377..ee51956ff 100644 --- a/data/pokedex/entries/110.asm +++ b/data/pokedex/entries/110.asm @@ -8,5 +8,3 @@ page "body expands, and" next "its insides smell" next "much worse.@" -; 0x1b935d - diff --git a/data/pokedex/entries/111.asm b/data/pokedex/entries/111.asm index 77e1ecc82..1b39102a4 100644 --- a/data/pokedex/entries/111.asm +++ b/data/pokedex/entries/111.asm @@ -8,5 +8,3 @@ page "starts rushing, it" next "forgets why it" next "started.@" -; 0x1b93c5 - diff --git a/data/pokedex/entries/112.asm b/data/pokedex/entries/112.asm index 93fc1c806..cfd79ae02 100644 --- a/data/pokedex/entries/112.asm +++ b/data/pokedex/entries/112.asm @@ -8,5 +8,3 @@ page "easily shatter" next "even a diamond in" next "the rough.@" -; 0x1b942e - diff --git a/data/pokedex/entries/113.asm b/data/pokedex/entries/113.asm index a6774dcf9..1388ad6c2 100644 --- a/data/pokedex/entries/113.asm +++ b/data/pokedex/entries/113.asm @@ -8,5 +8,3 @@ page "nutritious eggs," next "but it rarely can" next "be found.@" -; 0x1b948c - diff --git a/data/pokedex/entries/114.asm b/data/pokedex/entries/114.asm index f2cee4ef8..636de30c8 100644 --- a/data/pokedex/entries/114.asm +++ b/data/pokedex/entries/114.asm @@ -8,5 +8,3 @@ page "cover its body in" next "order to annoy its" next "opponent.@" -; 0x1b94f6 - diff --git a/data/pokedex/entries/115.asm b/data/pokedex/entries/115.asm index aa64e86dd..ac9d2d01f 100644 --- a/data/pokedex/entries/115.asm +++ b/data/pokedex/entries/115.asm @@ -8,5 +8,3 @@ page "its pouch, it" next "always sleeps" next "standing up.@" -; 0x1b9553 - diff --git a/data/pokedex/entries/116.asm b/data/pokedex/entries/116.asm index 32398b4e8..edb19271a 100644 --- a/data/pokedex/entries/116.asm +++ b/data/pokedex/entries/116.asm @@ -8,5 +8,3 @@ page "playfully tangling" next "their tails" next "together.@" -; 0x1b95b8 - diff --git a/data/pokedex/entries/117.asm b/data/pokedex/entries/117.asm index 6b24c13f0..8a81cf791 100644 --- a/data/pokedex/entries/117.asm +++ b/data/pokedex/entries/117.asm @@ -8,5 +8,3 @@ page "uses its toxic" next "spikes to fend off" next "the intruder.@" -; 0x1b9626 - diff --git a/data/pokedex/entries/118.asm b/data/pokedex/entries/118.asm index bae8e00cf..80b48b2b6 100644 --- a/data/pokedex/entries/118.asm +++ b/data/pokedex/entries/118.asm @@ -8,5 +8,3 @@ page "water, searching" next "for their perfect" next "mate.@" -; 0x1b9690 - diff --git a/data/pokedex/entries/119.asm b/data/pokedex/entries/119.asm index ecb96c86b..4e8593681 100644 --- a/data/pokedex/entries/119.asm +++ b/data/pokedex/entries/119.asm @@ -8,5 +8,3 @@ page "their nests in" next "order to protect" next "their offspring.@" -; 0x1b9702 - diff --git a/data/pokedex/entries/120.asm b/data/pokedex/entries/120.asm index d2bfe22dd..87aee3b3e 100644 --- a/data/pokedex/entries/120.asm +++ b/data/pokedex/entries/120.asm @@ -8,5 +8,3 @@ page "the sea floor, and" next "its body's center" next "core flickers.@" -; 0x1b9776 - diff --git a/data/pokedex/entries/121.asm b/data/pokedex/entries/121.asm index 4ae383bbd..17497e106 100644 --- a/data/pokedex/entries/121.asm +++ b/data/pokedex/entries/121.asm @@ -8,5 +8,3 @@ page "its body to send" next "electric waves" next "into outer space.@" -; 0x1b97ea - diff --git a/data/pokedex/entries/122.asm b/data/pokedex/entries/122.asm index f9d84ec16..1f068663e 100644 --- a/data/pokedex/entries/122.asm +++ b/data/pokedex/entries/122.asm @@ -8,5 +8,3 @@ page "its fingers to" next "solidify air into" next "an invisible wall.@" -; 0x1b9851 - diff --git a/data/pokedex/entries/123.asm b/data/pokedex/entries/123.asm index e7a67ca0b..fed2a139d 100644 --- a/data/pokedex/entries/123.asm +++ b/data/pokedex/entries/123.asm @@ -8,5 +8,3 @@ page "its opponent does" next "not even know what" next "knocked it down.@" -; 0x1b98c5 - diff --git a/data/pokedex/entries/124.asm b/data/pokedex/entries/124.asm index da3997c69..57610399a 100644 --- a/data/pokedex/entries/124.asm +++ b/data/pokedex/entries/124.asm @@ -8,5 +8,3 @@ page "which seems to" next "have its own" next "meaning.@" -; 0x1b992a - diff --git a/data/pokedex/entries/125.asm b/data/pokedex/entries/125.asm index 239258364..f8dfecc89 100644 --- a/data/pokedex/entries/125.asm +++ b/data/pokedex/entries/125.asm @@ -8,5 +8,3 @@ page "electric currents" next "to communicate" next "their feelings.@" -; 0x1b9994 - diff --git a/data/pokedex/entries/126.asm b/data/pokedex/entries/126.asm index 2930a5a13..214ba2ff0 100644 --- a/data/pokedex/entries/126.asm +++ b/data/pokedex/entries/126.asm @@ -8,5 +8,3 @@ page "itself by dipping" next "its wound into" next "lava.@" -; 0x1b99fb - diff --git a/data/pokedex/entries/127.asm b/data/pokedex/entries/127.asm index 760abaaf9..abe18d8e6 100644 --- a/data/pokedex/entries/127.asm +++ b/data/pokedex/entries/127.asm @@ -8,5 +8,3 @@ page "on treetops or" next "among roots where" next "it is well hidden.@" -; 0x1b9a6f - diff --git a/data/pokedex/entries/128.asm b/data/pokedex/entries/128.asm index 3c1f59f40..49ebbfee9 100644 --- a/data/pokedex/entries/128.asm +++ b/data/pokedex/entries/128.asm @@ -8,5 +8,3 @@ page "bers of their herd" next "in order to prove" next "their strength.@" -; 0x1b9adb - diff --git a/data/pokedex/entries/129.asm b/data/pokedex/entries/129.asm index ad79a2811..7df0ac2c2 100644 --- a/data/pokedex/entries/129.asm +++ b/data/pokedex/entries/129.asm @@ -8,5 +8,3 @@ page "along rivers when" next "there are strong" next "currents.@" -; 0x1cc065 - diff --git a/data/pokedex/entries/130.asm b/data/pokedex/entries/130.asm index 3cdd1b851..ae7276fa8 100644 --- a/data/pokedex/entries/130.asm +++ b/data/pokedex/entries/130.asm @@ -8,5 +8,3 @@ page "burning down any" next "place it travels" next "through.@" -; 0x1cc0cd - diff --git a/data/pokedex/entries/131.asm b/data/pokedex/entries/131.asm index c1d5fe035..ab830a467 100644 --- a/data/pokedex/entries/131.asm +++ b/data/pokedex/entries/131.asm @@ -8,5 +8,3 @@ page "and provides a ve-" next "ry comfortable way" next "to get around.@" -; 0x1cc13c - diff --git a/data/pokedex/entries/132.asm b/data/pokedex/entries/132.asm index 587334848..e2f6aac0b 100644 --- a/data/pokedex/entries/132.asm +++ b/data/pokedex/entries/132.asm @@ -8,5 +8,3 @@ page "faster than normal" next "to duplicate that" next "opponent exactly.@" -; 0x1cc1b2 - diff --git a/data/pokedex/entries/133.asm b/data/pokedex/entries/133.asm index 2b055a7d0..70048b31f 100644 --- a/data/pokedex/entries/133.asm +++ b/data/pokedex/entries/133.asm @@ -8,5 +8,3 @@ page "adapt smoothly" next "and perfectly to" next "any environment.@" -; 0x1cc224 - diff --git a/data/pokedex/entries/134.asm b/data/pokedex/entries/134.asm index 2db4ca0d9..dad373f65 100644 --- a/data/pokedex/entries/134.asm +++ b/data/pokedex/entries/134.asm @@ -8,5 +8,3 @@ page "swim, it blends" next "with the water" next "perfectly.@" -; 0x1cc28b - diff --git a/data/pokedex/entries/135.asm b/data/pokedex/entries/135.asm index 0d37fccd7..419ab1d1c 100644 --- a/data/pokedex/entries/135.asm +++ b/data/pokedex/entries/135.asm @@ -8,5 +8,3 @@ page "fur create a" next "constant sparking" next "noise.@" -; 0x1cc2ec - diff --git a/data/pokedex/entries/136.asm b/data/pokedex/entries/136.asm index c03bf0cf6..83f30d458 100644 --- a/data/pokedex/entries/136.asm +++ b/data/pokedex/entries/136.asm @@ -8,5 +8,3 @@ page "body temperature" next "can reach up to" next "1700 degrees.@" -; 0x1cc353 - diff --git a/data/pokedex/entries/137.asm b/data/pokedex/entries/137.asm index 31cf31698..904e1869f 100644 --- a/data/pokedex/entries/137.asm +++ b/data/pokedex/entries/137.asm @@ -8,5 +8,3 @@ page "research, it can" next "perform only what" next "is in its program.@" -; 0x1cc3c1 - diff --git a/data/pokedex/entries/138.asm b/data/pokedex/entries/138.asm index e221bc453..3bda088c4 100644 --- a/data/pokedex/entries/138.asm +++ b/data/pokedex/entries/138.asm @@ -8,5 +8,3 @@ page "eating plankton." next "Its fossils are" next "sometimes found.@" -; 0x1cc42e - diff --git a/data/pokedex/entries/139.asm b/data/pokedex/entries/139.asm index 90d148b3a..782eb0212 100644 --- a/data/pokedex/entries/139.asm +++ b/data/pokedex/entries/139.asm @@ -8,5 +8,3 @@ page "food. This could" next "be the reason it" next "is extinct.@" -; 0x1cc497 - diff --git a/data/pokedex/entries/140.asm b/data/pokedex/entries/140.asm index 31a342303..9b011e90a 100644 --- a/data/pokedex/entries/140.asm +++ b/data/pokedex/entries/140.asm @@ -8,5 +8,3 @@ page "floor. It also has" next "eyes on its back" next "that glow.@" -; 0x1cc507 - diff --git a/data/pokedex/entries/141.asm b/data/pokedex/entries/141.asm index bdce32657..03cdc9f05 100644 --- a/data/pokedex/entries/141.asm +++ b/data/pokedex/entries/141.asm @@ -8,5 +8,3 @@ page "compactly folding" next "up its razor-sharp" next "sickles.@" -; 0x1cc576 - diff --git a/data/pokedex/entries/142.asm b/data/pokedex/entries/142.asm index d47b508a6..7971f7c7c 100644 --- a/data/pokedex/entries/142.asm +++ b/data/pokedex/entries/142.asm @@ -8,5 +8,3 @@ page "freely and" next "fearlessly through" next "the skies.@" -; 0x1cc5cf - diff --git a/data/pokedex/entries/143.asm b/data/pokedex/entries/143.asm index b58089efc..7a50d1817 100644 --- a/data/pokedex/entries/143.asm +++ b/data/pokedex/entries/143.asm @@ -8,5 +8,3 @@ page "eating moldy or" next "rotten food will" next "not affect it.@" -; 0x1cc632 - diff --git a/data/pokedex/entries/144.asm b/data/pokedex/entries/144.asm index c705e912e..76e413985 100644 --- a/data/pokedex/entries/144.asm +++ b/data/pokedex/entries/144.asm @@ -8,5 +8,3 @@ page "sky, it cools the" next "air, causing snow" next "to fall.@" -; 0x1cc697 - diff --git a/data/pokedex/entries/145.asm b/data/pokedex/entries/145.asm index b0e012c29..7446c8568 100644 --- a/data/pokedex/entries/145.asm +++ b/data/pokedex/entries/145.asm @@ -8,5 +8,3 @@ page "by the flapping of" next "its wings causes" next "summer storms.@" -; 0x1cc706 - diff --git a/data/pokedex/entries/146.asm b/data/pokedex/entries/146.asm index 7a314baf1..90fa0d1f9 100644 --- a/data/pokedex/entries/146.asm +++ b/data/pokedex/entries/146.asm @@ -8,5 +8,3 @@ page "from the south" next "along with the" next "spring.@" -; 0x1cc761 - diff --git a/data/pokedex/entries/147.asm b/data/pokedex/entries/147.asm index 2763ed608..acffd7976 100644 --- a/data/pokedex/entries/147.asm +++ b/data/pokedex/entries/147.asm @@ -8,5 +8,3 @@ page "ing this process," next "it is protected by" next "a rapid waterfall.@" -; 0x1cc7dc - diff --git a/data/pokedex/entries/148.asm b/data/pokedex/entries/148.asm index 2bb507f88..5e6b93b5d 100644 --- a/data/pokedex/entries/148.asm +++ b/data/pokedex/entries/148.asm @@ -8,5 +8,3 @@ page "body brightens" next "slightly, the" next "weather changes.@" -; 0x1cc843 - diff --git a/data/pokedex/entries/149.asm b/data/pokedex/entries/149.asm index 1ddfab146..07d5eec3d 100644 --- a/data/pokedex/entries/149.asm +++ b/data/pokedex/entries/149.asm @@ -8,5 +8,3 @@ page "island where these" next "gather. Only they" next "live there.@" -; 0x1cc8ae - diff --git a/data/pokedex/entries/150.asm b/data/pokedex/entries/150.asm index a1e922e05..3e11c040d 100644 --- a/data/pokedex/entries/150.asm +++ b/data/pokedex/entries/150.asm @@ -8,5 +8,3 @@ page "this #MON was" next "created solely for" next "battling.@" -; 0x1cc915 - diff --git a/data/pokedex/entries/151.asm b/data/pokedex/entries/151.asm index 1415d07b7..9fac31c83 100644 --- a/data/pokedex/entries/151.asm +++ b/data/pokedex/entries/151.asm @@ -8,5 +8,3 @@ page "research to see if" next "it is the ancestor" next "of all #MON.@" -; 0x1cc988 - diff --git a/data/pokedex/entries/152.asm b/data/pokedex/entries/152.asm index a7d279643..480a7d9a4 100644 --- a/data/pokedex/entries/152.asm +++ b/data/pokedex/entries/152.asm @@ -8,5 +8,3 @@ page "on its head to" next "seek out warm" next "places.@" -; 0x1cc9e9 - diff --git a/data/pokedex/entries/153.asm b/data/pokedex/entries/153.asm index 22be1337a..bbbd07558 100644 --- a/data/pokedex/entries/153.asm +++ b/data/pokedex/entries/153.asm @@ -8,5 +8,3 @@ page "causes anyone who" next "smells it to" next "become energetic.@" -; 0x1cca54 - diff --git a/data/pokedex/entries/154.asm b/data/pokedex/entries/154.asm index 7144a6b09..be345cd28 100644 --- a/data/pokedex/entries/154.asm +++ b/data/pokedex/entries/154.asm @@ -8,5 +8,3 @@ page "if they were" next "relaxing in a" next "sunny forest.@" -; 0x1ccabd - diff --git a/data/pokedex/entries/155.asm b/data/pokedex/entries/155.asm index 9a1f7749a..e155975df 100644 --- a/data/pokedex/entries/155.asm +++ b/data/pokedex/entries/155.asm @@ -8,5 +8,3 @@ page "when it is angry." next "The flaring flames" next "intimidate foes.@" -; 0x1ccb33 - diff --git a/data/pokedex/entries/156.asm b/data/pokedex/entries/156.asm index 2840d0c93..d78a560ee 100644 --- a/data/pokedex/entries/156.asm +++ b/data/pokedex/entries/156.asm @@ -8,5 +8,3 @@ page "demonstrate how" next "ferociously its" next "fire blazes.@" -; 0x1ccba0 - diff --git a/data/pokedex/entries/157.asm b/data/pokedex/entries/157.asm index b21d62268..bddc45430 100644 --- a/data/pokedex/entries/157.asm +++ b/data/pokedex/entries/157.asm @@ -8,5 +8,3 @@ page "shimmer, this is a" next "sign that it is" next "ready to battle.@" -; 0x1ccc14 - diff --git a/data/pokedex/entries/158.asm b/data/pokedex/entries/158.asm index d3f3f97ab..b949dbbbe 100644 --- a/data/pokedex/entries/158.asm +++ b/data/pokedex/entries/158.asm @@ -8,5 +8,3 @@ page "sees. Turning your" next "back on it is not" next "recommended.@" -; 0x1ccc84 - diff --git a/data/pokedex/entries/159.asm b/data/pokedex/entries/159.asm index d44f99d0e..96b1e5aaa 100644 --- a/data/pokedex/entries/159.asm +++ b/data/pokedex/entries/159.asm @@ -8,5 +8,3 @@ page "those fangs clamp" next "down, the prey has" next "no hope of escape.@" -; 0x1cccf9 - diff --git a/data/pokedex/entries/160.asm b/data/pokedex/entries/160.asm index 31aee2d44..d942d2fd3 100644 --- a/data/pokedex/entries/160.asm +++ b/data/pokedex/entries/160.asm @@ -8,5 +8,3 @@ page "enable it to move" next "quickly, even on" next "the ground.@" -; 0x1ccd6b - diff --git a/data/pokedex/entries/161.asm b/data/pokedex/entries/161.asm index 991c22baa..113755a25 100644 --- a/data/pokedex/entries/161.asm +++ b/data/pokedex/entries/161.asm @@ -8,5 +8,3 @@ page "by screeching and" next "hitting the ground" next "with its tail.@" -; 0x1ccddd - diff --git a/data/pokedex/entries/162.asm b/data/pokedex/entries/162.asm index e6e7a0121..b7fbce09d 100644 --- a/data/pokedex/entries/162.asm +++ b/data/pokedex/entries/162.asm @@ -8,5 +8,3 @@ page "deeper the nests" next "go, the more maze-" next "like they become.@" -; 0x1cce58 - diff --git a/data/pokedex/entries/163.asm b/data/pokedex/entries/163.asm index 0a1841ccf..add305d3d 100644 --- a/data/pokedex/entries/163.asm +++ b/data/pokedex/entries/163.asm @@ -8,5 +8,3 @@ page "trainers use them" next "in place of" next "clocks.@" -; 0x1cceb9 - diff --git a/data/pokedex/entries/164.asm b/data/pokedex/entries/164.asm index c1828b350..55c2d39d9 100644 --- a/data/pokedex/entries/164.asm +++ b/data/pokedex/entries/164.asm @@ -8,5 +8,3 @@ page "It silently sneaks" next "up on prey without" next "being detected.@" -; 0x1ccf2c - diff --git a/data/pokedex/entries/165.asm b/data/pokedex/entries/165.asm index 7abaf54ea..28e8a6c7b 100644 --- a/data/pokedex/entries/165.asm +++ b/data/pokedex/entries/165.asm @@ -8,5 +8,3 @@ page "fluid secreted by" next "its feet indicates" next "its location.@" -; 0x1ccfa0 - diff --git a/data/pokedex/entries/166.asm b/data/pokedex/entries/166.asm index 80284d756..5222adfa8 100644 --- a/data/pokedex/entries/166.asm +++ b/data/pokedex/entries/166.asm @@ -8,5 +8,3 @@ page "a big leaf and" next "drifts off into" next "a deep slumber.@" -; 0x1cd012 - diff --git a/data/pokedex/entries/167.asm b/data/pokedex/entries/167.asm index eecfe3b5d..6c8fa1147 100644 --- a/data/pokedex/entries/167.asm +++ b/data/pokedex/entries/167.asm @@ -8,5 +8,3 @@ page "string, it waits" next "motionlessly until" next "it becomes dark.@" -; 0x1cd083 - diff --git a/data/pokedex/entries/168.asm b/data/pokedex/entries/168.asm index 0318cdf73..6ccb82be9 100644 --- a/data/pokedex/entries/168.asm +++ b/data/pokedex/entries/168.asm @@ -8,5 +8,3 @@ page "wanders in search" next "of food after" next "darkness falls.@" -; 0x1cd0f5 - diff --git a/data/pokedex/entries/169.asm b/data/pokedex/entries/169.asm index d5483e029..065c78c9b 100644 --- a/data/pokedex/entries/169.asm +++ b/data/pokedex/entries/169.asm @@ -8,5 +8,3 @@ page "flight, a new set" next "of wings grew on" next "its hind legs.@" -; 0x1cd165 - diff --git a/data/pokedex/entries/170.asm b/data/pokedex/entries/170.asm index b3d5344ff..91f6a9d73 100644 --- a/data/pokedex/entries/170.asm +++ b/data/pokedex/entries/170.asm @@ -8,5 +8,3 @@ page "sitive and neg-" next "ative charges flo-" next "wing through them.@" -; 0x1cd1de - diff --git a/data/pokedex/entries/171.asm b/data/pokedex/entries/171.asm index 5ec3afdfc..52a9a4a3a 100644 --- a/data/pokedex/entries/171.asm +++ b/data/pokedex/entries/171.asm @@ -8,5 +8,3 @@ page "changed from a" next "dorsal fin, to" next "lure prey.@" -; 0x1cd243 - diff --git a/data/pokedex/entries/172.asm b/data/pokedex/entries/172.asm index 896a40684..5058b8cd5 100644 --- a/data/pokedex/entries/172.asm +++ b/data/pokedex/entries/172.asm @@ -8,5 +8,3 @@ page "shock causes it to" next "discharge energy" next "spontaneously.@" -; 0x1cd2bc - diff --git a/data/pokedex/entries/173.asm b/data/pokedex/entries/173.asm index 6b87925cd..b4be5050b 100644 --- a/data/pokedex/entries/173.asm +++ b/data/pokedex/entries/173.asm @@ -8,5 +8,3 @@ page "#MON is certain" next "to be within the" next "immediate area.@" -; 0x1cd32c - diff --git a/data/pokedex/entries/174.asm b/data/pokedex/entries/174.asm index 683dc2955..64d4be612 100644 --- a/data/pokedex/entries/174.asm +++ b/data/pokedex/entries/174.asm @@ -8,5 +8,3 @@ page "around by bouncing" next "on its soft," next "tender body.@" -; 0x1cd396 - diff --git a/data/pokedex/entries/175.asm b/data/pokedex/entries/175.asm index 07b139abe..10691feb4 100644 --- a/data/pokedex/entries/175.asm +++ b/data/pokedex/entries/175.asm @@ -8,5 +8,3 @@ page "shell is said to" next "be filled with" next "happiness.@" -; 0x1cd402 - diff --git a/data/pokedex/entries/176.asm b/data/pokedex/entries/176.asm index 14f02bad0..f2510b3ee 100644 --- a/data/pokedex/entries/176.asm +++ b/data/pokedex/entries/176.asm @@ -8,5 +8,3 @@ page "stay up in the air" next "as it tags along" next "after its trainer.@" -; 0x1cd47d - diff --git a/data/pokedex/entries/177.asm b/data/pokedex/entries/177.asm index 7dab8f356..6c1deb780 100644 --- a/data/pokedex/entries/177.asm +++ b/data/pokedex/entries/177.asm @@ -8,5 +8,3 @@ page "likes to eat the" next "new sprouts on" next "the trees.@" -; 0x1cd4e9 - diff --git a/data/pokedex/entries/178.asm b/data/pokedex/entries/178.asm index 169efa407..baa441474 100644 --- a/data/pokedex/entries/178.asm +++ b/data/pokedex/entries/178.asm @@ -8,5 +8,3 @@ page "day will pass" next "before it will" next "move again.@" -; 0x1cd551 - diff --git a/data/pokedex/entries/179.asm b/data/pokedex/entries/179.asm index 4c64aff8a..b76ebfc0e 100644 --- a/data/pokedex/entries/179.asm +++ b/data/pokedex/entries/179.asm @@ -8,5 +8,3 @@ page "to stay cool in" next "summer and warm" next "in winter.@" -; 0x1cd5b8 - diff --git a/data/pokedex/entries/180.asm b/data/pokedex/entries/180.asm index d30f7c877..2986debe0 100644 --- a/data/pokedex/entries/180.asm +++ b/data/pokedex/entries/180.asm @@ -8,5 +8,3 @@ page "skin, it can store" next "lots of electric-" next "ity in its fur.@" -; 0x1cd626 - diff --git a/data/pokedex/entries/181.asm b/data/pokedex/entries/181.asm index da50c306c..44f0fbcbc 100644 --- a/data/pokedex/entries/181.asm +++ b/data/pokedex/entries/181.asm @@ -8,5 +8,3 @@ page "can be seen from" next "far away on the" next "ocean's surface.@" -; 0x1cd69a - diff --git a/data/pokedex/entries/182.asm b/data/pokedex/entries/182.asm index 381e85fc1..4c12e88a5 100644 --- a/data/pokedex/entries/182.asm +++ b/data/pokedex/entries/182.asm @@ -8,5 +8,3 @@ page "each other," next "making pretty," next "relaxing sounds.@" -; 0x1cd705 - diff --git a/data/pokedex/entries/183.asm b/data/pokedex/entries/183.asm index 44ba743eb..2a47da48d 100644 --- a/data/pokedex/entries/183.asm +++ b/data/pokedex/entries/183.asm @@ -8,5 +8,3 @@ page "can stay dry, even" next "when it plays in" next "the water.@" -; 0x1cd771 - diff --git a/data/pokedex/entries/184.asm b/data/pokedex/entries/184.asm index b50f6aea7..cc1ad3587 100644 --- a/data/pokedex/entries/184.asm +++ b/data/pokedex/entries/184.asm @@ -8,5 +8,3 @@ page "camouflage itself" next "when it's in the" next "water.@" -; 0x1cd7d9 - diff --git a/data/pokedex/entries/185.asm b/data/pokedex/entries/185.asm index 1c991d895..eb1608ef3 100644 --- a/data/pokedex/entries/185.asm +++ b/data/pokedex/entries/185.asm @@ -8,5 +8,3 @@ page "SUDOWOODO, not a" next "tree. It hides" next "from the rain.@" -; 0x1cd84b - diff --git a/data/pokedex/entries/186.asm b/data/pokedex/entries/186.asm index 7db0bea6e..1525a27b7 100644 --- a/data/pokedex/entries/186.asm +++ b/data/pokedex/entries/186.asm @@ -8,5 +8,3 @@ page "nearby POLIWAG and" next "POLIWHIRL gather" next "immediately.@" -; 0x1cd8b5 - diff --git a/data/pokedex/entries/187.asm b/data/pokedex/entries/187.asm index d9f294382..56898131c 100644 --- a/data/pokedex/entries/187.asm +++ b/data/pokedex/entries/187.asm @@ -8,5 +8,3 @@ page "It may even float" next "all the way to the" next "next town.@" -; 0x1cd928 - diff --git a/data/pokedex/entries/188.asm b/data/pokedex/entries/188.asm index aa5afd0cb..4aba157a9 100644 --- a/data/pokedex/entries/188.asm +++ b/data/pokedex/entries/188.asm @@ -8,5 +8,3 @@ page "hides in the shade" next "of a tree to avoid" next "getting wet.@" -; 0x1cd998 - diff --git a/data/pokedex/entries/189.asm b/data/pokedex/entries/189.asm index 94199651a..07154b6b3 100644 --- a/data/pokedex/entries/189.asm +++ b/data/pokedex/entries/189.asm @@ -8,5 +8,3 @@ page "to make its way to" next "any place in the" next "world it wants.@" -; 0x1cda11 - diff --git a/data/pokedex/entries/190.asm b/data/pokedex/entries/190.asm index 1d9cbf18f..86bb3cdff 100644 --- a/data/pokedex/entries/190.asm +++ b/data/pokedex/entries/190.asm @@ -8,5 +8,3 @@ page "its momentum to" next "swing from one" next "branch to another.@" -; 0x1cda87 - diff --git a/data/pokedex/entries/191.asm b/data/pokedex/entries/191.asm index c4f7917ab..96e235198 100644 --- a/data/pokedex/entries/191.asm +++ b/data/pokedex/entries/191.asm @@ -8,5 +8,3 @@ page "shake its leaves" next "desperately at its" next "attacker.@" -; 0x1cdaef - diff --git a/data/pokedex/entries/192.asm b/data/pokedex/entries/192.asm index fd4ab5010..a92e9db45 100644 --- a/data/pokedex/entries/192.asm +++ b/data/pokedex/entries/192.asm @@ -8,5 +8,3 @@ page "#MON's face" next "become more vivid" next "and lively.@" -; 0x1cdb51 - diff --git a/data/pokedex/entries/193.asm b/data/pokedex/entries/193.asm index 7a3d1e901..8a9d14ec8 100644 --- a/data/pokedex/entries/193.asm +++ b/data/pokedex/entries/193.asm @@ -8,5 +8,3 @@ page "eyes, helping it" next "spot attackers and" next "food right away.@" -; 0x1d0078 - diff --git a/data/pokedex/entries/194.asm b/data/pokedex/entries/194.asm index 8b73d95f8..6ce375ae1 100644 --- a/data/pokedex/entries/194.asm +++ b/data/pokedex/entries/194.asm @@ -8,5 +8,3 @@ page "it barehanded will" next "cause a shooting" next "pain.@" -; 0x1d00dd - diff --git a/data/pokedex/entries/195.asm b/data/pokedex/entries/195.asm index 0c8cd45de..6d5e5a282 100644 --- a/data/pokedex/entries/195.asm +++ b/data/pokedex/entries/195.asm @@ -8,5 +8,3 @@ page "the river bottom" next "as it swims but" next "seems not to care.@" -; 0x1d0155 - diff --git a/data/pokedex/entries/196.asm b/data/pokedex/entries/196.asm index e5a0ddefe..c1644671a 100644 --- a/data/pokedex/entries/196.asm +++ b/data/pokedex/entries/196.asm @@ -8,5 +8,3 @@ page "predicting its" next "opponent's next" next "move.@" -; 0x1d01af - diff --git a/data/pokedex/entries/197.asm b/data/pokedex/entries/197.asm index 9e7ae227e..d19e690b9 100644 --- a/data/pokedex/entries/197.asm +++ b/data/pokedex/entries/197.asm @@ -8,5 +8,3 @@ page "the ring patterns" next "on its body glow" next "yellow.@" -; 0x1d021e - diff --git a/data/pokedex/entries/198.asm b/data/pokedex/entries/198.asm index fd5db0d7d..72ce3925b 100644 --- a/data/pokedex/entries/198.asm +++ b/data/pokedex/entries/198.asm @@ -8,5 +8,3 @@ page "MURKROW and" next "MEOWTH loot one" next "another's stashes.@" -; 0x1d0292 - diff --git a/data/pokedex/entries/199.asm b/data/pokedex/entries/199.asm index 057976b6f..60726c2d1 100644 --- a/data/pokedex/entries/199.asm +++ b/data/pokedex/entries/199.asm @@ -8,5 +8,3 @@ page "son into it. The" next "poison makes it" next "more intelligent.@" -; 0x1d0301 - diff --git a/data/pokedex/entries/200.asm b/data/pokedex/entries/200.asm index 9e1f5b7af..f646d85ae 100644 --- a/data/pokedex/entries/200.asm +++ b/data/pokedex/entries/200.asm @@ -8,5 +8,3 @@ page "them by screaming" next "loudly or appear-" next "ing suddenly.@" -; 0x1d0373 - diff --git a/data/pokedex/entries/201.asm b/data/pokedex/entries/201.asm index d7df7f924..76b9da319 100644 --- a/data/pokedex/entries/201.asm +++ b/data/pokedex/entries/201.asm @@ -8,5 +8,3 @@ page "that they must" next "have a variety of" next "abilities.@" -; 0x1d03dd - diff --git a/data/pokedex/entries/202.asm b/data/pokedex/entries/202.asm index 2d3d29142..950f65edd 100644 --- a/data/pokedex/entries/202.asm +++ b/data/pokedex/entries/202.asm @@ -8,5 +8,3 @@ page "a dark cave and" next "only moves about" next "at night.@" -; 0x1d0446 - diff --git a/data/pokedex/entries/203.asm b/data/pokedex/entries/203.asm index ba5e8286c..e6cdca5d7 100644 --- a/data/pokedex/entries/203.asm +++ b/data/pokedex/entries/203.asm @@ -8,5 +8,3 @@ page "mysterious powers" next "to drive away the" next "enemy.@" -; 0x1d04b0 - diff --git a/data/pokedex/entries/204.asm b/data/pokedex/entries/204.asm index 6edeb49c0..502a5d9b1 100644 --- a/data/pokedex/entries/204.asm +++ b/data/pokedex/entries/204.asm @@ -8,5 +8,3 @@ page "to its body. The" next "fluid hardens when" next "it touches air.@" -; 0x1d0524 - diff --git a/data/pokedex/entries/205.asm b/data/pokedex/entries/205.asm index 540d64797..09df4b488 100644 --- a/data/pokedex/entries/205.asm +++ b/data/pokedex/entries/205.asm @@ -8,5 +8,3 @@ page "shoots out bits of" next "its shell when it" next "sees action.@" -; 0x1d0593 - diff --git a/data/pokedex/entries/206.asm b/data/pokedex/entries/206.asm index 517436a21..ec2525beb 100644 --- a/data/pokedex/entries/206.asm +++ b/data/pokedex/entries/206.asm @@ -8,5 +8,3 @@ page "reaches it and" next "remains virtually" next "motionless there.@" -; 0x1d0604 - diff --git a/data/pokedex/entries/207.asm b/data/pokedex/entries/207.asm index 03f973837..435df525c 100644 --- a/data/pokedex/entries/207.asm +++ b/data/pokedex/entries/207.asm @@ -8,5 +8,3 @@ page "gliding, it hops" next "along the ground" next "back to its nest.@" -; 0x1d067c - diff --git a/data/pokedex/entries/208.asm b/data/pokedex/entries/208.asm index c3741a11c..5861dab78 100644 --- a/data/pokedex/entries/208.asm +++ b/data/pokedex/entries/208.asm @@ -8,5 +8,3 @@ page "#MON's body" next "reflect bright" next "light well.@" -; 0x1d06e0 - diff --git a/data/pokedex/entries/209.asm b/data/pokedex/entries/209.asm index 1966611ae..bc8709cf0 100644 --- a/data/pokedex/entries/209.asm +++ b/data/pokedex/entries/209.asm @@ -8,5 +8,3 @@ page "in order to hide" next "its fear from its" next "opponent.@" -; 0x1d074a - diff --git a/data/pokedex/entries/210.asm b/data/pokedex/entries/210.asm index 0ecc4d9fb..0f52f8f1d 100644 --- a/data/pokedex/entries/210.asm +++ b/data/pokedex/entries/210.asm @@ -8,5 +8,3 @@ page "opening its mouth" next "wide to reveal its" next "big fangs.@" -; 0x1d07b1 - diff --git a/data/pokedex/entries/211.asm b/data/pokedex/entries/211.asm index 8733eaba2..441c8187f 100644 --- a/data/pokedex/entries/211.asm +++ b/data/pokedex/entries/211.asm @@ -8,5 +8,3 @@ page "much water as it" next "can to match the" next "opponent's size.@" -; 0x1d0821 - diff --git a/data/pokedex/entries/212.asm b/data/pokedex/entries/212.asm index a97794f32..76d3650de 100644 --- a/data/pokedex/entries/212.asm +++ b/data/pokedex/entries/212.asm @@ -8,5 +8,3 @@ page "crush any hard" next "object it gets a" next "hold of into bits.@" -; 0x1d088e - diff --git a/data/pokedex/entries/213.asm b/data/pokedex/entries/213.asm index 3723eb0ef..890dedba4 100644 --- a/data/pokedex/entries/213.asm +++ b/data/pokedex/entries/213.asm @@ -8,5 +8,3 @@ page "nesting and can be" next "mixed with BERRIES" next "to make a drink.@" -; 0x1d0907 - diff --git a/data/pokedex/entries/214.asm b/data/pokedex/entries/214.asm index 7ce1d1d4d..06b5f91ec 100644 --- a/data/pokedex/entries/214.asm +++ b/data/pokedex/entries/214.asm @@ -8,5 +8,3 @@ page "nd an object that" next "is 100 times its" next "own weight.@" -; 0x1d097a - diff --git a/data/pokedex/entries/215.asm b/data/pokedex/entries/215.asm index b8aba2b53..adcfa3f96 100644 --- a/data/pokedex/entries/215.asm +++ b/data/pokedex/entries/215.asm @@ -8,5 +8,3 @@ page "of darkness," next "waiting to attack" next "its prey.@" -; 0x1d09da - diff --git a/data/pokedex/entries/216.asm b/data/pokedex/entries/216.asm index c6e303cba..f02be440f 100644 --- a/data/pokedex/entries/216.asm +++ b/data/pokedex/entries/216.asm @@ -8,5 +8,3 @@ page "because of all the" next "honey it has" next "absorbed.@" -; 0x1d0a41 - diff --git a/data/pokedex/entries/217.asm b/data/pokedex/entries/217.asm index db944463c..9ad558516 100644 --- a/data/pokedex/entries/217.asm +++ b/data/pokedex/entries/217.asm @@ -8,5 +8,3 @@ page "climbing trees. It" next "eats and sleeps in" next "the treetops.@" -; 0x1d0ab8 - diff --git a/data/pokedex/entries/218.asm b/data/pokedex/entries/218.asm index d6998cb2e..d0756bf58 100644 --- a/data/pokedex/entries/218.asm +++ b/data/pokedex/entries/218.asm @@ -8,5 +8,3 @@ page "than normal. If it" next "cools off, its" next "skin hardens.@" -; 0x1d0b21 - diff --git a/data/pokedex/entries/219.asm b/data/pokedex/entries/219.asm index e83798886..b955ed39c 100644 --- a/data/pokedex/entries/219.asm +++ b/data/pokedex/entries/219.asm @@ -8,5 +8,3 @@ page "Flames will" next "occasionally burst" next "from its shell.@" -; 0x1d0b8d - diff --git a/data/pokedex/entries/220.asm b/data/pokedex/entries/220.asm index b93d42115..2380a285a 100644 --- a/data/pokedex/entries/220.asm +++ b/data/pokedex/entries/220.asm @@ -8,5 +8,3 @@ page "is so tough that" next "even frozen ground" next "poses no problem.@" -; 0x1d0c01 - diff --git a/data/pokedex/entries/221.asm b/data/pokedex/entries/221.asm index 035437976..019e94aaf 100644 --- a/data/pokedex/entries/221.asm +++ b/data/pokedex/entries/221.asm @@ -8,5 +8,3 @@ page "prevent it from" next "slipping, even on" next "icy ground.@" -; 0x1d0c68 - diff --git a/data/pokedex/entries/222.asm b/data/pokedex/entries/222.asm index 0c91cb5fd..9cf6ba27a 100644 --- a/data/pokedex/entries/222.asm +++ b/data/pokedex/entries/222.asm @@ -8,5 +8,3 @@ page "clean water. They" next "cannot survive in" next "polluted water.@" -; 0x1d0cd3 - diff --git a/data/pokedex/entries/223.asm b/data/pokedex/entries/223.asm index 2691f746e..9a055d7f1 100644 --- a/data/pokedex/entries/223.asm +++ b/data/pokedex/entries/223.asm @@ -8,5 +8,3 @@ page "its mouth, then" next "use that force to" next "swim backward.@" -; 0x1d0d42 - diff --git a/data/pokedex/entries/224.asm b/data/pokedex/entries/224.asm index d6e641b79..b0303f675 100644 --- a/data/pokedex/entries/224.asm +++ b/data/pokedex/entries/224.asm @@ -8,5 +8,3 @@ page "steals the nesting" next "holes of others to" next "sleep in them.@" -; 0x1d0db1 - diff --git a/data/pokedex/entries/225.asm b/data/pokedex/entries/225.asm index 17407b962..ae67fb337 100644 --- a/data/pokedex/entries/225.asm +++ b/data/pokedex/entries/225.asm @@ -8,5 +8,3 @@ page "If attacked, it" next "throws its food at" next "the opponent.@" -; 0x1d0e25 - diff --git a/data/pokedex/entries/226.asm b/data/pokedex/entries/226.asm index 25dc6abcc..58b41c96a 100644 --- a/data/pokedex/entries/226.asm +++ b/data/pokedex/entries/226.asm @@ -8,5 +8,3 @@ page "into its mouth." next "Its whole body is" next "very coarse.@" -; 0x1d0e8c - diff --git a/data/pokedex/entries/227.asm b/data/pokedex/entries/227.asm index 51b0041b1..fe1d05d54 100644 --- a/data/pokedex/entries/227.asm +++ b/data/pokedex/entries/227.asm @@ -8,5 +8,3 @@ page "that people once" next "used the feathers" next "as swords.@" -; 0x1d0eff - diff --git a/data/pokedex/entries/228.asm b/data/pokedex/entries/228.asm index a9e97dc80..9da083599 100644 --- a/data/pokedex/entries/228.asm +++ b/data/pokedex/entries/228.asm @@ -8,5 +8,3 @@ page "area to announce" next "that this is its" next "territory.@" -; 0x1d0f66 - diff --git a/data/pokedex/entries/229.asm b/data/pokedex/entries/229.asm index dc66b4e1a..d3114d6fc 100644 --- a/data/pokedex/entries/229.asm +++ b/data/pokedex/entries/229.asm @@ -8,5 +8,3 @@ page "its mouth results" next "from toxins burn-" next "ing in its body.@" -; 0x1d0fd1 - diff --git a/data/pokedex/entries/230.asm b/data/pokedex/entries/230.asm index efe33cf9f..b76e74a00 100644 --- a/data/pokedex/entries/230.asm +++ b/data/pokedex/entries/230.asm @@ -8,5 +8,3 @@ page "at which no other" next "life forms can" next "survive.@" -; 0x1d1038 - diff --git a/data/pokedex/entries/231.asm b/data/pokedex/entries/231.asm index b05619682..076512fca 100644 --- a/data/pokedex/entries/231.asm +++ b/data/pokedex/entries/231.asm @@ -8,5 +8,3 @@ page "where it deftly" next "uses its trunk to" next "take a shower.@" -; 0x1d10ac - diff --git a/data/pokedex/entries/232.asm b/data/pokedex/entries/232.asm index 3c8e4a1f3..298e96277 100644 --- a/data/pokedex/entries/232.asm +++ b/data/pokedex/entries/232.asm @@ -8,5 +8,3 @@ page "attack won't even" next "leave a scratch on" next "it.@" -; 0x1d110c - diff --git a/data/pokedex/entries/233.asm b/data/pokedex/entries/233.asm index c6be07b88..75213ce4f 100644 --- a/data/pokedex/entries/233.asm +++ b/data/pokedex/entries/233.asm @@ -8,5 +8,3 @@ page "technology. It" next "may have unprog-" next "rammed reactions.@" -; 0x1d1174 - diff --git a/data/pokedex/entries/234.asm b/data/pokedex/entries/234.asm index 25a37388a..550a4f980 100644 --- a/data/pokedex/entries/234.asm +++ b/data/pokedex/entries/234.asm @@ -8,5 +8,3 @@ page "be ground into a" next "powder that aids" next "in sleeping.@" -; 0x1d11e0 - diff --git a/data/pokedex/entries/235.asm b/data/pokedex/entries/235.asm index e775600df..0e2b3c6db 100644 --- a/data/pokedex/entries/235.asm +++ b/data/pokedex/entries/235.asm @@ -8,5 +8,3 @@ page "tail is predeter-" next "mined for each" next "SMEARGLE.@" -; 0x1d124b - diff --git a/data/pokedex/entries/236.asm b/data/pokedex/entries/236.asm index 3eb4ef54c..c77de72f9 100644 --- a/data/pokedex/entries/236.asm +++ b/data/pokedex/entries/236.asm @@ -8,5 +8,3 @@ page "anyone. It has a" next "very strong com-" next "petitive spirit.@" -; 0x1d12c0 - diff --git a/data/pokedex/entries/237.asm b/data/pokedex/entries/237.asm index 192aeae0b..09f7a6d23 100644 --- a/data/pokedex/entries/237.asm +++ b/data/pokedex/entries/237.asm @@ -8,5 +8,3 @@ page "opponent's timing," next "it presents its" next "fancy kick moves.@" -; 0x1d132b - diff --git a/data/pokedex/entries/238.asm b/data/pokedex/entries/238.asm index 5b10b2572..5b0059d9f 100644 --- a/data/pokedex/entries/238.asm +++ b/data/pokedex/entries/238.asm @@ -8,5 +8,3 @@ page "It uses them to" next "try to identify" next "unknown objects.@" -; 0x1d1398 - diff --git a/data/pokedex/entries/239.asm b/data/pokedex/entries/239.asm index 9553aa2f5..49fa2c01f 100644 --- a/data/pokedex/entries/239.asm +++ b/data/pokedex/entries/239.asm @@ -8,5 +8,3 @@ page "flickers bluish-" next "white when it is" next "charging energy.@" -; 0x1d140e - diff --git a/data/pokedex/entries/240.asm b/data/pokedex/entries/240.asm index 6ca68128b..a38f82879 100644 --- a/data/pokedex/entries/240.asm +++ b/data/pokedex/entries/240.asm @@ -8,5 +8,3 @@ page "when many appear," next "it heralds a" next "volcanic eruption.@" -; 0x1d1482 - diff --git a/data/pokedex/entries/241.asm b/data/pokedex/entries/241.asm index da449be03..882f1a436 100644 --- a/data/pokedex/entries/241.asm +++ b/data/pokedex/entries/241.asm @@ -8,5 +8,3 @@ page "rhythmically pull-" next "ing up and down" next "on its udders.@" -; 0x1d14f7 - diff --git a/data/pokedex/entries/242.asm b/data/pokedex/entries/242.asm index 38f3a7895..a8af8411f 100644 --- a/data/pokedex/entries/242.asm +++ b/data/pokedex/entries/242.asm @@ -8,5 +8,3 @@ page "provides will make" next "everyone around" next "smile with joy.@" -; 0x1d156b - diff --git a/data/pokedex/entries/243.asm b/data/pokedex/entries/243.asm index ed6d3bb21..cba4455b2 100644 --- a/data/pokedex/entries/243.asm +++ b/data/pokedex/entries/243.asm @@ -8,5 +8,3 @@ page "then sweeps across" next "the land, shooting" next "off electricity.@" -; 0x1d15dd - diff --git a/data/pokedex/entries/244.asm b/data/pokedex/entries/244.asm index b30afa9b2..a073e4b29 100644 --- a/data/pokedex/entries/244.asm +++ b/data/pokedex/entries/244.asm @@ -8,5 +8,3 @@ page "spouting flames" next "hotter than a" next "volcano's magma.@" -; 0x1d1642 - diff --git a/data/pokedex/entries/245.asm b/data/pokedex/entries/245.asm index f8763699f..2768f979b 100644 --- a/data/pokedex/entries/245.asm +++ b/data/pokedex/entries/245.asm @@ -8,5 +8,3 @@ page "always in search" next "of a pure" next "reservoir.@" -; 0x1d169c - diff --git a/data/pokedex/entries/246.asm b/data/pokedex/entries/246.asm index bfa45f911..d674f7a32 100644 --- a/data/pokedex/entries/246.asm +++ b/data/pokedex/entries/246.asm @@ -8,5 +8,3 @@ page "pupa after eating" next "enough dirt to" next "make a mountain.@" -; 0x1d1709 - diff --git a/data/pokedex/entries/247.asm b/data/pokedex/entries/247.asm index dfe104c4f..bdb6a5151 100644 --- a/data/pokedex/entries/247.asm +++ b/data/pokedex/entries/247.asm @@ -8,5 +8,3 @@ page "already has arms" next "and legs under its" next "solid shell.@" -; 0x1d177b - diff --git a/data/pokedex/entries/248.asm b/data/pokedex/entries/248.asm index 8c5852b56..15a90d4a1 100644 --- a/data/pokedex/entries/248.asm +++ b/data/pokedex/entries/248.asm @@ -8,5 +8,3 @@ page "make the ground" next "shake and moun-" next "tains crumble.@" -; 0x1d17e9 - diff --git a/data/pokedex/entries/249.asm b/data/pokedex/entries/249.asm index c84ea7cbb..63b2204f5 100644 --- a/data/pokedex/entries/249.asm +++ b/data/pokedex/entries/249.asm @@ -8,5 +8,3 @@ page "rms. It is said" next "that LUGIA appears" next "when storms start.@" -; 0x1d185d - diff --git a/data/pokedex/entries/250.asm b/data/pokedex/entries/250.asm index 62390b1a5..8fb8b0e46 100644 --- a/data/pokedex/entries/250.asm +++ b/data/pokedex/entries/250.asm @@ -8,5 +8,3 @@ page "trainer by shining" next "its bright rain-" next "bow-colored wings.@" -; 0x1d18cc - diff --git a/data/pokedex/entries/251.asm b/data/pokedex/entries/251.asm index 770b654d5..aba5ad405 100644 --- a/data/pokedex/entries/251.asm +++ b/data/pokedex/entries/251.asm @@ -8,5 +8,3 @@ page "appears wherever" next "beautiful forests" next "exist.@" -; 0x1d1931 - diff --git a/data/pokedex/entries_crystal.asm b/data/pokedex/entries_crystal.asm index dda18db9e..fc38b063d 100644 --- a/data/pokedex/entries_crystal.asm +++ b/data/pokedex/entries_crystal.asm @@ -1,3 +1,2 @@ INCLUDE "pokecrystal.asm" INCLUDE "data/pokedex/entries.asm" - diff --git a/data/wild/fish.asm b/data/wild/fish.asm index 0bb7a812c..777c7b48a 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -499,4 +499,3 @@ TimeFishGroups: ; 9266f db TENTACOOL, 40 ; day ; 926c7 - diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 313f608a4..d859ed986 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -1,4 +1,4 @@ -; Johto Pokémon in water +; Johto Pokémon in water db GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE db $05 ; encounter rate diff --git a/engine/color.asm b/engine/color.asm index 694f9b7bf..b43e3d066 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -2769,4 +2769,3 @@ Palettes_b7a9: ; b7a9 RGB 00, 00, 00 RGB 00, 00, 00 ; b829 - diff --git a/engine/credits.asm b/engine/credits.asm index 18785a6bd..727dbb9b0 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -1307,4 +1307,3 @@ CreditsStrings: ; (C) 1 9 9 5 - 2 0 0 1 G A M E F R E A K i n c . next $60,$61,$62,$63,$64,$65,$66, $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c db "@" - diff --git a/engine/credits_crystal.asm b/engine/credits_crystal.asm index f417985e9..51265434b 100644 --- a/engine/credits_crystal.asm +++ b/engine/credits_crystal.asm @@ -1,3 +1,2 @@ INCLUDE "pokecrystal.asm" INCLUDE "engine/credits.asm" - diff --git a/engine/events_2.asm b/engine/events_2.asm index 0a20e79be..433c7caea 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -641,4 +641,3 @@ Function97f42: ; 97f42 pop af ret ; 97f7e - diff --git a/engine/facings.asm b/engine/facings.asm index 7f078224e..47e6fd352 100644 --- a/engine/facings.asm +++ b/engine/facings.asm @@ -266,4 +266,3 @@ Facing31: ; 426a db 9, -1, 4, $fe db 9, 9, 4 | X_FLIP, $fe ; 4273 - diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index b1e16cc3a..26002641a 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -159,4 +159,3 @@ NothingHereText: ; 440c9 text_jump _NothingHereText db "@" ; 440ce - diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 28c0d60a9..831709514 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -291,4 +291,3 @@ RegionCheck: ; 0x1caea1 .kanto ld e, 1 ret - diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 983c1c700..d7c1b6581 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -3680,4 +3680,3 @@ Function5ac2: ; 5ac2 dw ObjectStruct11 dw ObjectStruct12 ; 5ae8 - diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 96a9e58f2..abac62b9c 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1658,4 +1658,3 @@ UnknownScript_0xa0b09: clearflag ENGINE_14 specialphonecall $0000 end - diff --git a/engine/movement.asm b/engine/movement.asm index 1b5f53b35..775406494 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -827,5 +827,3 @@ Function548a: ; 548a ld [hl], $9 ret ; 54b8 - - diff --git a/engine/pack.asm b/engine/pack.asm index b83576148..e765bab7e 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1689,4 +1689,3 @@ INCBIN "gfx/misc/pack_menu.2bpp" PackGFX: INCBIN "gfx/misc/pack.w40.2bpp" - diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 8ca68ce30..62c04cb12 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -2586,4 +2586,3 @@ Function41a58: ; 41a58 (10:5a58) pop af ld [UnownLetter], a ret - diff --git a/engine/scripting.asm b/engine/scripting.asm index 6999d624d..3012d14b3 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -3237,4 +3237,3 @@ Function97c20: ; 97c20 .byte db 0 ; 97c28 - diff --git a/engine/specials.asm b/engine/specials.asm index 0c8158502..ef2952328 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -639,4 +639,3 @@ SpecialTrainerHouse: ; 0xc4b9 ld a, [$abfd] ; XXX what is this memory location? ld [ScriptVar], a jp CloseSRAM - diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 98602bd8a..b5c763220 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -2365,4 +2365,3 @@ MovementData_0xbcea1: ; bcea1 turn_head_up step_end ; bcea5 - diff --git a/engine/title.asm b/engine/title.asm index 309b1ea80..a5ce99f20 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -474,4 +474,3 @@ TitleScreenPalettes: RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - diff --git a/event/dratini.asm b/event/dratini.asm index 1845673c8..1352492ca 100644 --- a/event/dratini.asm +++ b/event/dratini.asm @@ -109,4 +109,3 @@ GetNthPartyMon: ; 0x8b1ce scf ret ; 8b1e1 - diff --git a/event/name_rater.asm b/event/name_rater.asm index c1aedf026..43d6c9a90 100644 --- a/event/name_rater.asm +++ b/event/name_rater.asm @@ -233,4 +233,3 @@ UnknownText_0xfb83c: ; 0xfb83c text_jump UnknownText_0x1c0272 db "@" ; 0xfb841 - diff --git a/event/poke_seer.asm b/event/poke_seer.asm index 3775e4a5b..87d55dad4 100644 --- a/event/poke_seer.asm +++ b/event/poke_seer.asm @@ -448,5 +448,3 @@ GetCaughtGender: ; 4f301 ld c, 0 ret ; 4f31c - - @@ -108,4 +108,3 @@ rUNKNOWN5 EQU $ff75 ; (8Fh) - Bit 4-6 (Read/Write) rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only) rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only) rIE EQU $ffff ; Interrupt Enable (R/W) - diff --git a/gfx/overworld/sprite_headers.asm b/gfx/overworld/sprite_headers.asm index 0b7eb4433..42822224a 100644 --- a/gfx/overworld/sprite_headers.asm +++ b/gfx/overworld/sprite_headers.asm @@ -614,4 +614,3 @@ StandingYoungsterSprite: ; 14994 db $3 * $40, BANK(StandingYoungsterSpriteGFX) db STANDING_SPRITE, PAL_OW_BLUE ; 1499a - diff --git a/gfx/pics.asm b/gfx/pics.asm index b29940e98..051ae6500 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -789,6 +789,3 @@ INCBIN "gfx/pics/unown_y/back.6x6.2bpp.lz" INCBIN "gfx/pics/unown_p/back.6x6.2bpp.lz" INCBIN "gfx/pics/unown_i/back.6x6.2bpp.lz" INCBIN "gfx/pics/unown_r/back.6x6.2bpp.lz" - - - diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index 8e646da93..c2ab2626e 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -1119,5 +1119,3 @@ Functiond066e: ; d066e ld [CurPartySpecies], a ret ; d0695 - - diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm index eb8814f22..7756e8e7e 100644 --- a/gfx/pics/palette_pointers.asm +++ b/gfx/pics/palette_pointers.asm @@ -539,4 +539,3 @@ CelebiShinyPalette: INCLUDE "gfx/pics/celebi/shiny.pal" RGB 17, 17, 17 ; b0ce - diff --git a/gfx/pics/pic_pointers.asm b/gfx/pics/pic_pointers.asm index ac9864139..99000be70 100644 --- a/gfx/pics/pic_pointers.asm +++ b/gfx/pics/pic_pointers.asm @@ -508,4 +508,3 @@ dbw -1, -1 ; unused add_pic EggPic dbw -1, -1 ; unused - diff --git a/gfx/pics/unown_frame_pointers.asm b/gfx/pics/unown_frame_pointers.asm index 9d3c4b1d4..8907f5303 100644 --- a/gfx/pics/unown_frame_pointers.asm +++ b/gfx/pics/unown_frame_pointers.asm @@ -25,4 +25,3 @@ UnownFramesPointers: dw UnownXFrames dw UnownYFrames dw UnownZFrames - diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm index 145c35534..6dbf13983 100644 --- a/gfx/trainers/palette_pointers.asm +++ b/gfx/trainers/palette_pointers.asm @@ -80,4 +80,3 @@ OfficerPalette: INCLUDE "gfx/trainers/officer.pal" GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal" MysticalmanPalette: INCLUDE "gfx/trainers/mysticalman.pal" ; b1de - @@ -2266,4 +2266,3 @@ Function3f9f:: ; 3f9f jr nz, .asm_3fa2 ret ; 3fb5 - diff --git a/home/copy.asm b/home/copy.asm index 538669654..e49094554 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -416,4 +416,3 @@ Copy1bpp:: ; fa4 pop hl jp FarCopyBytesDouble ; fb6 - diff --git a/home/copy2.asm b/home/copy2.asm index 136c5f602..ca83ff44b 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -131,4 +131,3 @@ GetFarWRAMWord:: ; 308d ld [rSVBK], a ret ; 309d - diff --git a/home/decompress.asm b/home/decompress.asm index b98be0fe8..13613f64a 100644 --- a/home/decompress.asm +++ b/home/decompress.asm @@ -341,4 +341,3 @@ LZ_LONG_HI EQU %00000011 inc hl jp .Main ; c2f - diff --git a/home/delay.asm b/home/delay.asm index b9f84fcdf..450b4190c 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -20,4 +20,3 @@ DelayFrames:: ; 468 jr nz, DelayFrames ret ; 46f - diff --git a/home/double_speed.asm b/home/double_speed.asm index 4bb6e1253..c07dc9cee 100644 --- a/home/double_speed.asm +++ b/home/double_speed.asm @@ -28,4 +28,3 @@ SwitchSpeed:: ; 2ffd stop ; rgbasm adds a nop after this instruction by default ret ; 300b - diff --git a/home/fade.asm b/home/fade.asm index 71a701a09..2c8bc3baa 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -131,4 +131,3 @@ IncGradGBPalTable_13:: db %10010000, %10000000, %10010000 IncGradGBPalTable_14:: db %01000000, %01000000, %01000000 IncGradGBPalTable_15:: db %00000000, %00000000, %00000000 ; 547 - diff --git a/home/farcall.asm b/home/farcall.asm index f54ba0df0..a74bcc3ae 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -52,4 +52,3 @@ ReturnFarCall:: ; 2d6e Function2d82:: ; 2d82 jp [hl] ; 2d83 - diff --git a/home/flag.asm b/home/flag.asm index 98b7f6526..479a51c33 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -110,4 +110,3 @@ Function2ead:: ; 2ead and a ret ; 2ebb - diff --git a/home/game_time.asm b/home/game_time.asm index 94539cd6a..54cad89c9 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -129,4 +129,3 @@ UpdateGameTimer:: ; 20ad ld [GameTimeHours + 1], a ret ; 210f - diff --git a/home/handshake.asm b/home/handshake.asm index 68dad5cb7..5c7664144 100644 --- a/home/handshake.asm +++ b/home/handshake.asm @@ -35,4 +35,3 @@ AskSerial:: ; 2063 ret ; 208a - diff --git a/home/init.asm b/home/init.asm index be6bfe99b..6ada3e267 100644 --- a/home/init.asm +++ b/home/init.asm @@ -221,4 +221,3 @@ Function270:: ; 270 call CloseSRAM ret ; 283 - diff --git a/home/item.asm b/home/item.asm index 3ba5db2a8..92d74c350 100644 --- a/home/item.asm +++ b/home/item.asm @@ -73,4 +73,3 @@ CheckItem:: ; 2f79 pop hl ret ; 2f8c - diff --git a/home/joypad.asm b/home/joypad.asm index ae2ab92be..5a161fb14 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -488,4 +488,3 @@ Functionb06:: ; b06 ld [hl], a ret ; b40 - diff --git a/home/lcd.asm b/home/lcd.asm index 216941995..cf3e40699 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -78,4 +78,3 @@ EnableLCD:: ; 58a ld [rLCDC], a ret ; 591 - diff --git a/home/map.asm b/home/map.asm index d5e83ca3a..259ed9503 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2348,4 +2348,3 @@ LoadTilesetHeader:: ; 2d27 pop hl ret ; 2d43 - diff --git a/home/map_objects.asm b/home/map_objects.asm index 2a78bfaa5..4a2b58712 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -678,4 +678,3 @@ GetSpriteDirection:: ; 1b07 and $c ret ; 1b0f - diff --git a/home/math.asm b/home/math.asm index 5e1cbdb50..8e19e0412 100644 --- a/home/math.asm +++ b/home/math.asm @@ -73,4 +73,3 @@ SubtractSigned:: ; 3136 scf ret ; 313d - diff --git a/home/menu.asm b/home/menu.asm index 8c2b562fc..21ce9c515 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -595,4 +595,3 @@ Function2057:: ; 2057 ret ; 2063 - diff --git a/home/movement.asm b/home/movement.asm index cd6476bc9..f0869aa99 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -218,4 +218,3 @@ Function1c23:: ; 0x1c23 call Function1c30 ret ; 0x1c30 - diff --git a/home/palettes.asm b/home/palettes.asm index 68e85f503..38f1d554d 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -344,4 +344,3 @@ Functiondbd:: ; dbd rst Bankswitch ret ; dc9 - diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm index ac59ffeb8..7aacd4981 100644 --- a/home/pokedex_flags.asm +++ b/home/pokedex_flags.asm @@ -36,4 +36,3 @@ PokedexFlagAction:: ; 33a1 and a ret ; 33ab - diff --git a/home/predef.asm b/home/predef.asm index 9c57497bf..03f741469 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -51,4 +51,3 @@ Predef:: ; 2d83 ld l, a ret ; 2dba - diff --git a/home/random.asm b/home/random.asm index 46b3e7571..ae39f439c 100644 --- a/home/random.asm +++ b/home/random.asm @@ -82,4 +82,3 @@ RandomRange:: ; 2fb1 pop bc ret ; 2fcb - diff --git a/home/rtc.asm b/home/rtc.asm index 1e42bf47d..7070c0dad 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -22,4 +22,3 @@ UpdateTimePals:: ; 485 callab _UpdateTimePals ret ; 48c - diff --git a/home/serial.asm b/home/serial.asm index e7dac7d07..302630cc7 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -404,5 +404,3 @@ Function919:: ; 919 ld [rSC], a ret ; 92e - - diff --git a/home/sine.asm b/home/sine.asm index 24fb1af92..e1552db24 100644 --- a/home/sine.asm +++ b/home/sine.asm @@ -19,4 +19,3 @@ Sine:: ; 1b11 rst Bankswitch ret ; 1b1e - diff --git a/home/sram.asm b/home/sram.asm index 8f60f57f3..4cfe14cf9 100644 --- a/home/sram.asm +++ b/home/sram.asm @@ -31,4 +31,3 @@ CloseSRAM:: ; 2fe1 pop af ret ; 2fec - diff --git a/home/string.asm b/home/string.asm index 5b705002a..70a0f2dd5 100644 --- a/home/string.asm +++ b/home/string.asm @@ -36,4 +36,3 @@ _InitString:: ; 2efc pop hl ret ; 2f17 - diff --git a/home/tilemap.asm b/home/tilemap.asm index 6eadba1a0..ceda55dd2 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -216,4 +216,3 @@ GetAttrCoord:: ; 1d21 add hl, bc ret ; 1d35 - diff --git a/home/time.asm b/home/time.asm index 6c1aaec5f..639f0b110 100644 --- a/home/time.asm +++ b/home/time.asm @@ -307,4 +307,3 @@ Function6e3:: ; 6e3 call CloseSRAM ret ; 6ef - diff --git a/home/video.asm b/home/video.asm index 3fdd5888d..7392d6e0f 100644 --- a/home/video.asm +++ b/home/video.asm @@ -484,4 +484,3 @@ AnimateTileset:: ; 17d3 rst Bankswitch ret ; 17ff - diff --git a/home/window.asm b/home/window.asm index 66c666340..8c1e95134 100644 --- a/home/window.asm +++ b/home/window.asm @@ -93,4 +93,3 @@ Function2e31:: ; 2e31 ld [hOAMUpdate], a ret ; 2e4e - @@ -71,4 +71,3 @@ hCGBPalUpdate EQU $ffe5 hCGB EQU $ffe6 hSGB EQU $ffe7 hDMATransfer EQU $ffe8 - diff --git a/interrupts.asm b/interrupts.asm index 2da426e96..c5e357780 100644 --- a/interrupts.asm +++ b/interrupts.asm @@ -14,4 +14,3 @@ SECTION "serial",ROM0[$58] SECTION "joypad",ROM0[$60] jp JoypadInt - diff --git a/items/item_attributes.asm b/items/item_attributes.asm index d35011f70..d251bfcac 100644 --- a/items/item_attributes.asm +++ b/items/item_attributes.asm @@ -2049,5 +2049,3 @@ Item2Attributes: db 0 ; can select + toss db ITEM db $00 ; can't use - - diff --git a/items/item_descriptions.asm b/items/item_descriptions.asm index cd8b961ba..9309b811d 100644 --- a/items/item_descriptions.asm +++ b/items/item_descriptions.asm @@ -1040,4 +1040,3 @@ TeruSama32Desc: TeruSama33Desc: db "?@" - diff --git a/items/item_effects.asm b/items/item_effects.asm index 5f594c1c7..377bd46da 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -3301,4 +3301,3 @@ Functionf969: ; f969 add hl, bc ret ; f971 - diff --git a/items/item_names.asm b/items/item_names.asm index 8e3b6cd48..7a31888b6 100644 --- a/items/item_names.asm +++ b/items/item_names.asm @@ -254,4 +254,3 @@ db "TERU-SAMA@" db "TERU-SAMA@" db "?@" - diff --git a/items/marts.asm b/items/marts.asm index 16a0695c4..a11b8a5bb 100644 --- a/items/marts.asm +++ b/items/marts.asm @@ -440,4 +440,3 @@ DefaultMart: ; 16214 db POTION db $ff ; 16218 - diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 7fb32906d..8ab169815 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -9634,4 +9634,3 @@ Function113f2d: ; 113f2d ld [hl], a ret ; 113f84 - diff --git a/macros/move_anim.asm b/macros/move_anim.asm index 962324bc6..f14fea7b7 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -241,4 +241,3 @@ anim_call: macro anim_ret: macro db $ff endm - diff --git a/macros/movement.asm b/macros/movement.asm index a78d532da..1d556f922 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -283,4 +283,3 @@ step_shake: macro db $55 db \1 ; displacement endm - diff --git a/macros/sound.asm b/macros/sound.asm index 8b8de34b2..ae1c192fb 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -227,4 +227,3 @@ callchannel: macro endchannel: macro db $ff endm - @@ -96596,4 +96596,3 @@ INCBIN "misc/stadium2_2.bin" ELSE INCBIN "misc/stadium2_1.bin" ENDC - @@ -510,4 +510,3 @@ SECTION "Map Scripts 25", ROMX, BANK[MAP_SCRIPTS_25] INCLUDE "maps/SilverCaveOutside.asm" INCLUDE "maps/Route10North.asm" - diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 511d52473..d9c079d58 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -502,6 +502,3 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff ; 0x18f441 - - - diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index b363bf8d4..ef1f03dd7 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -67,4 +67,3 @@ AzaleaMart_MapEventHeader: ; 0x18e118 person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff ; 0x18e14f - diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 0f4313331..5b37978e3 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -105,4 +105,3 @@ AzaleaPokeCenter1F_MapEventHeader: ; 0x18dccf person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff ; 0x18dd18 - diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index d24362744..f2704b57a 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -552,4 +552,3 @@ AzaleaTown_MapEventHeader: ; 0x1987c1 person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4 ; 0x1988d0 - diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 5d65fd6bb..180b51a48 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -852,4 +852,3 @@ BattleTower1F_MapEventHeader: ; 0x9f3b4 person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff ; 0x9f40f - diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index e16feb3e8..a69d56865 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -168,4 +168,3 @@ BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791 person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x9f558 - diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 900d01c7b..3bb3b469d 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -68,4 +68,3 @@ BattleTowerElevator_MapEventHeader: ; 0x9f594 db 1 person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff ; 0x9f5b1 - diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 1ac5939bb..33bde1837 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -109,4 +109,3 @@ BattleTowerHallway_MapEventHeader: ; 0x9f62f db 1 person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff ; 0x9f660 - diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 68db0320e..4628a134f 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -167,5 +167,3 @@ BattleTowerOutside_MapEventHeader: ; 0x9fb5f person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff ; 0x9fbb2 - - diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 886430c50..22f2ddff5 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -404,4 +404,3 @@ BillsHouse_MapEventHeader: ; 0x189b42 db 1 person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff ; 0x189b5f - diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 79a316008..322735606 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -40,4 +40,3 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34 db 1 person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff ; 0x195a5b - diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 2b6047b2f..f852da0b8 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -64,4 +64,3 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; 0x1959fe person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff ; 0x195a28 - diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b3f9e61fc..5513aa6e5 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -497,4 +497,3 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff ; 0x195722 - diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 77618b808..0914854b7 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -208,4 +208,3 @@ BlackthornGym2F_MapEventHeader: ; 0x1958c0 person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff ; 0x195947 - diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 35d664937..641aedb38 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -68,4 +68,3 @@ BlackthornMart_MapEventHeader: ; 0x195b40 person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff ; 0x195b77 - diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index f56d721a9..26b48b5ed 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -73,4 +73,3 @@ BlackthornPokeCenter1F_MapEventHeader: ; 0x195c69 person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, $ffff person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, $ffff ; 0x195cb2 - diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index aab29be8f..dfc68e96b 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -175,4 +175,3 @@ BluesHouse_MapEventHeader: ; 0x19b3a8 db 1 person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff ; 0x19b3c5 - diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9101547f0..348800279 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -158,4 +158,3 @@ BrunosRoom_MapEventHeader: ; 0x180b88 db 1 person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff ; 0x180baf - diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 356dfcb81..bae9bfdb2 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -345,4 +345,3 @@ BurnedTower1F_MapEventHeader: ; 0x1860b2 person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764 person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656 ; 0x186151 - diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 67dd1bd7a..94a6fabec 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -279,6 +279,3 @@ BurnedTowerB1F_MapEventHeader: ; 0x1863de person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657 person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, $07aa ; 0x18647f - - - diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 844fde007..456b93688 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -250,4 +250,3 @@ CeladonCafe_MapEventHeader: ; 0x73316 person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff ; 0x73371 - diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 27623e8ea..dd1596acc 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -305,4 +305,3 @@ CeladonCity_MapEventHeader: ; 0x1aa497 person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, $ffff person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, $ffff ; 0x1aa567 - diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index e8fe87f30..8940aa6b4 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -103,4 +103,3 @@ CeladonDeptStore1F_MapEventHeader: ; 0x70b60 person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff ; 0x70bab - diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index a36d03d3c..135ea4614 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -97,4 +97,3 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4 person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff ; 0x70d27 - diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index be4a3b5bf..9083e9244 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -126,4 +126,3 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff ; 0x70f0b - diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index c60a9def4..0ff2eac0e 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -78,4 +78,3 @@ CeladonDeptStore4F_MapEventHeader: ; 0x70fbc person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff ; 0x71002 - diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 5cf0cf639..bc5a6a6dd 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -102,4 +102,3 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110 person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff ; 0x71170 - diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index b7e4a0b59..59fd9a422 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -194,4 +194,3 @@ CeladonDeptStore6F_MapEventHeader: ; 0x71363 person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff ; 0x713ab - diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 5d45c7bb8..abe31164f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -51,4 +51,3 @@ CeladonDeptStoreElevator_MapEventHeader: ; 0x713d8 ; people-events db 0 ; 0x713ed - diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 119543cb5..f841c3769 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -370,4 +370,3 @@ CeladonGameCorner_MapEventHeader: ; 0x725a4 person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, $ffff ; 0x726e7 - diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 87af10d63..bc0233cd9 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -318,4 +318,3 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; 0x72a34 person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, $ffff person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, $ffff ; 0x72a68 - diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 0c1456fdc..c1607b89c 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -400,4 +400,3 @@ CeladonGym_MapEventHeader: ; 0x72fdf person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff ; 0x73047 - diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 6f529443d..11ce2b04f 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -108,4 +108,3 @@ CeladonMansion1F_MapEventHeader: ; 0x714cc person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, ClefairyScript_0x713fc, $ffff person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x71406, $ffff ; 0x7152e - diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e5f4169b1..2e7925f70 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -78,4 +78,3 @@ CeladonMansion2F_MapEventHeader: ; 0x71645 ; people-events db 0 ; 0x7166e - diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 6051e4a49..5905b347f 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -238,4 +238,3 @@ CeladonMansion3F_MapEventHeader: ; 0x719d5 person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, $ffff person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, $ffff ; 0x71a37 - diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 4059b437d..26b47114b 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -56,4 +56,3 @@ CeladonMansionRoof_MapEventHeader: ; 0x71ad4 db 1 person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff ; 0x71afb - diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 5408a3c2a..6820266cb 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -139,4 +139,3 @@ CeladonMansionRoofHouse_MapEventHeader: ; 0x71e03 db 1 person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff ; 0x71e20 - diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index be868698b..8ec22eaff 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -177,4 +177,3 @@ CeladonPokeCenter1F_MapEventHeader: ; 0x720b8 person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, $ffff person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, $07b7 ; 0x7210e - diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index ea799b308..79e8690ed 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CeladonPokeCenter2FBeta_MapEventHeader: ; 0x72110 ; people-events db 0 ; 0x7211b - diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 23f3cbfca..d89a46aaa 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -346,4 +346,3 @@ CeruleanCity_MapEventHeader: ; 0x18445d person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff ; 0x1844fc - diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index c208c8094..c3bb07c86 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -476,4 +476,3 @@ CeruleanGym_MapEventHeader: ; 0x188a51 person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, $076f person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, $076f ; 0x188abe - diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index e20db6593..ae149ebc7 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -35,4 +35,3 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; 0x18802b db 1 person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff ; 0x188048 - diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 297f34949..2a067019a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -67,4 +67,3 @@ CeruleanMart_MapEventHeader: ; 0x188b9b person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff ; 0x188bd2 - diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 16a4f36f4..e5164ab4b 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -87,4 +87,3 @@ CeruleanPokeCenter1F_MapEventHeader: ; 0x188386 person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, $ffff person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, $ffff ; 0x1883c2 - diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 664d1e5f1..666eabb2d 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CeruleanPokeCenter2FBeta_MapEventHeader: ; 0x1883c4 ; people-events db 0 ; 0x1883cf - diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 530600e51..e9b0de73a 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -66,4 +66,3 @@ CeruleanPoliceStation_MapEventHeader: ; 0x1880fa person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff ; 0x188131 - diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 3ad42c785..2efba93ad 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -78,4 +78,3 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; 0x1881c9 person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff ; 0x18820d - diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 5df7072ab..32ff56525 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -184,4 +184,3 @@ CharcoalKiln_MapEventHeader: ; 0x18dff8 person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, YoungsterScript_0x18dd3a, $06f6 person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, MoltresScript_0x18dd63, $06f5 ; 0x18e03e - diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 2575965f8..11cdce851 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -633,4 +633,3 @@ CherrygroveCity_MapEventHeader: ; 0x19c829 person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, FisherScript_0x19c16e, $ffff ; 0x19c8ad - diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index a40236ab3..8da0dfc28 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -65,4 +65,3 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; 0x196d2e person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff ; 0x196d62 - diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index c8d0d5855..ddd354086 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -68,4 +68,3 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; 0x196bd1 person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff ; 0x196c05 - diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 72edd8524..b971bb8bd 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -96,4 +96,3 @@ CherrygroveMart_MapEventHeader: ; 0x196934 person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff ; 0x19696b - diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index a88a9cba6..18d709797 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -95,4 +95,3 @@ CherrygrovePokeCenter1F_MapEventHeader: ; 0x196a96 person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, $ffff person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, $ffff ; 0x196adf - diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 855557b5a..149a63dcb 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -460,4 +460,3 @@ CianwoodCity_MapEventHeader: ; 0x1a0772 person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae ; 0x1a0867 - diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 6ad10d62f..ecd5b0b85 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -70,4 +70,3 @@ CianwoodCityPhotoStudio_MapEventHeader: ; 0x9e191 db 1 person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff ; 0x9e1ae - diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 38f63f49f..36b55e61e 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -426,4 +426,3 @@ CianwoodGym_MapEventHeader: ; 0x9db3e person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff ; 0x9dbcd - diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index b6974294f..31a0499e9 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -87,4 +87,3 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; 0x9e32b person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, $ffff person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, $ffff ; 0x9e36c - diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 2b014c571..8bd3cc3b0 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -100,4 +100,3 @@ CianwoodPharmacy_MapEventHeader: ; 0x9e0b7 db 1 person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, PharmacistScript_0x9df9e, $ffff ; 0x9e0de - diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index dbdcfbc3b..2be7f1df2 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -159,4 +159,3 @@ CianwoodPokeCenter1F_MapEventHeader: ; 0x9df4e person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, $ffff ; 0x9df97 - diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 5ff8bbeb2..56fa7ec65 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -162,4 +162,3 @@ CinnabarIsland_MapEventHeader: ; 0x1accf4 db 1 person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, BlueScript_0x1ac9b0, $0775 ; 0x1acd20 - diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index bb3346dcf..59fde2b89 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -57,4 +57,3 @@ CinnabarPokeCenter1F_MapEventHeader: ; 0x1ab3ab person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff ; 0x1ab3e7 - diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index 31155e7c7..9efbed5bc 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CinnabarPokeCenter2FBeta_MapEventHeader: ; 0x1ab3e9 ; people-events db 0 ; 0x1ab3f4 - diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 23ce0ae36..df7131bd6 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -97,4 +97,3 @@ Colosseum_MapEventHeader: ; 0x1934b7 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x1934eb - diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 19874e184..160a25629 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -98,4 +98,3 @@ CopycatsHouse1F_MapEventHeader: ; 0x18ae5e person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff ; 0x18ae9a - diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index e102c651e..eda9558fc 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -418,4 +418,3 @@ CopycatsHouse2F_MapEventHeader: ; 0x18b4f0 person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, BirdScript_0x18afca, $ffff person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, CopycatScript_0x18aeb1, $06ef ; 0x18b553 - diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index eb2ca6311..830766e38 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -480,4 +480,3 @@ DanceTheatre_MapEventHeader: ; 0x99baa person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, $ffff person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, $ffff ; 0x99c39 - diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index a3a3a794f..e4682818f 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -83,4 +83,3 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; 0x18c83d person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1 person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2 ; 0x18c874 - diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 06b3fdf27..2e68e3717 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -60,4 +60,3 @@ DarkCaveVioletEntrance_MapEventHeader: ; 0x18c69c person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0 person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce ; 0x18c71e - diff --git a/maps/DayCare.asm b/maps/DayCare.asm index eda851c11..101cf063c 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -194,5 +194,3 @@ DayCare_MapEventHeader: ; 0x63250 person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5 person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff ; 0x6328e - - diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 1fdb07f2d..14a5e3c10 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -49,4 +49,3 @@ DiglettsCave_MapEventHeader: ; 0x74049 db 1 person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff ; 0x7407f - diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index db020759b..0cfec0681 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -747,4 +747,3 @@ DragonShrine_MapEventHeader: ; 0x18dabc person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, $0000 person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790 ; 0x18db00 - diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 1ed9cc415..5e13d911c 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -26,4 +26,3 @@ DragonsDen1F_MapEventHeader: ; 0x18c876 ; people-events db 0 ; 0x18c890 - diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 520e406d8..c5e8344c8 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -547,4 +547,3 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73 person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 ; 0x18d014 - diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 4707f4184..8f67d4fc0 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -473,4 +473,3 @@ EarlsPokemonAcademy_MapEventHeader: ; 0x69375 person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, $ffff person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, PokedexScript_0x68b0b, $ffff ; 0x693e7 - diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b55ad3494..b4f6f135d 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -334,4 +334,3 @@ EcruteakCity_MapEventHeader: ; 0x1a45fc person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, $ffff person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, $07a9 ; 0x1a46d0 - diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index fe33080fa..67321595f 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -546,4 +546,3 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9 person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8 ; 0x9a5f9 - diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 75339c82a..68c27410a 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -332,4 +332,3 @@ EcruteakHouse_MapEventHeader: ; 0x98502 person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1 person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1 ; 0x98565 - diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 3c79bfeac..b8c1fdbee 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -193,4 +193,3 @@ EcruteakItemfinderHouse_MapEventHeader: ; 0x9a9f5 person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, $ffff person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, $ffff ; 0x9aa24 - diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index ddf8cc814..6d26551b8 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -67,4 +67,3 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; 0x99431 person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, $ffff person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, $ffff ; 0x99460 - diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 66c55da4c..1a02bab9f 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -67,4 +67,3 @@ EcruteakMart_MapEventHeader: ; 0x99d12 person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, $ffff person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, $ffff ; 0x99d49 - diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index dcce7b399..f793c0336 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -244,4 +244,3 @@ EcruteakPokeCenter1F_MapEventHeader: ; 0x992dc person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, $ffff person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713 ; 0x99332 - diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 936c66ff7..6b1ef1a91 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -110,4 +110,3 @@ ElmsHouse_MapEventHeader: ; 0x7b0ea person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, TeacherScript_0x7aeeb, $ffff person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, BugCatcherScript_0x7aeee, $ffff ; 0x7b123 - diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 502fb1ab1..bad898e74 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1555,4 +1555,3 @@ ElmsLab_MapEventHeader: ; 0x7a3de person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, $0702 ; 0x7a4cc - diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index e0090fbc6..6f8f2c513 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -352,4 +352,3 @@ FastShip1F_MapEventHeader: ; 0x754f1 person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, $ffff person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c ; 0x75577 - diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4942bb957..7349fdb0c 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -698,4 +698,3 @@ FastShipB1F_MapEventHeader: ; 0x76ee9 person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b ; 0x76faa - diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 6ba34a780..34392b0a2 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -657,4 +657,3 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a ; 0x76730 - diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index cc8879cc5..df481ad7f 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -421,4 +421,3 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; 0x759ce person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b ; 0x75a4d - diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 6ba34a780..34392b0a2 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -657,4 +657,3 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a ; 0x76730 - diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8af2b9827..16bbc6c33 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -339,4 +339,3 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42 person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b ; 0x75ea4 - diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 585d85427..e4d16f123 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -68,4 +68,3 @@ FightingDojo_MapEventHeader: ; 0x189bf8 person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d ; 0x189c2c - diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 580ec5569..5bf6bca47 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -48,4 +48,3 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; 0x196428 person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff ; 0x196452 - diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 0d55cc5cd..d3d4df745 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -183,4 +183,3 @@ FuchsiaCity_MapEventHeader: ; 0x194d67 person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, $ffff person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, $ffff ; 0x194e00 - diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 6899bc821..991438781 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -438,4 +438,3 @@ FuchsiaGym_MapEventHeader: ; 0x196353 person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff ; 0x1963bb - diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 3b503d643..ee4794410 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -59,4 +59,3 @@ FuchsiaMart_MapEventHeader: ; 0x195d6e person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff ; 0x195da5 - diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 49ee101da..ffaa50117 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -118,4 +118,3 @@ FuchsiaPokeCenter1F_MapEventHeader: ; 0x19656e person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, $ffff person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, $ffff ; 0x1965b7 - diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 4cae1173c..182ee7465 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ FuchsiaPokeCenter2FBeta_MapEventHeader: ; 0x1965b9 ; people-events db 0 ; 0x1965c4 - diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index f895f5f46..0e7dc59df 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -140,4 +140,3 @@ GoldenrodBikeShop_MapEventHeader: ; 0x54907 db 1 person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff ; 0x54951 - diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 359e69e15..740c684b0 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -288,4 +288,3 @@ GoldenrodBillsHouse_MapEventHeader: ; 0x5509f person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x54c25, $ffff person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, TwinScript_0x54c39, $ffff ; 0x550e5 - diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8927ecc67..ea08397f7 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -682,4 +682,3 @@ GoldenrodCity_MapEventHeader: ; 0x1991d1 person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, $06ce person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, PokefanMScript_0x198909, $076a ; 0x199321 - diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index e683073ab..cb59839b0 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -110,4 +110,3 @@ GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03 person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff ; 0x55b5b - diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 96ca37a4d..7ebe1c46a 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -133,4 +133,3 @@ GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56 person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, $ffff person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, $ffff ; 0x55db6 - diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index f406849ac..70af6bc26 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -84,4 +84,3 @@ GoldenrodDeptStore3F_MapEventHeader: ; 0x55ea1 person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff ; 0x55ee7 - diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index d3113cdd0..0272f4b57 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -107,4 +107,3 @@ GoldenrodDeptStore4F_MapEventHeader: ; 0x56038 person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, $ffff person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, $ffff ; 0x5608b - diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 417638a38..a478cd919 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -270,4 +270,3 @@ GoldenrodDeptStore5F_MapEventHeader: ; 0x56386 person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, $ffff person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, $0763 ; 0x563f3 - diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 9554a576a..fabc3f721 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -194,4 +194,3 @@ GoldenrodDeptStore6F_MapEventHeader: ; 0x5664a person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, $ffff person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, $ffff ; 0x56697 - diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7e6da9a2b..161625236 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -149,4 +149,3 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; 0x7d8ce person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, $ffff person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, $ffff ; 0x7d94b - diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 8182801b1..84e5280b3 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -81,4 +81,3 @@ GoldenrodDeptStoreElevator_MapEventHeader: ; 0x566fe ; people-events db 0 ; 0x56713 - diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index bc39da5c7..e6348490e 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -263,4 +263,3 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; 0x56b6d person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, $06f0 person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, $06f0 ; 0x56bf4 - diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 73a568818..6219fdf11 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -192,4 +192,3 @@ GoldenrodFlowerShop_MapEventHeader: ; 0x5561e person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768 ; 0x55648 - diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 5605f8fef..16c4db9be 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -543,6 +543,3 @@ GoldenrodGameCorner_MapEventHeader: ; 0x571db person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, $ffff person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, $076b ; 0x57322 - - - diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index bf11bc30b..5a6aa91e7 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -511,4 +511,3 @@ GoldenrodGym_MapEventHeader: ; 0x546dd person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff ; 0x5474d - diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index a714c7e54..afc59237b 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -176,4 +176,3 @@ GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff ; 0x54be2 - diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index b26bb421d..0bc171372 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -205,4 +205,3 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; 0x5531f person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, $ffff person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, $0749 ; 0x5535b - diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 760e88084..6e771c729 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -47,4 +47,3 @@ GoldenrodNameRatersHouse_MapEventHeader: ; 0x55953 db 1 person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff ; 0x5597f - diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index c587f07ea..dc22e58f5 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -78,4 +78,3 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; 0x55741 person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff ; 0x5577a - diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 45e977bdb..986becdf8 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -905,4 +905,3 @@ GoldenrodPokeCenter1F_MapEventHeader: ; 0x62564 person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, $ffff person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, $ffff ; 0x625cf - diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 66d41b20b..0599c64ef 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -314,4 +314,3 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; 0x62c32 person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, $ffff person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, $ffff ; 0x62c78 - diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 7f2a6d81a..18ccf6bd2 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -49,4 +49,3 @@ GuideGentsHouse_MapEventHeader: ; 0x196c89 db 1 person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff ; 0x196cb0 - diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a44a63546..ccc2ba1a1 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -135,8 +135,3 @@ HallOfFame_MapEventHeader: ; 0x181678 db 1 person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x181695 - - - - - diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ef1c76b01..7a320793c 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -41,4 +41,3 @@ IcePath1F_MapEventHeader: ; 0x7e478 person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689 person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be ; 0x7e4b9 - diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index c47e5db49..a7d7d887c 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -128,4 +128,3 @@ IcePathB1F_MapEventHeader: ; 0x7e52d person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070c person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a ; 0x7e5a1 - diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 8571aace5..53171f4c5 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -36,4 +36,3 @@ IcePathB2FBlackthornSide_MapEventHeader: ; 0x7e64b db 1 person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d ; 0x7e66d - diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index ed6e5d2b4..3af69a5c5 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -59,4 +59,3 @@ IcePathB2FMahoganySide_MapEventHeader: ; 0x7e5cd person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c ; 0x7e644 - diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index c77898e15..ff80e5409 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -34,4 +34,3 @@ IcePathB3F_MapEventHeader: ; 0x7e674 person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, RockScript_0x7e671, $ffff ; 0x7e69e - diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d016b73e9..39b1c5e65 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1080,6 +1080,3 @@ IlexForest_MapEventHeader: ; 0x6f5e7 person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb ; 0x6f6a4 - - - diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index b37d07967..a282247b5 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -53,4 +53,3 @@ IlexForestAzaleaGate_MapEventHeader: ; 0x62cf4 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, $ffff person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, $ffff ; 0x62d28 - diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 656ca2d20..bc2c75dcc 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -352,4 +352,3 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441 person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, GrampsScript_0x180139, $077c person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, JynxScript_0x18015a, $077c ; 0x1804b9 - diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index d43428ed0..9bdeee14a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -166,4 +166,3 @@ KarensRoom_MapEventHeader: ; 0x180e05 db 1 person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff ; 0x180e2c - diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 2bdc7e1a3..7143f7efe 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -163,4 +163,3 @@ KogasRoom_MapEventHeader: ; 0x18095f db 1 person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff ; 0x180986 - diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 6c7dcfcab..4f248b163 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -444,4 +444,3 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31 person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, $0792 ; 0x7abab - diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index e50fbd7be..75b89a993 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -163,4 +163,3 @@ KrissHouse2F_MapEventHeader: ; 0x7ac99 person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2Script_0x7abce, $0743 person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDollScript_0x7abd0, $0744 ; 0x7acec - diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index ed6089e61..436037909 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -132,4 +132,3 @@ KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0 person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, CooltrainerFScript_0x7acee, $ffff person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, PokefanFScript_0x7acf1, $0793 ; 0x7aee9 - diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c0002ea06..9360e21de 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -777,4 +777,3 @@ KurtsHouse_MapEventHeader: ; 0x18eba8 person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, $073f person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, TwinScript_0x18e42e, $078d ; 0x18ec1c - diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index d2a77186b..144a82487 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -93,4 +93,3 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; 0x19a685 db 1 person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, FisherScript_0x19a527, $ffff ; 0x19a6ac - diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index b688390bf..b43935404 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -245,4 +245,3 @@ LakeofRageMagikarpHouse_MapEventHeader: ; 0x19aae2 db 1 person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff ; 0x19ab09 - diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index c315ad61c..a0a1ff6eb 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -389,4 +389,3 @@ LancesRoom_MapEventHeader: ; 0x1813f4 person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f ; 0x181445 - diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 6c6173c70..6cf12dd93 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -263,4 +263,3 @@ LavRadioTower1F_MapEventHeader: ; 0x7f3b9 person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, $ffff person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, $ffff ; 0x7f414 - diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 0cacfdc92..d26fbf258 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -69,4 +69,3 @@ LavenderMart_MapEventHeader: ; 0x7ec0e person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, $ffff person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, $ffff ; 0x7ec45 - diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 43c3464ba..c300de2fc 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -45,4 +45,3 @@ LavenderNameRater_MapEventHeader: ; 0x7eafd db 1 person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, GentlemanScript_0x7eaf2, $ffff ; 0x7eb1a - diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 25c1b6f6a..5f0f7fbe0 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -107,4 +107,3 @@ LavenderPokeCenter1F_MapEventHeader: ; 0x7e872 person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, $ffff person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, $ffff ; 0x7e8bb - diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index cf6ee4e51..a133ad335 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ LavenderPokeCenter2FBeta_MapEventHeader: ; 0x7e8bd ; people-events db 0 ; 0x7e8c8 - diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 68e1244f3..92d5b306c 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -155,4 +155,3 @@ LavenderTown_MapEventHeader: ; 0x1ad8ac person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, $ffff person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, $ffff ; 0x1ad927 - diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 1484304c4..4a0751fdb 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -50,4 +50,3 @@ LavenderTownSpeechHouse_MapEventHeader: ; 0x7eac4 db 1 person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff ; 0x7eaeb - diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index d1bf21133..b3b8287a0 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -513,4 +513,3 @@ MahoganyGym_MapEventHeader: ; 0x19a2df person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff ; 0x19a354 - diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 3f82fd015..2cb6a8888 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -268,4 +268,3 @@ MahoganyMart1F_MapEventHeader: ; 0x6c5fb person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736 ; 0x6c651 - diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index e6d5740f9..e16adaf90 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -78,4 +78,3 @@ MahoganyPokeCenter1F_MapEventHeader: ; 0x19a46a person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, $ffff person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, $ffff ; 0x19a4b3 - diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 3b71940d9..bdf040941 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -82,4 +82,3 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; 0x199a72 person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff ; 0x199a9c - diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 76a582636..24be2398f 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -309,4 +309,3 @@ MahoganyTown_MapEventHeader: ; 0x1903d8 person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, $0757 person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, $0736 ; 0x19044f - diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 854f0665e..e4dd252e0 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -238,4 +238,3 @@ ManiasHouse_MapEventHeader: ; 0x9d5f0 db 1 person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff ; 0x9d60d - diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 4d9485e37..89c617f06 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -95,6 +95,3 @@ MobileBattleRoom_MapEventHeader: ; 0x193673 ; people-events db 0 ; 0x193688 - - - diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index e32463b4a..a17b47ee6 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -61,4 +61,3 @@ MobileTradeRoomMobile_MapEventHeader: ; 0x1935af ; people-events db 0 ; 0x1935c4 - diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 92760f5a7..73d0cb770 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -197,4 +197,3 @@ MountMoon_MapEventHeader: ; 0x74356 db 1 person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a ; 0x74391 - diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index ecb718423..16e98c135 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -47,4 +47,3 @@ MountMoonGiftShop_MapEventHeader: ; 0x771e7 person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, $ffff person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, $ffff ; 0x7722b - diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index d11a3ae0a..aff776684 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -179,4 +179,3 @@ MountMoonSquare_MapEventHeader: ; 0x77158 person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, RockScript_0x7711e, $0778 ; 0x771a6 - diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 9e7f30019..2ec1c9833 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -191,4 +191,3 @@ MountMortar1FInside_MapEventHeader: ; 0x7e01d person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 ; 0x7e0c8 - diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 0cf0adb43..125a6b77e 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -48,4 +48,3 @@ MountMortar1FOutside_MapEventHeader: ; 0x7ddfd person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c ; 0x7de4f - diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 5db70563f..fe23e759e 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -114,4 +114,3 @@ MountMortar2FInside_MapEventHeader: ; 0x7e184 person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685 person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff ; 0x7e1f4 - diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index a0082d803..081abf549 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -169,4 +169,3 @@ MountMortarB1F_MapEventHeader: ; 0x7e400 person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc ; 0x7e470 - diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index b700bdcea..5dd07ebf5 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -40,4 +40,3 @@ MoveDeletersHouse_MapEventHeader: ; 0x195cbf db 1 person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x195cb4, $ffff ; 0x195ce6 - diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 6b0da4626..c7db5199c 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -109,4 +109,3 @@ MrFujisHouse_MapEventHeader: ; 0x7e9ea person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x7e8da, $ffff person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MoltresScript_0x7e8e4, $ffff ; 0x7ea45 - diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 513385ec9..637a6513a 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -429,4 +429,3 @@ MrPokemonsHouse_MapEventHeader: ; 0x1975ef person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, $ffff person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9 ; 0x197632 - diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 726cb3274..b2ab78827 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -70,4 +70,3 @@ MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 db 1 person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff ; 0x18a817 - diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index c665af53b..edf80de41 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -674,4 +674,3 @@ NationalPark_MapEventHeader: ; 0x5c806 person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, $ffff person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659 ; 0x5c8ea - diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index bc6d0f4b4..ed3dce387 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -274,4 +274,3 @@ NationalParkBugContest_MapEventHeader: ; 0x5cc5d person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658 person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659 ; 0x5cd27 - diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 7eeb2d671..67b912e8b 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -347,4 +347,3 @@ NewBarkTown_MapEventHeader: ; 0x1a834d person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, $ffff person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, $06bd ; 0x1a83b2 - diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 30f1d3234..d9ca25232 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -316,6 +316,3 @@ OaksLab_MapEventHeader: ; 0x19ba33 person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff ; 0x19bac7 - - - diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index dd948ed90..f108b3936 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -102,4 +102,3 @@ OlivineCafe_MapEventHeader: ; 0x9ca8e person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, $ffff person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, $ffff ; 0x9cac5 - diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 714904162..61b8438a0 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -360,4 +360,3 @@ OlivineCity_MapEventHeader: ; 0x1a8cce person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, $ffff person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3 ; 0x1a8d72 - diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index a5f1555f5..a4e72f3b0 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -107,4 +107,3 @@ OlivineGoodRodHouse_MapEventHeader: ; 0x9c8a2 db 1 person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x9c71b, $ffff ; 0x9c8bf - diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 209c558f5..89b302ebb 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -237,4 +237,3 @@ OlivineGym_MapEventHeader: ; 0x9c526 person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, $06d3 person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff ; 0x9c55a - diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index b62b8f9d0..d112fb075 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -64,4 +64,3 @@ OlivineHouseBeta_MapEventHeader: ; 0x9c601 person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, $ffff person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, $ffff ; 0x9c635 - diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 87bd7752a..4b899ee6b 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -60,4 +60,3 @@ OlivineLighthouse1F_MapEventHeader: ; 0x5af36 person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff ; 0x5af6f - diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 1223de492..2e3b5dcee 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -284,4 +284,3 @@ OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff ; 0x5b23b - diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index f44991413..fd146ddb7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -200,4 +200,3 @@ OlivineLighthouse3F_MapEventHeader: ; 0x5b481 person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 ; 0x5b4e8 - diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index da6f2143a..641ed5628 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -148,6 +148,3 @@ OlivineLighthouse4F_MapEventHeader: ; 0x5b6c0 person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie1, $ffff ; 0x5b712 - - - diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 6c0e0b890..1a9d0f7d5 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -161,4 +161,3 @@ OlivineLighthouse5F_MapEventHeader: ; 0x60b20 person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666 person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667 ; 0x60b8f - diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index e9b18143f..f1bf0c5fd 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -299,4 +299,3 @@ OlivineLighthouse6F_MapEventHeader: ; 0x60f53 person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, $ffff person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668 ; 0x60f8f - diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 30b6fd92c..1320a3330 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -67,4 +67,3 @@ OlivineMart_MapEventHeader: ; 0x9cb9e person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff ; 0x9cbd5 - diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 1a83aaef1..004ebbf31 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -71,4 +71,3 @@ OlivinePokeCenter1F_MapEventHeader: ; 0x9c0e4 person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, $ffff person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, $ffff ; 0x9c12d - diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 437db358a..e24328528 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -450,4 +450,3 @@ OlivinePort_MapEventHeader: ; 0x74d18 person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, $0738 person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, $0738 ; 0x74d90 - diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index d14e948c6..e8f865397 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -41,4 +41,3 @@ OlivinePortPassage_MapEventHeader: ; 0x76fec db 1 person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733 ; 0x77018 - diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 25ca2b111..603e980cc 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -64,4 +64,3 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; 0x9c6e5 person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, PokefanMScript_0x9c637, $ffff person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, LassScript_0x9c63a, $ffff ; 0x9c719 - diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 50d4cff50..1e5134a62 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -40,4 +40,3 @@ OlivineVoltorbHouse_MapEventHeader: ; 0x9c566 db 1 person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, FishingGuruScript_0x9c55c, $ffff ; 0x9c58d - diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 3a0c81413..3d24bcd10 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -107,4 +107,3 @@ PalletTown_MapEventHeader: ; 0x1ac7cf person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, $ffff person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, $ffff ; 0x1ac812 - diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index eb7650ed0..aead22b48 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -205,4 +205,3 @@ PewterCity_MapEventHeader: ; 0x18c2f5 person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, $ffff person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, $ffff ; 0x18c378 - diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 02036f079..b711ea4d0 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -261,4 +261,3 @@ PewterGym_MapEventHeader: ; 0x1a2d88 person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff ; 0x1a2dc9 - diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 4588cf7d1..d41c97cfa 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -67,4 +67,3 @@ PewterMart_MapEventHeader: ; 0x1a2eae person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff ; 0x1a2ee5 - diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 69527d0dc..4fc54289d 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -49,4 +49,3 @@ PewterNidoranSpeechHouse_MapEventHeader: ; 0x1a2838 person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff ; 0x1a2862 - diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index e9f58f9df..6cc9a3474 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -23,4 +23,3 @@ PewterPokeCEnter2FBeta_MapEventHeader: ; 0x1a304c ; people-events db 0 ; 0x1a3057 - diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index faf3801f3..9223c01e8 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -93,4 +93,3 @@ PewterPokeCenter1F_MapEventHeader: ; 0x1a2ff4 person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff ; 0x1a304a - diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index b9ded5852..29b5e2849 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -42,6 +42,3 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; 0x1a308a db 1 person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff ; 0x1a30b1 - - - diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 7b00ed670..8bd060f52 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1178,4 +1178,3 @@ PokeCenter2F_MapEventHeader: ; 0x19337f person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, $ffff person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, $0711 ; 0x1933dc - diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 0d03b21d2..b12439b4b 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -34,4 +34,3 @@ PokeSeersHouse_MapEventHeader: ; 0x9e376 db 1 person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, $ffff ; 0x9e393 - diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ce86fe900..99c23de62 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -347,4 +347,3 @@ PokemonFanClub_MapEventHeader: ; 0x191e4d person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, $0774 person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, $ffff ; 0x191eb5 - diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8094b2bd6..fc055ce53 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -450,4 +450,3 @@ PowerPlant_MapEventHeader: ; 0x1894b9 person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, FisherScript_0x188e65, $ffff person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, $ffff ; 0x189536 - diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 8a5f1aca4..bb5945fd8 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -559,4 +559,3 @@ RadioTower1F_MapEventHeader: ; 0x5d68e person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, $06cf person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, $06cf ; 0x5d6fb - diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index b99bae619..06fa58941 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -875,4 +875,3 @@ RadioTower2F_MapEventHeader: ; 0x5e481 person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, BuenaScript_0x5d775, $ffff person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, $06cf ; 0x5e53e - diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index e30e4961a..6d38adb0d 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -461,4 +461,3 @@ RadioTower3F_MapEventHeader: ; 0x5eb01 person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce ; 0x5eb80 - diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 1425cfc09..a305cdb57 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -365,6 +365,3 @@ RadioTower4F_MapEventHeader: ; 0x5f01a person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce ; 0x5f099 - - - diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index bafa1a755..3789f82bb 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -497,4 +497,3 @@ RadioTower5F_MapEventHeader: ; 0x60906 person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, RockerScript_0x600fb, $06d0 person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd ; 0x60980 - diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 751deae02..49bd8f53f 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -106,4 +106,3 @@ RedsHouse1F_MapEventHeader: ; 0x19b017 db 1 person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMomScript_0x19aea3, $ffff ; 0x19b048 - diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index b0c1ad0e2..864c9d3a9 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -49,4 +49,3 @@ RedsHouse2F_MapEventHeader: ; 0x19b0b9 ; people-events db 0 ; 0x19b0ce - diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index f13e64145..7e4af31bf 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -52,4 +52,3 @@ RockTunnel1F_MapEventHeader: ; 0x743bf person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f ; 0x74407 - diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 1c0d4e396..d6b3ea8c3 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -48,4 +48,3 @@ RockTunnelB1F_MapEventHeader: ; 0x74412 person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781 person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782 ; 0x74458 - diff --git a/maps/Route1.asm b/maps/Route1.asm index eddd39553..dc102136c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -141,4 +141,3 @@ Route1_MapEventHeader: ; 0x1ac69a person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff ; 0x1ac6cc - diff --git a/maps/Route10North.asm b/maps/Route10North.asm index a298e6a37..d1930f232 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -39,5 +39,3 @@ Route10North_MapEventHeader: ; 0x1b2099 ; people-events db 0 ; 0x1b20b3 - - diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 4f75e87dc..b4426e0e2 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -107,4 +107,3 @@ Route10PokeCenter1F_MapEventHeader: ; 0x188d63 person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, $ffff person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, $ffff ; 0x188dac - diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 5e1aebf08..24bad9881 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -23,4 +23,3 @@ Route10PokeCenter2FBeta_MapEventHeader: ; 0x188dae ; people-events db 0 ; 0x188db9 - diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 91ff1d882..363dde504 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -136,4 +136,3 @@ Route10South_MapEventHeader: ; 0x1ae504 person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff ; 0x1ae52e - diff --git a/maps/Route11.asm b/maps/Route11.asm index a6badce14..7f9aca992 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -252,4 +252,3 @@ Route11_MapEventHeader: ; 0x68242 person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff ; 0x68293 - diff --git a/maps/Route12.asm b/maps/Route12.asm index 3429f481b..dfad65689 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -278,6 +278,3 @@ Route12_MapEventHeader: ; 0x1a72cf person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788 person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789 ; 0x1a7337 - - - diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 437b549f8..6fd7a9a3f 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -102,4 +102,3 @@ Route12SuperRodHouse_MapEventHeader: ; 0x7f60b db 1 person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff ; 0x7f628 - diff --git a/maps/Route13.asm b/maps/Route13.asm index 68a58c25f..d2c9930b7 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -324,4 +324,3 @@ Route13_MapEventHeader: ; 0x1a27aa person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff ; 0x1a2805 - diff --git a/maps/Route14.asm b/maps/Route14.asm index 70eb27728..fab1b9790 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -194,4 +194,3 @@ Route14_MapEventHeader: ; 0x1ad6a1 person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff ; 0x1ad6db - diff --git a/maps/Route15.asm b/maps/Route15.asm index ec144d7ec..cc1e508ba 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -348,4 +348,3 @@ Route15_MapEventHeader: ; 0x1aa90a person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a ; 0x1aa97a - diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 697503ed5..2442a6d4c 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -40,4 +40,3 @@ Route15FuchsiaGate_MapEventHeader: ; 0x1967e1 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff ; 0x196808 - diff --git a/maps/Route16.asm b/maps/Route16.asm index 4a77c0d56..408d7f5b2 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -58,4 +58,3 @@ Route16_MapEventHeader: ; 0x1ad35c ; people-events db 0 ; 0x1ad380 - diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index e3981abc4..2b2af9aaf 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -44,4 +44,3 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; 0x733bc db 1 person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff ; 0x733e3 - diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 96d0b05d5..d306bda8a 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -90,4 +90,3 @@ Route16Gate_MapEventHeader: ; 0x734df db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff ; 0x73516 - diff --git a/maps/Route17.asm b/maps/Route17.asm index e74c537a2..734de0333 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -245,4 +245,3 @@ Route17_MapEventHeader: ; 0x1ad2c5 person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff ; 0x1ad313 - diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 987b0b526..ce932c95d 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -81,6 +81,3 @@ Route1718Gate_MapEventHeader: ; 0x736b6 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff ; 0x736ed - - - diff --git a/maps/Route18.asm b/maps/Route18.asm index 2f94c2917..7d8c954dc 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -139,4 +139,3 @@ Route18_MapEventHeader: ; 0x1ad077 person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff ; 0x1ad0a6 - diff --git a/maps/Route19.asm b/maps/Route19.asm index 08ee826cc..a4e1601b3 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -352,4 +352,3 @@ Route19_MapEventHeader: ; 0x19ee31 person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, $ffff person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, $ffff ; 0x19ee94 - diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 23b9de4de..318c4b7bb 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -68,4 +68,3 @@ Route19FuchsiaGate_MapEventHeader: ; 0x1ab4cd db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff ; 0x1ab4f4 - diff --git a/maps/Route2.asm b/maps/Route2.asm index e6cf1e6e9..e37d96887 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -256,4 +256,3 @@ Route2_MapEventHeader: ; 0x1ac4af person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff ; 0x1ac554 - diff --git a/maps/Route20.asm b/maps/Route20.asm index 2d47a5885..c81882bf9 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -198,4 +198,3 @@ Route20_MapEventHeader: ; 0x1acef8 person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff ; 0x1acf2f - diff --git a/maps/Route21.asm b/maps/Route21.asm index 8db97cffe..2efee7505 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -167,4 +167,3 @@ Route21_MapEventHeader: ; 0x1ac97a person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff ; 0x1ac9a7 - diff --git a/maps/Route22.asm b/maps/Route22.asm index cd6242bd6..b1f4b77f5 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -36,4 +36,3 @@ Route22_MapEventHeader: ; 0x7c028 ; people-events db 0 ; 0x7c038 - diff --git a/maps/Route23.asm b/maps/Route23.asm index 1a709039e..44e524fe2 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -50,4 +50,3 @@ Route23_MapEventHeader: ; 0x1ae579 ; people-events db 0 ; 0x1ae598 - diff --git a/maps/Route24.asm b/maps/Route24.asm index 70e7d577a..fb59d08f5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -138,4 +138,3 @@ Route24_MapEventHeader: ; 0x1adf50 db 1 person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c ; 0x1adf63 - diff --git a/maps/Route25.asm b/maps/Route25.asm index a003d362c..8746a1fd0 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -622,6 +622,3 @@ Route25_MapEventHeader: ; 0x19f58f person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b ; 0x19f643 - - - diff --git a/maps/Route26.asm b/maps/Route26.asm index cd7a08c6c..edd1543c5 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -583,4 +583,3 @@ Route26_MapEventHeader: ; 0x1a5389 person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, $ffff person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa ; 0x1a540b - diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 899292903..5d396fc56 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -91,4 +91,3 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; 0x7b375 db 1 person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff ; 0x7b392 - diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index e44f898c5..b7ed379cf 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -71,4 +71,3 @@ Route26HealSpeechHouse_MapEventHeader: ; 0x7b1bb db 1 person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff ; 0x7b1e2 - diff --git a/maps/Route27.asm b/maps/Route27.asm index 3261eaf19..1ba167a0d 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -655,4 +655,3 @@ Route27_MapEventHeader: ; 0x1a0ead person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff ; 0x1a0f4c - diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 1b4e969fb..44597ff95 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -120,4 +120,3 @@ Route27SandstormHouse_MapEventHeader: ; 0x7b592 db 1 person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, GrannyScript_0x7b394, $ffff ; 0x7b5b9 - diff --git a/maps/Route28.asm b/maps/Route28.asm index f4666347e..61347bb7a 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -41,4 +41,3 @@ Route28_MapEventHeader: ; 0x1a541d ; people-events db 0 ; 0x1a5437 - diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 8c3f3fac6..b5ab8fb8a 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -100,5 +100,3 @@ Route28FamousSpeechHouse_MapEventHeader: ; 0x1ae762 person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1ae658, $ffff person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x1ae675, $ffff ; 0x1ae796 - - diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 9774d3204..67fbcc415 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -59,6 +59,3 @@ Route2946Gate_MapEventHeader: ; 0x7b674 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, $ffff person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, $ffff ; 0x7b6a8 - - - diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 4c0800f46..fb4ec0110 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -46,4 +46,3 @@ Route2Gate_MapEventHeader: ; 0x9b9ca db 1 person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff ; 0x9b9f1 - diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index a9c52f8e2..0b5ef8a7a 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -72,4 +72,3 @@ Route2NuggetSpeechHouse_MapEventHeader: ; 0x9b933 db 1 person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff ; 0x9b950 - diff --git a/maps/Route3.asm b/maps/Route3.asm index bbe1c47f0..647f3f313 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -235,4 +235,3 @@ Route3_MapEventHeader: ; 0x1ae18a person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff ; 0x1ae1ce - diff --git a/maps/Route30.asm b/maps/Route30.asm index 2e7e990d6..187e57170 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -534,4 +534,3 @@ Route30_MapEventHeader: ; 0x1a1c54 person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, $ffff person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, $07b8 ; 0x1a1d0c - diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 384c8fa38..49fd7e30c 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -69,4 +69,3 @@ Route30BerrySpeechHouse_MapEventHeader: ; 0x196e20 db 1 person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff ; 0x196e47 - diff --git a/maps/Route31.asm b/maps/Route31.asm index b24345965..93dd83909 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -511,4 +511,3 @@ Route31_MapEventHeader: ; 0x1a5a79 person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af ; 0x1a5af3 - diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index a9fbfa66f..8fa1b26c6 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -50,6 +50,3 @@ Route31VioletGate_MapEventHeader: ; 0x19768c person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff ; 0x1976c0 - - - diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index db23b7105..27fd67517 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -123,4 +123,3 @@ Route32PokeCenter1F_MapEventHeader: ; 0x69cf9 person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, $ffff person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, $ffff ; 0x69d35 - diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index a588bde83..fde87863b 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -71,4 +71,3 @@ Route32RuinsofAlphGate_MapEventHeader: ; 0x69b0f person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff ; 0x69b50 - diff --git a/maps/Route33.asm b/maps/Route33.asm index f8ece08cc..e1b137812 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -252,4 +252,3 @@ Route33_MapEventHeader: ; 0x1ac283 person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff ; 0x1ac2ba - diff --git a/maps/Route34.asm b/maps/Route34.asm index 846b84059..805c1826c 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1028,4 +1028,3 @@ Route34_MapEventHeader: ; 0x78a7c person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc ; 0x78b5d - diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index e4225f78f..5197082e5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -172,4 +172,3 @@ Route34IlexForestGate_MapEventHeader: ; 0x62f20 person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, $06eb person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ec ; 0x62f76 - diff --git a/maps/Route35.asm b/maps/Route35.asm index 568fe88ea..ed124d3e3 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -677,4 +677,3 @@ Route35_MapEventHeader: ; 0x19cf9e person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, $ffff person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2 ; 0x19d04c - diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 271b09614..6f80f9d2e 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -231,4 +231,3 @@ Route35Goldenrodgate_MapEventHeader: ; 0x6a148 person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, $ffff person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, $ffff ; 0x6a189 - diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index da0cc9de6..bae2d9978 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -509,4 +509,3 @@ Route35NationalParkgate_MapEventHeader: ; 0x6a9d2 person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, $0734 person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, $0746 ; 0x6aa18 - diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 5414e9b46..1f282b1e5 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -964,6 +964,3 @@ Route36NationalParkgate_MapEventHeader: ; 0x6b9ac person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, $0729 person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, $0748 ; 0x6ba67 - - - diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 5a92e2cdf..359f1f269 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -57,4 +57,3 @@ Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff ; 0x6aafd - diff --git a/maps/Route38.asm b/maps/Route38.asm index 85c08531d..a2e03f87c 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -652,4 +652,3 @@ Route38_MapEventHeader: ; 0x1a23bb person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff ; 0x1a2430 - diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 408ebd634..356727576 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -45,4 +45,3 @@ Route38EcruteakGate_MapEventHeader: ; 0x9cc4d db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff ; 0x9cc74 - diff --git a/maps/Route39.asm b/maps/Route39.asm index e8eba3deb..be8cd4834 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -480,4 +480,3 @@ Route39_MapEventHeader: ; 0x1a60ba person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, $ffff person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, $ffff ; 0x1a6160 - diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 161e563b8..19fe0ca23 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -229,4 +229,3 @@ Route39Barn_MapEventHeader: ; 0x9ce7b person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, $ffff person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, $ffff ; 0x9ceb2 - diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index b1224e7f6..15a6237c7 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -231,4 +231,3 @@ Route39Farmhouse_MapEventHeader: ; 0x9d242 person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, $ffff person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, $ffff ; 0x9d276 - diff --git a/maps/Route4.asm b/maps/Route4.asm index 8c69d6d58..f33f7e563 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -207,4 +207,3 @@ Route4_MapEventHeader: ; 0x1ae3ab person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 ; 0x1ae3f4 - diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index e0ac6bbb7..9a9ef164f 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -100,4 +100,3 @@ Route40BattleTowerGate_MapEventHeader: ; 0x9f81e person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff ; 0x9f852 - diff --git a/maps/Route41.asm b/maps/Route41.asm index 56d2e9c1f..c4e9d7541 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -573,4 +573,3 @@ Route41_MapEventHeader: ; 0x1a6f12 person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff ; 0x1a6fb3 - diff --git a/maps/Route42.asm b/maps/Route42.asm index df3d730df..5432cf754 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -445,4 +445,3 @@ Route42_MapEventHeader: ; 0x1a95c9 person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4 person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af ; 0x1a967e - diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index cc65e67f1..4ac15e86b 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -40,4 +40,3 @@ Route42EcruteakGate_MapEventHeader: ; 0x19a4fe db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff ; 0x19a525 - diff --git a/maps/Route43.asm b/maps/Route43.asm index c29d4c1c2..cab6a21b6 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -692,4 +692,3 @@ Route43_MapEventHeader: ; 0x19d78c person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, $ffff person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5 ; 0x19d822 - diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index dc0b45ca6..9e6a606a0 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -301,4 +301,3 @@ Route43Gate_MapEventHeader: ; 0x19ae5b person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc ; 0x19ae9c - diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index e03efe453..f8808672f 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -61,4 +61,3 @@ Route43MahoganyGate_MapEventHeader: ; 0x19ab91 db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff ; 0x19abb8 - diff --git a/maps/Route44.asm b/maps/Route44.asm index d4d88ff60..84dc69365 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -709,4 +709,3 @@ Route44_MapEventHeader: ; 0x19dff6 person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd ; 0x19e09f - diff --git a/maps/Route45.asm b/maps/Route45.asm index 4a762660f..22343401c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -738,4 +738,3 @@ Route45_MapEventHeader: ; 0x19e91b person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, $ffff ; 0x19e9d9 - diff --git a/maps/Route46.asm b/maps/Route46.asm index 8042da3bd..5c0b83f6c 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -353,4 +353,3 @@ Route46_MapEventHeader: ; 0x1a99db person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc ; 0x1a9a43 - diff --git a/maps/Route5.asm b/maps/Route5.asm index e23f40523..34d706685 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -66,4 +66,3 @@ Route5_MapEventHeader: ; 0x1adbc7 db 1 person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771 ; 0x1adbf8 - diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 806a6554f..35bc80743 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -85,6 +85,3 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; 0x18b744 person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, $ffff person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, $ffff ; 0x18b778 - - - diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 7449e512f..ec49620f2 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -41,4 +41,3 @@ Route5SaffronCityGate_MapEventHeader: ; 0x18b60b db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff ; 0x18b632 - diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index b718e661c..fbea3ee17 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -39,4 +39,3 @@ Route5UndergroundEntrance_MapEventHeader: ; 0x18b595 db 1 person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff ; 0x18b5b7 - diff --git a/maps/Route6.asm b/maps/Route6.asm index 5cb412a06..92a7c48b8 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -155,4 +155,3 @@ Route6_MapEventHeader: ; 0x1adadb person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff ; 0x1adb17 - diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 29eea10b6..7d4bc40c0 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -83,4 +83,3 @@ Route6SaffronGate_MapEventHeader: ; 0x192807 db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff ; 0x19282e - diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index ff205bc63..3035e5095 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -25,4 +25,3 @@ Route6UndergroundEntrance_MapEventHeader: ; 0x192830 ; people-events db 0 ; 0x192845 - diff --git a/maps/Route7.asm b/maps/Route7.asm index 2f83a7edd..b74ae5166 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -59,4 +59,3 @@ Route7_MapEventHeader: ; 0x1ad463 ; people-events db 0 ; 0x1ad47d - diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index cba403de4..d23d9774a 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -68,4 +68,3 @@ Route7SaffronGate_MapEventHeader: ; 0x735e0 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff ; 0x73607 - diff --git a/maps/Route8.asm b/maps/Route8.asm index b7aad9cd7..70762bb81 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -301,4 +301,3 @@ Route8_MapEventHeader: ; 0x6c2e1 person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff ; 0x6c349 - diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index ab1013700..382dec3ad 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -40,4 +40,3 @@ Route8SaffronGate_MapEventHeader: ; 0x7f45b db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff ; 0x7f482 - diff --git a/maps/Route9.asm b/maps/Route9.asm index b5746b97d..a97bc0986 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -354,4 +354,3 @@ Route9_MapEventHeader: ; 0x1ab2c7 person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff ; 0x1ab32a - diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 6018c1f7d..767c567db 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -196,4 +196,3 @@ RuinsofAlphAerodactylChamber_MapEventHeader: ; 0x58f22 ; people-events db 0 ; 0x58f5f - diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 2c7f7ee35..ecfd6b1bc 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; 0x59ae6 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2 person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3 ; 0x59b3e - diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 661933b65..202757766 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphAerodactylWordRoom_MapEventHeader: ; 0x59b85 ; people-events db 0 ; 0x59b9a - diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 6159cf19d..33eb7db97 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -197,4 +197,3 @@ RuinsofAlphHoOhChamber_MapEventHeader: ; 0x586e1 ; people-events db 0 ; 0x5871e - diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 07d3e20d4..aba83e902 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; 0x59948 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796 person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797 ; 0x599a0 - diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index e51dfc7ea..e0b700866 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphHoOhWordRoom_MapEventHeader: ; 0x59b40 ; people-events db 0 ; 0x59b55 - diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 9e1ed41a6..ba62be9e3 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -143,4 +143,3 @@ RuinsofAlphInnerChamber_MapEventHeader: ; 0x59097 person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, $0705 person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, $0705 ; 0x59173 - diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 57528ffa8..897c7be5c 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -318,4 +318,3 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; 0x58b85 person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, $074e person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, $ffff ; 0x58bdc - diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 02833117a..bf96e08a1 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; 0x599d2 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b ; 0x59a2a - diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 3e13e8fcb..b8b020fbd 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphKabutoWordRoom_MapEventHeader: ; 0x59b57 ; people-events db 0 ; 0x59b6c - diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 0518c383f..075129a80 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -197,4 +197,3 @@ RuinsofAlphOmanyteChamber_MapEventHeader: ; 0x58d63 ; people-events db 0 ; 0x58da0 - diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 7dcf050fd..e0a84974f 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; 0x59a5c person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f ; 0x59ab4 - diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 705aa634e..4059e3651 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphOmanyteWordRoom_MapEventHeader: ; 0x59b6e ; people-events db 0 ; 0x59b83 - diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 492e9d448..5282fed21 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -385,4 +385,3 @@ RuinsofAlphOutside_MapEventHeader: ; 0x584c3 person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, $078f person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, $078f ; 0x58560 - diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index f925044d0..0a0b22a97 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -459,4 +459,3 @@ RuinsofAlphResearchCenter_MapEventHeader: ; 0x598d0 person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704 ; 0x59916 - diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 1491def30..715963542 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -24,4 +24,3 @@ SafariZoneBeta_MapEventHeader: ; 0x74476 ; people-events db 0 ; 0x74486 - diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index bab3a3bdb..9a4c41742 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -26,4 +26,3 @@ SafariZoneFuchsiaGateBeta_MapEventHeader: ; 0x7445a ; people-events db 0 ; 0x74474 - diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index c22fcd828..24a47c105 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -24,4 +24,3 @@ SafariZoneMainOffice_MapEventHeader: ; 0x195da7 ; people-events db 0 ; 0x195db7 - diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 03e579b7f..4db19a8a0 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -107,4 +107,3 @@ SafariZoneWardensHome_MapEventHeader: ; 0x19676b db 1 person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, LassScript_0x1965c6, $ffff ; 0x19679c - diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 081f569e6..02a760587 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -343,4 +343,3 @@ SaffronCity_MapEventHeader: ; 0x19989c person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, $ffff person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, $ffff ; 0x19997d - diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 15b95d155..a2012e97e 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -435,4 +435,3 @@ SaffronGym_MapEventHeader: ; 0x18a2c4 person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff ; 0x18a3bd - diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 61c272546..fe798909b 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -59,4 +59,3 @@ SaffronMart_MapEventHeader: ; 0x18a444 person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff ; 0x18a47b - diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index c05f93dd9..80fb0a283 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -140,4 +140,3 @@ SaffronPokeCenter1F_MapEventHeader: ; 0x18a722 person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, $ffff person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, $ffff ; 0x18a76b - diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index e9bd0d8ce..32997c250 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ SaffronPokeCenter2FBeta_MapEventHeader: ; 0x18a76d ; people-events db 0 ; 0x18a778 - diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 453d23f9b..0b67083ac 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -262,4 +262,3 @@ SaffronTrainStation_MapEventHeader: ; 0x18ab8d person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, $0772 person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, $0772 ; 0x18abe3 - diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index bd109f3f7..3c39974d9 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -186,6 +186,3 @@ SeafoamGym_MapEventHeader: ; 0x1ab865 person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, $ffff person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777 ; 0x1ab88a - - - diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index e977aad49..7446d8d04 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -77,4 +77,3 @@ SilphCo1F_MapEventHeader: ; 0x18ace7 person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, $ffff person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, $ffff ; 0x18ad11 - diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 3e28f7e8c..c9574b701 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -34,4 +34,3 @@ SilverCaveItemRooms_MapEventHeader: ; 0x18c662 person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d ; 0x18c68c - diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 8d6d9cc24..337e34c41 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -55,4 +55,3 @@ SilverCaveOutside_MapEventHeader: ; 0x1b205f ; people-events db 0 ; 0x1b207e - diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index d2527f612..872068b4c 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -50,4 +50,3 @@ SilverCavePokeCenter1F_MapEventHeader: ; 0x1ae622 person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, $ffff person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, $ffff ; 0x1ae651 - diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 9a0b419b1..f30486c60 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -58,4 +58,3 @@ SilverCaveRoom1_MapEventHeader: ; 0x18c562 person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1 ; 0x18c5b0 - diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 637a750d6..f67098ed1 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -48,4 +48,3 @@ SilverCaveRoom2_MapEventHeader: ; 0x18c5bb person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 ; 0x18c601 - diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index b855d0516..057950853 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -68,4 +68,3 @@ SilverCaveRoom3_MapEventHeader: ; 0x18c644 db 1 person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, $0762 ; 0x18c65c - diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c06792b43..a86c8610d 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -433,4 +433,3 @@ SlowpokeWellB1F_MapEventHeader: ; 0x5ac84 person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a6a0, $ffff person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662 ; 0x5ad09 - diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 02bb779af..babf85873 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -82,4 +82,3 @@ SlowpokeWellB2F_MapEventHeader: ; 0x5ae40 person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, $ffff person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663 ; 0x5ae65 - diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 27fd5fdca..b3d537caa 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -97,4 +97,3 @@ SoulHouse_MapEventHeader: ; 0x7ee1d person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff ; 0x7ee61 - diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 50d4651df..fd2d2a823 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -156,4 +156,3 @@ SproutTower1F_MapEventHeader: ; 0x184703 person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647 ; 0x18477a - diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c99b2f05e..18e9800f5 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -149,4 +149,3 @@ SproutTower2F_MapEventHeader: ; 0x1848f5 person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648 ; 0x18493b - diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 4c2fb6805..1bd031334 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -439,4 +439,3 @@ SproutTower3F_MapEventHeader: ; 0x184f8e person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c4 ; 0x18501a - diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index dece0d88d..4dbd519d3 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -876,4 +876,3 @@ TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b ; 0x6cf70 - diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index dbfd357ac..1cbaae9c6 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1100,4 +1100,3 @@ TeamRocketBaseB2F_MapEventHeader: ; 0x6de44 person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c ; 0x6dfd4 - diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index c22068a46..5423de782 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -729,4 +729,3 @@ TeamRocketBaseB3F_MapEventHeader: ; 0x6e9e4 person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670 person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654 ; 0x6eafe - diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 8e5b4e343..4b9df263f 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -85,4 +85,3 @@ TimeCapsule_MapEventHeader: ; 0x193538 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0001 ; 0x19356c - diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 43ae52b69..9fbb31732 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -589,4 +589,3 @@ TinTower1F_MapEventHeader: ; 0x18598c person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, $07c5 person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, $07c5 ; 0x185a23 - diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 00fe07420..6730fd214 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -24,4 +24,3 @@ TinTower2F_MapEventHeader: ; 0x185a25 ; people-events db 0 ; 0x185a35 - diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 2eb79a55e..b607e28e9 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -29,4 +29,3 @@ TinTower3F_MapEventHeader: ; 0x185a39 db 1 person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b ; 0x185a56 - diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 0db1463b5..5221cfc45 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -48,4 +48,3 @@ TinTower4F_MapEventHeader: ; 0x185a61 person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e ; 0x185aa7 - diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 4fccbdf04..95549a257 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -45,4 +45,3 @@ TinTower5F_MapEventHeader: ; 0x185ab1 db 1 person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f ; 0x185ae2 - diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 6db5548c2..6e01af477 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -29,4 +29,3 @@ TinTower6F_MapEventHeader: ; 0x185ae6 db 1 person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6 ; 0x185b03 - diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ae20c4b01..6ecc68ebe 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -32,4 +32,3 @@ TinTower7F_MapEventHeader: ; 0x185b07 db 1 person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650 ; 0x185b33 - diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 11a11b045..35835c059 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -43,4 +43,3 @@ TinTower8F_MapEventHeader: ; 0x185b3b person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652 person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653 ; 0x185b86 - diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 0849d733e..bd50904f8 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -44,4 +44,3 @@ TinTower9F_MapEventHeader: ; 0x185bab db 1 person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7 ; 0x185be1 - diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index e74ceb907..1f3d035b8 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -68,6 +68,3 @@ TinTowerRoof_MapEventHeader: ; 0x7726a db 1 person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c ; 0x77282 - - - diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 3aff0fdf6..1bd94db19 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -29,4 +29,3 @@ TohjoFalls_MapEventHeader: ; 0x18db04 db 1 person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9 ; 0x18db21 - diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index a87b10d9c..54b3780d2 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -85,4 +85,3 @@ TradeCenter_MapEventHeader: ; 0x193429 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x19345d - diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d17526f2d..96c86ead4 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -174,4 +174,3 @@ TrainerHouse1F_MapEventHeader: ; 0x9b31f person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff ; 0x9b384 - diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 9c65f4e9f..4accd0088 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -204,4 +204,3 @@ TrainerHouseB1F_MapEventHeader: ; 0x9b5b8 person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff ; 0x9b5e5 - diff --git a/maps/Underground.asm b/maps/Underground.asm index 6eb0a5068..1872b0477 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -38,4 +38,3 @@ Underground_MapEventHeader: ; 0x74399 ; people-events db 0 ; 0x743b3 - diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 264db76b7..1bf2974f8 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1134,4 +1134,3 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; 0x7d689 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674 person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1 ; 0x7d779 - diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index e39e9ab85..640d24a60 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -302,4 +302,3 @@ UndergroundWarehouse_MapEventHeader: ; 0x7dd84 person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 ; 0x7ddf4 - diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 3c764f12f..ed9b8aa36 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -329,4 +329,3 @@ UnionCave1F_MapEventHeader: ; 0x59f35 person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d ; 0x59fc4 - diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 482b23cdd..87a3ec86a 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -259,4 +259,3 @@ UnionCaveB1F_MapEventHeader: ; 0x5a28e person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a01a, $ffff person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f ; 0x5a308 - diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index d63d55810..f57519427 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -228,4 +228,3 @@ UnionCaveB2F_MapEventHeader: ; 0x5a57a person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760 ; 0x5a5d3 - diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index f1dd6f2a7..1a98355b7 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -341,4 +341,3 @@ VermilionCity_MapEventHeader: ; 0x1aae77 person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, BigSnorlaxScript_0x1aa99e, $0770 person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1aa9c2, $ffff ; 0x1aaf25 - diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 18fc4c76c..234f3a606 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -372,4 +372,3 @@ VermilionGym_MapEventHeader: ; 0x19263d person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff ; 0x1926e3 - diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index a93741002..85a10eb64 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -39,4 +39,3 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; 0x192086 db 1 person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff ; 0x1920a3 - diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 422d257ba..caf32adcb 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -72,4 +72,3 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; 0x1915df db 1 person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x19148d, $ffff ; 0x191601 - diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 6722010da..beedfb90c 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -57,4 +57,3 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; 0x191f48 person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff ; 0x191f7c - diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 799a31024..71d301919 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -58,4 +58,3 @@ VermilionMart_MapEventHeader: ; 0x191ff8 person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff ; 0x19202f - diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 4b5bbf0d7..bfc36300f 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -103,4 +103,3 @@ VermilionPokeCenter1F_MapEventHeader: ; 0x191791 person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, $ffff person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, $ffff ; 0x1917da - diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index d42badcc8..35c14337f 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ VermilionPokeCenter2FBeta_MapEventHeader: ; 0x1917dc ; people-events db 0 ; 0x1917e7 - diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 914511b18..54df2da79 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -358,4 +358,3 @@ VermilionPort_MapEventHeader: ; 0x750e3 person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, $ffff person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, $ffff ; 0x75127 - diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 570ff837c..05355e027 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -40,4 +40,3 @@ VermilionPortPassage_MapEventHeader: ; 0x7705a db 1 person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff ; 0x77086 - diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 003249b6c..d94a94be6 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -296,4 +296,3 @@ VictoryRoad_MapEventHeader: ; 0x74802 person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 ; 0x748a2 - diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 80dd5f677..c839bc300 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -136,6 +136,3 @@ VictoryRoadGate_MapEventHeader: ; 0x9bb9b person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, $074f person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, $0750 ; 0x9bbf8 - - - diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 316818371..54ed25623 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -347,4 +347,3 @@ VioletCity_MapEventHeader: ; 0x1a8762 person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643 person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644 ; 0x1a8820 - diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 743c5c471..e20387a74 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -359,4 +359,3 @@ VioletGym_MapEventHeader: ; 0x68a0c person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff ; 0x68a5a - diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 54f90ddf9..ce19a3f88 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -70,4 +70,3 @@ VioletMart_MapEventHeader: ; 0x68389 person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff ; 0x683c0 - diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ab7cdabef..3401a724d 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -67,4 +67,3 @@ VioletNicknameSpeechHouse_MapEventHeader: ; 0x69490 person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, $ffff person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, $ffff ; 0x694c7 - diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 91b3a635d..c9a0b7213 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -52,4 +52,3 @@ VioletOnixTradeHouse_MapEventHeader: ; 0x69a01 person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, $ffff person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, $ffff ; 0x69a2b - diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index ca1ae8f8c..915f69704 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -256,4 +256,3 @@ VioletPokeCenter1F_MapEventHeader: ; 0x69935 person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, $ffff person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, $0700 ; 0x6998b - diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 60fdba4d0..6e99a4631 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -269,4 +269,3 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9 person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff ; 0x1a9f3a - diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index a183a6f44..89f610d0c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -200,4 +200,3 @@ ViridianGym_MapEventHeader: ; 0x9ae04 person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, $0776 person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776 ; 0x9ae38 - diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index e96608ec9..3354ca59c 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -58,4 +58,3 @@ ViridianMart_MapEventHeader: ; 0x9b657 person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff ; 0x9b68e - diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index aed513c1b..b86ab2d46 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -86,4 +86,3 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; 0x9af21 person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff ; 0x9af65 - diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a5f322aec..a7b2c34ac 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -98,4 +98,3 @@ ViridianPokeCenter1F_MapEventHeader: ; 0x9b7ef person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, $ffff person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, $ffff ; 0x9b838 - diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index 3f1f5f0a7..95b81f77c 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ ViridianPokeCenter2FBeta_MapEventHeader: ; 0x9b83a ; people-events db 0 ; 0x9b845 - diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index b80f29cee..ae28d0f22 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -831,4 +831,3 @@ WarehouseEntrance_MapEventHeader: ; 0x7c936 person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, $0755 person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, $0752 ; 0x7c9e8 - diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 362871fcc..e4022a762 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -82,4 +82,3 @@ WhirlIslandB1F_MapEventHeader: ; 0x18c426 person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695 person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, BoulderScript_0x18c41a, $ffff ; 0x18c4b6 - diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index ae3960bcd..dcd88e768 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -41,4 +41,3 @@ WhirlIslandB2F_MapEventHeader: ; 0x18c4be person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697 person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698 ; 0x18c4ff - diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index b595021e8..39239faf1 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -24,4 +24,3 @@ WhirlIslandCave_MapEventHeader: ; 0x18c3ec ; people-events db 0 ; 0x18c3fc - diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 76965fa9e..6ec8c969f 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -67,4 +67,3 @@ WhirlIslandLugiaChamber_MapEventHeader: ; 0x18c53a db 1 person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d ; 0x18c552 - diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 8d51b6595..7065638dd 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -30,4 +30,3 @@ WhirlIslandNE_MapEventHeader: ; 0x18c398 db 1 person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f ; 0x18c3ba - diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 4b0a454b5..43a31ad2d 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -26,4 +26,3 @@ WhirlIslandNW_MapEventHeader: ; 0x18c37a ; people-events db 0 ; 0x18c394 - diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 735e77f04..235453ca2 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -24,4 +24,3 @@ WhirlIslandSE_MapEventHeader: ; 0x18c3fe ; people-events db 0 ; 0x18c40e - diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 6f877d8c7..3ec1fac03 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -32,4 +32,3 @@ WhirlIslandSW_MapEventHeader: ; 0x18c3be db 1 person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690 ; 0x18c3ea - diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 84f7f7403..9c61d5e84 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -161,4 +161,3 @@ WillsRoom_MapEventHeader: ; 0x1806f9 db 1 person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff ; 0x18071b - diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index c5ee42902..204dca627 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -450,4 +450,3 @@ WiseTriosRoom_MapEventHeader: ; 0x98dea person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac ; 0x98e55 - diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index d9d6fc432..83bb76b96 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -384,4 +384,3 @@ Route9_BlockData: ; 0xabde9 Route22_BlockData: ; 0xabef7 INCBIN "maps/Route22.blk" ; 0xabfab - diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm index 09fafd7d0..a60303c5d 100644 --- a/maps/blockdata_2.asm +++ b/maps/blockdata_2.asm @@ -598,4 +598,3 @@ OlivineLighthouse5F_BlockData: ; 0xafea6 OlivineLighthouse6F_BlockData: ; 0xaff00 INCBIN "maps/OlivineLighthouse6F.blk" ; 0xaff5a - diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm index 28cc9fb7c..3db7f1152 100644 --- a/maps/blockdata_3.asm +++ b/maps/blockdata_3.asm @@ -351,4 +351,3 @@ BetaBlank_BlockData: ; 0xb1afa GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22 INCBIN "maps/GoldenrodDeptStoreRoof.blk" ; 0xb1b42 - diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 36768a54d..e346c50c7 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -493,4 +493,3 @@ MapGroup26: map_header Route30BerrySpeechHouse, $5, 3, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 1, 1 map_header MrPokemonsHouse, $b, 3, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 1, 1 map_header Route31VioletGate, $8, 6, ROUTE_31, MUSIC_ROUTE_30, 1, 1 - diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 0651dd9d1..82e97ede5 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -597,4 +597,3 @@ map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, NONE ; 0x9668c map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, NONE ; 0x96698 map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, NONE ; 0x966a4 - diff --git a/maps_crystal.asm b/maps_crystal.asm index 5ef83dc4a..7bb87d329 100644 --- a/maps_crystal.asm +++ b/maps_crystal.asm @@ -1,3 +1,2 @@ INCLUDE "pokecrystal.asm" INCLUDE "maps.asm" - diff --git a/menu/mon_icons.asm b/menu/mon_icons.asm index 60e88ace9..aeb758282 100644 --- a/menu/mon_icons.asm +++ b/menu/mon_icons.asm @@ -347,4 +347,3 @@ GyaradosIcon: INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d - diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index d642d6c24..2349bb687 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -147,4 +147,3 @@ GBCOnlyString: ; 4eb38 GBCOnlyGFX: ; 4eb76 INCBIN "gfx/misc/gbc_only.w112.2bpp.lz" ; 4f0bc - diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index ede68c544..84c86c8ee 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -8075,5 +8075,3 @@ UnknownText_0x103898: ; 0x103898 text_jump UnknownText_0x1c4525 db "@" ; 0x10389d - - diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 761eb90c2..1950a1812 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -1944,4 +1944,3 @@ Palette_1093c7: RGB 21, 20, 20 RGB 14, 14, 31 RGB 0, 0, 0 - diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index f03209ca3..eabc7e704 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -25025,5 +25025,3 @@ ENDC Attrmap_173517: INCBIN "gfx/unknown/173517.attrmap" - - diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index b39c1d6ae..74a50eb62 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -5311,4 +5311,3 @@ Function17ff3c: ; 17ff3c String_17ff68: ; 17ff68 db "101@" ; 17ff6c - diff --git a/predef/cgb.asm b/predef/cgb.asm index 5cdb30092..3f2bcb230 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -1111,4 +1111,3 @@ Palette95e0: ; 95e0 RGB 05, 14, 21 RGB 00, 03, 19 ; 95f0 - diff --git a/predef/sgb.asm b/predef/sgb.asm index 41f8e306d..cd3b3b2bf 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -620,4 +620,3 @@ Function8a60: ; 8a60 pop hl jp Function9809 ; 8a68 - @@ -35,4 +35,3 @@ SECTION "rst28",ROM0[JumpTable] SECTION "rst38",ROM0[$38] rst $38 - diff --git a/text/common.asm b/text/common.asm index 34d17e902..3e32b56f8 100644 --- a/text/common.asm +++ b/text/common.asm @@ -1199,4 +1199,3 @@ UnknownText_0x1b201f: ; 0x1b201f line "get started now!" done ; 0x1b2042 - diff --git a/text/common_4.asm b/text/common_4.asm index 0b4ea5b2f..1ba35a33d 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -1710,4 +1710,3 @@ UnknownText_0x1c60d1: ; 0x1c60d1 line "a while." prompt ; 0x1c611e - diff --git a/text/phone/buena.asm b/text/phone/buena.asm index c0d9f39f5..1f1020703 100644 --- a/text/phone/buena.asm +++ b/text/phone/buena.asm @@ -548,4 +548,3 @@ UnknownText_0xa1e2f: ; 0xa1e2f para "Please call again!" done ; 0xa1eca - diff --git a/tilesets/animations.asm b/tilesets/animations.asm index d0a8029ee..1a43f02b4 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -1076,4 +1076,3 @@ WhirlpoolTiles2: INCBIN "gfx/tilesets/whirlpool/2.2bpp" WhirlpoolTiles3: INCBIN "gfx/tilesets/whirlpool/3.2bpp" WhirlpoolTiles4: INCBIN "gfx/tilesets/whirlpool/4.2bpp" ; fcba8 - diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm index 658a782ed..307dac666 100644 --- a/tilesets/data_1.asm +++ b/tilesets/data_1.asm @@ -48,4 +48,3 @@ INCBIN "tilesets/20_metatiles.bin" Tileset20Coll: ; 0x1bcfe INCBIN "tilesets/20_collision.bin" ; 0x1bdfe - diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm index c9ab4cdce..9109cc235 100644 --- a/tilesets/data_2.asm +++ b/tilesets/data_2.asm @@ -59,4 +59,3 @@ Tileset24Coll: ; 0x1f21c Tileset30Coll: ; 0x1f21c INCBIN "tilesets/24_collision.bin" ; 0x1f31c - diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm index b97d4587d..72b2b72ff 100644 --- a/tilesets/data_3.asm +++ b/tilesets/data_3.asm @@ -62,4 +62,3 @@ INCBIN "tilesets/17_collision.bin" Tileset31Meta: ; 0x23891 INCBIN "tilesets/31_metatiles.bin" ; 0x23b11 - diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm index c427d0bf6..fb61d1f2b 100644 --- a/tilesets/data_4.asm +++ b/tilesets/data_4.asm @@ -57,4 +57,3 @@ INCBIN "tilesets/unused_30_metatiles.bin" UnusedTileset30Coll: ; 0x331f0 INCBIN "tilesets/unused_30_collision.bin" ; 0x333f0 - diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm index a985b0b3d..109df2daf 100644 --- a/tilesets/data_5.asm +++ b/tilesets/data_5.asm @@ -58,4 +58,3 @@ INCBIN "tilesets/16_metatiles.bin" Tileset16Coll: ; 0xb7da8 INCBIN "tilesets/16_collision.bin" ; 0xb7ea8 - diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm index 40245b5ca..695282bc7 100644 --- a/tilesets/data_6.asm +++ b/tilesets/data_6.asm @@ -73,4 +73,3 @@ Tileset35Coll: ; 0xdfc90 Tileset36Coll: ; 0xdfc90 INCBIN "tilesets/36_collision.bin" ; 0xdfd90 - diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm index d2d216fc6..d781ab518 100644 --- a/tilesets/data_7.asm +++ b/tilesets/data_7.asm @@ -14,4 +14,3 @@ INCBIN "tilesets/26_metatiles.bin" Tileset26Coll: ; 0x1dd5a9 INCBIN "tilesets/26_collision.bin" ; 0x1dd6a9 - diff --git a/tilesets/data_8.asm b/tilesets/data_8.asm index 82fe6b873..7ee2ecf3d 100644 --- a/tilesets/data_8.asm +++ b/tilesets/data_8.asm @@ -13,4 +13,3 @@ INCBIN "tilesets/35_metatiles.bin" Tileset36Meta: ; 0x1e0c00 INCBIN "tilesets/36_metatiles.bin" ; 0x1e1000 - diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index 9fb86b668..190b19d1a 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -295,4 +295,3 @@ Tileset36: ; 0x4d7b2 dw Tileset36PalMap ; 0x4d7c1 - diff --git a/trainers/attributes.asm b/trainers/attributes.asm index c6d4037da..23e8ed25e 100644 --- a/trainers/attributes.asm +++ b/trainers/attributes.asm @@ -422,4 +422,3 @@ TrainerClassAttributes: ; 3959c dw CONTEXT_USE + SWITCH_SOMETIMES ; 39771 - diff --git a/trainers/dvs.asm b/trainers/dvs.asm index 2277c7872..2975d60fe 100644 --- a/trainers/dvs.asm +++ b/trainers/dvs.asm @@ -90,4 +90,3 @@ TrainerClassDVs: ; 270d6 db $7E, $A8 ; gruntf db $98, $88 ; mysticalman ; 2715c - diff --git a/trainers/trainers.asm b/trainers/trainers.asm index 6337be07c..d5e3505e5 100644 --- a/trainers/trainers.asm +++ b/trainers/trainers.asm @@ -8827,4 +8827,3 @@ MysticalmanGroup: ; ================ ; ================================ - |