summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-25 14:27:29 -0500
committersurskitty <surskitty@gmail.com>2017-12-25 14:27:29 -0500
commitf22e127bb9be22b90c421c0528ef01ce49a31267 (patch)
treef8ef9c623811d6fb77d1a633c01d9d0a744b5e7e
parent5a7dff65549bcf42e050e1aa519763ec5cffed96 (diff)
Renaming the Captain #426
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 9cf4fc4fc..fbb8b0306 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -21,7 +21,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
Unused_0x75ea6:
end
-Captain:
+SSAquaCaptain:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
@@ -484,7 +484,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
.ObjectEvents:
db 11
- object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Captain, -1
+ object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Grandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Granddaughter1, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Granddaughter2, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2