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/FuchsiaGym.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'maps/FuchsiaGym.asm')
| -rw-r--r-- | maps/FuchsiaGym.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 48a5d2684..2f91b85f0 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -42,7 +42,7 @@ JanineScript_0x195db9: waitsfx setflag ENGINE_SOULBADGE jump UnknownScript_0x195e02 -.FightDone +.FightDone: faceplayer opentext UnknownScript_0x195e02: @@ -205,7 +205,7 @@ FuchsiaGymGuyScript: closetext end -.FuchsiaGymGuyWinScript +.FuchsiaGymGuyWinScript: writetext FuchsiaGymGuyWinText waitbutton closetext @@ -215,7 +215,7 @@ FuchsiaGymStatue: checkflag ENGINE_SOULBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext JANINE, 1, $1 jumpstd gymstatue2 |