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/PewterGym.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/PewterGym.asm')
| -rw-r--r-- | data/maps/objects/PewterGym.asm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index cfaeefbf..f81ca6d6 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,3 +1,8 @@ + object_const_def + const_export PEWTERGYM_BROCK + const_export PEWTERGYM_COOLTRAINER_M + const_export PEWTERGYM_GYM_GUIDE + PewterGym_Object: db $3 ; border block @@ -8,8 +13,8 @@ PewterGym_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1 - object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person + object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_PEWTERGYM_BROCK, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_PEWTERGYM_COOLTRAINER_M, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_PEWTERGYM_GYM_GUIDE def_warps_to PEWTER_GYM |