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
+4 -4
View File
@@ -1,15 +1,15 @@
SSAnne_B1F_Room5_MapScripts:: @ 8160DD5
SSAnne_B1F_Room5_MapScripts::
.byte 0
SSAnne_B1F_Room5_EventScript_Boy:: @ 8160DD6
SSAnne_B1F_Room5_EventScript_Boy::
msgbox SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks, MSGBOX_NPC
end
SSAnne_B1F_Room5_EventScript_Machoke:: @ 8160DDF
SSAnne_B1F_Room5_EventScript_Machoke::
lock
faceplayer
waitse
playmoncry SPECIES_MACHOKE, 0
playmoncry SPECIES_MACHOKE, CRY_MODE_NORMAL
msgbox SSAnne_B1F_Room5_Text_Machoke
waitmoncry
release
+2 -2
View File
@@ -1,8 +1,8 @@
SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks:: @ 81743F8
SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks::
.string "My buddy MACHOKE is super strong!\p"
.string "He has enough STRENGTH to move\n"
.string "big rocks!$"
SSAnne_B1F_Room5_Text_Machoke:: @ 8174444
SSAnne_B1F_Room5_Text_Machoke::
.string "MACHOKE: Gwoh! Goggoh!$"