ref: 53cf08b6b37b319a32b540af452f963747d03e2c
parent: fb9cbe7d1e8ae9062b4ae2b58028402686ea83d5
parent: ceadab8cd15c6b41d13e560989a991d0a64cb359
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Thu Feb 13 07:21:37 EST 2020
Merge pull request #682 from Rangi42/master Miscellaneous fixes
--- a/data/radio/pnp_hidden_places.asm
+++ /dev/null
@@ -1,13 +1,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
--- /dev/null
+++ b/data/radio/pnp_places.asm
@@ -1,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
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -1245,9 +1245,9 @@
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 @@
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