Use def_* macros for automatic map event counts

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

View File

@@ -1,17 +1,17 @@
MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300
object_const_def ; object_event constants
object_const_def
const MAHOGANYTOWN_POKEFAN_M
const MAHOGANYTOWN_GRAMPS
const MAHOGANYTOWN_FISHER
const MAHOGANYTOWN_LASS
MahoganyTown_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_NEWMAP, .FlyPoint
.DummyScene0:
@@ -247,24 +247,24 @@ MahoganyGymSignText:
MahoganyTown_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
def_warp_events
warp_event 11, 7, MAHOGANY_MART_1F, 1
warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
warp_event 6, 13, MAHOGANY_GYM, 1
warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1
warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
db 2 ; coord events
def_coord_events
coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
db 4 ; bg events
def_bg_events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
db 4 ; object events
def_object_events
object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1
object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM