aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SilphCo5F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2023-11-20 00:33:27 -0600
committerdannye <33dannye@gmail.com>2023-11-20 20:23:27 -0600
commit298e99d3776580585c3f434e5d93137ae431bdd3 (patch)
treea808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/SilphCo5F.asm
parentAdd sound bits documentation for wOptions (#110) (diff)
parentName 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff)
downloadpokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/SilphCo5F.asm')
-rw-r--r--data/maps/objects/SilphCo5F.asm35
1 files changed, 24 insertions, 11 deletions
diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm
index 7910f473..bc3a8391 100644
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -1,3 +1,16 @@
+ object_const_def
+ const_export SILPHCO5F_SILPH_WORKER_M
+ const_export SILPHCO5F_ROCKET1
+ const_export SILPHCO5F_SCIENTIST
+ const_export SILPHCO5F_ROCKER
+ const_export SILPHCO5F_ROCKET2
+ const_export SILPHCO5F_TM_TAKE_DOWN
+ const_export SILPHCO5F_PROTEIN
+ const_export SILPHCO5F_CARD_KEY
+ const_export SILPHCO5F_POKEMON_REPORT1
+ const_export SILPHCO5F_POKEMON_REPORT2
+ const_export SILPHCO5F_POKEMON_REPORT3
+
SilphCo5F_Object:
db $2e ; border block
@@ -13,16 +26,16 @@ SilphCo5F_Object:
def_bg_events
def_object_events
- object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
- object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28
- object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6
- object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1
- object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29
- object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN
- object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN
- object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY
- object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person
- object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person
- object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person
+ object_event 13, 9, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO5F_SILPH_WORKER_M
+ object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO5F_ROCKET1, OPP_ROCKET, 28
+ object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, TEXT_SILPHCO5F_SCIENTIST, OPP_SCIENTIST, 6
+ object_event 18, 10, SPRITE_ROCKER, STAY, UP, TEXT_SILPHCO5F_ROCKER, OPP_JUGGLER, 1
+ object_event 28, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO5F_ROCKET2, OPP_ROCKET, 29
+ object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_TM_TAKE_DOWN, TM_TAKE_DOWN
+ object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_PROTEIN, PROTEIN
+ object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_CARD_KEY, CARD_KEY
+ object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT1
+ object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT2
+ object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT3
def_warps_to SILPH_CO_5F