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
+5 -5
View File
@@ -1,19 +1,19 @@
SSAnne_1F_Room3_MapScripts:: @ 8160C1D
SSAnne_1F_Room3_MapScripts::
.byte 0
SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E
SSAnne_1F_Room3_EventScript_LittleGirl::
msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC
end
SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27
SSAnne_1F_Room3_EventScript_BaldingMan::
msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC
end
SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30
SSAnne_1F_Room3_EventScript_Wigglytuff::
lock
faceplayer
waitse
playmoncry SPECIES_WIGGLYTUFF, 0
playmoncry SPECIES_WIGGLYTUFF, CRY_MODE_NORMAL
msgbox SSAnne_1F_Room3_Text_Wigglytuff
waitmoncry
release
+3 -3
View File
@@ -1,11 +1,11 @@
SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA
SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy::
.string "A world cruise is so elegant yet\n"
.string "cozy!$"
SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21
SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff::
.string "I always travel with WIGGLYTUFF.\n"
.string "I never leave home without it.$"
SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61
SSAnne_1F_Room3_Text_Wigglytuff::
.string "WIGGLYTUFF: Puup pupuu!$"