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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
@@ -8,9 +8,9 @@
const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
FastShipCabins_NNW_NNE_NE_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerCooltrainermSean:
trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
@@ -267,19 +267,19 @@ BurglarCoreyAfterBattleText:
FastShipCabins_NNW_NNE_NE_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 2, 0, FAST_SHIP_1F, 2
warp_event 2, 12, FAST_SHIP_1F, 3
warp_event 2, 24, FAST_SHIP_1F, 4
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
db 7 ; object events
def_object_events
object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND