pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues 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/TeamRocketBaseB1F.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const TEAMROCKETBASEB1F_ROCKET1
const TEAMROCKETBASEB1F_ROCKET2
const TEAMROCKETBASEB1F_SCIENTIST
@@ -7,10 +7,10 @@
const TEAMROCKETBASEB1F_POKE_BALL3
TeamRocketBaseB1F_MapScripts:
db 1 ; scene scripts
def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
.DummyScene:
@@ -727,13 +727,13 @@ TeamRocketBaseB1FSwitchOffText:
TeamRocketBaseB1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 27, 2, MAHOGANY_MART_1F, 3
warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1
warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4
warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3
db 30 ; coord events
def_coord_events
; There are five security cameras in the base.
; Walking in front of one triggers two Rocket Grunts.
coord_event 24, 2, SCENE_DEFAULT, SecurityCamera1a
@@ -769,7 +769,7 @@ TeamRocketBaseB1F_MapEvents:
coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21
coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
db 9 ; bg events
def_bg_events
bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch
bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
@@ -780,7 +780,7 @@ TeamRocketBaseB1F_MapEvents:
bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf
bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
db 6 ; object events
def_object_events
object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION