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

Sync some event_scripts.s, split files

Browse Source
This commit is contained in:
GriffinR
2020-01-08 21:05:04 -05:00
parent 2e5bf6c9ef
commit 7eb5464860
52 changed files with 5901 additions and 5880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/CeruleanCity_House5/scripts.inc
+1 -1
View File
@@ -164,7 +164,7 @@ EventScript_16B055:: @ 816B055
end
EventScript_16B0BF:: @ 816B0BF
msgbox gUnknown_81A5207
msgbox Text_BagIsFull
special sub_815F114
release
end
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38
CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/CinnabarIsland/scripts.inc
+5 -5
View File
@@ -197,7 +197,7 @@ Movement_1670DE:: @ 81670DE
Movement_1670E2:: @ 81670E2
step_11
step_1a
step_60
set_invisible
step_end
EventScript_1670E6:: @ 81670E6
@@ -269,7 +269,7 @@ Movement_16719D:: @ 816719D
step_10
step_13
step_1a
step_60
set_invisible
step_end
Movement_1671A4:: @ 81671A4
@@ -301,7 +301,7 @@ Movement_1671AF:: @ 81671AF
Movement_1671B6:: @ 81671B6
step_13
step_1a
step_60
set_invisible
step_end
Movement_1671BA:: @ 81671BA
@@ -313,7 +313,7 @@ Movement_1671BA:: @ 81671BA
step_1a
step_13
step_1a
step_60
set_invisible
step_end
Movement_1671C4:: @ 81671C4
@@ -321,7 +321,7 @@ Movement_1671C4:: @ 81671C4
step_1a
step_13
step_1a
step_60
set_invisible
step_end
CinnabarIsland_EventScript_1671CA:: @ 81671CA
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2
CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
@@ -85,7 +85,7 @@ Movement_16E9AF:: @ 816E9AF
step_10
step_10
step_1b
step_60
set_invisible
step_end
Movement_16E9B9:: @ 816E9B9
@@ -111,7 +111,7 @@ Movement_16E9C3:: @ 816E9C3
step_10
step_10
step_1b
step_60
set_invisible
step_end
Movement_16E9CF:: @ 816E9CF
@@ -128,7 +128,7 @@ Movement_16E9CF:: @ 816E9CF
step_1b
step_10
step_1b
step_60
set_invisible
step_end
Movement_16E9DE:: @ 816E9DE
data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC
FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -36,7 +36,7 @@ EventScript_168808:: @ 8168808
Movement_168841:: @ 8168841
step_11
step_60
set_invisible
step_end
FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844
data/maps/FourIsland_IcefallCave_1F/scripts.inc
+1 -1
View File
@@ -29,5 +29,5 @@ EventScript_163D65:: @ 8163D65
end
Movement_163D7F:: @ 8163D7F
step_60
set_invisible
step_end
data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -1
View File
@@ -171,7 +171,7 @@ Movement_171B71:: @ 8171B71
step_1c
step_01
step_up
step_60
set_invisible
step_1c
step_1c
step_1c
data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC
FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -71,6 +71,6 @@ Items_16EAF4:: @ 816EAF4
IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA
LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/OneIsland/scripts.inc
+2 -2
View File
@@ -53,7 +53,7 @@ Movement_1674F4:: @ 81674F4
Movement_167501:: @ 8167501
step_11
step_11
step_60
set_invisible
step_end
Movement_167505:: @ 8167505
@@ -77,7 +77,7 @@ Movement_167507:: @ 8167507
Movement_167514:: @ 8167514
step_11
step_60
set_invisible
step_end
OneIsland_EventScript_167517:: @ 8167517
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -186,7 +186,7 @@ Movement_170E91:: @ 8170E91
OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/PalletTown/scripts.inc
+2 -2
View File
@@ -320,7 +320,7 @@ Movement_165719:: @ 8165719
Movement_16572E:: @ 816572E
step_11
step_60
set_invisible
step_end
Movement_165731:: @ 8165731
@@ -369,7 +369,7 @@ Movement_165744:: @ 8165744
Movement_165758:: @ 8165758
step_13
step_11
step_60
set_invisible
step_end
PalletTown_EventScript_16575C:: @ 816575C
data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B
PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+2 -2
View File
@@ -190,7 +190,7 @@ Movement_162D12:: @ 8162D12
step_11
step_11
step_1b
step_60
set_invisible
step_end
Movement_162D1F:: @ 8162D1F
@@ -230,7 +230,7 @@ Movement_162D37:: @ 8162D37
step_11
step_11
step_1b
step_60
set_invisible
step_end
Movement_162D41:: @ 8162D41
data/maps/Route1/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ Route1_EventScript_167EFE:: @ 8167EFE
goto_if eq, EventScript_1A6BF9
getitemname 1, ITEM_POTION
playfanfare MUS_FANFA1
message Text_1A51F6
message Text_ObtainedTheX
waitmessage
waitfanfare
additem ITEM_POTION, 1
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A
Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/Route4_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -142,7 +142,7 @@ EventScript_16F8AC:: @ 816F8AC
Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94
SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -102,7 +102,7 @@ EventScript_16495C:: @ 816495C
SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -66,7 +66,7 @@ Movement_171E02:: @ 8171E02
SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D
ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF
TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F
VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end
data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB
ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
lock
faceplayer
call EventScript_1A6578
call EventScript_PkmnCenterNurse
release
end