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/GoldenrodUndergroundWarehouse.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
@@ -8,9 +8,9 @@
const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
GoldenrodUndergroundWarehouse_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches
.ResetSwitches:
@@ -211,16 +211,16 @@ DirectorAfterText:
GoldenrodUndergroundWarehouse_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 7 ; object events
def_object_events
object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER