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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const TEAMROCKETBASEB2F_ROCKET1
const TEAMROCKETBASEB2F_ROCKET_GIRL
const TEAMROCKETBASEB2F_LANCE
@@ -15,13 +15,13 @@
const TEAMROCKETBASEB2F_POKE_BALL
TeamRocketBaseB2F_MapScripts:
db 4 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES
scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .TransmitterDoorCallback
.DummyScene0:
@@ -909,14 +909,14 @@ RocketBaseB2FDeactivateTransmitterText:
TeamRocketBaseB2F_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
def_warp_events
warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
db 9 ; coord events
def_coord_events
coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft
@@ -927,7 +927,7 @@ TeamRocketBaseB2F_MapEvents:
coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
db 23 ; bg events
def_bg_events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
@@ -952,7 +952,7 @@ TeamRocketBaseB2F_MapEvents:
bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
db 14 ; object events
def_object_events
object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE