6.4 update (minus sprites)

Data/Scripts/049_Compatibility/Constants.rb

@@ -75,9 +75,15 @@ SWITCH_NIGHTMARE_EFFECT= 805
 SWITCH_JOHTO_STARTERS=884
 SWITCH_HOENN_STARTERS=885
 SWITCH_SINNOH_STARTERS=886
+SWITCH_KALOS_STARTERS=888
+
 SWITCH_CUSTOM_STARTERS=883
 
-
+SWITCH_JOINED_TEAM_ROCKET=1037
+SWITCH_PINKAN_SIDE_ROCKET=1099
+SWITCH_PINKAN_SIDE_POLICE=1100
+SWITCH_LEAVING_PINKAN_ISLAND=1113
+SWITCH_BLOCK_PINKAN_WHISTLE=1111
 
 VAR_ORICORIO_FLOWERS = 276
 #Randomizer Switches
@@ -121,7 +127,7 @@ SWITCH_RANDOMIZED_WILD_POKEMON_TO_FUSIONS=829
 SWITCH_RANDOM_WILD_LEGENDARIES=1031
 SWITCH_RANDOM_TRAINER_LEGENDARIES=1032
 SWITCH_RANDOM_GYM_LEGENDARIES=1033
-
+SWITCH_DONT_RANDOMIZE=890
 
 #Other switches
 SWITCH_RACE_BIKE = 984
@@ -141,9 +147,10 @@ SWITCH_SUPER_SLOW_SPEED=649
 SWITCH_LOUNGE_BATTLE_LEVEL = 240
 SWITCH_CANNOT_CATCH_POKEMON = 75
 SWITCH_UNLOCKED_POKEMON_HATS = 770
+SWITCH_ILEX_FOREST_SPOOKED_POKEMON = 1021
 
 SWITCH_LOCK_PLAYER_MOVEMENT = 815
-
+SWITCH_TEAMED_WITH_ERIKA_SEWERS=141
 SWITCH_BAND_DRUMMER = 1004
 SWITCH_BAND_ACOUSTIC_GUITAR = 1005
 SWITCH_BAND_ELECTRIC_GUITAR = 1006
@@ -152,10 +159,29 @@ SWITCH_BAND_FLUTE = 1008
 
 SWITCH_SELECTING_CLOTHES = 804
 
+SWITCH_KANTO_HAIR_COLLECTION = 1059
+SWITCH_JOHTO_HAIR_COLLECTION = 1060
+SWITCH_HOENN_HAIR_COLLECTION = 1061
+SWITCH_SINNOH_HAIR_COLLECTION = 1062
+SWITCH_UNOVA_HAIR_COLLECTION = 1063
+SWITCH_KALOS_HAIR_COLLECTION = 1064
+SWITCH_ALOLA_HAIR_COLLECTION = 1065
+SWITCH_GALAR_HAIR_COLLECTION = 1066
+SWITCH_PALDEA_HAIR_COLLECTION = 1067
+SWITCH_GEN10_HAIR_COLLECTION = 1068
+
+SWITCH_UPDATED_TO_SPRITESHEETS_SPRITES=1117
+#OUTFITS
+#
+WEARING_ROCKET_OUTFIT = 1038
 
 #############
 # VARIABLES #
 #############
+VAR_CURRENT_MART=291
+VAR_CURRENT_CITY_NUMERICAL_ID=14 #for wondertrade/pokemarts
+
+
 VAR_SINGLE_POKEMON_MODE=251
 SINGLE_POKEMON_MODE_VAR=251 #c'est appellé comme ca en qqpart dans un event pis ca me tente pas de chercher ou
 
@@ -185,8 +211,18 @@ VAR_STAT_NB_SANDCASTLES=163
 VAR_STAT_GAMBLER_WINS=43
 VAR_STAT_GAMBLER_LOSSES=44
 VAR_STAT_HOTELS_SPENT=225
+VAR_NB_EGGS_HATCHED=298
+
+
 VAR_STAT_QUESTS_ACCEPTED=96
 VAR_STAT_QUESTS_COMPLETED=98
+VAR_NB_ROCKET_MISSIONS = 286
+
+VAR_BOUTIQUE_OUTFIT=290
+VAR_FISHING_CONTEST_RECORD=294
+
+
+
 VAR_STAT_NB_SECRETS=193
 VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE=267
 VAR_STAT_FUSION_QUIZ_NB_TIMES=268
@@ -196,7 +232,10 @@ VAR_LUNAR_FEATHERS=282
 
 VAR_FOSSIL=271
 
-
+VAR_SSANNE_MENU=313
+VAR_TEMP_SSANNE_ORDER=314
+VAR_TEMP_SSANNE_PLATE=325
+VAR_SSANNE_DISHES_HELD_ARRAY=316
 
 VAR_BATTLE_TOWER_MIN_BST = 257
 VAR_BATTLE_TOWER_MAX_BST = 258
@@ -210,6 +249,12 @@ VAR_NEXT_ARTIST_FORMATTED = 264
 VAR_RADIO_POINTS=266
 VAR_TRAINER_GENDER=52
 VAR_TRAINER_AGE=99
+VAR_ROCKET_NAME=25
+
+VAR_NB_CRIMES_REPORTED=300
+VAR_EXOTIC_POKEMON_ID=327
+VAR_TYPE_EXPERTS_BEATEN=332
+TOTAL_NB_TYPE_EXPERTS=331
 
 #Randomizer
 VAR_RANDOMIZER_WILD_POKE_BST=197
@@ -238,6 +283,8 @@ VAR_CONSTELLATION_SHARPEDO=317
 VAR_CONSTELLATION_ARCEUS=318
 
 VAR_LATEST_CONSTELLATION=319
+VAR_TRAINER_CARD_BACKGROUND_PRICE=329
+VAR_GALLERY_TEAM_FLAGS=330
 
 
 ##############
@@ -247,6 +294,11 @@ COMMON_EVENT_REGI_TABLET = 84
 COMMON_EVENT_SILHOUETTE = 87
 COMMON_EVENT_HOTEL = 12
 COMMON_EVENT_SINGLESPECIES_MODE = 73
+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
 
 
 ##############

Data/Scripts/049_Compatibility/MarinUtilities.rb

@@ -980,45 +980,45 @@ class SpriteHash
   end
 end
 
-# class ByteWriter
-#   def initialize(filename)
-#     @file = File.new(filename, "wb")
-#   end
-#
-#   def <<(*data)
-#     write(*data)
-#   end
-#
-#   def write(*data)
-#     data.each do |e|
-#       if e.is_a?(Array)
-#         e.each { |item| write(item) }
-#       elsif e.is_a?(Numeric)
-#         @file.putc e
-#       else
-#         raise "Invalid data for writing."
-#       end
-#     end
-#   end
-#
-#   def write_int(int)
-#     self << ByteWriter.to_bytes(int)
-#   end
-#
-#   def close
-#     @file.close
-#     @file = nil
-#   end
-#
-#   def self.to_bytes(int)
-#     return [
-#       (int >> 24) & 0xFF,
-#       (int >> 16) & 0xFF,
-#       (int >> 8) & 0xFF,
-#       int & 0xFF
-#     ]
-#   end
-# end
+class ByteWriter
+  def initialize(filename)
+    @file = File.new(filename, "wb")
+  end
+
+  def <<(*data)
+    write(*data)
+  end
+
+  def write(*data)
+    data.each do |e|
+      if e.is_a?(Array)
+        e.each { |item| write(item) }
+      elsif e.is_a?(Numeric)
+        @file.putc e
+      else
+        raise "Invalid data for writing."
+      end
+    end
+  end
+
+  def write_int(int)
+    self << ByteWriter.to_bytes(int)
+  end
+
+  def close
+    @file.close
+    @file = nil
+  end
+
+  def self.to_bytes(int)
+    return [
+      (int >> 24) & 0xFF,
+      (int >> 16) & 0xFF,
+      (int >> 8) & 0xFF,
+      int & 0xFF
+    ]
+  end
+end
 
 class Bitmap
   def save_to_png(filename)
@@ -1057,9 +1057,12 @@ class Bitmap
         data << px.alpha
       end
     end
+
     # Zlib deflation
-    smoldata = Zlib::Deflate.deflate(data.pack("C*")).bytes.map
-    # data chunk length
+    smoldata = Zlib::Deflate.deflate(data.pack("C*"))
+    smoldata = smoldata.bytes
+
+    # Data chunk length
     f.write_int smoldata.size
     # IDAT
     f << [0x49, 0x44, 0x41, 0x54]
@@ -1074,9 +1077,11 @@ class Bitmap
     f << [0x49, 0x45, 0x4E, 0x44]
     # CRC32 checksum
     f.write_int Zlib::crc32([0x49, 0x45, 0x4E, 0x44].pack("C*"))
+
     f.close
     return nil
   end
+
 end
 
 # Stand-alone methods

Data/Scripts/049_Compatibility/UtilityMethods.rb

@@ -62,7 +62,7 @@ def extract_custom_sprites_that_evolve_into_non_customs(includeOnlyNextEvos=true
       next if nextEvolutions.empty?
       for evolution in nextEvolutions
         evoSpecies = evolution[0]
-        if !customSpriteExists(evoSpecies) && !alreadyWritten.include?(evoSpecies)
+        if !customSpriteExistsSpecies(evoSpecies) && !alreadyWritten.include?(evoSpecies)
                   body = getBodyID(evoSpecies)
                   head = getHeadID(evoSpecies,body)
                   f.write((evoSpecies.to_s) +";")
@@ -108,7 +108,7 @@ def extract_pokes_with_non_custom_final_evos(includeOnlyNextEvos=true)
       for evolution in nextEvolutions
         evoSpecies = evolution[0]
         isFinalEvo = GameData::Species.get(evoSpecies).get_evolutions.empty?
-        if !customSpriteExists(evoSpecies) && !alreadyWritten.include?(evoSpecies) && isFinalEvo
+        if !customSpriteExistsSpecies(evoSpecies) && !alreadyWritten.include?(evoSpecies) && isFinalEvo
           body = getBodyID(evoSpecies)
           head = getHeadID(evoSpecies,body)
           f.write((evoSpecies.to_s) +";")
@@ -158,7 +158,7 @@ def extract_incomplete_evolution_lines
       non_customs = []
       nbCustoms=0
       for stage in evolutions
-        if !customSpriteExists(stage)
+        if !customSpriteExistsSpecies(stage)
           non_customs << stage
         else
           nbCustoms+=1