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/SSAnne2FRooms.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/SSAnne2FRooms.asm')
| -rw-r--r-- | data/maps/objects/SSAnne2FRooms.asm | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 1a9a1cb1..7418222e 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,3 +1,18 @@ + object_const_def + const_export SSANNE2FROOMS_GENTLEMAN1 + const_export SSANNE2FROOMS_FISHER + const_export SSANNE2FROOMS_GENTLEMAN2 + const_export SSANNE2FROOMS_COOLTRAINER_F + const_export SSANNE2FROOMS_GENTLEMAN3 + const_export SSANNE2FROOMS_MAX_ETHER + const_export SSANNE2FROOMS_GENTLEMAN4 + const_export SSANNE2FROOMS_GRAMPS + const_export SSANNE2FROOMS_RARE_CANDY + const_export SSANNE2FROOMS_GENTLEMAN5 + const_export SSANNE2FROOMS_LITTLE_BOY + const_export SSANNE2FROOMS_BRUNETTE_GIRL + const_export SSANNE2FROOMS_BEAUTY + SSAnne2FRooms_Object: db $c ; border block @@ -18,18 +33,18 @@ SSAnne2FRooms_Object: def_bg_events def_object_events - object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1 - object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 - object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person - object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER - object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person - object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person - object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY - object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, 10 ; person - object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person - object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person - object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person + object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 3 + object_event 13, 4, SPRITE_FISHER, STAY, LEFT, TEXT_SSANNE2FROOMS_FISHER, OPP_FISHER, 1 + object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 5 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_SSANNE2FROOMS_COOLTRAINER_F, OPP_LASS, 12 + object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN3 + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_MAX_ETHER, MAX_ETHER + object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN4 + object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, TEXT_SSANNE2FROOMS_GRAMPS + object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_RARE_CANDY, RARE_CANDY + object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN5 + object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, TEXT_SSANNE2FROOMS_LITTLE_BOY + object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, TEXT_SSANNE2FROOMS_BRUNETTE_GIRL + object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, TEXT_SSANNE2FROOMS_BEAUTY def_warps_to SS_ANNE_2F_ROOMS |