dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sys flags

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 10:42:24 -04:00
parent a1bddb8f8c
commit 221259d0d6
29 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+8 -8
View File
@@ -1636,10 +1636,10 @@ EventScript_1A661D:: @ 81A661D
return
EventScript_1A6636:: @ 81A6636
checkflag 2114
checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER
goto_if TRUE, EventScript_1A661D
msgbox Text_1A552B
setflag 2114
setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER
message Text_1BCCCA
waitmessage
applymovement VAR_LAST_TALKED, Movement_1A666C
@@ -2721,7 +2721,7 @@ EventScript_1A774D:: @ 81A774D
applymovement VAR_0x8008, Movement_1A75DD
waitmovement 0
msgbox Text_1A62D3
setflag 2105
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
textcolor 3
special sub_80699BC
signmsg
@@ -2759,7 +2759,7 @@ EventScript_1A77B0:: @ 81A77B0
Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6
Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6
lockall
clearflag FLAG_0x830
clearflag FLAG_SYS_ON_CYCLING_ROAD
setvar VAR_MAP_SCENE_ROUTE16, 0
releaseall
end
@@ -4384,7 +4384,7 @@ EventScript_1A924B:: @ 81A924B
return
EventScript_1A925E:: @ 81A925E
checkflag FLAG_0x849
checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
goto_if TRUE, EventScript_1A77A9
setweather 11
doweather
@@ -10484,7 +10484,7 @@ VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
lockall
checkflag FLAG_BADGE04_GET
goto_if FALSE, EventScript_1BE185
checkflag FLAG_0x805
checkflag FLAG_SYS_STRENGTH_ACTIVE
goto_if TRUE, EventScript_1BE18E
checkpartymove MOVE_STRENGTH
compare_var_to_value VAR_RESULT, 6
@@ -10507,7 +10507,7 @@ EventScript_FldEffStrength:: @ 81BE16E
end
EventScript_1BE179:: @ 81BE179
setflag FLAG_0x805
setflag FLAG_SYS_STRENGTH_ACTIVE
msgbox gUnknown_81BE1FA, 3
end
@@ -11335,7 +11335,7 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
faceplayer
compare_var_to_value VAR_0x4001, 1
goto_if eq, EventScript_1BEE3A
checkflag 2093
checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE
goto_if TRUE, EventScript_1BEECD
msgbox Text_1BEF88
goto EventScript_1BEE44
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -28,7 +28,7 @@ EventScript_165243:: @ 8165243
checkflag FLAG_DEOXYS_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_0x848
clearflag FLAG_SYS_DEOXYS_AWAKENED
return
BirthIsland_Exterior_MapScript2_165253:: @ 8165253
@@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253
EventScript_16525D:: @ 816525D
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 2
return
data/maps/CeruleanCity_House5/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
msgbox gUnknown_8192F67, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16AEAD
checkflag FLAG_0x847
checkflag FLAG_SYS_GOT_BERRY_POUCH
goto_if FALSE, EventScript_16AEA3
msgbox gUnknown_8193003
setflag FLAG_GOT_POWDER_JAR
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
trainerbattle 2, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_163FB7
msgbox gUnknown_817BCA3, 6
end
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -142,7 +142,7 @@ EventScript_167E19:: @ 8167E19
FourIsland_EventScript_167E2E:: @ 8167E2E
lock
faceplayer
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_167E43
msgbox gUnknown_8182A2B
release
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -11,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65
end
EventScript_16EA79:: @ 816EA79
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_1A77A9
setobjectxyperm 4, 4, 2
return
@@ -27,7 +27,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
end
EventScript_16EAA6:: @ 816EAA6
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_16EAB9
msgbox gUnknown_819A943
release
data/maps/OneIsland/scripts.inc
+1 -1
View File
@@ -83,7 +83,7 @@ Movement_167514:: @ 8167514
OneIsland_EventScript_167517:: @ 8167517
lock
faceplayer
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_16753F
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_167535
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+5 -5
View File
@@ -8,7 +8,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
call_if ge, EventScript_170C22
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_170C36
end
@@ -293,7 +293,7 @@ EventScript_170FA5:: @ 8170FA5
waitmovement 0
msgbox gUnknown_81A1D7D
special sub_810B82C
setflag FLAG_0x844
setflag FLAG_SYS_CAN_LINK_WITH_RS
setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
@@ -342,7 +342,7 @@ EventScript_1710B2:: @ 81710B2
removeitem ITEM_TRI_PASS, 1
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
additem ITEM_RAINBOW_PASS, 1
setflag FLAG_0x846
setflag FLAG_SYS_SEVII_MAP_4567
textcolor 3
playfanfare MUS_FAN5
message Text_1A1B56
@@ -404,7 +404,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
lock
faceplayer
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_17116F
msgbox gUnknown_81A218D
release
@@ -417,7 +417,7 @@ EventScript_17116F:: @ 817116F
OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
lockall
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_1711A0
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_171196
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+2 -2
View File
@@ -59,9 +59,9 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
call_if TRUE, EventScript_1628F2
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_1628FB
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162906
clearflag FLAG_TEMP_5
goto EventScript_16291B
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+2 -2
View File
@@ -58,9 +58,9 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
call_if TRUE, EventScript_16275A
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162763
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16276E
clearflag FLAG_TEMP_5
goto EventScript_1627B0
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+2 -2
View File
@@ -69,9 +69,9 @@ EventScript_162B76:: @ 8162B76
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
savebgm MUS_WIN_GYM
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162C6F
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162C91
setflag FLAG_TEMP_4
clearflag FLAG_TEMP_5
data/maps/PokemonLeague_LancesRoom/scripts.inc
+2 -2
View File
@@ -112,9 +112,9 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
call_if TRUE, EventScript_162A82
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162A8B
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162A96
clearflag FLAG_TEMP_5
goto EventScript_162AAB
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+4 -4
View File
@@ -57,15 +57,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
goto_if TRUE, EventScript_162669
famechecker FAMECHECKER_LORELEI, 0
famechecker FAMECHECKER_LORELEI, 1
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162641
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16264A
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162653
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16265E
clearflag FLAG_TEMP_5
goto EventScript_162673
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ Route16_MapScript2_168103:: @ 8168103
end
EventScript_16810F:: @ 816810F
setflag FLAG_0x830
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route16_MapScript3_168113:: @ 8168113
data/maps/Route16_NorthEntrance_1F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2
.byte 0
Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8
clearflag FLAG_0x830
clearflag FLAG_SYS_ON_CYCLING_ROAD
checkflag FLAG_GOT_BICYCLE
call_if TRUE, EventScript_1701D5
end
data/maps/Route18/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ Route18_MapScript1_168201:: @ 8168201
end
EventScript_16820D:: @ 816820D
setflag FLAG_0x830
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route18_MapScript2_168211:: @ 8168211
data/maps/Route18_EastEntrance_1F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378
.byte 0
Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E
clearflag FLAG_0x830
clearflag FLAG_SYS_ON_CYCLING_ROAD
checkflag FLAG_GOT_BICYCLE
call_if TRUE, EventScript_17038B
end
data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY
checkflag FLAG_0x849
checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
call_if TRUE, EventScript_164E07
setvar VAR_0x4001, 0
setvar VAR_0x4002, 0
@@ -138,6 +138,6 @@ EventScript_164F8A:: @ 8164F8A
EventScript_164F8C:: @ 8164F8C
call EventScript_164F51
msgbox gUnknown_817D31B
setflag FLAG_0x849
setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
releaseall
end
data/maps/TwoIsland/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ TwoIsland_MapScript1_16756A:: @ 816756A
end
EventScript_167576:: @ 8167576
checkflag FLAG_0x844
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_167597
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_1675B8
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -58,7 +58,7 @@ VermilionCity_EventScript_166941:: @ 8166941
end
EventScript_166958:: @ 8166958
checkflag FLAG_0x84A
checkflag FLAG_SYS_GOT_MYSTIC_TICKET
goto_if FALSE, EventScript_1A77B0
checkitem ITEM_MYSTIC_TICKET, 1
compare_var_to_value VAR_RESULT, 0
@@ -67,7 +67,7 @@ EventScript_166958:: @ 8166958
end
EventScript_166977:: @ 8166977
checkflag FLAG_0x84B
checkflag FLAG_SYS_GOT_AURORA_TICKET
goto_if FALSE, EventScript_1A77B0
checkitem ITEM_AURORA_TICKET, 1
compare_var_to_value VAR_RESULT, 0
data/mystery_event_msg.s
+2 -2
View File
@@ -229,7 +229,7 @@ MysteryEventScript_AuroraTicket:: @ 84894B9
compare_var_to_value VAR_RESULT, 0
vgoto_if TRUE, AuroraTicket_NoBagSpace
giveitem ITEM_AURORA_TICKET
setflag FLAG_0x84B
setflag FLAG_SYS_GOT_AURORA_TICKET
setflag FLAG_GOT_AURORA_TICKET
vmessage sText_AuroraTicket2
waitmessage
@@ -293,7 +293,7 @@ MysteryEventScript_MysticTicket:: @ 8489689
compare_var_to_value VAR_RESULT, 0
vgoto_if TRUE, MysticTicket_NoBagSpace
giveitem ITEM_MYSTIC_TICKET
setflag FLAG_0x84A
setflag FLAG_SYS_GOT_MYSTIC_TICKET
setflag FLAG_GOT_MYSTIC_TICKET
vmessage sText_MysticTicket1
waitmessage
include/constants/flags.h
+32 -32
View File
@@ -1317,12 +1317,12 @@
// 0x800
#define FLAG_SYS_SAFARI_MODE (SYS_FLAGS + 0x0)
#define FLAG_0x801 (SYS_FLAGS + 0x1)
#define FLAG_WHITE_FLUTE_ACTIVE (SYS_FLAGS + 0x3)
#define FLAG_BLACK_FLUTE_ACTIVE (SYS_FLAGS + 0x4)
#define FLAG_0x805 (SYS_FLAGS + 0x5)
#define FLAG_0x806 (SYS_FLAGS + 0x6)
#define FLAG_SYS_SAFARI_MODE (SYS_FLAGS + 0x0)
#define FLAG_SYS_VS_SEEKER_CHARGING (SYS_FLAGS + 0x1)
#define FLAG_SYS_WHITE_FLUTE_ACTIVE (SYS_FLAGS + 0x3)
#define FLAG_SYS_BLACK_FLUTE_ACTIVE (SYS_FLAGS + 0x4)
#define FLAG_SYS_STRENGTH_ACTIVE (SYS_FLAGS + 0x5)
#define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6)
#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7)
#define FLAG_BADGE01_GET (SYS_FLAGS + 0x20)
@@ -1335,40 +1335,40 @@
#define FLAG_BADGE08_GET (SYS_FLAGS + 0x27)
#define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28)
#define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29)
#define FLAG_0x82A (SYS_FLAGS + 0x2A)
#define FLAG_0x82B (SYS_FLAGS + 0x2B)
#define FLAG_SYS_GAME_CLEAR (SYS_FLAGS + 0x2C)
#define FLAG_SYS_SET_TRAINER_CARD_PROFILE (SYS_FLAGS + 0x2D)
#define FLAG_0x82E (SYS_FLAGS + 0x2E)
#define FLAG_SYS_RUNNING_SHOES (SYS_FLAGS + 0x2F)
#define FLAG_0x830 (SYS_FLAGS + 0x30)
#define FLAG_SYS_ON_CYCLING_ROAD (SYS_FLAGS + 0x30)
#define FLAG_0x831 (SYS_FLAGS + 0x31)
#define FLAG_0x832 (SYS_FLAGS + 0x32)
#define FLAG_0x833 (SYS_FLAGS + 0x33)
#define FLAG_SYS_NOT_SOMEONES_PC (SYS_FLAGS + 0x34)
#define FLAG_0x835 (SYS_FLAGS + 0x35)
#define FLAG_0x836 (SYS_FLAGS + 0x36)
#define FLAG_0x837 (SYS_FLAGS + 0x37)
#define FLAG_0x838 (SYS_FLAGS + 0x38)
#define FLAG_SYS_MYSTERY_GIFT_ENABLED (SYS_FLAGS + 0x39)
#define FLAG_0x83A (SYS_FLAGS + 0x3A)
#define FLAG_SYS_RIBBON_GET (SYS_FLAGS + 0x3B)
#define FLAG_0x83C (SYS_FLAGS + 0x3C)
#define FLAG_SYS_SAW_HELP_SYSTEM_INTRO (SYS_FLAGS + 0x3C)
#define FLAG_0x83D (SYS_FLAGS + 0x3D)
#define FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN (SYS_FLAGS + 0x3E)
#define FLAG_0x83F (SYS_FLAGS + 0x3F)
#define FLAG_SYS_NATIONAL_DEX (SYS_FLAGS + 0x40)
#define FLAG_SYS_PC_STORAGE_DISABLED (SYS_FLAGS + 0x41)
#define FLAG_0x842 (SYS_FLAGS + 0x42)
#define FLAG_0x843 (SYS_FLAGS + 0x43)
#define FLAG_0x844 (SYS_FLAGS + 0x44)
#define FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER (SYS_FLAGS + 0x42)
#define FLAG_SYS_CHANGED_BOX_TO_STORE_MON (SYS_FLAGS + 0x43)
#define FLAG_SYS_CAN_LINK_WITH_RS (SYS_FLAGS + 0x44)
#define FLAG_SYS_SEVII_MAP_123 (SYS_FLAGS + 0x45)
#define FLAG_0x846 (SYS_FLAGS + 0x46)
#define FLAG_0x847 (SYS_FLAGS + 0x47)
#define FLAG_0x848 (SYS_FLAGS + 0x48)
#define FLAG_0x849 (SYS_FLAGS + 0x49)
#define FLAG_0x84A (SYS_FLAGS + 0x4A)
#define FLAG_0x84B (SYS_FLAGS + 0x4B)
#define FLAG_0x87F (SYS_FLAGS + 0x7F)
#define FLAG_0x880 (SYS_FLAGS + 0x80)
#define FLAG_0x881 (SYS_FLAGS + 0x81)
#define FLAG_0x882 (SYS_FLAGS + 0x82)
#define FLAG_0x883 (SYS_FLAGS + 0x83)
#define FLAG_0x884 (SYS_FLAGS + 0x84)
#define FLAG_0x885 (SYS_FLAGS + 0x85)
#define FLAG_0x886 (SYS_FLAGS + 0x86)
#define FLAG_0x887 (SYS_FLAGS + 0x87)
#define FLAG_0x88C (SYS_FLAGS + 0x8C)
#define FLAG_0x88E (SYS_FLAGS + 0x8E)
#define FLAG_0x88F (SYS_FLAGS + 0x8F)
#define FLAG_SYS_SEVII_MAP_4567 (SYS_FLAGS + 0x46)
#define FLAG_SYS_GOT_BERRY_POUCH (SYS_FLAGS + 0x47)
#define FLAG_SYS_DEOXYS_AWAKENED (SYS_FLAGS + 0x48)
#define FLAG_SYS_UNLOCKED_TANOBY_RUINS (SYS_FLAGS + 0x49)
#define FLAG_SYS_GOT_MYSTIC_TICKET (SYS_FLAGS + 0x4A)
#define FLAG_SYS_GOT_AURORA_TICKET (SYS_FLAGS + 0x4B)
// World Map Flags
#define FLAG_WORLD_MAP_PALLET_TOWN (SYS_FLAGS + 0x90)
src/help_system_812B1E0.c
+3 -3
View File
@@ -950,7 +950,7 @@ static bool8 IsInDungeonMap(void)
if (
sDungeonMaps[i][0] == gSaveBlock1Ptr->location.mapGroup
&& sDungeonMaps[i][1] + j == gSaveBlock1Ptr->location.mapNum
&& (i != 15 /* TANOBY */ || FlagGet(FLAG_0x849) == TRUE)
&& (i != 15 /* TANOBY */ || FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS) == TRUE)
)
return TRUE;
}
@@ -990,10 +990,10 @@ bool8 sub_812B40C(void)
if (gUnknown_203B0EE == 1)
return FALSE;
if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_0x83C))
if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO))
return FALSE;
FlagSet(FLAG_0x83C);
FlagSet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO);
gUnknown_203B0EE = 1;
return TRUE;
}
src/item.c
+2 -2
View File
@@ -245,11 +245,11 @@ bool8 AddBagItem(u16 itemId, u16 count)
return FALSE;
gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].itemId = ITEM_BERRY_POUCH;
SetBagItemQuantity(&gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].quantity, 1);
FlagSet(FLAG_0x847);
FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
}
if (itemId == ITEM_BERRY_POUCH)
FlagSet(FLAG_0x847);
FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
idx = BagPocketGetFirstEmptySlot(pocket);
if (idx == -1)
src/item_use.c
+5 -5
View File
@@ -202,7 +202,7 @@ void FieldUseFunc_MachBike(u8 taskId)
PlayerGetDestCoords(&x, &y);
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (FlagGet(FLAG_0x830) == TRUE
if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE
|| MetatileBehavior_ReturnFalse_17(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_18(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_15(behavior) == TRUE
@@ -529,8 +529,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
ItemUse_SetQuestLogEvent(4, NULL, gSpecialVar_ItemId, 0xFFFF);
if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE)
{
FlagSet(FLAG_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_BLACK_FLUTE_ACTIVE);
FlagSet(FLAG_SYS_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE);
CopyItemName(gSpecialVar_ItemId, gStringVar2);
StringExpandPlaceholders(gStringVar4, gUnknown_84165D2);
gTasks[taskId].func = sub_80A1B48;
@@ -538,8 +538,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
}
else if (gSpecialVar_ItemId == ITEM_BLACK_FLUTE)
{
FlagSet(FLAG_BLACK_FLUTE_ACTIVE);
FlagClear(FLAG_WHITE_FLUTE_ACTIVE);
FlagSet(FLAG_SYS_BLACK_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE);
CopyItemName(gSpecialVar_ItemId, gStringVar2);
StringExpandPlaceholders(gStringVar4, gUnknown_8416600);
gTasks[taskId].func = sub_80A1B48;
src/link.c
+1 -1
View File
@@ -329,7 +329,7 @@ static void InitLocalLinkPlayer(void)
gLocalLinkPlayer.version = gGameVersion + 0x4000;
gLocalLinkPlayer.lp_field_2 = 0x8000;
gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled();
if (FlagGet(FLAG_0x844))
if (FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
{
gLocalLinkPlayer.name[8] |= 0x10;
}
src/pokemon.c
+1 -1
View File
@@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo)
FlagClear(FLAG_0x843);
FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
VarSet(VAR_0x4037, boxNo);
return MON_GIVEN_TO_PC;
}
src/quest_log.c
+1 -1
View File
@@ -3131,7 +3131,7 @@ static bool8 sub_8113778(u16 a0, u16 * a1)
return TRUE;
}
if (!FlagGet(FLAG_0x844))
if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
{
if (a0 == 4 || a0 == 5 || a0 == 6 || a0 == 7 || a0 == 8 || a0 == 9 || a0 == 10 || a0 == 22 || a0 == 25 || a0 == 26)
return TRUE;
src/vs_seeker.c
+5 -5
View File
@@ -641,7 +641,7 @@ bool8 sub_810C4EC(void)
gSaveBlock1Ptr->trainerRematchStepCounter++;
}
if (FlagGet(FLAG_0x801) == TRUE)
if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE)
{
u16 x;
do {
@@ -657,7 +657,7 @@ bool8 sub_810C4EC(void)
} while (0);
if (x == 100)
{
FlagClear(FLAG_0x801);
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
sub_810D0D0();
return TRUE;
@@ -743,7 +743,7 @@ bool8 sub_810C4EC(void)
void sub_810C578(void)
{
FlagClear(FLAG_0x801);
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
sub_810D0D0();
sub_810C594();
@@ -972,7 +972,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (sVsSeeker->trainerWantsRematch)
{
PlaySE(SE_PIN);
FlagSet(FLAG_0x801);
FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
return 2;
}
@@ -1270,7 +1270,7 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5:
if (!FlagGet(FLAG_0x844))
if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
}