aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PowerPlant.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/PowerPlant.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-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/PowerPlant.asm')
-rw-r--r--data/maps/objects/PowerPlant.asm44
1 files changed, 30 insertions, 14 deletions
diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
index 419adc01..df3bca01 100644
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -1,3 +1,19 @@
+ object_const_def
+ const POWERPLANT_VOLTORB1
+ const POWERPLANT_VOLTORB2
+ const POWERPLANT_VOLTORB3
+ const POWERPLANT_ELECTRODE1
+ const POWERPLANT_VOLTORB4
+ const POWERPLANT_VOLTORB5
+ const POWERPLANT_ELECTRODE2
+ const POWERPLANT_VOLTORB6
+ const POWERPLANT_ZAPDOS
+ const POWERPLANT_CARBOS
+ const POWERPLANT_HP_UP
+ const POWERPLANT_RARE_CANDY
+ const POWERPLANT_TM_THUNDER
+ const POWERPLANT_TM_REFLECT
+
PowerPlant_Object:
db $2e ; border block
@@ -9,19 +25,19 @@ PowerPlant_Object:
def_bg_events
def_object_events
- object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
- object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
- object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
- object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
- object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40
- object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
- object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
- object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
- object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
- object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
- object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
- object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
- object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
- object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT
+ object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB1, VOLTORB, 40
+ object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB2, VOLTORB, 40
+ object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB3, VOLTORB, 40
+ object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE1, ELECTRODE, 43
+ object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB4, VOLTORB, 40
+ object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB5, VOLTORB, 40
+ object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE2, ELECTRODE, 43
+ object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB6, VOLTORB, 40
+ object_event 4, 9, SPRITE_BIRD, STAY, UP, TEXT_POWERPLANT_ZAPDOS, ZAPDOS, 50
+ object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_CARBOS, CARBOS
+ object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_HP_UP, HP_UP
+ object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_RARE_CANDY, RARE_CANDY
+ object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_THUNDER, TM_THUNDER
+ object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_REFLECT, TM_REFLECT
def_warps_to POWER_PLANT