diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry_blender.c | 4 | ||||
| -rw-r--r-- | src/braille_puzzles.c | 8 | ||||
| -rw-r--r-- | src/field_specials.c | 12 | ||||
| -rw-r--r-- | src/match_call.c | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index a5b940189..8e0bc8043 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1124,7 +1124,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) sBerryBlenderData->playersNo = 2; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); - if (!FlagGet(FLAG_0x340)) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS)) StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]); else StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]); @@ -1647,7 +1647,7 @@ static void sub_80808D4(void) if (gSpecialVar_0x8004 == 1) { - if (!FlagGet(FLAG_0x340)) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS)) sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10); else sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10); diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 4765141de..76394e937 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -431,9 +431,9 @@ bool8 ShouldDoBrailleRegicePuzzle(void) { if (FlagGet(FLAG_SYS_BRAILLE_WAIT) != FALSE) return FALSE; - if (FlagGet(FLAG_0x002) == FALSE) + if (FlagGet(FLAG_TEMP_2) == FALSE) return FALSE; - if (FlagGet(FLAG_0x003) == TRUE) + if (FlagGet(FLAG_TEMP_3) == TRUE) return FALSE; for (i = 0; i < 36; i++) @@ -474,8 +474,8 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } } - FlagSet(FLAG_0x003); - FlagClear(FLAG_0x002); + FlagSet(FLAG_TEMP_3); + FlagClear(FLAG_TEMP_2); } return FALSE; diff --git a/src/field_specials.c b/src/field_specials.c index fcef56f14..a74bf40f6 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1328,7 +1328,7 @@ u16 GetSlotMachineId(void) bool8 FoundAbandonedShipRoom1Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_1F; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1340,7 +1340,7 @@ bool8 FoundAbandonedShipRoom1Key(void) bool8 FoundAbandonedShipRoom2Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_20; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1352,7 +1352,7 @@ bool8 FoundAbandonedShipRoom2Key(void) bool8 FoundAbandonedShipRoom4Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_21; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1364,7 +1364,7 @@ bool8 FoundAbandonedShipRoom4Key(void) bool8 FoundAbandonedShipRoom6Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_22; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1508,7 +1508,7 @@ static void sub_8139620(u8 taskId) bool8 FoundBlackGlasses(void) { - return FlagGet(FLAG_HIDDEN_ITEM_BLACK_GLASSES); + return FlagGet(FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES); } void SetRoute119Weather(void) @@ -4081,7 +4081,7 @@ void sub_813BA60(void) FlagClear(FLAG_HIDE_FANCLUB_BOY); FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY); FlagClear(FLAG_HIDE_FANCLUB_LADY); - FlagClear(FLAG_0x2DA); + FlagClear(FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER); VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1); } } diff --git a/src/match_call.c b/src/match_call.c index 2879881bf..a15700070 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -375,7 +375,7 @@ static const match_call_text_data_t sMayTextScripts[] = { { gText_May_Pokenav_2B3AB3, 0xFFFF, 0xFFFF }, { gText_May_Pokenav_2B3B3F, FLAG_0x4F1, 0xFFFF }, { gText_May_Pokenav_2B3C13, FLAG_0x095, 0xFFFF }, - { gText_May_Pokenav_2B3CF3, FLAG_0x324, 0xFFFF }, + { gText_May_Pokenav_2B3CF3, FLAG_HIDE_MAUVILLE_CITY_WALLY, 0xFFFF }, { gText_May_Pokenav_2B3D4B, FLAG_0x06A, 0xFFFF }, { gText_May_Pokenav_2B3DD1, FLAG_0x4F3, 0xFFFF }, { gText_May_Pokenav_2B3E69, FLAG_0x4F4, 0xFFFF }, @@ -396,7 +396,7 @@ static const match_call_text_data_t sBrendanTextScripts[] = { { gText_Brendan_Pokenav_2B43EF, 0xFFFF, 0xFFFF }, { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1, 0xFFFF }, { gText_Brendan_Pokenav_2B4560, FLAG_0x095, 0xFFFF }, - { gText_Brendan_Pokenav_2B463F, FLAG_0x324, 0xFFFF }, + { gText_Brendan_Pokenav_2B463F, FLAG_HIDE_MAUVILLE_CITY_WALLY, 0xFFFF }, { gText_Brendan_Pokenav_2B46B7, FLAG_0x06A, 0xFFFF }, { gText_Brendan_Pokenav_2B4761, FLAG_0x4F3, 0xFFFF }, { gText_Brendan_Pokenav_2B47F4, FLAG_0x4F4, 0xFFFF }, @@ -425,9 +425,9 @@ static const match_call_text_data_t sWallyTextScripts[] = { }; const struct MatchCallSubstruct2 sWallyAdditionalData[] = { - { FLAG_0x324, 0x05 }, + { FLAG_HIDE_MAUVILLE_CITY_WALLY, 0x05 }, { FLAG_0x06F, 0xD5 }, - { FLAG_0x35A, 0x46 }, + { FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY, 0x46 }, { 0xFFFF, 0xD5 } }; |