thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/pret/pokered

Browse source
This commit is contained in:
pikalaxalt 2016-06-09 20:45:02 -04:00
commit a2f7701f34
200 changed files with 19 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -253,7 +253,3 @@ ENDM
mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst LORELEIS_ROOM, 6, 5 ; $F5
mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst BRUNOS_ROOM, 6, 5 ; $F6
mapconst AGATHAS_ROOM, 6, 5 ; $F7 mapconst AGATHAS_ROOM, 6, 5 ; $F7
IF DEF(_OPTION_BEACH_HOUSE)
mapconst BEACH_HOUSE, 4, 7 ; $F8
ENDC

3
constants/tilesets.asm
View file

@ -24,6 +24,3 @@ const_value = 0
const CLUB ; 21 const CLUB ; 21
const FACILITY ; 22 const FACILITY ; 22
const PLATEAU ; 23 const PLATEAU ; 23
IF DEF(_OPTION_BEACH_HOUSE)
const BEACH_HOUSE_TILESET ; 24
ENDC

3
data/collision.asm
View file

@ -22,6 +22,3 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll"
Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll"
Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll"
Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll"
IF DEF(_OPTION_BEACH_HOUSE)
BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll"
ENDC

7
data/mapHeaders/beach_house.asm
View file

@ -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

20
data/mapObjects/beach_house.asm
View file

@ -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

23
data/mapObjects/route19.asm
View file

@ -1,42 +1,21 @@
Route19Object: ; 0x54e9a (size=87) Route19Object: ; 0x54e9a (size=87)
db $43 ; border block db $43 ; border block
IF DEF(_OPTION_BEACH_HOUSE) db $0 ; warps
db $1 ; warps
db $9, $5, $0, BEACH_HOUSE
ELSE
db $0 ; warps
ENDC
db $1 ; signs db $1 ; signs
IF DEF(_OPTION_BEACH_HOUSE)
db $b,$b,$b
ELSE
db $9, $b, $b ; Route19Text11 db $9, $b, $b ; Route19Text11
ENDC
db $a ; objects 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, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2
object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 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, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4
object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5
object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 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 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, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d 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, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8
object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
; warp-to ; warp-to
IF DEF(_OPTION_BEACH_HOUSE)
EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
ENDC

3
data/map_header_banks.asm
View file

@ -248,6 +248,3 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(Lorelei_h) db BANK(Lorelei_h)
db BANK(Bruno_h) db BANK(Bruno_h)
db BANK(Agatha_h) db BANK(Agatha_h)
IF DEF(_OPTION_BEACH_HOUSE)
db BANK(BeachHouse_h)
ENDC

3
data/map_header_pointers.asm
View file

@ -248,6 +248,3 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw Lorelei_h dw Lorelei_h
dw Bruno_h dw Bruno_h
dw Agatha_h ;247 dw Agatha_h ;247
IF DEF(_OPTION_BEACH_HOUSE)
dw BeachHouse_h
ENDC

3
data/map_songs.asm
View file

@ -247,6 +247,3 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_GYM, BANK(Music_Gym) ; Lorelei db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
IF DEF(_OPTION_BEACH_HOUSE)
db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
ENDC

3
data/tileset_headers.asm
View file

@ -23,6 +23,3 @@ Tilesets: ; c7be (3:47be)
tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR 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 Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE
tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, 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

3
data/wild_mons.asm
View file

@ -247,9 +247,6 @@ WildDataPointers: ; ceeb (3:4eeb)
dw NoMons dw NoMons
dw NoMons dw NoMons
dw NoMons dw NoMons
IF DEF(_OPTION_BEACH_HOUSE)
dw NoMons
ENDC
dw $FFFF dw $FFFF
; wild pokemon data is divided into two parts. ; wild pokemon data is divided into two parts.

BIN
gfx/blocksets/beachhouse.bst
View file

Binary file not shown.

BIN
gfx/tilesets/beachhouse.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 566 B

1
gfx/tilesets/beachhouse.tilecoll
View file

@ -1 +0,0 @@
<14>

20
main.asm
View file

@ -5120,12 +5120,6 @@ INCLUDE "data/mapHeaders/billshouse.asm"
INCLUDE "scripts/billshouse.asm" INCLUDE "scripts/billshouse.asm"
INCLUDE "data/mapObjects/billshouse.asm" INCLUDE "data/mapObjects/billshouse.asm"
BillsHouseBlocks: INCBIN "maps/billshouse.blk" 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" INCLUDE "engine/menu/oaks_pc.asm"
@ -6042,11 +6036,7 @@ Route17Blocks: INCBIN "maps/route17.blk"
INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapHeaders/route19.asm"
INCLUDE "data/mapObjects/route19.asm" INCLUDE "data/mapObjects/route19.asm"
IF DEF(_OPTION_BEACH_HOUSE)
Route19Blocks: INCBIN "maps/route19-yellow.blk"
ELSE
Route19Blocks: INCBIN "maps/route19.blk" Route19Blocks: INCBIN "maps/route19.blk"
ENDC
INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapHeaders/route21.asm"
INCLUDE "data/mapObjects/route21.asm" INCLUDE "data/mapObjects/route21.asm"
@ -6714,13 +6704,3 @@ INCLUDE "engine/evolution.asm"
INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/overworld/elevator.asm"
INCLUDE "engine/items/tm_prices.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

1
maps/beach_house.blk
View file

@ -1 +0,0 @@
     

195
scripts/beach_house.asm
View file

@ -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 "@"

36
scripts/bikeshop.asm
View file

@ -1,12 +1,12 @@
BikeShopScript: ; 1d73c (7:573c) BikeShopScript:
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
BikeShopTextPointers: ; 1d73f (7:573f) BikeShopTextPointers:
dw BikeShopText1 dw BikeShopText1
dw BikeShopText2 dw BikeShopText2
dw BikeShopText3 dw BikeShopText3
BikeShopText1: ; 1d745 (7:5745) BikeShopText1:
TX_ASM TX_ASM
CheckEvent EVENT_GOT_BICYCLE CheckEvent EVENT_GOT_BICYCLE
jr z, .asm_260d4 jr z, .asm_260d4
@ -78,56 +78,56 @@ BikeShopText1: ; 1d745 (7:5745)
.Done .Done
jp TextScriptEnd jp TextScriptEnd
BikeShopMenuText: ; 1d7f8 (7:57f8) BikeShopMenuText:
db "BICYCLE" db "BICYCLE"
next "CANCEL@" next "CANCEL@"
BikeShopMenuPrice: ; 1d807 (7:5807) BikeShopMenuPrice:
db "¥1000000@" db "¥1000000@"
BikeShopText_1d810: ; 1d810 (7:5810) BikeShopText_1d810:
TX_FAR _BikeShopText_1d810 TX_FAR _BikeShopText_1d810
db "@" db "@"
BikeShopText_1d815: ; 1d815 (7:5815) BikeShopText_1d815:
TX_FAR _BikeShopText_1d815 TX_FAR _BikeShopText_1d815
db "@" db "@"
BikeShopCantAffordText: ; 1d81a (7:581a) BikeShopCantAffordText:
TX_FAR _BikeShopCantAffordText TX_FAR _BikeShopCantAffordText
db "@" db "@"
BikeShopText_1d81f: ; 1d81f (7:581f) BikeShopText_1d81f:
TX_FAR _BikeShopText_1d81f TX_FAR _BikeShopText_1d81f
db "@" db "@"
BikeShopText_1d824: ; 1d824 (7:5824) BikeShopText_1d824:
TX_FAR _BikeShopText_1d824 TX_FAR _BikeShopText_1d824
db $11, "@" db $11, "@"
BikeShopComeAgainText: ; 1d82a (7:582a) BikeShopComeAgainText:
TX_FAR _BikeShopComeAgainText TX_FAR _BikeShopComeAgainText
db "@" db "@"
BikeShopText_1d82f: ; 1d82f (7:582f) BikeShopText_1d82f:
TX_FAR _BikeShopText_1d82f TX_FAR _BikeShopText_1d82f
db "@" db "@"
BikeShopText_1d834: ; 1d834 (7:5834) BikeShopText_1d834:
TX_FAR _BikeShopText_1d834 TX_FAR _BikeShopText_1d834
db "@" db "@"
BikeShopText2: ; 1d839 (7:5839) BikeShopText2:
TX_ASM TX_ASM
ld hl, BikeShopText_1d843 ld hl, BikeShopText_1d843
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
BikeShopText_1d843: ; 1d843 (7:5843) BikeShopText_1d843:
TX_FAR _BikeShopText_1d843 TX_FAR _BikeShopText_1d843
db "@" db "@"
BikeShopText3: ; 1d848 (7:5848) BikeShopText3:
TX_ASM TX_ASM
CheckEvent EVENT_GOT_BICYCLE CheckEvent EVENT_GOT_BICYCLE
ld hl, BikeShopText_1d861 ld hl, BikeShopText_1d861
@ -137,10 +137,10 @@ BikeShopText3: ; 1d848 (7:5848)
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
BikeShopText_1d85c: ; 1d85c (7:585c) BikeShopText_1d85c:
TX_FAR _BikeShopText_1d85c TX_FAR _BikeShopText_1d85c
db "@" db "@"
BikeShopText_1d861: ; 1d861 (7:5861) BikeShopText_1d861:
TX_FAR _BikeShopText_1d861 TX_FAR _BikeShopText_1d861
db "@" db "@"

11
text.asm
View file

@ -174,7 +174,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm"
INCLUDE "text/maps/ss_anne_1.asm" INCLUDE "text/maps/ss_anne_1.asm"
INCLUDE "text/maps/ss_anne_2.asm" INCLUDE "text/maps/ss_anne_2.asm"
INCLUDE "text/maps/ss_anne_3.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_5.asm"
INCLUDE "text/maps/ss_anne_6.asm" INCLUDE "text/maps/ss_anne_6.asm"
INCLUDE "text/maps/ss_anne_7.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_2.asm"
INCLUDE "text/maps/safari_zone_rest_house_3.asm" INCLUDE "text/maps/safari_zone_rest_house_3.asm"
INCLUDE "text/maps/safari_zone_rest_house_4.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/unknown_dungeon_b1f.asm"
INCLUDE "text/maps/victory_road_1f.asm" INCLUDE "text/maps/victory_road_1f.asm"
INCLUDE "text/maps/lance.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] SECTION "Text 3", ROMX, BANK[TEXT_3]
INCLUDE "text/maps/rock_tunnel_b2f_2.asm" 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" INCLUDE "text/maps/seafoam_islands_b4f.asm"
_AIBattleWithdrawText:: _AIBattleWithdrawText::
@ -1948,7 +1941,6 @@ INCLUDE "text/maps/daycare_1.asm"
SECTION "Text 4", ROMX, BANK[TEXT_4] SECTION "Text 4", ROMX, BANK[TEXT_4]
INCLUDE "text/maps/daycare_2.asm" 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_6_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance_unused.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_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm" INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.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/pokemon_league_gate.asm"
INCLUDE "text/maps/victory_road_2f.asm" INCLUDE "text/maps/victory_road_2f.asm"
INCLUDE "text/maps/bills_house.asm" INCLUDE "text/maps/bills_house.asm"

1
text/maps/agatha.asm
View file

@ -42,4 +42,3 @@ _AgathaDontRunAwayText::
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

103
text/maps/beach_house.asm
View file

@ -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!@@"

1
text/maps/bike_shop.asm
View file

@ -68,4 +68,3 @@ _BikeShopText_1d861::
text "Wow. Your BIKE is" text "Wow. Your BIKE is"
line "really cool!" line "really cool!"
done done

1
text/maps/bills_house.asm
View file

@ -85,4 +85,3 @@ _BillsHouseText_1e8da::
cont "some of my rare" cont "some of my rare"
cont "#MON on my PC!" cont "#MON on my PC!"
done done

1
text/maps/blues_house.asm
View file

@ -39,4 +39,3 @@ _BluesHouseText3::
text "It's a big map!" text "It's a big map!"
line "This is useful!" line "This is useful!"
done done

1
text/maps/bruno.asm
View file

@ -35,4 +35,3 @@ _BrunoDontRunAwayText::
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

1
text/maps/celadon_city.asm
View file

@ -150,4 +150,3 @@ _CeladonCityText18::
line "The playground" line "The playground"
cont "for grown-ups!" cont "for grown-ups!"
done done

1
text/maps/celadon_diner.asm
View file

@ -57,4 +57,3 @@ _CeladonDinerText_491b7::
line "I was going to" line "I was going to"
cont "win it back..." cont "win it back..."
done done

1
text/maps/celadon_game_corner.asm
View file

@ -184,4 +184,3 @@ _CeladonGameCornerText_48f19::
text "Oops! Forgot the" text "Oops! Forgot the"
line "COIN CASE!" line "COIN CASE!"
done done

1
text/maps/celadon_gym.asm
View file

@ -216,4 +216,3 @@ _CeladonGymAfterBattleText8::
para "Wait 'til next" para "Wait 'til next"
line "time!" line "time!"
done done

1
text/maps/celadon_hotel.asm
View file

@ -19,4 +19,3 @@ _CeladonHotelText3::
text "Why did she bring" text "Why did she bring"
line "her brother?" line "her brother?"
done done

1
text/maps/celadon_house.asm
View file

@ -20,4 +20,3 @@ _CeladonHouseText3::
para "There's no secret" para "There's no secret"
line "switch behind it!" line "switch behind it!"
done done

1
text/maps/celadon_mansion_1f.asm
View file

@ -21,4 +21,3 @@ _CeladonMansion1Text5::
text "CELADON MANSION" text "CELADON MANSION"
line "Manager's Suite" line "Manager's Suite"
done done

1
text/maps/celadon_mansion_2f.asm
View file

@ -2,4 +2,3 @@ _CeladonMansion2Text1::
text "GAME FREAK" text "GAME FREAK"
line "Meeting Room" line "Meeting Room"
done done

1
text/maps/celadon_mansion_3f.asm
View file

@ -64,4 +64,3 @@ _CeladonMansion3Text8::
text "GAME FREAK" text "GAME FREAK"
line "Development Room" line "Development Room"
done done

1
text/maps/celadon_mansion_4f_inside.asm
View file

@ -8,4 +8,3 @@ _CeladonMansion5Text1::
line "your friends and" line "your friends and"
cont "trade #MON!" cont "trade #MON!"
done done

1
text/maps/celadon_mansion_4f_outside.asm
View file

@ -1,4 +1,3 @@
_CeladonMansion4Text1:: _CeladonMansion4Text1::
text "I KNOW EVERYTHING!" text "I KNOW EVERYTHING!"
done done

1
text/maps/celadon_prize_room.asm
View file

@ -10,4 +10,3 @@ _CeladonPrizeRoomText2::
text "I had a major" text "I had a major"
line "haul today!" line "haul today!"
done done

1
text/maps/cerulean_badge_house.asm
View file

@ -95,4 +95,3 @@ _CeruleanHouse2Text_74eb9::
text "All #MON will" text "All #MON will"
line "obey you!" line "obey you!"
prompt prompt

1
text/maps/cerulean_city.asm
View file

@ -230,4 +230,3 @@ _CeruleanCityText17::
para "The Tomboyish" para "The Tomboyish"
line "Mermaid!" line "Mermaid!"
done done

1
text/maps/cerulean_gym.asm
View file

@ -129,4 +129,3 @@ _CeruleanGymText_5c82f::
line "we make a pretty" line "we make a pretty"
cont "darn good team!" cont "darn good team!"
done done

1
text/maps/cerulean_trashed_house.asm
View file

@ -34,4 +34,3 @@ _CeruleanHouseTrashedText3::
text "TEAM ROCKET left" text "TEAM ROCKET left"
line "a way out!" line "a way out!"
done done

1
text/maps/champion.asm
View file

@ -144,4 +144,3 @@ _GaryText_7612a::
para $52, "!" para $52, "!"
line "Come with me!" line "Come with me!"
done done

1
text/maps/cinnabar_gym.asm
View file

@ -207,4 +207,3 @@ _CinnabarGymText_75ac7::
text $52, "! You beat" text $52, "! You beat"
line "that fire brand!" line "that fire brand!"
done done

1
text/maps/cinnabar_island.asm
View file

@ -35,4 +35,3 @@ _CinnabarIslandText7::
para "The Hot-Headed" para "The Hot-Headed"
line "Quiz Master!" line "Quiz Master!"
done done

1
text/maps/cinnabar_lab.asm
View file

@ -27,4 +27,3 @@ _Lab1Text5::
text "#MON LAB" text "#MON LAB"
line "Testing Room" line "Testing Room"
done done

1
text/maps/cinnabar_lab_fossil_room.asm
View file

@ -76,4 +76,3 @@ _Lab4Text_610bd::
text "Aiyah! You come" text "Aiyah! You come"
line "again!" line "again!"
done done

1
text/maps/cinnabar_lab_metronome_room.asm
View file

@ -61,4 +61,3 @@ _Lab3Text3::
_Lab3Text5:: _Lab3Text5::
text "An amber pipe!" text "An amber pipe!"
done done

1
text/maps/cinnabar_lab_trade_room.asm
View file

@ -7,4 +7,3 @@ _Lab2Text1::
line "rare, prehistoric" line "rare, prehistoric"
cont "#MON!" cont "#MON!"
done done

1
text/maps/copycats_house_2f.asm
View file

@ -94,4 +94,3 @@ _CopycatsHouse2FText_5cd17::
_CopycatsHouse2FText_5cd1c:: _CopycatsHouse2FText_5cd1c::
text "Huh? Can't see!" text "Huh? Can't see!"
done done

1
text/maps/daycare_1.asm
View file

@ -60,4 +60,3 @@ _DayCareMonNeedsMoreTimeText::
cont "needs some more" cont "needs some more"
cont "time with me." cont "time with me."
prompt prompt

1
text/maps/daycare_2.asm
View file

@ -31,4 +31,3 @@ _DayCareNotEnoughMoneyText::
text "Hey, you don't" text "Hey, you don't"
line "have enough ¥!" line "have enough ¥!"
done done

1
text/maps/digletts_cave_route_11_entrance.asm
View file

@ -6,4 +6,3 @@ _DiglettsCaveEntRoute11Text1::
para "It goes right to" para "It goes right to"
line "VIRIDIAN CITY!" line "VIRIDIAN CITY!"
done done

1
text/maps/digletts_cave_route_2_entrance.asm
View file

@ -7,4 +7,3 @@ _DiglettsCaveRoute2Text1::
line "FLASH could light" line "FLASH could light"
cont "it up..." cont "it up..."
done done

1
text/maps/fan_club.asm
View file

@ -141,4 +141,3 @@ _FanClubText8::
text "If someone brags," text "If someone brags,"
line "brag right back!" line "brag right back!"
done done

1
text/maps/fighting_dojo.asm
View file

@ -128,4 +128,3 @@ _OtherHitmonText::
text "Better not get" text "Better not get"
line "greedy..." line "greedy..."
done done

1
text/maps/fuchsia_city.asm
View file

@ -117,4 +117,3 @@ _FuchsiaCityKabutoText::
_FuchsiaCityText_19b2a:: _FuchsiaCityText_19b2a::
text "..." text "..."
done done

1
text/maps/fuchsia_fishing_house.asm
View file

@ -41,4 +41,3 @@ _FuchsiaHouse3Text_5621c::
para "You have no room" para "You have no room"
line "for my gift!" line "for my gift!"
done done

1
text/maps/fuchsia_gym_1.asm
View file

@ -24,4 +24,3 @@ _KogaAfterBattleText::
para "Here! Take the" para "Here! Take the"
line "SOULBADGE!" line "SOULBADGE!"
prompt prompt

1
text/maps/fuchsia_gym_2.asm
View file

@ -191,4 +191,3 @@ _FuchsiaGymText_75653::
line "ninja can terrify" line "ninja can terrify"
cont "even now!" cont "even now!"
done done

1
text/maps/fuchsia_house.asm
View file

@ -25,4 +25,3 @@ _FuchsiaHouse1Text3::
para "Did he show you?" para "Did he show you?"
done done

1
text/maps/fuchsia_meeting_room.asm
View file

@ -24,4 +24,3 @@ _FuchsiaMeetingRoomText3::
para "I think he's got" para "I think he's got"
line "a speech problem!" line "a speech problem!"
done done

1
text/maps/fujis_house.asm
View file

@ -83,4 +83,3 @@ _LavenderHouse1Text6::
para "Gone! It's been" para "Gone! It's been"
line "clipped out!" line "clipped out!"
done done

1
text/maps/hall_of_fame.asm
View file

@ -26,4 +26,3 @@ _HallofFameRoomText1::
cont "your #MON are" cont "your #MON are"
cont "HALL OF FAMERs!" cont "HALL OF FAMERs!"
done done

1
text/maps/lance.asm
View file

@ -61,4 +61,3 @@ _LanceAfterBattleText::
para "He is the real" para "He is the real"
line "#MON LEAGUE" line "#MON LEAGUE"
cont "champion!@@" cont "champion!@@"

1
text/maps/lavender_house.asm
View file

@ -22,4 +22,3 @@ _LavenderHouse2Text_1d9e1::
line "soothed its" line "soothed its"
cont "restless soul!" cont "restless soul!"
done done

1
text/maps/lavender_town.asm
View file

@ -62,4 +62,3 @@ _LavenderTownText9::
line "#MON Rest Easy" line "#MON Rest Easy"
cont "#MON TOWER" cont "#MON TOWER"
done done

1
text/maps/lorelei.asm
View file

@ -40,4 +40,3 @@ _LoreleiDontRunAwayText::
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

1
text/maps/mansion_1f.asm
View file

@ -27,4 +27,3 @@ _MansionSwitchPressedText::
_MansionSwitchNotPressedText:: _MansionSwitchNotPressedText::
text "Not quite yet!" text "Not quite yet!"
done done

1
text/maps/mansion_2f.asm
View file

@ -45,4 +45,3 @@ _Mansion2Text_520c7::
_Mansion2Text_520cc:: _Mansion2Text_520cc::
text "Not quite yet!" text "Not quite yet!"
done done

1
text/maps/mansion_3f.asm
View file

@ -35,4 +35,3 @@ _Mansion3Text5::
para "We named the" para "We named the"
line "newborn MEWTWO." line "newborn MEWTWO."
done done

1
text/maps/mansion_b1f.asm
View file

@ -37,4 +37,3 @@ _Mansion4Text7::
line "curb its vicious" line "curb its vicious"
cont "tendencies..." cont "tendencies..."
done done

1
text/maps/mr_psychics_house.asm
View file

@ -23,4 +23,3 @@ _TM29NoRoomText::
text "Where do you plan" text "Where do you plan"
line "to put this?" line "to put this?"
done done

1
text/maps/mt_moon_b1f.asm
View file

@ -1,4 +1,3 @@
_MtMoonText1:: _MtMoonText1::
db $0 db $0
done done

1
text/maps/museum_1f.asm
View file

@ -105,4 +105,3 @@ _Museum1FText_5c2bc::
text "The AMBER is" text "The AMBER is"
line "clear and gold!" line "clear and gold!"
done done

1
text/maps/name_rater.asm
View file

@ -58,4 +58,3 @@ _NameRaterText_1dad1::
TX_RAM wcd6d TX_RAM wcd6d
text "!" text "!"
done done

1
text/maps/oaks_lab.asm
View file

@ -475,4 +475,3 @@ _OaksLabText_4424c::
line "entirely complete!" line "entirely complete!"
cont "Congratulations!" cont "Congratulations!"
done done

1
text/maps/pallet_town.asm
View file

@ -53,4 +53,3 @@ _PalletTownText6::
_PalletTownText7:: _PalletTownText7::
text $53,"'s house " text $53,"'s house "
done done

1
text/maps/pewter_city.asm
View file

@ -115,4 +115,3 @@ _PewterCityText12::
line "A Stone Gray" line "A Stone Gray"
cont "City" cont "City"
done done

1
text/maps/pewter_gym_1.asm
View file

@ -16,4 +16,3 @@ _PewterGymText_5c49e::
cont "Fine then! Show" cont "Fine then! Show"
cont "me your best!" cont "me your best!"
done done

1
text/maps/pewter_house_1.asm
View file

@ -22,4 +22,3 @@ _PewterHouse1Text3::
para "If only we had" para "If only we had"
line "some BADGEs..." line "some BADGEs..."
done done

1
text/maps/pewter_house_2.asm
View file

@ -17,4 +17,3 @@ _PewterHouse2Text2::
para "But, it's not a" para "But, it's not a"
line "sure thing!" line "sure thing!"
done done

1
text/maps/pokemon_league_gate.asm
View file

@ -17,4 +17,3 @@ _Route22GateText_1e71a::
text "Oh! That is the" text "Oh! That is the"
line "BOULDERBADGE!" line "BOULDERBADGE!"
cont "Go right ahead!@@" cont "Go right ahead!@@"

1
text/maps/pokemon_tower_1f.asm
View file

@ -29,4 +29,3 @@ _PokemonTower1Text5::
line "There are spirits" line "There are spirits"
cont "up to mischief!" cont "up to mischief!"
done done

1
text/maps/pokemon_tower_2f.asm
View file

@ -55,4 +55,3 @@ _PokemonTower2Text2::
line "might be able to" line "might be able to"
cont "unmask them." cont "unmask them."
done done

1
text/maps/pokemon_tower_3f.asm
View file

@ -43,4 +43,3 @@ _PokemonTower3AfterBattleText3::
text "My friends were" text "My friends were"
line "possessed too!" line "possessed too!"
done done

1
text/maps/pokemon_tower_4f.asm
View file

@ -43,4 +43,3 @@ _PokemonTower4AfterBattleText3::
line "souls of #MON" line "souls of #MON"
cont "rest in peace..." cont "rest in peace..."
done done

1
text/maps/pokemon_tower_5f.asm
View file

@ -69,4 +69,3 @@ _PokemonTower5Text7::
para $52, "'s #MON" para $52, "'s #MON"
line "are fully healed!" line "are fully healed!"
done done

1
text/maps/pokemon_tower_6f.asm
View file

@ -59,4 +59,3 @@ _PokemonTower6Text6::
text "Be gone..." text "Be gone..."
line "Intruders..." line "Intruders..."
done done

1
text/maps/power_plant.asm
View file

@ -4,4 +4,3 @@ _VoltorbBattleText::
_ZapdosBattleText:: _ZapdosBattleText::
text "Gyaoo!@@" text "Gyaoo!@@"

1
text/maps/reds_house_1f.asm
View file

@ -35,4 +35,3 @@ _StandByMeText::
_TVWrongSideText:: _TVWrongSideText::
text "Oops, wrong side." text "Oops, wrong side."
done done

1
text/maps/rock_tunnel_b1f.asm
View file

@ -113,4 +113,3 @@ _RockTunnel1Text8::
line "CERULEAN CITY -" line "CERULEAN CITY -"
cont "LAVENDER TOWN" cont "LAVENDER TOWN"
done done

1
text/maps/rock_tunnel_b2f_1.asm
View file

@ -106,4 +106,3 @@ _RockTunnel2EndBattleText8::
text "Fired" text "Fired"
line "away!" line "away!"
prompt prompt

1
text/maps/rock_tunnel_b2f_2.asm
View file

@ -18,4 +18,3 @@ _RockTunnel2AfterBattleText9::
text "I'm an artist," text "I'm an artist,"
line "not a fighter." line "not a fighter."
done done

1
text/maps/rocket_hideout_b1f.asm
View file

@ -71,4 +71,3 @@ _RocketHideout1AfterBattleTxt6::
text "Uh-oh, that fight" text "Uh-oh, that fight"
line "opened the door!" line "opened the door!"
done done

1
text/maps/rocket_hideout_b2f.asm
View file

@ -15,4 +15,3 @@ _RocketHideout2AfterBattleTxt2::
cont "floors. Can you" cont "floors. Can you"
cont "reach the BOSS?" cont "reach the BOSS?"
done done

1
text/maps/rocket_hideout_b3f.asm
View file

@ -33,4 +33,3 @@ _RocketHide3AfterBattleText3::
cont "LIFT KEY to run" cont "LIFT KEY to run"
cont "the elevator!" cont "the elevator!"
done done

1
text/maps/rocket_hideout_b4f.asm
View file

@ -72,4 +72,3 @@ _RocketHideout4Text_455ec::
text "Oh no! I dropped" text "Oh no! I dropped"
line "the LIFT KEY!" line "the LIFT KEY!"
done done

1
text/maps/rocket_hideout_elevator.asm
View file

@ -1,4 +1,3 @@
_RocketElevatorText_4578b:: _RocketElevatorText_4578b::
text "It appears to" text "It appears to"
line "need a key.@@" line "need a key.@@"

1
text/maps/route_1.asm
View file

@ -47,4 +47,3 @@ _Route1Text3::
line "PALLET TOWN -" line "PALLET TOWN -"
cont "VIRIDIAN CITY" cont "VIRIDIAN CITY"
done done

1
text/maps/route_10.asm
View file

@ -107,4 +107,3 @@ _Route10Text7::
_Route10Text10:: _Route10Text10::
text "POWER PLANT" text "POWER PLANT"
done done

Some files were not shown because too many files have changed in this diff Show more