dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into document-gyms2

Browse Source
This commit is contained in:
GriffinR
2019-10-16 04:22:34 -04:00
committed by GitHub
parent 20fa13616f 60a592a2c3
commit b4a9298205
361 changed files with 10599 additions and 11080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/scripts/apprentice.inc
View File

@@ -74,7 +74,7 @@ Script_Apprentice_FirstMeetingNag:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -117,7 +117,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -163,7 +163,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -235,7 +235,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -261,7 +261,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6D5C:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end
@@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
release
releaseall
switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight
case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave
end

38
data/scripts/battle_pike.inc
View File

@@ -3,9 +3,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25
setvar VAR_0x8004, 4
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS
special CallBattlePikeFunction
setvar VAR_0x8004, 5
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_0x8004, 5
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
compare VAR_RESULT, 3
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35
@@ -92,11 +92,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
setvar VAR_0x8004, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -108,9 +108,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
special CallBattlePikeFunction
setvar VAR_0x8004, 5
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030
@@ -167,17 +167,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8004, 25
setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136
setvar VAR_0x8004, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
@@ -200,14 +200,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128
setvar VAR_0x8004, 24
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 1
special CallBattlePikeFunction
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136
setvar VAR_0x8004, 24
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 0
special CallBattlePikeFunction
return
@@ -229,19 +229,19 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C
return
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8004, 7
setvar VAR_0x8004,BATTLE_PIKE_FUNC_7
special CallBattlePikeFunction
setvar VAR_0x8004, 25
setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136
setvar VAR_0x8004, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -253,7 +253,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144
@@ -275,7 +275,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D
closemessage
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4

1752
data/scripts/cable_club.inc
View File

File diff suppressed because it is too large Load Diff

22
data/scripts/cave_hole.inc
View File

@@ -1,23 +1,15 @@
GraniteCave_B1F_MapScript2_2A8327: @ 82A8327
MirageTower_2F_MapScript2_2A8327: @ 82A8327
MirageTower_3F_MapScript2_2A8327: @ 82A8327
MtPyre_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_2F_MapScript2_2A8327: @ 82A8327
SkyPillar_4F_MapScript2_2A8327: @ 82A8327
CaveHole_CheckFallDownHole: @ 82A8327
map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0
GraniteCave_B1F_MapScript1_2A8331: @ 82A8331
MirageTower_2F_MapScript1_2A8331: @ 82A8331
MirageTower_3F_MapScript1_2A8331: @ 82A8331
MtPyre_2F_MapScript1_2A8331: @ 82A8331
copyvar VAR_ICE_STEP_COUNT, 0x1
CaveHole_FixCrackedGround: @ 82A8331
copyvar VAR_ICE_STEP_COUNT, 1
end
EventScript_FallDownHole:: @ 82A8337
lockall
delay 20
applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369
applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -25,10 +17,10 @@ EventScript_FallDownHole:: @ 82A8337
waitstate
end
gUnknown_082A8350:: @ 82A8350
EventScript_FallDownHoleMtPyre:: @ 82A8350
lockall
delay 20
applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369
applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -36,6 +28,6 @@ gUnknown_082A8350:: @ 82A8350
waitstate
end
GraniteCave_B1F_Movement_2A8369: @ 82A8369
Movement_SetInvisible: @ 82A8369
set_invisible
step_end

2
data/scripts/cave_of_origin.inc
View File

@@ -45,4 +45,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_4, 1
setvar VAR_TEMP_5, 1
return
return

24
data/scripts/elite_four.inc
View File

@@ -1,9 +1,5 @@
EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -21,11 +17,8 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
special DrawWholeMapView
return
EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475
EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -37,10 +30,8 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
special DrawWholeMapView
return
EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC
EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -61,10 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
return
EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F
EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1

12
data/scripts/field_move_scripts.inc
View File

@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
checkpartymove MOVE_CUT
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
EventScript_UseWaterfall:: @ 8290A49
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
EventScript_UseDive:: @ 8290B0F
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
EventScript_UseDiveUnderwater:: @ 8290B5A
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, 6
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT

38
data/scripts/field_poison.inc
View File

@@ -1,51 +1,51 @@
EventScript_Poison:: @ 82736BC
EventScript_FieldPoison:: @ 82736BC
lockall
special ExecuteWhiteOut
special TryFieldPoisonWhiteOut
waitstate
compare VAR_RESULT, 1
goto_if_eq EventScript_2736D9
compare VAR_RESULT, 2
goto_if_eq EventScript_2736F8
compare VAR_RESULT, FLDPSN_WHITEOUT
goto_if_eq EventScript_FieldWhiteOut
compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT
goto_if_eq EventScript_FrontierFieldWhiteOut
releaseall
end
EventScript_2736D9:: @ 82736D9
EventScript_FieldWhiteOut:: @ 82736D9
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
special sub_80B05B4
special Script_FadeOutMapMusic
waitstate
fadescreen 1
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4
special sp0C8_whiteout_maybe
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut
waitstate
end
EventScript_2736F4:: @ 82736F4
EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
return
EventScript_2736F8:: @ 82736F8
EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
setvar VAR_0x8004, 16
setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
special CallBattlePikeFunction
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
setvar VAR_0x8004, 12
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
setvar VAR_0x8004, TRAINER_HILL_FUNC_10
setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
special CallTrainerHillFunction
compare VAR_RESULT, 1
goto_if_eq TrainerHill_1F_EventScript_2C83C9
special sub_80B05B4
goto_if_eq TrainerHill_1F_EventScript_Lost
special Script_FadeOutMapMusic
waitstate
fadescreen 1
special sp0C8_whiteout_maybe
special SetCB2WhiteOut
waitstate
end

16
data/scripts/gabby_and_ty.inc
View File

@@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36
Route111_EventScript_28CF56:: @ 828CF56
special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_28CF94
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq Route111_EventScript_28CF9F
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_28CFB1
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
msgbox Route111_Text_28B042, MSGBOX_YESNO
@@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94
Route111_EventScript_28CF9F:: @ 828CF9F
applymovement VAR_0x8004, Route111_Movement_28D04F
applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
Route111_EventScript_28CFB1:: @ 828CFB1
applymovement VAR_0x8004, Route111_Movement_28D051
applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -247,11 +247,11 @@ Route118_EventScript_28CFC3:: @ 828CFC3
Route120_EventScript_28CFC3:: @ 828CFC3
special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_28CF94
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq Route111_EventScript_28CF9F
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_28CFB1
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
specialvar VAR_RESULT, GabbyAndTyGetLastQuote

57
data/scripts/kecleon.inc
View File

@@ -1,74 +1,73 @@
Route120_EventScript_2722DB:: @ 82722DB
Route120_EventScript_Kecleon1:: @ 82722DB
lock
faceplayer
setvar VAR_0x8009, 1
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_2722E8:: @ 82722E8
Route120_EventScript_Kecleon2:: @ 82722E8
lock
faceplayer
setvar VAR_0x8009, 2
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_2722F5:: @ 82722F5
Route120_EventScript_Kecleon3:: @ 82722F5
lock
faceplayer
setvar VAR_0x8009, 3
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_272302:: @ 8272302
Route120_EventScript_Kecleon4:: @ 8272302
lock
faceplayer
setvar VAR_0x8009, 4
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_27230F:: @ 827230F
Route120_EventScript_Kecleon5:: @ 827230F
lock
faceplayer
setvar VAR_0x8009, 5
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_27231C:: @ 827231C
Route119_EventScript_Kecleon1:: @ 827231C
lock
faceplayer
setvar VAR_0x8009, 6
goto Route119_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_272329:: @ 8272329
Route119_EventScript_Kecleon2:: @ 8272329
lock
faceplayer
setvar VAR_0x8009, 7
goto Route119_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_272336:: @ 8272336
Route120_EventScript_272336:: @ 8272336
EventScript_Kecleon:: @ 8272336
checkitem ITEM_DEVON_SCOPE, 1
compare VAR_RESULT, 1
goto_if_eq Route119_EventScript_272350
msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT
goto_if_eq EventScript_AskUseDevonScope
msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT
release
end
Route119_EventScript_272350:: @ 8272350
msgbox Route119_Text_1F5D23, MSGBOX_YESNO
EventScript_AskUseDevonScope:: @ 8272350
msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq Route119_EventScript_272365
goto_if_eq EventScript_BattleKecleon
release
end
Route119_EventScript_272365:: @ 8272365
msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT
EventScript_BattleKecleon:: @ 8272365
msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
applymovement VAR_LAST_TALKED, Route119_Movement_2723C7
applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2
@@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_RemoveKecleon
compare VAR_RESULT, 4
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_RemoveKecleon
compare VAR_RESULT, 5
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_RemoveKecleon
release
end
@@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1
goto Common_EventScript_RemoveStaticPokemon
end
FortreeCity_Movement_2723C7: @ 82723C7
Route119_Movement_2723C7: @ 82723C7
Route120_Movement_2723C7: @ 82723C7
Movement_KecleonAppears: @ 82723C7
set_visible
delay_4
set_invisible

39
data/scripts/mevent.inc
View File

@@ -1,27 +1,26 @@
EventScript_Questionnaire:: @ 827381B
lockall
msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO
msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_2738FD
goto_if_eq Mevent_EventScript_Release
setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, GetMartEmployeeObjectEventId
compare VAR_0x8004, 1
goto_if_eq EventScript_27386D
goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase
compare VAR_0x8004, 2
goto_if_eq EventScript_2738B5
goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase
compare VAR_RESULT, 0
goto_if_eq EventScript_2738FD
goto_if_eq Mevent_EventScript_Release
compare VAR_RESULT, 1
goto_if_eq EventScript_2738FF
goto_if_eq Mevent_EventScript_QuestionnaireThankYou
end
EventScript_27386D:: @ 827386D
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF
Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
@@ -29,15 +28,15 @@ EventScript_27386D:: @ 827386D
waitmovement 0
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
msgbox gUnknown_08273506, MSGBOX_DEFAULT
msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT
setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
msgbox gUnknown_08273559, MSGBOX_DEFAULT
msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT
releaseall
end
EventScript_2738B5:: @ 82738B5
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF
Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
@@ -45,19 +44,19 @@ EventScript_2738B5:: @ 82738B5
waitmovement 0
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
msgbox gUnknown_08273446, MSGBOX_DEFAULT
msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT
setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
msgbox gUnknown_082734CC, MSGBOX_DEFAULT
msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT
releaseall
end
EventScript_2738FD:: @ 82738FD
Mevent_EventScript_Release:: @ 82738FD
releaseall
end
EventScript_2738FF:: @ 82738FF
Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT
msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT
releaseall
end

317
data/scripts/move_tutors.inc
View File

@@ -1,309 +1,300 @@
SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16
SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74
msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
call SlateportCity_PokemonFanClub_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT
setvar VAR_0x8005, 23
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
goto_if_eq MoveTutor_EventScript_SwaggerDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
goto SlateportCity_PokemonFanClub_EventScript_2C7F74
goto MoveTutor_EventScript_SwaggerTaught
end
SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A
msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT
MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A
msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74
msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT
MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74
msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E
MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC
msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_EventScript_2C7FD2
call MauvilleCity_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_RolloutDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_EventScript_2C7FD2
msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT
setvar VAR_0x8005, 16
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_RolloutDeclined
msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_EventScript_2C7FD2
goto_if_eq MoveTutor_EventScript_RolloutDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
goto MauvilleCity_EventScript_2C7FDC
goto MoveTutor_EventScript_RolloutTaught
end
MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2
msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT
MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2
msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC
msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT
MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC
msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT
release
end
VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6
VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044
msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT
setvar VAR_0x8005, 29
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044
goto MoveTutor_EventScript_FuryCutterTaught
end
VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A
msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT
MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A
msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT
release
end
VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044
msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT
MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044
msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT
release
end
LavaridgeTown_House_EventScript_2C804E:: @ 82C804E
LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC
msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
msgbox MoveTutor_MimicTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_House_EventScript_2C80A2
call LavaridgeTown_House_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_MimicDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_House_EventScript_2C80A2
msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT
setvar VAR_0x8005, 7
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_MimicDeclined
msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_MIMIC
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_House_EventScript_2C80A2
goto_if_eq MoveTutor_EventScript_MimicDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
goto LavaridgeTown_House_EventScript_2C80AC
goto MoveTutor_EventScript_MimicTaught
end
LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2
msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT
MoveTutor_EventScript_MimicDeclined:: @ 82C80A2
msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT
release
end
LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC
msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT
MoveTutor_EventScript_MimicTaught:: @ 82C80AC
msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT
release
end
FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6
FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114
msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq FallarborTown_Mart_EventScript_2C810A
call FallarborTown_Mart_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq FallarborTown_Mart_EventScript_2C810A
msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT
setvar VAR_0x8005, 8
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_METRONOME
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq FallarborTown_Mart_EventScript_2C810A
goto_if_eq MoveTutor_EventScript_MetronomeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
goto FallarborTown_Mart_EventScript_2C8114
goto MoveTutor_EventScript_MetronomeTaught
end
FallarborTown_Mart_EventScript_2C810A:: @ 82C810A
msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT
MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A
msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT
release
end
FallarborTown_Mart_EventScript_2C8114:: @ 82C8114
msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT
MoveTutor_EventScript_MetronomeTaught:: @ 82C8114
msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT
release
end
FortreeCity_House2_EventScript_2C811E:: @ 82C811E
FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C
msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House2_EventScript_2C8172
call FortreeCity_House2_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House2_EventScript_2C8172
msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT
setvar VAR_0x8005, 24
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House2_EventScript_2C8172
goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
goto FortreeCity_House2_EventScript_2C817C
goto MoveTutor_EventScript_SleepTalkTaught
end
FortreeCity_House2_EventScript_2C8172:: @ 82C8172
msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT
MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172
msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT
release
end
FortreeCity_House2_EventScript_2C817C:: @ 82C817C
msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT
MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C
msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT
release
end
LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186
LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT
setvar VAR_0x8005, 14
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
goto_if_eq MoveTutor_EventScript_SubstituteDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4
goto MoveTutor_EventScript_SubstituteTaught
end
LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT
MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA
msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT
release
end
LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT
MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4
msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT
release
end
MossdeepCity_EventScript_2C81EE:: @ 82C81EE
MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C
msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_EventScript_2C8242
call MossdeepCity_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_EventScript_2C8242
msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT
setvar VAR_0x8005, 15
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_EventScript_2C8242
goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
goto MossdeepCity_EventScript_2C824C
goto MoveTutor_EventScript_DynamicPunchTaught
end
MossdeepCity_EventScript_2C8242:: @ 82C8242
msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT
MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242
msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT
release
end
MossdeepCity_EventScript_2C824C:: @ 82C824C
msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT
MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C
msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT
release
end
SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256
SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4
msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
call SootopolisCity_PokemonCenter_1F_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT
setvar VAR_0x8005, 4
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4
goto MoveTutor_EventScript_DoubleEdgeTaught
end
SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA
msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT
MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA
msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT
release
end
SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4
msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT
MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4
msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT
release
end
PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE
PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
lock
faceplayer
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C
msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO
goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT
setvar VAR_0x8005, 12
call EventScript_ShowPartyMenu
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
goto_if_eq MoveTutor_EventScript_ExplosionDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION
goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C
goto MoveTutor_EventScript_ExplosionTaught
end
PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312
msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT
MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312
msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT
release
end
PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C
msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT
MoveTutor_EventScript_ExplosionTaught:: @ 82C831C
msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT
release
end
EventScript_ShowPartyMenu:: @ 82C8326
special sub_81B892C
MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326
special OpenPartyMenuForMoveTutor
waitstate
lock
faceplayer
return
FallarborTown_Mart_EventScript_2C832D:: @ 82C832D
FortreeCity_House2_EventScript_2C832D:: @ 82C832D
LavaridgeTown_House_EventScript_2C832D:: @ 82C832D
LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D
MauvilleCity_EventScript_2C832D:: @ 82C832D
MossdeepCity_EventScript_2C832D:: @ 82C832D
PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D
SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO
MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D
msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
return

33
data/scripts/movement.inc
View File

@@ -1,4 +1,4 @@
SlateportCity_Movement_272596: @ 8272596
Common_Movement_QuestionMark: @ 8272596
emote_question_mark
step_end
@@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2
face_original_direction
step_end
Common_Movement_WalkInPlaceLeft: @ 82725A4
Common_Movement_WalkInPlaceFastestLeft: @ 82725A4
walk_in_place_fastest_left
step_end
Common_Movement_WalkInPlaceUp: @ 82725A6
Common_Movement_WalkInPlaceFastestUp: @ 82725A6
walk_in_place_fastest_up
step_end
Common_Movement_WalkInPlaceRight: @ 82725A8
Common_Movement_WalkInPlaceFastestRight: @ 82725A8
walk_in_place_fastest_right
step_end
Common_Movement_WalkInPlaceDown: @ 82725AA
Common_Movement_WalkInPlaceFastestDown: @ 82725AA
walk_in_place_fastest_down
step_end
RustboroCity_Movement_2725AC: @ 82725AC
Common_Movement_FaceRight: @ 82725AC
face_right
step_end
RustboroCity_Movement_2725AE: @ 82725AE
Common_Movement_FaceLeft: @ 82725AE
face_left
step_end
@@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2
face_up
step_end
BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
Common_Movement_WalkInPlaceDown: @ 82725B4
walk_in_place_down
step_end
BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
Common_Movement_WalkInPlaceLeft: @ 82725B6
walk_in_place_left
step_end
Route121_Movement_2725B8: @ 82725B8
Common_Movement_WalkInPlaceRight: @ 82725B8
walk_in_place_right
step_end
EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
Common_Movement_WalkUp6: @ 82725BA
walk_up
walk_up
walk_up
@@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
walk_up
step_end
EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
Common_Movement_WalkUp4: @ 82725C1
walk_up
walk_up
walk_up
walk_up
step_end
EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
Common_Movement_Delay32: @ 82725C6
delay_16
delay_16
step_end
Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
Common_Movement_WalkUp: @ 82725C9
walk_up
step_end
Movement_2725CB:: @ 82725CB
@ Unused
Common_Movement_WalkUp2:: @ 82725CB
walk_up
walk_up
step_end

42
data/scripts/pc.inc
View File

@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT
goto EventScript_271DAC
goto EventScript_PCMainMenu
end
EventScript_271DAC:: @ 8271DAC
EventScript_PCMainMenu:: @ 8271DAC
message gText_WhichPCShouldBeAccessed
waitmessage
special ScriptMenu_CreatePCMultichoice
waitstate
goto EventScript_271DBC
goto EventScript_AccessPC
end
EventScript_271DBC:: @ 8271DBC
EventScript_AccessPC:: @ 8271DBC
switch VAR_RESULT
case 0, EventScript_271E0E
case 1, EventScript_271DF9
case 2, EventScript_271E54
case 3, EventScript_271E47
case MULTI_B_PRESSED, EventScript_271E47
case 0, EventScript_AccessPokemonStorage
case 1, EventScript_AccessPlayersPC
case 2, EventScript_AccessHallOfFame
case 3, EventScript_TurnOffPC
case MULTI_B_PRESSED, EventScript_TurnOffPC
end
EventScript_271DF9:: @ 8271DF9
EventScript_AccessPlayersPC:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
goto EventScript_271DAC
goto EventScript_PCMainMenu
end
EventScript_271E0E:: @ 8271E0E
EventScript_AccessPokemonStorage:: @ 8271E0E
playse SE_PC_LOGIN
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
goto EventScript_271DAC
goto EventScript_PCMainMenu
end
EventScript_271E35:: @ 8271E35
EventScript_AccessSomeonesPC:: @ 8271E35
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return
EventScript_271E3E:: @ 8271E3E
EventScript_AccessLanettesPC:: @ 8271E3E
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return
EventScript_271E47:: @ 8271E47
EventScript_TurnOffPC:: @ 8271E47
setvar VAR_0x8004, 0
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall
end
EventScript_271E54:: @ 8271E54
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47
EventScript_AccessHallOfFame:: @ 8271E54
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
special AccessHallOfFamePC
waitstate
goto EventScript_271DBC
goto EventScript_AccessPC
end

4
data/scripts/pkmn_center_nurse.inc
View File

@@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D
return
EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993
applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft
applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown
applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
special HealPlayerParty
return

34
data/scripts/players_house.inc
View File

@@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
waitmovement 0
releaseall
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
end
LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
@@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
end
LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29296C
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
@@ -586,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -624,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return

10
data/scripts/pokeblocks.inc
View File

@@ -667,13 +667,13 @@ EventScript_PblocLink_NoPokeblock: @ 829416C
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT
msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
releaseall
end
@@ -685,7 +685,7 @@ EventScript_PblocLink_CloseLink: @ 8294190
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
releaseall
end
@@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D
end
EventScript_PblocLink_BecomeLeader: @ 8294285
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
EventScript_PblocLink_JoinGroup: @ 829428A
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return

61
data/scripts/prof_birch.inc
View File

@@ -1,94 +1,89 @@
LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
Route101_EventScript_2720AD:: @ 82720AD
Route103_EventScript_2720AD:: @ 82720AD
ProfBirch_EventScript_UpdateLocation:: @ 82720AD
compare VAR_PETALBURG_GYM_STATE, 0
goto_if_eq Common_EventScript_NopReturn
goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 0
call_if_eq Route101_EventScript_27211A
call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 1
call_if_eq Route101_EventScript_27211A
call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 2
call_if_eq Route101_EventScript_272127
call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 3
call_if_eq Route101_EventScript_272127
call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 4
call_if_eq Route101_EventScript_272134
call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 5
call_if_eq Route101_EventScript_272134
call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 6
call_if_eq Route101_EventScript_27211A
call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 7
call_if_eq Route101_EventScript_27211A
call_if_eq ProfBirch_EventScript_MoveToLab
return
Route101_EventScript_27211A:: @ 827211A
ProfBirch_EventScript_MoveToLab:: @ 827211A
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
Route101_EventScript_272127:: @ 8272127
ProfBirch_EventScript_MoveToRoute101:: @ 8272127
clearflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
Route101_EventScript_272134:: @ 8272134
ProfBirch_EventScript_MoveToRoute103:: @ 8272134
clearflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
return
LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
Route101_EventScript_272141:: @ 8272141
Route103_EventScript_272141:: @ 8272141
ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
lock
faceplayer
goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155
goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2
goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
Route101_EventScript_272155:: @ 8272155
ProfBirch_EventScript_AskRatePokedex:: @ 8272155
msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route101_EventScript_27216F
call Route101_EventScript_272184
goto_if_eq ProfBirch_EventScript_DeclineRating
call ProfBirch_EventScript_RatePokedex
release
end
Route101_EventScript_27216F:: @ 827216F
ProfBirch_EventScript_DeclineRating:: @ 827216F
msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
release
end
Route101_EventScript_272179:: @ 8272179
ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
copyvar VAR_0x8004, VAR_0x8009
special ShowPokedexRatingMessage
waitmessage
waitbuttonpress
return
EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
Route101_EventScript_272184:: @ 8272184
ProfBirch_EventScript_RatePokedex:: @ 8272184
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
buffernumberstring 0, VAR_0x8008
buffernumberstring 1, VAR_0x8009
buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen
buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught
msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
call Route101_EventScript_272179
call ProfBirch_EventScript_ShowRatingMessage
compare VAR_0x800A, 0
goto_if_eq Common_EventScript_NopReturn
goto_if_eq Common_EventScript_NopReturn @ National dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
buffernumberstring 0, VAR_0x8008
buffernumberstring 1, VAR_0x8009
buffernumberstring 0, VAR_0x8008 @ Num National seen
buffernumberstring 1, VAR_0x8009 @ Num National caught
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return

49
data/scripts/roulette.inc
View File

@@ -1,70 +1,71 @@
MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1
Roulette_EventScript_Table1:: @ 82A5AB1
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_210456
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
getpricereduction 2
getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
goto MauvilleCity_GameCorner_EventScript_2A5B0D
goto Roulette_EventScript_Play
end
MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF
Roulette_EventScript_Table2:: @ 82A5ADF
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_210456
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
getpricereduction 2
getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
goto MauvilleCity_GameCorner_EventScript_2A5B0D
goto Roulette_EventScript_Play
end
MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
Roulette_EventScript_Play:: @ 82A5B0D
special PlayRoulette
waitstate
end
gUnknown_082A5B12:: @ 82A5B12
Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12
.string "The minimum wager at this table\n"
.string "is {STR_VAR_1}. Do you want to play?$"
gUnknown_082A5B4E:: @ 82A5B4E
Roulette_Text_NotEnoughCoins:: @ 82A5B4E
.string "You don't have enough COINS.$"
gUnknown_082A5B6B:: @ 82A5B6B
Roulette_Text_SpecialRateTable:: @ 82A5B6B
.string "Special rate table right now!$"
gUnknown_082A5B89:: @ 82A5B89
Roulette_Text_ControlsInstruction:: @ 82A5B89
.string "Place your wager with the + Control\n"
.string "Pad, then press the A Button.$"
gUnknown_082A5BCB:: @ 82A5BCB
Roulette_Text_ItsAHit:: @ 82A5BCB
.string "It's a hit!$"
gUnknown_082A5BD7:: @ 82A5BD7
Roulette_Text_Jackpot:: @ 82A5BD7
.string "Jackpot!$"
gUnknown_082A5BE0:: @ 82A5BE0
Roulette_Text_NothingDoing:: @ 82A5BE0
.string "Nothing doing!$"
gUnknown_082A5BEF:: @ 82A5BEF
Roulette_Text_YouveWonXCoins:: @ 82A5BEF
.string "You've won {STR_VAR_1} COINS!$"
gUnknown_082A5C04:: @ 82A5C04
Roulette_Text_NoCoinsLeft:: @ 82A5C04
.string "No COINS left…$"
gUnknown_082A5C13:: @ 82A5C13
Roulette_Text_KeepPlaying:: @ 82A5C13
.string "Keep playing?$"
gUnknown_082A5C21:: @ 82A5C21
Roulette_Text_BoardWillBeCleared:: @ 82A5C21
.string "The ROULETTE board will be cleared.$"
gUnknown_082A5C45:: @ 82A5C45
@ Unused
Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45
.string "You don't have a COIN CASE.$"
gUnknown_082A5C61:: @ 82A5C61
Roulette_Text_CoinCaseIsFull:: @ 82A5C61
.string "Your COIN CASE is full!\n"
.string "Coins can be exchanged for prizes.$"

6
data/scripts/secret_power_tm.inc
View File

@@ -51,11 +51,11 @@ Route111_EventScript_27661E:: @ 827661E
closemessage
setflag FLAG_RECEIVED_SECRET_POWER
clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq Route111_EventScript_27666A
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_27666A
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_276675
removeobject VAR_LAST_TALKED
release

8
data/scripts/trainer_hill.inc
View File

@@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, B_OUTCOME_LOST
goto_if_eq TrainerHill_1F_EventScript_2C83C9
goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_DREW
goto_if_eq TrainerHill_1F_EventScript_2C83C9
goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_FORFEITED
goto_if_eq TrainerHill_1F_EventScript_2C83C9
goto_if_eq TrainerHill_1F_EventScript_Lost
end
TrainerHill_1F_MapScript2_2C8372: @ 82C8372
@@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
waitstate
end
TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
TrainerHill_1F_EventScript_Lost:: @ 82C83C9
setvar VAR_0x8004, TRAINER_HILL_FUNC_12
special CallTrainerHillFunction
setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST

9
data/scripts/unusual_weather.inc
View File

@@ -158,14 +158,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 43, 22, METATILE_General_RoughWater, 0
return
Route105_EventScript_273D13:: @ 8273D13
Route114_EventScript_273D13:: @ 8273D13
Route115_EventScript_273D13:: @ 8273D13
Route116_EventScript_273D13:: @ 8273D13
Route118_EventScript_273D13:: @ 8273D13
Route125_EventScript_273D13:: @ 8273D13
Route127_EventScript_273D13:: @ 8273D13
Route129_EventScript_273D13:: @ 8273D13
UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13
setflag FLAG_HIDE_MAP_NAME_POPUP
return