aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SilphCo4F.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/SilphCo4F.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/SilphCo4F.asm')
-rw-r--r--data/maps/objects/SilphCo4F.asm23
1 files changed, 16 insertions, 7 deletions
diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm
index 7dbc12ca..bf4e1115 100644
--- a/data/maps/objects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
@@ -1,3 +1,12 @@
+ object_const_def
+ const_export SILPHCO4F_SILPH_WORKER_M
+ const_export SILPHCO4F_ROCKET1
+ const_export SILPHCO4F_SCIENTIST
+ const_export SILPHCO4F_ROCKET2
+ const_export SILPHCO4F_FULL_HEAL
+ const_export SILPHCO4F_MAX_REVIVE
+ const_export SILPHCO4F_ESCAPE_ROPE
+
SilphCo4F_Object:
db $2e ; border block
@@ -13,12 +22,12 @@ SilphCo4F_Object:
def_bg_events
def_object_events
- object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
- object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26
- object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5
- object_event 26, 10, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 27
- object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL
- object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE
- object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE
+ object_event 6, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO4F_SILPH_WORKER_M
+ object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO4F_ROCKET1, OPP_ROCKET, 26
+ object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO4F_SCIENTIST, OPP_SCIENTIST, 5
+ object_event 26, 10, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO4F_ROCKET2, OPP_ROCKET, 27
+ object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_FULL_HEAL, FULL_HEAL
+ object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_MAX_REVIVE, MAX_REVIVE
+ object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_ESCAPE_ROPE, ESCAPE_ROPE
def_warps_to SILPH_CO_4F