diff options
| author | jidoc01 <jidoc01@naver.com> | 2019-07-07 22:50:09 +0900 |
|---|---|---|
| committer | jidoc01 <jidoc01@naver.com> | 2019-07-07 22:50:09 +0900 |
| commit | ca2034184fa5f5e7dc4d9a779d5e2a2a17a024c5 (patch) | |
| tree | 045bc79cfeebd2014530050aed7a1d334c324444 /src | |
| parent | a1dcd04fc19fd14776c94a7b41d993a270aae8f6 (diff) | |
| parent | 87ddb7aaeb884e9f4d73aeeb66d747ccb6077bf3 (diff) | |
Merge branch 'master' of https://github.com/pret/poketcg
Diffstat (limited to 'src')
109 files changed, 589 insertions, 487 deletions
diff --git a/src/audio/sfx/sfx_01.asm b/src/audio/sfx/sfx_01.asm index c2f1874..9e5c060 100644 --- a/src/audio/sfx/sfx_01.asm +++ b/src/audio/sfx/sfx_01.asm @@ -1,4 +1,4 @@ -SFX_01_Ch1: ; fc4df (3f:44df) +Sfx01_Ch1: ; fc4df (3f:44df) sfx_1 196 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_02.asm b/src/audio/sfx/sfx_02.asm index b105b15..02f6c5d 100644 --- a/src/audio/sfx/sfx_02.asm +++ b/src/audio/sfx/sfx_02.asm @@ -1,4 +1,4 @@ -SFX_02_Ch1: ; fc4f7 (3f:44f7) +Sfx02_Ch1: ; fc4f7 (3f:44f7) sfx_1 194 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_03.asm b/src/audio/sfx/sfx_03.asm index 59cadb1..6ad742f 100644 --- a/src/audio/sfx/sfx_03.asm +++ b/src/audio/sfx/sfx_03.asm @@ -1,4 +1,4 @@ -SFX_03_Ch1: ; fc539 (3f:4539) +Sfx03_Ch1: ; fc539 (3f:4539) sfx_1 212 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_04.asm b/src/audio/sfx/sfx_04.asm index 2ec8391..c7bb86e 100644 --- a/src/audio/sfx/sfx_04.asm +++ b/src/audio/sfx/sfx_04.asm @@ -1,4 +1,4 @@ -SFX_04_Ch1: ; fc573 (3f:4573) +Sfx04_Ch1: ; fc573 (3f:4573) sfx_1 240 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_05.asm b/src/audio/sfx/sfx_05.asm index 7a12390..1a26798 100644 --- a/src/audio/sfx/sfx_05.asm +++ b/src/audio/sfx/sfx_05.asm @@ -1,4 +1,4 @@ -SFX_05_Ch1: ; fc59d (3f:459d) +Sfx05_Ch1: ; fc59d (3f:459d) sfx_1 241 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_06.asm b/src/audio/sfx/sfx_06.asm index 6d33acb..f5d12ab 100644 --- a/src/audio/sfx/sfx_06.asm +++ b/src/audio/sfx/sfx_06.asm @@ -1,4 +1,4 @@ -SFX_06_Ch1: ; fc625 (3f:4625) +Sfx06_Ch1: ; fc625 (3f:4625) sfx_1 241 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_07.asm b/src/audio/sfx/sfx_07.asm index 0888aa7..e3de8e6 100644 --- a/src/audio/sfx/sfx_07.asm +++ b/src/audio/sfx/sfx_07.asm @@ -1,4 +1,4 @@ -SFX_07_Ch1: ; fc6c2 (3f:46c2) +Sfx07_Ch1: ; fc6c2 (3f:46c2) sfx_8 17 sfx_loop 2 sfx_1 240 diff --git a/src/audio/sfx/sfx_08.asm b/src/audio/sfx/sfx_08.asm index 4711720..c5cab85 100644 --- a/src/audio/sfx/sfx_08.asm +++ b/src/audio/sfx/sfx_08.asm @@ -1,4 +1,4 @@ -SFX_08_Ch1: ; fc6f6 (3f:46f6) +Sfx08_Ch1: ; fc6f6 (3f:46f6) sfx_8 17 sfx_1 224 sfx_0 0, 64 diff --git a/src/audio/sfx/sfx_09.asm b/src/audio/sfx/sfx_09.asm index 648ef18..a280894 100644 --- a/src/audio/sfx/sfx_09.asm +++ b/src/audio/sfx/sfx_09.asm @@ -1,4 +1,4 @@ -SFX_09_Ch1: ; fc725 (3f:4725) +Sfx09_Ch1: ; fc725 (3f:4725) sfx_8 17 sfx_1 224 sfx_0 0, 65 diff --git a/src/audio/sfx/sfx_0a.asm b/src/audio/sfx/sfx_0a.asm index ea1ec1f..97e6d47 100644 --- a/src/audio/sfx/sfx_0a.asm +++ b/src/audio/sfx/sfx_0a.asm @@ -1,4 +1,4 @@ -SFX_0a_Ch1: ; fc78a (3f:478a) +Sfx0a_Ch1: ; fc78a (3f:478a) sfx_8 17 sfx_1 228 sfx_2 0 diff --git a/src/audio/sfx/sfx_0b.asm b/src/audio/sfx/sfx_0b.asm index 5712c37..f350c2d 100644 --- a/src/audio/sfx/sfx_0b.asm +++ b/src/audio/sfx/sfx_0b.asm @@ -1,4 +1,4 @@ -SFX_0b_Ch1: ; fc813 (3f:4813) +Sfx0b_Ch1: ; fc813 (3f:4813) sfx_8 17 sfx_1 239 sfx_2 0 diff --git a/src/audio/sfx/sfx_0c.asm b/src/audio/sfx/sfx_0c.asm index 7aebc8a..779ee3d 100644 --- a/src/audio/sfx/sfx_0c.asm +++ b/src/audio/sfx/sfx_0c.asm @@ -1,4 +1,4 @@ -SFX_0c_Ch1: ; fc8bd (3f:48bd) +Sfx0c_Ch1: ; fc8bd (3f:48bd) sfx_8 17 sfx_loop 2 sfx_1 225 diff --git a/src/audio/sfx/sfx_0d.asm b/src/audio/sfx/sfx_0d.asm index 3b8e511..5a2d2a8 100644 --- a/src/audio/sfx/sfx_0d.asm +++ b/src/audio/sfx/sfx_0d.asm @@ -1,4 +1,4 @@ -SFX_0d_Ch1: ; fc8f3 (3f:48f3) +Sfx0d_Ch1: ; fc8f3 (3f:48f3) sfx_loop 5 sfx_8 17 sfx_1 159 diff --git a/src/audio/sfx/sfx_0e.asm b/src/audio/sfx/sfx_0e.asm index bb3c6b3..1641beb 100644 --- a/src/audio/sfx/sfx_0e.asm +++ b/src/audio/sfx/sfx_0e.asm @@ -1,4 +1,4 @@ -SFX_0e_Ch1: ; fc953 (3f:4953) +Sfx0e_Ch1: ; fc953 (3f:4953) sfx_8 17 sfx_1 207 sfx_2 0 diff --git a/src/audio/sfx/sfx_0f.asm b/src/audio/sfx/sfx_0f.asm index 0a997df..712a508 100644 --- a/src/audio/sfx/sfx_0f.asm +++ b/src/audio/sfx/sfx_0f.asm @@ -1,4 +1,4 @@ -SFX_0f_Ch1: ; fc9b4 (3f:49b4) +Sfx0f_Ch1: ; fc9b4 (3f:49b4) sfx_8 17 sfx_1 225 sfx_0 0, 82 diff --git a/src/audio/sfx/sfx_10.asm b/src/audio/sfx/sfx_10.asm index 6c013c8..47c4b87 100644 --- a/src/audio/sfx/sfx_10.asm +++ b/src/audio/sfx/sfx_10.asm @@ -1,4 +1,4 @@ -SFX_10_Ch1: ; fc9fb (3f:49fb) +Sfx10_Ch1: ; fc9fb (3f:49fb) sfx_loop 5 sfx_8 17 sfx_1 55 diff --git a/src/audio/sfx/sfx_11.asm b/src/audio/sfx/sfx_11.asm index dd036c7..6388467 100644 --- a/src/audio/sfx/sfx_11.asm +++ b/src/audio/sfx/sfx_11.asm @@ -1,4 +1,4 @@ -SFX_11_Ch1: ; fca82 (3f:4a82) +Sfx11_Ch1: ; fca82 (3f:4a82) sfx_8 17 sfx_1 241 sfx_2 0 diff --git a/src/audio/sfx/sfx_12.asm b/src/audio/sfx/sfx_12.asm index 27cb676..3b6b905 100644 --- a/src/audio/sfx/sfx_12.asm +++ b/src/audio/sfx/sfx_12.asm @@ -1,4 +1,4 @@ -SFX_12_Ch1: ; fcb2d (3f:4b2d) +Sfx12_Ch1: ; fcb2d (3f:4b2d) sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_13.asm b/src/audio/sfx/sfx_13.asm index cd8a7a5..a5e3dd1 100644 --- a/src/audio/sfx/sfx_13.asm +++ b/src/audio/sfx/sfx_13.asm @@ -1,4 +1,4 @@ -SFX_13_Ch1: ; fcb72 (3f:4b72) +Sfx13_Ch1: ; fcb72 (3f:4b72) sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_14.asm b/src/audio/sfx/sfx_14.asm index a6b0d77..e1e364f 100644 --- a/src/audio/sfx/sfx_14.asm +++ b/src/audio/sfx/sfx_14.asm @@ -1,4 +1,4 @@ -SFX_14_Ch1: ; fcc80 (3f:4c80) +Sfx14_Ch1: ; fcc80 (3f:4c80) sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_15.asm b/src/audio/sfx/sfx_15.asm index fc5613d..e19ed92 100644 --- a/src/audio/sfx/sfx_15.asm +++ b/src/audio/sfx/sfx_15.asm @@ -1,4 +1,4 @@ -SFX_15_Ch1: ; fcd2f (3f:4d2f) +Sfx15_Ch1: ; fcd2f (3f:4d2f) sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_16.asm b/src/audio/sfx/sfx_16.asm index 9b096fa..ea3fd47 100644 --- a/src/audio/sfx/sfx_16.asm +++ b/src/audio/sfx/sfx_16.asm @@ -1,4 +1,4 @@ -SFX_16_Ch1: ; fcd71 (3f:4d71) +Sfx16_Ch1: ; fcd71 (3f:4d71) sfx_8 17 sfx_1 241 sfx_0 0, 45 diff --git a/src/audio/sfx/sfx_17.asm b/src/audio/sfx/sfx_17.asm index 56f08e1..d541d9a 100644 --- a/src/audio/sfx/sfx_17.asm +++ b/src/audio/sfx/sfx_17.asm @@ -1,4 +1,4 @@ -SFX_17_Ch1: ; fcdb0 (3f:4db0) +Sfx17_Ch1: ; fcdb0 (3f:4db0) sfx_8 17 sfx_1 241 sfx_0 0, 45 diff --git a/src/audio/sfx/sfx_18.asm b/src/audio/sfx/sfx_18.asm index a0fdb06..4be29f7 100644 --- a/src/audio/sfx/sfx_18.asm +++ b/src/audio/sfx/sfx_18.asm @@ -1,4 +1,4 @@ -SFX_18_Ch1: ; fce31 (3f:4e31) +Sfx18_Ch1: ; fce31 (3f:4e31) sfx_8 17 sfx_1 192 sfx_0 0, 81 diff --git a/src/audio/sfx/sfx_19.asm b/src/audio/sfx/sfx_19.asm index b01c70e..dde7b50 100644 --- a/src/audio/sfx/sfx_19.asm +++ b/src/audio/sfx/sfx_19.asm @@ -1,4 +1,4 @@ -SFX_19_Ch1: ; fce98 (3f:4e98) +Sfx19_Ch1: ; fce98 (3f:4e98) sfx_8 17 sfx_1 240 sfx_0 0, 98 diff --git a/src/audio/sfx/sfx_1a.asm b/src/audio/sfx/sfx_1a.asm index ce0d0d8..5fa7d5c 100644 --- a/src/audio/sfx/sfx_1a.asm +++ b/src/audio/sfx/sfx_1a.asm @@ -1,4 +1,4 @@ -SFX_1a_Ch1: ; fcf1d (3f:4f1d) +Sfx1a_Ch1: ; fcf1d (3f:4f1d) sfx_8 17 sfx_1 97 sfx_loop 2 diff --git a/src/audio/sfx/sfx_1b.asm b/src/audio/sfx/sfx_1b.asm index 43e3ba4..5b598cc 100644 --- a/src/audio/sfx/sfx_1b.asm +++ b/src/audio/sfx/sfx_1b.asm @@ -1,4 +1,4 @@ -SFX_1b_Ch1: ; fcf5d (3f:4f5d) +Sfx1b_Ch1: ; fcf5d (3f:4f5d) sfx_8 17 sfx_1 240 sfx_0 0, 80 diff --git a/src/audio/sfx/sfx_1c.asm b/src/audio/sfx/sfx_1c.asm index 76c1f46..51bc45a 100644 --- a/src/audio/sfx/sfx_1c.asm +++ b/src/audio/sfx/sfx_1c.asm @@ -1,4 +1,4 @@ -SFX_1c_Ch1: ; fd001 (3f:5001) +Sfx1c_Ch1: ; fd001 (3f:5001) sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1d.asm b/src/audio/sfx/sfx_1d.asm index 5f472e9..13b4baf 100644 --- a/src/audio/sfx/sfx_1d.asm +++ b/src/audio/sfx/sfx_1d.asm @@ -1,4 +1,4 @@ -SFX_1d_Ch1: ; fd0c0 (3f:50c0) +Sfx1d_Ch1: ; fd0c0 (3f:50c0) sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1e.asm b/src/audio/sfx/sfx_1e.asm index 9e921ed..ed95135 100644 --- a/src/audio/sfx/sfx_1e.asm +++ b/src/audio/sfx/sfx_1e.asm @@ -1,4 +1,4 @@ -SFX_1e_Ch1: ; fd185 (3f:5185) +Sfx1e_Ch1: ; fd185 (3f:5185) sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1f.asm b/src/audio/sfx/sfx_1f.asm index 7e45dda..7e96314 100644 --- a/src/audio/sfx/sfx_1f.asm +++ b/src/audio/sfx/sfx_1f.asm @@ -1,4 +1,4 @@ -SFX_1f_Ch1: ; fd28a (3f:528a) +Sfx1f_Ch1: ; fd28a (3f:528a) sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_20.asm b/src/audio/sfx/sfx_20.asm index 0711a70..22b1caa 100644 --- a/src/audio/sfx/sfx_20.asm +++ b/src/audio/sfx/sfx_20.asm @@ -1,4 +1,4 @@ -SFX_20_Ch1: ; fd33b (3f:533b) +Sfx20_Ch1: ; fd33b (3f:533b) sfx_8 17 sfx_loop 2 sfx_1 111 diff --git a/src/audio/sfx/sfx_21.asm b/src/audio/sfx/sfx_21.asm index 709f14c..b99d444 100644 --- a/src/audio/sfx/sfx_21.asm +++ b/src/audio/sfx/sfx_21.asm @@ -1,4 +1,4 @@ -SFX_21_Ch1: ; fd3bd (3f:53bd) +Sfx21_Ch1: ; fd3bd (3f:53bd) sfx_8 17 sfx_1 111 sfx_0 0, 81 diff --git a/src/audio/sfx/sfx_22.asm b/src/audio/sfx/sfx_22.asm index 6fc2583..4c0c599 100644 --- a/src/audio/sfx/sfx_22.asm +++ b/src/audio/sfx/sfx_22.asm @@ -1,4 +1,4 @@ -SFX_22_Ch1: ; fd44e (3f:544e) +Sfx22_Ch1: ; fd44e (3f:544e) sfx_8 17 sfx_loop 2 sfx_1 111 diff --git a/src/audio/sfx/sfx_23.asm b/src/audio/sfx/sfx_23.asm index 6546376..14fe256 100644 --- a/src/audio/sfx/sfx_23.asm +++ b/src/audio/sfx/sfx_23.asm @@ -1,4 +1,4 @@ -SFX_23_Ch1: ; fd4ca (3f:54ca) +Sfx23_Ch1: ; fd4ca (3f:54ca) sfx_8 17 sfx_1 246 sfx_0 0, 132 diff --git a/src/audio/sfx/sfx_24.asm b/src/audio/sfx/sfx_24.asm index e609cc2..9b6f4a5 100644 --- a/src/audio/sfx/sfx_24.asm +++ b/src/audio/sfx/sfx_24.asm @@ -1,4 +1,4 @@ -SFX_24_Ch1: ; fd5bd (3f:55bd) +Sfx24_Ch1: ; fd5bd (3f:55bd) sfx_8 17 sfx_1 111 sfx_loop 80 diff --git a/src/audio/sfx/sfx_25.asm b/src/audio/sfx/sfx_25.asm index d1c3d13..0a66ea0 100644 --- a/src/audio/sfx/sfx_25.asm +++ b/src/audio/sfx/sfx_25.asm @@ -1,4 +1,4 @@ -SFX_25_Ch1: ; fd617 (3f:5617) +Sfx25_Ch1: ; fd617 (3f:5617) sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_26.asm b/src/audio/sfx/sfx_26.asm index 5d7bcb4..730ebf4 100644 --- a/src/audio/sfx/sfx_26.asm +++ b/src/audio/sfx/sfx_26.asm @@ -1,4 +1,4 @@ -SFX_26_Ch1: ; fd6f2 (3f:56f2) +Sfx26_Ch1: ; fd6f2 (3f:56f2) sfx_1 255 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_27.asm b/src/audio/sfx/sfx_27.asm index 70d9fad..39a9d1e 100644 --- a/src/audio/sfx/sfx_27.asm +++ b/src/audio/sfx/sfx_27.asm @@ -1,4 +1,4 @@ -SFX_27_Ch1: ; fd769 (3f:5769) +Sfx27_Ch1: ; fd769 (3f:5769) sfx_1 84 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_28.asm b/src/audio/sfx/sfx_28.asm index c4c1ebb..6939d2d 100644 --- a/src/audio/sfx/sfx_28.asm +++ b/src/audio/sfx/sfx_28.asm @@ -1,4 +1,4 @@ -SFX_28_Ch1: ; fd799 (3f:5799) +Sfx28_Ch1: ; fd799 (3f:5799) sfx_1 100 sfx_8 17 sfx_2 4 @@ -22,7 +22,7 @@ SFX_28_Ch1: ; fd799 (3f:5799) sfx_0 7, 131 sfx_end -SFX_28_Ch2: ; fd7bf (3f:57bf) +Sfx28_Ch2: ; fd7bf (3f:57bf) sfx_8 17 sfx_1 255 sfx_1 0 diff --git a/src/audio/sfx/sfx_29.asm b/src/audio/sfx/sfx_29.asm index 129b23e..133ca0e 100644 --- a/src/audio/sfx/sfx_29.asm +++ b/src/audio/sfx/sfx_29.asm @@ -1,4 +1,4 @@ -SFX_29_Ch1: ; fd834 (3f:5834) +Sfx29_Ch1: ; fd834 (3f:5834) sfx_8 17 sfx_1 223 sfx_loop 40 diff --git a/src/audio/sfx/sfx_2a.asm b/src/audio/sfx/sfx_2a.asm index a1560bd..aad607c 100644 --- a/src/audio/sfx/sfx_2a.asm +++ b/src/audio/sfx/sfx_2a.asm @@ -1,4 +1,4 @@ -SFX_2a_Ch1: ; fd866 (3f:5866) +Sfx2a_Ch1: ; fd866 (3f:5866) sfx_8 17 sfx_1 223 sfx_loop 4 diff --git a/src/audio/sfx/sfx_2b.asm b/src/audio/sfx/sfx_2b.asm index 8cf6b66..de76337 100644 --- a/src/audio/sfx/sfx_2b.asm +++ b/src/audio/sfx/sfx_2b.asm @@ -1,4 +1,4 @@ -SFX_2b_Ch1: ; fd8c4 (3f:58c4) +Sfx2b_Ch1: ; fd8c4 (3f:58c4) sfx_1 255 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_2c.asm b/src/audio/sfx/sfx_2c.asm index cc5bb48..6764eb1 100644 --- a/src/audio/sfx/sfx_2c.asm +++ b/src/audio/sfx/sfx_2c.asm @@ -1,4 +1,4 @@ -SFX_2c_Ch1: ; fd96f (3f:596f) +Sfx2c_Ch1: ; fd96f (3f:596f) sfx_1 255 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_2d.asm b/src/audio/sfx/sfx_2d.asm index d9fb760..8098548 100644 --- a/src/audio/sfx/sfx_2d.asm +++ b/src/audio/sfx/sfx_2d.asm @@ -1,4 +1,4 @@ -SFX_2d_Ch1: ; fd9ab (3f:59ab) +Sfx2d_Ch1: ; fd9ab (3f:59ab) sfx_8 17 sfx_1 223 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_2e.asm b/src/audio/sfx/sfx_2e.asm index 03cd8bd..b4a1926 100644 --- a/src/audio/sfx/sfx_2e.asm +++ b/src/audio/sfx/sfx_2e.asm @@ -1,4 +1,4 @@ -SFX_2e_Ch1: ; fd9f4 (3f:59f4) +Sfx2e_Ch1: ; fd9f4 (3f:59f4) sfx_8 17 sfx_1 223 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_2f.asm b/src/audio/sfx/sfx_2f.asm index 0f034f1..1a499c6 100644 --- a/src/audio/sfx/sfx_2f.asm +++ b/src/audio/sfx/sfx_2f.asm @@ -1,4 +1,4 @@ -SFX_2f_Ch1: ; fda5c (3f:5a5c) +Sfx2f_Ch1: ; fda5c (3f:5a5c) sfx_8 17 sfx_1 214 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_30.asm b/src/audio/sfx/sfx_30.asm index c96ca1c..b560790 100644 --- a/src/audio/sfx/sfx_30.asm +++ b/src/audio/sfx/sfx_30.asm @@ -1,4 +1,4 @@ -SFX_30_Ch1: ; fdb03 (3f:5b03) +Sfx30_Ch1: ; fdb03 (3f:5b03) sfx_8 17 sfx_loop 8 sfx_1 129 diff --git a/src/audio/sfx/sfx_31.asm b/src/audio/sfx/sfx_31.asm index d900fa3..a7c8414 100644 --- a/src/audio/sfx/sfx_31.asm +++ b/src/audio/sfx/sfx_31.asm @@ -1,4 +1,4 @@ -SFX_31_Ch1: ; fdb1e (3f:5b1e) +Sfx31_Ch1: ; fdb1e (3f:5b1e) sfx_8 17 sfx_1 111 sfx_2 0 diff --git a/src/audio/sfx/sfx_32.asm b/src/audio/sfx/sfx_32.asm index 20e300d..da39247 100644 --- a/src/audio/sfx/sfx_32.asm +++ b/src/audio/sfx/sfx_32.asm @@ -1,4 +1,4 @@ -SFX_32_Ch1: ; fdbdb (3f:5bdb) +Sfx32_Ch1: ; fdbdb (3f:5bdb) sfx_1 143 sfx_8 17 sfx_2 8 @@ -193,7 +193,7 @@ SFX_32_Ch1: ; fdbdb (3f:5bdb) sfx_0 7, 157 sfx_end -SFX_32_Ch2: ; fdd3e (3f:5d3e) +Sfx32_Ch2: ; fdd3e (3f:5d3e) sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_33.asm b/src/audio/sfx/sfx_33.asm index 3696a16..f1c9319 100644 --- a/src/audio/sfx/sfx_33.asm +++ b/src/audio/sfx/sfx_33.asm @@ -1,4 +1,4 @@ -SFX_33_Ch1: ; fdddd (3f:5ddd) +Sfx33_Ch1: ; fdddd (3f:5ddd) sfx_1 255 sfx_8 17 sfx_2 0 @@ -76,7 +76,7 @@ SFX_33_Ch1: ; fdddd (3f:5ddd) sfx_1 255 sfx_end -SFX_33_Ch2: ; fde73 (3f:5e73) +Sfx33_Ch2: ; fde73 (3f:5e73) sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_34.asm b/src/audio/sfx/sfx_34.asm index 94fb687..41c6b64 100644 --- a/src/audio/sfx/sfx_34.asm +++ b/src/audio/sfx/sfx_34.asm @@ -1,4 +1,4 @@ -SFX_34_Ch1: ; fdec8 (3f:5ec8) +Sfx34_Ch1: ; fdec8 (3f:5ec8) sfx_8 17 sfx_2 8 sfx_loop 3 diff --git a/src/audio/sfx/sfx_35.asm b/src/audio/sfx/sfx_35.asm index db50b5b..9cc6cc5 100644 --- a/src/audio/sfx/sfx_35.asm +++ b/src/audio/sfx/sfx_35.asm @@ -1,4 +1,4 @@ -SFX_35_Ch1: ; fdefd (3f:5efd) +Sfx35_Ch1: ; fdefd (3f:5efd) sfx_8 17 sfx_1 47 sfx_0 0, 8 diff --git a/src/audio/sfx/sfx_36.asm b/src/audio/sfx/sfx_36.asm index 04c7c52..4a281b4 100644 --- a/src/audio/sfx/sfx_36.asm +++ b/src/audio/sfx/sfx_36.asm @@ -1,4 +1,4 @@ -SFX_36_Ch1: ; fdf5d (3f:5f5d) +Sfx36_Ch1: ; fdf5d (3f:5f5d) sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_37.asm b/src/audio/sfx/sfx_37.asm index 0be5964..5854700 100644 --- a/src/audio/sfx/sfx_37.asm +++ b/src/audio/sfx/sfx_37.asm @@ -1,4 +1,4 @@ -SFX_37_Ch1: ; fe04e (3f:604e) +Sfx37_Ch1: ; fe04e (3f:604e) sfx_1 255 sfx_8 17 sfx_2 0 @@ -76,7 +76,7 @@ SFX_37_Ch1: ; fe04e (3f:604e) sfx_1 255 sfx_end -SFX_37_Ch2: ; fe0e4 (3f:60e4) +Sfx37_Ch2: ; fe0e4 (3f:60e4) sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_38.asm b/src/audio/sfx/sfx_38.asm index 66af1e6..66f6572 100644 --- a/src/audio/sfx/sfx_38.asm +++ b/src/audio/sfx/sfx_38.asm @@ -1,4 +1,4 @@ -SFX_38_Ch1: ; fe13b (3f:613b) +Sfx38_Ch1: ; fe13b (3f:613b) sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_39.asm b/src/audio/sfx/sfx_39.asm index 68146e0..8d2d6ae 100644 --- a/src/audio/sfx/sfx_39.asm +++ b/src/audio/sfx/sfx_39.asm @@ -1,4 +1,4 @@ -SFX_39_Ch1: ; fe42a (3f:642a) +Sfx39_Ch1: ; fe42a (3f:642a) sfx_8 17 sfx_1 159 sfx_2 0 @@ -98,7 +98,7 @@ SFX_39_Ch1: ; fe42a (3f:642a) sfx_0 7, 157 sfx_end -SFX_39_Ch2: ; fe4eb (3f:64eb) +Sfx39_Ch2: ; fe4eb (3f:64eb) sfx_8 17 sfx_loop 2 sfx_1 207 diff --git a/src/audio/sfx/sfx_3a.asm b/src/audio/sfx/sfx_3a.asm index 961e94c..a017511 100644 --- a/src/audio/sfx/sfx_3a.asm +++ b/src/audio/sfx/sfx_3a.asm @@ -1,4 +1,4 @@ -SFX_3a_Ch1: ; fe533 (3f:6533) +Sfx3a_Ch1: ; fe533 (3f:6533) sfx_8 17 sfx_1 87 sfx_2 0 diff --git a/src/audio/sfx/sfx_3b.asm b/src/audio/sfx/sfx_3b.asm index b134155..1433eb2 100644 --- a/src/audio/sfx/sfx_3b.asm +++ b/src/audio/sfx/sfx_3b.asm @@ -1,4 +1,4 @@ -SFX_3b_Ch1: ; fe638 (3f:6638) +Sfx3b_Ch1: ; fe638 (3f:6638) sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_3c.asm b/src/audio/sfx/sfx_3c.asm index 045b4f6..d4786fc 100644 --- a/src/audio/sfx/sfx_3c.asm +++ b/src/audio/sfx/sfx_3c.asm @@ -1,4 +1,4 @@ -SFX_3c_Ch1: ; fe685 (3f:6685) +Sfx3c_Ch1: ; fe685 (3f:6685) sfx_loop 4 sfx_1 244 sfx_8 17 diff --git a/src/audio/sfx/sfx_3d.asm b/src/audio/sfx/sfx_3d.asm index da0a093..55c8a6e 100644 --- a/src/audio/sfx/sfx_3d.asm +++ b/src/audio/sfx/sfx_3d.asm @@ -1,4 +1,4 @@ -SFX_3d_Ch1: ; fe6fc (3f:66fc) +Sfx3d_Ch1: ; fe6fc (3f:66fc) sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_3e.asm b/src/audio/sfx/sfx_3e.asm index c5db7f1..7a690db 100644 --- a/src/audio/sfx/sfx_3e.asm +++ b/src/audio/sfx/sfx_3e.asm @@ -1,4 +1,4 @@ -SFX_3e_Ch1: ; fe7c0 (3f:67c0) +Sfx3e_Ch1: ; fe7c0 (3f:67c0) sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_3f.asm b/src/audio/sfx/sfx_3f.asm index e672dc5..20d9001 100644 --- a/src/audio/sfx/sfx_3f.asm +++ b/src/audio/sfx/sfx_3f.asm @@ -1,4 +1,4 @@ -SFX_3f_Ch1: ; fe7f3 (3f:67f3) +Sfx3f_Ch1: ; fe7f3 (3f:67f3) sfx_8 17 sfx_loop 20 sfx_1 193 diff --git a/src/audio/sfx/sfx_40.asm b/src/audio/sfx/sfx_40.asm index 9599a66..c6ba2f1 100644 --- a/src/audio/sfx/sfx_40.asm +++ b/src/audio/sfx/sfx_40.asm @@ -1,4 +1,4 @@ -SFX_40_Ch1: ; fe807 (3f:6807) +Sfx40_Ch1: ; fe807 (3f:6807) sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_41.asm b/src/audio/sfx/sfx_41.asm index 57a78bb..982c30e 100644 --- a/src/audio/sfx/sfx_41.asm +++ b/src/audio/sfx/sfx_41.asm @@ -1,4 +1,4 @@ -SFX_41_Ch1: ; fe8f8 (3f:68f8) +Sfx41_Ch1: ; fe8f8 (3f:68f8) sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_42.asm b/src/audio/sfx/sfx_42.asm index 5ee3bfe..5ac2ccb 100644 --- a/src/audio/sfx/sfx_42.asm +++ b/src/audio/sfx/sfx_42.asm @@ -1,4 +1,4 @@ -SFX_42_Ch1: ; fe9cf (3f:69cf) +Sfx42_Ch1: ; fe9cf (3f:69cf) sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_43.asm b/src/audio/sfx/sfx_43.asm index dd7f416..a5e64d0 100644 --- a/src/audio/sfx/sfx_43.asm +++ b/src/audio/sfx/sfx_43.asm @@ -1,4 +1,4 @@ -SFX_43_Ch1: ; fea4d (3f:6a4d) +Sfx43_Ch1: ; fea4d (3f:6a4d) sfx_8 17 sfx_loop 2 sfx_1 31 diff --git a/src/audio/sfx/sfx_44.asm b/src/audio/sfx/sfx_44.asm index 807779b..bfacfe9 100644 --- a/src/audio/sfx/sfx_44.asm +++ b/src/audio/sfx/sfx_44.asm @@ -1,4 +1,4 @@ -SFX_44_Ch1: ; feaa5 (3f:6aa5) +Sfx44_Ch1: ; feaa5 (3f:6aa5) sfx_8 17 sfx_loop 2 sfx_1 31 diff --git a/src/audio/sfx/sfx_45.asm b/src/audio/sfx/sfx_45.asm index 6242983..84b337c 100644 --- a/src/audio/sfx/sfx_45.asm +++ b/src/audio/sfx/sfx_45.asm @@ -1,4 +1,4 @@ -SFX_45_Ch1: ; feb5e (3f:6b5e) +Sfx45_Ch1: ; feb5e (3f:6b5e) sfx_loop 17 sfx_1 135 sfx_8 17 diff --git a/src/audio/sfx/sfx_46.asm b/src/audio/sfx/sfx_46.asm index f680133..d99aeef 100644 --- a/src/audio/sfx/sfx_46.asm +++ b/src/audio/sfx/sfx_46.asm @@ -1,4 +1,4 @@ -SFX_46_Ch1: ; febd1 (3f:6bd1) +Sfx46_Ch1: ; febd1 (3f:6bd1) sfx_1 239 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_47.asm b/src/audio/sfx/sfx_47.asm index 2e14f11..ba06a36 100644 --- a/src/audio/sfx/sfx_47.asm +++ b/src/audio/sfx/sfx_47.asm @@ -1,4 +1,4 @@ -SFX_47_Ch1: ; fed02 (3f:6d02) +Sfx47_Ch1: ; fed02 (3f:6d02) sfx_8 17 sfx_1 207 sfx_0 0, 113 diff --git a/src/audio/sfx/sfx_48.asm b/src/audio/sfx/sfx_48.asm index e74ee65..495164c 100644 --- a/src/audio/sfx/sfx_48.asm +++ b/src/audio/sfx/sfx_48.asm @@ -1,4 +1,4 @@ -SFX_48_Ch1: ; fed55 (3f:6d55) +Sfx48_Ch1: ; fed55 (3f:6d55) sfx_8 17 sfx_1 207 sfx_0 0, 116 diff --git a/src/audio/sfx/sfx_49.asm b/src/audio/sfx/sfx_49.asm index 2e777af..0b7355c 100644 --- a/src/audio/sfx/sfx_49.asm +++ b/src/audio/sfx/sfx_49.asm @@ -1,4 +1,4 @@ -SFX_49_Ch1: ; fedcc (3f:6dcc) +Sfx49_Ch1: ; fedcc (3f:6dcc) sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4a.asm b/src/audio/sfx/sfx_4a.asm index b4f59ed..c5cec57 100644 --- a/src/audio/sfx/sfx_4a.asm +++ b/src/audio/sfx/sfx_4a.asm @@ -1,4 +1,4 @@ -SFX_4a_Ch1: ; fee7c (3f:6e7c) +Sfx4a_Ch1: ; fee7c (3f:6e7c) sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4b.asm b/src/audio/sfx/sfx_4b.asm index de97c38..53f2a8b 100644 --- a/src/audio/sfx/sfx_4b.asm +++ b/src/audio/sfx/sfx_4b.asm @@ -1,4 +1,4 @@ -SFX_4b_Ch1: ; fef2d (3f:6f2d) +Sfx4b_Ch1: ; fef2d (3f:6f2d) sfx_8 17 sfx_1 47 sfx_0 0, 8 diff --git a/src/audio/sfx/sfx_4c.asm b/src/audio/sfx/sfx_4c.asm index 55cde21..6a117ad 100644 --- a/src/audio/sfx/sfx_4c.asm +++ b/src/audio/sfx/sfx_4c.asm @@ -1,4 +1,4 @@ -SFX_4c_Ch1: ; fef8d (3f:6f8d) +Sfx4c_Ch1: ; fef8d (3f:6f8d) sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4d.asm b/src/audio/sfx/sfx_4d.asm index 6fa0447..efb8328 100644 --- a/src/audio/sfx/sfx_4d.asm +++ b/src/audio/sfx/sfx_4d.asm @@ -1,4 +1,4 @@ -SFX_4d_Ch1: ; ff0b7 (3f:70b7) +Sfx4d_Ch1: ; ff0b7 (3f:70b7) sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_4e.asm b/src/audio/sfx/sfx_4e.asm index a797bd3..88f8aaa 100644 --- a/src/audio/sfx/sfx_4e.asm +++ b/src/audio/sfx/sfx_4e.asm @@ -1,4 +1,4 @@ -SFX_4e_Ch1: ; ff313 (3f:7313) +Sfx4e_Ch1: ; ff313 (3f:7313) sfx_1 239 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_4f.asm b/src/audio/sfx/sfx_4f.asm index b407f80..61031b2 100644 --- a/src/audio/sfx/sfx_4f.asm +++ b/src/audio/sfx/sfx_4f.asm @@ -1,4 +1,4 @@ -SFX_4f_Ch1: ; ff49b (3f:749b) +Sfx4f_Ch1: ; ff49b (3f:749b) sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_50.asm b/src/audio/sfx/sfx_50.asm index 2ae5e33..34784ed 100644 --- a/src/audio/sfx/sfx_50.asm +++ b/src/audio/sfx/sfx_50.asm @@ -1,4 +1,4 @@ -SFX_50_Ch1: ; ff4fa (3f:74fa) +Sfx50_Ch1: ; ff4fa (3f:74fa) sfx_1 159 sfx_8 17 sfx_2 0 @@ -87,7 +87,7 @@ SFX_50_Ch1: ; ff4fa (3f:74fa) sfx_1 31 sfx_end -SFX_50_Ch2: ; ff5a0 (3f:75a0) +Sfx50_Ch2: ; ff5a0 (3f:75a0) sfx_1 207 sfx_8 17 sfx_loop 3 diff --git a/src/audio/sfx/sfx_51.asm b/src/audio/sfx/sfx_51.asm index 114ccda..87b89aa 100644 --- a/src/audio/sfx/sfx_51.asm +++ b/src/audio/sfx/sfx_51.asm @@ -1,4 +1,4 @@ -SFX_51_Ch1: ; ff5f8 (3f:75f8) +Sfx51_Ch1: ; ff5f8 (3f:75f8) sfx_1 0 sfx_5 0 sfx_6 20 @@ -122,7 +122,7 @@ SFX_51_Ch1: ; ff5f8 (3f:75f8) sfx_endloop sfx_end -SFX_51_Ch2: ; ff6e6 (3f:76e6) +Sfx51_Ch2: ; ff6e6 (3f:76e6) sfx_loop 65 sfx_1 127 sfx_8 17 diff --git a/src/audio/sfx/sfx_52.asm b/src/audio/sfx/sfx_52.asm index c3e8b3a..2da2234 100644 --- a/src/audio/sfx/sfx_52.asm +++ b/src/audio/sfx/sfx_52.asm @@ -1,4 +1,4 @@ -SFX_52_Ch1: ; ff714 (3f:7714) +Sfx52_Ch1: ; ff714 (3f:7714) sfx_1 255 sfx_8 17 sfx_2 8 @@ -91,7 +91,7 @@ SFX_52_Ch1: ; ff714 (3f:7714) sfx_1 31 sfx_end -SFX_52_Ch2: ; ff7bf (3f:77bf) +Sfx52_Ch2: ; ff7bf (3f:77bf) sfx_8 17 sfx_loop 2 sfx_1 0 diff --git a/src/audio/sfx/sfx_53.asm b/src/audio/sfx/sfx_53.asm index f59c97c..f01dc82 100644 --- a/src/audio/sfx/sfx_53.asm +++ b/src/audio/sfx/sfx_53.asm @@ -1,4 +1,4 @@ -SFX_53_Ch1: ; ff81d (3f:781d) +Sfx53_Ch1: ; ff81d (3f:781d) sfx_1 255 sfx_8 17 sfx_2 8 @@ -91,7 +91,7 @@ SFX_53_Ch1: ; ff81d (3f:781d) sfx_1 31 sfx_end -SFX_53_Ch2: ; ff8c8 (3f:78c8) +Sfx53_Ch2: ; ff8c8 (3f:78c8) sfx_8 17 sfx_loop 2 sfx_1 0 diff --git a/src/audio/sfx/sfx_54.asm b/src/audio/sfx/sfx_54.asm index de05745..c988627 100644 --- a/src/audio/sfx/sfx_54.asm +++ b/src/audio/sfx/sfx_54.asm @@ -1,4 +1,4 @@ -SFX_54_Ch1: ; ff92c (3f:792c) +Sfx54_Ch1: ; ff92c (3f:792c) sfx_1 231 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_55.asm b/src/audio/sfx/sfx_55.asm index 2bd0b61..928427b 100644 --- a/src/audio/sfx/sfx_55.asm +++ b/src/audio/sfx/sfx_55.asm @@ -1,4 +1,4 @@ -SFX_55_Ch1: ; ff960 (3f:7960) +Sfx55_Ch1: ; ff960 (3f:7960) sfx_1 231 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_56.asm b/src/audio/sfx/sfx_56.asm index d36edf5..0acbe76 100644 --- a/src/audio/sfx/sfx_56.asm +++ b/src/audio/sfx/sfx_56.asm @@ -1,4 +1,4 @@ -SFX_56_Ch1: ; ff98b (3f:798b) +Sfx56_Ch1: ; ff98b (3f:798b) sfx_1 247 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_57.asm b/src/audio/sfx/sfx_57.asm index 3d2f5df..ed7f832 100644 --- a/src/audio/sfx/sfx_57.asm +++ b/src/audio/sfx/sfx_57.asm @@ -1,4 +1,4 @@ -SFX_57_Ch1: ; ffa05 (3f:7a05) +Sfx57_Ch1: ; ffa05 (3f:7a05) sfx_loop 50 sfx_1 164 sfx_8 17 diff --git a/src/audio/sfx/sfx_58.asm b/src/audio/sfx/sfx_58.asm index 68e7271..3311c80 100644 --- a/src/audio/sfx/sfx_58.asm +++ b/src/audio/sfx/sfx_58.asm @@ -1,4 +1,4 @@ -SFX_58_Ch1: ; ffa30 (3f:7a30) +Sfx58_Ch1: ; ffa30 (3f:7a30) sfx_1 207 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_59.asm b/src/audio/sfx/sfx_59.asm index b948993..f272af9 100644 --- a/src/audio/sfx/sfx_59.asm +++ b/src/audio/sfx/sfx_59.asm @@ -1,4 +1,4 @@ -SFX_59_Ch1: ; ffb0c (3f:7b0c) +Sfx59_Ch1: ; ffb0c (3f:7b0c) sfx_1 207 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_5a.asm b/src/audio/sfx/sfx_5a.asm index 4cdbcab..87f6684 100644 --- a/src/audio/sfx/sfx_5a.asm +++ b/src/audio/sfx/sfx_5a.asm @@ -1,4 +1,4 @@ -SFX_5a_Ch1: ; ffc03 (3f:7c03) +Sfx5a_Ch1: ; ffc03 (3f:7c03) sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_5b.asm b/src/audio/sfx/sfx_5b.asm index 528894a..b647b05 100644 --- a/src/audio/sfx/sfx_5b.asm +++ b/src/audio/sfx/sfx_5b.asm @@ -1,4 +1,4 @@ -SFX_5b_Ch1: ; ffcbf (3f:7cbf) +Sfx5b_Ch1: ; ffcbf (3f:7cbf) sfx_1 196 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_5c.asm b/src/audio/sfx/sfx_5c.asm index 393f521..60d66e2 100644 --- a/src/audio/sfx/sfx_5c.asm +++ b/src/audio/sfx/sfx_5c.asm @@ -1,4 +1,4 @@ -SFX_5c_Ch1: ; ffd5b (3f:7d5b) +Sfx5c_Ch1: ; ffd5b (3f:7d5b) sfx_loop 30 sfx_1 191 sfx_8 17 diff --git a/src/audio/sfx/sfx_5d.asm b/src/audio/sfx/sfx_5d.asm index 343ec7f..0067e8b 100644 --- a/src/audio/sfx/sfx_5d.asm +++ b/src/audio/sfx/sfx_5d.asm @@ -1,4 +1,4 @@ -SFX_5d_Ch1: ; ffd89 (3f:7d89) +Sfx5d_Ch1: ; ffd89 (3f:7d89) sfx_1 0 sfx_5 0 sfx_6 6 @@ -70,7 +70,7 @@ SFX_5d_Ch1: ; ffd89 (3f:7d89) sfx_6 1 sfx_end -SFX_5d_Ch2: ; ffe0d (3f:7e0d) +Sfx5d_Ch2: ; ffe0d (3f:7e0d) sfx_1 196 sfx_8 17 sfx_2 8 @@ -101,7 +101,7 @@ SFX_5d_Ch2: ; ffe0d (3f:7e0d) sfx_0 6, 246 sfx_end -SFX_5d_Ch3: ; ffe3f (3f:7e3f) +Sfx5d_Ch3: ; ffe3f (3f:7e3f) sfx_1 119 sfx_8 17 sfx_0 0, 17 diff --git a/src/audio/sfx/sfx_5e.asm b/src/audio/sfx/sfx_5e.asm index 0d69559..8a260f7 100644 --- a/src/audio/sfx/sfx_5e.asm +++ b/src/audio/sfx/sfx_5e.asm @@ -1,4 +1,4 @@ -SFX_5e_Ch1: ; ffe92 (3f:7e92) +Sfx5e_Ch1: ; ffe92 (3f:7e92) sfx_1 196 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_5f.asm b/src/audio/sfx/sfx_5f.asm index a79d11e..7756369 100644 --- a/src/audio/sfx/sfx_5f.asm +++ b/src/audio/sfx/sfx_5f.asm @@ -1,4 +1,4 @@ -SFX_5f_Ch1: ; fff04 (3f:7f04) +Sfx5f_Ch1: ; fff04 (3f:7f04) sfx_1 247 sfx_8 17 sfx_0 0, 68 diff --git a/src/audio/sfx_headers.asm b/src/audio/sfx_headers.asm index 6485425..1554ddd 100644 --- a/src/audio/sfx_headers.asm +++ b/src/audio/sfx_headers.asm @@ -2,493 +2,493 @@ NumberOfSFX: ; fc290 (3f:4290) db $60 SFXHeaderPointers: ; fc291 (3f:4291) - dw SFX_Stop - dw SFX_01 - dw SFX_02 - dw SFX_03 - dw SFX_04 - dw SFX_05 - dw SFX_06 - dw SFX_07 - dw SFX_08 - dw SFX_09 - dw SFX_0a - dw SFX_0b - dw SFX_0c - dw SFX_0d - dw SFX_0e - dw SFX_0f - dw SFX_10 - dw SFX_11 - dw SFX_12 - dw SFX_13 - dw SFX_14 - dw SFX_15 - dw SFX_16 - dw SFX_17 - dw SFX_18 - dw SFX_19 - dw SFX_1a - dw SFX_1b - dw SFX_1c - dw SFX_1d - dw SFX_1e - dw SFX_1f - dw SFX_20 - dw SFX_21 - dw SFX_22 - dw SFX_23 - dw SFX_24 - dw SFX_25 - dw SFX_26 - dw SFX_27 - dw SFX_28 - dw SFX_29 - dw SFX_2a - dw SFX_2b - dw SFX_2c - dw SFX_2d - dw SFX_2e - dw SFX_2f - dw SFX_30 - dw SFX_31 - dw SFX_32 - dw SFX_33 - dw SFX_34 - dw SFX_35 - dw SFX_36 - dw SFX_37 - dw SFX_38 - dw SFX_39 - dw SFX_3a - dw SFX_3b - dw SFX_3c - dw SFX_3d - dw SFX_3e - dw SFX_3f - dw SFX_40 - dw SFX_41 - dw SFX_42 - dw SFX_43 - dw SFX_44 - dw SFX_45 - dw SFX_46 - dw SFX_47 - dw SFX_48 - dw SFX_49 - dw SFX_4a - dw SFX_4b - dw SFX_4c - dw SFX_4d - dw SFX_4e - dw SFX_4f - dw SFX_50 - dw SFX_51 - dw SFX_52 - dw SFX_53 - dw SFX_54 - dw SFX_55 - dw SFX_56 - dw SFX_57 - dw SFX_58 - dw SFX_59 - dw SFX_5a - dw SFX_5b - dw SFX_5c - dw SFX_5d - dw SFX_5e - dw SFX_5f - -SFX_Stop: ; fc351 (3f:4351) + dw SfxStop + dw Sfx01 + dw Sfx02 + dw Sfx03 + dw Sfx04 + dw Sfx05 + dw Sfx06 + dw Sfx07 + dw Sfx08 + dw Sfx09 + dw Sfx0a + dw Sfx0b + dw Sfx0c + dw Sfx0d + dw Sfx0e + dw Sfx0f + dw Sfx10 + dw Sfx11 + dw Sfx12 + dw Sfx13 + dw Sfx14 + dw Sfx15 + dw Sfx16 + dw Sfx17 + dw Sfx18 + dw Sfx19 + dw Sfx1a + dw Sfx1b + dw Sfx1c + dw Sfx1d + dw Sfx1e + dw Sfx1f + dw Sfx20 + dw Sfx21 + dw Sfx22 + dw Sfx23 + dw Sfx24 + dw Sfx25 + dw Sfx26 + dw Sfx27 + dw Sfx28 + dw Sfx29 + dw Sfx2a + dw Sfx2b + dw Sfx2c + dw Sfx2d + dw Sfx2e + dw Sfx2f + dw Sfx30 + dw Sfx31 + dw Sfx32 + dw Sfx33 + dw Sfx34 + dw Sfx35 + dw Sfx36 + dw Sfx37 + dw Sfx38 + dw Sfx39 + dw Sfx3a + dw Sfx3b + dw Sfx3c + dw Sfx3d + dw Sfx3e + dw Sfx3f + dw Sfx40 + dw Sfx41 + dw Sfx42 + dw Sfx43 + dw Sfx44 + dw Sfx45 + dw Sfx46 + dw Sfx47 + dw Sfx48 + dw Sfx49 + dw Sfx4a + dw Sfx4b + dw Sfx4c + dw Sfx4d + dw Sfx4e + dw Sfx4f + dw Sfx50 + dw Sfx51 + dw Sfx52 + dw Sfx53 + dw Sfx54 + dw Sfx55 + dw Sfx56 + dw Sfx57 + dw Sfx58 + dw Sfx59 + dw Sfx5a + dw Sfx5b + dw Sfx5c + dw Sfx5d + dw Sfx5e + dw Sfx5f + +SfxStop: ; fc351 (3f:4351) db %0000 -SFX_01: ; fc352 (3f:4352) +Sfx01: ; fc352 (3f:4352) db %0010 - dw SFX_01_Ch1 + dw Sfx01_Ch1 -SFX_02: ; fc355 (3f:4355) +Sfx02: ; fc355 (3f:4355) db %0010 - dw SFX_02_Ch1 + dw Sfx02_Ch1 -SFX_03: ; fc358 (3f:4358) +Sfx03: ; fc358 (3f:4358) db %0010 - dw SFX_03_Ch1 + dw Sfx03_Ch1 -SFX_04: ; fc35b (3f:435b) +Sfx04: ; fc35b (3f:435b) db %0010 - dw SFX_04_Ch1 + dw Sfx04_Ch1 -SFX_05: ; fc35e (3f:435e) +Sfx05: ; fc35e (3f:435e) db %0010 - dw SFX_05_Ch1 + dw Sfx05_Ch1 -SFX_06: ; fc361 (3f:4361) +Sfx06: ; fc361 (3f:4361) db %0010 - dw SFX_06_Ch1 + dw Sfx06_Ch1 -SFX_07: ; fc364 (3f:4364) +Sfx07: ; fc364 (3f:4364) db %1000 - dw SFX_07_Ch1 + dw Sfx07_Ch1 -SFX_08: ; fc367 (3f:4367) +Sfx08: ; fc367 (3f:4367) db %1000 - dw SFX_08_Ch1 + dw Sfx08_Ch1 -SFX_09: ; fc36a (3f:436a) +Sfx09: ; fc36a (3f:436a) db %1000 - dw SFX_09_Ch1 + dw Sfx09_Ch1 -SFX_0a: ; fc36d (3f:436d) +Sfx0a: ; fc36d (3f:436d) db %0010 - dw SFX_0a_Ch1 + dw Sfx0a_Ch1 -SFX_0b: ; fc370 (3f:4370) +Sfx0b: ; fc370 (3f:4370) db %0010 - dw SFX_0b_Ch1 + dw Sfx0b_Ch1 -SFX_0c: ; fc373 (3f:4373) +Sfx0c: ; fc373 (3f:4373) db %1000 - dw SFX_0c_Ch1 + dw Sfx0c_Ch1 -SFX_0d: ; fc376 (3f:4376) +Sfx0d: ; fc376 (3f:4376) db %0010 - dw SFX_0d_Ch1 + dw Sfx0d_Ch1 -SFX_0e: ; fc379 (3f:4379) +Sfx0e: ; fc379 (3f:4379) db %0010 - dw SFX_0e_Ch1 + dw Sfx0e_Ch1 -SFX_0f: ; fc37c (3f:437c) +Sfx0f: ; fc37c (3f:437c) db %1000 - dw SFX_0f_Ch1 + dw Sfx0f_Ch1 -SFX_10: ; fc37f (3f:437f) +Sfx10: ; fc37f (3f:437f) db %0010 - dw SFX_10_Ch1 + dw Sfx10_Ch1 -SFX_11: ; fc382 (3f:4382) +Sfx11: ; fc382 (3f:4382) db %0010 - dw SFX_11_Ch1 + dw Sfx11_Ch1 -SFX_12: ; fc385 (3f:4385) +Sfx12: ; fc385 (3f:4385) db %0010 - dw SFX_12_Ch1 + dw Sfx12_Ch1 -SFX_13: ; fc388 (3f:4388) +Sfx13: ; fc388 (3f:4388) db %0010 - dw SFX_13_Ch1 + dw Sfx13_Ch1 -SFX_14: ; fc38b (3f:438b) +Sfx14: ; fc38b (3f:438b) db %0010 - dw SFX_14_Ch1 + dw Sfx14_Ch1 -SFX_15: ; fc38e (3f:438e) +Sfx15: ; fc38e (3f:438e) db %0010 - dw SFX_15_Ch1 + dw Sfx15_Ch1 -SFX_16: ; fc391 (3f:4391) +Sfx16: ; fc391 (3f:4391) db %1000 - dw SFX_16_Ch1 + dw Sfx16_Ch1 -SFX_17: ; fc394 (3f:4394) +Sfx17: ; fc394 (3f:4394) db %1000 - dw SFX_17_Ch1 + dw Sfx17_Ch1 -SFX_18: ; fc397 (3f:4397) +Sfx18: ; fc397 (3f:4397) db %1000 - dw SFX_18_Ch1 + dw Sfx18_Ch1 -SFX_19: ; fc39a (3f:439a) +Sfx19: ; fc39a (3f:439a) db %1000 - dw SFX_19_Ch1 + dw Sfx19_Ch1 -SFX_1a: ; fc39d (3f:439d) +Sfx1a: ; fc39d (3f:439d) db %1000 - dw SFX_1a_Ch1 + dw Sfx1a_Ch1 -SFX_1b: ; fc3a0 (3f:43a0) +Sfx1b: ; fc3a0 (3f:43a0) db %1000 - dw SFX_1b_Ch1 + dw Sfx1b_Ch1 -SFX_1c: ; fc3a3 (3f:43a3) +Sfx1c: ; fc3a3 (3f:43a3) db %1000 - dw SFX_1c_Ch1 + dw Sfx1c_Ch1 -SFX_1d: ; fc3a6 (3f:43a6) +Sfx1d: ; fc3a6 (3f:43a6) db %1000 - dw SFX_1d_Ch1 + dw Sfx1d_Ch1 -SFX_1e: ; fc3a9 (3f:43a9) +Sfx1e: ; fc3a9 (3f:43a9) db %1000 - dw SFX_1e_Ch1 + dw Sfx1e_Ch1 -SFX_1f: ; fc3ac (3f:43ac) +Sfx1f: ; fc3ac (3f:43ac) db %1000 - dw SFX_1f_Ch1 + dw Sfx1f_Ch1 -SFX_20: ; fc3af (3f:43af) +Sfx20: ; fc3af (3f:43af) db %1000 - dw SFX_20_Ch1 + dw Sfx20_Ch1 -SFX_21: ; fc3b2 (3f:43b2) +Sfx21: ; fc3b2 (3f:43b2) db %1000 - dw SFX_21_Ch1 + dw Sfx21_Ch1 -SFX_22: ; fc3b5 (3f:43b5) +Sfx22: ; fc3b5 (3f:43b5) db %1000 - dw SFX_22_Ch1 + dw Sfx22_Ch1 -SFX_23: ; fc3b8 (3f:43b8) +Sfx23: ; fc3b8 (3f:43b8) db %1000 - dw SFX_23_Ch1 + dw Sfx23_Ch1 -SFX_24: ; fc3bb (3f:43bb) +Sfx24: ; fc3bb (3f:43bb) db %1000 - dw SFX_24_Ch1 + dw Sfx24_Ch1 -SFX_25: ; fc3be (3f:43be) +Sfx25: ; fc3be (3f:43be) db %0010 - dw SFX_25_Ch1 + dw Sfx25_Ch1 -SFX_26: ; fc3c1 (3f:43c1) +Sfx26: ; fc3c1 (3f:43c1) db %0010 - dw SFX_26_Ch1 + dw Sfx26_Ch1 -SFX_27: ; fc3c4 (3f:43c4) +Sfx27: ; fc3c4 (3f:43c4) db %0010 - dw SFX_27_Ch1 + dw Sfx27_Ch1 -SFX_28: ; fc3c7 (3f:43c7) +Sfx28: ; fc3c7 (3f:43c7) db %1010 - dw SFX_28_Ch1 - dw SFX_28_Ch2 + dw Sfx28_Ch1 + dw Sfx28_Ch2 -SFX_29: ; fc3cc (3f:43cc) +Sfx29: ; fc3cc (3f:43cc) db %1000 - dw SFX_29_Ch1 + dw Sfx29_Ch1 -SFX_2a: ; fc3cf (3f:43cf) +Sfx2a: ; fc3cf (3f:43cf) db %1000 - dw SFX_2a_Ch1 + dw Sfx2a_Ch1 -SFX_2b: ; fc3d2 (3f:43d2) +Sfx2b: ; fc3d2 (3f:43d2) db %0010 - dw SFX_2b_Ch1 + dw Sfx2b_Ch1 -SFX_2c: ; fc3d5 (3f:43d5) +Sfx2c: ; fc3d5 (3f:43d5) db %0010 - dw SFX_2c_Ch1 + dw Sfx2c_Ch1 -SFX_2d: ; fc3d8 (3f:43d8) +Sfx2d: ; fc3d8 (3f:43d8) db %1000 - dw SFX_2d_Ch1 + dw Sfx2d_Ch1 -SFX_2e: ; fc3db (3f:43db) +Sfx2e: ; fc3db (3f:43db) db %1000 - dw SFX_2e_Ch1 + dw Sfx2e_Ch1 -SFX_2f: ; fc3de (3f:43de) +Sfx2f: ; fc3de (3f:43de) db %1000 - dw SFX_2f_Ch1 + dw Sfx2f_Ch1 -SFX_30: ; fc3e1 (3f:43e1) +Sfx30: ; fc3e1 (3f:43e1) db %1000 - dw SFX_30_Ch1 + dw Sfx30_Ch1 -SFX_31: ; fc3e4 (3f:43e4) +Sfx31: ; fc3e4 (3f:43e4) db %0010 - dw SFX_31_Ch1 + dw Sfx31_Ch1 -SFX_32: ; fc3e7 (3f:43e7) +Sfx32: ; fc3e7 (3f:43e7) db %1010 - dw SFX_32_Ch1 - dw SFX_32_Ch2 + dw Sfx32_Ch1 + dw Sfx32_Ch2 -SFX_33: ; fc3ec (3f:43ec) +Sfx33: ; fc3ec (3f:43ec) db %1010 - dw SFX_33_Ch1 - dw SFX_33_Ch2 + dw Sfx33_Ch1 + dw Sfx33_Ch2 -SFX_34: ; fc3f1 (3f:43f1) +Sfx34: ; fc3f1 (3f:43f1) db %0010 - dw SFX_34_Ch1 + dw Sfx34_Ch1 -SFX_35: ; fc3f4 (3f:43f4) +Sfx35: ; fc3f4 (3f:43f4) db %1000 - dw SFX_35_Ch1 + dw Sfx35_Ch1 -SFX_36: ; fc3f7 (3f:43f7) +Sfx36: ; fc3f7 (3f:43f7) db %0010 - dw SFX_36_Ch1 + dw Sfx36_Ch1 -SFX_37: ; fc3fa (3f:43fa) +Sfx37: ; fc3fa (3f:43fa) db %1010 - dw SFX_37_Ch1 - dw SFX_37_Ch2 + dw Sfx37_Ch1 + dw Sfx37_Ch2 -SFX_38: ; fc3ff (3f:43ff) +Sfx38: ; fc3ff (3f:43ff) db %0010 - dw SFX_38_Ch1 + dw Sfx38_Ch1 -SFX_39: ; fc402 (3f:4402) +Sfx39: ; fc402 (3f:4402) db %1010 - dw SFX_39_Ch1 - dw SFX_39_Ch2 + dw Sfx39_Ch1 + dw Sfx39_Ch2 -SFX_3a: ; fc407 (3f:4407) +Sfx3a: ; fc407 (3f:4407) db %0010 - dw SFX_3a_Ch1 + dw Sfx3a_Ch1 -SFX_3b: ; fc40a (3f:440a) +Sfx3b: ; fc40a (3f:440a) db %0010 - dw SFX_3b_Ch1 + dw Sfx3b_Ch1 -SFX_3c: ; fc40d (3f:440d) +Sfx3c: ; fc40d (3f:440d) db %0010 - dw SFX_3c_Ch1 + dw Sfx3c_Ch1 -SFX_3d: ; fc410 (3f:4410) +Sfx3d: ; fc410 (3f:4410) db %0010 - dw SFX_3d_Ch1 + dw Sfx3d_Ch1 -SFX_3e: ; fc413 (3f:4413) +Sfx3e: ; fc413 (3f:4413) db %0010 - dw SFX_3e_Ch1 + dw Sfx3e_Ch1 -SFX_3f: ; fc416 (3f:4416) +Sfx3f: ; fc416 (3f:4416) db %1000 - dw SFX_3f_Ch1 + dw Sfx3f_Ch1 -SFX_40: ; fc419 (3f:4419) +Sfx40: ; fc419 (3f:4419) db %0010 - dw SFX_40_Ch1 + dw Sfx40_Ch1 -SFX_41: ; fc41c (3f:441c) +Sfx41: ; fc41c (3f:441c) db %0010 - dw SFX_41_Ch1 + dw Sfx41_Ch1 -SFX_42: ; fc41f (3f:441f) +Sfx42: ; fc41f (3f:441f) db %0010 - dw SFX_42_Ch1 + dw Sfx42_Ch1 -SFX_43: ; fc422 (3f:4422) +Sfx43: ; fc422 (3f:4422) db %1000 - dw SFX_43_Ch1 + dw Sfx43_Ch1 -SFX_44: ; fc425 (3f:4425) +Sfx44: ; fc425 (3f:4425) db %1000 - dw SFX_44_Ch1 + dw Sfx44_Ch1 -SFX_45: ; fc428 (3f:4428) +Sfx45: ; fc428 (3f:4428) db %0010 - dw SFX_45_Ch1 + dw Sfx45_Ch1 -SFX_46: ; fc42b (3f:442b) +Sfx46: ; fc42b (3f:442b) db %0010 - dw SFX_46_Ch1 + dw Sfx46_Ch1 -SFX_47: ; fc42e (3f:442e) +Sfx47: ; fc42e (3f:442e) db %1000 - dw SFX_47_Ch1 + dw Sfx47_Ch1 -SFX_48: ; fc431 (3f:4431) +Sfx48: ; fc431 (3f:4431) db %1000 - dw SFX_48_Ch1 + dw Sfx48_Ch1 -SFX_49: ; fc434 (3f:4434) +Sfx49: ; fc434 (3f:4434) db %0010 - dw SFX_49_Ch1 + dw Sfx49_Ch1 -SFX_4a: ; fc437 (3f:4437) +Sfx4a: ; fc437 (3f:4437) db %0010 - dw SFX_4a_Ch1 + dw Sfx4a_Ch1 -SFX_4b: ; fc43a (3f:443a) +Sfx4b: ; fc43a (3f:443a) db %1000 - dw SFX_4b_Ch1 + dw Sfx4b_Ch1 -SFX_4c: ; fc43d (3f:443d) +Sfx4c: ; fc43d (3f:443d) db %0010 - dw SFX_4c_Ch1 + dw Sfx4c_Ch1 -SFX_4d: ; fc440 (3f:4440) +Sfx4d: ; fc440 (3f:4440) db %0010 - dw SFX_4d_Ch1 + dw Sfx4d_Ch1 -SFX_4e: ; fc443 (3f:4443) +Sfx4e: ; fc443 (3f:4443) db %0010 - dw SFX_4e_Ch1 + dw Sfx4e_Ch1 -SFX_4f: ; fc446 (3f:4446) +Sfx4f: ; fc446 (3f:4446) db %0010 - dw SFX_4f_Ch1 + dw Sfx4f_Ch1 -SFX_50: ; fc449 (3f:4449) +Sfx50: ; fc449 (3f:4449) db %1010 - dw SFX_50_Ch1 - dw SFX_50_Ch2 + dw Sfx50_Ch1 + dw Sfx50_Ch2 -SFX_51: ; fc44e (3f:444e) +Sfx51: ; fc44e (3f:444e) db %1010 - dw SFX_51_Ch1 - dw SFX_51_Ch2 + dw Sfx51_Ch1 + dw Sfx51_Ch2 -SFX_52: ; fc453 (3f:4453) +Sfx52: ; fc453 (3f:4453) db %1010 - dw SFX_52_Ch1 - dw SFX_52_Ch2 + dw Sfx52_Ch1 + dw Sfx52_Ch2 -SFX_53: ; fc458 (3f:4458) +Sfx53: ; fc458 (3f:4458) db %1010 - dw SFX_53_Ch1 - dw SFX_53_Ch2 + dw Sfx53_Ch1 + dw Sfx53_Ch2 -SFX_54: ; fc45d (3f:445d) +Sfx54: ; fc45d (3f:445d) db %0010 - dw SFX_54_Ch1 + dw Sfx54_Ch1 -SFX_55: ; fc460 (3f:4460) +Sfx55: ; fc460 (3f:4460) db %0010 - dw SFX_55_Ch1 + dw Sfx55_Ch1 -SFX_56: ; fc463 (3f:4463) +Sfx56: ; fc463 (3f:4463) db %0010 - dw SFX_56_Ch1 + dw Sfx56_Ch1 -SFX_57: ; fc466 (3f:4466) +Sfx57: ; fc466 (3f:4466) db %0010 - dw SFX_57_Ch1 + dw Sfx57_Ch1 -SFX_58: ; fc469 (3f:4469) +Sfx58: ; fc469 (3f:4469) db %0010 - dw SFX_58_Ch1 + dw Sfx58_Ch1 -SFX_59: ; fc46c (3f:446c) +Sfx59: ; fc46c (3f:446c) db %0010 - dw SFX_59_Ch1 + dw Sfx59_Ch1 -SFX_5a: ; fc46f (3f:446f) +Sfx5a: ; fc46f (3f:446f) db %0010 - dw SFX_5a_Ch1 + dw Sfx5a_Ch1 -SFX_5b: ; fc472 (3f:4472) +Sfx5b: ; fc472 (3f:4472) db %0010 - dw SFX_5b_Ch1 + dw Sfx5b_Ch1 -SFX_5c: ; fc475 (3f:4475) +Sfx5c: ; fc475 (3f:4475) db %1000 - dw SFX_5c_Ch1 + dw Sfx5c_Ch1 -SFX_5d: ; fc478 (3f:4478) +Sfx5d: ; fc478 (3f:4478) db %1011 - dw SFX_5d_Ch1 - dw SFX_5d_Ch2 - dw SFX_5d_Ch3 + dw Sfx5d_Ch1 + dw Sfx5d_Ch2 + dw Sfx5d_Ch3 -SFX_5e: ; fc47f (3f:447f) +Sfx5e: ; fc47f (3f:447f) db %0010 - dw SFX_5e_Ch1 + dw Sfx5e_Ch1 -SFX_5f: ; fc482 (3f:4482) +Sfx5f: ; fc482 (3f:4482) db %1000 - dw SFX_5f_Ch1 + dw Sfx5f_Ch1 diff --git a/src/constants.asm b/src/constants.asm index cad6cae..aec75af 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -9,9 +9,10 @@ INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/misc_constants.asm" INCLUDE "constants/music_constants.asm" +INCLUDE "constants/name_constants.asm" INCLUDE "constants/npc_constants.asm" INCLUDE "constants/sgb_constants.asm" +INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/text_constants.asm" -INCLUDE "constants/name_constants.asm" INCLUDE "constants/charmaps.asm"
\ No newline at end of file diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm index 996baf2..c6c50f7 100644 --- a/src/constants/music_constants.asm +++ b/src/constants/music_constants.asm @@ -9,12 +9,12 @@ const MUSIC_DECK_MACHINE ; $07 const MUSIC_CARD_POP ; $08 const MUSIC_OVERWORLD ; $09 - const MUSIC_POKEMON_DOME ; $0A - const MUSIC_CHALLENGE_HALL ; $0B - const MUSIC_CLUB_1 ; $0C - const MUSIC_CLUB_2 ; $0D - const MUSIC_CLUB_3 ; $0E - const MUSIC_RONALD ; $0F + const MUSIC_POKEMON_DOME ; $0a + const MUSIC_CHALLENGE_HALL ; $0b + const MUSIC_CLUB_1 ; $0c + const MUSIC_CLUB_2 ; $0d + const MUSIC_CLUB_3 ; $0e + const MUSIC_RONALD ; $0f const MUSIC_IMAKUNI ; $10 const MUSIC_HALL_OF_HONOR ; $11 const MUSIC_CREDITS ; $12 @@ -25,8 +25,8 @@ const MUSIC_MATCH_START_3 ; $17 const MUSIC_MATCH_VICTORY ; $18 const MUSIC_MATCH_LOSS ; $19 - const MUSIC_DARK_DIDDLY ; $1A - const MUSIC_UNUSED_1B ; $1B - const MUSIC_BOOSTER_PACK ; $1C - const MUSIC_MEDAL ; $1D - const MUSIC_UNUSED_1E ; $1E + const MUSIC_DARK_DIDDLY ; $1a + const MUSIC_UNUSED_1B ; $1b + const MUSIC_BOOSTER_PACK ; $1c + const MUSIC_MEDAL ; $1d + const MUSIC_UNUSED_1E ; $1e diff --git a/src/constants/sfx_constants.asm b/src/constants/sfx_constants.asm new file mode 100644 index 0000000..4745260 --- /dev/null +++ b/src/constants/sfx_constants.asm @@ -0,0 +1,98 @@ + const_def + const SFX_STOP ; $00 + const SFX_01 ; $01 + const SFX_02 ; $02 + const SFX_03 ; $03 + const SFX_04 ; $04 + const SFX_05 ; $05 + const SFX_06 ; $06 + const SFX_07 ; $07 + const SFX_08 ; $08 + const SFX_09 ; $09 + const SFX_0A ; $0a + const SFX_0B ; $0b + const SFX_0C ; $0c + const SFX_0D ; $0d + const SFX_0E ; $0e + const SFX_0F ; $0f + const SFX_10 ; $10 + const SFX_11 ; $11 + const SFX_12 ; $12 + const SFX_13 ; $13 + const SFX_14 ; $14 + const SFX_15 ; $15 + const SFX_16 ; $16 + const SFX_17 ; $17 + const SFX_18 ; $18 + const SFX_19 ; $19 + const SFX_1A ; $1a + const SFX_1B ; $1b + const SFX_1C ; $1c + const SFX_1D ; $1d + const SFX_1E ; $1e + const SFX_1F ; $1f + const SFX_20 ; $20 + const SFX_21 ; $21 + const SFX_22 ; $22 + const SFX_23 ; $23 + const SFX_24 ; $24 + const SFX_25 ; $25 + const SFX_26 ; $26 + const SFX_27 ; $27 + const SFX_28 ; $28 + const SFX_29 ; $29 + const SFX_2A ; $2a + const SFX_2B ; $2b + const SFX_2C ; $2c + const SFX_2D ; $2d + const SFX_2E ; $2e + const SFX_2F ; $2f + const SFX_30 ; $30 + const SFX_31 ; $31 + const SFX_32 ; $32 + const SFX_33 ; $33 + const SFX_34 ; $34 + const SFX_35 ; $35 + const SFX_36 ; $36 + const SFX_37 ; $37 + const SFX_38 ; $38 + const SFX_39 ; $39 + const SFX_3A ; $3a + const SFX_3B ; $3b + const SFX_3C ; $3c + const SFX_3D ; $3d + const SFX_3E ; $3e + const SFX_3F ; $3f + const SFX_40 ; $40 + const SFX_41 ; $41 + const SFX_42 ; $42 + const SFX_43 ; $43 + const SFX_44 ; $44 + const SFX_45 ; $45 + const SFX_46 ; $46 + const SFX_47 ; $47 + const SFX_48 ; $48 + const SFX_49 ; $49 + const SFX_4A ; $4a + const SFX_4B ; $4b + const SFX_4C ; $4c + const SFX_4D ; $4d + const SFX_4E ; $4e + const SFX_4F ; $4f + const SFX_50 ; $50 + const SFX_51 ; $51 + const SFX_52 ; $52 + const SFX_53 ; $53 + const SFX_54 ; $54 + const SFX_55 ; $55 + const SFX_56 ; $56 + const SFX_57 ; $57 + const SFX_58 ; $58 + const SFX_59 ; $59 + const SFX_5A ; $5a + const SFX_5B ; $5b + const SFX_5C ; $5c + const SFX_5D ; $5d + const SFX_5E ; $5e + const SFX_5F ; $5f + diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 79035fc..e81f95d 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -1921,7 +1921,7 @@ Func_4b60: ; 4b60 (1:4b60) call .asm_4cb4 call .asm_4cb4 push hl - ld a, $08 + ld a, SFX_08 call PlaySFX lb bc, 3, 5 ld a, e @@ -3139,7 +3139,7 @@ ReturnWrongAction: ; 0x54c8 ; display BOXMSG_PLAYERS_TURN or BOXMSG_OPPONENTS_TURN and print -; DuelistsTurnText in a textbox. also call ExchangeRNG. +; DuelistTurnText in a textbox. also call ExchangeRNG. DisplayDuelistTurnScreen: ; 54c8 (1:54c8) call EmptyScreen ld c, BOXMSG_PLAYERS_TURN @@ -3150,7 +3150,7 @@ DisplayDuelistTurnScreen: ; 54c8 (1:54c8) .got_turn ld a, c call DrawDuelBoxMessage - ldtx hl, DuelistsTurnText + ldtx hl, DuelistTurnText call DrawWideTextBox_WaitForInput call ExchangeRNG ret @@ -3503,7 +3503,7 @@ CardListItemSelectionMenu: ; 56c2 (1:56c2) ldtx hl, PlayCheck1Text .got_text call DrawNarrowTextBox_PrintTextNoDelay - ld hl, ItemSelectionMenuParamenters + ld hl, ItemSelectionMenuParameters xor a call InitializeMenuParameters .wait_a_or_b @@ -3525,7 +3525,7 @@ CardListItemSelectionMenu: ; 56c2 (1:56c2) ret ; 0x5708 -ItemSelectionMenuParamenters ; 5708 (1:5708) +ItemSelectionMenuParameters: ; 5708 (1:5708) db 1, 14 ; corsor x, cursor y db 2 ; y displacement between items db 2 ; number of items @@ -4327,7 +4327,7 @@ DisplayCardPage_PokemonOverview: ; 5b7d (1:5b7d) jr z, .basic ld hl, wLoadedCard1PreEvoName lb de, 1, 3 - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID .basic ; print card level and maximum HP lb bc, 12, 2 @@ -4428,7 +4428,7 @@ PrintMoveOrPkmnPowerInformation: ; 5c33 (1:5c33) dec hl ; print text ID pointed to by hl at 7,e ld d, 7 - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID pop hl inc hl inc hl @@ -4549,7 +4549,7 @@ PrintPokemonCardPageGenericInformation: ; 5cc4 (1:5cc4) call DrawCardPageSurroundingBox lb de, 5, 1 ld hl, wLoadedCard1Name - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID ld a, [wCardPageType] or a jr z, .from_loaded_card @@ -4665,7 +4665,7 @@ DisplayCardPage_PokemonDescription: ; 5d54 (1:5d54) ; print the Pokemon's category at 1,10 (just above the length and weight texts) lb de, 1, 10 ld hl, wLoadedCard1Category - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID ld a, TX_KATAKANA call ProcessSpecialTextCharacter ldtx hl, PokemonText @@ -4713,7 +4713,7 @@ PrintCardPageRarityIcon: ; 5dd3 (1:5dd3) ld c, a ld b, $00 add hl, bc - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID ret ; 0x5ddd @@ -4782,7 +4782,7 @@ DisplayEnergyOrTrainerCardPage: ; 5e2d (1:5e2d) ; print the card's name at 4,3 lb de, 4, 3 ld hl, wLoadedCard1Name - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID ; colorize the card image lb de, 6, 4 call ApplyBGP6OrSGB3ToCardImage @@ -5740,7 +5740,7 @@ DisplayUsePokemonPowerScreen: ; 6510 (1:6510) lb de, 1, 4 call InitTextPrinting ld hl, wLoadedCard1Move1Name - call ProcessTextFromPointerToID_InitTextPrinting + call InitTextPrinting_ProcessTextFromPointerToID lb de, 1, 6 ld hl, wLoadedCard1Move1Description call PrintMoveOrCardDescription @@ -6428,7 +6428,7 @@ PrintAttachedEnergyToPokemon: ; 68e4 (1:68e4) ; print the PokemonEvolvedIntoPokemonText, given the Pokemon card to evolve in wccee, ; and the evolved Pokemon card in hTempCardIndex_ff98. also play a sound effect. PrintPokemonEvolvedIntoPokemon: ; 68fa (1:68fa) - ld a, $5e + ld a, SFX_5E call PlaySFX ld a, [wccee] call LoadCardNameToTxRam2 @@ -7556,11 +7556,11 @@ _TossCoin: ; 71ad (1:71ad) ld e, a .asm_728a - ld d, $54 + ld d, SFX_54 ld a, e or a jr nz, .asm_7292 - ld d, $55 + ld d, SFX_55 .asm_7292 ld a, d diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 4bbf7ca..f22d584 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -532,10 +532,10 @@ Func_90fb: ; 90fb (2:50fb) push af inc a jr z, .asm_9103 - ld a, $2 + ld a, SFX_02 jr .asm_9105 .asm_9103 - ld a, $3 + ld a, SFX_03 .asm_9105 call PlaySFX pop af diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 00c6c88..b33fd35 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -64,7 +64,7 @@ LoadMap: ; c000 (3:4000) ld a, [hl] bit 4, [hl] jr z, .asm_c0b6 - ld a, $c + ld a, SFX_0C call PlaySFX jp .asm_c037 .asm_c0b6 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 290b004..e2ca66c 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -372,7 +372,7 @@ Func_10e71: ; 10e71 (4:4e71) ldh a, [hKeysPressed] and A_BUTTON jr z, .asm_10e96 - ld a, $2 + ld a, SFX_02 call PlaySFX call Func_11016 call Func_11024 @@ -398,7 +398,7 @@ Func_10e97: ; 10e97 (4:4e97) jr z, .asm_10eb9 ld [wd32e], a call Func_10f2e - ld a, $1 + ld a, SFX_01 call PlaySFX .asm_10eb9 pop bc @@ -548,7 +548,7 @@ Func_11016: ; 11016 (4:5016) ret Func_11024: ; 11024 (4:5024) - ld a, $57 + ld a, SFX_57 call PlaySFX ld a, [wd336] ld [wWhichSprite], a @@ -1191,7 +1191,7 @@ DisplayPlayerNamingScreen:: ; 128a9 (4:68a9) ; from the user into hl. ld hl, wNameBuffer farcall InputPlayerName - + farcall WhiteOutDMGPals call DoFrameIfLCDEnabled call DisableLCD diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index de83a1e..e6793d5 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1,3 +1,5 @@ +; copy the name and level of the card at wLoadedCard1 to wDefaultText +; a = length in number of tiles (the resulting string will be padded with spaces to match it) _CopyCardNameAndLevel: ; 18000 (6:4000) push bc push de @@ -12,7 +14,10 @@ _CopyCardNameAndLevel: ; 18000 (6:4000) pop hl ld a, [hli] cp TX_HALFWIDTH - jp z, Func_18086 + jp z, _CopyCardNameAndLevel_HalfwidthText + +; the name doesn't start with TX_HALFWIDTH +; this doesn't appear to be ever the case (unless caller manipulates wLoadedCard1Name) ld a, [wcd9b] ld c, a ld a, [wLoadedCard1Type] @@ -83,9 +88,9 @@ _CopyCardNameAndLevel: ; 18000 (6:4000) pop de pop bc ret -; 0x18086 -Func_18086: ; 18086 (6:4086) +; the name starts with TX_HALFWIDTH +_CopyCardNameAndLevel_HalfwidthText: ld a, [wcd9b] inc a add a @@ -248,7 +253,7 @@ PrintCardName_HandlePlayAreaView: ; 18171 (6:4171) push af lb de, 1, 17 call InitTextPrinting - ldtx hl, Text0251 + ldtx hl, EmptyLineText call ProcessTextFromID ld hl, hffb0 @@ -261,8 +266,7 @@ PrintCardName_HandlePlayAreaView: ; 18171 (6:4171) lb de, 1, 17 call InitTextPrinting pop af - - ld hl, Data_006_42bb + ld hl, TextIDTable_182bb ld b, 0 sla a ld c, a @@ -438,24 +442,23 @@ Func_006_42b1: ldh [hWhoseTurn], a ret -Data_006_42bb: -; - db $01, $00 - db $02, $00 - db $03, $00 - db $04, $00 - db $05, $00 - db $00, $00 - db $4f, $02 - db $50, $02 - db $00, $00 - db $4f, $02 - db $50, $02 - db $01, $00 - db $02, $00 - db $03, $00 - db $04, $00 - db $05, $00 +TextIDTable_182bb: + tx HandText + tx CheckText + tx AttackText + tx PKMNPowerText + tx DoneText + dw NONE + tx DuelistHandText_2 + tx DuelistDiscardPileText + dw NONE + tx DuelistHandText_2 + tx DuelistDiscardPileText + tx HandText + tx CheckText + tx AttackText + tx PKMNPowerText + tx DoneText Data_006_42db: ; transitions[] @@ -1686,16 +1689,16 @@ ClearMemory: ; (6:6787) ret ; play different sfx by a. -; if a is 0xff play sfx with 0x03 (usually following a B press), -; else with 0x02 (usually following an A press). +; if a is 0xff play SFX_03 (usually following a B press), +; else play SFX_02 (usually following an A press). PlayAcceptOrDeclineSFX: ; (6:6794) push af inc a jr z, .sfx_decline - ld a, $02 + ld a, SFX_02 jr .sfx_accept .sfx_decline - ld a, $03 + ld a, SFX_03 .sfx_accept call PlaySFX pop af diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index dfae95a..a79f27a 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -451,7 +451,7 @@ Func_1d078: ; 1d078 (7:5078) ldh a, [hKeysPressed] and A_BUTTON | START jr z, .asm_1d095 - ld a, $2 + ld a, SFX_02 call PlaySFX farcall Func_10ab4 diff --git a/src/engine/home.asm b/src/engine/home.asm index 23095e1..7739545 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -7376,17 +7376,17 @@ HandleMenuInput: ; 264b (0:264b) scf ret -; plays an "open screen" sound if [hCurMenuItem] != 0xff -; plays an "exit screen" sound if [hCurMenuItem] == 0xff +; plays an "open screen" sound (SFX_02) if [hCurMenuItem] != 0xff +; plays an "exit screen" sound (SFX_03) if [hCurMenuItem] == 0xff PlayOpenOrExitScreenSFX: ; 26c0 (0:26c0) push af ldh a, [hCurMenuItem] inc a jr z, .play_exit_sfx - ld a, $2 + ld a, SFX_02 jr .play_sfx .play_exit_sfx - ld a, $3 + ld a, SFX_03 .play_sfx call PlaySFX pop af @@ -7490,7 +7490,7 @@ HandleDuelMenuInput: ; 271a (0:271a) and 1 .dpad_pressed push af - ld a, $1 + ld a, SFX_01 call PlaySFX call .erase_cursor pop af @@ -7940,7 +7940,7 @@ CardSymbolTable: db $dc, $02 ; TYPE_TRAINER ; copy the name and level of the card at wLoadedCard1 to wDefaultText -; a = string length in number of tiles (padded with spaces to fit) +; a = length in number of tiles (the resulting string will be padded with spaces to match it) CopyCardNameAndLevel: ; 29f5 (0:29f5) farcall _CopyCardNameAndLevel ret @@ -8172,7 +8172,7 @@ HandleYesOrNoMenu: and D_RIGHT | D_LEFT jr z, .wait_button_loop ; left or right pressed, so switch to the other menu item - ld a, $1 + ld a, SFX_01 call PlaySFX call EraseCursor .refresh_menu @@ -8348,7 +8348,7 @@ InitTextPrinting_ProcessTextFromID: ; 2c1b (0:2c1b) jr ProcessTextFromID ; like ProcessTextFromPointerToID, except it calls InitTextPrinting first -ProcessTextFromPointerToID_InitTextPrinting: ; 2c20 (0:2c20) +InitTextPrinting_ProcessTextFromPointerToID: ; 2c20 (0:2c20) call InitTextPrinting ; fallthrough @@ -9995,7 +9995,7 @@ CheckNoDamageOrEffect: ; 34b7 (0:34b7) add a ld e, a ld d, $0 - ld hl, NoDamageOrEffectTextPointerTable + ld hl, NoDamageOrEffectTextIDTable add hl, de ld a, [hli] ld h, [hl] @@ -10009,7 +10009,7 @@ CheckNoDamageOrEffect: ; 34b7 (0:34b7) ret ; 0x34d8 -NoDamageOrEffectTextPointerTable: ; 34d8 (0:34d8) +NoDamageOrEffectTextIDTable: ; 34d8 (0:34d8) tx NoDamageOrEffectDueToAgilityText ; NO_DAMAGE_OR_EFFECT_AGILITY tx NoDamageOrEffectDueToBarrierText ; NO_DAMAGE_OR_EFFECT_BARRIER tx NoDamageOrEffectDueToFlyText ; NO_DAMAGE_OR_EFFECT_FLY diff --git a/src/text/text1.asm b/src/text/text1.asm index 19c999b..8245b3b 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -406,7 +406,7 @@ FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74) line "without Attacking." done -DuelistsTurnText: ; 36a9a (d:6a9a) +DuelistTurnText: ; 36a9a (d:6a9a) text "<RAMNAME>'s Turn." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 4cb3784..042dcd9 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1779,15 +1779,15 @@ HandText_2: ; 3bd20 (e:7d20) text "Hand" done -Text024f: ; 3bd26 (e:7d26) +DuelistHandText_2: ; 3bd26 (e:7d26) text "<RAMNAME>'s Hand" done -Text0250: ; 3bd30 (e:7d30) +DuelistDiscardPileText: ; 3bd30 (e:7d30) text "<RAMNAME>'s Discard Pile" done -Text0251: ; 3bd42 (e:7d42) +EmptyLineText: ; 3bd42 (e:7d42) textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " " textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " " done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 36611ca..8421f29 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -95,7 +95,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer RetreatWasUnsuccessfulText ; 0x005b textpointer WillUseThePokemonPowerText ; 0x005c textpointer FinishedTurnWithoutAttackingText ; 0x005d - textpointer DuelistsTurnText ; 0x005e + textpointer DuelistTurnText ; 0x005e textpointer AttachedEnergyToPokemonText ; 0x005f textpointer PokemonEvolvedIntoPokemonText ; 0x0060 textpointer PlacedOnTheBenchText ; 0x0061 @@ -591,10 +591,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text024b ; 0x024b textpointer Text024c ; 0x024c textpointer Text024d ; 0x024d - textpointer HandText_2 ; 0x024e - textpointer Text024f ; 0x024f - textpointer Text0250 ; 0x0250 - textpointer Text0251 ; 0x0251 + textpointer HandText_2 ; 0x024e + textpointer DuelistHandText_2 ; 0x024f + textpointer DuelistDiscardPileText ; 0x0250 + textpointer EmptyLineText ; 0x0251 textpointer Text0252 ; 0x0252 textpointer Text0253 ; 0x0253 textpointer Text0254 ; 0x0254 |