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

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+382 -258
View File
File diff suppressed because it is too large Load Diff
data/event_scripts.s
+56 -65
View File
@@ -68,7 +68,7 @@ gStdScripts:: @ 8160450
.4byte Std_MsgboxAutoclose
.4byte Std_ObtainDecoration
.4byte Std_PutItemAway
.4byte gStdScript_ItemMessageAndFanfare
.4byte Std_ReceivedItem
gStdScriptsEnd::
.include "data/maps/UnknownMap_00_00/scripts.inc"
@@ -1175,7 +1175,7 @@ EventScript_1A651A:: @ 81A651A
special sub_81130A8
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 0
call_if eq, EventScript_1A653B
call_if_eq EventScript_1A653B
call EventScript_1A6541
return
@@ -1258,7 +1258,7 @@ gUnknown_81A6C32:: @ 81A6C32
msgbox Text_ATownMap
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
fadescreen 1
special Special_TownMap
waitstate
@@ -1503,7 +1503,7 @@ gUnknown_81A7702:: @ 81A7702
textcolor 3
msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1A778A
goto_if_eq EventScript_1A778A
setvar VAR_0x8004, 14
call EventScript_1A6AC0
lock
@@ -1511,11 +1511,11 @@ gUnknown_81A7702:: @ 81A7702
specialvar VAR_0x8008, Special_GetMartClerkObjectId
textcolor 0
compare VAR_0x8004, 0
goto_if eq, EventScript_1A774D
goto_if_eq EventScript_1A774D
compare VAR_RESULT, 0
goto_if eq, EventScript_1A778A
goto_if_eq EventScript_1A778A
compare VAR_RESULT, 1
goto_if eq, EventScript_1A778C
goto_if_eq EventScript_1A778C
end
EventScript_1A774D:: @ 81A774D
@@ -1610,10 +1610,9 @@ EventScript_1A7AE0:: @ 81A7AE0
EventScript_1A7AE2:: @ 81A7AE2
msgbox Text_177460, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1A7B70
goto_if_eq EventScript_1A7B70
msgbox Text_17747B
checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
goto_if TRUE, EventScript_1A7B3B
goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B
setflag FLAG_POKEMON_MANSION_SWITCH_STATE
switch VAR_0x8004
case 0, EventScript_1A7B7A
@@ -1836,7 +1835,7 @@ EventScript_1A80FE:: @ 81A80FE
.include "data/scripts/silphco_doors.inc"
EventScript_1A8C27:: @ 81A8C27
countpokemon
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
return
@@ -1852,16 +1851,14 @@ EventScript_1A8C33:: @ 81A8C33
EventScript_1A8C3C:: @ 81A8C3C
bufferboxname 0, VAR_0x4037
getspeciesname 1, VAR_TEMP_1
checkflag FLAG_SYS_NOT_SOMEONES_PC
call_if FALSE, EventScript_1A8C57
checkflag FLAG_SYS_NOT_SOMEONES_PC
call_if TRUE, EventScript_1A8C82
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82
return
EventScript_1A8C57:: @ 81A8C57
specialvar VAR_RESULT, sub_80CC7B4
compare VAR_RESULT, 1
goto_if eq, EventScript_1A8C70
goto_if_eq EventScript_1A8C70
msgbox Text_1A5CF1
return
@@ -1874,7 +1871,7 @@ EventScript_1A8C70:: @ 81A8C70
EventScript_1A8C82:: @ 81A8C82
specialvar VAR_RESULT, sub_80CC7B4
compare VAR_RESULT, 1
goto_if eq, EventScript_1A8C9B
goto_if_eq EventScript_1A8C9B
msgbox Text_1A5D31
return
@@ -1993,13 +1990,12 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
lock
faceplayer
checkflag FLAG_GOT_VS_SEEKER
goto_if TRUE, EventScript_1A8D3F
goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F
msgbox Text_194234
setflag FLAG_GOT_VS_SEEKER
giveitem ITEM_VS_SEEKER
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
goto_if_eq EventScript_1A6BF9
msgbox Text_19430F
release
end
@@ -2015,9 +2011,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49
waitse
call EventScript_GiveItem
compare VAR_0x8007, 1
goto_if eq, EventScript_DigUpItemPutInPocket
goto_if_eq EventScript_DigUpItemPutInPocket
compare VAR_0x8007, 0
goto_if eq, EventScript_DigUpItemBagIsFull
goto_if_eq EventScript_DigUpItemBagIsFull
end
EventScript_DigUpItemPutInPocket::
@@ -2042,10 +2038,8 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97
textcolor 1
msgbox Text_1A5E89
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
checkflag FLAG_DEFEATED_BROCK
call_if FALSE, EventScript_1A8DC6
checkflag FLAG_DEFEATED_BROCK
call_if TRUE, EventScript_1A8DCF
call_if_unset FLAG_DEFEATED_BROCK, EventScript_1A8DC6
call_if_set FLAG_DEFEATED_BROCK, EventScript_1A8DCF
applymovement VAR_LAST_TALKED, Movement_1A666C
waitmovement 0
fadedefaultbgm
@@ -2078,16 +2072,16 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD
special ExecuteWhiteOut
waitstate
compare VAR_RESULT, 1
goto_if eq, EventScript_1A8E11
goto_if_eq EventScript_1A8E11
releaseall
end
EventScript_1A8E11:: @ 81A8E11
checkmoney 1, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1A8E2E
goto_if_eq EventScript_1A8E2E
compare VAR_RESULT, 1
goto_if eq, EventScript_1A8E3C
goto_if_eq EventScript_1A8E3C
end
EventScript_1A8E2E:: @ 81A8E2E
@@ -2149,8 +2143,7 @@ EventScript_1A8EC0:: @ 81A8EC0
.include "data/scripts/static_pokemon.inc"
EventScript_1A925E:: @ 81A925E
checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
goto_if TRUE, EventScript_1A77A9
goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_1A77A9
setweather 11
doweather
return
@@ -2186,10 +2179,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
showmoneybox 0, 0, 0
msgbox gUnknown_81B1D7D, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1B2926
goto_if_eq EventScript_1B2926
checkmoney 50, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_1B292B
goto_if_eq EventScript_1B292B
playse SE_SHOP
takemoney 50, 0
updatemoneybox 0, 0, 0
@@ -2258,10 +2251,8 @@ EventScript_1B292B:: @ 81B292B
FourIsland_House2_EventScript_1B2938:: @ 81B2938
lock
specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
checkflag FLAG_MET_STICKER_LADY
goto_if FALSE, EventScript_1B2951
checkflag FLAG_MET_STICKER_LADY
goto_if TRUE, EventScript_1B2994
goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
end
EventScript_1B2951:: @ 81B2951
@@ -2275,7 +2266,7 @@ EventScript_1B2951:: @ 81B2951
applymovement 1, Movement_Delay48
waitmovement 0
compare VAR_0x8008, 0
goto_if eq, EventScript_1B2B8E
goto_if_eq EventScript_1B2B8E
message gUnknown_81B1EF8
waitmessage
goto EventScript_1B29D0
@@ -2288,10 +2279,10 @@ EventScript_1B2994:: @ 81B2994
waitmovement 0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
compare VAR_0x8008, 0
goto_if eq, EventScript_1B29C6
goto_if_eq EventScript_1B29C6
message gUnknown_81B2025
waitmessage
goto EventScript_1B29D0
@@ -2383,18 +2374,18 @@ EventScript_1B2B8E:: @ 81B2B8E
EventScript_1B2B98:: @ 81B2B98
compare VAR_0x8004, 39
goto_if le, EventScript_1B2BC5
goto_if_le EventScript_1B2BC5
compare VAR_0x8004, 99
goto_if le, EventScript_1B2BE3
goto_if_le EventScript_1B2BE3
compare VAR_0x8004, 199
goto_if le, EventScript_1B2C01
goto_if_le EventScript_1B2C01
compare VAR_0x8004, 200
goto_if ge, EventScript_1B2C1F
goto_if_ge EventScript_1B2C1F
end
EventScript_1B2BC5:: @ 81B2BC5
compare VAR_HOF_BRAG_STATE, 1
goto_if eq, EventScript_1B2C3D
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 1
msgbox gUnknown_81B206E
goto EventScript_1B2C51
@@ -2404,7 +2395,7 @@ EventScript_1B2BE2:: @ 81B2BE2
EventScript_1B2BE3:: @ 81B2BE3
compare VAR_HOF_BRAG_STATE, 2
goto_if eq, EventScript_1B2C3D
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 2
msgbox gUnknown_81B20CF
goto EventScript_1B2C51
@@ -2414,7 +2405,7 @@ EventScript_1B2C00:: @ 81B2C00
EventScript_1B2C01:: @ 81B2C01
compare VAR_HOF_BRAG_STATE, 3
goto_if eq, EventScript_1B2C3D
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 3
msgbox gUnknown_81B2133
goto EventScript_1B2C51
@@ -2424,7 +2415,7 @@ EventScript_1B2C1E:: @ 81B2C1E
EventScript_1B2C1F:: @ 81B2C1F
compare VAR_HOF_BRAG_STATE, 4
goto_if eq, EventScript_1B2C47
goto_if_eq EventScript_1B2C47
setvar VAR_HOF_BRAG_STATE, 4
msgbox gUnknown_81B21C4
goto EventScript_1B2C51
@@ -2454,18 +2445,18 @@ EventScript_1B2C51:: @ 81B2C51
EventScript_1B2C62:: @ 81B2C62
compare VAR_0x8005, 99
goto_if le, EventScript_1B2C8F
goto_if_le EventScript_1B2C8F
compare VAR_0x8005, 199
goto_if le, EventScript_1B2CAD
goto_if_le EventScript_1B2CAD
compare VAR_0x8005, 299
goto_if le, EventScript_1B2CCB
goto_if_le EventScript_1B2CCB
compare VAR_0x8005, 300
goto_if ge, EventScript_1B2CE9
goto_if_ge EventScript_1B2CE9
end
EventScript_1B2C8F:: @ 81B2C8F
compare VAR_EGG_BRAG_STATE, 1
goto_if eq, EventScript_1B2D07
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 1
msgbox gUnknown_81B2308
goto EventScript_1B2D1B
@@ -2475,7 +2466,7 @@ EventScript_1B2CAC:: @ 81B2CAC
EventScript_1B2CAD:: @ 81B2CAD
compare VAR_EGG_BRAG_STATE, 2
goto_if eq, EventScript_1B2D07
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 2
msgbox gUnknown_81B2372
goto EventScript_1B2D1B
@@ -2485,7 +2476,7 @@ EventScript_1B2CCA:: @ 81B2CCA
EventScript_1B2CCB:: @ 81B2CCB
compare VAR_EGG_BRAG_STATE, 3
goto_if eq, EventScript_1B2D07
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 3
msgbox gUnknown_81B23E0
goto EventScript_1B2D1B
@@ -2495,7 +2486,7 @@ EventScript_1B2CE8:: @ 81B2CE8
EventScript_1B2CE9:: @ 81B2CE9
compare VAR_EGG_BRAG_STATE, 4
goto_if eq, EventScript_1B2D11
goto_if_eq EventScript_1B2D11
setvar VAR_EGG_BRAG_STATE, 4
msgbox gUnknown_81B2448
goto EventScript_1B2D1B
@@ -2525,18 +2516,18 @@ EventScript_1B2D1B:: @ 81B2D1B
EventScript_1B2D2C:: @ 81B2D2C
compare VAR_0x8006, 19
goto_if le, EventScript_1B2D59
goto_if_le EventScript_1B2D59
compare VAR_0x8006, 49
goto_if le, EventScript_1B2D77
goto_if_le EventScript_1B2D77
compare VAR_0x8006, 99
goto_if le, EventScript_1B2D95
goto_if_le EventScript_1B2D95
compare VAR_0x8006, 100
goto_if ge, EventScript_1B2DB3
goto_if_ge EventScript_1B2DB3
end
EventScript_1B2D59:: @ 81B2D59
compare VAR_LINK_WIN_BRAG_STATE, 1
goto_if eq, EventScript_1B2DD1
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 1
msgbox gUnknown_81B25A7
goto EventScript_1B2DE5
@@ -2546,7 +2537,7 @@ EventScript_1B2D76:: @ 81B2D76
EventScript_1B2D77:: @ 81B2D77
compare VAR_LINK_WIN_BRAG_STATE, 2
goto_if eq, EventScript_1B2DD1
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 2
msgbox gUnknown_81B2609
goto EventScript_1B2DE5
@@ -2556,7 +2547,7 @@ EventScript_1B2D94:: @ 81B2D94
EventScript_1B2D95:: @ 81B2D95
compare VAR_LINK_WIN_BRAG_STATE, 3
goto_if eq, EventScript_1B2DD1
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 3
msgbox gUnknown_81B267B
goto EventScript_1B2DE5
@@ -2566,7 +2557,7 @@ EventScript_1B2DB2:: @ 81B2DB2
EventScript_1B2DB3:: @ 81B2DB3
compare VAR_LINK_WIN_BRAG_STATE, 4
goto_if eq, EventScript_1B2DDB
goto_if_eq EventScript_1B2DDB
setvar VAR_LINK_WIN_BRAG_STATE, 4
msgbox gUnknown_81B26F6
goto EventScript_1B2DE5
@@ -2626,7 +2617,7 @@ EventScript_SafariRetire:: @ 81BFBAA
lockall
msgbox Text_1BFBE9, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if eq, EventScript_1BFBC0
goto_if_eq EventScript_1BFBC0
releaseall
end
data/maps/BirthIsland_Exterior/scripts.inc
+9 -13
View File
@@ -13,10 +13,8 @@ BirthIsland_Exterior_OnTransition:: @ 8165217
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
setvar VAR_DEOXYS_INTERACTION_NUM, 0
checkflag FLAG_FOUGHT_DEOXYS
call_if TRUE, EventScript_16523C
checkflag FLAG_FOUGHT_DEOXYS
call_if FALSE, EventScript_165243
call_if_set FLAG_FOUGHT_DEOXYS, EventScript_16523C
call_if_unset FLAG_FOUGHT_DEOXYS, EventScript_165243
end
EventScript_16523C:: @ 816523C
@@ -25,21 +23,19 @@ EventScript_16523C:: @ 816523C
return
EventScript_165243:: @ 8165243
checkflag FLAG_DEOXYS_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_1A77A9
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_SYS_DEOXYS_AWAKENED
return
BirthIsland_Exterior_OnResume:: @ 8165253
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_16525D
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_16525D
end
EventScript_16525D:: @ 816525D
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject 2
return
@@ -48,7 +44,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
faceplayer
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
special Special_DeoxysSound
waitstate
@@ -97,11 +93,11 @@ EventScript_1652C0:: @ 81652C0
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16533A
goto_if_eq EventScript_16533A
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_165348
goto_if_eq EventScript_165348
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_165348
goto_if_eq EventScript_165348
setflag FLAG_FOUGHT_DEOXYS
release
end
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+4 -7
View File
@@ -4,17 +4,14 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
lock
faceplayer
checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
goto_if TRUE, EventScript_16C36A
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_16C374
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16C36A
goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374
goto_if_set FLAG_GOT_TEA, EventScript_16C36A
msgbox gUnknown_81960C9
setflag FLAG_GOT_TEA
giveitem ITEM_TEA
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
goto_if_eq EventScript_1A6BF9
msgbox gUnknown_8196109
release
end
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
faceplayer
specialvar VAR_RESULT, HasAllKantoMons
compare VAR_RESULT, 1
goto_if eq, EventScript_16C412
goto_if_eq EventScript_16C412
msgbox gUnknown_8196356
release
end
@@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418
delay 60
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special Special_ShowDiploma
waitstate
release
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+6 -6
View File
@@ -9,13 +9,13 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
lock
faceplayer
setvar VAR_TEMP_1, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
givemon SPECIES_EEVEE, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if eq, EventScript_16C4A6
goto_if_eq EventScript_16C4A6
compare VAR_RESULT, 1
goto_if eq, EventScript_16C4DA
goto_if_eq EventScript_16C4DA
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
goto_if_eq EventScript_1A927C
release
end
@@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16C514
goto_if_eq EventScript_16C514
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16C514
@@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16C509
goto_if_eq EventScript_16C509
call EventScript_1A8C33
goto EventScript_16C509
end
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+2 -2
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
@@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38
CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+2 -2
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
@@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84
CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+6 -7
View File
@@ -4,8 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
lockall
setvar VAR_0x8004, 3
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
@@ -62,7 +61,7 @@ EventScript_16C246:: @ 816C246
setvar VAR_0x8006, 4
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
compare VAR_ELEVATOR_FLOOR, 4
goto_if eq, EventScript_16C30E
goto_if_eq EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 4
goto EventScript_16C30E
@@ -72,7 +71,7 @@ EventScript_16C26E:: @ 816C26E
setvar VAR_0x8006, 5
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
compare VAR_ELEVATOR_FLOOR, 5
goto_if eq, EventScript_16C30E
goto_if_eq EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 5
goto EventScript_16C30E
@@ -82,7 +81,7 @@ EventScript_16C296:: @ 816C296
setvar VAR_0x8006, 6
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
compare VAR_ELEVATOR_FLOOR, 6
goto_if eq, EventScript_16C30E
goto_if_eq EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 6
goto EventScript_16C30E
@@ -92,7 +91,7 @@ EventScript_16C2BE:: @ 816C2BE
setvar VAR_0x8006, 7
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
compare VAR_ELEVATOR_FLOOR, 7
goto_if eq, EventScript_16C30E
goto_if_eq EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 7
goto EventScript_16C30E
@@ -102,7 +101,7 @@ EventScript_16C2E6:: @ 816C2E6
setvar VAR_0x8006, 8
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
compare VAR_ELEVATOR_FLOOR, 8
goto_if eq, EventScript_16C30E
goto_if_eq EventScript_16C30E
call EventScript_16C313
setvar VAR_ELEVATOR_FLOOR, 8
goto EventScript_16C30E
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+20 -23
View File
@@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
call EventScript_16BCF6
compare VAR_TEMP_1, 0
goto_if eq, EventScript_16C00E
goto_if_eq EventScript_16C00E
goto EventScript_16BD3E
end
@@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6
setvar VAR_TEMP_1, 0
checkitem ITEM_FRESH_WATER, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD2C
call_if_eq EventScript_16BD2C
checkitem ITEM_SODA_POP, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD32
call_if_eq EventScript_16BD32
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD38
call_if_eq EventScript_16BD38
return
EventScript_16BD2C:: @ 816BD2C
@@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38
EventScript_16BD3E:: @ 816BD3E
msgbox gUnknown_8195D22, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16C00C
goto_if_eq EventScript_16C00C
textcolor 3
message Text_195D5F
waitmessage
@@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7
EventScript_16BF19:: @ 816BF19
setvar VAR_0x8008, ITEM_FRESH_WATER
setvar VAR_0x8009, ITEM_TM16
checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195D75
goto EventScript_16BF7C
end
@@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19
EventScript_16BF3A:: @ 816BF3A
setvar VAR_0x8008, ITEM_SODA_POP
setvar VAR_0x8009, ITEM_TM20
checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195E33
goto EventScript_16BF7C
end
@@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A
EventScript_16BF5B:: @ 816BF5B
setvar VAR_0x8008, ITEM_LEMONADE
setvar VAR_0x8009, ITEM_TM33
checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195EBF
goto EventScript_16BF7C
end
@@ -151,8 +148,8 @@ EventScript_16BF7C:: @ 816BF7C
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16C002
additem VAR_0x8009, 1
goto_if_eq EventScript_16C002
additem VAR_0x8009
textcolor 3
playfanfare MUS_FANFA1
message Text_ReceivedItemFromLittleGirl
@@ -161,11 +158,11 @@ EventScript_16BF7C:: @ 816BF7C
putitemaway VAR_0x8009
call EventScript_1A6675
compare VAR_0x8008, ITEM_FRESH_WATER
call_if eq, EventScript_16BFDE
call_if_eq EventScript_16BFDE
compare VAR_0x8008, ITEM_SODA_POP
call_if eq, EventScript_16BFEA
call_if_eq EventScript_16BFEA
compare VAR_0x8008, ITEM_LEMONADE
call_if eq, EventScript_16BFF6
call_if_eq EventScript_16BFF6
release
end
@@ -262,21 +259,21 @@ EventScript_16C0C4:: @ 816C0C4
EventScript_16C0CB:: @ 816C0CB
compare VAR_RESULT, 0
goto_if eq, EventScript_16C131
goto_if_eq EventScript_16C131
checkitemspace VAR_TEMP_0, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16C13F
goto_if_eq EventScript_16C13F
compare VAR_TEMP_1, 0
call_if eq, EventScript_16C0B6
call_if_eq EventScript_16C0B6
compare VAR_TEMP_1, 1
call_if eq, EventScript_16C0BD
call_if_eq EventScript_16C0BD
compare VAR_TEMP_1, 2
call_if eq, EventScript_16C0C4
call_if_eq EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, VAR_TEMP_0
playse SE_JIHANKI
msgbox gUnknown_8196076
additem VAR_TEMP_0, 1
additem VAR_TEMP_0
goto EventScript_16C125
end
data/maps/CeladonCity_GameCorner/scripts.inc
+25 -36
View File
@@ -3,8 +3,7 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
.byte 0
CeladonCity_GameCorner_OnLoad:: @ 816C64C
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16C656
call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656
end
EventScript_16C656:: @ 816C656
@@ -22,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
showmoneybox 0, 0, 0
@@ -39,21 +38,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
end
EventScript_16C6E6:: @ 816C6E6
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C790
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790
compare VAR_0x8009, 0
goto_if eq, EventScript_16C734
goto_if_eq EventScript_16C734
compare VAR_0x8009, 1
goto_if eq, EventScript_16C706
goto_if_eq EventScript_16C706
end
EventScript_16C706:: @ 816C706
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9500
goto_if ge, EventScript_16C79E
goto_if_ge EventScript_16C79E
checkmoney 10000, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C7AC
goto_if_eq EventScript_16C7AC
givecoins 500
takemoney 10000, 0
goto EventScript_16C762
@@ -62,10 +60,10 @@ EventScript_16C706:: @ 816C706
EventScript_16C734:: @ 816C734
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9950
goto_if ge, EventScript_16C79E
goto_if_ge EventScript_16C79E
checkmoney 1000, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16C7AC
goto_if_eq EventScript_16C7AC
givecoins 50
takemoney 1000, 0
goto EventScript_16C762
@@ -129,14 +127,12 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
lock
faceplayer
checkflag FLAG_GOT_10_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C849
goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849
msgbox gUnknown_8196AF3
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9990
goto_if ge, EventScript_16C82B
goto_if_ge EventScript_16C82B
givecoins 10
textcolor 3
msgbox gUnknown_8196B0D
@@ -165,8 +161,7 @@ EventScript_16C849:: @ 816C849
CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
lock
faceplayer
checkflag FLAG_DEFEATED_ERIKA
goto_if TRUE, EventScript_16C870
goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870
msgbox gUnknown_8196BAD
goto EventScript_16C7CA
end
@@ -193,14 +188,12 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
lock
faceplayer
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C8F0
goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0
msgbox gUnknown_8196D2B
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9980
goto_if ge, EventScript_16C8E2
goto_if_ge EventScript_16C8E2
givecoins 20
textcolor 3
msgbox gUnknown_8196D47
@@ -223,14 +216,12 @@ EventScript_16C8F0:: @ 816C8F0
CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
lock
faceplayer
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
goto_if TRUE, EventScript_16C950
goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950
msgbox gUnknown_8196DB7
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16C839
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9980
goto_if ge, EventScript_16C942
goto_if_ge EventScript_16C942
givecoins 20
textcolor 3
msgbox gUnknown_8196DF8
@@ -261,11 +252,10 @@ EventScript_16C96A:: @ 816C96A
end
EventScript_16C96C:: @ 816C96C
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CAA0
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0
msgbox gUnknown_8196F46, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16C96A
goto_if_eq EventScript_16C96A
setfieldeffectarg 0, 255
setfieldeffectarg 1, 10
setfieldeffectarg 2, 14
@@ -410,8 +400,7 @@ EventScript_16CAA0:: @ 816CAA0
CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
lockall
msgbox gUnknown_8196EDC
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16CABE
call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE
releaseall
end
@@ -427,7 +416,7 @@ EventScript_16CABE:: @ 816CABE
return
CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10
msgbox gUnknown_8196E9B, 6
end
@@ -435,9 +424,9 @@ EventScript_16CB10:: @ 816CB10
msgbox gUnknown_8196E9B
closemessage
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16CB34
call_if_eq EventScript_16CB34
compare VAR_FACING, DIR_WEST
call_if ne, EventScript_16CB3F
call_if_ne EventScript_16CB3F
removeobject 11
release
end
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+28 -31
View File
@@ -12,11 +12,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CBB2
@@ -110,10 +109,10 @@ EventScript_16CC65:: @ 816CC65
getspeciesname 0, VAR_TEMP_1
msgbox gUnknown_819709D, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
goto_if_eq EventScript_16CC10
checkcoins VAR_RESULT
compare VAR_RESULT, VAR_TEMP_2
goto_if lt, EventScript_16CDA5
goto_if_lt EventScript_16CDA5
textcolor 3
switch VAR_TEMP_1
case SPECIES_ABRA, EventScript_16CCD4
@@ -126,10 +125,10 @@ EventScript_16CC65:: @ 816CC65
EventScript_16CCD4:: @ 816CCD4
.ifdef FIRERED
givemon VAR_TEMP_1, 9, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 9, ITEM_NONE
.else
.ifdef LEAFGREEN
givemon VAR_TEMP_1, 7, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 7, ITEM_NONE
.endif
.endif
goto EventScript_16CD52
@@ -137,10 +136,10 @@ EventScript_16CCD4:: @ 816CCD4
EventScript_16CCE9:: @ 816CCE9
.ifdef FIRERED
givemon VAR_TEMP_1, 8, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 8, ITEM_NONE
.else
.ifdef LEAFGREEN
givemon VAR_TEMP_1, 12, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 12, ITEM_NONE
.endif
.endif
goto EventScript_16CD52
@@ -148,43 +147,43 @@ EventScript_16CCE9:: @ 816CCE9
EventScript_16CCFE:: @ 816CCFE
.ifdef FIRERED
givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 18, ITEM_NONE
.else
.ifdef LEAFGREEN
givemon VAR_TEMP_1, 24, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 24, ITEM_NONE
.endif
.endif
goto EventScript_16CD52
end
EventScript_16CD13:: @ 816CD13
givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 25, ITEM_NONE
goto EventScript_16CD52
end
EventScript_16CD28:: @ 816CD28
.ifdef FIRERED
givemon VAR_TEMP_1, 26, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 26, ITEM_NONE
.else
.ifdef LEAFGREEN
givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 18, ITEM_NONE
.endif
.endif
goto EventScript_16CD52
end
EventScript_16CD3D:: @ 816CD3D
givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 18, ITEM_NONE
goto EventScript_16CD52
end
EventScript_16CD52:: @ 816CD52
compare VAR_RESULT, 0
goto_if eq, EventScript_16CDB3
goto_if_eq EventScript_16CDB3
compare VAR_RESULT, 1
goto_if eq, EventScript_16CDE0
goto_if_eq EventScript_16CDE0
compare VAR_RESULT, 2
goto_if eq, EventScript_16CD74
goto_if_eq EventScript_16CD74
end
EventScript_16CD74:: @ 816CD74
@@ -195,7 +194,7 @@ EventScript_16CD74:: @ 816CD74
end
EventScript_16CD83:: @ 816CD83
countpokemon
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
call EventScript_1A74EB
@@ -223,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16CD83
goto_if_eq EventScript_16CD83
goto EventScript_16CC10
end
@@ -237,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16CE12
goto_if_eq EventScript_16CE12
call EventScript_1A8C33
goto EventScript_16CE12
end
@@ -250,11 +249,10 @@ EventScript_16CE12:: @ 816CE12
CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CE47
@@ -312,7 +310,7 @@ EventScript_16CEF5:: @ 816CEF5
EventScript_16CF09:: @ 816CF09
msgbox gUnknown_81970B2, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
goto_if_eq EventScript_16CC10
goto EventScript_16CF3F
end
@@ -320,7 +318,7 @@ EventScript_16CF22:: @ 816CF22
getitemname 0, VAR_TEMP_1
msgbox gUnknown_819709D, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16CC10
goto_if_eq EventScript_16CC10
goto EventScript_16CF3F
end
@@ -328,10 +326,10 @@ EventScript_16CF3F:: @ 816CF3F
getitemname 0, VAR_TEMP_1
checkcoins VAR_RESULT
compare VAR_RESULT, VAR_TEMP_2
goto_if lt, EventScript_16CDA5
goto_if_lt EventScript_16CDA5
checkitemspace VAR_TEMP_1, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16CF79
goto_if_eq EventScript_16CF79
takecoins VAR_TEMP_2
updatecoinsbox 0, 5
giveitem VAR_TEMP_1
@@ -348,11 +346,10 @@ EventScript_16CF79:: @ 816CF79
CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_16CD99
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CFB2
data/maps/CeladonCity_Gym/scripts.inc
+12 -15
View File
@@ -3,9 +3,8 @@ CeladonCity_Gym_MapScripts:: @ 816D060
CeladonCity_Gym_EventScript_16D061:: @ 816D061
famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
checkflag FLAG_GOT_TM19_FROM_ERIKA
goto_if FALSE, EventScript_16D0C6
trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC
goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6
famechecker FAMECHECKER_ERIKA, 4
msgbox gUnknown_81972B8
release
@@ -24,9 +23,8 @@ EventScript_16D0C6:: @ 816D0C6
msgbox gUnknown_8197327
checkitemspace ITEM_TM19, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16D107
additem ITEM_TM19, 1
giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
goto_if_eq EventScript_16D107
giveitem_msg gUnknown_81973BA, ITEM_TM19
setflag FLAG_GOT_TM19_FROM_ERIKA
msgbox gUnknown_81973D7
release
@@ -38,46 +36,45 @@ EventScript_16D107:: @ 816D107
end
CeladonCity_Gym_EventScript_16D111:: @ 816D111
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4
msgbox gUnknown_81974D6, 6
end
CeladonCity_Gym_EventScript_16D128:: @ 816D128
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF
famechecker FAMECHECKER_ERIKA, 2
msgbox gUnknown_8197708, 6
end
CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB
msgbox gUnknown_81975D1, 6
end
CeladonCity_Gym_EventScript_16D163:: @ 816D163
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C
msgbox gUnknown_8197527, 6
end
CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660
famechecker FAMECHECKER_ERIKA, 3
msgbox gUnknown_8197664, 6
end
CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A
msgbox gUnknown_8197788, 6
end
CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832
msgbox gUnknown_819783E, 6
end
CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
lockall
checkflag FLAG_BADGE04_GET
goto_if TRUE, EventScript_16D1E0
goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0
msgbox gUnknown_8197874
releaseall
end
data/maps/CeladonCity_Restaurant/scripts.inc
+3 -5
View File
@@ -12,14 +12,12 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if TRUE, EventScript_16D24B
goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B
msgbox gUnknown_81979C1
checkitemspace ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16D241
additem ITEM_COIN_CASE, 1
giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
goto_if_eq EventScript_16D241
giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE
setflag FLAG_GOT_COIN_CASE
release
end
data/maps/CeruleanCave_B1F/scripts.inc
+7 -9
View File
@@ -4,20 +4,18 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
.byte 0
CeruleanCave_B1F_OnResume:: @ 81624C9
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_1624D3
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3
end
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
CeruleanCave_B1F_OnTransition:: @ 81624E7
checkflag FLAG_FOUGHT_MEWTWO
call_if FALSE, EventScript_1624F1
call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1
end
EventScript_1624F1:: @ 81624F1
@@ -27,7 +25,7 @@ EventScript_1624F1:: @ 81624F1
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -46,11 +44,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_162558
goto_if_eq EventScript_162558
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_162561
goto_if_eq EventScript_162561
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_162561
goto_if_eq EventScript_162561
setflag FLAG_FOUGHT_MEWTWO
release
end
data/maps/CeruleanCity/scripts.inc
+26 -29
View File
@@ -4,8 +4,7 @@ CeruleanCity_MapScripts:: @ 8166471
CeruleanCity_OnTransition:: @ 8166477
setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
checkflag FLAG_GOT_SS_TICKET
call_if FALSE, EventScript_166484
call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484
end
EventScript_166484:: @ 8166484
@@ -44,21 +43,21 @@ EventScript_1664CC:: @ 81664CC
msgbox gUnknown_817EAD7
setvar VAR_LAST_TALKED, 8
compare VAR_STARTER_MON, 2
call_if eq, EventScript_166582
call_if_eq EventScript_166582
compare VAR_STARTER_MON, 1
call_if eq, EventScript_16658D
call_if_eq EventScript_16658D
compare VAR_STARTER_MON, 0
call_if eq, EventScript_166598
call_if_eq EventScript_166598
famechecker FAMECHECKER_BILL, 0
msgbox gUnknown_817EB95
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if eq, EventScript_1665A3
call_if_eq EventScript_1665A3
compare VAR_TEMP_1, 1
call_if eq, EventScript_1665A3
call_if_eq EventScript_1665A3
compare VAR_TEMP_1, 2
call_if eq, EventScript_1665B5
call_if_eq EventScript_1665B5
msgbox gUnknown_817ECD4
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
setflag FLAG_GOT_FAME_CHECKER
@@ -73,15 +72,15 @@ EventScript_1664CC:: @ 81664CC
end
EventScript_166582:: @ 8166582
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71
return
EventScript_16658D:: @ 816658D
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71
return
EventScript_166598:: @ 8166598
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71
return
EventScript_1665A3:: @ 81665A3
@@ -172,12 +171,12 @@ CeruleanCity_EventScript_166603:: @ 8166603
lock
faceplayer
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5
goto_if eq, EventScript_16662E
goto_if_eq EventScript_16662E
message Text_17EE0E
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end
@@ -186,9 +185,8 @@ EventScript_16662E:: @ 816662E
msgbox gUnknown_817EE9C
checkitemspace ITEM_TM28, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_166677
additem ITEM_TM28, 1
giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
goto_if_eq EventScript_166677
giveitem_msg gUnknown_817EEBF, ITEM_TM28
msgbox gUnknown_817EEED
closemessage
fadescreen 1
@@ -228,7 +226,7 @@ EventScript_1666C3:: @ 81666C3
textcolor 0
msgbox Text_17EE0E
setvar VAR_LAST_TALKED, 2
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end
@@ -246,8 +244,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
CeruleanCity_EventScript_1666FE:: @ 81666FE
lock
faceplayer
checkflag FLAG_GOT_SS_TICKET
goto_if TRUE, EventScript_166713
goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713
msgbox gUnknown_817F01D
release
end
@@ -284,11 +281,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
random 3
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0
call_if eq, EventScript_1667B0
call_if_eq EventScript_1667B0
compare VAR_0x8008, 1
call_if eq, EventScript_1667B6
call_if_eq EventScript_1667B6
compare VAR_0x8008, 2
call_if eq, EventScript_1667BC
call_if_eq EventScript_1667BC
waitmessage
delay 40
playse SE_PIN
@@ -296,11 +293,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
waitmovement 0
delay 30
compare VAR_0x8008, 0
call_if eq, EventScript_1667C2
call_if_eq EventScript_1667C2
compare VAR_0x8008, 1
call_if eq, EventScript_1667CB
call_if_eq EventScript_1667CB
compare VAR_0x8008, 2
call_if eq, EventScript_1667D4
call_if_eq EventScript_1667D4
release
end
@@ -333,13 +330,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD
random 4
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0
call_if eq, EventScript_166814
call_if_eq EventScript_166814
compare VAR_0x8008, 1
call_if eq, EventScript_16681D
call_if_eq EventScript_16681D
compare VAR_0x8008, 2
call_if eq, EventScript_166826
call_if_eq EventScript_166826
compare VAR_0x8008, 3
call_if eq, EventScript_16682F
call_if_eq EventScript_16682F
release
end
data/maps/CeruleanCity_BikeShop/scripts.inc
+5 -8
View File
@@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
lock
faceplayer
checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC58
checkflag FLAG_GOT_BIKE_VOUCHER
goto_if TRUE, EventScript_16AC22
goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58
goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22
showmoneybox 0, 0, 0
message Text_192755
waitmessage
@@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15
EventScript_16AC22:: @ 816AC22
msgbox gUnknown_81927B2
giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE, 1
additem ITEM_BICYCLE
removeitem ITEM_BIKE_VOUCHER, 1
msgbox gUnknown_819280E
release
@@ -56,8 +54,7 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
lock
faceplayer
checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC8A
goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A
msgbox gUnknown_8192937
release
end
data/maps/CeruleanCity_Gym/scripts.inc
+8 -12
View File
@@ -3,9 +3,8 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
checkflag FLAG_GOT_TM03_FROM_MISTY
goto_if FALSE, EventScript_16AAF9
trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC
goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9
msgbox gUnknown_81922BF
release
end
@@ -23,9 +22,8 @@ EventScript_16AAF9:: @ 816AAF9
msgbox gUnknown_81922F7
checkitemspace ITEM_TM03, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16AB3A
additem ITEM_TM03, 1
giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
goto_if_eq EventScript_16AB3A
giveitem_msg gUnknown_81923F1, ITEM_TM03
setflag FLAG_GOT_TM03_FROM_MISTY
msgbox gUnknown_81922BF
release
@@ -37,12 +35,12 @@ EventScript_16AB3A:: @ 816AB3A
end
CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0
msgbox gUnknown_81924E4, 6
end
CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547
famechecker FAMECHECKER_MISTY, 2
msgbox gUnknown_8192556, 6
end
@@ -50,8 +48,7 @@ CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
lock
faceplayer
checkflag FLAG_DEFEATED_MISTY
goto_if TRUE, EventScript_16AB94
goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94
msgbox gUnknown_81925AC
release
end
@@ -63,8 +60,7 @@ EventScript_16AB94:: @ 816AB94
CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
lockall
checkflag FLAG_BADGE02_GET
goto_if TRUE, EventScript_16ABB2
goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2
msgbox gUnknown_81926E1
releaseall
end
data/maps/CeruleanCity_House2/scripts.inc
+1 -2
View File
@@ -4,8 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975
CeruleanCity_House2_EventScript_16A976:: @ 816A976
lock
faceplayer
checkflag FLAG_GOT_TM28_FROM_ROCKET
goto_if TRUE, EventScript_16A98B
goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B
msgbox gUnknown_8191E13
release
end
data/maps/CeruleanCity_House3/scripts.inc
+4 -5
View File
@@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
faceplayer
setvar VAR_0x8008, 1
call EventScript_1A8CAD
checkflag FLAG_DID_ZYNX_TRADE
goto_if TRUE, EventScript_16AA23
goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16AA0B
goto_if_eq EventScript_16AA0B
call EventScript_1A8CBD
compare VAR_0x8004, 6
goto_if ge, EventScript_16AA0B
goto_if_ge EventScript_16AA0B
call EventScript_1A8CC9
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16AA15
goto_if_ne EventScript_16AA15
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_DID_ZYNX_TRADE
data/maps/CeruleanCity_House4/scripts.inc
+12 -12
View File
@@ -4,25 +4,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8004, 0
goto_if eq, EventScript_CeruleanCity_House4_NoNews
goto_if_eq EventScript_CeruleanCity_House4_NoNews
compare VAR_0x8004, 1
goto_if eq, EventScript_CeruleanCity_House4_News1
goto_if_eq EventScript_CeruleanCity_House4_News1
compare VAR_0x8004, 2
goto_if eq, EventScript_CeruleanCity_House4_News2
goto_if_eq EventScript_CeruleanCity_House4_News2
compare VAR_0x8004, 3
goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread
compare VAR_0x8004, 4
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1
compare VAR_0x8004, 5
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2
compare VAR_0x8004, 6
goto_if eq, EventScript_CeruleanCity_House4_NewsDone
goto_if_eq EventScript_CeruleanCity_House4_NewsDone
end
EventScript_CeruleanCity_House4_NoNews:: @ 816AD59
@@ -35,7 +35,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63
msgbox gUnknown_8192B43
giveitem VAR_0x8008
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
goto_if_eq EventScript_16AE45
release
end
@@ -44,7 +44,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89
msgbox gUnknown_8192C07
giveitem VAR_0x8008, 4
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
goto_if_eq EventScript_16AE45
release
end
@@ -60,7 +60,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
msgbox gUnknown_8192D4B
giveitem VAR_0x8008
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
goto_if_eq EventScript_16AE45
release
end
@@ -69,7 +69,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
msgbox gUnknown_8192DE3
giveitem VAR_0x8008, 4
compare VAR_RESULT, 0
goto_if eq, EventScript_16AE45
goto_if_eq EventScript_16AE45
release
end
data/maps/CeruleanCity_House5/scripts.inc
+9 -11
View File
@@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F
CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
lock
faceplayer
checkflag FLAG_GOT_POWDER_JAR
goto_if TRUE, EventScript_16AEB7
goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7
msgbox gUnknown_8192F67, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16AEAD
checkflag FLAG_SYS_GOT_BERRY_POUCH
goto_if FALSE, EventScript_16AEA3
goto_if_eq EventScript_16AEAD
goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3
msgbox gUnknown_8193003
setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
goto_if_eq EventScript_1A6BF9
msgbox gUnknown_8193033
release
end
@@ -144,20 +142,20 @@ EventScript_16B048:: @ 816B048
EventScript_16B055:: @ 816B055
msgbox gUnknown_819331E, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16AEC8
goto_if_eq EventScript_16AEC8
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, sub_815EEB0
compare VAR_RESULT, 0
goto_if eq, EventScript_16B0CC
goto_if_eq EventScript_16B0CC
giveitem VAR_0x8008
compare VAR_RESULT, 0
goto_if eq, EventScript_16B0BF
goto_if_eq EventScript_16B0BF
copyvar VAR_0x8004, VAR_0x8009
special sub_815EF5C
special sub_815F070
msgbox gUnknown_819337A, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16AEC8
goto_if_eq EventScript_16AEC8
msgbox gUnknown_81933FB
special sub_815F114
release
@@ -178,7 +176,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
lockall
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_814EA7C
waitstate
releaseall
data/maps/CeruleanCity_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/CinnabarIsland/scripts.inc
+18 -30
View File
@@ -7,11 +7,11 @@ CinnabarIsland_OnTransition:: @ 8166EE1
setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
call EventScript_166F5E
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
call_if eq, EventScript_166F24
call_if_eq EventScript_166F24
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
call_if eq, EventScript_166F52
call_if_eq EventScript_166F52
compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
call_if eq, EventScript_166F0B
call_if_eq EventScript_166F0B
end
EventScript_166F0B:: @ 8166F0B
@@ -25,7 +25,7 @@ EventScript_166F0B:: @ 8166F0B
EventScript_166F24:: @ 8166F24
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 18
goto_if ge, EventScript_166F4A
goto_if_ge EventScript_166F4A
setflag FLAG_TEMP_2
setobjectxyperm 3, 18, 12
setobjectmovementtype 3, 7
@@ -42,8 +42,7 @@ EventScript_166F52:: @ 8166F52
return
EventScript_166F5E:: @ 8166F5E
checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
goto_if TRUE, EventScript_166F68
goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68
return
EventScript_166F68:: @ 8166F68
@@ -93,25 +92,21 @@ Movement_166FC6:: @ 8166FC6
EventScript_166FCD:: @ 8166FCD
lockall
textcolor 0
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167032
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_16703D
call_if_unset FLAG_TEMP_2, EventScript_167032
call_if_set FLAG_TEMP_2, EventScript_16703D
playse SE_PIN
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_Delay48
waitmovement 0
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167048
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167053
call_if_unset FLAG_TEMP_2, EventScript_167048
call_if_set FLAG_TEMP_2, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_167068
goto_if_eq EventScript_167068
compare VAR_RESULT, 0
goto_if eq, EventScript_167078
goto_if_eq EventScript_167078
end
EventScript_167032:: @ 8167032
@@ -146,10 +141,8 @@ EventScript_167068:: @ 8167068
EventScript_167078:: @ 8167078
msgbox gUnknown_8180DF8
closemessage
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1670A0
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_1670B3
call_if_unset FLAG_TEMP_2, EventScript_1670A0
call_if_set FLAG_TEMP_2, EventScript_1670B3
removeobject 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
@@ -201,19 +194,14 @@ Movement_1670E2:: @ 81670E2
step_end
EventScript_1670E6:: @ 81670E6
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167142
call_if_set FLAG_TEMP_2, EventScript_167142
addobject 4
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167154
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167166
call_if_unset FLAG_TEMP_2, EventScript_167154
call_if_set FLAG_TEMP_2, EventScript_167166
msgbox gUnknown_8180EAD
closemessage
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167171
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167183
call_if_unset FLAG_TEMP_2, EventScript_167171
call_if_set FLAG_TEMP_2, EventScript_167183
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject 3
delay 40
data/maps/CinnabarIsland_Gym/scripts.inc
+74 -103
View File
@@ -3,20 +3,13 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B
.byte 0
CinnabarIsland_Gym_OnLoad:: @ 816D951
checkflag FLAG_DEFEATED_BLAINE
goto_if TRUE, EventScript_16D991
checkflag FLAG_CINNABAR_GYM_QUIZ_1
call_if TRUE, EventScript_16D9B0
checkflag FLAG_CINNABAR_GYM_QUIZ_2
call_if TRUE, EventScript_16D9B6
checkflag FLAG_CINNABAR_GYM_QUIZ_3
call_if TRUE, EventScript_16D9BC
checkflag FLAG_CINNABAR_GYM_QUIZ_4
call_if TRUE, EventScript_16D9C2
checkflag FLAG_CINNABAR_GYM_QUIZ_5
call_if TRUE, EventScript_16D9C8
checkflag FLAG_CINNABAR_GYM_QUIZ_6
call_if TRUE, EventScript_16D9CE
goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991
call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0
call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6
call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC
call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2
call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8
call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE
end
EventScript_16D991:: @ 816D991
@@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE
CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
checkflag FLAG_GOT_TM38_FROM_BLAINE
goto_if FALSE, EventScript_16DA34
trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC
goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34
msgbox gUnknown_819971D
release
end
@@ -76,9 +68,8 @@ EventScript_16DA34:: @ 816DA34
msgbox gUnknown_819969E
checkitemspace ITEM_TM38, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16DA75
additem ITEM_TM38, 1
giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
goto_if_eq EventScript_16DA75
giveitem_msg gUnknown_81996FF, ITEM_TM38
setflag FLAG_GOT_TM38_FROM_BLAINE
msgbox gUnknown_8199652
release
@@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75
end
CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6
msgbox gUnknown_81997EA, 6
end
CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1
msgbox gUnknown_8199911, 6
end
EventScript_16DAB1:: @ 816DAB1
checkflag FLAG_CINNABAR_GYM_QUIZ_2
call_if FALSE, EventScript_16DABC
call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC
release
end
@@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC
return
CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA
famechecker FAMECHECKER_BLAINE, 2
msgbox gUnknown_81999DF, 6
end
EventScript_16DAEA:: @ 816DAEA
checkflag FLAG_CINNABAR_GYM_QUIZ_4
call_if FALSE, EventScript_16DAF5
call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5
release
end
@@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5
return
CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16
msgbox gUnknown_8199B27, 6
end
EventScript_16DB16:: @ 816DB16
checkflag FLAG_CINNABAR_GYM_QUIZ_6
call_if FALSE, EventScript_16DB21
call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21
release
end
@@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21
return
CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42
msgbox gUnknown_819987D, 6
end
EventScript_16DB42:: @ 816DB42
checkflag FLAG_CINNABAR_GYM_QUIZ_1
call_if FALSE, EventScript_16DB4D
call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D
release
end
@@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D
return
CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E
msgbox gUnknown_8199986, 6
end
EventScript_16DB6E:: @ 816DB6E
checkflag FLAG_CINNABAR_GYM_QUIZ_3
call_if FALSE, EventScript_16DB79
call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79
release
end
@@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79
return
CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A
msgbox gUnknown_8199AC9, 6
end
EventScript_16DB9A:: @ 816DB9A
checkflag FLAG_CINNABAR_GYM_QUIZ_5
call_if FALSE, EventScript_16DBA5
call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5
release
end
@@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5
CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
lock
faceplayer
checkflag FLAG_DEFEATED_BLAINE
goto_if TRUE, EventScript_16DBC0
goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0
msgbox gUnknown_8199B81
release
end
@@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0
CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
lockall
checkflag FLAG_BADGE07_GET
goto_if TRUE, EventScript_16DBDE
goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE
msgbox gUnknown_8199C29
releaseall
end
@@ -228,9 +211,9 @@ EventScript_16DC00:: @ 816DC00
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D5A, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16DC43
goto_if_eq EventScript_16DC43
compare VAR_RESULT, 0
goto_if eq, EventScript_16DC6A
goto_if_eq EventScript_16DC6A
end
EventScript_16DC27:: @ 816DC27
@@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34
EventScript_16DC43:: @ 816DC43
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_1
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68
call EventScript_16DC58
releaseall
end
@@ -270,20 +252,19 @@ EventScript_16DC68:: @ 816DC68
EventScript_16DC6A:: @ 816DC6A
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_QUINN
goto_if lt, EventScript_16DC7A
goto_if_lt EventScript_16DC7A
releaseall
end
EventScript_16DC7A:: @ 816DC7A
compare VAR_TEMP_1, 0
call_if eq, EventScript_16DCB4
call_if_eq EventScript_16DCB4
compare VAR_TEMP_1, 1
call_if eq, EventScript_16DCC6
call_if_eq EventScript_16DCC6
textcolor 0
msgbox gUnknown_819983F
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870
checkflag FLAG_CINNABAR_GYM_QUIZ_1
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870
goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68
call EventScript_16DC58
releaseall
end
@@ -325,15 +306,14 @@ EventScript_16DCF5:: @ 816DCF5
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D79, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16DD41
goto_if_eq EventScript_16DD41
compare VAR_RESULT, 0
goto_if eq, EventScript_16DD1C
goto_if_eq EventScript_16DD1C
end
EventScript_16DD1C:: @ 816DD1C
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_2
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68
call EventScript_16DD31
releaseall
end
@@ -349,20 +329,19 @@ EventScript_16DD31:: @ 816DD31
EventScript_16DD41:: @ 816DD41
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_AVERY
goto_if lt, EventScript_16DD51
goto_if_lt EventScript_16DD51
releaseall
end
EventScript_16DD51:: @ 816DD51
compare VAR_TEMP_1, 0
call_if eq, EventScript_16DD8B
call_if_eq EventScript_16DD8B
compare VAR_TEMP_1, 1
call_if eq, EventScript_16DD9D
call_if_eq EventScript_16DD9D
textcolor 0
msgbox gUnknown_81998BD
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
checkflag FLAG_CINNABAR_GYM_QUIZ_2
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED
goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68
call EventScript_16DD31
releaseall
end
@@ -413,15 +392,14 @@ EventScript_16DDD3:: @ 816DDD3
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DA9, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16DE1F
goto_if_eq EventScript_16DE1F
compare VAR_RESULT, 0
goto_if eq, EventScript_16DDFA
goto_if_eq EventScript_16DDFA
end
EventScript_16DDFA:: @ 816DDFA
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_3
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68
call EventScript_16DE0F
releaseall
end
@@ -437,20 +415,19 @@ EventScript_16DE0F:: @ 816DE0F
EventScript_16DE1F:: @ 816DE1F
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_RAMON
goto_if lt, EventScript_16DE2F
goto_if_lt EventScript_16DE2F
releaseall
end
EventScript_16DE2F:: @ 816DE2F
compare VAR_TEMP_1, 0
call_if eq, EventScript_16DE69
call_if_eq EventScript_16DE69
compare VAR_TEMP_1, 1
call_if eq, EventScript_16DE7B
call_if_eq EventScript_16DE7B
textcolor 0
msgbox gUnknown_8199948
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973
checkflag FLAG_CINNABAR_GYM_QUIZ_3
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973
goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68
call EventScript_16DE0F
releaseall
end
@@ -492,15 +469,14 @@ EventScript_16DEAA:: @ 816DEAA
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DC6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16DEF6
goto_if_eq EventScript_16DEF6
compare VAR_RESULT, 0
goto_if eq, EventScript_16DED1
goto_if_eq EventScript_16DED1
end
EventScript_16DED1:: @ 816DED1
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_4
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68
call EventScript_16DEE6
releaseall
end
@@ -516,20 +492,19 @@ EventScript_16DEE6:: @ 816DEE6
EventScript_16DEF6:: @ 816DEF6
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_DEREK
goto_if lt, EventScript_16DF06
goto_if_lt EventScript_16DF06
releaseall
end
EventScript_16DF06:: @ 816DF06
compare VAR_TEMP_1, 0
call_if eq, EventScript_16DF40
call_if_eq EventScript_16DF40
compare VAR_TEMP_1, 1
call_if eq, EventScript_16DF52
call_if_eq EventScript_16DF52
textcolor 0
msgbox gUnknown_81999B7
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
checkflag FLAG_CINNABAR_GYM_QUIZ_4
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB
goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68
call EventScript_16DEE6
releaseall
end
@@ -571,15 +546,14 @@ EventScript_16DF81:: @ 816DF81
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E00, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16DFA8
goto_if_eq EventScript_16DFA8
compare VAR_RESULT, 0
goto_if eq, EventScript_16DFCD
goto_if_eq EventScript_16DFCD
end
EventScript_16DFA8:: @ 816DFA8
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_5
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68
call EventScript_16DFBD
releaseall
end
@@ -595,20 +569,19 @@ EventScript_16DFBD:: @ 816DFBD
EventScript_16DFCD:: @ 816DFCD
call EventScript_16DC34
checktrainerflag TRAINER_BURGLAR_DUSTY
goto_if lt, EventScript_16DFDD
goto_if_lt EventScript_16DFDD
releaseall
end
EventScript_16DFDD:: @ 816DFDD
compare VAR_TEMP_1, 0
call_if eq, EventScript_16E017
call_if_eq EventScript_16E017
compare VAR_TEMP_1, 1
call_if eq, EventScript_16E029
call_if_eq EventScript_16E029
textcolor 0
msgbox gUnknown_8199A7F
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
checkflag FLAG_CINNABAR_GYM_QUIZ_5
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9
goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68
call EventScript_16DFBD
releaseall
end
@@ -650,15 +623,14 @@ EventScript_16E058:: @ 816E058
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E36, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16E0A4
goto_if_eq EventScript_16E0A4
compare VAR_RESULT, 0
goto_if eq, EventScript_16E07F
goto_if_eq EventScript_16E07F
end
EventScript_16E07F:: @ 816E07F
call EventScript_16DC27
checkflag FLAG_CINNABAR_GYM_QUIZ_6
goto_if TRUE, EventScript_16DC68
goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68
call EventScript_16E094
releaseall
end
@@ -674,20 +646,19 @@ EventScript_16E094:: @ 816E094
EventScript_16E0A4:: @ 816E0A4
call EventScript_16DC34
checktrainerflag TRAINER_SUPER_NERD_ZAC
goto_if lt, EventScript_16E0B4
goto_if_lt EventScript_16E0B4
releaseall
end
EventScript_16E0B4:: @ 816E0B4
compare VAR_TEMP_1, 0
call_if eq, EventScript_16E0EE
call_if_eq EventScript_16E0EE
compare VAR_TEMP_1, 1
call_if eq, EventScript_16E100
call_if_eq EventScript_16E100
textcolor 0
msgbox gUnknown_8199AFC
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
checkflag FLAG_CINNABAR_GYM_QUIZ_6
goto_if TRUE, EventScript_16DC68
trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16
goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68
call EventScript_16E094
releaseall
end
data/maps/CinnabarIsland_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -31,7 +31,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
faceplayer
msgbox gUnknown_819A725, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E9A5
goto_if_eq EventScript_16E9A5
msgbox gUnknown_819A785
closemessage
playbgm MUS_ANNAI, 1
@@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16E96F
call_if_eq EventScript_16E96F
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16E981
call_if_eq EventScript_16E981
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16E993
call_if_eq EventScript_16E993
removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_HIDE_CINNABAR_BILL
data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if eq, EventScript_16E285
call_if_eq EventScript_16E285
end
EventScript_16E285:: @ 816E285
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+43 -55
View File
@@ -6,17 +6,16 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
faceplayer
setvar VAR_0x8008, 8
call EventScript_1A8CAD
checkflag FLAG_DID_SEELOR_TRADE
goto_if TRUE, EventScript_16E473
goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E45B
goto_if_eq EventScript_16E45B
call EventScript_1A8CBD
compare VAR_0x8004, 6
goto_if ge, EventScript_16E45B
goto_if_ge EventScript_16E45B
call EventScript_1A8CC9
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E465
goto_if_ne EventScript_16E465
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
setflag FLAG_DID_SEELOR_TRADE
@@ -43,48 +42,41 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
lock
faceplayer
setvar VAR_RESULT, 0
checkflag FLAG_REVIVED_AMBER
call_if TRUE, EventScript_16E8A1
call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1
compare VAR_RESULT, 1
goto_if eq, EventScript_16E897
goto_if_eq EventScript_16E897
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
goto_if eq, EventScript_16E736
goto_if_eq EventScript_16E736
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
goto_if eq, EventScript_16E72C
goto_if_eq EventScript_16E72C
call EventScript_16E4EC
compare VAR_RESULT, 1
goto_if eq, EventScript_16E544
goto_if_eq EventScript_16E544
call EventScript_16E504
compare VAR_RESULT, 1
goto_if eq, EventScript_16E586
goto_if_eq EventScript_16E586
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if eq, EventScript_16E5C8
goto_if_eq EventScript_16E5C8
msgbox gUnknown_819A282
goto EventScript_16E53A
end
EventScript_16E4EC:: @ 816E4EC
checkflag FLAG_GOT_HELIX_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_HELIX
goto_if TRUE, EventScript_16E534
goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534
goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E504:: @ 816E504
checkflag FLAG_GOT_DOME_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_DOME
goto_if TRUE, EventScript_16E534
goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534
goto_if_set FLAG_REVIVED_DOME, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E51C:: @ 816E51C
checkflag FLAG_GOT_OLD_AMBER
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_AMBER
goto_if TRUE, EventScript_16E534
goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534
goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534
setvar VAR_RESULT, 1
return
@@ -102,7 +94,7 @@ EventScript_16E544:: @ 816E544
waitmessage
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if eq, EventScript_16E5FA
goto_if_eq EventScript_16E5FA
multichoice 0, 0, MULTICHOICE_HELIX, FALSE
switch VAR_RESULT
case 0, EventScript_16E668
@@ -115,7 +107,7 @@ EventScript_16E586:: @ 816E586
waitmessage
call EventScript_16E51C
compare VAR_RESULT, 1
goto_if eq, EventScript_16E631
goto_if_eq EventScript_16E631
multichoice 0, 0, MULTICHOICE_DOME, FALSE
switch VAR_RESULT
case 0, EventScript_16E6A6
@@ -156,7 +148,7 @@ EventScript_16E668:: @ 816E668
getitemname 1, ITEM_HELIX_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_HELIX_FOSSIL, 1
@@ -171,7 +163,7 @@ EventScript_16E6A6:: @ 816E6A6
getitemname 1, ITEM_DOME_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_DOME_FOSSIL, 1
@@ -186,7 +178,7 @@ EventScript_16E6E4:: @ 816E6E4
getitemname 1, ITEM_OLD_AMBER
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E722
goto_if_eq EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_OLD_AMBER, 1
@@ -208,53 +200,53 @@ EventScript_16E72C:: @ 816E72C
EventScript_16E736:: @ 816E736
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
goto_if eq, EventScript_16E758
goto_if_eq EventScript_16E758
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
goto_if eq, EventScript_16E79D
goto_if_eq EventScript_16E79D
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
goto_if eq, EventScript_16E7E2
goto_if_eq EventScript_16E7E2
end
EventScript_16E758:: @ 816E758
setvar VAR_TEMP_1, SPECIES_OMANYTE
getspeciesname 0, SPECIES_OMANYTE
msgbox gUnknown_819A34F
givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
givemon SPECIES_OMANYTE, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
goto_if_eq EventScript_1A927C
setflag FLAG_REVIVED_HELIX
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
goto_if_eq EventScript_16E827
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
goto_if_eq EventScript_16E85B
end
EventScript_16E79D:: @ 816E79D
setvar VAR_TEMP_1, SPECIES_KABUTO
getspeciesname 0, SPECIES_KABUTO
msgbox gUnknown_819A34F
givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
givemon SPECIES_KABUTO, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
goto_if_eq EventScript_1A927C
setflag FLAG_REVIVED_DOME
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
goto_if_eq EventScript_16E827
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
goto_if_eq EventScript_16E85B
end
EventScript_16E7E2:: @ 816E7E2
setvar VAR_TEMP_1, SPECIES_AERODACTYL
getspeciesname 0, SPECIES_AERODACTYL
msgbox gUnknown_819A34F
givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
givemon SPECIES_AERODACTYL, 5, ITEM_NONE
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
goto_if_eq EventScript_1A927C
setflag FLAG_REVIVED_AMBER
compare VAR_RESULT, 0
goto_if eq, EventScript_16E827
goto_if_eq EventScript_16E827
compare VAR_RESULT, 1
goto_if eq, EventScript_16E85B
goto_if_eq EventScript_16E85B
end
EventScript_16E827:: @ 816E827
@@ -266,7 +258,7 @@ EventScript_16E827:: @ 816E827
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E895
goto_if_eq EventScript_16E895
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16E895
@@ -281,7 +273,7 @@ EventScript_16E85B:: @ 816E85B
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E88A
goto_if_eq EventScript_16E88A
call EventScript_1A8C33
goto EventScript_16E88A
end
@@ -301,21 +293,17 @@ EventScript_16E897:: @ 816E897
end
EventScript_16E8A1:: @ 816E8A1
checkflag FLAG_GOT_HELIX_FOSSIL
goto_if TRUE, EventScript_16E8B9
checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_16E8C8
goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9
goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8
goto EventScript_16E534
end
EventScript_16E8B9:: @ 816E8B9
checkflag FLAG_REVIVED_HELIX
goto_if FALSE, EventScript_16E534
goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E8C8:: @ 816E8C8
checkflag FLAG_REVIVED_DOME
goto_if FALSE, EventScript_16E534
goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534
setvar VAR_RESULT, 1
return
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+8 -10
View File
@@ -10,17 +10,16 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
faceplayer
setvar VAR_0x8008, 6
call EventScript_1A8CAD
checkflag FLAG_DID_ESPHERE_TRADE
goto_if TRUE, EventScript_16E334
goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E31C
goto_if_eq EventScript_16E31C
call EventScript_1A8CBD
compare VAR_0x8004, 6
goto_if ge, EventScript_16E31C
goto_if_ge EventScript_16E31C
call EventScript_1A8CC9
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E326
goto_if_ne EventScript_16E326
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_DID_ESPHERE_TRADE
@@ -50,21 +49,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16E3BC
goto_if_eq EventScript_16E3BC
special Special_ChooseMonFromParty
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, 6
goto_if ge, EventScript_16E3BC
goto_if_ge EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E3C6
goto_if_ne EventScript_16E3C6
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special CreateInGameTradePokemon
data/maps/FiveIsland_LostCave_Room1/scripts.inc
+1 -1
View File
@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
.byte 0
FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42
trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42
msgbox gUnknown_817CF54, 6
end
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+3 -3
View File
@@ -5,7 +5,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D
FiveIsland_LostCave_Room10_OnResume:: @ 8164C38
checktrainerflag TRAINER_LADY_SELPHY
call_if eq, EventScript_164C42
call_if_eq EventScript_164C42
end
EventScript_164C42:: @ 8164C42
@@ -27,8 +27,8 @@ EventScript_164C52:: @ 8164C52
msgbox gUnknown_817D062
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_164CB6
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086
goto_if_eq EventScript_164CB6
trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086
msgbox gUnknown_817D0B2
closemessage
call EventScript_164CA5
data/maps/FiveIsland_LostCave_Room4/scripts.inc
+1 -1
View File
@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
.byte 0
FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB
trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB
msgbox gUnknown_817D037, 6
end
data/maps/FiveIsland_Meadow/scripts.inc
+6 -9
View File
@@ -3,16 +3,13 @@ FiveIsland_Meadow_MapScripts:: @ 8168932
.byte 0
FiveIsland_Meadow_OnLoad:: @ 8168938
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
call_if TRUE, EventScript_168983
call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983
end
FiveIsland_Meadow_EventScript_168942:: @ 8168942
lockall
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
goto_if TRUE, EventScript_168979
checkflag FLAG_LEARNED_YES_NAH_CHANSEY
goto_if TRUE, EventScript_16895F
goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979
goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F
msgbox gUnknown_818AB8E
releaseall
end
@@ -39,16 +36,16 @@ EventScript_168983:: @ 8168983
return
FiveIsland_Meadow_EventScript_16898D:: @ 816898D
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3
msgbox gUnknown_818ACC5, 6
end
FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39
msgbox gUnknown_818AD59, 6
end
FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB
msgbox gUnknown_818AE16, 6
end
data/maps/FiveIsland_MemorialPillar/scripts.inc
+9 -13
View File
@@ -3,10 +3,8 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2
FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
lock
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A18
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A22
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22
msgbox gUnknown_818B02E
closemessage
applymovement 1, Movement_FacePlayer
@@ -28,7 +26,7 @@ EventScript_168A22:: @ 8168A22
msgbox gUnknown_818B282
giveitem ITEM_TM42
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
goto_if_eq EventScript_168AFE
call EventScript_168AE8
release
end
@@ -36,24 +34,22 @@ EventScript_168A22:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lockall
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
goto_if eq, EventScript_168A86
goto_if_eq EventScript_168A86
releaseall
end
EventScript_168A86:: @ 8168A86
msgbox gUnknown_818B105, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_168A9B
goto_if_eq EventScript_168A9B
releaseall
end
@@ -70,7 +66,7 @@ EventScript_168A9B:: @ 8168A9B
msgbox gUnknown_818B171
giveitem ITEM_TM42
compare VAR_RESULT, 0
goto_if eq, EventScript_168AFE
goto_if_eq EventScript_168AFE
call EventScript_168AE8
releaseall
end
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+10 -11
View File
@@ -4,16 +4,15 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
goto_if_set FLAG_TEMP_2, EventScript_172043
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
goto_if_eq EventScript_171F0B
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
goto_if_ne EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
end
@@ -33,7 +32,7 @@ EventScript_171F19:: @ 8171F19
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare VAR_RESULT, 1
goto_if eq, EventScript_171F34
goto_if_eq EventScript_171F34
goto EventScript_171EFE
end
@@ -53,18 +52,18 @@ EventScript_171F34:: @ 8171F34
msgbox gUnknown_81A4566
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_171FCD
call_if_eq EventScript_171FCD
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_171FE9
call_if_eq EventScript_171FE9
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_171FFE
call_if_eq EventScript_171FFE
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_17201A
call_if_eq EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
giveitem VAR_RESORT_GORGEOUS_REWARD
compare VAR_RESULT, 0
goto_if eq, EventScript_172025
goto_if_eq EventScript_172025
setflag FLAG_TEMP_2
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+20 -22
View File
@@ -9,7 +9,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39
FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
checktrainerflag TRAINER_TEAM_ROCKET_ADMIN
call_if eq, EventScript_163F47
call_if_eq EventScript_163F47
end
EventScript_163F47:: @ 8163F47
@@ -19,8 +19,7 @@ EventScript_163F47:: @ 8163F47
FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
lockall
checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
goto_if TRUE, EventScript_163F6E
goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E
msgbox gUnknown_817B4E3
releaseall
end
@@ -43,9 +42,8 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
end
FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_163FB7
trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7
msgbox gUnknown_817BCA3, 6
end
@@ -62,24 +60,24 @@ EventScript_163FCD:: @ 8163FCD
end
FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585
msgbox gUnknown_817B5A6, 6
end
FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9
msgbox gUnknown_817B6EF, 6
end
FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F
trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F
msgbox gUnknown_817BA64, 6
end
EventScript_16402F:: @ 816402F
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 24
call_if le, EventScript_164065
call_if_le EventScript_164065
msgbox gUnknown_817BA64
closemessage
fadescreen 1
@@ -100,12 +98,12 @@ EventScript_164065:: @ 8164065
return
FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F
msgbox gUnknown_817B642, 6
end
FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2
trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2
msgbox gUnknown_817B7FA, 6
end
@@ -113,36 +111,36 @@ EventScript_1640A2:: @ 81640A2
getplayerxy VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, GetPlayerFacingDirection
compare VAR_RESULT, DIR_NORTH
call_if eq, EventScript_16412E
call_if_eq EventScript_16412E
msgbox gUnknown_817B7AE
closemessage
compare VAR_0x8004, 24
call_if le, EventScript_164144
call_if_le EventScript_164144
compare VAR_0x8004, 25
call_if eq, EventScript_16414F
call_if_eq EventScript_16414F
compare VAR_0x8004, 26
call_if eq, EventScript_16415A
call_if_eq EventScript_16415A
compare VAR_0x8004, 27
call_if eq, EventScript_16415A
call_if_eq EventScript_16415A
playse SE_PIN
call EventScript_163F47
special DrawWholeMapView
waitse
compare VAR_0x8004, 24
call_if le, EventScript_164165
call_if_le EventScript_164165
compare VAR_0x8004, 25
call_if eq, EventScript_164165
call_if_eq EventScript_164165
compare VAR_0x8004, 26
call_if eq, EventScript_164165
call_if_eq EventScript_164165
compare VAR_0x8004, 27
call_if eq, EventScript_164170
call_if_eq EventScript_164170
msgbox gUnknown_817B7FA
release
end
EventScript_16412E:: @ 816412E
compare VAR_0x8004, 27
goto_if eq, EventScript_1A77A9
goto_if_eq EventScript_1A77A9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+9 -11
View File
@@ -4,18 +4,16 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_GOT_TOGEPI_EGG
goto_if TRUE, EventScript_1688E3
checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
goto_if TRUE, EventScript_16892C
goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3
goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C
msgbox gUnknown_818A80D
specialvar VAR_RESULT, Special_GetLeadMonFriendship
compare VAR_RESULT, 6
goto_if eq, EventScript_1688AC
goto_if_eq EventScript_1688AC
msgbox gUnknown_818A88F
release
end
@@ -32,9 +30,9 @@ EventScript_1688AC:: @ 81688AC
end
EventScript_1688BA:: @ 81688BA
countpokemon
compare VAR_RESULT, 6
goto_if eq, EventScript_16891F
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_16891F
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
@@ -51,12 +49,12 @@ EventScript_1688E3:: @ 81688E3
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, 1
goto_if eq, EventScript_168895
goto_if_eq EventScript_168895
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, 1
goto_if eq, EventScript_168895
goto_if_eq EventScript_168895
msgbox gUnknown_818A9C0
release
end
data/maps/FourIsland/scripts.inc
+10 -12
View File
@@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
call_if eq, EventScript_167CCD
call_if_eq EventScript_167CCD
call EventScript_167CD1
end
@@ -15,8 +15,7 @@ EventScript_167CCD:: @ 8167CCD
return
EventScript_167CD1:: @ 8167CD1
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if FALSE, EventScript_167CE1
goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1
setobjectxyperm 1, 16, 14
EventScript_167CE1:: @ 8167CE1
@@ -73,18 +72,18 @@ Movement_167D52:: @ 8167D52
FourIsland_EventScript_167D55:: @ 8167D55
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 1
goto_if eq, EventScript_167D9B
goto_if_eq EventScript_167D9B
compare VAR_RESULT, 2
goto_if eq, EventScript_167E0C
goto_if_eq EventScript_167E0C
compare VAR_RESULT, 3
goto_if eq, EventScript_167E19
goto_if_eq EventScript_167E19
msgbox gUnknown_81BF555
release
end
@@ -92,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55
EventScript_167D9B:: @ 8167D9B
msgbox gUnknown_81BF5E3, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF7B6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF6CF
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
@@ -105,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B
EventScript_167DD1:: @ 8167DD1
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if ne, EventScript_167DEB
goto_if_ne EventScript_167DEB
msgbox gUnknown_81BF6F0
release
end
@@ -142,8 +141,7 @@ EventScript_167E19:: @ 8167E19
FourIsland_EventScript_167E2E:: @ 8167E2E
lock
faceplayer
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_167E43
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43
msgbox gUnknown_8182A2B
release
end
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
call_if eq, EventScript_163D94
call_if_eq EventScript_163D94
end
EventScript_163D94:: @ 8163D94
@@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
textcolor 0
msgbox gUnknown_817B20B
setvar VAR_LAST_TALKED, 4
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251
applymovement 3, Movement_163F1B
waitmovement 0
textcolor 1
data/maps/FourIsland_LoreleisHouse/scripts.inc
+2 -4
View File
@@ -9,10 +9,8 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
lock
faceplayer
checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
goto_if TRUE, EventScript_171C83
checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
goto_if TRUE, EventScript_171C76
goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83
goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76
msgbox gUnknown_81A3826
release
end
data/maps/FourIsland_Mart/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD
FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/FourIsland_PokemonDayCare/scripts.inc
+22 -22
View File
@@ -4,19 +4,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F
FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 1
goto_if eq, EventScript_171A2E
goto_if_eq EventScript_171A2E
compare VAR_RESULT, 2
goto_if eq, EventScript_171A52
goto_if_eq EventScript_171A52
compare VAR_RESULT, 3
goto_if eq, EventScript_171B86
goto_if_eq EventScript_171B86
msgbox gUnknown_81BF7E4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
goto_if_eq EventScript_171993
msgbox gUnknown_81BF916
release
end
@@ -24,16 +24,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
EventScript_171993:: @ 8171993
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 1
goto_if eq, EventScript_171A1A
goto_if_eq EventScript_171A1A
msgbox gUnknown_81BF839
fadescreen 1
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 6
goto_if ge, EventScript_1719F7
goto_if_ge EventScript_1719F7
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare VAR_RESULT, 0
goto_if eq, EventScript_171A24
goto_if_eq EventScript_171A24
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
waitse
playmoncry VAR_0x8005, 0
@@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
goto_if eq, EventScript_171A01
goto_if_eq EventScript_171A01
release
end
@@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7
EventScript_171A01:: @ 8171A01
msgbox gUnknown_81BF89F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
goto_if_eq EventScript_171993
goto EventScript_1719F7
end
@@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38
EventScript_171A41:: @ 8171A41
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare VAR_RESULT, 0
call_if ne, EventScript_171A38
call_if_ne EventScript_171A38
return
EventScript_171A52:: @ 8171A52
@@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52
call EventScript_171A41
msgbox gUnknown_81BF89F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171993
goto_if_eq EventScript_171993
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
goto_if_eq EventScript_171A90
goto EventScript_1719F7
end
EventScript_171A90:: @ 8171A90
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if eq, EventScript_171B67
goto_if_eq EventScript_171B67
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
compare VAR_RESULT, 2
goto_if eq, EventScript_171ACF
goto_if_eq EventScript_171ACF
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
compare VAR_RESULT, 2
goto_if eq, EventScript_1719F7
goto_if_eq EventScript_1719F7
goto EventScript_171ACF
end
@@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF
special GetDaycareCost
msgbox gUnknown_81BFA3B, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171AEB
goto_if_eq EventScript_171AEB
goto EventScript_1719F7
end
EventScript_171AEB:: @ 8171AEB
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
goto_if eq, EventScript_171B05
goto_if_eq EventScript_171B05
msgbox gUnknown_81BF932
release
end
@@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
goto_if eq, EventScript_171B4E
goto_if_eq EventScript_171B4E
goto EventScript_1719F7
end
EventScript_171B4E:: @ 8171B4E
msgbox gUnknown_81BF94F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
goto_if_eq EventScript_171A90
goto EventScript_1719F7
end
@@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86
call EventScript_171A41
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_171A90
goto_if_eq EventScript_171A90
msgbox gUnknown_81BF976
release
end
@@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
goto_if eq, EventScript_1719F7
goto_if_eq EventScript_1719F7
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
msgbox gUnknown_81BFA67
data/maps/FuchsiaCity/scripts.inc
+3 -6
View File
@@ -4,10 +4,8 @@ FuchsiaCity_MapScripts:: @ 8166D75
FuchsiaCity_OnTransition:: @ 8166D7B
setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY
checkflag FLAG_GOT_DOME_FOSSIL
call_if TRUE, EventScript_166D91
checkflag FLAG_GOT_DOME_FOSSIL
call_if FALSE, EventScript_166D97
call_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166D91
call_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_166D97
end
EventScript_166D91:: @ 8166D91
@@ -121,8 +119,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83
FuchsiaCity_EventScript_166E9C:: @ 8166E9C
lockall
checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_166EBE
goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166EBE
setvar VAR_0x8004, SPECIES_KABUTO
special Special_SetSeenMon
drawmonpic SPECIES_KABUTO, 10, 3
data/maps/FuchsiaCity_Building1/scripts.inc
+7 -10
View File
@@ -4,15 +4,13 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B
FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
lock
faceplayer
checkflag FLAG_GOT_HM04
goto_if TRUE, EventScript_16D7FA
checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH
goto_if TRUE, EventScript_16D780
goto_if_set FLAG_GOT_HM04, EventScript_16D7FA
goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780
msgbox gUnknown_8198DF9, MSGBOX_YESNO
compare VAR_RESULT, 1
call_if eq, EventScript_16D7E8
call_if_eq EventScript_16D7E8
compare VAR_RESULT, 0
call_if eq, EventScript_16D7F1
call_if_eq EventScript_16D7F1
release
end
@@ -26,11 +24,10 @@ EventScript_16D780:: @ 816D780
call EventScript_1A6675
checkplayergender
compare VAR_RESULT, 0
call_if eq, EventScript_16D7D6
call_if_eq EventScript_16D7D6
compare VAR_RESULT, 1
call_if eq, EventScript_16D7DF
additem ITEM_HM04, 1
giveitemfanfaremsg gUnknown_8199068, ITEM_HM04
call_if_eq EventScript_16D7DF
giveitem_msg gUnknown_8199068, ITEM_HM04
setflag FLAG_GOT_HM04
removeitem ITEM_GOLD_TEETH, 1
release
data/maps/FuchsiaCity_Gym/scripts.inc
+12 -16
View File
@@ -3,9 +3,8 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D
FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
checkflag FLAG_GOT_TM06_FROM_KOGA
goto_if FALSE, EventScript_16D5A6
trainerbattle_single TRAINER_LEADER_KOGA, Text_19832E, Text_198444, EventScript_16D580, NO_MUSIC
goto_if_unset FLAG_GOT_TM06_FROM_KOGA, EventScript_16D5A6
msgbox gUnknown_8198481
release
end
@@ -23,9 +22,8 @@ EventScript_16D5A6:: @ 816D5A6
msgbox gUnknown_819850E
checkitemspace ITEM_TM06, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16D5E7
additem ITEM_TM06, 1
giveitemfanfaremsg gUnknown_819858F, ITEM_TM06
goto_if_eq EventScript_16D5E7
giveitem_msg gUnknown_819858F, ITEM_TM06
setflag FLAG_GOT_TM06_FROM_KOGA
msgbox gUnknown_81985AB
release
@@ -37,41 +35,40 @@ EventScript_16D5E7:: @ 816D5E7
end
FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6
trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6
msgbox gUnknown_81988CB, 6
end
FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F
trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F
msgbox gUnknown_8198985, 6
end
FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779
famechecker FAMECHECKER_KOGA, 2
msgbox gUnknown_8198787, 6
end
FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA
trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA
msgbox gUnknown_8198A10, 6
end
FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4
trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4
msgbox gUnknown_81986C9, 6
end
FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812
trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812
msgbox gUnknown_8198825, 6
end
FuchsiaCity_Gym_EventScript_16D688:: @ 816D688
lock
faceplayer
checkflag FLAG_DEFEATED_KOGA
goto_if TRUE, EventScript_16D69D
goto_if_set FLAG_DEFEATED_KOGA, EventScript_16D69D
msgbox gUnknown_8198A5E
release
end
@@ -83,8 +80,7 @@ EventScript_16D69D:: @ 816D69D
FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
lockall
checkflag FLAG_BADGE05_GET
goto_if TRUE, EventScript_16D6BB
goto_if_set FLAG_BADGE05_GET, EventScript_16D6BB
msgbox gUnknown_8198B4B
releaseall
end
data/maps/FuchsiaCity_House2/scripts.inc
+4 -6
View File
@@ -4,11 +4,10 @@ FuchsiaCity_House2_MapScripts:: @ 816D816
FuchsiaCity_House2_EventScript_16D817:: @ 816D817
lock
faceplayer
checkflag FLAG_GOT_GOOD_ROD
goto_if TRUE, EventScript_16D83F
goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F
msgbox gUnknown_819918E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16D849
goto_if_eq EventScript_16D849
msgbox gUnknown_8199337
release
end
@@ -22,9 +21,8 @@ EventScript_16D849:: @ 816D849
msgbox gUnknown_8199207
checkitemspace ITEM_GOOD_ROD, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16D88A
additem ITEM_GOOD_ROD, 1
giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD
goto_if_eq EventScript_16D88A
giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD
msgbox gUnknown_8199296
setflag FLAG_GOT_GOOD_ROD
release
data/maps/FuchsiaCity_House3/scripts.inc
+6 -6
View File
@@ -6,7 +6,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895
faceplayer
msgbox gUnknown_81993B9, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16D8B0
goto_if_eq EventScript_16D8B0
goto EventScript_16D941
end
@@ -15,23 +15,23 @@ EventScript_16D8B0:: @ 816D8B0
special Special_ChooseMonFromParty
waitstate
compare VAR_0x8004, 6
goto_if ge, EventScript_16D941
goto_if_ge EventScript_16D941
special IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if eq, EventScript_16D937
goto_if_eq EventScript_16D937
special ScrSpecial_CountPokemonMoves
compare VAR_RESULT, 1
goto_if eq, EventScript_16D92A
goto_if_eq EventScript_16D92A
msgbox gUnknown_8199445
fadescreen 1
special SelectMove
fadescreen 0
compare VAR_0x8005, 4
goto_if eq, EventScript_16D8B0
goto_if_eq EventScript_16D8B0
special ScrSpecial_GetPokemonNicknameAndMoveName
msgbox gUnknown_8199485, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16D919
goto_if_eq EventScript_16D919
goto EventScript_16D941
end
data/maps/FuchsiaCity_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+11 -11
View File
@@ -39,7 +39,7 @@ EventScript_16D312:: @ 816D312
textcolor 0
msgbox gUnknown_8197E1A, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16D345
goto_if_eq EventScript_16D345
msgbox gUnknown_8197E48
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362
@@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391
showmoneybox 0, 0, 0
msgbox gUnknown_8197C87, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16D3CA
goto_if_eq EventScript_16D3CA
msgbox gUnknown_8197DE9
goto EventScript_16D49A
end
@@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA
call EventScript_16D462
checkmoney 500, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16D48C
goto_if_eq EventScript_16D48C
takemoney 500, 0
updatemoneybox 0, 0, 0
msgbox gUnknown_8197D07
@@ -125,11 +125,11 @@ EventScript_16D3CA:: @ 816D3CA
closemessage
hidemoneybox 0, 0
compare VAR_TEMP_2, 0
call_if eq, EventScript_16D44C
call_if_eq EventScript_16D44C
compare VAR_TEMP_2, 1
call_if eq, EventScript_16D441
call_if_eq EventScript_16D441
compare VAR_TEMP_2, 2
call_if eq, EventScript_16D457
call_if_eq EventScript_16D457
special EnterSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
@@ -152,12 +152,12 @@ EventScript_16D457:: @ 816D457
return
EventScript_16D462:: @ 816D462
countpokemon
compare VAR_RESULT, 6
goto_if ne, EventScript_1A77A9
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_ne EventScript_1A77A9
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare VAR_RESULT, 1
goto_if eq, EventScript_1A77A9
goto_if_eq EventScript_1A77A9
msgbox gUnknown_81BFEAC
goto EventScript_16D49A
end
@@ -201,7 +201,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
faceplayer
msgbox gUnknown_8197EB0, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16D4D6
goto_if_eq EventScript_16D4D6
msgbox gUnknown_819809E
release
end
data/maps/IndigoPlateau_Exterior/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B
IndigoPlateau_Exterior_OnTransition:: @ 8167246
setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
end
EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+5 -7
View File
@@ -7,12 +7,11 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
call_if eq, EventScript_16EA79
call_if_eq EventScript_16EA79
end
EventScript_16EA79:: @ 816EA79
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_1A77A9
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1A77A9
setobjectxyperm 4, 4, 2
return
@@ -21,14 +20,13 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
faceplayer
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
goto_if eq, EventScript_16EAA6
goto_if_eq EventScript_16EAA6
msgbox gUnknown_819A8D8
release
end
EventScript_16EAA6:: @ 816EAA6
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_16EAB9
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9
msgbox gUnknown_819A943
release
end
@@ -45,7 +43,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/LavenderTown/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ LavenderTown_EventScript_16687D:: @ 816687D
faceplayer
msgbox gUnknown_817F52E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16689C
goto_if_eq EventScript_16689C
msgbox gUnknown_817F568
release
end
data/maps/LavenderTown_House1/scripts.inc
+1 -2
View File
@@ -4,8 +4,7 @@ LavenderTown_House1_MapScripts:: @ 816B232
LavenderTown_House1_EventScript_16B233:: @ 816B233
lock
faceplayer
checkflag FLAG_RESCUED_MR_FUJI
goto_if TRUE, EventScript_16B248
goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B248
msgbox gUnknown_819397D
release
end
data/maps/LavenderTown_House2/scripts.inc
+10 -10
View File
@@ -6,9 +6,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266
faceplayer
msgbox gUnknown_8193A4B, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16B287
goto_if_eq EventScript_16B287
compare VAR_RESULT, 0
goto_if eq, EventScript_16B2AA
goto_if_eq EventScript_16B2AA
end
EventScript_16B287:: @ 816B287
@@ -16,9 +16,9 @@ EventScript_16B287:: @ 816B287
special Special_ChooseMonFromParty
waitstate
compare VAR_0x8004, 6
goto_if lt, EventScript_16B2B4
goto_if_lt EventScript_16B2B4
compare VAR_0x8004, 6
goto_if ge, EventScript_16B2AA
goto_if_ge EventScript_16B2AA
end
EventScript_16B2AA:: @ 816B2AA
@@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_16B307
goto_if_eq EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
compare VAR_RESULT, 1
goto_if eq, EventScript_16B311
goto_if_eq EventScript_16B311
specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1
goto_if eq, EventScript_16B311
goto_if_eq EventScript_16B311
msgbox gUnknown_8193AD2, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16B31B
goto_if_eq EventScript_16B31B
compare VAR_RESULT, 0
goto_if eq, EventScript_16B2AA
goto_if_eq EventScript_16B2AA
end
EventScript_16B307:: @ 816B307
@@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1
goto_if eq, EventScript_16B345
goto_if_eq EventScript_16B345
msgbox gUnknown_8193BF0
release
end
data/maps/LavenderTown_Mart/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362
LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+4 -7
View File
@@ -4,15 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149
LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
lock
faceplayer
checkflag FLAG_GOT_POKE_FLUTE
goto_if TRUE, EventScript_16B196
goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196
msgbox gUnknown_81936FF
checkitemspace ITEM_POKE_FLUTE, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16B1A0
goto_if_eq EventScript_16B1A0
setflag FLAG_GOT_POKE_FLUTE
additem ITEM_POKE_FLUTE, 1
giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
msgbox gUnknown_81937E5
release
end
@@ -42,8 +40,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3
LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC
lock
faceplayer
checkflag FLAG_RESCUED_MR_FUJI
goto_if TRUE, EventScript_16B1E1
goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1
msgbox gUnknown_81935ED
release
end
data/maps/MtEmber_Exterior/scripts.inc
+13 -13
View File
@@ -6,7 +6,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946
MtEmber_Exterior_OnTransition:: @ 8163951
setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
call_if eq, EventScript_163960
call_if_eq EventScript_163960
end
EventScript_163960:: @ 8163960
@@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960
MtEmber_Exterior_OnLoad:: @ 8163969
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
call_if ge, EventScript_163975
call_if_ge EventScript_163975
end
EventScript_163975:: @ 8163975
@@ -26,9 +26,9 @@ EventScript_163975:: @ 8163975
MtEmber_Exterior_EventScript_16397F:: @ 816397F
lock
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43
goto_if eq, EventScript_16399E
goto_if_eq EventScript_16399E
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1639A8
goto_if_eq EventScript_1639A8
msgbox gUnknown_817A82A
release
end
@@ -43,10 +43,10 @@ EventScript_1639A8:: @ 81639A8
waitmovement 0
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA06
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34
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_eq EventScript_1639DB
release
end
@@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
lock
faceplayer
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44
goto_if eq, EventScript_163A1B
goto_if_eq EventScript_163A1B
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_163A25
goto_if_eq EventScript_163A25
msgbox gUnknown_817A88C
closemessage
applymovement 3, Movement_FaceOriginalDirection
@@ -82,10 +82,10 @@ EventScript_163A1B:: @ 8163A1B
EventScript_163A25:: @ 8163A25
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA56
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A
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_eq EventScript_1639DB
release
end
@@ -116,16 +116,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
end
MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA
trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA
msgbox gUnknown_817ABD8, 6
end
MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82
trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82
msgbox gUnknown_817ACA2, 6
end
MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B
trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B
msgbox gUnknown_817AD89, 6
end
data/maps/MtEmber_RubyPath_B3F/scripts.inc
+1 -2
View File
@@ -7,7 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
faceplayer
setflag FLAG_GOT_RUBY
removeobject 1
additem ITEM_RUBY, 1
giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5
giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5
release
end
data/maps/MtEmber_Summit/scripts.inc
+7 -9
View File
@@ -4,20 +4,18 @@ MtEmber_Summit_MapScripts:: @ 8163AFC
.byte 0
MtEmber_Summit_OnResume:: @ 8163B07
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_163B11
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11
end
EventScript_163B11:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
MtEmber_Summit_OnTransition:: @ 8163B25
checkflag FLAG_FOUGHT_MOLTRES
call_if FALSE, EventScript_163B2F
call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F
end
EventScript_163B2F:: @ 8163B2F
@@ -27,7 +25,7 @@ EventScript_163B2F:: @ 8163B2F
MtEmber_Summit_EventScript_163B33:: @ 8163B33
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -46,11 +44,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163B96
goto_if_eq EventScript_163B96
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163B9F
goto_if_eq EventScript_163B9F
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163B9F
goto_if_eq EventScript_163B9F
setflag FLAG_FOUGHT_MOLTRES
release
end
data/maps/MtMoon_1F/scripts.inc
+7 -7
View File
@@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE
end
MtMoon_1F_EventScript_1605F7:: @ 81605F7
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB
trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB
msgbox gUnknown_81727DF, 6
end
MtMoon_1F_EventScript_16060E:: @ 816060E
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844
trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844
msgbox gUnknown_8172863, 6
end
MtMoon_1F_EventScript_160625:: @ 8160625
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3
trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3
msgbox gUnknown_81728D2, 6
end
MtMoon_1F_EventScript_16063C:: @ 816063C
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4
trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4
msgbox gUnknown_81729AC, 6
end
MtMoon_1F_EventScript_160653:: @ 8160653
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927
trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927
msgbox gUnknown_817293C, 6
end
MtMoon_1F_EventScript_16066A:: @ 816066A
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A
trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A
msgbox gUnknown_8172A26, 6
end
MtMoon_1F_EventScript_160681:: @ 8160681
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F
trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F
msgbox gUnknown_8172A97, 6
end
data/maps/MtMoon_B2F/scripts.inc
+12 -16
View File
@@ -3,8 +3,7 @@ MtMoon_B2F_MapScripts:: @ 8160699
.byte 0
MtMoon_B2F_OnTransition:: @ 816069F
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
call_if FALSE, EventScript_1606A9
call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9
end
EventScript_1606A9:: @ 81606A9
@@ -23,10 +22,9 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0
MtMoon_B2F_EventScript_1606C2:: @ 81606C2
lock
faceplayer
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
goto_if TRUE, EventScript_160707
goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707
checktrainerflag TRAINER_SUPER_NERD_MIGUEL
goto_if eq, EventScript_160711
goto_if_eq EventScript_160711
call EventScript_1606DD
release
end
@@ -38,7 +36,7 @@ EventScript_1606DD:: @ 81606DD
playbgm MUS_EXEYE, 0
waitbuttonpress
setvar VAR_LAST_TALKED, 3
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99
trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99
setvar VAR_MAP_SCENE_MT_MOON_B2F, 1
msgbox gUnknown_8172BAB
return
@@ -58,10 +56,9 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
faceplayer
msgbox gUnknown_8172E77, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
goto_if_eq EventScript_1607DE
removeobject 1
additem ITEM_DOME_FOSSIL, 1
giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
delay 10
@@ -91,10 +88,9 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
faceplayer
msgbox gUnknown_8172E94, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
goto_if_eq EventScript_1607DE
removeobject 2
additem ITEM_HELIX_FOSSIL, 1
giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
delay 10
@@ -123,21 +119,21 @@ Movement_1607E0:: @ 81607E0
step_end
MtMoon_B2F_EventScript_1607E4:: @ 81607E4
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8
msgbox gUnknown_8172CCB, 6
end
MtMoon_B2F_EventScript_1607FB:: @ 81607FB
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46
msgbox gUnknown_8172D51, 6
end
MtMoon_B2F_EventScript_160812:: @ 8160812
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF
msgbox gUnknown_8172DC1, 6
end
MtMoon_B2F_EventScript_160829:: @ 8160829
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E
msgbox gUnknown_8172E4B, 6
end
data/maps/NavelRock_Base/scripts.inc
+9 -13
View File
@@ -4,10 +4,8 @@ NavelRock_Base_MapScripts:: @ 81650E7
.byte 0
NavelRock_Base_OnTransition:: @ 81650F2
checkflag FLAG_FOUGHT_LUGIA
call_if TRUE, EventScript_165105
checkflag FLAG_FOUGHT_LUGIA
call_if FALSE, EventScript_165109
call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105
call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109
end
EventScript_165105:: @ 8165105
@@ -15,27 +13,25 @@ EventScript_165105:: @ 8165105
return
EventScript_165109:: @ 8165109
checkflag FLAG_LUGIA_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9
clearflag FLAG_HIDE_LUGIA
return
NavelRock_Base_OnResume:: @ 8165116
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_165120
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120
end
EventScript_165120:: @ 8165120
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject 1
return
NavelRock_Base_EventScript_165134:: @ 8165134
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -70,11 +66,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1651D9
goto_if_eq EventScript_1651D9
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1651E7
goto_if_eq EventScript_1651E7
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1651E7
goto_if_eq EventScript_1651E7
setflag FLAG_FOUGHT_LUGIA
release
end
data/maps/NavelRock_Summit/scripts.inc
+9 -13
View File
@@ -4,10 +4,8 @@ NavelRock_Summit_MapScripts:: @ 8164F9F
.byte 0
NavelRock_Summit_OnTransition:: @ 8164FAA
checkflag FLAG_FOUGHT_HO_OH
call_if TRUE, EventScript_164FBD
checkflag FLAG_FOUGHT_HO_OH
call_if FALSE, EventScript_164FC6
call_if_set FLAG_FOUGHT_HO_OH, EventScript_164FBD
call_if_unset FLAG_FOUGHT_HO_OH, EventScript_164FC6
end
EventScript_164FBD:: @ 8164FBD
@@ -17,28 +15,26 @@ EventScript_164FBD:: @ 8164FBD
EventScript_164FC6:: @ 8164FC6
setvar VAR_TEMP_1, 1
checkflag FLAG_HO_OH_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_1A77A9
setvar VAR_TEMP_1, 0
clearflag FLAG_HIDE_HO_OH
return
NavelRock_Summit_OnResume:: @ 8164FDD
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_164FE7
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_164FE7
end
EventScript_164FE7:: @ 8164FE7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject 1
return
NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lockall
setvar VAR_TEMP_1, 1
@@ -75,11 +71,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1650B4
goto_if_eq EventScript_1650B4
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1650C2
goto_if_eq EventScript_1650C2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1650C2
goto_if_eq EventScript_1650C2
setflag FLAG_FOUGHT_HO_OH
releaseall
end
data/maps/OneIsland/scripts.inc
+2 -4
View File
@@ -83,10 +83,8 @@ Movement_167514:: @ 8167514
OneIsland_EventScript_167517:: @ 8167517
lock
faceplayer
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_16753F
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_167535
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F
goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535
msgbox gUnknown_818174E
release
end
data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+1 -2
View File
@@ -28,8 +28,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
lock
faceplayer
checkflag FLAG_GOT_HM06
goto_if TRUE, EventScript_1653C5
goto_if_set FLAG_GOT_HM06, EventScript_1653C5
msgbox gUnknown_817D622
giveitem ITEM_HM06
setflag FLAG_GOT_HM06
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+34 -45
View File
@@ -7,9 +7,8 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
call_if ge, EventScript_170C22
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_170C36
call_if_ge EventScript_170C22
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36
end
EventScript_170C22:: @ 8170C22
@@ -29,11 +28,11 @@ EventScript_170C36:: @ 8170C36
OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E
setrespawn SPAWN_ONE_ISLAND
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
call_if eq, EventScript_170C73
call_if_eq EventScript_170C73
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
call_if eq, EventScript_170C79
call_if_eq EventScript_170C79
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
call_if eq, EventScript_170C90
call_if_eq EventScript_170C90
end
EventScript_170C73:: @ 8170C73
@@ -84,10 +83,8 @@ EventScript_170CB1:: @ 8170CB1
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_170E34
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_170E3D
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A0E17
@@ -104,18 +101,17 @@ EventScript_170CB1:: @ 8170CB1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A0FB1
giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
additem ITEM_METEORITE, 1
msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
additem ITEM_METEORITE
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A1113
additem ITEM_TRI_PASS, 1
giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
msgbox gUnknown_81A1150
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_170E46
call_if_ge EventScript_170E46
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_170E58
call_if_lt EventScript_170E58
setflag FLAG_SYS_SEVII_MAP_123
msgbox gUnknown_81A1230
closemessage
@@ -148,8 +144,7 @@ EventScript_170E46:: @ 8170E46
EventScript_170E58:: @ 8170E58
setflag FLAG_HIDE_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
return
Movement_170E7D:: @ 8170E7D
@@ -192,8 +187,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
lock
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_170EB1
goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1
msgbox gUnknown_81A1266
release
end
@@ -209,22 +203,20 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
lock
faceplayer
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
goto_if eq, EventScript_170F35
goto_if_eq EventScript_170F35
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
goto_if eq, EventScript_170F9B
checkflag FLAG_RECOVERED_SAPPHIRE
goto_if TRUE, EventScript_170FA5
goto_if_eq EventScript_170F9B
goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if eq, EventScript_17103A
checkflag FLAG_GOT_RUBY
goto_if TRUE, EventScript_171044
goto_if_eq EventScript_17103A
goto_if_set FLAG_GOT_RUBY, EventScript_171044
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1710F2
goto_if_eq EventScript_1710F2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
goto_if eq, EventScript_1710FC
goto_if_eq EventScript_1710FC
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
goto_if eq, EventScript_171134
goto_if_eq EventScript_171134
msgbox gUnknown_81A1321
closemessage
applymovement 3, Movement_FaceOriginalDirection
@@ -236,9 +228,9 @@ EventScript_170F35:: @ 8170F35
msgbox gUnknown_81A1EBD
random 3
compare VAR_RESULT, 0
goto_if eq, EventScript_170F6D
goto_if_eq EventScript_170F6D
compare VAR_RESULT, 1
goto_if eq, EventScript_170F84
goto_if_eq EventScript_170F84
famechecker FAMECHECKER_BILL, 5
msgbox gUnknown_81A2076
release
@@ -325,14 +317,14 @@ EventScript_171044:: @ 8171044
waitmovement 0
msgbox gUnknown_81A19AA, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto_if_eq EventScript_171099
goto EventScript_1710B2
end
EventScript_171099:: @ 8171099
msgbox gUnknown_81A1A08, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto_if_eq EventScript_171099
goto EventScript_1710B2
end
@@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2
removeitem ITEM_RUBY, 1
removeitem ITEM_TRI_PASS, 1
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
additem ITEM_RAINBOW_PASS, 1
additem ITEM_RAINBOW_PASS
setflag FLAG_SYS_SEVII_MAP_4567
textcolor 3
playfanfare MUS_FAN5
@@ -404,8 +396,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
lock
faceplayer
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_17116F
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F
msgbox gUnknown_81A218D
release
end
@@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F
OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
lockall
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_1711A0
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_171196
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0
goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196
msgbox gUnknown_81A223F
releaseall
end
@@ -467,13 +456,13 @@ EventScript_1711DA:: @ 81711DA
msgbox gUnknown_81A13B8
closemessage
compare VAR_TEMP_1, 1
call_if eq, EventScript_1712E4
call_if_eq EventScript_1712E4
compare VAR_TEMP_1, 2
call_if eq, EventScript_1712EF
call_if_eq EventScript_1712EF
compare VAR_TEMP_1, 3
call_if eq, EventScript_1712FA
call_if_eq EventScript_1712FA
compare VAR_TEMP_1, 4
call_if eq, EventScript_171305
call_if_eq EventScript_171305
delay 10
msgbox gUnknown_81A13CB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
data/maps/PalletTown/scripts.inc
+18 -23
View File
@@ -5,19 +5,17 @@ PalletTown_MapScripts:: @ 816545A
PalletTown_OnTransition:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
call_if TRUE, EventScript_165488
call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
call_if eq, EventScript_1654A8
call_if_eq EventScript_1654A8
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
call_if eq, EventScript_1654A2
call_if_eq EventScript_1654A2
end
EventScript_165488:: @ 8165488
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
goto_if FALSE, EventScript_1A77A9
goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if ge, EventScript_1A77A9
goto_if_ge EventScript_1A77A9
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
@@ -26,8 +24,7 @@ EventScript_1654A2:: @ 81654A2
return
EventScript_1654A8:: @ 81654A8
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
goto_if TRUE, EventScript_1654BD
goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD
setobjectxyperm 1, 5, 15
setobjectmovementtype 1, 7
return
@@ -50,8 +47,7 @@ EventScript_1654D8:: @ 81654D8
addobject 3
applymovement 3, Movement_1655AF
waitmovement 0
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if FALSE, EventScript_1655A1
goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
@@ -60,7 +56,7 @@ EventScript_1654D8:: @ 81654D8
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare VAR_0x8009, 60
goto_if lt, EventScript_165593
goto_if_lt EventScript_165593
msgbox gUnknown_817D9AA
closemessage
playbgm MUS_ANNAI, 0
@@ -200,17 +196,17 @@ EventScript_165605:: @ 8165605
delay 30
addobject 3
compare VAR_TEMP_1, 0
call_if eq, EventScript_1656B8
call_if_eq EventScript_1656B8
compare VAR_TEMP_1, 1
call_if eq, EventScript_1656C3
call_if_eq EventScript_1656C3
delay 30
msgbox gUnknown_817D74A
closemessage
delay 30
compare VAR_TEMP_1, 0
call_if eq, EventScript_1656CE
call_if_eq EventScript_1656CE
compare VAR_TEMP_1, 1
call_if eq, EventScript_1656E0
call_if_eq EventScript_1656E0
opendoor 16, 13
waitdooranim
applymovement 3, Movement_16572E
@@ -375,13 +371,12 @@ Movement_165758:: @ 8165758
PalletTown_EventScript_16575C:: @ 816575C
lock
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
goto_if eq, EventScript_1657ED
goto_if_eq EventScript_1657ED
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if eq, EventScript_165815
goto_if_eq EventScript_165815
compare VAR_TEMP_2, 1
goto_if eq, EventScript_1658C2
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_165801
goto_if_eq EventScript_1658C2
goto_if_set FLAG_TEMP_2, EventScript_165801
msgbox gUnknown_81B1C8B
applymovement 1, Movement_FacePlayer
waitmovement 0
@@ -393,9 +388,9 @@ PalletTown_EventScript_16575C:: @ 816575C
msgbox gUnknown_81B1C9F
closemessage
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1657D7
call_if_eq EventScript_1657D7
compare VAR_FACING, DIR_EAST
call_if ne, EventScript_1657E2
call_if_ne EventScript_1657E2
moveobjectoffscreen 1
setflag FLAG_TEMP_2
release
data/maps/PalletTown_GarysHouse/scripts.inc
+14 -16
View File
@@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27
PalletTown_GarysHouse_OnTransition:: @ 8168D2D
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_168D44
call_if_lt EventScript_168D44
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_168D50
call_if_ge EventScript_168D50
end
EventScript_168D44:: @ 8168D44
@@ -22,16 +22,15 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
lock
faceplayer
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_168DB9
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9
compare VAR_TEMP_1, 1
goto_if eq, EventScript_168EEC
goto_if_eq EventScript_168EEC
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
goto_if eq, EventScript_168F59
goto_if_eq EventScript_168F59
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
goto_if eq, EventScript_168EF6
goto_if_eq EventScript_168EF6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
goto_if ge, EventScript_168DAF
goto_if_ge EventScript_168DAF
msgbox gUnknown_818D58C
closemessage
applymovement 1, Movement_FaceOriginalDirection
@@ -47,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF
EventScript_168DB9:: @ 8168DB9
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if lt, EventScript_168E46
goto_if_lt EventScript_168E46
msgbox gUnknown_818D7D3, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_168E3C
goto_if_eq EventScript_168E3C
msgbox gUnknown_818D8B2
special Special_ChooseMonFromParty
waitstate
lock
faceplayer
compare VAR_0x8004, 6
goto_if ge, EventScript_168E3C
goto_if_ge EventScript_168E3C
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_168E32
goto_if_eq EventScript_168E32
msgbox gUnknown_818D8CC
closemessage
fadescreen 1
@@ -144,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6
closemessage
checkitemspace ITEM_TOWN_MAP, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_168F4F
goto_if_eq EventScript_168F4F
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
removeobject 2
@@ -153,8 +152,7 @@ EventScript_168EF6:: @ 8168EF6
applymovement 1, Movement_FacePlayer
waitmovement 0
delay 12
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5
giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5
release
end
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+6 -7
View File
@@ -4,13 +4,12 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08
PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
lock
faceplayer
checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB
goto_if TRUE, EventScript_168C4A
goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A
checkplayergender
compare VAR_RESULT, 0
call_if eq, EventScript_168C38
call_if_eq EventScript_168C38
compare VAR_RESULT, 1
call_if eq, EventScript_168C41
call_if_eq EventScript_168C41
closemessage
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
@@ -36,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A
PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
lockall
compare VAR_FACING, DIR_NORTH
goto_if eq, EventScript_168C78
goto_if_eq EventScript_168C78
msgbox gUnknown_818D4F9
releaseall
end
@@ -44,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
EventScript_168C78:: @ 8168C78
checkplayergender
compare VAR_RESULT, 0
call_if eq, EventScript_168C91
call_if_eq EventScript_168C91
compare VAR_RESULT, 1
call_if eq, EventScript_168C9A
call_if_eq EventScript_168C9A
releaseall
end
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3
PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE
compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
call_if eq, EventScript_168CBA
call_if_eq EventScript_168CBA
end
EventScript_168CBA:: @ 8168CBA
@@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4
PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
setvar VAR_0x8004, 32
special Special_SetSomeVariable
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+115 -127
View File
@@ -7,13 +7,12 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E
setflag FLAG_VISITED_OAKS_LAB
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
call_if eq, EventScript_168FC6
call_if_eq EventScript_168FC6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
call_if eq, EventScript_168FD5
call_if_eq EventScript_168FD5
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
call_if eq, EventScript_168FC0
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
call_if TRUE, EventScript_168FBC
call_if_eq EventScript_168FC0
call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC
end
EventScript_168FBC:: @ 8168FBC
@@ -67,32 +66,32 @@ EventScript_169035:: @ 8169035
msgbox gUnknown_818EE60
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169174
call_if_eq EventScript_169174
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1691BB
call_if_eq EventScript_1691BB
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169194
call_if_eq EventScript_169194
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169194
call_if_eq EventScript_169194
msgbox gUnknown_818EF59
fadedefaultbgm
msgbox gUnknown_818F004
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1691DB
call_if_eq EventScript_1691DB
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1691E6
call_if_eq EventScript_1691E6
textcolor 3
msgbox gUnknown_818F062
closemessage
call EventScript_1A6675
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1691F1
call_if_eq EventScript_1691F1
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1691FC
call_if_eq EventScript_1691FC
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169215
call_if_eq EventScript_169215
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169227
call_if_eq EventScript_169227
addobject 9
addobject 10
delay 30
@@ -102,13 +101,13 @@ EventScript_169035:: @ 8169035
removeobject 10
delay 30
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169845
call_if_eq EventScript_169845
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169850
call_if_eq EventScript_169850
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16985B
call_if_eq EventScript_16985B
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16986D
call_if_eq EventScript_16986D
textcolor 3
playfanfare MUS_FAN5
message Text_18F0E8
@@ -121,13 +120,13 @@ EventScript_169035:: @ 8169035
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B69
call_if_eq EventScript_169B69
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
removeobject 8
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
@@ -312,20 +311,20 @@ EventScript_16930B:: @ 816930B
applymovement 4, Movement_FaceDown
waitmovement 0
compare VAR_STARTER_MON, 0
goto_if eq, EventScript_1693D2
goto_if_eq EventScript_1693D2
compare VAR_STARTER_MON, 1
goto_if eq, EventScript_16944D
goto_if_eq EventScript_16944D
compare VAR_STARTER_MON, 2
goto_if eq, EventScript_16935A
goto_if_eq EventScript_16935A
end
EventScript_16935A:: @ 816935A
compare VAR_TEMP_2, 1
goto_if eq, EventScript_16937C
goto_if_eq EventScript_16937C
compare VAR_TEMP_2, 2
goto_if eq, EventScript_16938C
goto_if_eq EventScript_16938C
compare VAR_TEMP_2, 3
goto_if eq, EventScript_16939C
goto_if_eq EventScript_16939C
end
EventScript_16937C:: @ 816937C
@@ -347,7 +346,7 @@ EventScript_16939C:: @ 816939C
end
EventScript_1693AC:: @ 81693AC
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2
end
@@ -377,11 +376,11 @@ Movement_1693CD:: @ 81693CD
EventScript_1693D2:: @ 81693D2
compare VAR_TEMP_2, 1
goto_if eq, EventScript_1693F4
goto_if_eq EventScript_1693F4
compare VAR_TEMP_2, 2
goto_if eq, EventScript_169404
goto_if_eq EventScript_169404
compare VAR_TEMP_2, 3
goto_if eq, EventScript_169414
goto_if_eq EventScript_169414
end
EventScript_1693F4:: @ 81693F4
@@ -403,7 +402,7 @@ EventScript_169414:: @ 8169414
end
EventScript_169424:: @ 8169424
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2
end
@@ -436,11 +435,11 @@ Movement_169447:: @ 8169447
EventScript_16944D:: @ 816944D
compare VAR_TEMP_2, 1
goto_if eq, EventScript_16946F
goto_if_eq EventScript_16946F
compare VAR_TEMP_2, 2
goto_if eq, EventScript_16947F
goto_if_eq EventScript_16947F
compare VAR_TEMP_2, 3
goto_if eq, EventScript_16948F
goto_if_eq EventScript_16948F
end
EventScript_16946F:: @ 816946F
@@ -462,7 +461,7 @@ EventScript_16948F:: @ 816948F
end
EventScript_16949F:: @ 816949F
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2
end
@@ -493,11 +492,11 @@ EventScript_1694C2:: @ 81694C2
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_2, 1
call_if eq, EventScript_169504
call_if_eq EventScript_169504
compare VAR_TEMP_2, 2
call_if eq, EventScript_169516
call_if_eq EventScript_169516
compare VAR_TEMP_2, 3
call_if eq, EventScript_169528
call_if_eq EventScript_169528
removeobject 8
playse SE_KAIDAN
fadedefaultbgm
@@ -575,9 +574,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
lock
faceplayer
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if eq, EventScript_16958B
goto_if_eq EventScript_16958B
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169581
goto_if_eq EventScript_169581
msgbox gUnknown_818DC67
release
end
@@ -595,24 +594,22 @@ EventScript_16958B:: @ 816958B
PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
lock
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_169600
goto_if_set FLAG_TEMP_2, EventScript_169600
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
goto_if eq, EventScript_169903
goto_if_eq EventScript_169903
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
goto_if eq, EventScript_169A6E
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_1699CE
goto_if_eq EventScript_169A6E
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE
compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
goto_if eq, EventScript_169903
goto_if_eq EventScript_169903
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
goto_if eq, EventScript_1698D6
goto_if_eq EventScript_1698D6
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if ge, EventScript_16961E
goto_if_ge EventScript_16961E
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
goto_if eq, EventScript_169614
goto_if_eq EventScript_169614
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if eq, EventScript_16960A
goto_if_eq EventScript_16960A
msgbox gUnknown_818E116
release
end
@@ -646,13 +643,13 @@ EventScript_16961E:: @ 816961E
msgbox gUnknown_818DE8D
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169A82
call_if_eq EventScript_169A82
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169AC1
call_if_eq EventScript_169AC1
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169A9E
call_if_eq EventScript_169A9E
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169A9E
call_if_eq EventScript_169A9E
fadedefaultbgm
msgbox gUnknown_818DE99
closemessage
@@ -663,23 +660,23 @@ EventScript_16961E:: @ 816961E
applymovement 4, Movement_Delay48
waitmovement 0
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169ADD
call_if_eq EventScript_169ADD
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B14
call_if_eq EventScript_169B14
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169AF5
call_if_eq EventScript_169AF5
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B86
call_if_eq EventScript_169B86
msgbox gUnknown_818E508
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169882
call_if_eq EventScript_169882
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16988D
call_if_eq EventScript_16988D
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1698A6
call_if_eq EventScript_1698A6
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1698B8
call_if_eq EventScript_1698B8
msgbox gUnknown_818E536
closemessage
delay 40
@@ -692,13 +689,13 @@ EventScript_16961E:: @ 816961E
removeobject 10
delay 25
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169845
call_if_eq EventScript_169845
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169850
call_if_eq EventScript_169850
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16985B
call_if_eq EventScript_16985B
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16986D
call_if_eq EventScript_16986D
delay 10
textcolor 3
playfanfare MUS_FAN5
@@ -710,31 +707,30 @@ EventScript_16961E:: @ 816961E
special sub_810B810
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
msgbox gUnknown_818E612
additem ITEM_POKE_BALL, 5
giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
msgbox gUnknown_818E6D0
famechecker FAMECHECKER_OAK, 1
msgbox gUnknown_818E784
msgbox gUnknown_818DEC8
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B33
call_if_eq EventScript_169B33
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B45
call_if_eq EventScript_169B45
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B57
call_if_eq EventScript_169B57
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B57
call_if_eq EventScript_169B57
msgbox gUnknown_818DEF3
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B69
call_if_eq EventScript_169B69
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B7B
call_if_eq EventScript_169B7B
removeobject 8
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
@@ -840,14 +836,13 @@ EventScript_1698D6:: @ 81698D6
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare VAR_0x8009, 1
goto_if eq, EventScript_1699FB
goto_if_eq EventScript_1699FB
goto EventScript_169903
end
EventScript_169903:: @ 8169903
call EventScript_1A737B
checkflag FLAG_OAK_SAW_DEX_COMPLETION
goto_if TRUE, EventScript_169913
goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913
release
end
@@ -857,13 +852,13 @@ EventScript_169913:: @ 8169913
message Text_1A7291
waitmessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169964
call_if_eq EventScript_169964
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16996F
call_if_eq EventScript_16996F
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16997A
call_if_eq EventScript_16997A
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169985
call_if_eq EventScript_169985
applymovement 4, Movement_FacePlayer
waitmovement 0
closemessage
@@ -971,9 +966,8 @@ EventScript_1699CE:: @ 81699CE
call EventScript_1A737B
closemessage
compare VAR_0x8009, 60
goto_if lt, EventScript_1699F9
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if FALSE, EventScript_1699F9
goto_if_lt EventScript_1699F9
goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9
delay 30
msgbox gUnknown_818EDF5
goto EventScript_169035
@@ -986,28 +980,25 @@ EventScript_1699F9:: @ 81699F9
EventScript_1699FB:: @ 81699FB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK
goto_if TRUE, EventScript_169A6E
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
goto_if TRUE, EventScript_169A78
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
goto_if eq, EventScript_169A34
goto_if_eq EventScript_169A34
goto EventScript_169A6E
end
EventScript_169A34:: @ 8169A34
compare VAR_MAP_SCENE_ROUTE22, 2
goto_if ge, EventScript_169A45
goto_if_ge EventScript_169A45
goto EventScript_169A6E
end
EventScript_169A45:: @ 8169A45
msgbox gUnknown_818E89C
additem ITEM_POKE_BALL, 5
giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
release
end
@@ -1154,9 +1145,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
goto_if_ge EventScript_169DE4
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
goto_if_eq EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1167,35 +1158,35 @@ EventScript_169BE1:: @ 8169BE1
drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
textcolor 0
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if eq, EventScript_OakDescribesBulbasaur
goto_if_eq EventScript_OakDescribesBulbasaur
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if eq, EventScript_OakDescribesCharmander
goto_if_eq EventScript_OakDescribesCharmander
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if eq, EventScript_OakDescribesSquirtle
goto_if_eq EventScript_OakDescribesSquirtle
end
EventScript_OakDescribesBulbasaur:: @ 8169C14
msgbox gUnknown_818E272, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
goto_if_eq EventScript_DeclinedStarter
end
EventScript_OakDescribesCharmander:: @ 8169C33
msgbox gUnknown_818E207, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
goto_if_eq EventScript_DeclinedStarter
end
EventScript_OakDescribesSquirtle:: @ 8169C52
msgbox gUnknown_818E194, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
compare VAR_RESULT, 0
goto_if eq, EventScript_DeclinedStarter
goto_if_eq EventScript_DeclinedStarter
end
EventScript_DeclinedStarter:: @ 8169C71
@@ -1210,7 +1201,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
call EventScript_1A6675
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0
givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE
copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO
getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES
message Text_18E30D
@@ -1219,9 +1210,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_GiveNicknameToStarter
goto_if_eq EventScript_GiveNicknameToStarter
compare VAR_RESULT, 0
goto_if eq, EventScript_SkipGiveNicknameToStarter
goto_if_eq EventScript_SkipGiveNicknameToStarter
end
EventScript_GiveNicknameToStarter:: @ 8169CCC
@@ -1233,11 +1224,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC
EventScript_SkipGiveNicknameToStarter:: @ 8169CDC
closemessage
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if eq, EventScript_RivalWalksToCharmander
goto_if_eq EventScript_RivalWalksToCharmander
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if eq, EventScript_RivalWalksToSquirtle
goto_if_eq EventScript_RivalWalksToSquirtle
compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if eq, EventScript_RivalWalksToBulbasaur
goto_if_eq EventScript_RivalWalksToBulbasaur
end
EventScript_RivalWalksToCharmander:: @ 8169CFF
@@ -1269,8 +1260,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F
playfanfare MUS_FAN5
waitfanfare
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
call_if TRUE, EventScript_169D5C
call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C
release
end
@@ -1314,9 +1304,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
goto_if_ge EventScript_169DE4
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
goto_if_eq EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1329,9 +1319,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
goto_if_ge EventScript_169DE4
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if eq, EventScript_169BE1
goto_if_eq EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1344,8 +1334,7 @@ EventScript_169DE4:: @ 8169DE4
PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
lock
faceplayer
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_169E03
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03
msgbox gUnknown_818EBE6
release
end
@@ -1359,8 +1348,7 @@ EventScript_169E03:: @ 8169E03
PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
lock
faceplayer
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_169E2F
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F
msgbox gUnknown_818EBE6
release
end
@@ -1394,7 +1382,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
lockall
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
goto_if ge, EventScript_169E90
goto_if_ge EventScript_169E90
msgbox gUnknown_818EA84
releaseall
end
data/maps/PewterCity/scripts.inc
+21 -21
View File
@@ -14,7 +14,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
closemessage
playbgm MUS_ANNAI, 0
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_165BD3
call_if_eq EventScript_165BD3
msgbox gUnknown_817E6C7
closemessage
applymovement 5, Movement_165D83
@@ -446,11 +446,11 @@ EventScript_165DBE:: @ 8165DBE
closemessage
playbgm MUS_ANNAI, 0
compare VAR_TEMP_1, 0
call_if eq, EventScript_165E0A
call_if_eq EventScript_165E0A
compare VAR_TEMP_1, 1
call_if eq, EventScript_165E26
call_if_eq EventScript_165E26
compare VAR_TEMP_1, 2
call_if eq, EventScript_165E42
call_if_eq EventScript_165E42
msgbox gUnknown_817E6C7
closemessage
applymovement 5, Movement_165D83
@@ -1033,19 +1033,19 @@ PewterCity_EventScript_16607E:: @ 816607E
faceplayer
msgbox gUnknown_817E53E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_166136
goto_if_eq EventScript_166136
msgbox gUnknown_817E589
closemessage
delay 10
playbgm MUS_ANNAI, 0
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1660EE
call_if_eq EventScript_1660EE
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_166100
call_if_eq EventScript_166100
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_166112
call_if_eq EventScript_166112
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_166124
call_if_eq EventScript_166124
msgbox gUnknown_817E5AC
closemessage
delay 10
@@ -1352,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244
faceplayer
msgbox gUnknown_817E602, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_166263
goto_if_eq EventScript_166263
msgbox gUnknown_817E644
release
end
@@ -1417,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1
EventScript_1662DE:: @ 81662DE
textcolor 0
compare VAR_TEMP_1, 1
call_if eq, EventScript_1663CA
call_if_eq EventScript_1663CA
compare VAR_TEMP_1, 2
call_if eq, EventScript_1663CA
call_if_eq EventScript_1663CA
compare VAR_TEMP_1, 3
call_if eq, EventScript_1663CA
call_if_eq EventScript_1663CA
waitse
playse SE_PIN
applymovement 7, Movement_ExclamationMark
@@ -1430,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE
waitmovement 0
msgbox gUnknown_817E902
compare VAR_TEMP_1, 0
call_if eq, EventScript_1663D5
call_if_eq EventScript_1663D5
compare VAR_TEMP_1, 1
call_if eq, EventScript_1663DA
call_if_eq EventScript_1663DA
compare VAR_TEMP_1, 2
call_if eq, EventScript_1663E6
call_if_eq EventScript_1663E6
compare VAR_TEMP_1, 3
call_if eq, EventScript_1663FC
call_if_eq EventScript_1663FC
msgbox gUnknown_817E90C
textcolor 3
playfanfare MUS_FAN5
@@ -1452,13 +1452,13 @@ EventScript_1662DE:: @ 81662DE
msgbox gUnknown_817EA06
closemessage
compare VAR_TEMP_1, 0
call_if eq, EventScript_166412
call_if_eq EventScript_166412
compare VAR_TEMP_1, 1
call_if eq, EventScript_16641D
call_if_eq EventScript_16641D
compare VAR_TEMP_1, 2
call_if eq, EventScript_166428
call_if_eq EventScript_166428
compare VAR_TEMP_1, 3
call_if eq, EventScript_166433
call_if_eq EventScript_166433
delay 30
textcolor 3
msgbox gUnknown_817EA36
data/maps/PewterCity_Gym/scripts.inc
+9 -13
View File
@@ -3,9 +3,8 @@ PewterCity_Gym_MapScripts:: @ 816A592
PewterCity_Gym_EventScript_16A593:: @ 816A593
famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
checkflag FLAG_GOT_TM39_FROM_BROCK
goto_if FALSE, EventScript_16A5F3
trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC
goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3
msgbox gUnknown_819110F
release
end
@@ -25,9 +24,8 @@ EventScript_16A5F3:: @ 816A5F3
msgbox gUnknown_8190FC1
checkitemspace ITEM_TM39, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16A634
additem ITEM_TM39, 1
giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39
goto_if_eq EventScript_16A634
giveitem_msg gUnknown_8190FDB, ITEM_TM39
setflag FLAG_GOT_TM39_FROM_BROCK
msgbox gUnknown_8190FF8
release
@@ -39,20 +37,19 @@ EventScript_16A634:: @ 816A634
end
PewterCity_Gym_EventScript_16A63E:: @ 816A63E
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237
trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237
msgbox gUnknown_819126B, 6
end
PewterCity_Gym_EventScript_16A655:: @ 816A655
lock
faceplayer
checkflag FLAG_DEFEATED_BROCK
goto_if TRUE, EventScript_16A67F
goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F
msgbox gUnknown_8191298, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16A689
goto_if_eq EventScript_16A689
compare VAR_RESULT, 0
goto_if eq, EventScript_16A697
goto_if_eq EventScript_16A697
end
EventScript_16A67F:: @ 816A67F
@@ -77,8 +74,7 @@ EventScript_16A6A5:: @ 816A6A5
PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
lockall
checkflag FLAG_BADGE01_GET
goto_if TRUE, EventScript_16A6C3
goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3
msgbox gUnknown_819146E
releaseall
end
data/maps/PewterCity_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7
PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
message Text_MayIHelpYou
data/maps/PewterCity_Museum_1F/scripts.inc
+13 -15
View File
@@ -5,11 +5,11 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
lock
faceplayer
compare VAR_FACING, DIR_WEST
goto_if eq, EventScript_16A348
goto_if_eq EventScript_16A348
compare VAR_FACING, DIR_SOUTH
goto_if eq, EventScript_16A348
goto_if_eq EventScript_16A348
compare VAR_FACING, DIR_NORTH
goto_if eq, EventScript_16A348
goto_if_eq EventScript_16A348
msgbox gUnknown_8190539
release
end
@@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
EventScript_16A348:: @ 816A348
msgbox gUnknown_8190550, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16A367
goto_if_eq EventScript_16A367
compare VAR_RESULT, 0
goto_if eq, EventScript_16A37B
goto_if_eq EventScript_16A37B
end
EventScript_16A367:: @ 816A367
@@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1
showmoneybox 0, 0, 0
msgbox gUnknown_81904B5, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16A402
goto_if_eq EventScript_16A402
msgbox gUnknown_81904F9
closemessage
hidemoneybox 0, 0
@@ -77,14 +77,14 @@ EventScript_16A3D1:: @ 816A3D1
EventScript_16A402:: @ 816A402
checkmoney 50, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_16A476
goto_if_eq EventScript_16A476
closemessage
compare VAR_TEMP_1, 0
call_if eq, EventScript_16A455
call_if_eq EventScript_16A455
compare VAR_TEMP_1, 1
call_if eq, EventScript_16A460
call_if_eq EventScript_16A460
compare VAR_TEMP_1, 2
call_if eq, EventScript_16A46B
call_if_eq EventScript_16A46B
playse SE_SHOP
takemoney 50, 0
updatemoneybox 0, 0, 0
@@ -152,16 +152,14 @@ PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5
PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE
lock
faceplayer
checkflag FLAG_GOT_OLD_AMBER
goto_if TRUE, EventScript_16A4FF
goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF
msgbox gUnknown_8190717
checkitemspace ITEM_OLD_AMBER, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16A4F5
goto_if_eq EventScript_16A4F5
setflag FLAG_GOT_OLD_AMBER
removeobject 4
additem ITEM_OLD_AMBER, 1
giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5
giveitem_msg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5
release
end
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+9 -15
View File
@@ -11,10 +11,9 @@ PokemonLeague_AgathasRoom_OnResume:: @ 8162825
end
PokemonLeague_AgathasRoom_OnLoad:: @ 8162830
checkflag FLAG_DEFEATED_AGATHA
call_if TRUE, EventScript_16284B
call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
call_if eq, EventScript_162845
call_if_eq EventScript_162845
end
EventScript_162845:: @ 8162845
@@ -48,21 +47,16 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
lock
faceplayer
famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_AGATHA
goto_if TRUE, EventScript_162911
goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911
famechecker FAMECHECKER_AGATHA, 0
famechecker FAMECHECKER_AGATHA, 4
famechecker FAMECHECKER_OAK, 4
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_1628E9
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_1628F2
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_1628FB
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162906
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906
clearflag FLAG_TEMP_5
goto EventScript_16291B
@@ -78,11 +72,11 @@ EventScript_1628F2:: @ 81628F2
return
EventScript_1628FB:: @ 81628FB
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7
trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7
return
EventScript_162906:: @ 8162906
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7
trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7
return
EventScript_162911:: @ 8162911
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+17 -23
View File
@@ -11,10 +11,9 @@ PokemonLeague_BrunosRoom_OnResume:: @ 816269A
end
PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5
checkflag FLAG_DEFEATED_BRUNO
call_if TRUE, EventScript_1626C0
call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
call_if eq, EventScript_1626BA
call_if_eq EventScript_1626BA
end
EventScript_1626BA:: @ 81626BA
@@ -48,20 +47,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
lock
faceplayer
famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_BRUNO
goto_if TRUE, EventScript_162779
goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779
famechecker FAMECHECKER_BRUNO, 0
famechecker FAMECHECKER_BRUNO, 1
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_162751
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_16275A
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162763
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16276E
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E
clearflag FLAG_TEMP_5
goto EventScript_1627B0
@@ -77,24 +71,24 @@ EventScript_16275A:: @ 816275A
return
EventScript_162763:: @ 8162763
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409
trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409
return
EventScript_16276E:: @ 816276E
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409
trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409
return
EventScript_162779:: @ 8162779
msgbox gUnknown_8178420
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1627FA
call_if_eq EventScript_1627FA
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1627EF
call_if_eq EventScript_1627EF
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_162805
call_if_eq EventScript_162805
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_162805
call_if_eq EventScript_162805
release
end
@@ -104,13 +98,13 @@ EventScript_1627B0:: @ 81627B0
msgbox gUnknown_8178420
closemessage
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1627FA
call_if_eq EventScript_1627FA
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1627EF
call_if_eq EventScript_1627EF
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_162805
call_if_eq EventScript_162805
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_162805
call_if_eq EventScript_162805
release
end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+26 -30
View File
@@ -8,32 +8,32 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2
setvar VAR_0x8004, 4
call EventScript_1A75D5
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162B1E
call_if_eq EventScript_162B1E
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162B31
call_if_eq EventScript_162B31
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162B44
call_if_eq EventScript_162B44
end
EventScript_162B1E:: @ 8162B1E
checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
return
EventScript_162B31:: @ 8162B31
checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
return
EventScript_162B44:: @ 8162B44
checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
goto_if eq, EventScript_162B57
goto_if_eq EventScript_162B57
return
EventScript_162B57:: @ 8162B57
@@ -59,20 +59,16 @@ EventScript_162B76:: @ 8162B76
applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07
waitmovement 0
delay 20
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_162CB3
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_162CBC
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_162C68
goto_if_eq EventScript_162C68
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
savebgm MUS_WIN_GYM
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162C6F
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162C91
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91
setflag FLAG_TEMP_4
clearflag FLAG_TEMP_5
setflag FLAG_DEFEATED_CHAMP
@@ -117,20 +113,20 @@ EventScript_162C68:: @ 8162C68
EventScript_162C6F:: @ 8162C6F
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162CC5
call_if_eq EventScript_162CC5
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162CD0
call_if_eq EventScript_162CD0
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162CDB
call_if_eq EventScript_162CDB
return
EventScript_162C91:: @ 8162C91
compare VAR_STARTER_MON, 2
call_if eq, EventScript_162CE6
call_if_eq EventScript_162CE6
compare VAR_STARTER_MON, 1
call_if eq, EventScript_162CF1
call_if_eq EventScript_162CF1
compare VAR_STARTER_MON, 0
call_if eq, EventScript_162CFC
call_if_eq EventScript_162CFC
return
EventScript_162CB3:: @ 8162CB3
@@ -142,27 +138,27 @@ EventScript_162CBC:: @ 8162CBC
return
EventScript_162CC5:: @ 8162CC5
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F
return
EventScript_162CD0:: @ 8162CD0
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F
return
EventScript_162CDB:: @ 8162CDB
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F
return
EventScript_162CE6:: @ 8162CE6
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F
return
EventScript_162CF1:: @ 8162CF1
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F
return
EventScript_162CFC:: @ 8162CFC
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F
trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F
return
Movement_162D07:: @ 8162D07
data/maps/PokemonLeague_LancesRoom/scripts.inc
+9 -15
View File
@@ -12,9 +12,8 @@ PokemonLeague_LancesRoom_OnResume:: @ 8162942
PokemonLeague_LancesRoom_OnLoad:: @ 816294D
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
call_if eq, EventScript_162962
checkflag FLAG_DEFEATED_LANCE
call_if TRUE, EventScript_162968
call_if_eq EventScript_162962
call_if_set FLAG_DEFEATED_LANCE, EventScript_162968
end
EventScript_162962:: @ 8162962
@@ -102,20 +101,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
lock
faceplayer
famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_LANCE
goto_if TRUE, EventScript_162AA1
goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1
famechecker FAMECHECKER_LANCE, 0
famechecker FAMECHECKER_LANCE, 1
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_162A79
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_162A82
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162A8B
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_162A96
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96
clearflag FLAG_TEMP_5
goto EventScript_162AAB
@@ -131,11 +125,11 @@ EventScript_162A82:: @ 8162A82
return
EventScript_162A8B:: @ 8162A8B
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15
trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15
return
EventScript_162A96:: @ 8162A96
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15
trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15
return
EventScript_162AA1:: @ 8162AA1
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+9 -15
View File
@@ -12,10 +12,9 @@ PokemonLeague_LoreleisRoom_OnResume:: @ 8162586
end
PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591
checkflag FLAG_DEFEATED_LORELEI
call_if TRUE, EventScript_1625AC
call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
call_if eq, EventScript_1625A6
call_if_eq EventScript_1625A6
end
EventScript_1625A6:: @ 81625A6
@@ -53,20 +52,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
lock
faceplayer
famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_DEFEATED_LORELEI
goto_if TRUE, EventScript_162669
goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669
famechecker FAMECHECKER_LORELEI, 0
famechecker FAMECHECKER_LORELEI, 1
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162641
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16264A
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if FALSE, EventScript_162653
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_16265E
call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E
clearflag FLAG_TEMP_5
goto EventScript_162673
@@ -82,11 +76,11 @@ EventScript_16264A:: @ 816264A
return
EventScript_162653:: @ 8162653
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191
trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191
return
EventScript_16265E:: @ 816265E
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191
trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191
return
EventScript_162669:: @ 8162669
data/maps/PokemonMansion_1F/scripts.inc
+3 -4
View File
@@ -4,8 +4,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9
.byte 0
PokemonMansion_1F_OnLoad:: @ 8162204
checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
call_if TRUE, EventScript_1A7B7A
call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A
end
PokemonMansion_1F_OnTransition:: @ 816220E
@@ -23,11 +22,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212
end
PokemonMansion_1F_EventScript_162226:: @ 8162226
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391
trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391
msgbox gUnknown_8177397, 6
end
PokemonMansion_1F_EventScript_16223D:: @ 816223D
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD
trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD
msgbox gUnknown_8177418, 6
end
data/maps/PokemonMansion_2F/scripts.inc
+2 -3
View File
@@ -3,8 +3,7 @@ PokemonMansion_2F_MapScripts:: @ 8162254
.byte 0
PokemonMansion_2F_OnLoad:: @ 816225A
checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
call_if TRUE, EventScript_1A7D3E
call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7D3E
end
PokemonMansion_2F_EventScript_162264:: @ 8162264
@@ -26,6 +25,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281
end
PokemonMansion_2F_EventScript_16228A:: @ 816228A
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB
trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB
msgbox gUnknown_81774E3, 6
end
data/maps/PokemonMansion_3F/scripts.inc
+3 -4
View File
@@ -3,8 +3,7 @@ PokemonMansion_3F_MapScripts:: @ 81622A1
.byte 0
PokemonMansion_3F_OnLoad:: @ 81622A7
checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
call_if TRUE, EventScript_1A7E72
call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7E72
end
PokemonMansion_3F_EventScript_1622B1:: @ 81622B1
@@ -22,11 +21,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5
end
PokemonMansion_3F_EventScript_1622CE:: @ 81622CE
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602
trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602
msgbox gUnknown_8177608, 6
end
PokemonMansion_3F_EventScript_1622E5:: @ 81622E5
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643
trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643
msgbox gUnknown_8177657, 6
end
data/maps/PokemonMansion_B1F/scripts.inc
+3 -4
View File
@@ -3,8 +3,7 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC
.byte 0
PokemonMansion_B1F_OnLoad:: @ 8162302
checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
call_if TRUE, EventScript_1A7F4C
call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C
end
PokemonMansion_B1F_EventScript_16230C:: @ 816230C
@@ -22,11 +21,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320
end
PokemonMansion_B1F_EventScript_162329:: @ 8162329
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7
trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7
msgbox gUnknown_81776DE, 6
end
PokemonMansion_B1F_EventScript_162340:: @ 8162340
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757
trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757
msgbox gUnknown_817776A, 6
end
data/maps/PokemonTower_1F/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A
faceplayer
checkplayergender
compare VAR_RESULT, 0
goto_if eq, EventScript_163272
goto_if_eq EventScript_163272
msgbox gUnknown_8179BFC
release
end
data/maps/PokemonTower_2F/scripts.inc
+10 -10
View File
@@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7
textcolor 0
playbgm MUS_RIVAL1, 0
compare VAR_TEMP_1, 0
call_if eq, EventScript_163339
call_if_eq EventScript_163339
compare VAR_TEMP_1, 1
call_if eq, EventScript_16334B
call_if_eq EventScript_16334B
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_Delay48
@@ -31,18 +31,18 @@ EventScript_1632A7:: @ 81632A7
msgbox gUnknown_8179CFF
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if eq, EventScript_16335D
call_if_eq EventScript_16335D
compare VAR_STARTER_MON, 1
call_if eq, EventScript_163368
call_if_eq EventScript_163368
compare VAR_STARTER_MON, 0
call_if eq, EventScript_163373
call_if_eq EventScript_163373
msgbox gUnknown_8179DD4
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if eq, EventScript_16337E
call_if_eq EventScript_16337E
compare VAR_TEMP_1, 1
call_if eq, EventScript_163389
call_if_eq EventScript_163389
playse SE_KAIDAN
delay 25
fadedefaultbgm
@@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B
return
EventScript_16335D:: @ 816335D
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73
return
EventScript_163368:: @ 8163368
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73
return
EventScript_163373:: @ 8163373
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73
return
EventScript_16337E:: @ 816337E
data/maps/PokemonTower_3F/scripts.inc
+3 -3
View File
@@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6
.byte 0
PokemonTower_3F_EventScript_1633A7:: @ 81633A7
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC
trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC
msgbox gUnknown_8179FD3, 6
end
PokemonTower_3F_EventScript_1633BE:: @ 81633BE
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72
trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72
msgbox gUnknown_8179F88, 6
end
PokemonTower_3F_EventScript_1633D5:: @ 81633D5
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21
trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21
msgbox gUnknown_8179F31, 6
end
data/maps/PokemonTower_4F/scripts.inc
+3 -3
View File
@@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC
.byte 0
PokemonTower_4F_EventScript_1633ED:: @ 81633ED
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017
trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017
msgbox gUnknown_817A02B, 6
end
PokemonTower_4F_EventScript_163404:: @ 8163404
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061
trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061
msgbox gUnknown_817A067, 6
end
PokemonTower_4F_EventScript_16341B:: @ 816341B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB
trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB
msgbox gUnknown_817A0BB, 6
end
data/maps/PokemonTower_5F/scripts.inc
+4 -4
View File
@@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453
end
PokemonTower_5F_EventScript_16345B:: @ 816345B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132
trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132
msgbox gUnknown_817A138, 6
end
PokemonTower_5F_EventScript_163472:: @ 8163472
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164
trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164
msgbox gUnknown_817A176, 6
end
PokemonTower_5F_EventScript_163489:: @ 8163489
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190
trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190
msgbox gUnknown_817A194, 6
end
PokemonTower_5F_EventScript_1634A0:: @ 81634A0
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7
trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7
msgbox gUnknown_817A1BD, 6
end
data/maps/PokemonTower_6F/scripts.inc
+5 -5
View File
@@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
msgbox gUnknown_817A2F8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special ScrSpecial_StartMarowakBattle
waitstate
special sub_8112364
compare VAR_RESULT, 0
goto_if eq, EventScript_1634F5
goto_if_eq EventScript_1634F5
applymovement OBJ_EVENT_ID_PLAYER, Movement_163512
waitmovement 0
releaseall
@@ -36,16 +36,16 @@ Movement_163512:: @ 8163512
step_end
PokemonTower_6F_EventScript_163514:: @ 8163514
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253
trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253
msgbox gUnknown_817A25A, 6
end
PokemonTower_6F_EventScript_16352B:: @ 816352B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F
trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F
msgbox gUnknown_817A293, 6
end
PokemonTower_6F_EventScript_163542:: @ 8163542
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC
trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC
msgbox gUnknown_817A2E2, 6
end
data/maps/PokemonTower_7F/scripts.inc
+10 -10
View File
@@ -16,7 +16,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A
end
PokemonTower_7F_EventScript_163586:: @ 8163586
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1
msgbox gUnknown_817A3AF, 6
end
@@ -25,11 +25,11 @@ EventScript_1635A1:: @ 81635A1
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
goto_if eq, EventScript_1635E0
goto_if_eq EventScript_1635E0
compare VAR_0x8004, 11
goto_if eq, EventScript_1635F0
goto_if_eq EventScript_1635F0
compare VAR_0x8004, 9
goto_if eq, EventScript_163600
goto_if_eq EventScript_163600
applymovement 2, Movement_16362C
waitmovement 0
goto EventScript_163616
@@ -103,7 +103,7 @@ Movement_163633:: @ 8163633
step_end
PokemonTower_7F_EventScript_16363D:: @ 816363D
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658
msgbox gUnknown_817A477, 6
end
@@ -113,9 +113,9 @@ EventScript_163658:: @ 8163658
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 12
goto_if eq, EventScript_163699
goto_if_eq EventScript_163699
compare VAR_0x8004, 13
goto_if eq, EventScript_1636A9
goto_if_eq EventScript_1636A9
applymovement 3, Movement_1636C6
waitmovement 0
goto EventScript_1636B9
@@ -169,7 +169,7 @@ Movement_1636CD:: @ 81636CD
step_end
PokemonTower_7F_EventScript_1636D6:: @ 81636D6
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1
msgbox gUnknown_817A506, 6
end
@@ -178,9 +178,9 @@ EventScript_1636F1:: @ 81636F1
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
goto_if eq, EventScript_163725
goto_if_eq EventScript_163725
compare VAR_0x8004, 9
goto_if eq, EventScript_163735
goto_if_eq EventScript_163735
applymovement 4, Movement_163754
waitmovement 0
goto EventScript_163745
data/maps/PowerPlant/scripts.inc
+17 -21
View File
@@ -4,25 +4,21 @@ PowerPlant_MapScripts:: @ 8163764
.byte 0
PowerPlant_OnResume:: @ 816376F
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_163779
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779
end
EventScript_163779:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
PowerPlant_OnTransition:: @ 816378D
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
checkflag FLAG_FOUGHT_ZAPDOS
call_if FALSE, EventScript_1637AC
checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
call_if FALSE, EventScript_1637B0
checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
call_if FALSE, EventScript_1637B4
call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4
end
EventScript_1637AC:: @ 81637AC
@@ -40,7 +36,7 @@ EventScript_1637B4:: @ 81637B4
PowerPlant_EventScript_1637B8:: @ 81637B8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -59,11 +55,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16381B
goto_if_eq EventScript_16381B
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163824
goto_if_eq EventScript_163824
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163824
goto_if_eq EventScript_163824
setflag FLAG_FOUGHT_ZAPDOS
release
end
@@ -81,7 +77,7 @@ EventScript_163824:: @ 8163824
PowerPlant_EventScript_16382F:: @ 816382F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
@@ -95,11 +91,11 @@ PowerPlant_EventScript_16382F:: @ 816382F
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163884
goto_if_eq EventScript_163884
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163884
goto_if_eq EventScript_163884
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163884
goto_if_eq EventScript_163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
end
@@ -112,7 +108,7 @@ EventScript_163884:: @ 8163884
PowerPlant_EventScript_16388D:: @ 816388D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
@@ -126,11 +122,11 @@ PowerPlant_EventScript_16388D:: @ 816388D
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1638E2
goto_if_eq EventScript_1638E2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1638E2
goto_if_eq EventScript_1638E2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1638E2
goto_if_eq EventScript_1638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
end
data/maps/RockTunnel_1F/scripts.inc
+7 -7
View File
@@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
end
RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388
trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388
msgbox gUnknown_8179396, 6
end
RockTunnel_1F_EventScript_162E00:: @ 8162E00
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E
trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E
msgbox gUnknown_817943A, 6
end
RockTunnel_1F_EventScript_162E17:: @ 8162E17
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC
trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC
msgbox gUnknown_81794B4, 6
end
RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE
trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE
msgbox gUnknown_81794F9, 6
end
RockTunnel_1F_EventScript_162E45:: @ 8162E45
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547
trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547
msgbox gUnknown_8179558, 6
end
RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604
trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604
msgbox gUnknown_8179613, 6
end
RockTunnel_1F_EventScript_162E73:: @ 8162E73
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1
trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1
msgbox gUnknown_81795B5, 6
end
data/maps/RockTunnel_B1F/scripts.inc
+8 -8
View File
@@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A
.byte 0
RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9
trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9
msgbox gUnknown_81796CE, 6
end
RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD
trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD
msgbox gUnknown_81798E9, 6
end
RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700
trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700
msgbox gUnknown_8179712, 6
end
RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856
trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856
msgbox gUnknown_817987A, 6
end
RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932
trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932
msgbox gUnknown_817993E, 6
end
RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F
trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F
msgbox gUnknown_8179777, 6
end
RockTunnel_B1F_EventScript_162F15:: @ 8162F15
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB
trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB
msgbox gUnknown_81797DE, 6
end
RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997
trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997
msgbox gUnknown_81799AC, 6
end
data/maps/RocketHideout_B1F/scripts.inc
+6 -6
View File
@@ -5,7 +5,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195
RocketHideout_B1F_OnLoad:: @ 81611A0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12
call_if lt, EventScript_161233
call_if_lt EventScript_161233
end
RocketHideout_B1F_OnTransition:: @ 81611AA
@@ -13,27 +13,27 @@ RocketHideout_B1F_OnTransition:: @ 81611AA
end
RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED
msgbox gUnknown_8174EFA, 6
end
RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60
msgbox gUnknown_8174F66, 6
end
RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4
msgbox gUnknown_8174FB3, 6
end
RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8
msgbox gUnknown_8175007, 6
end
RocketHideout_B1F_EventScript_16120A:: @ 816120A
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225
msgbox gUnknown_8175060, 6
end
data/maps/RocketHideout_B2F/scripts.inc
+1 -1
View File
@@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1
.byte 0
RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF
msgbox gUnknown_81750CC, 6
end
data/maps/RocketHideout_B3F/scripts.inc
+2 -2
View File
@@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9
.byte 0
RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A
msgbox gUnknown_817515B, 6
end
RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE
msgbox gUnknown_81751E0, 6
end
data/maps/RocketHideout_B4F/scripts.inc
+17 -17
View File
@@ -5,11 +5,11 @@ RocketHideout_B4F_MapScripts:: @ 81612E8
RocketHideout_B4F_OnLoad:: @ 81612EE
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if eq, EventScript_161311
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
call_if_eq EventScript_161311
compare VAR_TEMP_1, 2
call_if ne, EventScript_16146A
call_if_ne EventScript_16146A
end
EventScript_161311:: @ 8161311
@@ -24,7 +24,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI, 0, Text_175318
trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318
msgbox gUnknown_817532D
fadescreen 1
closemessage
@@ -43,12 +43,12 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
removeobject 2
giveitem ITEM_SILPH_SCOPE
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
goto_if_eq EventScript_1A6BF9
release
end
RocketHideout_B4F_EventScript_161381:: @ 8161381
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D
msgbox gUnknown_81754BD
release
end
@@ -67,43 +67,43 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
removeobject 4
giveitem ITEM_LIFT_KEY
compare VAR_RESULT, 0
goto_if eq, EventScript_1A6BF9
goto_if_eq EventScript_1A6BF9
release
end
RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9
msgbox gUnknown_817540C, 6
end
EventScript_1613E9:: @ 81613E9
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if eq, EventScript_161311
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
call_if_eq EventScript_161311
compare VAR_TEMP_1, 2
call_if eq, EventScript_1614A1
call_if_eq EventScript_1614A1
compare VAR_TEMP_1, 2
call_if eq, EventScript_161462
call_if_eq EventScript_161462
release
end
RocketHideout_B4F_EventScript_161418:: @ 8161418
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433
msgbox gUnknown_817546A, 6
end
EventScript_161433:: @ 8161433
setvar VAR_TEMP_1, 0
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if eq, EventScript_161311
call_if_eq EventScript_161311
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if eq, EventScript_161311
call_if_eq EventScript_161311
compare VAR_TEMP_1, 2
call_if eq, EventScript_1614A1
call_if_eq EventScript_1614A1
compare VAR_TEMP_1, 2
call_if eq, EventScript_161462
call_if_eq EventScript_161462
release
end

Some files were not shown because too many files have changed in this diff Show More