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/FastShipCabins.asm | |
parent | d4aa6edfa744a45cc82b20cd813462af870b6fef (diff) | |
parent | 740f91370db08d2e30c16f34be83c6d14e7d1c60 (diff) |
Merge branch 'master' into refactor-preprocessor
Diffstat (limited to 'maps/FastShipCabins.asm')
-rw-r--r-- | maps/FastShipCabins.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 4e3ef010b..7eaf4f1de 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -80,7 +80,7 @@ UnknownScript_0x75f09: ; 0x75f09 GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont - checkbit1 $0071 + checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 checkbit1 $0732 iftrue UnknownScript_0x75f58 @@ -96,7 +96,7 @@ UnknownScript_0x75f37: ; 0x75f37 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: ; 0x75f44 loadmovesprites waitbutton @@ -116,7 +116,7 @@ UnknownScript_0x75f58: ; 0x75f58 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 - setbit1 $0071 + setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: ; 0x75f65 loadmovesprites end |