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/VictoryRoad1F.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/VictoryRoad1F.asm')
| -rw-r--r-- | data/maps/objects/VictoryRoad1F.asm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index d923948a..267ae00a 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -1,3 +1,12 @@ + object_const_def + const_export VICTORYROAD1F_COOLTRAINER_F + const_export VICTORYROAD1F_COOLTRAINER_M + const_export VICTORYROAD1F_TM_SKY_ATTACK + const_export VICTORYROAD1F_RARE_CANDY + const_export VICTORYROAD1F_BOULDER1 + const_export VICTORYROAD1F_BOULDER2 + const_export VICTORYROAD1F_BOULDER3 + VictoryRoad1F_Object: db $7d ; border block @@ -9,12 +18,12 @@ VictoryRoad1F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK - object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD1F_COOLTRAINER_F, OPP_COOLTRAINER_F, 5 + object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VICTORYROAD1F_COOLTRAINER_M, OPP_COOLTRAINER_M, 5 + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_TM_SKY_ATTACK, TM_SKY_ATTACK + object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_RARE_CANDY, RARE_CANDY + object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER1 + object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER2 + object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER3 def_warps_to VICTORY_ROAD_1F |