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/Museum1F.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/Museum1F.asm')
| -rw-r--r-- | data/maps/objects/Museum1F.asm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index edbe63c9..7f856f89 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,3 +1,10 @@ + object_const_def + const_export MUSEUM1F_SCIENTIST1 + const_export MUSEUM1F_GAMBLER + const_export MUSEUM1F_SCIENTIST2 + const_export MUSEUM1F_SCIENTIST3 + const_export MUSEUM1F_OLD_AMBER + Museum1F_Object: db $a ; border block @@ -11,10 +18,10 @@ Museum1F_Object: def_bg_events def_object_events - object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person - object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person - object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person - object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person + object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, TEXT_MUSEUM1F_SCIENTIST1 + object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, TEXT_MUSEUM1F_GAMBLER + object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM1F_SCIENTIST2 + object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_MUSEUM1F_SCIENTIST3 + object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, TEXT_MUSEUM1F_OLD_AMBER def_warps_to MUSEUM_1F |