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/SummerBeachHouse.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/SummerBeachHouse.asm')
| -rw-r--r-- | data/maps/objects/SummerBeachHouse.asm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/data/maps/objects/SummerBeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm index 1cb01869..1bff029a 100644 --- a/data/maps/objects/SummerBeachHouse.asm +++ b/data/maps/objects/SummerBeachHouse.asm @@ -1,3 +1,11 @@ + object_const_def + const_export SUMMERBEACHHOUSE_SURFINDUDE + const_export SUMMERBEACHHOUSE_PIKACHU + const_export SUMMERBEACHHOUSE_POSTER1 + const_export SUMMERBEACHHOUSE_POSTER2 + const_export SUMMERBEACHHOUSE_POSTER3 + const_export SUMMERBEACHHOUSE_PRINTER + SummerBeachHouse_Object: db $a ; border block @@ -6,13 +14,13 @@ SummerBeachHouse_Object: warp_event 3, 7, LAST_MAP, 1 def_bg_events - bg_event 3, 0, 3 ; SummerBeachHouseSign1Text - bg_event 7, 0, 4 ; SummerBeachHouseSign2Text - bg_event 11, 0, 5 ; SummerBeachHouseSign3Text - bg_event 13, 1, 6 ; SummerBeachHouseSign4Text + bg_event 3, 0, TEXT_SUMMERBEACHHOUSE_POSTER1 + bg_event 7, 0, TEXT_SUMMERBEACHHOUSE_POSTER2 + bg_event 11, 0, TEXT_SUMMERBEACHHOUSE_POSTER3 + bg_event 13, 1, TEXT_SUMMERBEACHHOUSE_PRINTER def_object_events - object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person - object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; person + object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, TEXT_SUMMERBEACHHOUSE_SURFINDUDE + object_event 5, 3, SPRITE_PIKACHU, WALK, 1, TEXT_SUMMERBEACHHOUSE_PIKACHU def_warps_to SUMMER_BEACH_HOUSE |