DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes pokeradar and pokedex issues

Browse Source
This commit is contained in:
infinitefusion
2022-04-19 16:49:19 -04:00
parent cfb541925c
commit beafd528f0
16 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/001_Settings.rb
View File

@@ -6,7 +6,7 @@
module Settings
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
GAME_VERSION = '5.0.0'
GAME_VERSION_NUMBER = "5.0.19 - beta"
GAME_VERSION_NUMBER = "5.0.19.1 - beta"
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
@@ -354,7 +354,7 @@ module Settings
[485, 30, :DEINO,20,20], #Safari zone 3
[486, 30, :LARVITAR,20,20], #Safari zone 4
[487, 30, :BELDUM,20,20], #Safari zone 5
[59, 30, :DUNSPARSE,25,30], #Rt. 21
[59, 30, :DUNSPARCE,25,30], #Rt. 21
[171, 30, :BIDOOF,2,5], #Rt. 22
[143, 30, :RIOLU,25,25], #Rt. 23
[8, 30, :BUNEARY,12,13], #Rt. 24
@@ -365,7 +365,7 @@ module Settings
[288, 30, :VIGOROTH,40,45], #Rt. 32
[342, 30, :GOLETT,40,45], #Ruins of Alph
[261, 30, :BELLOSSOM,45,50], #Rt. 31
[261, 30, :BIBAREL,45,50], #Rt. 30
[262, 30, :BIBAREL,45,50], #Rt. 30
[265, 30, :KIRLIA,25,30], #Rt. 34
[267, 30, :SUDOWOODO,25,30], #Rt. 36
[300, 30, :ROSELIA,30,30], #National Park

5
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -174,7 +174,8 @@ def pbOnStepTaken(eventTriggered)
$PokemonGlobal.stepcount = 0 if !$PokemonGlobal.stepcount
$PokemonGlobal.stepcount += 1
$PokemonGlobal.stepcount &= 0x7FFFFFFF
repel_active = ($PokemonGlobal.repel > 0)
repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar
Events.onStepTaken.trigger(nil)
# Events.onStepTakenFieldMovement.trigger(nil,$game_player)
handled = [nil]
@@ -186,7 +187,7 @@ end
# Start wild encounters while turning on the spot
Events.onChangeDirection += proc {
repel_active = ($PokemonGlobal.repel > 0)
repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar
pbBattleOnStepTaken(repel_active) if !$game_temp.in_menu
}

4
Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb
View File

@@ -24,7 +24,6 @@ class Player < Trainer
def clear
@seen = {} #deprecated
@owned = {} #deprecated
@seen_standard = initStandardDexArray()
@seen_fusion = initFusionDexArray()
@seen_triple = {}
@@ -381,7 +380,7 @@ class Player < Trainer
# @param dex [Integer] Dex ID (-1 is the National Dex)
# @return [Boolean] whether the given Dex is unlocked
def unlocked?(dex)
return dex == -1
return dex == 0
# validate dex => Integer
# dex = @unlocked_dexes.length - 1 if dex == -1
# return @unlocked_dexes[dex] == true
@@ -400,6 +399,7 @@ class Player < Trainer
# if a species in the current region has been seen - doesn't look at other
# regions.
def refresh_accessible_dexes
@accessible_dexes = []
if self.unlocked?(0) && self.seen_any?
@accessible_dexes.push(-1)
end