From 3ee8422962cc485b47026dc51e232efb52a17007 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 27 May 2025 14:57:07 +0000 Subject: [PATCH] Merge pull request #693 from pret/porymap-6 --- pokefirered.sym | 4 ++-- pokefirered_rev1.sym | 4 ++-- pokeleafgreen.sym | 4 ++-- pokeleafgreen_rev1.sym | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index c1c09b5ce..d999c8df9 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -16867,7 +16867,7 @@ 08172178 g 00000000 SixIsland_WaterPath_House2_MapScripts 08172179 g 00000000 SixIsland_WaterPath_House2_EventScript_Man 08172182 g 00000000 SevenIsland_SevaultCanyon_House_MapScripts -08172183 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan +08172183 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan 08172206 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown 08172211 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced 08172225 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_DeclineDance @@ -36210,7 +36210,7 @@ 083eeac4 l 00000090 sMessageLayouts_3x3 083eeb54 l 00000014 sLayout_5x2 083eeb68 l 00000090 sMessageLayouts_5x2 -083eebf8 l 000000a0 sSpawnPoints +083eebf8 l 000000a0 sHealLocations 083eec98 l 00000050 sWhiteoutRespawnHealCenterMapIdxs 083eece8 l 00000014 sWhiteoutRespawnHealerNpcIds 083eecfc l 0000000c sMapsecName_PALLET_TOWN diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 0a6461440..afd3e71f0 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -16868,7 +16868,7 @@ 081721f0 g 00000000 SixIsland_WaterPath_House2_MapScripts 081721f1 g 00000000 SixIsland_WaterPath_House2_EventScript_Man 081721fa g 00000000 SevenIsland_SevaultCanyon_House_MapScripts -081721fb g 00000000 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan +081721fb g 00000000 SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan 0817227e g 00000000 SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown 08172289 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced 0817229d g 00000000 SevenIsland_SevaultCanyon_House_EventScript_DeclineDance @@ -36211,7 +36211,7 @@ 083eeb34 l 00000090 sMessageLayouts_3x3 083eebc4 l 00000014 sLayout_5x2 083eebd8 l 00000090 sMessageLayouts_5x2 -083eec68 l 000000a0 sSpawnPoints +083eec68 l 000000a0 sHealLocations 083eed08 l 00000050 sWhiteoutRespawnHealCenterMapIdxs 083eed58 l 00000014 sWhiteoutRespawnHealerNpcIds 083eed6c l 0000000c sMapsecName_PALLET_TOWN diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 3b7a017d7..a3c66e60c 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -16869,7 +16869,7 @@ 08172154 g 00000000 SixIsland_WaterPath_House2_MapScripts 08172155 g 00000000 SixIsland_WaterPath_House2_EventScript_Man 0817215e g 00000000 SevenIsland_SevaultCanyon_House_MapScripts -0817215f g 00000000 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan +0817215f g 00000000 SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan 081721e2 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown 081721ed g 00000000 SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced 08172201 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_DeclineDance @@ -36212,7 +36212,7 @@ 083ee900 l 00000090 sMessageLayouts_3x3 083ee990 l 00000014 sLayout_5x2 083ee9a4 l 00000090 sMessageLayouts_5x2 -083eea34 l 000000a0 sSpawnPoints +083eea34 l 000000a0 sHealLocations 083eead4 l 00000050 sWhiteoutRespawnHealCenterMapIdxs 083eeb24 l 00000014 sWhiteoutRespawnHealerNpcIds 083eeb38 l 0000000c sMapsecName_PALLET_TOWN diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 8465469a0..36ddc505f 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -16870,7 +16870,7 @@ 081721cc g 00000000 SixIsland_WaterPath_House2_MapScripts 081721cd g 00000000 SixIsland_WaterPath_House2_EventScript_Man 081721d6 g 00000000 SevenIsland_SevaultCanyon_House_MapScripts -081721d7 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan +081721d7 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan 0817225a g 00000000 SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown 08172265 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced 08172279 g 00000000 SevenIsland_SevaultCanyon_House_EventScript_DeclineDance @@ -36213,7 +36213,7 @@ 083ee970 l 00000090 sMessageLayouts_3x3 083eea00 l 00000014 sLayout_5x2 083eea14 l 00000090 sMessageLayouts_5x2 -083eeaa4 l 000000a0 sSpawnPoints +083eeaa4 l 000000a0 sHealLocations 083eeb44 l 00000050 sWhiteoutRespawnHealCenterMapIdxs 083eeb94 l 00000014 sWhiteoutRespawnHealerNpcIds 083eeba8 l 0000000c sMapsecName_PALLET_TOWN