diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/FuchsiaGym.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-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/FuchsiaGym.asm')
| -rw-r--r-- | data/maps/objects/FuchsiaGym.asm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 62a94376..17efbf75 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -1,3 +1,13 @@ + object_const_def + const_export FUCHSIAGYM_KOGA + const_export FUCHSIAGYM_ROCKER1 + const_export FUCHSIAGYM_ROCKER2 + const_export FUCHSIAGYM_ROCKER3 + const_export FUCHSIAGYM_ROCKER4 + const_export FUCHSIAGYM_ROCKER5 + const_export FUCHSIAGYM_ROCKER6 + const_export FUCHSIAGYM_GYM_GUIDE + FuchsiaGym_Object: db $3 ; border block @@ -8,13 +18,13 @@ FuchsiaGym_Object: def_bg_events def_object_events - object_event 4, 10, SPRITE_SILPH_WORKER, STAY, DOWN, 1, OPP_KOGA, 1 - object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7 - object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3 - object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8 - object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1 - object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2 - object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4 - object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person + object_event 4, 10, SPRITE_SILPH_WORKER_M, STAY, DOWN, TEXT_FUCHSIAGYM_KOGA, OPP_KOGA, 1 + object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER1, OPP_JUGGLER, 7 + object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, TEXT_FUCHSIAGYM_ROCKER2, OPP_JUGGLER, 3 + object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER3, OPP_JUGGLER, 8 + object_event 3, 5, SPRITE_ROCKER, STAY, UP, TEXT_FUCHSIAGYM_ROCKER4, OPP_TAMER, 1 + object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER5, OPP_TAMER, 2 + object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, TEXT_FUCHSIAGYM_ROCKER6, OPP_JUGGLER, 4 + object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_FUCHSIAGYM_GYM_GUIDE def_warps_to FUCHSIA_GYM |