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

update famechecker macro

Browse Source
This commit is contained in:
PikalaxALT
2019-10-20 20:20:45 -04:00
parent b3951b48ec
commit 2aeefdc5de
51 changed files with 178 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+10 -3
View File
@@ -37,6 +37,13 @@
.4byte \destination
.endm
lt = 0
eq = 1
gt = 2
le = 3
ge = 4
ne = 5
@ If the result of the last comparison matches condition (see Comparison operators), calls destination.
.macro call_if condition, destination
.byte 0x07
@@ -1442,13 +1449,13 @@
callstd 9
.endm
.macro famechecker person, index
.macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars
setvar VAR_0x8004, \person
setvar VAR_0x8005, \index
special SetFlavorTextFlagFromSpecialVars
special \function
.endm
.macro set_gym_trainers gym
.macro set_gym_trainers gym:req
setvar VAR_0x8008, \gym
call EventScript_1A6B18
.endm
data/event_scripts.s
+1
View File
@@ -352,6 +352,7 @@ gStdScriptsEnd::
.include "data/maps/VermilionCity_PokemonCenter_1F/scripts.inc"
.include "data/maps/VermilionCity_PokemonCenter_2F/scripts.inc"
.include "data/maps/VermilionCity_PokemonFanClub/scripts.inc"
.include "data/maps/VermilionCity_House2/scripts.inc"
.include "data/maps/VermilionCity_Mart/scripts.inc"
.include "data/maps/VermilionCity_Gym/scripts.inc"
.include "data/maps/VermilionCity_House3/scripts.inc"
data/maps/CeladonCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ CeladonCity_Gym_MapScripts:: @ 816D060
.byte 0
CeladonCity_Gym_EventScript_16D061:: @ 816D061
setvar VAR_0x8004, 5
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
checkflag FLAG_0x293
goto_if 0, EventScript_16D0C6
data/maps/CeruleanCity/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ CeruleanCity_MapScripts:: @ 8166471
CeruleanCity_MapScript1_166477:: @ 8166477
setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
checkflag FLAG_0x234
checkflag FLAG_GOT_SS_TICKET
call_if 0, EventScript_166484
end
@@ -194,7 +194,7 @@ EventScript_16662E:: @ 816662E
fadescreen 1
removeobject 2
fadescreen 0
setflag FLAG_0x23F
setflag FLAG_GOT_TM28_FROM_ROCKET
release
end
@@ -246,7 +246,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
CeruleanCity_EventScript_1666FE:: @ 81666FE
lock
faceplayer
checkflag FLAG_0x234
checkflag FLAG_GOT_SS_TICKET
goto_if_eq EventScript_166713
msgbox gUnknown_817F01D
release
data/maps/CeruleanCity_BikeShop/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
faceplayer
checkflag FLAG_0x271
goto_if_eq EventScript_16AC58
checkflag FLAG_0x241
checkflag FLAG_GOT_BIKE_VOUCHER
goto_if_eq EventScript_16AC22
showmoneybox 0, 0, 0
message Text_192755
data/maps/CeruleanCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
.byte 0
CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
checkflag FLAG_0x297
goto_if 0, EventScript_16AAF9
data/maps/CeruleanCity_House2/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975
CeruleanCity_House2_EventScript_16A976:: @ 816A976
lock
faceplayer
checkflag FLAG_0x23F
checkflag FLAG_GOT_TM28_FROM_ROCKET
goto_if_eq EventScript_16A98B
msgbox gUnknown_8191E13
release
data/maps/CeruleanCity_House3/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
faceplayer
setvar VAR_0x8008, 1
call EventScript_1A8CAD
checkflag FLAG_0x24A
checkflag FLAG_DID_ZYNX_TRADE
goto_if_eq EventScript_16AA23
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -23,7 +23,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
goto_if 5, EventScript_16AA15
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_0x24A
setflag FLAG_DID_ZYNX_TRADE
release
end
data/maps/CinnabarIsland_Gym/scripts.inc
+3 -5
View File
@@ -53,11 +53,9 @@ EventScript_16D9CE:: @ 816D9CE
return
CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
setvar VAR_0x8004, 8
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
checkflag FLAG_0x24E
checkflag FLAG_GOT_TM38_FROM_BLAINE
goto_if 0, EventScript_16DA34
msgbox gUnknown_819971D
release
@@ -81,7 +79,7 @@ EventScript_16DA34:: @ 816DA34
goto_if_eq EventScript_16DA75
additem ITEM_TM38, 1
giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
setflag FLAG_0x24E
setflag FLAG_GOT_TM38_FROM_BLAINE
msgbox gUnknown_8199652
release
end
data/maps/FiveIsland_MemorialPillar/scripts.inc
+3 -3
View File
@@ -3,7 +3,7 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2
FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
lock
checkflag FLAG_0x236
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if_eq EventScript_168A18
checkflag FLAG_0x2D7
goto_if_eq EventScript_168A22
@@ -39,7 +39,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
goto_if_eq EventScript_1A7AE0
special sub_8112364
lockall
checkflag FLAG_0x236
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if_eq EventScript_168B0B
checkflag FLAG_0x2D7
goto_if_eq EventScript_168B0B
@@ -79,7 +79,7 @@ EventScript_168AE8:: @ 8168AE8
msgbox gUnknown_818B219
applymovement 1, Movement_1A75E9
waitmovement 0
setflag FLAG_0x236
setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
return
EventScript_168AFE:: @ 8168AFE
data/maps/FuchsiaCity_Building1/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B
FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
lock
faceplayer
checkflag FLAG_0x23A
checkflag FLAG_GOT_HM04
goto_if_eq EventScript_16D7FA
checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH
goto_if_eq EventScript_16D780
@@ -31,7 +31,7 @@ EventScript_16D780:: @ 816D780
call_if 1, EventScript_16D7DF
additem ITEM_HM04, 1
giveitemfanfaremsg gUnknown_8199068, ITEM_HM04
setflag FLAG_0x23A
setflag FLAG_GOT_HM04
removeitem ITEM_GOLD_TEETH, 1
release
end
data/maps/FuchsiaCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D
.byte 0
FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
setvar VAR_0x8004, 6
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
checkflag FLAG_0x259
goto_if 0, EventScript_16D5A6
data/maps/FuchsiaCity_House2/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ FuchsiaCity_House2_MapScripts:: @ 816D816
FuchsiaCity_House2_EventScript_16D817:: @ 816D817
lock
faceplayer
checkflag FLAG_0x244
checkflag FLAG_GOT_GOOD_ROD
goto_if_eq EventScript_16D83F
msgbox gUnknown_819918E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
@@ -26,7 +26,7 @@ EventScript_16D849:: @ 816D849
additem ITEM_GOOD_ROD, 1
giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD
msgbox gUnknown_8199296
setflag FLAG_0x244
setflag FLAG_GOT_GOOD_ROD
release
end
data/maps/LavenderTown_House1/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ LavenderTown_House1_MapScripts:: @ 816B232
LavenderTown_House1_EventScript_16B233:: @ 816B233
lock
faceplayer
checkflag FLAG_0x23C
checkflag FLAG_RESCUED_MR_FUJI
goto_if_eq EventScript_16B248
msgbox gUnknown_819397D
release
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+3 -3
View File
@@ -4,13 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149
LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
lock
faceplayer
checkflag FLAG_0x23D
checkflag FLAG_GOT_POKE_FLUTE
goto_if_eq EventScript_16B196
msgbox gUnknown_81936FF
checkitemspace ITEM_POKE_FLUTE, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B1A0
setflag FLAG_0x23D
setflag FLAG_GOT_POKE_FLUTE
additem ITEM_POKE_FLUTE, 1
giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
msgbox gUnknown_81937E5
@@ -42,7 +42,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3
LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC
lock
faceplayer
checkflag FLAG_0x23C
checkflag FLAG_RESCUED_MR_FUJI
goto_if_eq EventScript_16B1E1
msgbox gUnknown_81935ED
release
data/maps/MtMoon_B2F/scripts.inc
+4 -4
View File
@@ -3,7 +3,7 @@ MtMoon_B2F_MapScripts:: @ 8160699
.byte 0
MtMoon_B2F_MapScript1_16069F:: @ 816069F
checkflag FLAG_0x232
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
call_if 0, EventScript_1606A9
end
@@ -23,7 +23,7 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0
MtMoon_B2F_EventScript_1606C2:: @ 81606C2
lock
faceplayer
checkflag FLAG_0x232
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
goto_if_eq EventScript_160707
checktrainerflag TRAINER_SUPER_NERD_MIGUEL
goto_if_eq EventScript_160711
@@ -75,7 +75,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
waitfanfare
removeobject 2
setflag FLAG_0x272
setflag FLAG_0x232
setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
release
end
@@ -108,7 +108,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
waitfanfare
removeobject 1
setflag FLAG_0x273
setflag FLAG_0x232
setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
release
end
data/maps/PalletTown/scripts.inc
+1 -3
View File
@@ -184,9 +184,7 @@ PalletTown_EventScript_1655F9:: @ 81655F9
end
EventScript_165605:: @ 8165605
setvar VAR_0x8004, 0
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
textcolor 0
delay 30
playbgm MUS_OHKIDO, 0
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -3
View File
@@ -21,9 +21,7 @@ EventScript_168D50:: @ 8168D50
PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
lock
faceplayer
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_168DB9
compare_var_to_value VAR_0x4001, 1
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+5 -5
View File
@@ -12,12 +12,12 @@ PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E
call_if 1, EventScript_168FD5
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
call_if 1, EventScript_168FC0
checkflag FLAG_0x247
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
call_if 1, EventScript_168FBC
end
EventScript_168FBC:: @ 8168FBC
setflag FLAG_0x24F
setflag FLAG_OAK_SKIP_22_RIVAL_CHECK
return
EventScript_168FC0:: @ 8168FC0
@@ -988,9 +988,9 @@ EventScript_1699FB:: @ 81699FB
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
special sub_8112364
checkflag FLAG_0x24F
checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK
goto_if_eq EventScript_169A6E
checkflag FLAG_0x247
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
goto_if_eq EventScript_169A78
checkitem ITEM_POKE_BALL, 1
compare_var_to_value VAR_RESULT, 0
@@ -1008,7 +1008,7 @@ EventScript_169A45:: @ 8169A45
msgbox gUnknown_818E89C
additem ITEM_POKE_BALL, 5
giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
setflag FLAG_0x247
setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
release
end
data/maps/PewterCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ PewterCity_Gym_MapScripts:: @ 816A592
.byte 0
PewterCity_Gym_EventScript_16A593:: @ 816A593
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
checkflag FLAG_0x254
goto_if 0, EventScript_16A5F3
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+1 -3
View File
@@ -47,9 +47,7 @@ EventScript_16286A:: @ 816286A
PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
lock
faceplayer
setvar VAR_0x8004, 11
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_AGATHA
goto_if_eq EventScript_162911
famechecker FAMECHECKER_AGATHA, 0
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+1 -3
View File
@@ -47,9 +47,7 @@ EventScript_1626DF:: @ 81626DF
PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
lock
faceplayer
setvar VAR_0x8004, 10
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_BRUNO
goto_if_eq EventScript_162779
famechecker FAMECHECKER_BRUNO, 0
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -3
View File
@@ -101,9 +101,7 @@ Movement_1629F1:: @ 81629F1
PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
lock
faceplayer
setvar VAR_0x8004, 12
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_LANCE
goto_if_eq EventScript_162AA1
famechecker FAMECHECKER_LANCE, 0
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+1 -3
View File
@@ -52,9 +52,7 @@ EventScript_1625CF:: @ 81625CF
PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
lock
faceplayer
setvar VAR_0x8004, 9
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_LORELEI
goto_if_eq EventScript_162669
famechecker FAMECHECKER_LORELEI, 0
data/maps/PokemonTower_7F/scripts.inc
+2 -4
View File
@@ -4,12 +4,10 @@ PokemonTower_7F_MapScripts:: @ 8163559
PokemonTower_7F_EventScript_16355A:: @ 816355A
lock
faceplayer
setvar VAR_0x8004, 14
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
setflag FLAG_HIDE_TOWER_FUJI
clearflag FLAG_HIDE_POKEHOUSE_FUJI
setflag FLAG_0x23C
setflag FLAG_RESCUED_MR_FUJI
msgbox gUnknown_817A529
closemessage
warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
data/maps/RocketHideout_B4F/scripts.inc
+1 -3
View File
@@ -32,9 +32,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
addobject 2
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS
setvar VAR_0x8004, 15
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
fadescreen 0
release
end
data/maps/Route1/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ Route1_MapScripts:: @ 8167EFD
Route1_EventScript_167EFE:: @ 8167EFE
lock
faceplayer
checkflag FLAG_0x230
checkflag FLAG_GOT_POTION_ON_ROUTE_1
goto_if_eq EventScript_167F48
msgbox gUnknown_818329D
textcolor 3
@@ -19,7 +19,7 @@ Route1_EventScript_167EFE:: @ 8167EFE
additem ITEM_POTION, 1
msgbox gUnknown_8183387
call EventScript_1A6675
setflag FLAG_0x230
setflag FLAG_GOT_POTION_ON_ROUTE_1
release
end
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ EventScript_168010:: @ 8168010
Route12_EventScript_168014:: @ 8168014
lock
faceplayer
checkflag FLAG_0x23D
checkflag FLAG_GOT_POKE_FLUTE
goto_if 0, EventScript_168099
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ EventScript_16811D:: @ 816811D
Route16_EventScript_168121:: @ 8168121
lock
faceplayer
checkflag FLAG_0x23D
checkflag FLAG_GOT_POKE_FLUTE
goto_if 0, EventScript_1681A3
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
data/maps/Route16_House/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ Route16_House_MapScripts:: @ 817014E
Route16_House_EventScript_17014F:: @ 817014F
lock
faceplayer
checkflag FLAG_0x238
checkflag FLAG_GOT_HM02
goto_if_eq EventScript_1701A5
msgbox gUnknown_819F851
checkitemspace ITEM_HM02, 1
@@ -13,7 +13,7 @@ Route16_House_EventScript_17014F:: @ 817014F
additem ITEM_HM02, 1
giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02
msgbox gUnknown_819F8E0
setflag FLAG_0x238
setflag FLAG_GOT_HM02
release
end
data/maps/Route25_SeaCottage/scripts.inc
+8 -10
View File
@@ -3,9 +3,9 @@ Route25_SeaCottage_MapScripts:: @ 8170523
.byte 0
Route25_SeaCottage_MapScript1_170529:: @ 8170529
checkflag FLAG_0x233
checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
call_if 0, EventScript_17053C
checkflag FLAG_0x234
checkflag FLAG_GOT_SS_TICKET
call_if 1, EventScript_170547
end
@@ -23,9 +23,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B
faceplayer
checkflag FLAG_TEMP_3
goto_if_eq EventScript_1706C8
checkflag FLAG_0x234
checkflag FLAG_GOT_SS_TICKET
goto_if_eq EventScript_170640
checkflag FLAG_0x233
checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
goto_if_eq EventScript_17064A
checkplayergender
compare_var_to_value VAR_RESULT, 0
@@ -102,9 +102,7 @@ EventScript_170640:: @ 8170640
end
EventScript_17064A:: @ 817064A
setvar VAR_0x8004, 13
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkplayergender
compare_var_to_value VAR_RESULT, 0
call_if 1, EventScript_1706AC
@@ -115,9 +113,9 @@ EventScript_17064A:: @ 817064A
goto_if_eq EventScript_1706BE
additem ITEM_SS_TICKET, 1
giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
setflag FLAG_0x235
setflag FLAG_GOT_SS_TICKET_DUP
setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET
setflag FLAG_0x234
setflag FLAG_GOT_SS_TICKET
setflag FLAG_SYS_NOT_SOMEONES_PC
goto EventScript_170640
end
@@ -172,7 +170,7 @@ EventScript_1706FA:: @ 81706FA
msgbox gUnknown_81A042D
closemessage
clearflag FLAG_TEMP_2
setflag FLAG_0x233
setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
special SpawnScriptFieldObject
applymovement 127, Movement_1707BE
waitmovement 0
data/maps/Route2_EastBuilding/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
lock
faceplayer
call EventScript_16F70B
checkflag FLAG_0x23B
checkflag FLAG_GOT_HM05
goto_if_eq EventScript_16F701
msgbox gUnknown_819D64F, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -22,7 +22,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
goto_if_eq EventScript_1A7AC7
additem ITEM_HM05, 1
giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05
setflag FLAG_0x23B
setflag FLAG_GOT_HM05
msgbox gUnknown_819D7C1
release
end
data/maps/Route2_House/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ Route2_House_EventScript_16F602:: @ 816F602
faceplayer
setvar VAR_0x8008, 0
call EventScript_1A8CAD
checkflag FLAG_0x248
checkflag FLAG_DID_MIMIEN_TRADE
goto_if_eq EventScript_16F674
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -23,7 +23,7 @@ Route2_House_EventScript_16F602:: @ 816F602
goto_if 5, EventScript_16F666
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
setflag FLAG_0x248
setflag FLAG_DID_MIMIEN_TRADE
release
end
data/maps/Route4_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -21,7 +21,7 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754
Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F
lock
faceplayer
checkflag FLAG_0x249
checkflag FLAG_BOUGHT_MAGIKARP
goto_if_eq EventScript_16F8A2
showmoneybox 0, 0, 0
checkplayergender
@@ -107,7 +107,7 @@ EventScript_16F861:: @ 816F861
end
EventScript_16F86A:: @ 816F86A
setflag FLAG_0x249
setflag FLAG_BOUGHT_MAGIKARP
release
end
data/maps/SSAnne_CaptainsOffice/scripts.inc
+2 -2
View File
@@ -3,7 +3,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39
SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
lock
checkflag FLAG_0x237
checkflag FLAG_GOT_HM01
goto_if_eq EventScript_160BB5
msgbox gUnknown_8173646
textcolor 3
@@ -19,7 +19,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
additem ITEM_HM01, 1
giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5
msgbox gUnknown_81737D2
setflag FLAG_0x237
setflag FLAG_GOT_HM01
setvar VAR_MAP_SCENE_VERMILION_CITY, 1
release
end
data/maps/SafariZone_SecretHouse/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452
SafariZone_SecretHouse_EventScript_162453:: @ 8162453
lock
faceplayer
checkflag FLAG_0x239
checkflag FLAG_GOT_HM03
goto_if_eq EventScript_1624A9
msgbox gUnknown_8177DC1
checkitemspace ITEM_HM03, 1
@@ -13,7 +13,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453
additem ITEM_HM03, 1
giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03
msgbox gUnknown_8177EB7
setflag FLAG_0x239
setflag FLAG_GOT_HM03
release
end
data/maps/SaffronCity/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ SaffronCity_MapScripts:: @ 816735F
SaffronCity_MapScript1_167365:: @ 8167365
setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
checkflag FLAG_0x23C
checkflag FLAG_RESCUED_MR_FUJI
call_if 0, EventScript_167372
end
@@ -42,7 +42,7 @@ SaffronCity_EventScript_1673B0:: @ 81673B0
SaffronCity_EventScript_1673B9:: @ 81673B9
lock
checkflag FLAG_0x23C
checkflag FLAG_RESCUED_MR_FUJI
goto_if_eq EventScript_1673D7
applymovement 6, Movement_1A75E1
waitmovement 0
data/maps/SaffronCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7
.byte 0
SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
checkflag FLAG_0x29A
goto_if 0, EventScript_16EE3D
data/maps/SaffronCity_House3/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ SaffronCity_House3_MapScripts:: @ 816F05E
SaffronCity_House3_EventScript_16F05F:: @ 816F05F
lock
faceplayer
checkflag FLAG_0x245
checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
goto_if_eq EventScript_16F0B5
msgbox gUnknown_819C142
checkitemspace ITEM_TM29, 1
@@ -13,7 +13,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F
additem ITEM_TM29, 1
giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29
msgbox gUnknown_819C18F
setflag FLAG_0x245
setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
release
end
data/maps/SilphCo_7F/scripts.inc
+2 -2
View File
@@ -130,7 +130,7 @@ Movement_161ABF:: @ 8161ABF
SilphCo_7F_EventScript_161AC8:: @ 8161AC8
lock
faceplayer
checkflag FLAG_0x246
checkflag FLAG_GOT_LAPRAS_FROM_SILPH
goto_if_eq EventScript_161B8D
msgbox gUnknown_8176266
setvar VAR_0x4001, SPECIES_LAPRAS
@@ -187,7 +187,7 @@ EventScript_161B7D:: @ 8161B7D
EventScript_161B7E:: @ 8161B7E
textcolor 0
msgbox gUnknown_8176305
setflag FLAG_0x246
setflag FLAG_GOT_LAPRAS_FROM_SILPH
release
end
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+2 -2
View File
@@ -6,7 +6,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
faceplayer
setvar VAR_0x8008, 2
call EventScript_1A8CAD
checkflag FLAG_0x24B
checkflag FLAG_DID_MS_NIDO_TRADE
goto_if_eq EventScript_160EAB
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -19,7 +19,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
goto_if 5, EventScript_160E9D
call EventScript_1A8CD9
msgbox gUnknown_81A5B4A
setflag FLAG_0x24B
setflag FLAG_DID_MS_NIDO_TRADE
release
end
data/maps/VermilionCity/scripts.inc
+1 -1
View File
@@ -212,7 +212,7 @@ EventScript_166BA0:: @ 8166BA0
compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if_eq EventScript_166BED
msgbox gUnknown_817FA3C
checkflag FLAG_0x234
checkflag FLAG_GOT_SS_TICKET
goto_if 0, EventScript_166BDE
msgbox gUnknown_817FA77
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
data/maps/VermilionCity_Gym/scripts.inc
+4 -6
View File
@@ -208,11 +208,9 @@ EventScript_16B8EF:: @ 816B8EF
return
VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
setvar VAR_0x8004, 4
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C
checkflag FLAG_0x231
checkflag FLAG_GOT_TM34_FROM_SURGE
goto_if 0, EventScript_16B9AF
msgbox gUnknown_8194C8E
release
@@ -220,7 +218,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
EventScript_16B97C:: @ 816B97C
famechecker FAMECHECKER_LTSURGE, 1
checkflag FLAG_0x23B
checkflag FLAG_GOT_HM05
call_if 0, EventScript_16B9AB
clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL
setflag FLAG_DEFEATED_LT_SURGE
@@ -240,7 +238,7 @@ EventScript_16B9AF:: @ 816B9AF
goto_if_eq EventScript_16B9F0
additem ITEM_TM34, 1
giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34
setflag FLAG_0x231
setflag FLAG_GOT_TM34_FROM_SURGE
msgbox gUnknown_8194DA8
release
end
data/maps/VermilionCity_House1/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ VermilionCity_House1_MapScripts:: @ 816B3A6
VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7
lock
faceplayer
checkflag FLAG_0x240
checkflag FLAG_GOT_OLD_ROD
goto_if_eq EventScript_16B3CF
msgbox gUnknown_8193EC1, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
@@ -25,7 +25,7 @@ EventScript_16B3D9:: @ 816B3D9
additem ITEM_OLD_ROD, 1
msgbox gUnknown_8193F2A
giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD
setflag FLAG_0x240
setflag FLAG_GOT_OLD_ROD
msgbox gUnknown_8193FAF
release
end
data/maps/VermilionCity_House2/scripts.inc
+40 -1
View File
@@ -1 +1,40 @@
@ .include "data/maps/VermilionCity_House2/scripts.inc"
VermilionCity_House2_MapScripts:: @ 816B5D6
.byte 0
VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
lock
faceplayer
setvar VAR_0x8008, 3
call EventScript_1A8CAD
checkflag FLAG_DID_CH_DING_TRADE
goto_if_eq EventScript_16B649
msgbox gUnknown_81949CB, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B631
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16B631
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16B63B
call EventScript_1A8CD9
msgbox gUnknown_8194A44
setflag FLAG_DID_CH_DING_TRADE
release
end
EventScript_16B631:: @ 816B631
msgbox gUnknown_81949FD
release
end
EventScript_16B63B:: @ 816B63B
getspeciesname 0, VAR_0x8009
msgbox gUnknown_8194A0D
release
end
EventScript_16B649:: @ 816B649
msgbox gUnknown_8194A4F
release
end
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+2 -43
View File
@@ -4,7 +4,7 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E
VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F
lock
faceplayer
checkflag FLAG_0x241
checkflag FLAG_GOT_BIKE_VOUCHER
goto_if_eq EventScript_16B4A7
msgbox gUnknown_819457E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
@@ -23,7 +23,7 @@ EventScript_16B4B1:: @ 816B4B1
checkitemspace ITEM_BIKE_VOUCHER, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B4F2
setflag FLAG_0x241
setflag FLAG_GOT_BIKE_VOUCHER
additem ITEM_BIKE_VOUCHER, 1
giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5
msgbox gUnknown_819477C
@@ -121,44 +121,3 @@ VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4
VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD
msgbox gUnknown_819493D, 3
end
VermilionCity_House2_MapScripts:: @ 816B5D6
.byte 0
VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
lock
faceplayer
setvar VAR_0x8008, 3
call EventScript_1A8CAD
checkflag FLAG_0x24D
goto_if_eq EventScript_16B649
msgbox gUnknown_81949CB, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B631
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16B631
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16B63B
call EventScript_1A8CD9
msgbox gUnknown_8194A44
setflag FLAG_0x24D
release
end
EventScript_16B631:: @ 816B631
msgbox gUnknown_81949FD
release
end
EventScript_16B63B:: @ 816B63B
getspeciesname 0, VAR_0x8009
msgbox gUnknown_8194A0D
release
end
EventScript_16B649:: @ 816B649
msgbox gUnknown_8194A4F
release
end
data/maps/ViridianCity_Gym/scripts.inc
+1 -3
View File
@@ -2,9 +2,7 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9
.byte 0
ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
setvar VAR_0x8004, 15
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
checkflag FLAG_0x298
goto_if 0, EventScript_169F2F
include/constants/fame_checker.h
+4
View File
@@ -19,4 +19,8 @@
#define FAMECHECKER_GIOVANNI 15
#define NUM_FAMECHECKER_PERSONS 16
#define FCPICKSTATE_NO_DRAW 0
#define FCPICKSTATE_SILHOUETTE 1
#define FCPICKSTATE_COLORED 2
#endif //GUARD_CONSTANTS_FAME_CHECKER_H
include/constants/flags.h
+32 -32
View File
@@ -573,38 +573,38 @@
#define FLAG_0x22F 0x22F
// Story flags
#define FLAG_0x230 0x230
#define FLAG_0x231 0x231
#define FLAG_0x232 0x232
#define FLAG_0x233 0x233
#define FLAG_0x234 0x234
#define FLAG_0x235 0x235
#define FLAG_0x236 0x236
#define FLAG_0x237 0x237
#define FLAG_0x238 0x238
#define FLAG_0x239 0x239
#define FLAG_0x23A 0x23A
#define FLAG_0x23B 0x23B
#define FLAG_0x23C 0x23C
#define FLAG_0x23D 0x23D
#define FLAG_0x23E 0x23E
#define FLAG_0x23F 0x23F
#define FLAG_0x240 0x240
#define FLAG_0x241 0x241
#define FLAG_0x242 0x242
#define FLAG_GOT_COIN_CASE 0x243
#define FLAG_0x244 0x244
#define FLAG_0x245 0x245
#define FLAG_0x246 0x246
#define FLAG_0x247 0x247
#define FLAG_0x248 0x248
#define FLAG_0x249 0x249
#define FLAG_0x24A 0x24A
#define FLAG_0x24B 0x24B
#define FLAG_0x24C 0x24C
#define FLAG_0x24D 0x24D
#define FLAG_0x24E 0x24E
#define FLAG_0x24F 0x24F
#define FLAG_GOT_POTION_ON_ROUTE_1 0x230
#define FLAG_GOT_TM34_FROM_SURGE 0x231
#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232
#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233
#define FLAG_GOT_SS_TICKET 0x234
#define FLAG_GOT_SS_TICKET_DUP 0x235
#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236
#define FLAG_GOT_HM01 0x237
#define FLAG_GOT_HM02 0x238
#define FLAG_GOT_HM03 0x239
#define FLAG_GOT_HM04 0x23A
#define FLAG_GOT_HM05 0x23B
#define FLAG_RESCUED_MR_FUJI 0x23C
#define FLAG_GOT_POKE_FLUTE 0x23D
#define FLAG_0x23E 0x23E
#define FLAG_GOT_TM28_FROM_ROCKET 0x23F
#define FLAG_GOT_OLD_ROD 0x240
#define FLAG_GOT_BIKE_VOUCHER 0x241
#define FLAG_0x242 0x242
#define FLAG_GOT_COIN_CASE 0x243
#define FLAG_GOT_GOOD_ROD 0x244
#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245
#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246
#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247
#define FLAG_DID_MIMIEN_TRADE 0x248
#define FLAG_BOUGHT_MAGIKARP 0x249
#define FLAG_DID_ZYNX_TRADE 0x24A
#define FLAG_DID_MS_NIDO_TRADE 0x24B
#define FLAG_0x24C 0x24C
#define FLAG_DID_CH_DING_TRADE 0x24D
#define FLAG_GOT_TM38_FROM_BLAINE 0x24E
#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F
#define FLAG_0x250 0x250
#define FLAG_0x251 0x251
#define FLAG_0x252 0x252
include/fame_checker.h
-6
View File
@@ -4,12 +4,6 @@
#include "main.h"
#include "constants/fame_checker.h"
enum {
FCPICKSTATE_NO_DRAW,
FCPICKSTATE_SILHOUETTE,
FCPICKSTATE_COLORED
};
enum {
FCWINDOWID_LIST,
FCWINDOWID_UIHELP,
src/help_system_812B1E0.c
+5 -5
View File
@@ -1341,15 +1341,15 @@ static bool8 sub_812B780(u8 id)
static bool8 sub_812BB10(void)
{
if (FlagGet(FLAG_0x237) == TRUE)
if (FlagGet(FLAG_GOT_HM01) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x238) == TRUE)
if (FlagGet(FLAG_GOT_HM02) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x239) == TRUE)
if (FlagGet(FLAG_GOT_HM03) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x23A) == TRUE)
if (FlagGet(FLAG_GOT_HM04) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x23B) == TRUE)
if (FlagGet(FLAG_GOT_HM05) == TRUE)
return TRUE;
if (FlagGet(FLAG_0x2EF) == TRUE)
return TRUE;