Release 6.9.0

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_Animations.rb

@@ -10,12 +10,17 @@ SPARKLE_ANIMATION=29
 
 PUDDLE_ANIMATION_ID = 31
 
+ANIMATION_SPLASH_SMALL = 21
 
+HEART_ANIMATION_SHORT_ID = 40
 
 EXCLAMATION_ANIMATION_ID = 3
+SOOT_DUST_ANIMATION = 36
+
 
 QUESTION_MARK_ANIMATION_ID = 4
 ANGRY_ANIMATION_ID = 24
 ANGRY_SHORT_ANIMATION_ID = 34
+NOISE_ANIMATION_ID = 12
 
 FUSE_ANIMATION_ID = 33

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_GameVariables.rb

@@ -117,11 +117,14 @@ VAR_CONSTELLATION_URSARING=310
 VAR_CONSTELLATION_LUGIA=311
 VAR_CONSTELLATION_HOOH=312
 VAR_CONSTELLATION_CELEBI=313
-VAR_CONSTELLATION_SLAKING=314
-VAR_CONSTELLATION_JIRACHI=315
-VAR_CONSTELLATION_TYRANTRUM=316
-VAR_CONSTELLATION_SHARPEDO=317
+
+VAR_CONSTELLATION_SHARPEDO=337
+VAR_CONSTELLATION_SLAKING=338
+VAR_CONSTELLATION_JIRACHI=339
+
 VAR_CONSTELLATION_ARCEUS=318
+VAR_CONSTELLATION_TYRANTRUM=316
+
 
 VAR_LATEST_CONSTELLATION=319
 VAR_TRAINER_CARD_BACKGROUND_PRICE=329
@@ -146,4 +149,8 @@ VAR_NB_WILD_FUSING_SEEN = 1036
 VAR_TIME_TRIAL_START =1051
 VAR_TIME_TRIAL_SECONDS =1052
 
-VAR_CONTEST_CATEGORY = 1048
+VAR_CONTEST_CATEGORY = 1048
+
+VAR_HOENN_SAFARI_NB_BALLS = 1049
+VAR_HOENN_SAFARI_FEEDER_DISCOUNT = 1050
+VAR_SAFARI_POINTS = 1054

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_General.rb

@@ -25,9 +25,12 @@ GENDER_MALE=1
 MELOETTA_BAND_NAME = _INTL("Miss Melody and the Mystic Musicians")
 SUCKY_BAND_NAME = _INTL("MooMoo Milk")
 COSMETIC_CURRENCY_NAME = _INTL("Glimmer Coins")
+def get_cosmetic_currency_name()
+  _INTL("Glimmer Coins")
+end
 
 NB_POKEMON = Settings::NB_POKEMON#809#420 #351  #aussi CONST_NB_POKE
 CONST_NB_POKE = NB_POKEMON
 
 DOSSIERCUSTOMSPRITES = "CustomBattlers"
-BATTLERSPATH = "Battlers"
+BATTLERSPATH = "Battlers"

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_Maps.rb

@@ -130,14 +130,14 @@ MAP_DEWFORD = 51
 MAP_SLATEPORT = 6
 MAP_MAUVILLE = 73
 MAP_VERDANTURF = 18
-MAP_LAVARIDGE = 994   #todo: Temp
+MAP_LAVARIDGE = 135
 MAP_PETALBURG = 7
-MAP_FORTREE = 992  #todo: Temp
+MAP_FORTREE = 142
 MAP_MOSSDEEP = 990  #todo: Temp
 MAP_SOOTOPOLIS = 989  #todo: Temp
 MAP_LEAGUE = 988  #todo: Temp
 MAP_EVERGRANDE = 988  #todo: Temp
-MAP_FALLARBOR = 993  #todo: Temp
+MAP_FALLARBOR = 1171
 MAP_PACIFIDLOG = 951 #todo: Temp
 MAP_MAGMA_CAMP = 11
 MAP_AQUA_CAMP = 39
@@ -145,23 +145,48 @@ MAP_AQUA_CAMP = 39
 # Routes
 MAP_ROUTE_102 = 10
 MAP_ROUTE_104 = 20
+MAP_ROUTE_104_SOUTH = 12
+MAP_ROUTE_105 = 50
+MAP_ROUTE_106 = 49
+MAP_ROUTE_107 = 37
+MAP_ROUTE_108 = 38
 MAP_ROUTE_109 = 39
 MAP_ROUTE_110 = 71
 MAP_ROUTE_111 = 77
+MAP_ROUTE_112 = 113
+MAP_ROUTE_112_NORTH = 119
+
+
 MAP_ROUTE_115 = 65
 MAP_ROUTE_116 = 31
-MAP_ROUTE_113 = 973 #todo: Temp
-MAP_ROUTE_119 = 967 #todo: Temp
-MAP_ROUTE_120 = 966 #todo: Temp
-MAP_ROUTE_121 = 965 #todo: Temp
+MAP_ROUTE_113 = 116
+MAP_ROUTE_119_SOUTH = 133
+MAP_ROUTE_119_NORTH = 137
+
+MAP_ROUTE_120 = 147
+MAP_ROUTE_121 = 148
+MAP_ROUTE_123 = 144
 MAP_ROUTE_124 = 962 #todo: Temp
 MAP_ROUTE_128 = 958 #todo: Temp
 
+MAP_SCORCHED_SLAB = 147
+
+MAP_SAFARI_ENTRANCE = 155
+MAP_SAFARI_1 = 149
+MAP_SAFARI_2 = 150
+MAP_SAFARI_3 = 151
+MAP_SAFARI_4 = 152
+MAP_SAFARI_5 = 153
+MAP_SAFARI_6 = 154
+
 # Dungeons/Areas
 MAP_PETALBURG_WOODS = 30
 MAP_RUSTURF_TUNNEL = 0
-MAP_MT_CHIMNEY = 983
-MAP_DESERT = 555 #todo: Temp
+MAP_MT_CHIMNEY = 126
+MAP_DESERT = 124
+MAP_GRANITE_CAVE = 32
 MAP_SHOAL_CAVE = 444 #todo: Temp
 MAP_MT_PYRE = 964 #todo: Temp
-MAP_METEOR_FALLS = 985 #todo: Temp
+MAP_METEOR_FALLS = 129
+MAP_DESERT_UNDERPASS = 19
+MAP_JAGGED_PASS = 132

Data/Scripts/052_InfiniteFusion/Constants/CONSTANTS_Switches.rb

@@ -102,6 +102,8 @@ SWITCH_CAUGHT_MELOETTA = 750
 SWITCH_FINISHED_ROCKET_QUESTS_CERULEAN = 1116
 SWITCH_FINISHED_ROCKET_QUESTS_CELADON = 1106
 
+SWITCH_NO_REPEL = 1147
+
 ##Randomizer & System
 SWITCH_RANDOM_WILD_TO_FUSION=953
 SWITCH_RANDOMIZED_AT_LEAST_ONCE = 855
@@ -111,9 +113,14 @@ SWITCH_RANDOM_WILD = 778
 SWITCH_RANDOM_WILD_AREA = 777
 
 SWITCH_RANDOM_TRAINERS = 987
+SWITCH_RANDOM_TRAINERS_CUSTOMS_ONLY = 600
+
 SWITCH_RANDOM_STARTERS = 954
 SWITCH_RANDOM_STARTER_FIRST_STAGE = 771
 
+SWITCH_RANDOM_REFERENCE_SPRITES = 1187
+
+
 SWITCH_RANDOM_ITEMS_GENERAL=759
 SWITCH_RANDOM_ITEMS=751
 SWITCH_RANDOM_FOUND_ITEMS=755
@@ -144,6 +151,10 @@ SWITCH_RANDOM_WILD_LEGENDARIES=1031
 SWITCH_RANDOM_TRAINER_LEGENDARIES=1032
 SWITCH_RANDOM_GYM_LEGENDARIES=1033
 SWITCH_DONT_RANDOMIZE=890
+SWITCH_RANDOM_WILD_EGG_GROUP = 1150
+
+SWITCH_RANDOM_TRAINER_EGG_GROUP = 1148
+SWITCH_RANDOM_GYM_EGG_GROUP = 1149
 
 #Other switches
 SWITCH_RACE_BIKE = 984
@@ -207,5 +218,10 @@ SWITCH_AQUA_CAMP = 2114
 SWITCH_WILD_FUSION_QUEST = 2159
 SWITCH_TIME_TRIAL = 2196
 
+SWITCH_WAILMER_EGGS_QUEST = 2167
+
+SWITCH_SAFARI_FLOWERS_PLANTED = 2258
+
 SWITCH_UNLOCKED_WALLPAPER_LOTTERY = 1995
-SWITCH_UNLOCKED_TRANSFER_BOX = 1994
+SWITCH_UNLOCKED_TRANSFER_BOX = 1994
+SWITCH_ENCOUNTERED_A_POKEMON = 2209 #Used for challenge where you need to get through a place without enountering wild POkemon

Data/Scripts/052_InfiniteFusion/Constants/COSNTANTS_CommonEvents.rb

@@ -9,4 +9,6 @@ COMMON_EVENT_OUTFIT = 80
 COMMON_EVENT_FIX_GAME = 16
 COMMON_EVENT_IDLE_HAT = 100
 COMMON_EVENT_PINKAN_WHISTLE = 106
-COMMON_EVENT_PINKAN_BACK_TO_BEGIN = 103
+COMMON_EVENT_PINKAN_BACK_TO_BEGIN = 103
+
+COMMON_EVENT_RESHUFFLE = 28