mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
PnP_HiddenPlaces -> PnP_Places
The "Places & People" radio station does not avoid these maps; it only describes these maps.
This commit is contained in:
parent
fb9cbe7d1e
commit
ceadab8cd1
@ -1,13 +0,0 @@
|
||||
; Places and People will not describe these maps.
|
||||
|
||||
PnP_HiddenPlaces:
|
||||
map_id PALLET_TOWN
|
||||
map_id ROUTE_22
|
||||
map_id PEWTER_CITY
|
||||
map_id CERULEAN_POLICE_STATION
|
||||
map_id ROUTE_12
|
||||
map_id ROUTE_11
|
||||
map_id ROUTE_16
|
||||
map_id ROUTE_14
|
||||
map_id CINNABAR_POKECENTER_2F_BETA
|
||||
.End
|
13
data/radio/pnp_places.asm
Normal file
13
data/radio/pnp_places.asm
Normal file
@ -0,0 +1,13 @@
|
||||
; Places and People will describe the landmarks of these maps.
|
||||
|
||||
PnP_Places:
|
||||
map_id PALLET_TOWN ; PALLET_TOWN
|
||||
map_id ROUTE_22 ; ROUTE_22
|
||||
map_id PEWTER_CITY ; PEWTER_CITY
|
||||
map_id CERULEAN_POLICE_STATION ; CERULEAN_CITY
|
||||
map_id ROUTE_12 ; ROUTE_12
|
||||
map_id ROUTE_11 ; ROUTE_11
|
||||
map_id ROUTE_16 ; ROUTE_16
|
||||
map_id ROUTE_14 ; ROUTE_14
|
||||
map_id CINNABAR_POKECENTER_2F_BETA ; CINNABAR_ISLAND
|
||||
.End
|
@ -1245,9 +1245,9 @@ PnP_OddText:
|
||||
|
||||
PeoplePlaces6: ; Places
|
||||
call Random
|
||||
cp (PnP_HiddenPlaces.End - PnP_HiddenPlaces) / 2
|
||||
cp (PnP_Places.End - PnP_Places) / 2
|
||||
jr nc, PeoplePlaces6
|
||||
ld hl, PnP_HiddenPlaces
|
||||
ld hl, PnP_Places
|
||||
ld c, a
|
||||
ld b, 0
|
||||
add hl, bc
|
||||
@ -1262,7 +1262,7 @@ PeoplePlaces6: ; Places
|
||||
ld a, PLACES_AND_PEOPLE_7
|
||||
jp NextRadioLine
|
||||
|
||||
INCLUDE "data/radio/pnp_hidden_places.asm"
|
||||
INCLUDE "data/radio/pnp_places.asm"
|
||||
|
||||
PnP_Text5:
|
||||
text_far _PnP_Text5
|
||||
|
Loading…
Reference in New Issue
Block a user