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/SSAnne1FRooms.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/SSAnne1FRooms.asm')
| -rw-r--r-- | data/maps/objects/SSAnne1FRooms.asm | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 40e80a57..a462852d 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const_export SSANNE1FROOMS_GENTLEMAN1 + const_export SSANNE1FROOMS_GENTLEMAN2 + const_export SSANNE1FROOMS_YOUNGSTER + const_export SSANNE1FROOMS_COOLTRAINER_F + const_export SSANNE1FROOMS_GIRL1 + const_export SSANNE1FROOMS_MIDDLE_AGED_MAN + const_export SSANNE1FROOMS_LITTLE_GIRL + const_export SSANNE1FROOMS_WIGGLYTUFF + const_export SSANNE1FROOMS_GIRL2 + const_export SSANNE1FROOMS_TM_BODY_SLAM + const_export SSANNE1FROOMS_GENTLEMAN3 + SSAnne1FRooms_Object: db $c ; border block @@ -12,16 +25,16 @@ SSAnne1FRooms_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 - object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8 - object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11 - object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person - object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person - object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person - object_event 3, 11, SPRITE_JIGGLYPUFF, STAY, DOWN, 8 ; person - object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person - object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM - object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person + object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_SSANNE1FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 1 + object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, TEXT_SSANNE1FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 2 + object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, TEXT_SSANNE1FROOMS_YOUNGSTER, OPP_YOUNGSTER, 8 + object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_SSANNE1FROOMS_COOLTRAINER_F, OPP_LASS, 11 + object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, TEXT_SSANNE1FROOMS_GIRL1 + object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_SSANNE1FROOMS_MIDDLE_AGED_MAN + object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_SSANNE1FROOMS_LITTLE_GIRL + object_event 3, 11, SPRITE_JIGGLYPUFF, STAY, DOWN, TEXT_SSANNE1FROOMS_WIGGLYTUFF + object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, TEXT_SSANNE1FROOMS_GIRL2 + object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE1FROOMS_TM_BODY_SLAM, TM_BODY_SLAM + object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_SSANNE1FROOMS_GENTLEMAN3 def_warps_to SS_ANNE_1F_ROOMS |