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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const MAHOGANYMART1F_PHARMACIST
const MAHOGANYMART1F_BLACK_BELT
const MAHOGANYMART1F_LANCE
@@ -6,11 +6,11 @@
const MAHOGANYMART1F_GRANNY
MahoganyMart1F_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING
scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
.DummyScene0:
@@ -221,16 +221,16 @@ MahoganyMart1FLanceSplitUpText:
MahoganyMart1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 3, 7, MAHOGANY_TOWN, 1
warp_event 4, 7, MAHOGANY_TOWN, 1
warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 5 ; object events
def_object_events
object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE