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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const BRUNOSROOM_BRUNO
BrunosRoom_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
@@ -125,15 +125,15 @@ BrunoScript_BrunoDefeatText:
BrunosRoom_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 4, 17, KOGAS_ROOM, 3
warp_event 5, 17, KOGAS_ROOM, 4
warp_event 4, 2, KARENS_ROOM, 1
warp_event 5, 2, KARENS_ROOM, 2
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1