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

Merge pull request #517 from mid-kid/master

Browse Source 
Some fixes all around
This commit is contained in:
yenatch 2018-06-05 07:04:54 -04:00 committed by GitHub
commit dbf05e48eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 410 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
audio/cries.asm
View File

@ -226,9 +226,9 @@ Cry_Magcargo_Ch6: ; f2ed3
Cry_Magcargo_Ch8: ; f2ef2
noise __, 3, $e8, $3b
Cry_Magcargo_branch_f2ef5: ; f2ef5
.loop
noise __, 2, $f1, $4e
loopchannel 5, Cry_Magcargo_branch_f2ef5
loopchannel 5, .loop
noise __, 3, $d8, $3f
noise C_, 5, $c2, $5f
endchannel
@ -378,9 +378,8 @@ Cry_Togetic_branch_f3022: ; f3022
Cry_Togetic_Ch5: ; f3035
tone $0002
Cry_Togetic_Ch6: ; f3038
Cry_Togetic_branch_f3038: ; f3038
callchannel Cry_Togetic_branch_f3022
loopchannel 2, Cry_Togetic_branch_f3038
loopchannel 2, Cry_Togetic_Ch6
sound __, 15, $0, 0
sound __, 9, $f2, $07c2
endchannel
@ -464,12 +463,12 @@ Cry_Hoothoot_Ch5: ; f30d6
Cry_Hoothoot_Ch6: ; f30f9
sound_duty 2, 0, 2, 0
Cry_Hoothoot_branch_f30fb: ; f30fb
.loop1
sound __, 3, $a1, $0600
loopchannel 3, Cry_Hoothoot_branch_f30fb
Cry_Hoothoot_branch_f3103: ; f3103
loopchannel 3, .loop1
.loop2
sound __, 3, $a1, $0630
loopchannel 4, Cry_Hoothoot_branch_f3103
loopchannel 4, .loop2
sound __, 5, $a2, $0634
sound __, 5, $91, $0638
endchannel
@ -525,14 +524,14 @@ Cry_Cyndaquil_Ch5: ; f3156
Cry_Cyndaquil_Ch6: ; f3159
dutycycle $2
sound __, 9, $2f, $0107
Cry_Cyndaquil_branch_f315f: ; f315f
.loop1
sound __, 1, $e1, $0483
sound __, 1, $51, $044e
loopchannel 4, Cry_Cyndaquil_branch_f315f
Cry_Cyndaquil_branch_f316b: ; f316b
loopchannel 4, .loop1
.loop2
sound __, 1, $e1, $03da
sound __, 2, $51, $0312
loopchannel 4, Cry_Cyndaquil_branch_f316b
loopchannel 4, .loop2
endchannel
; f3178
@ -683,29 +682,24 @@ Cry_Donphan_Ch8: ; f3274
Cry_Typhlosion_Ch5: ; f3284
Cry_Teddiursa_Ch5: ; f3284
sound_duty 2, 0, 1, 0
Cry_Typhlosion_branch_f3286: ; f3286
Cry_Teddiursa_branch_f3286: ; f3286
.loop1
sound __, 4, $c1, $0791
loopchannel 3, Cry_Typhlosion_branch_f3286
Cry_Typhlosion_branch_f328e: ; f328e
Cry_Teddiursa_branch_f328e: ; f328e
loopchannel 3, .loop1
.loop2
sound __, 4, $d1, $04b1
loopchannel 6, Cry_Typhlosion_branch_f328e
Cry_Typhlosion_branch_f3296: ; f3296
Cry_Teddiursa_branch_f3296: ; f3296
loopchannel 6, .loop2
.loop3
sound __, 2, $d1, $0491
sound __, 2, $b1, $0451
loopchannel 6, Cry_Typhlosion_branch_f3296
Cry_Typhlosion_branch_f32a2: ; f32a2
Cry_Teddiursa_branch_f32a2: ; f32a2
loopchannel 6, .loop3
.loop4
sound __, 2, $a3, $0471
sound __, 2, $81, $0441
loopchannel 6, Cry_Typhlosion_branch_f32a2
Cry_Typhlosion_branch_f32ae: ; f32ae
Cry_Teddiursa_branch_f32ae: ; f32ae
loopchannel 6, .loop4
.loop5
sound __, 2, $41, $0421
sound __, 2, $21, $0401
loopchannel 4, Cry_Typhlosion_branch_f32ae
loopchannel 4, .loop5
endchannel
; f32bb
@ -803,10 +797,10 @@ Cry_Mantine_Ch8: ; f334c
Cry_Ampharos_Ch5: ; f3353
sound_duty 2, 3, 1, 3
Cry_Ampharos_branch_f3355: ; f3355
.loop
sound __, 2, $c1, $0520
sound __, 2, $a1, $0420
loopchannel 4, Cry_Ampharos_branch_f3355
loopchannel 4, .loop
dutycycle $0
sound __, 5, $78, $0760
sound __, 5, $78, $0730
@ -911,23 +905,22 @@ Cry_Aipom_Ch5: ; f3422
Cry_Aipom_Ch6: ; f3441
sound_duty 3, 1, 2, 0
Cry_Aipom_branch_f3443: ; f3443
.loop1
sound __, 2, $f1, $07b4
loopchannel 8, Cry_Aipom_branch_f3443
Cry_Aipom_branch_f344b: ; f344b
loopchannel 8, .loop1
.loop2
sound __, 2, $c1, $0790
loopchannel 3, Cry_Aipom_branch_f344b
Cry_Aipom_branch_f3453: ; f3453
loopchannel 3, .loop2
.loop3
sound __, 2, $b1, $078d
loopchannel 2, Cry_Aipom_branch_f3453
loopchannel 2, .loop3
sound C_, 1, $92, $0795
endchannel
; f3460
Cry_Aipom_Ch8: ; f3460
Cry_Aipom_branch_f3460: ; f3460
noise __, 1, $f1, $28
loopchannel 4, Cry_Aipom_branch_f3460
loopchannel 4, Cry_Aipom_Ch8
noise __, 1, $91, $49
noise __, 2, $a8, $4a
noise __, 1, $e1, $4b
@ -1656,7 +1649,6 @@ Cry_Slowpoke_Ch8: ; f3a19
; f3a1a
Cry_Drowzee_Ch5: ; f3a1a
Cry_Drowzee_branch_f3a1a: ; f3a1a
sound_duty 0, 2, 0, 2
sound __, 6, $f2, $0650
sound __, 10, $d1, $0660
@ -1664,7 +1656,7 @@ Cry_Drowzee_branch_f3a1a: ; f3a1a
sound __, 10, $c1, $0622
sound __, 6, $f2, $0610
sound __, 7, $d1, $0620
loopchannel 2, Cry_Drowzee_branch_f3a1a
loopchannel 2, Cry_Drowzee_Ch5
endchannel
; f3a39

424
audio/engine.asm
View File

File diff suppressed because it is too large Load Diff

202
audio/sfx.asm
View File

File diff suppressed because it is too large Load Diff

4
audio/sfx_crystal.asm
View File

@ -196,7 +196,7 @@ Sfx_Tingle_Ch5: ; 179964
dutycycle $1
pitchoffset 0, B_
notetype $1, $b1
Sfx_Tingle_branch_17996c: ; 17996c
.loop
octave 5
note C_, 3
octave 6
@ -204,7 +204,7 @@ Sfx_Tingle_branch_17996c: ; 17996c
octave 5
note C_, 3
note __, 2
loopchannel 2, Sfx_Tingle_branch_17996c
loopchannel 2, .loop
note C_, 2
intensity $a1
note G_, 13

46
constants/audio_constants.asm
View File

@ -31,6 +31,46 @@ NUM_NOISE_CHANS EQU const_value
const CHAN8 ; 7
NUM_CHANNELS EQU const_value
; channel_struct members (see macros/wram.asm)
CHANNEL_MUSIC_ID EQUS "(wChannel1MusicID - wChannel1)"
CHANNEL_MUSIC_BANK EQUS "(wChannel1MusicBank - wChannel1)"
CHANNEL_FLAGS1 EQUS "(wChannel1Flags1 - wChannel1)"
CHANNEL_FLAGS2 EQUS "(wChannel1Flags2 - wChannel1)"
CHANNEL_FLAGS3 EQUS "(wChannel1Flags3 - wChannel1)"
CHANNEL_MUSIC_ADDRESS EQUS "(wChannel1MusicAddress - wChannel1)"
CHANNEL_LAST_MUSIC_ADDRESS EQUS "(wChannel1LastMusicAddress - wChannel1)"
CHANNEL_NOTE_FLAGS EQUS "(wChannel1NoteFlags - wChannel1)"
CHANNEL_CONDITION EQUS "(wChannel1Condition - wChannel1)"
CHANNEL_DUTY_CYCLE EQUS "(wChannel1DutyCycle - wChannel1)"
CHANNEL_INTENSITY EQUS "(wChannel1Intensity - wChannel1)"
CHANNEL_FREQUENCY EQUS "(wChannel1Frequency - wChannel1)"
CHANNEL_PITCH EQUS "(wChannel1Pitch - wChannel1)"
CHANNEL_OCTAVE EQUS "(wChannel1Octave - wChannel1)"
CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)"
CHANNEL_NOTE_DURATION EQUS "(wChannel1NoteDuration - wChannel1)"
CHANNEL_FIELD16 EQUS "(wChannel1Field16 - wChannel1)"
CHANNEL_LOOP_COUNT EQUS "(wChannel1LoopCount - wChannel1)"
CHANNEL_TEMPO EQUS "(wChannel1Tempo - wChannel1)"
CHANNEL_TRACKS EQUS "(wChannel1Tracks - wChannel1)"
CHANNEL_SFX_DUTY_LOOP EQUS "(wChannel1SFXDutyLoop - wChannel1)"
CHANNEL_VIBRATO_DELAY_COUNT EQUS "(wChannel1VibratoDelayCount - wChannel1)"
CHANNEL_VIBRATO_DELAY EQUS "(wChannel1VibratoDelay - wChannel1)"
CHANNEL_VIBRATO_EXTENT EQUS "(wChannel1VibratoExtent - wChannel1)"
CHANNEL_VIBRATO_RATE EQUS "(wChannel1VibratoRate - wChannel1)"
CHANNEL_PITCH_WHEEL_TARGET EQUS "(wChannel1PitchWheelTarget - wChannel1)"
CHANNEL_PITCH_WHEEL_AMOUNT EQUS "(wChannel1PitchWheelAmount - wChannel1)"
CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)"
CHANNEL_FIELD25 EQUS "(wChannel1Field25 - wChannel1)"
CHANNEL_CRY_PITCH EQUS "(wChannel1CryPitch - wChannel1)"
CHANNEL_FIELD29 EQUS "(wChannel1Field29 - wChannel1)"
CHANNEL_FIELD2A EQUS "(wChannel1Field2a - wChannel1)"
CHANNEL_FIELD2C EQUS "(wChannel1Field2c - wChannel1)"
CHANNEL_NOTE_LENGTH EQUS "(wChannel1NoteLength - wChannel1)"
CHANNEL_FIELD2E EQUS "(wChannel1Field2e - wChannel1)"
CHANNEL_FIELD2F EQUS "(wChannel1Field2f - wChannel1)"
CHANNEL_FIELD30 EQUS "(wChannel1Field30 - wChannel1)"
CHANNEL_STRUCT_LENGTH EQUS "(wChannel2 - wChannel1)"
NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7
; Flags1
@ -69,11 +109,11 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7
const NOTE_VIBRATO_OVERRIDE ; 6
; wVolume
VOLUME_SO1_F EQU 3
VOLUME_SO2_F EQU 7
VOLUME_SO1_F EQU 3
VOLUME_SO2_F EQU 7
VOLUME_SO1_LEVEL EQU %00000111
VOLUME_SO2_LEVEL EQU %01110000
MAX_VOLUME EQU $77
MAX_VOLUME EQU $77
; wSoundInput
SOUND_INPUT_CH1_F EQU 0

2
data/items/attributes.asm
View File

@ -269,7 +269,7 @@ ItemAttributes: ; 67c1
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STARDUST
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STAR PIECE
; STAR_PIECE
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BASEMENT_KEY
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE

2
engine/battle/effect_commands.asm
View File

@ -64,7 +64,7 @@ DoMove: ; 3402c
inc hl
ld [de], a
inc de
cp -1
cp endmove_command
jr nz, .GetMoveEffect
; Start at the first command.

6
engine/events/specials.asm
View File

@ -95,13 +95,13 @@ NameRival: ; 0xc29d
farcall _NamingScreen
; default to "SILVER"
ld hl, wRivalName
ld de, DefaultRivalName
ld de, .default
call InitName
ret
; 0xc2b2
DefaultRivalName: ; 0xc2b2
.default
db "SILVER@"
; 0xc2b9
NameRater: ; c2b9
farcall _NameRater

6
engine/gfx/pic_animation.asm
View File

@ -399,11 +399,11 @@ PokeAnim_DoAnimScript: ; d0250
.RunAnim: ; d0261
call PokeAnim_GetPointer
ld a, [wPokeAnimCommand]
cp -1
cp endanim_command
jr z, PokeAnim_End
cp -2
cp setrepeat_command
jr z, .SetRepeat
cp -3
cp dorepeat_command
jr z, .DoRepeat
call PokeAnim_GetFrame
ld a, [wPokeAnimParameter]

5
engine/overworld/map_objects.asm
View File

@ -2116,13 +2116,13 @@ SpawnEmote: ; 5547
ShakeGrass: ; 5556
push bc
ld de, .data_5562
ld de, .GrassObject
call CopyTempObjectData
call InitTempObject
pop bc
ret
.data_5562
.GrassObject
db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
; 5565
@ -2140,6 +2140,7 @@ ShakeScreen: ; 5565
.ScreenShakeObject:
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
; 5579
DespawnEmote: ; 5579
push bc
ld a, [hMapObjectIndexBuffer]

42
home/audio.asm
View File

@ -249,16 +249,16 @@ WaitSFX:: ; 3c55
push hl
.wait
ld hl, wChannel5Flags
ld hl, wChannel5Flags1
bit 0, [hl]
jr nz, .wait
ld hl, wChannel6Flags
ld hl, wChannel6Flags1
bit 0, [hl]
jr nz, .wait
ld hl, wChannel7Flags
ld hl, wChannel7Flags1
bit 0, [hl]
jr nz, .wait
ld hl, wChannel8Flags
ld hl, wChannel8Flags1
bit 0, [hl]
jr nz, .wait
@ -271,16 +271,16 @@ IsSFXPlaying:: ; 3c74
; The inverse of CheckSFX.
push hl
ld hl, wChannel5Flags
ld hl, wChannel5Flags1
bit 0, [hl]
jr nz, .playing
ld hl, wChannel6Flags
ld hl, wChannel6Flags1
bit 0, [hl]
jr nz, .playing
ld hl, wChannel7Flags
ld hl, wChannel7Flags1
bit 0, [hl]
jr nz, .playing
ld hl, wChannel8Flags
ld hl, wChannel8Flags1
bit 0, [hl]
jr nz, .playing
@ -540,16 +540,16 @@ Unreferenced_Function3d9f:: ; 3d9f
CheckSFX:: ; 3dde
; Return carry if any SFX channels are active.
ld a, [wChannel5Flags]
ld a, [wChannel5Flags1]
bit 0, a
jr nz, .playing
ld a, [wChannel6Flags]
ld a, [wChannel6Flags1]
bit 0, a
jr nz, .playing
ld a, [wChannel7Flags]
ld a, [wChannel7Flags1]
bit 0, a
jr nz, .playing
ld a, [wChannel8Flags]
ld a, [wChannel8Flags1]
bit 0, a
jr nz, .playing
and a
@ -561,7 +561,7 @@ CheckSFX:: ; 3dde
TerminateExpBarSound:: ; 3dfe
xor a
ld [wChannel5Flags], a
ld [wChannel5Flags1], a
ld [wSoundInput], a
ld [rNR10], a
ld [rNR11], a
@ -575,10 +575,10 @@ TerminateExpBarSound:: ; 3dfe
ChannelsOff:: ; 3e10
; Quickly turn off music channels
xor a
ld [wChannel1Flags], a
ld [wChannel2Flags], a
ld [wChannel3Flags], a
ld [wChannel4Flags], a
ld [wChannel1Flags1], a
ld [wChannel2Flags1], a
ld [wChannel3Flags1], a
ld [wChannel4Flags1], a
ld [wSoundInput], a
ret
; 3e21
@ -586,10 +586,10 @@ ChannelsOff:: ; 3e10
SFXChannelsOff:: ; 3e21
; Quickly turn off sound effect channels
xor a
ld [wChannel5Flags], a
ld [wChannel6Flags], a
ld [wChannel7Flags], a
ld [wChannel8Flags], a
ld [wChannel5Flags1], a
ld [wChannel6Flags1], a
ld [wChannel7Flags1], a
ld [wChannel8Flags1], a
ld [wSoundInput], a
ret
; 3e32

6
macros/wram.asm
View File

@ -131,7 +131,7 @@ channel_struct: MACRO
; Addreses are wChannel1 (c101).
\1MusicID:: dw
\1MusicBank:: db
\1Flags:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
\1Flags1:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
\1Flags2:: db ; 0:vibrato on/off 2:duty 4:cry pitch
\1Flags3:: db ; 0:vibrato up/down
\1MusicAddress:: dw
@ -141,9 +141,7 @@ channel_struct: MACRO
\1Condition:: db ; conditional jumps
\1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%)
\1Intensity:: db ; hi:pressure lo:velocity
\1Frequency:: ; 11 bits
\1FrequencyLo:: db
\1FrequencyHi:: db
\1Frequency:: dw ; 11 bits
\1Pitch:: db ; 0:rest 1-c:note
\1Octave:: db ; 7-0 (0 is highest)
\1PitchOffset:: db ; raises existing octaves (to repeat phrases)