diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/WardensHouse.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/WardensHouse.asm (renamed from scripts/fuchsiahouse2.asm) | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/fuchsiahouse2.asm b/scripts/WardensHouse.asm index 7e90aa84..69e199c9 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/WardensHouse.asm @@ -1,7 +1,7 @@ -FuchsiaHouse2Script: +WardensHouse_Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse2TextPointers: +WardensHouse_TextPointers: dw FuchsiaHouse2Text1 dw PickUpItemText dw BoulderText @@ -12,7 +12,7 @@ FuchsiaHouse2Text1: TX_ASM CheckEvent EVENT_GOT_HM04 jr nz, .subtract - ld b,GOLD_TEETH + ld b, GOLD_TEETH call IsItemInBag jr nz, .asm_3f30f CheckEvent EVENT_GAVE_GOLD_TEETH @@ -69,7 +69,7 @@ WardenGibberishText3: WardenTeethText1: TX_FAR _WardenTeethText1 - db $0b + TX_SFX_ITEM_1 WardenTeethText2: TX_FAR _WardenTeethText2 @@ -81,7 +81,8 @@ WardenThankYouText: ReceivedHM04Text: TX_FAR _ReceivedHM04Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" HM04ExplanationText: TX_FAR _HM04ExplanationText |