Fixes bad interaction between clothes menu and regi puzzle

This commit is contained in:
chardub
2025-03-15 13:44:27 -04:00
parent 147658bccb
commit bab284c503
6 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
Graphics/CustomBattlers/local_sprites/* Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/* Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets Graphics/CustomBattlers/spritesheets
Graphics/CustomBattlers/*
Data/sprites/* Data/sprites/*
Data/VERSION Data/VERSION
infinitefusion.sh infinitefusion.sh

Binary file not shown.

Binary file not shown.

View File

@@ -288,7 +288,7 @@ VAR_LATEST_CONSTELLATION=319
VAR_TRAINER_CARD_BACKGROUND_PRICE=329 VAR_TRAINER_CARD_BACKGROUND_PRICE=329
VAR_GALLERY_TEAM_FLAGS=330 VAR_GALLERY_TEAM_FLAGS=330
VAR_REGI_PUZZLE_SWITCH_PRESSED = 1122
############## ##############
# COMMON EVENTS # COMMON EVENTS
################ ################

View File

@@ -654,11 +654,11 @@ def validate_regirock_steel_puzzle()
end end
def registeel_ice_press_switch(letter) def registeel_ice_press_switch(letter)
order = pbGet(1) order = pbGet(VAR_REGI_PUZZLE_SWITCH_PRESSED)
solution = "ssBSBGG" # GGSBBss" solution = "ssBSBGG" # GGSBBss"
registeel_ice_reset_switches() if !order.is_a?(String) registeel_ice_reset_switches() if !order.is_a?(String)
order << letter order << letter
pbSet(1, order) pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, order)
if order == solution if order == solution
echoln "OK" echoln "OK"
pbSEPlay("Evolution start", nil, 130) pbSEPlay("Evolution start", nil, 130)
@@ -674,7 +674,7 @@ def registeel_ice_reset_switches()
pbSetSelfSwitch(switch_id, "A", false) pbSetSelfSwitch(switch_id, "A", false)
echoln "reset" + switch_id.to_s echoln "reset" + switch_id.to_s
end end
pbSet(1, "") pbSet(VAR_REGI_PUZZLE_SWITCH_PRESSED, "")
end end
def regirock_steel_move_boulder() def regirock_steel_move_boulder()

Binary file not shown.