diff options
144 files changed, 1448 insertions, 2415 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index d749bdb4..50ce3104 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -6,7 +6,7 @@ ; FadeMusic ; PlayStereoSFX -_MapSetup_Sound_Off:: +_InitSound:: ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -62,7 +62,7 @@ MusicFadeRestart: push af ld a, [wMusicFadeID] push af - call _MapSetup_Sound_Off + call _InitSound pop af ld [wMusicFadeID], a pop af @@ -116,19 +116,19 @@ _UpdateSound:: ; turn vibrato off for now ld hl, CHANNEL_FLAGS2 add hl, bc - res SOUND_PITCH_WHEEL, [hl] + res SOUND_PITCH_SLIDE, [hl] ; get next note call ParseMusic .continue_sound_update - call ApplyPitchWheel + call ApplyPitchSlide ; duty cycle ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld a, [hli] ld [wCurTrackDuty], a - ; intensity + ; volume envelope ld a, [hli] - ld [wCurTrackIntensity], a + ld [wCurTrackVolumeEnvelope], a ; frequency ld a, [hli] ld [wCurTrackFrequency], a @@ -240,12 +240,12 @@ UpdateChannels: .Channel5: ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit NOTE_UNKN_3, [hl] - jr z, .asm_e8159 + bit NOTE_PITCH_SWEEP, [hl] + jr z, .noPitchSweep ; - ld a, [wSoundInput] + ld a, [wPitchSweep] ldh [rNR10], a -.asm_e8159 +.noPitchSweep bit NOTE_REST, [hl] ; rest jr nz, .ch1rest bit NOTE_NOISE_SAMPLING, [hl] @@ -296,7 +296,7 @@ UpdateChannels: ld a, $3f ; sound length or [hl] ldh [rNR11], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR12], a ld a, [wCurTrackFrequency] ldh [rNR13], a @@ -356,7 +356,7 @@ UpdateChannels: ld a, $3f ; sound length or [hl] ldh [rNR21], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR22], a ld a, [wCurTrackFrequency] ldh [rNR23], a @@ -414,7 +414,7 @@ UpdateChannels: .asm_e8268 push hl - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] and $f ; only 0-9 are valid ld l, a ld h, 0 @@ -460,7 +460,7 @@ endr ld a, [hli] ldh [rWave_f], a pop hl - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] and $f0 sla a ldh [rNR32], a @@ -492,7 +492,7 @@ endr .asm_e82d4 ld a, $3f ; sound length ldh [rNR41], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR42], a ld a, [wCurTrackFrequency] ldh [rNR43], a @@ -706,10 +706,10 @@ FadeMusic: ret LoadNote: - ; wait for pitch wheel to finish + ; wait for pitch slide to finish ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_PITCH_WHEEL, [hl] + bit SOUND_PITCH_SLIDE, [hl] ret z ; get note duration ld hl, CHANNEL_NOTE_DURATION @@ -727,8 +727,8 @@ LoadNote: ld e, [hl] inc hl ld d, [hl] - ; get direction of pitch wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ; get direction of pitch slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e sub [hl] @@ -736,13 +736,13 @@ LoadNote: ld a, d sbc 0 ld d, a - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc sub [hl] jr nc, .greater_than ld hl, CHANNEL_FLAGS3 add hl, bc - set SOUND_PITCH_WHEEL_DIR, [hl] + set SOUND_PITCH_SLIDE_DIR, [hl] ; get frequency ld hl, CHANNEL_FREQUENCY add hl, bc @@ -750,7 +750,7 @@ LoadNote: inc hl ld d, [hl] ; ???? - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, [hl] sub e @@ -759,7 +759,7 @@ LoadNote: sbc 0 ld d, a ; ???? - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, [hl] sub d @@ -769,15 +769,15 @@ LoadNote: .greater_than ld hl, CHANNEL_FLAGS3 add hl, bc - res SOUND_PITCH_WHEEL_DIR, [hl] + res SOUND_PITCH_SLIDE_DIR, [hl] ; get frequency ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] - ; get distance from pitch wheel target - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ; get distance from pitch slide target + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e sub [hl] @@ -785,7 +785,7 @@ LoadNote: ld a, d sbc 0 ld d, a - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc sub [hl] ld d, a @@ -813,10 +813,10 @@ LoadNote: add [hl] ld d, b ; quotient pop bc - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld [hl], d ; quotient - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld [hl], a ; remainder ld hl, CHANNEL_FIELD25 @@ -829,9 +829,9 @@ HandleTrackVibrato: ; handle duty, cry pitch, and vibrato ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_DUTY, [hl] ; duty + bit SOUND_DUTY_LOOP, [hl] ; duty cycle looping jr z, .next - ld hl, CHANNEL_SFX_DUTY_LOOP + ld hl, CHANNEL_DUTY_CYCLE_PATTERN add hl, bc ld a, [hl] rlca @@ -845,9 +845,9 @@ HandleTrackVibrato: .next ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_CRY_PITCH, [hl] + bit SOUND_PITCH_OFFSET, [hl] jr z, .vibrato - ld hl, CHANNEL_CRY_PITCH + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld e, [hl] inc hl @@ -942,11 +942,11 @@ HandleTrackVibrato: .quit ret -ApplyPitchWheel: - ; quit if pitch wheel inactive +ApplyPitchSlide: + ; quit if pitch slide inactive ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_PITCH_WHEEL, [hl] + bit SOUND_PITCH_SLIDE, [hl] ret z ; de = Frequency ld hl, CHANNEL_FREQUENCY @@ -954,22 +954,22 @@ ApplyPitchWheel: ld e, [hl] inc hl ld d, [hl] - ; check whether pitch wheel is going up or down + ; check whether pitch slide is going up or down ld hl, CHANNEL_FLAGS3 add hl, bc - bit SOUND_PITCH_WHEEL_DIR, [hl] + bit SOUND_PITCH_SLIDE_DIR, [hl] jr z, .decreasing - ; frequency += [Channel*PitchWheelAmount] - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ; frequency += [Channel*PitchSlideAmount] + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld l, [hl] ld h, 0 add hl, de ld d, h ld e, l - ; [Channel*Field25] += [Channel*PitchWheelAmountFraction] + ; [Channel*Field25] += [Channel*PitchSlideAmountFraction] ; if rollover: Frequency += 1 - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld a, [hl] ld hl, CHANNEL_FIELD25 @@ -982,26 +982,26 @@ ApplyPitchWheel: ld a, 0 adc d ld d, a - ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; Compare the dw at [Channel*PitchSlideTarget] to de. ; If frequency is greater, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, [hl] cp d - jp c, .finished_pitch_wheel - jr nz, .continue_pitch_wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + jp c, .finished_pitch_slide + jr nz, .continue_pitch_slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, [hl] cp e - jp c, .finished_pitch_wheel - jr .continue_pitch_wheel + jp c, .finished_pitch_slide + jr .continue_pitch_slide .decreasing - ; frequency -= [Channel*PitchWheelAmount] + ; frequency -= [Channel*PitchSlideAmount] ld a, e - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld e, [hl] sub e @@ -1011,7 +1011,7 @@ ApplyPitchWheel: ld d, a ; [Channel*Field25] *= 2 ; if rollover: Frequency -= 1 - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld a, [hl] add a @@ -1022,30 +1022,30 @@ ApplyPitchWheel: ld a, d sbc 0 ld d, a - ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; Compare the dw at [Channel*PitchSlideTarget] to de. ; If frequency is lower, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, d cp [hl] - jr c, .finished_pitch_wheel - jr nz, .continue_pitch_wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + jr c, .finished_pitch_slide + jr nz, .continue_pitch_slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e cp [hl] - jr nc, .continue_pitch_wheel -.finished_pitch_wheel + jr nc, .continue_pitch_slide +.finished_pitch_slide ld hl, CHANNEL_FLAGS2 add hl, bc - res SOUND_PITCH_WHEEL, [hl] + res SOUND_PITCH_SLIDE, [hl] ld hl, CHANNEL_FLAGS3 add hl, bc - res SOUND_PITCH_WHEEL_DIR, [hl] + res SOUND_PITCH_SLIDE_DIR, [hl] ret -.continue_pitch_wheel +.continue_pitch_slide ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e @@ -1088,7 +1088,7 @@ ReadNoiseSample: ; [wx] [yy] [zz] ; w: ? either 2 or 3 ; x: duration -; zz: intensity +; zz: volume envelope ; yy: frequency ; de = [wNoiseSampleAddress] @@ -1105,7 +1105,7 @@ ReadNoiseSample: ld a, [de] inc de - cp endchannel_cmd + cp sound_ret_cmd jr z, .quit and $f @@ -1113,7 +1113,7 @@ ReadNoiseSample: ld [wNoiseSampleDelay], a ld a, [de] inc de - ld [wCurTrackIntensity], a + ld [wCurTrackVolumeEnvelope], a ld a, [de] inc de ld [wCurTrackFrequency], a @@ -1136,8 +1136,8 @@ ReadNoiseSample: ParseMusic: ; parses until a note is read or the song is ended call GetMusicByte ; store next byte in a - cp endchannel_cmd - jr z, .endchannel + cp sound_ret_cmd + jr z, .sound_ret cp FIRST_MUSIC_CMD jr c, .readnote ; then it's a command @@ -1196,7 +1196,7 @@ ParseMusic: set NOTE_REST, [hl] ; Rest ret -.endchannel +.sound_ret ; $ff is reached in music data ld hl, CHANNEL_FLAGS1 add hl, bc @@ -1247,10 +1247,10 @@ RestoreVolume: cp CHAN5 ret nz xor a - ld hl, wChannel6CryPitch + ld hl, wChannel6PitchOffset ld [hli], a ld [hl], a - ld hl, wChannel8CryPitch + ld hl, wChannel8PitchOffset ld [hli], a ld [hl], a ld a, [wLastVolume] @@ -1268,9 +1268,9 @@ ParseSFXOrRest: ; update note duration ld a, [wCurMusicByte] call SetNoteDuration ; top nybble doesnt matter? - ; update intensity from next param + ; update volume envelope from next param call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc ld [hl], a ; update lo frequency from next param @@ -1364,7 +1364,7 @@ ParseMusicCommand: jp hl MusicCommands: -; entries correspond to macros/sound.asm enumeration +; entries correspond to macros/scripts/audio.asm enumeration dw Music_Octave8 ; octave 8 dw Music_Octave7 ; octave 7 dw Music_Octave6 ; octave 6 @@ -1373,24 +1373,24 @@ MusicCommands: dw Music_Octave3 ; octave 3 dw Music_Octave2 ; octave 2 dw Music_Octave1 ; octave 1 - dw Music_NoteType ; note length + intensity - dw Music_ForceOctave ; set starting octave + dw Music_NoteType ; note length + volume envelope + dw Music_Transpose ; transpose dw Music_Tempo ; tempo dw Music_DutyCycle ; duty cycle - dw Music_Intensity ; intensity - dw Music_SoundStatus ; update sound status - dw Music_SoundDuty ; sfx duty + dw Music_VolumeEnvelope ; volume envelope + dw Music_PitchSweep ; update pitch sweep + dw Music_DutyCyclePattern ; duty cycle pattern dw Music_ToggleSFX ; sound on/off - dw Music_SlidePitchTo ; pitch wheel + dw Music_PitchSlide ; pitch slide dw Music_Vibrato ; vibrato dw MusicE2 ; unused dw Music_ToggleNoise ; music noise sampling - dw Music_Panning ; force panning + dw Music_ForceStereoPanning ; force stereo panning dw Music_Volume ; volume - dw Music_Tone ; tone + dw Music_PitchOffset ; pitch offset dw MusicE7 ; unused dw MusicE8 ; unused - dw Music_TempoRelative ; global tempo + dw Music_TempoRelative ; tempo adjust dw Music_RestartChannel ; restart current channel from header dw Music_NewSong ; new song dw Music_SFXPriorityOn ; sfx priority on @@ -1407,12 +1407,12 @@ MusicCommands: dw MusicF7 ; nothing dw MusicF8 ; nothing dw MusicF9 ; unused - dw Music_SetCondition ; setcondition + dw Music_SetCondition ; set condition dw Music_JumpIf ; jumpif - dw Music_JumpChannel ; jump - dw Music_LoopChannel ; loop - dw Music_CallChannel ; call - dw Music_EndChannel ; return + dw Music_Jump ; jump + dw Music_Loop ; loop + dw Music_Call ; call + dw Music_Ret ; return MusicF1: MusicF2: @@ -1424,7 +1424,7 @@ MusicF7: MusicF8: ret -Music_EndChannel: +Music_Ret: ; called when $ff is encountered w/ subroutine flag set ; end music stream ; return to caller of the subroutine @@ -1445,7 +1445,7 @@ Music_EndChannel: ld [hl], d ret -Music_CallChannel: +Music_Call: ; call music stream (subroutine) ; parameters: ll hh ; pointer to subroutine ; get pointer from next 2 bytes @@ -1478,7 +1478,7 @@ Music_CallChannel: set SOUND_SUBROUTINE, [hl] ret -Music_JumpChannel: +Music_Jump: ; jump ; parameters: ll hh ; pointer ; get pointer from next 2 bytes @@ -1493,7 +1493,7 @@ Music_JumpChannel: ld [hl], d ret -Music_LoopChannel: +Music_Loop: ; loops xx - 1 times ; 00: infinite ; params: 3 @@ -1740,8 +1740,8 @@ Music_Vibrato: ld [hl], a ret -Music_SlidePitchTo: -; set the target for pitch wheel +Music_PitchSlide: +; set the target for pitch slide ; params: 2 ; note duration ; target note @@ -1760,24 +1760,25 @@ Music_SlidePitchTo: and $f ld d, a call GetFrequency - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld [hl], e - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld [hl], d ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_PITCH_WHEEL, [hl] + set SOUND_PITCH_SLIDE, [hl] ret -Music_Tone: +Music_PitchOffset: ; tone ; params: 1 (dw) +; offset to add to each note frequency ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_CRY_PITCH, [hl] - ld hl, CHANNEL_CRY_PITCH + 1 + set SOUND_PITCH_OFFSET, [hl] + ld hl, CHANNEL_PITCH_OFFSET + 1 add hl, bc call GetMusicByte ld [hld], a @@ -1797,17 +1798,17 @@ MusicE7: ld [hl], a ret -Music_SoundDuty: +Music_DutyCyclePattern: ; sequence of 4 duty cycles to be looped ; params: 1 (4 2-bit duty cycle arguments) ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_DUTY, [hl] ; duty cycle + set SOUND_DUTY_LOOP, [hl] ; duty cycle looping ; sound duty sequence call GetMusicByte rrca rrca - ld hl, CHANNEL_SFX_DUTY_LOOP + ld hl, CHANNEL_DUTY_CYCLE_PATTERN add hl, bc ld [hl], a ; update duty cycle @@ -1889,7 +1890,7 @@ Music_SFXToggleNoise: Music_NoteType: ; note length ; # frames per 16th note -; intensity: see Music_Intensity +; volume envelope: see Music_VolumeEnvelope ; params: 2 ; note length call GetMusicByte @@ -1900,18 +1901,18 @@ Music_NoteType: maskbits NUM_MUSIC_CHANS cp CHAN4 ret z - ; intensity - call Music_Intensity + ; volume envelope + call Music_VolumeEnvelope ret -Music_SoundStatus: -; update sound status +Music_PitchSweep: +; update pitch sweep ; params: 1 call GetMusicByte - ld [wSoundInput], a + ld [wPitchSweep], a ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set NOTE_UNKN_3, [hl] + set NOTE_PITCH_SWEEP, [hl] ret Music_DutyCycle: @@ -1926,13 +1927,13 @@ Music_DutyCycle: ld [hl], a ret -Music_Intensity: -; intensity +Music_VolumeEnvelope: +; volume envelope ; params: 1 -; hi: pressure -; lo: velocity +; hi: volume +; lo: fade call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc ld [hl], a ret @@ -1964,12 +1965,12 @@ Music_Octave1: ld [hl], a ret -Music_ForceOctave: +Music_Transpose: ; set starting octave ; this forces all notes up by the starting octave ; params: 1 call GetMusicByte - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld [hl], a ret @@ -1980,12 +1981,12 @@ Music_StereoPanning: ; stereo on? ld a, [wOptions] bit STEREO, a - jr nz, Music_Panning + jr nz, Music_ForceStereoPanning ; skip param call GetMusicByte ret -Music_Panning: +Music_ForceStereoPanning: ; force panning ; params: 1 call SetLRTracks @@ -2141,7 +2142,7 @@ GetFrequency: ; get octave ; get starting octave - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld a, [hl] swap a ; hi nybble @@ -2150,7 +2151,7 @@ GetFrequency: add d push af ; we'll use this later ; get starting octave - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld a, [hl] and $f ; lo nybble @@ -2402,9 +2403,9 @@ _PlayCry:: ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_CRY_PITCH, [hl] + set SOUND_PITCH_OFFSET, [hl] - ld hl, CHANNEL_CRY_PITCH + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [wCryPitch] ld [hli], a @@ -2484,8 +2485,8 @@ _PlaySFX:: ld a, $80 ldh [rNR14], a ; restart sound (freq hi = 0) xor a - ld [wSoundInput], a ; global sound off - ldh [rNR10], a ; sweep = 0 + ld [wPitchSweep], a ; pitch sweep off + ldh [rNR10], a ; pitch sweep off .ch6 ld hl, wChannel6Flags1 bit SOUND_CHANNEL_ON, [hl] diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 1d092edf..f5895dd9 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,7 +1,6 @@ ; pitch ; FrequencyTable indexes (see audio/notes.asm) - const_def - const __ ; 0 + const_def 1 const C_ ; 1 const C# ; 2 const D_ ; 3 @@ -14,7 +13,6 @@ const A_ ; a const A# ; b const B_ ; c - const CC ; d (used for pitchoffset) ; channel ; ChannelPointers indexes (see audio/engine.asm) @@ -42,26 +40,26 @@ CHANNEL_LAST_MUSIC_ADDRESS EQUS "(wChannel1LastMusicAddress - wChannel1 CHANNEL_NOTE_FLAGS EQUS "(wChannel1NoteFlags - wChannel1)" CHANNEL_CONDITION EQUS "(wChannel1Condition - wChannel1)" CHANNEL_DUTY_CYCLE EQUS "(wChannel1DutyCycle - wChannel1)" -CHANNEL_INTENSITY EQUS "(wChannel1Intensity - wChannel1)" +CHANNEL_VOLUME_ENVELOPE EQUS "(wChannel1VolumeEnvelope - wChannel1)" CHANNEL_FREQUENCY EQUS "(wChannel1Frequency - wChannel1)" CHANNEL_PITCH EQUS "(wChannel1Pitch - wChannel1)" CHANNEL_OCTAVE EQUS "(wChannel1Octave - wChannel1)" -CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" +CHANNEL_TRANSPOSITION EQUS "(wChannel1Transposition - wChannel1)" CHANNEL_NOTE_DURATION EQUS "(wChannel1NoteDuration - wChannel1)" CHANNEL_FIELD16 EQUS "(wChannel1Field16 - wChannel1)" CHANNEL_LOOP_COUNT EQUS "(wChannel1LoopCount - wChannel1)" CHANNEL_TEMPO EQUS "(wChannel1Tempo - wChannel1)" CHANNEL_TRACKS EQUS "(wChannel1Tracks - wChannel1)" -CHANNEL_SFX_DUTY_LOOP EQUS "(wChannel1SFXDutyLoop - wChannel1)" +CHANNEL_DUTY_CYCLE_PATTERN EQUS "(wChannel1DutyCyclePattern - wChannel1)" CHANNEL_VIBRATO_DELAY_COUNT EQUS "(wChannel1VibratoDelayCount - wChannel1)" CHANNEL_VIBRATO_DELAY EQUS "(wChannel1VibratoDelay - wChannel1)" CHANNEL_VIBRATO_EXTENT EQUS "(wChannel1VibratoExtent - wChannel1)" CHANNEL_VIBRATO_RATE EQUS "(wChannel1VibratoRate - wChannel1)" -CHANNEL_PITCH_WHEEL_TARGET EQUS "(wChannel1PitchWheelTarget - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT EQUS "(wChannel1PitchWheelAmount - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)" +CHANNEL_PITCH_SLIDE_TARGET EQUS "(wChannel1PitchSlideTarget - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT EQUS "(wChannel1PitchSlideAmount - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION EQUS "(wChannel1PitchSlideAmountFraction - wChannel1)" CHANNEL_FIELD25 EQUS "(wChannel1Field25 - wChannel1)" -CHANNEL_CRY_PITCH EQUS "(wChannel1CryPitch - wChannel1)" +CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" CHANNEL_FIELD29 EQUS "(wChannel1Field29 - wChannel1)" CHANNEL_FIELD2A EQUS "(wChannel1Field2a - wChannel1)" CHANNEL_FIELD2C EQUS "(wChannel1Field2c - wChannel1)" @@ -84,26 +82,26 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 ; Flags2 const_def - const SOUND_VIBRATO ; 0 - const SOUND_PITCH_WHEEL ; 1 - const SOUND_DUTY ; 2 - const SOUND_UNKN_0B ; 3 - const SOUND_CRY_PITCH ; 4 - const SOUND_UNKN_0D ; 5 - const SOUND_UNKN_0E ; 6 - const SOUND_UNKN_0F ; 7 + const SOUND_VIBRATO ; 0 + const SOUND_PITCH_SLIDE ; 1 + const SOUND_DUTY_LOOP ; 2 + const SOUND_UNKN_0B ; 3 + const SOUND_PITCH_OFFSET ; 4 + const SOUND_UNKN_0D ; 5 + const SOUND_UNKN_0E ; 6 + const SOUND_UNKN_0F ; 7 ; Flags3 const_def const SOUND_VIBRATO_DIR ; 0 - const SOUND_PITCH_WHEEL_DIR ; 1 + const SOUND_PITCH_SLIDE_DIR ; 1 ; NoteFlags const_def const NOTE_DUTY_OVERRIDE ; 0 const NOTE_FREQ_OVERRIDE ; 1 const NOTE_UNUSED ; 2 - const NOTE_UNKN_3 ; 3 + const NOTE_PITCH_SWEEP ; 3 const NOTE_NOISE_SAMPLING ; 4 const NOTE_REST ; 5 const NOTE_VIBRATO_OVERRIDE ; 6 diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 61b6dd45..bba69b4c 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -165,19 +165,19 @@ Text_NothingHereToFish_:: line "nothing here." prompt -Text_CantGetOffBike_:: +_CantGetOffBikeText:: text "You can't get off" line "here!" done -Text_GotOnTheBike_:: +_GotOnBikeText:: text "<PLAYER> got on the" line "@" text_ram wStringBuffer2 text "." done -Text_GotOffTheBike_:: +_GotOffBikeText:: text "<PLAYER> got off" line "the @" text_ram wStringBuffer2 @@ -209,7 +209,7 @@ _CantCarryItemText:: cont "items!" done -UnknownText_0x1c0a4e:: +_WhitedOutText:: text "<PLAYER> is out of" line "useable #MON!" @@ -1323,11 +1323,11 @@ _ObjectEventText:: text "Object event." done -BGEventText_:: +_BGEventText:: text "BG event" done -CoordinatesEventText_:: +_CoordinatesEventText:: text "Coordinates event" done diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 88c300e9..6a3f7799 100755 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -2,16 +2,16 @@ GiveParkBalls: xor a ld [wContestMon], a ld a, 20 - ld [wParkBalls], a + ld [wParkBallsRemaining], a farcall StartBugContestTimer ret BugCatchingContestBattleScript:: - writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST + loadvar VAR_BATTLETYPE, BATTLETYPE_CONTEST randomwildmon startbattle reloadmapafterbattle - copybytetovar wParkBalls + readmem wParkBallsRemaining iffalse BugCatchingContestOutOfBallsScript end @@ -20,22 +20,22 @@ BugCatchingContestOverScript:: opentext writetext BugCatchingContestTimeUpText waitbutton - jump $79CD - + sjump BugCatchingContestReturnToGateScript + BugCatchingContestOutOfBallsScript: playsound SFX_ELEVATOR_END opentext writetext BugCatchingContestIsOverText waitbutton - + BugCatchingContestReturnToGateScript: closetext jumpstd bugcontestresultswarp - + BugCatchingContestTimeUpText: text_far _BugCatchingContestTimeUpText - db "@" + text_end BugCatchingContestIsOverText: text_far _BugCatchingContestIsOverText - db "@"
\ No newline at end of file + text_end diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index 69f27bfe..fcd2793f 100755 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm @@ -1,5 +1,5 @@ Script_ForcedMovement:: - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, .down ifequal UP, .up ifequal LEFT, .left diff --git a/engine/events/misc_scripts_2.asm b/engine/events/hidden_item.asm index 294dc6a0..b61a6205 100755..100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/hidden_item.asm @@ -1,28 +1,17 @@ -RepelWoreOffScript:: - opentext - writetext .RepelWoreOffText - waitbutton - closetext - end - -.RepelWoreOffText: - text_far _RepelWoreOffText - db "@" - HiddenItemScript:: opentext - copybytetovar wHiddenItemID - itemtotext STRING_BUFFER_3, USE_SCRIPT_VAR + readmem wHiddenItemID + getitemname STRING_BUFFER_3, USE_SCRIPT_VAR writetext .PlayerFoundItemText giveitem ITEM_FROM_MEM iffalse .bag_full callasm SetMemEvent specialsound itemnotify - jump .finish + sjump .finish .bag_full - buttonsound + promptbutton writetext .ButNoSpaceText waitbutton @@ -32,11 +21,11 @@ HiddenItemScript:: .PlayerFoundItemText: text_far _PlayerFoundItemText - db "@" + text_end .ButNoSpaceText: text_far _ButNoSpaceText - db "@" + text_end SetMemEvent: ld hl, wHiddenItemEvent diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index b08d313e..e9006332 100755 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -29,17 +29,17 @@ FindItemInBallScript:: .FoundItemText: text_far _FoundItemText - db "@" + text_end .CantCarryItemText: text_far _CantCarryItemText - db "@" + text_end .TryReceiveItem: xor a ld [wScriptVar], a ld a, [wItemBallItemID] - ld [wDeciramBuffer], a + ld [wNamedObjectIndexBuffer], a call GetItemName ld hl, wStringBuffer3 call CopyName2 @@ -52,4 +52,4 @@ FindItemInBallScript:: ret nc ld a, $1 ld [wScriptVar], a - ret
\ No newline at end of file + ret diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 7cc64dff..2ec6d857 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -409,16 +409,18 @@ AlreadySurfing: SurfFromMenuScript: special UpdateTimePals + UsedSurfScript: - writetext UsedSurfText + writetext UsedSurfText ; "used SURF!" waitbutton closetext - copybytetovar wBuffer2 - writevarcode VAR_MOVEMENT + readmem wBuffer2 + writevar VAR_MOVEMENT special ReplacePlayerSprite special PlayMapMusic +; step into the water (slow_step DIR, step_end) special SurfStartStep - applymovement 0, wMovementBuffer + applymovement PLAYER, wMovementBuffer end UsedSurfText: @@ -591,7 +593,7 @@ FlyScript: farscall Script_AbortBugContest special WarpToSpawnPoint callasm DelayLoadingNewSprites ; 1560c - writecode VAR_MOVEMENT, PLAYER_NORMAL + loadvar VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_TELEPORT callasm FlyToAnimation special WaitSFX @@ -806,7 +808,7 @@ UsedEscapeRopeScript: ; cc2e reloadmappart reloadmappart special UpdateTimePals writetext Text_UsedEscapeRope ; cc24 - jump ContinueDigEscapeRopeScript + sjump ContinueDigEscapeRopeScript UsedDigScript: reloadmappart @@ -819,7 +821,7 @@ ContinueDigEscapeRopeScript: applymovement PLAYER, DigOutMovementData farscall Script_AbortBugContest special WarpToSpawnPoint - writecode VAR_MOVEMENT, PLAYER_NORMAL + loadvar VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_DOOR playsound SFX_WARP_FROM applymovement PLAYER, DigReturnMovementData @@ -906,7 +908,7 @@ TeleportScript: ; ccbe applymovement PLAYER, TeleportFromMovementData farscall Script_AbortBugContest special WarpToSpawnPoint - writecode VAR_MOVEMENT, PLAYER_NORMAL + loadvar VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_TELEPORT playsound SFX_WARP_FROM applymovement PLAYER, TeleportToMovementData @@ -969,7 +971,7 @@ Script_StrengthFromMenu: ; cd2c Script_UsedStrength: callasm GetStrengthUserSpeciesAndSetFlag writetext Text_UsedStrength - copybytetovar wBuffer6 + readmem wBuffer6 cry 0 pause 3 writetext Text_AllowedToMoveBoulders @@ -988,7 +990,7 @@ AskStrengthScript: ; cd4e callasm TryStrengthOW iffalse .ask ifequal 1, .not_able - jump .already_active + sjump .already_active .not_able jumptext Text_MonMayBeAbleToMove @@ -1315,10 +1317,11 @@ RockSmashScript: special WaitSFX playsound SFX_STRENGTH earthquake 84 - applymovement2 RockSmashMovementData + applymovementlasttalked RockSmashMovementData disappear -2 + callasm RockMonEncounter - copybytetovar wd117 + readmem wTempWildMonSpecies iffalse .skip_battle randomwildmon startbattle @@ -1421,7 +1424,7 @@ Fish_CheckMap: ld a, d and a jr z, .asm_cff1 - ld [wd117], a + ld [wTempWildMonSpecies], a ld a, e ld [wCurPartyLevel], a ld a, $4 @@ -1464,7 +1467,7 @@ Fish_NoFish: Script_NotEvenANibble: ; d021 scall Script_FishCastRod writetext Text_NotEvenANibble - jump Script_NotEvenANibble_Continue + sjump Script_NotEvenANibble_Continue Script_NotEvenANibble2: scall Script_FishCastRod @@ -1479,7 +1482,7 @@ Script_GotABite: callasm Fish_CheckFacingUp iffalse .not_facing_up applymovement 0, Movement_Fishing_BiteFacingUp - jump .continue + sjump .continue .not_facing_up applymovement 0, Movement_Fishing_BiteNotFacingUp @@ -1530,7 +1533,7 @@ Fish_CheckFacingUp: ; d06d Script_FishCastRod: ; d07d reloadmappart - loadvar hBGMapMode, 0 + loadmem hBGMapMode, $0 special UpdateTimePals loademote EMOTE_ROD callasm LoadFishingGFX @@ -1657,15 +1660,15 @@ CheckBikePermission: ; d12e (3:512e) Script_GetOnBike: ; d14b reloadmappart special UpdateTimePals - writecode VAR_MOVEMENT, PLAYER_BIKE - writetext Text_GotOnTheBike + loadvar VAR_MOVEMENT, PLAYER_BIKE + writetext GotOnBikeText waitbutton closetext special ReplacePlayerSprite end Script_GetOnBike_Register: - writecode VAR_MOVEMENT, PLAYER_BIKE + loadvar VAR_MOVEMENT, PLAYER_BIKE closetext special ReplacePlayerSprite end @@ -1676,8 +1679,8 @@ Script_GetOnBike_Register: Script_GetOffBike: reloadmappart special UpdateTimePals - writecode VAR_MOVEMENT, PLAYER_NORMAL - writetext Text_GotOffTheBike + loadvar VAR_MOVEMENT, PLAYER_NORMAL + writetext GotOffBikeText waitbutton FinishGettingOffBike: closetext @@ -1686,26 +1689,26 @@ FinishGettingOffBike: end Script_GetOffBike_Register: - writecode VAR_MOVEMENT, PLAYER_NORMAL - jump FinishGettingOffBike + loadvar VAR_MOVEMENT, PLAYER_NORMAL + sjump FinishGettingOffBike -Script_CantGetOffBike: ; d17e - writetext Text_CantGetOffBike +Script_CantGetOffBike: + writetext .CantGetOffBikeText waitbutton closetext end -Text_CantGetOffBike: - text_far Text_CantGetOffBike_ - db "@" +.CantGetOffBikeText: + text_far _CantGetOffBikeText + text_end -Text_GotOnTheBike: - text_far Text_GotOnTheBike_ - db "@" +GotOnBikeText: + text_far _GotOnBikeText + text_end -Text_GotOffTheBike: - text_far Text_GotOffTheBike_ - db "@" +GotOffBikeText: + text_far _GotOffBikeText + text_end TryCutOW: ; d193 diff --git a/engine/events/repel.asm b/engine/events/repel.asm new file mode 100644 index 00000000..e324239c --- /dev/null +++ b/engine/events/repel.asm @@ -0,0 +1,10 @@ +RepelWoreOffScript:: + opentext + writetext .RepelWoreOffText + waitbutton + closetext + end + +.RepelWoreOffText: + text_far _RepelWoreOffText + text_end diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 0e06b03c..8c54c041 100755 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm @@ -26,4 +26,4 @@ CheckFacingTileForStdScript:: INCLUDE "data/events/collision_stdscripts.asm" Script_JumpStdFromRAM: - jump wJumpStdScriptBuffer + sjump wJumpStdScriptBuffer diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 01d7b388..bcab820b 100755 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -1,6 +1,6 @@ Script_BattleWhiteout:: callasm BattleBGMap - jump Script_Whiteout + sjump Script_Whiteout Script_OverworldWhiteout:: refreshscreen @@ -25,9 +25,8 @@ Script_Whiteout: jumpstd bugcontestresultswarp .WhitedOutText: - ; is out of useable #MON! whited out! - text_far UnknownText_0x1c0a4e - db "@" + text_far _WhitedOutText + text_end OverworldBGMap: call ClearPalettes diff --git a/engine/pack.asm b/engine/items/pack.asm index a8c1fedc..a8c1fedc 100755 --- a/engine/pack.asm +++ b/engine/items/pack.asm diff --git a/engine/learn_tm.asm b/engine/items/tmhm2.asm index a7a135d9..a7a135d9 100755 --- a/engine/learn_tm.asm +++ b/engine/items/tmhm2.asm diff --git a/engine/namingscreen.asm b/engine/menus/naming_screen.asm index ca0eb213..ca0eb213 100644 --- a/engine/namingscreen.asm +++ b/engine/menus/naming_screen.asm diff --git a/engine/billspctop.asm b/engine/pokemon/bills_pc_top.asm index 749718db..749718db 100644 --- a/engine/billspctop.asm +++ b/engine/pokemon/bills_pc_top.asm diff --git a/home/audio.asm b/home/audio.asm index 5ce77bd6..b69687db 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -8,11 +8,11 @@ InitSound:: ldh a, [hROMBank] push af - ld a, BANK(_MapSetup_Sound_Off) + ld a, BANK(_InitSound) ldh [hROMBank], a ld [MBC3RomBank], a - call _MapSetup_Sound_Off + call _InitSound pop af ldh [hROMBank], a @@ -71,7 +71,7 @@ PlayMusic:: ldh a, [hROMBank] push af - ld a, BANK(_PlayMusic) ; aka BANK(_MapSetup_Sound_Off) + ld a, BANK(_PlayMusic) ; aka BANK(_InitSound) ldh [hROMBank], a ld [MBC3RomBank], a @@ -83,7 +83,7 @@ PlayMusic:: jr .end .nomusic - call _MapSetup_Sound_Off + call _InitSound .end pop af @@ -250,7 +250,7 @@ MaxVolume:: ret LowVolume:: - ld a, $33 ; 40% + ld a, $33 ; 50% ld [wVolume], a ret @@ -497,7 +497,7 @@ CheckSFX:: TerminateExpBarSound:: xor a ld [wChannel5Flags1], a - ld [wSoundInput], a + ld [wPitchSweep], a ldh [rNR10], a ldh [rNR11], a ldh [rNR12], a diff --git a/home/header.asm b/home/header.asm index ae77c7e4..b1d30d02 100755 --- a/home/header.asm +++ b/home/header.asm @@ -63,4 +63,4 @@ Start:: ; The cartridge header data is filled in by rgbfix. ; This makes sure it doesn't get used. - ds $0150 - @ + ds $0150 - $0104 diff --git a/home/map.asm b/home/map.asm index d331c40d..d6da26c2 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1390,21 +1390,21 @@ ObjectEvent:: ObjectEventText:: text_far _ObjectEventText - db "@" + text_end BGEvent:: jumptext BGEventText BGEventText:: - text_far BGEventText_ - db "@" + text_far _BGEventText + text_end CoordinatesEvent:: jumptext CoordinatesEventText CoordinatesEventText:: - text_far CoordinatesEventText_ - db "@" + text_far _CoordinatesEventText + text_end CheckObjectMask:: ldh a, [hMapObjectIndexBuffer] diff --git a/items/item_effects.asm b/items/item_effects.asm index ce3ab464..274b8468 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -642,7 +642,7 @@ UltraBall: ; e926 jp TossItem .used_park_ball - ld hl, wParkBalls + ld hl, wParkBallsRemaining dec [hl] ret @@ -20,7 +20,7 @@ INCLUDE "macros/mobile.asm" INCLUDE "macros/pals.asm" INCLUDE "macros/flag.asm" -;INCLUDE "macros/legacy.asm" +INCLUDE "macros/legacy.asm" dr: macro IF DEF(GOLD) diff --git a/macros/event.asm b/macros/event.asm deleted file mode 100644 index 359fe553..00000000 --- a/macros/event.asm +++ /dev/null @@ -1,1058 +0,0 @@ - enum_start - - enum scall_command -scall: macro - db scall_command - dw \1 ; pointer - endm - - enum farscall_command -farscall: macro - db farscall_command - dba \1 - endm - - enum ptcall_command -ptcall: macro - db ptcall_command - dw \1 ; pointer - endm - - enum jump_command -jump: macro - db jump_command - dw \1 ; pointer - endm - - enum farjump_command -farjump: macro - db farjump_command - dba \1 - endm - - enum ptjump_command -ptjump: macro - db ptjump_command - dw \1 ; pointer - endm - - enum if_equal_command -if_equal: macro - db if_equal_command - db \1 ; byte - dw \2 ; pointer - endm - - enum if_not_equal_command -if_not_equal: macro - db if_not_equal_command - db \1 ; byte - dw \2 ; pointer - endm - - enum iffalse_command -iffalse: macro - db iffalse_command - dw \1 ; pointer - endm - - enum iftrue_command -iftrue: macro - db iftrue_command - dw \1 ; pointer - endm - - enum if_greater_than_command -if_greater_than: macro - db if_greater_than_command - db \1 ; byte - dw \2 ; pointer - endm - - enum if_less_than_command -if_less_than: macro - db if_less_than_command - db \1 ; byte - dw \2 ; pointer - endm - - enum jumpstd_command -jumpstd: macro - db jumpstd_command - dw \1 ; predefined_script - endm - - enum callstd_command -callstd: macro - db callstd_command - dw \1 ; predefined_script - endm - - enum callasm_command -callasm: macro - db callasm_command - dba \1 - endm - - enum special_command -special: macro - db special_command - dw (\1Special - SpecialsPointers) / 3 - endm - -;add_special: MACRO -;; Some ROM0 specials have a nonzero bank. -;\1Special:: -;IF _NARG == 1 -; dba \1 -;ELSE -; dbw \2, \1 -;ENDC -;ENDM - - enum ptcallasm_command -ptcallasm: macro - db ptcallasm_command - dw \1 ; asm - endm - - enum checkmaptriggers_command -checkmaptriggers: macro - db checkmaptriggers_command - map \1 ; map - endm - - enum domaptrigger_command -domaptrigger: macro - db domaptrigger_command - map \1 ; map - db \2 ; trigger_id - endm - - enum checktriggers_command -checktriggers: macro - db checktriggers_command - endm - - enum dotrigger_command -dotrigger: macro - db dotrigger_command - db \1 ; trigger_id - endm - - enum writebyte_command -writebyte: macro - db writebyte_command - db \1 ; value - endm - - enum addvar_command -addvar: macro - db addvar_command - db \1 ; value - endm - - enum random_command -random: macro - db random_command - db \1 ; input - endm - - enum checkver_command -checkver: macro - db checkver_command - endm - - enum copybytetovar_command -copybytetovar: macro - db copybytetovar_command - dw \1 ; address - endm - - enum copyvartobyte_command -copyvartobyte: macro - db copyvartobyte_command - dw \1 ; address - endm - - enum loadvar_command -loadvar: macro - db loadvar_command - dw \1 ; address - db \2 ; value - endm - - enum checkcode_command -checkcode: macro - db checkcode_command - db \1 ; variable_id - endm - - enum writevarcode_command -writevarcode: macro - db writevarcode_command - db \1 ; variable_id - endm - - enum writecode_command -writecode: macro - db writecode_command - db \1 ; variable_id - db \2 ; value - endm - - enum giveitem_command -giveitem: macro - db giveitem_command - db \1 ; item -if _NARG == 2 - db \2 ; quantity -else - db 1 -endc - endm - - enum takeitem_command -takeitem: macro - db takeitem_command - db \1 ; item -if _NARG == 2 - db \2 ; quantity -else - db 1 -endc - endm - - enum checkitem_command -checkitem: macro - db checkitem_command - db \1 ; item - endm - - enum givemoney_command -givemoney: macro - db givemoney_command - db \1 ; account - dt \2 ; money - endm - - enum takemoney_command -takemoney: macro - db takemoney_command - db \1 ; account - dt \2 ; money - endm - - enum checkmoney_command -checkmoney: macro - db checkmoney_command - db \1 ; account - dt \2 ; money - endm - - enum givecoins_command -givecoins: macro - db givecoins_command - dw \1 ; coins - endm - - enum takecoins_command -takecoins: macro - db takecoins_command - dw \1 ; coins - endm - - enum checkcoins_command -checkcoins: macro - db checkcoins_command - dw \1 ; coins - endm - - enum addcellnum_command -addcellnum: macro - db addcellnum_command - db \1 ; person - endm - - enum delcellnum_command -delcellnum: macro - db delcellnum_command - db \1 ; person - endm - - enum checkcellnum_command -checkcellnum: macro - db checkcellnum_command - db \1 ; person - endm - - enum checktime_command -checktime: macro - db checktime_command - db \1 ; time - endm - -checkmorn EQUS "checktime 1 << MORN" -checkday EQUS "checktime 1 << DAY" -checknite EQUS "checktime 1 << NITE" - - enum checkpoke_command -checkpoke: macro - db checkpoke_command - db \1 ; pkmn - endm - - enum givepoke_command -givepoke: macro - db givepoke_command - db \1 ; pokemon - db \2 ; level - if _NARG >= 3 - db \3 ; item - if _NARG >= 4 - db \4 ; trainer - if \4 - dw \5 ; trainer_name_pointer - dw \6 ; pkmn_nickname - endc - else - db 0 - endc - else - db 0, 0 - endc - endm - - enum giveegg_command -giveegg: macro - db giveegg_command - db \1 ; pkmn - db \2 ; level - endm - - enum givepokeitem_command -givepokeitem: macro - db givepokeitem_command - dw \1 ; pointer - endm - - enum checkpokeitem_command -checkpokeitem: macro - db checkpokeitem_command - dw \1 ; pointer - endm - - enum checkevent_command -checkevent: macro - db checkevent_command - dw \1 ; event_flag - endm - - enum clearevent_command -clearevent: macro - db clearevent_command - dw \1 ; event_flag - endm - - enum setevent_command -setevent: macro - db setevent_command - dw \1 ; event_flag - endm - - enum checkflag_command -checkflag: macro - db checkflag_command - dw \1 ; engine_flag - endm - - enum clearflag_command -clearflag: macro - db clearflag_command - dw \1 ; engine_flag - endm - - enum setflag_command -setflag: macro - db setflag_command - dw \1 ; engine_flag - endm - - enum wildon_command -wildon: macro - db wildon_command - endm - - enum wildoff_command -wildoff: macro - db wildoff_command - endm - - enum xycompare_command -xycompare: macro - db xycompare_command - dw \1 ; pointer - endm - - enum warpmod_command -warpmod: macro - db warpmod_command - db \1 ; warp_id - map \2 ; map - endm - - enum blackoutmod_command -blackoutmod: macro - db blackoutmod_command - map \1 ; map - endm - - enum warp_command -warp: macro - db warp_command - map \1 ; map - db \2 ; x - db \3 ; y - endm - - enum readmoney_command -readmoney: macro - db readmoney_command - db \1 ; account - db \2 ; memory - endm - - enum readcoins_command -readcoins: macro - db readcoins_command - db \1 ; memory - endm - - enum RAM2MEM_command -RAM2MEM: macro - db RAM2MEM_command - db \1 ; memory - endm - - enum pokenamemem_command -pokenamemem: macro - db pokenamemem_command - db \1 ; pokemon - db \2 ; memory - endm - - enum itemtotext_command -itemtotext: macro - db itemtotext_command - db \1 ; item - db \2 ; memory - endm - - enum mapnametotext_command -mapnametotext: macro - db mapnametotext_command - db \1 ; memory - endm - - enum trainertotext_command -trainertotext: macro - db trainertotext_command - db \1 ; trainer_id - db \2 ; trainer_group - db \3 ; memory - endm - - enum stringtotext_command -stringtotext: macro - db stringtotext_command - dw \1 ; text_pointer - db \2 ; memory - endm - - enum itemnotify_command -itemnotify: macro - db itemnotify_command - endm - - enum pocketisfull_command -pocketisfull: macro - db pocketisfull_command - endm - - enum opentext_command -opentext: macro - db opentext_command - endm - - enum refreshscreen_command -refreshscreen: macro - db refreshscreen_command - db \1 ; dummy - endm - - enum closetext_command -closetext: macro - db closetext_command - endm - - enum loadbytec2cf_command -loadbytec2cf: macro - db loadbytec2cf_command - db \1 ; byte - endm - - enum farwritetext_command -farwritetext: macro - db farwritetext_command - dba \1 - endm - - enum writetext_command -writetext: macro - db writetext_command - dw \1 ; text_pointer - endm - - enum repeattext_command -repeattext: macro - db repeattext_command - db \1 ; byte - db \2 ; byte - endm - - enum yesorno_command -yesorno: macro - db yesorno_command - endm - - enum loadmenudata_command -loadmenudata: macro - db loadmenudata_command - dw \1 ; data - endm - - enum closewindow_command -closewindow: macro - db closewindow_command - endm - - enum jumptextfaceplayer_command -jumptextfaceplayer: macro - db jumptextfaceplayer_command - dw \1 ; text_pointer - endm - - enum jumptext_command -jumptext: macro - db jumptext_command - dw \1 ; text_pointer - endm - - enum waitbutton_command -waitbutton: macro - db waitbutton_command - endm - - enum buttonsound_command -buttonsound: macro - db buttonsound_command - endm - - enum pokepic_command -pokepic: macro - db pokepic_command - db \1 ; pokemon - endm - - enum closepokepic_command -closepokepic: macro - db closepokepic_command - endm - - enum _2dmenu_command -_2dmenu: macro - db _2dmenu_command - endm - - enum verticalmenu_command -verticalmenu: macro - db verticalmenu_command - endm - - enum loadpikachudata_command -loadpikachudata: macro - db loadpikachudata_command - endm - - enum randomwildmon_command -randomwildmon: macro - db randomwildmon_command - endm - - enum loadmemtrainer_command -loadmemtrainer: macro - db loadmemtrainer_command - endm - - enum loadwildmon_command -loadwildmon: macro - db loadwildmon_command - db \1 ; pokemon - db \2 ; level - endm - - enum loadtrainer_command -loadtrainer: macro - db loadtrainer_command - db \1 ; trainer_group - db \2 ; trainer_id - endm - - enum startbattle_command -startbattle: macro - db startbattle_command - endm - - enum reloadmapafterbattle_command -reloadmapafterbattle: macro - db reloadmapafterbattle_command - endm - - enum catchtutorial_command -catchtutorial: macro - db catchtutorial_command - db \1 ; byte - endm - - enum trainertext_command -trainertext: macro - db trainertext_command - db \1 ; which_text - endm - - enum trainerflagaction_command -trainerflagaction: macro - db trainerflagaction_command - db \1 ; action - endm - - enum winlosstext_command -winlosstext: macro - db winlosstext_command - dw \1 ; win_text_pointer - dw \2 ; loss_text_pointer - endm - - enum scripttalkafter_command -scripttalkafter: macro - db scripttalkafter_command - endm - - enum end_if_just_battled_command -end_if_just_battled: macro - db end_if_just_battled_command - endm - - enum check_just_battled_command -check_just_battled: macro - db check_just_battled_command - endm - - enum setlasttalked_command -setlasttalked: macro - db setlasttalked_command - db \1 ; person - endm - - enum applymovement_command -applymovement: macro - db applymovement_command - db \1 ; person - dw \2 ; data - endm - - enum applymovement2_command -applymovement2: macro - db applymovement2_command - dw \1 ; data - endm - - enum faceplayer_command -faceplayer: macro - db faceplayer_command - endm - - enum faceperson_command -faceperson: macro - db faceperson_command - db \1 ; person1 - db \2 ; person2 - endm - - enum variablesprite_command -variablesprite: macro - db variablesprite_command - db \1 - SPRITE_VARS ; byte - db \2 ; sprite - endm - - enum disappear_command -disappear: macro - db disappear_command - db \1 ; person - endm - - enum appear_command -appear: macro - db appear_command - db \1 ; person - endm - - enum follow_command -follow: macro - db follow_command - db \1 ; person2 - db \2 ; person1 - endm - - enum stopfollow_command -stopfollow: macro - db stopfollow_command - endm - - enum moveperson_command -moveperson: macro - db moveperson_command - db \1 ; person - db \2 ; x - db \3 ; y - endm - - enum writepersonxy_command -writepersonxy: macro - db writepersonxy_command - db \1 ; person - endm - - enum loademote_command -loademote: macro - db loademote_command - db \1 ; bubble - endm - - enum showemote_command -showemote: macro - db showemote_command - db \1 ; bubble - db \2 ; person - db \3 ; time - endm - - enum spriteface_command -spriteface: macro - db spriteface_command - db \1 ; person - db \2 ; facing - endm - - enum follownotexact_command -follownotexact: macro - db follownotexact_command - db \1 ; person2 - db \2 ; person1 - endm - - enum earthquake_command -earthquake: macro - db earthquake_command - db \1 ; param - endm - - enum changemap_command -changemap: macro - db changemap_command - dba \1 ; blockdata - endm - - enum changeblock_command -changeblock: macro - db changeblock_command - db \1 ; x - db \2 ; y - db \3 ; block - endm - - enum reloadmap_command -reloadmap: macro - db reloadmap_command - endm - - enum reloadmappart_command -reloadmappart: macro - db reloadmappart_command - endm - - enum writecmdqueue_command -writecmdqueue: macro - db writecmdqueue_command - dw \1 ; queue_pointer - endm - - enum delcmdqueue_command -delcmdqueue: macro - db delcmdqueue_command - db \1 ; byte - endm - - enum playmusic_command -playmusic: macro - db playmusic_command - dw \1 ; music_pointer - endm - - enum encountermusic_command -encountermusic: macro - db encountermusic_command - endm - - enum musicfadeout_command -musicfadeout: macro - db musicfadeout_command - dw \1 ; music - db \2 ; fadetime - endm - - enum playmapmusic_command -playmapmusic: macro - db playmapmusic_command - endm - - enum dontrestartmapmusic_command -dontrestartmapmusic: macro - db dontrestartmapmusic_command - endm - - enum cry_command -cry: macro - db cry_command - dw \1 ; cry_id - endm - - enum playsound_command -playsound: macro - db playsound_command - dw \1 ; sound_pointer - endm - - enum waitsfx_command -waitsfx: macro - db waitsfx_command - endm - - enum warpsound_command -warpsound: macro - db warpsound_command - endm - - enum specialsound_command -specialsound: macro - db specialsound_command - endm - - enum passtoengine_command -passtoengine: macro - db passtoengine_command - db \1 ; data_pointer - endm - - enum newloadmap_command -newloadmap: macro - db newloadmap_command - db \1 ; which_method - endm - - enum pause_command -pause: macro - db pause_command - db \1 ; length - endm - - enum deactivatefacing_command -deactivatefacing: macro - db deactivatefacing_command - db \1 ; time - endm - - enum priorityjump_command -priorityjump: macro - db priorityjump_command - dw \1 ; pointer - endm - - enum warpcheck_command -warpcheck: macro - db warpcheck_command - endm - - enum ptpriorityjump_command -ptpriorityjump: macro - db ptpriorityjump_command - dw \1 ; pointer - endm - - enum return_command -return: macro - db return_command - endm - - enum end_command -end: macro - db end_command - endm - - enum reloadandreturn_command -reloadandreturn: macro - db reloadandreturn_command - db \1 ; which_method - endm - - enum end_all_command -end_all: macro - db end_all_command - endm - - enum pokemart_command -pokemart: macro - db pokemart_command - db \1 ; dialog_id - dw \2 ; mart_id - endm - - enum elevator_command -elevator: macro - db elevator_command - dw \1 ; floor_list_pointer - endm - - enum trade_command -trade: macro - db trade_command - db \1 ; trade_id - endm - - enum askforphonenumber_command -askforphonenumber: macro - db askforphonenumber_command - db \1 ; number - endm - - enum phonecall_command -phonecall: macro - db phonecall_command - dw \1 ; caller_name - endm - - enum hangup_command -hangup: macro - db hangup_command - endm - - enum describedecoration_command -describedecoration: macro - db describedecoration_command - db \1 ; byte - endm - - enum fruittree_command -fruittree: macro - db fruittree_command - db \1 ; tree_id - endm - - enum specialphonecall_command -specialphonecall: macro - db specialphonecall_command - dw \1 ; call_id - endm - - enum checkphonecall_command -checkphonecall: macro - db checkphonecall_command - endm - - enum verbosegiveitem_command -verbosegiveitem: macro - db verbosegiveitem_command - db \1 ; item -if _NARG == 2 - db \2 ; quantity -else - db 1 -endc - endm - - enum verbosegiveitem2_command -verbosegiveitem2: macro - db verbosegiveitem2_command - db \1 ; item - db \2 ; var - endm - - enum swarm_command -swarm: macro - db swarm_command - db \1 ; flag - map \2 ; map - endm - - enum halloffame_command -halloffame: macro - db halloffame_command - endm - - enum credits_command -credits: macro - db credits_command - endm - - enum warpfacing_command -warpfacing: macro - db warpfacing_command - db \1 ; facing - map \2 ; map - db \3 ; x - db \4 ; y - endm - - enum landmarktotext_command -landmarktotext: macro - db landmarktotext_command - db \1 ; id - db \2 ; memory - endm - - enum trainerclassname_command -trainerclassname: macro - db trainerclassname_command - db \1 ; id - db \2 ; memory - endm - - enum name_command -name: macro - db name_command - db \1 ; type - db \2 ; id - db \3 ; memory - endm - - enum wait_command -wait: macro - db wait_command - db \1 ; duration - endm - - enum check_save_command -check_save: macro - db check_save_command - endm diff --git a/macros/legacy.asm b/macros/legacy.asm new file mode 100644 index 00000000..6234b834 --- /dev/null +++ b/macros/legacy.asm @@ -0,0 +1,324 @@ +; Legacy support for old pokecrystal. +; Allows porting scripts with as few edits as possible. +; Legacy support not in this file can be found by looking for the keyword: "LEGACY" + +; macros/rst.asm +callba EQUS "farcall" +callab EQUS "callfar" + +; macros/scripts/audio.asm +__ EQU 0 +CC EQU 13 + +musicheader: MACRO + channel_count \1 + channel \2, \3 +ENDM + +sound: MACRO + note \1, \2 + db \3 + dw \4 +ENDM + +noise: MACRO + note \1, \2 + db \3 + db \4 +ENDM + +notetype: MACRO +IF _NARG >= 2 + note_type \1, \2 >> 4, \2 & $0f +ELSE + note_type \1 +ENDC +ENDM + +pitchoffset: MACRO + transpose \1, \2 - 1 +ENDM + +dutycycle EQUS "duty_cycle" + +intensity: MACRO + volume_envelope \1 >> 4, \1 & $0f +ENDM + +soundinput: MACRO + pitch_sweep \1 >> 4, \1 & $0f +ENDM + +unknownmusic0xde EQUS "sound_duty" +sound_duty: MACRO + db $de +IF _NARG == 4 + db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) +ELSE + db \1 +ENDC +ENDM + +togglesfx EQUS "toggle_sfx" + +slidepitchto: MACRO + pitch_slide \1, (8 - \2), \3 +ENDM + +togglenoise EQUS "toggle_noise" + +panning: MACRO + force_stereo_panning ((\1 >> 4) & 1), (\1 & 1) +ENDM + +tone EQUS "pitch_offset" +restartchannel EQUS "restart_channel" +newsong EQUS "new_song" +sfxpriorityon EQUS "sfx_priority_on" +sfxpriorityoff EQUS "sfx_priority_off" + +stereopanning: MACRO + stereo_panning ((\1 >> 4) & 1), (\1 & 1) +ENDM + +sfxtogglenoise EQUS "sfx_toggle_noise" +setcondition EQUS "set_condition" +jumpif EQUS "sound_jump_if" +jumpchannel EQUS "sound_jump" +loopchannel EQUS "sound_loop" +callchannel EQUS "sound_call" +endchannel EQUS "sound_ret" + +; macros/scripts/events.asm + +checkmorn EQUS "checktime MORN" +checkday EQUS "checktime DAY" +checknite EQUS "checktime NITE" + +jump EQUS "sjump" +farjump EQUS "farsjump" +priorityjump EQUS "prioritysjump" +ptcall EQUS "memcall" +ptjump EQUS "memjump" +ptpriorityjump EQUS "stopandsjump" +ptcallasm EQUS "memcallasm" + +if_equal EQUS "ifequal" +if_not_equal EQUS "ifnotequal" +if_greater_than EQUS "ifgreater" +if_less_than EQUS "ifless" +end_all EQUS "endall" + +checkmaptriggers EQUS "checkmapscene" +domaptrigger EQUS "setmapscene" +checktriggers EQUS "checkscene" +dotrigger EQUS "setscene" + +faceperson EQUS "faceobject" +moveperson EQUS "moveobject" +writepersonxy EQUS "writeobjectxy" +spriteface EQUS "turnobject" +objectface EQUS "turnobject" +applymovement2 EQUS "applymovementlasttalked" + +writebyte EQUS "setval" +addvar EQUS "addval" +copybytetovar EQUS "readmem" +copyvartobyte EQUS "writemem" +checkcode EQUS "readvar" +writevarcode EQUS "writevar" +writecode EQUS "loadvar" + +MEM_BUFFER_0 EQUS "STRING_BUFFER_3" +MEM_BUFFER_1 EQUS "STRING_BUFFER_4" +MEM_BUFFER_2 EQUS "STRING_BUFFER_5" + +vartomem EQUS "getnum" +mapnametotext EQUS "getcurlandmarkname" +readcoins EQUS "getcoins" + +pokenamemem: MACRO + getmonname \2, \1 +ENDM + +itemtotext: MACRO + getitemname \2, \1 +ENDM + +landmarktotext: MACRO + getlandmarkname \2, \1 +ENDM + +trainertotext: MACRO + gettrainername \3, \1, \2 +ENDM + +trainerclassname: MACRO + gettrainerclassname \2, \1 +ENDM + +name: MACRO + getname \3, \1, \2 +ENDM + +stringtotext: MACRO + getstring \2, \1 +ENDM + +readmoney: MACRO + getmoney \2, \1 +ENDM + +RAM2MEM EQUS "getnum" +loadfont EQUS "opentext" +loadmenudata EQUS "loadmenu" +loadmenuheader EQUS "loadmenu" +writebackup EQUS "closewindow" +interpretmenu EQUS "_2dmenu" +interpretmenu2 EQUS "verticalmenu" +buttonsound EQUS "promptbutton" +battlecheck EQUS "randomwildmon" +loadtrainerdata EQUS "loadtemptrainer" +loadpokedata EQUS "loadwildmon" +returnafterbattle EQUS "reloadmapafterbattle" +trainerstatus EQUS "trainerflagaction" +talkaftercancel EQUS "endifjustbattled" +talkaftercheck EQUS "checkjustbattled" +playrammusic EQUS "encountermusic" +reloadmapmusic EQUS "dontrestartmapmusic" +resetfuncs EQUS "endall" +storetext EQUS "battletowertext" +displaylocation EQUS "landmarktotext" +givepokeitem EQUS "givepokemail" +checkpokeitem EQUS "checkpokemail" +passtoengine EQUS "autoinput" +verbosegiveitem2 EQUS "verbosegiveitemvar" +loadbytec2cf EQUS "writeunusedbytebuffer" + +; macros/scripts/maps.asm + +mapconst: MACRO + map_const \1, \3, \2 +ENDM + +maptrigger EQUS "scene_script" + +warp_def: MACRO + warp_event \2, \1, \4, \3 +ENDM + +xy_trigger: MACRO + coord_event \3, \2, \1, \5 +ENDM + +signpost: MACRO + bg_event \2, \1, \3, \4 +ENDM + +person_event: MACRO +; object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13 + db \1, \2 + 4, \3 + 4, \4 + dn \6, \5 + db \7, \8 + shift + dn \8, \9 + shift + db \9 + shift + dw \9 + shift + dw \9 +ENDM + +PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" +PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL" +PERSONTYPE_TRAINER EQUS "OBJECTTYPE_TRAINER" + +; macros/scripts/movement.asm + +show_person EQUS "show_object" +hide_person EQUS "hide_object" +remove_person EQUS "remove_object" + +turn_head_down EQUS "turn_head DOWN" +turn_head_up EQUS "turn_head UP" +turn_head_left EQUS "turn_head LEFT" +turn_head_right EQUS "turn_head RIGHT" +turn_step_down EQUS "turn_step DOWN" +turn_step_up EQUS "turn_step UP" +turn_step_left EQUS "turn_step LEFT" +turn_step_right EQUS "turn_step RIGHT" +slow_step_down EQUS "slow_step DOWN" +slow_step_up EQUS "slow_step UP" +slow_step_left EQUS "slow_step LEFT" +slow_step_right EQUS "slow_step RIGHT" +step_down EQUS "step DOWN" +step_up EQUS "step UP" +step_left EQUS "step LEFT" +step_right EQUS "step RIGHT" +big_step_down EQUS "big_step DOWN" +big_step_up EQUS "big_step UP" +big_step_left EQUS "big_step LEFT" +big_step_right EQUS "big_step RIGHT" +slow_slide_step_down EQUS "slow_slide_step DOWN" +slow_slide_step_up EQUS "slow_slide_step UP" +slow_slide_step_left EQUS "slow_slide_step LEFT" +slow_slide_step_right EQUS "slow_slide_step RIGHT" +slide_step_down EQUS "slide_step DOWN" +slide_step_up EQUS "slide_step UP" +slide_step_left EQUS "slide_step LEFT" +slide_step_right EQUS "slide_step RIGHT" +fast_slide_step_down EQUS "fast_slide_step DOWN" +fast_slide_step_up EQUS "fast_slide_step UP" +fast_slide_step_left EQUS "fast_slide_step LEFT" +fast_slide_step_right EQUS "fast_slide_step RIGHT" +turn_away_down EQUS "turn_away DOWN" +turn_away_up EQUS "turn_away UP" +turn_away_left EQUS "turn_away LEFT" +turn_away_right EQUS "turn_away RIGHT" +turn_in_down EQUS "turn_in DOWN" +turn_in_up EQUS "turn_in UP" +turn_in_left EQUS "turn_in LEFT" +turn_in_right EQUS "turn_in RIGHT" +turn_waterfall_down EQUS "turn_waterfall DOWN" +turn_waterfall_up EQUS "turn_waterfall UP" +turn_waterfall_left EQUS "turn_waterfall LEFT" +turn_waterfall_right EQUS "turn_waterfall RIGHT" +slow_jump_step_down EQUS "slow_jump_step DOWN" +slow_jump_step_up EQUS "slow_jump_step UP" +slow_jump_step_left EQUS "slow_jump_step LEFT" +slow_jump_step_right EQUS "slow_jump_step RIGHT" +jump_step_down EQUS "jump_step DOWN" +jump_step_up EQUS "jump_step UP" +jump_step_left EQUS "jump_step LEFT" +jump_step_right EQUS "jump_step RIGHT" +fast_jump_step_down EQUS "fast_jump_step DOWN" +fast_jump_step_up EQUS "fast_jump_step UP" +fast_jump_step_left EQUS "fast_jump_step LEFT" +fast_jump_step_right EQUS "fast_jump_step RIGHT" + +step_sleep_1 EQUS "step_sleep 1" +step_sleep_2 EQUS "step_sleep 2" +step_sleep_3 EQUS "step_sleep 3" +step_sleep_4 EQUS "step_sleep 4" +step_sleep_5 EQUS "step_sleep 5" +step_sleep_6 EQUS "step_sleep 6" +step_sleep_7 EQUS "step_sleep 7" +step_sleep_8 EQUS "step_sleep 8" + +; macros/scripts/text.asm +text_from_ram EQUS "text_ram" +start_asm EQUS "text_asm" +deciram EQUS "text_decimal" +interpret_data EQUS "text_pause" +limited_interpret_data EQUS "text_dots" +text_waitbutton EQUS "text_promptbutton" +link_wait_button EQUS "text_linkpromptbutton" +text_linkwaitbutton EQUS "text_linkpromptbutton" +current_day EQUS "text_today" +text_jump EQUS "text_far" + +; macros/scripts/battle_anims.asm +anim_enemyfeetobj EQUS "anim_battlergfx_2row" +anim_playerheadobj EQUS "anim_battlergfx_1row" +anim_clearsprites EQUS "anim_keepsprites" diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index fc9e3397..92654ff9 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -1,21 +1,42 @@ -musicheader: MACRO - ; number of tracks, track idx, address - dbw ((\1 - 1) << 6) + (\2 - 1), \3 +channel_count: MACRO +_num_channels = \1 - 1 +ENDM + +channel: MACRO + dn (_num_channels << 2), \1 - 1 ; channel id + dw \2 ; address +_num_channels = 0 ENDM note: MACRO - dn (\1), (\2) - 1 + dn (\1), (\2) - 1 ; pitch, length +ENDM + +drum_note: MACRO + note \1, \2 ; drum instrument, length ENDM -sound: MACRO - note \1, \2 - db \3 ; intensity +rest: MACRO + note 0, \1 ; length +ENDM + +square_note: MACRO + db \1 ; length + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC dw \4 ; frequency ENDM -noise: MACRO - note \1, \2 ; duration - db \3 ; intensity +noise_note: MACRO + db \1 ; length + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC db \4 ; frequency ENDM @@ -25,24 +46,33 @@ FIRST_MUSIC_CMD EQU __enum__ enum octave_cmd ; $d0 octave: MACRO - db octave_cmd | 8 - (\1) + db octave_cmd | 8 - (\1) ; octave ENDM __enumdir__ = +1 - enum notetype_cmd ; $d8 -notetype: MACRO - db notetype_cmd - db \1 ; note_length -if _NARG >= 2 - db \2 ; intensity -endc + enum note_type_cmd ; $d8 +note_type: MACRO + db note_type_cmd + db \1 ; note length + IF _NARG >= 2 + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC + ENDC +ENDM + +; only valid on the noise channel +drum_speed: MACRO + note_type \1 ; note length ENDM - enum pitchoffset_cmd ; $d9 -pitchoffset: MACRO - db pitchoffset_cmd - dn \1, \2 - 1 ; octave, key + enum transpose_cmd ; $d9 +transpose: MACRO + db transpose_cmd + dn \1, \2 ; num octaves, num pitches ENDM enum tempo_cmd ; $da @@ -51,51 +81,59 @@ tempo: MACRO bigdw \1 ; tempo ENDM - enum dutycycle_cmd ; $db -dutycycle: MACRO - db dutycycle_cmd - db \1 ; duty_cycle + enum duty_cycle_cmd ; $db +duty_cycle: MACRO + db duty_cycle_cmd + db \1 ; duty cycle ENDM - enum intensity_cmd ; $dc -intensity: MACRO - db intensity_cmd - db \1 ; intensity + enum volume_envelope_cmd ; $dc +volume_envelope: MACRO + db volume_envelope_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; volume envelope + ELSE + dn \1, \2 ; volume envelope + ENDC ENDM - enum soundinput_cmd ; $dd -soundinput: MACRO - db soundinput_cmd - db \1 ; input + enum pitch_sweep_cmd ; $dd +pitch_sweep: MACRO + db pitch_sweep_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; pitch sweep + ELSE + dn \1, \2 ; pitch sweep + ENDC ENDM - enum sound_duty_cmd ; $de -sound_duty: MACRO - db sound_duty_cmd -if _NARG == 4 - db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence -else - db \1 ; LEGACY: Support for one-byte duty value -endc + enum duty_cycle_pattern_cmd ; $de +duty_cycle_pattern: MACRO + db duty_cycle_pattern_cmd + db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern ENDM - enum togglesfx_cmd ; $df -togglesfx: MACRO - db togglesfx_cmd + enum toggle_sfx_cmd ; $df +toggle_sfx: MACRO + db toggle_sfx_cmd ENDM - enum slidepitchto_cmd ; $e0 -slidepitchto: MACRO - db slidepitchto_cmd + enum pitch_slide_cmd ; $e0 +pitch_slide: MACRO + db pitch_slide_cmd db \1 - 1 ; duration - dn \2, \3 ; octave, pitch + dn 8 - \2, \3 % 12 ; octave, pitch ENDM enum vibrato_cmd ; $e1 vibrato: MACRO db vibrato_cmd db \1 ; delay - db \2 ; extent + IF _NARG > 2 + dn \2, \3 ; extent, rate + ELSE + db \2 ; LEGACY: Support for 1-arg extent + ENDC ENDM enum unknownmusic0xe2_cmd ; $e2 @@ -104,28 +142,34 @@ unknownmusic0xe2: MACRO db \1 ; unknown ENDM - enum togglenoise_cmd ; $e3 -togglenoise: MACRO - db togglenoise_cmd - db \1 ; id + enum toggle_noise_cmd ; $e3 +toggle_noise: MACRO + db toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC ENDM - enum panning_cmd ; $e4 -panning: MACRO - db panning_cmd - db \1 ; tracks + enum force_stereo_panning_cmd ; $e4 +force_stereo_panning: MACRO + db force_stereo_panning_cmd + dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable ENDM enum volume_cmd ; $e5 volume: MACRO db volume_cmd - db \1 ; volume + IF _NARG > 1 + dn \1, \2 ; left volume, right volume + ELSE + db \1 ; LEGACY: Support for 1-arg volume + ENDC ENDM - enum tone_cmd ; $e6 -tone: MACRO - db tone_cmd - bigdw \1 ; tone + enum pitch_offset_cmd ; $e6 +pitch_offset: MACRO + db pitch_offset_cmd + bigdw \1 ; pitch offset ENDM enum unknownmusic0xe7_cmd ; $e7 @@ -143,29 +187,29 @@ ENDM enum tempo_relative_cmd ; $e9 tempo_relative: MACRO db tempo_relative_cmd - bigdw \1 ; value + bigdw \1 ; tempo adjustment ENDM - enum restartchannel_cmd ; $ea -restartchannel: MACRO - db restartchannel_cmd + enum restart_channel_cmd ; $ea +restart_channel: MACRO + db restart_channel_cmd dw \1 ; address ENDM - enum newsong_cmd ; $eb -newsong: MACRO - db newsong_cmd + enum new_song_cmd ; $eb +new_song: MACRO + db new_song_cmd bigdw \1 ; id ENDM - enum sfxpriorityon_cmd ; $ec -sfxpriorityon: MACRO - db sfxpriorityon_cmd + enum sfx_priority_on_cmd ; $ec +sfx_priority_on: MACRO + db sfx_priority_on_cmd ENDM - enum sfxpriorityoff_cmd ; $ed -sfxpriorityoff: MACRO - db sfxpriorityoff_cmd + enum sfx_priority_off_cmd ; $ed +sfx_priority_off: MACRO + db sfx_priority_off_cmd ENDM enum unknownmusic0xee_cmd ; $ee @@ -174,16 +218,18 @@ unknownmusic0xee: MACRO dw \1 ; address ENDM - enum stereopanning_cmd ; $ef -stereopanning: MACRO - db stereopanning_cmd - db \1 ; tracks + enum stereo_panning_cmd ; $ef +stereo_panning: MACRO + db stereo_panning_cmd + dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable ENDM - enum sfxtogglenoise_cmd ; $f0 -sfxtogglenoise: MACRO - db sfxtogglenoise_cmd - db \1 ; id + enum sfx_toggle_noise_cmd ; $f0 +sfx_toggle_noise: MACRO + db sfx_toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC ENDM enum music0xf1_cmd ; $f1 @@ -231,39 +277,39 @@ unknownmusic0xf9: MACRO db unknownmusic0xf9_cmd ENDM - enum setcondition_cmd ; $fa -setcondition: MACRO - db setcondition_cmd + enum set_condition_cmd ; $fa +set_condition: MACRO + db set_condition_cmd db \1 ; condition ENDM - enum jumpif_cmd ; $fb -jumpif: MACRO - db jumpif_cmd + enum sound_jump_if_cmd ; $fb +sound_jump_if: MACRO + db sound_jump_if_cmd db \1 ; condition dw \2 ; address ENDM - enum jumpchannel_cmd ; $fc -jumpchannel: MACRO - db jumpchannel_cmd + enum sound_jump_cmd ; $fc +sound_jump: MACRO + db sound_jump_cmd dw \1 ; address ENDM - enum loopchannel_cmd ; $fd -loopchannel: MACRO - db loopchannel_cmd + enum sound_loop_cmd ; $fd +sound_loop: MACRO + db sound_loop_cmd db \1 ; count dw \2 ; address ENDM - enum callchannel_cmd ; $fe -callchannel: MACRO - db callchannel_cmd + enum sound_call_cmd ; $fe +sound_call: MACRO + db sound_call_cmd dw \1 ; address ENDM - enum endchannel_cmd ; $ff -endchannel: MACRO - db endchannel_cmd + enum sound_ret_cmd ; $ff +sound_ret: MACRO + db sound_ret_cmd ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 3a6578d7..dd5af81d 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -13,27 +13,27 @@ farscall: MACRO dba \1 ENDM - enum ptcall_command ; $02 -ptcall: MACRO - db ptcall_command + enum memcall_command ; $02 +memcall: MACRO + db memcall_command dw \1 ; pointer ENDM - enum jump_command ; $03 -jump: MACRO - db jump_command + enum sjump_command ; $03 +sjump: MACRO + db sjump_command dw \1 ; pointer ENDM - enum farjump_command ; $04 -farjump: MACRO - db farjump_command + enum farsjump_command ; $04 +farsjump: MACRO + db farsjump_command dba \1 ENDM - enum ptjump_command ; $05 -ptjump: MACRO - db ptjump_command + enum memjump_command ; $05 +memjump: MACRO + db memjump_command dw \1 ; pointer ENDM @@ -101,9 +101,9 @@ special: MACRO dw (\1Special - SpecialsPointers) / 3 ENDM - enum ptcallasm_command ; $10 -ptcallasm: MACRO - db ptcallasm_command + enum memcallasm_command ; $10 +memcallasm: MACRO + db memcallasm_command dw \1 ; asm ENDM @@ -131,15 +131,15 @@ setscene: MACRO db \1 ; scene_id ENDM - enum writebyte_command ; $15 -writebyte: MACRO - db writebyte_command + enum setval_command ; $15 +setval: MACRO + db setval_command db \1 ; value ENDM - enum addvar_command ; $16 -addvar: MACRO - db addvar_command + enum addval_command ; $16 +addval: MACRO + db addval_command db \1 ; value ENDM @@ -154,42 +154,47 @@ checkver: MACRO db checkver_command ENDM - enum copybytetovar_command ; $19 -copybytetovar: MACRO - db copybytetovar_command + enum readmem_command ; $19 +readmem: MACRO + db readmem_command dw \1 ; address ENDM - enum copyvartobyte_command ; $1a -copyvartobyte: MACRO - db copyvartobyte_command + enum writemem_command ; $1a +writemem: MACRO + db writemem_command dw \1 ; address ENDM - enum loadvar_command ; $1b -loadvar: MACRO - db loadvar_command + enum loadmem_command ; $1b +loadmem: MACRO + db loadmem_command dw \1 ; address db \2 ; value ENDM - enum checkcode_command ; $1c -checkcode: MACRO - db checkcode_command + enum readvar_command ; $1c +readvar: MACRO + db readvar_command db \1 ; variable_id ENDM - enum writevarcode_command ; $1d -writevarcode: MACRO - db writevarcode_command + enum writevar_command ; $1d +writevar: MACRO + db writevar_command db \1 ; variable_id ENDM - enum writecode_command ; $1e -writecode: MACRO - db writecode_command + enum loadvar_command ; $1e +loadvar: MACRO +if STRIN("\1", "VAR_") != 1 +; LEGACY: Support for the old name of "loadmem" + loadmem \1, \2 +else + db loadvar_command db \1 ; variable_id db \2 ; value +endc ENDM enum giveitem_command ; $1f @@ -400,58 +405,58 @@ warp: MACRO db \3 ; y ENDM - enum readmoney_command ; $3d -readmoney: MACRO - db readmoney_command - db \1 ; account - db \2 ; memory + enum getmoney_command ; $3d +getmoney: MACRO + db getmoney_command + db \2 ; account + db \1 ; string_buffer ENDM - enum readcoins_command ; $3e -readcoins: MACRO - db readcoins_command - db \1 ; memory + enum getcoins_command ; $3e +getcoins: MACRO + db getcoins_command + db \1 ; string_buffer ENDM - enum vartomem_command ; $3f -vartomem: MACRO - db vartomem_command - db \1 ; memory + enum getnum_command ; $3f +getnum: MACRO + db getnum_command + db \1 ; string_buffer ENDM - enum pokenamemem_command ; $40 -pokenamemem: MACRO - db pokenamemem_command - db \1 ; pokemon - db \2 ; memory + enum getmonname_command ; $40 +getmonname: MACRO + db getmonname_command + db \2 ; pokemon + db \1 ; string_buffer ENDM - enum itemtotext_command ; $41 -itemtotext: MACRO - db itemtotext_command - db \1 ; item - db \2 ; memory + enum getitemname_command ; $41 +getitemname: MACRO + db getitemname_command + db \2 ; item + db \1 ; string_buffer ENDM - enum mapnametotext_command ; $42 -mapnametotext: MACRO - db mapnametotext_command - db \1 ; memory + enum getcurlandmarkname_command ; $42 +getcurlandmarkname: MACRO + db getcurlandmarkname_command + db \1 ; string_buffer ENDM - enum trainertotext_command ; $43 -trainertotext: MACRO - db trainertotext_command - db \1 ; trainer_id + enum gettrainername_command ; $43 +gettrainername: MACRO + db gettrainername_command db \2 ; trainer_group - db \3 ; memory + db \3 ; trainer_id + db \1 ; string_buffer ENDM - enum stringtotext_command ; $44 -stringtotext: MACRO - db stringtotext_command - dw \1 ; text_pointer - db \2 ; memory + enum getstring_command ; $44 +getstring: MACRO + db getstring_command + dw \2 ; text_pointer + db \1 ; string_buffer ENDM enum itemnotify_command ; $45 @@ -484,9 +489,9 @@ closetext: MACRO db closetext_command ENDM - enum loadbytec2cf_command ; $4a -loadbytec2cf: MACRO - db loadbytec2cf_command + enum writeunusedbytebuffer_command ; $4a +writeunusedbytebuffer: MACRO + db writeunusedbytebuffer_command db \1 ; byte ENDM @@ -542,9 +547,9 @@ waitbutton: MACRO db waitbutton_command ENDM - enum buttonsound_command ; $54 -buttonsound: MACRO - db buttonsound_command + enum promptbutton_command ; $54 +promptbutton: MACRO + db promptbutton_command ENDM enum pokepic_command ; $55 @@ -578,9 +583,9 @@ randomwildmon: MACRO db randomwildmon_command ENDM - enum loadmemtrainer_command ; $5b -loadmemtrainer: MACRO - db loadmemtrainer_command + enum loadtemptrainer_command ; $5b +loadtemptrainer: MACRO + db loadtemptrainer_command ENDM enum loadwildmon_command ; $5c @@ -616,7 +621,7 @@ ENDM enum trainertext_command ; $61 trainertext: MACRO db trainertext_command - db \1 ; which_text + db \1 ; text_id ENDM enum trainerflagaction_command ; $62 @@ -660,9 +665,9 @@ applymovement: MACRO dw \2 ; data ENDM - enum applymovement2_command ; $69 -applymovement2: MACRO - db applymovement2_command + enum applymovementlasttalked_command ; $69 +applymovementlasttalked: MACRO + db applymovementlasttalked_command dw \1 ; data ENDM @@ -757,11 +762,10 @@ earthquake: MACRO db \1 ; param ENDM - enum changemap_command ; $78 -changemap: MACRO - db changemap_command - db \1 ; map_bank - dw \2 ; map_data_pointer + enum changemapblocks_command ; $78 +changemapblocks: MACRO + db changemapblocks_command + dba \1 ; map_data_pointer ENDM enum changeblock_command ; $79 @@ -849,10 +853,10 @@ specialsound: MACRO db specialsound_command ENDM - enum passtoengine_command ; $88 -passtoengine: MACRO - db passtoengine_command - db \1 ; data_pointer + enum autoinput_command ; $88 +autoinput: MACRO + db autoinput_command + dba \1 ENDM enum newloadmap_command ; $89 @@ -873,9 +877,9 @@ deactivatefacing: MACRO db \1 ; time ENDM - enum priorityjump_command ; $8c -priorityjump: MACRO - db priorityjump_command + enum prioritysjump_command ; $8c +prioritysjump: MACRO + db prioritysjump_command dw \1 ; pointer ENDM @@ -884,9 +888,9 @@ warpcheck: MACRO db warpcheck_command ENDM - enum ptpriorityjump_command ; $8e -ptpriorityjump: MACRO - db ptpriorityjump_command + enum stopandsjump_command ; $8e +stopandsjump: MACRO + db stopandsjump_command dw \1 ; pointer ENDM @@ -900,25 +904,25 @@ end: MACRO db end_command ENDM - enum reloadandreturn_command ; $92 + enum reloadandreturn_command ; $91 reloadandreturn: MACRO db reloadandreturn_command db \1 ; which_method ENDM - enum endall_command ; $93 + enum endall_command ; $92 endall: MACRO db endall_command ENDM - enum pokemart_command ; $94 + enum pokemart_command ; $93 pokemart: MACRO db pokemart_command db \1 ; dialog_id dw \2 ; mart_id ENDM - enum elevator_command ; $95 + enum elevator_command ; $94 elevator: MACRO db elevator_command dw \1 ; floor_list_pointer @@ -1007,41 +1011,41 @@ warpfacing: MACRO db \4 ; y ENDM - enum battletowertext_command ; $a4 + enum battletowertext_command ; $a2 battletowertext: MACRO db battletowertext_command - db \1 ; memory + db \1 ; bttext_id ENDM - enum landmarktotext_command ; $a5 -landmarktotext: MACRO - db landmarktotext_command - db \1 ; id - db \2 ; memory + enum getlandmarkname_command ; $a3 +getlandmarkname: MACRO + db getlandmarkname_command + db \2 ; landmark_id + db \1 ; string_buffer ENDM - enum trainerclassname_command ; $a6 -trainerclassname: MACRO - db trainerclassname_command - db \1 ; id - db \2 ; memory + enum gettrainerclassname_command ; $a4 +gettrainerclassname: MACRO + db gettrainerclassname_command + db \2 ; trainer_group + db \1 ; string_buffer ENDM - enum name_command ; $a7 -name: MACRO - db name_command - db \1 ; type - db \2 ; id - db \3 ; memory + enum getname_command ; $a5 +getname: MACRO + db getname_command + db \2 ; type + db \3 ; id + db \1 ; memory ENDM - enum wait_command ; $a8 + enum wait_command ; $a6 wait: MACRO db wait_command db \1 ; duration ENDM - enum checksave_command ; $a9 + enum checksave_command ; $a7 checksave: MACRO db checksave_command ENDM diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 7f5947a5..edf2b421 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -3,6 +3,8 @@ map_id: MACRO db GROUP_\1, MAP_\1 ENDM +object_const_def EQUS "const_def 2" + scene_script: MACRO ;\1: script pointer dw \1 @@ -32,7 +34,7 @@ coord_event: MACRO db \3, \2, \1 db 0 ; filler dw \4 - db 0, 0 ; filler + dw 0 ; filler ENDM bg_event: MACRO diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 49d95f82..eeda6bd8 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -1,242 +1,220 @@ - - enum_start - - enum movement_turn_head -turn_head: macro - db movement_turn_head | \1 ; $00 - endm - -__enum__ SET $4 - - enum movement_turn_step -turn_step: macro - db movement_turn_step | \1 ; $04 - endm - -__enum__ SET $8 - - enum movement_slow_step -slow_step: macro - db movement_slow_step | \1; $08 - endm - -__enum__ SET $c - - enum movement_step -step: macro - db movement_step | \1 ; $0c - endm - -__enum__ SET $10 - - enum movement_big_step -big_step: macro - db movement_big_step | \1 ; $10 - endm - -__enum__ SET $14 - - enum movement_slow_slide_step -slow_slide_step: macro - db movement_slow_slide_step | \1 ; $14 - endm - -__enum__ SET $18 - - enum movement_slide_step -slide_step: macro - db movement_slide_step | \1 ; $18 - endm - -__enum__ SET $1c - - enum movement_fast_slide_step -fast_slide_step: macro - db movement_fast_slide_step | \1 ; $1c - endm - -__enum__ SET $20 - - enum movement_turn_away -turn_away: macro - db movement_turn_away | \1 ; $20 - endm - -__enum__ SET $24 - - enum movement_turn_in -turn_in: macro - db movement_turn_in | \1 ; $24 - endm - -__enum__ SET $28 - - enum movement_turn_waterfall -turn_waterfall: macro - db movement_turn_waterfall | \1 ; $28 - endm - -__enum__ SET $2c - - enum movement_slow_jump_step -slow_jump_step: macro - db movement_slow_jump_step | \1 ; $2c - endm - -__enum__ SET $30 - - enum movement_jump_step -jump_step: macro - db movement_jump_step | \1 ; $30 - endm - -__enum__ SET $34 - - enum movement_fast_jump_step -fast_jump_step: macro - db movement_fast_jump_step | \1 ; $34 - endm +; MovementPointers indexes (see engine/overworld/movement.asm) + enum_start 0, +4 + +; Directional movements + + enum movement_turn_head ; $00 +turn_head: MACRO + db movement_turn_head | \1 +ENDM + + enum movement_turn_step ; $04 +turn_step: MACRO + db movement_turn_step | \1 +ENDM + + enum movement_slow_step ; $08 +slow_step: MACRO + db movement_slow_step | \1 +ENDM + + enum movement_step ; $0c +step: MACRO + db movement_step | \1 +ENDM + + enum movement_big_step ; $10 +big_step: MACRO + db movement_big_step | \1 +ENDM + + enum movement_slow_slide_step ; $14 +slow_slide_step: MACRO + db movement_slow_slide_step | \1 +ENDM + + enum movement_slide_step ; $18 +slide_step: MACRO + db movement_slide_step | \1 +ENDM + + enum movement_fast_slide_step ; $1c +fast_slide_step: MACRO + db movement_fast_slide_step | \1 +ENDM + + enum movement_turn_away ; $20 +turn_away: MACRO + db movement_turn_away | \1 +ENDM + + enum movement_turn_in ; $24 +turn_in: MACRO + db movement_turn_in | \1 +ENDM + + enum movement_turn_waterfall ; $28 +turn_waterfall: MACRO + db movement_turn_waterfall | \1 +ENDM + + enum movement_slow_jump_step ; $2c +slow_jump_step: MACRO + db movement_slow_jump_step | \1 +ENDM + + enum movement_jump_step ; $30 +jump_step: MACRO + db movement_jump_step | \1 +ENDM + + enum movement_fast_jump_step ; $34 +fast_jump_step: MACRO + db movement_fast_jump_step | \1 +ENDM + +__enumdir__ = +1 ; Control -__enum__ SET $38 - - enum movement_remove_sliding -remove_sliding: macro - db movement_remove_sliding ; $38 - endm - - enum movement_set_sliding -set_sliding: macro - db movement_set_sliding ; $39 - endm - - enum movement_remove_fixed_facing -remove_fixed_facing: macro - db movement_remove_fixed_facing ; $3a - endm - - enum movement_fix_facing -fix_facing: macro - db movement_fix_facing ; $3b - endm - - enum movement_show_person -show_person: macro - db movement_show_person ; $3c - endm - - enum movement_hide_person -hide_person: macro - db movement_hide_person ; $3d - endm + enum movement_remove_sliding ; $38 +remove_sliding: MACRO + db movement_remove_sliding +ENDM + + enum movement_set_sliding ; $39 +set_sliding: MACRO + db movement_set_sliding +ENDM + + enum movement_remove_fixed_facing ; $3a +remove_fixed_facing: MACRO + db movement_remove_fixed_facing +ENDM + + enum movement_fix_facing ; $3b +fix_facing: MACRO + db movement_fix_facing +ENDM + + enum movement_show_object ; $3c +show_object: MACRO + db movement_show_object +ENDM + + enum movement_hide_object ; $3d +hide_object: MACRO + db movement_hide_object +ENDM ; Sleep - enum movement_step_sleep -step_sleep: macro + enum movement_step_sleep ; $3e +step_sleep: MACRO if \1 <= 8 db movement_step_sleep + \1 - 1 else db movement_step_sleep + 8, \1 endc -endm - -__enum__ SET $47 - - enum movement_step_end -step_end: macro - db movement_step_end ; $47 - endm - -; Whatever Movement_48 is, it takes a one-byte parameter - -__enum__ = $49 - - enum movement_remove_person -remove_person: macro - db movement_remove_person ; $49 - endm - - enum movement_step_loop -step_loop: macro - db movement_step_loop ; $4a - endm - - enum movement_step_4b -step_4b: macro - db movement_step_4b ; $4b - endm - - enum movement_teleport_from -teleport_from: macro - db movement_teleport_from ; $4c - endm - - enum movement_teleport_to -teleport_to: macro - db movement_teleport_to ; $4d - endm - - enum movement_skyfall -skyfall: macro - db movement_skyfall ; $4e - endm - - enum movement_step_dig -step_dig: macro - db movement_step_dig ; $4f - db \1 - endm - - enum movement_step_bump -step_bump: macro - db movement_step_bump ; $50 - endm - - enum movement_fish_got_bite -fish_got_bite: macro - db movement_fish_got_bite ; $51 - endm - - enum movement_fish_cast_rod -fish_cast_rod: macro - db movement_fish_cast_rod ; $52 - endm - - enum movement_hide_emote -hide_emote: macro - db movement_hide_emote ; $53 - endm - - enum movement_show_emote -show_emote: macro - db movement_show_emote ; $54 - endm - - enum movement_step_shake -step_shake: macro - db movement_step_shake ; $55 +ENDM + +__enum__ = __enum__ + 8 + + enum movement_step_end ; $47 +step_end: MACRO + db movement_step_end +ENDM + + enum movement_step_48 ; $48 +step_48: MACRO + db movement_step_48 + db \1 ; ??? +ENDM + + enum movement_remove_object ; $49 +remove_object: MACRO + db movement_remove_object +ENDM + + enum movement_step_loop ; $4a +step_loop: MACRO + db movement_step_loop +ENDM + + enum movement_step_4b ; $4b +step_4b: MACRO + db movement_step_4b +ENDM + + enum movement_teleport_from ; $4c +teleport_from: MACRO + db movement_teleport_from +ENDM + + enum movement_teleport_to ; $4d +teleport_to: MACRO + db movement_teleport_to +ENDM + + enum movement_skyfall ; $4e +skyfall: MACRO + db movement_skyfall +ENDM + + enum movement_step_dig ; $4f +step_dig: MACRO + db movement_step_dig + db \1 ; length +ENDM + + enum movement_step_bump ; $50 +step_bump: MACRO + db movement_step_bump +ENDM + + enum movement_fish_got_bite ; $51 +fish_got_bite: MACRO + db movement_fish_got_bite +ENDM + + enum movement_fish_cast_rod ; $52 +fish_cast_rod: MACRO + db movement_fish_cast_rod +ENDM + + enum movement_hide_emote ; $53 +hide_emote: MACRO + db movement_hide_emote +ENDM + + enum movement_show_emote ; $54 +show_emote: MACRO + db movement_show_emote +ENDM + + enum movement_step_shake ; $55 +step_shake: MACRO + db movement_step_shake db \1 ; displacement - endm +ENDM - enum movement_tree_shake -tree_shake: macro + enum movement_tree_shake ; $56 +tree_shake: MACRO db movement_tree_shake - endm - - enum movement_rock_smash -rock_smash: macro - db movement_rock_smash ; $57 - db \1 - endm - - enum movement_return_dig -return_dig: macro - db movement_return_dig ; $58 - db \1 - endm - - enum movement_skyfall_top -skyfall_top: macro - db movement_skyfall_top ; $59 - endm +ENDM + + enum movement_rock_smash ; $57 +rock_smash: MACRO + db movement_rock_smash + db \1 ; length +ENDM + + enum movement_return_dig ; $58 +return_dig: MACRO + db movement_return_dig + db \1 ; length +ENDM + + enum movement_skyfall_top ; $59 +skyfall_top: MACRO + db movement_skyfall_top +ENDM diff --git a/macros/sound.asm b/macros/sound.asm deleted file mode 100644 index a0eacc1e..00000000 --- a/macros/sound.asm +++ /dev/null @@ -1,263 +0,0 @@ -note: MACRO - dn (\1), (\2) - 1 - ENDM - -sound: macro - note \1, \2 - db \3 ; intensity - dw \4 ; frequency - endm - -noise: macro - note \1, \2 ; duration - db \3 ; intensity - db \4 ; frequency - endm - -musicheader: macro - ; number of tracks, track idx, address - dbw ((\1 - 1) << 6) + (\2 - 1), \3 - endm - -cry_header: macro - dw \1, \2, \3 - endm - - enum_start $d8 - enum notetype_cmd -octave: macro - db notetype_cmd - (\1) - endm - -notetype: macro - db notetype_cmd - db \1 ; note_length - if _NARG >= 2 - db \2 ; intensity - endc - endm - - enum forceoctave_cmd -forceoctave: macro - db forceoctave_cmd - db \1 ; octave - endm - - enum tempo_cmd -tempo: macro - db tempo_cmd - bigdw \1 ; tempo - endm - - enum dutycycle_cmd -dutycycle: macro - db dutycycle_cmd - db \1 ; duty_cycle - endm - - enum intensity_cmd -intensity: macro - db intensity_cmd - db \1 ; intensity - endm - - enum soundinput_cmd -soundinput: macro - db soundinput_cmd - db \1 ; input - endm - - enum sound_duty_cmd -sound_duty: macro - db sound_duty_cmd - db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence - endm - - enum togglesfx_cmd -togglesfx: macro - db togglesfx_cmd - endm - - enum slidepitchto_cmd -slidepitchto: macro - db slidepitchto_cmd - db \1 ; unknown - dn \2, \3 ; octave, pitch - endm - - enum vibrato_cmd -vibrato: macro - db vibrato_cmd - db \1 ; delay - db \2 ; extent - endm - - enum unknownmusic0xe2_cmd -unknownmusic0xe2: macro - db unknownmusic0xe2_cmd - db \1 ; unknown - endm - - enum togglenoise_cmd -togglenoise: macro - db togglenoise_cmd - db \1 ; id - endm - - enum panning_cmd -panning: macro - db panning_cmd - db \1 ; tracks - endm - - enum volume_cmd -volume: macro - db volume_cmd - db \1 ; volume - endm - - enum tone_cmd -tone: macro - db tone_cmd - bigdw \1 ; tone - endm - - enum unknownmusic0xe7_cmd -unknownmusic0xe7: macro - db unknownmusic0xe7_cmd - db \1 ; unknown - endm - - enum unknownmusic0xe8_cmd -unknownmusic0xe8: macro - db unknownmusic0xe8_cmd - db \1 ; unknown - endm - - enum tempo_relative_cmd -tempo_relative: macro - db tempo_relative_cmd - bigdw \1 ; value - endm - - enum restartchannel_cmd -restartchannel: macro - db restartchannel_cmd - dw \1 ; address - endm - - enum newsong_cmd -newsong: macro - db newsong_cmd - bigdw \1 ; id - endm - - enum sfxpriorityon_cmd -sfxpriorityon: macro - db sfxpriorityon_cmd - endm - - enum sfxpriorityoff_cmd -sfxpriorityoff: macro - db sfxpriorityoff_cmd - endm - - enum unknownmusic0xee_cmd -unknownmusic0xee: macro - db unknownmusic0xee_cmd - dw \1 ; address - endm - - enum stereopanning_cmd -stereopanning: macro - db stereopanning_cmd - db \1 ; tracks - endm - - enum sfxtogglenoise_cmd -sfxtogglenoise: macro - db sfxtogglenoise_cmd - db \1 ; id - endm - - enum music0xf1_cmd -music0xf1: macro - db music0xf1_cmd - endm - - enum music0xf2_cmd -music0xf2: macro - db music0xf2_cmd - endm - - enum music0xf3_cmd -music0xf3: macro - db music0xf3_cmd - endm - - enum music0xf4_cmd -music0xf4: macro - db music0xf4_cmd - endm - - enum music0xf5_cmd -music0xf5: macro - db music0xf5_cmd - endm - - enum music0xf6_cmd -music0xf6: macro - db music0xf6_cmd - endm - - enum music0xf7_cmd -music0xf7: macro - db music0xf7_cmd - endm - - enum music0xf8_cmd -music0xf8: macro - db music0xf8_cmd - endm - - enum unknownmusic0xf9_cmd -unknownmusic0xf9: macro - db unknownmusic0xf9_cmd - endm - - enum setcondition_cmd -setcondition: macro - db setcondition_cmd - db \1 ; condition - endm - - enum jumpif_cmd -jumpif: macro - db jumpif_cmd - db \1 ; condition - dw \2 ; address - endm - - enum jumpchannel_cmd -jumpchannel: macro - db jumpchannel_cmd - dw \1 ; address - endm - - enum loopchannel_cmd -loopchannel: macro - db loopchannel_cmd - db \1 ; count - dw \2 ; address - endm - - enum callchannel_cmd -callchannel: macro - db callchannel_cmd - dw \1 ; address - endm - - enum endchannel_cmd -endchannel: macro - db endchannel_cmd - endm diff --git a/macros/wram.asm b/macros/wram.asm index 9f408d5a..3f07a891 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -1,3 +1,4 @@ +; Used in wram.asm flag_array: MACRO ds ((\1) + 7) / 8 @@ -15,7 +16,7 @@ box_struct: MACRO \1DefExp:: dw \1SpdExp:: dw \1SpcExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES \1Happiness:: db \1PokerusStatus:: db @@ -60,7 +61,7 @@ red_box_struct: MACRO \1DefenseExp:: dw \1SpeedExp:: dw \1SpecialExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES ENDM @@ -75,13 +76,12 @@ red_party_struct: MACRO \1Special:: dw ENDM - battle_struct: MACRO \1Species:: db \1Item:: db \1Moves:: ds NUM_MOVES \1MovesEnd:: -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES \1Happiness:: db \1Level:: db @@ -102,91 +102,80 @@ battle_struct: MACRO ENDM box: MACRO -\1:: -\1Count:: ds 1 +\1Count:: db \1Species:: ds MONS_PER_BOX + 1 \1Mons:: \1Mon1:: box_struct \1Mon1 -\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX +- 1) +\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX + -1) \1MonOT:: ds NAME_LENGTH * MONS_PER_BOX \1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX \1MonNicknamesEnd:: \1End:: ds 2 ; padding ENDM - channel_struct: MACRO -; Addreses are Channel1 (c101). +; Addreses are wChannel1 (c101). \1MusicID:: dw \1MusicBank:: db -\1Flags1:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest -\1Flags2:: db ; 0:vibrato on/off 2:duty 4:cry pitch -\1Flags3:: db ; 0:vibrato up/down +\1Flags1:: db ; 0:on/off 1:subroutine 2:looping 3:sfx 4:noise 5:rest +\1Flags2:: db ; 0:vibrato on/off 1:pitch slide 2:duty cycle pattern 4:pitch offset +\1Flags3:: db ; 0:vibrato up/down 1:pitch slide direction \1MusicAddress:: dw \1LastMusicAddress:: dw dw \1NoteFlags:: db ; 5:rest \1Condition:: db ; conditional jumps \1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) -\1Intensity:: db ; hi:pressure lo:velocity +\1VolumeEnvelope:: db ; hi:volume lo:fade \1Frequency:: dw ; 11 bits \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1PitchOffset:: db ; raises existing octaves (to repeat phrases) +\1Transposition:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note -\1Field16:: ds 1 ; c117 - ds 1 ; c118 +\1Field16:: ds 1 + ds 1 \1LoopCount:: db \1Tempo:: dw \1Tracks:: db ; hi:left lo:right -\1SFXDutyLoop:: ds 1 ; c11d +\1DutyCyclePattern:: db \1VibratoDelayCount:: db ; initialized by \1VibratoDelay \1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoExtent:: db \1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt -\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel -\1PitchWheelAmount:: db ; c124 -\1PitchWheelAmountFraction:: db ; c125 -\1Field25:: ds 1 ; c126 - ds 1 ; c127 -\1CryPitch:: dw +\1PitchSlideTarget:: dw ; frequency endpoint for pitch slide +\1PitchSlideAmount:: db +\1PitchSlideAmountFraction:: db +\1Field25:: db + ds 1 +\1PitchOffset:: dw \1Field29:: ds 1 \1Field2a:: ds 2 \1Field2c:: ds 1 \1NoteLength:: db ; frames per 16th note -\1Field2e:: ds 1 ; c12f -\1Field2f:: ds 1 ; c130 -\1Field30:: ds 1 ; c131 - ds 1 ; c132 +\1Field2e:: ds 1 +\1Field2f:: ds 1 +\1Field30:: ds 1 + ds 1 ENDM mailmsg: MACRO -\1Message:: ds MAIL_MSG_LENGTH +\1Message:: ds MAIL_MSG_LENGTH \1MessageEnd:: ds 1 -\1Author:: ds PLAYER_NAME_LENGTH +\1Author:: ds PLAYER_NAME_LENGTH \1AuthorNationality:: ds 2 -\1AuthorID:: ds 2 -\1Species:: ds 1 -\1Type:: ds 1 -\1End:: -endm - -hof_mon: MACRO -\1Species:: ds 1 -\1ID:: ds 2 -\1DVs:: ds 2 -\1Level:: ds 1 -\1Nickname:: ds MON_NAME_LENGTH +- 1 +\1AuthorID:: dw +\1Species:: db +\1Type:: db \1End:: -endm +ENDM roam_struct: MACRO \1Species:: db \1Level:: db \1MapGroup:: db \1MapNumber:: db -\1HP:: ds 1 -\1DVs:: ds 2 +\1HP:: db +\1DVs:: dw ENDM bugcontestwinner: MACRO @@ -195,38 +184,46 @@ bugcontestwinner: MACRO \1Score:: dw ENDM +hof_mon: MACRO +\1Species:: db +\1ID:: dw +\1DVs:: dw +\1Level:: db +\1Nickname:: ds MON_NAME_LENGTH + -1 +\1End:: +ENDM + hall_of_fame: MACRO -\1:: -\1WinCount:: ds 1 +\1WinCount:: db \1Mon1:: hof_mon \1Mon1 \1Mon2:: hof_mon \1Mon2 \1Mon3:: hof_mon \1Mon3 \1Mon4:: hof_mon \1Mon4 \1Mon5:: hof_mon \1Mon5 \1Mon6:: hof_mon \1Mon6 -\1End:: ds 1 +\1End:: db ENDM trademon: MACRO -\1Species:: ds 1 ; wc6d0 | wc702 +\1Species:: db ; wc6d0 | wc702 \1SpeciesName:: ds MON_NAME_LENGTH ; wc6d1 | wc703 -\1Nickname:: ds MON_NAME_LENGTH ; wc6dc | wc70e -\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 -\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 -\1DVs:: ds 2 ; wc6fd | wc72f -\1ID:: ds 2 ; wc6ff | wc731 +\1Nickname:: ds MON_NAME_LENGTH ; wc6dc | wc70e +\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 +\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 +\1DVs:: dw ; wc6fd | wc72f +\1ID:: dw ; wc6ff | wc731 \1End:: ENDM move_struct: MACRO -\1Animation:: ds 1 -\1Effect:: ds 1 -\1Power:: ds 1 -\1Type:: ds 1 -\1Accuracy:: ds 1 -\1PP:: ds 1 -\1EffectChance:: ds 1 -endm +\1Animation:: db +\1Effect:: db +\1Power:: db +\1Type:: db +\1Accuracy:: db +\1PP:: db +\1EffectChance:: db +ENDM slot_reel: MACRO \1ReelAction:: db @@ -246,56 +243,55 @@ slot_reel: MACRO endm object_struct: MACRO -\1Struct:: -\1Sprite:: ds 1 -\1MapObjectIndex:: ds 1 -\1SpriteTile:: ds 1 -\1MovementType:: ds 1 -\1Flags:: ds 2 -\1Palette:: ds 1 -\1Walking:: ds 1 -\1Direction:: ds 1 -\1StepType:: ds 1 -\1StepDuration:: ds 1 -\1Action:: ds 1 -\1ObjectStepFrame:: ds 1 -\1Facing:: ds 1 -\1StandingTile:: ds 1 ; collision -\1LastTile:: ds 1 ; collision -\1StandingMapX:: ds 1 -\1StandingMapY:: ds 1 -\1LastMapX:: ds 1 -\1LastMapY:: ds 1 -\1ObjectInitX:: ds 1 -\1ObjectInitY:: ds 1 -\1Radius:: ds 1 -\1SpriteX:: ds 1 -\1SpriteY:: ds 1 -\1SpriteXOffset:: ds 1 -\1SpriteYOffset:: ds 1 -\1MovementByteIndex:: ds 1 -\1Object28:: ds 1 -\1Object29:: ds 1 -\1Object30:: ds 1 -\1Object31:: ds 1 -\1Range:: ds 1 +\1Sprite:: db +\1MapObjectIndex:: db +\1SpriteTile:: db +\1MovementType:: db +\1Flags:: dw +\1Palette:: db +\1Walking:: db +\1Direction:: db +\1StepType:: db +\1StepDuration:: db +\1Action:: db +\1ObjectStepFrame:: db +\1Facing:: db +\1StandingTile:: db ; collision +\1LastTile:: db ; collision +\1StandingMapX:: db +\1StandingMapY:: db +\1LastMapX:: db +\1LastMapY:: db +\1ObjectInitX:: db +\1ObjectInitY:: db +\1Radius:: db +\1SpriteX:: db +\1SpriteY:: db +\1SpriteXOffset:: db +\1SpriteYOffset:: db +\1MovementByteIndex:: db +\1Field1c:: ds 1 +\1Field1d:: ds 1 +\1Field1e:: ds 1 +\1Field1f:: ds 1 +\1Range:: db ds 7 \1StructEnd:: ENDM map_object: MACRO -\1ObjectStructID:: ds 1 -\1ObjectSprite:: ds 1 -\1ObjectYCoord:: ds 1 -\1ObjectXCoord:: ds 1 -\1ObjectMovement:: ds 1 -\1ObjectRadius:: ds 1 -\1ObjectHour:: ds 1 -\1ObjectTimeOfDay:: ds 1 -\1ObjectColor:: ds 1 -\1ObjectRange:: ds 1 -\1ObjectScript:: ds 2 -\1ObjectEventFlag:: ds 2 +\1ObjectStructID:: db +\1ObjectSprite:: db +\1ObjectYCoord:: db +\1ObjectXCoord:: db +\1ObjectMovement:: db +\1ObjectRadius:: db +\1ObjectHour:: db +\1ObjectTimeOfDay:: db +\1ObjectColor:: db +\1ObjectRange:: db +\1ObjectScript:: dw +\1ObjectEventFlag:: dw ds 2 ENDM @@ -395,7 +395,7 @@ INCLUDE "engine/items.asm" INCLUDE "engine/overworld/player_step.asm" INCLUDE "engine/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" -INCLUDE "engine/billspctop.asm" +INCLUDE "engine/pokemon/bills_pc_top.asm" GetBreedMon1LevelGrowth: ld hl, wBreedMon1Species @@ -618,10 +618,10 @@ Text_KnowsMove: SECTION "bank4", ROMX, BANK[$4] INCLUDE "engine/overworld/player_movement.asm" -INCLUDE "engine/pack.asm" +INCLUDE "engine/items/pack.asm" INCLUDE "engine/overworld/time.asm" -INCLUDE "engine/learn_tm.asm" -INCLUDE "engine/namingscreen.asm" +INCLUDE "engine/items/tmhm2.asm" +INCLUDE "engine/menus/naming_screen.asm" INCLUDE "engine/events/misc_scripts.asm" INCLUDE "engine/events/heal_machine_anim.asm" INCLUDE "engine/events/whiteout.asm" @@ -632,7 +632,8 @@ INCLUDE "engine/pokemon/mon_menu.asm" INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/events/elevator.asm" INCLUDE "engine/events/bug_contest/contest.asm" -INCLUDE "engine/events/misc_scripts_2.asm" +INCLUDE "engine/events/repel.asm" +INCLUDE "engine/events/hidden_item.asm" INCLUDE "engine/events/std_collision.asm" INCLUDE "engine/events/bug_contest/judging.asm" INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm" diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 79176a28..be45f78d 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -40,7 +40,7 @@ AzaleaGymBugsyScript: setevent EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_JOSH writetext BugsyText_HiveBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_FURY_CUTTER iffalse .NoRoomForFuryCutter setevent EVENT_GOT_TM49_FURY_CUTTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index b80aacc7..4dc53b12 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -17,7 +17,7 @@ BillScript: yesorno iffalse .Refused writetext BillImCountingOnYouText - buttonsound + promptbutton waitsfx checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom @@ -79,7 +79,7 @@ BillsSisterScript: writetext RecordedBillsNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton .GotBillsNumber: writetext BillsSisterStorageSystemText waitbutton @@ -94,7 +94,7 @@ BillsSisterScript: .NoRoom: writetext BillsSisterPhoneFullText - buttonsound + promptbutton jump .Refused BillsHouseBookshelf1: diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 69a7fda7..3705faf3 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -16,7 +16,7 @@ BillsGrandpa: checkevent EVENT_MET_BILLS_GRANDPA iftrue .MetGrandpa writetext BillsGrandpaIntroText - buttonsound + promptbutton setevent EVENT_MET_BILLS_GRANDPA .MetGrandpa: checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA @@ -30,7 +30,7 @@ BillsGrandpa: checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA iftrue .ShowedLickitung writetext BillsGrandpaLickitungText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -44,7 +44,7 @@ BillsGrandpa: .GotEverstone: writetext BillsGrandpaOddishText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -58,7 +58,7 @@ BillsGrandpa: .GotLeafStone: writetext BillsGrandpaStaryuText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -74,7 +74,7 @@ BillsGrandpa: checkver iftrue .AskVulpix writetext BillsGrandpaGrowlitheText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -88,7 +88,7 @@ BillsGrandpa: .AskVulpix: writetext BillsGrandpaVulpixText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -102,7 +102,7 @@ BillsGrandpa: .GotFireStone: writetext BillsGrandpaPichuText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -168,7 +168,7 @@ BillsGrandpa: .ExcitedToSee: writetext BillsGrandpaExcitedToSeeText - buttonsound + promptbutton end .SaidNo: @@ -179,12 +179,12 @@ BillsGrandpa: .CorrectPokemon: writetext BillsGrandpaShownPokemonText - buttonsound + promptbutton end .ReceiveItem: writetext BillsGrandpaTokenOfAppreciationText - buttonsound + promptbutton end .JustShowedSomething: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index a31adb4a..eec1650d 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -95,11 +95,11 @@ SantosScript: checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos writetext MeetSantosText - buttonsound + promptbutton setevent EVENT_MET_SANTOS_OF_SATURDAY .MetSantos: writetext SantosGivesGiftText - buttonsound + promptbutton verbosegiveitem SPELL_TAG iffalse .Done setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 87b35414..4451e913 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -73,7 +73,7 @@ BlackthornGymClairScript: checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue .GotTM24 writetext BlackthornGymClairText_YouKeptMeWaiting - buttonsound + promptbutton verbosegiveitem TM_DRAGONBREATH iffalse .BagFull setevent EVENT_GOT_TM24_DRAGONBREATH diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 27d46e07..e56221d8 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -39,7 +39,7 @@ DaisyScript: opentext writetext GroomedMonLooksContentText special PlayCurMonCry - buttonsound + promptbutton writetext DaisyAllDoneText waitbutton closetext diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 07359b6d..0b7a3699 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -107,7 +107,7 @@ CeladonCafeTrashcan: opentext itemtotext LEFTOVERS, STRING_BUFFER_3 writetext FoundLeftoversText - buttonsound + promptbutton writetext NoRoomForLeftoversText waitbutton closetext diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 52cc573e..d44e2aca 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -58,7 +58,7 @@ CeladonDeptStore6FVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext CeladonClangText - buttonsound + promptbutton itemnotify jump .Start diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 1b29dc01..0473916f 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -53,7 +53,7 @@ CeladonGameCornerFisherScript: checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .GotCoins writetext CeladonGameCornerFisherText1 - buttonsound + promptbutton checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 38b09b84..d3196187 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -37,7 +37,7 @@ CeladonGymErikaScript: checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue .GotGigaDrain writetext ErikaExplainTMText - buttonsound + promptbutton verbosegiveitem TM_GIGA_DRAIN iffalse .GotGigaDrain setevent EVENT_GOT_TM19_GIGA_DRAIN diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 29f04309..3986b1c4 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -20,12 +20,12 @@ GameFreakGameDesignerScript: end .CompletedPokedex: - buttonsound + promptbutton writetext GameFreakGameDesignerCompletedPokedexText playsound SFX_DEX_FANFARE_230_PLUS waitsfx writetext GameFreakGameDesignerPauseForDiplomaText - buttonsound + promptbutton special Diploma writetext GameFreakGameDesignerAfterDiplomaText waitbutton diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 31bda62b..cadbe89e 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -12,7 +12,7 @@ CeladonMansionRoofHousePharmacistScript: checkevent EVENT_GOT_TM03_CURSE iftrue .GotCurse writetext CeladonMansionRoofHousePharmacistIntroText - buttonsound + promptbutton checktime NITE iftrue .Night writetext CeladonMansionRoofHousePharmacistNotNightText @@ -22,7 +22,7 @@ CeladonMansionRoofHousePharmacistScript: .Night: writetext CeladonMansionRoofHousePharmacistStoryText - buttonsound + promptbutton verbosegiveitem TM_CURSE iffalse .NoRoom setevent EVENT_GOT_TM03_CURSE diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index dda28937..165b5074 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -46,7 +46,7 @@ CharcoalKilnApprentice: .Thanks: writetext CharcoalKilnApprenticeText2 - buttonsound + promptbutton verbosegiveitem CHARCOAL iffalse .Done setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ee281738..b2f56401 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -66,12 +66,12 @@ CherrygroveCityGuideGent: turnobject PLAYER, RIGHT opentext writetext GuideGentGiftText - buttonsound + promptbutton stringtotext .mapcardname, STRING_BUFFER_4 scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText - buttonsound + promptbutton writetext GuideGentPokegearText waitbutton closetext @@ -212,7 +212,7 @@ MysticWaterGuy: checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue .After writetext MysticWaterGuyTextBefore - buttonsound + promptbutton verbosegiveitem MYSTIC_WATER iffalse .Exit setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 30117d47..335d9e00 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -26,7 +26,7 @@ CianwoodCityChucksWife: checkevent EVENT_GOT_HM02_FLY iftrue .GotFly writetext ChucksWifeEasierToFlyText - buttonsound + promptbutton checkevent EVENT_BEAT_CHUCK iftrue .BeatChuck writetext ChucksWifeBeatChuckText @@ -36,12 +36,12 @@ CianwoodCityChucksWife: .BeatChuck: writetext ChucksWifeGiveHMText - buttonsound + promptbutton verbosegiveitem HM_FLY iffalse .Done setevent EVENT_GOT_HM02_FLY writetext ChucksWifeFlySpeechText - buttonsound + promptbutton .GotFly: writetext ChucksWifeChubbyText waitbutton diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 6dfc8257..f4a47019 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -57,7 +57,7 @@ CianwoodGymChuckScript: setevent EVENT_BEAT_BLACKBELT_NOB setevent EVENT_BEAT_BLACKBELT_LUNG writetext ChuckExplainBadgeText - buttonsound + promptbutton verbosegiveitem TM_DYNAMICPUNCH iffalse .BagFull setevent EVENT_GOT_TM01_DYNAMICPUNCH diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index ef00ba49..771c5932 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -18,7 +18,7 @@ CianwoodPharmacist: checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iffalse .Mart writetext PharmacistGiveSecretpotionText - buttonsound + promptbutton giveitem SECRETPOTION writetext ReceivedSecretpotionText playsound SFX_KEY_ITEM diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 7127cdd8..9cd374ae 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -57,7 +57,7 @@ Copycat: .ReturnLostItem: opentext writetext CopycatText_GiveDoll - buttonsound + promptbutton takeitem LOST_ITEM setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent EVENT_COPYCATS_HOUSE_2F_DOLL @@ -67,7 +67,7 @@ Copycat: opentext .GivePass: writetext CopycatText_GivePass - buttonsound + promptbutton verbosegiveitem PASS iffalse .Cancel setevent EVENT_GOT_PASS_FROM_COPYCAT @@ -100,7 +100,7 @@ CopycatsDodrio: opentext writetext CopycatsDodrioText1 cry DODRIO - buttonsound + promptbutton writetext CopycatsDodrioText2 waitbutton closetext diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 205e3683..a302db46 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -73,7 +73,7 @@ DanceTheaterSurfGuy: faceplayer opentext writetext SurfGuyNeverLeftAScratchText - buttonsound + promptbutton checkevent EVENT_GOT_HM03_SURF iftrue SurfGuyAlreadyGaveSurf checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO @@ -96,7 +96,7 @@ DanceTheaterSurfGuy: .GetSurf: writetext SurfGuyLikeADanceText - buttonsound + promptbutton verbosegiveitem HM_SURF setevent EVENT_GOT_HM03_SURF writetext SurfGuySurfExplanationText diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 84daa17d..d1ac6082 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -14,7 +14,7 @@ DarkCaveBlackthornEntrancePharmacistScript: checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue .GotBlackglasses writetext DarkCaveBlackthornEntrancePharmacistText1 - buttonsound + promptbutton verbosegiveitem BLACKGLASSES iffalse .PackFull setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 75d63cd0..47f5b0ca 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -54,7 +54,7 @@ DragonsDenB1FDragonFangScript: turnobject PLAYER, DOWN opentext writetext ClairText_GiveDragonbreathDragonDen - buttonsound + promptbutton waitsfx writetext DragonShrinePlayerReceivedRisingBadgeText playsound SFX_GET_BADGE @@ -62,12 +62,12 @@ DragonsDenB1FDragonFangScript: setflag ENGINE_RISINGBADGE specialphonecall SPECIALCALL_MASTERBALL writetext DragonShrineRisingBadgeExplanationText - buttonsound + promptbutton verbosegiveitem TM_DRAGONBREATH, 1 iffalse .ClairLastText setevent EVENT_GOT_TM24_DRAGONBREATH writetext ClairText_DescribeDragonbreathDragonDen - buttonsound + promptbutton jump .ClairLastText .ClairLastText writetext ClairText_WhatsTheMatterDragonDen @@ -81,7 +81,7 @@ DragonsDenB1FDragonFangScript: opentext itemtotext DRAGON_FANG, STRING_BUFFER_3 writetext Text_FoundDragonFang - buttonsound + promptbutton writetext Text_NoRoomForDragonFang waitbutton closetext diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index bd47d9d7..19a818bd 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -41,7 +41,7 @@ EcruteakGymMortyScript: setevent EVENT_BEAT_MEDIUM_MARTHA setevent EVENT_BEAT_MEDIUM_GRACE writetext MortyText_FogBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_SHADOW_BALL iffalse .NoRoomForShadowBall setevent EVENT_GOT_TM30_SHADOW_BALL diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 0ae99bd6..299a80e5 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -16,7 +16,7 @@ EcruteakItemfinderGuy: yesorno iffalse .no writetext EcruteakItemfinderTrueSpiritText - buttonsound + promptbutton verbosegiveitem ITEMFINDER setevent EVENT_GOT_ITEMFINDER .itemfinder: diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index fcc417d7..f99eb892 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -38,7 +38,7 @@ EcruteakPokecenter1F_MapScripts: pause 10 opentext writetext EcruteakPokecenter1F_BillText1 - buttonsound + promptbutton jump .PointlessJump .PointlessJump: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 167c1025..14acb93a 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -131,13 +131,13 @@ CyndaquilPokeBallScript: disappear ELMSLAB_POKE_BALL1 setevent EVENT_GOT_CYNDAQUIL_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx pokenamemem CYNDAQUIL, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke CYNDAQUIL, 5, BERRY closetext checkcode VAR_FACING @@ -161,13 +161,13 @@ TotodilePokeBallScript: disappear ELMSLAB_POKE_BALL2 setevent EVENT_GOT_TOTODILE_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx pokenamemem TOTODILE, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke TOTODILE, 5, BERRY closetext applymovement PLAYER, AfterTotodileMovement @@ -189,13 +189,13 @@ ChikoritaPokeBallScript: disappear ELMSLAB_POKE_BALL3 setevent EVENT_GOT_CHIKORITA_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx pokenamemem CHIKORITA, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke CHIKORITA, 5, BERRY closetext applymovement PLAYER, AfterChikoritaMovement @@ -221,7 +221,7 @@ ElmDirectionsScript: turnobject ELMSLAB_ELM, DOWN opentext writetext ElmDirectionsText3 - buttonsound + promptbutton waitsfx addcellnum PHONE_ELM writetext GotElmsNumberText @@ -283,7 +283,7 @@ ElmAfterTheftScript: writetext ElmAfterTheftText1 checkitem MYSTERY_EGG iffalse ElmAfterTheftDoneScript - buttonsound + promptbutton writetext ElmAfterTheftText2 waitbutton takeitem MYSTERY_EGG @@ -292,9 +292,9 @@ ElmAfterTheftScript: waitbutton scall ElmJumpBackScript2 writetext ElmAfterTheftText4 - buttonsound + promptbutton writetext ElmAfterTheftText5 - buttonsound + promptbutton setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY @@ -331,12 +331,12 @@ ShowElmTogepiScript: setevent EVENT_SHOWED_TOGEPI_TO_ELM opentext writetext ShowElmTogepiText2 - buttonsound + promptbutton writetext ShowElmTogepiText3 - buttonsound + promptbutton ElmGiveEverstoneScript: writetext ElmGiveEverstoneText1 - buttonsound + promptbutton verbosegiveitem EVERSTONE iffalse ElmScript_NoRoomForEverstone writetext ElmGiveEverstoneText2 @@ -354,7 +354,7 @@ ElmScript_NoRoomForEverstone: ElmGiveMasterBallScript: writetext ElmGiveMasterBallText1 - buttonsound + promptbutton verbosegiveitem MASTER_BALL iffalse .notdone setevent EVENT_GOT_MASTER_BALL_FROM_ELM @@ -366,7 +366,7 @@ ElmGiveMasterBallScript: ElmGiveTicketScript: writetext ElmGiveTicketText1 - buttonsound + promptbutton verbosegiveitem S_S_TICKET setevent EVENT_GOT_SS_TICKET_FROM_ELM writetext ElmGiveTicketText2 @@ -429,7 +429,7 @@ AideScript_WalkPotion2: AideScript_GivePotion: opentext writetext AideText_GiveYouPotion - buttonsound + promptbutton verbosegiveitem POTION writetext AideText_AlwaysBusy waitbutton @@ -454,12 +454,12 @@ AideScript_WalkBalls2: AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls - buttonsound + promptbutton itemtotext POKE_BALL, STRING_BUFFER_4 scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls - buttonsound + promptbutton itemnotify closetext setscene SCENE_ELMSLAB_NOTHING @@ -510,7 +510,7 @@ CopScript: turnobject ELMSLAB_OFFICER, LEFT opentext writetext ElmsLabOfficerText1 - buttonsound + promptbutton special NameRival writetext ElmsLabOfficerText2 waitbutton diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index f05908e2..a1375427 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -79,7 +79,7 @@ FastShipB1FSailorScript: end .NotFoundGirl: - buttonsound + promptbutton writetext FastShipB1FOnDutySailorSawLittleGirlText waitbutton closetext diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 43143c01..cf5278a3 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -67,7 +67,7 @@ SSAquaGranddaughterBefore: applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 opentext writetext SSAquaEntertainedGranddaughterText - buttonsound + promptbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene FAST_SHIP_1F, SCENE_DEFAULT jump SSAquaMetalCoatAndDocking @@ -87,7 +87,7 @@ SSAquaGrandpa: SSAquaMetalCoatAndDocking: writetext SSAquaGrandpaHaveThisText - buttonsound + promptbutton verbosegiveitem METAL_COAT iffalse .NoRoom setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA @@ -106,7 +106,7 @@ SSAquaMetalCoatAndDocking: SSAquaFoundGranddaughter: writetext SSAquaGrandpaHaveThisText - buttonsound + promptbutton verbosegiveitem METAL_COAT iffalse .NoRoom setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index e6a5e9bc..ec784776 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -47,7 +47,7 @@ FuchsiaGymJanineScript: checkevent EVENT_GOT_TM06_TOXIC iftrue .AfterTM writetext JanineText_ToxicSpeech - buttonsound + promptbutton verbosegiveitem TM_TOXIC iffalse .AfterTM setevent EVENT_GOT_TM06_TOXIC diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index caf328d1..a8d484a5 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -18,7 +18,7 @@ GoldenrodBikeShopClerkScript: yesorno iffalse .Refused writetext GoldenrodBikeShopClerkAgreedText - buttonsound + promptbutton waitsfx giveitem BICYCLE writetext BorrowedABicycleText diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 752f80ad..baf39888 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -75,7 +75,7 @@ GoldenrodCityGrampsScript: GoldenrodCityRocketScoutScript: opentext writetext GoldenrodCityRocketScoutText1 - buttonsound + promptbutton faceplayer writetext GoldenrodCityRocketScoutText2 waitbutton diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 4734656b..6a650fdf 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,14 +65,14 @@ GoldenrodDeptStore5FReceptionistScript: iftrue .EventIsOver special GetFirstPokemonHappiness writetext UnknownText_0x56143 - buttonsound + promptbutton ifgreater 150 - 1, .VeryHappy ifgreater 50 - 1, .SomewhatHappy jump .NotVeryHappy .VeryHappy: writetext UnknownText_0x5615a - buttonsound + promptbutton verbosegiveitem TM_RETURN iffalse .Done setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN @@ -87,7 +87,7 @@ GoldenrodDeptStore5FReceptionistScript: .NotVeryHappy: writetext UnknownText_0x561d8 - buttonsound + promptbutton verbosegiveitem TM_FRUSTRATION iffalse .Done setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 6b92d7c9..b27d033e 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -52,7 +52,7 @@ GoldenrodVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext GoldenrodClangText - buttonsound + promptbutton itemnotify jump .Start diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 5377ecee..9aff3cbd 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -15,7 +15,7 @@ FlowerShopTeacherScript: faceplayer opentext writetext UnknownText_0x554c2 - buttonsound + promptbutton verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE closetext diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 2370857e..39a56312 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -53,7 +53,7 @@ GoldenrodGymWhitneyScript: checkflag ENGINE_PLAINBADGE iftrue .GotPlainBadge writetext WhitneyWhatDoYouWantText - buttonsound + promptbutton waitsfx writetext PlayerReceivedPlainBadgeText playsound SFX_GET_BADGE @@ -63,7 +63,7 @@ GoldenrodGymWhitneyScript: scall GoldenrodGymActivateRockets .GotPlainBadge: writetext WhitneyPlainBadgeText - buttonsound + promptbutton verbosegiveitem TM_ATTRACT iffalse .NoRoomForAttract setevent EVENT_GOT_TM45_ATTRACT diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 0918b6b7..c722cdae 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRaterTeacherScript: opentext special GetFirstPokemonHappiness writetext GoldenrodHappinessRaterTeacherText - buttonsound + promptbutton ifgreater 250 - 1, .LovesYouALot ifgreater 200 - 1, .ReallyTrustsYou ifgreater 150 - 1, .SortOfHappy diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index eaecc1c5..aaf5617a 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -197,7 +197,7 @@ OlderHaircutBrotherScript: checkmoney YOUR_MONEY, 500 ifequal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a - buttonsound + promptbutton special YoungerHaircutBrother ifequal $0, .Refused ifequal $1, .Refused @@ -280,7 +280,7 @@ YoungerHaircutBrotherScript: checkmoney YOUR_MONEY, 300 ifequal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 - buttonsound + promptbutton special OlderHaircutBrother ifequal $0, .Refused ifequal $1, .Refused diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 8c30fe78..942f7d2c 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -273,7 +273,7 @@ TrainerGruntF3: Switch1Script: opentext writetext SwitchRoomText_Switch1 - buttonsound + promptbutton checkevent EVENT_SWITCH_1 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -298,7 +298,7 @@ Switch1Script: Switch2Script: opentext writetext SwitchRoomText_Switch2 - buttonsound + promptbutton checkevent EVENT_SWITCH_2 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -323,7 +323,7 @@ Switch2Script: Switch3Script: opentext writetext SwitchRoomText_Switch3 - buttonsound + promptbutton checkevent EVENT_SWITCH_3 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -348,7 +348,7 @@ Switch3Script: EmergencySwitchScript: opentext writetext SwitchRoomText_Emergency - buttonsound + promptbutton checkevent EVENT_EMERGENCY_SWITCH iftrue .On writetext SwitchRoomText_OffTurnOn diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index e9e9e735..ad21f5f1 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -72,14 +72,14 @@ GoldenrodUndergroundWarehouseDirectorScript: checkevent EVENT_RECEIVED_CARD_KEY iftrue .GotCardKey writetext DirectorIntroText - buttonsound + promptbutton verbosegiveitem CARD_KEY setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 writetext DirectorCardKeyText - buttonsound + promptbutton .GotCardKey: writetext DirectorAfterText waitbutton diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7ec75819..93ff2035 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -43,7 +43,7 @@ FarfetchdPosition1: faceplayer opentext writetext Text_ItsTheMissingPokemon - buttonsound + promptbutton writetext Text_Kwaaaa cry FARFETCH_D waitbutton @@ -252,7 +252,7 @@ IlexForestCharcoalMasterScript: checkevent EVENT_GOT_HM01_CUT iftrue .AlreadyGotCut writetext Text_CharcoalMasterIntro - buttonsound + promptbutton verbosegiveitem HM_CUT setevent EVENT_GOT_HM01_CUT writetext Text_CharcoalMasterOutro @@ -278,7 +278,7 @@ IlexForestHeadbuttGuyScript: checkevent EVENT_GOT_TM02_HEADBUTT iftrue .AlreadyGotHeadbutt writetext Text_HeadbuttIntro - buttonsound + promptbutton verbosegiveitem TM_HEADBUTT iffalse .BagFull setevent EVENT_GOT_TM02_HEADBUTT diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index df26a5fc..96aa1f4a 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -61,7 +61,7 @@ Kurt1: .ClearedSlowpokeWell: writetext UnknownText_0x18e615 - buttonsound + promptbutton verbosegiveitem LURE_BALL iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL @@ -85,7 +85,7 @@ Kurt1: checkevent EVENT_GAVE_KURT_PNK_APRICORN iftrue .GiveLoveBall writetext UnknownText_0x18e6c9 - buttonsound + promptbutton .CheckApricorns: checkitem RED_APRICORN iftrue .AskApricorn @@ -106,7 +106,7 @@ Kurt1: .AskApricorn: writetext UnknownText_0x18e736 - buttonsound + promptbutton special SelectApricornForKurt ifequal FALSE, .Cancel ifequal BLU_APRICORN, .Blu @@ -177,7 +177,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem LEVEL_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_RED_APRICORN @@ -187,7 +187,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem LURE_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLU_APRICORN @@ -197,7 +197,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem MOON_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_YLW_APRICORN @@ -207,7 +207,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem FRIEND_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_GRN_APRICORN @@ -217,7 +217,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem FAST_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_WHT_APRICORN @@ -227,7 +227,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem HEAVY_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLK_APRICORN @@ -237,7 +237,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue .KurtMakingBallsScript writetext UnknownText_0x18e7fb - buttonsound + promptbutton verbosegiveitem LOVE_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_PNK_APRICORN diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 892d1f0e..b493f90e 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -46,7 +46,7 @@ LakeOfRageLanceScript: iftrue .AskAgainForHelp opentext writetext UnknownText_0x70157 - buttonsound + promptbutton faceplayer writetext UnknownText_0x701b4 yesorno @@ -138,7 +138,7 @@ MagikarpHouseSignScript: end .MagikarpLengthRecord: - buttonsound + promptbutton special MagikarpHouseSign closetext end @@ -197,11 +197,11 @@ WesleyScript: checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley writetext MeetWesleyText - buttonsound + promptbutton setevent EVENT_MET_WESLEY_OF_WEDNESDAY .MetWesley: writetext WesleyGivesGiftText - buttonsound + promptbutton verbosegiveitem BLACKBELT iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 177d7ea2..b8662867 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -12,7 +12,7 @@ HiddenPowerGuy: checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue .AlreadyGotItem writetext HiddenPowerGuyText1 - buttonsound + promptbutton verbosegiveitem TM_HIDDEN_POWER iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 4731ec48..9374dd6b 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -51,7 +51,7 @@ MagikarpLengthRaterScript: .GetReward: writetext MagikarpLengthRaterText_Memento - buttonsound + promptbutton verbosegiveitem ETHER iffalse .NoRoom writetext MagikarpLengthRaterText_Bonus diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 7e931de3..dc4e895a 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -33,7 +33,7 @@ LavRadioTower1FGentlemanScript: .ReturnedMachinePart: writetext LavRadioTower1FGentlemanText_ReturnedMachinePart - buttonsound + promptbutton stringtotext .expncardname, STRING_BUFFER_4 scall .receiveitem setflag ENGINE_EXPN_CARD diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index a8da6137..55e6da6f 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -41,7 +41,7 @@ MahoganyGymPryceScript: setevent EVENT_BEAT_BOARDER_BRAD setevent EVENT_BEAT_BOARDER_DOUGLAS writetext PryceText_GlacierBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_ICY_WIND iffalse MahoganyGym_NoRoomForIcyWind setevent EVENT_GOT_TM16_ICY_WIND diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 1a70e960..1c203beb 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -19,7 +19,7 @@ ManiaScript: special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle - buttonsound + promptbutton waitsfx writetext ManiaText_GotShuckle playsound SFX_KEY_ITEM diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 580d699f..7cfb66b2 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -30,7 +30,7 @@ MountMortarB1FKiyoScript: opentext .BeatKiyo: writetext UnknownText_0x7e2c0 - buttonsound + promptbutton waitsfx checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 3f6efbb0..d849e0a8 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -26,7 +26,7 @@ MrPokemonsHouse_MapScripts: applymovement PLAYER, MrPokemonsHouse_PlayerWalksToMrPokemon opentext writetext MrPokemonIntroText2 - buttonsound + promptbutton waitsfx giveitem MYSTERY_EGG writetext MrPokemonsHouse_GotEggText @@ -36,10 +36,10 @@ MrPokemonsHouse_MapScripts: setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod CHERRYGROVE_CITY writetext MrPokemonIntroText3 - buttonsound + promptbutton turnobject MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext MrPokemonIntroText4 - buttonsound + promptbutton turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN turnobject MRPOKEMONSHOUSE_OAK, LEFT writetext MrPokemonIntroText5 @@ -87,7 +87,7 @@ MrPokemonsHouse_OakScript: turnobject PLAYER, RIGHT opentext writetext MrPokemonsHouse_OakText1 - buttonsound + promptbutton waitsfx writetext MrPokemonsHouse_GetDexText playsound SFX_ITEM diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 7f6511a8..2913d2e3 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -12,7 +12,7 @@ MrPsychic: checkevent EVENT_GOT_TM29_PSYCHIC iftrue .AlreadyGotItem writetext MrPsychicText1 - buttonsound + promptbutton verbosegiveitem TM_PSYCHIC_M iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b0f1d0ed..e6038111 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -31,7 +31,7 @@ NationalParkTeacher1Script: checkevent EVENT_GOT_QUICK_CLAW iftrue .GotQuickClaw writetext NationalParkTeacher1Text - buttonsound + promptbutton verbosegiveitem QUICK_CLAW iffalse .NoRoom setevent EVENT_GOT_QUICK_CLAW @@ -82,7 +82,7 @@ TrainerSchoolboyJack1: checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext UnknownText_0x5c4f3 - buttonsound + promptbutton setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .RequestNumber @@ -176,7 +176,7 @@ TrainerPokefanfBeverly1: checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext UnknownText_0x5c68a - buttonsound + promptbutton setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .RequestNumber diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 9e909a83..b5b7015e 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -20,7 +20,7 @@ Oak: checkevent EVENT_TALKED_TO_OAK_IN_KANTO iftrue .CheckBadges writetext OakWelcomeKantoText - buttonsound + promptbutton setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: checkcode VAR_BADGES @@ -39,18 +39,18 @@ Oak: .OpenMtSilver: writetext OakOpenMtSilverText - buttonsound + promptbutton setevent EVENT_OPENED_MT_SILVER jump .CheckPokedex .Complain: writetext OakNoKantoBadgesText - buttonsound + promptbutton jump .CheckPokedex .AhGood: writetext OakYesKantoBadgesText - buttonsound + promptbutton jump .CheckPokedex OaksAssistant1Script: diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 41ae1b43..e36f9625 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -14,7 +14,7 @@ OlivineCafeStrengthSailorScript: checkevent EVENT_GOT_HM04_STRENGTH iftrue .GotStrength writetext OlivineCafeStrengthSailorText - buttonsound + promptbutton verbosegiveitem HM_STRENGTH setevent EVENT_GOT_HM04_STRENGTH .GotStrength: diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 67acb021..ee2a11f1 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -15,7 +15,7 @@ GoodRodGuru: yesorno iffalse .DontWantIt writetext GiveGoodRodText - buttonsound + promptbutton verbosegiveitem GOOD_ROD writetext GaveGoodRodText waitbutton diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index d1787cb0..2f2c3332 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -31,7 +31,7 @@ OlivineGymJasmineScript: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue .GotIronTail writetext Jasmine_BadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_IRON_TAIL iffalse .NoRoomForIronTail setevent EVENT_GOT_TM23_IRON_TAIL diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 02f0d84a..8aa413a4 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -31,7 +31,7 @@ TrainerSailorHuey: checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER iftrue .AskedBefore writetext SailorHueyAfterBattleText - buttonsound + promptbutton setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index f0121b8e..87fd486d 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -16,7 +16,7 @@ OlivineLighthouseJasmine: checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iftrue .ExplainedSickness writetext JasmineCianwoodPharmacyText - buttonsound + promptbutton setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS .ExplainedSickness: writetext JasmineGetSomeMedicineText @@ -29,7 +29,7 @@ OlivineLighthouseJasmine: yesorno iffalse .no writetext PlayerHandedSecretpotionText - buttonsound + promptbutton takeitem SECRETPOTION writetext JasmineDontBeOffendedText waitbutton @@ -41,7 +41,7 @@ OlivineLighthouseJasmine: playmusic MUSIC_HEAL writetext JasmineAmphyHowAreYouFeelingText pause 60 - buttonsound + promptbutton closetext special RestartMapMusic cry AMPHAROS @@ -109,7 +109,7 @@ OlivineLighthouseAmphy: writetext AmphyPalPalooText writebyte AMPHAROS special PlaySlowCry - buttonsound + promptbutton writetext AmphyBreathingLaboredText waitbutton closetext diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1b101984..59094ca9 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -93,7 +93,7 @@ OlivinePortWalkUpToShipScript: yesorno iffalse OlivinePortNotRidingMoveAwayScript writetext UnknownText_0x74ada - buttonsound + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext UnknownText_0x74b11 @@ -158,7 +158,7 @@ OlivinePortSailorAfterHOFScript: yesorno iffalse OlivinePortNotRidingScript writetext UnknownText_0x74ada - buttonsound + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext UnknownText_0x74b11 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 8c28e9d6..fcc2f7c5 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -29,7 +29,7 @@ PewterCityGrampsScript: checkevent EVENT_GOT_SILVER_WING iftrue .GotSilverWing writetext PewterCityGrampsText - buttonsound + promptbutton verbosegiveitem SILVER_WING setevent EVENT_GOT_SILVER_WING closetext @@ -45,7 +45,7 @@ PewterCityGrampsScript: checkevent EVENT_GOT_RAINBOW_WING iftrue .GotSilverWing writetext PewterCityGrampsText - buttonsound + promptbutton verbosegiveitem RAINBOW_WING setevent EVENT_GOT_RAINBOW_WING setevent EVENT_TEAM_ROCKET_DISBANDED diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 8b9c071a..ea3f5606 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -26,7 +26,7 @@ MeetMomScript: applymovement PLAYERSHOUSE1F_MOM1, MomWalksToPlayerMovement opentext writetext ElmsLookingForYouText - buttonsound + promptbutton stringtotext GearName, STRING_BUFFER_4 scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR @@ -36,7 +36,7 @@ MeetMomScript: setevent EVENT_PLAYERS_HOUSE_MOM_1 clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext MomGivesPokegearText - buttonsound + promptbutton special SetDayOfWeek .SetDayOfWeek: writetext IsItDSTText @@ -59,12 +59,12 @@ MeetMomScript: .KnowPhone: writetext KnowTheInstructionsText - buttonsound + promptbutton jump .FinishPhone .ExplainPhone: writetext DontKnowTheInstructionsText - buttonsound + promptbutton jump .FinishPhone .FinishPhone: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 4d3d7413..4a3041e6 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -320,7 +320,7 @@ Pokecenter2FOfficerScript: yesorno iffalse .RefusedGift writetext Text_MysteryGiftDeliveryGuy_HereYouGo - buttonsound + promptbutton waitsfx special GetMysteryGiftItem iffalse .BagIsFull diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 75f9e321..fdd1579f 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -22,10 +22,10 @@ PokemonFanClubPresidentScript: yesorno iffalse .NotListening writetext UnknownText_0x191911 - buttonsound + promptbutton .HeardSpeechButBagFull: writetext UnknownText_0x191a3d - buttonsound + promptbutton verbosegiveitem RARE_CANDY iffalse .BagFull setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT @@ -71,9 +71,9 @@ PokemonFanClubClefairyGuyScript: end .MetCopycat: - buttonsound + promptbutton writetext UnknownText_0x191c5a - buttonsound + promptbutton waitsfx giveitem LOST_ITEM iffalse .NoRoom diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 31b28d3c..5f0e49ae 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -158,7 +158,7 @@ PowerPlantManager: .FoundMachinePart: writetext UnknownText_0x18936e - buttonsound + promptbutton takeitem MACHINE_PART setevent EVENT_RETURNED_MACHINE_PART clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION @@ -170,7 +170,7 @@ PowerPlantManager: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue .GotZapCannon writetext UnknownText_0x1893c4 - buttonsound + promptbutton verbosegiveitem TM_ZAP_CANNON iffalse .NoRoom setevent EVENT_GOT_TM07_ZAP_CANNON diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index c760da0e..fbadc45f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -31,7 +31,7 @@ RadioTower1FLuckyNumberManScript: faceplayer opentext writetext UnknownText_0x5ceba - buttonsound + promptbutton special CheckLuckyNumberShowFlag iffalse .skip special ResetLuckyNumberShowFlag @@ -40,17 +40,17 @@ RadioTower1FLuckyNumberManScript: checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a - buttonsound + promptbutton closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 opentext writetext UnknownText_0x5cf5a - buttonsound + promptbutton waitsfx writetext UnknownText_0x5cf79 playsound SFX_DEX_FANFARE_20_49 waitsfx - buttonsound + promptbutton special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 @@ -70,7 +70,7 @@ RadioTower1FLuckyNumberManScript: writetext UnknownText_0x5cfb5 playsound SFX_1ST_PLACE waitsfx - buttonsound + promptbutton giveitem MASTER_BALL iffalse .BagFull itemnotify @@ -81,7 +81,7 @@ RadioTower1FLuckyNumberManScript: writetext UnknownText_0x5d023 playsound SFX_2ND_PLACE waitsfx - buttonsound + promptbutton giveitem EXP_SHARE iffalse .BagFull itemnotify @@ -92,7 +92,7 @@ RadioTower1FLuckyNumberManScript: writetext UnknownText_0x5d076 playsound SFX_3RD_PLACE waitsfx - buttonsound + promptbutton giveitem PP_UP iffalse .BagFull itemnotify @@ -145,11 +145,11 @@ RadioTower1FRadioCardWomanScript: playsound SFX_ELEVATOR_END waitsfx writetext UnknownText_0x5d37b - buttonsound + promptbutton stringtotext .RadioCardText, STRING_BUFFER_4 scall .ReceiveItem writetext UnknownText_0x5d3c0 - buttonsound + promptbutton setflag ENGINE_RADIO_CARD .GotCard: writetext UnknownText_0x5d3e5 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 367223ce..a6c61667 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -64,7 +64,7 @@ RadioTower3FCooltrainerFScript: .NoRockets: writetext UnknownText_0x5e7e2 - buttonsound + promptbutton verbosegiveitem TM_SUNNY_DAY iffalse .NoRoom writetext UnknownText_0x5e821 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 87efe0b2..08f3f82e 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -29,7 +29,7 @@ RadioTower4FDJMaryScript: .ClearedRockets: writetext RadioTower4FDJMaryText_ClearedRockets - buttonsound + promptbutton verbosegiveitem PINK_BOW iffalse .NoRoom writetext RadioTower4FDJMaryText_GivePinkBow diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 889b2fb2..29f7e1ac 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -42,7 +42,7 @@ FakeDirectorScript: reloadmapafterbattle opentext writetext FakeDirectorTextAfter - buttonsound + promptbutton verbosegiveitem BASEMENT_KEY closetext setscene SCENE_RADIOTOWER5F_ROCKET_BOSS @@ -119,7 +119,7 @@ RadioTower5FRocketBossScene: turnobject PLAYER, RIGHT opentext writetext RadioTower5FDirectorThankYouText - buttonsound + promptbutton checkver iftrue .SilverWing verbosegiveitem RAINBOW_WING diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index f91e7802..420e8782 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -15,7 +15,7 @@ Route12SuperRodHouseFishingGuruScript: yesorno iffalse .Refused writetext GiveSuperRodText - buttonsound + promptbutton verbosegiveitem SUPER_ROD iffalse .NoRoom setevent EVENT_GOT_SUPER_ROD diff --git a/maps/Route24.asm b/maps/Route24.asm index e547fc23..09f41b1f 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -21,7 +21,7 @@ Route24RocketScript: playmusic MUSIC_ROCKET_ENCOUNTER opentext writetext Route24RocketAfterBattleText - buttonsound + promptbutton special FadeOutMusic writetext Route24RocketDisappearsText waitbutton diff --git a/maps/Route25.asm b/maps/Route25.asm index 20179b4b..84f25af2 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -161,7 +161,7 @@ TrainerCooltrainermKevin: checkevent EVENT_CLEARED_NUGGET_BRIDGE iftrue .AfterNuggetBridge writetext CooltrainermKevinNuggetText - buttonsound + promptbutton verbosegiveitem NUGGET iffalse .NoRoomForNugget setevent EVENT_CLEARED_NUGGET_BRIDGE diff --git a/maps/Route26.asm b/maps/Route26.asm index e99f4929..b0bade82 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -37,7 +37,7 @@ TrainerCooltrainermGaven3: checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainermGavenAfterText - buttonsound + promptbutton setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber @@ -131,7 +131,7 @@ TrainerCooltrainerfBeth1: checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainerfBethAfterText - buttonsound + promptbutton setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/Route27.asm b/maps/Route27.asm index e32f013e..79153963 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -36,7 +36,7 @@ FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext writetext Route27FisherHeyText - buttonsound + promptbutton writetext Route27FisherText waitbutton closetext @@ -70,7 +70,7 @@ TrainerBirdKeeperJose2: checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperJose2AfterBattleText - buttonsound + promptbutton setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber @@ -175,7 +175,7 @@ TrainerCooltrainerfReena: checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainerfReenaAfterBattleText - buttonsound + promptbutton setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 886e7aa2..3a1990ed 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,13 +13,13 @@ SandstormHouseWoman: iftrue .AlreadyGotItem special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 - buttonsound + promptbutton ifgreater 150 - 1, .Loyal jump .Disloyal .Loyal: writetext SandstormHouseWomanLoyalText - buttonsound + promptbutton verbosegiveitem TM_SANDSTORM iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index a62f94d5..270bf715 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -17,7 +17,7 @@ Celebrity: checkevent EVENT_GOT_TM47_STEEL_WING iftrue .AlreadyGotItem writetext CelebrityText1 - buttonsound + promptbutton verbosegiveitem TM_STEEL_WING iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING diff --git a/maps/Route29.asm b/maps/Route29.asm index 3b3322f1..32820ddd 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -174,11 +174,11 @@ TuscanyScript: checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany writetext MeetTuscanyText - buttonsound + promptbutton setevent EVENT_MET_TUSCANY_OF_TUESDAY .MetTuscany: writetext TuscanyGivesGiftText - buttonsound + promptbutton verbosegiveitem PINK_BOW iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 2fa4b892..402cf169 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -12,7 +12,7 @@ Route2NuggetHouseFisherScript: checkevent EVENT_GOT_NUGGET_FROM_GUY iftrue .GotNugget writetext Route2NuggetHouseFisherText - buttonsound + promptbutton verbosegiveitem NUGGET iffalse .NoRoom setevent EVENT_GOT_NUGGET_FROM_GUY diff --git a/maps/Route30.asm b/maps/Route30.asm index 3b5707eb..2ae0b4b7 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -49,7 +49,7 @@ TrainerYoungsterJoey: checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext YoungsterJoey1AfterText - buttonsound + promptbutton setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .RequestNumber diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index f24c5808..43935d21 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -12,7 +12,7 @@ Route30BerryHousePokefanMScript: checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue .GotBerry writetext Route30BerrySpeechHouseMonEatBerriesText - buttonsound + promptbutton verbosegiveitem BERRY iffalse .NoRoom setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE diff --git a/maps/Route31.asm b/maps/Route31.asm index 78b143d0..b9f789f4 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -120,7 +120,7 @@ Route31MailRecipientScript: .TryGiveKenya: writetext Text_Route31SleepyManGotMail - buttonsound + promptbutton checkpokemail ReceivedSpearowMailText ifequal POKEMAIL_WRONG_MAIL, .WrongMail ifequal POKEMAIL_REFUSED, .Refused @@ -128,9 +128,9 @@ Route31MailRecipientScript: ifequal POKEMAIL_LAST_MON, .LastMon ; POKEMAIL_CORRECT writetext Text_Route31HandOverMailMon - buttonsound + promptbutton writetext Text_Route31ReadingMail - buttonsound + promptbutton setevent EVENT_GAVE_KENYA verbosegiveitem TM_NIGHTMARE iffalse .NoRoomForItems diff --git a/maps/Route32.asm b/maps/Route32.asm index 43b77274..2d4f1ce5 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -65,7 +65,7 @@ Route32CooltrainerMContinueScene: .GiveMiracleSeed: writetext Route32CooltrainerMText_HaveThisSeed - buttonsound + promptbutton verbosegiveitem MIRACLE_SEED iffalse .BagFull setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 @@ -106,7 +106,7 @@ Route32RoarTMGuyScript: checkevent EVENT_GOT_TM05_ROAR iftrue .AlreadyHaveRoar writetext Text_RoarIntro - buttonsound + promptbutton verbosegiveitem TM_ROAR iffalse .Finish setevent EVENT_GOT_TM05_ROAR @@ -176,7 +176,7 @@ TrainerFisherRalph1: checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext FisherRalphAfterText - buttonsound + promptbutton setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber @@ -270,7 +270,7 @@ TrainerPicnickerLiz1: checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext PicnickerLiz1AfterText - buttonsound + promptbutton setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber @@ -383,11 +383,11 @@ FriedaScript: checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda writetext MeetFriedaText - buttonsound + promptbutton setevent EVENT_MET_FRIEDA_OF_FRIDAY .MetFrieda: writetext FriedaGivesGiftText - buttonsound + promptbutton verbosegiveitem POISON_BARB iffalse .Done setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 0f51be40..7a51f73d 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -20,7 +20,7 @@ Route32Pokecenter1FFishingGuruScript: yesorno iffalse .Refused writetext Route32Pokecenter1FFishingGuruText_Yes - buttonsound + promptbutton verbosegiveitem OLD_ROD writetext Route32Pokecenter1FFishingGuruText_GiveOldRod waitbutton diff --git a/maps/Route33.asm b/maps/Route33.asm index 7af007ee..ada3536a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -21,7 +21,7 @@ TrainerHikerAnthony: checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext HikerAnthony2AfterText - buttonsound + promptbutton setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForPhoneNumber diff --git a/maps/Route34.asm b/maps/Route34.asm index aa0f332c..f8fdce62 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -98,7 +98,7 @@ TrainerCamperTodd1: checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext CamperTodd1AfterText - buttonsound + promptbutton setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER scall .AskNumber jump .FinishAsk @@ -181,7 +181,7 @@ TrainerPicnickerGina1: checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext PicnickerGina1AfterText - buttonsound + promptbutton setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .FinishAsk @@ -362,7 +362,7 @@ TrainerCooltrainerfKate: checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand writetext CooltrainerfKateOfferSoftSandText - buttonsound + promptbutton verbosegiveitem SOFT_SAND iffalse .BagFull setevent EVENT_GOT_SOFT_SAND_FROM_KATE diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index b6f546c0..7978afff 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -15,7 +15,7 @@ Route34IlexForestGateTeacherScript: checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue .GotSweetScent writetext Route34IlexForestGateTeacherText - buttonsound + promptbutton verbosegiveitem TM_SWEET_SCENT iffalse .NoRoom setevent EVENT_GOT_TM12_SWEET_SCENT diff --git a/maps/Route35.asm b/maps/Route35.asm index 954ea960..8babafa0 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -40,7 +40,7 @@ TrainerJugglerIrwin: checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext JugglerIrwinAfterBattleText - buttonsound + promptbutton setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M jump .AskForNumber @@ -167,7 +167,7 @@ TrainerBugCatcherArnie: checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BugCatcherArnieAfterBattleText - buttonsound + promptbutton setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M jump .AskForNumber diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index b2816dbd..47768768 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -21,7 +21,7 @@ RandyScript: yesorno iffalse .refused writetext UnknownText_0x69e48 - buttonsound + promptbutton waitsfx checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, .partyfull @@ -51,7 +51,7 @@ RandyScript: .questcomplete writetext UnknownText_0x69f8b - buttonsound + promptbutton verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 3ba3036f..aed30ee9 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -99,7 +99,7 @@ Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d - buttonsound + promptbutton writetext UnknownText_0x6a3c7 playsound SFX_ITEM waitsfx @@ -141,11 +141,11 @@ Route35NationalParkGate_LessThanFullParty: iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 - buttonsound + promptbutton writetext UnknownText_0x6a56b playsound SFX_GOT_SAFARI_BALLS waitsfx - buttonsound + promptbutton jump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: diff --git a/maps/Route36.asm b/maps/Route36.asm index 00196c92..b3b8a8ef 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -85,7 +85,7 @@ Route36RockSmashGuyScript: .ClearedSudowoodo: writetext RockSmashGuyText2 - buttonsound + promptbutton verbosegiveitem TM_ROCK_SMASH iffalse .NoRoomForTM setevent EVENT_GOT_TM08_ROCK_SMASH @@ -125,7 +125,7 @@ TrainerSchoolboyAlan1: checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue .AskAgainForPhoneNumber writetext UnknownText_0x1947aa - buttonsound + promptbutton setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .ContinueAskForPhoneNumber @@ -216,11 +216,11 @@ ArthurScript: checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur writetext MeetArthurText - buttonsound + promptbutton setevent EVENT_MET_ARTHUR_OF_THURSDAY .MetArthur: writetext ArthurGivesGiftText - buttonsound + promptbutton verbosegiveitem HARD_STONE iffalse .BagFull setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a5c983e2..d7b77429 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -160,7 +160,7 @@ Route36OfficerScriptContest: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6ae87 - buttonsound + promptbutton waitsfx writetext UnknownText_0x6aeb1 playsound SFX_ITEM @@ -193,11 +193,11 @@ Route36OfficerScriptContest: iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 - buttonsound + promptbutton writetext UnknownText_0x6b055 playsound SFX_GOT_SAFARI_BALLS waitsfx - buttonsound + promptbutton jump .ResumeStartingContest .DecidedNotToJoinContest: @@ -246,7 +246,7 @@ Route36Officer_ContestHasConcluded: .Sunstone: writetext UnknownText_0x6b97f - buttonsound + promptbutton verbosegiveitem SUN_STONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE @@ -255,7 +255,7 @@ Route36Officer_ContestHasConcluded: .Everstone: writetext UnknownText_0x6b97f - buttonsound + promptbutton verbosegiveitem EVERSTONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE @@ -264,7 +264,7 @@ Route36Officer_ContestHasConcluded: .GoldBerry: writetext UnknownText_0x6b97f - buttonsound + promptbutton verbosegiveitem GOLD_BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY @@ -273,7 +273,7 @@ Route36Officer_ContestHasConcluded: .Berry: writetext UnknownText_0x6b97f - buttonsound + promptbutton verbosegiveitem BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_BERRY diff --git a/maps/Route37.asm b/maps/Route37.asm index 108496f6..0131d174 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -66,11 +66,11 @@ SunnyScript: checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny writetext MeetSunnyText - buttonsound + promptbutton setevent EVENT_MET_SUNNY_OF_SUNDAY .MetSunny: writetext SunnyGivesGiftText1 - buttonsound + promptbutton verbosegiveitem MAGNET iffalse SunnyDoneScript setevent EVENT_GOT_MAGNET_FROM_SUNNY diff --git a/maps/Route38.asm b/maps/Route38.asm index 6dc1d046..fec0f4e6 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -47,7 +47,7 @@ TrainerLassDana1: checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking writetext UnknownText_0x1a20ec - buttonsound + promptbutton setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F jump .AskForPhoneNumber @@ -130,7 +130,7 @@ TrainerSchoolboyChad1: checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking writetext UnknownText_0x1a200e - buttonsound + promptbutton setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 jump .AskToRegisterNumber diff --git a/maps/Route39.asm b/maps/Route39.asm index 53b4edf8..a29445ac 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -36,7 +36,7 @@ TrainerPokefanmDerek: checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PokefanMDerekText_NotBragging - buttonsound + promptbutton setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 96bb784b..7e45f578 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -51,7 +51,7 @@ MoomooScript: writetext MoomooWeakMooText writebyte MILTANK special PlaySlowCry - buttonsound + promptbutton writetext Route39BarnItsCryIsWeakText checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue .GiveBerry @@ -60,7 +60,7 @@ MoomooScript: end .GiveBerry: - buttonsound + promptbutton writetext Route39BarnAskGiveBerryText yesorno iffalse .Refused @@ -80,7 +80,7 @@ MoomooScript: .ThreeBerries: writetext Route39BarnGaveBerryText - buttonsound + promptbutton writetext Route39BarnLittleHealthierText waitbutton closetext @@ -88,7 +88,7 @@ MoomooScript: .FiveBerries: writetext Route39BarnGaveBerryText - buttonsound + promptbutton writetext Route39BarnQuiteHealthyText waitbutton closetext @@ -98,7 +98,7 @@ MoomooScript: playmusic MUSIC_HEAL writetext Route39BarnGaveBerryText pause 60 - buttonsound + promptbutton special RestartMapMusic writetext Route39BarnTotallyHealthyText waitbutton diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 7d93f943..e6835bc1 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -34,7 +34,7 @@ FarmerMScript_SellMilk: waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk - buttonsound + promptbutton itemnotify closetext end @@ -77,7 +77,7 @@ PokefanF_SnoreFarmer: FarmerFScript_GiveSnore: writetext FarmerFText_HealedMiltank - buttonsound + promptbutton verbosegiveitem TM_SNORE iffalse FarmerFScript_NoRoomForSnore setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM diff --git a/maps/Route40.asm b/maps/Route40.asm index 7a66b61e..b988de9a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -85,11 +85,11 @@ MonicaScript: checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica writetext MeetMonicaText - buttonsound + promptbutton setevent EVENT_MET_MONICA_OF_MONDAY .MetMonica: writetext MonicaGivesGiftText - buttonsound + promptbutton verbosegiveitem SHARP_BEAK iffalse .done setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA diff --git a/maps/Route42.asm b/maps/Route42.asm index 55736f29..4733bf58 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -27,7 +27,7 @@ TrainerFisherChris: checkevent EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherChrisAfterBattleText - buttonsound + promptbutton setevent EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/Route43.asm b/maps/Route43.asm index d0fce5df..bfce5669 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -59,7 +59,7 @@ TrainerPokemaniacBrent: checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PokemaniacBrentAfterBattleText - buttonsound + promptbutton setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber @@ -164,7 +164,7 @@ TrainerPicnickerTiffany: checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PicnickerTiffanyWantsPicnicText - buttonsound + promptbutton setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 jump .AskForNumber diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 6b4c530d..dbccf93b 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -47,7 +47,7 @@ RocketScript_Southbound: applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth opentext writetext RocketText_TollFee - buttonsound + promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollSouth jump RocketScript_YoureBrokeSouth @@ -63,7 +63,7 @@ RocketScript_YoureBrokeSouth: jump RocketScript_ShakeDownSouth RocketScript_ShakeDownSouth: - buttonsound + promptbutton closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth @@ -79,7 +79,7 @@ RocketScript_Northbound: applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth opentext writetext RocketText_TollFee - buttonsound + promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollNorth jump RocketScript_YoureBrokeNorth @@ -95,7 +95,7 @@ RocketScript_YoureBrokeNorth: jump RocketScript_ShakeDownNorth RocketScript_ShakeDownNorth: - buttonsound + promptbutton closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth @@ -112,7 +112,7 @@ OfficerScript_GuardWithSludgeBomb: checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue .GotSludgeBomb writetext OfficerText_FoundTM - buttonsound + promptbutton verbosegiveitem TM_SLUDGE_BOMB iffalse .NoRoomForSludgeBomb setevent EVENT_GOT_TM36_SLUDGE_BOMB diff --git a/maps/Route44.asm b/maps/Route44.asm index 27e0ba1e..ef43ed51 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -29,7 +29,7 @@ TrainerBirdKeeperVance1: checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperVanceLegendaryBirdsText - buttonsound + promptbutton setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M jump .AskForNumber @@ -123,7 +123,7 @@ TrainerFisherWilton1: checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherWiltonHugePoliwagText - buttonsound + promptbutton setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M jump .AskForNumber diff --git a/maps/Route45.asm b/maps/Route45.asm index 59a02c9a..477dfb6c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -136,7 +136,7 @@ TrainerHikerParry: checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext HikerParryAfterBattleText - buttonsound + promptbutton setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER scall Route45AskNumber1M jump .AskForNumber diff --git a/maps/Route46.asm b/maps/Route46.asm index a48d973b..e4ac8d94 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -35,7 +35,7 @@ TrainerPicnickerErin1: checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PicnickerErinAfterBattleText - buttonsound + promptbutton setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER scall Route46AskNumber1F jump .AskForNumber diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index 90554d1a..a5b86f7d 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -13,7 +13,7 @@ Route5CleanseTagHouseGrannyScript: checkevent EVENT_GOT_CLEANSE_TAG iftrue .GotCleanseTag writetext Route5CleanseTagHouseGrannyText1 - buttonsound + promptbutton verbosegiveitem CLEANSE_TAG iffalse .NoRoom setevent EVENT_GOT_CLEANSE_TAG diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index d14f19b2..157496c5 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -16,7 +16,7 @@ SilphCoOfficerScript: checkevent EVENT_GOT_UP_GRADE iftrue .GotUpGrade writetext SilphCoOfficerText - buttonsound + promptbutton verbosegiveitem UP_GRADE iffalse .NoRoom setevent EVENT_GOT_UP_GRADE diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 3098815e..25b022d8 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -13,7 +13,7 @@ SlowpokeWellB2FGymGuyScript: checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue .GotKingsRock writetext SlowpokeWellB2FGymGuyText - buttonsound + promptbutton verbosegiveitem KINGS_ROCK iffalse .NoRoom setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 5bf9809a..71322d1e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -75,7 +75,7 @@ SageLiScript: reloadmapafterbattle opentext writetext SageLiTakeThisFlashText - buttonsound + promptbutton verbosegiveitem HM_FLASH setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index c45b3572..63a0ecfa 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -283,7 +283,7 @@ RocketBaseElectrodeScript: turnobject PLAYER, RIGHT opentext writetext UnknownText_0x6d809 - buttonsound + promptbutton verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL writetext UnknownText_0x6d8f8 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index bbd836e4..0c7ef06e 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -17,7 +17,7 @@ TrainerHouseReceptionistScript: checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText - buttonsound + promptbutton special TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, STRING_BUFFER_3 @@ -27,7 +27,7 @@ TrainerHouseReceptionistScript: trainertotext CAL, CAL3, STRING_BUFFER_3 .GotName: writetext TrainerHouseB1FYourOpponentIsText - buttonsound + promptbutton writetext TrainerHouseB1FAskWantToBattleText yesorno iffalse .Declined diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 26caecfe..f08379d6 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -88,7 +88,7 @@ VermilionGymBadgeGuy: .AllBadges: writetext UnknownText_0x1aacf3 - buttonsound + promptbutton verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 9bd49f0b..e4b3ee12 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -94,7 +94,7 @@ VermilionPortWalkUpToShipScript: yesorno iffalse VermilionPortNotRidingMoveAwayScript writetext UnknownText_0x74f8b - buttonsound + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext VermilionPortSSTicketText @@ -156,7 +156,7 @@ VermilionPortSailorScript: yesorno iffalse VermilionPortNotRidingScript writetext UnknownText_0x74f8b - buttonsound + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext VermilionPortSSTicketText diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index c596efe8..c04344fe 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -25,7 +25,7 @@ VictoryRoadGateOfficerScript: VictoryRoadGateBadgeCheckScript: opentext writetext VictoryRoadGateOfficerText - buttonsound + promptbutton checkcode VAR_BADGES ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 5aaf8ef6..18f0dca3 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -37,7 +37,7 @@ VioletGymFalknerScript: setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING specialphonecall SPECIALCALL_ASSISTANT writetext FalknerZephyrBadgeText - buttonsound + promptbutton verbosegiveitem TM_MUD_SLAP iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index d0686934..f7586655 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -53,7 +53,7 @@ ViridianCityDreamEaterFisher: checkevent EVENT_GOT_TM42_DREAM_EATER iftrue .GotDreamEater writetext ViridianCityDreamEaterFisherText - buttonsound + promptbutton verbosegiveitem TM_DREAM_EATER iffalse .NoRoomForDreamEater setevent EVENT_GOT_TM42_DREAM_EATER diff --git a/pokegold.link b/pokegold.link index 522d6a8b..5eb704f5 100644 --- a/pokegold.link +++ b/pokegold.link @@ -1,6 +1,7 @@ ROM0 org $0000 "NULL" + org $0000 "rst0" org $0008 "rst8" diff --git a/pokesilver.link b/pokesilver.link index 522d6a8b..5eb704f5 100644 --- a/pokesilver.link +++ b/pokesilver.link @@ -1,6 +1,7 @@ ROM0 org $0000 "NULL" + org $0000 "rst0" org $0008 "rst8" @@ -9002,7 +9002,7 @@ s1_ad6b:: ds 1 ; 1:ad6b SECTION "Active Box", SRAM, BANK[1] ; 1:ad6c - box sBox +sBox:: box sBox ; 1:b1bc s1_b1bc:: ds 1 ; 1:b1bc @@ -12659,19 +12659,21 @@ s1_bffe:: ds 1 ; 1:bffe s1_bfff:: ds 1 ; 1:bfff SECTION "SRAM2", SRAM, BANK[$2] - box sBox1 - box sBox2 - box sBox3 - box sBox4 - box sBox5 - box sBox6 - box sBox7 + +sBox1:: box sBox1 +sBox2:: box sBox2 +sBox3:: box sBox3 +sBox4:: box sBox4 +sBox5:: box sBox5 +sBox6:: box sBox6 +sBox7:: box sBox7 SECTION "SRAM3", SRAM, BANK[$3] - box sBox8 - box sBox9 - box sBox10 - box sBox11 - box sBox12 - box sBox13 - box sBox14 + +sBox8:: box sBox8 +sBox9:: box sBox9 +sBox10:: box sBox10 +sBox11:: box sBox11 +sBox12:: box sBox12 +sBox13:: box sBox13 +sBox14:: box sBox14 @@ -26,7 +26,7 @@ wChannel8:: channel_struct wChannel8 ; c25f ds 1 ; c291 wCurTrackDuty:: db -wCurTrackIntensity:: db +wCurTrackVolumeEnvelope:: db wCurTrackFrequency:: dw wUnusedBCDNumber:: db ; BCD value, dummied out wCurNoteDuration:: db ; used in MusicE0 and LoadNote @@ -46,13 +46,12 @@ wSoundOutput:: ; c29b ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off db -wSoundInput:: ; c29c -; corresponds to rNR52 -; bit 7: global on/off -; bit 0: ch1 on/off -; bit 1: ch2 on/off -; bit 2: ch3 on/off -; bit 3: ch4 on/off +wPitchSweep:: ; c29c +; corresponds to rNR10 +; bit 7: unused +; bit 4-6: sweep time +; bit 3: sweep direction +; but 0-2: sweep shift db wMusicID:: dw ; c29d @@ -2770,7 +2769,7 @@ wd113:: ds 1 ; d113 wd114:: ds 1 ; d114 wd115:: ds 1 ; d115 wBattleMode:: ds 1 ; d116 -wd117:: ds 1 ; d117 +wTempWildMonSpecies:: db ; d117 wOtherTrainerClass:: ; d118 ; class (Youngster, Bug Catcher, etc.) of opposing trainer @@ -3010,20 +3009,20 @@ wFollowerMovementQueueLength:: ds 1 ; d1f7 wFollowMovementQueue:: ds 5 ; d1f8 wObjectStructs:: ; d1fd - object_struct wPlayer ; d1fd - object_struct wObject1 ; d225 - object_struct wObject2 ; d24d - object_struct wObject3 ; d275 - object_struct wObject4 ; d29d - object_struct wObject5 ; d2c5 - object_struct wObject6 ; d2ed - object_struct wObject7 ; d315 - object_struct wObject8 ; d33d - object_struct wObject9 ; d365 - object_struct wObject10 ; d38d - object_struct wObject11 ; d3b5 - object_struct wObject12 ; d3dd -wObjectStructsEnd:: ; d405 +wPlayerStruct:: object_struct wPlayer +wObject1Struct:: object_struct wObject1 +wObject2Struct:: object_struct wObject2 +wObject3Struct:: object_struct wObject3 +wObject4Struct:: object_struct wObject4 +wObject5Struct:: object_struct wObject5 +wObject6Struct:: object_struct wObject6 +wObject7Struct:: object_struct wObject7 +wObject8Struct:: object_struct wObject8 +wObject9Struct:: object_struct wObject9 +wObject10Struct:: object_struct wObject10 +wObject11Struct:: object_struct wObject11 +wObject12Struct:: object_struct wObject12 +wObjectStructsEnd:: wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE ; d405 ; d41d @@ -3608,7 +3607,7 @@ wd9bf:: ds 1 ; d9bf wd9c0:: ds 1 ; d9c0 wd9c1:: ds 1 ; d9c1 wd9c2:: ds 1 ; d9c2 -wParkBalls:: ds 1 ; d9c3 +wParkBallsRemaining:: db ; d9c3 wd9c4:: ds 1 ; d9c4 wd9c5:: ds 1 ; d9c5 wd9c6:: ds 1 ; d9c6 @@ -3884,4 +3883,4 @@ wStackTop:: INCLUDE "sram.asm" -INCLUDE "hram.asm"
\ No newline at end of file +INCLUDE "hram.asm" |