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

@@ -2,14 +2,14 @@ CELADONDEPTSTORE6F_FRESH_WATER_PRICE EQU 200
CELADONDEPTSTORE6F_SODA_POP_PRICE EQU 300
CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350
object_const_def ; object_event constants
object_const_def
const CELADONDEPTSTORE6F_SUPER_NERD
const CELADONDEPTSTORE6F_YOUNGSTER
CeladonDeptStore6F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .HideRooftopStairs
.HideRooftopStairs:
@@ -150,13 +150,13 @@ CeladonDeptStore6FDirectoryText:
CeladonDeptStore6F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 15, 0, CELADON_DEPT_STORE_5F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
def_coord_events
db 6 ; bg events
def_bg_events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
@@ -164,6 +164,6 @@ CeladonDeptStore6F_MapEvents:
bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
db 2 ; object events
def_object_events
object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1