pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

hiddenitem, like itemball and object_event, puts the item first and the event last

Browse Source
This commit is contained in:
Rangi 2018-01-23 12:59:21 -05:00
parent b88928e9aa
commit dea26c6639
63 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/map_scripts.md
View File

@ -110,7 +110,7 @@ BG event types:
- `BGEVENT_ITEM`
<pre>
hiddenitem <i>event_flag</i>, <i>item_id</i>
hiddenitem <i>item_id</i>, <i>event_flag</i>
</pre>
- `BGEVENT_COPY`
@ -162,7 +162,7 @@ Object types:
- `OBJECTTYPE_ITEMBALL`
<pre>
itemball <i>item_id</i>
itemball <i>item_id</i>[, <i>quantity</i>=1]
</pre>
- `OBJECTTYPE_TRAINER`

6
macros/scripts/maps.asm
View File

@ -99,9 +99,9 @@ endc
ENDM
hiddenitem: MACRO
;\1: flag: an EVENT_* constant
;\2: item: from constants/item_constants.asm
dwb \1, \2
;\1: item: from constants/item_constants.asm
;\2: flag: an EVENT_* constant
dwb \2, \1
ENDM
elevfloor: MACRO

2
maps/AzaleaTown.asm
View File

@ -211,7 +211,7 @@ WhiteApricornTree:
fruittree FRUITTREE_AZALEA_TOWN
AzaleaTownHiddenFullHeal:
hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL
AzaleaTownRivalBattleApproachMovement1:
step LEFT

4
maps/BurnedTower1F.asm
View File

@ -131,10 +131,10 @@ BurnedTower1FRock:
jumpstd smashrock
BurnedTower1FHiddenEther:
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
BurnedTower1FHiddenUltraBall:
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
BurnedTower1FHPUp:
itemball HP_UP

2
maps/CeladonCity.asm
View File

@ -75,7 +75,7 @@ CeladonCityPokecenterSign:
jumpstd pokecentersign
CeladonCityHiddenPpUp:
hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP
CeladonCityFisherText:
text "This POLIWRATH is"

2
maps/CeruleanCity.asm
View File

@ -147,7 +147,7 @@ CeruleanCityMartSign:
jumpstd martsign
CeruleanCityHiddenBerserkGene:
hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
CeruleanCityCooltrainerMText1:
text "KANTO's POWER"

2
maps/CeruleanGym.asm
View File

@ -135,7 +135,7 @@ CeruleanGymGuyScript:
end
CeruleanGymHiddenMachinePart:
hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM

4
maps/CianwoodCity.asm
View File

@ -145,10 +145,10 @@ CianwoodCityRock:
jumpstd smashrock
CianwoodCityHiddenRevive:
hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE
CianwoodCityHiddenMaxEther:
hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER
MovementData_0x1a00da:
set_sliding

2
maps/CinnabarIsland.asm
View File

@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign:
jumpstd pokecentersign
CinnabarIslandHiddenRareCandy:
hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
CinnabarIslandBlueTeleport:
teleport_from

2
maps/DarkCaveVioletEntrance.asm
View File

@ -31,7 +31,7 @@ DarkCaveVioletEntranceRock:
jumpstd smashrock
DarkCaveVioletEntranceHiddenElixer:
hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
DarkCaveVioletEntrance_MapEvents:
; filler

2
maps/DiglettsCave.asm
View File

@ -12,7 +12,7 @@ DiglettsCavePokefanMScript:
jumptextfaceplayer DiglettsCavePokefanMText
DiglettsCaveHiddenMaxRevive:
hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
DiglettsCavePokefanMText:
text "A bunch of DIGLETT"

6
maps/DragonsDenB1F.asm
View File

@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer:
itemball MAX_ELIXER
DragonsDenB1FHiddenRevive:
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE
DragonsDenB1FHiddenMaxPotion:
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION
DragonsDenB1FHiddenMaxElixer:
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER
MovementDragonsDen_ClairWalksToYou:
slow_step RIGHT

2
maps/EcruteakCity.asm
View File

@ -88,7 +88,7 @@ EcruteakCityMartSign:
jumpstd martsign
EcruteakCityHiddenHyperPotion:
hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION
UnusedMissingDaughterText:
; This text is neither used nor referenced in the final game.

6
maps/GoldenrodUnderground.asm
View File

@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script:
jumptext UnknownText_0x7c91a
GoldenrodUndergroundHiddenParlyzHeal:
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
GoldenrodUndergroundHiddenSuperPotion:
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION
GoldenrodUndergroundHiddenAntidote:
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
SupernerdEricSeenText:
text "I got booted out"

4
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -631,10 +631,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
itemball FULL_HEAL
GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
UndergroundSilverApproachMovement1:
step DOWN

2
maps/IcePathB1F.asm
View File

@ -68,7 +68,7 @@ IcePathB1FIron:
itemball IRON
IcePathB1FHiddenMaxPotion:
hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION
IcePathBoulderFellThroughText:
text "The boulder fell"

2
maps/IcePathB2FBlackthornSide.asm
View File

@ -12,7 +12,7 @@ IcePathB2FBlackthornSideTMRest:
itemball TM_REST
IcePathB2FBlackthornSideHiddenIceHeal:
hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL
IcePathB2FBlackthornSide_MapEvents:
; filler

2
maps/IcePathB2FMahoganySide.asm
View File

@ -23,7 +23,7 @@ IcePathB2FMahoganySideMaxPotion:
itemball MAX_POTION
IcePathB2FMahoganySideHiddenCarbos:
hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS
IcePathB2FMahoganySideBoulderText:
text "It's immovably"

6
maps/IlexForest.asm
View File

@ -414,13 +414,13 @@ IlexForestEther:
itemball ETHER
IlexForestHiddenEther:
hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER
IlexForestHiddenSuperPotion:
hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION
IlexForestHiddenFullHeal:
hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL
IlexForestBoulder:
; unused

6
maps/LakeOfRage.asm
View File

@ -232,13 +232,13 @@ LakeOfRageTMDetect:
itemball TM_DETECT
LakeOfRageHiddenFullRestore:
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE
LakeOfRageHiddenRareCandy:
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
LakeOfRageHiddenMaxPotion:
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
MovementData_0x70155:
teleport_from

2
maps/MountMoonSquare.asm
View File

@ -75,7 +75,7 @@ ClefairyDance:
end
MountMoonSquareHiddenMoonStone:
hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
DontLitterSign:
jumptext DontLitterSignText

2
maps/MountMortar1FInside.asm
View File

@ -64,7 +64,7 @@ MountMortar1FInsideUltraBall:
itemball ULTRA_BALL
MountMortar1FInsideHiddenMaxRepel:
hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
PokemaniacMillerSeenText:
text "I'm not losing"

2
maps/MountMortar1FOutside.asm
View File

@ -16,7 +16,7 @@ MountMortar1FOutsideRevive:
itemball REVIVE
MountMortar1FOutsideHiddenHyperPotion:
hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
MountMortar1FOutside_MapEvents:
; filler

2
maps/MountMortar2FInside.asm
View File

@ -44,7 +44,7 @@ MountMortar2FInsideEscapeRope:
itemball ESCAPE_ROPE
MountMortar2FInsideHiddenFullRestore:
hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
SupernerdHughSeenText:
text "Yo! MARKUS!"

2
maps/MountMortarB1F.asm
View File

@ -72,7 +72,7 @@ MountMortarB1FPPUp:
itemball PP_UP
MountMortarB1FHiddenMaxRevive:
hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE
UnknownText_0x7e24d:
text "Hey!"

2
maps/NationalPark.asm
View File

@ -305,7 +305,7 @@ NationalParkTMDig:
itemball TM_DIG
NationalParkHiddenFullHeal:
hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
NationalParkLassText:
text "Look! Check out my"

2
maps/NationalParkBugContest.asm
View File

@ -115,7 +115,7 @@ NationalParkBugContestTMDig:
itemball TM_DIG
NationalParkBugContestHiddenFullHeal:
hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
UnknownText_0x5c94c:
text "DON: I'm going to"

2
maps/OlivineLighthouse5F.asm
View File

@ -44,7 +44,7 @@ OlivineLighthouse5FTMSwagger:
itemball TM_SWAGGER
OlivineLighthouse5FHiddenHyperPotion:
hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION
SailorErnestSeenText:
text "I wanted to battle"

2
maps/OlivinePort.asm
View File

@ -234,7 +234,7 @@ CooltrainerFScript_0x74a22:
end
OlivinePortHiddenProtein:
hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN
MovementData_0x74a30:
step DOWN

4
maps/RockTunnel1F.asm
View File

@ -16,10 +16,10 @@ RockTunnel1FTMSteelWing:
itemball TM_STEEL_WING
RockTunnel1FHiddenXAccuracy:
hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
RockTunnel1FHiddenXDefend:
hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
RockTunnel1F_MapEvents:
; filler

2
maps/RockTunnelB1F.asm
View File

@ -20,7 +20,7 @@ RockTunnelB1FRevive:
itemball REVIVE
RockTunnelB1FHiddenMaxPotion:
hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
RockTunnelB1F_MapEvents:
; filler

2
maps/Route11.asm
View File

@ -63,7 +63,7 @@ FruitTreeScript_0x68055:
fruittree FRUITTREE_ROUTE_11
Route11HiddenRevive:
hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE
YoungsterOwenSeenText:
text "There's no cheat-"

2
maps/Route12.asm
View File

@ -70,7 +70,7 @@ Route12Nugget:
itemball NUGGET
Route12HiddenElixer:
hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER
FisherMartinSeenText:
text "Patience is the"

2
maps/Route13.asm
View File

@ -77,7 +77,7 @@ Route13DirectionsSign:
jumptext Route13DirectionsSignText
Route13HiddenCalcium:
hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM
PokefanmAlexSeenText:
text "Bow down before my"

4
maps/Route17.asm
View File

@ -62,10 +62,10 @@ TrainerBikerGlenn:
end
Route17HiddenMaxEther:
hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER
Route17HiddenMaxElixer:
hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER
BikerRileySeenText:
text "Hey, you! You're"

8
maps/Route2.asm
View File

@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306:
fruittree FRUITTREE_ROUTE_2
Route2HiddenMaxEther:
hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER
Route2HiddenFullHeal:
hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL
Route2HiddenFullRestore:
hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE
Route2HiddenRevive:
hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE
BugCatcherRobSeenText:
text "My bug #MON are"

2
maps/Route25.asm
View File

@ -191,7 +191,7 @@ Route25Protein:
itemball PROTEIN
Route25HiddenPotion:
hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION
hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION
MovementData_0x19efe8:
big_step DOWN

2
maps/Route28.asm
View File

@ -9,7 +9,7 @@ Route28Sign:
jumptext Route28SignText
Route28HiddenRareCandy:
hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY
Route28SignText:
text "ROUTE 28"

2
maps/Route30.asm
View File

@ -248,7 +248,7 @@ Route30FruitTree2:
fruittree FRUITTREE_ROUTE_30_2
Route30HiddenPotion:
hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION
hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION
Route30_JoeysRattataAttacksMovement:
fix_facing

4
maps/Route32.asm
View File

@ -506,10 +506,10 @@ Route32PokecenterSign:
jumpstd pokecentersign
Route32HiddenGreatBall:
hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL
Route32HiddenSuperPotion:
hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP

4
maps/Route34.asm
View File

@ -488,10 +488,10 @@ Route34Nugget:
itemball NUGGET
Route34HiddenRareCandy:
hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY
Route34HiddenSuperPotion:
hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION
Route34MovementData_DayCareManWalksBackInside:
slow_step LEFT

2
maps/Route37.asm
View File

@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d:
fruittree FRUITTREE_ROUTE_37_3
Route37HiddenEther:
hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"

2
maps/Route39.asm
View File

@ -180,7 +180,7 @@ FruitTreeScript_0x1a5bf4:
fruittree FRUITTREE_ROUTE_39
Route39HiddenNugget:
hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET
Route39MiltankText:
text "MILTANK: Mooo!"

2
maps/Route4.asm
View File

@ -51,7 +51,7 @@ Route4HPUp:
itemball HP_UP
Route4HiddenUltraBall:
hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL
BirdKeeperHankSeenText:
text "I'm raising my"

2
maps/Route40.asm
View File

@ -135,7 +135,7 @@ Route40Rock:
jumpstd smashrock
Route40HiddenHyperPotion:
hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION
MovementData_0x1a621c:
step RIGHT

2
maps/Route41.asm
View File

@ -132,7 +132,7 @@ Route41Rock:
jumpstd smashrock
Route41HiddenMaxEther:
hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER
SwimmermCharlieSeenText:
text "The water's warm"

2
maps/Route42.asm
View File

@ -212,7 +212,7 @@ FruitTreeScript_0x1a9351:
fruittree FRUITTREE_ROUTE_42_3
Route42HiddenMaxPotion:
hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION
MovementData_0x1a9356:
set_sliding

2
maps/Route44.asm
View File

@ -318,7 +318,7 @@ Route44MaxRepel:
itemball MAX_REPEL
Route44HiddenElixer:
hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER
FisherWilton1SeenText:
text "Aack! You made me"

2
maps/Route45.asm
View File

@ -312,7 +312,7 @@ Route45MaxPotion:
itemball MAX_POTION
Route45HiddenPpUp:
hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP
HikerErikSeenText:
text "Be prepared for"

2
maps/Route9.asm
View File

@ -83,7 +83,7 @@ Route9Sign:
jumptext Route9SignText
Route9HiddenEther:
hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER
CamperDeanSeenText:
text "I came to explore"

2
maps/SilverCaveOutside.asm
View File

@ -17,7 +17,7 @@ MtSilverSign:
jumptext MtSilverSignText
SilverCaveOutsideHiddenFullRestore:
hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
MtSilverSignText:
text "MT.SILVER"

4
maps/SilverCaveRoom1.asm
View File

@ -24,10 +24,10 @@ SilverCaveRoom1UltraBall:
itemball ULTRA_BALL
SilverCaveRoom1HiddenDireHit:
hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT
SilverCaveRoom1HiddenUltraBall:
hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL
SilverCaveRoom1_MapEvents:
; filler

2
maps/SilverCaveRoom2.asm
View File

@ -20,7 +20,7 @@ SilverCaveRoom2PPUp:
itemball PP_UP
SilverCaveRoom2HiddenMaxPotion:
hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION
SilverCaveRoom2_MapEvents:
; filler

2
maps/TeamRocketBaseB1F.asm
View File

@ -540,7 +540,7 @@ TeamRocketBaseB1FGuardSpec:
itemball GUARD_SPEC
TeamRocketBaseB1FHiddenRevive:
hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE
SecurityCameraMovement1:
big_step RIGHT

2
maps/TeamRocketBaseB2F.asm
View File

@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief:
itemball TM_THIEF
TeamRocketBaseB2FHiddenFullHeal:
hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
MovementData_0x6d212:
step RIGHT

2
maps/TinTower4F.asm
View File

@ -20,7 +20,7 @@ TinTower4FEscapeRope:
itemball ESCAPE_ROPE
TinTower4FHiddenMaxPotion:
hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
TinTower4F_MapEvents:
; filler

4
maps/TinTower5F.asm
View File

@ -12,10 +12,10 @@ TinTower5FRareCandy:
itemball RARE_CANDY
TinTower5FHiddenFullRestore:
hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
TinTower5FHiddenCarbos:
hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
TinTower5F_MapEvents:
; filler

4
maps/UndergroundPath.asm
View File

@ -6,10 +6,10 @@ UndergroundPath_MapScripts:
db 0
UndergroundPathHiddenFullRestore:
hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
UndergroundPathHiddenXSpecial:
hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
UndergroundPath_MapEvents:
; filler

2
maps/VermilionCity.asm
View File

@ -123,7 +123,7 @@ VermilionCityMartSign:
jumpstd martsign
VermilionCityHiddenFullHeal:
hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL
VermilionCityTeacherText:
text "VERMILION PORT is"

2
maps/VermilionPort.asm
View File

@ -195,7 +195,7 @@ SuperNerdScript_0x74ee6:
end
VermilionPortHiddenIron:
hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON
MovementData_0x74ef1:
step DOWN

4
maps/VictoryRoad.asm
View File

@ -112,10 +112,10 @@ VictoryRoadHPUp:
itemball HP_UP
VictoryRoadHiddenMaxPotion:
hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION
VictoryRoadHiddenFullHeal:
hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL
MovementData_0x74539:
step LEFT

2
maps/VioletCity.asm
View File

@ -98,7 +98,7 @@ VioletCityFruitTreeScript:
fruittree FRUITTREE_VIOLET_CITY
VioletCityHiddenHyperPotion:
hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION
VioletCityFollowEarl_MovementData:
big_step DOWN

6
maps/WhirlIslandB1F.asm
View File

@ -32,13 +32,13 @@ WhirlIslandB1FBoulder:
jumpstd strengthboulder
WhirlIslandB1FHiddenRareCandy:
hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY
WhirlIslandB1FHiddenUltraBall:
hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL
WhirlIslandB1FHiddenFullRestore:
hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE
WhirlIslandB1F_MapEvents:
; filler