Update 6.8

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

@@ -2,4 +2,20 @@
 # ANIMATIONS
 ################
 DUST_ANIMATION_ID=2
-VIRUS_ANIMATION_ID=10
+VIRUS_ANIMATION_ID=10
+
+TELEPORT_ANIMATION_ID=32
+EXPLODE_ANIMATION=15
+SPARKLE_ANIMATION=29
+
+PUDDLE_ANIMATION_ID = 31
+
+
+
+EXCLAMATION_ANIMATION_ID = 3
+
+QUESTION_MARK_ANIMATION_ID = 4
+ANGRY_ANIMATION_ID = 24
+ANGRY_SHORT_ANIMATION_ID = 34
+
+FUSE_ANIMATION_ID = 33

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

@@ -0,0 +1 @@
+SE_EXIT = "Exit Door"

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

@@ -2,6 +2,7 @@
 # VARIABLES #
 #############
 VAR_CURRENT_MART=291
+VAR_CURRENT_CITY=291
 VAR_CURRENT_CITY_NUMERICAL_ID=14 #for wondertrade/pokemarts
 
 VAR_SPEED_UP_TOGGLE_SPEED=23
@@ -101,7 +102,7 @@ VAR_RANDOMIZER_WILD_POKE_BST=197
 VAR_RANDOMIZER_TRAINER_BST=195
 VAR_GYM_TYPES_ARRAY=151
 VAR_CURRENT_GYM_TYPE=152
-
+VAR_CURRENT_GYM_TYPE_NAME = 1000
 #constellations
 VAR_CONSTELLATION_IVYSAUR=301
 VAR_CONSTELLATION_WARTORTLE=302
@@ -130,4 +131,19 @@ VAR_REGI_PUZZLE_SWITCH_PRESSED = 1122
 
 VAR_HOENN_STARTER = 1002
 VAR_HOENN_CHOSEN_STARTER_INDEX = 1003
-VAR_ORICORIO_TO_FIND=1021
+VAR_ORICORIO_TO_FIND=1021
+
+VAR_MAUVILLE_GYM_ELECTRICITY_MAP = 336
+
+VAR_TRENDY_PHRASE = 1025
+
+
+VAR_MAGMA_SONG = 1034
+VAR_AQUA_SONG = 1035
+
+VAR_NB_WILD_FUSING_SEEN = 1036
+
+VAR_TIME_TRIAL_START =1051
+VAR_TIME_TRIAL_SECONDS =1052
+
+VAR_CONTEST_CATEGORY = 1048

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

@@ -24,6 +24,7 @@ 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")
 
 NB_POKEMON = Settings::NB_POKEMON#809#420 #351  #aussi CONST_NB_POKE
 CONST_NB_POKE = NB_POKEMON

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

@@ -5,14 +5,28 @@ MAP_TEMPLATE_EVENTS = Settings::GAME_ID == :IF_KANTO ? 175 : 21
 MAP_SECRET_BASES=64
 
 
+#Sound effects
+SE_FLEE = "Flee"
 
 ##
 # Template events
 #
 TEMPLATE_EVENT_SILHOUETTE = 7
-TEMPLATE_EVENT_SURF_SPLASH = 2
 TEMPLATE_EVENT_SECRET_BASE_FURNITURE = 3
 
+TEMPLATE_EVENT_OW_POKEMON_SKITTISH = 2
+
+TEMPLATE_EVENT_OW_POKEMON_NORMAL = 2
+TEMPLATE_EVENT_OW_POKEMON_STILL = 9
+
+
+MOVE_TYPE_FIXED= 0
+MOVE_TYPE_RANDOM = 1
+MOVE_TYPE_TOWARDS_PLAYER = 2
+MOVE_TYPE_AWAY_PLAYER = 4
+
+MOVE_TYPE_CUSTOM = 3
+
 ##
 # Tilesets
 #
@@ -107,4 +121,47 @@ KANTO_OUTDOOR_MAPS = [
   468, # Pokemon Tower
   469, # Pokemon Tower
 
-]
+]
+
+
+#Towns
+MAP_RUSTBORO = 47
+MAP_DEWFORD = 51
+MAP_SLATEPORT = 6
+MAP_MAUVILLE = 73
+MAP_VERDANTURF = 18
+MAP_LAVARIDGE = 994   #todo: Temp
+MAP_PETALBURG = 7
+MAP_FORTREE = 992  #todo: Temp
+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_PACIFIDLOG = 951 #todo: Temp
+MAP_MAGMA_CAMP = 11
+MAP_AQUA_CAMP = 39
+
+# Routes
+MAP_ROUTE_102 = 10
+MAP_ROUTE_104 = 20
+MAP_ROUTE_109 = 39
+MAP_ROUTE_110 = 71
+MAP_ROUTE_111 = 77
+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_124 = 962 #todo: Temp
+MAP_ROUTE_128 = 958 #todo: Temp
+
+# Dungeons/Areas
+MAP_PETALBURG_WOODS = 30
+MAP_RUSTURF_TUNNEL = 0
+MAP_MT_CHIMNEY = 983
+MAP_DESERT = 555 #todo: Temp
+MAP_SHOAL_CAVE = 444 #todo: Temp
+MAP_MT_PYRE = 964 #todo: Temp
+MAP_METEOR_FALLS = 985 #todo: Temp

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

@@ -21,6 +21,7 @@ SWITCH_DOUBLE_ABILITIES=773
 SWITCH_SINGLE_SPECIES_MODE=790
 
 #Gameplay
+SWITCH_TIME_PAUSED = 27
 SWITCH_DURING_INTRO = 917
 SWITCH_CHOOSING_STARTER=3
 SWITCH_GOT_BADGE_1 = 4
@@ -76,6 +77,7 @@ SWITCH_GOT_DIVE = 317
 SWITCH_GOT_ROCK_CLIMB = 661
 SWITCH_GOT_WATERFALL = 388
 
+SWITCH_KANTO_STARTERS=887
 SWITCH_JOHTO_STARTERS=884
 SWITCH_HOENN_STARTERS=885
 SWITCH_SINNOH_STARTERS=886
@@ -192,6 +194,18 @@ SWITCH_UPDATED_TO_SPRITESHEETS_SPRITES=1117
 #
 WEARING_ROCKET_OUTFIT = 1038
 
+SWITCH_JOINED_TEAM_AQUA=2042
+SWITCH_JOINED_TEAM_MAGMA=2043
 
 ## Hoenn only
-SWITCH_SPORES_REPEL =2050
+SWITCH_SPORES_REPEL =2050
+SWITCH_FOMANTIS_GUARANTEED_FLOWER = 672
+SWITCH_PETALBURG_WOODS_UNLOCKED = 2079
+SWITCH_RIVAL_BATTLE_2 = 2117
+SWITCH_QUEST_BEACH_BALL_COMPLETE= 2140
+SWITCH_AQUA_CAMP = 2114
+SWITCH_WILD_FUSION_QUEST = 2159
+SWITCH_TIME_TRIAL = 2196
+
+SWITCH_UNLOCKED_WALLPAPER_LOTTERY = 1995
+SWITCH_UNLOCKED_TRANSFER_BOX = 1994