diff options
Diffstat (limited to 'data/maps')
7 files changed, 6 insertions, 71 deletions
diff --git a/data/maps/scripts/BattleFrontier_BattleTowerLobby.inc b/data/maps/scripts/BattleFrontier_BattleTowerLobby.inc index dea046207..d21c607d8 100644 --- a/data/maps/scripts/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/scripts/BattleFrontier_BattleTowerLobby.inc @@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 setvar VAR_0x8004, 9 - message gUnknown_08278091 + message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage setvar VAR_0x8005, 0 special sub_80B2DA4 diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc index 831c7f8ab..895922471 100644 --- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc @@ -51,7 +51,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_eq gUnknown_08275D0C + goto_eq EventScript_275D0C end LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc b/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc index f7db4b4cd..efe89144d 100644 --- a/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc @@ -52,7 +52,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 checkplayergender compare_var_to_value VAR_RESULT, 1 - goto_eq gUnknown_08275D0C + goto_eq EventScript_275D0C end LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 diff --git a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.inc b/data/maps/scripts/Route124_DivingTreasureHuntersHouse.inc index 2070bd6f0..f94892ee4 100644 --- a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/scripts/Route124_DivingTreasureHuntersHouse.inc @@ -347,68 +347,3 @@ Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 .string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p" .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n" .string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$" - -Route124_DivingTreasureHuntersHouse_Text_271315: @ 8271315 - lock - faceplayer - message 0x0 - waitmessage - waitbuttonpress - release - return - -Route124_DivingTreasureHuntersHouse_Text_271320: @ 8271320 - lockall - message 0x0 - waitmessage - waitbuttonpress - releaseall - return - -Route124_DivingTreasureHuntersHouse_Text_27132A: @ 827132A - message 0x0 - waitmessage - waitbuttonpress - return - -Route124_DivingTreasureHuntersHouse_Text_271332: @ 8271332 - message 0x0 - waitmessage - yesnobox 20, 8 - return - -Route124_DivingTreasureHuntersHouse_Text_27133C: @ 827133C - message 0x0 - playfanfare BGM_ME_BATTLE_POINTS - waitfanfare - waitmessage - return - -Route124_DivingTreasureHuntersHouse_Text_271347: @ 8271347 - pokenavcall 0x0 - waitmessage - return - -Route124_DivingTreasureHuntersHouse_Text_27134E: @ 827134E - return - -BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleFactoryLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePalaceLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePikeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePyramidLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleTowerLobby_EventScript_27134F:: @ 827134F -FallarborTown_BattleTentLobby_EventScript_27134F:: @ 827134F -LilycoveCity_ContestLobby_EventScript_27134F:: @ 827134F -MossdeepCity_GameCorner_1F_EventScript_27134F:: @ 827134F -OldaleTown_PokemonCenter_2F_EventScript_27134F:: @ 827134F -SecretBase_RedCave1_EventScript_27134F:: @ 827134F -SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F -SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F -TrainerHill_Entrance_EventScript_27134F:: @ 827134F -VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F - special sub_809FF80 - waitstate - return - diff --git a/data/maps/scripts/SeafloorCavern_Room9.inc b/data/maps/scripts/SeafloorCavern_Room9.inc index 085bd5124..6f968b4d0 100644 --- a/data/maps/scripts/SeafloorCavern_Room9.inc +++ b/data/maps/scripts/SeafloorCavern_Room9.inc @@ -123,7 +123,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 clearflag FLAG_0x3CD clearflag FLAG_0x33A clearflag FLAG_0x33B - clearflag TRAINERS_FLAG_NO + clearflag FLAG_0x356 clearflag FLAG_0x3E6 clearflag FLAG_0x3E5 setflag FLAG_0x347 diff --git a/data/maps/scripts/SecretBase_YellowCave4.inc b/data/maps/scripts/SecretBase_YellowCave4.inc index 3b32b8448..32da39388 100644 --- a/data/maps/scripts/SecretBase_YellowCave4.inc +++ b/data/maps/scripts/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_0x4089, 0, gUnknown_08275D0C + map_script_2 VAR_0x4089, 0, EventScript_275D0C .2byte 0 SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 diff --git a/data/maps/scripts/SootopolisCity_Gym_1F.inc b/data/maps/scripts/SootopolisCity_Gym_1F.inc index 58ffb1ad0..e28d8d13f 100644 --- a/data/maps/scripts/SootopolisCity_Gym_1F.inc +++ b/data/maps/scripts/SootopolisCity_Gym_1F.inc @@ -105,7 +105,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 setflag FLAG_0x4F7 setflag FLAG_BADGE08_GET - setflag TRAINERS_FLAG_NO + setflag FLAG_0x356 setflag FLAG_0x3CD setflag FLAG_0x330 setvar VAR_0x405E, 6 |