dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document Abandoned Ship scripts

Browse Source
This commit is contained in:
GriffinR
2019-11-06 09:31:04 -05:00
committed by huderlem
parent 37bd93ec6c
commit 6730df2321
22 changed files with 300 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+7
View File
@@ -1679,3 +1679,10 @@
setorcopyvar VAR_0x8000, \trainer setorcopyvar VAR_0x8000, \trainer
callstd STD_REGISTER_MATCH_CALL callstd STD_REGISTER_MATCH_CALL
.endm .endm
.macro dofieldeffectsparkle x:req y:req
setfieldeffectargument 0, \x
setfieldeffectargument 1, \y
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
.endm
data/maps/AbandonedShip_CaptainsOffice/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", "script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+12 -12
View File
@@ -1,42 +1,42 @@
AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
.byte 0 .byte 0
AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
lock lock
faceplayer faceplayer
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
checkitem ITEM_SCANNER, 1 checkitem ITEM_SCANNER, 1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
release release
end end
AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810
msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT
release release
end end
AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A
msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT
release release
end end
AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824
.string "I'm investigating this ship on behalf\n" .string "I'm investigating this ship on behalf\n"
.string "of CAPT. STERN.\p" .string "of CAPT. STERN.\p"
.string "He also asked me to find a SCANNER,\n" .string "He also asked me to find a SCANNER,\n"
.string "but I haven't had any success…$" .string "but I haven't had any success…$"
AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D
.string "Oh! That's a SCANNER!\p" .string "Oh! That's a SCANNER!\p"
.string "Listen, can I get you to deliver that\n" .string "Listen, can I get you to deliver that\n"
.string "to CAPT. STERN?\p" .string "to CAPT. STERN?\p"
.string "I want to investigate this ship a\n" .string "I want to investigate this ship a\n"
.string "little more.$" .string "little more.$"
AbandonedShip_CaptainsOffice_Text_238918: @ 8238918 AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918
.string "This ship is called S.S. CACTUS.\n" .string "This ship is called S.S. CACTUS.\n"
.string "It seems to be from an earlier era.$" .string "It seems to be from an earlier era.$"
data/maps/AbandonedShip_Corridors_1F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Corridors_1F_EventScript_2379A5", "script": "AbandonedShip_Corridors_1F_EventScript_Youngster",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 7, "movement_range_y": 7,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "AbandonedShip_Corridors_1F_EventScript_2379AE", "script": "AbandonedShip_Corridors_1F_EventScript_Charlie",
"flag": "0" "flag": "0"
} }
], ],
data/maps/AbandonedShip_Corridors_1F/scripts.inc
+9 -9
View File
@@ -1,26 +1,26 @@
AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4
.byte 0 .byte 0
AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5
msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
end end
AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE
trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat
msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5
.string "What's so funny about having my inner\n" .string "What's so funny about having my inner\n"
.string "tube aboard the ship?$" .string "tube aboard the ship?$"
AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01
.string "Whoa, you overwhelmed me!$" .string "Whoa, you overwhelmed me!$"
AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B AbandonedShip_Corridors_1F_Text_CharliePostBattle: @ 8237A1B
.string "It's not easy throwing POKé BALLS\n" .string "It's not easy throwing POKé BALLS\n"
.string "while hanging on to an inner tube!$" .string "while hanging on to an inner tube!$"
AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 AbandonedShip_Corridors_1F_Text_IsntItFunHere: @ 8237A60
.string "Isn't it fun here?\n" .string "Isn't it fun here?\n"
.string "I get excited just being here!$" .string "I get excited just being here!$"
data/maps/AbandonedShip_Corridors_B1F/map.json
+3 -3
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", "script": "AbandonedShip_Corridors_B1F_EventScript_TuberM",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4", "trainer_sight_or_berry_tree_id": "4",
"script": "AbandonedShip_Corridors_B1F_EventScript_237E13", "script": "AbandonedShip_Corridors_B1F_EventScript_Duncan",
"flag": "0" "flag": "0"
} }
], ],
@@ -107,7 +107,7 @@
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor"
} }
] ]
} }
data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+32 -33
View File
@@ -1,88 +1,87 @@
AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
.byte 0 .byte 0
AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
end end
AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98
call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5 call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
end end
AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB
setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1 setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
return return
AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5
setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1 setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
return return
AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF
msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC
end end
AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
lockall lockall
goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09 goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
checkitem ITEM_STORAGE_KEY, 1 checkitem ITEM_STORAGE_KEY, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
takeitem ITEM_STORAGE_KEY, 1 takeitem ITEM_STORAGE_KEY, 1
setflag FLAG_USED_STORAGE_KEY setflag FLAG_USED_STORAGE_KEY
call AbandonedShip_Corridors_B1F_EventScript_237DB5 call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
special DrawWholeMapView special DrawWholeMapView
releaseall releaseall
end end
AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF
msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09
msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13
trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat
msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A
.string "When we go out to sea, we SAILORS\n" .string "When we go out to sea, we SAILORS\n"
.string "always bring our POKéMON.\l" .string "always bring our POKéMON.\l"
.string "How about a quick battle?$" .string "How about a quick battle?$"
AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80
.string "Whoops, I'm sunk!$" .string "Whoops, I'm sunk!$"
AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 AbandonedShip_Corridors_B1F_Text_DuncanPostBattle: @ 8237E92
.string "The ship's bottom has sunk into the\n" .string "The ship's bottom has sunk into the\n"
.string "depths.\p" .string "depths.\p"
.string "If a POKéMON knew how to go underwater,\n" .string "If a POKéMON knew how to go underwater,\n"
.string "we might make some progress…$" .string "we might make some progress…$"
AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03
.string "Yay!\n" .string "Yay!\n"
.string "It's a ship!$" .string "It's a ship!$"
AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15
.string "The door is locked.\p" .string "The door is locked.\p"
.string "“STORAGE” is painted on the door.$" .string "“STORAGE” is painted on the door.$"
AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B AbandonedShip_Corridors_B1F_Text_InsertedStorageKey: @ 8237F4B
.string "{PLAYER} inserted and turned the\n" .string "{PLAYER} inserted and turned the\n"
.string "STORAGE KEY.\p" .string "STORAGE KEY.\p"
.string "The inserted KEY stuck fast,\n" .string "The inserted KEY stuck fast,\n"
.string "but the door opened.$" .string "but the door opened.$"
AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5 AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5
AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5
.string "The door is open.$" .string "The door is open.$"
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+4 -4
View File
@@ -66,7 +66,7 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door"
}, },
{ {
"type": "sign", "type": "sign",
@@ -74,7 +74,7 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door"
}, },
{ {
"type": "sign", "type": "sign",
@@ -82,7 +82,7 @@
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door"
}, },
{ {
"type": "sign", "type": "sign",
@@ -90,7 +90,7 @@
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door"
} }
] ]
} }
data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+67 -67
View File
@@ -1,157 +1,157 @@
AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
.byte 0 .byte 0
AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
end end
AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6
call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
end end
AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9
setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
return return
AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3
setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
return return
AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD
setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0 setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
return return
AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7
setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0 setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
return return
AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1
setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
return return
AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB
setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
return return
AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05
setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0 setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0
return return
AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F
setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0 setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0
return return
AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
lockall lockall
goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_1_KEY, 1 checkitem ITEM_ROOM_1_KEY, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
takeitem ITEM_ROOM_1_KEY, 1 takeitem ITEM_ROOM_1_KEY, 1
setflag FLAG_USED_ROOM_1_KEY setflag FLAG_USED_ROOM_1_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
special DrawWholeMapView special DrawWholeMapView
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
lockall lockall
goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_2_KEY, 1 checkitem ITEM_ROOM_2_KEY, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
takeitem ITEM_ROOM_2_KEY, 1 takeitem ITEM_ROOM_2_KEY, 1
setflag FLAG_USED_ROOM_2_KEY setflag FLAG_USED_ROOM_2_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
special DrawWholeMapView special DrawWholeMapView
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
lockall lockall
goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_4_KEY, 1 checkitem ITEM_ROOM_4_KEY, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
takeitem ITEM_ROOM_4_KEY, 1 takeitem ITEM_ROOM_4_KEY, 1
setflag FLAG_USED_ROOM_4_KEY setflag FLAG_USED_ROOM_4_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
special DrawWholeMapView special DrawWholeMapView
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
lockall lockall
goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_6_KEY, 1 checkitem ITEM_ROOM_6_KEY, 1
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
takeitem ITEM_ROOM_6_KEY, 1 takeitem ITEM_ROOM_6_KEY, 1
setflag FLAG_USED_ROOM_6_KEY setflag FLAG_USED_ROOM_6_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
special DrawWholeMapView special DrawWholeMapView
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5
msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF
msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09
msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D
msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27 AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27
.string "The door is locked.\p" .string "The door is locked.\p"
.string "“RM. 1” is painted on the door.$" .string "“RM. 1” is painted on the door.$"
AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked: @ 8238B5B
.string "The door is locked.\p" .string "The door is locked.\p"
.string "“RM. 2” is painted on the door.$" .string "“RM. 2” is painted on the door.$"
AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F
.string "The door is locked.\p" .string "The door is locked.\p"
.string "“RM. 4” is painted on the door.$" .string "“RM. 4” is painted on the door.$"
AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3 AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked: @ 8238BC3
.string "The door is locked.\p" .string "The door is locked.\p"
.string "“RM. 6” is painted on the door.$" .string "“RM. 6” is painted on the door.$"
AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7 AbandonedShip_HiddenFloorCorridors_Text_InsertedKey: @ 8238BF7
.string "{PLAYER} inserted and turned the\n" .string "{PLAYER} inserted and turned the\n"
.string "KEY.\p" .string "KEY.\p"
.string "The inserted KEY stuck fast,\n" .string "The inserted KEY stuck fast,\n"
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+6 -6
View File
@@ -172,7 +172,7 @@
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}, },
{ {
"type": "sign", "type": "sign",
@@ -180,7 +180,7 @@
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}, },
{ {
"type": "sign", "type": "sign",
@@ -188,7 +188,7 @@
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}, },
{ {
"type": "sign", "type": "sign",
@@ -196,7 +196,7 @@
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}, },
{ {
"type": "sign", "type": "sign",
@@ -204,7 +204,7 @@
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}, },
{ {
"type": "sign", "type": "sign",
@@ -212,7 +212,7 @@
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
} }
] ]
} }
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+57 -80
View File
@@ -1,148 +1,125 @@
AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
.byte 0 .byte 0
AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
.2byte 0 .2byte 0
AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 @ After the below calculation, VAR_TEMP_4 is the room number of the door the player entered
@ Bottom row, left column (Rm 1)
@ Bottom row, middle column (Rm 2)
@ Bottom row, right column (Rm 3)
@ Upper row, left column (Rm 4)
@ Upper row, middle column (Rm 5)
@ Upper row, right column (Rm 6)
AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
getplayerxy VAR_TEMP_2, VAR_TEMP_3 getplayerxy VAR_TEMP_2, VAR_TEMP_3
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
compare VAR_TEMP_2, 21 compare VAR_TEMP_2, 21
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn
compare VAR_TEMP_2, 36 compare VAR_TEMP_2, 36
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn
compare VAR_TEMP_3, 2 compare VAR_TEMP_3, 2
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow
switch VAR_TEMP_4 switch VAR_TEMP_4
case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1
case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2
case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D case 3, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3
case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33 case 4, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4
case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B case 5, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5
case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2 case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6
end end
AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1 AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1
addvar VAR_TEMP_4, 1 addvar VAR_TEMP_4, 1
return return
AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7
addvar VAR_TEMP_4, 2 addvar VAR_TEMP_4, 2
return return
AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD
addvar VAR_TEMP_4, 3 addvar VAR_TEMP_4, 3
return return
AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
delay 20 delay 20
setfieldeffectargument 0, 10 dofieldeffectsparkle 10, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
delay 20 delay 20
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32 AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
delay 20 delay 20
setfieldeffectargument 0, 8 dofieldeffectsparkle 8, 5
setfieldeffectargument 1, 5 dofieldeffectsparkle 11, 3
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 11
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
delay 20 delay 20
setfieldeffectargument 0, 16 dofieldeffectsparkle 16, 3
setfieldeffectargument 1, 3 dofieldeffectsparkle 25, 2
setfieldeffectargument 2, 0 dofieldeffectsparkle 24, 6
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 25
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 24
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2
end end
AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3
setfieldeffectargument 0, 42 dofieldeffectsparkle 42, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return return
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3
setfieldeffectargument 0, 20 dofieldeffectsparkle 20, 5
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return return
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3
setfieldeffectargument 0, 1 dofieldeffectsparkle 1, 12
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return return
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3
setfieldeffectargument 0, 1 dofieldeffectsparkle 1, 2
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return return
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3
lockall lockall
msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT
releaseall releaseall
end end
AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE
.string "It's bright and shiny!\n" .string "It's bright and shiny!\n"
.string "But it's just trash…$" .string "But it's just trash…$"
data/maps/AbandonedShip_Rooms2_1F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", "script": "AbandonedShip_Rooms2_1F_EventScript_Dan",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "AbandonedShip_Rooms2_1F_EventScript_23810B", "script": "AbandonedShip_Rooms2_1F_EventScript_Kira",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "AbandonedShip_Rooms2_1F_EventScript_238186", "script": "AbandonedShip_Rooms2_1F_EventScript_Garrison",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "AbandonedShip_Rooms2_1F_EventScript_23816F", "script": "AbandonedShip_Rooms2_1F_EventScript_Jani",
"flag": "0" "flag": "0"
} }
], ],
data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+49 -49
View File
@@ -1,151 +1,151 @@
AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
.byte 0 .byte 0
AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_DanRematch
msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT
release release
end end
AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT @ Kira speaks for both when registering KiraAndDan
register_matchcall TRAINER_KIRA_AND_DAN_1 register_matchcall TRAINER_KIRA_AND_DAN_1
release release
end end
AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0
trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanRematchIntro, AbandonedShip_Rooms2_1F_Text_DanRematchDefeat, AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons
msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms2_1F_Text_DanPostRematch, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_KiraRematch
msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT
release release
end end
AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_KIRA_AND_DAN_1 register_matchcall TRAINER_KIRA_AND_DAN_1
release release
end end
AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154
trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraRematchIntro, AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat, AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons
msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms2_1F_Text_KiraPostRematch, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F
trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat
msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186
trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat
msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D
.string "DAN: While searching for treasures,\n" .string "DAN: While searching for treasures,\n"
.string "we discovered a TRAINER!$" .string "we discovered a TRAINER!$"
AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA AbandonedShip_Rooms2_1F_Text_DanDefeat: @ 82381DA
.string "DAN: We couldn't win even though\n" .string "DAN: We couldn't win even though\n"
.string "we worked together…$" .string "we worked together…$"
AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F AbandonedShip_Rooms2_1F_Text_DanPostBattle: @ 823820F
.string "DAN: We can't find any treasures…\n" .string "DAN: We can't find any treasures…\n"
.string "I wonder if someone got them already?$" .string "I wonder if someone got them already?$"
AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons: @ 8238257
.string "DAN: You don't even have two POKéMON.\n" .string "DAN: You don't even have two POKéMON.\n"
.string "You can't expect to beat us like that.$" .string "You can't expect to beat us like that.$"
AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 AbandonedShip_Rooms2_1F_Text_KiraIntro: @ 82382A4
.string "KIRA: Oh?\n" .string "KIRA: Oh?\n"
.string "We were searching for treasures.\l" .string "We were searching for treasures.\l"
.string "But we discovered a TRAINER instead!$" .string "But we discovered a TRAINER instead!$"
AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4
.string "KIRA: Ooh, so strong!$" .string "KIRA: Ooh, so strong!$"
AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A AbandonedShip_Rooms2_1F_Text_KiraPostBattle: @ 823830A
.string "KIRA: Where could the treasures be?\p" .string "KIRA: Where could the treasures be?\p"
.string "I've already decided what I'm buying\n" .string "I've already decided what I'm buying\n"
.string "when we find the treasures!$" .string "when we find the treasures!$"
AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons: @ 823836F
.string "KIRA: Oh, you don't have two POKéMON?\n" .string "KIRA: Oh, you don't have two POKéMON?\n"
.string "We'll have to battle some other time!$" .string "We'll have to battle some other time!$"
AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB AbandonedShip_Rooms2_1F_Text_KiraRegister: @ 82383BB
.string "KIRA: Oh, you make me so angry!\n" .string "KIRA: Oh, you make me so angry!\n"
.string "I'm going to register you for that!$" .string "I'm going to register you for that!$"
AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF AbandonedShip_Rooms2_1F_Text_DanRematchIntro: @ 82383FF
.string "DAN: We've been searching for\n" .string "DAN: We've been searching for\n"
.string "treasures all this time.\p" .string "treasures all this time.\p"
.string "Our POKéMON have grown stronger, too.\n" .string "Our POKéMON have grown stronger, too.\n"
.string "Let us show you, okay?$" .string "Let us show you, okay?$"
AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 AbandonedShip_Rooms2_1F_Text_DanRematchDefeat: @ 8238473
.string "DAN: You're strong, as usual!$" .string "DAN: You're strong, as usual!$"
AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491
.string "DAN: We can't find any treasures,\n" .string "DAN: We can't find any treasures,\n"
.string "we lose at POKéMON…\p" .string "we lose at POKéMON…\p"
.string "I want to go home… But if I say that,\n" .string "I want to go home… But if I say that,\n"
.string "she gets all angry with me…$" .string "she gets all angry with me…$"
AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509
.string "DAN: You don't even have two POKéMON.\n" .string "DAN: You don't even have two POKéMON.\n"
.string "You can't expect to beat us like that.$" .string "You can't expect to beat us like that.$"
AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 AbandonedShip_Rooms2_1F_Text_KiraRematchIntro: @ 8238556
.string "KIRA: Oh? We meet again!\p" .string "KIRA: Oh? We meet again!\p"
.string "Just like us, you still haven't given up\n" .string "Just like us, you still haven't given up\n"
.string "searching for treasures, have you?\p" .string "searching for treasures, have you?\p"
.string "Want to make it so the loser has\n" .string "Want to make it so the loser has\n"
.string "to give up searching?$" .string "to give up searching?$"
AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2
.string "KIRA: Oh, we lost again…$" .string "KIRA: Oh, we lost again…$"
AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B AbandonedShip_Rooms2_1F_Text_KiraPostRematch: @ 823860B
.string "KIRA: We're not leaving until we raise\n" .string "KIRA: We're not leaving until we raise\n"
.string "our POKéMON some more and we find\l" .string "our POKéMON some more and we find\l"
.string "the treasures here!$" .string "the treasures here!$"
AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons: @ 8238668
.string "KIRA: Oh, you don't have two POKéMON?\n" .string "KIRA: Oh, you don't have two POKéMON?\n"
.string "We'll have to battle some other time!$" .string "We'll have to battle some other time!$"
AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 AbandonedShip_Rooms2_1F_Text_JaniIntro: @ 82386B4
.string "I'm not good at swimming,\n" .string "I'm not good at swimming,\n"
.string "but I am good at battles!$" .string "but I am good at battles!$"
AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8
.string "Oops.\n" .string "Oops.\n"
.string "That didn't go very well.$" .string "That didn't go very well.$"
AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 AbandonedShip_Rooms2_1F_Text_JaniPostBattle: @ 8238708
.string "Walking around barefoot in this ship\n" .string "Walking around barefoot in this ship\n"
.string "is kind of gross.$" .string "is kind of gross.$"
AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F
.string "Strength and compassion…\n" .string "Strength and compassion…\n"
.string "Those are a TRAINER's treasures!$" .string "Those are a TRAINER's treasures!$"
AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 AbandonedShip_Rooms2_1F_Text_GarrisonDefeat: @ 8238779
.string "Ah, there is something about you\n" .string "Ah, there is something about you\n"
.string "that sparkles.$" .string "that sparkles.$"
AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9
.string "In a cabin somewhere on board,\n" .string "In a cabin somewhere on board,\n"
.string "I saw something sparkle.$" .string "I saw something sparkle.$"
data/maps/AbandonedShip_Rooms2_B1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_238025", "script": "AbandonedShip_Rooms2_B1F_EventScript_Camper",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
+3 -3
View File
@@ -1,11 +1,11 @@
AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024
.byte 0 .byte 0
AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025
msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
end end
AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E
.string "This is a perfect place to go exploring!\n" .string "This is a perfect place to go exploring!\n"
.string "It's exciting here!\p" .string "It's exciting here!\p"
.string "I bet there're amazing treasures on\n" .string "I bet there're amazing treasures on\n"
data/maps/AbandonedShip_Rooms_1F/map.json
+3 -3
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_237A93", "script": "AbandonedShip_Rooms_1F_EventScript_Gentleman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4", "trainer_sight_or_berry_tree_id": "4",
"script": "AbandonedShip_Rooms_1F_EventScript_237AB3", "script": "AbandonedShip_Rooms_1F_EventScript_Thalia",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4", "trainer_sight_or_berry_tree_id": "4",
"script": "AbandonedShip_Rooms_1F_EventScript_237A9C", "script": "AbandonedShip_Rooms_1F_EventScript_Demetrius",
"flag": "0" "flag": "0"
} }
], ],
data/maps/AbandonedShip_Rooms_1F/scripts.inc
+26 -26
View File
@@ -1,78 +1,78 @@
AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92
.byte 0 .byte 0
AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93
msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
end end
AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C
trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat
msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE goto_if_eq AbandonedShip_Rooms_1F_EventScript_ThaliaRematch
msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT
release release
end end
AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
special PlayerFaceTrainerAfterBattle special PlayerFaceTrainerAfterBattle
waitmovement 0 waitmovement 0
msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_THALIA_1 register_matchcall TRAINER_THALIA_1
release release
end end
AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE
trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat
msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE
end end
AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 AbandonedShip_Rooms_1F_Text_TakingALookAround: @ 8237B15
.string "Ships of this sort are rare, so I'm\n" .string "Ships of this sort are rare, so I'm\n"
.string "taking a look around.\p" .string "taking a look around.\p"
.string "Hmhm…\n" .string "Hmhm…\n"
.string "There appear to be other cabins…$" .string "There appear to be other cabins…$"
AbandonedShip_Rooms_1F_Text_237B76: @ 8237B76 AbandonedShip_Rooms_1F_Text_ThaliaIntro: @ 8237B76
.string "What on earth would compel you to\n" .string "What on earth would compel you to\n"
.string "come here? You must be curious!$" .string "come here? You must be curious!$"
AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 AbandonedShip_Rooms_1F_Text_ThaliaDefeat: @ 8237BB8
.string "Not just curious, but also strong…$" .string "Not just curious, but also strong…$"
AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB
.string "The man next door…\p" .string "The man next door…\p"
.string "He says he's just sightseeing,\n" .string "He says he's just sightseeing,\n"
.string "but I don't know about that.$" .string "but I don't know about that.$"
AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A AbandonedShip_Rooms_1F_Text_ThaliaRegister: @ 8237C2A
.string "You're such a tough TRAINER!\n" .string "You're such a tough TRAINER!\n"
.string "Let me register you as a memento!$" .string "Let me register you as a memento!$"
AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro: @ 8237C69
.string "What on earth would compel you to\n" .string "What on earth would compel you to\n"
.string "come back? You must really be curious!$" .string "come back? You must really be curious!$"
AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat: @ 8237CB2
.string "Aren't you too strong?$" .string "Aren't you too strong?$"
AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9
.string "I'm sure that man's up to something!\n" .string "I'm sure that man's up to something!\n"
.string "He just acts so suspiciously!$" .string "He just acts so suspiciously!$"
AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C
.string "Waaah!\n" .string "Waaah!\n"
.string "I've been found! …Huh?$" .string "I've been found! …Huh?$"
AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A AbandonedShip_Rooms_1F_Text_DemetriusDefeat: @ 8237D2A
.string "Oh, you're not my mom.$" .string "Oh, you're not my mom.$"
AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 AbandonedShip_Rooms_1F_Text_DemetriusPostBattle: @ 8237D41
.string "I'm in trouble with my mom, so I ran.\n" .string "I'm in trouble with my mom, so I ran.\n"
.string "Keep it a secret where I am!$" .string "Keep it a secret where I am!$"
data/maps/AbandonedShip_Rooms_B1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", "script": "AbandonedShip_Rooms_B1F_EventScript_FatMan",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+5 -5
View File
@@ -1,16 +1,16 @@
AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
.byte 0 .byte 0
AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
end end
AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6
msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
end end
AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF
.string "Urrrrppp…\p" .string "Urrrrppp…\p"
.string "I'm getting queasy just being aboard\n" .string "I'm getting queasy just being aboard\n"
.string "this ship…\p" .string "this ship…\p"
data/maps/AbandonedShip_Underwater1/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AbandonedShip_Underwater1_MapScripts:: @ 8238096 AbandonedShip_Underwater1_MapScripts:: @ 8238096
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
.byte 0 .byte 0
AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C AbandonedShip_Underwater1_OnResume: @ 823809C
setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
end end
data/maps/AbandonedShip_Underwater2/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AbandonedShip_Underwater2_MapScripts:: @ 823895D AbandonedShip_Underwater2_MapScripts:: @ 823895D
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
.byte 0 .byte 0
AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 AbandonedShip_Underwater2_OnResume: @ 8238963
setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
end end
include/constants/metatile_labels.h
+4 -4
View File
@@ -255,10 +255,10 @@
#define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E #define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E
// gTileset_InsideShip // gTileset_InsideShip
#define METATILE_InsideShip_InTactDoor0_Bottom 0x233 #define METATILE_InsideShip_IntactDoor_Bottom_Unlocked 0x22B
#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B #define METATILE_InsideShip_IntactDoor_Bottom_Locked 0x233
#define METATILE_InsideShip_DoorIndent1 0x21A #define METATILE_InsideShip_DoorIndent_Unlocked 0x21A
#define METATILE_InsideShip_DoorIndent0 0x234 #define METATILE_InsideShip_DoorIndent_Locked 0x234
// gTileset_BattlePike // gTileset_BattlePike
#define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A