diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-05 11:42:44 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-05 11:42:44 -0700 |
| commit | a75940caa20c85258c3ac5bafe4471abfb072cf5 (patch) | |
| tree | 4e564ce4de1a3412d15bb1c01871872933ac44f7 /maps/FuchsiaGym.asm | |
| parent | 40b4c87db7e9472d99186b67bdec3d48a2132e73 (diff) | |
| parent | 1323008f6f9b8d7004de8bf16ffd028cdd2d67f3 (diff) | |
Merge pull request #189 from yenatch/haxwiki-event-flags
dump haxwiki event flag constants and use them in map events
Diffstat (limited to 'maps/FuchsiaGym.asm')
| -rw-r--r-- | maps/FuchsiaGym.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 4364525fe..e7bd0f9cf 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -19,7 +19,7 @@ JanineScript_0x195db9: ; 0x195db9 loadtrainer JANINE, 1 startbattle returnafterbattle - setbit1 $04c9 + setbit1 EVENT_BEAT_JANINE setbit1 $0517 setbit1 $051a setbit1 $0482 @@ -41,13 +41,13 @@ UnknownScript_0x195e00: ; 0x195e00 faceplayer loadfont UnknownScript_0x195e02: ; 0x195e02 - checkbit1 $00dd + checkbit1 EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 2writetext UnknownText_0x196002 keeptextopen verbosegiveitem TM_06, 1 iffalse UnknownScript_0x195e15 - setbit1 $00dd + setbit1 EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: ; 0x195e15 2writetext UnknownText_0x196074 closetext @@ -206,7 +206,7 @@ UnknownScript_0x195efd: ; 0x195efd FuchsiaGymGuyScript: ; 0x195f03 faceplayer loadfont - checkbit1 $04c9 + checkbit1 EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript 2writetext FuchsiaGymGuyText closetext |