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/Route24.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/Route24.asm')
| -rw-r--r-- | data/maps/objects/Route24.asm | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 050b7060..c7f7de2e 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -1,3 +1,14 @@ + object_const_def + const_export ROUTE24_COOLTRAINER_M1 + const_export ROUTE24_COOLTRAINER_M2 + const_export ROUTE24_COOLTRAINER_M3 + const_export ROUTE24_COOLTRAINER_F1 + const_export ROUTE24_YOUNGSTER1 + const_export ROUTE24_COOLTRAINER_F2 + const_export ROUTE24_YOUNGSTER2 + const_export ROUTE24_TM_THUNDER_WAVE + const_export ROUTE24_COOLTRAINER_M4 + Route24_Object: db $2c ; border block @@ -6,14 +17,14 @@ Route24_Object: def_bg_events def_object_events - object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_ROCKET, 6 - object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 7 - object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8 - object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE - object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 + object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M1, OPP_ROCKET, 6 + object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 + object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 + object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER1, OPP_YOUNGSTER, 4 + object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER2, OPP_BUG_CATCHER, 9 + object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE + object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE24_COOLTRAINER_M4 def_warps_to ROUTE_24 |