From cf45874f2f3e93650589aa8536c7940a8cc20f25 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 22 May 2020 16:23:50 +0200 Subject: [PATCH] Remove trailing whitespace --- README.md | 2 +- src/code/audio/music_1.asm | 48 ++++++++--------- src/code/audio/music_2.asm | 80 ++++++++++++++-------------- src/code/entities/bank19.asm | 2 +- src/code/entities/bank3.asm | 2 +- src/code/entities/bank36.asm | 14 ++--- src/code/home/entities.asm | 2 +- src/code/photo_album.asm | 100 +++++++++++++++++------------------ src/code/photos.asm | 2 +- src/constants/sfx.asm | 14 ++--- 10 files changed, 133 insertions(+), 133 deletions(-) diff --git a/README.md b/README.md index 8a217b20..28894ac9 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,6 @@ Thanks to these people for contributing: * Kyle McGuffin - https://github.com/kcmcg * Marijn van der Werf - https://github.com/marijnvdwerf * samuel-flynn - https://github.com/samuel-flynn -* Xkeeper - https://github.com/Xkeeper0 +* Xkeeper - https://github.com/Xkeeper0 * Vextrove - https://github.com/Vextrove * daid - https://github.com/daid diff --git a/src/code/audio/music_1.asm b/src/code/audio/music_1.asm index 9c6b2b21..6deeb1da 100644 --- a/src/code/audio/music_1.asm +++ b/src/code/audio/music_1.asm @@ -303,7 +303,6 @@ BeginMusicTrack_Dispatch_1B:: jp label_01B_42D5 ; $4188: $C3 $D5 $42 Data_1B_418B:: - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 @@ -321,35 +320,36 @@ Data_1B_418B:: db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 label_01B_42AB: diff --git a/src/code/audio/music_2.asm b/src/code/audio/music_2.asm index a0aab41a..1696eb32 100644 --- a/src/code/audio/music_2.asm +++ b/src/code/audio/music_2.asm @@ -310,7 +310,6 @@ BeginMusicTrack_Dispatch_1E:: ; Pattern, repeats after 6 entries. Data_01E_41AF:: - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 @@ -328,48 +327,49 @@ Data_01E_41AF:: db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 - db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 + db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 db $01, $00, $FF, $FF, $00, $00 diff --git a/src/code/entities/bank19.asm b/src/code/entities/bank19.asm index a28b7d6f..e9ae3312 100644 --- a/src/code/entities/bank19.asm +++ b/src/code/entities/bank19.asm @@ -7239,7 +7239,7 @@ func_019_76CB:: ld e, $84 ; $76D4: $1E $84 -; Sea shell house LVL 2 sword awarding script? +; Sea shell house LVL 2 sword awarding script? jr_019_76D6: ld a, e ; $76D6: $7B ld [wBGPalette], a ; $76D7: $EA $97 $DB diff --git a/src/code/entities/bank3.asm b/src/code/entities/bank3.asm index ddefbc86..880c288d 100644 --- a/src/code/entities/bank3.asm +++ b/src/code/entities/bank3.asm @@ -4766,7 +4766,7 @@ GiveInventoryItem:: ; @TODO GivePlayerItem or w/e - inserts item in [d] into .inventorySlotFull: inc hl ; Do we have more inventory spaces to check? inc e ; (e was 0C - slots checked) - ld a, e ; + ld a, e ; cp $0C ; If we've checked enough to get back to 0C, we're out jr nz, .checkInventorySlotEmpty ; Otherwise, go back to check next slot diff --git a/src/code/entities/bank36.asm b/src/code/entities/bank36.asm index efd2fa21..e114f580 100644 --- a/src/code/entities/bank36.asm +++ b/src/code/entities/bank36.asm @@ -3873,27 +3873,27 @@ Data_036_5810: dw Data_020_6980 Data_036_5816: - dw Data_020_6980 + dw Data_020_6980 dw Data_020_6950 dw Data_020_6938 dw Data_020_6950 dw Data_020_6968 dw Data_020_6950 dw Data_020_6938 - + Data_036_5824: - dw Data_020_6938 - dw Data_020_6950 + dw Data_020_6938 + dw Data_020_6950 dw Data_020_6968 dw Data_020_6950 Data_036_582C:: dw Data_036_57EA dw Data_036_57EA - dw Data_036_57EA - dw Data_036_57EA + dw Data_036_57EA + dw Data_036_57EA dw Data_036_57F2 - dw Data_036_5808 + dw Data_036_5808 dw Data_036_5810 dw Data_036_5810 dw Data_036_5816 diff --git a/src/code/home/entities.asm b/src/code/home/entities.asm index c2772883..2d5a3d28 100644 --- a/src/code/home/entities.asm +++ b/src/code/home/entities.asm @@ -1108,7 +1108,7 @@ BossIntro:: jr z, .endIf ld a, MUSIC_MINIBOSS - + .endIf: ld [wMusicTrackToPlay], a diff --git a/src/code/photo_album.asm b/src/code/photo_album.asm index 959f78b3..cb9f29b9 100644 --- a/src/code/photo_album.asm +++ b/src/code/photo_album.asm @@ -1980,14 +1980,14 @@ JumpTable_028_4CCE: db $50, $60, $28, $00, $50, $68, $2A, $00 ; $4CF8 |P`(.Ph*.| db $50, $70, $2C, $00, $50, $78, $30, $00 ; $4D00 |Pp,.Px0.| db $FF ; $4D08 |.| - + db $50, $30, $14, $00, $50, $38, $16, $00 ; $4D08 |P0..P8..| db $50, $40, $18, $00, $50, $48, $1A, $00 ; $4D10 |P@..PH..| db $50, $50, $24, $00, $50, $58, $26, $00 ; $4D18 |PP$.PX&.| db $50, $60, $28, $00, $50, $68, $2A, $00 ; $4D20 |P`(.Ph*.| db $50, $70, $2C, $00, $50, $78, $32, $00 ; $4D28 |Pp,.Px2.| db $FF ; $4D30 |.| - + db $50, $30, $14, $00, $50, $38, $16, $00 ; $4D30 |P0..P8..| db $50, $40, $18, $00, $50, $48, $1A, $00 ; $4D38 |P@..PH..| db $50, $50, $24, $00, $50, $58, $26, $00 ; $4D40 |PP$.PX&.| @@ -2068,19 +2068,19 @@ Data_028_4DD1:: db $53, $30, $1C, $01, $53, $38, $1E, $01 ; $4DE1 |S0..S8..| db $50, $40, $20, $01, $50, $48, $20, $21 ; $4DE9 |P@ .PH !| db $50, $50, $38, $01, $50, $58, $3A, $01 ; $4DF1 |PP8.PX:.| - + db $50, $0E, $14, $01, $50, $16, $16, $01 ; $4DF9 |P...P...| db $50, $1E, $18, $01, $50, $26, $1A, $01 ; $4E01 |P...P&..| db $53, $30, $46, $01, $53, $38, $48, $01 ; $4E09 |S0F.S8H.| db $50, $40, $20, $01, $50, $48, $22, $01 ; $4E11 |P@ .PH".| db $4E, $52, $3C, $01, $4E, $5A, $3E, $01 ; $4E19 |NR<.NZ>.| - + db $50, $10, $14, $01, $50, $18, $16, $01 ; $4E21 |P...P...| db $50, $20, $18, $01, $50, $28, $1A, $01 ; $4E29 |P ..P(..| db $53, $30, $1C, $01, $53, $38, $1E, $01 ; $4E31 |S0..S8..| db $51, $40, $22, $21, $51, $48, $22, $01 ; $4E39 |Q@"!QH".| db $50, $51, $3C, $01, $50, $59, $3E, $01 ; $4E41 |PQ<.PY>.| - + db $50, $11, $14, $01, $50, $19, $16, $01 ; $4E49 |P...P...| db $50, $21, $18, $01, $50, $29, $1A, $01 ; $4E51 |P!..P)..| db $4F, $30, $1C, $01, $4F, $38, $1E, $01 ; $4E59 |O0..O8..| @@ -2307,75 +2307,75 @@ Data_028_4DD1:: db $00, $00, $00, $00, $00, $00, $00, $00 ; $5539 |........| db $00, $00, $00, $00, $00, $00, $00, $00 ; $5541 |........| db $00, $00, $00, $00, $00, $00, $00, $A3 ; $5549 |........| - - ; This table is incorrectly formatted, the increasing value pattern repeats every 20 values. + + ; This table is incorrectly formatted, the increasing value pattern repeats every 20 values. ; Increasing values db $A3, $01, $02, $03, $44, $05, $06, $07 ; $5551 |....D...| db $08, $09, $1A, $0B, $0C, $1A, $0E, $0F ; $5559 |........| - + ; Increasing values db $DF, $A3, $A3, $A3, $A3, $11, $44, $13 ; $5561 |......D.| db $14, $15, $16, $17, $18, $19, $1A, $1B ; $5569 |........| db $1C, $1D, $1E, $1F, $EF, $A3, $A3, $6F ; $5571 |.......o| - + ; Increasing values db $A3, $21, $22, $44, $24, $25, $26, $27 ; $5579 |.!"D$%&'| db $28, $29, $2A, $2B, $2C, $2D, $2E, $2F ; $5581 |()*+,-./| - + ; Increasing values db $FF, $A3, $A3, $A3, $A3, $A3, $32, $44 ; $5589 |......2D| db $34, $35, $36, $37, $38, $39, $3A, $3B ; $5591 |456789:;| db $3C, $3D, $3E, $3F, $EE, $A3, $A3, $A3 ; $5599 |<=>?....| - + ; Increasing values db $A3, $A3, $42, $43, $44, $45, $46, $47 ; $55A1 |..BCDEFG| db $48, $49, $4A, $4B, $4C, $4D, $4E, $4F ; $55A9 |HIJKLMNO| - + ; Increasing values db $A3, $6F, $A3, $A3, $A3, $A3, $52, $53 ; $55B1 |.o....RS| db $54, $55, $56, $57, $58, $59, $5A, $5B ; $55B9 |TUVWXYZ[| db $5C, $5D, $5E, $5F, $A3, $A3, $A3, $6F ; $55C1 |\]^_...o| - + ; Increasing values db $A3, $A3, $62, $63, $64, $65, $66, $67 ; $55C9 |..bcdefg| db $68, $69, $6A, $6B, $6C, $6D, $6E, $6F ; $55D1 |hijklmno| - + ; Increasing values db $A3, $A3, $A3, $A3, $A3, $A3, $6F, $73 ; $55D9 |......os| db $74, $75, $76, $77, $78, $79, $7A, $7B ; $55E1 |tuvwxyz{| db $7C, $7D, $7E, $7F, $A3, $A3, $A3, $A3 ; $55E9 ||}~.....| - + ; Increasing values db $A3, $A3, $A3, $83, $84, $85, $86, $87 ; $55F1 |........| db $88, $89, $8A, $8B, $8C, $8D, $8E, $8F ; $55F9 |........| - + ; Increasing values db $A3, $A3, $A3, $12, $04, $12, $92, $93 ; $5601 |........| db $94, $95, $96, $97, $98, $99, $9A, $9B ; $5609 |........| db $9C, $9D, $9E, $9F, $A0, $12, $04, $0A ; $5611 |........| - + ; Increasing values db $0D, $0A, $A2, $44, $A4, $A5, $A6, $A7 ; $5619 |...D....| db $A8, $A9, $AA, $AB, $AC, $AD, $AE, $AF ; $5621 |........| - + ; Increasing values db $B0, $0A, $0D, $12, $04, $B1, $B2, $B3 ; $5629 |........| db $B4, $B5, $B6, $B7, $B8, $B9, $BA, $BB ; $5631 |........| db $BC, $BD, $BE, $12, $04, $12, $04, $0A ; $5639 |........| - + ; Increasing values db $0D, $0A, $C2, $C3, $C4, $C5, $C6, $C7 ; $5641 |........| db $C8, $C9, $CA, $CB, $CC, $CD, $CE, $0A ; $5649 |........| - + ; Increasing values db $0D, $0A, $0D, $10, $D0, $D1, $D2, $D3 ; $5651 |........| db $D4, $D5, $D6, $D7, $D8, $D9, $DA, $DB ; $5659 |........| db $DC, $40, $72, $60, $61, $10, $10, $00 ; $5661 |.@r`a...| - + ; Increasing values db $E0, $E1, $E2, $E3, $44, $E5, $E6, $E7 ; $5669 |....D...| db $E8, $E9, $EA, $EB, $EC, $44, $41, $70 ; $5671 |.....DAp| - + ; Increasing values db $71, $20, $90, $00, $F0, $F1, $F2, $F3 ; $5679 |q ......| db $F4, $F5, $F6, $F7, $F8, $FD, $FE, $30 ; $5681 |.......0| @@ -2430,74 +2430,74 @@ Data_028_4DD1:: db $00, $00, $00, $00, $00, $00, $00, $00 ; $5809 |........| db $00, $00, $00, $00, $00, $00, $00, $00 ; $5811 |........| db $00, $00, $00, $00, $00, $00, $00, $42 ; $5819 |.......B| - + ; Increasing values db $42, $B1, $B2, $B3, $94, $35, $16, $17 ; $5821 |B....5..| db $08, $09, $0A, $0B, $0C, $1D, $1E, $B2 ; $5829 |........| - + ; Increasing values db $BF, $42, $42, $42, $42, $B1, $B2, $B3 ; $5831 |.BBBB...| db $84, $35, $16, $17, $18, $19, $1A, $1B ; $5839 |.5......| db $1C, $1D, $1E, $B2, $BF, $42, $42, $0D ; $5841 |.....BB.| - + ; Increasing values db $42, $B1, $B2, $B3, $84, $35, $26, $27 ; $5849 |B....5&'| db $28, $29, $2A, $2B, $2C, $2D, $2E, $B2 ; $5851 |()*+,-..| - + ; Increasing values db $BF, $42, $42, $42, $42, $B1, $B2, $B3 ; $5859 |.BBBB...| db $84, $35, $36, $37, $38, $39, $3A, $3B ; $5861 |.56789:;| db $3C, $3D, $3E, $B2, $BF, $42, $42, $42 ; $5869 |<=>..BBB| - + ; Increasing values db $42, $B1, $B2, $B3, $44, $45, $46, $47 ; $5871 |B...DEFG| db $48, $49, $4A, $4B, $4C, $4D, $4E, $B2 ; $5879 |HIJKLMN.| - + ; Increasing values db $BF, $0D, $42, $42, $42, $B1, $B2, $B3 ; $5881 |..BBB...| db $54, $55, $56, $57, $58, $59, $5A, $5B ; $5889 |TUVWXYZ[| db $5C, $5D, $5E, $B2, $BF, $42, $42, $0D ; $5891 |\]^..BB.| - + ; Increasing values db $42, $B1, $B2, $B3, $64, $65, $66, $67 ; $5899 |B...defg| db $68, $69, $6A, $6B, $6C, $6D, $1E, $B2 ; $58A1 |hijklm..| - + ; Increasing values db $BF, $42, $42, $42, $42, $B1, $B2, $B3 ; $58A9 |.BBBB...| db $74, $75, $76, $77, $78, $79, $7A, $7B ; $58B1 |tuvwxyz{| db $7C, $1D, $1E, $B2, $BF, $42, $42, $42 ; $58B9 ||....BBB| - + ; Increasing values db $42, $B1, $B2, $B3, $84, $35, $86, $87 ; $58C1 |B....5..| db $88, $89, $8A, $8B, $8C, $1D, $1E, $B2 ; $58C9 |........| - + ; Increasing values db $BF, $42, $42, $53, $52, $B1, $B2, $B3 ; $58D1 |.BBSR...| db $94, $95, $96, $97, $98, $99, $9A, $9B ; $58D9 |........| db $9C, $1D, $1E, $B2, $BF, $52, $53, $63 ; $58E1 |.....RSc| - + ; Increasing values db $62, $B1, $B2, $B3, $94, $35, $A6, $A7 ; $58E9 |b....5..| db $A8, $A9, $AA, $AB, $AC, $1D, $1E, $B2 ; $58F1 |........| - + ; Increasing values db $BF, $62, $63, $53, $52, $B1, $B2, $B3 ; $58F9 |.bcSR...| db $94, $35, $B6, $B7, $B8, $B9, $BA, $BB ; $5901 |.5......| db $9C, $1D, $1E, $B2, $BF, $52, $53, $63 ; $5909 |.....RSc| - + ; Increasing values db $62, $70, $71, $72, $80, $81, $82, $C7 ; $5911 |bpqr....| db $C8, $C9, $CA, $90, $91, $92, $9D, $9E ; $5919 |........| - + ; Increasing values db $9F, $62, $63, $A0, $D0, $D1, $D2, $D3 ; $5921 |.bc.....| db $D4, $D5, $D6, $D7, $D8, $D9, $DA, $DB ; $5929 |........| db $DC, $00, $01, $02, $D1, $A0, $D0, $A1 ; $5931 |........| - + ; Increasing values db $E0, $E1, $E2, $E3, $E4, $E5, $E6, $E7 ; $5939 |........| db $E8, $E9, $EA, $EB, $EC, $E4, $11, $12 ; $5941 |........| - + ; Increasing values db $13, $14, $A1, $A1, $F0, $F1, $F2, $F3 ; $5949 |........| db $F4, $F5, $F6, $F7, $F8, $C0, $C1, $C2 ; $5951 |........| @@ -2566,54 +2566,54 @@ Data_028_4DD1:: db $89, $8C, $8D, $9F, $9F, $9F, $9F, $9F ; $5B49 |........| db $9F, $9F, $99, $89, $89, $89, $89, $89 ; $5B51 |........| db $89, $89, $89, $89, $89, $9C, $9F, $9F ; $5B59 |........| - + ; Increasing values db $9F, $04, $05, $06, $07, $9F, $9F, $89 ; $5B61 |........| db $89, $89, $89, $89, $89, $89, $89, $8C ; $5B69 |........| db $8D, $9F, $11, $12, $13, $14, $15, $16 ; $5B71 |........| db $17, $9F, $9F, $88, $9A, $9B, $89, $89 ; $5B79 |........| - + ; Increasing values db $89, $89, $89, $9C, $9F, $20, $21, $22 ; $5B81 |..... !"| db $23, $24, $25, $26, $27, $9F, $9F, $9F ; $5B89 |#$%&'...| db $9F, $9F, $9D, $89, $89, $8C, $98, $9F ; $5B91 |........| - + ; Increasing values db $9F, $30, $31, $32, $A9, $AA, $AB, $AA ; $5B99 |.012....| db $AB, $AA, $AB, $9F, $9F, $9F, $9E, $9A ; $5BA1 |........| - + ; Increasing values db $9B, $9C, $9F, $9F, $9F, $9F, $B7, $B8 ; $5BA9 |........| db $B9, $BA, $BB, $BA, $BB, $BA, $BB, $9F ; $5BB1 |........| db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F ; $5BB9 |........| - + ; Increasing values db $9F, $81, $82, $83, $84, $85, $86, $85 ; $5BC1 |........| db $86, $85, $86, $9F, $9F, $9F, $9F, $9F ; $5BC9 |........| - + ; Increasing values db $9F, $9F, $9F, $9F, $90, $91, $92, $93 ; $5BD1 |........| db $94, $95, $96, $95, $96, $95, $96, $9F ; $5BD9 |........| db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F ; $5BE1 |........| - + ; Increasing values db $A0, $A1, $A2, $A3, $A4, $A5, $A6, $A5 ; $5BE9 |........| db $A6, $A5, $A6, $9F, $9F, $9F, $9F, $9F ; $5BF1 |........| - + ; Increasing values db $9F, $9F, $9F, $9F, $B0, $B1, $B2, $B3 ; $5BF9 |........| db $B4, $B5, $B6, $B5, $B6, $B5, $B6, $9F ; $5C01 |........| db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $01 ; $5C09 |........| - + ; Increasing values db $C0, $C1, $C2, $C3, $C4, $C5, $C6, $49 ; $5C11 |.......I| db $4A, $4B, $4C, $9F, $10, $9F, $00, $9F ; $5C19 |JKL.....| - + ; Increasing values db $01, $9F, $9F, $58, $D0, $D1, $D2, $44 ; $5C21 |...X...D| db $45, $46, $47, $59, $5A, $5B, $5C, $60 ; $5C29 |EFGYZ[\`| db $01, $9F, $10, $9F, $9F, $00, $9F, $68 ; $5C31 |.......h| - + ; Increasing values db $E0, $E1, $E2, $54, $55, $56, $57, $69 ; $5C39 |...TUVWi| db $6A, $6B, $6C, $70, $71, $72, $73, $74 ; $5C41 |jklpqrst| @@ -2687,7 +2687,7 @@ Data_028_4DD1:: db $00, $00, $00, $00, $00, $00, $95, $96 ; $5E61 |........| db $97, $98, $99, $9A, $9B, $9C, $9D, $9E ; $5E69 |........| db $9F, $00, $00, $00, $00, $00, $00, $00 ; $5E71 |........| - + ; Increasing values db $36, $A0, $A1, $A2, $A3, $A4, $A5, $A6 ; $5E79 |6.......| db $A7, $A8, $A9, $AA, $AB, $00, $00, $37 ; $5E81 |.......7| diff --git a/src/code/photos.asm b/src/code/photos.asm index a78cb52f..9bb3533f 100644 --- a/src/code/photos.asm +++ b/src/code/photos.asm @@ -42,7 +42,7 @@ MarineCliffPictureHandler:: dw JumpTable_037_4229 dw LoadPhotoBgMap_trampoline dw JumpTable_037_42FE - + ; Plays the seagull/shore SFXs. dw JumpTable_037_4659 dw JumpTable_037_5393 diff --git a/src/constants/sfx.asm b/src/constants/sfx.asm index 5b406541..cea187b4 100644 --- a/src/constants/sfx.asm +++ b/src/constants/sfx.asm @@ -1,7 +1,7 @@ ; Constants for music tracks and sound effects ; Values for wMusicTrackToPlay - + MUSIC_NONE equ $00 ; This value means: Don't play a different track. MUSIC_TITLE_SCREEN_INTRO equ $01 ; $0D's introduction section. MUSIC_MINIGAME equ $02 @@ -33,7 +33,7 @@ MUSIC_INSTRUMENT_ACQUIRED equ $1B MUSIC_LINK_AWAKENS equ $1C ; Played in the house when you begin your game. MUSIC_SWORD_SEARCH equ $1D ; First time on Koholint Island. MUSIC_DREAMING equ $1E ; Plays when you sleep in the bed in the upper Dream Shrine and the VFXplays. -MUSIC_SOUTHERN_SHRINE equ $1F +MUSIC_SOUTHERN_SHRINE equ $1F MUSIC_INSTRUMENT_FULL_MOON_CELLO equ $20 ; When you obtain the Full Moon Cello and it plays its tune. MUSIC_2D_UNDERGROUND equ $21 MUSIC_OWL equ $22 @@ -72,7 +72,7 @@ MUSIC_BALLAD_BELL equ $42 ; Played when breaking o MUSIC_BALLAD_HARP equ $43 ; Played when breaking open the Wind Egg. The game cycles through these to showcase different instruments. MUSIC_BALLAD_MARIMBA equ $44 ; Played when breaking open the Wind Egg. The game cycles through these to showcase different instruments. MUSIC_BALLAD_TRIANGLE equ $45 ; Played when breaking open the Wind Egg. The game cycles through these to showcase different instruments. -MUSIC_BALLAD_ORGAN equ $46 ; When playing for the egg w +MUSIC_BALLAD_ORGAN equ $46 ; When playing for the egg w MUSIC_BALLAD_ALL equ $47 ; Played when breaking open the Wind Egg. The game cycles through these to showcase different instruments. MUSIC_GHOST_HOUSE equ $48 MUSIC_ACTIVE_POWER_UP equ $49 @@ -81,7 +81,7 @@ MUSIC_CATFISH_MAW equ $4B MUSIC_WATERFALL_DRAIN equ $4C ; Plays when you open the lock for the Angler's Tunnel. MUSIC_MARIN_BEACH_TRANSITION equ $4D ; For the transition to the Link and Marin beach cutscene. The beginning and ending notes are skipped. MUSIC_MARIN_BEACH equ $4E -;MUSIC_UNKNOWN equ $4F ; Jingle, possible unused/possibly related to Marin +;MUSIC_UNKNOWN equ $4F ; Jingle, possible unused/possibly related to Marin MUSIC_MINIBOSS equ $50 MUSIC_KANALET_CASTLE_COPY equ $51 ; Copy of $13. MUSIC_TAIL_CAVE_COPY equ $52 ; Copy of $14. @@ -100,9 +100,9 @@ MUSIC_BOSS_WARNING equ $5E ; Plays during the dialo MUSIC_FINAL_BOSS_DEFEATED equ $5F MUSIC_ZELDA_NICKNAME_EASTER_EGG equ $60 ; ZELDA nickname easter egg. MUSIC_COLOR_DUNGEON equ $61 -;MUSIC_COLOR_DUNGEON_COPIES equ $62 to 6F ; Same as $61 +;MUSIC_COLOR_DUNGEON_COPIES equ $62 to 6F ; Same as $61 ;MUSIC_GLITCHED equ $70 to $FE ; Glitches the music that played before it. -MUSIC_SILENCE equ $FF ; Seems to try to silence the voice channels. Does not always correctly silence the music. +MUSIC_SILENCE equ $FF ; Seems to try to silence the voice channels. Does not always correctly silence the music. ; Values for hJingle JINGLE_NONE equ $00; @@ -228,7 +228,7 @@ NOISE_SFX_TITLE_APPEARS equ $19;probably correct ;NOISE_SFX_UNKNOWN equ $1D ;NOISE_SFX_UNKNOWN equ $1E ;NOISE_SFX_UNKNOWN equ $1F -;NOISE_SFX_ELECTRICITY equ $20;Electricity/Shopkeeper's magic +;NOISE_SFX_ELECTRICITY equ $20;Electricity/Shopkeeper's magic ;NOISE_SFX_UNKNOWN equ $21;silent? ;NOISE_SFX_UNKNOWN equ $22;beach/explosion with fade out ;NOISE_SFX_UNKNOWN equ $23;burning/explosion/rumbling