ref: a2f7701f3441c71b0734a28d44168576f6f28716
parent: 0d687ba25ae223f6de2c69d46fd1c3df6ad52da3
parent: 2a529796374f3798fb507931a7c8a9bad4281107
author: pikalaxalt <PikalaxALT@gmail.com>
date: Thu Jun 9 16:45:02 EDT 2016
Merge branch 'master' of https://github.com/pret/pokered
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -253,7 +253,3 @@
mapconst LORELEIS_ROOM, 6, 5 ; $F5
mapconst BRUNOS_ROOM, 6, 5 ; $F6
mapconst AGATHAS_ROOM, 6, 5 ; $F7
-
-IF DEF(_OPTION_BEACH_HOUSE)
- mapconst BEACH_HOUSE, 4, 7 ; $F8
-ENDC
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -24,6 +24,3 @@
const CLUB ; 21
const FACILITY ; 22
const PLATEAU ; 23
-IF DEF(_OPTION_BEACH_HOUSE)
- const BEACH_HOUSE_TILESET ; 24
-ENDC
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,6 +22,3 @@
Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll"
Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll"
Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll"
-IF DEF(_OPTION_BEACH_HOUSE)
-BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll"
-ENDC
--- a/data/mapHeaders/beach_house.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-BeachHouse_h:
-
- db BEACH_HOUSE_TILESET
- db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
- dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts
- db 0 ; connections
- dw BeachHouseObjects ; objects
--- a/data/mapObjects/beach_house.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-BeachHouseObjects: ; 0xf23a4
- db $a ; border block
-
- db 2 ; warps
- db 7,2,0,$ff
- db 7,3,0,$ff
-
- db 4 ; signs
- db 0,3,3
- db 0,7,4
- db 0,$b,5
- db 1,$d,6
-
- db 2 ; objects
- object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude
- object $3d, 5, 3, WALK, $01, 2 ; pikachu
-
- ; warp-to
- EVENT_DISP BEACH_HOUSE_WIDTH,7,2
- EVENT_DISP BEACH_HOUSE_WIDTH,7,3
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,36 +1,18 @@
Route19Object: ; 0x54e9a (size=87)
db $43 ; border block
- IF DEF(_OPTION_BEACH_HOUSE)
- db $1 ; warps
- db $9, $5, $0, BEACH_HOUSE
- ELSE
- db $0 ; warps
- ENDC
+ db $0 ; warps
db $1 ; signs
-IF DEF(_OPTION_BEACH_HOUSE)
- db $b,$b,$b
-ELSE
db $9, $b, $b ; Route19Text11
-ENDC
db $a ; objects
-IF DEF(_OPTION_BEACH_HOUSE)
- object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2
- object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3
-ELSE
object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2
object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3
-ENDC
object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4
object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5
object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6
-IF DEF(_OPTION_BEACH_HOUSE)
- object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7
-ELSE
object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7
-ENDC
object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d
object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8
@@ -37,6 +19,3 @@
object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
; warp-to
- IF DEF(_OPTION_BEACH_HOUSE)
- EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
- ENDC
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -248,6 +248,3 @@
db BANK(Lorelei_h)
db BANK(Bruno_h)
db BANK(Agatha_h)
-IF DEF(_OPTION_BEACH_HOUSE)
- db BANK(BeachHouse_h)
-ENDC
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -248,6 +248,3 @@
dw Lorelei_h
dw Bruno_h
dw Agatha_h ;247
-IF DEF(_OPTION_BEACH_HOUSE)
- dw BeachHouse_h
-ENDC
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -247,6 +247,3 @@
db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
-IF DEF(_OPTION_BEACH_HOUSE)
- db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
-ENDC
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,6 +23,3 @@
tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR
tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE
tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE
-IF DEF(_OPTION_BEACH_HOUSE)
- tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR
-ENDC
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -247,9 +247,6 @@
dw NoMons
dw NoMons
dw NoMons
- IF DEF(_OPTION_BEACH_HOUSE)
- dw NoMons
- ENDC
dw $FFFF
; wild pokemon data is divided into two parts.
binary files a/gfx/blocksets/beachhouse.bst /dev/null differ
binary files a/gfx/tilesets/beachhouse.png /dev/null differ
--- a/gfx/tilesets/beachhouse.tilecoll
+++ /dev/null
@@ -1,1 +1,0 @@
-
\ No newline at end of file
--- a/main.asm
+++ b/main.asm
@@ -5120,12 +5120,6 @@
INCLUDE "scripts/billshouse.asm"
INCLUDE "data/mapObjects/billshouse.asm"
BillsHouseBlocks: INCBIN "maps/billshouse.blk"
-IF DEF(_OPTION_BEACH_HOUSE)
-INCLUDE "data/mapHeaders/beach_house.asm"
-INCLUDE "scripts/beach_house.asm"
-BeachHouseBlockdata: INCBIN "maps/beach_house.blk"
-INCLUDE "data/mapObjects/beach_house.asm"
-ENDC
INCLUDE "engine/menu/oaks_pc.asm"
@@ -6042,11 +6036,7 @@
INCLUDE "data/mapHeaders/route19.asm"
INCLUDE "data/mapObjects/route19.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-Route19Blocks: INCBIN "maps/route19-yellow.blk"
-ELSE
Route19Blocks: INCBIN "maps/route19.blk"
-ENDC
INCLUDE "data/mapHeaders/route21.asm"
INCLUDE "data/mapObjects/route21.asm"
@@ -6714,13 +6704,3 @@
INCLUDE "engine/overworld/elevator.asm"
INCLUDE "engine/items/tm_prices.asm"
-
-IF DEF(_OPTION_BEACH_HOUSE)
-SECTION "bank3C",ROMX[$4314],BANK[$3C]
-
-BeachHouse_GFX:
- INCBIN "gfx/tilesets/beachhouse.2bpp"
-
-BeachHouse_Block:
- INCBIN "gfx/blocksets/beachhouse.bst"
-ENDC
--- a/maps/beach_house.blk
+++ /dev/null
@@ -1,1 +1,0 @@
-
\ No newline at end of file
--- a/scripts/beach_house.asm
+++ /dev/null
@@ -1,195 +1,0 @@
-BeachHouseScript:
- call $3c29
- ret
-
-BeachHouseTextPointers:
- dw SurfinDudeText
- dw BeachHousePikachuText
- dw BeachHouseSign1Text
- dw BeachHouseSign2Text
- dw BeachHouseSign3Text
- dw BeachHouseSign4Text
-
-SurfinDudeText:
- TX_ASM
- ld a,[$d471]
- bit 6,a
- jr nz,.next
- ld hl,.SurfinDudeText4
- call PrintText
- jr .done
-.next
- ld hl,$d492
- bit 0,[hl]
- set 0,[hl]
- jr nz,.next2
- ld hl,.SurfinDudeText1
- jr .next3
-.next2
- ld hl,.SurfinDudeText3
-.next3
- call PrintText
- call YesNoChoice
- ld a,[wCurrentMenuItem]
- and a
- jr nz,.xf226b
- ld a,1
- ld [$cc3c],a
- ld b,$3e
- ld hl,$4000
- call $3e84
- ld hl,$d492
- set 1,[hl]
- jr .done
-.xf226b
- ld hl,.SurfinDudeText2
- call PrintText
-.done
- jp TextScriptEnd
-
-.SurfinDudeText1
- TX_FAR _SurfinDudeText1
- db "@"
-.SurfinDudeText2
- TX_FAR _SurfinDudeText2
- db "@"
-.SurfinDudeText3
- TX_FAR _SurfinDudeText3
- db "@"
-.SurfinDudeText4
- TX_FAR _SurfinDudeText4
- db "@"
-
-BeachHousePikachuText:
- TX_ASM
- ld hl,.BeachHousePikachuText
- call PrintText
- ld a,PIKACHU
- call PlayCry
- call WaitForSoundToFinish
- jp TextScriptEnd
-
-.BeachHousePikachuText
- TX_FAR _BeachHousePikachuText
- db "@"
-
-BeachHouseSign1Text:
- TX_ASM
- ld hl,.BeachHouseSign1Text2
- ld a,[$d471]
- bit 6,a
- jr z,.next
- ld hl,.BeachHouseSign1Text1
-.next
- call PrintText
- jp TextScriptEnd
-
-.BeachHouseSign1Text1
- TX_FAR _BeachHouseSign1Text1
- db "@"
-.BeachHouseSign1Text2
- TX_FAR _BeachHouseSign1Text2
- db "@"
-
-BeachHouseSign2Text:
- TX_ASM
- ld hl,.BeachHouseSign2Text2
- ld a,[$d471]
- bit 6,a
- jr z,.next
- ld hl,.BeachHouseSign2Text1
-.next
- call PrintText
- jp TextScriptEnd
-
-.BeachHouseSign2Text1
- TX_FAR _BeachHouseSign2Text1
- db "@"
-.BeachHouseSign2Text2
- TX_FAR _BeachHouseSign2Text2
- db "@"
-
-BeachHouseSign3Text:
- TX_ASM
- ld hl,.BeachHouseSign3Text2
- ld a,[$d471]
- bit 6,a
- jr z,.next
- ld hl,.BeachHouseSign3Text1
-.next
- call PrintText
- jp TextScriptEnd
-
-.BeachHouseSign3Text1
- TX_FAR _BeachHouseSign3Text1
- db "@"
-.BeachHouseSign3Text2
- TX_FAR _BeachHouseSign3Text2
- db "@"
-
-BeachHouseSign4Text:
- TX_ASM
- ld a,1
- ld [$cc3c],a
- ld a,[$d471]
- bit 6,a
- jr z,.xf2369
-
- ld hl,$d492
- bit 1,[hl]
- jr z,.next2
- ld a,0
- ld [$cc3c],a
-.next2
- ld hl,.BeachHousePrinterText2
- call PrintText
- ld a,[$d492]
- bit 1,a
- jr z,.xf236f
-
- ld a,1
- ld [$cc3c],a
- ld hl,.BeachHousePrinterText3
- call PrintText
- call YesNoChoice
- ld a,[wCurrentMenuItem]
- and a
- jp z,$63d0 ; 0xf23d0
- call $36ec
- ld hl,$d72f
- set 6,[hl]
- xor a
- ld [$cfca],a
- ld hl,$510a
- ld b,$3a
- call $3e84
- call $3852
- ld hl,$d72f
- res 6,[hl]
- call $3dd8
- call $2f83
- call $3dc2
- call $36f8
- call $3ddb
- call $3de0
- ld a,1
- ld [$cfca],a
- jr .xf236f
-.xf2369
- ld hl,.BeachHousePrinterText1
- call PrintText
-.xf236f
- jp TextScriptEnd
-
-.BeachHousePrinterText1
- TX_FAR _BeachHousePrinterText1
- db $d,"@"
-.BeachHousePrinterText2
- TX_FAR _BeachHousePrinterText2
- db $d,"@"
-.BeachHousePrinterText3
- TX_FAR _BeachHousePrinterText3
- db "@"
-.xf2383
- TX_FAR _BeachHousePrinterText4
- db "@"
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -1,12 +1,12 @@
-BikeShopScript: ; 1d73c (7:573c)
+BikeShopScript:
jp EnableAutoTextBoxDrawing
-BikeShopTextPointers: ; 1d73f (7:573f)
+BikeShopTextPointers:
dw BikeShopText1
dw BikeShopText2
dw BikeShopText3
-BikeShopText1: ; 1d745 (7:5745)
+BikeShopText1:
TX_ASM
CheckEvent EVENT_GOT_BICYCLE
jr z, .asm_260d4
@@ -78,56 +78,56 @@
.Done
jp TextScriptEnd
-BikeShopMenuText: ; 1d7f8 (7:57f8)
+BikeShopMenuText:
db "BICYCLE"
next "CANCEL@"
-BikeShopMenuPrice: ; 1d807 (7:5807)
+BikeShopMenuPrice:
db "¥1000000@"
-BikeShopText_1d810: ; 1d810 (7:5810)
+BikeShopText_1d810:
TX_FAR _BikeShopText_1d810
db "@"
-BikeShopText_1d815: ; 1d815 (7:5815)
+BikeShopText_1d815:
TX_FAR _BikeShopText_1d815
db "@"
-BikeShopCantAffordText: ; 1d81a (7:581a)
+BikeShopCantAffordText:
TX_FAR _BikeShopCantAffordText
db "@"
-BikeShopText_1d81f: ; 1d81f (7:581f)
+BikeShopText_1d81f:
TX_FAR _BikeShopText_1d81f
db "@"
-BikeShopText_1d824: ; 1d824 (7:5824)
+BikeShopText_1d824:
TX_FAR _BikeShopText_1d824
db $11, "@"
-BikeShopComeAgainText: ; 1d82a (7:582a)
+BikeShopComeAgainText:
TX_FAR _BikeShopComeAgainText
db "@"
-BikeShopText_1d82f: ; 1d82f (7:582f)
+BikeShopText_1d82f:
TX_FAR _BikeShopText_1d82f
db "@"
-BikeShopText_1d834: ; 1d834 (7:5834)
+BikeShopText_1d834:
TX_FAR _BikeShopText_1d834
db "@"
-BikeShopText2: ; 1d839 (7:5839)
+BikeShopText2:
TX_ASM
ld hl, BikeShopText_1d843
call PrintText
jp TextScriptEnd
-BikeShopText_1d843: ; 1d843 (7:5843)
+BikeShopText_1d843:
TX_FAR _BikeShopText_1d843
db "@"
-BikeShopText3: ; 1d848 (7:5848)
+BikeShopText3:
TX_ASM
CheckEvent EVENT_GOT_BICYCLE
ld hl, BikeShopText_1d861
@@ -137,10 +137,10 @@
call PrintText
jp TextScriptEnd
-BikeShopText_1d85c: ; 1d85c (7:585c)
+BikeShopText_1d85c:
TX_FAR _BikeShopText_1d85c
db "@"
-BikeShopText_1d861: ; 1d861 (7:5861)
+BikeShopText_1d861:
TX_FAR _BikeShopText_1d861
db "@"
--- a/text.asm
+++ b/text.asm
@@ -174,7 +174,6 @@
INCLUDE "text/maps/ss_anne_1.asm"
INCLUDE "text/maps/ss_anne_2.asm"
INCLUDE "text/maps/ss_anne_3.asm"
-INCLUDE "text/maps/ss_anne_4.asm"
INCLUDE "text/maps/ss_anne_5.asm"
INCLUDE "text/maps/ss_anne_6.asm"
INCLUDE "text/maps/ss_anne_7.asm"
@@ -214,8 +213,6 @@
INCLUDE "text/maps/safari_zone_rest_house_2.asm"
INCLUDE "text/maps/safari_zone_rest_house_3.asm"
INCLUDE "text/maps/safari_zone_rest_house_4.asm"
-INCLUDE "text/maps/unknown_dungeon_1f.asm"
-INCLUDE "text/maps/unknown_dungeon_2f.asm"
INCLUDE "text/maps/unknown_dungeon_b1f.asm"
INCLUDE "text/maps/victory_road_1f.asm"
INCLUDE "text/maps/lance.asm"
@@ -230,10 +227,6 @@
SECTION "Text 3", ROMX, BANK[TEXT_3]
INCLUDE "text/maps/rock_tunnel_b2f_2.asm"
-INCLUDE "text/maps/seafoam_islands_1f.asm"
-INCLUDE "text/maps/seafoam_islands_b1f.asm"
-INCLUDE "text/maps/seafoam_islands_b2f.asm"
-INCLUDE "text/maps/seafoam_islands_b3f.asm"
INCLUDE "text/maps/seafoam_islands_b4f.asm"
_AIBattleWithdrawText::
@@ -1948,7 +1941,6 @@
SECTION "Text 4", ROMX, BANK[TEXT_4]
INCLUDE "text/maps/daycare_2.asm"
-INCLUDE "text/maps/underground_path_route_5_entrance.asm"
INCLUDE "text/maps/underground_path_route_6_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm"
@@ -1969,9 +1961,6 @@
INCLUDE "text/maps/route_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-INCLUDE "text/maps/beach_house.asm"
-ENDC
INCLUDE "text/maps/pokemon_league_gate.asm"
INCLUDE "text/maps/victory_road_2f.asm"
INCLUDE "text/maps/bills_house.asm"
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -42,4 +42,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/beach_house.asm
+++ /dev/null
@@ -1,103 +1,0 @@
-_SurfinDudeText1::
- text "Whoa!"
-
- para "Your PIKACHU knows"
- line "how to SURF! So,"
- cont "I'm not alone..."
-
- para "Great! You earned"
- line "the right to SURF"
- cont "with the DUDE!"
-
- para "Give it a go?"
- done
-
-_SurfinDudeText2::
- text "Come SURF anytime,"
- line "my friend!"
- done
-
-_SurfinDudeText3::
- text "Wanna go SURF?"
- done
-
-_SurfinDudeText4::
- text "Dogs and burgers"
- line "on special today!"
- done
-
-_BeachHousePikachuText::
- text "PIKACHU: Pikaa."
- done
-
-_BeachHouseSign1Text1::
- text "SURFIN' DUDE's"
- line "scribbles..."
-
- para "When I shoot the"
- line "tube, the tunes"
- cont "hit the groove!"
- done
-
-_BeachHouseSign1Text2::
- text "30 years of waves!"
- line "SURFIN' DUDE"
- done
-
-_BeachHouseSign2Text1::
- text "SURFING TIP 1!"
-
- para "After flips, line"
- line "the board up with"
- cont "a wave for a cool"
- cont "effect!"
- done
-
-_BeachHouseSign2Text2::
- text "SUMMER BEACH HOUSE"
- line "#MON welcome!"
- done
-
-_BeachHouseSign3Text1::
- text "SURFING TIP 2!"
-
- para "Pulling flips in"
- line "a jump is totally"
- cont "rad!"
- done
-
-_BeachHouseSign3Text2::
- text "The sea unites"
- line "all in surfdom!"
- done
-
-_BeachHousePrinterText1::
- text "It's some sort of"
- line "a machine...@@"
-
-_BeachHousePrinterText2::
- text "SUMMER BEACH HOUSE"
- line "PRINTER, it says.@@"
-
-_BeachHousePrinterText3::
- text "The Hi.Score is"
- line "shown."
-
- para "PRINT it out?"
- done
-
-_BeachHousePrinterText4::
- text "SUMMER BEACH HOUSE"
- line "PRINTER, it says."
-
- para "The Hi.Score is"
- line "shown."
-
- para "PRINT it out?"
- done
-
-_BeachHousePrinterText5::
- text "PRINT completed.@@"
-
-_BeachHousePrinterText6::
- text "PRINT error!@@"
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -68,4 +68,3 @@
text "Wow. Your BIKE is"
line "really cool!"
done
-
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -85,4 +85,3 @@
cont "some of my rare"
cont "#MON on my PC!"
done
-
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -39,4 +39,3 @@
text "It's a big map!"
line "This is useful!"
done
-
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -35,4 +35,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -150,4 +150,3 @@
line "The playground"
cont "for grown-ups!"
done
-
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -57,4 +57,3 @@
line "I was going to"
cont "win it back..."
done
-
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/celadon_game_corner.asm
@@ -184,4 +184,3 @@
text "Oops! Forgot the"
line "COIN CASE!"
done
-
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -216,4 +216,3 @@
para "Wait 'til next"
line "time!"
done
-
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/celadon_hotel.asm
@@ -19,4 +19,3 @@
text "Why did she bring"
line "her brother?"
done
-
--- a/text/maps/celadon_house.asm
+++ b/text/maps/celadon_house.asm
@@ -20,4 +20,3 @@
para "There's no secret"
line "switch behind it!"
done
-
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/celadon_mansion_1f.asm
@@ -21,4 +21,3 @@
text "CELADON MANSION"
line "Manager's Suite"
done
-
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/celadon_mansion_2f.asm
@@ -2,4 +2,3 @@
text "GAME FREAK"
line "Meeting Room"
done
-
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/celadon_mansion_3f.asm
@@ -64,4 +64,3 @@
text "GAME FREAK"
line "Development Room"
done
-
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/celadon_mansion_4f_inside.asm
@@ -8,4 +8,3 @@
line "your friends and"
cont "trade #MON!"
done
-
--- 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
-
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/celadon_prize_room.asm
@@ -10,4 +10,3 @@
text "I had a major"
line "haul today!"
done
-
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/cerulean_badge_house.asm
@@ -95,4 +95,3 @@
text "All #MON will"
line "obey you!"
prompt
-
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -230,4 +230,3 @@
para "The Tomboyish"
line "Mermaid!"
done
-
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -129,4 +129,3 @@
line "we make a pretty"
cont "darn good team!"
done
-
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/cerulean_trashed_house.asm
@@ -34,4 +34,3 @@
text "TEAM ROCKET left"
line "a way out!"
done
-
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -144,4 +144,3 @@
para $52, "!"
line "Come with me!"
done
-
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -207,4 +207,3 @@
text $52, "! You beat"
line "that fire brand!"
done
-
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -35,4 +35,3 @@
para "The Hot-Headed"
line "Quiz Master!"
done
-
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/cinnabar_lab.asm
@@ -27,4 +27,3 @@
text "#MON LAB"
line "Testing Room"
done
-
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -76,4 +76,3 @@
text "Aiyah! You come"
line "again!"
done
-
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -61,4 +61,3 @@
_Lab3Text5::
text "An amber pipe!"
done
-
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/cinnabar_lab_trade_room.asm
@@ -7,4 +7,3 @@
line "rare, prehistoric"
cont "#MON!"
done
-
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -94,4 +94,3 @@
_CopycatsHouse2FText_5cd1c::
text "Huh? Can't see!"
done
-
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -60,4 +60,3 @@
cont "needs some more"
cont "time with me."
prompt
-
--- a/text/maps/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -31,4 +31,3 @@
text "Hey, you don't"
line "have enough ¥!"
done
-
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/digletts_cave_route_11_entrance.asm
@@ -6,4 +6,3 @@
para "It goes right to"
line "VIRIDIAN CITY!"
done
-
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/digletts_cave_route_2_entrance.asm
@@ -7,4 +7,3 @@
line "FLASH could light"
cont "it up..."
done
-
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -141,4 +141,3 @@
text "If someone brags,"
line "brag right back!"
done
-
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -128,4 +128,3 @@
text "Better not get"
line "greedy..."
done
-
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -117,4 +117,3 @@
_FuchsiaCityText_19b2a::
text "..."
done
-
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -41,4 +41,3 @@
para "You have no room"
line "for my gift!"
done
-
--- a/text/maps/fuchsia_gym_1.asm
+++ b/text/maps/fuchsia_gym_1.asm
@@ -24,4 +24,3 @@
para "Here! Take the"
line "SOULBADGE!"
prompt
-
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -191,4 +191,3 @@
line "ninja can terrify"
cont "even now!"
done
-
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/fuchsia_house.asm
@@ -25,4 +25,3 @@
para "Did he show you?"
done
-
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/fuchsia_meeting_room.asm
@@ -24,4 +24,3 @@
para "I think he's got"
line "a speech problem!"
done
-
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -83,4 +83,3 @@
para "Gone! It's been"
line "clipped out!"
done
-
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -26,4 +26,3 @@
cont "your #MON are"
cont "HALL OF FAMERs!"
done
-
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -61,4 +61,3 @@
para "He is the real"
line "#MON LEAGUE"
cont "champion!@@"
-
--- a/text/maps/lavender_house.asm
+++ b/text/maps/lavender_house.asm
@@ -22,4 +22,3 @@
line "soothed its"
cont "restless soul!"
done
-
--- a/text/maps/lavender_town.asm
+++ b/text/maps/lavender_town.asm
@@ -62,4 +62,3 @@
line "#MON Rest Easy"
cont "#MON TOWER"
done
-
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -40,4 +40,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/mansion_1f.asm
@@ -27,4 +27,3 @@
_MansionSwitchNotPressedText::
text "Not quite yet!"
done
-
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/mansion_2f.asm
@@ -45,4 +45,3 @@
_Mansion2Text_520cc::
text "Not quite yet!"
done
-
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/mansion_3f.asm
@@ -35,4 +35,3 @@
para "We named the"
line "newborn MEWTWO."
done
-
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/mansion_b1f.asm
@@ -37,4 +37,3 @@
line "curb its vicious"
cont "tendencies..."
done
-
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -23,4 +23,3 @@
text "Where do you plan"
line "to put this?"
done
-
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/mt_moon_b1f.asm
@@ -1,4 +1,3 @@
_MtMoonText1::
db $0
done
-
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -105,4 +105,3 @@
text "The AMBER is"
line "clear and gold!"
done
-
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -58,4 +58,3 @@
TX_RAM wcd6d
text "!"
done
-
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -475,4 +475,3 @@
line "entirely complete!"
cont "Congratulations!"
done
-
--- a/text/maps/pallet_town.asm
+++ b/text/maps/pallet_town.asm
@@ -53,4 +53,3 @@
_PalletTownText7::
text $53,"'s house "
done
-
--- a/text/maps/pewter_city.asm
+++ b/text/maps/pewter_city.asm
@@ -115,4 +115,3 @@
line "A Stone Gray"
cont "City"
done
-
--- a/text/maps/pewter_gym_1.asm
+++ b/text/maps/pewter_gym_1.asm
@@ -16,4 +16,3 @@
cont "Fine then! Show"
cont "me your best!"
done
-
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/pewter_house_1.asm
@@ -22,4 +22,3 @@
para "If only we had"
line "some BADGEs..."
done
-
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/pewter_house_2.asm
@@ -17,4 +17,3 @@
para "But, it's not a"
line "sure thing!"
done
-
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/pokemon_league_gate.asm
@@ -17,4 +17,3 @@
text "Oh! That is the"
line "BOULDERBADGE!"
cont "Go right ahead!@@"
-
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/pokemon_tower_1f.asm
@@ -29,4 +29,3 @@
line "There are spirits"
cont "up to mischief!"
done
-
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.asm
@@ -55,4 +55,3 @@
line "might be able to"
cont "unmask them."
done
-
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/pokemon_tower_3f.asm
@@ -43,4 +43,3 @@
text "My friends were"
line "possessed too!"
done
-
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/pokemon_tower_4f.asm
@@ -43,4 +43,3 @@
line "souls of #MON"
cont "rest in peace..."
done
-
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.asm
@@ -69,4 +69,3 @@
para $52, "'s #MON"
line "are fully healed!"
done
-
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/pokemon_tower_6f.asm
@@ -59,4 +59,3 @@
text "Be gone..."
line "Intruders..."
done
-
--- a/text/maps/power_plant.asm
+++ b/text/maps/power_plant.asm
@@ -4,4 +4,3 @@
_ZapdosBattleText::
text "Gyaoo!@@"
-
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -35,4 +35,3 @@
_TVWrongSideText::
text "Oops, wrong side."
done
-
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/rock_tunnel_b1f.asm
@@ -113,4 +113,3 @@
line "CERULEAN CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/rock_tunnel_b2f_1.asm
+++ b/text/maps/rock_tunnel_b2f_1.asm
@@ -106,4 +106,3 @@
text "Fired"
line "away!"
prompt
-
--- a/text/maps/rock_tunnel_b2f_2.asm
+++ b/text/maps/rock_tunnel_b2f_2.asm
@@ -18,4 +18,3 @@
text "I'm an artist,"
line "not a fighter."
done
-
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/rocket_hideout_b1f.asm
@@ -71,4 +71,3 @@
text "Uh-oh, that fight"
line "opened the door!"
done
-
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/rocket_hideout_b2f.asm
@@ -15,4 +15,3 @@
cont "floors. Can you"
cont "reach the BOSS?"
done
-
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/rocket_hideout_b3f.asm
@@ -33,4 +33,3 @@
cont "LIFT KEY to run"
cont "the elevator!"
done
-
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -72,4 +72,3 @@
text "Oh no! I dropped"
line "the LIFT KEY!"
done
-
--- 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.@@"
-
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -47,4 +47,3 @@
line "PALLET TOWN -"
cont "VIRIDIAN CITY"
done
-
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -107,4 +107,3 @@
_Route10Text10::
text "POWER PLANT"
done
-
--- a/text/maps/route_11_1.asm
+++ b/text/maps/route_11_1.asm
@@ -131,5 +131,3 @@
text "Watch out for"
line "live wires!"
done
-
-
--- a/text/maps/route_11_2.asm
+++ b/text/maps/route_11_2.asm
@@ -26,4 +26,3 @@
_Route11Text11::
text "DIGLETT's CAVE"
done
-
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/route_11_gate.asm
@@ -12,4 +12,3 @@
para "He'll help you"
line "rename them too!"
done
-
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/route_11_gate_upstairs.asm
@@ -38,4 +38,3 @@
cont "is by way of the"
cont "ROCK TUNNEL."
done
-
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -137,4 +137,3 @@
_Route12Text12::
text "SPORT FISHING AREA"
done
-
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/route_12_gate.asm
@@ -2,4 +2,3 @@
text "There's a lookout"
line "spot upstairs."
done
-
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -40,4 +40,3 @@
para "It's #MON TOWER!"
done
-
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -58,4 +58,3 @@
line "you, but you have"
cont "no room for it!"
done
-
--- a/text/maps/route_13.asm
+++ b/text/maps/route_13.asm
@@ -177,4 +177,3 @@
line "North to SILENCE"
cont "BRIDGE"
done
-
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -171,4 +171,3 @@
line "West to FUCHSIA"
cont "CITY"
done
-
--- a/text/maps/route_15.asm
+++ b/text/maps/route_15.asm
@@ -169,4 +169,3 @@
line "West to FUCHSIA"
cont "CITY"
done
-
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/route_15_gate.asm
@@ -5,4 +5,3 @@
para "PROF.OAK's AIDE"
line "came by here."
done
-
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/route_15_gate_upstairs.asm
@@ -22,4 +22,3 @@
para "It looks like a"
line "small island!"
done
-
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -118,4 +118,3 @@
line "CELADON CITY -"
cont "FUCHSIA CITY"
done
-
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -20,4 +20,3 @@
text "How'd you get in?"
line "Good effort!"
done
-
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/route_16_gate_upstairs.asm
@@ -24,4 +24,3 @@
para "There's a long"
line "path over water!"
done
-
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -29,4 +29,3 @@
_Route16HouseText_1e652::
text "FEAROW: Kyueen!"
done
-
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -193,4 +193,3 @@
text "CYCLING ROAD"
line "Slope ends here!"
done
-
--- a/text/maps/route_18.asm
+++ b/text/maps/route_18.asm
@@ -56,4 +56,3 @@
line "No pedestrians"
cont "permitted!"
done
-
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/route_18_gate.asm
@@ -12,4 +12,3 @@
_Route18GateText_49932::
text "Excuse me!"
done
-
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/route_18_gate_upstairs.asm
@@ -13,5 +13,3 @@
para "There are people"
line "swimming!"
done
-
-
--- a/text/maps/route_19.asm
+++ b/text/maps/route_19.asm
@@ -155,4 +155,3 @@
line "FUCHSIA CITY -"
cont "SEAFOAM ISLANDS"
done
-
--- a/text/maps/route_2.asm
+++ b/text/maps/route_2.asm
@@ -7,4 +7,3 @@
_Route2Text4::
text "DIGLETT's CAVE"
done
-
--- a/text/maps/route_20.asm
+++ b/text/maps/route_20.asm
@@ -154,4 +154,3 @@
_Route20Text11::
text "SEAFOAM ISLANDS"
done
-
--- a/text/maps/route_21.asm
+++ b/text/maps/route_21.asm
@@ -135,4 +135,3 @@
text "Oh wait! I got a"
line "bite! Yeah!"
done
-
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -102,4 +102,3 @@
text "#MON LEAGUE"
line "Front Gate"
done
-
--- a/text/maps/route_23.asm
+++ b/text/maps/route_23.asm
@@ -36,4 +36,3 @@
text "VICTORY ROAD GATE"
line "- #MON LEAGUE"
done
-
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -62,4 +62,3 @@
text "I saw your feat"
line "from the grass!"
done
-
--- a/text/maps/route_24_2.asm
+++ b/text/maps/route_24_2.asm
@@ -88,4 +88,3 @@
text "I did my best, I"
line "have no regrets!"
done
-
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -154,4 +154,3 @@
text "SEA COTTAGE"
line "BILL lives here!"
done
-
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/route_2_gate.asm
@@ -10,4 +10,3 @@
cont "can get through"
cont "ROCK TUNNEL."
done
-
--- a/text/maps/route_2_house.asm
+++ b/text/maps/route_2_house.asm
@@ -4,4 +4,3 @@
cont "it can still use "
cont "moves like CUT!"
done
-
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -143,4 +143,3 @@
text "ROUTE 3"
line "MT.MOON AHEAD"
done
-
--- a/text/maps/route_4.asm
+++ b/text/maps/route_4.asm
@@ -33,4 +33,3 @@
line "MT.MOON -"
cont "CERULEAN CITY"
done
-
--- a/text/maps/route_5.asm
+++ b/text/maps/route_5.asm
@@ -3,4 +3,3 @@
line "CERULEAN CITY -"
cont "VERMILION CITY"
done
-
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -95,4 +95,3 @@
line "CERULEAN CITY -"
cont "VERMILION CITY"
done
-
--- a/text/maps/route_7.asm
+++ b/text/maps/route_7.asm
@@ -3,4 +3,3 @@
line "CELADON CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -152,4 +152,3 @@
line "CELADON CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -155,4 +155,3 @@
line "CERULEAN CITY-"
cont "ROCK TUNNEL"
done
-
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/safari_zone_center.asm
@@ -9,4 +9,3 @@
line "Button to check"
cont "remaining time!"
done
-
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/safari_zone_east.asm
@@ -14,4 +14,3 @@
text "CENTER AREA"
line "NORTH: AREA 2"
done
-
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -91,50 +91,3 @@
text "Sorry, you're a"
line "regular here!"
done
-
-IF DEF(_OPTION_LOWCOST_SAFARI)
-_SafariZoneLowCostText1::
- db 0
- para "Oh, all right, pay"
- line "me what you have."
- prompt
-
-_SafariZoneLowCostText2::
- text "But, I can't give"
- line "you all 30 BALLs."
- done
-
-_SafariZoneLowCostText3::
- db 0
- para "You're persistent,"
- line "aren't you?"
-
- para "OK, you can go in"
- line "for free, but"
- cont "just this once!@@"
-
-_SafariZoneLowCostText4::
- db 0
- done
-
-_SafariZoneLowCostText5::
- text "I'm sorry, but you"
- line "have to pay to"
- cont "enter."
- done
-
-_SafariZoneLowCostText6::
- text "You can't enter"
- line "without paying!"
- done
-
-_SafariZoneLowCostText7::
- text "I said, no money,"
- line "no entry!"
- done
-
-_SafariZoneLowCostText8::
- text "Read my lips, NO!"
- line "Get it?"
- done
-ENDC
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/safari_zone_north.asm
@@ -31,4 +31,3 @@
line "finding the"
cont "SECRET HOUSE!"
done
-
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/safari_zone_rest_house_1.asm
@@ -9,4 +9,3 @@
line "#MON to take"
cont "home as gifts!"
done
-
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/safari_zone_rest_house_2.asm
@@ -17,4 +17,3 @@
line "I didn't see any"
cont "#MON I wanted."
done
-
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/safari_zone_rest_house_3.asm
@@ -16,4 +16,3 @@
text "Whew! I'm tired"
line "from all the fun!"
done
-
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/safari_zone_rest_house_4.asm
@@ -25,4 +25,3 @@
cont "a VAPOREON!"
cont "I wonder why?"
done
-
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -42,4 +42,3 @@
line "room for this"
cont "fabulous prize!"
done
-
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/safari_zone_west.asm
@@ -29,4 +29,3 @@
text "AREA 3"
line "EAST: CENTER AREA"
done
-
--- a/text/maps/saffron_city.asm
+++ b/text/maps/saffron_city.asm
@@ -149,4 +149,3 @@
para "Release to be"
line "determined..."
done
-
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -34,4 +34,3 @@
text "Hi, thanks for"
line "the cool drinks!"
done
-
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -234,4 +234,3 @@
line "used telepathy to"
cont "read your mind!"
done
-
--- a/text/maps/saffron_house.asm
+++ b/text/maps/saffron_house.asm
@@ -24,4 +24,3 @@
line "increasing the PP"
cont "of techniques!"
done
-
--- a/text/maps/seafoam_islands_1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b2f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b3f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -11,4 +11,3 @@
text "DANGER"
line "Fast current!"
done
-
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -132,4 +132,3 @@
text "The monitor has"
line "#MON on it!"
done
-
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/silph_co_1f.asm
@@ -5,4 +5,3 @@
line "in the boardroom"
cont "on 11F!"
done
-
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -94,4 +94,3 @@
line "be merged with"
cont "TEAM ROCKET!"
done
-
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -44,4 +44,3 @@
cont "them, they'd let"
cont "me study #MON!"
done
-
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/silph_co_4f.asm
@@ -54,4 +54,3 @@
text "I better tell the"
line "BOSS on 11F!"
done
-
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/silph_co_5f_2.asm
@@ -53,4 +53,3 @@
line "only when traded"
cont "by link-cable."
done
-
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/silph_co_6f.asm
@@ -105,4 +105,3 @@
line "justice, you"
cont "betray evil!"
done
-
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -207,4 +207,3 @@
cont "Don't sweat it!"
cont "Smell ya!"
done
-
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/silph_co_8f.asm
@@ -54,4 +54,3 @@
text "I'll leave you up"
line "to my brothers!"
done
-
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/silph_co_9f.asm
@@ -60,4 +60,3 @@
text "My brothers will"
line "avenge me!"
done
-
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/ss_anne_1.asm
@@ -19,4 +19,3 @@
line "challenged by the"
cont "more bored ones!"
done
-
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/ss_anne_10.asm
@@ -110,4 +110,3 @@
line "STRENGTH to move"
cont "big rocks!"
done
-
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -61,4 +61,3 @@
para "You should go see"
line "him! Smell ya!"
done
-
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/ss_anne_3.asm
@@ -5,4 +5,3 @@
para "He even teaches"
line "CUT to #MON!"
done
-
--- a/text/maps/ss_anne_4.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/ss_anne_5.asm
@@ -50,4 +50,3 @@
cont "#MON. I think"
cont "there are more."
done
-
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -67,4 +67,3 @@
para "But, have I enough"
line "fillets du beef?"
done
-
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -60,4 +60,3 @@
cont "The CAPTAIN's"
cont "reading this!"
done
-
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/ss_anne_8.asm
@@ -102,4 +102,3 @@
para "I'm on the trail"
line "of TEAM ROCKET!"
done
-
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/ss_anne_9.asm
@@ -111,4 +111,3 @@
text "Oh, I adore your"
line "strong #MON!"
done
-
--- a/text/maps/underground_path_route_5_entrance.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/underground_path_route_6_entrance.asm
@@ -3,4 +3,3 @@
line "things in that"
cont "UNDERGROUND PATH."
done
-
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/underground_path_route_7_entrance.asm
@@ -3,4 +3,3 @@
line "#MON appeared"
cont "near CELADON CITY."
done
-
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -33,4 +33,3 @@
cont "to the building"
cont "across the road."
done
-
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/underground_path_route_8_entrance.asm
@@ -3,4 +3,3 @@
line "in CELADON has a"
cont "great selection!"
done
-
--- a/text/maps/unknown_dungeon_1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/unknown_dungeon_2f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,2 @@
_MewtwoBattleText::
text "Mew!@@"
-
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -124,4 +124,3 @@
_VermilionCityText13::
text "VERMILION HARBOR"
done
-
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/vermilion_dock.asm
@@ -1,4 +1,3 @@
_VermilionDockText1::
text ""
done
-
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -51,4 +51,3 @@
para "You have no room"
line "for my gift!"
done
-
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -141,4 +141,3 @@
text "Whew! That match"
line "was electric!"
done
-
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/vermilion_house.asm
@@ -19,4 +19,3 @@
para "VERMILION appears"
line "to be safe."
done
-
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/victory_road_1f.asm
@@ -29,4 +29,3 @@
text "I concede, you're"
line "better than me!"
done
-
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -83,4 +83,3 @@
line "up the challenge"
cont "here."
done
-
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/victory_road_3f.asm
@@ -61,4 +61,3 @@
line "battles, you get"
cont "stronger!"
done
-
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -178,4 +178,3 @@
text "The GYM's doors"
line "are locked..."
done
-
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -121,4 +121,3 @@
line "VIRIDIAN FOREST"
cont "PEWTER CITY AHEAD"
done
-
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -17,4 +17,3 @@
line "down by a special"
cont "#MON move."
done
-
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -234,4 +234,3 @@
line "GIOVANNI was the"
cont "GYM LEADER here?"
done
-
--- a/text/maps/viridian_house.asm
+++ b/text/maps/viridian_house.asm
@@ -21,4 +21,3 @@
text "SPEAROW"
line "Name: SPEARY"
done
-
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -81,4 +81,3 @@
text "Old #MON"
line "merchandise."
done
-