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_House5_MapScripts:: @ 817191F
ThreeIsland_House5_MapScripts::
.byte 0
ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920
ThreeIsland_House5_EventScript_LittleGirl::
lock
faceplayer
goto_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_House5_EventScript_LittleGirlLostelleFound
@@ -9,7 +9,7 @@ ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920
release
end
ThreeIsland_House5_EventScript_LittleGirlLostelleFound:: @ 8171935
ThreeIsland_House5_EventScript_LittleGirlLostelleFound::
msgbox ThreeIsland_House5_Text_IllGoPlayWithLostelle
release
end
+2 -2
View File
@@ -1,4 +1,4 @@
ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469
ThreeIsland_House5_Text_ImNotLostelle::
.string "Me?\n"
.string "I'm not LOSTELLE.\p"
.string "She's probably gone to the\n"
@@ -6,7 +6,7 @@ ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469
.string "She picks BERRIES there for making\n"
.string "lunch.$"
ThreeIsland_House5_Text_IllGoPlayWithLostelle:: @ 81A34DB
ThreeIsland_House5_Text_IllGoPlayWithLostelle::
.string "I think I'll go play with LOSTELLE\n"
.string "today.$"