diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-06 19:49:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 19:49:14 -0500 |
| commit | 2b944fd7213baa0d54003e0b876c4e3e5df4dfbd (patch) | |
| tree | a6b514e610ec3ef32e597f1917c77d34f5e272e8 | |
| parent | 25d026aded10c9a9567d214e46bf41ff4153eb46 (diff) | |
| parent | 1475c4d8da2e27734aa5a738e2287222c1e21386 (diff) | |
Merge branch 'master' into doc-trickhouse
77 files changed, 1302 insertions, 1179 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 64f2cdc92..40430fe53 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1630,6 +1630,14 @@ call_if 5, \dest .endm + .macro vgoto_if_eq dest:req + vgoto_if 1, \dest + .endm + + .macro vgoto_if_ne dest:req + vgoto_if 0, \dest + .endm + .macro switch var:req copyvar VAR_0x8000, \var .endm @@ -1671,3 +1679,10 @@ setorcopyvar VAR_0x8000, \trainer callstd STD_REGISTER_MATCH_CALL .endm + + .macro dofieldeffectsparkle x:req, y:req, priority:req + setfieldeffectargument 0, \x + setfieldeffectargument 1, \y + setfieldeffectargument 2, \priority + dofieldeffect FLDEFF_SPARKLE + .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 532e87d36..b1e637bf0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -825,12 +825,12 @@ Common_EventScript_BagIsFull:: @ 827205E msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_272067:: @ 8272067 +Common_EventScript_ShowNoRoomForDecor:: @ 8272067 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -Common_EventScript_NoRoomLeftForAnother:: @ 8272071 +Common_EventScript_NoRoomForDecor:: @ 8272071 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index b876ad849..804fd0afc 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", + "script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 011ea4a07..b2940eb6f 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -1,42 +1,42 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 .byte 0 -AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 +AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2 lock 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 compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 - goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus + msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810 + msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A + msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824 .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_23889D: @ 823889D +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D .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_238918: @ 8238918 +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918 .string "This ship is called S.S. CACTUS.\n" .string "It seems to be from an earlier era.$" diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 4ddf92226..b75fcf3ac 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", + "script": "AbandonedShip_Corridors_1F_EventScript_Youngster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", + "script": "AbandonedShip_Corridors_1F_EventScript_Charlie", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 15fda4194..a954ee119 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -1,26 +1,26 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 .byte 0 -AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC +AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5 + msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC end -AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat + msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 +AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5 .string "What's so funny about having my inner\n" .string "tube aboard the ship?$" -AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 +AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01 .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 "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 "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 9bccfc636..04868ad92 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", + "script": "AbandonedShip_Corridors_B1F_EventScript_TuberM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", + "script": "AbandonedShip_Corridors_B1F_EventScript_Duncan", "flag": "0" } ], @@ -107,7 +107,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" + "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] }
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 1012ebce7..c56951a03 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,88 +1,87 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad .byte 0 -AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F +AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB - call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5 +AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom end -AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB - setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB + setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 - setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5 + setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC +AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF + msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC end -AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 +AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8 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 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked + msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY - call AbandonedShip_Corridors_B1F_EventScript_237DB5 + call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom special DrawWholeMapView releaseall end -AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF + msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09 + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat + msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A +AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A .string "When we go out to sea, we SAILORS\n" .string "always bring our POKéMON.\l" .string "How about a quick battle?$" -AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 +AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80 .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 "depths.\p" .string "If a POKéMON knew how to go underwater,\n" .string "we might make some progress…$" -AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 +AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03 .string "Yay!\n" .string "It's a ship!$" -AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 +AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15 .string "The door is locked.\p" .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 "STORAGE KEY.\p" .string "The inserted KEY stuck fast,\n" .string "but the door opened.$" -AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5 -AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5 +AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5 .string "The door is open.$" diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 1b1466fe1..81e19fd1f 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -66,7 +66,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door" }, { "type": "sign", @@ -74,7 +74,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door" }, { "type": "sign", @@ -82,7 +82,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door" }, { "type": "sign", @@ -90,7 +90,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] }
\ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 9c6474b6f..5fc4160f8 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,157 +1,157 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad .byte 0 -AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 +AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 +AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1 + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4 + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 end -AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 - setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9 + setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3 - setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3 + setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD - setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD + setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7 - setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7 + setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1 - setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1 + setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB - setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB + setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05 - setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05 + setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F - setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F + setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 +AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19 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 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 +AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50 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 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 +AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87 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 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE +AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE 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 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27 +AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27 .string "The door is locked.\p" .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 "“RM. 2” is painted on the door.$" -AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F +AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F .string "The door is locked.\p" .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 "“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 "KEY.\p" .string "The inserted KEY stuck fast,\n" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index fdfb8a187..f937eb649 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -172,7 +172,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -180,7 +180,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -188,7 +188,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -196,7 +196,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -204,7 +204,7 @@ "y": 2, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -212,7 +212,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] }
\ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 2d6f7ee77..53a7ee2ed 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,148 +1,125 @@ 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 -AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F - map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 +AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle .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 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn compare VAR_TEMP_2, 36 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn compare VAR_TEMP_3, 2 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow switch VAR_TEMP_4 - case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 - case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C - case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D - case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33 - case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B - case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2 + 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_238CD1:: @ 8238CD1 +AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1 addvar VAR_TEMP_4, 1 return -AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 +AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7 addvar VAR_TEMP_4, 2 return -AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD +AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD addvar VAR_TEMP_4, 3 return -AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3 delay 20 - setfieldeffectargument 0, 10 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE + dofieldeffectsparkle 10, 10, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C end -AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D specialvar VAR_RESULT, FoundAbandonedShipRoom1Key - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle delay 20 - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32 +AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32 end -AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 delay 20 - setfieldeffectargument 0, 8 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE - setfieldeffectargument 0, 11 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE + dofieldeffectsparkle 8, 5, 0 + dofieldeffectsparkle 11, 3, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B delay 20 - setfieldeffectargument 0, 16 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - 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 + dofieldeffectsparkle 16, 3, 0 + dofieldeffectsparkle 25, 2, 0 + dofieldeffectsparkle 24, 6, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2 end -AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 - setfieldeffectargument 0, 42 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3 + dofieldeffectsparkle 42, 10, 0 return -AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 - setfieldeffectargument 0, 20 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3 + dofieldeffectsparkle 20, 5, 0 return -AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 12 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3 + dofieldeffectsparkle 1, 12, 0 return -AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 2 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3 + dofieldeffectsparkle 1, 2, 0 return -AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 +AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3 lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT + msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE +AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE .string "It's bright and shiny!\n" .string "But it's just trash…$" diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 35b029f7f..6f39d4827 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", + "script": "AbandonedShip_Rooms2_1F_EventScript_Dan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", + "script": "AbandonedShip_Rooms2_1F_EventScript_Kira", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Rooms2_1F_EventScript_238186", + "script": "AbandonedShip_Rooms2_1F_EventScript_Garrison", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", + "script": "AbandonedShip_Rooms2_1F_EventScript_Jani", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index ec382e56c..a09242fc9 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -1,151 +1,151 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 .byte 0 -AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 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 +AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7 + 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 - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_DanRematch + msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT +AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7 + msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT @ Kira speaks for both when registering KiraAndDan register_matchcall TRAINER_KIRA_AND_DAN_1 release end -AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0 + 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_DanPostRematch, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 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 +AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B + 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 - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_KiraRematch + msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT +AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B + msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT register_matchcall TRAINER_KIRA_AND_DAN_1 release end -AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154 + 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_KiraPostRematch, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F + trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat + msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186 + trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat + msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D +AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D .string "DAN: While searching for treasures,\n" .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 "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 "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 "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 "We were searching for treasures.\l" .string "But we discovered a TRAINER instead!$" -AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 +AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4 .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 "I've already decided what I'm buying\n" .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 "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 "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 "treasures all this time.\p" .string "Our POKéMON have grown stronger, too.\n" .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!$" -AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 +AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491 .string "DAN: 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_238509: @ 8238509 +AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509 .string "DAN: You don't even have two POKéMON.\n" .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 "Just like us, you still haven't given up\n" .string "searching for treasures, have you?\p" .string "Want to make it so the loser has\n" .string "to give up searching?$" -AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 +AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2 .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 "our POKéMON some more and we find\l" .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 "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 "but I am good at battles!$" -AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 +AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8 .string "Oops.\n" .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 "is kind of gross.$" -AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F +AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F .string "Strength and compassion…\n" .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 "that sparkles.$" -AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 +AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9 .string "In a cabin somewhere on board,\n" .string "I saw something sparkle.$" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 621b80bb1..672d2c54e 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", + "script": "AbandonedShip_Rooms2_B1F_EventScript_Camper", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index a0b9e3946..5c2418696 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -1,11 +1,11 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 .byte 0 -AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC +AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025 + msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC end -AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E +AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E .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" diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index af25a3994..28feaf940 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_1F_EventScript_237A93", + "script": "AbandonedShip_Rooms_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", + "script": "AbandonedShip_Rooms_1F_EventScript_Thalia", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", + "script": "AbandonedShip_Rooms_1F_EventScript_Demetrius", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2c3ff862a..cabbb45ea 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -1,78 +1,78 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 .byte 0 -AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC +AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93 + msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC end -AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C + trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat + msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF +AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3 + trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms_1F_EventScript_ThaliaRematch + msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF +AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT + msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_THALIA_1 release end -AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE + trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat + msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE 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 "taking a look around.\p" .string "Hmhm…\n" .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 "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…$" -AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB +AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB .string "The man next door…\p" .string "He says he's just sightseeing,\n" .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 "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 "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?$" -AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 +AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9 .string "I'm sure that man's up to something!\n" .string "He just acts so suspiciously!$" -AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C +AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C .string "Waaah!\n" .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.$" -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 "Keep it a secret where I am!$" diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 2e836f3a1..0af0a05ac 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", + "script": "AbandonedShip_Rooms_B1F_EventScript_FatMan", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 05223592e..80208b051 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,16 +1,16 @@ 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 -AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD +AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end -AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC +AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6 + msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC end -AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF +AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF .string "Urrrrppp…\p" .string "I'm getting queasy just being aboard\n" .string "this ship…\p" diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index b957bb6be..9e10c19f5 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,8 +1,8 @@ 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 -AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C +AbandonedShip_Underwater1_OnResume: @ 823809C setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index cc000b09c..40e6c1e5e 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,8 +1,8 @@ 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 -AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 +AbandonedShip_Underwater2_OnResume: @ 8238963 setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index ca4b894d4..a3a80d41e 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DesertUnderpass_EventScript_23AF41", + "script": "DesertUnderpass_EventScript_Fossil", "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" } ], diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 8e89075e5..437f5de4b 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D setflag FLAG_LANDMARK_DESERT_UNDERPASS end -DesertUnderpass_EventScript_23AF41:: @ 823AF41 +DesertUnderpass_EventScript_Fossil:: @ 823AF41 lock faceplayer - goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57 - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil release end -DesertUnderpass_EventScript_23AF57:: @ 823AF57 +DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57 giveitem_std ITEM_CLAW_FOSSIL removeobject 1 release end -DesertUnderpass_EventScript_23AF68:: @ 823AF68 +DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68 giveitem_std ITEM_ROOT_FOSSIL removeobject 1 release end -DesertUnderpass_Text_23AF79:: @ 823AF79 +@ Unused +DesertUnderpass_Text_FoundRootFossil:: @ 823AF79 .string "{PLAYER} found the ROOT FOSSIL.$" -DesertUnderpass_Text_23AF93:: @ 823AF93 +@ Unused +DesertUnderpass_Text_FoundClawFossil:: @ 823AF93 .string "{PLAYER} found the CLAW FOSSIL.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 71aead3e4..190c2b677 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 98f4a2a77..7e4180b92 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -213,7 +213,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -446,7 +446,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 3c2c59355..ac3afdce6 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL removeobject 1 delay 30 - setflag FLAG_CHOSE_CLAW_FOSSIL + setflag FLAG_CHOSE_ROOT_FOSSIL goto MirageTower_4F_EventScript_23ADCA end @@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL removeobject 2 delay 30 - setflag FLAG_CHOSE_ROOT_FOSSIL + setflag FLAG_CHOSE_CLAW_FOSSIL goto MirageTower_4F_EventScript_23ADCA end diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 1b0efd3d9..49d102878 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_CableCarStation_EventScript_22AC4B", + "script": "MtChimney_CableCarStation_EventScript_Attendant", "flag": "0" }, { diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 588a4c3f4..32064ad04 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,26 +1,26 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_OnFrame .byte 0 MtChimney_CableCarStation_OnTransition: @ 822AC05 compare VAR_CABLE_CAR_STATION_STATE, 1 - call_if_eq MtChimney_CableCarStation_EventScript_22AC11 + call_if_eq MtChimney_CableCarStation_EventScript_MoveAttendantAside end -MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 +MtChimney_CableCarStation_EventScript_MoveAttendantAside:: @ 822AC11 setobjectxyperm 1, 5, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return -MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27 +MtChimney_CableCarStation_OnFrame: @ 822AC1D + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_ExitCableCar .2byte 0 -MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 +MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27 lockall - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 - applymovement 1, MtChimney_CableCarStation_Movement_22ACAA + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar + applymovement 1, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 @@ -28,21 +28,21 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 releaseall end -MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B +MtChimney_CableCarStation_EventScript_Attendant:: @ 822AC4B lock faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO + msgbox MtChimney_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C + goto_if_eq MtChimney_CableCarStation_EventScript_RideCableCar compare VAR_RESULT, NO - goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B + goto_if_eq MtChimney_CableCarStation_EventScript_DeclineRide end -MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT +MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C + msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage - applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF + applymovement 1, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 @@ -53,46 +53,46 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C release end -MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT +MtChimney_CableCarStation_EventScript_DeclineRide:: @ 822AC9B + msgbox MtChimney_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT release end -MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 +MtChimney_CableCarStation_Movement_LeadPlayerToCableCar: @ 822ACA5 walk_up walk_up walk_left walk_in_place_fastest_right step_end -MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA +MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822ACAA delay_16 walk_right walk_down walk_down step_end -MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF +MtChimney_CableCarStation_Movement_BoardCableCar: @ 822ACAF walk_up walk_up walk_up delay_16 step_end -MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 +MtChimney_CableCarStation_Movement_ExitCableCar: @ 822ACB4 walk_down walk_down walk_down delay_16 step_end -MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 +MtChimney_CableCarStation_Text_CableCarReadyGetOn: @ 822ACB9 .string "The CABLE CAR is ready to go down.\n" .string "Would you like to be on it?$" -MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8 +MtChimney_CableCarStation_Text_StepThisWay: @ 822ACF8 .string "Please step this way.$" -MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E +MtChimney_CableCarStation_Text_RideAnotherTime: @ 822AD0E .string "Please ride with us another time.$" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index b692426fd..f0aea1aec 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk", "flag": "0" } ], @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 687fff9a7..ba5dfd9f0 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -1,49 +1,49 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 .byte 0 -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk:: @ 826EA78 lock faceplayer - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT release end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 - goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT +Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4 +Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter: @ 826EAB4 walk_left step_end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad:: @ 826EAB6 lockall clearflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 0 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 +Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EAC1 .string "On CYCLING ROAD, you can go all out\n" .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" -Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 +Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: @ 826EB48 .string "Sorry, you can't walk on CYCLING\n" .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index dcc9029e5..6077876f7 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk", "flag": "0" } ], @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 1d0ca55bb..4f839d72b 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -4,51 +4,51 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 Route110_SeasideCyclingRoadSouthEntrance_OnTransition: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE +Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge:: @ 826EBBE setvar VAR_CYCLING_CHALLENGE_STATE, 1 return -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk:: @ 826EBC4 lock faceplayer - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT release end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: @ 826EBD0 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike compare VAR_RESULT, 0 - goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6 setvar VAR_CYCLING_CHALLENGE_STATE, 1 return -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT +Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11 +Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter: @ 826EC11 walk_left step_end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: @ 826EC13 lockall setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD @@ -56,13 +56,13 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 +Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EC23 .string "On CYCLING ROAD, you can go all out\n" .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" -Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA +Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: @ 826ECAA .string "Sorry, you can't walk on CYCLING\n" .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 348fce566..91d70160f 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -206,7 +206,7 @@ Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF return Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index eaf3defd8..10102e956 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -452,7 +452,7 @@ Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039 compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_ReceivedTent compare VAR_RESULT, FALSE - call_if_eq Common_EventScript_NoRoomLeftForAnother + call_if_eq Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEntrance_Text_PCFullAgain, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 037ddb18c..91d13e88c 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -136,7 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_MIRAGE_TOWER_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index c915bfb95..71afc39f8 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_OldLadysRestStop_EventScript_22A920", + "script": "Route111_OldLadysRestStop_EventScript_OldLady", "flag": "0" } ], diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 63b373fbf..0df1e6b6e 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -6,49 +6,49 @@ Route111_OldLadysRestStop_OnTransition: @ 822A91C setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end -Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 +Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920 lock faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO + msgbox Route111_OldLadysRestStop_Text_RestUpHere, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_Rest compare VAR_RESULT, NO - goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest end -Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT +Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941 + msgbox Route111_OldLadysRestStop_Text_TakeYourTimeRestUp, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal - msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO + msgbox Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_Rest compare VAR_RESULT, NO - goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest end -Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT +Route111_OldLadysRestStop_EventScript_DeclineRest:: @ 822A96E + msgbox Route111_OldLadysRestStop_Text_DontNeedToBeShy, MSGBOX_DEFAULT release end -Route111_OldLadysRestStop_Text_22A978: @ 822A978 +Route111_OldLadysRestStop_Text_RestUpHere: @ 822A978 .string "Oh, dear, dear.\n" .string "Aren't your POKéMON exhausted?\p" .string "If you'd like, rest up here.\n" .string "That's a fine idea! You should do that.$" -Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC +Route111_OldLadysRestStop_Text_TakeYourTimeRestUp: @ 822A9EC .string "That's right.\n" .string "Take your time and rest up!$" -Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 +Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest: @ 822AA16 .string "Oh, dear, dear.\n" .string "Are your POKéMON still tired?\p" .string "You should take another rest here.\n" .string "That's a fine idea. You should do that.$" -Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F +Route111_OldLadysRestStop_Text_DontNeedToBeShy: @ 822AA8F .string "Is that so?\n" .string "You don't need to be shy about it.$" diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index fed3dab3f..640de23cb 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", + "script": "Route111_WinstrateFamilysHouse_EventScript_Vivi", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", + "script": "Route111_WinstrateFamilysHouse_EventScript_Victor", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", + "script": "Route111_WinstrateFamilysHouse_EventScript_Victoria", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", + "script": "Route111_WinstrateFamilysHouse_EventScript_Vicky", "flag": "0" } ], diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 312bf739f..387b8f630 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -1,63 +1,63 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C .byte 0 -Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D +Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D lock faceplayer setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + msgbox Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 +Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2 lock faceplayer setvar VAR_0x8008, 3 - goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace + msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C +Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: @ 822A4DA + msgbox Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 +Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8 lock faceplayer setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + msgbox Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD +Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD lock faceplayer setvar VAR_0x8008, 4 - goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo + msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrong, MSGBOX_DEFAULT setflag FLAG_TEMP_4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C +Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: @ 822A51E + msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C +Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: @ 822A52C closemessage applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 +Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539 .string "You're the first TRAINER I've seen who\n" .string "deploys POKéMON so masterfully.\p" .string "But, I should tell you--my son is\n" @@ -65,7 +65,7 @@ Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 .string "He even took the POKéMON LEAGUE\n" .string "challenge, I'll have you know.$" -Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 +Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4 .string "We use this MACHO BRACE to more\n" .string "effectively strengthen our POKéMON\l" .string "in training.\p" @@ -73,18 +73,18 @@ Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 .string "I don't know if you need it, but we\l" .string "would like you to have our MACHO BRACE.$" -Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 +Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles: @ 822A6B4 .string "When it comes to POKéMON battles,\n" .string "we tend to be pretty passionate.$" -Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 +Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers: @ 822A6F7 .string "Mommy is stronger than Daddy.\p" .string "I'm stronger than Mommy.\p" .string "And Grandma's stronger than me!\p" .string "But my big brother is even stronger\n" .string "than Grandma.$" -Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 +Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780 .string "There's no question that you're strong.\p" .string "But if you were to battle my grandson,\n" .string "you'd end up crying in frustration.\p" @@ -95,7 +95,7 @@ Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 .string "Knowing my grandson, he could be the\n" .string "CHAMPION already!$" -Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B +Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort: @ 822A89B .string "My grandson must be challenging the\n" .string "POKéMON LEAGUE CHAMPION by now.\p" .string "Knowing my grandson, he could be the\n" diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 52958a4ee..5ed7fc4a7 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_CableCarStation_EventScript_22AB17", + "script": "Route112_CableCarStation_EventScript_Attendant", "flag": "0" }, { diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index f319e0a28..0b0ad3dc9 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,27 +1,27 @@ Route112_CableCarStation_MapScripts:: @ 822AABE map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_OnFrame .byte 0 Route112_CableCarStation_OnTransition: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 - call_if_eq Route112_CableCarStation_EventScript_22AADD + call_if_eq Route112_CableCarStation_EventScript_MoveAttendantAside end -Route112_CableCarStation_EventScript_22AADD:: @ 822AADD +Route112_CableCarStation_EventScript_MoveAttendantAside:: @ 822AADD setobjectxyperm 1, 7, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT return -Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3 +Route112_CableCarStation_OnFrame: @ 822AAE9 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_ExitCableCar .2byte 0 -Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 +Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 - applymovement 1, Route112_CableCarStation_Movement_22AB76 + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar + applymovement 1, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 @@ -29,21 +29,21 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 releaseall end -Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 +Route112_CableCarStation_EventScript_Attendant:: @ 822AB17 lock faceplayer - msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO + msgbox Route112_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route112_CableCarStation_EventScript_22AB38 + goto_if_eq Route112_CableCarStation_EventScript_RideCableCar compare VAR_RESULT, NO - goto_if_eq Route112_CableCarStation_EventScript_22AB67 + goto_if_eq Route112_CableCarStation_EventScript_DeclineRide end -Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT +Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38 + msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_CableCarStation_Movement_22AB71 - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B + applymovement 1, Route112_CableCarStation_Movement_LeadPlayerToCableCar + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 @@ -54,46 +54,46 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 release end -Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT +Route112_CableCarStation_EventScript_DeclineRide:: @ 822AB67 + msgbox Route112_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT release end -Route112_CableCarStation_Movement_22AB71: @ 822AB71 +Route112_CableCarStation_Movement_LeadPlayerToCableCar: @ 822AB71 walk_up walk_up walk_right walk_in_place_fastest_left step_end -Route112_CableCarStation_Movement_22AB76: @ 822AB76 +Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822AB76 delay_16 walk_left walk_down walk_down step_end -Route112_CableCarStation_Movement_22AB7B: @ 822AB7B +Route112_CableCarStation_Movement_BoardCableCar: @ 822AB7B walk_up walk_up walk_up delay_16 step_end -Route112_CableCarStation_Movement_22AB80: @ 822AB80 +Route112_CableCarStation_Movement_ExitCableCar: @ 822AB80 walk_down walk_down walk_down delay_16 step_end -Route112_CableCarStation_Text_22AB85: @ 822AB85 +Route112_CableCarStation_Text_CableCarReadyGetOn: @ 822AB85 .string "The CABLE CAR is ready to go up.\n" .string "Would you like to be on it?$" -Route112_CableCarStation_Text_22ABC2: @ 822ABC2 +Route112_CableCarStation_Text_StepThisWay: @ 822ABC2 .string "Please step this way.$" -Route112_CableCarStation_Text_22ABD8: @ 822ABD8 +Route112_CableCarStation_Text_RideAnotherTime: @ 822ABD8 .string "Please ride with us another time.$" diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 70e342048..0f57ce2b8 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_GlassWorkshop_EventScript_26ED1E", + "script": "Route113_GlassWorkshop_EventScript_GlassWorker", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_GlassWorkshop_EventScript_26F194", + "script": "Route113_GlassWorkshop_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index e1339c75c..30d453abd 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -2,313 +2,322 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition .byte 0 + .set BLUE_FLUTE_PRICE, 250 + .set YELLOW_FLUTE_PRICE, 500 + .set RED_FLUTE_PRICE, 500 + .set WHITE_FLUTE_PRICE, 1000 + .set BLACK_FLUTE_PRICE, 1000 + .set PRETTY_CHAIR_PRICE, 6000 + .set PRETTY_DESK_PRICE, 8000 + .set LOWEST_ASH_PRICE, BLUE_FLUTE_PRICE + Route113_GlassWorkshop_OnTransition: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_GLASS_WORKSHOP_STATE, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26ED18 + call_if_eq Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack end -Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 +Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack:: @ 826ED18 setvar VAR_GLASS_WORKSHOP_STATE, 2 return -Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E +Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E lock faceplayer compare VAR_GLASS_WORKSHOP_STATE, 10 - goto_if_ge Route113_GlassWorkshop_EventScript_26F090 + goto_if_ge Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom compare VAR_GLASS_WORKSHOP_STATE, 2 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E + goto_if_eq Route113_GlassWorkshop_EventScript_CheckCollectedAsh compare VAR_GLASS_WORKSHOP_STATE, 1 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT + goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack + msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_GLASS_WORKSHOP_STATE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_ExplainSootSack:: @ 826ED64 + msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E +Route113_GlassWorkshop_EventScript_CheckCollectedAsh:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT - compare VAR_ASH_GATHER_COUNT, 250 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFD6 - message Route113_GlassWorkshop_Text_26F40A + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_SootSackNotInBag + msgbox Route113_GlassWorkshop_Text_LetsSeeCollectedAshes, MSGBOX_DEFAULT + compare VAR_ASH_GATHER_COUNT, LOWEST_ASH_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAsh + message Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_SootSackNotInBag:: @ 826ED9D + msgbox Route113_GlassWorkshop_Text_HaventGotYourSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 +Route113_GlassWorkshop_EventScript_ChooseGlassItem:: @ 826EDA7 setvar VAR_0x8009, 0 setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR special ShowScrollableMultichoice waitstate switch VAR_RESULT - case 0, Route113_GlassWorkshop_EventScript_26EE1E - case 1, Route113_GlassWorkshop_EventScript_26EE5A - case 2, Route113_GlassWorkshop_EventScript_26EE96 - case 3, Route113_GlassWorkshop_EventScript_26EED2 - case 4, Route113_GlassWorkshop_EventScript_26EF0E - case 5, Route113_GlassWorkshop_EventScript_26EF4A - case 6, Route113_GlassWorkshop_EventScript_26EF8B - case 7, Route113_GlassWorkshop_EventScript_26EFCC - case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_26EFCC + case 0, Route113_GlassWorkshop_EventScript_BlueFlute + case 1, Route113_GlassWorkshop_EventScript_YellowFlute + case 2, Route113_GlassWorkshop_EventScript_RedFlute + case 3, Route113_GlassWorkshop_EventScript_WhiteFlute + case 4, Route113_GlassWorkshop_EventScript_BlackFlute + case 5, Route113_GlassWorkshop_EventScript_PrettyChair + case 6, Route113_GlassWorkshop_EventScript_PrettyDesk + case 7, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect + case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect end -Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E +Route113_GlassWorkshop_EventScript_BlueFlute:: @ 826EE1E setvar VAR_0x8008, ITEM_BLUE_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 250 - compare VAR_ASH_GATHER_COUNT, 250 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, BLUE_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 10 - subvar VAR_ASH_GATHER_COUNT, 250 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A +Route113_GlassWorkshop_EventScript_YellowFlute:: @ 826EE5A setvar VAR_0x8008, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, YELLOW_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 11 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 +Route113_GlassWorkshop_EventScript_RedFlute:: @ 826EE96 setvar VAR_0x8008, ITEM_RED_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, RED_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 12 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 +Route113_GlassWorkshop_EventScript_WhiteFlute:: @ 826EED2 setvar VAR_0x8008, ITEM_WHITE_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, WHITE_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 13 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E +Route113_GlassWorkshop_EventScript_BlackFlute:: @ 826EF0E setvar VAR_0x8008, ITEM_BLACK_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, BLACK_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 14 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A +Route113_GlassWorkshop_EventScript_PrettyChair:: @ 826EF4A setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_CHAIR bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 6000 - compare VAR_ASH_GATHER_COUNT, 6000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, PRETTY_CHAIR_PRICE + compare VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 15 - subvar VAR_ASH_GATHER_COUNT, 6000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B +Route113_GlassWorkshop_EventScript_PrettyDesk:: @ 826EF8B setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_DESK bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 8000 - compare VAR_ASH_GATHER_COUNT, 8000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, PRETTY_DESK_PRICE + compare VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 16 - subvar VAR_ASH_GATHER_COUNT, 8000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_CancelGlassItemSelect:: @ 826EFCC + msgbox Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 - setvar VAR_0x800A, 250 +Route113_GlassWorkshop_EventScript_NotEnoughAsh:: @ 826EFD6 + setvar VAR_0x800A, LOWEST_ASH_PRICE subvar VAR_0x800A, VAR_ASH_GATHER_COUNT buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_NotEnoughAshNeedX, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE +Route113_GlassWorkshop_EventScript_NotEnoughAshForItem:: @ 826EFEE subvar VAR_0x800A, VAR_ASH_GATHER_COUNT buffernumberstring 1, VAR_0x800A - message Route113_GlassWorkshop_Text_26F543 + message Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 - message Route113_GlassWorkshop_Text_26F4B5 +Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003 + message Route113_GlassWorkshop_Text_WhichWouldYouLike waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F + msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT closemessage fadescreen 1 playse SE_SELECT delay 30 fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if_eq Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute compare VAR_0x8009, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor setvar VAR_GLASS_WORKSHOP_STATE, 2 release end -Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 +Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047 giveitem_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26F072 + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute return -Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F +Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F givedecoration_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26F081 + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor return -Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 +Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072 call Common_EventScript_BagIsFull - msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_NoRoomInBag, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Common_EventScript_NoRoomLeftForAnother - msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081 + call Common_EventScript_NoRoomForDecor + msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 +Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom:: @ 826F090 switch VAR_GLASS_WORKSHOP_STATE - case 10, Route113_GlassWorkshop_EventScript_26F0E3 - case 11, Route113_GlassWorkshop_EventScript_26F0F7 - case 12, Route113_GlassWorkshop_EventScript_26F10B - case 13, Route113_GlassWorkshop_EventScript_26F11F - case 14, Route113_GlassWorkshop_EventScript_26F133 - case 15, Route113_GlassWorkshop_EventScript_26F147 - case 16, Route113_GlassWorkshop_EventScript_26F15B + case 10, Route113_GlassWorkshop_EventScript_GiveBlueFlute + case 11, Route113_GlassWorkshop_EventScript_GiveYellowFlute + case 12, Route113_GlassWorkshop_EventScript_GiveRedFlute + case 13, Route113_GlassWorkshop_EventScript_GiveWhiteFlute + case 14, Route113_GlassWorkshop_EventScript_GiveBlackFlute + case 15, Route113_GlassWorkshop_EventScript_GivePrettyChair + case 16, Route113_GlassWorkshop_EventScript_GivePrettyDesk end -Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3 +Route113_GlassWorkshop_EventScript_GiveBlueFlute:: @ 826F0E3 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_BLUE_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7 +Route113_GlassWorkshop_EventScript_GiveYellowFlute:: @ 826F0F7 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B +Route113_GlassWorkshop_EventScript_GiveRedFlute:: @ 826F10B setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_RED_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F +Route113_GlassWorkshop_EventScript_GiveWhiteFlute:: @ 826F11F setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_WHITE_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F133:: @ 826F133 +Route113_GlassWorkshop_EventScript_GiveBlackFlute:: @ 826F133 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_BLACK_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F147:: @ 826F147 +Route113_GlassWorkshop_EventScript_GivePrettyChair:: @ 826F147 setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_CHAIR bufferdecorationname 0, DECOR_PRETTY_CHAIR - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B +Route113_GlassWorkshop_EventScript_GivePrettyDesk:: @ 826F15B setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_DESK bufferdecorationname 0, DECOR_PRETTY_DESK - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_TryGiveItemAgain:: @ 826F16F + msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if_eq Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute compare VAR_0x8009, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor setvar VAR_GLASS_WORKSHOP_STATE, 2 release end -Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC +Route113_GlassWorkshop_EventScript_NinjaBoy:: @ 826F194 + msgbox Route113_GlassWorkshop_Text_FunToBlowGlassFlute, MSGBOX_NPC end -Route113_GlassWorkshop_Text_26F19D: @ 826F19D +Route113_GlassWorkshop_Text_GoCollectAshWithThis: @ 826F19D .string "This area is covered in volcanic ash,\n" .string "huff-puff!\p" .string "I'm specially gifted, huff-puff.\p" @@ -316,7 +325,7 @@ Route113_GlassWorkshop_Text_26F19D: @ 826F19D .string "and make items, huff-puff.\p" .string "Go collect ashes with this, huff-puff.$" -Route113_GlassWorkshop_Text_26F252: @ 826F252 +Route113_GlassWorkshop_Text_ExplainSootSack: @ 826F252 .string "Just take that SOOT SACK and walk\n" .string "through piles of ash, huff-puff.\p" .string "And it will fill up with the volcanic ash,\n" @@ -324,11 +333,11 @@ Route113_GlassWorkshop_Text_26F252: @ 826F252 .string "Once you think you've collected a good\n" .string "amount, come see me, huff-puff.$" -Route113_GlassWorkshop_Text_26F312: @ 826F312 +Route113_GlassWorkshop_Text_LetsSeeCollectedAshes: @ 826F312 .string "Have you collected ashes, huff-puff?\n" .string "Let me see, huff-puff.$" -Route113_GlassWorkshop_Text_26F34E: @ 826F34E +Route113_GlassWorkshop_Text_NotEnoughAshNeedX: @ 826F34E .string "Hmmm…\n" .string "There's not enough ash here, huff-puff.\l" .string "I can't make glass with this, huff-puff.\p" @@ -336,25 +345,25 @@ Route113_GlassWorkshop_Text_26F34E: @ 826F34E .string "you'll need to walk for me to make you\l" .string "a BLUE FLUTE, huff-puff.$" -Route113_GlassWorkshop_Text_26F40A: @ 826F40A +Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike: @ 826F40A .string "Oh!\n" .string "You've got a lot of ashes, huff-puff!\p" .string "I'll make you a glass item, huff-puff!\n" .string "Which one would you like, huff-puff?$" -Route113_GlassWorkshop_Text_26F480: @ 826F480 +Route113_GlassWorkshop_Text_IsThatTheItemForYou: @ 826F480 .string "A {STR_VAR_1}, huff-puff?\n" .string "Is that the one for you, huff-puff?$" -Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 +Route113_GlassWorkshop_Text_WhichWouldYouLike: @ 826F4B5 .string "Which one would you like, huff-puff?$" -Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA +Route113_GlassWorkshop_Text_IllMakeItemForYou: @ 826F4DA .string "A {STR_VAR_1} it is, then, huff-puff!\p" .string "Okay! I'll make it for you, huff-puff.\n" .string "Just wait a little while, huff-puff.$" -Route113_GlassWorkshop_Text_26F543: @ 826F543 +Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem: @ 826F543 .string "A {STR_VAR_1}, huff-puff?\p" .string "There's not enough ash here to make\n" .string "that, though, huff-puff.\p" @@ -364,33 +373,33 @@ Route113_GlassWorkshop_Text_26F543: @ 826F543 .string "Which item would you rather have me\n" .string "make instead, huff-puff?$" -Route113_GlassWorkshop_Text_26F641: @ 826F641 +Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything: @ 826F641 .string "You've collected all that ash, but you\n" .string "don't want anything, huff-puff?$" -Route113_GlassWorkshop_Text_26F688: @ 826F688 +Route113_GlassWorkshop_Text_IveFinishedGlassItem: @ 826F688 .string "Ah, I've finished your {STR_VAR_1}.\n" .string "Take it, huff-puff.$" -Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 +Route113_GlassWorkshop_Text_NoRoomInBag: @ 826F6B7 .string "Oh?\n" .string "You've no room in your BAG, huff-puff.\p" .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" -Route113_GlassWorkshop_Text_26F715: @ 826F715 +Route113_GlassWorkshop_Text_NoRoomInPC: @ 826F715 .string "Oh?\n" .string "You've no room in your PC, huff-puff?\p" .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" -Route113_GlassWorkshop_Text_26F772: @ 826F772 +Route113_GlassWorkshop_Text_HaventGotYourSootSack: @ 826F772 .string "Hah? You haven't got your SOOT SACK\n" .string "with you, huff-puff.\p" .string "You have to keep it with you to collect\n" .string "volcanic ash, huff-puff.$" -Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC +Route113_GlassWorkshop_Text_FunToBlowGlassFlute: @ 826F7EC .string "It's fun to blow a glass flute while\n" .string "my boss is talking.\p" .string "Huff-huff! Puff-puff!$" diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0c5c5ea77..7a629f44a 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "script": "Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother", "flag": "0" } ], @@ -59,7 +59,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] }
\ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 83fade3e6..5313f8705 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -6,32 +6,32 @@ Route114_FossilManiacsHouse_OnTransition: @ 822AD36 setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end -Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A +Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A lock faceplayer - goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig + msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT giveitem_std ITEM_TM28 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end -Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT +Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69 + msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT release end -Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73 + msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN end -Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C + msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN end -Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 +Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85 .string "My big brother's the FOSSIL MANIAC…\n" .string "He's a nice guy who loves FOSSILS…\p" .string "He loves digging holes, too…\n" @@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 .string "You can have this, so you can DIG\n" .string "holes just like my big brother…$" -Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 +Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48 .string "If you make a POKéMON DIG inside a\n" .string "cave, you're returned to the entrance…$" -Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 +Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92 .string "Rocks in peculiar shapes fill\n" .string "the display case…$" -Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 +Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2 .string "THE COMPOSITION OF STRATA…\n" .string "HOW RAIN SHAPES THE LAND…\l" .string "STONES, SOIL, AND ROCK…\p" diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index d0992f8fa..da3241ed1 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "script": "Route114_FossilManiacsTunnel_EventScript_FossilManiac", "flag": "0" } ], @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" } ], "bg_events": [] diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 8c5ec779d..3bea9a501 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,61 +1,61 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad .byte 0 Route114_FossilManiacsTunnel_OnTransition: @ 822AF33 - call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D + call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac end -Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D +Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 +Route114_FossilManiacsTunnel_OnLoad: @ 822AF49 + call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass end -Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 +Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53 setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1 setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1 return -Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 +Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66 lockall applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT + msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 releaseall end -Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 +Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87 lock faceplayer - goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil + msgbox Route114_FossilManiacsTunnel_Text_LookInDesertForFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC + msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6 + msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 +Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0 .string "I'm the FOSSIL MANIAC…\n" .string "I'm a nice guy who loves FOSSILS…\p" .string "Do you want a FOSSIL?\p" @@ -66,7 +66,7 @@ Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 .string "are boulders and sand that may hide\l" .string "FOSSILS…$" -Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 +Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6 .string "You found a FOSSIL, didn't you?\n" .string "That's so nice… It's so dreamy…\p" .string "What are you going to do with that\n" @@ -77,11 +77,11 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 .string "I love my FOSSILS, so I would never\n" .string "do anything like that…$" -Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC +Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC .string "FOSSILS are so… Wonderful…\n" .string "It's so dreamy…$" -Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 +Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7 .string "Oh…\n" .string "It's not safe that way…\p" .string "I was digging away, you see…\n" diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index b4b1b412b..6709d055e 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_LanettesHouse_EventScript_22B2D2", + "script": "Route114_LanettesHouse_EventScript_Lanette", "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" } ], @@ -52,7 +52,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B309" + "script": "Route114_LanettesHouse_EventScript_Notebook" }, { "type": "sign", @@ -60,7 +60,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B345" + "script": "Route114_LanettesHouse_EventScript_PC" }, { "type": "sign", @@ -68,7 +68,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B345" + "script": "Route114_LanettesHouse_EventScript_PC" } ] }
\ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 59d82ffe1..b772228e4 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -6,49 +6,49 @@ Route114_LanettesHouse_OnTransition: @ 822B2CE setflag FLAG_LANDMARK_LANETTES_HOUSE end -Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 +Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2 lock faceplayer - goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT + msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT givedecoration_std DECOR_LOTAD_DOLL - compare VAR_RESULT, 0 - goto_if_eq Route114_LanettesHouse_EventScript_272067 + compare VAR_RESULT, FALSE + goto_if_eq Common_EventScript_ShowNoRoomForDecor setflag FLAG_RECEIVED_DOLL_LANETTE release end -Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT +Route114_LanettesHouse_EventScript_OfferAdvice:: @ 822B2FF + msgbox Route114_LanettesHouse_Text_OrganizeYourBoxes, MSGBOX_DEFAULT release end -Route114_LanettesHouse_EventScript_22B309:: @ 822B309 +Route114_LanettesHouse_EventScript_Notebook:: @ 822B309 lockall - msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO + msgbox Route114_LanettesHouse_Text_ResearchNotesPage1, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT + goto_if_eq Route114_LanettesHouse_EventScript_NotebookPage2 + msgbox Route114_LanettesHouse_Text_ClosedTheNotebook, MSGBOX_DEFAULT releaseall end -Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO +Route114_LanettesHouse_EventScript_NotebookPage2:: @ 822B327 + msgbox Route114_LanettesHouse_Text_ResearchNotesPage2, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq Route114_LanettesHouse_EventScript_22B33C + call_if_eq Route114_LanettesHouse_EventScript_NotebookPage3 releaseall end -Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT +Route114_LanettesHouse_EventScript_NotebookPage3:: @ 822B33C + msgbox Route114_LanettesHouse_Text_ResearchNotesPage3, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN +Route114_LanettesHouse_EventScript_PC:: @ 822B345 + msgbox Route114_LanettesHouse_Text_EmailFromBill, MSGBOX_SIGN end -Route114_LanettesHouse_Text_22B34E: @ 822B34E +Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E .string "LANETTE: Oh! {PLAYER}{KUN}!\p" .string "I'm sorry everything is so cluttered…\n" .string "When I get engrossed in research,\l" @@ -56,13 +56,13 @@ Route114_LanettesHouse_Text_22B34E: @ 822B34E .string "This is embarrassing… Please keep\n" .string "this a secret in exchange for this.$" -Route114_LanettesHouse_Text_22B407: @ 822B407 +Route114_LanettesHouse_Text_OrganizeYourBoxes: @ 822B407 .string "May I offer advice about my POKéMON\n" .string "Storage System?\p" .string "You should organize your BOXES so you\n" .string "can tell which POKéMON are in them.$" -Route114_LanettesHouse_Text_22B485: @ 822B485 +Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485 .string "It's LANETTE's research notes.\n" .string "There's information about BOXES.\p" .string "Design BOXES to hold 30 POKéMON each.\p" @@ -70,7 +70,7 @@ Route114_LanettesHouse_Text_22B485: @ 822B485 .string "420 POKéMON on the PC system.\p" .string "Keep reading?$" -Route114_LanettesHouse_Text_22B53C: @ 822B53C +Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C .string "A marking system should be added to\n" .string "make POKéMON easier to organize.\p" .string "The name and wallpaper design of each\n" @@ -78,7 +78,7 @@ Route114_LanettesHouse_Text_22B53C: @ 822B53C .string "the stored POKéMON.\p" .string "Keep reading?$" -Route114_LanettesHouse_Text_22B5EF: @ 822B5EF +Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF .string "When storing a POKéMON, it should be\n" .string "sent to the BOX inspected last.\p" .string "If that BOX is full, the received\n" @@ -87,10 +87,10 @@ Route114_LanettesHouse_Text_22B5EF: @ 822B5EF .string "it is automatically selected as the BOX\l" .string "to which POKéMON are sent.$" -Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 +Route114_LanettesHouse_Text_ClosedTheNotebook: @ 822B6E4 .string "{PLAYER} closed the notebook.$" -Route114_LanettesHouse_Text_22B6FC: @ 822B6FC +Route114_LanettesHouse_Text_EmailFromBill: @ 822B6FC .string "There's an e-mail from someone on\n" .string "the PC.\p" .string "“… … … … … … …\p" diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index f9dfb484c..470ccadfe 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B85A", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B86C", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler3", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B863", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler2", "flag": "0" } ], diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index e4e943e61..42a80fc78 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -6,28 +6,28 @@ Route116_TunnelersRestHouse_OnTransition: @ 822B856 setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end -Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC +Route116_TunnelersRestHouse_EventScript_Tunneler1:: @ 822B85A + msgbox Route116_TunnelersRestHouse_Text_WeHadToStopBoring, MSGBOX_NPC end -Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC +Route116_TunnelersRestHouse_EventScript_Tunneler2:: @ 822B863 + msgbox Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf, MSGBOX_NPC end -Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C +Route116_TunnelersRestHouse_EventScript_Tunneler3:: @ 822B86C lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_TunnelOpened + msgbox Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel, MSGBOX_DEFAULT release end -Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT +Route116_TunnelersRestHouse_EventScript_TunnelOpened:: @ 822B881 + msgbox Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough, MSGBOX_DEFAULT release end -Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B +Route116_TunnelersRestHouse_Text_WeHadToStopBoring: @ 822B88B .string "That RUSTURF TUNNEL there…\p" .string "At first, we had a huge work crew boring\n" .string "through rock with the latest machinery.\l" @@ -38,7 +38,7 @@ Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B .string "So, we've got nothing to do but loll\n" .string "around here doing nothing.$" -Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F +Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf: @ 822B99F .string "There's a man digging his way to\n" .string "VERDANTURF all by his lonesome.\l" .string "He's desperate to get through.\p" @@ -48,13 +48,13 @@ Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F .string "harming the natural environment.\p" .string "I wonder if he made it through yet.$" -Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF +Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel: @ 822BAAF .string "To get to VERDANTURF without using\n" .string "this TUNNEL, you'd have to cross the\l" .string "sea to DEWFORD, sail on to SLATEPORT,\l" .string "then travel through MAUVILLE.$" -Route116_TunnelersRestHouse_Text_22BB3B: @ 822BB3B +Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough: @ 822BB3B .string "Did you hear? The TUNNEL to VERDANTURF\n" .string "has gone through!\p" .string "Sometimes, if you hope strongly enough,\n" diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 31d84664f..f07156653 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_270966", + "script": "Route119_House_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" } ], diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc index 4d4826bdf..b6915aaa3 100644 --- a/data/maps/Route119_House/scripts.inc +++ b/data/maps/Route119_House/scripts.inc @@ -1,27 +1,27 @@ Route119_House_MapScripts:: @ 8270965 .byte 0 -Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, MSGBOX_NPC +Route119_House_EventScript_Woman:: @ 8270966 + msgbox Route119_House_Text_RumorAboutCaveOfOrigin, MSGBOX_NPC end -Route119_House_EventScript_27096F:: @ 827096F +Route119_House_EventScript_Wingull:: @ 827096F lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT + msgbox Route119_House_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end -Route119_House_Text_270982: @ 8270982 +Route119_House_Text_RumorAboutCaveOfOrigin: @ 8270982 .string "I heard about a cave called the CAVE\n" .string "OF ORIGIN.\p" .string "People rumor that the spirits of\n" .string "POKéMON are revived there. Could\l" .string "something like that really happen?$" -Route119_House_Text_270A17: @ 8270A17 +Route119_House_Text_Wingull: @ 8270A17 .string "WINGULL: Pihyoh!$" diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index c87feb2bc..b7f2523af 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F845", + "script": "Route123_BerryMastersHouse_EventScript_BerryMaster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "script": "Route123_BerryMastersHouse_EventScript_BerryMastersWife", "flag": "0" } ], diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 979509440..9e63dc608 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -6,141 +6,141 @@ Route123_BerryMastersHouse_OnTransition: @ 826F841 setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end -Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 +Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_ReceivedBerryToday + msgbox Route123_BerryMastersHouse_Text_YoureDeservingOfBerry, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY - msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6 + msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 +Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday + msgbox Route123_BerryMastersHouse_Text_HeardAGoodSayingLately, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING call Common_ShowEasyChatScreen lock faceplayer - compare VAR_RESULT, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 - compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 + compare VAR_RESULT, TRUE + goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase + compare VAR_RESULT, FALSE + goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase end -Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7 + msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare VAR_0x8004, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C - compare VAR_0x8004, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A - compare VAR_0x8004, 2 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare VAR_0x8004, 3 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare VAR_0x8004, 4 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare VAR_0x8004, 5 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E +Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909 + compare VAR_0x8004, NOT_SPECIAL_PHRASE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry + compare VAR_0x8004, PHRASE_GREAT_BATTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry + compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST + goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry + compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry + compare VAR_0x8004, PHRASE_COOL_LATIOS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry + compare VAR_0x8004, PHRASE_SUPER_HUSTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry end -Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT - random 10 +Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C + msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_WIFE_BERRIES addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry release end -Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 +Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79 setflag FLAG_DAILY_BERRY_MASTERS_WIFE - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end diff --git a/data/mystery_event.s b/data/mystery_event.s new file mode 100644 index 000000000..d707731b6 --- /dev/null +++ b/data/mystery_event.s @@ -0,0 +1,25 @@ +#include "constants/global.h" +#include "constants/flags.h" +#include "constants/items.h" +#include "constants/map_scripts.h" +#include "constants/mevent.h" +#include "constants/moves.h" +#include "constants/region_map_sections.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "constants/vars.h" + .include "asm/macros.inc" + .include "asm/macros/event.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 + .include "data/scripts/mevent_stamp_card.inc" + .include "data/scripts/mevent_pichu.inc" + .include "data/scripts/mevent_trainer.inc" + .include "data/scripts/mevent_battle_card.inc" + .include "data/scripts/mevent_aurora_ticket.inc" + .include "data/scripts/mevent_mystic_ticket.inc" + .include "data/scripts/mevent_altering_cave.inc" + .include "data/scripts/mevent_old_sea_map.inc" diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s deleted file mode 100644 index 33af5269c..000000000 --- a/data/mystery_event_msg.s +++ /dev/null @@ -1,344 +0,0 @@ -#include "constants/flags.h" -#include "constants/items.h" -#include "constants/map_scripts.h" -#include "constants/moves.h" -#include "constants/region_map_sections.h" -#include "constants/songs.h" -#include "constants/species.h" -#include "constants/vars.h" - .include "asm/macros.inc" - .include "asm/macros/event.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - -MysteryEventScript_StampCard:: @ 8674CB0 - setvaddress MysteryEventScript_StampCard - setorcopyvar VAR_RESULT, 1 - specialvar VAR_0x8008, sub_813986C - setorcopyvar VAR_RESULT, 0 - specialvar VAR_0x8009, sub_813986C - subvar VAR_0x8008, VAR_0x8009 - buffernumberstring 0, VAR_0x8008 - lock - faceplayer - vmessage sText_MysteryGiftStampCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftStampCard: - .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" - -MysteryEventScript_SurfPichu:: @ 8674D3D - setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if 0, SurfPichu_GiveIfPossible - returnram - -SurfPichu_GiveIfPossible: @ 8674D4C - specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 - vgoto_if 1, SurfPichu_FullParty - setflag FLAG_MYSTERY_EVENT_DONE - vcall SurfPichu_GiveEgg - lock - faceplayer - vmessage sText_MysteryGiftEgg - waitmessage - waitbuttonpress - playfanfare MUS_FANFA4 - waitfanfare - release - end - -SurfPichu_FullParty: @ 8674D73 - lock - faceplayer - vmessage sText_FullParty - waitmessage - waitbuttonpress - release - end - -SurfPichu_GiveEgg: @ 8674D7E - giveegg SPECIES_PICHU - setmonobedient VAR_EVENT_PICHU_SLOT - setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 - vgoto_if 1, SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 - vgoto_if 1, SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 - vgoto_if 1, SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 - vgoto_if 1, SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 - vgoto_if 1, SurfPichu_Slot5 - return - -SurfPichu_Slot1: @ 8674DC0 - setmonmove 1, 2, MOVE_SURF - return - -SurfPichu_Slot2:: @ 8674DC6 - setmonmove 2, 2, MOVE_SURF - return - -SurfPichu_Slot3: @ 8674DCC - setmonmove 3, 2, MOVE_SURF - return - -SurfPichu_Slot4: @ 8674DD2 - setmonmove 4, 2, MOVE_SURF - return - -SurfPichu_Slot5: @ 8674DD8 - setmonmove 5, 2, MOVE_SURF - return - -sText_MysteryGiftEgg: - .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" - -sText_FullParty: - .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" - -MysteryEventScript_VisitingTrainer:: @ 8674EC1 - setvaddress MysteryEventScript_VisitingTrainer - special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, MysteryEventScript_VisitingTrainerArrived - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainer - waitmessage - waitbuttonpress - release - end - -MysteryEventScript_VisitingTrainerArrived: @ 8674EDF - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainer_2 - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftVisitingTrainer: - .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" - -sText_MysteryGiftVisitingTrainer_2: - .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" - -MysteryEventScript_BattleCard:: @ 867513C - setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if 1, MysteryEventScript_BattleCardInfo - setorcopyvar VAR_RESULT, 2 - specialvar VAR_0x8008, sub_813986C - compare_var_to_value VAR_0x8008, 3 - vgoto_if 0, MysteryEventScript_BattleCardInfo - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard_2 - waitmessage - waitbuttonpress - giveitem_std ITEM_POTION - release - setflag FLAG_MYSTERY_EVENT_DONE - end - -MysteryEventScript_BattleCardInfo: @ 8675179 - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftBattleCountCard: - .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" - -sText_MysteryGiftBattleCountCard_2: - .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" - -MysteryEventScript_AuroraTicket:: @ 867533C - setvaddress MysteryEventScript_AuroraTicket - lock - faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if 1, AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if 1, AuroraTicket_Obtained - checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, AuroraTicket_Obtained - vmessage sText_AuroraTicket1 - waitmessage - waitbuttonpress - checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET - setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND - setflag FLAG_RECEIVED_AURORA_TICKET - vmessage sText_AuroraTicket2 - waitmessage - waitbuttonpress - release - end - -AuroraTicket_NoBagSpace: @ 8675397 - vmessage sText_AuroraTicketNoPlace - waitmessage - waitbuttonpress - release - end - -AuroraTicket_Obtained: @ 86753A0 - vmessage sText_AuroraTicketGot - waitmessage - waitbuttonpress - release - end - -sText_AuroraTicket1: - .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" - -sText_AuroraTicket2: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - -sText_AuroraTicketGot: - .string "Thank you for using the MYSTERY\nGIFT System.$" - -sText_AuroraTicketNoPlace: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" - -MysteryEventScript_MysticTicket:: @ 867550B - setvaddress MysteryEventScript_MysticTicket - lock - faceplayer - checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if 1, MysticTicket_Obtained - checkflag FLAG_CAUGHT_LUGIA - vgoto_if 1, MysticTicket_Obtained - checkflag FLAG_CAUGHT_HO_OH - vgoto_if 1, MysticTicket_Obtained - checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, MysticTicket_Obtained - vmessage sText_MysticTicket2 - waitmessage - waitbuttonpress - checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, MysticTicket_NoBagSpace - giveitem_std ITEM_MYSTIC_TICKET - setflag FLAG_ENABLE_SHIP_NAVEL_ROCK - setflag FLAG_RECEIVED_MYSTIC_TICKET - vmessage sText_MysticTicket1 - waitmessage - waitbuttonpress - release - end - -MysticTicket_NoBagSpace: @ 867556F - vmessage sText_MysticTicketNoPlace - waitmessage - waitbuttonpress - release - end - -MysticTicket_Obtained: @ 8675578 - vmessage sText_MysticTicketGot - waitmessage - waitbuttonpress - release - end - -sText_MysticTicket2: - .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" - -sText_MysticTicket1: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - -sText_MysticTicketGot: - .string "Thank you for using the MYSTERY\nGIFT System.$" - -sText_MysticTicketNoPlace: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" - -MysteryEventScript_AlteringCave:: @ 86756E3 - setvaddress MysteryEventScript_AlteringCave - addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if 0, MysteryEventScript_AlteringCave_ - setvar VAR_ALTERING_CAVE_WILD_SET, 0 -MysteryEventScript_AlteringCave_: @ 86756FD - lock - faceplayer - vmessage sText_MysteryGiftAlteringCave - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftAlteringCave:: - .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" - -MysteryEventScript_OldSeaMap:: @ 86757F4 - setvaddress MysteryEventScript_OldSeaMap - lock - faceplayer - checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if 1, OldSeaMap_Obtained - checkflag FLAG_CAUGHT_MEW - vgoto_if 1, OldSeaMap_Obtained - checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, OldSeaMap_Obtained - vmessage sText_MysteryGiftOldSeaMap - waitmessage - waitbuttonpress - checkitemspace ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, OldSeaMap_NoBagSpace - giveitem_std ITEM_OLD_SEA_MAP - setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND - setflag FLAG_RECEIVED_OLD_SEA_MAP - vmessage sText_MysteryGiftOldSeaMap_1 - waitmessage - waitbuttonpress - release - end - -OldSeaMap_NoBagSpace: @ 867584F - vmessage sText_MysteryGiftOldSeaMap_3 - waitmessage - waitbuttonpress - release - end - -OldSeaMap_Obtained: @ 8675858 - vmessage sText_MysteryGiftOldSeaMap_2 - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftOldSeaMap: - .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" - -sText_MysteryGiftOldSeaMap_1: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - -sText_MysteryGiftOldSeaMap_2: - .string "Thank you for using the MYSTERY\nGIFT System.$" - -sText_MysteryGiftOldSeaMap_3: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc new file mode 100644 index 000000000..072005934 --- /dev/null +++ b/data/scripts/mevent_altering_cave.inc @@ -0,0 +1,24 @@ +MysteryEventScript_AlteringCave:: @ 86756E3 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if_ne MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 86756FD + lock + faceplayer + vmessage sText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftAlteringCave:: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "There appears to be a rumor about\n" + .string "rare POKéMON sightings.\p" + .string "The sightings reportedly came from\n" + .string "the ALTERING CAVE on ROUTE 103.\p" + .string "Perhaps it would be worthwhile for\n" + .string "you to investigate this rumor.$" diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc new file mode 100644 index 000000000..811c840aa --- /dev/null +++ b/data/scripts/mevent_aurora_ticket.inc @@ -0,0 +1,61 @@ +MysteryEventScript_AuroraTicket:: @ 867533C + setvaddress MysteryEventScript_AuroraTicket + lock + faceplayer + checkflag FLAG_RECEIVED_AURORA_TICKET + vgoto_if_eq AuroraTicket_Obtained + checkflag FLAG_BATTLED_DEOXYS + vgoto_if_eq AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained + vmessage sText_AuroraTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace + giveitem_std ITEM_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND + setflag FLAG_RECEIVED_AURORA_TICKET + vmessage sText_AuroraTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +AuroraTicket_NoBagSpace: @ 8675397 + vmessage sText_AuroraTicketBagFull + waitmessage + waitbuttonpress + release + end + +AuroraTicket_Obtained: @ 86753A0 + vmessage sText_AuroraTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_AuroraTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_AuroraTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_AuroraTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_AuroraTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc new file mode 100644 index 000000000..8c36ed63a --- /dev/null +++ b/data/scripts/mevent_battle_card.inc @@ -0,0 +1,47 @@ +MysteryEventScript_BattleCard:: @ 867513C + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_eq MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON + specialvar VAR_0x8008, GetMysteryEventCardVal + compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + vgoto_if_ne MysteryEventScript_BattleCardInfo + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard_WonPrize + waitmessage + waitbuttonpress + giveitem_std ITEM_POTION + release + setflag FLAG_MYSTERY_EVENT_DONE + end + +MysteryEventScript_BattleCardInfo: @ 8675179 + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftBattleCountCard: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" + +sText_MysteryGiftBattleCountCard_WonPrize: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc new file mode 100644 index 000000000..0264fb77f --- /dev/null +++ b/data/scripts/mevent_mystic_ticket.inc @@ -0,0 +1,63 @@ +MysteryEventScript_MysticTicket:: @ 867550B + setvaddress MysteryEventScript_MysticTicket + lock + faceplayer + checkflag FLAG_RECEIVED_MYSTIC_TICKET + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_LUGIA + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_HO_OH + vgoto_if_eq MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained + vmessage sText_MysticTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace + giveitem_std ITEM_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK + setflag FLAG_RECEIVED_MYSTIC_TICKET + vmessage sText_MysticTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +MysticTicket_NoBagSpace: @ 867556F + vmessage sText_MysticTicketBagFull + waitmessage + waitbuttonpress + release + end + +MysticTicket_Obtained: @ 8675578 + vmessage sText_MysticTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysticTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_MysticTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysticTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysticTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc new file mode 100644 index 000000000..dffb56caa --- /dev/null +++ b/data/scripts/mevent_old_sea_map.inc @@ -0,0 +1,62 @@ +MysteryEventScript_OldSeaMap:: @ 86757F4 + setvaddress MysteryEventScript_OldSeaMap + lock + faceplayer + checkflag FLAG_RECEIVED_OLD_SEA_MAP + vgoto_if_eq OldSeaMap_Obtained + checkflag FLAG_CAUGHT_MEW + vgoto_if_eq OldSeaMap_Obtained + checkitem ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMapForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq OldSeaMap_NoBagSpace + giveitem_std ITEM_OLD_SEA_MAP + setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND + setflag FLAG_RECEIVED_OLD_SEA_MAP + vmessage sText_MysteryGiftOldSeaMapUseAtPort + waitmessage + waitbuttonpress + release + end + +OldSeaMap_NoBagSpace: @ 867584F + vmessage sText_MysteryGiftOldSeaMapBagFull + waitmessage + waitbuttonpress + release + end + +OldSeaMap_Obtained: @ 8675858 + vmessage sText_MysteryGiftOldSeaMapThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftOldSeaMapForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Let me confirm--you are {PLAYER}?\p" + .string "We received this OLD SEA MAP\n" + .string "addressed to you.$" + +sText_MysteryGiftOldSeaMapUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysteryGiftOldSeaMapThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysteryGiftOldSeaMapBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc new file mode 100644 index 000000000..4df317564 --- /dev/null +++ b/data/scripts/mevent_pichu.inc @@ -0,0 +1,79 @@ +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_ne SurfPichu_GiveIfPossible + returnram + +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8674D73 + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift--a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" + +sText_FullParty: + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" diff --git a/data/scripts/mevent_stamp_card.inc b/data/scripts/mevent_stamp_card.inc new file mode 100644 index 000000000..dcef80a50 --- /dev/null +++ b/data/scripts/mevent_stamp_card.inc @@ -0,0 +1,21 @@ +MysteryEventScript_StampCard:: @ 8674CB0 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, GET_MAX_STAMPS + specialvar VAR_0x8008, GetMysteryEventCardVal + setorcopyvar VAR_RESULT, GET_NUM_STAMPS + specialvar VAR_0x8009, GetMysteryEventCardVal + subvar VAR_0x8008, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 + lock + faceplayer + vmessage sText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftStampCard: + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc new file mode 100644 index 000000000..1b0117078 --- /dev/null +++ b/data/scripts/mevent_trainer.inc @@ -0,0 +1,49 @@ +MysteryEventScript_VisitingTrainer:: @ 8674EC1 + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerInstructions + waitmessage + waitbuttonpress + release + end + +MysteryEventScript_VisitingTrainerArrived: @ 8674EDF + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerArrived + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftVisitingTrainerInstructions: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to SOOTOPOLIS CITY.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" + +sText_MysteryGiftVisitingTrainerArrived: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in\n" + .string "SOOTOPOLIS CITY looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" diff --git a/data/specials.inc b/data/specials.inc index 62311ce14..1ec8bb230 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -400,7 +400,7 @@ gSpecials:: @ 81DBA64 def_special ClearQuizLadyQuestionAndAnswer def_special QuizLadySetCustomQuestion def_special QuizLadyTakePrizeForCustomQuiz - def_special sub_813986C + def_special GetMysteryEventCardVal def_special QuizLadyRecordCustomQuizData def_special QuizLadySetWaitingForChallenger def_special BufferQuizCorrectAnswer diff --git a/data/text/berries.inc b/data/text/berries.inc index 390812e96..7eeba8e18 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -88,50 +88,50 @@ LilycoveCity_Text_2A7321: @ 82A7321 .string "The way dignified simplicity suits me,\n" .string "{POKEBLOCK}S perfectly suit POKéMON.$" -Route123_BerryMastersHouse_Text_2A7386: @ 82A7386 +Route123_BerryMastersHouse_Text_YoureDeservingOfBerry: @ 82A7386 .string "You may call me the BERRY MASTER.\p" .string "I dream of filling the world with\n" .string "beautiful flowers, so I raise BERRIES\l" .string "and hand them out to everyone.\p" .string "You're deserving of one!$" -Route123_BerryMastersHouse_Text_2A7428: @ 82A7428 +Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother: @ 82A7428 .string "Why be stingy?\n" .string "Take another!$" -Route123_BerryMastersHouse_Text_2A7445: @ 82A7445 +Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop: @ 82A7445 .string "Be sure to visit the PRETTY PETAL\n" .string "flower shop near RUSTBORO.\p" .string "Let flowers fill the world!$" -Route123_BerryMastersHouse_Text_2A749E: @ 82A749E +Route123_BerryMastersHouse_Text_DoneForToday: @ 82A749E .string "I'm done for today.\n" .string "Come again another day.\p" .string "Let flowers fill the world!$" -Route123_BerryMastersHouse_Text_2A74E6: @ 82A74E6 +Route123_BerryMastersHouse_Text_HeardAGoodSayingLately: @ 82A74E6 .string "The way my husband grows BERRIES,\n" .string "oh, he's the best in the world.\p" .string "He makes me proud, that he does.\p" .string "Incidentally, child, have you heard\n" .string "a good saying lately?$" -Route123_BerryMastersHouse_Text_2A7583: @ 82A7583 +Route123_BerryMastersHouse_Text_InspirationalTakeThis: @ 82A7583 .string "Ah! What a remarkable saying!\n" .string "Inspirational, it is!\p" .string "I want you to have this.$" -Route123_BerryMastersHouse_Text_2A75D0: @ 82A75D0 +Route123_BerryMastersHouse_Text_GoodSayingTakeThis: @ 82A75D0 .string "Oh! A good saying it is.\n" .string "You're quite remarkable.\p" .string "I want you to have this.$" -Route123_BerryMastersHouse_Text_2A761B: @ 82A761B +Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife: @ 82A761B .string "Our four grandchildren should become\n" .string "more accomplished than my husband.\p" .string "Joy never goes out of my life!$" -Route123_BerryMastersHouse_Text_2A7682: @ 82A7682 +Route123_BerryMastersHouse_Text_Ah: @ 82A7682 .string "Ah…$" Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686 diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index b97c2aaf2..8e82cfef0 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1097,6 +1097,14 @@ #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 #define NUM_ADDITIONAL_PHRASES 33 +// Special Berry Masters Wife phrases +#define NOT_SPECIAL_PHRASE 0 +#define PHRASE_GREAT_BATTLE 1 +#define PHRASE_CHALLENGE_CONTEST 2 +#define PHRASE_OVERWHELMING_LATIAS 3 +#define PHRASE_COOL_LATIOS 4 +#define PHRASE_SUPER_HUSTLE 5 + #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move) diff --git a/include/constants/flags.h b/include/constants/flags.h index 1d10e2249..2ac6fe8d6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -353,8 +353,8 @@ #define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E -#define FLAG_CHOSE_CLAW_FOSSIL 0x14F -#define FLAG_CHOSE_ROOT_FOSSIL 0x150 +#define FLAG_CHOSE_ROOT_FOSSIL 0x14F +#define FLAG_CHOSE_CLAW_FOSSIL 0x150 #define FLAG_RECEIVED_POWDER_JAR 0x151 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152 diff --git a/include/constants/items.h b/include/constants/items.h index 3a894f8ff..3664f6dd2 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -465,8 +465,17 @@ #define ITEMS_COUNT 377 #define ITEM_FIELD_ARROW ITEMS_COUNT -#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY -#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY +#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY +#define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY +#define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY +#define LAST_BERRY_MASTER_WIFE_BERRY ITEM_SITRUS_BERRY + +#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 +#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX +#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 + #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) #define NUM_TECHNICAL_MACHINES 50 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 2f3ce5f71..6d17fc047 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -255,10 +255,10 @@ #define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E // gTileset_InsideShip -#define METATILE_InsideShip_InTactDoor0_Bottom 0x233 -#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B -#define METATILE_InsideShip_DoorIndent1 0x21A -#define METATILE_InsideShip_DoorIndent0 0x234 +#define METATILE_InsideShip_IntactDoor_Bottom_Unlocked 0x22B +#define METATILE_InsideShip_IntactDoor_Bottom_Locked 0x233 +#define METATILE_InsideShip_DoorIndent_Unlocked 0x21A +#define METATILE_InsideShip_DoorIndent_Locked 0x234 // gTileset_BattlePike #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A diff --git a/include/constants/mevent.h b/include/constants/mevent.h new file mode 100644 index 000000000..25bbcdf36 --- /dev/null +++ b/include/constants/mevent.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_MEVENT_H +#define GUARD_CONSTANTS_MEVENT_H + +// mevent2.c +#define GET_NUM_STAMPS 0 +#define GET_MAX_STAMPS 1 +#define GET_CARD_BATTLES_WON 2 + +#define GET_NUM_STAMPS_INTERNAL 3 +#define GET_MAX_STAMPS_INTERNAL 4 +#define GET_CARD_BATTLES_WON_INTERNAL 0 + +#define REQUIRED_CARD_BATTLES 3 + +#endif //GUARD_MEVENT_H diff --git a/ld_script.txt b/ld_script.txt index 92aafebde..ca59a71a7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -687,7 +687,7 @@ SECTIONS { data/text_input_strings.o(.rodata); data/fonts.o(.rodata); src/mystery_event_msg.o(.rodata); - data/mystery_event_msg.o(.rodata); + data/mystery_event.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 diff --git a/src/easy_chat.c b/src/easy_chat.c index 05f51ed4e..ce5fe3c7a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -532,11 +532,11 @@ static const u16 sMysteryGiftPhrase[] = { }; static const u16 sBerryMasterWifePhrases[][2] = { - {EC_WORD_GREAT, EC_WORD_BATTLE}, - {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, - {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, - {EC_WORD_COOL, EC_POKEMON(LATIOS)}, - {EC_WORD_SUPER, EC_WORD_HUSTLE}, + [PHRASE_GREAT_BATTLE - 1] = {EC_WORD_GREAT, EC_WORD_BATTLE}, + [PHRASE_CHALLENGE_CONTEST - 1] = {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + [PHRASE_OVERWHELMING_LATIAS - 1] = {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + [PHRASE_COOL_LATIOS - 1] = {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + [PHRASE_SUPER_HUSTLE - 1] = {EC_WORD_SUPER, EC_WORD_HUSTLE}, }; static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); diff --git a/src/field_specials.c b/src/field_specials.c index 7c323792a..65bc3a095 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -55,6 +55,7 @@ #include "constants/heal_locations.h" #include "constants/map_types.h" #include "constants/maps.h" +#include "constants/mevent.h" #include "constants/tv.h" #include "constants/script_menu.h" #include "constants/songs.h" @@ -1655,19 +1656,19 @@ void BufferLottoTicketNumber(void) } } -u16 sub_813986C(void) +u16 GetMysteryEventCardVal(void) { switch (gSpecialVar_Result) { - case 0: - return mevent_081445C0(3); - case 1: - return mevent_081445C0(4); - case 2: - return mevent_081445C0(0); - case 3: + case GET_NUM_STAMPS: + return mevent_081445C0(GET_NUM_STAMPS_INTERNAL); + case GET_MAX_STAMPS: + return mevent_081445C0(GET_MAX_STAMPS_INTERNAL); + case GET_CARD_BATTLES_WON: + return mevent_081445C0(GET_CARD_BATTLES_WON_INTERNAL); + case 3: // Never occurs return mevent_081445C0(1); - case 4: + case 4: // Never occurs return mevent_081445C0(2); default: return 0; diff --git a/src/mevent2.c b/src/mevent2.c index f36e5d06b..aedc7b366 100755 --- a/src/mevent2.c +++ b/src/mevent2.c @@ -9,6 +9,7 @@ #include "string_util.h" #include "new_game.h" #include "mevent.h" +#include "constants/mevent.h" #include "constants/species.h" static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE; @@ -493,7 +494,7 @@ u16 mevent_081445C0(u32 command) { switch (command) { - case 0: + case GET_CARD_BATTLES_WON_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -503,7 +504,7 @@ u16 mevent_081445C0(u32 command) } break; } - case 1: + case 1: // Never occurs { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -513,7 +514,7 @@ u16 mevent_081445C0(u32 command) } break; } - case 2: + case 2: // Never occurs { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -523,14 +524,14 @@ u16 mevent_081445C0(u32 command) } break; } - case 3: + case GET_NUM_STAMPS_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 1) return sub_801B4CC(); break; } - case 4: + case GET_MAX_STAMPS_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 1) |