Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-03-03 18:37:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AbandonedShip name parity update with PokeEmerald. (#874)
Some checks failed
CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Xyifer 2025-02-25 08:18:15 -06:00 committed by GitHub
parent c3530bdf81
commit 6eec908ad1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 194 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data-de/maps/AbandonedShip_CaptainsOffice/text.inc vendored
View File

@ -1,18 +1,18 @@
AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85
AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:: @ 8198C85
.string "Ich untersuche das Schiff im Auftrag\n"
.string "von KAPT. BRIGG.\p"
.string "Er hat mich auch beauftragt, einen\n"
.string "SCANNER zu finden, aber ich habe \l"
.string "ihn noch nicht gefunden.$"
AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00
AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:: @ 8198D00
.string "Oh! Das ist der SCANNER!\p"
.string "Würdest du den bitte für mich zu\n"
.string "KAPT. BRIGG bringen? Das wäre nett.\p"
.string "Ich möchte das Schiff noch weiter\n"
.string "untersuchen.$"
AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B
AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:: @ 8198D7B
.string "Dieses Schiff heißt MS CACTUS. Es\n"
.string "scheint aus einer früheren Epoche zu\l"
.string "stammen.$"

8
data-de/maps/AbandonedShip_Corridors_1F/text.inc vendored
View File

@ -1,15 +1,15 @@
AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D
AbandonedShip_Corridors_1F_Text_CharlieIntro:: @ 819843D
.string "Was ist so lustig daran, dass ich meinen\n"
.string "Schwimmreifen mit an Bord habe?$"
AbandonedShip_Corridors_1F_Text_198479:: @ 8198479
AbandonedShip_Corridors_1F_Text_CharlieDefeat:: @ 8198479
.string "Hui, du hast mir die Luft rausgelassen!$"
AbandonedShip_Corridors_1F_Text_198493:: @ 8198493
AbandonedShip_Corridors_1F_Text_CharliePostBattle:: @ 8198493
.string "Es ist gar nicht so einfach, POKéBÄLLE\n"
.string "zu werfen, wenn man einen Schwimmreifen\l"
.string "trägt!$"
AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8
AbandonedShip_Corridors_1F_Text_IsntItFunHere:: @ 81984D8
.string "Hier ist es doch wirklich lustig, nicht\n"
.string "wahr? Ich bin total aufgeregt.$"

32
data-de/maps/AbandonedShip_Rooms2_1F/text.inc vendored
View File

@ -1,70 +1,70 @@
AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1
AbandonedShip_Rooms2_1F_Text_HalIntro:: @ 81987C1
.string "PIT: Wir haben nach Schätzen gesucht\n"
.string "- und einen TRAINER gefunden!$"
AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE
AbandonedShip_Rooms2_1F_Text_HalDefeat:: @ 81987FE
.string "PIT: Wir konnten nicht gewinnen, obwohl\n"
.string "wir zusammengearbeitet haben...$"
AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835
AbandonedShip_Rooms2_1F_Text_HalPostBattle:: @ 8198835
.string "PIT: Wir konnten keine Schätze finden.\n"
.string "Ob uns jemand zuvorgekommen ist?$"
AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F
AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon:: @ 819887F
.string "PIT: Du hast keine zwei POKéMON.\n"
.string "So kannst du nicht gegen uns antreten.$"
AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC
AbandonedShip_Rooms2_1F_Text_LoisIntro:: @ 81988CC
.string "GESA: Oh? Wir haben nach Schätzen\n"
.string "gesucht und einen TRAINER gefunden.$"
AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916
AbandonedShip_Rooms2_1F_Text_LoisDefeat:: @ 8198916
.string "GESA: Oh, wow, bist du stark!$"
AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934
AbandonedShip_Rooms2_1F_Text_LoisPostBattle:: @ 8198934
.string "GESA: Ich frage mich, wo die Schätze\n"
.string "versteckt sind...\p"
.string "Ich weiß, was ich mir alles kaufen\n"
.string "würde, wenn ich reich wäre...$"
AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A
AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon:: @ 819899A
.string "GESA: Hast du keine zwei POKéMON?\n"
.string "Dann können wir jetzt nicht kämpfen.$"
AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF
AbandonedShip_Rooms2_1F_Text_HalRematchIntro:: @ 81989DF
.string "PIT: Wir haben die ganze Zeit nur nach\n"
.string "Schätzen gesucht.\p"
.string "Aber unsere POKéMON sind auch stärker\n"
.string "geworden. Dürfen wir dir das zeigen?$"
AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53
AbandonedShip_Rooms2_1F_Text_HalRematchDefeat:: @ 8198A53
.string "PIT: Du bist stark wie immer.$"
AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70
AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle:: @ 8198A70
.string "PIT: Wir haben keine Schätze gefunden,\n"
.string "sondern gegen POKéMON verloren...\p"
.string "Ich will nach Hause... Aber wenn ich das\n"
.string "laut sage, wird sie sauer auf mich.$"
AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE
AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon:: @ 8198AEE
.string "PIT: Du hast keine zwei POKéMON.\n"
.string "So können wir nicht kämpfen.$"
AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B
AbandonedShip_Rooms2_1F_Text_LoisRematchIntro:: @ 8198B3B
.string "GESA: Oh, da bist du ja wieder!\p"
.string "Genau wie wir, hast du die Suche nach\n"
.string "Schätzen auch nicht aufgegeben, was?\p"
.string "Wie wäre es mit einem Kampf? Und der\n"
.string "Verlierer gibt die Suche auf?$"
AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF
AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat:: @ 8198BCF
.string "GESA: Ach, wir haben wieder verloren...$"
AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA
AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle:: @ 8198BEA
.string "GESA: Wir müssen unsere POKéMON mehr\n"
.string "trainieren.\p"
.string "Wir gehen nicht ohne Schatz nach Hause!$"
AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40
AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon:: @ 8198C40
.string "GESA: Hast du keine zwei POKéMON?\n"
.string "Dann müssen wir später kämpfen.$"

2
data-de/maps/AbandonedShip_Rooms2_B1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759
AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:: @ 8198759
.string "Ein perfekter Ort, auf Erkundungstour\n"
.string "zu gehen. Es ist aufregend hier!\p"
.string "Ich wette, hier sind wertvolle Schätze\n"

2
data-de/maps/AbandonedShip_Rooms_1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A
AbandonedShip_Rooms_1F_Text_TakingALookAround:: @ 819850A
.string "Schiffe dieser Art sind sehr selten,\n"
.string "daher schaue ich mich hier gut um.\p"
.string "Hmhm...\n"

2
data-de/maps/AbandonedShip_Rooms_B1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE
AbandonedShip_Rooms_B1F_Text_GettingQueasy:: @ 81986FE
.string "Bööörps...\p"
.string "Mir wird schon übel, sobald ich ein\n"
.string "Schiff nur betrete...\p"

20
data/item_ball_scripts.inc
View File

@ -334,43 +334,43 @@ NewMauville_Inside_EventScript_1B1870:: @ 81B1870
finditem ITEM_PARALYZE_HEAL
end
AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D
AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 81B187D
finditem ITEM_HARBOR_MAIL
end
AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A
AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 81B188A
finditem ITEM_ESCAPE_ROPE
end
AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897
AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 81B1897
finditem ITEM_DIVE_BALL
end
AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4
AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam:: @ 81B18A4
finditem ITEM_TM13_ICE_BEAM
end
AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1
AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 81B18B1
finditem ITEM_REVIVE
end
AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE
AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 81B18BE
finditem ITEM_STORAGE_KEY
end
AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB
AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 81B18CB
finditem ITEM_LUXURY_BALL
end
AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8
AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 81B18D8
finditem ITEM_SCANNER
end
AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5
AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 81B18E5
finditem ITEM_WATER_STONE
end
AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2
AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance:: @ 81B18F2
finditem ITEM_TM18_RAIN_DANCE
end

6
data/maps/AbandonedShip_CaptainsOffice/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_15EAF5",
"script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide",
"flag": "0"
},
{
@ -34,8 +34,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_1B18BE",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1"
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],
"warp_events": [

18
data/maps/AbandonedShip_CaptainsOffice/scripts.inc vendored
View File

@ -1,24 +1,24 @@
AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4
.byte 0
AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 815EAF5
lock
faceplayer
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
checkitem ITEM_SCANNER, 1
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D
msgbox AbandonedShip_CaptainsOffice_Text_198C85, MSGBOX_DEFAULT
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
release
end
AbandonedShip_CaptainsOffice_EventScript_15EB23:: @ 815EB23
msgbox AbandonedShip_CaptainsOffice_Text_198D00, MSGBOX_DEFAULT
AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 815EB23
msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT
release
end
AbandonedShip_CaptainsOffice_EventScript_15EB2D:: @ 815EB2D
msgbox AbandonedShip_CaptainsOffice_Text_198D7B, MSGBOX_DEFAULT
AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 815EB2D
msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT
release
end

6
data/maps/AbandonedShip_CaptainsOffice/text.inc vendored
View File

@ -1,16 +1,16 @@
AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85
AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:: @ 8198C85
.string "I'm investigating this ship on behalf\n"
.string "of CAPT. STERN.\p"
.string "He also asked me to find a SCANNER,\n"
.string "but I haven't had any success...$"
AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00
AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:: @ 8198D00
.string "Oh! That's a SCANNER!\p"
.string "Listen, can I get you to deliver that\n"
.string "to CAPT. STERN?\p"
.string "I want to investigate this ship a\n"
.string "little more.$"
AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B
AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:: @ 8198D7B
.string "This ship is called S.S. CACTUS.\n"
.string "It seems to be from an earlier era.$"

4
data/maps/AbandonedShip_Corridors_1F/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Corridors_1F_EventScript_15E965",
"script": "AbandonedShip_Corridors_1F_EventScript_Youngster",
"flag": "0"
},
{
@ -34,7 +34,7 @@
"movement_range_y": 7,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "AbandonedShip_Corridors_1F_EventScript_15E96E",
"script": "AbandonedShip_Corridors_1F_EventScript_Charlie",
"flag": "0"
}
],

10
data/maps/AbandonedShip_Corridors_1F/scripts.inc vendored
View File

@ -1,11 +1,11 @@
AbandonedShip_Corridors_1F_MapScripts:: @ 815E964
.byte 0
AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965
msgbox AbandonedShip_Corridors_1F_Text_1984D8, MSGBOX_NPC
AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 815E965
msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
end
AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E
trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479
msgbox AbandonedShip_Corridors_1F_Text_198493, MSGBOX_AUTOCLOSE
AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 815E96E
trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat
msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
end

8
data/maps/AbandonedShip_Corridors_1F/text.inc vendored
View File

@ -1,14 +1,14 @@
AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D
AbandonedShip_Corridors_1F_Text_CharlieIntro:: @ 819843D
.string "What's so funny about having my inner\n"
.string "tube aboard the ship?$"
AbandonedShip_Corridors_1F_Text_198479:: @ 8198479
AbandonedShip_Corridors_1F_Text_CharlieDefeat:: @ 8198479
.string "Whoa, you overwhelmed me!$"
AbandonedShip_Corridors_1F_Text_198493:: @ 8198493
AbandonedShip_Corridors_1F_Text_CharliePostBattle:: @ 8198493
.string "It's not easy throwing POKé BALLS\n"
.string "while hanging on to an inner tube!$"
AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8
AbandonedShip_Corridors_1F_Text_IsntItFunHere:: @ 81984D8
.string "Isn't it fun here?\n"
.string "I get excited just being here!$"

4
data/maps/AbandonedShip_Deck/scripts.inc vendored
View File

@ -1,7 +1,7 @@
AbandonedShip_Deck_MapScripts:: @ 815E95A
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_15E960
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
.byte 0
AbandonedShip_Deck_MapScript1_15E960:: @ 815E960
AbandonedShip_Deck_OnTransition:: @ 815E960
setflag FLAG_LANDMARK_ABANDONED_SHIP
end

36
data/maps/AbandonedShip_HiddenFloorRooms/map.json vendored
View File

@ -21,8 +21,8 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18CB",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@ -34,8 +34,8 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18D8",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@ -47,8 +47,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18F2",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@ -60,8 +60,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18E5",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],
"warp_events": [
@ -137,7 +137,7 @@
"y": 10,
"elevation": 3,
"item": "ITEM_ROOM_1_KEY",
"flag": "FLAG_HIDDEN_ITEM_1F"
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY"
},
{
"type": "hidden_item",
@ -145,7 +145,7 @@
"y": 5,
"elevation": 3,
"item": "ITEM_ROOM_2_KEY",
"flag": "FLAG_HIDDEN_ITEM_20"
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY"
},
{
"type": "hidden_item",
@ -153,7 +153,7 @@
"y": 12,
"elevation": 3,
"item": "ITEM_ROOM_4_KEY",
"flag": "FLAG_HIDDEN_ITEM_21"
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY"
},
{
"type": "hidden_item",
@ -161,7 +161,7 @@
"y": 2,
"elevation": 0,
"item": "ITEM_ROOM_6_KEY",
"flag": "FLAG_HIDDEN_ITEM_22"
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY"
},
{
"type": "sign",
@ -169,7 +169,7 @@
"y": 5,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
},
{
"type": "sign",
@ -177,7 +177,7 @@
"y": 3,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
},
{
"type": "sign",
@ -185,7 +185,7 @@
"y": 10,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
},
{
"type": "sign",
@ -193,7 +193,7 @@
"y": 3,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
},
{
"type": "sign",
@ -201,7 +201,7 @@
"y": 2,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
},
{
"type": "sign",
@ -209,7 +209,7 @@
"y": 6,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB"
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}
]
}

66
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc vendored
View File

@ -1,43 +1,43 @@
AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
.byte 0
AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07
map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11
AbandonedShip_HiddenFloorRooms_OnFrame:: @ 815ED07
map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
.2byte 0
AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11
AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 815ED11
setvar VAR_TEMP_1, 1
getplayerxy VAR_TEMP_2, VAR_TEMP_3
setvar VAR_TEMP_4, 1
compare VAR_TEMP_2, 21
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn
compare VAR_TEMP_2, 36
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn
compare VAR_TEMP_3, 2
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow
switch VAR_TEMP_4
case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B
case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4
case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5
case 4, AbandonedShip_HiddenFloorRooms_EventScript_15EDEB
case 5, AbandonedShip_HiddenFloorRooms_EventScript_15EE23
case 6, AbandonedShip_HiddenFloorRooms_EventScript_15EE6A
case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1
case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2
case 3, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3
case 4, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4
case 5, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5
case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6
end
AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89
AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 815ED89
addvar VAR_TEMP_4, 1
return
AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F
AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 815ED8F
addvar VAR_TEMP_4, 2
return
AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95
AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 815ED95
addvar VAR_TEMP_4, 3
return
AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 815ED9B
delay 20
setfieldeffectargument 0, 10
setfieldeffectargument 1, 10
@ -45,29 +45,29 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 815EDC4
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 815EDC5
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
delay 20
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA
AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 815EDEA
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 815EDEB
delay 20
setfieldeffectargument 0, 8
setfieldeffectargument 1, 5
@ -79,12 +79,12 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 815EE23
delay 20
setfieldeffectargument 0, 16
setfieldeffectargument 1, 3
@ -100,43 +100,43 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 815EE6A
end
AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B
AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 815EE6B
setfieldeffectargument 0, 42
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B
AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 815EE7B
setfieldeffectargument 0, 20
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B
AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 815EE8B
setfieldeffectargument 0, 1
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 815EE9B
setfieldeffectargument 0, 1
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB
AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 815EEAB
lockall
msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT
releaseall

4
data/maps/AbandonedShip_Room_B1F/map.json vendored
View File

@ -21,8 +21,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_1B18A4",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1"
"script": "AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM"
}
],
"warp_events": [

8
data/maps/AbandonedShip_Rooms2_1F/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_15EA68",
"script": "AbandonedShip_Rooms2_1F_EventScript_Hal",
"flag": "0"
},
{
@ -34,7 +34,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_15EAAE",
"script": "AbandonedShip_Rooms2_1F_EventScript_Lois",
"flag": "0"
},
{
@ -47,8 +47,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_1B18B1",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1"
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
}
],
"warp_events": [

28
data/maps/AbandonedShip_Rooms2_1F/scripts.inc vendored
View File

@ -1,28 +1,28 @@
AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67
.byte 0
AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68
trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
AbandonedShip_Rooms2_1F_EventScript_Hal:: @ 815EA68
trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_HalIntro, AbandonedShip_Rooms2_1F_Text_HalDefeat, AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93
msgbox AbandonedShip_Rooms2_1F_Text_198835, MSGBOX_AUTOCLOSE
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_HalRematch
msgbox AbandonedShip_Rooms2_1F_Text_HalPostBattle, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93
trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE
msgbox AbandonedShip_Rooms2_1F_Text_198A70, MSGBOX_AUTOCLOSE
AbandonedShip_Rooms2_1F_EventScript_HalRematch:: @ 815EA93
trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_HalRematchIntro, AbandonedShip_Rooms2_1F_Text_HalRematchDefeat, AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon
msgbox AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE
trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
AbandonedShip_Rooms2_1F_EventScript_Lois:: @ 815EAAE
trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_LoisIntro, AbandonedShip_Rooms2_1F_Text_LoisDefeat, AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9
msgbox AbandonedShip_Rooms2_1F_Text_198934, MSGBOX_AUTOCLOSE
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_LoisRematch
msgbox AbandonedShip_Rooms2_1F_Text_LoisPostBattle, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9
trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40
msgbox AbandonedShip_Rooms2_1F_Text_198BEA, MSGBOX_AUTOCLOSE
AbandonedShip_Rooms2_1F_EventScript_LoisRematch:: @ 815EAD9
trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_LoisRematchIntro, AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat, AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon
msgbox AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle, MSGBOX_AUTOCLOSE
end

32
data/maps/AbandonedShip_Rooms2_1F/text.inc vendored
View File

@ -1,70 +1,70 @@
AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1
AbandonedShip_Rooms2_1F_Text_HalIntro:: @ 81987C1
.string "HAL: While searching for treasures,\n"
.string "we discovered a TRAINER!$"
AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE
AbandonedShip_Rooms2_1F_Text_HalDefeat:: @ 81987FE
.string "HAL: We couldn't win even though\n"
.string "we worked together...$"
AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835
AbandonedShip_Rooms2_1F_Text_HalPostBattle:: @ 8198835
.string "HAL: We can't find any treasures...\n"
.string "I wonder if someone got them already?$"
AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F
AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon:: @ 819887F
.string "HAL: You don't even have two POKéMON.\n"
.string "You can't expect to beat us like that.$"
AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC
AbandonedShip_Rooms2_1F_Text_LoisIntro:: @ 81988CC
.string "LOIS: Oh? We were looking for some\n"
.string "treasure, but we only found a TRAINER.$"
AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916
AbandonedShip_Rooms2_1F_Text_LoisDefeat:: @ 8198916
.string "LOIS: Oh, wow, you're strong!$"
AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934
AbandonedShip_Rooms2_1F_Text_LoisPostBattle:: @ 8198934
.string "LOIS: I wonder where the treasures\n"
.string "are hidden?\p"
.string "I already know what I'm going to buy\n"
.string "when I find them!$"
AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A
AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon:: @ 819899A
.string "LOIS: Don't you have two POKéMON?\n"
.string "We'll have to battle another time!$"
AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF
AbandonedShip_Rooms2_1F_Text_HalRematchIntro:: @ 81989DF
.string "HAL: We've been searching for\n"
.string "treasures all this time.\p"
.string "Our POKéMON have grown stronger, too.\n"
.string "Let us show you, okay?$"
AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53
AbandonedShip_Rooms2_1F_Text_HalRematchDefeat:: @ 8198A53
.string "HAL: You're strong as usual!$"
AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70
AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle:: @ 8198A70
.string "HAL: We can't find any treasures,\n"
.string "we lose at POKéMON...\p"
.string "I want to go home... But if I say that,\n"
.string "she gets all angry with me...$"
AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE
AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon:: @ 8198AEE
.string "HAL: You don't even have two POKéMON.\n"
.string "You can't expect to beat us like that.$"
AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B
AbandonedShip_Rooms2_1F_Text_LoisRematchIntro:: @ 8198B3B
.string "LOIS: Oh, hi, we meet again!\p"
.string "Just like us, you haven't given up\n"
.string "searching for treasures!\p"
.string "How about we battle, and the loser has\n"
.string "to give up looking?$"
AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF
AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat:: @ 8198BCF
.string "LOIS: Oh, we lost again...$"
AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA
AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle:: @ 8198BEA
.string "LOIS: We'll raise our POKéMON more.\p"
.string "We're not going home until we find our\n"
.string "treasures!$"
AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40
AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon:: @ 8198C40
.string "LOIS: Don't you have two POKéMON?\n"
.string "We'll have to battle another time!$"

6
data/maps/AbandonedShip_Rooms2_B1F/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_15EA4E",
"script": "AbandonedShip_Rooms2_B1F_EventScript_Camper",
"flag": "0"
},
{
@ -34,8 +34,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_1B1897",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1"
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],
"warp_events": [

4
data/maps/AbandonedShip_Rooms2_B1F/scripts.inc vendored
View File

@ -1,6 +1,6 @@
AbandonedShip_Rooms2_B1F_MapScripts:: @ 815EA4D
.byte 0
AbandonedShip_Rooms2_B1F_EventScript_15EA4E:: @ 815EA4E
msgbox AbandonedShip_Rooms2_B1F_Text_198759, MSGBOX_NPC
AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 815EA4E
msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
end

2
data/maps/AbandonedShip_Rooms2_B1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759
AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:: @ 8198759
.string "This is a perfect place to go exploring!\n"
.string "It's exciting here!\p"
.string "I bet there're amazing treasures on\n"

6
data/maps/AbandonedShip_Rooms_1F/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_15E986",
"script": "AbandonedShip_Rooms_1F_EventScript_Gentleman",
"flag": "0"
},
{
@ -34,8 +34,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_1B187D",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1"
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
}
],
"warp_events": [

4
data/maps/AbandonedShip_Rooms_1F/scripts.inc vendored
View File

@ -1,6 +1,6 @@
AbandonedShip_Rooms_1F_MapScripts:: @ 815E985
.byte 0
AbandonedShip_Rooms_1F_EventScript_15E986:: @ 815E986
msgbox AbandonedShip_Rooms_1F_Text_19850A, MSGBOX_NPC
AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 815E986
msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
end

2
data/maps/AbandonedShip_Rooms_1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A
AbandonedShip_Rooms_1F_Text_TakingALookAround:: @ 819850A
.string "Ships of this sort are rare, so I'm\n"
.string "taking a look around.\p"
.string "Hmhm...\n"

6
data/maps/AbandonedShip_Rooms_B1F/map.json vendored
View File

@ -21,7 +21,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_15EA44",
"script": "AbandonedShip_Rooms_B1F_EventScript_FatMan",
"flag": "0"
},
{
@ -34,8 +34,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_1B188A",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1"
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],
"warp_events": [

8
data/maps/AbandonedShip_Rooms_B1F/scripts.inc vendored
View File

@ -1,11 +1,11 @@
AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_15EA3B
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_OnResume
.byte 0
AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B
AbandonedShip_Rooms_B1F_MapScript1_OnResume:: @ 815EA3B
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
end
AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44
msgbox AbandonedShip_Rooms_B1F_Text_1986FE, MSGBOX_NPC
AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 815EA44
msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
end

2
data/maps/AbandonedShip_Rooms_B1F/text.inc vendored
View File

@ -1,4 +1,4 @@
AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE
AbandonedShip_Rooms_B1F_Text_GettingQueasy:: @ 81986FE
.string "Urrrrppp...\p"
.string "I'm getting queasy just being aboard\n"
.string "this ship...\p"

4
data/maps/AbandonedShip_Underwater1/scripts.inc vendored
View File

@ -1,7 +1,7 @@
AbandonedShip_Underwater1_MapScripts:: @ 815EA57
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_15EA5D
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
.byte 0
AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D
AbandonedShip_Underwater1_OnResume:: @ 815EA5D
setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
end

4
data/maps/AbandonedShip_Underwater2/scripts.inc vendored
View File

@ -1,7 +1,7 @@
AbandonedShip_Underwater2_MapScripts:: @ 815EB37
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_15EB3D
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
.byte 0
AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D
AbandonedShip_Underwater2_OnResume:: @ 815EB3D
setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
end

28
include/constants/flags.h
View File

@ -288,10 +288,10 @@
#define FLAG_HIDDEN_ITEM_1C 0x274
#define FLAG_HIDDEN_ITEM_1D 0x275
#define FLAG_HIDDEN_ITEM_1E 0x276
#define FLAG_HIDDEN_ITEM_1F 0x277
#define FLAG_HIDDEN_ITEM_20 0x278
#define FLAG_HIDDEN_ITEM_21 0x279
#define FLAG_HIDDEN_ITEM_22 0x27A
#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY 0x277
#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY 0x278
#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY 0x279
#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY 0x27A
#define FLAG_HIDDEN_ITEM_23 0x27B
#define FLAG_HIDDEN_ITEM_24 0x27C
#define FLAG_HIDDEN_ITEM_25 0x27D
@ -688,8 +688,8 @@
#define FLAG_ITEM_MT_PYRE_EXTERIOR_2 0x432
#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 0x433
#define FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 0x434
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 0x435
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 0x436
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER 0x436
#define FLAG_ITEM_SCORCHED_SLAB_1 0x437
#define FLAG_ITEM_METEOR_FALLS_B1F_2R_1 0x438
#define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 0x439
@ -706,14 +706,14 @@
#define FLAG_ITEM_ROUTE124_2 0x444
#define FLAG_ITEM_ROUTE124_3 0x445
#define FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 0x446
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 0x447
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 0x448
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 0x449
#define FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 0x44A
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 0x44B
#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 0x44C
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 0x44D
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 0x44E
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM 0x44A
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B
#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE 0x44E
#define FLAG_ITEM_ROUTE121_1 0x44F
#define FLAG_ITEM_ROUTE123_3 0x450
#define FLAG_ITEM_ROUTE126_1 0x451

2
src/debug/tomomichi_debug_menu.c
View File

@ -773,7 +773,7 @@ static const struct MenuAction gUnknown_Debug_083C1A9C[] = {
static const u8 gUnknown_Debug_083C1AAC[] = {2};
static const u16 gUnknown_Debug_083C1AAE[][9] = {
{FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08}
{FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08}
};
static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER");

8
src/field_specials.c
View File

@ -1643,7 +1643,7 @@ u16 GetSlotMachineId(void)
bool8 FoundAbandonedShipRoom1Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
u16 flag = FLAG_HIDDEN_ITEM_1F;
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY;
*specVar = flag;
if (!FlagGet(flag))
{
@ -1655,7 +1655,7 @@ bool8 FoundAbandonedShipRoom1Key(void)
bool8 FoundAbandonedShipRoom2Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
u16 flag = FLAG_HIDDEN_ITEM_20;
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY;
*specVar = flag;
if (!FlagGet(flag))
{
@ -1667,7 +1667,7 @@ bool8 FoundAbandonedShipRoom2Key(void)
bool8 FoundAbandonedShipRoom4Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
u16 flag = FLAG_HIDDEN_ITEM_21;
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY;
*specVar = flag;
if (!FlagGet(flag))
{
@ -1679,7 +1679,7 @@ bool8 FoundAbandonedShipRoom4Key(void)
bool8 FoundAbandonedShipRoom6Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
u16 flag = FLAG_HIDDEN_ITEM_22;
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY;
*specVar = flag;
if (!FlagGet(flag))
{