diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
| commit | a2f7701f3441c71b0734a28d44168576f6f28716 (patch) | |
| tree | 84fecc02816fc4fc31fdd172e8e79fc59947cedb | |
| parent | 0d687ba25ae223f6de2c69d46fd1c3df6ad52da3 (diff) | |
| parent | 2a529796374f3798fb507931a7c8a9bad4281107 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
200 files changed, 19 insertions, 659 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ad37e3cf..cbedef3f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -253,7 +253,3 @@ ENDM 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 diff --git a/constants/tilesets.asm b/constants/tilesets.asm index 86f87433..f10e4d92 100644 --- a/constants/tilesets.asm +++ b/constants/tilesets.asm @@ -24,6 +24,3 @@ const_value = 0 const CLUB ; 21 const FACILITY ; 22 const PLATEAU ; 23 -IF DEF(_OPTION_BEACH_HOUSE) - const BEACH_HOUSE_TILESET ; 24 -ENDC diff --git a/data/collision.asm b/data/collision.asm index 46d5ddc6..78579242 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,6 +22,3 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" 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 diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm deleted file mode 100644 index 99d237f6..00000000 --- a/data/mapHeaders/beach_house.asm +++ /dev/null @@ -1,7 +0,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 diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm deleted file mode 100644 index 847883d1..00000000 --- a/data/mapObjects/beach_house.asm +++ /dev/null @@ -1,20 +0,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 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index ee55a069..1b99d90e 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,42 +1,21 @@ 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 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 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ed120d75..8796a608 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -248,6 +248,3 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Lorelei_h) db BANK(Bruno_h) db BANK(Agatha_h) -IF DEF(_OPTION_BEACH_HOUSE) - db BANK(BeachHouse_h) -ENDC diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ef2b4e65..746d3211 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -248,6 +248,3 @@ MapHeaderPointers:: ; 01ae (0:01ae) dw Lorelei_h dw Bruno_h dw Agatha_h ;247 -IF DEF(_OPTION_BEACH_HOUSE) - dw BeachHouse_h -ENDC diff --git a/data/map_songs.asm b/data/map_songs.asm index a8022da2..8fee18d2 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -247,6 +247,3 @@ MapSongBanks: ; c04d (3:404d) 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 diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 3e2e68bb..84cfaffd 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,6 +23,3 @@ Tilesets: ; c7be (3:47be) 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 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index f29fd340..482405e3 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -247,9 +247,6 @@ WildDataPointers: ; ceeb (3:4eeb) dw NoMons dw NoMons dw NoMons - IF DEF(_OPTION_BEACH_HOUSE) - dw NoMons - ENDC dw $FFFF ; wild pokemon data is divided into two parts. diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst Binary files differdeleted file mode 100644 index bafbe0b2..00000000 --- a/gfx/blocksets/beachhouse.bst +++ /dev/null diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png Binary files differdeleted file mode 100644 index f5dccf7a..00000000 --- a/gfx/tilesets/beachhouse.png +++ /dev/null diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll deleted file mode 100644 index 54ddac19..00000000 --- a/gfx/tilesets/beachhouse.tilecoll +++ /dev/null @@ -1 +0,0 @@ -ÿ
\ No newline at end of file @@ -5120,12 +5120,6 @@ INCLUDE "data/mapHeaders/billshouse.asm" 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 @@ Route17Blocks: INCBIN "maps/route17.blk" 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/evolution.asm" 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 diff --git a/maps/beach_house.blk b/maps/beach_house.blk deleted file mode 100644 index 5bcdb58a..00000000 --- a/maps/beach_house.blk +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm deleted file mode 100644 index d6112df7..00000000 --- a/scripts/beach_house.asm +++ /dev/null @@ -1,195 +0,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 "@" diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index e639caf9..866c04b0 100755 --- 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 @@ BikeShopText1: ; 1d745 (7:5745) .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 @@ BikeShopText3: ; 1d848 (7:5848) 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 "@" @@ -174,7 +174,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm" 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_secret_house.asm" 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 @@ INCLUDE "text/maps/rock_tunnel_b2f_1.asm" 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 @@ INCLUDE "text/maps/daycare_1.asm" 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_gate_upstairs.asm" 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" diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 158dbb63..4957f4d4 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/beach_house.asm b/text/maps/beach_house.asm deleted file mode 100644 index 318b6013..00000000 --- a/text/maps/beach_house.asm +++ /dev/null @@ -1,103 +0,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!@@" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 3247e0e3..33f53ee9 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -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 83f92a64..463b13e6 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -85,4 +85,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 147b23fb..b676ea69 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 ab78e9d6..e2470ec1 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -150,4 +150,3 @@ _CeladonCityText18:: line "The playground" cont "for grown-ups!" 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.asm b/text/maps/celadon_game_corner.asm index b74b04b3..2d263e80 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner.asm @@ -184,4 +184,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 953c9c4a..fc175cd5 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -21,4 +21,3 @@ _CeladonMansion1Text5:: text "CELADON MANSION" line "Manager's Suite" 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 f761da72..c8858281 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -64,4 +64,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_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.asm b/text/maps/cerulean_badge_house.asm index 12c0e5ae..9d701443 100644 --- a/text/maps/cerulean_badge_house.asm +++ b/text/maps/cerulean_badge_house.asm @@ -95,4 +95,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 465f1155..48d97e05 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 c5d67004..dd6baaff 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -129,4 +129,3 @@ _CeruleanGymText_5c82f:: line "we make a pretty" cont "darn good team!" 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 51258818..3ca7aadf 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -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 c8df3fe4..b14f6f60 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -207,4 +207,3 @@ _CinnabarGymText_75ac7:: text $52, "! You beat" line "that fire brand!" done - diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index d43c4d66..352ab8ea 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/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/daycare_1.asm b/text/maps/daycare_1.asm index e2e58c0c..6e3c5737 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -60,4 +60,3 @@ _DayCareMonNeedsMoreTimeText:: cont "needs some more" cont "time with me." prompt - diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm index f0950812..20c0e5ad 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -31,4 +31,3 @@ _DayCareNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" 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 3e251e13..7477405c 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -141,4 +141,3 @@ _FanClubText8:: text "If someone brags," line "brag right back!" done - diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index e8cdfb2e..3df069c1 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 3d6fa0c0..a90d0021 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_gym_1.asm b/text/maps/fuchsia_gym_1.asm index 3938f9af..9108fc79 100644 --- a/text/maps/fuchsia_gym_1.asm +++ b/text/maps/fuchsia_gym_1.asm @@ -24,4 +24,3 @@ _KogaAfterBattleText:: para "Here! Take the" line "SOULBADGE!" prompt - diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index 8b7c84ac..ba1970e6 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -191,4 +191,3 @@ _FuchsiaGymText_75653:: line "ninja can terrify" cont "even now!" 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_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/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 cf79e221..6c5dd40e 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/lance.asm b/text/maps/lance.asm index f6890896..3c75ce47 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_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/lorelei.asm b/text/maps/lorelei.asm index 91e90b75..fdbb55b4 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -40,4 +40,3 @@ _LoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" 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/museum_1f.asm b/text/maps/museum_1f.asm index 29b167b5..46b4484c 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 f43aef91..65d3e8a4 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/oaks_lab.asm b/text/maps/oaks_lab.asm index 9aaac71c..52af450d 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -475,4 +475,3 @@ _OaksLabText_4424c:: line "entirely complete!" cont "Congratulations!" done - diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index f912e16e..64b3325b 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -53,4 +53,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_gym_1.asm b/text/maps/pewter_gym_1.asm index 1d56065b..6426dd72 100644 --- a/text/maps/pewter_gym_1.asm +++ b/text/maps/pewter_gym_1.asm @@ -16,4 +16,3 @@ _PewterGymText_5c49e:: cont "Fine then! Show" cont "me your best!" 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/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/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 729c5b46..8b82f2de 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -35,4 +35,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_1.asm b/text/maps/rock_tunnel_b2f_1.asm index e859a7f9..1a565eb3 100644 --- a/text/maps/rock_tunnel_b2f_1.asm +++ b/text/maps/rock_tunnel_b2f_1.asm @@ -106,4 +106,3 @@ _RockTunnel2EndBattleText8:: text "Fired" line "away!" prompt - diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm index 646ccd02..e8e45a7f 100644 --- a/text/maps/rock_tunnel_b2f_2.asm +++ b/text/maps/rock_tunnel_b2f_2.asm @@ -18,4 +18,3 @@ _RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." 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 6d84305a..f3ba43f3 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -72,4 +72,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 19d5fa2b..057ddcb5 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_1.asm b/text/maps/route_11_1.asm index e10825e9..13e37bdf 100644 --- a/text/maps/route_11_1.asm +++ b/text/maps/route_11_1.asm @@ -131,5 +131,3 @@ _Route11BattleText9:: text "Watch out for" line "live wires!" done - - diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm index 537fea42..b9b68d6d 100644 --- a/text/maps/route_11_2.asm +++ b/text/maps/route_11_2.asm @@ -26,4 +26,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 b0d05a30..82696fda 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 a9d74099..1f2af788 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 1371b5b0..18e85ed4 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 740ef8a1..45265829 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 db9bf4d2..a0affd90 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 2a46d5b4..f2d7ae96 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_24_1.asm b/text/maps/route_24_1.asm index 3a8d6d9a..25079b2f 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -62,4 +62,3 @@ _Route24BattleText1:: text "I saw your feat" line "from the grass!" done - diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm index 12a8a59d..325dea13 100644 --- a/text/maps/route_24_2.asm +++ b/text/maps/route_24_2.asm @@ -88,4 +88,3 @@ _Route24AfterBattleText6:: text "I did my best, I" line "have no regrets!" done - diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index b89396ea..325ab348 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 f9496c89..966a0786 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 f98bcaf8..c48b5d3d 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -95,4 +95,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 f59feb87..57a9a5f9 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/route_9.asm b/text/maps/route_9.asm index c440eca9..9975000d 100644 --- a/text/maps/route_9.asm +++ b/text/maps/route_9.asm @@ -155,4 +155,3 @@ _Route9Text11:: line "CERULEAN CITY-" cont "ROCK TUNNEL" 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_entrance.asm b/text/maps/safari_zone_entrance.asm index 22c179f3..8a018b2d 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -91,50 +91,3 @@ _SafariZoneEntranceText_753f0:: 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 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 30ad6cbd..c16e880e 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 f44baaea..ba57e35d 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -234,4 +234,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/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 dccb43c0..608d165f 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 2986f3af..7fccab4f 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -132,4 +132,3 @@ _SilphCo10Text_6237b:: text "The monitor has" line "#MON on it!" 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 819a08c1..a48ebd23 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_2.asm b/text/maps/silph_co_5f_2.asm index da0c6e6f..3c1b8ead 100644 --- a/text/maps/silph_co_5f_2.asm +++ b/text/maps/silph_co_5f_2.asm @@ -53,4 +53,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 f29c16bc..e6ad11c1 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 51c941a8..7fcc9973 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 4687c421..bb8ca042 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 efdc014a..a9be8cee 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -111,4 +111,3 @@ _SSAnne9AfterBattleText4:: text "Oh, I adore your" line "strong #MON!" 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_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 057c7b0c..4e0dc3ca 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -33,4 +33,3 @@ _UGPathRoute7EntranceUnusedText_5d782:: cont "to the building" cont "across the road." 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 4db8467f..0918a3ce 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,2 @@ _MewtwoBattleText:: text "Mew!@@" - diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 07ed1b96..ff90cbef 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -124,4 +124,3 @@ _VermilionCityText12:: _VermilionCityText13:: text "VERMILION HARBOR" done - diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 28b75731..5d998e82 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,4 +1,3 @@ _VermilionDockText1:: text "" done - 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_2.asm b/text/maps/vermilion_gym_2.asm index e347edb9..4fd5e159 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -141,4 +141,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/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 bc1b6cd9..cdcf6e36 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 feedd017..17b2ec91 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -178,4 +178,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 8eaf7738..813b193a 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -121,4 +121,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 a308681a..df04e6d6 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 - |
