diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 71336e1f0..a900929a9 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 2af9e8509..28e9dfed8 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map013.rxdata b/Data/Map013.rxdata index 6fba6bc62..42f9c4793 100644 Binary files a/Data/Map013.rxdata and b/Data/Map013.rxdata differ diff --git a/Data/Map046.rxdata b/Data/Map046.rxdata index acb6bbf5a..209223efe 100644 Binary files a/Data/Map046.rxdata and b/Data/Map046.rxdata differ diff --git a/Data/Map048.rxdata b/Data/Map048.rxdata index f5f7a368d..e63175b6c 100644 Binary files a/Data/Map048.rxdata and b/Data/Map048.rxdata differ diff --git a/Data/Map051.rxdata b/Data/Map051.rxdata index f5c9160ad..4f8ca411d 100644 Binary files a/Data/Map051.rxdata and b/Data/Map051.rxdata differ diff --git a/Data/Map067.rxdata b/Data/Map067.rxdata index ea3f8ae2f..3fd6827eb 100644 Binary files a/Data/Map067.rxdata and b/Data/Map067.rxdata differ diff --git a/Data/Map068.rxdata b/Data/Map068.rxdata index 9f961c846..eff042f34 100644 Binary files a/Data/Map068.rxdata and b/Data/Map068.rxdata differ diff --git a/Data/Map069.rxdata b/Data/Map069.rxdata index 53553d2a6..fa5683134 100644 Binary files a/Data/Map069.rxdata and b/Data/Map069.rxdata differ diff --git a/Data/Map070.rxdata b/Data/Map070.rxdata index e52351e01..bf0e4e40b 100644 Binary files a/Data/Map070.rxdata and b/Data/Map070.rxdata differ diff --git a/Data/Map071.rxdata b/Data/Map071.rxdata index 40c3d61a0..f9eef9e34 100644 Binary files a/Data/Map071.rxdata and b/Data/Map071.rxdata differ diff --git a/Data/Map073.rxdata b/Data/Map073.rxdata index 4b47281e5..22efb793c 100644 Binary files a/Data/Map073.rxdata and b/Data/Map073.rxdata differ diff --git a/Data/Map078.rxdata b/Data/Map078.rxdata index 442c4a1cf..66ac2782f 100644 Binary files a/Data/Map078.rxdata and b/Data/Map078.rxdata differ diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata index 92882a94f..81eaa05ca 100644 Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ diff --git a/Data/Map265.rxdata b/Data/Map265.rxdata index bfce866d5..509ab0d95 100644 Binary files a/Data/Map265.rxdata and b/Data/Map265.rxdata differ diff --git a/Data/Map357.rxdata b/Data/Map357.rxdata index e0552c5f9..7fdef649a 100644 Binary files a/Data/Map357.rxdata and b/Data/Map357.rxdata differ diff --git a/Data/Map609.rxdata b/Data/Map609.rxdata index 88e17532c..4d1fbdf5a 100644 Binary files a/Data/Map609.rxdata and b/Data/Map609.rxdata differ diff --git a/Data/Map635.rxdata b/Data/Map635.rxdata index 6fa2659da..2b0c87151 100644 Binary files a/Data/Map635.rxdata and b/Data/Map635.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index d77bc7a9f..0a7712fff 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6888348fc..35fce8b96 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/052_AddOns/New Items effects.rb b/Data/Scripts/052_AddOns/New Items effects.rb index c4c2b3ba2..48fe6390b 100644 --- a/Data/Scripts/052_AddOns/New Items effects.rb +++ b/Data/Scripts/052_AddOns/New Items effects.rb @@ -442,6 +442,8 @@ ItemHandlers::UseInField.add(:EMERGENCYWHISTLE, proc { |item| ItemHandlers::UseFromBag.add(:EMERGENCYWHISTLE, proc { |item| if isOnPinkanIsland() pbCommonEvent(COMMON_EVENT_PINKAN_WHISTLE) + $scene.reset_map(true) + updatePinkanBerryDisplay() next 1 end next 0 diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index e2a33ef81..04e1b7c68 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 81118b37b..6fd4dee80 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/map_connections.dat b/Data/map_connections.dat index 691cacef2..e48c967aa 100644 Binary files a/Data/map_connections.dat and b/Data/map_connections.dat differ diff --git a/Data/messages.dat b/Data/messages.dat index d38cfcdd5..20d9e4f1a 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ