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

Merge pull request #477 from melthelesbian/object_script_commands

Browse Source 
use player constant in obj script commands
This commit is contained in:
Diegoisawesome
2018-12-24 16:09:42 -06:00
committed by GitHub
parent ed1961a926 38293d4293
commit c2ca57e8ac
54 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, 0 compare VAR_TEMP_F, 0
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
turnobject 1, 1 turnobject 1, 1
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+1 -1
View File
@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
compare VAR_TEMP_C, 0 compare VAR_TEMP_C, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
setobjectxyperm 2, 0, 0 setobjectxyperm 2, 0, 0
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
.2byte 0 .2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
.2byte 0 .2byte 0
BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
special sub_8139980 special sub_8139980
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+1 -1
View File
@@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+1 -1
View File
@@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
.2byte 0 .2byte 0
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
data/maps/DewfordTown/scripts.inc
+9 -9
View File
@@ -117,29 +117,29 @@ DewfordTown_EventScript_1E9656:: @ 81E9656
DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E9660:: @ 81E9660
call DewfordTown_EventScript_271E95 call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement 2, DewfordTown_Movement_1E991D applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0 call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E97A2 applymovement 4, DewfordTown_Movement_1E97A2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2
waitmovement 0 waitmovement 0
showobjectat 255, MAP_ROUTE104 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call DewfordTown_EventScript_2720A8 call DewfordTown_EventScript_2720A8
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914
waitmovement 0 waitmovement 0
showobjectat 255, MAP_ROUTE104 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2 setvar VAR_0x408E, 2
resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_0x4096, VAR_0x8008 copyvar VAR_0x4096, VAR_0x8008
waitstate waitstate
@@ -149,19 +149,19 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
DewfordTown_EventScript_1E96E7:: @ 81E96E7 DewfordTown_EventScript_1E96E7:: @ 81E96E7
call DewfordTown_EventScript_271E95 call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 1 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement 2, DewfordTown_Movement_1E991D applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0 call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E9865 applymovement 4, DewfordTown_Movement_1E9865
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865
waitmovement 0 waitmovement 0
call DewfordTown_EventScript_2720A8 call DewfordTown_EventScript_2720A8
showobjectat 255, MAP_ROUTE109 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918
waitmovement 0 waitmovement 0
setobjectxyperm 2, 21, 26 setobjectxyperm 2, 21, 26
@@ -178,7 +178,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799 call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
closemessage closemessage
copyvar VAR_0x4096, VAR_0x8008 copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109 resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2 moveobjectoffscreen 2
release release
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
.2byte 0 .2byte 0
EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
.2byte 0 .2byte 0
EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
.2byte 0 .2byte 0
EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
data/maps/EverGrandeCity_Hall1/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
.2byte 0 .2byte 0
EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/EverGrandeCity_Hall2/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
.2byte 0 .2byte 0
EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/EverGrandeCity_Hall3/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
.2byte 0 .2byte 0
EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/EverGrandeCity_Hall4/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
.2byte 0 .2byte 0
EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/EverGrandeCity_Hall5/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
.2byte 0 .2byte 0
EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
.2byte 0 .2byte 0
EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
.2byte 0 .2byte 0
EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
.2byte 0 .2byte 0
EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+1 -1
View File
@@ -260,7 +260,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
.2byte 0 .2byte 0
FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA
hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
removeobject 3 removeobject 3
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
data/maps/LilycoveCity_Harbor/scripts.inc
+2 -2
View File
@@ -363,7 +363,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if_eq LilycoveCity_Harbor_EventScript_21E610 call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
call LilycoveCity_Harbor_EventScript_2721E2 call LilycoveCity_Harbor_EventScript_2721E2
return return
@@ -424,7 +424,7 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if_eq LilycoveCity_Harbor_EventScript_21E610 call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
call LilycoveCity_Harbor_EventScript_2721E2 call LilycoveCity_Harbor_EventScript_2721E2
return return
data/maps/LittlerootTown/scripts.inc
+1 -1
View File
@@ -137,7 +137,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
waitmovement 0 waitmovement 0
setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setvar VAR_0x4092, 3 setvar VAR_0x4092, 3
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005 closedoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+2 -2
View File
@@ -48,11 +48,11 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
.2byte 0 .2byte 0
LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
addobject 2 addobject 2
addobject 3 addobject 3
turnobject 3, 2 turnobject 3, 2
data/maps/PetalburgCity/scripts.inc
+1 -1
View File
@@ -68,7 +68,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418
waitmovement 0 waitmovement 0
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005 closedoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_SPECIAL_FLAG_0x4000
data/maps/PetalburgCity_Gym/scripts.inc
+1 -1
View File
@@ -78,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B
.2byte 0 .2byte 0
PetalburgCity_Gym_EventScript_204995:: @ 8204995 PetalburgCity_Gym_EventScript_204995:: @ 8204995
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
PetalburgCity_Gym_MapScript2_20499A: @ 820499A PetalburgCity_Gym_MapScript2_20499A: @ 820499A
data/maps/PetalburgCity_WallysHouse/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
.2byte 0 .2byte 0
PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
turnobject 255, 4 turnobject EVENT_OBJ_ID_PLAYER, 4
turnobject 1, 3 turnobject 1, 3
end end
data/maps/Route101/scripts.inc
+1 -1
View File
@@ -222,7 +222,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_0x052 setflag FLAG_0x052
fadescreen 1 fadescreen 1
removeobject 4 removeobject 4
setobjectxy 255, 6, 13 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4
waitmovement 0 waitmovement 0
special ChooseStarter special ChooseStarter
data/maps/Route104/scripts.inc
+4 -4
View File
@@ -357,13 +357,13 @@ Route104_EventScript_1ED090:: @ 81ED090
Route104_EventScript_1ED099:: @ 81ED099 Route104_EventScript_1ED099:: @ 81ED099
setobjectpriority 8, MAP_ROUTE104, 0 setobjectpriority 8, MAP_ROUTE104, 0
setobjectpriority 255, MAP_ROUTE104, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0
applymovement 8, Route104_Movement_1ED359 applymovement 8, Route104_Movement_1ED359
waitmovement 0 waitmovement 0
removeobject 8 removeobject 8
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_ROUTE104 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call Route104_EventScript_2720A0 call Route104_EventScript_2720A0
goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9
goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF
@@ -399,7 +399,7 @@ Route104_EventScript_1ED139:: @ 81ED139
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
waitmovement 0 waitmovement 0
call Route104_EventScript_2720A8 call Route104_EventScript_2720A8
showobjectat 255, MAP_DEWFORD_TOWN showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
waitmovement 0 waitmovement 0
setobjectxyperm 2, 12, 8 setobjectxyperm 2, 12, 8
@@ -414,7 +414,7 @@ Route104_EventScript_1ED139:: @ 81ED139
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104 hideobjectat 7, MAP_ROUTE104
copyvar VAR_0x4096, VAR_0x8008 copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2 moveobjectoffscreen 2
setvar VAR_0x408E, 0 setvar VAR_0x408E, 0
data/maps/Route109/scripts.inc
+4 -4
View File
@@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F
Route109_EventScript_1EE760:: @ 81EE760 Route109_EventScript_1EE760:: @ 81EE760
call Route109_EventScript_271E95 call Route109_EventScript_271E95
setobjectpriority 2, MAP_ROUTE109, 0 setobjectpriority 2, MAP_ROUTE109, 0
setobjectpriority 255, MAP_ROUTE109, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0
applymovement 2, Route109_Movement_1EE90B applymovement 2, Route109_Movement_1EE90B
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
@@ -33,14 +33,14 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5
end end
Route109_EventScript_1EE7D5:: @ 81EE7D5 Route109_EventScript_1EE7D5:: @ 81EE7D5
hideobjectat 255, MAP_ROUTE109 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
call Route109_EventScript_2720A0 call Route109_EventScript_2720A0
applymovement 1, Route109_Movement_1EE84F applymovement 1, Route109_Movement_1EE84F
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F
waitmovement 0 waitmovement 0
delay 50 delay 50
call Route109_EventScript_2720A8 call Route109_EventScript_2720A8
showobjectat 255, MAP_DEWFORD_TOWN showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900
waitmovement 0 waitmovement 0
addobject 4 addobject 4
@@ -56,7 +56,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
closemessage closemessage
copyvar VAR_0x4096, VAR_0x8008 copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2 moveobjectoffscreen 2
release release
data/maps/Route110_TrickHouseEntrance/scripts.inc
+1 -1
View File
@@ -133,7 +133,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
addobject 1 addobject 1
showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
turnobject 1, 4 turnobject 1, 4
turnobject 255, 3 turnobject EVENT_OBJ_ID_PLAYER, 3
end end
Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
data/maps/Route111/scripts.inc
+3 -3
View File
@@ -109,7 +109,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46
.2byte 0 .2byte 0
Route111_EventScript_1F0E50:: @ 81F0E50 Route111_EventScript_1F0E50:: @ 81F0E50
hideobjectat 255, MAP_LITTLEROOT_TOWN hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
end end
Route111_MapScript2_1F0E56: @ 81F0E56 Route111_MapScript2_1F0E56: @ 81F0E56
@@ -125,10 +125,10 @@ Route111_EventScript_1F0E60:: @ 81F0E60
addobject 45 addobject 45
special sub_81BE7F4 special sub_81BE7F4
waitstate waitstate
showobjectat 255, MAP_LITTLEROOT_TOWN showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
removeobject 45 removeobject 45
delay 16 delay 16
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
delay 16 delay 16
special sub_81BEB54 special sub_81BEB54
waitstate waitstate
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
.2byte 0 .2byte 0
RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
turnobject 255, 4 turnobject EVENT_OBJ_ID_PLAYER, 4
end end
RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
end end
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
turnobject 1, 1 turnobject 1, 1
SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
data/maps/SlateportCity_Harbor/scripts.inc
+1 -1
View File
@@ -235,7 +235,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if_eq SlateportCity_Harbor_EventScript_20CC37 call_if_eq SlateportCity_Harbor_EventScript_20CC37
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
call SlateportCity_Harbor_EventScript_2721E2 call SlateportCity_Harbor_EventScript_2721E2
return return
data/maps/SootopolisCity/scripts.inc
+2 -2
View File
@@ -179,11 +179,11 @@ SootopolisCity_EventScript_1E58E5:: @ 81E58E5
end end
SootopolisCity_EventScript_1E58FC:: @ 81E58FC SootopolisCity_EventScript_1E58FC:: @ 81E58FC
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
return return
SootopolisCity_EventScript_1E5901:: @ 81E5901 SootopolisCity_EventScript_1E5901:: @ 81E5901
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
setvar VAR_0x40CA, 3 setvar VAR_0x40CA, 3
return return
data/maps/TrainerHill_Entrance/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
special sp194_trainer_tower special sp194_trainer_tower
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_2680FF goto_if_eq TrainerHill_Entrance_EventScript_2680FF
setobjectxy 255, 9, 6 setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
end end
data/maps/UnknownMap_25_34/scripts.inc
+1 -1
View File
@@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829
LinkContestRoom1_EventScript_23B834:: @ 823B834 LinkContestRoom1_EventScript_23B834:: @ 823B834
special sub_80F8B94 special sub_80F8B94
hideobjectat 255, MAP_LITTLEROOT_TOWN hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
call LinkContestRoom1_EventScript_23BB2B call LinkContestRoom1_EventScript_23BB2B
end end
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject 255, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
end end
VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
data/scripts/cable_club.inc
+6 -6
View File
@@ -466,7 +466,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1 closedoor 9, 1
waitdooranim waitdooranim
release release
@@ -570,7 +570,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1 closedoor 9, 1
waitdooranim waitdooranim
release release
@@ -645,7 +645,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1 closedoor 9, 1
waitdooranim waitdooranim
release release
@@ -1043,7 +1043,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1 closedoor 5, 1
waitdooranim waitdooranim
special sub_8018090 special sub_8018090
@@ -1378,7 +1378,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
waitdooranim waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1 closedoor 9, 1
waitdooranim waitdooranim
release release
@@ -1587,7 +1587,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360
waitmovement 0 waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
release release
waitstate waitstate
end end