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

@@ -1,7 +1,7 @@
GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE EQU 500
GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300
object_const_def ; object_event constants
object_const_def
const GOLDENRODUNDERGROUND_SUPER_NERD1
const GOLDENRODUNDERGROUND_SUPER_NERD2
const GOLDENRODUNDERGROUND_SUPER_NERD3
@@ -13,9 +13,9 @@ GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300
const GOLDENRODUNDERGROUND_GRANNY
GoldenrodUnderground_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 3 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches
callback MAPCALLBACK_TILES, .CheckBasementKey
callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
@@ -650,7 +650,7 @@ GoldenrodUndergroundNoEntryText:
GoldenrodUnderground_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
def_warp_events
warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
warp_event 18, 6, GOLDENROD_UNDERGROUND, 4
@@ -658,16 +658,16 @@ GoldenrodUnderground_MapEvents:
warp_event 22, 31, GOLDENROD_UNDERGROUND, 3
warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1
db 0 ; coord events
def_coord_events
db 5 ; bg events
def_bg_events
bg_event 18, 6, BGEVENT_READ, BasementDoorScript
bg_event 19, 6, BGEVENT_READ, GoldenrodUndergroundNoEntrySign
bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
db 9 ; object events
def_object_events
object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1