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/OaksLab.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/OaksLab.asm')
| -rw-r--r-- | data/maps/objects/OaksLab.asm | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7546e953..4774e158 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,3 +1,14 @@ + object_const_def + const_export OAKSLAB_RIVAL + const_export OAKSLAB_EEVEE_POKE_BALL + const_export OAKSLAB_OAK1 + const_export OAKSLAB_POKEDEX1 + const_export OAKSLAB_POKEDEX2 + const_export OAKSLAB_OAK2 + const_export OAKSLAB_GIRL + const_export OAKSLAB_SCIENTIST1 + const_export OAKSLAB_SCIENTIST2 + OaksLab_Object: db $3 ; border block @@ -8,14 +19,14 @@ OaksLab_Object: def_bg_events def_object_events - object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 - object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person - object_event 5, 2, SPRITE_OAK, STAY, DOWN, 3 ; person - object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 4 ; person - object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 5 ; person - object_event 5, 10, SPRITE_OAK, STAY, UP, 6 ; person - object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 7 ; person - object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 8 ; person - object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 9 ; person + object_event 4, 3, SPRITE_BLUE, STAY, NONE, TEXT_OAKSLAB_RIVAL, OPP_RIVAL1, 1 + object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_EEVEE_POKE_BALL + object_event 5, 2, SPRITE_OAK, STAY, DOWN, TEXT_OAKSLAB_OAK1 + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX1 + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX2 + object_event 5, 10, SPRITE_OAK, STAY, UP, TEXT_OAKSLAB_OAK2 + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, TEXT_OAKSLAB_GIRL + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST1 + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST2 def_warps_to OAKS_LAB |