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,11 +1,11 @@
object_const_def ; object_event constants
object_const_def
const POKECENTER2F_TRADE_RECEPTIONIST
const POKECENTER2F_BATTLE_RECEPTIONIST
const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
const POKECENTER2F_OFFICER
Pokecenter2F_MapScripts:
db 6 ; scene scripts
def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM
@@ -13,7 +13,7 @@ Pokecenter2F_MapScripts:
scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
db 0 ; callbacks
def_callbacks
.Scene0:
special CheckMysteryGift
@@ -1023,7 +1023,7 @@ Text_BrokeStadiumRules:
Pokecenter2F_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
def_warp_events
warp_event 0, 7, POKECENTER_2F, -1
warp_event 5, 0, TRADE_CENTER, 1
warp_event 9, 0, COLOSSEUM, 1
@@ -1031,12 +1031,12 @@ Pokecenter2F_MapEvents:
warp_event 6, 0, MOBILE_TRADE_ROOM, 1
warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 7, 3, BGEVENT_READ, Pokecenter2FLinkRecordSign
db 4 ; object events
def_object_events
object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1