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/MrFujisHouse.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/MrFujisHouse.asm')
| -rw-r--r-- | data/maps/objects/MrFujisHouse.asm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index c84b8637..86939057 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,3 +1,11 @@ + object_const_def + const_export MRFUJISHOUSE_SUPER_NERD + const_export MRFUJISHOUSE_LITTLE_GIRL + const_export MRFUJISHOUSE_PSYDUCK + const_export MRFUJISHOUSE_NIDORINO + const_export MRFUJISHOUSE_MR_FUJI + const_export MRFUJISHOUSE_POKEDEX + MrFujisHouse_Object: db $a ; border block @@ -8,11 +16,11 @@ MrFujisHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person - object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person - object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person - object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person + object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_MRFUJISHOUSE_SUPER_NERD + object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_MRFUJISHOUSE_LITTLE_GIRL + object_event 6, 4, SPRITE_MONSTER, STAY, UP, TEXT_MRFUJISHOUSE_PSYDUCK + object_event 1, 3, SPRITE_MONSTER, STAY, NONE, TEXT_MRFUJISHOUSE_NIDORINO + object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, TEXT_MRFUJISHOUSE_MR_FUJI + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_MRFUJISHOUSE_POKEDEX def_warps_to MR_FUJIS_HOUSE |