diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/WardensHouse.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'data/maps/objects/WardensHouse.asm')
| -rw-r--r-- | data/maps/objects/WardensHouse.asm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 63e461c4..40aee76d 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const WARDENSHOUSE_WARDEN + const WARDENSHOUSE_RARE_CANDY + const WARDENSHOUSE_BOULDER + WardensHouse_Object: db $17 ; border block @@ -6,12 +11,12 @@ WardensHouse_Object: warp_event 5, 7, LAST_MAP, 4 def_bg_events - bg_event 4, 3, 4 ; FuchsiaHouse2Text4 - bg_event 5, 3, 5 ; FuchsiaHouse2Text5 + bg_event 4, 3, TEXT_WARDENSHOUSE_DISPLAY_LEFT + bg_event 5, 3, TEXT_WARDENSHOUSE_DISPLAY_RIGHT def_object_events - object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY - object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 2, 3, SPRITE_WARDEN, STAY, NONE, TEXT_WARDENSHOUSE_WARDEN + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_WARDENSHOUSE_RARE_CANDY, RARE_CANDY + object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_WARDENSHOUSE_BOULDER def_warps_to WARDENS_HOUSE |