diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /data/maps/objects/PewterNidoranHouse.asm | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/PewterNidoranHouse.asm')
| -rw-r--r-- | data/maps/objects/PewterNidoranHouse.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 15419cba..8065c148 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -13,8 +13,8 @@ PewterNidoranHouse_Object: def_bg_events def_object_events - object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, PEWTERNIDORANHOUSE_NIDORAN - object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY - object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, TEXT_PEWTERNIDORANHOUSE_NIDORAN + object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY + object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN def_warps_to PEWTER_NIDORAN_HOUSE |