diff options
69 files changed, 233 insertions, 233 deletions
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 8fca93e81..c3f19aff6 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -293,7 +293,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const STEP_TYPE_16 const STEP_TYPE_17 const STEP_TYPE_18 - const STEP_TYPE_19 + const STEP_TYPE_SKYFALL_TOP const_def const PERSON_ACTION_00 diff --git a/engine/events.asm b/engine/events.asm index 02381bbc3..565b60049 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -767,8 +767,8 @@ TryReadSign: ; 96a38 ld de, EngineBuffer1 ld bc, 3 call FarCopyBytes - ld a, BANK(SignpostItemScript) - ld hl, SignpostItemScript + ld a, BANK(HiddenItemScript) + ld hl, HiddenItemScript call CallScript scf ret diff --git a/engine/events_2.asm b/engine/events_2.asm index 7722ec72b..97e2b76da 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -627,7 +627,7 @@ CmdQueue_StoneTable: ; 97f42 ld hl, OBJECT_MOVEMENTTYPE add hl, de ld a, [hl] - cp STEP_TYPE_19 + cp STEP_TYPE_SKYFALL_TOP jr nz, .next ld hl, OBJECT_NEXT_TILE diff --git a/engine/events_3.asm b/engine/events_3.asm index f9f8ffedc..686a794b7 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -276,7 +276,7 @@ endr ret ; b8172 -CheckForSignpostItems: ; b8172 +CheckForHiddenItems: ; b8172 ; Checks to see if there are hidden items on the screen that have not yet been found. If it finds one, returns carry. call GetMapScriptHeaderBank ld [Buffer1], a diff --git a/engine/movement.asm b/engine/movement.asm index 8de9c2590..40f3d7b27 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -88,7 +88,7 @@ MovementPointers: ; 5075 dw Movement_56 ; 56 dw Movement_rock_smash ; 57 dw Movement_return_dig ; 58 - dw Movement_run_before_fall ; 59 + dw Movement_skyfall_top ; 59 ; 5129 @@ -113,10 +113,10 @@ Movement_skyfall: ; 5137 ret ; 513e -Movement_run_before_fall: ; 513e +Movement_skyfall_top: ; 513e ld hl, OBJECT_STEP_TYPE add hl, bc - ld [hl], STEP_TYPE_19 + ld [hl], STEP_TYPE_SKYFALL_TOP ret ; 5145 diff --git a/event/itemfinder.asm b/event/itemfinder.asm index 1bbec2a4f..8bef235d3 100755 --- a/event/itemfinder.asm +++ b/event/itemfinder.asm @@ -1,5 +1,5 @@ ItemFinder: ; 12580 - callba CheckForSignpostItems + callba CheckForHiddenItems jr c, .found_something ld hl, .Script_FoundNothing jr .resume diff --git a/macros/movement.asm b/macros/movement.asm index 6331a4240..c4134b570 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -434,7 +434,7 @@ return_dig: macro db \1 endm - enum movement_run_before_fall -run_before_fall: macro - db movement_run_before_fall ; $59 + enum movement_skyfall_top +skyfall_top: macro + db movement_skyfall_top ; $59 endm @@ -7600,7 +7600,7 @@ RepelWoreOffScript:: ; 0x13619 db "@" ; 0x13625 -SignpostItemScript:: ; 0x13625 +HiddenItemScript:: ; 0x13625 opentext copybytetovar EngineBuffer3 itemtotext 0, 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 9a842b8f4..de6941334 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -214,7 +214,7 @@ AzaleaTownMartSign: WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN -MapAzaleaTownSignpostItem8: +AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL @@ -491,7 +491,7 @@ AzaleaTown_MapEventHeader: signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 + signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal .PersonEvents: db 12 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 6519edeb9..fa8b112da 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -10,28 +10,28 @@ BurnedTower1F_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x185bf2, 0 - dw UnknownScript_0x185bf6, 0 - dw UnknownScript_0x185bf7, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 ; callbacks - dbw 1, UnknownScript_0x185bf8 + dbw 1, .HoleAndLadder -UnknownScript_0x185bf2: - priorityjump UnknownScript_0x185c0d +.Trigger0: + priorityjump .EusineTrigger end -UnknownScript_0x185bf6: +.Trigger1: end -UnknownScript_0x185bf7: +.Trigger2: end -UnknownScript_0x185bf8: +.HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER iftrue .Next changeblock $a, $8, $32 ; hole @@ -42,65 +42,65 @@ UnknownScript_0x185bf8: .Done return -UnknownScript_0x185c0d: +.EusineTrigger: spriteface BURNEDTOWER1F_SUPER_NERD, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15 - applymovement BURNEDTOWER1F_SUPER_NERD, MovementData_0x185cd3 + applymovement BURNEDTOWER1F_SUPER_NERD, BurnedTower1FEusineMovement opentext - writetext UnknownText_0x185ecc + writetext BurnedTower1FEusineIntroText waitbutton closetext moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e dotrigger $1 end -UnknownScript_0x185c25: +BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 special Special_FadeOutMusic pause 15 spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 - applymovement PLAYER, MovementData_0x185ccd - applymovement BURNEDTOWER1F_SILVER, MovementData_0x185ccf + applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver + applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x185cd9 + writetext BurnedTowerSilver_BeforeText waitbutton closetext checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x185c60 + iftrue .totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x185c70 - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c + iftrue .chikorita + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_9 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x185c80 + jump .returnfrombattle -UnknownScript_0x185c60: - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c +.totodile: + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_7 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x185c80 + jump .returnfrombattle -UnknownScript_0x185c70: - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c +.chikorita: + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_8 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x185c80 + jump .returnfrombattle -UnknownScript_0x185c80: +.returnfrombattle: playmusic MUSIC_RIVAL_AFTER opentext - writetext UnknownText_0x185de2 + writetext BurnedTowerSilver_AfterText1 waitbutton closetext dotrigger $2 @@ -114,11 +114,11 @@ UnknownScript_0x185c80: changeblock $a, $8, $25 reloadmappart pause 15 - applymovement PLAYER, MovementData_0x185cd1 + applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall playsound SFX_KINESIS showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20 opentext - writetext UnknownText_0x185e75 + writetext BurnedTowerSilver_AfterText2 waitbutton closetext setevent EVENT_HOLE_IN_BURNED_TOWER @@ -126,39 +126,39 @@ UnknownScript_0x185c80: warpcheck end -SuperNerdScript_0x185cbc: - jumptextfaceplayer UnknownText_0x185f99 +BurnedTower1FEusineScript: + jumptextfaceplayer BurnedTower1FEusineText -MortyScript_0x185cbf: - jumptextfaceplayer UnknownText_0x186002 +BurnedTower1FMortyScript: + jumptextfaceplayer BurnedTower1FMortyText BurnedTower1FRock: jumpstd smashrock -MapBurnedTower1FSignpostItem0: +BurnedTower1FHiddenEther: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER -MapBurnedTower1FSignpostItem1: +BurnedTower1FHiddenUltraBall: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP -MovementData_0x185ccd: +BurnedTowerMovement_PlayerWalksToSilver: step_left step_end -MovementData_0x185ccf: +BurnedTowerMovement_SilverWalksToPlayer: step_right step_end -MovementData_0x185cd1: - run_before_fall +BurnedTower1FMovement_PlayerStartsToFall: + skyfall_top step_end -MovementData_0x185cd3: +BurnedTower1FEusineMovement: step_down step_left step_left @@ -166,7 +166,7 @@ MovementData_0x185cd3: step_down step_end -UnknownText_0x185cd9: +BurnedTowerSilver_BeforeText: text "<......> <......> <......>" para "…Oh, it's you." @@ -190,7 +190,7 @@ UnknownText_0x185cd9: line "fault!" done -UnknownText_0x185d9b: +BurnedTowerSilver_WinText: text "…Humph!" para "This is why I hate" @@ -200,7 +200,7 @@ UnknownText_0x185d9b: line "challenge in it." done -UnknownText_0x185de2: +BurnedTowerSilver_AfterText1: text "…Aw, whatever." para "You would never be" @@ -210,7 +210,7 @@ UnknownText_0x185de2: line "anyway." done -UnknownText_0x185e2c: +BurnedTowerSilver_LossText: text "…Humph!" para "This is why I hate" @@ -220,7 +220,7 @@ UnknownText_0x185e2c: line "of my time." done -UnknownText_0x185e75: +BurnedTowerSilver_AfterText2: text "Humph!" para "What are you doing" @@ -232,7 +232,7 @@ UnknownText_0x185e75: para "Serves you right!" done -UnknownText_0x185ecc: +BurnedTower1FEusineIntroText: text "EUSINE: My name's" line "EUSINE." @@ -255,7 +255,7 @@ UnknownText_0x185ecc: line "could it be?" done -UnknownText_0x185f99: +BurnedTower1FEusineText: text "EUSINE: I heard" line "that SUICUNE is in" @@ -266,7 +266,7 @@ UnknownText_0x185f99: line "could it be?" done -UnknownText_0x186002: +BurnedTower1FMortyText: text "MORTY: ECRUTEAK's" line "GYM LEADER has to" @@ -307,17 +307,17 @@ BurnedTower1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0 + xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0 .Signposts: db 2 - signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 - signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther + signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall .PersonEvents: db 5 person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER - person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 10d64c190..0dde68efd 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -76,7 +76,7 @@ CeladonCityTrainerTips: CeladonCityPokeCenterSign: jumpstd pokecentersign -MapCeladonCitySignpostItem7: +CeladonCityHiddenPpUp: dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: @@ -264,7 +264,7 @@ CeladonCity_MapEventHeader: signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign - signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 + signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp .PersonEvents: db 9 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index d54cda1f5..b841f3f78 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -148,7 +148,7 @@ CeruleanCityPokeCenterSign: CeruleanCityMartSign: jumpstd martsign -MapCeruleanCitySignpostItem8: +CeruleanCityHiddenBerserkGene: dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE UnknownText_0x1840bc: @@ -303,7 +303,7 @@ CeruleanCity_MapEventHeader: signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 + signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene .PersonEvents: db 6 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 496c00023..005880d2b 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -136,7 +136,7 @@ CeruleanGymGuyScript: closetext end -MapCeruleanGymSignpostItem0: +CeruleanGymHiddenMachinePart: dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART @@ -379,7 +379,7 @@ CeruleanGym_MapEventHeader: .Signposts: db 3 - signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 + signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4babcd4f9..70d44054d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -148,10 +148,10 @@ CianwoodPokeCenterSign: CianwoodCityRock: jumpstd smashrock -MapCianwoodCitySignpostItem6: +CianwoodCityHiddenRevive: dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE -MapCianwoodCitySignpostItem7: +CianwoodCityHiddenMaxEther: dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: @@ -410,8 +410,8 @@ CianwoodCity_MapEventHeader: signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 - signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 + signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive + signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther .PersonEvents: db 12 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 886f8dfb5..6823bc8a7 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -36,7 +36,7 @@ CinnabarIslandSign: CinnabarIslandPokeCenterSign: jumpstd pokecentersign -MapCinnabarIslandSignpostItem3: +CinnabarIslandHiddenRareCandy: dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: @@ -145,7 +145,7 @@ CinnabarIsland_MapEventHeader: signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 + signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy .PersonEvents: db 1 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 943b3b390..615a98c94 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -30,7 +30,7 @@ DarkCaveVioletEntranceDireHit: DarkCaveVioletEntranceRock: jumpstd smashrock -MapDarkCaveVioletEntranceSignpostItem0: +DarkCaveVioletEntranceHiddenElixer: dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER @@ -49,7 +49,7 @@ DarkCaveVioletEntrance_MapEventHeader: .Signposts: db 1 - signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer .PersonEvents: db 8 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index a3daf6517..2f85c057d 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -11,7 +11,7 @@ DiglettsCave_MapScriptHeader: PokefanMScript_0x74002: jumptextfaceplayer UnknownText_0x74008 -MapDiglettsCaveSignpostItem0: +DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE @@ -41,7 +41,7 @@ DiglettsCave_MapEventHeader: .Signposts: db 1 - signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEM, DiglettsCaveHiddenMaxRevive .PersonEvents: db 1 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 356d0446b..5497bc90c 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -187,13 +187,13 @@ DragonsDenB1FCalcium: DragonsDenB1FMaxElixer: itemball MAX_ELIXER -MapDragonsDenB1FSignpostItem1: +DragonsDenB1FHiddenRevive: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE -MapDragonsDenB1FSignpostItem2: +DragonsDenB1FHiddenMaxPotion: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION -MapDragonsDenB1FSignpostItem3: +DragonsDenB1FHiddenMaxElixer: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementDragonsDen_ClairWalksToYou: @@ -427,9 +427,9 @@ DragonsDenB1F_MapEventHeader: .Signposts: db 4 signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 + signpost 29, 33, SIGNPOST_ITEM, DragonsDenB1FHiddenRevive + signpost 17, 21, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxPotion + signpost 15, 31, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxElixer .PersonEvents: db 9 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 091d070f2..0b5fd1192 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -89,7 +89,7 @@ EcruteakCityPokeCenterSign: EcruteakCityMartSign: jumpstd martsign -MapEcruteakCitySignpostItem7: +EcruteakCityHiddenHyperPotion: dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: @@ -295,7 +295,7 @@ EcruteakCity_MapEventHeader: signpost 10, 2, SIGNPOST_READ, BurnedTowerSign signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 + signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion .PersonEvents: db 7 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 9ca9fb4ba..510e4e458 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -72,7 +72,7 @@ IcePathB1FBoulder: IcePathB1FIron: itemball IRON -MapIcePathB1FSignpostItem0: +IcePathB1FHiddenMaxPotion: dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION @@ -102,7 +102,7 @@ IcePathB1F_MapEventHeader: .Signposts: db 1 - signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion .PersonEvents: db 5 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index bae73a255..12d5dbdcb 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -11,7 +11,7 @@ IcePathB2FBlackthornSide_MapScriptHeader: IcePathB2FBlackthornSideTMRest: itemball TM_REST -MapIcePathB2FBlackthornSideSignpostItem0: +IcePathB2FBlackthornSideHiddenIceHeal: dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL @@ -29,7 +29,7 @@ IcePathB2FBlackthornSide_MapEventHeader: .Signposts: db 1 - signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEM, IcePathB2FBlackthornSideHiddenIceHeal .PersonEvents: db 1 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index bc240a1ae..f17f21d12 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -22,7 +22,7 @@ IcePathB2FMahoganySideFullHeal: IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION -MapIcePathB2FMahoganySideSignpostItem0: +IcePathB2FMahoganySideHiddenCarbos: dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS @@ -49,7 +49,7 @@ IcePathB2FMahoganySide_MapEventHeader: .Signposts: db 1 - signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEM, IcePathB2FMahoganySideHiddenCarbos .PersonEvents: db 6 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d2877beeb..fd8623a18 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -416,15 +416,15 @@ IlexForestAntidote: IlexForestEther: itemball ETHER -MapIlexForestSignpostItem1: +IlexForestHiddenEther: dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER -MapIlexForestSignpostItem2: +IlexForestHiddenSuperPotion: dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION -MapIlexForestSignpostItem3: +IlexForestHiddenFullHeal: dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: @@ -958,9 +958,9 @@ IlexForest_MapEventHeader: .Signposts: db 5 signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 - signpost 14, 22, SIGNPOST_ITEM, MapIlexForestSignpostItem2 - signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 + signpost 7, 11, SIGNPOST_ITEM, IlexForestHiddenEther + signpost 14, 22, SIGNPOST_ITEM, IlexForestHiddenSuperPotion + signpost 17, 1, SIGNPOST_ITEM, IlexForestHiddenFullHeal signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script .PersonEvents: diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 12e087f96..b23b313d1 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -236,15 +236,15 @@ LakeofRageElixer: LakeofRageTMDetect: itemball TM_DETECT -MapLakeofRageSignpostItem2: +LakeofRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapLakeofRageSignpostItem3: +LakeofRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY -MapLakeofRageSignpostItem4: +LakeofRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION @@ -517,9 +517,9 @@ LakeofRage_MapEventHeader: db 5 signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEM, MapLakeofRageSignpostItem2 - signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 - signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 + signpost 28, 11, SIGNPOST_ITEM, LakeofRageHiddenFullRestore + signpost 4, 4, SIGNPOST_ITEM, LakeofRageHiddenRareCandy + signpost 5, 35, SIGNPOST_ITEM, LakeofRageHiddenMaxPotion .PersonEvents: db 12 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 9ec9120c1..c897757cb 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -80,7 +80,7 @@ UnknownScript_0x7709a: .NoDancing: end -MapMountMoonSquareSignpostItem0: +MountMoonSquareHiddenMoonStone: dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE @@ -155,7 +155,7 @@ MountMoonSquare_MapEventHeader: .Signposts: db 2 - signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 + signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script .PersonEvents: diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 6984e4573..a9d25bb7b 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -63,7 +63,7 @@ MountMortar1FInsideIron: MountMortar1FInsideUltraBall: itemball ULTRA_BALL -MapMountMortar1FInsideSignpostItem0: +MountMortar1FInsideHiddenMaxRepel: dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL @@ -135,7 +135,7 @@ MountMortar1FInside_MapEventHeader: .Signposts: db 1 - signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MountMortar1FInsideHiddenMaxRepel .PersonEvents: db 10 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 5091911a3..ebaa40bf1 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -15,7 +15,7 @@ MountMortar1FOutsideEther: MountMortar1FOutsideRevive: itemball REVIVE -MapMountMortar1FOutsideSignpostItem0: +MountMortar1FOutsideHiddenHyperPotion: dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION @@ -40,7 +40,7 @@ MountMortar1FOutside_MapEventHeader: .Signposts: db 1 - signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEM, MountMortar1FOutsideHiddenHyperPotion .PersonEvents: db 2 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 7e04d15c4..6d08a7d22 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -43,7 +43,7 @@ MountMortar2FInsideElixer: MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE -MapMountMortar2FInsideSignpostItem0: +MountMortar2FInsideHiddenFullRestore: dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE @@ -81,7 +81,7 @@ MountMortar2FInside_MapEventHeader: .Signposts: db 1 - signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEM, MountMortar2FInsideHiddenFullRestore .PersonEvents: db 7 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 30d9dba90..e9f7d44a4 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -71,7 +71,7 @@ MountMortarB1FMaxEther: MountMortarB1FPPUp: itemball PP_UP -MapMountMortarB1FSignpostItem0: +MountMortarB1FHiddenMaxRevive: dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE @@ -149,7 +149,7 @@ MountMortarB1F_MapEventHeader: .Signposts: db 1 - signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEM, MountMortarB1FHiddenMaxRevive .PersonEvents: db 7 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index ad33c6655..c15c589d4 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -304,7 +304,7 @@ NationalParkParlyzHeal: NationalParkTMDig: itemball TM_DIG -MapNationalParkSignpostItem2: +NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL @@ -532,7 +532,7 @@ NationalPark_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, NationalParkHiddenFullHeal signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script .PersonEvents: diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 9c513c9b4..113fd6f96 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -114,7 +114,7 @@ NationalParkBugContestParlyzHeal: NationalParkBugContestTMDig: itemball TM_DIG -MapNationalParkBugContestSignpostItem2: +NationalParkBugContestHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL @@ -239,7 +239,7 @@ NationalParkBugContest_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, NationalParkBugContestHiddenFullHeal signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script .PersonEvents: diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 91e96abfe..cbc8bc441 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -43,7 +43,7 @@ OlivineLighthouse5FSuperRepel: OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER -MapOlivineLighthouse5FSignpostItem0: +OlivineLighthouse5FHiddenHyperPotion: dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION @@ -110,7 +110,7 @@ OlivineLighthouse5F_MapEventHeader: .Signposts: db 1 - signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEM, OlivineLighthouse5FHiddenHyperPotion .PersonEvents: db 5 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f8b49bd0a..734d72dbb 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -235,7 +235,7 @@ CooltrainerFScript_0x74a22: spriteface OLIVINEPORT_COOLTRAINER_F, DOWN end -MapOlivinePortSignpostItem0: +OlivinePortHiddenProtein: dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN @@ -402,7 +402,7 @@ OlivinePort_MapEventHeader: .Signposts: db 1 - signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEM, OlivinePortHiddenProtein .PersonEvents: db 7 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 4599884ba..14156a01f 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -15,11 +15,11 @@ RockTunnel1FElixer: RockTunnel1FTMSteelWing: itemball TM_STEEL_WING -MapRockTunnel1FSignpostItem0: +RockTunnel1FHiddenXAccuracy: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY -MapRockTunnel1FSignpostItem1: +RockTunnel1FHiddenXDefend: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND @@ -41,8 +41,8 @@ RockTunnel1F_MapEventHeader: .Signposts: db 2 - signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 - signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, RockTunnel1FHiddenXAccuracy + signpost 15, 21, SIGNPOST_ITEM, RockTunnel1FHiddenXDefend .PersonEvents: db 2 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index f759651d8..7d061d45d 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -19,7 +19,7 @@ RockTunnelB1FPPUp: RockTunnelB1FRevive: itemball REVIVE -MapRockTunnelB1FSignpostItem0: +RockTunnelB1FHiddenMaxPotion: dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION @@ -39,7 +39,7 @@ RockTunnelB1F_MapEventHeader: .Signposts: db 1 - signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEM, RockTunnelB1FHiddenMaxPotion .PersonEvents: db 3 diff --git a/maps/Route11.asm b/maps/Route11.asm index fe0f274d3..5dd00f6a7 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -62,7 +62,7 @@ MapRoute11Signpost0Script: FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 -MapRoute11SignpostItem1: +Route11HiddenRevive: dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE @@ -159,7 +159,7 @@ Route11_MapEventHeader: .Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script - signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 + signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive .PersonEvents: db 5 diff --git a/maps/Route12.asm b/maps/Route12.asm index 626b26e89..b947333d7 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -69,7 +69,7 @@ Route12Calcium: Route12Nugget: itemball NUGGET -MapRoute12SignpostItem2: +Route12HiddenElixer: dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER @@ -182,7 +182,7 @@ Route12_MapEventHeader: db 3 signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script - signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 + signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer .PersonEvents: db 6 diff --git a/maps/Route13.asm b/maps/Route13.asm index 5e25f6ac3..4237878d3 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -76,7 +76,7 @@ MapRoute13Signpost1Script: MapRoute13Signpost2Script: jumptext UnknownText_0x1a277d -MapRoute13SignpostItem3: +Route13HiddenCalcium: dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM @@ -207,7 +207,7 @@ Route13_MapEventHeader: signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script - signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 + signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium .PersonEvents: db 5 diff --git a/maps/Route17.asm b/maps/Route17.asm index bf32ef2f7..1520d3eeb 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -64,11 +64,11 @@ BikerGlennScript: closetext end -MapRoute17SignpostItem0: +Route17HiddenMaxEther: dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER -MapRoute17SignpostItem1: +Route17HiddenMaxElixer: dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER @@ -151,8 +151,8 @@ Route17_MapEventHeader: .Signposts: db 2 - signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 - signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEM, Route17HiddenMaxEther + signpost 77, 8, SIGNPOST_ITEM, Route17HiddenMaxElixer .PersonEvents: db 4 diff --git a/maps/Route2.asm b/maps/Route2.asm index b811c05c8..28eb3e43b 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -69,16 +69,16 @@ Route2Elixer: FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 -MapRoute2SignpostItem2: +Route2HiddenMaxEther: dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER -MapRoute2SignpostItem3: +Route2HiddenFullHeal: dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL -MapRoute2SignpostItem4: +Route2HiddenFullRestore: dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapRoute2SignpostItem5: +Route2HiddenRevive: dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE Bug_catcherRobSeenText: @@ -165,10 +165,10 @@ Route2_MapEventHeader: db 6 signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 - signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 - signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 - signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 + signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther + signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal + signpost 27, 4, SIGNPOST_ITEM, Route2HiddenFullRestore + signpost 30, 11, SIGNPOST_ITEM, Route2HiddenRevive .PersonEvents: db 8 diff --git a/maps/Route25.asm b/maps/Route25.asm index f929251c6..7c2ecf6a2 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -192,7 +192,7 @@ MapRoute25Signpost0Script: Route25Protein: itemball PROTEIN -MapRoute25SignpostItem1: +Route25HiddenPotion: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION @@ -448,7 +448,7 @@ Route25_MapEventHeader: .Signposts: db 2 signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script - signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 + signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion .PersonEvents: db 11 diff --git a/maps/Route28.asm b/maps/Route28.asm index 041f7517b..fc815b05b 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -10,7 +10,7 @@ Route28_MapScriptHeader: MapRoute28Signpost0Script: jumptext UnknownText_0x1a5413 -MapRoute28SignpostItem1: +Route28HiddenRareCandy: dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY @@ -33,7 +33,7 @@ Route28_MapEventHeader: .Signposts: db 2 signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script - signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 + signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy .PersonEvents: db 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index aa29498e9..31a278a75 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -247,7 +247,7 @@ FruitTreeScript_0x1a17f7: FruitTreeScript_0x1a17f9: fruittree FRUITTREE_ROUTE_30_2 -MapRoute30SignpostItem4: +Route30HiddenPotion: dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION @@ -425,7 +425,7 @@ Route30_MapEventHeader: signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script - signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 + signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion .PersonEvents: db 11 diff --git a/maps/Route32.asm b/maps/Route32.asm index f02770d9e..d41d97abd 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -510,11 +510,11 @@ Route32UnionCaveSign: Route32PokeCenterSign: jumpstd pokecentersign -MapRoute32SignpostItem4: +Route32HiddenGreatBall: dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL -MapRoute32SignpostItem5: +Route32HiddenSuperPotion: dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION @@ -957,8 +957,8 @@ Route32_MapEventHeader: signpost 1, 9, SIGNPOST_READ, Route32RuinsSign signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign - signpost 67, 12, SIGNPOST_ITEM, MapRoute32SignpostItem4 - signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 + signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall + signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion .PersonEvents: db 14 diff --git a/maps/Route34.asm b/maps/Route34.asm index 80839a03e..048a08801 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -490,11 +490,11 @@ MapRoute34Signpost2Script: Route34Nugget: itemball NUGGET -MapRoute34SignpostItem3: +Route34HiddenRareCandy: dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY -MapRoute34SignpostItem4: +Route34HiddenSuperPotion: dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION @@ -785,8 +785,8 @@ Route34_MapEventHeader: signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script - signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 - signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 + signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy + signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion .PersonEvents: db 13 diff --git a/maps/Route37.asm b/maps/Route37.asm index 4e7e48f0c..54081e849 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -116,7 +116,7 @@ FruitTreeScript_0x1a8e0b: FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 -MapRoute37SignpostItem1: +Route37HiddenEther: dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER @@ -254,7 +254,7 @@ Route37_MapEventHeader: .Signposts: db 2 signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script - signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 + signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther .PersonEvents: db 7 diff --git a/maps/Route39.asm b/maps/Route39.asm index 809d1f5d7..bdd247829 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -179,7 +179,7 @@ MapRoute39Signpost0Script: FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 -MapRoute39SignpostItem3: +Route39HiddenNugget: dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET @@ -361,7 +361,7 @@ Route39_MapEventHeader: signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script - signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 + signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget .PersonEvents: db 10 diff --git a/maps/Route4.asm b/maps/Route4.asm index 9bc86ea46..b6ec5b98e 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -50,7 +50,7 @@ MapRoute4Signpost0Script: Route4HPUp: itemball HP_UP -MapRoute4SignpostItem1: +Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL @@ -135,7 +135,7 @@ Route4_MapEventHeader: .Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script - signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 + signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall .PersonEvents: db 4 diff --git a/maps/Route40.asm b/maps/Route40.asm index 5f5a0b078..65e040604 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -137,7 +137,7 @@ MapRoute40Signpost0Script: Route40Rock: jumpstd smashrock -MapRoute40SignpostItem1: +Route40HiddenHyperPotion: dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: @@ -354,7 +354,7 @@ Route40_MapEventHeader: .Signposts: db 2 signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script - signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 + signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion .PersonEvents: db 12 diff --git a/maps/Route41.asm b/maps/Route41.asm index 376428d54..6c4b5c0d5 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -131,7 +131,7 @@ Route41Rock: ; unused jumpstd smashrock -MapRoute41SignpostItem0: +Route41HiddenMaxEther: dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: @@ -357,7 +357,7 @@ Route41_MapEventHeader: .Signposts: db 1 - signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEM, Route41HiddenMaxEther .PersonEvents: db 10 diff --git a/maps/Route42.asm b/maps/Route42.asm index dac07a6fc..a85512ff4 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -213,7 +213,7 @@ FruitTreeScript_0x1a934f: FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 -MapRoute42SignpostItem4: +Route42HiddenMaxPotion: dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION @@ -343,7 +343,7 @@ Route42_MapEventHeader: signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script - signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 + signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion .PersonEvents: db 9 diff --git a/maps/Route44.asm b/maps/Route44.asm index 42ce27417..a9eceb5b9 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -317,7 +317,7 @@ Route44UltraBall: Route44MaxRepel: itemball MAX_REPEL -MapRoute44SignpostItem2: +Route44HiddenElixer: dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER @@ -522,7 +522,7 @@ Route44_MapEventHeader: db 3 signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script - signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 + signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer .PersonEvents: db 11 diff --git a/maps/Route45.asm b/maps/Route45.asm index b9ec147a7..9d4fecbf1 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -311,7 +311,7 @@ Route45Elixer: Route45MaxPotion: itemball MAX_POTION -MapRoute45SignpostItem1: +Route45HiddenPpUp: dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP @@ -546,7 +546,7 @@ Route45_MapEventHeader: .Signposts: db 2 signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script - signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 + signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp .PersonEvents: db 13 diff --git a/maps/Route9.asm b/maps/Route9.asm index 3a0a71772..8ba626286 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -82,7 +82,7 @@ HikerSidneyScript: MapRoute9Signpost0Script: jumptext UnknownText_0x1ab2a2 -MapRoute9SignpostItem1: +Route9HiddenEther: dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER @@ -220,7 +220,7 @@ Route9_MapEventHeader: .Signposts: db 2 signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script - signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 + signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther .PersonEvents: db 6 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 52bfe2eb2..29e02e287 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -20,7 +20,7 @@ MtSilverPokeCenterSign: MtSilverSign: jumptext MtSilverSignText -MapSilverCaveOutsideSignpostItem2: +SilverCaveOutsideHiddenFullRestore: dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: @@ -43,7 +43,7 @@ SilverCaveOutside_MapEventHeader: db 3 signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 + signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore .PersonEvents: db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 505f525c1..6bca1da26 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -23,11 +23,11 @@ SilverCaveRoom1EscapeRope: SilverCaveRoom1UltraBall: itemball ULTRA_BALL -MapSilverCaveRoom1SignpostItem0: +SilverCaveRoom1HiddenDireHit: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT -MapSilverCaveRoom1SignpostItem1: +SilverCaveRoom1HiddenUltraBall: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL @@ -45,8 +45,8 @@ SilverCaveRoom1_MapEventHeader: .Signposts: db 2 - signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, SilverCaveRoom1HiddenDireHit + signpost 12, 17, SIGNPOST_ITEM, SilverCaveRoom1HiddenUltraBall .PersonEvents: db 4 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index bb208c5e0..274fea517 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -19,7 +19,7 @@ SilverCaveRoom2UltraBall: SilverCaveRoom2PPUp: itemball PP_UP -MapSilverCaveRoom2SignpostItem0: +SilverCaveRoom2HiddenMaxPotion: dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION @@ -39,7 +39,7 @@ SilverCaveRoom2_MapEventHeader: .Signposts: db 1 - signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, SilverCaveRoom2HiddenMaxPotion .PersonEvents: db 3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 2f0f5ac70..9a137ce56 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -544,7 +544,7 @@ TeamRocketBaseB1FNugget: TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC -MapTeamRocketBaseB1FSignpostItem8: +TeamRocketBaseB1FHiddenRevive: dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE @@ -790,7 +790,7 @@ TeamRocketBaseB1F_MapEventHeader: signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 + signpost 11, 3, SIGNPOST_ITEM, TeamRocketBaseB1FHiddenRevive .PersonEvents: db 6 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index a657b8ca2..36377d5ea 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -362,7 +362,7 @@ UnknownScript_0x6d207: TeamRocketBaseB2FTMThief: itemball TM_THIEF -MapTeamRocketBaseB2FSignpostItem22: +TeamRocketBaseB2FHiddenFullHeal: dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL @@ -964,7 +964,7 @@ TeamRocketBaseB2F_MapEventHeader: signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 + signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal .PersonEvents: db 14 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 496c8e655..44b683423 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -19,7 +19,7 @@ TinTower4FPPUp: TinTower4FEscapeRope: itemball ESCAPE_ROPE -MapTinTower4FSignpostItem0: +TinTower4FHiddenMaxPotion: dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION @@ -39,7 +39,7 @@ TinTower4F_MapEventHeader: .Signposts: db 1 - signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEM, TinTower4FHiddenMaxPotion .PersonEvents: db 3 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index a8e291cc2..a8e668284 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -11,11 +11,11 @@ TinTower5F_MapScriptHeader: TinTower5FRareCandy: itemball RARE_CANDY -MapTinTower5FSignpostItem0: +TinTower5FHiddenFullRestore: dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapTinTower5FSignpostItem1: +TinTower5FHiddenCarbos: dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS @@ -35,8 +35,8 @@ TinTower5F_MapEventHeader: .Signposts: db 2 - signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 - signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, TinTower5FHiddenFullRestore + signpost 15, 3, SIGNPOST_ITEM, TinTower5FHiddenCarbos .PersonEvents: db 1 diff --git a/maps/Underground.asm b/maps/Underground.asm index b88db2943..3c235f8b1 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -7,11 +7,11 @@ Underground_MapScriptHeader: .MapCallbacks: db 0 -MapUndergroundSignpostItem0: +UndergroundHiddenFullRestore: dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapUndergroundSignpostItem1: +UndergroundHiddenXSpecial: dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL @@ -29,8 +29,8 @@ Underground_MapEventHeader: .Signposts: db 2 - signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 - signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEM, UndergroundHiddenFullRestore + signpost 19, 1, SIGNPOST_ITEM, UndergroundHiddenXSpecial .PersonEvents: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index acf04e5ac..58e569e84 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -634,11 +634,11 @@ UndergroundPathSwitchRoomEntrancesSmokeBall: UndergroundPathSwitchRoomEntrancesFullHeal: itemball FULL_HEAL -MapUndergroundPathSwitchRoomEntrancesSignpostItem4: +UndergroundPathSwitchRoomEntrancesHiddenMaxPotion: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION -MapUndergroundPathSwitchRoomEntrancesSignpostItem5: +UndergroundPathSwitchRoomEntrancesHiddenRevive: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE @@ -963,8 +963,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: signpost 1, 10, SIGNPOST_READ, Switch2Script signpost 1, 2, SIGNPOST_READ, Switch3Script signpost 11, 20, SIGNPOST_READ, EmergencySwitchScript - signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + signpost 9, 8, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion + signpost 8, 1, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive .PersonEvents: db 11 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 3e5fba430..b47f39693 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -124,7 +124,7 @@ VermilionCityPokeCenterSign: VermilionCityMartSign: jumpstd martsign -MapVermilionCitySignpostItem7: +VermilionCityHiddenFullHeal: dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x1aaa15: @@ -298,7 +298,7 @@ VermilionCity_MapEventHeader: signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 + signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal .PersonEvents: db 6 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index b3ccd1d4c..2e31531ce 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -198,7 +198,7 @@ SuperNerdScript_0x74ee6: closetext end -MapVermilionPortSignpostItem0: +VermilionPortHiddenIron: dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON @@ -318,7 +318,7 @@ VermilionPort_MapEventHeader: .Signposts: db 1 - signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, VermilionPortHiddenIron .PersonEvents: db 3 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 256b98374..f4cf89575 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -113,11 +113,11 @@ VictoryRoadFullHeal: VictoryRoadHPUp: itemball HP_UP -MapVictoryRoadSignpostItem0: +VictoryRoadHiddenMaxPotion: dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION -MapVictoryRoadSignpostItem1: +VictoryRoadHiddenFullHeal: dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL @@ -266,8 +266,8 @@ VictoryRoad_MapEventHeader: .Signposts: db 2 - signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 - signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEM, VictoryRoadHiddenMaxPotion + signpost 65, 3, SIGNPOST_ITEM, VictoryRoadHiddenFullHeal .PersonEvents: db 6 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index b3995ee30..c15a4a7eb 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -99,7 +99,7 @@ VioletCityRareCandy: FruitTreeScript_0x1a8425: fruittree FRUITTREE_VIOLET_CITY -MapVioletCitySignpostItem6: +VioletCityHiddenHyperPotion: dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a842a: @@ -307,7 +307,7 @@ VioletCity_MapEventHeader: signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign - signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 + signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion .PersonEvents: db 8 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 753a1cc8a..0321c4bdf 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -413,15 +413,15 @@ WarehouseEntranceCoinCase: MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a -MapWarehouseEntranceSignpostItem2: +WarehouseEntranceHiddenParlyzHeal: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL -MapWarehouseEntranceSignpostItem3: +WarehouseEntranceHiddenSuperPotion: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION -MapWarehouseEntranceSignpostItem4: +WarehouseEntranceHiddenAntidote: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE @@ -674,9 +674,9 @@ WarehouseEntrance_MapEventHeader: db 5 signpost 6, 18, SIGNPOST_READ, BasementDoorScript signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 + signpost 13, 6, SIGNPOST_ITEM, WarehouseEntranceHiddenParlyzHeal + signpost 18, 4, SIGNPOST_ITEM, WarehouseEntranceHiddenSuperPotion + signpost 8, 17, SIGNPOST_ITEM, WarehouseEntranceHiddenAntidote .PersonEvents: db 9 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index eb102c306..e425c80ca 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -31,15 +31,15 @@ WhirlIslandB1FEscapeRope: WhirlIslandB1FBoulder: jumpstd strengthboulder -MapWhirlIslandB1FSignpostItem0: +WhirlIslandB1FHiddenRareCandy: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY -MapWhirlIslandB1FSignpostItem1: +WhirlIslandB1FHiddenUltraBall: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL -MapWhirlIslandB1FSignpostItem2: +WhirlIslandB1FHiddenFullRestore: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE @@ -64,9 +64,9 @@ WhirlIslandB1F_MapEventHeader: .Signposts: db 3 - signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, WhirlIslandB1FHiddenRareCandy + signpost 18, 36, SIGNPOST_ITEM, WhirlIslandB1FHiddenUltraBall + signpost 23, 2, SIGNPOST_ITEM, WhirlIslandB1FHiddenFullRestore .PersonEvents: db 6 |