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

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const BATTLETOWERBATTLEROOM_YOUNGSTER
const BATTLETOWERBATTLEROOM_RECEPTIONIST
BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .EnterBattleRoom ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -139,14 +139,14 @@ Text_ReturnedAfterSave_Mobile:
BattleTowerBattleRoom_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 2 ; object events
def_object_events
object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1