diff options
44 files changed, 1013 insertions, 994 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 4cb25db68..950bc6d5d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -925,7 +925,7 @@ Text_1A5690:: @ 81A5690 .string "{PLAYER} handed over the\n" .string "{STR_VAR_1}.$" -gUnknown_81A56A7:: @ 81A56A7 +Text_GiveNicknameToThisMon:: @ 81A56A7 .string "Do you want to give a nickname to\n" .string "this {STR_VAR_1}?$" @@ -1007,43 +1007,7 @@ Text_1A5CD3:: @ 81A5CD3 Text_TheDoorIsOpen:: @ 81A5CDF .string "The door is open…$" -Text_1A5CF1:: @ 81A5CF1 - .string "{STR_VAR_2} was transferred to\n" - .string "Someone's PC.\p" - .string "It was placed in \n" - .string "BOX “{STR_VAR_1}.”$" - -Text_1A5D31:: @ 81A5D31 - .string "{STR_VAR_2} was transferred to\n" - .string "BILL'S PC.\p" - .string "It was placed in \n" - .string "BOX “{STR_VAR_1}.”$" - -Text_1A5D6E:: @ 81A5D6E - .string "BOX “{STR_VAR_3}” on\n" - .string "Someone's PC was full.\p" - .string "{STR_VAR_2} was transferred to\n" - .string "BOX “{STR_VAR_1}.”$" - -Text_1A5DB1:: @ 81A5DB1 - .string "BOX “{STR_VAR_3}” on\n" - .string "BILL'S PC was full.\p" - .string "{STR_VAR_2} was transferred to\n" - .string "BOX “{STR_VAR_1}.”$" - -Text_1A5DF1:: @ 81A5DF1 - .string "{PLAYER} obtained\n" - .string "the {STR_VAR_1}!$" - -Text_1A5E05:: @ 81A5E05 - .string "ポケモンを もちきれないので\n" - .string "パソコンの ボックス“{STR_VAR_1}” に\l" - .string "{STR_VAR_2}を てんそうした！$" - -gUnknown_81A5E31:: @ 81A5E31 - .string "There's no more room for POKéMON!\p" - .string "The POKéMON BOXES are full and\n" - .string "can't accept any more!$" + .include "data/text/pc_transfer.inc" Text_1A5E89:: @ 81A5E89 .string "First, you should restore your\n" @@ -1510,53 +1474,7 @@ EventScript_1A80FE:: @ 81A80FE end .include "data/scripts/silphco_doors.inc" - -EventScript_1A8C27:: @ 81A8C27 - getpartysize - subvar VAR_RESULT, 1 - copyvar VAR_0x8004, VAR_RESULT - return - -EventScript_1A8C33:: @ 81A8C33 - fadescreen FADE_TO_BLACK - special ChangeBoxPokemonNickname - waitstate - lock - faceplayer - return - -EventScript_1A8C3C:: @ 81A8C3C - bufferboxname 0, VAR_PC_BOX_TO_SEND_MON - getspeciesname 1, VAR_TEMP_1 - call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57 - call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82 - return - -EventScript_1A8C57:: @ 81A8C57 - specialvar VAR_RESULT, ShouldShowBoxWasFullMessage - compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A8C70 - msgbox Text_1A5CF1 - return - -EventScript_1A8C70:: @ 81A8C70 - specialvar VAR_RESULT, GetPCBoxToSendMon - bufferboxname 2, VAR_RESULT - msgbox Text_1A5D6E - return - -EventScript_1A8C82:: @ 81A8C82 - specialvar VAR_RESULT, ShouldShowBoxWasFullMessage - compare VAR_RESULT, TRUE - goto_if_eq EventScript_1A8C9B - msgbox Text_1A5D31 - return - -EventScript_1A8C9B:: @ 81A8C9B - specialvar VAR_RESULT, GetPCBoxToSendMon - bufferboxname 2, VAR_RESULT - msgbox Text_1A5DB1 - return + .include "data/scripts/pc_transfer.inc" EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD copyvar VAR_0x8004, VAR_0x8008 @@ -1776,9 +1694,9 @@ EventScript_BrailleCursorWaitButton:: @ 81A926C special Special_BrailleCursorToggle return -EventScript_1A927C:: @ 81A927C +EventScript_NoMoreRoomForPokemon:: @ 81A927C textcolor 3 - msgbox gUnknown_81A5E31 + msgbox Text_NoMoreRoomForPokemon release end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index e717a7cc4..73c55afd8 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D compare VAR_RESULT, 1 goto_if_eq EventScript_16C4DA compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon release end @@ -26,10 +26,10 @@ EventScript_16C4A6:: @ 816C4A6 waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16C514 - call EventScript_1A8C27 + call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname goto EventScript_16C514 end @@ -41,15 +41,15 @@ EventScript_16C4DA:: @ 816C4DA waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16C509 - call EventScript_1A8C33 + call EventScript_NameReceivedBoxMon goto EventScript_16C509 end EventScript_16C509:: @ 816C509 - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_16C514 end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 5a479aa3f..329f829d3 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -186,7 +186,7 @@ EventScript_16CD52:: @ 816CD52 EventScript_16CD74:: @ 816CD74 textcolor 3 - msgbox gUnknown_81A5E31 + msgbox Text_NoMoreRoomForPokemon hidecoinsbox 0, 0 release end @@ -215,10 +215,10 @@ EventScript_16CDB3:: @ 816CDB3 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_1A5DF1 + message Text_PlayerObtainedTheMon waitmessage waitfanfare - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq EventScript_16CD83 goto EventScript_16CC10 @@ -229,18 +229,18 @@ EventScript_16CDE0:: @ 816CDE0 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_1A5DF1 + message Text_PlayerObtainedTheMon waitmessage waitfanfare - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16CE12 - call EventScript_1A8C33 + call EventScript_NameReceivedBoxMon goto EventScript_16CE12 end EventScript_16CE12:: @ 816CE12 - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_16CC10 end diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 793eb7016..823a4ce95 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_EventScript_1671EF", + "script": "CinnabarIsland_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_EventScript_167208", + "script": "CinnabarIsland_EventScript_OldMan", "flag": "0" }, { @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 0, - "script": "CinnabarIsland_EventScript_1671CA" + "script": "CinnabarIsland_EventScript_GymDoorLocked" } ], "bg_events": [ @@ -131,28 +131,28 @@ "x": 12, "y": 3, "elevation": 0, - "script": "CinnabarIsland_EventScript_167211" + "script": "CinnabarIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 9, "y": 9, "elevation": 0, - "script": "CinnabarIsland_EventScript_16721A" + "script": "CinnabarIsland_EventScript_PokemonLabSign" }, { "type": "bg_event_type_0", "x": 22, "y": 5, "elevation": 0, - "script": "CinnabarIsland_EventScript_167223" + "script": "CinnabarIsland_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 10, "y": 9, "elevation": 0, - "script": "CinnabarIsland_EventScript_16721A" + "script": "CinnabarIsland_EventScript_PokemonLabSign" } ] } diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index b3cd646b4..5780a2bf6 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_BILL, 3 +.equ LOCALID_SEAGALLOP, 4 + CinnabarIsland_MapScripts:: @ 8166ED6 map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame @@ -5,82 +8,82 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND - call EventScript_166F5E + call CinnabarIsland_EventScript_CheckUnlockGym compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if_eq EventScript_166F24 + call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if_eq EventScript_166F52 + call_if_eq CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if_eq EventScript_166F0B + call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter end -EventScript_166F0B:: @ 8166F0B +CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B savebgm MUS_ANNAI setflag FLAG_TEMP_2 - setobjectxyperm 3, 15, 12 - setobjectmovementtype 3, 9 - setobjectxyperm 4, 30, 12 + setobjectxyperm LOCALID_BILL, 15, 12 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_SEAGALLOP, 30, 12 return -EventScript_166F24:: @ 8166F24 +CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 18 - goto_if_ge EventScript_166F4A + goto_if_ge CinnabarIsland_EventScript_MoveSeagallopDown setflag FLAG_TEMP_2 - setobjectxyperm 3, 18, 12 - setobjectmovementtype 3, 7 - setobjectxyperm 4, 30, 12 + setobjectxyperm LOCALID_BILL, 18, 12 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_SEAGALLOP, 30, 12 return -EventScript_166F4A:: @ 8166F4A - setobjectxyperm 4, 30, 8 +CinnabarIsland_EventScript_MoveSeagallopDown:: @ 8166F4A + setobjectxyperm LOCALID_SEAGALLOP, 30, 8 return -EventScript_166F52:: @ 8166F52 - setobjectxyperm 3, 21, 8 - setobjectmovementtype 3, 7 +CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: @ 8166F52 + setobjectxyperm LOCALID_BILL, 21, 8 + setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP return -EventScript_166F5E:: @ 8166F5E - goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68 +CinnabarIsland_EventScript_CheckUnlockGym:: @ 8166F5E + goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, CinnabarIsland_EventScript_UnlockGym return -EventScript_166F68:: @ 8166F68 +CinnabarIsland_EventScript_UnlockGym:: @ 8166F68 setvar VAR_TEMP_1, 1 return CinnabarIsland_OnFrame:: @ 8166F6E - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_ExitPokeCenterForOneIsland + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_BillScene + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_ReturnFromSeviiIslands .2byte 0 -EventScript_166F88:: @ 8166F88 +CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88 lockall clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 delay 20 - call EventScript_1670E6 + call CinnabarIsland_EventScript_SailToOneIsland releaseall end -EventScript_166FA0:: @ 8166FA0 +CinnabarIsland_EventScript_ReturnFromSeviiIslands:: @ 8166FA0 lockall textcolor 0 - msgbox gUnknown_8180F09 + msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain closemessage - applymovement 3, Movement_166FC6 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit waitmovement 0 - removeobject 3 + removeobject LOCALID_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME releaseall end -Movement_166FC6:: @ 8166FC6 +CinnabarIsland_Movement_BillExit:: @ 8166FC6 walk_down walk_down walk_down @@ -89,72 +92,72 @@ Movement_166FC6:: @ 8166FC6 walk_down step_end -EventScript_166FCD:: @ 8166FCD +CinnabarIsland_EventScript_BillScene:: @ 8166FCD lockall textcolor 0 - call_if_unset FLAG_TEMP_2, EventScript_167032 - call_if_set FLAG_TEMP_2, EventScript_16703D + call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1 + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2 playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_BILL, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_BILL, Movement_Delay48 waitmovement 0 - call_if_unset FLAG_TEMP_2, EventScript_167048 - call_if_set FLAG_TEMP_2, EventScript_167053 - msgbox gUnknown_8180C90 - msgbox gUnknown_8180CAA, MSGBOX_YESNO + call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1 + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2 + msgbox CinnabarIsland_Text_HeyIfItIsntPlayer + msgbox CinnabarIsland_Text_ComeWithMeToOneIsland, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_167068 + goto_if_eq CinnabarIsland_EventScript_AgreeSailToOneIsland compare VAR_RESULT, NO - goto_if_eq EventScript_167078 + goto_if_eq CinnabarIsland_EventScript_DeclineSailToOneIsland end -EventScript_167032:: @ 8167032 - applymovement 3, Movement_WalkInPlaceFastestUp +CinnabarIsland_EventScript_BillFacePlayer1:: @ 8167032 + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_16703D:: @ 816703D - applymovement 3, Movement_WalkInPlaceFastestLeft +CinnabarIsland_EventScript_BillFacePlayer2:: @ 816703D + applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_167048:: @ 8167048 - applymovement 3, Movement_1671A4 +CinnabarIsland_EventScript_BillApproachPlayer1:: @ 8167048 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1 waitmovement 0 return -EventScript_167053:: @ 8167053 - applymovement 3, Movement_1671A6 +CinnabarIsland_EventScript_BillApproachPlayer2:: @ 8167053 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_167068:: @ 8167068 - msgbox gUnknown_8180DDD +CinnabarIsland_EventScript_AgreeSailToOneIsland:: @ 8167068 + msgbox CinnabarIsland_Text_AllRightLetsGo closemessage - call EventScript_1670E6 + call CinnabarIsland_EventScript_SailToOneIsland releaseall end -EventScript_167078:: @ 8167078 - msgbox gUnknown_8180DF8 +CinnabarIsland_EventScript_DeclineSailToOneIsland:: @ 8167078 + msgbox CinnabarIsland_Text_IllBeWaitingInPokeCenter closemessage - call_if_unset FLAG_TEMP_2, EventScript_1670A0 - call_if_set FLAG_TEMP_2, EventScript_1670B3 - removeobject 3 + call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter + removeobject LOCALID_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL releaseall end -EventScript_1670A0:: @ 81670A0 - applymovement 3, Movement_1670AB +CinnabarIsland_EventScript_BillExitToPokeCenter:: @ 81670A0 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter waitmovement 0 return -Movement_1670AB:: @ 81670AB +CinnabarIsland_Movement_BillExitToPokeCenter:: @ 81670AB walk_right walk_down walk_down @@ -164,46 +167,47 @@ Movement_1670AB:: @ 81670AB walk_down step_end -EventScript_1670B3:: @ 81670B3 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB - applymovement 3, Movement_1670DE +CinnabarIsland_EventScript_BillReturnToPokeCenter:: @ 81670B3 + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor waitmovement 0 opendoor 14, 11 waitdooranim - applymovement 3, Movement_1670E2 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter waitmovement 0 closedoor 14, 11 waitdooranim return -Movement_1670DB:: @ 81670DB +CinnabarIsland_Movement_PlayerWatchBillExit:: @ 81670DB walk_left walk_in_place_fastest_right step_end -Movement_1670DE:: @ 81670DE +CinnabarIsland_Movement_BillApproachDoor:: @ 81670DE delay_16 walk_left walk_in_place_fastest_up step_end -Movement_1670E2:: @ 81670E2 +CinnabarIsland_Movement_BillReEnterPokeCenter:: @ 81670E2 walk_up delay_4 set_invisible step_end -EventScript_1670E6:: @ 81670E6 - call_if_set FLAG_TEMP_2, EventScript_167142 - addobject 4 - call_if_unset FLAG_TEMP_2, EventScript_167154 - call_if_set FLAG_TEMP_2, EventScript_167166 - msgbox gUnknown_8180EAD +@ Can be triggered outside, or after talking to Bill in the poke center +CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6 + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore + addobject LOCALID_SEAGALLOP + call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter + msgbox CinnabarIsland_Text_MyPalsBoatArrived closemessage - call_if_unset FLAG_TEMP_2, EventScript_167171 - call_if_set FLAG_TEMP_2, EventScript_167183 + call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat + call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 - removeobject 3 + removeobject LOCALID_BILL delay 40 setflag FLAG_HIDE_CINNABAR_SEAGALLOP setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 @@ -212,36 +216,36 @@ EventScript_1670E6:: @ 81670E6 goto EventScript_1A90DA end -EventScript_167142:: @ 8167142 - applymovement 3, Movement_1671AF - applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF +CinnabarIsland_EventScript_ApproachShore:: @ 8167142 + applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore waitmovement 0 return -EventScript_167154:: @ 8167154 - applymovement 3, Movement_1671AA - applymovement 4, Movement_167195 +CinnabarIsland_EventScript_BoatArrive:: @ 8167154 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat + applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return -EventScript_167166:: @ 8167166 - applymovement 4, Movement_167195 +CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: @ 8167166 + applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return -EventScript_167171:: @ 8167171 - applymovement 3, Movement_16719D - applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA +CinnabarIsland_EventScript_BoardBoat:: @ 8167171 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat waitmovement 0 return -EventScript_167183:: @ 8167183 - applymovement 3, Movement_1671B6 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4 +CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: @ 8167183 + applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore waitmovement 0 return -Movement_167195:: @ 8167195 +CinnabarIsland_Movement_BoatArrive:: @ 8167195 delay_16 delay_16 walk_fast_left @@ -251,7 +255,7 @@ Movement_167195:: @ 8167195 walk_slowest_left step_end -Movement_16719D:: @ 816719D +CinnabarIsland_Movement_BillBoardBoat:: @ 816719D walk_right walk_down walk_down @@ -260,24 +264,24 @@ Movement_16719D:: @ 816719D set_invisible step_end -Movement_1671A4:: @ 81671A4 +CinnabarIsland_Movement_BillApproachPlayer1:: @ 81671A4 walk_up step_end -Movement_1671A6:: @ 81671A6 +CinnabarIsland_Movement_BillApproachPlayer2:: @ 81671A6 walk_left walk_left walk_left step_end -Movement_1671AA:: @ 81671AA +CinnabarIsland_Movement_BillFaceBoat:: @ 81671AA delay_16 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_1671AF:: @ 81671AF +CinnabarIsland_Movement_ApproachShore:: @ 81671AF walk_right walk_right walk_right @@ -286,13 +290,13 @@ Movement_1671AF:: @ 81671AF walk_right step_end -Movement_1671B6:: @ 81671B6 +CinnabarIsland_Movement_BillBoardBoatFromShore:: @ 81671B6 walk_right delay_4 set_invisible step_end -Movement_1671BA:: @ 81671BA +CinnabarIsland_Movement_PlayerBoardBoat:: @ 81671BA walk_down walk_right walk_down @@ -304,7 +308,7 @@ Movement_1671BA:: @ 81671BA set_invisible step_end -Movement_1671C4:: @ 81671C4 +CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ 81671C4 walk_right delay_4 walk_right @@ -312,45 +316,46 @@ Movement_1671C4:: @ 81671C4 set_invisible step_end -CinnabarIsland_EventScript_1671CA:: @ 81671CA +@ Triggered when VAR_TEMP_1 is 0 +CinnabarIsland_EventScript_GymDoorLocked:: @ 81671CA lockall applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - msgbox gUnknown_8180B20 + msgbox CinnabarIsland_Text_DoorIsLocked closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor waitmovement 0 releaseall end -Movement_1671ED:: @ 81671ED +CinnabarIsland_Movement_ForcePlayerFromDoor:: @ 81671ED walk_down step_end -CinnabarIsland_EventScript_1671EF:: @ 81671EF +CinnabarIsland_EventScript_Woman:: @ 81671EF lock faceplayer famechecker FAMECHECKER_BLAINE, 3 - msgbox gUnknown_8180B34 + msgbox CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab release end -CinnabarIsland_EventScript_167208:: @ 8167208 - msgbox gUnknown_8180BA0, MSGBOX_NPC +CinnabarIsland_EventScript_OldMan:: @ 8167208 + msgbox CinnabarIsland_Text_ScientistsExperimentInMansion, MSGBOX_NPC end -CinnabarIsland_EventScript_167211:: @ 8167211 - msgbox gUnknown_8180C0D, MSGBOX_SIGN +CinnabarIsland_EventScript_IslandSign:: @ 8167211 + msgbox CinnabarIsland_Text_IslandSign, MSGBOX_SIGN end -CinnabarIsland_EventScript_16721A:: @ 816721A - msgbox gUnknown_8180C3E, MSGBOX_SIGN +CinnabarIsland_EventScript_PokemonLabSign:: @ 816721A + msgbox CinnabarIsland_Text_PokemonLab, MSGBOX_SIGN end -CinnabarIsland_EventScript_167223:: @ 8167223 +CinnabarIsland_EventScript_GymSign:: @ 8167223 lockall famechecker FAMECHECKER_BLAINE, 0 - msgbox gUnknown_8180C4A + msgbox CinnabarIsland_Text_GymSign releaseall end diff --git a/data/maps/CinnabarIsland/text.inc b/data/maps/CinnabarIsland/text.inc index 26ce19f09..08ea3e44b 100644 --- a/data/maps/CinnabarIsland/text.inc +++ b/data/maps/CinnabarIsland/text.inc @@ -1,35 +1,35 @@ -gUnknown_8180B20:: @ 8180B20 +CinnabarIsland_Text_DoorIsLocked:: @ 8180B20 .string "The door is locked…$" -gUnknown_8180B34:: @ 8180B34 +CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab:: @ 8180B34 .string "CINNABAR GYM's BLAINE is quite the\n" .string "odd fellow.\p" .string "He's lived on the island since way\n" .string "before the LAB was built.$" -gUnknown_8180BA0:: @ 8180BA0 +CinnabarIsland_Text_ScientistsExperimentInMansion:: @ 8180BA0 .string "Scientists conduct experiments \n" .string "in the burned-out building.\p" .string "You know, the one they call the\n" .string "POKéMON MANSION.$" -gUnknown_8180C0D:: @ 8180C0D +CinnabarIsland_Text_IslandSign:: @ 8180C0D .string "CINNABAR ISLAND\n" .string "The Fiery Town of Burning Desire$" -gUnknown_8180C3E:: @ 8180C3E +CinnabarIsland_Text_PokemonLab:: @ 8180C3E .string "POKéMON LAB$" -gUnknown_8180C4A:: @ 8180C4A +CinnabarIsland_Text_GymSign:: @ 8180C4A .string "CINNABAR ISLAND POKéMON GYM\n" .string "LEADER: BLAINE\l" .string "The Hotheaded Quiz Master!$" -gUnknown_8180C90:: @ 8180C90 +CinnabarIsland_Text_HeyIfItIsntPlayer:: @ 8180C90 .string "Huh?\n" .string "Hey, if it isn't {PLAYER}!$" -gUnknown_8180CAA:: @ 8180CAA +CinnabarIsland_Text_ComeWithMeToOneIsland:: @ 8180CAA .string "Look, it's me, BILL.\n" .string "Long time no see!\p" .string "I hope you're still using my\n" @@ -43,11 +43,11 @@ gUnknown_8180CAA:: @ 8180CAA .string "How about it?\n" .string "Do you feel like coming with me?$" -gUnknown_8180DDD:: @ 8180DDD +CinnabarIsland_Text_AllRightLetsGo:: @ 8180DDD .string "All right, then.\n" .string "Let's go!$" -gUnknown_8180DF8:: @ 8180DF8 +CinnabarIsland_Text_IllBeWaitingInPokeCenter:: @ 8180DF8 .string "What, are you too busy?\p" .string "Well, all right.\n" .string "The boat hasn't arrived yet anyway.\p" @@ -56,13 +56,13 @@ gUnknown_8180DF8:: @ 8180DF8 .string "Come see me when you're done with\n" .string "your business here.$" -gUnknown_8180EAD:: @ 8180EAD +CinnabarIsland_Text_MyPalsBoatArrived:: @ 8180EAD .string "Looks like my pal's boat arrived,\n" .string "too.\p" .string "He sent it specially here to\n" .string "CINNABAR to pick me up.$" -gUnknown_8180F09:: @ 8180F09 +CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain:: @ 8180F09 .string "Hey, wasn't that a long cruise?\p" .string "My buddy CELIO seemed to enjoy\n" .string "your company.\p" diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 36ef2b0cf..05ba07431 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DB27", + "script": "CinnabarIsland_Gym_EventScript_Quinn", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DA7F", + "script": "CinnabarIsland_Gym_EventScript_Erik", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DA96", + "script": "CinnabarIsland_Gym_EventScript_Avery", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DB53", + "script": "CinnabarIsland_Gym_EventScript_Ramon", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DAC2", + "script": "CinnabarIsland_Gym_EventScript_Derek", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DB7F", + "script": "CinnabarIsland_Gym_EventScript_Dusty", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DAFB", + "script": "CinnabarIsland_Gym_EventScript_Zac", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16D9D4", + "script": "CinnabarIsland_Gym_EventScript_Blaine", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Gym_EventScript_16DBAB", + "script": "CinnabarIsland_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -161,105 +161,105 @@ "x": 23, "y": 20, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DBCA" + "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 27, "y": 20, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DBCA" + "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_1", "x": 22, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DBE8" + "script": "CinnabarIsland_Gym_EventScript_Quz1Left" }, { "type": "bg_event_type_1", "x": 23, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DBF4" + "script": "CinnabarIsland_Gym_EventScript_Quz1Right" }, { "type": "bg_event_type_1", "x": 15, "y": 2, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DCDD" + "script": "CinnabarIsland_Gym_EventScript_Quiz2Left" }, { "type": "bg_event_type_1", "x": 16, "y": 2, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DCE9" + "script": "CinnabarIsland_Gym_EventScript_Quiz2Right" }, { "type": "bg_event_type_1", "x": 13, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DDBB" + "script": "CinnabarIsland_Gym_EventScript_Quiz3Left" }, { "type": "bg_event_type_1", "x": 14, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DDC7" + "script": "CinnabarIsland_Gym_EventScript_Quiz3Right" }, { "type": "bg_event_type_1", "x": 13, "y": 17, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DE92" + "script": "CinnabarIsland_Gym_EventScript_Quiz4Left" }, { "type": "bg_event_type_1", "x": 14, "y": 17, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DE9E" + "script": "CinnabarIsland_Gym_EventScript_Quiz4Right" }, { "type": "bg_event_type_1", "x": 1, "y": 18, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DF69" + "script": "CinnabarIsland_Gym_EventScript_Quiz5Left" }, { "type": "bg_event_type_1", "x": 2, "y": 18, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16DF75" + "script": "CinnabarIsland_Gym_EventScript_Quiz5Right" }, { "type": "bg_event_type_1", "x": 1, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16E040" + "script": "CinnabarIsland_Gym_EventScript_Quiz6Left" }, { "type": "bg_event_type_1", "x": 2, "y": 10, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_16E04C" + "script": "CinnabarIsland_Gym_EventScript_Quiz6Right" }, { "type": "bg_event_type_1", "x": 3, "y": 1, "elevation": 0, - "script": "CinnabarIsland_Gym_EventScript_1ACF07" + "script": "CinnabarIsland_Gym_EventScript_BlaineFujiPhoto" } ] } diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index dc4633df7..f31d6f7bb 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -3,57 +3,57 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B .byte 0 CinnabarIsland_Gym_OnLoad:: @ 816D951 - goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991 - call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0 - call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6 - call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC - call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2 - call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8 - call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE + goto_if_set FLAG_DEFEATED_BLAINE, CinnabarIsland_Gym_OnLoadOpenAllDoors + call_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_OnLoadOpenDoor1 + call_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_OnLoadOpenDoor2 + call_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_OnLoadOpenDoor3 + call_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_OnLoadOpenDoor4 + call_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_OnLoadOpenDoor5 + call_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_OnLoadOpenDoor6 end -EventScript_16D991:: @ 816D991 - call EventScript_16E117 - call EventScript_16E157 - call EventScript_16E197 - call EventScript_16E1D7 - call EventScript_16E1F3 - call EventScript_16E233 +CinnabarIsland_Gym_OnLoadOpenAllDoors:: @ 816D991 + call CinnabarIsland_Gym_EventScript_OpenDoor1 + call CinnabarIsland_Gym_EventScript_OpenDoor2 + call CinnabarIsland_Gym_EventScript_OpenDoor3 + call CinnabarIsland_Gym_EventScript_OpenDoor4 + call CinnabarIsland_Gym_EventScript_OpenDoor5 + call CinnabarIsland_Gym_EventScript_OpenDoor6 end -EventScript_16D9B0:: @ 816D9B0 - call EventScript_16E117 +CinnabarIsland_Gym_OnLoadOpenDoor1:: @ 816D9B0 + call CinnabarIsland_Gym_EventScript_OpenDoor1 return -EventScript_16D9B6:: @ 816D9B6 - call EventScript_16E157 +CinnabarIsland_Gym_OnLoadOpenDoor2:: @ 816D9B6 + call CinnabarIsland_Gym_EventScript_OpenDoor2 return -EventScript_16D9BC:: @ 816D9BC - call EventScript_16E197 +CinnabarIsland_Gym_OnLoadOpenDoor3:: @ 816D9BC + call CinnabarIsland_Gym_EventScript_OpenDoor3 return -EventScript_16D9C2:: @ 816D9C2 - call EventScript_16E1D7 +CinnabarIsland_Gym_OnLoadOpenDoor4:: @ 816D9C2 + call CinnabarIsland_Gym_EventScript_OpenDoor4 return -EventScript_16D9C8:: @ 816D9C8 - call EventScript_16E1F3 +CinnabarIsland_Gym_OnLoadOpenDoor5:: @ 816D9C8 + call CinnabarIsland_Gym_EventScript_OpenDoor5 return -EventScript_16D9CE:: @ 816D9CE - call EventScript_16E233 +CinnabarIsland_Gym_OnLoadOpenDoor6:: @ 816D9CE + call CinnabarIsland_Gym_EventScript_OpenDoor6 return -CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 +CinnabarIsland_Gym_EventScript_Blaine:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC - goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34 - msgbox gUnknown_819971D + trainerbattle_single TRAINER_LEADER_BLAINE, CinnabarIsland_Gym_Text_BlaineIntro, CinnabarIsland_Gym_Text_BlaineDefeat, CinnabarIsland_Gym_EventScript_DefeatedBlaine, NO_MUSIC + goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, CinnabarIsland_Gym_EventScript_GiveTM38 + msgbox CinnabarIsland_Gym_Text_BlainePostBattle release end -EventScript_16DA06:: @ 816DA06 +CinnabarIsland_Gym_EventScript_DefeatedBlaine:: @ 816DA06 famechecker FAMECHECKER_BLAINE, 1 setflag FLAG_DEFEATED_BLAINE setflag FLAG_BADGE07_GET @@ -61,675 +61,675 @@ EventScript_16DA06:: @ 816DA06 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 clearflag FLAG_HIDE_CINNABAR_BILL set_gym_trainers 7 - goto EventScript_16DA34 + goto CinnabarIsland_Gym_EventScript_GiveTM38 end -EventScript_16DA34:: @ 816DA34 - msgbox gUnknown_819969E +CinnabarIsland_Gym_EventScript_GiveTM38:: @ 816DA34 + msgbox CinnabarIsland_Gym_Text_ExplainVolcanoBadge checkitemspace ITEM_TM38, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16DA75 - giveitem_msg gUnknown_81996FF, ITEM_TM38 + goto_if_eq CinnabarIsland_Gym_EventScript_NoRoomForTM38 + giveitem_msg CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE - msgbox gUnknown_8199652 + msgbox CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove release end -EventScript_16DA75:: @ 816DA75 - msgbox gUnknown_8199789 +CinnabarIsland_Gym_EventScript_NoRoomForTM38:: @ 816DA75 + msgbox CinnabarIsland_Gym_Text_MakeSpaceForThis release end -CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 - msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Erik:: @ 816DA7F + trainerbattle_single TRAINER_SUPER_NERD_ERIK, CinnabarIsland_Gym_Text_ErikIntro, CinnabarIsland_Gym_Text_ErikDefeat + msgbox CinnabarIsland_Gym_Text_ErikPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 - msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Avery:: @ 816DA96 + trainerbattle_single TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryIntro, CinnabarIsland_Gym_Text_AveryDefeat, CinnabarIsland_Gym_EventScript_DefeatedAvery + msgbox CinnabarIsland_Gym_Text_AveryPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DAB1:: @ 816DAB1 - call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC +CinnabarIsland_Gym_EventScript_DefeatedAvery:: @ 816DAB1 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer release end -EventScript_16DABC:: @ 816DABC - call EventScript_16DD31 +CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer:: @ 816DABC + call CinnabarIsland_Gym_EventScript_Quiz2Complete return -CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA +CinnabarIsland_Gym_EventScript_Derek:: @ 816DAC2 + trainerbattle_single TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekIntro, CinnabarIsland_Gym_Text_DerekDefeat, CinnabarIsland_Gym_EventScript_DefeatedDerek famechecker FAMECHECKER_BLAINE, 2 - msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE + msgbox CinnabarIsland_Gym_Text_DerekPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DAEA:: @ 816DAEA - call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5 +CinnabarIsland_Gym_EventScript_DefeatedDerek:: @ 816DAEA + call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer release end -EventScript_16DAF5:: @ 816DAF5 - call EventScript_16DEE6 +CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer:: @ 816DAF5 + call CinnabarIsland_Gym_EventScript_Quiz4Complete return -CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 - msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Zac:: @ 816DAFB + trainerbattle_single TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacIntro, CinnabarIsland_Gym_Text_ZacDefeat, CinnabarIsland_Gym_EventScript_DefeatedZac + msgbox CinnabarIsland_Gym_Text_ZacPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DB16:: @ 816DB16 - call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21 +CinnabarIsland_Gym_EventScript_DefeatedZac:: @ 816DB16 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer release end -EventScript_16DB21:: @ 816DB21 - call EventScript_16E094 +CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer:: @ 816DB21 + call CinnabarIsland_Gym_EventScript_Quiz6Complete return -CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 - msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Quinn:: @ 816DB27 + trainerbattle_single TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnIntro, CinnabarIsland_Gym_Text_QuinnDefeat, CinnabarIsland_Gym_EventScript_DefeatedQuinn + msgbox CinnabarIsland_Gym_Text_QuinnPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DB42:: @ 816DB42 - call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D +CinnabarIsland_Gym_EventScript_DefeatedQuinn:: @ 816DB42 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer release end -EventScript_16DB4D:: @ 816DB4D - call EventScript_16DC58 +CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer:: @ 816DB4D + call CinnabarIsland_Gym_EventScript_Quiz1Complete return -CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E - msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Ramon:: @ 816DB53 + trainerbattle_single TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonIntro, CinnabarIsland_Gym_Text_RamonDefeat, CinnabarIsland_Gym_EventScript_DefeatedRamon + msgbox CinnabarIsland_Gym_Text_RamonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DB6E:: @ 816DB6E - call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79 +CinnabarIsland_Gym_EventScript_DefeatedRamon:: @ 816DB6E + call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer release end -EventScript_16DB79:: @ 816DB79 - call EventScript_16DE0F +CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer:: @ 816DB79 + call CinnabarIsland_Gym_EventScript_Quiz3Complete return -CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A - msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE +CinnabarIsland_Gym_EventScript_Dusty:: @ 816DB7F + trainerbattle_single TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyIntro, CinnabarIsland_Gym_Text_DustyDefeat, CinnabarIsland_Gym_EventScript_DefeatedDusty + msgbox CinnabarIsland_Gym_Text_DustyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16DB9A:: @ 816DB9A - call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5 +CinnabarIsland_Gym_EventScript_DefeatedDusty:: @ 816DB9A + call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer release end -EventScript_16DBA5:: @ 816DBA5 - call EventScript_16DFBD +CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer:: @ 816DBA5 + call CinnabarIsland_Gym_EventScript_Quiz5Complete return -CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB +CinnabarIsland_Gym_EventScript_GymGuy:: @ 816DBAB lock faceplayer - goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0 - msgbox gUnknown_8199B81 + goto_if_set FLAG_DEFEATED_BLAINE, CinnabarIsland_Gym_EventScript_GymGuyPostVictory + msgbox CinnabarIsland_Gym_Text_GymGuyAdvice release end -EventScript_16DBC0:: @ 816DBC0 - msgbox gUnknown_8199C0C +CinnabarIsland_Gym_EventScript_GymGuyPostVictory:: @ 816DBC0 + msgbox CinnabarIsland_Gym_Text_GymGuyPostVictory release end -CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA +CinnabarIsland_Gym_EventScript_GymStatue:: @ 816DBCA lockall - goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE - msgbox gUnknown_8199C29 + goto_if_set FLAG_BADGE07_GET, CinnabarIsland_Gym_EventScript_GymStatuePostVictory + msgbox CinnabarIsland_Gym_Text_GymStatue releaseall end -EventScript_16DBDE:: @ 816DBDE - msgbox gUnknown_8199C62 +CinnabarIsland_Gym_EventScript_GymStatuePostVictory:: @ 816DBDE + msgbox CinnabarIsland_Gym_Text_GymStatuePlayerWon releaseall end -CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 +CinnabarIsland_Gym_EventScript_Quz1Left:: @ 816DBE8 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16DC00 + goto CinnabarIsland_Gym_EventScript_Quiz1 end -CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 +CinnabarIsland_Gym_EventScript_Quz1Right:: @ 816DBF4 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16DC00 + goto CinnabarIsland_Gym_EventScript_Quiz1 end -EventScript_16DC00:: @ 816DC00 - msgbox gUnknown_8199C9F - msgbox gUnknown_8199D5A, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion1, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16DC43 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Correct compare VAR_RESULT, NO - goto_if_eq EventScript_16DC6A + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Incorrect end -EventScript_16DC27:: @ 816DC27 +CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27 playfanfare MUS_FANFA1 waitfanfare - msgbox gUnknown_8199E4F + msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough return -EventScript_16DC34:: @ 816DC34 +CinnabarIsland_Gym_EventScript_IncorrectAnswer:: @ 816DC34 waitse playse SE_BOO waitse - msgbox gUnknown_8199E79 + msgbox CinnabarIsland_Gym_Text_SorryBadCall closemessage return -EventScript_16DC43:: @ 816DC43 - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 - call EventScript_16DC58 +CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43 + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz1Complete releaseall end -EventScript_16DC58:: @ 816DC58 +CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 playse SE_KI_GASYAN waitse - call EventScript_16E117 + call CinnabarIsland_Gym_EventScript_OpenDoor1 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_1 return -EventScript_16DC68:: @ 816DC68 +CinnabarIsland_Gym_EventScript_DoorAlreadyOpen:: @ 816DC68 releaseall end -EventScript_16DC6A:: @ 816DC6A - call EventScript_16DC34 - goto_if_not_defeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A +CinnabarIsland_Gym_EventScript_Quiz1Incorrect:: @ 816DC6A + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_EventScript_BattleQuinn releaseall end -EventScript_16DC7A:: @ 816DC7A +CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A compare VAR_TEMP_1, 0 - call_if_eq EventScript_16DCB4 + call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16DCC6 + call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachRight textcolor 0 - msgbox gUnknown_819983F - trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 - call EventScript_16DC58 + msgbox CinnabarIsland_Gym_Text_QuinnIntro + trainerbattle_no_intro TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz1Complete releaseall end -EventScript_16DCB4:: @ 816DCB4 +CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: @ 816DCB4 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 1, Movement_16DCD8 + applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return -EventScript_16DCC6:: @ 816DCC6 +CinnabarIsland_Gym_EventScript_QuinnApproachRight:: @ 816DCC6 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 1, Movement_16DCDB + applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return -Movement_16DCD8:: @ 816DCD8 +CinnabarIsland_Gym_Movement_QuinnApproachLeft:: @ 816DCD8 walk_left walk_left step_end -Movement_16DCDB:: @ 816DCDB +CinnabarIsland_Gym_Movement_QuinnApproachRight:: @ 816DCDB walk_left step_end -CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD +CinnabarIsland_Gym_EventScript_Quiz2Left:: @ 816DCDD lockall setvar VAR_TEMP_1, 0 - goto EventScript_16DCF5 + goto CinnabarIsland_Gym_EventScript_Quiz2 end -CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 +CinnabarIsland_Gym_EventScript_Quiz2Right:: @ 816DCE9 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16DCF5 + goto CinnabarIsland_Gym_EventScript_Quiz2 end -EventScript_16DCF5:: @ 816DCF5 - msgbox gUnknown_8199C9F - msgbox gUnknown_8199D79, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz2:: @ 816DCF5 + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion2, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16DD41 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Incorrect compare VAR_RESULT, NO - goto_if_eq EventScript_16DD1C + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Correct end -EventScript_16DD1C:: @ 816DD1C - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 - call EventScript_16DD31 +CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz2Complete releaseall end -EventScript_16DD31:: @ 816DD31 +CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 playse SE_KI_GASYAN waitse - call EventScript_16E157 + call CinnabarIsland_Gym_EventScript_OpenDoor2 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_2 return -EventScript_16DD41:: @ 816DD41 - call EventScript_16DC34 - goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51 +CinnabarIsland_Gym_EventScript_Quiz2Incorrect:: @ 816DD41 + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_EventScript_BattleAvery releaseall end -EventScript_16DD51:: @ 816DD51 +CinnabarIsland_Gym_EventScript_BattleAvery:: @ 816DD51 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16DD8B + call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16DD9D + call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachRight textcolor 0 - msgbox gUnknown_81998BD - trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED - goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 - call EventScript_16DD31 + msgbox CinnabarIsland_Gym_Text_AveryIntro + trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz2Complete releaseall end -EventScript_16DD8B:: @ 816DD8B - applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 - applymovement 3, Movement_16DDAF +CinnabarIsland_Gym_EventScript_AveryApproachLeft:: @ 816DD8B + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery + applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachLeft waitmovement 0 return -EventScript_16DD9D:: @ 816DD9D - applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 - applymovement 3, Movement_16DDB3 +CinnabarIsland_Gym_EventScript_AveryApproachRight:: @ 816DD9D + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery + applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachRight waitmovement 0 return -Movement_16DDAF:: @ 816DDAF +CinnabarIsland_Gym_Movement_AveryApproachLeft:: @ 816DDAF walk_up walk_up walk_left step_end -Movement_16DDB3:: @ 816DDB3 +CinnabarIsland_Gym_Movement_AveryApproachRight:: @ 816DDB3 walk_up walk_up walk_in_place_fastest_left step_end -Movement_16DDB7:: @ 816DDB7 +CinnabarIsland_Gym_Movement_PlayerFaceAvery:: @ 816DDB7 delay_16 delay_16 walk_in_place_fastest_right step_end -CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB +CinnabarIsland_Gym_EventScript_Quiz3Left:: @ 816DDBB lockall setvar VAR_TEMP_1, 0 - goto EventScript_16DDD3 + goto CinnabarIsland_Gym_EventScript_Quiz3 end -CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 +CinnabarIsland_Gym_EventScript_Quiz3Right:: @ 816DDC7 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16DDD3 + goto CinnabarIsland_Gym_EventScript_Quiz3 end -EventScript_16DDD3:: @ 816DDD3 - msgbox gUnknown_8199C9F - msgbox gUnknown_8199DA9, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz3:: @ 816DDD3 + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion3, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16DE1F + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Incorrect compare VAR_RESULT, NO - goto_if_eq EventScript_16DDFA + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Correct end -EventScript_16DDFA:: @ 816DDFA - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 - call EventScript_16DE0F +CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz3Complete releaseall end -EventScript_16DE0F:: @ 816DE0F +CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F playse SE_KI_GASYAN waitse - call EventScript_16E197 + call CinnabarIsland_Gym_EventScript_OpenDoor3 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_3 return -EventScript_16DE1F:: @ 816DE1F - call EventScript_16DC34 - goto_if_not_defeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F +CinnabarIsland_Gym_EventScript_Quiz3Incorrect:: @ 816DE1F + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_EventScript_BattleRamon releaseall end -EventScript_16DE2F:: @ 816DE2F +CinnabarIsland_Gym_EventScript_BattleRamon:: @ 816DE2F compare VAR_TEMP_1, 0 - call_if_eq EventScript_16DE69 + call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16DE7B + call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachRight textcolor 0 - msgbox gUnknown_8199948 - trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 - call EventScript_16DE0F + msgbox CinnabarIsland_Gym_Text_RamonIntro + trainerbattle_no_intro TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz3Complete releaseall end -EventScript_16DE69:: @ 816DE69 +CinnabarIsland_Gym_EventScript_RamonApproachLeft:: @ 816DE69 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, Movement_16DE8D + applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return -EventScript_16DE7B:: @ 816DE7B +CinnabarIsland_Gym_EventScript_RamonApproachRight:: @ 816DE7B applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, Movement_16DE90 + applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return -Movement_16DE8D:: @ 816DE8D +CinnabarIsland_Gym_Movement_RamonApproachLeft:: @ 816DE8D walk_left walk_left step_end -Movement_16DE90:: @ 816DE90 +CinnabarIsland_Gym_Movement_RamonApproachRight:: @ 816DE90 walk_left step_end -CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 +CinnabarIsland_Gym_EventScript_Quiz4Left:: @ 816DE92 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16DEAA + goto CinnabarIsland_Gym_EventScript_Quiz4 end -CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E +CinnabarIsland_Gym_EventScript_Quiz4Right:: @ 816DE9E lockall setvar VAR_TEMP_1, 1 - goto EventScript_16DEAA + goto CinnabarIsland_Gym_EventScript_Quiz4 end -EventScript_16DEAA:: @ 816DEAA - msgbox gUnknown_8199C9F - msgbox gUnknown_8199DC6, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz4:: @ 816DEAA + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion4, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16DEF6 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Incorrect compare VAR_RESULT, NO - goto_if_eq EventScript_16DED1 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Correct end -EventScript_16DED1:: @ 816DED1 - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 - call EventScript_16DEE6 +CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1 + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz4Complete releaseall end -EventScript_16DEE6:: @ 816DEE6 +CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 playse SE_KI_GASYAN waitse - call EventScript_16E1D7 + call CinnabarIsland_Gym_EventScript_OpenDoor4 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_4 return -EventScript_16DEF6:: @ 816DEF6 - call EventScript_16DC34 - goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06 +CinnabarIsland_Gym_EventScript_Quiz4Incorrect:: @ 816DEF6 + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_EventScript_BattleDerek releaseall end -EventScript_16DF06:: @ 816DF06 +CinnabarIsland_Gym_EventScript_BattleDerek:: @ 816DF06 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16DF40 + call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16DF52 + call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachRight textcolor 0 - msgbox gUnknown_81999B7 - trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB - goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 - call EventScript_16DEE6 + msgbox CinnabarIsland_Gym_Text_DerekIntro + trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz4Complete releaseall end -EventScript_16DF40:: @ 816DF40 +CinnabarIsland_Gym_EventScript_DerekApproachLeft:: @ 816DF40 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 5, Movement_16DF64 + applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return -EventScript_16DF52:: @ 816DF52 +CinnabarIsland_Gym_EventScript_DerekApproachRight:: @ 816DF52 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 5, Movement_16DF67 + applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return -Movement_16DF64:: @ 816DF64 +CinnabarIsland_Gym_Movement_DerekApproachLeft:: @ 816DF64 walk_left walk_left step_end -Movement_16DF67:: @ 816DF67 +CinnabarIsland_Gym_Movement_DerekApproachRight:: @ 816DF67 walk_left step_end -CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 +CinnabarIsland_Gym_EventScript_Quiz5Left:: @ 816DF69 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16DF81 + goto CinnabarIsland_Gym_EventScript_Quiz5 end -CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 +CinnabarIsland_Gym_EventScript_Quiz5Right:: @ 816DF75 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16DF81 + goto CinnabarIsland_Gym_EventScript_Quiz5 end -EventScript_16DF81:: @ 816DF81 - msgbox gUnknown_8199C9F - msgbox gUnknown_8199E00, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz5:: @ 816DF81 + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion5, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16DFA8 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Correct compare VAR_RESULT, NO - goto_if_eq EventScript_16DFCD + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Incorrect end -EventScript_16DFA8:: @ 816DFA8 - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 - call EventScript_16DFBD +CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8 + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz5Complete releaseall end -EventScript_16DFBD:: @ 816DFBD +CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD playse SE_KI_GASYAN waitse - call EventScript_16E1F3 + call CinnabarIsland_Gym_EventScript_OpenDoor5 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_5 return -EventScript_16DFCD:: @ 816DFCD - call EventScript_16DC34 - goto_if_not_defeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD +CinnabarIsland_Gym_EventScript_Quiz5Incorrect:: @ 816DFCD + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_EventScript_BattleDusty releaseall end -EventScript_16DFDD:: @ 816DFDD +CinnabarIsland_Gym_EventScript_BattleDusty:: @ 816DFDD compare VAR_TEMP_1, 0 - call_if_eq EventScript_16E017 + call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16E029 + call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachRight textcolor 0 - msgbox gUnknown_8199A7F - trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 - call EventScript_16DFBD + msgbox CinnabarIsland_Gym_Text_DustyIntro + trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz5Complete releaseall end -EventScript_16E017:: @ 816E017 +CinnabarIsland_Gym_EventScript_DustyApproachLeft:: @ 816E017 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 6, Movement_16E03B + applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return -EventScript_16E029:: @ 816E029 +CinnabarIsland_Gym_EventScript_DustyApproachRight:: @ 816E029 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 6, Movement_16E03E + applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return -Movement_16E03B:: @ 816E03B +CinnabarIsland_Gym_Movement_DustyApproachLeft:: @ 816E03B walk_left walk_left step_end -Movement_16E03E:: @ 816E03E +CinnabarIsland_Gym_Movement_DustyApproachRight:: @ 816E03E walk_left step_end -CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 +CinnabarIsland_Gym_EventScript_Quiz6Left:: @ 816E040 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16E058 + goto CinnabarIsland_Gym_EventScript_Quiz6 end -CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C +CinnabarIsland_Gym_EventScript_Quiz6Right:: @ 816E04C lockall setvar VAR_TEMP_1, 1 - goto EventScript_16E058 + goto CinnabarIsland_Gym_EventScript_Quiz6 end -EventScript_16E058:: @ 816E058 - msgbox gUnknown_8199C9F - msgbox gUnknown_8199E36, MSGBOX_YESNO +CinnabarIsland_Gym_EventScript_Quiz6:: @ 816E058 + msgbox CinnabarIsland_Gym_Text_PokemonQuizRules + msgbox CinnabarIsland_Gym_Text_QuizQuestion6, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16E0A4 + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Incorrect compare VAR_RESULT, NO - goto_if_eq EventScript_16E07F + goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Correct end -EventScript_16E07F:: @ 816E07F - call EventScript_16DC27 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 - call EventScript_16E094 +CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F + call CinnabarIsland_Gym_EventScript_CorrectAnswer + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz6Complete releaseall end -EventScript_16E094:: @ 816E094 +CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 playse SE_KI_GASYAN waitse - call EventScript_16E233 + call CinnabarIsland_Gym_EventScript_OpenDoor6 special DrawWholeMapView setflag FLAG_CINNABAR_GYM_QUIZ_6 return -EventScript_16E0A4:: @ 816E0A4 - call EventScript_16DC34 - goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4 +CinnabarIsland_Gym_EventScript_Quiz6Incorrect:: @ 816E0A4 + call CinnabarIsland_Gym_EventScript_IncorrectAnswer + goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_EventScript_BattleZac releaseall end -EventScript_16E0B4:: @ 816E0B4 +CinnabarIsland_Gym_EventScript_BattleZac:: @ 816E0B4 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16E0EE + call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16E100 + call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachRight textcolor 0 - msgbox gUnknown_8199AFC - trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16 - goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 - call EventScript_16E094 + msgbox CinnabarIsland_Gym_Text_ZacIntro + trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacDefeat + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen + call CinnabarIsland_Gym_EventScript_Quiz6Complete releaseall end -EventScript_16E0EE:: @ 816E0EE +CinnabarIsland_Gym_EventScript_ZacApproachLeft:: @ 816E0EE applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 7, Movement_16E112 + applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return -EventScript_16E100:: @ 816E100 +CinnabarIsland_Gym_EventScript_ZacApproachRight:: @ 816E100 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 7, Movement_16E115 + applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return -Movement_16E112:: @ 816E112 +CinnabarIsland_Gym_Movement_ZacApproachLeft:: @ 816E112 walk_left walk_left step_end -Movement_16E115:: @ 816E115 +CinnabarIsland_Gym_Movement_ZacApproachRight:: @ 816E115 walk_left step_end -EventScript_16E117:: @ 816E117 - setmetatile 26, 8, 711, 0 - setmetatile 27, 8, 710, 0 - setmetatile 26, 9, 719, 0 - setmetatile 27, 9, 718, 0 - setmetatile 26, 10, 649, 0 - setmetatile 27, 10, 641, 0 - setmetatile 28, 10, 642, 0 - return - -EventScript_16E157:: @ 816E157 - setmetatile 17, 8, 711, 0 - setmetatile 18, 8, 710, 0 - setmetatile 17, 9, 719, 0 - setmetatile 18, 9, 718, 0 - setmetatile 17, 10, 649, 0 - setmetatile 18, 10, 641, 0 - setmetatile 19, 10, 642, 0 - return - -EventScript_16E197:: @ 816E197 - setmetatile 17, 15, 711, 0 - setmetatile 18, 15, 710, 0 - setmetatile 17, 16, 719, 0 - setmetatile 18, 16, 718, 0 - setmetatile 17, 17, 649, 0 - setmetatile 18, 17, 641, 0 - setmetatile 19, 17, 642, 0 - return - -EventScript_16E1D7:: @ 816E1D7 - setmetatile 11, 21, 721, 1 - setmetatile 11, 22, 649, 0 - setmetatile 11, 23, 641, 0 - return - -EventScript_16E1F3:: @ 816E1F3 - setmetatile 5, 16, 711, 0 - setmetatile 6, 16, 710, 0 - setmetatile 5, 17, 719, 0 - setmetatile 6, 17, 718, 0 - setmetatile 5, 18, 649, 0 - setmetatile 6, 18, 641, 0 - setmetatile 7, 18, 642, 0 - return - -EventScript_16E233:: @ 816E233 - setmetatile 5, 8, 711, 0 - setmetatile 6, 8, 710, 0 - setmetatile 5, 9, 719, 0 - setmetatile 6, 9, 718, 0 - setmetatile 5, 10, 649, 0 - setmetatile 6, 10, 641, 0 - setmetatile 7, 10, 642, 0 +CinnabarIsland_Gym_EventScript_OpenDoor1:: @ 816E117 + setmetatile 26, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 + setmetatile 27, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 + setmetatile 26, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 + setmetatile 27, 9, METATILE_CinnabarGym_Floor_WallRightEdge, 0 + setmetatile 26, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 27, 10, METATILE_CinnabarGym_Floor, 0 + setmetatile 28, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 + return + +CinnabarIsland_Gym_EventScript_OpenDoor2:: @ 816E157 + setmetatile 17, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 + setmetatile 18, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 + setmetatile 17, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 + setmetatile 18, 9, METATILE_CinnabarGym_Floor_WallRightEdge, 0 + setmetatile 17, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 18, 10, METATILE_CinnabarGym_Floor, 0 + setmetatile 19, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 + return + +CinnabarIsland_Gym_EventScript_OpenDoor3:: @ 816E197 + setmetatile 17, 15, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 + setmetatile 18, 15, METATILE_CinnabarGym_Floor_WallRightCorner, 0 + setmetatile 17, 16, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 + setmetatile 18, 16, METATILE_CinnabarGym_Floor_WallRightEdge, 0 + setmetatile 17, 17, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 18, 17, METATILE_CinnabarGym_Floor, 0 + setmetatile 19, 17, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 + return + +CinnabarIsland_Gym_EventScript_OpenDoor4:: @ 816E1D7 + setmetatile 11, 21, METATILE_CinnabarGym_Wall_RetractedBarrier, 1 + setmetatile 11, 22, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 11, 23, METATILE_CinnabarGym_Floor, 0 + return + +CinnabarIsland_Gym_EventScript_OpenDoor5:: @ 816E1F3 + setmetatile 5, 16, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 + setmetatile 6, 16, METATILE_CinnabarGym_Floor_WallRightCorner, 0 + setmetatile 5, 17, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 + setmetatile 6, 17, METATILE_CinnabarGym_Floor_WallRightEdge, 0 + setmetatile 5, 18, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 6, 18, METATILE_CinnabarGym_Floor, 0 + setmetatile 7, 18, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 + return + +CinnabarIsland_Gym_EventScript_OpenDoor6:: @ 816E233 + setmetatile 5, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 + setmetatile 6, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 + setmetatile 5, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 + setmetatile 6, 9, METATILE_CinnabarGym_Floor_WallRightEdge, 0 + setmetatile 5, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0 + setmetatile 6, 10, METATILE_CinnabarGym_Floor, 0 + setmetatile 7, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index c09e8b791..4543ffcc8 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -1,4 +1,4 @@ -Text_199543:: @ 8199543 +CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 .string "Hah!\p" .string "I am BLAINE, the red-hot LEADER\n" .string "of CINNABAR GYM!\p" @@ -8,95 +8,91 @@ Text_199543:: @ 8199543 .string "Hah!\n" .string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$" -Text_1995FA:: @ 81995FA +CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA .string "I have burned down to nothing!\n" .string "Not even ashes remain!\p" .string "You have earned the VOLCANOBADGE.$" -gUnknown_8199652:: @ 8199652 +CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove:: @ 8199652 .string "FIRE BLAST is the ultimate fire\n" .string "technique.\p" .string "Don't waste it on WATER POKéMON.$" -gUnknown_819969E:: @ 819969E +CinnabarIsland_Gym_Text_ExplainVolcanoBadge:: @ 819969E .string "Hah!\p" .string "The VOLCANOBADGE heightens the\n" .string "SPECIAL stats of your POKéMON.\p" .string "Here, you can have this, too!$" -gUnknown_81996FF:: @ 81996FF +CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine:: @ 81996FF .string "{PLAYER} received TM38\n" .string "from BLAINE.$" -gUnknown_819971D:: @ 819971D +CinnabarIsland_Gym_Text_BlainePostBattle:: @ 819971D .string "TM38 contains FIRE BLAST.\n" .string "Teach it to FIRE-type POKéMON.\p" .string "VULPIX or CHARMELEON would be\n" .string "ideal for that move.$" -gUnknown_8199789:: @ 8199789 +CinnabarIsland_Gym_Text_MakeSpaceForThis:: @ 8199789 .string "Make space for this, child!$" -Text_1997A5:: @ 81997A5 +CinnabarIsland_Gym_Text_ErikIntro:: @ 81997A5 .string "Do you know how hot POKéMON fire\n" .string "breath can get?$" -Text_1997D6:: @ 81997D6 +CinnabarIsland_Gym_Text_ErikDefeat:: @ 81997D6 .string "Yow!\n" .string "Hot, hot, hot!$" -gUnknown_81997EA:: @ 81997EA +CinnabarIsland_Gym_Text_ErikPostBattle:: @ 81997EA .string "Fire, or to be more precise,\n" .string "combustion…\p" .string "…Oxygen in the air…\n" .string "Blah, blah, blah, blah…$" -Text_19983F:: @ 819983F -gUnknown_819983F:: @ 819983F +CinnabarIsland_Gym_Text_QuinnIntro:: @ 819983F .string "I was a thief, but I went straight\n" .string "as a TRAINER.$" -Text_199870:: @ 8199870 +CinnabarIsland_Gym_Text_QuinnDefeat:: @ 8199870 .string "I surrender!$" -gUnknown_819987D:: @ 819987D +CinnabarIsland_Gym_Text_QuinnPostBattle:: @ 819987D .string "I get this uncontrollable urge to\n" .string "steal other people's POKéMON.$" -Text_1998BD:: @ 81998BD -gUnknown_81998BD:: @ 81998BD +CinnabarIsland_Gym_Text_AveryIntro:: @ 81998BD .string "I've studied POKéMON thoroughly.\n" .string "You can't win!$" -Text_1998ED:: @ 81998ED +CinnabarIsland_Gym_Text_AveryDefeat:: @ 81998ED .string "Waah!\n" .string "My studies were insufficient!$" -gUnknown_8199911:: @ 8199911 +CinnabarIsland_Gym_Text_AveryPostBattle:: @ 8199911 .string "My theories are too complicated\n" .string "for you to understand.$" -Text_199948:: @ 8199948 -gUnknown_8199948:: @ 8199948 +CinnabarIsland_Gym_Text_RamonIntro:: @ 8199948 .string "I like using FIRE-type POKéMON.\n" .string "I just do.$" -Text_199973:: @ 8199973 +CinnabarIsland_Gym_Text_RamonDefeat:: @ 8199973 .string "Too hot to handle!$" -gUnknown_8199986:: @ 8199986 +CinnabarIsland_Gym_Text_RamonPostBattle:: @ 8199986 .string "I wish there were a thief POKéMON.\n" .string "I'd use that!$" -Text_1999B7:: @ 81999B7 -gUnknown_81999B7:: @ 81999B7 +CinnabarIsland_Gym_Text_DerekIntro:: @ 81999B7 .string "I know why BLAINE became a\n" .string "TRAINER.$" -Text_1999DB:: @ 81999DB +CinnabarIsland_Gym_Text_DerekDefeat:: @ 81999DB .string "Ow!$" -gUnknown_81999DF:: @ 81999DF +CinnabarIsland_Gym_Text_DerekPostBattle:: @ 81999DF .string "Our LEADER, BLAINE, became lost\n" .string "in the mountains but good.\p" .string "Night fell when a fiery bird\n" @@ -104,33 +100,31 @@ gUnknown_81999DF:: @ 81999DF .string "Its light allowed BLAINE to find\n" .string "his way down safely.$" -Text_199A7F:: @ 8199A7F -gUnknown_8199A7F:: @ 8199A7F +CinnabarIsland_Gym_Text_DustyIntro:: @ 8199A7F .string "I've been to many GYMS, but this\n" .string "one best suits my style.$" -Text_199AB9:: @ 8199AB9 +CinnabarIsland_Gym_Text_DustyDefeat:: @ 8199AB9 .string "Yowza!\n" .string "Too hot!$" -gUnknown_8199AC9:: @ 8199AC9 +CinnabarIsland_Gym_Text_DustyPostBattle:: @ 8199AC9 .string "PONYTA, NINETALES…\n" .string "Those are popular FIRE POKéMON.$" -Text_199AFC:: @ 8199AFC -gUnknown_8199AFC:: @ 8199AFC +CinnabarIsland_Gym_Text_ZacIntro:: @ 8199AFC .string "Fire is weak against H2O.$" -Text_199B16:: @ 8199B16 +CinnabarIsland_Gym_Text_ZacDefeat:: @ 8199B16 .string "Oh!\n" .string "Snuffed out!$" -gUnknown_8199B27:: @ 8199B27 +CinnabarIsland_Gym_Text_ZacPostBattle:: @ 8199B27 .string "Water beats fire, of course.\p" .string "But fire melts ice, so the FIRE\n" .string "type beats ICE-type POKéMON.$" -gUnknown_8199B81:: @ 8199B81 +CinnabarIsland_Gym_Text_GymGuyAdvice:: @ 8199B81 .string "Yo!\n" .string "Champ in the making!\p" .string "The hotheaded BLAINE is a FIRE\n" @@ -139,23 +133,23 @@ gUnknown_8199B81:: @ 8199B81 .string "You'd better take some\n" .string "BURN HEALS, too.$" -gUnknown_8199C0C:: @ 8199C0C +CinnabarIsland_Gym_Text_GymGuyPostVictory:: @ 8199C0C .string "{PLAYER}!\n" .string "You beat that firebrand!$" -gUnknown_8199C29:: @ 8199C29 +CinnabarIsland_Gym_Text_GymStatue:: @ 8199C29 .string "CINNABAR POKéMON GYM\n" .string "LEADER: BLAINE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_8199C62:: @ 8199C62 +CinnabarIsland_Gym_Text_GymStatuePlayerWon:: @ 8199C62 .string "CINNABAR POKéMON GYM\n" .string "LEADER: BLAINE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}, {PLAYER}$" -gUnknown_8199C9F:: @ 8199C9F +CinnabarIsland_Gym_Text_PokemonQuizRules:: @ 8199C9F .string "POKéMON Quiz!\p" .string "Get it right, and the door opens to\n" .string "the next room.\p" @@ -165,32 +159,32 @@ gUnknown_8199C9F:: @ 8199C9F .string "Then get it right!\n" .string "Here we go!$" -gUnknown_8199D5A:: @ 8199D5A +CinnabarIsland_Gym_Text_QuizQuestion1:: @ 8199D5A .string "CATERPIE evolves into METAPOD?$" -gUnknown_8199D79:: @ 8199D79 +CinnabarIsland_Gym_Text_QuizQuestion2:: @ 8199D79 .string "There are nine certified POKéMON\n" .string "LEAGUE BADGES?$" -gUnknown_8199DA9:: @ 8199DA9 +CinnabarIsland_Gym_Text_QuizQuestion3:: @ 8199DA9 .string "POLIWAG evolves three times?$" -gUnknown_8199DC6:: @ 8199DC6 +CinnabarIsland_Gym_Text_QuizQuestion4:: @ 8199DC6 .string "Are electric moves effective\n" .string "against GROUND-type POKéMON?$" -gUnknown_8199E00:: @ 8199E00 +CinnabarIsland_Gym_Text_QuizQuestion5:: @ 8199E00 .string "POKéMON of the same kind and level\n" .string "are not identical?$" -gUnknown_8199E36:: @ 8199E36 +CinnabarIsland_Gym_Text_QuizQuestion6:: @ 8199E36 .string "TM28 contains TOMBSTONY?$" -gUnknown_8199E4F:: @ 8199E4F +CinnabarIsland_Gym_Text_CorrectGoOnThrough:: @ 8199E4F .string "You're absolutely correct!\p" .string "Go on through!$" -gUnknown_8199E79:: @ 8199E79 +CinnabarIsland_Gym_Text_SorryBadCall:: @ 8199E79 .string "Sorry!\n" .string "Bad call!$" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index d0233f91e..7970cf732 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Mart_EventScript_16EA22", + "script": "CinnabarIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Mart_EventScript_16EA10", + "script": "CinnabarIsland_Mart_EventScript_Woman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_Mart_EventScript_16EA19", + "script": "CinnabarIsland_Mart_EventScript_Scientist", "flag": "0" } ], diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index f5ecf68d8..29b52627b 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -1,27 +1,27 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 -CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - msgbox gUnknown_819A7A0, MSGBOX_NPC +CinnabarIsland_Mart_EventScript_Woman:: @ 816EA10 + msgbox CinnabarIsland_Mart_Text_DontTheyHaveXAttack, MSGBOX_NPC end -CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - msgbox gUnknown_819A7F1, MSGBOX_NPC +CinnabarIsland_Mart_EventScript_Scientist:: @ 816EA19 + msgbox CinnabarIsland_Mart_Text_ExtraItemsNeverHurt, MSGBOX_NPC end -CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 +CinnabarIsland_Mart_EventScript_Clerk:: @ 816EA22 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16EA48 + pokemart CinnabarIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16EA48:: @ 816EA48 +CinnabarIsland_Mart_Items:: @ 816EA48 .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION diff --git a/data/maps/CinnabarIsland_Mart/text.inc b/data/maps/CinnabarIsland_Mart/text.inc index 189baff6a..30c36bf08 100644 --- a/data/maps/CinnabarIsland_Mart/text.inc +++ b/data/maps/CinnabarIsland_Mart/text.inc @@ -1,9 +1,9 @@ -gUnknown_819A7A0:: @ 819A7A0 +CinnabarIsland_Mart_Text_DontTheyHaveXAttack:: @ 819A7A0 .string "Don't they have X ATTACK?\p" .string "I like it because it raises the\n" .string "ATTACK stat in battle.$" -gUnknown_819A7F1:: @ 819A7F1 +CinnabarIsland_Mart_Text_ExtraItemsNeverHurt:: @ 819A7F1 .string "It never hurts to have extra items.\n" .string "You never know what might happen.$" diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 45ed90320..5cc12ab94 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E901", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A", + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Bill", "flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL" } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 626263f76..c96169d1d 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -7,32 +7,32 @@ CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 setrespawn SPAWN_CINNABAR_ISLAND end -CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 +CinnabarIsland_PokemonCenter_1F_EventScript_Nurse:: @ 816E8E6 lock faceplayer call EventScript_PkmnCenterNurse release end -CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - msgbox gUnknown_819A5BE, MSGBOX_NPC +CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 816E8EF + msgbox CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - msgbox gUnknown_819A4F8, MSGBOX_NPC +CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816E8F8 + msgbox CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - msgbox gUnknown_819A6B1, MSGBOX_NPC +CinnabarIsland_PokemonCenter_1F_EventScript_Youngster:: @ 816E901 + msgbox CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A +CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A lock faceplayer - msgbox gUnknown_819A725, MSGBOX_YESNO + msgbox CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E9A5 - msgbox gUnknown_819A785 + goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail + msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo closemessage playbgm MUS_ANNAI, 1 savebgm MUS_ANNAI @@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16E96F + call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16E981 + call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16E993 + call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL @@ -53,30 +53,30 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A release end -EventScript_16E96F:: @ 816E96F - applymovement 7, Movement_16E9AF - applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9 +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: @ 816E96F + applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth waitmovement 0 return -EventScript_16E981:: @ 816E981 - applymovement 7, Movement_16E9C3 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: @ 816E981 + applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast waitmovement 0 return -EventScript_16E993:: @ 816E993 - applymovement 7, Movement_16E9AF - applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: @ 816E993 + applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest waitmovement 0 return -EventScript_16E9A5:: @ 816E9A5 - msgbox gUnknown_819A766 +CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail:: @ 816E9A5 + msgbox CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet release end -Movement_16E9AF:: @ 816E9AF +CinnabarIsland_PokemonCenter_1F_Movement_BillExit:: @ 816E9AF walk_left walk_left walk_left @@ -88,7 +88,7 @@ Movement_16E9AF:: @ 816E9AF set_invisible step_end -Movement_16E9B9:: @ 816E9B9 +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth:: @ 816E9B9 walk_down walk_left walk_left @@ -100,7 +100,7 @@ Movement_16E9B9:: @ 816E9B9 walk_down step_end -Movement_16E9C3:: @ 816E9C3 +CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast:: @ 816E9C3 walk_up walk_left walk_left @@ -114,7 +114,7 @@ Movement_16E9C3:: @ 816E9C3 set_invisible step_end -Movement_16E9CF:: @ 816E9CF +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast:: @ 816E9CF delay_16 delay_16 delay_16 @@ -131,7 +131,7 @@ Movement_16E9CF:: @ 816E9CF set_invisible step_end -Movement_16E9DE:: @ 816E9DE +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest:: @ 816E9DE walk_left walk_left walk_left diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc index c88fbbf28..74d2f1bc1 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819A4F8:: @ 819A4F8 +CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked:: @ 819A4F8 .string "I came to visit the CINNABAR GYM,\n" .string "but the door is locked tight.\p" .string "There should be a key for it\n" @@ -8,7 +8,7 @@ gUnknown_819A4F8:: @ 819A4F8 .string "The GYM LEADER's friend used to\n" .string "live there, they say.$" -gUnknown_819A5BE:: @ 819A5BE +CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom:: @ 819A5BE .string "Do you have lots of friends?\p" .string "Linking up with the usual friends\n" .string "is fun, of course.\p" @@ -19,20 +19,20 @@ gUnknown_819A5BE:: @ 819A5BE .string "I think it would be worth your time\n" .string "to check the UNION ROOM.$" -gUnknown_819A6B1:: @ 819A6B1 +CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves:: @ 819A6B1 .string "POKéMON can still learn techniques\n" .string "after canceling evolution.\p" .string "Evolution can wait until new moves\n" .string "have been learned.$" -gUnknown_819A725:: @ 819A725 +CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland:: @ 819A725 .string "BILL: Hey, you kept me waiting!\n" .string "Ready to set sail to ONE ISLAND?$" -gUnknown_819A766:: @ 819A766 +CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet:: @ 819A766 .string "Oh, you're still not done yet?$" -gUnknown_819A785:: @ 819A785 +CinnabarIsland_PokemonCenter_1F_Text_LetsGo:: @ 819A785 .string "Well, that's it.\n" .string "Let's go!$" diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index cb2aa4d61..20aa48378 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B", + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist", "flag": "0" } ], @@ -78,28 +78,28 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E294" + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto" }, { "type": "bg_event_type_0", "x": 12, "y": 5, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D" + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign" }, { "type": "bg_event_type_0", "x": 18, "y": 5, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6" + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign" }, { "type": "bg_event_type_0", "x": 24, "y": 5, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF" + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign" } ] } diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index caf07f29d..8aea98ace 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -4,29 +4,29 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if_eq EventScript_16E285 + call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil end -EventScript_16E285:: @ 816E285 +CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil:: @ 816E285 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 return -CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - msgbox gUnknown_8199EE5, MSGBOX_NPC +CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist:: @ 816E28B + msgbox CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively, MSGBOX_NPC end -CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - msgbox gUnknown_8199F41, MSGBOX_SIGN +CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto:: @ 816E294 + msgbox CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - msgbox gUnknown_8199F6A, MSGBOX_SIGN +CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign:: @ 816E29D + msgbox CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - msgbox gUnknown_8199F83, MSGBOX_SIGN +CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign:: @ 816E2A6 + msgbox CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - msgbox gUnknown_8199F9A, MSGBOX_SIGN +CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign:: @ 816E2AF + msgbox CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc index a14866bd4..2c51769bc 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc @@ -1,28 +1,28 @@ -Text_199E8A:: @ 8199E8A +CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji:: @ 8199E8A .string "It's a photo of BLAINE and\n" .string "MR. FUJI.\p" .string "They're standing shoulder to\n" .string "shoulder with big grins.$" -gUnknown_8199EE5:: @ 8199EE5 +CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively:: @ 8199EE5 .string "We study POKéMON extensively\n" .string "every day.\p" .string "People often bring us rare POKéMON\n" .string "for examination.$" -gUnknown_8199F41:: @ 8199F41 +CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji:: @ 8199F41 .string "A photo of the LAB's founder…\n" .string "DR. FUJI?!$" -gUnknown_8199F6A:: @ 8199F6A +CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign:: @ 8199F6A .string "POKéMON LAB\n" .string "Meeting Room$" -gUnknown_8199F83:: @ 8199F83 +CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign:: @ 8199F83 .string "POKéMON LAB\n" .string "R & D Room$" -gUnknown_8199F9A:: @ 8199F9A +CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign:: @ 8199F9A .string "POKéMON LAB\n" .string "Testing Room$" diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 1a50f1208..2189361a9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401", + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D", + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist", "flag": "0" } ], diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index dc1bd697a..08fe9acb8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -1,309 +1,313 @@ +.equ HELIX_FOSSIL, 1 +.equ DOME_FOSSIL, 2 +.equ OLD_AMBER, 3 + CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400 .byte 0 -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: @ 816E401 lock faceplayer setvar VAR_0x8008, INGAME_TRADE_SEEL call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 - msgbox gUnknown_81A597B, MSGBOX_YESNO + goto_if_set FLAG_DID_SEELOR_TRADE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded + msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E45B + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16E45B + goto_if_ge CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16E465 + goto_if_ne CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon call EventScript_DoInGameTrade - msgbox gUnknown_81A59DA + msgbox Trade_Text_HeyThanks setflag FLAG_DID_SEELOR_TRADE release end -EventScript_16E45B:: @ 816E45B - msgbox gUnknown_81A59B6 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade:: @ 816E45B + msgbox Trade_Text_AwwOhWell release end -EventScript_16E465:: @ 816E465 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon:: @ 816E465 getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A59C6 + msgbox Trade_Text_WhatThatsNoMon release end -EventScript_16E473:: @ 816E473 - msgbox gUnknown_81A59E7 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded:: @ 816E473 + msgbox Trade_Text_IsntMyOldMonGreat release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist:: @ 816E47D lock faceplayer - setvar VAR_RESULT, 0 - call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1 - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E897 + setvar VAR_RESULT, FALSE + call_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 - goto_if_eq EventScript_16E736 + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - goto_if_eq EventScript_16E72C - call EventScript_16E4EC - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E544 - call EventScript_16E504 - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E586 - call EventScript_16E51C - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E5C8 - msgbox gUnknown_819A282 - goto EventScript_16E53A + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving + call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix + call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome + call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe + goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E4EC:: @ 816E4EC - goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534 - goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534 - setvar VAR_RESULT, 1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList:: @ 816E4EC + goto_if_unset FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + goto_if_set FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + setvar VAR_RESULT, TRUE return -EventScript_16E504:: @ 816E504 - goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534 - goto_if_set FLAG_REVIVED_DOME, EventScript_16E534 - setvar VAR_RESULT, 1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList:: @ 816E504 + goto_if_unset FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + goto_if_set FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + setvar VAR_RESULT, TRUE return -EventScript_16E51C:: @ 816E51C - goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534 - goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534 - setvar VAR_RESULT, 1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList:: @ 816E51C + goto_if_unset FLAG_GOT_OLD_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + goto_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + setvar VAR_RESULT, TRUE return -EventScript_16E534:: @ 816E534 - setvar VAR_RESULT, 0 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse:: @ 816E534 + setvar VAR_RESULT, FALSE return -EventScript_16E53A:: @ 816E53A - msgbox gUnknown_819A314 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil:: @ 816E53A + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad release end -EventScript_16E544:: @ 816E544 - message Text_19A282 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix:: @ 816E544 + message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage - call EventScript_16E51C - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E5FA + call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT - case 0, EventScript_16E668 - case 1, EventScript_16E53A - case 127, EventScript_16E53A + case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil + case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil + case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E586:: @ 816E586 - message Text_19A282 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome:: @ 816E586 + message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage - call EventScript_16E51C - compare VAR_RESULT, 1 - goto_if_eq EventScript_16E631 + call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList + compare VAR_RESULT, TRUE + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT - case 0, EventScript_16E6A6 - case 1, EventScript_16E53A - case 127, EventScript_16E53A + case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil + case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil + case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E5C8:: @ 816E5C8 - message Text_19A282 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber:: @ 816E5C8 + message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage multichoice 0, 0, MULTICHOICE_AMBER, FALSE switch VAR_RESULT - case 0, EventScript_16E6E4 - case 1, EventScript_16E53A - case 127, EventScript_16E53A + case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber + case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil + case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E5FA:: @ 816E5FA +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber:: @ 816E5FA multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE switch VAR_RESULT - case 0, EventScript_16E668 - case 1, EventScript_16E6E4 - case 2, EventScript_16E53A - case 127, EventScript_16E53A + case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil + case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber + case 2, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil + case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E631:: @ 816E631 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber:: @ 816E631 multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE switch VAR_RESULT - case 0, EventScript_16E6A6 - case 1, EventScript_16E6E4 - case 2, EventScript_16E53A - case 127, EventScript_16E53A + case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil + case 1, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber + case 2, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil + case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -EventScript_16E668:: @ 816E668 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL - msgbox gUnknown_819A3D4, MSGBOX_YESNO + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E722 - msgbox gUnknown_819A45D + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor textcolor 0 - removeitem ITEM_HELIX_FOSSIL, 1 - msgbox gUnknown_819A4AB + removeitem ITEM_HELIX_FOSSIL + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL release end -EventScript_16E6A6:: @ 816E6A6 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL - msgbox gUnknown_819A3D4, MSGBOX_YESNO + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E722 - msgbox gUnknown_819A45D + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor textcolor 0 - removeitem ITEM_DOME_FOSSIL, 1 - msgbox gUnknown_819A4AB + removeitem ITEM_DOME_FOSSIL + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL release end -EventScript_16E6E4:: @ 816E6E4 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER - msgbox gUnknown_819A3D4, MSGBOX_YESNO + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E722 - msgbox gUnknown_819A45D + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor textcolor 0 - removeitem ITEM_OLD_AMBER, 1 - msgbox gUnknown_819A4AB + removeitem ITEM_OLD_AMBER + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER release end -EventScript_16E722:: @ 816E722 - msgbox gUnknown_819A4E1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil:: @ 816E722 + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain release end -EventScript_16E72C:: @ 816E72C - msgbox gUnknown_819A4AB +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving:: @ 816E72C + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk release end -EventScript_16E736:: @ 816E736 - compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 - goto_if_eq EventScript_16E758 - compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 - goto_if_eq EventScript_16E79D - compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 - goto_if_eq EventScript_16E7E2 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon:: @ 816E736 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, OLD_AMBER + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl end -EventScript_16E758:: @ 816E758 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: @ 816E758 setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE - msgbox gUnknown_819A34F + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife givemon SPECIES_OMANYTE, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_HELIX compare VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -EventScript_16E79D:: @ 816E79D +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO - msgbox gUnknown_819A34F + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife givemon SPECIES_KABUTO, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_DOME compare VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -EventScript_16E7E2:: @ 816E7E2 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL - msgbox gUnknown_819A34F + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife givemon SPECIES_AERODACTYL, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_AMBER compare VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -EventScript_16E827:: @ 816E827 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827 textcolor 3 playfanfare MUS_FANFA1 - message Text_19A39E + message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E895 - call EventScript_1A8C27 + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon + call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16E895 + goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon end -EventScript_16E85B:: @ 816E85B +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B textcolor 3 playfanfare MUS_FANFA1 - message Text_19A39E + message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E88A - call EventScript_1A8C33 - goto EventScript_16E88A + goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC + call EventScript_NameReceivedBoxMon + goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC end -EventScript_16E88A:: @ 816E88A - call EventScript_1A8C3C - goto EventScript_16E895 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC:: @ 816E88A + call EventScript_TransferredToPC + goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon end -EventScript_16E895:: @ 816E895 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon:: @ 816E895 release end -EventScript_16E897:: @ 816E897 - msgbox gUnknown_819A4E1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils:: @ 816E897 + msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain release end -EventScript_16E8A1:: @ 816E8A1 - goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9 - goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8 - goto EventScript_16E534 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil:: @ 816E8A1 + goto_if_set FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix + goto_if_set FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome + goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse end -EventScript_16E8B9:: @ 816E8B9 - goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534 - setvar VAR_RESULT, 1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix:: @ 816E8B9 + goto_if_unset FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + setvar VAR_RESULT, TRUE return -EventScript_16E8C8:: @ 816E8C8 - goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534 - setvar VAR_RESULT, 1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome:: @ 816E8C8 + goto_if_unset FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse + setvar VAR_RESULT, TRUE return diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc index 6b36fd1a3..9a19c16f7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -19,8 +19,7 @@ Text_MetronomeTaught:: @ 819A20E .string "It tweaks your POKéMON's brain into\n" .string "using moves it doesn't even know.$" -Text_19A282:: @ 819A282 -gUnknown_819A282:: @ 819A282 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: @ 819A282 .string "Hiya!\p" .string "I am important doctor.\n" .string "Yes, very much so, indeed.\p" @@ -29,29 +28,31 @@ gUnknown_819A282:: @ 819A282 .string "You!\n" .string "Have you a fossil for me?$" -gUnknown_819A314:: @ 819A314 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad:: @ 819A314 .string "No!\n" .string "Is too bad!$" -Text_19A324:: @ 819A324 +@ Unused +CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalkJP:: @ 819A324 .string "ちょっと じかん かかるよ！\p" .string "そこらへんを すこし\n" .string "ブラブラ してくると よろしー！$" -gUnknown_819A34F:: @ 819A34F +CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife:: @ 819A34F .string "You late.\n" .string "Where were you?\p" .string "Your fossil is back to life!\n" .string "It was {STR_VAR_1} like I think!$" -Text_19A39E:: @ 819A39E +CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor:: @ 819A39E .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the doctor.$" -Text_19A3C2:: @ 819A3C2 +@ Unused +CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoRoomForPokemon:: @ 819A3C2 .string "ポケモン いっぱいで もてないね！$" -gUnknown_819A3D4:: @ 819A3D4 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: @ 819A3D4 .string "Oh!\n" .string "That is {STR_VAR_2}, it is!\p" .string "It is fossil of {STR_VAR_1},\n" @@ -59,17 +60,18 @@ gUnknown_819A3D4:: @ 819A3D4 .string "My Resurrection Machine will make\n" .string "that POKéMON live again!$" -gUnknown_819A45D:: @ 819A45D +@ TODO: Resolve text dump error below? +CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: @ 819A45D .string "So!\n" .string "You hurry and give me that!\p" .string "{SIZE}Á{PLAYER} handed over the\n" .string "{STR_VAR_2} to the weird doctor.$" -gUnknown_819A4AB:: @ 819A4AB +CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: @ 819A4AB .string "I take a little time!\n" .string "You go for walk a little while!$" -gUnknown_819A4E1:: @ 819A4E1 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain:: @ 819A4E1 .string "Aiyah!\n" .string "You come again!$" diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index fedab09af..5761ffe0c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9", + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2", + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E", + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Norma", "flag": "0" } ], diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 1282a3b38..bcf1f17c9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -1,90 +1,90 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 -CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - msgbox gUnknown_8199FB3, MSGBOX_NPC +CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist:: @ 816E2B9 + msgbox CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon, MSGBOX_NPC end -CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 +CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton:: @ 816E2C2 lock faceplayer setvar VAR_0x8008, INGAME_TRADE_ELECTRODE call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 + goto_if_set FLAG_DID_ESPHERE_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E31C + goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16E31C + goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16E326 + goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_Thanks setflag FLAG_DID_ESPHERE_TRADE release end -EventScript_16E31C:: @ 816E31C +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade:: @ 816E31C msgbox Trade_Text_WellIfYouDontWantTo release end -EventScript_16E326:: @ 816E326 +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon:: @ 816E326 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_ThisIsntMon release end -EventScript_16E334:: @ 816E334 +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded:: @ 816E334 msgbox Trade_Text_HasTradedMonGrownStronger release end -CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E +CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E lock faceplayer setvar VAR_0x8008, INGAME_TRADE_TANGELA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 - msgbox gUnknown_81A5AD6, MSGBOX_YESNO + goto_if_set FLAG_DID_TANGENY_TRADE, CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded + msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16E3BC + goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16E3BC + goto_if_ge CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16E3C6 + goto_if_ne CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - msgbox gUnknown_81A5B4A + msgbox Trade_Text_ThanksYoureAPal setflag FLAG_DID_TANGENY_TRADE release end -EventScript_16E3BC:: @ 816E3BC - msgbox gUnknown_81A5B08 +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade:: @ 816E3BC + msgbox Trade_Text_ThatsTooBad release end -EventScript_16E3C6:: @ 816E3C6 +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon:: @ 816E3C6 getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A5B18 + msgbox Trade_Text_ThisIsNoMon release end -EventScript_16E3D4:: @ 816E3D4 - msgbox gUnknown_81A5B60 +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded:: @ 816E3D4 + msgbox Trade_Text_HowIsMyOldMon release end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc index 24d539c13..7ea854e1f 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc @@ -1,4 +1,4 @@ -gUnknown_8199FB3:: @ 8199FB3 +CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon:: @ 8199FB3 .string "I found this most remarkable fossil\n" .string "inside MT. MOON.\p" .string "I think it's of a rare, prehistoric\n" diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 247b09136..1464d0db7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5", + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist", "flag": "0" } ], @@ -56,14 +56,14 @@ "x": 6, "y": 1, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7" + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe" }, { "type": "bg_event_type_0", "x": 3, "y": 1, "elevation": 0, - "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE" + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer" } ] } diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index 3dcd07733..1619d9df3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -5,14 +5,14 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF goto EventScript_MetronomeTutor end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - msgbox gUnknown_819A015, MSGBOX_NPC +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist:: @ 816E3E5 + msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons, MSGBOX_NPC end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - msgbox gUnknown_819A04A, MSGBOX_SIGN +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer:: @ 816E3EE + msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - msgbox gUnknown_819A128, MSGBOX_SIGN +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe:: @ 816E3F7 + msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc index e3343e8e3..bdfd1f95c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc @@ -1,8 +1,8 @@ -gUnknown_819A015:: @ 819A015 +CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons:: @ 819A015 .string "EEVEE can evolve into one of three\n" .string "kinds of POKéMON.$" -gUnknown_819A04A:: @ 819A04A +CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A .string "There's an e-mail message.\p" .string "… … …\p" .string "There are three legendary bird\n" @@ -14,6 +14,6 @@ gUnknown_819A04A:: @ 819A04A .string "close to CERULEAN.\p" .string "From: POKéMON RESEARCH TEAM…$" -gUnknown_819A128:: @ 819A128 +CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe:: @ 819A128 .string "An amber pipe!$" diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 5694157cc..d28125f72 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1206,7 +1206,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 waitmessage playfanfare MUS_FAN5 waitfanfare - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq EventScript_GiveNicknameToStarter compare VAR_RESULT, NO diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 93a059d12..68b520e47 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -23,7 +23,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C setvar VAR_0x8008, INGAME_TRADE_NIDORINOA call EventScript_GetInGameTradeSpeciesInfo goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE - msgbox gUnknown_81A597B, MSGBOX_YESNO + msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16FDB6 call EventScript_ChooseMonForInGameTrade @@ -33,24 +33,24 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C compare VAR_RESULT, VAR_0x8009 goto_if_ne EventScript_16FDC0 call EventScript_DoInGameTrade - msgbox gUnknown_81A59DA + msgbox Trade_Text_HeyThanks setflag FLAG_DID_NINA_TRADE release end EventScript_16FDB6:: @ 816FDB6 - msgbox gUnknown_81A59B6 + msgbox Trade_Text_AwwOhWell release end EventScript_16FDC0:: @ 816FDC0 getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A59C6 + msgbox Trade_Text_WhatThatsNoMon release end EventScript_16FDCE:: @ 816FDCE - msgbox gUnknown_81A59E7 + msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 483aba832..ed29859ab 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -15,7 +15,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E setvar VAR_0x8008, INGAME_TRADE_LICKITUNG call EventScript_GetInGameTradeSpeciesInfo goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 - msgbox gUnknown_81A597B, MSGBOX_YESNO + msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1704D8 call EventScript_ChooseMonForInGameTrade @@ -25,23 +25,23 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E compare VAR_RESULT, VAR_0x8009 goto_if_ne EventScript_1704E2 call EventScript_DoInGameTrade - msgbox gUnknown_81A59DA + msgbox Trade_Text_HeyThanks setflag FLAG_DID_MARC_TRADE release end EventScript_1704D8:: @ 81704D8 - msgbox gUnknown_81A59B6 + msgbox Trade_Text_AwwOhWell release end EventScript_1704E2:: @ 81704E2 getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A59C6 + msgbox Trade_Text_WhatThatsNoMon release end EventScript_1704F0:: @ 81704F0 - msgbox gUnknown_81A59E7 + msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 641689dff..2cdc2d8ec 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -11,7 +11,7 @@ Route2_House_EventScript_16F602:: @ 816F602 setvar VAR_0x8008, INGAME_TRADE_MR_MIME call EventScript_GetInGameTradeSpeciesInfo goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 - msgbox gUnknown_81A597B, MSGBOX_YESNO + msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16F65C call EventScript_ChooseMonForInGameTrade @@ -21,23 +21,23 @@ Route2_House_EventScript_16F602:: @ 816F602 compare VAR_RESULT, VAR_0x8009 goto_if_ne EventScript_16F666 call EventScript_DoInGameTrade - msgbox gUnknown_81A59DA + msgbox Trade_Text_HeyThanks setflag FLAG_DID_MIMIEN_TRADE release end EventScript_16F65C:: @ 816F65C - msgbox gUnknown_81A59B6 + msgbox Trade_Text_AwwOhWell release end EventScript_16F666:: @ 816F666 getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A59C6 + msgbox Trade_Text_WhatThatsNoMon release end EventScript_16F674:: @ 816F674 - msgbox gUnknown_81A59E7 + msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 0f310b07d..ca2c5f611 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -59,10 +59,10 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16F861 - call EventScript_1A8C27 + call EventScript_GetGiftMonPartySlot fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname @@ -72,7 +72,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16F84B fadescreen FADE_TO_BLACK @@ -85,12 +85,12 @@ EventScript_16F822:: @ 816F822 end EventScript_16F84B:: @ 816F84B - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_16F861 end EventScript_16F856:: @ 816F856 - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_16F86A end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 7a061860a..d5c3e6603 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -64,7 +64,7 @@ EventScript_16EC82:: @ 816EC82 compare VAR_RESULT, 1 goto_if_eq EventScript_16ECEC compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon release end @@ -76,10 +76,10 @@ EventScript_16ECB5:: @ 816ECB5 waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16ED29 - call EventScript_1A8C27 + call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname goto EventScript_16ED29 end @@ -92,15 +92,15 @@ EventScript_16ECEC:: @ 816ECEC waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_16ED1E - call EventScript_1A8C33 + call EventScript_NameReceivedBoxMon goto EventScript_16ED1E end EventScript_16ED1E:: @ 816ED1E - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_16ED29 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 19012f0e4..9ca4f31ec 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -136,7 +136,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 compare VAR_RESULT, 1 goto_if_eq EventScript_161B45 compare VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if_eq EventScript_NoMoreRoomForPokemon release end @@ -147,10 +147,10 @@ EventScript_161B12:: @ 8161B12 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_161B7E - call EventScript_1A8C27 + call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname goto EventScript_161B7E @@ -164,17 +164,17 @@ EventScript_161B45:: @ 8161B45 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - msgbox gUnknown_81A56A7, MSGBOX_YESNO + msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_161B73 - call EventScript_1A8C33 + call EventScript_NameReceivedBoxMon goto EventScript_161B73 EventScript_161B72:: @ 8161B72 end EventScript_161B73:: @ 8161B73 - call EventScript_1A8C3C + call EventScript_TransferredToPC goto EventScript_161B7E EventScript_161B7D:: @ 8161B7D diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 70a690828..b34ef1e59 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -7,7 +7,7 @@ UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39 setvar VAR_0x8008, INGAME_TRADE_NIDORAN call EventScript_GetInGameTradeSpeciesInfo goto_if_set FLAG_DID_MS_NIDO_TRADE, UndergroundPath_NorthEntrance_EventScript_AlreadyTraded - msgbox gUnknown_81A5AD6, MSGBOX_YESNO + msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq UndergroundPath_NorthEntrance_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade @@ -17,23 +17,23 @@ UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39 compare VAR_RESULT, VAR_0x8009 goto_if_ne UndergroundPath_NorthEntrance_EventScript_NotRequestedMon call EventScript_DoInGameTrade - msgbox gUnknown_81A5B4A + msgbox Trade_Text_ThanksYoureAPal setflag FLAG_DID_MS_NIDO_TRADE release end UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: @ 8160E93 - msgbox gUnknown_81A5B08 + msgbox Trade_Text_ThatsTooBad release end UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: @ 8160E9D getspeciesname 0, VAR_0x8009 - msgbox gUnknown_81A5B18 + msgbox Trade_Text_ThisIsNoMon release end UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: @ 8160EAB - msgbox gUnknown_81A5B60 + msgbox Trade_Text_HowIsMyOldMon release end diff --git a/data/naming_screen.s b/data/naming_screen.s index 121d05c88..b7d348165 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -16,10 +16,10 @@ gUnknown_83E1980:: @ 83E1980 .incbin "graphics/interface/naming_screen_83E1980.4bpp" gUnknown_83E2280:: @ 83E2280 - .4byte Text_1A5CF1 - .4byte Text_1A5D31 - .4byte Text_1A5D6E - .4byte Text_1A5DB1 + .4byte Text_MonSentToBoxInSomeonesPC + .4byte Text_MonSentToBoxInBillsPC + .4byte Text_MonSentToBoxSomeonesBoxFull + .4byte Text_MonSentToBoxBillsBoxFull gUnknown_83E2290:: @ 83E2290 .4byte 0x000001e0 diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index e141634eb..8bf111541 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -127,11 +127,11 @@ SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC release end -CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07 +CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07 lockall famechecker FAMECHECKER_BLAINE, 4 famechecker FAMECHECKER_MRFUJI, 4 - msgbox Text_199E8A + msgbox CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji releaseall end @@ -260,12 +260,12 @@ LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: @ 81AD0A0 release end -CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9 +CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9 lock faceplayer famechecker FAMECHECKER_MRFUJI, 5 textcolor 3 - msgbox gUnknown_81B1BD1 + msgbox PokemonJournal_Text_SpecialFeatureMrFuji release end diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc new file mode 100644 index 000000000..c04c2d0cd --- /dev/null +++ b/data/scripts/pc_transfer.inc @@ -0,0 +1,46 @@ +EventScript_GetGiftMonPartySlot:: @ 81A8C27 + getpartysize + subvar VAR_RESULT, 1 + copyvar VAR_0x8004, VAR_RESULT + return + +EventScript_NameReceivedBoxMon:: @ 81A8C33 + fadescreen FADE_TO_BLACK + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + return + +EventScript_TransferredToPC:: @ 81A8C3C + bufferboxname 0, VAR_PC_BOX_TO_SEND_MON + getspeciesname 1, VAR_TEMP_1 + call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredSomeonesPC + call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredBillsPC + return + +EventScript_TransferredSomeonesPC:: @ 81A8C57 + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, TRUE + goto_if_eq EventScript_TransferredSomeonesPCBoxFull + msgbox Text_MonSentToBoxInSomeonesPC + return + +EventScript_TransferredSomeonesPCBoxFull:: @ 81A8C70 + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox Text_MonSentToBoxSomeonesBoxFull + return + +EventScript_TransferredBillsPC:: @ 81A8C82 + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, TRUE + goto_if_eq EventScript_TransferredBillsPCBoxFull + msgbox Text_MonSentToBoxInBillsPC + return + +EventScript_TransferredBillsPCBoxFull:: @ 81A8C9B + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox Text_MonSentToBoxBillsBoxFull + return diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a65dc1f48..ded2719f6 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1477,7 +1477,7 @@ gUnknown_81B1B3D:: @ 81B1B3D .string "Grand Champion is DAISY OAK of\l" .string "PALLET TOWN!$" -gUnknown_81B1BD1:: @ 81B1BD1 +PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1 .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "MR. FUJI of POKéMON HOUSE!\p" diff --git a/data/text/ingame_trade.inc b/data/text/ingame_trade.inc index 861e2fc1a..0b84b96d6 100644 --- a/data/text/ingame_trade.inc +++ b/data/text/ingame_trade.inc @@ -1,21 +1,21 @@ -gUnknown_81A597B:: @ 81A597B +Trade_Text_LookingForMonWannaTradeForMon:: @ 81A597B .string "I'm looking for the POKéMON\n" .string "{STR_VAR_1}!\p" .string "Wanna trade one for my\n" .string "{STR_VAR_2}?$" -gUnknown_81A59B6:: @ 81A59B6 +Trade_Text_AwwOhWell:: @ 81A59B6 .string "Awww!\n" .string "Oh, well…$" -gUnknown_81A59C6:: @ 81A59C6 +Trade_Text_WhatThatsNoMon:: @ 81A59C6 .string "What?\n" .string "That's no {STR_VAR_1}!$" -gUnknown_81A59DA:: @ 81A59DA +Trade_Text_HeyThanks:: @ 81A59DA .string "Hey, thanks!$" -gUnknown_81A59E7:: @ 81A59E7 +Trade_Text_IsntMyOldMonGreat:: @ 81A59E7 .string "Isn't my old {STR_VAR_2} great?$" Trade_Text_DoYouHaveMonWouldYouTradeForMon:: @ 81A59FE @@ -39,22 +39,22 @@ Trade_Text_HasTradedMonGrownStronger:: @ 81A5AA5 .string "The {STR_VAR_2} that I traded you,\n" .string "has it grown stronger?$" -gUnknown_81A5AD6:: @ 81A5AD6 +Trade_Text_DoYouHaveMonWantToTradeForMon:: @ 81A5AD6 .string "Hi!\n" .string "Do you have a {STR_VAR_1}?\p" .string "Want to trade it for my\n" .string "{STR_VAR_2}?$" -gUnknown_81A5B08:: @ 81A5B08 +Trade_Text_ThatsTooBad:: @ 81A5B08 .string "That's too bad.$" -gUnknown_81A5B18:: @ 81A5B18 +Trade_Text_ThisIsNoMon:: @ 81A5B18 .string "…This is no {STR_VAR_1}.\p" .string "If you get one, trade it with me.$" -gUnknown_81A5B4A:: @ 81A5B4A +Trade_Text_ThanksYoureAPal:: @ 81A5B4A .string "Thanks, you're a pal!$" -gUnknown_81A5B60:: @ 81A5B60 +Trade_Text_HowIsMyOldMon:: @ 81A5B60 .string "How is my old {STR_VAR_2}?\n" .string "My {STR_VAR_1} is doing great!$" diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc new file mode 100644 index 000000000..3e9b99ac8 --- /dev/null +++ b/data/text/pc_transfer.inc @@ -0,0 +1,39 @@ +Text_MonSentToBoxInSomeonesPC:: @ 81A5CF1 + .string "{STR_VAR_2} was transferred to\n" + .string "Someone's PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" + +Text_MonSentToBoxInBillsPC:: @ 81A5D31 + .string "{STR_VAR_2} was transferred to\n" + .string "BILL'S PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" + +Text_MonSentToBoxSomeonesBoxFull:: @ 81A5D6E + .string "BOX “{STR_VAR_3}” on\n" + .string "Someone's PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" + +Text_MonSentToBoxBillsBoxFull:: @ 81A5DB1 + .string "BOX “{STR_VAR_3}” on\n" + .string "BILL'S PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" + +Text_PlayerObtainedTheMon:: @ 81A5DF1 + .string "{PLAYER} obtained\n" + .string "the {STR_VAR_1}!$" + +@ Unused. Translated below +@ You cannot carry any more Pokemon, so {STR_VAR_2} was sent to PC Box {STR_VAR_1}! +Text_MonSentToBoxInPC:: @ 81A5E05 + .string "ポケモンを もちきれないので\n" + .string "パソコンの ボックス“{STR_VAR_1}” に\l" + .string "{STR_VAR_2}を てんそうした！$" + +Text_NoMoreRoomForPokemon:: @ 81A5E31 + .string "There's no more room for POKéMON!\p" + .string "The POKéMON BOXES are full and\n" + .string "can't accept any more!$" diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index f2bf4b865..7cdfb25e5 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -37,7 +37,18 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F +// Cinnabar Gym +#define METATILE_CinnabarGym_Floor 0x281 +#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282 +#define METATILE_CinnabarGym_Floor_ShadeFull 0x289 +#define METATILE_CinnabarGym_Floor_WallRightCorner 0x2C6 +#define METATILE_CinnabarGym_Floor_WallLeftCorner 0x2C7 +#define METATILE_CinnabarGym_Floor_WallRightEdge 0x2CE +#define METATILE_CinnabarGym_Floor_WallLeftEdge 0x2CF +#define METATILE_CinnabarGym_Wall_RetractedBarrier 0x2D1 + // gTileset_82D504C. Below metatile probably needs generic name #define METATILE_MtEmber_CaveEntrance 0x346 + #endif // GUARD_METATILE_LABELS_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 54eb2b2a9..b8da8f3e0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1190,10 +1190,10 @@ extern const u8 EventScript_PC[]; extern const u8 EventScript_RepelWoreOff[]; // battle_message -extern const u8 Text_1A5CF1[]; -extern const u8 Text_1A5D31[]; -extern const u8 Text_1A5D6E[]; -extern const u8 Text_1A5DB1[]; +extern const u8 Text_MonSentToBoxInSomeonesPC[]; +extern const u8 Text_MonSentToBoxInBillsPC[]; +extern const u8 Text_MonSentToBoxSomeonesBoxFull[]; +extern const u8 Text_MonSentToBoxBillsBoxFull[]; extern const u8 EventScript_BagItemCanBeRegistered[]; diff --git a/src/battle_message.c b/src/battle_message.c index 5bc0f113f..dd43e4bd5 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -872,10 +872,10 @@ const u8 *const gBattleStringsTable[] = { gUnknown_83FDDEB, gUnknown_83FB484, gUnknown_83FB4BE, - Text_1A5CF1, - Text_1A5D31, - Text_1A5D6E, - Text_1A5DB1, + Text_MonSentToBoxInSomeonesPC, + Text_MonSentToBoxInBillsPC, + Text_MonSentToBoxSomeonesBoxFull, + Text_MonSentToBoxBillsBoxFull, sText_PokedudeUsedItem, gUnknown_83FDA4D, gUnknown_83FDA7A, |