diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
| commit | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (patch) | |
| tree | ca189f210cb5f404d4791ace04fcd70de6b3a642 /text | |
| parent | 42a9f7e8fd9f2f56a271cd5378467bb6a0f5bd21 (diff) | |
Part 1 of syncing with pokered.
Diffstat (limited to 'text')
192 files changed, 4 insertions, 206 deletions
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 95b455c8..45a4692d 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -42,4 +42,3 @@ _AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 723021a1..1717c552 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -11,7 +11,7 @@ _BikeShopText_1d815:: line "Do you want it?" done -_BikeShopText_1d81a:: +_BikeShopCantAffordText:: text "Sorry! You can't" line "afford it!" prompt @@ -29,7 +29,7 @@ _BikeShopText_1d824:: line "the BIKE VOUCHER" cont "for a BICYCLE.@@" -_BikeShopText_1d82a:: +_BikeShopComeAgainText:: text "Come back again" line "sometime!" done @@ -68,4 +68,3 @@ _BikeShopText_1d861:: text "Wow. Your BIKE is" line "really cool!" done - diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 5403ce1a..dd556a7b 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -90,4 +90,3 @@ _BillsHouseText_1e8da:: cont "some of my rare" cont "#MON on my PC!" done - diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index 9891ce26..c7db0b2c 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -39,4 +39,3 @@ _BluesHouseText3:: text "It's a big map!" line "This is useful!" done - diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index ddcbdb59..39898eb5 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -35,4 +35,3 @@ _BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index e126980f..908fcbb4 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -150,4 +150,3 @@ _CeladonCityText10:: line "CELADON DEPT." cont "STORE!" done - diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm index cf343206..8d805edc 100644 --- a/text/maps/celadon_dept_store_1f.asm +++ b/text/maps/celadon_dept_store_1f.asm @@ -29,4 +29,3 @@ _CeladonMart1Text3:: text "1F: SERVICE" line " COUNTER" done - diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm index b1345a05..74869902 100644 --- a/text/maps/celadon_dept_store_2f.asm +++ b/text/maps/celadon_dept_store_2f.asm @@ -20,4 +20,3 @@ _CeladonMart2Text5:: para "2F: TRAINER'S" line " MARKET" done - diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 42c46591..4006a3bb 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -96,4 +96,3 @@ _TM18NoRoomText:: text "Your pack is full" line "of items!" done - diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index 3124e46f..c17483c1 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -28,4 +28,3 @@ _CeladonMart4Text4:: line "Element STONEs on" cont "sale now!" done - diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm index a2bb97f6..1871194b 100644 --- a/text/maps/celadon_dept_store_5f.asm +++ b/text/maps/celadon_dept_store_5f.asm @@ -26,4 +26,3 @@ _CeladonMart5Text2:: _CeladonMart5Text5:: text "5F: DRUG STORE" done - diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 0c91b773..319ca3f0 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -133,4 +133,3 @@ _VendingMachineText6:: _VendingMachineText7:: text "Not thirsty!" done - diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index 7f69e67f..fd31eb20 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -57,4 +57,3 @@ _CeladonDinerText_491b7:: line "I was going to" cont "win it back..." done - diff --git a/text/maps/celadon_game_corner_1.asm b/text/maps/celadon_game_corner_1.asm index c5108c2e..ad8a82b2 100644 --- a/text/maps/celadon_game_corner_1.asm +++ b/text/maps/celadon_game_corner_1.asm @@ -179,4 +179,3 @@ _CeladonGameCornerText_48f09:: para "A switch behind" line "the poster!?" cont "Let's push it!@@" - diff --git a/text/maps/celadon_game_corner_2.asm b/text/maps/celadon_game_corner_2.asm index 7ee54725..c288464d 100755 --- a/text/maps/celadon_game_corner_2.asm +++ b/text/maps/celadon_game_corner_2.asm @@ -2,4 +2,3 @@ _CeladonGameCornerText_48f19:: text "Oops! Forgot the" line "COIN CASE!" done - diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index c076196f..99833ee1 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -216,4 +216,3 @@ _CeladonGymAfterBattleText8:: para "Wait 'til next" line "time!" done - diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm index c9e8bd8b..f2eb059e 100644 --- a/text/maps/celadon_hotel.asm +++ b/text/maps/celadon_hotel.asm @@ -19,4 +19,3 @@ _CeladonHotelText3:: text "Why did she bring" line "her brother?" done - diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm index c0bb9532..19e59bd6 100644 --- a/text/maps/celadon_house.asm +++ b/text/maps/celadon_house.asm @@ -20,4 +20,3 @@ _CeladonHouseText3:: para "There's no secret" line "switch behind it!" done - diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index e106eb1c..23123892 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -62,4 +62,3 @@ _CeladonMansion1Text12:: para "You're making me" line "jealous!" done - diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm index ecb46da6..b2ecb4fa 100644 --- a/text/maps/celadon_mansion_2f.asm +++ b/text/maps/celadon_mansion_2f.asm @@ -2,4 +2,3 @@ _CeladonMansion2Text1:: text "GAME FREAK" line "Meeting Room" done - diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index d4cc4caa..baf86186 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -115,4 +115,3 @@ _CeladonMansion3Text8:: text "GAME FREAK" line "Development Room" done - diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm index 9749774f..dab81a8d 100644 --- a/text/maps/celadon_mansion_4f_inside.asm +++ b/text/maps/celadon_mansion_4f_inside.asm @@ -8,4 +8,3 @@ _CeladonMansion5Text1:: line "your friends and" cont "trade #MON!" done - diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm index 7053d74a..c8fd7ec8 100644 --- a/text/maps/celadon_mansion_4f_outside.asm +++ b/text/maps/celadon_mansion_4f_outside.asm @@ -1,4 +1,3 @@ _CeladonMansion4Text1:: text "I KNOW EVERYTHING!" done - diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm index 32fa7a6a..a04f51c9 100644 --- a/text/maps/celadon_pokecenter.asm +++ b/text/maps/celadon_pokecenter.asm @@ -10,4 +10,3 @@ _CeladonPokecenterText3:: line "CYCLING ROAD from" cont "FUCHSIA!" done - diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm index 3f96fdfb..6b2bb537 100644 --- a/text/maps/celadon_prize_room.asm +++ b/text/maps/celadon_prize_room.asm @@ -10,4 +10,3 @@ _CeladonPrizeRoomText2:: text "I had a major" line "haul today!" done - diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm index 9b0066a1..4bba10cd 100644 --- a/text/maps/cerulean_badge_house_1.asm +++ b/text/maps/cerulean_badge_house_1.asm @@ -66,4 +66,3 @@ _CeruleanHouse2Text_74ea5:: line "use STRENGTH out-" cont "side of battle." prompt - diff --git a/text/maps/cerulean_badge_house_2.asm b/text/maps/cerulean_badge_house_2.asm index 69ea9ca2..e5da0622 100755 --- a/text/maps/cerulean_badge_house_2.asm +++ b/text/maps/cerulean_badge_house_2.asm @@ -26,4 +26,3 @@ _CeruleanHouse2Text_74eb9:: text "All #MON will" line "obey you!" prompt - diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 712b332f..4c51c5e0 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -230,4 +230,3 @@ _CeruleanCityText17:: para "The Tomboyish" line "Mermaid!" done - diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index b77831b4..70cbdf0d 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -132,4 +132,3 @@ _CeruleanGymText_5c82f:: line "we make a pretty" cont "darn good team!" done - diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm index 8ebe0c32..86a74588 100644 --- a/text/maps/cerulean_mart.asm +++ b/text/maps/cerulean_mart.asm @@ -17,4 +17,3 @@ _CeruleanMartText3:: line "make #MON go" cont "up one level!" done - diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm index e7933988..497fbce3 100644 --- a/text/maps/cerulean_pokecenter.asm +++ b/text/maps/cerulean_pokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText1:: +_CeruleanPokecenterText2:: text "That BILL!" para "I heard that" @@ -22,4 +22,3 @@ _CeruleanPokecenterText3:: line "to boast about" cont "their #MON?" done - diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm index b23f4507..f79540ae 100644 --- a/text/maps/cerulean_trashed_house.asm +++ b/text/maps/cerulean_trashed_house.asm @@ -34,4 +34,3 @@ _CeruleanHouseTrashedText3:: text "TEAM ROCKET left" line "a way out!" done - diff --git a/text/maps/champion.asm b/text/maps/champion.asm index eb0287af..079c2ed4 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,4 +1,4 @@ -_GaryText_760f4:: +_GaryChampionIntroText:: text $53, ": Hey!" para "I was looking" @@ -144,4 +144,3 @@ _GaryText_7612a:: para $52, "!" line "Come with me!" done - diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index e795aca4..58873c2a 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -250,4 +250,3 @@ _CinnabarGymText_7:: text "Come on, answer" line "the question!" done - diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index bd11ff49..54552a46 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -35,4 +35,3 @@ _CinnabarIslandText7:: para "The Hot-Headed" line "Quiz Master!" done - diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm index 74161166..a93a484d 100644 --- a/text/maps/cinnabar_lab.asm +++ b/text/maps/cinnabar_lab.asm @@ -27,4 +27,3 @@ _Lab1Text5:: text "#MON LAB" line "Testing Room" done - diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 38deb1ee..565104b3 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -76,4 +76,3 @@ _Lab4Text_610bd:: text "Aiyah! You come" line "again!" done - diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index b8034889..e2fbb558 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -61,4 +61,3 @@ _Lab3Text3:: _Lab3Text5:: text "An amber pipe!" done - diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm index 3c0a4bfe..196124e7 100644 --- a/text/maps/cinnabar_lab_trade_room.asm +++ b/text/maps/cinnabar_lab_trade_room.asm @@ -7,4 +7,3 @@ _Lab2Text1:: line "rare, prehistoric" cont "#MON!" done - diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm index 44292ca8..42a41d06 100644 --- a/text/maps/cinnabar_mart.asm +++ b/text/maps/cinnabar_mart.asm @@ -8,4 +8,3 @@ _CinnabarMartText3:: text "It never hurts to" line "have extra items!" done - diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm index e3e6cca9..301c9740 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/cinnabar_pokecenter.asm @@ -20,4 +20,3 @@ _CinnabarPokecenterText3:: para "I think it's" line "worth a try!" done - diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 8f59f22f..90833127 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -94,4 +94,3 @@ _CopycatsHouse2FText_5cd17:: _CopycatsHouse2FText_5cd1c:: text "Huh? Can't see!" done - diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm index 16cdb562..ecd3225e 100644 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ b/text/maps/digletts_cave_route_11_entrance.asm @@ -6,4 +6,3 @@ _DiglettsCaveEntRoute11Text1:: para "It goes right to" line "VIRIDIAN CITY!" done - diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm index f6d5589c..a04bbef7 100644 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ b/text/maps/digletts_cave_route_2_entrance.asm @@ -7,4 +7,3 @@ _DiglettsCaveRoute2Text1:: line "FLASH could light" cont "it up..." done - diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 33d3ca53..5fcd469d 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -176,4 +176,3 @@ _FanClubText6:: line "very vocal about" cont "#MON." done - diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index f5cd5101..a6ccc8c3 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -128,4 +128,3 @@ _OtherHitmonText:: text "Better not get" line "greedy..." done - diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index a3cec8c4..0392a1ed 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -117,4 +117,3 @@ _FuchsiaCityKabutoText:: _FuchsiaCityText_19b2a:: text "..." done - diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 4f0c98b5..195dc8ef 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -41,4 +41,3 @@ _FuchsiaHouse3Text_5621c:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm index a4b14eb6..7b6556b1 100644 --- a/text/maps/fuchsia_house.asm +++ b/text/maps/fuchsia_house.asm @@ -25,4 +25,3 @@ _FuchsiaHouse1Text3:: para "Did he show you?" done - diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm index 6764e3a8..574898ce 100644 --- a/text/maps/fuchsia_mart.asm +++ b/text/maps/fuchsia_mart.asm @@ -12,4 +12,3 @@ _FuchsiaMartText3:: cont "up a #MON in" cont "battle!" done - diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm index 1fa81344..10675ead 100644 --- a/text/maps/fuchsia_meeting_room.asm +++ b/text/maps/fuchsia_meeting_room.asm @@ -24,4 +24,3 @@ _FuchsiaMeetingRoomText3:: para "I think he's got" line "a speech problem!" done - diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm index 617c3b84..a0def7eb 100644 --- a/text/maps/fuchsia_pokecenter.asm +++ b/text/maps/fuchsia_pokecenter.asm @@ -18,4 +18,3 @@ _FuchsiaPokecenterText3:: cont "The HQ governs" cont "all trainers." done - diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index e75d46ea..7c61d1ed 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -83,4 +83,3 @@ _LavenderHouse1Text6:: para "Gone! It's been" line "clipped out!" done - diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index cbb0e52b..8faefd3f 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -26,4 +26,3 @@ _HallofFameRoomText1:: cont "your #MON are" cont "HALL OF FAMERs!" done - diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm index bfac25c3..86cfb562 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/indigo_plateau_lobby.asm @@ -23,4 +23,3 @@ _IndigoPlateauLobbyText3:: cont "next trainer!" cont "Good luck!" done - diff --git a/text/maps/lance.asm b/text/maps/lance.asm index beedd955..9c7bd677 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -61,4 +61,3 @@ _LanceAfterBattleText:: para "He is the real" line "#MON LEAGUE" cont "champion!@@" - diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm index d92f0c68..66cc85a5 100644 --- a/text/maps/lavender_house.asm +++ b/text/maps/lavender_house.asm @@ -22,4 +22,3 @@ _LavenderHouse2Text_1d9e1:: line "soothed its" cont "restless soul!" done - diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm index 69b8096f..54519890 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/lavender_mart.asm @@ -28,4 +28,3 @@ _LavenderMart_5c958:: line "useless, but it" cont "sold for ¥5000!" done - diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm index d982fa75..5ee5b2f5 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/lavender_pokecenter.asm @@ -12,4 +12,3 @@ _LavenderPokecenterText3:: cont "to escape from" cont "TEAM ROCKET!" done - diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm index d3b41ffa..19b6c8c8 100644 --- a/text/maps/lavender_town.asm +++ b/text/maps/lavender_town.asm @@ -62,4 +62,3 @@ _LavenderTownText9:: line "#MON Rest Easy" cont "#MON TOWER" done - diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm index 3ddd5660..a3c517fb 100644 --- a/text/maps/mansion_1f.asm +++ b/text/maps/mansion_1f.asm @@ -27,4 +27,3 @@ _MansionSwitchPressedText:: _MansionSwitchNotPressedText:: text "Not quite yet!" done - diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm index c7e12408..378efb30 100644 --- a/text/maps/mansion_2f.asm +++ b/text/maps/mansion_2f.asm @@ -45,4 +45,3 @@ _Mansion2Text_520c7:: _Mansion2Text_520cc:: text "Not quite yet!" done - diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm index 7e48a844..70331fdf 100644 --- a/text/maps/mansion_3f.asm +++ b/text/maps/mansion_3f.asm @@ -35,4 +35,3 @@ _Mansion3Text5:: para "We named the" line "newborn MEWTWO." done - diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm index 78de2abb..1bc1ef89 100644 --- a/text/maps/mansion_b1f.asm +++ b/text/maps/mansion_b1f.asm @@ -37,4 +37,3 @@ _Mansion4Text7:: line "curb its vicious" cont "tendencies..." done - diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index 78257980..8c37383d 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -23,4 +23,3 @@ _TM29NoRoomText:: text "Where do you plan" line "to put this?" done - diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm index 85cdee66..cd995ed5 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/mt_moon_b1f.asm @@ -1,4 +1,3 @@ _MtMoonText1:: db $0 done - diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 610ff254..f45c5598 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -46,4 +46,3 @@ _MtMoonPokecenterText_4936b:: text "MAN: Well, I don't" line "give refunds!" done - diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 71aeee3c..ecb511aa 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -105,4 +105,3 @@ _Museum1FText_5c2bc:: text "The AMBER is" line "clear and gold!" done - diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index 09878dca..7194a927 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -58,4 +58,3 @@ _NameRaterText_1dad1:: TX_RAM wcd6d text "!" done - diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index 6eb603a3..741ad529 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -65,4 +65,3 @@ _PalletTownText6:: _PalletTownText7:: text $53,"'s house " done - diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index 0d7c7de7..03dfcc91 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -115,4 +115,3 @@ _PewterCityText12:: line "A Stone Gray" cont "City" done - diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm index 0fe3e165..450e8372 100644 --- a/text/maps/pewter_house_1.asm +++ b/text/maps/pewter_house_1.asm @@ -22,4 +22,3 @@ _PewterHouse1Text3:: para "If only we had" line "some BADGEs..." done - diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm index 34ebc90d..615536f7 100644 --- a/text/maps/pewter_house_2.asm +++ b/text/maps/pewter_house_2.asm @@ -17,4 +17,3 @@ _PewterHouse2Text2:: para "But, it's not a" line "sure thing!" done - diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 6eda0d88..29a1f597 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -15,4 +15,3 @@ _PewterMartText_74cd5:: cont "diligently, even" cont "the weak ones!" done - diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm index b817ef81..ac92f4b0 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/pokemon_league_gate.asm @@ -17,4 +17,3 @@ _Route22GateText_1e71a:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@@" - diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm index b9570d18..50a2cd29 100644 --- a/text/maps/pokemon_tower_1f.asm +++ b/text/maps/pokemon_tower_1f.asm @@ -29,4 +29,3 @@ _PokemonTower1Text5:: line "There are spirits" cont "up to mischief!" done - diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index e41112a4..ec2281fd 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -55,4 +55,3 @@ _PokemonTower2Text2:: line "might be able to" cont "unmask them." done - diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm index 443aecd5..67098e6b 100644 --- a/text/maps/pokemon_tower_3f.asm +++ b/text/maps/pokemon_tower_3f.asm @@ -43,4 +43,3 @@ _PokemonTower3AfterBattleText3:: text "My friends were" line "possessed too!" done - diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm index e8fa75b6..771325a0 100644 --- a/text/maps/pokemon_tower_4f.asm +++ b/text/maps/pokemon_tower_4f.asm @@ -43,4 +43,3 @@ _PokemonTower4AfterBattleText3:: line "souls of #MON" cont "rest in peace..." done - diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index bbdc3d84..f2cadfcb 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -69,4 +69,3 @@ _PokemonTower5Text7:: para $52, "'s #MON" line "are fully healed!" done - diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm index ff8bc73c..7532d56d 100644 --- a/text/maps/pokemon_tower_6f.asm +++ b/text/maps/pokemon_tower_6f.asm @@ -59,4 +59,3 @@ _PokemonTower6Text6:: text "Be gone..." line "Intruders..." done - diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 31ec248b..652cf37a 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -47,4 +47,3 @@ _TowerRescueFujiText:: cont "HOUSE at the foot" cont "of this tower." done - diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm index 2ea387d7..e5df6674 100644 --- a/text/maps/power_plant.asm +++ b/text/maps/power_plant.asm @@ -4,4 +4,3 @@ _VoltorbBattleText:: _ZapdosBattleText:: text "Gyaoo!@@" - diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 9d03f166..e93450da 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -40,4 +40,3 @@ _StandByMeText:: _TVWrongSideText:: text "Oops, wrong side." done - diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm index 88659e8e..472c52f8 100644 --- a/text/maps/rock_tunnel_b1f.asm +++ b/text/maps/rock_tunnel_b1f.asm @@ -113,4 +113,3 @@ _RockTunnel1Text8:: line "CERULEAN CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/rock_tunnel_b2f.asm b/text/maps/rock_tunnel_b2f.asm index 82151475..d0437de7 100644 --- a/text/maps/rock_tunnel_b2f.asm +++ b/text/maps/rock_tunnel_b2f.asm @@ -127,4 +127,3 @@ _RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." done - diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm index a5268dd2..ec625e95 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/rock_tunnel_pokecenter.asm @@ -11,4 +11,3 @@ _RockTunnelPokecenterText3:: text "I sold a useless" line "NUGGET for ¥5000!" done - diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm index 66ac1fbd..36117804 100644 --- a/text/maps/rocket_hideout_b1f.asm +++ b/text/maps/rocket_hideout_b1f.asm @@ -71,4 +71,3 @@ _RocketHideout1AfterBattleTxt6:: text "Uh-oh, that fight" line "opened the door!" done - diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm index 1b0e9439..c13c3593 100644 --- a/text/maps/rocket_hideout_b2f.asm +++ b/text/maps/rocket_hideout_b2f.asm @@ -15,4 +15,3 @@ _RocketHideout2AfterBattleTxt2:: cont "floors. Can you" cont "reach the BOSS?" done - diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm index 67bc9c24..a146a383 100644 --- a/text/maps/rocket_hideout_b3f.asm +++ b/text/maps/rocket_hideout_b3f.asm @@ -33,4 +33,3 @@ _RocketHide3AfterBattleText3:: cont "LIFT KEY to run" cont "the elevator!" done - diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index 6ff48e6e..d9e13457 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -63,4 +63,3 @@ _RocketHideout4Text_455ec:: text "Oh no! I dropped" line "the LIFT KEY!" done - diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm index c2ce930b..6f2aa638 100644 --- a/text/maps/rocket_hideout_elevator.asm +++ b/text/maps/rocket_hideout_elevator.asm @@ -1,4 +1,3 @@ _RocketElevatorText_4578b:: text "It appears to" line "need a key.@@" - diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index e343ea6f..adffd705 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -47,4 +47,3 @@ _Route1Text3:: line "PALLET TOWN -" cont "VIRIDIAN CITY" done - diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index c78f6068..a56018f0 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -107,4 +107,3 @@ _Route10Text7:: _Route10Text10:: text "POWER PLANT" done - diff --git a/text/maps/route_11.asm b/text/maps/route_11.asm index 1db6066f..451d2bec 100644 --- a/text/maps/route_11.asm +++ b/text/maps/route_11.asm @@ -160,5 +160,3 @@ _Route11AfterBattleText10:: _Route11Text11:: text "DIGLETT's CAVE" done - - diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm index db9ad871..ef371d06 100644 --- a/text/maps/route_11_gate.asm +++ b/text/maps/route_11_gate.asm @@ -12,4 +12,3 @@ _Route11GateText1:: para "He'll help you" line "rename them too!" done - diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm index 92eea2fb..10236081 100644 --- a/text/maps/route_11_gate_upstairs.asm +++ b/text/maps/route_11_gate_upstairs.asm @@ -38,4 +38,3 @@ _Route11GateUpstairsText_494d5:: cont "is by way of the" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index cb6479dc..27befda5 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -137,4 +137,3 @@ _Route12Text11:: _Route12Text12:: text "SPORT FISHING AREA" done - diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm index 246c3eac..51d75539 100644 --- a/text/maps/route_12_gate.asm +++ b/text/maps/route_12_gate.asm @@ -2,4 +2,3 @@ _Route12GateText1:: text "There's a lookout" line "spot upstairs." done - diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 6413bc42..a18e3d57 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -40,4 +40,3 @@ _Route12GateUpstairsText_495c4:: para "It's #MON TOWER!" done - diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 97046b75..4cb4beee 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -58,4 +58,3 @@ _Route12HouseText_564d9:: line "you, but you have" cont "no room for it!" done - diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm index c7034eb5..e2718919 100644 --- a/text/maps/route_13.asm +++ b/text/maps/route_13.asm @@ -177,4 +177,3 @@ _Route13Text13:: line "North to SILENCE" cont "BRIDGE" done - diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index 774f3f99..9a9de78c 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -171,4 +171,3 @@ _Route14Text11:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm index 1368b3d5..a23b8500 100644 --- a/text/maps/route_15.asm +++ b/text/maps/route_15.asm @@ -169,4 +169,3 @@ _Route15Text12:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm index eb4ca6d3..0a526142 100644 --- a/text/maps/route_15_gate.asm +++ b/text/maps/route_15_gate.asm @@ -5,4 +5,3 @@ _Route15GateText1:: para "PROF.OAK's AIDE" line "came by here." done - diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm index 310ecdba..ade4a358 100644 --- a/text/maps/route_15_gate_upstairs.asm +++ b/text/maps/route_15_gate_upstairs.asm @@ -22,4 +22,3 @@ _Route15GateUpstairsText_49698:: para "It looks like a" line "small island!" done - diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm index 87c26232..2ef6b02a 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -118,4 +118,3 @@ _Route16Text9:: line "CELADON CITY -" cont "FUCHSIA CITY" done - diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm index f4f03e2f..f548977f 100644 --- a/text/maps/route_16_gate.asm +++ b/text/maps/route_16_gate.asm @@ -20,4 +20,3 @@ _Route16GateText2:: text "How'd you get in?" line "Good effort!" done - diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm index 55a49274..d76b70ca 100644 --- a/text/maps/route_16_gate_upstairs.asm +++ b/text/maps/route_16_gate_upstairs.asm @@ -24,4 +24,3 @@ _Route16GateUpstairsText_49847:: para "There's a long" line "path over water!" done - diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index d84faf38..534cee08 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -29,4 +29,3 @@ _HM02NoRoomText:: _Route16HouseText_1e652:: text "FEAROW: Kyueen!" done - diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index da774494..f7f59683 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -193,4 +193,3 @@ _Route17Text16:: text "CYCLING ROAD" line "Slope ends here!" done - diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm index 31e921bd..d09caf82 100644 --- a/text/maps/route_18.asm +++ b/text/maps/route_18.asm @@ -56,4 +56,3 @@ _Route18Text5:: line "No pedestrians" cont "permitted!" done - diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm index 964a32e5..f2f51039 100644 --- a/text/maps/route_18_gate.asm +++ b/text/maps/route_18_gate.asm @@ -12,4 +12,3 @@ _Route18GateText_4992d:: _Route18GateText_49932:: text "Excuse me!" done - diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm index a1778cb6..0fd2de09 100644 --- a/text/maps/route_18_gate_upstairs.asm +++ b/text/maps/route_18_gate_upstairs.asm @@ -13,5 +13,3 @@ _Route18GateUpstairsText_4999f:: para "There are people" line "swimming!" done - - diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm index ae6e7334..244e31d0 100644 --- a/text/maps/route_19.asm +++ b/text/maps/route_19.asm @@ -155,4 +155,3 @@ _Route19Text11:: line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm index 2419abbe..dd7becc0 100644 --- a/text/maps/route_2.asm +++ b/text/maps/route_2.asm @@ -7,4 +7,3 @@ _Route2Text3:: _Route2Text4:: text "DIGLETT's CAVE" done - diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm index c69dec51..1ccf0b6c 100644 --- a/text/maps/route_20.asm +++ b/text/maps/route_20.asm @@ -154,4 +154,3 @@ _Route20Text12:: _Route20Text11:: text "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm index d94bdfac..3451953f 100644 --- a/text/maps/route_21.asm +++ b/text/maps/route_21.asm @@ -135,4 +135,3 @@ _Route21AfterBattleText9:: text "Oh wait! I got a" line "bite! Yeah!" done - diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index f14c8db5..52d1a4c7 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -102,4 +102,3 @@ _Route22FrontGateText:: text "#MON LEAGUE" line "Front Gate" done - diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm index 0807cc91..2ecb020e 100644 --- a/text/maps/route_23.asm +++ b/text/maps/route_23.asm @@ -36,4 +36,3 @@ _Route23Text8:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done - diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index f9f0c8ff..4786d830 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -154,4 +154,3 @@ _Route25Text11:: text "SEA COTTAGE" line "BILL lives here!" done - diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm index 6be23d54..566830f8 100644 --- a/text/maps/route_2_gate.asm +++ b/text/maps/route_2_gate.asm @@ -10,4 +10,3 @@ _Route2GateText2:: cont "can get through" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm index 098a8f3e..46fc1062 100644 --- a/text/maps/route_2_house.asm +++ b/text/maps/route_2_house.asm @@ -4,4 +4,3 @@ _Route2HouseText1:: cont "it can still use " cont "moves like CUT!" done - diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index 049ba9c5..14d44e64 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -143,4 +143,3 @@ _Route3Text10:: text "ROUTE 3" line "MT.MOON AHEAD" done - diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm index e49f1b7a..0a36f4cd 100644 --- a/text/maps/route_4.asm +++ b/text/maps/route_4.asm @@ -33,4 +33,3 @@ _Route4Text6:: line "MT.MOON -" cont "CERULEAN CITY" done - diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm index 4fced687..54ff0f84 100644 --- a/text/maps/route_5.asm +++ b/text/maps/route_5.asm @@ -3,4 +3,3 @@ _Route5Text1:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index 4237fb7d..71760449 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -102,4 +102,3 @@ _Route6Text7:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm index 24645b90..6500be96 100644 --- a/text/maps/route_7.asm +++ b/text/maps/route_7.asm @@ -3,4 +3,3 @@ _Route7Text1:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index dc26e193..c0988d70 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -152,4 +152,3 @@ _Route8Text10:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm index 50ed1e1e..09918f93 100644 --- a/text/maps/safari_zone_center.asm +++ b/text/maps/safari_zone_center.asm @@ -9,4 +9,3 @@ _SafariZoneCenterText3:: line "Button to check" cont "remaining time!" done - diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm index 78634e4a..eebe5de7 100644 --- a/text/maps/safari_zone_east.asm +++ b/text/maps/safari_zone_east.asm @@ -14,4 +14,3 @@ _SafariZoneEastText7:: text "CENTER AREA" line "NORTH: AREA 2" done - diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm index fdf8b5e8..1e148f0b 100644 --- a/text/maps/safari_zone_north.asm +++ b/text/maps/safari_zone_north.asm @@ -31,4 +31,3 @@ _SafariZoneNorthText7:: line "finding the" cont "SECRET HOUSE!" done - diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm index 2731bdb4..b6c87818 100644 --- a/text/maps/safari_zone_rest_house_1.asm +++ b/text/maps/safari_zone_rest_house_1.asm @@ -9,4 +9,3 @@ _SafariZoneRestHouse1Text2:: line "#MON to take" cont "home as gifts!" done - diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm index 6cdca9c0..94802b13 100644 --- a/text/maps/safari_zone_rest_house_2.asm +++ b/text/maps/safari_zone_rest_house_2.asm @@ -17,4 +17,3 @@ _SafariZoneRestHouse2Text3:: line "I didn't see any" cont "#MON I wanted." done - diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm index f40c3009..d5f7abc8 100644 --- a/text/maps/safari_zone_rest_house_3.asm +++ b/text/maps/safari_zone_rest_house_3.asm @@ -16,4 +16,3 @@ _SafariZoneRestHouse3Text3:: text "Whew! I'm tired" line "from all the fun!" done - diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm index e50c4522..93f02c8f 100644 --- a/text/maps/safari_zone_rest_house_4.asm +++ b/text/maps/safari_zone_rest_house_4.asm @@ -25,4 +25,3 @@ _SafariZoneRestHouse4Text3:: cont "a VAPOREON!" cont "I wonder why?" done - diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index f285a697..1bbe89fd 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -42,4 +42,3 @@ _HM03NoRoomText:: line "room for this" cont "fabulous prize!" done - diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm index e10df2a3..dcb2fe6c 100644 --- a/text/maps/safari_zone_west.asm +++ b/text/maps/safari_zone_west.asm @@ -29,4 +29,3 @@ _SafariZoneWestText8:: text "AREA 3" line "EAST: CENTER AREA" done - diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm index 82687181..a0422c8c 100644 --- a/text/maps/saffron_city.asm +++ b/text/maps/saffron_city.asm @@ -149,4 +149,3 @@ _SaffronCityText25:: para "Release to be" line "determined..." done - diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index 629ec433..0fd11d88 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -34,4 +34,3 @@ _SaffronGateText_1dff6:: text "Hi, thanks for" line "the cool drinks!" done - diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index ab1497bf..23cc211b 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -233,4 +233,3 @@ _SaffronGymAfterBattleText7:: line "used telepathy to" cont "read your mind!" done - diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm index 21ed3b89..214bf089 100644 --- a/text/maps/saffron_house.asm +++ b/text/maps/saffron_house.asm @@ -24,4 +24,3 @@ _SaffronHouse1Text4:: line "increasing the PP" cont "of techniques!" done - diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm index 29c34a1c..a43b0d94 100644 --- a/text/maps/saffron_mart.asm +++ b/text/maps/saffron_mart.asm @@ -11,4 +11,3 @@ _SaffronMartText3:: line "but it revives" cont "fainted #MON!" done - diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm index 9202af9b..8fd47e4f 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/saffron_pokecenter.asm @@ -10,4 +10,3 @@ _SaffronPokecenterText3:: cont "why it attracted" cont "TEAM ROCKET!" done - diff --git a/text/maps/seafoam_islands_1f.asm b/text/maps/seafoam_islands_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b1f.asm b/text/maps/seafoam_islands_b1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b2f.asm b/text/maps/seafoam_islands_b2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b3f.asm b/text/maps/seafoam_islands_b3f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b3f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index c4649f4f..04ff0d9b 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -11,4 +11,3 @@ _SeafoamIslands5Text5:: text "DANGER" line "Fast current!" done - diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 3051fc76..6be83c5d 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -112,4 +112,3 @@ _SilphCo11AfterBattleText2:: line "my BOSS likes his" cont "#MON tough!" done - diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm index ca166d31..1ef80189 100644 --- a/text/maps/silph_co_1f.asm +++ b/text/maps/silph_co_1f.asm @@ -5,4 +5,3 @@ _SilphCo1Text1:: line "in the boardroom" cont "on 11F!" done - diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index 5993bafe..5ef349d5 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -94,4 +94,3 @@ _SilphCo2AfterBattleText4:: line "be merged with" cont "TEAM ROCKET!" done - diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index 0374482d..a514d3ef 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -44,4 +44,3 @@ _SilphCo3AfterBattleText2:: cont "them, they'd let" cont "me study #MON!" done - diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm index 19494482..5b484ec7 100644 --- a/text/maps/silph_co_4f.asm +++ b/text/maps/silph_co_4f.asm @@ -54,4 +54,3 @@ _SilphCo4AfterBattleText4:: text "I better tell the" line "BOSS on 11F!" done - diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm index 78bb8f9e..9c8bfd41 100644 --- a/text/maps/silph_co_5f.asm +++ b/text/maps/silph_co_5f.asm @@ -105,4 +105,3 @@ _SilphCo5Text11:: line "only when traded" cont "by link-cable." done - diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm index b3a38aa0..90456b5c 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/silph_co_6f.asm @@ -105,4 +105,3 @@ _SilphCo6AfterBattleText4:: line "justice, you" cont "betray evil!" done - diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index 3eba2f1e..0373355a 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -207,4 +207,3 @@ _SilphCo7Text_51ed2:: cont "Don't sweat it!" cont "Smell ya!" done - diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm index 898c0600..fabae5e6 100644 --- a/text/maps/silph_co_8f.asm +++ b/text/maps/silph_co_8f.asm @@ -54,4 +54,3 @@ _SilphCo8AfterBattleText3:: text "I'll leave you up" line "to my brothers!" done - diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm index f01ffb7b..fd1aa91c 100644 --- a/text/maps/silph_co_9f.asm +++ b/text/maps/silph_co_9f.asm @@ -60,4 +60,3 @@ _SilphCo9AfterBattleText3:: text "My brothers will" line "avenge me!" done - diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm index 6032b770..2bbdcbac 100644 --- a/text/maps/ss_anne_1.asm +++ b/text/maps/ss_anne_1.asm @@ -19,4 +19,3 @@ _SSAnne1Text2:: line "challenged by the" cont "more bored ones!" done - diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm index f1eb8a77..7df629b5 100644 --- a/text/maps/ss_anne_10.asm +++ b/text/maps/ss_anne_10.asm @@ -110,4 +110,3 @@ _SSAnne10Text7:: line "STRENGTH to move" cont "big rocks!" done - diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index bd33b9d3..ba231ac5 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -61,4 +61,3 @@ _SSAnneRivalCaptainText:: para "You should go see" line "him! Smell ya!" done - diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm index 8ac96d88..76490594 100644 --- a/text/maps/ss_anne_3.asm +++ b/text/maps/ss_anne_3.asm @@ -5,4 +5,3 @@ _SSAnne3Text1:: para "He even teaches" line "CUT to #MON!" done - diff --git a/text/maps/ss_anne_4.asm b/text/maps/ss_anne_4.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/ss_anne_4.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm index b4935f5b..76cd5631 100644 --- a/text/maps/ss_anne_5.asm +++ b/text/maps/ss_anne_5.asm @@ -50,4 +50,3 @@ _SSAnne5AfterBattleText2:: cont "#MON. I think" cont "there are more." done - diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm index 4256eb47..b7784019 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -67,4 +67,3 @@ _SSAnne6Text_61816:: para "But, have I enough" line "fillets du beef?" done - diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index cffb4add..a046e600 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -60,4 +60,3 @@ _SSAnne7Text3:: cont "The CAPTAIN's" cont "reading this!" done - diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm index 393633e3..7a09303e 100644 --- a/text/maps/ss_anne_8.asm +++ b/text/maps/ss_anne_8.asm @@ -102,4 +102,3 @@ _SSAnne8Text11:: para "I'm on the trail" line "of TEAM ROCKET!" done - diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index 68973b09..c9b29119 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -111,4 +111,3 @@ _SSAnne9Text_61c4c:: text "I hear many people" line "get seasick!" done - diff --git a/text/maps/underground_path_route_5_entrance.asm b/text/maps/underground_path_route_5_entrance.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/underground_path_route_5_entrance.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm index c898d199..dacc44f7 100644 --- a/text/maps/underground_path_route_6_entrance.asm +++ b/text/maps/underground_path_route_6_entrance.asm @@ -3,4 +3,3 @@ _UndergrdTunnelEntRoute6Text1:: line "things in that" cont "UNDERGROUND PATH." done - diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm index dee62853..5cde3614 100644 --- a/text/maps/underground_path_route_7_entrance.asm +++ b/text/maps/underground_path_route_7_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute7Text1:: line "#MON appeared" cont "near CELADON CITY." done - diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm index 0df1dec9..da785c8e 100644 --- a/text/maps/underground_path_route_8_entrance.asm +++ b/text/maps/underground_path_route_8_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute8Text1:: line "in CELADON has a" cont "great selection!" done - diff --git a/text/maps/unknown_dungeon_1f.asm b/text/maps/unknown_dungeon_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_2f.asm b/text/maps/unknown_dungeon_2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index bea7df28..7fa72a82 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,2 @@ _UnknownDungeon3MewtwoText:: text "Mew!@@" - diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index f5e0adba..2b2d125f 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -165,4 +165,3 @@ _VermilionCityText13:: _VermilionCityText14:: text "VERMILION HARBOR" done - diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 26c556a7..034de399 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,3 +1,2 @@ _VermilionDockText1:: db $0, $57 - diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 59f730db..0fa28cae 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -51,4 +51,3 @@ _VermilionHouse2Text_560ca:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm index 47895757..a7cce733 100644 --- a/text/maps/vermilion_gym.asm +++ b/text/maps/vermilion_gym.asm @@ -163,4 +163,3 @@ _VermilionGymText_5cbf9:: text "Whew! That match" line "was electric!" done - diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm index 806a4b8a..91c18708 100644 --- a/text/maps/vermilion_house.asm +++ b/text/maps/vermilion_house.asm @@ -19,4 +19,3 @@ _VermilionHouse1Text3:: para "VERMILION appears" line "to be safe." done - diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm index 9acdf905..10743989 100644 --- a/text/maps/vermilion_mart.asm +++ b/text/maps/vermilion_mart.asm @@ -21,4 +21,3 @@ _VermilionMartText3:: cont "evil. It depends" cont "on the trainer." done - diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm index 8ba563dc..bbd8842f 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/vermilion_pokecenter.asm @@ -18,4 +18,3 @@ _VermilionPokecenterText3:: cont "fainted while we" cont "were walking!" done - diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm index ded9afd6..1523db88 100644 --- a/text/maps/victory_road_1f.asm +++ b/text/maps/victory_road_1f.asm @@ -29,4 +29,3 @@ _VictoryRoad1AfterBattleText2:: text "I concede, you're" line "better than me!" done - diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index 390d8d54..9241619e 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -83,4 +83,3 @@ _VictoryRoad2AfterBattleText5:: line "up the challenge" cont "here." done - diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm index 66364190..07e0be70 100644 --- a/text/maps/victory_road_3f.asm +++ b/text/maps/victory_road_3f.asm @@ -61,4 +61,3 @@ _VictoryRoad3AfterBattleText5:: line "battles, you get" cont "stronger!" done - diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index a9a2184e..0cfd1fe8 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -192,4 +192,3 @@ _ViridianCityText14:: text "The GYM's doors" line "are locked..." done - diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index d3a66091..f88a484c 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -155,4 +155,3 @@ _ViridianForestText14:: line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" done - diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm index 04dea7e5..ab6a5a1d 100644 --- a/text/maps/viridian_forest_exit.asm +++ b/text/maps/viridian_forest_exit.asm @@ -17,4 +17,3 @@ _ViridianForestExitText2:: line "down by a special" cont "#MON move." done - diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index 2df76aec..795447a5 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -234,4 +234,3 @@ _ViridianGymText_74bd9:: line "GIOVANNI was the" cont "GYM LEADER here?" done - diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm index 5adf059b..757f597a 100644 --- a/text/maps/viridian_house.asm +++ b/text/maps/viridian_house.asm @@ -21,4 +21,3 @@ _ViridianHouseText4:: text "SPEAROW" line "Name: SPEARY" done - diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index 09ab1443..d4da3781 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -81,4 +81,3 @@ _FuchsiaHouse2Text_7517b:: text "Old #MON" line "merchandise." done - |