thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few things

Browse source 
- Added a gate between the two halves of Route 10 on the right side of Rock Tunnel that contains the Graveler trade NPC.

- Improved Faraway's encounter table.

- Made the music go silent before battling both of the postgame bosses for suspense reasons. It also sounds cool.

- Minor text fixes
This commit is contained in:
Martha Schilling 2023-12-31 12:22:36 +00:00
parent 4c0dfdfedd
commit caa8076bcd
29 changed files with 185 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
constants/hide_show_constants.asm
View file

@ -180,82 +180,77 @@ DEF SHOW EQU $15
const HS_SILPH_CO_7F_RIVAL ; A5 const HS_SILPH_CO_7F_RIVAL ; A5
const HS_SILPH_CO_7F_ITEM_1 ; A6 X const HS_SILPH_CO_7F_ITEM_1 ; A6 X
const HS_SILPH_CO_7F_ITEM_2 ; A7 X const HS_SILPH_CO_7F_ITEM_2 ; A7 X
const HS_SILPH_CO_10F_1 ; A8 const HS_SILPH_CO_11F_1 ; A8
const HS_SILPH_CO_10F_2 ; A9 const HS_SILPH_CO_11F_JAMES ; A9
const HS_SILPH_CO_10F_ITEM_1 ; AA X const HS_SILPH_CO_11F_3 ; AA
const HS_SILPH_CO_10F_ITEM_2 ; AB X const HS_SILPH_CO_11F_JESSIE ; AB
const HS_SILPH_CO_10F_ITEM_3 ; AC X const HS_OMEGA ; AC
const HS_SILPH_CO_11F_1 ; AD const HS_OMEGA_2 ; AD
const HS_SILPH_CO_11F_JAMES ; AE const HS_DRAGONITE ; AE
const HS_SILPH_CO_11F_3 ; AF const HS_MOLTRES ; AF
const HS_SILPH_CO_11F_JESSIE ; B0 const HS_POKEMON_MANSION_2F_ITEM ; B0 X
const HS_OMEGA ; B1 const HS_POKEMON_MANSION_3F_ITEM_1 ; B1 X
const HS_OMEGA_2 ; B2 const HS_POKEMON_MANSION_3F_ITEM_2 ; B2 X
const HS_DRAGONITE ; B3 const HS_POKEMON_MANSION_B1F_ITEM_1 ; B3 X
const HS_MOLTRES ; B4 const HS_POKEMON_MANSION_B1F_ITEM_2 ; B4 X
const HS_POKEMON_MANSION_2F_ITEM ; B5 X const HS_POKEMON_MANSION_B1F_ITEM_3 ; B5 X
const HS_POKEMON_MANSION_3F_ITEM_1 ; B6 X const HS_POKEMON_MANSION_B1F_ITEM_4 ; B6 X
const HS_POKEMON_MANSION_3F_ITEM_2 ; B7 X const HS_POKEMON_MANSION_B1F_ITEM_5 ; B7 X
const HS_POKEMON_MANSION_B1F_ITEM_1 ; B8 X const HS_MANSION_GUARD ; B8
const HS_POKEMON_MANSION_B1F_ITEM_2 ; B9 X const HS_SAFARI_ZONE_EAST_ITEM_1 ; B9 X
const HS_POKEMON_MANSION_B1F_ITEM_3 ; BA X const HS_SAFARI_ZONE_EAST_ITEM_2 ; BA X
const HS_POKEMON_MANSION_B1F_ITEM_4 ; BB X const HS_SAFARI_ZONE_EAST_ITEM_3 ; BB X
const HS_POKEMON_MANSION_B1F_ITEM_5 ; BC X const HS_SAFARI_ZONE_EAST_ITEM_4 ; BC X
const HS_MANSION_GUARD ; BD const HS_SAFARI_ZONE_NORTH_ITEM_1 ; BD X
const HS_SAFARI_ZONE_EAST_ITEM_1 ; BE X const HS_SAFARI_ZONE_NORTH_ITEM_2 ; BE X
const HS_SAFARI_ZONE_EAST_ITEM_2 ; BF X const HS_SAFARI_ZONE_WEST_ITEM_1 ; BF X
const HS_SAFARI_ZONE_EAST_ITEM_3 ; C0 X const HS_SAFARI_ZONE_WEST_ITEM_2 ; C0 X
const HS_SAFARI_ZONE_EAST_ITEM_4 ; C1 X const HS_SAFARI_ZONE_WEST_ITEM_3 ; C1 X
const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C2 X const HS_SAFARI_ZONE_WEST_ITEM_4 ; C2 X
const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C3 X const HS_SAFARI_ZONE_CENTER_ITEM ; C3 X
const HS_SAFARI_ZONE_WEST_ITEM_1 ; C4 X const HS_CERULEAN_CAVE_2F_ITEM_1 ; C4 X
const HS_SAFARI_ZONE_WEST_ITEM_2 ; C5 X const HS_CERULEAN_CAVE_2F_ITEM_2 ; C5 X
const HS_SAFARI_ZONE_WEST_ITEM_3 ; C6 X const HS_CERULEAN_CAVE_2F_ITEM_3 ; C6 X
const HS_SAFARI_ZONE_WEST_ITEM_4 ; C7 X const HS_MEWTWO ; C7 X
const HS_SAFARI_ZONE_CENTER_ITEM ; C8 X const HS_CERULEAN_CAVE_B1F_ITEM_1 ; C8 X
const HS_CERULEAN_CAVE_2F_ITEM_1 ; C9 X const HS_CERULEAN_CAVE_B1F_ITEM_2 ; C9 X
const HS_CERULEAN_CAVE_2F_ITEM_2 ; CA X const HS_VICTORY_ROAD_1F_ITEM_1 ; CA X
const HS_CERULEAN_CAVE_2F_ITEM_3 ; CB X const HS_VICTORY_ROAD_1F_ITEM_2 ; CB X
const HS_MEWTWO ; CC X const HS_CHAMPIONS_ROOM_OAK ; CC
const HS_CERULEAN_CAVE_B1F_ITEM_1 ; CD X const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; CD
const HS_CERULEAN_CAVE_B1F_ITEM_2 ; CE X const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; CE
const HS_VICTORY_ROAD_1F_ITEM_1 ; CF X const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; CF
const HS_VICTORY_ROAD_1F_ITEM_2 ; D0 X const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D0
const HS_CHAMPIONS_ROOM_OAK ; D1 const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D1
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D2 const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D2
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D3 const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D3
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D4 const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D4
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D5 const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; D5
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D6 const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; D6
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D7 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; D7
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D8 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; D8
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D9 const HS_ARTICUNO ; D9
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DA const HS_MEW ; DA
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; DB const HS_POKEMON_MANSION_B2F_ITEM_1 ; DB
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; DC const HS_POKEMON_MANSION_B2F_ITEM_2 ; DC
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; DD const HS_MT_MOON_CRATER_ITEM_1 ; DD
const HS_ARTICUNO ; DE const HS_MT_MOON_CRATER_ITEM_2 ; DE
const HS_MEW ; DF const HS_MT_MOON_CRATER_ITEM_3 ; DF
const HS_POKEMON_MANSION_B2F_ITEM_1 ; E0 const HS_MT_MOON_CRATER_ITEM_4 ; E0
const HS_POKEMON_MANSION_B2F_ITEM_2 ; E1 const HS_GIOVANNIS_ROOM_ITEM_1 ; E1
const HS_MT_MOON_CRATER_ITEM_1 ; E2 const HS_GIOVANNIS_ROOM_ITEM_2 ; E2
const HS_MT_MOON_CRATER_ITEM_2 ; E3 const HS_ROCK_TUNNEL_B1F_DOME ; E3
const HS_MT_MOON_CRATER_ITEM_3 ; E4 const HS_ROCK_TUNNEL_B1F_HELIX ; E4
const HS_MT_MOON_CRATER_ITEM_4 ; E5 const HS_ROCK_TUNNEL_B1F_AMBER ; E5
const HS_GIOVANNIS_ROOM_ITEM_1 ; E6 const HS_ROCK_TUNNEL_B1F_WING ; E6
const HS_GIOVANNIS_ROOM_ITEM_2 ; E7 const HS_MT_MOON_CRATER_GUARD ; E7
const HS_ROCK_TUNNEL_B1F_DOME ; E8 const HS_DAYCARE_BULBASAUR ; E8
const HS_ROCK_TUNNEL_B1F_HELIX ; E9 const HS_GLADE_GZAP_1 ; E9
const HS_ROCK_TUNNEL_B1F_AMBER ; EA sports. to the game. const HS_GLADE_GZAP_2 ; EA sports. to the game.
const HS_ROCK_TUNNEL_B1F_WING ; EB const HS_GLADE_GZAP_3 ; EB
const HS_MT_MOON_CRATER_GUARD ; EC const HS_GLADE_ITEM1 ; EC
const HS_DAYCARE_BULBASAUR ; ED const HS_GLADE_ITEM2 ; ED
const HS_GLADE_GZAP_1 ; EE const HS_GLADE_ITEM3 ; EE
const HS_GLADE_GZAP_2 ; EF const HS_GLADE_ITEM4 ; EF
const HS_GLADE_GZAP_3 ; F0 const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F0
const HS_GLADE_ITEM1
const HS_GLADE_ITEM2
const HS_GLADE_ITEM3
const HS_GLADE_ITEM4
const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1
DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused.

41
constants/map_constants.asm
View file

@ -253,27 +253,26 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7 map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7
map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7 map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7
map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F
map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused) map_const ROUTE_10_GATE, 5, 4 ; $EA
map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused) map_const SILPH_CO_11F, 9, 9 ; $EB
map_const SILPH_CO_11F, 9, 9 ; $EC map_const FARAWAY_FERRY_DOCK, 14, 6 ; $EC - was SILPH_CO_ELEVATOR
map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR map_const GARNET_CAVERN_2F, 15, 9 ; $ED - was UNUSED_MAP_ED
map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED map_const UNDERWATER_TUNNEL, 15, 9 ; $EE - Was UNUSED_MAP_EE
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE map_const TRADE_CENTER, 5, 4 ; $EF
map_const TRADE_CENTER, 5, 4 ; $F0 map_const COLOSSEUM, 5, 4 ; $F0
map_const COLOSSEUM, 5, 4 ; $F1 map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F1 - Was UNUSED_MAP_F1
map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1 map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F2 - Was UNUSED_MAP_F2
map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2 map_const LORELEIS_ROOM, 5, 6 ; $F3
map_const LORELEIS_ROOM, 5, 6 ; $F4 map_const BRUNOS_ROOM, 5, 6 ; $F4
map_const BRUNOS_ROOM, 5, 6 ; $F5 map_const AGATHAS_ROOM, 5, 6 ; $F5
map_const AGATHAS_ROOM, 5, 6 ; $F6 map_const ROCK_TUNNEL_B1F, 20, 18 ; $F6 - Switched with CINNABAR_VOLCANO_FLOORS
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS map_const GIOVANNIS_ROOM, 11, 14 ; $F7
map_const GIOVANNIS_ROOM, 11, 14 ; $F8 map_const BATTLE_TENT, 5, 10 ; $F8
map_const BATTLE_TENT, 5, 10 ; $F9 map_const MT_MOON_SQUARE, 13, 7 ; $F9
map_const MT_MOON_SQUARE, 13, 7 ; $FA map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FA
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB map_const CELESTE_HILL_CAVE, 20, 18 ; $FB
map_const CELESTE_HILL_CAVE, 20, 18 ; $FC map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FC
map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FD map_const BRUNSWICK_GLADE, 19, 20 ; $FD
map_const BRUNSWICK_GLADE, 19, 20 ; $FE
DEF NUM_MAPS EQU const_value DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps ; Indoor maps, such as houses, use this as the Map ID in their exit warps

6
data/events/card_key_coords.asm
View file

@ -7,10 +7,6 @@
CardKeyTable1: CardKeyTable1:
db SILPH_CO_7F, $06, $0A, 4 db SILPH_CO_7F, $06, $0A, 4
db SILPH_CO_7F, $06, $0B, 5 db SILPH_CO_7F, $06, $0B, 5
db SILPH_CO_9F, $04, $12, 6
db SILPH_CO_9F, $04, $13, 7
db SILPH_CO_10F, $08, $0A, 8
db SILPH_CO_10F, $08, $0B, 9
db -1 ; end db -1 ; end
CardKeyTable2: CardKeyTable2:
@ -18,8 +14,6 @@ CardKeyTable2:
db SILPH_CO_3F, $09, $09, 11 db SILPH_CO_3F, $09, $09, 11
db SILPH_CO_5F, $04, $07, 12 db SILPH_CO_5F, $04, $07, 12
db SILPH_CO_5F, $05, $07, 13 db SILPH_CO_5F, $05, $07, 13
db SILPH_CO_9F, $08, $03, 18
db SILPH_CO_9F, $09, $03, 19
db -1 ; end db -1 ; end
CardKeyTable3: CardKeyTable3:

2
data/events/card_key_maps.asm
View file

@ -2,7 +2,5 @@ SilphCoMapList:
db SILPH_CO_3F db SILPH_CO_3F
db SILPH_CO_5F db SILPH_CO_5F
db SILPH_CO_7F db SILPH_CO_7F
db SILPH_CO_9F
db SILPH_CO_10F
db SILPH_CO_11F db SILPH_CO_11F
db -1 ; end db -1 ; end

5
data/events/hidden_item_coords.asm
View file

@ -11,8 +11,8 @@ HiddenItemCoords:
hidden_item ROUTE_9, 14, 7 hidden_item ROUTE_9, 14, 7
hidden_item SS_ANNE_KITCHEN, 13, 9 hidden_item SS_ANNE_KITCHEN, 13, 9
hidden_item SS_ANNE_B1F_ROOMS, 3, 1 hidden_item SS_ANNE_B1F_ROOMS, 3, 1
hidden_item ROUTE_10, 9, 17 hidden_item ROUTE_10, 9, 25
hidden_item ROUTE_10, 16, 53 hidden_item ROUTE_10, 12, 71
hidden_item ROCKET_HIDEOUT_B1F, 21, 15 hidden_item ROCKET_HIDEOUT_B1F, 21, 15
hidden_item ROCKET_HIDEOUT_B3F, 27, 17 hidden_item ROCKET_HIDEOUT_B3F, 27, 17
hidden_item ROCKET_HIDEOUT_B4F, 25, 1 hidden_item ROCKET_HIDEOUT_B4F, 25, 1
@ -23,7 +23,6 @@ HiddenItemCoords:
hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible
hidden_item SAFARI_ZONE_WEST, 6, 5 hidden_item SAFARI_ZONE_WEST, 6, 5
hidden_item SILPH_CO_5F, 12, 3 hidden_item SILPH_CO_5F, 12, 3
hidden_item SILPH_CO_9F, 2, 15
hidden_item COPYCATS_HOUSE_2F, 1, 1 hidden_item COPYCATS_HOUSE_2F, 1, 1
hidden_item CERULEAN_CAVE_1F, 14, 11 hidden_item CERULEAN_CAVE_1F, 14, 11
hidden_item CERULEAN_CAVE_B1F, 27, 3 hidden_item CERULEAN_CAVE_B1F, 27, 3

10
data/events/hidden_objects.asm
View file

@ -46,7 +46,6 @@ HiddenObjectMaps:
db SAFARI_ZONE_GATE db SAFARI_ZONE_GATE
db SAFARI_ZONE_WEST db SAFARI_ZONE_WEST
db SILPH_CO_5F db SILPH_CO_5F
db SILPH_CO_9F
db COPYCATS_HOUSE_2F db COPYCATS_HOUSE_2F
db CERULEAN_CAVE_1F db CERULEAN_CAVE_1F
db CERULEAN_CAVE_B1F db CERULEAN_CAVE_B1F
@ -142,7 +141,6 @@ HiddenObjectPointers:
dw SafariZoneEntranceHiddenObjects dw SafariZoneEntranceHiddenObjects
dw SafariZoneWestHiddenObjects dw SafariZoneWestHiddenObjects
dw SilphCo5FHiddenObjects dw SilphCo5FHiddenObjects
dw SilphCo9FHiddenObjects
dw CopycatsHouse2FHiddenObjects dw CopycatsHouse2FHiddenObjects
dw CeruleanCave1HiddenObjects dw CeruleanCave1HiddenObjects
dw CeruleanCave3HiddenObjects dw CeruleanCave3HiddenObjects
@ -431,8 +429,8 @@ SSAnne10HiddenObjects:
db -1 ; end db -1 ; end
Route10HiddenObjects: Route10HiddenObjects:
hidden_object 9, 17, SUPER_POTION, HiddenItems hidden_object 9, 25, SUPER_POTION, HiddenItems
hidden_object 16, 53, MAX_ETHER, HiddenItems hidden_object 12, 71, MAX_ETHER, HiddenItems
db -1 ; end db -1 ; end
RocketHideout1HiddenObjects: RocketHideout1HiddenObjects:
@ -473,10 +471,6 @@ SilphCo5FHiddenObjects:
hidden_object 12, 3, ELIXER, HiddenItems hidden_object 12, 3, ELIXER, HiddenItems
db -1 ; end db -1 ; end
SilphCo9FHiddenObjects:
hidden_object 2, 15, MAX_POTION, HiddenItems
db -1 ; end
CopycatsHouse2FHiddenObjects: CopycatsHouse2FHiddenObjects:
hidden_object 1, 1, NUGGET, HiddenItems hidden_object 1, 1, NUGGET, HiddenItems
db -1 ; end db -1 ; end

3
data/maps/dungeon_maps.asm
View file

@ -13,6 +13,7 @@ DungeonMaps1:
db DIGLETTS_CAVE db DIGLETTS_CAVE
db UNDERWATER_TUNNEL db UNDERWATER_TUNNEL
db CINNABAR_VOLCANO_FLOORS db CINNABAR_VOLCANO_FLOORS
db SILPH_CO_11F
db CELESTE_HILL db CELESTE_HILL
db CELESTE_HILL_OUTSIDE db CELESTE_HILL_OUTSIDE
db CELESTE_HILL_CAVE db CELESTE_HILL_CAVE
@ -34,8 +35,6 @@ DungeonMaps2:
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
; CERULEAN_CAVE maps, except for SILPH_CO_1F ; CERULEAN_CAVE maps, except for SILPH_CO_1F
db SILPH_CO_3F, CERULEAN_CAVE_1F db SILPH_CO_3F, CERULEAN_CAVE_1F
; SILPH_CO_[9-11]F
db SILPH_CO_9F, SILPH_CO_11F
; SEAFOAM_ISLANDS_[B1F-B4F] ; SEAFOAM_ISLANDS_[B1F-B4F]
db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F
; all ROCKET_HIDEOUT maps ; all ROCKET_HIDEOUT maps

2
data/maps/headers/Route10Gate.asm Normal file
View file

@ -0,0 +1,2 @@
map_header Route10Gate, ROUTE_10_GATE, FOREST_GATE, 0
end_map_header

7
data/maps/hide_show_data.asm
View file

@ -238,7 +238,6 @@ MapHSPointers:
dw CinnabarVolcanoHS dw CinnabarVolcanoHS
dw CinnabarVolcanoFloorsHS dw CinnabarVolcanoFloorsHS
dw NoHS dw NoHS
dw SilphCo10FHS
dw SilphCo11FHS dw SilphCo11FHS
dw NoHS dw NoHS
dw NoHS dw NoHS
@ -493,12 +492,6 @@ SilphCo7FHS:
db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL
db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1 db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1
db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2 db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2
SilphCo10FHS:
db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1
db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2
db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3
SilphCo11FHS: SilphCo11FHS:
db SILPH_CO_11F, $03, SHOW ; Giovanni db SILPH_CO_11F, $03, SHOW ; Giovanni
db SILPH_CO_11F, $04, SHOW ; James db SILPH_CO_11F, $04, SHOW ; James

3
data/maps/map_header_banks.asm
View file

@ -235,8 +235,7 @@ MapHeaderBanks::
db BANK(CeruleanBadgeHouse_h) db BANK(CeruleanBadgeHouse_h)
db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7 db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7
db BANK(CinnabarVolcanoFloors_h) db BANK(CinnabarVolcanoFloors_h)
db BANK(SilphCo9F_h) db BANK(Route10Gate_h)
db BANK(SilphCo10F_h)
db BANK(SilphCo11F_h) db BANK(SilphCo11F_h)
db BANK(FarawayFerryDock_h) db BANK(FarawayFerryDock_h)
db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED

3
data/maps/map_header_pointers.asm
View file

@ -235,8 +235,7 @@ MapHeaderPointers::
dw CeruleanBadgeHouse_h dw CeruleanBadgeHouse_h
dw CinnabarVolcano_h ; UNUSED_MAP_E7 dw CinnabarVolcano_h ; UNUSED_MAP_E7
dw CinnabarVolcanoFloors_h dw CinnabarVolcanoFloors_h
dw SilphCo9F_h dw Route10Gate_h
dw SilphCo10F_h
dw SilphCo11F_h dw SilphCo11F_h
dw FarawayFerryDock_h dw FarawayFerryDock_h
dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f

4
data/maps/objects/CinnabarLabTradeRoom.asm
View file

@ -9,8 +9,6 @@ CinnabarLabTradeRoom_Object:
def_object_events def_object_events
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; Trader
; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader
def_warps_to CINNABAR_LAB_TRADE_ROOM def_warps_to CINNABAR_LAB_TRADE_ROOM

5
data/maps/objects/Route10.asm
View file

@ -7,6 +7,9 @@ Route10_Object:
warp_event 8, 61, ROCK_TUNNEL_1F, 3 warp_event 8, 61, ROCK_TUNNEL_1F, 3
warp_event 6, 47, POWER_PLANT, 1 warp_event 6, 47, POWER_PLANT, 1
warp_event 6, 3, UNDERWATER_TUNNEL, 2 warp_event 6, 3, UNDERWATER_TUNNEL, 2
warp_event 14, 61, ROUTE_10_GATE, 2
warp_event 14, 57, ROUTE_10_GATE, 1
warp_event 15, 57, ROUTE_10_GATE, 1
def_bg_events def_bg_events
bg_event 7, 27, 7 ; Route10Text7 bg_event 7, 27, 7 ; Route10Text7
@ -15,7 +18,7 @@ Route10_Object:
bg_event 5, 49, 10 ; Route10Text10 bg_event 5, 49, 10 ; Route10Text10
def_object_events def_object_events
object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 object_event 10, 50, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7

14
data/maps/objects/Route10Gate.asm Normal file
View file

@ -0,0 +1,14 @@
Route10Gate_Object:
db $a ; border block
def_warp_events
warp_event 5, 0, ROUTE_10, 7
warp_event 4, 7, ROUTE_10, 6
warp_event 5, 7, ROUTE_10, 6
def_bg_events
def_object_events
object_event 3, 4, SPRITE_GRAMPS, STAY, LEFT, 1 ; person
def_warps_to ROUTE_10_GATE

3
data/maps/songs.asm
View file

@ -234,8 +234,7 @@ MapSongBanks::
db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F db MUSIC_CITIES1, 0 ; ROUTE_10_GATE
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F

1
data/maps/town_map_entries.asm
View file

@ -135,6 +135,7 @@ InternalMapEntries:
internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map ROUTE_10_GATE, 14, 4, Route10Name
internal_map SILPH_CO_11F, 10, 5, SilphCoName internal_map SILPH_CO_11F, 10, 5, SilphCoName
internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName

3
data/text/text_7.asm
View file

@ -142,8 +142,7 @@ _AfterTrade2Text::
text_ram wInGameTradeGiveMonName text_ram wInGameTradeGiveMonName
text " you" text " you"
line "traded to me" line "traded to me"
cont "went and evolved!"
para "went and evolved!"
done done
_WannaTrade3Text:: _WannaTrade3Text::

1
data/wild/grass_water.asm
View file

@ -237,7 +237,6 @@ WildDataPointers:
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
dw NothingWildMons
dw GarnetCavern2FWildMons dw GarnetCavern2FWildMons
dw UnderwaterTunnelWildMons dw UnderwaterTunnelWildMons
dw NothingWildMons dw NothingWildMons

22
data/wild/maps/FarawayIslandInside.asm
View file

@ -1,15 +1,15 @@
FarawayIslandInsideMons: ; DEFINITELY needs reworking FarawayIslandInsideMons:
def_grass_wildmons 10 ; encounter rate def_grass_wildmons 10 ; encounter rate
db 30, EEVEE db 25, MANKEY
db 30, MANKEY db 28, GLOOM
db 30, MANKEY db 26, BUTTERFREE
db 30, PRIMEAPE db 29, PRIMEAPE
db 30, BUTTERFREE db 24, MANKEY
db 30, EEVEE db 30, DECILLA
db 30, EEVEE db 26, MANKEY
db 30, EEVEE db 30, GORILLAIMO
db 30, EEVEE db 27, BUTTERFREE
db 30, EEVEE db 30, AERODACTYL
end_grass_wildmons end_grass_wildmons
def_water_wildmons 0 ; encounter rate def_water_wildmons 0 ; encounter rate

13
maps.asm
View file

@ -789,10 +789,10 @@ INCLUDE "scripts/SilphCo3F.asm"
INCLUDE "data/maps/objects/SilphCo3F.asm" INCLUDE "data/maps/objects/SilphCo3F.asm"
SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
INCLUDE "data/maps/headers/SilphCo10F.asm" INCLUDE "data/maps/headers/Route10Gate.asm"
INCLUDE "scripts/SilphCo10F.asm" INCLUDE "scripts/Route10Gate.asm"
INCLUDE "data/maps/objects/SilphCo10F.asm" INCLUDE "data/maps/objects/Route10Gate.asm"
SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" Route10Gate_Blocks: INCBIN "maps/Route10Gate.blk"
INCLUDE "data/maps/headers/LancesRoom.asm" INCLUDE "data/maps/headers/LancesRoom.asm"
INCLUDE "scripts/LancesRoom.asm" INCLUDE "scripts/LancesRoom.asm"
@ -947,11 +947,6 @@ INCLUDE "data/maps/objects/UndergroundPathRoute7.asm"
;INCLUDE "scripts/UndergroundPathRoute7Copy.asm" ;INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
;INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm" ;INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm"
INCLUDE "data/maps/headers/SilphCo9F.asm"
INCLUDE "scripts/SilphCo9F.asm"
INCLUDE "data/maps/objects/SilphCo9F.asm"
SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
INCLUDE "data/maps/headers/VictoryRoad1F.asm" INCLUDE "data/maps/headers/VictoryRoad1F.asm"
INCLUDE "scripts/VictoryRoad1F.asm" INCLUDE "scripts/VictoryRoad1F.asm"
INCLUDE "data/maps/objects/VictoryRoad1F.asm" INCLUDE "data/maps/objects/VictoryRoad1F.asm"

3
maps/Route10.blk
View file

@ -24,8 +24,7 @@ Me()
Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e().(,?????;CC(,,,,,,)CC(+WWWW% Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{$%{e(){{{{{{{e().()CCCCCCCC(,????;CTC(,,,,,) !(+WWW%7:~()11111
L()11111
()1111>;/()>??,) ()1111>;/()>??,)

BIN
maps/Route10Gate.blk Normal file
View file

Binary file not shown.

13
scripts/CeruleanCaveB1F.asm
View file

@ -25,8 +25,21 @@ MewtwoTrainerHeader:
MewtwoText: MewtwoText:
text_asm text_asm
ld a, 5
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitloop
ld a, [wMusicFade]
and a
jr nz, .waitloop
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld hl, MewtwoTrainerHeader ld hl, MewtwoTrainerHeader
call TalkToTrainer call TalkToTrainer
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
jp TextScriptEnd jp TextScriptEnd
MewtwoBattleText: MewtwoBattleText:

16
scripts/CinnabarLabTradeRoom.asm
View file

@ -3,28 +3,12 @@ CinnabarLabTradeRoom_Script:
CinnabarLabTradeRoom_TextPointers: CinnabarLabTradeRoom_TextPointers:
dw Lab2Text1 dw Lab2Text1
dw Lab2Text2
; dw Lab2Text3
dw CinnabarLabTrader dw CinnabarLabTrader
Lab2Text1: Lab2Text1:
text_far _Lab2Text1 text_far _Lab2Text1
text_end text_end
Lab2Text2:
text_asm
ld a, TRADE_FOR_JENNY
ld [wWhichTrade], a
jr Lab2DoTrade
;Lab2Text3:
; text_asm
; ld a, TRADE_FOR_CRINKLES
; ld [wWhichTrade], a
Lab2DoTrade:
predef DoInGameTradeDialogue
jp TextScriptEnd
CinnabarLabTrader: CinnabarLabTrader:
text_asm text_asm
ld a, TRADE_WITH_SELF ld a, TRADE_WITH_SELF

15
scripts/Route10Gate.asm Normal file
View file

@ -0,0 +1,15 @@
Route10Gate_Script:
jp EnableAutoTextBoxDrawing
Route10Gate_TextPointers:
dw Route10GateText1
Route10GateText1:
text_asm
ld a, TRADE_FOR_JENNY
ld [wWhichTrade], a
jr Route10GateDoTrade
Route10GateDoTrade:
predef DoInGameTradeDialogue
jp TextScriptEnd

6
scripts/SilphCo11F.asm
View file

@ -173,10 +173,6 @@ MissableObjectIDs_6219b:
db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_3
db HS_SILPH_CO_7F_4 db HS_SILPH_CO_7F_4
db HS_SILPH_CO_10F_1
db HS_SILPH_CO_10F_2
db HS_SILPH_CO_11F_1
db HS_SILPH_CO_11F_3
db -1 ; end db -1 ; end
SilphCo11Script_62185: SilphCo11Script_62185:
@ -633,8 +629,6 @@ SaffronCityRockets:
db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_3
db HS_SILPH_CO_7F_4 db HS_SILPH_CO_7F_4
db HS_SILPH_CO_10F_1
db HS_SILPH_CO_10F_2
db HS_SILPH_CO_11F_1 db HS_SILPH_CO_11F_1
db HS_SILPH_CO_11F_3 db HS_SILPH_CO_11F_3
db -1 ; end db -1 ; end

11
scripts/SilphGauntlet7F.asm
View file

@ -21,6 +21,17 @@ SilphGauntlet7F_ScriptPointers:
ChiefScript1: ChiefScript1:
CheckEvent EVENT_BEAT_CHIEF CheckEvent EVENT_BEAT_CHIEF
jr nz, .skip jr nz, .skip
ld a, 5
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitloop
ld a, [wMusicFade]
and a
jr nz, .waitloop
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld a, PLAYER_DIR_UP ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
call UpdateSprites call UpdateSprites

2
text/CelesteHillCave.asm
View file

@ -26,7 +26,7 @@ _CelesteHillCaveBattleText2::
_CelesteHillCaveEndBattleText2:: _CelesteHillCaveEndBattleText2::
text "...!" text "...!"
line "You are not an" line "You are not an"
cont "ordinary TRAINER!" cont "ordinary trainer!"
prompt prompt
_CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV _CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV

6
text/CeruleanCaveB1F.asm
View file

@ -1,3 +1,7 @@
_MewtwoBattleText:: _MewtwoBattleText::
text "Mew!@" text "MEWTWO: ..."
para "..."
para "...Mew!!!@"
text_end text_end