diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
| commit | f73893db566c67ee9e1b4b6b309853503351d8ca (patch) | |
| tree | 6b420d9e1ab47f11bf6240b48d237c810f4b6aa1 | |
| parent | fde4f79b3ba6a6653b91801e26865155b89a6be0 (diff) | |
Update to latest pokered
499 files changed, 5050 insertions, 4124 deletions
@@ -1,6 +1,6 @@ -# Pokémon: Version Rouge +# Pokémon: Version Rouge and Bleue -This is a disassembly of Pokémon: Version Rouge. +This is a disassembly of Pokémon: Version Rouge and Bleue. It builds the following roms: @@ -162,7 +162,7 @@ INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch6.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 - ld [wChannelSoundIDs + CH4], a ;disable sound channel? + ld [wChannelSoundIDs + Ch4], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -491,7 +491,7 @@ Music_DoLowHealthAlarm:: .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? + ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -542,12 +542,12 @@ Music_PokeFluteInBattle:: ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 + ld hl, wChannelCommandPointers + Ch4 * 2 + ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 + ld de, SFX_08_PokeFlute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 + ld de, SFX_08_PokeFlute_Ch6 Audio2_OverwriteChannelPointer: ld a, e @@ -632,7 +632,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 36f5db5a..f762da29 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,7 +1,7 @@ ; The first of three duplicated sound engines. Audio1_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, 0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio1_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio1_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp CH7 + cp Ch7 jr nz, .loop ret @@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -171,7 +171,7 @@ Audio1_endchannel: bit BIT_CHANNEL_CALL, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .disableChannelOutput .noiseOrSfxChannel @@ -179,7 +179,7 @@ Audio1_endchannel: ld hl, wChannelFlags2 add hl, bc res BIT_EXECUTE_MUSIC, [hl] - cp CH6 + cp Ch6 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 @@ -223,19 +223,19 @@ Audio1_endchannel: and [hl] ld [rNR51], a .asm_9248 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_START jr nc, .asm_9251 jr .skipCry .asm_9251 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_END jr z, .skipCry jr c, .cry jr .skipCry .cry ld a, c - cp CH4 + cp Ch4 jr z, .asm_9265 call Audio1_GoBackOneCommandIfCry ret c @@ -336,14 +336,14 @@ Audio1_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio1_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .skipChannel3 ld hl, wSfxWaveInstrument jr .channel3 @@ -477,7 +477,7 @@ Audio1_tempo: cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio1_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -520,10 +520,10 @@ Audio1_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio1_endchannel @@ -576,7 +576,7 @@ Audio1_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio1_unknownsfx0x10 ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio1_unknownsfx0x10 ; no ld b, 0 ld hl, wChannelFlags2 @@ -606,7 +606,7 @@ Audio1_unknownsfx0x20: call Audio1_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, 0 jr z, .skip ; Channels 1 through 3 have 2 registers that control frequency, but the noise @@ -626,7 +626,7 @@ Audio1_unknownsfx0x20: Audio1_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio1_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? @@ -642,7 +642,7 @@ Audio1_unknownsfx0x10: Audio1_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio1_notelength ; if not noise channel ld a, d and $f0 @@ -690,7 +690,7 @@ Audio1_notelength: ld l, b call Audio1_MultiplyAdd ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -700,7 +700,7 @@ Audio1_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio1_SetSfxTempo ld a, [wSfxTempo] @@ -740,10 +740,10 @@ Audio1_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .next ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -751,9 +751,9 @@ Audio1_notepitch: ; fall through .next ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 .channel3 ld b, 0 @@ -789,10 +789,10 @@ Audio1_notepitch: .skipPitchBend push de ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, 0 ld e, a add hl, de @@ -837,12 +837,12 @@ Audio1_EnableChannelOutput: or [hl] ; set this channel's bits ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .noiseChannelOrNoSfx - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -872,9 +872,9 @@ Audio1_ApplyDutyAndSoundLength: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .skipDuty ; if music channel 3 - cp CH6 + cp Ch6 jr z, .skipDuty ; if sfx channel 3 ; include duty (except on channel 3 which doesn't have it) ld a, d @@ -893,15 +893,15 @@ Audio1_ApplyDutyAndSoundLength: Audio1_ApplyWavePatternAndFrequency: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .next ld de, wSfxWaveInstrument .next @@ -1005,7 +1005,7 @@ Audio1_GoBackOneCommandIfCry: Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_START jr nc, .next jr .no @@ -1541,7 +1541,7 @@ Audio1_PlaySound:: add hl, de ld [hl], a ld a, e - cp CH4 + cp Ch4 jr nz, .asm_9a2b ld a, $8 ld [rNR10], a ; sweep off @@ -1643,7 +1643,7 @@ Audio1_PlaySound:: ld a, [wSoundID] ld [hl], a pop af - cp CH3 + cp Ch3 jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc @@ -1675,12 +1675,12 @@ Audio1_PlaySound:: jr c, .cry jr .done .cry - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer ld de, Audio1_CryEndchannel ld [hl], e inc hl diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 26cef4bd..7f31d88b 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,7 +1,7 @@ ; The second of three duplicated sound engines. Audio2_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio2_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,18 +30,18 @@ Audio2_UpdateMusic:: .nextChannel ld a, c inc c - cp CH7 + cp Ch7 jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. ; known flags for wChannelFlags1: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag +; 0: toggleperfectpitch has been used +; 1: call has been used +; 3: a toggle used only by this routine for vibrato +; 4: pitchbend flag +; 6: dutycycle flag Audio2_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note @@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -160,7 +160,7 @@ Audio2_PlayNextNote: res 4, [hl] res 5, [hl] ld a, c - cp CH4 + cp Ch4 jr nz, .beginChecks ld a, [wLowHealthAlarm] ;low health alarm enabled? bit 7, a @@ -180,7 +180,7 @@ Audio2_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .asm_219c0 .noiseOrSfxChannel @@ -188,7 +188,7 @@ Audio2_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -231,19 +231,19 @@ Audio2_endchannel: and [hl] ld [rNR51], a .asm_219c9 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $86 jr z, .asm_219ef jr c, .asm_219dd jr .asm_219ef .asm_219dd ld a, c - cp CH4 + cp Ch4 jr z, .asm_219e6 call Audio2_21e6d ret c @@ -344,14 +344,14 @@ Audio2_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio2_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -471,7 +471,7 @@ Audio2_tempo: cp $ed ; is this command a tempo? jr nz, Audio2_stereopanning ; no ld a, c ; yes - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio2_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -514,10 +514,10 @@ Audio2_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio2_endchannel @@ -570,7 +570,7 @@ Audio2_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio2_unknownsfx0x10 ; no ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio2_unknownsfx0x10 ; no ld b, $0 ld hl, wChannelFlags2 @@ -596,7 +596,7 @@ Audio2_unknownsfx0x20: call Audio2_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -613,7 +613,7 @@ Audio2_unknownsfx0x20: Audio2_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio2_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? @@ -629,7 +629,7 @@ Audio2_unknownsfx0x10: Audio2_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio2_notelength ; if not noise channel ld a, d and $f0 @@ -677,7 +677,7 @@ Audio2_notelength: ld l, b call Audio2_22006 ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -687,7 +687,7 @@ Audio2_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio2_21e2f ld a, [wSfxTempo] @@ -727,9 +727,9 @@ Audio2_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -737,9 +737,9 @@ Audio2_notepitch: ; fall through .sfxChannel ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -775,9 +775,9 @@ Audio2_notepitch: .asm_21d39 push de ld a, c - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, $0 ld e, a add hl, de @@ -822,11 +822,11 @@ Audio2_21d79: or [hl] ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .sfxNoiseChannel - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -854,9 +854,9 @@ Audio2_21daa: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .channel3 ; if music channel 3 - cp CH6 + cp Ch6 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -874,15 +874,15 @@ Audio2_21daa: Audio2_21dcc: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -921,7 +921,7 @@ Audio2_21dcc: inc hl ld [hl], d ld a, c - cp CH4 + cp Ch4 jr c, .musicChannel call Audio2_21e56 .musicChannel @@ -929,7 +929,7 @@ Audio2_21dcc: Audio2_21e19: ld a, c - cp CH4 + cp Ch4 jr nz, .asm_21e2e ld a, [wLowHealthAlarm] bit 7, a @@ -1008,7 +1008,7 @@ Audio2_21e6d: ret Audio2_21e8b: - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1025,9 +1025,9 @@ Audio2_21e8b: ret Audio2_21e9f: - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld b, a - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] or b cp $9d jr nc, .asm_21ead @@ -1313,7 +1313,7 @@ Audio2_22017: ld d, [hl] ld a, b .loop - cp CH7 + cp Ch7 jr z, .done sra d rr e @@ -1682,12 +1682,12 @@ Audio2_2224e: jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 33baa5c6..bd784023 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,7 +1,7 @@ ; The third of three duplicated sound engines. Audio3_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio3_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,18 +30,18 @@ Audio3_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp CH7 + cp Ch7 jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. ; known flags for wChannelFlags1: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag +; 0: toggleperfectpitch has been used +; 1: call has been used +; 3: a toggle used only by this routine for vibrato +; 4: pitchbend flag +; 6: dutycycle flag Audio3_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note @@ -52,9 +52,9 @@ Audio3_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -173,7 +173,7 @@ Audio3_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .asm_7d2b3 .noiseOrSfxChannel @@ -181,7 +181,7 @@ Audio3_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -224,19 +224,19 @@ Audio3_endchannel: and [hl] ld [rNR51], a .asm_7d2bc - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 jr .asm_7d2e2 .asm_7d2d0 ld a, c - cp CH4 + cp Ch4 jr z, .asm_7d2d9 call Audio3_7d73b ret c @@ -337,14 +337,14 @@ Audio3_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio3_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -464,7 +464,7 @@ Audio3_tempo: cp $ed ; is this command a tempo? jr nz, Audio3_stereopanning ; no ld a, c ; yes - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio3_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -507,10 +507,10 @@ Audio3_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio3_endchannel @@ -563,7 +563,7 @@ Audio3_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio3_unknownsfx0x10 ; no ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio3_unknownsfx0x10 ; no ld b, $0 ld hl, wChannelFlags2 @@ -589,7 +589,7 @@ Audio3_unknownsfx0x20: call Audio3_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -606,7 +606,7 @@ Audio3_unknownsfx0x20: Audio3_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio3_note ; if not a sfx ld a, d cp $10 ; is this command an unknownsfx0x10? @@ -622,7 +622,7 @@ Audio3_unknownsfx0x10: Audio3_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio3_notelength ; if not noise channel ld a, d and $f0 @@ -670,7 +670,7 @@ Audio3_notelength: ld l, b call Audio3_7d8bb ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -680,7 +680,7 @@ Audio3_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio3_7d707 ld a, [wSfxTempo] @@ -720,9 +720,9 @@ Audio3_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -730,9 +730,9 @@ Audio3_notepitch: ; fall through .sfxChannel ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -768,9 +768,9 @@ Audio3_notepitch: .asm_7d62c push de ld a, c - cp CH4 + cp Ch4 jr nc, .skip ; if sfx Channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, $0 ld e, a add hl, de @@ -815,11 +815,11 @@ Audio3_7d66c: or [hl] ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .sfxNoiseChannel - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -847,9 +847,9 @@ Audio3_7d69d: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .channel3 ; if music channel 3 - cp CH6 + cp Ch6 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -867,15 +867,15 @@ Audio3_7d69d: Audio3_7d6bf: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -977,7 +977,7 @@ Audio3_7d73b: ret Audio3_7d759: - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -1631,12 +1631,12 @@ Audio3_7db03: jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer ld de, Noise3_endchannel ld [hl], e inc hl diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 5a762b30..38594d41 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,66 @@ Music_PalletTown:: - db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 - db CH1 - dw Music_PalletTown_Ch2 - db CH2 - dw Music_PalletTown_Ch3 + audio Music_PalletTown, Ch0, Ch1, Ch2 Music_Pokecenter:: - db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 - db CH1 - dw Music_Pokecenter_Ch2 - db CH2 - dw Music_Pokecenter_Ch3 + audio Music_Pokecenter, Ch0, Ch1, Ch2 Music_Gym:: - db ( $80 | CH0 ) - dw Music_Gym_Ch1 - db CH1 - dw Music_Gym_Ch2 - db CH2 - dw Music_Gym_Ch3 + audio Music_Gym, Ch0, Ch1, Ch2 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 - db CH1 - dw Music_Cities1_Ch2 - db CH2 - dw Music_Cities1_Ch3 - db CH3 - dw Music_Cities1_Ch4 + audio Music_Cities1, Ch0, Ch1, Ch2, Ch3 ; Cerulean City, Fuchsia City Music_Cities2:: - db ( $80 | CH0 ) - dw Music_Cities2_Ch1 - db CH1 - dw Music_Cities2_Ch2 - db CH2 - dw Music_Cities2_Ch3 + audio Music_Cities2, Ch0, Ch1, Ch2 Music_Celadon:: - db ( $80 | CH0 ) - dw Music_Celadon_Ch1 - db CH1 - dw Music_Celadon_Ch2 - db CH2 - dw Music_Celadon_Ch3 + audio Music_Celadon, Ch0, Ch1, Ch2 Music_Cinnabar:: - db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 - db CH1 - dw Music_Cinnabar_Ch2 - db CH2 - dw Music_Cinnabar_Ch3 + audio Music_Cinnabar, Ch0, Ch1, Ch2 Music_Vermilion:: - db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 - db CH1 - dw Music_Vermilion_Ch2 - db CH2 - dw Music_Vermilion_Ch3 - db CH3 - dw Music_Vermilion_Ch4 + audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3 Music_Lavender:: - db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 - db CH1 - dw Music_Lavender_Ch2 - db CH2 - dw Music_Lavender_Ch3 - db CH3 - dw Music_Lavender_Ch4 + audio Music_Lavender, Ch0, Ch1, Ch2, Ch3 Music_SSAnne:: - db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 - db CH1 - dw Music_SSAnne_Ch2 - db CH2 - dw Music_SSAnne_Ch3 + audio Music_SSAnne, Ch0, Ch1, Ch2 Music_MeetProfOak:: - db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 - db CH1 - dw Music_MeetProfOak_Ch2 - db CH2 - dw Music_MeetProfOak_Ch3 + audio Music_MeetProfOak, Ch0, Ch1, Ch2 Music_MeetRival:: - db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 - db CH1 - dw Music_MeetRival_Ch2 - db CH2 - dw Music_MeetRival_Ch3 + audio Music_MeetRival, Ch0, Ch1, Ch2 Music_MuseumGuy:: - db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 - db CH1 - dw Music_MuseumGuy_Ch2 - db CH2 - dw Music_MuseumGuy_Ch3 - db CH3 - dw Music_MuseumGuy_Ch4 + audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3 Music_SafariZone:: - db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 - db CH1 - dw Music_SafariZone_Ch2 - db CH2 - dw Music_SafariZone_Ch3 + audio Music_SafariZone, Ch0, Ch1, Ch2 Music_PkmnHealed:: - db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 - db CH1 - dw Music_PkmnHealed_Ch2 - db CH2 - dw Music_PkmnHealed_Ch3 + audio Music_PkmnHealed, Ch0, Ch1, Ch2 ; Routes 1 and 2 Music_Routes1:: - db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 - db CH1 - dw Music_Routes1_Ch2 - db CH2 - dw Music_Routes1_Ch3 - db CH3 - dw Music_Routes1_Ch4 + audio Music_Routes1, Ch0, Ch1, Ch2, Ch3 ; Routes 24 and 25 Music_Routes2:: - db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 - db CH1 - dw Music_Routes2_Ch2 - db CH2 - dw Music_Routes2_Ch3 - db CH3 - dw Music_Routes2_Ch4 + audio Music_Routes2, Ch0, Ch1, Ch2, Ch3 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 - db CH1 - dw Music_Routes3_Ch2 - db CH2 - dw Music_Routes3_Ch3 - db CH3 - dw Music_Routes3_Ch4 + audio Music_Routes3, Ch0, Ch1, Ch2, Ch3 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 - db CH1 - dw Music_Routes4_Ch2 - db CH2 - dw Music_Routes4_Ch3 - db CH3 - dw Music_Routes4_Ch4 + audio Music_Routes4, Ch0, Ch1, Ch2, Ch3 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 - db CH1 - dw Music_IndigoPlateau_Ch2 - db CH2 - dw Music_IndigoPlateau_Ch3 - db CH3 - dw Music_IndigoPlateau_Ch4 + audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 8adc039a..45557420 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,55 +1,20 @@ Music_GymLeaderBattle:: - db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 - db CH1 - dw Music_GymLeaderBattle_Ch2 - db CH2 - dw Music_GymLeaderBattle_Ch3 + audio Music_GymLeaderBattle, Ch0, Ch1, Ch2 Music_TrainerBattle:: - db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 - db CH1 - dw Music_TrainerBattle_Ch2 - db CH2 - dw Music_TrainerBattle_Ch3 + audio Music_TrainerBattle, Ch0, Ch1, Ch2 Music_WildBattle:: - db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 - db CH1 - dw Music_WildBattle_Ch2 - db CH2 - dw Music_WildBattle_Ch3 + audio Music_WildBattle, Ch0, Ch1, Ch2 Music_FinalBattle:: - db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 - db CH1 - dw Music_FinalBattle_Ch2 - db CH2 - dw Music_FinalBattle_Ch3 + audio Music_FinalBattle, Ch0, Ch1, Ch2 Music_DefeatedTrainer:: - db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 - db CH1 - dw Music_DefeatedTrainer_Ch2 - db CH2 - dw Music_DefeatedTrainer_Ch3 + audio Music_DefeatedTrainer, Ch0, Ch1, Ch2 Music_DefeatedWildMon:: - db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 - db CH1 - dw Music_DefeatedWildMon_Ch2 - db CH2 - dw Music_DefeatedWildMon_Ch3 + audio Music_DefeatedWildMon, Ch0, Ch1, Ch2 Music_DefeatedGymLeader:: - db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 - db CH1 - dw Music_DefeatedGymLeader_Ch2 - db CH2 - dw Music_DefeatedGymLeader_Ch3 + audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 1c54b266..90798882 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,158 +1,56 @@ Music_TitleScreen:: - db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 - db CH1 - dw Music_TitleScreen_Ch2 - db CH2 - dw Music_TitleScreen_Ch3 - db CH3 - dw Music_TitleScreen_Ch4 + audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3 Music_Credits:: - db ( $80 | CH0 ) - dw Music_Credits_Ch1 - db CH1 - dw Music_Credits_Ch2 - db CH2 - dw Music_Credits_Ch3 + audio Music_Credits, Ch0, Ch1, Ch2 Music_HallOfFame:: - db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 - db CH1 - dw Music_HallOfFame_Ch2 - db CH2 - dw Music_HallOfFame_Ch3 + audio Music_HallOfFame, Ch0, Ch1, Ch2 Music_OaksLab:: - db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 - db CH1 - dw Music_OaksLab_Ch2 - db CH2 - dw Music_OaksLab_Ch3 + audio Music_OaksLab, Ch0, Ch1, Ch2 Music_JigglypuffSong:: - db $40 - dw Music_JigglypuffSong_Ch1 - db CH1 - dw Music_JigglypuffSong_Ch2 + audio Music_JigglypuffSong, Ch0, Ch1 Music_BikeRiding:: - db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 - db CH1 - dw Music_BikeRiding_Ch2 - db CH2 - dw Music_BikeRiding_Ch3 - db CH3 - dw Music_BikeRiding_Ch4 + audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3 Music_Surfing:: - db ( $80 | CH0 ) - dw Music_Surfing_Ch1 - db CH1 - dw Music_Surfing_Ch2 - db CH2 - dw Music_Surfing_Ch3 + audio Music_Surfing, Ch0, Ch1, Ch2 Music_GameCorner:: - db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 - db CH1 - dw Music_GameCorner_Ch2 - db CH2 - dw Music_GameCorner_Ch3 + audio Music_GameCorner, Ch0, Ch1, Ch2 Music_IntroBattle:: - db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch1 - db CH1 - dw Music_IntroBattle_Ch2 - db CH2 - dw Music_IntroBattle_Ch3 - db CH3 - dw Music_IntroBattle_Ch4 + audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: - db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 - db CH1 - dw Music_Dungeon1_Ch2 - db CH2 - dw Music_Dungeon1_Ch3 - db CH3 - dw Music_Dungeon1_Ch4 + audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 - db CH1 - dw Music_Dungeon2_Ch2 - db CH2 - dw Music_Dungeon2_Ch3 - db CH3 - dw Music_Dungeon2_Ch4 + audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 - db CH1 - dw Music_Dungeon3_Ch2 - db CH2 - dw Music_Dungeon3_Ch3 - db CH3 - dw Music_Dungeon3_Ch4 + audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3 Music_CinnabarMansion:: - db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 - db CH1 - dw Music_CinnabarMansion_Ch2 - db CH2 - dw Music_CinnabarMansion_Ch3 - db CH3 - dw Music_CinnabarMansion_Ch4 + audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3 Music_PokemonTower:: - db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 - db CH1 - dw Music_PokemonTower_Ch2 - db CH2 - dw Music_PokemonTower_Ch3 + audio Music_PokemonTower, Ch0, Ch1, Ch2 Music_SilphCo:: - db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 - db CH1 - dw Music_SilphCo_Ch2 - db CH2 - dw Music_SilphCo_Ch3 + audio Music_SilphCo, Ch0, Ch1, Ch2 Music_MeetEvilTrainer:: - db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 - db CH1 - dw Music_MeetEvilTrainer_Ch2 - db CH2 - dw Music_MeetEvilTrainer_Ch3 + audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2 Music_MeetFemaleTrainer:: - db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 - db CH1 - dw Music_MeetFemaleTrainer_Ch2 - db CH2 - dw Music_MeetFemaleTrainer_Ch3 + audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2 Music_MeetMaleTrainer:: - db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 - db CH1 - dw Music_MeetMaleTrainer_Ch2 - db CH2 - dw Music_MeetMaleTrainer_Ch3 + audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 57c62e1c..72a69646 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -2,561 +2,287 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding SFX_Snare1_1:: - db CH7 - dw SFX_Snare1_1_Ch1 + audio SFX_Snare1_1, Ch7 SFX_Snare2_1:: - db CH7 - dw SFX_Snare2_1_Ch1 + audio SFX_Snare2_1, Ch7 SFX_Snare3_1:: - db CH7 - dw SFX_Snare3_1_Ch1 + audio SFX_Snare3_1, Ch7 SFX_Snare4_1:: - db CH7 - dw SFX_Snare4_1_Ch1 + audio SFX_Snare4_1, Ch7 SFX_Snare5_1:: - db CH7 - dw SFX_Snare5_1_Ch1 + audio SFX_Snare5_1, Ch7 SFX_Triangle1_1:: - db CH7 - dw SFX_Triangle1_1_Ch1 + audio SFX_Triangle1_1, Ch7 SFX_Triangle2_1:: - db CH7 - dw SFX_Triangle2_1_Ch1 + audio SFX_Triangle2_1, Ch7 SFX_Snare6_1:: - db CH7 - dw SFX_Snare6_1_Ch1 + audio SFX_Snare6_1, Ch7 SFX_Snare7_1:: - db CH7 - dw SFX_Snare7_1_Ch1 + audio SFX_Snare7_1, Ch7 SFX_Snare8_1:: - db CH7 - dw SFX_Snare8_1_Ch1 + audio SFX_Snare8_1, Ch7 SFX_Snare9_1:: - db CH7 - dw SFX_Snare9_1_Ch1 + audio SFX_Snare9_1, Ch7 SFX_Cymbal1_1:: - db CH7 - dw SFX_Cymbal1_1_Ch1 + audio SFX_Cymbal1_1, Ch7 SFX_Cymbal2_1:: - db CH7 - dw SFX_Cymbal2_1_Ch1 + audio SFX_Cymbal2_1, Ch7 SFX_Cymbal3_1:: - db CH7 - dw SFX_Cymbal3_1_Ch1 + audio SFX_Cymbal3_1, Ch7 SFX_Muted_Snare1_1:: - db CH7 - dw SFX_Muted_Snare1_1_Ch1 + audio SFX_Muted_Snare1_1, Ch7 SFX_Triangle3_1:: - db CH7 - dw SFX_Triangle3_1_Ch1 + audio SFX_Triangle3_1, Ch7 SFX_Muted_Snare2_1:: - db CH7 - dw SFX_Muted_Snare2_1_Ch1 + audio SFX_Muted_Snare2_1, Ch7 SFX_Muted_Snare3_1:: - db CH7 - dw SFX_Muted_Snare3_1_Ch1 + audio SFX_Muted_Snare3_1, Ch7 SFX_Muted_Snare4_1:: - db CH7 - dw SFX_Muted_Snare4_1_Ch1 + audio SFX_Muted_Snare4_1, Ch7 SFX_Cry00_1:: - db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 - db CH5 - dw SFX_Cry00_1_Ch2 - db CH7 - dw SFX_Cry00_1_Ch3 + audio SFX_Cry00_1, Ch4, Ch5, Ch7 SFX_Cry01_1:: - db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 - db CH5 - dw SFX_Cry01_1_Ch2 - db CH7 - dw SFX_Cry01_1_Ch3 + audio SFX_Cry01_1, Ch4, Ch5, Ch7 SFX_Cry02_1:: - db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 - db CH5 - dw SFX_Cry02_1_Ch2 - db CH7 - dw SFX_Cry02_1_Ch3 + audio SFX_Cry02_1, Ch4, Ch5, Ch7 SFX_Cry03_1:: - db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 - db CH5 - dw SFX_Cry03_1_Ch2 - db CH7 - dw SFX_Cry03_1_Ch3 + audio SFX_Cry03_1, Ch4, Ch5, Ch7 SFX_Cry04_1:: - db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 - db CH5 - dw SFX_Cry04_1_Ch2 - db CH7 - dw SFX_Cry04_1_Ch3 + audio SFX_Cry04_1, Ch4, Ch5, Ch7 SFX_Cry05_1:: - db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 - db CH5 - dw SFX_Cry05_1_Ch2 - db CH7 - dw SFX_Cry05_1_Ch3 + audio SFX_Cry05_1, Ch4, Ch5, Ch7 SFX_Cry06_1:: - db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 - db CH5 - dw SFX_Cry06_1_Ch2 - db CH7 - dw SFX_Cry06_1_Ch3 + audio SFX_Cry06_1, Ch4, Ch5, Ch7 SFX_Cry07_1:: - db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 - db CH5 - dw SFX_Cry07_1_Ch2 - db CH7 - dw SFX_Cry07_1_Ch3 + audio SFX_Cry07_1, Ch4, Ch5, Ch7 SFX_Cry08_1:: - db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 - db CH5 - dw SFX_Cry08_1_Ch2 - db CH7 - dw SFX_Cry08_1_Ch3 + audio SFX_Cry08_1, Ch4, Ch5, Ch7 SFX_Cry09_1:: - db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 - db CH5 - dw SFX_Cry09_1_Ch2 - db CH7 - dw SFX_Cry09_1_Ch3 + audio SFX_Cry09_1, Ch4, Ch5, Ch7 SFX_Cry0A_1:: - db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 - db CH5 - dw SFX_Cry0A_1_Ch2 - db CH7 - dw SFX_Cry0A_1_Ch3 + audio SFX_Cry0A_1, Ch4, Ch5, Ch7 SFX_Cry0B_1:: - db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 - db CH5 - dw SFX_Cry0B_1_Ch2 - db CH7 - dw SFX_Cry0B_1_Ch3 + audio SFX_Cry0B_1, Ch4, Ch5, Ch7 SFX_Cry0C_1:: - db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 - db CH5 - dw SFX_Cry0C_1_Ch2 - db CH7 - dw SFX_Cry0C_1_Ch3 + audio SFX_Cry0C_1, Ch4, Ch5, Ch7 SFX_Cry0D_1:: - db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 - db CH5 - dw SFX_Cry0D_1_Ch2 - db CH7 - dw SFX_Cry0D_1_Ch3 + audio SFX_Cry0D_1, Ch4, Ch5, Ch7 SFX_Cry0E_1:: - db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 - db CH5 - dw SFX_Cry0E_1_Ch2 - db CH7 - dw SFX_Cry0E_1_Ch3 + audio SFX_Cry0E_1, Ch4, Ch5, Ch7 SFX_Cry0F_1:: - db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 - db CH5 - dw SFX_Cry0F_1_Ch2 - db CH7 - dw SFX_Cry0F_1_Ch3 + audio SFX_Cry0F_1, Ch4, Ch5, Ch7 SFX_Cry10_1:: - db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 - db CH5 - dw SFX_Cry10_1_Ch2 - db CH7 - dw SFX_Cry10_1_Ch3 + audio SFX_Cry10_1, Ch4, Ch5, Ch7 SFX_Cry11_1:: - db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 - db CH5 - dw SFX_Cry11_1_Ch2 - db CH7 - dw SFX_Cry11_1_Ch3 + audio SFX_Cry11_1, Ch4, Ch5, Ch7 SFX_Cry12_1:: - db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 - db CH5 - dw SFX_Cry12_1_Ch2 - db CH7 - dw SFX_Cry12_1_Ch3 + audio SFX_Cry12_1, Ch4, Ch5, Ch7 SFX_Cry13_1:: - db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 - db CH5 - dw SFX_Cry13_1_Ch2 - db CH7 - dw SFX_Cry13_1_Ch3 + audio SFX_Cry13_1, Ch4, Ch5, Ch7 SFX_Cry14_1:: - db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 - db CH5 - dw SFX_Cry14_1_Ch2 - db CH7 - dw SFX_Cry14_1_Ch3 + audio SFX_Cry14_1, Ch4, Ch5, Ch7 SFX_Cry15_1:: - db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 - db CH5 - dw SFX_Cry15_1_Ch2 - db CH7 - dw SFX_Cry15_1_Ch3 + audio SFX_Cry15_1, Ch4, Ch5, Ch7 SFX_Cry16_1:: - db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 - db CH5 - dw SFX_Cry16_1_Ch2 - db CH7 - dw SFX_Cry16_1_Ch3 + audio SFX_Cry16_1, Ch4, Ch5, Ch7 SFX_Cry17_1:: - db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 - db CH5 - dw SFX_Cry17_1_Ch2 - db CH7 - dw SFX_Cry17_1_Ch3 + audio SFX_Cry17_1, Ch4, Ch5, Ch7 SFX_Cry18_1:: - db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 - db CH5 - dw SFX_Cry18_1_Ch2 - db CH7 - dw SFX_Cry18_1_Ch3 + audio SFX_Cry18_1, Ch4, Ch5, Ch7 SFX_Cry19_1:: - db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 - db CH5 - dw SFX_Cry19_1_Ch2 - db CH7 - dw SFX_Cry19_1_Ch3 + audio SFX_Cry19_1, Ch4, Ch5, Ch7 SFX_Cry1A_1:: - db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 - db CH5 - dw SFX_Cry1A_1_Ch2 - db CH7 - dw SFX_Cry1A_1_Ch3 + audio SFX_Cry1A_1, Ch4, Ch5, Ch7 SFX_Cry1B_1:: - db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 - db CH5 - dw SFX_Cry1B_1_Ch2 - db CH7 - dw SFX_Cry1B_1_Ch3 + audio SFX_Cry1B_1, Ch4, Ch5, Ch7 SFX_Cry1C_1:: - db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 - db CH5 - dw SFX_Cry1C_1_Ch2 - db CH7 - dw SFX_Cry1C_1_Ch3 + audio SFX_Cry1C_1, Ch4, Ch5, Ch7 SFX_Cry1D_1:: - db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 - db CH5 - dw SFX_Cry1D_1_Ch2 - db CH7 - dw SFX_Cry1D_1_Ch3 + audio SFX_Cry1D_1, Ch4, Ch5, Ch7 SFX_Cry1E_1:: - db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 - db CH5 - dw SFX_Cry1E_1_Ch2 - db CH7 - dw SFX_Cry1E_1_Ch3 + audio SFX_Cry1E_1, Ch4, Ch5, Ch7 SFX_Cry1F_1:: - db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 - db CH5 - dw SFX_Cry1F_1_Ch2 - db CH7 - dw SFX_Cry1F_1_Ch3 + audio SFX_Cry1F_1, Ch4, Ch5, Ch7 SFX_Cry20_1:: - db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 - db CH5 - dw SFX_Cry20_1_Ch2 - db CH7 - dw SFX_Cry20_1_Ch3 + audio SFX_Cry20_1, Ch4, Ch5, Ch7 SFX_Cry21_1:: - db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 - db CH5 - dw SFX_Cry21_1_Ch2 - db CH7 - dw SFX_Cry21_1_Ch3 + audio SFX_Cry21_1, Ch4, Ch5, Ch7 SFX_Cry22_1:: - db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 - db CH5 - dw SFX_Cry22_1_Ch2 - db CH7 - dw SFX_Cry22_1_Ch3 + audio SFX_Cry22_1, Ch4, Ch5, Ch7 SFX_Cry23_1:: - db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 - db CH5 - dw SFX_Cry23_1_Ch2 - db CH7 - dw SFX_Cry23_1_Ch3 + audio SFX_Cry23_1, Ch4, Ch5, Ch7 SFX_Cry24_1:: - db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 - db CH5 - dw SFX_Cry24_1_Ch2 - db CH7 - dw SFX_Cry24_1_Ch3 + audio SFX_Cry24_1, Ch4, Ch5, Ch7 SFX_Cry25_1:: - db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 - db CH5 - dw SFX_Cry25_1_Ch2 - db CH7 - dw SFX_Cry25_1_Ch3 + audio SFX_Cry25_1, Ch4, Ch5, Ch7 SFX_Get_Item1_1:: - db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 - db CH5 - dw SFX_Get_Item1_1_Ch2 - db CH6 - dw SFX_Get_Item1_1_Ch3 + audio SFX_Get_Item1_1, Ch4, Ch5, Ch6 SFX_Get_Item2_1:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 - db CH5 - dw SFX_Get_Item2_1_Ch2 - db CH6 - dw SFX_Get_Item2_1_Ch3 + audio SFX_Get_Item2_1, Ch4, Ch5, Ch6 SFX_Tink_1:: - db CH4 - dw SFX_Tink_1_Ch1 + audio SFX_Tink_1, Ch4 SFX_Heal_HP_1:: - db CH4 - dw SFX_Heal_HP_1_Ch1 + audio SFX_Heal_HP_1, Ch4 SFX_Heal_Ailment_1:: - db CH4 - dw SFX_Heal_Ailment_1_Ch1 + audio SFX_Heal_Ailment_1, Ch4 SFX_Start_Menu_1:: - db CH7 - dw SFX_Start_Menu_1_Ch1 + audio SFX_Start_Menu_1, Ch7 SFX_Press_AB_1:: - db CH4 - dw SFX_Press_AB_1_Ch1 + audio SFX_Press_AB_1, Ch4 SFX_Pokedex_Rating_1:: - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 - db CH5 - dw SFX_Pokedex_Rating_1_Ch2 - db CH6 - dw SFX_Pokedex_Rating_1_Ch3 + audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6 SFX_Get_Key_Item_1:: - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 - db CH5 - dw SFX_Get_Key_Item_1_Ch2 - db CH6 - dw SFX_Get_Key_Item_1_Ch3 + audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6 SFX_Poisoned_1:: - db CH4 - dw SFX_Poisoned_1_Ch1 + audio SFX_Poisoned_1, Ch4 SFX_Trade_Machine_1:: - db CH4 - dw SFX_Trade_Machine_1_Ch1 + audio SFX_Trade_Machine_1, Ch4 SFX_Turn_On_PC_1:: - db CH4 - dw SFX_Turn_On_PC_1_Ch1 + audio SFX_Turn_On_PC_1, Ch4 SFX_Turn_Off_PC_1:: - db CH4 - dw SFX_Turn_Off_PC_1_Ch1 + audio SFX_Turn_Off_PC_1, Ch4 SFX_Enter_PC_1:: - db CH4 - dw SFX_Enter_PC_1_Ch1 + audio SFX_Enter_PC_1, Ch4 SFX_Shrink_1:: - db CH4 - dw SFX_Shrink_1_Ch1 + audio SFX_Shrink_1, Ch4 SFX_Switch_1:: - db CH4 - dw SFX_Switch_1_Ch1 + audio SFX_Switch_1, Ch4 SFX_Healing_Machine_1:: - db CH4 - dw SFX_Healing_Machine_1_Ch1 + audio SFX_Healing_Machine_1, Ch4 SFX_Teleport_Exit1_1:: - db CH4 - dw SFX_Teleport_Exit1_1_Ch1 + audio SFX_Teleport_Exit1_1, Ch4 SFX_Teleport_Enter1_1:: - db CH4 - dw SFX_Teleport_Enter1_1_Ch1 + audio SFX_Teleport_Enter1_1, Ch4 SFX_Teleport_Exit2_1:: - db CH4 - dw SFX_Teleport_Exit2_1_Ch1 + audio SFX_Teleport_Exit2_1, Ch4 SFX_Ledge_1:: - db CH4 - dw SFX_Ledge_1_Ch1 + audio SFX_Ledge_1, Ch4 SFX_Teleport_Enter2_1:: - db CH7 - dw SFX_Teleport_Enter2_1_Ch1 + audio SFX_Teleport_Enter2_1, Ch7 SFX_Fly_1:: - db CH7 - dw SFX_Fly_1_Ch1 + audio SFX_Fly_1, Ch7 SFX_Denied_1:: - db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 - db CH5 - dw SFX_Denied_1_Ch2 + audio SFX_Denied_1, Ch4, Ch5 SFX_Arrow_Tiles_1:: - db CH4 - dw SFX_Arrow_Tiles_1_Ch1 + audio SFX_Arrow_Tiles_1, Ch4 SFX_Push_Boulder_1:: - db CH7 - dw SFX_Push_Boulder_1_Ch1 + audio SFX_Push_Boulder_1, Ch7 SFX_SS_Anne_Horn_1:: - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 + audio SFX_SS_Anne_Horn_1, Ch4, Ch5 SFX_Withdraw_Deposit_1:: - db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 + audio SFX_Withdraw_Deposit_1, Ch4 SFX_Cut_1:: - db CH7 - dw SFX_Cut_1_Ch1 + audio SFX_Cut_1, Ch7 SFX_Go_Inside_1:: - db CH7 - dw SFX_Go_Inside_1_Ch1 + audio SFX_Go_Inside_1, Ch7 SFX_Swap_1:: - db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 - db CH5 - dw SFX_Swap_1_Ch2 + audio SFX_Swap_1, Ch4, Ch5 SFX_59_1:: - db ( $40 | CH4 ) - dw SFX_59_1_Ch1 - db CH5 - dw SFX_59_1_Ch2 + audio SFX_59_1, Ch4, Ch5 SFX_Purchase_1:: - db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 - db CH5 - dw SFX_Purchase_1_Ch2 + audio SFX_Purchase_1, Ch4, Ch5 SFX_Collision_1:: - db CH4 - dw SFX_Collision_1_Ch1 + audio SFX_Collision_1, Ch4 SFX_Go_Outside_1:: - db CH7 - dw SFX_Go_Outside_1_Ch1 + audio SFX_Go_Outside_1, Ch7 SFX_Save_1:: - db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 - db CH5 - dw SFX_Save_1_Ch2 + audio SFX_Save_1, Ch4, Ch5 +; the Pokeflute sound effect directly hijacks channel 2 SFX_Pokeflute:: - db CH2 - dw SFX_Pokeflute_Ch1 + audio SFX_Pokeflute, Ch2 SFX_Safari_Zone_PA:: - db CH4 - dw SFX_Safari_Zone_PA_Ch1 + audio SFX_Safari_Zone_PA, Ch4 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b6f8a5c..b96a764f 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -2,705 +2,358 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding SFX_Snare1_2:: - db CH7 - dw SFX_Snare1_2_Ch1 + audio SFX_Snare1_2, Ch7 SFX_Snare2_2:: - db CH7 - dw SFX_Snare2_2_Ch1 + audio SFX_Snare2_2, Ch7 SFX_Snare3_2:: - db CH7 - dw SFX_Snare3_2_Ch1 + audio SFX_Snare3_2, Ch7 SFX_Snare4_2:: - db CH7 - dw SFX_Snare4_2_Ch1 + audio SFX_Snare4_2, Ch7 SFX_Snare5_2:: - db CH7 - dw SFX_Snare5_2_Ch1 + audio SFX_Snare5_2, Ch7 SFX_Triangle1_2:: - db CH7 - dw SFX_Triangle1_2_Ch1 + audio SFX_Triangle1_2, Ch7 SFX_Triangle2_2:: - db CH7 - dw SFX_Triangle2_2_Ch1 + audio SFX_Triangle2_2, Ch7 SFX_Snare6_2:: - db CH7 - dw SFX_Snare6_2_Ch1 + audio SFX_Snare6_2, Ch7 SFX_Snare7_2:: - db CH7 - dw SFX_Snare7_2_Ch1 + audio SFX_Snare7_2, Ch7 SFX_Snare8_2:: - db CH7 - dw SFX_Snare8_2_Ch1 + audio SFX_Snare8_2, Ch7 SFX_Snare9_2:: - db CH7 - dw SFX_Snare9_2_Ch1 + audio SFX_Snare9_2, Ch7 SFX_Cymbal1_2:: - db CH7 - dw SFX_Cymbal1_2_Ch1 + audio SFX_Cymbal1_2, Ch7 SFX_Cymbal2_2:: - db CH7 - dw SFX_Cymbal2_2_Ch1 + audio SFX_Cymbal2_2, Ch7 SFX_Cymbal3_2:: - db CH7 - dw SFX_Cymbal3_2_Ch1 + audio SFX_Cymbal3_2, Ch7 SFX_Muted_Snare1_2:: - db CH7 - dw SFX_Muted_Snare1_2_Ch1 + audio SFX_Muted_Snare1_2, Ch7 SFX_Triangle3_2:: - db CH7 - dw SFX_Triangle3_2_Ch1 + audio SFX_Triangle3_2, Ch7 SFX_Muted_Snare2_2:: - db CH7 - dw SFX_Muted_Snare2_2_Ch1 + audio SFX_Muted_Snare2_2, Ch7 SFX_Muted_Snare3_2:: - db CH7 - dw SFX_Muted_Snare3_2_Ch1 + audio SFX_Muted_Snare3_2, Ch7 SFX_Muted_Snare4_2:: - db CH7 - dw SFX_Muted_Snare4_2_Ch1 + audio SFX_Muted_Snare4_2, Ch7 SFX_Cry00_2:: - db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 - db CH5 - dw SFX_Cry00_2_Ch2 - db CH7 - dw SFX_Cry00_2_Ch3 + audio SFX_Cry00_2, Ch4, Ch5, Ch7 SFX_Cry01_2:: - db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 - db CH5 - dw SFX_Cry01_2_Ch2 - db CH7 - dw SFX_Cry01_2_Ch3 + audio SFX_Cry01_2, Ch4, Ch5, Ch7 SFX_Cry02_2:: - db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 - db CH5 - dw SFX_Cry02_2_Ch2 - db CH7 - dw SFX_Cry02_2_Ch3 + audio SFX_Cry02_2, Ch4, Ch5, Ch7 SFX_Cry03_2:: - db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 - db CH5 - dw SFX_Cry03_2_Ch2 - db CH7 - dw SFX_Cry03_2_Ch3 + audio SFX_Cry03_2, Ch4, Ch5, Ch7 SFX_Cry04_2:: - db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 - db CH5 - dw SFX_Cry04_2_Ch2 - db CH7 - dw SFX_Cry04_2_Ch3 + audio SFX_Cry04_2, Ch4, Ch5, Ch7 SFX_Cry05_2:: - db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 - db CH5 - dw SFX_Cry05_2_Ch2 - db CH7 - dw SFX_Cry05_2_Ch3 + audio SFX_Cry05_2, Ch4, Ch5, Ch7 SFX_Cry06_2:: - db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 - db CH5 - dw SFX_Cry06_2_Ch2 - db CH7 - dw SFX_Cry06_2_Ch3 + audio SFX_Cry06_2, Ch4, Ch5, Ch7 SFX_Cry07_2:: - db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 - db CH5 - dw SFX_Cry07_2_Ch2 - db CH7 - dw SFX_Cry07_2_Ch3 + audio SFX_Cry07_2, Ch4, Ch5, Ch7 SFX_Cry08_2:: - db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 - db CH5 - dw SFX_Cry08_2_Ch2 - db CH7 - dw SFX_Cry08_2_Ch3 + audio SFX_Cry08_2, Ch4, Ch5, Ch7 SFX_Cry09_2:: - db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 - db CH5 - dw SFX_Cry09_2_Ch2 - db CH7 - dw SFX_Cry09_2_Ch3 + audio SFX_Cry09_2, Ch4, Ch5, Ch7 SFX_Cry0A_2:: - db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 - db CH5 - dw SFX_Cry0A_2_Ch2 - db CH7 - dw SFX_Cry0A_2_Ch3 + audio SFX_Cry0A_2, Ch4, Ch5, Ch7 SFX_Cry0B_2:: - db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 - db CH5 - dw SFX_Cry0B_2_Ch2 - db CH7 - dw SFX_Cry0B_2_Ch3 + audio SFX_Cry0B_2, Ch4, Ch5, Ch7 SFX_Cry0C_2:: - db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 - db CH5 - dw SFX_Cry0C_2_Ch2 - db CH7 - dw SFX_Cry0C_2_Ch3 + audio SFX_Cry0C_2, Ch4, Ch5, Ch7 SFX_Cry0D_2:: - db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 - db CH5 - dw SFX_Cry0D_2_Ch2 - db CH7 - dw SFX_Cry0D_2_Ch3 + audio SFX_Cry0D_2, Ch4, Ch5, Ch7 SFX_Cry0E_2:: - db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 - db CH5 - dw SFX_Cry0E_2_Ch2 - db CH7 - dw SFX_Cry0E_2_Ch3 + audio SFX_Cry0E_2, Ch4, Ch5, Ch7 SFX_Cry0F_2:: - db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 - db CH5 - dw SFX_Cry0F_2_Ch2 - db CH7 - dw SFX_Cry0F_2_Ch3 + audio SFX_Cry0F_2, Ch4, Ch5, Ch7 SFX_Cry10_2:: - db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 - db CH5 - dw SFX_Cry10_2_Ch2 - db CH7 - dw SFX_Cry10_2_Ch3 + audio SFX_Cry10_2, Ch4, Ch5, Ch7 SFX_Cry11_2:: - db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 - db CH5 - dw SFX_Cry11_2_Ch2 - db CH7 - dw SFX_Cry11_2_Ch3 + audio SFX_Cry11_2, Ch4, Ch5, Ch7 SFX_Cry12_2:: - db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 - db CH5 - dw SFX_Cry12_2_Ch2 - db CH7 - dw SFX_Cry12_2_Ch3 + audio SFX_Cry12_2, Ch4, Ch5, Ch7 SFX_Cry13_2:: - db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 - db CH5 - dw SFX_Cry13_2_Ch2 - db CH7 - dw SFX_Cry13_2_Ch3 + audio SFX_Cry13_2, Ch4, Ch5, Ch7 SFX_Cry14_2:: - db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 - db CH5 - dw SFX_Cry14_2_Ch2 - db CH7 - dw SFX_Cry14_2_Ch3 + audio SFX_Cry14_2, Ch4, Ch5, Ch7 SFX_Cry15_2:: - db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 - db CH5 - dw SFX_Cry15_2_Ch2 - db CH7 - dw SFX_Cry15_2_Ch3 + audio SFX_Cry15_2, Ch4, Ch5, Ch7 SFX_Cry16_2:: - db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 - db CH5 - dw SFX_Cry16_2_Ch2 - db CH7 - dw SFX_Cry16_2_Ch3 + audio SFX_Cry16_2, Ch4, Ch5, Ch7 SFX_Cry17_2:: - db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 - db CH5 - dw SFX_Cry17_2_Ch2 - db CH7 - dw SFX_Cry17_2_Ch3 + audio SFX_Cry17_2, Ch4, Ch5, Ch7 SFX_Cry18_2:: - db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 - db CH5 - dw SFX_Cry18_2_Ch2 - db CH7 - dw SFX_Cry18_2_Ch3 + audio SFX_Cry18_2, Ch4, Ch5, Ch7 SFX_Cry19_2:: - db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 - db CH5 - dw SFX_Cry19_2_Ch2 - db CH7 - dw SFX_Cry19_2_Ch3 + audio SFX_Cry19_2, Ch4, Ch5, Ch7 SFX_Cry1A_2:: - db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 - db CH5 - dw SFX_Cry1A_2_Ch2 - db CH7 - dw SFX_Cry1A_2_Ch3 + audio SFX_Cry1A_2, Ch4, Ch5, Ch7 SFX_Cry1B_2:: - db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 - db CH5 - dw SFX_Cry1B_2_Ch2 - db CH7 - dw SFX_Cry1B_2_Ch3 + audio SFX_Cry1B_2, Ch4, Ch5, Ch7 SFX_Cry1C_2:: - db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 - db CH5 - dw SFX_Cry1C_2_Ch2 - db CH7 - dw SFX_Cry1C_2_Ch3 + audio SFX_Cry1C_2, Ch4, Ch5, Ch7 SFX_Cry1D_2:: - db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 - db CH5 - dw SFX_Cry1D_2_Ch2 - db CH7 - dw SFX_Cry1D_2_Ch3 + audio SFX_Cry1D_2, Ch4, Ch5, Ch7 SFX_Cry1E_2:: - db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 - db CH5 - dw SFX_Cry1E_2_Ch2 - db CH7 - dw SFX_Cry1E_2_Ch3 + audio SFX_Cry1E_2, Ch4, Ch5, Ch7 SFX_Cry1F_2:: - db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 - db CH5 - dw SFX_Cry1F_2_Ch2 - db CH7 - dw SFX_Cry1F_2_Ch3 + audio SFX_Cry1F_2, Ch4, Ch5, Ch7 SFX_Cry20_2:: - db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 - db CH5 - dw SFX_Cry20_2_Ch2 - db CH7 - dw SFX_Cry20_2_Ch3 + audio SFX_Cry20_2, Ch4, Ch5, Ch7 SFX_Cry21_2:: - db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 - db CH5 - dw SFX_Cry21_2_Ch2 - db CH7 - dw SFX_Cry21_2_Ch3 + audio SFX_Cry21_2, Ch4, Ch5, Ch7 SFX_Cry22_2:: - db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 - db CH5 - dw SFX_Cry22_2_Ch2 - db CH7 - dw SFX_Cry22_2_Ch3 + audio SFX_Cry22_2, Ch4, Ch5, Ch7 SFX_Cry23_2:: - db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 - db CH5 - dw SFX_Cry23_2_Ch2 - db CH7 - dw SFX_Cry23_2_Ch3 + audio SFX_Cry23_2, Ch4, Ch5, Ch7 SFX_Cry24_2:: - db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 - db CH5 - dw SFX_Cry24_2_Ch2 - db CH7 - dw SFX_Cry24_2_Ch3 + audio SFX_Cry24_2, Ch4, Ch5, Ch7 SFX_Cry25_2:: - db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 - db CH5 - dw SFX_Cry25_2_Ch2 - db CH7 - dw SFX_Cry25_2_Ch3 + audio SFX_Cry25_2, Ch4, Ch5, Ch7 SFX_Level_Up:: - db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 - db CH5 - dw SFX_Level_Up_Ch2 - db CH6 - dw SFX_Level_Up_Ch3 + audio SFX_Level_Up, Ch4, Ch5, Ch6 SFX_Get_Item2_2:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 - db CH5 - dw SFX_Get_Item2_2_Ch2 - db CH6 - dw SFX_Get_Item2_2_Ch3 + audio SFX_Get_Item2_2, Ch4, Ch5, Ch6 SFX_Tink_2:: - db CH4 - dw SFX_Tink_2_Ch1 + audio SFX_Tink_2, Ch4 SFX_Heal_HP_2:: - db CH4 - dw SFX_Heal_HP_2_Ch1 + audio SFX_Heal_HP_2, Ch4 SFX_Heal_Ailment_2:: - db CH4 - dw SFX_Heal_Ailment_2_Ch1 + audio SFX_Heal_Ailment_2, Ch4 SFX_Start_Menu_2:: - db CH7 - dw SFX_Start_Menu_2_Ch1 + audio SFX_Start_Menu_2, Ch7 SFX_Press_AB_2:: - db CH4 - dw SFX_Press_AB_2_Ch1 + audio SFX_Press_AB_2, Ch4 SFX_Ball_Toss:: - db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 - db CH5 - dw SFX_Ball_Toss_Ch2 + audio SFX_Ball_Toss, Ch4, Ch5 SFX_Ball_Poof:: - db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 - db CH7 - dw SFX_Ball_Poof_Ch2 + audio SFX_Ball_Poof, Ch4, Ch7 SFX_Faint_Thud:: - db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 - db CH7 - dw SFX_Faint_Thud_Ch2 + audio SFX_Faint_Thud, Ch4, Ch7 SFX_Run:: - db CH7 - dw SFX_Run_Ch1 + audio SFX_Run, Ch7 SFX_Dex_Page_Added:: - db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 - db CH5 - dw SFX_Dex_Page_Added_Ch2 + audio SFX_Dex_Page_Added, Ch4, Ch5 SFX_Caught_Mon:: - db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 - db CH5 - dw SFX_Caught_Mon_Ch2 - db CH6 - dw SFX_Caught_Mon_Ch3 + audio SFX_Caught_Mon, Ch4, Ch5, Ch6 SFX_Peck:: - db CH7 - dw SFX_Peck_Ch1 + audio SFX_Peck, Ch7 SFX_Faint_Fall:: - db CH4 - dw SFX_Faint_Fall_Ch1 + audio SFX_Faint_Fall, Ch4 SFX_Battle_09:: - db CH4 - dw SFX_Battle_09_Ch1 + audio SFX_Battle_09, Ch4 SFX_Pound:: - db CH7 - dw SFX_Pound_Ch1 + audio SFX_Pound, Ch7 SFX_Battle_0B:: - db CH7 - dw SFX_Battle_0B_Ch1 + audio SFX_Battle_0B, Ch7 SFX_Battle_0C:: - db CH7 - dw SFX_Battle_0C_Ch1 + audio SFX_Battle_0C, Ch7 SFX_Battle_0D:: - db CH7 - dw SFX_Battle_0D_Ch1 + audio SFX_Battle_0D, Ch7 SFX_Battle_0E:: - db CH7 - dw SFX_Battle_0E_Ch1 + audio SFX_Battle_0E, Ch7 SFX_Battle_0F:: - db CH7 - dw SFX_Battle_0F_Ch1 + audio SFX_Battle_0F, Ch7 SFX_Damage:: - db CH7 - dw SFX_Damage_Ch1 + audio SFX_Damage, Ch7 SFX_Not_Very_Effective:: - db CH7 - dw SFX_Not_Very_Effective_Ch1 + audio SFX_Not_Very_Effective, Ch7 SFX_Battle_12:: - db CH7 - dw SFX_Battle_12_Ch1 + audio SFX_Battle_12, Ch7 SFX_Battle_13:: - db CH7 - dw SFX_Battle_13_Ch1 + audio SFX_Battle_13, Ch7 SFX_Battle_14:: - db CH7 - dw SFX_Battle_14_Ch1 + audio SFX_Battle_14, Ch7 SFX_Vine_Whip:: - db CH7 - dw SFX_Vine_Whip_Ch1 + audio SFX_Vine_Whip, Ch7 SFX_Battle_16:: - db CH7 - dw SFX_Battle_16_Ch1 + audio SFX_Battle_16, Ch7 SFX_Battle_17:: - db CH7 - dw SFX_Battle_17_Ch1 + audio SFX_Battle_17, Ch7 SFX_Battle_18:: - db CH7 - dw SFX_Battle_18_Ch1 + audio SFX_Battle_18, Ch7 SFX_Battle_19:: - db CH7 - dw SFX_Battle_19_Ch1 + audio SFX_Battle_19, Ch7 SFX_Super_Effective:: - db CH7 - dw SFX_Super_Effective_Ch1 + audio SFX_Super_Effective, Ch7 SFX_Battle_1B:: - db CH7 - dw SFX_Battle_1B_Ch1 + audio SFX_Battle_1B, Ch7 SFX_Battle_1C:: - db CH7 - dw SFX_Battle_1C_Ch1 + audio SFX_Battle_1C, Ch7 SFX_Doubleslap:: - db CH7 - dw SFX_Doubleslap_Ch1 + audio SFX_Doubleslap, Ch7 SFX_Battle_1E:: - db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 - db CH7 - dw SFX_Battle_1E_Ch2 + audio SFX_Battle_1E, Ch4, Ch7 SFX_Horn_Drill:: - db CH7 - dw SFX_Horn_Drill_Ch1 + audio SFX_Horn_Drill, Ch7 SFX_Battle_20:: - db CH7 - dw SFX_Battle_20_Ch1 + audio SFX_Battle_20, Ch7 SFX_Battle_21:: - db CH7 - dw SFX_Battle_21_Ch1 + audio SFX_Battle_21, Ch7 SFX_Battle_22:: - db CH7 - dw SFX_Battle_22_Ch1 + audio SFX_Battle_22, Ch7 SFX_Battle_23:: - db CH7 - dw SFX_Battle_23_Ch1 + audio SFX_Battle_23, Ch7 SFX_Battle_24:: - db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 - db CH7 - dw SFX_Battle_24_Ch2 + audio SFX_Battle_24, Ch4, Ch7 SFX_Battle_25:: - db CH7 - dw SFX_Battle_25_Ch1 + audio SFX_Battle_25, Ch7 SFX_Battle_26:: - db CH7 - dw SFX_Battle_26_Ch1 + audio SFX_Battle_26, Ch7 SFX_Battle_27:: - db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 - db CH5 - dw SFX_Battle_27_Ch2 - db CH7 - dw SFX_Battle_27_Ch3 + audio SFX_Battle_27, Ch4, Ch5, Ch7 SFX_Battle_28:: - db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 - db CH5 - dw SFX_Battle_28_Ch2 - db CH7 - dw SFX_Battle_28_Ch3 + audio SFX_Battle_28, Ch4, Ch5, Ch7 SFX_Battle_29:: - db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 - db CH7 - dw SFX_Battle_29_Ch2 + audio SFX_Battle_29, Ch4, Ch7 SFX_Battle_2A:: - db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 - db CH5 - dw SFX_Battle_2A_Ch2 - db CH7 - dw SFX_Battle_2A_Ch3 + audio SFX_Battle_2A, Ch4, Ch5, Ch7 SFX_Battle_2B:: - db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 - db CH7 - dw SFX_Battle_2B_Ch2 + audio SFX_Battle_2B, Ch4, Ch7 SFX_Battle_2C:: - db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 - db CH5 - dw SFX_Battle_2C_Ch2 - db CH7 - dw SFX_Battle_2C_Ch3 + audio SFX_Battle_2C, Ch4, Ch5, Ch7 SFX_Psybeam:: - db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 - db CH5 - dw SFX_Psybeam_Ch2 - db CH7 - dw SFX_Psybeam_Ch3 + audio SFX_Psybeam, Ch4, Ch5, Ch7 SFX_Battle_2E:: - db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 - db CH5 - dw SFX_Battle_2E_Ch2 - db CH7 - dw SFX_Battle_2E_Ch3 + audio SFX_Battle_2E, Ch4, Ch5, Ch7 SFX_Battle_2F:: - db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 - db CH5 - dw SFX_Battle_2F_Ch2 - db CH7 - dw SFX_Battle_2F_Ch3 + audio SFX_Battle_2F, Ch4, Ch5, Ch7 SFX_Psychic_M:: - db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 - db CH5 - dw SFX_Psychic_M_Ch2 - db CH7 - dw SFX_Psychic_M_Ch3 + audio SFX_Psychic_M, Ch4, Ch5, Ch7 SFX_Battle_31:: - db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 - db CH5 - dw SFX_Battle_31_Ch2 + audio SFX_Battle_31, Ch4, Ch5 SFX_Battle_32:: - db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 - db CH5 - dw SFX_Battle_32_Ch2 + audio SFX_Battle_32, Ch4, Ch5 SFX_Battle_33:: - db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 - db CH5 - dw SFX_Battle_33_Ch2 + audio SFX_Battle_33, Ch4, Ch5 SFX_Battle_34:: - db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 - db CH5 - dw SFX_Battle_34_Ch2 - db CH7 - dw SFX_Battle_34_Ch3 + audio SFX_Battle_34, Ch4, Ch5, Ch7 SFX_Battle_35:: - db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 - db CH5 - dw SFX_Battle_35_Ch2 + audio SFX_Battle_35, Ch4, Ch5 SFX_Battle_36:: - db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 - db CH5 - dw SFX_Battle_36_Ch2 - db CH7 - dw SFX_Battle_36_Ch3 + audio SFX_Battle_36, Ch4, Ch5, Ch7 SFX_Silph_Scope:: - db CH4 - dw SFX_Silph_Scope_Ch1 + audio SFX_Silph_Scope, Ch4 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 0472afa6..19a19272 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -2,595 +2,310 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding SFX_Snare1_3:: - db CH7 - dw SFX_Snare1_3_Ch1 + audio SFX_Snare1_3, Ch7 SFX_Snare2_3:: - db CH7 - dw SFX_Snare2_3_Ch1 + audio SFX_Snare2_3, Ch7 SFX_Snare3_3:: - db CH7 - dw SFX_Snare3_3_Ch1 + audio SFX_Snare3_3, Ch7 SFX_Snare4_3:: - db CH7 - dw SFX_Snare4_3_Ch1 + audio SFX_Snare4_3, Ch7 SFX_Snare5_3:: - db CH7 - dw SFX_Snare5_3_Ch1 + audio SFX_Snare5_3, Ch7 SFX_Triangle1_3:: - db CH7 - dw SFX_Triangle1_3_Ch1 + audio SFX_Triangle1_3, Ch7 SFX_Triangle2_3:: - db CH7 - dw SFX_Triangle2_3_Ch1 + audio SFX_Triangle2_3, Ch7 SFX_Snare6_3:: - db CH7 - dw SFX_Snare6_3_Ch1 + audio SFX_Snare6_3, Ch7 SFX_Snare7_3:: - db CH7 - dw SFX_Snare7_3_Ch1 + audio SFX_Snare7_3, Ch7 SFX_Snare8_3:: - db CH7 - dw SFX_Snare8_3_Ch1 + audio SFX_Snare8_3, Ch7 SFX_Snare9_3:: - db CH7 - dw SFX_Snare9_3_Ch1 + audio SFX_Snare9_3, Ch7 SFX_Cymbal1_3:: - db CH7 - dw SFX_Cymbal1_3_Ch1 + audio SFX_Cymbal1_3, Ch7 SFX_Cymbal2_3:: - db CH7 - dw SFX_Cymbal2_3_Ch1 + audio SFX_Cymbal2_3, Ch7 SFX_Cymbal3_3:: - db CH7 - dw SFX_Cymbal3_3_Ch1 + audio SFX_Cymbal3_3, Ch7 SFX_Muted_Snare1_3:: - db CH7 - dw SFX_Muted_Snare1_3_Ch1 + audio SFX_Muted_Snare1_3, Ch7 SFX_Triangle3_3:: - db CH7 - dw SFX_Triangle3_3_Ch1 + audio SFX_Triangle3_3, Ch7 SFX_Muted_Snare2_3:: - db CH7 - dw SFX_Muted_Snare2_3_Ch1 + audio SFX_Muted_Snare2_3, Ch7 SFX_Muted_Snare3_3:: - db CH7 - dw SFX_Muted_Snare3_3_Ch1 + audio SFX_Muted_Snare3_3, Ch7 SFX_Muted_Snare4_3:: - db CH7 - dw SFX_Muted_Snare4_3_Ch1 + audio SFX_Muted_Snare4_3, Ch7 SFX_Cry00_3:: - db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 - db CH5 - dw SFX_Cry00_3_Ch2 - db CH7 - dw SFX_Cry00_3_Ch3 + audio SFX_Cry00_3, Ch4, Ch5, Ch7 SFX_Cry01_3:: - db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 - db CH5 - dw SFX_Cry01_3_Ch2 - db CH7 - dw SFX_Cry01_3_Ch3 + audio SFX_Cry01_3, Ch4, Ch5, Ch7 SFX_Cry02_3:: - db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 - db CH5 - dw SFX_Cry02_3_Ch2 - db CH7 - dw SFX_Cry02_3_Ch3 + audio SFX_Cry02_3, Ch4, Ch5, Ch7 SFX_Cry03_3:: - db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 - db CH5 - dw SFX_Cry03_3_Ch2 - db CH7 - dw SFX_Cry03_3_Ch3 + audio SFX_Cry03_3, Ch4, Ch5, Ch7 SFX_Cry04_3:: - db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 - db CH5 - dw SFX_Cry04_3_Ch2 - db CH7 - dw SFX_Cry04_3_Ch3 + audio SFX_Cry04_3, Ch4, Ch5, Ch7 SFX_Cry05_3:: - db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 - db CH5 - dw SFX_Cry05_3_Ch2 - db CH7 - dw SFX_Cry05_3_Ch3 + audio SFX_Cry05_3, Ch4, Ch5, Ch7 SFX_Cry06_3:: - db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 - db CH5 - dw SFX_Cry06_3_Ch2 - db CH7 - dw SFX_Cry06_3_Ch3 + audio SFX_Cry06_3, Ch4, Ch5, Ch7 SFX_Cry07_3:: - db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 - db CH5 - dw SFX_Cry07_3_Ch2 - db CH7 - dw SFX_Cry07_3_Ch3 + audio SFX_Cry07_3, Ch4, Ch5, Ch7 SFX_Cry08_3:: - db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 - db CH5 - dw SFX_Cry08_3_Ch2 - db CH7 - dw SFX_Cry08_3_Ch3 + audio SFX_Cry08_3, Ch4, Ch5, Ch7 SFX_Cry09_3:: - db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 - db CH5 - dw SFX_Cry09_3_Ch2 - db CH7 - dw SFX_Cry09_3_Ch3 + audio SFX_Cry09_3, Ch4, Ch5, Ch7 SFX_Cry0A_3:: - db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 - db CH5 - dw SFX_Cry0A_3_Ch2 - db CH7 - dw SFX_Cry0A_3_Ch3 + audio SFX_Cry0A_3, Ch4, Ch5, Ch7 SFX_Cry0B_3:: - db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 - db CH5 - dw SFX_Cry0B_3_Ch2 - db CH7 - dw SFX_Cry0B_3_Ch3 + audio SFX_Cry0B_3, Ch4, Ch5, Ch7 SFX_Cry0C_3:: - db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 - db CH5 - dw SFX_Cry0C_3_Ch2 - db CH7 - dw SFX_Cry0C_3_Ch3 + audio SFX_Cry0C_3, Ch4, Ch5, Ch7 SFX_Cry0D_3:: - db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 - db CH5 - dw SFX_Cry0D_3_Ch2 - db CH7 - dw SFX_Cry0D_3_Ch3 + audio SFX_Cry0D_3, Ch4, Ch5, Ch7 SFX_Cry0E_3:: - db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 - db CH5 - dw SFX_Cry0E_3_Ch2 - db CH7 - dw SFX_Cry0E_3_Ch3 + audio SFX_Cry0E_3, Ch4, Ch5, Ch7 SFX_Cry0F_3:: - db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 - db CH5 - dw SFX_Cry0F_3_Ch2 - db CH7 - dw SFX_Cry0F_3_Ch3 + audio SFX_Cry0F_3, Ch4, Ch5, Ch7 SFX_Cry10_3:: - db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 - db CH5 - dw SFX_Cry10_3_Ch2 - db CH7 - dw SFX_Cry10_3_Ch3 + audio SFX_Cry10_3, Ch4, Ch5, Ch7 SFX_Cry11_3:: - db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 - db CH5 - dw SFX_Cry11_3_Ch2 - db CH7 - dw SFX_Cry11_3_Ch3 + audio SFX_Cry11_3, Ch4, Ch5, Ch7 SFX_Cry12_3:: - db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 - db CH5 - dw SFX_Cry12_3_Ch2 - db CH7 - dw SFX_Cry12_3_Ch3 + audio SFX_Cry12_3, Ch4, Ch5, Ch7 SFX_Cry13_3:: - db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 - db CH5 - dw SFX_Cry13_3_Ch2 - db CH7 - dw SFX_Cry13_3_Ch3 + audio SFX_Cry13_3, Ch4, Ch5, Ch7 SFX_Cry14_3:: - db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 - db CH5 - dw SFX_Cry14_3_Ch2 - db CH7 - dw SFX_Cry14_3_Ch3 + audio SFX_Cry14_3, Ch4, Ch5, Ch7 SFX_Cry15_3:: - db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 - db CH5 - dw SFX_Cry15_3_Ch2 - db CH7 - dw SFX_Cry15_3_Ch3 + audio SFX_Cry15_3, Ch4, Ch5, Ch7 SFX_Cry16_3:: - db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 - db CH5 - dw SFX_Cry16_3_Ch2 - db CH7 - dw SFX_Cry16_3_Ch3 + audio SFX_Cry16_3, Ch4, Ch5, Ch7 SFX_Cry17_3:: - db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 - db CH5 - dw SFX_Cry17_3_Ch2 - db CH7 - dw SFX_Cry17_3_Ch3 + audio SFX_Cry17_3, Ch4, Ch5, Ch7 SFX_Cry18_3:: - db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 - db CH5 - dw SFX_Cry18_3_Ch2 - db CH7 - dw SFX_Cry18_3_Ch3 + audio SFX_Cry18_3, Ch4, Ch5, Ch7 SFX_Cry19_3:: - db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 - db CH5 - dw SFX_Cry19_3_Ch2 - db CH7 - dw SFX_Cry19_3_Ch3 + audio SFX_Cry19_3, Ch4, Ch5, Ch7 SFX_Cry1A_3:: - db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 - db CH5 - dw SFX_Cry1A_3_Ch2 - db CH7 - dw SFX_Cry1A_3_Ch3 + audio SFX_Cry1A_3, Ch4, Ch5, Ch7 SFX_Cry1B_3:: - db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 - db CH5 - dw SFX_Cry1B_3_Ch2 - db CH7 - dw SFX_Cry1B_3_Ch3 + audio SFX_Cry1B_3, Ch4, Ch5, Ch7 SFX_Cry1C_3:: - db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 - db CH5 - dw SFX_Cry1C_3_Ch2 - db CH7 - dw SFX_Cry1C_3_Ch3 + audio SFX_Cry1C_3, Ch4, Ch5, Ch7 SFX_Cry1D_3:: - db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 - db CH5 - dw SFX_Cry1D_3_Ch2 - db CH7 - dw SFX_Cry1D_3_Ch3 + audio SFX_Cry1D_3, Ch4, Ch5, Ch7 SFX_Cry1E_3:: - db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 - db CH5 - dw SFX_Cry1E_3_Ch2 - db CH7 - dw SFX_Cry1E_3_Ch3 + audio SFX_Cry1E_3, Ch4, Ch5, Ch7 SFX_Cry1F_3:: - db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 - db CH5 - dw SFX_Cry1F_3_Ch2 - db CH7 - dw SFX_Cry1F_3_Ch3 + audio SFX_Cry1F_3, Ch4, Ch5, Ch7 SFX_Cry20_3:: - db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 - db CH5 - dw SFX_Cry20_3_Ch2 - db CH7 - dw SFX_Cry20_3_Ch3 + audio SFX_Cry20_3, Ch4, Ch5, Ch7 SFX_Cry21_3:: - db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 - db CH5 - dw SFX_Cry21_3_Ch2 - db CH7 - dw SFX_Cry21_3_Ch3 + audio SFX_Cry21_3, Ch4, Ch5, Ch7 SFX_Cry22_3:: - db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 - db CH5 - dw SFX_Cry22_3_Ch2 - db CH7 - dw SFX_Cry22_3_Ch3 + audio SFX_Cry22_3, Ch4, Ch5, Ch7 SFX_Cry23_3:: - db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 - db CH5 - dw SFX_Cry23_3_Ch2 - db CH7 - dw SFX_Cry23_3_Ch3 + audio SFX_Cry23_3, Ch4, Ch5, Ch7 SFX_Cry24_3:: - db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 - db CH5 - dw SFX_Cry24_3_Ch2 - db CH7 - dw SFX_Cry24_3_Ch3 + audio SFX_Cry24_3, Ch4, Ch5, Ch7 SFX_Cry25_3:: - db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 - db CH5 - dw SFX_Cry25_3_Ch2 - db CH7 - dw SFX_Cry25_3_Ch3 + audio SFX_Cry25_3, Ch4, Ch5, Ch7 SFX_Get_Item1_3:: - db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 - db CH5 - dw SFX_Get_Item1_3_Ch2 - db CH6 - dw SFX_Get_Item1_3_Ch3 + audio SFX_Get_Item1_3, Ch4, Ch5, Ch6 SFX_Get_Item2_3:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 - db CH5 - dw SFX_Get_Item2_3_Ch2 - db CH6 - dw SFX_Get_Item2_3_Ch3 + audio SFX_Get_Item2_3, Ch4, Ch5, Ch6 SFX_Tink_3:: - db CH4 - dw SFX_Tink_3_Ch1 + audio SFX_Tink_3, Ch4 SFX_Heal_HP_3:: - db CH4 - dw SFX_Heal_HP_3_Ch1 + audio SFX_Heal_HP_3, Ch4 SFX_Heal_Ailment_3:: - db CH4 - dw SFX_Heal_Ailment_3_Ch1 + audio SFX_Heal_Ailment_3, Ch4 SFX_Start_Menu_3:: - db CH7 - dw SFX_Start_Menu_3_Ch1 + audio SFX_Start_Menu_3, Ch7 SFX_Press_AB_3:: - db CH4 - dw SFX_Press_AB_3_Ch1 + audio SFX_Press_AB_3, Ch4 SFX_Pokedex_Rating_3:: - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 - db CH5 - dw SFX_Pokedex_Rating_3_Ch2 - db CH6 - dw SFX_Pokedex_Rating_3_Ch3 + audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6 SFX_Get_Key_Item_3:: - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 - db CH5 - dw SFX_Get_Key_Item_3_Ch2 - db CH6 - dw SFX_Get_Key_Item_3_Ch3 + audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6 SFX_Poisoned_3:: - db CH4 - dw SFX_Poisoned_3_Ch1 + audio SFX_Poisoned_3, Ch4 SFX_Trade_Machine_3:: - db CH4 - dw SFX_Trade_Machine_3_Ch1 + audio SFX_Trade_Machine_3, Ch4 SFX_Turn_On_PC_3:: - db CH4 - dw SFX_Turn_On_PC_3_Ch1 + audio SFX_Turn_On_PC_3, Ch4 SFX_Turn_Off_PC_3:: - db CH4 - dw SFX_Turn_Off_PC_3_Ch1 + audio SFX_Turn_Off_PC_3, Ch4 SFX_Enter_PC_3:: - db CH4 - dw SFX_Enter_PC_3_Ch1 + audio SFX_Enter_PC_3, Ch4 SFX_Shrink_3:: - db CH4 - dw SFX_Shrink_3_Ch1 + audio SFX_Shrink_3, Ch4 SFX_Switch_3:: - db CH4 - dw SFX_Switch_3_Ch1 + audio SFX_Switch_3, Ch4 SFX_Healing_Machine_3:: - db CH4 - dw SFX_Healing_Machine_3_Ch1 + audio SFX_Healing_Machine_3, Ch4 SFX_Teleport_Exit1_3:: - db CH4 - dw SFX_Teleport_Exit1_3_Ch1 + audio SFX_Teleport_Exit1_3, Ch4 SFX_Teleport_Enter1_3:: - db CH4 - dw SFX_Teleport_Enter1_3_Ch1 + audio SFX_Teleport_Enter1_3, Ch4 SFX_Teleport_Exit2_3:: - db CH4 - dw SFX_Teleport_Exit2_3_Ch1 + audio SFX_Teleport_Exit2_3, Ch4 SFX_Ledge_3:: - db CH4 - dw SFX_Ledge_3_Ch1 + audio SFX_Ledge_3, Ch4 SFX_Teleport_Enter2_3:: - db CH7 - dw SFX_Teleport_Enter2_3_Ch1 + audio SFX_Teleport_Enter2_3, Ch7 SFX_Fly_3:: - db CH7 - dw SFX_Fly_3_Ch1 + audio SFX_Fly_3, Ch7 SFX_Denied_3:: - db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 - db CH5 - dw SFX_Denied_3_Ch2 + audio SFX_Denied_3, Ch4, Ch5 SFX_Arrow_Tiles_3:: - db CH4 - dw SFX_Arrow_Tiles_3_Ch1 + audio SFX_Arrow_Tiles_3, Ch4 SFX_Push_Boulder_3:: - db CH7 - dw SFX_Push_Boulder_3_Ch1 + audio SFX_Push_Boulder_3, Ch7 SFX_SS_Anne_Horn_3:: - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 + audio SFX_SS_Anne_Horn_3, Ch4, Ch5 SFX_Withdraw_Deposit_3:: - db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 + audio SFX_Withdraw_Deposit_3, Ch4 SFX_Cut_3:: - db CH7 - dw SFX_Cut_3_Ch1 + audio SFX_Cut_3, Ch7 SFX_Go_Inside_3:: - db CH7 - dw SFX_Go_Inside_3_Ch1 + audio SFX_Go_Inside_3, Ch7 SFX_Swap_3:: - db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 - db CH5 - dw SFX_Swap_3_Ch2 + audio SFX_Swap_3, Ch4, Ch5 SFX_59_3:: - db ( $40 | CH4 ) - dw SFX_59_3_Ch1 - db CH5 - dw SFX_59_3_Ch2 + audio SFX_59_3, Ch4, Ch5 SFX_Purchase_3:: - db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 - db CH5 - dw SFX_Purchase_3_Ch2 + audio SFX_Purchase_3, Ch4, Ch5 SFX_Collision_3:: - db CH4 - dw SFX_Collision_3_Ch1 + audio SFX_Collision_3, Ch4 SFX_Go_Outside_3:: - db CH7 - dw SFX_Go_Outside_3_Ch1 + audio SFX_Go_Outside_3, Ch7 SFX_Save_3:: - db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 - db CH5 - dw SFX_Save_3_Ch2 + audio SFX_Save_3, Ch4, Ch5 SFX_Intro_Lunge:: - db CH7 - dw SFX_Intro_Lunge_Ch1 + audio SFX_Intro_Lunge, Ch7 SFX_Intro_Hip:: - db CH4 - dw SFX_Intro_Hip_Ch1 + audio SFX_Intro_Hip, Ch4 SFX_Intro_Hop:: - db CH4 - dw SFX_Intro_Hop_Ch1 + audio SFX_Intro_Hop, Ch4 SFX_Intro_Raise:: - db CH7 - dw SFX_Intro_Raise_Ch1 + audio SFX_Intro_Raise, Ch7 SFX_Intro_Crash:: - db CH7 - dw SFX_Intro_Crash_Ch1 + audio SFX_Intro_Crash, Ch7 SFX_Intro_Whoosh:: - db CH7 - dw SFX_Intro_Whoosh_Ch1 + audio SFX_Intro_Whoosh, Ch7 SFX_Slots_Stop_Wheel:: - db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 + audio SFX_Slots_Stop_Wheel, Ch4 SFX_Slots_Reward:: - db CH4 - dw SFX_Slots_Reward_Ch1 + audio SFX_Slots_Reward, Ch4 SFX_Slots_New_Spin:: - db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 - db CH5 - dw SFX_Slots_New_Spin_Ch2 + audio SFX_Slots_New_Spin, Ch4, Ch5 SFX_Shooting_Star:: - db CH4 - dw SFX_Shooting_Star_Ch1 + audio SFX_Shooting_Star, Ch4 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index b5378a94..87c7b5c2 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1:: +Music_BikeRiding_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9:: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2:: +Music_BikeRiding_Ch1:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 @@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75:: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3:: +Music_BikeRiding_Ch2:: notetype 12, 1, 3 rest 2 @@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17:: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4:: +Music_BikeRiding_Ch3:: dspeed 12 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 3f015d8d..a1699301 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1:: +Music_Celadon_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4:: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2:: +Music_Celadon_Ch1:: duty 3 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a:: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3:: +Music_Celadon_Ch2:: notetype 12, 1, 3 rest 8 octave 5 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 4fe93c31..c6b3564d 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,4 +1,4 @@ -Music_Cinnabar_Ch1:: +Music_Cinnabar_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878:: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2:: +Music_Cinnabar_Ch1:: duty 3 vibrato 10, 2, 3 @@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9:: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3:: +Music_Cinnabar_Ch2:: notetype 12, 1, 0 Music_Cinnabar_branch_b93f:: diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 438c2f18..bb54a456 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,4 +1,4 @@ -Music_CinnabarMansion_Ch1:: +Music_CinnabarMansion_Ch0:: tempo 144 volume 7, 7 vibrato 11, 2, 5 @@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19:: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2:: +Music_CinnabarMansion_Ch1:: duty 2 toggleperfectpitch vibrato 10, 2, 4 @@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c:: endchannel -Music_CinnabarMansion_Ch3:: +Music_CinnabarMansion_Ch2:: notetype 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: @@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80:: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4:: +Music_CinnabarMansion_Ch3:: dspeed 6 rest 16 rest 16 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index eb9ccde5..984202f6 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1:: +Music_Cities1_Ch0:: tempo 144 Music_Cities1_branch_aa79:: @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a:: endchannel -Music_Cities1_Ch2:: +Music_Cities1_Ch1:: vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -357,7 +357,7 @@ Music_Cities1_Ch2:: G# 1 notetype 12, 10, 4 A_ 1 - loopchannel 0, Music_Cities1_Ch2 + loopchannel 0, Music_Cities1_Ch1 Music_Cities1_branch_ac00:: duty 2 @@ -401,7 +401,7 @@ Music_Cities1_branch_ac00:: endchannel -Music_Cities1_Ch3:: +Music_Cities1_Ch2:: notetype 12, 1, 1 toggleperfectpitch @@ -579,7 +579,7 @@ Music_Cities1_branch_acce:: endchannel -Music_Cities1_Ch4:: +Music_Cities1_Ch3:: dspeed 12 callchannel Music_Cities1_branch_ad36 @@ -609,7 +609,7 @@ Music_Cities1_branch_acf3:: triangle1 6 snare6 6 snare6 4 - loopchannel 0, Music_Cities1_Ch4 + loopchannel 0, Music_Cities1_Ch3 Music_Cities1_branch_ad36:: snare6 6 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 897fb8c9..fb167999 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1:: +Music_Cities2_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a:: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2:: +Music_Cities2_Ch1:: duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b:: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3:: +Music_Cities2_Ch2:: notetype 12, 1, 1 rest 16 octave 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index d9a5ec35..f092326b 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1:: +Music_Credits_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1:: endchannel -Music_Credits_Ch2:: +Music_Credits_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2:: endchannel -Music_Credits_Ch3:: +Music_Credits_Ch2:: notetype 12, 1, 0 octave 5 C# 6 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 7f0d046d..1ea6c1ff 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1:: +Music_DefeatedGymLeader_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc:: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2:: +Music_DefeatedGymLeader_Ch1:: duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84:: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3:: +Music_DefeatedGymLeader_Ch2:: notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 8ad51afa..87c5d2c9 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1:: +Music_DefeatedTrainer_Ch0:: tempo 224 volume 7, 7 duty 2 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2:: +Music_DefeatedTrainer_Ch1:: duty 2 notetype 4, 12, 3 octave 4 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3:: +Music_DefeatedTrainer_Ch2:: notetype 4, 1, 0 octave 5 D_ 2 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 92326a84..ea3f733f 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1:: +Music_DefeatedWildMon_Ch0:: tempo 112 volume 7, 7 executemusic @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b:: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2:: +Music_DefeatedWildMon_Ch1:: executemusic duty 2 notetype 12, 12, 3 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce:: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3:: +Music_DefeatedWildMon_Ch2:: executemusic notetype 12, 2, 0 octave 5 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c84fc694..c6f6b105 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1:: +Music_Dungeon1_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5:: endchannel -Music_Dungeon1_Ch2:: +Music_Dungeon1_Ch1:: vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd:: endchannel -Music_Dungeon1_Ch3:: +Music_Dungeon1_Ch2:: notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177:: endchannel -Music_Dungeon1_Ch4:: +Music_Dungeon1_Ch3:: dspeed 12 rest 14 cymbal1 1 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 44e9d5bf..d5f459fb 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,4 +1,4 @@ -Music_Dungeon2_Ch1:: +Music_Dungeon2_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892:: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2:: +Music_Dungeon2_Ch1:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: @@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db:: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3:: +Music_Dungeon2_Ch2:: notetype 12, 1, 3 vibrato 8, 2, 6 @@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1:: endchannel -Music_Dungeon2_Ch4:: +Music_Dungeon2_Ch3:: dspeed 12 Music_Dungeon2_branch_7e9dd:: diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 767ca626..f9742a26 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,4 +1,4 @@ -Music_Dungeon3_Ch1:: +Music_Dungeon3_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc:: endchannel -Music_Dungeon3_Ch2:: +Music_Dungeon3_Ch1:: vibrato 11, 1, 5 duty 3 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d:: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3:: +Music_Dungeon3_Ch2:: notetype 12, 1, 2 rest 16 rest 16 @@ -707,10 +707,10 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch3 + loopchannel 0, Music_Dungeon3_Ch2 -Music_Dungeon3_Ch4:: +Music_Dungeon3_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 9a13f00f..adb0f8b9 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1:: +Music_FinalBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429:: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2:: +Music_FinalBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710:: endchannel -Music_FinalBattle_Ch3:: +Music_FinalBattle_Ch2:: notetype 12, 1, 1 octave 4 E_ 4 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 52b85e08..832bade6 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1:: +Music_GameCorner_Ch0:: tempo 120 volume 7, 7 duty 3 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222:: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2:: +Music_GameCorner_Ch1:: duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa:: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3:: +Music_GameCorner_Ch2:: notetype 12, 1, 3 octave 5 C# 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index b314336d..ad99bddd 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1:: +Music_Gym_Ch0:: tempo 138 volume 7, 7 duty 3 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8:: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2:: +Music_Gym_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82:: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3:: +Music_Gym_Ch2:: notetype 12, 1, 1 rest 16 rest 10 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 1eb2951d..6c1cffb5 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1:: +Music_GymLeaderBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0:: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2:: +Music_GymLeaderBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0:: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3:: +Music_GymLeaderBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 69f926f6..098c82c8 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1:: +Music_HallOfFame_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5:: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2:: +Music_HallOfFame_Ch1:: vibrato 8, 2, 5 duty 3 @@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf:: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3:: +Music_HallOfFame_Ch2:: notetype 12, 1, 2 Music_HallOfFame_branch_7fbfe:: @@ -93,4 +93,4 @@ Music_HallOfFame_branch_7fbfe:: G_ 4 E_ 4 G_ 4 - loopchannel 0, Music_HallOfFame_Ch3 + loopchannel 0, Music_HallOfFame_Ch2 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 61623e39..f139775b 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1:: +Music_IndigoPlateau_Ch0:: tempo 132 volume 7, 7 duty 3 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659:: endchannel -Music_IndigoPlateau_Ch2:: +Music_IndigoPlateau_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af:: endchannel -Music_IndigoPlateau_Ch3:: +Music_IndigoPlateau_Ch2:: notetype 12, 1, 0 octave 4 D_ 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe:: endchannel -Music_IndigoPlateau_Ch4:: +Music_IndigoPlateau_Ch3:: dspeed 6 mutedsnare2 16 mutedsnare2 16 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index fd4a8e35..2aad0d88 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1:: +Music_IntroBattle_Ch0:: tempo 98 volume 7, 7 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: endchannel -Music_IntroBattle_Ch2:: +Music_IntroBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: endchannel -Music_IntroBattle_Ch3:: +Music_IntroBattle_Ch2:: notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: endchannel -Music_IntroBattle_Ch4:: +Music_IntroBattle_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 9a01246b..0b791a30 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch0:: tempo 144 volume 7, 7 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: endchannel -Music_JigglypuffSong_Ch2:: +Music_JigglypuffSong_Ch1:: vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 7b60cc24..da58e489 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1:: +Music_Lavender_Ch0:: tempo 152 volume 7, 7 duty 1 @@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b:: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2:: +Music_Lavender_Ch1:: vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5:: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3:: +Music_Lavender_Ch2:: vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9:: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4:: +Music_Lavender_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 2378a03a..941b0c34 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1:: +Music_MeetEvilTrainer_Ch0:: tempo 124 volume 7, 7 duty 2 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2:: +Music_MeetEvilTrainer_Ch1:: duty 1 notetype 12, 11, 6 octave 3 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3:: +Music_MeetEvilTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 4 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 0f24f99e..2a5659b4 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1:: +Music_MeetFemaleTrainer_Ch0:: tempo 124 volume 7, 7 duty 1 @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2:: +Music_MeetFemaleTrainer_Ch1:: duty 2 notetype 12, 12, 2 octave 3 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3:: +Music_MeetFemaleTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 5 diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 92047849..c13e40cb 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1:: +Music_MeetMaleTrainer_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f:: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2:: +Music_MeetMaleTrainer_Ch1:: duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3:: +Music_MeetMaleTrainer_Ch2:: notetype 12, 1, 0 rest 6 octave 4 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 6532a187..5c6ea13d 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1:: +Music_MeetProfOak_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85:: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2:: +Music_MeetProfOak_Ch1:: vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005:: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3:: +Music_MeetProfOak_Ch2:: notetype 12, 1, 2 rest 10 octave 4 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 153523af..a6391247 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -2,7 +2,7 @@ Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1:: +Music_MeetRival_Ch0:: tempo 112 Music_MeetRival_branch_b123:: @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5:: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2:: +Music_MeetRival_Ch1:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d:: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3:: +Music_MeetRival_Ch2:: notetype 12, 1, 4 octave 5 D_ 2 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index cb08fcf4..e41b37bd 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1:: +Music_MuseumGuy_Ch0:: tempo 128 volume 7, 7 duty 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec:: endchannel -Music_MuseumGuy_Ch2:: +Music_MuseumGuy_Ch1:: duty 2 notetype 12, 12, 1 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26:: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3:: +Music_MuseumGuy_Ch2:: notetype 12, 1, 0 rest 16 octave 4 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1:: endchannel -Music_MuseumGuy_Ch4:: +Music_MuseumGuy_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 7214264c..87245350 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1:: +Music_OaksLab_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0:: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2:: +Music_OaksLab_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16:: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3:: +Music_OaksLab_Ch2:: notetype 12, 1, 1 rest 2 octave 4 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 0c8b7dbc..5ad31f81 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -Music_PalletTown_Ch1:: +Music_PalletTown_Ch0:: tempo 160 volume 7, 7 duty 2 @@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce:: endchannel -Music_PalletTown_Ch2:: +Music_PalletTown_Ch1:: duty 2 Music_PalletTown_branch_a861:: @@ -262,7 +262,7 @@ Music_PalletTown_branch_a861:: endchannel -Music_PalletTown_Ch3:: +Music_PalletTown_Ch2:: vibrato 24, 2, 8 notetype 12, 1, 2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 2b7b545b..9d3cd3d0 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1:: +Music_PkmnHealed_Ch0:: tempo 144 volume 7, 7 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: endchannel -Music_PkmnHealed_Ch2:: +Music_PkmnHealed_Ch1:: duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: endchannel -Music_PkmnHealed_Ch3:: +Music_PkmnHealed_Ch2:: notetype 12, 1, 0 octave 4 E_ 2 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 5de546ad..83d161d7 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,4 +1,4 @@ -Music_Pokecenter_Ch1:: +Music_Pokecenter_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61:: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2:: +Music_Pokecenter_Ch1:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: @@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60:: endchannel -Music_Pokecenter_Ch3:: +Music_Pokecenter_Ch2:: notetype 12, 1, 0 Music_Pokecenter_branch_bf72:: diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index afae9a75..0f17ddeb 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1:: +Music_PokemonTower_Ch0:: tempo 152 volume 7, 7 duty 3 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a:: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2:: +Music_PokemonTower_Ch1:: vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee:: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3:: +Music_PokemonTower_Ch2:: vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index bab18261..fc3227ce 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,4 +1,4 @@ -Music_Routes1_Ch1:: +Music_Routes1_Ch0:: tempo 152 volume 7, 7 vibrato 4, 2, 3 @@ -106,7 +106,7 @@ Music_Routes1_branch_9be9:: endchannel -Music_Routes1_Ch2:: +Music_Routes1_Ch1:: duty 2 Music_Routes1_branch_9c53:: @@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d:: endchannel -Music_Routes1_Ch3:: +Music_Routes1_Ch2:: vibrato 8, 2, 5 notetype 12, 1, 3 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd:: endchannel -Music_Routes1_Ch4:: +Music_Routes1_Ch3:: dspeed 12 rest 4 mutedsnare1 2 @@ -400,5 +400,5 @@ Music_Routes1_Ch4:: rest 2 mutedsnare1 2 mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch4 + loopchannel 0, Music_Routes1_Ch3 endchannel diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 42b4deda..ae5b22d1 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,4 +1,4 @@ -Music_Routes2_Ch1:: +Music_Routes2_Ch0:: tempo 152 volume 7, 7 vibrato 9, 2, 5 @@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3:: endchannel -Music_Routes2_Ch2:: +Music_Routes2_Ch1:: vibrato 8, 2, 6 duty 3 @@ -216,7 +216,7 @@ Music_Routes2_branch_9e54:: endchannel -Music_Routes2_Ch3:: +Music_Routes2_Ch2:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e:: endchannel -Music_Routes2_Ch4:: +Music_Routes2_Ch3:: dspeed 12 snare3 2 rest 2 @@ -421,5 +421,5 @@ Music_Routes2_Ch4:: rest 3 snare3 3 rest 3 - loopchannel 0, Music_Routes2_Ch4 + loopchannel 0, Music_Routes2_Ch3 endchannel diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d0d1672e..b384308b 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1:: +Music_Routes3_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3:: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2:: +Music_Routes3_Ch1:: vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a:: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3:: +Music_Routes3_Ch2:: vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3:: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4:: +Music_Routes3_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 9bbf44ea..a9149f05 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1:: +Music_Routes4_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a:: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2:: +Music_Routes4_Ch1:: vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325:: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3:: +Music_Routes4_Ch2:: notetype 12, 1, 0 octave 4 E_ 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7:: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4:: +Music_Routes4_Ch3:: dspeed 12 rest 16 rest 12 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 45d84fd0..e2853646 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1:: +Music_SafariZone_Ch0:: tempo 132 volume 7, 7 vibrato 6, 3, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f:: endchannel -Music_SafariZone_Ch2:: +Music_SafariZone_Ch1:: duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89:: endchannel -Music_SafariZone_Ch3:: +Music_SafariZone_Ch2:: notetype 12, 1, 0 rest 8 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 2b6d8134..3e1ff3fc 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1:: +Music_SilphCo_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0:: endchannel -Music_SilphCo_Ch2:: +Music_SilphCo_Ch1:: vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e:: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3:: +Music_SilphCo_Ch2:: vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index ea6b1a0f..1356c8b1 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,4 +1,4 @@ -Music_SSAnne_Ch1:: +Music_SSAnne_Ch0:: tempo 128 volume 7, 7 duty 1 @@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2:: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2:: +Music_SSAnne_Ch1:: duty 0 vibrato 12, 2, 4 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e:: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3:: +Music_SSAnne_Ch2:: notetype 12, 1, 3 rest 16 rest 12 @@ -335,4 +335,4 @@ Music_SSAnne_Ch3:: F# 8 G# 8 B_ 8 - loopchannel 0, Music_SSAnne_Ch3 + loopchannel 0, Music_SSAnne_Ch2 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 03ebfed0..c4507a55 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1:: +Music_Surfing_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30:: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2:: +Music_Surfing_Ch1:: duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae:: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3:: +Music_Surfing_Ch2:: notetype 12, 1, 0 rest 12 octave 5 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b28474eb..2d41b082 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1:: +Music_TitleScreen_Ch0:: tempo 144 volume 7, 7 vibrato 9, 3, 4 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c:: endchannel -Music_TitleScreen_Ch2:: +Music_TitleScreen_Ch1:: vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636:: endchannel -Music_TitleScreen_Ch3:: +Music_TitleScreen_Ch2:: notetype 12, 1, 0 octave 3 G_ 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5:: endchannel -Music_TitleScreen_Ch4:: +Music_TitleScreen_Ch3:: dspeed 6 rest 4 snare3 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 395f05de..5bd2c5f8 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1:: +Music_TrainerBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962:: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2:: +Music_TrainerBattle_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc:: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3:: +Music_TrainerBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index 10ca4beb..fb541581 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,4 +1,4 @@ -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch0:: tempo 144 volume 7, 7 vibrato 5, 1, 6 @@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b:: endchannel -Music_UnusedSong_Ch2:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 toggleperfectpitch diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 94f87b25..c89c9b3b 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,4 +1,4 @@ -Music_Vermilion_Ch1:: +Music_Vermilion_Ch0:: tempo 156 volume 7, 7 duty 3 @@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6:: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2:: +Music_Vermilion_Ch1:: duty 3 vibrato 10, 2, 3 @@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66:: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3:: +Music_Vermilion_Ch2:: notetype 12, 1, 0 Music_Vermilion_branch_baa8:: @@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8:: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4:: +Music_Vermilion_Ch3:: dspeed 12 Music_Vermilion_branch_bb0e:: diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index 3a88678f..e9aad529 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1:: +Music_WildBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0:: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2:: +Music_WildBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225:: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3:: +Music_WildBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c14be83e..f36f9e1e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: +SFX_59_1_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: +SFX_59_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 3b817f2f..559318ba 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: +SFX_59_3_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: +SFX_59_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 6c3959c9..c9ef1564 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: +SFX_Arrow_Tiles_1_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 8ff79858..f88b9c83 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: +SFX_Arrow_Tiles_3_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 6cd9701b..7068c66c 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: +SFX_Ball_Poof_Ch4: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: endchannel -SFX_Ball_Poof_Ch2: +SFX_Ball_Poof_Ch7: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 49176db3..e9beac77 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: +SFX_Ball_Toss_Ch4: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: +SFX_Ball_Toss_Ch5: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8b92fc50..11f156cb 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: +SFX_Battle_09_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 27909666..d6feba8e 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: +SFX_Battle_0B_Ch7: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 7aa009ba..f193fc20 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: +SFX_Battle_0C_Ch7: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 1b69e13f..f9d423ad 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: +SFX_Battle_0D_Ch7: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index ff60cb9e..92a660b2 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: +SFX_Battle_0E_Ch7: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 3827a5a6..846a9053 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: +SFX_Battle_0F_Ch7: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 7d301053..77be75c0 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch1: +SFX_Battle_12_Ch7: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_Battle_12_Ch1 + loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 89b8c555..81e1a0ef 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: +SFX_Battle_13_Ch7: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index acc064f7..8cecfb37 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: +SFX_Battle_14_Ch7: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 3aa31247..dcc7014d 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: +SFX_Battle_16_Ch7: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 2ff4bd6d..82bb2117 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: +SFX_Battle_17_Ch7: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 81fa2178..14aac5c1 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: +SFX_Battle_18_Ch7: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 9981f5e4..6bc1804d 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: +SFX_Battle_19_Ch7: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 9f89e449..a4d8992b 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: +SFX_Battle_1B_Ch7: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 3827b34c..05cdd091 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: +SFX_Battle_1C_Ch7: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index f4e9bdc8..8d3f4745 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: +SFX_Battle_1E_Ch4: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: endchannel -SFX_Battle_1E_Ch2: +SFX_Battle_1E_Ch7: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index e8a4d9f3..f7413e63 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: +SFX_Battle_20_Ch7: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index b59f5833..a6b63a6c 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: +SFX_Battle_21_Ch7: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 66cd218d..6a20c3ae 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: +SFX_Battle_22_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 7203dcf2..e532cf08 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: +SFX_Battle_23_Ch7: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 7c81b40b..46e9d29f 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: +SFX_Battle_24_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: endchannel -SFX_Battle_24_Ch2: +SFX_Battle_24_Ch7: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index b1f4fc54..3a46e505 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: +SFX_Battle_25_Ch7: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index c656264b..ce1ac2f9 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: +SFX_Battle_26_Ch7: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index af86c33f..1e662c29 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: +SFX_Battle_27_Ch4: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: +SFX_Battle_27_Ch5: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,8 +20,8 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: +SFX_Battle_27_Ch7: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_Battle_27_Ch3 + loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 1c974e85..298ddb7a 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch1: +SFX_Battle_28_Ch4: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_Battle_28_Ch1 + loopchannel 12, SFX_Battle_28_Ch4 endchannel -SFX_Battle_28_Ch2: +SFX_Battle_28_Ch5: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_Battle_28_Ch2 + loopchannel 12, SFX_Battle_28_Ch5 endchannel -SFX_Battle_28_Ch3: +SFX_Battle_28_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_Battle_28_Ch3 + loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index d0abb3cb..e36c18dc 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,17 +1,17 @@ -SFX_Battle_29_Ch1: +SFX_Battle_29_Ch4: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_Battle_29_Ch1 + loopchannel 5, SFX_Battle_29_Ch4 unknownsfx0x20 8, 227, 48, 1 unknownsfx0x20 15, 194, 16, 1 endchannel -SFX_Battle_29_Ch2: +SFX_Battle_29_Ch7: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_Battle_29_Ch2 + loopchannel 4, SFX_Battle_29_Ch7 unknownnoise0x20 12, 244, 188 unknownnoise0x20 12, 245, 156 unknownnoise0x20 15, 244, 172 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index ab01bf85..710a45f1 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch1: +SFX_Battle_2A_Ch4: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 unknownsfx0x20 5, 181, 0, 6 unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_Battle_2A_Ch1 + loopchannel 3, SFX_Battle_2A_Ch4 unknownsfx0x20 8, 209, 0, 6 endchannel -SFX_Battle_2A_Ch2: +SFX_Battle_2A_Ch5: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 unknownsfx0x20 6, 165, 232, 5 unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_Battle_2A_Ch2 + loopchannel 3, SFX_Battle_2A_Ch5 endchannel -SFX_Battle_2A_Ch3: +SFX_Battle_2A_Ch7: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_Battle_2A_Ch3 + loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 6eddfa76..da57c7a7 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch1: +SFX_Battle_2B_Ch4: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 unknownsfx0x20 3, 241, 0, 5 unknownsfx0x20 3, 177, 0, 4 unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_Battle_2B_Ch1 + loopchannel 5, SFX_Battle_2B_Ch4 unknownsfx0x20 8, 129, 0, 4 endchannel -SFX_Battle_2B_Ch2: +SFX_Battle_2B_Ch7: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 unknownnoise0x20 3, 146, 35 unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_Battle_2B_Ch2 + loopchannel 5, SFX_Battle_2B_Ch7 unknownnoise0x20 8, 129, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 9cd9bd16..2f8bdc49 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch1: +SFX_Battle_2C_Ch4: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_Battle_2C_Ch1 + loopchannel 3, SFX_Battle_2C_Ch4 endchannel -SFX_Battle_2C_Ch2: +SFX_Battle_2C_Ch5: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_Battle_2C_Ch2 + loopchannel 4, SFX_Battle_2C_Ch5 endchannel -SFX_Battle_2C_Ch3: +SFX_Battle_2C_Ch7: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_Battle_2C_Ch3 + loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a0841ccf..20c86033 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch1: +SFX_Battle_2E_Ch4: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 unknownsfx0x20 4, 241, 0, 5 unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_Battle_2E_Ch1 + loopchannel 8, SFX_Battle_2E_Ch4 endchannel -SFX_Battle_2E_Ch2: +SFX_Battle_2E_Ch5: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 unknownsfx0x20 4, 225, 2, 6 unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_Battle_2E_Ch2 + loopchannel 8, SFX_Battle_2E_Ch5 endchannel -SFX_Battle_2E_Ch3: +SFX_Battle_2E_Ch7: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_Battle_2E_Ch3 + loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index ad607993..fb4c7a14 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch1: +SFX_Battle_2F_Ch4: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_Battle_2F_Ch1 + loopchannel 8, SFX_Battle_2F_Ch4 endchannel -SFX_Battle_2F_Ch2: +SFX_Battle_2F_Ch5: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_Battle_2F_Ch2 + loopchannel 9, SFX_Battle_2F_Ch5 endchannel -SFX_Battle_2F_Ch3: +SFX_Battle_2F_Ch7: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_Battle_2F_Ch3 + loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index c88cc476..cc1169eb 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: +SFX_Battle_31_Ch4: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: endchannel -SFX_Battle_31_Ch2: +SFX_Battle_31_Ch5: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index a85d4334..c7bff4b2 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: +SFX_Battle_32_Ch4: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: endchannel -SFX_Battle_32_Ch2: +SFX_Battle_32_Ch5: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 25b1ee42..c92b5482 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: +SFX_Battle_33_Ch4: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: endchannel -SFX_Battle_33_Ch2: +SFX_Battle_33_Ch5: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 14718916..38576ecb 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: +SFX_Battle_34_Ch4: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: endchannel -SFX_Battle_34_Ch2: +SFX_Battle_34_Ch5: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: endchannel -SFX_Battle_34_Ch3: +SFX_Battle_34_Ch7: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 2fe57bc4..7ce3afb4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: +SFX_Battle_35_Ch4: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: endchannel -SFX_Battle_35_Ch2: +SFX_Battle_35_Ch5: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index dcf9c56e..df23fb37 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: +SFX_Battle_36_Ch4: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: +SFX_Battle_36_Ch5: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,8 +40,8 @@ SFX_Battle_36_Ch2: endchannel -SFX_Battle_36_Ch3: +SFX_Battle_36_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_Battle_36_Ch3 + loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d4f3e858..b844a54a 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: +SFX_Caught_Mon_Ch4: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: endchannel -SFX_Caught_Mon_Ch2: +SFX_Caught_Mon_Ch5: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: endchannel -SFX_Caught_Mon_Ch3: +SFX_Caught_Mon_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 7a45bdf4..241a5e68 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: +SFX_Collision_1_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 601670d5..649792eb 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: +SFX_Collision_3_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 4fc82294..98920dfc 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: +SFX_Cry00_1_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: endchannel -SFX_Cry00_1_Ch2: +SFX_Cry00_1_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: endchannel -SFX_Cry00_1_Ch3: +SFX_Cry00_1_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index ccce6943..17a9207e 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: +SFX_Cry00_2_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: endchannel -SFX_Cry00_2_Ch2: +SFX_Cry00_2_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: endchannel -SFX_Cry00_2_Ch3: +SFX_Cry00_2_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 9b8b6fda..81ad7edf 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: +SFX_Cry00_3_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: endchannel -SFX_Cry00_3_Ch2: +SFX_Cry00_3_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: endchannel -SFX_Cry00_3_Ch3: +SFX_Cry00_3_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index d684af6f..392adbe3 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: +SFX_Cry01_1_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: endchannel -SFX_Cry01_1_Ch2: +SFX_Cry01_1_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: endchannel -SFX_Cry01_1_Ch3: +SFX_Cry01_1_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 0e1030e1..a7397fd8 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: +SFX_Cry01_2_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: endchannel -SFX_Cry01_2_Ch2: +SFX_Cry01_2_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: endchannel -SFX_Cry01_2_Ch3: +SFX_Cry01_2_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index be084d7e..19235f9e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: +SFX_Cry01_3_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: endchannel -SFX_Cry01_3_Ch2: +SFX_Cry01_3_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: endchannel -SFX_Cry01_3_Ch3: +SFX_Cry01_3_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index d4b520c9..62834724 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: +SFX_Cry02_1_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: endchannel -SFX_Cry02_1_Ch2: +SFX_Cry02_1_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: +SFX_Cry02_1_Ch7: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 526e8c48..ae40372a 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: +SFX_Cry02_2_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: endchannel -SFX_Cry02_2_Ch2: +SFX_Cry02_2_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: +SFX_Cry02_2_Ch7: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 2366ff97..32be5608 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: +SFX_Cry02_3_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: endchannel -SFX_Cry02_3_Ch2: +SFX_Cry02_3_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: +SFX_Cry02_3_Ch7: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 72ea5d38..706d2325 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: +SFX_Cry03_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: endchannel -SFX_Cry03_1_Ch2: +SFX_Cry03_1_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: endchannel -SFX_Cry03_1_Ch3: +SFX_Cry03_1_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index de043909..89e98ae4 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: +SFX_Cry03_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: endchannel -SFX_Cry03_2_Ch2: +SFX_Cry03_2_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: endchannel -SFX_Cry03_2_Ch3: +SFX_Cry03_2_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 467745f9..d472d37b 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: +SFX_Cry03_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: endchannel -SFX_Cry03_3_Ch2: +SFX_Cry03_3_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: endchannel -SFX_Cry03_3_Ch3: +SFX_Cry03_3_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 2c34f1c6..d1bb26c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: +SFX_Cry04_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: endchannel -SFX_Cry04_1_Ch2: +SFX_Cry04_1_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: endchannel -SFX_Cry04_1_Ch3: +SFX_Cry04_1_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 38bfbf63..aa5baf29 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: +SFX_Cry04_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: endchannel -SFX_Cry04_2_Ch2: +SFX_Cry04_2_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: endchannel -SFX_Cry04_2_Ch3: +SFX_Cry04_2_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index bd73c271..b4d9cf2e 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: +SFX_Cry04_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: endchannel -SFX_Cry04_3_Ch2: +SFX_Cry04_3_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: endchannel -SFX_Cry04_3_Ch3: +SFX_Cry04_3_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 8de5bf02..dc68e77d 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: +SFX_Cry05_1_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: endchannel -SFX_Cry05_1_Ch2: +SFX_Cry05_1_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: +SFX_Cry05_1_Ch7: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 28879677..f7e09dcc 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: +SFX_Cry05_2_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: endchannel -SFX_Cry05_2_Ch2: +SFX_Cry05_2_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: +SFX_Cry05_2_Ch7: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 261492af..2e8839c9 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: +SFX_Cry05_3_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: endchannel -SFX_Cry05_3_Ch2: +SFX_Cry05_3_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: +SFX_Cry05_3_Ch7: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index e171b025..d3b051c8 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: +SFX_Cry06_1_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: +SFX_Cry06_1_Ch5: endchannel -SFX_Cry06_1_Ch3: +SFX_Cry06_1_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 5e6e9e6a..6a46246c 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: +SFX_Cry06_2_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: +SFX_Cry06_2_Ch5: endchannel -SFX_Cry06_2_Ch3: +SFX_Cry06_2_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 5d2994f1..692cd1cf 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: +SFX_Cry06_3_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: +SFX_Cry06_3_Ch5: endchannel -SFX_Cry06_3_Ch3: +SFX_Cry06_3_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index e48a50a2..2eebb7f9 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: +SFX_Cry07_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: endchannel -SFX_Cry07_1_Ch2: +SFX_Cry07_1_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: endchannel -SFX_Cry07_1_Ch3: +SFX_Cry07_1_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index ab902a30..e0381424 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: +SFX_Cry07_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: endchannel -SFX_Cry07_2_Ch2: +SFX_Cry07_2_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: endchannel -SFX_Cry07_2_Ch3: +SFX_Cry07_2_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 40fad544..92a401a9 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: +SFX_Cry07_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: endchannel -SFX_Cry07_3_Ch2: +SFX_Cry07_3_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: endchannel -SFX_Cry07_3_Ch3: +SFX_Cry07_3_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ec5ca3c..91901faa 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: +SFX_Cry08_1_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: endchannel -SFX_Cry08_1_Ch2: +SFX_Cry08_1_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: endchannel -SFX_Cry08_1_Ch3: +SFX_Cry08_1_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 9c154b1c..45d12f38 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: +SFX_Cry08_2_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: endchannel -SFX_Cry08_2_Ch2: +SFX_Cry08_2_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: endchannel -SFX_Cry08_2_Ch3: +SFX_Cry08_2_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 95fea40e..8f1ec3fb 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: +SFX_Cry08_3_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: endchannel -SFX_Cry08_3_Ch2: +SFX_Cry08_3_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: endchannel -SFX_Cry08_3_Ch3: +SFX_Cry08_3_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 46aae33c..11b4ab55 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: +SFX_Cry09_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: endchannel -SFX_Cry09_1_Ch2: +SFX_Cry09_1_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: endchannel -SFX_Cry09_1_Ch3: +SFX_Cry09_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 8ce97609..ac4b1f74 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: +SFX_Cry09_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: endchannel -SFX_Cry09_2_Ch2: +SFX_Cry09_2_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: endchannel -SFX_Cry09_2_Ch3: +SFX_Cry09_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index a6b40dde..1d3856cc 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: +SFX_Cry09_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: endchannel -SFX_Cry09_3_Ch2: +SFX_Cry09_3_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: endchannel -SFX_Cry09_3_Ch3: +SFX_Cry09_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 4264e858..051a5d73 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: +SFX_Cry0A_1_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: endchannel -SFX_Cry0A_1_Ch2: +SFX_Cry0A_1_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: endchannel -SFX_Cry0A_1_Ch3: +SFX_Cry0A_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 42a8e603..d7fdd264 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: +SFX_Cry0A_2_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: endchannel -SFX_Cry0A_2_Ch2: +SFX_Cry0A_2_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: endchannel -SFX_Cry0A_2_Ch3: +SFX_Cry0A_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index f8576fa1..e16287c4 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: +SFX_Cry0A_3_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: endchannel -SFX_Cry0A_3_Ch2: +SFX_Cry0A_3_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: endchannel -SFX_Cry0A_3_Ch3: +SFX_Cry0A_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index d0da6c2e..5ee9b81c 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: +SFX_Cry0B_1_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: endchannel -SFX_Cry0B_1_Ch2: +SFX_Cry0B_1_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: endchannel -SFX_Cry0B_1_Ch3: +SFX_Cry0B_1_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 0fe7840a..f762ea02 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: +SFX_Cry0B_2_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: endchannel -SFX_Cry0B_2_Ch2: +SFX_Cry0B_2_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: endchannel -SFX_Cry0B_2_Ch3: +SFX_Cry0B_2_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ff761b85..22420974 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: +SFX_Cry0B_3_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: endchannel -SFX_Cry0B_3_Ch2: +SFX_Cry0B_3_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: endchannel -SFX_Cry0B_3_Ch3: +SFX_Cry0B_3_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 4ff72662..dfbf0283 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: +SFX_Cry0C_1_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: endchannel -SFX_Cry0C_1_Ch2: +SFX_Cry0C_1_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: +SFX_Cry0C_1_Ch7: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 8fb925da..11e0d06a 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: +SFX_Cry0C_2_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: endchannel -SFX_Cry0C_2_Ch2: +SFX_Cry0C_2_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: +SFX_Cry0C_2_Ch7: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 149b585d..6fc798f2 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: +SFX_Cry0C_3_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: endchannel -SFX_Cry0C_3_Ch2: +SFX_Cry0C_3_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: +SFX_Cry0C_3_Ch7: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index dccccb4e..2864fa01 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: +SFX_Cry0D_1_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_1_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_1_Ch1 + loopchannel 2, SFX_Cry0D_1_Ch4 endchannel -SFX_Cry0D_1_Ch2: +SFX_Cry0D_1_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: endchannel -SFX_Cry0D_1_Ch3: +SFX_Cry0D_1_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 718364dd..ef4a0eb6 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: +SFX_Cry0D_2_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_2_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_2_Ch1 + loopchannel 2, SFX_Cry0D_2_Ch4 endchannel -SFX_Cry0D_2_Ch2: +SFX_Cry0D_2_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: endchannel -SFX_Cry0D_2_Ch3: +SFX_Cry0D_2_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index ce26e7e5..1fbc40b5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: +SFX_Cry0D_3_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_3_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_3_Ch1 + loopchannel 2, SFX_Cry0D_3_Ch4 endchannel -SFX_Cry0D_3_Ch2: +SFX_Cry0D_3_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: endchannel -SFX_Cry0D_3_Ch3: +SFX_Cry0D_3_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c30aaf20..37cabb7c 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: +SFX_Cry0E_1_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: endchannel -SFX_Cry0E_1_Ch2: +SFX_Cry0E_1_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: endchannel -SFX_Cry0E_1_Ch3: +SFX_Cry0E_1_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 194fb04b..5f6f481f 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: +SFX_Cry0E_2_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: endchannel -SFX_Cry0E_2_Ch2: +SFX_Cry0E_2_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: endchannel -SFX_Cry0E_2_Ch3: +SFX_Cry0E_2_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 062e8970..13cf9405 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: +SFX_Cry0E_3_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: endchannel -SFX_Cry0E_3_Ch2: +SFX_Cry0E_3_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: endchannel -SFX_Cry0E_3_Ch3: +SFX_Cry0E_3_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 1646d4b5..81abdc09 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: +SFX_Cry0F_1_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: endchannel -SFX_Cry0F_1_Ch2: +SFX_Cry0F_1_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: endchannel -SFX_Cry0F_1_Ch3: +SFX_Cry0F_1_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 6058e7cc..112b9e8b 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: +SFX_Cry0F_2_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: endchannel -SFX_Cry0F_2_Ch2: +SFX_Cry0F_2_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: endchannel -SFX_Cry0F_2_Ch3: +SFX_Cry0F_2_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 113f5ed1..08abd131 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: +SFX_Cry0F_3_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: endchannel -SFX_Cry0F_3_Ch2: +SFX_Cry0F_3_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: endchannel -SFX_Cry0F_3_Ch3: +SFX_Cry0F_3_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 5199b973..eef13d3d 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: +SFX_Cry10_1_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: endchannel -SFX_Cry10_1_Ch2: +SFX_Cry10_1_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: endchannel -SFX_Cry10_1_Ch3: +SFX_Cry10_1_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 789c61b1..dd468979 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: +SFX_Cry10_2_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: endchannel -SFX_Cry10_2_Ch2: +SFX_Cry10_2_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: endchannel -SFX_Cry10_2_Ch3: +SFX_Cry10_2_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 83980fc7..e9a5200d 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: +SFX_Cry10_3_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: endchannel -SFX_Cry10_3_Ch2: +SFX_Cry10_3_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: endchannel -SFX_Cry10_3_Ch3: +SFX_Cry10_3_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index d7e0b0f9..f7c314ef 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: +SFX_Cry11_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: endchannel -SFX_Cry11_1_Ch2: +SFX_Cry11_1_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: endchannel -SFX_Cry11_1_Ch3: +SFX_Cry11_1_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index f46580eb..0009a0ec 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: +SFX_Cry11_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: endchannel -SFX_Cry11_2_Ch2: +SFX_Cry11_2_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: endchannel -SFX_Cry11_2_Ch3: +SFX_Cry11_2_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c07e01a5..a8af19f6 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: +SFX_Cry11_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: endchannel -SFX_Cry11_3_Ch2: +SFX_Cry11_3_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: endchannel -SFX_Cry11_3_Ch3: +SFX_Cry11_3_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 62956626..29d93eff 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: +SFX_Cry12_1_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: endchannel -SFX_Cry12_1_Ch2: +SFX_Cry12_1_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: endchannel -SFX_Cry12_1_Ch3: +SFX_Cry12_1_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4acb8911..90f373c0 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: +SFX_Cry12_2_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: endchannel -SFX_Cry12_2_Ch2: +SFX_Cry12_2_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: endchannel -SFX_Cry12_2_Ch3: +SFX_Cry12_2_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index bb433ac9..f2c012ae 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: +SFX_Cry12_3_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: endchannel -SFX_Cry12_3_Ch2: +SFX_Cry12_3_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: endchannel -SFX_Cry12_3_Ch3: +SFX_Cry12_3_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 7f9ef226..703db728 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: +SFX_Cry13_1_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: endchannel -SFX_Cry13_1_Ch2: +SFX_Cry13_1_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: endchannel -SFX_Cry13_1_Ch3: +SFX_Cry13_1_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 35d723dd..7d75853c 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: +SFX_Cry13_2_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: endchannel -SFX_Cry13_2_Ch2: +SFX_Cry13_2_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: endchannel -SFX_Cry13_2_Ch3: +SFX_Cry13_2_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index a298e5ff..53296f1a 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: +SFX_Cry13_3_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: endchannel -SFX_Cry13_3_Ch2: +SFX_Cry13_3_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: endchannel -SFX_Cry13_3_Ch3: +SFX_Cry13_3_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b3cb43b9..fa8964de 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: +SFX_Cry14_1_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: endchannel -SFX_Cry14_1_Ch2: +SFX_Cry14_1_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: endchannel -SFX_Cry14_1_Ch3: +SFX_Cry14_1_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index d243bcbd..1f70dca8 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: +SFX_Cry14_2_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: endchannel -SFX_Cry14_2_Ch2: +SFX_Cry14_2_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: endchannel -SFX_Cry14_2_Ch3: +SFX_Cry14_2_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index b1a32bc4..3bab2100 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: +SFX_Cry14_3_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: endchannel -SFX_Cry14_3_Ch2: +SFX_Cry14_3_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: endchannel -SFX_Cry14_3_Ch3: +SFX_Cry14_3_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 4ebd4963..0220ad4f 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: +SFX_Cry15_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: endchannel -SFX_Cry15_1_Ch2: +SFX_Cry15_1_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: endchannel -SFX_Cry15_1_Ch3: +SFX_Cry15_1_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 77807203..2ebd7ab0 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: +SFX_Cry15_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: endchannel -SFX_Cry15_2_Ch2: +SFX_Cry15_2_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: endchannel -SFX_Cry15_2_Ch3: +SFX_Cry15_2_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 2c24d658..39ba7a74 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: +SFX_Cry15_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: endchannel -SFX_Cry15_3_Ch2: +SFX_Cry15_3_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: endchannel -SFX_Cry15_3_Ch3: +SFX_Cry15_3_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 8a7ee4c1..34d6f6d9 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: +SFX_Cry16_1_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: endchannel -SFX_Cry16_1_Ch2: +SFX_Cry16_1_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: endchannel -SFX_Cry16_1_Ch3: +SFX_Cry16_1_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 46729c2a..8948cd29 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: +SFX_Cry16_2_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: endchannel -SFX_Cry16_2_Ch2: +SFX_Cry16_2_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: endchannel -SFX_Cry16_2_Ch3: +SFX_Cry16_2_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index a94ac495..026ee67b 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: +SFX_Cry16_3_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: endchannel -SFX_Cry16_3_Ch2: +SFX_Cry16_3_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: endchannel -SFX_Cry16_3_Ch3: +SFX_Cry16_3_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index ddf0967d..97dec764 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: +SFX_Cry17_1_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: endchannel -SFX_Cry17_1_Ch2: +SFX_Cry17_1_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: endchannel -SFX_Cry17_1_Ch3: +SFX_Cry17_1_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index f2528875..a6ab03a2 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: +SFX_Cry17_2_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: endchannel -SFX_Cry17_2_Ch2: +SFX_Cry17_2_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: endchannel -SFX_Cry17_2_Ch3: +SFX_Cry17_2_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index f180a3b8..53555206 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: +SFX_Cry17_3_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: endchannel -SFX_Cry17_3_Ch2: +SFX_Cry17_3_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: endchannel -SFX_Cry17_3_Ch3: +SFX_Cry17_3_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index c28bf7f4..8cb3283f 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: +SFX_Cry18_1_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: endchannel -SFX_Cry18_1_Ch2: +SFX_Cry18_1_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: endchannel -SFX_Cry18_1_Ch3: +SFX_Cry18_1_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 1c3c26b9..01dacd5f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: +SFX_Cry18_2_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: endchannel -SFX_Cry18_2_Ch2: +SFX_Cry18_2_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: endchannel -SFX_Cry18_2_Ch3: +SFX_Cry18_2_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index ceeda42f..23d2d6a6 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: +SFX_Cry18_3_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: endchannel -SFX_Cry18_3_Ch2: +SFX_Cry18_3_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: endchannel -SFX_Cry18_3_Ch3: +SFX_Cry18_3_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 4b5b4ed0..2e6790e5 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: +SFX_Cry19_1_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: endchannel -SFX_Cry19_1_Ch2: +SFX_Cry19_1_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: +SFX_Cry19_1_Ch7: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 9c9557a9..f412ec14 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: +SFX_Cry19_2_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: endchannel -SFX_Cry19_2_Ch2: +SFX_Cry19_2_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: +SFX_Cry19_2_Ch7: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 71eccbf8..2baff05e 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: +SFX_Cry19_3_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: endchannel -SFX_Cry19_3_Ch2: +SFX_Cry19_3_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: +SFX_Cry19_3_Ch7: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 7f8911c7..5d03596e 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: +SFX_Cry1A_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: endchannel -SFX_Cry1A_1_Ch2: +SFX_Cry1A_1_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: endchannel -SFX_Cry1A_1_Ch3: +SFX_Cry1A_1_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index da54ff6e..4dcf2a42 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: +SFX_Cry1A_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: endchannel -SFX_Cry1A_2_Ch2: +SFX_Cry1A_2_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: endchannel -SFX_Cry1A_2_Ch3: +SFX_Cry1A_2_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index d16cf035..274ce438 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: +SFX_Cry1A_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: endchannel -SFX_Cry1A_3_Ch2: +SFX_Cry1A_3_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: endchannel -SFX_Cry1A_3_Ch3: +SFX_Cry1A_3_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index f6f03c98..562239c7 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: +SFX_Cry1B_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: endchannel -SFX_Cry1B_1_Ch2: +SFX_Cry1B_1_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: endchannel -SFX_Cry1B_1_Ch3: +SFX_Cry1B_1_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index fe96943d..45bb41a2 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: +SFX_Cry1B_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: endchannel -SFX_Cry1B_2_Ch2: +SFX_Cry1B_2_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: endchannel -SFX_Cry1B_2_Ch3: +SFX_Cry1B_2_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 8a034b1e..e6e31b00 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: +SFX_Cry1B_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: endchannel -SFX_Cry1B_3_Ch2: +SFX_Cry1B_3_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: endchannel -SFX_Cry1B_3_Ch3: +SFX_Cry1B_3_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 1561353e..332b7da8 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: +SFX_Cry1C_1_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: endchannel -SFX_Cry1C_1_Ch2: +SFX_Cry1C_1_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: endchannel -SFX_Cry1C_1_Ch3: +SFX_Cry1C_1_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index c589a24d..aee95be5 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: +SFX_Cry1C_2_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: endchannel -SFX_Cry1C_2_Ch2: +SFX_Cry1C_2_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: endchannel -SFX_Cry1C_2_Ch3: +SFX_Cry1C_2_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 930e3368..13e687f6 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: +SFX_Cry1C_3_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: endchannel -SFX_Cry1C_3_Ch2: +SFX_Cry1C_3_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: endchannel -SFX_Cry1C_3_Ch3: +SFX_Cry1C_3_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6b8b3f79..4e7b6308 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: +SFX_Cry1D_1_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: endchannel -SFX_Cry1D_1_Ch2: +SFX_Cry1D_1_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: endchannel -SFX_Cry1D_1_Ch3: +SFX_Cry1D_1_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 31fccb8d..9ee56bf8 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: +SFX_Cry1D_2_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: endchannel -SFX_Cry1D_2_Ch2: +SFX_Cry1D_2_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: endchannel -SFX_Cry1D_2_Ch3: +SFX_Cry1D_2_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index fbbe9ca5..e2e5fae3 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: +SFX_Cry1D_3_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: endchannel -SFX_Cry1D_3_Ch2: +SFX_Cry1D_3_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: endchannel -SFX_Cry1D_3_Ch3: +SFX_Cry1D_3_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 9501a06a..56d97001 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: +SFX_Cry1E_1_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: endchannel -SFX_Cry1E_1_Ch2: +SFX_Cry1E_1_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: endchannel -SFX_Cry1E_1_Ch3: +SFX_Cry1E_1_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index fe112101..7ed25afe 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: +SFX_Cry1E_2_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: endchannel -SFX_Cry1E_2_Ch2: +SFX_Cry1E_2_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: endchannel -SFX_Cry1E_2_Ch3: +SFX_Cry1E_2_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f5bdbe08..82dbdfcc 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: +SFX_Cry1E_3_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: endchannel -SFX_Cry1E_3_Ch2: +SFX_Cry1E_3_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: endchannel -SFX_Cry1E_3_Ch3: +SFX_Cry1E_3_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 28b91c61..a38bd975 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: +SFX_Cry1F_1_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: endchannel -SFX_Cry1F_1_Ch2: +SFX_Cry1F_1_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: endchannel -SFX_Cry1F_1_Ch3: +SFX_Cry1F_1_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 9691654f..3d261bb2 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: +SFX_Cry1F_2_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: endchannel -SFX_Cry1F_2_Ch2: +SFX_Cry1F_2_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: endchannel -SFX_Cry1F_2_Ch3: +SFX_Cry1F_2_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 3c50327b..2bdfe24b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: +SFX_Cry1F_3_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: endchannel -SFX_Cry1F_3_Ch2: +SFX_Cry1F_3_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: endchannel -SFX_Cry1F_3_Ch3: +SFX_Cry1F_3_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 0e9ffb00..14ec6942 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: +SFX_Cry20_1_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: endchannel -SFX_Cry20_1_Ch2: +SFX_Cry20_1_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: endchannel -SFX_Cry20_1_Ch3: +SFX_Cry20_1_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 91891b4f..bcbf27a6 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: +SFX_Cry20_2_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: endchannel -SFX_Cry20_2_Ch2: +SFX_Cry20_2_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: endchannel -SFX_Cry20_2_Ch3: +SFX_Cry20_2_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1fae1bb3..12e42d7f 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: +SFX_Cry20_3_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: endchannel -SFX_Cry20_3_Ch2: +SFX_Cry20_3_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: endchannel -SFX_Cry20_3_Ch3: +SFX_Cry20_3_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 17d1e16c..c08704d7 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: +SFX_Cry21_1_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: endchannel -SFX_Cry21_1_Ch2: +SFX_Cry21_1_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: +SFX_Cry21_1_Ch7: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index 14856fc9..b8f68dbd 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: +SFX_Cry21_2_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: endchannel -SFX_Cry21_2_Ch2: +SFX_Cry21_2_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: +SFX_Cry21_2_Ch7: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 40cbf7f2..4a549af9 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: +SFX_Cry21_3_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: endchannel -SFX_Cry21_3_Ch2: +SFX_Cry21_3_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: +SFX_Cry21_3_Ch7: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index fb0c6b23..0da8dbd2 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: +SFX_Cry22_1_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: endchannel -SFX_Cry22_1_Ch2: +SFX_Cry22_1_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: endchannel -SFX_Cry22_1_Ch3: +SFX_Cry22_1_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 7653234e..d7456dbc 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: +SFX_Cry22_2_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: endchannel -SFX_Cry22_2_Ch2: +SFX_Cry22_2_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: endchannel -SFX_Cry22_2_Ch3: +SFX_Cry22_2_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 96fae832..927c174c 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: +SFX_Cry22_3_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: endchannel -SFX_Cry22_3_Ch2: +SFX_Cry22_3_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: endchannel -SFX_Cry22_3_Ch3: +SFX_Cry22_3_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 4aaa3bfa..cc0587d7 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: +SFX_Cry23_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: endchannel -SFX_Cry23_1_Ch2: +SFX_Cry23_1_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: endchannel -SFX_Cry23_1_Ch3: +SFX_Cry23_1_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 644b14cf..5d130aa5 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: +SFX_Cry23_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: endchannel -SFX_Cry23_2_Ch2: +SFX_Cry23_2_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: endchannel -SFX_Cry23_2_Ch3: +SFX_Cry23_2_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index d86dfcd4..8ada0c63 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: +SFX_Cry23_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: endchannel -SFX_Cry23_3_Ch2: +SFX_Cry23_3_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: endchannel -SFX_Cry23_3_Ch3: +SFX_Cry23_3_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index a94803c1..f79dc72c 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: +SFX_Cry24_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: endchannel -SFX_Cry24_1_Ch2: +SFX_Cry24_1_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: endchannel -SFX_Cry24_1_Ch3: +SFX_Cry24_1_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index cc8b2f87..aede2b95 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: +SFX_Cry24_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: endchannel -SFX_Cry24_2_Ch2: +SFX_Cry24_2_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: endchannel -SFX_Cry24_2_Ch3: +SFX_Cry24_2_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 37926146..cad3ada1 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: +SFX_Cry24_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: endchannel -SFX_Cry24_3_Ch2: +SFX_Cry24_3_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: endchannel -SFX_Cry24_3_Ch3: +SFX_Cry24_3_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index d54b8d6c..f3ae46ae 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: +SFX_Cry25_1_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: endchannel -SFX_Cry25_1_Ch2: +SFX_Cry25_1_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: endchannel -SFX_Cry25_1_Ch3: +SFX_Cry25_1_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 48e4d057..9b976b4e 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: +SFX_Cry25_2_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: endchannel -SFX_Cry25_2_Ch2: +SFX_Cry25_2_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: endchannel -SFX_Cry25_2_Ch3: +SFX_Cry25_2_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index f08c6a00..e76feb9e 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: +SFX_Cry25_3_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: endchannel -SFX_Cry25_3_Ch2: +SFX_Cry25_3_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: endchannel -SFX_Cry25_3_Ch3: +SFX_Cry25_3_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index a42cd660..73510fd7 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: +SFX_Cut_1_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 12c2366e..6e7d8951 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: +SFX_Cut_3_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 3f3c6d8b..35cae4df 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: +SFX_Cymbal1_1_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index bb1e3e3e..bffe7690 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: +SFX_Cymbal1_2_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 9587977f..0f03f455 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: +SFX_Cymbal1_3_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 2ec3fc86..ce19bb6b 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: +SFX_Cymbal2_1_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 8b27a0de..f45dec5b 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: +SFX_Cymbal2_2_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 642a336a..2d2ebf1c 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: +SFX_Cymbal2_3_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 3fd225e2..98f3977d 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: +SFX_Cymbal3_1_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index 1435b5ed..2a2cb997 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: +SFX_Cymbal3_2_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index b45fb03d..60b96278 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: +SFX_Cymbal3_3_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index ea2727d8..452fd5ed 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: +SFX_Damage_Ch7: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index d954308a..e7d5a8ca 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: +SFX_Denied_1_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: endchannel -SFX_Denied_1_Ch2: +SFX_Denied_1_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index ca82a739..cf3b2a20 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: +SFX_Denied_3_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: endchannel -SFX_Denied_3_Ch2: +SFX_Denied_3_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6e3a0dcf..08180071 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: +SFX_Dex_Page_Added_Ch4: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: endchannel -SFX_Dex_Page_Added_Ch2: +SFX_Dex_Page_Added_Ch5: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 5cae0a4b..4e71ac36 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: +SFX_Doubleslap_Ch7: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index b2450ced..338c32ab 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: +SFX_Enter_PC_1_Ch4: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 061068ce..f34ed9d0 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: +SFX_Enter_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd1b2cdc..cd403485 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: +SFX_Faint_Fall_Ch4: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 7b6ec0a0..479efab3 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: +SFX_Faint_Thud_Ch4: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: +SFX_Faint_Thud_Ch7: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 2b487bc2..ededef48 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: +SFX_Fly_1_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index c081030d..084c8b4c 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: +SFX_Fly_3_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index ba428722..2cf5e8c9 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: +SFX_Get_Item1_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: endchannel -SFX_Get_Item1_1_Ch2: +SFX_Get_Item1_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: endchannel -SFX_Get_Item1_1_Ch3: +SFX_Get_Item1_1_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index b30ce40c..6c4c01b5 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: +SFX_Get_Item1_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: endchannel -SFX_Get_Item1_3_Ch2: +SFX_Get_Item1_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: endchannel -SFX_Get_Item1_3_Ch3: +SFX_Get_Item1_3_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 67bb7bb8..01e66269 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: +SFX_Get_Item2_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: endchannel -SFX_Get_Item2_1_Ch2: +SFX_Get_Item2_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: endchannel -SFX_Get_Item2_1_Ch3: +SFX_Get_Item2_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 292a74f6..27c5864d 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: +SFX_Get_Item2_2_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: endchannel -SFX_Get_Item2_2_Ch2: +SFX_Get_Item2_2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: endchannel -SFX_Get_Item2_2_Ch3: +SFX_Get_Item2_2_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 1a833741..42d74e8e 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: +SFX_Get_Item2_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: endchannel -SFX_Get_Item2_3_Ch2: +SFX_Get_Item2_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: endchannel -SFX_Get_Item2_3_Ch3: +SFX_Get_Item2_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index c8da1745..b2ae3d57 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: +SFX_Get_Key_Item_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: endchannel -SFX_Get_Key_Item_1_Ch2: +SFX_Get_Key_Item_1_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: endchannel -SFX_Get_Key_Item_1_Ch3: +SFX_Get_Key_Item_1_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index e6a50929..aebae361 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: +SFX_Get_Key_Item_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: endchannel -SFX_Get_Key_Item_3_Ch2: +SFX_Get_Key_Item_3_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: endchannel -SFX_Get_Key_Item_3_Ch3: +SFX_Get_Key_Item_3_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 5da5be86..aa523774 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: +SFX_Go_Inside_1_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 460b3b4a..9939ba6d 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: +SFX_Go_Inside_3_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2038d299..c60bb592 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: +SFX_Go_Outside_1_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index d45b8410..30b9884c 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: +SFX_Go_Outside_3_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 3a292b82..ca703c09 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: +SFX_Heal_Ailment_1_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 25e1bbe0..b06abe62 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: +SFX_Heal_Ailment_2_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index 2719358f..c13d74fd 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: +SFX_Heal_Ailment_3_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index a23db490..75400957 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: +SFX_Heal_HP_1_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index f21f6712..182937cd 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: +SFX_Heal_HP_2_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index 96ff391b..c238013a 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: +SFX_Heal_HP_3_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ecb7c09c..ebaee990 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: +SFX_Healing_Machine_1_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ec73e139..ac11fee4 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: +SFX_Healing_Machine_3_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index b1af527b..12ca5da6 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: +SFX_Horn_Drill_Ch7: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 69d6ff9b..82c58356 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: +SFX_Intro_Crash_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 3d6de9d6..0d450e21 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: +SFX_Intro_Hip_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 8e077c67..1bd9faec 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: +SFX_Intro_Hop_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index cb7570de..bb534a70 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: +SFX_Intro_Lunge_Ch7: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 0088228f..060ef09a 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: +SFX_Intro_Raise_Ch7: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 5609bfc0..e874e773 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: +SFX_Intro_Whoosh_Ch7: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 72aa087e..26acaf1b 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: +SFX_Ledge_1_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index a554282e..623e56ce 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: +SFX_Ledge_3_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index f0890eab..5b3da83d 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: +SFX_Level_Up_Ch4: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: endchannel -SFX_Level_Up_Ch2: +SFX_Level_Up_Ch5: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: endchannel -SFX_Level_Up_Ch3: +SFX_Level_Up_Ch6: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index b29a5b87..4b205470 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: +SFX_Muted_Snare1_1_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index a7f5467f..d530bd89 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: +SFX_Muted_Snare1_2_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 136018ef..8b5c2c6d 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: +SFX_Muted_Snare1_3_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 9ad52c27..4e15e386 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: +SFX_Muted_Snare2_1_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 20670ec8..5107fb77 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: +SFX_Muted_Snare2_2_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 007d462d..043c870d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: +SFX_Muted_Snare2_3_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 8db6b874..d0c689a4 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: +SFX_Muted_Snare3_1_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 013ea9ab..3e470ae6 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: +SFX_Muted_Snare3_2_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index 038a66db..c8749577 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: +SFX_Muted_Snare3_3_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index 99429995..ebe2ee1d 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: +SFX_Muted_Snare4_1_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 11ee3218..bdbe4d11 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: +SFX_Muted_Snare4_2_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 86223813..59d72218 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: +SFX_Muted_Snare4_3_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 8a4c521e..3f74c515 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: +SFX_Not_Very_Effective_Ch7: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c474e9b3..cca7ecaa 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: +SFX_Peck_Ch7: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index bfd619fd..73068b86 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch1: +SFX_Poisoned_1_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_1_Ch1 + loopchannel 4, SFX_Poisoned_1_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b972ca92..7dc973bc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch1: +SFX_Poisoned_3_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_3_Ch1 + loopchannel 4, SFX_Poisoned_3_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index eccf0ee5..1e0f95f5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: +SFX_Pokedex_Rating_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: endchannel -SFX_Pokedex_Rating_1_Ch2: +SFX_Pokedex_Rating_1_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: endchannel -SFX_Pokedex_Rating_1_Ch3: +SFX_Pokedex_Rating_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index ec82888e..01ac0e1c 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: +SFX_Pokedex_Rating_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: endchannel -SFX_Pokedex_Rating_3_Ch2: +SFX_Pokedex_Rating_3_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: endchannel -SFX_Pokedex_Rating_3_Ch3: +SFX_Pokedex_Rating_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index cf61a6ee..272c114f 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: +SFX_Pokeflute_Ch2: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch4_ch5.asm index 84631bca..146488d8 100755 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ b/audio/sfx/pokeflute_ch4_ch5.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: +SFX_08_PokeFlute_Ch4: tempo 256 -SFX_08_PokeFlute_Ch2: +SFX_08_PokeFlute_Ch5: executemusic notetype 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch6.asm index 3c883462..4d4e5bae 100755 --- a/audio/sfx/pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch6.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: +SFX_08_PokeFlute_Ch6: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index f70f6725..fc6d292e 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: +SFX_Pound_Ch7: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index f68a6384..95edbf4a 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: +SFX_Press_AB_1_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 83b5ccd6..0d8faa46 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: +SFX_Press_AB_2_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 167c0fb1..0f11fc34 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: +SFX_Press_AB_3_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 893d4334..12a1b6fc 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch1: +SFX_Psybeam_Ch4: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_Psybeam_Ch1 + loopchannel 4, SFX_Psybeam_Ch4 unknownsfx0x20 10, 241, 64, 6 endchannel -SFX_Psybeam_Ch2: +SFX_Psybeam_Ch5: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_Psybeam_Ch2 + loopchannel 4, SFX_Psybeam_Ch5 unknownsfx0x20 10, 241, 113, 5 endchannel -SFX_Psybeam_Ch3: +SFX_Psybeam_Ch7: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_Psybeam_Ch3 + loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index abaa8345..2bbde2f1 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: +SFX_Psychic_M_Ch4: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: endchannel -SFX_Psychic_M_Ch2: +SFX_Psychic_M_Ch5: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: endchannel -SFX_Psychic_M_Ch3: +SFX_Psychic_M_Ch7: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 767035ea..1c9490a2 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: +SFX_Purchase_1_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: +SFX_Purchase_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 65a22527..78929c27 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: +SFX_Purchase_3_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: +SFX_Purchase_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index cf43bbcf..86035278 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: +SFX_Push_Boulder_1_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9f536964..ecaeb768 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: +SFX_Push_Boulder_3_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 656d3d01..81d01467 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: +SFX_Run_Ch7: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index d385feb3..f898def0 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: +SFX_Safari_Zone_PA_Ch4: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 13cb46e5..afb1f13a 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: +SFX_Save_1_Ch4: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: endchannel -SFX_Save_1_Ch2: +SFX_Save_1_Ch5: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index ad049ec6..083e77c8 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: +SFX_Save_3_Ch4: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_Save_3_Ch2: +SFX_Save_3_Ch5: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index f8b8e285..f9b03feb 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: +SFX_Shooting_Star_Ch4: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index d69d60de..54731535 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: +SFX_Shrink_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index e5c4b7af..b03cbe55 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: +SFX_Shrink_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ad789af2..ee238262 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: +SFX_Silph_Scope_Ch4: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d29529e9..ae1a6d90 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: +SFX_Slots_New_Spin_Ch4: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: endchannel -SFX_Slots_New_Spin_Ch2: +SFX_Slots_New_Spin_Ch5: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index d7833f55..6923ac71 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: +SFX_Slots_Reward_Ch4: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 00641a5e..85d73daf 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: +SFX_Slots_Stop_Wheel_Ch4: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 9f7b4138..aae0ef28 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: +SFX_Snare1_1_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 55fdf84a..e5013081 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: +SFX_Snare1_2_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index cab603c1..4ffffa7f 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: +SFX_Snare1_3_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index e40facb5..286e397a 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: +SFX_Snare2_1_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 82deb096..a3718612 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: +SFX_Snare2_2_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index fb5e1672..67f8c7fb 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: +SFX_Snare2_3_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index c2b20add..686b4561 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: +SFX_Snare3_1_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 16f87fc5..f8236d40 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: +SFX_Snare3_2_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index 6b9a006f..3b52bac9 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: +SFX_Snare3_3_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 2796410c..35d58dba 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: +SFX_Snare4_1_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index 920321ab..713f8996 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: +SFX_Snare4_2_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index a47c332c..231193e1 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: +SFX_Snare4_3_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index dd4eab3a..54106d58 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: +SFX_Snare5_1_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index fad74021..f7f55eb5 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: +SFX_Snare5_2_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index d0ca1d91..76dc3966 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: +SFX_Snare5_3_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 74bf01c7..97c0241d 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: +SFX_Snare6_1_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 0a96680e..797d5518 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: +SFX_Snare6_2_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index f3130931..28fc695a 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: +SFX_Snare6_3_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index ef8f80ab..1b54eefa 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: +SFX_Snare7_1_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 5e266b12..e480f87f 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: +SFX_Snare7_2_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 26db3703..b57dfc13 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: +SFX_Snare7_3_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 5f624177..1a0f74a3 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: +SFX_Snare8_1_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index cf5d5654..87619598 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: +SFX_Snare8_2_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 7da0e415..54076c8e 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: +SFX_Snare8_3_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index c511cdaf..6923bb09 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: +SFX_Snare9_1_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index db9aecf9..308ae7f6 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: +SFX_Snare9_2_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 18df2e46..ffbdc454 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: +SFX_Snare9_3_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 66c95262..38407f24 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: +SFX_SS_Anne_Horn_1_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: endchannel -SFX_SS_Anne_Horn_1_Ch2: +SFX_SS_Anne_Horn_1_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 070f111c..3162f664 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: +SFX_SS_Anne_Horn_3_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: endchannel -SFX_SS_Anne_Horn_3_Ch2: +SFX_SS_Anne_Horn_3_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index f509326c..3a979b44 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: +SFX_Start_Menu_1_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 92bb7558..2706f555 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: +SFX_Start_Menu_2_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 74c82cf3..4b16cea4 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: +SFX_Start_Menu_3_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 70d7014a..63ba35e8 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: +SFX_Super_Effective_Ch7: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 782dd3fb..95a31fcd 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: +SFX_Swap_1_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: +SFX_Swap_1_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 4fc1db1d..6ed97d7d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: +SFX_Swap_3_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: +SFX_Swap_3_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ac9fb680..ee15dc20 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: +SFX_Switch_1_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 81b68d26..d98a7f29 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: +SFX_Switch_3_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 0522ee16..60c87cab 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: +SFX_Teleport_Enter1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 6518e416..d3dab8b4 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: +SFX_Teleport_Enter1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 338c1c30..53eb3335 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: +SFX_Teleport_Enter2_1_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index f6cd103c..8b7c7894 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: +SFX_Teleport_Enter2_3_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index f916d539..084c116f 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: +SFX_Teleport_Exit1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 67739bd1..b3a26af8 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: +SFX_Teleport_Exit1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 1e1de5a5..4b168bb9 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: +SFX_Teleport_Exit2_1_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 928e486e..171e59d8 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: +SFX_Teleport_Exit2_3_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index e6eff9ac..c1f5f00c 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: +SFX_Tink_1_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index fa06cf19..bab45323 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: +SFX_Tink_2_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index d786d289..a9cf73ec 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: +SFX_Tink_3_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 87993851..2f67936b 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: +SFX_Trade_Machine_1_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 6b70d5da..b590455e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: +SFX_Trade_Machine_3_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 94b61fe1..957dc63f 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: +SFX_Triangle1_1_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 1c9c1d29..535448cd 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: +SFX_Triangle1_2_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index b900da7c..a13d00ea 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: +SFX_Triangle1_3_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 0f648237..09ba8a67 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: +SFX_Triangle2_1_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index cbc2a642..6512648a 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: +SFX_Triangle2_2_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index 44fc95dd..b0612aba 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: +SFX_Triangle2_3_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index f5622bd7..9fd3952f 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: +SFX_Triangle3_1_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 8b0b76e5..38b3198b 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: +SFX_Triangle3_2_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index d40779fb..138c8fac 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: +SFX_Triangle3_3_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index ca29a4cc..6b2561fe 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: +SFX_Turn_Off_PC_1_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 2ae0787b..cf6d95cd 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: +SFX_Turn_Off_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 22433707..dede7c3e 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: +SFX_Turn_On_PC_1_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index d97dc1c7..1ed54d3c 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: +SFX_Turn_On_PC_3_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 7e0350d4..36c10ba3 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: +SFX_08_unused2_Ch4: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: endchannel -SFX_08_unused2_Ch2: +SFX_08_unused2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: endchannel -SFX_08_unused2_Ch3: +SFX_08_unused2_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index d0bbfd59..21d54fb1 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: +SFX_02_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: endchannel -SFX_02_unused_Ch2: +SFX_02_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: endchannel -SFX_02_unused_Ch3: +SFX_02_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fd491b71..20de851f 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: +SFX_08_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: endchannel -SFX_08_unused_Ch2: +SFX_08_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: endchannel -SFX_08_unused_Ch3: +SFX_08_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b00e55f5..d4a30539 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: +SFX_1f_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: endchannel -SFX_1f_unused_Ch2: +SFX_1f_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: endchannel -SFX_1f_unused_Ch3: +SFX_1f_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index a8445131..ad0bd40b 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: +SFX_Vine_Whip_Ch7: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 59827ceb..d7a2f54d 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: +SFX_Withdraw_Deposit_1_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 0add48e1..1fd1fe3e 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: +SFX_Withdraw_Deposit_3_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/constants.asm b/constants.asm index d4e453ec..c8e5a78d 100644 --- a/constants.asm +++ b/constants.asm @@ -29,5 +29,4 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" -INCLUDE "constants/event_macros.asm" INCLUDE "constants/text_constants.asm" diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 47448d09..5b73012b 100755 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -427,12 +427,12 @@ const_value = 0 const EVENT_GOT_TM21 ; 1A8, (D77C, bit 0) const EVENT_BEAT_ERIKA ; 1A9, (D77C, bit 1) const EVENT_BEAT_CELADON_GYM_TRAINER_0 ; 1AA, (D77C, bit 2) - const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AB, (D77C, bit 3) - const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AC, (D77C, bit 4) - const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AD, (D77C, bit 5) - const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AE, (D77C, bit 6) - const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1AF, (D77C, bit 7) - const EVENT_BEAT_CELADON_GYM_TRAINER_7 ; 1B0, (D77D, bit 0) + const EVENT_BEAT_CELADON_GYM_TRAINER_1 ; 1AB, (D77C, bit 3) + const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AC, (D77C, bit 4) + const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AD, (D77C, bit 5) + const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AE, (D77C, bit 6) + const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AF, (D77C, bit 7) + const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1B0, (D77D, bit 0) const EVENT_1B1 ; 1B1, (D77D, bit 1) const EVENT_1B2 ; 1B2, (D77D, bit 2) const EVENT_1B3 ; 1B3, (D77D, bit 3) @@ -603,11 +603,11 @@ const_value = 0 const EVENT_GOT_TM06 ; 258, (D792, bit 0) const EVENT_BEAT_KOGA ; 259, (D792, bit 1) const EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 ; 25A, (D792, bit 2) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25B, (D792, bit 3) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25C, (D792, bit 4) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25D, (D792, bit 5) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25E, (D792, bit 6) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 ; 25F, (D792, bit 7) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 ; 25B, (D792, bit 3) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25C, (D792, bit 4) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25D, (D792, bit 5) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25E, (D792, bit 6) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25F, (D792, bit 7) const EVENT_260 ; 260, (D793, bit 0) const EVENT_261 ; 261, (D793, bit 1) const EVENT_262 ; 262, (D793, bit 2) @@ -995,13 +995,13 @@ const_value = 0 const EVENT_3E0 ; 3E0, (D7C3, bit 0) const EVENT_3E1 ; 3E1, (D7C3, bit 1) const EVENT_BEAT_ROUTE_3_TRAINER_0 ; 3E2, (D7C3, bit 2) - const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E3, (D7C3, bit 3) - const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E4, (D7C3, bit 4) - const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E5, (D7C3, bit 5) - const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E6, (D7C3, bit 6) - const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E7, (D7C3, bit 7) - const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E8, (D7C4, bit 0) - const EVENT_BEAT_ROUTE_3_TRAINER_8 ; 3E9, (D7C4, bit 1) + const EVENT_BEAT_ROUTE_3_TRAINER_1 ; 3E3, (D7C3, bit 3) + const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E4, (D7C3, bit 4) + const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E5, (D7C3, bit 5) + const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E6, (D7C3, bit 6) + const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E7, (D7C3, bit 7) + const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E8, (D7C4, bit 0) + const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E9, (D7C4, bit 1) const EVENT_3EA ; 3EA, (D7C4, bit 2) const EVENT_3EB ; 3EB, (D7C4, bit 3) const EVENT_3EC ; 3EC, (D7C4, bit 4) @@ -1090,14 +1090,14 @@ const_value = 0 const EVENT_43F ; 43F, (D7CE, bit 7) const EVENT_440 ; 440, (D7CF, bit 0) const EVENT_BEAT_ROUTE_9_TRAINER_0 ; 441, (D7CF, bit 1) - const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 442, (D7CF, bit 2) - const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 443, (D7CF, bit 3) - const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 444, (D7CF, bit 4) - const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 445, (D7CF, bit 5) - const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 446, (D7CF, bit 6) - const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 447, (D7CF, bit 7) - const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 448, (D7D0, bit 0) - const EVENT_BEAT_ROUTE_9_TRAINER_9 ; 449, (D7D0, bit 1) + const EVENT_BEAT_ROUTE_9_TRAINER_1 ; 442, (D7CF, bit 2) + const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 443, (D7CF, bit 3) + const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 444, (D7CF, bit 4) + const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 445, (D7CF, bit 5) + const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 446, (D7CF, bit 6) + const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 447, (D7CF, bit 7) + const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 448, (D7D0, bit 0) + const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 449, (D7D0, bit 1) const EVENT_44A ; 44A, (D7D0, bit 2) const EVENT_44B ; 44B, (D7D0, bit 3) const EVENT_44C ; 44C, (D7D0, bit 4) @@ -1113,13 +1113,13 @@ const_value = 0 const EVENT_BEAT_ROUTE_10_TRAINER_5 ; 456, (D7D1, bit 6) const EVENT_457 ; 457, (D7D1, bit 7) const EVENT_458 ; 458, (D7D2, bit 0) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 459, (D7D2, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45A, (D7D2, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45B, (D7D2, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45C, (D7D2, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45D, (D7D2, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 ; 459, (D7D2, bit 1) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 45A, (D7D2, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45B, (D7D2, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45C, (D7D2, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45D, (D7D2, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45E, (D7D2, bit 6) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45F, (D7D2, bit 7) const EVENT_460 ; 460, (D7D3, bit 0) const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1) const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2) @@ -1170,15 +1170,15 @@ const_value = 0 const EVENT_BEAT_ROUTE12_SNORLAX ; 48F, (D7D8, bit 7) const EVENT_490 ; 490, (D7D9, bit 0) const EVENT_BEAT_ROUTE_13_TRAINER_0 ; 491, (D7D9, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 492, (D7D9, bit 2) - const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 493, (D7D9, bit 3) - const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 494, (D7D9, bit 4) - const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 495, (D7D9, bit 5) - const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 496, (D7D9, bit 6) - const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 497, (D7D9, bit 7) - const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 498, (D7DA, bit 0) - const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 499, (D7DA, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_10 ; 49A, (D7DA, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_1 ; 492, (D7D9, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 493, (D7D9, bit 3) + const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 494, (D7D9, bit 4) + const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 495, (D7D9, bit 5) + const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 496, (D7D9, bit 6) + const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 497, (D7D9, bit 7) + const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 498, (D7DA, bit 0) + const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 499, (D7DA, bit 1) + const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 49A, (D7DA, bit 2) const EVENT_49B ; 49B, (D7DA, bit 3) const EVENT_49C ; 49C, (D7DA, bit 4) const EVENT_49D ; 49D, (D7DA, bit 5) @@ -1282,15 +1282,15 @@ const_value = 0 const EVENT_4FF ; 4FF, (D7E6, bit 7) const EVENT_IN_SEAFOAM_ISLANDS ; 500, (D7E7, bit 0) const EVENT_BEAT_ROUTE_20_TRAINER_0 ; 501, (D7E7, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 502, (D7E7, bit 2) - const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 503, (D7E7, bit 3) - const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 504, (D7E7, bit 4) - const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 505, (D7E7, bit 5) - const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 506, (D7E7, bit 6) - const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 507, (D7E7, bit 7) - const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 508, (D7E8, bit 0) - const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 509, (D7E8, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_10 ; 50A, (D7E8, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_1 ; 502, (D7E7, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 503, (D7E7, bit 3) + const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 504, (D7E7, bit 4) + const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 505, (D7E7, bit 5) + const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 506, (D7E7, bit 6) + const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 507, (D7E7, bit 7) + const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 508, (D7E8, bit 0) + const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 509, (D7E8, bit 1) + const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 50A, (D7E8, bit 2) const EVENT_50B ; 50B, (D7E8, bit 3) const EVENT_50C ; 50C, (D7E8, bit 4) const EVENT_50D ; 50D, (D7E8, bit 5) @@ -1338,20 +1338,20 @@ const_value = 0 const EVENT_537 ; 537, (D7ED, bit 7) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ; 538, (D7EE, bit 0) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 ; 539, (D7EE, bit 1) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53A, (D7EE, bit 2) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 ; 53A, (D7EE, bit 2) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53B, (D7EE, bit 3) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53C, (D7EE, bit 4) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53D, (D7EE, bit 5) const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7) const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0) const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1) const EVENT_BEAT_ROUTE_24_TRAINER_0 ; 542, (D7EF, bit 2) - const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 543, (D7EF, bit 3) - const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 544, (D7EF, bit 4) - const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 545, (D7EF, bit 5) - const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 546, (D7EF, bit 6) - const EVENT_BEAT_ROUTE_24_TRAINER_6 ; 547, (D7EF, bit 7) + const EVENT_BEAT_ROUTE_24_TRAINER_1 ; 543, (D7EF, bit 3) + const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 544, (D7EF, bit 4) + const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 545, (D7EF, bit 5) + const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 546, (D7EF, bit 6) + const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 547, (D7EF, bit 7) const EVENT_548 ; 548, (D7F0, bit 0) const EVENT_NUGGET_REWARD_AVAILABLE ; 549, (D7F0, bit 1) const EVENT_54A ; 54A, (D7F0, bit 2) @@ -1362,14 +1362,14 @@ const_value = 0 const EVENT_54F ; 54F, (D7F0, bit 7) const EVENT_MET_BILL ; 550, (D7F1, bit 0) const EVENT_BEAT_ROUTE_25_TRAINER_0 ; 551, (D7F1, bit 1) - const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 552, (D7F1, bit 2) - const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 553, (D7F1, bit 3) - const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 554, (D7F1, bit 4) - const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 555, (D7F1, bit 5) - const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 556, (D7F1, bit 6) - const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 557, (D7F1, bit 7) - const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 558, (D7F2, bit 0) - const EVENT_BEAT_ROUTE_25_TRAINER_9 ; 559, (D7F2, bit 1) + const EVENT_BEAT_ROUTE_25_TRAINER_1 ; 552, (D7F1, bit 2) + const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 553, (D7F1, bit 3) + const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 554, (D7F1, bit 4) + const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 555, (D7F1, bit 5) + const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 556, (D7F1, bit 6) + const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 557, (D7F1, bit 7) + const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 558, (D7F2, bit 0) + const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 559, (D7F2, bit 1) const EVENT_55A ; 55A, (D7F2, bit 2) const EVENT_USED_CELL_SEPARATOR_ON_BILL ; 55B, (D7F2, bit 3) const EVENT_GOT_SS_TICKET ; 55C, (D7F2, bit 4) @@ -1394,18 +1394,18 @@ const_value = 0 const EVENT_56F ; 56F, (D7F4, bit 7) const EVENT_570 ; 570, (D7F5, bit 0) const EVENT_BEAT_MT_MOON_1_TRAINER_0 ; 571, (D7F5, bit 1) - const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 572, (D7F5, bit 2) - const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 573, (D7F5, bit 3) - const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 574, (D7F5, bit 4) - const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 575, (D7F5, bit 5) - const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 576, (D7F5, bit 6) - const EVENT_BEAT_MT_MOON_1_TRAINER_7 ; 577, (D7F5, bit 7) + const EVENT_BEAT_MT_MOON_1_TRAINER_1 ; 572, (D7F5, bit 2) + const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 573, (D7F5, bit 3) + const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 574, (D7F5, bit 4) + const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 575, (D7F5, bit 5) + const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 576, (D7F5, bit 6) + const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 577, (D7F5, bit 7) const EVENT_578 ; 578, (D7F6, bit 0) const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ; 579, (D7F6, bit 1) const EVENT_BEAT_MT_MOON_3_TRAINER_0 ; 57A, (D7F6, bit 2) - const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57B, (D7F6, bit 3) - const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57C, (D7F6, bit 4) - const EVENT_BEAT_MT_MOON_3_TRAINER_4 ; 57D, (D7F6, bit 5) + const EVENT_BEAT_MT_MOON_3_TRAINER_1 ; 57B, (D7F6, bit 3) + const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57C, (D7F6, bit 4) + const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57D, (D7F6, bit 5) const EVENT_GOT_DOME_FOSSIL ; 57E, (D7F6, bit 6) const EVENT_GOT_HELIX_FOSSIL ; 57F, (D7F6, bit 7) const EVENT_580 ; 580, (D7F7, bit 0) @@ -1634,9 +1634,9 @@ const_value = 0 const EVENT_65F ; 65F, (D812, bit 7) const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ; 660, (D813, bit 0) const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 ; 661, (D813, bit 1) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 662, (D813, bit 2) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 ; 663, (D813, bit 3) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 ; 664, (D813, bit 4) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 ; 662, (D813, bit 2) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 663, (D813, bit 3) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 ; 664, (D813, bit 4) const EVENT_665 ; 665, (D813, bit 5) const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 ; 666, (D813, bit 6) const EVENT_667 ; 667, (D813, bit 7) @@ -1650,10 +1650,10 @@ const_value = 0 const EVENT_66F ; 66F, (D814, bit 7) const EVENT_670 ; 670, (D815, bit 0) const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 ; 671, (D815, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 672, (D815, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 673, (D815, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 674, (D815, bit 4) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 ; 675, (D815, bit 5) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 ; 672, (D815, bit 2) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 673, (D815, bit 3) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 674, (D815, bit 4) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 675, (D815, bit 5) const EVENT_676 ; 676, (D815, bit 6) const EVENT_677 ; 677, (D815, bit 7) const EVENT_678 ; 678, (D816, bit 0) @@ -1682,7 +1682,7 @@ const_value = 0 const EVENT_68F ; 68F, (D818, bit 7) const EVENT_690 ; 690, (D819, bit 0) const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 ; 691, (D819, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 ; 692, (D819, bit 2) + const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 ; 692, (D819, bit 2) const EVENT_693 ; 693, (D819, bit 3) const EVENT_694 ; 694, (D819, bit 4) const EVENT_695 ; 695, (D819, bit 5) @@ -1699,8 +1699,8 @@ const_value = 0 const EVENT_6A0 ; 6A0, (D81B, bit 0) const EVENT_6A1 ; 6A1, (D81B, bit 1) const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 ; 6A2, (D81B, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 ; 6A3, (D81B, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 ; 6A4, (D81B, bit 4) + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 ; 6A3, (D81B, bit 3) + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 ; 6A4, (D81B, bit 4) const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED ; 6A5, (D81B, bit 5) const EVENT_ROCKET_DROPPED_LIFT_KEY ; 6A6, (D81B, bit 6) const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ; 6A7, (D81B, bit 7) @@ -1811,8 +1811,8 @@ const_value = 0 const EVENT_710 ; 710, (D829, bit 0) const EVENT_711 ; 711, (D829, bit 1) const EVENT_BEAT_SILPH_CO_4F_TRAINER_0 ; 712, (D829, bit 2) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 ; 713, (D829, bit 3) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_3 ; 714, (D829, bit 4) + const EVENT_BEAT_SILPH_CO_4F_TRAINER_1 ; 713, (D829, bit 3) + const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 ; 714, (D829, bit 4) const EVENT_715 ; 715, (D829, bit 5) const EVENT_716 ; 716, (D829, bit 6) const EVENT_717 ; 717, (D829, bit 7) @@ -1827,9 +1827,9 @@ const_value = 0 const EVENT_720 ; 720, (D82B, bit 0) const EVENT_721 ; 721, (D82B, bit 1) const EVENT_BEAT_SILPH_CO_5F_TRAINER_0 ; 722, (D82B, bit 2) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 723, (D82B, bit 3) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 ; 724, (D82B, bit 4) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_4 ; 725, (D82B, bit 5) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_1 ; 723, (D82B, bit 3) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 724, (D82B, bit 4) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 ; 725, (D82B, bit 5) const EVENT_726 ; 726, (D82B, bit 6) const EVENT_727 ; 727, (D82B, bit 7) const EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ; 728, (D82C, bit 0) @@ -1847,8 +1847,8 @@ const_value = 0 const EVENT_734 ; 734, (D82D, bit 4) const EVENT_735 ; 735, (D82D, bit 5) const EVENT_BEAT_SILPH_CO_6F_TRAINER_0 ; 736, (D82D, bit 6) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 ; 737, (D82D, bit 7) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_3 ; 738, (D82E, bit 0) + const EVENT_BEAT_SILPH_CO_6F_TRAINER_1 ; 737, (D82D, bit 7) + const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 ; 738, (D82E, bit 0) const EVENT_739 ; 739, (D82E, bit 1) const EVENT_73A ; 73A, (D82E, bit 2) const EVENT_73B ; 73B, (D82E, bit 3) @@ -1862,9 +1862,9 @@ const_value = 0 const EVENT_743 ; 743, (D82F, bit 3) const EVENT_744 ; 744, (D82F, bit 4) const EVENT_BEAT_SILPH_CO_7F_TRAINER_0 ; 745, (D82F, bit 5) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 746, (D82F, bit 6) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 ; 747, (D82F, bit 7) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_4 ; 748, (D830, bit 0) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_1 ; 746, (D82F, bit 6) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 747, (D82F, bit 7) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 ; 748, (D830, bit 0) const EVENT_749 ; 749, (D830, bit 1) const EVENT_74A ; 74A, (D830, bit 2) const EVENT_74B ; 74B, (D830, bit 3) @@ -2066,7 +2066,7 @@ const_value = 0 const EVENT_80F ; 80F, (D848, bit 7) const EVENT_810 ; 810, (D849, bit 0) const EVENT_BEAT_MANSION_3_TRAINER_0 ; 811, (D849, bit 1) - const EVENT_BEAT_MANSION_3_TRAINER_2 ; 812, (D849, bit 2) + const EVENT_BEAT_MANSION_3_TRAINER_1 ; 812, (D849, bit 2) const EVENT_813 ; 813, (D849, bit 3) const EVENT_814 ; 814, (D849, bit 4) const EVENT_815 ; 815, (D849, bit 5) @@ -2082,7 +2082,7 @@ const_value = 0 const EVENT_81F ; 81F, (D84A, bit 7) const EVENT_820 ; 820, (D84B, bit 0) const EVENT_BEAT_MANSION_4_TRAINER_0 ; 821, (D84B, bit 1) - const EVENT_BEAT_MANSION_4_TRAINER_2 ; 822, (D84B, bit 2) + const EVENT_BEAT_MANSION_4_TRAINER_1 ; 822, (D84B, bit 2) const EVENT_823 ; 823, (D84B, bit 3) const EVENT_824 ; 824, (D84B, bit 4) const EVENT_825 ; 825, (D84B, bit 5) @@ -2482,13 +2482,13 @@ const_value = 0 const EVENT_9AF ; 9AF, (D87C, bit 7) const EVENT_9B0 ; 9B0, (D87D, bit 0) const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 ; 9B1, (D87D, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B2, (D87D, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B3, (D87D, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B4, (D87D, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B5, (D87D, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B6, (D87D, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B7, (D87D, bit 7) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8 ; 9B8, (D87E, bit 0) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 ; 9B2, (D87D, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B3, (D87D, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B4, (D87D, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B5, (D87D, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B6, (D87D, bit 6) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B7, (D87D, bit 7) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B8, (D87E, bit 0) const EVENT_9B9 ; 9B9, (D87E, bit 1) const EVENT_9BA ; 9BA, (D87E, bit 2) const EVENT_9BB ; 9BB, (D87E, bit 3) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index cc10de70..57b19a37 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -105,12 +105,12 @@ QUESTION_BUBBLE EQU 1 SMILE_BUBBLE EQU 2 ; slot symbols -SLOTS7 EQU $0200 -SLOTSBAR EQU $0604 -SLOTSCHERRY EQU $0A08 -SLOTSFISH EQU $0E0C -SLOTSBIRD EQU $1210 -SLOTSMOUSE EQU $1614 +SLOTS7 EQU $0200 +SLOTSBAR EQU $0604 +SLOTSCHERRY EQU $0A08 +SLOTSFISH EQU $0E0C +SLOTSBIRD EQU $1210 +SLOTSMOUSE EQU $1614 ; party menu types NORMAL_PARTY_MENU EQU 0 @@ -200,3 +200,7 @@ LINK_STATE_START_BATTLE EQU $03 ; pre-battle initialisation LINK_STATE_BATTLING EQU $04 ; in a link battle LINK_STATE_RESET EQU $05 ; reset game (unused) LINK_STATE_TRADING EQU $32 ; in a link trade + +LINKBATTLE_RUN EQU $F +LINKBATTLE_STRUGGLE EQU $E +LINKBATTLE_NO_ACTION EQU $D diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index a56958ef..7a82c86e 100644 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,4 +1,4 @@ -db DEX_VICTREEBEL ; pokedex id +db DEX_VICTREEBEL ; pokedex id db 80 ; base hp db 105 ; base attack db 65 ; base defense diff --git a/data/evos_moves.asm b/data/evos_moves.asm index a668ea3e..2371fb83 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -29,8 +29,8 @@ EvosMovesPointerTable: dw Mon009_EvosMoves dw Mon127_EvosMoves dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo - dw Mon153_EvosMoves ;MissingNo + dw Mon152_EvosMoves ;MissingNo + dw Mon153_EvosMoves ;MissingNo dw Mon058_EvosMoves dw Mon095_EvosMoves dw Mon022_EvosMoves @@ -48,26 +48,26 @@ EvosMovesPointerTable: dw Mon054_EvosMoves dw Mon096_EvosMoves dw Mon076_EvosMoves - dw Mon154_EvosMoves ;MissingNo + dw Mon154_EvosMoves ;MissingNo dw Mon126_EvosMoves - dw Mon155_EvosMoves ;MissingNo + dw Mon155_EvosMoves ;MissingNo dw Mon125_EvosMoves dw Mon082_EvosMoves dw Mon109_EvosMoves - dw Mon156_EvosMoves ;MissingNo + dw Mon156_EvosMoves ;MissingNo dw Mon056_EvosMoves dw Mon086_EvosMoves dw Mon050_EvosMoves dw Mon128_EvosMoves - dw Mon157_EvosMoves ;MissingNo - dw Mon158_EvosMoves ;MissingNo - dw Mon159_EvosMoves ;MissingNo + dw Mon157_EvosMoves ;MissingNo + dw Mon158_EvosMoves ;MissingNo + dw Mon159_EvosMoves ;MissingNo dw Mon083_EvosMoves dw Mon048_EvosMoves dw Mon149_EvosMoves - dw Mon160_EvosMoves ;MissingNo - dw Mon161_EvosMoves ;MissingNo - dw Mon162_EvosMoves ;MissingNo + dw Mon160_EvosMoves ;MissingNo + dw Mon161_EvosMoves ;MissingNo + dw Mon162_EvosMoves ;MissingNo dw Mon084_EvosMoves dw Mon060_EvosMoves dw Mon124_EvosMoves @@ -77,23 +77,23 @@ EvosMovesPointerTable: dw Mon132_EvosMoves dw Mon052_EvosMoves dw Mon098_EvosMoves - dw Mon163_EvosMoves ;MissingNo - dw Mon164_EvosMoves ;MissingNo - dw Mon165_EvosMoves ;MissingNo + dw Mon163_EvosMoves ;MissingNo + dw Mon164_EvosMoves ;MissingNo + dw Mon165_EvosMoves ;MissingNo dw Mon037_EvosMoves dw Mon038_EvosMoves dw Mon025_EvosMoves dw Mon026_EvosMoves - dw Mon166_EvosMoves ;MissingNo - dw Mon167_EvosMoves ;MissingNo + dw Mon166_EvosMoves ;MissingNo + dw Mon167_EvosMoves ;MissingNo dw Mon147_EvosMoves dw Mon148_EvosMoves dw Mon140_EvosMoves dw Mon141_EvosMoves dw Mon116_EvosMoves dw Mon117_EvosMoves - dw Mon168_EvosMoves ;MissingNo - dw Mon169_EvosMoves ;MissingNo + dw Mon168_EvosMoves ;MissingNo + dw Mon169_EvosMoves ;MissingNo dw Mon027_EvosMoves dw Mon028_EvosMoves dw Mon138_EvosMoves @@ -113,38 +113,38 @@ EvosMovesPointerTable: dw Mon013_EvosMoves dw Mon014_EvosMoves dw Mon015_EvosMoves - dw Mon170_EvosMoves ;MissingNo + dw Mon170_EvosMoves ;MissingNo dw Mon085_EvosMoves dw Mon057_EvosMoves dw Mon051_EvosMoves dw Mon049_EvosMoves dw Mon087_EvosMoves - dw Mon171_EvosMoves ;MissingNo - dw Mon172_EvosMoves ;MissingNo + dw Mon171_EvosMoves ;MissingNo + dw Mon172_EvosMoves ;MissingNo dw Mon010_EvosMoves dw Mon011_EvosMoves dw Mon012_EvosMoves dw Mon068_EvosMoves - dw Mon173_EvosMoves ;MissingNo + dw Mon173_EvosMoves ;MissingNo dw Mon055_EvosMoves dw Mon097_EvosMoves dw Mon042_EvosMoves dw Mon150_EvosMoves dw Mon143_EvosMoves dw Mon129_EvosMoves - dw Mon174_EvosMoves ;MissingNo - dw Mon175_EvosMoves ;MissingNo + dw Mon174_EvosMoves ;MissingNo + dw Mon175_EvosMoves ;MissingNo dw Mon089_EvosMoves - dw Mon176_EvosMoves ;MissingNo + dw Mon176_EvosMoves ;MissingNo dw Mon099_EvosMoves dw Mon091_EvosMoves - dw Mon177_EvosMoves ;MissingNo + dw Mon177_EvosMoves ;MissingNo dw Mon101_EvosMoves dw Mon036_EvosMoves dw Mon110_EvosMoves dw Mon053_EvosMoves dw Mon105_EvosMoves - dw Mon178_EvosMoves ;MissingNo + dw Mon178_EvosMoves ;MissingNo dw Mon093_EvosMoves dw Mon063_EvosMoves dw Mon065_EvosMoves @@ -154,13 +154,13 @@ EvosMovesPointerTable: dw Mon001_EvosMoves dw Mon003_EvosMoves dw Mon073_EvosMoves - dw Mon179_EvosMoves ;MissingNo + dw Mon179_EvosMoves ;MissingNo dw Mon118_EvosMoves dw Mon119_EvosMoves - dw Mon180_EvosMoves ;MissingNo - dw Mon181_EvosMoves ;MissingNo - dw Mon182_EvosMoves ;MissingNo - dw Mon183_EvosMoves ;MissingNo + dw Mon180_EvosMoves ;MissingNo + dw Mon181_EvosMoves ;MissingNo + dw Mon182_EvosMoves ;MissingNo + dw Mon183_EvosMoves ;MissingNo dw Mon077_EvosMoves dw Mon078_EvosMoves dw Mon019_EvosMoves @@ -170,19 +170,19 @@ EvosMovesPointerTable: dw Mon074_EvosMoves dw Mon137_EvosMoves dw Mon142_EvosMoves - dw Mon184_EvosMoves ;MissingNo + dw Mon184_EvosMoves ;MissingNo dw Mon081_EvosMoves - dw Mon185_EvosMoves ;MissingNo - dw Mon186_EvosMoves ;MissingNo + dw Mon185_EvosMoves ;MissingNo + dw Mon186_EvosMoves ;MissingNo dw Mon004_EvosMoves dw Mon007_EvosMoves dw Mon005_EvosMoves dw Mon008_EvosMoves dw Mon006_EvosMoves - dw Mon187_EvosMoves ;MissingNo - dw Mon188_EvosMoves ;MissingNo - dw Mon189_EvosMoves ;MissingNo - dw Mon190_EvosMoves ;MissingNo + dw Mon187_EvosMoves ;MissingNo + dw Mon188_EvosMoves ;MissingNo + dw Mon189_EvosMoves ;MissingNo + dw Mon190_EvosMoves ;MissingNo dw Mon043_EvosMoves dw Mon044_EvosMoves dw Mon045_EvosMoves diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index f3ea62ef..1fa4b64a 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -266,8 +266,8 @@ MapHSPointers: ; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) ; These constants come from the bytes for Predef functions: -Hide equ $11 -Show equ $15 +Hide equ $11 +Show equ $15 MapHSXX: db $FF,$FF,$FF diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index d83e7b4e..987d8d28 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -1,77 +1,77 @@ MonPartyData: - dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur - dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander - dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard - dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle - dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie - dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree - dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna - dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow - dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok - dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu - dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash - dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina - dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM - dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking - dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales - dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff - dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat - dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom - dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras - dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat - dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett - dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth - dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck - dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey - dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe - dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag - dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath - dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra - dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop - dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp - dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell - dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool - dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude - dn SPRITE_MON, SPRITE_MON ;Graveler/Golem - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash - dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro - dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo - dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel - dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer - dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder - dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly - dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar - dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee - dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby - dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb - dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute - dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone - dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee - dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung - dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing - dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon - dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela - dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea - dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen - dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu - dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime - dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx - dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar - dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros - dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados - dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon - dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte - dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto - dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl - dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres - dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair - dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding + dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur + dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander + dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard + dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle + dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie + dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree + dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna + dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow + dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok + dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu + dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash + dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina + dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM + dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking + dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales + dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff + dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat + dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom + dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras + dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat + dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett + dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth + dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck + dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey + dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe + dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag + dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath + dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra + dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop + dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp + dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell + dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool + dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude + dn SPRITE_MON, SPRITE_MON ;Graveler/Golem + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash + dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro + dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo + dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel + dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer + dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder + dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly + dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar + dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee + dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby + dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb + dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute + dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone + dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee + dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung + dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing + dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon + dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela + dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea + dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen + dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu + dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime + dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx + dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar + dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros + dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados + dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon + dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte + dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto + dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl + dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres + dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair + dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo + dn SPRITE_MON, 0 ;Mew/Padding diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 0fe55731..0ac69e5e 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1254,6 +1254,6 @@ VictreebelDexEntry: MissingNoDexEntry: db "???@" - db 10 - db 100 - db 0,"コメント さくせいちゅう@" + db 10 ; 1.0 m + db 100 ; 10.0 kg + db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index c186dd00..0c586dad 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -60,16 +60,22 @@ YoungsterData: ; Route 3 db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 +; Mt. Moon 1F db 10,RATTATA,RATTATA,ZUBAT,0 +; Route 24 db 14,RATTATA,EKANS,ZUBAT,0 +; Route 25 db 15,RATTATA,SPEAROW,0 db 17,SLOWPOKE,0 db 14,EKANS,SANDSHREW,0 +; SS Anne 1F Rooms db 21,NIDORAN_M,0 +; Route 11 db 21,EKANS,0 db 19,SANDSHREW,ZUBAT,0 db 17,RATTATA,RATTATA,RATICATE,0 db 18,NIDORAN_M,NIDORINO,0 +; Unused db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 BugCatcherData: ; Viridian Forest @@ -80,12 +86,17 @@ BugCatcherData: db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 +; Mt. Moon 1F db 11,WEEDLE,KAKUNA,0 db 10,CATERPIE,METAPOD,CATERPIE,0 +; Route 24 db 14,CATERPIE,WEEDLE,0 +; Route 6 db 16,WEEDLE,CATERPIE,WEEDLE,0 db 20,BUTTERFREE,0 +; Unused db 18,METAPOD,CATERPIE,VENONAT,0 +; Route 9 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 LassData: @@ -93,147 +104,213 @@ LassData: db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 +; Route 4 db 31,PARAS,PARAS,PARASECT,0 +; Mt. Moon 1F db 11,ODDISH,BELLSPROUT,0 db 14,CLEFAIRY,0 +; Route 24 db 16,PIDGEY,NIDORAN_F,0 db 14,PIDGEY,NIDORAN_F,0 +; Route 25 db 15,NIDORAN_M,NIDORAN_F,0 db 13,ODDISH,PIDGEY,ODDISH,0 +; SS Anne 1F Rooms db 18,PIDGEY,NIDORAN_F,0 +; SS Anne 2F Rooms db 18,RATTATA,PIKACHU,0 +; Route 8 db 23,NIDORAN_F,NIDORINA,0 db 24,MEOWTH,MEOWTH,MEOWTH,0 db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 db 22,CLEFAIRY,CLEFAIRY,0 +; Celadon Gym db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 SailorData: +; SS Anne Stern db 18,MACHOP,SHELLDER,0 db 17,MACHOP,TENTACOOL,0 +; SS Anne B1F Rooms db 21,SHELLDER,0 db 17,HORSEA,SHELLDER,TENTACOOL,0 db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 +; Vermilion Gym db 21,PIKACHU,PIKACHU,0 JrTrainerMData: +; Pewter Gym db 11,DIGLETT,SANDSHREW,0 +; Route 24/Route 25 db 14,RATTATA,EKANS,0 +; Route 24 db 18,MANKEY,0 +; Route 6 db 20,SQUIRTLE,0 db 16,SPEAROW,RATICATE,0 +; Unused db 18,DIGLETT,DIGLETT,SANDSHREW,0 +; Route 9 db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 +; Route 12 db 29,NIDORAN_M,NIDORINO,0 JrTrainerFData: +; Cerulean Gym db 19,GOLDEEN,0 +; Route 6 db 16,RATTATA,PIKACHU,0 db 16,PIDGEY,PIDGEY,PIDGEY,0 +; Unused db 22,BULBASAUR,0 +; Route 9 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 +; Route 10 db 20,PIKACHU,CLEFAIRY,0 db 21,PIDGEY,PIDGEOTTO,0 +; Rock Tunnel B1F db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 +; Celadon Gym db 24,BULBASAUR,IVYSAUR,0 +; Route 13 db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 db 30,POLIWAG,POLIWAG,0 db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 db 28,GOLDEEN,POLIWAG,HORSEA,0 +; Route 20 db 31,GOLDEEN,SEAKING,0 +; Rock Tunnel 1F db 22,BELLSPROUT,CLEFAIRY,0 db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 +; Route 15 db 28,GLOOM,ODDISH,ODDISH,0 db 29,PIKACHU,RAICHU,0 db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 +; Route 20 db 30,TENTACOOL,HORSEA,SEEL,0 PokemaniacData: +; Route 10 db 30,RHYHORN,LICKITUNG,0 db 20,CUBONE,SLOWPOKE,0 +; Rock Tunnel B1F db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 db 22,CHARMANDER,CUBONE,0 db 25,SLOWPOKE,0 +; Victory Road 2F db 40,CHARMELEON,LAPRAS,LICKITUNG,0 +; Rock Tunnel 1F db 23,CUBONE,SLOWPOKE,0 SuperNerdData: +; Mt. Moon 1F db 11,MAGNEMITE,VOLTORB,0 +; Mt. Moon B2F db 12,GRIMER,VOLTORB,KOFFING,0 +; Route 8 db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 db 22,GRIMER,MUK,GRIMER,0 db 26,KOFFING,0 +; Unused db 22,KOFFING,MAGNEMITE,WEEZING,0 db 20,MAGNEMITE,MAGNEMITE,KOFFING,MAGNEMITE,0 db 24,MAGNEMITE,VOLTORB,0 +; Cinnabar Gym db 36,VULPIX,VULPIX,NINETALES,0 db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 db 41,RAPIDASH,0 db 37,GROWLITHE,VULPIX,0 HikerData: +; Mt. Moon 1F db 10,GEODUDE,GEODUDE,ONIX,0 +; Route 25 db 15,MACHOP,GEODUDE,0 db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 db 17,ONIX,0 +; Route 9 db 21,GEODUDE,ONIX,0 db 20,GEODUDE,MACHOP,GEODUDE,0 +; Route 10 db 21,GEODUDE,ONIX,0 db 19,ONIX,GRAVELER,0 +; Rock Tunnel B1F db 21,GEODUDE,GEODUDE,GRAVELER,0 db 25,GEODUDE,0 +; Route 9/Rock Tunnel B1F db 20,MACHOP,ONIX,0 +; Rock Tunnel 1F db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 db 20,ONIX,ONIX,GEODUDE,0 db 21,GEODUDE,GRAVELER,0 BikerData: +; Route 13 db 28,KOFFING,KOFFING,KOFFING,0 +; Route 14 db 29,KOFFING,GRIMER,0 +; Route 15 db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 db 28,KOFFING,GRIMER,WEEZING,0 +; Route 16 db 29,GRIMER,KOFFING,0 db 33,WEEZING,0 db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 +; Route 17 db 28,WEEZING,KOFFING,WEEZING,0 db 33,MUK,0 db 29,VOLTORB,VOLTORB,0 db 29,WEEZING,MUK,0 db 25,KOFFING,WEEZING,KOFFING,KOFFING,WEEZING,0 +; Route 14 db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 db 28,GRIMER,GRIMER,KOFFING,0 db 29,KOFFING,MUK,0 BurglarData: +; Unused db 29,GROWLITHE,VULPIX,0 db 33,GROWLITHE,0 db 28,VULPIX,CHARMANDER,PONYTA,0 +; Cinnabar Gym db 36,GROWLITHE,VULPIX,NINETALES,0 db 41,PONYTA,0 db 37,VULPIX,GROWLITHE,0 +; Mansion 2F db 34,CHARMANDER,CHARMELEON,0 +; Mansion 3F db 38,NINETALES,0 +; Mansion B1F db 34,GROWLITHE,PONYTA,0 EngineerData: +; Unused db 21,VOLTORB,MAGNEMITE,0 +; Route 11 db 21,MAGNEMITE,0 db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 Juggler1Data: ; none FisherData: +; SS Anne 2F Rooms db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 +; SS Anne B1F Rooms db 17,TENTACOOL,STARYU,SHELLDER,0 +; Route 12 db 22,GOLDEEN,POLIWAG,GOLDEEN,0 db 24,TENTACOOL,GOLDEEN,0 db 27,GOLDEEN,0 db 21,POLIWAG,SHELLDER,GOLDEEN,HORSEA,0 +; Route 21 db 28,SEAKING,GOLDEEN,SEAKING,SEAKING,0 db 31,SHELLDER,CLOYSTER,0 db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 db 33,SEAKING,GOLDEEN,0 +; Route 12 db 24,MAGIKARP,MAGIKARP,0 SwimmerData: +; Cerulean Gym db 16,HORSEA,SHELLDER,0 +; Route 19 db 30,TENTACOOL,SHELLDER,0 db 29,GOLDEEN,HORSEA,STARYU,0 db 30,POLIWAG,POLIWHIRL,0 @@ -241,192 +318,280 @@ SwimmerData: db 29,GOLDEEN,SHELLDER,SEAKING,0 db 30,HORSEA,HORSEA,0 db 27,TENTACOOL,TENTACOOL,STARYU,HORSEA,TENTACRUEL,0 +; Route 20 db 31,SHELLDER,CLOYSTER,0 db 35,STARYU,0 db 28,HORSEA,HORSEA,SEADRA,HORSEA,0 +; Route 21 db 33,SEADRA,TENTACRUEL,0 db 37,STARMIE,0 db 33,STARYU,WARTORTLE,0 db 32,POLIWHIRL,TENTACOOL,SEADRA,0 CueBallData: +; Route 16 db 28,MACHOP,MANKEY,MACHOP,0 db 29,MANKEY,MACHOP,0 db 33,MACHOP,0 +; Route 17 db 29,MANKEY,PRIMEAPE,0 db 29,MACHOP,MACHOKE,0 db 33,MACHOKE,0 db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 db 29,PRIMEAPE,MACHOKE,0 +; Route 21 db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 GamblerData: +; Route 11 db 18,POLIWAG,HORSEA,0 db 18,BELLSPROUT,ODDISH,0 db 18,VOLTORB,MAGNEMITE,0 db 18,GROWLITHE,VULPIX,0 +; Route 8 db 22,POLIWAG,POLIWAG,POLIWHIRL,0 +; Unused db 22,ONIX,GEODUDE,GRAVELER,0 +; Route 8 db 24,GROWLITHE,VULPIX,0 BeautyData: +; Celadon Gym db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 +; Route 13 db 27,RATTATA,PIKACHU,RATTATA,0 db 29,CLEFAIRY,MEOWTH,0 +; Route 20 db 35,SEAKING,0 db 30,SHELLDER,SHELLDER,CLOYSTER,0 db 31,POLIWAG,SEAKING,0 +; Route 15 db 29,PIDGEOTTO,WIGGLYTUFF,0 db 29,BULBASAUR,IVYSAUR,0 +; Unused db 33,WEEPINBELL,BELLSPROUT,WEEPINBELL,0 +; Route 19 db 27,POLIWAG,GOLDEEN,SEAKING,GOLDEEN,POLIWAG,0 db 30,GOLDEEN,SEAKING,0 db 29,STARYU,STARYU,STARYU,0 +; Route 20 db 30,SEADRA,HORSEA,SEADRA,0 PsychicData: +; Saffron Gym db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 db 34,MR_MIME,KADABRA,0 db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 RockerData: +; Vermilion Gym db 20,VOLTORB,MAGNEMITE,VOLTORB,0 +; Route 12 db 29,VOLTORB,ELECTRODE,0 JugglerData: +; Silph Co. 5F db 29,KADABRA,MR_MIME,0 +; Victory Road 2F db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 +; Fucshia Gym db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 +; Victory Road 2F db 48,MR_MIME,0 +; Unused db 33,HYPNO,0 +; Fucshia Gym db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 TamerData: +; Fucshia Gym db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 +; Viridian Gym db 43,RHYHORN,0 db 39,ARBOK,TAUROS,0 +; Victory Road 2F db 44,PERSIAN,GOLDUCK,0 +; Unused db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 BirdKeeperData: +; Route 13 db 29,PIDGEY,PIDGEOTTO,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 +; Route 14 db 33,FARFETCHD,0 db 29,SPEAROW,FEAROW,0 +; Route 15 db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 db 28,DODRIO,DODUO,DODUO,0 +; Route 18 db 29,SPEAROW,FEAROW,0 db 34,DODRIO,0 db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 +; Route 20 db 30,FEAROW,FEAROW,PIDGEOTTO,0 +; Unused db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 db 42,FARFETCHD,FEAROW,0 +; Route 14 db 28,PIDGEY,DODUO,PIDGEOTTO,0 db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0 db 28,SPEAROW,DODUO,FEAROW,0 BlackbeltData: +; Fighting Dojo db 37,HITMONLEE,HITMONCHAN,0 db 31,MANKEY,MANKEY,PRIMEAPE,0 db 32,MACHOP,MACHOKE,0 db 36,PRIMEAPE,0 db 31,MACHOP,MANKEY,PRIMEAPE,0 +; Viridian Gym db 40,MACHOP,MACHOKE,0 db 43,MACHOKE,0 db 38,MACHOKE,MACHOP,MACHOKE,0 +; Victory Road 2F db 43,MACHOKE,MACHOP,MACHOKE,0 Green1Data: db 5,SQUIRTLE,0 db 5,BULBASAUR,0 db 5,CHARMANDER,0 +; Route 22 db $FF,9,PIDGEY,8,SQUIRTLE,0 db $FF,9,PIDGEY,8,BULBASAUR,0 db $FF,9,PIDGEY,8,CHARMANDER,0 +; Cerulean City db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 ProfOakData: +; Unused db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 ChiefData: ; none ScientistData: +; Unused db 34,KOFFING,VOLTORB,0 +; Silph Co. 2F db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 db 28,MAGNEMITE,VOLTORB,MAGNETON,0 +; Silph Co. 3F/Mansion 1F db 29,ELECTRODE,WEEZING,0 +; Silph Co. 4F db 33,ELECTRODE,0 +; Silph Co. 5F db 26,MAGNETON,KOFFING,WEEZING,MAGNEMITE,0 +; Silph Co. 6F db 25,VOLTORB,KOFFING,MAGNETON,MAGNEMITE,KOFFING,0 +; Silph Co. 7F db 29,ELECTRODE,MUK,0 +; Silph Co. 8F db 29,GRIMER,ELECTRODE,0 +; Silph Co. 9F db 28,VOLTORB,KOFFING,MAGNETON,0 +; Silph Co. 10F db 29,MAGNEMITE,KOFFING,0 +; Mansion 3F db 33,MAGNEMITE,MAGNETON,VOLTORB,0 +; Mansion B1F db 34,MAGNEMITE,ELECTRODE,0 GiovanniData: +; Rocket Hideout B4F db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 +; Silph Co. 11F db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 +; Viridian Gym db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 RocketData: +; Mt. Moon B2F db 13,RATTATA,ZUBAT,0 db 11,SANDSHREW,RATTATA,ZUBAT,0 db 12,ZUBAT,EKANS,0 db 16,RATICATE,0 +; Cerulean City db 17,MACHOP,DROWZEE,0 +; Route 24 db 15,EKANS,ZUBAT,0 +; Game Corner db 20,RATICATE,ZUBAT,0 +; Rocket Hideout B1F db 21,DROWZEE,MACHOP,0 db 21,RATICATE,RATICATE,0 db 20,GRIMER,KOFFING,KOFFING,0 db 19,RATTATA,RATICATE,RATICATE,RATTATA,0 db 22,GRIMER,KOFFING,0 +; Rocket Hideout B2F db 17,ZUBAT,KOFFING,GRIMER,ZUBAT,RATICATE,0 +; Rocket Hideout B3F db 20,RATTATA,RATICATE,DROWZEE,0 db 21,MACHOP,MACHOP,0 +; Rocket Hideout B4F db 23,SANDSHREW,EKANS,SANDSLASH,0 db 23,EKANS,SANDSHREW,ARBOK,0 db 21,KOFFING,ZUBAT,0 +; Pokémon Tower 7F db 25,ZUBAT,ZUBAT,GOLBAT,0 db 26,KOFFING,DROWZEE,0 db 23,ZUBAT,RATTATA,RATICATE,ZUBAT,0 +; Unused db 26,DROWZEE,KOFFING,0 +; Silph Co. 2F db 29,CUBONE,ZUBAT,0 db 25,GOLBAT,ZUBAT,ZUBAT,RATICATE,ZUBAT,0 +; Silph Co. 3F db 28,RATICATE,HYPNO,RATICATE,0 +; Silph Co. 4F db 29,MACHOP,DROWZEE,0 db 28,EKANS,ZUBAT,CUBONE,0 +; Silph Co. 5F db 33,ARBOK,0 db 33,HYPNO,0 +; Silph Co. 6F db 29,MACHOP,MACHOKE,0 db 28,ZUBAT,ZUBAT,GOLBAT,0 +; Silph Co. 7F db 26,RATICATE,ARBOK,KOFFING,GOLBAT,0 db 29,CUBONE,CUBONE,0 db 29,SANDSHREW,SANDSLASH,0 +; Silph Co. 8F db 26,RATICATE,ZUBAT,GOLBAT,RATTATA,0 db 28,WEEZING,GOLBAT,KOFFING,0 +; Silph Co. 9F db 28,DROWZEE,GRIMER,MACHOP,0 db 28,GOLBAT,DROWZEE,HYPNO,0 +; Silph Co. 10F db 33,MACHOKE,0 +; Silph Co. 11F db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 CooltrainerMData: +; Viridian Gym db 39,NIDORINO,NIDOKING,0 +; Victory Road 3F db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 db 43,KINGLER,TENTACRUEL,BLASTOISE,0 +; Unused db 45,KINGLER,STARMIE,0 +; Victory Road 1F db 42,IVYSAUR,WARTORTLE,CHARMELEON,CHARIZARD,0 +; Unused db 44,IVYSAUR,WARTORTLE,CHARMELEON,0 db 49,NIDOKING,0 db 44,KINGLER,CLOYSTER,0 +; Viridian Gym db 39,SANDSLASH,DUGTRIO,0 db 43,RHYHORN,0 CooltrainerFData: +; Celadon Gym db 24,WEEPINBELL,GLOOM,IVYSAUR,0 +; Victory Road 3F db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 db 43,PARASECT,DEWGONG,CHANSEY,0 +; Unused db 46,VILEPLUME,BUTTERFREE,0 +; Victory Road 1F db 44,PERSIAN,NINETALES,0 +; Unused db 45,IVYSAUR,VENUSAUR,0 db 45,NIDORINA,NIDOQUEEN,0 db 43,PERSIAN,NINETALES,RAICHU,0 @@ -447,21 +612,29 @@ BlaineData: SabrinaData: db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 GentlemanData: +; SS Anne 1F Rooms db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 +; SS Anne 2F Rooms/Vermilion Gym db 23,PIKACHU,0 +; Unused db 48,PRIMEAPE,0 +; SS Anne 2F Rooms db 17,GROWLITHE,PONYTA,0 Green2Data: +; SS Anne 2F db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 +; Pokémon Tower 2F db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0 db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0 db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0 +; Silph Co. 7F db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0 db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0 db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0 +; Route 22 db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 @@ -472,27 +645,40 @@ Green3Data: LoreleiData: db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 ChannelerData: +; Unused db 22,GASTLY,0 db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 db 24,GASTLY,0 +; Pokémon Tower 3F db 23,GASTLY,0 db 24,GASTLY,0 +; Unused db 24,HAUNTER,0 +; Pokémon Tower 3F db 22,GASTLY,0 +; Pokémon Tower 4F db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 4F db 22,GASTLY,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 5F db 23,HAUNTER,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 5F db 22,GASTLY,0 db 24,GASTLY,0 db 22,HAUNTER,0 +; Pokémon Tower 6F db 22,GASTLY,GASTLY,GASTLY,0 db 24,GASTLY,0 db 24,GASTLY,0 +; Saffron Gym db 34,GASTLY,HAUNTER,0 db 38,HAUNTER,0 db 33,GASTLY,GASTLY,HAUNTER,0 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index a4265565..a2c9d6b2 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -253,12 +253,12 @@ WildDataPointers: ; first part: pokemon found in grass ; second part: pokemon found while surfing ; each part goes as follows: - ; if first byte == 00, then - ; no wild pokemon on this map - ; if first byte != 00, then - ; first byte is encounter rate - ; followed by 20 bytes: - ; level, species (ten times) + ; if first byte == 00, then + ; no wild pokemon on this map + ; if first byte != 00, then + ; first byte is encounter rate + ; followed by 20 bytes: + ; level, species (ten times) INCLUDE "data/wildPokemon/nomons.asm" INCLUDE "data/wildPokemon/route1.asm" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 1d7cd474..a0c4ba6a 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -432,13 +432,13 @@ MainInBattleLoop: jr nz, .noLinkBattle ; link battle ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN jp z, EnemyRan - cp $e + cp LINKBATTLE_STRUGGLE jr z, .noLinkBattle - cp $d + cp LINKBATTLE_NO_ACTION jr z, .noLinkBattle - sub $4 + sub 4 jr c, .noLinkBattle ; the link battle enemy has switched mons ld a, [wPlayerBattleStatus1] @@ -488,8 +488,8 @@ MainInBattleLoop: jr nc, .playerMovesFirst ; if player is faster jr .enemyMovesFirst ; if enemy is faster .speedEqual ; 50/50 chance for both players - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom cp $80 @@ -872,7 +872,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -956,7 +956,7 @@ EndLowHealthAlarm: ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wLowHealthAlarm], a ; turn off low health alarm - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -990,7 +990,7 @@ ReplaceFaintedEnemyMon: ; link battle call LinkBattleExchangeData ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN ret z call LoadScreenTilesFromBuffer1 .notLinkBattle @@ -1679,12 +1679,12 @@ TryRunningFromBattle: call SaveScreenTilesToBuffer1 xor a ld [wActionResultOrTookBattleTurn], a - ld a, $f + ld a, LINKBATTLE_RUN ld [wPlayerMoveListIndex], a call LinkBattleExchangeData call LoadScreenTilesFromBuffer1 ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN ld a, $2 jr z, .playSound dec a @@ -1954,7 +1954,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm @@ -3000,16 +3000,16 @@ SelectEnemyMove: call LinkBattleExchangeData call LoadScreenTilesFromBuffer1 ld a, [wSerialExchangeNybbleReceiveData] - cp $e + cp LINKBATTLE_STRUGGLE jp z, .linkedOpponentUsedStruggle - cp $d + cp LINKBATTLE_NO_ACTION jr z, .unableToSelectMove - cp $4 + cp 4 ret nc ld [wEnemyMoveListIndex], a ld c, a ld hl, wEnemyMonMoves - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] jr .done @@ -3088,7 +3088,7 @@ LinkBattleExchangeData: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a ld a, [wPlayerMoveListIndex] - cp $f ; is the player running from battle? + cp LINKBATTLE_RUN ; is the player running from battle? jr z, .doExchange ld a, [wActionResultOrTookBattleTurn] and a ; is the player switching in another mon? @@ -3096,10 +3096,10 @@ LinkBattleExchangeData: ; the player used a move ld a, [wPlayerSelectedMove] cp STRUGGLE - ld b, $e + ld b, LINKBATTLE_STRUGGLE jr z, .next - dec b - inc a + dec b ; LINKBATTLE_NO_ACTION + inc a ; does move equal -1 (i.e. no action)? jr z, .next ld a, [wPlayerMoveListIndex] jr .doExchange @@ -4503,10 +4503,10 @@ GetEnemyMonStat: CalculateDamage: ; input: -; b: attack -; c: opponent defense -; d: base power -; e: level +; b: attack +; c: opponent defense +; d: base power +; e: level ld a, [H_WHOSETURN] ; whose turn? and a @@ -5677,9 +5677,9 @@ ExecuteEnemyMove: jr nz, .executeEnemyMove ld b, $1 ld a, [wSerialExchangeNybbleReceiveData] - cp $e + cp LINKBATTLE_STRUGGLE jr z, .executeEnemyMove - cp $4 + cp 4 ret nc .executeEnemyMove ld hl, wAILayer2Encouragement @@ -7517,7 +7517,7 @@ FrozenText: CheckDefrost: ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target - and a, 1 << FRZ ; are they frozen? + and a, 1 << FRZ ; are they frozen? ret z ; return if so ld a, [H_WHOSETURN] and a @@ -7526,7 +7526,7 @@ CheckDefrost: ld a, [wPlayerMoveType] sub a, FIRE ret nz ; return if type of move used isn't fire - ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] + ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] ld hl, wEnemyMon1Status ld a, [wEnemyMonPartyPos] ld bc, wEnemyMon2 - wEnemyMon1 @@ -7536,7 +7536,7 @@ CheckDefrost: ld hl, FireDefrostedText jr .common .opponent - ld a, [wEnemyMoveType] ; same as above with addresses swapped + ld a, [wEnemyMoveType] ; same as above with addresses swapped sub a, FIRE ret nz ld [wBattleMonStatus], a @@ -8052,9 +8052,8 @@ SwitchAndTeleportEffect: cp c ; get a random number between 0 and c jr nc, .rejectionSampleLoop1 srl b - srl b ; b = enemy level * 4 -; bug: does not account for overflow, so levels above 63 can lead to erroneousness results - cp b ; is rand[0, playerLevel + enemyLevel] > enemyLevel? + srl b ; b = enemyLevel / 4 + cp b ; is rand[0, playerLevel + enemyLevel) >= (enemyLevel / 4)? jr nc, .playerMoveWasSuccessful ; if so, allow teleporting ld c, 50 call DelayFrames diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 368cb00a..92a1bcda 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 9aee8bd7..24748338 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -119,11 +119,11 @@ GainExperience: ld d, MAX_LEVEL callab CalcExperience ; get max exp ; compare max exp with current exp - ld a, [$ff96] + ld a, [hExperience] ld b, a - ld a, [$ff97] + ld a, [hExperience + 1] ld c, a - ld a, [$ff98] + ld a, [hExperience + 2] ld d, a pop hl ld a, [hld] diff --git a/engine/black_out.asm b/engine/black_out.asm new file mode 100644 index 00000000..6c358ce3 --- /dev/null +++ b/engine/black_out.asm @@ -0,0 +1,46 @@ +ResetStatusAndHalveMoneyOnBlackout:: +; Reset player status on blackout. + xor a + ld [wBattleResult], a + ld [wWalkBikeSurfState], a + ld [wIsInBattle], a + ld [wMapPalOffset], a + ld [wNPCMovementScriptFunctionNum], a + ld [hJoyHeld], a + ld [wNPCMovementScriptPointerTableNum], a + ld [wFlags_0xcd60], a + + ld [hMoney], a + ld [hMoney + 1], a + ld [hMoney + 2], a + call HasEnoughMoney + jr c, .lostmoney ; never happens + + ; Halve the player's money. + ld a, [wPlayerMoney] + ld [hMoney], a + ld a, [wPlayerMoney + 1] + ld [hMoney + 1], a + ld a, [wPlayerMoney + 2] + ld [hMoney + 2], a + xor a + ld [hDivideBCDDivisor], a + ld [hDivideBCDDivisor + 1], a + ld a, 2 + ld [hDivideBCDDivisor + 2], a + predef DivideBCDPredef3 + ld a, [hDivideBCDQuotient] + ld [wPlayerMoney], a + ld a, [hDivideBCDQuotient + 1] + ld [wPlayerMoney + 1], a + ld a, [hDivideBCDQuotient + 2] + ld [wPlayerMoney + 2], a + +.lostmoney + ld hl, wd732 + set 2, [hl] + res 3, [hl] + set 6, [hl] + ld a, %11111111 + ld [wJoyIgnore], a + predef_jump HealParty diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 70be26c2..a488e8f1 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -551,7 +551,7 @@ TradeCenter_SelectMon: Coorda 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity - ld a, [$ffb5] + ld a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop bit 0, a ; A button pressed? @@ -914,7 +914,7 @@ CableClub_Run: ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a - ld [$ffb5], a + ld [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a ld a, BANK(Music_Celadon) diff --git a/engine/debug1.asm b/engine/debug1.asm new file mode 100644 index 00000000..a5eb7dde --- /dev/null +++ b/engine/debug1.asm @@ -0,0 +1,33 @@ +; This function appears to never be used. +; It is likely a debugging feature to give the player Tsunekazu Ishihara's +; favorite Pokemon. This is indicated by the overpowered Exeggutor, which +; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC +; interview on February 8, 2000. +; "Exeggutor is my favorite. That's because I was always using this character +; while I was debugging the program." +; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript + +SetIshiharaTeam: + ld de, IshiharaTeam +.loop + ld a, [de] + cp $ff + ret z + ld [wcf91], a + inc de + ld a, [de] + ld [wCurEnemyLVL], a + inc de + call AddPartyMon + jr .loop + +IshiharaTeam: + db EXEGGUTOR,90 + db MEW,20 + db JOLTEON,56 + db DUGTRIO,56 + db ARTICUNO,57 + db $FF + +EmptyFunc: + ret diff --git a/engine/display_pokedex.asm b/engine/display_pokedex.asm new file mode 100644 index 00000000..96a2dd6c --- /dev/null +++ b/engine/display_pokedex.asm @@ -0,0 +1,19 @@ +_DisplayPokedex: + ld hl, wd730 + set 6, [hl] + predef ShowPokedexData + ld hl, wd730 + res 6, [hl] + call ReloadMapData + ld c, 10 + call DelayFrames + predef IndexToPokedex + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + ld hl, wPokedexSeen + predef FlagActionPredef + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret diff --git a/engine/display_text_id_init.asm b/engine/display_text_id_init.asm new file mode 100644 index 00000000..312d6329 --- /dev/null +++ b/engine/display_text_id_init.asm @@ -0,0 +1,78 @@ +; function that performs initialization for DisplayTextID +DisplayTextIDInit: + xor a + ld [wListMenuID],a + ld a,[wAutoTextBoxDrawingControl] + bit 0,a + jr nz,.skipDrawingTextBoxBorder + ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) + and a + jr nz,.notStartMenu +; if text ID is 0 (i.e. the start menu) +; Note that the start menu text border is also drawn in the function directly +; below this, so this seems unnecessary. + CheckEvent EVENT_GOT_POKEDEX +; start menu with pokedex + coord hl, 10, 0 + ld b,$0e + ld c,$08 + jr nz,.drawTextBoxBorder +; start menu without pokedex + coord hl, 10, 0 + ld b,$0c + ld c,$08 + jr .drawTextBoxBorder +; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box +.notStartMenu + coord hl, 0, 12 + ld b,$04 + ld c,$12 +.drawTextBoxBorder + call TextBoxBorder +.skipDrawingTextBoxBorder + ld hl,wFontLoaded + set 0,[hl] + ld hl,wFlags_0xcd60 + bit 4,[hl] + res 4,[hl] + jr nz,.skipMovingSprites + call UpdateSprites +.skipMovingSprites +; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite +; this is done because when you talk to an NPC, they turn to look your way +; the original direction they were facing must be restored after the dialogue is over + ld hl,wSpriteStateData1 + $19 + ld c,$0f + ld de,$0010 +.spriteFacingDirectionCopyLoop + ld a,[hl] + inc h + ld [hl],a + dec h + add hl,de + dec c + jr nz,.spriteFacingDirectionCopyLoop +; loop to force all the sprites in the middle of animation to stand still +; (so that they don't like they're frozen mid-step during the dialogue) + ld hl,wSpriteStateData1 + 2 + ld de,$0010 + ld c,e +.spriteStandStillLoop + ld a,[hl] + cp a,$ff ; is the sprite visible? + jr z,.nextSprite +; if it is visible + and a,$fc + ld [hl],a +.nextSprite + add hl,de + dec c + jr nz,.spriteStandStillLoop + ld b,$9c ; window background address + call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM + xor a + ld [hWY],a ; put the window on the screen + call LoadFontTilePatterns + ld a,$01 + ld [H_AUTOBGTRANSFERENABLED],a ; enable continuous WRAM to VRAM transfer each V-blank + ret diff --git a/engine/evolution.asm b/engine/evolution.asm index c0a3434a..a2c52765 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a dec a ld [wNewSoundID], a call PlaySound diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index c0b78119..2f9a6aa5 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -71,7 +71,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER diff --git a/engine/items/items.asm b/engine/items/items.asm index 643fb524..159f3a45 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,7 +1,7 @@ UseItem_: ld a,1 ld [wActionResultOrTookBattleTurn],a ; initialise to success value - ld a,[wcf91] ;contains item_ID + ld a,[wcf91] ;contains item_ID cp a,HM_01 jp nc,ItemUseTMHM ld hl,ItemUsePtrTable @@ -235,7 +235,7 @@ ItemUseBall: ld b,a .skipAilmentValueSubtraction - push bc ; save (Rand1 - Status) + push bc ; save (Rand1 - Status) ; Calculate MaxHP * 255. xor a @@ -990,7 +990,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm],a ;disable low health alarm - ld [wChannelSoundIDs + CH4],a + ld [wChannelSoundIDs + Ch4],a push hl push de ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1777,7 +1777,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH6] + ld a,[wChannelSoundIDs + Ch6] and a ; music off? jr nz,.musicWaitLoop .skipMusic @@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH2] + ld a,[wChannelSoundIDs + Ch2] cp a, SFX_POKEFLUE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again diff --git a/engine/load_mon_data.asm b/engine/load_mon_data.asm new file mode 100644 index 00000000..a71a81c5 --- /dev/null +++ b/engine/load_mon_data.asm @@ -0,0 +1,49 @@ +LoadMonData_: +; Load monster [wWhichPokemon] from list [wMonDataLocation]: +; 0: partymon +; 1: enemymon +; 2: boxmon +; 3: daycaremon +; Return monster id at wcf91 and its data at wLoadedMon. +; Also load base stats at wMonHeader for convenience. + + ld a, [wDayCareMonSpecies] + ld [wcf91], a + ld a, [wMonDataLocation] + cp DAYCARE_DATA + jr z, .GetMonHeader + + ld a, [wWhichPokemon] + ld e, a + callab GetMonSpecies + +.GetMonHeader + ld a, [wcf91] + ld [wd0b5], a ; input for GetMonHeader + call GetMonHeader + + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wMonDataLocation] + cp ENEMY_PARTY_DATA + jr c, .getMonEntry + + ld hl, wEnemyMons + jr z, .getMonEntry + + cp 2 + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 + jr z, .getMonEntry + + ld hl, wDayCareMon + jr .copyMonData + +.getMonEntry + ld a, [wWhichPokemon] + call AddNTimes + +.copyMonData + ld de, wLoadedMon + ld bc, wPartyMon2 - wPartyMon1 + jp CopyData diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm new file mode 100644 index 00000000..4df9de27 --- /dev/null +++ b/engine/menu/draw_start_menu.asm @@ -0,0 +1,89 @@ +; function that displays the start menu +DrawStartMenu: + CheckEvent EVENT_GOT_POKEDEX +; menu with pokedex + coord hl, 10, 0 + ld b,$0e + ld c,$08 + jr nz,.drawTextBoxBorder +; shorter menu if the player doesn't have the pokedex + coord hl, 10, 0 + ld b,$0c + ld c,$08 +.drawTextBoxBorder + call TextBoxBorder + ld a,D_DOWN | D_UP | START | B_BUTTON | A_BUTTON + ld [wMenuWatchedKeys],a + ld a,$02 + ld [wTopMenuItemY],a ; Y position of first menu choice + ld a,$0b + ld [wTopMenuItemX],a ; X position of first menu choice + ld a,[wBattleAndStartSavedMenuItem] ; remembered menu selection from last time + ld [wCurrentMenuItem],a + ld [wLastMenuItem],a + xor a + ld [wMenuWatchMovingOutOfBounds],a + ld hl,wd730 + set 6,[hl] ; no pauses between printing each letter + coord hl, 12, 2 + CheckEvent EVENT_GOT_POKEDEX +; case for not having pokdex + ld a,$06 + jr z,.storeMenuItemCount +; case for having pokedex + ld de,StartMenuPokedexText + call PrintStartMenuItem + ld a,$07 +.storeMenuItemCount + ld [wMaxMenuItem],a ; number of menu items + ld de,StartMenuPokemonText + call PrintStartMenuItem + ld de,StartMenuItemText + call PrintStartMenuItem + ld de,wPlayerName ; player's name + call PrintStartMenuItem + ld a,[wd72e] + bit 6,a ; is the player using the link feature? +; case for not using link feature + ld de,StartMenuSaveText + jr z,.printSaveOrResetText +; case for using link feature + ld de,StartMenuResetText +.printSaveOrResetText + call PrintStartMenuItem + ld de,StartMenuOptionText + call PrintStartMenuItem + ld de,StartMenuExitText + call PlaceString + ld hl,wd730 + res 6,[hl] ; turn pauses between printing letters back on + ret + +StartMenuPokedexText: + db "POKéDEX@" + +StartMenuPokemonText: + db "POKéMON@" + +StartMenuItemText: + db "ITEM@" + +StartMenuSaveText: + db "SAVE@" + +StartMenuResetText: + db "RESET@" + +StartMenuExitText: + db "EXIT@" + +StartMenuOptionText: + db "OPTION@" + +PrintStartMenuItem: + push hl + call PlaceString + pop hl + ld de,SCREEN_WIDTH * 2 + add hl,de + ret diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm new file mode 100644 index 00000000..b1fa78be --- /dev/null +++ b/engine/menu/swap_items.asm @@ -0,0 +1,149 @@ +HandleItemListSwapping: + ld a,[wListMenuID] + cp a,ITEMLISTMENU + jp nz,DisplayListMenuIDLoop ; only rearrange item list menus + push hl + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + inc hl ; hl = beginning of list entries + ld a,[wCurrentMenuItem] + ld b,a + ld a,[wListScrollOffset] + add b + add a + ld c,a + ld b,0 + add hl,bc ; hl = address of currently selected item entry + ld a,[hl] + pop hl + inc a + jp z,DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + and a ; has the first item to swap already been chosen? + jr nz,.swapItems +; if not, set the currently selected item as the first item + ld a,[wCurrentMenuItem] + inc a + ld b,a + ld a,[wListScrollOffset] ; index of top (visible) menu item within the list + add b + ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) + ld c,20 + call DelayFrames + jp DisplayListMenuIDLoop +.swapItems + ld a,[wCurrentMenuItem] + inc a + ld b,a + ld a,[wListScrollOffset] + add b + ld b,a + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + cp b ; is the currently selected item the same as the first item to swap? + jp z,DisplayListMenuIDLoop ; ignore attempts to swap an item with itself + dec a + ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) + ld c,20 + call DelayFrames + push hl + push de + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + inc hl ; hl = beginning of list entries + ld d,h + ld e,l ; de = beginning of list entries + ld a,[wCurrentMenuItem] + ld b,a + ld a,[wListScrollOffset] + add b + add a + ld c,a + ld b,0 + add hl,bc ; hl = address of currently selected item entry + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + add a + add e + ld e,a + jr nc,.noCarry + inc d +.noCarry ; de = address of first item to swap + ld a,[de] + ld b,a + ld a,[hli] + cp b + jr z,.swapSameItemType +.swapDifferentItems + ld [$ff95],a ; [$ff95] = second item ID + ld a,[hld] + ld [$ff96],a ; [$ff96] = second item quantity + ld a,[de] + ld [hli],a ; put first item ID in second item slot + inc de + ld a,[de] + ld [hl],a ; put first item quantity in second item slot + ld a,[$ff96] + ld [de],a ; put second item quantity in first item slot + dec de + ld a,[$ff95] + ld [de],a ; put second item ID in first item slot + xor a + ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + pop de + pop hl + jp DisplayListMenuIDLoop +.swapSameItemType + inc de + ld a,[hl] + ld b,a + ld a,[de] + add b ; a = sum of both item quantities + cp a,100 ; is the sum too big for one item slot? + jr c,.combineItemSlots +; swap enough items from the first slot to max out the second slot if they can't be combined + sub a,99 + ld [de],a + ld a,99 + ld [hl],a + jr .done +.combineItemSlots + ld [hl],a ; put the sum in the second item slot + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + dec [hl] ; decrease the number of items + ld a,[hl] + ld [wListCount],a ; update number of items variable + cp a,1 + jr nz,.skipSettingMaxMenuItemID + ld [wMaxMenuItem],a ; if the number of items is only one now, update the max menu item ID +.skipSettingMaxMenuItemID + dec de + ld h,d + ld l,e + inc hl + inc hl ; hl = address of item after first item to swap +.moveItemsUpLoop ; erase the first item slot and move up all the following item slots to fill the gap + ld a,[hli] + ld [de],a + inc de + inc a ; reached the $ff terminator? + jr z,.afterMovingItemsUp + ld a,[hli] + ld [de],a + inc de + jr .moveItemsUpLoop +.afterMovingItemsUp + xor a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a +.done + xor a + ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + pop de + pop hl + jp DisplayListMenuIDLoop diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm new file mode 100644 index 00000000..12067dd4 --- /dev/null +++ b/engine/menu/text_box.asm @@ -0,0 +1,767 @@ +; function to draw various text boxes +DisplayTextBoxID_: + ld a,[wTextBoxID] + cp a,TWO_OPTION_MENU + jp z,DisplayTwoOptionMenu + ld c,a + ld hl,TextBoxFunctionTable + ld de,3 + call SearchTextBoxTable + jr c,.functionTableMatch + ld hl,TextBoxCoordTable + ld de,5 + call SearchTextBoxTable + jr c,.coordTableMatch + ld hl,TextBoxTextAndCoordTable + ld de,9 + call SearchTextBoxTable + jr c,.textAndCoordTableMatch +.done + ret +.functionTableMatch + ld a,[hli] + ld h,[hl] + ld l,a ; hl = address of function + ld de,.done + push de + jp [hl] ; jump to the function +.coordTableMatch + call GetTextBoxIDCoords + call GetAddressOfScreenCoords + call TextBoxBorder + ret +.textAndCoordTableMatch + call GetTextBoxIDCoords + push hl + call GetAddressOfScreenCoords + call TextBoxBorder + pop hl + call GetTextBoxIDText + ld a,[wd730] + push af + ld a,[wd730] + set 6,a ; no pauses between printing each letter + ld [wd730],a + call PlaceString + pop af + ld [wd730],a + call UpdateSprites + ret + +; function to search a table terminated with $ff for a byte matching c in increments of de +; sets carry flag if a match is found and clears carry flag if not +SearchTextBoxTable: + dec de +.loop + ld a,[hli] + cp a,$ff + jr z,.notFound + cp c + jr z,.found + add hl,de + jr .loop +.found + scf +.notFound + ret + +; function to load coordinates from the TextBoxCoordTable or the TextBoxTextAndCoordTable +; INPUT: +; hl = address of coordinates +; OUTPUT: +; b = height +; c = width +; d = row of upper left corner +; e = column of upper left corner +GetTextBoxIDCoords: + ld a,[hli] ; column of upper left corner + ld e,a + ld a,[hli] ; row of upper left corner + ld d,a + ld a,[hli] ; column of lower right corner + sub e + dec a + ld c,a ; c = width + ld a,[hli] ; row of lower right corner + sub d + dec a + ld b,a ; b = height + ret + +; function to load a text address and text coordinates from the TextBoxTextAndCoordTable +GetTextBoxIDText: + ld a,[hli] + ld e,a + ld a,[hli] + ld d,a ; de = address of text + push de ; save text address + ld a,[hli] + ld e,a ; column of upper left corner of text + ld a,[hl] + ld d,a ; row of upper left corner of text + call GetAddressOfScreenCoords + pop de ; restore text address + ret + +; function to point hl to the screen coordinates +; INPUT: +; d = row +; e = column +; OUTPUT: +; hl = address of upper left corner of text box +GetAddressOfScreenCoords: + push bc + coord hl, 0, 0 + ld bc,20 +.loop ; loop to add d rows to the base address + ld a,d + and a + jr z,.addedRows + add hl,bc + dec d + jr .loop +.addedRows + pop bc + add hl,de + ret + +; Format: +; 00: text box ID +; 01-02: function address +TextBoxFunctionTable: + dbw MONEY_BOX, DisplayMoneyBox + dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu + dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu + db $ff ; terminator + +; Format: +; 00: text box ID +; 01: column of upper left corner +; 02: row of upper left corner +; 03: column of lower right corner +; 04: row of lower right corner +TextBoxCoordTable: + db MESSAGE_BOX, 0, 12, 19, 17 + db $03, 0, 0, 19, 14 + db $07, 0, 0, 11, 6 + db LIST_MENU_BOX, 4, 2, 19, 12 + db $10, 7, 0, 19, 17 + db MON_SPRITE_POPUP, 6, 4, 14, 13 + db $ff ; terminator + +; Format: +; 00: text box ID +; 01: column of upper left corner +; 02: row of upper left corner +; 03: column of lower right corner +; 04: row of lower right corner +; 05-06: address of text +; 07: column of beginning of text +; 08: row of beginning of text +; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row] +TextBoxTextAndCoordTable: + db JP_MOCHIMONO_MENU_TEMPLATE + db 0,0,14,17 ; text box coordinates + dw JapaneseMochimonoText + db 3,0 ; text coordinates + + db USE_TOSS_MENU_TEMPLATE + db 13,10,19,14 ; text box coordinates + dw UseTossText + db 15,11 ; text coordinates + + db JP_SAVE_MESSAGE_MENU_TEMPLATE + db 0,0,7,5 ; text box coordinates + dw JapaneseSaveMessageText + db 2,2 ; text coordinates + + db JP_SPEED_OPTIONS_MENU_TEMPLATE + db 0,6,5,10 ; text box coordinates + dw JapaneseSpeedOptionsText + db 2,7 ; text coordinates + + db BATTLE_MENU_TEMPLATE + db 8,12,19,17 ; text box coordinates + dw BattleMenuText + db 10,14 ; text coordinates + + db SAFARI_BATTLE_MENU_TEMPLATE + db 0,12,19,17 ; text box coordinates + dw SafariZoneBattleMenuText + db 2,14 ; text coordinates + + db SWITCH_STATS_CANCEL_MENU_TEMPLATE + db 11,11,19,17 ; text box coordinates + dw SwitchStatsCancelText + db 13,12 ; text coordinates + + db BUY_SELL_QUIT_MENU_TEMPLATE + db 0,0,10,6 ; text box coordinates + dw BuySellQuitText + db 2,1 ; text coordinates + + db MONEY_BOX_TEMPLATE + db 11,0,19,2 ; text box coordinates + dw MoneyText + db 13,0 ; text coordinates + + db JP_AH_MENU_TEMPLATE + db 7,6,11,10 ; text box coordinates + dw JapaneseAhText + db 8,8 ; text coordinates + + db JP_POKEDEX_MENU_TEMPLATE + db 11,8,19,17 ; text box coordinates + dw JapanesePokedexMenu + db 12,10 ; text coordinates + +; note that there is no terminator + +BuySellQuitText: + db "BUY" + next "SELL" + next "QUIT@@" + +UseTossText: + db "USE" + next "TOSS@" + +JapaneseSaveMessageText: + db "きろく" + next "メッセージ@" + +JapaneseSpeedOptionsText: + db "はやい" + next "おそい@" + +MoneyText: + db "MONEY@" + +JapaneseMochimonoText: + db "もちもの@" + +JapaneseMainMenuText: + db "つづきから" + next "さいしょから@" + +BattleMenuText: + db "FIGHT ",$E1,$E2 + next "ITEM RUN@" + +SafariZoneBattleMenuText: + db "BALL× BAIT" + next "THROW ROCK RUN@" + +SwitchStatsCancelText: + db "SWITCH" + next "STATS" + next "CANCEL@" + +JapaneseAhText: + db "アッ!@" + +JapanesePokedexMenu: + db "データをみる" + next "なきごえ" + next "ぶんぷをみる" + next "キャンセル@" + +DisplayMoneyBox: + ld hl, wd730 + set 6, [hl] + ld a, MONEY_BOX_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + coord hl, 13, 1 + ld b, 1 + ld c, 6 + call ClearScreenArea + coord hl, 12, 1 + ld de, wPlayerMoney + ld c, $a3 + call PrintBCDNumber + ld hl, wd730 + res 6, [hl] + ret + +CurrencyString: + db " ¥@" + +DoBuySellQuitMenu: + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + xor a + ld [wChosenMenuItem], a + ld a, BUY_SELL_QUIT_MENU_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $2 + ld [wMaxMenuItem], a + ld a, $1 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wd730] + res 6, a ; turn on the printing delay + ld [wd730], a + call HandleMenuInput + call PlaceUnfilledArrowMenuCursor + bit 0, a ; was A pressed? + jr nz, .pressedA + bit 1, a ; was B pressed? (always true since only A/B are watched) + jr z, .pressedA + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + jr .quit +.pressedA + ld a, CHOSE_MENU_ITEM + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + ld b, a + ld a, [wMaxMenuItem] + cp b + jr z, .quit + ret +.quit + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + scf + ret + +; displays a menu with two options to choose from +; b = Y of upper left corner of text region +; c = X of upper left corner of text region +; hl = address where the text box border should be drawn +DisplayTwoOptionMenu: + push hl + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + +; pointless because both values are overwritten before they are read + xor a + ld [wChosenMenuItem], a + ld [wMenuExitMethod], a + + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $1 + ld [wMaxMenuItem], a + ld a, b + ld [wTopMenuItemY], a + ld a, c + ld [wTopMenuItemX], a + xor a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + push hl + ld hl, wTwoOptionMenuID + bit 7, [hl] ; select second menu item by default? + res 7, [hl] + jr z, .storeCurrentMenuItem + inc a +.storeCurrentMenuItem + ld [wCurrentMenuItem], a + pop hl + push hl + push hl + call TwoOptionMenu_SaveScreenTiles + ld a, [wTwoOptionMenuID] + ld hl, TwoOptionMenuStrings + ld e, a + ld d, $0 + ld a, $5 +.menuStringLoop + add hl, de + dec a + jr nz, .menuStringLoop + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld e, l + ld d, h + pop hl + push de + ld a, [wTwoOptionMenuID] + cp TRADE_CANCEL_MENU + jr nz, .notTradeCancelMenu + call CableClub_TextBoxBorder + jr .afterTextBoxBorder +.notTradeCancelMenu + call TextBoxBorder +.afterTextBoxBorder + call UpdateSprites + pop hl + ld a, [hli] + and a ; put blank line before first menu item? + ld bc, 20 + 2 + jr z, .noBlankLine + ld bc, 2 * 20 + 2 +.noBlankLine + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + pop hl + add hl, bc + call PlaceString + ld hl, wd730 + res 6, [hl] ; turn on the printing delay + ld a, [wTwoOptionMenuID] + cp NO_YES_MENU + jr nz, .notNoYesMenu +; No/Yes menu +; this menu type ignores the B button +; it only seems to be used when confirming the deletion of a save file + xor a + ld [wTwoOptionMenuID], a + ld a, [wFlags_0xcd60] + push af + push hl + ld hl, wFlags_0xcd60 + bit 5, [hl] + set 5, [hl] ; don't play sound when A or B is pressed in menu + pop hl +.noYesMenuInputLoop + call HandleMenuInput + bit 1, a ; A button pressed? + jr nz, .noYesMenuInputLoop ; try again if A was not pressed + pop af + pop hl + ld [wFlags_0xcd60], a + ld a, SFX_PRESS_AB + call PlaySound + jr .pressedAButton +.notNoYesMenu + xor a + ld [wTwoOptionMenuID], a + call HandleMenuInput + pop hl + bit 1, a ; A button pressed? + jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed +.pressedAButton + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + and a + jr nz, .choseSecondMenuItem +; chose first menu item + ld a, CHOSE_FIRST_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + and a + ret +.choseSecondMenuItem + ld a, 1 + ld [wCurrentMenuItem], a + ld [wChosenMenuItem], a + ld a, CHOSE_SECOND_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + scf + ret + +; Some of the wider/taller two option menus will not have the screen areas +; they cover be fully saved/restored by the two functions below. +; The bottom and right edges of the menu may remain after the function returns. + +TwoOptionMenu_SaveScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, $6 + dec b + jr nz, .loop + ret + +TwoOptionMenu_RestoreScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, 6 + dec b + jr nz, .loop + call UpdateSprites + ret + +; Format: +; 00: byte width +; 01: byte height +; 02: byte put blank line before first menu item +; 03: word text pointer +TwoOptionMenuStrings: + db 4,3,0 + dw .YesNoMenu + db 6,3,0 + dw .NorthWestMenu + db 6,3,0 + dw .SouthEastMenu + db 6,3,0 + dw .YesNoMenu + db 6,3,0 + dw .NorthEastMenu + db 7,3,0 + dw .TradeCancelMenu + db 7,4,1 + dw .HealCancelMenu + db 4,3,0 + dw .NoYesMenu + +.NoYesMenu + db "NO" + next "YES@" +.YesNoMenu + db "YES" + next "NO@" +.NorthWestMenu + db "NORTH" + next "WEST@" +.SouthEastMenu + db "SOUTH" + next "EAST@" +.NorthEastMenu + db "NORTH" + next "EAST@" +.TradeCancelMenu + db "TRADE" + next "CANCEL@" +.HealCancelMenu + db "HEAL" + next "CANCEL@" + +DisplayFieldMoveMonMenu: + xor a + ld hl, wFieldMoves + ld [hli], a ; wFieldMoves + ld [hli], a ; wFieldMoves + 1 + ld [hli], a ; wFieldMoves + 2 + ld [hli], a ; wFieldMoves + 3 + ld [hli], a ; wNumFieldMoves + ld [hl], 12 ; wFieldMovesLeftmostXCoord + call GetMonFieldMoves + ld a, [wNumFieldMoves] + and a + jr nz, .fieldMovesExist + +; no field moves + coord hl, 11, 11 + ld b, 5 + ld c, 7 + call TextBoxBorder + call UpdateSprites + ld a, 12 + ld [hFieldMoveMonMenuTopMenuItemX], a + coord hl, 13, 12 + ld de, PokemonMenuEntries + jp PlaceString + +.fieldMovesExist + push af + +; Calculate the text box position and dimensions based on the leftmost X coord +; of the field move names before adjusting for the number of field moves. + coord hl, 0, 11 + ld a, [wFieldMovesLeftmostXCoord] + dec a + ld e, a + ld d, 0 + add hl, de + ld b, 5 + ld a, 18 + sub e + ld c, a + pop af + +; For each field move, move the top of the text box up 2 rows while the leaving +; the bottom of the text box at the bottom of the screen. + ld de, -SCREEN_WIDTH * 2 +.textBoxHeightLoop + add hl, de + inc b + inc b + dec a + jr nz, .textBoxHeightLoop + +; Make space for an extra blank row above the top field move. + ld de, -SCREEN_WIDTH + add hl, de + inc b + + call TextBoxBorder + call UpdateSprites + +; Calculate the position of the first field move name to print. + coord hl, 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, -SCREEN_WIDTH * 2 + ld a, [wNumFieldMoves] +.calcFirstFieldMoveYLoop + add hl, de + dec a + jr nz, .calcFirstFieldMoveYLoop + + xor a + ld [wNumFieldMoves], a + ld de, wFieldMoves +.printNamesLoop + push hl + ld hl, FieldMoveNames + ld a, [de] + and a + jr z, .donePrintingNames + inc de + ld b, a ; index of name +.skipNamesLoop ; skip past names before the name we want + dec b + jr z, .reachedName +.skipNameLoop ; skip past current name + ld a, [hli] + cp "@" + jr nz, .skipNameLoop + jr .skipNamesLoop +.reachedName + ld b, h + ld c, l + pop hl + push de + ld d, b + ld e, c + call PlaceString + ld bc, SCREEN_WIDTH * 2 + add hl, bc + pop de + jr .printNamesLoop + +.donePrintingNames + pop hl + ld a, [wFieldMovesLeftmostXCoord] + ld [hFieldMoveMonMenuTopMenuItemX], a + coord hl, 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, PokemonMenuEntries + jp PlaceString + +FieldMoveNames: + db "CUT@" + db "FLY@" + db "@" + db "SURF@" + db "STRENGTH@" + db "FLASH@" + db "DIG@" + db "TELEPORT@" + db "SOFTBOILED@" + +PokemonMenuEntries: + db "STATS" + next "SWITCH" + next "CANCEL@" + +GetMonFieldMoves: + ld a, [wWhichPokemon] + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld d, h + ld e, l + ld c, NUM_MOVES + 1 + ld hl, wFieldMoves +.loop + push hl +.nextMove + dec c + jr z, .done + ld a, [de] ; move ID + and a + jr z, .done + ld b, a + inc de + ld hl, FieldMoveDisplayData +.fieldMoveLoop + ld a, [hli] + cp $ff + jr z, .nextMove ; if the move is not a field move + cp b + jr z, .foundFieldMove + inc hl + inc hl + jr .fieldMoveLoop +.foundFieldMove + ld a, b + ld [wLastFieldMoveID], a + ld a, [hli] ; field move name index + ld b, [hl] ; field move leftmost X coordinate + pop hl + ld [hli], a ; store name index in wFieldMoves + ld a, [wNumFieldMoves] + inc a + ld [wNumFieldMoves], a + ld a, [wFieldMovesLeftmostXCoord] + cp b + jr c, .skipUpdatingLeftmostXCoord + ld a, b + ld [wFieldMovesLeftmostXCoord], a +.skipUpdatingLeftmostXCoord + ld a, [wLastFieldMoveID] + ld b, a + jr .loop +.done + pop hl + ret + +; Format: [Move id], [name index], [leftmost tile] +; Move id = id of move +; Name index = index of name in FieldMoveNames +; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed +; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C +FieldMoveDisplayData: + db CUT, $01, $0C + db FLY, $02, $0C + db $B4, $03, $0C ; unused field move + db SURF, $04, $0C + db STRENGTH, $05, $0A + db FLASH, $06, $0C + db DIG, $07, $0C + db TELEPORT, $08, $0A + db SOFTBOILED, $09, $08 + db $ff ; list terminator diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 929e4f22..7ff4ff71 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -33,7 +33,7 @@ ShakeElevator: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm new file mode 100644 index 00000000..d1a411fa --- /dev/null +++ b/engine/overworld/map_sprite_functions1.asm @@ -0,0 +1,356 @@ +_UpdateSprites: + ld h, $c1 + inc h + ld a, $e ; wSpriteStateData2 + $0e +.spriteLoop + ld l, a + sub $e + ld c, a + ld [H_CURRENTSPRITEOFFSET], a + ld a, [hl] + and a + jr z, .skipSprite ; tests $c2Xe + push hl + push de + push bc + call .updateCurrentSprite + pop bc + pop de + pop hl +.skipSprite + ld a, l + add $10 ; move to next sprite + cp $e ; test for overflow (back at $0e) + jr nz, .spriteLoop + ret +.updateCurrentSprite + cp $1 + jp nz, UpdateNonPlayerSprite + jp UpdatePlayerSprite + +UpdateNonPlayerSprite: + dec a + swap a + ld [$ff93], a ; $10 * sprite# + ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset? + ld b, a + ld a, [H_CURRENTSPRITEOFFSET] + cp b + jr nz, .unequal + jp DoScriptedNPCMovement +.unequal + jp UpdateNPCSprite + +; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET) +; is going to collide with another sprite by looping over the other sprites. +; The current sprite's offset will be labelled with i (e.g. $c1i0). +; The loop sprite's offset will labelled with j (e.g. $c1j0). +; +; Note that the Y coordinate of the sprite (in [$c1k4]) is one of the following +; 9 values when the sprite is aligned with the grid: $fc, $0c, $1c, $2c, ..., $7c. +; The reason that 4 is added below to the coordinate is to make it align with a +; multiple of $10 to make comparisons easier. +DetectCollisionBetweenSprites: + nop + + ld h, wSpriteStateData1 / $100 + ld a, [H_CURRENTSPRITEOFFSET] + add wSpriteStateData1 % $100 + ld l, a + + ld a, [hl] ; a = [$c1i0] (picture) (0 if slot is unused) + and a ; is this sprite slot slot used? + ret z ; return if not used + + ld a, l + add 3 + ld l, a + + ld a, [hli] ; a = [$c1i3] (delta Y) (-1, 0, or 1) + call SetSpriteCollisionValues + + ld a, [hli] ; a = [$C1i4] (Y screen coordinate) + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + ld [$ff90], a ; store Y coordinate adjusted for direction of movement + + ld a, [hli] ; a = [$c1i5] (delta X) (-1, 0, or 1) + call SetSpriteCollisionValues + ld a, [hl] ; a = [$C1i6] (X screen coordinate) + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + ld [$ff91], a ; store X coordinate adjusted for direction of movement + + ld a, l + add 7 + ld l, a + + xor a + ld [hld], a ; zero [$c1id] XXX what's [$c1id] for? + ld [hld], a ; zero [$c1ic] (directions in which collisions occurred) + + ld a, [$ff91] + ld [hld], a ; [$c1ib] = adjusted X coordinate + ld a, [$ff90] + ld [hl], a ; [$c1ia] = adjusted Y coordinate + + xor a ; zero the loop counter + +.loop + ld [$ff8f], a ; store loop counter + swap a + ld e, a + ld a, [H_CURRENTSPRITEOFFSET] + cp e ; does the loop sprite match the current sprite? + jp z, .next ; go to the next sprite if they match + + ld d, h + ld a, [de] ; a = [$c1j0] (picture) (0 if slot is unused) + and a ; is this sprite slot slot used? + jp z, .next ; go the next sprite if not used + + inc e + inc e + ld a, [de] ; a = [$c1j2] ($ff means the sprite is offscreen) + inc a + jp z, .next ; go the next sprite if offscreen + + ld a, [H_CURRENTSPRITEOFFSET] + add 10 + ld l, a + + inc e + ld a, [de] ; a = [$c1j3] (delta Y) + call SetSpriteCollisionValues + + inc e + ld a, [de] ; a = [$C1j4] (Y screen coordinate) + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + sub [hl] ; subtract the adjusted Y coordinate of sprite i ([$c1ia]) from that of sprite j + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry1 + cpl + inc a +.noCarry1 + ld [$ff90], a ; store the distance between the two sprites' adjusted Y values + +; Use the carry flag set by the above subtraction to determine which sprite's +; Y coordinate is larger. This information is used later to set [$c1ic], +; which stores which direction the collision occurred in. +; The following 5 lines set the lowest 2 bits of c, which are later shifted left by 2. +; If sprite i's Y is larger, set lowest 2 bits of c to 10. +; If sprite j's Y is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [$c1ia] (adjusted Y coordinate) + and $f + jr z, .next1 + ld b, 9 + +.next1 + ld a, [$ff90] ; a = distance between adjusted Y coordinates + sub b + ld [$ff92], a ; store distance adjusted using sprite i's direction + ld a, b + ld [$ff90], a ; store 7 or 9 depending on sprite i's delta Y + jr c, .checkXDistance + +; If sprite j's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [$c1j3] (delta Y) + inc e + and a + jr z, .next2 + ld b, 9 + +.next2 + ld a, [$ff92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .checkXDistance + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.checkXDistance + inc e + inc l + ld a, [de] ; a = [$c1j5] (delta X) + + push bc + + call SetSpriteCollisionValues + inc e + ld a, [de] ; a = [$c1j6] (X screen coordinate) + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + pop bc + + sub [hl] ; subtract the adjusted X coordinate of sprite i ([$c1ib]) from that of sprite j + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry2 + cpl + inc a +.noCarry2 + ld [$ff91], a ; store the distance between the two sprites' adjusted X values + +; Use the carry flag set by the above subtraction to determine which sprite's +; X coordinate is larger. This information is used later to set [$c1ic], +; which stores which direction the collision occurred in. +; The following 5 lines set the lowest 2 bits of c. +; If sprite i's X is larger, set lowest 2 bits of c to 10. +; If sprite j's X is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta X is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [$c1ib] (adjusted X coordinate) + and $f + jr z, .next3 + ld b, 9 + +.next3 + ld a, [$ff91] ; a = distance between adjusted X coordinates + sub b + ld [$ff92], a ; store distance adjusted using sprite i's direction + ld a, b + ld [$ff91], a ; store 7 or 9 depending on sprite i's delta X + jr c, .collision + +; If sprite j's delta X is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [$c1j5] (delta X) + inc e + and a + jr z, .next4 + ld b, 9 + +.next4 + ld a, [$ff92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .collision + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.collision + ld a, [$ff91] ; a = 7 or 9 depending on sprite i's delta X + ld b, a + ld a, [$ff90] ; a = 7 or 9 depending on sprite i's delta Y + inc l + +; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. +; (note that normally if delta X isn't 0, then delta Y must be 0 and vice versa) + cp b + jr c, .next5 + ld b, %1100 + jr .next6 +.next5 + ld b, %0011 + +.next6 + ld a, c ; c has 2 bits set (one of bits 0-1 is set for the X axis and one of bits 2-3 for the Y axis) + and b ; we select either the bit in bits 0-1 or bits 2-3 based on the calculation immediately above + or [hl] ; or with existing collision direction bits in [$c1ic] + ld [hl], a ; store new value + ld a, c ; useless code because a is overwritten before being used again + +; set bit in [$c1ie] or [$c1if] to indicate which sprite the collision occurred with + inc l + inc l + ld a, [$ff8f] ; a = loop counter + ld de, SpriteCollisionBitTable + add a + add e + ld e, a + jr nc, .noCarry3 + inc d +.noCarry3 + ld a, [de] + or [hl] + ld [hli], a + inc de + ld a, [de] + or [hl] + ld [hl], a + +.next + ld a, [$ff8f] ; a = loop counter + inc a + cp $10 + jp nz, .loop + ret + +; takes delta X or delta Y in a +; b = delta X/Y +; c = 0 if delta X/Y is 0 +; c = 7 if delta X/Y is 1 +; c = 9 if delta X/Y is -1 +SetSpriteCollisionValues: + and a + ld b, 0 + ld c, 0 + jr z, .done + ld c, 9 + cp -1 + jr z, .ok + ld c, 7 + ld a, 0 +.ok + ld b, a +.done + ret + +SpriteCollisionBitTable: + db %00000000,%00000001 + db %00000000,%00000010 + db %00000000,%00000100 + db %00000000,%00001000 + db %00000000,%00010000 + db %00000000,%00100000 + db %00000000,%01000000 + db %00000000,%10000000 + db %00000001,%00000000 + db %00000010,%00000000 + db %00000100,%00000000 + db %00001000,%00000000 + db %00010000,%00000000 + db %00100000,%00000000 + db %01000000,%00000000 + db %10000000,%00000000 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm new file mode 100644 index 00000000..9bfe82bd --- /dev/null +++ b/engine/overworld/set_blackout_map.asm @@ -0,0 +1,29 @@ +SetLastBlackoutMap: +; Set the map to return to when +; blacking out or using Teleport or Dig. +; Safari rest houses don't count. + + push hl + ld hl, SafariZoneRestHouses + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp -1 + jr z, .notresthouse + cp b + jr nz, .loop + jr .done + +.notresthouse + ld a, [wLastMap] + ld [wLastBlackoutMap], a +.done + pop hl + ret + +SafariZoneRestHouses: + db SAFARI_ZONE_REST_HOUSE_2 + db SAFARI_ZONE_REST_HOUSE_3 + db SAFARI_ZONE_REST_HOUSE_4 + db -1 diff --git a/engine/predefs.asm b/engine/predefs.asm index 4ab652b9..d689318d 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -58,9 +58,10 @@ PredefPointers:: add_predef ScaleSpriteByTwo add_predef LoadMonBackPic add_predef CopyDownscaledMonTiles - ; add_predef LoadMissableObjects +; add_predef LoadMissableObjects +; For some reason this points to the middle of the "ld de, wMissableObjectList" instruction in LoadMissableObjects db 3 - dw $714d + dw $714D add_predef HealParty add_predef MoveAnimation add_predef DivideBCDPredef diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm new file mode 100644 index 00000000..7a95da2a --- /dev/null +++ b/engine/print_waiting_text.asm @@ -0,0 +1,20 @@ +PrintWaitingText: + coord hl, 3, 10 + ld b, $1 + ld c, $b + ld a, [wIsInBattle] + and a + jr z, .asm_4c17 + call TextBoxBorder + jr .asm_4c1a +.asm_4c17 + call CableClub_TextBoxBorder +.asm_4c1a + coord hl, 4, 11 + ld de, WaitingText + call PlaceString + ld c, 50 + jp DelayFrames + +WaitingText: + db "Waiting...!@" diff --git a/engine/remove_pokemon.asm b/engine/remove_pokemon.asm new file mode 100644 index 00000000..1fcb5d09 --- /dev/null +++ b/engine/remove_pokemon.asm @@ -0,0 +1,95 @@ +_RemovePokemon: + ld hl, wPartyCount + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7b74 + ld hl, wNumInBox +.asm_7b74 + ld a, [hl] + dec a + ld [hli], a + ld a, [wWhichPokemon] + ld c, a + ld b, $0 + add hl, bc + ld e, l + ld d, h + inc de +.asm_7b81 + ld a, [de] + inc de + ld [hli], a + inc a + jr nz, .asm_7b81 + ld hl, wPartyMonOT + ld d, $5 + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7b97 + ld hl, wBoxMonOT + ld d, $13 +.asm_7b97 + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries + ld a, [wWhichPokemon] + cp d + jr nz, .asm_7ba6 + ld [hl], $ff + ret +.asm_7ba6 + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bb8 + ld bc, wBoxMonNicks +.asm_7bb8 + call CopyDataUntil + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bcd + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 +.asm_7bcd + ld a, [wWhichPokemon] + call AddNTimes + ld d, h + ld e, l + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7be4 + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc + ld bc, wBoxMonOT + jr .asm_7beb +.asm_7be4 + ld bc, wPartyMon2 - wPartyMon1 + add hl, bc + ld bc, wPartyMonOT +.asm_7beb + call CopyDataUntil + ld hl, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bfa + ld hl, wBoxMonNicks +.asm_7bfa + ld bc, NAME_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPokedexOwned + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7c15 + ld bc, wBoxMonNicksEnd +.asm_7c15 + jp CopyDataUntil diff --git a/engine/special_warps.asm b/engine/special_warps.asm new file mode 100644 index 00000000..de00a817 --- /dev/null +++ b/engine/special_warps.asm @@ -0,0 +1,149 @@ +SpecialWarpIn: + call LoadSpecialWarpData + predef LoadTilesetHeader + ld hl,wd732 + bit 2,[hl] ; dungeon warp or fly warp? + res 2,[hl] + jr z,.next +; if dungeon warp or fly warp + ld a,[wDestinationMap] + jr .next2 +.next + bit 1,[hl] + jr z,.next3 + call EmptyFunc +.next3 + ld a,0 +.next2 + ld b,a + ld a,[wd72d] + and a + jr nz,.next4 + ld a,b +.next4 + ld hl,wd732 + bit 4,[hl] ; dungeon warp? + ret nz +; if not dungeon warp + ld [wLastMap],a + ret + +; gets the map ID, tile block map view pointer, tileset, and coordinates +LoadSpecialWarpData: + ld a, [wd72d] + cp TRADE_CENTER + jr nz, .notTradeCenter + ld hl, TradeCenterSpec1 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right + jr z, .copyWarpData + ld hl, TradeCenterSpec2 + jr .copyWarpData +.notTradeCenter + cp COLOSSEUM + jr nz, .notColosseum + ld hl, ColosseumSpec1 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK + jr z, .copyWarpData + ld hl, ColosseumSpec2 + jr .copyWarpData +.notColosseum + ld a, [wd732] + bit 1, a + jr nz, .notFirstMap + bit 2, a + jr nz, .notFirstMap + ld hl, FirstMapSpec +.copyWarpData + ld de, wCurMap + ld c, $7 +.copyWarpDataLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop + ld a, [hli] + ld [wCurMapTileset], a + xor a + jr .done +.notFirstMap + ld a, [wLastMap] ; this value is overwritten before it's ever read + ld hl, wd732 + bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? + jr nz, .usedDunegonWarp + bit 6, [hl] ; return to last pokemon center (or player's house)? + res 6, [hl] + jr z, .otherDestination +; return to last pokemon center or player's house + ld a, [wLastBlackoutMap] + jr .usedFlyWarp +.usedDunegonWarp + ld hl, wd72d + res 4, [hl] + ld a, [wDungeonWarpDestinationMap] + ld b, a + ld [wCurMap], a + ld a, [wWhichDungeonWarp] + ld c, a + ld hl, DungeonWarpList + ld de, 0 + ld a, 6 + ld [wDungeonWarpDataEntrySize], a +.dungeonWarpListLoop + ld a, [hli] + cp b + jr z, .matchedDungeonWarpDestinationMap + inc hl + jr .nextDungeonWarp +.matchedDungeonWarpDestinationMap + ld a, [hli] + cp c + jr z, .matchedDungeonWarpID +.nextDungeonWarp + ld a, [wDungeonWarpDataEntrySize] + add e + ld e, a + jr .dungeonWarpListLoop +.matchedDungeonWarpID + ld hl, DungeonWarpData + add hl, de + jr .copyWarpData2 +.otherDestination + ld a, [wDestinationMap] +.usedFlyWarp + ld b, a + ld [wCurMap], a + ld hl, FlyWarpDataPtr +.flyWarpDataPtrLoop + ld a, [hli] + inc hl + cp b + jr z, .foundFlyWarpMatch + inc hl + inc hl + jr .flyWarpDataPtrLoop +.foundFlyWarpMatch + ld a, [hli] + ld h, [hl] + ld l, a +.copyWarpData2 + ld de, wCurrentTileBlockMapViewPointer + ld c, $6 +.copyWarpDataLoop2 + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop2 + xor a ; OVERWORLD + ld [wCurMapTileset], a +.done + ld [wYOffsetSinceLastSpecialWarp], a + ld [wXOffsetSinceLastSpecialWarp], a + ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps + ld [wDestinationWarpID], a + ret + +INCLUDE "data/special_warps.asm" diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm new file mode 100644 index 00000000..2888c3fb --- /dev/null +++ b/engine/subtract_paid_money.asm @@ -0,0 +1,17 @@ +; subtracts the amount the player paid from their money +; sets carry flag if there is enough money and unsets carry flag if not +SubtractAmountPaidFromMoney_: + ld de,wPlayerMoney + ld hl,hMoney ; total price of items + ld c,3 ; length of money in bytes + call StringCmp + ret c + ld de,wPlayerMoney + 2 + ld hl,hMoney + 2 ; total price of items + ld c,3 ; length of money in bytes + predef SubBCDPredef ; subtract total price from money + ld a,MONEY_BOX + ld [wTextBoxID],a + call DisplayTextBoxID ; redraw money text box + and a + ret diff --git a/engine/test_battle.asm b/engine/test_battle.asm new file mode 100644 index 00000000..d9dcf1fa --- /dev/null +++ b/engine/test_battle.asm @@ -0,0 +1,45 @@ +TestBattle: + ret + +.loop + call GBPalNormal + + ; Don't mess around + ; with obedience. + ld a, %10000000 ; EARTHBADGE + ld [wObtainedBadges], a + + ld hl, wFlags_D733 + set BIT_TEST_BATTLE, [hl] + + ; Reset the party. + ld hl, wPartyCount + xor a + ld [hli], a + dec a + ld [hl], a + + ; Give the player a + ; level 20 Rhydon. + ld a, RHYDON + ld [wcf91], a + ld a, 20 + ld [wCurEnemyLVL], a + xor a + ld [wMonDataLocation], a + ld [wCurMap], a + call AddPartyMon + + ; Fight against a + ; level 20 Rhydon. + ld a, RHYDON + ld [wCurOpponent], a + + predef InitOpponent + + ; When the battle ends, + ; do it all again. + ld a, 1 + ld [wUpdateSpritesEnabled], a + ld [H_AUTOBGTRANSFERENABLED], a + jr .loop @@ -723,7 +723,7 @@ UncompressMonSprite:: ; define (by index number) the bank that a pokemon's image is in ; index = Mew, bank 1 ; index = Kabutops fossil, bank $B -; index < $1F, bank 9 +; index < $1F, bank 9 ; $1F ≤ index < $4A, bank $A ; $4A ≤ index < $74, bank $B ; $74 ≤ index < $99, bank $C @@ -1587,7 +1587,7 @@ DisplayChooseQuantityMenu:: cp PRICEDITEMLISTMENU jr nz,.printInitialQuantity ld a,"¥" - ld [$C47A],a + ld [wTileMap+$DA],a coord hl, 8, 10 .printInitialQuantity ld de,InitialQuantityText @@ -3226,7 +3226,7 @@ WaitForSoundToFinish:: ret nz push hl .waitLoop - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 xor a or [hl] inc hl @@ -4420,7 +4420,6 @@ endm CallFunctionInTable:: -JumpTable:: ; Call function a in jumptable hl. ; de is not preserved. push hl diff --git a/home/audio.asm b/home/audio.asm index 7c0c5238..c982d9d6 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -148,10 +148,10 @@ PlaySound:: and a jr z, .next xor a - ld [wChannelSoundIDs + CH4], a - ld [wChannelSoundIDs + CH5], a - ld [wChannelSoundIDs + CH6], a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + Ch6], a + ld [wChannelSoundIDs + Ch7], a .next ld a, [wAudioFadeOutControl] and a ; has a fade-out length been specified? diff --git a/home/overworld.asm b/home/overworld.asm index f71bb68a..fe763b43 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1244,7 +1244,7 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc,.noCollision .collision - ld a,[wChannelSoundIDs + CH4] + ld a,[wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -1948,7 +1948,7 @@ CollisionCheckOnWater:: jr z,.stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a,[wChannelSoundIDs + CH4] + ld a,[wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION diff --git a/home/pic.asm b/home/pic.asm index 444a9f05..a1c18e8a 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -7,10 +7,10 @@ UncompressSpriteData:: ld a, b ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - ld a, $a - ld [$0], a + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a xor a - ld [$4000], a + ld [MBC1SRamBank], a call _UncompressSpriteData pop af ld [H_LOADEDROMBANK], a @@ -48,8 +48,8 @@ _UncompressSpriteData:: ld [wSpriteWidth], a call ReadNextInputBit ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit - ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 - ; bit 0 decides in which one the first chunk is placed + ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 + ; bit 0 decides in which one the first chunk is placed ; fall through ; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 diff --git a/home/text.asm b/home/text.asm index 2b978bfd..027e5c74 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,5 +1,5 @@ TextBoxBorder:: -; Draw a cxb text box at hl. +; Draw a c×b text box at hl. ; top row push hl @@ -369,9 +369,9 @@ TextCommandProcessor:: xor e ld [wLetterPrintingDelayFlags],a ld a,c - ld [wUnusedCC3A],a + ld [wTextDest],a ld a,b - ld [wUnusedCC3B],a + ld [wTextDest + 1],a NextTextCommand:: ld a,[hli] @@ -480,10 +480,10 @@ TextCommand02:: TextCommand03:: pop hl ld a,[hli] - ld [wUnusedCC3A],a + ld [wTextDest],a ld c,a ld a,[hli] - ld [wUnusedCC3B],a + ld [wTextDest + 1],a ld b,a jp NextTextCommand @@ -1,760 +1,5 @@ - -percent EQUS "* $ff / 100" - -lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + ((\3) & $ff) - ENDM - - -; Constant enumeration is useful for monsters, items, moves, etc. -const_def: MACRO -const_value = 0 -ENDM - -const: MACRO -\1 EQU const_value -const_value = const_value + 1 -ENDM - - -homecall: MACRO - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(\1) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call \1 - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ENDM - -farcall EQUS "callba" - -callba: MACRO - ld b, BANK(\1) - ld hl, \1 - call Bankswitch - ENDM - -callab: MACRO - ld hl, \1 - ld b, BANK(\1) - call Bankswitch - ENDM - -jpba: MACRO - ld b, BANK(\1) - ld hl, \1 - jp Bankswitch - ENDM - -jpab: MACRO - ld hl, \1 - ld b, BANK(\1) - jp Bankswitch - ENDM - -bcd2: MACRO - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM - -bcd3: MACRO - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM - -coins equs "bcd2" -money equs "bcd3" - -validateCoords: MACRO - if \1 >= SCREEN_WIDTH - fail "x coord out of range" - endc - if \2 >= SCREEN_HEIGHT - fail "y coord out of range" - endc - endm - -;\1 = r -;\2 = X -;\3 = Y -;\4 = which tilemap (optional) -coord: MACRO - validateCoords \2, \3 -if _NARG >= 4 - ld \1, \4 + SCREEN_WIDTH * \3 + \2 -else - ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -aCoord: MACRO - validateCoords \1, \2 -if _NARG >= 3 - ld a, [\3 + SCREEN_WIDTH * \2 + \1] -else - ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -Coorda: MACRO - validateCoords \1, \2 -if _NARG >= 3 - ld [\3 + SCREEN_WIDTH * \2 + \1], a -else - ld [wTileMap + SCREEN_WIDTH * \2 + \1], a -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -dwCoord: MACRO - validateCoords \1, \2 -if _NARG >= 3 - dw \3 + SCREEN_WIDTH * \2 + \1 -else - dw wTileMap + SCREEN_WIDTH * \2 + \1 -endc - ENDM - -;\1 = r -;\2 = X -;\3 = Y -;\4 = map width -overworldMapCoord: MACRO - ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) - ENDM - -;\1 = Map Width -;\2 = Rows above (Y-blocks) -;\3 = X movement (X-blocks) -EVENT_DISP: MACRO - dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp - db \2,\3 ;Y,X - ENDM - -FLYWARP_DATA: MACRO - EVENT_DISP \1,\2,\3 - db ((\2) & $01) ;sub-block Y - db ((\3) & $01) ;sub-block X - ENDM - -; external map entry macro -EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer -; the appearance of towns and routes in the town map, indexed by map id - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - dn \2, \1 - dw \3 - ENDM - -; internal map entry macro -IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer -; the appearance of buildings and dungeons in the town map - ; byte : maximum map id subject to this rule - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - db \1 + 1 - dn \3, \2 - dw \4 - ENDM - -; tilesets' headers macro -tileset: MACRO - db BANK(\2) ; BANK(GFX) - dw \1, \2, \3 ; Block, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; grass tile - db \8 ; permission (indoor, cave, outdoor) - ENDM - -INDOOR EQU 0 -CAVE EQU 1 -OUTDOOR EQU 2 - -; macro for two nibbles -dn: MACRO - db (\1 << 4 | \2) - ENDM - -; macro for putting a byte then a word -dbw: MACRO - db \1 - dw \2 - ENDM - -dba: MACRO - dbw BANK(\1), \1 - ENDM - -dwb: MACRO - dw \1 - db \2 - ENDM - -dab: MACRO - dwb \1, BANK(\1) - ENDM - -dbbw: MACRO - db \1, \2 - dw \3 - ENDM - -; data format macros -RGB: MACRO - dw (\3 << 10 | \2 << 5 | \1) - ENDM - -; text macros -text EQUS "db $00," ; Start writing text. -next EQUS "db $4e," ; Move a line down. -line EQUS "db $4f," ; Start writing at the bottom line. -para EQUS "db $51," ; Start a new paragraph. -cont EQUS "db $55," ; Scroll to the next line. -done EQUS "db $57" ; End a text box. -prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). - -page EQUS "db $49," ; Start a new Pokedex page. -dex EQUS "db $50, $50" ; End a Pokedex entry. - -TX_RAM: MACRO -; prints text to screen -; \1: RAM address to read from - db $1 - dw \1 - ENDM - -TX_BCD: MACRO -; \1: RAM address to read from -; \2: number of bytes + print flags - db $2 - dw \1 - db \2 - ENDM - -TX_LINE EQUS "db $05" -TX_BLINK EQUS "db $06" -;TX_SCROLL EQUS "db $07" -TX_ASM EQUS "db $08" - -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 - dw \1 - db \2 << 4 | \3 - ENDM - -TX_DELAY EQUS "db $0a" -TX_SFX_ITEM_1 EQUS "db $0b" -TX_SFX_LEVEL_UP EQUS "db $0b" -;TX_ELLIPSES EQUS "db $0c" -TX_WAIT EQUS "db $0d" -;TX_SFX_DEX_RATING EQUS "db $0e" -TX_SFX_ITEM_2 EQUS "db $10" -TX_SFX_KEY_ITEM EQUS "db $11" -TX_SFX_CAUGHT_MON EQUS "db $12" -TX_SFX_DEX_PAGE_ADDED EQUS "db $13" -TX_CRY_NIDORINA EQUS "db $14" -TX_CRY_PIDGEOT EQUS "db $15" -;TX_CRY_DEWGONG EQUS "db $16" - -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) - ENDM - -TX_VENDING_MACHINE EQUS "db $f5" -TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" -TX_PRIZE_VENDOR EQUS "db $f7" -TX_POKECENTER_PC EQUS "db $f9" -TX_PLAYERS_PC EQUS "db $fc" -TX_BILLS_PC EQUS "db $fd" - -TX_MART: MACRO - db $FE, _NARG - rept _NARG - db \1 - shift - endr - db $FF - ENDM - -TX_POKECENTER_NURSE EQUS "db $ff" - -; Predef macro. -predef_const: MACRO - const \1PredefID - ENDM - -add_predef: MACRO -\1Predef:: - db BANK(\1) - dw \1 - ENDM - -predef_id: MACRO - ld a, (\1Predef - PredefPointers) / 3 - ENDM - -predef: MACRO - predef_id \1 - call Predef - ENDM - -predef_jump: MACRO - predef_id \1 - jp Predef - ENDM - -tx_pre_const: MACRO - const \1_id - ENDM - -add_tx_pre: MACRO -\1_id:: dw \1 -ENDM - -db_tx_pre: MACRO - db (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre_id: MACRO - ld a, (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre: MACRO - tx_pre_id \1 - call PrintPredefTextID -ENDM - -tx_pre_jump: MACRO - tx_pre_id \1 - jp PrintPredefTextID -ENDM - -sound0x0A: macro - db $11 -endm - - -WALK EQU $FE -STAY EQU $FF - -DOWN EQU $D0 -UP EQU $D1 -LEFT EQU $D2 -RIGHT EQU $D3 -NONE EQU $FF - -;\1 sprite id -;\2 x position -;\3 y position -;\4 movement (WALK/STAY) -;\5 range or direction -;\6 text id -;\7 items only: item id -;\7 trainers only: trainer class/pokemon id -;\8 trainers only: trainer number/pokemon level -object: MACRO - db \1 - db \3 + 4 - db \2 + 4 - db \4 - db \5 - IF (_NARG > 7) - db TRAINER | \6 - db \7 - db \8 - ELSE - IF (_NARG > 6) - db ITEM | \6 - db \7 - ELSE - db \6 - ENDC - ENDC -ENDM - -StopAllMusic: macro - ld a, $ff - call PlaySound - endm - -;1_channel EQU $00 -;2_channels EQU $40 -;3_channels EQU $80 -;4_channels EQU $C0 - -CH0 EQU 0 -CH1 EQU 1 -CH2 EQU 2 -CH3 EQU 3 -CH4 EQU 4 -CH5 EQU 5 -CH6 EQU 6 -CH7 EQU 7 - -unknownsfx0x10: MACRO - db $10 - db \1 -ENDM - -unknownsfx0x20: MACRO - db $20 | \1 - db \2 - db \3 - db \4 -ENDM - -unknownnoise0x20: MACRO - db $20 | \1 - db \2 - db \3 -ENDM - -;format: pitch length (in 16ths) -C_: MACRO - db $00 | (\1 - 1) -ENDM - -C#: MACRO - db $10 | (\1 - 1) -ENDM - -D_: MACRO - db $20 | (\1 - 1) -ENDM - -D#: MACRO - db $30 | (\1 - 1) -ENDM - -E_: MACRO - db $40 | (\1 - 1) -ENDM - -F_: MACRO - db $50 | (\1 - 1) -ENDM - -F#: MACRO - db $60 | (\1 - 1) -ENDM - -G_: MACRO - db $70 | (\1 - 1) -ENDM - -G#: MACRO - db $80 | (\1 - 1) -ENDM - -A_: MACRO - db $90 | (\1 - 1) -ENDM - -A#: MACRO - db $A0 | (\1 - 1) -ENDM - -B_: MACRO - db $B0 | (\1 - 1) -ENDM - -;format: instrument length (in 16ths) -snare1: MACRO - db $B0 | (\1 - 1) - db $01 -ENDM - -snare2: MACRO - db $B0 | (\1 - 1) - db $02 -ENDM - -snare3: MACRO - db $B0 | (\1 - 1) - db $03 -ENDM - -snare4: MACRO - db $B0 | (\1 - 1) - db $04 -ENDM - -snare5: MACRO - db $B0 | (\1 - 1) - db $05 -ENDM - -triangle1: MACRO - db $B0 | (\1 - 1) - db $06 -ENDM - -triangle2: MACRO - db $B0 | (\1 - 1) - db $07 -ENDM - -snare6: MACRO - db $B0 | (\1 - 1) - db $08 -ENDM - -snare7: MACRO - db $B0 | (\1 - 1) - db $09 -ENDM - -snare8: MACRO - db $B0 | (\1 - 1) - db $0A -ENDM - -snare9: MACRO - db $B0 | (\1 - 1) - db $0B -ENDM - -cymbal1: MACRO - db $B0 | (\1 - 1) - db $0C -ENDM - -cymbal2: MACRO - db $B0 | (\1 - 1) - db $0D -ENDM - -cymbal3: MACRO - db $B0 | (\1 - 1) - db $0E -ENDM - -mutedsnare1: MACRO - db $B0 | (\1 - 1) - db $0F -ENDM - -triangle3: MACRO - db $B0 | (\1 - 1) - db $10 -ENDM - -mutedsnare2: MACRO - db $B0 | (\1 - 1) - db $11 -ENDM - -mutedsnare3: MACRO - db $B0 | (\1 - 1) - db $12 -ENDM - -mutedsnare4: MACRO - db $B0 | (\1 - 1) - db $13 -ENDM - -;format: rest length (in 16ths) -rest: MACRO - db $C0 | (\1 - 1) -ENDM - -; format: notetype speed, volume, fade -notetype: MACRO - db $D0 | \1 - db (\2 << 4) | \3 -ENDM - -dspeed: MACRO - db $D0 | \1 -ENDM - -octave: MACRO - db $E8 - \1 -ENDM - -toggleperfectpitch: MACRO - db $E8 -ENDM - -;format: vibrato delay, rate, depth -vibrato: MACRO - db $EA - db \1 - db (\2 << 4) | \3 -ENDM - -pitchbend: MACRO - db $EB - db \1 - db \2 -ENDM - -duty: MACRO - db $EC - db \1 -ENDM - -tempo: MACRO - db $ED - db \1 / $100 - db \1 % $100 -ENDM - -stereopanning: MACRO - db $EE - db \1 -ENDM - -volume: MACRO - db $F0 - db (\1 << 4) | \2 -ENDM - -executemusic: MACRO - db $F8 -ENDM - -dutycycle: MACRO - db $FC - db \1 -ENDM - -;format: callchannel address -callchannel: MACRO - db $FD - dw \1 -ENDM - -;format: loopchannel count, address -loopchannel: MACRO - db $FE - db \1 - dw \2 -ENDM - -endchannel: MACRO - db $FF -ENDM - - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -NORTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location - dw wOverworldMap + 3 + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to width of connection strip (why?) -SOUTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + \4 ; "Conection Strip" location - dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - IF (_NARG > 5) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \1_WIDTH - \3 ; width of connection strip - ENDC - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db 0 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -WEST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location - dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db (\2_WIDTH * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to height of connection strip (why?) -EAST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location - dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - IF (_NARG > 5) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \1_HEIGHT - \3 ; height of connection strip - ENDC - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db 0 ; x alignment - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -tmlearn: MACRO -x = 0 - rept _NARG -IF \1 != 0 -x = x | (1 << ((\1 - 1) % 8)) -ENDC - shift - endr - db x -ENDM +INCLUDE "macros/asm_macros.asm" +INCLUDE "macros/data_macros.asm" +INCLUDE "macros/text_macros.asm" +INCLUDE "macros/audio_macros.asm" +INCLUDE "macros/event_macros.asm" diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm new file mode 100755 index 00000000..5cf5a809 --- /dev/null +++ b/macros/asm_macros.asm @@ -0,0 +1,188 @@ + +lb: MACRO ; r, hi, lo + ld \1, (\2) << 8 + ((\3) & $ff) +ENDM + +homecall: MACRO + ld a, [H_LOADEDROMBANK] + push af + ld a, BANK(\1) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + call \1 + pop af + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a +ENDM + +farcall EQUS "callba" + +callba: MACRO + ld b, BANK(\1) + ld hl, \1 + call Bankswitch +ENDM + +callab: MACRO + ld hl, \1 + ld b, BANK(\1) + call Bankswitch +ENDM + +jpba: MACRO + ld b, BANK(\1) + ld hl, \1 + jp Bankswitch +ENDM + +jpab: MACRO + ld hl, \1 + ld b, BANK(\1) + jp Bankswitch +ENDM + +validateCoords: MACRO + IF \1 >= SCREEN_WIDTH + fail "x coord out of range" + ENDC + IF \2 >= SCREEN_HEIGHT + fail "y coord out of range" + ENDC +ENDM + +;\1 = r +;\2 = X +;\3 = Y +;\4 = which tilemap (optional) +coord: MACRO + validateCoords \2, \3 + IF _NARG >= 4 + ld \1, \4 + SCREEN_WIDTH * \3 + \2 + ELSE + ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +aCoord: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + ld a, [\3 + SCREEN_WIDTH * \2 + \1] + ELSE + ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +Coorda: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + ld [\3 + SCREEN_WIDTH * \2 + \1], a + ELSE + ld [wTileMap + SCREEN_WIDTH * \2 + \1], a + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +dwCoord: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + dw \3 + SCREEN_WIDTH * \2 + \1 + ELSE + dw wTileMap + SCREEN_WIDTH * \2 + \1 + ENDC +ENDM + +;\1 = r +;\2 = X +;\3 = Y +;\4 = map width +overworldMapCoord: MACRO + ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) +ENDM + +; macro for two nibbles +dn: MACRO + db (\1 << 4 | \2) +ENDM + +; macro for putting a byte then a word +dbw: MACRO + db \1 + dw \2 +ENDM + +dba: MACRO + dbw BANK(\1), \1 +ENDM + +dwb: MACRO + dw \1 + db \2 +ENDM + +dab: MACRO + dwb \1, BANK(\1) +ENDM + +dbbw: MACRO + db \1, \2 + dw \3 +ENDM + +; Predef macro. +predef_const: MACRO + const \1PredefID +ENDM + +add_predef: MACRO +\1Predef:: + db BANK(\1) + dw \1 +ENDM + +predef_id: MACRO + ld a, (\1Predef - PredefPointers) / 3 +ENDM + +predef: MACRO + predef_id \1 + call Predef +ENDM + +predef_jump: MACRO + predef_id \1 + jp Predef +ENDM + +tx_pre_const: MACRO + const \1_id +ENDM + +add_tx_pre: MACRO +\1_id:: dw \1 +ENDM + +db_tx_pre: MACRO + db (\1_id - TextPredefs) / 2 + 1 +ENDM + +tx_pre_id: MACRO + ld a, (\1_id - TextPredefs) / 2 + 1 +ENDM + +tx_pre: MACRO + tx_pre_id \1 + call PrintPredefTextID +ENDM + +tx_pre_jump: MACRO + tx_pre_id \1 + jp PrintPredefTextID +ENDM diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm new file mode 100755 index 00000000..71304bf8 --- /dev/null +++ b/macros/audio_macros.asm @@ -0,0 +1,277 @@ + +StopAllMusic: MACRO + ld a, $ff + call PlaySound +ENDM + +Ch0 EQU 0 +Ch1 EQU 1 +Ch2 EQU 2 +Ch3 EQU 3 +Ch4 EQU 4 +Ch5 EQU 5 +Ch6 EQU 6 +Ch7 EQU 7 + +audio: MACRO + db (_NARG - 2) << 6 | \2 + dw \1_\2 + IF _NARG > 2 + db \3 + dw \1_\3 + ENDC + IF _NARG > 3 + db \4 + dw \1_\4 + ENDC + IF _NARG > 4 + db \5 + dw \1_\5 + ENDC +ENDM + +unknownsfx0x10: MACRO + db $10 + db \1 +ENDM + +unknownsfx0x20: MACRO + db $20 | \1 + db \2 + db \3 + db \4 +ENDM + +unknownnoise0x20: MACRO + db $20 | \1 + db \2 + db \3 +ENDM + +;format: pitch length (in 16ths) +C_: MACRO + db $00 | (\1 - 1) +ENDM + +C#: MACRO + db $10 | (\1 - 1) +ENDM + +D_: MACRO + db $20 | (\1 - 1) +ENDM + +D#: MACRO + db $30 | (\1 - 1) +ENDM + +E_: MACRO + db $40 | (\1 - 1) +ENDM + +F_: MACRO + db $50 | (\1 - 1) +ENDM + +F#: MACRO + db $60 | (\1 - 1) +ENDM + +G_: MACRO + db $70 | (\1 - 1) +ENDM + +G#: MACRO + db $80 | (\1 - 1) +ENDM + +A_: MACRO + db $90 | (\1 - 1) +ENDM + +A#: MACRO + db $A0 | (\1 - 1) +ENDM + +B_: MACRO + db $B0 | (\1 - 1) +ENDM + +;format: instrument length (in 16ths) +snare1: MACRO + db $B0 | (\1 - 1) + db $01 +ENDM + +snare2: MACRO + db $B0 | (\1 - 1) + db $02 +ENDM + +snare3: MACRO + db $B0 | (\1 - 1) + db $03 +ENDM + +snare4: MACRO + db $B0 | (\1 - 1) + db $04 +ENDM + +snare5: MACRO + db $B0 | (\1 - 1) + db $05 +ENDM + +triangle1: MACRO + db $B0 | (\1 - 1) + db $06 +ENDM + +triangle2: MACRO + db $B0 | (\1 - 1) + db $07 +ENDM + +snare6: MACRO + db $B0 | (\1 - 1) + db $08 +ENDM + +snare7: MACRO + db $B0 | (\1 - 1) + db $09 +ENDM + +snare8: MACRO + db $B0 | (\1 - 1) + db $0A +ENDM + +snare9: MACRO + db $B0 | (\1 - 1) + db $0B +ENDM + +cymbal1: MACRO + db $B0 | (\1 - 1) + db $0C +ENDM + +cymbal2: MACRO + db $B0 | (\1 - 1) + db $0D +ENDM + +cymbal3: MACRO + db $B0 | (\1 - 1) + db $0E +ENDM + +mutedsnare1: MACRO + db $B0 | (\1 - 1) + db $0F +ENDM + +triangle3: MACRO + db $B0 | (\1 - 1) + db $10 +ENDM + +mutedsnare2: MACRO + db $B0 | (\1 - 1) + db $11 +ENDM + +mutedsnare3: MACRO + db $B0 | (\1 - 1) + db $12 +ENDM + +mutedsnare4: MACRO + db $B0 | (\1 - 1) + db $13 +ENDM + +;format: rest length (in 16ths) +rest: MACRO + db $C0 | (\1 - 1) +ENDM + +; format: notetype speed, volume, fade +notetype: MACRO + db $D0 | \1 + db (\2 << 4) | \3 +ENDM + +dspeed: MACRO + db $D0 | \1 +ENDM + +octave: MACRO + db $E8 - \1 +ENDM + +toggleperfectpitch: MACRO + db $E8 +ENDM + +;format: vibrato delay, rate, depth +vibrato: MACRO + db $EA + db \1 + db (\2 << 4) | \3 +ENDM + +pitchbend: MACRO + db $EB + db \1 + db \2 +ENDM + +duty: MACRO + db $EC + db \1 +ENDM + +tempo: MACRO + db $ED + db \1 / $100 + db \1 % $100 +ENDM + +stereopanning: MACRO + db $EE + db \1 +ENDM + +volume: MACRO + db $F0 + db (\1 << 4) | \2 +ENDM + +executemusic: MACRO + db $F8 +ENDM + +dutycycle: MACRO + db $FC + db \1 +ENDM + +;format: callchannel address +callchannel: MACRO + db $FD + dw \1 +ENDM + +;format: loopchannel count, address +loopchannel: MACRO + db $FE + db \1 + dw \2 +ENDM + +endchannel: MACRO + db $FF +ENDM diff --git a/macros/data_macros.asm b/macros/data_macros.asm new file mode 100755 index 00000000..e24ae20e --- /dev/null +++ b/macros/data_macros.asm @@ -0,0 +1,220 @@ + +; Constant enumeration is useful for monsters, items, moves, etc. +const_def: MACRO +const_value = 0 +ENDM + +const: MACRO +\1 EQU const_value +const_value = const_value + 1 +ENDM + +; data format macros + +percent EQUS "* $ff / 100" + +bcd2: MACRO + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +bcd3: MACRO + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +coins equs "bcd2" +money equs "bcd3" + +;\1 = Map Width +;\2 = Rows above (Y-blocks) +;\3 = X movement (X-blocks) +EVENT_DISP: MACRO + dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp + db \2,\3 ;Y,X +ENDM + +FLYWARP_DATA: MACRO + EVENT_DISP \1,\2,\3 + db ((\2) & $01) ;sub-block Y + db ((\3) & $01) ;sub-block X +ENDM + +; external map entry macro +EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer +; the appearance of towns and routes in the town map, indexed by map id + ; nybble: y-coordinate + ; nybble: x-coordinate + ; word : pointer to map name + dn \2, \1 + dw \3 +ENDM + +; internal map entry macro +IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer +; the appearance of buildings and dungeons in the town map + ; byte : maximum map id subject to this rule + ; nybble: y-coordinate + ; nybble: x-coordinate + ; word : pointer to map name + db \1 + 1 + dn \3, \2 + dw \4 +ENDM + +; tilesets' headers macro +tileset: MACRO + db BANK(\2) ; BANK(GFX) + dw \1, \2, \3 ; Block, GFX, Coll + db \4, \5, \6 ; counter tiles + db \7 ; grass tile + db \8 ; permission (indoor, cave, outdoor) +ENDM + +INDOOR EQU 0 +CAVE EQU 1 +OUTDOOR EQU 2 + +RGB: MACRO + dw (\3 << 10 | \2 << 5 | \1) +ENDM + +WALK EQU $FE +STAY EQU $FF + +DOWN EQU $D0 +UP EQU $D1 +LEFT EQU $D2 +RIGHT EQU $D3 +NONE EQU $FF + +;\1 sprite id +;\2 x position +;\3 y position +;\4 movement (WALK/STAY) +;\5 range or direction +;\6 text id +;\7 items only: item id +;\7 trainers only: trainer class/pokemon id +;\8 trainers only: trainer number/pokemon level +object: MACRO + db \1 + db \3 + 4 + db \2 + 4 + db \4 + db \5 + IF (_NARG > 7) + db TRAINER | \6 + db \7 + db \8 + ELSE + IF (_NARG > 6) + db ITEM | \6 + db \7 + ELSE + db \6 + ENDC + ENDC +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +NORTH_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location + dw wOverworldMap + 3 + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width + db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) + db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) + dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to width of connection strip (why?) +SOUTH_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + \4 ; "Conection Strip" location + dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + IF (_NARG > 5) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \1_WIDTH - \3 ; width of connection strip + ENDC + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width + db 0 ; y alignment (y coordinate of player when entering map) + db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +WEST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location + dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width + db (\3 - \4) * -2 ; y alignment + db (\2_WIDTH * 2) - 1 ; x alignment + dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to height of connection strip (why?) +EAST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location + dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + IF (_NARG > 5) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \1_HEIGHT - \3 ; height of connection strip + ENDC + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width + db (\3 - \4) * -2 ; y alignment + db 0 ; x alignment + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) +ENDM + +tmlearn: MACRO +x = 0 + REPT _NARG +IF \1 != 0 +x = x | (1 << ((\1 - 1) % 8)) +ENDC + SHIFT + ENDR + db x +ENDM diff --git a/constants/event_macros.asm b/macros/event_macros.asm index 20027209..20027209 100755 --- a/constants/event_macros.asm +++ b/macros/event_macros.asm diff --git a/macros/text_macros.asm b/macros/text_macros.asm new file mode 100755 index 00000000..2c570525 --- /dev/null +++ b/macros/text_macros.asm @@ -0,0 +1,80 @@ + +; text macros +text EQUS "db $00," ; Start writing text. +next EQUS "db $4e," ; Move a line down. +line EQUS "db $4f," ; Start writing at the bottom line. +para EQUS "db $51," ; Start a new paragraph. +cont EQUS "db $55," ; Scroll to the next line. +done EQUS "db $57" ; End a text box. +prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). + +page EQUS "db $49," ; Start a new Pokedex page. +dex EQUS "db $50, $50" ; End a Pokedex entry. + +TX_RAM: MACRO +; prints text to screen +; \1: RAM address to read from + db $1 + dw \1 +ENDM + +TX_BCD: MACRO +; \1: RAM address to read from +; \2: number of bytes + print flags + db $2 + dw \1 + db \2 +ENDM + +TX_LINE EQUS "db $05" +TX_BLINK EQUS "db $06" +;TX_SCROLL EQUS "db $07" +TX_ASM EQUS "db $08" + +TX_NUM: MACRO +; print a big-endian decimal number. +; \1: address to read from +; \2: number of bytes to read +; \3: number of digits to display + db $09 + dw \1 + db \2 << 4 | \3 +ENDM + +TX_DELAY EQUS "db $0a" +TX_SFX_ITEM_1 EQUS "db $0b" +TX_SFX_LEVEL_UP EQUS "db $0b" +;TX_ELLIPSES EQUS "db $0c" +TX_WAIT EQUS "db $0d" +;TX_SFX_DEX_RATING EQUS "db $0e" +TX_SFX_ITEM_2 EQUS "db $10" +TX_SFX_KEY_ITEM EQUS "db $11" +TX_SFX_CAUGHT_MON EQUS "db $12" +TX_SFX_DEX_PAGE_ADDED EQUS "db $13" +TX_CRY_NIDORINA EQUS "db $14" +TX_CRY_PIDGEOT EQUS "db $15" +;TX_CRY_DEWGONG EQUS "db $16" + +TX_FAR: MACRO + db $17 + dw \1 + db BANK(\1) +ENDM + +TX_VENDING_MACHINE EQUS "db $f5" +TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" +TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" + +TX_MART: MACRO + db $FE, _NARG + REPT _NARG + db \1 + SHIFT + ENDR + db $FF +ENDM + +TX_POKECENTER_NURSE EQUS "db $ff" diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 26068977..88d6a8de 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -1,7 +1,7 @@ AgathaScript: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, AgathaTrainerHeaders + ld hl, AgathaTrainerHeader0 ld de, AgathaScriptPointers ld a, [wAgathaCurScript] call ExecuteCurMapScriptInTable @@ -120,7 +120,6 @@ AgathaTextPointers: dw AgathaText1 dw AgathaDontRunAwayText -AgathaTrainerHeaders: AgathaTrainerHeader0: dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 4a7ecdaf..02ceebf2 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,7 +1,7 @@ BrunoScript: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, BrunoTrainerHeaders + ld hl, BrunoTrainerHeader0 ld de, BrunoScriptPointers ld a, [wBrunoCurScript] call ExecuteCurMapScriptInTable @@ -117,7 +117,6 @@ BrunoTextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeaders: BrunoTrainerHeader0: dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 5f86df96..c0a9df6f 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -4,7 +4,7 @@ CeladonGymScript: res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing - ld hl, CeladonGymTrainerHeaders + ld hl, CeladonGymTrainerHeader0 ld de, CeladonGymScriptPointers ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,7 @@ CeladonGymText_48963: set 3, [hl] ; deactivate gym trainers - SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_7 + SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 jp CeladonGymText_48943 @@ -83,7 +83,6 @@ CeladonGymTextPointers: dw TM21Text dw TM21NoRoomText -CeladonGymTrainerHeaders: CeladonGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -93,55 +92,55 @@ CeladonGymTrainerHeader0: dw CeladonGymEndBattleText2 ; TextEndBattle dw CeladonGymEndBattleText2 ; TextEndBattle -CeladonGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 +CeladonGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1 dw CeladonGymBattleText3 ; TextBeforeBattle dw CeladonGymAfterBattleText3 ; TextAfterBattle dw CeladonGymEndBattleText3 ; TextEndBattle dw CeladonGymEndBattleText3 ; TextEndBattle -CeladonGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 +CeladonGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 dw CeladonGymBattleText4 ; TextBeforeBattle dw CeladonGymAfterBattleText4 ; TextAfterBattle dw CeladonGymEndBattleText4 ; TextEndBattle dw CeladonGymEndBattleText4 ; TextEndBattle -CeladonGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 +CeladonGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 dw CeladonGymBattleText5 ; TextBeforeBattle dw CeladonGymAfterBattleText5 ; TextAfterBattle dw CeladonGymEndBattleText5 ; TextEndBattle dw CeladonGymEndBattleText5 ; TextEndBattle -CeladonGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 +CeladonGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 dw CeladonGymBattleText6 ; TextBeforeBattle dw CeladonGymAfterBattleText6 ; TextAfterBattle dw CeladonGymEndBattleText6 ; TextEndBattle dw CeladonGymEndBattleText6 ; TextEndBattle -CeladonGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6 +CeladonGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 dw CeladonGymBattleText7 ; TextBeforeBattle dw CeladonGymAfterBattleText7 ; TextAfterBattle dw CeladonGymEndBattleText7 ; TextEndBattle dw CeladonGymEndBattleText7 ; TextEndBattle -CeladonGymTrainerHeader7: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 +CeladonGymTrainerHeader6: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 dw CeladonGymBattleText8 ; TextBeforeBattle dw CeladonGymAfterBattleText8 ; TextAfterBattle dw CeladonGymEndBattleText8 ; TextEndBattle @@ -229,7 +228,7 @@ CeladonGymAfterBattleText2: CeladonGymText3: TX_ASM - ld hl, CeladonGymTrainerHeader2 + ld hl, CeladonGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -247,7 +246,7 @@ CeladonGymAfterBattleText3: CeladonGymText4: TX_ASM - ld hl, CeladonGymTrainerHeader3 + ld hl, CeladonGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -265,7 +264,7 @@ CeladonGymAfterBattleText4: CeladonGymText5: TX_ASM - ld hl, CeladonGymTrainerHeader4 + ld hl, CeladonGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -283,7 +282,7 @@ CeladonGymAfterBattleText5: CeladonGymText6: TX_ASM - ld hl, CeladonGymTrainerHeader5 + ld hl, CeladonGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -301,7 +300,7 @@ CeladonGymAfterBattleText6: CeladonGymText7: TX_ASM - ld hl, CeladonGymTrainerHeader6 + ld hl, CeladonGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -319,7 +318,7 @@ CeladonGymAfterBattleText7: CeladonGymText8: TX_ASM - ld hl, CeladonGymTrainerHeader7 + ld hl, CeladonGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 326e2d6d..5d6138d9 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -4,7 +4,7 @@ CeruleanGymScript: res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing - ld hl, CeruleanGymTrainerHeaders + ld hl, CeruleanGymTrainerHeader0 ld de, CeruleanGymScriptPointers ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable @@ -79,7 +79,6 @@ CeruleanGymTextPointers: dw CeruleanGymText6 dw CeruleanGymText7 -CeruleanGymTrainerHeaders: CeruleanGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -148,7 +147,6 @@ CeruleanGymText5: db "@" CeruleanGymText6: -ReceivedTM11Text: TX_FAR _ReceivedTM11Text TX_SFX_ITEM_1 db "@" diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 9d28046f..fa0cdca2 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -1,6 +1,6 @@ FightingDojoScript: call EnableAutoTextBoxDrawing - ld hl, FightingDojoTrainerHeaders + ld hl, FightingDojoTrainerHeader0 ld de, FightingDojoScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable @@ -90,7 +90,6 @@ FightingDojoTextPointers: dw FightingDojoText7 dw FightingDojoText8 -FightingDojoTrainerHeaders: FightingDojoTrainerHeader0: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 99703fd2..b5380512 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -1,7 +1,7 @@ FuchsiaGymScript: call FuchsiaGymScript_75453 call EnableAutoTextBoxDrawing - ld hl, FuchsiaGymTrainerHeaders + ld hl, FuchsiaGymTrainerHeader0 ld de, FuchsiaGymScriptPointers ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,7 @@ FuchsiaGymScript3_75497: set 4, [hl] ; deactivate gym trainers - SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 + SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 jp FuchsiaGymScript_75477 @@ -83,7 +83,6 @@ FuchsiaGymTextPointers: dw FuchsiaGymText10 dw FuchsiaGymText11 -FuchsiaGymTrainerHeaders: FuchsiaGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -93,46 +92,46 @@ FuchsiaGymTrainerHeader0: dw FuchsiaGymEndBattleText1 ; TextEndBattle dw FuchsiaGymEndBattleText1 ; TextEndBattle -FuchsiaGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 +FuchsiaGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 dw FuchsiaGymBattleText2 ; TextBeforeBattle dw FuchsiaGymAfterBattleText2 ; TextAfterBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle -FuchsiaGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 +FuchsiaGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 dw FuchsiaGymBattleText3 ; TextBeforeBattle dw FuchsiaGymAfterBattleText3 ; TextAfterBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle -FuchsiaGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 +FuchsiaGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 dw FuchsiaGymBattleText4 ; TextBeforeBattle dw FuchsiaGymAfterBattleText4 ; TextAfterBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle -FuchsiaGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 +FuchsiaGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 dw FuchsiaGymBattleText5 ; TextBeforeBattle dw FuchsiaGymAfterBattleText5 ; TextAfterBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle -FuchsiaGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 +FuchsiaGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 dw FuchsiaGymBattleText6 ; TextBeforeBattle dw FuchsiaGymAfterBattleText6 ; TextAfterBattle dw FuchsiaGymEndBattleText6 ; TextEndBattle @@ -223,7 +222,7 @@ FuchsiaGymAfterBattleText1: FuchsiaGymText3: TX_ASM - ld hl, FuchsiaGymTrainerHeader2 + ld hl, FuchsiaGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -241,7 +240,7 @@ FuchsiaGymAfterBattleText2: FuchsiaGymText4: TX_ASM - ld hl, FuchsiaGymTrainerHeader3 + ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -259,7 +258,7 @@ FuchsiaGymAfterBattleText3: FuchsiaGymText5: TX_ASM - ld hl, FuchsiaGymTrainerHeader4 + ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -277,7 +276,7 @@ FuchsiaGymAfterBattleText4: FuchsiaGymText6: TX_ASM - ld hl, FuchsiaGymTrainerHeader5 + ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -295,7 +294,7 @@ FuchsiaGymAfterBattleText5: FuchsiaGymText7: TX_ASM - ld hl, FuchsiaGymTrainerHeader6 + ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/lance.asm b/scripts/lance.asm index b0ec7f6a..a0b0e6e7 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,7 +1,7 @@ LanceScript: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing - ld hl, LanceTrainerHeaders + ld hl, LanceTrainerHeader0 ld de, LanceScriptPointers ld a, [wLanceCurScript] call ExecuteCurMapScriptInTable @@ -130,7 +130,6 @@ LanceScript3: LanceTextPointers: dw LanceText1 -LanceTrainerHeaders: LanceTrainerHeader0: dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 60be524d..ec29847a 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,7 +1,7 @@ LoreleiScript: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, LoreleiTrainerHeaders + ld hl, LoreleiTrainerHeader0 ld de, LoreleiScriptPointers ld a, [wLoreleiCurScript] call ExecuteCurMapScriptInTable @@ -119,7 +119,6 @@ LoreleiTextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeaders: LoreleiTrainerHeader0: dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index e37a09cd..2fdc18c6 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -1,7 +1,7 @@ Mansion1Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing - ld hl, Mansion1TrainerHeaders + ld hl, Mansion1TrainerHeader0 ld de, Mansion1ScriptPointers ld a, [wMansion1CurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,6 @@ Mansion1TextPointers: dw PickUpItemText dw Mansion1Text4 -Mansion1TrainerHeaders: Mansion1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index a9f9ffec..ddc1ff7a 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -1,7 +1,7 @@ Mansion2Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeaders + ld hl, Mansion2TrainerHeader0 ld de, Mansion2ScriptPointers ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable @@ -63,7 +63,6 @@ Mansion2TextPointers: dw Mansion2Text4 dw Mansion2Text5 -Mansion2TrainerHeaders: Mansion2TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index afb46671..abe76df8 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -90,7 +90,6 @@ Mansion3TextPointers: dw Mansion3Text5 dw Mansion3Text6 -Mansion3TrainerHeaders: Mansion3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -100,10 +99,10 @@ Mansion3TrainerHeader0: dw Mansion3EndBattleText1 ; TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle -Mansion3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2 +Mansion3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 dw Mansion3BattleText2 ; TextBeforeBattle dw Mansion3AfterBattleText2 ; TextAfterBattle dw Mansion3EndBattleText2 ; TextEndBattle @@ -119,7 +118,7 @@ Mansion3Text1: Mansion3Text2: TX_ASM - ld hl, Mansion3TrainerHeader2 + ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 5ae3fea2..de8a5d58 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -69,7 +69,6 @@ Mansion4TextPointers: dw PickUpItemText dw Mansion3Text6 -Mansion4TrainerHeaders: Mansion4TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -79,10 +78,10 @@ Mansion4TrainerHeader0: dw Mansion4EndBattleText1 ; TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle -Mansion4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2 +Mansion4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 dw Mansion4BattleText2 ; TextBeforeBattle dw Mansion4AfterBattleText2 ; TextAfterBattle dw Mansion4EndBattleText2 ; TextEndBattle @@ -98,7 +97,7 @@ Mansion4Text1: Mansion4Text2: TX_ASM - ld hl, Mansion4TrainerHeader2 + ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 11f7e2e4..5ee3d025 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -28,7 +28,6 @@ MtMoon1TextPointers: dw PickUpItemText dw MtMoon1Text14 -MtMoon1TrainerHeaders: MtMoon1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -38,55 +37,55 @@ MtMoon1TrainerHeader0: dw MtMoon1EndBattleText2 ; TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle -MtMoon1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 +MtMoon1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 dw MtMoon1BattleText3 ; TextBeforeBattle dw MtMoon1AfterBattleText3 ; TextAfterBattle dw MtMoon1EndBattleText3 ; TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle -MtMoon1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 +MtMoon1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 dw MtMoon1BattleText4 ; TextBeforeBattle dw MtMoon1AfterBattleText4 ; TextAfterBattle dw MtMoon1EndBattleText4 ; TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle -MtMoon1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 +MtMoon1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 dw MtMoon1BattleText5 ; TextBeforeBattle dw MtMoon1AfterBattleText5 ; TextAfterBattle dw MtMoon1EndBattleText5 ; TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle -MtMoon1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 +MtMoon1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 dw MtMoon1BattleText6 ; TextBeforeBattle dw MtMoon1AfterBattleText6 ; TextAfterBattle dw MtMoon1EndBattleText6 ; TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle -MtMoon1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 +MtMoon1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 dw MtMoon1BattleText7 ; TextBeforeBattle dw MtMoon1AfterBattleText7 ; TextAfterBattle dw MtMoon1EndBattleText7 ; TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle -MtMoon1TrainerHeader7: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7 +MtMoon1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 dw MtMoon1BattleText8 ; TextBeforeBattle dw MtMoon1AfterBattleText8 ; TextAfterBattle dw MtMoon1EndBattleText8 ; TextEndBattle @@ -102,37 +101,37 @@ MtMoon1Text1: MtMoon1Text2: TX_ASM - ld hl, MtMoon1TrainerHeader2 + ld hl, MtMoon1TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon1Text3: TX_ASM - ld hl, MtMoon1TrainerHeader3 + ld hl, MtMoon1TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon1Text4: TX_ASM - ld hl, MtMoon1TrainerHeader4 + ld hl, MtMoon1TrainerHeader3 call TalkToTrainer jp TextScriptEnd MtMoon1Text5: TX_ASM - ld hl, MtMoon1TrainerHeader5 + ld hl, MtMoon1TrainerHeader4 call TalkToTrainer jp TextScriptEnd MtMoon1Text6: TX_ASM - ld hl, MtMoon1TrainerHeader6 + ld hl, MtMoon1TrainerHeader5 call TalkToTrainer jp TextScriptEnd MtMoon1Text7: TX_ASM - ld hl, MtMoon1TrainerHeader7 + ld hl, MtMoon1TrainerHeader6 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index de36db4f..60cd1ab8 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -166,7 +166,6 @@ MtMoon3TextPointers: dw PickUpItemText dw MtMoon3Text_49f99 -MtMoon3TrainerHeaders: MtMoon3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -176,28 +175,28 @@ MtMoon3TrainerHeader0: dw MtMoon3EndBattleText2 ; TextEndBattle dw MtMoon3EndBattleText2 ; TextEndBattle -MtMoon3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 +MtMoon3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 dw MtMoon3BattleText3 ; TextBeforeBattle dw MtMoon3AfterBattleText3 ; TextAfterBattle dw MtMoon3EndBattleText3 ; TextEndBattle dw MtMoon3EndBattleText3 ; TextEndBattle -MtMoon3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 +MtMoon3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 dw MtMoon3BattleText4 ; TextBeforeBattle dw MtMoon3AfterBattleText4 ; TextAfterBattle dw MtMoon3EndBattleText4 ; TextEndBattle dw MtMoon3EndBattleText4 ; TextEndBattle -MtMoon3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4 +MtMoon3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 dw MtMoon3BattleText5 ; TextBeforeBattle dw MtMoon3AfterBattleText5 ; TextAfterBattle dw MtMoon3EndBattleText5 ; TextEndBattle @@ -245,19 +244,19 @@ MtMoon3Text2: MtMoon3Text3: TX_ASM - ld hl, MtMoon3TrainerHeader2 + ld hl, MtMoon3TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon3Text4: TX_ASM - ld hl, MtMoon3TrainerHeader3 + ld hl, MtMoon3TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon3Text5: TX_ASM - ld hl, MtMoon3TrainerHeader4 + ld hl, MtMoon3TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 603c4759..494298b8 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -300,9 +300,7 @@ PewterCityText_1945d: db "@" PewterCityText14: - -PewterCityText_19462: - TX_FAR _PewterCityText_19462 + TX_FAR _PewterCityText14 db "@" PewterCityText6: diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 854a3f72..2a0db39b 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -4,7 +4,7 @@ PewterGymScript: res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing - ld hl, PewterGymTrainerHeaders + ld hl, PewterGymTrainerHeader0 ld de, PewterGymScriptPointers ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable @@ -87,7 +87,6 @@ PewterGymTextPointers: dw PewterGymText5 dw PewterGymText6 -PewterGymTrainerHeaders: PewterGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 db ($5 << 4) ; trainer's view range diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index bea7a47d..5de1e6b7 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -60,7 +60,7 @@ PewterJigglypuffText: ld a, [wChannelSoundIDs] ld b, a - ld a, [wChannelSoundIDs + CH1] + ld a, [wChannelSoundIDs + Ch1] or b jr nz, .loop diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 8be15c9e..6027b450 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -1,6 +1,6 @@ PokemonTower3Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower3TrainerHeaders + ld hl, PokemonTower3TrainerHeader0 ld de, PokemonTower3ScriptPointers ld a, [wPokemonTower3CurScript] call ExecuteCurMapScriptInTable @@ -18,7 +18,6 @@ PokemonTower3TextPointers: dw PokemonTower3Text3 dw PickUpItemText -PokemonTower3TrainerHeaders: PokemonTower3TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index fe7a4e08..a8307c01 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -1,6 +1,6 @@ PokemonTower4Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower4TrainerHeaders + ld hl, PokemonTower4TrainerHeader0 ld de, PokemonTower4ScriptPointers ld a, [wPokemonTower4CurScript] call ExecuteCurMapScriptInTable @@ -20,7 +20,6 @@ PokemonTower4TextPointers: dw PickUpItemText dw PickUpItemText -PokemonTower4TrainerHeaders: PokemonTower4TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 82b912b5..9a13f286 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -1,6 +1,6 @@ PokemonTower5Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower5TrainerHeaders + ld hl, PokemonTower5TrainerHeader0 ld de, PokemonTower5ScriptPointers ld a, [wPokemonTower5CurScript] call ExecuteCurMapScriptInTable @@ -57,7 +57,6 @@ PokemonTower5TextPointers: dw PickUpItemText dw PokemonTower5Text7 -PokemonTower5TrainerHeaders: PokemonTower5TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 82c39a41..c3118f62 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -1,6 +1,6 @@ PokemonTower6Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower6TrainerHeaders + ld hl, PokemonTower6TrainerHeader0 ld de, PokemonTower6ScriptPointers ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable @@ -103,7 +103,6 @@ PokemonTower6TextPointers: dw PokemonTower6Text6 dw PokemonTower6Text7 -PokemonTower6TrainerHeaders: PokemonTower6TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 348534b4..88c62c53 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,6 +1,6 @@ PokemonTower7Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower7TrainerHeaders + ld hl, PokemonTower7TrainerHeader0 ld de, PokemonTower7ScriptPointers ld a, [wPokemonTower7CurScript] call ExecuteCurMapScriptInTable @@ -204,7 +204,6 @@ PokemonTower7TextPointers: dw PokemonTower7Text3 dw PokemonTower7FujiText -PokemonTower7TrainerHeaders: PokemonTower7TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index c7a5625f..5391585d 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,6 +1,6 @@ PowerPlantScript: call EnableAutoTextBoxDrawing - ld hl, PowerPlantTrainerHeaders + ld hl, Voltorb0TrainerHeader ld de, .ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable @@ -28,7 +28,6 @@ PowerPlantTextPointers: dw PickUpItemText dw PickUpItemText -PowerPlantTrainerHeaders: Voltorb0TrainerHeader: dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 6aa7c813..88b3a7e9 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -1,7 +1,7 @@ RocketHideout1Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing - ld hl, RocketHideout1TrainerHeaders + ld hl, RocketHideout1TrainerHeader0 ld de, RocketHideout1ScriptPointers ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable @@ -15,7 +15,7 @@ RocketHideout1Script_44be0: ret z CheckEvent EVENT_677 jr nz, .asm_44c01 - CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 jr nz, .asm_44bf7 ld a, $54 jr .asm_44c03 @@ -44,7 +44,6 @@ RocketHideout1TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout1TrainerHeaders: RocketHideout1TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -54,37 +53,37 @@ RocketHideout1TrainerHeader0: dw RocketHideout1EndBattleText2 ; TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle -RocketHideout1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 +RocketHideout1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 dw RocketHideout1BattleText3 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle dw RocketHideout1EndBattleText3 ; TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle -RocketHideout1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 +RocketHideout1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 dw RocketHideout1BattleText4 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle dw RocketHideout1EndBattleText4 ; TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle -RocketHideout1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 +RocketHideout1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 dw RocketHideout1BattleText5 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle dw RocketHideout1EndBattleText5 ; TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle -RocketHideout1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 +RocketHideout1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 dw RocketHideout1BattleText6 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle dw RocketHideout1EndBattleText6 ; TextEndBattle @@ -100,32 +99,32 @@ RocketHideout1Text1: RocketHideout1Text2: TX_ASM - ld hl, RocketHideout1TrainerHeader2 + ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout1Text3: TX_ASM - ld hl, RocketHideout1TrainerHeader3 + ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd RocketHideout1Text4: TX_ASM - ld hl, RocketHideout1TrainerHeader4 + ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd RocketHideout1Text5: TX_ASM - ld hl, RocketHideout1TrainerHeader5 + ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd RocketHideout1EndBattleText6: TX_FAR _RocketHideout1EndBattleText6 TX_ASM - SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ld hl, RocketHideout1Text_44c9f ret diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index b29e5396..c5f026d5 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -1,6 +1,6 @@ RocketHideout2Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout2TrainerHeaders + ld hl, RocketHideout2TrainerHeader0 ld de, RocketHideout2ScriptPointers ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable @@ -420,7 +420,6 @@ RocketHideout2TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout2TrainerHeaders: RocketHideout2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index ac08e868..00a61568 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -1,6 +1,6 @@ RocketHideout3Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout3TrainerHeaders + ld hl, RocketHideout3TrainerHeader0 ld de, RocketHideout3ScriptPointers ld a, [wRocketHideout3CurScript] call ExecuteCurMapScriptInTable @@ -149,7 +149,6 @@ RocketHideout3TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0: dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 +RocketHideout3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 dw RocketHideout3BattleTxt ; TextBeforeBattle dw RocketHideout3AfterBattleText3 ; TextAfterBattle dw RocketHideout3EndBattleText3 ; TextEndBattle @@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2: RocketHideout3Text2: TX_ASM - ld hl, RocketHideout3TrainerHeader2 + ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 49da07b3..e8361988 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -15,7 +15,7 @@ RocketHideout4Script_45473: ret z CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED jr nz, .asm_45496 - CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1 + CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1 jr z, .asm_4548c ld a, $2d jr .asm_45498 @@ -84,7 +84,6 @@ RocketHideout4TextPointers: dw PickUpItemText dw RocketHideout4Text10 -RocketHideout4TrainerHeaders: RocketHideout4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -94,19 +93,19 @@ RocketHideout4TrainerHeader0: dw RocketHideout4EndBattleText2 ; TextEndBattle dw RocketHideout4EndBattleText2 ; TextEndBattle -RocketHideout4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 +RocketHideout4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 dw RocketHideout4BattleText3 ; TextBeforeBattle dw RocketHideout4AfterBattleText3 ; TextAfterBattle dw RocketHideout4EndBattleText3 ; TextEndBattle dw RocketHideout4EndBattleText3 ; TextEndBattle -RocketHideout4TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 +RocketHideout4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 dw RocketHideout4BattleText4 ; TextBeforeBattle dw RocketHideout4AfterBattleText4 ; TextAfterBattle dw RocketHideout4EndBattleText4 ; TextEndBattle @@ -174,7 +173,7 @@ RocketHideout4AfterBattleText2: RocketHideout4Text3: TX_ASM - ld hl, RocketHideout4TrainerHeader2 + ld hl, RocketHideout4TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -192,7 +191,7 @@ RocketHideout4AfterBattleText3: RocketHideout4Text4: TX_ASM - ld hl, RocketHideout4TrainerHeader3 + ld hl, RocketHideout4TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index 2819c350..390330e8 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -1,6 +1,6 @@ RockTunnel1Script: call EnableAutoTextBoxDrawing - ld hl, RockTunnel1TrainerHeaders + ld hl, RockTunnel1TrainerHeader0 ld de, RockTunnel1ScriptPointers ld a, [wRockTunnel1CurScript] call ExecuteCurMapScriptInTable @@ -22,65 +22,64 @@ RockTunnel1TextPointers: dw RockTunnel1Text7 dw RockTunnel1Text8 -RockTunnel1TrainerHeaders: -RockTunnel1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 +RockTunnel1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 dw RockTunnel1BattleText1 ; TextBeforeBattle dw RockTunnel1AfterBattleText1 ; TextAfterBattle dw RockTunnel1EndBattleText1 ; TextEndBattle dw RockTunnel1EndBattleText1 ; TextEndBattle -RockTunnel1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 +RockTunnel1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 dw RockTunnel1BattleText2 ; TextBeforeBattle dw RockTunnel1AfterBattleText2 ; TextAfterBattle dw RockTunnel1EndBattleText2 ; TextEndBattle dw RockTunnel1EndBattleText2 ; TextEndBattle -RockTunnel1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 +RockTunnel1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 dw RockTunnel1BattleText3 ; TextBeforeBattle dw RockTunnel1AfterBattleText3 ; TextAfterBattle dw RockTunnel1EndBattleText3 ; TextEndBattle dw RockTunnel1EndBattleText3 ; TextEndBattle -RockTunnel1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 +RockTunnel1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 dw RockTunnel1BattleText4 ; TextBeforeBattle dw RockTunnel1AfterBattleText4 ; TextAfterBattle dw RockTunnel1EndBattleText4 ; TextEndBattle dw RockTunnel1EndBattleText4 ; TextEndBattle -RockTunnel1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 +RockTunnel1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 dw RockTunnel1BattleText5 ; TextBeforeBattle dw RockTunnel1AfterBattleText5 ; TextAfterBattle dw RockTunnel1EndBattleText5 ; TextEndBattle dw RockTunnel1EndBattleText5 ; TextEndBattle -RockTunnel1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 +RockTunnel1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 dw RockTunnel1BattleText6 ; TextBeforeBattle dw RockTunnel1AfterBattleText6 ; TextAfterBattle dw RockTunnel1EndBattleText6 ; TextEndBattle dw RockTunnel1EndBattleText6 ; TextEndBattle -RockTunnel1TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 +RockTunnel1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 dw RockTunnel1BattleText7 ; TextBeforeBattle dw RockTunnel1AfterBattleText7 ; TextAfterBattle dw RockTunnel1EndBattleText7 ; TextEndBattle @@ -90,37 +89,37 @@ RockTunnel1TrainerHeader7: RockTunnel1Text1: TX_ASM - ld hl, RockTunnel1TrainerHeader1 + ld hl, RockTunnel1TrainerHeader0 jr RockTunnel1TalkToTrainer RockTunnel1Text2: TX_ASM - ld hl, RockTunnel1TrainerHeader2 + ld hl, RockTunnel1TrainerHeader1 jr RockTunnel1TalkToTrainer RockTunnel1Text3: TX_ASM - ld hl, RockTunnel1TrainerHeader3 + ld hl, RockTunnel1TrainerHeader2 jr RockTunnel1TalkToTrainer RockTunnel1Text4: TX_ASM - ld hl, RockTunnel1TrainerHeader4 + ld hl, RockTunnel1TrainerHeader3 jr RockTunnel1TalkToTrainer RockTunnel1Text5: TX_ASM - ld hl, RockTunnel1TrainerHeader5 + ld hl, RockTunnel1TrainerHeader4 jr RockTunnel1TalkToTrainer RockTunnel1Text6: TX_ASM - ld hl, RockTunnel1TrainerHeader6 + ld hl, RockTunnel1TrainerHeader5 jr RockTunnel1TalkToTrainer RockTunnel1Text7: TX_ASM - ld hl, RockTunnel1TrainerHeader7 + ld hl, RockTunnel1TrainerHeader6 RockTunnel1TalkToTrainer: call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 7ac3f426..4385b5f7 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -1,6 +1,6 @@ RockTunnel2Script: call EnableAutoTextBoxDrawing - ld hl, RockTunnel2TrainerHeaders + ld hl, RockTunnel2TrainerHeader0 ld de, RockTunnel2ScriptPointers ld a, [wRockTunnel2CurScript] call ExecuteCurMapScriptInTable @@ -22,7 +22,6 @@ RockTunnel2TextPointers: dw RockTunnel2Text7 dw RockTunnel2Text8 -RockTunnel2TrainerHeaders: RockTunnel2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -32,64 +31,64 @@ RockTunnel2TrainerHeader0: dw RockTunnel2EndBattleText2 ; TextEndBattle dw RockTunnel2EndBattleText2 ; TextEndBattle -RockTunnel2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 +RockTunnel2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 dw RockTunnel2BattleText3 ; TextBeforeBattle dw RockTunnel2AfterBattleText3 ; TextAfterBattle dw RockTunnel2EndBattleText3 ; TextEndBattle dw RockTunnel2EndBattleText3 ; TextEndBattle -RockTunnel2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 +RockTunnel2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 dw RockTunnel2BattleText4 ; TextBeforeBattle dw RockTunnel2AfterBattleText4 ; TextAfterBattle dw RockTunnel2EndBattleText4 ; TextEndBattle dw RockTunnel2EndBattleText4 ; TextEndBattle -RockTunnel2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 +RockTunnel2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 dw RockTunnel2BattleText5 ; TextBeforeBattle dw RockTunnel2AfterBattleText5 ; TextAfterBattle dw RockTunnel2EndBattleText5 ; TextEndBattle dw RockTunnel2EndBattleText5 ; TextEndBattle -RockTunnel2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 +RockTunnel2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 dw RockTunnel2BattleText6 ; TextBeforeBattle dw RockTunnel2AfterBattleText6 ; TextAfterBattle dw RockTunnel2EndBattleText6 ; TextEndBattle dw RockTunnel2EndBattleText6 ; TextEndBattle -RockTunnel2TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 +RockTunnel2TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 dw RockTunnel2BattleText7 ; TextBeforeBattle dw RockTunnel2AfterBattleText7 ; TextAfterBattle dw RockTunnel2EndBattleText7 ; TextEndBattle dw RockTunnel2EndBattleText7 ; TextEndBattle -RockTunnel2TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 +RockTunnel2TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 dw RockTunnel2BattleText8 ; TextBeforeBattle dw RockTunnel2AfterBattleText8 ; TextAfterBattle dw RockTunnel2EndBattleText8 ; TextEndBattle dw RockTunnel2EndBattleText8 ; TextEndBattle -RockTunnel2TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 +RockTunnel2TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 dw RockTunnel2BattleText9 ; TextBeforeBattle dw RockTunnel2AfterBattleText9 ; TextAfterBattle dw RockTunnel2EndBattleText9 ; TextEndBattle @@ -105,43 +104,43 @@ RockTunnel2Text1: RockTunnel2Text2: TX_ASM - ld hl, RockTunnel2TrainerHeader2 + ld hl, RockTunnel2TrainerHeader1 call TalkToTrainer jp TextScriptEnd RockTunnel2Text3: TX_ASM - ld hl, RockTunnel2TrainerHeader3 + ld hl, RockTunnel2TrainerHeader2 call TalkToTrainer jp TextScriptEnd RockTunnel2Text4: TX_ASM - ld hl, RockTunnel2TrainerHeader4 + ld hl, RockTunnel2TrainerHeader3 call TalkToTrainer jp TextScriptEnd RockTunnel2Text5: TX_ASM - ld hl, RockTunnel2TrainerHeader5 + ld hl, RockTunnel2TrainerHeader4 call TalkToTrainer jp TextScriptEnd RockTunnel2Text6: TX_ASM - ld hl, RockTunnel2TrainerHeader6 + ld hl, RockTunnel2TrainerHeader5 call TalkToTrainer jp TextScriptEnd RockTunnel2Text7: TX_ASM - ld hl, RockTunnel2TrainerHeader7 + ld hl, RockTunnel2TrainerHeader6 call TalkToTrainer jp TextScriptEnd RockTunnel2Text8: TX_ASM - ld hl, RockTunnel2TrainerHeader8 + ld hl, RockTunnel2TrainerHeader7 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route10.asm b/scripts/route10.asm index ca0ab190..03a1e818 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -1,6 +1,6 @@ Route10Script: call EnableAutoTextBoxDrawing - ld hl, Route10TrainerHeaders + ld hl, Route10TrainerHeader0 ld de, Route10ScriptPointers ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable @@ -24,7 +24,6 @@ Route10TextPointers: dw Route10Text9 dw Route10Text10 -Route10TrainerHeaders: Route10TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route11.asm b/scripts/route11.asm index ab3509c5..afedfc32 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -1,6 +1,6 @@ Route11Script: call EnableAutoTextBoxDrawing - ld hl, Route11TrainerHeaders + ld hl, Route11TrainerHeader0 ld de, Route11ScriptPointers ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route11TextPointers: dw Route11Text10 dw Route11Text11 -Route11TrainerHeaders: Route11TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route12.asm b/scripts/route12.asm index e61f41c0..07b5833b 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -1,6 +1,6 @@ Route12Script: call EnableAutoTextBoxDrawing - ld hl, Route12TrainerHeaders + ld hl, Route12TrainerHeader0 ld de, Route12ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable @@ -76,7 +76,6 @@ Route12TextPointers: dw Route12Text13 dw Route12Text14 -Route12TrainerHeaders: Route12TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route13.asm b/scripts/route13.asm index 61f43ee9..54fb9d68 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -1,6 +1,6 @@ Route13Script: call EnableAutoTextBoxDrawing - ld hl, Route13TrainerHeaders + ld hl, Route13TrainerHeader0 ld de, Route13ScriptPointers ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable @@ -27,7 +27,6 @@ Route13TextPointers: dw Route13Text12 dw Route13Text13 -Route13TrainerHeaders: Route13TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -37,82 +36,82 @@ Route13TrainerHeader0: dw Route13EndBattleText2 ; TextEndBattle dw Route13EndBattleText2 ; TextEndBattle -Route13TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 +Route13TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 dw Route13BattleText3 ; TextBeforeBattle dw Route13AfterBattleText3 ; TextAfterBattle dw Route13EndBattleText3 ; TextEndBattle dw Route13EndBattleText3 ; TextEndBattle -Route13TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 +Route13TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 dw Route13BattleText4 ; TextBeforeBattle dw Route13AfterBattleText4 ; TextAfterBattle dw Route13EndBattleText4 ; TextEndBattle dw Route13EndBattleText4 ; TextEndBattle -Route13TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 +Route13TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 dw Route13BattleText5 ; TextBeforeBattle dw Route13AfterBattleText5 ; TextAfterBattle dw Route13EndBattleText5 ; TextEndBattle dw Route13EndBattleText5 ; TextEndBattle -Route13TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 +Route13TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 dw Route13BattleText6 ; TextBeforeBattle dw Route13AfterBattleText6 ; TextAfterBattle dw Route13EndBattleText6 ; TextEndBattle dw Route13EndBattleText6 ; TextEndBattle -Route13TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 +Route13TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 dw Route13BattleText7 ; TextBeforeBattle dw Route13AfterBattleText7 ; TextAfterBattle dw Route13EndBattleText7 ; TextEndBattle dw Route13EndBattleText7 ; TextEndBattle -Route13TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7 +Route13TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 dw Route13BattleText8 ; TextBeforeBattle dw Route13AfterBattleText8 ; TextAfterBattle dw Route13EndBattleText8 ; TextEndBattle dw Route13EndBattleText8 ; TextEndBattle -Route13TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 +Route13TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 dw Route13BattleText9 ; TextBeforeBattle dw Route13AfterBattleText9 ; TextAfterBattle dw Route13EndBattleText9 ; TextEndBattle dw Route13EndBattleText9 ; TextEndBattle -Route13TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 +Route13TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 dw Route13BattleText10 ; TextBeforeBattle dw Route13AfterBattleText10 ; TextAfterBattle dw Route13EndBattleText10 ; TextEndBattle dw Route13EndBattleText10 ; TextEndBattle -Route13TrainerHeader10: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1 +Route13TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 dw Route13BattleText11 ; TextBeforeBattle dw Route13AfterBattleText11 ; TextAfterBattle dw Route13EndBattleText11 ; TextEndBattle @@ -140,7 +139,7 @@ Route13AfterBattleText2: Route13Text2: TX_ASM - ld hl, Route13TrainerHeader2 + ld hl, Route13TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -158,7 +157,7 @@ Route13AfterBattleText3: Route13Text3: TX_ASM - ld hl, Route13TrainerHeader3 + ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -176,7 +175,7 @@ Route13AfterBattleText4: Route13Text4: TX_ASM - ld hl, Route13TrainerHeader4 + ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -194,7 +193,7 @@ Route13AfterBattleText5: Route13Text5: TX_ASM - ld hl, Route13TrainerHeader5 + ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -212,7 +211,7 @@ Route13AfterBattleText6: Route13Text6: TX_ASM - ld hl, Route13TrainerHeader6 + ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -230,7 +229,7 @@ Route13AfterBattleText7: Route13Text7: TX_ASM - ld hl, Route13TrainerHeader7 + ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd @@ -248,7 +247,7 @@ Route13AfterBattleText8: Route13Text8: TX_ASM - ld hl, Route13TrainerHeader8 + ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd @@ -266,7 +265,7 @@ Route13AfterBattleText9: Route13Text9: TX_ASM - ld hl, Route13TrainerHeader9 + ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd @@ -284,7 +283,7 @@ Route13AfterBattleText10: Route13Text10: TX_ASM - ld hl, Route13TrainerHeader10 + ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route14.asm b/scripts/route14.asm index 70f747c5..c929451f 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -1,6 +1,6 @@ Route14Script: call EnableAutoTextBoxDrawing - ld hl, Route14TrainerHeaders + ld hl, Route14TrainerHeader0 ld de, Route14ScriptPointers ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route14TextPointers: dw Route14Text10 dw Route14Text11 -Route14TrainerHeaders: Route14TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/route15.asm b/scripts/route15.asm index e3329ab4..58c5d0ab 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -1,6 +1,6 @@ Route15Script: call EnableAutoTextBoxDrawing - ld hl, Route15TrainerHeaders + ld hl, Route15TrainerHeader0 ld de, Route15ScriptPointers ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable @@ -26,7 +26,6 @@ Route15TextPointers: dw PickUpItemText dw Route15Text12 -Route15TrainerHeaders: Route15TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/route16.asm b/scripts/route16.asm index fe38fac4..20431608 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -1,6 +1,6 @@ Route16Script: call EnableAutoTextBoxDrawing - ld hl, Route16TrainerHeaders + ld hl, Route16TrainerHeader0 ld de, Route16ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable @@ -74,7 +74,6 @@ Route16TextPointers: dw Route16Text10 dw Route16Text11 -Route16TrainerHeaders: Route16TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route17.asm b/scripts/route17.asm index ddf92c2d..fb9f4cd8 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -1,6 +1,6 @@ Route17Script: call EnableAutoTextBoxDrawing - ld hl, Route17TrainerHeaders + ld hl, Route17TrainerHeader0 ld de, Route17ScriptPointers ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable @@ -30,7 +30,6 @@ Route17TextPointers: dw Route17Text15 dw Route17Text16 -Route17TrainerHeaders: Route17TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route18.asm b/scripts/route18.asm index b89e2613..687b269c 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -1,6 +1,6 @@ Route18Script: call EnableAutoTextBoxDrawing - ld hl, Route18TrainerHeaders + ld hl, Route18TrainerHeader0 ld de, Route18ScriptPointers ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable @@ -19,7 +19,6 @@ Route18TextPointers: dw Route18Text4 dw Route18Text5 -Route18TrainerHeaders: Route18TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route19.asm b/scripts/route19.asm index 7b6aa8f0..01ea5dce 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -1,6 +1,6 @@ Route19Script: call EnableAutoTextBoxDrawing - ld hl, Route19TrainerHeaders + ld hl, Route19TrainerHeader0 ld de, Route19ScriptPointers ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route19TextPointers: dw Route19Text10 dw Route19Text11 -Route19TrainerHeaders: Route19TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route20.asm b/scripts/route20.asm index 012c9c53..53ff5e55 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -75,7 +75,6 @@ Route20TextPointers: dw Route20Text11 dw Route20Text12 -Route20TrainerHeaders: Route20TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -85,82 +84,82 @@ Route20TrainerHeader0: dw Route20EndBattleText1 ; TextEndBattle dw Route20EndBattleText1 ; TextEndBattle -Route20TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 +Route20TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1 dw Route20BattleText2 ; TextBeforeBattle dw Route20AfterBattleText2 ; TextAfterBattle dw Route20EndBattleText2 ; TextEndBattle dw Route20EndBattleText2 ; TextEndBattle -Route20TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 +Route20TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 dw Route20BattleText3 ; TextBeforeBattle dw Route20AfterBattleText3 ; TextAfterBattle dw Route20EndBattleText3 ; TextEndBattle dw Route20EndBattleText3 ; TextEndBattle -Route20TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 +Route20TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 dw Route20BattleText4 ; TextBeforeBattle dw Route20AfterBattleText4 ; TextAfterBattle dw Route20EndBattleText4 ; TextEndBattle dw Route20EndBattleText4 ; TextEndBattle -Route20TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 +Route20TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 dw Route20BattleText5 ; TextBeforeBattle dw Route20AfterBattleText5 ; TextAfterBattle dw Route20EndBattleText5 ; TextEndBattle dw Route20EndBattleText5 ; TextEndBattle -Route20TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 +Route20TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 dw Route20BattleText6 ; TextBeforeBattle dw Route20AfterBattleText6 ; TextAfterBattle dw Route20EndBattleText6 ; TextEndBattle dw Route20EndBattleText6 ; TextEndBattle -Route20TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7 +Route20TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 dw Route20BattleText7 ; TextBeforeBattle dw Route20AfterBattleText7 ; TextAfterBattle dw Route20EndBattleText7 ; TextEndBattle dw Route20EndBattleText7 ; TextEndBattle -Route20TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 +Route20TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1 dw Route20BattleText8 ; TextBeforeBattle dw Route20AfterBattleText8 ; TextAfterBattle dw Route20EndBattleText8 ; TextEndBattle dw Route20EndBattleText8 ; TextEndBattle -Route20TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 +Route20TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 dw Route20BattleText9 ; TextBeforeBattle dw Route20AfterBattleText9 ; TextAfterBattle dw Route20EndBattleText9 ; TextEndBattle dw Route20EndBattleText9 ; TextEndBattle -Route20TrainerHeader10: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1 +Route20TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 dw Route20BattleText10 ; TextBeforeBattle dw Route20AfterBattleText10 ; TextAfterBattle dw Route20EndBattleText10 ; TextEndBattle @@ -176,55 +175,55 @@ Route20Text1: Route20Text2: TX_ASM - ld hl, Route20TrainerHeader2 + ld hl, Route20TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route20Text3: TX_ASM - ld hl, Route20TrainerHeader3 + ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route20Text4: TX_ASM - ld hl, Route20TrainerHeader4 + ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route20Text5: TX_ASM - ld hl, Route20TrainerHeader5 + ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route20Text6: TX_ASM - ld hl, Route20TrainerHeader6 + ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route20Text7: TX_ASM - ld hl, Route20TrainerHeader7 + ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route20Text8: TX_ASM - ld hl, Route20TrainerHeader8 + ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route20Text9: TX_ASM - ld hl, Route20TrainerHeader9 + ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route20Text10: TX_ASM - ld hl, Route20TrainerHeader10 + ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route21.asm b/scripts/route21.asm index 89874e58..dcdc8022 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -1,6 +1,6 @@ Route21Script: call EnableAutoTextBoxDrawing - ld hl, Route21TrainerHeaders + ld hl, Route21TrainerHeader0 ld de, Route21ScriptPointers ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable @@ -23,7 +23,6 @@ Route21TextPointers: dw Route21Text8 dw Route21Text9 -Route21TrainerHeaders: Route21TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/route24.asm b/scripts/route24.asm index 7f1400f2..f55d2268 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -1,6 +1,6 @@ Route24Script: call EnableAutoTextBoxDrawing - ld hl, Route24TrainerHeaders + ld hl, Route24TrainerHeader0 ld de, Route24ScriptPointers ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable @@ -85,7 +85,6 @@ Route24TextPointers: dw Route24Text7 dw PickUpItemText -Route24TrainerHeaders: Route24TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -95,46 +94,46 @@ Route24TrainerHeader0: dw Route24EndBattleText1 ; TextEndBattle dw Route24EndBattleText1 ; TextEndBattle -Route24TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 +Route24TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 dw Route24BattleText2 ; TextBeforeBattle dw Route24AfterBattleText2 ; TextAfterBattle dw Route24EndBattleText2 ; TextEndBattle dw Route24EndBattleText2 ; TextEndBattle -Route24TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 +Route24TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 dw Route24BattleText3 ; TextBeforeBattle dw Route24AfterBattleText3 ; TextAfterBattle dw Route24EndBattleText3 ; TextEndBattle dw Route24EndBattleText3 ; TextEndBattle -Route24TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 +Route24TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 dw Route24BattleText4 ; TextBeforeBattle dw Route24AfterBattleText4 ; TextAfterBattle dw Route24EndBattleText4 ; TextEndBattle dw Route24EndBattleText4 ; TextEndBattle -Route24TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 +Route24TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 dw Route24BattleText5 ; TextBeforeBattle dw Route24AfterBattleText5 ; TextAfterBattle dw Route24EndBattleText5 ; TextEndBattle dw Route24EndBattleText5 ; TextEndBattle -Route24TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6 +Route24TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 dw Route24BattleText6 ; TextBeforeBattle dw Route24AfterBattleText6 ; TextAfterBattle dw Route24EndBattleText6 ; TextEndBattle @@ -219,31 +218,31 @@ Route24Text2: Route24Text3: TX_ASM - ld hl, Route24TrainerHeader2 + ld hl, Route24TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route24Text4: TX_ASM - ld hl, Route24TrainerHeader3 + ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route24Text5: TX_ASM - ld hl, Route24TrainerHeader4 + ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route24Text6: TX_ASM - ld hl, Route24TrainerHeader5 + ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route24Text7: TX_ASM - ld hl, Route24TrainerHeader6 + ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route25.asm b/scripts/route25.asm index 7ebfaff6..c83c725b 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -1,7 +1,7 @@ Route25Script: call Route25Script_515e1 call EnableAutoTextBoxDrawing - ld hl, Route25TrainerHeaders + ld hl, Route25TrainerHeader0 ld de, Route25ScriptPointers ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable @@ -53,7 +53,6 @@ Route25TextPointers: dw PickUpItemText dw Route25Text11 -Route25TrainerHeaders: Route25TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -63,73 +62,73 @@ Route25TrainerHeader0: dw Route25EndBattleText1 ; TextEndBattle dw Route25EndBattleText1 ; TextEndBattle -Route25TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 +Route25TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1 dw Route25BattleText2 ; TextBeforeBattle dw Route25AfterBattleText2 ; TextAfterBattle dw Route25EndBattleText2 ; TextEndBattle dw Route25EndBattleText2 ; TextEndBattle -Route25TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 +Route25TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 dw Route25BattleText3 ; TextBeforeBattle dw Route25AfterBattleText3 ; TextAfterBattle dw Route25EndBattleText3 ; TextEndBattle dw Route25EndBattleText3 ; TextEndBattle -Route25TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 +Route25TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 dw Route25BattleText4 ; TextBeforeBattle dw Route25AfterBattleText4 ; TextAfterBattle dw Route25EndBattleText4 ; TextEndBattle dw Route25EndBattleText4 ; TextEndBattle -Route25TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 +Route25TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 dw Route25BattleText5 ; TextBeforeBattle dw Route25AfterBattleText5 ; TextAfterBattle dw Route25EndBattleText5 ; TextEndBattle dw Route25EndBattleText5 ; TextEndBattle -Route25TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 +Route25TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 dw Route25BattleText6 ; TextBeforeBattle dw Route25AfterBattleText6 ; TextAfterBattle dw Route25EndBattleText6 ; TextEndBattle dw Route25EndBattleText6 ; TextEndBattle -Route25TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7 +Route25TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 dw Route25BattleText7 ; TextBeforeBattle dw Route25AfterBattleText7 ; TextAfterBattle dw Route25EndBattleText7 ; TextEndBattle dw Route25EndBattleText7 ; TextEndBattle -Route25TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 +Route25TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1 dw Route25BattleText8 ; TextBeforeBattle dw Route25AfterBattleText8 ; TextAfterBattle dw Route25EndBattleText8 ; TextEndBattle dw Route25EndBattleText8 ; TextEndBattle -Route25TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1 +Route25TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 dw Route25BattleText9 ; TextBeforeBattle dw Route25AfterBattleText9 ; TextAfterBattle dw Route25EndBattleText9 ; TextEndBattle @@ -145,49 +144,49 @@ Route25Text1: Route25Text2: TX_ASM - ld hl, Route25TrainerHeader2 + ld hl, Route25TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route25Text3: TX_ASM - ld hl, Route25TrainerHeader3 + ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route25Text4: TX_ASM - ld hl, Route25TrainerHeader4 + ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route25Text5: TX_ASM - ld hl, Route25TrainerHeader5 + ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route25Text6: TX_ASM - ld hl, Route25TrainerHeader6 + ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route25Text7: TX_ASM - ld hl, Route25TrainerHeader7 + ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route25Text8: TX_ASM - ld hl, Route25TrainerHeader8 + ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route25Text9: TX_ASM - ld hl, Route25TrainerHeader9 + ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route3.asm b/scripts/route3.asm index b2c5de3e..e4748b8c 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -24,7 +24,6 @@ Route3TextPointers: dw Route3Text9 dw Route3Text10 -Route3TrainerHeaders: Route3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -34,64 +33,64 @@ Route3TrainerHeader0: dw Route3EndBattleText1 ; TextEndBattle dw Route3EndBattleText1 ; TextEndBattle -Route3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 +Route3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1 dw Route3BattleText2 ; TextBeforeBattle dw Route3AfterBattleText2 ; TextAfterBattle dw Route3EndBattleText2 ; TextEndBattle dw Route3EndBattleText2 ; TextEndBattle -Route3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 +Route3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 dw Route3BattleText3 ; TextBeforeBattle dw Route3AfterBattleText3 ; TextAfterBattle dw Route3EndBattleText3 ; TextEndBattle dw Route3EndBattleText3 ; TextEndBattle -Route3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 +Route3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 dw Route3BattleText4 ; TextBeforeBattle dw Route3AfterBattleText4 ; TextAfterBattle dw Route3EndBattleText4 ; TextEndBattle dw Route3EndBattleText4 ; TextEndBattle -Route3TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 +Route3TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 dw Route3BattleText5 ; TextBeforeBattle dw Route3AfterBattleText5 ; TextAfterBattle dw Route3EndBattleText5 ; TextEndBattle dw Route3EndBattleText5 ; TextEndBattle -Route3TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6 +Route3TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 dw Route3BattleText6 ; TextBeforeBattle dw Route3AfterBattleText6 ; TextAfterBattle dw Route3EndBattleText6 ; TextEndBattle dw Route3EndBattleText6 ; TextEndBattle -Route3TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 +Route3TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1 dw Route3BattleText7 ; TextBeforeBattle dw Route3AfterBattleText7 ; TextAfterBattle dw Route3EndBattleText7 ; TextEndBattle dw Route3EndBattleText7 ; TextEndBattle -Route3TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1 +Route3TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 dw Route3BattleText8 ; TextBeforeBattle dw Route3AfterBattleText8 ; TextAfterBattle dw Route3EndBattleText8 ; TextEndBattle @@ -123,7 +122,7 @@ Route3AfterBattleText1: Route3Text3: TX_ASM - ld hl, Route3TrainerHeader2 + ld hl, Route3TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -141,7 +140,7 @@ Route3AfterBattleText2: Route3Text4: TX_ASM - ld hl, Route3TrainerHeader3 + ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -159,7 +158,7 @@ Route3AfterBattleText3: Route3Text5: TX_ASM - ld hl, Route3TrainerHeader4 + ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -177,7 +176,7 @@ Route3AfterBattleText4: Route3Text6: TX_ASM - ld hl, Route3TrainerHeader5 + ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -195,7 +194,7 @@ Route3AfterBattleText5: Route3Text7: TX_ASM - ld hl, Route3TrainerHeader6 + ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -213,7 +212,7 @@ Route3AfterBattleText6: Route3Text8: TX_ASM - ld hl, Route3TrainerHeader7 + ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd @@ -231,7 +230,7 @@ Route3AfterBattleText7: Route3Text9: TX_ASM - ld hl, Route3TrainerHeader8 + ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route4.asm b/scripts/route4.asm index 559f2006..ee9e2cdf 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -1,6 +1,6 @@ Route4Script: call EnableAutoTextBoxDrawing - ld hl, Route4TrainerHeaders + ld hl, Route4TrainerHeader0 ld de, Route4ScriptPointers ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable @@ -20,7 +20,6 @@ Route4TextPointers: dw Route4Text5 dw Route4Text6 -Route4TrainerHeaders: Route4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route6.asm b/scripts/route6.asm index 53653b39..ba727adc 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -1,6 +1,6 @@ Route6Script: call EnableAutoTextBoxDrawing - ld hl, Route6TrainerHeaders + ld hl, Route6TrainerHeader0 ld de, Route6ScriptPointers ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable @@ -21,7 +21,6 @@ Route6TextPointers: dw Route6Text6 dw Route6Text7 -Route6TrainerHeaders: Route6TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/route8.asm b/scripts/route8.asm index 34e6aba4..e05508bb 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -1,6 +1,6 @@ Route8Script: call EnableAutoTextBoxDrawing - ld hl, Route8TrainerHeaders + ld hl, Route8TrainerHeader0 ld de, Route8ScriptPointers ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable @@ -24,7 +24,6 @@ Route8TextPointers: dw Route8Text9 dw Route8Text10 -Route8TrainerHeaders: Route8TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route9.asm b/scripts/route9.asm index 5776d4e6..c965d853 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -1,6 +1,6 @@ Route9Script: call EnableAutoTextBoxDrawing - ld hl, Route9TrainerHeaders + ld hl, Route9TrainerHeader0 ld de, Route9ScriptPointers ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route9TextPointers: dw PickUpItemText dw Route9Text11 -Route9TrainerHeaders: Route9TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -35,73 +34,73 @@ Route9TrainerHeader0: dw Route9EndBattleText1 ; TextEndBattle dw Route9EndBattleText1 ; TextEndBattle -Route9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 +Route9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 dw Route9BattleText2 ; TextBeforeBattle dw Route9AfterBattleText2 ; TextAfterBattle dw Route9EndBattleText2 ; TextEndBattle dw Route9EndBattleText2 ; TextEndBattle -Route9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 +Route9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 dw Route9BattleText3 ; TextBeforeBattle dw Route9AfterBattleText3 ; TextAfterBattle dw Route9EndBattleText3 ; TextEndBattle dw Route9EndBattleText3 ; TextEndBattle -Route9TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 +Route9TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 dw Route9BattleText4 ; TextBeforeBattle dw Route9AfterBattleText4 ; TextAfterBattle dw Route9EndBattleText4 ; TextEndBattle dw Route9EndBattleText4 ; TextEndBattle -Route9TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 +Route9TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 dw Route9BattleText5 ; TextBeforeBattle dw Route9AfterBattleText5 ; TextAfterBattle dw Route9EndBattleText5 ; TextEndBattle dw Route9EndBattleText5 ; TextEndBattle -Route9TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 +Route9TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 dw Route9BattleText6 ; TextBeforeBattle dw Route9AfterBattleText6 ; TextAfterBattle dw Route9EndBattleText6 ; TextEndBattle dw Route9EndBattleText6 ; TextEndBattle -Route9TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7 +Route9TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 dw Route9BattleText7 ; TextBeforeBattle dw Route9AfterBattleText7 ; TextAfterBattle dw Route9EndBattleText7 ; TextEndBattle dw Route9EndBattleText7 ; TextEndBattle -Route9TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 +Route9TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 dw Route9BattleText8 ; TextBeforeBattle dw Route9AfterBattleText8 ; TextAfterBattle dw Route9EndBattleText8 ; TextEndBattle dw Route9EndBattleText8 ; TextEndBattle -Route9TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1 +Route9TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 dw Route9BattleText9 ; TextBeforeBattle dw Route9AfterBattleText9 ; TextAfterBattle dw Route9EndBattleText9 ; TextEndBattle @@ -116,42 +115,42 @@ Route9Text1: Route9Text2: TX_ASM - ld hl, Route9TrainerHeader2 + ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer Route9Text3: TX_ASM - ld hl, Route9TrainerHeader3 + ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer Route9Text4: TX_ASM - ld hl, Route9TrainerHeader4 + ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer Route9Text5: TX_ASM - ld hl, Route9TrainerHeader5 + ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer Route9Text6: TX_ASM - ld hl, Route9TrainerHeader6 + ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer Route9Text7: TX_ASM - ld hl, Route9TrainerHeader7 + ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer Route9Text8: TX_ASM - ld hl, Route9TrainerHeader8 + ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer Route9Text9: TX_ASM - ld hl, Route9TrainerHeader9 + ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 804b1b78..2dcaed44 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -84,7 +84,6 @@ SaffronGymTextPointers: dw SaffronGymText11 dw SaffronGymText12 -SaffronGymTrainerHeaders: SaffronGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 6b35a05a..5cfb92b2 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -1,7 +1,7 @@ SilphCo10Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing - ld hl, SilphCo10TrainerHeaders + ld hl, SilphCo10TrainerHeader0 ld de, SilphCo10ScriptPointers ld a, [wSilphCo10CurScript] call ExecuteCurMapScriptInTable @@ -47,7 +47,6 @@ SilphCo10TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo10TrainerHeaders: SilphCo10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 5f924bfc..342fef07 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -1,7 +1,7 @@ SilphCo11Script: call SilphCo11Script_62110 call EnableAutoTextBoxDrawing - ld hl, SilphCo11TrainerHeaders + ld hl, SilphCo11TrainerHeader0 ld de, SilphCo11ScriptPointers ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable @@ -280,7 +280,6 @@ SilphCo11TextPointers: dw SilphCo11Text5 dw SilphCo11Text6 -SilphCo11TrainerHeaders: SilphCo11TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index c8d72689..e77c45dd 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -1,7 +1,7 @@ SilphCo2Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing - ld hl, SilphCo2TrainerHeaders + ld hl, SilphCo2TrainerHeader0 ld de, SilphCo2ScriptPointers ld a, [wSilphCo2CurScript] call ExecuteCurMapScriptInTable @@ -98,7 +98,6 @@ SilphCo2TextPointers: dw SilphCo2Text4 dw SilphCo2Text5 -SilphCo2TrainerHeaders: SilphCo2TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index b8dfb7fb..0d12b768 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -1,7 +1,7 @@ SilphCo3Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing - ld hl, SilphCo3TrainerHeaders + ld hl, SilphCo3TrainerHeader0 ld de, SilphCo3ScriptPointers ld a, [wSilphCo3CurScript] call ExecuteCurMapScriptInTable @@ -61,7 +61,6 @@ SilphCo3TextPointers: dw SilphCo3Text3 dw PickUpItemText -SilphCo3TrainerHeaders: SilphCo3TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index a0682c8d..1cfd1ceb 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -1,7 +1,7 @@ SilphCo4Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing - ld hl, SilphCo4TrainerHeaders + ld hl, SilphCo4TrainerHeader0 ld de, SilphCo4ScriptPointers ld a, [wSilphCo4CurScript] call ExecuteCurMapScriptInTable @@ -100,7 +100,6 @@ SilphCo4TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo4TrainerHeaders: SilphCo4TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -110,19 +109,19 @@ SilphCo4TrainerHeader0: dw SilphCo4EndBattleText2 ; TextEndBattle dw SilphCo4EndBattleText2 ; TextEndBattle -SilphCo4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 +SilphCo4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1 dw SilphCo4BattleText3 ; TextBeforeBattle dw SilphCo4AfterBattleText3 ; TextAfterBattle dw SilphCo4EndBattleText3 ; TextEndBattle dw SilphCo4EndBattleText3 ; TextEndBattle -SilphCo4TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3 +SilphCo4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 dw SilphCo4BattleText4 ; TextBeforeBattle dw SilphCo4AfterBattleText4 ; TextAfterBattle dw SilphCo4EndBattleText4 ; TextEndBattle @@ -165,7 +164,7 @@ SilphCo4AfterBattleText2: SilphCo4Text3: TX_ASM - ld hl, SilphCo4TrainerHeader2 + ld hl, SilphCo4TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -183,7 +182,7 @@ SilphCo4AfterBattleText3: SilphCo4Text4: TX_ASM - ld hl, SilphCo4TrainerHeader3 + ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 42577498..45a81b68 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -1,7 +1,7 @@ SilphCo5Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeaders + ld hl, SilphCo5TrainerHeader0 ld de, SilphCo5ScriptPointers ld a, [wSilphCo5CurScript] call ExecuteCurMapScriptInTable @@ -83,8 +83,7 @@ SilphCo5TextPointers: dw SilphCo5Text10 dw SilphCo5Text11 -SilphCo5TrainerHeaders: -Silphco5TrainerHeader0: +SilphCo5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 @@ -93,28 +92,28 @@ Silphco5TrainerHeader0: dw SilphCo5EndBattleText2 ; TextEndBattle dw SilphCo5EndBattleText2 ; TextEndBattle -Silphco5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 +SilphCo5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 dw SilphCo5BattleText3 ; TextBeforeBattle dw SilphCo5AfterBattleText3 ; TextAfterBattle dw SilphCo5EndBattleText3 ; TextEndBattle dw SilphCo5EndBattleText3 ; TextEndBattle -Silphco5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 +SilphCo5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 dw SilphCo5BattleText4 ; TextBeforeBattle dw SilphCo5AfterBattleText4 ; TextAfterBattle dw SilphCo5EndBattleText4 ; TextEndBattle dw SilphCo5EndBattleText4 ; TextEndBattle -Silphco5TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4 +SilphCo5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 dw SilphCo5BattleText5 ; TextBeforeBattle dw SilphCo5AfterBattleText5 ; TextAfterBattle dw SilphCo5EndBattleText5 ; TextEndBattle @@ -139,7 +138,7 @@ SilphCo5Text_1a015: SilphCo5Text2: TX_ASM - ld hl, Silphco5TrainerHeader0 + ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -157,7 +156,7 @@ SilphCo5AfterBattleText2: SilphCo5Text3: TX_ASM - ld hl, Silphco5TrainerHeader2 + ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -175,7 +174,7 @@ SilphCo5AfterBattleText3: SilphCo5Text4: TX_ASM - ld hl, Silphco5TrainerHeader3 + ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -193,7 +192,7 @@ SilphCo5AfterBattleText4: SilphCo5Text5: TX_ASM - ld hl, Silphco5TrainerHeader4 + ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index c40c7d70..240b6793 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -1,7 +1,7 @@ SilphCo6Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeaders + ld hl, SilphCo6TrainerHeader0 ld de, SilphCo6ScriptPointers ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable @@ -51,7 +51,6 @@ SilphCo6TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo6TrainerHeaders: SilphCo6TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -61,19 +60,19 @@ SilphCo6TrainerHeader0: dw SilphCo6EndBattleText2 ; TextEndBattle dw SilphCo6EndBattleText2 ; TextEndBattle -SilphCo6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2 +SilphCo6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 dw SilphCo6BattleText3 ; TextBeforeBattle dw SilphCo6AfterBattleText3 ; TextAfterBattle dw SilphCo6EndBattleText3 ; TextEndBattle dw SilphCo6EndBattleText3 ; TextEndBattle -SilphCo6TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 +SilphCo6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 dw SilphCo6BattleText4 ; TextBeforeBattle dw SilphCo6AfterBattleText4 ; TextAfterBattle dw SilphCo6EndBattleText4 ; TextEndBattle @@ -186,7 +185,7 @@ SilphCo6AfterBattleText2: SilphCo6Text7: TX_ASM - ld hl, SilphCo6TrainerHeader2 + ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -204,7 +203,7 @@ SilphCo6AfterBattleText3: SilphCo6Text8: TX_ASM - ld hl, SilphCo6TrainerHeader3 + ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 9469d294..b211c8a9 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -1,7 +1,7 @@ SilphCo7Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing - ld hl, SilphCo7TrainerHeaders + ld hl, SilphCo7TrainerHeader0 ld de, SilphCo7ScriptPointers ld a, [wSilphCo7CurScript] call ExecuteCurMapScriptInTable @@ -279,7 +279,6 @@ SilphCo7TextPointers: dw SilphCo7Text14 dw SilphCo7Text15 -SilphCo7TrainerHeaders: SilphCo7TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -289,28 +288,28 @@ SilphCo7TrainerHeader0: dw SilphCo7EndBattleText1 ; TextEndBattle dw SilphCo7EndBattleText1 ; TextEndBattle -SilphCo7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 +SilphCo7TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 dw SilphCo7BattleText2 ; TextBeforeBattle dw SilphCo7AfterBattleText2 ; TextAfterBattle dw SilphCo7EndBattleText2 ; TextEndBattle dw SilphCo7EndBattleText2 ; TextEndBattle -SilphCo7TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3 +SilphCo7TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 dw SilphCo7BattleText3 ; TextBeforeBattle dw SilphCo7AfterBattleText3 ; TextAfterBattle dw SilphCo7EndBattleText3 ; TextEndBattle dw SilphCo7EndBattleText3 ; TextEndBattle -SilphCo7TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 +SilphCo7TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 dw SilphCo7BattleText4 ; TextBeforeBattle dw SilphCo7AfterBattleText4 ; TextAfterBattle dw SilphCo7EndBattleText4 ; TextEndBattle @@ -449,7 +448,7 @@ SilphCo7AfterBattleText1: SilphCo7Text6: TX_ASM - ld hl, SilphCo7TrainerHeader2 + ld hl, SilphCo7TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -467,7 +466,7 @@ SilphCo7AfterBattleText2: SilphCo7Text7: TX_ASM - ld hl, SilphCo7TrainerHeader3 + ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -485,7 +484,7 @@ SilphCo7AfterBattleText3: SilphCo7Text8: TX_ASM - ld hl, SilphCo7TrainerHeader4 + ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 399f7bd5..498fd569 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -81,7 +81,6 @@ SilphCo8TextPointers: dw SilphCo8Text3 dw SilphCo8Text4 -SilphCo8TrainerHeaders: SilphCo8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 6757eb49..57b8bc89 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -1,7 +1,7 @@ SilphCo9Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing - ld hl, SilphCo9TrainerHeaders + ld hl, SilphCo9TrainerHeader0 ld de, SilphCo9ScriptPointers ld a, [wSilphCo9CurScript] call ExecuteCurMapScriptInTable @@ -129,7 +129,6 @@ SilphCo9TextPointers: dw SilphCo9Text3 dw SilphCo9Text4 -SilphCo9TrainerHeaders: SilphCo9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 45c8dba5..12433732 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -1,6 +1,6 @@ SSAnne10Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne10TrainerHeaders + ld hl, SSAnne10TrainerHeader0 ld de, SSAnne10ScriptPointers ld a, [wSSAnne10CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ SSAnne10TextPointers: dw PickUpItemText dw PickUpItemText -SSAnne10TrainerHeaders: SSAnne10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index a398a381..0cfef9f4 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -19,7 +19,6 @@ SSAnne5TextPointers: dw SSAnne5Text4 dw SSAnne5Text5 -SSAnne5TrainerHeaders: SSAnne5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index e7cbef3e..c684f84b 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -1,6 +1,6 @@ SSAnne8Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne8TrainerHeaders + ld hl, SSAnne8TrainerHeader0 ld de, SSAnne8ScriptPointers ld a, [wSSAnne8CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ SSAnne8TextPointers: dw PickUpItemText dw SSAnne8Text11 -SSAnne8TrainerHeaders: SSAnne8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 789b0fa8..1f965e0d 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -3,7 +3,7 @@ SSAnne9Script: ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, SSAnne9TrainerHeaders + ld hl, SSAnne9TrainerHeader0 ld de, SSAnne9ScriptPointers ld a, [wSSAnne9CurScript] call ExecuteCurMapScriptInTable @@ -30,7 +30,6 @@ SSAnne9TextPointers: dw SSAnne9Text12 dw SSAnne9Text13 -SSAnne9TrainerHeaders: SSAnne9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index a200e719..80efe4f9 100755 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -1,7 +1,7 @@ TradeCenterScript: call EnableAutoTextBoxDrawing - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ld a, SPRITE_FACING_LEFT jr z, .next ld a, SPRITE_FACING_RIGHT @@ -21,8 +21,8 @@ TradeCenterScript: ld [hl], a ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + $19], a - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ret z ld a, $7 ld [wSpriteStateData2 + $15], a diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 2790694b..78b1ab80 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,6 +1,6 @@ UnknownDungeon3Script: call EnableAutoTextBoxDrawing - ld hl, UnknownDungeon3TrainerHeaders + ld hl, MewtwoTrainerHeader ld de, .ScriptPointers ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable @@ -17,7 +17,6 @@ UnknownDungeon3TextPointers: dw PickUpItemText dw PickUpItemText -UnknownDungeon3TrainerHeaders: MewtwoTrainerHeader: dbEventFlagBit EVENT_BEAT_MEWTWO db ($0 << 4) ; trainer's view range diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 25d5abad..f2c3f7c4 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -99,7 +99,6 @@ VermilionGymTextPointers: dw VermilionGymText7 dw VermilionGymText8 -VermilionGymTrainerHeaders: VermilionGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 8ec6725b..5409d733 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -4,7 +4,7 @@ VictoryRoad1Script: res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing - ld hl, VictoryRoad1TrainerHeaders + ld hl, VictoryRoad1TrainerHeader0 ld de, VictoryRoad1ScriptPointers ld a, [wVictoryRoad1CurScript] call ExecuteCurMapScriptInTable @@ -46,7 +46,6 @@ VictoryRoad1TextPointers: dw BoulderText dw BoulderText -VictoryRoad1TrainerHeaders: VictoryRoad1TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 5a3413ee..847573d8 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -8,7 +8,7 @@ VictoryRoad2Script: res 5, [hl] call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing - ld hl, VictoryRoad2TrainerHeaders + ld hl, VictoryRoad2TrainerHeader0 ld de, VictoryRoad2ScriptPointers ld a, [wVictoryRoad2CurScript] call ExecuteCurMapScriptInTable @@ -83,7 +83,6 @@ VictoryRoad2TextPointers: dw BoulderText dw BoulderText -VictoryRoad2TrainerHeaders: VictoryRoad2TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -93,37 +92,37 @@ VictoryRoad2TrainerHeader0: dw VictoryRoad2EndBattleText1 ; TextEndBattle dw VictoryRoad2EndBattleText1 ; TextEndBattle -VictoryRoad2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 +VictoryRoad2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 dw VictoryRoad2BattleText2 ; TextBeforeBattle dw VictoryRoad2AfterBattleText2 ; TextAfterBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle -VictoryRoad2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 +VictoryRoad2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 dw VictoryRoad2BattleText3 ; TextBeforeBattle dw VictoryRoad2AfterBattleText3 ; TextAfterBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle -VictoryRoad2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 +VictoryRoad2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 dw VictoryRoad2BattleText4 ; TextBeforeBattle dw VictoryRoad2AfterBattleText4 ; TextAfterBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle -VictoryRoad2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 +VictoryRoad2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 dw VictoryRoad2BattleText5 ; TextBeforeBattle dw VictoryRoad2AfterBattleText5 ; TextAfterBattle dw VictoryRoad2EndBattleText5 ; TextEndBattle @@ -148,25 +147,25 @@ VictoryRoad2Text1: VictoryRoad2Text2: TX_ASM - ld hl, VictoryRoad2TrainerHeader2 + ld hl, VictoryRoad2TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text3: TX_ASM - ld hl, VictoryRoad2TrainerHeader3 + ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text4: TX_ASM - ld hl, VictoryRoad2TrainerHeader4 + ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text5: TX_ASM - ld hl, VictoryRoad2TrainerHeader5 + ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index ef638a0f..c615091b 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -1,7 +1,7 @@ VictoryRoad3Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing - ld hl, VictoryRoad3TrainerHeaders + ld hl, VictoryRoad3TrainerHeader0 ld de, VictoryRoad3ScriptPointers ld a, [wVictoryRoad3CurScript] call ExecuteCurMapScriptInTable @@ -86,7 +86,6 @@ VictoryRoad3TextPointers: dw BoulderText dw BoulderText -VictoryRoad3TrainerHeaders: VictoryRoad3TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 db ($1 << 4) ; trainer's view range @@ -96,28 +95,28 @@ VictoryRoad3TrainerHeader0: dw VictoryRoad3EndBattleText2 ; TextEndBattle dw VictoryRoad3EndBattleText2 ; TextEndBattle -VictoryRoad3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 +VictoryRoad3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 dw VictoryRoad3BattleText3 ; TextBeforeBattle dw VictoryRoad3AfterBattleText3 ; TextAfterBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle -VictoryRoad3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 +VictoryRoad3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 dw VictoryRoad3BattleText4 ; TextBeforeBattle dw VictoryRoad3AfterBattleText4 ; TextAfterBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle -VictoryRoad3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 +VictoryRoad3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 dw VictoryRoad3BattleText5 ; TextBeforeBattle dw VictoryRoad3AfterBattleText5 ; TextAfterBattle dw VictoryRoad3EndBattleText5 ; TextEndBattle @@ -133,19 +132,19 @@ VictoryRoad3Text1: VictoryRoad3Text2: TX_ASM - ld hl, VictoryRoad3TrainerHeader2 + ld hl, VictoryRoad3TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text3: TX_ASM - ld hl, VictoryRoad3TrainerHeader3 + ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text4: TX_ASM - ld hl, VictoryRoad3TrainerHeader4 + ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 3dbfd8dd..bce093a9 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -1,6 +1,6 @@ ViridianForestScript: call EnableAutoTextBoxDrawing - ld hl, ViridianForestTrainerHeaders + ld hl, ViridianForestTrainerHeader0 ld de, ViridianForestScriptPointers ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable @@ -28,7 +28,6 @@ ViridianForestTextPointers: dw ViridianForestText13 dw ViridianForestText14 -ViridianForestTrainerHeaders: ViridianForestTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 8a42f210..ae70bacb 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -3,7 +3,7 @@ ViridianGymScript: ld de, Gym8LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing - ld hl, ViridianGymTrainerHeaders + ld hl, ViridianGymTrainerHeader0 ld de, ViridianGymScriptPointers ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable @@ -184,7 +184,6 @@ ViridianGymTextPointers: dw ViridianGymText13 dw ViridianGymText14 -ViridianGymTrainerHeaders: ViridianGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index c373405d..777027b0 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -73,7 +73,7 @@ _PewterCityText_1945d:: cont "Suis-moi!" done -_PewterCityText_19462:: +_PewterCityText14:: text "Si t'es fort..." line "T'as pas tort..." cont "Alors..." diff --git a/text/unused_names.asm b/text/unused_names.asm new file mode 100644 index 00000000..4aca7ca2 --- /dev/null +++ b/text/unused_names.asm @@ -0,0 +1,20 @@ +UnusedNames:: + db "かみなりバッヂ@" + db "かいがらバッヂ@" + db "おじぞうバッヂ@" + db "はやぶさバッヂ@" + db "ひんやりバッヂ@" + db "なかよしバッヂ@" + db "バラバッヂ@" + db "ひのたまバッヂ@" + db "ゴールドバッヂ@" + db "たまご@" + db "ひよこ@" + db "ブロンズ@" + db "シルバー@" + db "ゴールド@" + db "プチキャプテン@" + db "キャプテン@" + db "プチマスター@" + db "マスター@" + db "エクセレント" @@ -445,11 +445,10 @@ wTradeCenterPointerTableIndex:: ; cc38 ds 1 -wUnusedCC3A:: ; cc3a - ds 1 - -wUnusedCC3B:: ; cc3b - ds 1 +wTextDest:: ; cc3a +; destination pointer for text output +; this variable is written to, but is never read from + ds 2 wDoNotWaitForButtonPressAfterDisplayingText:: ; cc3c ; if non-zero, skip waiting for a button press after displaying text in DisplayTextID |