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

Use special obj event ids

Browse Source
This commit is contained in:
GriffinR
2020-01-08 21:12:58 -05:00
parent 7eb5464860
commit 33a4b68486
54 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity/scripts.inc
+4 -4
View File
@@ -85,13 +85,13 @@ EventScript_166598:: @ 8166598
return
EventScript_1665A3:: @ 81665A3
applymovement 255, Movement_1665C7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7
applymovement 8, Movement_1665D9
waitmovement 0
return
EventScript_1665B5:: @ 81665B5
applymovement 255, Movement_1665CD
applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD
applymovement 8, Movement_1665EA
waitmovement 0
return
@@ -209,7 +209,7 @@ CeruleanCity_EventScript_166683:: @ 8166683
setvar VAR_0x4001, 0
applymovement 2, Movement_1A75E9
waitmovement 0
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
goto EventScript_1666C3
end
@@ -219,7 +219,7 @@ CeruleanCity_EventScript_1666A3:: @ 81666A3
setvar VAR_0x4001, 1
applymovement 2, Movement_1A75ED
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
goto EventScript_1666C3
end
data/maps/CinnabarIsland/scripts.inc
+7 -7
View File
@@ -132,7 +132,7 @@ EventScript_167048:: @ 8167048
EventScript_167053:: @ 8167053
applymovement 3, Movement_1671A6
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
return
@@ -172,7 +172,7 @@ Movement_1670AB:: @ 81670AB
step_end
EventScript_1670B3:: @ 81670B3
applymovement 255, Movement_1670DB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB
applymovement 3, Movement_1670DE
waitmovement 0
opendoor 14, 11
@@ -226,7 +226,7 @@ EventScript_1670E6:: @ 81670E6
EventScript_167142:: @ 8167142
applymovement 3, Movement_1671AF
applymovement 255, Movement_1671AF
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF
waitmovement 0
return
@@ -243,13 +243,13 @@ EventScript_167166:: @ 8167166
EventScript_167171:: @ 8167171
applymovement 3, Movement_16719D
applymovement 255, Movement_1671BA
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA
waitmovement 0
return
EventScript_167183:: @ 8167183
applymovement 3, Movement_1671B6
applymovement 255, Movement_1671C4
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4
waitmovement 0
return
@@ -326,12 +326,12 @@ Movement_1671C4:: @ 81671C4
CinnabarIsland_EventScript_1671CA:: @ 81671CA
lockall
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
delay 20
msgbox gUnknown_8180B20
closemessage
applymovement 255, Movement_1671ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED
waitmovement 0
releaseall
end
data/maps/CinnabarIsland_Gym/scripts.inc
+12 -12
View File
@@ -289,13 +289,13 @@ EventScript_16DC7A:: @ 816DC7A
end
EventScript_16DCB4:: @ 816DCB4
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 1, Movement_16DCD8
waitmovement 0
return
EventScript_16DCC6:: @ 816DCC6
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 1, Movement_16DCDB
waitmovement 0
return
@@ -368,13 +368,13 @@ EventScript_16DD51:: @ 816DD51
end
EventScript_16DD8B:: @ 816DD8B
applymovement 255, Movement_16DDB7
applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
applymovement 3, Movement_16DDAF
waitmovement 0
return
EventScript_16DD9D:: @ 816DD9D
applymovement 255, Movement_16DDB7
applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
applymovement 3, Movement_16DDB3
waitmovement 0
return
@@ -456,13 +456,13 @@ EventScript_16DE2F:: @ 816DE2F
end
EventScript_16DE69:: @ 816DE69
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 4, Movement_16DE8D
waitmovement 0
return
EventScript_16DE7B:: @ 816DE7B
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 4, Movement_16DE90
waitmovement 0
return
@@ -535,13 +535,13 @@ EventScript_16DF06:: @ 816DF06
end
EventScript_16DF40:: @ 816DF40
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 5, Movement_16DF64
waitmovement 0
return
EventScript_16DF52:: @ 816DF52
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 5, Movement_16DF67
waitmovement 0
return
@@ -614,13 +614,13 @@ EventScript_16DFDD:: @ 816DFDD
end
EventScript_16E017:: @ 816E017
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 6, Movement_16E03B
waitmovement 0
return
EventScript_16E029:: @ 816E029
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 6, Movement_16E03E
waitmovement 0
return
@@ -693,13 +693,13 @@ EventScript_16E0B4:: @ 816E0B4
end
EventScript_16E0EE:: @ 816E0EE
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 7, Movement_16E112
waitmovement 0
return
EventScript_16E100:: @ 816E100
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 7, Movement_16E115
waitmovement 0
return
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -55,19 +55,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
EventScript_16E96F:: @ 816E96F
applymovement 7, Movement_16E9AF
applymovement 255, Movement_16E9B9
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9
waitmovement 0
return
EventScript_16E981:: @ 816E981
applymovement 7, Movement_16E9C3
applymovement 255, Movement_16E9CF
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF
waitmovement 0
return
EventScript_16E993:: @ 816E993
applymovement 7, Movement_16E9AF
applymovement 255, Movement_16E9DE
applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE
waitmovement 0
return
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -1
View File
@@ -64,7 +64,7 @@ EventScript_168A9B:: @ 8168A9B
applymovement 1, Movement_1A75EB
waitmovement 0
delay 45
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
textcolor 0
msgbox gUnknown_818B171
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+3 -3
View File
@@ -74,14 +74,14 @@ EventScript_171FCD:: @ 8171FCD
applymovement 1, Movement_1A75ED
applymovement 2, Movement_17204D
waitmovement 0
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_171FE9:: @ 8171FE9
applymovement 2, Movement_172055
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
@@ -89,7 +89,7 @@ EventScript_171FFE:: @ 8171FFE
applymovement 1, Movement_1A75E7
applymovement 2, Movement_172059
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+2 -2
View File
@@ -95,7 +95,7 @@ EventScript_16402F:: @ 816402F
end
EventScript_164065:: @ 8164065
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
return
@@ -143,7 +143,7 @@ EventScript_1640A2:: @ 81640A2
EventScript_16412E:: @ 816412E
compare VAR_0x8004, 27
goto_if eq, EventScript_1A77A9
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
return
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ EventScript_167CEC:: @ 8167CEC
waitmovement 0
msgbox gUnknown_8182B37
closemessage
applymovement 255, Movement_167D52
applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52
applymovement 10, Movement_167D4E
waitmovement 0
fadedefaultbgm
data/maps/FourIsland_IcefallCave_1F/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
EventScript_163D65:: @ 8163D65
lockall
delay 20
applymovement 255, Movement_163D7F
applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F
waitmovement 0
playse SE_RU_HYUU
delay 60
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+3 -3
View File
@@ -38,7 +38,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
delay 35
applymovement 4, Movement_163F11
applymovement 3, Movement_163F18
applymovement 255, Movement_163EDD
applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD
waitmovement 0
applymovement 2, Movement_163EE8
waitmovement 0
@@ -66,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
msgbox gUnknown_817B399
closemessage
applymovement 3, Movement_163F1D
applymovement 255, Movement_163EE2
applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2
applymovement 1, Movement_163EF0
applymovement 2, Movement_163EFA
applymovement 4, Movement_163F05
@@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
delay 50
applymovement 3, Movement_163F23
waitmovement 0
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
textcolor 1
msgbox gUnknown_817B457
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+10 -10
View File
@@ -11,11 +11,11 @@ FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE
EventScript_16D2C8:: @ 816D2C8
lockall
textcolor 0
applymovement 255, Movement_16D36A
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D36A
waitmovement 0
msgbox gUnknown_8197E85
closemessage
applymovement 255, Movement_16D367
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D367
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -27,7 +27,7 @@ EventScript_16D2F2:: @ 816D2F2
textcolor 0
msgbox gUnknown_8197E85
closemessage
applymovement 255, Movement_16D362
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -42,7 +42,7 @@ EventScript_16D312:: @ 816D312
goto_if eq, EventScript_16D345
msgbox gUnknown_8197E48
closemessage
applymovement 255, Movement_16D362
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -52,7 +52,7 @@ EventScript_16D312:: @ 816D312
EventScript_16D345:: @ 816D345
msgbox gUnknown_8197E7A
closemessage
applymovement 255, Movement_16D365
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D365
waitmovement 0
warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
waitstate
@@ -98,7 +98,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385
EventScript_16D391:: @ 816D391
textcolor 0
msgbox gUnknown_8197C6B
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
showmoneybox 0, 0, 0
msgbox gUnknown_8197C87, MSGBOX_YESNO
@@ -137,17 +137,17 @@ EventScript_16D3CA:: @ 816D3CA
end
EventScript_16D441:: @ 816D441
applymovement 255, Movement_16D4AF
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AF
waitmovement 0
return
EventScript_16D44C:: @ 816D44C
applymovement 255, Movement_16D4AC
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AC
waitmovement 0
return
EventScript_16D457:: @ 816D457
applymovement 255, Movement_16D4B3
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4B3
waitmovement 0
return
@@ -170,7 +170,7 @@ EventScript_16D48C:: @ 816D48C
EventScript_16D49A:: @ 816D49A
closemessage
hidemoneybox 0, 0
applymovement 255, Movement_16D4AA
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AA
waitmovement 0
releaseall
end
data/maps/IndigoPlateau_Exterior/scripts.inc
+7 -7
View File
@@ -31,13 +31,13 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
special SpawnCameraObject
addobject 1
applymovement 1, Movement_167346
applymovement 255, Movement_167337
applymovement OBJ_EVENT_ID_PLAYER, Movement_167337
waitmovement 0
closedoor 11, 6
waitdooranim
@ Rival runs off
applymovement 255, Movement_16731B
applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B
applymovement 1, Movement_16733E
waitmovement 0
delay 100
@@ -53,23 +53,23 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
delay 160
@ Oak looks at player, then walks off
applymovement 255, Movement_16731F
applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F
applymovement 2, Movement_167348
waitmovement 0
delay 100
applymovement 255, Movement_16732E
applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E
waitmovement 0
delay 155
@ Player turns to face the League
applymovement 255, Movement_16733C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C
waitmovement 0
delay 90
@ Player runs off
applymovement 255, Movement_167335
applymovement OBJ_EVENT_ID_PLAYER, Movement_167335
waitmovement 0
applymovement 255, Movement_167311
applymovement OBJ_EVENT_ID_PLAYER, Movement_167311
waitmovement 0
@ Reset the map state and roll the credits
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -47,7 +47,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8005, 35
special Special_LoopWingFlapSound
applymovement 1, Movement_1650E0
applymovement 127, Movement_1650CD
applymovement OBJ_EVENT_ID_CAMERA, Movement_1650CD
waitmovement 0
delay 50
setweather 0
@@ -60,7 +60,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special Special_LoopWingFlapSound
applymovement 127, Movement_1650D1
applymovement OBJ_EVENT_ID_CAMERA, Movement_1650D1
applymovement 1, Movement_1650D7
waitmovement 0
special RemoveCameraObject
data/maps/OneIsland/scripts.inc
+3 -3
View File
@@ -14,17 +14,17 @@ OneIsland_OnFrame:: @ 8167493
EventScript_16749D:: @ 816749D
lockall
textcolor 0
applymovement 255, Movement_167505
applymovement OBJ_EVENT_ID_PLAYER, Movement_167505
waitmovement 0
msgbox gUnknown_818161B
closemessage
applymovement 1, Movement_167507
applymovement 255, Movement_1674F4
applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4
waitmovement 0
opendoor 14, 5
waitdooranim
applymovement 1, Movement_167514
applymovement 255, Movement_167501
applymovement OBJ_EVENT_ID_PLAYER, Movement_167501
waitmovement 0
closedoor 14, 5
waitdooranim
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ OneIsland_Harbor_OnFrame:: @ 8171392
EventScript_17139C:: @ 817139C
lockall
textcolor 0
applymovement 255, Movement_1713B9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1713B9
waitmovement 0
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
warp MAP_ONE_ISLAND, 255, 12, 18
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+13 -13
View File
@@ -61,11 +61,11 @@ OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7
EventScript_170CB1:: @ 8170CB1
lockall
textcolor 0
applymovement 255, Movement_170E7D
applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D
applymovement 2, Movement_170E86
waitmovement 0
msgbox gUnknown_81A0CDE
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
playse SE_PIN
applymovement 3, Movement_1A75DB
@@ -77,12 +77,12 @@ EventScript_170CB1:: @ 8170CB1
msgbox gUnknown_81A0CF7
msgbox gUnknown_81A0D27
applymovement 2, Movement_1A75ED
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
msgbox gUnknown_81A0D72
applymovement 2, Movement_1A75EB
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_170E34
@@ -101,7 +101,7 @@ EventScript_170CB1:: @ 8170CB1
msgbox gUnknown_81A0F40
applymovement 2, Movement_1A75ED
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
msgbox gUnknown_81A0FB1
giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
@@ -476,7 +476,7 @@ EventScript_1711DA:: @ 81711DA
call_if eq, EventScript_171305
delay 10
msgbox gUnknown_81A13CB
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
msgbox gUnknown_81A1431
applymovement 2, Movement_1A75ED
@@ -489,7 +489,7 @@ EventScript_1711DA:: @ 81711DA
applymovement 2, Movement_1A75E7
waitmovement 0
delay 10
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
delay 15
msgbox gUnknown_81A14FB
@@ -499,12 +499,12 @@ EventScript_1711DA:: @ 81711DA
delay 15
applymovement 3, Movement_1A75E7
waitmovement 0
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
msgbox gUnknown_81A1574
closemessage
delay 25
applymovement 255, Movement_171326
applymovement OBJ_EVENT_ID_PLAYER, Movement_171326
applymovement 2, Movement_17132D
waitmovement 0
playse SE_KAIDAN
@@ -518,22 +518,22 @@ EventScript_1711DA:: @ 81711DA
end
EventScript_1712E4:: @ 81712E4
applymovement 255, Movement_171310
applymovement OBJ_EVENT_ID_PLAYER, Movement_171310
waitmovement 0
return
EventScript_1712EF:: @ 81712EF
applymovement 255, Movement_171314
applymovement OBJ_EVENT_ID_PLAYER, Movement_171314
waitmovement 0
return
EventScript_1712FA:: @ 81712FA
applymovement 255, Movement_171316
applymovement OBJ_EVENT_ID_PLAYER, Movement_171316
waitmovement 0
return
EventScript_171305:: @ 8171305
applymovement 255, Movement_17131A
applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A
waitmovement 0
return
data/maps/PalletTown/scripts.inc
+8 -8
View File
@@ -64,13 +64,13 @@ EventScript_1654D8:: @ 81654D8
msgbox gUnknown_817D9AA
closemessage
playbgm MUS_ANNAI, 0
applymovement 255, Movement_1655DD
applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD
applymovement 3, Movement_1655CC
waitmovement 0
opendoor 16, 13
waitdooranim
applymovement 3, Movement_16572E
applymovement 255, Movement_165758
applymovement OBJ_EVENT_ID_PLAYER, Movement_165758
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -192,10 +192,10 @@ EventScript_165605:: @ 8165605
waitmessage
delay 85
closemessage
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
playse SE_PIN
applymovement 255, Movement_1A75DB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75DB
waitmovement 0
delay 30
addobject 3
@@ -214,7 +214,7 @@ EventScript_165605:: @ 8165605
opendoor 16, 13
waitdooranim
applymovement 3, Movement_16572E
applymovement 255, Movement_165758
applymovement OBJ_EVENT_ID_PLAYER, Movement_165758
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -240,13 +240,13 @@ EventScript_1656C3:: @ 81656C3
EventScript_1656CE:: @ 81656CE
applymovement 3, Movement_165705
applymovement 255, Movement_165731
applymovement OBJ_EVENT_ID_PLAYER, Movement_165731
waitmovement 0
return
EventScript_1656E0:: @ 81656E0
applymovement 3, Movement_165719
applymovement 255, Movement_165744
applymovement OBJ_EVENT_ID_PLAYER, Movement_165744
waitmovement 0
return
@@ -475,7 +475,7 @@ PalletTown_EventScript_16586B:: @ 816586B
PalletTown_EventScript_16587B:: @ 816587B
lockall
applymovement 1, Movement_1A75EB
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
call EventScript_165894
releaseall
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+25 -25
View File
@@ -58,7 +58,7 @@ EventScript_169002:: @ 8169002
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7
waitmovement 0
goto EventScript_169035
end
@@ -138,7 +138,7 @@ EventScript_169174:: @ 8169174
setobjectxyperm 8, 5, 10
addobject 8
playbgm MUS_RIVAL1, 0
applymovement 255, Movement_169B94
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94
applymovement 8, Movement_169B9D
waitmovement 0
return
@@ -148,7 +148,7 @@ EventScript_169194:: @ 8169194
addobject 8
playbgm MUS_RIVAL1, 0
applymovement 4, Movement_1A75ED
applymovement 255, Movement_169B91
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
applymovement 8, Movement_169B9D
waitmovement 0
return
@@ -163,12 +163,12 @@ EventScript_1691BB:: @ 81691BB
return
EventScript_1691DB:: @ 81691DB
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
EventScript_1691E6:: @ 81691E6
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
@@ -179,14 +179,14 @@ EventScript_1691F1:: @ 81691F1
EventScript_1691FC:: @ 81691FC
applymovement 4, Movement_169238
applymovement 255, Movement_1698C7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7
applymovement 8, Movement_1698C7
waitmovement 4
return
EventScript_169215:: @ 8169215
applymovement 4, Movement_169232
applymovement 255, Movement_1698C3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3
waitmovement 4
return
@@ -220,7 +220,7 @@ EventScript_16923E:: @ 816923E
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7
waitmovement 0
applymovement 8, Movement_1A75E9
waitmovement 0
@@ -273,7 +273,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
waitmovement 0
msgbox gUnknown_818E177
closemessage
applymovement 255, Movement_1692E5
applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5
waitmovement 0
releaseall
end
@@ -305,7 +305,7 @@ EventScript_16930B:: @ 816930B
playbgm MUS_RIVAL1, 0
applymovement 8, Movement_1A75ED
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
msgbox gUnknown_818DDA4
closemessage
@@ -508,19 +508,19 @@ EventScript_1694C2:: @ 81694C2
EventScript_169504:: @ 8169504
applymovement 8, Movement_16953A
applymovement 255, Movement_169553
applymovement OBJ_EVENT_ID_PLAYER, Movement_169553
waitmovement 8
return
EventScript_169516:: @ 8169516
applymovement 8, Movement_16954A
applymovement 255, Movement_169553
applymovement OBJ_EVENT_ID_PLAYER, Movement_169553
waitmovement 8
return
EventScript_169528:: @ 8169528
applymovement 8, Movement_169542
applymovement 255, Movement_169559
applymovement OBJ_EVENT_ID_PLAYER, Movement_169559
waitmovement 8
return
@@ -757,7 +757,7 @@ EventScript_169850:: @ 8169850
EventScript_16985B:: @ 816985B
applymovement 4, Movement_16987C
applymovement 255, Movement_169878
applymovement OBJ_EVENT_ID_PLAYER, Movement_169878
waitmovement 0
return
@@ -789,14 +789,14 @@ EventScript_169882:: @ 8169882
EventScript_16988D:: @ 816988D
applymovement 4, Movement_1698D0
applymovement 255, Movement_1698C7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7
applymovement 8, Movement_1698C7
waitmovement 4
return
EventScript_1698A6:: @ 81698A6
applymovement 4, Movement_1698CB
applymovement 255, Movement_1698C3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3
waitmovement 4
return
@@ -1025,7 +1025,7 @@ EventScript_169A78:: @ 8169A78
EventScript_169A82:: @ 8169A82
setobjectxyperm 8, 5, 10
addobject 8
applymovement 255, Movement_169B94
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94
applymovement 8, Movement_169B9D
waitmovement 0
return
@@ -1034,7 +1034,7 @@ EventScript_169A9E:: @ 8169A9E
setobjectxyperm 8, 6, 10
addobject 8
applymovement 4, Movement_1A75ED
applymovement 255, Movement_169B91
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
applymovement 8, Movement_169B9D
waitmovement 0
return
@@ -1059,7 +1059,7 @@ EventScript_169AF5:: @ 8169AF5
applymovement 4, Movement_1A75E1
waitmovement 0
delay 15
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement 4, Movement_1A75ED
waitmovement 0
return
@@ -1068,31 +1068,31 @@ EventScript_169B14:: @ 8169B14
applymovement 4, Movement_1A75E1
waitmovement 0
delay 15
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 4, Movement_1A75ED
waitmovement 0
return
EventScript_169B33:: @ 8169B33
applymovement 8, Movement_1A75E1
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_169B45:: @ 8169B45
applymovement 8, Movement_1A75E9
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
EventScript_169B57:: @ 8169B57
applymovement 8, Movement_1A75E1
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
EventScript_169B69:: @ 8169B69
applymovement 255, Movement_169B91
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
applymovement 8, Movement_169BA4
waitmovement 0
return
@@ -1103,7 +1103,7 @@ EventScript_169B7B:: @ 8169B7B
return
EventScript_169B86:: @ 8169B86
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
data/maps/PewterCity/scripts.inc
+17 -17
View File
@@ -26,28 +26,28 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
end
EventScript_165BD3:: @ 8165BD3
applymovement 255, Movement_165C3C
applymovement OBJ_EVENT_ID_PLAYER, Movement_165C3C
applymovement 5, Movement_165CDE
waitmovement 0
applymovement 255, Movement_165C41
applymovement OBJ_EVENT_ID_PLAYER, Movement_165C41
applymovement 5, Movement_165CE3
waitmovement 0
return
EventScript_165BF6:: @ 8165BF6
applymovement 255, Movement_165C80
applymovement OBJ_EVENT_ID_PLAYER, Movement_165C80
applymovement 5, Movement_165D23
waitmovement 0
applymovement 255, Movement_165C82
applymovement OBJ_EVENT_ID_PLAYER, Movement_165C82
applymovement 5, Movement_165D25
waitmovement 0
return
EventScript_165C19:: @ 8165C19
applymovement 255, Movement_165CAF
applymovement OBJ_EVENT_ID_PLAYER, Movement_165CAF
applymovement 5, Movement_165D53
waitmovement 0
applymovement 255, Movement_165CB1
applymovement OBJ_EVENT_ID_PLAYER, Movement_165CB1
applymovement 5, Movement_165D55
waitmovement 0
return
@@ -464,7 +464,7 @@ EventScript_165DBE:: @ 8165DBE
EventScript_165E0A:: @ 8165E0A
applymovement 5, Movement_165F6C
waitmovement 0
applymovement 255, Movement_165E7A
applymovement OBJ_EVENT_ID_PLAYER, Movement_165E7A
applymovement 5, Movement_165F7F
waitmovement 0
return
@@ -472,7 +472,7 @@ EventScript_165E0A:: @ 8165E0A
EventScript_165E26:: @ 8165E26
applymovement 5, Movement_165F71
waitmovement 0
applymovement 255, Movement_165EB9
applymovement OBJ_EVENT_ID_PLAYER, Movement_165EB9
applymovement 5, Movement_165FBF
waitmovement 0
return
@@ -480,7 +480,7 @@ EventScript_165E26:: @ 8165E26
EventScript_165E42:: @ 8165E42
applymovement 5, Movement_165F74
waitmovement 0
applymovement 255, Movement_165EF9
applymovement OBJ_EVENT_ID_PLAYER, Movement_165EF9
applymovement 5, Movement_166000
waitmovement 0
return
@@ -488,7 +488,7 @@ EventScript_165E42:: @ 8165E42
EventScript_165E5E:: @ 8165E5E
applymovement 5, Movement_165F78
waitmovement 0
applymovement 255, Movement_165F3A
applymovement OBJ_EVENT_ID_PLAYER, Movement_165F3A
applymovement 5, Movement_166042
waitmovement 0
return
@@ -1059,25 +1059,25 @@ PewterCity_EventScript_16607E:: @ 816607E
EventScript_1660EE:: @ 81660EE
applymovement 2, Movement_16615C
applymovement 255, Movement_166140
applymovement OBJ_EVENT_ID_PLAYER, Movement_166140
waitmovement 0
return
EventScript_166100:: @ 8166100
applymovement 2, Movement_166193
applymovement 255, Movement_166177
applymovement OBJ_EVENT_ID_PLAYER, Movement_166177
waitmovement 0
return
EventScript_166112:: @ 8166112
applymovement 2, Movement_1661CA
applymovement 255, Movement_1661AE
applymovement OBJ_EVENT_ID_PLAYER, Movement_1661AE
waitmovement 0
return
EventScript_166124:: @ 8166124
applymovement 2, Movement_166201
applymovement 255, Movement_1661E5
applymovement OBJ_EVENT_ID_PLAYER, Movement_1661E5
waitmovement 0
return
@@ -1480,7 +1480,7 @@ EventScript_1663D5:: @ 81663D5
EventScript_1663DA:: @ 81663DA
closemessage
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
@@ -1488,7 +1488,7 @@ EventScript_1663E6:: @ 81663E6
closemessage
applymovement 7, Movement_16643E
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
@@ -1496,7 +1496,7 @@ EventScript_1663FC:: @ 81663FC
closemessage
applymovement 7, Movement_166441
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
data/maps/PewterCity_Museum_1F/scripts.inc
+8 -8
View File
@@ -39,7 +39,7 @@ EventScript_16A37B:: @ 816A37B
PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F
lockall
setvar VAR_0x4001, 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
goto EventScript_16A3D1
end
@@ -47,7 +47,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F
PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5
lockall
setvar VAR_0x4001, 1
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
goto EventScript_16A3D1
end
@@ -55,7 +55,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5
PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB
lockall
setvar VAR_0x4001, 2
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
goto EventScript_16A3D1
end
@@ -69,7 +69,7 @@ EventScript_16A3D1:: @ 816A3D1
msgbox gUnknown_81904F9
closemessage
hidemoneybox 0, 0
applymovement 255, Movement_16A48E
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E
waitmovement 0
releaseall
end
@@ -96,17 +96,17 @@ EventScript_16A402:: @ 816A402
end
EventScript_16A455:: @ 816A455
applymovement 255, Movement_16A490
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A490
waitmovement 0
return
EventScript_16A460:: @ 816A460
applymovement 255, Movement_16A495
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A495
waitmovement 0
return
EventScript_16A46B:: @ 816A46B
applymovement 255, Movement_16A499
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A499
waitmovement 0
return
@@ -114,7 +114,7 @@ EventScript_16A476:: @ 816A476
msgbox gUnknown_819051C
closemessage
hidemoneybox 0, 0
applymovement 255, Movement_16A48E
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E
waitmovement 0
releaseall
end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+3 -3
View File
@@ -56,7 +56,7 @@ EventScript_162B76:: @ 8162B76
lockall
textcolor 0
setflag FLAG_TEMP_2
applymovement 255, Movement_162D07
applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07
waitmovement 0
delay 20
checkflag FLAG_SYS_GAME_CLEAR
@@ -82,7 +82,7 @@ EventScript_162B76:: @ 8162B76
addobject 2
msgbox gUnknown_8178FC6
closemessage
applymovement 255, Movement_162D1F
applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F
applymovement 1, Movement_162D41
applymovement 2, Movement_162D2A
waitmovement 0
@@ -102,7 +102,7 @@ EventScript_162B76:: @ 8162B76
closemessage
delay 13
applymovement 2, Movement_162D37
applymovement 255, Movement_162D12
applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12
waitmovement 0
setvar VAR_0x4001, 1
warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
data/maps/PokemonLeague_HallOfFame/scripts.inc
+3 -3
View File
@@ -18,16 +18,16 @@ PokemonLeague_HallOfFame_OnFrame:: @ 8162D66
EventScript_162D70:: @ 8162D70
lockall
textcolor 0
applymovement 255, Movement_162DCD
applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD
waitmovement 0
applymovement 1, Movement_1A75E7
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
delay 18
msgbox gUnknown_817922F
closemessage
applymovement 1, Movement_1A75E9
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
delay 20
dofieldeffect 62
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -39,7 +39,7 @@ PokemonLeague_LancesRoom_OnFrame:: @ 816297D
EventScript_162987:: @ 8162987
lockall
applymovement 255, Movement_1629F1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1
waitmovement 0
setflag FLAG_TEMP_2
call EventScript_1629A8
data/maps/PokemonTower_2F/scripts.inc
+2 -2
View File
@@ -53,13 +53,13 @@ EventScript_1632A7:: @ 81632A7
EventScript_163339:: @ 8163339
applymovement 1, Movement_1A75EB
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_16334B:: @ 816334B
applymovement 1, Movement_1A75ED
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
special sub_8112364
compare VAR_RESULT, 0
goto_if eq, EventScript_1634F5
applymovement 255, Movement_163512
applymovement OBJ_EVENT_ID_PLAYER, Movement_163512
waitmovement 0
releaseall
end
data/maps/Route16_NorthEntrance_1F/scripts.inc
+6 -6
View File
@@ -50,7 +50,7 @@ EventScript_170220:: @ 8170220
textcolor 0
msgbox gUnknown_819F9CC
closemessage
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
delay 20
compare VAR_0x8008, 1
@@ -63,28 +63,28 @@ EventScript_170220:: @ 8170220
call_if eq, EventScript_17029A
msgbox gUnknown_819F95F
closemessage
applymovement 255, Movement_1702B3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3
waitmovement 0
releaseall
end
EventScript_170279:: @ 8170279
applymovement 255, Movement_1702A5
applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5
waitmovement 0
return
EventScript_170284:: @ 8170284
applymovement 255, Movement_1702A7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7
waitmovement 0
return
EventScript_17028F:: @ 817028F
applymovement 255, Movement_1702AA
applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA
waitmovement 0
return
EventScript_17029A:: @ 817029A
applymovement 255, Movement_1702AE
applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE
waitmovement 0
return
data/maps/Route18_EastEntrance_1F/scripts.inc
+6 -6
View File
@@ -50,7 +50,7 @@ EventScript_1703D6:: @ 81703D6
textcolor 0
msgbox gUnknown_819FD60
closemessage
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
delay 20
compare VAR_0x8008, 1
@@ -63,28 +63,28 @@ EventScript_1703D6:: @ 81703D6
call_if eq, EventScript_170450
msgbox gUnknown_819FD0C
closemessage
applymovement 255, Movement_170469
applymovement OBJ_EVENT_ID_PLAYER, Movement_170469
waitmovement 0
releaseall
end
EventScript_17042F:: @ 817042F
applymovement 255, Movement_17045B
applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B
waitmovement 0
return
EventScript_17043A:: @ 817043A
applymovement 255, Movement_17045D
applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D
waitmovement 0
return
EventScript_170445:: @ 8170445
applymovement 255, Movement_170460
applymovement OBJ_EVENT_ID_PLAYER, Movement_170460
waitmovement 0
return
EventScript_170450:: @ 8170450
applymovement 255, Movement_170464
applymovement OBJ_EVENT_ID_PLAYER, Movement_170464
waitmovement 0
return
data/maps/Route22/scripts.inc
+2 -2
View File
@@ -68,7 +68,7 @@ EventScript_168350:: @ 8168350
EventScript_16835B:: @ 816835B
applymovement 1, Movement_1683D9
applymovement 255, Movement_1683E3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
waitmovement 0
return
@@ -230,7 +230,7 @@ EventScript_16849C:: @ 816849C
EventScript_1684A7:: @ 81684A7
applymovement 1, Movement_1683D9
applymovement 255, Movement_1683E3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
waitmovement 0
return
data/maps/Route24/scripts.inc
+2 -2
View File
@@ -42,7 +42,7 @@ EventScript_168678:: @ 8168678
call_if eq, EventScript_1686FD
compare VAR_0x4001, 1
call_if eq, EventScript_168708
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
msgbox gUnknown_8188C3C
checkitemspace ITEM_NUGGET, 1
@@ -78,7 +78,7 @@ EventScript_168708:: @ 8168708
EventScript_168713:: @ 8168713
msgbox gUnknown_8188CC2
closemessage
applymovement 255, Movement_168743
applymovement OBJ_EVENT_ID_PLAYER, Movement_168743
waitmovement 0
compare VAR_0x4001, 0
call_if eq, EventScript_168733
data/maps/Route25_SeaCottage/scripts.inc
+2 -2
View File
@@ -172,7 +172,7 @@ EventScript_1706FA:: @ 81706FA
clearflag FLAG_TEMP_2
setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
special SpawnCameraObject
applymovement 127, Movement_1707BE
applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE
waitmovement 0
delay 35
playse SE_PIN
@@ -207,7 +207,7 @@ EventScript_1706FA:: @ 81706FA
applymovement 1, Movement_170888
waitmovement 0
waitfanfare
applymovement 127, Movement_1707C3
applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3
waitmovement 0
playse SE_C_MAKU_D
closedoor 3, 3
data/maps/Route5_SouthEntrance/scripts.inc
+5 -5
View File
@@ -25,13 +25,13 @@ Route5_SouthEntrance_EventScript_16F922:: @ 816F922
EventScript_16F92E:: @ 816F92E
textcolor 0
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16F958
msgbox gUnknown_819E04B
closemessage
applymovement 255, Movement_16F9C4
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4
waitmovement 0
releaseall
end
@@ -56,17 +56,17 @@ EventScript_16F963:: @ 816F963
end
EventScript_16F99C:: @ 816F99C
applymovement 255, Movement_16F9C2
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2
waitmovement 0
return
EventScript_16F9A7:: @ 816F9A7
applymovement 255, Movement_16F9BD
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD
waitmovement 0
return
EventScript_16F9B2:: @ 816F9B2
applymovement 255, Movement_16F9BF
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF
waitmovement 0
return
data/maps/Route6_NorthEntrance/scripts.inc
+5 -5
View File
@@ -25,13 +25,13 @@ Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
EventScript_16F9F4:: @ 816F9F4
textcolor 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FA1E
msgbox gUnknown_819E181
closemessage
applymovement 255, Movement_16FA8A
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A
waitmovement 0
releaseall
end
@@ -56,17 +56,17 @@ EventScript_16FA29:: @ 816FA29
end
EventScript_16FA62:: @ 816FA62
applymovement 255, Movement_16FA83
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83
waitmovement 0
return
EventScript_16FA6D:: @ 816FA6D
applymovement 255, Movement_16FA86
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86
waitmovement 0
return
EventScript_16FA78:: @ 816FA78
applymovement 255, Movement_16FA88
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88
waitmovement 0
return
data/maps/Route7_EastEntrance/scripts.inc
+5 -5
View File
@@ -25,13 +25,13 @@ Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
EventScript_16FABB:: @ 816FABB
textcolor 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FAE5
msgbox gUnknown_819E2B7
closemessage
applymovement 255, Movement_16FB51
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51
waitmovement 0
releaseall
end
@@ -56,17 +56,17 @@ EventScript_16FAF0:: @ 816FAF0
end
EventScript_16FB29:: @ 816FB29
applymovement 255, Movement_16FB4F
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F
waitmovement 0
return
EventScript_16FB34:: @ 816FB34
applymovement 255, Movement_16FB4A
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A
waitmovement 0
return
EventScript_16FB3F:: @ 816FB3F
applymovement 255, Movement_16FB4C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C
waitmovement 0
return
data/maps/Route8_WestEntrance/scripts.inc
+5 -5
View File
@@ -25,13 +25,13 @@ Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
EventScript_16FB81:: @ 816FB81
textcolor 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FBAB
msgbox gUnknown_819E3ED
closemessage
applymovement 255, Movement_16FC2D
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D
waitmovement 0
releaseall
end
@@ -66,17 +66,17 @@ EventScript_16FBCC:: @ 816FBCC
end
EventScript_16FC05:: @ 816FC05
applymovement 255, Movement_16FC2B
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B
waitmovement 0
return
EventScript_16FC10:: @ 816FC10
applymovement 255, Movement_16FC26
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26
waitmovement 0
return
EventScript_16FC1B:: @ 816FC1B
applymovement 255, Movement_16FC28
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28
waitmovement 0
return
data/maps/SSAnne_2F_Corridor/scripts.inc
+2 -2
View File
@@ -72,12 +72,12 @@ EventScript_1609AD:: @ 81609AD
EventScript_1609B8:: @ 81609B8
applymovement 1, Movement_160A2E
applymovement 255, Movement_160A24
applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24
waitmovement 0
return
EventScript_1609CA:: @ 81609CA
applymovement 255, Movement_160A1E
applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E
applymovement 1, Movement_160A34
waitmovement 0
return
data/maps/SSAnne_Exterior/scripts.inc
+3 -3
View File
@@ -23,7 +23,7 @@ SSAnne_Exterior_160859:: @ 8160859
special Special_SSAnneDepartureCutscene
waitstate
removeobject 1
applymovement 255, Movement_1608B7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 2
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
@@ -33,12 +33,12 @@ SSAnne_Exterior_160859:: @ 8160859
end
EventScript_1608A1:: @ 81608A1
applymovement 255, Movement_1608C1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1
waitmovement 0
return
EventScript_1608AC:: @ 81608AC
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ EventScript_16F0D4:: @ 816F0D4
closemessage
applymovement 1, Movement_16F124
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
msgbox gUnknown_819C235
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
data/maps/SeafoamIslands_B3F/scripts.inc
+2 -2
View File
@@ -57,12 +57,12 @@ EventScript_162FF0:: @ 8162FF0
return
EventScript_162FF6:: @ 8162FF6
applymovement 255, Movement_163013
applymovement OBJ_EVENT_ID_PLAYER, Movement_163013
waitmovement 0
return
EventScript_163001:: @ 8163001
applymovement 255, Movement_163021
applymovement OBJ_EVENT_ID_PLAYER, Movement_163021
waitmovement 0
return
data/maps/SeafoamIslands_B4F/scripts.inc
+4 -4
View File
@@ -80,7 +80,7 @@ SeafoamIslands_B4F_OnFrame:: @ 81630F9
EventScript_16310B:: @ 816310B
lockall
applymovement 255, Movement_16311D
applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D
waitmovement 0
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
releaseall
@@ -116,12 +116,12 @@ EventScript_163169:: @ 8163169
return
EventScript_16316F:: @ 816316F
applymovement 255, Movement_16318C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C
waitmovement 0
return
EventScript_16317A:: @ 816317A
applymovement 255, Movement_163195
applymovement OBJ_EVENT_ID_PLAYER, Movement_163195
waitmovement 0
return
@@ -153,7 +153,7 @@ Movement_163195:: @ 8163195
SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
lockall
applymovement 255, Movement_1631AA
applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA
waitmovement 0
releaseall
end
data/maps/SevenIsland_House_Room1/scripts.inc
+5 -5
View File
@@ -32,12 +32,12 @@ SevenIsland_House_Room1_OnFrame:: @ 81708CF
EventScript_1708E9:: @ 1708E9
lockall
textcolor 1
applymovement 255, Movement_170953
applymovement OBJ_EVENT_ID_PLAYER, Movement_170953
waitmovement 0
applymovement 1, Movement_170955
waitmovement 0
moveobjectoffscreen 1
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
call_if eq, EventScript_170938
@@ -134,19 +134,19 @@ EventScript_170A1E:: @ 8170A1E
EventScript_170A2D:: @ 8170A2D
applymovement VAR_LAST_TALKED, Movement_170A6F
applymovement 255, Movement_170A63
applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63
waitmovement 0
return
EventScript_170A3F:: @ 8170A3F
applymovement VAR_LAST_TALKED, Movement_170A72
applymovement 255, Movement_170A67
applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67
waitmovement 0
return
EventScript_170A51:: @ 8170A51
applymovement VAR_LAST_TALKED, Movement_170A6F
applymovement 255, Movement_170A6B
applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B
waitmovement 0
return
data/maps/SevenIsland_House_Room2/scripts.inc
+2 -2
View File
@@ -13,7 +13,7 @@ SevenIsland_House_Room2_OnFrame:: @ 8170A8D
EventScript_170A97:: @ 8170A97
lockall
applymovement 255, Movement_170B22
applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22
waitmovement 0
special PrintEReaderTrainerGreeting
msgbox gStringVar4
@@ -30,7 +30,7 @@ EventScript_170A97:: @ 8170A97
call_if eq, EventScript_170B17
closemessage
special sp000_heal_pokemon
applymovement 255, Movement_170B28
applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28
waitmovement 0
special LoadPlayerParty
setvar VAR_0x4001, 1
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+2 -2
View File
@@ -24,7 +24,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
call_if ne, EventScript_172206
delay 30
playbgm MUS_P_SCHOOL, 0
applymovement 255, Movement_172231
applymovement OBJ_EVENT_ID_PLAYER, Movement_172231
waitmovement 0
fadedefaultbgm
delay 30
@@ -35,7 +35,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
end
EventScript_172206:: @ 8172206
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ EventScript_164B90:: @ 8164B90
setvar VAR_ELEVATOR_FLOOR, 3
special Special_CloseElevatorCurrentFloorWindow
delay 25
applymovement 255, Movement_164BE5
applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5
waitmovement 0
warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
waitstate
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+8 -8
View File
@@ -15,8 +15,8 @@ SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853
compare VAR_RESULT, 0
goto_if eq, EventScript_164886
setvar VAR_0x4000, 0
setobjectxy 255, 9, 7
applymovement 255, Movement_164AD4
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
EventScript_164886:: @ 8164886
end
@@ -50,7 +50,7 @@ SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6
EventScript_1648C8:: @ 81648C8
lockall
applymovement 255, Movement_1648EA
applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA
waitmovement 0
setmetatile 17, 10, 692, 1
special DrawWholeMapView
@@ -77,7 +77,7 @@ EventScript_1648ED:: @ 81648ED
EventScript_164920:: @ 8164920
lock
faceplayer
applymovement 255, Movement_164AD4
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C937
goto EventScript_16494B
@@ -85,13 +85,13 @@ EventScript_164920:: @ 8164920
EventScript_164938:: @ 8164938
lock
faceplayer
applymovement 255, Movement_164AD4
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C9C0
EventScript_16494B:: @ 816494B
closemessage
applymovement 255, Movement_164AD6
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
waitmovement 0
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
release
@@ -153,7 +153,7 @@ Items_1649B8:: @ 81649B8
SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE
lockall
applymovement 255, Movement_164AD4
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C794
setvar VAR_0x8004, 17
@@ -206,7 +206,7 @@ EventScript_164AA0:: @ 8164AA0
EventScript_164ABF:: @ 8164ABF
msgbox gUnknown_817C91D
closemessage
applymovement 255, Movement_164AD6
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
waitmovement 0
releaseall
end
data/maps/SilphCo_11F/scripts.inc
+1 -1
View File
@@ -93,7 +93,7 @@ EventScript_161EA0:: @ 8161EA0
EventScript_161F00:: @ 8161F00
applymovement 3, Movement_161F1D
applymovement 255, Movement_161F27
applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27
waitmovement 0
return
data/maps/SilphCo_7F/scripts.inc
+1 -1
View File
@@ -42,7 +42,7 @@ EventScript_1619D4:: @ 81619D4
playbgm MUS_RIVAL1, 0
applymovement 1, Movement_1A75DB
waitmovement 0
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement 1, Movement_1A75DD
waitmovement 0
msgbox gUnknown_8176710
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+12 -12
View File
@@ -76,22 +76,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
end
EventScript_1642F9:: @ 81642F9
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_164304:: @ 8164304
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
EventScript_16430F:: @ 816430F
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_16431A:: @ 816431A
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
@@ -118,51 +118,51 @@ EventScript_164346:: @ 8164346
EventScript_164351:: @ 8164351
applymovement 2, Movement_1643F5
waitmovement 0
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
EventScript_164366:: @ 8164366
applymovement 2, Movement_1643F5
waitmovement 0
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
EventScript_16437B:: @ 816437B
applymovement 2, Movement_1643F7
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
return
EventScript_164390:: @ 8164390
applymovement 2, Movement_1643F7
waitmovement 0
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_1643A5:: @ 81643A5
applymovement 255, Movement_16441C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
applymovement 2, Movement_1643F9
waitmovement 0
return
EventScript_1643B7:: @ 81643B7
applymovement 255, Movement_16441C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
applymovement 2, Movement_164401
waitmovement 0
return
EventScript_1643C9:: @ 81643C9
applymovement 255, Movement_16441C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
applymovement 2, Movement_164409
waitmovement 0
return
EventScript_1643DB:: @ 81643DB
applymovement 255, Movement_16441C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
applymovement 2, Movement_164409
waitmovement 0
return
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ EventScript_171D97:: @ 8171D97
waitmovement 0
msgbox gUnknown_81A3F30
closemessage
applymovement 255, Movement_171E02
applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02
applymovement 2, Movement_171DFE
waitmovement 0
fadedefaultbgm
data/maps/ThreeIsland/scripts.inc
+8 -8
View File
@@ -101,22 +101,22 @@ EventScript_16786F:: @ 816786F
return
EventScript_167931:: @ 8167931
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
return
EventScript_16793C:: @ 816793C
applymovement 255, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
waitmovement 0
return
EventScript_167947:: @ 8167947
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
return
EventScript_167952:: @ 8167952
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
return
@@ -300,20 +300,20 @@ EventScript_167BD8:: @ 8167BD8
EventScript_167BEA:: @ 8167BEA
applymovement 4, Movement_1A75ED
applymovement 3, Movement_167C64
applymovement 255, Movement_167C68
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
waitmovement 0
return
EventScript_167C03:: @ 8167C03
applymovement 4, Movement_1A75ED
applymovement 255, Movement_167C68
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
applymovement 3, Movement_167C6C
waitmovement 0
return
EventScript_167C1C:: @ 8167C1C
applymovement 4, Movement_1A75ED
applymovement 255, Movement_167C68
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
applymovement 3, Movement_167C71
waitmovement 0
return
@@ -321,7 +321,7 @@ EventScript_167C1C:: @ 8167C1C
EventScript_167C35:: @ 8167C35
msgbox gUnknown_8182453
closemessage
applymovement 255, Movement_167C55
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C55
waitmovement 0
applymovement 5, Movement_167C59
waitmovement 0
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+2 -2
View File
@@ -62,13 +62,13 @@ EventScript_17145F:: @ 817145F
waitmovement 0
applymovement 1, Movement_171527
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
msgbox gUnknown_81A2465
closemessage
playse SE_DOOR
waitse
applymovement 255, Movement_17152C
applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C
waitmovement 0
playbgm MUS_SHOUNEN, 0
addobject 2
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ VermilionCity_OnFrame:: @ 81668E7
EventScript_1668F1:: @ 81668F1
lockall
applymovement 255, Movement_166903
applymovement OBJ_EVENT_ID_PLAYER, Movement_166903
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 3
releaseall
@@ -207,7 +207,7 @@ VermilionCity_EventScript_166B98:: @ 8166B98
EventScript_166BA0:: @ 8166BA0
textcolor 0
applymovement 6, Movement_1A75E7
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
compare VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if eq, EventScript_166BED
data/maps/ViridianCity/scripts.inc
+5 -5
View File
@@ -49,12 +49,12 @@ EventScript_165931:: @ 8165931
ViridianCity_EventScript_16596D:: @ 816596D
lockall
textcolor 3
applymovement 255, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
waitmovement 0
delay 20
msgbox gUnknown_817E2F5
closemessage
applymovement 255, Movement_165992
applymovement OBJ_EVENT_ID_PLAYER, Movement_165992
waitmovement 0
releaseall
end
@@ -208,7 +208,7 @@ ViridianCity_EventScript_165AF6:: @ 8165AF6
textcolor 0
msgbox gUnknown_817DD03
closemessage
applymovement 255, Movement_165B0E
applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E
waitmovement 0
releaseall
end
@@ -222,7 +222,7 @@ ViridianCity_EventScript_165B10:: @ 8165B10
textcolor 0
applymovement 4, Movement_1A75E7
waitmovement 0
applymovement 255, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
waitmovement 0
call EventScript_165B4C
release
@@ -233,7 +233,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E
textcolor 0
applymovement 4, Movement_1A75EB
waitmovement 0
applymovement 255, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
waitmovement 0
call EventScript_165B4C
release
data/maps/ViridianCity_Mart/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ EventScript_16A205:: @ 816A205
msgbox gUnknown_819021A
closemessage
applymovement 1, Movement_16A262
applymovement 255, Movement_16A25C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C
waitmovement 0
msgbox gUnknown_819023A
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
data/scripts/hole.inc
+2 -2
View File
@@ -7,7 +7,7 @@ EventScript_1C1338:: @ 81C1338
EventScript_1C1348:: @ 81C1348
lockall
delay 20
applymovement 255, Movement_1C137A
applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -18,7 +18,7 @@ EventScript_1C1348:: @ 81C1348
EventScript_1C1361:: @ 81C1361
lockall
delay 20
applymovement 255, Movement_1C137A
applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A
waitmovement 0
playse SE_RU_HYUU
delay 60