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/PokemonTower7F.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/PokemonTower7F.asm')
| -rw-r--r-- | data/maps/objects/PokemonTower7F.asm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 6125f870..72cbabe1 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,3 +1,8 @@ + object_const_def + const_export POKEMONTOWER7F_JESSIE + const_export POKEMONTOWER7F_JAMES + const_export POKEMONTOWER7F_MR_FUJI + PokemonTower7F_Object: db $1 ; border block @@ -7,8 +12,8 @@ PokemonTower7F_Object: def_bg_events def_object_events - object_event 10, 8, SPRITE_JESSIE, STAY, DOWN, 1 - object_event 11, 8, SPRITE_JAMES, STAY, DOWN, 2 - object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 3 + object_event 10, 8, SPRITE_JESSIE, STAY, DOWN, TEXT_POKEMONTOWER7F_JESSIE + object_event 11, 8, SPRITE_JAMES, STAY, DOWN, TEXT_POKEMONTOWER7F_JAMES + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, TEXT_POKEMONTOWER7F_MR_FUJI def_warps_to POKEMON_TOWER_7F |