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
+3 -3
View File
@@ -1,7 +1,7 @@
ThreeIsland_House1_MapScripts:: @ 8171819
ThreeIsland_House1_MapScripts::
.byte 0
ThreeIsland_House1_EventScript_Lostelle:: @ 817181A
ThreeIsland_House1_EventScript_Lostelle::
lock
faceplayer
special BufferBigGuyOrBigGirlString
@@ -9,6 +9,6 @@ ThreeIsland_House1_EventScript_Lostelle:: @ 817181A
release
end
ThreeIsland_House1_EventScript_DisplayCase:: @ 8171829
ThreeIsland_House1_EventScript_DisplayCase::
msgbox ThreeIsland_House1_Text_RareRocksGemsDisplayed, MSGBOX_SIGN
end
+2 -2
View File
@@ -1,9 +1,9 @@
ThreeIsland_House1_Text_YoureAlwaysSoCool:: @ 81A2F3E
ThreeIsland_House1_Text_YoureAlwaysSoCool::
.string "LOSTELLE: Hi, {PLAYER}!\n"
.string "You're always so cool!\p"
.string "I'll make lunch for you, too, one\n"
.string "day, {PLAYER}.$"
ThreeIsland_House1_Text_RareRocksGemsDisplayed:: @ 81A2F92
ThreeIsland_House1_Text_RareRocksGemsDisplayed::
.string "Rare rocks and gems are displayed.$"