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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
+8 -8
View File
@@ -1,32 +1,32 @@
CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
CinnabarIsland_PokemonLab_Entrance_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition
.byte 0
CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279
CinnabarIsland_PokemonLab_Entrance_OnTransition::
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
end
CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil:: @ 816E285
CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil::
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
return
CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist:: @ 816E28B
CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist::
msgbox CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively, MSGBOX_NPC
end
CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto:: @ 816E294
CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto::
msgbox CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign:: @ 816E29D
CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign::
msgbox CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign:: @ 816E2A6
CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign::
msgbox CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign:: @ 816E2AF
CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign::
msgbox CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign, MSGBOX_SIGN
end
data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc
+6 -6
View File
@@ -1,28 +1,28 @@
CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji:: @ 8199E8A
CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji::
.string "It's a photo of BLAINE and\n"
.string "MR. FUJI.\p"
.string "They're standing shoulder to\n"
.string "shoulder with big grins.$"
CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively:: @ 8199EE5
CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively::
.string "We study POKéMON extensively\n"
.string "every day.\p"
.string "People often bring us rare POKéMON\n"
.string "for examination.$"
CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji:: @ 8199F41
CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji::
.string "A photo of the LAB's founder…\n"
.string "DR. FUJI?!$"
CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign:: @ 8199F6A
CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign::
.string "POKéMON LAB\n"
.string "Meeting Room$"
CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign:: @ 8199F83
CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign::
.string "POKéMON LAB\n"
.string "R & D Room$"
CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign:: @ 8199F9A
CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign::
.string "POKéMON LAB\n"
.string "Testing Room$"