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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
@@ -1,6 +1,6 @@
CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
CeladonCity_Condominiums_2F_MapScripts::
.byte 0
CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1
CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign::
msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN
end
@@ -1,3 +1,3 @@
CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7
CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom::
.string "GAME FREAK Meeting Room$"