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,13 +1,13 @@
ROUTE39FARMHOUSE_MILK_PRICE EQU 500
object_const_def ; object_event constants
object_const_def
const ROUTE39FARMHOUSE_POKEFAN_M
const ROUTE39FARMHOUSE_POKEFAN_F
Route39Farmhouse_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
PokefanM_DairyFarmer:
faceplayer
@@ -195,16 +195,16 @@ FarmerFText_SnoreSpeech:
Route39Farmhouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, ROUTE_39, 2
warp_event 3, 7, ROUTE_39, 2
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
db 2 ; object events
def_object_events
object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1