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
data/scripts/cable_club.inc
+102 -107
View File
@@ -5,7 +5,7 @@ CableClub_OnTransition:: @ 81BB1B4
CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 81BB1BA
specialvar VAR_RESULT, ValidateReceivedWonderCard
compare VAR_RESULT, FALSE
goto_if eq, EventScript_HideMysteryGiftMan
goto_if_eq EventScript_HideMysteryGiftMan
clearflag FLAG_HIDE_MG_DELIVERYMEN
return
@@ -16,7 +16,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
execram
@@ -37,26 +37,26 @@ CableClub_OnWarp:: @ 81BB1ED
EventScript_CheckTurnAttendant:: @ 81BB227
compare VAR_0x8007, 0
goto_if eq, EventScript_CheckTurnAttendantEnd
goto_if_eq EventScript_CheckTurnAttendantEnd
turnobject VAR_0x8007, DIR_WEST
EventScript_CheckTurnAttendantEnd:
end
CableClub_OnLoad:: @ 81BB237
compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE
goto_if eq, EventScript_OnLoadFromColosseum
goto_if_eq EventScript_OnLoadFromColosseum
compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE
goto_if eq, EventScript_OnLoadFromColosseum
goto_if_eq EventScript_OnLoadFromColosseum
compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE
goto_if eq, EventScript_OnLoadFromColosseum
goto_if_eq EventScript_OnLoadFromColosseum
compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER
goto_if eq, EventScript_OnLoadFromTradeCenter
goto_if_eq EventScript_OnLoadFromTradeCenter
compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM
goto_if eq, EventScript_OnLoadFromUnionRoom
goto_if_eq EventScript_OnLoadFromUnionRoom
compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH
goto_if eq, EventScript_OnLoadFromBerryCrush
goto_if_eq EventScript_OnLoadFromBerryCrush
compare VAR_CABLE_CLUB_STATE, USING_MINIGAME
goto_if eq, EventScript_OnLoadFromGameCorner
goto_if_eq EventScript_OnLoadFromGameCorner
end
EventScript_OnLoadFromColosseum:: @ 81BB285
@@ -117,7 +117,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
goto_if eq, CableClub_EventScript_PlayerExitLinkRoom
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement VAR_0x8007, Movement_1BB88F
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891
@@ -143,7 +143,7 @@ EventScript_1BB367:: @ 81BB367
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
goto_if eq, CableClub_EventScript_PlayerExitLinkRoom
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0
waitmovement 0
applymovement VAR_0x8007, Movement_1BB88F
@@ -167,7 +167,7 @@ EventScript_1BB3B4:: @ 81BB3B4
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
goto_if eq, CableClub_EventScript_PlayerExitLinkRoom
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0
waitmovement 0
applymovement VAR_0x8007, Movement_1BB88F
@@ -267,7 +267,7 @@ EventScript_1BB50F:: @ 81BB50F
EventScript_1BB51A:: @ 81BB51A
special CheckForAlivePartyMons
compare VAR_RESULT, 0
goto_if ne, EventScript_1BB533
goto_if_ne EventScript_1BB533
setvar VAR_0x8004, 2
goto EventScript_1BB54C
end
@@ -285,7 +285,7 @@ EventScript_1BB541:: @ 81BB541
EventScript_1BB54C:: @ 81BB54C
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
message gUnknown_81BC4AC
waitmessage
special HelpSystem_Disable
@@ -294,17 +294,17 @@ EventScript_1BB54C:: @ 81BB54C
waitstate
call EventScript_1A6675
compare VAR_RESULT, 1
goto_if eq, EventScript_1BB5B3
goto_if_eq EventScript_1BB5B3
compare VAR_RESULT, 2
goto_if eq, EventScript_1BB80F
goto_if_eq EventScript_1BB80F
compare VAR_RESULT, 3
goto_if eq, EventScript_1BB81F
goto_if_eq EventScript_1BB81F
compare VAR_RESULT, 4
goto_if eq, EventScript_1BB63C
goto_if_eq EventScript_1BB63C
compare VAR_RESULT, 5
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
compare VAR_RESULT, 6
goto_if eq, EventScript_1BB7FF
goto_if_eq EventScript_1BB7FF
end
EventScript_1BB5B3:: @ 81BB5B3
@@ -332,7 +332,7 @@ EventScript_1BB5B3:: @ 81BB5B3
waitdooranim
release
compare VAR_0x8004, 5
goto_if eq, EventScript_1BB62C
goto_if_eq EventScript_1BB62C
special SetCableClubWarp
warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8
special DoCableClubWarp
@@ -396,10 +396,10 @@ EventScript_1BB6AB:: @ 81BB6AB
copyvar VAR_0x8007, VAR_LAST_TALKED
call EventScript_1BB79C
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
message gUnknown_81BC4AC
waitmessage
special HelpSystem_Disable
@@ -408,21 +408,21 @@ EventScript_1BB6AB:: @ 81BB6AB
waitstate
call EventScript_1A6675
compare VAR_RESULT, 1
goto_if eq, EventScript_1BB73D
goto_if_eq EventScript_1BB73D
compare VAR_RESULT, 2
goto_if eq, EventScript_1BB80F
goto_if_eq EventScript_1BB80F
compare VAR_RESULT, 3
goto_if eq, EventScript_1BB81F
goto_if_eq EventScript_1BB81F
compare VAR_RESULT, 4
goto_if eq, EventScript_1BB857
goto_if_eq EventScript_1BB857
compare VAR_RESULT, 5
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
compare VAR_RESULT, 6
goto_if eq, EventScript_1BB7FF
goto_if_eq EventScript_1BB7FF
compare VAR_RESULT, 7
goto_if eq, EventScript_1BB7DF
goto_if_eq EventScript_1BB7DF
compare VAR_RESULT, 9
goto_if eq, EventScript_1BB7EF
goto_if_eq EventScript_1BB7EF
end
EventScript_1BB73D:: @ 81BB73D
@@ -456,10 +456,10 @@ EventScript_1BB73D:: @ 81BB73D
EventScript_1BB79C:: @ 81BB79C
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 2
goto_if lt, EventScript_1BB7C2
goto_if_lt EventScript_1BB7C2
specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
compare VAR_RESULT, 1
goto_if eq, EventScript_1BB7D0
goto_if_eq EventScript_1BB7D0
setvar VAR_RESULT, 1
return
@@ -606,7 +606,7 @@ Movement_1BB8A2:: @ 81BB8A2
gUnknown_81BB8A7:: @ 81BB8A7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
fadescreen 1
setvar VAR_0x8004, 0
@@ -637,7 +637,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
special sub_80A0334
waitstate
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
goto_if_eq EventScript_1BB94F
setvar VAR_0x8005, 0
textcolor 3
special sub_80819C8
@@ -650,7 +650,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
special sub_80A0334
waitstate
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
goto_if_eq EventScript_1BB94F
setvar VAR_0x8005, 1
textcolor 3
special sub_80819C8
@@ -663,7 +663,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
special sub_80A0334
waitstate
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
goto_if_eq EventScript_1BB94F
setvar VAR_0x8005, 2
textcolor 3
special sub_80819C8
@@ -676,7 +676,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
special sub_80A0334
waitstate
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
goto_if_eq EventScript_1BB94F
setvar VAR_0x8005, 3
textcolor 3
special sub_80819C8
@@ -765,7 +765,7 @@ gUnknown_81BB9D4:: @ 81BB9D4
textcolor 3
msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if eq, EventScript_1BB9F0
goto_if_eq EventScript_1BB9F0
erasebox 0, 0, 29, 19
releaseall
end
@@ -786,19 +786,18 @@ gUnknown_81BB9FC:: @ 81BB9FC
EventScript_1BBA04:: @ 81BBA04
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB877
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877
specialvar VAR_RESULT, Special_BadEggInParty
compare VAR_RESULT, 1
goto_if eq, EventScript_1BB867
goto_if_eq EventScript_1BB867
copyvar VAR_0x8007, VAR_LAST_TALKED
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
goto_if eq, EventScript_1BBB60
goto_if_eq EventScript_1BBB60
message Text_1BD65B
waitmessage
goto EventScript_1BBA51
@@ -826,10 +825,10 @@ EventScript_1BBA93:: @ 81BBA93
EventScript_1BBA94:: @ 81BBA94
call EventScript_1BBB1E
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
msgbox gUnknown_81BD86A
closemessage
special sp000_heal_pokemon
@@ -862,10 +861,10 @@ EventScript_1BBA94:: @ 81BBA94
EventScript_1BBB1E:: @ 81BBB1E
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 2
goto_if lt, EventScript_1BBB44
goto_if_lt EventScript_1BBB44
specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBB52
goto_if_eq EventScript_1BBB52
setvar VAR_RESULT, 1
return
@@ -891,11 +890,10 @@ EventScript_1BBB60:: @ 81BBB60
EventScript_1BBB6A:: @ 81BBB6A
lock
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB877
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877
msgbox gUnknown_81BDB85, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1BBB92
goto_if_eq EventScript_1BBB92
msgbox gUnknown_81BDBF8
release
return
@@ -908,18 +906,17 @@ EventScript_1BBB92:: @ 81BBB92
EventScript_1BBB9C:: @ 81BBB9C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB877
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877
specialvar VAR_RESULT, Special_BadEggInParty
compare VAR_RESULT, 1
goto_if eq, EventScript_1BB867
goto_if_eq EventScript_1BB867
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB44A
goto_if_eq EventScript_1BB44A
message Text_1BD28D
waitmessage
delay 15
@@ -929,8 +926,7 @@ EventScript_1BBBE6:: @ 81BBBE6
end
EventScript_1BBBE7:: @ 81BBBE7
checkflag FLAG_GOT_POWDER_JAR
goto_if FALSE, EventScript_1BBC32
goto_if_unset FLAG_GOT_POWDER_JAR, EventScript_1BBC32
multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE
switch VAR_RESULT
case 0, EventScript_1BBC69
@@ -952,10 +948,10 @@ EventScript_1BBC32:: @ 81BBC32
EventScript_1BBC69:: @ 81BBC69
msgbox gUnknown_81BD317, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
call EventScript_1BB79C
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
setvar VAR_0x8004, 3
goto EventScript_1BBD6F
@@ -985,7 +981,7 @@ EventScript_1BBCF4:: @ 81BBCF4
EventScript_1BBCF5:: @ 81BBCF5
special CheckForAlivePartyMons
compare VAR_RESULT, 0
goto_if ne, EventScript_1BBD0E
goto_if_ne EventScript_1BBD0E
setvar VAR_0x8004, 1
goto EventScript_1BBD6F
@@ -1016,10 +1012,10 @@ EventScript_1BBD34:: @ 81BBD34
EventScript_1BBD35:: @ 81BBD35
msgbox gUnknown_81BD362, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
special CheckHasAtLeastOneBerry
compare VAR_RESULT, 0
goto_if eq, EventScript_1BBD61
goto_if_eq EventScript_1BBD61
setvar VAR_0x8004, 5
goto EventScript_1BBD6F
@@ -1036,7 +1032,7 @@ EventScript_1BBD6E:: @ 81BBD6E
EventScript_1BBD6F:: @ 81BBD6F
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB82F
goto_if_eq EventScript_1BB82F
switch VAR_0x8004
case 3, EventScript_1BBDBC
case 0, EventScript_1BBDBC
@@ -1061,22 +1057,22 @@ EventScript_1BBDBC:: @ 81BBDBC
EventScript_1BBE00:: @ 81BBE00
call EventScript_1BBF78
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBDBC
goto_if_eq EventScript_1BBDBC
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBE00
goto_if_eq EventScript_1BBE00
release
return
EventScript_1BBE28:: @ 81BBE28
call EventScript_1BBF80
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBDBC
goto_if_eq EventScript_1BBDBC
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBE28
goto_if_eq EventScript_1BBE28
release
return
@@ -1096,22 +1092,22 @@ EventScript_1BBE50:: @ 81BBE50
EventScript_1BBE94:: @ 81BBE94
call EventScript_1BBF78
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBE50
goto_if_eq EventScript_1BBE50
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBE94
goto_if_eq EventScript_1BBE94
release
return
EventScript_1BBEBC:: @ 81BBEBC
call EventScript_1BBF80
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBE50
goto_if_eq EventScript_1BBE50
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBEBC
goto_if_eq EventScript_1BBEBC
release
return
@@ -1131,22 +1127,22 @@ EventScript_1BBEE4:: @ 81BBEE4
EventScript_1BBF28:: @ 81BBF28
call EventScript_1BBF78
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBEE4
goto_if_eq EventScript_1BBEE4
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBF28
goto_if_eq EventScript_1BBF28
release
return
EventScript_1BBF50:: @ 81BBF50
call EventScript_1BBF80
compare VAR_RESULT, 1
goto_if eq, EventScript_1BBF88
goto_if_eq EventScript_1BBF88
compare VAR_RESULT, 5
goto_if eq, EventScript_1BBEE4
goto_if_eq EventScript_1BBEE4
compare VAR_RESULT, 8
goto_if eq, EventScript_1BBF50
goto_if_eq EventScript_1BBF50
release
return
@@ -1191,13 +1187,12 @@ EventScript_1BBF88:: @ 81BBF88
gUnknown_81BBFD8:: @ 81BBFD8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB881
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
goto_if eq, EventScript_1BC016
goto_if_eq EventScript_1BC016
special HelpSystem_Disable
fadescreen 1
special sub_814F1D4
@@ -1261,7 +1256,7 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C
EventScript_1BC060:: @ 81BC060
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -1293,7 +1288,7 @@ EventScript_1BC0C4:: @ 81BC0C4
EventScript_1BC0CE:: @ 81BC0CE
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -1301,7 +1296,7 @@ EventScript_1BC0CE:: @ 81BC0CE
waitmessage
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 0
goto_if eq, EventScript_1BC29C
goto_if_eq EventScript_1BC29C
delay 60
special HelpSystem_Disable
message Text_1BD02D
@@ -1318,16 +1313,16 @@ EventScript_1BC13A:: @ 81BC13A
setvar VAR_0x8005, 0
special sub_8149A18
compare VAR_RESULT, 0
goto_if eq, EventScript_NoEligiblePkmn
goto_if_eq EventScript_NoEligiblePkmn
msgbox gUnknown_81BD059
setvar VAR_0x8005, 0
special ChooseMonForWirelessMinigame
waitstate
compare VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
goto_if_ge EventScript_1BB83F
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB83F
goto_if_eq EventScript_1BB83F
setvar VAR_0x8004, 4
goto EventScript_1BC1CE
@@ -1338,16 +1333,16 @@ EventScript_1BC184:: @ 81BC184
setvar VAR_0x8005, 1
special sub_81537C0
compare VAR_RESULT, 0
goto_if eq, EventScript_NoEligiblePkmn
goto_if_eq EventScript_NoEligiblePkmn
msgbox gUnknown_81BD059
setvar VAR_0x8005, 1
special ChooseMonForWirelessMinigame
waitstate
compare VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
goto_if_ge EventScript_1BB83F
call EventScript_1A4EAF
compare VAR_RESULT, 0
goto_if eq, EventScript_1BB83F
goto_if_eq EventScript_1BB83F
setvar VAR_0x8004, 6
goto EventScript_1BC1CE
@@ -1370,22 +1365,22 @@ EventScript_1BC1CE:: @ 81BC1CE
EventScript_1BC212:: @ 81BC212
call EventScript_1BBF78
compare VAR_RESULT, 1
goto_if eq, EventScript_1BC262
goto_if_eq EventScript_1BC262
compare VAR_RESULT, 5
goto_if eq, EventScript_1BC1CE
goto_if_eq EventScript_1BC1CE
compare VAR_RESULT, 8
goto_if eq, EventScript_1BC212
goto_if_eq EventScript_1BC212
release
return
EventScript_1BC23A:: @ 81BC23A
call EventScript_1BBF80
compare VAR_RESULT, 1
goto_if eq, EventScript_1BC262
goto_if_eq EventScript_1BC262
compare VAR_RESULT, 5
goto_if eq, EventScript_1BC1CE
goto_if_eq EventScript_1BC1CE
compare VAR_RESULT, 8
goto_if eq, EventScript_1BC23A
goto_if_eq EventScript_1BC23A
release
return
@@ -1417,11 +1412,11 @@ EventScript_1BC29C:: @ 81BC29C
EventScript_NoEligiblePkmn:: @ 81BC2A6
msgbox gUnknown_81BD0CF, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1BB83F
goto_if_eq EventScript_1BB83F
compare VAR_0x8005, 0
call_if eq, EventScript_1BC2D5
call_if_eq EventScript_1BC2D5
compare VAR_0x8005, 1
call_if eq, EventScript_1BC2DE
call_if_eq EventScript_1BC2DE
goto EventScript_1BB83F
EventScript_1BC2D4:: @ 81BC2D4
@@ -1438,7 +1433,7 @@ EventScript_1BC2DE:: @ 81BC2DE
TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
special sub_814B504
waitstate
@@ -1448,7 +1443,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7
TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
special sub_8153810
waitstate
data/scripts/day_care.inc
+12 -12
View File
@@ -1,16 +1,16 @@
Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
showmoneybox 0, 0, 0
specialvar VAR_RESULT, IsThereMonInRoute5Daycare
compare VAR_RESULT, 1
goto_if eq, EventScript_1BF46E
goto_if_eq EventScript_1BF46E
msgbox Text_19DD66, 5
compare VAR_RESULT, 1
goto_if eq, EventScript_1BF3DD
goto_if_eq EventScript_1BF3DD
msgbox Text_19DDB2
goto EventScript_1BF541
end
@@ -18,7 +18,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
EventScript_1BF3DD:: @ 81BF3DD
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 1
goto_if eq, EventScript_1BF452
goto_if_eq EventScript_1BF452
msgbox Text_19DDBE
fadescreen 1
hidemoneybox 0, 0
@@ -26,10 +26,10 @@ EventScript_1BF3DD:: @ 81BF3DD
waitstate
showmoneybox 0, 0, 0
compare VAR_0x8004, 6
goto_if ge, EventScript_1BF444
goto_if_ge EventScript_1BF444
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare VAR_RESULT, 0
goto_if eq, EventScript_1BF460
goto_if_eq EventScript_1BF460
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
msgbox Text_19DDF9
waitse
@@ -60,13 +60,13 @@ EventScript_1BF46E:: @ 81BF46E
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon
compare VAR_RESULT, 0
call_if ne, EventScript_1BF4AA
call_if_ne EventScript_1BF4AA
compare VAR_RESULT, 0
call_if eq, EventScript_1BF4B3
call_if_eq EventScript_1BF4B3
special GetCostToWithdrawRoute5DaycareMon
msgbox Text_19DE80, 5
compare VAR_RESULT, 1
goto_if eq, EventScript_1BF4BC
goto_if_eq EventScript_1BF4BC
goto EventScript_1BF444
end
@@ -81,10 +81,10 @@ EventScript_1BF4B3:: @ 81BF4B3
EventScript_1BF4BC:: @ 81BF4BC
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BF533
goto_if_eq EventScript_1BF533
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
goto_if eq, EventScript_1BF4EA
goto_if_eq EventScript_1BF4EA
msgbox Text_19E001
goto EventScript_1BF541
end
@@ -95,7 +95,7 @@ EventScript_1BF4EA:: @ 81BF4EA
special SubtractMoneyFromVar0x8005
updatemoneybox 0, 0, 0
copyvar VAR_0x8008, VAR_RESULT
countpokemon
getpartysize
subvar VAR_RESULT, 1
getpartymonname 0, VAR_RESULT
copyvar VAR_RESULT, VAR_0x8008
data/scripts/field_moves.inc
+21 -25
View File
@@ -1,19 +1,18 @@
EventScript_InteractWithCutTreeObject:: @ 81BDF13
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkflag FLAG_BADGE02_GET
goto_if FALSE, EventScript_1BDF87
goto_if_unset FLAG_BADGE02_GET, EventScript_1BDF87
checkpartymove MOVE_CUT
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BDF87
goto_if_eq EventScript_1BDF87
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_CUT
msgbox gUnknown_81BDF94, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BDF91
goto_if_eq EventScript_1BDF91
msgbox gUnknown_81BDFD7
closemessage
dofieldeffect FLDEFF_USE_CUT_ON_TREE
@@ -64,19 +63,18 @@ gUnknown_81BDFE3:: @ 81BDFE3
EventScript_InteractWithRockSmashRockObject:: @ 81BE00C
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkflag FLAG_BADGE06_GET
goto_if FALSE, EventScript_1BE091
goto_if_unset FLAG_BADGE06_GET, EventScript_1BE091
checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BE091
goto_if_eq EventScript_1BE091
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_ROCK_SMASH
msgbox Text_1BE09D, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE09A
goto_if_eq EventScript_1BE09A
msgbox gUnknown_81BDFD7
closemessage
dofieldeffect FLDEFF_USE_ROCK_SMASH
@@ -97,7 +95,7 @@ EventScript_1BE06F:: @ 81BE06F
removeobject VAR_LAST_TALKED
special ScrSpecial_RockSmashWildEncounter
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE08D
goto_if_eq EventScript_1BE08D
waitstate
releaseall
end
@@ -130,19 +128,17 @@ gUnknown_81BE0E2:: @ 81BE0E2
EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkflag FLAG_BADGE04_GET
goto_if FALSE, EventScript_1BE185
checkflag FLAG_SYS_STRENGTH_ACTIVE
goto_if TRUE, EventScript_1BE18E
goto_if_unset FLAG_BADGE04_GET, EventScript_1BE185
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_1BE18E
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BE185
goto_if_eq EventScript_1BE185
setfieldeffectarg 0, VAR_RESULT
msgbox gUnknown_81BE19A, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE197
goto_if_eq EventScript_1BE197
closemessage
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
@@ -195,16 +191,16 @@ gUnknown_81BE284:: @ 81BE284
gUnknown_81BE2B7:: @ 81BE2B7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BE300
goto_if_eq EventScript_1BE300
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
msgbox gUnknown_81BE33F, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE308
goto_if_eq EventScript_1BE308
msgbox gUnknown_81BE378
dofieldeffect FLDEFF_USE_WATERFALL
goto EventScript_1BE308
@@ -233,13 +229,13 @@ EventScript_1BE38B:: @ 81BE38B
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BE3CA
goto_if_eq EventScript_1BE3CA
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
msgbox gUnknown_81BE469, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE3D2
goto_if_eq EventScript_1BE3D2
msgbox gUnknown_81BE49B
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE3D2
@@ -256,13 +252,13 @@ EventScript_1BE3D4:: @ 81BE3D4
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_1BE412
goto_if_eq EventScript_1BE412
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
msgbox gUnknown_81BE4EF, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_1BE429
goto_if_eq EventScript_1BE429
msgbox gUnknown_81BE49B
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE429
data/scripts/move_tutors.inc
+74 -91
View File
@@ -1,19 +1,18 @@
VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
lock
faceplayer
checkflag FLAG_TUTOR_DOUBLE_EDGE
goto_if TRUE, EventScript_1C480C
goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_1C480C
msgbox Text_1749F9, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4802
goto_if_eq EventScript_1C4802
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4802
goto_if_eq EventScript_1C4802
msgbox Text_174AE2
setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4802
goto_if_eq EventScript_1C4802
setflag FLAG_TUTOR_DOUBLE_EDGE
goto EventScript_1C480C
end
@@ -31,19 +30,18 @@ EventScript_1C480C:: @ 81C480C
EventScript_1C4816:: @ 81C4816
lock
faceplayer
checkflag FLAG_TUTOR_THUNDER_WAVE
goto_if TRUE, EventScript_1C4874
goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_1C4874
msgbox Text_175711, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C486A
goto_if_eq EventScript_1C486A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C486A
goto_if_eq EventScript_1C486A
msgbox Text_1757C1
setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C486A
goto_if_eq EventScript_1C486A
setflag FLAG_TUTOR_THUNDER_WAVE
goto EventScript_1C4874
end
@@ -61,19 +59,18 @@ EventScript_1C4874:: @ 81C4874
RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
lock
faceplayer
checkflag FLAG_TUTOR_ROCK_SLIDE
goto_if TRUE, EventScript_1C48DC
goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_1C48DC
msgbox Text_1799E0, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C48D2
goto_if_eq EventScript_1C48D2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C48D2
goto_if_eq EventScript_1C48D2
msgbox Text_179AE1
setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C48D2
goto_if_eq EventScript_1C48D2
setflag FLAG_TUTOR_ROCK_SLIDE
goto EventScript_1C48DC
end
@@ -91,19 +88,18 @@ EventScript_1C48DC:: @ 81C48DC
MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
lock
faceplayer
checkflag FLAG_TUTOR_EXPLOSION
goto_if TRUE, EventScript_1C4944
goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_1C4944
msgbox Text_17A642, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C493A
goto_if_eq EventScript_1C493A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C493A
goto_if_eq EventScript_1C493A
msgbox Text_17A717
setvar VAR_0x8005, MOVETUTOR_EXPLOSION
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C493A
goto_if_eq EventScript_1C493A
setflag FLAG_TUTOR_EXPLOSION
goto EventScript_1C4944
end
@@ -121,19 +117,18 @@ EventScript_1C4944:: @ 81C4944
Route4_EventScript_1C494E:: @ 81C494E
lock
faceplayer
checkflag FLAG_TUTOR_META_PUNCH
goto_if TRUE, EventScript_1C49AC
goto_if_set FLAG_TUTOR_META_PUNCH, EventScript_1C49AC
msgbox Text_1839D5, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C49A2
goto_if_eq EventScript_1C49A2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C49A2
goto_if_eq EventScript_1C49A2
msgbox Text_183ABF
setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C49A2
goto_if_eq EventScript_1C49A2
setflag FLAG_TUTOR_META_PUNCH
goto EventScript_1C49AC
end
@@ -151,19 +146,18 @@ EventScript_1C49AC:: @ 81C49AC
Route4_EventScript_1C49B6:: @ 81C49B6
lock
faceplayer
checkflag FLAG_TUTOR_MEGA_KICK
goto_if TRUE, EventScript_1C4A14
goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_1C4A14
msgbox Text_183B74, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4A0A
goto_if_eq EventScript_1C4A0A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4A0A
goto_if_eq EventScript_1C4A0A
msgbox Text_183C68
setvar VAR_0x8005, MOVETUTOR_MEGA_KICK
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4A0A
goto_if_eq EventScript_1C4A0A
setflag FLAG_TUTOR_MEGA_KICK
goto EventScript_1C4A14
end
@@ -181,19 +175,18 @@ EventScript_1C4A14:: @ 81C4A14
EventScript_1C4A1E:: @ 81C4A1E
lock
faceplayer
checkflag FLAG_TUTOR_DREAM_EATER
goto_if TRUE, EventScript_1C4A7C
goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_1C4A7C
msgbox Text_17E316, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4A72
goto_if_eq EventScript_1C4A72
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4A72
goto_if_eq EventScript_1C4A72
msgbox Text_17E3F1
setvar VAR_0x8005, MOVETUTOR_DREAM_EATER
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4A72
goto_if_eq EventScript_1C4A72
setflag FLAG_TUTOR_DREAM_EATER
goto EventScript_1C4A7C
end
@@ -211,19 +204,18 @@ EventScript_1C4A7C:: @ 81C4A7C
EventScript_1C4A86:: @ 81C4A86
lock
faceplayer
checkflag FLAG_TUTOR_SOFT_BOILED
goto_if TRUE, EventScript_1C4AE4
goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_1C4AE4
msgbox Text_180388, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4ADA
goto_if_eq EventScript_1C4ADA
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4ADA
goto_if_eq EventScript_1C4ADA
msgbox Text_180484
setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4ADA
goto_if_eq EventScript_1C4ADA
setflag FLAG_TUTOR_SOFT_BOILED
goto EventScript_1C4AE4
end
@@ -241,19 +233,18 @@ EventScript_1C4AE4:: @ 81C4AE4
FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
lock
faceplayer
checkflag FLAG_TUTOR_SUBSTITUTE
goto_if TRUE, EventScript_1C4B4C
goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_1C4B4C
msgbox Text_180948, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4B42
goto_if_eq EventScript_1C4B42
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4B42
goto_if_eq EventScript_1C4B42
msgbox Text_180A57
setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4B42
goto_if_eq EventScript_1C4B42
setflag FLAG_TUTOR_SUBSTITUTE
goto EventScript_1C4B4C
end
@@ -271,19 +262,18 @@ EventScript_1C4B4C:: @ 81C4B4C
SevenIsland_EventScript_1C4B56:: @ 81C4B56
lock
faceplayer
checkflag FLAG_TUTOR_SWORDS_DANCE
goto_if TRUE, EventScript_1C4BB4
goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_1C4BB4
msgbox Text_182F01, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4BAA
goto_if_eq EventScript_1C4BAA
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4BAA
goto_if_eq EventScript_1C4BAA
msgbox Text_182FD9
setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4BAA
goto_if_eq EventScript_1C4BAA
setflag FLAG_TUTOR_SWORDS_DANCE
goto EventScript_1C4BB4
end
@@ -301,19 +291,18 @@ EventScript_1C4BB4:: @ 81C4BB4
PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
lock
faceplayer
checkflag FLAG_TUTOR_SEISMIC_TOSS
goto_if TRUE, EventScript_1C4C1C
goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_1C4C1C
msgbox Text_1909A3, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4C12
goto_if_eq EventScript_1C4C12
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4C12
goto_if_eq EventScript_1C4C12
msgbox Text_190AD5
setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4C12
goto_if_eq EventScript_1C4C12
setflag FLAG_TUTOR_SEISMIC_TOSS
goto EventScript_1C4C1C
end
@@ -331,19 +320,18 @@ EventScript_1C4C1C:: @ 81C4C1C
EventScript_1C4C26:: @ 81C4C26
lock
faceplayer
checkflag FLAG_TUTOR_COUNTER
goto_if TRUE, EventScript_1C4C84
goto_if_set FLAG_TUTOR_COUNTER, EventScript_1C4C84
msgbox Text_195928, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4C7A
goto_if_eq EventScript_1C4C7A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4C7A
goto_if_eq EventScript_1C4C7A
msgbox Text_195A08
setvar VAR_0x8005, MOVETUTOR_COUNTER
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4C7A
goto_if_eq EventScript_1C4C7A
setflag FLAG_TUTOR_COUNTER
goto EventScript_1C4C84
end
@@ -361,19 +349,18 @@ EventScript_1C4C84:: @ 81C4C84
EventScript_1C4C8E:: @ 81C4C8E
lock
faceplayer
checkflag FLAG_TUTOR_METRONOME
goto_if TRUE, EventScript_1C4CEC
goto_if_set FLAG_TUTOR_METRONOME, EventScript_1C4CEC
msgbox Text_19A137, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4CE2
goto_if_eq EventScript_1C4CE2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4CE2
goto_if_eq EventScript_1C4CE2
msgbox Text_19A1EA
setvar VAR_0x8005, MOVETUTOR_METRONOME
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4CE2
goto_if_eq EventScript_1C4CE2
setflag FLAG_TUTOR_METRONOME
goto EventScript_1C4CEC
end
@@ -389,21 +376,20 @@ EventScript_1C4CEC:: @ 81C4CEC
end
EventScript_1C4CF6:: @ 81C4CF6
checkflag FLAG_TUTOR_MIMIC
goto_if TRUE, EventScript_1C4D59
goto_if_set FLAG_TUTOR_MIMIC, EventScript_1C4D59
msgbox Text_19AD85, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4D4F
goto_if_eq EventScript_1C4D4F
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4D4F
goto_if_eq EventScript_1C4D4F
msgbox Text_19ADEE
setvar VAR_0x8005, MOVETUTOR_MIMIC
call EventScript_1C4F30
lock
faceplayer
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4D4F
goto_if_eq EventScript_1C4D4F
removeitem ITEM_POKE_DOLL, 1
setflag FLAG_TUTOR_MIMIC
goto EventScript_1C4D59
@@ -417,9 +403,9 @@ EventScript_1C4D4F:: @ 81C4D4F
EventScript_1C4D59:: @ 81C4D59
checkplayergender
compare VAR_RESULT, 0
call_if eq, EventScript_1C4D72
call_if_eq EventScript_1C4D72
compare VAR_RESULT, 1
call_if eq, EventScript_1C4D7B
call_if_eq EventScript_1C4D7B
release
end
@@ -434,19 +420,18 @@ EventScript_1C4D7B:: @ 81C4D7B
FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
lock
faceplayer
checkflag FLAG_TUTOR_BODY_SLAM
goto_if TRUE, EventScript_1C4DE2
goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_1C4DE2
msgbox Text_1A3505, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4DD8
goto_if_eq EventScript_1C4DD8
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4DD8
goto_if_eq EventScript_1C4DD8
msgbox Text_1A35DA
setvar VAR_0x8005, MOVETUTOR_BODY_SLAM
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4DD8
goto_if_eq EventScript_1C4DD8
setflag FLAG_TUTOR_BODY_SLAM
goto EventScript_1C4DE2
end
@@ -464,34 +449,32 @@ EventScript_1C4DE2:: @ 81C4DE2
TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK
goto_if TRUE, EventScript_1C4EA1
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_1C4E97
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, EventScript_1C4EA1
goto_if_set FLAG_TEMP_2, EventScript_1C4E97
getfirstpartymonname 0
msgbox Text_1A46C6
specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4F26
goto_if_eq EventScript_1C4F26
copyvar VAR_0x8009, VAR_0x8005
compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1C4EF0
call_if_eq EventScript_1C4EF0
compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1C4EFB
call_if_eq EventScript_1C4EFB
compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1C4F06
call_if_eq EventScript_1C4F06
compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1C4F11
call_if_eq EventScript_1C4F11
msgbox Text_1A4751, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4F1C
goto_if_eq EventScript_1C4F1C
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4F1C
goto_if_eq EventScript_1C4F1C
msgbox Text_1A4814
closemessage
fadescreen 1
@@ -516,7 +499,7 @@ EventScript_1C4EAB:: @ 81C4EAB
copyvar VAR_0x8005, VAR_0x8009
specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
compare VAR_RESULT, 1
goto_if eq, EventScript_1C4ECD
goto_if_eq EventScript_1C4ECD
msgbox Text_1A4865
setflag FLAG_TEMP_2
release
@@ -531,7 +514,7 @@ EventScript_1C4ECD:: @ 81C4ECD
EventScript_1C4EDA:: @ 81C4EDA
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if eq, EventScript_1C4F1C
goto_if_eq EventScript_1C4F1C
goto EventScript_1C4EAB
end
data/scripts/mystery_event_club.inc
+5 -6
View File
@@ -2,9 +2,8 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
lock
faceplayer
compare VAR_TEMP_1, 1
goto_if eq, EventScript_1BEE3A
checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE
goto_if TRUE, EventScript_1BEECD
goto_if_eq EventScript_1BEE3A
goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_1BEECD
msgbox Text_1BEF88
goto EventScript_1BEE44
end
@@ -104,11 +103,11 @@ EventScript_1BEF5A:: @ 81BEF5A
lock
faceplayer
compare VAR_0x8004, 0
goto_if eq, EventScript_1BEF3F
goto_if_eq EventScript_1BEF3F
compare VAR_RESULT, 0
goto_if eq, EventScript_1BEE9E
goto_if_eq EventScript_1BEE9E
compare VAR_RESULT, 1
goto_if eq, EventScript_1BEEA8
goto_if_eq EventScript_1BEEA8
end
Text_1BEF88:: @ 81BEF88
data/scripts/obtain_item.inc
+20 -21
View File
@@ -20,9 +20,9 @@ EventScript_1A6697:: @ 81A6697
checkitemtype VAR_0x8000
call EventScript_1A66BC
compare VAR_0x8007, 1
call_if eq, EventScript_1A6749
call_if_eq EventScript_1A6749
compare VAR_0x8007, 0
call_if eq, EventScript_1A675E
call_if_eq EventScript_1A675E
return
EventScript_1A66BC:: @ 81A66BC
@@ -37,31 +37,31 @@ EventScript_1A66BC:: @ 81A66BC
EventScript_1A66F9:: @ 81A66F9
getstdstring 2, 24
compare VAR_0x8007, 1
call_if eq, EventScript_1A6764
call_if_eq EventScript_1A6764
return
EventScript_1A6709:: @ 81A6709
getstdstring 2, 25
compare VAR_0x8007, 1
call_if eq, EventScript_1A6764
call_if_eq EventScript_1A6764
return
EventScript_1A6719:: @ 81A6719
getstdstring 2, 26
compare VAR_0x8007, 1
call_if eq, EventScript_1A6764
call_if_eq EventScript_1A6764
return
EventScript_1A6729:: @ 81A6729
getstdstring 2, 27
compare VAR_0x8007, 1
call_if eq, EventScript_1A6768
call_if_eq EventScript_1A6768
return
EventScript_1A6739:: @ 81A6739
getstdstring 2, 28
compare VAR_0x8007, 1
call_if eq, EventScript_1A6764
call_if_eq EventScript_1A6764
return
EventScript_1A6749:: @ 81A6749
@@ -93,9 +93,9 @@ Std_ObtainDecoration:: @ 81A676C
EventScript_1A677A:: @ 81A677A
getdecorname 1, VAR_0x8000
compare VAR_0x8007, 1
call_if eq, EventScript_1A6795
call_if_eq EventScript_1A6795
compare VAR_0x8007, 0
call_if eq, EventScript_1A67AD
call_if_eq EventScript_1A67AD
return
EventScript_1A6795:: @ 81A6795
@@ -123,9 +123,9 @@ Std_FindItem:: @ 81A67B3
checkitemtype VAR_0x8000
call EventScript_1A66BC
compare VAR_0x8007, 1
call_if eq, EventScript_1A67EE
call_if_eq EventScript_1A67EE
compare VAR_0x8007, 0
call_if eq, EventScript_1A682D
call_if_eq EventScript_1A682D
release
return
@@ -135,9 +135,9 @@ EventScript_1A67EE:: @ 81A67EE
specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1
call_if eq, EventScript_1A6821
call_if_eq EventScript_1A6821
compare VAR_0x8008, 0
call_if eq, EventScript_1A6827
call_if_eq EventScript_1A6827
waitfanfare
waitmessage
msgbox Text_PutItemAway
@@ -162,12 +162,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843
textcolor 3
waitse
compare VAR_0x8005, 0
goto_if eq, EventScript_PickUpHiddenCoins
goto_if_eq EventScript_PickUpHiddenCoins
call EventScript_GiveItem
compare VAR_0x8007, 1
goto_if eq, EventScript_ItemInPocketMessage
goto_if_eq EventScript_ItemInPocketMessage
compare VAR_0x8007, 0
goto_if eq, EventScript_BagIsFullMessage
goto_if_eq EventScript_BagIsFullMessage
end
EventScript_GiveItem::
@@ -180,9 +180,9 @@ EventScript_GiveItem::
EventScript_ItemInPocketMessage::
compare VAR_0x8006, 1
call_if eq, EventScript_FoundSingleItemMessage
call_if_eq EventScript_FoundSingleItemMessage
compare VAR_0x8006, 1
call_if ne, EventScript_FoundMultipleItemsMessage
call_if_ne EventScript_FoundMultipleItemsMessage
waitfanfare
waitmessage
msgbox Text_PutItemAway
@@ -212,12 +212,11 @@ EventScript_BagIsFullMessage::
end
EventScript_PickUpHiddenCoins::
checkflag FLAG_GOT_COIN_CASE
goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_HiddenCoinsButNoCoinCase
checkcoins VAR_RESULT
specialvar VAR_RESULT, Special_CheckAddCoins
compare VAR_RESULT, 0
goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull
goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull
givecoins VAR_0x8006
getstdstring 1, 0x17
call EventScript_1A6764
data/scripts/pc.inc
+7 -12
View File
@@ -1,10 +1,9 @@
EventScript_PC:: @ 81A6955
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lockall
checkflag FLAG_SYS_PC_STORAGE_DISABLED
goto_if TRUE, EventScript_PCDisabled
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
special Special_SetSomeVariable
setvar VAR_0x8004, 0
@@ -47,10 +46,8 @@ EventScript_AccessPlayersPC:: @ 81A69F0
EventScript_AccessPokemonStorage:: @ 81A6A05
playse SE_PC_LOGIN
checkflag FLAG_SYS_NOT_SOMEONES_PC
call_if FALSE, EventScript_1A6A34
checkflag FLAG_SYS_NOT_SOMEONES_PC
call_if TRUE, EventScript_1A6A3D
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A34
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A3D
msgbox Text_OpenedPkmnStorage
special ShowPokemonStorageSystem
waitstate
@@ -76,8 +73,7 @@ EventScript_1A6A46:: @ 81A6A46
end
EventScript_1A6A56:: @ 81A6A56
checkflag FLAG_SYS_GAME_CLEAR
goto_if FALSE, EventScript_1A6A46
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A6A46
playse SE_PC_LOGIN
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
@@ -89,13 +85,12 @@ EventScript_1A6A56:: @ 81A6A56
end
EventScript_AccessProfOaksPC:: @ 81A6A7A
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1A6A46
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1A6A46
playse SE_PC_LOGIN
msgbox Text_AccessedProfOaksPC
msgbox Text_HavePokedexRated, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_ExitOaksPC
goto_if_eq EventScript_ExitOaksPC
setflag FLAG_OAKS_RATING_IS_VIA_PC
call EventScript_1A73E0
clearflag FLAG_OAKS_RATING_IS_VIA_PC
data/scripts/pkmn_center_nurse.inc
+5 -6
View File
@@ -1,7 +1,7 @@
EventScript_PkmnCenterNurse:: @ 81A6578
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
message Text_WelcomeWantToHealPkmn
waitmessage
multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1)
@@ -33,13 +33,13 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby
compare VAR_RESULT, FALSE
goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
specialvar VAR_RESULT, BufferUnionRoomPlayerName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0
goto_if eq, EventScript_PkmnCenterNurse_ReturnPkmn
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
compare VAR_0x8008, 1
goto_if eq, EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom
goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom
end
EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D
@@ -51,8 +51,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D
return
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636
checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER
goto_if TRUE, EventScript_PkmnCenterNurse_ReturnPkmn
goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn
msgbox Text_RestoredPkmnToFullHealth
setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER
message Text_PlayerIsPlayingRightNowGoForIt
data/scripts/pokedex_rating.inc
+9 -12
View File
@@ -1,12 +1,10 @@
EventScript_1A737B:: @ 81A737B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
checkflag FLAG_OAK_SAW_DEX_COMPLETION
call_if TRUE, EventScript_1A73A4
checkflag FLAG_OAK_SAW_DEX_COMPLETION
call_if FALSE, EventScript_1A73AD
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73A4
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73AD
call EventScript_1A73E0
return
@@ -23,9 +21,9 @@ EventScript_1A73B6:: @ 81A73B6
special Special_GetProfOaksRatingMessage
waitmessage
compare VAR_RESULT, 0
call_if eq, EventScript_1A73D8
call_if_eq EventScript_1A73D8
compare VAR_RESULT, 1
call_if eq, EventScript_1A73DC
call_if_eq EventScript_1A73DC
waitfanfare
waitbuttonpress
return
@@ -50,11 +48,10 @@ EventScript_1A73E0:: @ 81A73E0
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
msgbox Text_1A6CA3
checkflag FLAG_OAKS_RATING_IS_VIA_PC
call_if FALSE, EventScript_1A746D
call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, EventScript_1A746D
call EventScript_1A73B6
compare VAR_0x800A, 0
goto_if eq, EventScript_1A748F
goto_if_eq EventScript_1A748F
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
@@ -64,9 +61,9 @@ EventScript_1A73E0:: @ 81A73E0
msgbox Text_1A71AA
specialvar VAR_RESULT, HasAllMons
compare VAR_RESULT, 0
goto_if eq, EventScript_1A7470
goto_if_eq EventScript_1A7470
compare VAR_RESULT, 1
goto_if eq, EventScript_1A747E
goto_if_eq EventScript_1A747E
end
EventScript_1A746D:: @ 81A746D
data/scripts/route23.inc
+18 -34
View File
@@ -31,7 +31,7 @@ EventScript_1A77F9:: @ 81A77F9
EventScript_1A7803:: @ 81A7803
compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
goto_if ge, EventScript_1A77EC
goto_if_ge EventScript_1A77EC
switch VAR_TEMP_1
case 1, EventScript_1A78D5
case 2, EventScript_1A78E4
@@ -45,7 +45,7 @@ EventScript_1A7803:: @ 81A7803
EventScript_1A786C:: @ 81A786C
compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
goto_if ge, EventScript_1A77F9
goto_if_ge EventScript_1A77F9
switch VAR_TEMP_1
case 1, EventScript_1A78D5
case 2, EventScript_1A78E4
@@ -58,50 +58,42 @@ EventScript_1A786C:: @ 81A786C
end
EventScript_1A78D5:: @ 81A78D5
checkflag FLAG_BADGE01_GET
goto_if TRUE, EventScript_1A794D
goto_if_set FLAG_BADGE01_GET, EventScript_1A794D
goto EventScript_1A77C9
end
EventScript_1A78E4:: @ 81A78E4
checkflag FLAG_BADGE02_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE02_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A78F3:: @ 81A78F3
checkflag FLAG_BADGE03_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE03_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A7902:: @ 81A7902
checkflag FLAG_BADGE04_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE04_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A7911:: @ 81A7911
checkflag FLAG_BADGE05_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE05_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A7920:: @ 81A7920
checkflag FLAG_BADGE06_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE06_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A792F:: @ 81A792F
checkflag FLAG_BADGE07_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE07_GET, EventScript_1A795F
goto EventScript_1A77DE
end
EventScript_1A793E:: @ 81A793E
checkflag FLAG_BADGE08_GET
goto_if TRUE, EventScript_1A795F
goto_if_set FLAG_BADGE08_GET, EventScript_1A795F
goto EventScript_1A77DE
end
@@ -137,50 +129,42 @@ EventScript_1A796E:: @ 81A796E
end
EventScript_1A79D8:: @ 81A79D8
checkflag FLAG_BADGE01_GET
goto_if TRUE, EventScript_1A7A96
goto_if_set FLAG_BADGE01_GET, EventScript_1A7A96
goto EventScript_1A7A50
end
EventScript_1A79E7:: @ 81A79E7
checkflag FLAG_BADGE02_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE02_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A79F6:: @ 81A79F6
checkflag FLAG_BADGE03_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE03_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A7A05:: @ 81A7A05
checkflag FLAG_BADGE04_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE04_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A7A14:: @ 81A7A14
checkflag FLAG_BADGE05_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE05_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A7A23:: @ 81A7A23
checkflag FLAG_BADGE06_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE06_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A7A32:: @ 81A7A32
checkflag FLAG_BADGE07_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE07_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
EventScript_1A7A41:: @ 81A7A41
checkflag FLAG_BADGE08_GET
goto_if TRUE, EventScript_1A7AA8
goto_if_set FLAG_BADGE08_GET, EventScript_1A7AA8
goto EventScript_1A7A77
end
data/scripts/seagallop.inc
+10 -10
View File
@@ -1,8 +1,8 @@
EventScript_1A8EC5:: @ 81A8EC5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if ge, EventScript_1A911E
goto_if_ge EventScript_1A911E
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A8F12
goto_if_ge EventScript_1A8F12
multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE
switch VAR_RESULT
case 0, EventScript_1A8FF9
@@ -23,9 +23,9 @@ EventScript_1A8F12:: @ 81A8F12
EventScript_1A8F54:: @ 81A8F54
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if ge, EventScript_1A911E
goto_if_ge EventScript_1A911E
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A8FA1
goto_if_ge EventScript_1A8FA1
multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE
switch VAR_RESULT
case 0, EventScript_1A8FEE
@@ -66,9 +66,9 @@ EventScript_1A9004:: @ 81A9004
EventScript_1A900F:: @ 81A900F
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if ge, EventScript_1A911E
goto_if_ge EventScript_1A911E
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A905C
goto_if_ge EventScript_1A905C
multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE
switch VAR_RESULT
case 0, EventScript_1A8FEE
@@ -91,9 +91,9 @@ EventScript_1A909E:: @ 81A909E
specialvar VAR_RESULT, sub_8147500
getnumberstring 0, VAR_RESULT
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
goto_if eq, EventScript_1A90BE
goto_if_eq EventScript_1A90BE
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
goto_if ne, EventScript_1A90CC
goto_if_ne EventScript_1A90CC
end
EventScript_1A90BE:: @ 81A90BE
@@ -111,7 +111,7 @@ EventScript_1A90DA:: @ 81A90DA
delay 20
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
fadescreen 1
special ScrSpecial_SeagallopFerry
@@ -121,7 +121,7 @@ EventScript_1A90DA:: @ 81A90DA
EventScript_1A90F6:: @ 81A90F6
specialvar VAR_RESULT, sub_8147594
compare VAR_RESULT, 1
goto_if eq, EventScript_1A9108
goto_if_eq EventScript_1A9108
release
end
data/scripts/silphco_doors.inc
+41 -62
View File
@@ -350,8 +350,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B
lockall
setvar VAR_TEMP_1, 1
setvar VAR_0x8004, 634
checkflag FLAG_SILPH_2F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_2F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -359,8 +358,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935
lockall
setvar VAR_TEMP_1, 2
setvar VAR_0x8004, 635
checkflag FLAG_SILPH_2F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_2F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -368,8 +366,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F
lockall
setvar VAR_TEMP_1, 3
setvar VAR_0x8004, 636
checkflag FLAG_SILPH_3F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_3F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -377,8 +374,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969
lockall
setvar VAR_TEMP_1, 4
setvar VAR_0x8004, 637
checkflag FLAG_SILPH_3F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_3F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -386,8 +382,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983
lockall
setvar VAR_TEMP_1, 5
setvar VAR_0x8004, 638
checkflag FLAG_SILPH_4F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_4F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -395,8 +390,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D
lockall
setvar VAR_TEMP_1, 6
setvar VAR_0x8004, 639
checkflag FLAG_SILPH_4F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_4F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -404,8 +398,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7
lockall
setvar VAR_TEMP_1, 7
setvar VAR_0x8004, 640
checkflag FLAG_SILPH_5F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_5F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -413,8 +406,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1
lockall
setvar VAR_TEMP_1, 8
setvar VAR_0x8004, 641
checkflag FLAG_SILPH_5F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_5F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -422,8 +414,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB
lockall
setvar VAR_TEMP_1, 9
setvar VAR_0x8004, 642
checkflag FLAG_SILPH_5F_DOOR_3
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_5F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -431,8 +422,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05
lockall
setvar VAR_TEMP_1, 10
setvar VAR_0x8004, 643
checkflag FLAG_SILPH_6F_DOOR
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_6F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -440,8 +430,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F
lockall
setvar VAR_TEMP_1, 11
setvar VAR_0x8004, 644
checkflag FLAG_SILPH_7F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_7F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -449,8 +438,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39
lockall
setvar VAR_TEMP_1, 12
setvar VAR_0x8004, 645
checkflag FLAG_SILPH_7F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_7F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -458,8 +446,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53
lockall
setvar VAR_TEMP_1, 13
setvar VAR_0x8004, 646
checkflag FLAG_SILPH_7F_DOOR_3
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_7F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -467,8 +454,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D
lockall
setvar VAR_TEMP_1, 14
setvar VAR_0x8004, 647
checkflag FLAG_SILPH_8F_DOOR
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_8F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -476,8 +462,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87
lockall
setvar VAR_TEMP_1, 15
setvar VAR_0x8004, 648
checkflag FLAG_SILPH_9F_DOOR_1
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_9F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -485,8 +470,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1
lockall
setvar VAR_TEMP_1, 16
setvar VAR_0x8004, 649
checkflag FLAG_SILPH_9F_DOOR_2
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_9F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -494,8 +478,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB
lockall
setvar VAR_TEMP_1, 17
setvar VAR_0x8004, 650
checkflag FLAG_SILPH_9F_DOOR_3
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_9F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -503,8 +486,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5
lockall
setvar VAR_TEMP_1, 18
setvar VAR_0x8004, 651
checkflag FLAG_SILPH_9F_DOOR_4
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_9F_DOOR_4, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -512,8 +494,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF
lockall
setvar VAR_TEMP_1, 19
setvar VAR_0x8004, 652
checkflag FLAG_SILPH_10F_DOOR
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_10F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -521,14 +502,12 @@ SilphCo_11F_EventScript_Door:: @ 81A8B09
lockall
setvar VAR_TEMP_1, 20
setvar VAR_0x8004, 653
checkflag FLAG_SILPH_11F_DOOR
goto_if TRUE, EventScript_DoorUnlocked
goto_if_set FLAG_SILPH_11F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
EventScript_TryUnlockDoor:: @ 81A8B23
checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY
goto_if TRUE, EventScript_OpenDoor
goto_if_set FLAG_HIDE_SILPH_CO_5F_CARD_KEY, EventScript_OpenDoor
goto EventScript_NeedCardKey
end
@@ -537,45 +516,45 @@ EventScript_OpenDoor:: @ 81A8B32
msgbox Text_CardKeyOpenedDoor
waitfanfare
compare VAR_TEMP_1, 1
call_if eq, EventScript_Open2FDoor1
call_if_eq EventScript_Open2FDoor1
compare VAR_TEMP_1, 2
call_if eq, EventScript_Open2FDoor2
call_if_eq EventScript_Open2FDoor2
compare VAR_TEMP_1, 3
call_if eq, EventScript_Open3FDoor1
call_if_eq EventScript_Open3FDoor1
compare VAR_TEMP_1, 4
call_if eq, EventScript_Open3FDoor2
call_if_eq EventScript_Open3FDoor2
compare VAR_TEMP_1, 5
call_if eq, EventScript_Open4FDoor1
call_if_eq EventScript_Open4FDoor1
compare VAR_TEMP_1, 6
call_if eq, EventScript_Open4FDoor2
call_if_eq EventScript_Open4FDoor2
compare VAR_TEMP_1, 7
call_if eq, EventScript_Open5FDoor1
call_if_eq EventScript_Open5FDoor1
compare VAR_TEMP_1, 8
call_if eq, EventScript_Open5FDoor2
call_if_eq EventScript_Open5FDoor2
compare VAR_TEMP_1, 9
call_if eq, EventScript_Open5FDoor3
call_if_eq EventScript_Open5FDoor3
compare VAR_TEMP_1, 10
call_if eq, EventScript_Open6FDoor
call_if_eq EventScript_Open6FDoor
compare VAR_TEMP_1, 11
call_if eq, EventScript_Open7FDoor1
call_if_eq EventScript_Open7FDoor1
compare VAR_TEMP_1, 12
call_if eq, EventScript_Open7FDoor2
call_if_eq EventScript_Open7FDoor2
compare VAR_TEMP_1, 13
call_if eq, EventScript_Open7FDoor3
call_if_eq EventScript_Open7FDoor3
compare VAR_TEMP_1, 14
call_if eq, EventScript_Open8FDoor
call_if_eq EventScript_Open8FDoor
compare VAR_TEMP_1, 15
call_if eq, EventScript_Open9FDoor1
call_if_eq EventScript_Open9FDoor1
compare VAR_TEMP_1, 16
call_if eq, EventScript_Open9FDoor2
call_if_eq EventScript_Open9FDoor2
compare VAR_TEMP_1, 17
call_if eq, EventScript_Open9FDoor3
call_if_eq EventScript_Open9FDoor3
compare VAR_TEMP_1, 18
call_if eq, EventScript_Open9FDoor4
call_if_eq EventScript_Open9FDoor4
compare VAR_TEMP_1, 19
call_if eq, EventScript_Open10FDoor
call_if_eq EventScript_Open10FDoor
compare VAR_TEMP_1, 20
call_if eq, EventScript_Open11FDoor
call_if_eq EventScript_Open11FDoor
waitse
playse SE_KI_GASYAN
special DrawWholeMapView
data/scripts/std_msgbox.inc
+4 -4
View File
@@ -27,17 +27,17 @@ Std_MsgboxYesNo:: @ 81A4E5C
yesnobox 20, 8
return
gStdScript_ItemMessageAndFanfare:: @ 81A4E66
Std_ReceivedItem:: @ 81A4E66
textcolor 3
compare VAR_0x8002, MUS_FANFA1
call_if eq, EventScript_1A4EA2
call_if_eq EventScript_1A4EA2
compare VAR_0x8002, MUS_FAN5
call_if eq, EventScript_1A4EA6
call_if_eq EventScript_1A4EA6
message 0x0
waitmessage
waitfanfare
compare VAR_0x8002, MUS_FANFA1
call_if eq, EventScript_1A4EAA
call_if_eq EventScript_1A4EAA
putitemaway VAR_0x8000, VAR_0x8001
call EventScript_1A6675
return
data/scripts/surf.inc
+3 -3
View File
@@ -1,16 +1,16 @@
EventScript_UseSurf:: @ 81A6AC8
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_UseSurfEnd
goto_if_eq EventScript_UseSurfEnd
checkpartymove MOVE_SURF
compare VAR_RESULT, PARTY_SIZE
goto_if eq, EventScript_UseSurfEnd
goto_if_eq EventScript_UseSurfEnd
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
lockall
msgbox Text_1A556E, 5
compare VAR_RESULT, 0
goto_if eq, EventScript_UseSurfRelease
goto_if_eq EventScript_UseSurfRelease
msgbox Text_1A55A5
dofieldeffect FLDEFF_USE_SURF
EventScript_UseSurfRelease:@ 81A6B0B
data/scripts/trainer_battle.inc
+15 -15
View File
@@ -12,7 +12,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
waitmovement 0
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare VAR_RESULT, 0
goto_if ne, EventScript_1A4EE8
goto_if_ne EventScript_1A4EE8
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
goto EventScript_1A4FC7
@@ -26,10 +26,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
call EventScript_1A4FBA
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare VAR_RESULT, 0
goto_if ne, EventScript_1A4F20
goto_if_ne EventScript_1A4F20
special CheckForAlivePartyMons
compare VAR_RESULT, 0
goto_if ne, EventScript_1A4F19
goto_if_ne EventScript_1A4F19
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
goto EventScript_1A4FC7
@@ -50,7 +50,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21
special PlayTrainerEncounterMusic
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A501A
goto_if_eq EventScript_1A501A
battlebegin
ontrainerbattleend
@@ -58,7 +58,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
call EventScript_1A4FBA
specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare VAR_RESULT, 0
goto_if eq, EventScript_1A4F72
goto_if_eq EventScript_1A4F72
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
special ScrSpecial_ShowTrainerIntroSpeech
@@ -66,7 +66,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8
goto_if_eq EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -78,10 +78,10 @@ EventScript_1A4F72:: @ 81A4F72
EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare VAR_RESULT, 0
goto_if eq, EventScript_1A4FB0
goto_if_eq EventScript_1A4FB0
special CheckForAlivePartyMons
compare VAR_RESULT, 0
goto_if ne, EventScript_1A4FB1
goto_if_ne EventScript_1A4FB1
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
special ScrSpecial_ShowTrainerIntroSpeech
@@ -89,7 +89,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8
goto_if_eq EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -124,19 +124,19 @@ EventScript_1A4FC7:: @ 81A4FC7
waitbuttonpress
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A501A
goto_if_eq EventScript_1A501A
battlebegin
specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
compare VAR_RESULT, 0
goto_if eq, EventScript_1A5017
goto_if_eq EventScript_1A5017
compare VAR_RESULT, 2
goto_if eq, EventScript_1A5019
goto_if_eq EventScript_1A5019
compare VAR_RESULT, 1
goto_if eq, EventScript_1A5019
goto_if_eq EventScript_1A5019
compare VAR_RESULT, 6
goto_if eq, EventScript_1A5019
goto_if_eq EventScript_1A5019
compare VAR_RESULT, 8
goto_if eq, EventScript_1A5019
goto_if_eq EventScript_1A5019
EventScript_1A5017:: @ 81A5017
releaseall
data/scripts/trainer_tower.inc
+6 -6
View File
@@ -51,7 +51,7 @@ EventScript_1C4FC5:: @ 81C4FC5
setvar VAR_0x8004, 5
special sub_815D9E8
compare VAR_RESULT, 1
goto_if eq, EventScript_1C4FFE
goto_if_eq EventScript_1C4FFE
setobjectxyperm 2, 10, 12
setobjectmovementtype 2, 9
setobjectxyperm 5, 10, 13
@@ -96,14 +96,14 @@ EventScript_1C5050:: @ 81C5050
setvar VAR_0x8004, 5
special sub_815D9E8
compare VAR_RESULT, 0
goto_if eq, EventScript_1C5072
goto_if_eq EventScript_1C5072
setvar VAR_TEMP_E, 1
setvar VAR_TEMP_F, 1
EventScript_1C5072:
setvar VAR_0x8004, 18
special sub_815D9E8
compare VAR_RESULT, 1
goto_if eq, EventScript_1C5086
goto_if_eq EventScript_1C5086
end
EventScript_1C5086:: @ 81C5086
@@ -145,7 +145,7 @@ EventScript_1C510D:: @ 81C510D
setvar VAR_0x8005, 2
addvar VAR_TEMP_3, 1
compare VAR_TEMP_3, 1
goto_if eq, EventScript_1C5146
goto_if_eq EventScript_1C5146
setvar VAR_TEMP_3, 0
EventScript_1C5146:
copyvar VAR_0x8006, VAR_TEMP_3
@@ -378,7 +378,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
setvar VAR_0x8004, 16
special sub_815D9E8
compare VAR_RESULT, 0
goto_if ne, EventScript_1C5528
goto_if_ne EventScript_1C5528
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 2, Movement_ExclamationMark
@@ -398,7 +398,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
setvar VAR_0x8004, 16
special sub_815D9E8
compare VAR_RESULT, 0
goto_if ne, EventScript_1C5528
goto_if_ne EventScript_1C5528
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 5, Movement_ExclamationMark
data/scripts/trainers.inc
+702 -702
View File
File diff suppressed because it is too large Load Diff