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
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_B1F_Room2_MapScripts:: @ 8160D76
SSAnne_B1F_Room2_MapScripts::
.byte 0
SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77
SSAnne_B1F_Room2_EventScript_Huey::
trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat
msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
end
+3 -3
View File
@@ -1,10 +1,10 @@
SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239
SSAnne_B1F_Room2_Text_HueyIntro::
.string "Even us sailors have POKéMON, too!$"
SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C
SSAnne_B1F_Room2_Text_HueyDefeat::
.string "Okay, you're not bad.$"
SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272
SSAnne_B1F_Room2_Text_HueyPostBattle::
.string "We caught all our POKéMON while\n"
.string "we were out at sea.$"