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

Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Browse Source
This commit is contained in:
infinitefusion
2024-06-28 19:50:49 -04:00
parent 63e3d6970c cfc4afa5ae
commit 4ec7496fee
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/CommonEvents.rxdata
View File

Binary file not shown.

BIN
Data/MapInfos.rxdata
View File

Binary file not shown.

34
Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
View File

@@ -41,17 +41,17 @@ def Kernel.initRandomTypeArray()
$game_variables[VAR_GYM_TYPES_ARRAY] = $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] ? typesArray : GYM_TYPES_ARRAY $game_variables[VAR_GYM_TYPES_ARRAY] = $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] ? typesArray : GYM_TYPES_ARRAY
end end
def setRivalStarter(starter1, starter2, starter3, choice) # def setRivalStarter(starter1, starter2, starter3, choice)
starters = [starter1, starter2, starter3] # starters = [starter1, starter2, starter3]
starters.delete_at(choice) # starters.delete_at(choice)
if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON # if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
rivalStarter = starters[0] # rivalStarter = starters[0]
else # else
rivalStarter = starters[0] * NB_POKEMON + starters[1] # rivalStarter = starters[0] * NB_POKEMON + starters[1]
end # end
pbSet(VAR_RIVAL_STARTER, rivalStarter) # pbSet(VAR_RIVAL_STARTER, rivalStarter)
$game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true # $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
end # end
def setRivalStarterSpecific(rivalStarter) def setRivalStarterSpecific(rivalStarter)
pbSet(VAR_RIVAL_STARTER, rivalStarter) pbSet(VAR_RIVAL_STARTER, rivalStarter)
@@ -734,13 +734,13 @@ def fixRivalStarter()
end end
starterChoice = pbGet(7) starterChoice = pbGet(7)
s1 = $PokemonGlobal.psuedoBSTHash[1] setRivalStarter(0, 1) if starterChoice == 2
s2 = $PokemonGlobal.psuedoBSTHash[4] setRivalStarter(0, 2) if starterChoice == 1
s3 = $PokemonGlobal.psuedoBSTHash[7] setRivalStarter(1, 2) if starterChoice == 0
setRivalStarter(s3, s2, s1, starterChoice) setRivalStarter(0, 1) if starterChoice > 2
echoln pbGet(VAR_RIVAL_STARTER)
#evolve en fct des badges #evolve en fct des badges
rivalStarter = pbGet(250) rivalStarter = pbGet(VAR_RIVAL_STARTER)
if $game_switches[68] #beat blue cerulean if $game_switches[68] #beat blue cerulean
rivalStarter = evolveBody(rivalStarter) rivalStarter = evolveBody(rivalStarter)

1
Data/Scripts/051_AddOns/GameplayUtils.rb
View File

@@ -1110,6 +1110,7 @@ def setRivalStarter(starterIndex1,starterIndex2)
starter = GameData::Species.get(starterSpecies.get_baby_species(false)).id_number starter = GameData::Species.get(starterSpecies.get_baby_species(false)).id_number
end end
pbSet(VAR_RIVAL_STARTER,starter) pbSet(VAR_RIVAL_STARTER,starter)
$game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
return starter return starter
end end

BIN
Data/System.rxdata
View File

Binary file not shown.

2
Data/VERSION
View File

@@ -1 +1 @@
6.1 6.2