pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

No more NONE

Browse Source
This commit is contained in:
PikalaxALT
2015-11-02 14:37:02 -05:00
parent e0d6e9ca7a
commit 72af3337fd
185 changed files with 1343 additions and 1345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
audio/cries.asm
View File

@@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
unknownmusic0xde $52 unknownmusic0xde $52
sound $4, $f1, $0796 sound $4, $f1, $0796
sound $4, $f1, $072d sound $4, $f1, $072d
sound $7, $0, NONE sound $7, $0, 0
sound $10, $f1, $07a7 sound $10, $f1, $07a7
endchannel endchannel
; f3035 ; f3035
@@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
Cry_2C_branch_f3038: ; f3038 Cry_2C_branch_f3038: ; f3038
callchannel Cry_2C_branch_f3022 callchannel Cry_2C_branch_f3022
loopchannel 2, Cry_2C_branch_f3038 loopchannel 2, Cry_2C_branch_f3038
sound $e, $0, NONE sound $e, $0, 0
sound $8, $f2, $07c2 sound $8, $f2, $07c2
endchannel endchannel
; f3048 ; f3048
@@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
Cry_27_Ch6: ; f305b Cry_27_Ch6: ; f305b
unknownmusic0xde $2a unknownmusic0xde $2a
sound $3, $2c, $07c7 sound $3, $2c, $07c7
sound $1, $0, NONE sound $1, $0, 0
sound $5, $59, $07be sound $5, $59, $07be
sound $6, $b4, $07bd sound $6, $b4, $07bd
endchannel endchannel
@@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
Cry_36_branch_f3202: ; f3202 Cry_36_branch_f3202: ; f3202
sound $3, $f8, $0791 sound $3, $f8, $0791
sound $3, $d8, $078d sound $3, $d8, $078d
sound $2, $0, NONE sound $2, $0, 0
sound $1, $78, $06c1 sound $1, $78, $06c1
sound $1, $f8, $0741 sound $1, $f8, $0741
sound $4, $e1, $0751 sound $4, $e1, $0751
@@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
sound $8, $ab, $0734 sound $8, $ab, $0734
sound $4, $d6, $0716 sound $4, $d6, $0716
sound $8, $d1, $0712 sound $8, $d1, $0712
sound $8, $0, NONE sound $8, $0, 0
endchannel endchannel
; f3249 ; f3249
@@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
sound $8, $cb, $0754 sound $8, $cb, $0754
sound $4, $f6, $0736 sound $4, $f6, $0736
sound $8, $f1, $0732 sound $8, $f1, $0732
sound $8, $0, NONE sound $8, $0, 0
endchannel endchannel
; f3264 ; f3264
@@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
Cry_09_Ch6: ; f363c Cry_09_Ch6: ; f363c
unknownmusic0xde $5 unknownmusic0xde $5
sound $2, $8, NONE sound $2, $8, 0
sound $f, $a7, $06a1 sound $f, $a7, $06a1
sound $6, $86, $06a2 sound $6, $86, $06a2
sound $a, $74, $06a1 sound $a, $74, $06a1
@@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
Cry_11_Ch6: ; f3722 Cry_11_Ch6: ; f3722
unknownmusic0xde $a unknownmusic0xde $a
sound $4, $8, NONE sound $4, $8, 0
sound $6, $a7, $0741 sound $6, $a7, $0741
sound $8, $86, $0743 sound $8, $86, $0743
sound $4, $76, $0741 sound $4, $76, $0741
@@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
Cry_0B_Ch6: ; f3976 Cry_0B_Ch6: ; f3976
unknownmusic0xde $44 unknownmusic0xde $44
sound $c, $8, NONE sound $c, $8, 0
sound $4, $f1, $0701 sound $4, $f1, $0701
sound $4, $e1, $0782 sound $4, $e1, $0782
sound $4, $d1, $0741 sound $4, $d1, $0741
@@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
Cry_0D_Ch6: ; f3a39 Cry_0D_Ch6: ; f3a39
unknownmusic0xde $40 unknownmusic0xde $40
sound $4, $8, NONE sound $4, $8, 0
sound $5, $f2, $0651 sound $5, $f2, $0651
sound $9, $d1, $0661 sound $9, $d1, $0661
sound $5, $e2, $0614 sound $5, $e2, $0614
@@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
Cry_0A_Ch6: ; f3ad9 Cry_0A_Ch6: ; f3ad9
unknownmusic0xde $5 unknownmusic0xde $5
sound $3, $8, NONE sound $3, $8, 0
sound $8, $a7, $06a1 sound $8, $a7, $06a1
sound $6, $86, $06a3 sound $6, $86, $06a3
sound $3, $74, $06a1 sound $3, $74, $06a1

2
audio/engine.asm
View File

@@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
; e8d80 ; e8d80
FrequencyTable: ; e8d80 FrequencyTable: ; e8d80
dw NONE ; filler dw 0 ; filler
dw $f82c dw $f82c
dw $f89d dw $f89d
dw $f907 dw $f907

2
audio/music/battletowertheme.asm
View File

@@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
note __, 1 note __, 1
note F_, 4 note F_, 4
note __, 4 note __, 4
tone NONE tone 0
intensity $b7 intensity $b7
note G_, 2 note G_, 2
octave 4 octave 4

2
audio/music/lookkimonogirl.asm
View File

@@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
notetype $6, $87 notetype $6, $87
tone $0001 tone $0001
callchannel Music_LookKimonoGirl_branch_f7aa8 callchannel Music_LookKimonoGirl_branch_f7aa8
tone NONE tone 0
Music_LookKimonoGirl_branch_f79d7: ; f79d7 Music_LookKimonoGirl_branch_f79d7: ; f79d7
notetype $c, $b2 notetype $c, $b2
callchannel Music_LookKimonoGirl_branch_f7a13 callchannel Music_LookKimonoGirl_branch_f7a13

4
audio/music/titlescreen.asm
View File

@@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
octave 4 octave 4
note A_, 4 note A_, 4
stereopanning $ff stereopanning $ff
tone NONE tone 0
notetype $c, $b0 notetype $c, $b0
octave 3 octave 3
note B_, 6 note B_, 6
@@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
note __, 1 note __, 1
stereopanning $ff stereopanning $ff
notetype $c, $16 notetype $c, $16
tone NONE tone 0
octave 4 octave 4
note A_, 2 note A_, 2
octave 5 octave 5

114
audio/sfx.asm
View File

@@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
Sfx_Save_Ch6: ; f09d5 Sfx_Save_Ch6: ; f09d5
dutycycle $2 dutycycle $2
sound $2, $8, NONE sound $2, $8, 0
sound $2, $a1, $0701 sound $2, $a1, $0701
sound $1, $91, $0601 sound $1, $91, $0601
sound $1, $91, $0681 sound $1, $91, $0681
@@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
Sfx_Sketch_branch_f12fd: ; f12fd Sfx_Sketch_branch_f12fd: ; f12fd
sound $2, $f1, $06e0 sound $2, $f1, $06e0
sound $d, $af, $05b0 sound $d, $af, $05b0
sound $4, $0, NONE sound $4, $0, 0
sound $9, $f4, $0718 sound $9, $f4, $0718
loopchannel 3, Sfx_Sketch_branch_f12fd loopchannel 3, Sfx_Sketch_branch_f12fd
soundinput $8 soundinput $8
@@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
soundinput $34 soundinput $34
Sfx_Nightmare_branch_f1424: ; f1424 Sfx_Nightmare_branch_f1424: ; f1424
sound $3, $ba, $0631 sound $3, $ba, $0631
sound $2, $0, NONE sound $2, $0, 0
sound $3, $f8, $0621 sound $3, $f8, $0621
sound $2, $0, NONE sound $2, $0, 0
sound $3, $f8, $0611 sound $3, $f8, $0611
sound $2, $0, NONE sound $2, $0, 0
sound $3, $e8, $0601 sound $3, $e8, $0601
sound $2, $0, NONE sound $2, $0, 0
sound $3, $e8, $05f1 sound $3, $e8, $05f1
sound $2, $0, NONE sound $2, $0, 0
loopchannel 2, Sfx_Nightmare_branch_f1424 loopchannel 2, Sfx_Nightmare_branch_f1424
soundinput $8 soundinput $8
endchannel endchannel
@@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
dutycycle $0 dutycycle $0
soundinput $97 soundinput $97
sound $2, $f4, $0772 sound $2, $f4, $0772
sound $4, $0, NONE sound $4, $0, 0
sound $2, $c4, $0772 sound $2, $c4, $0772
sound $4, $0, NONE sound $4, $0, 0
sound $2, $b4, $0772 sound $2, $b4, $0772
sound $4, $0, NONE sound $4, $0, 0
sound $2, $a1, $0772 sound $2, $a1, $0772
soundinput $8 soundinput $8
endchannel endchannel
@@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
dutycycle $2 dutycycle $2
soundinput $c5 soundinput $c5
sound $3, $f8, $0581 sound $3, $f8, $0581
sound $1, $0, NONE sound $1, $0, 0
soundinput $cb soundinput $cb
sound $10, $f2, $05d1 sound $10, $f2, $05d1
soundinput $8 soundinput $8
@@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
sound $3, $f4, $07b5 sound $3, $f4, $07b5
sound $3, $f5, $07c8 sound $3, $f5, $07c8
sound $8, $f4, $07da sound $8, $f4, $07da
sound $2, $0, NONE sound $2, $0, 0
sound $8, $c1, $07da sound $8, $c1, $07da
sound $2, $0, NONE sound $2, $0, 0
sound $8, $91, $07da sound $8, $91, $07da
endchannel endchannel
; f1515 ; f1515
@@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
sound $8, $f1, $0759 sound $8, $f1, $0759
soundinput $57 soundinput $57
sound $8, $f1, $0759 sound $8, $f1, $0759
sound $10, $0, NONE sound $10, $0, 0
loopchannel 2, Sfx_Return_branch_f163c loopchannel 2, Sfx_Return_branch_f163c
soundinput $8 soundinput $8
endchannel endchannel
@@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
sound $d, $f7, $0290 sound $d, $f7, $0290
soundinput $9e soundinput $9e
sound $4, $c9, $05e1 sound $4, $c9, $05e1
sound $2, $0, NONE sound $2, $0, 0
loopchannel 6, Sfx_MilkDrink_branch_f1684 loopchannel 6, Sfx_MilkDrink_branch_f1684
soundinput $8 soundinput $8
endchannel endchannel
@@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
soundinput $d6 soundinput $d6
Sfx_Present_branch_f16a6: ; f16a6 Sfx_Present_branch_f16a6: ; f16a6
sound $2, $f1, $0740 sound $2, $f1, $0740
sound $1, $0, NONE sound $1, $0, 0
loopchannel 3, Sfx_Present_branch_f16a6 loopchannel 3, Sfx_Present_branch_f16a6
sound $10, $f1, $0780 sound $10, $f1, $0780
soundinput $8 soundinput $8
@@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
sound $2, $f1, $07e0 sound $2, $f1, $07e0
sound $5, $f2, $07e7 sound $5, $f2, $07e7
loopchannel 3, Sfx_MorningSun_branch_f16be loopchannel 3, Sfx_MorningSun_branch_f16be
sound $1, $0, NONE sound $1, $0, 0
sound $8, $c2, $07e7 sound $8, $c2, $07e7
sound $1, $0, NONE sound $1, $0, 0
sound $8, $82, $07e7 sound $8, $82, $07e7
endchannel endchannel
; f16df ; f16df
@@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
Sfx_Encore_Ch5: ; f1703 Sfx_Encore_Ch5: ; f1703
dutycycle $2 dutycycle $2
soundinput $ce soundinput $ce
sound $10, $0, NONE sound $10, $0, 0
Sfx_Encore_branch_f170b: ; f170b Sfx_Encore_branch_f170b: ; f170b
sound $2, $f8, $0774 sound $2, $f8, $0774
sound $24, $0, NONE sound $24, $0, 0
loopchannel 2, Sfx_Encore_branch_f170b loopchannel 2, Sfx_Encore_branch_f170b
soundinput $8 soundinput $8
endchannel endchannel
@@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
soundinput $f7 soundinput $f7
sound $20, $f2, $0680 sound $20, $f2, $0680
sound $1, $f1, $0760 sound $1, $f1, $0760
sound $20, $0, NONE sound $20, $0, 0
sound $1, $f1, $0760 sound $1, $f1, $0760
sound $1a, $0, NONE sound $1a, $0, 0
sound $1, $f1, $0760 sound $1, $f1, $0760
soundinput $8 soundinput $8
endchannel endchannel
@@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
Sfx_BallBounce_Ch5: ; f1b69 Sfx_BallBounce_Ch5: ; f1b69
dutycycle $2 dutycycle $2
sound $8, $e1, $0740 sound $8, $e1, $0740
sound $17, $0, NONE sound $17, $0, 0
sound $8, $b1, $0740 sound $8, $b1, $0740
sound $17, $0, NONE sound $17, $0, 0
sound $8, $81, $0740 sound $8, $81, $0740
sound $17, $0, NONE sound $17, $0, 0
sound $8, $51, $0740 sound $8, $51, $0740
sound $17, $0, NONE sound $17, $0, 0
endchannel endchannel
; f1b8c ; f1b8c
Sfx_BallBounce_Ch6: ; f1b8c Sfx_BallBounce_Ch6: ; f1b8c
dutycycle $2 dutycycle $2
sound $2, $8, NONE sound $2, $8, 0
sound $8, $b1, $0741 sound $8, $b1, $0741
sound $17, $0, NONE sound $17, $0, 0
sound $8, $81, $0741 sound $8, $81, $0741
sound $17, $0, NONE sound $17, $0, 0
sound $8, $51, $0741 sound $8, $51, $0741
sound $17, $0, NONE sound $17, $0, 0
sound $8, $21, $0741 sound $8, $21, $0741
sound $17, $0, NONE sound $17, $0, 0
endchannel endchannel
; f1bb3 ; f1bb3
@@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
; f1c13 ; f1c13
Sfx_GiveTrademon_Ch5: ; f1c13 Sfx_GiveTrademon_Ch5: ; f1c13
sound $20, $0, NONE sound $20, $0, 0
dutycycle $1 dutycycle $1
soundinput $a7 soundinput $a7
sound $1b, $f4, $0750 sound $1b, $f4, $0750
@@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
; f1c41 ; f1c41
Sfx_GetTrademon_Ch5: ; f1c41 Sfx_GetTrademon_Ch5: ; f1c41
sound $20, $0, NONE sound $20, $0, 0
dutycycle $2 dutycycle $2
soundinput $bf soundinput $bf
sound $1b, $14, $07bc sound $1b, $14, $07bc
@@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
Sfx_TrainArrived_Ch6: ; f1c75 Sfx_TrainArrived_Ch6: ; f1c75
tone $0008 tone $0008
sound $8, $0, NONE sound $8, $0, 0
Sfx_TrainArrived_Ch5: ; f1c7c Sfx_TrainArrived_Ch5: ; f1c7c
dutycycle $2 dutycycle $2
sound $4, $5f, $0691 sound $4, $5f, $0691
@@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
Sfx_SwitchPokemon_Ch6: ; f1d16 Sfx_SwitchPokemon_Ch6: ; f1d16
dutycycle $2 dutycycle $2
sound $2, $8, NONE sound $2, $8, 0
sound $8, $b1, $0741 sound $8, $b1, $0741
endchannel endchannel
; f1d21 ; f1d21
@@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
Sfx_Tally_Ch6: ; f1d4a Sfx_Tally_Ch6: ; f1d4a
dutycycle $2 dutycycle $2
sound $1, $8, NONE sound $1, $8, 0
sound $4, $a1, $0761 sound $4, $a1, $0761
endchannel endchannel
; f1d55 ; f1d55
@@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
Sfx_Transaction_Ch6: ; f1d60 Sfx_Transaction_Ch6: ; f1d60
dutycycle $2 dutycycle $2
sound $1, $8, NONE sound $1, $8, 0
sound $4, $91, $06c1 sound $4, $91, $06c1
sound $18, $a2, $07a1 sound $18, $a2, $07a1
endchannel endchannel
@@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
Sfx_BootPc_Ch5: ; f1de3 Sfx_BootPc_Ch5: ; f1de3
dutycycle $2 dutycycle $2
sound $f, $f2, $07c0 sound $f, $f2, $07c0
sound $f, $0, NONE sound $f, $0, 0
sound $3, $a1, $0780 sound $3, $a1, $0780
sound $3, $a1, $0700 sound $3, $a1, $0700
sound $3, $a1, $0740 sound $3, $a1, $0740
@@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
sound $4, $f0, $0600 sound $4, $f0, $0600
sound $4, $f0, $0400 sound $4, $f0, $0400
sound $4, $f0, $0200 sound $4, $f0, $0200
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1e21 ; f1e21
Sfx_ChoosePcOption_Ch5: ; f1e21 Sfx_ChoosePcOption_Ch5: ; f1e21
dutycycle $2 dutycycle $2
sound $6, $f0, $0700 sound $6, $f0, $0700
sound $4, $0, NONE sound $4, $0, 0
sound $6, $f0, $0700 sound $6, $f0, $0700
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1e34 ; f1e34
@@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
Sfx_PushButton_Ch5: ; f1e4f Sfx_PushButton_Ch5: ; f1e4f
dutycycle $2 dutycycle $2
sound $4, $0, NONE sound $4, $0, 0
sound $2, $f1, $0680 sound $2, $f1, $0680
sound $1, $0, NONE sound $1, $0, 0
sound $4, $f1, $0780 sound $4, $f1, $0780
sound $4, $0, NONE sound $4, $0, 0
endchannel endchannel
; f1e66 ; f1e66
@@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
soundinput $22 soundinput $22
sound $2, $f1, $0500 sound $2, $f1, $0500
soundinput $8 soundinput $8
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1e7b ; f1e7b
@@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
soundinput $5a soundinput $5a
sound $4, $f0, $0500 sound $4, $f0, $0500
soundinput $8 soundinput $8
sound $4, $0, NONE sound $4, $0, 0
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1f1c ; f1f1c
Sfx_Wrong_Ch6: ; f1f1c Sfx_Wrong_Ch6: ; f1f1c
dutycycle $3 dutycycle $3
sound $4, $f0, $0401 sound $4, $f0, $0401
sound $4, $0, NONE sound $4, $0, 0
sound $f, $f0, $0401 sound $f, $f0, $0401
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1f2f ; f1f2f
@@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
Sfx_Boat_Ch5: ; f1f53 Sfx_Boat_Ch5: ; f1f53
dutycycle $2 dutycycle $2
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $4, $0, NONE sound $4, $0, 0
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $f, $f0, $0500 sound $f, $f0, $0500
sound $f, $f0, $0500 sound $f, $f0, $0500
@@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
Sfx_Boat_Ch6: ; f1f72 Sfx_Boat_Ch6: ; f1f72
dutycycle $3 dutycycle $3
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $4, $0, NONE sound $4, $0, 0
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $f, $f0, $0482 sound $f, $f0, $0482
sound $f, $f0, $0482 sound $f, $f0, $0482
@@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
sound $0, $d2, $0780 sound $0, $d2, $0780
sound $0, $d2, $07c0 sound $0, $d2, $07c0
sound $a, $e1, $07e0 sound $a, $e1, $07e0
sound $1, $0, NONE sound $1, $0, 0
endchannel endchannel
; f1ff4 ; f1ff4
@@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
sound $4, $f7, $07a0 sound $4, $f7, $07a0
sound $4, $f7, $07a0 sound $4, $f7, $07a0
soundinput $8 soundinput $8
sound $4, $0, NONE sound $4, $0, 0
endchannel endchannel
; f206f ; f206f
@@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
dutycycle $2 dutycycle $2
sound $4, $b8, $077b sound $4, $b8, $077b
sound $2, $21, $077b sound $2, $21, $077b
sound $10, $0, NONE sound $10, $0, 0
Sfx_HangUp_branch_f26ff: ; f26ff Sfx_HangUp_branch_f26ff: ; f26ff
Sfx_NoSignal_Ch5: ; f26ff Sfx_NoSignal_Ch5: ; f26ff
Sfx_NoSignal_branch_f26ff: ; f26ff Sfx_NoSignal_branch_f26ff: ; f26ff
dutycycle $2 dutycycle $2
sound $14, $e8, $070b sound $14, $e8, $070b
sound $1c, $0, NONE sound $1c, $0, 0
loopchannel 3, Sfx_HangUp_branch_f26ff loopchannel 3, Sfx_HangUp_branch_f26ff
endchannel endchannel
; f270e ; f270e
@@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
Sfx_Elevator_Ch6: ; f274b Sfx_Elevator_Ch6: ; f274b
Sfx_Elevator_Ch7: ; f274b Sfx_Elevator_Ch7: ; f274b
sound $60, $0, NONE sound $60, $0, 0
sound $53, $0, NONE sound $53, $0, 0
endchannel endchannel
; f2754 ; f2754

2
audio/sfx_crystal.asm
View File

@@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
dutycycle $3 dutycycle $3
soundinput $4d soundinput $4d
sound $1, $88, $0770 sound $1, $88, $0770
sound $3, $0, NONE sound $3, $0, 0
soundinput $17 soundinput $17
sound $2, $88, $0776 sound $2, $88, $0776
endchannel endchannel

2
audio/trainer_encounters.asm
View File

@@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
ld [MusicFade], a ld [MusicFade], a
; play nothing for one frame ; play nothing for one frame
push de push de
ld de, NONE ; id: Music_Nothing ld de, 0 ; id: Music_Nothing
call PlayMusic call PlayMusic
call DelayFrame call DelayFrame
; play new song ; play new song

2
battle/anim_objects.asm
View File

@@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
Functioncc9bd: ; cc9bd Functioncc9bd: ; cc9bd
ld hl, NONE ld hl, 0
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
ret ret

2
battle/effect_command_pointers.asm
View File

@@ -1,5 +1,5 @@
dw NONE ; padding dw 0 ; padding
BattleCommandPointers: ; 3fd28 BattleCommandPointers: ; 3fd28
dw BattleCommand01 ; 34084 dw BattleCommand01 ; 34084

1
constants/misc_constants.asm
View File

@@ -1,4 +1,3 @@
NONE EQU 0
PARTY_LENGTH EQU 6 PARTY_LENGTH EQU 6
MAX_ITEMS EQU 20 MAX_ITEMS EQU 20

2
data/battle_tower.asm
View File

@@ -773,7 +773,7 @@ BattleTowerMons1:
db UNOWN db UNOWN
db BERRY db BERRY
db HIDDEN_POWER, NONE, NONE, NONE db HIDDEN_POWER, 0, 0, 0
dw 0 ; OT ID dw 0 ; OT ID
dt 1000 ; Exp dt 1000 ; Exp
; Stat exp ; Stat exp

28
data/odd_eggs.asm
View File

@@ -125,7 +125,7 @@ OddEggs: ; 1fb56e
OddEgg1: OddEgg1:
db PICHU db PICHU
db NO_ITEM db NO_ITEM
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 02048 ; OT ID dw 02048 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -152,7 +152,7 @@ OddEgg1:
OddEgg2: OddEgg2:
db PICHU db PICHU
db NO_ITEM db NO_ITEM
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 00256 ; OT ID dw 00256 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -178,7 +178,7 @@ OddEgg2:
db CLEFFA db CLEFFA
db NO_ITEM db NO_ITEM
db POUND, CHARM, DIZZY_PUNCH, NONE db POUND, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID dw 04096 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -204,7 +204,7 @@ OddEgg2:
db CLEFFA db CLEFFA
db NO_ITEM db NO_ITEM
db POUND, CHARM, DIZZY_PUNCH, NONE db POUND, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID dw 00768 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -230,7 +230,7 @@ OddEgg2:
db IGGLYBUFF db IGGLYBUFF
db NO_ITEM db NO_ITEM
db SING, CHARM, DIZZY_PUNCH, NONE db SING, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID dw 04096 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -256,7 +256,7 @@ OddEgg2:
db IGGLYBUFF db IGGLYBUFF
db NO_ITEM db NO_ITEM
db SING, CHARM, DIZZY_PUNCH, NONE db SING, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID dw 00768 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -282,7 +282,7 @@ OddEgg2:
db SMOOCHUM db SMOOCHUM
db NO_ITEM db NO_ITEM
db POUND, LICK, DIZZY_PUNCH, NONE db POUND, LICK, DIZZY_PUNCH, 0
dw 03584 ; OT ID dw 03584 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -308,7 +308,7 @@ OddEgg2:
db SMOOCHUM db SMOOCHUM
db NO_ITEM db NO_ITEM
db POUND, LICK, DIZZY_PUNCH, NONE db POUND, LICK, DIZZY_PUNCH, 0
dw 00512 ; OT ID dw 00512 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -334,7 +334,7 @@ OddEgg2:
db MAGBY db MAGBY
db NO_ITEM db NO_ITEM
db EMBER, DIZZY_PUNCH, NONE, NONE db EMBER, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID dw 02560 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -360,7 +360,7 @@ OddEgg2:
db MAGBY db MAGBY
db NO_ITEM db NO_ITEM
db EMBER, DIZZY_PUNCH, NONE, NONE db EMBER, DIZZY_PUNCH, 0, 0
dw 00512 ; OT ID dw 00512 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -386,7 +386,7 @@ OddEgg2:
db ELEKID db ELEKID
db NO_ITEM db NO_ITEM
db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 03072 ; OT ID dw 03072 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -412,7 +412,7 @@ OddEgg2:
db ELEKID db ELEKID
db NO_ITEM db NO_ITEM
db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 00512 ; OT ID dw 00512 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -438,7 +438,7 @@ OddEgg2:
db TYROGUE db TYROGUE
db NO_ITEM db NO_ITEM
db TACKLE, DIZZY_PUNCH, NONE, NONE db TACKLE, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID dw 02560 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp
@@ -464,7 +464,7 @@ OddEgg2:
db TYROGUE db TYROGUE
db NO_ITEM db NO_ITEM
db TACKLE, DIZZY_PUNCH, NONE, NONE db TACKLE, DIZZY_PUNCH, 0, 0
dw 00256 ; OT ID dw 00256 ; OT ID
dt 125 ; Exp dt 125 ; Exp
; Stat exp ; Stat exp

6
engine/events_2.asm
View File

@@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
; 97e72 ; 97e72
Function97e72: ; 97e72 Function97e72: ; 97e72
ld hl, NONE ld hl, 0
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0
ret ret
; 97e79 ; 97e79
Function97e79: ; 97e79 Function97e79: ; 97e79
ld hl, NONE ld hl, 0
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp 5 cp 5
@@ -620,7 +620,7 @@ Function97f42: ; 97f42
.asm_97f47 .asm_97f47
push af push af
ld hl, NONE ld hl, 0
add hl, de add hl, de
ld a, [hl] ld a, [hl]
and a and a

2
engine/map_objects.asm
View File

@@ -3103,7 +3103,7 @@ Function57e2: ; 57e2
ld a, d ld a, d
and %10000000 and %10000000
ret z ret z
ld bc, NONE ; debug? ld bc, 0 ; debug?
ld hl, OBJECT_FACING ld hl, OBJECT_FACING
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]

2
event/battle_tower.asm
View File

@@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
; 0x8b25b ; 0x8b25b
Function8b25b: ; 8b25b Function8b25b: ; 8b25b
ld bc, NONE ld bc, 0
.asm_8b25e .asm_8b25e
call Function8b26c call Function8b26c
call c, Function8b28e call c, Function8b28e

2
gfx/pics/animation.asm
View File

@@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8
Functiond02ae: ; d02ae Functiond02ae: ; d02ae
ld c, a ld c, a
ld b, $0 ld b, $0
ld hl, NONE ld hl, 0
ld a, [w2_d173] ld a, [w2_d173]
call AddNTimes call AddNTimes
ld a, h ld a, h

2
home/map.asm
View File

@@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
GetAnyMapBank:: ; 2c31 GetAnyMapBank:: ; 2c31
push hl push hl
push de push de
ld de, NONE ld de, 0
call GetAnyMapHeaderMember call GetAnyMapHeaderMember
ld a, c ld a, c
pop de pop de

2
home/menu.asm
View File

@@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
db $40 ; tile backup db $40 ; tile backup
db 0, 0 ; start coords db 0, 0 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
dw NONE dw 0
db 1 ; default option db 1 ; default option
; 1d7d ; 1d7d

434
items/item_attributes.asm
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More