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/SilphCo11F.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/SilphCo11F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo11F.asm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 54484a05..ef5d4048 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,3 +1,11 @@ + object_const_def + const_export SILPHCO11F_SILPH_PRESIDENT + const_export SILPHCO11F_BEAUTY + const_export SILPHCO11F_GIOVANNI + const_export SILPHCO11F_JAMES + const_export SILPHCO11F_ROCKET + const_export SILPHCO11F_JESSIE + SilphCo11F_Object: db $d ; border block @@ -10,11 +18,11 @@ SilphCo11F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person - object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object_event 2, 8, SPRITE_JAMES, STAY, UP, 4 - object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 - object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6 + object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, TEXT_SILPHCO11F_SILPH_PRESIDENT + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_SILPHCO11F_BEAUTY + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, TEXT_SILPHCO11F_GIOVANNI, OPP_GIOVANNI, 2 + object_event 2, 8, SPRITE_JAMES, STAY, UP, TEXT_SILPHCO11F_JAMES + object_event 15, 9, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET, OPP_ROCKET, 40 + object_event 3, 8, SPRITE_JESSIE, STAY, UP, TEXT_SILPHCO11F_JESSIE def_warps_to SILPH_CO_11F |