Game-Decompilation/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2024-11-30 16:51:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-13 00:47:38 -05:00
parent d054116458
commit 5a3822fe86
127 changed files with 245 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/map_scripts.md
View File

@ -16,7 +16,7 @@
## `.MapCallbacks: db` *N*
- **`dbw` *type*, *script***
- **`callback` *type*, *script***
Callback types:
@ -30,11 +30,21 @@ Callback types:
- **`MAPCALLBACK_CMDQUEUE`**
**`dbw CMDQUEUE_STONETABLE,` *table_pointer***
**`stonetable` *warp_id*, *person*, *script***
**`db -1 ; end`**
<!-- need pre tags here; can't use inline bold/italic formatting in Markdown code blocks -->
<pre>
callback MAPCALLBACK_CMDQUEUE, .Boulders
.Boulders:
writecmdqueue .BoulderCmdQueue
return
.BoulderCmdQueue:
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable
.BoulderTable:
stonetable <i>warp_id</i>, <i>person</i>, <i>script</i>
db -1 ; end
</pre>
## Event scripts
@ -54,8 +64,10 @@ Callback types:
## `MapName_MapEventHeader:`
```asm
; filler
db 0, 0
```
## `.Warps: db` *N*
@ -80,11 +92,11 @@ BG event types:
- **`BGEVENT_IFSET/IFNOTSET`**
**`dw` *event_flag*, *script***
**`conditional_event` *event_flag*, *script***
- **`BGEVENT_ITEM`**
**`dwb` *event_flag*, *item_id***
**`hiddenitem` *event_flag*, *item_id***
- **`BGEVENT_COPY`**

33
macros/scripts/maps.asm
View File

@ -9,6 +9,12 @@ scene_script: MACRO
dw \1, 0
ENDM
callback: MACRO
;\1: type: a MAPCALLBACK_* constant
;\2: script pointer
dbw \1, \2
ENDM
warp_def: MACRO
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
@ -23,9 +29,10 @@ coord_event: MACRO
;\2: y: top to bottom, starts at 0
;\3: scene id: controlled by setscene/setmapscene
;\4: script pointer
db \3, \2, \1, $0
db \3, \2, \1
db 0 ; filler
dw \4
db $0, $0
db 0, 0 ; filler
ENDM
bg_event: MACRO
@ -91,6 +98,12 @@ else
endc
ENDM
hiddenitem: MACRO
;\1: flag: an EVENT_* constant
;\2: item: from constants/item_constants.asm
dwb \1, \2
ENDM
elevfloor: MACRO
;\1: floor: a FLOOR_* constant
;\2: warp destination: starts at 1
@ -99,10 +112,22 @@ elevfloor: MACRO
map \3
ENDM
conditional_event: MACRO
;\1: flag: an EVENT_* constant
;\2: script pointer
dw \1, \2
ENDM
cmdqueue: MACRO
;\1: type: a CMDQUEUE_* constant
;\2: data pointer
dbw \1, \2
dw 0 ; filler
ENDM
stonetable: MACRO
;\1: warp id
;\2: object_event id
;\3: script pointer
db \1, \2
dw \3
dbbw \1, \2, \3
ENDM

4
maps/AzaleaTown.asm
View File

@ -21,7 +21,7 @@ AzaleaTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .Flypoint
callback MAPCALLBACK_NEWMAP, .Flypoint
.DummyScene0:
end
@ -211,7 +211,7 @@ WhiteApricornTree:
fruittree FRUITTREE_AZALEA_TOWN
AzaleaTownHiddenFullHeal:
dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
AzaleaTownRivalBattleApproachMovement1:
step LEFT

4
maps/BattleTowerOutside.asm
View File

@ -10,8 +10,8 @@ BattleTowerOutside_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_TILES, .Callback1
dbw MAPCALLBACK_OBJECTS, .Callback2
callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2
.Callback1:
return

4
maps/BlackthornCity.asm
View File

@ -15,8 +15,8 @@ BlackthornCity_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Santos
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Santos
.FlyPoint:
setflag ENGINE_FLYPOINT_BLACKTHORN

2
maps/BlackthornGym1F.asm
View File

@ -11,7 +11,7 @@ BlackthornGym1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .Boulders
callback MAPCALLBACK_TILES, .Boulders
.Boulders:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1

5
maps/BlackthornGym2F.asm
View File

@ -14,15 +14,14 @@ BlackthornGym2F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_CMDQUEUE, .Boulders
callback MAPCALLBACK_CMDQUEUE, .Boulders
.Boulders:
writecmdqueue .BoulderCmdQueue
return
.BoulderCmdQueue:
dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp
dw 0 ; filler
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp
.BoulderTable:
stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4

2
maps/BrunosRoom.asm
View File

@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .BrunosRoomDoors
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
priorityjump .BrunosDoorLocksBehindYou

6
maps/BurnedTower1F.asm
View File

@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HoleAndLadder
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
priorityjump .MeetEusine
@ -131,10 +131,10 @@ BurnedTower1FRock:
jumpstd smashrock
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
BurnedTower1FHPUp:
itemball HP_UP

2
maps/BurnedTowerB1F.asm
View File

@ -17,7 +17,7 @@ BurnedTowerB1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .LadderCallback
callback MAPCALLBACK_TILES, .LadderCallback
.DummyScene0:
end

4
maps/CeladonCity.asm
View File

@ -15,7 +15,7 @@ CeladonCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_CELADON
@ -75,7 +75,7 @@ CeladonCityPokecenterSign:
jumpstd pokecentersign
CeladonCityHiddenPpUp:
dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
CeladonCityFisherText:
text "This POLIWRATH is"

2
maps/CeladonDeptStore6F.asm
View File

@ -8,7 +8,7 @@ CeladonDeptStore6F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .Callback
callback MAPCALLBACK_TILES, .Callback
.Callback:
changeblock 12, 0, $03

4
maps/CeruleanCity.asm
View File

@ -12,7 +12,7 @@ CeruleanCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_CERULEAN
@ -147,7 +147,7 @@ CeruleanCityMartSign:
jumpstd martsign
CeruleanCityHiddenBerserkGene:
dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
CeruleanCityCooltrainerMText1:
text "KANTO's POWER"

2
maps/CeruleanGym.asm
View File

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

2
maps/CherrygroveCity.asm
View File

@ -13,7 +13,7 @@ CherrygroveCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
end

6
maps/CianwoodCity.asm
View File

@ -20,7 +20,7 @@ CianwoodCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.DummyScene0:
end
@ -145,10 +145,10 @@ CianwoodCityRock:
jumpstd smashrock
CianwoodCityHiddenRevive:
dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
CianwoodCityHiddenMaxEther:
dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
MovementData_0x1a00da:
set_sliding

4
maps/CinnabarIsland.asm
View File

@ -7,7 +7,7 @@ CinnabarIsland_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_CINNABAR
@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign:
jumpstd pokecentersign
CinnabarIslandHiddenRareCandy:
dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
CinnabarIslandBlueTeleport:
teleport_from

4
maps/Colosseum.asm
View File

@ -11,8 +11,8 @@ Colosseum_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_OBJECTS, .SetWhichChris
dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F
callback MAPCALLBACK_OBJECTS, .SetWhichChris
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
.InitializeColosseum:
priorityjump .InitializeAndPreparePokecenter2F

2
maps/CopycatsHouse2F.asm
View File

@ -12,7 +12,7 @@ CopycatsHouse2F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .Callback
callback MAPCALLBACK_OBJECTS, .Callback
.Callback:
checkflag ENGINE_PLAYER_IS_FEMALE

2
maps/DarkCaveVioletEntrance.asm
View File

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

2
maps/DayCare.asm
View File

@ -8,7 +8,7 @@ DayCare_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
callback MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG

2
maps/DiglettsCave.asm
View File

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

8
maps/DragonsDenB1F.asm
View File

@ -17,7 +17,7 @@ DragonsDenB1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .CheckSilver
callback MAPCALLBACK_NEWMAP, .CheckSilver
.DummyScene0:
end
@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer:
itemball MAX_ELIXER
DragonsDenB1FHiddenRevive:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
DragonsDenB1FHiddenMaxPotion:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
DragonsDenB1FHiddenMaxElixer:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
MovementDragonsDen_ClairWalksToYou:
slow_step RIGHT

4
maps/EcruteakCity.asm
View File

@ -13,7 +13,7 @@ EcruteakCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_ECRUTEAK
@ -88,7 +88,7 @@ EcruteakCityMartSign:
jumpstd martsign
EcruteakCityHiddenHyperPotion:
dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
UnusedMissingDaughterText:
; This text is neither used nor referenced in the final game.

2
maps/EcruteakHouse.asm
View File

@ -12,7 +12,7 @@ EcruteakHouse_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .InitializeSages
callback MAPCALLBACK_OBJECTS, .InitializeSages
.DummyScene0:
end

2
maps/ElmsLab.asm
View File

@ -18,7 +18,7 @@ ElmsLab_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .MoveElmCallback
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
.MeetElm:
priorityjump .WalkUpToElm

2
maps/FuchsiaCity.asm
View File

@ -10,7 +10,7 @@ FuchsiaCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_FUCHSIA

4
maps/GoldenrodCity.asm
View File

@ -21,8 +21,8 @@ GoldenrodCity_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria
dbw MAPCALLBACK_OBJECTS, .MoveTutor
callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
callback MAPCALLBACK_OBJECTS, .MoveTutor
.FlyPointAndFloria:
setflag ENGINE_FLYPOINT_GOLDENROD

2
maps/GoldenrodDeptStore5F.asm
View File

@ -12,7 +12,7 @@ GoldenrodDeptStore5F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .CheckIfSunday
callback MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday:
checkcode VAR_WEEKDAY

4
maps/GoldenrodDeptStoreB1F.asm
View File

@ -14,8 +14,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_TILES, UnknownScript_0x7d781
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
callback MAPCALLBACK_TILES, UnknownScript_0x7d781
callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
UnknownScript_0x7d781:
checkevent EVENT_RECEIVED_CARD_KEY

4
maps/GoldenrodDeptStoreRoof.asm
View File

@ -14,8 +14,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock
dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
callback MAPCALLBACK_TILES, .CheckSaleChangeBlock
callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
.CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON

2
maps/GoldenrodGameCorner.asm
View File

@ -18,7 +18,7 @@ GoldenrodGameCorner_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .Callback
callback MAPCALLBACK_OBJECTS, .Callback
.Callback:
checkevent EVENT_BEAT_ELITE_FOUR

12
maps/GoldenrodUnderground.asm
View File

@ -15,9 +15,9 @@ GoldenrodUnderground_MapScriptHeader:
.MapCallbacks:
db 3
dbw MAPCALLBACK_NEWMAP, .ResetSwitches
dbw MAPCALLBACK_TILES, .CheckBasementKey
dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek
callback MAPCALLBACK_NEWMAP, .ResetSwitches
callback MAPCALLBACK_TILES, .CheckBasementKey
callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
.ResetSwitches:
clearevent EVENT_SWITCH_1
@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script:
jumptext UnknownText_0x7c91a
GoldenrodUndergroundHiddenParlyzHeal:
dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
GoldenrodUndergroundHiddenSuperPotion:
dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
GoldenrodUndergroundHiddenAntidote:
dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
SupernerdEricSeenText:
text "I got booted out"

6
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -51,7 +51,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .UpdateDoorPositions
callback MAPCALLBACK_TILES, .UpdateDoorPositions
.DummyScene0:
end
@ -630,10 +630,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
itemball FULL_HEAL
GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
UndergroundSilverApproachMovement1:
step DOWN

2
maps/GoldenrodUndergroundWarehouse.asm
View File

@ -13,7 +13,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .ResetSwitches
callback MAPCALLBACK_NEWMAP, .ResetSwitches
.ResetSwitches:
clearevent EVENT_SWITCH_1

7
maps/IcePathB1F.asm
View File

@ -11,15 +11,14 @@ IcePathB1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.SetUpStoneTable:
writecmdqueue .CommandQueue
return
.CommandQueue:
dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
dw 0 ; filler
cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
.StoneTable:
stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1
@ -69,7 +68,7 @@ IcePathB1FIron:
itemball IRON
IcePathB1FHiddenMaxPotion:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
IcePathBoulderFellThroughText:
text "The boulder fell"

2
maps/IcePathB2FBlackthornSide.asm
View File

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

2
maps/IcePathB2FMahoganySide.asm
View File

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

8
maps/IlexForest.asm
View File

@ -17,7 +17,7 @@ IlexForest_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback
callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
.FarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT
@ -414,13 +414,13 @@ IlexForestEther:
itemball ETHER
IlexForestHiddenEther:
dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
IlexForestHiddenSuperPotion:
dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
IlexForestHiddenFullHeal:
dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
IlexForestBoulder:
; unused

2
maps/IndigoPlateauPokecenter1F.asm
View File

@ -13,7 +13,7 @@ IndigoPlateauPokecenter1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .PrepareElite4
callback MAPCALLBACK_NEWMAP, .PrepareElite4
.DummyScene:
end

2
maps/KarensRoom.asm
View File

@ -9,7 +9,7 @@ KarensRoom_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .KarensRoomDoors
callback MAPCALLBACK_TILES, .KarensRoomDoors
.LockDoor:
priorityjump .KarensDoorLocksBehindYou

2
maps/KogasRoom.asm
View File

@ -9,7 +9,7 @@ KogasRoom_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .KogasRoomDoors
callback MAPCALLBACK_TILES, .KogasRoomDoors
.LockDoor:
priorityjump .KogasDoorLocksBehindYou

11
maps/KrissHouse2F.asm
View File

@ -10,9 +10,10 @@ KrissHouse2F_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .InitializeRoom
dbw MAPCALLBACK_TILES, .SetSpawn
callback MAPCALLBACK_NEWMAP, .InitializeRoom
callback MAPCALLBACK_TILES, .SetSpawn
; unused
.Null:
end
@ -20,11 +21,11 @@ KrissHouse2F_MapScriptHeader:
special ToggleDecorationsVisibility
setevent EVENT_IN_YOUR_ROOM
checkevent EVENT_INITIALIZED_EVENTS
iftrue .SkipInizialization
iftrue .SkipInitialization
jumpstd initializeevents
return
.SkipInizialization:
.SkipInitialization:
return
.SetSpawn:
@ -46,7 +47,7 @@ GameConsole:
describedecoration DECODESC_CONSOLE
KrissHousePoster:
dw EVENT_KRISS_ROOM_POSTER, .Script
conditional_event EVENT_KRISS_ROOM_POSTER, .Script
.Script:
describedecoration DECODESC_POSTER

2
maps/KurtsHouse.asm
View File

@ -11,7 +11,7 @@ KurtsHouse_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .KurtCallback
callback MAPCALLBACK_OBJECTS, .KurtCallback
.KurtCallback:
checkevent EVENT_CLEARED_SLOWPOKE_WELL

10
maps/LakeOfRage.asm
View File

@ -20,8 +20,8 @@ LakeOfRage_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Wesley
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Wesley
.DummyScene0:
end
@ -232,13 +232,13 @@ LakeOfRageTMDetect:
itemball TM_DETECT
LakeOfRageHiddenFullRestore:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
LakeOfRageHiddenRareCandy:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
LakeOfRageHiddenMaxPotion:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
MovementData_0x70155:
teleport_from

2
maps/LancesRoom.asm
View File

@ -11,7 +11,7 @@ LancesRoom_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .LancesRoomDoors
callback MAPCALLBACK_TILES, .LancesRoomDoors
.LockDoor:
priorityjump .LancesDoorLocksBehindYou

2
maps/LavenderTown.asm
View File

@ -10,7 +10,7 @@ LavenderTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_LAVENDER

2
maps/MahoganyMart1F.asm
View File

@ -13,7 +13,7 @@ MahoganyMart1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
.DummyScene0:
end

2
maps/MahoganyTown.asm
View File

@ -12,7 +12,7 @@ MahoganyTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
end

6
maps/MountMoonSquare.asm
View File

@ -10,8 +10,8 @@ MountMoonSquare_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone
dbw MAPCALLBACK_OBJECTS, .DisappearRock
callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
callback MAPCALLBACK_OBJECTS, .DisappearRock
.DummyScene:
end
@ -75,7 +75,7 @@ ClefairyDance:
end
MountMoonSquareHiddenMoonStone:
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
DontLitterSign:
jumptext DontLitterSignText

2
maps/MountMortar1FInside.asm
View File

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

2
maps/MountMortar1FOutside.asm
View File

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

2
maps/MountMortar2FInside.asm
View File

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

2
maps/MountMortarB1F.asm
View File

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

2
maps/NationalPark.asm
View File

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

2
maps/NationalParkBugContest.asm
View File

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

2
maps/NewBarkTown.asm
View File

@ -11,7 +11,7 @@ NewBarkTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
end

2
maps/OlivineCity.asm
View File

@ -12,7 +12,7 @@ OlivineCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
end

2
maps/OlivineLighthouse5F.asm
View File

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

2
maps/OlivinePort.asm
View File

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

2
maps/PalletTown.asm
View File

@ -8,7 +8,7 @@ PalletTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_PALLET

2
maps/PewterCity.asm
View File

@ -11,7 +11,7 @@ PewterCity_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_PEWTER

2
maps/RadioTower3F.asm
View File

@ -13,7 +13,7 @@ RadioTower3F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .CardKeyShutterCallback
callback MAPCALLBACK_TILES, .CardKeyShutterCallback
.CardKeyShutterCallback:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER

4
maps/RockTunnel1F.asm
View File

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

2
maps/RockTunnelB1F.asm
View File

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

2
maps/Route11.asm
View File

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

2
maps/Route12.asm
View File

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

2
maps/Route13.asm
View File

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

2
maps/Route16.asm
View File

@ -4,7 +4,7 @@ Route16_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
checkcode VAR_YCOORD

6
maps/Route17.asm
View File

@ -10,7 +10,7 @@ Route17_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
setflag ENGINE_ALWAYS_ON_BIKE
@ -62,10 +62,10 @@ TrainerBikerGlenn:
end
Route17HiddenMaxEther:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
Route17HiddenMaxElixer:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
BikerRileySeenText:
text "Hey, you! You're"

2
maps/Route19.asm
View File

@ -12,7 +12,7 @@ Route19_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .ClearRocks
callback MAPCALLBACK_TILES, .ClearRocks
.ClearRocks:
checkevent EVENT_CINNABAR_ROCKS_CLEARED

8
maps/Route2.asm
View File

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

2
maps/Route20.asm
View File

@ -9,7 +9,7 @@ Route20_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .ClearRocks
callback MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks:
setevent EVENT_CINNABAR_ROCKS_CLEARED

2
maps/Route23.asm
View File

@ -4,7 +4,7 @@ Route23_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU

2
maps/Route25.asm
View File

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

2
maps/Route28.asm
View File

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

2
maps/Route29.asm
View File

@ -16,7 +16,7 @@ Route29_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .Tuscany
callback MAPCALLBACK_OBJECTS, .Tuscany
.DummyScene0:
end

2
maps/Route30.asm
View File

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

2
maps/Route31.asm
View File

@ -13,7 +13,7 @@ Route31_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .CheckMomCall
callback MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST

6
maps/Route32.asm
View File

@ -23,7 +23,7 @@ Route32_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .Frieda
callback MAPCALLBACK_OBJECTS, .Frieda
.DummyScene0:
end
@ -506,10 +506,10 @@ Route32PokecenterSign:
jumpstd pokecentersign
Route32HiddenGreatBall:
dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
Route32HiddenSuperPotion:
dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP

6
maps/Route34.asm
View File

@ -19,7 +19,7 @@ Route34_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
callback MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
@ -488,10 +488,10 @@ Route34Nugget:
itemball NUGGET
Route34HiddenRareCandy:
dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
Route34HiddenSuperPotion:
dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
Route34MovementData_DayCareManWalksBackInside:
slow_step LEFT

2
maps/Route34IlexForestGate.asm
View File

@ -10,7 +10,7 @@ Route34IlexForestGate_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .IsForestRestless
callback MAPCALLBACK_OBJECTS, .IsForestRestless
.IsForestRestless:
checkevent EVENT_FOREST_IS_RESTLESS

4
maps/Route35NationalParkGate.asm
View File

@ -12,8 +12,8 @@ Route35NationalParkGate_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.DummyScene0:
end

2
maps/Route36.asm
View File

@ -17,7 +17,7 @@ Route36_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .ArthurCallback
callback MAPCALLBACK_OBJECTS, .ArthurCallback
.DummyScene0:
end

4
maps/Route36NationalParkGate.asm
View File

@ -21,8 +21,8 @@ Route36NationalParkGate_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.DummyScene0:
end

4
maps/Route37.asm
View File

@ -13,7 +13,7 @@ Route37_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .Sunny
callback MAPCALLBACK_OBJECTS, .Sunny
.Sunny:
checkcode VAR_WEEKDAY
@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d:
fruittree FRUITTREE_ROUTE_37_3
Route37HiddenEther:
dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"

2
maps/Route39.asm
View File

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

2
maps/Route4.asm
View File

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

4
maps/Route40.asm
View File

@ -18,7 +18,7 @@ Route40_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .MonicaCallback
callback MAPCALLBACK_OBJECTS, .MonicaCallback
.MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
@ -135,7 +135,7 @@ Route40Rock:
jumpstd smashrock
Route40HiddenHyperPotion:
dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
MovementData_0x1a621c:
step RIGHT

2
maps/Route40BattleTowerGate.asm
View File

@ -8,7 +8,7 @@ Route40BattleTowerGate_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .ShowSailor
callback MAPCALLBACK_OBJECTS, .ShowSailor
.ShowSailor:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR

2
maps/Route41.asm
View File

@ -132,7 +132,7 @@ Route41Rock:
jumpstd smashrock
Route41HiddenMaxEther:
dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER
hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, 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:
dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
MovementData_0x1a9356:
set_sliding

2
maps/Route43.asm
View File

@ -14,7 +14,7 @@ Route43_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .CheckIfRockets
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.CheckIfRockets:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT

2
maps/Route43Gate.asm
View File

@ -13,7 +13,7 @@ Route43Gate_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .CheckIfRockets
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.RocketShakedown:
priorityjump .RocketTakeover

2
maps/Route44.asm
View File

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

2
maps/Route45.asm
View File

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

2
maps/Route9.asm
View File

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

2
maps/RuinsOfAlphAerodactylChamber.asm
View File

@ -6,7 +6,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HiddenDoors
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER

2
maps/RuinsOfAlphHoOhChamber.asm
View File

@ -6,7 +6,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HiddenDoors
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
special SpecialHoOhChamber

2
maps/RuinsOfAlphKabutoChamber.asm
View File

@ -10,7 +10,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HiddenDoors
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER

Some files were not shown because too many files have changed in this diff Show More