diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /maps/Route30.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'maps/Route30.asm')
| -rw-r--r-- | maps/Route30.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm index 317c01ea3..640a17742 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -76,19 +76,19 @@ TrainerYoungsterJoey: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_GOLDENROD iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer YOUNGSTER, JOEY1 startbattle reloadmapafterbattle @@ -96,7 +96,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight1 +.LoadFight1: loadtrainer YOUNGSTER, JOEY2 startbattle reloadmapafterbattle @@ -104,7 +104,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight2 +.LoadFight2: loadtrainer YOUNGSTER, JOEY3 startbattle reloadmapafterbattle @@ -112,7 +112,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight3 +.LoadFight3: loadtrainer YOUNGSTER, JOEY4 startbattle reloadmapafterbattle @@ -120,7 +120,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight4 +.LoadFight4: loadtrainer YOUNGSTER, JOEY5 startbattle reloadmapafterbattle @@ -135,7 +135,7 @@ TrainerYoungsterJoey: setevent EVENT_GOT_HP_UP_FROM_JOEY jump .NumberAccepted -.done: +.done end .GiveHPUp: @@ -249,7 +249,7 @@ Route30FruitTree2: Route30HiddenPotion: dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION - + Route30_JoeysRattataAttacksMovement: fix_facing |