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/PokemonMansion2F.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/PokemonMansion2F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion2F.asm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 52b65885..f251ac8f 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,3 +1,9 @@ + object_const_def + const_export POKEMONMANSION2F_SUPER_NERD + const_export POKEMONMANSION2F_CALCIUM + const_export POKEMONMANSION2F_DIARY1 + const_export POKEMONMANSION2F_DIARY2 + PokemonMansion2F_Object: db $1 ; border block @@ -10,9 +16,9 @@ PokemonMansion2F_Object: def_bg_events def_object_events - object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 - object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM - object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person - object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_POKEMONMANSION2F_SUPER_NERD, OPP_BURGLAR, 7 + object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION2F_CALCIUM, CALCIUM + object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY1 + object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY2 def_warps_to POKEMON_MANSION_2F |