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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const TRAINERHOUSE1F_RECEPTIONIST
const TRAINERHOUSE1F_COOLTRAINER_M
const TRAINERHOUSE1F_COOLTRAINER_F
@@ -6,9 +6,9 @@
const TRAINERHOUSE1F_GENTLEMAN
TrainerHouse1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerHouse1FReceptionistScript:
jumptextfaceplayer TrainerHouse1FReceptionistText
@@ -138,19 +138,19 @@ TrainerHouseIllegibleText:
TrainerHouse1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 2, 13, VIRIDIAN_CITY, 3
warp_event 3, 13, VIRIDIAN_CITY, 3
warp_event 8, 2, TRAINER_HOUSE_B1F, 1
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 5, 0, BGEVENT_READ, TrainerHouseSign1
bg_event 7, 0, BGEVENT_READ, TrainerHouseSign2
bg_event 7, 10, BGEVENT_READ, TrainerHouseIllegibleBook
db 5 ; object events
def_object_events
object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1