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/Route11.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/Route11.asm')
| -rw-r--r-- | data/maps/objects/Route11.asm | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index a1635f46..e84aa05f 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -1,3 +1,15 @@ + object_const_def + const_export ROUTE11_GAMBLER1 + const_export ROUTE11_GAMBLER2 + const_export ROUTE11_YOUNGSTER1 + const_export ROUTE11_SUPER_NERD1 + const_export ROUTE11_YOUNGSTER2 + const_export ROUTE11_GAMBLER3 + const_export ROUTE11_GAMBLER4 + const_export ROUTE11_YOUNGSTER3 + const_export ROUTE11_SUPER_NERD2 + const_export ROUTE11_YOUNGSTER4 + Route11_Object: db $f ; border block @@ -9,18 +21,18 @@ Route11_Object: warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events - bg_event 1, 5, 11 ; Route11Text11 + bg_event 1, 5, TEXT_ROUTE11_DIGLETTSCAVE_SIGN def_object_events - object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, 1, OPP_GAMBLER, 1 - object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2 - object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 2 - object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10 - object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3 - object_event 33, 3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4 - object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, 9, OPP_ENGINEER, 3 - object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, 10, OPP_YOUNGSTER, 12 + object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER1, OPP_GAMBLER, 1 + object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER2, OPP_GAMBLER, 2 + object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE11_YOUNGSTER1, OPP_YOUNGSTER, 9 + object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROUTE11_SUPER_NERD1, OPP_ENGINEER, 2 + object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER2, OPP_YOUNGSTER, 10 + object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER3, OPP_GAMBLER, 3 + object_event 33, 3, SPRITE_GAMBLER, STAY, UP, TEXT_ROUTE11_GAMBLER4, OPP_GAMBLER, 4 + object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE11_YOUNGSTER3, OPP_YOUNGSTER, 11 + object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE11_SUPER_NERD2, OPP_ENGINEER, 3 + object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER4, OPP_YOUNGSTER, 12 def_warps_to ROUTE_11 |