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

More basic script constants

Browse Source
This commit is contained in:
GriffinR
2020-01-10 03:19:11 -05:00
parent 29e4446a03
commit 9fafa12285
74 changed files with 232 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+12 -11
View File
@@ -22,6 +22,7 @@
#include "constants/battle_setup.h"
#include "constants/map_scripts.h"
#include "constants/cable_club.h"
#include "constants/field_weather.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -1213,9 +1214,9 @@ EventScript_1A6551:: @ 81A6551
.include "data/scripts/pc.inc"
EventScript_1A6AC0:: @ 81A6AC0
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80FEE44
fadescreen 0
fadescreen FADE_FROM_BLACK
return
.include "data/scripts/surf.inc"
@@ -1246,11 +1247,11 @@ EventScript_1A6C21:: @ 81A6C21
return
EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26
fadescreen 1
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
special sp000_heal_pokemon
fadescreen 0
fadescreen FADE_FROM_BLACK
return
gUnknown_81A6C32:: @ 81A6C32
@@ -1259,7 +1260,7 @@ gUnknown_81A6C32:: @ 81A6C32
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
fadescreen 1
fadescreen FADE_TO_BLACK
special Special_TownMap
waitstate
releaseall
@@ -1305,7 +1306,7 @@ EventScript_1A74D1:: @ 81A74D1
return
EventScript_1A74EB:: @ 81A74EB
fadescreen 1
fadescreen FADE_TO_BLACK
special ChangePokemonNickname
waitstate
return
@@ -1841,7 +1842,7 @@ EventScript_1A8C27:: @ 81A8C27
return
EventScript_1A8C33:: @ 81A8C33
fadescreen 1
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
@@ -2078,9 +2079,9 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD
EventScript_1A8E11:: @ 81A8E11
checkmoney 1, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A8E2E
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8E3C
end
@@ -2098,7 +2099,7 @@ EventScript_1A8E3C:: @ 81A8E3C
EventScript_1A8E4D:: @ 81A8E4D
special sub_807F0B0
waitstate
fadescreen 1
fadescreen FADE_TO_BLACK
special sp0C8_whiteout_maybe
waitstate
end
@@ -2181,7 +2182,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
compare VAR_RESULT, NO
goto_if_eq EventScript_1B2926
checkmoney 50, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1B292B
playse SE_SHOP
takemoney 50, 0
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+6 -6
View File
@@ -17,13 +17,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
EventScript_16BCF6:: @ 816BCF6
setvar VAR_TEMP_1, 0
checkitem ITEM_FRESH_WATER, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_16BD2C
checkitem ITEM_SODA_POP, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_16BD32
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_16BD38
return
@@ -147,7 +147,7 @@ EventScript_16BF7C:: @ 816BF7C
getitemname 1, VAR_0x8009
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C002
additem VAR_0x8009
textcolor 3
@@ -258,10 +258,10 @@ EventScript_16C0C4:: @ 816C0C4
return
EventScript_16C0CB:: @ 816C0CB
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C131
checkitemspace VAR_TEMP_0, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C13F
compare VAR_TEMP_1, 0
call_if_eq EventScript_16C0B6
data/maps/CeladonCity_GameCorner/scripts.inc
+2 -2
View File
@@ -50,7 +50,7 @@ EventScript_16C706:: @ 816C706
compare VAR_TEMP_1, 9500
goto_if_ge EventScript_16C79E
checkmoney 10000, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C7AC
givecoins 500
takemoney 10000, 0
@@ -62,7 +62,7 @@ EventScript_16C734:: @ 816C734
compare VAR_TEMP_1, 9950
goto_if_ge EventScript_16C79E
checkmoney 1000, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C7AC
givecoins 50
takemoney 1000, 0
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+1 -1
View File
@@ -328,7 +328,7 @@ EventScript_16CF3F:: @ 816CF3F
compare VAR_RESULT, VAR_TEMP_2
goto_if_lt EventScript_16CDA5
checkitemspace VAR_TEMP_1, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16CF79
takecoins VAR_TEMP_2
updatecoinsbox 0, 5
data/maps/CeladonCity_Gym/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ EventScript_16D0A0:: @ 816D0A0
EventScript_16D0C6:: @ 816D0C6
msgbox gUnknown_8197327
checkitemspace ITEM_TM19, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D107
giveitem_msg gUnknown_81973BA, ITEM_TM19
setflag FLAG_GOT_TM19_FROM_ERIKA
data/maps/CeladonCity_Restaurant/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B
msgbox gUnknown_81979C1
checkitemspace ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D241
giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE
setflag FLAG_GOT_COIN_CASE
data/maps/CeruleanCity/scripts.inc
+4 -5
View File
@@ -170,8 +170,7 @@ Movement_1665FB:: @ 81665FB
CeruleanCity_EventScript_166603:: @ 8166603
lock
faceplayer
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5
goto_if_eq EventScript_16662E
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E
message Text_17EE0E
waitmessage
playbgm MUS_ROCKET, 0
@@ -184,14 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603
EventScript_16662E:: @ 816662E
msgbox gUnknown_817EE9C
checkitemspace ITEM_TM28, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_166677
giveitem_msg gUnknown_817EEBF, ITEM_TM28
msgbox gUnknown_817EEED
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 2
fadescreen 0
fadescreen FADE_FROM_BLACK
setflag FLAG_GOT_TM28_FROM_ROCKET
release
end
data/maps/CeruleanCity_Gym/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ EventScript_16AAD3:: @ 816AAD3
EventScript_16AAF9:: @ 816AAF9
msgbox gUnknown_81922F7
checkitemspace ITEM_TM03, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AB3A
giveitem_msg gUnknown_81923F1, ITEM_TM03
setflag FLAG_GOT_TM03_FROM_MISTY
data/maps/CinnabarIsland_Gym/scripts.inc
+7 -13
View File
@@ -67,7 +67,7 @@ EventScript_16DA06:: @ 816DA06
EventScript_16DA34:: @ 816DA34
msgbox gUnknown_819969E
checkitemspace ITEM_TM38, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16DA75
giveitem_msg gUnknown_81996FF, ITEM_TM38
setflag FLAG_GOT_TM38_FROM_BLAINE
@@ -251,8 +251,7 @@ EventScript_16DC68:: @ 816DC68
EventScript_16DC6A:: @ 816DC6A
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_QUINN
goto_if_lt EventScript_16DC7A
goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A
releaseall
end
@@ -328,8 +327,7 @@ EventScript_16DD31:: @ 816DD31
EventScript_16DD41:: @ 816DD41
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_AVERY
goto_if_lt EventScript_16DD51
goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51
releaseall
end
@@ -414,8 +412,7 @@ EventScript_16DE0F:: @ 816DE0F
EventScript_16DE1F:: @ 816DE1F
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_RAMON
goto_if_lt EventScript_16DE2F
goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F
releaseall
end
@@ -491,8 +488,7 @@ EventScript_16DEE6:: @ 816DEE6
EventScript_16DEF6:: @ 816DEF6
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_DEREK
goto_if_lt EventScript_16DF06
goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06
releaseall
end
@@ -568,8 +564,7 @@ EventScript_16DFBD:: @ 816DFBD
EventScript_16DFCD:: @ 816DFCD
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_DUSTY
goto_if_lt EventScript_16DFDD
goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD
releaseall
end
@@ -645,8 +640,7 @@ EventScript_16E094:: @ 816E094
EventScript_16E0A4:: @ 816E0A4
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_ZAC
goto_if_lt EventScript_16E0B4
goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4
releaseall
end
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+1 -2
View File
@@ -4,8 +4,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D
.byte 0
FiveIsland_LostCave_Room10_OnResume:: @ 8164C38
checktrainerflag TRAINER_LADY_SELPHY
call_if_eq EventScript_164C42
call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42
end
EventScript_164C42:: @ 8164C42
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_168A86
releaseall
end
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+3 -4
View File
@@ -8,8 +8,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39
end
FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
checktrainerflag TRAINER_TEAM_ROCKET_ADMIN
call_if_eq EventScript_163F47
call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47
end
EventScript_163F47:: @ 8163F47
@@ -80,13 +79,13 @@ EventScript_16402F:: @ 816402F
call_if_le EventScript_164065
msgbox gUnknown_817BA64
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 1
removeobject 2
removeobject 4
removeobject 3
setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
fadescreen 0
fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
release
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ EventScript_171993:: @ 8171993
compare VAR_RESULT, 1
goto_if_eq EventScript_171A1A
msgbox gUnknown_81BF839
fadescreen 1
fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 6
data/maps/FuchsiaCity_Building1/scripts.inc
+2 -2
View File
@@ -23,9 +23,9 @@ EventScript_16D780:: @ 816D780
msgbox gUnknown_8198EAA
call EventScript_1A6675
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_16D7D6
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_16D7DF
giveitem_msg gUnknown_8199068, ITEM_HM04
setflag FLAG_GOT_HM04
data/maps/FuchsiaCity_Gym/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ EventScript_16D580:: @ 816D580
EventScript_16D5A6:: @ 816D5A6
msgbox gUnknown_819850E
checkitemspace ITEM_TM06, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D5E7
giveitem_msg gUnknown_819858F, ITEM_TM06
setflag FLAG_GOT_TM06_FROM_KOGA
data/maps/FuchsiaCity_House2/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ EventScript_16D83F:: @ 816D83F
EventScript_16D849:: @ 816D849
msgbox gUnknown_8199207
checkitemspace ITEM_GOOD_ROD, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D88A
giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD
msgbox gUnknown_8199296
data/maps/FuchsiaCity_House3/scripts.inc
+2 -2
View File
@@ -23,9 +23,9 @@ EventScript_16D8B0:: @ 816D8B0
compare VAR_RESULT, 1
goto_if_eq EventScript_16D92A
msgbox gUnknown_8199445
fadescreen 1
fadescreen FADE_TO_BLACK
special SelectMove
fadescreen 0
fadescreen FADE_FROM_BLACK
compare VAR_0x8005, 4
goto_if_eq EventScript_16D8B0
special ScrSpecial_GetPokemonNicknameAndMoveName
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -111,7 +111,7 @@ EventScript_16D391:: @ 816D391
EventScript_16D3CA:: @ 816D3CA
call EventScript_16D462
checkmoney 500, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D48C
takemoney 500, 0
updatemoneybox 0, 0, 0
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_16EA79
end
@@ -19,7 +19,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
lock
faceplayer
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16EAA6
msgbox gUnknown_819A8D8
release
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196
msgbox gUnknown_81936FF
checkitemspace ITEM_POKE_FLUTE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B1A0
setflag FLAG_GOT_POKE_FLUTE
giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
data/maps/MtEmber_Exterior/scripts.inc
+6 -10
View File
@@ -25,8 +25,7 @@ EventScript_163975:: @ 8163975
MtEmber_Exterior_EventScript_16397F:: @ 816397F
lock
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43
goto_if_eq EventScript_16399E
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_16399E
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_1639A8
msgbox gUnknown_817A82A
@@ -45,26 +44,24 @@ EventScript_1639A8:: @ 81639A8
msgbox gUnknown_817AA06
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34
msgbox gUnknown_817AA3F
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44
goto_if_eq EventScript_1639DB
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_1639DB
release
end
EventScript_1639DB:: @ 81639DB
msgbox gUnknown_817AAD7
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 2
removeobject 3
fadescreen 0
fadescreen FADE_FROM_BLACK
release
end
MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
lock
faceplayer
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44
goto_if_eq EventScript_163A1B
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_163A1B
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_163A25
msgbox gUnknown_817A88C
@@ -84,8 +81,7 @@ EventScript_163A25:: @ 8163A25
msgbox gUnknown_817AA56
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A
msgbox gUnknown_817AA99
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43
goto_if_eq EventScript_1639DB
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_1639DB
release
end
data/maps/MtMoon_B2F/scripts.inc
+1 -2
View File
@@ -23,8 +23,7 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2
lock
faceplayer
goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707
checktrainerflag TRAINER_SUPER_NERD_MIGUEL
goto_if_eq EventScript_160711
goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711
call EventScript_1606DD
release
end
data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+2 -2
View File
@@ -43,9 +43,9 @@ EventScript_1653C5:: @ 81653C5
OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
lockall
fadescreen 3
fadescreen FADE_TO_WHITE
special sp000_heal_pokemon
fadescreen 2
fadescreen FADE_FROM_WHITE
msgbox gUnknown_817D450
setvar VAR_TEMP_1, 1
releaseall
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -213,7 +213,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_1710F2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1710FC
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
goto_if_eq EventScript_171134
data/maps/PalletTown_GarysHouse/scripts.inc
+3 -3
View File
@@ -65,11 +65,11 @@ EventScript_168DB9:: @ 8168DB9
goto_if_eq EventScript_168E32
msgbox gUnknown_818D8CC
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
special Special_DaisyMassageServices
fadescreen 0
fadescreen FADE_FROM_BLACK
special TV_CopyNicknameToStringVar1AndEnsureTerminated
msgbox gUnknown_818D8FE
release
@@ -142,7 +142,7 @@ EventScript_168EF6:: @ 8168EF6
msgbox gUnknown_818D60A
closemessage
checkitemspace ITEM_TOWN_MAP, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_168F4F
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+4 -4
View File
@@ -6,9 +6,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
faceplayer
goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_168C38
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_168C41
closemessage
applymovement 1, Movement_FaceOriginalDirection
@@ -42,9 +42,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
EventScript_168C78:: @ 8168C78
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_168C91
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_168C9A
releaseall
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -985,7 +985,7 @@ EventScript_1699FB:: @ 81699FB
goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E
goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78
checkitem ITEM_POKE_BALL, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_169A34
goto EventScript_169A6E
end
data/maps/PewterCity_Gym/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ EventScript_16A5C5:: @ 816A5C5
EventScript_16A5F3:: @ 816A5F3
msgbox gUnknown_8190FC1
checkitemspace ITEM_TM39, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16A634
giveitem_msg gUnknown_8190FDB, ITEM_TM39
setflag FLAG_GOT_TM39_FROM_BROCK
data/maps/PewterCity_Museum_1F/scripts.inc
+2 -2
View File
@@ -76,7 +76,7 @@ EventScript_16A3D1:: @ 816A3D1
EventScript_16A402:: @ 816A402
checkmoney 50, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16A476
closemessage
compare VAR_TEMP_1, 0
@@ -155,7 +155,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF
msgbox gUnknown_8190717
checkitemspace ITEM_OLD_AMBER, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16A4F5
setflag FLAG_GOT_OLD_AMBER
removeobject 4
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+6 -12
View File
@@ -16,24 +16,18 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2
end
EventScript_162B1E:: @ 8162B1E
checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
goto_if_eq EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57
return
EventScript_162B31:: @ 8162B31
checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
goto_if_eq EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57
return
EventScript_162B44:: @ 8162B44
checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
goto_if_eq EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57
goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57
return
EventScript_162B57:: @ 8162B57
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -36,7 +36,7 @@ EventScript_162D70:: @ 8162D70
setvar VAR_TEMP_1, 1
call EventScript_1A651A
setrespawn SPAWN_PALLET_TOWN
fadescreenspeed 1, 24
fadescreenspeed FADE_TO_BLACK, 24
special Special_HallOfFame
waitstate
releaseall
data/maps/PokemonTower_1F/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A
lock
faceplayer
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_163272
msgbox gUnknown_8179BFC
release
data/maps/PokemonTower_5F/scripts.inc
+2 -2
View File
@@ -7,9 +7,9 @@ PokemonTower_5F_EventScript_163433:: @ 8163433
PokemonTower_5F_EventScript_16343C:: @ 816343C
lockall
fadescreen 3
fadescreen FADE_TO_WHITE
special sp000_heal_pokemon
fadescreen 2
fadescreen FADE_FROM_WHITE
msgbox gUnknown_817A1FA
setvar VAR_TEMP_1, 1
releaseall
data/maps/RocketHideout_B1F/scripts.inc
+1 -2
View File
@@ -4,8 +4,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195
.byte 0
RocketHideout_B1F_OnLoad:: @ 81611A0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12
call_if_lt EventScript_161233
call_if_undefeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
end
RocketHideout_B1F_OnTransition:: @ 81611AA
data/maps/RocketHideout_B4F/scripts.inc
+8 -14
View File
@@ -4,10 +4,8 @@ RocketHideout_B4F_MapScripts:: @ 81612E8
RocketHideout_B4F_OnLoad:: @ 81612EE
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if_eq EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
compare VAR_TEMP_1, 2
call_if_ne EventScript_16146A
end
@@ -26,14 +24,14 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
waitbuttonpress
trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318
msgbox gUnknown_817532D
fadescreen 1
fadescreen FADE_TO_BLACK
closemessage
removeobject 1
addobject 2
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
fadescreen 0
fadescreen FADE_FROM_BLACK
release
end
@@ -78,10 +76,8 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
EventScript_1613E9:: @ 81613E9
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if_eq EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
compare VAR_TEMP_1, 2
call_if_eq EventScript_1614A1
compare VAR_TEMP_1, 2
@@ -96,10 +92,8 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418
EventScript_161433:: @ 8161433
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if_eq EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
compare VAR_TEMP_1, 2
call_if_eq EventScript_1614A1
compare VAR_TEMP_1, 2
data/maps/Route1/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ Route1_EventScript_167EFE:: @ 8167EFE
msgbox gUnknown_818329D
textcolor 3
checkitemspace ITEM_POTION, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A6BF9
getitemname 1, ITEM_POTION
playfanfare MUS_FANFA1
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -43,7 +43,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819E733
checkitemspace ITEM_EVERSTONE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
data/maps/Route11_EastEntrance_2F/scripts.inc
+1 -1
View File
@@ -70,7 +70,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819EAE4
checkitemspace ITEM_ITEMFINDER, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
setflag FLAG_GOT_ITEMFINDER
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
EventScript_16FF34:: @ 816FF34
checkitemspace ITEM_SUPER_ROD, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16FF75
additem ITEM_SUPER_ROD
msgbox gUnknown_819F05B
data/maps/Route12_NorthEntrance_2F/scripts.inc
+3 -3
View File
@@ -14,12 +14,12 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
faceplayer
goto_if_set FLAG_GOT_TM27, EventScript_16FF01
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_16FEE5
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_16FEEE
checkitemspace ITEM_TM27, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16FEF7
giveitem_msg gUnknown_819EE9F, ITEM_TM27
msgbox gUnknown_819EEC6
data/maps/Route15_WestEntrance_2F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819F6AA
checkitemspace ITEM_EXP_SHARE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
data/maps/Route16_House/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ Route16_House_EventScript_17014F:: @ 817014F
goto_if_set FLAG_GOT_HM02, EventScript_1701A5
msgbox gUnknown_819F851
checkitemspace ITEM_HM02, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_17019B
giveitem_msg gUnknown_819F8C0, ITEM_HM02
msgbox gUnknown_819F8E0
data/maps/Route16_NorthEntrance_2F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819FC15
checkitemspace ITEM_AMULET_COIN, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
data/maps/Route24/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ Route24_EventScript_168620:: @ 8168620
goto_if_eq EventScript_168656
msgbox gUnknown_8188C3C
checkitemspace ITEM_NUGGET, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16864C
call EventScript_1686B9
release
data/maps/Route25_SeaCottage/scripts.inc
+7 -7
View File
@@ -23,9 +23,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B
goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640
goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_170580
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_17058E
end
@@ -67,9 +67,9 @@ EventScript_17059C:: @ 817059C
EventScript_170600:: @ 8170600
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_170618
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_170621
return
@@ -99,12 +99,12 @@ EventScript_170640:: @ 8170640
EventScript_17064A:: @ 817064A
famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_1706AC
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_1706B5
checkitemspace ITEM_SS_TICKET, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1706BE
giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
setflag FLAG_GOT_SS_TICKET_DUP
data/maps/Route2_EastBuilding/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819D74E
checkitemspace ITEM_HM05, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819D7A1, ITEM_HM05
setflag FLAG_GOT_HM05
data/maps/Route4_PokemonCenter_1F/scripts.inc
+5 -5
View File
@@ -24,9 +24,9 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F
goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2
showmoneybox 0, 0, 0
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_16F786
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_16F794
end
@@ -44,7 +44,7 @@ EventScript_16F7A2:: @ 816F7A2
compare VAR_RESULT, NO
goto_if_eq EventScript_16F888
checkmoney 500, 0
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16F895
textcolor 3
setvar VAR_TEMP_1, 129
@@ -63,7 +63,7 @@ EventScript_16F7F6:: @ 816F7F6
compare VAR_RESULT, NO
goto_if_eq EventScript_16F861
call EventScript_1A8C27
fadescreen 1
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
special ChangePokemonNickname
waitstate
@@ -75,7 +75,7 @@ EventScript_16F822:: @ 816F822
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F84B
fadescreen 1
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
special ChangeBoxPokemonNickname
waitstate
data/maps/SSAnne_1F_Room4/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44
lock
faceplayer
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_160C5C
msgbox gUnknown_8173BA4
release
data/maps/SSAnne_1F_Room6/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
EventScript_160E18:: @ 8160E18
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_160E2E
msgbox gUnknown_8174515
release
data/maps/SafariZone_SecretHouse/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453
goto_if_set FLAG_GOT_HM03, EventScript_1624A9
msgbox gUnknown_8177DC1
checkitemspace ITEM_HM03, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16249F
giveitem_msg gUnknown_8177E92, ITEM_HM03
msgbox gUnknown_8177EB7
data/maps/SaffronCity_Gym/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ EventScript_16EE0A:: @ 816EE0A
EventScript_16EE3D:: @ 816EE3D
msgbox gUnknown_819B6FA
checkitemspace ITEM_TM04, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16EE7E
giveitem_msg gUnknown_819B7D3, ITEM_TM04
setflag FLAG_GOT_TM04_FROM_SABRINA
data/maps/SaffronCity_House1_2F/scripts.inc
+3 -3
View File
@@ -25,12 +25,12 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
lock
faceplayer
checkitem ITEM_POKE_DOLL, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1C4CF6
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_16EBB7
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_16EBC0
release
end
data/maps/SaffronCity_House3/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F
goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5
msgbox gUnknown_819C142
checkitemspace ITEM_TM29, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16F0AB
giveitem_msg gUnknown_819C16C, ITEM_TM29
msgbox gUnknown_819C18F
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -127,7 +127,7 @@ EventScript_170A11:: @ 8170A11
EventScript_170A1E:: @ 8170A1E
msgbox gUnknown_81A06AB
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80A0334
waitstate
return
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -221,7 +221,7 @@ Movement_164AD6:: @ 8164AD6
SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
lockall
fadescreen 1
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1
special Special_BattleRecords
waitstate
data/maps/SilphCo_11F/scripts.inc
+5 -5
View File
@@ -11,12 +11,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE
faceplayer
goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_161E59
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_161E62
checkitemspace ITEM_MASTER_BALL, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_161E6B
giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5
msgbox gUnknown_8176FEB
@@ -77,11 +77,11 @@ EventScript_161EA0:: @ 8161EA0
trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB
msgbox gUnknown_81771C2
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 3
removeobject 4
removeobject 6
fadescreen 0
fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_SILPH_CO_11F, 1
setflag FLAG_HIDE_SAFFRON_ROCKETS
clearflag FLAG_HIDE_SAFFRON_CIVILIANS
data/maps/ThreeIsland/scripts.inc
+3 -3
View File
@@ -47,7 +47,7 @@ EventScript_16781A:: @ 816781A
waitmovement 0
msgbox gUnknown_818275A
checkitemspace ITEM_FULL_RESTORE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_167865
msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE
additem ITEM_FULL_RESTORE
@@ -270,7 +270,7 @@ EventScript_167A59:: @ 8167A59
trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7
msgbox gUnknown_818271D
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 3
removeobject 5
removeobject 7
@@ -278,7 +278,7 @@ EventScript_167A59:: @ 8167A59
removeobject 6
removeobject 8
removeobject 14
fadescreen 0
fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_THREE_ISLAND, 4
releaseall
end
data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+3 -3
View File
@@ -6,9 +6,9 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL
specialvar VAR_RESULT, IsNationalPokedexEnabled
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1
compare VAR_0x8008, TRUE
call_if_eq EventScript_164D50
compare VAR_0x8008, 0
compare VAR_0x8008, FALSE
call_if_eq EventScript_164D54
end
@@ -26,7 +26,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
faceplayer
goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_164D90
msgbox gUnknown_817D13B
closemessage
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -19,10 +19,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619
EventScript_17164F:: @ 817164F
checkitem ITEM_BIG_MUSHROOM, 1
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_1717A8
checkitem ITEM_TINY_MUSHROOM, 2
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
call_if_eq EventScript_1717AC
goto_if_set FLAG_TEMP_2, EventScript_171687
goto_if_set FLAG_TEMP_3, EventScript_171696
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -165,7 +165,7 @@ EventScript_17158A:: @ 817158A
EventScript_1715C4:: @ 81715C4
checkitemspace ITEM_MOON_STONE, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1715FF
additem ITEM_MOON_STONE
setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -59,7 +59,7 @@ VermilionCity_EventScript_166941:: @ 8166941
EventScript_166958:: @ 8166958
goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0
checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A77B0
goto EventScript_1A77AA
end
@@ -67,7 +67,7 @@ EventScript_166958:: @ 8166958
EventScript_166977:: @ 8166977
goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0
checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A77B0
goto EventScript_1A77AA
end
data/maps/VermilionCity_Gym/scripts.inc
+1 -1
View File
@@ -227,7 +227,7 @@ EventScript_16B9AB:: @ 816B9AB
EventScript_16B9AF:: @ 816B9AF
msgbox gUnknown_8194CFA
checkitemspace ITEM_TM34, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B9F0
giveitem_msg gUnknown_8194D87, ITEM_TM34
setflag FLAG_GOT_TM34_FROM_SURGE
data/maps/VermilionCity_House1/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ EventScript_16B3CF:: @ 816B3CF
EventScript_16B3D9:: @ 816B3D9
checkitemspace ITEM_OLD_ROD, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B41A
additem ITEM_OLD_ROD
msgbox gUnknown_8193F2A
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ EventScript_16B4A7:: @ 816B4A7
EventScript_16B4B1:: @ 816B4B1
msgbox gUnknown_8194628
checkitemspace ITEM_BIKE_VOUCHER, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B4F2
setflag FLAG_GOT_BIKE_VOUCHER
giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5
data/maps/ViridianCity_Gym/scripts.inc
+3 -3
View File
@@ -7,9 +7,9 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F
msgbox gUnknown_818F4A2
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 8
fadescreen 0
fadescreen FADE_FROM_BLACK
release
end
@@ -26,7 +26,7 @@ EventScript_169F04:: @ 8169F04
EventScript_169F2F:: @ 8169F2F
msgbox gUnknown_818F586
checkitemspace ITEM_TM26, 1
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_169F70
giveitem_msg gUnknown_818F675, ITEM_TM26
setflag FLAG_GOT_TM26_FROM_GIOVANNI
data/mystery_event_msg.s
+19 -18
View File
@@ -1,5 +1,6 @@
@ These are event scripts. They should not be moved to C.
#include "constants/global.h"
#include "constants/flags.h"
#include "constants/moves.h"
#include "constants/songs.h"
@@ -42,8 +43,8 @@ MysteryEventScript_SurfPichu:: @ 8488EB5
SurfPichu_GiveIfPossible: @ 8488EC4
specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
compare VAR_EVENT_PICHU_SLOT, 6
vgoto_if TRUE, SurfPichu_FullParty
compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
vgoto_if_eq SurfPichu_FullParty
setflag FLAG_MYSTERY_EVENT_DONE
vcall SurfPichu_GiveEgg
lock
@@ -70,15 +71,15 @@ SurfPichu_GiveEgg: @ 8488EF6
setmonobedient VAR_EVENT_PICHU_SLOT
setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff
compare VAR_EVENT_PICHU_SLOT, 1
vgoto_if TRUE, SurfPichu_Slot1
vgoto_if_eq SurfPichu_Slot1
compare VAR_EVENT_PICHU_SLOT, 2
vgoto_if TRUE, SurfPichu_Slot2
vgoto_if_eq SurfPichu_Slot2
compare VAR_EVENT_PICHU_SLOT, 3
vgoto_if TRUE, SurfPichu_Slot3
vgoto_if_eq SurfPichu_Slot3
compare VAR_EVENT_PICHU_SLOT, 4
vgoto_if TRUE, SurfPichu_Slot4
vgoto_if_eq SurfPichu_Slot4
compare VAR_EVENT_PICHU_SLOT, 5
vgoto_if TRUE, SurfPichu_Slot5
vgoto_if_eq SurfPichu_Slot5
return
SurfPichu_Slot1: @ 8488F38
@@ -118,7 +119,7 @@ MysteryEventScript_VisitingTrainer:: @ 848903A
setvaddress MysteryEventScript_VisitingTrainer
special ValidateEReaderTrainer
compare VAR_RESULT, 0
vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived
vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
lock
faceplayer
vmessage sText_MysteryGiftVisitingTrainer
@@ -170,7 +171,7 @@ MysteryEventScript_BattleCard:: @ 84892B9
setorcopyvar VAR_RESULT, 2
specialvar VAR_0x8008, Special_BattleCardAction
compare VAR_0x8008, 3
vgoto_if FALSE, MysteryEventScript_BattleCardInfo
vgoto_if_ne MysteryEventScript_BattleCardInfo
lock
faceplayer
vmessage sText_MysteryGiftBattleCountCard_2
@@ -218,14 +219,14 @@ MysteryEventScript_AuroraTicket:: @ 84894B9
vgoto_if_set FLAG_GOT_AURORA_TICKET, AuroraTicket_Obtained
vgoto_if_set FLAG_FOUGHT_DEOXYS, AuroraTicket_Obtained
checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, 1
vgoto_if TRUE, AuroraTicket_Obtained
compare VAR_RESULT, TRUE
vgoto_if_eq AuroraTicket_Obtained
vmessage sText_AuroraTicket1
waitmessage
waitbuttonpress
checkitemspace ITEM_AURORA_TICKET, 1
compare VAR_RESULT, 0
vgoto_if TRUE, AuroraTicket_NoBagSpace
compare VAR_RESULT, FALSE
vgoto_if_eq AuroraTicket_NoBagSpace
giveitem ITEM_AURORA_TICKET
setflag FLAG_SYS_GOT_AURORA_TICKET
setflag FLAG_GOT_AURORA_TICKET
@@ -279,14 +280,14 @@ MysteryEventScript_MysticTicket:: @ 8489689
vgoto_if_set FLAG_FOUGHT_LUGIA, MysticTicket_Obtained
vgoto_if_set FLAG_FOUGHT_HO_OH, MysticTicket_Obtained
checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, 1
vgoto_if TRUE, MysticTicket_Obtained
compare VAR_RESULT, TRUE
vgoto_if_eq MysticTicket_Obtained
vmessage sText_MysticTicket2
waitmessage
waitbuttonpress
checkitemspace ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, 0
vgoto_if TRUE, MysticTicket_NoBagSpace
compare VAR_RESULT, FALSE
vgoto_if_eq MysticTicket_NoBagSpace
giveitem ITEM_MYSTIC_TICKET
setflag FLAG_SYS_GOT_MYSTIC_TICKET
setflag FLAG_GOT_MYSTIC_TICKET
@@ -336,7 +337,7 @@ MysteryEventScript_AlteringCave:: @ 8489862
setvaddress MysteryEventScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1
compare VAR_ALTERING_CAVE_WILD_SET, 10
vgoto_if FALSE, MysteryEventScript_AlteringCave_
vgoto_if_ne MysteryEventScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0
MysteryEventScript_AlteringCave_: @ 848987C
lock
data/scripts/cable_club.inc
+12 -12
View File
@@ -608,7 +608,7 @@ gUnknown_81BB8A7:: @ 81BB8A7
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
lockall
fadescreen 1
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 0
special Special_BattleRecords
waitstate
@@ -633,7 +633,7 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF
gUnknown_81BB8DB:: @ 81BB8DB
UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80A0334
waitstate
compare VAR_RESULT, 0
@@ -646,7 +646,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
gUnknown_81BB8F8:: @ 81BB8F8
UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80A0334
waitstate
compare VAR_RESULT, 0
@@ -659,7 +659,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
gUnknown_81BB915:: @ 81BB915
UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80A0334
waitstate
compare VAR_RESULT, 0
@@ -672,7 +672,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
gUnknown_81BB932:: @ 81BB932
UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_80A0334
waitstate
compare VAR_RESULT, 0
@@ -723,7 +723,7 @@ UnknownMap_00_02_EventScript_1BB980:: @ 81BB980
gUnknown_81BB981:: @ 81BB981
textcolor 3
msgbox Text_LookedAtPlayersTrainerCard
fadescreen 1
fadescreen FADE_TO_BLACK
special sp02A_crash_sound
waitstate
end
@@ -731,7 +731,7 @@ gUnknown_81BB981:: @ 81BB981
gUnknown_81BB992:: @ 81BB992
textcolor 3
msgbox Text_LookedAtPlayersTrainerCardColored
fadescreen 1
fadescreen FADE_TO_BLACK
special sp02A_crash_sound
waitstate
end
@@ -796,7 +796,7 @@ EventScript_1BBA04:: @ 81BBA04
goto_if_eq EventScript_1BB867
copyvar VAR_0x8007, VAR_LAST_TALKED
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1BBB60
message Text_1BD65B
waitmessage
@@ -915,7 +915,7 @@ EventScript_1BBB9C:: @ 81BBB9C
compare VAR_RESULT, 1
goto_if_eq EventScript_1BB867
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1BB44A
message Text_1BD28D
waitmessage
@@ -1191,10 +1191,10 @@ gUnknown_81BBFD8:: @ 81BBFD8
lockall
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1BC016
special HelpSystem_Disable
fadescreen 1
fadescreen FADE_TO_BLACK
special sub_814F1D4
waitstate
msgbox gUnknown_81BCA43
@@ -1295,7 +1295,7 @@ EventScript_1BC0CE:: @ 81BC0CE
message Text_1BCF69
waitmessage
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1BC29C
delay 60
special HelpSystem_Disable
data/scripts/day_care.inc
+1 -1
View File
@@ -20,7 +20,7 @@ EventScript_1BF3DD:: @ 81BF3DD
compare VAR_RESULT, 1
goto_if_eq EventScript_1BF452
msgbox Text_19DDBE
fadescreen 1
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
special ChooseSendDaycareMon
waitstate
data/scripts/move_tutors.inc
+4 -4
View File
@@ -402,9 +402,9 @@ EventScript_1C4D4F:: @ 81C4D4F
EventScript_1C4D59:: @ 81C4D59
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq EventScript_1C4D72
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq EventScript_1C4D7B
release
end
@@ -477,11 +477,11 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
goto_if_eq EventScript_1C4F1C
msgbox Text_1A4814
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
goto EventScript_1C4EDA
EventScript_1C4E8F:: @ 81C4E8F
fadescreen 0
fadescreen FADE_FROM_BLACK
goto EventScript_1C4EAB
end
data/scripts/seagallop.inc
+1 -1
View File
@@ -113,7 +113,7 @@ EventScript_1A90DA:: @ 81A90DA
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
special sub_8112364
fadescreen 1
fadescreen FADE_TO_BLACK
special ScrSpecial_SeagallopFerry
waitstate
end
data/scripts/static_pokemon.inc
+4 -4
View File
@@ -1,14 +1,14 @@
EventScript_1A922D:: @ 81A922D
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreen 0
fadescreen FADE_FROM_BLACK
release
end
EventScript_1A9236:: @ 81A9236
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreen 0
fadescreen FADE_FROM_BLACK
getspeciesname 0, VAR_0x8004
msgbox Text_1A63C4
release