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

Sync Birth Island / Navel Rock scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-10 15:18:53 -05:00
parent 91bf7665c6
commit 388c40575d
33 changed files with 151 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+2 -2
View File
@@ -1555,7 +1555,7 @@ gUnknown_81A77A0:: @ 81A77A0
msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN
end
EventScript_1A77A9:: @ 81A77A9
EventScript_Return:: @ 81A77A9
return
EventScript_1A77AA:: @ 81A77AA
@@ -1941,7 +1941,7 @@ EventScript_1A8EC0:: @ 81A8EC0
.include "data/scripts/static_pokemon.inc"
EventScript_1A925E:: @ 81A925E
goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_1A77A9
goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
setweather 11
doweather
return
data/maps/BirthIsland_Exterior/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "BirthIsland_Exterior_EventScript_165271",
"script": "BirthIsland_Exterior_EventScript_Triangle",
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
},
{
data/maps/BirthIsland_Exterior/scripts.inc
+27 -27
View File
@@ -13,61 +13,61 @@ BirthIsland_Exterior_OnTransition:: @ 8165217
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
setvar VAR_DEOXYS_INTERACTION_NUM, 0
call_if_set FLAG_FOUGHT_DEOXYS, EventScript_16523C
call_if_unset FLAG_FOUGHT_DEOXYS, EventScript_165243
call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle
call_if_unset FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle
end
EventScript_16523C:: @ 816523C
BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 816523C
setflag FLAG_HIDE_DEOXYS
setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
return
EventScript_165243:: @ 8165243
goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_1A77A9
BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8165243
goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_Return
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_SYS_DEOXYS_AWAKENED
return
BirthIsland_Exterior_OnResume:: @ 8165253
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_16525D
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys
end
EventScript_16525D:: @ 816525D
BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject 2
return
BirthIsland_Exterior_EventScript_165271:: @ 8165271
BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
lock
faceplayer
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
special sub_8112364
special Special_DeoxysSound
special DoDeoxysRockInteraction
waitstate
switch VAR_RESULT
case 0, EventScript_1652BA
case 1, EventScript_1652BC
case 2, EventScript_1652C0
case 3, EventScript_1652BE
case 0, BirthIsland_Exterior_EventScript_NotSolved1
case 1, BirthIsland_Exterior_EventScript_NotSolved2
case 2, BirthIsland_Exterior_EventScript_Deoxys
case 3, BirthIsland_Exterior_EventScript_NotSolved3
end
EventScript_1652BA:: @ 81652BA
BirthIsland_Exterior_EventScript_NotSolved1:: @ 81652BA
release
end
EventScript_1652BC:: @ 81652BC
BirthIsland_Exterior_EventScript_NotSolved2:: @ 81652BC
release
end
EventScript_1652BE:: @ 81652BE
BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE
release
end
EventScript_1652C0:: @ 81652C0
BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
addobject 2
waitse
setfieldeffectarg 0, 1
@@ -76,7 +76,7 @@ EventScript_1652C0:: @ 81652C0
dofieldeffect 68
playbgm MUS_DEOEYE, 0
waitfieldeffect 68
applymovement 2, Movement_165353
applymovement 2, Movement_DeoxysApproach
waitmovement 0
waitse
playmoncry SPECIES_DEOXYS, 2
@@ -84,8 +84,8 @@ EventScript_1652C0:: @ 81652C0
waitmoncry
setvar VAR_LAST_TALKED, 2
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
setvar VAR_0x8005, 30 @ Level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
@@ -93,27 +93,27 @@ EventScript_1652C0:: @ 81652C0
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16533A
goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_165348
goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_165348
goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
setflag FLAG_FOUGHT_DEOXYS
release
end
EventScript_16533A:: @ 816533A
BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 816533A
setflag FLAG_DEOXYS_FLEW_AWAY
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_MonFlewAway
end
EventScript_165348:: @ 8165348
BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_MonFlewAway
end
Movement_165353:: @ 8165353
Movement_DeoxysApproach: @ 8165353
walk_slowest_down
walk_slowest_down
walk_slowest_down
data/maps/BirthIsland_Harbor/map.json
+1 -1
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "BirthIsland_Harbor_EventScript_1653E7",
"script": "BirthIsland_Harbor_EventScript_Sailor",
"flag": "0"
}
],
data/maps/BirthIsland_Harbor/scripts.inc
+5 -5
View File
@@ -1,15 +1,15 @@
BirthIsland_Harbor_MapScripts:: @ 81653E6
.byte 0
BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
BirthIsland_Harbor_EventScript_Sailor:: @ 81653E7
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE
switch VAR_RESULT
case 0, EventScript_1A91D5
case 1, EventScript_1A90F6
case 127, EventScript_1A90F6
case 0, EventScript_SailToVermilionCity
case 1, EventScript_CancelSail
case 127, EventScript_CancelSail
end
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
data/maps/FiveIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42
FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
goto EventScript_1A900F
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -139,7 +139,7 @@ EventScript_1640A2:: @ 81640A2
EventScript_16412E:: @ 816412E
compare VAR_0x8004, 27
goto_if_eq EventScript_1A77A9
goto_if_eq EventScript_Return
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
data/maps/FourIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FourIsland_Harbor_MapScripts:: @ 8171C98
FourIsland_Harbor_EventScript_171C99:: @ 8171C99
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
goto EventScript_1A900F
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+2 -2
View File
@@ -154,10 +154,10 @@ EventScript_16D457:: @ 816D457
EventScript_16D462:: @ 816D462
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare VAR_RESULT, 1
goto_if_eq EventScript_1A77A9
goto_if_eq EventScript_Return
msgbox gUnknown_81BFEAC
goto EventScript_16D49A
end
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
end
EventScript_16EA79:: @ 816EA79
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1A77A9
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
setobjectxyperm 4, 4, 2
return
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ MtEmber_Summit_OnResume:: @ 8163B07
EventScript_163B11:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
data/maps/NavelRock_Base/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "NavelRock_Base_EventScript_165134",
"script": "NavelRock_Base_EventScript_Lugia",
"flag": "FLAG_HIDE_LUGIA"
}
],
data/maps/NavelRock_Base/scripts.inc
+24 -24
View File
@@ -4,31 +4,31 @@ NavelRock_Base_MapScripts:: @ 81650E7
.byte 0
NavelRock_Base_OnTransition:: @ 81650F2
call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105
call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109
call_if_set FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_HideLugia
call_if_unset FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_TryShowLugia
end
EventScript_165105:: @ 8165105
NavelRock_Base_EventScript_HideLugia:: @ 8165105
setflag FLAG_HIDE_LUGIA
return
EventScript_165109:: @ 8165109
goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9
NavelRock_Base_EventScript_TryShowLugia:: @ 8165109
goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_Return
clearflag FLAG_HIDE_LUGIA
return
NavelRock_Base_OnResume:: @ 8165116
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Base_EventScript_TryRemoveLugia
end
EventScript_165120:: @ 8165120
NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject 1
return
NavelRock_Base_EventScript_165134:: @ 8165134
NavelRock_Base_EventScript_Lugia:: @ 8165134
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
@@ -38,17 +38,17 @@ NavelRock_Base_EventScript_165134:: @ 8165134
waitse
delay 20
playse SE_T_AME_E
setvar VAR_0x8004, 0
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
setvar VAR_0x8004, 0 @ Vertical pan
setvar VAR_0x8005, 3 @ Horizontal pan
setvar VAR_0x8006, 4 @ Num shakes
setvar VAR_0x8007, 2 @ Shake delay
special Special_ShakeScreen
delay 30
playse SE_T_AME_E
setvar VAR_0x8004, 0
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
setvar VAR_0x8004, 0 @ Vertical pan
setvar VAR_0x8005, 3 @ Horizontal pan
setvar VAR_0x8006, 4 @ Num shakes
setvar VAR_0x8007, 2 @ Shake delay
special Special_ShakeScreen
delay 30
delay 50
@@ -57,8 +57,8 @@ NavelRock_Base_EventScript_165134:: @ 8165134
waitmoncry
delay 20
setvar VAR_0x8004, SPECIES_LUGIA
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
setvar VAR_0x8005, 70 @ Level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
@@ -66,22 +66,22 @@ NavelRock_Base_EventScript_165134:: @ 8165134
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_1651D9
goto_if_eq NavelRock_Base_EventScript_DefeatedLugia
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_1651E7
goto_if_eq NavelRock_Base_EventScript_RanFromLugia
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_1651E7
goto_if_eq NavelRock_Base_EventScript_RanFromLugia
setflag FLAG_FOUGHT_LUGIA
release
end
EventScript_1651D9:: @ 81651D9
NavelRock_Base_EventScript_DefeatedLugia:: @ 81651D9
setflag FLAG_LUGIA_FLEW_AWAY
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_MonFlewAway
end
EventScript_1651E7:: @ 81651E7
NavelRock_Base_EventScript_RanFromLugia:: @ 81651E7
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_MonFlewAway
end
data/maps/NavelRock_Harbor/map.json
+1 -1
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "NavelRock_Harbor_EventScript_165421",
"script": "NavelRock_Harbor_EventScript_Sailor",
"flag": "0"
}
],
data/maps/NavelRock_Harbor/scripts.inc
+5 -6
View File
@@ -1,16 +1,15 @@
NavelRock_Harbor_MapScripts:: @ 8165420
.byte 0
NavelRock_Harbor_EventScript_165421:: @ 8165421
NavelRock_Harbor_EventScript_Sailor:: @ 8165421
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK
multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE
switch VAR_RESULT
case 0, EventScript_1A91D5
case 1, EventScript_1A90F6
case 127, EventScript_1A90F6
case 0, EventScript_SailToVermilionCity
case 1, EventScript_CancelSail
case 127, EventScript_CancelSail
end
data/maps/NavelRock_Summit/map.json
+1 -1
View File
@@ -44,7 +44,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "NavelRock_Summit_EventScript_164FFB"
"script": "NavelRock_Summit_EventScript_HoOh"
}
],
"bg_events": [
data/maps/NavelRock_Summit/scripts.inc
+28 -28
View File
@@ -4,34 +4,34 @@ NavelRock_Summit_MapScripts:: @ 8164F9F
.byte 0
NavelRock_Summit_OnTransition:: @ 8164FAA
call_if_set FLAG_FOUGHT_HO_OH, EventScript_164FBD
call_if_unset FLAG_FOUGHT_HO_OH, EventScript_164FC6
call_if_set FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_HideHoOh
call_if_unset FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_TryShowHoOh
end
EventScript_164FBD:: @ 8164FBD
NavelRock_Summit_EventScript_HideHoOh:: @ 8164FBD
setvar VAR_TEMP_1, 1
setflag FLAG_HIDE_HO_OH
return
EventScript_164FC6:: @ 8164FC6
NavelRock_Summit_EventScript_TryShowHoOh:: @ 8164FC6
setvar VAR_TEMP_1, 1
goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_1A77A9
goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_Return
setvar VAR_TEMP_1, 0
clearflag FLAG_HIDE_HO_OH
return
NavelRock_Summit_OnResume:: @ 8164FDD
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_164FE7
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Summit_EventScript_TryRemoveHoOh
end
EventScript_164FE7:: @ 8164FE7
NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject 1
return
NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
@@ -39,11 +39,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
lockall
setvar VAR_TEMP_1, 1
special SpawnCameraObject
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special Special_LoopWingFlapSound
applymovement 1, Movement_1650E0
applymovement OBJ_EVENT_ID_CAMERA, Movement_1650CD
applymovement 1, Movement_HoOhAppear
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
waitmovement 0
delay 50
setweather 0
@@ -53,16 +53,16 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
delay 30
waitmoncry
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special Special_LoopWingFlapSound
applymovement OBJ_EVENT_ID_CAMERA, Movement_1650D1
applymovement 1, Movement_1650D7
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
applymovement 1, Movement_HoOhApproach
waitmovement 0
special RemoveCameraObject
setvar VAR_0x8004, SPECIES_HO_OH
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
setvar VAR_0x8005, 70 @ Level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
@@ -71,33 +71,33 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_1650B4
goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_1650C2
goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_1650C2
goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh
setflag FLAG_FOUGHT_HO_OH
releaseall
end
EventScript_1650B4:: @ 81650B4
NavelRock_Summit_EventScript_DefeatedHoOh:: @ 81650B4
setflag FLAG_HO_OH_FLEW_AWAY
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_MonFlewAway
end
EventScript_1650C2:: @ 81650C2
NavelRock_Summit_EventScript_RanFromHoOh:: @ 81650C2
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_MonFlewAway
end
Movement_1650CD:: @ 81650CD
Movement_CameraPanUp: @ 81650CD
walk_up
walk_up
walk_up
step_end
Movement_1650D1:: @ 81650D1
Movement_CameraPanDown: @ 81650D1
delay_16
delay_16
walk_down
@@ -105,7 +105,7 @@ Movement_1650D1:: @ 81650D1
walk_down
step_end
Movement_1650D7:: @ 81650D7
Movement_HoOhApproach: @ 81650D7
walk_down
walk_down
walk_down
@@ -116,7 +116,7 @@ Movement_1650D7:: @ 81650D7
delay_16
step_end
Movement_1650E0:: @ 81650E0
Movement_HoOhAppear: @ 81650E0
delay_16
delay_16
walk_in_place_down
data/maps/OneIsland/text.inc
+1 -1
View File
@@ -19,7 +19,7 @@ gUnknown_818161B:: @ 818161B
.string "…Why am I telling you this now?\n"
.string "Let's just go see CELIO!$"
Text_181726:: @ 8181726
Text_WhereDoYouWantToSail:: @ 8181726
.string "Ahoy, there!\n"
.string "Where do you want to sail?$"
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ Movement_1713B9:: @ 81713B9
OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
goto EventScript_1A8EC5
data/maps/PalletTown/scripts.inc
+2 -2
View File
@@ -13,9 +13,9 @@ PalletTown_OnTransition:: @ 8165465
end
EventScript_165488:: @ 8165488
goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9
goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if_ge EventScript_1A77A9
goto_if_ge EventScript_Return
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
data/maps/PowerPlant/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ PowerPlant_OnResume:: @ 816376F
EventScript_163779:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048
EventScript_163052:: @ 8163052
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_1A77A9
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
data/maps/SevenIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SevenIsland_Harbor_MapScripts:: @ 8170BE4
SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND
goto EventScript_1A900F
data/maps/SixIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SixIsland_Harbor_MapScripts:: @ 8171E47
SixIsland_Harbor_EventScript_171E48:: @ 8171E48
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND
goto EventScript_1A900F
data/maps/ThreeIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9
ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND
goto EventScript_1A900F
data/maps/TwoIsland_Harbor/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ TwoIsland_Harbor_MapScripts:: @ 8171805
TwoIsland_Harbor_EventScript_171806:: @ 8171806
lock
faceplayer
message Text_181726
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND
goto EventScript_1A8F54
data/maps/VermilionCity/scripts.inc
+8 -8
View File
@@ -110,8 +110,8 @@ EventScript_1669FD:: @ 81669FD
switch VAR_RESULT
case 0, EventScript_1A911E
case 1, EventScript_166B0B
case 2, EventScript_1A90F6
case 127, EventScript_1A90F6
case 2, EventScript_CancelSail
case 127, EventScript_CancelSail
end
EventScript_166A53:: @ 8166A53
@@ -127,8 +127,8 @@ EventScript_166A5F:: @ 8166A5F
switch VAR_RESULT
case 0, EventScript_1A911E
case 1, EventScript_166B23
case 2, EventScript_1A90F6
case 127, EventScript_1A90F6
case 2, EventScript_CancelSail
case 127, EventScript_CancelSail
end
EventScript_166AA5:: @ 8166AA5
@@ -146,8 +146,8 @@ EventScript_166AB1:: @ 8166AB1
case 0, EventScript_1A911E
case 1, EventScript_166B0B
case 2, EventScript_166B23
case 3, EventScript_1A90F6
case 127, EventScript_1A90F6
case 3, EventScript_CancelSail
case 127, EventScript_CancelSail
end
EventScript_166B0B:: @ 8166B0B
@@ -173,8 +173,8 @@ EventScript_166B3B:: @ 8166B3B
case 0, EventScript_1A8FEE
case 1, EventScript_1A8FF9
case 2, EventScript_1A9004
case 3, EventScript_1A90F6
case 127, EventScript_1A90F6
case 3, EventScript_CancelSail
case 127, EventScript_CancelSail
end
EventScript_166B88:: @ 8166B88
data/maps/VermilionCity_Gym/scripts.inc
+1 -1
View File
@@ -39,7 +39,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772
end
EventScript_16B778:: @ 816B778
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_1A77A9
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return
special Special_SetVermilionTrashCans
copyvar VAR_TEMP_0, VAR_0x8004
copyvar VAR_TEMP_1, VAR_0x8005
data/maps/ViridianCity/scripts.inc
+6 -6
View File
@@ -31,12 +31,12 @@ EventScript_165920:: @ 8165920
return
EventScript_165931:: @ 8165931
goto_if_unset FLAG_BADGE02_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE03_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE04_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE05_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE06_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE07_GET, EventScript_1A77A9
goto_if_unset FLAG_BADGE02_GET, EventScript_Return
goto_if_unset FLAG_BADGE03_GET, EventScript_Return
goto_if_unset FLAG_BADGE04_GET, EventScript_Return
goto_if_unset FLAG_BADGE05_GET, EventScript_Return
goto_if_unset FLAG_BADGE06_GET, EventScript_Return
goto_if_unset FLAG_BADGE07_GET, EventScript_Return
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
return
data/scripts/seagallop.inc
+17 -17
View File
@@ -7,8 +7,8 @@ EventScript_1A8EC5:: @ 81A8EC5
switch VAR_RESULT
case 0, EventScript_1A8FF9
case 1, EventScript_1A9004
case 2, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A8F12:: @ 81A8F12
@@ -17,8 +17,8 @@ EventScript_1A8F12:: @ 81A8F12
case 0, EventScript_1A8FE3
case 1, EventScript_1A8FF9
case 2, EventScript_1A9004
case 3, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A8F54:: @ 81A8F54
@@ -30,8 +30,8 @@ EventScript_1A8F54:: @ 81A8F54
switch VAR_RESULT
case 0, EventScript_1A8FEE
case 1, EventScript_1A9004
case 2, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A8FA1:: @ 81A8FA1
@@ -40,8 +40,8 @@ EventScript_1A8FA1:: @ 81A8FA1
case 0, EventScript_1A8FE3
case 1, EventScript_1A8FEE
case 2, EventScript_1A9004
case 3, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A8FE3:: @ 81A8FE3
@@ -73,8 +73,8 @@ EventScript_1A900F:: @ 81A900F
switch VAR_RESULT
case 0, EventScript_1A8FEE
case 1, EventScript_1A8FF9
case 2, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A905C:: @ 81A905C
@@ -83,8 +83,8 @@ EventScript_1A905C:: @ 81A905C
case 0, EventScript_1A8FE3
case 1, EventScript_1A8FEE
case 2, EventScript_1A8FF9
case 3, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_1A90F6
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A909E:: @ 81A909E
@@ -118,7 +118,7 @@ EventScript_1A90DA:: @ 81A90DA
waitstate
end
EventScript_1A90F6:: @ 81A90F6
EventScript_CancelSail:: @ 81A90F6
specialvar VAR_RESULT, sub_8147594
compare VAR_RESULT, 1
goto_if_eq EventScript_1A9108
@@ -143,13 +143,13 @@ EventScript_1A911E:: @ 81A911E
waitstate
specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5
case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0
case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB
case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6
case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
case SEAGALLOP_MORE, EventScript_1A917F
case SCR_MENU_CANCEL, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A917F:: @ 81A917F
@@ -163,10 +163,10 @@ EventScript_1A917F:: @ 81A917F
case SEAGALLOP_SIX_ISLAND, EventScript_1A9217
case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222
case SEAGALLOP_MORE, EventScript_1A911E
case SCR_MENU_CANCEL, EventScript_1A90F6
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_1A91D5:: @ 81A91D5
EventScript_SailToVermilionCity:: @ 81A91D5
setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY
goto EventScript_1A909E
end
data/specials.inc
+1 -1
View File
@@ -435,7 +435,7 @@ gSpecials:: @ 815FD60
def_special Special_GetSelectedSeagallopDestination
def_special sub_8147500
def_special GetPlayerFacingDirection
def_special Special_DeoxysSound
def_special DoDeoxysRockInteraction
def_special Special_SetDeoxysTriangleObjectPal
def_special sub_8147594
def_special Special_BadEggInParty
src/field_specials.c
+4 -4
View File
@@ -80,7 +80,7 @@ static void ChangeBoxPokemonNickname_CB(void);
static void ChangePokemonNickname_CB(void);
static void Task_RunPokemonLeagueLightingEffect(u8 taskId);
static void Task_CancelPokemonLeagueLightingEffect(u8 taskId);
static void task_deoxys_sound(u8 taskId);
static void Task_DoDeoxysRockInteraction(u8 taskId);
static void MoveDeoxysObject(u8 num);
static void Task_WaitDeoxysFieldEffect(u8 taskId);
static void Task_WingFlapSound(u8 taskId);
@@ -2309,12 +2309,12 @@ static const u8 sDeoxysStepCaps[] = {
3
};
void Special_DeoxysSound(void)
void DoDeoxysRockInteraction(void)
{
CreateTask(task_deoxys_sound, 8);
CreateTask(Task_DoDeoxysRockInteraction, 8);
}
static void task_deoxys_sound(u8 taskId)
static void Task_DoDeoxysRockInteraction(u8 taskId)
{
u16 r5;
u16 r6;