diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
| commit | 5c4dc08ee451f699471ce69fc8f98265bc80939d (patch) | |
| tree | 33223a7ef5c01b7fbf4a3a3a176c65b237d5e5ab /maps/Route43Gate.asm | |
| parent | d4aa6edfa744a45cc82b20cd813462af870b6fef (diff) | |
| parent | 740f91370db08d2e30c16f34be83c6d14e7d1c60 (diff) | |
Merge branch 'master' into refactor-preprocessor
Diffstat (limited to 'maps/Route43Gate.asm')
| -rw-r--r-- | maps/Route43Gate.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index d70a8fdf8..f6947da9e 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -24,7 +24,7 @@ UnknownScript_0x19abc9: ; 0x19abc9 ; 0x19abca UnknownScript_0x19abca: ; 0x19abca - checkbit1 $0022 + checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19abd5 domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0 return @@ -124,13 +124,13 @@ RocketScript_0x19ac82: ; 0x19ac82 OfficerScript_0x19ac85: ; 0x19ac85 faceplayer loadfont - checkbit1 $0059 + checkbit1 EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c 2writetext UnknownText_0x19ad9b keeptextopen verbosegiveitem TM_36, 1 iffalse UnknownScript_0x19aca0 - setbit1 $0059 + setbit1 EVENT_GOT_TM36_SLUDGE_BOMB loadmovesprites end ; 0x19ac9c |