Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use def_* macros for automatic map event counts

Browse Source 
Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@@ -31,7 +31,7 @@ doorstate: MACRO
changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
ENDM
object_const_def ; object_event constants
object_const_def
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
@@ -45,11 +45,11 @@ ENDM
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions
.DummyScene0:
@@ -931,7 +931,7 @@ SwitchRoomText_Emergency:
GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
db 0, 0 ; filler
db 9 ; warp events
def_warp_events
warp_event 23, 3, GOLDENROD_UNDERGROUND, 6
warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1
warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2
@@ -942,11 +942,11 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
warp_event 20, 29, GOLDENROD_CITY, 13
warp_event 21, 29, GOLDENROD_CITY, 13
db 2 ; coord events
def_coord_events
coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1
coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2
db 6 ; bg events
def_bg_events
bg_event 16, 1, BGEVENT_READ, Switch1Script
bg_event 10, 1, BGEVENT_READ, Switch2Script
bg_event 2, 1, BGEVENT_READ, Switch3Script
@@ -954,7 +954,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
db 11 ; object events
def_object_events
object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER