ref: 4d532beee6310c8cfd1d8f7d26d623d176fb0027
parent: 47938939fe299d9ce3d2d167a1af42096d71a8fe
author: IIMarckus <[email protected]>
date: Tue Jun 23 08:24:51 EDT 2015
Remove trailing newlines.
--- a/audio.asm
+++ b/audio.asm
@@ -169,5 +169,3 @@
CryHeaders:: INCLUDE "audio/cry_headers.asm"
INCLUDE "audio/cries.asm"
-
-
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -67,5 +67,3 @@
note D_, 2
loopchannel 0, Music_AfterTheRivalFight_branch_f5118
; f518a
-
-
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -661,5 +661,3 @@
note F#, 2
loopchannel 0, Music_AzaleaTown_branch_f5aea
; f5b03
-
-
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -311,5 +311,3 @@
note F_, 4
loopchannel 0, Music_BattleTowerLobby_branch_179612
; 17961d
-
-
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -695,5 +695,3 @@
note C#, 1
endchannel
; 178b81
-
-
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -519,5 +519,3 @@
note F_, 2
loopchannel 0, Music_Bicycle_branch_ee34b
; ee35e
-
-
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -643,5 +643,3 @@
note D_, 1
endchannel
; 17843b
-
-
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -672,4 +672,3 @@
note D_, 2
endchannel
; f7ef3
-
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -263,5 +263,3 @@
note G_, 4
loopchannel 0, Music_BurnedTower_branch_f6be7
; f6bf2
-
-
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -394,5 +394,3 @@
note B_, 2
endchannel
; f4518
-
-
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -789,5 +789,3 @@
note E_, 2
endchannel
; ead99
-
-
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -308,5 +308,3 @@
note G_, 2
loopchannel 0, Music_CherrygroveCity_branch_f5c4d
; f5c60
-
-
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -441,5 +441,3 @@
note G_, 1
endchannel
; 1fc87
-
-
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -176,5 +176,3 @@
note G_, 1
loopchannel 0, Music_ContestResults_branch_efbed
; efc01
-
-
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1692,5 +1692,3 @@
note D_, 1
endchannel
; 1fa8d
-
-
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -362,5 +362,3 @@
note __, 16
endchannel
; 178889
-
-
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -309,5 +309,3 @@
note D_, 1
loopchannel 0, Music_DancingHall_branch_efae3
; efb3e
-
-
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -490,5 +490,3 @@
note C#, 2
loopchannel 0, Music_DarkCave_branch_ea4ee
; ea50d
-
-
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -178,5 +178,3 @@
note F#, 4
loopchannel 0, Music_DragonsDen_branch_eedbd
; eedcb
-
-
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -672,5 +672,3 @@
note B_, 1
endchannel
; ef5b1
-
-
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -540,5 +540,3 @@
note G_, 4
loopchannel 0, Music_ElmsLab_branch_ea2b9
; ea2be
-
-
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -208,5 +208,3 @@
note E_, 2
loopchannel 0, Music_Evolution_branch_f07f0
; f07fd
-
-
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -819,5 +819,3 @@
note F#, 2
endchannel
; ee119
-
-
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -485,5 +485,3 @@
note G_, 1
endchannel
; eb676
-
-
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -617,5 +617,3 @@
note __, 13
endchannel
; f7308
-
-
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -220,5 +220,3 @@
note C_, 16
endchannel
; f7411
-
-
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -572,5 +572,3 @@
loopchannel 8, Music_Gym_branch_f4afa
loopchannel 0, Music_Gym_branch_f4ac7
; f4b0c
-
-
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -428,5 +428,3 @@
loopchannel 3, Music_GymLeaderVictory_branch_f480b
endchannel
; f4815
-
-
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -175,5 +175,3 @@
note A#, 1
loopchannel 0, Music_HallOfFame_branch_f0677
; f0697
-
-
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -52,5 +52,3 @@
note __, 2
endchannel
; f06e1
-
-
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -188,5 +188,3 @@
note C#, 4
loopchannel 0, Music_IndigoPlateau_branch_ee92a
; ee94b
-
-
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -1030,5 +1030,3 @@
note D#, 2
endchannel
; ea9c1
-
-
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -1346,5 +1346,3 @@
note A#, 2
endchannel
; f66c3
-
-
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -588,5 +588,3 @@
loopchannel 4, Music_JohtoWildBattle_branch_f6055
endchannel
; f605c
-
-
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -30,5 +30,3 @@
notetype $c, $11
loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
; f6096
-
-
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -614,5 +614,3 @@
note F_, 2
loopchannel 0, Music_KantoGymBattle_branch_ec965
; ec9fa
-
-
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -1538,5 +1538,3 @@
note G_, 4
loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
; ed06d
-
-
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -1224,5 +1224,3 @@
note G_, 16
loopchannel 0, Music_KantoWildBattle_branch_ed39e
; ed5c6
-
-
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -325,5 +325,3 @@
note D_, 1
loopchannel 0, Music_LakeOfRage_branch_ee83b
; ee852
-
-
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -37,5 +37,3 @@
note __, 4
loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
; ef5f0
-
-
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -519,5 +519,3 @@
note F_, 2
loopchannel 0, Music_LavenderTown_branch_ef941
; ef9bc
-
-
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -312,5 +312,3 @@
note A_, 2
loopchannel 0, Music_Lighthouse_branch_ee6b1
; ee6c5
-
-
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -329,5 +329,3 @@
note G_, 2
endchannel
; eefb2
-
-
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -118,5 +118,3 @@
note G_, 2
loopchannel 0, Music_LookHiker_branch_f749a
; f74a2
-
-
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -271,5 +271,3 @@
note E_, 8
loopchannel 0, Music_LookKimonoGirl_branch_f7aec
; f7b13
-
-
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -117,5 +117,3 @@
note C#, 1
loopchannel 0, Music_LookLass_branch_ed81f
; ed82d
-
-
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -617,5 +617,3 @@
note D_, 1
endchannel
; 1786e8
-
-
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -140,5 +140,3 @@
note C#, 8
loopchannel 0, Music_LookOfficer_branch_ed8c8
; ed8dd
-
-
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -162,5 +162,3 @@
note __, 1
endchannel
; ebeab
-
-
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -358,5 +358,3 @@
note D_, 2
loopchannel 0, Music_LookRival_branch_f5118
; f5127
-
-
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -414,5 +414,3 @@
note F#, 2
endchannel
; f766d
-
-
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -180,5 +180,3 @@
note G#, 1
loopchannel 0, Music_LookSage_branch_ee430
; ee45f
-
-
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -297,5 +297,3 @@
; f6810
db $ff
-
-
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -288,5 +288,3 @@
note G_, 2
endchannel
; ef72f
-
-
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -145,5 +145,3 @@
note D_, 1
loopchannel 0, Music_MainMenu_branch_f79a5
; f79b8
-
-
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -668,4 +668,3 @@
note D_, 1
endchannel
; 1ff6c
-
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -280,5 +280,3 @@
note A_, 4
endchannel
; 178153
-
-
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -486,4 +486,3 @@
note C#, 1
loopchannel 0, Music_MobileCenter_branch_179813
; 17982d
-
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -110,5 +110,3 @@
note __, 1
loopchannel 0, Music_Mom_branch_f6c56
; f6c72
-
-
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -141,5 +141,3 @@
note A#, 8
loopchannel 0, Music_MtMoon_branch_edbc3
; edbd8
-
-
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -108,5 +108,3 @@
loopchannel 2, Music_MtMoonSquare_branch_f489b
loopchannel 0, Music_MtMoonSquare_branch_f4862
; f48ae
-
-
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -666,5 +666,3 @@
note D#, 1
loopchannel 0, Music_NationalPark_branch_f57bd
; f57e8
-
-
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -330,5 +330,3 @@
note E_, 1
loopchannel 0, Music_NewBarkTown_branch_eb408
; eb453
-
-
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -11,4 +11,3 @@
Music_Nothing_Ch4: ; e91af
endchannel
; e91b0
-
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -359,5 +359,3 @@
note A_, 8
loopchannel 0, Music_PalletTown_branch_f4c2d
; f4c9f
-
-
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -230,5 +230,3 @@
note G_, 4
endchannel
; f7c16
-
-
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -412,5 +412,3 @@
note G_, 2
loopchannel 0, Music_PokemonCenter_branch_ed792
; ed79b
-
-
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -234,5 +234,3 @@
note A#, 4
endchannel
; ee569
-
-
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -134,5 +134,3 @@
note A_, 2
loopchannel 0, Music_PokemonLullaby_branch_f6e06
; f6e23
-
-
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -467,5 +467,3 @@
note C#, 2
endchannel
; f7055
-
-
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -265,4 +265,3 @@
note F_, 2
loopchannel 0, Music_PostCredits_branch_cfe5a
; cff04
-
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -319,4 +319,3 @@
note __, 1
loopchannel 0, Music_Printer_branch_f0823
; f0941
-
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -321,5 +321,3 @@
note B_, 2
endchannel
; f4f79
-
-
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -309,5 +309,3 @@
note __, 1
loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
; f4dea
-
-
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -867,5 +867,3 @@
loopchannel 2, Music_RivalBattle_branch_e9b65
endchannel
; e9b6f
-
-
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -1038,5 +1038,3 @@
note A_, 2
endchannel
; ea040
-
-
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -311,5 +311,3 @@
note A_, 4
endchannel
; eece8
-
-
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -480,5 +480,3 @@
callchannel Music_RocketTheme_branch_f765c
loopchannel 0, Music_RocketTheme_branch_f78c3
; f78fd
-
-
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -651,5 +651,3 @@
note __, 3
loopchannel 0, Music_Route1_branch_ec20c
; ec2ca
-
-
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -458,5 +458,3 @@
note C#, 1
endchannel
; ec720
-
-
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -526,5 +526,3 @@
note D#, 4
loopchannel 0, Music_Route2_branch_edaef
; edb29
-
-
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -673,5 +673,3 @@
note E_, 2
endchannel
; ef2d0
-
-
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -524,5 +524,3 @@
note F_, 4
loopchannel 0, Music_Route29_branch_f05b0
; f05bf
-
-
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -508,5 +508,3 @@
note C#, 1
loopchannel 0, Music_Route3_branch_ec4f0
; ec506
-
-
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -677,4 +677,3 @@
notetype $c
endchannel
; efef5
-
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -526,5 +526,3 @@
notetype $c
endchannel
; e974f
-
-
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -436,5 +436,3 @@
note D#, 1
endchannel
; eeb75
-
-
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -48,5 +48,3 @@
note __, 10
loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
; ebde1
-
-
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -77,5 +77,3 @@
note __, 16
loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
; eee3e
-
-
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -360,5 +360,3 @@
note F#, 2
endchannel
; edd6d
-
-
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -245,5 +245,3 @@
note F#, 4
loopchannel 0, Music_SproutTower_branch_f6a7f
; f6a99
-
-
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -1185,5 +1185,3 @@
note C_, 2
endchannel
; eb2d3
-
-
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -24,5 +24,3 @@
notetype $c, $25
jumpchannel Music_SuccessfulCapture_branch_f45cf
; f462c
-
-
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -2058,5 +2058,3 @@
note E_, 2
loopchannel 0, Music_SuicuneBattle_branch_179182
; 17948b
-
-
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -733,5 +733,3 @@
note __, 3
endchannel
; f54e8
-
-
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -294,5 +294,3 @@
note F_, 2
loopchannel 0, Music_TinTower_branch_f694c
; f6974
-
-
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1177,5 +1177,3 @@
note C_, 4
endchannel
; ebd9e
-
-
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -234,4 +234,3 @@
note B_, 2
endchannel
; ebfc3
-
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -264,5 +264,3 @@
loopchannel 0, Music_UnionCave_branch_f5da9
loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
; f5dc5
-
-
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -346,5 +346,3 @@
note C#, 1
endchannel
; eb808
-
-
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -203,5 +203,3 @@
note D#, 1
loopchannel 0, Music_VictoryRoad_branch_f6d63
; f6d79
-
-
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -780,5 +780,3 @@
note D#, 2
endchannel
; f0386
-
-
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -796,5 +796,3 @@
note F#, 2
endchannel
; f435b
-
-
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -187,5 +187,3 @@
note C#, 2
endchannel
; f4602
-
-
--- 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
-
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -3597,5 +3597,3 @@
cp $80 ; 1/2
ret
; 3952d
-
-
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -1506,5 +1506,3 @@
.asm_cc9a0
ret
; cc9a1
-
-
--- a/battle/anim_gfx.asm
+++ b/battle/anim_gfx.asm
@@ -39,4 +39,3 @@
AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz"
AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz"
; 8640e
-
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -6451,4 +6451,3 @@
object_gfx NULL, 1
object_gfx NULL, 1
; cfd9e
-
--- a/battle/anims.asm
+++ b/battle/anims.asm
@@ -5307,4 +5307,3 @@
anim_wait 1
anim_ret
; cbcdd
-
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -2932,5 +2932,3 @@
ld a, e
ret
; c906f (32:506f)
-
-
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -9525,4 +9525,3 @@
ret
; 3fd26
-
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -10683,4 +10683,3 @@
pop hl
ret
; 37ee2
-
--- a/battle/effects/curse.asm
+++ b/battle/effects/curse.asm
@@ -95,4 +95,3 @@
ld hl, WontRiseAnymoreText
jp StdBattleTextBox
; 37618
-
--- a/battle/effects/endure.asm
+++ b/battle/effects/endure.asm
@@ -15,4 +15,3 @@
ld hl, BracedItselfText
jp StdBattleTextBox
; 37683
-
--- a/battle/effects/foresight.asm
+++ b/battle/effects/foresight.asm
@@ -21,4 +21,3 @@
.failed
jp Function37354
; 376c2
-
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -59,4 +59,3 @@
db THIEF
db -1
; 37462
-
--- a/battle/effects/mirror_move.asm
+++ b/battle/effects/mirror_move.asm
@@ -50,4 +50,3 @@
call BattleCommandaa
jp ResetTurn
; 37418
-
--- a/battle/effects/nightmare.asm
+++ b/battle/effects/nightmare.asm
@@ -36,4 +36,3 @@
call AnimateFailedMove
jp PrintButItFailed
; 37563
-
--- a/battle/effects/perish_song.asm
+++ b/battle/effects/perish_song.asm
@@ -38,4 +38,3 @@
call AnimateFailedMove
jp PrintButItFailed
; 376f8
-
--- a/battle/effects/protect.asm
+++ b/battle/effects/protect.asm
@@ -78,4 +78,3 @@
scf
ret
; 3766f
-
--- a/battle/effects/rollout.asm
+++ b/battle/effects/rollout.asm
@@ -96,4 +96,3 @@
.asm_37790
ret
; 37791
-
--- a/battle/effects/sandstorm.asm
+++ b/battle/effects/sandstorm.asm
@@ -17,4 +17,3 @@
call AnimateFailedMove
jp PrintButItFailed
; 37718
-
--- a/battle/effects/spikes.asm
+++ b/battle/effects/spikes.asm
@@ -25,4 +25,3 @@
.failed
jp Function37354
; 376a0
-
--- a/battle/effects/thief.asm
+++ b/battle/effects/thief.asm
@@ -114,4 +114,3 @@
ld hl, EnemyMonItem
ret
; 37517
-
--- a/battle/hidden_power.asm
+++ b/battle/hidden_power.asm
@@ -109,4 +109,3 @@
ld d, a
ret
; fbd54
-
--- a/battle/magikarp_length.asm
+++ b/battle/magikarp_length.asm
@@ -212,4 +212,3 @@
dwb 65410, 2
dwb 65510, 1 ; not used
; fbcd2
-
--- a/battle/move_names.asm
+++ b/battle/move_names.asm
@@ -249,4 +249,3 @@
db "ROCK SMASH@"
db "WHIRLPOOL@"
db "BEAT UP@"
-
--- a/battle/moves/move_effects.asm
+++ b/battle/moves/move_effects.asm
@@ -2237,7 +2237,3 @@
statmessageuser
statupfailtext
endmove
-
-
-
-
--- a/battle/moves/move_effects_pointers.asm
+++ b/battle/moves/move_effects_pointers.asm
@@ -155,4 +155,3 @@
dw BeatUp
dw Fly
dw DefenseCurl
-
--- a/battle/moves/moves.asm
+++ b/battle/moves/moves.asm
@@ -262,4 +262,3 @@
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
-
--- a/constants.asm
+++ b/constants.asm
@@ -23,4 +23,3 @@
INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/misc_constants.asm"
-
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -60,4 +60,3 @@
ANIM_BG_VIBRATE_MON EQU $33
ANIM_BG_WOBBLE_MON EQU $34
-
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -160,4 +160,3 @@
ENGINE_KRIS_IN_CABLE_CLUB EQU $9f
ENGINE_DUNSPARCE_SWARM EQU $a0
ENGINE_YANMA_SWARM EQU $a1
-
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -37,4 +37,3 @@
ANIM_GFX_ANGELS EQU 37
ANIM_GFX_WAVE EQU 38
ANIM_GFX_AEROBLAST EQU 39
-
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -100,4 +100,3 @@
const TOHJO_FALLS
const ROUTE_28
const FAST_SHIP
-
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1805,4 +1805,3 @@
OBJECT_31 EQU $1f
OBJECT_32 EQU $20
; 33-39 are not used
-
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -256,4 +256,3 @@
const_value SET const_value + -1
const NUM_ATTACKS ; $fb
-
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -104,4 +104,3 @@
MUSIC_MOBILE_CENTER EQU 102
MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold
-
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -254,4 +254,3 @@
const CELEBI
EGG EQU 253
-
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -86,5 +86,3 @@
ATK_GT_DEF EQU 1
ATK_LT_DEF EQU 2
ATK_EQ_DEF EQU 3
-
-
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -206,4 +206,3 @@
SFX_TWO_PC_BEEPS EQU $cc
SFX_4_NOTE_DITTY EQU $cd
SFX_TWINKLE EQU $ce
-
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -68,4 +68,3 @@
PLAYER_SLIP EQU 2
PLAYER_SURF EQU 4
PLAYER_SURF_PIKA EQU 8
-
--- a/contents.asm
+++ b/contents.asm
@@ -127,5 +127,3 @@
; misc.o
MISC_CRYSTAL EQU $5E
-
-
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -5964,6 +5964,3 @@
bigdw 214 ; SAtk
bigdw 214 ; SDef
db "RANTA-N@@@@"
-
-
-
--- a/data/egg_moves_crystal.asm
+++ b/data/egg_moves_crystal.asm
@@ -1,3 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "data/egg_moves.asm"
-
--- a/data/evos_attacks_crystal.asm
+++ b/data/evos_attacks_crystal.asm
@@ -1,3 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "data/evos_attacks.asm"
-
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -481,4 +481,3 @@
bigdw 9 ; SAtk
bigdw 9 ; SDef
db "EGG@@@@@@@@"
-
--- a/data/pokedex/entries.asm
+++ b/data/pokedex/entries.asm
@@ -23,4 +23,3 @@
PokedexEntries4::
INCLUDE "data/pokedex/entries_4.asm"
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- a/data/pokedex/entries_crystal.asm
+++ b/data/pokedex/entries_crystal.asm
@@ -1,3 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "data/pokedex/entries.asm"
-
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -499,4 +499,3 @@
db TENTACOOL, 40 ; day
; 926c7
-
--- 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
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -2769,4 +2769,3 @@
RGB 00, 00, 00
RGB 00, 00, 00
; b829
-
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -1307,4 +1307,3 @@
; (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 "@"
-
--- a/engine/credits_crystal.asm
+++ b/engine/credits_crystal.asm
@@ -1,3 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "engine/credits.asm"
-
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -641,4 +641,3 @@
pop af
ret
; 97f7e
-
--- a/engine/facings.asm
+++ b/engine/facings.asm
@@ -266,4 +266,3 @@
db 9, -1, 4, $fe
db 9, 9, 4 | X_FLIP, $fe
; 4273
-
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -159,4 +159,3 @@
text_jump _NothingHereText
db "@"
; 440ce
-
--- a/engine/landmarks.asm
+++ b/engine/landmarks.asm
@@ -291,4 +291,3 @@
.kanto
ld e, 1
ret
-
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -3680,4 +3680,3 @@
dw ObjectStruct11
dw ObjectStruct12
; 5ae8
-
--- a/engine/more_phone_scripts.asm
+++ b/engine/more_phone_scripts.asm
@@ -1658,4 +1658,3 @@
clearflag ENGINE_14
specialphonecall $0000
end
-
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -827,5 +827,3 @@
ld [hl], $9
ret
; 54b8
-
-
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1689,4 +1689,3 @@
PackGFX:
INCBIN "gfx/misc/pack.w40.2bpp"
-
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -2586,4 +2586,3 @@
pop af
ld [UnownLetter], a
ret
-
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -3237,4 +3237,3 @@
.byte
db 0
; 97c28
-
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -639,4 +639,3 @@
ld a, [$abfd] ; XXX what is this memory location?
ld [ScriptVar], a
jp CloseSRAM
-
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -2365,4 +2365,3 @@
turn_head_up
step_end
; bcea5
-
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -474,4 +474,3 @@
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
-
--- a/event/dratini.asm
+++ b/event/dratini.asm
@@ -109,4 +109,3 @@
scf
ret
; 8b1e1
-
--- a/event/name_rater.asm
+++ b/event/name_rater.asm
@@ -233,4 +233,3 @@
text_jump UnknownText_0x1c0272
db "@"
; 0xfb841
-
--- a/event/poke_seer.asm
+++ b/event/poke_seer.asm
@@ -448,5 +448,3 @@
ld c, 0
ret
; 4f31c
-
-
--- a/gbhw.asm
+++ b/gbhw.asm
@@ -108,4 +108,3 @@
rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only)
rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only)
rIE EQU $ffff ; Interrupt Enable (R/W)
-
--- a/gfx/overworld/sprite_headers.asm
+++ b/gfx/overworld/sprite_headers.asm
@@ -614,4 +614,3 @@
db $3 * $40, BANK(StandingYoungsterSpriteGFX)
db STANDING_SPRITE, PAL_OW_BLUE
; 1499a
-
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -789,6 +789,3 @@
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"
-
-
-
--- a/gfx/pics/animation.asm
+++ b/gfx/pics/animation.asm
@@ -1119,5 +1119,3 @@
ld [CurPartySpecies], a
ret
; d0695
-
-
--- a/gfx/pics/palette_pointers.asm
+++ b/gfx/pics/palette_pointers.asm
@@ -539,4 +539,3 @@
RGB 17, 17, 17
; b0ce
-
--- 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
-
--- a/gfx/pics/unown_frame_pointers.asm
+++ b/gfx/pics/unown_frame_pointers.asm
@@ -25,4 +25,3 @@
dw UnownXFrames
dw UnownYFrames
dw UnownZFrames
-
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainers/palette_pointers.asm
@@ -80,4 +80,3 @@
GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal"
MysticalmanPalette: INCLUDE "gfx/trainers/mysticalman.pal"
; b1de
-
--- a/home.asm
+++ b/home.asm
@@ -2266,4 +2266,3 @@
jr nz, .asm_3fa2
ret
; 3fb5
-
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -416,4 +416,3 @@
pop hl
jp FarCopyBytesDouble
; fb6
-
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -131,4 +131,3 @@
ld [rSVBK], a
ret
; 309d
-
--- a/home/decompress.asm
+++ b/home/decompress.asm
@@ -341,4 +341,3 @@
inc hl
jp .Main
; c2f
-
--- a/home/delay.asm
+++ b/home/delay.asm
@@ -20,4 +20,3 @@
jr nz, DelayFrames
ret
; 46f
-
--- a/home/double_speed.asm
+++ b/home/double_speed.asm
@@ -28,4 +28,3 @@
stop ; rgbasm adds a nop after this instruction by default
ret
; 300b
-
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -131,4 +131,3 @@
IncGradGBPalTable_14:: db %01000000, %01000000, %01000000
IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
; 547
-
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -52,4 +52,3 @@
Function2d82:: ; 2d82
jp [hl]
; 2d83
-
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -110,4 +110,3 @@
and a
ret
; 2ebb
-
--- a/home/game_time.asm
+++ b/home/game_time.asm
@@ -129,4 +129,3 @@
ld [GameTimeHours + 1], a
ret
; 210f
-
--- a/home/handshake.asm
+++ b/home/handshake.asm
@@ -35,4 +35,3 @@
ret
; 208a
-
--- a/home/init.asm
+++ b/home/init.asm
@@ -221,4 +221,3 @@
call CloseSRAM
ret
; 283
-
--- a/home/item.asm
+++ b/home/item.asm
@@ -73,4 +73,3 @@
pop hl
ret
; 2f8c
-
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -488,4 +488,3 @@
ld [hl], a
ret
; b40
-
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -78,4 +78,3 @@
ld [rLCDC], a
ret
; 591
-
--- a/home/map.asm
+++ b/home/map.asm
@@ -2348,4 +2348,3 @@
pop hl
ret
; 2d43
-
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -678,4 +678,3 @@
and $c
ret
; 1b0f
-
--- a/home/math.asm
+++ b/home/math.asm
@@ -73,4 +73,3 @@
scf
ret
; 313d
-
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -595,4 +595,3 @@
ret
; 2063
-
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -218,4 +218,3 @@
call Function1c30
ret
; 0x1c30
-
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -344,4 +344,3 @@
rst Bankswitch
ret
; dc9
-
--- a/home/pokedex_flags.asm
+++ b/home/pokedex_flags.asm
@@ -36,4 +36,3 @@
and a
ret
; 33ab
-
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -51,4 +51,3 @@
ld l, a
ret
; 2dba
-
--- a/home/random.asm
+++ b/home/random.asm
@@ -82,4 +82,3 @@
pop bc
ret
; 2fcb
-
--- a/home/rtc.asm
+++ b/home/rtc.asm
@@ -22,4 +22,3 @@
callab _UpdateTimePals
ret
; 48c
-
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -404,5 +404,3 @@
ld [rSC], a
ret
; 92e
-
-
--- a/home/sine.asm
+++ b/home/sine.asm
@@ -19,4 +19,3 @@
rst Bankswitch
ret
; 1b1e
-
--- a/home/sram.asm
+++ b/home/sram.asm
@@ -31,4 +31,3 @@
pop af
ret
; 2fec
-
--- a/home/string.asm
+++ b/home/string.asm
@@ -36,4 +36,3 @@
pop hl
ret
; 2f17
-
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -216,4 +216,3 @@
add hl, bc
ret
; 1d35
-
--- a/home/time.asm
+++ b/home/time.asm
@@ -307,4 +307,3 @@
call CloseSRAM
ret
; 6ef
-
--- a/home/video.asm
+++ b/home/video.asm
@@ -484,4 +484,3 @@
rst Bankswitch
ret
; 17ff
-
--- a/home/window.asm
+++ b/home/window.asm
@@ -93,4 +93,3 @@
ld [hOAMUpdate], a
ret
; 2e4e
-
--- a/hram.asm
+++ b/hram.asm
@@ -71,4 +71,3 @@
hCGB EQU $ffe6
hSGB EQU $ffe7
hDMATransfer EQU $ffe8
-
--- a/interrupts.asm
+++ b/interrupts.asm
@@ -14,4 +14,3 @@
SECTION "joypad",ROM0[$60]
jp JoypadInt
-
--- a/items/item_attributes.asm
+++ b/items/item_attributes.asm
@@ -2049,5 +2049,3 @@
db 0 ; can select + toss
db ITEM
db $00 ; can't use
-
-
--- a/items/item_descriptions.asm
+++ b/items/item_descriptions.asm
@@ -1040,4 +1040,3 @@
TeruSama33Desc:
db "?@"
-
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -3301,4 +3301,3 @@
add hl, bc
ret
; f971
-
--- a/items/item_names.asm
+++ b/items/item_names.asm
@@ -254,4 +254,3 @@
db "TERU-SAMA@"
db "TERU-SAMA@"
db "?@"
-
--- a/items/marts.asm
+++ b/items/marts.asm
@@ -440,4 +440,3 @@
db POTION
db $ff
; 16218
-
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -9634,4 +9634,3 @@
ld [hl], a
ret
; 113f84
-
--- a/macros/move_anim.asm
+++ b/macros/move_anim.asm
@@ -241,4 +241,3 @@
anim_ret: macro
db $ff
endm
-
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -283,4 +283,3 @@
db $55
db \1 ; displacement
endm
-
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -227,4 +227,3 @@
endchannel: macro
db $ff
endm
-
--- a/main.asm
+++ b/main.asm
@@ -96596,4 +96596,3 @@
ELSE
INCBIN "misc/stadium2_1.bin"
ENDC
-
--- a/maps.asm
+++ b/maps.asm
@@ -510,4 +510,3 @@
INCLUDE "maps/SilverCaveOutside.asm"
INCLUDE "maps/Route10North.asm"
-
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -502,6 +502,3 @@
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
-
-
-
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/AzaleaPokeCenter1F.asm
+++ b/maps/AzaleaPokeCenter1F.asm
@@ -105,4 +105,3 @@
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
-
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -552,4 +552,3 @@
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
-
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -852,4 +852,3 @@
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
-
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -168,4 +168,3 @@
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
-
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -68,4 +68,3 @@
db 1
person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff
; 0x9f5b1
-
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -109,4 +109,3 @@
db 1
person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff
; 0x9f660
-
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -167,5 +167,3 @@
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
-
-
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -404,4 +404,3 @@
db 1
person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff
; 0x189b5f
-
--- a/maps/BlackthornDodrioTradeHouse.asm
+++ b/maps/BlackthornDodrioTradeHouse.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff
; 0x195a5b
-
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -64,4 +64,3 @@
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
-
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -497,4 +497,3 @@
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
-
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -208,4 +208,3 @@
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
-
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -68,4 +68,3 @@
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
-
--- a/maps/BlackthornPokeCenter1F.asm
+++ b/maps/BlackthornPokeCenter1F.asm
@@ -73,4 +73,3 @@
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
-
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -175,4 +175,3 @@
db 1
person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff
; 0x19b3c5
-
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -158,4 +158,3 @@
db 1
person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff
; 0x180baf
-
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -345,4 +345,3 @@
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
-
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -279,6 +279,3 @@
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
-
-
-
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -250,4 +250,3 @@
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
-
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -305,4 +305,3 @@
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
-
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -103,4 +103,3 @@
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
-
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -97,4 +97,3 @@
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
-
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -126,4 +126,3 @@
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
-
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -78,4 +78,3 @@
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
-
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -102,4 +102,3 @@
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
-
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -194,4 +194,3 @@
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
-
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -51,4 +51,3 @@
; people-events
db 0
; 0x713ed
-
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -370,4 +370,3 @@
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
-
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -318,4 +318,3 @@
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
-
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -400,4 +400,3 @@
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
-
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -108,4 +108,3 @@
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
-
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -78,4 +78,3 @@
; people-events
db 0
; 0x7166e
-
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -238,4 +238,3 @@
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
-
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -56,4 +56,3 @@
db 1
person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff
; 0x71afb
-
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -139,4 +139,3 @@
db 1
person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff
; 0x71e20
-
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -177,4 +177,3 @@
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
-
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x7211b
-
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -346,4 +346,3 @@
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
-
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -476,4 +476,3 @@
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
-
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -35,4 +35,3 @@
db 1
person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff
; 0x188048
-
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/CeruleanPokeCenter1F.asm
+++ b/maps/CeruleanPokeCenter1F.asm
@@ -87,4 +87,3 @@
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
-
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x1883cf
-
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -66,4 +66,3 @@
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
-
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -78,4 +78,3 @@
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
-
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -184,4 +184,3 @@
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
-
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -633,4 +633,3 @@
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
-
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -65,4 +65,3 @@
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
-
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -68,4 +68,3 @@
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
-
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -96,4 +96,3 @@
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
-
--- a/maps/CherrygrovePokeCenter1F.asm
+++ b/maps/CherrygrovePokeCenter1F.asm
@@ -95,4 +95,3 @@
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
-
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -460,4 +460,3 @@
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
-
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodCityPhotoStudio.asm
@@ -70,4 +70,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff
; 0x9e1ae
-
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -426,4 +426,3 @@
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
-
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -87,4 +87,3 @@
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
-
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -100,4 +100,3 @@
db 1
person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, PharmacistScript_0x9df9e, $ffff
; 0x9e0de
-
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokeCenter1F.asm
@@ -159,4 +159,3 @@
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
-
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -162,4 +162,3 @@
db 1
person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, BlueScript_0x1ac9b0, $0775
; 0x1acd20
-
--- a/maps/CinnabarPokeCenter1F.asm
+++ b/maps/CinnabarPokeCenter1F.asm
@@ -57,4 +57,3 @@
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
-
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x1ab3f4
-
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -97,4 +97,3 @@
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
-
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -98,4 +98,3 @@
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
-
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -418,4 +418,3 @@
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
-
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -480,4 +480,3 @@
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
-
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -83,4 +83,3 @@
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
-
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -60,4 +60,3 @@
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
-
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -194,5 +194,3 @@
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
-
-
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -49,4 +49,3 @@
db 1
person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff
; 0x7407f
-
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -747,4 +747,3 @@
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
-
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -26,4 +26,3 @@
; people-events
db 0
; 0x18c890
-
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -547,4 +547,3 @@
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
-
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -473,4 +473,3 @@
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
-
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -334,4 +334,3 @@
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
-
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -546,4 +546,3 @@
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
-
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -332,4 +332,3 @@
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
-
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -193,4 +193,3 @@
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
-
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -244,4 +244,3 @@
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
-
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -110,4 +110,3 @@
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
-
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1555,4 +1555,3 @@
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
-
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -352,4 +352,3 @@
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
-
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -698,4 +698,3 @@
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
-
--- a/maps/FastShipCabins.asm
+++ b/maps/FastShipCabins.asm
@@ -657,4 +657,3 @@
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
-
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -421,4 +421,3 @@
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
-
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -657,4 +657,3 @@
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
-
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -339,4 +339,3 @@
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
-
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -68,4 +68,3 @@
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
-
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -48,4 +48,3 @@
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
-
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -183,4 +183,3 @@
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
-
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -438,4 +438,3 @@
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
-
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/FuchsiaPokeCenter1F.asm
+++ b/maps/FuchsiaPokeCenter1F.asm
@@ -118,4 +118,3 @@
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
-
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x1965c4
-
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -140,4 +140,3 @@
db 1
person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff
; 0x54951
-
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -288,4 +288,3 @@
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
-
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -682,4 +682,3 @@
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
-
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -110,4 +110,3 @@
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
-
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -133,4 +133,3 @@
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
-
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -84,4 +84,3 @@
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
-
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -107,4 +107,3 @@
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
-
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -270,4 +270,3 @@
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
-
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -194,4 +194,3 @@
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
-
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -149,4 +149,3 @@
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
-
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -81,4 +81,3 @@
; people-events
db 0
; 0x56713
-
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -263,4 +263,3 @@
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
-
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -192,4 +192,3 @@
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
-
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -543,6 +543,3 @@
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
-
-
-
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -511,4 +511,3 @@
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
-
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -176,4 +176,3 @@
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
-
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -205,4 +205,3 @@
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
-
--- a/maps/GoldenrodNameRatersHouse.asm
+++ b/maps/GoldenrodNameRatersHouse.asm
@@ -47,4 +47,3 @@
db 1
person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff
; 0x5597f
-
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -78,4 +78,3 @@
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
-
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -905,4 +905,3 @@
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
-
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -314,4 +314,3 @@
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
-
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -49,4 +49,3 @@
db 1
person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff
; 0x196cb0
-
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -135,8 +135,3 @@
db 1
person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff
; 0x181695
-
-
-
-
-
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -41,4 +41,3 @@
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
-
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -128,4 +128,3 @@
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
-
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -36,4 +36,3 @@
db 1
person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d
; 0x7e66d
-
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -34,4 +34,3 @@
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
-
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1080,6 +1080,3 @@
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
-
-
-
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -53,4 +53,3 @@
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
-
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -352,4 +352,3 @@
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
-
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -166,4 +166,3 @@
db 1
person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff
; 0x180e2c
-
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -163,4 +163,3 @@
db 1
person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff
; 0x180986
-
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -444,4 +444,3 @@
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
-
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -163,4 +163,3 @@
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
-
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -132,4 +132,3 @@
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
-
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -777,4 +777,3 @@
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
-
--- a/maps/LakeofRageHiddenPowerHouse.asm
+++ b/maps/LakeofRageHiddenPowerHouse.asm
@@ -93,4 +93,3 @@
db 1
person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, FisherScript_0x19a527, $ffff
; 0x19a6ac
-
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -245,4 +245,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff
; 0x19ab09
-
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -389,4 +389,3 @@
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
-
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -263,4 +263,3 @@
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
-
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -69,4 +69,3 @@
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
-
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -45,4 +45,3 @@
db 1
person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, GentlemanScript_0x7eaf2, $ffff
; 0x7eb1a
-
--- a/maps/LavenderPokeCenter1F.asm
+++ b/maps/LavenderPokeCenter1F.asm
@@ -107,4 +107,3 @@
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
-
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x7e8c8
-
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -155,4 +155,3 @@
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
-
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderTownSpeechHouse.asm
@@ -50,4 +50,3 @@
db 1
person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff
; 0x7eaeb
-
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -513,4 +513,3 @@
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
-
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -268,4 +268,3 @@
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
-
--- a/maps/MahoganyPokeCenter1F.asm
+++ b/maps/MahoganyPokeCenter1F.asm
@@ -78,4 +78,3 @@
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
-
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -82,4 +82,3 @@
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
-
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -309,4 +309,3 @@
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
-
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -238,4 +238,3 @@
db 1
person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff
; 0x9d60d
-
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -95,6 +95,3 @@
; people-events
db 0
; 0x193688
-
-
-
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -61,4 +61,3 @@
; people-events
db 0
; 0x1935c4
-
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -197,4 +197,3 @@
db 1
person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a
; 0x74391
-
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -47,4 +47,3 @@
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
-
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -179,4 +179,3 @@
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
-
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -191,4 +191,3 @@
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
-
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -48,4 +48,3 @@
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
-
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -114,4 +114,3 @@
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
-
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -169,4 +169,3 @@
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
-
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x195cb4, $ffff
; 0x195ce6
-
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -109,4 +109,3 @@
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
-
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -429,4 +429,3 @@
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
-
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -70,4 +70,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff
; 0x18a817
-
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -674,4 +674,3 @@
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
-
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -274,4 +274,3 @@
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
-
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -347,4 +347,3 @@
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
-
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -316,6 +316,3 @@
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
-
-
-
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -102,4 +102,3 @@
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
-
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -360,4 +360,3 @@
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
-
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -107,4 +107,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x9c71b, $ffff
; 0x9c8bf
-
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -237,4 +237,3 @@
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
-
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -64,4 +64,3 @@
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
-
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -60,4 +60,3 @@
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
-
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -284,4 +284,3 @@
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
-
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -200,4 +200,3 @@
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
-
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -148,6 +148,3 @@
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
-
-
-
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -161,4 +161,3 @@
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
-
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -299,4 +299,3 @@
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
-
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/OlivinePokeCenter1F.asm
+++ b/maps/OlivinePokeCenter1F.asm
@@ -71,4 +71,3 @@
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
-
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -450,4 +450,3 @@
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
-
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -41,4 +41,3 @@
db 1
person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733
; 0x77018
-
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -64,4 +64,3 @@
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
-
--- a/maps/OlivineVoltorbHouse.asm
+++ b/maps/OlivineVoltorbHouse.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, FishingGuruScript_0x9c55c, $ffff
; 0x9c58d
-
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -107,4 +107,3 @@
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
-
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -205,4 +205,3 @@
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
-
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -261,4 +261,3 @@
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
-
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -49,4 +49,3 @@
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
-
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ b/maps/PewterPokeCEnter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x1a3057
-
--- a/maps/PewterPokeCenter1F.asm
+++ b/maps/PewterPokeCenter1F.asm
@@ -93,4 +93,3 @@
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
-
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -42,6 +42,3 @@
db 1
person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff
; 0x1a30b1
-
-
-
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -1178,4 +1178,3 @@
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
-
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -34,4 +34,3 @@
db 1
person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, $ffff
; 0x9e393
-
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -347,4 +347,3 @@
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
-
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -450,4 +450,3 @@
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
-
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -559,4 +559,3 @@
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
-
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -875,4 +875,3 @@
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
-
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -461,4 +461,3 @@
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
-
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -365,6 +365,3 @@
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
-
-
-
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -497,4 +497,3 @@
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
-
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -106,4 +106,3 @@
db 1
person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMomScript_0x19aea3, $ffff
; 0x19b048
-
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -49,4 +49,3 @@
; people-events
db 0
; 0x19b0ce
-
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -52,4 +52,3 @@
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
-
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -48,4 +48,3 @@
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
-
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -141,4 +141,3 @@
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
-
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -39,5 +39,3 @@
; people-events
db 0
; 0x1b20b3
-
-
--- a/maps/Route10PokeCenter1F.asm
+++ b/maps/Route10PokeCenter1F.asm
@@ -107,4 +107,3 @@
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
-
--- a/maps/Route10PokeCenter2FBeta.asm
+++ b/maps/Route10PokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x188db9
-
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -136,4 +136,3 @@
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
-
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -252,4 +252,3 @@
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
-
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -278,6 +278,3 @@
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
-
-
-
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -102,4 +102,3 @@
db 1
person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff
; 0x7f628
-
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -324,4 +324,3 @@
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
-
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -194,4 +194,3 @@
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
-
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -348,4 +348,3 @@
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
-
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff
; 0x196808
-
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -58,4 +58,3 @@
; people-events
db 0
; 0x1ad380
-
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -44,4 +44,3 @@
db 1
person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff
; 0x733e3
-
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -90,4 +90,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff
; 0x73516
-
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -245,4 +245,3 @@
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
-
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -81,6 +81,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff
; 0x736ed
-
-
-
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -139,4 +139,3 @@
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
-
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -352,4 +352,3 @@
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
-
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -68,4 +68,3 @@
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff
; 0x1ab4f4
-
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -256,4 +256,3 @@
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
-
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -198,4 +198,3 @@
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
-
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -167,4 +167,3 @@
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
-
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -36,4 +36,3 @@
; people-events
db 0
; 0x7c038
-
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -50,4 +50,3 @@
; people-events
db 0
; 0x1ae598
-
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -138,4 +138,3 @@
db 1
person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c
; 0x1adf63
-
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -622,6 +622,3 @@
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
-
-
-
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -583,4 +583,3 @@
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
-
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ b/maps/Route26DayofWeekSiblingsHouse.asm
@@ -91,4 +91,3 @@
db 1
person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff
; 0x7b392
-
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -71,4 +71,3 @@
db 1
person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff
; 0x7b1e2
-
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -655,4 +655,3 @@
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
-
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -120,4 +120,3 @@
db 1
person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, GrannyScript_0x7b394, $ffff
; 0x7b5b9
-
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -41,4 +41,3 @@
; people-events
db 0
; 0x1a5437
-
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -100,5 +100,3 @@
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
-
-
--- a/maps/Route2946Gate.asm
+++ b/maps/Route2946Gate.asm
@@ -59,6 +59,3 @@
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
-
-
-
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -46,4 +46,3 @@
db 1
person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff
; 0x9b9f1
-
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -72,4 +72,3 @@
db 1
person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff
; 0x9b950
-
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -235,4 +235,3 @@
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
-
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -534,4 +534,3 @@
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
-
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -69,4 +69,3 @@
db 1
person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff
; 0x196e47
-
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -511,4 +511,3 @@
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
-
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -50,6 +50,3 @@
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
-
-
-
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32PokeCenter1F.asm
@@ -123,4 +123,3 @@
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
-
--- a/maps/Route32RuinsofAlphGate.asm
+++ b/maps/Route32RuinsofAlphGate.asm
@@ -71,4 +71,3 @@
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
-
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -252,4 +252,3 @@
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
-
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1028,4 +1028,3 @@
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
-
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -172,4 +172,3 @@
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
-
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -677,4 +677,3 @@
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
-
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -231,4 +231,3 @@
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
-
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -509,4 +509,3 @@
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
-
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -964,6 +964,3 @@
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
-
-
-
--- a/maps/Route36RuinsofAlphgate.asm
+++ b/maps/Route36RuinsofAlphgate.asm
@@ -57,4 +57,3 @@
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
-
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -652,4 +652,3 @@
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
-
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -45,4 +45,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff
; 0x9cc74
-
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -480,4 +480,3 @@
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
-
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -229,4 +229,3 @@
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
-
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -231,4 +231,3 @@
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
-
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -207,4 +207,3 @@
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
-
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -100,4 +100,3 @@
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
-
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -573,4 +573,3 @@
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
-
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -445,4 +445,3 @@
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
-
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff
; 0x19a525
-
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -692,4 +692,3 @@
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
-
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -301,4 +301,3 @@
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
-
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -61,4 +61,3 @@
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff
; 0x19abb8
-
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -709,4 +709,3 @@
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
-
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -738,4 +738,3 @@
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
-
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -353,4 +353,3 @@
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
-
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -66,4 +66,3 @@
db 1
person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771
; 0x1adbf8
-
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -85,6 +85,3 @@
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
-
-
-
--- a/maps/Route5SaffronCityGate.asm
+++ b/maps/Route5SaffronCityGate.asm
@@ -41,4 +41,3 @@
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff
; 0x18b632
-
--- a/maps/Route5UndergroundEntrance.asm
+++ b/maps/Route5UndergroundEntrance.asm
@@ -39,4 +39,3 @@
db 1
person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff
; 0x18b5b7
-
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -155,4 +155,3 @@
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
-
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -83,4 +83,3 @@
db 1
person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff
; 0x19282e
-
--- a/maps/Route6UndergroundEntrance.asm
+++ b/maps/Route6UndergroundEntrance.asm
@@ -25,4 +25,3 @@
; people-events
db 0
; 0x192845
-
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -59,4 +59,3 @@
; people-events
db 0
; 0x1ad47d
-
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -68,4 +68,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff
; 0x73607
-
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -301,4 +301,3 @@
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
-
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff
; 0x7f482
-
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -354,4 +354,3 @@
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
-
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -196,4 +196,3 @@
; people-events
db 0
; 0x58f5f
-
--- a/maps/RuinsofAlphAerodactylItemRoom.asm
+++ b/maps/RuinsofAlphAerodactylItemRoom.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/RuinsofAlphAerodactylWordRoom.asm
+++ b/maps/RuinsofAlphAerodactylWordRoom.asm
@@ -25,4 +25,3 @@
; people-events
db 0
; 0x59b9a
-
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -197,4 +197,3 @@
; people-events
db 0
; 0x5871e
-
--- a/maps/RuinsofAlphHoOhItemRoom.asm
+++ b/maps/RuinsofAlphHoOhItemRoom.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/RuinsofAlphHoOhWordRoom.asm
+++ b/maps/RuinsofAlphHoOhWordRoom.asm
@@ -25,4 +25,3 @@
; people-events
db 0
; 0x59b55
-
--- a/maps/RuinsofAlphInnerChamber.asm
+++ b/maps/RuinsofAlphInnerChamber.asm
@@ -143,4 +143,3 @@
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
-
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -318,4 +318,3 @@
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
-
--- a/maps/RuinsofAlphKabutoItemRoom.asm
+++ b/maps/RuinsofAlphKabutoItemRoom.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/RuinsofAlphKabutoWordRoom.asm
+++ b/maps/RuinsofAlphKabutoWordRoom.asm
@@ -25,4 +25,3 @@
; people-events
db 0
; 0x59b6c
-
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -197,4 +197,3 @@
; people-events
db 0
; 0x58da0
-
--- a/maps/RuinsofAlphOmanyteItemRoom.asm
+++ b/maps/RuinsofAlphOmanyteItemRoom.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/RuinsofAlphOmanyteWordRoom.asm
+++ b/maps/RuinsofAlphOmanyteWordRoom.asm
@@ -25,4 +25,3 @@
; people-events
db 0
; 0x59b83
-
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -385,4 +385,3 @@
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
-
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -459,4 +459,3 @@
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
-
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -24,4 +24,3 @@
; people-events
db 0
; 0x74486
-
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -26,4 +26,3 @@
; people-events
db 0
; 0x74474
-
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -24,4 +24,3 @@
; people-events
db 0
; 0x195db7
-
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -107,4 +107,3 @@
db 1
person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, LassScript_0x1965c6, $ffff
; 0x19679c
-
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -343,4 +343,3 @@
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
-
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -435,4 +435,3 @@
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
-
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -59,4 +59,3 @@
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
-
--- a/maps/SaffronPokeCenter1F.asm
+++ b/maps/SaffronPokeCenter1F.asm
@@ -140,4 +140,3 @@
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
-
--- a/maps/SaffronPokeCenter2FBeta.asm
+++ b/maps/SaffronPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x18a778
-
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -262,4 +262,3 @@
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
-
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -186,6 +186,3 @@
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
-
-
-
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -77,4 +77,3 @@
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
-
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -34,4 +34,3 @@
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
-
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -55,4 +55,3 @@
; people-events
db 0
; 0x1b207e
-
--- a/maps/SilverCavePokeCenter1F.asm
+++ b/maps/SilverCavePokeCenter1F.asm
@@ -50,4 +50,3 @@
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
-
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -58,4 +58,3 @@
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
-
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -48,4 +48,3 @@
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
-
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -68,4 +68,3 @@
db 1
person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, $0762
; 0x18c65c
-
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -433,4 +433,3 @@
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
-
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -82,4 +82,3 @@
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
-
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -97,4 +97,3 @@
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
-
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -156,4 +156,3 @@
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
-
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -149,4 +149,3 @@
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
-
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -439,4 +439,3 @@
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
-
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -876,4 +876,3 @@
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
-
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1100,4 +1100,3 @@
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
-
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -729,4 +729,3 @@
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
-
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -85,4 +85,3 @@
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
-
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -589,4 +589,3 @@
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
-
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -24,4 +24,3 @@
; people-events
db 0
; 0x185a35
-
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -29,4 +29,3 @@
db 1
person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b
; 0x185a56
-
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -48,4 +48,3 @@
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
-
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -45,4 +45,3 @@
db 1
person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f
; 0x185ae2
-
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -29,4 +29,3 @@
db 1
person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6
; 0x185b03
-
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -32,4 +32,3 @@
db 1
person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650
; 0x185b33
-
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -43,4 +43,3 @@
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
-
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -44,4 +44,3 @@
db 1
person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7
; 0x185be1
-
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -68,6 +68,3 @@
db 1
person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c
; 0x77282
-
-
-
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -29,4 +29,3 @@
db 1
person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9
; 0x18db21
-
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -85,4 +85,3 @@
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
-
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -174,4 +174,3 @@
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
-
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -204,4 +204,3 @@
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
-
--- a/maps/Underground.asm
+++ b/maps/Underground.asm
@@ -38,4 +38,3 @@
; people-events
db 0
; 0x743b3
-
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -1134,4 +1134,3 @@
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
-
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -302,4 +302,3 @@
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
-
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -329,4 +329,3 @@
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
-
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -259,4 +259,3 @@
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
-
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -228,4 +228,3 @@
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
-
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -341,4 +341,3 @@
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
-
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -372,4 +372,3 @@
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
-
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
@@ -39,4 +39,3 @@
db 1
person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff
; 0x1920a3
-
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionHouseFishingSpeechHouse.asm
@@ -72,4 +72,3 @@
db 1
person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x19148d, $ffff
; 0x191601
-
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -57,4 +57,3 @@
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
-
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -58,4 +58,3 @@
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
-
--- a/maps/VermilionPokeCenter1F.asm
+++ b/maps/VermilionPokeCenter1F.asm
@@ -103,4 +103,3 @@
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
-
--- a/maps/VermilionPokeCenter2FBeta.asm
+++ b/maps/VermilionPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x1917e7
-
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -358,4 +358,3 @@
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
-
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -40,4 +40,3 @@
db 1
person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff
; 0x77086
-
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -296,4 +296,3 @@
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
-
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -136,6 +136,3 @@
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
-
-
-
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -347,4 +347,3 @@
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
-
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -359,4 +359,3 @@
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
-
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -70,4 +70,3 @@
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
-
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -67,4 +67,3 @@
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
-
--- a/maps/VioletOnixTradeHouse.asm
+++ b/maps/VioletOnixTradeHouse.asm
@@ -52,4 +52,3 @@
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
-
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -256,4 +256,3 @@
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
-
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -269,4 +269,3 @@
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
-
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -200,4 +200,3 @@
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
-
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -58,4 +58,3 @@
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
-
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -86,4 +86,3 @@
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
-
--- a/maps/ViridianPokeCenter1F.asm
+++ b/maps/ViridianPokeCenter1F.asm
@@ -98,4 +98,3 @@
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
-
--- a/maps/ViridianPokeCenter2FBeta.asm
+++ b/maps/ViridianPokeCenter2FBeta.asm
@@ -23,4 +23,3 @@
; people-events
db 0
; 0x9b845
-
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -831,4 +831,3 @@
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
-
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -82,4 +82,3 @@
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
-
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -41,4 +41,3 @@
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
-
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -24,4 +24,3 @@
; people-events
db 0
; 0x18c3fc
-
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -67,4 +67,3 @@
db 1
person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d
; 0x18c552
-
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -30,4 +30,3 @@
db 1
person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f
; 0x18c3ba
-
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -26,4 +26,3 @@
; people-events
db 0
; 0x18c394
-
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -24,4 +24,3 @@
; people-events
db 0
; 0x18c40e
-
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -32,4 +32,3 @@
db 1
person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690
; 0x18c3ea
-
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -161,4 +161,3 @@
db 1
person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff
; 0x18071b
-
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -450,4 +450,3 @@
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
-
--- a/maps/blockdata_1.asm
+++ b/maps/blockdata_1.asm
@@ -384,4 +384,3 @@
Route22_BlockData: ; 0xabef7
INCBIN "maps/Route22.blk"
; 0xabfab
-
--- a/maps/blockdata_2.asm
+++ b/maps/blockdata_2.asm
@@ -598,4 +598,3 @@
OlivineLighthouse6F_BlockData: ; 0xaff00
INCBIN "maps/OlivineLighthouse6F.blk"
; 0xaff5a
-
--- a/maps/blockdata_3.asm
+++ b/maps/blockdata_3.asm
@@ -351,4 +351,3 @@
GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22
INCBIN "maps/GoldenrodDeptStoreRoof.blk"
; 0xb1b42
-
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -493,4 +493,3 @@
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
-
--- 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
-
--- a/maps_crystal.asm
+++ b/maps_crystal.asm
@@ -1,3 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "maps.asm"
-
--- a/menu/mon_icons.asm
+++ b/menu/mon_icons.asm
@@ -347,4 +347,3 @@
SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d
SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d
BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d
-
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -147,4 +147,3 @@
GBCOnlyGFX: ; 4eb76
INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
; 4f0bc
-
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -8075,5 +8075,3 @@
text_jump UnknownText_0x1c4525
db "@"
; 0x10389d
-
-
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -1944,4 +1944,3 @@
RGB 21, 20, 20
RGB 14, 14, 31
RGB 0, 0, 0
-
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -25025,5 +25025,3 @@
Attrmap_173517:
INCBIN "gfx/unknown/173517.attrmap"
-
-
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -5311,4 +5311,3 @@
String_17ff68: ; 17ff68
db "101@"
; 17ff6c
-
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -1111,4 +1111,3 @@
RGB 05, 14, 21
RGB 00, 03, 19
; 95f0
-
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -620,4 +620,3 @@
pop hl
jp Function9809
; 8a68
-
--- a/rst.asm
+++ b/rst.asm
@@ -35,4 +35,3 @@
SECTION "rst38",ROM0[$38]
rst $38
-
--- a/text/common.asm
+++ b/text/common.asm
@@ -1199,4 +1199,3 @@
line "get started now!"
done
; 0x1b2042
-
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -1710,4 +1710,3 @@
line "a while."
prompt
; 0x1c611e
-
--- a/text/phone/buena.asm
+++ b/text/phone/buena.asm
@@ -548,4 +548,3 @@
para "Please call again!"
done
; 0xa1eca
-
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -1076,4 +1076,3 @@
WhirlpoolTiles3: INCBIN "gfx/tilesets/whirlpool/3.2bpp"
WhirlpoolTiles4: INCBIN "gfx/tilesets/whirlpool/4.2bpp"
; fcba8
-
--- a/tilesets/data_1.asm
+++ b/tilesets/data_1.asm
@@ -48,4 +48,3 @@
Tileset20Coll: ; 0x1bcfe
INCBIN "tilesets/20_collision.bin"
; 0x1bdfe
-
--- a/tilesets/data_2.asm
+++ b/tilesets/data_2.asm
@@ -59,4 +59,3 @@
Tileset30Coll: ; 0x1f21c
INCBIN "tilesets/24_collision.bin"
; 0x1f31c
-
--- a/tilesets/data_3.asm
+++ b/tilesets/data_3.asm
@@ -62,4 +62,3 @@
Tileset31Meta: ; 0x23891
INCBIN "tilesets/31_metatiles.bin"
; 0x23b11
-
--- a/tilesets/data_4.asm
+++ b/tilesets/data_4.asm
@@ -57,4 +57,3 @@
UnusedTileset30Coll: ; 0x331f0
INCBIN "tilesets/unused_30_collision.bin"
; 0x333f0
-
--- a/tilesets/data_5.asm
+++ b/tilesets/data_5.asm
@@ -58,4 +58,3 @@
Tileset16Coll: ; 0xb7da8
INCBIN "tilesets/16_collision.bin"
; 0xb7ea8
-
--- a/tilesets/data_6.asm
+++ b/tilesets/data_6.asm
@@ -73,4 +73,3 @@
Tileset36Coll: ; 0xdfc90
INCBIN "tilesets/36_collision.bin"
; 0xdfd90
-
--- a/tilesets/data_7.asm
+++ b/tilesets/data_7.asm
@@ -14,4 +14,3 @@
Tileset26Coll: ; 0x1dd5a9
INCBIN "tilesets/26_collision.bin"
; 0x1dd6a9
-
--- a/tilesets/data_8.asm
+++ b/tilesets/data_8.asm
@@ -13,4 +13,3 @@
Tileset36Meta: ; 0x1e0c00
INCBIN "tilesets/36_metatiles.bin"
; 0x1e1000
-
--- a/tilesets/tileset_headers.asm
+++ b/tilesets/tileset_headers.asm
@@ -295,4 +295,3 @@
dw Tileset36PalMap
; 0x4d7c1
-
--- a/trainers/attributes.asm
+++ b/trainers/attributes.asm
@@ -422,4 +422,3 @@
dw CONTEXT_USE + SWITCH_SOMETIMES
; 39771
-
--- a/trainers/dvs.asm
+++ b/trainers/dvs.asm
@@ -90,4 +90,3 @@
db $7E, $A8 ; gruntf
db $98, $88 ; mysticalman
; 2715c
-
--- a/trainers/trainers.asm
+++ b/trainers/trainers.asm
@@ -8827,4 +8827,3 @@
; ================
; ================================
-