diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index ac0b547af..34ae21224 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975 return DesertRuins_MapScript1_22D989: @ 822D989 - call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3b6d94f0b..3d0efa1ca 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -16,7 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44 return IslandCave_MapScript1_238E58: @ 8238E58 - call_if_unset FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238E62 + call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62 end IslandCave_EventScript_238E62:: @ 8238E62 @@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag FLAG_SYS_BRAILLE_REGICE_PUZZLE + setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED end IslandCave_EventScript_238EEF:: @ 8238EEF lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 - goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F13 + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle @@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 - goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F41 + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 diff --git a/include/constants/flags.h b/include/constants/flags.h index a7bc4c88e..b440ba78b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1352,8 +1352,8 @@ #define FLAG_SYS_ENC_UP_ITEM (SYSTEM_FLAGS + 0x4D) #define FLAG_SYS_ENC_DOWN_ITEM (SYSTEM_FLAGS + 0x4E) #define FLAG_SYS_BRAILLE_DIG (SYSTEM_FLAGS + 0x4F) -#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETE (SYSTEM_FLAGS + 0x50) -#define FLAG_SYS_BRAILLE_REGICE_PUZZLE (SYSTEM_FLAGS + 0x51) +#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETED (SYSTEM_FLAGS + 0x50) +#define FLAG_SYS_BRAILLE_REGICE_COMPLETED (SYSTEM_FLAGS + 0x51) #define FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED (SYSTEM_FLAGS + 0x52) #define FLAG_SYS_HAS_EON_TICKET (SYSTEM_FLAGS + 0x53) diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index f89491940..07b941f11 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -117,7 +117,7 @@ bool8 CheckRelicanthWailord(void) void ShouldDoBrailleRegirockEffectOld(void) { /* - if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -141,7 +141,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -241,7 +241,7 @@ void SealedChamberShakingEffect(u8 taskId) // moved later in the function because it was rewritten. bool8 ShouldDoBrailleRegirockEffect(void) { - if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { @@ -287,7 +287,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(16, 27, 0xE34); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -334,7 +334,7 @@ void DoBrailleRegisteelEffect(void) void DoBrailleWait(void) { /* - if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED)) CreateTask(Task_BrailleWait, 0x50); } @@ -432,7 +432,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ISLAND_CAVE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ISLAND_CAVE)) { - if (FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) + if (FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED)) return FALSE; if (FlagGet(FLAG_TEMP_2) == FALSE) return FALSE;