From bab284c5036cfcff2500f43de0ec192c9abf6198 Mon Sep 17 00:00:00 2001 From: chardub Date: Sat, 15 Mar 2025 13:44:27 -0400 Subject: [PATCH] Fixes bad interaction between clothes menu and regi puzzle --- .gitignore | 1 + Data/Map813.rxdata | Bin 73757 -> 73751 bytes Data/MapInfos.rxdata | Bin 42773 -> 42773 bytes Data/Scripts/049_Compatibility/Constants.rb | 2 +- Data/Scripts/052_AddOns/GameplayUtils.rb | 6 +++--- Data/System.rxdata | Bin 31692 -> 31713 bytes 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a9b5f47cc..0757b7fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ Graphics/CustomBattlers/local_sprites/* Graphics/Pokemon/FusionIcons/* Graphics/CustomBattlers/spritesheets +Graphics/CustomBattlers/* Data/sprites/* Data/VERSION infinitefusion.sh diff --git a/Data/Map813.rxdata b/Data/Map813.rxdata index 582b61e2dc90bfb529bc17dca66e2986f995a87c..6884e3b7364985129768ade8c50c3b0c2e32af69 100644 GIT binary patch literal 73751 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 diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 8439473a8fe3647419623f25f75db235f48aa9d5..93f61750b76206c8047f01b72eca51e5d2e7b409 100644 GIT binary patch delta 30 mcmbPwj%n&SrVW2;nNF}zHms85IL2hnmC5vlX|sIYHw^&BTMPgI delta 30 mcmbPwj%n&SrVW2;nKYRv8&*kj9AmQP%4E98xLLmLn+5>5s0%p& diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 19929c3d4..786141aff 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -288,7 +288,7 @@ VAR_LATEST_CONSTELLATION=319 VAR_TRAINER_CARD_BACKGROUND_PRICE=329 VAR_GALLERY_TEAM_FLAGS=330 - +VAR_REGI_PUZZLE_SWITCH_PRESSED = 1122 ############## # COMMON EVENTS ################ diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb index 18af956da..0c997de10 100644 --- a/Data/Scripts/052_AddOns/GameplayUtils.rb +++ b/Data/Scripts/052_AddOns/GameplayUtils.rb @@ -654,11 +654,11 @@ def validate_regirock_steel_puzzle() end def registeel_ice_press_switch(letter) - order = pbGet(1) + order = pbGet(VAR_REGI_PUZZLE_SWITCH_PRESSED) solution = "ssBSBGG" # GGSBBss" registeel_ice_reset_switches() if !order.is_a?(String) order << letter - pbSet(1, order) + pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, order) if order == solution echoln "OK" pbSEPlay("Evolution start", nil, 130) @@ -674,7 +674,7 @@ def registeel_ice_reset_switches() pbSetSelfSwitch(switch_id, "A", false) echoln "reset" + switch_id.to_s end - pbSet(1, "") + pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, "") end def regirock_steel_move_boulder() diff --git a/Data/System.rxdata b/Data/System.rxdata index 46ab33c9b853310d10ff1b1004f1e545a641ce13..196d54dd4457db4d49c1be09a2017cac44c5f466 100644 GIT binary patch delta 67 zcmV-J0KEUq_W|Me0kGd34HfMM13C{tWpiU;aAlLhc^R_>9j;mx8FFQ3X>)XCWo%z* ZV`X1+cWHEEXp^*e?*jrY1GA-gCj+H`8f^do delta 46 zcmV+}0MY;9_W{iJ0kGd34ch?B0Xh#rWpiU;aAlK#c^R_>9j;md0F%gf?*aksv$}XE E1KceWI{*Lx