diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 17:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:00:57 -0400 |
| commit | d44c7c305c3f94b59e3e2c008408779836a0020a (patch) | |
| tree | 2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/CeruleanBadgeHouse.asm | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/CeruleanBadgeHouse.asm')
| -rwxr-xr-x | scripts/CeruleanBadgeHouse.asm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index e1e4ab44..5e35b079 100755 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -1,5 +1,5 @@ CeruleanBadgeHouse_Script: - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a dec a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -34,7 +34,7 @@ CeruleanHouse2Text1: jr c, .asm_74e60 ld hl, TextPointers_74e86 ld a, [wcf91] - sub $15 + sub BOULDERBADGE add a ld d, $0 ld e, a @@ -52,7 +52,16 @@ CeruleanHouse2Text1: jp TextScriptEnd BadgeItemList: - db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF + db 8 ; # + db BOULDERBADGE + db CASCADEBADGE + db THUNDERBADGE + db RAINBOWBADGE + db SOULBADGE + db MARSHBADGE + db VOLCANOBADGE + db EARTHBADGE + db -1 ; end CeruleanHouse2Text_74e77: text_far _CeruleanHouse2Text_74e77 |