diff options
1117 files changed, 10065 insertions, 9825 deletions
@@ -452,7 +452,7 @@ INCLUDE "audio/sfx/get_item2_4.asm" SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] -PlayBattleMusic:: ; 9064 (2:5064) +PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a @@ -490,7 +490,7 @@ INCLUDE "audio/engine_1.asm" ; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: ; 99bd (2:59bd) +Music_RivalAlternateStart:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -501,7 +501,7 @@ Music_RivalAlternateStart:: ; 99bd (2:59bd) call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) +Audio1_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -509,7 +509,7 @@ Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) ret ; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: ; 99db (2:59db) +Music_RivalAlternateTempo:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -517,10 +517,10 @@ Music_RivalAlternateTempo:: ; 99db (2:59db) jr asm_99ed ; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: ; 99e7 (2:59e7) +Music_RivalAlternateStartAndTempo:: call Music_RivalAlternateStart ld de, Music_MeetRival_branch_b19b -asm_99ed: ; 99ed (2:59ed) +asm_99ed: ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer @@ -528,7 +528,7 @@ asm_99ed: ; 99ed (2:59ed) ret ; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) +Music_Cities1AlternateTempo:: ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a @@ -545,7 +545,7 @@ Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] -Music_DoLowHealthAlarm:: ; 2131e (8:531e) +Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -627,7 +627,7 @@ INCLUDE "audio/engine_2.asm" SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -PlayPokedexRatingSfx:: ; 7d0d6 (1f:50d6) +PlayPokedexRatingSfx:: ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues @@ -650,7 +650,7 @@ PlayPokedexRatingSfx:: ; 7d0d6 (1f:50d6) call PlayMusic jp PlayDefaultMusic -PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) +PokedexRatingSfxPointers: db SFX_DENIED, BANK(SFX_Denied_3) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) @@ -659,7 +659,7 @@ PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) -OwnedMonValues: ; 7d106 (1f:5106) +OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff @@ -667,7 +667,9 @@ INCLUDE "audio/engine_3.asm" SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4] -SurfingPikachu1Graphics:: INCBIN "gfx/surfing_pikachu_1.t4.2bpp" +SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu_1a.2bpp" +SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu_1b.2bpp" +SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu_1c.t5.2bpp" INCLUDE "audio/engine_4.asm" @@ -751,7 +753,7 @@ INCLUDE "audio/music/meetjessiejames.asm" INCBIN "audio/unknown_832b9.bin" SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1] -PikachuCry1:: ; 84000 (21:4000) +PikachuCry1:: dw (PikachuCry1_End - PikachuCry1) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm" PikachuCry1_End: @@ -760,21 +762,21 @@ PikachuCry1_End: ; Game Freak might have made a slight error, because all of ; the pcm data has one trailing byte that is never processed. -PikachuCry2:: ; 8491a (21:491a) +PikachuCry2:: dw (PikachuCry2_End - PikachuCry2) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_2.pcm" PikachuCry2_End: db $77 ; unused -PikachuCry3:: ; 84fdc (21:4fdc) +PikachuCry3:: dw (PikachuCry3_End - PikachuCry3) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_3.pcm" PikachuCry3_End: db $03 ; unused -PikachuCry4:: ; 859ee (21:59ee) +PikachuCry4:: dw (PikachuCry4_End - PikachuCry4) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_4.pcm" PikachuCry4_End: @@ -783,21 +785,21 @@ PikachuCry4_End: SECTION "Pikachu Cries 2",ROMX,BANK[PCM_2] -PikachuCry5:: ; 88000 (22:4000) +PikachuCry5:: dw (PikachuCry5_End - PikachuCry5) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm" PikachuCry5_End: db $77 ; unused -PikachuCry6:: ; 89042 (22:5042) +PikachuCry6:: dw (PikachuCry6_End - PikachuCry6) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_6.pcm" PikachuCry6_End: db $77 ; unused -PikachuCry7:: ; 8a254 (22:6254) +PikachuCry7:: dw (PikachuCry7_End - PikachuCry7) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_7.pcm" PikachuCry7_End: @@ -806,21 +808,21 @@ PikachuCry7_End: SECTION "Pikachu Cries 3",ROMX,BANK[PCM_3] -PikachuCry8:: ; 8c000 (23:4000) +PikachuCry8:: dw (PikachuCry8_End - PikachuCry8) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm" PikachuCry8_End: db $f7 ; unused -PikachuCry9:: ; 8d0ca (23:50ca) +PikachuCry9:: dw (PikachuCry9_End - PikachuCry9) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_9.pcm" PikachuCry9_End: db $f3 ; unused -PikachuCry10:: ; 8de0c (23:5e0c) +PikachuCry10:: dw (PikachuCry10_End - PikachuCry10) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_10.pcm" PikachuCry10_End: @@ -829,21 +831,21 @@ PikachuCry10_End: SECTION "Pikachu Cries 4",ROMX,BANK[PCM_4] -PikachuCry11:: ; 90000 (24:4000) +PikachuCry11:: dw (PikachuCry11_End - PikachuCry11) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm" PikachuCry11_End: db $77 ; unused -PikachuCry12:: ; 90722 (24:4772) +PikachuCry12:: dw (PikachuCry12_End - PikachuCry12) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_12.pcm" PikachuCry12_End: db $ff ; unused -PikachuCry13:: ; 914a4 (24:54a4) +PikachuCry13:: dw (PikachuCry13_End - PikachuCry13) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_13.pcm" PikachuCry13_End: @@ -852,14 +854,14 @@ PikachuCry13_End: SECTION "Pikachu Cries 5",ROMX,BANK[PCM_5] -PikachuCry14:: ; 94000 (25:4000) +PikachuCry14:: dw (PikachuCry14_End - PikachuCry14) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm" PikachuCry14_End: db $fc ; unused -PikachuCry15:: ; 9589a (25:589a) +PikachuCry15:: dw (PikachuCry15_End - PikachuCry15) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm" PikachuCry15_End: @@ -867,21 +869,21 @@ PikachuCry15_End: db $77 ; unused SECTION "Pikachu Cries 6",ROMX,BANK[PCM_6] -PikachuCry16:: ; c4000 (31:4000) +PikachuCry16:: dw (PikachuCry16_End - PikachuCry16) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm" PikachuCry16_End: db $e7 ; unused -PikachuCry18:: ; c549a (31:549a) +PikachuCry18:: dw (PikachuCry18_End - PikachuCry18) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_18.pcm" PikachuCry18_End: db $00 ; unused -PikachuCry22:: ; c63a4 (31:63a4) +PikachuCry22:: dw (PikachuCry22_End - PikachuCry22) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_22.pcm" PikachuCry22_End: @@ -890,14 +892,14 @@ PikachuCry22_End: SECTION "Pikachu Cries 7",ROMX,BANK[PCM_7] -PikachuCry20:: ; c8000 (32:4000) +PikachuCry20:: dw (PikachuCry20_End - PikachuCry20) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm" PikachuCry20_End: db $07 ; unused -PikachuCry21:: ; ca002 (32:6002) +PikachuCry21:: dw (PikachuCry21_End - PikachuCry21) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_21.pcm" PikachuCry21_End: @@ -906,42 +908,42 @@ PikachuCry21_End: SECTION "Pikachu Cries 8",ROMX,BANK[PCM_8] -PikachuCry19:: ; cc000 (33:4000) +PikachuCry19:: dw (PikachuCry19_End - PikachuCry19) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm" PikachuCry19_End: db $06 ; unused -PikachuCry24:: ; cd632 (33:5632) +PikachuCry24:: dw (PikachuCry24_End - PikachuCry24) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_24.pcm" PikachuCry24_End: db $e0 ; unused -PikachuCry26:: ; cf25c (33:725c) +PikachuCry26:: dw (PikachuCry26_End - PikachuCry26) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm" PikachuCry26_End: SECTION "Pikachu Cries 9",ROMX,BANK[PCM_9] -PikachuCry17:: ; d0000 (34:4000) +PikachuCry17:: dw (PikachuCry17_End - PikachuCry17) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm" PikachuCry17_End: db $00 ; unused -PikachuCry23:: ; d0862 (34:4862) +PikachuCry23:: dw (PikachuCry23_End - PikachuCry23) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_23.pcm" PikachuCry23_End: db $00 ; unused -PikachuCry25:: ; d173c (34:573c) +PikachuCry25:: dw (PikachuCry25_End - PikachuCry25) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_25.pcm" PikachuCry25_End: @@ -950,63 +952,63 @@ PikachuCry25_End: SECTION "Pikachu Cries 10",ROMX,BANK[PCM_10] -PikachuCry27:: ; d4000 (35:4000) +PikachuCry27:: dw (PikachuCry27_End - PikachuCry27) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm" PikachuCry27_End: db $ff ; unused -PikachuCry28:: ; d4b5a (35:4b5a) +PikachuCry28:: dw (PikachuCry28_End - PikachuCry28) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_28.pcm" PikachuCry28_End: db $1b ; unused -PikachuCry29:: ; d5da4 (35:5da4) +PikachuCry29:: dw (PikachuCry29_End - PikachuCry29) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_29.pcm" PikachuCry29_End: db $87 ; unused -PikachuCry30:: ; d69ce (35:69ce) +PikachuCry30:: dw (PikachuCry30_End - PikachuCry30) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_30.pcm" PikachuCry30_End: db $00 ; unused -PikachuCry31:: ; d6e80 (35:6ea0) +PikachuCry31:: dw (PikachuCry31_End - PikachuCry31) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm" PikachuCry31_End: SECTION "Pikachu Cries 11",ROMX,BANK[PCM_11] -PikachuCry32:: ; d8000 (36:4000) +PikachuCry32:: dw (PikachuCry32_End - PikachuCry32) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm" PikachuCry32_End: db $ff ; unused -PikachuCry33:: ; d858a (36:458a) +PikachuCry33:: dw (PikachuCry33_End - PikachuCry33) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_33.pcm" PikachuCry33_End: db $1f ; unused -PikachuCry34:: ; d923c (36:523c) +PikachuCry34:: dw (PikachuCry34_End - PikachuCry34) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_34.pcm" PikachuCry34_End: db $01 ; unused -PikachuCry41:: ; da746 (36:6746) +PikachuCry41:: dw (PikachuCry41_End - PikachuCry41) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_41.pcm" PikachuCry41_End: @@ -1015,21 +1017,21 @@ PikachuCry41_End: SECTION "Pikachu Cries 12",ROMX,BANK[PCM_12] -PikachuCry35:: ; dc000 (37:4000) +PikachuCry35:: dw (PikachuCry35_End - PikachuCry35) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm" PikachuCry35_End: db $00 ; unused -PikachuCry36:: ; dd22a (37:5d2a) +PikachuCry36:: dw (PikachuCry36_End - PikachuCry36) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_36.pcm" PikachuCry36_End: db $01 ; unused -PikachuCry39:: ; dee0c (37:6e0c) +PikachuCry39:: dw (PikachuCry39_End - PikachuCry39) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_39.pcm" PikachuCry39_End: @@ -1038,28 +1040,28 @@ PikachuCry39_End: SECTION "Pikachu Cries 13",ROMX,BANK[PCM_13] -PikachuCry37:: ; e0000 (38:4000) +PikachuCry37:: dw (PikachuCry37_End - PikachuCry37) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm" PikachuCry37_End: db $3f ; unused -PikachuCry38:: ; e0dfa (38:4dfa) +PikachuCry38:: dw (PikachuCry38_End - PikachuCry38) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_38.pcm" PikachuCry38_End: db $ff ; unused -PikachuCry40:: ; e1a64 (38:5a64) +PikachuCry40:: dw (PikachuCry40_End - PikachuCry40) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_40.pcm" PikachuCry40_End: db $ff ; unused -PikachuCry42:: ; e2976 (38:6976) +PikachuCry42:: dw (PikachuCry42_End - PikachuCry42) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_42.pcm" PikachuCry42_End: diff --git a/audio/engine_1.asm b/audio/engine_1.asm index adf4cfde..51522634 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,6 +1,6 @@ ; The first of three duplicated sound engines. -Audio1_UpdateMusic:: ; 909d (2:509d) +Audio1_UpdateMusic:: ld c, CH0 .loop ld b, 0 @@ -36,7 +36,7 @@ Audio1_UpdateMusic:: ; 909d (2:509d) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -Audio1_ApplyMusicAffects: ; 90d2 (2:50d2) +Audio1_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc @@ -144,7 +144,7 @@ Audio1_ApplyMusicAffects: ; 90d2 (2:50d2) ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Audio1_PlayNextNote: ; 916a (2:516a) +Audio1_PlayNextNote: ; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc @@ -839,7 +839,7 @@ Audio1_notepitch: ; 0x9568 call Audio1_ApplyWavePatternAndFrequency ret -Audio1_EnableChannelOutput: ; 95a3 (2:55a3) +Audio1_EnableChannelOutput: ld b, 0 call Audio1_9972 add hl, bc @@ -968,7 +968,7 @@ Audio1_ApplyWavePatternAndFrequency: ; 0x964b ld [wTempoModifier], a ret -Audio1_SetSfxTempo: ; 9657 (2:5657) +Audio1_SetSfxTempo: call Audio1_IsCry jr c, .isCry call Audio1_96c3 @@ -991,7 +991,7 @@ Audio1_SetSfxTempo: ; 9657 (2:5657) ld [wSfxTempo], a ret -Audio1_ApplyFrequencyModifier: ; 967c (2:567c) +Audio1_ApplyFrequencyModifier: call Audio1_IsCry jr c, .isCry call Audio1_96c3 @@ -1011,7 +1011,7 @@ Audio1_ApplyFrequencyModifier: ; 967c (2:567c) .done ret -Audio1_GoBackOneCommandIfCry: ; 9692 (2:5692) +Audio1_GoBackOneCommandIfCry: call Audio1_IsCry jr nc, .done ld hl, wChannelCommandPointers @@ -1033,7 +1033,7 @@ Audio1_GoBackOneCommandIfCry: ; 9692 (2:5692) and a ret -Audio1_IsCry: ; 96af (2:56af) +Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. ld a, [wChannelSoundIDs + CH4] cp CRY_SFX_START @@ -1051,7 +1051,7 @@ Audio1_IsCry: ; 96af (2:56af) scf ret -Audio1_96c3: ; 96c3 (2:56c3) +Audio1_96c3: ld a, [wAudioROMBank] cp AUDIO_2 jr nz, .asm_96dc @@ -1353,7 +1353,7 @@ Audio1_CalculateFrequency: ; 0x9858 ld d, a ret -Audio1_PlaySound:: ; 984e (2:584e) +Audio1_PlaySound:: ld [wSoundID], a ld a, [wSoundID] cp $ff @@ -1541,19 +1541,19 @@ Audio1_PlaySound:: ; 984e (2:584e) .done ret -Audio1_CryEndchannel: ; 9961 (2:5961) +Audio1_CryEndchannel: endchannel -Audio1_HWChannelBaseAddresses: ; 9962 (2:5962) +Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Audio1_HWChannelDisableMasks: ; 996a (2:596a) +Audio1_HWChannelDisableMasks: db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Audio1_9972: ; 9972 (2:5972) +Audio1_9972: push af push bc ld a, [wOptions] @@ -1567,7 +1567,7 @@ Audio1_9972: ; 9972 (2:5972) pop af ret -Audio1_HWChannelEnableMasks: ; 9985 (2:5985) +Audio1_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 db $01,$20,$44,$88 @@ -1577,7 +1577,7 @@ Audio1_HWChannelEnableMasks: ; 9985 (2:5985) db $01,$02,$40,$80 db $01,$02,$40,$80 -Audio1_Pitches: ; 99a5 (2:59a5) +Audio1_Pitches: dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index b09e3d1e..d1b07df9 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,4 +1,4 @@ -Audio2_PlaySound:: ; 218bb (8:58bb) +Audio2_PlaySound:: ld [wSoundID], a ld a, [wSoundID] cp $ff @@ -13,7 +13,7 @@ Audio2_PlaySound:: ; 218bb (8:58bb) call InitMusicVariables jp Audio2_21940 -Audio2_218db: ; 218db (8:58db) +Audio2_218db: ld l, a ld e, a ld h, $0 @@ -79,11 +79,11 @@ Audio2_218db: ; 218db (8:58db) dec c jp .asm_218f4 -Audio2_2193c: ; 2193c (8:593c) +Audio2_2193c: call StopAllAudio ret -Audio2_21940: ; 21940 (8:5940) +Audio2_21940: ld a, [wSoundID] ld l, a ld e, a @@ -184,10 +184,10 @@ Audio2_21940: ; 21940 (8:5940) .asm_219cd ret -Noise2_endchannel: ; 222d5 (8:62d5) +Noise2_endchannel: endchannel -Music_PokeFluteInBattle:: ; 219cf (8:59cf) +Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent @@ -199,7 +199,7 @@ Music_PokeFluteInBattle:: ; 219cf (8:59cf) call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch3 -Audio2_OverwriteChannelPointer: ; 219e6 (8:59e6) +Audio2_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -208,7 +208,7 @@ Audio2_OverwriteChannelPointer: ; 219e6 (8:59e6) INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" -Audio2_InitMusicVariables:: ; 219f8 (8:59f8) +Audio2_InitMusicVariables:: xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -281,7 +281,7 @@ Audio2_InitMusicVariables:: ; 219f8 (8:59f8) ld [rNR50], a ret -Audio2_InitSFXVariables:: ; 21ab7 (8:5ab7) +Audio2_InitSFXVariables:: xor a push de ld h, d @@ -369,7 +369,7 @@ Audio2_InitSFXVariables:: ; 21ab7 (8:5ab7) ld [rNR10], a ret -Audio2_StopAllAudio:: ; 21b3f (8:5b3f) +Audio2_StopAllAudio:: ld a, $80 ld [rNR52], a ld [rNR30], a @@ -408,10 +408,10 @@ Audio2_StopAllAudio:: ; 21b3f (8:5b3f) ld [wStereoPanning], a ret -FillAudioRAM2: ; 21b94 (8:5b94) +FillAudioRAM2: ld b, d .loop ld [hli], a dec b jr nz, .loop - ret
\ No newline at end of file + ret diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 71416dbc..418ee10b 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,6 +1,6 @@ ; The third of three duplicated sound engines. -Audio3_PlaySound:: ; 7d10d (1f:510d) +Audio3_PlaySound:: ld [wSoundID], a ld a, [wSoundID] cp $ff @@ -15,7 +15,7 @@ Audio3_PlaySound:: ; 7d10d (1f:510d) call InitMusicVariables jp Audio3_7d192 -Audio3_7d12d: ; 7d12d (1f:512d) +Audio3_7d12d: ld l, a ld e, a ld h, $0 @@ -81,11 +81,11 @@ Audio3_7d12d: ; 7d12d (1f:512d) dec c jp .asm_7d146 -Audio3_7d18e: ; 7d18e (1f:518e) +Audio3_7d18e: call StopAllAudio ret -Audio3_7d192: ; 7d192 (1f:5192) +Audio3_7d192: ld a, [wSoundID] ld l, a ld e, a @@ -186,5 +186,5 @@ Audio3_7d192: ; 7d192 (1f:5192) .asm_7d21f ret -Noise3_endchannel: ; 7d220 (1f:5220) - endchannel
\ No newline at end of file +Noise3_endchannel: + endchannel diff --git a/audio/engine_4.asm b/audio/engine_4.asm index fdeead3e..f152ff80 100644 --- a/audio/engine_4.asm +++ b/audio/engine_4.asm @@ -1,4 +1,4 @@ -Audio4_PlaySound:: ; 82bd4 (20:6bd4) +Audio4_PlaySound:: ; Duplicate of Audio3_PlaySound ld [wSoundID], a ld a, [wSoundID] @@ -15,7 +15,7 @@ Audio4_PlaySound:: ; 82bd4 (20:6bd4) call InitMusicVariables jp Audio4_7d192 -Audio4_7d12d: ; 7d12d (1f:512d) +Audio4_7d12d: ld l, a ld e, a ld h, $0 @@ -83,11 +83,11 @@ Audio4_7d12d: ; 7d12d (1f:512d) dec c jp .asm_7d146 -Audio4_7d18e: ; 7d18e (1f:518e) +Audio4_7d18e: call StopAllAudio ret -Audio4_7d192: ; 7d192 (1f:5192) +Audio4_7d192: ld a, [wSoundID] ld l, a ld e, a @@ -189,5 +189,5 @@ Audio4_7d192: ; 7d192 (1f:5192) .asm_7d21f ret -Noise4_endchannel: ; 7d220 (1f:5220) - endchannel
\ No newline at end of file +Noise4_endchannel: + endchannel diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index b3e640af..665efceb 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,114 +1,114 @@ -Music_PalletTown:: ; 822e (2:422e) +Music_PalletTown:: dbw ( $80 | CH0 ), Music_PalletTown_Ch1 dbw CH1, Music_PalletTown_Ch2 dbw CH2, Music_PalletTown_Ch3 -Music_Pokecenter:: ; 8237 (2:4237) +Music_Pokecenter:: dbw ( $80 | CH0 ), Music_Pokecenter_Ch1 dbw CH1, Music_Pokecenter_Ch2 dbw CH2, Music_Pokecenter_Ch3 -Music_Gym:: ; 8240 (2:4240) +Music_Gym:: dbw ( $80 | CH0 ), Music_Gym_Ch1 dbw CH1, Music_Gym_Ch2 dbw CH2, Music_Gym_Ch3 ; Viridian City, Pewter City, Saffron City -Music_Cities1:: ; 8249 (2:4249) +Music_Cities1:: dbw ( $C0 | CH0 ), Music_Cities1_Ch1 dbw CH1, Music_Cities1_Ch2 dbw CH2, Music_Cities1_Ch3 dbw CH3, Music_Cities1_Ch4 ; Cerulean City, Fuchsia City -Music_Cities2:: ; 8255 (2:4255) +Music_Cities2:: dbw ( $80 | CH0 ), Music_Cities2_Ch1 dbw CH1, Music_Cities2_Ch2 dbw CH2, Music_Cities2_Ch3 -Music_Celadon:: ; 825e (2:425e) +Music_Celadon:: dbw ( $80 | CH0 ), Music_Celadon_Ch1 dbw CH1, Music_Celadon_Ch2 dbw CH2, Music_Celadon_Ch3 -Music_Cinnabar:: ; 8267 (2:4267) +Music_Cinnabar:: dbw ( $80 | CH0 ), Music_Cinnabar_Ch1 dbw CH1, Music_Cinnabar_Ch2 dbw CH2, Music_Cinnabar_Ch3 -Music_Vermilion:: ; 8270 (2:4270) +Music_Vermilion:: dbw ( $C0 | CH0 ), Music_Vermilion_Ch1 dbw CH1, Music_Vermilion_Ch2 dbw CH2, Music_Vermilion_Ch3 dbw CH3, Music_Vermilion_Ch4 -Music_Lavender:: ; 827c (2:427c) +Music_Lavender:: dbw ( $C0 | CH0 ), Music_Lavender_Ch1 dbw CH1, Music_Lavender_Ch2 dbw CH2, Music_Lavender_Ch3 dbw CH3, Music_Lavender_Ch4 -Music_SSAnne:: ; 8288 (2:4288) +Music_SSAnne:: dbw ( $80 | CH0 ), Music_SSAnne_Ch1 dbw CH1, Music_SSAnne_Ch2 dbw CH2, Music_SSAnne_Ch3 -Music_MeetProfOak:: ; 8291 (2:4291) +Music_MeetProfOak:: dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1 dbw CH1, Music_MeetProfOak_Ch2 dbw CH2, Music_MeetProfOak_Ch3 -Music_MeetRival:: ; 829a (2:429a) +Music_MeetRival:: dbw ( $80 | CH0 ), Music_MeetRival_Ch1 dbw CH1, Music_MeetRival_Ch2 dbw CH2, Music_MeetRival_Ch3 -Music_MuseumGuy:: ; 82a3 (2:42a3) +Music_MuseumGuy:: dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1 dbw CH1, Music_MuseumGuy_Ch2 dbw CH2, Music_MuseumGuy_Ch3 dbw CH3, Music_MuseumGuy_Ch4 -Music_SafariZone:: ; 82af (2:42af) +Music_SafariZone:: dbw ( $80 | CH0 ), Music_SafariZone_Ch1 dbw CH1, Music_SafariZone_Ch2 dbw CH2, Music_SafariZone_Ch3 -Music_PkmnHealed:: ; 82b8 (2:42b8) +Music_PkmnHealed:: dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1 dbw CH1, Music_PkmnHealed_Ch2 dbw CH2, Music_PkmnHealed_Ch3 ; Routes 1 and 2 -Music_Routes1:: ; 82c1 (2:42c1) +Music_Routes1:: dbw ( $C0 | CH0 ), Music_Routes1_Ch1 dbw CH1, Music_Routes1_Ch2 dbw CH2, Music_Routes1_Ch3 dbw CH3, Music_Routes1_Ch4 ; Routes 24 and 25 -Music_Routes2:: ; 82cd (2:42cd) +Music_Routes2:: dbw ( $C0 | CH0 ), Music_Routes2_Ch1 dbw CH1, Music_Routes2_Ch2 dbw CH2, Music_Routes2_Ch3 dbw CH3, Music_Routes2_Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Music_Routes3:: ; 82d9 (2:42d9) +Music_Routes3:: dbw ( $C0 | CH0 ), Music_Routes3_Ch1 dbw CH1, Music_Routes3_Ch2 dbw CH2, Music_Routes3_Ch3 dbw CH3, Music_Routes3_Ch4 ; Routes 11, 12, 13, 14, 15 -Music_Routes4:: ; 82d5 (2:42d5) +Music_Routes4:: dbw ( $C0 | CH0 ), Music_Routes4_Ch1 dbw CH1, Music_Routes4_Ch2 dbw CH2, Music_Routes4_Ch3 dbw CH3, Music_Routes4_Ch4 ; Route 23, Indigo Plateau -Music_IndigoPlateau:: ; 82f1 (2:42f1) +Music_IndigoPlateau:: dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1 dbw CH1, Music_IndigoPlateau_Ch2 dbw CH2, Music_IndigoPlateau_Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 1862a040..8c128c0e 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,34 +1,34 @@ -Music_GymLeaderBattle:: ; 202be (8:42be) +Music_GymLeaderBattle:: dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1 dbw CH1, Music_GymLeaderBattle_Ch2 dbw CH2, Music_GymLeaderBattle_Ch3 -Music_TrainerBattle:: ; 202c7 (8:42c7) +Music_TrainerBattle:: dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1 dbw CH1, Music_TrainerBattle_Ch2 dbw CH2, Music_TrainerBattle_Ch3 -Music_WildBattle:: ; 202d0 (8:42d0) +Music_WildBattle:: dbw ( $80 | CH0 ), Music_WildBattle_Ch1 dbw CH1, Music_WildBattle_Ch2 dbw CH2, Music_WildBattle_Ch3 -Music_FinalBattle:: ; 202d9 (8:42d9) +Music_FinalBattle:: dbw ( $80 | CH0 ), Music_FinalBattle_Ch1 dbw CH1, Music_FinalBattle_Ch2 dbw CH2, Music_FinalBattle_Ch3 -Music_DefeatedTrainer:: ; 202e2 (8:42e2) +Music_DefeatedTrainer:: dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1 dbw CH1, Music_DefeatedTrainer_Ch2 dbw CH2, Music_DefeatedTrainer_Ch3 -Music_DefeatedWildMon:: ; 202eb (8:42eb) +Music_DefeatedWildMon:: dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1 dbw CH1, Music_DefeatedWildMon_Ch2 dbw CH2, Music_DefeatedWildMon_Ch3 -Music_DefeatedGymLeader:: ; 202f4 (8:42f4) +Music_DefeatedGymLeader:: dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 dbw CH1, Music_DefeatedGymLeader_Ch2 dbw CH2, Music_DefeatedGymLeader_Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index a1bfaad2..c694be9b 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,97 +1,97 @@ -Music_TitleScreen:: ; 7c249 (1f:4249) +Music_TitleScreen:: dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1 dbw CH1, Music_TitleScreen_Ch2 dbw CH2, Music_TitleScreen_Ch3 dbw CH3, Music_TitleScreen_Ch4 -Music_Credits:: ; 7c255 (1f:4255) +Music_Credits:: dbw ( $80 | CH0 ), Music_Credits_Ch1 dbw CH1, Music_Credits_Ch2 dbw CH2, Music_Credits_Ch3 -Music_HallOfFame:: ; 7c25e (1f:425e) +Music_HallOfFame:: dbw ( $80 | CH0 ), Music_HallOfFame_Ch1 dbw CH1, Music_HallOfFame_Ch2 dbw CH2, Music_HallOfFame_Ch3 -Music_OaksLab:: ; 7c267 (1f:4267) +Music_OaksLab:: dbw ( $80 | CH0 ), Music_OaksLab_Ch1 dbw CH1, Music_OaksLab_Ch2 dbw CH2, Music_OaksLab_Ch3 -Music_JigglypuffSong:: ; 7c270 (1f:4270) +Music_JigglypuffSong:: dbw $40, Music_JigglypuffSong_Ch1 dbw CH1, Music_JigglypuffSong_Ch2 -Music_BikeRiding:: ; 7c276 (1f:4276) +Music_BikeRiding:: dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1 dbw CH1, Music_BikeRiding_Ch2 dbw CH2, Music_BikeRiding_Ch3 dbw CH3, Music_BikeRiding_Ch4 -Music_Surfing:: ; 7c282 (1f:4282) +Music_Surfing:: dbw ( $80 | CH0 ), Music_Surfing_Ch1 dbw CH1, Music_Surfing_Ch2 dbw CH2, Music_Surfing_Ch3 -Music_GameCorner:: ; 7c28b (1f:428b) +Music_GameCorner:: dbw ( $80 | CH0 ), Music_GameCorner_Ch1 dbw CH1, Music_GameCorner_Ch2 dbw CH2, Music_GameCorner_Ch3 -Music_IntroBattle:: ; 7c294 (1f:4294) +Music_IntroBattle:: dbw ( $80 | CH0 ), Music_YellowIntro_Ch1 dbw CH1, Music_YellowIntro_Ch2 dbw CH2, Music_YellowIntro_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ -Music_Dungeon1:: ; 7c2a0 (1f:42a0) +Music_Dungeon1:: dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1 dbw CH1, Music_Dungeon1_Ch2 dbw CH2, Music_Dungeon1_Ch3 dbw CH3, Music_Dungeon1_Ch4 ; Viridian Forest, Seafoam Islands -Music_Dungeon2:: ; 7c2ac (1f:42ac) +Music_Dungeon2:: dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1 dbw CH1, Music_Dungeon2_Ch2 dbw CH2, Music_Dungeon2_Ch3 dbw CH3, Music_Dungeon2_Ch4 ; Mt. Moon, Rock Tunnel, Victory Road -Music_Dungeon3:: ; 7c2b8 (1f:42b8) +Music_Dungeon3:: dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1 dbw CH1, Music_Dungeon3_Ch2 dbw CH2, Music_Dungeon3_Ch3 dbw CH3, Music_Dungeon3_Ch4 -Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) +Music_CinnabarMansion:: dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1 dbw CH1, Music_CinnabarMansion_Ch2 dbw CH2, Music_CinnabarMansion_Ch3 dbw CH3, Music_CinnabarMansion_Ch4 -Music_PokemonTower:: ; 7c2d0 (1f:42d0) +Music_PokemonTower:: dbw ( $80 | CH0 ), Music_PokemonTower_Ch1 dbw CH1, Music_PokemonTower_Ch2 dbw CH2, Music_PokemonTower_Ch3 -Music_SilphCo:: ; 7c2d9 (1f:42d9) +Music_SilphCo:: dbw ( $80 | CH0 ), Music_SilphCo_Ch1 dbw CH1, Music_SilphCo_Ch2 dbw CH2, Music_SilphCo_Ch3 -Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) +Music_MeetEvilTrainer:: dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1 dbw CH1, Music_MeetEvilTrainer_Ch2 dbw CH2, Music_MeetEvilTrainer_Ch3 -Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) +Music_MeetFemaleTrainer:: dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1 dbw CH1, Music_MeetFemaleTrainer_Ch2 dbw CH2, Music_MeetFemaleTrainer_Ch3 -Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) +Music_MeetMaleTrainer:: dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1 dbw CH1, Music_MeetMaleTrainer_Ch2 dbw CH2, Music_MeetMaleTrainer_Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 8a24fcb5..fdbcb5f3 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,377 +1,377 @@ SFX_Headers_1:: dbw -1, -1 ; padding -SFX_Snare1_1:: ; 8003 (2:4003) +SFX_Snare1_1:: dbw CH7, SFX_Snare1_1_Ch1 -SFX_Snare2_1:: ; 8006 (2:4006) +SFX_Snare2_1:: dbw CH7, SFX_Snare2_1_Ch1 -SFX_Snare3_1:: ; 8009 (2:4009) +SFX_Snare3_1:: dbw CH7, SFX_Snare3_1_Ch1 -SFX_Snare4_1:: ; 800c (2:400c) +SFX_Snare4_1:: dbw CH7, SFX_Snare4_1_Ch1 -SFX_Snare5_1:: ; 800f (2:400f) +SFX_Snare5_1:: dbw CH7, SFX_Snare5_1_Ch1 -SFX_Triangle1_1:: ; 8012 (2:4012) +SFX_Triangle1_1:: dbw CH7, SFX_Triangle1_1_Ch1 -SFX_Triangle2_1:: ; 8015 (2:4015) +SFX_Triangle2_1:: dbw CH7, SFX_Triangle2_1_Ch1 -SFX_Snare6_1:: ; 8018 (2:4018) +SFX_Snare6_1:: dbw CH7, SFX_Snare6_1_Ch1 -SFX_Snare7_1:: ; 801b (2:401b) +SFX_Snare7_1:: dbw CH7, SFX_Snare7_1_Ch1 -SFX_Snare8_1:: ; 801e (2:401e) +SFX_Snare8_1:: dbw CH7, SFX_Snare8_1_Ch1 -SFX_Snare9_1:: ; 8021 (2:4021) +SFX_Snare9_1:: dbw CH7, SFX_Snare9_1_Ch1 -SFX_Cymbal1_1:: ; 8024 (2:4024) +SFX_Cymbal1_1:: dbw CH7, SFX_Cymbal1_1_Ch1 -SFX_Cymbal2_1:: ; 8027 (2:4027) +SFX_Cymbal2_1:: dbw CH7, SFX_Cymbal2_1_Ch1 -SFX_Cymbal3_1:: ; 802a (2:402a) +SFX_Cymbal3_1:: dbw CH7, SFX_Cymbal3_1_Ch1 -SFX_Muted_Snare1_1:: ; 802d (2:402d) +SFX_Muted_Snare1_1:: dbw CH7, SFX_Muted_Snare1_1_Ch1 -SFX_Triangle3_1:: ; 8030 (2:4030) +SFX_Triangle3_1:: dbw CH7, SFX_Triangle3_1_Ch1 -SFX_Muted_Snare2_1:: ; 8033 (2:4033) +SFX_Muted_Snare2_1:: dbw CH7, SFX_Muted_Snare2_1_Ch1 -SFX_Muted_Snare3_1:: ; 8036 (2:4036) +SFX_Muted_Snare3_1:: dbw CH7, SFX_Muted_Snare3_1_Ch1 -SFX_Muted_Snare4_1:: ; 8039 (2:4039) +SFX_Muted_Snare4_1:: dbw CH7, SFX_Muted_Snare4_1_Ch1 -SFX_Cry00_1:: ; 803c (2:403c) +SFX_Cry00_1:: dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1 dbw CH5, SFX_Cry00_1_Ch2 dbw CH7, SFX_Cry00_1_Ch3 -SFX_Cry01_1:: ; 8045 (2:4045) +SFX_Cry01_1:: dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1 dbw CH5, SFX_Cry01_1_Ch2 dbw CH7, SFX_Cry01_1_Ch3 -SFX_Cry02_1:: ; 804e (2:404e) +SFX_Cry02_1:: dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1 dbw CH5, SFX_Cry02_1_Ch2 dbw CH7, SFX_Cry02_1_Ch3 -SFX_Cry03_1:: ; 8057 (2:4057) +SFX_Cry03_1:: dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1 dbw CH5, SFX_Cry03_1_Ch2 dbw CH7, SFX_Cry03_1_Ch3 -SFX_Cry04_1:: ; 8060 (2:4060) +SFX_Cry04_1:: dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1 dbw CH5, SFX_Cry04_1_Ch2 dbw CH7, SFX_Cry04_1_Ch3 -SFX_Cry05_1:: ; 8069 (2:4069) +SFX_Cry05_1:: dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1 dbw CH5, SFX_Cry05_1_Ch2 dbw CH7, SFX_Cry05_1_Ch3 -SFX_Cry06_1:: ; 8072 (2:4072) +SFX_Cry06_1:: dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1 dbw CH5, SFX_Cry06_1_Ch2 dbw CH7, SFX_Cry06_1_Ch3 -SFX_Cry07_1:: ; 807b (2:407b) +SFX_Cry07_1:: dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1 dbw CH5, SFX_Cry07_1_Ch2 dbw CH7, SFX_Cry07_1_Ch3 -SFX_Cry08_1:: ; 8084 (2:4084) +SFX_Cry08_1:: dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1 dbw CH5, SFX_Cry08_1_Ch2 dbw CH7, SFX_Cry08_1_Ch3 -SFX_Cry09_1:: ; 808d (2:408d) +SFX_Cry09_1:: dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1 dbw CH5, SFX_Cry09_1_Ch2 dbw CH7, SFX_Cry09_1_Ch3 -SFX_Cry0A_1:: ; 8096 (2:4096) +SFX_Cry0A_1:: dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1 dbw CH5, SFX_Cry0A_1_Ch2 dbw CH7, SFX_Cry0A_1_Ch3 -SFX_Cry0B_1:: ; 809f (2:409f) +SFX_Cry0B_1:: dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1 dbw CH5, SFX_Cry0B_1_Ch2 dbw CH7, SFX_Cry0B_1_Ch3 -SFX_Cry0C_1:: ; 80a8 (2:40a8) +SFX_Cry0C_1:: dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1 dbw CH5, SFX_Cry0C_1_Ch2 dbw CH7, SFX_Cry0C_1_Ch3 -SFX_Cry0D_1:: ; 80b1 (2:40b1) +SFX_Cry0D_1:: dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1 dbw CH5, SFX_Cry0D_1_Ch2 dbw CH7, SFX_Cry0D_1_Ch3 -SFX_Cry0E_1:: ; 80ba (2:40ba) +SFX_Cry0E_1:: dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1 dbw CH5, SFX_Cry0E_1_Ch2 dbw CH7, SFX_Cry0E_1_Ch3 -SFX_Cry0F_1:: ; 80c3 (2:40c3) +SFX_Cry0F_1:: dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1 dbw CH5, SFX_Cry0F_1_Ch2 dbw CH7, SFX_Cry0F_1_Ch3 -SFX_Cry10_1:: ; 80cc (2:40cc) +SFX_Cry10_1:: dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1 dbw CH5, SFX_Cry10_1_Ch2 dbw CH7, SFX_Cry10_1_Ch3 -SFX_Cry11_1:: ; 80d5 (2:40d5) +SFX_Cry11_1:: dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1 dbw CH5, SFX_Cry11_1_Ch2 dbw CH7, SFX_Cry11_1_Ch3 -SFX_Cry12_1:: ; 80de (2:40de) +SFX_Cry12_1:: dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1 dbw CH5, SFX_Cry12_1_Ch2 dbw CH7, SFX_Cry12_1_Ch3 -SFX_Cry13_1:: ; 80e7 (2:40e7) +SFX_Cry13_1:: dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1 dbw CH5, SFX_Cry13_1_Ch2 dbw CH7, SFX_Cry13_1_Ch3 -SFX_Cry14_1:: ; 80f0 (2:40f0) +SFX_Cry14_1:: dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1 dbw CH5, SFX_Cry14_1_Ch2 dbw CH7, SFX_Cry14_1_Ch3 -SFX_Cry15_1:: ; 80f9 (2:40f9) +SFX_Cry15_1:: dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1 dbw CH5, SFX_Cry15_1_Ch2 dbw CH7, SFX_Cry15_1_Ch3 -SFX_Cry16_1:: ; 8102 (2:4102) +SFX_Cry16_1:: dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1 dbw CH5, SFX_Cry16_1_Ch2 dbw CH7, SFX_Cry16_1_Ch3 -SFX_Cry17_1:: ; 810b (2:410b) +SFX_Cry17_1:: dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1 dbw CH5, SFX_Cry17_1_Ch2 dbw CH7, SFX_Cry17_1_Ch3 -SFX_Cry18_1:: ; 8114 (2:4114) +SFX_Cry18_1:: dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1 dbw CH5, SFX_Cry18_1_Ch2 dbw CH7, SFX_Cry18_1_Ch3 -SFX_Cry19_1:: ; 811d (2:411d) +SFX_Cry19_1:: dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1 dbw CH5, SFX_Cry19_1_Ch2 dbw CH7, SFX_Cry19_1_Ch3 -SFX_Cry1A_1:: ; 8126 (2:4126) +SFX_Cry1A_1:: dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1 dbw CH5, SFX_Cry1A_1_Ch2 dbw CH7, SFX_Cry1A_1_Ch3 -SFX_Cry1B_1:: ; 812f (2:412f) +SFX_Cry1B_1:: dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1 dbw CH5, SFX_Cry1B_1_Ch2 dbw CH7, SFX_Cry1B_1_Ch3 -SFX_Cry1C_1:: ; 8138 (2:4138) +SFX_Cry1C_1:: dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1 dbw CH5, SFX_Cry1C_1_Ch2 dbw CH7, SFX_Cry1C_1_Ch3 -SFX_Cry1D_1:: ; 8141 (2:4141) +SFX_Cry1D_1:: dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1 dbw CH5, SFX_Cry1D_1_Ch2 dbw CH7, SFX_Cry1D_1_Ch3 -SFX_Cry1E_1:: ; 814a (2:414a) +SFX_Cry1E_1:: dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1 dbw CH5, SFX_Cry1E_1_Ch2 dbw CH7, SFX_Cry1E_1_Ch3 -SFX_Cry1F_1:: ; 8153 (2:4153) +SFX_Cry1F_1:: dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1 dbw CH5, SFX_Cry1F_1_Ch2 dbw CH7, SFX_Cry1F_1_Ch3 -SFX_Cry20_1:: ; 815c (2:415c) +SFX_Cry20_1:: dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1 dbw CH5, SFX_Cry20_1_Ch2 dbw CH7, SFX_Cry20_1_Ch3 -SFX_Cry21_1:: ; 8165 (2:4165) +SFX_Cry21_1:: dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1 dbw CH5, SFX_Cry21_1_Ch2 dbw CH7, SFX_Cry21_1_Ch3 -SFX_Cry22_1:: ; 816e (2:416e) +SFX_Cry22_1:: dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1 dbw CH5, SFX_Cry22_1_Ch2 dbw CH7, SFX_Cry22_1_Ch3 -SFX_Cry23_1:: ; 8177 (2:4177) +SFX_Cry23_1:: dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1 dbw CH5, SFX_Cry23_1_Ch2 dbw CH7, SFX_Cry23_1_Ch3 -SFX_Cry24_1:: ; 8180 (2:4180) +SFX_Cry24_1:: dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1 dbw CH5, SFX_Cry24_1_Ch2 dbw CH7, SFX_Cry24_1_Ch3 -SFX_Cry25_1:: ; 8189 (2:4189) +SFX_Cry25_1:: dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1 dbw CH5, SFX_Cry25_1_Ch2 dbw CH7, SFX_Cry25_1_Ch3 -SFX_Get_Item1_1:: ; 8192 (2:4192) +SFX_Get_Item1_1:: dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1 dbw CH5, SFX_Get_Item1_1_Ch2 dbw CH6, SFX_Get_Item1_1_Ch3 -SFX_Get_Item2_1:: ; 819b (2:419b) +SFX_Get_Item2_1:: dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1 dbw CH5, SFX_Get_Item2_1_Ch2 dbw CH6, SFX_Get_Item2_1_Ch3 -SFX_Tink_1:: ; 81a4 (2:41a4) +SFX_Tink_1:: dbw CH4, SFX_Tink_1_Ch1 -SFX_Heal_HP_1:: ; 81a7 (2:41a7) +SFX_Heal_HP_1:: dbw CH4, SFX_Heal_HP_1_Ch1 -SFX_Heal_Ailment_1:: ; 81aa (2:41aa) +SFX_Heal_Ailment_1:: dbw CH4, SFX_Heal_Ailment_1_Ch1 -SFX_Start_Menu_1:: ; 81ad (2:41ad) +SFX_Start_Menu_1:: dbw CH7, SFX_Start_Menu_1_Ch1 -SFX_Press_AB_1:: ; 81b0 (2:41b0) +SFX_Press_AB_1:: dbw CH4, SFX_Press_AB_1_Ch1 -SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) +SFX_Pokedex_Rating_1:: dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1 dbw CH5, SFX_Pokedex_Rating_1_Ch2 dbw CH6, SFX_Pokedex_Rating_1_Ch3 -SFX_Get_Key_Item_1:: ; 81bc (2:41bc) +SFX_Get_Key_Item_1:: dbw ( $80 | CH4 ), SFX_Get_Key_Item_1_Ch1 dbw CH5, SFX_Get_Key_Item_1_Ch2 dbw CH6, SFX_Get_Key_Item_1_Ch3 -SFX_Poisoned_1:: ; 81c5 (2:41c5) +SFX_Poisoned_1:: dbw CH4, SFX_Poisoned_1_Ch1 -SFX_Trade_Machine_1:: ; 81c8 (2:41c8) +SFX_Trade_Machine_1:: dbw CH4, SFX_Trade_Machine_1_Ch1 -SFX_Turn_On_PC_1:: ; 81cb (2:41cb) +SFX_Turn_On_PC_1:: dbw CH4, SFX_Turn_On_PC_1_Ch1 -SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) +SFX_Turn_Off_PC_1:: dbw CH4, SFX_Turn_Off_PC_1_Ch1 -SFX_Enter_PC_1:: ; 81d1 (2:41d1) +SFX_Enter_PC_1:: dbw CH4, SFX_Enter_PC_1_Ch1 -SFX_Shrink_1:: ; 81d4 (2:41d4) +SFX_Shrink_1:: dbw CH4, SFX_Shrink_1_Ch1 -SFX_Switch_1:: ; 81d7 (2:41d7) +SFX_Switch_1:: dbw CH4, SFX_Switch_1_Ch1 -SFX_Healing_Machine_1:: ; 81da (2:41da) +SFX_Healing_Machine_1:: dbw CH4, SFX_Healing_Machine_1_Ch1 -SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) +SFX_Teleport_Exit1_1:: dbw CH4, SFX_Teleport_Exit1_1_Ch1 -SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) +SFX_Teleport_Enter1_1:: dbw CH4, SFX_Teleport_Enter1_1_Ch1 -SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) +SFX_Teleport_Exit2_1:: dbw CH4, SFX_Teleport_Exit2_1_Ch1 -SFX_Ledge_1:: ; 81e6 (2:41e6) +SFX_Ledge_1:: dbw CH4, SFX_Ledge_1_Ch1 -SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) +SFX_Teleport_Enter2_1:: dbw CH7, SFX_Teleport_Enter2_1_Ch1 -SFX_Fly_1:: ; 81ec (2:41ec) +SFX_Fly_1:: dbw CH7, SFX_Fly_1_Ch1 -SFX_Denied_1:: ; 81ef (2:41ef) +SFX_Denied_1:: dbw ( $40 | CH4 ), SFX_Denied_1_Ch1 dbw CH5, SFX_Denied_1_Ch2 -SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) +SFX_Arrow_Tiles_1:: dbw CH4, SFX_Arrow_Tiles_1_Ch1 -SFX_Push_Boulder_1:: ; 81f8 (2:41f8) +SFX_Push_Boulder_1:: dbw CH7, SFX_Push_Boulder_1_Ch1 -SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) +SFX_SS_Anne_Horn_1:: dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1 dbw CH5, SFX_SS_Anne_Horn_1_Ch2 -SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) +SFX_Withdraw_Deposit_1:: dbw CH4, SFX_Withdraw_Deposit_1_Ch1 -SFX_Cut_1:: ; 8204 (2:4204) +SFX_Cut_1:: dbw CH7, SFX_Cut_1_Ch1 -SFX_Go_Inside_1:: ; 8207 (2:4207) +SFX_Go_Inside_1:: dbw CH7, SFX_Go_Inside_1_Ch1 -SFX_Swap_1:: ; 820a (2:420a) +SFX_Swap_1:: dbw ( $40 | CH4 ), SFX_Swap_1_Ch1 dbw CH5, SFX_Swap_1_Ch2 -SFX_59_1:: ; 8210 (2:4210) +SFX_59_1:: dbw ( $40 | CH4 ), SFX_59_1_Ch1 dbw CH5, SFX_59_1_Ch2 -SFX_Purchase_1:: ; 8216 (2:4216) +SFX_Purchase_1:: dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1 dbw CH5, SFX_Purchase_1_Ch2 -SFX_Collision_1:: ; 821c (2:421c) +SFX_Collision_1:: dbw CH4, SFX_Collision_1_Ch1 -SFX_Go_Outside_1:: ; 821f (2:421f) +SFX_Go_Outside_1:: dbw CH7, SFX_Go_Outside_1_Ch1 -SFX_Save_1:: ; 8222 (2:4222) +SFX_Save_1:: dbw ( $40 | CH4 ), SFX_Save_1_Ch1 dbw CH5, SFX_Save_1_Ch2 -SFX_Pokeflute:: ; 8228 (2:4228) +SFX_Pokeflute:: dbw CH2, SFX_Pokeflute_Ch1 -SFX_Safari_Zone_PA:: ; 822b (2:422b) +SFX_Safari_Zone_PA:: dbw CH4, SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index f3d0720e..2f517d10 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,473 +1,473 @@ SFX_Headers_2:: dbw -1, -1 ; padding -SFX_Snare1_2:: ; 20003 (8:4003) +SFX_Snare1_2:: dbw CH7, SFX_Snare1_2_Ch1 -SFX_Snare2_2:: ; 20006 (8:4006) +SFX_Snare2_2:: dbw CH7, SFX_Snare2_2_Ch1 -SFX_Snare3_2:: ; 20009 (8:4009) +SFX_Snare3_2:: dbw CH7, SFX_Snare3_2_Ch1 -SFX_Snare4_2:: ; 2000c (8:400c) +SFX_Snare4_2:: dbw CH7, SFX_Snare4_2_Ch1 -SFX_Snare5_2:: ; 2000f (8:400f) +SFX_Snare5_2:: dbw CH7, SFX_Snare5_2_Ch1 -SFX_Triangle1_2:: ; 20012 (8:4012) +SFX_Triangle1_2:: dbw CH7, SFX_Triangle1_2_Ch1 -SFX_Triangle2_2:: ; 20015 (8:4015) +SFX_Triangle2_2:: dbw CH7, SFX_Triangle2_2_Ch1 -SFX_Snare6_2:: ; 20018 (8:4018) +SFX_Snare6_2:: dbw CH7, SFX_Snare6_2_Ch1 -SFX_Snare7_2:: ; 2001b (8:401b) +SFX_Snare7_2:: dbw CH7, SFX_Snare7_2_Ch1 -SFX_Snare8_2:: ; 2001e (8:401e) +SFX_Snare8_2:: dbw CH7, SFX_Snare8_2_Ch1 -SFX_Snare9_2:: ; 20021 (8:4021) +SFX_Snare9_2:: dbw CH7, SFX_Snare9_2_Ch1 -SFX_Cymbal1_2:: ; 20024 (8:4024) +SFX_Cymbal1_2:: dbw CH7, SFX_Cymbal1_2_Ch1 -SFX_Cymbal2_2:: ; 20027 (8:4027) +SFX_Cymbal2_2:: dbw CH7, SFX_Cymbal2_2_Ch1 -SFX_Cymbal3_2:: ; 2002a (8:402a) +SFX_Cymbal3_2:: dbw CH7, SFX_Cymbal3_2_Ch1 -SFX_Muted_Snare1_2:: ; 2002d (8:402d) +SFX_Muted_Snare1_2:: dbw CH7, SFX_Muted_Snare1_2_Ch1 -SFX_Triangle3_2:: ; 20030 (8:4030) +SFX_Triangle3_2:: dbw CH7, SFX_Triangle3_2_Ch1 -SFX_Muted_Snare2_2:: ; 20033 (8:4033) +SFX_Muted_Snare2_2:: dbw CH7, SFX_Muted_Snare2_2_Ch1 -SFX_Muted_Snare3_2:: ; 20036 (8:4036) +SFX_Muted_Snare3_2:: dbw CH7, SFX_Muted_Snare3_2_Ch1 -SFX_Muted_Snare4_2:: ; 20039 (8:4039) +SFX_Muted_Snare4_2:: dbw CH7, SFX_Muted_Snare4_2_Ch1 -SFX_Cry00_2:: ; 2003c (8:403c) +SFX_Cry00_2:: dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1 dbw CH5, SFX_Cry00_2_Ch2 dbw CH7, SFX_Cry00_2_Ch3 -SFX_Cry01_2:: ; 20045 (8:4045) +SFX_Cry01_2:: dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1 dbw CH5, SFX_Cry01_2_Ch2 dbw CH7, SFX_Cry01_2_Ch3 -SFX_Cry02_2:: ; 2004e (8:404e) +SFX_Cry02_2:: dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1 dbw CH5, SFX_Cry02_2_Ch2 dbw CH7, SFX_Cry02_2_Ch3 -SFX_Cry03_2:: ; 20057 (8:4057) +SFX_Cry03_2:: dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1 dbw CH5, SFX_Cry03_2_Ch2 dbw CH7, SFX_Cry03_2_Ch3 -SFX_Cry04_2:: ; 20060 (8:4060) +SFX_Cry04_2:: dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1 dbw CH5, SFX_Cry04_2_Ch2 dbw CH7, SFX_Cry04_2_Ch3 -SFX_Cry05_2:: ; 20069 (8:4069) +SFX_Cry05_2:: dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1 dbw CH5, SFX_Cry05_2_Ch2 dbw CH7, SFX_Cry05_2_Ch3 -SFX_Cry06_2:: ; 20072 (8:4072) +SFX_Cry06_2:: dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1 dbw CH5, SFX_Cry06_2_Ch2 dbw CH7, SFX_Cry06_2_Ch3 -SFX_Cry07_2:: ; 2007b (8:407b) +SFX_Cry07_2:: dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1 dbw CH5, SFX_Cry07_2_Ch2 dbw CH7, SFX_Cry07_2_Ch3 -SFX_Cry08_2:: ; 20084 (8:4084) +SFX_Cry08_2:: dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1 dbw CH5, SFX_Cry08_2_Ch2 dbw CH7, SFX_Cry08_2_Ch3 -SFX_Cry09_2:: ; 2008d (8:408d) +SFX_Cry09_2:: dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1 dbw CH5, SFX_Cry09_2_Ch2 dbw CH7, SFX_Cry09_2_Ch3 -SFX_Cry0A_2:: ; 20096 (8:4096) +SFX_Cry0A_2:: dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1 dbw CH5, SFX_Cry0A_2_Ch2 dbw CH7, SFX_Cry0A_2_Ch3 -SFX_Cry0B_2:: ; 2009f (8:409f) +SFX_Cry0B_2:: dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1 dbw CH5, SFX_Cry0B_2_Ch2 dbw CH7, SFX_Cry0B_2_Ch3 -SFX_Cry0C_2:: ; 200a8 (8:40a8) +SFX_Cry0C_2:: dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1 dbw CH5, SFX_Cry0C_2_Ch2 dbw CH7, SFX_Cry0C_2_Ch3 -SFX_Cry0D_2:: ; 200b1 (8:40b1) +SFX_Cry0D_2:: dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1 dbw CH5, SFX_Cry0D_2_Ch2 dbw CH7, SFX_Cry0D_2_Ch3 -SFX_Cry0E_2:: ; 200ba (8:40ba) +SFX_Cry0E_2:: dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1 dbw CH5, SFX_Cry0E_2_Ch2 dbw CH7, SFX_Cry0E_2_Ch3 -SFX_Cry0F_2:: ; 200c3 (8:40c3) +SFX_Cry0F_2:: dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1 dbw CH5, SFX_Cry0F_2_Ch2 dbw CH7, SFX_Cry0F_2_Ch3 -SFX_Cry10_2:: ; 200cc (8:40cc) +SFX_Cry10_2:: dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1 dbw CH5, SFX_Cry10_2_Ch2 dbw CH7, SFX_Cry10_2_Ch3 -SFX_Cry11_2:: ; 200d5 (8:40d5) +SFX_Cry11_2:: dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1 dbw CH5, SFX_Cry11_2_Ch2 dbw CH7, SFX_Cry11_2_Ch3 -SFX_Cry12_2:: ; 200de (8:40de) +SFX_Cry12_2:: dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1 dbw CH5, SFX_Cry12_2_Ch2 dbw CH7, SFX_Cry12_2_Ch3 -SFX_Cry13_2:: ; 200e7 (8:40e7) +SFX_Cry13_2:: dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1 dbw CH5, SFX_Cry13_2_Ch2 dbw CH7, SFX_Cry13_2_Ch3 -SFX_Cry14_2:: ; 200f0 (8:40f0) +SFX_Cry14_2:: dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1 dbw CH5, SFX_Cry14_2_Ch2 dbw CH7, SFX_Cry14_2_Ch3 -SFX_Cry15_2:: ; 200f9 (8:40f9) +SFX_Cry15_2:: dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1 dbw CH5, SFX_Cry15_2_Ch2 dbw CH7, SFX_Cry15_2_Ch3 -SFX_Cry16_2:: ; 20102 (8:4102) +SFX_Cry16_2:: dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1 dbw CH5, SFX_Cry16_2_Ch2 dbw CH7, SFX_Cry16_2_Ch3 -SFX_Cry17_2:: ; 2010b (8:410b) +SFX_Cry17_2:: dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1 dbw CH5, SFX_Cry17_2_Ch2 dbw CH7, SFX_Cry17_2_Ch3 -SFX_Cry18_2:: ; 20114 (8:4114) +SFX_Cry18_2:: dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1 dbw CH5, SFX_Cry18_2_Ch2 dbw CH7, SFX_Cry18_2_Ch3 -SFX_Cry19_2:: ; 2011d (8:411d) +SFX_Cry19_2:: dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1 dbw CH5, SFX_Cry19_2_Ch2 dbw CH7, SFX_Cry19_2_Ch3 -SFX_Cry1A_2:: ; 20126 (8:4126) +SFX_Cry1A_2:: dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1 dbw CH5, SFX_Cry1A_2_Ch2 dbw CH7, SFX_Cry1A_2_Ch3 -SFX_Cry1B_2:: ; 2012f (8:412f) +SFX_Cry1B_2:: dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1 dbw CH5, SFX_Cry1B_2_Ch2 dbw CH7, SFX_Cry1B_2_Ch3 -SFX_Cry1C_2:: ; 20138 (8:4138) +SFX_Cry1C_2:: dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1 dbw CH5, SFX_Cry1C_2_Ch2 dbw CH7, SFX_Cry1C_2_Ch3 -SFX_Cry1D_2:: ; 20141 (8:4141) +SFX_Cry1D_2:: dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1 dbw CH5, SFX_Cry1D_2_Ch2 dbw CH7, SFX_Cry1D_2_Ch3 -SFX_Cry1E_2:: ; 2014a (8:414a) +SFX_Cry1E_2:: dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1 dbw CH5, SFX_Cry1E_2_Ch2 dbw CH7, SFX_Cry1E_2_Ch3 -SFX_Cry1F_2:: ; 20153 (8:4153) +SFX_Cry1F_2:: dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1 dbw CH5, SFX_Cry1F_2_Ch2 dbw CH7, SFX_Cry1F_2_Ch3 -SFX_Cry20_2:: ; 2015c (8:415c) +SFX_Cry20_2:: dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1 dbw CH5, SFX_Cry20_2_Ch2 dbw CH7, SFX_Cry20_2_Ch3 -SFX_Cry21_2:: ; 20165 (8:4165) +SFX_Cry21_2:: dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1 dbw CH5, SFX_Cry21_2_Ch2 dbw CH7, SFX_Cry21_2_Ch3 -SFX_Cry22_2:: ; 2016e (8:416e) +SFX_Cry22_2:: dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1 dbw CH5, SFX_Cry22_2_Ch2 dbw CH7, SFX_Cry22_2_Ch3 -SFX_Cry23_2:: ; 20177 (8:4177) +SFX_Cry23_2:: dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1 dbw CH5, SFX_Cry23_2_Ch2 dbw CH7, SFX_Cry23_2_Ch3 -SFX_Cry24_2:: ; 20180 (8:4180) +SFX_Cry24_2:: dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1 dbw CH5, SFX_Cry24_2_Ch2 dbw CH7, SFX_Cry24_2_Ch3 -SFX_Cry25_2:: ; 20189 (8:4189) +SFX_Cry25_2:: dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1 dbw CH5, SFX_Cry25_2_Ch2 dbw CH7, SFX_Cry25_2_Ch3 -SFX_Level_Up:: ; 20192 (8:4192) +SFX_Level_Up:: dbw ( $80 | CH4 ), SFX_Level_Up_Ch1 dbw CH5, SFX_Level_Up_Ch2 dbw CH6, SFX_Level_Up_Ch3 -SFX_Get_Item2_2:: ; 2019b (8:419b) +SFX_Get_Item2_2:: dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1 dbw CH5, SFX_Get_Item2_2_Ch2 dbw CH6, SFX_Get_Item2_2_Ch3 -SFX_Tink_2:: ; 201a4 (8:41a4) +SFX_Tink_2:: dbw CH4, SFX_Tink_2_Ch1 -SFX_Heal_HP_2:: ; 201a7 (8:41a7) +SFX_Heal_HP_2:: dbw CH4, SFX_Heal_HP_2_Ch1 -SFX_Heal_Ailment_2:: ; 201aa (8:41aa) +SFX_Heal_Ailment_2:: dbw CH4, SFX_Heal_Ailment_2_Ch1 -SFX_Start_Menu_2:: ; 201ad (8:41ad) +SFX_Start_Menu_2:: dbw CH7, SFX_Start_Menu_2_Ch1 -SFX_Press_AB_2:: ; 201b0 (8:41b0) +SFX_Press_AB_2:: dbw CH4, SFX_Press_AB_2_Ch1 -SFX_Ball_Toss:: ; 201b3 (8:41b3) +SFX_Ball_Toss:: dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1 dbw CH5, SFX_Ball_Toss_Ch2 -SFX_Ball_Poof:: ; 201b9 (8:41b9) +SFX_Ball_Poof:: dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1 dbw CH7, SFX_Ball_Poof_Ch2 -SFX_Faint_Thud:: ; 201bf (8:41bf) +SFX_Faint_Thud:: dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1 dbw CH7, SFX_Faint_Thud_Ch2 -SFX_Run:: ; 201c5 (8:41c5) +SFX_Run:: dbw CH7, SFX_Run_Ch1 -SFX_Dex_Page_Added:: ; 201c8 (8:41c8) +SFX_Dex_Page_Added:: dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1 dbw CH5, SFX_Dex_Page_Added_Ch2 -SFX_Caught_Mon:: ; 201ce (8:41ce) +SFX_Caught_Mon:: dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1 dbw CH5, SFX_Caught_Mon_Ch2 dbw CH6, SFX_Caught_Mon_Ch3 -SFX_Peck:: ; 201d7 (8:41d7) +SFX_Peck:: dbw CH7, SFX_Peck_Ch1 -SFX_Faint_Fall:: ; 201da (8:41da) +SFX_Faint_Fall:: dbw CH4, SFX_Faint_Fall_Ch1 -SFX_Battle_09:: ; 201dd (8:41dd) +SFX_Battle_09:: dbw CH4, SFX_Battle_09_Ch1 -SFX_Pound:: ; 201e0 (8:41e0) +SFX_Pound:: dbw CH7, SFX_Pound_Ch1 -SFX_Battle_0B:: ; 201e3 (8:41e3) +SFX_Battle_0B:: dbw CH7, SFX_Battle_0B_Ch1 -SFX_Battle_0C:: ; 201e6 (8:41e6) +SFX_Battle_0C:: dbw CH7, SFX_Battle_0C_Ch1 -SFX_Battle_0D:: ; 201e9 (8:41e9) +SFX_Battle_0D:: dbw CH7, SFX_Battle_0D_Ch1 -SFX_Battle_0E:: ; 201ec (8:41ec) +SFX_Battle_0E:: dbw CH7, SFX_Battle_0E_Ch1 -SFX_Battle_0F:: ; 201ef (8:41ef) +SFX_Battle_0F:: dbw CH7, SFX_Battle_0F_Ch1 -SFX_Damage:: ; 201f2 (8:41f2) +SFX_Damage:: dbw CH7, SFX_Damage_Ch1 -SFX_Not_Very_Effective:: ; 201f5 (8:41f5) +SFX_Not_Very_Effective:: dbw CH7, SFX_Not_Very_Effective_Ch1 -SFX_Battle_12:: ; 201f8 (8:41f8) +SFX_Battle_12:: dbw CH7, SFX_Battle_12_Ch1 -SFX_Battle_13:: ; 201fb (8:41fb) +SFX_Battle_13:: dbw CH7, SFX_Battle_13_Ch1 -SFX_Battle_14:: ; 201fe (8:41fe) +SFX_Battle_14:: dbw CH7, SFX_Battle_14_Ch1 -SFX_Vine_Whip:: ; 20201 (8:4201) +SFX_Vine_Whip:: dbw CH7, SFX_Vine_Whip_Ch1 -SFX_Battle_16:: ; 20204 (8:4204) +SFX_Battle_16:: dbw CH7, SFX_Battle_16_Ch1 -SFX_Battle_17:: ; 20207 (8:4207) +SFX_Battle_17:: dbw CH7, SFX_Battle_17_Ch1 -SFX_Battle_18:: ; 2020a (8:420a) +SFX_Battle_18:: dbw CH7, SFX_Battle_18_Ch1 -SFX_Battle_19:: ; 2020d (8:420d) +SFX_Battle_19:: dbw CH7, SFX_Battle_19_Ch1 -SFX_Super_Effective:: ; 20210 (8:4210) +SFX_Super_Effective:: dbw CH7, SFX_Super_Effective_Ch1 -SFX_Battle_1B:: ; 20213 (8:4213) +SFX_Battle_1B:: dbw CH7, SFX_Battle_1B_Ch1 -SFX_Battle_1C:: ; 20216 (8:4216) +SFX_Battle_1C:: dbw CH7, SFX_Battle_1C_Ch1 -SFX_Doubleslap:: ; 20219 (8:4219) +SFX_Doubleslap:: dbw CH7, SFX_Doubleslap_Ch1 -SFX_Battle_1E:: ; 2021c (8:421c) +SFX_Battle_1E:: dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1 dbw CH7, SFX_Battle_1E_Ch2 -SFX_Horn_Drill:: ; 20222 (8:4222) +SFX_Horn_Drill:: dbw CH7, SFX_Horn_Drill_Ch1 -SFX_Battle_20:: ; 20225 (8:4225) +SFX_Battle_20:: dbw CH7, SFX_Battle_20_Ch1 -SFX_Battle_21:: ; 20228 (8:4228) +SFX_Battle_21:: dbw CH7, SFX_Battle_21_Ch1 -SFX_Battle_22:: ; 2022b (8:422b) +SFX_Battle_22:: dbw CH7, SFX_Battle_22_Ch1 -SFX_Battle_23:: ; 2022e (8:422e) +SFX_Battle_23:: dbw CH7, SFX_Battle_23_Ch1 -SFX_Battle_24:: ; 20231 (8:4231) +SFX_Battle_24:: dbw ( $40 | CH4 ), SFX_Battle_24_Ch1 dbw CH7, SFX_Battle_24_Ch2 -SFX_Battle_25:: ; 20237 (8:4237) +SFX_Battle_25:: dbw CH7, SFX_Battle_25_Ch1 -SFX_Battle_26:: ; 2023a (8:423a) +SFX_Battle_26:: dbw CH7, SFX_Battle_26_Ch1 -SFX_Battle_27:: ; 2023d (8:423d) +SFX_Battle_27:: dbw ( $80 | CH4 ), SFX_Battle_27_Ch1 dbw CH5, SFX_Battle_27_Ch2 dbw CH7, SFX_Battle_27_Ch3 -SFX_Battle_28:: ; 20246 (8:4246) +SFX_Battle_28:: dbw ( $80 | CH4 ), SFX_Battle_28_Ch1 dbw CH5, SFX_Battle_28_Ch2 dbw CH7, SFX_Battle_28_Ch3 -SFX_Battle_29:: ; 2024f (8:424f) - dbw ( $40 | CH4 ), SFX_Battle_29_Ch1 - dbw CH7, SFX_Battle_29_Ch2 +SFX_Earthquake:: + dbw ( $40 | CH4 ), SFX_Earthquake_Ch1 + dbw CH7, SFX_Earthquake_Ch2 -SFX_Battle_2A:: ; 20255 (8:4255) +SFX_Battle_2A:: dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1 dbw CH5, SFX_Battle_2A_Ch2 dbw CH7, SFX_Battle_2A_Ch3 -SFX_Battle_2B:: ; 2025e (8:425e) +SFX_Battle_2B:: dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1 dbw CH7, SFX_Battle_2B_Ch2 -SFX_Battle_2C:: ; 20264 (8:4264) +SFX_Battle_2C:: dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1 dbw CH5, SFX_Battle_2C_Ch2 dbw CH7, SFX_Battle_2C_Ch3 -SFX_Psybeam:: ; 2026d (8:426d) +SFX_Psybeam:: dbw ( $80 | CH4 ), SFX_Psybeam_Ch1 dbw CH5, SFX_Psybeam_Ch2 dbw CH7, SFX_Psybeam_Ch3 -SFX_Battle_2E:: ; 20276 (8:4276) +SFX_Battle_2E:: dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1 dbw CH5, SFX_Battle_2E_Ch2 dbw CH7, SFX_Battle_2E_Ch3 -SFX_Battle_2F:: ; 2027f (8:427f) - dbw ( $80 | CH4 ), SFX_Battle_2F_Ch1 - dbw CH5, SFX_Battle_2F_Ch2 - dbw CH7, SFX_Battle_2F_Ch3 +SFX_Thunderbolt:: + dbw ( $80 | CH4 ), SFX_Thunderbolt_Ch1 + dbw CH5, SFX_Thunderbolt_Ch2 + dbw CH7, SFX_Thunderbolt_Ch3 -SFX_Psychic_M:: ; 20288 (8:4288) +SFX_Psychic_M:: dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1 dbw CH5, SFX_Psychic_M_Ch2 dbw CH7, SFX_Psychic_M_Ch3 -SFX_Battle_31:: ; 20291 (8:4291) +SFX_Battle_31:: dbw ( $40 | CH4 ), SFX_Battle_31_Ch1 dbw CH5, SFX_Battle_31_Ch2 -SFX_Battle_32:: ; 20297 (8:4297) +SFX_Battle_32:: dbw ( $40 | CH4 ), SFX_Battle_32_Ch1 dbw CH5, SFX_Battle_32_Ch2 -SFX_Battle_33:: ; 2029d (8:429d) +SFX_Battle_33:: dbw ( $40 | CH4 ), SFX_Battle_33_Ch1 dbw CH5, SFX_Battle_33_Ch2 -SFX_Battle_34:: ; 202a3 (8:42a3) +SFX_Battle_34:: dbw ( $80 | CH4 ), SFX_Battle_34_Ch1 dbw CH5, SFX_Battle_34_Ch2 dbw CH7, SFX_Battle_34_Ch3 -SFX_Battle_35:: ; 202ac (8:42ac) +SFX_Battle_35:: dbw ( $40 | CH4 ), SFX_Battle_35_Ch1 dbw CH5, SFX_Battle_35_Ch2 -SFX_Battle_36:: ; 202b2 (8:42b2) +SFX_Battle_36:: dbw ( $80 | CH4 ), SFX_Battle_36_Ch1 dbw CH5, SFX_Battle_36_Ch2 dbw CH7, SFX_Battle_36_Ch3 -SFX_Silph_Scope:: ; 202bb (8:42bb) +SFX_Silph_Scope:: dbw CH4, SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 8328d6c7..cd940357 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,402 +1,402 @@ SFX_Headers_3:: dbw -1, -1 ; padding -SFX_Snare1_3:: ; 7c003 (1f:4003) +SFX_Snare1_3:: dbw CH7, SFX_Snare1_3_Ch1 -SFX_Snare2_3:: ; 7c006 (1f:4006) +SFX_Snare2_3:: dbw CH7, SFX_Snare2_3_Ch1 -SFX_Snare3_3:: ; 7c009 (1f:4009) +SFX_Snare3_3:: dbw CH7, SFX_Snare3_3_Ch1 -SFX_Snare4_3:: ; 7c00c (1f:400c) +SFX_Snare4_3:: dbw CH7, SFX_Snare4_3_Ch1 -SFX_Snare5_3:: ; 7c00f (1f:400f) +SFX_Snare5_3:: dbw CH7, SFX_Snare5_3_Ch1 -SFX_Triangle1_3:: ; 7c012 (1f:4012) +SFX_Triangle1_3:: dbw CH7, SFX_Triangle1_3_Ch1 -SFX_Triangle2_3:: ; 7c015 (1f:4015) +SFX_Triangle2_3:: dbw CH7, SFX_Triangle2_3_Ch1 -SFX_Snare6_3:: ; 7c018 (1f:4018) +SFX_Snare6_3:: dbw CH7, SFX_Snare6_3_Ch1 -SFX_Snare7_3:: ; 7c01b (1f:401b) +SFX_Snare7_3:: dbw CH7, SFX_Snare7_3_Ch1 -SFX_Snare8_3:: ; 7c01e (1f:401e) +SFX_Snare8_3:: dbw CH7, SFX_Snare8_3_Ch1 -SFX_Snare9_3:: ; 7c021 (1f:4021) +SFX_Snare9_3:: dbw CH7, SFX_Snare9_3_Ch1 -SFX_Cymbal1_3:: ; 7c024 (1f:4024) +SFX_Cymbal1_3:: dbw CH7, SFX_Cymbal1_3_Ch1 -SFX_Cymbal2_3:: ; 7c027 (1f:4027) +SFX_Cymbal2_3:: dbw CH7, SFX_Cymbal2_3_Ch1 -SFX_Cymbal3_3:: ; 7c02a (1f:402a) +SFX_Cymbal3_3:: dbw CH7, SFX_Cymbal3_3_Ch1 -SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) +SFX_Muted_Snare1_3:: dbw CH7, SFX_Muted_Snare1_3_Ch1 -SFX_Triangle3_3:: ; 7c030 (1f:4030) +SFX_Triangle3_3:: dbw CH7, SFX_Triangle3_3_Ch1 -SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) +SFX_Muted_Snare2_3:: dbw CH7, SFX_Muted_Snare2_3_Ch1 -SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) +SFX_Muted_Snare3_3:: dbw CH7, SFX_Muted_Snare3_3_Ch1 -SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) +SFX_Muted_Snare4_3:: dbw CH7, SFX_Muted_Snare4_3_Ch1 -SFX_Cry00_3:: ; 7c03c (1f:403c) +SFX_Cry00_3:: dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1 dbw CH5, SFX_Cry00_3_Ch2 dbw CH7, SFX_Cry00_3_Ch3 -SFX_Cry01_3:: ; 7c045 (1f:4045) +SFX_Cry01_3:: dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1 dbw CH5, SFX_Cry01_3_Ch2 dbw CH7, SFX_Cry01_3_Ch3 -SFX_Cry02_3:: ; 7c04e (1f:404e) +SFX_Cry02_3:: dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1 dbw CH5, SFX_Cry02_3_Ch2 dbw CH7, SFX_Cry02_3_Ch3 -SFX_Cry03_3:: ; 7c057 (1f:4057) +SFX_Cry03_3:: dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1 dbw CH5, SFX_Cry03_3_Ch2 dbw CH7, SFX_Cry03_3_Ch3 -SFX_Cry04_3:: ; 7c060 (1f:4060) +SFX_Cry04_3:: dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1 dbw CH5, SFX_Cry04_3_Ch2 dbw CH7, SFX_Cry04_3_Ch3 -SFX_Cry05_3:: ; 7c069 (1f:4069) +SFX_Cry05_3:: dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1 dbw CH5, SFX_Cry05_3_Ch2 dbw CH7, SFX_Cry05_3_Ch3 -SFX_Cry06_3:: ; 7c072 (1f:4072) +SFX_Cry06_3:: dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1 dbw CH5, SFX_Cry06_3_Ch2 dbw CH7, SFX_Cry06_3_Ch3 -SFX_Cry07_3:: ; 7c07b (1f:407b) +SFX_Cry07_3:: dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1 dbw CH5, SFX_Cry07_3_Ch2 dbw CH7, SFX_Cry07_3_Ch3 -SFX_Cry08_3:: ; 7c084 (1f:4084) +SFX_Cry08_3:: dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1 dbw CH5, SFX_Cry08_3_Ch2 dbw CH7, SFX_Cry08_3_Ch3 -SFX_Cry09_3:: ; 7c08d (1f:408d) +SFX_Cry09_3:: dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1 dbw CH5, SFX_Cry09_3_Ch2 dbw CH7, SFX_Cry09_3_Ch3 -SFX_Cry0A_3:: ; 7c096 (1f:4096) +SFX_Cry0A_3:: dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1 dbw CH5, SFX_Cry0A_3_Ch2 dbw CH7, SFX_Cry0A_3_Ch3 -SFX_Cry0B_3:: ; 7c09f (1f:409f) +SFX_Cry0B_3:: dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1 dbw CH5, SFX_Cry0B_3_Ch2 dbw CH7, SFX_Cry0B_3_Ch3 -SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) +SFX_Cry0C_3:: dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1 dbw CH5, SFX_Cry0C_3_Ch2 dbw CH7, SFX_Cry0C_3_Ch3 -SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) +SFX_Cry0D_3:: dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1 dbw CH5, SFX_Cry0D_3_Ch2 dbw CH7, SFX_Cry0D_3_Ch3 -SFX_Cry0E_3:: ; 7c0ba (1f:40ba) +SFX_Cry0E_3:: dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1 dbw CH5, SFX_Cry0E_3_Ch2 dbw CH7, SFX_Cry0E_3_Ch3 -SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) +SFX_Cry0F_3:: dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1 dbw CH5, SFX_Cry0F_3_Ch2 dbw CH7, SFX_Cry0F_3_Ch3 -SFX_Cry10_3:: ; 7c0cc (1f:40cc) +SFX_Cry10_3:: dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1 dbw CH5, SFX_Cry10_3_Ch2 dbw CH7, SFX_Cry10_3_Ch3 -SFX_Cry11_3:: ; 7c0d5 (1f:40d5) +SFX_Cry11_3:: dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1 dbw CH5, SFX_Cry11_3_Ch2 dbw CH7, SFX_Cry11_3_Ch3 -SFX_Cry12_3:: ; 7c0de (1f:40de) +SFX_Cry12_3:: dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1 dbw CH5, SFX_Cry12_3_Ch2 dbw CH7, SFX_Cry12_3_Ch3 -SFX_Cry13_3:: ; 7c0e7 (1f:40e7) +SFX_Cry13_3:: dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1 dbw CH5, SFX_Cry13_3_Ch2 dbw CH7, SFX_Cry13_3_Ch3 -SFX_Cry14_3:: ; 7c0f0 (1f:40f0) +SFX_Cry14_3:: dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1 dbw CH5, SFX_Cry14_3_Ch2 dbw CH7, SFX_Cry14_3_Ch3 -SFX_Cry15_3:: ; 7c0f9 (1f:40f9) +SFX_Cry15_3:: dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1 dbw CH5, SFX_Cry15_3_Ch2 dbw CH7, SFX_Cry15_3_Ch3 -SFX_Cry16_3:: ; 7c102 (1f:4102) +SFX_Cry16_3:: dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1 dbw CH5, SFX_Cry16_3_Ch2 dbw CH7, SFX_Cry16_3_Ch3 -SFX_Cry17_3:: ; 7c10b (1f:410b) +SFX_Cry17_3:: dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1 dbw CH5, SFX_Cry17_3_Ch2 dbw CH7, SFX_Cry17_3_Ch3 -SFX_Cry18_3:: ; 7c114 (1f:4114) +SFX_Cry18_3:: dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1 dbw CH5, SFX_Cry18_3_Ch2 dbw CH7, SFX_Cry18_3_Ch3 -SFX_Cry19_3:: ; 7c11d (1f:411d) +SFX_Cry19_3:: dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1 dbw CH5, SFX_Cry19_3_Ch2 dbw CH7, SFX_Cry19_3_Ch3 -SFX_Cry1A_3:: ; 7c126 (1f:4126) +SFX_Cry1A_3:: dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1 dbw CH5, SFX_Cry1A_3_Ch2 dbw CH7, SFX_Cry1A_3_Ch3 -SFX_Cry1B_3:: ; 7c12f (1f:412f) +SFX_Cry1B_3:: dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1 dbw CH5, SFX_Cry1B_3_Ch2 dbw CH7, SFX_Cry1B_3_Ch3 -SFX_Cry1C_3:: ; 7c138 (1f:4138) +SFX_Cry1C_3:: dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1 dbw CH5, SFX_Cry1C_3_Ch2 dbw CH7, SFX_Cry1C_3_Ch3 -SFX_Cry1D_3:: ; 7c141 (1f:4141) +SFX_Cry1D_3:: dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1 dbw CH5, SFX_Cry1D_3_Ch2 dbw CH7, SFX_Cry1D_3_Ch3 -SFX_Cry1E_3:: ; 7c14a (1f:414a) +SFX_Cry1E_3:: dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1 dbw CH5, SFX_Cry1E_3_Ch2 dbw CH7, SFX_Cry1E_3_Ch3 -SFX_Cry1F_3:: ; 7c153 (1f:4153) +SFX_Cry1F_3:: dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1 dbw CH5, SFX_Cry1F_3_Ch2 dbw CH7, SFX_Cry1F_3_Ch3 -SFX_Cry20_3:: ; 7c15c (1f:415c) +SFX_Cry20_3:: dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1 dbw CH5, SFX_Cry20_3_Ch2 dbw CH7, SFX_Cry20_3_Ch3 -SFX_Cry21_3:: ; 7c165 (1f:4165) +SFX_Cry21_3:: dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1 dbw CH5, SFX_Cry21_3_Ch2 dbw CH7, SFX_Cry21_3_Ch3 -SFX_Cry22_3:: ; 7c16e (1f:416e) +SFX_Cry22_3:: dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1 dbw CH5, SFX_Cry22_3_Ch2 dbw CH7, SFX_Cry22_3_Ch3 -SFX_Cry23_3:: ; 7c177 (1f:4177) +SFX_Cry23_3:: dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1 dbw CH5, SFX_Cry23_3_Ch2 dbw CH7, SFX_Cry23_3_Ch3 -SFX_Cry24_3:: ; 7c180 (1f:4180) +SFX_Cry24_3:: dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1 dbw CH5, SFX_Cry24_3_Ch2 dbw CH7, SFX_Cry24_3_Ch3 -SFX_Cry25_3:: ; 7c189 (1f:4189) +SFX_Cry25_3:: dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1 dbw CH5, SFX_Cry25_3_Ch2 dbw CH7, SFX_Cry25_3_Ch3 -SFX_Get_Item1_3:: ; 7c192 (1f:4192) +SFX_Get_Item1_3:: dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1 dbw CH5, SFX_Get_Item1_3_Ch2 dbw CH6, SFX_Get_Item1_3_Ch3 -SFX_Get_Item2_3:: ; 7c19b (1f:419b) +SFX_Get_Item2_3:: dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1 dbw CH5, SFX_Get_Item2_3_Ch2 dbw CH6, SFX_Get_Item2_3_Ch3 -SFX_Tink_3:: ; 7c1a4 (1f:41a4) +SFX_Tink_3:: dbw CH4, SFX_Tink_3_Ch1 -SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) +SFX_Heal_HP_3:: dbw CH4, SFX_Heal_HP_3_Ch1 -SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) +SFX_Heal_Ailment_3:: dbw CH4, SFX_Heal_Ailment_3_Ch1 -SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) +SFX_Start_Menu_3:: dbw CH7, SFX_Start_Menu_3_Ch1 -SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) +SFX_Press_AB_3:: dbw CH4, SFX_Press_AB_3_Ch1 -SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) +SFX_Pokedex_Rating_3:: dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1 dbw CH5, SFX_Pokedex_Rating_3_Ch2 dbw CH6, SFX_Pokedex_Rating_3_Ch3 -SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) +SFX_Get_Key_Item_3:: dbw ( $80 | CH4 ), SFX_Get_Key_Item_3_Ch1 dbw CH5, SFX_Get_Key_Item_3_Ch2 dbw CH6, SFX_Get_Key_Item_3_Ch3 -SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) +SFX_Poisoned_3:: dbw CH4, SFX_Poisoned_3_Ch1 -SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) +SFX_Trade_Machine_3:: dbw CH4, SFX_Trade_Machine_3_Ch1 -SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) +SFX_Turn_On_PC_3:: dbw CH4, SFX_Turn_On_PC_3_Ch1 -SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) +SFX_Turn_Off_PC_3:: dbw CH4, SFX_Turn_Off_PC_3_Ch1 -SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) +SFX_Enter_PC_3:: dbw CH4, SFX_Enter_PC_3_Ch1 -SFX_Shrink_3:: ; 7c1d4 (1f:41d4) +SFX_Shrink_3:: dbw CH4, SFX_Shrink_3_Ch1 -SFX_Switch_3:: ; 7c1d7 (1f:41d7) +SFX_Switch_3:: dbw CH4, SFX_Switch_3_Ch1 -SFX_Healing_Machine_3:: ; 7c1da (1f:41da) +SFX_Healing_Machine_3:: dbw CH4, SFX_Healing_Machine_3_Ch1 -SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) +SFX_Teleport_Exit1_3:: dbw CH4, SFX_Teleport_Exit1_3_Ch1 -SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) +SFX_Teleport_Enter1_3:: dbw CH4, SFX_Teleport_Enter1_3_Ch1 -SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) +SFX_Teleport_Exit2_3:: dbw CH4, SFX_Teleport_Exit2_3_Ch1 -SFX_Ledge_3:: ; 7c1e6 (1f:41e6) +SFX_Ledge_3:: dbw CH4, SFX_Ledge_3_Ch1 -SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) +SFX_Teleport_Enter2_3:: dbw CH7, SFX_Teleport_Enter2_3_Ch1 -SFX_Fly_3:: ; 7c1ec (1f:41ec) +SFX_Fly_3:: dbw CH7, SFX_Fly_3_Ch1 -SFX_Denied_3:: ; 7c1ef (1f:41ef) +SFX_Denied_3:: dbw ( $40 | CH4 ), SFX_Denied_3_Ch1 dbw CH5, SFX_Denied_3_Ch2 -SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) +SFX_Arrow_Tiles_3:: dbw CH4, SFX_Arrow_Tiles_3_Ch1 -SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) +SFX_Push_Boulder_3:: dbw CH7, SFX_Push_Boulder_3_Ch1 -SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) +SFX_SS_Anne_Horn_3:: dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1 dbw CH5, SFX_SS_Anne_Horn_3_Ch2 -SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) +SFX_Withdraw_Deposit_3:: dbw CH4, SFX_Withdraw_Deposit_3_Ch1 -SFX_Cut_3:: ; 7c204 (1f:4204) +SFX_Cut_3:: dbw CH7, SFX_Cut_3_Ch1 -SFX_Go_Inside_3:: ; 7c207 (1f:4207) +SFX_Go_Inside_3:: dbw CH7, SFX_Go_Inside_3_Ch1 -SFX_Swap_3:: ; 7c20a (1f:420a) +SFX_Swap_3:: dbw ( $40 | CH4 ), SFX_Swap_3_Ch1 dbw CH5, SFX_Swap_3_Ch2 -SFX_59_3:: ; 7c210 (1f:4210) +SFX_59_3:: dbw ( $40 | CH4 ), SFX_59_3_Ch1 dbw CH5, SFX_59_3_Ch2 -SFX_Purchase_3:: ; 7c216 (1f:4216) +SFX_Purchase_3:: dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1 dbw CH5, SFX_Purchase_3_Ch2 -SFX_Collision_3:: ; 7c21c (1f:421c) +SFX_Collision_3:: dbw CH4, SFX_Collision_3_Ch1 -SFX_Go_Outside_3:: ; 7c21f (1f:421f) +SFX_Go_Outside_3:: dbw CH7, SFX_Go_Outside_3_Ch1 -SFX_Save_3:: ; 7c222 (1f:4222) +SFX_Save_3:: dbw ( $40 | CH4 ), SFX_Save_3_Ch1 dbw CH5, SFX_Save_3_Ch2 -SFX_Intro_Lunge:: ; 7c228 (1f:4228) +SFX_Intro_Lunge:: dbw CH7, SFX_Intro_Lunge_Ch1 -SFX_Intro_Hip:: ; 7c22b (1f:422b) +SFX_Intro_Hip:: dbw CH4, SFX_Intro_Hip_Ch1 -SFX_Intro_Hop:: ; 7c22e (1f:422e) +SFX_Intro_Hop:: dbw CH4, SFX_Intro_Hop_Ch1 -SFX_Intro_Raise:: ; 7c231 (1f:4231) +SFX_Intro_Raise:: dbw CH7, SFX_Intro_Raise_Ch1 -SFX_Intro_Crash:: ; 7c234 (1f:4234) +SFX_Intro_Crash:: dbw CH7, SFX_Intro_Crash_Ch1 -SFX_Intro_Whoosh:: ; 7c237 (1f:4237) +SFX_Intro_Whoosh:: dbw CH7, SFX_Intro_Whoosh_Ch1 -SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) +SFX_Slots_Stop_Wheel:: dbw CH4, SFX_Slots_Stop_Wheel_Ch1 -SFX_Slots_Reward:: ; 7c23d (1f:423d) +SFX_Slots_Reward:: dbw CH4, SFX_Slots_Reward_Ch1 -SFX_Slots_New_Spin:: ; 7c240 (1f:4240) +SFX_Slots_New_Spin:: dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1 dbw CH5, SFX_Slots_New_Spin_Ch2 -SFX_Shooting_Star:: ; 7c246 (1f:4246) +SFX_Shooting_Star:: dbw CH4, SFX_Shooting_Star_Ch1 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index bb60c5bd..16e69e1f 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,294 +1,294 @@ -SFX_Headers_4:: ; 80000 (20:4000) +SFX_Headers_4:: dbw -1, -1 ; padding -SFX_Snare1_4:: ; 80003 (20:4003) +SFX_Snare1_4:: dbw CH7, SFX_Snare1_4_Ch7 -SFX_Snare2_4:: ; 80006 (20:4006) +SFX_Snare2_4:: dbw CH7, SFX_Snare2_4_Ch7 -SFX_Snare3_4:: ; 80009 (20:4009) +SFX_Snare3_4:: dbw CH7, SFX_Snare3_4_Ch7 -SFX_Snare4_4:: ; 8000c (20:400c) +SFX_Snare4_4:: dbw CH7, SFX_Snare4_4_Ch7 -SFX_Snare5_4:: ; 8000f (20:400f) +SFX_Snare5_4:: dbw CH7, SFX_Snare5_4_Ch7 -SFX_Triangle1_4:: ; 80012 (20:4012) +SFX_Triangle1_4:: dbw CH7, SFX_Triangle1_4_Ch7 -SFX_Triangle2_4:: ; 80015 (20:4015) +SFX_Triangle2_4:: dbw CH7, SFX_Triangle2_4_Ch7 -SFX_Snare6_4:: ; 80018 (20:4018) +SFX_Snare6_4:: dbw CH7, SFX_Snare6_4_Ch7 -SFX_Snare7_4:: ; 8001b (20:401b) +SFX_Snare7_4:: dbw CH7, SFX_Snare7_4_Ch7 -SFX_Snare8_4:: ; 8001e (20:401e) +SFX_Snare8_4:: dbw CH7, SFX_Snare8_4_Ch7 -SFX_Snare9_4:: ; 80021 (20:4021) +SFX_Snare9_4:: dbw CH7, SFX_Snare9_4_Ch7 -SFX_Cymbal1_4:: ; 80024 (20:4024) +SFX_Cymbal1_4:: dbw CH7, SFX_Cymbal1_4_Ch7 -SFX_Cymbal2_4:: ; 80027 (20:4027) +SFX_Cymbal2_4:: dbw CH7, SFX_Cymbal2_4_Ch7 -SFX_Cymbal3_4:: ; 8002a (20:402a) +SFX_Cymbal3_4:: dbw CH7, SFX_Cymbal3_4_Ch7 -SFX_Muted_Snare1_4:: ; 8002d (20:402d) +SFX_Muted_Snare1_4:: dbw CH7, SFX_Muted_Snare1_4_Ch7 -SFX_Triangle3_4:: ; 80030 (20:4030) +SFX_Triangle3_4:: dbw CH7, SFX_Triangle3_4_Ch7 -SFX_Muted_Snare2_4:: ; 80033 (20:4033) +SFX_Muted_Snare2_4:: dbw CH7, SFX_Muted_Snare2_4_Ch7 -SFX_Muted_Snare3_4:: ; 80036 (20:4036) +SFX_Muted_Snare3_4:: dbw CH7, SFX_Muted_Snare3_4_Ch7 -SFX_Muted_Snare4_4:: ; 80039 (20:4039) +SFX_Muted_Snare4_4:: dbw CH7, SFX_Muted_Snare4_4_Ch7 -SFX_8003c_4:: ; 8003c (20:403c) +SFX_8003c_4:: dbw ( $80 | CH4 ), SFX_805db_4_Ch4 dbw CH5, SFX_805ea_4_Ch5 dbw CH7, SFX_805f9_4_Ch7 -SFX_80045_4:: ; 80045 (20:4045) +SFX_80045_4:: dbw ( $80 | CH4 ), SFX_807eb_4_Ch4 dbw CH5, SFX_807fe_4_Ch5 dbw CH7, SFX_80811_4_Ch7 -SFX_8004e_4:: ; 8004e (20:404e) +SFX_8004e_4:: dbw ( $80 | CH4 ), SFX_80760_4_Ch4 dbw CH5, SFX_8076f_4_Ch5 dbw CH7, SFX_8077d_4_Ch7 -SFX_80057_4:: ; 80057 (20:4057) +SFX_80057_4:: dbw ( $80 | CH4 ), SFX_804fa_4_Ch4 dbw CH5, SFX_80519_4_Ch5 dbw CH7, SFX_80538_4_Ch7 -SFX_80060_4:: ; 80060 (20:4060) +SFX_80060_4:: dbw ( $80 | CH4 ), SFX_808a9_4_Ch4 dbw CH5, SFX_808c8_4_Ch5 dbw CH7, SFX_808e7_4_Ch7 -SFX_80069_4:: ; 80069 (20:4069) +SFX_80069_4:: dbw ( $80 | CH4 ), SFX_80689_4_Ch4 dbw CH5, SFX_8069c_4_Ch5 dbw CH7, SFX_806ae_4_Ch7 -SFX_80072_4:: ; 80072 (20:4072) +SFX_80072_4:: dbw ( $80 | CH4 ), SFX_80633_4_Ch4 dbw CH5, SFX_8064d_4_Ch5 dbw CH7, SFX_8064e_4_Ch7 -SFX_8007b_4:: ; 8007b (20:407b) +SFX_8007b_4:: dbw ( $80 | CH4 ), SFX_80661_4_Ch4 dbw CH5, SFX_80670_4_Ch5 dbw CH7, SFX_8067f_4_Ch7 -SFX_80084_4:: ; 80084 (20:4084) +SFX_80084_4:: dbw ( $80 | CH4 ), SFX_80879_4_Ch4 dbw CH5, SFX_8088c_4_Ch5 dbw CH7, SFX_8089f_4_Ch7 -SFX_8008d_4:: ; 8008d (20:408d) +SFX_8008d_4:: dbw ( $80 | CH4 ), SFX_80383_4_Ch4 dbw CH5, SFX_803a0_4_Ch5 dbw CH7, SFX_803c1_4_Ch7 -SFX_80096_4:: ; 80096 (20:4096) +SFX_80096_4:: dbw ( $80 | CH4 ), SFX_8081e_4_Ch4 dbw CH5, SFX_8083d_4_Ch5 dbw CH7, SFX_80860_4_Ch7 -SFX_8009f_4:: ; 8009f (20:409f) +SFX_8009f_4:: dbw ( $80 | CH4 ), SFX_806af_4_Ch4 dbw CH5, SFX_806da_4_Ch5 dbw CH7, SFX_806f9_4_Ch7 -SFX_800a8_4:: ; 800a8 (20:40a8) +SFX_800a8_4:: dbw ( $80 | CH4 ), SFX_80712_4_Ch4 dbw CH5, SFX_80739_4_Ch5 dbw CH7, SFX_8075f_4_Ch7 -SFX_800b1_4:: ; 800b1 (20:40b1) +SFX_800b1_4:: dbw ( $80 | CH4 ), SFX_8077e_4_Ch4 dbw CH5, SFX_8079d_4_Ch5 dbw CH7, SFX_807cc_4_Ch7 -SFX_800ba_4:: ; 800ba (20:40ba) +SFX_800ba_4:: dbw ( $80 | CH4 ), SFX_80603_4_Ch4 dbw CH5, SFX_80616_4_Ch5 dbw CH7, SFX_80629_4_Ch7 -SFX_800c3_4:: ; 800c3 (20:40c3) +SFX_800c3_4:: dbw ( $80 | CH4 ), SFX_80545_4_Ch4 dbw CH5, SFX_80560_4_Ch5 dbw CH7, SFX_8057b_4_Ch7 -SFX_800cc_4:: ; 800cc (20:40cc) +SFX_800cc_4:: dbw ( $80 | CH4 ), SFX_8058b_4_Ch4 dbw CH5, SFX_805ae_4_Ch5 dbw CH7, SFX_805d1_4_Ch7 -SFX_800d5_4:: ; 800d5 (20:40d5) +SFX_800d5_4:: dbw ( $80 | CH4 ), SFX_80467_4_Ch4 dbw CH5, SFX_80486_4_Ch5 dbw CH7, SFX_804a9_4_Ch7 -SFX_800de_4:: ; 800de (20:40de) +SFX_800de_4:: dbw ( $80 | CH4 ), SFX_8097f_4_Ch4 dbw CH5, SFX_80992_4_Ch5 dbw CH7, SFX_809a5_4_Ch7 -SFX_800e7_4:: ; 800e7 (20:40e7) +SFX_800e7_4:: dbw ( $80 | CH4 ), SFX_809b2_4_Ch4 dbw CH5, SFX_809cd_4_Ch5 dbw CH7, SFX_809e8_4_Ch7 -SFX_800f0_4:: ; 800f0 (20:40f0) +SFX_800f0_4:: dbw ( $80 | CH4 ), SFX_809fb_4_Ch4 dbw CH5, SFX_80a0a_4_Ch5 dbw CH7, SFX_80a19_4_Ch7 -SFX_800f9_4:: ; 800f9 (20:40f9) +SFX_800f9_4:: dbw ( $80 | CH4 ), SFX_80a89_4_Ch4 dbw CH5, SFX_80aa4_4_Ch5 dbw CH7, SFX_80abf_4_Ch7 -SFX_80102_4:: ; 80102 (20:4102) +SFX_80102_4:: dbw ( $80 | CH4 ), SFX_8091c_4_Ch4 dbw CH5, SFX_8092b_4_Ch5 dbw CH7, SFX_8093a_4_Ch7 -SFX_8010b_4:: ; 8010b (20:410b) +SFX_8010b_4:: dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4 dbw CH5, SFX_80ae5_4_Ch5 dbw CH7, SFX_80af8_4_Ch7 -SFX_80114_4:: ; 80114 (20:4114) +SFX_80114_4:: dbw ( $80 | CH4 ), SFX_80be2_4_Ch4 dbw CH5, SFX_80c05_4_Ch5 dbw CH7, SFX_80c28_4_Ch7 -SFX_8011d_4:: ; 8011d (20:411d) +SFX_8011d_4:: dbw ( $80 | CH4 ), SFX_808fa_4_Ch4 dbw CH5, SFX_80909_4_Ch5 dbw CH7, SFX_8091b_4_Ch7 -SFX_80126_4:: ; 80126 (20:4126) +SFX_80126_4:: dbw ( $80 | CH4 ), SFX_80b53_4_Ch4 dbw CH5, SFX_80b6e_4_Ch5 dbw CH7, SFX_80b89_4_Ch7 -SFX_8012f_4:: ; 8012f (20:412f) +SFX_8012f_4:: dbw ( $80 | CH4 ), SFX_80944_4_Ch4 dbw CH5, SFX_8095b_4_Ch5 dbw CH7, SFX_80972_4_Ch7 -SFX_80138_4:: ; 80138 (20:4138) +SFX_80138_4:: dbw ( $80 | CH4 ), SFX_80b05_4_Ch4 dbw CH5, SFX_80b28_4_Ch5 dbw CH7, SFX_80b43_4_Ch7 -SFX_80141_4:: ; 80141 (20:4141) +SFX_80141_4:: dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4 dbw CH5, SFX_80bb7_4_Ch5 dbw CH7, SFX_80bd2_4_Ch7 -SFX_8014a_4:: ; 8014a (20:414a) +SFX_8014a_4:: dbw ( $80 | CH4 ), SFX_80a23_4_Ch4 dbw CH5, SFX_80a46_4_Ch5 dbw CH7, SFX_80a6d_4_Ch7 -SFX_80153_4:: ; 80153 (20:4153) +SFX_80153_4:: dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4 dbw CH5, SFX_80c4e_4_Ch5 dbw CH7, SFX_80c61_4_Ch7 -SFX_8015c_4:: ; 8015c (20:415c) +SFX_8015c_4:: dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4 dbw CH5, SFX_80c81_4_Ch5 dbw CH7, SFX_80c94_4_Ch7 -SFX_80165_4:: ; 80165 (20:4165) +SFX_80165_4:: dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4 dbw CH5, SFX_80cc4_4_Ch5 dbw CH7, SFX_80ce6_4_Ch7 -SFX_8016e_4:: ; 8016e (20:416e) +SFX_8016e_4:: dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4 dbw CH5, SFX_80cfa_4_Ch5 dbw CH7, SFX_80d0d_4_Ch7 -SFX_80177_4:: ; 80177 (20:4177) +SFX_80177_4:: dbw ( $80 | CH4 ), SFX_803da_4_Ch4 dbw CH5, SFX_803f1_4_Ch5 dbw CH7, SFX_80404_4_Ch7 -SFX_80180_4:: ; 80180 (20:4180) +SFX_80180_4:: dbw ( $80 | CH4 ), SFX_80411_4_Ch4 dbw CH5, SFX_80434_4_Ch5 dbw CH7, SFX_80457_4_Ch7 -SFX_80189_4:: ; 80189 (20:4189) +SFX_80189_4:: dbw ( $80 | CH4 ), SFX_804bf_4_Ch4 dbw CH5, SFX_804d6_4_Ch5 dbw CH7, SFX_804ed_4_Ch7 -SFX_Get_Item1_4:: ; 80192 (20:4192) +SFX_Get_Item1_4:: dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4 dbw CH5, SFX_80e71_4_Ch5 dbw CH6, SFX_80e81_4_Ch6 -SFX_Get_Item2_4:: ; 8019b (20:419b) +SFX_Get_Item2_4:: dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4 dbw CH5, SFX_80ee7_4_Ch5 dbw CH6, SFX_80eff_4_Ch6 -SFX_Tink_4:: ; 801a4 (20:41a4) +SFX_Tink_4:: dbw CH4, SFX_8028e_4_Ch4 -SFX_Heal_Ailment_4:: ; 801a7 (20:41a7) +SFX_Heal_Ailment_4:: dbw CH4, SFX_8027f_4_Ch4 -SFX_Start_Menu_4:: ; 801aa (20:41aa) +SFX_Start_Menu_4:: dbw CH4, SFX_8026a_4_Ch4 -SFX_PressAB_4:: ; 801ad (20:41ad) +SFX_PressAB_4:: dbw CH7, SFX_80263_4_Ch7 -SFX_801b0_4:: ; 801b0 (20:41b0) +SFX_801b0_4:: dbw CH4, SFX_80250_4_Ch4 -SFX_801b3_4:: ; 801b3 (20:41b3) +SFX_801b3_4:: dbw CH7, SFX_8029f_4_Ch7 -SFX_801b6_4:: ; 801b6 (20:41b6) +SFX_801b6_4:: dbw CH4, SFX_802b5_4_Ch4 -SFX_801b9_4:: ; 801b9 (20:41b9) +SFX_801b9_4:: dbw CH7, SFX_802e1_4_Ch7 -SFX_801bc_4:: ; 801bc (20:41bc) +SFX_801bc_4:: dbw CH4, SFX_802cc_4_Ch4 -SFX_801bf_4:: ; 801bf (20:41bf) +SFX_801bf_4:: dbw CH7, SFX_802d7_4_Ch7 -SFX_Get_Item2_4_2:: ; 801c2 (20:41c2) +SFX_Get_Item2_4_2:: dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1 dbw CH5, SFX_Get_Item2_4_2_Ch2 dbw CH6, SFX_Get_Item2_4_2_Ch3 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 6da2f9d6..b5378a94 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb) +Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9:: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c) +Music_BikeRiding_Ch2:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 @@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75:: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14) +Music_BikeRiding_Ch3:: notetype 12, 1, 3 rest 2 @@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17:: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68) +Music_BikeRiding_Ch4:: dspeed 12 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 71758fe4..3f015d8d 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1:: ; b6c7 (2:76c7) +Music_Celadon_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4:: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2:: ; b73a (2:773a) +Music_Celadon_Ch2:: duty 3 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a:: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3:: ; b7b5 (2:77b5) +Music_Celadon_Ch3:: notetype 12, 1, 3 rest 8 octave 5 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index f3a12c5e..4fe93c31 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,4 +1,4 @@ -Music_Cinnabar_Ch1:: ; b86d (2:786d) +Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878:: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2:: ; b8d4 (2:78d4) +Music_Cinnabar_Ch2:: duty 3 vibrato 10, 2, 3 @@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9:: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3:: ; b93d (2:793d) +Music_Cinnabar_Ch3:: notetype 12, 1, 0 Music_Cinnabar_branch_b93f:: diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index f461ec56..438c2f18 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,4 +1,4 @@ -Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f) +Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 @@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19:: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40) +Music_CinnabarMansion_Ch2:: duty 2 toggleperfectpitch vibrato 10, 2, 4 @@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c:: endchannel -Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e) +Music_CinnabarMansion_Ch3:: notetype 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: @@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80:: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0) +Music_CinnabarMansion_Ch4:: dspeed 6 rest 16 rest 16 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 4b068045..eb9ccde5 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1:: ; aa76 (2:6a76) +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a:: endchannel -Music_Cities1_Ch2:: ; ab92 (2:6b92) +Music_Cities1_Ch2:: vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -401,7 +401,7 @@ Music_Cities1_branch_ac00:: endchannel -Music_Cities1_Ch3:: ; ac32 (2:6c32) +Music_Cities1_Ch3:: notetype 12, 1, 1 toggleperfectpitch @@ -579,7 +579,7 @@ Music_Cities1_branch_acce:: endchannel -Music_Cities1_Ch4:: ; acef (2:6cef) +Music_Cities1_Ch4:: dspeed 12 callchannel Music_Cities1_branch_ad36 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index e0e4ab5e..897fb8c9 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1:: ; b504 (2:7504) +Music_Cities2_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a:: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2:: ; b569 (2:7569) +Music_Cities2_Ch2:: duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b:: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3:: ; b640 (2:7640) +Music_Cities2_Ch3:: notetype 12, 1, 1 rest 16 octave 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 803e3d02..d9a5ec35 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) +Music_Credits_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) endchannel -Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) +Music_Credits_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) endchannel -Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) +Music_Credits_Ch3:: notetype 12, 1, 0 octave 5 C# 6 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index e3e6a3de..7f0d046d 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad) +Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc:: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d) +Music_DefeatedGymLeader_Ch2:: duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84:: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52) +Music_DefeatedGymLeader_Ch3:: notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 015aaaf5..8ad51afa 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53) +Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 duty 2 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1) +Music_DefeatedTrainer_Ch2:: duty 2 notetype 4, 12, 3 octave 4 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15) +Music_DefeatedTrainer_Ch3:: notetype 4, 1, 0 octave 5 D_ 2 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 6b378400..92326a84 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 executemusic @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b:: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch2:: executemusic duty 2 notetype 12, 12, 3 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce:: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) +Music_DefeatedWildMon_Ch3:: executemusic notetype 12, 2, 0 octave 5 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 27e4deb9..825207b8 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) +Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -224,7 +224,7 @@ Music_Dungeon1_branch_7dfd5:: endchannel -Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde) +Music_Dungeon1_Ch2:: vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -439,7 +439,7 @@ Music_Dungeon1_branch_7e0cd:: endchannel -Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc) +Music_Dungeon1_Ch3:: notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -594,7 +594,7 @@ Music_Dungeon1_branch_7e177:: endchannel -Music_Dungeon1_Ch4:: ; 7e18a (1f:618a) +Music_Dungeon1_Ch4:: dspeed 12 rest 14 cymbal1 1 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 57e1805c..44e9d5bf 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,4 +1,4 @@ -Music_Dungeon2_Ch1:: ; 7e887 (1f:6887) +Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892:: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8) +Music_Dungeon2_Ch2:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: @@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db:: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3:: ; 7e93b (1f:693b) +Music_Dungeon2_Ch3:: notetype 12, 1, 3 vibrato 8, 2, 6 @@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1:: endchannel -Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc) +Music_Dungeon2_Ch4:: dspeed 12 Music_Dungeon2_branch_7e9dd:: diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 796d1e78..767ca626 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,4 +1,4 @@ -Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1) +Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc:: endchannel -Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68) +Music_Dungeon3_Ch2:: vibrato 11, 1, 5 duty 3 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d:: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) +Music_Dungeon3_Ch3:: notetype 12, 1, 2 rest 16 rest 16 @@ -710,7 +710,7 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) loopchannel 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4) +Music_Dungeon3_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 7e4eb43b..9a13f00f 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1:: ; 233a6 (8:73a6) +Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429:: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2:: ; 2356a (8:756a) +Music_FinalBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710:: endchannel -Music_FinalBattle_Ch3:: ; 2371c (8:771c) +Music_FinalBattle_Ch3:: notetype 12, 1, 1 octave 4 E_ 4 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 97ed4e77..52b85e08 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1:: ; 7e20b (1f:620b) +Music_GameCorner_Ch1:: tempo 120 volume 7, 7 duty 3 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222:: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2:: ; 7e2df (1f:62df) +Music_GameCorner_Ch2:: duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa:: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3:: ; 7e38b (1f:638b) +Music_GameCorner_Ch3:: notetype 12, 1, 3 octave 5 C# 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 3ee51100..b314336d 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1:: ; bcbb (2:7cbb) +Music_Gym_Ch1:: tempo 138 volume 7, 7 duty 3 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8:: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2:: ; bd6b (2:7d6b) +Music_Gym_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82:: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3:: ; bdfa (2:7dfa) +Music_Gym_Ch3:: notetype 12, 1, 1 rest 16 rest 10 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index c4a702e5..1eb2951d 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370) +Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 duty 3 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0:: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1) +Music_GymLeaderBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0:: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef) +Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 86fff1c8..69f926f6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf) +Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5:: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda) +Music_HallOfFame_Ch2:: vibrato 8, 2, 5 duty 3 @@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf:: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc) +Music_HallOfFame_Ch3:: notetype 12, 1, 2 Music_HallOfFame_branch_7fbfe:: diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index ab4df7a7..61623e39 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0) +Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 duty 3 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659:: endchannel -Music_IndigoPlateau_Ch2:: ; a664 (2:6664) +Music_IndigoPlateau_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af:: endchannel -Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba) +Music_IndigoPlateau_Ch3:: notetype 12, 1, 0 octave 4 D_ 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe:: endchannel -Music_IndigoPlateau_Ch4:: ; a70f (2:670f) +Music_IndigoPlateau_Ch4:: dspeed 6 mutedsnare2 16 mutedsnare2 16 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index ff7d85d8..fd4a8e35 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) +Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) endchannel -Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) +Music_IntroBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) endchannel -Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) +Music_IntroBattle_Ch3:: notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) endchannel -Music_IntroBattle_Ch4:: ; 7f95b (1f:795b) +Music_IntroBattle_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index e21d331f..9a01246b 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) +Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) endchannel -Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a) +Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index b655a488..7b60cc24 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1:: ; bb58 (2:7b58) +Music_Lavender_Ch1:: tempo 152 volume 7, 7 duty 1 @@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b:: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2:: ; bb9e (2:7b9e) +Music_Lavender_Ch2:: vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5:: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3:: ; bbae (2:7bae) +Music_Lavender_Ch3:: vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9:: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4:: ; bc21 (2:7c21) +Music_Lavender_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 77324e5c..2378a03a 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d) +Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 duty 2 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba) +Music_MeetEvilTrainer_Ch2:: duty 1 notetype 12, 11, 6 octave 3 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6) +Music_MeetEvilTrainer_Ch3:: notetype 12, 1, 0 rest 8 octave 4 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index b416987d..0f24f99e 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9) +Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 duty 1 @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c) +Music_MeetFemaleTrainer_Ch2:: duty 2 notetype 12, 12, 2 octave 3 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b) +Music_MeetFemaleTrainer_Ch3:: notetype 12, 1, 0 rest 8 octave 5 diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm index 168b1bdc..086fef53 100644 --- a/audio/music/meetjessiejames.asm +++ b/audio/music/meetjessiejames.asm @@ -1,4 +1,4 @@ -Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) +Music_MeetJessieJames_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_MeetJessieJames_branch_83187:: loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) +Music_MeetJessieJames_Ch2:: duty 3 vibrato 6, 1, 5 notetype 12, 12, 2 @@ -164,7 +164,7 @@ Music_MeetJessieJames_branch_831df:: loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) +Music_MeetJessieJames_Ch3:: notetype 12, 1, 0 rest 16 rest 8 diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 0a2e8396..92047849 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b) +Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f:: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2) +Music_MeetMaleTrainer_Ch2:: duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2) +Music_MeetMaleTrainer_Ch3:: notetype 12, 1, 0 rest 6 octave 4 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index a2f0abca..6532a187 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1:: ; af59 (2:6f59) +Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85:: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9) +Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005:: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3:: ; b03d (2:703d) +Music_MeetProfOak_Ch3:: notetype 12, 1, 2 rest 10 octave 4 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 1588e1c7..153523af 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -2,7 +2,7 @@ Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1:: ; b120 (2:7120) +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5:: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2:: ; b1bb (2:71bb) +Music_MeetRival_Ch2:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d:: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3:: ; b233 (2:7233) +Music_MeetRival_Ch3:: notetype 12, 1, 4 octave 5 D_ 2 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 2e2b79bf..cb08fcf4 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1:: ; adae (2:6dae) +Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 duty 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec:: endchannel -Music_MuseumGuy_Ch2:: ; adf1 (2:6df1) +Music_MuseumGuy_Ch2:: duty 2 notetype 12, 12, 1 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26:: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e) +Music_MuseumGuy_Ch3:: notetype 12, 1, 0 rest 16 octave 4 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1:: endchannel -Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1) +Music_MuseumGuy_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 018a3e92..7214264c 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9) +Music_OaksLab_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0:: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05) +Music_OaksLab_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16:: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52) +Music_OaksLab_Ch3:: notetype 12, 1, 1 rest 2 octave 4 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 9d64b331..0c8b7dbc 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -Music_PalletTown_Ch1:: ; a7c5 (2:67c5) +Music_PalletTown_Ch1:: tempo 160 volume 7, 7 duty 2 @@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce:: endchannel -Music_PalletTown_Ch2:: ; a85f (2:685f) +Music_PalletTown_Ch2:: duty 2 Music_PalletTown_branch_a861:: @@ -262,7 +262,7 @@ Music_PalletTown_branch_a861:: endchannel -Music_PalletTown_Ch3:: ; a8de (2:68de) +Music_PalletTown_Ch3:: vibrato 24, 2, 8 notetype 12, 1, 2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index c802f217..2b7b545b 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) +Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) endchannel -Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) +Music_PkmnHealed_Ch2:: duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) endchannel -Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2) +Music_PkmnHealed_Ch3:: notetype 12, 1, 0 octave 4 E_ 2 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index d0c9ef2c..5de546ad 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,4 +1,4 @@ -Music_Pokecenter_Ch1:: ; be56 (2:7e56) +Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61:: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2:: ; bef9 (2:7ef9) +Music_Pokecenter_Ch2:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: @@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60:: endchannel -Music_Pokecenter_Ch3:: ; bf70 (2:7f70) +Music_Pokecenter_Ch3:: notetype 12, 1, 0 Music_Pokecenter_branch_bf72:: diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 9bb7826e..afae9a75 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1:: ; 7f04a (1f:704a) +Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 duty 3 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a:: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3) +Music_PokemonTower_Ch2:: vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee:: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3:: ; 7f19a (1f:719a) +Music_PokemonTower_Ch3:: vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index 81f138eb..bab18261 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,4 +1,4 @@ -Music_Routes1_Ch1:: ; 9bde (2:5bde) +Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 @@ -106,7 +106,7 @@ Music_Routes1_branch_9be9:: endchannel -Music_Routes1_Ch2:: ; 9c51 (2:5c51) +Music_Routes1_Ch2:: duty 2 Music_Routes1_branch_9c53:: @@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d:: endchannel -Music_Routes1_Ch3:: ; 9cd8 (2:5cd8) +Music_Routes1_Ch3:: vibrato 8, 2, 5 notetype 12, 1, 3 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd:: endchannel -Music_Routes1_Ch4:: ; 9d24 (2:5d24) +Music_Routes1_Ch4:: dspeed 12 rest 4 mutedsnare1 2 diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 3926c8de..42b4deda 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,4 +1,4 @@ -Music_Routes2_Ch1:: ; 9db9 (2:5db9) +Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 @@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3:: endchannel -Music_Routes2_Ch2:: ; 9e4f (2:5e4f) +Music_Routes2_Ch2:: vibrato 8, 2, 6 duty 3 @@ -216,7 +216,7 @@ Music_Routes2_branch_9e54:: endchannel -Music_Routes2_Ch3:: ; 9e9b (2:5e9b) +Music_Routes2_Ch3:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e:: endchannel -Music_Routes2_Ch4:: ; 9f08 (2:5f08) +Music_Routes2_Ch4:: dspeed 12 snare3 2 rest 2 diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 09a0516f..d0d1672e 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1:: ; 9fad (2:5fad) +Music_Routes3_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3:: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2:: ; a009 (2:6009) +Music_Routes3_Ch2:: vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a:: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3:: ; a07f (2:607f) +Music_Routes3_Ch3:: vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3:: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4:: ; a131 (2:6131) +Music_Routes3_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index d67411f7..9bbf44ea 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1:: ; a26a (2:626a) +Music_Routes4_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a:: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2:: ; a304 (2:6304) +Music_Routes4_Ch2:: vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325:: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3:: ; a3c4 (2:63c4) +Music_Routes4_Ch3:: notetype 12, 1, 0 octave 4 E_ 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7:: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4:: ; a49d (2:649d) +Music_Routes4_Ch4:: dspeed 12 rest 16 rest 12 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index afa81f17..45d84fd0 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1:: ; bc2e (2:7c2e) +Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f:: endchannel -Music_SafariZone_Ch2:: ; bc6a (2:7c6a) +Music_SafariZone_Ch2:: duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89:: endchannel -Music_SafariZone_Ch3:: ; bc94 (2:7c94) +Music_SafariZone_Ch3:: notetype 12, 1, 0 rest 8 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 853d248d..2b6d8134 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1:: ; 7f243 (1f:7243) +Music_SilphCo_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0:: endchannel -Music_SilphCo_Ch2:: ; 7f409 (1f:7409) +Music_SilphCo_Ch2:: vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e:: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3:: ; 7f5be (1f:75be) +Music_SilphCo_Ch3:: vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 62fd1a02..ea6b1a0f 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,4 +1,4 @@ -Music_SSAnne_Ch1:: ; b3a7 (2:73a7) +Music_SSAnne_Ch1:: tempo 128 volume 7, 7 duty 1 @@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2:: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2:: ; b419 (2:7419) +Music_SSAnne_Ch2:: duty 0 vibrato 12, 2, 4 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e:: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3:: ; b4cb (2:74cb) +Music_SSAnne_Ch3:: notetype 12, 1, 3 rest 16 rest 12 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 4ee84233..03ebfed0 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1:: ; 7fa19 (1f:7a19) +Music_Surfing_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30:: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c) +Music_Surfing_Ch2:: duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae:: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3:: ; 7fafa (1f:7afa) +Music_Surfing_Ch3:: notetype 12, 1, 0 rest 12 octave 5 diff --git a/audio/music/surfingpikachu.asm b/audio/music/surfingpikachu.asm index 466a2c53..1ee3f760 100644 --- a/audio/music/surfingpikachu.asm +++ b/audio/music/surfingpikachu.asm @@ -1,4 +1,4 @@ -Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) +Music_SurfingPikachu_Ch1:: tempo 117 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_SurfingPikachu_branch_82d1a:: loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) +Music_SurfingPikachu_Ch2:: duty 3 vibrato 6, 1, 5 notetype 12, 12, 4 @@ -312,7 +312,7 @@ Music_SurfingPikachu_branch_82de0:: loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) +Music_SurfingPikachu_Ch3:: notetype 12, 1, 0 octave 4 B_ 6 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index edd3352f..b28474eb 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0) +Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c:: endchannel -Music_TitleScreen_Ch2:: ; 7e578 (1f:6578) +Music_TitleScreen_Ch2:: vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636:: endchannel -Music_TitleScreen_Ch3:: ; 7e643 (1f:6643) +Music_TitleScreen_Ch3:: notetype 12, 1, 0 octave 3 G_ 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5:: endchannel -Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb) +Music_TitleScreen_Ch4:: dspeed 6 rest 4 snare3 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index ffc17e20..395f05de 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1:: ; 22919 (8:6919) +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962:: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2:: ; 22bae (8:6bae) +Music_TrainerBattle_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc:: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10) +Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index c2c87891..10ca4beb 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,4 +1,4 @@ -Music_UnusedSong_Ch1:: ; a913 (2:6913) +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 @@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b:: endchannel -Music_UnusedSong_Ch2:: ; a9cf (2:69cf) +Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 toggleperfectpitch diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 59ea3e08..94f87b25 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,4 +1,4 @@ -Music_Vermilion_Ch1:: ; b9eb (2:79eb) +Music_Vermilion_Ch1:: tempo 156 volume 7, 7 duty 3 @@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6:: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2:: ; ba61 (2:7a61) +Music_Vermilion_Ch2:: duty 3 vibrato 10, 2, 3 @@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66:: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3:: ; baa6 (2:7aa6) +Music_Vermilion_Ch3:: notetype 12, 1, 0 Music_Vermilion_branch_baa8:: @@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8:: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4:: ; bb0d (2:7b0d) +Music_Vermilion_Ch4:: dspeed 12 Music_Vermilion_branch_bb0e:: diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e37e4b06..3a88678f 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1:: ; 23099 (8:7099) +Music_WildBattle_Ch1:: tempo 104 volume 7, 7 duty 3 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0:: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2:: ; 231d8 (8:71d8) +Music_WildBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225:: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3:: ; 23290 (8:7290) +Music_WildBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 diff --git a/audio/music/yellowintro.asm b/audio/music/yellowintro.asm index 9b0b52ab..c809d10f 100644 --- a/audio/music/yellowintro.asm +++ b/audio/music/yellowintro.asm @@ -1,4 +1,4 @@ -Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) +Music_YellowIntro_Ch1:: tempo 116 volume 7, 7 duty 3 @@ -100,7 +100,7 @@ Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) endchannel -Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) +Music_YellowIntro_Ch2:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 2 @@ -203,7 +203,7 @@ Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) endchannel -Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) +Music_YellowIntro_Ch3:: notetype 12, 1, 0 octave 4 E_ 1 diff --git a/audio/music/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm index 86e55ee8..f65ca164 100644 --- a/audio/music/yellowunusedsong.asm +++ b/audio/music/yellowunusedsong.asm @@ -1,4 +1,4 @@ -Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) +Music_YellowUnusedSong_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -75,7 +75,7 @@ Music_YellowUnusedSong_branch_82fde:: loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) +Music_YellowUnusedSong_Ch2:: duty 2 notetype 8, 12, 2 octave 4 @@ -161,7 +161,7 @@ Music_YellowUnusedSong_branch_8302a:: loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) +Music_YellowUnusedSong_Ch3:: notetype 12, 1, 0 vibrato 2, 1, 5 rest 16 @@ -202,7 +202,7 @@ Music_YellowUnusedSong_branch_83075:: loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) +Music_YellowUnusedSong_Ch4:: dspeed 12 snare3 4 dspeed 8 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index 6cbfdb16..c14be83e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: ; 841b (2:441b) +SFX_59_1_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: ; 8422 (2:4422) +SFX_59_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 9c808359..3b817f2f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: ; 7c404 (1f:4404) +SFX_59_3_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: ; 7c40b (1f:440b) +SFX_59_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 172907a8..6c3959c9 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649) +SFX_Arrow_Tiles_1_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index fd225a5f..8ff79858 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626) +SFX_Arrow_Tiles_3_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 46fb2a07..6cd9701b 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: ; 2043d (8:443d) +SFX_Ball_Poof_Ch1: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: ; 2043d (8:443d) endchannel -SFX_Ball_Poof_Ch2: ; 20448 (8:4448) +SFX_Ball_Poof_Ch2: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index fc9f81cc..49176db3 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: ; 2042d (8:442d) +SFX_Ball_Toss_Ch1: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: ; 20436 (8:4436) +SFX_Ball_Toss_Ch2: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 19e9b9e7..8b92fc50 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: ; 204b9 (8:44b9) +SFX_Battle_09_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 1a7e17ec..27909666 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: ; 204c8 (8:44c8) +SFX_Battle_0B_Ch1: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index b2fdf455..7aa009ba 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: ; 204cc (8:44cc) +SFX_Battle_0C_Ch1: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index c70b281d..1b69e13f 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: ; 204d6 (8:44d6) +SFX_Battle_0D_Ch1: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 20c20628..ff60cb9e 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: ; 204e0 (8:44e0) +SFX_Battle_0E_Ch1: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index d84aed37..3827a5a6 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: ; 204e7 (8:44e7) +SFX_Battle_0F_Ch1: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 324ce9b9..7d301053 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,4 +1,4 @@ -SFX_Battle_12_Ch1: ; 2050b (8:450b) +SFX_Battle_12_Ch1: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 74349bb5..89b8c555 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: ; 20519 (8:4519) +SFX_Battle_13_Ch1: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 82234904..acc064f7 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: ; 20526 (8:4526) +SFX_Battle_14_Ch1: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index a2b5031e..3aa31247 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: ; 2054c (8:454c) +SFX_Battle_16_Ch1: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 4be1d96b..2ff4bd6d 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: ; 20556 (8:4556) +SFX_Battle_17_Ch1: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 6c201d38..81fa2178 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: ; 20563 (8:4563) +SFX_Battle_18_Ch1: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 6b54f8cd..9981f5e4 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: ; 2056a (8:456a) +SFX_Battle_19_Ch1: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 3bb451d5..9f89e449 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: ; 2057b (8:457b) +SFX_Battle_1B_Ch1: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 579e36cc..3827b34c 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: ; 20582 (8:4582) +SFX_Battle_1C_Ch1: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index df556540..f4e9bdc8 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: ; 20593 (8:4593) +SFX_Battle_1E_Ch1: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: ; 20593 (8:4593) endchannel -SFX_Battle_1E_Ch2: ; 205a4 (8:45a4) +SFX_Battle_1E_Ch2: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 142030ee..e8a4d9f3 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: ; 205be (8:45be) +SFX_Battle_20_Ch1: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 10ad350e..b59f5833 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: ; 205c5 (8:45c5) +SFX_Battle_21_Ch1: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index c6b0d972..66cd218d 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: ; 205d5 (8:45d5) +SFX_Battle_22_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 474e43b6..7203dcf2 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: ; 205dc (8:45dc) +SFX_Battle_23_Ch1: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 4fea9cf9..7c81b40b 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: ; 205ec (8:45ec) +SFX_Battle_24_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: ; 205ec (8:45ec) endchannel -SFX_Battle_24_Ch2: ; 205f7 (8:45f7) +SFX_Battle_24_Ch2: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 18a70f45..b1f4fc54 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: ; 205fe (8:45fe) +SFX_Battle_25_Ch1: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 943078e1..c656264b 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: ; 2060e (8:460e) +SFX_Battle_26_Ch1: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index ddd4e452..af86c33f 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: ; 20624 (8:4624) +SFX_Battle_27_Ch1: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: ; 20637 (8:4637) +SFX_Battle_27_Ch2: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,7 +20,7 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: ; 2064a (8:464a) +SFX_Battle_27_Ch3: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 loopchannel 10, SFX_Battle_27_Ch3 diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 73855179..1c974e85 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,4 +1,4 @@ -SFX_Battle_28_Ch1: ; 20655 (8:4655) +SFX_Battle_28_Ch1: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_28_Ch1: ; 20655 (8:4655) endchannel -SFX_Battle_28_Ch2: ; 20664 (8:4664) +SFX_Battle_28_Ch2: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 @@ -14,7 +14,7 @@ SFX_Battle_28_Ch2: ; 20664 (8:4664) endchannel -SFX_Battle_28_Ch3: ; 20673 (8:4673) +SFX_Battle_28_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 6, SFX_Battle_28_Ch3 diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index e766a453..0db98b36 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,17 +1,17 @@ -SFX_Battle_29_Ch1: ; 2067e (8:467e) +SFX_Earthquake_Ch1: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_Battle_29_Ch1 + loopchannel 5, SFX_Earthquake_Ch1 unknownsfx0x20 8, 227, 48, 1 unknownsfx0x20 15, 194, 16, 1 endchannel -SFX_Battle_29_Ch2: ; 20695 (8:4695) +SFX_Earthquake_Ch2: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_Battle_29_Ch2 + loopchannel 4, SFX_Earthquake_Ch2 unknownnoise0x20 12, 244, 188 unknownnoise0x20 12, 245, 156 unknownnoise0x20 15, 244, 172 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index d7334aae..ab01bf85 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,4 +1,4 @@ -SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) +SFX_Battle_2A_Ch1: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 @@ -9,7 +9,7 @@ SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) endchannel -SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) +SFX_Battle_2A_Ch2: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 @@ -19,7 +19,7 @@ SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) endchannel -SFX_Battle_2A_Ch3: ; 206db (8:46db) +SFX_Battle_2A_Ch3: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 276627c3..6eddfa76 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,4 +1,4 @@ -SFX_Battle_2B_Ch1: ; 206ec (8:46ec) +SFX_Battle_2B_Ch1: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 @@ -10,7 +10,7 @@ SFX_Battle_2B_Ch1: ; 206ec (8:46ec) endchannel -SFX_Battle_2B_Ch2: ; 2070b (8:470b) +SFX_Battle_2B_Ch2: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 22b902f1..9cd9bd16 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,4 +1,4 @@ -SFX_Battle_2C_Ch1: ; 20722 (8:4722) +SFX_Battle_2C_Ch1: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 @@ -7,7 +7,7 @@ SFX_Battle_2C_Ch1: ; 20722 (8:4722) endchannel -SFX_Battle_2C_Ch2: ; 20735 (8:4735) +SFX_Battle_2C_Ch2: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 @@ -16,7 +16,7 @@ SFX_Battle_2C_Ch2: ; 20735 (8:4735) endchannel -SFX_Battle_2C_Ch3: ; 20748 (8:4748) +SFX_Battle_2C_Ch3: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 91dda605..a0841ccf 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,4 +1,4 @@ -SFX_Battle_2E_Ch1: ; 20792 (8:4792) +SFX_Battle_2E_Ch1: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 @@ -8,7 +8,7 @@ SFX_Battle_2E_Ch1: ; 20792 (8:4792) endchannel -SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) +SFX_Battle_2E_Ch2: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 @@ -18,7 +18,7 @@ SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) endchannel -SFX_Battle_2E_Ch3: ; 207c0 (8:47c0) +SFX_Battle_2E_Ch3: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index 4b1d9b2c..f511c832 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) +SFX_Thunderbolt_Ch1: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_Battle_2F_Ch1 + loopchannel 8, SFX_Thunderbolt_Ch1 endchannel -SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) +SFX_Thunderbolt_Ch2: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_Battle_2F_Ch2 + loopchannel 9, SFX_Thunderbolt_Ch2 endchannel -SFX_Battle_2F_Ch3: ; 207ef (8:47ef) +SFX_Thunderbolt_Ch3: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_Battle_2F_Ch3 + loopchannel 9, SFX_Thunderbolt_Ch3 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 5d3e2e40..c88cc476 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: ; 20847 (8:4847) +SFX_Battle_31_Ch1: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: ; 20847 (8:4847) endchannel -SFX_Battle_31_Ch2: ; 2085e (8:485e) +SFX_Battle_31_Ch2: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c949fb5b..a85d4334 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: ; 20875 (8:4875) +SFX_Battle_32_Ch1: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: ; 20875 (8:4875) endchannel -SFX_Battle_32_Ch2: ; 20880 (8:4880) +SFX_Battle_32_Ch2: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 8b2bd17d..25b1ee42 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: ; 20887 (8:4887) +SFX_Battle_33_Ch1: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: ; 20887 (8:4887) endchannel -SFX_Battle_33_Ch2: ; 2089e (8:489e) +SFX_Battle_33_Ch2: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index ac80eeea..14718916 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: ; 208b5 (8:48b5) +SFX_Battle_34_Ch1: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: ; 208b5 (8:48b5) endchannel -SFX_Battle_34_Ch2: ; 208c4 (8:48c4) +SFX_Battle_34_Ch2: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: ; 208c4 (8:48c4) endchannel -SFX_Battle_34_Ch3: ; 208d3 (8:48d3) +SFX_Battle_34_Ch3: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7e64aca9..2fe57bc4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: ; 208e0 (8:48e0) +SFX_Battle_35_Ch1: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: ; 208e0 (8:48e0) endchannel -SFX_Battle_35_Ch2: ; 208f0 (8:48f0) +SFX_Battle_35_Ch2: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index f878a1c8..dcf9c56e 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: ; 20902 (8:4902) +SFX_Battle_36_Ch1: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: ; 20941 (8:4941) +SFX_Battle_36_Ch2: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,7 +40,7 @@ SFX_Battle_36_Ch2: ; 20941 (8:4941) endchannel -SFX_Battle_36_Ch3: ; 20980 (8:4980) +SFX_Battle_36_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 26, SFX_Battle_36_Ch3 diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d841f57a..d4f3e858 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) +SFX_Caught_Mon_Ch1: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) endchannel -SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) +SFX_Caught_Mon_Ch2: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) endchannel -SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44) +SFX_Caught_Mon_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 4b9c4a7e..7a45bdf4 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: ; 8447 (2:4447) +SFX_Collision_1_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 18806c1f..601670d5 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: ; 7c430 (1f:4430) +SFX_Collision_3_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index f29e29ab..4fc82294 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: ; 8987 (2:4987) +SFX_Cry00_1_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: ; 8987 (2:4987) endchannel -SFX_Cry00_1_Ch2: ; 8996 (2:4996) +SFX_Cry00_1_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: ; 8996 (2:4996) endchannel -SFX_Cry00_1_Ch3: ; 89a5 (2:49a5) +SFX_Cry00_1_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index fa069f18..ccce6943 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) +SFX_Cry00_2_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) endchannel -SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) +SFX_Cry00_2_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) endchannel -SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d) +SFX_Cry00_2_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index bdeadab5..9b8b6fda 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) +SFX_Cry00_3_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) endchannel -SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) +SFX_Cry00_3_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) endchannel -SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a) +SFX_Cry00_3_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 835d41f7..d684af6f 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) +SFX_Cry01_1_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) endchannel -SFX_Cry01_1_Ch2: ; 8baa (2:4baa) +SFX_Cry01_1_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: ; 8baa (2:4baa) endchannel -SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd) +SFX_Cry01_1_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index bcafa873..0e1030e1 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) +SFX_Cry01_2_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) endchannel -SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) +SFX_Cry01_2_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) endchannel -SFX_Cry01_2_Ch3: ; 20e65 (8:4e65) +SFX_Cry01_2_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 1a31c7ca..be084d7e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) +SFX_Cry01_3_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) endchannel -SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) +SFX_Cry01_3_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) endchannel -SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32) +SFX_Cry01_3_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 97cff95e..d4b520c9 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) +SFX_Cry02_1_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) endchannel -SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b) +SFX_Cry02_1_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: ; 8b29 (2:4b29) +SFX_Cry02_1_Ch3: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 7d67fc4a..526e8c48 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) +SFX_Cry02_2_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) endchannel -SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3) +SFX_Cry02_2_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1) +SFX_Cry02_2_Ch3: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 604d084a..2366ff97 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) +SFX_Cry02_3_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) endchannel -SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90) +SFX_Cry02_3_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e) +SFX_Cry02_3_Ch3: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 42f2c5d3..72ea5d38 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) +SFX_Cry03_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) endchannel -SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) +SFX_Cry03_1_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) endchannel -SFX_Cry03_1_Ch3: ; 88e4 (2:48e4) +SFX_Cry03_1_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 92dab482..de043909 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) +SFX_Cry03_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) endchannel -SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) +SFX_Cry03_2_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) endchannel -SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c) +SFX_Cry03_2_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 0161b820..467745f9 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) +SFX_Cry03_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) endchannel -SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) +SFX_Cry03_3_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) endchannel -SFX_Cry03_3_Ch3: ; 7c959 (1f:4959) +SFX_Cry03_3_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index c80a6bd9..2c34f1c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) +SFX_Cry04_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) endchannel -SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) +SFX_Cry04_1_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) endchannel -SFX_Cry04_1_Ch3: ; 8c93 (2:4c93) +SFX_Cry04_1_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index dcd866da..38bfbf63 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: ; 20efd (8:4efd) +SFX_Cry04_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: ; 20efd (8:4efd) endchannel -SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) +SFX_Cry04_2_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) endchannel -SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b) +SFX_Cry04_2_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 5d8c6df9..bd73c271 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) +SFX_Cry04_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) endchannel -SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) +SFX_Cry04_3_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) endchannel -SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08) +SFX_Cry04_3_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 891cc50e..8de5bf02 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) +SFX_Cry05_1_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) endchannel -SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) +SFX_Cry05_1_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a) +SFX_Cry05_1_Ch3: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 98df4c1d..28879677 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) +SFX_Cry05_2_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) endchannel -SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) +SFX_Cry05_2_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: ; 20d02 (8:4d02) +SFX_Cry05_2_Ch3: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index a7f88abf..261492af 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) +SFX_Cry05_3_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) endchannel -SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) +SFX_Cry05_3_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf) +SFX_Cry05_3_Ch3: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index b26004e2..e171b025 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: ; 89df (2:49df) +SFX_Cry06_1_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: ; 89df (2:49df) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: ; 89f9 (2:49f9) +SFX_Cry06_1_Ch2: endchannel -SFX_Cry06_1_Ch3: ; 89fa (2:49fa) +SFX_Cry06_1_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 283c1360..5e6e9e6a 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) +SFX_Cry06_2_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1) +SFX_Cry06_2_Ch2: endchannel -SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2) +SFX_Cry06_2_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 9feecc3b..5d2994f1 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) +SFX_Cry06_3_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e) +SFX_Cry06_3_Ch2: endchannel -SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f) +SFX_Cry06_3_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index b1346b94..e48a50a2 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) +SFX_Cry07_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) endchannel -SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) +SFX_Cry07_1_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) endchannel -SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b) +SFX_Cry07_1_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 075b7139..ab902a30 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) +SFX_Cry07_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) endchannel -SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) +SFX_Cry07_2_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) endchannel -SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3) +SFX_Cry07_2_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 4955e115..40fad544 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) +SFX_Cry07_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) endchannel -SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) +SFX_Cry07_3_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) endchannel -SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0) +SFX_Cry07_3_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 65131766..6ec5ca3c 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) +SFX_Cry08_1_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) endchannel -SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) +SFX_Cry08_1_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) endchannel -SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b) +SFX_Cry08_1_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 71a0e205..9c154b1c 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) +SFX_Cry08_2_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) endchannel -SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) +SFX_Cry08_2_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) endchannel -SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3) +SFX_Cry08_2_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index bfda8c3d..95fea40e 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) +SFX_Cry08_3_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) endchannel -SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) +SFX_Cry08_3_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) endchannel -SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0) +SFX_Cry08_3_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 29dffdb6..46aae33c 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: ; 872f (2:472f) +SFX_Cry09_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: ; 872f (2:472f) endchannel -SFX_Cry09_1_Ch2: ; 874c (2:474c) +SFX_Cry09_1_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: ; 874c (2:474c) endchannel -SFX_Cry09_1_Ch3: ; 876d (2:476d) +SFX_Cry09_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index c0e61ec7..8ce97609 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) +SFX_Cry09_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) endchannel -SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) +SFX_Cry09_2_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) endchannel -SFX_Cry09_2_Ch3: ; 20a15 (8:4a15) +SFX_Cry09_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index c5c0f599..a6b40dde 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) +SFX_Cry09_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) endchannel -SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) +SFX_Cry09_3_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) endchannel -SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2) +SFX_Cry09_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 9a8e616b..4264e858 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) +SFX_Cry0A_1_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) endchannel -SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) +SFX_Cry0A_1_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) endchannel -SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c) +SFX_Cry0A_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 0386099d..42a8e603 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) +SFX_Cry0A_2_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) endchannel -SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) +SFX_Cry0A_2_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) endchannel -SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4) +SFX_Cry0A_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 4cf59333..f8576fa1 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) +SFX_Cry0A_3_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) endchannel -SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) +SFX_Cry0A_3_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) endchannel -SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81) +SFX_Cry0A_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 0f0edca7..d0da6c2e 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) +SFX_Cry0B_1_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) endchannel -SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) +SFX_Cry0B_1_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) endchannel -SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5) +SFX_Cry0B_1_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 071cd9b1..0fe7840a 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) +SFX_Cry0B_2_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) endchannel -SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) +SFX_Cry0B_2_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) endchannel -SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d) +SFX_Cry0B_2_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index c2bd1809..ff761b85 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) +SFX_Cry0B_3_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) endchannel -SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) +SFX_Cry0B_3_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) endchannel -SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a) +SFX_Cry0B_3_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 1c0f9f65..4ff72662 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) +SFX_Cry0C_1_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) endchannel -SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) +SFX_Cry0C_1_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b) +SFX_Cry0C_1_Ch3: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index ef598b3e..8fb925da 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) +SFX_Cry0C_2_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) endchannel -SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) +SFX_Cry0C_2_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3) +SFX_Cry0C_2_Ch3: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 4075ac51..149b585d 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) +SFX_Cry0C_3_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) endchannel -SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) +SFX_Cry0C_3_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80) +SFX_Cry0C_3_Ch3: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 591bf58e..dccccb4e 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) +SFX_Cry0D_1_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) endchannel -SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) +SFX_Cry0D_1_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) endchannel -SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78) +SFX_Cry0D_1_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index a7ca34f1..718364dd 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) +SFX_Cry0D_2_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) endchannel -SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) +SFX_Cry0D_2_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) endchannel -SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20) +SFX_Cry0D_2_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index a9187dc8..ce26e7e5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) +SFX_Cry0D_3_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) endchannel -SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) +SFX_Cry0D_3_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) endchannel -SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed) +SFX_Cry0D_3_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 1e778dea..c30aaf20 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: ; 89af (2:49af) +SFX_Cry0E_1_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: ; 89af (2:49af) endchannel -SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) +SFX_Cry0E_1_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) endchannel -SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5) +SFX_Cry0E_1_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index bab74449..194fb04b 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) +SFX_Cry0E_2_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) endchannel -SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) +SFX_Cry0E_2_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) endchannel -SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d) +SFX_Cry0E_2_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index da14b3a7..062e8970 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) +SFX_Cry0E_3_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) endchannel -SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) +SFX_Cry0E_3_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) endchannel -SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a) +SFX_Cry0E_3_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 84563293..1646d4b5 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) +SFX_Cry0F_1_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) endchannel -SFX_Cry0F_1_Ch2: ; 890c (2:490c) +SFX_Cry0F_1_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: ; 890c (2:490c) endchannel -SFX_Cry0F_1_Ch3: ; 8927 (2:4927) +SFX_Cry0F_1_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 0fbaeb7a..6058e7cc 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) +SFX_Cry0F_2_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) endchannel -SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) +SFX_Cry0F_2_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) endchannel -SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf) +SFX_Cry0F_2_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 810ab949..113f5ed1 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) +SFX_Cry0F_3_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) endchannel -SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) +SFX_Cry0F_3_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) endchannel -SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c) +SFX_Cry0F_3_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 956fc910..5199b973 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: ; 8937 (2:4937) +SFX_Cry10_1_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: ; 8937 (2:4937) endchannel -SFX_Cry10_1_Ch2: ; 895a (2:495a) +SFX_Cry10_1_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: ; 895a (2:495a) endchannel -SFX_Cry10_1_Ch3: ; 897d (2:497d) +SFX_Cry10_1_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 5d4cc3aa..789c61b1 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) +SFX_Cry10_2_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) endchannel -SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) +SFX_Cry10_2_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) endchannel -SFX_Cry10_2_Ch3: ; 20c25 (8:4c25) +SFX_Cry10_2_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 2d5df465..83980fc7 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) +SFX_Cry10_3_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) endchannel -SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) +SFX_Cry10_3_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) endchannel -SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2) +SFX_Cry10_3_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index dd354c90..d7e0b0f9 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: ; 8813 (2:4813) +SFX_Cry11_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: ; 8813 (2:4813) endchannel -SFX_Cry11_1_Ch2: ; 8832 (2:4832) +SFX_Cry11_1_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: ; 8832 (2:4832) endchannel -SFX_Cry11_1_Ch3: ; 8855 (2:4855) +SFX_Cry11_1_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 37546fe1..f46580eb 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: ; 20abb (8:4abb) +SFX_Cry11_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: ; 20abb (8:4abb) endchannel -SFX_Cry11_2_Ch2: ; 20ada (8:4ada) +SFX_Cry11_2_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: ; 20ada (8:4ada) endchannel -SFX_Cry11_2_Ch3: ; 20afd (8:4afd) +SFX_Cry11_2_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 75b9a861..c07e01a5 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) +SFX_Cry11_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) endchannel -SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) +SFX_Cry11_3_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) endchannel -SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca) +SFX_Cry11_3_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index a6b1a0f8..62956626 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) +SFX_Cry12_1_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) endchannel -SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) +SFX_Cry12_1_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) endchannel -SFX_Cry12_1_Ch3: ; 8d51 (2:4d51) +SFX_Cry12_1_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index e2b29de7..4acb8911 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) +SFX_Cry12_2_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) endchannel -SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) +SFX_Cry12_2_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) endchannel -SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9) +SFX_Cry12_2_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 143f8045..bb433ac9 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) +SFX_Cry12_3_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) endchannel -SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) +SFX_Cry12_3_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) endchannel -SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6) +SFX_Cry12_3_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index c2f1002f..7f9ef226 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) +SFX_Cry13_1_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) endchannel -SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) +SFX_Cry13_1_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) endchannel -SFX_Cry13_1_Ch3: ; 8d94 (2:4d94) +SFX_Cry13_1_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index b072fb07..35d723dd 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: ; 21006 (8:5006) +SFX_Cry13_2_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: ; 21006 (8:5006) endchannel -SFX_Cry13_2_Ch2: ; 21021 (8:5021) +SFX_Cry13_2_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: ; 21021 (8:5021) endchannel -SFX_Cry13_2_Ch3: ; 2103c (8:503c) +SFX_Cry13_2_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index f2c110b8..a298e5ff 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) +SFX_Cry13_3_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) endchannel -SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) +SFX_Cry13_3_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) endchannel -SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09) +SFX_Cry13_3_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 125fe86e..b3cb43b9 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) +SFX_Cry14_1_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) endchannel -SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) +SFX_Cry14_1_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) endchannel -SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5) +SFX_Cry14_1_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 3ba2ac26..d243bcbd 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: ; 2104f (8:504f) +SFX_Cry14_2_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: ; 2104f (8:504f) endchannel -SFX_Cry14_2_Ch2: ; 2105e (8:505e) +SFX_Cry14_2_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: ; 2105e (8:505e) endchannel -SFX_Cry14_2_Ch3: ; 2106d (8:506d) +SFX_Cry14_2_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index fe2cd1e8..b1a32bc4 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) +SFX_Cry14_3_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) endchannel -SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) +SFX_Cry14_3_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) endchannel -SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a) +SFX_Cry14_3_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 54f94deb..4ebd4963 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) +SFX_Cry15_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) endchannel -SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) +SFX_Cry15_1_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) endchannel -SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b) +SFX_Cry15_1_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 14b1af72..77807203 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: ; 210dd (8:50dd) +SFX_Cry15_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: ; 210dd (8:50dd) endchannel -SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) +SFX_Cry15_2_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) endchannel -SFX_Cry15_2_Ch3: ; 21113 (8:5113) +SFX_Cry15_2_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 36951439..2c24d658 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) +SFX_Cry15_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) endchannel -SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) +SFX_Cry15_3_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) endchannel -SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0) +SFX_Cry15_3_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 91fa2596..8a7ee4c1 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) +SFX_Cry16_1_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) endchannel -SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) +SFX_Cry16_1_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) endchannel -SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6) +SFX_Cry16_1_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 5e29eba8..46729c2a 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) +SFX_Cry16_2_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) endchannel -SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) +SFX_Cry16_2_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) endchannel -SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e) +SFX_Cry16_2_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index af32e9ef..a94ac495 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) +SFX_Cry16_3_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) endchannel -SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) +SFX_Cry16_3_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) endchannel -SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b) +SFX_Cry16_3_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 2f2cde11..ddf0967d 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) +SFX_Cry17_1_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) endchannel -SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) +SFX_Cry17_1_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) endchannel -SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4) +SFX_Cry17_1_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index cca78ae2..f2528875 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: ; 21126 (8:5126) +SFX_Cry17_2_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: ; 21126 (8:5126) endchannel -SFX_Cry17_2_Ch2: ; 21139 (8:5139) +SFX_Cry17_2_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: ; 21139 (8:5139) endchannel -SFX_Cry17_2_Ch3: ; 2114c (8:514c) +SFX_Cry17_2_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 6aad35d0..f180a3b8 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) +SFX_Cry17_3_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) endchannel -SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) +SFX_Cry17_3_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) endchannel -SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19) +SFX_Cry17_3_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 576ea693..c28bf7f4 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) +SFX_Cry18_1_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) endchannel -SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) +SFX_Cry18_1_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) endchannel -SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4) +SFX_Cry18_1_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 333ddb9e..1c3c26b9 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: ; 21236 (8:5236) +SFX_Cry18_2_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: ; 21236 (8:5236) endchannel -SFX_Cry18_2_Ch2: ; 21259 (8:5259) +SFX_Cry18_2_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: ; 21259 (8:5259) endchannel -SFX_Cry18_2_Ch3: ; 2127c (8:527c) +SFX_Cry18_2_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 3c7b1a99..ceeda42f 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) +SFX_Cry18_3_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) endchannel -SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) +SFX_Cry18_3_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) endchannel -SFX_Cry18_3_Ch3: ; 7d049 (1f:5049) +SFX_Cry18_3_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 94607b9b..4b5b4ed0 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) +SFX_Cry19_1_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) endchannel -SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) +SFX_Cry19_1_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7) +SFX_Cry19_1_Ch3: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 717a5d2b..9c9557a9 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) +SFX_Cry19_2_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) endchannel -SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) +SFX_Cry19_2_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f) +SFX_Cry19_2_Ch3: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 535be2b6..71eccbf8 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) +SFX_Cry19_3_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) endchannel -SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) +SFX_Cry19_3_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c) +SFX_Cry19_3_Ch3: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 0217deef..7f8911c7 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) +SFX_Cry1A_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) endchannel -SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) +SFX_Cry1A_1_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) endchannel -SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35) +SFX_Cry1A_1_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index c94fc657..da54ff6e 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) +SFX_Cry1A_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) endchannel -SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) +SFX_Cry1A_2_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) endchannel -SFX_Cry1A_2_Ch3: ; 211dd (8:51dd) +SFX_Cry1A_2_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 29ff2ec0..d16cf035 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) +SFX_Cry1A_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) endchannel -SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) +SFX_Cry1A_3_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) endchannel -SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa) +SFX_Cry1A_3_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 858d724a..f6f03c98 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) +SFX_Cry1B_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) endchannel -SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) +SFX_Cry1B_1_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) endchannel -SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e) +SFX_Cry1B_1_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 423258ee..fe96943d 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) +SFX_Cry1B_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) endchannel -SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) +SFX_Cry1B_2_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) endchannel -SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6) +SFX_Cry1B_2_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 7fe6019f..8a034b1e 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) +SFX_Cry1B_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) endchannel -SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) +SFX_Cry1B_3_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) endchannel -SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93) +SFX_Cry1B_3_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index f7e66dfb..1561353e 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) +SFX_Cry1C_1_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) endchannel -SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) +SFX_Cry1C_1_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) endchannel -SFX_Cry1C_1_Ch3: ; 8eef (2:4eef) +SFX_Cry1C_1_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 8037fc96..c589a24d 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: ; 21159 (8:5159) +SFX_Cry1C_2_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: ; 21159 (8:5159) endchannel -SFX_Cry1C_2_Ch2: ; 2117c (8:517c) +SFX_Cry1C_2_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: ; 2117c (8:517c) endchannel -SFX_Cry1C_2_Ch3: ; 21197 (8:5197) +SFX_Cry1C_2_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 853eb1c6..930e3368 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) +SFX_Cry1C_3_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) endchannel -SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) +SFX_Cry1C_3_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) endchannel -SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64) +SFX_Cry1C_3_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6e2818c1..6b8b3f79 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) +SFX_Cry1D_1_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) endchannel -SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) +SFX_Cry1D_1_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) endchannel -SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e) +SFX_Cry1D_1_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index c7a2c512..31fccb8d 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) +SFX_Cry1D_2_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) endchannel -SFX_Cry1D_2_Ch2: ; 2120b (8:520b) +SFX_Cry1D_2_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: ; 2120b (8:520b) endchannel -SFX_Cry1D_2_Ch3: ; 21226 (8:5226) +SFX_Cry1D_2_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 7210406c..fbbe9ca5 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) +SFX_Cry1D_3_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) endchannel -SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) +SFX_Cry1D_3_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) endchannel -SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3) +SFX_Cry1D_3_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index e445fdd7..9501a06a 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) +SFX_Cry1E_1_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) endchannel -SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) +SFX_Cry1E_1_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) endchannel -SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19) +SFX_Cry1E_1_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 59c9985f..fe112101 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: ; 21077 (8:5077) +SFX_Cry1E_2_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: ; 21077 (8:5077) endchannel -SFX_Cry1E_2_Ch2: ; 2109a (8:509a) +SFX_Cry1E_2_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: ; 2109a (8:509a) endchannel -SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1) +SFX_Cry1E_2_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 1c50d4b8..f5bdbe08 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) +SFX_Cry1E_3_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) endchannel -SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) +SFX_Cry1E_3_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) endchannel -SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e) +SFX_Cry1E_3_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 52be80df..28b91c61 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) +SFX_Cry1F_1_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) endchannel -SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) +SFX_Cry1F_1_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) endchannel -SFX_Cry1F_1_Ch3: ; 900d (2:500d) +SFX_Cry1F_1_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index da7df61a..9691654f 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: ; 2128f (8:528f) +SFX_Cry1F_2_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: ; 2128f (8:528f) endchannel -SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) +SFX_Cry1F_2_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) endchannel -SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5) +SFX_Cry1F_2_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 2f6c1eda..3c50327b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) +SFX_Cry1F_3_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) endchannel -SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) +SFX_Cry1F_3_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) endchannel -SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082) +SFX_Cry1F_3_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index d6586bdd..0e9ffb00 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: ; 901a (2:501a) +SFX_Cry20_1_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: ; 901a (2:501a) endchannel -SFX_Cry20_1_Ch2: ; 902d (2:502d) +SFX_Cry20_1_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: ; 902d (2:502d) endchannel -SFX_Cry20_1_Ch3: ; 9040 (2:5040) +SFX_Cry20_1_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index b345eba5..91891b4f 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) +SFX_Cry20_2_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) endchannel -SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) +SFX_Cry20_2_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) endchannel -SFX_Cry20_2_Ch3: ; 212e8 (8:52e8) +SFX_Cry20_2_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 5bcdf3df..1fae1bb3 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) +SFX_Cry20_3_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) endchannel -SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) +SFX_Cry20_3_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) endchannel -SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5) +SFX_Cry20_3_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 9b81e2a3..17d1e16c 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: ; 904d (2:504d) +SFX_Cry21_1_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: ; 904d (2:504d) endchannel -SFX_Cry21_1_Ch2: ; 9070 (2:5070) +SFX_Cry21_1_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: ; 9070 (2:5070) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: ; 9092 (2:5092) +SFX_Cry21_1_Ch3: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index f5571642..14856fc9 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) +SFX_Cry21_2_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) endchannel -SFX_Cry21_2_Ch2: ; 21318 (8:5318) +SFX_Cry21_2_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: ; 21318 (8:5318) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: ; 2133a (8:533a) +SFX_Cry21_2_Ch3: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index d91177b8..40cbf7f2 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) +SFX_Cry21_3_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) endchannel -SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) +SFX_Cry21_3_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: ; 7d107 (1f:5107) +SFX_Cry21_3_Ch3: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 90961298..fb0c6b23 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: ; 9093 (2:5093) +SFX_Cry22_1_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: ; 9093 (2:5093) endchannel -SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) +SFX_Cry22_1_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) endchannel -SFX_Cry22_1_Ch3: ; 90b9 (2:50b9) +SFX_Cry22_1_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 861c3bfb..7653234e 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: ; 2133b (8:533b) +SFX_Cry22_2_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: ; 2133b (8:533b) endchannel -SFX_Cry22_2_Ch2: ; 2134e (8:534e) +SFX_Cry22_2_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: ; 2134e (8:534e) endchannel -SFX_Cry22_2_Ch3: ; 21361 (8:5361) +SFX_Cry22_2_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 42b3039c..96fae832 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) +SFX_Cry22_3_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) endchannel -SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) +SFX_Cry22_3_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) endchannel -SFX_Cry22_3_Ch3: ; 7d12e (1f:512e) +SFX_Cry22_3_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 02868042..4aaa3bfa 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: ; 8786 (2:4786) +SFX_Cry23_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: ; 8786 (2:4786) endchannel -SFX_Cry23_1_Ch2: ; 879d (2:479d) +SFX_Cry23_1_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: ; 879d (2:479d) endchannel -SFX_Cry23_1_Ch3: ; 87b0 (2:47b0) +SFX_Cry23_1_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 089a233c..644b14cf 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) +SFX_Cry23_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) endchannel -SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) +SFX_Cry23_2_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) endchannel -SFX_Cry23_2_Ch3: ; 20a58 (8:4a58) +SFX_Cry23_2_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 31ba3743..d86dfcd4 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) +SFX_Cry23_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) endchannel -SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) +SFX_Cry23_3_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) endchannel -SFX_Cry23_3_Ch3: ; 7c825 (1f:4825) +SFX_Cry23_3_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 061ed65a..a94803c1 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: ; 87bd (2:47bd) +SFX_Cry24_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: ; 87bd (2:47bd) endchannel -SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) +SFX_Cry24_1_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) endchannel -SFX_Cry24_1_Ch3: ; 8803 (2:4803) +SFX_Cry24_1_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 52986829..cc8b2f87 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) +SFX_Cry24_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) endchannel -SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) +SFX_Cry24_2_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) endchannel -SFX_Cry24_2_Ch3: ; 20aab (8:4aab) +SFX_Cry24_2_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 8c9cfc81..37926146 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) +SFX_Cry24_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) endchannel -SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) +SFX_Cry24_3_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) endchannel -SFX_Cry24_3_Ch3: ; 7c878 (1f:4878) +SFX_Cry24_3_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index ce238db2..d54b8d6c 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: ; 886b (2:486b) +SFX_Cry25_1_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: ; 886b (2:486b) endchannel -SFX_Cry25_1_Ch2: ; 8882 (2:4882) +SFX_Cry25_1_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: ; 8882 (2:4882) endchannel -SFX_Cry25_1_Ch3: ; 8899 (2:4899) +SFX_Cry25_1_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index b00210a9..48e4d057 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) +SFX_Cry25_2_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) endchannel -SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) +SFX_Cry25_2_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) endchannel -SFX_Cry25_2_Ch3: ; 20b41 (8:4b41) +SFX_Cry25_2_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 7c93b0e6..f08c6a00 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) +SFX_Cry25_3_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) endchannel -SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) +SFX_Cry25_3_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) endchannel -SFX_Cry25_3_Ch3: ; 7c90e (1f:490e) +SFX_Cry25_3_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index c1b763e0..a42cd660 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: ; 83e1 (2:43e1) +SFX_Cut_1_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 4ad5551d..12c2366e 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca) +SFX_Cut_3_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index d001b750..3f3c6d8b 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: ; 833b (2:433b) +SFX_Cymbal1_1_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index 8987d85f..bb1e3e3e 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: ; 2033b (8:433b) +SFX_Cymbal1_2_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 597a8b61..9587977f 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b) +SFX_Cymbal1_3_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 3f50299a..2ec3fc86 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: ; 833f (2:433f) +SFX_Cymbal2_1_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 5224a20d..8b27a0de 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: ; 2033f (8:433f) +SFX_Cymbal2_2_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index dd3a4fc9..642a336a 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f) +SFX_Cymbal2_3_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 8aa5ebe5..3fd225e2 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: ; 8343 (2:4343) +SFX_Cymbal3_1_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index d1fd3b90..1435b5ed 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: ; 20343 (8:4343) +SFX_Cymbal3_2_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 45e41c15..b45fb03d 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343) +SFX_Cymbal3_3_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 4022fcbf..ea2727d8 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: ; 204f4 (8:44f4) +SFX_Damage_Ch1: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 46520151..d954308a 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: ; 861f (2:461f) +SFX_Denied_1_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: ; 861f (2:461f) endchannel -SFX_Denied_1_Ch2: ; 8636 (2:4636) +SFX_Denied_1_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 2cebd766..ca82a739 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) +SFX_Denied_3_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) endchannel -SFX_Denied_3_Ch2: ; 7c613 (1f:4613) +SFX_Denied_3_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index dac55ed9..6e3a0dcf 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) +SFX_Dex_Page_Added_Ch1: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) endchannel -SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490) +SFX_Dex_Page_Added_Ch2: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 0918238a..5cae0a4b 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: ; 2058c (8:458c) +SFX_Doubleslap_Ch1: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 5c1a189a..b2450ced 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: ; 853b (2:453b) +SFX_Enter_PC_1_Ch1: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 5907a7e5..061068ce 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518) +SFX_Enter_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index c252b93a..cd1b2cdc 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: ; 204ae (8:44ae) +SFX_Faint_Fall_Ch1: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 5ef100c5..7b6ec0a0 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: ; 2044c (8:444c) +SFX_Faint_Thud_Ch1: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: ; 20453 (8:4453) +SFX_Faint_Thud_Ch2: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index c2ecf435..2b487bc2 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: ; 85ee (2:45ee) +SFX_Fly_1_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 043d4b51..c081030d 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb) +SFX_Fly_3_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 471124d7..ba428722 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) +SFX_Get_Item1_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) endchannel -SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) +SFX_Get_Item1_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) endchannel -SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e) +SFX_Get_Item1_1_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index 6a7ebabc..b30ce40c 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) +SFX_Get_Item1_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) endchannel -SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) +SFX_Get_Item1_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) endchannel -SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877) +SFX_Get_Item1_3_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 6fda3404..67bb7bb8 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: ; b316 (2:7316) +SFX_Get_Item2_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: ; b316 (2:7316) endchannel -SFX_Get_Item2_1_Ch2: ; b335 (2:7335) +SFX_Get_Item2_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: ; b335 (2:7335) endchannel -SFX_Get_Item2_1_Ch3: ; b34d (2:734d) +SFX_Get_Item2_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 25e40744..292a74f6 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) +SFX_Get_Item2_2_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) endchannel -SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) +SFX_Get_Item2_2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) endchannel -SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe) +SFX_Get_Item2_2_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 20a0ee04..1a833741 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) +SFX_Get_Item2_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) endchannel -SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) +SFX_Get_Item2_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) endchannel -SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f) +SFX_Get_Item2_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_4_2.asm b/audio/sfx/get_item2_4_2.asm index 6f97390e..4f7e38eb 100644 --- a/audio/sfx/get_item2_4_2.asm +++ b/audio/sfx/get_item2_4_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_4_2_Ch1: ; 802eb (20:42eb) +SFX_Get_Item2_4_2_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_4_2_Ch1: ; 802eb (20:42eb) endchannel -SFX_Get_Item2_4_2_Ch2: ; 8030a (20:430a) +SFX_Get_Item2_4_2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_4_2_Ch2: ; 8030a (20:430a) endchannel -SFX_Get_Item2_4_2_Ch3: ; 80322 (20:4322) +SFX_Get_Item2_4_2_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index 233ea01b..c8da1745 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) +SFX_Get_Key_Item_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) endchannel -SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) +SFX_Get_Key_Item_1_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) endchannel -SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d) +SFX_Get_Key_Item_1_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index f918e1bf..e6a50929 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) +SFX_Get_Key_Item_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) endchannel -SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) +SFX_Get_Key_Item_3_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) endchannel -SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf) +SFX_Get_Key_Item_3_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 1eb1e2ca..5da5be86 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1) +SFX_Go_Inside_1_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index d8e18b7d..460b3b4a 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da) +SFX_Go_Inside_3_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2e8a8b31..2038d299 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: ; 8452 (2:4452) +SFX_Go_Outside_1_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 2dc4242d..d45b8410 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b) +SFX_Go_Outside_3_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 5937f3a2..3a292b82 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9) +SFX_Heal_Ailment_1_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 4b39895a..25e1bbe0 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd) +SFX_Heal_Ailment_2_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index b2805f3d..2719358f 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2) +SFX_Heal_Ailment_3_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index eb8063f7..a23db490 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7) +SFX_Heal_HP_1_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 890a2151..f21f6712 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee) +SFX_Heal_HP_2_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index da80d48f..96ff391b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490) +SFX_Heal_HP_3_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 4babf6b0..ecb7c09c 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580) +SFX_Healing_Machine_1_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index c72f7905..ec73e139 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d) +SFX_Healing_Machine_3_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index e68e5834..b1af527b 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1) +SFX_Horn_Drill_Ch1: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 65e475f8..69d6ff9b 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de) +SFX_Intro_Crash_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 70d0f8b1..3d6de9d6 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be) +SFX_Intro_Hip_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 223c7f25..8e077c67 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9) +SFX_Intro_Hop_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ad00f56f..cb7570de 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5) +SFX_Intro_Lunge_Ch1: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index d6ee1430..0088228f 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4) +SFX_Intro_Raise_Ch1: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 903b7252..5609bfc0 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5) +SFX_Intro_Whoosh_Ch1: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index dfd7c819..72aa087e 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: ; 85d6 (2:45d6) +SFX_Ledge_1_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 2bf172e7..a554282e 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3) +SFX_Ledge_3_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 03e077ec..f0890eab 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: ; 2397d (8:797d) +SFX_Level_Up_Ch1: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: ; 2397d (8:797d) endchannel -SFX_Level_Up_Ch2: ; 23998 (8:7998) +SFX_Level_Up_Ch2: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: ; 23998 (8:7998) endchannel -SFX_Level_Up_Ch3: ; 239b0 (8:79b0) +SFX_Level_Up_Ch3: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index 5d10ecc1..b29a5b87 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347) +SFX_Muted_Snare1_1_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index ea3cfc8c..a7f5467f 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347) +SFX_Muted_Snare1_2_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 27caa37b..136018ef 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347) +SFX_Muted_Snare1_3_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 7ab6252b..9ad52c27 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355) +SFX_Muted_Snare2_1_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index a9359226..20670ec8 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355) +SFX_Muted_Snare2_2_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 7ac9705d..007d462d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355) +SFX_Muted_Snare2_3_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 1cd27319..8db6b874 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359) +SFX_Muted_Snare3_1_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 1606b6d5..013ea9ab 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359) +SFX_Muted_Snare3_2_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index c0fe7efb..038a66db 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359) +SFX_Muted_Snare3_3_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index bcac6440..99429995 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d) +SFX_Muted_Snare4_1_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 6910c20d..11ee3218 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d) +SFX_Muted_Snare4_2_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 52f14f21..86223813 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d) +SFX_Muted_Snare4_3_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 959f33e3..8a4c521e 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe) +SFX_Not_Very_Effective_Ch1: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index e4632281..c474e9b3 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: ; 204aa (8:44aa) +SFX_Peck_Ch1: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 4760696d..bfd619fd 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6) +SFX_Poisoned_1_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b6d69dc6..b972ca92 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f) +SFX_Poisoned_3_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 21503d16..eccf0ee5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) +SFX_Pokedex_Rating_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) endchannel -SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) +SFX_Pokedex_Rating_1_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) endchannel -SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7) +SFX_Pokedex_Rating_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index a9ea1c75..ec82888e 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) +SFX_Pokedex_Rating_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) endchannel -SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) +SFX_Pokedex_Rating_3_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) endchannel -SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09) +SFX_Pokedex_Rating_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 4abf1713..cf61a6ee 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: ; 83ca (2:43ca) +SFX_Pokeflute_Ch1: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm index d912b168..84631bca 100644 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ b/audio/sfx/pokeflute_ch1_ch2.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: ; 219eb (8:59eb) +SFX_08_PokeFlute_Ch1: tempo 256 -SFX_08_PokeFlute_Ch2: ; 219ee (8:59ee) +SFX_08_PokeFlute_Ch2: executemusic notetype 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm index 0652e673..3c883462 100644 --- a/audio/sfx/pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch3.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) +SFX_08_PokeFlute_Ch3: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 102d7d6d..f70f6725 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: ; 204c4 (8:44c4) +SFX_Pound_Ch1: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 5925b788..f68a6384 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: ; 8462 (2:4462) +SFX_Press_AB_1_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index e15dadc4..83b5ccd6 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3) +SFX_Press_AB_2_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 8af4a335..167c0fb1 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b) +SFX_Press_AB_3_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 65fcc229..893d4334 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,4 +1,4 @@ -SFX_Psybeam_Ch1: ; 20759 (8:4759) +SFX_Psybeam_Ch1: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 @@ -8,7 +8,7 @@ SFX_Psybeam_Ch1: ; 20759 (8:4759) endchannel -SFX_Psybeam_Ch2: ; 20770 (8:4770) +SFX_Psybeam_Ch2: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 @@ -18,7 +18,7 @@ SFX_Psybeam_Ch2: ; 20770 (8:4770) endchannel -SFX_Psybeam_Ch3: ; 20787 (8:4787) +SFX_Psybeam_Ch3: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 loopchannel 21, SFX_Psybeam_Ch3 diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index e734b7ac..abaa8345 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: ; 207fa (8:47fa) +SFX_Psychic_M_Ch1: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: ; 207fa (8:47fa) endchannel -SFX_Psychic_M_Ch2: ; 20819 (8:4819) +SFX_Psychic_M_Ch2: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: ; 20819 (8:4819) endchannel -SFX_Psychic_M_Ch3: ; 20834 (8:4834) +SFX_Psychic_M_Ch3: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index fc0cecb5..767035ea 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: ; 842d (2:442d) +SFX_Purchase_1_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: ; 8438 (2:4438) +SFX_Purchase_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 5d649958..65a22527 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: ; 7c416 (1f:4416) +SFX_Purchase_3_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: ; 7c421 (1f:4421) +SFX_Purchase_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index 31096861..cf43bbcf 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654) +SFX_Push_Boulder_1_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index ca7d2cd1..9f536964 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631) +SFX_Push_Boulder_3_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 653b0f6b..656d3d01 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: ; 2045d (8:445d) +SFX_Run_Ch1: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index fb8c4d1f..d385feb3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8) +SFX_Safari_Zone_PA_Ch1: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 2e6c1f2b..13cb46e5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: ; 8475 (2:4475) +SFX_Save_1_Ch1: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: ; 8475 (2:4475) endchannel -SFX_Save_1_Ch2: ; 8494 (2:4494) +SFX_Save_1_Ch2: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index e0c8ce2b..7f0df72c 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: ; 7c45e (1f:445e) +SFX_Save_3_Ch1: duty 2 unknownsfx0x20 3, 228, 0, 6 unknownsfx0x20 3, 228, 128, 6 @@ -7,7 +7,7 @@ SFX_Save_3_Ch1: ; 7c45e (1f:445e) unknownsfx0x20 15, 242, 224, 7 endchannel -SFX_Save_3_Ch2: ; 7c475 (1f:4475) +SFX_Save_3_Ch2: duty 2 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 3, 196, 1, 6 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 09dc4bf9..282f83b5 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) +SFX_Shooting_Star_Ch1: dutycycle 136 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 61ca1933..d69d60de 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: ; 854e (2:454e) +SFX_Shrink_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 59fe1556..e5c4b7af 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: ; 7c52b (1f:452b) +SFX_Shrink_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 66e4fe95..ad789af2 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: ; 20412 (8:4412) +SFX_Silph_Scope_Ch1: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d122517d..d29529e9 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) +SFX_Slots_New_Spin_Ch1: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) endchannel -SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e) +SFX_Slots_New_Spin_Ch2: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 2400c0df..d7833f55 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704) +SFX_Slots_Reward_Ch1: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index e67af4c4..00641a5e 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5) +SFX_Slots_Stop_Wheel_Ch1: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 3aa0f74e..9f7b4138 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: ; 82fd (2:42fd) +SFX_Snare1_1_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 7d0c3413..55fdf84a 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: ; 202fd (8:42fd) +SFX_Snare1_2_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 8d92bff6..cab603c1 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd) +SFX_Snare1_3_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 7636a4f3..e40facb5 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: ; 8301 (2:4301) +SFX_Snare2_1_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 4c34e91a..82deb096 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: ; 20301 (8:4301) +SFX_Snare2_2_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index eb816f54..fb5e1672 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: ; 7c301 (1f:4301) +SFX_Snare2_3_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index b7e319b2..c2b20add 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: ; 8305 (2:4305) +SFX_Snare3_1_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index ce889e55..16f87fc5 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: ; 20305 (8:4305) +SFX_Snare3_2_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index c94f436f..6b9a006f 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: ; 7c305 (1f:4305) +SFX_Snare3_3_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 20c62731..2796410c 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: ; 8309 (2:4309) +SFX_Snare4_1_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index da38dd62..920321ab 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: ; 20309 (8:4309) +SFX_Snare4_2_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 4496260b..a47c332c 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: ; 7c309 (1f:4309) +SFX_Snare4_3_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index e0ae8b4c..dd4eab3a 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: ; 830d (2:430d) +SFX_Snare5_1_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 649463cc..fad74021 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: ; 2030d (8:430d) +SFX_Snare5_2_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 33a169b9..d0ca1d91 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: ; 7c30d (1f:430d) +SFX_Snare5_3_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 4779226f..74bf01c7 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: ; 832b (2:432b) +SFX_Snare6_1_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 36359d02..0a96680e 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: ; 2032b (8:432b) +SFX_Snare6_2_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index d4807ff6..f3130931 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: ; 7c32b (1f:432b) +SFX_Snare6_3_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index c53642ed..ef8f80ab 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: ; 832f (2:432f) +SFX_Snare7_1_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 066aaa53..5e266b12 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: ; 2032f (8:432f) +SFX_Snare7_2_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 1b058a9b..26db3703 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: ; 7c32f (1f:432f) +SFX_Snare7_3_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 6269c7dc..5f624177 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: ; 8333 (2:4333) +SFX_Snare8_1_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 4c5bb18e..cf5d5654 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: ; 20333 (8:4333) +SFX_Snare8_2_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index d1f0edc0..7da0e415 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: ; 7c333 (1f:4333) +SFX_Snare8_3_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 44b2e8c7..c511cdaf 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: ; 8337 (2:4337) +SFX_Snare9_1_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 1d20de2d..db9aecf9 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: ; 20337 (8:4337) +SFX_Snare9_2_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 849f4404..18df2e46 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: ; 7c337 (1f:4337) +SFX_Snare9_3_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 3989c148..66c95262 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) +SFX_SS_Anne_Horn_1_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) endchannel -SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c) +SFX_SS_Anne_Horn_1_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index c671b6cb..070f111c 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) +SFX_SS_Anne_Horn_3_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) endchannel -SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669) +SFX_SS_Anne_Horn_3_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 350b08ce..f509326c 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3) +SFX_Start_Menu_1_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index aabd41ce..92bb7558 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6) +SFX_Start_Menu_2_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 566f11f4..74c82cf3 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3) +SFX_Start_Menu_3_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 6759ef6a..70d7014a 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: ; 20574 (8:4574) +SFX_Super_Effective_Ch1: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index c96d8522..782dd3fb 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: ; 83f8 (2:43f8) +SFX_Swap_1_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: ; 83ff (2:43ff) +SFX_Swap_1_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_2.asm b/audio/sfx/swap_2.asm index 200536ec..270cf15b 100644 --- a/audio/sfx/swap_2.asm +++ b/audio/sfx/swap_2.asm @@ -1,11 +1,11 @@ -SFX_Swap_2_Ch1: ; 20439 (2:4439) +SFX_Swap_2_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_2_Ch2: ; 20440 (2:4440) +SFX_Swap_2_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 - endchannel
\ No newline at end of file + endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 95aa3f19..4fc1db1d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1) +SFX_Swap_3_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8) +SFX_Swap_3_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 040e95aa..ac9fb680 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: ; 8569 (2:4569) +SFX_Switch_1_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index cbe6c8b2..81b68d26 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: ; 7c546 (1f:4546) +SFX_Switch_3_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index f9fc5ee2..0522ee16 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0) +SFX_Teleport_Enter1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 24220173..6518e416 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d) +SFX_Teleport_Enter1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index c3c593b2..338c1c30 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1) +SFX_Teleport_Enter2_1_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index 628bb9fa..f6cd103c 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be) +SFX_Teleport_Enter2_3_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 46ba29cf..f916d539 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595) +SFX_Teleport_Exit1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 8d203212..67739bd1 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572) +SFX_Teleport_Exit1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 37159083..1e1de5a5 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb) +SFX_Teleport_Exit2_1_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index c7ad054b..928e486e 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8) +SFX_Teleport_Exit2_3_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index a8099ae1..e6eff9ac 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: ; 840a (2:440a) +SFX_Tink_1_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index cca37381..fa06cf19 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: ; 203dd (8:43dd) +SFX_Tink_2_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index 7299b7ae..d786d289 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3) +SFX_Tink_3_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index ce2bbc0a..87993851 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee) +SFX_Trade_Machine_1_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index f7515ffb..6b70d5da 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7) +SFX_Trade_Machine_3_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index fded5b94..94b61fe1 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: ; 8320 (2:4320) +SFX_Triangle1_1_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 4f4474ee..1c9c1d29 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: ; 20320 (8:4320) +SFX_Triangle1_2_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index d1ad9390..b900da7c 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320) +SFX_Triangle1_3_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index f9c4bc6a..0f648237 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: ; 8324 (2:4324) +SFX_Triangle2_1_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index feddf1af..cbc2a642 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: ; 20324 (8:4324) +SFX_Triangle2_2_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index a4acff1b..44fc95dd 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324) +SFX_Triangle2_3_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index e4c3c919..f5622bd7 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: ; 834e (2:434e) +SFX_Triangle3_1_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 7a642878..8b0b76e5 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: ; 2034e (8:434e) +SFX_Triangle3_2_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 73ad42ce..d40779fb 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e) +SFX_Triangle3_3_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 7b4e999d..ca29a4cc 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528) +SFX_Turn_Off_PC_1_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 057ab9a4..2ae0787b 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505) +SFX_Turn_Off_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index b537791c..22433707 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd) +SFX_Turn_On_PC_1_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index df654cfa..d97dc1c7 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6) +SFX_Turn_On_PC_3_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 1eca4432..7e0350d4 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: ; 2232f (8:632f) +SFX_08_unused2_Ch1: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) endchannel -SFX_08_unused2_Ch2: ; 22347 (8:6347) +SFX_08_unused2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) endchannel -SFX_08_unused2_Ch3: ; 22359 (8:6359) +SFX_08_unused2_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index bd9bdfb3..d0bbfd59 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: ; 86e3 (2:46e3) +SFX_02_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: ; 86e3 (2:46e3) endchannel -SFX_02_unused_Ch2: ; 86fe (2:46fe) +SFX_02_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: ; 86fe (2:46fe) endchannel -SFX_02_unused_Ch3: ; 8719 (2:4719) +SFX_02_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 25e4840c..fd491b71 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: ; 2098b (8:498b) +SFX_08_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: ; 2098b (8:498b) endchannel -SFX_08_unused_Ch2: ; 209a6 (8:49a6) +SFX_08_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: ; 209a6 (8:49a6) endchannel -SFX_08_unused_Ch3: ; 209c1 (8:49c1) +SFX_08_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index dfb16ee1..b00e55f5 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: ; 7c758 (1f:4758) +SFX_1f_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: ; 7c758 (1f:4758) endchannel -SFX_1f_unused_Ch2: ; 7c773 (1f:4773) +SFX_1f_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: ; 7c773 (1f:4773) endchannel -SFX_1f_unused_Ch3: ; 7c78e (1f:478e) +SFX_1f_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index c1e610b6..a8445131 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: ; 20533 (8:4533) +SFX_Vine_Whip_Ch1: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index bb7a8d6e..59827ceb 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab) +SFX_Withdraw_Deposit_1_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 99e47fee..0add48e1 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688) +SFX_Withdraw_Deposit_3_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/constants.asm b/constants.asm index 554f89ca..cc636558 100644 --- a/constants.asm +++ b/constants.asm @@ -29,5 +29,5 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" -INCLUDE "constants/pikachu_emotion_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/pikachu_emotion_constants.asm" diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 71ff1aba..955a3899 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -247,13 +247,13 @@ ENDM music_const SFX_BATTLE_26, SFX_Battle_26 music_const SFX_BATTLE_27, SFX_Battle_27 music_const SFX_BATTLE_28, SFX_Battle_28 - music_const SFX_BATTLE_29, SFX_Battle_29 + music_const SFX_EARTHQUAKE, SFX_Earthquake music_const SFX_BATTLE_2A, SFX_Battle_2A music_const SFX_BATTLE_2B, SFX_Battle_2B music_const SFX_BATTLE_2C, SFX_Battle_2C music_const SFX_PSYBEAM, SFX_Psybeam music_const SFX_BATTLE_2E, SFX_Battle_2E - music_const SFX_BATTLE_2F, SFX_Battle_2F + music_const SFX_THUNDERBOLT, SFX_Thunderbolt music_const SFX_PSYCHIC_M, SFX_Psychic_M music_const SFX_BATTLE_31, SFX_Battle_31 music_const SFX_BATTLE_32, SFX_Battle_32 diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index c34a08f7..25d9a7aa 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -1,6 +1,33 @@ +dpikapic: macro + db (\1_id - PikaPicAnimPointers) / 2 + endm + +ldpikapic: macro + ld \1, (\2_id - PikaPicAnimPointers) / 2 + endm + +dpikaemotion: macro + db (\1_id - PikachuEmotionTable) / 2 + endm + +ldpikaemotion: macro + ld \1, (\2_id - PikachuEmotionTable) / 2 + endm + +dpikaanim: macro + db (\1_id - PikaPicAnimBGFramesPointers) / 2 + endm + +pikaframeend EQUS "db $e0" +pikaframe: macro + db (\1_id - PikaPicTilemapPointers) / 2, \2 + endm + +pikaframedelay EQUS "db 0," + ; Starter Pikachu emotion commands constants -const_value = 0 + const_def const PIKAEMOTION_DUMMY1 const PIKAEMOTION_PRINTTEXT const PIKAEMOTION_PLAYPCMSOUNDCLIP @@ -13,7 +40,7 @@ const_value = 0 const PIKAEMOTION_9 const PIKAEMOTION_DUMMY3 -const_value = 0 + const_def const PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES const PIKAEMOTION_SUBCMD_LOADFONT const PIKAEMOTION_SUBCMD_SHOWMAPVIEW @@ -22,6 +49,16 @@ const_value = 0 const PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER const PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE + const_def + const PIKASTEPDIR_DOWN + const PIKASTEPDIR_UP + const PIKASTEPDIR_LEFT + const PIKASTEPDIR_RIGHT + const PIKASTEPDIR_DOWN_LEFT + const PIKASTEPDIR_DOWN_RIGHT + const PIKASTEPDIR_UP_LEFT + const PIKASTEPDIR_UP_RIGHT + ; Macros for commands pikaemotion_dummy1: MACRO @@ -54,7 +91,7 @@ ENDM pikaemotion_pikapic: MACRO db PIKAEMOTION_5 - db \1 + dpikapic \1 ENDM pikaemotion_subcmd: MACRO @@ -77,4 +114,111 @@ ENDM pikaemotion_dummy3: MACRO db PIKAEMOTION_DUMMY3 -ENDM
\ No newline at end of file +ENDM + +pikacry_def: MACRO +\1_id:: dba \1 +endm + +dpikacry: MACRO + db (\1_id - PikachuCriesPointerTable) / 3 + endm + +ldpikacry: MACRO + ld \1, (\2_id - PikachuCriesPointerTable) / 3 + ENDM + +pikacry: MACRO + ldpikacry a, \1 + endm + + + enum_start + enum pikapic_nop_command +pikapic_nop: macro + db pikapic_nop_command + endm + + enum pikapic_writebyte_command +pikapic_writebyte: macro + db pikapic_writebyte_command, \1 + endm + + enum pikapic_loadgfx_command +pikapic_loadgfx: macro + db pikapic_loadgfx_command, (\1_id - PikaPicAnimGFXHeaders) / 4 + endm + + enum pikapic_animation_command +pikapic_animation: macro + ; frameset pointer, starting vtile, y offset, x offset + db pikapic_animation_command + dpikaanim \1 + db 0, \2, \3, \4 + endm + + enum pikapic_nop4_command +pikapic_nop4: macro + db pikapic_nop4_command + endm + + enum pikapic_nop5_command +pikapic_nop5: macro + db pikapic_nop5_command + endm + + enum pikapic_waitbgmapeleteobject_command +pikapic_waitbgmapeleteobject: macro + db pikapic_waitbgmapeleteobject_command, \1 + endm + + enum pikapic_nop7_command +pikapic_nop7: macro + db pikapic_nop7_command + endm + + enum pikapic_nop8_command +pikapic_nop8: macro + db pikapic_nop8_command + endm + + enum pikapic_jump_command +pikapic_jump: macro ; 9 + dbw pikapic_jump_command, \1 + endm + + enum pikapic_setduration_command +pikapic_setduration: macro ; a + dbw pikapic_setduration_command, \1 + endm + + enum pikapic_cry_command +pikapic_cry: macro ; b + db pikapic_cry_command +IF _NARG == 0 + db $ff +else + dpikacry \1 + endc + endm + + enum pikapic_thunderbolt_command +pikapic_thunderbolt: macro ; c + db pikapic_thunderbolt_command + endm + + enum pikapic_waitbgmap_command +pikapic_waitbgmap: macro ; d + db pikapic_waitbgmap_command + endm + + enum pikapic_ret_command +pikapic_ret: macro ; e + db pikapic_ret_command + endm + +pikapic_looptofinish: macro +.loop\@ + pikapic_waitbgmap + pikapic_jump .loop\@ + endm diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 66085f8d..b36dc179 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -13,4 +13,4 @@ GRASS EQU $16 ELECTRIC EQU $17 PSYCHIC EQU $18 ICE EQU $19 -DRAGON EQU $1A
\ No newline at end of file +DRAGON EQU $1A diff --git a/data/animated_objects_3e_1.asm b/data/animated_objects_3e_1.asm index 2461c469..07b17ce5 100755 --- a/data/animated_objects_3e_1.asm +++ b/data/animated_objects_3e_1.asm @@ -1,32 +1,32 @@ -Unkn_f9405: - dw Unkn_f943d - dw Unkn_f9440 - dw Unkn_f9445 - dw Unkn_f944a - dw Unkn_f944f - dw Unkn_f9454 - dw Unkn_f9459 - dw Unkn_f945e - dw Unkn_f9463 - dw Unkn_f9468 - dw Unkn_f946d - dw Unkn_f9472 - dw Unkn_f9477 - dw Unkn_f947c - dw Unkn_f9481 - dw Unkn_f9486 - dw Unkn_f948b - dw Unkn_f9494 - dw Unkn_f9499 - dw Unkn_f949e - dw Unkn_f94fb - dw Unkn_f94a1 - dw Unkn_f94b0 - dw Unkn_f94bf - dw Unkn_f94ce - dw Unkn_f94dd - dw Unkn_f94ec - dw Unkn_f94fe +SurfingPikachuFrames: + dw Unkn_f943d ; 00 + dw Unkn_f9440 ; 01 + dw Unkn_f9445 ; 02 + dw Unkn_f944a ; 03 + dw Unkn_f944f ; 04 + dw Unkn_f9454 ; 05 + dw Unkn_f9459 ; 06 + dw Unkn_f945e ; 07 + dw Unkn_f9463 ; 08 + dw Unkn_f9468 ; 09 + dw Unkn_f946d ; 0a + dw Unkn_f9472 ; 0b + dw Unkn_f9477 ; 0c + dw Unkn_f947c ; 0d + dw Unkn_f9481 ; 0e + dw Unkn_f9486 ; 0f + dw Unkn_f948b ; 10 + dw Unkn_f9494 ; 11 + dw Unkn_f9499 ; 12 + dw Unkn_f949e ; 13 + dw Unkn_f94fb ; 14 + dw Unkn_f94a1 ; 15 + dw Unkn_f94b0 ; 16 + dw Unkn_f94bf ; 17 + dw Unkn_f94ce ; 18 + dw Unkn_f94dd ; 19 + dw Unkn_f94ec ; 1a + dw Unkn_f94fe ; 1b Unkn_f943d: frame $00, 32 @@ -199,49 +199,66 @@ Unkn_f94fe: frame $23, 7 dorestart -Unkn_f9507: - dbw $00, Unkn_f9573 - dbw $00, Unkn_f9578 - dbw $36, Unkn_f9578 - dbw $03, Unkn_f9578 - dbw $39, Unkn_f9578 - dbw $06, Unkn_f9578 - dbw $3c, Unkn_f9578 - dbw $09, Unkn_f9578 - dbw $60, Unkn_f9578 - dbw $0c, Unkn_f9578 - dbw $63, Unkn_f9578 - dbw $30, Unkn_f9578 - dbw $66, Unkn_f9578 - dbw $33, Unkn_f9578 - dbw $69, Unkn_f9578 - dbw $6c, Unkn_f9578 - dbw $9c, Unkn_f9578 - dbw $a0, Unkn_f9578 - dbw $a3, Unkn_f9578 - dbw $a7, Unkn_f95db - dbw $a8, Unkn_f95f4 - dbw $98, Unkn_f9625 - dbw $e0, Unkn_f959d - dbw $e6, Unkn_f959d - dbw $ca, Unkn_f959d - dbw $a7, Unkn_f95ce - dbw $00, Unkn_f9632 - dbw $00, Unkn_f963f - dbw $00, Unkn_f9650 - dbw $00, Unkn_f9661 - dbw $00, Unkn_f9672 - dbw $00, Unkn_f9683 - dbw $80, Unkn_f9694 - dbw $84, Unkn_f9694 - dbw $88, Unkn_f9694 - dbw $8c, Unkn_f9694 - -Unkn_f9573: +SurfingPikachuOAMData: + dbw $00, .Frame0 + dbw $00, .Frame1 + dbw $36, .Frame2 + dbw $03, .Frame3 + dbw $39, .Frame4 + dbw $06, .Frame5 + dbw $3c, .Frame6 + dbw $09, .Frame7 + dbw $60, .Frame8 + dbw $0c, .Frame9 + dbw $63, .Frame10 + dbw $30, .Frame11 + dbw $66, .Frame12 + dbw $33, .Frame13 + dbw $69, .Frame14 + dbw $6c, .Frame15 + dbw $9c, .Frame16 + dbw $a0, .Frame17 + dbw $a3, .Frame18 + dbw $a7, .Frame19 + dbw $a8, .Frame20 + dbw $98, .Frame21 + dbw $e0, .Frame22 + dbw $e6, .Frame23 + dbw $ca, .Frame24 + dbw $a7, .Frame25 + dbw $00, .Frame26 + dbw $00, .Frame27 + dbw $00, .Frame28 + dbw $00, .Frame29 + dbw $00, .Frame30 + dbw $00, .Frame31 + dbw $80, .Frame32 + dbw $84, .Frame33 + dbw $88, .Frame34 + dbw $8c, .Frame35 + +.Frame0: db 1 db $fc, $fc, $00, $00 -Unkn_f9578: +.Frame1: +.Frame2: +.Frame3: +.Frame4: +.Frame5: +.Frame6: +.Frame7: +.Frame8: +.Frame9: +.Frame10: +.Frame11: +.Frame12: +.Frame13: +.Frame14: +.Frame15: +.Frame16: +.Frame17: +.Frame18: db 9 db $f4, $f4, $00, $00 db $f4, $fc, $01, $00 @@ -253,7 +270,9 @@ Unkn_f9578: db $04, $fc, $21, $00 db $04, $04, $22, $00 -Unkn_f959d: +.Frame22: +.Frame23: +.Frame24: db 12 db $f8, $e8, $00, $00 db $f8, $f0, $01, $00 @@ -268,13 +287,13 @@ Unkn_f959d: db $00, $08, $14, $00 db $00, $10, $15, $00 -Unkn_f95ce: +.Frame25: db 3 db $fc, $0b, $00, $10 db $04, $03, $0f, $10 db $04, $0b, $10, $10 -Unkn_f95db: +.Frame19: db 6 db $fc, $f0, $00, $30 db $fc, $08, $00, $10 @@ -283,7 +302,7 @@ Unkn_f95db: db $04, $00, $0f, $10 db $04, $08, $10, $10 -Unkn_f95f4: +.Frame20: db 12 db $f4, $f0, $00, $10 db $f4, $f8, $01, $10 @@ -298,54 +317,57 @@ Unkn_f95f4: db $04, $00, $21, $30 db $04, $08, $20, $30 -Unkn_f9625: +.Frame21: db 3 db $04, $f4, $00, $00 db $04, $fc, $01, $00 db $04, $04, $02, $00 -Unkn_f9632: +.Frame26: db 3 db $fc, $f4, $bf, $00 db $fc, $fc, $d5, $00 db $fc, $04, $d0, $00 -Unkn_f963f: +.Frame27: db 4 db $fc, $f0, $bf, $00 db $fc, $f8, $d1, $00 db $fc, $00, $d5, $00 db $fc, $08, $d0, $00 -Unkn_f9650: +.Frame28: db 4 db $fc, $f0, $bf, $00 db $fc, $f8, $d3, $00 db $fc, $00, $d5, $00 db $fc, $08, $d0, $00 -Unkn_f9661: +.Frame29: db 4 db $fc, $f0, $bf, $00 db $fc, $f8, $d7, $00 db $fc, $00, $d5, $00 db $fc, $08, $d0, $00 -Unkn_f9672: +.Frame30: db 4 db $fc, $f0, $bf, $00 db $fc, $f8, $d1, $00 db $fc, $00, $d8, $00 db $fc, $08, $d0, $00 -Unkn_f9683: +.Frame31: db 4 db $fc, $f0, $bf, $00 db $fc, $f8, $d5, $00 db $fc, $00, $d0, $00 db $fc, $08, $d0, $00 -Unkn_f9694: +.Frame32: +.Frame33: +.Frame34: +.Frame35: db 12 db $f4, $f0, $03, $20 db $f4, $f8, $02, $20 diff --git a/data/animations.asm b/data/animations.asm index 786f7e72..de2487d7 100755 --- a/data/animations.asm +++ b/data/animations.asm @@ -1,4 +1,4 @@ -AttackAnimationPointers: ; 7a22a (1e:622a) +AttackAnimationPointers: dw PoundAnim dw KarateChopAnim dw DoubleSlapAnim @@ -208,152 +208,152 @@ AttackAnimationPointers: ; 7a22a (1e:622a) ; if first byte >= $D8 ; db special_effect_id, sound_id ; $FF terminated -PoundAnim: ; 7a216 (1e:6216) -StruggleAnim: ; 7a216 (1e:6216) +PoundAnim: +StruggleAnim: db $08,$00,$01 db $FF -KarateChopAnim: ; 7a21a (1e:621a) +KarateChopAnim: db $08,$01,$03 db $FF -DoubleSlapAnim: ; 7a21e (1e:621e) +DoubleSlapAnim: db $05,$02,$01 db $05,$02,$01 db $FF -CometPunchAnim: ; 7a225 (1e:6225) +CometPunchAnim: db $04,$03,$02 db $04,$03,$02 db $FF -MegaPunchAnim: ; 7a22c (1e:622c) +MegaPunchAnim: db $46,$04,$04 db $FF -PayDayAnim: ; 7a230 (1e:6230) +PayDayAnim: db $08,$00,$01 db $04,$05,$52 db $FF -FirePunchAnim: ; 7a237 (1e:6237) +FirePunchAnim: db $06,$06,$02 db $46,$FF,$11 db $FF -IcePunchAnim: ; 7a23e (1e:623e) +IcePunchAnim: db $06,$07,$02 db $10,$FF,$2F db $FF -ThunderPunchAnim: ; 7a245 (1e:6245) +ThunderPunchAnim: db $06,$08,$02 db SE_DARK_SCREEN_PALETTE, $FF db $46,$FF,$2B db SE_RESET_SCREEN_PALETTE, $FF db $FF -ScratchAnim: ; 7a250 (1e:6250) +ScratchAnim: db $06,$09,$0F db $FF -VicegripAnim: ; 7a254 (1e:6254) +VicegripAnim: db $08,$0A,$2A db $FF -GuillotineAnim: ; 7a258 (1e:6258) +GuillotineAnim: db $06,$0B,$2A db $FF -RazorWindAnim: ; 7a25c (1e:625c) +RazorWindAnim: db $04,$0C,$16 db $FF -SwordsDanceAnim: ; 7a260 (1e:6260) +SwordsDanceAnim: db $46,$0D,$18 db $46,$0D,$18 db $46,$0D,$18 db $FF -CutAnim: ; 7a26a (1e:626a) +CutAnim: db SE_DARK_SCREEN_FLASH, $0E db $04,$FF,$16 db $FF -GustAnim: ; 7a270 (1e:6270) +GustAnim: db $46,$0F,$10 db $06,$FF,$02 db $FF -WingAttackAnim: ; 7a277 (1e:6277) +WingAttackAnim: db $46,$10,$04 db $FF -WhirlwindAnim: ; 7a27b (1e:627b) +WhirlwindAnim: db $46,$11,$10 db SE_SLIDE_ENEMY_MON_OFF, $FF db $FF -FlyAnim: ; 7a281 (1e:6281) +FlyAnim: db $46,$12,$04 db SE_SHOW_MON_PIC, $FF db $FF -BindAnim: ; 7a287 (1e:6287) +BindAnim: db $04,$13,$23 db $04,$13,$23 db $FF -SlamAnim: ; 7a28e (1e:628e) +SlamAnim: db $06,$14,$02 db $FF -VineWhipAnim: ; 7a292 (1e:6292) +VineWhipAnim: db $01,$15,$16 db $08,$FF,$01 db $FF -StompAnim: ; 7a299 (1e:6299) +StompAnim: db $48,$16,$05 db $FF -DoubleKickAnim: ; 7a29d (1e:629d) +DoubleKickAnim: db $08,$17,$01 db $08,$17,$01 db $FF -MegaKickAnim: ; 7a2a4 (1e:62a4) +MegaKickAnim: db $46,$18,$04 db $FF -JumpKickAnim: ; 7a2a8 (1e:62a8) +JumpKickAnim: db $46,$19,$04 db $FF -RollingKickAnim: ; 7a2ac (1e:62ac) +RollingKickAnim: db SE_DARK_SCREEN_FLASH, $1A db $46,$FF,$04 db $FF -SandAttackAnim: ; 7a2b2 (1e:62b2) +SandAttackAnim: db $46,$1B,$28 db $FF -HeatButtAnim: ; 7a2b6 (1e:62b6) +HeatButtAnim: db $46,$1C,$05 db $FF -HornAttackAnim: ; 7a2ba (1e:62ba) +HornAttackAnim: db $06,$1D,$45 db $46,$FF,$05 db $FF -FuryAttackAnim: ; 7a2c1 (1e:62c1) +FuryAttackAnim: db $02,$1E,$46 db $02,$FF,$46 db $FF -HornDrillAnim: ; 7a2c8 (1e:62c8) +HornDrillAnim: db $42,$1F,$05 db $42,$FF,$05 db $42,$FF,$05 @@ -361,35 +361,35 @@ HornDrillAnim: ; 7a2c8 (1e:62c8) db $42,$FF,$05 db $FF -TackleAnim: ; 7a2d8 (1e:62d8) +TackleAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $FF -BodySlamAnim: ; 7a2dd (1e:62dd) +BodySlamAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_DARK_SCREEN_FLASH, $FF db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_MON_POSITION, $FF db $FF -WrapAnim: ; 7a2e6 (1e:62e6) +WrapAnim: db $04,$22,$23 db $04,$22,$23 db $04,$22,$23 db $FF -TakeDownAnim: ; 7a2f0 (1e:62f0) +TakeDownAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_DARK_SCREEN_FLASH, $23 db SE_RESET_MON_POSITION, $FF db $FF -ThrashAnim: ; 7a2f7 (1e:62f7) +ThrashAnim: db $46,$24,$04 db $FF -DoubleEdgeAnim: ; 7a2fb (1e:62fb) +DoubleEdgeAnim: db SE_LIGHT_SCREEN_PALETTE, $48 db $06,$FF,$2D db SE_RESET_SCREEN_PALETTE, $FF @@ -398,7 +398,7 @@ DoubleEdgeAnim: ; 7a2fb (1e:62fb) db SE_RESET_MON_POSITION, $FF db $FF -TailWhipAnim: ; 7a309 (1e:6309) +TailWhipAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -408,125 +408,125 @@ TailWhipAnim: ; 7a309 (1e:6309) db SE_RESET_MON_POSITION, $84 db $FF -PoisonStingAnim: ; 7a318 (1e:6318) +PoisonStingAnim: db $06,$27,$00 db $FF -TwineedleAnim: ; 7a31c (1e:631c) +TwineedleAnim: db $05,$28,$01 db $05,$28,$01 db $FF -PinMissileAnim: ; 7a323 (1e:6323) +PinMissileAnim: db $03,$29,$01 db $FF -LeerAnim: ; 7a327 (1e:6327) +LeerAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $2A db SE_DARK_SCREEN_FLASH, $2A db SE_RESET_SCREEN_PALETTE, $FF db $FF -BiteAnim: ; 7a330 (1e:6330) +BiteAnim: db $08,$2B,$02 db $FF -GrowlAnim: ; 7a334 (1e:6334) +GrowlAnim: db $46,$2C,$12 db $FF -RoarAnim: ; 7a338 (1e:6338) +RoarAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$2D,$15 db $FF -SingAnim: ; 7a342 (1e:6342) +SingAnim: db $46,$2E,$12 db $50,$FF,$40 db $50,$FF,$40 db $FF -SupersonicAnim: ; 7a34c (1e:634c) +SupersonicAnim: db $06,$2F,$31 db $FF -SonicBoomAnim: ; 7a350 (1e:6350) +SonicBoomAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$0F,$10 db $46,$FF,$05 db $FF -DisableAnim: ; 7a35d (1e:635d) +DisableAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $2A db SE_DARK_SCREEN_FLASH, $2A db SE_RESET_SCREEN_PALETTE, $FF db $FF -AcidAnim: ; 7a366 (1e:6366) +AcidAnim: db $46,$32,$13 db $46,$32,$14 db $FF -EmberAnim: ; 7a36d (1e:636d) +EmberAnim: db $46,$33,$11 db $FF -FlamethrowerAnim: ; 7a371 (1e:6371) +FlamethrowerAnim: db $46,$34,$1F db $46,$34,$0C db $46,$34,$0D db $FF -MistAnim: ; 7a37b (1e:637b) +MistAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -WaterGunAnim: ; 7a382 (1e:6382) +WaterGunAnim: db $06,$36,$2C db $FF -HydroPumpAnim: ; 7a386 (1e:6386) +HydroPumpAnim: db $06,$37,$1A db $06,$37,$1A db $FF -SurfAnim: ; 7a38d (1e:638d) +SurfAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $06,$37,$1A db $FF -IceBeamAnim: ; 7a393 (1e:6393) +IceBeamAnim: db $03,$39,$2E db $10,$FF,$2F db $FF -BlizzardAnim: ; 7a39a (1e:639a) +BlizzardAnim: db $04,$3A,$38 db $04,$37,$38 db $FF -PsyBeamAnim: ; 7a3a1 (1e:63a1) +PsyBeamAnim: db $03,$3B,$2E db SE_FLASH_SCREEN_LONG, $FF db $FF -BubbleBeamAnim: ; 7a3a7 (1e:63a7) +BubbleBeamAnim: db $12,$3C,$35 db $FF -AuroraBeamAnim: ; 7a3ab (1e:63ab) +AuroraBeamAnim: db $03,$3D,$2E db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF db $FF -HyperBeamAnim: ; 7a3b3 (1e:63b3) +HyperBeamAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_SPIRAL_BALLS_INWARD, $FF db $02,$3E,$2E @@ -536,33 +536,33 @@ HyperBeamAnim: ; 7a3b3 (1e:63b3) db SE_RESET_SCREEN_PALETTE, $FF db $FF -PeckAnim: ; 7a3c4 (1e:63c4) +PeckAnim: db $08,$3F,$01 db $FF -DrillPeckAnim: ; 7a3c8 (1e:63c8) +DrillPeckAnim: db $46,$40,$04 db $FF -SubmissionAnim: ; 7a3cc (1e:63cc) +SubmissionAnim: db SE_SLIDE_MON_OFF, $41 db $06,$FF,$01 db SE_SHOW_MON_PIC, $FF db $FF -LowKickAnim: ; 7a3d4 (1e:63d4) +LowKickAnim: db SE_SLIDE_MON_OFF, $42 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -CounterAnim: ; 7a3dc (1e:63dc) +CounterAnim: db SE_SLIDE_MON_OFF, $43 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -SeismicTossAnim: ; 7a3e4 (1e:63e4) +SeismicTossAnim: db SE_BLINK_ENEMY_MON, $FF db $41,$8B,$4E db SE_HIDE_ENEMY_MON_PIC, $FF @@ -576,20 +576,20 @@ SeismicTossAnim: ; 7a3e4 (1e:63e4) db SE_SHAKE_SCREEN, $FF db $FF -StrengthAnim: ; 7a3fe (1e:63fe) +StrengthAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $46,$06,$04 db $FF -AbsorbAnim: ; 7a406 (1e:6406) +AbsorbAnim: db SE_LIGHT_SCREEN_PALETTE, $46 db $06,$FF,$21 db $06,$FF,$22 db SE_RESET_SCREEN_PALETTE, $FF db $FF -MegaDrainAnim: ; 7a411 (1e:6411) +MegaDrainAnim: db SE_LIGHT_SCREEN_PALETTE, $47 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -598,79 +598,79 @@ MegaDrainAnim: ; 7a411 (1e:6411) db SE_RESET_SCREEN_PALETTE, $FF db $FF -LeechSeedAnim: ; 7a420 (1e:6420) +LeechSeedAnim: db $46,$48,$1B db $55,$4D,$1C db $FF -GrowthAnim: ; 7a427 (1e:6427) +GrowthAnim: db SE_LIGHT_SCREEN_PALETTE, $49 db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -RazorLeafAnim: ; 7a42e (1e:642e) +RazorLeafAnim: db SE_LEAVES_FALLING, $4A db $41,$80,$44 db $01,$0C,$16 db $FF -SolarBeamAnim: ; 7a437 (1e:6437) +SolarBeamAnim: db $06,$4B,$2E db $06,$FF,$01 db $FF -PoisonPowderAnim: ; 7a43e (1e:643e) +PoisonPowderAnim: db $06,$4C,$36 db $FF -StunSporeAnim: ; 7a442 (1e:6442) +StunSporeAnim: db $06,$4D,$36 db $FF -SleepPowderAnim: ; 7a446 (1e:6446) +SleepPowderAnim: db $06,$4E,$36 db $FF -PedalDanceAnim: ; 7a44a (1e:644a) +PedalDanceAnim: db SE_LIGHT_SCREEN_PALETTE, $4F db SE_PETALS_FALLING, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -StringShotAnim: ; 7a451 (1e:6451) +StringShotAnim: db $08,$50,$37 db $FF -DragonRageAnim: ; 7a455 (1e:6455) +DragonRageAnim: db $46,$51,$1F db $46,$FF,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -FireSpinAnim: ; 7a462 (1e:6462) +FireSpinAnim: db $46,$52,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -ThunderShockAnim: ; 7a46c (1e:646c) +ThunderShockAnim: db $42,$53,$29 db $FF -ThunderBoltAnim: ; 7a470 (1e:6470) +ThunderBoltAnim: db $41,$54,$29 db $41,$54,$29 db $FF -ThunderWaveAnim: ; 7a477 (1e:6477) +ThunderWaveAnim: db $42,$55,$29 db $02,$FF,$23 db $04,$FF,$23 db $FF -ThunderAnim: ; 7a481 (1e:6481) +ThunderAnim: db SE_DARK_SCREEN_PALETTE, $56 db SE_DARK_SCREEN_FLASH, $FF db $46,$FF,$2B @@ -679,87 +679,87 @@ ThunderAnim: ; 7a481 (1e:6481) db SE_RESET_SCREEN_PALETTE, $FF db $FF -RockThrowAnim: ; 7a490 (1e:6490) +RockThrowAnim: db $04,$57,$30 db $FF -EarthquakeAnim: ; 7a494 (1e:6494) +EarthquakeAnim: db SE_SHAKE_SCREEN, $58 db SE_SHAKE_SCREEN, $58 db $FF -FissureAnim: ; 7a499 (1e:6499) +FissureAnim: db SE_DARK_SCREEN_FLASH, $59 db SE_SHAKE_SCREEN, $FF db SE_DARK_SCREEN_FLASH, $59 db SE_SHAKE_SCREEN, $FF db $FF -DigAnim: ; 7a4a2 (1e:64a2) +DigAnim: db $46,$5A,$04 db SE_SLIDE_MON_UP, $FF db $FF -ToxicAnim: ; 7a4a8 (1e:64a8) +ToxicAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $46,$5B,$14 db $FF -ConfusionAnim: ; 7a4ae (1e:64ae) +ConfusionAnim: db SE_FLASH_SCREEN_LONG, $5C db $FF -PsychicAnim: ; 7a4b1 (1e:64b1) +PsychicAnim: db SE_FLASH_SCREEN_LONG, $5D db SE_WAVY_SCREEN, $FF db $FF -HypnosisAnim: ; 7a4b6 (1e:64b6) +HypnosisAnim: db SE_FLASH_SCREEN_LONG, $5E db $FF -MeditateAnim: ; 7a4b9 (1e:64b9) +MeditateAnim: db SE_LIGHT_SCREEN_PALETTE, $5F db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -AgilityAnim: ; 7a4c3 (1e:64c3) +AgilityAnim: db SE_LIGHT_SCREEN_PALETTE, $60 db SE_RESET_SCREEN_PALETTE, $FF db $FF -QuickAttackAnim: ; 7a4c8 (1e:64c8) +QuickAttackAnim: db SE_SLIDE_MON_OFF, $61 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -RageAnim: ; 7a4d0 (1e:64d0) +RageAnim: db $06,$62,$01 db $FF -TeleportAnim: ; 7a4d4 (1e:64d4) +TeleportAnim: db SE_SQUISH_MON_PIC, $63 db SE_SHOOT_BALLS_UPWARD, $FF db $FF -NightShadeAnim: ; 7a4d9 (1e:64d9) +NightShadeAnim: db SE_FLASH_SCREEN_LONG, $5C db SE_WAVY_SCREEN, $FF db $FF -MimicAnim: ; 7a4de (1e:64de) +MimicAnim: db $46,$65,$21 db $46,$65,$22 db $FF -ScreechAnim: ; 7a4e5 (1e:64e5) +ScreechAnim: db $46,$66,$12 db $FF -DoubleTeamAnim: ; 7a4e9 (1e:64e9) +DoubleTeamAnim: db SE_DARK_SCREEN_PALETTE, $FF db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF @@ -771,28 +771,28 @@ DoubleTeamAnim: ; 7a4e9 (1e:64e9) db $46,$6F,$33 db $FF -RecoverAnim: ; 7a4fd (1e:64fd) +RecoverAnim: db SE_BLINK_MON, $68 db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -HardenAnim: ; 7a506 (1e:6506) +HardenAnim: db SE_LIGHT_SCREEN_PALETTE, $69 db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -MinimizeAnim: ; 7a510 (1e:6510) +MinimizeAnim: db SE_LIGHT_SCREEN_PALETTE, $6A db SE_SPIRAL_BALLS_INWARD, $FF db SE_MINIMIZE_MON, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -SmokeScreenAnim: ; 7a519 (1e:6519) +SmokeScreenAnim: db $46,$6B,$28 db $04,$FF,$0A db SE_DARKEN_MON_PALETTE, $FF @@ -810,13 +810,13 @@ SmokeScreenAnim: ; 7a519 (1e:6519) db SE_RESET_SCREEN_PALETTE, $FF db $FF -ConfuseRayAnim: ; 7a53a (1e:653a) +ConfuseRayAnim: db SE_DARK_SCREEN_PALETTE, $6C db $46,$FF,$3E db SE_RESET_SCREEN_PALETTE, $FF db $FF -WithdrawAnim: ; 7a542 (1e:6542) +WithdrawAnim: db SE_LIGHT_SCREEN_PALETTE, $6E db SE_SLIDE_MON_DOWN, $FF db $06,$FF,$51 @@ -824,47 +824,47 @@ WithdrawAnim: ; 7a542 (1e:6542) db SE_SHOW_MON_PIC, $FF db $FF -DefenseCurlAnim: ; 7a54e (1e:654e) +DefenseCurlAnim: db SE_LIGHT_SCREEN_PALETTE, $6E db $06,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -BarrierAnim: ; 7a558 (1e:6558) +BarrierAnim: db $46,$6F,$33 db $46,$6F,$33 db $FF -LightScreenAnim: ; 7a55f (1e:655f) +LightScreenAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$70,$33 db $46,$70,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -HazeAnim: ; 7a56a (1e:656a) +HazeAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -ReflectAnim: ; 7a571 (1e:6571) +ReflectAnim: db SE_DARK_SCREEN_PALETTE, $FF db $46,$72,$33 db $46,$72,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -FocusEnergyAnim: ; 7a57c (1e:657c) +FocusEnergyAnim: db SE_SPIRAL_BALLS_INWARD, $73 db $FF -BideAnim: ; 7a57f (1e:657f) +BideAnim: db $46,$74,$04 db $FF -MetronomeAnim: ; 7a583 (1e:6583) +MetronomeAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -874,39 +874,39 @@ MetronomeAnim: ; 7a583 (1e:6583) db SE_RESET_MON_POSITION, $84 db $FF -MirrorMoveAnim: ; 7a592 (1e:6592) +MirrorMoveAnim: db $08,$76,$01 db $FF -SelfdestructAnim: ; 7a596 (1e:6596) +SelfdestructAnim: db $43,$77,$34 db $FF -EggBombAnim: ; 7a59a (1e:659a) +EggBombAnim: db $44,$78,$41 db $44,$78,$42 db $FF -LickAnim: ; 7a5a1 (1e:65a1) +LickAnim: db $46,$7B,$14 db $FF -SmogAnim: ; 7a5a5 (1e:65a5) +SmogAnim: db SE_DARKEN_MON_PALETTE, $48 db $46,$7A,$19 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SludgeAnim: ; 7a5ad (1e:65ad) +SludgeAnim: db $46,$7B,$13 db $46,$7B,$14 db $FF -BoneClubAnim: ; 7a5b4 (1e:65b4) +BoneClubAnim: db $08,$7C,$02 db $FF -FireBlastAnim: ; 7a5b8 (1e:65b8) +FireBlastAnim: db $46,$7D,$1F db $46,$FF,$20 db $46,$FF,$20 @@ -914,47 +914,47 @@ FireBlastAnim: ; 7a5b8 (1e:65b8) db $46,$FF,$0D db $FF -WaterfallAnim: ; 7a5c8 (1e:65c8) +WaterfallAnim: db SE_SLIDE_MON_DOWN, $48 db $06,$37,$1A db $08,$FF,$02 db SE_SLIDE_MON_UP, $FF db $FF -ClampAnim: ; 7a5d3 (1e:65d3) +ClampAnim: db $08,$7F,$2A db $06,$83,$23 db $06,$83,$23 db $FF -SwiftAnim: ; 7a5dd (1e:65dd) +SwiftAnim: db $43,$80,$3F db $FF -SkullBashAnim: ; 7a5e1 (1e:65e1) +SkullBashAnim: db $46,$81,$05 db $FF -SpikeCannonAnim: ; 7a5e5 (1e:65e5) +SpikeCannonAnim: db $44,$82,$04 db $FF -ConstrictAnim: ; 7a5e9 (1e:65e9) +ConstrictAnim: db $06,$83,$23 db $06,$83,$23 db $06,$83,$23 db $FF -AmnesiaAnim: ; 7a5f3 (1e:65f3) +AmnesiaAnim: db $08,$84,$25 db $08,$84,$25 db $FF -KinesisAnim: ; 7a5fa (1e:65fa) +KinesisAnim: db $08,$85,$01 db $FF -SoftboiledAnim: ; 7a5fe (1e:65fe) +SoftboiledAnim: db SE_SLIDE_MON_HALF_OFF, $48 db $08,$86,$4C db SE_LIGHT_SCREEN_PALETTE, $FF @@ -963,34 +963,34 @@ SoftboiledAnim: ; 7a5fe (1e:65fe) db SE_SHOW_MON_PIC, $FF db $FF -HiJumpKickAnim: ; 7a6 (1e:660c) +HiJumpKickAnim: db $46,$87,$04 db $FF -GlareAnim: ; 7a610 (1e:6610) +GlareAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $88 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -DreamEaterAnim: ; 7a619 (1e:6619) +DreamEaterAnim: db SE_FLASH_SCREEN_LONG, $89 db SE_DARK_SCREEN_PALETTE, $89 db $08,$89,$02 db SE_RESET_SCREEN_PALETTE, $FF db $FF -PoisonGasAnim: ; 7a623 (1e:6623) +PoisonGasAnim: db $46,$8A,$19 db $FF -BarrageAnim: ; 7a627 (1e:6627) +BarrageAnim: db $43,$8B,$41 db $05,$FF,$55 db $FF -LeechLifeAnim: ; 7a62e (1e:662e) +LeechLifeAnim: db $08,$8C,$02 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -998,264 +998,264 @@ LeechLifeAnim: ; 7a62e (1e:662e) db SE_DARK_SCREEN_FLASH, $FF db $FF -LovelyKissAnim: ; 7a63c (1e:663c) +LovelyKissAnim: db $06,$8D,$12 db $FF -SkyAttackAnim: ; 7a640 (1e:6640) +SkyAttackAnim: db SE_SQUISH_MON_PIC, $8E db SE_SHOOT_BALLS_UPWARD, $FF db $46,$87,$04 db SE_SHOW_MON_PIC, $FF db $FF -TransformAnim: ; 7a64a (1e:664a) +TransformAnim: db $46,$8F,$21 db $44,$8F,$22 db $08,$FF,$47 db SE_TRANSFORM_MON, $FF db $FF -BubbleAnim: ; 7a656 (1e:6656) +BubbleAnim: db $16,$90,$35 db $FF -DizzyPunchAnim: ; 7a65a (1e:665a) +DizzyPunchAnim: db $06,$91,$17 db $06,$91,$17 db $06,$91,$17 db $06,$02,$02 db $FF -SporeAnim: ; 7a667 (1e:6667) +SporeAnim: db $06,$92,$36 db $FF -FlashAnim: ; 7a66b (1e:666b) +FlashAnim: db SE_LIGHT_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $88 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -PsywaveAnim: ; 7a674 (1e:6674) +PsywaveAnim: db $06,$2F,$31 db SE_WAVY_SCREEN, $5C db $FF -SplashAnim: ; 7a67a (1e:667a) +SplashAnim: db SE_BOUNCE_UP_AND_DOWN, $95 db $FF -AcidArmorAnim: ; 7a67d (1e:667d) +AcidArmorAnim: db SE_SLIDE_MON_DOWN_AND_HIDE, $96 db $FF -CrabHammerAnim: ; 7a680 (1e:6680) +CrabHammerAnim: db $46,$97,$05 db $06,$FF,$2A db $FF -ExplosionAnim: ; 7a687 (1e:6687) +ExplosionAnim: db $43,$98,$34 db $FF -FurySwipesAnim: ; 7a68b (1e:668b) +FurySwipesAnim: db $04,$99,$0F db $FF -BonemerangAnim: ; 7a68f (1e:668f) +BonemerangAnim: db $06,$9A,$02 db $FF -RestAnim: ; 7a693 (1e:6693) +RestAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -RockSlideAnim: ; 7a69a (1e:669a) +RockSlideAnim: db $04,$9C,$1D db $03,$9C,$1E db $46,$9D,$04 db $FF -HyperFangAnim: ; 7a6a4 (1e:66a4) +HyperFangAnim: db $06,$9D,$02 db $FF -SharpenAnim: ; 7a6a8 (1e:66a8) +SharpenAnim: db SE_LIGHT_SCREEN_PALETTE, $9E db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ConversionAnim: ; 7a6b2 (1e:66b2) +ConversionAnim: db SE_DARK_SCREEN_FLASH, $9F db $46,$FF,$21 db $46,$FF,$22 db SE_DARK_SCREEN_FLASH, $FF db $FF -TriAttackAnim: ; 7a6bd (1e:66bd) +TriAttackAnim: db SE_DARK_SCREEN_FLASH, $A0 db $46,$FF,$4D db SE_DARK_SCREEN_FLASH, $FF db $FF -SuperFangAnim: ; 7a6c5 (1e:66c5) +SuperFangAnim: db SE_DARK_SCREEN_PALETTE, $48 db $46,$A1,$04 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SlashAnim: ; 7a6cd (1e:66cd) +SlashAnim: db $06,$A2,$0F db $FF -SubstituteAnim: ; 7a6d1 (1e:66d1) +SubstituteAnim: db SE_SLIDE_MON_OFF, $A3 db $08,$FF,$47 db SE_SUBSTITUTE_MON, $FF db $FF -BallTossAnim: ; 7a6d9 (1e:66d9) +BallTossAnim: db $03,$FF,$06 db $FF -GreatTossAnim: ; 7a6dd (1e:66dd) +GreatTossAnim: db $03,$FF,$07 db $FF -UltraTossAnim: ; 7a6e1 (1e:66e1) +UltraTossAnim: db $02,$FF,$08 db $FF -BallShakeAnim: ; 7a6e5 (1e:66e5) +BallShakeAnim: db $04,$FF,$09 db $FF -BallPoofAnim: ; 7a6e9 (1e:66e9) +BallPoofAnim: db $04,$FF,$0A db $FF -ShowPicAnim: ; 7a6ed (1e:66ed) +ShowPicAnim: db SE_SHOW_ENEMY_MON_PIC, $FF db $FF -HidePicAnim: ; 7a6f0 (1e:66f0) +HidePicAnim: db SE_HIDE_ENEMY_MON_PIC, $FF db $FF -EnemyFlashAnim: ; 7a6f3 (1e:66f3) +EnemyFlashAnim: db SE_SHOW_MON_PIC, $FF db $FF -PlayerFlashAnim: ; 7a6f6 (1e:66f6) +PlayerFlashAnim: db SE_FLASH_MON_PIC, $FF db $FF -EnemyHUDShakeAnim: ; 7a6f9 (1e:66f9) +EnemyHUDShakeAnim: db SE_SHAKE_ENEMY_HUD, $FF db $FF -TradeBallDropAnim: ; 7a6fc (1e:66fc) +TradeBallDropAnim: db $86,$FF,$48 db $FF -TradeBallAppear1Anim: ; 7a700 (1e:6700) +TradeBallAppear1Anim: db $84,$FF,$49 db $FF -TradeBallAppear2Anim: ; 7a704 (1e:6704) +TradeBallAppear2Anim: db $86,$FF,$4A db $FF -TradeBallPoofAnim: ; 7a708 (1e:6708) +TradeBallPoofAnim: db $86,$FF,$4B db $FF -XStatItemAnim: ; 7a7c0 (1e:670c) +XStatItemAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareAnim: ; 7a713 (1e:6713) +ShrinkingSquareAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -XStatItemBlackAnim: ; 7a71b (1e:671b) +XStatItemBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareBlackAnim: ; 7a722 (1e:6722) +ShrinkingSquareBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -UnusedAnim: ; 7a72a (1e:672a) +UnusedAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SHOOT_MANY_BALLS_UPWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ParalyzeAnim: ; 7a731 (1e:6731) +ParalyzeAnim: db $04,$13,$24 db $04,$13,$24 db $FF -PoisonAnim: ; 7a738 (1e:6738) +PoisonAnim: db $08,$13,$27 db $08,$13,$27 db $FF -SleepPlayerAnim: ; 7a73f (1e:673f) +SleepPlayerAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -SleepEnemyAnim: ; 7a746 (1e:6746) +SleepEnemyAnim: db $10,$9B,$3B db $10,$9B,$3B db $FF -ConfusedPlayerAnim: ; 7a74d (1e:674d) +ConfusedPlayerAnim: db $08,$84,$25 db $08,$84,$25 db $FF -ConfusedEnemyAnim: ; 7a754 (1e:6754) +ConfusedEnemyAnim: db $08,$84,$26 db $08,$84,$26 db $FF -BallBlockAnim: ; 7a75b (1e:675b) +BallBlockAnim: db $03,$FF,$0B db $FF -FaintAnim: ; 7a75f (1e:675f) +FaintAnim: db SE_SLIDE_MON_DOWN, $5A db $FF -ShakeScreenAnim: ; 7a762 (1e:6762) +ShakeScreenAnim: db SE_SHAKE_SCREEN, $FF db $FF -ThrowRockAnim: ; 7a765 (1e:6765) +ThrowRockAnim: db $03,$8B,$53 db $FF -ThrowBaitAnim: ; 7a769 (1e:6769) +ThrowBaitAnim: db $03,$8B,$54 db $FF -SubanimationPointers: ; 7a76d (1e:676d) +SubanimationPointers: dw Subanimation00 dw Subanimation01 dw Subanimation02 @@ -1343,17 +1343,17 @@ SubanimationPointers: ; 7a76d (1e:676d) dw Subanimation54 dw Subanimation55 -Subanimation04: ; 7a819 (1e:6819) +Subanimation04: db $43 db $02,$1a,$00 db $02,$10,$00 db $02,$03,$00 -Subanimation05: ; 7a823 (1e:6823) +Subanimation05: db $41 db $02,$10,$00 -Subanimation08: ; 7a827 (1e:6827) +Subanimation08: db $0b db $03,$30,$00 db $03,$44,$00 @@ -1367,7 +1367,7 @@ Subanimation08: ; 7a827 (1e:6827) db $03,$a1,$00 db $03,$34,$00 -Subanimation07: ; 7a849 (1e:6849) +Subanimation07: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1381,7 +1381,7 @@ Subanimation07: ; 7a849 (1e:6849) db $03,$a6,$00 db $03,$34,$00 -Subanimation06: ; 7a86b (1e:686b) +Subanimation06: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1395,14 +1395,14 @@ Subanimation06: ; 7a86b (1e:686b) db $03,$a9,$00 db $03,$34,$00 -Subanimation09: ; 7a88d (1e:688d) +Subanimation09: db $04 db $03,$21,$04 db $04,$21,$04 db $03,$21,$04 db $05,$21,$04 -Subanimation0a: ; 7a89a (1e:689a) +Subanimation0a: db $46 db $06,$1b,$00 db $07,$1b,$00 @@ -1411,18 +1411,18 @@ Subanimation0a: ; 7a89a (1e:689a) db $0a,$15,$00 db $0a,$15,$00 -Subanimation0b: ; 7a8ad (1e:68ad) +Subanimation0b: db $04 db $01,$2d,$00 db $03,$2f,$00 db $03,$35,$00 db $03,$4d,$00 -Subanimation55: ; 7a8ba (1e:68ba) +Subanimation55: db $41 db $01,$9d,$00 -Subanimation11: ; 7a8be (1e:68be) +Subanimation11: db $4c db $0b,$26,$00 db $0c,$26,$00 @@ -1437,7 +1437,7 @@ Subanimation11: ; 7a8be (1e:68be) db $0b,$27,$00 db $0c,$27,$00 -Subanimation2b: ; 7a8e3 (1e:68e3) +Subanimation2b: db $4b db $0d,$03,$03 db $0e,$03,$03 @@ -1451,7 +1451,7 @@ Subanimation2b: ; 7a8e3 (1e:68e3) db $11,$1b,$00 db $11,$1b,$00 -Subanimation2c: ; 7a905 (1e:6905) +Subanimation2c: db $4c db $12,$01,$00 db $12,$0f,$00 @@ -1466,7 +1466,7 @@ Subanimation2c: ; 7a905 (1e:6905) db $16,$38,$00 db $16,$38,$00 -Subanimation12: ; 7a92a (1e:692a) +Subanimation12: db $69 db $17,$30,$00 db $17,$39,$00 @@ -1478,35 +1478,35 @@ Subanimation12: ; 7a92a (1e:692a) db $17,$3f,$00 db $17,$1f,$00 -Subanimation00: ; 7a946 (1e:6946) +Subanimation00: db $41 db $01,$17,$00 -Subanimation01: ; 7a94a (1e:694a) +Subanimation01: db $42 db $01,$0f,$00 db $01,$1d,$00 -Subanimation02: ; 7a951 (1e:6951) +Subanimation02: db $43 db $01,$12,$00 db $01,$15,$00 db $01,$1c,$00 -Subanimation03: ; 7a95b (1e:695b) +Subanimation03: db $44 db $01,$0b,$00 db $01,$11,$00 db $01,$18,$00 db $01,$1d,$00 -Subanimation0c: ; 7a968 (1e:6968) +Subanimation0c: db $43 db $0c,$20,$00 db $0c,$21,$00 db $0c,$23,$00 -Subanimation0d: ; 7a972 (1e:6972) +Subanimation0d: db $46 db $0c,$20,$02 db $0c,$15,$00 @@ -1515,7 +1515,7 @@ Subanimation0d: ; 7a972 (1e:6972) db $0c,$23,$02 db $0c,$19,$00 -Subanimation0e: ; 7a985 (1e:6985) +Subanimation0e: db $49 db $0c,$20,$02 db $0c,$15,$02 @@ -1527,7 +1527,7 @@ Subanimation0e: ; 7a985 (1e:6985) db $0c,$19,$02 db $0c,$0c,$00 -Subanimation1f: ; 7a9a1 (1e:69a1) +Subanimation1f: db $85 db $0c,$30,$03 db $0c,$40,$03 @@ -1535,7 +1535,7 @@ Subanimation1f: ; 7a9a1 (1e:69a1) db $0c,$42,$03 db $0c,$21,$00 -Subanimation2e: ; 7a9b1 (1e:69b1) +Subanimation2e: db $2e db $18,$43,$02 db $75,$52,$04 @@ -1552,14 +1552,14 @@ Subanimation2e: ; 7a9b1 (1e:69b1) db $1e,$43,$02 db $75,$1b,$00 -Subanimation2f: ; 7a9dc (1e:69dc) +Subanimation2f: db $44 db $1f,$24,$00 db $20,$20,$00 db $21,$1a,$00 db $22,$15,$00 -Subanimation30: ; 7a9e9 (1e:69e9) +Subanimation30: db $52 db $23,$00,$02 db $23,$02,$02 @@ -1580,7 +1580,7 @@ Subanimation30: ; 7a9e9 (1e:69e9) db $24,$28,$00 db $24,$28,$00 -Subanimation0f: ; 7aa20 (1e:6a20) +Subanimation0f: db $4c db $26,$0e,$02 db $26,$16,$02 @@ -1595,7 +1595,7 @@ Subanimation0f: ; 7aa20 (1e:6a20) db $29,$16,$02 db $29,$1c,$00 -Subanimation16: ; 7aa45 (1e:6a45) +Subanimation16: db $4c db $2a,$05,$00 db $2b,$05,$02 @@ -1610,7 +1610,7 @@ Subanimation16: ; 7aa45 (1e:6a45) db $2c,$00,$02 db $2c,$00,$00 -Subanimation10: ; 7aa6a (1e:6a6a) +Subanimation10: db $88 db $2d,$44,$00 db $2e,$45,$00 @@ -1621,7 +1621,7 @@ Subanimation10: ; 7aa6a (1e:6a6a) db $2d,$2f,$00 db $2e,$1a,$00 -Subanimation31: ; 7aa83 (1e:6a83) +Subanimation31: db $2a db $2f,$46,$00 db $2f,$4a,$00 @@ -1634,7 +1634,7 @@ Subanimation31: ; 7aa83 (1e:6a83) db $2f,$2e,$00 db $2f,$51,$00 -Subanimation13: ; 7aaa2 (1e:6aa2) +Subanimation13: db $86 db $30,$31,$00 db $30,$32,$00 @@ -1643,7 +1643,7 @@ Subanimation13: ; 7aaa2 (1e:6aa2) db $30,$0f,$00 db $30,$10,$00 -Subanimation14: ; 7aab5 (1e:6ab5) +Subanimation14: db $49 db $30,$10,$00 db $30,$10,$03 @@ -1655,7 +1655,7 @@ Subanimation14: ; 7aab5 (1e:6ab5) db $31,$22,$04 db $31,$27,$00 -Subanimation41: ; 7aad1 (1e:6ad1) +Subanimation41: db $85 db $03,$31,$00 db $03,$32,$00 @@ -1663,32 +1663,32 @@ Subanimation41: ; 7aad1 (1e:6ad1) db $03,$0e,$00 db $03,$10,$00 -Subanimation42: ; 7aae1 (1e:6ae1) +Subanimation42: db $43 db $48,$08,$00 db $49,$08,$00 db $5a,$08,$00 -Subanimation15: ; 7aaeb (1e:6aeb) +Subanimation15: db $22 db $35,$52,$00 db $35,$53,$00 -Subanimation17: ; 7aaf2 (1e:6af2) +Subanimation17: db $44 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation18: ; 7aaff (1e:6aff) +Subanimation18: db $a4 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation40: ; 7ab0c (1e:6b0c) +Subanimation40: db $46 db $17,$54,$00 db $17,$55,$00 @@ -1697,7 +1697,7 @@ Subanimation40: ; 7ab0c (1e:6b0c) db $17,$57,$00 db $17,$13,$00 -Subanimation19: ; 7ab1f (1e:6b1f) +Subanimation19: db $8c db $38,$31,$00 db $39,$31,$00 @@ -1712,7 +1712,7 @@ Subanimation19: ; 7ab1f (1e:6b1f) db $38,$10,$00 db $39,$10,$00 -Subanimation1a: ; 7ab44 (1e:6b44) +Subanimation1a: db $50 db $3a,$08,$00 db $3b,$08,$00 @@ -1731,20 +1731,20 @@ Subanimation1a: ; 7ab44 (1e:6b44) db $3e,$0b,$00 db $3f,$0b,$00 -Subanimation1b: ; 7ab75 (1e:6b75) +Subanimation1b: db $84 db $40,$31,$00 db $40,$32,$00 db $40,$92,$00 db $40,$15,$00 -Subanimation1c: ; 7ab82 (1e:6b82) +Subanimation1c: db $43 db $41,$58,$00 db $41,$59,$00 db $41,$21,$00 -Subanimation1d: ; 7ab8c (1e:6b8c) +Subanimation1d: db $af db $24,$9a,$00 db $23,$1b,$02 @@ -1762,22 +1762,22 @@ Subanimation1d: ; 7ab8c (1e:6b8c) db $25,$62,$04 db $25,$99,$03 -Subanimation1e: ; 7abba (1e:6bba) +Subanimation1e: db $01 db $25,$75,$00 -Subanimation20: ; 7abbe (1e:6bbe) +Subanimation20: db $42 db $42,$07,$00 db $43,$07,$00 -Subanimation21: ; 7abc5 (1e:6bc5) +Subanimation21: db $43 db $44,$00,$00 db $45,$08,$00 db $46,$10,$02 -Subanimation22: ; 7abcf (1e:6bcf) +Subanimation22: db $8b db $47,$10,$00 db $47,$56,$00 @@ -1791,7 +1791,7 @@ Subanimation22: ; 7abcf (1e:6bcf) db $47,$89,$00 db $47,$b0,$00 -Subanimation2d: ; 7abf1 (1e:6bf1) +Subanimation2d: db $66 db $44,$64,$00 db $45,$65,$00 @@ -1800,15 +1800,15 @@ Subanimation2d: ; 7abf1 (1e:6bf1) db $47,$66,$00 db $47,$66,$00 -Subanimation39: ; 7ac04 (1e:6c04) +Subanimation39: db $61 db $47,$67,$00 -Subanimation4e: ; 7ac08 (1e:6c08) +Subanimation4e: db $41 db $71,$0f,$03 -Subanimation4f: ; 7ac0c (1e:6c0c) +Subanimation4f: db $47 db $71,$0f,$00 db $71,$08,$00 @@ -1818,7 +1818,7 @@ Subanimation4f: ; 7ac0c (1e:6c0c) db $73,$95,$00 db $74,$95,$00 -Subanimation50: ; 7ac22 (1e:6c22) +Subanimation50: db $48 db $74,$95,$00 db $73,$95,$00 @@ -1829,7 +1829,7 @@ Subanimation50: ; 7ac22 (1e:6c22) db $71,$0f,$00 db $71,$16,$00 -Subanimation29: ; 7ac3b (1e:6c3b) +Subanimation29: db $5d db $48,$0f,$00 db $4a,$68,$03 @@ -1861,63 +1861,63 @@ Subanimation29: ; 7ac3b (1e:6c3b) db $4d,$2a,$03 db $49,$6b,$00 -Subanimation2a: ; 7ac93 (1e:6c93) +Subanimation2a: db $44 db $4e,$2b,$00 db $4f,$2b,$00 db $50,$2b,$00 db $50,$2b,$00 -Subanimation23: ; 7aca0 (1e:6ca0) +Subanimation23: db $42 db $51,$2d,$00 db $51,$6e,$00 -Subanimation24: ; 7aca7 (1e:6ca7) +Subanimation24: db $a2 db $51,$2d,$00 db $51,$6e,$00 -Subanimation25: ; 7acae (1e:6cae) +Subanimation25: db $62 db $52,$71,$00 db $52,$72,$00 -Subanimation26: ; 7acb5 (1e:6cb5) +Subanimation26: db $02 db $52,$01,$00 db $52,$2c,$00 -Subanimation3a: ; 7acbc (1e:6cbc) +Subanimation3a: db $63 db $53,$71,$00 db $53,$7f,$00 db $53,$81,$00 -Subanimation3b: ; 7acc6 (1e:6cc6) +Subanimation3b: db $03 db $53,$01,$00 db $53,$15,$00 db $53,$2c,$00 -Subanimation27: ; 7acd0 (1e:6cd0) +Subanimation27: db $a2 db $54,$01,$00 db $54,$2c,$00 -Subanimation28: ; 7acd7 (1e:6cd7) +Subanimation28: db $23 db $55,$73,$03 db $56,$73,$03 db $57,$73,$00 -Subanimation32: ; 7ace1 (1e:6ce1) +Subanimation32: db $63 db $47,$74,$00 db $47,$43,$00 db $47,$75,$00 -Subanimation33: ; 7aceb (1e:6ceb) +Subanimation33: db $26 db $58,$76,$00 db $34,$76,$00 @@ -1926,7 +1926,7 @@ Subanimation33: ; 7aceb (1e:6ceb) db $58,$76,$00 db $34,$76,$00 -Subanimation3c: ; 7acfe (1e:6cfe) +Subanimation3c: db $67 db $59,$79,$03 db $59,$7b,$03 @@ -1936,7 +1936,7 @@ Subanimation3c: ; 7acfe (1e:6cfe) db $59,$7c,$03 db $59,$76,$00 -Subanimation3d: ; 7ad14 (1e:6d14) +Subanimation3d: db $08 db $3a,$4d,$00 db $3b,$4d,$00 @@ -1947,7 +1947,7 @@ Subanimation3d: ; 7ad14 (1e:6d14) db $3e,$4d,$00 db $3f,$4d,$00 -Subanimation34: ; 7ad2d (1e:6d2d) +Subanimation34: db $35 db $48,$7d,$00 db $49,$7d,$00 @@ -1971,14 +1971,14 @@ Subanimation34: ; 7ad2d (1e:6d2d) db $49,$82,$00 db $5a,$82,$00 -Subanimation35: ; 7ad6d (1e:6d6d) +Subanimation35: db $24 db $5b,$83,$03 db $5c,$84,$03 db $5d,$85,$03 db $5e,$09,$00 -Subanimation36: ; 7ad7a (1e:6d7a) +Subanimation36: db $48 db $5f,$2a,$00 db $5f,$00,$00 @@ -1989,7 +1989,7 @@ Subanimation36: ; 7ad7a (1e:6d7a) db $62,$2a,$00 db $62,$00,$00 -Subanimation37: ; 7ad93 (1e:6d93) +Subanimation37: db $2a db $63,$89,$00 db $64,$75,$00 @@ -2002,7 +2002,7 @@ Subanimation37: ; 7ad93 (1e:6d93) db $65,$88,$00 db $65,$1a,$00 -Subanimation38: ; 7adb2 (1e:6db2) +Subanimation38: db $50 db $66,$8a,$00 db $66,$33,$00 @@ -2021,7 +2021,7 @@ Subanimation38: ; 7adb2 (1e:6db2) db $66,$1e,$04 db $67,$29,$00 -Subanimation3e: ; 7ade3 (1e:6de3) +Subanimation3e: db $92 db $02,$31,$00 db $34,$31,$00 @@ -2042,7 +2042,7 @@ Subanimation3e: ; 7ade3 (1e:6de3) db $34,$10,$00 db $02,$10,$00 -Subanimation3f: ; 7ae1a (1e:6e1a) +Subanimation3f: db $72 db $68,$4b,$00 db $68,$8c,$00 @@ -2063,7 +2063,7 @@ Subanimation3f: ; 7ae1a (1e:6e1a) db $68,$23,$00 db $68,$1f,$00 -Subanimation44: ; 7ae51 (1e:6e51) +Subanimation44: db $2c db $69,$4b,$00 db $69,$8c,$00 @@ -2078,20 +2078,20 @@ Subanimation44: ; 7ae51 (1e:6e51) db $69,$0c,$00 db $69,$06,$00 -Subanimation43: ; 7ae76 (1e:6e76) +Subanimation43: db $a3 db $6a,$07,$00 db $6b,$0f,$00 db $6c,$17,$00 -Subanimation45: ; 7ae80 (1e:6e80) +Subanimation45: db $24 db $6d,$8b,$00 db $6d,$84,$00 db $6d,$63,$00 db $6d,$8c,$00 -Subanimation46: ; 7ae8d (1e:6e8d) +Subanimation46: db $26 db $6d,$8b,$00 db $6d,$84,$00 @@ -2100,13 +2100,13 @@ Subanimation46: ; 7ae8d (1e:6e8d) db $6d,$0a,$00 db $6d,$89,$00 -Subanimation47: ; 7aea0 (1e:6ea0) +Subanimation47: db $23 db $06,$82,$00 db $07,$82,$00 db $08,$96,$00 -Subanimation48: ; 7aeaa (1e:6eaa) +Subanimation48: db $06 db $03,$41,$04 db $03,$48,$04 @@ -2115,24 +2115,24 @@ Subanimation48: ; 7aeaa (1e:6eaa) db $05,$48,$04 db $03,$48,$03 -Subanimation49: ; 7aebd (1e:6ebd) +Subanimation49: db $04 db $04,$48,$04 db $03,$48,$04 db $05,$48,$04 db $03,$48,$03 -Subanimation4a: ; 7aeca (1e:6eca) +Subanimation4a: db $01 db $04,$84,$03 -Subanimation4b: ; 7aece (1e:6ece) +Subanimation4b: db $03 db $06,$72,$00 db $07,$72,$00 db $08,$72,$00 -Subanimation4c: ; 7aed8 (1e:6ed8) +Subanimation4c: db $68 db $6f,$30,$00 db $6e,$30,$00 @@ -2143,7 +2143,7 @@ Subanimation4c: ; 7aed8 (1e:6ed8) db $70,$30,$00 db $6e,$30,$00 -Subanimation4d: ; 7aef1 (1e:6ef1) +Subanimation4d: db $26 db $32,$4b,$00 db $33,$4f,$00 @@ -2152,7 +2152,7 @@ Subanimation4d: ; 7aef1 (1e:6ef1) db $32,$19,$00 db $33,$0d,$00 -Subanimation51: ; 7af04 (1e:6f04) +Subanimation51: db $a6 db $76,$1b,$00 db $34,$1b,$00 @@ -2161,7 +2161,7 @@ Subanimation51: ; 7af04 (1e:6f04) db $76,$1b,$00 db $34,$1b,$00 -Subanimation52: ; 7af17 (1e:6f17) +Subanimation52: db $47 db $77,$25,$00 db $77,$9b,$00 @@ -2171,7 +2171,7 @@ Subanimation52: ; 7af17 (1e:6f17) db $77,$50,$00 db $77,$8c,$00 -Subanimation53: ; 7af2d (1e:6f2d) +Subanimation53: db $0c db $78,$30,$00 db $78,$a2,$00 @@ -2186,7 +2186,7 @@ Subanimation53: ; 7af2d (1e:6f2d) db $78,$34,$00 db $01,$9e,$00 -Subanimation54: ; 7af52 (1e:6f52) +Subanimation54: db $0b db $79,$30,$00 db $79,$a2,$00 @@ -2200,7 +2200,7 @@ Subanimation54: ; 7af52 (1e:6f52) db $79,$a9,$00 db $79,$34,$00 -FrameBlockPointers: ; 7af74 (1e:6f74) +FrameBlockPointers: dw FrameBlock00 dw FrameBlock01 dw FrameBlock02 @@ -2332,7 +2332,7 @@ FrameBlockPointers: ; 7af74 (1e:6f74) ; second byte = x offset ; third byte = tile id (it's actually tile id - $31) ; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: ; 7b068 (1e:7068) +FrameBlock01: db $09 db $00,$00,$2c,$00 db $00,$08,$2d,$00 @@ -2344,7 +2344,7 @@ FrameBlock01: ; 7b068 (1e:7068) db $10,$08,$2d,$40 db $10,$10,$2c,$60 -FrameBlock02: ; 7b08d (1e:708d) +FrameBlock02: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2363,28 +2363,28 @@ FrameBlock02: ; 7b08d (1e:708d) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock03: ; 7b0ce (1e:70ce) +FrameBlock03: db $04 db $00,$00,$02,$00 db $00,$08,$02,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock04: ; 7b0df (1e:70df) +FrameBlock04: db $04 db $00,$00,$06,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock05: ; 7b0f0 (1e:70f0) +FrameBlock05: db $04 db $00,$00,$07,$20 db $00,$08,$06,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock06: ; 7b101 (1e:7101) +FrameBlock06: db $0c db $00,$08,$23,$00 db $08,$00,$32,$00 @@ -2399,7 +2399,7 @@ FrameBlock06: ; 7b101 (1e:7101) db $10,$18,$32,$60 db $18,$10,$23,$60 -FrameBlock07: ; 7b132 (1e:7132) +FrameBlock07: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2418,7 +2418,7 @@ FrameBlock07: ; 7b132 (1e:7132) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock08: ; 7b173 (1e:7173) +FrameBlock08: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2437,7 +2437,7 @@ FrameBlock08: ; 7b173 (1e:7173) db $20,$18,$21,$60 db $20,$20,$20,$60 -FrameBlock09: ; 7b1b4 (1e:71b4) +FrameBlock09: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2452,7 +2452,7 @@ FrameBlock09: ; 7b1b4 (1e:71b4) db $20,$18,$25,$60 db $20,$20,$24,$60 -FrameBlock0a: ; 7b1e5 (1e:71e5) +FrameBlock0a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2467,21 +2467,21 @@ FrameBlock0a: ; 7b1e5 (1e:71e5) db $28,$20,$25,$60 db $28,$28,$24,$60 -FrameBlock0b: ; 7b216 (1e:7216) +FrameBlock0b: db $04 db $00,$00,$05,$00 db $00,$08,$05,$20 db $08,$00,$15,$00 db $08,$08,$15,$20 -FrameBlock0c: ; 7b227 (1e:7227) +FrameBlock0c: db $04 db $00,$00,$04,$00 db $00,$08,$04,$20 db $08,$00,$14,$00 db $08,$08,$14,$20 -FrameBlock0d: ; 7b238 (1e:7238) +FrameBlock0d: db $08 db $00,$00,$0c,$00 db $00,$08,$0d,$00 @@ -2492,21 +2492,21 @@ FrameBlock0d: ; 7b238 (1e:7238) db $18,$00,$0d,$60 db $18,$08,$0c,$60 -FrameBlock0e: ; 7b259 (1e:7259) +FrameBlock0e: db $04 db $20,$00,$0c,$00 db $20,$08,$0d,$00 db $28,$00,$1c,$00 db $28,$08,$1d,$00 -FrameBlock0f: ; 7b26a (1e:726a) +FrameBlock0f: db $04 db $30,$00,$1d,$60 db $30,$08,$1c,$60 db $38,$00,$0d,$60 db $38,$08,$0c,$60 -FrameBlock10: ; 7b27b (1e:727b) +FrameBlock10: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2517,7 +2517,7 @@ FrameBlock10: ; 7b27b (1e:727b) db $08,$10,$1f,$20 db $08,$18,$1e,$20 -FrameBlock11: ; 7b29c (1e:729c) +FrameBlock11: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2528,20 +2528,20 @@ FrameBlock11: ; 7b29c (1e:729c) db $08,$20,$1f,$20 db $08,$28,$1e,$20 -FrameBlock12: ; 7b2bd (1e:72bd) +FrameBlock12: db $03 db $00,$00,$37,$00 db $08,$10,$37,$00 db $00,$20,$37,$00 -FrameBlock13: ; 7b2ca (1e:72ca) +FrameBlock13: db $04 db $00,$00,$36,$00 db $00,$08,$36,$20 db $08,$00,$36,$40 db $08,$08,$36,$60 -FrameBlock14: ; 7b2db (1e:72db) +FrameBlock14: db $08 db $00,$10,$28,$00 db $00,$18,$28,$20 @@ -2552,7 +2552,7 @@ FrameBlock14: ; 7b2db (1e:72db) db $08,$20,$36,$40 db $08,$28,$36,$60 -FrameBlock15: ; 7b2fc (1e:72fc) +FrameBlock15: db $0c db $00,$00,$28,$00 db $00,$08,$28,$20 @@ -2567,7 +2567,7 @@ FrameBlock15: ; 7b2fc (1e:72fc) db $08,$20,$38,$00 db $08,$28,$38,$20 -FrameBlock16: ; 7b32d (1e:732d) +FrameBlock16: db $08 db $00,$00,$29,$00 db $00,$08,$29,$20 @@ -2578,60 +2578,60 @@ FrameBlock16: ; 7b32d (1e:732d) db $08,$20,$39,$00 db $08,$28,$39,$20 -FrameBlock17: ; 7b34e (1e:734e) +FrameBlock17: db $04 db $00,$00,$08,$00 db $00,$08,$09,$00 db $08,$00,$18,$00 db $08,$08,$19,$00 -FrameBlock18: ; 7b35f (1e:735f) +FrameBlock18: db $01 db $18,$00,$45,$60 -FrameBlock19: ; 7b364 (1e:7364) +FrameBlock19: db $02 db $18,$08,$45,$00 db $10,$08,$46,$60 -FrameBlock1a: ; 7b36d (1e:736d) +FrameBlock1a: db $02 db $10,$10,$45,$60 db $18,$10,$46,$00 -FrameBlock1b: ; 7b376 (1e:7376) +FrameBlock1b: db $02 db $10,$18,$45,$00 db $08,$18,$46,$60 -FrameBlock1c: ; 7b37f (1e:737f) +FrameBlock1c: db $02 db $08,$20,$45,$60 db $10,$20,$46,$00 -FrameBlock1d: ; 7b388 (1e:7388) +FrameBlock1d: db $02 db $08,$28,$45,$00 db $00,$28,$46,$60 -FrameBlock1e: ; 7b391 (1e:7391) +FrameBlock1e: db $02 db $00,$30,$45,$60 db $08,$30,$46,$00 -FrameBlock75: ; 7b39a (1e:739a) +FrameBlock75: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$22,$00 db $08,$08,$43,$60 -FrameBlock1f: ; 7b3ab (1e:73ab) +FrameBlock1f: db $02 db $00,$00,$03,$00 db $00,$30,$03,$20 -FrameBlock20: ; 7b3b4 (1e:73b4) +FrameBlock20: db $06 db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2640,7 +2640,7 @@ FrameBlock20: ; 7b3b4 (1e:73b4) db $08,$00,$13,$00 db $08,$30,$13,$20 -FrameBlock21: ; 7b3cd (1e:73cd) +FrameBlock21: db $0c db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2655,7 +2655,7 @@ FrameBlock21: ; 7b3cd (1e:73cd) db $10,$00,$03,$00 db $10,$30,$03,$20 -FrameBlock22: ; 7b3fe (1e:73fe) +FrameBlock22: db $13 db $00,$00,$03,$00 db $08,$00,$13,$00 @@ -2677,19 +2677,19 @@ FrameBlock22: ; 7b3fe (1e:73fe) db $10,$30,$03,$20 db $18,$30,$13,$20 -FrameBlock23: ; 7b44b (1e:744b) +FrameBlock23: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock24: ; 7b45c (1e:745c) +FrameBlock24: db $02 db $08,$00,$0a,$00 db $08,$08,$0b,$00 -FrameBlock25: ; 7b465 (1e:7465) +FrameBlock25: db $0c db $10,$00,$0a,$00 db $10,$08,$0b,$00 @@ -2704,14 +2704,14 @@ FrameBlock25: ; 7b465 (1e:7465) db $10,$20,$1a,$00 db $10,$28,$1b,$00 -FrameBlock26: ; 7b496 (1e:7496) +FrameBlock26: db $04 db $00,$10,$44,$00 db $00,$18,$44,$20 db $08,$10,$44,$40 db $08,$18,$44,$60 -FrameBlock27: ; 7b4a7 (1e:74a7) +FrameBlock27: db $05 db $08,$08,$44,$00 db $08,$10,$44,$20 @@ -2719,7 +2719,7 @@ FrameBlock27: ; 7b4a7 (1e:74a7) db $10,$10,$44,$60 db $00,$18,$47,$00 -FrameBlock28: ; 7b4bc (1e:74bc) +FrameBlock28: db $06 db $10,$00,$44,$00 db $10,$08,$44,$20 @@ -2728,30 +2728,30 @@ FrameBlock28: ; 7b4bc (1e:74bc) db $08,$10,$47,$00 db $02,$16,$47,$00 -FrameBlock29: ; 7b4d5 (1e:74d5) +FrameBlock29: db $04 db $18,$00,$47,$00 db $12,$06,$47,$00 db $0c,$0c,$47,$00 db $06,$12,$47,$00 -FrameBlock2a: ; 7b4e6 (1e:74e6) +FrameBlock2a: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock2b: ; 7b4f7 (1e:74f7) +FrameBlock2b: db $02 db $06,$02,$47,$00 db $00,$08,$47,$00 -FrameBlock2c: ; 7b500 (1e:7500) +FrameBlock2c: db $01 db $a0,$00,$4d,$00 -FrameBlock2d: ; 7b505 (1e:7505) +FrameBlock2d: db $08 db $00,$00,$26,$00 db $00,$08,$27,$00 @@ -2762,7 +2762,7 @@ FrameBlock2d: ; 7b505 (1e:7505) db $18,$00,$38,$00 db $18,$08,$39,$00 -FrameBlock2e: ; 7b526 (1e:7526) +FrameBlock2e: db $08 db $00,$00,$27,$20 db $00,$08,$26,$20 @@ -2773,25 +2773,25 @@ FrameBlock2e: ; 7b526 (1e:7526) db $18,$00,$39,$20 db $18,$08,$38,$20 -FrameBlock2f: ; 7b547 (1e:7547) +FrameBlock2f: db $04 db $00,$00,$0c,$00 db $00,$08,$0d,$00 db $08,$00,$0c,$40 db $08,$08,$0d,$40 -FrameBlock30: ; 7b558 (1e:7558) +FrameBlock30: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock31: ; 7b569 (1e:7569) +FrameBlock31: db $01 db $00,$00,$45,$00 -FrameBlock32: ; 7b56e (1e:756e) +FrameBlock32: db $07 db $00,$00,$4d,$00 db $00,$08,$2f,$00 @@ -2801,7 +2801,7 @@ FrameBlock32: ; 7b56e (1e:756e) db $08,$10,$4e,$20 db $10,$08,$3f,$00 -FrameBlock33: ; 7b58b (1e:758b) +FrameBlock33: db $07 db $00,$08,$3f,$40 db $08,$00,$4e,$40 @@ -2811,11 +2811,11 @@ FrameBlock33: ; 7b58b (1e:758b) db $10,$08,$2f,$40 db $10,$10,$4d,$60 -FrameBlock34: ; 7b5a8 (1e:75a8) +FrameBlock34: db $01 db $a0,$00,$00,$10 -FrameBlock35: ; 7b5ad (1e:75ad) +FrameBlock35: db $06 db $00,$00,$2a,$00 db $00,$08,$2b,$00 @@ -2824,42 +2824,42 @@ FrameBlock35: ; 7b5ad (1e:75ad) db $18,$00,$2a,$40 db $18,$08,$2b,$40 -FrameBlock36: ; 7b5c6 (1e:75c6) +FrameBlock36: db $04 db $00,$00,$00,$00 db $00,$08,$01,$00 db $08,$00,$10,$00 db $08,$08,$11,$00 -FrameBlock37: ; 7b5d7 (1e:75d7) +FrameBlock37: db $04 db $00,$00,$01,$a0 db $00,$08,$00,$a0 db $08,$00,$11,$a0 db $08,$08,$10,$a0 -FrameBlock38: ; 7b5e8 (1e:75e8) +FrameBlock38: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock39: ; 7b5f9 (1e:75f9) +FrameBlock39: db $04 db $00,$00,$0b,$20 db $00,$08,$0a,$20 db $08,$00,$1b,$20 db $08,$08,$1a,$20 -FrameBlock3a: ; 7b60a (1e:760a) +FrameBlock3a: db $04 db $20,$00,$05,$00 db $20,$08,$05,$20 db $28,$00,$15,$00 db $28,$08,$15,$20 -FrameBlock3b: ; 7b61b (1e:761b) +FrameBlock3b: db $05 db $18,$00,$04,$00 db $18,$08,$04,$20 @@ -2867,7 +2867,7 @@ FrameBlock3b: ; 7b61b (1e:761b) db $20,$08,$14,$20 db $28,$04,$41,$00 -FrameBlock3c: ; 7b630 (1e:7630) +FrameBlock3c: db $06 db $10,$00,$05,$00 db $10,$08,$05,$20 @@ -2876,7 +2876,7 @@ FrameBlock3c: ; 7b630 (1e:7630) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3d: ; 7b649 (1e:7649) +FrameBlock3d: db $07 db $08,$00,$04,$00 db $08,$08,$04,$20 @@ -2886,7 +2886,7 @@ FrameBlock3d: ; 7b649 (1e:7649) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock3e: ; 7b666 (1e:7666) +FrameBlock3e: db $08 db $00,$00,$05,$00 db $00,$08,$05,$20 @@ -2897,7 +2897,7 @@ FrameBlock3e: ; 7b666 (1e:7666) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3f: ; 7b687 (1e:7687) +FrameBlock3f: db $08 db $00,$00,$04,$00 db $00,$08,$04,$20 @@ -2908,20 +2908,20 @@ FrameBlock3f: ; 7b687 (1e:7687) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock40: ; 7b6a8 (1e:76a8) +FrameBlock40: db $03 db $00,$00,$3d,$00 db $00,$08,$3d,$00 db $08,$08,$3d,$00 -FrameBlock41: ; 7b6b5 (1e:76b5) +FrameBlock41: db $04 db $00,$00,$06,$00 db $00,$08,$06,$20 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock42: ; 7b6c6 (1e:76c6) +FrameBlock42: db $0b db $00,$10,$42,$00 db $08,$00,$42,$00 @@ -2935,7 +2935,7 @@ FrameBlock42: ; 7b6c6 (1e:76c6) db $20,$00,$42,$00 db $20,$20,$42,$00 -FrameBlock43: ; 7b6f3 (1e:76f3) +FrameBlock43: db $0b db $00,$10,$41,$00 db $08,$00,$41,$00 @@ -2949,42 +2949,42 @@ FrameBlock43: ; 7b6f3 (1e:76f3) db $20,$00,$41,$00 db $20,$20,$41,$00 -FrameBlock44: ; 7b720 (1e:7720) +FrameBlock44: db $04 db $00,$00,$49,$00 db $00,$28,$49,$00 db $28,$00,$49,$00 db $28,$28,$49,$00 -FrameBlock45: ; 7b731 (1e:7731) +FrameBlock45: db $04 db $00,$00,$49,$00 db $00,$18,$49,$00 db $18,$00,$49,$00 db $18,$18,$49,$00 -FrameBlock46: ; 7b742 (1e:7742) +FrameBlock46: db $04 db $00,$00,$49,$00 db $00,$08,$49,$00 db $08,$00,$49,$00 db $08,$08,$49,$00 -FrameBlock47: ; 7b753 (1e:7753) +FrameBlock47: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -SmallBlackCircleFrameBlock: ; 7b764 (1e:7764) +SmallBlackCircleFrameBlock: db $04 db $08,$08,$33,$00 db $08,$10,$33,$20 db $10,$08,$33,$40 db $10,$10,$33,$60 -LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) +LargeBlockCircleFrameBlock: db $10 db $00,$00,$22,$00 db $00,$08,$23,$00 @@ -3003,7 +3003,7 @@ LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock71: ; 7b7b6 (1e:77b6) +FrameBlock71: db $10 db $00,$00,$22,$00 db $00,$08,$3b,$00 @@ -3022,7 +3022,7 @@ FrameBlock71: ; 7b7b6 (1e:77b6) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock72: ; 7b7f7 (1e:77f7) +FrameBlock72: db $0c db $00,$00,$32,$00 db $00,$08,$43,$00 @@ -3037,7 +3037,7 @@ FrameBlock72: ; 7b7f7 (1e:77f7) db $10,$10,$23,$60 db $10,$18,$22,$60 -FrameBlock73: ; 7b828 (1e:7828) +FrameBlock73: db $08 db $00,$00,$32,$40 db $00,$08,$43,$40 @@ -3048,42 +3048,42 @@ FrameBlock73: ; 7b828 (1e:7828) db $08,$10,$23,$60 db $08,$18,$22,$60 -FrameBlock74: ; 7b849 (1e:7849) +FrameBlock74: db $04 db $00,$00,$22,$40 db $00,$08,$23,$40 db $00,$10,$23,$60 db $00,$18,$22,$60 -FrameBlock4a: ; 7b85a (1e:785a) +FrameBlock4a: db $04 db $08,$18,$4c,$20 db $20,$08,$4b,$00 db $30,$20,$4c,$00 db $18,$30,$4b,$40 -FrameBlock4b: ; 7b86b (1e:786b) +FrameBlock4b: db $04 db $00,$18,$4c,$00 db $20,$00,$4b,$40 db $38,$20,$4c,$20 db $18,$38,$4b,$00 -FrameBlock4c: ; 7b87c (1e:787c) +FrameBlock4c: db $04 db $10,$08,$4a,$40 db $30,$10,$4a,$00 db $28,$30,$4a,$20 db $08,$28,$4a,$60 -FrameBlock4d: ; 7b88d (1e:788d) +FrameBlock4d: db $04 db $08,$00,$4a,$20 db $38,$08,$4a,$60 db $30,$38,$4a,$40 db $00,$30,$4a,$00 -FrameBlock4e: ; 7b89e (1e:789e) +FrameBlock4e: db $08 db $00,$30,$44,$00 db $00,$38,$44,$20 @@ -3094,7 +3094,7 @@ FrameBlock4e: ; 7b89e (1e:789e) db $2e,$0a,$44,$40 db $2e,$12,$44,$60 -FrameBlock4f: ; 7b8bf (1e:78bf) +FrameBlock4f: db $0c db $0e,$22,$44,$00 db $0e,$2a,$44,$20 @@ -3109,7 +3109,7 @@ FrameBlock4f: ; 7b8bf (1e:78bf) db $30,$08,$47,$00 db $2a,$0e,$47,$00 -FrameBlock50: ; 7b8f0 (1e:78f0) +FrameBlock50: db $08 db $06,$32,$47,$00 db $00,$38,$47,$00 @@ -3120,7 +3120,7 @@ FrameBlock50: ; 7b8f0 (1e:78f0) db $2a,$0e,$47,$00 db $24,$14,$47,$00 -FrameBlock51: ; 7b911 (1e:7911) +FrameBlock51: db $08 db $00,$00,$35,$20 db $08,$00,$35,$40 @@ -3131,33 +3131,33 @@ FrameBlock51: ; 7b911 (1e:7911) db $10,$40,$35,$20 db $18,$40,$35,$40 -FrameBlock52: ; 7b932 (1e:7932) +FrameBlock52: db $04 db $00,$00,$2a,$00 db $00,$08,$2b,$00 db $08,$00,$3a,$00 db $08,$08,$3b,$00 -FrameBlock53: ; 7b943 (1e:7943) +FrameBlock53: db $03 db $00,$00,$3f,$00 db $00,$08,$3f,$00 db $08,$06,$3f,$00 -FrameBlock54: ; 7b950 (1e:7950) +FrameBlock54: db $04 db $00,$00,$0e,$00 db $00,$08,$0e,$20 db $08,$00,$0f,$00 db $08,$08,$0f,$20 -FrameBlock55: ; 7b961 (1e:7961) +FrameBlock55: db $03 db $10,$00,$2c,$00 db $10,$08,$3c,$00 db $10,$10,$2d,$00 -FrameBlock56: ; 7b96e (1e:796e) +FrameBlock56: db $06 db $10,$10,$31,$00 db $10,$18,$31,$00 @@ -3166,7 +3166,7 @@ FrameBlock56: ; 7b96e (1e:796e) db $08,$20,$2d,$00 db $10,$20,$2d,$00 -FrameBlock57: ; 7b987 (1e:7987) +FrameBlock57: db $09 db $08,$20,$31,$00 db $10,$20,$31,$00 @@ -3178,7 +3178,7 @@ FrameBlock57: ; 7b987 (1e:7987) db $08,$30,$2d,$00 db $10,$30,$2d,$00 -FrameBlock58: ; 7b9ac (1e:79ac) +FrameBlock58: db $07 db $00,$00,$46,$00 db $08,$02,$47,$00 @@ -3188,11 +3188,11 @@ FrameBlock58: ; 7b9ac (1e:79ac) db $28,$05,$48,$00 db $30,$05,$48,$00 -FrameBlock59: ; 7b9c9 (1e:79c9) +FrameBlock59: db $01 db $00,$00,$42,$00 -FrameBlock5a: ; 7b9ce (1e:79ce) +FrameBlock5a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -3207,14 +3207,14 @@ FrameBlock5a: ; 7b9ce (1e:79ce) db $18,$10,$25,$60 db $18,$18,$24,$60 -FrameBlock5b: ; 7b9ff (1e:79ff) +FrameBlock5b: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -FrameBlock5c: ; 7ba10 (1e:7a10) +FrameBlock5c: db $08 db $00,$00,$49,$00 db $02,$08,$49,$00 @@ -3225,7 +3225,7 @@ FrameBlock5c: ; 7ba10 (1e:7a10) db $10,$00,$43,$40 db $10,$08,$43,$60 -FrameBlock5d: ; 7ba31 (1e:7a31) +FrameBlock5d: db $0b db $00,$00,$49,$00 db $18,$02,$49,$00 @@ -3239,7 +3239,7 @@ FrameBlock5d: ; 7ba31 (1e:7a31) db $0c,$08,$43,$40 db $0c,$10,$43,$60 -FrameBlock5e: ; 7ba5e (1e:7a5e) +FrameBlock5e: db $0f db $00,$08,$49,$00 db $08,$10,$49,$00 @@ -3257,14 +3257,14 @@ FrameBlock5e: ; 7ba5e (1e:7a5e) db $28,$08,$43,$40 db $28,$10,$43,$60 -FrameBlock5f: ; 7ba9b (1e:7a9b) +FrameBlock5f: db $04 db $00,$00,$49,$00 db $00,$10,$49,$00 db $00,$20,$49,$00 db $00,$30,$49,$00 -FrameBlock60: ; 7baac (1e:7aac) +FrameBlock60: db $08 db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3275,7 +3275,7 @@ FrameBlock60: ; 7baac (1e:7aac) db $08,$28,$49,$00 db $08,$38,$49,$00 -FrameBlock61: ; 7bacd (1e:7acd) +FrameBlock61: db $0c db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3290,7 +3290,7 @@ FrameBlock61: ; 7bacd (1e:7acd) db $10,$20,$49,$00 db $10,$30,$49,$00 -FrameBlock62: ; 7bafe (1e:7afe) +FrameBlock62: db $0f db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3309,7 +3309,7 @@ FrameBlock62: ; 7bafe (1e:7afe) db $18,$28,$49,$00 db $18,$38,$49,$00 ; unused -FrameBlock63: ; 7bb3f (1e:7b3f) +FrameBlock63: db $06 db $10,$00,$26,$00 db $10,$08,$27,$00 @@ -3318,7 +3318,7 @@ FrameBlock63: ; 7bb3f (1e:7b3f) db $00,$20,$26,$00 db $00,$28,$27,$00 -FrameBlock64: ; 7bb58 (1e:7b58) +FrameBlock64: db $06 db $18,$00,$27,$00 db $10,$08,$26,$00 @@ -3327,7 +3327,7 @@ FrameBlock64: ; 7bb58 (1e:7b58) db $08,$20,$27,$00 db $00,$28,$26,$00 -FrameBlock65: ; 7bb71 (1e:7b71) +FrameBlock65: db $06 db $00,$00,$1c,$00 db $00,$08,$1d,$00 @@ -3336,27 +3336,27 @@ FrameBlock65: ; 7bb71 (1e:7b71) db $20,$00,$1c,$00 db $20,$08,$1d,$00 -FrameBlock66: ; 7bb8a (1e:7b8a) +FrameBlock66: db $02 db $00,$00,$03,$00 db $08,$00,$13,$00 -FrameBlock67: ; 7bb93 (1e:7b93) +FrameBlock67: db $01 db $00,$00,$03,$00 -FrameBlock68: ; 7bb98 (1e:7b98) +FrameBlock68: db $04 db $00,$00,$03,$00 db $00,$08,$03,$20 db $08,$00,$13,$00 db $08,$08,$13,$20 -FrameBlock69: ; 7bba9 (1e:7ba9) +FrameBlock69: db $01 db $00,$00,$06,$00 -FrameBlock6a: ; 7bbae (1e:7bae) +FrameBlock6a: db $08 db $00,$00,$2e,$00 db $00,$30,$2e,$20 @@ -3367,7 +3367,7 @@ FrameBlock6a: ; 7bbae (1e:7bae) db $18,$00,$3e,$00 db $18,$30,$3e,$20 -FrameBlock6b: ; 7bbcf (1e:7bcf) +FrameBlock6b: db $08 db $00,$00,$2e,$00 db $00,$20,$2e,$20 @@ -3378,7 +3378,7 @@ FrameBlock6b: ; 7bbcf (1e:7bcf) db $10,$00,$3e,$00 db $10,$20,$3e,$20 -FrameBlock6c: ; 7bbf0 (1e:7bf0) +FrameBlock6c: db $08 db $00,$00,$2e,$00 db $00,$10,$2e,$20 @@ -3389,33 +3389,33 @@ FrameBlock6c: ; 7bbf0 (1e:7bf0) db $08,$00,$3e,$00 db $08,$10,$3e,$20 -FrameBlock6d: ; 7bc11 (1e:7c11) +FrameBlock6d: db $02 db $00,$00,$1e,$00 db $00,$08,$1f,$00 -FrameBlock6e: ; 7bc1a (1e:7c1a) +FrameBlock6e: db $04 db $00,$00,$48,$00 db $00,$08,$48,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock6f: ; 7bc2b (1e:7c2b) +FrameBlock6f: db $04 db $00,$00,$4a,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock70: ; 7bc3c (1e:7c3c) +FrameBlock70: db $04 db $00,$00,$07,$20 db $00,$08,$4a,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock76: ; 7bc4d (1e:7c4d) +FrameBlock76: db $07 db $00,$10,$2f,$00 db $01,$08,$2f,$00 @@ -3425,22 +3425,22 @@ FrameBlock76: ; 7bc4d (1e:7c4d) db $0a,$00,$3e,$00 db $0a,$20,$3e,$20 -FrameBlock77: ; 7bc6a (1e:7c6a) +FrameBlock77: db $04 db $00,$02,$4b,$00 db $00,$0a,$4c,$00 db $08,$00,$4c,$60 db $08,$08,$4b,$60 -FrameBlock78: ; 7bc7b (1e:7c7b) +FrameBlock78: db $01 db $00,$00,$4d,$00 -FrameBlock79: ; 7bc80 (1e:7c80) +FrameBlock79: db $01 db $00,$00,$4e,$00 -FrameBlockBaseCoords: ; 7bc85 (1e:7c85) +FrameBlockBaseCoords: db $10,$68 db $10,$70 db $10,$78 @@ -3619,5 +3619,5 @@ FrameBlockBaseCoords: ; 7bc85 (1e:7c85) db $1C,$48 db $48,$28 -FrameBlock00: ; 7bde7 (1e:7de7) +FrameBlock00: db $00,$00 diff --git a/data/bg_map_attributes.asm b/data/bg_map_attributes.asm index d1bcfb14..81535e72 100644 --- a/data/bg_map_attributes.asm +++ b/data/bg_map_attributes.asm @@ -1,4 +1,4 @@ -BGMapAttributes_Unknown1: ; bd000 (2f:5000) +BGMapAttributes_Unknown1: db $23 dw $000d db $00 @@ -33,7 +33,7 @@ BGMapAttributes_Unknown1: ; bd000 (2f:5000) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_Unknown2: ; bd250 (2f:5250) +BGMapAttributes_Unknown2: db $23 dw $000d db $00 @@ -68,7 +68,7 @@ BGMapAttributes_Unknown2: ; bd250 (2f:5250) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_GameFreakIntro: ; bd4a0 (2f:54a0) +BGMapAttributes_GameFreakIntro: db $23 dw $000d db $00 @@ -103,7 +103,7 @@ BGMapAttributes_GameFreakIntro: ; bd4a0 (2f:54a0) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_TrainerCard: ; bd6f0 (2f:56f0) +BGMapAttributes_TrainerCard: db $23 dw $000d db $00 @@ -138,7 +138,7 @@ BGMapAttributes_TrainerCard: ; bd6f0 (2f:56f0) db $00,$00,$00,$02,$02,$00,$00,$03,$03,$00,$00,$02,$02,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_PartyMenu: ; bd940 (2f:5940) +BGMapAttributes_PartyMenu: db $23 dw $000d db $00 @@ -173,7 +173,7 @@ BGMapAttributes_PartyMenu: ; bd940 (2f:5940) db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_NidorinoIntro: ; bdb90 (2f:5b90) +BGMapAttributes_NidorinoIntro: db $23 dw $000d db $00 @@ -208,7 +208,7 @@ BGMapAttributes_NidorinoIntro: ; bdb90 (2f:5b90) db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_TitleScreen: ; bdde0 (2f:5de0) +BGMapAttributes_TitleScreen: db $23 dw $024d db $00 @@ -262,7 +262,7 @@ BGMapAttributes_TitleScreen: ; bdde0 (2f:5de0) db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_Slots: ; be270 (2f:6270) +BGMapAttributes_Slots: db $23 dw $000d db $00 @@ -297,7 +297,7 @@ BGMapAttributes_Slots: ; be270 (2f:6270) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_Pokedex: ; be4c0 (2f:64c0) +BGMapAttributes_Pokedex: db $23 dw $000d db $00 @@ -332,7 +332,7 @@ BGMapAttributes_Pokedex: ; be4c0 (2f:64c0) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_StatusScreen: ; be710 (2f:6710) +BGMapAttributes_StatusScreen: db $23 dw $000d db $00 @@ -367,7 +367,7 @@ BGMapAttributes_StatusScreen: ; be710 (2f:6710) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_Battle: ; be960 (2f:6960) +BGMapAttributes_Battle: db $23 dw $000d db $00 @@ -402,7 +402,7 @@ BGMapAttributes_Battle: ; be960 (2f:6960) db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_WholeScreen: ; bebb0 (2f:6bb0) +BGMapAttributes_WholeScreen: db $3f dw $000d db $00 @@ -451,7 +451,7 @@ BGMapAttributes_WholeScreen: ; bebb0 (2f:6bb0) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_Unknown13: ; befc0 (2f:6fc0) +BGMapAttributes_Unknown13: db $23 dw $024d db $00 @@ -503,4 +503,4 @@ BGMapAttributes_Unknown13: ; befc0 (2f:6fc0) db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
\ No newline at end of file + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm index f0fc922d..48c2cee6 100755 --- a/data/bike_riding_tilesets.asm +++ b/data/bike_riding_tilesets.asm @@ -1,2 +1,2 @@ -BikeRidingTilesets:: ; 09e2 (0:09e2) +BikeRidingTilesets:: db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF diff --git a/data/credit_mons.asm b/data/credit_mons.asm index c271db68..15212048 100755 --- a/data/credit_mons.asm +++ b/data/credit_mons.asm @@ -1,4 +1,4 @@ -CreditsMons: ; 74131 (1d:4131) +CreditsMons: db VENUSAUR db ARBOK db RHYHORN diff --git a/data/credits_order.asm b/data/credits_order.asm index e84a2a09..c818ac07 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -1,4 +1,4 @@ -CreditsOrder: ; 74243 (1d:4243) +CreditsOrder: ; subsequent credits elements will be displayed on separate lines. ; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used ; to go to the next set of credits texts. diff --git a/data/cries.asm b/data/cries.asm index 7d03b831..7031536e 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -1,4 +1,4 @@ -CryData: ; 39446 (e:5446) +CryData: ;$BaseCry, $Pitch, $Length db $11, $00, $80; Rhydon db $03, $00, $80; Kangaskhan diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm index 702a37e0..01e86714 100755 --- a/data/dungeon_tilesets.asm +++ b/data/dungeon_tilesets.asm @@ -1,2 +1,2 @@ -DungeonTilesets: ; c54c (3:454c) +DungeonTilesets: db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 1892663e..d819b916 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,4 +1,4 @@ -EvosMovesPointerTable: ; 3b1e5 (e:71e5) +EvosMovesPointerTable: dw Mon112_EvosMoves dw Mon115_EvosMoves dw Mon032_EvosMoves @@ -190,7 +190,7 @@ EvosMovesPointerTable: ; 3b1e5 (e:71e5) dw Mon070_EvosMoves dw Mon071_EvosMoves -Mon112_EvosMoves: ; 3b361 (e:7361) +Mon112_EvosMoves: ;RHYDON ;Evolutions db 0 @@ -203,7 +203,7 @@ Mon112_EvosMoves: ; 3b361 (e:7361) db 64,TAKE_DOWN db 0 -Mon115_EvosMoves: ; 3b36f (e:736f) +Mon115_EvosMoves: ;KANGASKHAN ;Evolutions db 0 @@ -215,7 +215,7 @@ Mon115_EvosMoves: ; 3b36f (e:736f) db 46,DIZZY_PUNCH db 0 -Mon032_EvosMoves: ; 3b37b (e:737b) +Mon032_EvosMoves: ;NIDORAN_M ;Evolutions db EV_LEVEL,16,NIDORINO @@ -229,7 +229,7 @@ Mon032_EvosMoves: ; 3b37b (e:737b) db 38,HORN_DRILL db 0 -Mon035_EvosMoves: ; 3b38c (e:738c) +Mon035_EvosMoves: ;CLEFAIRY ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE @@ -243,7 +243,7 @@ Mon035_EvosMoves: ; 3b38c (e:738c) db 48,LIGHT_SCREEN db 0 -Mon021_EvosMoves: ; 3b39e (e:739e) +Mon021_EvosMoves: ;SPEAROW ;Evolutions db EV_LEVEL,20,FEAROW @@ -256,7 +256,7 @@ Mon021_EvosMoves: ; 3b39e (e:739e) db 36,AGILITY db 0 -Mon100_EvosMoves: ; 3b3ad (e:73ad) +Mon100_EvosMoves: ;VOLTORB ;Evolutions db EV_LEVEL,30,ELECTRODE @@ -269,7 +269,7 @@ Mon100_EvosMoves: ; 3b3ad (e:73ad) db 43,EXPLOSION db 0 -Mon034_EvosMoves: ; 3b3bc (e:73bc) +Mon034_EvosMoves: ;NIDOKING ;Evolutions db 0 @@ -279,7 +279,7 @@ Mon034_EvosMoves: ; 3b3bc (e:73bc) db 23,THRASH db 0 -Mon080_EvosMoves: ; 3b3c4 (e:73c4) +Mon080_EvosMoves: ;SLOWBRO ;Evolutions db 0 @@ -293,7 +293,7 @@ Mon080_EvosMoves: ; 3b3c4 (e:73c4) db 55,PSYCHIC_M db 0 -Mon002_EvosMoves: ; 3b3d4 (e:73d4) +Mon002_EvosMoves: ;IVYSAUR ;Evolutions db EV_LEVEL,32,VENUSAUR @@ -308,7 +308,7 @@ Mon002_EvosMoves: ; 3b3d4 (e:73d4) db 54,SOLARBEAM db 0 -Mon103_EvosMoves: ; 3b3e7 (e:73e7) +Mon103_EvosMoves: ;EXEGGUTOR ;Evolutions db 0 @@ -316,7 +316,7 @@ Mon103_EvosMoves: ; 3b3e7 (e:73e7) db 28,STOMP db 0 -Mon108_EvosMoves: ; 3b3eb (e:73eb) +Mon108_EvosMoves: ;LICKITUNG ;Evolutions db 0 @@ -328,7 +328,7 @@ Mon108_EvosMoves: ; 3b3eb (e:73eb) db 39,SCREECH db 0 -Mon102_EvosMoves: ; 3b3f7 (e:73f7) +Mon102_EvosMoves: ;EXEGGCUTE ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR @@ -342,7 +342,7 @@ Mon102_EvosMoves: ; 3b3f7 (e:73f7) db 48,SLEEP_POWDER db 0 -Mon088_EvosMoves: ; 3b409 (e:7409) +Mon088_EvosMoves: ;GRIMER ;Evolutions db EV_LEVEL,38,MUK @@ -356,7 +356,7 @@ Mon088_EvosMoves: ; 3b409 (e:7409) db 55,ACID_ARMOR db 0 -Mon094_EvosMoves: ; 3b41a (e:741a) +Mon094_EvosMoves: ;GENGAR ;Evolutions db 0 @@ -365,7 +365,7 @@ Mon094_EvosMoves: ; 3b41a (e:741a) db 38,DREAM_EATER db 0 -Mon029_EvosMoves: ; 3b420 (e:7420) +Mon029_EvosMoves: ;NIDORAN_F ;Evolutions db EV_LEVEL,16,NIDORINA @@ -379,7 +379,7 @@ Mon029_EvosMoves: ; 3b420 (e:7420) db 38,FURY_SWIPES db 0 -Mon031_EvosMoves: ; 3b431 (e:7431) +Mon031_EvosMoves: ;NIDOQUEEN ;Evolutions db 0 @@ -389,7 +389,7 @@ Mon031_EvosMoves: ; 3b431 (e:7431) db 23,BODY_SLAM db 0 -Mon104_EvosMoves: ; 3b439 (e:7439) +Mon104_EvosMoves: ;CUBONE ;Evolutions db EV_LEVEL,28,MAROWAK @@ -405,7 +405,7 @@ Mon104_EvosMoves: ; 3b439 (e:7439) db 46,RAGE db 0 -Mon111_EvosMoves: ; 3b44e (e:744e) +Mon111_EvosMoves: ;RHYHORN ;Evolutions db EV_LEVEL,42,RHYDON @@ -419,7 +419,7 @@ Mon111_EvosMoves: ; 3b44e (e:744e) db 55,TAKE_DOWN db 0 -Mon131_EvosMoves: ; 3b45f (e:745f) +Mon131_EvosMoves: ;LAPRAS ;Evolutions db 0 @@ -432,14 +432,14 @@ Mon131_EvosMoves: ; 3b45f (e:745f) db 46,HYDRO_PUMP db 0 -Mon059_EvosMoves: ; 3b46d (e:746d) +Mon059_EvosMoves: ;ARCANINE ;Evolutions db 0 ;Learnset db 0 -Mon151_EvosMoves: ; 3b46f (e:746f) +Mon151_EvosMoves: ;MEW ;Evolutions db 0 @@ -450,7 +450,7 @@ Mon151_EvosMoves: ; 3b46f (e:746f) db 40,PSYCHIC_M db 0 -Mon130_EvosMoves: ; 3b479 (e:7479) +Mon130_EvosMoves: ;GYARADOS ;Evolutions db 0 @@ -462,7 +462,7 @@ Mon130_EvosMoves: ; 3b479 (e:7479) db 52,HYPER_BEAM db 0 -Mon090_EvosMoves: ; 3b485 (e:7485) +Mon090_EvosMoves: ;SHELLDER ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER @@ -475,7 +475,7 @@ Mon090_EvosMoves: ; 3b485 (e:7485) db 50,ICE_BEAM db 0 -Mon072_EvosMoves: ; 3b495 (e:7495) +Mon072_EvosMoves: ;TENTACOOL ;Evolutions db EV_LEVEL,30,TENTACRUEL @@ -491,7 +491,7 @@ Mon072_EvosMoves: ; 3b495 (e:7495) db 48,HYDRO_PUMP db 0 -Mon092_EvosMoves: ; 3b4aa (e:74aa) +Mon092_EvosMoves: ;GASTLY ;Evolutions db EV_LEVEL,25,HAUNTER @@ -501,7 +501,7 @@ Mon092_EvosMoves: ; 3b4aa (e:74aa) db 35,DREAM_EATER db 0 -Mon123_EvosMoves: ; 3b4b3 (e:74b3) +Mon123_EvosMoves: ;SCYTHER ;Evolutions db 0 @@ -515,7 +515,7 @@ Mon123_EvosMoves: ; 3b4b3 (e:74b3) db 50,WING_ATTACK db 0 -Mon120_EvosMoves: ; 3b4c3 (e:74c3) +Mon120_EvosMoves: ;STARYU ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE @@ -530,7 +530,7 @@ Mon120_EvosMoves: ; 3b4c3 (e:74c3) db 47,HYDRO_PUMP db 0 -Mon009_EvosMoves: ; 3b4d7 (e:74d7) +Mon009_EvosMoves: ;BLASTOISE ;Evolutions db 0 @@ -543,7 +543,7 @@ Mon009_EvosMoves: ; 3b4d7 (e:74d7) db 52,HYDRO_PUMP db 0 -Mon127_EvosMoves: ; 3b4e5 (e:74e5) +Mon127_EvosMoves: ;PINSIR ;Evolutions db 0 @@ -557,7 +557,7 @@ Mon127_EvosMoves: ; 3b4e5 (e:74e5) db 54,SWORDS_DANCE db 0 -Mon114_EvosMoves: ; 3b4f5 (e:74f5) +Mon114_EvosMoves: ;TANGELA ;Evolutions db 0 @@ -572,21 +572,21 @@ Mon114_EvosMoves: ; 3b4f5 (e:74f5) db 48,GROWTH db 0 -Mon152_EvosMoves: ; 3b507 (e:7507) +Mon152_EvosMoves: ;MISSINGNO_1F ;Evolutions db 0 ;Learnset db 0 -Mon153_EvosMoves: ; 3b509 (e:7509) +Mon153_EvosMoves: ;MISSINGNO_20 ;Evolutions db 0 ;Learnset db 0 -Mon058_EvosMoves: ; 3b50b (e:750b) +Mon058_EvosMoves: ;GROWLITHE ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE @@ -599,7 +599,7 @@ Mon058_EvosMoves: ; 3b50b (e:750b) db 50,FLAMETHROWER db 0 -Mon095_EvosMoves: ; 3b51b (e:751b) +Mon095_EvosMoves: ;ONIX ;Evolutions db 0 @@ -611,7 +611,7 @@ Mon095_EvosMoves: ; 3b51b (e:751b) db 43,HARDEN db 0 -Mon022_EvosMoves: ; 3b527 (e:7527) +Mon022_EvosMoves: ;FEAROW ;Evolutions db 0 @@ -623,7 +623,7 @@ Mon022_EvosMoves: ; 3b527 (e:7527) db 43,AGILITY db 0 -Mon016_EvosMoves: ; 3b533 (e:7533) +Mon016_EvosMoves: ;PIDGEY ;Evolutions db EV_LEVEL,18,PIDGEOTTO @@ -637,7 +637,7 @@ Mon016_EvosMoves: ; 3b533 (e:7533) db 44,MIRROR_MOVE db 0 -Mon079_EvosMoves: ; 3b544 (e:7544) +Mon079_EvosMoves: ;SLOWPOKE ;Evolutions db EV_LEVEL,37,SLOWBRO @@ -651,7 +651,7 @@ Mon079_EvosMoves: ; 3b544 (e:7544) db 48,PSYCHIC_M db 0 -Mon064_EvosMoves: ; 3b555 (e:7555) +Mon064_EvosMoves: ;KADABRA ;Evolutions db EV_TRADE,1,ALAKAZAM @@ -665,7 +665,7 @@ Mon064_EvosMoves: ; 3b555 (e:7555) db 42,REFLECT db 0 -Mon075_EvosMoves: ; 3b566 (e:7566) +Mon075_EvosMoves: ;GRAVELER ;Evolutions db EV_TRADE,1,GOLEM @@ -679,7 +679,7 @@ Mon075_EvosMoves: ; 3b566 (e:7566) db 43,EXPLOSION db 0 -Mon113_EvosMoves: ; 3b577 (e:7577) +Mon113_EvosMoves: ;CHANSEY ;Evolutions db 0 @@ -693,7 +693,7 @@ Mon113_EvosMoves: ; 3b577 (e:7577) db 54,DOUBLE_EDGE db 0 -Mon067_EvosMoves: ; 3b587 (e:7587) +Mon067_EvosMoves: ;MACHOKE ;Evolutions db EV_TRADE,1,MACHAMP @@ -706,7 +706,7 @@ Mon067_EvosMoves: ; 3b587 (e:7587) db 52,SUBMISSION db 0 -Mon122_EvosMoves: ; 3b596 (e:7596) +Mon122_EvosMoves: ;MR_MIME ;Evolutions db 0 @@ -718,7 +718,7 @@ Mon122_EvosMoves: ; 3b596 (e:7596) db 47,SUBSTITUTE db 0 -Mon106_EvosMoves: ; 3b5a2 (e:75a2) +Mon106_EvosMoves: ;HITMONLEE ;Evolutions db 0 @@ -730,7 +730,7 @@ Mon106_EvosMoves: ; 3b5a2 (e:75a2) db 53,MEGA_KICK db 0 -Mon107_EvosMoves: ; 3b5ae (e:75ae) +Mon107_EvosMoves: ;HITMONCHAN ;Evolutions db 0 @@ -742,7 +742,7 @@ Mon107_EvosMoves: ; 3b5ae (e:75ae) db 53,COUNTER db 0 -Mon024_EvosMoves: ; 3b5ba (e:75ba) +Mon024_EvosMoves: ;ARBOK ;Evolutions db 0 @@ -754,7 +754,7 @@ Mon024_EvosMoves: ; 3b5ba (e:75ba) db 47,ACID db 0 -Mon047_EvosMoves: ; 3b5c6 (e:75c6) +Mon047_EvosMoves: ;PARASECT ;Evolutions db 0 @@ -766,7 +766,7 @@ Mon047_EvosMoves: ; 3b5c6 (e:75c6) db 48,GROWTH db 0 -Mon054_EvosMoves: ; 3b5d2 (e:75d2) +Mon054_EvosMoves: ;PSYDUCK ;Evolutions db EV_LEVEL,33,GOLDUCK @@ -779,7 +779,7 @@ Mon054_EvosMoves: ; 3b5d2 (e:75d2) db 52,HYDRO_PUMP db 0 -Mon096_EvosMoves: ; 3b5e1 (e:75e1) +Mon096_EvosMoves: ;DROWZEE ;Evolutions db EV_LEVEL,26,HYPNO @@ -793,7 +793,7 @@ Mon096_EvosMoves: ; 3b5e1 (e:75e1) db 37,MEDITATE db 0 -Mon076_EvosMoves: ; 3b5f2 (e:75f2) +Mon076_EvosMoves: ;GOLEM ;Evolutions db 0 @@ -806,14 +806,14 @@ Mon076_EvosMoves: ; 3b5f2 (e:75f2) db 43,EXPLOSION db 0 -Mon154_EvosMoves: ; 3b600 (e:7600) +Mon154_EvosMoves: ;MISSINGNO_32 ;Evolutions db 0 ;Learnset db 0 -Mon126_EvosMoves: ; 3b602 (e:7602) +Mon126_EvosMoves: ;MAGMAR ;Evolutions db 0 @@ -826,14 +826,14 @@ Mon126_EvosMoves: ; 3b602 (e:7602) db 55,FLAMETHROWER db 0 -Mon155_EvosMoves: ; 3b610 (e:7610) +Mon155_EvosMoves: ;MISSINGNO_34 ;Evolutions db 0 ;Learnset db 0 -Mon125_EvosMoves: ; 3b612 (e:7612) +Mon125_EvosMoves: ;ELECTABUZZ ;Evolutions db 0 @@ -845,7 +845,7 @@ Mon125_EvosMoves: ; 3b612 (e:7612) db 54,THUNDER db 0 -Mon082_EvosMoves: ; 3b61e (e:761e) +Mon082_EvosMoves: ;MAGNETON ;Evolutions db 0 @@ -858,7 +858,7 @@ Mon082_EvosMoves: ; 3b61e (e:761e) db 54,SCREECH db 0 -Mon109_EvosMoves: ; 3b62c (e:762c) +Mon109_EvosMoves: ;KOFFING ;Evolutions db EV_LEVEL,35,WEEZING @@ -871,14 +871,14 @@ Mon109_EvosMoves: ; 3b62c (e:762c) db 48,EXPLOSION db 0 -Mon156_EvosMoves: ; 3b63b (e:763b) +Mon156_EvosMoves: ;MISSINGNO_38 ;Evolutions db 0 ;Learnset db 0 -Mon056_EvosMoves: ; 3b63d (e:763d) +Mon056_EvosMoves: ;MANKEY ;Evolutions db EV_LEVEL,28,PRIMEAPE @@ -893,7 +893,7 @@ Mon056_EvosMoves: ; 3b63d (e:763d) db 45,SCREECH db 0 -Mon086_EvosMoves: ; 3b650 (e:7650) +Mon086_EvosMoves: ;SEEL ;Evolutions db EV_LEVEL,34,DEWGONG @@ -906,7 +906,7 @@ Mon086_EvosMoves: ; 3b650 (e:7650) db 50,ICE_BEAM db 0 -Mon050_EvosMoves: ; 3b65f (e:765f) +Mon050_EvosMoves: ;DIGLETT ;Evolutions db EV_LEVEL,26,DUGTRIO @@ -919,7 +919,7 @@ Mon050_EvosMoves: ; 3b65f (e:765f) db 40,EARTHQUAKE db 0 -Mon128_EvosMoves: ; 3b66e (e:766e) +Mon128_EvosMoves: ;TAUROS ;Evolutions db 0 @@ -931,28 +931,28 @@ Mon128_EvosMoves: ; 3b66e (e:766e) db 51,TAKE_DOWN db 0 -Mon157_EvosMoves: ; 3b67a (e:767a) +Mon157_EvosMoves: ;MISSINGNO_3D ;Evolutions db 0 ;Learnset db 0 -Mon158_EvosMoves: ; 3b67c (e:767c) +Mon158_EvosMoves: ;MISSINGNO_3E ;Evolutions db 0 ;Learnset db 0 -Mon159_EvosMoves: ; 3b67e (e:767e) +Mon159_EvosMoves: ;MISSINGNO_3F ;Evolutions db 0 ;Learnset db 0 -Mon083_EvosMoves: ; 3b680 (e:7680) +Mon083_EvosMoves: ;FARFETCH_D ;Evolutions db 0 @@ -964,7 +964,7 @@ Mon083_EvosMoves: ; 3b680 (e:7680) db 39,SLASH db 0 -Mon048_EvosMoves: ; 3b68c (e:768c) +Mon048_EvosMoves: ;VENONAT ;Evolutions db EV_LEVEL,31,VENOMOTH @@ -980,7 +980,7 @@ Mon048_EvosMoves: ; 3b68c (e:768c) db 43,PSYCHIC_M db 0 -Mon149_EvosMoves: ; 3b6a1 (e:76a1) +Mon149_EvosMoves: ;DRAGONITE ;Evolutions db 0 @@ -992,28 +992,28 @@ Mon149_EvosMoves: ; 3b6a1 (e:76a1) db 60,HYPER_BEAM db 0 -Mon160_EvosMoves: ; 3b6ad (e:76ad) +Mon160_EvosMoves: ;MISSINGNO_43 ;Evolutions db 0 ;Learnset db 0 -Mon161_EvosMoves: ; 3b6af (e:76af) +Mon161_EvosMoves: ;MISSINGNO_44 ;Evolutions db 0 ;Learnset db 0 -Mon162_EvosMoves: ; 3b6b1 (e:76b1) +Mon162_EvosMoves: ;MISSINGNO_45 ;Evolutions db 0 ;Learnset db 0 -Mon084_EvosMoves: ; 3b6b3 (e:76b3) +Mon084_EvosMoves: ;DODUO ;Evolutions db EV_LEVEL,31,DODRIO @@ -1027,7 +1027,7 @@ Mon084_EvosMoves: ; 3b6b3 (e:76b3) db 44,AGILITY db 0 -Mon060_EvosMoves: ; 3b6c4 (e:76c4) +Mon060_EvosMoves: ;POLIWAG ;Evolutions db EV_LEVEL,25,POLIWHIRL @@ -1041,7 +1041,7 @@ Mon060_EvosMoves: ; 3b6c4 (e:76c4) db 45,HYDRO_PUMP db 0 -Mon124_EvosMoves: ; 3b6d5 (e:76d5) +Mon124_EvosMoves: ;JYNX ;Evolutions db 0 @@ -1054,7 +1054,7 @@ Mon124_EvosMoves: ; 3b6d5 (e:76d5) db 58,BLIZZARD db 0 -Mon146_EvosMoves: ; 3b6e3 (e:76e3) +Mon146_EvosMoves: ;MOLTRES ;Evolutions db 0 @@ -1064,7 +1064,7 @@ Mon146_EvosMoves: ; 3b6e3 (e:76e3) db 60,SKY_ATTACK db 0 -Mon144_EvosMoves: ; 3b6eb (e:76eb) +Mon144_EvosMoves: ;ARTICUNO ;Evolutions db 0 @@ -1074,7 +1074,7 @@ Mon144_EvosMoves: ; 3b6eb (e:76eb) db 60,MIST db 0 -Mon145_EvosMoves: ; 3b6f3 (e:76f3) +Mon145_EvosMoves: ;ZAPDOS ;Evolutions db 0 @@ -1084,14 +1084,14 @@ Mon145_EvosMoves: ; 3b6f3 (e:76f3) db 60,LIGHT_SCREEN db 0 -Mon132_EvosMoves: ; 3b6fb (e:76fb) +Mon132_EvosMoves: ;DITTO ;Evolutions db 0 ;Learnset db 0 -Mon052_EvosMoves: ; 3b6fd (e:76fd) +Mon052_EvosMoves: ;MEOWTH ;Evolutions db EV_LEVEL,28,PERSIAN @@ -1104,7 +1104,7 @@ Mon052_EvosMoves: ; 3b6fd (e:76fd) db 44,SLASH db 0 -Mon098_EvosMoves: ; 3b70c (e:770c) +Mon098_EvosMoves: ;KRABBY ;Evolutions db EV_LEVEL,28,KINGLER @@ -1117,28 +1117,28 @@ Mon098_EvosMoves: ; 3b70c (e:770c) db 40,HARDEN db 0 -Mon163_EvosMoves: ; 3b71b (e:771b) +Mon163_EvosMoves: ;MISSINGNO_4F ;Evolutions db 0 ;Learnset db 0 -Mon164_EvosMoves: ; 3b71d (e:771d) +Mon164_EvosMoves: ;MISSINGNO_50 ;Evolutions db 0 ;Learnset db 0 -Mon165_EvosMoves: ; 3b71f (e:771f) +Mon165_EvosMoves: ;MISSINGNO_51 ;Evolutions db 0 ;Learnset db 0 -Mon037_EvosMoves: ; 3b721 (e:7721) +Mon037_EvosMoves: ;VULPIX ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES @@ -1151,14 +1151,14 @@ Mon037_EvosMoves: ; 3b721 (e:7721) db 42,FIRE_SPIN db 0 -Mon038_EvosMoves: ; 3b731 (e:7731) +Mon038_EvosMoves: ;NINETALES ;Evolutions db 0 ;Learnset db 0 -Mon025_EvosMoves: ; 3b733 (e:7733) +Mon025_EvosMoves: ;PIKACHU ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU @@ -1175,28 +1175,28 @@ Mon025_EvosMoves: ; 3b733 (e:7733) db 50,LIGHT_SCREEN db 0 -Mon026_EvosMoves: ; 3b74b (e:774b) +Mon026_EvosMoves: ;RAICHU ;Evolutions db 0 ;Learnset db 0 -Mon166_EvosMoves: ; 3b74d (e:774d) +Mon166_EvosMoves: ;MISSINGNO_56 ;Evolutions db 0 ;Learnset db 0 -Mon167_EvosMoves: ; 3b74f (e:774f) +Mon167_EvosMoves: ;MISSINGNO_57 ;Evolutions db 0 ;Learnset db 0 -Mon147_EvosMoves: ; 3b751 (e:7751) +Mon147_EvosMoves: ;DRATINI ;Evolutions db EV_LEVEL,30,DRAGONAIR @@ -1209,7 +1209,7 @@ Mon147_EvosMoves: ; 3b751 (e:7751) db 50,HYPER_BEAM db 0 -Mon148_EvosMoves: ; 3b760 (e:7760) +Mon148_EvosMoves: ;DRAGONAIR ;Evolutions db EV_LEVEL,55,DRAGONITE @@ -1222,7 +1222,7 @@ Mon148_EvosMoves: ; 3b760 (e:7760) db 55,HYPER_BEAM db 0 -Mon140_EvosMoves: ; 3b76f (e:776f) +Mon140_EvosMoves: ;KABUTO ;Evolutions db EV_LEVEL,40,KABUTOPS @@ -1234,7 +1234,7 @@ Mon140_EvosMoves: ; 3b76f (e:776f) db 49,HYDRO_PUMP db 0 -Mon141_EvosMoves: ; 3b77c (e:777c) +Mon141_EvosMoves: ;KABUTOPS ;Evolutions db 0 @@ -1245,7 +1245,7 @@ Mon141_EvosMoves: ; 3b77c (e:777c) db 53,HYDRO_PUMP db 0 -Mon116_EvosMoves: ; 3b786 (e:7786) +Mon116_EvosMoves: ;HORSEA ;Evolutions db EV_LEVEL,32,SEADRA @@ -1258,7 +1258,7 @@ Mon116_EvosMoves: ; 3b786 (e:7786) db 45,HYDRO_PUMP db 0 -Mon117_EvosMoves: ; 3b795 (e:7795) +Mon117_EvosMoves: ;SEADRA ;Evolutions db 0 @@ -1270,21 +1270,21 @@ Mon117_EvosMoves: ; 3b795 (e:7795) db 52,HYDRO_PUMP db 0 -Mon168_EvosMoves: ; 3b7a1 (e:77a1) +Mon168_EvosMoves: ;MISSINGNO_5E ;Evolutions db 0 ;Learnset db 0 -Mon169_EvosMoves: ; 3b7a3 (e:77a3) +Mon169_EvosMoves: ;MISSINGNO_5F ;Evolutions db 0 ;Learnset db 0 -Mon027_EvosMoves: ; 3b7a5 (e:77a5) +Mon027_EvosMoves: ;SANDSHREW ;Evolutions db EV_LEVEL,22,SANDSLASH @@ -1297,7 +1297,7 @@ Mon027_EvosMoves: ; 3b7a5 (e:77a5) db 38,FURY_SWIPES db 0 -Mon028_EvosMoves: ; 3b7b4 (e:77b4) +Mon028_EvosMoves: ;SANDSLASH ;Evolutions db 0 @@ -1309,7 +1309,7 @@ Mon028_EvosMoves: ; 3b7b4 (e:77b4) db 47,FURY_SWIPES db 0 -Mon138_EvosMoves: ; 3b7c0 (e:77c0) +Mon138_EvosMoves: ;OMANYTE ;Evolutions db EV_LEVEL,40,OMASTAR @@ -1321,7 +1321,7 @@ Mon138_EvosMoves: ; 3b7c0 (e:77c0) db 53,HYDRO_PUMP db 0 -Mon139_EvosMoves: ; 3b7cd (e:77cd) +Mon139_EvosMoves: ;OMASTAR ;Evolutions db 0 @@ -1332,7 +1332,7 @@ Mon139_EvosMoves: ; 3b7cd (e:77cd) db 49,HYDRO_PUMP db 0 -Mon039_EvosMoves: ; 3b7d7 (e:77d7) +Mon039_EvosMoves: ;JIGGLYPUFF ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF @@ -1347,14 +1347,14 @@ Mon039_EvosMoves: ; 3b7d7 (e:77d7) db 39,DOUBLE_EDGE db 0 -Mon040_EvosMoves: ; 3b7eb (e:77eb) +Mon040_EvosMoves: ;WIGGLYTUFF ;Evolutions db 0 ;Learnset db 0 -Mon133_EvosMoves: ; 3b7ed (e:77ed) +Mon133_EvosMoves: ;EEVEE ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON @@ -1370,7 +1370,7 @@ Mon133_EvosMoves: ; 3b7ed (e:77ed) db 42,TAKE_DOWN db 0 -Mon136_EvosMoves: ; 3b807 (e:7807) +Mon136_EvosMoves: ;FLAREON ;Evolutions db 0 @@ -1385,7 +1385,7 @@ Mon136_EvosMoves: ; 3b807 (e:7807) db 52,FLAMETHROWER db 0 -Mon135_EvosMoves: ; 3b819 (e:7819) +Mon135_EvosMoves: ;JOLTEON ;Evolutions db 0 @@ -1400,7 +1400,7 @@ Mon135_EvosMoves: ; 3b819 (e:7819) db 52,THUNDER db 0 -Mon134_EvosMoves: ; 3b82b (e:782b) +Mon134_EvosMoves: ;VAPOREON ;Evolutions db 0 @@ -1416,7 +1416,7 @@ Mon134_EvosMoves: ; 3b82b (e:782b) db 52,HYDRO_PUMP db 0 -Mon066_EvosMoves: ; 3b83f (e:783f) +Mon066_EvosMoves: ;MACHOP ;Evolutions db EV_LEVEL,28,MACHOKE @@ -1429,7 +1429,7 @@ Mon066_EvosMoves: ; 3b83f (e:783f) db 46,SUBMISSION db 0 -Mon041_EvosMoves: ; 3b84e (e:784e) +Mon041_EvosMoves: ;ZUBAT ;Evolutions db EV_LEVEL,22,GOLBAT @@ -1442,7 +1442,7 @@ Mon041_EvosMoves: ; 3b84e (e:784e) db 36,HAZE db 0 -Mon023_EvosMoves: ; 3b85d (e:785d) +Mon023_EvosMoves: ;EKANS ;Evolutions db EV_LEVEL,22,ARBOK @@ -1455,7 +1455,7 @@ Mon023_EvosMoves: ; 3b85d (e:785d) db 38,ACID db 0 -Mon046_EvosMoves: ; 3b86c (e:786c) +Mon046_EvosMoves: ;PARAS ;Evolutions db EV_LEVEL,24,PARASECT @@ -1468,7 +1468,7 @@ Mon046_EvosMoves: ; 3b86c (e:786c) db 41,GROWTH db 0 -Mon061_EvosMoves: ; 3b87b (e:787b) +Mon061_EvosMoves: ;POLIWHIRL ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH @@ -1482,7 +1482,7 @@ Mon061_EvosMoves: ; 3b87b (e:787b) db 49,HYDRO_PUMP db 0 -Mon062_EvosMoves: ; 3b88d (e:788d) +Mon062_EvosMoves: ;POLIWRATH ;Evolutions db 0 @@ -1491,7 +1491,7 @@ Mon062_EvosMoves: ; 3b88d (e:788d) db 19,WATER_GUN db 0 -Mon013_EvosMoves: ; 3b893 (e:7893) +Mon013_EvosMoves: ;WEEDLE ;Evolutions db EV_LEVEL,7,KAKUNA @@ -1499,7 +1499,7 @@ Mon013_EvosMoves: ; 3b893 (e:7893) ;Learnset db 0 -Mon014_EvosMoves: ; 3b898 (e:7898) +Mon014_EvosMoves: ;KAKUNA ;Evolutions db EV_LEVEL,10,BEEDRILL @@ -1507,7 +1507,7 @@ Mon014_EvosMoves: ; 3b898 (e:7898) ;Learnset db 0 -Mon015_EvosMoves: ; 3b89d (e:789d) +Mon015_EvosMoves: ;BEEDRILL ;Evolutions db 0 @@ -1520,14 +1520,14 @@ Mon015_EvosMoves: ; 3b89d (e:789d) db 35,AGILITY db 0 -Mon170_EvosMoves: ; 3b8ab (e:78ab) +Mon170_EvosMoves: ;MISSINGNO_73 ;Evolutions db 0 ;Learnset db 0 -Mon085_EvosMoves: ; 3b8ad (e:78ad) +Mon085_EvosMoves: ;DODRIO ;Evolutions db 0 @@ -1540,7 +1540,7 @@ Mon085_EvosMoves: ; 3b8ad (e:78ad) db 51,AGILITY db 0 -Mon057_EvosMoves: ; 3b8bb (e:78bb) +Mon057_EvosMoves: ;PRIMEAPE ;Evolutions db 0 @@ -1555,7 +1555,7 @@ Mon057_EvosMoves: ; 3b8bb (e:78bb) db 45,SCREECH db 0 -Mon051_EvosMoves: ; 3b8cd (e:78cd) +Mon051_EvosMoves: ;DUGTRIO ;Evolutions db 0 @@ -1567,7 +1567,7 @@ Mon051_EvosMoves: ; 3b8cd (e:78cd) db 47,EARTHQUAKE db 0 -Mon049_EvosMoves: ; 3b8d9 (e:78d9) +Mon049_EvosMoves: ;VENOMOTH ;Evolutions db 0 @@ -1580,7 +1580,7 @@ Mon049_EvosMoves: ; 3b8d9 (e:78d9) db 50,PSYCHIC_M db 0 -Mon087_EvosMoves: ; 3b8e7 (e:78e7) +Mon087_EvosMoves: ;DEWGONG ;Evolutions db 0 @@ -1592,21 +1592,21 @@ Mon087_EvosMoves: ; 3b8e7 (e:78e7) db 56,ICE_BEAM db 0 -Mon171_EvosMoves: ; 3b8f3 (e:78f3) +Mon171_EvosMoves: ;MISSINGNO_79 ;Evolutions db 0 ;Learnset db 0 -Mon172_EvosMoves: ; 3b8f5 (e:78f5) +Mon172_EvosMoves: ;MISSINGNO_7A ;Evolutions db 0 ;Learnset db 0 -Mon010_EvosMoves: ; 3b8f7 (e:78f7) +Mon010_EvosMoves: ;CATERPIE ;Evolutions db EV_LEVEL,7,METAPOD @@ -1614,7 +1614,7 @@ Mon010_EvosMoves: ; 3b8f7 (e:78f7) ;Learnset db 0 -Mon011_EvosMoves: ; 3b8fc (e:78fc) +Mon011_EvosMoves: ;METAPOD ;Evolutions db EV_LEVEL,10,BUTTERFREE @@ -1623,7 +1623,7 @@ Mon011_EvosMoves: ; 3b8fc (e:78fc) db 7,HARDEN db 0 -Mon012_EvosMoves: ; 3b903 (e:7903) +Mon012_EvosMoves: ;BUTTERFREE ;Evolutions db 0 @@ -1638,7 +1638,7 @@ Mon012_EvosMoves: ; 3b903 (e:7903) db 34,PSYBEAM db 0 -Mon068_EvosMoves: ; 3b915 (e:7915) +Mon068_EvosMoves: ;MACHAMP ;Evolutions db 0 @@ -1650,14 +1650,14 @@ Mon068_EvosMoves: ; 3b915 (e:7915) db 52,SUBMISSION db 0 -Mon173_EvosMoves: ; 3b921 (e:7921) +Mon173_EvosMoves: ;MISSINGNO_7F ;Evolutions db 0 ;Learnset db 0 -Mon055_EvosMoves: ; 3b923 (e:7923) +Mon055_EvosMoves: ;GOLDUCK ;Evolutions db 0 @@ -1669,7 +1669,7 @@ Mon055_EvosMoves: ; 3b923 (e:7923) db 59,HYDRO_PUMP db 0 -Mon097_EvosMoves: ; 3b92f (e:792f) +Mon097_EvosMoves: ;HYPNO ;Evolutions db 0 @@ -1682,7 +1682,7 @@ Mon097_EvosMoves: ; 3b92f (e:792f) db 43,MEDITATE db 0 -Mon042_EvosMoves: ; 3b93d (e:793d) +Mon042_EvosMoves: ;GOLBAT ;Evolutions db 0 @@ -1694,7 +1694,7 @@ Mon042_EvosMoves: ; 3b93d (e:793d) db 43,HAZE db 0 -Mon150_EvosMoves: ; 3b949 (e:7949) +Mon150_EvosMoves: ;MEWTWO ;Evolutions db 0 @@ -1706,7 +1706,7 @@ Mon150_EvosMoves: ; 3b949 (e:7949) db 81,AMNESIA db 0 -Mon143_EvosMoves: ; 3b955 (e:7955) +Mon143_EvosMoves: ;SNORLAX ;Evolutions db 0 @@ -1717,7 +1717,7 @@ Mon143_EvosMoves: ; 3b955 (e:7955) db 56,HYPER_BEAM db 0 -Mon129_EvosMoves: ; 3b95f (e:795f) +Mon129_EvosMoves: ;MAGIKARP ;Evolutions db EV_LEVEL,20,GYARADOS @@ -1726,21 +1726,21 @@ Mon129_EvosMoves: ; 3b95f (e:795f) db 15,TACKLE db 0 -Mon174_EvosMoves: ; 3b966 (e:7966) +Mon174_EvosMoves: ;MISSINGNO_86 ;Evolutions db 0 ;Learnset db 0 -Mon175_EvosMoves: ; 3b968 (e:7968) +Mon175_EvosMoves: ;MISSINGNO_87 ;Evolutions db 0 ;Learnset db 0 -Mon089_EvosMoves: ; 3b96a (e:796a) +Mon089_EvosMoves: ;MUK ;Evolutions db 0 @@ -1753,14 +1753,14 @@ Mon089_EvosMoves: ; 3b96a (e:796a) db 60,ACID_ARMOR db 0 -Mon176_EvosMoves: ; 3b978 (e:7978) +Mon176_EvosMoves: ;MISSINGNO_8A ;Evolutions db 0 ;Learnset db 0 -Mon099_EvosMoves: ; 3b97a (e:797a) +Mon099_EvosMoves: ;KINGLER ;Evolutions db 0 @@ -1772,7 +1772,7 @@ Mon099_EvosMoves: ; 3b97a (e:797a) db 49,HARDEN db 0 -Mon091_EvosMoves: ; 3b986 (e:7986) +Mon091_EvosMoves: ;CLOYSTER ;Evolutions db 0 @@ -1780,14 +1780,14 @@ Mon091_EvosMoves: ; 3b986 (e:7986) db 50,SPIKE_CANNON db 0 -Mon177_EvosMoves: ; 3b98a (e:798a) +Mon177_EvosMoves: ;MISSINGNO_8C ;Evolutions db 0 ;Learnset db 0 -Mon101_EvosMoves: ; 3b98c (e:798c) +Mon101_EvosMoves: ;ELECTRODE ;Evolutions db 0 @@ -1799,14 +1799,14 @@ Mon101_EvosMoves: ; 3b98c (e:798c) db 50,EXPLOSION db 0 -Mon036_EvosMoves: ; 3b998 (e:7998) +Mon036_EvosMoves: ;CLEFABLE ;Evolutions db 0 ;Learnset db 0 -Mon110_EvosMoves: ; 3b99a (e:799a) +Mon110_EvosMoves: ;WEEZING ;Evolutions db 0 @@ -1818,7 +1818,7 @@ Mon110_EvosMoves: ; 3b99a (e:799a) db 53,EXPLOSION db 0 -Mon053_EvosMoves: ; 3b9a6 (e:79a6) +Mon053_EvosMoves: ;PERSIAN ;Evolutions db 0 @@ -1830,7 +1830,7 @@ Mon053_EvosMoves: ; 3b9a6 (e:79a6) db 51,SLASH db 0 -Mon105_EvosMoves: ; 3b9b2 (e:79b2) +Mon105_EvosMoves: ;MAROWAK ;Evolutions db 0 @@ -1845,14 +1845,14 @@ Mon105_EvosMoves: ; 3b9b2 (e:79b2) db 55,RAGE db 0 -Mon178_EvosMoves: ; 3b9c4 (e:79c4) +Mon178_EvosMoves: ;MISSINGNO_92 ;Evolutions db 0 ;Learnset db 0 -Mon093_EvosMoves: ; 3b9c6 (e:79c6) +Mon093_EvosMoves: ;HAUNTER ;Evolutions db EV_TRADE,1,GENGAR @@ -1862,7 +1862,7 @@ Mon093_EvosMoves: ; 3b9c6 (e:79c6) db 38,DREAM_EATER db 0 -Mon063_EvosMoves: ; 3b9cf (e:79cf) +Mon063_EvosMoves: ;ABRA ;Evolutions db EV_LEVEL,16,KADABRA @@ -1870,7 +1870,7 @@ Mon063_EvosMoves: ; 3b9cf (e:79cf) ;Learnset db 0 -Mon065_EvosMoves: ; 3b9d4 (e:79d4) +Mon065_EvosMoves: ;ALAKAZAM ;Evolutions db 0 @@ -1883,7 +1883,7 @@ Mon065_EvosMoves: ; 3b9d4 (e:79d4) db 42,REFLECT db 0 -Mon017_EvosMoves: ; 3b9e2 (e:79e2) +Mon017_EvosMoves: ;PIDGEOTTO ;Evolutions db EV_LEVEL,36,PIDGEOT @@ -1897,7 +1897,7 @@ Mon017_EvosMoves: ; 3b9e2 (e:79e2) db 49,MIRROR_MOVE db 0 -Mon018_EvosMoves: ; 3b9f3 (e:79f3) +Mon018_EvosMoves: ;PIDGEOT ;Evolutions db 0 @@ -1910,14 +1910,14 @@ Mon018_EvosMoves: ; 3b9f3 (e:79f3) db 54,MIRROR_MOVE db 0 -Mon121_EvosMoves: ; 3ba01 (e:7a01) +Mon121_EvosMoves: ;STARMIE ;Evolutions db 0 ;Learnset db 0 -Mon001_EvosMoves: ; 3ba03 (e:7a03) +Mon001_EvosMoves: ;BULBASAUR ;Evolutions db EV_LEVEL,16,IVYSAUR @@ -1932,7 +1932,7 @@ Mon001_EvosMoves: ; 3ba03 (e:7a03) db 48,SOLARBEAM db 0 -Mon003_EvosMoves: ; 3ba16 (e:7a16) +Mon003_EvosMoves: ;VENUSAUR ;Evolutions db 0 @@ -1946,7 +1946,7 @@ Mon003_EvosMoves: ; 3ba16 (e:7a16) db 65,SOLARBEAM db 0 -Mon073_EvosMoves: ; 3ba26 (e:7a26) +Mon073_EvosMoves: ;TENTACRUEL ;Evolutions db 0 @@ -1961,14 +1961,14 @@ Mon073_EvosMoves: ; 3ba26 (e:7a26) db 50,HYDRO_PUMP db 0 -Mon179_EvosMoves: ; 3ba38 (e:7a38) +Mon179_EvosMoves: ;MISSINGNO_9C ;Evolutions db 0 ;Learnset db 0 -Mon118_EvosMoves: ; 3ba3a (e:7a3a) +Mon118_EvosMoves: ;GOLDEEN ;Evolutions db EV_LEVEL,33,SEAKING @@ -1982,7 +1982,7 @@ Mon118_EvosMoves: ; 3ba3a (e:7a3a) db 54,AGILITY db 0 -Mon119_EvosMoves: ; 3ba4b (e:7a4b) +Mon119_EvosMoves: ;SEAKING ;Evolutions db 0 @@ -1995,35 +1995,35 @@ Mon119_EvosMoves: ; 3ba4b (e:7a4b) db 54,AGILITY db 0 -Mon180_EvosMoves: ; 3ba59 (e:7a59) +Mon180_EvosMoves: ;MISSINGNO_9F ;Evolutions db 0 ;Learnset db 0 -Mon181_EvosMoves: ; 3ba5b (e:7a5b) +Mon181_EvosMoves: ;MISSINGNO_A0 ;Evolutions db 0 ;Learnset db 0 -Mon182_EvosMoves: ; 3ba5d (e:7a5d) +Mon182_EvosMoves: ;MISSINGNO_A1 ;Evolutions db 0 ;Learnset db 0 -Mon183_EvosMoves: ; 3ba5f (e:7a5f) +Mon183_EvosMoves: ;MISSINGNO_A2 ;Evolutions db 0 ;Learnset db 0 -Mon077_EvosMoves: ; 3ba61 (e:7a61) +Mon077_EvosMoves: ;PONYTA ;Evolutions db EV_LEVEL,40,RAPIDASH @@ -2037,7 +2037,7 @@ Mon077_EvosMoves: ; 3ba61 (e:7a61) db 48,AGILITY db 0 -Mon078_EvosMoves: ; 3ba72 (e:7a72) +Mon078_EvosMoves: ;RAPIDASH ;Evolutions db 0 @@ -2050,7 +2050,7 @@ Mon078_EvosMoves: ; 3ba72 (e:7a72) db 55,AGILITY db 0 -Mon019_EvosMoves: ; 3ba80 (e:7a80) +Mon019_EvosMoves: ;RATTATA ;Evolutions db EV_LEVEL,20,RATICATE @@ -2062,7 +2062,7 @@ Mon019_EvosMoves: ; 3ba80 (e:7a80) db 34,SUPER_FANG db 0 -Mon020_EvosMoves: ; 3ba8d (e:7a8d) +Mon020_EvosMoves: ;RATICATE ;Evolutions db 0 @@ -2073,7 +2073,7 @@ Mon020_EvosMoves: ; 3ba8d (e:7a8d) db 41,SUPER_FANG db 0 -Mon033_EvosMoves: ; 3ba97 (e:7a97) +Mon033_EvosMoves: ;NIDORINO ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING @@ -2087,7 +2087,7 @@ Mon033_EvosMoves: ; 3ba97 (e:7a97) db 46,HORN_DRILL db 0 -Mon030_EvosMoves: ; 3baa9 (e:7aa9) +Mon030_EvosMoves: ;NIDORINA ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN @@ -2101,7 +2101,7 @@ Mon030_EvosMoves: ; 3baa9 (e:7aa9) db 46,FURY_SWIPES db 0 -Mon074_EvosMoves: ; 3babb (e:7abb) +Mon074_EvosMoves: ;GEODUDE ;Evolutions db EV_LEVEL,25,GRAVELER @@ -2115,7 +2115,7 @@ Mon074_EvosMoves: ; 3babb (e:7abb) db 36,EXPLOSION db 0 -Mon137_EvosMoves: ; 3bacc (e:7acc) +Mon137_EvosMoves: ;PORYGON ;Evolutions db 0 @@ -2126,7 +2126,7 @@ Mon137_EvosMoves: ; 3bacc (e:7acc) db 42,TRI_ATTACK db 0 -Mon142_EvosMoves: ; 3bad6 (e:7ad6) +Mon142_EvosMoves: ;AERODACTYL ;Evolutions db 0 @@ -2137,14 +2137,14 @@ Mon142_EvosMoves: ; 3bad6 (e:7ad6) db 54,HYPER_BEAM db 0 -Mon184_EvosMoves: ; 3bae0 (e:7ae0) +Mon184_EvosMoves: ;MISSINGNO_AC ;Evolutions db 0 ;Learnset db 0 -Mon081_EvosMoves: ; 3bae2 (e:7ae2) +Mon081_EvosMoves: ;MAGNEMITE ;Evolutions db EV_LEVEL,30,MAGNETON @@ -2158,21 +2158,21 @@ Mon081_EvosMoves: ; 3bae2 (e:7ae2) db 47,SCREECH db 0 -Mon185_EvosMoves: ; 3baf3 (e:7af3) +Mon185_EvosMoves: ;MISSINGNO_AE ;Evolutions db 0 ;Learnset db 0 -Mon186_EvosMoves: ; 3baf5 (e:7af5) +Mon186_EvosMoves: ;MISSINGNO_AF ;Evolutions db 0 ;Learnset db 0 -Mon004_EvosMoves: ; 3baf7 (e:7af7) +Mon004_EvosMoves: ;CHARMANDER ;Evolutions db EV_LEVEL,16,CHARMELEON @@ -2186,7 +2186,7 @@ Mon004_EvosMoves: ; 3baf7 (e:7af7) db 46,FIRE_SPIN db 0 -Mon007_EvosMoves: ; 3bb08 (e:7b08) +Mon007_EvosMoves: ;SQUIRTLE ;Evolutions db EV_LEVEL,16,WARTORTLE @@ -2200,7 +2200,7 @@ Mon007_EvosMoves: ; 3bb08 (e:7b08) db 42,HYDRO_PUMP db 0 -Mon005_EvosMoves: ; 3bb19 (e:7b19) +Mon005_EvosMoves: ;CHARMELEON ;Evolutions db EV_LEVEL,36,CHARIZARD @@ -2214,7 +2214,7 @@ Mon005_EvosMoves: ; 3bb19 (e:7b19) db 56,FIRE_SPIN db 0 -Mon008_EvosMoves: ; 3bb2a (e:7b2a) +Mon008_EvosMoves: ;WARTORTLE ;Evolutions db EV_LEVEL,36,BLASTOISE @@ -2228,7 +2228,7 @@ Mon008_EvosMoves: ; 3bb2a (e:7b2a) db 47,HYDRO_PUMP db 0 -Mon006_EvosMoves: ; 3bb3b (e:7b3b) +Mon006_EvosMoves: ;CHARIZARD ;Evolutions db 0 @@ -2241,35 +2241,35 @@ Mon006_EvosMoves: ; 3bb3b (e:7b3b) db 55,FIRE_SPIN db 0 -Mon187_EvosMoves: ; 3bb49 (e:7b49) +Mon187_EvosMoves: ;MISSINGNO_B5 ;Evolutions db 0 ;Learnset db 0 -Mon188_EvosMoves: ; 3bb4b (e:7b4b) +Mon188_EvosMoves: ;FOSSIL_KABUTOPS ;Evolutions db 0 ;Learnset db 0 -Mon189_EvosMoves: ; 3bb4d (e:7b4d) +Mon189_EvosMoves: ;FOSSIL_AERODACTYL ;Evolutions db 0 ;Learnset db 0 -Mon190_EvosMoves: ; 3bb4f (e:7b4f) +Mon190_EvosMoves: ;MON_GHOST ;Evolutions db 0 ;Learnset db 0 -Mon043_EvosMoves: ; 3bb51 (e:7b51) +Mon043_EvosMoves: ;ODDISH ;Evolutions db EV_LEVEL,21,GLOOM @@ -2283,7 +2283,7 @@ Mon043_EvosMoves: ; 3bb51 (e:7b51) db 46,SOLARBEAM db 0 -Mon044_EvosMoves: ; 3bb62 (e:7b62) +Mon044_EvosMoves: ;GLOOM ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME @@ -2297,7 +2297,7 @@ Mon044_EvosMoves: ; 3bb62 (e:7b62) db 52,SOLARBEAM db 0 -Mon045_EvosMoves: ; 3bb74 (e:7b74) +Mon045_EvosMoves: ;VILEPLUME ;Evolutions db 0 @@ -2307,7 +2307,7 @@ Mon045_EvosMoves: ; 3bb74 (e:7b74) db 19,SLEEP_POWDER db 0 -Mon069_EvosMoves: ; 3bb7c (e:7b7c) +Mon069_EvosMoves: ;BELLSPROUT ;Evolutions db EV_LEVEL,21,WEEPINBELL @@ -2322,7 +2322,7 @@ Mon069_EvosMoves: ; 3bb7c (e:7b7c) db 42,SLAM db 0 -Mon070_EvosMoves: ; 3bb8f (e:7b8f) +Mon070_EvosMoves: ;WEEPINBELL ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL @@ -2337,7 +2337,7 @@ Mon070_EvosMoves: ; 3bb8f (e:7b8f) db 49,SLAM db 0 -Mon071_EvosMoves: ; 3bba3 (e:7ba3) +Mon071_EvosMoves: ;VICTREEBEL ;Evolutions db 0 diff --git a/data/facing.asm b/data/facing.asm index 7a3dfacd..3e965132 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -1,4 +1,4 @@ -SpriteFacingAndAnimationTable: ; 4000 (1:4000) +SpriteFacingAndAnimationTable: dw SpriteFacingDownAndStanding ; facing down, walk animation frame 0 dw SpriteFacingDownAndWalking ; facing down, walk animation frame 1 dw SpriteFacingDownAndStanding ; facing down, walk animation frame 2 @@ -38,7 +38,7 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000) ; special case dw SpriteSpecialCase ; pikachu maybe? -SpriteFacingDownAndStanding: ; 4042 (1:4042) +SpriteFacingDownAndStanding: db $04 ; Sprite OAM Parameters db $00,$00,$00,$00 ; top left @@ -46,7 +46,7 @@ SpriteFacingDownAndStanding: ; 4042 (1:4042) db $08,$00,$02,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$03,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingDownAndWalking: ; 4053 (1:4053) +SpriteFacingDownAndWalking: db $04 ; Sprite OAM Parameters db $00,$00,$80,$00 ; top left @@ -54,7 +54,7 @@ SpriteFacingDownAndWalking: ; 4053 (1:4053) db $08,$00,$82,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$83,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingDownAndWalking2: ; 4064 (1:4064) +SpriteFacingDownAndWalking2: db $04 ; Sprite OAM Parameters db $00,$08,$80,OAMFLAG_VFLIPPED ; top left @@ -62,7 +62,7 @@ SpriteFacingDownAndWalking2: ; 4064 (1:4064) db $08,$08,$82,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$83,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingUpAndStanding: ; 4075 (1:4075) +SpriteFacingUpAndStanding: db $04 ; Sprite OAM Parameters db $00,$00,$04,$00 ; top left @@ -70,7 +70,7 @@ SpriteFacingUpAndStanding: ; 4075 (1:4075) db $08,$00,$06,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$07,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingUpAndWalking: ; 4086 (1:4086) +SpriteFacingUpAndWalking: db $04 ; Sprite OAM Parameters db $00,$00,$84,$00 ; top left @@ -78,7 +78,7 @@ SpriteFacingUpAndWalking: ; 4086 (1:4086) db $08,$00,$86,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$87,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingUpAndWalking2: ; 4097 (1:4097) +SpriteFacingUpAndWalking2: db $04 ; Sprite OAM Parameters db $00,$08,$84,OAMFLAG_VFLIPPED ; top left @@ -86,7 +86,7 @@ SpriteFacingUpAndWalking2: ; 4097 (1:4097) db $08,$08,$86,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$87,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingLeftAndStanding: ; 40a8 (1:40a8) +SpriteFacingLeftAndStanding: db $04 ; Sprite OAM Parameters db $00,$00,$08,$00 ; top left @@ -94,7 +94,7 @@ SpriteFacingLeftAndStanding: ; 40a8 (1:40a8) db $08,$00,$0a,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$0b,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingLeftAndWalking: ; 40b9 (1:40b9) +SpriteFacingLeftAndWalking: db $04 ; Sprite OAM Parameters db $00,$00,$88,$00 ; top left @@ -102,7 +102,7 @@ SpriteFacingLeftAndWalking: ; 40b9 (1:40b9) db $08,$00,$8a,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$8b,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingRightAndStanding: ; 40ca (1:40ca) +SpriteFacingRightAndStanding: db $04 ; Sprite OAM Parameters db $00,$08,$08,OAMFLAG_VFLIPPED ; top left @@ -110,7 +110,7 @@ SpriteFacingRightAndStanding: ; 40ca (1:40ca) db $08,$08,$0a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$0b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteFacingRightAndWalking: ; 40db (1:40db) +SpriteFacingRightAndWalking: db $04 ; Sprite OAM Parameters db $00,$08,$88,OAMFLAG_VFLIPPED ; top left @@ -130,4 +130,4 @@ SpriteSpecialCase ; 40ec (1:40ec) db $0c,-$4,$00,OAM_VFLIP | OAMFLAG_CANBEMASKED db $0c,$04,$01,OAMFLAG_CANBEMASKED db $0c,$0c,$00,OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA -
\ No newline at end of file + diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm index 71c2c0cc..926db476 100755 --- a/data/force_bike_surf.asm +++ b/data/force_bike_surf.asm @@ -1,4 +1,4 @@ -ForcedBikeOrSurfMaps: ; c12f (3:412f) +ForcedBikeOrSurfMaps: ; map id, y, x db ROUTE_16,$0A,$11 db ROUTE_16,$0B,$11 diff --git a/data/good_rod.asm b/data/good_rod.asm index f1785737..6c23f402 100755 --- a/data/good_rod.asm +++ b/data/good_rod.asm @@ -1,3 +1,3 @@ -GoodRodMons: ; e27f (3:627f) +GoodRodMons: db 10,GOLDEEN db 10,POLIWAG diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm index c0dc63b1..b7358572 100755 --- a/data/hidden_coins.asm +++ b/data/hidden_coins.asm @@ -1,4 +1,4 @@ -HiddenCoinCoords: ; 7608e (1d:608e) +HiddenCoinCoords: db GAME_CORNER,$08,$00 db GAME_CORNER,$10,$01 db GAME_CORNER,$0b,$03 diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 051fdfe5..e94ebf80 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -1,4 +1,4 @@ -HiddenItemCoords: ; 75faa (1d:5faa) +HiddenItemCoords: ; map ID, then coords db SILPH_CO_5F, $03, $0c db SILPH_CO_9F, $0f, $02 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 6738d597..7ba90bd3 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -1,4 +1,4 @@ -HiddenObjectMaps: ; f268d (3c:668d) +HiddenObjectMaps: dbw SILPH_CO_11F, SilphCo11FHiddenObjects dbw SILPH_CO_5F, SilphCo5FHiddenObjects dbw SILPH_CO_9F, SilphCo9FHiddenObjects diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 5b522f8e..72822a40 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -4,7 +4,7 @@ ; Table of 2-Byte pointers, one pointer per map, ; goes up to Map_F7, ends with $FFFF. ; points to table listing all missable object in the area -MapHSPointers: ; c69b (3:469b) +MapHSPointers: dw MapHS00 dw MapHS01 dw MapHS02 @@ -270,24 +270,24 @@ MapHSPointers: ; c69b (3:469b) Hide EQU $11 ; (HideObjectPredef - PredefPointers) / 3 Show EQU $15 ; (ShowObjectPredef - PredefPointers) / 3 -MapHSXX: ; c88f (3:488f) +MapHSXX: db $FF, $FF, $FF -MapHS00: ; c892 (3:4892) +MapHS00: db PALLET_TOWN, $01, Hide -MapHS01: ; c895 (3:4895) +MapHS01: db VIRIDIAN_CITY, $05, Show db VIRIDIAN_CITY, $07, Hide db VIRIDIAN_CITY, $08, Hide -MapHS02: ; c89e (3:489e) +MapHS02: db PEWTER_CITY, $03, Show db PEWTER_CITY, $05, Show -MapHS03: ; c8a4 (3:48a4) +MapHS03: db CERULEAN_CITY, $01, Hide db CERULEAN_CITY, $02, Show db CERULEAN_CITY, $06, Hide db CERULEAN_CITY, $0A, Show db CERULEAN_CITY, $0B, Show -MapHS0A: ; c8b3 (3:48b3) +MapHS0A: db SAFFRON_CITY, $01, Show db SAFFRON_CITY, $02, Show db SAFFRON_CITY, $03, Show @@ -303,86 +303,86 @@ MapHS0A: ; c8b3 (3:48b3) db SAFFRON_CITY, $0D, Hide db SAFFRON_CITY, $0E, Show db SAFFRON_CITY, $0F, Hide -MapHS0D: ; c8e0 (3:48e0) +MapHS0D: db ROUTE_2, $01, Show db ROUTE_2, $02, Show -MapHS0F: ; c8e6 (3:48e6) +MapHS0F: db ROUTE_4, $03, Show -MapHS14: ; c8e9 (3:48e9) +MapHS14: db ROUTE_9, $0A, Show -MapHS17: ; c8ec (3:48ec) +MapHS17: db ROUTE_12, $01, Show db ROUTE_12, $09, Show db ROUTE_12, $0A, Show -MapHS1A: ; c8f5 (3:48f5) +MapHS1A: db ROUTE_15, $0B, Show -MapHS1B: ; c8f8 (3:48f8) +MapHS1B: db ROUTE_16, $07, Show -MapHS21: ; c8fb (3:48fb) +MapHS21: db ROUTE_22, $01, Hide db ROUTE_22, $02, Hide -MapHS23: ; c901 (3:4901) +MapHS23: db ROUTE_24, $01, Show db ROUTE_24, $08, Show -MapHS24: ; c907 (3:4907) +MapHS24: db ROUTE_25, $0A, Show -MapHS27: ; c90a (3:490a) +MapHS27: db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show -MapHS28: ; c913 (3:4913) +MapHS28: db OAKS_LAB, $01, Show db OAKS_LAB, $02, Show db OAKS_LAB, $03, Hide db OAKS_LAB, $04, Show db OAKS_LAB, $05, Show db OAKS_LAB, $06, Hide -MapHS2D: ; c925 (3:4925) +MapHS2D: db VIRIDIAN_GYM, $01, Show db VIRIDIAN_GYM, $0B, Show -MapHS34: ; c92b (3:492b) +MapHS34: db MUSEUM_1F, $05, Show MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house db CERULEAN_HOUSE_1, $02, Show -MapHSE4: ; c931 (3:4931) +MapHSE4: db UNKNOWN_DUNGEON_1, $01, Show db UNKNOWN_DUNGEON_1, $02, Show db UNKNOWN_DUNGEON_1, $03, Show db UNKNOWN_DUNGEON_1, $04, Show -MapHS8F: ; c93d (3:493d) +MapHS8F: db POKEMONTOWER_2, $01, Show -MapHS90: ; c940 (3:4940) +MapHS90: db POKEMONTOWER_3, $04, Show -MapHS91: ; c943 (3:4943) +MapHS91: db POKEMONTOWER_4, $04, Show db POKEMONTOWER_4, $05, Show db POKEMONTOWER_4, $06, Show -MapHS92: ; c94c (3:494c) +MapHS92: db POKEMONTOWER_5, $06, Show -MapHS93: ; c94f (3:494f) +MapHS93: db POKEMONTOWER_6, $04, Show db POKEMONTOWER_6, $05, Show -MapHS94: ; c955 (3:4955) +MapHS94: db POKEMONTOWER_7, $01, Hide ; jessie & james? db POKEMONTOWER_7, $02, Hide db POKEMONTOWER_7, $03, Show -MapHS95: ; c95e (3:495e) +MapHS95: db LAVENDER_HOUSE_1, $05, Hide -MapHS84: ; c961 (3:4961) +MapHS84: db CELADON_MANSION_5, $02, Show -MapHS87: ; c964 (3:4964) +MapHS87: db GAME_CORNER, $0B, Show -MapHS9B: ; c967 (3:4967) +MapHS9B: db FUCHSIA_HOUSE_2, $02, Show -MapHSA5: ; c96a (3:496a) +MapHSA5: db MANSION_1, $02, Show db MANSION_1, $03, Show -MapHSB1: ; c970 (3:4970) +MapHSB1: db FIGHTING_DOJO, $06, Show db FIGHTING_DOJO, $07, Show -MapHSB5: ; c976 (3:4976) +MapHSB5: db SILPH_CO_1F, $01, Hide -MapHS53: ; c979 (3:4979) +MapHS53: db POWER_PLANT, $01, Show db POWER_PLANT, $02, Show db POWER_PLANT, $03, Show @@ -397,62 +397,62 @@ MapHS53: ; c979 (3:4979) db POWER_PLANT, $0C, Show db POWER_PLANT, $0D, Show db POWER_PLANT, $0E, Show -MapHSC2: ; c9a3 (3:49a3) +MapHSC2: db VICTORY_ROAD_2, $06, Show db VICTORY_ROAD_2, $07, Show db VICTORY_ROAD_2, $08, Show db VICTORY_ROAD_2, $09, Show db VICTORY_ROAD_2, $0A, Show db VICTORY_ROAD_2, $0D, Show -MapHS58: ; c9b5 (3:49b5) +MapHS58: db BILLS_HOUSE, $01, Show db BILLS_HOUSE, $02, Hide db BILLS_HOUSE, $03, Hide -MapHS33: ; c9be (3:49be) +MapHS33: db VIRIDIAN_FOREST, $07, Show db VIRIDIAN_FOREST, $08, Show db VIRIDIAN_FOREST, $09, Show -MapHS3B: ; c9c7 (3:49c7) +MapHS3B: db MT_MOON_1, $08, Show db MT_MOON_1, $09, Show db MT_MOON_1, $0A, Show db MT_MOON_1, $0B, Show db MT_MOON_1, $0C, Show db MT_MOON_1, $0D, Show -MapHS3D: ; c9d9 (3:49d9) +MapHS3D: db MT_MOON_3, $02, Hide db MT_MOON_3, $06, Hide db MT_MOON_3, $07, Show db MT_MOON_3, $08, Show db MT_MOON_3, $09, Show db MT_MOON_3, $0A, Show -MapHS60: ; c9eb (3:49eb) +MapHS60: db SS_ANNE_2, $02, Hide -MapHS66: ; c9ee (3:49ee) +MapHS66: db SS_ANNE_8, $0A, Show -MapHS67: ; c9f1 (3:49f1) +MapHS67: db SS_ANNE_9, $06, Show db SS_ANNE_9, $09, Show -MapHS68: ; c9f7 (3:49f7) +MapHS68: db SS_ANNE_10, $09, Show db SS_ANNE_10, $0A, Show db SS_ANNE_10, $0B, Show -MapHSC6: ; ca00 (3:4a00) +MapHSC6: db VICTORY_ROAD_3, $05, Show db VICTORY_ROAD_3, $06, Show db VICTORY_ROAD_3, $0A, Show -MapHSC7: ; ca09 (3:4a09) +MapHSC7: db ROCKET_HIDEOUT_1, $06, Show db ROCKET_HIDEOUT_1, $07, Show -MapHSC8: ; ca0f (3:4a0f) +MapHSC8: db ROCKET_HIDEOUT_2, $02, Show db ROCKET_HIDEOUT_2, $03, Show db ROCKET_HIDEOUT_2, $04, Show db ROCKET_HIDEOUT_2, $05, Show -MapHSC9: ; ca1b (3:4a1b) +MapHSC9: db ROCKET_HIDEOUT_3, $03, Show db ROCKET_HIDEOUT_3, $04, Show -MapHSCA: ; ca21 (3:4a21) +MapHSCA: db ROCKET_HIDEOUT_4, $01, Show db ROCKET_HIDEOUT_4, $02, Hide db ROCKET_HIDEOUT_4, $03, Hide @@ -461,24 +461,24 @@ MapHSCA: ; ca21 (3:4a21) db ROCKET_HIDEOUT_4, $07, Show db ROCKET_HIDEOUT_4, $08, Hide db ROCKET_HIDEOUT_4, $09, Hide -MapHSCF: ; ca39 (3:4a39) +MapHSCF: db SILPH_CO_2F, $01, Show db SILPH_CO_2F, $02, Show db SILPH_CO_2F, $03, Show db SILPH_CO_2F, $04, Show db SILPH_CO_2F, $05, Show -MapHSD0: ; ca48 (3:4a48) +MapHSD0: db SILPH_CO_3F, $02, Show db SILPH_CO_3F, $03, Show db SILPH_CO_3F, $04, Show -MapHSD1: ; ca51 (3:4a51) +MapHSD1: db SILPH_CO_4F, $02, Show db SILPH_CO_4F, $03, Show db SILPH_CO_4F, $04, Show db SILPH_CO_4F, $05, Show db SILPH_CO_4F, $06, Show db SILPH_CO_4F, $07, Show -MapHSD2: ; ca63 (3:4a63) +MapHSD2: db SILPH_CO_5F, $02, Show db SILPH_CO_5F, $03, Show db SILPH_CO_5F, $04, Show @@ -486,13 +486,13 @@ MapHSD2: ; ca63 (3:4a63) db SILPH_CO_5F, $06, Show db SILPH_CO_5F, $07, Show db SILPH_CO_5F, $08, Show -MapHSD3: ; ca78 (3:4a78) +MapHSD3: db SILPH_CO_6F, $06, Show db SILPH_CO_6F, $07, Show db SILPH_CO_6F, $08, Show db SILPH_CO_6F, $09, Show db SILPH_CO_6F, $0A, Show -MapHSD4: ; ca87 (3:4a87) +MapHSD4: db SILPH_CO_7F, $05, Show db SILPH_CO_7F, $06, Show db SILPH_CO_7F, $07, Show @@ -501,93 +501,93 @@ MapHSD4: ; ca87 (3:4a87) db SILPH_CO_7F, $0A, Show db SILPH_CO_7F, $0B, Show db SILPH_CO_7F, $0C, Show -MapHSD5: ; ca9f (3:4a9f) +MapHSD5: db SILPH_CO_8F, $02, Show db SILPH_CO_8F, $03, Show db SILPH_CO_8F, $04, Show -MapHSE9: ; caa8 (3:4aa8) +MapHSE9: db SILPH_CO_9F, $02, Show db SILPH_CO_9F, $03, Show db SILPH_CO_9F, $04, Show -MapHSEA: ; cab1 (3:4ab1) +MapHSEA: db SILPH_CO_10F, $01, Show db SILPH_CO_10F, $02, Show db SILPH_CO_10F, $03, Show db SILPH_CO_10F, $04, Show db SILPH_CO_10F, $05, Show db SILPH_CO_10F, $06, Show -MapHSEB: ; cac3 (3:4ac3) +MapHSEB: db SILPH_CO_11F, $03, Show db SILPH_CO_11F, $04, Show db SILPH_CO_11F, $05, Show db SILPH_CO_11F, $06, Show -MapHSF4: ; cacf (3:4acf) +MapHSF4: db $F4, $02, Show -MapHSD6: ; cad2 (3:4ad2) +MapHSD6: db MANSION_2, $02, Show -MapHSD7: ; cad5 (3:4ad5) +MapHSD7: db MANSION_3, $03, Show db MANSION_3, $04, Show -MapHSD8: ; cadb (3:4adb) +MapHSD8: db MANSION_4, $03, Show db MANSION_4, $04, Show db MANSION_4, $05, Show db MANSION_4, $06, Show db MANSION_4, $08, Show -MapHSD9: ; caea (3:4aea) +MapHSD9: db SAFARI_ZONE_EAST, $01, Show db SAFARI_ZONE_EAST, $02, Show db SAFARI_ZONE_EAST, $03, Show db SAFARI_ZONE_EAST, $04, Show -MapHSDA: ; caf6 (3:4af6) +MapHSDA: db SAFARI_ZONE_NORTH, $01, Show db SAFARI_ZONE_NORTH, $02, Show -MapHSDB: ; cafc (3:4afc) +MapHSDB: db SAFARI_ZONE_WEST, $01, Show db SAFARI_ZONE_WEST, $02, Show db SAFARI_ZONE_WEST, $03, Show db SAFARI_ZONE_WEST, $04, Show -MapHSDC: ; cb08 (3:4b08) +MapHSDC: db SAFARI_ZONE_CENTER, $01, Show -MapHSE2: ; cb0b (3:4b0b) +MapHSE2: db UNKNOWN_DUNGEON_2, $01, Show db UNKNOWN_DUNGEON_2, $02, Show db UNKNOWN_DUNGEON_2, $03, Show db UNKNOWN_DUNGEON_2, $04, Show -MapHSE3: ; cb17 (3:4b17) +MapHSE3: db UNKNOWN_DUNGEON_3, $01, Show db UNKNOWN_DUNGEON_3, $02, Show db UNKNOWN_DUNGEON_3, $03, Show db UNKNOWN_DUNGEON_3, $04, Show db UNKNOWN_DUNGEON_3, $05, Show -MapHS6C: ; cb26 (3:4b26) +MapHS6C: db VICTORY_ROAD_1, $03, Show db VICTORY_ROAD_1, $04, Show -MapHS78: ; cb2c (3:4b2c) +MapHS78: db CHAMPIONS_ROOM, $02, Hide -MapHSC0: ; cb2f (3:4b2f) +MapHSC0: db SEAFOAM_ISLANDS_1, $01, Show db SEAFOAM_ISLANDS_1, $02, Show -MapHS9F: ; cb35 (3:4b35) +MapHS9F: db SEAFOAM_ISLANDS_2, $01, Hide db SEAFOAM_ISLANDS_2, $02, Hide -MapHSA0: ; cb3b (3:4b3b) +MapHSA0: db SEAFOAM_ISLANDS_3, $01, Hide db SEAFOAM_ISLANDS_3, $02, Hide -MapHSA1: ; cb41 (3:4b41) +MapHSA1: db SEAFOAM_ISLANDS_4, $02, Show db SEAFOAM_ISLANDS_4, $03, Show db SEAFOAM_ISLANDS_4, $05, Hide db SEAFOAM_ISLANDS_4, $06, Hide -MapHSA2: ; cb4d (3:4b4d) +MapHSA2: db SEAFOAM_ISLANDS_5, $01, Hide db SEAFOAM_ISLANDS_5, $02, Hide db SEAFOAM_ISLANDS_5, $03, Show -MapHS27Copy: ; cb56 (3:4b56) +MapHS27Copy: ; doesn't seem to be referenced db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show - db $FF, $01, Show
\ No newline at end of file + db $FF, $01, Show diff --git a/data/item_prices.asm b/data/item_prices.asm index cdcb5762..15a1bd34 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -1,4 +1,4 @@ -ItemPrices: ; 4494 (1:4494) +ItemPrices: money 0 ; MASTER_BALL money 1200 ; ULTRA_BALL money 600 ; GREAT_BALL diff --git a/data/key_items.asm b/data/key_items.asm index c7ee6413..afa586af 100755 --- a/data/key_items.asm +++ b/data/key_items.asm @@ -1,4 +1,4 @@ -KeyItemBitfield: ; e6dd (3:66dd) +KeyItemBitfield: db %11110000 db %00000001 db %11110000 diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm index dcfe0231..f3389579 100755 --- a/data/mapHeaders/agatha.asm +++ b/data/mapHeaders/agatha.asm @@ -1,4 +1,4 @@ -Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247) +Agatha_h: db CEMETERY ; tileset db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm index 04652643..99d237f6 100644 --- a/data/mapHeaders/beach_house.asm +++ b/data/mapHeaders/beach_house.asm @@ -1,4 +1,4 @@ -BeachHouse_h: ; f220e (3c:620e) +BeachHouse_h: db BEACH_HOUSE_TILESET db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm index 958e9fd4..b63b03df 100755 --- a/data/mapHeaders/bikeshop.asm +++ b/data/mapHeaders/bikeshop.asm @@ -1,4 +1,4 @@ -BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66) +BikeShop_h: db CLUB ; tileset db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm index 5218c5f3..735f8d62 100755 --- a/data/mapHeaders/billshouse.asm +++ b/data/mapHeaders/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88) +BillsHouse_h: db INTERIOR ; tileset db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm index 24564da5..47e5c5b4 100755 --- a/data/mapHeaders/blueshouse.asm +++ b/data/mapHeaders/blueshouse.asm @@ -1,4 +1,4 @@ -BluesHouse_h: ; 0x19b2f id=39 +BluesHouse_h: db HOUSE ; tileset db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm index 19536501..1267ebe2 100755 --- a/data/mapHeaders/bruno.asm +++ b/data/mapHeaders/bruno.asm @@ -1,4 +1,4 @@ -Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) +Bruno_h: db GYM ; tileset db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm index 7e3a6c06..7f94cad5 100755 --- a/data/mapHeaders/celadoncity.asm +++ b/data/mapHeaders/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCity_h: ; 18000 (6:4000) +CeladonCity_h: db OVERWORLD ; tileset db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm index cc2b6075..9520d76e 100755 --- a/data/mapHeaders/celadondiner.asm +++ b/data/mapHeaders/celadondiner.asm @@ -1,4 +1,4 @@ -CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138) +CeladonDiner_h: db LOBBY ; tileset db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm index f211b930..3c5674a7 100755 --- a/data/mapHeaders/celadongamecorner.asm +++ b/data/mapHeaders/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135) +CeladonGameCorner_h: db LOBBY ; tileset db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm index b54aa76c..c0dcf162 100755 --- a/data/mapHeaders/celadongym.asm +++ b/data/mapHeaders/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134) +CeladonGym_h: db GYM ; tileset db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm index 6bb908fb..019c3cc3 100755 --- a/data/mapHeaders/celadonhotel.asm +++ b/data/mapHeaders/celadonhotel.asm @@ -1,4 +1,4 @@ -CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140) +CeladonHotel_h: db POKECENTER ; tileset db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm index fee3fa15..ba510282 100755 --- a/data/mapHeaders/celadonhouse.asm +++ b/data/mapHeaders/celadonhouse.asm @@ -1,4 +1,4 @@ -CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139) +CeladonHouse_h: db MANSION ; tileset db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm index 8b2d9856..8c94cc63 100755 --- a/data/mapHeaders/celadonmansion1.asm +++ b/data/mapHeaders/celadonmansion1.asm @@ -1,4 +1,4 @@ -CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128) +CeladonMansion1_h: db MANSION ; tileset db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x) dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm index e5afd96e..462dfdf3 100755 --- a/data/mapHeaders/celadonmansion2.asm +++ b/data/mapHeaders/celadonmansion2.asm @@ -1,4 +1,4 @@ -CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129) +CeladonMansion2_h: db MANSION ; tileset db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x) dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm index 8b290e42..81b3f2e2 100755 --- a/data/mapHeaders/celadonmansion3.asm +++ b/data/mapHeaders/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130) +CeladonMansion3_h: db MANSION ; tileset db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x) dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm index e7277d66..c5cf2da9 100755 --- a/data/mapHeaders/celadonmansion4.asm +++ b/data/mapHeaders/celadonmansion4.asm @@ -1,4 +1,4 @@ -CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131) +CeladonMansion4_h: db MANSION ; tileset db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x) dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm index 06c5ce09..d26faccf 100755 --- a/data/mapHeaders/celadonmansion5.asm +++ b/data/mapHeaders/celadonmansion5.asm @@ -1,4 +1,4 @@ -CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132) +CeladonMansion5_h: db HOUSE ; tileset db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x) dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm index 2a5dc6ad..50d171bc 100755 --- a/data/mapHeaders/celadonmart1.asm +++ b/data/mapHeaders/celadonmart1.asm @@ -1,4 +1,4 @@ -CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122) +CeladonMart1_h: db LOBBY ; tileset db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x) dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm index 9bcd63bf..ecd609cb 100755 --- a/data/mapHeaders/celadonmart2.asm +++ b/data/mapHeaders/celadonmart2.asm @@ -1,4 +1,4 @@ -CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123) +CeladonMart2_h: db LOBBY ; tileset db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x) dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm index bb847159..af109528 100755 --- a/data/mapHeaders/celadonmart3.asm +++ b/data/mapHeaders/celadonmart3.asm @@ -1,4 +1,4 @@ -CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124) +CeladonMart3_h: db LOBBY ; tileset db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x) dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm index 12e7cc12..4ae820d9 100755 --- a/data/mapHeaders/celadonmart4.asm +++ b/data/mapHeaders/celadonmart4.asm @@ -1,4 +1,4 @@ -CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125) +CeladonMart4_h: db LOBBY ; tileset db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x) dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm index c16207ca..0d28464f 100755 --- a/data/mapHeaders/celadonmart5.asm +++ b/data/mapHeaders/celadonmart5.asm @@ -1,4 +1,4 @@ -CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136) +CeladonMart5_h: db LOBBY ; tileset db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm index 1e51a262..498587c6 100755 --- a/data/mapHeaders/celadonmartelevator.asm +++ b/data/mapHeaders/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127) +CeladonMartElevator_h: db LOBBY ; tileset db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm index 9654ef3d..8814092b 100755 --- a/data/mapHeaders/celadonmartroof.asm +++ b/data/mapHeaders/celadonmartroof.asm @@ -1,4 +1,4 @@ -CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126) +CeladonMartRoof_h: db LOBBY ; tileset db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm index e2164223..b9464c68 100755 --- a/data/mapHeaders/celadonpokecenter.asm +++ b/data/mapHeaders/celadonpokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133) +CeladonPokecenter_h: db POKECENTER ; tileset db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm index 96951df0..f7a5dc12 100755 --- a/data/mapHeaders/celadonprizeroom.asm +++ b/data/mapHeaders/celadonprizeroom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137) +CeladonPrizeRoom_h: db LOBBY ; tileset db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x) dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm index 56cab9f7..be6dc5b2 100755 --- a/data/mapHeaders/ceruleancity.asm +++ b/data/mapHeaders/ceruleancity.asm @@ -1,4 +1,4 @@ -CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3) +CeruleanCity_h: db OVERWORLD ; tileset db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm index 7296a2a7..f95e1a79 100755 --- a/data/mapHeaders/ceruleangym.asm +++ b/data/mapHeaders/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65) +CeruleanGym_h: db GYM ; tileset db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm index 879ceb23..2a8c9197 100755 --- a/data/mapHeaders/ceruleanhouse1.asm +++ b/data/mapHeaders/ceruleanhouse1.asm @@ -1,4 +1,4 @@ -CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63) +CeruleanHouse1_h: db HOUSE ; tileset db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x) dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm index d2c44a47..1e040ffd 100755 --- a/data/mapHeaders/ceruleanhouse2.asm +++ b/data/mapHeaders/ceruleanhouse2.asm @@ -1,4 +1,4 @@ -CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) +CeruleanHouse2_h: db SHIP ; tileset db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm index 60c6dc94..90119dc5 100755 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ b/data/mapHeaders/ceruleanhousetrashed.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62) +CeruleanHouseTrashed_h: db HOUSE ; tileset db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm index a2e112fd..3f3231e8 100755 --- a/data/mapHeaders/ceruleanmart.asm +++ b/data/mapHeaders/ceruleanmart.asm @@ -1,4 +1,4 @@ -CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67) +CeruleanMart_h: db MART ; tileset db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm index 908229fe..636a89ae 100755 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ b/data/mapHeaders/ceruleanpokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64) +CeruleanPokecenter_h: db POKECENTER ; tileset db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm index 1902fe5d..3f05790c 100755 --- a/data/mapHeaders/cinnabargym.asm +++ b/data/mapHeaders/cinnabargym.asm @@ -1,4 +1,4 @@ -CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166) +CinnabarGym_h: db FACILITY ; tileset db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm index 60ba7560..6ae6424d 100755 --- a/data/mapHeaders/cinnabarisland.asm +++ b/data/mapHeaders/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8) +CinnabarIsland_h: db OVERWORLD ; tileset db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm index dd9fc116..b686713f 100755 --- a/data/mapHeaders/cinnabarmart.asm +++ b/data/mapHeaders/cinnabarmart.asm @@ -1,4 +1,4 @@ -CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172) +CinnabarMart_h: db MART ; tileset db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm index 2d00d498..b1f002bd 100755 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ b/data/mapHeaders/cinnabarpokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171) +CinnabarPokecenter_h: db POKECENTER ; tileset db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm index 94728b8d..67e1188b 100644 --- a/data/mapHeaders/colosseum.asm +++ b/data/mapHeaders/colosseum.asm @@ -1,4 +1,4 @@ -Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) +Colosseum_h: db CLUB ; tileset db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm index a8d171d7..bdca2189 100755 --- a/data/mapHeaders/copycatshouse1f.asm +++ b/data/mapHeaders/copycatshouse1f.asm @@ -1,4 +1,4 @@ -CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175) +CopycatsHouse1F_h: db REDS_HOUSE_1 ; tileset db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm index 46be1f54..3eecf718 100755 --- a/data/mapHeaders/copycatshouse2f.asm +++ b/data/mapHeaders/copycatshouse2f.asm @@ -1,4 +1,4 @@ -CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176) +CopycatsHouse2F_h: db REDS_HOUSE_2 ; tileset db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm index 2677b51c..1b8d4c1c 100755 --- a/data/mapHeaders/daycarem.asm +++ b/data/mapHeaders/daycarem.asm @@ -1,4 +1,4 @@ -DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72) +DayCareM_h: db HOUSE ; tileset db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x) dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm index 3cd5a651..0e68a55c 100755 --- a/data/mapHeaders/diglettscave.asm +++ b/data/mapHeaders/diglettscave.asm @@ -1,4 +1,4 @@ -DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197) +DiglettsCave_h: db CAVERN ; tileset db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm index 8d9acd49..7670c83f 100755 --- a/data/mapHeaders/diglettscaveroute11.asm +++ b/data/mapHeaders/diglettscaveroute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85) +DiglettsCaveEntranceRoute11_h: db CAVERN ; tileset db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x) dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm index b81d48a6..0499b4c3 100755 --- a/data/mapHeaders/diglettscaveroute2.asm +++ b/data/mapHeaders/diglettscaveroute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46) +DiglettsCaveRoute2_h: db CAVERN ; tileset db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x) dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm index 603ec53b..8e8205b4 100755 --- a/data/mapHeaders/fanclub.asm +++ b/data/mapHeaders/fanclub.asm @@ -1,4 +1,4 @@ -FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90) +FanClub_h: db INTERIOR ; tileset db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm index d981d816..cb0a2fdb 100755 --- a/data/mapHeaders/fightingdojo.asm +++ b/data/mapHeaders/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177) +FightingDojo_h: db DOJO ; tileset db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm index 998f7bb4..2bfd2793 100755 --- a/data/mapHeaders/fuchsiacity.asm +++ b/data/mapHeaders/fuchsiacity.asm @@ -1,4 +1,4 @@ -FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7) +FuchsiaCity_h: db OVERWORLD ; tileset db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm index 4c6f083f..9d16f178 100755 --- a/data/mapHeaders/fuchsiagym.asm +++ b/data/mapHeaders/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157) +FuchsiaGym_h: db GYM ; tileset db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm index 98974fee..c4ab2c95 100755 --- a/data/mapHeaders/fuchsiahouse1.asm +++ b/data/mapHeaders/fuchsiahouse1.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) +FuchsiaHouse1_h: db HOUSE ; tileset db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x) dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm index f4d05eeb..530f44b6 100755 --- a/data/mapHeaders/fuchsiahouse2.asm +++ b/data/mapHeaders/fuchsiahouse2.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155) +FuchsiaHouse2_h: db LAB ; tileset db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x) dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm index 92b4d96d..e52b6b8a 100755 --- a/data/mapHeaders/fuchsiahouse3.asm +++ b/data/mapHeaders/fuchsiahouse3.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164) +FuchsiaHouse3_h: db SHIP ; tileset db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x) dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm index a9f00150..dcdfe8c7 100755 --- a/data/mapHeaders/fuchsiamart.asm +++ b/data/mapHeaders/fuchsiamart.asm @@ -1,4 +1,4 @@ -FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152) +FuchsiaMart_h: db MART ; tileset db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm index 48d4c7fc..b44acf29 100755 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ b/data/mapHeaders/fuchsiameetingroom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158) +FuchsiaMeetingRoom_h: db LAB ; tileset db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm index aec7f455..dc6f1e6b 100755 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ b/data/mapHeaders/fuchsiapokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154) +FuchsiaPokecenter_h: db POKECENTER ; tileset db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm index 5b1a1f98..792c4b32 100755 --- a/data/mapHeaders/gary.asm +++ b/data/mapHeaders/gary.asm @@ -1,4 +1,4 @@ -Gary_h: ; 75f11 (1d:5f11) +Gary_h: db GYM ;tileset db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width dw GaryBlocks, GaryTextPointers, GaryScript diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm index 63cd6419..a90464a8 100755 --- a/data/mapHeaders/halloffameroom.asm +++ b/data/mapHeaders/halloffameroom.asm @@ -1,4 +1,4 @@ -HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118) +HallofFameRoom_h: db GYM ; tileset db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm index 87c37501..deaf5041 100755 --- a/data/mapHeaders/indigoplateau.asm +++ b/data/mapHeaders/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) +IndigoPlateau_h: db PLATEAU ; tileset db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm index d0e056ac..4cf92d82 100755 --- a/data/mapHeaders/indigoplateaulobby.asm +++ b/data/mapHeaders/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174) +IndigoPlateauLobby_h: db MART ; tileset db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm index 512373c4..d0e976e7 100755 --- a/data/mapHeaders/lab1.asm +++ b/data/mapHeaders/lab1.asm @@ -1,4 +1,4 @@ -Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) +Lab1_h: db LAB ; tileset db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x) dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm index a3c2ccf6..75cbcf1f 100755 --- a/data/mapHeaders/lab2.asm +++ b/data/mapHeaders/lab2.asm @@ -1,4 +1,4 @@ -Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168) +Lab2_h: db LAB ; tileset db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x) dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm index c9709e83..9af39022 100755 --- a/data/mapHeaders/lab3.asm +++ b/data/mapHeaders/lab3.asm @@ -1,4 +1,4 @@ -Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169) +Lab3_h: db LAB ; tileset db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x) dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm index 82ced4a3..e0b23c7d 100755 --- a/data/mapHeaders/lab4.asm +++ b/data/mapHeaders/lab4.asm @@ -1,4 +1,4 @@ -Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170) +Lab4_h: db LAB ; tileset db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x) dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm index 464fd0d7..13b2a343 100755 --- a/data/mapHeaders/lance.asm +++ b/data/mapHeaders/lance.asm @@ -1,4 +1,4 @@ -Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113) +Lance_h: db DOJO ; tileset db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm index e9531fff..f1750dc0 100755 --- a/data/mapHeaders/lavenderhouse1.asm +++ b/data/mapHeaders/lavenderhouse1.asm @@ -1,4 +1,4 @@ -LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149) +LavenderHouse1_h: db HOUSE ; tileset db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x) dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm index ea6c00c1..449ccf07 100755 --- a/data/mapHeaders/lavenderhouse2.asm +++ b/data/mapHeaders/lavenderhouse2.asm @@ -1,4 +1,4 @@ -LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151) +LavenderHouse2_h: db HOUSE ; tileset db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x) dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm index 95f448e5..e2bd0c9c 100755 --- a/data/mapHeaders/lavendermart.asm +++ b/data/mapHeaders/lavendermart.asm @@ -1,4 +1,4 @@ -LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150) +LavenderMart_h: db MART ; tileset db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm index ce6630bf..c0d41294 100755 --- a/data/mapHeaders/lavenderpokecenter.asm +++ b/data/mapHeaders/lavenderpokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141) +LavenderPokecenter_h: db POKECENTER ; tileset db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm index 72952d41..74bbd7a8 100755 --- a/data/mapHeaders/lavendertown.asm +++ b/data/mapHeaders/lavendertown.asm @@ -1,4 +1,4 @@ -LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4) +LavenderTown_h: db OVERWORLD ; tileset db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm index e1261c3e..634435d3 100755 --- a/data/mapHeaders/lorelei.asm +++ b/data/mapHeaders/lorelei.asm @@ -1,4 +1,4 @@ -Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245) +Lorelei_h: db GYM ; tileset db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm index e7110698..46b0a83e 100755 --- a/data/mapHeaders/mansion1.asm +++ b/data/mapHeaders/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165) +Mansion1_h: db FACILITY ; tileset db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x) dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm index e888b243..ee4b570c 100755 --- a/data/mapHeaders/mansion2.asm +++ b/data/mapHeaders/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214) +Mansion2_h: db FACILITY ; tileset db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x) dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm index a1b6c95f..97074347 100755 --- a/data/mapHeaders/mansion3.asm +++ b/data/mapHeaders/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215) +Mansion3_h: db FACILITY ; tileset db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x) dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm index 63f138e7..45b1636a 100755 --- a/data/mapHeaders/mansion4.asm +++ b/data/mapHeaders/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216) +Mansion4_h: db FACILITY ; tileset db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x) dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm index f5b52f37..da64b667 100755 --- a/data/mapHeaders/mtmoon1.asm +++ b/data/mapHeaders/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59) +MtMoon1_h: db CAVERN ; tileset db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x) dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm index 5e53bc20..7121c33e 100755 --- a/data/mapHeaders/mtmoon2.asm +++ b/data/mapHeaders/mtmoon2.asm @@ -1,4 +1,4 @@ -MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60) +MtMoon2_h: db CAVERN ; tileset db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x) dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm index 95331007..643eb95d 100755 --- a/data/mapHeaders/mtmoon3.asm +++ b/data/mapHeaders/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61) +MtMoon3_h: db CAVERN ; tileset db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x) dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm index 52f002cc..ba82c478 100755 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ b/data/mapHeaders/mtmoonpokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68) +MtMoonPokecenter_h: db POKECENTER ; tileset db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm index dacdb50e..10611513 100755 --- a/data/mapHeaders/museum1f.asm +++ b/data/mapHeaders/museum1f.asm @@ -1,4 +1,4 @@ -Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) +Museum1F_h: db MUSEUM ; tileset db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm index 15997573..62f9f7ca 100755 --- a/data/mapHeaders/museum2f.asm +++ b/data/mapHeaders/museum2f.asm @@ -1,4 +1,4 @@ -Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53) +Museum2F_h: db MUSEUM ; tileset db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm index f43493d4..3fdef0d7 100755 --- a/data/mapHeaders/namerater.asm +++ b/data/mapHeaders/namerater.asm @@ -1,4 +1,4 @@ -NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229) +NameRater_h: db HOUSE ; tileset db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm index ab41ef4d..ba2c9d22 100755 --- a/data/mapHeaders/oakslab.asm +++ b/data/mapHeaders/oakslab.asm @@ -1,4 +1,4 @@ -OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40) +OaksLab_h: db DOJO ; tileset db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index 5ad13aea..a957314c 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -1,4 +1,4 @@ -PalletTown_h: ; 182a1 (6:42a1) +PalletTown_h: db OVERWORLD ; tileset db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index 69c5d978..ff5bd7b9 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2) +PewterCity_h: db OVERWORLD ; tileset db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm index ac159b16..8eee73b3 100755 --- a/data/mapHeaders/pewtergym.asm +++ b/data/mapHeaders/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54) +PewterGym_h: db GYM ; tileset db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm index b9d11d98..40209926 100755 --- a/data/mapHeaders/pewterhouse1.asm +++ b/data/mapHeaders/pewterhouse1.asm @@ -1,4 +1,4 @@ -PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55) +PewterHouse1_h: db HOUSE ; tileset db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x) dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm index abcb409b..25fc3e9d 100755 --- a/data/mapHeaders/pewterhouse2.asm +++ b/data/mapHeaders/pewterhouse2.asm @@ -1,4 +1,4 @@ -PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57) +PewterHouse2_h: db HOUSE ; tileset db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x) dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm index 673dc1cf..02481bfc 100755 --- a/data/mapHeaders/pewtermart.asm +++ b/data/mapHeaders/pewtermart.asm @@ -1,4 +1,4 @@ -PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56) +PewterMart_h: db MART ; tileset db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm index 4fd426c5..f3abc838 100755 --- a/data/mapHeaders/pewterpokecenter.asm +++ b/data/mapHeaders/pewterpokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58) +PewterPokecenter_h: db POKECENTER ; tileset db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm index d7c2849e..9a799d73 100755 --- a/data/mapHeaders/pokemontower1.asm +++ b/data/mapHeaders/pokemontower1.asm @@ -1,4 +1,4 @@ -PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142) +PokemonTower1_h: db CEMETERY ; tileset db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x) dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm index 30493d08..a2c395c9 100755 --- a/data/mapHeaders/pokemontower2.asm +++ b/data/mapHeaders/pokemontower2.asm @@ -1,4 +1,4 @@ -PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143) +PokemonTower2_h: db CEMETERY ; tileset db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x) dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm index bb3f2318..af81c9e6 100755 --- a/data/mapHeaders/pokemontower3.asm +++ b/data/mapHeaders/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144) +PokemonTower3_h: db CEMETERY ; tileset db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x) dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm index bf405a76..073c34c0 100755 --- a/data/mapHeaders/pokemontower4.asm +++ b/data/mapHeaders/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145) +PokemonTower4_h: db CEMETERY ; tileset db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x) dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm index 662c32d2..a7636534 100755 --- a/data/mapHeaders/pokemontower5.asm +++ b/data/mapHeaders/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146) +PokemonTower5_h: db CEMETERY ; tileset db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x) dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm index a6d0ff9d..a83ae0ba 100755 --- a/data/mapHeaders/pokemontower6.asm +++ b/data/mapHeaders/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147) +PokemonTower6_h: db CEMETERY ; tileset db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x) dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm index c366006b..4e13bcee 100755 --- a/data/mapHeaders/pokemontower7.asm +++ b/data/mapHeaders/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) +PokemonTower7_h: db CEMETERY ; tileset db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x) dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm index 36c07d3f..9c78311d 100755 --- a/data/mapHeaders/powerplant.asm +++ b/data/mapHeaders/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83) +PowerPlant_h: db FACILITY ; tileset db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm index 02dcc082..82d83042 100755 --- a/data/mapHeaders/redshouse1f.asm +++ b/data/mapHeaders/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1F_h: ; 4815c (12:415c) +RedsHouse1F_h: db REDS_HOUSE_1 ; tileset db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm index 6b72d7db..c4b0969c 100755 --- a/data/mapHeaders/redshouse2f.asm +++ b/data/mapHeaders/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2F_h: ; 5c0a4 (17:40a4) +RedsHouse2F_h: db REDS_HOUSE_2 ; tileset db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm index 9af33f1d..a9dcf424 100755 --- a/data/mapHeaders/rockethideout1.asm +++ b/data/mapHeaders/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199) +RocketHideout1_h: db FACILITY ; tileset db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x) dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm index b4629ccb..8f034360 100755 --- a/data/mapHeaders/rockethideout2.asm +++ b/data/mapHeaders/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200) +RocketHideout2_h: db FACILITY ; tileset db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x) dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm index 1ec94195..5fc9fb95 100755 --- a/data/mapHeaders/rockethideout3.asm +++ b/data/mapHeaders/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201) +RocketHideout3_h: db FACILITY ; tileset db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x) dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm index 9ee9ec58..0cde5bee 100755 --- a/data/mapHeaders/rockethideout4.asm +++ b/data/mapHeaders/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202) +RocketHideout4_h: db FACILITY ; tileset db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x) dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm index 209c2ba8..d4917812 100755 --- a/data/mapHeaders/rockethideoutelevator.asm +++ b/data/mapHeaders/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203) +RocketHideoutElevator_h: db LOBBY ; tileset db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm index cc734b28..db67517d 100755 --- a/data/mapHeaders/rocktunnel1.asm +++ b/data/mapHeaders/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82) +RockTunnel1_h: db CAVERN ; tileset db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x) dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm index ec43cddc..5b85701b 100755 --- a/data/mapHeaders/rocktunnel2.asm +++ b/data/mapHeaders/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232) +RockTunnel2_h: db CAVERN ; tileset db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x) dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm index 390cc20e..e1bad3bd 100755 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ b/data/mapHeaders/rocktunnelpokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81) +RockTunnelPokecenter_h: db POKECENTER ; tileset db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm index 6a8db0c4..5f6a858e 100755 --- a/data/mapHeaders/route1.asm +++ b/data/mapHeaders/route1.asm @@ -1,4 +1,4 @@ -Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12) +Route1_h: db OVERWORLD ; tileset db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm index fab0e4a5..7ee588cf 100755 --- a/data/mapHeaders/route10.asm +++ b/data/mapHeaders/route10.asm @@ -1,4 +1,4 @@ -Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) +Route10_h: db OVERWORLD ; tileset db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm index 66c54bbe..04ae8f24 100755 --- a/data/mapHeaders/route11.asm +++ b/data/mapHeaders/route11.asm @@ -1,4 +1,4 @@ -Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) +Route11_h: db OVERWORLD ; tileset db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm index 56b9381c..26539a19 100755 --- a/data/mapHeaders/route11gate.asm +++ b/data/mapHeaders/route11gate.asm @@ -1,4 +1,4 @@ -Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84) +Route11Gate_h: db GATE ; tileset db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm index 3428de6a..ac556804 100755 --- a/data/mapHeaders/route11gateupstairs.asm +++ b/data/mapHeaders/route11gateupstairs.asm @@ -1,4 +1,4 @@ -Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86) +Route11GateUpstairs_h: db GATE ; tileset db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm index 6132a244..b11e0128 100755 --- a/data/mapHeaders/route12.asm +++ b/data/mapHeaders/route12.asm @@ -1,4 +1,4 @@ -Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) +Route12_h: db OVERWORLD ; tileset db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm index 0afcf06b..bcd36d73 100755 --- a/data/mapHeaders/route12gate.asm +++ b/data/mapHeaders/route12gate.asm @@ -1,4 +1,4 @@ -Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87) +Route12Gate_h: db GATE ; tileset db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm index acad7e9f..96109a38 100755 --- a/data/mapHeaders/route12gateupstairs.asm +++ b/data/mapHeaders/route12gateupstairs.asm @@ -1,4 +1,4 @@ -Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195) +Route12GateUpstairs_h: db GATE ; tileset db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm index 0116270c..11f45d24 100755 --- a/data/mapHeaders/route12house.asm +++ b/data/mapHeaders/route12house.asm @@ -1,4 +1,4 @@ -Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189) +Route12House_h: db HOUSE ; tileset db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x) dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm index 9a821208..53a88633 100755 --- a/data/mapHeaders/route13.asm +++ b/data/mapHeaders/route13.asm @@ -1,4 +1,4 @@ -Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) +Route13_h: db OVERWORLD ; tileset db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm index e4163126..f860d332 100755 --- a/data/mapHeaders/route14.asm +++ b/data/mapHeaders/route14.asm @@ -1,4 +1,4 @@ -Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) +Route14_h: db OVERWORLD ; tileset db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm index 6d2e8859..48d5ff20 100755 --- a/data/mapHeaders/route15.asm +++ b/data/mapHeaders/route15.asm @@ -1,4 +1,4 @@ -Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) +Route15_h: db OVERWORLD ; tileset db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm index 55ee5cc9..072d8f72 100755 --- a/data/mapHeaders/route15gate.asm +++ b/data/mapHeaders/route15gate.asm @@ -1,4 +1,4 @@ -Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184) +Route15Gate_h: db GATE ; tileset db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm index 0687ab28..96e7e2ca 100755 --- a/data/mapHeaders/route15gateupstairs.asm +++ b/data/mapHeaders/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairs_h: ; 4963e (12:563e) +Route15GateUpstairs_h: db GATE ; tileset db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm index 42678ed3..eee71ba2 100755 --- a/data/mapHeaders/route16.asm +++ b/data/mapHeaders/route16.asm @@ -1,4 +1,4 @@ -Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) +Route16_h: db OVERWORLD ; tileset db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm index a155125e..b3381258 100755 --- a/data/mapHeaders/route16gate.asm +++ b/data/mapHeaders/route16gate.asm @@ -1,4 +1,4 @@ -Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186) +Route16Gate_h: db GATE ; tileset db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm index 878c4eca..e8dd7d45 100755 --- a/data/mapHeaders/route16gateupstairs.asm +++ b/data/mapHeaders/route16gateupstairs.asm @@ -1,4 +1,4 @@ -Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187) +Route16GateUpstairs_h: db GATE ; tileset db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm index c3649b84..5945e11b 100755 --- a/data/mapHeaders/route16house.asm +++ b/data/mapHeaders/route16house.asm @@ -1,4 +1,4 @@ -Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188) +Route16House_h: db HOUSE ; tileset db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x) dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm index 577fe009..82a5d0f4 100755 --- a/data/mapHeaders/route17.asm +++ b/data/mapHeaders/route17.asm @@ -1,4 +1,4 @@ -Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) +Route17_h: db OVERWORLD ; tileset db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm index 8fb1b3bc..180111b5 100755 --- a/data/mapHeaders/route18.asm +++ b/data/mapHeaders/route18.asm @@ -1,4 +1,4 @@ -Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) +Route18_h: db OVERWORLD ; tileset db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm index a0e463e8..090d43df 100755 --- a/data/mapHeaders/route18gate.asm +++ b/data/mapHeaders/route18gate.asm @@ -1,4 +1,4 @@ -Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190) +Route18Gate_h: db GATE ; tileset db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm index 2043c2ef..ac9e3d0a 100755 --- a/data/mapHeaders/route18gateupstairs.asm +++ b/data/mapHeaders/route18gateupstairs.asm @@ -1,4 +1,4 @@ -Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) +Route18GateUpstairs_h: db GATE ; tileset db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm index 2ca85cc1..1de353f8 100755 --- a/data/mapHeaders/route19.asm +++ b/data/mapHeaders/route19.asm @@ -1,4 +1,4 @@ -Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) +Route19_h: db OVERWORLD ; tileset db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 564f4a58..38e80842 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,4 +1,4 @@ -Route2_h: ; 54000 (15:4000) +Route2_h: db 00 ; Tileset db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm index d4f645d8..f871179f 100755 --- a/data/mapHeaders/route20.asm +++ b/data/mapHeaders/route20.asm @@ -1,4 +1,4 @@ -Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) +Route20_h: db OVERWORLD ; tileset db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm index 7f3e0a2f..a2c06868 100755 --- a/data/mapHeaders/route21.asm +++ b/data/mapHeaders/route21.asm @@ -1,4 +1,4 @@ -Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) +Route21_h: db OVERWORLD ; tileset db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm index 598e9224..c227d433 100755 --- a/data/mapHeaders/route22.asm +++ b/data/mapHeaders/route22.asm @@ -1,4 +1,4 @@ -Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) +Route22_h: db OVERWORLD ; tileset db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm index 3daa30a3..7b8963ba 100755 --- a/data/mapHeaders/route22gate.asm +++ b/data/mapHeaders/route22gate.asm @@ -1,4 +1,4 @@ -Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193) +Route22Gate_h: db GATE ; tileset db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm index 32dc36fd..bec192c2 100755 --- a/data/mapHeaders/route23.asm +++ b/data/mapHeaders/route23.asm @@ -1,4 +1,4 @@ -Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) +Route23_h: db PLATEAU ; tileset db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm index a445c144..9a313aba 100755 --- a/data/mapHeaders/route24.asm +++ b/data/mapHeaders/route24.asm @@ -1,4 +1,4 @@ -Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) +Route24_h: db OVERWORLD ; tileset db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm index a6e62a00..39ffa45d 100755 --- a/data/mapHeaders/route25.asm +++ b/data/mapHeaders/route25.asm @@ -1,4 +1,4 @@ -Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) +Route25_h: db OVERWORLD ; tileset db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm index 343c0f09..5cb7bcbc 100755 --- a/data/mapHeaders/route2gate.asm +++ b/data/mapHeaders/route2gate.asm @@ -1,4 +1,4 @@ -Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49) +Route2Gate_h: db GATE ; tileset db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm index f99a365d..c7c140f6 100755 --- a/data/mapHeaders/route2house.asm +++ b/data/mapHeaders/route2house.asm @@ -1,4 +1,4 @@ -Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48) +Route2House_h: db HOUSE ; tileset db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x) dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm index 0003b90a..19adfea8 100755 --- a/data/mapHeaders/route3.asm +++ b/data/mapHeaders/route3.asm @@ -1,4 +1,4 @@ -Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) +Route3_h: db OVERWORLD ; tileset db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index 6e8724c9..a322f23c 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -1,4 +1,4 @@ -Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) +Route4_h: db OVERWORLD ; tileset db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm index 1b8c3ee1..b982c02d 100755 --- a/data/mapHeaders/route5.asm +++ b/data/mapHeaders/route5.asm @@ -1,4 +1,4 @@ -Route5_h: ; 0x54589 to 0x545ab (34 bytes) (id=16) +Route5_h: db OVERWORLD ; tileset db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm index 79a44874..68810da1 100755 --- a/data/mapHeaders/route5gate.asm +++ b/data/mapHeaders/route5gate.asm @@ -1,4 +1,4 @@ -Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70) +Route5Gate_h: db GATE ; tileset db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm index 21dd0872..6ed13d4e 100755 --- a/data/mapHeaders/route6.asm +++ b/data/mapHeaders/route6.asm @@ -1,4 +1,4 @@ -Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) +Route6_h: db OVERWORLD ; tileset db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm index 3bafb448..f689240c 100755 --- a/data/mapHeaders/route6gate.asm +++ b/data/mapHeaders/route6gate.asm @@ -1,4 +1,4 @@ -Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73) +Route6Gate_h: db GATE ; tileset db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm index 38fd1e15..62f3bedf 100755 --- a/data/mapHeaders/route7.asm +++ b/data/mapHeaders/route7.asm @@ -1,4 +1,4 @@ -Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) +Route7_h: db OVERWORLD ; tileset db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm index b5d26672..9e01914f 100755 --- a/data/mapHeaders/route7gate.asm +++ b/data/mapHeaders/route7gate.asm @@ -1,4 +1,4 @@ -Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76) +Route7Gate_h: db GATE ; tileset db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm index 14c867ea..5187fd8f 100755 --- a/data/mapHeaders/route8.asm +++ b/data/mapHeaders/route8.asm @@ -1,4 +1,4 @@ -Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) +Route8_h: db OVERWORLD ; tileset db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm index 2bd505a2..d206e978 100755 --- a/data/mapHeaders/route8gate.asm +++ b/data/mapHeaders/route8gate.asm @@ -1,4 +1,4 @@ -Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79) +Route8Gate_h: db GATE ; tileset db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm index 30982dd4..044a4ec0 100755 --- a/data/mapHeaders/route9.asm +++ b/data/mapHeaders/route9.asm @@ -1,4 +1,4 @@ -Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) +Route9_h: db OVERWORLD ; tileset db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm index a1388fa1..6da27c12 100755 --- a/data/mapHeaders/safarizonecenter.asm +++ b/data/mapHeaders/safarizonecenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220) +SafariZoneCenter_h: db FOREST ; tileset db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm index dec95d2a..089620dc 100755 --- a/data/mapHeaders/safarizoneeast.asm +++ b/data/mapHeaders/safarizoneeast.asm @@ -1,4 +1,4 @@ -SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217) +SafariZoneEast_h: db FOREST ; tileset db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm index e7340c4a..1122d5a3 100755 --- a/data/mapHeaders/safarizoneentrance.asm +++ b/data/mapHeaders/safarizoneentrance.asm @@ -1,4 +1,4 @@ -SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156) +SafariZoneEntrance_h: db GATE ; tileset db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x) dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm index 310ead4c..a3a46769 100755 --- a/data/mapHeaders/safarizonenorth.asm +++ b/data/mapHeaders/safarizonenorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218) +SafariZoneNorth_h: db FOREST ; tileset db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm index f788b6c4..b2988b47 100755 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ b/data/mapHeaders/safarizoneresthouse1.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221) +SafariZoneRestHouse1_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm index 5ccdb947..589d9850 100755 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ b/data/mapHeaders/safarizoneresthouse2.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223) +SafariZoneRestHouse2_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm index acf87854..21ffd3b6 100755 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ b/data/mapHeaders/safarizoneresthouse3.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224) +SafariZoneRestHouse3_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm index 8a1ad30f..fa7de7ad 100755 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ b/data/mapHeaders/safarizoneresthouse4.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225) +SafariZoneRestHouse4_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm index 7fa71fe4..6b081b1a 100755 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ b/data/mapHeaders/safarizonesecrethouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222) +SafariZoneSecretHouse_h: db LAB ; tileset db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm index 590ae21d..c1c54d13 100755 --- a/data/mapHeaders/safarizonewest.asm +++ b/data/mapHeaders/safarizonewest.asm @@ -1,4 +1,4 @@ -SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219) +SafariZoneWest_h: db FOREST ; tileset db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm index 3a39b396..8f4ea922 100755 --- a/data/mapHeaders/saffroncity.asm +++ b/data/mapHeaders/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) +SaffronCity_h: db OVERWORLD ; tileset db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm index 23601c75..da3b4c04 100755 --- a/data/mapHeaders/saffrongym.asm +++ b/data/mapHeaders/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178) +SaffronGym_h: db FACILITY ; tileset db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm index 71cd5395..9e22b03b 100755 --- a/data/mapHeaders/saffronhouse1.asm +++ b/data/mapHeaders/saffronhouse1.asm @@ -1,4 +1,4 @@ -SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179) +SaffronHouse1_h: db HOUSE ; tileset db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x) dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm index a91bcaec..c38d0231 100755 --- a/data/mapHeaders/saffronhouse2.asm +++ b/data/mapHeaders/saffronhouse2.asm @@ -1,4 +1,4 @@ -SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183) +SaffronHouse2_h: db HOUSE ; tileset db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x) dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm index 0c6fc1d8..747e4da9 100755 --- a/data/mapHeaders/saffronmart.asm +++ b/data/mapHeaders/saffronmart.asm @@ -1,4 +1,4 @@ -SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180) +SaffronMart_h: db MART ; tileset db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm index 341b415a..aa972289 100755 --- a/data/mapHeaders/saffronpokecenter.asm +++ b/data/mapHeaders/saffronpokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182) +SaffronPokecenter_h: db POKECENTER ; tileset db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm index 336ce26e..8ace4fba 100755 --- a/data/mapHeaders/school.asm +++ b/data/mapHeaders/school.asm @@ -1,4 +1,4 @@ -School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43) +School_h: db HOUSE ; tileset db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x) dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm index 8cb1c847..f52a65a8 100755 --- a/data/mapHeaders/seafoamislands1.asm +++ b/data/mapHeaders/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192) +SeafoamIslands1_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x) dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm index 9edbcc72..08ec4bfa 100755 --- a/data/mapHeaders/seafoamislands2.asm +++ b/data/mapHeaders/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159) +SeafoamIslands2_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x) dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm index 6ff1d8ff..4050cd71 100755 --- a/data/mapHeaders/seafoamislands3.asm +++ b/data/mapHeaders/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160) +SeafoamIslands3_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x) dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm index d3b6fca0..d3912ce0 100755 --- a/data/mapHeaders/seafoamislands4.asm +++ b/data/mapHeaders/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161) +SeafoamIslands4_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x) dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm index 330b1d0e..2ae6d4b7 100755 --- a/data/mapHeaders/seafoamislands5.asm +++ b/data/mapHeaders/seafoamislands5.asm @@ -1,4 +1,4 @@ -SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162) +SeafoamIslands5_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x) dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm index eecb49b6..203f08b7 100755 --- a/data/mapHeaders/silphco1.asm +++ b/data/mapHeaders/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181) +SilphCo1_h: db FACILITY ; tileset db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm index efef2235..a16a6323 100755 --- a/data/mapHeaders/silphco10.asm +++ b/data/mapHeaders/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234) +SilphCo10_h: db FACILITY ; tileset db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm index 829fc9de..a5d2f1b0 100755 --- a/data/mapHeaders/silphco11.asm +++ b/data/mapHeaders/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235) +SilphCo11_h: db INTERIOR ; tileset db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm index 1f345127..f0783e98 100755 --- a/data/mapHeaders/silphco2.asm +++ b/data/mapHeaders/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207) +SilphCo2_h: db FACILITY ; tileset db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm index 56119f41..b89a3802 100755 --- a/data/mapHeaders/silphco3.asm +++ b/data/mapHeaders/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208) +SilphCo3_h: db FACILITY ; tileset db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm index 3d6289cf..3c03a771 100755 --- a/data/mapHeaders/silphco4.asm +++ b/data/mapHeaders/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209) +SilphCo4_h: db FACILITY ; tileset db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm index aa40ca2f..42704025 100755 --- a/data/mapHeaders/silphco5.asm +++ b/data/mapHeaders/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210) +SilphCo5_h: db FACILITY ; tileset db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm index af9b3d6b..c204360a 100755 --- a/data/mapHeaders/silphco6.asm +++ b/data/mapHeaders/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211) +SilphCo6_h: db FACILITY ; tileset db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm index 335d3b6b..bc31b335 100755 --- a/data/mapHeaders/silphco7.asm +++ b/data/mapHeaders/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212) +SilphCo7_h: db FACILITY ; tileset db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm index 31c9617c..aa3e0317 100755 --- a/data/mapHeaders/silphco8.asm +++ b/data/mapHeaders/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) +SilphCo8_h: db FACILITY ; tileset db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm index 1cc8b3f2..97427fa3 100755 --- a/data/mapHeaders/silphco9.asm +++ b/data/mapHeaders/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233) +SilphCo9_h: db FACILITY ; tileset db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm index b8a59b7a..8a6ae1ca 100755 --- a/data/mapHeaders/silphcoelevator.asm +++ b/data/mapHeaders/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236) +SilphCoElevator_h: db LOBBY ; tileset db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm index c31de5d4..e6b48564 100755 --- a/data/mapHeaders/ssanne1.asm +++ b/data/mapHeaders/ssanne1.asm @@ -1,4 +1,4 @@ -SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95) +SSAnne1_h: db SHIP ; tileset db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x) dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm index e0e5c6a7..ef07424b 100755 --- a/data/mapHeaders/ssanne10.asm +++ b/data/mapHeaders/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104) +SSAnne10_h: db SHIP ; tileset db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x) dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm index 50ca0562..cd5f3aa4 100755 --- a/data/mapHeaders/ssanne2.asm +++ b/data/mapHeaders/ssanne2.asm @@ -1,4 +1,4 @@ -SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96) +SSAnne2_h: db SHIP ; tileset db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x) dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm index acde90a2..ffa57ddd 100755 --- a/data/mapHeaders/ssanne3.asm +++ b/data/mapHeaders/ssanne3.asm @@ -1,4 +1,4 @@ -SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97) +SSAnne3_h: db SHIP ; tileset db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x) dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm index 7f3e9ab2..492b4b8d 100755 --- a/data/mapHeaders/ssanne4.asm +++ b/data/mapHeaders/ssanne4.asm @@ -1,4 +1,4 @@ -SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98) +SSAnne4_h: db SHIP ; tileset db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x) dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm index 7da4a6bf..29ffb6b9 100755 --- a/data/mapHeaders/ssanne5.asm +++ b/data/mapHeaders/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99) +SSAnne5_h: db SHIP ; tileset db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x) dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm index 6d27509e..e347528a 100755 --- a/data/mapHeaders/ssanne6.asm +++ b/data/mapHeaders/ssanne6.asm @@ -1,4 +1,4 @@ -SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100) +SSAnne6_h: db SHIP ; tileset db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x) dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm index 66da59c0..9b437688 100755 --- a/data/mapHeaders/ssanne7.asm +++ b/data/mapHeaders/ssanne7.asm @@ -1,4 +1,4 @@ -SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101) +SSAnne7_h: db SHIP ; tileset db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x) dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm index dcb12993..64b5c565 100755 --- a/data/mapHeaders/ssanne8.asm +++ b/data/mapHeaders/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102) +SSAnne8_h: db SHIP ; tileset db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x) dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm index 5a293576..c8e6e16f 100755 --- a/data/mapHeaders/ssanne9.asm +++ b/data/mapHeaders/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103) +SSAnne9_h: db SHIP ; tileset db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x) dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm index b9759bbb..09217ff0 100644 --- a/data/mapHeaders/tradecenter.asm +++ b/data/mapHeaders/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) +TradeCenter_h: db CLUB ; tileset db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm index 75e881ba..6e2c5727 100755 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ b/data/mapHeaders/undergroundpathentranceroute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71) +UndergroundPathEntranceRoute5_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm index 91835507..bb22e93e 100755 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ b/data/mapHeaders/undergroundpathentranceroute6.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74) +UndergroundPathEntranceRoute6_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm index 1ad53899..49b03415 100755 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ b/data/mapHeaders/undergroundpathentranceroute7.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77) +UndergroundPathEntranceRoute7_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm index e5e6cfa0..e12ee454 100755 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d) +UndergroundPathEntranceRoute7Copy_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm index ac6fd87d..c70cb697 100755 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ b/data/mapHeaders/undergroundpathentranceroute8.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80) +UndergroundPathEntranceRoute8_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm index 78a02053..4dc86647 100755 --- a/data/mapHeaders/undergroundpathns.asm +++ b/data/mapHeaders/undergroundpathns.asm @@ -1,4 +1,4 @@ -UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119) +UndergroundPathNS_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x) dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm index e5561767..df2f98e1 100755 --- a/data/mapHeaders/undergroundpathwe.asm +++ b/data/mapHeaders/undergroundpathwe.asm @@ -1,4 +1,4 @@ -UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121) +UndergroundPathWE_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x) dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm index 8bac389a..e784ffac 100755 --- a/data/mapHeaders/unknowndungeon1.asm +++ b/data/mapHeaders/unknowndungeon1.asm @@ -1,4 +1,4 @@ -UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228) +UnknownDungeon1_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x) dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm index 0bea5b16..3c4c8d4e 100755 --- a/data/mapHeaders/unknowndungeon2.asm +++ b/data/mapHeaders/unknowndungeon2.asm @@ -1,4 +1,4 @@ -UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226) +UnknownDungeon2_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x) dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm index a29d39dd..2e01c079 100755 --- a/data/mapHeaders/unknowndungeon3.asm +++ b/data/mapHeaders/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227) +UnknownDungeon3_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x) dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm index a4118084..c162ab24 100755 --- a/data/mapHeaders/vermilioncity.asm +++ b/data/mapHeaders/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5) +VermilionCity_h: db OVERWORLD ; tileset db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm index d8d2993c..16b1c7d8 100755 --- a/data/mapHeaders/vermiliondock.asm +++ b/data/mapHeaders/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94) +VermilionDock_h: db SHIP_PORT ; tileset db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm index 5627257e..7624ed75 100755 --- a/data/mapHeaders/vermiliongym.asm +++ b/data/mapHeaders/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92) +VermilionGym_h: db GYM ; tileset db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm index 34f99023..94aac1d0 100755 --- a/data/mapHeaders/vermilionhouse1.asm +++ b/data/mapHeaders/vermilionhouse1.asm @@ -1,4 +1,4 @@ -VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93) +VermilionHouse1_h: db HOUSE ; tileset db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x) dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm index ce810bb4..b4124088 100755 --- a/data/mapHeaders/vermilionhouse2.asm +++ b/data/mapHeaders/vermilionhouse2.asm @@ -1,4 +1,4 @@ -VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163) +VermilionHouse2_h: db HOUSE ; tileset db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x) dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm index 62651a4f..01683532 100755 --- a/data/mapHeaders/vermilionhouse3.asm +++ b/data/mapHeaders/vermilionhouse3.asm @@ -1,4 +1,4 @@ -VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196) +VermilionHouse3_h: db HOUSE ; tileset db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x) dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm index ecf71946..97fccc4d 100755 --- a/data/mapHeaders/vermilionmart.asm +++ b/data/mapHeaders/vermilionmart.asm @@ -1,4 +1,4 @@ -VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91) +VermilionMart_h: db MART ; tileset db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm index 6033585f..e1a63f9e 100755 --- a/data/mapHeaders/vermilionpokecenter.asm +++ b/data/mapHeaders/vermilionpokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89) +VermilionPokecenter_h: db POKECENTER ; tileset db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm index 972d3866..6d2f4338 100755 --- a/data/mapHeaders/victoryroad1.asm +++ b/data/mapHeaders/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108) +VictoryRoad1_h: db CAVERN ; tileset db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x) dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm index 3fb24eee..fa9803b2 100755 --- a/data/mapHeaders/victoryroad2.asm +++ b/data/mapHeaders/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194) +VictoryRoad2_h: db CAVERN ; tileset db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x) dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm index e35c32c1..4202bfb6 100755 --- a/data/mapHeaders/victoryroad3.asm +++ b/data/mapHeaders/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198) +VictoryRoad3_h: db CAVERN ; tileset db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x) dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm index f7faa568..79b19368 100755 --- a/data/mapHeaders/viridiancity.asm +++ b/data/mapHeaders/viridiancity.asm @@ -1,4 +1,4 @@ -ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1) +ViridianCity_h: db OVERWORLD ; tileset db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm index 43433c9e..ef7905b0 100755 --- a/data/mapHeaders/viridianforest.asm +++ b/data/mapHeaders/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51) +ViridianForest_h: db FOREST ; tileset db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm index 21fdc56b..6e861c58 100755 --- a/data/mapHeaders/viridianforestentrance.asm +++ b/data/mapHeaders/viridianforestentrance.asm @@ -1,4 +1,4 @@ -ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50) +ViridianForestEntrance_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x) dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm index 285e6416..8e1dd25e 100755 --- a/data/mapHeaders/viridianforestexit.asm +++ b/data/mapHeaders/viridianforestexit.asm @@ -1,4 +1,4 @@ -ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47) +ViridianForestExit_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x) dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm index c983ab71..40b0d69f 100755 --- a/data/mapHeaders/viridiangym.asm +++ b/data/mapHeaders/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45) +ViridianGym_h: db GYM ; tileset db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index 392c6a20..c8724b4e 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -1,4 +1,4 @@ -ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44) +ViridianHouse_h: db HOUSE ; tileset db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x) dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm index 1bbe80f0..3d799a5b 100755 --- a/data/mapHeaders/viridianmart.asm +++ b/data/mapHeaders/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42) +ViridianMart_h: db MART ; tileset db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm index 673be44e..3218e89d 100755 --- a/data/mapHeaders/viridianpokecenter.asm +++ b/data/mapHeaders/viridianpokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41) +ViridianPokecenter_h: db POKECENTER ; tileset db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index e33172ae..22000dde 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -1,4 +1,4 @@ -AgathaObject: ; 0x76534 (size=44) +AgathaObject: db $0 ; border block db $4 ; warps diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index ab763bc3..5a7e832c 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,4 +1,4 @@ -BikeShopObject: ; 0x1d866 (size=38) +BikeShopObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index 9da1efd1..ef52e1dd 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouseObject: ; 0x1e8df (size=38) +BillsHouseObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 3dfce6e1..08b11853 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,4 +1,4 @@ -BluesHouseObject: ; 19bce (6:5bce) +BluesHouseObject: db $0A ; border block db $2 ; warps diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 8d55461f..a734b07b 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,4 +1,4 @@ -BrunoObject: ; 0x763d7 (size=44) +BrunoObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 0e420221..c2a7fd78 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCityObject: ; 0x18022 (size=189) +CeladonCityObject: db $f ; border block db $d ; warps diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index 74141df9..fd202a96 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,4 +1,4 @@ -CeladonDinerObject: ; 0x491bc (size=50) +CeladonDinerObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index a44cf0a6..af59d2b1 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCornerObject: ; 0x48fa0 (size=99) +CeladonGameCornerObject: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index a38dd535..212c389e 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGymObject: ; 0x48b30 (size=84) +CeladonGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 33c442c2..8d7dcb03 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -1,4 +1,4 @@ -CeladonHotelObject: ; 0x49281 (size=38) +CeladonHotelObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 0fcb08f5..6bd847a4 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -1,4 +1,4 @@ -CeladonHouseObject: ; 0x49227 (size=38) +CeladonHouseObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index a308e8bc..47fbb0e5 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -1,4 +1,4 @@ -CeladonMansion1Object: ; 0x486cf (size=71) +CeladonMansion1Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 9271c22d..883cae36 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,4 +1,4 @@ -CeladonMansion2Object: ; 0x48745 (size=39) +CeladonMansion2Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index 36bf36d5..0564b1cb 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3Object: ; 0x487ff (size=72) +CeladonMansion3Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 0241725d..c4f667fa 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,4 +1,4 @@ -CeladonMansion4Object: ; 0x48875 (size=31) +CeladonMansion4Object: db $9 ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 2f20323d..243e345b 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -1,4 +1,4 @@ -CeladonMansion5Object: ; 0x1dd5c (size=32) +CeladonMansion5Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index dbbc0a36..af647cf2 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -1,4 +1,4 @@ -CeladonMart1Object: ; 0x60f9e (size=64) +CeladonMart1Object: db $f ; border block db $6 ; warps diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 061ac6e0..a6c9af59 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,4 +1,4 @@ -CeladonMart2Object: ; 0x56111 (size=55) +CeladonMart2Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 36760d25..45f12b2c 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -1,4 +1,4 @@ -CeladonMart3Object: ; 0x482c4 (size=94) +CeladonMart3Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 7dce43dc..386dba8c 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -1,4 +1,4 @@ -CeladonMart4Object: ; 0x48370 (size=49) +CeladonMart4Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 23b7cf4f..df47a70d 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -1,4 +1,4 @@ -CeladonMart5Object: ; 0x49085 (size=55) +CeladonMart5Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index 6b778043..2db8635a 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorObject: ; 0x4866d (size=23) +CeladonMartElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 82830cf2..63a1b4d7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,4 +1,4 @@ -CeladonMartRoofObject: ; 0x485a8 (size=36) +CeladonMartRoofObject: db $42 ; border block db $1 ; warps diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index 7429c190..6691eaaa 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenterObject: ; 0x488d2 (size=44) +CeladonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index 73ca7598..c440bad5 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoomObject: ; 0x49108 (size=41) +CeladonPrizeRoomObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index ff0f2c66..318f03b9 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,4 +1,4 @@ -CeruleanCityObject: ; 0x18786 (size=170) +CeruleanCityObject: db $a ; border block db $a ; warps diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 68d74547..66d22260 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGymObject: ; 0x5c834 (size=50) +CeruleanGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index aa9f66a4..97e5b52d 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,4 +1,4 @@ -CeruleanHouse1Object: ; 0x1d710 (size=32) +CeruleanHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 24fe3a5e..669cd098 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -1,4 +1,4 @@ -CeruleanHouse2Object: ; 0x74ebe (size=34) +CeruleanHouse2Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 0c896120..4f154191 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) +CeruleanHouseTrashedObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index fc400e73..301d11a2 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,4 +1,4 @@ -CeruleanMartObject: ; 0x5c8a8 (size=38) +CeruleanMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 4b92f0d8..a8ad26d4 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenterObject: ; 0x5c65f (size=44) +CeruleanPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 2b9f34cb..28960150 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -1,4 +1,4 @@ -CinnabarGymObject: ; 0x75acc (size=90) +CinnabarGymObject: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 7c8e80fb..05f4c06c 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIslandObject: ; 0x1c022 (size=71) +CinnabarIslandObject: db $43 ; border block db $5 ; warps diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 057ce048..79494686 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,4 +1,4 @@ -CinnabarMartObject: ; 0x75e91 (size=38) +CinnabarMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index b855464e..b9779eb5 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenterObject: ; 0x75e46 (size=44) +CinnabarPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 5be02b44..91fea6b9 100644 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -1,4 +1,4 @@ -ColosseumObject: ; 0x4fd87 (size=10) +ColosseumObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 983baa99..c6702cfa 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -1,4 +1,4 @@ -CopycatsHouse1FObject: ; 0x75ee3 (size=46) +CopycatsHouse1FObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 204c429f..0d53965a 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -1,4 +1,4 @@ -CopycatsHouse2FObject: ; 0x5cd21 (size=48) +CopycatsHouse2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 7fbbf13b..98d4c184 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -1,4 +1,4 @@ -DayCareMObject: ; 0x56459 (size=26) +DayCareMObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 74bbf775..cdcffce0 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -1,4 +1,4 @@ -DiglettsCaveObject: ; 0x61f72 (size=20) +DiglettsCaveObject: db $19 ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index d77e649d..e5d6b69f 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) +DiglettsCaveEntranceRoute11Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index a905305b..f1310cce 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2Object: ; 0x1debf (size=34) +DiglettsCaveRoute2Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index cbe0cb31..1dbb2dca 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,4 +1,4 @@ -FanClubObject: ; 0x59c97 (size=62) +FanClubObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index aa9c0bd7..44fed88f 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojoObject: ; 0x5cf9b (size=72) +FightingDojoObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index c64760c0..f4bb842b 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -1,4 +1,4 @@ -FuchsiaCityObject: ; 0x18bd4 (size=178) +FuchsiaCityObject: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index c7fc3799..86f62d21 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGymObject: ; 0x75658 (size=82) +FuchsiaGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 0789ea2c..4d3c3b6e 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1Object: ; 0x75031 (size=38) +FuchsiaHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f3aa5e7c..3a3d07c3 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2Object: ; 0x75180 (size=45) +FuchsiaHouse2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 3fd056e9..aaf05bd6 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3Object: ; 0x56221 (size=34) +FuchsiaHouse3Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index eb85d110..431e7c2f 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -1,4 +1,4 @@ -FuchsiaMartObject: ; 0x1dd9b (size=38) +FuchsiaMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 36afcfd8..8106b9ec 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoomObject: ; 0x756fc (size=38) +FuchsiaMeetingRoomObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 8a1c392b..bf9abe99 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenterObject: ; 0x7507d (size=44) +FuchsiaPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index c14efcf0..e0f37b91 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,4 +1,4 @@ -GaryObject: ; 0x7612f (size=48) +GaryObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index b21b1f4e..8e245c2c 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -1,4 +1,4 @@ -HallofFameRoomObject: ; 0x5a571 (size=26) +HallofFameRoomObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index a30cfbfe..145f2f39 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateauObject: ; 0x50936 (size=20) +IndigoPlateauObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index c41e2cfc..dbeaa85b 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyObject: ; 0x19c95 (size=58) +IndigoPlateauLobbyObject: db $0 ; border block db $3 ; warps diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index a2e05e14..e0adaedc 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -1,4 +1,4 @@ -Lab1Object: ; 0x75bb3 (size=62) +Lab1Object: db $17 ; border block db $5 ; warps diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 89ed5f2c..ed541ada 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,4 +1,4 @@ -Lab2Object: ; 0x75c45 (size=38) +Lab2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index 8aca194b..c5ee01c3 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,4 +1,4 @@ -Lab3Object: ; 0x75cec (size=41) +Lab3Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 47f301c9..361f9533 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,4 +1,4 @@ -Lab4Object: ; 0x75df0 (size=32) +Lab4Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index cdfbc7a6..e7bf0ad6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,4 +1,4 @@ -LanceObject: ; 0x5a3c5 (size=36) +LanceObject: db $3 ; border block db $3 ; warps diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 45707121..54f57270 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -1,4 +1,4 @@ -LavenderHouse1Object: ; 0x1d96a (size=56) +LavenderHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index a8641204..7638ff66 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -1,4 +1,4 @@ -LavenderHouse2Object: ; 0x1d9e6 (size=32) +LavenderHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index d23f21ae..2d8e7636 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -1,4 +1,4 @@ -LavenderMartObject: ; 0x5c95d (size=38) +LavenderMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index 702e67b7..f98cede4 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenterObject: ; 0x5c8f4 (size=44) +LavenderPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index fb78f139..49347aba 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -1,4 +1,4 @@ -LavenderTownObject: ; 0x4402d (size=88) +LavenderTownObject: db $2c ; border block db $6 ; warps diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 4ce080f7..5b985369 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,4 +1,4 @@ -LoreleiObject: ; 0x76280 (size=44) +LoreleiObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 0bb168bb..ed6529f2 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1Object: ; 0x443a4 (size=90) +Mansion1Object: db $2e ; border block db $8 ; warps diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index 2cb45879..bda2ad27 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2Object: ; 0x520d1 (size=63) +Mansion2Object: db $1 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 288b4753..72431402 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3Object: ; 0x522e6 (size=64) +Mansion3Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index eddbda8e..94a6f612 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4Object: ; 0x52498 (size=69) +Mansion4Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index a59f2a20..42c45016 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1Object: ; 0x49b06 (size=145) +MtMoon1Object: db $3 ; border block db $5 ; warps diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 2cf6be6b..f39cd4a5 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,4 +1,4 @@ -MtMoon2Object: ; 0x51a4d (size=68) +MtMoon2Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 4a9b1946..43891ec3 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3Object: ; 0x49fdb (size=102) +MtMoon3Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 935c4a40..d1ac34fb 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenterObject: ; 0x49376 (size=56) +MtMoonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 208a19c8..56932af8 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,4 +1,4 @@ -Museum1FObject: ; 0x5c2c1 (size=74) +Museum1FObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 77ea061b..689391d9 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,4 +1,4 @@ -Museum2FObject: ; 0x5c34b (size=48) +Museum2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 28dcf48f..0118b2f7 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -1,4 +1,4 @@ -NameRaterObject: ; 0x1dad6 (size=26) +NameRaterObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 5b9a01d5..1efb1e72 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,4 +1,4 @@ -OaksLabObject: ; 0x1d40a (size=88) +OaksLabObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index 0d45fea3..e22f79a6 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -1,4 +1,4 @@ -PalletTownObject: ; 0x182c3 (size=58) +PalletTownObject: db $b ; border block db $3 ; warps diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 27a559fc..7b389bd2 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCityObject: ; 0x18577 (size=111) +PewterCityObject: db $a ; border block db $7 ; warps diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index b0224a11..280f1a7e 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGymObject: ; 0x5c52e (size=42) +PewterGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 8dcac05c..d973e53b 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -1,4 +1,4 @@ -PewterHouse1Object: ; 0x1d616 (size=38) +PewterHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index b4b8f2e7..6c111acb 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -1,4 +1,4 @@ -PewterHouse2Object: ; 0x1d659 (size=32) +PewterHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 2ef08e29..50ccd288 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -1,4 +1,4 @@ -PewterMartObject: ; 0x74cda (size=38) +PewterMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index d3f87326..4c7444bb 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenterObject: ; 0x5c60d (size=44) +PewterPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index eb71be9e..54af9efc 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,4 +1,4 @@ -PokemonTower1Object: ; 0x60452 (size=58) +PokemonTower1Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 57ba7363..33bc048d 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,4 +1,4 @@ -PokemonTower2Object: ; 0x60646 (size=32) +PokemonTower2Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 4591cbe3..9899276a 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3Object: ; 0x6075d (size=51) +PokemonTower3Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 722f6e08..19f4f4e3 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4Object: ; 0x6088b (size=65) +PokemonTower4Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 1d23abbf..5a73825c 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5Object: ; 0x60a48 (size=65) +PokemonTower5Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index cd7453d8..d0035faa 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6Object: ; 0x60c5b (size=58) +PokemonTower6Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 4d1e26c2..76435c04 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7Object: ; 0x60ef6 (size=42) +PokemonTower7Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index a4c5d8ea..a04cb657 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlantObject: ; 0x1e3bf (size=135) +PowerPlantObject: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4f977b2c..4d32ea3d 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1FObject: ; 481e4 (12:41e4) +RedsHouse1FObject: db $0A ; border block db $3 ; warps diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index d668d441..ebd57e59 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: ; 0x5c0d0 +RedsHouse2FObject: db $0A ; border block db $1 ; warps diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 55c0c101..0b2bf374 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1Object: ; 0x44ce7 (size=98) +RocketHideout1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index b14dc0e6..6689110c 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2Object: ; 0x450f7 (size=80) +RocketHideout2Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index d7933ddf..90bfbb57 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3Object: ; 0x4534d (size=50) +RocketHideout3Object: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 616f5a75..42e58b23 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4Object: ; 0x455f1 (size=95) +RocketHideout4Object: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index 477e62c9..c1dfe961 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorObject: ; 0x45791 (size=23) +RocketHideoutElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 70ffa438..932efb87 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1Object: ; 0x445f6 (size=127) +RockTunnel1Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index e343fc0b..3589ec60 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2Object: ; 0x4613d (size=100) +RockTunnel2Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 3cd937cf..06a2e39d 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenterObject: ; 0x493d4 (size=44) +RockTunnelPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index d2abf51f..0e6237e7 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,4 +1,4 @@ -Route1Object: ; 0x1c0e5 (size=19) +Route1Object: db $b ; border block db $0 ; warps diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index 3623b79f..a1590ded 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -1,4 +1,4 @@ -Route10Object: ; 0x582f6 (size=96) +Route10Object: db $2c ; border block db $4 ; warps diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index d0c9af20..8b6b5d3f 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,4 +1,4 @@ -Route11Object: ; 0x584e0 (size=127) +Route11Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 351b922c..d8e6bff1 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,4 +1,4 @@ -Route11GateObject: ; 0x49416 (size=50) +Route11GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 421de945..6228851d 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -1,4 +1,4 @@ -Route11GateUpstairsObject: ; 0x494da (size=30) +Route11GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 783fd49b..2dc7f9e7 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -1,4 +1,4 @@ -Route12Object: ; 0x5869a (size=118) +Route12Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 1e2fe3f9..27e8532a 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -1,4 +1,4 @@ -Route12GateObject: ; 0x4950e (size=50) +Route12GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 9a8e4d4a..f1221c44 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -1,4 +1,4 @@ -Route12GateUpstairsObject: ; 0x495de (size=24) +Route12GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index fad89578..104b01f7 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -1,4 +1,4 @@ -Route12HouseObject: ; 0x564de (size=26) +Route12HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index e6fdf8e6..a01e25a3 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -1,4 +1,4 @@ -Route13Object: ; 0x5482e (size=93) +Route13Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index ce6d52b0..48edd284 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -1,4 +1,4 @@ -Route14Object: ; 0x549bb (size=87) +Route14Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index bd6283b0..30fc39c4 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,4 +1,4 @@ -Route15Object: ; 0x5894e (size=126) +Route15Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index f571ee03..06a6790a 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,4 +1,4 @@ -Route15GateObject: ; 0x4960c (size=50) +Route15GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 4362ade0..c4cdcea8 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairsObject: ; 4969d (12:569d) +Route15GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 529b59bf..b7da1dbb 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -1,4 +1,4 @@ -Route16Object: ; 0x58afc (size=136) +Route16Object: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index e1da990d..fce6c292 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -1,4 +1,4 @@ -Route16GateObject: ; 0x4978b (size=88) +Route16GateObject: db $a ; border block db $9 ; warps diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index d8c2db12..9119bf5e 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,4 +1,4 @@ -Route16GateUpstairsObject: ; 0x4984c (size=30) +Route16GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 12a846c6..e1e4244d 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -1,4 +1,4 @@ -Route16HouseObject: ; 0x1e657 (size=32) +Route16HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index c496373e..3c8e3bce 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -1,4 +1,4 @@ -Route17Object: ; 0x54b42 (size=102) +Route17Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 40b50b08..41b971b0 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,4 +1,4 @@ -Route18Object: ; 0x58c5a (size=66) +Route18Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index d42026da..08b10050 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -1,4 +1,4 @@ -Route18GateObject: ; 0x49937 (size=50) +Route18GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 93438044..1ad911e8 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,4 +1,4 @@ -Route18GateUpstairsObject: ; 0x499a4 (size=24) +Route18GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 151cc4a8..0f963cfd 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,4 +1,4 @@ -Route19Object: ; 0x54e9a (size=87) +Route19Object: db $43 ; border block db $1 ; warps diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 9731f450..a8b0a7a5 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,4 +1,4 @@ -Route2Object: ; 0x54022 (size=72) +Route2Object: db $f ; border block db $7 ; warps diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 6939ffad..a3527525 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,4 +1,4 @@ -Route20Object: ; 0x50113 (size=106) +Route20Object: db $43 ; border block db $2 ; warps diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index e98c8425..1ed7b1cb 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,4 +1,4 @@ -Route21Object: ; 0x55021 (size=76) +Route21Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 999b9d8a..ef568ae8 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,4 +1,4 @@ -Route22Object: ; 0x50022 (size=27) +Route22Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 02f11d58..e75c4d50 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -1,4 +1,4 @@ -Route22GateObject: ; 0x1e720 (size=42) +Route22GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index af8c8dab..3995e510 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -1,4 +1,4 @@ -Route23Object: ; 0x50361 (size=81) +Route23Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 115f08d3..78a4d573 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -1,4 +1,4 @@ -Route24Object: ; 0x506a4 (size=67) +Route24Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 5c6811f3..b26f62ef 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -1,4 +1,4 @@ -Route25Object: ; 0x507b2 (size=94) +Route25Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 9a0b79e0..53590f69 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,4 +1,4 @@ -Route2GateObject: ; 0x5d620 (size=48) +Route2GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 463d9a1a..7d1d224d 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -1,4 +1,4 @@ -Route2HouseObject: ; 0x1df07 (size=32) +Route2HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index a2df6925..ba446dca 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -1,4 +1,4 @@ -Route3Object: ; 0x54208 (size=77) +Route3Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 14e59684..e52f4909 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -1,4 +1,4 @@ -Route4Object: ; 0x543b2 (size=58) +Route4Object: db $2c ; border block db $3 ; warps diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 7ace428a..eefcaa92 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,4 +1,4 @@ -Route5Object: ; 0x545ab (size=47) +Route5Object: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index db2f4564..9588f511 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -1,4 +1,4 @@ -Route5GateObject: ; 0x1dffb (size=42) +Route5GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index c854c91f..6ab90621 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -1,4 +1,4 @@ -Route6Object: ; 0x58022 (size=87) +Route6Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 59d08e57..79f17007 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -1,4 +1,4 @@ -Route6GateObject: ; 0x1e0be (size=42) +Route6GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index b84fa190..3f753830 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -1,4 +1,4 @@ -Route7Object: ; 0x48022 (size=47) +Route7Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 9e80ca39..8f65891b 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,4 +1,4 @@ -Route7GateObject: ; 0x1e185 (size=42) +Route7GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 38bcca5e..8f336e03 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,4 +1,4 @@ -Route8Object: ; 0x5814f (size=119) +Route8Object: db $2c ; border block db $5 ; warps diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 61d70dfc..a3e21618 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -1,4 +1,4 @@ -Route8GateObject: ; 0x1e247 (size=42) +Route8GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 6a759608..cdfd801c 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -1,4 +1,4 @@ -Route9Object: ; 0x546a8 (size=86) +Route9Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 41886e9f..b5fa0107 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenterObject: ; 0x45bc5 (size=89) +SafariZoneCenterObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 4cb1e0ae..6c2f8138 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -1,4 +1,4 @@ -SafariZoneEastObject: ; 0x4588b (size=81) +SafariZoneEastObject: db $0 ; border block db $5 ; warps diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 543cf7dc..9d26aa17 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -1,4 +1,4 @@ -SafariZoneEntranceObject: ; 0x753f5 (size=48) +SafariZoneEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index e3c4cddb..d0305507 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorthObject: ; 0x459d5 (size=105) +SafariZoneNorthObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index d27a967f..79156825 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1Object: ; 0x45cfe (size=32) +SafariZoneRestHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index eb6c7a25..82f04f9d 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2Object: ; 0x45d43 (size=38) +SafariZoneRestHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 4d698782..ae973fa8 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3Object: ; 0x45d8e (size=38) +SafariZoneRestHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 1d928420..7502732c 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) +SafariZoneRestHouse4Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index 471ec40b..a96115b8 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouseObject: ; 0x4a365 (size=26) +SafariZoneSecretHouseObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 724476ae..64ed0876 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -1,4 +1,4 @@ -SafariZoneWestObject: ; 0x4a1dc (size=108) +SafariZoneWestObject: db $0 ; border block db $8 ; warps diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 5980659b..730d8be5 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509e2 (size=188) +SaffronCityObject: db $f ; border block db $8 ; warps diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 20d91991..629ab760 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGymObject: ; 0x5d259 (size=330) +SaffronGymObject: db $2e ; border block db $20 ; warps diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 0480cbd9..9f6d7750 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,4 +1,4 @@ -SaffronHouse1Object: ; 0x1de04 (size=44) +SaffronHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index ffcbd64d..e57bdbb7 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -1,4 +1,4 @@ -SaffronHouse2Object: ; 0x1de8a (size=26) +SaffronHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index be3803af..113a1ea9 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,4 +1,4 @@ -SaffronMartObject: ; 0x5d41c (size=38) +SaffronMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index bda46343..b82be083 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenterObject: ; 0x5d54f (size=44) +SaffronPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 4c802e64..3fe629da 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -1,4 +1,4 @@ -SchoolObject: ; 0x1d55d (size=32) +SchoolObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 3b3d4f7a..eaa9036e 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Object: ; 0x4484f (size=72) +SeafoamIslands1Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 29cdfa59..d25e5375 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Object: ; 0x46376 (size=72) +SeafoamIslands2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 28a5e67b..a660f2ed 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Object: ; 0x464b2 (size=72) +SeafoamIslands3Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index e90b3865..c7043a93 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Object: ; 0x466a6 (size=96) +SeafoamIslands4Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index e5fbaecd..a05c00cc 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -1,4 +1,4 @@ -SeafoamIslands5Object: ; 0x468bc (size=62) +SeafoamIslands5Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index a953f376..fe779393 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1Object: ; 0x5d470 (size=50) +SilphCo1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index cc608e64..185a23c9 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10Object: ; 0x5a1fb (size=95) +SilphCo10Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index bae7eda5..a1bb5d81 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11Object: ; 0x62380 (size=72) +SilphCo11Object: db $d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 44271d70..ae3aca74 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2Object: ; 0x59e66 (size=98) +SilphCo2Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 48bb8c1a..ddea9062 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3Object: ; 0x5a035 (size=113) +SilphCo3Object: db $2e ; border block db $a ; warps diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index 762ca7f8..a2320112 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4Object: ; 0x19e35 (size=111) +SilphCo4Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 0c956cd3..62e30fac 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5Object: ; 0x1a08d (size=137) +SilphCo5Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 66372f57..19d66e50 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6Object: ; 0x1a2fb (size=112) +SilphCo6Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index ef665ac0..47e881fe 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7Object: ; 0x51ed7 (size=128) +SilphCo7Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index a4b97a91..188b27b6 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8Object: ; 0x56613 (size=90) +SilphCo8Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 204f0d1d..76d82895 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9Object: ; 0x5d93f (size=74) +SilphCo9Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 0e0f03c6..2de795ae 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorObject: ; 0x45844 (size=23) +SilphCoElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index c631074c..7f6a826c 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,4 +1,4 @@ -SSAnne1Object: ; 0x61277 (size=104) +SSAnne1Object: db $c ; border block db $b ; warps diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index c57925f1..a8f49cf7 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10Object: ; 0x61e75 (size=165) +SSAnne10Object: db $c ; border block db $a ; warps diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 9f3691cf..eb761685 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -1,4 +1,4 @@ -SSAnne2Object: ; 0x61514 (size=90) +SSAnne2Object: db $c ; border block db $9 ; warps diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 1037d118..567f0363 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,4 +1,4 @@ -SSAnne3Object: ; 0x4493c (size=26) +SSAnne3Object: db $c ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index 9d752480..fbd1df5b 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,4 +1,4 @@ -SSAnne4Object: ; 0x61632 (size=52) +SSAnne4Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index e18f1074..6031327e 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5Object: ; 0x6172b (size=54) +SSAnne5Object: db $23 ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 159a3ed2..8c2444f8 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,4 +1,4 @@ -SSAnne6Object: ; 0x6181b (size=54) +SSAnne6Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6179a28e..6002e85b 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,4 +1,4 @@ -SSAnne7Object: ; 0x61946 (size=24) +SSAnne7Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index f089b35d..0d1ea2f3 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8Object: ; 0x61a60 (size=127) +SSAnne8Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 7fddc058..6b5e4b7d 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9Object: ; 0x61c8d (size=188) +SSAnne9Object: db $c ; border block db $c ; warps diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 57a3eee5..f482fc4f 100644 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenterObject: ; 0x4fd53 (size=10) +TradeCenterObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index a2f18179..14d7232e 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) +UndergroundPathEntranceRoute5Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 834263b5..7bce8774 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) +UndergroundPathEntranceRoute6Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 909ff4a0..51b4bcda 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) +UndergroundPathEntranceRoute7Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 707a0e0e..04a5bf2f 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) +UndergroundPathEntranceRoute7CopyObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 9a1d9d37..9e98c987 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) +UndergroundPathEntranceRoute8Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index d9ae7499..d0188a76 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -1,4 +1,4 @@ -UndergroundPathNSObject: ; 0x61f2a (size=20) +UndergroundPathNSObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 303f60b9..42bbb9bf 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -1,4 +1,4 @@ -UndergroundPathWEObject: ; 0x61f4e (size=20) +UndergroundPathWEObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 0635e9a7..5348dab8 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,4 +1,4 @@ -UnknownDungeon1Object: ; 0x74d15 (size=97) +UnknownDungeon1Object: db $7d ; border block db $9 ; warps diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 88cc6ba0..8e696462 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,4 +1,4 @@ -UnknownDungeon2Object: ; 0x45e14 (size=73) +UnknownDungeon2Object: db $7d ; border block db $6 ; warps diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index cb2d8f83..18439368 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3Object: ; 0x45f36 (size=34) +UnknownDungeon3Object: db $7d ; border block db $1 ; warps diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 3bfbc947..8342a2a6 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCityObject: ; 0x189ba (size=133) +VermilionCityObject: db $43 ; border block db $9 ; warps diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index b8aa659d..54d6790a 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDockObject: ; 0x1dcc6 (size=20) +VermilionDockObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 892403a3..9058ec4c 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGymObject: ; 0x5cbfe (size=58) +VermilionGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 952661cc..199489ba 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -1,4 +1,4 @@ -VermilionHouse1Object: ; 0x1db20 (size=38) +VermilionHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 03c3c1a2..0108233b 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -1,4 +1,4 @@ -VermilionHouse2Object: ; 0x560cf (size=26) +VermilionHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 161ad090..3d269364 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -1,4 +1,4 @@ -VermilionHouse3Object: ; 0x19c25 (size=26) +VermilionHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 56c52944..01df824e 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -1,4 +1,4 @@ -VermilionMartObject: ; 0x5c9f4 (size=38) +VermilionMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index cd11d653..1440531f 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenterObject: ; 0x5c9a9 (size=44) +VermilionPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 9e66e95b..05680b9f 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1Object: ; 0x5dab8 (size=76) +VictoryRoad1Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 348cae03..1bada62a 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2Object: ; 0x51915 (size=154) +VictoryRoad2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 19a06c65..20e43583 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3Object: ; 0x44acd (size=106) +VictoryRoad3Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 79b177f4..465d53bc 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -1,4 +1,4 @@ -ViridianCityObject: ; 0x18384 (size=104) +ViridianCityObject: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 8f5d6b0b..0bb67f82 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForestObject: ; 0x611da (size=127) +ViridianForestObject: db $3 ; border block db $6 ; warps diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 891c0636..8fe934ae 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,4 +1,4 @@ -ViridianForestEntranceObject: ; 0x5d66d (size=48) +ViridianForestEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index be8b65ea..0f48fd1c 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,4 +1,4 @@ -ViridianForestExitObject: ; 0x5d598 (size=48) +ViridianForestExitObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 468b9022..8efa5e22 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGymObject: ; 0x74bde (size=105) +ViridianGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index ba45adac..c06bb9c8 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -1,4 +1,4 @@ -ViridianHouseObject: ; 0x1d5bb (size=44) +ViridianHouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index ed2642f9..4b90bee3 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMartObject: ; 0x1d50a (size=38) +ViridianMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 74c27d46..39432c17 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenterObject: ; 0x44277 (size=44) +ViridianPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index eef36242..f26b305d 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks:: ; fc3e4 (3f:43e4) +MapHeaderBanks:: db BANK(PalletTown_h) ;PALLET_TOWN db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 730038f3..325ff4bb 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,5 +1,5 @@ ; see also MapHeaderBanks -MapHeaderPointers:: ; fc1f2 (3f:41f2) +MapHeaderPointers:: dw PalletTown_h dw ViridianCity_h dw PewterCity_h diff --git a/data/map_songs.asm b/data/map_songs.asm index b65822e7..973f6945 100644 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,4 +1,4 @@ -MapSongBanks: ; fc000 (3f:4000) +MapSongBanks: db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY @@ -247,4 +247,4 @@ MapSongBanks: ; fc000 (3f:4000) db MUSIC_GYM, BANK(Music_Gym) ; Lorelei db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha - db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
\ No newline at end of file + db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index b271aa5a..065db93e 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -1,4 +1,4 @@ -MonsterPalettes: ; 72921 (1c:6921) +MonsterPalettes: db PAL_MEWMON ; MISSINGNO db PAL_GREENMON ; BULBASAUR db PAL_GREENMON ; IVYSAUR @@ -151,4 +151,4 @@ MonsterPalettes: ; 72921 (1c:6921) db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW -; 1c:69b9
\ No newline at end of file +; 1c:69b9 diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 017c8d7c..81600f45 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -1,4 +1,4 @@ -MonPartyData: ; 719ba (1c:59ba) +MonPartyData: ; MON = 0 ; BALL_M = 1 ; HELIX = 2 @@ -85,4 +85,4 @@ MonPartyData: ; 719ba (1c:59ba) dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding
\ No newline at end of file + dn SPRITE_MON, 0 ;Mew/Padding diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm index a1d902c3..f72beaa4 100755 --- a/data/pikachu_emotions.asm +++ b/data/pikachu_emotions.asm @@ -1,266 +1,266 @@ -PikachuEmotion0_fd115: ; fd115 (3f:5115) +PikachuEmotion0: db $ff -PikachuEmotion2_fd116: ; fd116 (3f:5116) +PikachuEmotion2: pikaemotion_dummy2 pikaemotion_emotebubble SMILE_BUBBLE pikaemotion_pcm PikachuCry35 - pikaemotion_pikapic $2 + pikaemotion_pikapic PikaPicAnimScript2 db $ff -PikachuEmotion10_fd11e: ; fd11e (3f:511e) +PikachuEmotion10: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES pikaemotion_emotebubble HEART_BUBBLE pikaemotion_pcm PikachuCry5 - pikaemotion_pikapic $a + pikaemotion_pikapic PikaPicAnimScript10 db $ff -PikachuEmotion7_fd128: ; fd128 (3f:5128) +PikachuEmotion7: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES - pikaemotion_movement Pointer_fd224 + pikaemotion_movement PikachuMovementData_fd224 pikaemotion_pcm PikachuCry1 - pikaemotion_movement Pointer_fd224 - pikaemotion_pikapic $7 + pikaemotion_movement PikachuMovementData_fd224 + pikaemotion_pikapic PikaPicAnimScript7 db $ff -PikachuEmotion4_fd136: ; fd136 (3f:5136) +PikachuEmotion4: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES - pikaemotion_movement Pointer_fd230 + pikaemotion_movement PikachuMovementData_fd230 pikaemotion_pcm PikachuCry29 - pikaemotion_pikapic $4 + pikaemotion_pikapic PikaPicAnimScript4 db $ff -PikachuEmotion1_fd141: ; fd141 (3f:5141) +PikachuEmotion1: pikaemotion_dummy2 pikaemotion_pcm - pikaemotion_pikapic $1 + pikaemotion_pikapic PikaPicAnimScript1 db $ff -PikachuEmotion8_fd147: ; fd147 (3f:5147) +PikachuEmotion8: pikaemotion_dummy2 pikaemotion_pcm PikachuCry39 - pikaemotion_pikapic $8 + pikaemotion_pikapic PikaPicAnimScript8 db $ff -PikachuEmotion5_fd14d: ; fd14d (3f:514d) +PikachuEmotion5: pikaemotion_dummy2 pikaemotion_pcm PikachuCry31 - pikaemotion_pikapic $5 + pikaemotion_pikapic PikaPicAnimScript5 db $ff -PikachuEmotion6_fd153: ; fd153 (3f:5153) +PikachuEmotion6: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES pikaemotion_pcm - pikaemotion_movement Pointer_fd21e + pikaemotion_movement PikachuMovementData_fd21e pikaemotion_emotebubble SKULL_BUBBLE - pikaemotion_pikapic $6 + pikaemotion_pikapic PikaPicAnimScript6 db $ff -PikachuEmotion3_fd160: ; fd160 (3f:5160) +PikachuEmotion3: pikaemotion_dummy2 pikaemotion_pcm PikachuCry40 - pikaemotion_pikapic $3 + pikaemotion_pikapic PikaPicAnimScript3 db $ff -PikachuEmotion9_fd166: ; fd166 (3f:5166) +PikachuEmotion9: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES pikaemotion_pcm PikachuCry6 - pikaemotion_movement Pointer_fd218 + pikaemotion_movement PikachuMovementData_fd218 pikaemotion_emotebubble SKULL_BUBBLE - pikaemotion_pikapic $9 + pikaemotion_pikapic PikaPicAnimScript9 db $ff -PikachuEmotion11_fd173: ; fd173 (3f:5173) +PikachuEmotion11: pikaemotion_emotebubble ZZZ_BUBBLE pikaemotion_pcm PikachuCry37 - pikaemotion_pikapic $b + pikaemotion_pikapic PikaPicAnimScript11 db $ff -PikachuEmotion12_fd17a: ; fd17a (3f:517a) +PikachuEmotion12: pikaemotion_dummy2 pikaemotion_pcm - pikaemotion_pikapic $c + pikaemotion_pikapic PikaPicAnimScript12 db $ff -PikachuEmotion13_fd180: ; fd180 (3f:5180) +PikachuEmotion13: pikaemotion_dummy2 pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES - pikaemotion_movement Pointer_fd21e - pikaemotion_pikapic $d + pikaemotion_movement PikachuMovementData_fd21e + pikaemotion_pikapic PikaPicAnimScript13 db $ff -PikachuEmotion14_fd189: ; fd189 (3f:5189) +PikachuEmotion14: pikaemotion_dummy2 pikaemotion_emotebubble BOLT_BUBBLE pikaemotion_pcm PikachuCry10 - pikaemotion_pikapic $e + pikaemotion_pikapic PikaPicAnimScript14 db $ff -PikachuEmotion15_fd191: ; fd191 (3f:5191) +PikachuEmotion15: pikaemotion_dummy2 pikaemotion_pcm PikachuCry34 - pikaemotion_pikapic $f + pikaemotion_pikapic PikaPicAnimScript15 db $ff -PikachuEmotion16_fd197: ; fd197 (3f:5197) +PikachuEmotion16: pikaemotion_dummy2 pikaemotion_pcm PikachuCry33 - pikaemotion_pikapic $10 + pikaemotion_pikapic PikaPicAnimScript16 db $ff -PikachuEmotion17_fd19d: ; fd19d (3f:519d) +PikachuEmotion17: pikaemotion_dummy2 pikaemotion_pcm PikachuCry13 - pikaemotion_pikapic $11 + pikaemotion_pikapic PikaPicAnimScript17 db $ff -PikachuEmotion18_fd1a3: ; fd1a3 (3f:51a3) +PikachuEmotion18: pikaemotion_dummy2 pikaemotion_pcm - pikaemotion_pikapic $12 + pikaemotion_pikapic PikaPicAnimScript18 db $ff -PikachuEmotion19_fd1a9: ; fd1a9 (3f:51a9) +PikachuEmotion19: pikaemotion_dummy2 pikaemotion_emotebubble HEART_BUBBLE pikaemotion_pcm PikachuCry33 - pikaemotion_pikapic $13 + pikaemotion_pikapic PikaPicAnimScript19 db $ff -PikachuEmotion20_fd1b1: ; fd1b1 (3f:51b1) +PikachuEmotion20: pikaemotion_dummy2 pikaemotion_emotebubble HEART_BUBBLE pikaemotion_pcm PikachuCry5 - pikaemotion_pikapic $14 + pikaemotion_pikapic PikaPicAnimScript20 db $ff -PikachuEmotion21_fd1b9: ; fd1b9 (3f:51b9) +PikachuEmotion21: pikaemotion_dummy2 pikaemotion_emotebubble FISH_BUBBLE pikaemotion_pcm - pikaemotion_pikapic $15 + pikaemotion_pikapic PikaPicAnimScript21 db $ff -PikachuEmotion22_fd1c1: ; fd1c1 (3f:51c1) +PikachuEmotion22: pikaemotion_dummy2 pikaemotion_pcm PikachuCry4 - pikaemotion_pikapic $16 + pikaemotion_pikapic PikaPicAnimScript22 db $ff -PikachuEmotion23_fd1c7: ; fd1c7 (3f:51c7) +PikachuEmotion23: pikaemotion_dummy2 pikaemotion_pcm PikachuCry19 - pikaemotion_pikapic $17 + pikaemotion_pikapic PikaPicAnimScript23 pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW db $ff -PikachuEmotion24_fd1cf: ; fd1cf (3f:51cf) +PikachuEmotion24: pikaemotion_dummy2 pikaemotion_emotebubble EXCLAMATION_BUBBLE pikaemotion_pcm - pikaemotion_pikapic $18 + pikaemotion_pikapic PikaPicAnimScript24 db $ff -PikachuEmotion25_fd1d7: ; fd1d7 (3f:51d7) +PikachuEmotion25: pikaemotion_dummy2 pikaemotion_emotebubble BOLT_BUBBLE pikaemotion_pcm PikachuCry35 - pikaemotion_pikapic $19 + pikaemotion_pikapic PikaPicAnimScript25 db $ff -PikachuEmotion26_fd1df: ; fd1df (3f:51df) +PikachuEmotion26: pikaemotion_dummy2 pikaemotion_emotebubble ZZZ_BUBBLE pikaemotion_pcm PikachuCry37 - pikaemotion_pikapic $1a + pikaemotion_pikapic PikaPicAnimScript26 pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER db $ff -PikachuEmotion27_fd1eb: ; fd1eb (3f:51eb) +PikachuEmotion27: pikaemotion_dummy2 pikaemotion_pcm PikachuCry9 - pikaemotion_pikapic $1b + pikaemotion_pikapic PikaPicAnimScript27 db $ff -PikachuEmotion28_fd1f1: ; fd1f1 (3f:51f1) +PikachuEmotion28: pikaemotion_dummy2 pikaemotion_pcm PikachuCry15 - pikaemotion_pikapic $1c + pikaemotion_pikapic PikaPicAnimScript28 db $ff -PikachuEmotion29_fd1f7: ; fd1f7 (3f:51f7) +PikachuEmotion29: pikaemotion_pcm PikachuCry5 - pikaemotion_pikapic $a + pikaemotion_pikapic PikaPicAnimScript10 db $ff -PikachuEmotion30_fd1fc: ; fd1fc (3f:51fc) +PikachuEmotion30: pikaemotion_9 pikaemotion_emotebubble HEART_BUBBLE pikaemotion_pcm PikachuCry5 - pikaemotion_pikapic $14 + pikaemotion_pikapic PikaPicAnimScript20 pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADFONT pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER db $ff -PikachuEmotion31_fd20a: ; fd20a (3f:520a) +PikachuEmotion31: pikaemotion_pcm PikachuCry19 - pikaemotion_pikapic $17 + pikaemotion_pikapic PikaPicAnimScript23 pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE db $ff -PikachuEmotion32_fd213: ; fd213 (3f:5213) +PikachuEmotion32: pikaemotion_pcm PikachuCry26 - pikaemotion_pikapic $17 + pikaemotion_pikapic PikaPicAnimScript23 db $ff -Pointer_fd218: ; fd218 (3f:5218) +PikachuMovementData_fd218: db $00 - db $39, $01 - db $3e, $1e + db $39, 2 - 1 + db $3e, 31 - 1 db $3f -Pointer_fd21e: ; fd21e (3f:521e) +PikachuMovementData_fd21e: db $00 - db $39, $00 - db $3e, $1e + db $39, 1 - 1 + db $3e, 31 - 1 db $3f -Pointer_fd224: ; fd224 (3f:5224) +PikachuMovementData_fd224: db $00 - db $3c, $07, $2f - db $3c, $07, $2f + db $3c, 8 - 1, (2 << 4) | (16 - 1) + db $3c, 8 - 1, (2 << 4) | (16 - 1) db $3f -Pointer_fd22c: ; fd22c (3f:522c) - db $3b, $1f, $03 +PikachuMovementData_fd22c: + db $3b, 32 - 1, 4 - 1 db $3f -Pointer_fd230: ; fd230 (3f:5230) +PikachuMovementData_fd230: db $00 - db $3c, $0f, $1f - db $3c, $0f, $1f + db $3c, 16 - 1, (1 << 4) | (16 - 1) + db $3c, 16 - 1, (1 << 4) | (16 - 1) db $3f -Pointer_fd238: ; fd238 (3f:5238) +PikachuMovementData_fd238: db $00 - db $05, $07 - db $39, $00 - db $05, $07 - db $06, $07 - db $39, $00 - db $06, $07 - db $08, $07 - db $39, $00 - db $08, $07 - db $07, $07 - db $39, $00 - db $07, $07 + db $05, 8 - 1 + db $39, 1 - 1 + db $05, 8 - 1 + db $06, 8 - 1 + db $39, 1 - 1 + db $06, 8 - 1 + db $08, 8 - 1 + db $39, 1 - 1 + db $08, 8 - 1 + db $07, 8 - 1 + db $39, 1 - 1 + db $07, 8 - 1 db $3f diff --git a/data/pikachu_pic_animation.asm b/data/pikachu_pic_animation.asm index f1f6bd68..d10f65dd 100755 --- a/data/pikachu_pic_animation.asm +++ b/data/pikachu_pic_animation.asm @@ -1,4 +1,4 @@ -Data_fe242: +PikaPicAnimThunderboltPals: db 4, %11000000 db 4, %11100100 db 4, %11000000 @@ -21,268 +21,270 @@ Data_fe242: db 4, %11100100 db $ff -Data_fe26b: ; fe26b (3f:626b) +Data_fe26b: pikapic_loadgfx Pic_e4000 pikapic_loadgfx Pic_e49d1 pikapic_loadgfx PikachuSprite - pikapic_object $1, $80, $0, $0 - pikapic_object $2, $b2, $5, $5 - pikapic_object $3, $b6, $5, $5 + pikapic_animation PikaPicAnimBGFrames_1, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_2, $b2, $5, $5 + pikapic_animation PikaPicAnimBGFrames_3, $b6, $5, $5 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe28a: ; fe28a (3f:628a) +PikaPicAnimScript0: +PikaPicAnimScript1: +PikaPicAnimScript29: pikapic_setduration 40 pikapic_loadgfx Pic_e4000 pikapic_loadgfx GFX_e40cc - pikapic_object $4, $80, $0, $0 - pikapic_object $6, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_6, $99, $0, $0 pikapic_waitbgmap pikapic_cry PikachuCry3 pikapic_looptofinish -Data_fe2a4: ; fe2a4 (3f:62a4) +PikaPicAnimScript2: pikapic_setduration 44 pikapic_loadgfx Pic_e411c pikapic_loadgfx GFX_e41d2 - pikapic_object $4, $80, $0, $0 - pikapic_object $7, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_7, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe2be: ; fe2be (3f:62be) +PikaPicAnimScript3: pikapic_setduration 80 pikapic_loadgfx Pic_e4272 pikapic_loadgfx GFX_e4323 - pikapic_object $4, $80, $0, $0 - pikapic_object $8, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_8, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe2d8: ; fe2d8 (3f:62d8) +PikaPicAnimScript4: pikapic_setduration 70 pikapic_loadgfx Pic_e4383 pikapic_loadgfx GFX_e444b - pikapic_object $4, $80, $0, $0 - pikapic_object $9, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_9, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe2f2: ; fe2f2 (3f:62f2) +PikaPicAnimScript5: pikapic_setduration 32 pikapic_loadgfx Pic_e458b pikapic_loadgfx GFX_e463b - pikapic_object $4, $80, $0, $0 - pikapic_object $a, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_10, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe30c: ; fe30c (3f:630c) +PikaPicAnimScript6: pikapic_setduration 50 pikapic_loadgfx Pic_e467b pikapic_loadgfx GFX_e472e - pikapic_object $4, $80, $0, $0 - pikapic_object $b, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_11, $99, $0, $0 pikapic_waitbgmap pikapic_cry PikachuCry38 pikapic_looptofinish -Data_fe326: ; fe326 (3f:6326) +PikaPicAnimScript7: pikapic_setduration 58 pikapic_loadgfx Pic_e476e pikapic_loadgfx GFX_e4841 - pikapic_object $4, $80, $0, $0 - pikapic_object $c, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_12, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe340: ; fe340 (3f:6340) +PikaPicAnimScript8: pikapic_setduration 44 pikapic_loadgfx Pic_e49d1 pikapic_loadgfx GFX_e4a99 - pikapic_object $4, $80, $0, $0 - pikapic_object $d, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_13, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe35a: ; fe35a (3f:635a) +PikaPicAnimScript9: pikapic_setduration 56 pikapic_loadgfx Pic_e4b39 pikapic_loadgfx GFX_e4bde - pikapic_object $4, $80, $0, $0 - pikapic_object $e, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_14, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe374: ; fe374 (3f:6374) +PikaPicAnimScript10: pikapic_setduration 56 pikapic_loadgfx Pic_e4c3e pikapic_loadgfx GFX_e4ce0 pikapic_loadgfx GFX_e4e70 - pikapic_object $4, $80, $0, $0 - pikapic_object $10, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_16, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe390: ; fe390 (3f:6390) +PikaPicAnimScript11: pikapic_setduration 100 pikapic_loadgfx Pic_e5000 pikapic_loadgfx GFX_e50af - pikapic_object $4, $80, $0, $0 - pikapic_object $11, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_17, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe3aa: ; fe3aa (3f:63aa) +PikaPicAnimScript12: pikapic_setduration 50 pikapic_loadgfx Pic_e523f pikapic_loadgfx GFX_e52fe - pikapic_object $4, $80, $0, $0 - pikapic_object $12, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_18, $99, $0, $0 pikapic_waitbgmap pikapic_cry PikachuCry25 pikapic_looptofinish -Data_fe3c4: ; fe3c4 (3f:63c4) +PikaPicAnimScript13: pikapic_setduration 50 pikapic_loadgfx Pic_e548e pikapic_loadgfx GFX_e5541 - pikapic_object $4, $80, $0, $0 - pikapic_object $13, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_19, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe3de: ; fe3de (3f:63de) +PikaPicAnimScript14: pikapic_setduration 40 pikapic_loadgfx Pic_e56d1 pikapic_loadgfx GFX_e5794 - pikapic_object $4, $80, $0, $0 - pikapic_object $14, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_20, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe3f8: ; fe3f8 (3f:63f8) +PikaPicAnimScript15: pikapic_setduration 50 pikapic_loadgfx Pic_e5924 pikapic_loadgfx GFX_e59ed - pikapic_object $4, $80, $0, $0 - pikapic_object $15, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_21, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe412: ; fe412 (3f:6412) +PikaPicAnimScript16: pikapic_setduration 32 pikapic_loadgfx Pic_e5b7d pikapic_loadgfx GFX_e5c4d - pikapic_object $4, $80, $0, $0 - pikapic_object $16, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_22, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe42c: ; fe42c (3f:642c) +PikaPicAnimScript17: pikapic_setduration 100 pikapic_loadgfx Pic_e5ddd pikapic_loadgfx GFX_e5e90 - pikapic_object $4, $80, $0, $0 - pikapic_object $17, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_23, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe446: ; fe446 (3f:6446) +PikaPicAnimScript18: pikapic_setduration 32 pikapic_loadgfx GFX_e6020 pikapic_loadgfx GFX_e61b0 - pikapic_object $5, $80, $0, $0 - pikapic_object $18, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_24, $99, $0, $0 pikapic_waitbgmap pikapic_cry PikachuCry18 pikapic_looptofinish -Data_fe460: ; fe460 (3f:6460) +PikaPicAnimScript19: pikapic_setduration 44 pikapic_loadgfx Pic_e6340 pikapic_loadgfx GFX_e63f7 - pikapic_object $4, $80, $0, $0 - pikapic_object $19, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_25, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe47a: ; fe47a (3f:647a) +PikaPicAnimScript20: pikapic_setduration 50 pikapic_loadgfx Pic_e6587 pikapic_loadgfx GFX_e6646 - pikapic_object $4, $80, $0, $0 - pikapic_object $1a, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_26, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe494: ; fe494 (3f:6494) +PikaPicAnimScript21: pikapic_setduration 40 pikapic_loadgfx Pic_e67d6 pikapic_loadgfx GFX_e682f pikapic_loadgfx GFX_e69bf pikapic_loadgfx GFX_e6b4f pikapic_loadgfx GFX_e6cdf - pikapic_object $4, $80, $0, $0 - pikapic_object $1b, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_27, $99, $0, $0 pikapic_waitbgmap pikapic_cry PikachuCry20 pikapic_looptofinish -Data_fe4b4: ; fe4b4 (3f:64b4) +PikaPicAnimScript22: pikapic_setduration 40 pikapic_loadgfx GFX_e6e6f pikapic_loadgfx GFX_e6fff - pikapic_object $5, $80, $0, $0 - pikapic_object $1c, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_28, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe4ce: ; fe4ce (3f:64ce) +PikaPicAnimScript23: pikapic_setduration 70 pikapic_loadgfx GFX_e718f pikapic_loadgfx GFX_e731f - pikapic_object $5, $80, $0, $0 - pikapic_object $1d, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_29, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe4e8: ; fe4e8 (3f:64e8) +PikaPicAnimScript24: pikapic_setduration 60 pikapic_loadgfx GFX_e74af pikapic_loadgfx GFX_e763f - pikapic_object $5, $80, $0, $0 - pikapic_object $1e, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_30, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe502: ; fe502 (3f:6502) +PikaPicAnimScript25: pikapic_setduration 50 pikapic_loadgfx Pic_e77cf pikapic_loadgfx GFX_e7863 pikapic_loadgfx GFX_e79f3 - pikapic_object $4, $80, $0, $0 - pikapic_object $1f, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_31, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_writebyte 13 @@ -290,37 +292,36 @@ Data_fe502: ; fe502 (3f:6502) pikapic_thunderbolt pikapic_ret -Data_fe51f: ; fe51f (3f:651f) +Data_fe51f: pikapic_waitbgmap - -Data_fe520: ; fe520 (3f:6520) +PikaPicAnimScript26: pikapic_setduration 100 pikapic_loadgfx Pic_e5000 pikapic_loadgfx GFX_e50af pikapic_loadgfx GFX_e7b83 pikapic_loadgfx GFX_e7d13 - pikapic_object $4, $80, $0, $0 - pikapic_object $20, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_32, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe53e: ; fe53e (3f:653e) +PikaPicAnimScript27: pikapic_setduration 30 pikapic_loadgfx Pic_f0abf pikapic_loadgfx GFX_f0b64 - pikapic_object $4, $80, $0, $0 - pikapic_object $21, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_33, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish -Data_fe558: ; fe558 (3f:6558) +PikaPicAnimScript28: pikapic_setduration 64 pikapic_loadgfx Pic_f0cf4 pikapic_loadgfx GFX_f0d82 - pikapic_object $4, $80, $0, $0 - pikapic_object $22, $99, $0, $0 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_34, $99, $0, $0 pikapic_waitbgmap pikapic_cry pikapic_looptofinish @@ -328,10 +329,11 @@ Data_fe558: ; fe558 (3f:6558) PikaPicAnimGFXHeaders: pikapicanimgfx: MACRO \2_id:: - db \1 ; size + db \1 ; size (-1 if compressed) dba \2 ; pointer endm +PikaPicAnimGFX_Null_id:: dbbw 1, $39,$0000 ; 00 pikapicanimgfx -1, Pic_e4000 ; 01 pikapicanimgfx 5, GFX_e40cc ; 02 diff --git a/data/pikachu_pic_objects.asm b/data/pikachu_pic_objects.asm new file mode 100755 index 00000000..940c1141 --- /dev/null +++ b/data/pikachu_pic_objects.asm @@ -0,0 +1,300 @@ +PikaPicAnimBGFramesPointers: +pikaanim_def: macro +\1_id: dw \1 + endm + + pikaanim_def PikaPicAnimBGFrames_0 ; 00 + pikaanim_def PikaPicAnimBGFrames_1 ; 01 + pikaanim_def PikaPicAnimBGFrames_2 ; 02 + pikaanim_def PikaPicAnimBGFrames_3 ; 03 + pikaanim_def PikaPicAnimBGFrames_4 ; 04 + pikaanim_def PikaPicAnimBGFrames_5 ; 05 + pikaanim_def PikaPicAnimBGFrames_6 ; 06 + pikaanim_def PikaPicAnimBGFrames_7 ; 07 + pikaanim_def PikaPicAnimBGFrames_8 ; 08 + pikaanim_def PikaPicAnimBGFrames_9 ; 09 + pikaanim_def PikaPicAnimBGFrames_10 ; 0a + pikaanim_def PikaPicAnimBGFrames_11 ; 0b + pikaanim_def PikaPicAnimBGFrames_12 ; 0c + pikaanim_def PikaPicAnimBGFrames_13 ; 0d + pikaanim_def PikaPicAnimBGFrames_14 ; 0e + pikaanim_def PikaPicAnimBGFrames_15 ; 0f + pikaanim_def PikaPicAnimBGFrames_16 ; 10 + pikaanim_def PikaPicAnimBGFrames_17 ; 11 + pikaanim_def PikaPicAnimBGFrames_18 ; 12 + pikaanim_def PikaPicAnimBGFrames_19 ; 13 + pikaanim_def PikaPicAnimBGFrames_20 ; 14 + pikaanim_def PikaPicAnimBGFrames_21 ; 15 + pikaanim_def PikaPicAnimBGFrames_22 ; 16 + pikaanim_def PikaPicAnimBGFrames_23 ; 17 + pikaanim_def PikaPicAnimBGFrames_24 ; 18 + pikaanim_def PikaPicAnimBGFrames_25 ; 19 + pikaanim_def PikaPicAnimBGFrames_26 ; 1a + pikaanim_def PikaPicAnimBGFrames_27 ; 1b + pikaanim_def PikaPicAnimBGFrames_28 ; 1c + pikaanim_def PikaPicAnimBGFrames_29 ; 1d + pikaanim_def PikaPicAnimBGFrames_30 ; 1e + pikaanim_def PikaPicAnimBGFrames_31 ; 1f + pikaanim_def PikaPicAnimBGFrames_32 ; 20 + pikaanim_def PikaPicAnimBGFrames_33 ; 21 + pikaanim_def PikaPicAnimBGFrames_34 ; 22 + pikaanim_def PikaPicAnimBGFrames_35 ; 23 + +PikaPicAnimBGFrames_0: +PikaPicAnimBGFrames_1: + ; Tilemap idx, duration + pikaframe PikaAnimTilemap_1, 20 + pikaframe PikaAnimTilemap_7, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_7, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_7, 8 + pikaframeend + +PikaPicAnimBGFrames_fdc1e: ; unreferenced + pikaframe PikaAnimTilemap_2, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_2, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_2, 8 + pikaframeend + +PikaPicAnimBGFrames_2: + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframeend + +PikaPicAnimBGFrames_3: + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframeend + +PikaPicAnimBGFrames_4: +PikaPicAnimBGFrames_35: + pikaframe PikaAnimTilemap_1, 0 + pikaframeend + +PikaPicAnimBGFrames_5: + pikaframe PikaAnimTilemap_9, 0 + pikaframeend + +PikaPicAnimBGFrames_6: + pikaframedelay 2 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 64 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_7: + pikaframedelay 4 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 4 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_15, 4 + pikaframeend + +PikaPicAnimBGFrames_8: + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 1 + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 64 + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_9: + pikaframedelay 8 + pikaframe PikaAnimTilemap_17, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_17, 8 + pikaframeend + +PikaPicAnimBGFrames_10: + pikaframedelay 2 + pikaframe PikaAnimTilemap_18, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_18, 64 + pikaframedelay 3 + pikaframe PikaAnimTilemap_18, 64 + pikaframeend + +PikaPicAnimBGFrames_11: + pikaframedelay 8 + pikaframe PikaAnimTilemap_19, 64 + pikaframedelay 4 + pikaframe PikaAnimTilemap_19, 64 + pikaframeend + +PikaPicAnimBGFrames_12: + pikaframe PikaAnimTilemap_20, 8 + pikaframedelay 2 + pikaframe PikaAnimTilemap_20, 8 + pikaframedelay 2 + pikaframe PikaAnimTilemap_20, 8 + pikaframeend + +PikaPicAnimBGFrames_13: + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 64 + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_14: + pikaframedelay 2 + pikaframe PikaAnimTilemap_22, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_22, 2 + pikaframedelay 20 + pikaframe PikaAnimTilemap_22, 2 + pikaframeend + +PikaPicAnimBGFrames_15: + pikaframedelay 8 + pikaframe PikaAnimTilemap_23, 8 + pikaframeend + +PikaPicAnimBGFrames_16: + pikaframedelay 8 + pikaframe PikaAnimTilemap_23, 3 + pikaframe PikaAnimTilemap_24, 5 + pikaframe PikaAnimTilemap_23, 3 + pikaframedelay 5 + pikaframeend + +PikaPicAnimBGFrames_17: + pikaframedelay 20 + pikaframe PikaAnimTilemap_25, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_25, 8 + pikaframeend + +PikaPicAnimBGFrames_18: + pikaframedelay 13 + pikaframe PikaAnimTilemap_26, 12 + pikaframedelay 100 + pikaframe PikaAnimTilemap_26, 8 + pikaframeend + +PikaPicAnimBGFrames_19: + pikaframedelay 5 + pikaframe PikaAnimTilemap_27, 5 + pikaframedelay 5 + pikaframe PikaAnimTilemap_27, 5 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_20: + pikaframedelay 2 + pikaframe PikaAnimTilemap_28, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_28, 2 + pikaframeend + +PikaPicAnimBGFrames_21: + pikaframedelay 5 + pikaframe PikaAnimTilemap_29, 5 + pikaframedelay 5 + pikaframe PikaAnimTilemap_29, 5 + pikaframeend + +PikaPicAnimBGFrames_22: + pikaframe PikaAnimTilemap_30, 8 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_23: + pikaframedelay 10 + pikaframe PikaAnimTilemap_31, 3 + pikaframedelay 3 + pikaframe PikaAnimTilemap_31, 3 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_24: + pikaframedelay 3 + pikaframe PikaAnimTilemap_32, 100 + pikaframedelay 8 + pikaframe PikaAnimTilemap_32, 8 + pikaframeend + +PikaPicAnimBGFrames_25: + pikaframe PikaAnimTilemap_33, 6 + pikaframedelay 6 + pikaframe PikaAnimTilemap_33, 6 + pikaframedelay 6 + pikaframeend + +PikaPicAnimBGFrames_26: + pikaframedelay 8 + pikaframe PikaAnimTilemap_34, 12 + pikaframedelay 8 + pikaframe PikaAnimTilemap_34, 12 + pikaframeend + +PikaPicAnimBGFrames_27: + pikaframedelay 8 + pikaframe PikaAnimTilemap_9, 2 + pikaframe PikaAnimTilemap_10, 1 + pikaframe PikaAnimTilemap_11, 1 + pikaframe PikaAnimTilemap_12, 100 + pikaframeend + +PikaPicAnimBGFrames_28: + pikaframedelay 8 + pikaframe PikaAnimTilemap_36, 100 + pikaframeend + +PikaPicAnimBGFrames_29: + pikaframedelay 16 + pikaframe PikaAnimTilemap_37, 16 + pikaframedelay 16 + pikaframe PikaAnimTilemap_37, 16 + pikaframeend + +PikaPicAnimBGFrames_30: + pikaframedelay 6 + pikaframe PikaAnimTilemap_38, 6 + pikaframedelay 6 + pikaframe PikaAnimTilemap_38, 6 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_31: + pikaframedelay 6 + pikaframe PikaAnimTilemap_9, 6 + pikaframe PikaAnimTilemap_10, 100 + pikaframeend + +PikaPicAnimBGFrames_32: + pikaframedelay 20 + pikaframe PikaAnimTilemap_9, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_9, 8 + pikaframe PikaAnimTilemap_10, 8 + pikaframe PikaAnimTilemap_11, 100 + pikaframeend + +PikaPicAnimBGFrames_33: + pikaframedelay 4 + pikaframe PikaAnimTilemap_9, 100 + pikaframeend + +PikaPicAnimBGFrames_34: + pikaframedelay 12 + pikaframe PikaAnimTilemap_9, 12 + pikaframedelay 12 + pikaframe PikaAnimTilemap_9, 100 + pikaframeend diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu_pic_tilemaps.asm new file mode 100755 index 00000000..95882711 --- /dev/null +++ b/data/pikachu_pic_tilemaps.asm @@ -0,0 +1,253 @@ +PikaPicTilemapPointers: +pikatilemap_def: macro +\1_id: dw \1 + endm + + pikatilemap_def PikaAnimTilemap_0 + pikatilemap_def PikaAnimTilemap_1 + pikatilemap_def PikaAnimTilemap_2 + pikatilemap_def PikaAnimTilemap_3 + pikatilemap_def PikaAnimTilemap_4 + pikatilemap_def PikaAnimTilemap_5 + pikatilemap_def PikaAnimTilemap_6 + pikatilemap_def PikaAnimTilemap_7 + pikatilemap_def PikaAnimTilemap_8 + pikatilemap_def PikaAnimTilemap_9 + pikatilemap_def PikaAnimTilemap_10 + pikatilemap_def PikaAnimTilemap_11 + pikatilemap_def PikaAnimTilemap_12 + pikatilemap_def PikaAnimTilemap_13 + pikatilemap_def PikaAnimTilemap_14 + pikatilemap_def PikaAnimTilemap_15 + pikatilemap_def PikaAnimTilemap_16 + pikatilemap_def PikaAnimTilemap_17 + pikatilemap_def PikaAnimTilemap_18 + pikatilemap_def PikaAnimTilemap_19 + pikatilemap_def PikaAnimTilemap_20 + pikatilemap_def PikaAnimTilemap_21 + pikatilemap_def PikaAnimTilemap_22 + pikatilemap_def PikaAnimTilemap_23 + pikatilemap_def PikaAnimTilemap_24 + pikatilemap_def PikaAnimTilemap_25 + pikatilemap_def PikaAnimTilemap_26 + pikatilemap_def PikaAnimTilemap_27 + pikatilemap_def PikaAnimTilemap_28 + pikatilemap_def PikaAnimTilemap_29 + pikatilemap_def PikaAnimTilemap_30 + pikatilemap_def PikaAnimTilemap_31 + pikatilemap_def PikaAnimTilemap_32 + pikatilemap_def PikaAnimTilemap_33 + pikatilemap_def PikaAnimTilemap_34 + pikatilemap_def PikaAnimTilemap_35 + pikatilemap_def PikaAnimTilemap_36 + pikatilemap_def PikaAnimTilemap_37 + pikatilemap_def PikaAnimTilemap_38 + pikatilemap_def PikaAnimTilemap_39 + pikatilemap_def PikaAnimTilemap_40 + pikatilemap_def PikaAnimTilemap_41 + pikatilemap_def PikaAnimTilemap_42 + +PikaAnimTilemap_0: + db $ff ; unused + + + ; $ff inhibits overwriting that tile +PikaAnimTilemap_1: +PikaAnimTilemap_42: + db 5, 5 + db $00, $05, $0a, $0f, $14 + db $01, $06, $0b, $10, $15 + db $02, $07, $0c, $11, $16 + db $03, $08, $0d, $12, $17 + db $04, $09, $0e, $13, $18 + +PikaAnimTilemap_2: + db 5, 5 + db $19, $1e, $23, $28, $2d + db $1a, $1f, $24, $29, $2e + db $1b, $20, $25, $2a, $2f + db $1c, $21, $26, $2b, $30 + db $1d, $22, $27, $2c, $31 + +PikaAnimTilemap_7: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $20, $25, $ff, $ff + db $ff, $21, $26, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_3: + db 1, 1 + db $00 + +PikaAnimTilemap_4: + db 2, 1 + db $00 + db $01 + +PikaAnimTilemap_5: + db 1, 2 + db $00, $01 + +PikaAnimTilemap_6: +PikaAnimTilemap_8: + db 2, 2 + db $00, $01 + db $02, $03 + +PikaAnimTilemap_fde71: ; unused + db 3, 2 + db $00, $01 + db $02, $03 + db $04, $05 + +PikaAnimTilemap_fde79: ; unused + db 2, 3 + db $00, $01, $02 + db $03, $04, $05 + +PikaAnimTilemap_14: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_15: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + +PikaAnimTilemap_16: + db 5, 5 + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $04, $05, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_17: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + +PikaAnimTilemap_18: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $00, $01 + db $ff, $ff, $ff, $02, $03 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_19: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_20: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_21: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_22: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $04, $05, $ff, $ff, $ff + +PikaAnimTilemap_23: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_24: + db 5, 5 + db $19, $1a, $1b, $1c, $1d + db $1e, $1f, $20, $21, $22 + db $23, $24, $25, $26, $27 + db $28, $29, $2a, $2b, $2c + db $2d, $2e, $2f, $30, $31 + +PikaAnimTilemap_9: +PikaAnimTilemap_25: +PikaAnimTilemap_26: +PikaAnimTilemap_27: +PikaAnimTilemap_28: +PikaAnimTilemap_29: +PikaAnimTilemap_30: +PikaAnimTilemap_31: +PikaAnimTilemap_32: +PikaAnimTilemap_33: +PikaAnimTilemap_34: +PikaAnimTilemap_35: +PikaAnimTilemap_36: +PikaAnimTilemap_37: +PikaAnimTilemap_38: +PikaAnimTilemap_39: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_10: +PikaAnimTilemap_40: + db 5, 5 + db $19, $1a, $1b, $1c, $1d + db $1e, $1f, $20, $21, $22 + db $23, $24, $25, $26, $27 + db $28, $29, $2a, $2b, $2c + db $2d, $2e, $2f, $30, $31 + +PikaAnimTilemap_11: +PikaAnimTilemap_41: + db 5, 5 + db $32, $33, $34, $35, $36 + db $37, $38, $39, $3a, $3b + db $3c, $3d, $3e, $3f, $40 + db $41, $42, $43, $44, $45 + db $46, $47, $48, $49, $4a + +PikaAnimTilemap_12: + db 5, 5 + db $4b, $4c, $4d, $4e, $4f + db $50, $51, $52, $53, $54 + db $55, $56, $57, $58, $59 + db $5a, $5b, $5c, $5d, $5e + db $5f, $60, $61, $62, $63 + +PikaAnimTilemap_13: + db 5, 5 + db $64, $65, $66, $67, $68 + db $69, $6a, $6b, $6c, $6d + db $6e, $6f, $70, $71, $72 + db $73, $74, $75, $76, $77 + db $78, $79, $7a, $7b, $7c diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 8b021287..1f35a0d5 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1,4 +1,4 @@ -PokedexEntryPointers: ; 4050b (10:450b) +PokedexEntryPointers: dw RhydonDexEntry dw KangaskhanDexEntry dw NidoranMDexEntry @@ -195,1064 +195,1064 @@ PokedexEntryPointers: ; 4050b (10:450b) ; weight in pounds ; text entry -BulbasaurDexEntry: ; 40687 (10:4687) +BulbasaurDexEntry: db "SEED@" db 2,4 dw 150 TX_FAR _BulbasaurDexEntry db "@" -IvysaurDexEntry: ; 40695 (10:4695) +IvysaurDexEntry: db "SEED@" db 3,3 dw 290 TX_FAR _IvysaurDexEntry db "@" -VenusaurDexEntry: ; 406a3 (10:46a3) +VenusaurDexEntry: db "SEED@" db 6,7 dw 2210 TX_FAR _VenusaurDexEntry db "@" -CharmanderDexEntry: ; 406b1 (10:46b1) +CharmanderDexEntry: db "LIZARD@" db 2, dw 190 TX_FAR _CharmanderDexEntry db "@" -CharmeleonDexEntry: ; 406c1 (10:46c1) +CharmeleonDexEntry: db "FLAME@" db 3,7 dw 420 TX_FAR _CharmeleonDexEntry db "@" -CharizardDexEntry: ; 406d0 (10:46d0) +CharizardDexEntry: db "FLAME@" db 5,7 dw 2000 TX_FAR _CharizardDexEntry db "@" -SquirtleDexEntry: ; 406df (10:46df) +SquirtleDexEntry: db "TINYTURTLE@" db 1,8 dw 200 TX_FAR _SquirtleDexEntry db "@" -WartortleDexEntry: ; 406f3 (10:46f3) +WartortleDexEntry: db "TURTLE@" db 3,3 dw 500 TX_FAR _WartortleDexEntry db "@" -BlastoiseDexEntry: ; 40703 (10:4703) +BlastoiseDexEntry: db "SHELLFISH@" db 5,3 dw 1890 TX_FAR _BlastoiseDexEntry db "@" -CaterpieDexEntry: ; 40716 (10:4716) +CaterpieDexEntry: db "WORM@" db 1, dw 60 TX_FAR _CaterpieDexEntry db "@" -MetapodDexEntry: ; 40724 (10:4724) +MetapodDexEntry: db "COCOON@" db 2,4 dw 220 TX_FAR _MetapodDexEntry db "@" -ButterfreeDexEntry: ; 40734 (10:4734) +ButterfreeDexEntry: db "BUTTERFLY@" db 3,7 dw 710 TX_FAR _ButterfreeDexEntry db "@" -WeedleDexEntry: ; 40747 (10:4747) +WeedleDexEntry: db "HAIRY BUG@" db 1, dw 70 TX_FAR _WeedleDexEntry db "@" -KakunaDexEntry: ; 4075a (10:475a) +KakunaDexEntry: db "COCOON@" db 2, dw 220 TX_FAR _KakunaDexEntry db "@" -BeedrillDexEntry: ; 4076a (10:476a) +BeedrillDexEntry: db "POISON BEE@" db 3,3 dw 650 TX_FAR _BeedrillDexEntry db "@" -PidgeyDexEntry: ; 4077e (10:477e) +PidgeyDexEntry: db "TINY BIRD@" db 1, dw 40 TX_FAR _PidgeyDexEntry db "@" -PidgeottoDexEntry: ; 40791 (10:4791) +PidgeottoDexEntry: db "BIRD@" db 3,7 dw 660 TX_FAR _PidgeottoDexEntry db "@" -PidgeotDexEntry: ; 4079f (10:479f) +PidgeotDexEntry: db "BIRD@" db 4,11 dw 870 TX_FAR _PidgeotDexEntry db "@" -RattataDexEntry: ; 407ad (10:47ad) +RattataDexEntry: db "RAT@" db 1, dw 80 TX_FAR _RattataDexEntry db "@" -RaticateDexEntry: ; 407ba (10:47ba) +RaticateDexEntry: db "RAT@" db 2,4 dw 410 TX_FAR _RaticateDexEntry db "@" -SpearowDexEntry: ; 407c7 (10:47c7) +SpearowDexEntry: db "TINY BIRD@" db 1, dw 40 TX_FAR _SpearowDexEntry db "@" -FearowDexEntry: ; 407da (10:47da) +FearowDexEntry: db "BEAK@" db 3,11 dw 840 TX_FAR _FearowDexEntry db "@" -EkansDexEntry: ; 407e8 (10:47e8) +EkansDexEntry: db "SNAKE@" db 6,7 dw 150 TX_FAR _EkansDexEntry db "@" -ArbokDexEntry: ; 407f7 (10:47f7) +ArbokDexEntry: db "COBRA@" db 11,6 dw 1430 TX_FAR _ArbokDexEntry db "@" -PikachuDexEntry: ; 40806 (10:4806) +PikachuDexEntry: db "MOUSE@" db 1,4 dw 130 TX_FAR _PikachuDexEntry db "@" -RaichuDexEntry: ; 40815 (10:4815) +RaichuDexEntry: db "MOUSE@" db 2,7 dw 660 TX_FAR _RaichuDexEntry db "@" -SandshrewDexEntry: ; 40824 (10:4824) +SandshrewDexEntry: db "MOUSE@" db 2, dw 260 TX_FAR _SandshrewDexEntry db "@" -SandslashDexEntry: ; 40833 (10:4833) +SandslashDexEntry: db "MOUSE@" db 3,3 dw 650 TX_FAR _SandslashDexEntry db "@" -NidoranFDexEntry: ; 40842 (10:4842) +NidoranFDexEntry: db "POISON PIN@" db 1,4 dw 150 TX_FAR _NidoranFDexEntry db "@" -NidorinaDexEntry: ; 40856 (10:4856) +NidorinaDexEntry: db "POISON PIN@" db 2,7 dw 440 TX_FAR _NidorinaDexEntry db "@" -NidoqueenDexEntry: ; 4086a (10:486a) +NidoqueenDexEntry: db "DRILL@" db 4,3 dw 1320 TX_FAR _NidoqueenDexEntry db "@" -NidoranMDexEntry: ; 40879 (10:4879) +NidoranMDexEntry: db "POISON PIN@" db 1,8 dw 200 TX_FAR _NidoranMDexEntry db "@" -NidorinoDexEntry: ; 4088d (10:488d) +NidorinoDexEntry: db "POISON PIN@" db 2,11 dw 430 TX_FAR _NidorinoDexEntry db "@" -NidokingDexEntry: ; 408a1 (10:48a1) +NidokingDexEntry: db "DRILL@" db 4,7 dw 1370 TX_FAR _NidokingDexEntry db "@" -ClefairyDexEntry: ; 408b0 (10:48b0) +ClefairyDexEntry: db "FAIRY@" db 2, dw 170 TX_FAR _ClefairyDexEntry db "@" -ClefableDexEntry: ; 408bf (10:48bf) +ClefableDexEntry: db "FAIRY@" db 4,3 dw 880 TX_FAR _ClefableDexEntry db "@" -VulpixDexEntry: ; 408ce (10:48ce) +VulpixDexEntry: db "FOX@" db 2, dw 220 TX_FAR _VulpixDexEntry db "@" -NinetalesDexEntry: ; 408db (10:48db) +NinetalesDexEntry: db "FOX@" db 3,7 dw 440 TX_FAR _NinetalesDexEntry db "@" -JigglypuffDexEntry: ; 408e8 (10:48e8) +JigglypuffDexEntry: db "BALLOON@" db 1,8 dw 120 TX_FAR _JigglypuffDexEntry db "@" -WigglytuffDexEntry: ; 408f9 (10:48f9) +WigglytuffDexEntry: db "BALLOON@" db 3,3 dw 260 TX_FAR _WigglytuffDexEntry db "@" -ZubatDexEntry: ; 4090a (10:490a) +ZubatDexEntry: db "BAT@" db 2,7 dw 170 TX_FAR _ZubatDexEntry db "@" -GolbatDexEntry: ; 40917 (10:4917) +GolbatDexEntry: db "BAT@" db 5,3 dw 1210 TX_FAR _GolbatDexEntry db "@" -OddishDexEntry: ; 40924 (10:4924) +OddishDexEntry: db "WEED@" db 1,8 dw 120 TX_FAR _OddishDexEntry db "@" -GloomDexEntry: ; 40932 (10:4932) +GloomDexEntry: db "WEED@" db 2,7 dw 190 TX_FAR _GloomDexEntry db "@" -VileplumeDexEntry: ; 40940 (10:4940) +VileplumeDexEntry: db "FLOWER@" db 3,11 dw 410 TX_FAR _VileplumeDexEntry db "@" -ParasDexEntry: ; 40950 (10:4950) +ParasDexEntry: db "MUSHROOM@" db 1, dw 120 TX_FAR _ParasDexEntry db "@" -ParasectDexEntry: ; 40962 (10:4962) +ParasectDexEntry: db "MUSHROOM@" db 3,3 dw 650 TX_FAR _ParasectDexEntry db "@" -VenonatDexEntry: ; 40974 (10:4974) +VenonatDexEntry: db "INSECT@" db 3,3 dw 660 TX_FAR _VenonatDexEntry db "@" -VenomothDexEntry: ; 40984 (10:4984) +VenomothDexEntry: db "POISONMOTH@" db 4,11 dw 280 TX_FAR _VenomothDexEntry db "@" -DiglettDexEntry: ; 40998 (10:4998) +DiglettDexEntry: db "MOLE@" db ,8 dw 20 TX_FAR _DiglettDexEntry db "@" -DugtrioDexEntry: ; 409a6 (10:49a6) +DugtrioDexEntry: db "MOLE@" db 2,4 dw 730 TX_FAR _DugtrioDexEntry db "@" -MeowthDexEntry: ; 409b4 (10:49b4) +MeowthDexEntry: db "SCRATCHCAT@" db 1,4 dw 90 TX_FAR _MeowthDexEntry db "@" -PersianDexEntry: ; 409c8 (10:49c8) +PersianDexEntry: db "CLASSY CAT@" db 3,3 dw 710 TX_FAR _PersianDexEntry db "@" -PsyduckDexEntry: ; 409dc (10:49dc) +PsyduckDexEntry: db "DUCK@" db 2,7 dw 430 TX_FAR _PsyduckDexEntry db "@" -GolduckDexEntry: ; 409ea (10:49ea) +GolduckDexEntry: db "DUCK@" db 5,7 dw 1690 TX_FAR _GolduckDexEntry db "@" -MankeyDexEntry: ; 409f8 (10:49f8) +MankeyDexEntry: db "PIG MONKEY@" db 1,8 dw 620 TX_FAR _MankeyDexEntry db "@" -PrimeapeDexEntry: ; 40a0c (10:4a0c) +PrimeapeDexEntry: db "PIG MONKEY@" db 3,3 dw 710 TX_FAR _PrimeapeDexEntry db "@" -GrowlitheDexEntry: ; 40a20 (10:4a20) +GrowlitheDexEntry: db "PUPPY@" db 2,4 dw 420 TX_FAR _GrowlitheDexEntry db "@" -ArcanineDexEntry: ; 40a2f (10:4a2f) +ArcanineDexEntry: db "LEGENDARY@" db 6,3 dw 3420 TX_FAR _ArcanineDexEntry db "@" -PoliwagDexEntry: ; 40a42 (10:4a42) +PoliwagDexEntry: db "TADPOLE@" db 2, dw 270 TX_FAR _PoliwagDexEntry db "@" -PoliwhirlDexEntry: ; 40a53 (10:4a53) +PoliwhirlDexEntry: db "TADPOLE@" db 3,3 dw 440 TX_FAR _PoliwhirlDexEntry db "@" -PoliwrathDexEntry: ; 40a64 (10:4a64) +PoliwrathDexEntry: db "TADPOLE@" db 4,3 dw 1190 TX_FAR _PoliwrathDexEntry db "@" -AbraDexEntry: ; 40a75 (10:4a75) +AbraDexEntry: db "PSI@" db 2,11 dw 430 TX_FAR _AbraDexEntry db "@" -KadabraDexEntry: ; 40a82 (10:4a82) +KadabraDexEntry: db "PSI@" db 4,3 dw 1250 TX_FAR _KadabraDexEntry db "@" -AlakazamDexEntry: ; 40a8f (10:4a8f) +AlakazamDexEntry: db "PSI@" db 4,11 dw 1060 TX_FAR _AlakazamDexEntry db "@" -MachopDexEntry: ; 40a9c (10:4a9c) +MachopDexEntry: db "SUPERPOWER@" db 2,7 dw 430 TX_FAR _MachopDexEntry db "@" -MachokeDexEntry: ; 40ab0 (10:4ab0) +MachokeDexEntry: db "SUPERPOWER@" db 4,11 dw 1550 TX_FAR _MachokeDexEntry db "@" -MachampDexEntry: ; 40ac4 (10:4ac4) +MachampDexEntry: db "SUPERPOWER@" db 5,3 dw 2870 TX_FAR _MachampDexEntry db "@" -BellsproutDexEntry: ; 40ad8 (10:4ad8) +BellsproutDexEntry: db "FLOWER@" db 2,4 dw 90 TX_FAR _BellsproutDexEntry db "@" -WeepinbellDexEntry: ; 40ae8 (10:4ae8) +WeepinbellDexEntry: db "FLYCATCHER@" db 3,3 dw 140 TX_FAR _WeepinbellDexEntry db "@" -VictreebelDexEntry: ; 40afc (10:4afc) +VictreebelDexEntry: db "FLYCATCHER@" db 5,7 dw 340 TX_FAR _VictreebelDexEntry db "@" -TentacoolDexEntry: ; 40b10 (10:4b10) +TentacoolDexEntry: db "JELLYFISH@" db 2,11 dw 1000 TX_FAR _TentacoolDexEntry db "@" -TentacruelDexEntry: ; 40b23 (10:4b23) +TentacruelDexEntry: db "JELLYFISH@" db 5,3 dw 1210 TX_FAR _TentacruelDexEntry db "@" -GeodudeDexEntry: ; 40b36 (10:4b36) +GeodudeDexEntry: db "ROCK@" db 1,4 dw 440 TX_FAR _GeodudeDexEntry db "@" -GravelerDexEntry: ; 40b44 (10:4b44) +GravelerDexEntry: db "ROCK@" db 3,3 dw 2320 TX_FAR _GravelerDexEntry db "@" -GolemDexEntry: ; 40b52 (10:4b52) +GolemDexEntry: db "MEGATON@" db 4,7 dw 6620 TX_FAR _GolemDexEntry db "@" -PonytaDexEntry: ; 40b63 (10:4b63) +PonytaDexEntry: db "FIRE HORSE@" db 3,3 dw 660 TX_FAR _PonytaDexEntry db "@" -RapidashDexEntry: ; 40b77 (10:4b77) +RapidashDexEntry: db "FIRE HORSE@" db 5,7 dw 2090 TX_FAR _RapidashDexEntry db "@" -SlowpokeDexEntry: ; 40b8b (10:4b8b) +SlowpokeDexEntry: db "DOPEY@" db 3,11 dw 790 TX_FAR _SlowpokeDexEntry db "@" -SlowbroDexEntry: ; 40b9a (10:4b9a) +SlowbroDexEntry: db "HERMITCRAB@" db 5,3 dw 1730 TX_FAR _SlowbroDexEntry db "@" -MagnemiteDexEntry: ; 40bae (10:4bae) +MagnemiteDexEntry: db "MAGNET@" db 1, dw 130 TX_FAR _MagnemiteDexEntry db "@" -MagnetonDexEntry: ; 40bbe (10:4bbe) +MagnetonDexEntry: db "MAGNET@" db 3,3 dw 1320 TX_FAR _MagnetonDexEntry db "@" -FarfetchdDexEntry: ; 40bce (10:4bce) +FarfetchdDexEntry: db "WILD DUCK@" db 2,7 dw 330 TX_FAR _FarfetchdDexEntry db "@" -DoduoDexEntry: ; 40be1 (10:4be1) +DoduoDexEntry: db "TWIN BIRD@" db 4,7 dw 860 TX_FAR _DoduoDexEntry db "@" -DodrioDexEntry: ; 40bf4 (10:4bf4) +DodrioDexEntry: db "TRIPLEBIRD@" db 5,11 dw 1880 TX_FAR _DodrioDexEntry db "@" -SeelDexEntry: ; 40c08 (10:4c08) +SeelDexEntry: db "SEA LION@" db 3,7 dw 1980 TX_FAR _SeelDexEntry db "@" -DewgongDexEntry: ; 40c1a (10:4c1a) +DewgongDexEntry: db "SEA LION@" db 5,7 dw 2650 TX_FAR _DewgongDexEntry db "@" -GrimerDexEntry: ; 40c2c (10:4c2c) +GrimerDexEntry: db "SLUDGE@" db 2,11 dw 660 TX_FAR _GrimerDexEntry db "@" -MukDexEntry: ; 40c3c (10:4c3c) +MukDexEntry: db "SLUDGE@" db 3,11 dw 660 TX_FAR _MukDexEntry db "@" -ShellderDexEntry: ; 40c4c (10:4c4c) +ShellderDexEntry: db "BIVALVE@" db 1, dw 90 TX_FAR _ShellderDexEntry db "@" -CloysterDexEntry: ; 40c5d (10:4c5d) +CloysterDexEntry: db "BIVALVE@" db 4,11 dw 2920 TX_FAR _CloysterDexEntry db "@" -GastlyDexEntry: ; 40c6e (10:4c6e) +GastlyDexEntry: db "GAS@" db 4,3 dw 2 TX_FAR _GastlyDexEntry db "@" -HaunterDexEntry: ; 40c7b (10:4c7b) +HaunterDexEntry: db "GAS@" db 5,3 dw 2 TX_FAR _HaunterDexEntry db "@" -GengarDexEntry: ; 40c88 (10:4c88) +GengarDexEntry: db "SHADOW@" db 4,11 dw 890 TX_FAR _GengarDexEntry db "@" -OnixDexEntry: ; 40c98 (10:4c98) +OnixDexEntry: db "ROCK SNAKE@" db 28,10 dw 4630 TX_FAR _OnixDexEntry db "@" -DrowzeeDexEntry: ; 40cac (10:4cac) +DrowzeeDexEntry: db "HYPNOSIS@" db 3,3 dw 710 TX_FAR _DrowzeeDexEntry db "@" -HypnoDexEntry: ; 40cbe (10:4cbe) +HypnoDexEntry: db "HYPNOSIS@" db 5,3 dw 1670 TX_FAR _HypnoDexEntry db "@" -KrabbyDexEntry: ; 40cd0 (10:4cd0) +KrabbyDexEntry: db "RIVER CRAB@" db 1,4 dw 140 TX_FAR _KrabbyDexEntry db "@" -KinglerDexEntry: ; 40ce4 (10:4ce4) +KinglerDexEntry: db "PINCER@" db 4,3 dw 1320 TX_FAR _KinglerDexEntry db "@" -VoltorbDexEntry: ; 40cf4 (10:4cf4) +VoltorbDexEntry: db "BALL@" db 1,8 dw 230 TX_FAR _VoltorbDexEntry db "@" -ElectrodeDexEntry: ; 40d02 (10:4d02) +ElectrodeDexEntry: db "BALL@" db 3,11 dw 1470 TX_FAR _ElectrodeDexEntry db "@" -ExeggcuteDexEntry: ; 40d10 (10:4d10) +ExeggcuteDexEntry: db "EGG@" db 1,4 dw 60 TX_FAR _ExeggcuteDexEntry db "@" -ExeggutorDexEntry: ; 40d1d (10:4d1d) +ExeggutorDexEntry: db "COCONUT@" db 6,7 dw 2650 TX_FAR _ExeggutorDexEntry db "@" -CuboneDexEntry: ; 40d2e (10:4d2e) +CuboneDexEntry: db "LONELY@" db 1,4 dw 140 TX_FAR _CuboneDexEntry db "@" -MarowakDexEntry: ; 40d3e (10:4d3e) +MarowakDexEntry: db "BONEKEEPER@" db 3,3 dw 990 TX_FAR _MarowakDexEntry db "@" -HitmonleeDexEntry: ; 40d52 (10:4d52) +HitmonleeDexEntry: db "KICKING@" db 4,11 dw 1100 TX_FAR _HitmonleeDexEntry db "@" -HitmonchanDexEntry: ; 40d63 (10:4d63) +HitmonchanDexEntry: db "PUNCHING@" db 4,7 dw 1110 TX_FAR _HitmonchanDexEntry db "@" -LickitungDexEntry: ; 40d75 (10:4d75) +LickitungDexEntry: db "LICKING@" db 3,11 dw 1440 TX_FAR _LickitungDexEntry db "@" -KoffingDexEntry: ; 40d86 (10:4d86) +KoffingDexEntry: db "POISON GAS@" db 2, dw 20 TX_FAR _KoffingDexEntry db "@" -WeezingDexEntry: ; 40d9a (10:4d9a) +WeezingDexEntry: db "POISON GAS@" db 3,11 dw 210 TX_FAR _WeezingDexEntry db "@" -RhyhornDexEntry: ; 40dae (10:4dae) +RhyhornDexEntry: db "SPIKES@" db 3,3 dw 2540 TX_FAR _RhyhornDexEntry db "@" -RhydonDexEntry: ; 40dbe (10:4dbe) +RhydonDexEntry: db "DRILL@" db 6,3 dw 2650 TX_FAR _RhydonDexEntry db "@" -ChanseyDexEntry: ; 40dcd (10:4dcd) +ChanseyDexEntry: db "EGG@" db 3,7 dw 760 TX_FAR _ChanseyDexEntry db "@" -TangelaDexEntry: ; 40dda (10:4dda) +TangelaDexEntry: db "VINE@" db 3,3 dw 770 TX_FAR _TangelaDexEntry db "@" -KangaskhanDexEntry: ; 40de8 (10:4de8) +KangaskhanDexEntry: db "PARENT@" db 7,3 dw 1760 TX_FAR _KangaskhanDexEntry db "@" -HorseaDexEntry: ; 40df8 (10:4df8) +HorseaDexEntry: db "DRAGON@" db 1,4 dw 180 TX_FAR _HorseaDexEntry db "@" -SeadraDexEntry: ; 40e08 (10:4e08) +SeadraDexEntry: db "DRAGON@" db 3,11 dw 550 TX_FAR _SeadraDexEntry db "@" -GoldeenDexEntry: ; 40e18 (10:4e18) +GoldeenDexEntry: db "GOLDFISH@" db 2, dw 330 TX_FAR _GoldeenDexEntry db "@" -SeakingDexEntry: ; 40e2a (10:4e2a) +SeakingDexEntry: db "GOLDFISH@" db 4,3 dw 860 TX_FAR _SeakingDexEntry db "@" -StaryuDexEntry: ; 40e3c (10:4e3c) +StaryuDexEntry: db "STARSHAPE@" db 2,7 dw 760 TX_FAR _StaryuDexEntry db "@" -StarmieDexEntry: ; 40e4f (10:4e4f) +StarmieDexEntry: db "MYSTERIOUS@" db 3,7 dw 1760 TX_FAR _StarmieDexEntry db "@" -MrMimeDexEntry: ; 40e63 (10:4e63) +MrMimeDexEntry: db "BARRIER@" db 4,3 dw 1200 TX_FAR _MrMimeDexEntry db "@" -ScytherDexEntry: ; 40e74 (10:4e74) +ScytherDexEntry: db "MANTIS@" db 4,11 dw 1230 TX_FAR _ScytherDexEntry db "@" -JynxDexEntry: ; 40e84 (10:4e84) +JynxDexEntry: db "HUMANSHAPE@" db 4,7 dw 900 TX_FAR _JynxDexEntry db "@" -ElectabuzzDexEntry: ; 40e98 (10:4e98) +ElectabuzzDexEntry: db "ELECTRIC@" db 3,7 dw 660 TX_FAR _ElectabuzzDexEntry db "@" -MagmarDexEntry: ; 40eaa (10:4eaa) +MagmarDexEntry: db "SPITFIRE@" db 4,3 dw 980 TX_FAR _MagmarDexEntry db "@" -PinsirDexEntry: ; 40ebc (10:4ebc) +PinsirDexEntry: db "STAGBEETLE@" db 4,11 dw 1210 TX_FAR _PinsirDexEntry db "@" -TaurosDexEntry: ; 40ed0 (10:4ed0) +TaurosDexEntry: db "WILD BULL@" db 4,7 dw 1950 TX_FAR _TaurosDexEntry db "@" -MagikarpDexEntry: ; 40ee3 (10:4ee3) +MagikarpDexEntry: db "FISH@" db 2,11 dw 220 TX_FAR _MagikarpDexEntry db "@" -GyaradosDexEntry: ; 40ef1 (10:4ef1) +GyaradosDexEntry: db "ATROCIOUS@" db 21,4 dw 5180 TX_FAR _GyaradosDexEntry db "@" -LaprasDexEntry: ; 40f04 (10:4f04) +LaprasDexEntry: db "TRANSPORT@" db 8,2 dw 4850 TX_FAR _LaprasDexEntry db "@" -DittoDexEntry: ; 40f17 (10:4f17) +DittoDexEntry: db "TRANSFORM@" db 1, dw 90 TX_FAR _DittoDexEntry db "@" -EeveeDexEntry: ; 40f2a (10:4f2a) +EeveeDexEntry: db "EVOLUTION@" db 1, dw 140 TX_FAR _EeveeDexEntry db "@" -VaporeonDexEntry: ; 40f3d (10:4f3d) +VaporeonDexEntry: db "BUBBLE JET@" db 3,3 dw 640 TX_FAR _VaporeonDexEntry db "@" -JolteonDexEntry: ; 40f51 (10:4f51) +JolteonDexEntry: db "LIGHTNING@" db 2,7 dw 540 TX_FAR _JolteonDexEntry db "@" -FlareonDexEntry: ; 40f64 (10:4f64) +FlareonDexEntry: db "FLAME@" db 2,11 dw 550 TX_FAR _FlareonDexEntry db "@" -PorygonDexEntry: ; 40f73 (10:4f73) +PorygonDexEntry: db "VIRTUAL@" db 2,7 dw 800 TX_FAR _PorygonDexEntry db "@" -OmanyteDexEntry: ; 40f84 (10:4f84) +OmanyteDexEntry: db "SPIRAL@" db 1,4 dw 170 TX_FAR _OmanyteDexEntry db "@" -OmastarDexEntry: ; 40f94 (10:4f94) +OmastarDexEntry: db "SPIRAL@" db 3,3 dw 770 TX_FAR _OmastarDexEntry db "@" -KabutoDexEntry: ; 40fa4 (10:4fa4) +KabutoDexEntry: db "SHELLFISH@" db 1,8 dw 250 TX_FAR _KabutoDexEntry db "@" -KabutopsDexEntry: ; 40fb7 (10:4fb7) +KabutopsDexEntry: db "SHELLFISH@" db 4,3 dw 890 TX_FAR _KabutopsDexEntry db "@" -AerodactylDexEntry: ; 40fca (10:4fca) +AerodactylDexEntry: db "FOSSIL@" db 5,11 dw 1300 TX_FAR _AerodactylDexEntry db "@" -SnorlaxDexEntry: ; 40fda (10:4fda) +SnorlaxDexEntry: db "SLEEPING@" db 6,11 dw 10140 TX_FAR _SnorlaxDexEntry db "@" -ArticunoDexEntry: ; 40fec (10:4fec) +ArticunoDexEntry: db "FREEZE@" db 5,7 dw 1220 TX_FAR _ArticunoDexEntry db "@" -ZapdosDexEntry: ; 40ffc (10:4ffc) +ZapdosDexEntry: db "ELECTRIC@" db 5,3 dw 1160 TX_FAR _ZapdosDexEntry db "@" -MoltresDexEntry: ; 4100e (10:500e) +MoltresDexEntry: db "FLAME@" db 6,7 dw 1320 TX_FAR _MoltresDexEntry db "@" -DratiniDexEntry: ; 4101d (10:501d) +DratiniDexEntry: db "DRAGON@" db 5,11 dw 70 TX_FAR _DratiniDexEntry db "@" -DragonairDexEntry: ; 4102d (10:502d) +DragonairDexEntry: db "DRAGON@" db 13,1 dw 360 TX_FAR _DragonairDexEntry db "@" -DragoniteDexEntry: ; 4103d (10:503d) +DragoniteDexEntry: db "DRAGON@" db 7,3 dw 4630 TX_FAR _DragoniteDexEntry db "@" -MewtwoDexEntry: ; 4104d (10:504d) +MewtwoDexEntry: db "GENETIC@" db 6,7 dw 2690 TX_FAR _MewtwoDexEntry db "@" -MewDexEntry: ; 4105e (10:505e) +MewDexEntry: db "NEW SPECIE@" db 1,4 dw 90 TX_FAR _MewDexEntry db "@" -MissingNoDexEntry: ; 41072 (10:5072) +MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg @@ -1262,4 +1262,4 @@ MissingNoDexEntry: ; 41072 (10:5072) ; db "???@" ; db 10,100 ; 10 feet, 100 inches ; dw 35072 ; dw ("コ" << 8 | 0), 3507.2 lbs -; db "メント さくせいちゅう@" ; a whole bunch of sound effects
\ No newline at end of file +; db "メント さくせいちゅう@" ; a whole bunch of sound effects diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index b3d7305e..0e293946 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -1,4 +1,4 @@ -PokedexOrder: ; 410b1 (10:50b1) +PokedexOrder: db DEX_RHYDON db DEX_KANGASKHAN db DEX_NIDORAN_M diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm index a48fd347..eb126d37 100755 --- a/data/prize_mon_levels.asm +++ b/data/prize_mon_levels.asm @@ -1,4 +1,4 @@ -PrizeMonLevelDictionary: ; 528ea (14:68ea) +PrizeMonLevelDictionary: db ABRA,15 db VULPIX,18 db WIGGLYTUFF,22 diff --git a/data/prizes.asm b/data/prizes.asm index 103ed415..b113c7cb 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -1,4 +1,4 @@ -PrizeDifferentMenuPtrs: ; 527ae (14:67ae) +PrizeDifferentMenuPtrs: dw PrizeMenuMon1Entries dw PrizeMenuMon1Cost @@ -8,37 +8,37 @@ PrizeDifferentMenuPtrs: ; 527ae (14:67ae) dw PrizeMenuTMsEntries dw PrizeMenuTMsCost -PrizeMenuMon1Entries: ; 527b9 (14:67b9) +PrizeMenuMon1Entries: db ABRA db VULPIX db WIGGLYTUFF db "@" -PrizeMenuMon1Cost: ; 527be (14:67be) +PrizeMenuMon1Cost: coins 230 coins 1000 coins 2680 db "@" -PrizeMenuMon2Entries: ; 527c5 (14:67c5) +PrizeMenuMon2Entries: db SCYTHER db PINSIR db PORYGON db "@" -PrizeMenuMon2Cost: ; 527c9 (14:67c9) +PrizeMenuMon2Cost: coins 6500 coins 6500 coins 9999 db "@" -PrizeMenuTMsEntries: ; 527df (14:67df) +PrizeMenuTMsEntries: db TM_23 db TM_15 db TM_50 db "@" -PrizeMenuTMsCost: ; 527e4 (14:67e4) +PrizeMenuTMsCost: coins 3300 coins 5500 coins 7700 diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 694f97b6..0080b4d2 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,4 +1,4 @@ -BorderPalettes: ; 72c39 (1c:6c39) +BorderPalettes: INCBIN "gfx/tilemaps/sgbborder.map" ds $100 @@ -83,5 +83,5 @@ BorderPalettes: ; 72c39 (1c:6c39) RGB 31, 31, 25 RGB 31, 31, 25 -SGBBorderGraphics: ; 734b9 (1c:74b9) +SGBBorderGraphics: INCBIN "gfx/pokemon_yellow.t6.2bpp" diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index c00a7f58..b2cb6e9b 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -51,32 +51,32 @@ DATA_SND: MACRO db \3 ; length (1-11) ENDM -BlkPacket_WholeScreen: ; 72611 (1c:6611) +BlkPacket_WholeScreen: db $21 db $1,$3,$0,$0,$0,$13,$11,$0 db $0,$0,$0,$0,$0,$0,$0 -BlkPacket_Battle: ; 72621 (1c:6621) +BlkPacket_Battle: db $22 db $5,$7,$a,$0,$c,$13,$11,$3,$5,$1 db $0,$a,$3,$3,$0,$a,$7,$13,$a db $3,$a,$0,$4,$8,$b,$3,$f,$b db $0,$13,$6 -BlkPacket_StatusScreen: ; 72641 (1c:6641) +BlkPacket_StatusScreen: db $21 db $1,$7,$5,$1,$0 db $7,$6,$0,$0,$0,$0,$0,$0,$0 db $0 -BlkPacket_Pokedex: ; 72651 (1c:6651) +BlkPacket_Pokedex: db $21 db $1,$7,$5,$1,$1,$8,$8 db $0,$0,$0,$0,$0,$0,$0,$0 -BlkPacket_Slots: ; 72661 (1c:6661) +BlkPacket_Slots: db $22 db $5,$3,$5,$0,$0,$13,$b,$3,$a db $0,$4,$13,$9,$2,$f,$0,$6,$13 db $7,$3,$0,$4,$4,$f,$9,$3,$0 db $0,$c,$13,$11 -BlkPacket_Titlescreen: ; 72681 (1c:6681) +BlkPacket_Titlescreen: db $22 db $3,$3,$0,$0 db $0,$13,$7,$3,$a,$0,$8,$13,$11 @@ -88,7 +88,7 @@ BlkPacket_NidorinoIntro ; 726a1 (1c:66a1) db $0,$0,$4,$13,$d,$3,$5,$0,$e db $13,$11,$0,$0,$0,$0,$0,$0,$0 db $0,$0,$0,$0,$0 -BlkPacket_PartyMenu: ; 726c1 (1c:66c1) +BlkPacket_PartyMenu: db $23 db $7,$6,$10 db $1,$0,$2,$c,$2,$0,$5,$1,$b @@ -96,7 +96,7 @@ BlkPacket_PartyMenu: ; 726c1 (1c:66c1) db $5,$5,$b,$5,$2,$0,$5,$7,$b db $7,$2,$0,$5,$9,$b,$9,$2,$0 db $5,$b,$b,$b,$0,$0,$0,$0 -BlkPacket_TrainerCard: ; 726f1 (1c:66f1) +BlkPacket_TrainerCard: db $24 db $a,$2,$0,$3,$c,$4,$d,$2,$5 db $7,$c,$8,$d,$2,$f,$b,$c,$c @@ -105,70 +105,70 @@ BlkPacket_TrainerCard: ; 726f1 (1c:66f1) db $d,$2,$a,$3,$f,$4,$10,$2,$f db $7,$f,$8,$10,$2,$a,$b,$f,$c db $10,$2,$5,$f,$f,$10,$10,$0,$0 -BlkPacket_GameFreakIntro: ; 72731 (1c:6731) +BlkPacket_GameFreakIntro: db $22 db $3,$7,$5,$5,$b,$7,$d,$2 db $a,$8,$b,$9,$d,$3,$f,$c,$b db $e,$d,$0,$0,$0,$0,$0,$0,$0 db $0,$0,$0,$0,$0 -UnknownPacket_72751: ; 72751 (1c:6751) +UnknownPacket_72751: db $21,$1,$7,$5 db $4,$0,$f,$5,$0,$0,$0,$0,$0 db $0,$0,$0 -PalPacket_Empty: ; 72761 (1c:6761) +PalPacket_Empty: PAL_SET 0, 0, 0, 0 -PalPacket_PartyMenu: ; 72771 (1c:6771) +PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR -PalPacket_Black: ; 72781 (1c:6781) +PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK -PalPacket_TownMap: ; 72791 (1c:6791) +PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 -PalPacket_Pokedex: ; 727a1 (1c:67a1) +PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 -PalPacket_Slots: ; 727b1 (1c:67b1) +PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 -PalPacket_Titlescreen: ; 727c1 (1c:67c1) +PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON -PalPacket_TrainerCard: ; 727d1 (1c:67d1) +PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON -PalPacket_Generic: ; 727e1 (1c:67e1) +PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 -PalPacket_NidorinoIntro: ; 727f1 (1c:67f1) +PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 -PalPacket_GameFreakIntro: ; 72801 (1c:6801) +PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON -UnknownPalPacket_72811: ; 72811 (1c:6811) +UnknownPalPacket_72811: db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 -UnknownPalPacket_72821: ; 72821 (1c:6821) +UnknownPalPacket_72821: db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 -PalTrnPacket: ; 72831 (1c:6831) +PalTrnPacket: PAL_TRN -MltReq1Packet: ; 72841 (1c:6841) +MltReq1Packet: MLT_REQ 1 -MltReq2Packet: ; 72851 (1c:6851) +MltReq2Packet: MLT_REQ 2 -ChrTrnPacket: ; 72861 (1c:6861) +ChrTrnPacket: CHR_TRN 0, 0 -PctTrnPacket: ; 72871 (1c:6871) +PctTrnPacket: PCT_TRN -MaskEnFreezePacket: ; 72881 (1c:6881) +MaskEnFreezePacket: MASK_EN 1 -MaskEnCancelPacket: ; 72891 (1c:6891) +MaskEnCancelPacket: MASK_EN 0 ; These are DATA_SND packets containing SNES code. @@ -245,4 +245,4 @@ DataSnd_72911: DATA_SND $810, $0, 11 ; 72911 (1c:6911) db $EA ; nop db $60 ; rts db $EA ; nop - db $EA ; nop
\ No newline at end of file + db $EA ; nop diff --git a/data/slot_machine_wheels.asm b/data/slot_machine_wheels.asm index dc9accca..88a89822 100755 --- a/data/slot_machine_wheels.asm +++ b/data/slot_machine_wheels.asm @@ -1,4 +1,4 @@ -SlotMachineWheel1: ; 37c15 (d:7c15) +SlotMachineWheel1: dw SLOTS7 dw SLOTSMOUSE dw SLOTSFISH @@ -18,7 +18,7 @@ SlotMachineWheel1: ; 37c15 (d:7c15) dw SLOTSMOUSE dw SLOTSFISH -SlotMachineWheel2: ; 37c39 (d:7c39) +SlotMachineWheel2: dw SLOTS7 dw SLOTSFISH dw SLOTSCHERRY @@ -38,7 +38,7 @@ SlotMachineWheel2: ; 37c39 (d:7c39) dw SLOTSFISH dw SLOTSCHERRY -SlotMachineWheel3: ; 37c5d (d:7c5d) +SlotMachineWheel3: dw SLOTS7 dw SLOTSBIRD dw SLOTSFISH diff --git a/data/special_warps.asm b/data/special_warps.asm index e883f3e2..27837109 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -1,7 +1,7 @@ ; Format: (size 2 bytes) ; 00: target map ID ; 01: which dungeon warp in the source map was used -DungeonWarpList: ; 6133 (1:6133) +DungeonWarpList: db SEAFOAM_ISLANDS_2,$01 db SEAFOAM_ISLANDS_2,$02 db SEAFOAM_ISLANDS_3,$01 @@ -16,7 +16,7 @@ DungeonWarpList: ; 6133 (1:6133) db MANSION_2,$03 db $FF -DungeonWarpData: ; 614c (1:614c) +DungeonWarpData: FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18 FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23 FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19 @@ -34,32 +34,32 @@ DungeonWarpData: ; 614c (1:614c) ; db Map_id ; FLYWARP_DATA [Map Width][Y-pos][X-pos] ; db Tileset_id -FirstMapSpec: ; 6194 (1:6194) +FirstMapSpec: db REDS_HOUSE_2F FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 db REDS_HOUSE_2 -TradeCenterSpec1: ; 619a (1:619a) +TradeCenterSpec1: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 db CLUB -TradeCenterSpec2: ; 61a3 (1:61a3) +TradeCenterSpec2: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 db CLUB -ColosseumSpec1: ; 61ac (1:61ac) +ColosseumSpec1: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,3 db CLUB -ColosseumSpec2: ; 61b3 (1:61b3) +ColosseumSpec2: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,6 db CLUB -FlyWarpDataPtr: ; 61bc (1:61bc) +FlyWarpDataPtr: db PALLET_TOWN, 0 dw PalletTownFlyWarp db VIRIDIAN_CITY, 0 @@ -91,29 +91,29 @@ FlyWarpDataPtr: ; 61bc (1:61bc) ; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] ; Macro Format: ; FLYWARP_DATA [Map Width][Y-pos][X-pos] -PalletTownFlyWarp: ; 61f0 (1:61f0) +PalletTownFlyWarp: FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5 -ViridianCityFlyWarp: ; 61f6 (1:61f6) +ViridianCityFlyWarp: FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23 -PewterCityFlyWarp: ; 61fc (1:61fc) +PewterCityFlyWarp: FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13 -CeruleanCityFlyWarp: ; 6202 (1:6202) +CeruleanCityFlyWarp: FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19 -LavenderTownFlyWarp: ; 6208 (1:6208) +LavenderTownFlyWarp: FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3 -VermilionCityFlyWarp: ; 620e (1:620e) +VermilionCityFlyWarp: FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11 -CeladonCityFlyWarp: ; 6214 (1:6214) +CeladonCityFlyWarp: FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41 -FuchsiaCityFlyWarp: ; 621a (1:621a) +FuchsiaCityFlyWarp: FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19 -CinnabarIslandFlyWarp: ; 6220 (1:6220) +CinnabarIslandFlyWarp: FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11 -IndigoPlateauFlyWarp: ; 6226 (1:6226) +IndigoPlateauFlyWarp: FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9 -SaffronCityFlyWarp: ; 622c (1:622c) +SaffronCityFlyWarp: FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9 -Route4FlyWarp: ; 6232 (1:6232) +Route4FlyWarp: FLYWARP_DATA ROUTE_4_WIDTH, 6, 11 -Route10FlyWarp: ; 6238 (1:6238) - FLYWARP_DATA ROUTE_10_WIDTH, 20, 11
\ No newline at end of file +Route10FlyWarp: + FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm index 50e50e07..d74c9d2f 100755 --- a/data/sprite_sets.asm +++ b/data/sprite_sets.asm @@ -1,4 +1,4 @@ -MapSpriteSets: ; 141e6 (5:41e6) +MapSpriteSets: db $01 ; PALLET_TOWN db $01 ; VIRIDIAN_CITY db $02 ; PEWTER_CITY @@ -44,7 +44,7 @@ MapSpriteSets: ; 141e6 (5:41e6) ; 01: coordinate of dividing line ; 02: sprite set ID if in the West or North side ; 03: sprite set ID if in the East or South side -SplitMapSpriteSets: ; 1402b (5:420b) +SplitMapSpriteSets: db $02,$25,$02,$01 ; $f1 db $02,$32,$02,$03 ; $f2 db $01,$39,$04,$08 ; $f3 @@ -58,7 +58,7 @@ SplitMapSpriteSets: ; 1402b (5:420b) db $01,$11,$05,$07 ; $fb db $01,$03,$07,$03 ; $fc -SpriteSets: ; 1423d (5:423d) +SpriteSets: ; sprite set $01 db SPRITE_PIKACHU db SPRITE_BLUE @@ -189,7 +189,7 @@ SpriteSets: ; 1423d (5:423d) db SPRITE_BALL db SPRITE_OMANYTE -SpriteSheetPointerTable: ; 142a9 (5:42a9) +SpriteSheetPointerTable: ; SPRITE_RED dw RedSprite db $c0 ; byte count diff --git a/data/super_rod.asm b/data/super_rod.asm index 14a3b9b7..1303edbb 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -1,4 +1,4 @@ -FishingSlots:: ; f5eda (3d:5eda) +FishingSlots:: db PALLET_TOWN,STARYU,10,TENTACOOL,10,STARYU,5,TENTACOOL,20 db VIRIDIAN_CITY,POLIWAG,5,POLIWAG,10,POLIWAG,15,POLIWAG,10 db CERULEAN_CITY,GOLDEEN,25,GOLDEEN,30,SEAKING,30,SEAKING,40 @@ -30,4 +30,4 @@ FishingSlots:: ; f5eda (3d:5eda) db SEAFOAM_ISLANDS_5,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40 db UNKNOWN_DUNGEON_1,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55 db UNKNOWN_DUNGEON_3,GOLDEEN,30,SEAKING,40,SEAKING,50,SEAKING,60 - db $ff
\ No newline at end of file + db $ff diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index e81d11ff..c85a51e5 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,5 +1,4 @@ -Tilesets: ; c558 (3:4558) - ; dr $c558,$c684 +Tilesets: tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR diff --git a/data/tm_prices.asm b/data/tm_prices.asm index 2aa72f28..ccc8be05 100755 --- a/data/tm_prices.asm +++ b/data/tm_prices.asm @@ -1,4 +1,4 @@ -TechnicalMachinePrices: ; f65f5 (3d:65f5) +TechnicalMachinePrices: ; In thousands (nybbles). dn 3, 2 ; TM_01, TM_02 dn 2, 1 ; TM_03, TM_04 diff --git a/data/tms.asm b/data/tms.asm index e41a60e9..d61392c4 100755 --- a/data/tms.asm +++ b/data/tms.asm @@ -1,4 +1,4 @@ -TechnicalMachines: ; 13773 (4:7773) +TechnicalMachines: db MEGA_PUNCH db RAZOR_WIND db SWORDS_DANCE diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index 5223f435..e9ced645 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -1,4 +1,4 @@ -ExternalMapEntries: ; 7139c (1c:539c) +ExternalMapEntries: EMAP $2,$B,PalletTownName EMAP $2,$8,ViridianCityName EMAP $2,$3,PewterCityName @@ -37,7 +37,7 @@ ExternalMapEntries: ; 7139c (1c:539c) EMAP $A,$1,Route24Name EMAP $B,$0,Route25Name -InternalMapEntries: ; 7140b (1c:540b) +InternalMapEntries: IMAP OAKS_LAB, $2,$B,PalletTownName IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name diff --git a/data/town_map_order.asm b/data/town_map_order.asm index b43ed010..10131a31 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -1,4 +1,4 @@ -TownMapOrder: ; 70f95 (1c:4f95) +TownMapOrder: db PALLET_TOWN db ROUTE_1 db VIRIDIAN_CITY diff --git a/data/trades.asm b/data/trades.asm index 77fc55f4..4fa52d30 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,4 +1,4 @@ -TradeMons: ; 71c1d (1c:5c1d) +TradeMons: ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index dbff96f4..696253e3 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -3,7 +3,7 @@ ; entry = trainerclass, trainerid, moveset+, 0 ; moveset = partymon location, partymon's move, moveid -SpecialTrainerMoves: ; 39c6b (e:5c6b) +SpecialTrainerMoves: db BUG_CATCHER,$f db 2,2,TACKLE db 2,3,STRING_SHOT diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 8f75f41e..48de8bce 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -1,4 +1,4 @@ -TrainerDataPointers: ; 39dd1 (e:5dd1) +TrainerDataPointers: dw YoungsterData dw BugCatcherData dw LassData diff --git a/data/trainer_types.asm b/data/trainer_types.asm index bb8bd0ec..cc7ca605 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,11 +1,11 @@ -FemaleTrainerList:: ; 33c3 (0:33c3) +FemaleTrainerList:: db OPP_LASS db OPP_JR_TRAINER_F db OPP_BEAUTY db OPP_COOLTRAINER_F db $FF -EvilTrainerList:: ; 33c8 (0:33c8) +EvilTrainerList:: db OPP_JUGGLER_X db OPP_GAMBLER db OPP_ROCKER @@ -14,5 +14,4 @@ EvilTrainerList:: ; 33c8 (0:33c8) db OPP_SCIENTIST db OPP_GIOVANNI db OPP_ROCKET - - db $ff + db $FF diff --git a/data/type_effects.asm b/data/type_effects.asm index 8885ae19..1321a3d9 100755 --- a/data/type_effects.asm +++ b/data/type_effects.asm @@ -1,4 +1,4 @@ -TypeEffects: ; 3e5fa (f:65fa) +TypeEffects: ; format: attacking type, defending type, damage multiplier ; the multiplier is a (decimal) fixed-point number: ; 20 is ×2.0 diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm index 672d7382..4edc48a5 100755 --- a/data/warp_tile_ids.asm +++ b/data/warp_tile_ids.asm @@ -1,4 +1,4 @@ -WarpTileIDPointers: ; c215 (3:4215) +WarpTileIDPointers: dw OverworldWarpTileIDs dw RedsHouse1WarpTileIDs dw MartWarpTileIDs @@ -25,65 +25,65 @@ WarpTileIDPointers: ; c215 (3:4215) dw PlateauWarpTileIDs dw BeachHouseWarpTileIDs -OverworldWarpTileIDs: ; c247 (3:4247) +OverworldWarpTileIDs: db $1B,$58,$FF -ForestGateWarpTileIDs: ; c24a (3:424a) -MuseumWarpTileIDs: ; c24a (3:424a) -GateWarpTileIDs: ; c24a (3:424a) +ForestGateWarpTileIDs: +MuseumWarpTileIDs: +GateWarpTileIDs: db $3B -RedsHouse1WarpTileIDs: ; c24b (3:424b) -RedsHouse2WarpTileIDs: ; c24b (3:424b) +RedsHouse1WarpTileIDs: +RedsHouse2WarpTileIDs: db $1A,$1C,$FF -MartWarpTileIDs: ; c24e (3:424e) -PokecenterWarpTileIDs: ; c24e (3:424e) +MartWarpTileIDs: +PokecenterWarpTileIDs: db $5E,$FF -ForestWarpTileIDs: ; c250 (3:4250) +ForestWarpTileIDs: db $5A,$5C,$3A,$FF -DojoWarpTileIDs: ; c254 (3:4254) -GymWarpTileIDs: ; c254 (3:4254) +DojoWarpTileIDs: +GymWarpTileIDs: db $4A,$FF -HouseWarpTileIDs: ; c256 (3:4256) +HouseWarpTileIDs: db $54,$5C,$32,$FF -ShipWarpTileIDs: ; c25a (3:425a) +ShipWarpTileIDs: db $37,$39,$1E,$4A,$FF -InteriorWarpTileIDs: ; c25f (3:425f) +InteriorWarpTileIDs: db $15,$55,$04,$FF -CavernWarpTileIDs: ; c263 (3:4263) +CavernWarpTileIDs: db $18,$1A,$22,$FF -LobbyWarpTileIDs: ; c267 (3:4267) +LobbyWarpTileIDs: db $1A,$1C,$38,$FF -MansionWarpTileIDs: ; c26b (3:426b) +MansionWarpTileIDs: db $1A,$1C,$53,$FF -LabWarpTileIDs: ; c26f (3:426f) +LabWarpTileIDs: db $34,$FF -FacilityWarpTileIDs: ; c271 (3:4571) +FacilityWarpTileIDs: db $43,$58,$20 -CemeteryWarpTileIDs: ; c274 (3:4274) +CemeteryWarpTileIDs: db $1B -UndergroundWarpTileIDs: ; c275 (3:4275) +UndergroundWarpTileIDs: db $13,$FF -PlateauWarpTileIDs: ; c277 (3:4277) +PlateauWarpTileIDs: db $1B,$3B -ShipPortWarpTileIDs: ; c279 (3:4279) -ClubWarpTileIDs: ; c279 (3:4279) +ShipPortWarpTileIDs: +ClubWarpTileIDs: db $FF -BeachHouseWarpTileIDs: ; c27a (3:427a) - db $FF
\ No newline at end of file +BeachHouseWarpTileIDs: + db $FF diff --git a/data/wild_mons.asm b/data/wild_mons.asm index 15cbccc7..c1c44e95 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -1,4 +1,4 @@ -WildDataPointers: ; cb95 (3:4b95) +WildDataPointers: dw NoMons ; PALLET_TOWN dw NoMons ; VIRIDIAN_CITY dw NoMons ; PEWTER_CITY diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 51575a9d..4a811116 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -39,18 +39,18 @@ HallOfFamePC: jp Credits FadeInCreditsText: - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ld hl, HoFGBPalettes ld b, 4 -.asm_f0f91 +.loop ld a, [hli] ld [rBGP], a call UpdateGBCPal_BGP ld c, 5 call DelayFrames dec b - jr nz, .asm_f0f91 + jr nz, .loop ret HoFGBPalettes: @@ -76,7 +76,7 @@ DisplayCreditsMon: call LoadScreenTilesFromBuffer2DisableBGTransfer ld hl, vBGMap0 call CreditsCopyTileMapToVRAM - ld a, %11111100 + ld a, %11111100 ; make the mon a black silhouette ld [rBGP], a call UpdateGBCPal_BGP ld hl, rLCDC @@ -100,14 +100,13 @@ DisplayCreditsMon: ret ScrollCreditsMonLeft: -.asm_f0fff ld a, b ld [hSCX], a add 8 ld b, a call DelayFrame dec c - jr nz, .asm_f0fff + jr nz, ScrollCreditsMonLeft ret GetNextCreditsMon: @@ -129,10 +128,10 @@ INCLUDE "data/credit_mons.asm" CreditsCopyTileMapToVRAM: ld a, l - ld [$ffbc], a + ld [H_AUTOBGTRANSFERDEST], a ld a, h - ld [$ffbd], a - ld a, $1 + ld [H_AUTOBGTRANSFERDEST + 1], a + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 @@ -154,24 +153,24 @@ CreditsLoadFont: ret ZeroMemory: -.asm_f1071 +; zero bc bytes at hl ld [hl], 0 inc hl inc hl dec bc ld a, b or c - jr nz, .asm_f1071 + jr nz, ZeroMemory ret FillFourRowsWithBlack: - ld bc, 4 * SCREEN_WIDTH + ld bc, SCREEN_WIDTH * 4 ld a, $7e jp FillMemory FillMiddleOfScreenWithWhite: coord hl, 0, 4 - ld bc, 10 * SCREEN_WIDTH + ld bc, SCREEN_WIDTH * 10 ld a, " " jp FillMemory @@ -193,19 +192,19 @@ FillHalfOfScreenWithWhite: ld b, 10 ld c, 10 ld a, " " -.asm_f10a6 +.loop push bc push hl -.asm_f10a8 +.innerLoop ld [hli], a dec c - jr nz, .asm_f10a8 + jr nz, .innerLoop pop hl ld bc, SCREEN_WIDTH add hl, bc pop bc dec b - jr nz, .asm_f10a6 + jr nz, .loop ret Credits: ; Roll credits @@ -287,7 +286,7 @@ ShowTheEndGFX: call PlaceString jp FadeInCreditsText -TheEndTextString: ; 74229 (1d:4229) +TheEndTextString: ; "T H E E N D" db $60, " ", $62, " ", $64, " ", $64, " ", $66, " ", $68, "@" db $61, " ", $63, " ", $65, " ", $65, " ", $67, " ", $69, "@" @@ -322,4 +321,3 @@ INCLUDE "text/credits_text.asm" TheEndGfx: ; 7473e (1d:473e) (7473f on blue) INCBIN "gfx/theend.interleave.2bpp" TheEndGfxEnd: - diff --git a/engine/add_party_mon.asm b/engine/add_party_mon.asm index b20913dd..1aa6bd16 100644 --- a/engine/add_party_mon.asm +++ b/engine/add_party_mon.asm @@ -1,4 +1,4 @@ -_AddPartyMon: ; f161 (3:7161) +_AddPartyMon: ; Adds a new mon to the player's or enemy's party. ; [wMonDataLocation] is used in an unusual way in this function. ; If the lower nybble is 0, the mon is added to the player's party, else the enemy's. @@ -251,10 +251,10 @@ _AddPartyMon: ; f161 (3:7161) scf ret -LoadMovePPs: ; f2f9 (3:72f9) +LoadMovePPs: call GetPredefRegisters ; fallthrough -AddPartyMon_WriteMovePP: ; f2fc (3:72fc) +AddPartyMon_WriteMovePP: ld b, NUM_MOVES .pploop ld a, [hli] ; read move ID @@ -283,7 +283,7 @@ AddPartyMon_WriteMovePP: ; f2fc (3:72fc) ; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party ; used in the cable club trade center -_AddEnemyMonToPlayerParty: ; f323 (3:7323) +_AddEnemyMonToPlayerParty: ld hl, wPartyCount ld a, [hl] cp PARTY_LENGTH @@ -342,4 +342,4 @@ _AddEnemyMonToPlayerParty: ; f323 (3:7323) ld hl, wPokedexSeen call FlagAction ; add to seen pokemon and a - ret ; return success
\ No newline at end of file + ret ; return success diff --git a/engine/animated_objects_3e.asm b/engine/animated_objects_3e.asm index 9d21ff8b..63a94350 100755 --- a/engine/animated_objects_3e.asm +++ b/engine/animated_objects_3e.asm @@ -1,4 +1,4 @@ -ClearObjectAnimationBuffers: ; fbb5a (3e:7b5a) +ClearObjectAnimationBuffers: ld hl, wAnimatedObjectsData ld bc, wAnimatedObjectsDataEnd - wAnimatedObjectsData xor a diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 1f3c967f..7ae059e7 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -1,7 +1,7 @@ INCLUDE "engine/pikachu_pcm.asm" INCLUDE "engine/overworld/advance_player_sprite.asm" -ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) +ResetStatusAndHalveMoneyOnBlackout: ; Reset player status on blackout. xor a ld [wd435], a @@ -50,31 +50,31 @@ ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ld [wJoyIgnore], a predef_jump HealParty -Func_f02da:: ; f02da (3c:42da) +SetMapSpecificScriptFlagsOnMapReload: ld a, [wCurMap] cp VERMILION_GYM ; ??? new thing about verm gym? - jr z, .asm_f02ee + jr z, .verm_gym ld c, a - ld hl, Pointer_f02fa -.asm_f02e5 + ld hl, .MapList +.search_loop ld a, [hli] cp c - jr z, .asm_f02f4 + jr z, .in_list cp a, $ff - jr nz, .asm_f02e5 + jr nz, .search_loop ret -.asm_f02ee +.verm_gym ld hl, wCurrentMapScriptFlags set 6, [hl] ret -.asm_f02f4 +.in_list ld hl, wCurrentMapScriptFlags set 5, [hl] ret -Pointer_f02fa:: ; f02fa (3c:42fa) +.MapList ; f02fa (3c:42fa) db SILPH_CO_2F db SILPH_CO_3F db SILPH_CO_4F @@ -102,18 +102,18 @@ Pointer_f02fa:: ; f02fa (3c:42fa) db AGATHAS_ROOM db $ff -BeachHouse_GFX:: ; f0314 (3c:4314) +BeachHouse_GFX: INCBIN "gfx/tilesets/beachhouse.2bpp" -BeachHouse_Block:: ; f0914 (3c:4914) +BeachHouse_Block: INCBIN "gfx/blocksets/beachhouse.bst" -Func_f0a54:: ; f0a54 (3c:4a54) +Func_f0a54: ret -Func_f0a55:: ; f0a55 (3c:4a55) +LoadUnusedBluesHouseMissableObjectData: ; referenced in an unused function - ld hl, Pointer_f0a76 ; 3c:4a76 + ld hl, .MissableObjectsMaps .loop ld a, [hli] cp a, $ff @@ -121,13 +121,13 @@ Func_f0a55:: ; f0a55 (3c:4a55) ld b, a ld a, [wCurMap] cp b - jr z, .asm_f0a68 + jr z, .found inc hl inc hl inc hl jr .loop -.asm_f0a68 +.found ld a, [hli] ld c, a ld b, 0 @@ -138,16 +138,16 @@ Func_f0a55:: ; f0a55 (3c:4a55) call CopyData ret -Pointer_f0a76:: ; f0a76 (3c:4a76) - dbbw BLUES_HOUSE, Pointer_f0a7bEnd - Pointer_f0a7b, Pointer_f0a7b +.MissableObjectsMaps: + dbbw BLUES_HOUSE, .End - .Start, .Start db $ff -Pointer_f0a7b: +.Start: db 1, HS_DAISY_SITTING_COPY db 2, HS_DAISY_WALKING_COPY db 3, HS_TOWN_MAP_COPY db $ff -Pointer_f0a7bEnd: +.End: TryApplyPikachuMovementData: ; f0a82 ld a, [wd472] @@ -177,13 +177,13 @@ TryApplyPikachuMovementData: ; f0a82 callab RefreshPikachuFollow ret -Pic_f0abf: ; f0abf (3c:4abf) +Pic_f0abf: INCBIN "gfx/pikachu/unknown_f0abf.pic" -GFX_f0b64: ; f0b64 (3c:4b64) +GFX_f0b64: INCBIN "gfx/pikachu/unknown_f0b64.2bpp" -Pic_f0cf4: ; f0cf4 (3c:4cf4) +Pic_f0cf4: INCBIN "gfx/pikachu/unknown_f0cf4.pic" -GFX_f0d82: ; f0d82 (3c:4d82) +GFX_f0d82: INCBIN "gfx/pikachu/unknown_f0d82.2bpp" PokecenterChanseyText: @@ -209,46 +209,19 @@ INCLUDE "scripts/oakslab2.asm" INCLUDE "scripts/school2.asm" INCLUDE "scripts/museum1f2.asm" INCLUDE "scripts/pewterpokecenter2.asm" - -Func_f1e22: - ld hl, PikachuMovementData_f1e2b - ld b, SPRITE_FACING_RIGHT - call TryApplyPikachuMovementData - ret - -PikachuMovementData_f1e2b: - db $00 - db $1d - db $1f - db $38 - db $3f - +INCLUDE "scripts/pokemontower2_2.asm" INCLUDE "scripts/celadonmart3_2.asm" INCLUDE "scripts/celadonmansion1_2.asm" INCLUDE "scripts/celadonmansion3_2.asm" - -Func_f1f23: - ld hl, PikachuMovementData_f1f2c - ld b, SPRITE_FACING_DOWN - call TryApplyPikachuMovementData - ret - -PikachuMovementData_f1f2c: - db $00 - db $20 - db $1e - db $35 - db $3f - +INCLUDE "scripts/celadongamecorner2.asm" INCLUDE "scripts/celadondiner2.asm" INCLUDE "scripts/safarizoneentrance2.asm" INCLUDE "scripts/cinnabargym3.asm" - INCLUDE "scripts/mtmoonpokecenter2.asm" INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" -BeachHouseBlockdata: ; f2388 (3c:6388) +BeachHouseBlockdata: INCBIN "maps/beach_house.blk" INCLUDE "data/mapObjects/beach_house.asm" @@ -259,111 +232,4 @@ INCLUDE "scripts/ssanne9_2.asm" INCLUDE "scripts/silphco11_2.asm" INCLUDE "engine/overworld/hidden_objects.asm" - -Func_f2cd0: - ld d, 0 - ld hl, Jumptable_f2ce1 - add hl, de - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - call JumpToAddress - ld e, a - ld d, 0 - ret - -Jumptable_f2ce1: - dw Func_f2ceb - dw Func_f2ceb - dw Func_f2cee - dw Func_f2cf4 - dw Func_f2d06 - -Func_f2ceb: - ld a, 0 - ret - -Func_f2cee: - call Random - and $1 - ret - -Func_f2cf4: ; should return to a, instead returns to b - call Random - swap a - cp 1 * $ff / 3 - ld b, 0 - ret c - cp 2 * $ff / 3 - ld b, 1 - ret c - ld b, 2 - ret - -Func_f2d06: - call Random - and $3 - ret - -Func_f2d0c: - ld hl, GymTrashCans3c - ld a, [wGymTrashCanIndex] - ld c, a - ld b, 0 - ld a, 9 - call AddNTimes - call AddNTimes ; ???? - ld a, [hli] - ld [hGymTrashCanRandNumMask], a - ld e, a - push hl - call Func_f2cd0 - pop hl - add hl, de - add hl, de - ld a, [hli] - ld [wSecondLockTrashCanIndex], a - ld a, [hl] - ld [wSecondLockTrashCanIndex + 1], a - ret - -GymTrashCans3c: ; f2d31 (3c:6d31) -; First byte: number of trashcan entries -; Following four byte pairs: indices for the second trash can. -; BUG: Rows that have 3 trashcan entries are sampled incorrectly. -; The sampling occurs by taking a random number and seeing which -; third of the range 0-255 the number falls in. However, it returns -; that value to the wrong register, so the result is never used. -; Instead of using an offset in [0,1,2], the offset is instead -; in the full range 0-255. This results in truly random behavior. - db 4 - db 1,3, 3,1, 1,-1, 3,-1 - db 3 - db 0,2, 2,4, 4,0, -1,-1 - db 4 - db 1,5, 5,1, 1,-1, 5,-1 - db 3 - db 0,4, 4,6, 6,0, -1,-1 - db 4 - db 1,3, 3,1, 5,5, 7,7 - db 3 - db 2,4, 4,8, 8,2, -1,-1 - db 3 - db 3,7, 7,9, 9,3, -1,-1 - db 4 - db 4,8, 6,10, 8,4, 10,6 - db 3 - db 5,7, 7,11, 11,5, -1,-1 - db 3 - db 6,10, 10,12, 12,6, -1,-1 - db 4 - db 7,9, 9,7, 11,13, 13,11 - db 3 - db 8,10, 10,14, 14,8, -1,-1 - db 4 - db 9,13, 13,9, 9,-1, 13,-1 - db 3 - db 10,12, 12,14, 14,10, -1,-1 - db 4 - db 11,13, 13,11, 11,-1, 13,-1 +INCLUDE "engine/vermilion_gym_trash_cans.asm" diff --git a/engine/bank3d.asm b/engine/bank3d.asm index fbf816b6..6efff351 100644 --- a/engine/bank3d.asm +++ b/engine/bank3d.asm @@ -3,7 +3,7 @@ INCLUDE "engine/battle/link_battle_versus_text.asm" INCLUDE "engine/battle/unused_stats_functions.asm" INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" -StarterPikachuBattleEntranceAnimation: ; f429f (3d:429f) +StarterPikachuBattleEntranceAnimation: coord hl, 0, 5 ld c, 0 .loop1 @@ -29,7 +29,7 @@ StarterPikachuBattleEntranceAnimation: ; f429f (3d:429f) inc hl jr .loop1 -.PlaceColumn: ; f42c2 (3d:f42c2) +.PlaceColumn: push hl push de push bc @@ -53,7 +53,7 @@ StarterPikachuBattleEntranceAnimation: ; f429f (3d:429f) INCLUDE "engine/battle/decrement_pp.asm" -ModifyPikachuHappiness:: ; f430a (3d:430a) +ModifyPikachuHappiness:: ld a, d cp PIKAHAPPY_GYMLEADER jr z, .checkanywhereinparty @@ -142,7 +142,7 @@ ModifyPikachuHappiness:: ; f430a (3d:430a) .done ret -HappinessChangeTable: ; f4385 (3d:4385) +HappinessChangeTable: ; Increase db 5, 3, 2 ; Gained a level db 5, 3, 2 ; HP restore @@ -157,7 +157,7 @@ HappinessChangeTable: ; f4385 (3d:4385) db -5, -5, -10 ; Unknown (d = 10) db -10, -10, -20 ; Unknown (d = 11) -PikachuMoods: ; f43a6 (3d:43a6) +PikachuMoods: ; Increase db $8a ; Gained a level db $83 ; HP restore @@ -176,7 +176,7 @@ RedPicBack: INCBIN "pic/trainer/redb.pic" OldManPic: INCBIN "pic/trainer/oldman.pic" ProfOakPicBack: INCBIN "pic/ytrainer/prof.oakb.pic" -LoadYellowTitleScreenGFX: ; f453f (3d:453f) +LoadYellowTitleScreenGFX: ld hl, PokemonLogoGraphics ld de, vChars2 ld bc, 115 * $10 @@ -199,14 +199,14 @@ LoadYellowTitleScreenGFX: ; f453f (3d:453f) call FarCopyData ret -TitleScreen_PlacePokemonLogo: ; f4578 (3d:4578) +TitleScreen_PlacePokemonLogo: coord hl, 2, 1 ld de, TitleScreenPokemonLogoTilemap lb bc, 7, 16 call Bank3D_CopyBox ret -TitleScreen_PlacePikaSpeechBubble: ; f4585 (3d:4585) +TitleScreen_PlacePikaSpeechBubble: coord hl, 6, 4 ld de, TitleScreenPikaBubbleTilemap lb bc, 4, 7 @@ -217,7 +217,7 @@ TitleScreen_PlacePikaSpeechBubble: ; f4585 (3d:4585) ld [hl], $65 ret -TitleScreen_PlacePikachu: ; f459a (3d:459a) +TitleScreen_PlacePikachu: coord hl, 4, 8 ld de, TitleScreenPikachuTilemap lb bc, 9, 12 @@ -236,7 +236,7 @@ TitleScreen_PlacePikachu: ; f459a (3d:459a) call CopyData ret -TitleScreenPikachuEyesOAMData: ; f45c7 (3d:45c7) +TitleScreenPikachuEyesOAMData: db $60, $40, $f1, $22 db $60, $48, $f0, $22 db $68, $40, $f3, $22 @@ -246,7 +246,7 @@ TitleScreenPikachuEyesOAMData: ; f45c7 (3d:45c7) db $68, $60, $f2, $02 db $68, $68, $f3, $02 -Bank3D_CopyBox: ; f45e7 (3d:45e7) +Bank3D_CopyBox: ; copy cxb (xy) screen area from de to hl .row push bc @@ -265,7 +265,7 @@ Bank3D_CopyBox: ; f45e7 (3d:45e7) jr nz, .row ret -TitleScreenPokemonLogoTilemap: ; f45f9 (3d:45f9) +TitleScreenPokemonLogoTilemap: ; 16x7 (xy) db $f4, $f4, $f4, $f4, $f4, $f4, $49, $f4, $72, $30, $f4, $f4, $f4, $f4, $f4, $f4 db $fd, $01, $02, $03, $04, $05, $06, $07, $08, $09, $0a, $0b, $f4, $0d, $0e, $0f @@ -275,18 +275,18 @@ TitleScreenPokemonLogoTilemap: ; f45f9 (3d:45f9) db $f4, $41, $42, $43, $44, $45, $46, $47, $48, $f4, $4a, $4b, $4c, $4d, $4e, $4f db $f4, $6a, $6b, $6c, $6d, $f4, $f4, $f4, $f4, $f4, $f4, $6e, $6f, $70, $71, $f4 -Pointer_f4669: ; f4669 (3d:4669) +Pointer_f4669: ; Unreferenced db $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $4f, $5f -TitleScreenPikaBubbleTilemap: ; f4673 (3d:4673) +TitleScreenPikaBubbleTilemap: ; 7x4 (xy) db $24, $25, $66, $67, $68, $69, $2a db $50, $51, $52, $53, $54, $55, $56 db $57, $58, $59, $5a, $5b, $5c, $5d db $6d, $5e, $5f, $60, $61, $62, $63 -TitleScreenPikachuTilemap: ; f468f (3d:468f) +TitleScreenPikachuTilemap: ; 12x9 (xy) db $80, $81, $82, $83, $00, $00, $00, $00, $84, $85, $86, $87 db $88, $89, $8a, $8b, $8c, $8d, $8d, $8e, $8f, $8a, $90, $91 @@ -306,11 +306,11 @@ YellowLogoGraphicsEnd: INCLUDE "engine/menu/link_menu.asm" -HandleMenuInputDouble: ; f5a40 (3d:5a40) +HandleMenuInputDouble: xor a ld [wPartyMenuAnimMonEnabled], a -HandleMenuInputPokemonSelectionDouble: ; f5a44 (3d:5a44) +HandleMenuInputPokemonSelectionDouble: ld a, [H_DOWNARROWBLINKCNT1] push af ld a, [H_DOWNARROWBLINKCNT2] @@ -380,7 +380,7 @@ HandleMenuInputPokemonSelectionDouble: ; f5a44 (3d:5a44) ld a, [hJoy5] ret -.UpdateCursorTile: ; f5ab0 (3d:5ab0) +.UpdateCursorTile: ld a, [wTopMenuItemY] and a jr z, .asm_f5ac0 @@ -436,7 +436,7 @@ HandleMenuInputPokemonSelectionDouble: ; f5a44 (3d:5a44) ld [wLastMenuItem], a ret -PrintStrengthTxt: ; f5b06 (3d:5b06) +PrintStrengthTxt: ld hl, wd728 set 0, [hl] ld hl, Text_f5b17 @@ -444,7 +444,7 @@ PrintStrengthTxt: ; f5b06 (3d:5b06) ld hl, Text_f5b28 jp PrintText -Text_f5b17: ; f5b17 (3d:5b17) +Text_f5b17: TX_FAR _UsedStrengthText ; 2d:417e TX_ASM ld a, [wcf91] @@ -452,11 +452,11 @@ Text_f5b17: ; f5b17 (3d:5b17) call Delay3 jp TextScriptEnd -Text_f5b28: ; f5b28 (3d:5b28) +Text_f5b28: TX_FAR _CanMoveBouldersText ; 2d:4193 db "@" -IsSurfingAllowed: ; f5b2d (3d:5b2d) +IsSurfingAllowed: ; Returns whether surfing is allowed in bit 1 of wd728. ; Surfing isn't allowed on the Cycling Road or in the lowest level of the ; Seafoam Islands before the current has been slowed with boulders. @@ -483,19 +483,19 @@ IsSurfingAllowed: ; f5b2d (3d:5b2d) ld hl, CyclingIsFunText jp PrintText -CoordsData_f5b64: ; f5b64 (3d:5b64) +CoordsData_f5b64: db 11, 07 db $ff -CurrentTooFastText: ; f5b67 (3d:5b67) +CurrentTooFastText: TX_FAR _CurrentTooFastText ; 2d:41ab db "@" -CyclingIsFunText: ; f5b6c (3d:5b6c) +CyclingIsFunText: TX_FAR _CyclingIsFunText ; 2d:41ca db "@" -AddItemToInventory_: ; f5b70 (3d:5b70) +AddItemToInventory_: ld a, [wItemQuantity] ; a = item quantity push af push bc @@ -589,7 +589,7 @@ AddItemToInventory_: ; f5b70 (3d:5b70) ; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [wWhichPokemon] = index (within the inventory) of the item to remove ; [wItemQuantity] = quantity to remove -RemoveItemFromInventory_: ; f5be1 (3d:5be1) +RemoveItemFromInventory_: push hl inc hl ld a, [wWhichPokemon] ; index (within the inventory) of the item being removed @@ -647,7 +647,7 @@ BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp" CircleTile: INCBIN "gfx/circle_tile.2bpp" BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp" -ReadSuperRodData: ; f5ea4 (3d:5ea4) +ReadSuperRodData: ld a, [wCurMap] ld c, a ld hl, FishingSlots @@ -667,7 +667,7 @@ ReadSuperRodData: ; f5ea4 (3d:5ea4) ld de, $0 ret -GenerateRandomFishingEncounter: ; f5ec1 (3d:5ec1) +GenerateRandomFishingEncounter: call Random cp $66 jr c, .asm_f5ed6 @@ -694,4 +694,4 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -INCLUDE "engine/predefs.asm"
\ No newline at end of file +INCLUDE "engine/predefs.asm" diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4f7cd2c8..bfbaa180 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1,53 +1,53 @@ ; Draws a "frame block". Frame blocks are blocks of tiles that are put ; together to form frames in battle animations. -DrawFrameBlock: ; 78000 (1e:4000) - ld l,c - ld h,b - ld a,[hli] - ld [wNumFBTiles],a - ld a,[wFBDestAddr + 1] - ld e,a - ld a,[wFBDestAddr] - ld d,a +DrawFrameBlock: + ld l, c + ld h, b + ld a, [hli] + ld [wNumFBTiles], a + ld a, [wFBDestAddr + 1] + ld e, a + ld a, [wFBDestAddr] + ld d, a xor a - ld [wFBTileCounter],a ; loop counter + ld [wFBTileCounter], a ; loop counter .loop - ld a,[wFBTileCounter] + ld a, [wFBTileCounter] inc a - ld [wFBTileCounter],a + ld [wFBTileCounter], a ld a, $2 ld [wdef5], a - ld a,[wSubAnimTransform] + ld a, [wSubAnimTransform] dec a - jr z,.flipHorizontalAndVertical ; 1 + jr z, .flipHorizontalAndVertical ; 1 dec a - jp z,.flipHorizontalTranslateDown ; 2 + jp z, .flipHorizontalTranslateDown ; 2 dec a - jr z,.flipBaseCoords ; 3 + jr z, .flipBaseCoords ; 3 .noTransformation - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] jr .finishCopying .flipBaseCoords - ld a,[wBaseCoordY] - ld b,a - ld a,136 + ld a, [wBaseCoordY] + ld b, a + ld a, 136 sub b ; flip Y base coordinate add [hl] ; Y offset - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] - ld b,a - ld a,168 + ld a, [wBaseCoordX] + ld b, a + ld a, 168 sub b ; flip X base coordinate .finishCopying ; finish copying values to OAM (when [wSubAnimTransform] not 1 or 2) add [hl] ; X offset - ld [de],a ; store X + ld [de], a ; store X cp 88 jr c, .asm_78056 ld a, [wdef5] @@ -56,32 +56,32 @@ DrawFrameBlock: ; 78000 (1e:4000) .asm_78056 inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add a, $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de - ld a,[hli] + ld a, [hli] ld b, a ld a, [wdef5] or b - ld [de],a ; store flags + ld [de], a ; store flags inc de jp .nextTile .flipHorizontalAndVertical - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] ; Y offset - ld b,a - ld a,136 + ld b, a + ld a, 136 sub b ; flip Y coordinate - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] add [hl] ; X offset - ld b,a - ld a,168 + ld b, a + ld a, 168 sub b ; flip X coordinate - ld [de],a ; store X + ld [de], a ; store X cp 88 jr c, .asm_78087 ld a, [wdef5] @@ -90,41 +90,41 @@ DrawFrameBlock: ; 78000 (1e:4000) .asm_78087 inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add a, $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de ; toggle horizontal and vertical flip - ld a,[hli] ; flags + ld a, [hli] ; flags and a - ld b,OAM_VFLIP | OAM_HFLIP - jr z,.storeFlags1 - cp a,OAM_HFLIP - ld b,OAM_VFLIP - jr z,.storeFlags1 - cp a,OAM_VFLIP - ld b,OAM_HFLIP - jr z,.storeFlags1 - ld b,0 + ld b, OAM_VFLIP | OAM_HFLIP + jr z, .storeFlags1 + cp a, OAM_HFLIP + ld b, OAM_VFLIP + jr z, .storeFlags1 + cp a, OAM_VFLIP + ld b, OAM_HFLIP + jr z, .storeFlags1 + ld b, 0 .storeFlags1 ld a, [wdef5] or b - ld [de],a + ld [de], a inc de jp .nextTile .flipHorizontalTranslateDown - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] - add a,40 ; translate Y coordinate downwards - ld [de],a ; store Y + add a, 40 ; translate Y coordinate downwards + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] add [hl] - ld b,a - ld a,168 + ld b, a + ld a, 168 sub b ; flip X coordinate - ld [de],a ; store X + ld [de], a ; store X cp 88 jr c, .asm_780c8 ld a, [wdef5] @@ -133,97 +133,97 @@ DrawFrameBlock: ; 78000 (1e:4000) .asm_780c8 inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add a, $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de - ld a,[hli] - bit 5,a ; is horizontal flip enabled? - jr nz,.disableHorizontalFlip + ld a, [hli] + bit 5, a ; is horizontal flip enabled? + jr nz, .disableHorizontalFlip .enableHorizontalFlip - set 5,a + set 5, a jr .storeFlags2 .disableHorizontalFlip - res 5,a + res 5, a .storeFlags2 ld b, a ld a, [wdef5] or b - ld [de],a + ld [de], a inc de .nextTile - ld a,[wFBTileCounter] - ld c,a - ld a,[wNumFBTiles] + ld a, [wFBTileCounter] + ld c, a + ld a, [wNumFBTiles] cp c - jp nz,.loop ; go back up if there are more tiles to draw + jp nz, .loop ; go back up if there are more tiles to draw .afterDrawingTiles - ld a,[wFBMode] - cp a,2 - jr z,.advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer - ld a,[wSubAnimFrameDelay] - ld c,a + ld a, [wFBMode] + cp a, 2 + jr z, .advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer + ld a, [wSubAnimFrameDelay] + ld c, a call DelayFrames - ld a,[wFBMode] - cp a,3 - jr z,.advanceFrameBlockDestAddr ; skip cleaning OAM buffer - cp a,4 - jr z,.done ; skip cleaning OAM buffer and don't advance the frame block destination address - ld a,[wAnimationID] - cp a,GROWL - jr z,.resetFrameBlockDestAddr + ld a, [wFBMode] + cp a, 3 + jr z, .advanceFrameBlockDestAddr ; skip cleaning OAM buffer + cp a, 4 + jr z, .done ; skip cleaning OAM buffer and don't advance the frame block destination address + ld a, [wAnimationID] + cp a, GROWL + jr z, .resetFrameBlockDestAddr call AnimationCleanOAM .resetFrameBlockDestAddr - ld hl,wOAMBuffer ; OAM buffer - ld a,l - ld [wFBDestAddr + 1],a - ld a,h - ld [wFBDestAddr],a ; set destination address to beginning of OAM buffer + ld hl, wOAMBuffer ; OAM buffer + ld a, l + ld [wFBDestAddr + 1], a + ld a, h + ld [wFBDestAddr], a ; set destination address to beginning of OAM buffer ret .advanceFrameBlockDestAddr - ld a,e - ld [wFBDestAddr + 1],a - ld a,d - ld [wFBDestAddr],a + ld a, e + ld [wFBDestAddr + 1], a + ld a, d + ld [wFBDestAddr], a .done ret -PlayAnimation: ; 78124 (1e:4124) +PlayAnimation: xor a - ld [$FF8B],a ; it looks like nothing reads this - ld [wSubAnimTransform],a - ld a,[wAnimationID] ; get animation number + ld [$FF8B], a ; it looks like nothing reads this + ld [wSubAnimTransform], a + ld a, [wAnimationID] ; get animation number dec a - ld l,a - ld h,0 - add hl,hl - ld de,AttackAnimationPointers ; animation command stream pointers - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a + ld l, a + ld h, 0 + add hl, hl + ld de, AttackAnimationPointers ; animation command stream pointers + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a .animationLoop - ld a,[hli] - cp a,$FF - jr z,.AnimationOver - cp a,$C0 ; is this subanimation or a special effect? - jr c,.playSubanimation + ld a, [hli] + cp a, $FF + jr z, .AnimationOver + cp a, $C0 ; is this subanimation or a special effect? + jr c, .playSubanimation .doSpecialEffect - ld c,a - ld de,SpecialEffectPointers + ld c, a + ld de, SpecialEffectPointers .searchSpecialEffectTableLoop - ld a,[de] + ld a, [de] cp c - jr z,.foundMatch + jr z, .foundMatch inc de inc de inc de jr .searchSpecialEffectTableLoop .foundMatch - ld a,[hli] - cp a,$FF ; is there a sound to play? - jr z,.skipPlayingSound - ld [wAnimSoundID],a ; store sound + ld a, [hli] + cp a, $FF ; is there a sound to play? + jr z, .skipPlayingSound + ld [wAnimSoundID], a ; store sound push hl push de call GetMoveSound @@ -233,51 +233,51 @@ PlayAnimation: ; 78124 (1e:4124) .skipPlayingSound push hl inc de - ld a,[de] - ld l,a + ld a, [de] + ld l, a inc de - ld a,[de] - ld h,a - ld de,.nextAnimationCommand + ld a, [de] + ld h, a + ld de, .nextAnimationCommand push de jp [hl] ; jump to special effect function .playSubanimation - ld c,a - and a,%00111111 - ld [wSubAnimFrameDelay],a + ld c, a + and a, %00111111 + ld [wSubAnimFrameDelay], a xor a sla c rla sla c rla - ld [wWhichBattleAnimTileset],a - ld a,[hli] ; sound - ld [wAnimSoundID],a ; store sound - ld a,[hli] ; subanimation ID - ld c,l - ld b,h - ld l,a - ld h,0 - add hl,hl - ld de,SubanimationPointers - add hl,de - ld a,l - ld [wSubAnimAddrPtr],a - ld a,h - ld [wSubAnimAddrPtr + 1],a - ld l,c - ld h,b + ld [wWhichBattleAnimTileset], a + ld a, [hli] ; sound + ld [wAnimSoundID], a ; store sound + ld a, [hli] ; subanimation ID + ld c, l + ld b, h + ld l, a + ld h, 0 + add hl, hl + ld de, SubanimationPointers + add hl, de + ld a, l + ld [wSubAnimAddrPtr], a + ld a, h + ld [wSubAnimAddrPtr + 1], a + ld l, c + ld h, b push hl - ld a,[rOBP0] + ld a, [rOBP0] push af - ld a,[wAnimPalette] - ld [rOBP0],a + ld a, [wAnimPalette] + ld [rOBP0], a call UpdateGBCPal_OBP0 call LoadAnimationTileset call LoadSubanimation call PlaySubanimation pop af - ld [rOBP0],a + ld [rOBP0], a call UpdateGBCPal_OBP0 .nextAnimationCommand pop hl @@ -285,23 +285,23 @@ PlayAnimation: ; 78124 (1e:4124) .AnimationOver ; 417B ret -LoadSubanimation: ; 781b5 (1e:41b5) - ld a,[wSubAnimAddrPtr + 1] - ld h,a - ld a,[wSubAnimAddrPtr] - ld l,a - ld a,[hli] - ld e,a - ld a,[hl] - ld d,a ; de = address of subanimation - ld a,[de] - ld b,a - and a,31 - ld [wSubAnimCounter],a ; number of frame blocks - ld a,b - and a,%11100000 - cp a,5 << 5 ; is subanimation type 5? - jr nz,.isNotType5 +LoadSubanimation: + ld a, [wSubAnimAddrPtr + 1] + ld h, a + ld a, [wSubAnimAddrPtr] + ld l, a + ld a, [hli] + ld e, a + ld a, [hl] + ld d, a ; de = address of subanimation + ld a, [de] + ld b, a + and a, 31 + ld [wSubAnimCounter], a ; number of frame blocks + ld a, b + and a, %11100000 + cp a, 5 << 5 ; is subanimation type 5? + jr nz, .isNotType5 .isType5 call GetSubanimationTransform2 jr .saveTransformation @@ -311,35 +311,35 @@ LoadSubanimation: ; 781b5 (1e:41b5) ; place the upper 3 bits of a into bits 0-2 of a before storing srl a swap a - ld [wSubAnimTransform],a - cp a,4 ; is the animation reversed? - ld hl,0 - jr nz,.storeSubentryAddr + ld [wSubAnimTransform], a + cp a, 4 ; is the animation reversed? + ld hl, 0 + jr nz, .storeSubentryAddr ; if the animation is reversed, then place the initial subentry address at the end of the list of subentries - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - ld bc,3 + ld bc, 3 .loop - add hl,bc + add hl, bc dec a - jr nz,.loop + jr nz, .loop .storeSubentryAddr inc de - add hl,de - ld a,l - ld [wSubAnimSubEntryAddr],a - ld a,h - ld [wSubAnimSubEntryAddr + 1],a + add hl, de + ld a, l + ld [wSubAnimSubEntryAddr], a + ld a, h + ld [wSubAnimSubEntryAddr + 1], a ret ; called if the subanimation type is not 5 ; sets the transform to 0 (i.e. no transform) if it's the player's turn ; sets the transform to the subanimation type if it's the enemy's turn -GetSubanimationTransform1: ; 781fb (1e:41fb) - ld b,a - ld a,[H_WHOSETURN] +GetSubanimationTransform1: + ld b, a + ld a, [H_WHOSETURN] and a - ld a,b + ld a, b ret nz xor a ret @@ -347,36 +347,36 @@ GetSubanimationTransform1: ; 781fb (1e:41fb) ; called if the subanimation type is 5 ; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn ; sets the transform to 0 (i.e. no transform) if it's the enemy's turn -GetSubanimationTransform2: ; 78203 (1e:4203) - ld a,[H_WHOSETURN] +GetSubanimationTransform2: + ld a, [H_WHOSETURN] and a - ld a,2 << 5 + ld a, 2 << 5 ret z xor a ret ; loads tile patterns for battle animations -LoadAnimationTileset: ; 7820b (1e:420b) - ld a,[wWhichBattleAnimTileset] +LoadAnimationTileset: + ld a, [wWhichBattleAnimTileset] add a add a - ld hl,AnimationTilesetPointers - ld e,a - ld d,0 - add hl,de - ld a,[hli] - ld [wTempTilesetNumTiles],a ; number of tiles - ld a,[hli] - ld e,a - ld a,[hl] - ld d,a ; de = address of tileset - ld hl,vSprites + $310 + ld hl, AnimationTilesetPointers + ld e, a + ld d, 0 + add hl, de + ld a, [hli] + ld [wTempTilesetNumTiles], a ; number of tiles + ld a, [hli] + ld e, a + ld a, [hl] + ld d, a ; de = address of tileset + ld hl, vSprites + $310 ld b, BANK(AnimationTileset1) ; ROM bank - ld a,[wTempTilesetNumTiles] - ld c,a ; number of tiles + ld a, [wTempTilesetNumTiles] + ld c, a ; number of tiles jp CopyVideoData ; load tileset -AnimationTilesetPointers: ; 7822b (1e:422b) +AnimationTilesetPointers: db 79 ; number of tiles dw AnimationTileset1 db $FF @@ -389,28 +389,28 @@ AnimationTilesetPointers: ; 7822b (1e:422b) dw AnimationTileset1 db $FF -AnimationTileset1: ; 78237 (1e:4237) +AnimationTileset1: INCBIN "gfx/attack_anim_1.2bpp" -AnimationTileset2: ; 78757 (1e:4757) +AnimationTileset2: INCBIN "gfx/attack_anim_2.2bpp" -SlotMachineTiles2: ; 78bde (1e:4c17) +SlotMachineTiles2: INCBIN "gfx/slotmachine2.2bpp" -MoveAnimation: ; 78d97 (1e:4d97) +MoveAnimation: push hl push de push bc push af call WaitForSoundToFinish call SetAnimationPalette - ld a,[wAnimationID] + ld a, [wAnimationID] and a jr z, .animationFinished ; if throwing a Poké Ball, skip the regular animation code - cp a,TOSS_ANIM + cp a, TOSS_ANIM jr nz, .moveAnimation ld de, .animationFinished push de @@ -418,72 +418,72 @@ MoveAnimation: ; 78d97 (1e:4d97) .moveAnimation ; check if battle animations are disabled in the options - ld a,[wOptions] - bit 7,a + ld a, [wOptions] + bit 7, a jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation jr .next4 .animationsDisabled - ld c,30 + ld c, 30 call DelayFrames .next4 call PlayApplyingAttackAnimation ; shake the screen or flash the pic in and out (to show damage) .animationFinished call WaitForSoundToFinish xor a - ld [wSubAnimSubEntryAddr],a - ld [wUnusedD09B],a - ld [wSubAnimTransform],a + ld [wSubAnimSubEntryAddr], a + ld [wUnusedD09B], a + ld [wSubAnimTransform], a dec a - ld [wAnimSoundID],a + ld [wAnimSoundID], a pop af pop bc pop de pop hl ret -ShareMoveAnimations: ; 78ddf (1e:4ddf) +ShareMoveAnimations: ; some moves just reuse animations from status conditions - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a ret z ; opponent’s turn - ld a,[wAnimationID] + ld a, [wAnimationID] - cp a,AMNESIA - ld b,CONF_ANIM + cp a, AMNESIA + ld b, CONF_ANIM jr z, .replaceAnim - cp a,REST - ld b,SLP_ANIM + cp a, REST + ld b, SLP_ANIM ret nz .replaceAnim - ld a,b - ld [wAnimationID],a + ld a, b + ld [wAnimationID], a ret -PlayApplyingAttackAnimation: ; 78df6 (1e:4df6) +PlayApplyingAttackAnimation: ; Generic animation that shows after the move's individual animation ; Different animation depending on whether the move has an additional effect and on whose turn it is - ld a,[wAnimationType] + ld a, [wAnimationType] and a ret z dec a add a - ld c,a - ld b,0 - ld hl,AnimationTypePointerTable - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a + ld c, a + ld b, 0 + ld hl, AnimationTypePointerTable + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a jp [hl] -AnimationTypePointerTable: ; 78e08 (1e:4e08) +AnimationTypePointerTable: dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect dw ShakeScreenHorizontallyHeavy ; enemy mon has used a damaging move with a side effect dw ShakeScreenHorizontallySlow ; enemy mon has used a non-damaging move @@ -491,33 +491,33 @@ AnimationTypePointerTable: ; 78e08 (1e:4e08) dw ShakeScreenHorizontallyLight ; player mon has used a damaging move with a side effect dw ShakeScreenHorizontallySlow2 ; player mon has used a non-damaging move -ShakeScreenVertically: ; 78e14 (1e:4e14) +ShakeScreenVertically: call PlayApplyingAttackSound ld b, 8 jp AnimationShakeScreenVertically -ShakeScreenHorizontallyHeavy: ; 78e1c (1e:4e1c) +ShakeScreenHorizontallyHeavy: call PlayApplyingAttackSound ld b, 8 jp AnimationShakeScreenHorizontallyFast -ShakeScreenHorizontallySlow: ; 78e24 (1e:4e24) +ShakeScreenHorizontallySlow: lb bc, 6, 2 jr AnimationShakeScreenHorizontallySlow -BlinkEnemyMonSprite: ; 78e29 (1e:4e29) +BlinkEnemyMonSprite: call PlayApplyingAttackSound jp AnimationBlinkEnemyMon -ShakeScreenHorizontallyLight: ; 78e2f (1e:4e2f) +ShakeScreenHorizontallyLight: call PlayApplyingAttackSound ld b, 2 jp AnimationShakeScreenHorizontallyFast -ShakeScreenHorizontallySlow2: ; 78e37 (1e:4e37) +ShakeScreenHorizontallySlow2: lb bc, 3, 2 -AnimationShakeScreenHorizontallySlow: ; 78e3a (1e:4e3a) +AnimationShakeScreenHorizontallySlow: push bc push bc .loop1 @@ -542,7 +542,7 @@ AnimationShakeScreenHorizontallySlow: ; 78e3a (1e:4e3a) jr nz, AnimationShakeScreenHorizontallySlow ret -SetAnimationPalette: ; 78e5c (1e:4e5c) +SetAnimationPalette: ld a, [wOnSGB] and a ld a, $e4 @@ -574,7 +574,7 @@ SetAnimationPalette: ; 78e5c (1e:4e5c) call UpdateGBCPal_OBP1 ret -Func_78e98: ; 78e98 (1e:4e98) +Func_78e98: call SaveScreenTilesToBuffer2 xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -587,80 +587,80 @@ Func_78e98: ; 78e98 (1e:4e98) call LoadScreenTilesFromBuffer2 ld h, vBGMap1 / $100 -WriteLowerByteOfBGMapAndEnableBGTransfer: ; 78eb1 (1e:4eb1) +WriteLowerByteOfBGMapAndEnableBGTransfer: ld l, vBGMap0 & $ff call BattleAnimCopyTileMapToVRAM ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ret -PlaySubanimation: ; 78ebb (1e:4ebb) - ld a,[wAnimSoundID] - cp a,$FF - jr z,.skipPlayingSound +PlaySubanimation: + ld a, [wAnimSoundID] + cp a, $FF + jr z, .skipPlayingSound call GetMoveSound call PlaySound .skipPlayingSound - ld hl,wOAMBuffer ; base address of OAM buffer - ld a,l - ld [wFBDestAddr + 1],a - ld a,h - ld [wFBDestAddr],a - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld a,[wSubAnimSubEntryAddr] - ld l,a + ld hl, wOAMBuffer ; base address of OAM buffer + ld a, l + ld [wFBDestAddr + 1], a + ld a, h + ld [wFBDestAddr], a + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld a, [wSubAnimSubEntryAddr] + ld l, a .loop push hl - ld c,[hl] ; frame block ID - ld b,0 - ld hl,FrameBlockPointers - add hl,bc - add hl,bc - ld a,[hli] - ld c,a - ld a,[hli] - ld b,a + ld c, [hl] ; frame block ID + ld b, 0 + ld hl, FrameBlockPointers + add hl, bc + add hl, bc + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a pop hl inc hl push hl - ld e,[hl] ; base coordinate ID - ld d,0 - ld hl,FrameBlockBaseCoords ; base coordinate table - add hl,de - add hl,de - ld a,[hli] - ld [wBaseCoordY],a - ld a,[hl] - ld [wBaseCoordX],a + ld e, [hl] ; base coordinate ID + ld d, 0 + ld hl, FrameBlockBaseCoords ; base coordinate table + add hl, de + add hl, de + ld a, [hli] + ld [wBaseCoordY], a + ld a, [hl] + ld [wBaseCoordX], a pop hl inc hl - ld a,[hl] ; frame block mode - ld [wFBMode],a + ld a, [hl] ; frame block mode + ld [wFBMode], a call DrawFrameBlock call DoSpecialEffectByAnimationId ; run animation-specific function (if there is one) - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - ld [wSubAnimCounter],a + ld [wSubAnimCounter], a ret z - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld a,[wSubAnimSubEntryAddr] - ld l,a - ld a,[wSubAnimTransform] - cp a,4 ; is the animation reversed? - ld bc,3 - jr nz,.nextSubanimationSubentry - ld bc,-3 + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld a, [wSubAnimSubEntryAddr] + ld l, a + ld a, [wSubAnimTransform] + cp a, 4 ; is the animation reversed? + ld bc, 3 + jr nz, .nextSubanimationSubentry + ld bc, -3 .nextSubanimationSubentry - add hl,bc - ld a,h - ld [wSubAnimSubEntryAddr + 1],a - ld a,l - ld [wSubAnimSubEntryAddr],a + add hl, bc + ld a, h + ld [wSubAnimSubEntryAddr + 1], a + ld a, l + ld [wSubAnimSubEntryAddr], a jp .loop -AnimationCleanOAM: ; 78f30 (1e:4f30) +AnimationCleanOAM: push hl push de push bc @@ -675,20 +675,20 @@ AnimationCleanOAM: ; 78f30 (1e:4f30) ; this runs after each frame block is drawn in a subanimation ; it runs a particular special effect based on the animation ID -DoSpecialEffectByAnimationId: ; 78f3f (1e:4f3f) +DoSpecialEffectByAnimationId: push hl push de push bc - ld a,[wAnimationID] - ld hl,AnimationIdSpecialEffects - ld de,3 + ld a, [wAnimationID] + ld hl, AnimationIdSpecialEffects + ld de, 3 call IsInArray - jr nc,.done + jr nc, .done inc hl - ld a,[hli] - ld h,[hl] - ld l,a - ld de,.done + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .done push de jp [hl] .done @@ -698,7 +698,7 @@ DoSpecialEffectByAnimationId: ; 78f3f (1e:4f3f) ret ; Format: Animation ID (1 byte), Address (2 bytes) -AnimationIdSpecialEffects: ; 78f5d (1e:4f5d) +AnimationIdSpecialEffects: db MEGA_PUNCH dw AnimationFlashScreen @@ -773,40 +773,40 @@ AnimationIdSpecialEffects: ; 78f5d (1e:4f5d) db $FF ; terminator -DoBallTossSpecialEffects: ; 78fa6 (1e:4fa6) - ld a,[wcf91] - cp a,3 ; is it a Master Ball or Ultra Ball? - jr nc,.skipFlashingEffect +DoBallTossSpecialEffects: + ld a, [wcf91] + cp a, 3 ; is it a Master Ball or Ultra Ball? + jr nc, .skipFlashingEffect .flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball - ld a,[rOBP0] - xor a,%00111100 ; complement colors 1 and 2 - ld [rOBP0],a + ld a, [rOBP0] + xor a, %00111100 ; complement colors 1 and 2 + ld [rOBP0], a call UpdateGBCPal_OBP0 .skipFlashingEffect - ld a,[wSubAnimCounter] - cp a,11 ; is it the beginning of the subanimation? - jr nz,.skipPlayingSound + ld a, [wSubAnimCounter] + cp a, 11 ; is it the beginning of the subanimation? + jr nz, .skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,SFX_BALL_TOSS + ld a, SFX_BALL_TOSS call PlaySound .skipPlayingSound - ld a,[wIsInBattle] - cp a,02 ; is it a trainer battle? - jr z,.isTrainerBattle - ld a,[wd11e] - cp a,$10 ; is the enemy pokemon the Ghost Marowak? + ld a, [wIsInBattle] + cp a, 02 ; is it a trainer battle? + jr z, .isTrainerBattle + ld a, [wd11e] + cp a, $10 ; is the enemy pokemon the Ghost Marowak? ret nz ; if the enemy pokemon is the Ghost Marowak, make it dodge during the last 3 frames - ld a,[wSubAnimCounter] - cp a,3 - jr z,.moveGhostMarowakLeft - cp a,2 - jr z,.moveGhostMarowakLeft - cp a,1 + ld a, [wSubAnimCounter] + cp a, 3 + jr z, .moveGhostMarowakLeft + cp a, 2 + jr z, .moveGhostMarowakLeft + cp a, 1 ret nz .moveGhostMarowakLeft coord hl, 17, 0 - ld de,20 + ld de, 20 lb bc, 7, 7 .loop push hl @@ -814,152 +814,152 @@ DoBallTossSpecialEffects: ; 78fa6 (1e:4fa6) call AnimCopyRowRight ; move row of tiles left pop bc pop hl - add hl,de + add hl, de dec b - jr nz,.loop - ld a,%00001000 - ld [rNR10],a ; Channel 1 sweep register + jr nz, .loop + ld a, %00001000 + ld [rNR10], a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame - ld a,[wSubAnimCounter] - cp a,3 + ld a, [wSubAnimCounter] + cp a, 3 ret nz dec a - ld [wSubAnimCounter],a + ld [wSubAnimCounter], a ret -DoBallShakeSpecialEffects: ; 79001 (1e:5001) - ld a,[wSubAnimCounter] - cp a,4 ; is it the beginning of a shake? - jr nz,.skipPlayingSound +DoBallShakeSpecialEffects: + ld a, [wSubAnimCounter] + cp a, 4 ; is it the beginning of a shake? + jr nz, .skipPlayingSound ; if it is the beginning of a shake, play a sound and wait 2/3 of a second - ld a,SFX_TINK + ld a, SFX_TINK call PlaySound - ld c,40 + ld c, 40 call DelayFrames .skipPlayingSound - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a ret nz ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation - ld a,[wNumShakes] ; number of shakes + ld a, [wNumShakes] ; number of shakes dec a ; decrement number of shakes - ld [wNumShakes],a + ld [wNumShakes], a ret z ; if there are shakes left, restart the subanimation - ld a,[wSubAnimSubEntryAddr] - ld l,a - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld de,-(4 * 3) ; 4 subentries and 3 bytes per subentry - add hl,de - ld a,l - ld [wSubAnimSubEntryAddr],a - ld a,h - ld [wSubAnimSubEntryAddr + 1],a - ld a,5 ; number of subentries in the ball shaking subanimation plus one - ld [wSubAnimCounter],a + ld a, [wSubAnimSubEntryAddr] + ld l, a + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld de, -(4 * 3) ; 4 subentries and 3 bytes per subentry + add hl, de + ld a, l + ld [wSubAnimSubEntryAddr], a + ld a, h + ld [wSubAnimSubEntryAddr + 1], a + ld a, 5 ; number of subentries in the ball shaking subanimation plus one + ld [wSubAnimCounter], a ret ; plays a sound after the second frame of the poof animation -DoPoofSpecialEffects: ; 79039 (1e:5039) - ld a,[wSubAnimCounter] - cp a,5 +DoPoofSpecialEffects: + ld a, [wSubAnimCounter] + cp a, 5 ret nz - ld a,SFX_BALL_POOF + ld a, SFX_BALL_POOF jp PlaySound -DoRockSlideSpecialEffects: ; 79044 (1e:5044) - ld a,[wSubAnimCounter] - cp a,12 +DoRockSlideSpecialEffects: + ld a, [wSubAnimCounter] + cp a, 12 ret nc - cp a,8 - jr nc,.shakeScreen - cp a,1 - jp z,AnimationFlashScreen ; if it's the end of the subanimation, flash the screen + cp a, 8 + jr nc, .shakeScreen + cp a, 1 + jp z, AnimationFlashScreen ; if it's the end of the subanimation, flash the screen ret ; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen - ld b,1 + ld b, 1 predef PredefShakeScreenHorizontally ; shake horizontally - ld b,1 + ld b, 1 predef_jump PredefShakeScreenVertically ; shake vertically -FlashScreenEveryEightFrameBlocks: ; 79062 (1e:5062) - ld a,[wSubAnimCounter] - and a,7 ; is the subanimation counter exactly 8? - call z,AnimationFlashScreen ; if so, flash the screen +FlashScreenEveryEightFrameBlocks: + ld a, [wSubAnimCounter] + and a, 7 ; is the subanimation counter exactly 8? + call z, AnimationFlashScreen ; if so, flash the screen ret ; flashes the screen if the subanimation counter is divisible by 4 -FlashScreenEveryFourFrameBlocks: ; 7906b (1e:506b) - ld a,[wSubAnimCounter] - and a,3 - call z,AnimationFlashScreen +FlashScreenEveryFourFrameBlocks: + ld a, [wSubAnimCounter] + and a, 3 + call z, AnimationFlashScreen ret ; used for Explosion and Selfdestruct -DoExplodeSpecialEffects: ; 79074 (1e:5074) - ld a,[wSubAnimCounter] - cp a,1 ; is it the end of the subanimation? - jr nz,FlashScreenEveryFourFrameBlocks +DoExplodeSpecialEffects: + ld a, [wSubAnimCounter] + cp a, 1 ; is it the end of the subanimation? + jr nz, FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear coord hl, 1, 5 jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 -DoBlizzardSpecialEffects: ; 79081 (1e:5081) - ld a,[wSubAnimCounter] - cp a,13 - jp z,AnimationFlashScreen - cp a,9 - jp z,AnimationFlashScreen - cp a,5 - jp z,AnimationFlashScreen - cp a,1 - jp z,AnimationFlashScreen +DoBlizzardSpecialEffects: + ld a, [wSubAnimCounter] + cp a, 13 + jp z, AnimationFlashScreen + cp a, 9 + jp z, AnimationFlashScreen + cp a, 5 + jp z, AnimationFlashScreen + cp a, 1 + jp z, AnimationFlashScreen ret ; flashes the screen at 3 points in the subanimation ; unused -FlashScreenUnused: ; 79099 (1e:5099) - ld a,[wSubAnimCounter] - cp a,14 - jp z,AnimationFlashScreen - cp a,9 - jp z,AnimationFlashScreen - cp a,2 - jp z,AnimationFlashScreen +FlashScreenUnused: + ld a, [wSubAnimCounter] + cp a, 14 + jp z, AnimationFlashScreen + cp a, 9 + jp z, AnimationFlashScreen + cp a, 2 + jp z, AnimationFlashScreen ret ; function to make the pokemon disappear at the beginning of the animation -TradeHidePokemon: ; 790ac (1e:50ac) - ld a,[wSubAnimCounter] - cp a,6 +TradeHidePokemon: + ld a, [wSubAnimCounter] + cp a, 6 ret nz - ld a,2 * SCREEN_WIDTH + 7 + ld a, 2 * SCREEN_WIDTH + 7 jp ClearMonPicFromTileMap ; make pokemon disappear ; function to make a shaking pokeball jump up at the end of the animation -TradeShakePokeball: ; 790b7 (1e:50b7) - ld a,[wSubAnimCounter] - cp a,1 +TradeShakePokeball: + ld a, [wSubAnimCounter] + cp a, 1 ret nz ; if it's the end of the animation, make the ball jump up - ld de,BallMoveDistances1 + ld de, BallMoveDistances1 .loop - ld hl,wOAMBuffer ; OAM buffer - ld bc,4 + ld hl, wOAMBuffer ; OAM buffer + ld bc, 4 .innerLoop - ld a,[de] - cp a,$ff - jr z,.done + ld a, [de] + cp a, $ff + jr z, .done add [hl] ; add to Y value of OAM entry - ld [hl],a - add hl,bc - ld a,l - cp a,4 * 4 ; there are 4 entries, each 4 bytes - jr nz,.innerLoop + ld [hl], a + add hl, bc + ld a, l + cp a, 4 * 4 ; there are 4 entries, each 4 bytes + jr nz, .innerLoop inc de push bc call Delay3 @@ -967,74 +967,75 @@ TradeShakePokeball: ; 790b7 (1e:50b7) jr .loop .done call AnimationCleanOAM - ld a,SFX_TRADE_MACHINE + ld a, SFX_TRADE_MACHINE jp PlaySound -BallMoveDistances1: ; 790e3 (1e:50e3) - db -12,-12,-8 +BallMoveDistances1: + db -12, -12, -8 db $ff ; terminator ; function to make the pokeball jump up -TradeJumpPokeball: ; 790e7 (1e:50e7) - ld de,BallMoveDistances2 +TradeJumpPokeball: + ld de, BallMoveDistances2 .loop - ld hl,wOAMBuffer ; OAM buffer - ld bc,4 + ld hl, wOAMBuffer ; OAM buffer + ld bc, 4 .innerLoop - ld a,[de] - cp a,$ff - jp z,ClearScreen + ld a, [de] + cp a, $ff + jp z, ClearScreen add [hl] - ld [hl],a - add hl,bc - ld a,l - cp a,4 * 4 ; there are 4 entries, each 4 bytes - jr nz,.innerLoop + ld [hl], a + add hl, bc + ld a, l + cp a, 4 * 4 ; there are 4 entries, each 4 bytes + jr nz, .innerLoop inc de push de - ld a,[de] - cp a,12 - jr z,.playSound - cp a,$ff - jr nz,.skipPlayingSound + ld a, [de] + cp a, 12 + jr z, .playSound + cp a, $ff + jr nz, .skipPlayingSound .playSound ; play sound if next move distance is 12 or this is the last one - ld a,SFX_BATTLE_18 + ld a, SFX_BATTLE_18 call PlaySound .skipPlayingSound push bc - ld c,5 + ld c, 5 call DelayFrames pop bc - ld a,[hSCX] ; background scroll X - sub a,8 ; scroll to the left - ld [hSCX],a + ld a, [hSCX] ; background scroll X + sub a, 8 ; scroll to the left + ld [hSCX], a pop de jr .loop -BallMoveDistances2: ; 7911f (1e:511f) - db 11,12,-12,-7,7,12,-8,8 +BallMoveDistances2: + db 11, 12, -12, -7, 7, 12, -8, 8 db $ff ; terminator ; this function copies the current musical note graphic ; so that there are two musical notes flying towards the defending pokemon -DoGrowlSpecialEffects: ; 79127 (1e:5127) - ld hl,wOAMBuffer ; OAM buffer - ld de,wOAMBuffer + $10 - ld bc,$10 +DoGrowlSpecialEffects: + ld hl, wOAMBuffer ; OAM buffer + ld de, wOAMBuffer + $10 + ld bc, $10 call CopyData ; copy the musical note graphic - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - call z,AnimationCleanOAM ; clean up at the end of the subanimation + call z, AnimationCleanOAM ; clean up at the end of the subanimation ret ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations -TailWhipAnimationUnused: ; 7913b (1e:513b) - ld a,1 - ld [wSubAnimCounter],a - ld c,20 +TailWhipAnimationUnused: + ld a, 1 + ld [wSubAnimCounter], a + ld c, 20 jp DelayFrames -SpecialEffectPointers: ; 79145 (1e:5145) +; Format: Special Effect ID (1 byte), Address (2 bytes) +SpecialEffectPointers: db SE_DARK_SCREEN_FLASH ; $FE dw AnimationFlashScreen db SE_DARK_SCREEN_PALETTE ; $FD @@ -1115,54 +1116,54 @@ SpecialEffectPointers: ; 79145 (1e:5145) dw AnimationWavyScreen db $FF -AnimationDelay10: ; 791bb (1e:51bb) - ld c,10 +AnimationDelay10: + ld c, 10 jp DelayFrames ; calls a function with the turn flipped from player to enemy or vice versa ; input - hl - address of function to call -CallWithTurnFlipped: ; 791c0 (1e:51c0) - ld a,[H_WHOSETURN] +CallWithTurnFlipped: + ld a, [H_WHOSETURN] push af - xor a,1 - ld [H_WHOSETURN],a - ld de,.returnAddress + xor a, 1 + ld [H_WHOSETURN], a + ld de, .returnAddress push de jp [hl] .returnAddress pop af - ld [H_WHOSETURN],a + ld [H_WHOSETURN], a ret ; flashes the screen for an extended period (48 frames) -AnimationFlashScreenLong: ; 791d0 (1e:51d0) - ld a,3 ; cycle through the palettes 3 times - ld [wFlashScreenLongCounter],a - ld a,[wOnSGB] ; running on SGB? +AnimationFlashScreenLong: + ld a, 3 ; cycle through the palettes 3 times + ld [wFlashScreenLongCounter], a + ld a, [wOnSGB] ; running on SGB? and a - ld hl,FlashScreenLongMonochrome - jr z,.loop - ld hl,FlashScreenLongSGB + ld hl, FlashScreenLongMonochrome + jr z, .loop + ld hl, FlashScreenLongSGB .loop push hl .innerLoop - ld a,[hli] - cp a,$01 ; is it the end of the palettes? - jr z,.endOfPalettes - ld [rBGP],a + ld a, [hli] + cp a, $01 ; is it the end of the palettes? + jr z, .endOfPalettes + ld [rBGP], a call UpdateGBCPal_BGP call FlashScreenLongDelay jr .innerLoop .endOfPalettes - ld a,[wFlashScreenLongCounter] + ld a, [wFlashScreenLongCounter] dec a - ld [wFlashScreenLongCounter],a + ld [wFlashScreenLongCounter], a pop hl - jr nz,.loop + jr nz, .loop ret ; BG palettes -FlashScreenLongMonochrome: ; 791fc (1e:51fc) +FlashScreenLongMonochrome: db %11111001 ; 3, 3, 2, 1 db %11111110 ; 3, 3, 3, 2 db %11111111 ; 3, 3, 3, 3 @@ -1178,7 +1179,7 @@ FlashScreenLongMonochrome: ; 791fc (1e:51fc) db $01 ; terminator ; BG palettes -FlashScreenLongSGB: ; 79209 (1e:5209) +FlashScreenLongSGB: db %11111000 ; 3, 3, 2, 0 db %11111100 ; 3, 3, 3, 0 db %11111111 ; 3, 3, 3, 3 @@ -1195,73 +1196,73 @@ FlashScreenLongSGB: ; 79209 (1e:5209) ; causes a delay of 2 frames for the first cycle ; causes a delay of 1 frame for the second and third cycles -FlashScreenLongDelay: ; 79216 (1e:5216) - ld a,[wFlashScreenLongCounter] - cp a,4 ; never true since [wFlashScreenLongCounter] starts at 3 - ld c,4 - jr z,.delayFrames - cp a,3 - ld c,2 - jr z,.delayFrames - cp a,2 ; nothing is done with this - ld c,1 +FlashScreenLongDelay: + ld a, [wFlashScreenLongCounter] + cp a, 4 ; never true since [wFlashScreenLongCounter] starts at 3 + ld c, 4 + jr z, .delayFrames + cp a, 3 + ld c, 2 + jr z, .delayFrames + cp a, 2 ; nothing is done with this + ld c, 1 .delayFrames jp DelayFrames -AnimationFlashScreen: ; 7922c (1e:522c) - ld a,[rBGP] +AnimationFlashScreen: + ld a, [rBGP] push af ; save initial palette - ld a,%00011011 ; 0, 1, 2, 3 (inverted colors) - ld [rBGP],a + ld a, %00011011 ; 0, 1, 2, 3 (inverted colors) + ld [rBGP], a call UpdateGBCPal_BGP - ld c,2 + ld c, 2 call DelayFrames xor a ; white out background - ld [rBGP],a + ld [rBGP], a call UpdateGBCPal_BGP - ld c,2 + ld c, 2 call DelayFrames pop af - ld [rBGP],a ; restore initial palette + ld [rBGP], a ; restore initial palette call UpdateGBCPal_BGP ret -AnimationDarkScreenPalette: ; 7924d (1e:524d) +AnimationDarkScreenPalette: ; Changes the screen's palette to a dark palette. lb bc, $6f, $6f jr SetAnimationBGPalette -AnimationDarkenMonPalette: ; 79252 (1e:5252) +AnimationDarkenMonPalette: ; Darkens the mon sprite's palette. lb bc, $f9, $f4 jr SetAnimationBGPalette -AnimationUnusedPalette1: ; 79257 (1e:5257) +AnimationUnusedPalette1: lb bc, $fe, $f8 jr SetAnimationBGPalette -AnimationUnusedPalette2: ; 7925c (1e:525c) +AnimationUnusedPalette2: lb bc, $ff, $ff jr SetAnimationBGPalette -AnimationResetScreenPalette: ; 79261 (1e:5261) +AnimationResetScreenPalette: ; Restores the screen's palette to the normal palette. lb bc, $e4, $e4 jr SetAnimationBGPalette -AnimationUnusedPalette3: ; 79266 (1e:5266) +AnimationUnusedPalette3: lb bc, $00, $00 jr SetAnimationBGPalette -AnimationLightScreenPalette: ; 7926b (1e:526b) +AnimationLightScreenPalette: ; Changes the screen to use a palette with light colors. lb bc, $90, $90 jr SetAnimationBGPalette -AnimationUnusedPalette4: ; 79270 (1e:5270) +AnimationUnusedPalette4: lb bc, $40, $40 -SetAnimationBGPalette: ; 79273 (1e:5273) +SetAnimationBGPalette: ld a, [wOnSGB] and a ld a, b @@ -1274,17 +1275,17 @@ SetAnimationBGPalette: ; 79273 (1e:5273) ld b, $5 -AnimationShakeScreenVertically: ; 79283 (1e:5283) +AnimationShakeScreenVertically: predef_jump PredefShakeScreenVertically -AnimationShakeScreen: ; 79288 (1e:5288) +AnimationShakeScreen: ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations. ld b, $8 -AnimationShakeScreenHorizontallyFast: ; 7928a (1e:528a) +AnimationShakeScreenHorizontallyFast: predef_jump PredefShakeScreenHorizontally -AnimationWaterDropletsEverywhere: ; 7928f (1e:528f) +AnimationWaterDropletsEverywhere: ; Draws water droplets all over the screen and makes them ; scroll. It's hard to describe, but it's the main animation ; in Surf/Mist/Toxic. @@ -1311,7 +1312,7 @@ AnimationWaterDropletsEverywhere: ; 7928f (1e:528f) jr nz, .loop ret -_AnimationWaterDroplets: ; 792c0 (1e:52c0) +_AnimationWaterDroplets: ld hl, wOAMBuffer .loop ld a, $1 @@ -1352,7 +1353,7 @@ _AnimationWaterDroplets: ; 792c0 (1e:52c0) call AnimationCleanOAM jp DelayFrame -AnimationSlideMonUp: ; 79314 (1e:5314) +AnimationSlideMonUp: ; Slides the mon's sprite upwards. ld c, 7 ld a, [H_WHOSETURN] @@ -1368,7 +1369,7 @@ AnimationSlideMonUp: ; 79314 (1e:5314) ld [wSlideMonUpBottomRowLeftTile], a jp _AnimationSlideMonUp -AnimationSlideMonDown: ; 79331 (1e:5331) +AnimationSlideMonDown: ; Slides the mon's sprite down out of the screen. xor a call GetTileIDList @@ -1385,19 +1386,19 @@ AnimationSlideMonDown: ; 79331 (1e:5331) jr nz, .loop ret -AnimationSlideMonOff: ; 79349 (1e:5349) +AnimationSlideMonOff: ; Slides the mon's sprite off the screen horizontally. ld e, 8 ld a, 3 ld [wSlideMonDelay], a jp _AnimationSlideMonOff -AnimationSlideEnemyMonOff: ; 79353 (1e:5353) +AnimationSlideEnemyMonOff: ; Slides the enemy mon off the screen horizontally. ld hl, AnimationSlideMonOff jp CallWithTurnFlipped -_AnimationSlideMonUp: ; 79359 (1e:5359) +_AnimationSlideMonUp: push de push hl push bc @@ -1448,7 +1449,7 @@ _AnimationSlideMonUp: ; 79359 (1e:5359) jr nz, _AnimationSlideMonUp ret -ShakeEnemyHUD_WritePlayerMonPicOAM: ; 79397 (1e:5397) +ShakeEnemyHUD_WritePlayerMonPicOAM: ; Writes the OAM entries for a copy of the player mon's pic in OAM. ; The top 5 rows are reproduced in OAM, although only 2 are actually needed. ld a, $10 @@ -1476,7 +1477,7 @@ ShakeEnemyHUD_WritePlayerMonPicOAM: ; 79397 (1e:5397) ld [wBaseCoordX], a jr .loop -BattleAnimWriteOAMEntry: ; 793c3 (1e:53c3) +BattleAnimWriteOAMEntry: ; Y coordinate = e (increased by 8 each call, before the write to OAM) ; X coordinate = [wBaseCoordX] ; tile = d @@ -1507,11 +1508,11 @@ BattleAnimWriteOAMEntry: ; 793c3 (1e:53c3) ld [hli], a ret -AdjustOAMBlockXPos: ; 793ef (1e:53ef) +AdjustOAMBlockXPos: ld l, e ld h, d -AdjustOAMBlockXPos2: ; 793f1 (1e:53f1) +AdjustOAMBlockXPos2: ld de, 4 .loop ld a, [wCoordAdjustmentAmount] @@ -1531,11 +1532,11 @@ AdjustOAMBlockXPos2: ; 793f1 (1e:53f1) jr nz, .loop ret -AdjustOAMBlockYPos: ; 79408 (1e:5408) +AdjustOAMBlockYPos: ld l, e ld h, d -AdjustOAMBlockYPos2: ; 7940d (1e:540d) +AdjustOAMBlockYPos2: ld de, 4 .loop ld a, [wCoordAdjustmentAmount] @@ -1554,12 +1555,12 @@ AdjustOAMBlockYPos2: ; 7940d (1e:540d) jr nz, .loop ret -AnimationBlinkEnemyMon: ; 79421 (1e:5421) +AnimationBlinkEnemyMon: ; Make the enemy mon's sprite blink on and off for a second or two ld hl, AnimationBlinkMon jp CallWithTurnFlipped -AnimationBlinkMon: ; 79427 (1e:5427) +AnimationBlinkMon: ; Make the mon's sprite blink on and off for a second or two. push af ld c, 6 @@ -1577,7 +1578,7 @@ AnimationBlinkMon: ; 79427 (1e:5427) pop af ret -AnimationFlashMonPic: ; 79441 (1e:5441) +AnimationFlashMonPic: ; Flashes the mon's sprite on and off ld a, [wBattleMonSpecies] ld [wChangeMonPicPlayerTurnSpecies], a @@ -1585,25 +1586,25 @@ AnimationFlashMonPic: ; 79441 (1e:5441) ld [wChangeMonPicEnemyTurnSpecies], a jp ChangeMonPic -AnimationFlashEnemyMonPic: ; 79450 (1e:5450) +AnimationFlashEnemyMonPic: ; Flashes the enemy mon's sprite on and off ld hl, AnimationFlashMonPic jp CallWithTurnFlipped -AnimationShowMonPic: ; 79456 (1e:5456) +AnimationShowMonPic: xor a call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles jp Delay3 -AnimationShowEnemyMonPic: ; 79463 (1e:5463) +AnimationShowEnemyMonPic: ; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss ; to make the mon's sprite reappear after disappears offscreen. ld hl, AnimationShowMonPic jp CallWithTurnFlipped -AnimationShakeBackAndForth: ; 79469 (1e:5469) +AnimationShakeBackAndForth: ; Shakes the mon's sprite back and forth rapidly. This is used in Double Team. ; The mon's sprite disappears after this animation. ld a, [H_WHOSETURN] @@ -1650,7 +1651,7 @@ AnimationShakeBackAndForth: ; 79469 (1e:5469) jr nz, .loop ret -AnimationMoveMonHorizontally: ; 794b1 (1e:54b1) +AnimationMoveMonHorizontally: ; Shifts the mon's sprite horizontally to a fixed location. Used by lots of ; animations like Tackle/Body Slam. call AnimationHideMonPic @@ -1668,7 +1669,7 @@ AnimationMoveMonHorizontally: ; 794b1 (1e:54b1) ld c, 3 jp DelayFrames -AnimationResetMonPosition: ; 794cd (1e:54cd) +AnimationResetMonPosition: ; Resets the mon's sprites to be located at the normal coordinates. ld a, [H_WHOSETURN] and a @@ -1679,7 +1680,7 @@ AnimationResetMonPosition: ; 794cd (1e:54cd) call ClearMonPicFromTileMap jp AnimationShowMonPic -AnimationSpiralBallsInward: ; 794dc (1e:54dc) +AnimationSpiralBallsInward: ; Creates an effect that looks like energy balls spiralling into the ; player mon's sprite. Used in Focus Energy, for example. ld a, [H_WHOSETURN] @@ -1746,7 +1747,7 @@ AnimationSpiralBallsInward: ; 794dc (1e:54dc) call AnimationCleanOAM jp AnimationFlashScreen -SpiralBallAnimationCoordinates: ; 79545 (1e:5545) +SpiralBallAnimationCoordinates: ; y, x pairs ; This is the sequence of screen coordinates that the spiralling ; balls are positioned at. @@ -1773,7 +1774,7 @@ SpiralBallAnimationCoordinates: ; 79545 (1e:5545) db $50, $28 db $FF ; list terminator -AnimationSquishMonPic: ; 79570 (1e:5570) +AnimationSquishMonPic: ; Squishes the mon's sprite horizontally making it ; disappear. Used by Teleport/Sky Attack animations. ld c, 4 @@ -1804,7 +1805,7 @@ AnimationSquishMonPic: ; 79570 (1e:5570) ld c, 2 jp DelayFrame -_AnimationSquishMonPic: ; 795a3 (1e:55a3) +_AnimationSquishMonPic: ld c, 7 .loop push bc @@ -1829,7 +1830,7 @@ _AnimationSquishMonPic: ; 795a3 (1e:55a3) jr nz, .loop jp Delay3 -AnimationShootBallsUpward: ; 795c8 (1e:55c8) +AnimationShootBallsUpward: ; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack ; animations. ld a, [H_WHOSETURN] @@ -1848,7 +1849,7 @@ AnimationShootBallsUpward: ; 795c8 (1e:55c8) call _AnimationShootBallsUpward jp AnimationCleanOAM -_AnimationShootBallsUpward: ; 795e6 (1e:55e6) +_AnimationShootBallsUpward: push bc xor a ld [wWhichBattleAnimTileset], a @@ -1898,7 +1899,7 @@ _AnimationShootBallsUpward: ; 795e6 (1e:55e6) jr nz, .loop ret -AnimationShootManyBallsUpward: ; 79635 (1e:5635) +AnimationShootManyBallsUpward: ; Shoots several pillars of "energy" balls upward. ld a, [H_WHOSETURN] and a @@ -1922,19 +1923,19 @@ AnimationShootManyBallsUpward: ; 79635 (1e:5635) pop hl jr .loop -UpwardBallsAnimXCoordinatesPlayerTurn: ; 79660 (1e:5660) +UpwardBallsAnimXCoordinatesPlayerTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $10, $40, $28, $18, $38, $30 db $FF ; list terminator -UpwardBallsAnimXCoordinatesEnemyTurn: ; 79667 (1e:5667) +UpwardBallsAnimXCoordinatesEnemyTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $60, $90, $78, $68, $88, $80 db $FF ; list terminator -AnimationMinimizeMon: ; 7966e (1e:566e) +AnimationMinimizeMon: ; Changes the mon's sprite to a mini black sprite. Used by the ; Minimize animation. ld hl, wTempPic @@ -1958,11 +1959,11 @@ AnimationMinimizeMon: ; 7966e (1e:566e) call Delay3 jp AnimationShowMonPic -MinimizedMonSprite: ; 79693 (1e:5693) +MinimizedMonSprite: INCBIN "gfx/minimized_mon_sprite.1bpp" MinimizedMonSpriteEnd: -AnimationSlideMonDownAndHide: ; 79698 (1e:5698) +AnimationSlideMonDownAndHide: ; Slides the mon's sprite down and disappears. Used in Acid Armor. ld a, $1 ld c, $2 @@ -1989,7 +1990,7 @@ AnimationSlideMonDownAndHide: ; 79698 (1e:5698) call FillMemory jp CopyTempPicToMonPic -_AnimationSlideMonOff: ; 796c7 (1e:56c7) +_AnimationSlideMonOff: ; Slides the mon's sprite off the screen horizontally by e tiles and waits ; [wSlideMonDelay] V-blanks each time the pic is slid by one tile. ld a, [H_WHOSETURN] @@ -2033,14 +2034,14 @@ _AnimationSlideMonOff: ; 796c7 (1e:56c7) jr nz, .slideLoop ret -; Since mon pic tile numbers go from top to bottom, left to right in order, +; Since mon pic tile numbers go from top to bottom, left to right in order, ; adding the height of the mon pic in tiles to a tile number gives the tile ; number of the tile one column to the right (and thus subtracting the height ; gives the reverse). If the next tile would be past the edge of the pic, the 2 ; functions below catch it by checking if the tile number is within the valid ; range and if not, replacing it with a blank tile. -.PlayerNextTile ; 79702 (1e:5702) +.PlayerNextTile ld a, [hl] add 7 ; bugfix: compares against the max tile + 1 as opposed to the max tile @@ -2049,7 +2050,7 @@ _AnimationSlideMonOff: ; 796c7 (1e:56c7) ld a, " " ret -.EnemyNextTile ; 7970b (1e:570b) +.EnemyNextTile ld a, [hl] sub 7 ; This has the same problem as above, but it has no visible effect because @@ -2059,7 +2060,7 @@ _AnimationSlideMonOff: ; 796c7 (1e:56c7) ld a, " " ret -AnimationSlideMonHalfOff: ; 79714 (1e:5714) +AnimationSlideMonHalfOff: ; Slides the mon's sprite halfway off the screen. It's used in Softboiled. ld e, 4 ld a, 4 @@ -2067,7 +2068,7 @@ AnimationSlideMonHalfOff: ; 79714 (1e:5714) call _AnimationSlideMonOff jp Delay3 -CopyTempPicToMonPic: ; 79721 (1e:5721) +CopyTempPicToMonPic: ld a, [H_WHOSETURN] and a ld hl, vBackPic ; player turn @@ -2078,7 +2079,7 @@ CopyTempPicToMonPic: ; 79721 (1e:5721) ld bc, 7 * 7 jp CopyVideoData -AnimationWavyScreen: ; 79735 (1e:5735) +AnimationWavyScreen: ; used in Psywave/Psychic etc. ld hl, vBGMap0 call BattleAnimCopyTileMapToVRAM @@ -2119,7 +2120,7 @@ AnimationWavyScreen: ; 79735 (1e:5735) call BattleAnimCopyTileMapToVRAM ret -WavyScreen_SetSCX: ; 7977d (1e:577d) +WavyScreen_SetSCX: ld a, [rSTAT] and $3 ; is it H-blank? jr nz, WavyScreen_SetSCX ; wait until it's H-blank @@ -2132,14 +2133,14 @@ WavyScreen_SetSCX: ; 7977d (1e:577d) ld hl, WavyScreenLineOffsets ; go back to the beginning if so ret -WavyScreenLineOffsets: ; 7978e (1e:578e) +WavyScreenLineOffsets: ; Sequence of horizontal line pixel offsets for the wavy screen animation. ; This sequence vaguely resembles a sine wave. db 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1 db 0, 0, 0, 0, 0, -1, -1, -1, -2, -2, -2, -2, -2, -1, -1, -1 db $80 ; terminator -AnimationSubstitute: ; 797af (1e:57af) +AnimationSubstitute: ; Changes the pokemon's sprite to the mini sprite ld hl, wTempPic xor a @@ -2178,12 +2179,12 @@ AnimationSubstitute: ; 797af (1e:57af) call CopyTempPicToMonPic jp AnimationShowMonPic -CopySlowbroSpriteData: ; 7980e (1e:580e) +CopySlowbroSpriteData: ld bc, $0010 ld a, BANK(SlowbroSprite) jp FarCopyData -HideSubstituteShowMonAnim: ; 79816 (1e:5816) +HideSubstituteShowMonAnim: ld a, [H_WHOSETURN] and a ld hl, wPlayerMonMinimized @@ -2267,12 +2268,12 @@ HideSubstituteShowMonAnim: ; 79816 (1e:5816) jr nz, .loop jp CopyTempPicToMonPic -ReshowSubstituteAnim: ; 798b2 (1e:58b2) +ReshowSubstituteAnim: call AnimationSlideMonOff call AnimationSubstitute jp AnimationShowMonPic -AnimationBoundUpAndDown: ; 798bb (1e:58bb) +AnimationBoundUpAndDown: ; Bounces the mon's sprite up and down several times. It is used ; by Splash's animation. ld c, 5 @@ -2284,7 +2285,7 @@ AnimationBoundUpAndDown: ; 798bb (1e:58bb) jr nz, .loop jp AnimationShowMonPic -AnimationTransformMon: ; 798c8 (1e:58c8) +AnimationTransformMon: ; Redraws this mon's sprite as the back/front sprite of the opposing mon. ; Used in Transform. ld a, [wEnemyMonSpecies] @@ -2292,7 +2293,7 @@ AnimationTransformMon: ; 798c8 (1e:58c8) ld a, [wBattleMonSpecies] ld [wChangeMonPicEnemyTurnSpecies], a -ChangeMonPic: ; 798d4 (1e:58d4) +ChangeMonPic: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -2323,7 +2324,7 @@ ChangeMonPic: ; 798d4 (1e:58d4) ld b, SET_PAL_BATTLE jp RunPaletteCommand -AnimationHideEnemyMonPic: ; 79919 (1e:5919) +AnimationHideEnemyMonPic: ; Hides the enemy mon's sprite xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -2333,7 +2334,7 @@ AnimationHideEnemyMonPic: ; 79919 (1e:5919) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -Func_79929: ; 79929 (1e:5929) +Func_79929: ld hl, wPlayerMonMinimized ld a, [H_WHOSETURN] and a @@ -2350,7 +2351,7 @@ Func_79929: ; 79929 (1e:5929) call AnimationShowMonPic ret -InitMultipleObjectsOAM: ; 79943 (1e:5943) +InitMultipleObjectsOAM: ; Writes c OAM entries with tile d. ; Sets their Y coordinates to sequential multiples of 8, starting from 0. ; Sets their X coordinates to 0. @@ -2373,7 +2374,7 @@ InitMultipleObjectsOAM: ; 79943 (1e:5943) ret ; unreferenced -AnimationHideMonPic: ; 7995d (1e:595d) +AnimationHideMonPic: ; Hides the mon's sprite. ld a, [H_WHOSETURN] and a @@ -2383,7 +2384,7 @@ AnimationHideMonPic: ; 7995d (1e:595d) .playerTurn ld a, 5 * SCREEN_WIDTH + 1 -ClearMonPicFromTileMap: ; 79968 (1e:5968) +ClearMonPicFromTileMap: push hl push de push bc @@ -2399,9 +2400,9 @@ ClearMonPicFromTileMap: ; 79968 (1e:5968) ret ; puts the tile map destination address of a mon sprite in hl, given the row count in b -; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out, +; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out, ; in order to show only a portion of the mon sprite. -GetMonSpriteTileMapPointerFromRowCount: ; 7997c (1e:597c) +GetMonSpriteTileMapPointerFromRowCount: push de ld a, [H_WHOSETURN] and a @@ -2434,7 +2435,7 @@ GetMonSpriteTileMapPointerFromRowCount: ; 7997c (1e:597c) ; de = tile ID list pointer ; b = number of rows ; c = number of columns -GetTileIDList: ; 7999e (1e:599e) +GetTileIDList: ld hl, TileIDListPointerTable ld e, a ld d, 0 @@ -2455,7 +2456,7 @@ GetTileIDList: ; 7999e (1e:599e) ld b, a ret -AnimCopyRowLeft: ; 798b7 (1e:58b7) +AnimCopyRowLeft: ; copy a row of c tiles 1 tile left ld a, [hld] ld [hli], a @@ -2464,7 +2465,7 @@ AnimCopyRowLeft: ; 798b7 (1e:58b7) jr nz, AnimCopyRowLeft ret -AnimCopyRowRight: ; 799be (1e:59be) +AnimCopyRowRight: ; copy a row of c tiles 1 tile right ld a, [hli] ld [hld], a @@ -2474,234 +2475,235 @@ AnimCopyRowRight: ; 799be (1e:59be) ret ; get the sound of the move id in b -GetMoveSoundB: ; 799c5 (1e:59c5) +GetMoveSoundB: ld a, b call GetMoveSound ld b, a ret -GetMoveSound: ; 799cb (1e:59cb) - ld hl,MoveSoundTable - ld e,a - ld d,0 - add hl,de - add hl,de - add hl,de - ld a,[hli] - ld b,a +GetMoveSound: + ld hl, MoveSoundTable + ld e, a + ld d, 0 + add hl, de + add hl, de + add hl, de + ld a, [hli] + ld b, a call IsCryMove - jr nc,.NotCryMove - ld a,[H_WHOSETURN] + jr nc, .NotCryMove + ld a, [H_WHOSETURN] and a - jr nz,.next - ld a,[wBattleMonSpecies] ; get number of current monster + jr nz, .next + ld a, [wBattleMonSpecies] ; get number of current monster jr .Continue .next - ld a,[wEnemyMonSpecies] + ld a, [wEnemyMonSpecies] .Continue push hl call GetCryData - ld b,a + ld b, a pop hl - ld a,[wFrequencyModifier] + ld a, [wFrequencyModifier] add [hl] - ld [wFrequencyModifier],a + ld [wFrequencyModifier], a inc hl - ld a,[wTempoModifier] + ld a, [wTempoModifier] add [hl] - ld [wTempoModifier],a + ld [wTempoModifier], a jr .done .NotCryMove - ld a,[hli] - ld [wFrequencyModifier],a - ld a,[hli] - ld [wTempoModifier],a + ld a, [hli] + ld [wFrequencyModifier], a + ld a, [hli] + ld [wTempoModifier], a .done - ld a,b + ld a, b ret -IsCryMove: ; 79a09 (1e:5a09) +IsCryMove: ; set carry if the move animation involves playing a monster cry - ld a,[wAnimationID] - cp a,GROWL - jr z,.CryMove - cp a,ROAR - jr z,.CryMove + ld a, [wAnimationID] + cp a, GROWL + jr z, .CryMove + cp a, ROAR + jr z, .CryMove and a ; clear carry ret .CryMove scf ret -MoveSoundTable: ; 79a18 (1e:5a18) - db SFX_POUND, $00,$80 ; POUND - db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP - db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP - db SFX_BATTLE_0B, $01,$80 ; COMET_PUNCH - db SFX_BATTLE_0D, $00,$40 ; MEGA_PUNCH - db SFX_SILPH_SCOPE, $00,$ff ; PAY_DAY - db SFX_BATTLE_0D, $10,$60 ; FIRE_PUNCH - db SFX_BATTLE_0D, $20,$80 ; ICE_PUNCH - db SFX_BATTLE_0D, $00,$a0 ; THUNDERPUNCH - db SFX_DAMAGE, $00,$80 ; SCRATCH - db SFX_BATTLE_0F, $20,$40 ; VICEGRIP - db SFX_BATTLE_0F, $00,$80 ; GUILLOTINE - db SFX_BATTLE_0E, $00,$a0 ; RAZOR_WIND - db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE - db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT - db SFX_BATTLE_12, $00,$c0 ; GUST - db SFX_BATTLE_12, $10,$a0 ; WING_ATTACK - db SFX_BATTLE_13, $00,$e0 ; WHIRLWIND - db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY - db SFX_BATTLE_14, $00,$80 ; BIND - db SFX_BATTLE_22, $00,$80 ; SLAM - db SFX_VINE_WHIP, $01,$80 ; VINE_WHIP - db SFX_BATTLE_20, $00,$80 ; STOMP - db SFX_BATTLE_17, $f0,$40 ; DOUBLE_KICK - db SFX_SUPER_EFFECTIVE, $00,$80 ; MEGA_KICK - db SFX_BATTLE_17, $00,$80 ; JUMP_KICK - db SFX_BATTLE_21, $10,$80 ; ROLLING_KICK - db SFX_BATTLE_1B, $01,$a0 ; SAND_ATTACK - db SFX_BATTLE_18, $00,$80 ; HEADBUTT - db SFX_BATTLE_1E, $00,$60 ; HORN_ATTACK - db SFX_BATTLE_1E, $01,$40 ; FURY_ATTACK - db SFX_HORN_DRILL, $00,$a0 ; HORN_DRILL - db SFX_SUPER_EFFECTIVE, $10,$a0 ; TACKLE - db SFX_BATTLE_20, $00,$c0 ; BODY_SLAM - db SFX_BATTLE_14, $10,$60 ; WRAP - db SFX_SUPER_EFFECTIVE, $00,$a0 ; TAKE_DOWN - db SFX_BATTLE_22, $11,$c0 ; THRASH - db SFX_SUPER_EFFECTIVE, $20,$c0 ; DOUBLE_EDGE - db SFX_BATTLE_21, $00,$80 ; TAIL_WHIP - db SFX_BATTLE_1B, $00,$80 ; POISON_STING - db SFX_BATTLE_1B, $20,$c0 ; TWINEEDLE - db SFX_BATTLE_19, $00,$80 ; PIN_MISSILE - db SFX_BATTLE_31, $ff,$40 ; LEER - db SFX_BATTLE_1E, $00,$80 ; BITE - db SFX_BATTLE_0B, $00,$c0 ; GROWL - db SFX_BATTLE_0B, $00,$40 ; ROAR - db SFX_BATTLE_35, $00,$80 ; SING - db SFX_BATTLE_27, $40,$60 ; SUPERSONIC - db SFX_BATTLE_27, $00,$80 ; SONICBOOM - db SFX_BATTLE_27, $ff,$40 ; DISABLE - db SFX_BATTLE_2A, $80,$c0 ; ACID - db SFX_BATTLE_19, $10,$a0 ; EMBER - db SFX_BATTLE_19, $21,$e0 ; FLAMETHROWER - db SFX_BATTLE_29, $00,$80 ; MIST - db SFX_BATTLE_24, $20,$60 ; WATER_GUN - db SFX_BATTLE_2A, $00,$80 ; HYDRO_PUMP - db SFX_BATTLE_2C, $00,$80 ; SURF - db SFX_BATTLE_28, $40,$80 ; ICE_BEAM - db SFX_BATTLE_29, $f0,$e0 ; BLIZZARD - db SFX_PSYBEAM, $00,$80 ; PSYBEAM - db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM - db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM - db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM - db SFX_PECK,$01, $a0 ; PECK - db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK - db SFX_BATTLE_23, $01,$c0 ; SUBMISSION - db SFX_BATTLE_23, $00,$80 ; LOW_KICK - db SFX_SUPER_EFFECTIVE, $00,$e0 ; COUNTER - db SFX_BATTLE_26, $01,$60 ; SEISMIC_TOSS - db SFX_BATTLE_26, $20,$40 ; STRENGTH - db SFX_BATTLE_24, $00,$80 ; ABSORB - db SFX_BATTLE_24, $40,$c0 ; MEGA_DRAIN - db SFX_BATTLE_1B, $03,$60 ; LEECH_SEED - db SFX_BATTLE_25, $11,$e0 ; GROWTH - db SFX_BATTLE_12, $20,$e0 ; RAZOR_LEAF - db SFX_BATTLE_2E, $00,$80 ; SOLARBEAM - db SFX_BATTLE_1C, $00,$80 ; POISONPOWDER - db SFX_BATTLE_1C, $11,$a0 ; STUN_SPORE - db SFX_BATTLE_1C, $01,$c0 ; SLEEP_POWDER - db SFX_BATTLE_13, $14,$c0 ; PETAL_DANCE - db SFX_BATTLE_1B, $02,$a0 ; STRING_SHOT - db SFX_BATTLE_29, $f0,$80 ; DRAGON_RAGE - db SFX_BATTLE_29, $20,$c0 ; FIRE_SPIN - db SFX_BATTLE_2F, $00,$20 ; THUNDERSHOCK - db SFX_BATTLE_2F, $20,$80 ; THUNDERBOLT - db SFX_BATTLE_2E, $12,$60 ; THUNDER_WAVE - db SFX_BATTLE_26, $00,$80 ; THUNDER - db SFX_BATTLE_14, $01,$e0 ; ROCK_THROW - db SFX_BATTLE_29, $0f,$e0 ; EARTHQUAKE - db SFX_BATTLE_29, $11,$20 ; FISSURE - db SFX_DAMAGE, $10,$40 ; DIG - db SFX_BATTLE_0F, $10,$c0 ; TOXIC - db SFX_BATTLE_14, $00,$20 ; CONFUSION - db SFX_PSYCHIC_M, $00,$80 ; PSYCHIC_M - db SFX_BATTLE_35, $11,$18 ; HYPNOSIS - db SFX_BATTLE_09, $20,$c0 ; MEDITATE - db SFX_FAINT_FALL, $20,$c0 ; AGILITY - db SFX_BATTLE_25, $00,$10 ; QUICK_ATTACK - db SFX_BATTLE_26, $f0,$20 ; RAGE - db SFX_BATTLE_33, $f0,$c0 ; TELEPORT - db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE - db SFX_BATTLE_09, $f0,$40 ; MIMIC - db SFX_BATTLE_31, $00,$80 ; SCREECH - db SFX_BATTLE_33, $80,$40 ; DOUBLE_TEAM - db SFX_BATTLE_33, $00,$80 ; RECOVER - db SFX_BATTLE_14, $11,$20 ; HARDEN - db SFX_BATTLE_14, $22,$10 ; MINIMIZE - db SFX_BATTLE_1B, $f1,$ff ; SMOKESCREEN - db SFX_BATTLE_13, $f1,$ff ; CONFUSE_RAY - db SFX_BATTLE_14, $33,$30 ; WITHDRAW - db SFX_BATTLE_32, $40,$c0 ; DEFENSE_CURL - db SFX_BATTLE_0E, $20,$20 ; BARRIER - db SFX_BATTLE_0E, $f0,$10 ; LIGHT_SCREEN - db SFX_BATTLE_0F, $f8,$10 ; HAZE - db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT - db SFX_BATTLE_25, $00,$80 ; FOCUS_ENERGY - db SFX_BATTLE_18, $00,$c0 ; BIDE - db SFX_BATTLE_32, $c0,$ff ; METRONOME - db SFX_BATTLE_09, $f2,$20 ; MIRROR_MOVE - db SFX_BATTLE_34, $00,$80 ; SELFDESTRUCT - db SFX_BATTLE_34, $00,$40 ; EGG_BOMB - db SFX_BATTLE_09, $00,$40 ; LICK - db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG - db SFX_BATTLE_2A, $20,$20 ; SLUDGE - db SFX_BATTLE_32, $00,$80 ; BONE_CLUB - db SFX_BATTLE_29, $1f,$20 ; FIRE_BLAST - db SFX_BATTLE_25, $2f,$80 ; WATERFALL - db SFX_BATTLE_0F, $1f,$ff ; CLAMP - db SFX_BATTLE_2B, $1f,$60 ; SWIFT - db SFX_BATTLE_26, $1e,$20 ; SKULL_BASH - db SFX_BATTLE_26, $1f,$18 ; SPIKE_CANNON - db SFX_BATTLE_14, $0f,$80 ; CONSTRICT - db SFX_BATTLE_09, $f8,$10 ; AMNESIA - db SFX_FAINT_FALL, $18,$20 ; KINESIS - db SFX_BATTLE_32, $08,$40 ; SOFTBOILED - db SFX_BATTLE_17, $01,$e0 ; HI_JUMP_KICK - db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE - db SFX_BATTLE_35, $42,$01 ; DREAM_EATER - db SFX_BATTLE_1C, $00,$ff ; POISON_GAS - db SFX_BATTLE_32, $08,$e0 ; BARRAGE - db SFX_BATTLE_24, $00,$80 ; LEECH_LIFE - db SFX_BATTLE_09, $88,$10 ; LOVELY_KISS - db SFX_BATTLE_25, $48,$ff ; SKY_ATTACK - db SFX_FAINT_FALL, $ff,$ff ; TRANSFORM - db SFX_BATTLE_24, $ff,$10 ; BUBBLE - db SFX_FAINT_FALL, $ff,$04 ; DIZZY_PUNCH - db SFX_BATTLE_1C, $01,$ff ; SPORE - db SFX_BATTLE_13, $f8,$ff ; FLASH - db SFX_BATTLE_0C, $f0,$f0 ; PSYWAVE - db SFX_BATTLE_0F, $08,$10 ; SPLASH - db SFX_BATTLE_0D, $f0,$ff ; ACID_ARMOR - db SFX_SUPER_EFFECTIVE, $f0,$ff ; CRABHAMMER - db SFX_BATTLE_34, $10,$ff ; EXPLOSION - db SFX_BATTLE_0E, $f0,$20 ; FURY_SWIPES - db SFX_BATTLE_2B, $f0,$60 ; BONEMERANG - db SFX_BATTLE_21, $12,$10 ; REST - db SFX_BATTLE_36, $f0,$20 ; ROCK_SLIDE - db SFX_BATTLE_1E, $12,$ff ; HYPER_FANG - db SFX_BATTLE_31, $80,$04 ; SHARPEN - db SFX_BATTLE_33, $f0,$10 ; CONVERSION - db SFX_BATTLE_29, $f8,$ff ; TRI_ATTACK - db SFX_BATTLE_26, $f0,$ff ; SUPER_FANG - db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH - db SFX_BATTLE_2C, $d8,$04 ; SUBSTITUTE - db SFX_BATTLE_0B, $00,$80 ; STRUGGLE - db SFX_BATTLE_0B, $00,$80 - -CopyPicTiles: ; 79c0a (1e:5c0a) +MoveSoundTable: + ; ID, pitch mod, tempo mod + db SFX_POUND, $00, $80 ; POUND + db SFX_BATTLE_0C, $10, $80 ; KARATE_CHOP + db SFX_DOUBLESLAP, $00, $80 ; DOUBLESLAP + db SFX_BATTLE_0B, $01, $80 ; COMET_PUNCH + db SFX_BATTLE_0D, $00, $40 ; MEGA_PUNCH + db SFX_SILPH_SCOPE, $00, $ff ; PAY_DAY + db SFX_BATTLE_0D, $10, $60 ; FIRE_PUNCH + db SFX_BATTLE_0D, $20, $80 ; ICE_PUNCH + db SFX_BATTLE_0D, $00, $a0 ; THUNDERPUNCH + db SFX_DAMAGE, $00, $80 ; SCRATCH + db SFX_BATTLE_0F, $20, $40 ; VICEGRIP + db SFX_BATTLE_0F, $00, $80 ; GUILLOTINE + db SFX_BATTLE_0E, $00, $a0 ; RAZOR_WIND + db SFX_NOT_VERY_EFFECTIVE, $10, $c0 ; SWORDS_DANCE + db SFX_NOT_VERY_EFFECTIVE, $00, $a0 ; CUT + db SFX_BATTLE_12, $00, $c0 ; GUST + db SFX_BATTLE_12, $10, $a0 ; WING_ATTACK + db SFX_BATTLE_13, $00, $e0 ; WHIRLWIND + db SFX_NOT_VERY_EFFECTIVE, $20, $c0 ; FLY + db SFX_BATTLE_14, $00, $80 ; BIND + db SFX_BATTLE_22, $00, $80 ; SLAM + db SFX_VINE_WHIP, $01, $80 ; VINE_WHIP + db SFX_BATTLE_20, $00, $80 ; STOMP + db SFX_BATTLE_17, $f0, $40 ; DOUBLE_KICK + db SFX_SUPER_EFFECTIVE, $00, $80 ; MEGA_KICK + db SFX_BATTLE_17, $00, $80 ; JUMP_KICK + db SFX_BATTLE_21, $10, $80 ; ROLLING_KICK + db SFX_BATTLE_1B, $01, $a0 ; SAND_ATTACK + db SFX_BATTLE_18, $00, $80 ; HEADBUTT + db SFX_BATTLE_1E, $00, $60 ; HORN_ATTACK + db SFX_BATTLE_1E, $01, $40 ; FURY_ATTACK + db SFX_HORN_DRILL, $00, $a0 ; HORN_DRILL + db SFX_SUPER_EFFECTIVE, $10, $a0 ; TACKLE + db SFX_BATTLE_20, $00, $c0 ; BODY_SLAM + db SFX_BATTLE_14, $10, $60 ; WRAP + db SFX_SUPER_EFFECTIVE, $00, $a0 ; TAKE_DOWN + db SFX_BATTLE_22, $11, $c0 ; THRASH + db SFX_SUPER_EFFECTIVE, $20, $c0 ; DOUBLE_EDGE + db SFX_BATTLE_21, $00, $80 ; TAIL_WHIP + db SFX_BATTLE_1B, $00, $80 ; POISON_STING + db SFX_BATTLE_1B, $20, $c0 ; TWINEEDLE + db SFX_BATTLE_19, $00, $80 ; PIN_MISSILE + db SFX_BATTLE_31, $ff, $40 ; LEER + db SFX_BATTLE_1E, $00, $80 ; BITE + db SFX_BATTLE_0B, $00, $c0 ; GROWL + db SFX_BATTLE_0B, $00, $40 ; ROAR + db SFX_BATTLE_35, $00, $80 ; SING + db SFX_BATTLE_27, $40, $60 ; SUPERSONIC + db SFX_BATTLE_27, $00, $80 ; SONICBOOM + db SFX_BATTLE_27, $ff, $40 ; DISABLE + db SFX_BATTLE_2A, $80, $c0 ; ACID + db SFX_BATTLE_19, $10, $a0 ; EMBER + db SFX_BATTLE_19, $21, $e0 ; FLAMETHROWER + db SFX_EARTHQUAKE, $00, $80 ; MIST + db SFX_BATTLE_24, $20, $60 ; WATER_GUN + db SFX_BATTLE_2A, $00, $80 ; HYDRO_PUMP + db SFX_BATTLE_2C, $00, $80 ; SURF + db SFX_BATTLE_28, $40, $80 ; ICE_BEAM + db SFX_EARTHQUAKE, $f0, $e0 ; BLIZZARD + db SFX_PSYBEAM, $00, $80 ; PSYBEAM + db SFX_BATTLE_2A, $f0, $60 ; BUBBLEBEAM + db SFX_BATTLE_28, $00, $80 ; AURORA_BEAM + db SFX_BATTLE_36, $00, $80 ; HYPER_BEAM + db SFX_PECK, $01, $a0 ; PECK + db SFX_BATTLE_13, $f0, $20 ; DRILL_PECK + db SFX_BATTLE_23, $01, $c0 ; SUBMISSION + db SFX_BATTLE_23, $00, $80 ; LOW_KICK + db SFX_SUPER_EFFECTIVE, $00, $e0 ; COUNTER + db SFX_BATTLE_26, $01, $60 ; SEISMIC_TOSS + db SFX_BATTLE_26, $20, $40 ; STRENGTH + db SFX_BATTLE_24, $00, $80 ; ABSORB + db SFX_BATTLE_24, $40, $c0 ; MEGA_DRAIN + db SFX_BATTLE_1B, $03, $60 ; LEECH_SEED + db SFX_BATTLE_25, $11, $e0 ; GROWTH + db SFX_BATTLE_12, $20, $e0 ; RAZOR_LEAF + db SFX_BATTLE_2E, $00, $80 ; SOLARBEAM + db SFX_BATTLE_1C, $00, $80 ; POISONPOWDER + db SFX_BATTLE_1C, $11, $a0 ; STUN_SPORE + db SFX_BATTLE_1C, $01, $c0 ; SLEEP_POWDER + db SFX_BATTLE_13, $14, $c0 ; PETAL_DANCE + db SFX_BATTLE_1B, $02, $a0 ; STRING_SHOT + db SFX_EARTHQUAKE, $f0, $80 ; DRAGON_RAGE + db SFX_EARTHQUAKE, $20, $c0 ; FIRE_SPIN + db SFX_THUNDERBOLT, $00, $20 ; THUNDERSHOCK + db SFX_THUNDERBOLT, $20, $80 ; THUNDERBOLT + db SFX_BATTLE_2E, $12, $60 ; THUNDER_WAVE + db SFX_BATTLE_26, $00, $80 ; THUNDER + db SFX_BATTLE_14, $01, $e0 ; ROCK_THROW + db SFX_EARTHQUAKE, $0f, $e0 ; EARTHQUAKE + db SFX_EARTHQUAKE, $11, $20 ; FISSURE + db SFX_DAMAGE, $10, $40 ; DIG + db SFX_BATTLE_0F, $10, $c0 ; TOXIC + db SFX_BATTLE_14, $00, $20 ; CONFUSION + db SFX_PSYCHIC_M, $00, $80 ; PSYCHIC_M + db SFX_BATTLE_35, $11, $18 ; HYPNOSIS + db SFX_BATTLE_09, $20, $c0 ; MEDITATE + db SFX_FAINT_FALL, $20, $c0 ; AGILITY + db SFX_BATTLE_25, $00, $10 ; QUICK_ATTACK + db SFX_BATTLE_26, $f0, $20 ; RAGE + db SFX_BATTLE_33, $f0, $c0 ; TELEPORT + db SFX_NOT_VERY_EFFECTIVE, $f0, $e0 ; NIGHT_SHADE + db SFX_BATTLE_09, $f0, $40 ; MIMIC + db SFX_BATTLE_31, $00, $80 ; SCREECH + db SFX_BATTLE_33, $80, $40 ; DOUBLE_TEAM + db SFX_BATTLE_33, $00, $80 ; RECOVER + db SFX_BATTLE_14, $11, $20 ; HARDEN + db SFX_BATTLE_14, $22, $10 ; MINIMIZE + db SFX_BATTLE_1B, $f1, $ff ; SMOKESCREEN + db SFX_BATTLE_13, $f1, $ff ; CONFUSE_RAY + db SFX_BATTLE_14, $33, $30 ; WITHDRAW + db SFX_BATTLE_32, $40, $c0 ; DEFENSE_CURL + db SFX_BATTLE_0E, $20, $20 ; BARRIER + db SFX_BATTLE_0E, $f0, $10 ; LIGHT_SCREEN + db SFX_BATTLE_0F, $f8, $10 ; HAZE + db SFX_NOT_VERY_EFFECTIVE, $f0, $10 ; REFLECT + db SFX_BATTLE_25, $00, $80 ; FOCUS_ENERGY + db SFX_BATTLE_18, $00, $c0 ; BIDE + db SFX_BATTLE_32, $c0, $ff ; METRONOME + db SFX_BATTLE_09, $f2, $20 ; MIRROR_MOVE + db SFX_BATTLE_34, $00, $80 ; SELFDESTRUCT + db SFX_BATTLE_34, $00, $40 ; EGG_BOMB + db SFX_BATTLE_09, $00, $40 ; LICK + db SFX_NOT_VERY_EFFECTIVE, $10, $ff ; SMOG + db SFX_BATTLE_2A, $20, $20 ; SLUDGE + db SFX_BATTLE_32, $00, $80 ; BONE_CLUB + db SFX_EARTHQUAKE, $1f, $20 ; FIRE_BLAST + db SFX_BATTLE_25, $2f, $80 ; WATERFALL + db SFX_BATTLE_0F, $1f, $ff ; CLAMP + db SFX_BATTLE_2B, $1f, $60 ; SWIFT + db SFX_BATTLE_26, $1e, $20 ; SKULL_BASH + db SFX_BATTLE_26, $1f, $18 ; SPIKE_CANNON + db SFX_BATTLE_14, $0f, $80 ; CONSTRICT + db SFX_BATTLE_09, $f8, $10 ; AMNESIA + db SFX_FAINT_FALL, $18, $20 ; KINESIS + db SFX_BATTLE_32, $08, $40 ; SOFTBOILED + db SFX_BATTLE_17, $01, $e0 ; HI_JUMP_KICK + db SFX_NOT_VERY_EFFECTIVE, $09, $ff ; GLARE + db SFX_BATTLE_35, $42, $01 ; DREAM_EATER + db SFX_BATTLE_1C, $00, $ff ; POISON_GAS + db SFX_BATTLE_32, $08, $e0 ; BARRAGE + db SFX_BATTLE_24, $00, $80 ; LEECH_LIFE + db SFX_BATTLE_09, $88, $10 ; LOVELY_KISS + db SFX_BATTLE_25, $48, $ff ; SKY_ATTACK + db SFX_FAINT_FALL, $ff, $ff ; TRANSFORM + db SFX_BATTLE_24, $ff, $10 ; BUBBLE + db SFX_FAINT_FALL, $ff, $04 ; DIZZY_PUNCH + db SFX_BATTLE_1C, $01, $ff ; SPORE + db SFX_BATTLE_13, $f8, $ff ; FLASH + db SFX_BATTLE_0C, $f0, $f0 ; PSYWAVE + db SFX_BATTLE_0F, $08, $10 ; SPLASH + db SFX_BATTLE_0D, $f0, $ff ; ACID_ARMOR + db SFX_SUPER_EFFECTIVE, $f0, $ff ; CRABHAMMER + db SFX_BATTLE_34, $10, $ff ; EXPLOSION + db SFX_BATTLE_0E, $f0, $20 ; FURY_SWIPES + db SFX_BATTLE_2B, $f0, $60 ; BONEMERANG + db SFX_BATTLE_21, $12, $10 ; REST + db SFX_BATTLE_36, $f0, $20 ; ROCK_SLIDE + db SFX_BATTLE_1E, $12, $ff ; HYPER_FANG + db SFX_BATTLE_31, $80, $04 ; SHARPEN + db SFX_BATTLE_33, $f0, $10 ; CONVERSION + db SFX_EARTHQUAKE, $f8, $ff ; TRI_ATTACK + db SFX_BATTLE_26, $f0, $ff ; SUPER_FANG + db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH + db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE + db SFX_BATTLE_0B, $00, $80 ; STRUGGLE + db SFX_BATTLE_0B, $00, $80 + +CopyPicTiles: ld a, [H_WHOSETURN] and a ld a, $31 ; base tile ID of player mon sprite @@ -2713,7 +2715,7 @@ CopyPicTiles: ; 79c0a (1e:5c0a) jr CopyTileIDs_NoBGTransfer ; copy the tiles used when a mon is being sent out of or into a pokeball -CopyDownscaledMonTiles: ; 79c16 (1e:5c16) +CopyDownscaledMonTiles: call GetPredefRegisters ld a, [wDownscaledMonSize] and a @@ -2724,14 +2726,14 @@ CopyDownscaledMonTiles: ; 79c16 (1e:5c16) ld de, DownscaledMonTiles_3x3 ; fall through -CopyTileIDs_NoBGTransfer: ; 79acb (1e:5acb) +CopyTileIDs_NoBGTransfer: xor a ld [H_AUTOBGTRANSFERENABLED], a ; fall through ; b = number of rows ; c = number of columns -CopyTileIDs: ; 79ace (1e:5ace) +CopyTileIDs: push hl .rowLoop push bc @@ -2756,100 +2758,100 @@ CopyTileIDs: ; 79ace (1e:5ace) pop hl ret -TileIDListPointerTable: ; 79c46 (1e:5c46) +TileIDListPointerTable: dw DownscaledMonTiles_7x7 - db $77 + dn 7, 7 dw DownscaledMonTiles_5x7 - db $57 + dn 5, 7 dw DownscaledMonTiles_3x7 - db $37 + dn 3, 7 dw DownscaledMonTiles_79ce9 - db $77 + dn 7, 7 dw DownscaledMonTiles_79d1a - db $77 + dn 7, 7 dw DownscaledMonTiles_79d4b - db $77 + dn 7, 7 dw DownscaledMonTiles_79d7c - db $86 + dn 8, 6 dw DownscaledMonTiles_79dac - db $3C - -DownscaledMonTiles_5x5: ; 79b02 (1e:5b02) - db $31,$38,$46,$54,$5B - db $32,$39,$47,$55,$5C - db $34,$3B,$49,$57,$5E - db $36,$3D,$4B,$59,$60 - db $37,$3E,$4C,$5A,$61 - -DownscaledMonTiles_3x3: ; 79b1b (1e:5b1b) - db $31,$46,$5B - db $34,$49,$5E - db $37,$4C,$61 - -DownscaledMonTiles_7x7: ; 79c80 (1e:5c80) - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $02,$09,$10,$17,$1E,$25,$2C - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F - db $06,$0D,$14,$1B,$22,$29,$30 - -DownscaledMonTiles_5x7: ; 79cb1 (1e:5cb1) - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F - -DownscaledMonTiles_3x7: ; 79cd4 (1e:5cd4) - db $00,$07,$0E,$15,$1C,$23,$2A - db $02,$09,$10,$17,$1E,$25,$2C - db $04,$0B,$12,$19,$20,$27,$2E - -DownscaledMonTiles_79ce9: ; 79ce9 (1e:5ce9) - db $00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$19,$00 - db $02,$06,$0B,$10,$14,$1A,$00 - db $00,$07,$0C,$11,$15,$1B,$00 - db $03,$08,$0D,$12,$16,$1C,$00 - db $04,$09,$0E,$13,$17,$1D,$1F - db $05,$0A,$0F,$01,$18,$1E,$20 - -DownscaledMonTiles_79d1a: ; 79d1a (1e:5d1a) - db $00,$00,$00,$30,$00,$37,$00 - db $00,$00,$2B,$31,$34,$38,$3D - db $21,$26,$2C,$01,$35,$39,$3E - db $22,$27,$2D,$32,$36,$01,$00 - db $23,$28,$2E,$33,$01,$3A,$00 - db $24,$29,$2F,$01,$01,$3B,$00 - db $25,$2A,$01,$01,$01,$3C,$00 - -DownscaledMonTiles_79d4b: ; 79d4b (1e:5d4b) - db $00,$00,$00,$00,$00,$00,$00 - db $00,$00,$47,$4D,$00,$00,$00 - db $00,$00,$48,$4E,$52,$56,$5B - db $3F,$43,$49,$4F,$53,$57,$5C - db $40,$44,$4A,$50,$54,$58,$00 - db $41,$45,$4B,$51,$4C,$59,$5D - db $42,$46,$4C,$4C,$55,$5A,$5E - -DownscaledMonTiles_79d7c: ; 79d7c (1e:5d7c) - db $31,$32,$32,$32,$32,$33 - db $34,$35,$36,$36,$37,$38 - db $34,$39,$3A,$3A,$3B,$38 - db $3C,$3D,$3E,$3E,$3F,$40 - db $41,$42,$43,$43,$44,$45 - db $46,$47,$43,$48,$49,$4A - db $41,$43,$4B,$4C,$4D,$4E - db $4F,$50,$50,$50,$51,$52 - -DownscaledMonTiles_79dac: ; 79dac (1e:5dac) - db $43,$55,$56,$53,$53,$53,$53,$53,$53,$53,$53,$53 - db $43,$57,$58,$54,$54,$54,$54,$54,$54,$54,$54,$54 - db $43,$59,$5A,$43,$43,$43,$43,$43,$43,$43,$43,$43 - -AnimationLeavesFalling: ; 79dd0 (1e:5dd0) + dn 3, 12 + +DownscaledMonTiles_5x5: + db $31, $38, $46, $54, $5B + db $32, $39, $47, $55, $5C + db $34, $3B, $49, $57, $5E + db $36, $3D, $4B, $59, $60 + db $37, $3E, $4C, $5A, $61 + +DownscaledMonTiles_3x3: + db $31, $46, $5B + db $34, $49, $5E + db $37, $4C, $61 + +DownscaledMonTiles_7x7: + db $00, $07, $0E, $15, $1C, $23, $2A + db $01, $08, $0F, $16, $1D, $24, $2B + db $02, $09, $10, $17, $1E, $25, $2C + db $03, $0A, $11, $18, $1F, $26, $2D + db $04, $0B, $12, $19, $20, $27, $2E + db $05, $0C, $13, $1A, $21, $28, $2F + db $06, $0D, $14, $1B, $22, $29, $30 + +DownscaledMonTiles_5x7: + db $00, $07, $0E, $15, $1C, $23, $2A + db $01, $08, $0F, $16, $1D, $24, $2B + db $03, $0A, $11, $18, $1F, $26, $2D + db $04, $0B, $12, $19, $20, $27, $2E + db $05, $0C, $13, $1A, $21, $28, $2F + +DownscaledMonTiles_3x7: + db $00, $07, $0E, $15, $1C, $23, $2A + db $02, $09, $10, $17, $1E, $25, $2C + db $04, $0B, $12, $19, $20, $27, $2E + +DownscaledMonTiles_79ce9: + db $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $19, $00 + db $02, $06, $0B, $10, $14, $1A, $00 + db $00, $07, $0C, $11, $15, $1B, $00 + db $03, $08, $0D, $12, $16, $1C, $00 + db $04, $09, $0E, $13, $17, $1D, $1F + db $05, $0A, $0F, $01, $18, $1E, $20 + +DownscaledMonTiles_79d1a: + db $00, $00, $00, $30, $00, $37, $00 + db $00, $00, $2B, $31, $34, $38, $3D + db $21, $26, $2C, $01, $35, $39, $3E + db $22, $27, $2D, $32, $36, $01, $00 + db $23, $28, $2E, $33, $01, $3A, $00 + db $24, $29, $2F, $01, $01, $3B, $00 + db $25, $2A, $01, $01, $01, $3C, $00 + +DownscaledMonTiles_79d4b: + db $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $47, $4D, $00, $00, $00 + db $00, $00, $48, $4E, $52, $56, $5B + db $3F, $43, $49, $4F, $53, $57, $5C + db $40, $44, $4A, $50, $54, $58, $00 + db $41, $45, $4B, $51, $4C, $59, $5D + db $42, $46, $4C, $4C, $55, $5A, $5E + +DownscaledMonTiles_79d7c: + db $31, $32, $32, $32, $32, $33 + db $34, $35, $36, $36, $37, $38 + db $34, $39, $3A, $3A, $3B, $38 + db $3C, $3D, $3E, $3E, $3F, $40 + db $41, $42, $43, $43, $44, $45 + db $46, $47, $43, $48, $49, $4A + db $41, $43, $4B, $4C, $4D, $4E + db $4F, $50, $50, $50, $51, $52 + +DownscaledMonTiles_79dac: + db $43, $55, $56, $53, $53, $53, $53, $53, $53, $53, $53, $53 + db $43, $57, $58, $54, $54, $54, $54, $54, $54, $54, $54, $54 + db $43, $59, $5A, $43, $43, $43, $43, $43, $43, $43, $43, $43 + +AnimationLeavesFalling: ; Makes leaves float down from the top of the screen. This is used ; in Razor Leaf's animation. ld a, [wAnimPalette] @@ -2860,7 +2862,7 @@ AnimationLeavesFalling: ; 79dd0 (1e:5dd0) ld [wNumFallingObjects], a jp AnimationFallingObjects -AnimationPetalsFalling: ; 79de2 (1e:5de2) +AnimationPetalsFalling: ; Makes lots of petals fall down from the top of the screen. It's used in ; the animation for Petal Dance. ld d, $71 ; petal tile @@ -2869,7 +2871,7 @@ AnimationPetalsFalling: ; 79de2 (1e:5de2) call AnimationFallingObjects jp ClearSprites -AnimationFallingObjects: ; 79def (1e:5def) +AnimationFallingObjects: ld c, a ld a, 1 call InitMultipleObjectsOAM @@ -2908,7 +2910,7 @@ AnimationFallingObjects: ; 79def (1e:5def) jr nz, .loop ; keep moving the falling objects down until it does ret -FallingObjects_UpdateOAMEntry: ; 79cdb (1e:5cdb) +FallingObjects_UpdateOAMEntry: ; Increases Y by 2 pixels and adjusts X and X flip based on the falling object's ; movement byte. ld hl, wOAMBuffer @@ -2977,10 +2979,10 @@ FallingObjects_UpdateOAMEntry: ; 79cdb (1e:5cdb) ld [hl], a ; attribute ret -FallingObjects_DeltaXs: ; 79e96 (1e:5e96) +FallingObjects_DeltaXs: db 0, 1, 3, 5, 7, 9, 11, 13, 15 -FallingObjects_UpdateMovementByte: ; 79e9f (1e:5e9f) +FallingObjects_UpdateMovementByte: ld a, [wFallingObjectMovementByte] inc a ld b, a @@ -2996,7 +2998,7 @@ FallingObjects_UpdateMovementByte: ; 79e9f (1e:5e9f) ld [wFallingObjectMovementByte], a ret -FallingObjects_InitXCoords: ; 79eb3 (1e:5eb3) +FallingObjects_InitXCoords: ld hl, wOAMBuffer + $01 ld de, FallingObjects_InitialXCoords ld a, [wNumFallingObjects] @@ -3012,10 +3014,10 @@ FallingObjects_InitXCoords: ; 79eb3 (1e:5eb3) jr nz, .loop ret -FallingObjects_InitialXCoords: ; 79ec7 (1e:5ec7) - db $38,$40,$50,$60,$70,$88,$90,$56,$67,$4A,$77,$84,$98,$32,$22,$5C,$6C,$7D,$8E,$99 +FallingObjects_InitialXCoords: + db $38, $40, $50, $60, $70, $88, $90, $56, $67, $4A, $77, $84, $98, $32, $22, $5C, $6C, $7D, $8E, $99 -FallingObjects_InitMovementData: ; 79edb (1e:5edb) +FallingObjects_InitMovementData: ld hl, wFallingObjectsMovementData ld de, FallingObjects_InitialMovementData ld a, [wNumFallingObjects] @@ -3028,10 +3030,10 @@ FallingObjects_InitMovementData: ; 79edb (1e:5edb) jr nz, .loop ret -FallingObjects_InitialMovementData: ; 79eec (1e:5eec) - db $00,$84,$06,$81,$02,$88,$01,$83,$05,$89,$09,$80,$07,$87,$03,$82,$04,$85,$08,$86 +FallingObjects_InitialMovementData: + db $00, $84, $06, $81, $02, $88, $01, $83, $05, $89, $09, $80, $07, $87, $03, $82, $04, $85, $08, $86 -AnimationShakeEnemyHUD: ; 79f00 (1e:5f00) +AnimationShakeEnemyHUD: ; Shakes the enemy HUD. ; Make a copy of the back pic's tile patterns in sprite tile pattern VRAM. @@ -3117,7 +3119,7 @@ AnimationShakeEnemyHUD: ; 79f00 (1e:5f00) ; b = tile ID list index ; c = base tile ID -CopyTileIDsFromList: ; 79f7b (1e:5f7b) +CopyTileIDsFromList: call GetPredefRegisters ld a, c ld [hBaseTileID], a @@ -3127,7 +3129,7 @@ CopyTileIDsFromList: ; 79f7b (1e:5f7b) pop hl jp CopyTileIDs -ShakeEnemyHUD_ShakeBG: ; 79f8a (1e:5f8a) +ShakeEnemyHUD_ShakeBG: ld a, [hSCX] ld [wTempSCX], a .loop @@ -3147,71 +3149,71 @@ ShakeEnemyHUD_ShakeBG: ; 79f8a (1e:5f8a) ld [hSCX], a ret -BattleAnimCopyTileMapToVRAM: ; 79fae (1e:5fae) +BattleAnimCopyTileMapToVRAM: ld a, h ld [H_AUTOBGTRANSFERDEST + 1], a ld a, l ld [H_AUTOBGTRANSFERDEST], a jp Delay3 -TossBallAnimation: ; 79fb7 (1e:5fb7) - ld a,[wIsInBattle] - cp a,2 - jr z,.BlockBall ; if in trainer battle, play different animation - ld a,[wPokeBallAnimData] - ld b,a +TossBallAnimation: + ld a, [wIsInBattle] + cp a, 2 + jr z, .BlockBall ; if in trainer battle, play different animation + ld a, [wPokeBallAnimData] + ld b, a ; upper nybble: how many animations (from PokeBallAnimations) to play ; this will be 4 for successful capture, 6 for breakout - and a,$F0 + and a, $F0 swap a - ld c,a + ld c, a ; lower nybble: number of shakes ; store these for later - ld a,b - and a,$F - ld [wNumShakes],a + ld a, b + and a, $F + ld [wNumShakes], a - ld hl,.PokeBallAnimations + ld hl, .PokeBallAnimations ; choose which toss animation to use - ld a,[wcf91] - cp a,POKE_BALL - ld b,TOSS_ANIM - jr z,.done - cp a,GREAT_BALL - ld b,GREATTOSS_ANIM - jr z,.done - ld b,ULTRATOSS_ANIM + ld a, [wcf91] + cp a, POKE_BALL + ld b, TOSS_ANIM + jr z, .done + cp a, GREAT_BALL + ld b, GREATTOSS_ANIM + jr z, .done + ld b, ULTRATOSS_ANIM .done - ld a,b + ld a, b .PlayNextAnimation - ld [wAnimationID],a + ld [wAnimationID], a push bc push hl call PlayAnimation pop hl - ld a,[hli] + ld a, [hli] pop bc dec c - jr nz,.PlayNextAnimation + jr nz, .PlayNextAnimation ret -.PokeBallAnimations: ; 79ff1 (1e:5ff1) +.PokeBallAnimations: ; sequence of animations that make up the Poké Ball toss - db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM + db POOF_ANIM, HIDEPIC_ANIM, SHAKE_ANIM, POOF_ANIM, SHOWPIC_ANIM -.BlockBall ; 79ff6 (1e:5ff6) - ld a,TOSS_ANIM - ld [wAnimationID],a +.BlockBall + ld a, TOSS_ANIM + ld [wAnimationID], a call PlayAnimation - ld a,SFX_FAINT_THUD + ld a, SFX_FAINT_THUD call PlaySound - ld a,BLOCKBALL_ANIM - ld [wAnimationID],a + ld a, BLOCKBALL_ANIM + ld [wAnimationID], a jp PlayAnimation -PlayApplyingAttackSound: ; 7a00b (1e:600b) +PlayApplyingAttackSound: ; play a different sound depending if move is not very effective, neutral, or super-effective ; don't play any sound at all if move is ineffective call WaitForSoundToFinish @@ -3235,4 +3237,4 @@ PlayApplyingAttackSound: ; 7a00b (1e:600b) ld a, b ld [wTempoModifier], a ld a, c - jp PlaySound
\ No newline at end of file + jp PlaySound diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index 2b2809d9..3719841f 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -1,14 +1,14 @@ -InitBattle: ; f5ff2 (3d:5ff2) +InitBattle: ld a, [wCurOpponent] and a jr z, asm_f6003 -InitOpponent: ; f5ff8 (3d:5ff8) +InitOpponent: ld a, [wCurOpponent] ld [wcf91], a ld [wEnemyMonSpecies2], a jr asm_f601d -asm_f6003: ; f6003 (3d:6003) +asm_f6003: ld a, [wd732] bit 1, a jr z, .asm_f600f @@ -21,7 +21,7 @@ asm_f6003: ; f6003 (3d:6003) ret nz callab TryDoWildEncounter ret nz -asm_f601d: ; f601d (f:601d) +asm_f601d: ld a, [wMapPalOffset] push af ld hl, wLetterPrintingDelayFlags @@ -56,7 +56,7 @@ asm_f601d: ; f601d (f:601d) callabd_ModifyPikachuHappiness PIKAHAPPY_GYMLEADER ; useless since already in bank3d jp InitBattle_Common -InitWildBattle: ; f607c (3d:607c) +InitWildBattle: ld a, $1 ld [wIsInBattle], a callab LoadEnemyMonData @@ -106,7 +106,7 @@ InitWildBattle: ; f607c (3d:607c) predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles -InitBattle_Common: ; f60eb (3d:60eb) +InitBattle_Common: ld b, $0 call RunPaletteCommand callab SlidePlayerAndEnemySilhouettesOnScreen @@ -149,7 +149,7 @@ InitBattle_Common: ; f60eb (3d:60eb) .emptyString db "@" -_LoadTrainerPic: ; f615a (3d:615a) +_LoadTrainerPic: ; wd033-wd034 contain pointer to pic ld a, [wTrainerPicPointer] ; wd033 ld e, a @@ -167,7 +167,7 @@ _LoadTrainerPic: ; f615a (3d:615a) ld c, a jp LoadUncompressedSpriteData -LoadMonBackPic: ; f6178 (3d:6178) +LoadMonBackPic: ; Assumes the monster's attributes have ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] @@ -187,7 +187,7 @@ LoadMonBackPic: ; f6178 (3d:6178) ld b, a jp CopyVideoData -AnimateSendingOutMon: ; f61a6 (3d:f61a6) +AnimateSendingOutMon: ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] @@ -227,13 +227,13 @@ AnimateSendingOutMon: ; f61a6 (3d:f61a6) add $31 jr CopyUncompressedPicToHL -CopyUncompressedPicToTilemap: ; f61f9 (3d:61f9) +CopyUncompressedPicToTilemap: ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] ld l, a ld a, [$ffe1] -CopyUncompressedPicToHL: ; f6203 (3d:6203) +CopyUncompressedPicToHL: ld bc, $707 ld de, $14 push af @@ -288,4 +288,4 @@ INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" -INCLUDE "engine/battle/moveEffects/paralyze_effect.asm"
\ No newline at end of file +INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index 278cce61..df9145f2 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -1,5 +1,5 @@ ; formats a string at wMovesString that lists the moves at wMoves -FormatMovesString: ; 39b06 (e:5b06) +FormatMovesString: ld hl, wMoves ld de, wMovesString ld b, $0 @@ -52,7 +52,7 @@ FormatMovesString: ; 39b06 (e:5b06) ret ; XXX this is called in a few places, but it doesn't appear to do anything useful -InitList: ; 39b53 (e:5b53) +InitList: ld a, [wInitListType] cp INIT_ENEMYOT_LIST jr nz, .notEnemy @@ -100,4 +100,4 @@ InitList: ; 39b53 (e:5b53) ld [wItemPrices], a ld a, b ld [wItemPrices + 1], a - ret
\ No newline at end of file + ret diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index e3527897..2f3e4e91 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -1,5 +1,5 @@ -BattleTransition: ; 709d7 (1c:49d7) - ld a, $1 +BattleTransition: + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a @@ -70,7 +70,7 @@ BattleTransition: ; 709d7 (1c:49d7) ; bit 0: set if trainer battle ; bit 1: set if enemy is at least 3 levels higher than player ; bit 2: set if dungeon map -BattleTransitions: ; 70a3c (1c:4a3c) +BattleTransitions: dw BattleTransition_DoubleCircle ; %000 dw BattleTransition_Spiral ; %001 dw BattleTransition_Circle ; %010 @@ -80,7 +80,7 @@ BattleTransitions: ; 70a3c (1c:4a3c) dw BattleTransition_VerticalStripes ; %110 dw BattleTransition_Split ; %111 -GetBattleTransitionID_WildOrTrainer: ; 70a4c (1c:4a4c) +GetBattleTransitionID_WildOrTrainer: ld a, [wCurOpponent] cp 200 jr nc, .trainer @@ -90,7 +90,7 @@ GetBattleTransitionID_WildOrTrainer: ; 70a4c (1c:4a4c) set 0, c ret -GetBattleTransitionID_CompareLevels: ; 70a59 (1c:4a59) +GetBattleTransitionID_CompareLevels: ld hl, wPartyMon1HP .faintedLoop ld a, [hli] @@ -121,7 +121,7 @@ GetBattleTransitionID_CompareLevels: ; 70a59 (1c:4a59) ; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, ; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps -GetBattleTransitionID_IsDungeonMap: ; 70a83 (1c:4a83) +GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] ld e, a ld hl, DungeonMaps1 @@ -153,7 +153,7 @@ GetBattleTransitionID_IsDungeonMap: ; 70a83 (1c:4a83) ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is equal to one of these maps -DungeonMaps1: ; 70aa9 (1c:4aa9) +DungeonMaps1: db VIRIDIAN_FOREST db ROCK_TUNNEL_1 db SEAFOAM_ISLANDS_1 @@ -162,7 +162,7 @@ DungeonMaps1: ; 70aa9 (1c:4aa9) ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps -DungeonMaps2: ; 70aac (1c:4aac) +DungeonMaps2: ; all MT_MOON maps db MT_MOON_1 db MT_MOON_3 @@ -181,17 +181,17 @@ DungeonMaps2: ; 70aac (1c:4aac) db UNKNOWN_DUNGEON_1 db $FF -LoadBattleTransitionTile: ; 70ab7 (1c:4ab7) +LoadBattleTransitionTile: ld hl, vChars1 + $7f0 ld de, BattleTransitionTile lb bc, BANK(BattleTransitionTile), (BattleTransitionTileEnd - BattleTransitionTile) / $10 jp CopyVideoData -BattleTransitionTile: ; 70ac3 (1c:4ac3) +BattleTransitionTile: INCBIN "gfx/battle_transition.2bpp" BattleTransitionTileEnd: -BattleTransition_BlackScreen: ; 70ad3 (1c:4ad3) +BattleTransition_BlackScreen: ld a, $ff ld [rBGP], a ld [rOBP0], a @@ -205,7 +205,7 @@ BattleTransition_BlackScreen: ; 70ad3 (1c:4ad3) ; called regardless of mon levels, but does an ; outward spiral if enemy is at least 3 levels ; higher than player and does an inward spiral otherwise -BattleTransition_Spiral: ; 70ae5 (1c:4ae5) +BattleTransition_Spiral: ld a, [wBattleTransitionSpiralDirection] and a jr z, .outwardSpiral @@ -238,7 +238,7 @@ BattleTransition_Spiral: ; 70ae5 (1c:4ae5) ld [wOutwardSpiralTileMapPointer], a ret -BattleTransition_InwardSpiral: ; 70b1d (1c:4b1d) +BattleTransition_InwardSpiral: ld a, 7 ld [wInwardSpiralUpdateScreenCounter], a coord hl, 0, 0 @@ -268,7 +268,7 @@ BattleTransition_InwardSpiral: ; 70b1d (1c:4b1d) jr nz, .loop ret -BattleTransition_InwardSpiral_: ; 70b53 (1c:4b53) +BattleTransition_InwardSpiral_: push bc .loop ld [hl], $ff @@ -287,7 +287,7 @@ BattleTransition_InwardSpiral_: ; 70b53 (1c:4b53) pop bc ret -BattleTransition_OutwardSpiral_: ; 70b6c (1c:4b6c) +BattleTransition_OutwardSpiral_: ld bc, -SCREEN_WIDTH ld de, SCREEN_WIDTH ld a, [wOutwardSpiralTileMapPointer + 1] @@ -355,7 +355,7 @@ BattleTransition_OutwardSpiral_: ; 70b6c (1c:4b6c) jr .done FlashScreen: -BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) +BattleTransition_FlashScreen_: ld hl, BattleTransition_FlashScreenPalettes .loop ld a, [hli] @@ -363,7 +363,7 @@ BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) jr z, .done ld [rBGP], a call UpdateGBCPal_BGP - ld c, $2 + ld c, 2 call DelayFrames jr .loop .done @@ -371,13 +371,13 @@ BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) jr nz, BattleTransition_FlashScreen_ ret -BattleTransition_FlashScreenPalettes: ; 70be8 (1c:4be8) +BattleTransition_FlashScreenPalettes: db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4 db $01 ; terminator ; used for low level trainer dungeon battles -BattleTransition_Shrink: ; 70bf4 (1c:4bf4) - ld c,9 +BattleTransition_Shrink: + ld c, 9 .loop push bc xor a @@ -410,8 +410,8 @@ BattleTransition_Shrink: ; 70bf4 (1c:4bf4) jp DelayFrames ; used for high level trainer dungeon battles -BattleTransition_Split: ; 70c40 (1c:4c40) - ld c,$9 +BattleTransition_Split: + ld c, 9 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop @@ -441,7 +441,7 @@ BattleTransition_Split: ; 70c40 (1c:4c40) ld c, 10 jp DelayFrames -BattleTransition_CopyTiles1: ; 70c88 (1c:4c88) +BattleTransition_CopyTiles1: ld a, c ld [wBattleTransitionCopyTilesOffset], a ld a, b @@ -473,7 +473,7 @@ BattleTransition_CopyTiles1: ; 70c88 (1c:4c88) jr nz, .loop2 ret -BattleTransition_CopyTiles2: ; 70cb5 (1c:4cb5) +BattleTransition_CopyTiles2: ld a, c ld [wBattleTransitionCopyTilesOffset], a ld a, b @@ -523,7 +523,7 @@ BattleTransition_CopyTiles2: ; 70cb5 (1c:4cb5) ret ; used for high level wild dungeon battles -BattleTransition_VerticalStripes: ; 70cf4 (1c:4cf4) +BattleTransition_VerticalStripes: ld c, SCREEN_HEIGHT coord hl, 0, 0 coord de, 1, 17 @@ -551,7 +551,7 @@ BattleTransition_VerticalStripes: ; 70cf4 (1c:4cf4) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_VerticalStripes_: ; 70d20 (1c:4d20) +BattleTransition_VerticalStripes_: ld c, SCREEN_WIDTH / 2 .loop ld [hl], $ff @@ -562,7 +562,7 @@ BattleTransition_VerticalStripes_: ; 70d20 (1c:4d20) ret ; used for low level wild dungeon battles -BattleTransition_HorizontalStripes: ; 70d2a (1c:4d2a) +BattleTransition_HorizontalStripes: ld c, SCREEN_WIDTH coord hl, 0, 0 coord de, 19, 1 @@ -586,7 +586,7 @@ BattleTransition_HorizontalStripes: ; 70d2a (1c:4d2a) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_HorizontalStripes_: ; 70d4e (1c:4d4e) +BattleTransition_HorizontalStripes_: ld c, SCREEN_HEIGHT / 2 ld de, SCREEN_WIDTH * 2 .loop @@ -599,7 +599,7 @@ BattleTransition_HorizontalStripes_: ; 70d4e (1c:4d4e) ; used for high level wild non-dungeon battles ; makes one full circle around the screen ; by animating each half circle one at a time -BattleTransition_Circle: ; 70d5a (1c:4d5a) +BattleTransition_Circle: call BattleTransition_FlashScreen lb bc, 0, SCREEN_WIDTH / 2 ld hl, BattleTransition_HalfCircle1 @@ -610,14 +610,14 @@ BattleTransition_Circle: ; 70d5a (1c:4d5a) call BattleTransition_Circle_Sub1 jp BattleTransition_BlackScreen -BattleTransition_FlashScreen: ; 70d73 (1c:4d73) +BattleTransition_FlashScreen: ld b, $3 call BattleTransition_FlashScreen_ xor a ld [H_AUTOBGTRANSFERENABLED], a ret -BattleTransition_Circle_Sub1: ; 70d7c (1c:4d7c) +BattleTransition_Circle_Sub1: push bc push hl ld a, b @@ -631,8 +631,8 @@ BattleTransition_Circle_Sub1: ; 70d7c (1c:4d7c) jr nz, BattleTransition_Circle_Sub1 ret -BattleTransition_TransferDelay3: ; 70d8f (1c:4d8f) - ld a, $1 +BattleTransition_TransferDelay3: + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a @@ -642,7 +642,7 @@ BattleTransition_TransferDelay3: ; 70d8f (1c:4d8f) ; used for low level wild non-dungeon battles ; makes two half circles around the screen ; by animating both half circles at the same time -BattleTransition_DoubleCircle: ; 70d9a (1c:4d9a) +BattleTransition_DoubleCircle: call BattleTransition_FlashScreen ld c, SCREEN_WIDTH / 2 ld hl, BattleTransition_HalfCircle1 @@ -670,7 +670,7 @@ BattleTransition_DoubleCircle: ; 70d9a (1c:4d9a) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_Circle_Sub2: ; 70dc6 (1c:4dc6) +BattleTransition_Circle_Sub2: ld [wBattleTransitionCircleScreenQuadrantY], a ld a, [hli] ld [wBattleTransitionCircleScreenQuadrantX], a @@ -683,7 +683,7 @@ BattleTransition_Circle_Sub2: ; 70dc6 (1c:4dc6) ld l, a jp BattleTransition_Circle_Sub3 -BattleTransition_HalfCircle1: ; 70dd7 (1c:4dd7) +BattleTransition_HalfCircle1: db $01 dw BattleTransition_CircleData1 dwCoord 18, 6 @@ -724,7 +724,7 @@ BattleTransition_HalfCircle1: ; 70dd7 (1c:4dd7) dw BattleTransition_CircleData1 dwCoord 1, 6 -BattleTransition_HalfCircle2: ; 70d93 (1c:4e09) +BattleTransition_HalfCircle2: db $00 dw BattleTransition_CircleData1 dwCoord 1, 11 @@ -765,7 +765,7 @@ BattleTransition_HalfCircle2: ; 70d93 (1c:4e09) dw BattleTransition_CircleData1 dwCoord 18, 11 -BattleTransition_Circle_Sub3: ; 70e3b (1c:4e3b) +BattleTransition_Circle_Sub3: push hl ld a, [de] ld c, a @@ -810,17 +810,17 @@ BattleTransition_Circle_Sub3: ; 70e3b (1c:4e3b) jr nz, .loop2 jr BattleTransition_Circle_Sub3 -BattleTransition_CircleData1: ; 70e74 (1c:4e74) +BattleTransition_CircleData1: db $02,$03,$05,$04,$09,$FF -BattleTransition_CircleData2: ; 70e7a (1c:4e7a) +BattleTransition_CircleData2: db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF -BattleTransition_CircleData3: ; 70e84 (1c:4e84) +BattleTransition_CircleData3: db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF -BattleTransition_CircleData4: ; 70e97 (1c:4e97) +BattleTransition_CircleData4: db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF -BattleTransition_CircleData5: ; 70ea3 (1c:4ea3) +BattleTransition_CircleData5: db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index a0c44346..d84d0300 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,5 +1,5 @@ -PrintBeginningBattleText: ; f4000 (3d:4000) - ld a, [wIsInBattle] ; W_ISINBATTLE +PrintBeginningBattleText: + ld a, [wIsInBattle] dec a jr nz, .trainerBattle ld a, [wCurMap] @@ -80,37 +80,37 @@ PrintBeginningBattleText: ; f4000 (3d:4000) ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a - ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3 + ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish .done ret -WildMonAppearedText: ; f40c7 (3d:40c7) +WildMonAppearedText: TX_FAR _WildMonAppearedText db "@" -HookedMonAttackedText: ; f40cc (3d:40cc) +HookedMonAttackedText: TX_FAR _HookedMonAttackedText db "@" -EnemyAppearedText: ; f40d1 (3d:40d1) +EnemyAppearedText: TX_FAR _EnemyAppearedText db "@" -TrainerWantsToFightText: ; f40d6 (3d:40d6) +TrainerWantsToFightText: TX_FAR _TrainerWantsToFightText db "@" -UnveiledGhostText: ; f40db (3d:40db) +UnveiledGhostText: TX_FAR _UnveiledGhostText db "@" -GhostCantBeIDdText: ; f40e0 (3d:40e0) +GhostCantBeIDdText: TX_FAR _GhostCantBeIDdText db "@" -PrintSendOutMonMessage: ; f40e0 (3d:40e5) +PrintSendOutMonMessage: ld hl, wEnemyMonHP ld a, [hli] or [hl] @@ -153,38 +153,38 @@ PrintSendOutMonMessage: ; f40e0 (3d:40e5) .printText jp PrintText -GoText: ; f413a (3d:413a) +GoText: TX_FAR _GoText TX_ASM jr PrintPlayerMon1Text -DoItText: ; f4141 (3d:4141) +DoItText: TX_FAR _DoItText TX_ASM jr PrintPlayerMon1Text -GetmText: ; f4148 (3d:4148) +GetmText: TX_FAR _GetmText TX_ASM jr PrintPlayerMon1Text -EnemysWeakText: ; f414f (3d:414f) +EnemysWeakText: TX_FAR _EnemysWeakText TX_ASM -PrintPlayerMon1Text: ; f4154 (3d:4154) +PrintPlayerMon1Text: ld hl, PlayerMon1Text ret -PlayerMon1Text: ; f4158 (3d:4158) +PlayerMon1Text: TX_FAR _PlayerMon1Text db "@" -RetreatMon: ; f415d (3d:415d) +RetreatMon: ld hl, PlayerMon2Text jp PrintText -PlayerMon2Text: ; f4163 (3d:4163) +PlayerMon2Text: TX_FAR _PlayerMon2Text TX_ASM push de @@ -235,25 +235,25 @@ PlayerMon2Text: ; f4163 (3d:4163) ld hl, GoodText ; HP went down 70% or more ret -EnoughText: ; f41b1 (3d:41b1) +EnoughText: TX_FAR _EnoughText TX_ASM jr PrintComeBackText -OKExclamationText: ; f41b8 (3d:41b8) +OKExclamationText: TX_FAR _OKExclamationText TX_ASM jr PrintComeBackText -GoodText: ; f41bf (3d:41bf) +GoodText: TX_FAR _GoodText TX_ASM jr PrintComeBackText -PrintComeBackText: ; f41c6 (3d:41c6) +PrintComeBackText: ld hl, ComeBackText ret -ComeBackText: ; f41ca (3d:41ca) +ComeBackText: TX_FAR _ComeBackText db "@" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 24b3863b..c061b291 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,7 +1,7 @@ BattleCore: ; These are move effects (second value from the Moves table in bank $E). -ResidualEffects1: ; 3c000 (f:4000) +ResidualEffects1: ; most non-side effects db CONVERSION_EFFECT db HAZE_EFFECT @@ -20,13 +20,13 @@ ResidualEffects1: ; 3c000 (f:4000) db LEECH_SEED_EFFECT db SPLASH_EFFECT db -1 -SetDamageEffects: ; 3c011 (f:4011) +SetDamageEffects: ; moves that do damage but not through normal calculations ; e.g., Super Fang, Psywave db SUPER_FANG_EFFECT db SPECIAL_DAMAGE_EFFECT db -1 -ResidualEffects2: ; 3c014 (f:4014) +ResidualEffects2: ; non-side effects not included in ResidualEffects1 ; stat-affecting moves, sleep-inflicting moves, and Bide ; e.g., Meditate, Bide, Hypnosis @@ -58,7 +58,7 @@ ResidualEffects2: ; 3c014 (f:4014) db ACCURACY_DOWN2_EFFECT db EVASION_DOWN2_EFFECT db -1 -AlwaysHappenSideEffects: ; 3c030 (f:4030) +AlwaysHappenSideEffects: ; Attacks that aren't finished after they faint the opponent. db DRAIN_HP_EFFECT db EXPLODE_EFFECT @@ -71,7 +71,7 @@ AlwaysHappenSideEffects: ; 3c030 (f:4030) db TWINEEDLE_EFFECT db RAGE_EFFECT db -1 -SpecialEffects: ; 3c03b (f:403b) +SpecialEffects: ; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage. ; Includes all effects that do not need to be called at the end of ; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled @@ -90,13 +90,13 @@ SpecialEffects: ; 3c03b (f:403b) db JUMP_KICK_EFFECT db RECOIL_EFFECT ; fallthrough to Next EffectsArray -SpecialEffectsCont: ; 3c049 (f:4049) +SpecialEffectsCont: ; damaging moves whose effect is executed prior to damage calculation db THRASH_PETAL_DANCE_EFFECT db TRAPPING_EFFECT db -1 -SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) +SlidePlayerAndEnemySilhouettesOnScreen: call LoadPlayerBackPic ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen ld [wTextBoxID], a @@ -196,7 +196,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ; the lower of the player's pic (his body) is part of the background, but his head is a sprite ; the reason for this is that it shares Y coordinates with the lower part of the enemy pic, so background scrolling wouldn't work for both pics ; instead, the enemy pic is part of the background and uses the scroll register, while the player's head is a sprite and is slid by changing its X coordinates in a loop -SlidePlayerHeadLeft: ; 3c108 (f:4108) +SlidePlayerHeadLeft: push bc ld hl, wOAMBuffer + $01 ld c, $15 ; number of OAM entries @@ -210,7 +210,7 @@ SlidePlayerHeadLeft: ; 3c108 (f:4108) pop bc ret -SetScrollXForSlidingPlayerBodyLeft: ; 3c119 (f:4119) +SetScrollXForSlidingPlayerBodyLeft: ld a, [rLY] cp l jr nz, SetScrollXForSlidingPlayerBodyLeft @@ -222,7 +222,7 @@ SetScrollXForSlidingPlayerBodyLeft: ; 3c119 (f:4119) jr z, .loop ret -StartBattle: ; 3c127 (f:4127) +StartBattle: xor a ld [wPartyGainExpFlags], a ld [wPartyFoughtCurrentEnemyFlags], a @@ -350,7 +350,7 @@ StartBattle: ; 3c127 (f:4127) jr MainInBattleLoop ; wild mon or link battle enemy ran from battle -EnemyRan: ; 3c202 (f:4218) +EnemyRan: call LoadScreenTilesFromBuffer1 ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -368,15 +368,15 @@ EnemyRan: ; 3c202 (f:4218) ld [H_WHOSETURN], a jpab AnimationSlideEnemyMonOff -WildRanText: ; 3c23f (f:423f) +WildRanText: TX_FAR _WildRanText db "@" -EnemyRanText: ; 3c23f (f:423f) +EnemyRanText: TX_FAR _EnemyRanText db "@" -MainInBattleLoop: ; 3c249 (f:4249) +MainInBattleLoop: call ReadPlayerMonCurHPAndStatus ld hl, wBattleMonHP ld a, [hli] @@ -566,7 +566,7 @@ MainInBattleLoop: ; 3c249 (f:4249) call CheckNumAttacksLeft jp MainInBattleLoop -HandlePoisonBurnLeechSeed: ; 3c3d3 (f:43d3) +HandlePoisonBurnLeechSeed: ld hl, wBattleMonHP ld de, wBattleMonStatus ld a, [H_WHOSETURN] @@ -630,15 +630,15 @@ HandlePoisonBurnLeechSeed: ; 3c3d3 (f:43d3) xor a ret -HurtByPoisonText: ; 3c444 (f:4444) +HurtByPoisonText: TX_FAR _HurtByPoisonText db "@" -HurtByBurnText: ; 3c449 (f:4449) +HurtByBurnText: TX_FAR _HurtByBurnText db "@" -HurtByLeechSeedText: ; 3c44e (f:444e) +HurtByLeechSeedText: TX_FAR _HurtByLeechSeedText db "@" @@ -646,7 +646,7 @@ HurtByLeechSeedText: ; 3c44e (f:444e) ; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch) ; hl: HP pointer ; bc (out): total damage -HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) +HandlePoisonBurnLeechSeed_DecreaseOwnHP: push hl push hl ld bc, $e ; skip to max HP @@ -714,7 +714,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) ; adds bc to enemy HP ; bc isn't updated if HP substracted was capped to prevent overkill -HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4b9 (f:44b9) +HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP ld a, [H_WHOSETURN] @@ -764,7 +764,7 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4b9 (f:44b9) pop hl ret -UpdateCurMonHPBar: ; 3c50c (f:450c) +UpdateCurMonHPBar: coord hl, 10, 9 ; tile pointer to player HP bar ld a, [H_WHOSETURN] and a @@ -779,7 +779,7 @@ UpdateCurMonHPBar: ; 3c50c (f:450c) pop bc ret -CheckNumAttacksLeft: ; 3c525 (f:4525) +CheckNumAttacksLeft: ld a, [wPlayerNumAttacksLeft] and a jr nz, .checkEnemy @@ -795,7 +795,7 @@ CheckNumAttacksLeft: ; 3c525 (f:4525) res UsingTrappingMove, [hl] ; enemy not using multi-turn attack like wrap any more ret -HandleEnemyMonFainted: ; 3c53b (f:453b) +HandleEnemyMonFainted: xor a ld [wInHandlePlayerMonFainted], a call FaintEnemyPokemon @@ -828,7 +828,7 @@ HandleEnemyMonFainted: ; 3c53b (f:453b) ld [wActionResultOrTookBattleTurn], a jp MainInBattleLoop -FaintEnemyPokemon: ; 3c57d (f:457d) +FaintEnemyPokemon: call ReadPlayerMonCurHPAndStatus ld a, [wIsInBattle] dec a @@ -956,11 +956,11 @@ FaintEnemyPokemon: ; 3c57d (f:457d) ld [wPartyGainExpFlags], a jpab GainExperience -EnemyMonFaintedText: ; 3c654 (f:4654) +EnemyMonFaintedText: TX_FAR _EnemyMonFaintedText db "@" -EndLowHealthAlarm: ; 3c659 (f:4659) +EndLowHealthAlarm: ; This function is called when the player has the won the battle. It turns off ; the low health alarm and prevents it from reactivating until the next battle. xor a @@ -970,7 +970,7 @@ EndLowHealthAlarm: ; 3c659 (f:4659) ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret -AnyEnemyPokemonAliveCheck: ; 3c665 (f:4665) +AnyEnemyPokemonAliveCheck: ld a, [wEnemyPartyCount] ld b, a xor a @@ -988,7 +988,7 @@ AnyEnemyPokemonAliveCheck: ; 3c665 (f:4665) ret ; stores whether enemy ran in Z flag -ReplaceFaintedEnemyMon: ; 3c67a (f:467a) +ReplaceFaintedEnemyMon: ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor @@ -1016,7 +1016,7 @@ ReplaceFaintedEnemyMon: ; 3c67a (f:467a) inc a ; reset Z flag ret -TrainerBattleVictory: ; 3c6b8 (f:46b8) +TrainerBattleVictory: call EndLowHealthAlarm ld b, MUSIC_DEFEATED_GYM_LEADER ld a, [wGymLeaderNo] @@ -1052,15 +1052,15 @@ TrainerBattleVictory: ; 3c6b8 (f:46b8) ld c, $3 predef_jump AddBCDPredef -MoneyForWinningText: ; 3c706 (f:4706) +MoneyForWinningText: TX_FAR _MoneyForWinningText db "@" -TrainerDefeatedText: ; 3c70b (f:470b) +TrainerDefeatedText: TX_FAR _TrainerDefeatedText db "@" -PlayBattleVictoryMusic: ; 3c710 (f:4710) +PlayBattleVictoryMusic: push af call StopAllMusic ld c, BANK(Music_DefeatedTrainer) @@ -1068,7 +1068,7 @@ PlayBattleVictoryMusic: ; 3c710 (f:4710) call PlayMusic jp Delay3 -HandlePlayerMonFainted: ; 3c71d (f:471d) +HandlePlayerMonFainted: ld a, 1 ld [wInHandlePlayerMonFainted], a call RemoveFaintedPlayerMon @@ -1102,7 +1102,7 @@ HandlePlayerMonFainted: ; 3c71d (f:471d) jp MainInBattleLoop ; resets flags, slides mon's pic down, plays cry, and prints fainted message -RemoveFaintedPlayerMon: ; 3c75e (f:475e) +RemoveFaintedPlayerMon: ld a, [wPlayerMonNumber] ld c, a ld hl, wPartyGainExpFlags @@ -1172,13 +1172,13 @@ RemoveFaintedPlayerMon: ; 3c75e (f:475e) callabd_ModifyPikachuHappiness PIKAHAPPY_CARELESSTRAINER ret -PlayerMonFaintedText: ; 3c7fa (f:47fa) +PlayerMonFaintedText: TX_FAR _PlayerMonFaintedText db "@" ; asks if you want to use next mon ; stores whether you ran in C flag -DoUseNextMonDialogue: ; 3c7ff (f:47ff) +DoUseNextMonDialogue: call PrintEmptyString call SaveScreenTilesToBuffer1 ld a, [wIsInBattle] @@ -1206,13 +1206,13 @@ DoUseNextMonDialogue: ; 3c7ff (f:47ff) ld de, wEnemyMonSpeed jp TryRunningFromBattle -UseNextMonText: ; 3c837 (f:4837) +UseNextMonText: TX_FAR _UseNextMonText db "@" ; choose next player mon to send out ; stores whether enemy mon has no HP left in Z flag -ChooseNextMon: ; 3c83c (f:483c) +ChooseNextMon: ld a, BATTLE_PARTY_MENU ld [wPartyMenuTypeOrMessageID], a call DisplayPartyMenu @@ -1227,7 +1227,7 @@ ChooseNextMon: ; 3c83c (f:483c) ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .notLinkBattle - ld a, $1 + ld a, 1 ld [wActionResultOrTookBattleTurn], a call LinkBattleExchangeData .notLinkBattle @@ -1258,7 +1258,7 @@ ChooseNextMon: ; 3c83c (f:483c) ; called when player is out of usable mons. ; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) -HandlePlayerBlackOut: ; 3c89c (f:489c) +HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .notSony1Battle @@ -1293,21 +1293,21 @@ HandlePlayerBlackOut: ; 3c89c (f:489c) scf ret -Sony1WinText: ; 3c8e9 (f:48e9) +Sony1WinText: TX_FAR _Sony1WinText db "@" -PlayerBlackedOutText2: ; 3c8ee (f:48ee) +PlayerBlackedOutText2: TX_FAR _PlayerBlackedOutText2 db "@" -LinkBattleLostText: ; 3c8f3 (f:48f3) +LinkBattleLostText: TX_FAR _LinkBattleLostText db "@" ; slides pic of fainted mon downwards until it disappears ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing -SlideDownFaintedMonPic: ; 3c8f8 (f:48f8) +SlideDownFaintedMonPic: ld a, [wd730] push af set 6, a @@ -1353,14 +1353,14 @@ SlideDownFaintedMonPic: ; 3c8f8 (f:48f8) ld [wd730], a ret -SevenSpacesText: ; 3c93c (f:493c) +SevenSpacesText: db " @" ; slides the player or enemy trainer off screen ; a is the number of tiles to slide it horizontally (always 9 for the player trainer or 8 for the enemy trainer) ; if a is 8, the slide is to the right, else it is to the left ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing -SlideTrainerPicOffScreen: ; 3c944 (f:4944) +SlideTrainerPicOffScreen: ld [hSlideAmount], a ld c, a .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right @@ -1401,7 +1401,7 @@ SlideTrainerPicOffScreen: ; 3c944 (f:4944) ret ; send out a trainer's mon -EnemySendOut: ; 3c973 (f:4973) +EnemySendOut: ld hl,wPartyGainExpFlags xor a ld [hl],a @@ -1417,7 +1417,7 @@ EnemySendOut: ; 3c973 (f:4973) predef FlagActionPredef ; don't change wPartyGainExpFlags or wPartyFoughtCurrentEnemyFlags -EnemySendOutFirstMon: ; 3c98f (f:498f) +EnemySendOutFirstMon: xor a ld hl,wEnemyStatsToDouble ; clear enemy statuses ld [hli],a @@ -1570,17 +1570,17 @@ EnemySendOutFirstMon: ; 3c98f (f:498f) call SaveScreenTilesToBuffer1 jp SwitchPlayerMon -TrainerAboutToUseText: ; 3cade (f:4ade) +TrainerAboutToUseText: TX_FAR _TrainerAboutToUseText db "@" -TrainerSentOutText: ; 3cae3 (f:4ae3) +TrainerSentOutText: TX_FAR _TrainerSentOutText db "@" ; tests if the player has any pokemon that are not fainted ; sets d = 0 if all fainted, d != 0 if some mons are still alive -AnyPartyAlive: ; 3cae8 (f:4ae8) +AnyPartyAlive: ld a, [wPartyCount] ld e, a xor a @@ -1598,7 +1598,7 @@ AnyPartyAlive: ; 3cae8 (f:4ae8) ; tests if player mon has fainted ; stores whether mon has fainted in Z flag -HasMonFainted: ; 3cafc (f:4afc) +HasMonFainted: ld a, [wWhichPokemon] ld hl, wPartyMon1HP ld bc, wPartyMon2 - wPartyMon1 @@ -1615,13 +1615,13 @@ HasMonFainted: ; 3cafc (f:4afc) xor a ret -NoWillText: ; 3cb19 (f:4b19) +NoWillText: TX_FAR _NoWillText db "@" ; try to run from battle (hl = player speed, de = enemy speed) ; stores whether the attempt was successful in carry flag -TryRunningFromBattle: ; 3cb1e (f:4b1e) +TryRunningFromBattle: call IsGhostBattle jp z, .canEscape ; jump if it's a ghost battle ld a, [wBattleType] @@ -1740,20 +1740,20 @@ TryRunningFromBattle: ; 3cb1e (f:4b1e) scf ; set carry ret -CantEscapeText: ; 3cc01 (f:4c01) +CantEscapeText: TX_FAR _CantEscapeText db "@" -NoRunningText: ; 3cc06 (f:4c06) +NoRunningText: TX_FAR _NoRunningText db "@" -GotAwayText: ; 3cc0b (f:4c0b) +GotAwayText: TX_FAR _GotAwayText db "@" ; copies from party data to battle mon data when sending out a new player mon -LoadBattleMonFromParty: ; 3cc10 (f:4c10) +LoadBattleMonFromParty: ld a, [wWhichPokemon] ld bc, wPartyMon2 - wPartyMon1 ld hl, wPartyMon1Species @@ -1797,7 +1797,7 @@ LoadBattleMonFromParty: ; 3cc10 (f:4c10) ret ; copies from enemy party data to current enemy mon data when sending out a new enemy mon -LoadEnemyMonFromParty: ; 3cc7d (f:4c7d) +LoadEnemyMonFromParty: ld a, [wWhichPokemon] ld bc, wEnemyMon2 - wEnemyMon1 ld hl, wEnemyMons @@ -1850,7 +1850,7 @@ LoadEnemyMonFromParty: ; 3cc7d (f:4c7d) ld [wEnemyMonPartyPos], a ret -SendOutMon: ; 3ccfb (f:4cfb) +SendOutMon: callab PrintSendOutMonMessage ld hl, wEnemyMonHP ld a, [hli] @@ -1914,7 +1914,7 @@ SendOutMon: ; 3ccfb (f:4cfb) jp SaveScreenTilesToBuffer1 ; show 2 stages of the player mon getting smaller before disappearing -AnimateRetreatingPlayerMon: ; 3cd97 (f:4d97) +AnimateRetreatingPlayerMon: ld a, [wWhichPokemon] push af ld a, [wPlayerMonNumber] @@ -1956,11 +1956,11 @@ AnimateRetreatingPlayerMon: ; 3cd97 (f:4d97) .clearScreenArea coord hl, 1, 5 lb bc, 7, 7 - call ClearScreenArea ; jp + call ClearScreenArea ret ; reads player's current mon's HP into wBattleMonHP -ReadPlayerMonCurHPAndStatus: ; 3ce08 (f:4e08) +ReadPlayerMonCurHPAndStatus: ld a, [wPlayerMonNumber] ld hl, wPartyMon1HP ld bc, wPartyMon2 - wPartyMon1 @@ -1971,11 +1971,11 @@ ReadPlayerMonCurHPAndStatus: ; 3ce08 (f:4e08) ld bc, $4 ; 2 bytes HP, 1 byte unknown (unused?), 1 byte status jp CopyData -DrawHUDsAndHPBars: ; 3ce1f (f:4e1f) +DrawHUDsAndHPBars: call DrawPlayerHUDAndHPBar jp DrawEnemyHUDAndHPBar -DrawPlayerHUDAndHPBar: ; 3ce25 (f:4e25) +DrawPlayerHUDAndHPBar: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 9, 7 @@ -2036,7 +2036,7 @@ DrawPlayerHUDAndHPBar: ; 3ce25 (f:4e25) set 7, [hl] ;enable low health alarm ret -DrawEnemyHUDAndHPBar: ; 3ceb1 (f:4eb1) +DrawEnemyHUDAndHPBar: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 0 @@ -2126,7 +2126,7 @@ DrawEnemyHUDAndHPBar: ; 3ceb1 (f:4eb1) ld [H_AUTOBGTRANSFERENABLED], a ld hl, wEnemyHPBarColor -GetBattleHealthBarColor: ; 3cf55 (f:4f55) +GetBattleHealthBarColor: ld b, [hl] call GetHealthBarColor ld a, [hl] @@ -2140,7 +2140,7 @@ GetBattleHealthBarColor: ; 3cf55 (f:4f55) ; (i.e. for names longer than 4 letters) ; if the name is 3 or 4 letters long, it is printed 1 space more to the right than usual ; (i.e. for names longer than 4 letters) -CenterMonName: ; 3cf61 (f:4f61) +CenterMonName: push de inc hl inc hl @@ -2161,7 +2161,7 @@ CenterMonName: ; 3cf61 (f:4f61) pop de ret -DisplayBattleMenu: ; 3cf78 (f:4f78) +DisplayBattleMenu: call LoadScreenTilesFromBuffer1 ; restore saved screen ld a, [wBattleType] and a @@ -2347,7 +2347,7 @@ DisplayBattleMenu: ; 3cf78 (f:4f78) call PrintText jp DisplayBattleMenu -.RunAwayText ; 3d0df (f:50df) +.RunAwayText TX_FAR _RunAwayText db "@" @@ -2376,7 +2376,7 @@ DisplayBattleMenu: ; 3cf78 (f:4f78) ld [wcf91], a jr UseBagItem -BagWasSelected: ; 3d10a (f:510a) +BagWasSelected: call LoadScreenTilesFromBuffer1 ld a, [wBattleType] and a ; is it a normal battle? @@ -2399,12 +2399,12 @@ BagWasSelected: ; 3d10a (f:510a) ld [wListPointer + 1], a jr DisplayBagMenu -SimulatedInputBattleItemList: ; 3c130 (f:5130) +SimulatedInputBattleItemList: db 1 ; # of items db POKE_BALL, 1 db $ff -DisplayPlayerBag: ; 3c134 (f:5134) +DisplayPlayerBag: ; get the pointer to player's bag when in a normal battle ld hl, wNumBagItems ld a, l @@ -2412,7 +2412,7 @@ DisplayPlayerBag: ; 3c134 (f:5134) ld a, h ld [wListPointer + 1], a -DisplayBagMenu: ; 3c13f (f:513f) +DisplayBagMenu: xor a ld [wPrintItemPrices], a ld a, ITEMLISTMENU @@ -2427,7 +2427,7 @@ DisplayBagMenu: ; 3c13f (f:513f) ld [wMenuItemToSwap], a jp c, DisplayBattleMenu ; go back to battle menu if an item was not selected -UseBagItem: ; 3c162 (f:5162) +UseBagItem: ; either use an item from the bag or use a safari zone item ld a, [wcf91] ld [wd11e], a @@ -2484,11 +2484,11 @@ UseBagItem: ; 3c162 (f:5162) scf ; set carry ret -ItemsCantBeUsedHereText: ; 3d1c8 (f:51c8) +ItemsCantBeUsedHereText: TX_FAR _ItemsCantBeUsedHereText db "@" -PartyMenuOrRockOrRun: ; 3d1cd (f:51cd) +PartyMenuOrRockOrRun: dec a ; was Run selected? jp nz, BattleMenu_RunWasSelected ; party menu or rock was selected @@ -2561,7 +2561,7 @@ PartyMenuOrRockOrRun: ; 3d1cd (f:51cd) predef StatusScreen predef StatusScreen2 ; now we need to reload the enemy mon pic - ld a, $1 + ld a, 1 ld [H_WHOSETURN], a ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does the enemy mon have a substitute? @@ -2608,7 +2608,7 @@ PartyMenuOrRockOrRun: ; 3d1cd (f:51cd) call GBPalNormal ; fall through to SwitchPlayerMon -SwitchPlayerMon: ; 3d2c1 (f:52c1) +SwitchPlayerMon: callab RetreatMon ld c, 50 call DelayFrames @@ -2631,11 +2631,11 @@ SwitchPlayerMon: ; 3d2c1 (f:52c1) and a ret -AlreadyOutText: ; 3d2fc (f:52fc) +AlreadyOutText: TX_FAR _AlreadyOutText db "@" -BattleMenu_RunWasSelected: ; 3d301 (f:5301) +BattleMenu_RunWasSelected: call LoadScreenTilesFromBuffer1 ld a, $3 ld [wCurrentMenuItem], a @@ -2650,7 +2650,7 @@ BattleMenu_RunWasSelected: ; 3d301 (f:5301) ret nz ; return if the player couldn't escape jp DisplayBattleMenu -MoveSelectionMenu: ; 3d320 (f:5320) +MoveSelectionMenu: ld a, [wMoveMenuType] dec a jr z, .mimicmenu @@ -2764,7 +2764,7 @@ MoveSelectionMenu: ; 3d320 (f:5320) ld [hl], a ; fallthrough -SelectMenuItem: ; 3d3fe (f:53fe) +SelectMenuItem: ld a, [wMoveMenuType] and a jr z, .battleselect @@ -2859,18 +2859,18 @@ SelectMenuItem: ; 3d3fe (f:53fe) call LoadScreenTilesFromBuffer1 jp MoveSelectionMenu -MoveNoPPText: ; 3d4ae (f:54ae) +MoveNoPPText: TX_FAR _MoveNoPPText db "@" -MoveDisabledText: ; 3d4b3 (f:54b3) +MoveDisabledText: TX_FAR _MoveDisabledText db "@" -WhichTechniqueString: ; 3d4b8 (f:54b8) +WhichTechniqueString: db "WHICH TECHNIQUE?@" -SelectMenuItem_CursorUp: ; 3d4c9 (f:54c9) +SelectMenuItem_CursorUp: ld a, [wCurrentMenuItem] and a jp nz, SelectMenuItem @@ -2880,7 +2880,7 @@ SelectMenuItem_CursorUp: ; 3d4c9 (f:54c9) ld [wCurrentMenuItem], a jp SelectMenuItem -SelectMenuItem_CursorDown: ; 3d4dd (f:54dd) +SelectMenuItem_CursorDown: ld a, [wCurrentMenuItem] ld b, a ld a, [wNumMovesMinusOne] @@ -2893,7 +2893,7 @@ SelectMenuItem_CursorDown: ; 3d4dd (f:54dd) ld [wCurrentMenuItem], a jp SelectMenuItem -Func_3d4f5: ; 3d4f5 (f:54f5) +Func_3d4f5: bit 3, a ld a, $0 jr nz, .asm_3d4fd @@ -2912,19 +2912,19 @@ Func_3d4f5: ; 3d4f5 (f:54f5) callab Func_78e98 jp MoveSelectionMenu -Func_3d523: ; 3d523 (f:5523) +Func_3d523: ld a, [wTestBattlePlayerSelectedMove] dec a jr asm_3d52d -Func_3d529: ; 3d529 (f:5529) +Func_3d529: ld a, [wTestBattlePlayerSelectedMove] inc a -asm_3d52d: ; 3d52d (f:552d) +asm_3d52d: ld [wTestBattlePlayerSelectedMove], a call Func_3d536 jp MoveSelectionMenu -Func_3d536: ; 3d536 (f:5536) +Func_3d536: coord hl, 10, 16 lb bc, 2, 10 call ClearScreenArea @@ -2942,7 +2942,7 @@ Func_3d536: ; 3d536 (f:5536) coord hl, 13, 17 jp PlaceString -AnyMoveToSelect: ; 3d55f (f:555f) +AnyMoveToSelect: ; return z and Struggle as the selected move if all moves have 0 PP and/or are disabled ld a, STRUGGLE ld [wPlayerSelectedMove], a @@ -2961,7 +2961,7 @@ AnyMoveToSelect: ; 3d55f (f:555f) jr .noMovesLeft .handleDisabledMove swap a - and $f ; get move disabled + and $f ; get disabled move ld b, a ld d, NUM_MOVES + 1 xor a @@ -2988,11 +2988,11 @@ AnyMoveToSelect: ; 3d55f (f:555f) xor a ret -NoMovesLeftText: ; 3d59b (f:559b) +NoMovesLeftText: TX_FAR _NoMovesLeftText db "@" -SwapMovesInMenu: ; 3d5a0 (f:55a0) +SwapMovesInMenu: ld a, [wPlayerBattleStatus3] bit Transformed, a jp nz, MoveSelectionMenu @@ -3071,7 +3071,7 @@ SwapMovesInMenu: ; 3d5a0 (f:55a0) ld [wMenuItemToSwap], a ; select the current menu item for swapping jp MoveSelectionMenu -PrintMenuItem: ; 3d629 (f:5629) +PrintMenuItem: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 8 @@ -3141,13 +3141,13 @@ PrintMenuItem: ; 3d629 (f:5629) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -DisabledText: ; 3d6c7 (f:56c7) +DisabledText: db "Disabled!@" -TypeText: ; 3d6d1 (f:56d1) +TypeText: db "TYPE@" -SelectEnemyMove: ; 3d6d6 (f:56d6) +SelectEnemyMove: ld a, [wLinkState] sub LINK_STATE_BATTLING jr nz, .noLinkBattle @@ -3240,7 +3240,7 @@ SelectEnemyMove: ; 3d6d6 (f:56d6) jr .done ; this appears to exchange data with the other gameboy during link battles -LinkBattleExchangeData: ; 3d777 (f:5777) +LinkBattleExchangeData: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a ld a, [wPlayerMoveListIndex] @@ -3288,7 +3288,7 @@ LinkBattleExchangeData: ; 3d777 (f:5777) jr nz, .syncLoop3 ret -ExecutePlayerMove: ; 3d7d0 (f:57d0) +ExecutePlayerMove: xor a ld [H_WHOSETURN], a ; set player's turn ld a, [wPlayerSelectedMove] @@ -3316,7 +3316,7 @@ ExecutePlayerMove: ; 3d7d0 (f:57d0) call CheckForDisobedience jp z, ExecutePlayerMoveDone -CheckIfPlayerNeedsToChargeUp: ; 3d80c (f:580c) +CheckIfPlayerNeedsToChargeUp: ld a, [wPlayerMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect @@ -3325,13 +3325,13 @@ CheckIfPlayerNeedsToChargeUp: ; 3d80c (f:580c) jr PlayerCanExecuteMove ; in-battle stuff -PlayerCanExecuteChargingMove: ; 3d81b (f:581b) +PlayerCanExecuteChargingMove: ld hl,wPlayerBattleStatus1 res ChargingUp,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack ; being fully paralyzed or hurting oneself in confusion removes charging up status ; resulting in the Pokemon being invulnerable for the whole battle res Invulnerable,[hl] -PlayerCanExecuteMove: ; 3d822 (f:5822) +PlayerCanExecuteMove: call PrintMonName1Text ld hl,DecrementPP ld de,wPlayerSelectedMove ; pointer to the move just used @@ -3348,7 +3348,7 @@ PlayerCanExecuteMove: ; 3d822 (f:5822) ld de,1 call IsInArray call c,JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything -PlayerCalcMoveDamage: ; 3d84e (f:584e) +PlayerCalcMoveDamage: ld a,[wPlayerMoveEffect] ld hl,SetDamageEffects ld de,1 @@ -3365,7 +3365,7 @@ PlayerCalcMoveDamage: ; 3d84e (f:584e) call RandomizeDamage .moveHitTest call MoveHitTest -handleIfPlayerMoveMissed: ; 3d877 (f:5877) +handleIfPlayerMoveMissed: ld a,[wMoveMissed] and a jr z,getPlayerAnimationType @@ -3373,13 +3373,13 @@ handleIfPlayerMoveMissed: ; 3d877 (f:5877) sub a,EXPLODE_EFFECT jr z,playPlayerMoveAnimation ; don't play any animation if the move missed, unless it was EXPLODE_EFFECT jr playerCheckIfFlyOrChargeEffect -getPlayerAnimationType: ; 3d87b (f:587b) +getPlayerAnimationType: ld a,[wPlayerMoveEffect] and a ld a,4 ; move has no effect other than dealing damage jr z,playPlayerMoveAnimation ld a,5 ; move has effect -playPlayerMoveAnimation ; 3d890 (f:5890) +playPlayerMoveAnimation: push af ld a,[wPlayerBattleStatus2] bit HasSubstituteUp,a @@ -3398,7 +3398,7 @@ playPlayerMoveAnimation ; 3d890 (f:5890) ld b,BANK(ReshowSubstituteAnim) call nz,Bankswitch jr MirrorMoveCheck -playerCheckIfFlyOrChargeEffect ; 3d8bd (f:58bd) +playerCheckIfFlyOrChargeEffect: ld c,30 call DelayFrames ld a,[wPlayerMoveEffect] @@ -3412,7 +3412,7 @@ playerCheckIfFlyOrChargeEffect ; 3d8bd (f:58bd) ld [wAnimationType],a ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation -MirrorMoveCheck: ; 3d8d8 (f:58d8) +MirrorMoveCheck: ld a,[wPlayerMoveEffect] cp a,MIRROR_MOVE_EFFECT jr nz,.metronomeCheck @@ -3485,17 +3485,17 @@ MirrorMoveCheck: ; 3d8d8 (f:58d8) ; Responsible for executing Twineedle's second side effect (poison). jp ExecutePlayerMoveDone -MultiHitText: ; 3d977 (f:5977) +MultiHitText: TX_FAR _MultiHitText db "@" -ExecutePlayerMoveDone: ; 3d97c (f:597c) +ExecutePlayerMoveDone: xor a ld [wActionResultOrTookBattleTurn],a ld b,1 ret -PrintGhostText: ; 3d983 (f:5983) +PrintGhostText: ; print the ghost battle messages call IsGhostBattle ret nz @@ -3515,15 +3515,15 @@ PrintGhostText: ; 3d983 (f:5983) xor a ret -ScaredText: ; 3d9a2 (f:59a2) +ScaredText: TX_FAR _ScaredText db "@" -GetOutText: ; 3d9a7 (f:59a7) +GetOutText: TX_FAR _GetOutText db "@" -IsGhostBattle: ; 3d9ac (f:59ac) +IsGhostBattle: ld a,[wIsInBattle] dec a ret nz @@ -3542,7 +3542,7 @@ IsGhostBattle: ; 3d9ac (f:59ac) ; checks for various status conditions affecting the player mon ; stores whether the mon cannot use a move this turn in Z flag -CheckPlayerStatusConditions: ; 3d9c6 (f:59c6) +CheckPlayerStatusConditions: ld hl,wBattleMonStatus ld a,[hl] and a,SLP ; sleep mask @@ -3803,67 +3803,67 @@ CheckPlayerStatusConditions: ; 3d9c6 (f:59c6) and a ret -FastAsleepText: ; 3dbaf (f:5baf) +FastAsleepText: TX_FAR _FastAsleepText db "@" -WokeUpText: ; 3dbb4 (f:5bb4) +WokeUpText: TX_FAR _WokeUpText db "@" -IsFrozenText: ; 3dbb9 (f:5bb9) +IsFrozenText: TX_FAR _IsFrozenText db "@" -FullyParalyzedText: ; 3dbbe (f:5bbe) +FullyParalyzedText: TX_FAR _FullyParalyzedText db "@" -FlinchedText: ; 3dbc3 (f:5bc3) +FlinchedText: TX_FAR _FlinchedText db "@" -MustRechargeText: ; 3dbc8 (f:5bc8) +MustRechargeText: TX_FAR _MustRechargeText db "@" -DisabledNoMoreText: ; 3dbcd (f:5bcd) +DisabledNoMoreText: TX_FAR _DisabledNoMoreText db "@" -IsConfusedText: ; 3dbd2 (f:5bd2) +IsConfusedText: TX_FAR _IsConfusedText db "@" -HurtItselfText: ; 3dbd7 (f:5bd7) +HurtItselfText: TX_FAR _HurtItselfText db "@" -ConfusedNoMoreText: ; 3dbdc (f:5bdc) +ConfusedNoMoreText: TX_FAR _ConfusedNoMoreText db "@" -SavingEnergyText: ; 3dbe1 (f:5be1) +SavingEnergyText: TX_FAR _SavingEnergyText db "@" -UnleashedEnergyText: ; 3dbe6 (f:5be6) +UnleashedEnergyText: TX_FAR _UnleashedEnergyText db "@" -ThrashingAboutText: ; 3dbeb (f:5beb) +ThrashingAboutText: TX_FAR _ThrashingAboutText db "@" -AttackContinuesText: ; 3dbf0 (f:5bf0) +AttackContinuesText: TX_FAR _AttackContinuesText db "@" -CantMoveText: ; 3dbf5 (f:5bf5) +CantMoveText: TX_FAR _CantMoveText db "@" -PrintMoveIsDisabledText: ; 3dbfa (f:5bfa) +PrintMoveIsDisabledText: ld hl, wPlayerSelectedMove ld de, wPlayerBattleStatus1 ld a, [H_WHOSETURN] @@ -3881,11 +3881,11 @@ PrintMoveIsDisabledText: ; 3dbfa (f:5bfa) ld hl, MoveIsDisabledText jp PrintText -MoveIsDisabledText: ; 3dc1a (f:5c1a) +MoveIsDisabledText: TX_FAR _MoveIsDisabledText db "@" -HandleSelfConfusionDamage: ; 3dc1f (f:5c1f) +HandleSelfConfusionDamage: ld hl, HurtItselfText call PrintText ld hl, wEnemyMonDefense @@ -3929,7 +3929,7 @@ HandleSelfConfusionDamage: ; 3dc1f (f:5c1f) ld [H_WHOSETURN], a jp ApplyDamageToPlayerPokemon -PrintMonName1Text: ; 3dc67 (f:5c67) +PrintMonName1Text: ld hl, MonName1Text jp PrintText @@ -3938,7 +3938,7 @@ PrintMonName1Text: ; 3dc67 (f:5c67) ; those text strings are identical and both continue at PrintInsteadText ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed -MonName1Text: ; 3dc6d (f:5c6d) +MonName1Text: TX_FAR _MonName1Text TX_ASM ld a, [H_WHOSETURN] @@ -3963,33 +3963,33 @@ MonName1Text: ; 3dc6d (f:5c6d) ld hl, Used1Text ret -Used1Text: ; 3dc9f (f:5c9f) +Used1Text: TX_FAR _Used1Text TX_ASM jr PrintInsteadText -Used2Text: ; 3dca6 (f:5ca6) +Used2Text: TX_FAR _Used2Text TX_ASM ; fall through -PrintInsteadText: ; 3dcab (f:5cab) +PrintInsteadText: ld a, [wMonIsDisobedient] and a jr z, PrintMoveName ld hl, InsteadText ret -InsteadText: ; 3dcb5 (f:5cb5) +InsteadText: TX_FAR _InsteadText TX_ASM ; fall through -PrintMoveName: ; 3dcba (f:5cba) +PrintMoveName: ld hl, _PrintMoveName ret -_PrintMoveName: ; 3dcbe (f:5cbe) +_PrintMoveName: TX_FAR _CF4BText TX_ASM ld hl, ExclamationPointPointerTable @@ -4005,30 +4005,30 @@ _PrintMoveName: ; 3dcbe (f:5cbe) ld l, a ret -ExclamationPointPointerTable: ; 3dcd4 (f:5cd4) +ExclamationPointPointerTable: dw ExclamationPoint1Text dw ExclamationPoint2Text dw ExclamationPoint3Text dw ExclamationPoint4Text dw ExclamationPoint5Text -ExclamationPoint1Text: ; 3dcde (f:5cde) +ExclamationPoint1Text: TX_FAR _ExclamationPoint1Text db "@" -ExclamationPoint2Text: ; 3dce3 (f:5ce3) +ExclamationPoint2Text: TX_FAR _ExclamationPoint2Text db "@" -ExclamationPoint3Text: ; 3dce8 (f:5ce8) +ExclamationPoint3Text: TX_FAR _ExclamationPoint3Text db "@" -ExclamationPoint4Text: ; 3dced (f:5ced) +ExclamationPoint4Text: TX_FAR _ExclamationPoint4Text db "@" -ExclamationPoint5Text: ; 3dcf2 (f:5cf2) +ExclamationPoint5Text: TX_FAR _ExclamationPoint5Text db "@" @@ -4039,7 +4039,7 @@ ExclamationPoint5Text: ; 3dcf2 (f:5cf2) ; but all five text strings are identical ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed -DetermineExclamationPointTextNum: ; 3dcf7 (f:5cf7) +DetermineExclamationPointTextNum: push bc ld a, [wd11e] ; move ID ld c, a @@ -4061,7 +4061,7 @@ DetermineExclamationPointTextNum: ; 3dcf7 (f:5cf7) pop bc ret -ExclamationPointMoveSets: ; 3dd15 (f:5d15) +ExclamationPointMoveSets: ; a grammar mistake was fixed (only concerning japanese) ; BIDE is in category 3, moved from category 2 db SWORDS_DANCE, GROWTH @@ -4078,7 +4078,7 @@ ExclamationPointMoveSets: ; 3dd15 (f:5d15) db $00 db $FF ; terminator -PrintMoveFailureText: ; 3dd54 (f:5d54) +PrintMoveFailureText: ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a @@ -4105,7 +4105,7 @@ PrintMoveFailureText: ; 3dd54 (f:5d54) ret nz ; if you get here, the mon used jump kick or hi jump kick and missed - ld hl, wDamage ; since the move missed, W_DAMAGE will always contain 0 at this point. + ld hl, wDamage ; since the move missed, wDamage will always contain 0 at this point. ; Thus, recoil damage will always be equal to 1 ; even if it was intended to be potential damage/8. ld a, [hli] @@ -4135,28 +4135,28 @@ PrintMoveFailureText: ; 3dd54 (f:5d54) .enemyTurn jp ApplyDamageToEnemyPokemon -AttackMissedText: ; 3ddb4 (f:5db4) +AttackMissedText: TX_FAR _AttackMissedText db "@" -KeptGoingAndCrashedText: ; 3ddb9 (f:5db9) +KeptGoingAndCrashedText: TX_FAR _KeptGoingAndCrashedText db "@" -UnaffectedText: ; 3ddbe (f:5dbe) +UnaffectedText: TX_FAR _UnaffectedText db "@" -PrintDoesntAffectText: ; 3ddc3 (f:5dc3) +PrintDoesntAffectText: ld hl, DoesntAffectMonText jp PrintText -DoesntAffectMonText: ; 3ddc9 (f:5dc9) +DoesntAffectMonText: TX_FAR _DoesntAffectMonText db "@" ; if there was a critical hit or an OHKO was successful, print the corresponding text -PrintCriticalOHKOText: ; 3ddce (f:5dce) +PrintCriticalOHKOText: ld a, [wCriticalHitOrOHKO] and a jr z, .done ; do nothing if there was no critical hit or successful OHKO @@ -4176,21 +4176,21 @@ PrintCriticalOHKOText: ; 3ddce (f:5dce) ld c, 20 jp DelayFrames -CriticalOHKOTextPointers: ; 3ddec (f:5dec) +CriticalOHKOTextPointers: dw CriticalHitText dw OHKOText -CriticalHitText: ; 3ddf0 (f:5df0) +CriticalHitText: TX_FAR _CriticalHitText db "@" -OHKOText: ; 3ddf5 (f:5df5) +OHKOText: TX_FAR _OHKOText db "@" ; checks if a traded mon will disobey due to lack of badges ; stores whether the mon will use a move in Z flag -CheckForDisobedience: ; 3ddfa (f:5dfa) +CheckForDisobedience: xor a ld [wMonIsDisobedient], a ld a, [wLinkState] @@ -4369,28 +4369,28 @@ CheckForDisobedience: ; 3ddfa (f:5dfa) xor a ; set Z flag ret -LoafingAroundText: ; 3df28 (f:5f28) +LoafingAroundText: TX_FAR _LoafingAroundText db "@" -BeganToNapText: ; 3df2d (f:5f2d) +BeganToNapText: TX_FAR _BeganToNapText db "@" -WontObeyText: ; 3df32 (f:5f32) +WontObeyText: TX_FAR _WontObeyText db "@" -TurnedAwayText: ; 3df37 (f:5f37) +TurnedAwayText: TX_FAR _TurnedAwayText db "@" -IgnoredOrdersText: ; 3df3c (f:5f3c) +IgnoredOrdersText: TX_FAR _IgnoredOrdersText db "@" ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon -GetDamageVarsForPlayerAttack: ; 3df41 (f:5f41) +GetDamageVarsForPlayerAttack: xor a ld hl, wDamage ; damage to eventually inflict, initialise to zero ldi [hl], a @@ -4503,7 +4503,7 @@ GetDamageVarsForPlayerAttack: ; 3df41 (f:5f41) ret ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the enemy mon -GetDamageVarsForEnemyAttack: ; 3dfe7 (f:5fe7) +GetDamageVarsForEnemyAttack: ld hl, wDamage ; damage to eventually inflict, initialise to zero xor a ld [hli], a @@ -4618,7 +4618,7 @@ GetDamageVarsForEnemyAttack: ; 3dfe7 (f:5fe7) ; get stat c of enemy mon ; c: stat to get (HP=1,Attack=2,Defense=3,Speed=4,Special=5) -GetEnemyMonStat: ; 3e08e (f:608e) +GetEnemyMonStat: push de push bc ld a, [wLinkState] @@ -4659,7 +4659,7 @@ GetEnemyMonStat: ; 3e08e (f:608e) pop de ret -CalculateDamage: ; 3d0d7 (f:60d7) +CalculateDamage: ; input: ; b: attack ; c: opponent defense @@ -4821,14 +4821,14 @@ CalculateDamage: ; 3d0d7 (f:60d7) and a ret -JumpToOHKOMoveEffect: ; 3e188 (f:6188) +JumpToOHKOMoveEffect: call JumpMoveEffect ld a, [wMoveMissed] dec a ret -UnusedHighCriticalMoves: ; 3e190 (f:6190) +UnusedHighCriticalMoves: db KARATE_CHOP db RAZOR_LEAF db CRABHAMMER @@ -4839,7 +4839,7 @@ UnusedHighCriticalMoves: ; 3e190 (f:6190) ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are, not coincidentally, ; among the most popular) tend to CH about 20 to 25% of the time." -CriticalHitTest: ; 3e195 (f:6195) +CriticalHitTest: xor a ld [wCriticalHitOrOHKO], a ld a, [H_WHOSETURN] @@ -4906,7 +4906,7 @@ CriticalHitTest: ; 3e195 (f:6195) ret ; high critical hit moves -HighCriticalMoves: ; 3e200 (f:6200) +HighCriticalMoves: db KARATE_CHOP db RAZOR_LEAF db CRABHAMMER @@ -4915,7 +4915,7 @@ HighCriticalMoves: ; 3e200 (f:6200) ; function to determine if Counter hits and if so, how much damage it does -HandleCounterMove: ; 3e205 (f:6205) +HandleCounterMove: ; The variables checked by Counter are updated whenever the cursor points to a new move in the battle selection menu. ; This is irrelevant for the opponent's side outside of link battles, since the move selection is controlled by the AI. ; However, in the scenario where the player switches out and the opponent uses Counter, @@ -4980,7 +4980,7 @@ HandleCounterMove: ; 3e205 (f:6205) xor a ret -ApplyAttackToEnemyPokemon: ; 3e251 (f:6251) +ApplyAttackToEnemyPokemon: ld a,[wPlayerMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToEnemyPokemon @@ -5046,7 +5046,7 @@ ApplyAttackToEnemyPokemon: ; 3e251 (f:6251) ld a,b ld [hl],a -ApplyDamageToEnemyPokemon: ; 3e2b4 (f:62b4) +ApplyDamageToEnemyPokemon: ld hl,wDamage ld a,[hli] ld b,a @@ -5096,10 +5096,10 @@ ApplyDamageToEnemyPokemon: ; 3e2b4 (f:62b4) xor a ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening -ApplyAttackToEnemyPokemonDone: ; 3e30f (f:630f) +ApplyAttackToEnemyPokemonDone: jp DrawHUDsAndHPBars -ApplyAttackToPlayerPokemon: ; 3e312 (f:6312) +ApplyAttackToPlayerPokemon: ld a,[wEnemyMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToPlayerPokemon @@ -5165,7 +5165,7 @@ ApplyAttackToPlayerPokemon: ; 3e312 (f:6312) ld a,b ld [hl],a -ApplyDamageToPlayerPokemon: ; 3e372 (f:6372) +ApplyDamageToPlayerPokemon: ld hl,wDamage ld a,[hli] ld b,a @@ -5214,10 +5214,10 @@ ApplyDamageToPlayerPokemon: ; 3e372 (f:6372) ld a,$01 ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening -ApplyAttackToPlayerPokemonDone: ; 3e3cd (f:63cd) +ApplyAttackToPlayerPokemonDone: jp DrawHUDsAndHPBars -AttackSubstitute: ; 3e3d0 (f:63d0) +AttackSubstitute: ; Unlike the two ApplyAttackToPokemon functions, Attack Substitute is shared by player and enemy. ; Self-confusion damage as well as Hi-Jump Kick and Jump Kick recoil cause a momentary turn swap before being applied. ; If the user has a Substitute up and would take damage because of that, @@ -5272,16 +5272,16 @@ AttackSubstitute: ; 3e3d0 (f:63d0) ld [hl],a ; zero the effect of the attacker's move jp DrawHUDsAndHPBars -SubstituteTookDamageText: ; 3e41e (f:641e) +SubstituteTookDamageText: TX_FAR _SubstituteTookDamageText db "@" -SubstituteBrokeText: ; 3e423 (f:6423) +SubstituteBrokeText: TX_FAR _SubstituteBrokeText db "@" ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked -HandleBuildingRage: ; 3e428 (f:6428) +HandleBuildingRage: ; values for the player turn ld hl,wEnemyBattleStatus2 ld de,wEnemyMonStatMods @@ -5323,13 +5323,13 @@ HandleBuildingRage: ; 3e428 (f:6428) ld [H_WHOSETURN],a ret -BuildingRageText: ; 3e46a (f:646a) +BuildingRageText: TX_FAR _BuildingRageText db "@" ; copy last move for Mirror Move ; sets zero flag on failure and unsets zero flag on success -MirrorMoveCopyMove: ; 3e46f (f:646f) +MirrorMoveCopyMove: ; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses, ; which are mainly used to print the "[Pokemon] used [Move]" text. ; Both are set to 0 whenever a new Pokemon is sent out @@ -5359,12 +5359,12 @@ MirrorMoveCopyMove: ; 3e46f (f:646f) xor a ret -MirrorMoveFailedText: ; 3e496 (f:6496) +MirrorMoveFailedText: TX_FAR _MirrorMoveFailedText db "@" ; function used to reload move data for moves like Mirror Move and Metronome -ReloadMoveData: ; 3e49b (f:649b) +ReloadMoveData: ld [wd11e],a dec a ld hl,Moves @@ -5381,7 +5381,7 @@ ReloadMoveData: ; 3e49b (f:649b) ret ; function that picks a random move for metronome -MetronomePickMove: ; 3e4ba (f:64ba) +MetronomePickMove: xor a ld [wAnimationType],a ld a,METRONOME @@ -5410,7 +5410,7 @@ MetronomePickMove: ; 3e4ba (f:64ba) ; this function increments the current move's PP ; it's used to prevent moves that run another move within the same turn ; (like Mirror Move and Metronome) from losing 2 PP -IncrementMovePP: ; 3e4e5 (f:64e5) +IncrementMovePP: ld a,[H_WHOSETURN] and a ; values for player turn @@ -5442,7 +5442,7 @@ IncrementMovePP: ; 3e4e5 (f:64e5) ret ; function to adjust the base damage of an attack to account for type effectiveness -AdjustDamageForMoveType: ; 3e517 (f:6517) +AdjustDamageForMoveType: ; values for player turn ld hl,wBattleMonType ld a,[hli] @@ -5555,7 +5555,7 @@ AdjustDamageForMoveType: ; 3e517 (f:6517) .done ret -AIGetTypeEffectiveness: ; 3e5bb (f:65bb) +AIGetTypeEffectiveness: ld a,[wEnemyMoveType] ld d,a ; d = type of enemy move ld hl,wBattleMonType @@ -5602,7 +5602,7 @@ AIGetTypeEffectiveness: ; 3e5bb (f:65bb) INCLUDE "data/type_effects.asm" ; some tests that need to pass for a move to hit -MoveHitTest: ; 3e6f1 (f:66f1) +MoveHitTest: ; player's turn ld hl,wEnemyBattleStatus1 ld de,wPlayerMoveEffect @@ -5722,7 +5722,7 @@ MoveHitTest: ; 3e6f1 (f:66f1) ret ; values for player turn -CalcHitChance: ; 3e7aa (f:67aa) +CalcHitChance: ld hl,wPlayerMoveAccuracy ld a,[H_WHOSETURN] and a @@ -5794,7 +5794,7 @@ CalcHitChance: ; 3e7aa (f:67aa) ret ; multiplies damage by a random percentage from ~85% to 100% -RandomizeDamage: ; 3e80d (f:680d) +RandomizeDamage: ld hl, wDamage ld a, [hli] and a @@ -5831,7 +5831,7 @@ RandomizeDamage: ; 3e80d (f:680d) ret ; for more detailed commentary, see equivalent function for player side (ExecutePlayerMove) -ExecuteEnemyMove: ; 3e842 (f:6842) +ExecuteEnemyMove: ld a, [wEnemySelectedMove] inc a jp z, ExecuteEnemyMoveDone @@ -5863,14 +5863,14 @@ ExecuteEnemyMove: ; 3e842 (f:6842) jr nz, EnemyCanExecuteChargingMove ; if so, jump call GetCurrentMove -CheckIfEnemyNeedsToChargeUp: ; 3e882 (f:6882) +CheckIfEnemyNeedsToChargeUp: ld a, [wEnemyMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect cp FLY_EFFECT jp z, JumpMoveEffect jr EnemyCanExecuteMove -EnemyCanExecuteChargingMove: ; 3e891 (f:6891) +EnemyCanExecuteChargingMove: ld hl, wEnemyBattleStatus1 res ChargingUp, [hl] ; no longer charging up for attack res Invulnerable, [hl] ; no longer invulnerable to typical attacks @@ -5883,7 +5883,7 @@ EnemyCanExecuteChargingMove: ; 3e891 (f:6891) call GetName ld de, wcd6d call CopyStringToCF4B -EnemyCanExecuteMove: ; 3e8b1 (f:68b1) +EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a call PrintMonName1Text @@ -5897,7 +5897,7 @@ EnemyCanExecuteMove: ; 3e8b1 (f:68b1) ld de, $1 call IsInArray call c, JumpMoveEffect -EnemyCalcMoveDamage: ; 3e8d6 (f:68d6) +EnemyCalcMoveDamage: call SwapPlayerAndEnemyLevels ld a, [wEnemyMoveEffect] ld hl, SetDamageEffects @@ -5915,9 +5915,9 @@ EnemyCalcMoveDamage: ; 3e8d6 (f:68d6) call AdjustDamageForMoveType call RandomizeDamage -EnemyMoveHitTest: ; 3e905 (f:6905) +EnemyMoveHitTest: call MoveHitTest -handleIfEnemyMoveMissed: ; 3e908 (f:6908) +handleIfEnemyMoveMissed: ld a, [wMoveMissed] and a jr z, .moveDidNotMiss @@ -5928,17 +5928,17 @@ handleIfEnemyMoveMissed: ; 3e908 (f:6908) .moveDidNotMiss call SwapPlayerAndEnemyLevels -GetEnemyAnimationType: ; 3e91a (f:691a) +GetEnemyAnimationType: ld a, [wEnemyMoveEffect] and a ld a, $1 jr z, playEnemyMoveAnimation ld a, $2 jr playEnemyMoveAnimation -handleExplosionMiss: ; 3e926 (f:6926) +handleExplosionMiss: call SwapPlayerAndEnemyLevels xor a -playEnemyMoveAnimation: ; 3e92a (f:692a) +playEnemyMoveAnimation: push af ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does mon have a substitute? @@ -5958,7 +5958,7 @@ playEnemyMoveAnimation: ; 3e92a (f:692a) call nz, Bankswitch ; slide the substitute's sprite out jr EnemyCheckIfMirrorMoveEffect -EnemyCheckIfFlyOrChargeEffect: ; 3e957 (f:6957) +EnemyCheckIfFlyOrChargeEffect: call SwapPlayerAndEnemyLevels ld c, 30 call DelayFrames @@ -5973,7 +5973,7 @@ EnemyCheckIfFlyOrChargeEffect: ; 3e957 (f:6957) ld [wAnimationType], a ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation -EnemyCheckIfMirrorMoveEffect: ; 3e975 (f:6975) +EnemyCheckIfMirrorMoveEffect: ld a, [wEnemyMoveEffect] cp MIRROR_MOVE_EFFECT jr nz, .notMirrorMoveEffect @@ -6040,17 +6040,17 @@ EnemyCheckIfMirrorMoveEffect: ; 3e975 (f:6975) call nc, JumpMoveEffect jr ExecuteEnemyMoveDone -HitXTimesText: ; 3ea0d (f:6a0d) +HitXTimesText: TX_FAR _HitXTimesText db "@" -ExecuteEnemyMoveDone: ; 3ea12 (f:6a12) +ExecuteEnemyMoveDone: ld b, $1 ret ; checks for various status conditions affecting the enemy mon ; stores whether the mon cannot use a move this turn in Z flag -CheckEnemyStatusConditions: ; 3ea15 (f:6a15) +CheckEnemyStatusConditions: ld hl, wEnemyMonStatus ld a, [hl] and SLP ; sleep mask @@ -6332,7 +6332,7 @@ CheckEnemyStatusConditions: ; 3ea15 (f:6a15) and a ; clear Z flag ret -GetCurrentMove: ; 3ec44 (f:6c44) +GetCurrentMove: ld a, [H_WHOSETURN] and a jp z, .player @@ -6363,7 +6363,7 @@ GetCurrentMove: ; 3ec44 (f:6c44) ld de, wcd6d jp CopyStringToCF4B -LoadEnemyMonData: ; 3ec87 (f:6c87) +LoadEnemyMonData: ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, LoadEnemyMonFromParty @@ -6523,7 +6523,7 @@ LoadEnemyMonData: ; 3ec87 (f:6c87) ret ; calls BattleTransition to show the battle transition animation and initializes some battle variables -DoBattleTransitionAndInitBattleVariables: ; 3edb8 (f:6db8) +DoBattleTransitionAndInitBattleVariables: ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .next @@ -6559,7 +6559,7 @@ DoBattleTransitionAndInitBattleVariables: ; 3edb8 (f:6db8) ret ; swaps the level values of the BattleMon and EnemyMon structs -SwapPlayerAndEnemyLevels: ; 3ee07 (f:6e07) +SwapPlayerAndEnemyLevels: push bc ld a, [wBattleMonLevel] ld b, a @@ -6573,7 +6573,7 @@ SwapPlayerAndEnemyLevels: ; 3ee07 (f:6e07) ; loads either red back pic or old man back pic ; also writes OAM data and loads tile patterns for the Red or Old Man back sprite's head ; (for use when scrolling the player sprite and enemy's silhouettes on screen) -LoadPlayerBackPic: ; 3ee18 (f:6e18) +LoadPlayerBackPic: ld a, [wBattleType] ld de, OldManPic cp BATTLE_TYPE_OLD_MAN ; is it the old man tutorial? @@ -6636,26 +6636,26 @@ LoadPlayerBackPic: ; 3ee18 (f:6e18) predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) -DoubleOrHalveSelectedStats: ; 3ee8e (f:6e8e) +DoubleOrHalveSelectedStats: callab DoubleSelectedStats jpab HalveSelectedStats -ScrollTrainerPicAfterBattle: ; 3ee9e (f:6e9e) +ScrollTrainerPicAfterBattle: jpab _ScrollTrainerPicAfterBattle -ApplyBurnAndParalysisPenaltiesToPlayer: ; 3eea6 (f:6ea6) +ApplyBurnAndParalysisPenaltiesToPlayer: ld a, $1 jr ApplyBurnAndParalysisPenalties -ApplyBurnAndParalysisPenaltiesToEnemy: ; 3eeaa (f:6eaa) +ApplyBurnAndParalysisPenaltiesToEnemy: xor a -ApplyBurnAndParalysisPenalties: ; 3eeab (f:6eab) +ApplyBurnAndParalysisPenalties: ld [H_WHOSETURN], a call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn -QuarterSpeedDueToParalysis: ; 3eeb3 (f:6eb3) +QuarterSpeedDueToParalysis: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -6698,7 +6698,7 @@ QuarterSpeedDueToParalysis: ; 3eeb3 (f:6eb3) ld [hl], b ret -HalveAttackDueToBurn: ; 3eeef (f:6eef) +HalveAttackDueToBurn: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -6737,7 +6737,7 @@ HalveAttackDueToBurn: ; 3eeef (f:6eef) ld [hl], b ret -CalculateModifiedStats: ; 3ef25 (f:6f25) +CalculateModifiedStats: ld c, 0 .loop call CalculateModifiedStat @@ -6748,7 +6748,7 @@ CalculateModifiedStats: ; 3ef25 (f:6f25) ret ; calculate modified stat for stat c (0 = attack, 1 = defense, 2 = speed, 3 = special) -CalculateModifiedStat: ; 3ef31 (f:6f31) +CalculateModifiedStat: push bc push bc ld a, [wCalculateWhoseStats] @@ -6826,7 +6826,7 @@ CalculateModifiedStat: ; 3ef31 (f:6f31) pop bc ret -ApplyBadgeStatBoosts: ; 3efa5 (f:6fa5) +ApplyBadgeStatBoosts: ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -6879,10 +6879,10 @@ ApplyBadgeStatBoosts: ; 3efa5 (f:6fa5) ld [hld], a ret -LoadHudAndHpBarAndStatusTilePatterns: ; 3efe4 (f:6fe4) +LoadHudAndHpBarAndStatusTilePatterns: call LoadHpBarAndStatusTilePatterns -LoadHudTilePatterns: ; 3efe7 (f:6fe7) +LoadHudTilePatterns: ld a, [rLCDC] add a ; is LCD disabled? jr c, .lcdEnabled @@ -6907,14 +6907,14 @@ LoadHudTilePatterns: ; 3efe7 (f:6fe7) lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8 jp CopyVideoDataDouble -PrintEmptyString: ; 3f020 (f:7020) +PrintEmptyString: ld hl, .emptyString jp PrintText .emptyString db "@" -BattleRandom: ; 3f027 (f:7027) +BattleRandom: ; Link battles use a shared PRNG. ld a, [wLinkState] @@ -6966,7 +6966,7 @@ BattleRandom: ; 3f027 (f:7027) ret -HandleExplodingAnimation: ; 3f05f (f:705f) +HandleExplodingAnimation: ld a, [H_WHOSETURN] and a ld hl, wEnemyMonType1 @@ -6997,19 +6997,19 @@ HandleExplodingAnimation: ; 3f05f (f:705f) ld a, 5 ld [wAnimationType], a -PlayMoveAnimation: ; 3f093 (f:7093) +PlayMoveAnimation: ld [wAnimationID],a call Delay3 predef MoveAnimation callab Func_78e98 ret -JumpMoveEffect: ; 3f0a7 (f:70a7) +JumpMoveEffect: call _JumpMoveEffect ld b, $1 ret -_JumpMoveEffect: ; 3f0ad (f:70ad) +_JumpMoveEffect: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveEffect] @@ -7027,7 +7027,7 @@ _JumpMoveEffect: ; 3f0ad (f:70ad) ld l, a jp [hl] ; jump to special effect handler -MoveEffectPointerTable: ; 3f0c5 (f:70c5) +MoveEffectPointerTable: dw SleepEffect ; unused effect dw PoisonEffect ; POISON_SIDE_EFFECT1 dw DrainHPEffect ; DRAIN_HP_EFFECT @@ -7115,7 +7115,7 @@ MoveEffectPointerTable: ; 3f0c5 (f:70c5) dw SplashEffect ; SPLASH_EFFECT dw DisableEffect ; DISABLE_EFFECT -SleepEffect: ; 3f171 (f:7171) +SleepEffect: ld de, wEnemyMonStatus ld bc, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -7169,15 +7169,15 @@ SleepEffect: ; 3f171 (f:7171) .didntAffect jp PrintDidntAffectText -FellAsleepText: ; 3f1c8 (f:71c8) +FellAsleepText: TX_FAR _FellAsleepText db "@" -AlreadyAsleepText: ; 3f1cd (f:71cds) +AlreadyAsleepText: TX_FAR _AlreadyAsleepText db "@" -PoisonEffect: ; 3f1d2 (f:71d2) +PoisonEffect: ld hl, wEnemyMonStatus ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -7263,18 +7263,18 @@ PoisonEffect: ; 3f1d2 (f:71d2) call DelayFrames jp PrintDidntAffectText -PoisonedText: ; 3f262 (f:7262) +PoisonedText: TX_FAR _PoisonedText db "@" -BadlyPoisonedText: ; 3f267 (f:7267) +BadlyPoisonedText: TX_FAR _BadlyPoisonedText db "@" -DrainHPEffect: ; 3f26c (f:726c) +DrainHPEffect: jpab DrainHPEffect_ -ExplodeEffect: ; 3f274 (f:7274) +ExplodeEffect: ld hl, wBattleMonHP ld de, wPlayerBattleStatus2 ld a, [H_WHOSETURN] @@ -7293,7 +7293,7 @@ ExplodeEffect: ; 3f274 (f:7274) ld [de], a ret -FreezeBurnParalyzeEffect: ; 3f28f (f:728f) +FreezeBurnParalyzeEffect: xor a ld [wAnimationType], a call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] @@ -7424,15 +7424,15 @@ FreezeBurnParalyzeEffect: ; 3f28f (f:728f) ld hl, FrozenText jp PrintText -BurnedText: ; 3f38e (f:738e) +BurnedText: TX_FAR _BurnedText db "@" -FrozenText: ; 3f393 (f:7393) +FrozenText: TX_FAR _FrozenText db "@" -CheckDefrost: ; 3f398 (f:7398) +CheckDefrost: ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target and a, 1 << FRZ ; are they frozen? ret z ; return if so @@ -7467,11 +7467,11 @@ CheckDefrost: ; 3f398 (f:7398) .common jp PrintText -FireDefrostedText: ; 3f3d9 (f:73d9) +FireDefrostedText: TX_FAR _FireDefrostedText db "@" -StatModifierUpEffect: ; 3f3de (f:73de) +StatModifierUpEffect: ld hl, wPlayerMonStatMods ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -7570,13 +7570,13 @@ StatModifierUpEffect: ; 3f3de (f:73de) ld a, 999 % $100 ld [H_MULTIPLICAND + 2], a -UpdateStat: ; 3f479 (f:7479) +UpdateStat: ld a, [H_PRODUCT + 2] ld [hli], a ld a, [H_PRODUCT + 3] ld [hl], a pop hl -UpdateStatDone: ; 3f480 (f:7480) +UpdateStatDone: ld b, c inc b call PrintStatText @@ -7627,15 +7627,15 @@ UpdateStatDone: ; 3f480 (f:7480) call QuarterSpeedDueToParalysis ; apply speed penalty to the player whose turn is not, if it's paralyzed jp HalveAttackDueToBurn ; apply attack penalty to the player whose turn is not, if it's burned -RestoreOriginalStatModifier: ; 3f4d6 (f:74d6) +RestoreOriginalStatModifier: pop hl dec [hl] -PrintNothingHappenedText: ; 3f4d8 (f:74d8) +PrintNothingHappenedText: ld hl, NothingHappenedText jp PrintText -MonsStatsRoseText: ; 3f4de (f:74de) +MonsStatsRoseText: TX_FAR _MonsStatsRoseText TX_ASM ld hl, GreatlyRoseText @@ -7650,15 +7650,15 @@ MonsStatsRoseText: ; 3f4de (f:74de) ld hl, RoseText ret -GreatlyRoseText: ; 3f4f8 (f:74f8) +GreatlyRoseText: db $0a TX_FAR _GreatlyRoseText ; fallthrough -RoseText: ; 3f4fd (f:74fd) +RoseText: TX_FAR _RoseText db "@" -StatModifierDownEffect: ; 3f502 (f:7502) +StatModifierDownEffect: ld hl, wEnemyMonStatMods ld de, wPlayerMoveEffect ld bc, wEnemyBattleStatus1 @@ -7788,14 +7788,14 @@ StatModifierDownEffect: ; 3f502 (f:7502) ld a, $1 ld [H_MULTIPLICAND + 2], a -UpdateLoweredStat: ; 3f5da (f:75da) +UpdateLoweredStat: ld a, [H_PRODUCT + 2] ld [hli], a ld a, [H_PRODUCT + 3] ld [hl], a pop de pop hl -UpdateLoweredStatDone: ; 3f5e2 (f:75e2) +UpdateLoweredStatDone: ld b, c inc b push de @@ -7819,25 +7819,25 @@ UpdateLoweredStatDone: ; 3f5e2 (f:75e2) call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn -CantLowerAnymore_Pop: ; 3f603 (f:7603) +CantLowerAnymore_Pop: pop de pop hl inc [hl] -CantLowerAnymore: ; 3f606 (f:7606) +CantLowerAnymore: ld a, [de] cp ATTACK_DOWN_SIDE_EFFECT ret nc ld hl, NothingHappenedText jp PrintText -MoveMissed: ; 3f610 (f:7610) +MoveMissed: ld a, [de] cp $44 ret nc jp ConditionalPrintButItFailed -MonsStatsFellText: ; 3f617 (f:7617) +MonsStatsFellText: TX_FAR _MonsStatsFellText TX_ASM ld hl, FellText @@ -7855,15 +7855,15 @@ MonsStatsFellText: ; 3f617 (f:7617) ld hl, GreatlyFellText ret -GreatlyFellText: ; 3f634 (f:7634) +GreatlyFellText: db $0a TX_FAR _GreatlyFellText ; fallthrough -FellText: ; 3f639 (f:7639) +FellText: TX_FAR _FellText db "@" -PrintStatText: ; 3f63e (f:763e) +PrintStatText: ld hl, StatsTextStrings ld c, "@" .findStatName_outer @@ -7879,7 +7879,7 @@ PrintStatText: ; 3f63e (f:763e) ld bc, $a jp CopyData -StatsTextStrings: ; 3f655 (f:7655) +StatsTextStrings: db "ATTACK@" db "DEFENSE@" db "SPEED@" @@ -7887,7 +7887,7 @@ StatsTextStrings: ; 3f655 (f:7655) db "ACCURACY@" db "EVADE@" -StatModifierRatios: ; 3f681 (f:7681) +StatModifierRatios: ; first byte is numerator, second byte is denominator db 25, 100 ; 0.25 db 28, 100 ; 0.28 @@ -7903,7 +7903,7 @@ StatModifierRatios: ; 3f681 (f:7681) db 35, 10 ; 3.50 db 4, 1 ; 4.00 -BideEffect: ; 3f69b (f:769b) +BideEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerBideAccumulatedDamage ld bc, wPlayerNumAttacksLeft @@ -7930,7 +7930,7 @@ BideEffect: ; 3f69b (f:769b) add XSTATITEM_ANIM jp PlayBattleAnimation2 -ThrashPetalDanceEffect: ; 3f7cd (f:77cd) +ThrashPetalDanceEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] @@ -7949,7 +7949,7 @@ ThrashPetalDanceEffect: ; 3f7cd (f:77cd) add ANIM_B0 jp PlayBattleAnimation2 -SwitchAndTeleportEffect: ; 3f6ef (f:76ef) +SwitchAndTeleportEffect: ld a, [H_WHOSETURN] and a jr nz, .handleEnemy @@ -8053,19 +8053,19 @@ SwitchAndTeleportEffect: ; 3f6ef (f:76ef) .printText jp PrintText -RanFromBattleText: ; 3f7b8 (f:77b8) +RanFromBattleText: TX_FAR _RanFromBattleText db "@" -RanAwayScaredText: ; 3f7bd (f:77bd) +RanAwayScaredText: TX_FAR _RanAwayScaredText db "@" -WasBlownAwayText: ; 3f7c2 (f:77c2) +WasBlownAwayText: TX_FAR _WasBlownAwayText db "@" -TwoToFiveAttacksEffect: ; 3f7c7 (f:77c7) +TwoToFiveAttacksEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld bc, wPlayerNumHits @@ -8111,7 +8111,7 @@ TwoToFiveAttacksEffect: ; 3f7c7 (f:77c7) ld [hl], a ; set Twineedle's effect to poison effect jr .saveNumberOfHits -FlinchSideEffect: ; 3f811 (f:7811) +FlinchSideEffect: call CheckTargetSubstitute ret nz ld hl, wEnemyBattleStatus1 @@ -8138,10 +8138,10 @@ FlinchSideEffect: ; 3f811 (f:7811) call ClearHyperBeam ret -OneHitKOEffect: ; 3f842 (f:7842) +OneHitKOEffect: jpab OneHitKOEffect_ -ChargeEffect: ; 3f84a (f:784a) +ChargeEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -8192,7 +8192,7 @@ ChargeEffect: ; 3f84a (f:784a) ld hl, ChargeMoveEffectText jp PrintText -ChargeMoveEffectText: ; 3f8a3 (f:78a3) +ChargeMoveEffectText: TX_FAR _ChargeMoveEffectText TX_ASM ld a, [wChargeMoveNum] @@ -8216,31 +8216,31 @@ ChargeMoveEffectText: ; 3f8a3 (f:78a3) .gotText ret -MadeWhirlwindText: ; 3f8d4 (f:78d4) +MadeWhirlwindText: TX_FAR _MadeWhirlwindText db "@" -TookInSunlightText: ; 3f8d9 (f:78d9) +TookInSunlightText: TX_FAR _TookInSunlightText db "@" -LoweredItsHeadText: ; 3f8de (f:78de) +LoweredItsHeadText: TX_FAR _LoweredItsHeadText db "@" -SkyAttackGlowingText: ; 3f8e3 (f:78e3) +SkyAttackGlowingText: TX_FAR _SkyAttackGlowingText db "@" -FlewUpHighText: ; 3f8e8 (f:78e8) +FlewUpHighText: TX_FAR _FlewUpHighText db "@" -DugAHoleText: ; 3f8ed (f:78ed) +DugAHoleText: TX_FAR _DugAHoleText db "@" -TrappingEffect: ; 3f8f2 (f:78f2) +TrappingEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] @@ -8265,22 +8265,22 @@ TrappingEffect: ; 3f8f2 (f:78f2) ld [de], a ret -MistEffect: ; 3f91c (f:791c) +MistEffect: jpab MistEffect_ -FocusEnergyEffect: ; 3f924 (f:7924) +FocusEnergyEffect: jpab FocusEnergyEffect_ -RecoilEffect: ; 3f92c (f:792c) +RecoilEffect: jpab RecoilEffect_ -ConfusionSideEffect: ; 3f934 (f:7934) +ConfusionSideEffect: call BattleRandom cp $19 ; ~10% chance ret nc jr ConfusionSideEffectSuccess -ConfusionEffect: ; 3f93c (f:793c) +ConfusionEffect: call CheckTargetSubstitute jr nz, ConfusionEffectFailed call MoveHitTest @@ -8288,7 +8288,7 @@ ConfusionEffect: ; 3f93c (f:793c) and a jr nz, ConfusionEffectFailed -ConfusionSideEffectSuccess: ; 3f94a (f:794a) +ConfusionSideEffectSuccess: ld a, [H_WHOSETURN] and a ld hl, wEnemyBattleStatus1 @@ -8314,24 +8314,24 @@ ConfusionSideEffectSuccess: ; 3f94a (f:794a) ld hl, BecameConfusedText jp PrintText -BecameConfusedText: ; 3f97c (f:797c) +BecameConfusedText: TX_FAR _BecameConfusedText db "@" -ConfusionEffectFailed: ; 3f981 (f:7981) +ConfusionEffectFailed: cp CONFUSION_SIDE_EFFECT ret z ld c, 50 call DelayFrames jp ConditionalPrintButItFailed -ParalyzeEffect: ; 3f98c (f:798c) +ParalyzeEffect: jpab ParalyzeEffect_ -SubstituteEffect: ; 3f994 (f:7994) +SubstituteEffect: jpab SubstituteEffect_ -HyperBeamEffect: ; 3f99c (f:799c) +HyperBeamEffect: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -8341,7 +8341,7 @@ HyperBeamEffect: ; 3f99c (f:799c) set NeedsToRecharge, [hl] ; mon now needs to recharge ret -ClearHyperBeam: ; 3f9aa (f:79aa) +ClearHyperBeam: push hl ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -8353,7 +8353,7 @@ ClearHyperBeam: ; 3f9aa (f:79aa) pop hl ret -RageEffect: ; 3f9ba (f:79ba) +RageEffect: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -8363,7 +8363,7 @@ RageEffect: ; 3f9ba (f:79ba) set UsingRage, [hl] ; mon is now in "rage" mode ret -MimicEffect: ; 3f9c8 (f:79c8) +MimicEffect: ld c, 50 call DelayFrames call MoveHitTest @@ -8435,18 +8435,18 @@ MimicEffect: ; 3f9c8 (f:79c8) .mimicMissed jp PrintButItFailedText_ -MimicLearnedMoveText: ; 3fa52 (f:7a52) +MimicLearnedMoveText: TX_FAR _MimicLearnedMoveText db "@" -LeechSeedEffect: ; 3fa57 (f:7a57) +LeechSeedEffect: jpab LeechSeedEffect_ -SplashEffect: ; 3fa5f (f:7a5f) +SplashEffect: call PlayCurrentMoveAnimation jp PrintNoEffectText -DisableEffect: ; 3fa65 (f:7a65) +DisableEffect: call MoveHitTest ld a, [wMoveMissed] and a @@ -8529,74 +8529,74 @@ DisableEffect: ; 3fa65 (f:7a65) .moveMissed jp PrintButItFailedText_ -MoveWasDisabledText: ; 3fae4 (f:7ae4) +MoveWasDisabledText: TX_FAR _MoveWasDisabledText db "@" -PayDayEffect: ; 3fae9 (f:7ae9) +PayDayEffect: jpab PayDayEffect_ -ConversionEffect: ; 3faf1 (f:7af1) +ConversionEffect: jpab ConversionEffect_ -HazeEffect: ; 3faf9 (f:7af9) +HazeEffect: jpab HazeEffect_ -HealEffect: ; 3fb01 (f:7b01) +HealEffect: jpab HealEffect_ -TransformEffect: ; 3fb09 (f:7b09) +TransformEffect: jpab TransformEffect_ -ReflectLightScreenEffect: ; 3fb11 (f:7b11) +ReflectLightScreenEffect: jpab ReflectLightScreenEffect_ -NothingHappenedText: ; 3fb19 (f:7b19) +NothingHappenedText: TX_FAR _NothingHappenedText db "@" -PrintNoEffectText: ; 3fb1e (f:7b1e) +PrintNoEffectText: ld hl, NoEffectText jp PrintText -NoEffectText: ; 3fb24 (f:7b24) +NoEffectText: TX_FAR _NoEffectText db "@" -ConditionalPrintButItFailed: ; 3fb29 (f:7b29) +ConditionalPrintButItFailed: ld a, [wMoveDidntMiss] and a ret nz ; return if the side effect failed, yet the attack was successful -PrintButItFailedText_: ; 3fb2e (f:7b2e) +PrintButItFailedText_: ld hl, ButItFailedText jp PrintText -ButItFailedText: ; 3fb34 (f:7b34) +ButItFailedText: TX_FAR _ButItFailedText db "@" -PrintDidntAffectText: ; 3fb39 (f:7b39) +PrintDidntAffectText: ld hl, DidntAffectText jp PrintText -DidntAffectText: ; 3fb3f (f:7b3f) +DidntAffectText: TX_FAR _DidntAffectText db "@" -IsUnaffectedText: ; 3fb44 (f:7b44) +IsUnaffectedText: TX_FAR _IsUnaffectedText db "@" -PrintMayNotAttackText: ; 3fb49 (f:7b49) +PrintMayNotAttackText: ld hl, ParalyzedMayNotAttackText jp PrintText -ParalyzedMayNotAttackText: ; 3fb4f (f:7b4f) +ParalyzedMayNotAttackText: TX_FAR _ParalyzedMayNotAttackText db "@" -CheckTargetSubstitute: ; 3fb54 (f:7b54) +CheckTargetSubstitute: push hl ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -8608,7 +8608,7 @@ CheckTargetSubstitute: ; 3fb54 (f:7b54) pop hl ret -PlayCurrentMoveAnimation2: ; 3fb64 (f:7b64) +PlayCurrentMoveAnimation2: ; animation at MOVENUM will be played unless MOVENUM is 0 ; plays wAnimationType 3 or 6 ld a, [H_WHOSETURN] @@ -8620,7 +8620,7 @@ PlayCurrentMoveAnimation2: ; 3fb64 (f:7b64) and a ret z -PlayBattleAnimation2: ; 3fb71 (f:7b71) +PlayBattleAnimation2: ; play animation ID at a and animation type 6 or 3 ld [wAnimationID], a ld a, [H_WHOSETURN] @@ -8632,7 +8632,7 @@ PlayBattleAnimation2: ; 3fb71 (f:7b71) ld [wAnimationType], a jp PlayBattleAnimationGotID -PlayCurrentMoveAnimation: ; 3fb83 (f:7b83) +PlayCurrentMoveAnimation: ; animation at MOVENUM will be played unless MOVENUM is 0 ; resets wAnimationType xor a @@ -8646,11 +8646,11 @@ PlayCurrentMoveAnimation: ; 3fb83 (f:7b83) and a ret z -PlayBattleAnimation: ; 3fb94 (f:7b94) +PlayBattleAnimation: ; play animation ID at a and predefined animation type ld [wAnimationID], a -PlayBattleAnimationGotID: ; 3fb97 (f:7b97) +PlayBattleAnimationGotID: ; play animation at wAnimationID push hl push de @@ -8660,4 +8660,4 @@ PlayBattleAnimationGotID: ; 3fb97 (f:7b97) pop bc pop de pop hl - ret
\ No newline at end of file + ret diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index da1910ee..e23a85ba 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -1,4 +1,4 @@ -DecrementPP: ; f42db (3d:42db) +DecrementPP: ; after using a move, decrement pp in battle and (if not transformed?) in party ld a, [de] cp a, STRUGGLE @@ -33,7 +33,7 @@ DecrementPP: ; f42db (3d:42db) ld a, [wPlayerMonNumber] ; which mon in party is active ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ; calculate address of the mon to modify -.DecrementPP ; f4301 (3d:4301) +.DecrementPP: ld a, [wPlayerMoveListIndex] ; which move (0, 1, 2, 3) did we use? ld c, a ld b, 0 diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index 1ef9873c..85f2bc3e 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -1,4 +1,4 @@ -DisplayEffectiveness: ; 2fd25 (b:7d25) +DisplayEffectiveness: ld a, [wDamageMultipliers] and a, $7F cp a, $0A @@ -9,10 +9,10 @@ DisplayEffectiveness: ; 2fd25 (b:7d25) .done jp PrintText -SuperEffectiveText: ; 2fd38 (b:7d38) +SuperEffectiveText: TX_FAR _SuperEffectiveText db "@" -NotVeryEffectiveText: ; 2fd3d (b:7d3d) +NotVeryEffectiveText: TX_FAR _NotVeryEffectiveText db "@" diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index f9db556d..8f9dce46 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -1,4 +1,4 @@ -DrawAllPokeballs: ; 3a8df (e:68df) +DrawAllPokeballs: call LoadPartyPokeballGfx call SetupOwnPartyPokeballs ld a, [wIsInBattle] @@ -6,17 +6,17 @@ DrawAllPokeballs: ; 3a8df (e:68df) ret z ; return if wild pokémon jp SetupEnemyPartyPokeballs -DrawEnemyPokeballs: ; 3a8ed (e:68ed) +DrawEnemyPokeballs: call LoadPartyPokeballGfx jp SetupEnemyPartyPokeballs -LoadPartyPokeballGfx: ; 3a8f3 (e:68f3) +LoadPartyPokeballGfx: ld de, PokeballTileGraphics ld hl, vSprites + $310 lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10 jp CopyVideoData -SetupOwnPartyPokeballs: ; 3a8ff (e:68ff) +SetupOwnPartyPokeballs: call PlacePlayerHUDTiles ld hl, wPartyMon1 ld de, wPartyCount @@ -32,7 +32,7 @@ SetupOwnPartyPokeballs: ; 3a8ff (e:68ff) ld hl, wOAMBuffer jp WritePokeballOAMData -SetupEnemyPartyPokeballs: ; 3a921 (e:6921) +SetupEnemyPartyPokeballs: call PlaceEnemyHUDTiles ld hl, wEnemyMons ld de, wEnemyPartyCount @@ -48,7 +48,7 @@ SetupEnemyPartyPokeballs: ; 3a921 (e:6921) ld hl, wOAMBuffer + PARTY_LENGTH * 4 jp WritePokeballOAMData -SetupPokeballs: ; 3a945 (e:6945) +SetupPokeballs: ld a, [de] push af ld de, wBuffer @@ -70,7 +70,7 @@ SetupPokeballs: ; 3a945 (e:6945) jr nz, .monloop ret -PickPokeball: ; 3a961 (e:6961) +PickPokeball: inc hl ld a, [hli] and a @@ -98,7 +98,7 @@ PickPokeball: ; 3a961 (e:6961) add hl, bc ; next mon struct ret -WritePokeballOAMData: ; 3a980 (e:6980) +WritePokeballOAMData: ld de, wBuffer ld c, PARTY_LENGTH .loop @@ -120,7 +120,7 @@ WritePokeballOAMData: ; 3a980 (e:6980) jr nz, .loop ret -PlacePlayerHUDTiles: ; 3a9a3 (e:69a3) +PlacePlayerHUDTiles: ld hl, PlayerBattleHUDGraphicsTiles ld de, wHUDGraphicsTiles ld bc, $3 @@ -129,13 +129,13 @@ PlacePlayerHUDTiles: ; 3a9a3 (e:69a3) ld de, -1 jr PlaceHUDTiles -PlayerBattleHUDGraphicsTiles: ; 3a9b7 (e:69b7) +PlayerBattleHUDGraphicsTiles: ; The tile numbers for specific parts of the battle display for the player's pokemon db $73 ; unused ($73 is hardcoded into the routine that uses these bytes) db $77 ; lower-right corner tile of the HUD db $6F ; lower-left triangle tile of the HUD -PlaceEnemyHUDTiles: ; 3a9ba (e:69ba) +PlaceEnemyHUDTiles: ld hl, EnemyBattleHUDGraphicsTiles ld de, wHUDGraphicsTiles ld bc, $3 @@ -144,13 +144,13 @@ PlaceEnemyHUDTiles: ; 3a9ba (e:69ba) ld de, $1 jr PlaceHUDTiles -EnemyBattleHUDGraphicsTiles: ; 3a9ce (e:69ce) +EnemyBattleHUDGraphicsTiles: ; The tile numbers for specific parts of the battle display for the enemy db $73 ; unused ($73 is hardcoded in the routine that uses these bytes) db $74 ; lower-left corner tile of the HUD db $78 ; lower-right triangle tile of the HUD -PlaceHUDTiles: ; 3a9d1 (e:69d1) +PlaceHUDTiles: ld [hl], $73 ld bc, SCREEN_WIDTH add hl, bc @@ -167,7 +167,7 @@ PlaceHUDTiles: ; 3a9d1 (e:69d1) ld [hl], a ret -SetupPlayerAndEnemyPokeballs: ; 3a9e9 (e:69e9) +SetupPlayerAndEnemyPokeballs: call LoadPartyPokeballGfx ld hl, wPartyMons ld de, wPartyCount @@ -195,6 +195,6 @@ SetupPlayerAndEnemyPokeballs: ; 3a9e9 (e:69e9) jp WritePokeballOAMData ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) -PokeballTileGraphics:: ; 3aa28 (e:6a28) +PokeballTileGraphics:: INCBIN "gfx/pokeball.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index f4c99e3d..47c9fa5d 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -1,4 +1,4 @@ -EndOfBattle: ; 13765 (4:7765) +EndOfBattle: ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .notLinkBattle @@ -78,15 +78,15 @@ EndOfBattle: ; 13765 (4:7765) ld [wDestinationWarpID], a ret -YouWinText: ; 1381d (4:781d) +YouWinText: db "YOU WIN@" -YouLoseText: ; 13825 (4:7825) +YouLoseText: db "YOU LOSE@" -DrawText: ; 1382e (4:782e) +DrawText: db " DRAW@" -PickUpPayDayMoneyText: ; 13835 (4:7835) +PickUpPayDayMoneyText: TX_FAR _PickUpPayDayMoneyText db "@" diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index f43a7354..9946c6c6 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -1,4 +1,4 @@ -GainExperience: ; 5524f (15:525f) +GainExperience: ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -297,7 +297,7 @@ GainExperience: ; 5524f (15:525f) predef_jump FlagActionPredef ; set the fought current enemy flag for the mon that is currently out ; divide enemy base stats, catch rate, and base exp by the number of mons gaining exp -DivideExpDataByNumMonsGainingExp: ; 5547b (15:547b) +DivideExpDataByNumMonsGainingExp: ld a, [wPartyGainExpFlags] ld b, a xor a @@ -331,7 +331,7 @@ DivideExpDataByNumMonsGainingExp: ; 5547b (15:547b) ret ; multiplies exp by 1.5 -BoostExp: ; 554ae (15:54ae) +BoostExp: ld a, [H_QUOTIENT + 2] ld b, a ld a, [H_QUOTIENT + 3] @@ -345,11 +345,11 @@ BoostExp: ; 554ae (15:54ae) ld [H_QUOTIENT + 2], a ret -Bankswitch15ToF: ; 554c1 (15:54c1) +Bankswitch15ToF: ld b, BANK(BattleCore) jp Bankswitch -GainedText: ; 554c6 (15:54c6) +GainedText: TX_FAR _GainedText TX_ASM ld a, [wBoostExpByExpAll] @@ -363,20 +363,20 @@ GainedText: ; 554c6 (15:54c6) ld hl, BoostedText ret -WithExpAllText: ; 554df (15:54df) +WithExpAllText: TX_FAR _WithExpAllText TX_ASM ld hl, ExpPointsText ret -BoostedText: ; 554e8 (15:54e8) +BoostedText: TX_FAR _BoostedText -ExpPointsText: ; 554ec (15:54ec) +ExpPointsText: TX_FAR _ExpPointsText db "@" -GrewLevelText: ; 554f1 (15:54f1) +GrewLevelText: TX_FAR _GrewLevelText db $0b db "@" diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index cacf7ee8..36ca019e 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,4 +1,4 @@ -GetTrainerName_: ; f67a5 (3d:67a5) +GetTrainerName_: ld hl, wGrassRate ld a, [wLinkState] and a @@ -19,7 +19,6 @@ GetTrainerName_: ; f67a5 (3d:67a5) call GetName ld hl, wcd6d .foundName -.rival ld de, wTrainerName ld bc, $d jp CopyData diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index d61e5fec..5bb3e308 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -1,4 +1,4 @@ -MarowakAnim: ; 7092b (1c:492b) +MarowakAnim: ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a @@ -52,7 +52,7 @@ MarowakAnim: ; 7092b (1c:492b) jp ClearSprites ; copies a mon pic's from background VRAM to sprite VRAM and sets up OAM -CopyMonPicFromBGToSpriteVRAM: ; 70994 (1c:4994) +CopyMonPicFromBGToSpriteVRAM: ld de, vFrontPic ld hl, vSprites ld bc, 7 * 7 diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 74ea3814..bdd5d8f4 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,4 +1,4 @@ -InitBattleVariables: ; f6236 (3d:6236) +InitBattleVariables: ld a, [hTilesetType] ld [wSavedTilesetType], a xor a diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 9849cc9a..63142ba6 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -1,8 +1,8 @@ ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names -DisplayLinkBattleVersusTextBox: ; f41cf (3d:41cf) +DisplayLinkBattleVersusTextBox: call LoadTextBoxTilePatterns coord hl, 3, 4 - ld bc, $70c + lb bc, 7, 12 call TextBoxBorder coord hl, 4, 5 ld de, wPlayerName diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index 5965f2a8..9c347876 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -1,4 +1,4 @@ -ConversionEffect_: ; 1396d (4:796d) +ConversionEffect_: ld hl, wEnemyMonType1 ld de, wBattleMonType1 ld a, [H_WHOSETURN] @@ -24,12 +24,12 @@ ConversionEffect_: ; 1396d (4:796d) ld hl, ConvertedTypeText jp PrintText -ConvertedTypeText: ; 13997 (4:7997) +ConvertedTypeText: TX_FAR _ConvertedTypeText db "@" -PrintButItFailedText: ; 1399c (4:799c) +PrintButItFailedText: ld hl, PrintButItFailedText_ -CallBankF: ; 1399f (4:799f) +CallBankF: ld b, BANK(PrintButItFailedText_) jp Bankswitch diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index 2af286a8..e5f4681a 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -1,4 +1,4 @@ -DrainHPEffect_: ; 76e7 (1:76e7) +DrainHPEffect_: ld hl, wDamage ld a, [hl] srl a ; divide damage by 2 @@ -95,10 +95,10 @@ DrainHPEffect_: ; 76e7 (1:76e7) .printText jp PrintText -SuckedHealthText: ; 7784 (1:7784) +SuckedHealthText: TX_FAR _SuckedHealthText db "@" -DreamWasEatenText: ; 7789 (1:7789) +DreamWasEatenText: TX_FAR _DreamWasEatenText db "@" diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index e7f30794..9ba0ade0 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -1,4 +1,4 @@ -FocusEnergyEffect_: ; f628b (3d:628b) +FocusEnergyEffect_: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -16,7 +16,7 @@ FocusEnergyEffect_: ; f628b (3d:628b) call DelayFrames jpab PrintButItFailedText_ -GettingPumpedText: ; f62b5 (3d:62b5) +GettingPumpedText: db $0a TX_FAR _GettingPumpedText db "@" diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index eec68182..bd20f231 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -1,4 +1,4 @@ -HazeEffect_: ; 139a4 (4:79a4) +HazeEffect_: ld a, $7 ; store 7 on every stat mod ld hl, wPlayerMonAttackMod @@ -45,7 +45,7 @@ HazeEffect_: ; 139a4 (4:79a4) ld hl, StatusChangesEliminatedText jp PrintText -CureVolatileStatuses: ; 13a01 (4:7a01) +CureVolatileStatuses: ; only cures statuses of the Pokemon not using Haze res Confused, [hl] inc hl ; BATTSTATUS2 @@ -58,7 +58,7 @@ CureVolatileStatuses: ; 13a01 (4:7a01) ld [hl], a ret -ResetStatMods: ; 13a0d (4:7a0d) +ResetStatMods: ld b, $8 .loop ld [hli], a @@ -66,7 +66,7 @@ ResetStatMods: ; 13a0d (4:7a0d) jr nz, .loop ret -ResetStats: ; 13a14 (4:7a14) +ResetStats: ld b, $8 .loop ld a, [hli] @@ -76,6 +76,6 @@ ResetStats: ; 13a14 (4:7a14) jr nz, .loop ret -StatusChangesEliminatedText: ; 13a1d (4:7a1d) +StatusChangesEliminatedText: TX_FAR _StatusChangesEliminatedText db "@" diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index 418f7df7..377c14c4 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -1,4 +1,4 @@ -HealEffect_: ; f62ba (3d:62ba) +HealEffect_: ld a, [H_WHOSETURN] and a ld de, wBattleMonHP @@ -107,14 +107,14 @@ HealEffect_: ; f62ba (3d:62ba) ld hl, PrintButItFailedText_ jp Bankswitch3DtoF -StartedSleepingEffect: ; f6370 (3d:6370) +StartedSleepingEffect: TX_FAR _StartedSleepingEffect db "@" -FellAsleepBecameHealthyText: ; f6375 (3d:6375) +FellAsleepBecameHealthyText: TX_FAR _FellAsleepBecameHealthyText db "@" -RegainedHealthText: ; f637a (3d:637a) +RegainedHealthText: TX_FAR _RegainedHealthText db "@" diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index ef649ff6..0f3a2666 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -1,4 +1,4 @@ -LeechSeedEffect_: ; 2bdba (a:7dba) +LeechSeedEffect_: callab MoveHitTest ld a, [wMoveMissed] and a @@ -31,10 +31,10 @@ LeechSeedEffect_: ; 2bdba (a:7dba) ld hl, EvadedAttackText jp PrintText -WasSeededText: ; 2be03 (a:7e03) +WasSeededText: TX_FAR _WasSeededText db "@" -EvadedAttackText: ; 2be08 (a:7e08) +EvadedAttackText: TX_FAR _EvadedAttackText db "@" diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm index 022606bb..b92777de 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/moveEffects/mist_effect.asm @@ -1,4 +1,4 @@ -MistEffect_: ; f64ac (3d:64ac) +MistEffect_: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -14,6 +14,6 @@ MistEffect_: ; f64ac (3d:64ac) .mistAlreadyInUse jpab PrintButItFailedText_ -ShroudedInMistText: ; f64d3 (3d:64d3) +ShroudedInMistText: TX_FAR _ShroudedInMistText db "@" diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm index a60d573a..827e2197 100644 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ b/engine/battle/moveEffects/one_hit_ko_effect.asm @@ -1,4 +1,4 @@ -OneHitKOEffect_: ; f64db (3d:64db) +OneHitKOEffect_: ld hl, wDamage xor a ld [hli], a diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index 5cec6b02..95979ae6 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -1,4 +1,4 @@ -ParalyzeEffect_: ; f6562 (3d:6562) +ParalyzeEffect_: ld hl, wEnemyMonStatus ld de, wPlayerMoveType ld a, [H_WHOSETURN] diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm index 0236e3e4..e5daf014 100644 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ b/engine/battle/moveEffects/pay_day_effect.asm @@ -1,4 +1,4 @@ -PayDayEffect_: ; f6511 (3d:6511) +PayDayEffect_: xor a ld hl, wcd6d ld [hli], a @@ -40,6 +40,6 @@ PayDayEffect_: ; f6511 (3d:6511) ld hl, CoinsScatteredText jp PrintText -CoinsScatteredText: ; f655d (3d:655d) +CoinsScatteredText: TX_FAR _CoinsScatteredText db "@" diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index d65696e2..7fc90c44 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -1,4 +1,4 @@ -RecoilEffect_: ; 138f6 (4:78f6) +RecoilEffect_: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveNum] @@ -65,6 +65,6 @@ RecoilEffect_: ; 138f6 (4:78f6) predef UpdateHPBar2 ld hl, HitWithRecoilText jp PrintText -HitWithRecoilText: ; 13968 (4:7968) +HitWithRecoilText: TX_FAR _HitWithRecoilText db "@" diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index 1c2db0a0..f2165956 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -1,4 +1,4 @@ -ReflectLightScreenEffect_: ; f645d (3d:645d) +ReflectLightScreenEffect_: ld hl, wPlayerBattleStatus3 ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -32,14 +32,14 @@ ReflectLightScreenEffect_: ; f645d (3d:645d) ld hl, PrintButItFailedText_ jp Bankswitch3DtoF -LightScreenProtectedText: ; f649d (3d:649d) +LightScreenProtectedText: TX_FAR _LightScreenProtectedText db "@" -ReflectGainedArmorText: ; f64a2 (3d:64a2) +ReflectGainedArmorText: TX_FAR _ReflectGainedArmorText db "@" -Bankswitch3DtoF: ; f64a7 (3d:64a7) +Bankswitch3DtoF: ld b, BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index a4cd0264..03314ebf 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -1,4 +1,4 @@ -SubstituteEffect_: ; 17c31 (5:7c31) +SubstituteEffect_: ld c, 50 call DelayFrames ld hl, wBattleMonMaxHP @@ -64,14 +64,14 @@ SubstituteEffect_: ; 17c31 (5:7c31) .printText jp PrintText -SubstituteText: ; 17ca1 (5:7ca1) +SubstituteText: TX_FAR _SubstituteText db "@" -HasSubstituteText: ; 17ca6 (5:7ca6) +HasSubstituteText: TX_FAR _HasSubstituteText db "@" -TooWeakSubstituteText: ; 17cab (5:7cab) +TooWeakSubstituteText: TX_FAR _TooWeakSubstituteText db "@" diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index d77f43a3..2906de11 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -1,4 +1,4 @@ -TransformEffect_: ; f637f (3d:637f) +TransformEffect_: ld hl, wBattleMonSpecies ld de, wEnemyMonSpecies ld bc, wEnemyBattleStatus3 @@ -136,6 +136,6 @@ TransformEffect_: ; f637f (3d:637f) ld hl, PrintButItFailedText_ jp Bankswitch3DtoF -TransformedText: ; f6458 (3d:6458) +TransformedText: TX_FAR _TransformedText db "@" diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm index 7b581905..f717f871 100644 --- a/engine/battle/print_type.asm +++ b/engine/battle/print_type.asm @@ -1,6 +1,6 @@ ; [wd0b5] = pokemon ID ; hl = dest addr -PrintMonType: ; 27d20 (9:7d20) +PrintMonType: call GetPredefRegisters push hl call GetMonHeader @@ -19,25 +19,25 @@ PrintMonType: ; 27d20 (9:7d20) ; a = type ; hl = dest addr -PrintType: ; 27d3e (9:7d3e) +PrintType: push hl jr PrintType_ ; erase "TYPE2/" if the mon only has 1 type -EraseType2Text: ; 27d41 (9:7d41) +EraseType2Text: ld a, " " ld bc, $13 add hl, bc ld bc, $6 jp FillMemory -PrintMoveType: ; 27d4d (9:7d4d) +PrintMoveType: call GetPredefRegisters push hl ld a, [wPlayerMoveType] ; fall through -PrintType_: ; 27d54 (9:7d54) +PrintType_: add a ld hl, TypeNames ld e, a diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index a4843417..3f10a85d 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -1,4 +1,4 @@ -ReadTrainer: ; 39bb6 (e:5bb6) +ReadTrainer: ; don't change any moves in a link battle ld a,[wLinkState] diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 69439199..c6c0fa80 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -1,4 +1,4 @@ -PrintSafariZoneBattleText: ; 4111 (1:4111) +PrintSafariZoneBattleText: ld hl, wSafariBaitFactor ld a, [hl] and a @@ -27,10 +27,10 @@ PrintSafariZoneBattleText: ; 4111 (1:4111) pop hl jp PrintText -SafariZoneEatingText: ; 4141 (1:4141) +SafariZoneEatingText: TX_FAR _SafariZoneEatingText db "@" -SafariZoneAngryText: ; 4146 (1:4146) +SafariZoneAngryText: TX_FAR _SafariZoneAngryText db "@" diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 227dbbcb..7e2c911c 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,4 +1,4 @@ -SaveTrainerName: ; 27dff (9:7dff) +SaveTrainerName: ld hl,TrainerNamePointers ld a,[wTrainerClass] dec a @@ -18,7 +18,7 @@ SaveTrainerName: ; 27dff (9:7dff) jr nz,.CopyCharacter ret -TrainerNamePointers: ; 27e19 (9:7e19) +TrainerNamePointers: ; what is the point of these? dw YoungsterName dw BugCatcherName @@ -68,45 +68,45 @@ TrainerNamePointers: ; 27e19 (9:7e19) dw wTrainerName dw wTrainerName -YoungsterName: ; 27e77 (9:7e77) +YoungsterName: db "YOUNGSTER@" -BugCatcherName: ; 27e81 (9:7e81) +BugCatcherName: db "BUG CATCHER@" -LassName: ; 27e8d (9:7e8d) +LassName: db "LASS@" -JrTrainerMName: ; 27e92 (9:7e92) +JrTrainerMName: db "JR.TRAINER♂@" -JrTrainerFName: ; 27e9e (9:7e9e) +JrTrainerFName: db "JR.TRAINER♀@" -PokemaniacName: ; 27eaa (9:7eaa) +PokemaniacName: db "POKéMANIAC@" -SuperNerdName: ; 27eb5 (9:7eb5) +SuperNerdName: db "SUPER NERD@" -BurglarName: ; 27ec0 (9:7ec0) +BurglarName: db "BURGLAR@" -EngineerName: ; 27ec8 (9:7ec8) +EngineerName: db "ENGINEER@" -JugglerXName: ; 27ed1 (9:7ed1) +JugglerXName: db "JUGGLER@" -SwimmerName: ; 27ed9 (9:7ed9) +SwimmerName: db "SWIMMER@" -BeautyName: ; 27ee1 (9:7ee1) +BeautyName: db "BEAUTY@" -RockerName: ; 27ee8 (9:7ee8) +RockerName: db "ROCKER@" -JugglerName: ; 27eef (9:7eef) +JugglerName: db "JUGGLER@" -BlackbeltName: ; 27ef7 (9:7ef7) +BlackbeltName: db "BLACKBELT@" -ProfOakName: ; 27f01 (9:7f01) +ProfOakName: db "PROF.OAK@" -ChiefName: ; 27f0a (9:7f0a) +ChiefName: db "CHIEF@" -ScientistName: ; 27f10 (9:7f10) +ScientistName: db "SCIENTIST@" -RocketName: ; 27f1a (9:7f1a) +RocketName: db "ROCKET@" -CooltrainerMName: ; 27f21 (9:7f21) +CooltrainerMName: db "COOLTRAINER♂@" -CooltrainerFName: ; 27f2e (9:7f2e) +CooltrainerFName: db "COOLTRAINER♀@" diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index c829fa13..c614d638 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -1,14 +1,14 @@ ; scales both uncompressed sprite chunks by two in every dimension (creating 2x2 output pixels per input pixel) ; assumes that input sprite chunks are 4x4 tiles, and the rightmost and bottommost 4 pixels will be ignored ; resulting in a 7*7 tile output sprite chunk -ScaleSpriteByTwo: ; 2fd79 (b:7d79) +ScaleSpriteByTwo: ld a, $0 call SwitchSRAMBankAndLatchClockData call ScaleSpriteByTwo_ call PrepareRTCDataAndDisableSRAM ret -ScaleSpriteByTwo_: ; 2fd85 (b:7d85) +ScaleSpriteByTwo_: ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case @@ -17,7 +17,7 @@ ScaleSpriteByTwo_: ; 2fd85 (b:7d85) ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case -ScaleFirstThreeSpriteColumnsByTwo: ; 2fd9a (b:7d9a) +ScaleFirstThreeSpriteColumnsByTwo: ld b, $3 ; 3 tile columns .columnLoop ld c, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows @@ -46,7 +46,7 @@ ScaleFirstThreeSpriteColumnsByTwo: ; 2fd9a (b:7d9a) jr nz, .columnLoop ret -ScaleLastSpriteColumnByTwo: ; 2fdc2 (b:7dc2) +ScaleLastSpriteColumnByTwo: ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows ld [H_SPRITEINTERLACECOUNTER], a ld bc, -1 @@ -68,7 +68,7 @@ ScaleLastSpriteColumnByTwo: ; 2fdc2 (b:7dc2) ; scales the given 4 bits in a (4x1 pixels) to 2 output bytes (8x2 pixels) ; hl: destination pointer ; bc: destination pointer offset (added after the two bytes have been written) -ScalePixelsByTwo: ; 2fddc (b:7ddc) +ScalePixelsByTwo: push hl and $f ld hl, DuplicateBitsTable @@ -85,7 +85,7 @@ ScalePixelsByTwo: ; 2fddc (b:7ddc) ret ; repeats each input bit twice -DuplicateBitsTable: ; 2fded (b:7ded) +DuplicateBitsTable: db $00, $03, $0c, $0f db $30, $33, $3c, $3f db $c0, $c3, $cc, $cf diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index 8e65c973..98893dcf 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -1,4 +1,4 @@ -_ScrollTrainerPicAfterBattle: ; f4259 (3d:4259) +_ScrollTrainerPicAfterBattle: ; Load the enemy trainer's pic and scrolls it into ; the screen from the right. xor a @@ -32,7 +32,7 @@ _ScrollTrainerPicAfterBattle: ; f4259 (3d:4259) jr .scrollLoop ; write one 7-tile column of the trainer pic to the tilemap -DrawTrainerPicColumn: ; f428d (3d:428d) +DrawTrainerPicColumn: push hl push de push bc diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 6b6247c9..2f2c46a6 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -1,6 +1,6 @@ ; creates a set of moves that may be used and returns its address in hl ; unused slots are filled with 0, all used slots may be chosen with equal probability -AIEnemyTrainerChooseMoves: ; 3969c (e:569c) +AIEnemyTrainerChooseMoves: ld a, $a ld hl, wBuffer ; init temporary move selection array. Only the moves with the lowest numbers are chosen in the end ld [hli], a ; move 1 @@ -103,14 +103,14 @@ AIEnemyTrainerChooseMoves: ; 3969c (e:569c) ld hl, wEnemyMonMoves ; use original move set ret -AIMoveChoiceModificationFunctionPointers: ; 39726 (e:5726) +AIMoveChoiceModificationFunctionPointers: dw AIMoveChoiceModification1 dw AIMoveChoiceModification2 dw AIMoveChoiceModification3 dw AIMoveChoiceModification4 ; unused, does nothing ; discourages moves that cause no damage but only a status ailment if player's mon already has one -AIMoveChoiceModification1: ; 3972e (e:572e) +AIMoveChoiceModification1: ld a, [wBattleMonStatus] and a ret z ; return if no status ailment on player's mon @@ -145,7 +145,7 @@ AIMoveChoiceModification1: ; 3972e (e:572e) ld [hl], a jr .nextMove -StatusAilmentMoveEffects: ; 39765 (e:5765) +StatusAilmentMoveEffects: db $01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT @@ -155,7 +155,7 @@ StatusAilmentMoveEffects: ; 39765 (e:5765) ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects ; that fall in-bewteen -AIMoveChoiceModification2: ; 3976a (e:576a) +AIMoveChoiceModification2: ld a, [wAILayer2Encouragement] cp $1 ret nz @@ -188,7 +188,7 @@ AIMoveChoiceModification2: ; 3976a (e:576a) ; encourages moves that are effective against the player's mon (even if non-damaging). ; discourage damaging moves that are ineffective or not very effective against the player's mon, ; unless there's no damaging move that deals at least neutral damage -AIMoveChoiceModification3: ; 3979a (e:579a) +AIMoveChoiceModification3: ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 @@ -255,10 +255,10 @@ AIMoveChoiceModification3: ; 3979a (e:579a) jr z, .nextMove inc [hl] ; sligthly discourage this move jr .nextMove -AIMoveChoiceModification4: ; 39806 (e:5806) +AIMoveChoiceModification4: ret -ReadMove: ; 39807 (e:5807) +ReadMove: push hl push de push bc @@ -275,7 +275,7 @@ ReadMove: ; 39807 (e:5807) ; move choice modification methods that are applied for each trainer class ; 0 is sentinel value -TrainerClassMoveChoiceModifications: ; 3981e (e:581e) +TrainerClassMoveChoiceModifications: db 0 ; YOUNGSTER db 1,0 ; BUG CATCHER db 1,0 ; LASS @@ -336,7 +336,7 @@ INCLUDE "data/trainer_moves.asm" INCLUDE "data/trainer_parties.asm" -TrainerAI: ; 3a5b2 (e:65b2) +TrainerAI: ld a,[wIsInBattle] dec a jr z, .done ; if not a trainer, we're done here @@ -377,7 +377,7 @@ TrainerAI: ; 3a5b2 (e:65b2) and a ret -TrainerAIPointers: ; 3a5f2 (e:65f2) +TrainerAIPointers: ; one entry per trainer class ; first byte, number of times (per Pokémon) it can occur ; next two bytes, pointer to AI subroutine for trainer class @@ -429,27 +429,27 @@ TrainerAIPointers: ; 3a5f2 (e:65f2) dbw 2,AgathaAI ; agatha dbw 1,LanceAI ; lance -JugglerAI: ; 3a67f (e:667f) +JugglerAI: cp $40 ret nc jp AISwitchIfEnoughMons -BlackbeltAI: ; 3a685 (e:6685) +BlackbeltAI: cp $20 ret nc jp AIUseXAttack -GiovanniAI: ; 3a68b (e:668b) +GiovanniAI: cp $40 ret nc jp AIUseGuardSpec -CooltrainerMAI: ; 3a691 (e:6691) +CooltrainerMAI: cp $40 ret nc jp AIUseXAttack -CooltrainerFAI: ; 3a697 (e:6697) +CooltrainerFAI: cp $40 ld a,$A call AICheckIfHPBelowFraction @@ -459,24 +459,24 @@ CooltrainerFAI: ; 3a697 (e:6697) ret nc jp AISwitchIfEnoughMons -BrockAI: ; 3a6aa (e:66aa) +BrockAI: ; if his active monster has a status condition, use a full heal ld a,[wEnemyMonStatus] and a ret z jp AIUseFullHeal -MistyAI: ; 3a6b2 (e:66b2) +MistyAI: cp $40 ret nc jp AIUseXDefend -LtSurgeAI: ; 3a6b8 (e:66b8) +LtSurgeAI: cp $40 ret nc jp AIUseXSpeed -ErikaAI: ; 3a6be (e:66be) +ErikaAI: cp $80 ret nc ld a,$A @@ -484,12 +484,12 @@ ErikaAI: ; 3a6be (e:66be) ret nc jp AIUseSuperPotion -KogaAI: ; 3a6ca (e:66ca) +KogaAI: cp $20 ret nc jp AIUseXAttack -BlaineAI: ; 3a6d0 (e:66d0) +BlaineAI: cp $40 ret nc ld a,$A @@ -497,12 +497,12 @@ BlaineAI: ; 3a6d0 (e:66d0) ret nc jp AIUseSuperPotion -SabrinaAI: ; 3a6dc (e:66dc) +SabrinaAI: cp $40 ret nc jp AIUseXDefend -Sony2AI: ; 3a6e2 (e:66e2) +Sony2AI: cp $20 ret nc ld a,5 @@ -510,7 +510,7 @@ Sony2AI: ; 3a6e2 (e:66e2) ret nc jp AIUsePotion -Sony3AI: ; 3a6ee (e:66ee) +Sony3AI: cp $20 ret nc ld a,5 @@ -518,7 +518,7 @@ Sony3AI: ; 3a6ee (e:66ee) ret nc jp AIUseFullRestore -LoreleiAI: ; 3a6fa (e:66fa) +LoreleiAI: cp $80 ret nc ld a,5 @@ -526,12 +526,12 @@ LoreleiAI: ; 3a6fa (e:66fa) ret nc jp AIUseSuperPotion -BrunoAI: ; 3a706 (e:6706) +BrunoAI: cp $40 ret nc jp AIUseXDefend -AgathaAI: ; 3a70c (e:670c) +AgathaAI: cp $14 jp c,AISwitchIfEnoughMons cp $80 @@ -541,7 +541,7 @@ AgathaAI: ; 3a70c (e:670c) ret nc jp AIUseSuperPotion -LanceAI: ; 3a71d (e:671d) +LanceAI: cp $80 ret nc ld a,5 @@ -549,23 +549,23 @@ LanceAI: ; 3a71d (e:671d) ret nc jp AIUseHyperPotion -GenericAI: ; 3a729 (e:6729) +GenericAI: and a ; clear carry ret ; end of individual trainer AI routines -DecrementAICount: ; 3a72b (e:672b) +DecrementAICount: ld hl,wAICount dec [hl] scf ret -AIPlayRestoringSFX: ; 3a731 (e:6731) +AIPlayRestoringSFX: ld a,SFX_HEAL_AILMENT jp PlaySoundWaitForCurrent -AIUseFullRestore: ; 3a736 (e:6736) +AIUseFullRestore: call AICureStatus ld a,FULL_RESTORE ld [wAIItem],a @@ -589,25 +589,25 @@ AIUseFullRestore: ; 3a736 (e:6736) ld [wEnemyMonHP],a jr AIPrintItemUseAndUpdateHPBar -AIUsePotion: ; 3a760 (e:6760) +AIUsePotion: ; enemy trainer heals his monster with a potion ld a,POTION ld b,20 jr AIRecoverHP -AIUseSuperPotion: ; 3a766 (e:6766) +AIUseSuperPotion: ; enemy trainer heals his monster with a super potion ld a,SUPER_POTION ld b,50 jr AIRecoverHP -AIUseHyperPotion: ; 3a76c (e:676c) +AIUseHyperPotion: ; enemy trainer heals his monster with a hyper potion ld a,HYPER_POTION ld b,200 ; fallthrough -AIRecoverHP: ; 3a770 (e:6770) +AIRecoverHP: ; heal b HP and print "trainer used $(a) on pokemon!" ld [wAIItem],a ld hl,wEnemyMonHP + 1 @@ -648,7 +648,7 @@ AIRecoverHP: ; 3a770 (e:6770) ld [wHPBarNewHP+1],a ; fallthrough -AIPrintItemUseAndUpdateHPBar: ; 3a7ae (e:67ae) +AIPrintItemUseAndUpdateHPBar: call AIPrintItemUse_ coord hl, 2, 2 xor a @@ -656,7 +656,7 @@ AIPrintItemUseAndUpdateHPBar: ; 3a7ae (e:67ae) predef UpdateHPBar2 jp DecrementAICount -AISwitchIfEnoughMons: ; 3a7c0 (e:67c0) +AISwitchIfEnoughMons: ; enemy trainer switches if there are 3 or more unfainted mons in party ld a,[wEnemyPartyCount] ld c,a @@ -686,7 +686,7 @@ AISwitchIfEnoughMons: ; 3a7c0 (e:67c0) and a ret -SwitchEnemyMon: ; 3a7e1 (e:67e1) +SwitchEnemyMon: ; prepare to withdraw the active monster: copy hp, number, and status to roster @@ -717,17 +717,17 @@ SwitchEnemyMon: ; 3a7e1 (e:67e1) scf ret -AIBattleWithdrawText: ; 3a817 (e:6817) +AIBattleWithdrawText: TX_FAR _AIBattleWithdrawText db "@" -AIUseFullHeal: ; 3a81c (e:681c) +AIUseFullHeal: call AIPlayRestoringSFX call AICureStatus ld a,FULL_HEAL jp AIPrintItemUse -AICureStatus: ; 3a827 (e:6827) +AICureStatus: ; cures the status of enemy's active pokemon ld a,[wEnemyMonPartyPos] ld hl,wEnemyMon1Status @@ -740,30 +740,28 @@ AICureStatus: ; 3a827 (e:6827) res 0,[hl] ret -AIUseXAccuracy: ; 3a83e (e:683e) -; unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] ld a,X_ACCURACY jp AIPrintItemUse -AIUseGuardSpec: ; 3a84b (e:684b) +AIUseGuardSpec: call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 1,[hl] ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: ; 3a858 (e:6858) -; unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] ld a,DIRE_HIT jp AIPrintItemUse -AICheckIfHPBelowFraction: ; 3a865 (e:6865) +AICheckIfHPBelowFraction: ; return carry if enemy trainer's current HP is below 1 / a of the maximum ld [H_DIVISOR],a ld hl,wEnemyMonMaxHP @@ -789,27 +787,27 @@ AICheckIfHPBelowFraction: ; 3a865 (e:6865) sub c ret -AIUseXAttack: ; 3a888 (e:6888) +AIUseXAttack: ld b,$A ld a,X_ATTACK jr AIIncreaseStat -AIUseXDefend: ; 3a88e (e:688e) +AIUseXDefend: ld b,$B ld a,X_DEFEND jr AIIncreaseStat -AIUseXSpeed: ; 3a894 (e:6894) +AIUseXSpeed: ld b,$C ld a,X_SPEED jr AIIncreaseStat -AIUseXSpecial: ; 3a89a (e:689a) +AIUseXSpecial: ld b,$D ld a,X_SPECIAL ; fallthrough -AIIncreaseStat: ; 3a89e (e:689e) +AIIncreaseStat: ld [wAIItem],a push bc call AIPrintItemUse_ @@ -831,12 +829,12 @@ AIIncreaseStat: ; 3a89e (e:689e) ld [hl],a jp DecrementAICount -AIPrintItemUse: ; 3a8c2 (e:68c2) +AIPrintItemUse: ld [wAIItem],a call AIPrintItemUse_ jp DecrementAICount -AIPrintItemUse_: ; 3a8cb (e:68cb) +AIPrintItemUse_: ; print "x used [wAIItem] on z!" ld a,[wAIItem] ld [wd11e],a @@ -844,6 +842,6 @@ AIPrintItemUse_: ; 3a8cb (e:68cb) ld hl, AIBattleUseItemText jp PrintText -AIBattleUseItemText: ; 3a8da (e:68da) +AIBattleUseItemText: TX_FAR _AIBattleUseItemText db "@" diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm index 69599dc0..37678e74 100755 --- a/engine/battle/trainer_pic_money_pointers.asm +++ b/engine/battle/trainer_pic_money_pointers.asm @@ -1,4 +1,4 @@ -TrainerPicAndMoneyPointers: ; 39893 (e:5893) +TrainerPicAndMoneyPointers: ; trainer pic pointers and base money. ; money received after battle = base money × level of highest-level enemy mon dw YoungsterPic diff --git a/engine/battle/unused_stats_functions.asm b/engine/battle/unused_stats_functions.asm index 5b2e5e0e..55f78fd3 100644 --- a/engine/battle/unused_stats_functions.asm +++ b/engine/battle/unused_stats_functions.asm @@ -1,5 +1,5 @@ ; does nothing since no stats are ever selected (barring glitches) -DoubleSelectedStats: ; f4206 (3d:4206) +DoubleSelectedStats: ld a, [H_WHOSETURN] and a ld a, [wPlayerStatsToDouble] @@ -29,7 +29,7 @@ DoubleSelectedStats: ; f4206 (3d:4206) ret ; does nothing since no stats are ever selected (barring glitches) -HalveSelectedStats: ; f422d (3d:422d) +HalveSelectedStats: ld a, [H_WHOSETURN] and a ld a, [wPlayerStatsToHalve] diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index f2f2f457..0285346e 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -1,6 +1,6 @@ ; try to initiate a wild pokemon encounter ; returns success in Z -TryDoWildEncounter: ; 1383a (4:783a) +TryDoWildEncounter: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -100,7 +100,7 @@ TryDoWildEncounter: ; 1383a (4:783a) xor a ret -WildMonEncounterSlotChances: ; 138e2 (4:78e2) +WildMonEncounterSlotChances: ; There are 10 slots for wild pokemon, and this is the table that defines how common each of ; those 10 slots is. A random number is generated and then the first byte of each pair in this ; table is compared against that random number. If the random number is less than or equal diff --git a/engine/bcd.asm b/engine/bcd.asm index a5322702..204c2e40 100644 --- a/engine/bcd.asm +++ b/engine/bcd.asm @@ -1,22 +1,22 @@ ; divide hMoney by hDivideBCDDivisor ; return output in hDivideBCDQuotient (same as hDivideBCDDivisor) ; used only to halve player money upon losing a fight -DivideBCDPredef:: ; f5a4 (3:75a4) +DivideBCDPredef:: DivideBCDPredef2:: DivideBCDPredef3:: ; only used function DivideBCDPredef4:: call GetPredefRegisters -DivideBCD:: ; f5a8 (3:75a8) +DivideBCD:: xor a ld [hDivideBCDBuffer], a ld [hDivideBCDBuffer + 1], a ld [hDivideBCDBuffer + 2], a ld d, $1 -.asm_f5b0 +.loop1 ld a, [hDivideBCDDivisor] and $f0 - jr nz, .asm_f5e1 + jr nz, .go inc d ld a, [hDivideBCDDivisor] swap a @@ -40,8 +40,9 @@ DivideBCD:: ; f5a8 (3:75a8) ld a, [hDivideBCDDivisor + 2] and $f0 ld [hDivideBCDDivisor + 2], a - jr .asm_f5b0 -.asm_f5e1 + jr .loop1 + +.go push de push de call DivideBCD_f686 @@ -51,7 +52,7 @@ DivideBCD:: ; f5a8 (3:75a8) and $f0 ld [hDivideBCDBuffer], a dec d - jr z, .asm_f642 + jr z, .skip push de call DivideBCD_f65d call DivideBCD_f686 @@ -60,7 +61,7 @@ DivideBCD:: ; f5a8 (3:75a8) or b ld [hDivideBCDBuffer], a dec d - jr z, .asm_f642 + jr z, .skip push de call DivideBCD_f65d call DivideBCD_f686 @@ -70,7 +71,7 @@ DivideBCD:: ; f5a8 (3:75a8) and $f0 ld [hDivideBCDBuffer + 1], a dec d - jr z, .asm_f642 + jr z, .skip push de call DivideBCD_f65d call DivideBCD_f686 @@ -79,7 +80,7 @@ DivideBCD:: ; f5a8 (3:75a8) or b ld [hDivideBCDBuffer + 1], a dec d - jr z, .asm_f642 + jr z, .skip push de call DivideBCD_f65d call DivideBCD_f686 @@ -89,7 +90,7 @@ DivideBCD:: ; f5a8 (3:75a8) and $f0 ld [hDivideBCDBuffer + 2], a dec d - jr z, .asm_f642 + jr z, .skip push de call DivideBCD_f65d call DivideBCD_f686 @@ -97,7 +98,7 @@ DivideBCD:: ; f5a8 (3:75a8) ld a, [hDivideBCDBuffer + 2] or b ld [hDivideBCDBuffer + 2], a -.asm_f642 +.skip ld a, [hDivideBCDBuffer] ld [hDivideBCDQuotient], a ld a, [hDivideBCDBuffer + 1] @@ -109,15 +110,15 @@ DivideBCD:: ; f5a8 (3:75a8) sub d and a ret z -.asm_f654 +.loop2 push af call DivideBCD_f65d pop af dec a - jr nz, .asm_f654 + jr nz, .loop2 ret -DivideBCD_f65d: ; f65d (3:765d) +DivideBCD_f65d: ld a, [hDivideBCDDivisor + 2] swap a and $f @@ -142,7 +143,7 @@ DivideBCD_f65d: ; f65d (3:765d) ld [hDivideBCDDivisor], a ret -DivideBCD_f686: ; f686 (3:7686) +DivideBCD_f686: ld bc, $3 .asm_f689 ld de, hMoney @@ -160,10 +161,10 @@ DivideBCD_f686: ; f686 (3:7686) jr .asm_f689 -AddBCDPredef:: ; f6a3 (3:76a3) +AddBCDPredef:: call GetPredefRegisters -AddBCD:: ; f6a6 (3:76a6) +AddBCD:: and a ld b, c .add @@ -187,10 +188,10 @@ AddBCD:: ; f6a6 (3:76a6) ret -SubBCDPredef:: ; f6bc (3:76bc) +SubBCDPredef:: call GetPredefRegisters -SubBCD:: ; f6bf (3:76bf) +SubBCD:: and a ld b, c .sub @@ -212,4 +213,4 @@ SubBCD:: ; f6bf (3:76bf) jr nz, .fill scf .done - ret
\ No newline at end of file + ret diff --git a/engine/bg_map_attributes.asm b/engine/bg_map_attributes.asm index b2c4c3f1..90df9e27 100644 --- a/engine/bg_map_attributes.asm +++ b/engine/bg_map_attributes.asm @@ -1,6 +1,6 @@ INCLUDE "data/bg_map_attributes.asm" -LoadBGMapAttributes:: ; bf450 (2f:7450) +LoadBGMapAttributes:: ld hl, BGMapAttributesPointers ld a, c ; c = which packet push af ; save for later (to determine if we're handling the trainer card or party menu) @@ -105,7 +105,7 @@ LoadBGMapAttributes:: ; bf450 (2f:7450) ei ret -BGMapAttributesPointers: ; bf4de (2f:74de) +BGMapAttributesPointers: dw BGMapAttributes_Unknown1 dw BGMapAttributes_Unknown2 dw BGMapAttributes_GameFreakIntro @@ -120,7 +120,7 @@ BGMapAttributesPointers: ; bf4de (2f:74de) dw BGMapAttributes_WholeScreen dw BGMapAttributes_Unknown13 -HandleBadgeFaceAttributes: ; bf4f8 (2f:74f8) +HandleBadgeFaceAttributes: ; zero out the attributes if the player doesn't have the respective badge ; BOULDERBADGE ld hl, vBGMap1 + $183 @@ -172,7 +172,7 @@ HandleBadgeFaceAttributes: ; bf4f8 (2f:74f8) call z, ZeroOutCurrentBadgeAttributes ret -ZeroOutCurrentBadgeAttributes: ; bf551 (2f:7551) +ZeroOutCurrentBadgeAttributes: push hl xor a ld [hli], a @@ -184,7 +184,7 @@ ZeroOutCurrentBadgeAttributes: ; bf551 (2f:7551) pop hl ret -HandlePartyHPBarAttributes: ; bf55d (2f:755d) +HandlePartyHPBarAttributes: ; hp bars require 3 (green, orange, red) colours, when there are only 2 "free" colours per palette ; therefore, we must transfer individual bg attributes where the locations of the hp bars are in vram ld hl, vBGMap1 + $25 ; location of start of the HP bar in vram @@ -216,4 +216,4 @@ HandlePartyHPBarAttributes: ; bf55d (2f:755d) pop bc dec c jr nz, .loop - ret
\ No newline at end of file + ret diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 3c75b340..88f7b2f7 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -1,7 +1,7 @@ ; performs the appropriate action when the player uses the gameboy on the table in the Colosseum or Trade Center ; In the Colosseum, it starts a battle. In the Trade Center, it displays the trade selection screen. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy. -CableClub_DoBattleOrTrade: ; 53a5 (1:53a5) +CableClub_DoBattleOrTrade: ld c, 80 call DelayFrames call ClearScreen @@ -22,7 +22,7 @@ CableClub_DoBattleOrTrade: ; 53a5 (1:53a5) ; fall through ; This is called after completing a trade. -CableClub_DoBattleOrTradeAgain: ; 53d2 (1:53d2) +CableClub_DoBattleOrTradeAgain: ld hl, wSerialPlayerDataBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 6 @@ -253,7 +253,7 @@ CableClub_DoBattleOrTradeAgain: ; 53d2 (1:53d2) ld hl, wEnemyMons + (SERIAL_PREAMBLE_BYTE - 1) dec c jr nz, .unpatchEnemyMonsLoop - ld a, wEnemyMonOT & $ff + ld a, wEnemyMonOT % $100 ld [wUnusedCF8D], a ld a, wEnemyMonOT / $100 ld [wUnusedCF8D + 1], a @@ -268,7 +268,7 @@ CableClub_DoBattleOrTradeAgain: ; 53d2 (1:53d2) cp LINK_STATE_START_BATTLE ld a, LINK_STATE_TRADING ld [wLinkState], a - jr nz, .asm_55a0 + jr nz, .trading ld a, LINK_STATE_BATTLING ld [wLinkState], a ld a, OPP_SONY1 @@ -288,16 +288,16 @@ CableClub_DoBattleOrTradeAgain: ; 53d2 (1:53d2) ld [wLetterPrintingDelayFlags], a predef HealParty jp ReturnToCableClubRoom -.asm_55a0 +.trading ld c, BANK(Music_GameCorner) ld a, MUSIC_GAME_CORNER call PlayMusic jr CallCurrentTradeCenterFunction -PleaseWaitString: ; 55a9 (1:55a9) +PleaseWaitString: db "PLEASE WAIT!@" -CallCurrentTradeCenterFunction: ; 55b6 (1:55b6) +CallCurrentTradeCenterFunction: ld hl, TradeCenterPointerTable ld b, 0 ld a, [wTradeCenterPointerTableIndex] @@ -311,7 +311,7 @@ CallCurrentTradeCenterFunction: ; 55b6 (1:55b6) ld l, a jp [hl] -TradeCenter_SelectMon: ; 55ca (1:55ca) +TradeCenter_SelectMon: call ClearScreen call Delay3 ld b, $9 @@ -446,7 +446,6 @@ TradeCenter_SelectMon: ; 55ca (1:55ca) ld a, [wEnemyPartyCount] dec a cp b - ; continue jr nc, .notPastLastEnemyMon ; when switching to the enemy mon menu, if the menu selection would be past the last enemy mon, select the last enemy mon ld [wCurrentMenuItem], a @@ -584,7 +583,7 @@ TradeCenter_SelectMon: ; 55ca (1:55ca) jr nz, .cancelMenuItem_Loop ; fall through -ReturnToCableClubRoom: ; 581e (1:581e) +ReturnToCableClubRoom: call GBPalWhiteOutWithDelay3 ld hl, wFontLoaded ld a, [hl] @@ -603,7 +602,7 @@ ReturnToCableClubRoom: ; 581e (1:581e) call GBFadeInFromWhite ret -TradeCenter_DrawCancelBox: ; 5843 (1:5843) +TradeCenter_DrawCancelBox: coord hl, 11, 15 ld a, $7e ld bc, 2 * SCREEN_WIDTH + 9 @@ -615,10 +614,10 @@ TradeCenter_DrawCancelBox: ; 5843 (1:5843) ld de, CancelTextString jp PlaceString -CancelTextString: ; 5860 (1:5860) +CancelTextString: db "CANCEL@" -TradeCenter_PlaceSelectedEnemyMonMenuCursor: ; 5867 (1:5867) +TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] coord hl, 1, 9 ld bc, SCREEN_WIDTH @@ -626,7 +625,7 @@ TradeCenter_PlaceSelectedEnemyMonMenuCursor: ; 5867 (1:5867) ld [hl], $ec ; cursor ret -TradeCenter_DisplayStats: ; 5876 (1:5876) +TradeCenter_DisplayStats: ld a, [wCurrentMenuItem] ld [wWhichPokemon], a predef StatusScreen @@ -639,7 +638,7 @@ TradeCenter_DisplayStats: ; 5876 (1:5876) call TradeCenter_DrawPartyLists jp TradeCenter_DrawCancelBox -TradeCenter_DrawPartyLists: ; 589a (1:589a) +TradeCenter_DrawPartyLists: coord hl, 0, 0 lb bc, 6, 18 call CableClub_TextBoxBorder @@ -659,7 +658,7 @@ TradeCenter_DrawPartyLists: ; 589a (1:589a) ld de, wEnemyPartyMons ; fall through -TradeCenter_PrintPartyListNames: ; 58cd (1:58cd) +TradeCenter_PrintPartyListNames: ld c, $0 .loop ld a, [de] @@ -684,7 +683,7 @@ TradeCenter_PrintPartyListNames: ; 58cd (1:58cd) inc c jr .loop -TradeCenter_Trade: ; 58ef (1:58ef) +TradeCenter_Trade: ld c, 100 call DelayFrames xor a @@ -851,7 +850,6 @@ TradeCenter_Trade: ; 58ef (1:58ef) .usingExternalClock predef ExternalClockTradeAnim .tradeCompleted -; continue callab TryEvolvingMon call ClearScreen call LoadTrainerInfoTextBoxTiles @@ -880,22 +878,22 @@ TradeCenter_Trade: ; 58ef (1:58ef) ld [wTradeCenterPointerTableIndex], a jp CallCurrentTradeCenterFunction -WillBeTradedText: ; 5ad8 (1:5ad8) +WillBeTradedText: TX_FAR _WillBeTradedText db "@" -TradeCompleted: ; 5add (1:5add) +TradeCompleted: db "Trade completed!@" -TradeCanceled: ; 5aee (1:5aee) +TradeCanceled: db "Too bad! The trade" next "was canceled!@" -TradeCenterPointerTable: ; 5b0f (1:5b0f) +TradeCenterPointerTable: dw TradeCenter_SelectMon dw TradeCenter_Trade -CableClub_Run: ; 5b13 (1:5b13) +CableClub_Run: ld a, [wLinkState] cp LINK_STATE_START_TRADE jr z, .doBattleOrTrade @@ -909,9 +907,9 @@ CableClub_Run: ; 5b13 (1:5b13) call CableClub_DoBattleOrTrade ld hl, Club_GFX ld a, h - ld [wTilesetGFXPtr + 1], a + ld [wTilesetGfxPtr + 1], a ld a, l - ld [wTilesetGFXPtr], a + ld [wTilesetGfxPtr], a ld a, Bank(Club_GFX) ld [wTilesetBank], a ld hl, Club_Coll @@ -932,15 +930,15 @@ CableClub_Run: ; 5b13 (1:5b13) ld [wNewSoundID], a jp PlaySound -EmptyFunc3: ; 5b63 (1:5b63) +EmptyFunc3: ret -Diploma_TextBoxBorder: ; 5b64 (1:5b64) +Diploma_TextBoxBorder: call GetPredefRegisters ; b = height ; c = width -CableClub_TextBoxBorder: ; 5b67 (1:5b67) +CableClub_TextBoxBorder: push hl ld a, $78 ; border upper left corner tile ld [hli], a @@ -971,16 +969,16 @@ CableClub_TextBoxBorder: ; 5b67 (1:5b67) ret ; c = width -CableClub_DrawHorizontalLine: ; 5b94 (1:5b94) +CableClub_DrawHorizontalLine: ld d, c -.drawHorizontalLineLoop +.loop ld [hli], a dec d - jr nz, .drawHorizontalLineLoop + jr nz, .loop ret -LoadTrainerInfoTextBoxTiles: ; 5b9a (1:5b9a) +LoadTrainerInfoTextBoxTiles: ld de, TrainerInfoTextBoxTileGraphics ld hl, vChars2 + $760 lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10 - jp CopyVideoData
\ No newline at end of file + jp CopyVideoData diff --git a/engine/clear_save.asm b/engine/clear_save.asm index 37d098e6..f2acbf32 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -1,4 +1,4 @@ -DoClearSaveDialogue: ; DoClearSaveDialogue: ; 1c21e (7:421e) +DoClearSaveDialogue: call ClearScreen call RunDefaultPaletteCommand call LoadFontTilePatterns @@ -22,6 +22,6 @@ DoClearSaveDialogue: ; DoClearSaveDialogue: ; 1c21e (7:421e) callba ClearSAV jp Init -ClearSaveDataText: ; 1c25f (7:425f) +ClearSaveDataText: TX_FAR _ClearSaveDataText db "@" diff --git a/engine/debug1.asm b/engine/debug1.asm index ada4b513..a39e8cac 100644 --- a/engine/debug1.asm +++ b/engine/debug1.asm @@ -1,5 +1,5 @@ ; not IshiharaTeam -SetDebugTeam: ; 623e (1:623e) +SetDebugTeam: ld de, DebugTeam .loop ld a, [de] @@ -13,12 +13,12 @@ SetDebugTeam: ; 623e (1:623e) call AddPartyMon jr .loop -DebugTeam: ; 6253 (1:6253) +DebugTeam: db SNORLAX,80 db PERSIAN,80 db JIGGLYPUFF,15 db PIKACHU,5 db $FF -EmptyFunc: ; 64ea (1:64ea) - ret
\ No newline at end of file +EmptyFunc: + ret diff --git a/engine/diploma_3a.asm b/engine/diploma_3a.asm index f85cc288..3b633a1b 100755 --- a/engine/diploma_3a.asm +++ b/engine/diploma_3a.asm @@ -1,4 +1,4 @@ -_DisplayDiploma: ; e9a08 (3a:5a08) +_DisplayDiploma: call GBPalWhiteOutWithDelay3 call ClearScreen ld de, SurfingPikachu3Graphics diff --git a/engine/display_pokedex.asm b/engine/display_pokedex.asm index a252f684..96a2dd6c 100644 --- a/engine/display_pokedex.asm +++ b/engine/display_pokedex.asm @@ -1,4 +1,4 @@ -_DisplayPokedex: ; 7abf (1:7abf) +_DisplayPokedex: ld hl, wd730 set 6, [hl] predef ShowPokedexData @@ -16,4 +16,4 @@ _DisplayPokedex: ; 7abf (1:7abf) predef FlagActionPredef ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret
\ No newline at end of file + ret diff --git a/engine/draw_badges.asm b/engine/draw_badges.asm index 3134ae0a..412197b2 100644 --- a/engine/draw_badges.asm +++ b/engine/draw_badges.asm @@ -1,4 +1,4 @@ -DrawBadges: ; e880 (3:6880) +DrawBadges: ; Draw 4x2 gym leader faces, with the faces replaced by ; badges if they are owned. Used in the player status screen. @@ -116,5 +116,5 @@ DrawBadges: ; e880 (3:6880) .FaceBadgeTiles db $20, $28, $30, $38, $40, $48, $50, $58 -GymLeaderFaceAndBadgeTileGraphics: ; e91b (3:691b) - INCBIN "gfx/badges.2bpp"
\ No newline at end of file +GymLeaderFaceAndBadgeTileGraphics: + INCBIN "gfx/badges.2bpp" diff --git a/engine/evolution.asm b/engine/evolution.asm index 780d78e7..9cefff27 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -1,4 +1,4 @@ -EvolveMon: ; 5da70 (17:5a70) +EvolveMon: push hl push de push bc @@ -89,16 +89,16 @@ EvolveMon: ; 5da70 (17:5a70) ld a, [wEvoOldSpecies] jr .done -EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) +EvolutionSetWholeScreenPalette: ld b, SET_PAL_POKEMON_WHOLE_SCREEN jp RunPaletteCommand -Evolution_LoadPic: ; 7beb9 (1e:7eb9) +Evolution_LoadPic: call GetMonHeader coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex -Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) +Evolution_BackAndForthAnim: ; show the mon change back and forth between the new and old species b times ld a, $31 ld [wEvoMonTileOffset], a @@ -110,7 +110,7 @@ Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) jr nz, Evolution_BackAndForthAnim ret -Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) +Evolution_ChangeMonPic: push bc xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -135,7 +135,7 @@ Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) pop bc ret -Evolution_CheckForCancel: ; 7befa (1e:7efa) +Evolution_CheckForCancel: call DelayFrame push bc call JoypadLowSensitivity diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 289c76ed..8ec2c4c7 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -1,5 +1,5 @@ ; try to evolve the mon in [wWhichPokemon] -TryEvolvingMon: ; 3adb8 (e:6db8) +TryEvolvingMon: EvolveTradeMon: ld hl, wCanEvolveFlags xor a @@ -11,7 +11,7 @@ EvolveTradeMon: ; this is only called after battle ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur -EvolutionAfterBattle: ; 3adc6 (e:6dc6) +EvolutionAfterBattle: ld a, [hTilesetType] push af xor a @@ -24,8 +24,7 @@ EvolutionAfterBattle: ; 3adc6 (e:6dc6) ld hl, wPartyCount push hl -Evolution_PartyMonLoop: ; 3add8 (e:6dd8) -; loop over party mons +Evolution_PartyMonLoop: ; loop over party mons ld hl, wWhichPokemon inc [hl] pop hl @@ -263,7 +262,7 @@ Evolution_PartyMonLoop: ; 3add8 (e:6dd8) call nz, PlayDefaultMusic ret -RenameEvolvedMon: ; 3afa8 (e:6fa8) +RenameEvolvedMon: ; Renames the mon to its new, evolved form's standard name unless it had a ; nickname, in which case the nickname is kept. ld a, [wd0b5] @@ -293,7 +292,7 @@ RenameEvolvedMon: ; 3afa8 (e:6fa8) pop de jp CopyData -CancelledEvolution: ; 3afdf (e:6fdf) +CancelledEvolution: ld hl, StoppedEvolvingText call PrintText call ClearScreen @@ -301,29 +300,29 @@ CancelledEvolution: ; 3afdf (e:6fdf) call Evolution_ReloadTilesetTilePatterns jp Evolution_PartyMonLoop -EvolvedText: ; 3afef (e:6fef) +EvolvedText: TX_FAR _EvolvedText db "@" -IntoText: ; 3aff4 (e:6ff4) +IntoText: TX_FAR _IntoText db "@" -StoppedEvolvingText: ; 3aff9 (e:6ff9) +StoppedEvolvingText: TX_FAR _StoppedEvolvingText db "@" -IsEvolvingText: ; 3affe (e:6ffes) +IsEvolvingText: TX_FAR _IsEvolvingText db "@" -Evolution_ReloadTilesetTilePatterns: ; 3b003 (e:7003) +Evolution_ReloadTilesetTilePatterns: ld a, [wLinkState] cp LINK_STATE_TRADING ret z jp ReloadTilesetTilePatterns -LearnMoveFromLevelUp: ; 3b00c (e:700c) +LearnMoveFromLevelUp: ld a, [wd11e] ; species ld [wcf91], a call GetMonLearnset @@ -382,7 +381,7 @@ LearnMoveFromLevelUp: ; 3b00c (e:700c) ld [wd11e], a ret -Func_3b079: ; 3b079 (e:7079) +Func_3b079: ld a, [wcf91] push af call Func_3b0a2 @@ -410,7 +409,7 @@ Func_3b079: ; 3b079 (e:7079) scf ret -Func_3b0a2: ; 3b0a2 (e:70a2) +Func_3b0a2: ; XXX what is wcf91 entering this function? ld a, [wd11e] ld [wMoveNum], a @@ -453,7 +452,7 @@ Func_3b0a2: ; 3b0a2 (e:70a2) scf ret -Pointer_3b0ee: ; 3b0ee (e:70ee) +Pointer_3b0ee: db NIDOKING db IVYSAUR db EXEGGUTOR @@ -488,7 +487,7 @@ Pointer_3b0ee: ; 3b0ee (e:70ee) db VICTREEBEL db $ff -Func_3b10f: ; 3b10f (e:710f) +Func_3b10f: ld c, $0 .asm_3b111 ld hl, EvosMovesPointerTable @@ -530,7 +529,7 @@ Func_3b10f: ; 3b10f (e:710f) ; writes the moves a mon has at level [wCurEnemyLVL] to [de] ; move slots are being filled up sequentially and shifted if all slots are full -WriteMonMoves: ; 3113f (e:713f) +WriteMonMoves: call GetPredefRegisters push hl push de @@ -636,7 +635,7 @@ WriteMonMoves: ; 3113f (e:713f) ret ; shifts all move data one up (freeing 4th move slot) -WriteMonMoves_ShiftMoveData: ; 3b1c3 (e:71c3) +WriteMonMoves_ShiftMoveData: ld c, NUM_MOVES - 1 .loop inc de @@ -646,10 +645,10 @@ WriteMonMoves_ShiftMoveData: ; 3b1c3 (e:71c3) jr nz, .loop ret -Evolution_FlagAction: ; 3b1cc (e:71cc) +Evolution_FlagAction: predef_jump FlagActionPredef -GetMonLearnset: ; 3b1d1 (e:71d1) +GetMonLearnset: ld hl, EvosMovesPointerTable ld b, 0 ld a, [wcf91] diff --git a/engine/experience.asm b/engine/experience.asm index 42917bf7..2efc13de 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -1,5 +1,5 @@ ; calculates the level a mon should be based on its current exp -CalcLevelFromExperience: ; 58d99 (16:4d99) +CalcLevelFromExperience: ld a, [wLoadedMonSpecies] ld [wd0b5], a call GetMonHeader @@ -28,7 +28,7 @@ CalcLevelFromExperience: ; 58d99 (16:4d99) ret ; calculates the amount of experience needed for level d -CalcExperience: ; 58dc0 (16:4dc0) +CalcExperience: ld a, [wMonHGrowthRate] add a add a @@ -137,7 +137,7 @@ CalcExperience: ; 58dc0 (16:4dc0) ret ; calculates d*d -CalcDSquared: ; 58e66 (16:4e66) +CalcDSquared: xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a @@ -151,7 +151,7 @@ CalcDSquared: ; 58e66 (16:4e66) ; resulting in ; (a*n^3)/b + sign*c*n^2 + d*n - e ; where sign = -1 <=> S=1 -GrowthRateTable: ; 58e73 (16:4e73) +GrowthRateTable: db $11,$00,$00,$00 ; medium fast n^3 db $34,$0A,$00,$1E ; (unused?) 3/4 n^3 + 10 n^2 - 30 db $34,$14,$00,$46 ; (unused?) 3/4 n^3 + 20 n^2 - 70 diff --git a/engine/flag_action_predef.asm b/engine/flag_action_predef.asm index df38bb87..dc516887 100644 --- a/engine/flag_action_predef.asm +++ b/engine/flag_action_predef.asm @@ -1,7 +1,7 @@ -FlagActionPredef: ; f4ec (3:74ec) +FlagActionPredef: call GetPredefRegisters -FlagAction: ; f4ef (3:74ef) +FlagAction: ; Perform action b on bit c ; in the bitfield at hl. ; 0: reset @@ -70,4 +70,4 @@ FlagAction: ; f4ef (3:74ef) pop de pop hl ld c, a - ret
\ No newline at end of file + ret diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm index 2e9ab4fb..3c5b3a10 100755 --- a/engine/game_corner_slots.asm +++ b/engine/game_corner_slots.asm @@ -1,4 +1,4 @@ -StartSlotMachine: ; 37ed1 (d:7ed1) +StartSlotMachine: ld a, [wHiddenObjectFunctionArgument] cp $fd jr z, .printOutOfOrder @@ -41,14 +41,14 @@ StartSlotMachine: ; 37ed1 (d:7ed1) call PrintPredefTextID ret -GameCornerOutOfOrderText: ; 37f1d (d:7f1d) +GameCornerOutOfOrderText: TX_FAR _GameCornerOutOfOrderText db "@" -GameCornerOutToLunchText: ; 37f22 (d:7f22) +GameCornerOutToLunchText: TX_FAR _GameCornerOutToLunchText db "@" -GameCornerSomeonesKeysText: ; 37f27 (d:7f27) +GameCornerSomeonesKeysText: TX_FAR _GameCornerSomeonesKeysText db "@" diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 3f7c3f71..6bbaf72d 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -1,4 +1,4 @@ -AbleToPlaySlotsCheck: ; 2fdfd (b:7dfd) +AbleToPlaySlotsCheck: ld a, [wSpriteStateData1 + 2] and $8 jr z, .done ; not able @@ -22,10 +22,10 @@ AbleToPlaySlotsCheck: ; 2fdfd (b:7dfd) ld [wCanPlaySlots], a ret -GameCornerCoinCaseText: ; 2fe26 (b:7e26) +GameCornerCoinCaseText: TX_FAR _GameCornerCoinCaseText db "@" -GameCornerNoCoinsText: ; 2fe2b (b:7e2b) +GameCornerNoCoinsText: TX_FAR _GameCornerNoCoinsText db "@" diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index e2db39de..5472a56e 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -1,15 +1,15 @@ -LoadShootingStarGraphics: ; 70000 (1c:4000) +LoadShootingStarGraphics: ld a, $f9 ld [rOBP0], a ld a, $a4 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP0 call UpdateGBCPal_OBP1 - ld de, AnimationTileset2 + $30 ; $4757 ; star tile (top left quadrant) + ld de, AnimationTileset2 + $30 ; star tile (top left quadrant) ld hl, vChars1 + $200 lb bc, BANK(AnimationTileset2), $01 call CopyVideoData - ld de, AnimationTileset2 + $130 ; $481e ; star tile (bottom left quadrant) + ld de, AnimationTileset2 + $130 ; star tile (bottom left quadrant) ld hl, vChars1 + $210 lb bc, BANK(AnimationTileset2), $01 call CopyVideoData @@ -26,9 +26,9 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData jp CopyData -AnimateShootingStar: ; 7004a (1c:404a) +AnimateShootingStar: call LoadShootingStarGraphics - ld a, $c2 ; (SFX_1f_67 - SFX_Headers_1f) / 3 + ld a, SFX_SHOOTING_STAR call PlaySound ; Move the big star down and left across the screen. @@ -39,7 +39,7 @@ AnimateShootingStar: ; 7004a (1c:404a) push bc .bigStarInnerLoop ld a, [hl] ; Y - add 4 ; y + add 4 ld [hli], a ld a, [hl] ; X add -4 @@ -60,11 +60,11 @@ AnimateShootingStar: ; 7004a (1c:404a) .next cp b jr nz, .bigStarLoop + +; Clear big star OAM. ld hl, wOAMBuffer ld c, 4 ld de, 4 - -; Clear big star OAM. .clearOAMLoop ld [hl], 160 add hl, de @@ -74,7 +74,7 @@ AnimateShootingStar: ; 7004a (1c:404a) ; Make Gamefreak logo flash. ld b, 3 .flashLogoLoop - ld hl, rOBP0 ; $ff48 + ld hl, rOBP0 rrc [hl] rrc [hl] call UpdateGBCPal_OBP0 @@ -83,13 +83,14 @@ AnimateShootingStar: ; 7004a (1c:404a) ret c dec b jr nz, .flashLogoLoop + ; Copy 24 instances of the small stars OAM data. ; Note that their coordinates put them off-screen. ld de, wOAMBuffer ld a, 24 .initSmallStarsOAMLoop push af - ld hl, SmallStarsOAM ; $40ee + ld hl, SmallStarsOAM ld bc, SmallStarsOAMEnd - SmallStarsOAM call CopyData pop af @@ -98,8 +99,8 @@ AnimateShootingStar: ; 7004a (1c:404a) ; Animate the small stars falling from the Gamefreak logo. xor a - ld [wMoveDownSmallStarsOAMCount], a ; wWhichTrade - ld hl, SmallStarsWaveCoordsPointerTable ; 1c:4105 + ld [wMoveDownSmallStarsOAMCount], a + ld hl, SmallStarsWaveCoordsPointerTable ld c, 6 .smallStarsLoop ld a, [hli] @@ -156,11 +157,11 @@ AnimateShootingStar: ; 7004a (1c:404a) and a ret -SmallStarsOAM: ; 70101 (1c:4101) +SmallStarsOAM: db $00,$00,$A2,$90 SmallStarsOAMEnd: -SmallStarsWaveCoordsPointerTable: ; 70105 (1c:4105) +SmallStarsWaveCoordsPointerTable: dw SmallStarsWave1Coords dw SmallStarsWave2Coords dw SmallStarsWave3Coords @@ -171,7 +172,7 @@ SmallStarsWaveCoordsPointerTable: ; 70105 (1c:4105) ; The stars that fall from the Gamefreak logo come in 4 waves of 4 OAM entries. ; These arrays contain the Y and X coordinates of each OAM entry. -SmallStarsWave1Coords: ; 70111 (1c:4111) +SmallStarsWave1Coords: db $68,$30 db $05,$68 db $40,$05 @@ -179,7 +180,7 @@ SmallStarsWave1Coords: ; 70111 (1c:4111) db $04,$68 db $78,$07 -SmallStarsWave2Coords: ; 7011d (1c:411d) +SmallStarsWave2Coords: db $68,$38 db $05,$68 db $48,$06 @@ -187,7 +188,7 @@ SmallStarsWave2Coords: ; 7011d (1c:411d) db $04,$68 db $70,$07 -SmallStarsWave3Coords: ; 70129 (1c:4129) +SmallStarsWave3Coords: db $68,$34 db $05,$68 db $4c,$06 @@ -195,7 +196,7 @@ SmallStarsWave3Coords: ; 70129 (1c:4129) db $06,$68 db $64,$07 -SmallStarsWave4Coords: ; 70135 (1c:4135) +SmallStarsWave4Coords: db $68,$3c db $05,$68 db $5c,$04 @@ -203,10 +204,10 @@ SmallStarsWave4Coords: ; 70135 (1c:4135) db $07,$68 db $74,$07 -SmallStarsEmptyWave: ; 70141 (1c:4141) +SmallStarsEmptyWave: db $FF -MoveDownSmallStars: ; 70142 (1c:4142) +MoveDownSmallStars: ld b, 8 .loop ld hl, wOAMBuffer + $5c @@ -214,15 +215,15 @@ MoveDownSmallStars: ; 70142 (1c:4142) ld de, -4 ld c, a .innerLoop - inc [hl] + inc [hl] ; Y add hl, de dec c jr nz, .innerLoop ; Toggle the palette so that the lower star in the small stars tile blinks in ; and out. - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] xor %10100000 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP1 ld c, 3 call CheckForUserInterruption @@ -231,7 +232,7 @@ MoveDownSmallStars: ; 70142 (1c:4142) jr nz, .loop ret -GameFreakLogoOAMData: ; 70166 (1c:4166) +GameFreakLogoOAMData: db $48,$50,$8D,$00 db $48,$58,$8E,$00 db $50,$50,$8F,$00 @@ -250,13 +251,13 @@ GameFreakLogoOAMData: ; 70166 (1c:4166) db $60,$78,$86,$00 GameFreakLogoOAMDataEnd: -GameFreakShootingStarOAMData: ; 701a6 (1c:41a6) +GameFreakShootingStarOAMData: db $00,$A0,$A0,$14 db $00,$A8,$A0,$34 db $08,$A0,$A1,$14 db $08,$A8,$A1,$34 GameFreakShootingStarOAMDataEnd: -FallingStar: ; 701b6 (1c:41b6) +FallingStar: INCBIN "gfx/falling_star.2bpp" FallingStarEnd: diff --git a/engine/get_bag_item_quantity.asm b/engine/get_bag_item_quantity.asm index 2a462b5d..f10df1a0 100644 --- a/engine/get_bag_item_quantity.asm +++ b/engine/get_bag_item_quantity.asm @@ -1,4 +1,4 @@ -GetQuantityOfItemInBag: ; f735 (3:7735) +GetQuantityOfItemInBag: ; In: b = item ID ; Out: b = how many of that item are in the bag call GetPredefRegisters @@ -15,4 +15,4 @@ GetQuantityOfItemInBag: ; f735 (3:7735) ret .notInBag ld b, 0 - ret
\ No newline at end of file + ret diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 5b506be2..9cbb4039 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -1,4 +1,4 @@ -_GivePokemon: ; f66fa (3d:66fa) +_GivePokemon: ; returns success in carry ; and whether the mon was added to the party in [wAddedToParty] call EnableAutoTextBoxDrawing @@ -53,7 +53,7 @@ _GivePokemon: ; f66fa (3d:66fa) scf ret -SetPokedexOwnedFlag: ; f676c (3d:676c) +SetPokedexOwnedFlag: ld a, [wcf91] push af ld [wd11e], a @@ -70,18 +70,18 @@ SetPokedexOwnedFlag: ; f676c (3d:676c) ld hl, GotMonText jp PrintText -UnknownTerminator_f6794: ; f6794 (3d:6794) +UnknownTerminator_f6794: db "@" -GotMonText: ; f6795 (3d:6795) +GotMonText: TX_FAR _GotMonText db $0b db "@" -SetToBoxText: ; f679b (3d:679b) +SetToBoxText: TX_FAR _SetToBoxText db "@" -BoxIsFullText: ; f67a0 (3d:67a0) +BoxIsFullText: TX_FAR _BoxIsFullText db "@" diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index c8e6de3b..833313a6 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -1,4 +1,4 @@ -AnimateHallOfFame: ; 701c6 (1c:41c6) +AnimateHallOfFame: call HoFFadeOutScreenAndMusic call ClearScreen ld c, 100 @@ -33,8 +33,8 @@ AnimateHallOfFame: ; 701c6 (1c:41c6) .skipInc ld a, $90 ld [hWY], a - ld c, $1f ; BANK(Music_HallOfFame) - ld a, $ca ; MUSIC_HALL_OF_FAME + ld c, BANK(Music_HallOfFame) + ld a, MUSIC_HALL_OF_FAME call PlayMusic ld hl, wPartySpecies ld c, $ff @@ -58,7 +58,7 @@ AnimateHallOfFame: ; 701c6 (1c:41c6) ld c, 80 call DelayFrames coord hl, 2, 13 - lb bc, $3, $e + lb bc, 3, 14 call TextBoxBorder coord hl, 4, 15 ld de, HallOfFameText @@ -90,10 +90,10 @@ AnimateHallOfFame: ; 701c6 (1c:41c6) res 3, [hl] ret -HallOfFameText: ; 70295 (1c:4295) +HallOfFameText: db "HALL OF FAME@" -HoFShowMonOrPlayer: ; 702a2 (1c:42a2) +HoFShowMonOrPlayer: call ClearScreen ld a, $d0 ld [hSCY], a @@ -149,9 +149,9 @@ HoFShowMonOrPlayer: ; 702a2 (1c:42a2) jr nz, .ScrollPic ret -HoFDisplayAndRecordMonInfo: ; 7030e (1c:430e) +HoFDisplayAndRecordMonInfo: ld a, [wHoFPartyMonIndex] - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks call GetPartyMonName call HoFDisplayMonInfo ld a, [wHoFPartyMonIndex] @@ -167,12 +167,12 @@ HoFDisplayAndRecordMonInfo: ; 7030e (1c:430e) .asm_7033c jp HoFRecordMonInfo -Func_7033f: ; 7033f (1c:433f) +Func_7033f: call HoFDisplayMonInfo ld a,[wHoFMonSpecies] jp PlayCry -HoFDisplayMonInfo: ; 70348 (1c:4348) +HoFDisplayMonInfo: coord hl, 0, 2 lb bc, 9, 10 call TextBoxBorder @@ -191,13 +191,13 @@ HoFDisplayMonInfo: ; 70348 (1c:4348) predef PrintMonType ret -HoFMonInfoText: ; 7037b (1c:437b) +HoFMonInfoText: db "LEVEL/" next "TYPE1/" next "TYPE2/@" -HoFLoadPlayerPics: ; 70390 (1c:433e) - ld de, RedPicFront ; $6ede +HoFLoadPlayerPics: + ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE ld a,$0 @@ -217,12 +217,13 @@ HoFLoadPlayerPics: ; 70390 (1c:433e) call InterlaceMergeSpriteBuffers ld c, $1 -HoFLoadMonPlayerPicTileIDs: ; 703c7 (1c:43c7) - ld b, $0 +HoFLoadMonPlayerPicTileIDs: +; c = base tile ID + ld b, 0 coord hl, 12, 5 predef_jump CopyTileIDsFromList -HoFDisplayPlayerStats: ; 703d1 (1c:43d1) +HoFDisplayPlayerStats: SetEvent EVENT_HALL_OF_FAME_DEX_RATING predef DisplayDexRating coord hl, 0, 4 @@ -259,26 +260,26 @@ HoFDisplayPlayerStats: ; 703d1 (1c:43d1) call HoFPrintTextAndDelay ld hl, wDexRatingText -HoFPrintTextAndDelay: ; 7043a (1c:443a) +HoFPrintTextAndDelay: call PrintText ld c, 120 jp DelayFrames -HoFPlayTimeText: ; 70442 (1c:4442) +HoFPlayTimeText: db "PLAY TIME@" -HoFMoneyText: ; 7044c (1c:444c) +HoFMoneyText: db "MONEY@" -DexSeenOwnedText: ; 70452 (1c:4452) +DexSeenOwnedText: TX_FAR _DexSeenOwnedText db "@" -DexRatingText: ; 70457 (1c:4457) +DexRatingText: TX_FAR _DexRatingText db "@" -HoFRecordMonInfo: ; 7045c (1c:445c) +HoFRecordMonInfo: ld hl, wHallOfFame ld bc, HOF_MON ld a, [wHoFPartyMonIndex] @@ -293,7 +294,7 @@ HoFRecordMonInfo: ; 7045c (1c:445c) ld bc, NAME_LENGTH jp CopyData -HoFFadeOutScreenAndMusic: ; 7047b (1c:447b) +HoFFadeOutScreenAndMusic: ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a diff --git a/engine/heal_party.asm b/engine/heal_party.asm index 4ef200a9..7aaa1bd1 100644 --- a/engine/heal_party.asm +++ b/engine/heal_party.asm @@ -1,4 +1,4 @@ -HealParty: ; f52b (3:752b) +HealParty: ; Restore HP and PP. ld hl, wPartySpecies @@ -96,4 +96,4 @@ HealParty: ; f52b (3:752b) inc [hl] dec b jr nz, .ppup - ret
\ No newline at end of file + ret diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index e69e802c..2781e182 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -1,16 +1,16 @@ -PrintNotebookText: ; 528f6 (14:68f6) +PrintNotebookText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, [wHiddenObjectFunctionArgument] jp PrintPredefTextID -TMNotebook: ; 52904 (14:6904) +TMNotebook: TX_FAR TMNotebookText db $0d db "@" -ViridianSchoolNotebook: ; 5290a (14:690a) +ViridianSchoolNotebook: TX_ASM ld hl, ViridianSchoolNotebookText1 call PrintText @@ -31,7 +31,7 @@ ViridianSchoolNotebook: ; 5290a (14:690a) .doneReading jp TextScriptEnd -TurnPageSchoolNotebook: ; 529db (14:69db) +TurnPageSchoolNotebook: ld hl, TurnPageText call PrintText call YesNoChoice @@ -39,62 +39,62 @@ TurnPageSchoolNotebook: ; 529db (14:69db) and a ret -TurnPageText: ; 52949 (14:6949) +TurnPageText: TX_FAR _TurnPageText db "@" -ViridianSchoolNotebookText5: ; 5294e (14:694e) +ViridianSchoolNotebookText5: TX_FAR _ViridianSchoolNotebookText5 db $0d db "@" -ViridianSchoolNotebookText1: ; 52954 (14:6954) +ViridianSchoolNotebookText1: TX_FAR _ViridianSchoolNotebookText1 db "@" -ViridianSchoolNotebookText2: ; 52959 (14:6959) +ViridianSchoolNotebookText2: TX_FAR _ViridianSchoolNotebookText2 db "@" -ViridianSchoolNotebookText3: ; 5295e (14:695e) +ViridianSchoolNotebookText3: TX_FAR _ViridianSchoolNotebookText3 db "@" -ViridianSchoolNotebookText4: ; 52963 (14:6963) +ViridianSchoolNotebookText4: TX_FAR _ViridianSchoolNotebookText4 db "@" -PrintFightingDojoText2: ; 52968 (14:6968) +PrintFightingDojoText2: call EnableAutoTextBoxDrawing tx_pre_jump EnemiesOnEverySideText -EnemiesOnEverySideText: ; 52970 (14:6970) +EnemiesOnEverySideText: TX_FAR _EnemiesOnEverySideText db "@" -PrintFightingDojoText3: ; 52975 (14:6975) +PrintFightingDojoText3: call EnableAutoTextBoxDrawing tx_pre_jump WhatGoesAroundComesAroundText -WhatGoesAroundComesAroundText: ; 5297d (14:697d) +WhatGoesAroundComesAroundText: TX_FAR _WhatGoesAroundComesAroundText db "@" -PrintFightingDojoText: ; 52982 (14:6982) +PrintFightingDojoText: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText -FightingDojoText: ; 5298a (14:698a) +FightingDojoText: TX_FAR _FightingDojoText db "@" -PrintIndigoPlateauHQText: ; 5298f (14:698f) +PrintIndigoPlateauHQText: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump IndigoPlateauHQText -IndigoPlateauHQText: ; 5299d (14:699d) +IndigoPlateauHQText: TX_FAR _IndigoPlateauHQText db "@" diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 78950150..afbcadee 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,19 +1,19 @@ -PrintRedSNESText: ; 5dbae (17:5bae) +PrintRedSNESText: call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomSNESText -RedBedroomSNESText: ; 5db81 (17:5b81) +RedBedroomSNESText: TX_FAR _RedBedroomSNESText db "@" -OpenRedsPC: ; 5db86 (17:5b86) +OpenRedsPC: call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomPCText -RedBedroomPCText: ; 5db8e (17:5b8e) - db $fc ; FuncTX_ItemStoragePC +RedBedroomPCText: + TX_PLAYERS_PC -Route15GateLeftBinoculars: ; 5db8f (17:5b8f) +Route15GateLeftBinoculars: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -27,11 +27,11 @@ Route15GateLeftBinoculars: ; 5db8f (17:5b8f) ld [H_AUTOBGTRANSFERENABLED], a ret -Route15UpstairsBinocularsText: ; 5dba8 (17:5ba8) +Route15UpstairsBinocularsText: TX_FAR _Route15UpstairsBinocularsText db "@" -AerodactylFossil: ; 5dbad (17:5bad) +AerodactylFossil: ld a, FOSSIL_AERODACTYL ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -39,11 +39,11 @@ AerodactylFossil: ; 5dbad (17:5bad) tx_pre AerodactylFossilText ret -AerodactylFossilText: ; 5dbbe (17:5bbe) +AerodactylFossilText: TX_FAR _AerodactylFossilText db "@" -KabutopsFossil: ; 5bdc3 (17:5bc3) +KabutopsFossil: ld a, FOSSIL_KABUTOPS ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -51,11 +51,11 @@ KabutopsFossil: ; 5bdc3 (17:5bc3) tx_pre KabutopsFossilText ret -KabutopsFossilText: ; 5dbd4 (17:5bd4) +KabutopsFossilText: TX_FAR _KabutopsFossilText db "@" -FanClubPicture1: ; 5dbad (17:5c12) +FanClubPicture1: ld a, RAPIDASH ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -63,11 +63,11 @@ FanClubPicture1: ; 5dbad (17:5c12) tx_pre FanClubPicture1Text ret -FanClubPicture1Text: ; 5dbbe (17:5bbe) +FanClubPicture1Text: TX_FAR _FanClubPicture1Text db "@" -FanClubPicture2: ; 5dbad (17:5c28) +FanClubPicture2: ld a, FEAROW ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -75,11 +75,11 @@ FanClubPicture2: ; 5dbad (17:5c28) tx_pre FanClubPicture2Text ret -FanClubPicture2Text: ; 5dc39 (17:5c39) +FanClubPicture2Text: TX_FAR _FanClubPicture2Text db "@" -DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) +DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number ld a, 1 @@ -108,7 +108,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ld [hWY], a ret -PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) +PrintBlackboardLinkCableText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -116,28 +116,28 @@ PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) call PrintPredefTextID ret -LinkCableHelp: ; 5dc29 (17:5c29) +LinkCableHelp: TX_ASM call SaveScreenTilesToBuffer1 ld hl, LinkCableHelpText1 call PrintText xor a - ld [wMenuItemOffset], a + ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $3 + ld a, 3 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .linkHelpLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 - lb bc, $8, $d + lb bc, 8, 13 call TextBoxBorder coord hl, 2, 2 ld de, HowToLinkText @@ -148,13 +148,13 @@ LinkCableHelp: ; 5dc29 (17:5c29) bit 1, a ; pressed b jr nz, .exit ld a, [wCurrentMenuItem] - cp $3 ; pressed a on "STOP READING" + cp 3 ; pressed a on "STOP READING" jr z, .exit ld hl, wd730 res 6, [hl] ld hl, LinkCableInfoTexts add a - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hli] @@ -168,38 +168,38 @@ LinkCableHelp: ; 5dc29 (17:5c29) call LoadScreenTilesFromBuffer1 jp TextScriptEnd -LinkCableHelpText1: ; 5dc9e (17:5c9e) +LinkCableHelpText1: TX_FAR _LinkCableHelpText1 db "@" -LinkCableHelpText2: ; 5dca3 (17:5ca3) +LinkCableHelpText2: TX_FAR _LinkCableHelpText2 db "@" -HowToLinkText: ; 5dca8 (17:5ca8) +HowToLinkText: db "HOW TO LINK" next "COLOSSEUM" next "TRADE CENTER" next "STOP READING@" -LinkCableInfoTexts: ; 5dcd8 (17:5cd8) +LinkCableInfoTexts: dw LinkCableInfoText1 dw LinkCableInfoText2 dw LinkCableInfoText3 -LinkCableInfoText1: ; 5dcde (17:5cde) +LinkCableInfoText1: TX_FAR _LinkCableInfoText1 db "@" -LinkCableInfoText2: ; 5dce3 (17:5ce3) +LinkCableInfoText2: TX_FAR _LinkCableInfoText2 db "@" -LinkCableInfoText3: ; 5dce8 (17:5ce8) +LinkCableInfoText3: TX_FAR _LinkCableInfoText3 db "@" -ViridianSchoolBlackboard: ; 5dced (17:5ced) +ViridianSchoolBlackboard: TX_ASM call SaveScreenTilesToBuffer1 ld hl, ViridianSchoolBlackboardText1 @@ -210,11 +210,11 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld [wLastMenuItem], a ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .blackboardLoop ld hl, wd730 @@ -236,24 +236,24 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) bit 4, a ; pressed right jr z, .didNotPressRight ; move cursor to right column - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $6 + ld a, 6 ld [wTopMenuItemX], a - ld a, $3 ; in the the right column, use an offset to prevent overlap + ld a, 3 ; in the the right column, use an offset to prevent overlap ld [wMenuItemOffset], a jr .blackboardLoop .didNotPressRight bit 5, a ; pressed left jr z, .didNotPressLeftOrRight ; move cursor to left column - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a xor a ld [wMenuItemOffset], a @@ -261,9 +261,9 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) .didNotPressLeftOrRight ld a, [wCurrentMenuItem] ld b, a - ld a, [wAnimationID] + ld a, [wMenuItemOffset] add b - cp $5 ; cursor is pointing to "QUIT" + cp 5 ; cursor is pointing to "QUIT" jr z, .exitBlackboard ; we must have pressed a on a status condition ; so print the text @@ -271,7 +271,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) res 6, [hl] ld hl, ViridianBlackboardStatusPointers add a - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hli] @@ -285,60 +285,60 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) call LoadScreenTilesFromBuffer1 jp TextScriptEnd -ViridianSchoolBlackboardText1: ; 5dda2 (17:5da2) +ViridianSchoolBlackboardText1: TX_FAR _ViridianSchoolBlackboardText1 db "@" -ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7) +ViridianSchoolBlackboardText2: TX_FAR _ViridianSchoolBlackboardText2 db "@" -StatusAilmentText1: ; 5ddac (17:5dac) +StatusAilmentText1: db " SLP" next " PSN" next " PAR@" -StatusAilmentText2: ; 5ddbb (17:5dbb) +StatusAilmentText2: db " BRN" next " FRZ" next " QUIT@@" -ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc) +ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText dw ViridianBlackboardPoisonText dw ViridianBlackboardPrlzText dw ViridianBlackboardBurnText dw ViridianBlackboardFrozenText -ViridianBlackboardSleepText: ; 5ddd6 (17:5dd6) +ViridianBlackboardSleepText: TX_FAR _ViridianBlackboardSleepText db "@" -ViridianBlackboardPoisonText: ; 5dddb (17:5ddb) +ViridianBlackboardPoisonText: TX_FAR _ViridianBlackboardPoisonText db "@" -ViridianBlackboardPrlzText: ; 5dde0 (17:5de0) +ViridianBlackboardPrlzText: TX_FAR _ViridianBlackboardPrlzText db "@" -ViridianBlackboardBurnText: ; 5dde5 (17:5de5) +ViridianBlackboardBurnText: TX_FAR _ViridianBlackboardBurnText db "@" -ViridianBlackboardFrozenText: ; 5ddea (17:5dea) +ViridianBlackboardFrozenText: TX_FAR _ViridianBlackboardFrozenText db "@" -PrintTrashText: ; 5ddef (17:5def) +PrintTrashText: call EnableAutoTextBoxDrawing tx_pre_jump VermilionGymTrashText -VermilionGymTrashText: ; 5ddf7 (17:5df7) +VermilionGymTrashText: TX_FAR _VermilionGymTrashText db "@" -GymTrashScript: ; 5ddfc (17:5dfc) +GymTrashScript: call EnableAutoTextBoxDrawing ld a, [wHiddenObjectFunctionArgument] ld [wGymTrashCanIndex], a @@ -365,7 +365,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) .openFirstLock ; Next can is trying for the second switch. SetEvent EVENT_1ST_LOCK_OPENED - callab Func_f2d0c + callab Yellow_SampleSecondTrashCan tx_pre_id VermilionGymTrashSuccessText1 jr .done @@ -400,7 +400,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) .done jp PrintPredefTextID -GymTrashCans: ; 5de7d (17:5e7d) +GymTrashCans: ; byte 0: mask for random number ; bytes 1-4: indices of the trash cans that can have the second lock ; Note that the mask is simply the number of valid trash can indices that @@ -425,7 +425,7 @@ GymTrashCans: ; 5de7d (17:5e7d) db 2, 11, 13, -1, -1 ; 14 ; 5dec8 -VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) +VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 TX_ASM call WaitForSoundToFinish @@ -435,12 +435,12 @@ VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) jp TextScriptEnd ; unused -VermilionGymTrashSuccessText2: ; 5dedb (17:5edb) +VermilionGymTrashSuccessText2: TX_FAR _VermilionGymTrashSuccessText2 db "@" ; unused -VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) +VermilionGymTrashSuccesPlaySfx: TX_ASM call WaitForSoundToFinish ld a, SFX_SWITCH @@ -448,7 +448,7 @@ VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashSuccessText3: ; 5deef (17:5eef) +VermilionGymTrashSuccessText3: TX_FAR _VermilionGymTrashSuccessText3 TX_ASM call WaitForSoundToFinish @@ -457,7 +457,7 @@ VermilionGymTrashSuccessText3: ; 5deef (17:5eef) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashFailText: ; 5df02 (17:5f02) +VermilionGymTrashFailText: TX_FAR _VermilionGymTrashFailText TX_ASM call WaitForSoundToFinish diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index cdba142b..1bb31e00 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -1,4 +1,4 @@ -GymStatues: ; 625e8 (18:65e8) +GymStatues: ; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID ; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID ; else ret @@ -28,7 +28,7 @@ GymStatues: ; 625e8 (18:65e8) .haveBadge jp PrintPredefTextID -.BadgeFlags: ; 62442 (18:6442) +.BadgeFlags: db PEWTER_GYM, %00000001 db CERULEAN_GYM, %00000010 db VERMILION_GYM, %00000100 @@ -39,15 +39,15 @@ GymStatues: ; 625e8 (18:65e8) db VIRIDIAN_GYM, %10000000 db $ff -GymStatueText1: ; 62453 (18:6453) +GymStatueText1: TX_FAR _GymStatueText1 db "@" -GymStatueText2: ; 62458 (18:6458) +GymStatueText2: TX_FAR _GymStatueText2 db "@" -PrintBenchGuyText: ; 6245d (18:645d) +PrintBenchGuyText: call EnableAutoTextBoxDrawing ld hl, BenchGuyTextPointers ld a, [wCurMap] @@ -71,7 +71,7 @@ PrintBenchGuyText: ; 6245d (18:645d) jp PrintPredefTextID ; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable -BenchGuyTextPointers: ; 6247e (18:647e) +BenchGuyTextPointers: db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT db_tx_pre ViridianCityPokecenterBenchGuyText db PEWTER_POKECENTER, SPRITE_FACING_LEFT @@ -104,59 +104,59 @@ BenchGuyTextPointers: ; 6247e (18:647e) db_tx_pre UnusedBenchGuyText3 db $FF -ViridianCityPokecenterBenchGuyText: ; 624a3 (18:64a3) +ViridianCityPokecenterBenchGuyText: TX_FAR _ViridianCityPokecenterGuyText db "@" -PewterCityPokecenterBenchGuyText: ; 624a8 (18:64a8) +PewterCityPokecenterBenchGuyText: TX_FAR _PewterCityPokecenterGuyText db "@" -CeruleanCityPokecenterBenchGuyText: ; 624ad (18:64ad) +CeruleanCityPokecenterBenchGuyText: TX_FAR _CeruleanPokecenterGuyText db "@" -LavenderCityPokecenterBenchGuyText: ; 624b2 (18:64b2) +LavenderCityPokecenterBenchGuyText: TX_FAR _LavenderPokecenterGuyText db "@" -MtMoonPokecenterBenchGuyText: ; 624b7 (18:64b7) +MtMoonPokecenterBenchGuyText: TX_FAR _MtMoonPokecenterBenchGuyText db "@" -RockTunnelPokecenterBenchGuyText: ; 624bc (18:64bc) +RockTunnelPokecenterBenchGuyText: TX_FAR _RockTunnelPokecenterGuyText db "@" -UnusedBenchGuyText1: ; 624c1 (18:64c1) +UnusedBenchGuyText1: TX_FAR _UnusedBenchGuyText1 db "@" -UnusedBenchGuyText2: ; 624c6 (18:64c6) +UnusedBenchGuyText2: TX_FAR _UnusedBenchGuyText2 db "@" -UnusedBenchGuyText3: ; 624cb (18:64cb) +UnusedBenchGuyText3: TX_FAR _UnusedBenchGuyText3 db "@" -VermilionCityPokecenterBenchGuyText: ; 624d0 (18:64d0) +VermilionCityPokecenterBenchGuyText: TX_FAR _VermilionPokecenterGuyText db "@" -CeladonCityPokecenterBenchGuyText: ; 624d5 (18:64d5) +CeladonCityPokecenterBenchGuyText: TX_FAR _CeladonCityPokecenterGuyText db "@" -FuchsiaCityPokecenterBenchGuyText: ; 624da (18:64da) +FuchsiaCityPokecenterBenchGuyText: TX_FAR _FuchsiaCityPokecenterGuyText db "@" -CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df) +CinnabarIslandPokecenterBenchGuyText: TX_FAR _CinnabarPokecenterGuyText db "@" -SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) +SaffronCityPokecenterBenchGuyText: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SaffronCityPokecenterBenchGuyText2 @@ -166,32 +166,32 @@ SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) call PrintText jp TextScriptEnd -SaffronCityPokecenterBenchGuyText1: ; 624f8 (18:64f8) +SaffronCityPokecenterBenchGuyText1: TX_FAR _SaffronCityPokecenterGuyText1 db "@" -SaffronCityPokecenterBenchGuyText2: ; 624fd (18:64fd) +SaffronCityPokecenterBenchGuyText2: TX_FAR _SaffronCityPokecenterGuyText2 db "@" -CeladonCityHotelText: ; 62502 (18:6502) +CeladonCityHotelText: TX_FAR _CeladonCityHotelText db "@" ret -UnusedPredefText: ; 62508 (18:6508) +UnusedPredefText: db "@" -PrintBookcaseText: ; 626e1 (18:66e1) +PrintBookcaseText: call EnableAutoTextBoxDrawing tx_pre_jump BookcaseText -BookcaseText: ; 62511 (18:6511) +BookcaseText: TX_FAR _BookcaseText db "@" -OpenPokemonCenterPC: ; 62516 (18:6516) +OpenPokemonCenterPC: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ; check to see if player is facing up ret nz @@ -200,5 +200,5 @@ OpenPokemonCenterPC: ; 62516 (18:6516) ld [wAutoTextBoxDrawingControl], a tx_pre_jump PokemonCenterPCText -PokemonCenterPCText: ; 62529 (18:6529) - db $F9 ; FuncTX_PokemonCenterPC +PokemonCenterPCText: + TX_POKECENTER_PC diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index 78da8274..9456e76f 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -1,5 +1,5 @@ ; prints text for bookshelves in buildings without sign events -PrintBookshelfText: ; f9de (3:79de) +PrintBookshelfText: ld a, [wPlayerFacingDirection] ; player's sprite facing direction cp SPRITE_FACING_UP jr nz, .noMatch @@ -37,7 +37,7 @@ PrintBookshelfText: ; f9de (3:79de) jpba PrintCardKeyText ; format: db tileset id, bookshelf tile id, text id -BookshelfTileIDs: ; fa19 (3:7a19) +BookshelfTileIDs: db PLATEAU, $30 db_tx_pre IndigoPlateauStatues db HOUSE, $3D @@ -74,58 +74,58 @@ BookshelfTileIDs: ; fa19 (3:7a19) db_tx_pre BookOrSculptureText db $FF -IndigoPlateauStatues: ; fa4d (3:7a4d) +IndigoPlateauStatues: TX_ASM ld hl, IndigoPlateauStatuesText1 call PrintText ld a, [wXCoord] bit 0, a ld hl, IndigoPlateauStatuesText2 - jr nz, .asm_fa61 + jr nz, .ok ld hl, IndigoPlateauStatuesText3 -.asm_fa61 +.ok call PrintText jp TextScriptEnd -IndigoPlateauStatuesText1: ; fa67 (3:7a67) +IndigoPlateauStatuesText1: TX_FAR _IndigoPlateauStatuesText1 db "@" -IndigoPlateauStatuesText2: ; fa6c (3:7a6c) +IndigoPlateauStatuesText2: TX_FAR _IndigoPlateauStatuesText2 db "@" -IndigoPlateauStatuesText3: ; fa71 (3:7a71) +IndigoPlateauStatuesText3: TX_FAR _IndigoPlateauStatuesText3 db "@" -BookOrSculptureText: ; fa76 (3:7a76) +BookOrSculptureText: TX_ASM ld hl, PokemonBooksText ld a, [wCurMapTileset] cp MANSION ; Celadon Mansion tileset - jr nz, .asm_fa8b + jr nz, .ok aCoord 8, 6 cp $38 - jr nz, .asm_fa8b + jr nz, .ok ld hl, DiglettSculptureText -.asm_fa8b +.ok call PrintText jp TextScriptEnd -PokemonBooksText: ; fa91 (3:7a91) +PokemonBooksText: TX_FAR _PokemonBooksText db "@" -DiglettSculptureText: ; fa96 (3:7a96) +DiglettSculptureText: TX_FAR _DiglettSculptureText db "@" -ElevatorText: ; fa9b (3:7a9b) +ElevatorText: TX_FAR _ElevatorText db "@" -TownMapText: ; faa0 (3:7aa0) +TownMapText: TX_FAR _TownMapText db $06 TX_ASM @@ -148,6 +148,6 @@ TownMapText: ; faa0 (3:7aa0) push af jp CloseTextDisplay -PokemonStuffText: ; fad3 (3:7ad3) +PokemonStuffText: TX_FAR _PokemonStuffText db "@" diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 4867b447..a8676fed 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -1,20 +1,20 @@ -PrintNewBikeText: ; 1e2e4 (7:62e4) +PrintNewBikeText: call EnableAutoTextBoxDrawing tx_pre_jump NewBicycleText -NewBicycleText: ; 1e2ec (7:62ec) +NewBicycleText: TX_FAR _NewBicycleText db "@" -DisplayOakLabLeftPoster: ; 1e2f1 (7:62f1) +DisplayOakLabLeftPoster: call EnableAutoTextBoxDrawing tx_pre_jump PushStartText -PushStartText: ; 1e2f9 (7:62f9) +PushStartText: TX_FAR _PushStartText db "@" -DisplayOakLabRightPoster: ; 1e2fe (7:62fe) +DisplayOakLabRightPoster: call EnableAutoTextBoxDrawing ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -28,15 +28,15 @@ DisplayOakLabRightPoster: ; 1e2fe (7:62fe) .ownLessThanTwo jp PrintPredefTextID -SaveOptionText: ; 1e317 (7:6317) +SaveOptionText: TX_FAR _SaveOptionText db "@" -StrengthsAndWeaknessesText: ; 1e31c (7:631c) +StrengthsAndWeaknessesText: TX_FAR _StrengthsAndWeaknessesText db "@" -SafariZoneCheck: ; 1e321 (7:6321) +SafariZoneCheck: CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone, jr z, SafariZoneGameStillGoing ; don't bother printing game over text ld a, [wNumSafariBalls] @@ -44,7 +44,7 @@ SafariZoneCheck: ; 1e321 (7:6321) jr z, SafariZoneGameOver jr SafariZoneGameStillGoing -SafariZoneCheckSteps: ; 1e330 (7:6330) +SafariZoneCheckSteps: ld a, [wSafariSteps] ld b, a ld a, [wSafariSteps + 1] @@ -56,12 +56,12 @@ SafariZoneCheckSteps: ; 1e330 (7:6330) ld [wSafariSteps], a ld a, c ld [wSafariSteps + 1], a -SafariZoneGameStillGoing: ; 1e344 (7:6344) +SafariZoneGameStillGoing: xor a ld [wSafariZoneGameOver], a ret -SafariZoneGameOver: ; 1e349 (7:6349) +SafariZoneGameOver: call EnableAutoTextBoxDrawing xor a ld [wAudioFadeOutControl], a @@ -85,17 +85,17 @@ SafariZoneGameOver: ; 1e349 (7:6349) ld a, $5 ld [wSafariZoneEntranceCurScript], a SetEvent EVENT_SAFARI_GAME_OVER - ld a, $1 + ld a, 1 ld [wSafariZoneGameOver], a ret -PrintSafariGameOverText: ; 1e385 (7:6385) +PrintSafariGameOverText: xor a ld [wJoyIgnore], a ld hl, SafariGameOverText jp PrintText -SafariGameOverText: ; 1e38f (7:638f) +SafariGameOverText: TX_ASM ld a, [wNumSafariBalls] and a @@ -107,22 +107,22 @@ SafariGameOverText: ; 1e38f (7:638f) call PrintText jp TextScriptEnd -TimesUpText: ; 1e3a5 (7:63a5) +TimesUpText: TX_FAR _TimesUpText db "@" -GameOverText: ; 1e3aa (7:63aa) +GameOverText: TX_FAR _GameOverText db "@" -PrintCinnabarQuiz: ; 1e3af (7:63af) +PrintCinnabarQuiz: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump CinnabarGymQuiz -CinnabarGymQuiz: ; 1e3be (7:63be) +CinnabarGymQuiz: TX_ASM xor a ld [wOpponentAfterWrongAnswer], a @@ -138,7 +138,7 @@ CinnabarGymQuiz: ; 1e3be (7:63be) ld [$ffdc], a ld a, [hGymGateIndex] ld hl, CinnabarGymQuizIntroText - cp $1 + cp 1 jr z, .onFirstQuestion ld hl, CinnabarGymQuizShortIntroText .onFirstQuestion @@ -154,24 +154,24 @@ CinnabarGymQuiz: ; 1e3be (7:63be) ld h, [hl] ld l, a call PrintText - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a call CinnabarGymQuiz_1ea92 jp TextScriptEnd -CinnabarGymQuizDummyIntroText: ; 1e401 (7:6401) +CinnabarGymQuizDummyIntroText: TX_FAR _CinnabarGymQuizDummyIntroText db "@" -CinnabarGymQuizIntroText: ; 1e406 (7:6406) +CinnabarGymQuizIntroText: TX_FAR _CinnabarGymQuizIntroText db "@" -CinnabarGymQuizShortIntroText: ; 1e40b (7:640b) +CinnabarGymQuizShortIntroText: TX_FAR _CinnabarGymQuizShortIntroText db "@" -CinnabarQuizQuestions: ; 1e410 (7:6410) +CinnabarQuizQuestions: dw CinnabarQuizQuestionsText1 dw CinnabarQuizQuestionsText2 dw CinnabarQuizQuestionsText3 @@ -179,31 +179,31 @@ CinnabarQuizQuestions: ; 1e410 (7:6410) dw CinnabarQuizQuestionsText5 dw CinnabarQuizQuestionsText6 -CinnabarQuizQuestionsText1: ; 1e41c (7:641c) +CinnabarQuizQuestionsText1: TX_FAR _CinnabarQuizQuestionsText1 db "@" -CinnabarQuizQuestionsText2: ; 1e421 (7:6421) +CinnabarQuizQuestionsText2: TX_FAR _CinnabarQuizQuestionsText2 db "@" -CinnabarQuizQuestionsText3: ; 1e426 (7:6426) +CinnabarQuizQuestionsText3: TX_FAR _CinnabarQuizQuestionsText3 db "@" -CinnabarQuizQuestionsText4: ; 1e42b (7:642b) +CinnabarQuizQuestionsText4: TX_FAR _CinnabarQuizQuestionsText4 db "@" -CinnabarQuizQuestionsText5: ; 1e430 (7:6430) +CinnabarQuizQuestionsText5: TX_FAR _CinnabarQuizQuestionsText5 db "@" -CinnabarQuizQuestionsText6: ; 1e435 (7:6435) +CinnabarQuizQuestionsText6: TX_FAR _CinnabarQuizQuestionsText6 db "@" -CinnabarGymQuiz_1ea92: ; 1e43a (7:643a) +CinnabarGymQuiz_1ea92: call YesNoChoice ld a, [$ffdc] ld c, a @@ -246,7 +246,7 @@ CinnabarGymQuiz_1ea92: ; 1e43a (7:643a) set 7, [hl] ret -CinnabarGymQuizCorrectText: ; 1e490 (7:6490) +CinnabarGymQuizCorrectText: db $0b TX_FAR _CinnabarGymQuizCorrectText db $06 @@ -266,15 +266,15 @@ CinnabarGymQuizCorrectText: ; 1e490 (7:6490) call WaitForSoundToFinish jp TextScriptEnd -CinnabarGymQuizIncorrectText: ; 1e4b2 (7:64b2) +CinnabarGymQuizIncorrectText: TX_FAR _CinnabarGymQuizIncorrectText db "@" -CinnabarGymGateFlagAction: ; 1e4b7 (7:64b7) +CinnabarGymGateFlagAction: EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED predef_jump FlagActionPredef -UpdateCinnabarGymGateTileBlocks_: ; 1e4bf (7:64bf) +UpdateCinnabarGymGateTileBlocks_: ; Update the overworld map with open floor blocks or locked gate blocks ; depending on event flags. ld a, 6 @@ -318,7 +318,7 @@ UpdateCinnabarGymGateTileBlocks_: ; 1e4bf (7:64bf) callab RedrawMapView ret -CinnabarGymGateCoords: ; 1e503 (7:6503) +CinnabarGymGateCoords: ; format: x-coord, y-coord, direction, padding ; direction: $54 = horizontal gate, $5f = vertical gate db $09,$03,$54,$00 @@ -329,7 +329,7 @@ CinnabarGymGateCoords: ; 1e503 (7:6503) db $02,$03,$54,$00 -CinnabarGym_ReplaceTileBlock: ; 1e51b (7:651b) +CinnabarGym_ReplaceTileBlock: ; basically a copy of the first half of ReplaceTileBlock ; before checking if it is necessary to redraw the map view ld hl, wOverworldMap @@ -356,16 +356,16 @@ CinnabarGym_ReplaceTileBlock: ; 1e51b (7:651b) ld [hl], a ret -PrintMagazinesText: ; 1e53b (7:653b) +PrintMagazinesText: call EnableAutoTextBoxDrawing tx_pre MagazinesText ret -MagazinesText: ; 1e544 (7:6544) +MagazinesText: TX_FAR _MagazinesText db "@" -BillsHousePC: ; 1e549 (7:6549) +BillsHousePC: call EnableAutoTextBoxDrawing ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP @@ -411,11 +411,11 @@ BillsHousePC: ; 1e549 (7:6549) tx_pre BillsHousePokemonList ret -BillsHouseMonitorText: ; 1e5b8 (7:65b8) +BillsHouseMonitorText: TX_FAR _BillsHouseMonitorText db "@" -BillsHouseInitiatedText: ; 1e5bd (7:65b2) +BillsHouseInitiatedText: TX_FAR _BillsHouseInitiatedText db $06 TX_ASM @@ -429,22 +429,22 @@ BillsHouseInitiatedText: ; 1e5bd (7:65b2) call DelayFrames jp TextScriptEnd -BillsHousePokemonList: ; 1e5dc (7:65dc) +BillsHousePokemonList: TX_ASM call SaveScreenTilesToBuffer1 ld hl, BillsHousePokemonListText1 call PrintText xor a - ld [wMenuItemOffset], a + ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $4 + ld a, 4 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .billsPokemonLoop ld hl, wd730 @@ -482,22 +482,22 @@ BillsHousePokemonList: ; 1e5dc (7:65dc) call LoadScreenTilesFromBuffer2 jp TextScriptEnd -BillsHousePokemonListText1: ; 1e654 (7:6654) +BillsHousePokemonListText1: TX_FAR _BillsHousePokemonListText1 db "@" -BillsMonListText: ; 1e659 (7:6659) +BillsMonListText: db "EEVEE" next "FLAREON" next "JOLTEON" next "VAPOREON" next "CANCEL@" -BillsHousePokemonListText2: ; 1e67f (7:667f) +BillsHousePokemonListText2: TX_FAR _BillsHousePokemonListText2 db "@" -DisplayOakLabEmailText: ; 1e684 (7:6684) +DisplayOakLabEmailText: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -505,6 +505,6 @@ DisplayOakLabEmailText: ; 1e684 (7:6684) tx_pre OakLabEmailText ret -OakLabEmailText: ; 1e693 (7:6693) +OakLabEmailText: TX_FAR _OakLabEmailText db "@" diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 789f1bd7..566a7b61 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -1,9 +1,9 @@ -HPBarLength: ; f86c (3:786c) +HPBarLength: call GetPredefRegisters ; calculates bc * 48 / de, the number of pixels the HP bar has ; the result is always at least 1 -GetHPBarLength: ; f86f (3:786f) +GetHPBarLength: push hl xor a ld hl, H_MULTIPLICAND @@ -45,7 +45,7 @@ GetHPBarLength: ; f86f (3:786f) ret ; predef $48 -UpdateHPBar: ; f8ad (3:78ad) +UpdateHPBar: UpdateHPBar2: push hl ld hl, wHPBarOldHP @@ -87,6 +87,7 @@ UpdateHPBar2: call UpdateHPBar_CompareNewHPToOldHP jr z, .animateHPBarDone jr nc, .HPIncrease +; HP decrease dec bc ; subtract 1 HP ld a, c ld [wHPBarNewHP], a @@ -95,7 +96,7 @@ UpdateHPBar2: call UpdateHPBar_CalcOldNewHPBarPixels ld a, e sub d ; calc pixel difference - jr .asm_f90e + jr .ok .HPIncrease inc bc ; add 1 HP ld a, c @@ -105,7 +106,7 @@ UpdateHPBar2: call UpdateHPBar_CalcOldNewHPBarPixels ld a, d sub e ; calc pixel difference -.asm_f90e +.ok call UpdateHPBar_PrintHPNumber and a jr z, .noPixelDifference @@ -136,7 +137,7 @@ UpdateHPBar2: ; animates the HP bar going up or down for (a) ticks (two waiting frames each) ; stops prematurely if bar is filled up ; e: current health (in pixels) to start with -UpdateHPBar_AnimateHPBar: ; f941 (3:7941) +UpdateHPBar_AnimateHPBar: push hl .barAnimationLoop push af @@ -162,7 +163,7 @@ UpdateHPBar_AnimateHPBar: ; f941 (3:7941) ret ; compares old HP and new HP and sets c and z flags accordingly -UpdateHPBar_CompareNewHPToOldHP: ; f961 (3:7961) +UpdateHPBar_CompareNewHPToOldHP: ld a, d sub b ret nz @@ -171,7 +172,7 @@ UpdateHPBar_CompareNewHPToOldHP: ; f961 (3:7961) ret ; calcs HP difference between bc and de (into de) -UpdateHPBar_CalcHPDifference: ; f967 (3:7967) +UpdateHPBar_CalcHPDifference: ld a, d sub b jr c, .oldHPGreater @@ -200,7 +201,7 @@ UpdateHPBar_CalcHPDifference: ; f967 (3:7967) ld de, $0 ret -UpdateHPBar_PrintHPNumber: ; f985 (3:7985) +UpdateHPBar_PrintHPNumber: push af push de ld a, [wHPBarType] @@ -238,7 +239,7 @@ UpdateHPBar_PrintHPNumber: ; f985 (3:7985) ; calcs number of HP bar pixels for old and new HP value ; d: new pixels ; e: old pixels -UpdateHPBar_CalcOldNewHPBarPixels: ; f9be (3:79be) +UpdateHPBar_CalcOldNewHPBarPixels: push hl ld hl, wHPBarMaxHP ld a, [hli] ; max HP into de diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index ff739ef0..60719c7e 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -1,4 +1,4 @@ -DoInGameTradeDialogue: ; 71b86 (1c:5b86) +DoInGameTradeDialogue: ; trigger the trade offer/action specified by wWhichTrade call SaveScreenTilesToBuffer2 ld hl,TradeMons @@ -67,7 +67,7 @@ DoInGameTradeDialogue: ; 71b86 (1c:5b86) jp PrintText ; copies name of species a to hl -InGameTrade_GetMonName: ; 71c0c (1c:5c0c) +InGameTrade_GetMonName: push de ld [wd11e],a call GetMonName @@ -78,7 +78,7 @@ InGameTrade_GetMonName: ; 71c0c (1c:5c0c) INCLUDE "data/trades.asm" -InGameTrade_DoTrade: ; 71ca9 (1c:5ca9) +InGameTrade_DoTrade: xor a ; NORMAL_PARTY_MENU ld [wPartyMenuTypeOrMessageID],a dec a @@ -133,13 +133,13 @@ InGameTrade_DoTrade: ; 71ca9 (1c:5ca9) and a ld a,$3 jr .tradeSucceeded -.tradeFailed ; never jumped to +.tradeFailed scf .tradeSucceeded ld [wInGameTradeTextPointerTableIndex],a ret -InGameTrade_RestoreScreen: ; 71d36 (1c:5d36) +InGameTrade_RestoreScreen: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call ReloadTilesetTilePatterns @@ -150,7 +150,7 @@ InGameTrade_RestoreScreen: ; 71d36 (1c:5d36) call DelayFrames jpba LoadWildData -InGameTrade_PrepareTradeData: ; 71d55 (1c:5d55) +InGameTrade_PrepareTradeData: ld hl, wTradedPlayerMonSpecies ld a, [wInGameTradeGiveMonSpecies] ld [hli], a ; wTradedPlayerMonSpecies @@ -180,7 +180,7 @@ InGameTrade_PrepareTradeData: ; 71d55 (1c:5d55) ld de, wTradedEnemyMonOTID jp CopyData -InGameTrade_CopyData: ; 71da5 (1c:5da5) +InGameTrade_CopyData: push hl push bc call CopyData @@ -188,7 +188,7 @@ InGameTrade_CopyData: ; 71da5 (1c:5da5) pop hl ret -InGameTrade_CopyDataToReceivedMon: ; 71dad (1c:5dad) +InGameTrade_CopyDataToReceivedMon: ld hl, wPartyMonNicks ld bc, NAME_LENGTH call InGameTrade_GetReceivedMonPointer @@ -210,7 +210,7 @@ InGameTrade_CopyDataToReceivedMon: ; 71dad (1c:5dad) ; the received mon's index is (partyCount - 1), ; so this adds bc to hl (partyCount - 1) times and moves the result to de -InGameTrade_GetReceivedMonPointer: ; 71de3 (1c:5de3) +InGameTrade_GetReceivedMonPointer: ld a, [wPartyCount] dec a call AddNTimes @@ -218,13 +218,13 @@ InGameTrade_GetReceivedMonPointer: ; 71de3 (1c:5de3) ld d, h ret -InGameTrade_FlagActionPredef: ; 71ded (1c:5ded) +InGameTrade_FlagActionPredef: ld hl,wCompletedInGameTradeFlags ld a,[wWhichTrade] ld c,a predef_jump FlagActionPredef -InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) +InGameTrade_CheckForTradeEvo: ld a,[wInGameTradeReceiveMonSpecies] cp KADABRA jr z,.tradeEvo @@ -249,100 +249,100 @@ InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) ld [wLinkState],a jp PlayDefaultMusic -InGameTrade_TrainerString: ; 71e2d (1c:5e2d) +InGameTrade_TrainerString: ; "TRAINER@@@@@@@@@@" db $5d, "@@@@@@@@@@" -InGameTradeTextPointers: ; 71e38 (1c:5e38) +InGameTradeTextPointers: dw TradeTextPointers1 dw TradeTextPointers2 dw TradeTextPointers3 -TradeTextPointers1: ; 71e3e (1c:5e3e) +TradeTextPointers1: dw WannaTrade1Text dw NoTrade1Text dw WrongMon1Text dw Thanks1Text dw AfterTrade1Text -TradeTextPointers2: ; 71e48 (1c:5e48) +TradeTextPointers2: dw WannaTrade2Text dw NoTrade2Text dw WrongMon2Text dw Thanks2Text dw AfterTrade2Text -TradeTextPointers3: ; 71e52 (1c:5e52) +TradeTextPointers3: dw WannaTrade3Text dw NoTrade3Text dw WrongMon3Text dw Thanks3Text dw AfterTrade3Text -ConnectCableText: ; 71e5c (1c:5e5c) +ConnectCableText: TX_FAR _ConnectCableText db "@" -TradedForText: ; 71e61 (1c:5e61) +TradedForText: TX_FAR _TradedForText db $11, $a, "@" -WannaTrade1Text: ; 71e66 (1c:5e66) +WannaTrade1Text: TX_FAR _WannaTrade1Text db "@" -NoTrade1Text: ; 71e6b (1c:5e6b) +NoTrade1Text: TX_FAR _NoTrade1Text db "@" -WrongMon1Text: ; 71e70 (1c:5e70) +WrongMon1Text: TX_FAR _WrongMon1Text db "@" -Thanks1Text: ; 71e75 (1c:5e75) +Thanks1Text: TX_FAR _Thanks1Text db "@" -AfterTrade1Text: ; 71e7a (1c:5e7a) +AfterTrade1Text: TX_FAR _AfterTrade1Text db "@" -WannaTrade2Text: ; 71e7f (1c:5e7f) +WannaTrade2Text: TX_FAR _WannaTrade2Text db "@" -NoTrade2Text: ; 71e84 (1c:5e84) +NoTrade2Text: TX_FAR _NoTrade2Text db "@" -WrongMon2Text: ; 71e89 (1c:5e89) +WrongMon2Text: TX_FAR _WrongMon2Text db "@" -Thanks2Text: ; 71e8e (1c:5e8e) +Thanks2Text: TX_FAR _Thanks2Text db "@" -AfterTrade2Text: ; 71e93 (1c:5e93) +AfterTrade2Text: TX_FAR _AfterTrade2Text db "@" -WannaTrade3Text: ; 71e98 (1c:5e98) +WannaTrade3Text: TX_FAR _WannaTrade3Text db "@" -NoTrade3Text: ; 71e9d (1c:5d9d) +NoTrade3Text: TX_FAR _NoTrade3Text db "@" -WrongMon3Text: ; 71ea2 (1c:5ea2) +WrongMon3Text: TX_FAR _WrongMon3Text db "@" -Thanks3Text: ; 71ea7 (1c:5ea7) +Thanks3Text: TX_FAR _Thanks3Text db "@" -AfterTrade3Text: ; 71eac (1c:5eac) +AfterTrade3Text: TX_FAR _AfterTrade3Text db "@" diff --git a/engine/init_player_data.asm b/engine/init_player_data.asm index f240b5db..5883547c 100644 --- a/engine/init_player_data.asm +++ b/engine/init_player_data.asm @@ -1,4 +1,4 @@ -InitPlayerData: ; f6d6 (3:76d6) +InitPlayerData: InitPlayerData2: call Random @@ -52,9 +52,9 @@ START_MONEY EQU $3000 jp InitializeMissableObjectsFlags -InitializeEmptyList: ; f730 (3:7730) +InitializeEmptyList: xor a ; count ld [hli], a dec a ; terminator ld [hl], a - ret
\ No newline at end of file + ret diff --git a/engine/intro.asm b/engine/intro.asm index 27a357a7..37bd0151 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -2,13 +2,13 @@ MOVE_GENGAR_RIGHT EQU $00 MOVE_GENGAR_LEFT EQU $01 MOVE_NIDORINO_RIGHT EQU $ff -PlayIntro: ; 41997 (10:5997) +PlayIntro: xor a ld [hJoyHeld], a inc a ld [H_AUTOBGTRANSFERENABLED], a call PlayShootingStar - callab PlayIntroScene ; 3e:582d + callab PlayIntroScene xor a ld [hSCX], a ld [H_AUTOBGTRANSFERENABLED], a @@ -16,7 +16,7 @@ PlayIntro: ; 41997 (10:5997) call DelayFrame ret -InitIntroNidorinoOAM: ; 419b4 (10:59b4) +InitIntroNidorinoOAM: ld hl, wOAMBuffer ld d, 0 .loop @@ -45,17 +45,17 @@ InitIntroNidorinoOAM: ; 419b4 (10:59b4) jr nz, .loop ret -IntroClearScreen: ; 419dd (10:59dd) +IntroClearScreen: ld hl, vBGMap1 ld bc, $240 jr IntroClearCommon -IntroClearMiddleOfScreen: ; 419e5 (10:59e5) +IntroClearMiddleOfScreen: ; clear the area of the tile map between the black bars on the top and bottom coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 -IntroClearCommon: ; 419eb (10:59eb) +IntroClearCommon: ld [hl], $0 inc hl dec bc @@ -64,7 +64,7 @@ IntroClearCommon: ; 419eb (10:59eb) jr nz, IntroClearCommon ret -IntroPlaceBlackTiles: ; 419f4 (10:59f4) +IntroPlaceBlackTiles: ld a, $1 .loop ld [hli], a @@ -72,11 +72,11 @@ IntroPlaceBlackTiles: ; 419f4 (10:59f4) jr nz, .loop ret -CopyTileIDsFromList_ZeroBaseTileID: ; 419fb (10:59fb) +CopyTileIDsFromList_ZeroBaseTileID: ld c, 0 predef_jump CopyTileIDsFromList -PlayShootingStar: ; 41a02 (10:5a02) +PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles @@ -128,7 +128,7 @@ PlayShootingStar: ; 41a02 (10:5a02) call ClearSprites jp Delay3 -IntroDrawBlackBars: ; 41a82 (10:5a82) +IntroDrawBlackBars: ; clear the screen and draw black bars on the top and bottom call IntroClearScreen coord hl, 0, 0 @@ -144,11 +144,11 @@ IntroDrawBlackBars: ; 41a82 (10:5a82) ld c, $80 jp IntroPlaceBlackTiles -EmptyFunc4: ; 41aa5 (10:5aa5) +EmptyFunc4: ret -GameFreakIntro: ; 41959 (10:5aa6) +GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" INCBIN "gfx/gamefreak_logo.2bpp" ds $10 ; blank tile -GameFreakIntroEnd:
\ No newline at end of file +GameFreakIntroEnd: diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 7b479462..7c15d4bb 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -1,4 +1,4 @@ -HiddenItemNear: ; 7405c (1d:405c) +HiddenItemNear: ld hl, HiddenItemCoords ld b, 0 .loop @@ -43,7 +43,7 @@ HiddenItemNear: ; 7405c (1d:405c) scf ret -Sub5ClampTo0: ; 740a8 (1d:40a8) +Sub5ClampTo0: ; subtract 5 but clamp to 0 sub 5 cp $f0 diff --git a/engine/items/items.asm b/engine/items/items.asm index 1858c5f0..984cc381 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,4 +1,4 @@ -UseItem_: ; d2ed (3:52ed) +UseItem_: ld a, 1 ld [wActionResultOrTookBattleTurn], a ; initialise to success value ld a, [wcf91] ;contains item_ID @@ -15,7 +15,7 @@ UseItem_: ; d2ed (3:52ed) ld l, a jp [hl] -ItemUsePtrTable: ; d307 (3:5307) +ItemUsePtrTable: dw ItemUseBall ; MASTER_BALL dw ItemUseBall ; ULTRA_BALL dw ItemUseBall ; GREAT_BALL @@ -100,7 +100,7 @@ ItemUsePtrTable: ; d307 (3:5307) dw ItemUsePPRestore ; ELIXER dw ItemUsePPRestore ; MAX_ELIXER -ItemUseBall: ; d3ad (3:53ad) +ItemUseBall: ; Balls can't be used out of battle. ld a,[wIsInBattle] @@ -608,56 +608,56 @@ ItemUseBall: ; d3ad (3:53ad) .emptyString db "@" -ItemUseBallText00: ; d697 (3:5697) +ItemUseBallText00: ;"It dodged the thrown ball!" ;"This pokemon can't be caught" TX_FAR _ItemUseBallText00 db "@" -ItemUseBallText01: ; d69c (3:569c) +ItemUseBallText01: ;"You missed the pokemon!" TX_FAR _ItemUseBallText01 db "@" -ItemUseBallText02: ; d6a1 (3:56a1) +ItemUseBallText02: ;"Darn! The pokemon broke free!" TX_FAR _ItemUseBallText02 db "@" -ItemUseBallText03: ; d6a6 (3:56a6) +ItemUseBallText03: ;"Aww! It appeared to be caught!" TX_FAR _ItemUseBallText03 db "@" -ItemUseBallText04: ; d6ab (3:56ab) +ItemUseBallText04: ;"Shoot! It was so close too!" TX_FAR _ItemUseBallText04 db "@" -ItemUseBallText05: ; d6b0 (3:56b0) +ItemUseBallText05: ;"All right! {MonName} was caught!" ;play sound TX_FAR _ItemUseBallText05 db $12, $06 db "@" -ItemUseBallText07: ; d6b7 (3:59b7) +ItemUseBallText07: ;"X was transferred to Bill's PC" TX_FAR _ItemUseBallText07 db "@" -ItemUseBallText08: ; d6bc (3:56bc) +ItemUseBallText08: ;"X was transferred to someone's PC" TX_FAR _ItemUseBallText08 db "@" -ItemUseBallText06: ; d6c1 (3:56c1) +ItemUseBallText06: ;"New DEX data will be added..." ;play sound TX_FAR _ItemUseBallText06 db $13, $06 db "@" -ItemUseTownMap: ; d6c8 (3:56c8) +ItemUseTownMap: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime jpba DisplayTownMap -ItemUseBicycle: ; d6d7 (3:56d7) +ItemUseBicycle: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime @@ -695,7 +695,7 @@ ItemUseBicycle: ; d6d7 (3:56d7) ret ; used for Surf out-of-battle effect -ItemUseSurfboard: ; d725 (3:5725) +ItemUseSurfboard: ld a, [wWalkBikeSurfState] ld [wWalkBikeSurfStateCopy], a cp 2 ; is the player already surfing? @@ -774,18 +774,18 @@ ItemUseSurfboard: ; d725 (3:5725) ld [wSimulatedJoypadStatesIndex], a ret -SurfingGotOnText: ; d7c1 (3:57c1) +SurfingGotOnText: TX_FAR _SurfingGotOnText db "@" -SurfingNoPlaceToGetOffText: ; d7c6 (3:57c6) +SurfingNoPlaceToGetOffText: TX_FAR _SurfingNoPlaceToGetOffText db "@" -ItemUsePokedex: ; d7cb (3:57cb) +ItemUsePokedex: predef_jump ShowPokedexMenu -ItemUseEvoStone: ; d7d0 (3:57d0) +ItemUseEvoStone: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime @@ -844,7 +844,7 @@ ItemUseEvoStone: ; d7d0 (3:57d0) pop af ret -Func_d85d: ; d85d (3:585d) +Func_d85d: ld hl, EvosMovesPointerTable ld a, [wLoadedMon] dec a @@ -889,16 +889,16 @@ Func_d85d: ; d85d (3:585d) and a ret -RefusingText: ; d8a2 (3:58a2) +RefusingText: TX_FAR _RefusingText db "@" -ItemUseVitamin: ; d8a7 (3:58a7) +ItemUseVitamin: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime -ItemUseMedicine: ; d8ae (3:58ae) +ItemUseMedicine: ld a, [wPartyCount] and a jp z, Func_e4bf @@ -1554,22 +1554,22 @@ ItemUseMedicine: ; d8ae (3:58ae) ld [wWhichPokemon], a jp RemoveUsedItem -VitaminStatRoseText: ; dd44 (3:5d44) +VitaminStatRoseText: TX_FAR _VitaminStatRoseText db "@" -VitaminNoEffectText: ; dd49 (3:5d49) +VitaminNoEffectText: TX_FAR _VitaminNoEffectText db "@" -VitaminText: ; dd4e (3:5d4e) +VitaminText: db "HEALTH@" db "ATTACK@" db "DEFENSE@" db "SPEED@" db "SPECIAL@" -ItemUseBait: ; dd72 (3:5d72) +ItemUseBait: ld hl, ThrewBaitText call PrintText ld hl, wEnemyMonCatchRate ; catch rate @@ -1579,7 +1579,7 @@ ItemUseBait: ; dd72 (3:5d72) ld de, wSafariEscapeFactor ; escape factor jr BaitRockCommon -ItemUseRock: ; dd87 (3:5d87) +ItemUseRock: ld hl, ThrewRockText call PrintText ld hl, wEnemyMonCatchRate ; catch rate @@ -1593,7 +1593,7 @@ ItemUseRock: ; dd87 (3:5d87) ld hl, wSafariEscapeFactor ; escape factor ld de, wSafariBaitFactor ; bait factor -BaitRockCommon: ; dd9f (3:5d9f) +BaitRockCommon: ld [wAnimationID], a xor a ld [wAnimationType], a @@ -1616,16 +1616,16 @@ BaitRockCommon: ; dd9f (3:5d9f) ld c, 70 jp DelayFrames -ThrewBaitText: ; ddc6 (3:5dc6) +ThrewBaitText: TX_FAR _ThrewBaitText db "@" -ThrewRockText: ; ddca (3:5dca) +ThrewRockText: TX_FAR _ThrewRockText db "@" ; also used for Dig out-of-battle effect -ItemUseEscapeRope: ; ddcf (3:5dcf) +ItemUseEscapeRope: ld a, [wIsInBattle] and a jr nz, .notUsable @@ -1669,14 +1669,14 @@ ItemUseEscapeRope: ; ddcf (3:5dcf) .notUsable jp ItemUseNotTime -EscapeRopeTilesets: ; de28 (3:5e28) +EscapeRopeTilesets: db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR db $ff ; terminator -ItemUseRepel: ; de2e (3:5e2e) +ItemUseRepel: ld b, 100 -ItemUseRepelCommon: ; e005 (3:6005) +ItemUseRepelCommon: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime @@ -1685,7 +1685,7 @@ ItemUseRepelCommon: ; e005 (3:6005) jp PrintItemUseTextAndRemoveItem ; handles X Accuracy item -ItemUseXAccuracy: ; de3e (3:5e3e) +ItemUseXAccuracy: ld a, [wIsInBattle] and a jp z, ItemUseNotTime @@ -1696,7 +1696,7 @@ ItemUseXAccuracy: ; de3e (3:5e3e) ; This function is bugged and never works. It always jumps to ItemUseNotTime. ; The Card Key is handled in a different way. -ItemUseCardKey: ; de57 (3:de57) +ItemUseCardKey: xor a ld [wUnusedD71F], a call GetTileAndCoordsInFrontOfPlayer @@ -1760,7 +1760,7 @@ ItemUseCardKey: ; de57 (3:de57) ; 02: X ; 03: ID? -CardKeyTable1: ; dea7 (3:5ea7) +CardKeyTable1: db SILPH_CO_2F, $04, $04, $00 db SILPH_CO_2F, $04, $05, $01 db SILPH_CO_4F, $0C, $04, $02 @@ -1773,7 +1773,7 @@ CardKeyTable1: ; dea7 (3:5ea7) db SILPH_CO_10F, $08, $0B, $09 db $ff -CardKeyTable2: ; ded0 (3:5ed0) +CardKeyTable2: db SILPH_CO_3F, $08, $09, $0A db SILPH_CO_3F, $09, $09, $0B db SILPH_CO_5F, $04, $07, $0C @@ -1786,12 +1786,12 @@ CardKeyTable2: ; ded0 (3:5ed0) db SILPH_CO_9F, $09, $03, $13 db $ff -CardKeyTable3: ; def9 (3:5ef9) +CardKeyTable3: db SILPH_CO_11F, $08, $09, $14 db SILPH_CO_11F, $09, $09, $15 db $ff -ItemUsePokedoll: ; df02 (3:5f02) +ItemUsePokedoll: ld a, [wIsInBattle] dec a jp nz, ItemUseNotTime @@ -1799,7 +1799,7 @@ ItemUsePokedoll: ; df02 (3:5f02) ld [wEscapedFromBattle], a jp PrintItemUseTextAndRemoveItem -ItemUseGuardSpec: ; df11 (3:5f11) +ItemUseGuardSpec: ld a, [wIsInBattle] and a jp z, ItemUseNotTime @@ -1816,15 +1816,15 @@ ItemUseGuardSpec: ; df11 (3:5f11) set ProtectedByMist, [hl] ; Mist bit jp PrintItemUseTextAndRemoveItem -ItemUseSuperRepel: ; df38 (3:5f38) +ItemUseSuperRepel: ld b, 200 jp ItemUseRepelCommon -ItemUseMaxRepel: ; df3d (3:5f3d) +ItemUseMaxRepel: ld b, 250 jp ItemUseRepelCommon -ItemUseDireHit: ; df42 (3:5f42) +ItemUseDireHit: ld a, [wIsInBattle] and a jp z, ItemUseNotTime @@ -1841,7 +1841,7 @@ ItemUseDireHit: ; df42 (3:5f42) set GettingPumped, [hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem -ItemUseXStat: ; df69 (3:df69) +ItemUseXStat: ld a, [wIsInBattle] and a jr nz, .inBattle @@ -1884,7 +1884,7 @@ ItemUseXStat: ; df69 (3:df69) ld [hl], a ; restore [wPlayerMoveNum] ret -ItemUsePokeflute: ; dfbd (3:5fbd) +ItemUsePokeflute: ld a, [wIsInBattle] and a jr nz, .inBattle @@ -1928,8 +1928,8 @@ ItemUsePokeflute: ; dfbd (3:5fbd) ld hl, PlayedFluteHadEffectText call PrintText call ItemUseReloadOverworldData - ld e, $1a - callab Func_fd001 + ldpikaemotion e, PikachuEmotion26 + callab PlaySpecificPikachuEmotion ret .noSnorlaxOrPikachuToWakeUp @@ -1992,7 +1992,7 @@ ItemUsePokeflute: ; dfbd (3:5fbd) ; [wWereAnyMonsAsleep] should be initialized to 0 ; OUTPUT: ; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep -WakeUpEntireParty: ; e094 (3:6094) +WakeUpEntireParty: ld de, 44 ld c, 6 .loop @@ -2014,7 +2014,7 @@ WakeUpEntireParty: ; e094 (3:6094) ; Format: ; 00: Y ; 01: X -Route12SnorlaxFluteCoords: ; e0ac (3:60ac) +Route12SnorlaxFluteCoords: db 62, 9 ; one space West of Snorlax db 61, 10 ; one space North of Snorlax db 63, 10 ; one space South of Snorlax @@ -2024,20 +2024,20 @@ Route12SnorlaxFluteCoords: ; e0ac (3:60ac) ; Format: ; 00: Y ; 01: X -Route16SnorlaxFluteCoords: ; e0b5 (3:60b5) +Route16SnorlaxFluteCoords: db 10, 27 ; one space East of Snorlax db 10, 25 ; one space West of Snorlax db $ff ; terminator -PlayedFluteNoEffectText: ; e0ba (3:60ba) +PlayedFluteNoEffectText: TX_FAR _PlayedFluteNoEffectText db "@" -FluteWokeUpText: ; e0bf (3:60bf) +FluteWokeUpText: TX_FAR _FluteWokeUpText db "@" -PlayedFluteHadEffectText: ; e0c4 (3:60c4) +PlayedFluteHadEffectText: TX_FAR _PlayedFluteHadEffectText db $06 TX_ASM @@ -2057,25 +2057,25 @@ PlayedFluteHadEffectText: ; e0c4 (3:60c4) .done jp TextScriptEnd ; end text -ItemUseCoinCase: ; e0e7 (3:60e7) +ItemUseCoinCase: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime ld hl, CoinCaseNumCoinsText jp PrintText -CoinCaseNumCoinsText: ; e0f1 (3:60f1) +CoinCaseNumCoinsText: TX_FAR _CoinCaseNumCoinsText db "@" -ItemUseOldRod: ; e0f9 (3:60f9) +ItemUseOldRod: call FishingInit jp c, ItemUseNotTime lb bc, 5, MAGIKARP ld a, $1 ; set bite jr RodResponse -ItemUseGoodRod: ; e106 (3:6106) +ItemUseGoodRod: call FishingInit jp c, ItemUseNotTime .RandomLoop @@ -2103,7 +2103,7 @@ ItemUseGoodRod: ; e106 (3:6106) INCLUDE "data/good_rod.asm" -ItemUseSuperRod: ; e130 (3:6130) +ItemUseSuperRod: call FishingInit jp c, ItemUseNotTime callab ReadSuperRodData @@ -2123,7 +2123,7 @@ ItemUseSuperRod: ; e130 (3:6130) ld [wRodResponse], a jr DoNotGenerateFishingEncounter -RodResponse: ; e15b (3:615b) +RodResponse: ld [wRodResponse], a dec a ; is there a bite? @@ -2136,7 +2136,7 @@ RodResponse: ; e15b (3:615b) ld a, c ; species ld [wCurOpponent], a -DoNotGenerateFishingEncounter: ; e16e (3:616e) +DoNotGenerateFishingEncounter: ld hl, wWalkBikeSurfState ld a, [hl] ; store the value in a push af @@ -2150,7 +2150,7 @@ DoNotGenerateFishingEncounter: ; e16e (3:616e) ; checks if fishing is possible and if so, runs initialization code common to all rods ; unsets carry if fishing is possible, sets carry if not -FishingInit: ; e182 (3:6182) +FishingInit: ld a, [wIsInBattle] and a jr z, .notInBattle @@ -2181,10 +2181,10 @@ FishingInit: ; e182 (3:6182) scf ; can't fish when surfing ret -ItemUseOaksParcel: ; e1b7 (3:61b7) +ItemUseOaksParcel: jp ItemUseNotYoursToUse -ItemUseItemfinder: ; e1ba (3:61ba) +ItemUseItemfinder: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime @@ -2204,20 +2204,20 @@ ItemUseItemfinder: ; e1ba (3:61ba) .printText jp PrintText -ItemfinderFoundItemText: ; e1e6 (3:61e6) +ItemfinderFoundItemText: TX_FAR _ItemfinderFoundItemText db "@" -ItemfinderFoundNothingText: ; e1eb (3:61eb) +ItemfinderFoundNothingText: TX_FAR _ItemfinderFoundNothingText db "@" -ItemUsePPUp: ; e1f0 (3:61f0) +ItemUsePPUp: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime -ItemUsePPRestore: ; e1f7 (3:61f7) +ItemUsePPRestore: ld a, [wWhichPokemon] push af ld a, [wcf91] @@ -2417,31 +2417,31 @@ ItemUsePPRestore: ; e1f7 (3:61f7) ld [wActionResultOrTookBattleTurn], a ; item use failed ret -RaisePPWhichTechniqueText: ; e358 (3:6358) +RaisePPWhichTechniqueText: TX_FAR _RaisePPWhichTechniqueText db "@" -RestorePPWhichTechniqueText: ; e35d (3:635d) +RestorePPWhichTechniqueText: TX_FAR _RestorePPWhichTechniqueText db "@" -PPMaxedOutText: ; e362 (3:6362) +PPMaxedOutText: TX_FAR _PPMaxedOutText db "@" -PPIncreasedText: ; e367 (3:6367) +PPIncreasedText: TX_FAR _PPIncreasedText db "@" -PPRestoredText: ; e36c (3:636c) +PPRestoredText: TX_FAR _PPRestoredText db "@" ; for items that can't be used from the Item menu -UnusableItem: ; e371 (3:6371) +UnusableItem: jp ItemUseNotTime -ItemUseTMHM: ; e374 (3:6374) +ItemUseTMHM: ld a, [wIsInBattle] and a jp nz, ItemUseNotTime @@ -2564,54 +2564,54 @@ ItemUseTMHM: ; e374 (3:6374) ret c jp RemoveUsedItem -BootedUpTMText: ; e483 (3:6483) +BootedUpTMText: TX_FAR _BootedUpTMText db "@" -BootedUpHMText: ; e488 (3:6488) +BootedUpHMText: TX_FAR _BootedUpHMText db "@" -TeachMachineMoveText: ; e48d (3:648d) +TeachMachineMoveText: TX_FAR _TeachMachineMoveText db "@" -MonCannotLearnMachineMoveText: ; e492 (3:6492) +MonCannotLearnMachineMoveText: TX_FAR _MonCannotLearnMachineMoveText db "@" -PrintItemUseTextAndRemoveItem: ; e497 (3:6497) +PrintItemUseTextAndRemoveItem: ld hl, ItemUseText00 call PrintText ld a, SFX_HEAL_AILMENT call PlaySound call WaitForTextScrollButtonPress ; wait for button press -RemoveUsedItem: ; e4a5 (3:64a5) +RemoveUsedItem: ld hl, wNumBagItems ld a, 1 ; one item ld [wItemQuantity], a jp RemoveItemFromInventory -ItemUseNoEffect: ; e4b0 (3:64b0) +ItemUseNoEffect: ld hl, ItemUseNoEffectText jr ItemUseFailed -ItemUseNotTime: ; e4b5 (3:64b5) +ItemUseNotTime: ld hl, ItemUseNotTimeText jr ItemUseFailed -ItemUseNotYoursToUse: ; e4ba (3:64ba) +ItemUseNotYoursToUse: ld hl, ItemUseNotYoursToUseText jr ItemUseFailed -Func_e4bf: ; e4bf (3:64bf) +Func_e4bf: ld a, $2 ld [wActionResultOrTookBattleTurn], a ld hl, DontHavePokemonText jp PrintText -ThrowBallAtTrainerMon: ; e4ca (3:64ca) +ThrowBallAtTrainerMon: call RunDefaultPaletteCommand call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 @@ -2624,71 +2624,71 @@ ThrowBallAtTrainerMon: ; e4ca (3:64ca) call PrintText jr RemoveUsedItem -NoCyclingAllowedHere: ; e4eb (3:64eb) +NoCyclingAllowedHere: ld hl, NoCyclingAllowedHereText jr ItemUseFailed -BoxFullCannotThrowBall: ; e4f0 (3:64f0) +BoxFullCannotThrowBall: ld hl, BoxFullCannotThrowBallText jr ItemUseFailed -SurfingAttemptFailed: ; e4f5 (3:64f5) +SurfingAttemptFailed: ld hl, NoSurfingHereText -ItemUseFailed: ; e4f8 (3:64f8) +ItemUseFailed: xor a ld [wActionResultOrTookBattleTurn], a ; item use failed jp PrintText -ItemUseNotTimeText: ; e4ff (3:64ff) +ItemUseNotTimeText: TX_FAR _ItemUseNotTimeText db "@" -ItemUseNotYoursToUseText: ; e504 (3:6504) +ItemUseNotYoursToUseText: TX_FAR _ItemUseNotYoursToUseText db "@" -ItemUseNoEffectText: ; e509 (3:6509) +ItemUseNoEffectText: TX_FAR _ItemUseNoEffectText db "@" -ThrowBallAtTrainerMonText1: ; e50e (3:650e) +ThrowBallAtTrainerMonText1: TX_FAR _ThrowBallAtTrainerMonText1 db "@" -ThrowBallAtTrainerMonText2: ; e513 (3:6513) +ThrowBallAtTrainerMonText2: TX_FAR _ThrowBallAtTrainerMonText2 db "@" -NoCyclingAllowedHereText: ; e518 (3:6518) +NoCyclingAllowedHereText: TX_FAR _NoCyclingAllowedHereText db "@" -NoSurfingHereText: ; e51d (3:651d) +NoSurfingHereText: TX_FAR _NoSurfingHereText db "@" -BoxFullCannotThrowBallText: ; e522 (3:6522) +BoxFullCannotThrowBallText: TX_FAR _BoxFullCannotThrowBallText db "@" -DontHavePokemonText: ; e527 (3:6527) +DontHavePokemonText: TX_FAR _DontHavePokemonText db "@" -ItemUseText00: ; e52c (3:652c) +ItemUseText00: TX_FAR _ItemUseText001 db $05 TX_FAR _ItemUseText002 db "@" -GotOnBicycleText: ; e536 (3:6536) +GotOnBicycleText: TX_FAR _GotOnBicycleText1 db $05 TX_FAR _GotOnBicycleText2 db "@" -GotOffBicycleText: ; e540 (3:6540) +GotOffBicycleText: TX_FAR _GotOffBicycleText1 db $05 TX_FAR _GotOffBicycleText2 @@ -2699,7 +2699,7 @@ GotOffBicycleText: ; e540 (3:6540) ; INPUT: ; [wWhichPokemon] = index of pokemon in party ; [wCurrentMenuItem] = index of move (when using a PP Up) -RestoreBonusPP: ; e54a (3:654a) +RestoreBonusPP: ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 ld a, [wWhichPokemon] @@ -2741,7 +2741,7 @@ RestoreBonusPP: ; e54a (3:654a) ; INPUT: ; [de] = normal max PP ; [hl] = move PP -AddBonusPP: ; e586 (3:6586) +AddBonusPP: push bc ld a, [de] ; normal max PP of move ld [H_DIVIDEND + 3], a @@ -2790,7 +2790,7 @@ AddBonusPP: ; e586 (3:6586) ; [wCurrentMenuItem] = move index ; OUTPUT: ; [wMaxPP] = max PP -GetMaxPP: ; e5bb (3:65bb) +GetMaxPP: ld a, [wMonDataLocation] and a ld hl, wPartyMon1Moves @@ -2851,11 +2851,11 @@ GetMaxPP: ; e5bb (3:65bb) ld [wMaxPP], a ; store max PP ret -GetSelectedMoveOffset: ; e627 (3:6627) +GetSelectedMoveOffset: ld a, [wWhichPokemon] call AddNTimes -GetSelectedMoveOffset2: ; e62d (3:662d) +GetSelectedMoveOffset2: ld a, [wCurrentMenuItem] ld c, a ld b, 0 @@ -2870,7 +2870,7 @@ GetSelectedMoveOffset2: ; e62d (3:662d) ; [wItemQuantity] = quantity to toss ; OUTPUT: ; clears carry flag if the item is tossed, sets carry flag if not -TossItem_: ; e635 (3:6635) +TossItem_: push hl ld a, [wcf91] call IsItemHM @@ -2921,15 +2921,15 @@ TossItem_: ; e635 (3:6635) scf ret -ThrewAwayItemText: ; e699 (3:6699) +ThrewAwayItemText: TX_FAR _ThrewAwayItemText db "@" -IsItOKToTossItemText: ; e69e (3:669e) +IsItOKToTossItemText: TX_FAR _IsItOKToTossItemText db "@" -TooImportantToTossText: ; e6a3 (3:66a3) +TooImportantToTossText: TX_FAR _TooImportantToTossText db "@" @@ -2940,7 +2940,7 @@ TooImportantToTossText: ; e6a3 (3:66a3) ; [wIsKeyItem] = result ; 00: item is not key item ; 01: item is key item -IsKeyItem_: ; e6a8 (3:66a8) +IsKeyItem_: ld a, $01 ld [wIsKeyItem], a ld a, [wcf91] @@ -2971,7 +2971,7 @@ IsKeyItem_: ; e6a8 (3:66a8) INCLUDE "data/key_items.asm" -SendNewMonToBox: ; e6e8 (3:66e8) +SendNewMonToBox: ld de, wNumInBox ld a, [de] inc a @@ -3146,7 +3146,7 @@ SendNewMonToBox: ; e6e8 (3:66e8) ; checks if the tile in front of the player is a shore or water tile ; used for surfing and fishing ; unsets carry if it is, sets carry if not -IsNextTileShoreOrWater: ; e808 (3:6808) +IsNextTileShoreOrWater: ld a, [wCurMapTileset] ld hl, WaterTilesets ld de, 1 @@ -3168,26 +3168,26 @@ IsNextTileShoreOrWater: ; e808 (3:6808) ret ; tilesets with water -WaterTilesets: ; e834 (3:6834) +WaterTilesets: db OVERWORLD, FOREST, DOJO, GYM, SHIP, SHIP_PORT, CAVERN, FACILITY, PLATEAU db $ff ; terminator ; shore tiles -ShoreTiles: ; e83e (3:683e) +ShoreTiles: db $48, $32 -WaterTile: ; e840 (3:6840) +WaterTile: db $14 db $ff ; terminator ; reloads map view and processes sprite data ; for items that cause the overworld to be displayed -ItemUseReloadOverworldData: ; e842 (3:6842) +ItemUseReloadOverworldData: call LoadCurrentMapView jp UpdateSprites ; creates a list at wBuffer of maps where the mon in [wd11e] can be found. ; this is used by the pokedex to display locations the mon can be found on the map. -FindWildLocationsOfMon: ; e848 (3:6848) +FindWildLocationsOfMon: ld hl, WildDataPointers ld de, wBuffer ld c, $0 @@ -3211,13 +3211,12 @@ FindWildLocationsOfMon: ; e848 (3:6848) inc hl inc c jr .loop - .done ld a, $ff ; list terminator ld [de], a ret -CheckMapForMon: ; e86d (3:686d) +CheckMapForMon: inc hl ld b, $a .loop diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index a3a8c608..80e6bf3c 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,4 +1,4 @@ -GetMachinePrice: ; f65d4 (3d:65d4) +GetMachinePrice: ; Input: [wcf91] = Item Id of a TM ; Output: Stores the TM price at hItemPrice ld a, [wcf91] ; a contains TM item id diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index be93fc0e..7ccaa232 100755 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,5 +1,5 @@ ; checks if the mon in [wWhichPokemon] already knows the move in [wMoveNum] -CheckIfMoveIsKnown: ; 2fd42 (b:7d42) +CheckIfMoveIsKnown: ld a, [wWhichPokemon] ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 @@ -21,6 +21,6 @@ CheckIfMoveIsKnown: ; 2fd42 (b:7d42) scf ret -AlreadyKnowsText: ; 2fd65 (b:7d65) +AlreadyKnowsText: TX_FAR _AlreadyKnowsText db "@" diff --git a/engine/items/tms.asm b/engine/items/tms.asm index ff10d134..84770747 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -1,5 +1,5 @@ ; tests if mon [wcf91] can learn move [wMoveNum] -CanLearnTM: ; 122f0 (4:62f0) +CanLearnTM: ld a, [wcf91] ld [wd0b5], a call GetMonHeader @@ -28,7 +28,7 @@ CanLearnTM: ; 122f0 (4:62f0) ; converts TM/HM number in wd11e into move number ; HMs start at 51 -TMToMove: ; 1231d (4:631d) +TMToMove: ld a, [wd11e] dec a ld hl, TechnicalMachines diff --git a/engine/joypad.asm b/engine/joypad.asm index 2b85cb61..4126568c 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -1,4 +1,4 @@ -ReadJoypad_:: ; c000 (3:4000) +ReadJoypad_:: ; Poll joypad input. ; Unlike the hardware register, button ; presses are indicated by a set bit. @@ -33,7 +33,7 @@ ReadJoypad_:: ; c000 (3:4000) ret -_Joypad:: ; c02d (3:402d) +_Joypad:: ; hJoyReleased: (hJoyLast ^ hJoyInput) & hJoyLast ; hJoyPressed: (hJoyLast ^ hJoyInput) & hJoyInput diff --git a/engine/learn_move.asm b/engine/learn_move.asm index 7022e3ea..dcaf4235 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -1,4 +1,4 @@ -LearnMove: ; 6bc8 (1:6bc8) +LearnMove: call SaveScreenTilesToBuffer1 ld a, [wWhichPokemon] ld hl, wPartyMonNicks @@ -8,7 +8,7 @@ LearnMove: ; 6bc8 (1:6bc8) ld bc, NAME_LENGTH call CopyData -DontAbandonLearning: ; 6be0 (1:6be0) +DontAbandonLearning: ld hl, wPartyMon1Moves ld bc, wPartyMon2Moves - wPartyMon1Moves ld a, [wWhichPokemon] @@ -73,7 +73,7 @@ DontAbandonLearning: ; 6be0 (1:6be0) call CopyData jp PrintLearnedMove -AbandonLearning: ; 6c5f (1:6c5f) +AbandonLearning: ld hl, AbandonLearningText call PrintText coord hl, 14, 7 @@ -89,13 +89,13 @@ AbandonLearning: ; 6c5f (1:6c5f) ld b, 0 ret -PrintLearnedMove: ; 6c83 (1:6c83) +PrintLearnedMove: ld hl, LearnedMove1Text call PrintText ld b, 1 ret -TryingToLearn: ; 6c8c (1:6c8c) +TryingToLearn: push hl ld hl, TryingToLearnText call PrintText @@ -182,27 +182,27 @@ TryingToLearn: ; 6c8c (1:6c8c) scf ret -LearnedMove1Text: ; 6d31 (1:6d31) +LearnedMove1Text: TX_FAR _LearnedMove1Text db $b,6,"@" -WhichMoveToForgetText: ; 6d38 (1:6d38) +WhichMoveToForgetText: TX_FAR _WhichMoveToForgetText db "@" -AbandonLearningText: ; 6d3d (1:6d3d) +AbandonLearningText: TX_FAR _AbandonLearningText db "@" -DidNotLearnText: ; 6d42 (1:6d42) +DidNotLearnText: TX_FAR _DidNotLearnText db "@" -TryingToLearnText: ; 6d47 (1:6d47) +TryingToLearnText: TX_FAR _TryingToLearnText db "@" -OneTwoAndText: ; 6d4c (1:6d4c) +OneTwoAndText: ; bugfix: In Red/Blue, the SFX_SWAP sound was played in the wrong bank, which played an incorrect sound ; Yellow has fixed this by swapping to the correct bank TX_FAR _OneTwoAndText @@ -236,13 +236,13 @@ OneTwoAndText: ; 6d4c (1:6d4c) ld hl, PoofText ret -PoofText: ; 6d88 (1:6d88) +PoofText: TX_FAR _PoofText db $a -ForgotAndText: ; 6d8d (1:6d8d) +ForgotAndText: TX_FAR _ForgotAndText db "@" -HMCantDeleteText: ; 6d92 (1:6d92) +HMCantDeleteText: TX_FAR _HMCantDeleteText db "@" diff --git a/engine/load_mon_data.asm b/engine/load_mon_data.asm index 4a1e3097..e708113f 100644 --- a/engine/load_mon_data.asm +++ b/engine/load_mon_data.asm @@ -1,4 +1,4 @@ -LoadMonData_: ; 442b (1:442b) +LoadMonData_: ; Load monster [wWhichPokemon] from list [wMonDataLocation]: ; 0: partymon ; 1: enemymon @@ -49,7 +49,7 @@ LoadMonData_: ; 442b (1:442b) jp CopyData ; get species of mon e in list [wMonDataLocation] for LoadMonData -GetMonSpecies: ; 4478 (1:4478) +GetMonSpecies: ld hl, wPartySpecies ld a, [wMonDataLocation] and a @@ -65,4 +65,4 @@ GetMonSpecies: ; 4478 (1:4478) add hl, de ld a, [hl] ld [wcf91], a - ret
\ No newline at end of file + ret diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm index 43d87f09..637b7a24 100755 --- a/engine/load_pokedex_tiles.asm +++ b/engine/load_pokedex_tiles.asm @@ -1,5 +1,5 @@ ; Loads tile patterns for tiles used in the pokedex. -LoadPokedexTilePatterns: ; 14000 (5:4000) +LoadPokedexTilePatterns: call LoadHpBarAndStatusTilePatterns ld de,PokedexTileGraphics ld hl,vChars2 + $600 @@ -8,4 +8,4 @@ LoadPokedexTilePatterns: ; 14000 (5:4000) ld de,PokeballTileGraphics ld hl,vChars2 + $720 lb bc, BANK(PokeballTileGraphics), $01 - jp CopyVideoData ; load pokeball tile for marking caught mons
\ No newline at end of file + jp CopyVideoData ; load pokeball tile for marking caught mons diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index e104f693..eddccc29 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -1,4 +1,4 @@ -DisplayPCMainMenu:: ; 213c8 (8:5378) +DisplayPCMainMenu:: xor a ld [H_AUTOBGTRANSFERENABLED], a call SaveScreenTilesToBuffer2 @@ -89,7 +89,7 @@ OaksPCText: db "PROF.OAK's PC@" PKMNLeaguePCText: db $4a, "LEAGUE@" LogOffPCText: db "LOG OFF@" -BillsPC_:: ; 2146f (8:546f) +BillsPC_:: ld hl, wd730 set 6, [hl] xor a @@ -108,7 +108,7 @@ BillsPC_:: ; 2146f (8:546f) ld hl, SwitchOnText call PrintText -BillsPCMenu: ; 21495 (8:5495) +BillsPCMenu: ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, vChars2 + $780 @@ -184,7 +184,7 @@ BillsPCMenu: ; 21495 (8:5495) cp $4 jp z, BillsPCPrintBox -ExitBillsPC: ; 2153e (8:553e) +ExitBillsPC: ld a, [wFlags_0xcd60] bit 3, a ; accessing Bill's PC through another PC? jr nz, .next @@ -203,11 +203,11 @@ ExitBillsPC: ; 2153e (8:553e) res 6, [hl] ret -BillsPCPrintBox: ; 21562 (8:5562) +BillsPCPrintBox: callab PrintPCBox jp BillsPCMenu -BillsPCDeposit: ; 2156d (8:556d) +BillsPCDeposit: ld a, [wPartyCount] dec a jr nz, .partyLargeEnough @@ -254,7 +254,7 @@ BillsPCDeposit: ; 2156d (8:556d) call WaitForSoundToFinish ld hl, wBoxNumString ld a, [wCurrentBoxNum] - and " " + and $7f cp 9 jr c, .singleDigitBoxNum sub 9 @@ -271,11 +271,11 @@ BillsPCDeposit: ; 2156d (8:556d) call PrintText jp BillsPCMenu -SleepingPikachuText2: ; 2160e (8:560e) +SleepingPikachuText2: TX_FAR _SleepingPikachuText2 db "@" -BillsPCWithdraw: ; 21613 (8:5613) +BillsPCWithdraw: ld a, [wNumInBox] and a jr nz, .boxNotEmpty @@ -318,7 +318,7 @@ BillsPCWithdraw: ; 21613 (8:5613) call PrintText jp BillsPCMenu -BillsPCRelease: ; 21690 (8:5690) +BillsPCRelease: ld a, [wNumInBox] and a jr nz, .loop @@ -357,11 +357,11 @@ BillsPCRelease: ; 21690 (8:5690) call PrintText jp BillsPCMenu -BillsPCChangeBox: ; 216e7 (8:56e7) +BillsPCChangeBox: callba ChangeBox jp BillsPCMenu -DisplayMonListMenu: ; 216f2 (8:56f2) +DisplayMonListMenu: ld a, l ld [wListPointer], a ld a, h @@ -378,7 +378,7 @@ DisplayMonListMenu: ; 216f2 (8:56f2) ld [wPartyAndBillsPCSavedMenuItem], a ret -BillsPCMenuText: ; 21715 (8:5715) +BillsPCMenuText: db "WITHDRAW ", $4a next "DEPOSIT ", $4a next "RELEASE ", $4a @@ -387,10 +387,10 @@ BillsPCMenuText: ; 21715 (8:5715) next "SEE YA!" db "@" -BoxNoPCText: ; 21751 (8:5751) +BoxNoPCText: db "BOX No.@" -KnowsHMMove:: ; 21759 (8:5759) +KnowsHMMove:: ; returns whether mon with party index [wWhichPokemon] knows an HM move ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 @@ -417,15 +417,15 @@ KnowsHMMove:: ; 21759 (8:5759) and a ret -HMMoveArray: ; 21783 (8:5783) +HMMoveArray: db CUT db FLY db SURF db STRENGTH db FLASH - db $ff + db -1 -DisplayDepositWithdrawMenu: ; 21789 (8:5789) +DisplayDepositWithdrawMenu: coord hl, 9, 10 lb bc, 6, 9 call TextBoxBorder @@ -497,59 +497,59 @@ StatsCancelPCText: db "STATS" next "CANCEL@" -SwitchOnText: ; 21826 (8:5826) +SwitchOnText: TX_FAR _SwitchOnText db "@" -WhatText: ; 2182b (8:582b) +WhatText: TX_FAR _WhatText db "@" -DepositWhichMonText: ; 21830 (8:5830) +DepositWhichMonText: TX_FAR _DepositWhichMonText db "@" -MonWasStoredText: ; 21835 (8:5835) +MonWasStoredText: TX_FAR _MonWasStoredText db "@" -CantDepositLastMonText: ; 2183a (8:583a) +CantDepositLastMonText: TX_FAR _CantDepositLastMonText db "@" -BoxFullText: ; 2183f (8:583f) +BoxFullText: TX_FAR _BoxFullText db "@" -MonIsTakenOutText: ; 21844 (8:5844) +MonIsTakenOutText: TX_FAR _MonIsTakenOutText db "@" -NoMonText: ; 21849 (8:5849) +NoMonText: TX_FAR _NoMonText db "@" -CantTakeMonText: ; 2184e (8:584e) +CantTakeMonText: TX_FAR _CantTakeMonText db "@" -PikachuUnhappyText: ; 21853 (8:5853) +PikachuUnhappyText: TX_FAR _PikachuUnhappyText db "@" -ReleaseWhichMonText: ; 21858 (8:5858) +ReleaseWhichMonText: TX_FAR _ReleaseWhichMonText db "@" -OnceReleasedText: ; 2185d (8:585d) +OnceReleasedText: TX_FAR _OnceReleasedText db "@" -MonWasReleasedText: ; 21862 (8:5862) +MonWasReleasedText: TX_FAR _MonWasReleasedText db "@" -CableClubLeftGameboy:: ; 21867 (8:5867) +CableClubLeftGameboy:: ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK ret z @@ -566,7 +566,7 @@ CableClubLeftGameboy:: ; 21867 (8:5867) call EnableAutoTextBoxDrawing tx_pre_jump JustAMomentText -CableClubRightGameboy:: ; 21887 (8:5887) +CableClubRightGameboy:: ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret z @@ -583,7 +583,7 @@ CableClubRightGameboy:: ; 21887 (8:5887) call EnableAutoTextBoxDrawing tx_pre_jump JustAMomentText -JustAMomentText:: ; 218a7 (8:58a7) +JustAMomentText:: TX_FAR _JustAMomentText db "@" @@ -593,5 +593,6 @@ JustAMomentText:: ; 218a7 (8:58a7) call EnableAutoTextBoxDrawing tx_pre_jump OpenBillsPCText -OpenBillsPCText:: ; 218ba (8:58ba) - db $FD ; FuncTX_BillsPC
\ No newline at end of file +OpenBillsPCText:: + db $FD ; FuncTX_BillsPC + diff --git a/engine/menu/diploma_1.asm b/engine/menu/diploma_1.asm index db156115..3f309bd2 100644 --- a/engine/menu/diploma_1.asm +++ b/engine/menu/diploma_1.asm @@ -1,4 +1,4 @@ -DisplayDiploma: ; 56714 (15:6714) +DisplayDiploma: call SaveScreenTilesToBuffer2 call GBPalWhiteOutWithDelay3 call ClearScreen @@ -14,4 +14,4 @@ DisplayDiploma: ; 56714 (15:6714) call ReloadTilesetTilePatterns call RestoreScreenTilesAndReloadTilePatterns call Delay3 - jp GBPalNormal
\ No newline at end of file + jp GBPalNormal diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 21ee30b0..9946b90d 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -1,4 +1,4 @@ -PKMNLeaguePC: ; 75dfe (1d:5dfe) +PKMNLeaguePC: ld hl, AccessedHoFPCText call PrintText ld hl, wd730 @@ -50,7 +50,7 @@ PKMNLeaguePC: ; 75dfe (1d:5dfe) call RunDefaultPaletteCommand jp GBPalNormal -LeaguePCShowTeam: ; 75e65 (1d:5e65) +LeaguePCShowTeam: ld c, PARTY_LENGTH .loop push bc @@ -77,7 +77,7 @@ LeaguePCShowTeam: ; 75e65 (1d:5e65) scf ret -LeaguePCShowMon: ; 75e90 (1d:5e90) +LeaguePCShowMon: call GBPalWhiteOutWithDelay3 call ClearScreen ld hl, wHallOfFame @@ -111,9 +111,9 @@ LeaguePCShowMon: ; 75e90 (1d:5e90) call PrintNumber jpba Func_7033f -HallOfFameNoText: ; 75eef (1d:5eef) +HallOfFameNoText: db "HALL OF FAME No @" -AccessedHoFPCText: ; 75f02 (1d:5f02) +AccessedHoFPCText: TX_FAR _AccessedHoFPCText db "@" diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm index 4d0beb7e..458f653b 100644 --- a/engine/menu/link_menu.asm +++ b/engine/menu/link_menu.asm @@ -1,4 +1,4 @@ -Func_f531b:: ; f531b (3d:531b) +Func_f531b:: ld c,$14 call DelayFrames ld a,$1 @@ -176,25 +176,25 @@ Func_f531b:: ; f531b (3d:531b) and a ret -Func_f5476:: ; f5476 (3d:5476) +Func_f5476:: ld hl,ColosseumIneligibleText call PrintText -asm_f547c:: ; f547c (3d:574c) +asm_f547c:: jp Func_f531b -asm_f547f:: ; f547f (3d:547f) +asm_f547f:: xor a ld [wUnknownSerialCounter],a ld [wUnknownSerialCounter+1],a scf ret -PointerTable_f5488:: ; f5488 (3d:5488) +PointerTable_f5488:: dw PokeCup dw PikaCup dw PetitCup -PokeCup:: ; f548e (3d:548e) +PokeCup:: ld hl,wPartyCount ld a,[hli] cp $3 @@ -240,7 +240,7 @@ PokeCup:: ; f548e (3d:548e) xor a ret -PikaCup:: ; f54e4 (3d:54e4) +PikaCup:: ld hl,wPartyCount ld a,[hli] cp $3 @@ -286,7 +286,7 @@ PikaCup:: ; f54e4 (3d:54e4) xor a ret -PetitCup:: ; f553a (3d:553a) +PetitCup:: ld hl,wPartyCount ld a,[hli] cp $3 @@ -407,79 +407,79 @@ PetitCup:: ; f553a (3d:553a) xor a ret -NotThreeMonsInParty:: ; f561d (3d:516d) +NotThreeMonsInParty:: ld hl,Colosseum3MonsText call PrintText ld a,$1 ret -MewInParty:: ; f5626 (3d:f5626) +MewInParty:: ld hl,ColosseumMewText call PrintText ld a,$2 ret -DuplicateSpecies:: ; f562f (3d:f562f) +DuplicateSpecies:: ld hl,ColosseumDifferentMonsText call PrintText ld a,$3 ret -LevelAbove55:: ; f5638 (3d:5638) +LevelAbove55:: ld hl,ColosseumMaxL55Text call PrintText ld a,$4 ret -LevelUnder50:: ; f5641 (3d:5641) +LevelUnder50:: ld hl,ColosseumMinL50Text call PrintText ld a,$5 ret -CombinedLevelsGreaterThan155:: ; f5641 (3d:564a) +CombinedLevelsGreaterThan155:: ld hl,ColosseumTotalL155Text call PrintText ld a,$6 ret -LevelAbove30:: ; f5653 (3d:5653) +LevelAbove30:: ld hl,ColosseumMaxL30Text call PrintText ld a,$7 ret -LevelUnder25:: ; f565c (3d:565c) +LevelUnder25:: ld hl,ColosseumMinL25Text call PrintText ld a,$8 ret -CombinedLevelsAbove80:: ; f5665 (3d:5665) +CombinedLevelsAbove80:: ld hl,ColosseumTotalL80Text call PrintText ld a,$9 ret -LevelAbove20:: ; f566e (3d:566e) +LevelAbove20:: ld hl,ColosseumMaxL20Text call PrintText ld a,$a ret -LevelUnder15:: ; f5677 (3d:5677) +LevelUnder15:: ld hl,ColosseumMinL15Text call PrintText ld a,$b ret -CombinedLevelsAbove50:: ; f5680 (3d:5680) +CombinedLevelsAbove50:: ld hl,ColosseumTotalL50Text call PrintText ld a,$c ret -asm_f5689:: ; f5689 (3d:5689) +asm_f5689:: pop af pop bc pop hl @@ -490,7 +490,7 @@ asm_f5689:: ; f5689 (3d:5689) ld a,$d ret -asm_f569b:: ; f569b (3d:569b) +asm_f569b:: pop af pop bc pop hl @@ -501,7 +501,7 @@ asm_f569b:: ; f569b (3d:569b) ld a,$e ret -asm_f56ad:: ; f56ad (3d:56ad) +asm_f56ad:: ld a,[hl] ld [wd11e],a call GetMonName @@ -510,7 +510,7 @@ asm_f56ad:: ; f56ad (3d:56ad) ld a,$f ret -Func_f56bd:: ; f56bd (3d:56bd) +Func_f56bd:: xor a ld [H_AUTOBGTRANSFERENABLED],a coord hl, 1,11 @@ -538,101 +538,101 @@ Func_f56bd:: ; f56bd (3d:56bd) ld [H_AUTOBGTRANSFERENABLED],a ret -PointerTable_f56ee:: ; f56ee (3d:56ee) +PointerTable_f56ee:: dw Text_f56f4 dw Text_f5728 dw Text_f575b -Text_f56f4:: ; f56f4 (3d:56f4) +Text_f56f4:: db "LVs of 3<pkmn>:50-55" next "Sum of LVs:155 MAX" next "MEW can't attend.@" -Text_f5728:: ; f5728 (3d:5728) +Text_f5728:: db "LVs of 3<pkmn>:15-20" next "Sum of LVs:50 MAX" next "MEW can't attend.@" -Text_f575b:: ; f575b (3d:575b) +Text_f575b:: db "3 Basic <pkmn>.LV25-30" next "Sum of LVs:80 MAX" next "6′8″ and 44lb MAX@" -Text_f5791:: ; f5791 (3d:5791) +Text_f5791:: db "View" next "Rules@" -Text_f579c:: ; f579c (3d:579c) +Text_f579c:: db "# Cup" next "Pika Cup" next "Petit Cup" next "CANCEL@" -Colosseum3MonsText:: ; f57bc (3d:57bc) +Colosseum3MonsText:: TX_FAR _Colosseum3MonsText ; a0a2b db "@" -ColosseumMewText:: ; f57c1 (3d:57c1) +ColosseumMewText:: TX_FAR _ColosseumMewText ; a0a46 db "@" -ColosseumDifferentMonsText:: ; f57c6 (3d:57c6) +ColosseumDifferentMonsText:: TX_FAR _ColosseumDifferentMonsText ; a0a5f db "@" -ColosseumMaxL55Text:: ; f57cb (3d:57cb) +ColosseumMaxL55Text:: TX_FAR _ColosseumMaxL55Text ; a0a81 db "@" -ColosseumMinL50Text:: ; f57d0 (3d:57d0) +ColosseumMinL50Text:: TX_FAR _ColosseumMinL50Text ; a0a9a db "@" -ColosseumTotalL155Text:: ; f57d5 (3d:57d5) +ColosseumTotalL155Text:: TX_FAR _ColosseumTotalL155Text ; a0aba db "@" -ColosseumMaxL30Text:: ; f57da (3d:57da) +ColosseumMaxL30Text:: TX_FAR _ColosseumMaxL30Text ; a0ad9 db "@" -ColosseumMinL25Text:: ; f57df (3d:57df) +ColosseumMinL25Text:: TX_FAR _ColosseumMinL25Text ; a0af2 db "@" -ColosseumTotalL80Text:: ; f57e4 (3d:57e4) +ColosseumTotalL80Text:: TX_FAR _ColosseumTotalL80Text ; a0b12 db "@" -ColosseumMaxL20Text:: ; f57e9 (3d:57e9) +ColosseumMaxL20Text:: TX_FAR _ColosseumMaxL20Text ; a0b30 db "@" -ColosseumMinL15Text:: ; f57ee (3d:57ee) +ColosseumMinL15Text:: TX_FAR _ColosseumMinL15Text ; a0b49 db "@" -ColosseumTotalL50Text:: ; f57f3 (3d:57f3) +ColosseumTotalL50Text:: TX_FAR _ColosseumTotalL50Text ; a0b69 db "@" -ColosseumHeightText:: ; f57f8 (3d:57f8) +ColosseumHeightText:: TX_FAR _ColosseumHeightText ; a0b87 db "@" -ColosseumWeightText:: ; f57fd (3d:57fd) +ColosseumWeightText:: TX_FAR _ColosseumWeightText ; a0b9f db "@" -ColosseumEvolvedText:: ; f5802 (3d:5802) +ColosseumEvolvedText:: TX_FAR _ColosseumEvolvedText ; a0bbb db "@" -ColosseumIneligibleText:: ; f5807 (3d:5807) +ColosseumIneligibleText:: TX_FAR _ColosseumIneligibleText ; a0bd4 db "@" -LinkMenu: ; f580c (3d:580c) +LinkMenu: xor a ld [wLetterPrintingDelayFlags], a ld hl, wd72e @@ -871,7 +871,7 @@ LinkMenu: ; f580c (3d:580c) ld a,$f0 jp .next -Func_f59ec:: ; f59ec (3d:59ec) +Func_f59ec:: ld a, b Coorda 6, 5 ld a, c @@ -884,27 +884,27 @@ Func_f59ec:: ; f59ec (3d:59ec) call DelayFrames ret -ColosseumWhereToText: ; f5a02 (3d:5a02) +ColosseumWhereToText: TX_FAR _ColosseumWhereToText db "@" -ColosseumPleaseWaitText: ; f5a07 (3d:5a07) +ColosseumPleaseWaitText: TX_FAR _ColosseumPleaseWaitText db "@" -ColosseumCanceledText: ; f5a0c (3d:5a0c) +ColosseumCanceledText: TX_FAR _ColosseumCanceledText db "@" -ColosseumVersionText: ; f5a11 (3d:5a11) +ColosseumVersionText: TX_FAR _ColosseumVersionText ; 28:4c47 db "@" -TextTerminator_f5a16: ; f5a16 (3d:5a16) +TextTerminator_f5a16: db "@" -TradeCenterText: ; f5a17 (3d:5a17) +TradeCenterText: db "TRADE CENTER" next "COLOSSEUM" next "COLOSSEUM2" - next "CANCEL@"
\ No newline at end of file + next "CANCEL@" diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 669b2ba8..cf837a54 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,4 +1,4 @@ -MainMenu: ; 5ba6 (1:5ba6) +MainMenu: ; Check save file call InitOptions xor a @@ -122,7 +122,7 @@ MainMenu: ; 5ba6 (1:5ba6) call SpecialWarpIn jp SpecialEnterMap -InitOptions: ; 5bff (1:5bff) +InitOptions: ld a,1 ; no delay ld [wLetterPrintingDelayFlags],a ld a,3 ; medium speed @@ -131,7 +131,7 @@ InitOptions: ; 5bff (1:5bff) ld [wPrinterSettings], a ret -Func_5cc1: ; 5cc1 (1:5cc1) +Func_5cc1: ; unused? ld a, $6d cp $80 @@ -140,11 +140,11 @@ Func_5cc1: ; 5cc1 (1:5cc1) call PrintText ret -NotEnoughMemoryText: ; 5ccd (1:5ccd) +NotEnoughMemoryText: TX_FAR _NotEnoughMemoryText db "@" -StartNewGame: ; 5cd2 (1:5cd2) +StartNewGame: ld hl, wd732 res 1, [hl] call OakSpeech @@ -154,7 +154,7 @@ StartNewGame: ; 5cd2 (1:5cd2) call DelayFrames ; enter map after using a special warp or loading the game from the main menu -SpecialEnterMap: ; 5ce4 (1:5ce4) +SpecialEnterMap: xor a ld [hJoyPressed], a ld [hJoyHeld], a @@ -171,14 +171,14 @@ SpecialEnterMap: ; 5ce4 (1:5ce4) ret nz jp EnterMap -ContinueText: ; 5d06 (1:5d06) +ContinueText: db "CONTINUE", $4e -NewGameText: ; 5d0f (1:5d0f) +NewGameText: db "NEW GAME", $4e db "OPTION@" -DisplayContinueGameInfo: ; 5d1f (1:5d1f) +DisplayContinueGameInfo: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 7 @@ -201,7 +201,7 @@ DisplayContinueGameInfo: ; 5d1f (1:5d1f) ld c, 30 jp DelayFrames -PrintSaveScreenText: ; 5d58 (1:5d58) +PrintSaveScreenText: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 0 @@ -226,7 +226,7 @@ PrintSaveScreenText: ; 5d58 (1:5d58) ld c, 30 jp DelayFrames -PrintNumBadges: ; 5d97 (1:5d97) +PrintNumBadges: push hl ld hl, wObtainedBadges ld b, $1 @@ -236,7 +236,7 @@ PrintNumBadges: ; 5d97 (1:5d97) lb bc, 1, 2 jp PrintNumber -PrintNumOwnedMons: ; 5daa (1:5daa) +PrintNumOwnedMons: push hl ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -246,7 +246,7 @@ PrintNumOwnedMons: ; 5daa (1:5daa) lb bc, 1, 3 jp PrintNumber -PrintPlayTime: ; 5dbd (1:5dbd) +PrintPlayTime: ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber @@ -256,17 +256,17 @@ PrintPlayTime: ; 5dbd (1:5dbd) lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber -SaveScreenInfoText: ; 5dd2 (1:5dd2) +SaveScreenInfoText: db "PLAYER" next "BADGES " next "#DEX " next "TIME@" -DisplayOptionMenu: ; 5df2 (1:5df2) +DisplayOptionMenu: callab DisplayOptionMenu_ ; 10:5c70 ret -CheckForPlayerNameInSRAM: ; 5dfb (1:5dfb) +CheckForPlayerNameInSRAM: ; Check if the player name data in SRAM has a string terminator character ; (indicating that a name may have been saved there) and return whether it does ; in carry. @@ -294,4 +294,4 @@ CheckForPlayerNameInSRAM: ; 5dfb (1:5dfb) ld [MBC1SRamEnable], a ld [MBC1SRamBankingMode], a scf - ret
\ No newline at end of file + ret diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 0eacc8f6..911c4e99 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -1,4 +1,4 @@ -AskName: ; 625d (1:625d) +AskName: call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl @@ -48,11 +48,11 @@ AskName: ; 625d (1:625d) ld bc, NAME_LENGTH jp CopyData -DoYouWantToNicknameText: ; 62c8 (1:62c8) +DoYouWantToNicknameText: TX_FAR _DoYouWantToNicknameText db "@" -DisplayNameRaterScreen: ; 62cd (1:62cd) +DisplayNameRaterScreen: ld hl, wBuffer xor a ld [wUpdateSpritesEnabled], a @@ -80,7 +80,7 @@ DisplayNameRaterScreen: ; 62cd (1:62cd) scf ret -DisplayNamingScreen: ; 6307 (1:6307) +DisplayNamingScreen: push hl ld hl, wd730 set 6, [hl] @@ -321,7 +321,7 @@ DisplayNamingScreen: ; 6307 (1:6307) ld [wTopMenuItemX], a jp EraseMenuCursor -LoadEDTile: ; 675b (1:675b) +LoadEDTile: ; In Red/Blue, the bank for the ED_tile was defined incorrectly as bank0 ; Luckily, the MBC3 treats loading $0 into $2000-$2fff range as loading bank1 into $4000-$7fff range ; Because Yellow uses the MBC5, loading $0 into $2000 - $2fff range will load bank0 instead of bank1 and thus incorrectly load the tile @@ -345,11 +345,11 @@ LoadEDTile: ; 675b (1:675b) jr nz, .waitForHBlankLoop ret -ED_Tile: ; 64e5 (1:64e5) +ED_Tile: INCBIN "gfx/ED_tile.1bpp" ED_TileEnd: -PrintAlphabet: ; 676f (1:676f) +PrintAlphabet: xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, [wAlphabetCase] @@ -379,13 +379,13 @@ PrintAlphabet: ; 676f (1:676f) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -LowerCaseAlphabet: ; 651c (1:651c) +LowerCaseAlphabet: db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@" -UpperCaseAlphabet: ; 6554 (1:6554) +UpperCaseAlphabet: db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@" -PrintNicknameAndUnderscores: ; 658c (1:658c) +PrintNicknameAndUnderscores: call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -439,7 +439,7 @@ PrintNicknameAndUnderscores: ; 658c (1:658c) ld [hl], $77 ; raised underscore tile id ret -DakutensAndHandakutens: ; 65ef (1:65ef) +DakutensAndHandakutens: push de call CalcStringLength dec hl @@ -453,7 +453,7 @@ DakutensAndHandakutens: ; 65ef (1:65ef) ld [wNamingScreenLetter], a ret -Dakutens: ; 6603 (1:6603) +Dakutens: db "かが", "きぎ", "くぐ", "けげ", "こご" db "さざ", "しじ", "すず", "せぜ", "そぞ" db "ただ", "ちぢ", "つづ", "てで", "とど" @@ -464,13 +464,13 @@ Dakutens: ; 6603 (1:6603) db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db $ff -Handakutens: ; 6654 (1:6654) +Handakutens: db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db $ff ; calculates the length of the string at wcf4b and stores it in c -CalcStringLength: ; 6669 (1:6669) +CalcStringLength: ld hl, wcf4b ld c, $0 .loop @@ -481,7 +481,7 @@ CalcStringLength: ; 6669 (1:6669) inc c jr .loop -PrintNamingText: ; 6676 (1:6676) +PrintNamingText: coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString @@ -513,14 +513,14 @@ PrintNamingText: ; 6676 (1:6676) .placeString jp PlaceString -YourTextString: ; 66bd (1:66bd) +YourTextString: db "YOUR @" -RivalsTextString: ; 66c3 (1:66c3) +RivalsTextString: db "RIVAL's @" -NameTextString: ; 66cb (1:66cb) +NameTextString: db "NAME?@" -NicknameTextString: ; 66d1 (1:66d1) +NicknameTextString: db "NICKNAME?@" diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index ce989bf1..e4172ec7 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -1,4 +1,4 @@ -OpenOaksPC: ; 1e2ae (7:62ae) +OpenOaksPC: call SaveScreenTilesToBuffer2 ld hl, AccessedOaksPCText call PrintText @@ -14,14 +14,14 @@ OpenOaksPC: ; 1e2ae (7:62ae) call PrintText jp LoadScreenTilesFromBuffer2 -GetDexRatedText: ; 1e2d4 (7:62d4) +GetDexRatedText: TX_FAR _GetDexRatedText db "@" -ClosedOaksPCText: ; 1e2d9 (7:62d9) +ClosedOaksPCText: TX_FAR _ClosedOaksPCText db $0d,"@" -AccessedOaksPCText: ; 1e2df (7:62df) +AccessedOaksPCText: TX_FAR _AccessedOaksPCText db "@" diff --git a/engine/menu/options.asm b/engine/menu/options.asm index 86a55bd2..7bed30ae 100644 --- a/engine/menu/options.asm +++ b/engine/menu/options.asm @@ -1,4 +1,4 @@ -DisplayOptionMenu_: ; 41c70 (10:5c70) +DisplayOptionMenu_: call Func_41f06 .optionMenuLoop call JoypadLowSensitivity @@ -18,7 +18,7 @@ DisplayOptionMenu_: ; 41c70 (10:5c70) .exitOptionMenu ret -Func_41c95: ; 41c95 (10:5c95) +Func_41c95: ld a, [wOptionsCursorLocation] ld e, a ld d, $0 @@ -30,7 +30,7 @@ Func_41c95: ; 41c95 (10:5c95) ld l, a jp hl -OptionMenuJumpTable: ; 41ca4 (10:5ca4) +OptionMenuJumpTable: dw OptionsMenu_TextSpeed dw OptionsMenu_BattleAnimations dw OptionsMenu_BattleStyle @@ -40,7 +40,7 @@ OptionMenuJumpTable: ; 41ca4 (10:5ca4) dw OptionsMenu_Dummy dw OptionsMenu_Cancel -OptionsMenu_TextSpeed: ; 41cb4 (10:5cb4) +OptionsMenu_TextSpeed: call Func_41d07 ld a, [hJoy5] bit 4, a ; right @@ -84,19 +84,19 @@ OptionsMenu_TextSpeed: ; 41cb4 (10:5cb4) and a ret -TextSpeedStringsPointerTable: ; 41cf2 (10:5cf2) +TextSpeedStringsPointerTable: dw FastText dw MidText dw SlowText -FastText: ; 41cf9 (10:5cf9) +FastText: db "FAST@" -MidText: ; 41cfd (10:5cfd) +MidText: db "MID @" -SlowText: ; 41d02 (10:5d02) +SlowText: db "SLOW@" -Func_41d07: ; 41d07 (10:5d07) +Func_41d07: ld a, [wOptions] and $f cp $5 @@ -116,7 +116,7 @@ Func_41d07: ; 41d07 (10:5d07) lb de, 5, 3 ret -OptionsMenu_BattleAnimations: ; 41d26 (10:5d26) +OptionsMenu_BattleAnimations: ld a, [hJoy5] and D_RIGHT | D_LEFT jr nz, .asm_41d33 @@ -142,16 +142,16 @@ OptionsMenu_BattleAnimations: ; 41d26 (10:5d26) and a ret -AnimationOptionStringsPointerTable: ; 41d52 (10:5d52) +AnimationOptionStringsPointerTable: dw AnimationOnText dw AnimationOffText -AnimationOnText: ; 41d56 (10:5d56) +AnimationOnText: db "ON @" -AnimationOffText: ; 41d5a (10:5d5a) +AnimationOffText: db "OFF@" -OptionsMenu_BattleStyle: ; 41d5e (10:5d5e) +OptionsMenu_BattleStyle: ld a, [hJoy5] and D_LEFT | D_RIGHT jr nz, .asm_41d6b @@ -178,16 +178,16 @@ OptionsMenu_BattleStyle: ; 41d5e (10:5d5e) and a ret -BattleStyleOptionStringsPointerTable: ; 41d8c (10:5d8c) +BattleStyleOptionStringsPointerTable: dw BattleStyleShiftText dw BattleStyleSetText -BattleStyleShiftText: ; 41d90 (10:5d90) +BattleStyleShiftText: db "SHIFT@" -BattleStyleSetText: ; 41d96 (10:5d96) +BattleStyleSetText: db "SET @" -OptionsMenu_SpeakerSettings: ; 41d9c (10:5d9c) +OptionsMenu_SpeakerSettings: ld a, [wOptions] and $30 swap a @@ -230,22 +230,22 @@ OptionsMenu_SpeakerSettings: ; 41d9c (10:5d9c) and a ret -SpeakerOptionStringsPointerTable: ; 41ddc (10:5ddc) +SpeakerOptionStringsPointerTable: dw MonoSoundText dw Earphone1SoundText dw Earphone2SoundText dw Earphone3SoundText -MonoSoundText: ; 41de4 (10:5de4) +MonoSoundText: db "MONO @" -Earphone1SoundText: ; 41dee (10:5dee) +Earphone1SoundText: db "EARPHONE1@" -Earphone2SoundText: ; 41df8 (10:5df8) +Earphone2SoundText: db "EARPHONE2@" -Earphone3SoundText: ; 41e02 (10:5e02) +Earphone3SoundText: db "EARPHONE3@" -OptionsMenu_GBPrinterBrightness: ; 41e0c (10:5e0c) +OptionsMenu_GBPrinterBrightness: call Func_41e7b ld a, [hJoy5] bit 4, a @@ -286,25 +286,25 @@ OptionsMenu_GBPrinterBrightness: ; 41e0c (10:5e0c) and a ret -GBPrinterOptionStringsPointerTable: ; 41e44 (10:5e44) +GBPrinterOptionStringsPointerTable: dw LightestPrintText dw LighterPrintText dw NormalPrintText dw DarkerPrintText dw DarkestPrintText -LightestPrintText: ; 41e4e (10:5e4e) +LightestPrintText: db "LIGHTEST@" -LighterPrintText: ; 41e57 (10:5e57) +LighterPrintText: db "LIGHTER @" -NormalPrintText: ; 41e60 (10:5e60) +NormalPrintText: db "NORMAL @" -DarkerPrintText: ; 41e69 (10:5e69) +DarkerPrintText: db "DARKER @" -DarkestPrintText: ; 41e72 (10:5e72) +DarkestPrintText: db "DARKEST @" -Func_41e7b: ; 41e7b (10:5e7b) +Func_41e7b: ld a, [wPrinterSettings] and a jr z, .asm_41e93 @@ -334,11 +334,11 @@ Func_41e7b: ; 41e7b (10:5e7b) lb de, $60, $0 ret -OptionsMenu_Dummy: ; 41eab (10:5eab) +OptionsMenu_Dummy: and a ret -OptionsMenu_Cancel: ; 41ead (10:5ead) +OptionsMenu_Cancel: ld a, [hJoy5] and A_BUTTON jr nz, .pressedCancel @@ -348,7 +348,7 @@ OptionsMenu_Cancel: ; 41ead (10:5ead) scf ret -Func_41eb7: ; 41eb7 (10:5eb7) +Func_41eb7: ld hl, wOptionsCursorLocation ld a, [hJoy5] cp D_DOWN @@ -388,7 +388,7 @@ Func_41eb7: ; 41eb7 (10:5eb7) scf ret -Func_41ee9: ; 41ee9 (10:5ee9) +Func_41ee9: coord hl, 1, 1 ld de, SCREEN_WIDTH ld c, 16 @@ -404,7 +404,7 @@ Func_41ee9: ; 41ee9 (10:5ee9) ld [hl], "▶" ret -Func_41f06: ; 41f06 (10:5f06) +Func_41f06: coord hl, 0, 0 lb bc, SCREEN_HEIGHT - 2, SCREEN_WIDTH - 2 call TextBoxBorder @@ -432,12 +432,12 @@ Func_41f06: ; 41f06 (10:5f06) call Delay3 ret -AllOptionsText: ; 41f3e (10:5f3e) +AllOptionsText: db "TEXT SPEED :" next "ANIMATION :" next "BATTLESTYLE:" next "SOUND:" next "PRINT:@" -OptionMenuCancelText: ; 41f73 (10:5f73) - db "CANCEL@"
\ No newline at end of file +OptionMenuCancelText: + db "CANCEL@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 16bea473..669d49db 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -17,14 +17,14 @@ ; f6: health returned ; f7: revitalized ; f8: leveled up -DrawPartyMenu_: ; 11875 (4:5875) +DrawPartyMenu_: xor a ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen call UpdateSprites callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics -RedrawPartyMenu_: ; 11886 (4:5886) +RedrawPartyMenu_: ld a,[wPartyMenuTypeOrMessageID] cp a,SWAP_MONS_PARTY_MENU jp z,.printMessage @@ -242,7 +242,7 @@ RedrawPartyMenu_: ; 11886 (4:5886) call PrintText jr .done -PartyMenuItemUseMessagePointers: ; 11a1a (4:5a1a) +PartyMenuItemUseMessagePointers: dw AntidoteText dw BurnHealText dw IceHealText @@ -253,7 +253,7 @@ PartyMenuItemUseMessagePointers: ; 11a1a (4:5a1a) dw ReviveText dw RareCandyText -PartyMenuMessagePointers: ; 11a2c (4:5a2c) +PartyMenuMessagePointers: dw PartyMenuNormalText dw PartyMenuItemUseText dw PartyMenuBattleText @@ -261,65 +261,65 @@ PartyMenuMessagePointers: ; 11a2c (4:5a2c) dw PartyMenuSwapMonText dw PartyMenuItemUseText -PartyMenuNormalText: ; 11a38 (4:5a38) +PartyMenuNormalText: TX_FAR _PartyMenuNormalText db "@" -PartyMenuItemUseText: ; 11a3d (4:5a3d) +PartyMenuItemUseText: TX_FAR _PartyMenuItemUseText db "@" -PartyMenuBattleText: ; 11a42 (4:5a42) +PartyMenuBattleText: TX_FAR _PartyMenuBattleText db "@" -PartyMenuUseTMText: ; 11a47 (4:5a47) +PartyMenuUseTMText: TX_FAR _PartyMenuUseTMText db "@" -PartyMenuSwapMonText: ; 11a4c (4:5a4c) +PartyMenuSwapMonText: TX_FAR _PartyMenuSwapMonText db "@" -PotionText: ; 11a51 (4:5a51) +PotionText: TX_FAR _PotionText db "@" -AntidoteText: ; 11a56 (4:5a56) +AntidoteText: TX_FAR _AntidoteText db "@" -ParlyzHealText: ; 11a5b (4:5a5b) +ParlyzHealText: TX_FAR _ParlyzHealText db "@" -BurnHealText: ; 11a60 (4:5a60) +BurnHealText: TX_FAR _BurnHealText db "@" -IceHealText: ; 11a65 (4:5a65) +IceHealText: TX_FAR _IceHealText db "@" -AwakeningText: ; 11a6a (4:5a6a) +AwakeningText: TX_FAR _AwakeningText db "@" -FullHealText: ; 11a6f (4:5a6f) +FullHealText: TX_FAR _FullHealText db "@" -ReviveText: ; 11a74 (4:5a74) +ReviveText: TX_FAR _ReviveText db "@" -RareCandyText: ; 11a79 (4:5a79) +RareCandyText: TX_FAR _RareCandyText db $0B db $06 db "@" -SetPartyMenuHPBarColor: ; 11a80 (4:5a80) +SetPartyMenuHPBarColor: ld hl, wPartyMenuHPBarColors ld a, [wWhichPartyMenuHPBar] ld c, a diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 373ae580..c9e2cf08 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -1,4 +1,4 @@ -ActivatePC: ; 17cb0 (5:7cb0) +ActivatePC: call SaveScreenTilesToBuffer2 ld a, SFX_TURN_ON_PC call PlaySound @@ -9,7 +9,7 @@ ActivatePC: ; 17cb0 (5:7cb0) set 3, [hl] call LoadScreenTilesFromBuffer2 call Delay3 -PCMainMenu: ; 17ccc (5:7ccc) +PCMainMenu: callba DisplayPCMainMenu ld hl, wFlags_0xcd60 set 5, [hl] @@ -58,19 +58,19 @@ PCMainMenu: ; 17ccc (5:7ccc) call PrintText callba PlayerPC jr ReloadMainMenu -OaksPC: ; 17d44 (5:7d44) +OaksPC: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba OpenOaksPC jr ReloadMainMenu -PKMNLeague: ; 17d56 (5:7d56) +PKMNLeague: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba PKMNLeaguePC jr ReloadMainMenu -BillsPC: ; 17d68 (5:7d68) +BillsPC: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish @@ -83,13 +83,13 @@ BillsPC: ; 17d68 (5:7d68) .printText call PrintText callba BillsPC_ -ReloadMainMenu: ; 17d8a (5:7d8a) +ReloadMainMenu: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call ReloadMapData call UpdateSprites jp PCMainMenu -LogOff: ; 17d97 (5:7d97) +LogOff: ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish @@ -98,24 +98,24 @@ LogOff: ; 17d97 (5:7d97) res 5, [hl] ret -TurnedOnPC1Text: ; 17da7 (5:7da7) +TurnedOnPC1Text: TX_FAR _TurnedOnPC1Text db "@" -AccessedBillsPCText: ; 17dac (5:7dac) +AccessedBillsPCText: TX_FAR _AccessedBillsPCText db "@" -AccessedSomeonesPCText: ; 17db1 (5:7db1) +AccessedSomeonesPCText: TX_FAR _AccessedSomeonesPCText db "@" -AccessedMyPCText: ; 17db6 (5:7db6) +AccessedMyPCText: TX_FAR _AccessedMyPCText db "@" ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent) -RemoveItemByID: ; 17dbb (5:7dbb) +RemoveItemByID: ld hl, wBagItems ld a, [hItemToRemoveID] ld b, a @@ -123,10 +123,10 @@ RemoveItemByID: ; 17dbb (5:7dbb) ld [hItemToRemoveIndex], a .loop ld a, [hli] - cp $ff ; have we reached the cancel button (terminator) + cp -1 ; reached terminator? ret z - cp b ; is the current item the item we want? - jr z, .foundItem ; if so, remove it from the inventory + cp b + jr z, .foundItem inc hl ld a, [hItemToRemoveIndex] inc a diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index 38cdf2f6..1cc02cbf 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -1,4 +1,4 @@ -PlayerPC: ; 778e (1:778e) +PlayerPC: ld a, ITEM_NAME ld [wNameListType], a call SaveScreenTilesToBuffer1 @@ -14,7 +14,7 @@ PlayerPC: ; 778e (1:778e) ld hl, TurnedOnPC2Text call PrintText -PlayerPCMenu: ; 790c (1:790c) +PlayerPCMenu: ld hl, wd730 set 6, [hl] ld a, [wParentMenuItem] @@ -61,7 +61,7 @@ PlayerPCMenu: ; 790c (1:790c) dec a jp z, PlayerPCToss -ExitPlayerPC: ; 7814 (1:7814) +ExitPlayerPC: ld a, [wFlags_0xcd60] bit 3, a ; accessing player's PC through another PC? jr nz, .next @@ -82,7 +82,7 @@ ExitPlayerPC: ; 7814 (1:7814) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -PlayerPCDeposit: ; 783c (1:783c) +PlayerPCDeposit: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -136,7 +136,7 @@ PlayerPCDeposit: ; 783c (1:783c) call PrintText jp .loop -PlayerPCWithdraw: ; 78b9 (1:78b9) +PlayerPCWithdraw: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -190,7 +190,7 @@ PlayerPCWithdraw: ; 78b9 (1:78b9) call PrintText jp .loop -PlayerPCToss: ; 7936 (1:7936) +PlayerPCToss: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -239,64 +239,64 @@ PlayerPCToss: ; 7936 (1:7936) call TossItem ; disallows tossing key items jp .loop -PlayersPCMenuEntries: ; 799c (1:799c) +PlayersPCMenuEntries: db "WITHDRAW ITEM" next "DEPOSIT ITEM" next "TOSS ITEM" next "LOG OFF@" -TurnedOnPC2Text: ; 79c9 (1:79c9) +TurnedOnPC2Text: TX_FAR _TurnedOnPC2Text db "@" -WhatDoYouWantText: ; 79ce (1:79ce) +WhatDoYouWantText: TX_FAR _WhatDoYouWantText db "@" -WhatToDepositText: ; 79d3 (1:79d3) +WhatToDepositText: TX_FAR _WhatToDepositText db "@" -DepositHowManyText: ; 79d8 (1:79d8) +DepositHowManyText: TX_FAR _DepositHowManyText db "@" -ItemWasStoredText: ; 79dd (1:79dd) +ItemWasStoredText: TX_FAR _ItemWasStoredText db "@" -NothingToDepositText: ; 79e2 (1:79e2) +NothingToDepositText: TX_FAR _NothingToDepositText db "@" -NoRoomToStoreText: ; 79e7 (1:79e7) +NoRoomToStoreText: TX_FAR _NoRoomToStoreText db "@" -WhatToWithdrawText: ; 79ec (1:79ec) +WhatToWithdrawText: TX_FAR _WhatToWithdrawText db "@" -WithdrawHowManyText: ; 79f1 (1:79f1) +WithdrawHowManyText: TX_FAR _WithdrawHowManyText db "@" -WithdrewItemText: ; 79f6 (1:79f6) +WithdrewItemText: TX_FAR _WithdrewItemText db "@" -NothingStoredText: ; 79fb (1:79fb) +NothingStoredText: TX_FAR _NothingStoredText db "@" -CantCarryMoreText: ; 7a00 (1:7a00) +CantCarryMoreText: TX_FAR _CantCarryMoreText db "@" -WhatToTossText: ; 7a05 (1:7a05) +WhatToTossText: TX_FAR _WhatToTossText db "@" -TossHowManyText: ; 7a0a (1:7a0a) +TossHowManyText: TX_FAR _TossHowManyText db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 7715500b..166e026d 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -1,4 +1,4 @@ -ShowPokedexMenu: ; 40000 (10:4000) +ShowPokedexMenu: call GBPalWhiteOut call ClearScreen call UpdateSprites @@ -61,7 +61,7 @@ ShowPokedexMenu: ; 40000 (10:4000) ; 00: showed pokemon data or area ; 01: the player chose Quit ; 02: the pokemon has not been seen yet or the player pressed the B button -HandlePokedexSideMenu: ; 40070 (10:4070) +HandlePokedexSideMenu: call PlaceUnfilledArrowMenuCursor ld a, [wCurrentMenuItem] push af @@ -179,7 +179,7 @@ HandlePokedexSideMenu: ; 40070 (10:4070) ; handles the list of pokemon on the left of the pokedex screen ; sets carry flag if player presses A, unsets carry flag if player presses B -HandlePokedexListMenu: ; 40140 (10:4140) +HandlePokedexListMenu: call Pokedex_DrawInterface .loop call Pokedex_PlacePokemonList @@ -255,7 +255,7 @@ HandlePokedexListMenu: ; 40140 (10:4140) and a ret -Pokedex_DrawInterface: ; 401c2 (10:41c2) +Pokedex_DrawInterface: xor a ld [H_AUTOBGTRANSFERENABLED], a ; draw the horizontal line separating the seen and owned amounts from the menu @@ -317,7 +317,7 @@ Pokedex_DrawInterface: ; 401c2 (10:41c2) ld [wDexMaxSeenMon], a ret -DrawPokedexVerticalLine: ; 40243 (10:4243) +DrawPokedexVerticalLine: ld c, 9 ; height of line ld de, SCREEN_WIDTH ; width of screen ld a, $71 ; vertical line tile @@ -329,23 +329,23 @@ DrawPokedexVerticalLine: ; 40243 (10:4243) jr nz, .loop ret -PokedexSeenText: ; 40252 (10:4252) +PokedexSeenText: db "SEEN@" -PokedexOwnText: ; 40257 (10:4257) +PokedexOwnText: db "OWN@" -PokedexContentsText: ; 4025b (10:425b) +PokedexContentsText: db "CONTENTS@" -PokedexMenuItemsText: ; 40264 (10:4264) +PokedexMenuItemsText: db "DATA" next "CRY" next "AREA" next "PRNT" next "QUIT@" -Pokedex_PlacePokemonList: ; 4027c (10:427c) +Pokedex_PlacePokemonList: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 2 @@ -393,7 +393,6 @@ Pokedex_PlacePokemonList: ; 4027c (10:427c) jr nz, .getPokemonName ; if the player has seen the pokemon ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon jr .skipGettingName - .dashedLine ; for unseen pokemon in the list db "----------@" .getPokemonName @@ -420,7 +419,7 @@ Pokedex_PlacePokemonList: ; 4027c (10:427c) ; INPUT: ; [wd11e] = pokedex number ; hl = address of bit field -IsPokemonBitSet: ; 40303 (10:4303) +IsPokemonBitSet: ld a, [wd11e] dec a ld c, a @@ -431,14 +430,14 @@ IsPokemonBitSet: ; 40303 (10:4303) ret ; function to display pokedex data from outside the pokedex -ShowPokedexData: ; 40312 (10:4312) +ShowPokedexData: call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites callab LoadPokedexTilePatterns ; load pokedex tiles ; function to display pokedex data from inside the pokedex -ShowPokedexDataInternal: ; 40323 (10:4323) +ShowPokedexDataInternal: ld hl, wd72c set 1, [hl] ld a, $33 ; 3/7 volume @@ -475,23 +474,23 @@ ShowPokedexDataInternal: ; 40323 (10:4323) ld [rNR50], a ret -HeightWeightText: ; 40370 (10:4370) +HeightWeightText: db "HT ?", $60, "??", $61 next "WT ???lb@" ; XXX does anything point to this? -PokeText: ; 40385 (10:4385) +PokeText: db "#@" ; horizontal line that divides the pokedex text description from the rest of the data -PokedexDataDividerLine: ; 40387 (10:4387) +PokedexDataDividerLine: db $68, $69, $6B, $69, $6B db $69, $6B, $69, $6B, $6B db $6B, $6B, $69, $6B, $69 db $6B, $69, $6B, $69, $6A db "@" -DrawDexEntryOnScreen: ; 4039c (10:439c) +DrawDexEntryOnScreen: call ClearScreen coord hl, 0, 0 @@ -519,10 +518,9 @@ DrawDexEntryOnScreen: ; 4039c (10:439c) ld a, $6c ; lower left corner tile Coorda 0, 17 ld a, $6e ; lower right corner tile - Coorda 19, 17 - coord hl, 0, 9 + coord hl, 0, 9 ld de, PokedexDataDividerLine call PlaceString ; draw horizontal divider line @@ -649,9 +647,9 @@ DrawDexEntryOnScreen: ; 4039c (10:439c) scf ret -Pokedex_PrintFlavorTextAtRow11: ; 404ae (10:44ae) +Pokedex_PrintFlavorTextAtRow11: coord bc, 1, 11 -Pokedex_PrintFlavorTextAtBC: ; 404b1 (10:44b1) +Pokedex_PrintFlavorTextAtBC: ld a, 2 ld [$fff9], a call TextCommandProcessor ; print pokedex description text @@ -659,7 +657,7 @@ Pokedex_PrintFlavorTextAtBC: ; 404b1 (10:44b1) ld [$fff9], a ret -Pokedex_PrepareDexEntryForPrinting: ; 404bc (10:44bc) +Pokedex_PrepareDexEntryForPrinting: coord hl, 0, 0 ld de, SCREEN_WIDTH lb bc, $66, $d @@ -695,7 +693,7 @@ Pokedex_PrepareDexEntryForPrinting: ; 404bc (10:44bc) ; c = number of tile ID's to write ; de = amount to destination address after each tile (1 for horizontal, 20 for vertical) ; hl = destination address -DrawTileLine: ; 40501 (10:4501) +DrawTileLine: push bc push de .loop @@ -709,7 +707,7 @@ DrawTileLine: ; 40501 (10:4501) INCLUDE "data/pokedex_entries.asm" -PokedexToIndex: ; 41086 (10:5086) +PokedexToIndex: ; converts the Pokédex number at wd11e to an index push bc push hl @@ -730,7 +728,7 @@ PokedexToIndex: ; 41086 (10:5086) pop bc ret -IndexToPokedex: ; 4109d (10:509d) +IndexToPokedex: ; converts the indexédex number at wd11e to a Pokédex number push bc push hl diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 0fedcca4..d1b1be3c 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -1,4 +1,4 @@ -CeladonPrizeMenu: ; 5267d (14:667d) +CeladonPrizeMenu: ld b,COIN_CASE call IsItemInBag jr nz,.havingCoinCase @@ -33,7 +33,7 @@ CeladonPrizeMenu: ; 5267d (14:667d) bit 1,a ; keypress = B (Cancel) jr nz, .noChoice ld a,[wCurrentMenuItem] - cp $03 ; "NO,THANKS" choice + cp 3 ; "NO,THANKS" choice jr z, .noChoice call HandlePrizeChoice .noChoice @@ -41,20 +41,20 @@ CeladonPrizeMenu: ; 5267d (14:667d) res 6, [hl] ret -RequireCoinCaseTextPtr: ; 526df (14:66df) +RequireCoinCaseTextPtr: TX_FAR _RequireCoinCaseText db $0D db "@" -ExchangeCoinsForPrizesTextPtr: ; 526e5 (14:66e5) +ExchangeCoinsForPrizesTextPtr: TX_FAR _ExchangeCoinsForPrizesText db "@" -WhichPrizeTextPtr: ; 526ea (14:66ea) +WhichPrizeTextPtr: TX_FAR _WhichPrizeText db "@" -GetPrizeMenuId: ; 526ef (14:66ef) +GetPrizeMenuId: ; determine which one among the three ; prize-texts has been selected ; using the text ID (stored in [hSpriteIndexOrTextID]) @@ -68,7 +68,7 @@ GetPrizeMenuId: ; 526ef (14:66ef) ld [wWhichPrizeWindow], a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a add a - ld d, $0 + ld d, 0 ld e, a ld hl, PrizeDifferentMenuPtrs add hl, de @@ -84,10 +84,10 @@ GetPrizeMenuId: ; 526ef (14:66ef) ld h, [hl] ld l, a ld de, wPrize1Price - ld bc, $6 + ld bc, 6 call CopyData ld a, [wWhichPrizeWindow] - cp $02 ;is TM_menu? + cp 2 ;is TM_menu? jr nz, .putMonName ld a, [wPrize1] ld [wd11e], a @@ -144,21 +144,21 @@ GetPrizeMenuId: ; 526ef (14:66ef) ld c, (1 << 7 | 2) jp PrintBCDNumber -NoThanksText: ; 527a4 (14:67a4) +NoThanksText: db "NO THANKS@" INCLUDE "data/prizes.asm" -PrintPrizePrice: ; 527db (14:67db) +PrintPrizePrice: coord hl, 11, 0 lb bc, 1, 7 call TextBoxBorder call UpdateSprites coord hl, 12, 0 - ld de, CoinString + ld de, .CoinString call PlaceString coord hl, 13, 1 - ld de, SixSpacesString + ld de, .SixSpacesString call PlaceString coord hl, 13, 1 ld de,wPlayerCoins @@ -166,16 +166,16 @@ PrintPrizePrice: ; 527db (14:67db) call PrintBCDNumber ret -CoinString: ; 52805 (14:6805) +.CoinString: db "COIN@" -SixSpacesString: ; 5280a (14:680a) +.SixSpacesString: db " @" -LoadCoinsToSubtract: ; 52811 (14:6811) +LoadCoinsToSubtract: ld a,[wWhichPrize] add a - ld d, $0 + ld d, 0 ld e, a ld hl, wPrize1Price add hl, de ; get selected prize's price @@ -187,17 +187,17 @@ LoadCoinsToSubtract: ; 52811 (14:6811) ld [hCoins + 1], a ret -HandlePrizeChoice: ; 52826 (14:6826) +HandlePrizeChoice: ld a, [wCurrentMenuItem] ld [wWhichPrize], a - ld d, $0 + ld d, 0 ld e, a ld hl, wPrize1 add hl, de ld a, [hl] ld [wd11e], a ld a, [wWhichPrizeWindow] - cp $02 ; is prize a TM? + cp 2 ; is prize a TM? jr nz, .getMonName call GetItemName jr .givePrize @@ -261,35 +261,35 @@ HandlePrizeChoice: ; 52826 (14:6826) ld hl,OhFineThenTextPtr jp PrintText -UnknownData528b1: ; 528b1 (14:68b1) +UnknownPrizeData: ; XXX what's this? db $00,$01,$00,$01,$00,$01,$00,$00,$01 -HereYouGoTextPtr: ; 528ca (14:68ba) +HereYouGoTextPtr: TX_FAR _HereYouGoText db $0D db "@" -SoYouWantPrizeTextPtr: ; 528c0 (14:68c0) +SoYouWantPrizeTextPtr: TX_FAR _SoYouWantPrizeText db "@" -SorryNeedMoreCoinsText: ; 528c5 (14:68c5) +SorryNeedMoreCoinsText: TX_FAR _SorryNeedMoreCoinsText db $0D db "@" -PrizeRoomBagIsFullTextPtr: ; 528cb (14:68cb) +PrizeRoomBagIsFullTextPtr: TX_FAR _OopsYouDontHaveEnoughRoomText db $0D db "@" -OhFineThenTextPtr: ; 528d1 (14:68d1) +OhFineThenTextPtr: TX_FAR _OhFineThenText db $0D ; wait keypress (A/B) without blink db "@" -GetPrizeMonLevel: ; 528d7 (14:68d7) +GetPrizeMonLevel: ld a, [wcf91] ld b, a ld hl, PrizeMonLevelDictionary diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 3eeb1c07..af687432 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -1,13 +1,13 @@ -DisplayStartMenu:: ; 29d1 (0:29d1) +DisplayStartMenu:: switchbank StartMenu_Pokedex ; also bank for other functions ld a, [wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy], a - ld a, $8f ; (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound + ld a, SFX_START_MENU call PlaySound -RedisplayStartMenu:: ; 29e1 (0:29e1) +RedisplayStartMenu:: callba DrawStartMenu -RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9) +RedisplayStartMenu_DoNotDrawStartMenu: callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone call UpdateSprites .loop @@ -23,7 +23,7 @@ RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9) and a jr nz, .loop ; if the player pressed tried to go past the top item, wrap around to the bottom - CheckEvent EVENT_GOT_POKEDEX ; does the player have the pokedex? + CheckEvent EVENT_GOT_POKEDEX ld a, 6 ; there are 7 menu items with the pokedex, so the max index is 6 jr nz, .wrapMenuItemId dec a ; there are only 6 menu items without the pokedex @@ -35,7 +35,7 @@ RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9) bit 7, a jr z, .buttonPressed ; if the player pressed tried to go past the bottom item, wrap around to the top - CheckEvent EVENT_GOT_POKEDEX ; does the player have the pokedex? + CheckEvent EVENT_GOT_POKEDEX ld a, [wCurrentMenuItem] ld c, 7 ; there are 7 menu items with the pokedex jr nz, .checkIfPastBottom @@ -56,7 +56,7 @@ RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9) and a, %00001010 ; was the Start button or B button pressed? jp nz, CloseStartMenu call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2 - CheckEvent EVENT_GOT_POKEDEX ; does the player have the pokedex? + CheckEvent EVENT_GOT_POKEDEX ld a, [wCurrentMenuItem] jr nz, .displayMenuItem inc a ; adjust position to account for missing pokedex menu item @@ -75,7 +75,7 @@ RedisplayStartMenu_DoNotDrawStartMenu: ; 29e9 (0:29e9) jp z, StartMenu_Option ; EXIT falls through to here -CloseStartMenu:: ; 2a72 (0:2a72) +CloseStartMenu:: call Joypad ld a, [hJoyPressed] bit 0, a ; was A button newly pressed? diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 792903b7..94469960 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -1,4 +1,4 @@ -StartMenu_Pokedex: ; 11c22 (4:5c22) +StartMenu_Pokedex: predef ShowPokedexMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call Delay3 @@ -6,7 +6,7 @@ StartMenu_Pokedex: ; 11c22 (4:5c22) call UpdateSprites jp RedisplayStartMenu -StartMenu_Pokemon: ; 11c36 (4:5c36) +StartMenu_Pokemon: ld a,[wPartyCount] and a jp z,RedisplayStartMenu @@ -129,7 +129,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) dw .dig dw .teleport dw .softboiled -.fly ; 11d1b (4:5d1b) +.fly bit 2,a ; does the player have the Thunder Badge? jp z,.newBadgeRequired call CheckIfInOutsideMap @@ -160,7 +160,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) and a jp z,.loop jp CloseTextDisplay -.surf ; 11d66 (4:5d66) +.surf bit 4,a ; does the player have the Soul Badge? jp z,.newBadgeRequired callba IsSurfingAllowed @@ -190,13 +190,13 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) xor a ld [wd473], a jp .loop -.strength ; 11dab (4:5dab) +.strength bit 3,a ; does the player have the Rainbow Badge? jp z,.newBadgeRequired predef PrintStrengthTxt call GBPalWhiteOutWithDelay3 jp .goBackToMap -.flash ; 11dbb (4:5dbb) +.flash bit 0,a ; does the player have the Boulder Badge? jp z,.newBadgeRequired xor a @@ -208,7 +208,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) .flashLightsAreaText TX_FAR _FlashLightsAreaText db "@" -.dig ; 11dd5 (4:5dd5) +.dig ld a,ESCAPE_ROPE ld [wcf91],a ld [wPseudoItemID],a @@ -218,7 +218,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) jp z,.loop call GBPalWhiteOutWithDelay3 jp .goBackToMap -.teleport ; 11ded (4:5ded) +.teleport call CheckIfInOutsideMap jr z,.canTeleport ld a,[wWhichPokemon] @@ -239,7 +239,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) res 4,[hl] ld c,60 call DelayFrames - call GBPalWhiteOutWithDelay3 ; zero all three palettes and wait 3 frames + call GBPalWhiteOutWithDelay3 jp .goBackToMap .warpToLastPokemonCenterText TX_FAR _WarpToLastPokemonCenterText @@ -250,7 +250,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) .cannotFlyHereText TX_FAR _CannotFlyHereText db "@" -.softboiled ; 11e35 (4:5e35) +.softboiled ld hl,wPartyMon1MaxHP ld a,[wWhichPokemon] ld bc,wPartyMon2 - wPartyMon1 @@ -301,7 +301,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) db "@" ; writes a blank tile to all possible menu cursor positions on the party menu -ErasePartyMenuCursors: ; 11e98 (4:5e98) +ErasePartyMenuCursors: coord hl, 0, 1 ld bc,2 * 20 ; menu cursor positions are 2 rows apart ld a,6 ; 6 menu cursor positions @@ -312,11 +312,11 @@ ErasePartyMenuCursors: ; 11e98 (4:5e98) jr nz,.loop ret -ItemMenuLoop: ; 11ea7 (4:5ea7) +ItemMenuLoop: call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen call RunDefaultPaletteCommand -StartMenu_Item: ; 11ead (4:5ead) +StartMenu_Item: ld a,[wLinkState] dec a ; is the player in the Colosseum or Trade Centre? jr nz,.notInCableClubRoom @@ -454,16 +454,16 @@ StartMenu_Item: ; 11ead (4:5ead) .tossZeroItems jp ItemMenuLoop -CannotUseItemsHereText: ; 11fd4 (4:5fd4) +CannotUseItemsHereText: TX_FAR _CannotUseItemsHereText db "@" -CannotGetOffHereText: ; 11fd9 (4:5fd9) +CannotGetOffHereText: TX_FAR _CannotGetOffHereText db "@" ; items which bring up the party menu when used -UsableItems_PartyMenu: ; 11fde (4:5fde) +UsableItems_PartyMenu: db MOON_STONE db ANTIDOTE db BURN_HEAL @@ -503,7 +503,7 @@ UsableItems_PartyMenu: ; 11fde (4:5fde) db $ff ; items which close the item menu when used -UsableItems_CloseMenu: ; 12003 (4:6003) +UsableItems_CloseMenu: db ESCAPE_ROPE db ITEMFINDER db POKE_FLUTE @@ -512,7 +512,7 @@ UsableItems_CloseMenu: ; 12003 (4:6003) db SUPER_ROD db $ff -StartMenu_TrainerInfo: ; 1200a (4:600a) +StartMenu_TrainerInfo: call GBPalWhiteOut call ClearScreen call UpdateSprites @@ -538,7 +538,7 @@ StartMenu_TrainerInfo: ; 1200a (4:600a) jp RedisplayStartMenu_DoNotDrawStartMenu ; loads tile patterns and draws everything except for gym leader faces / badges -DrawTrainerInfo: ; 1204c (4:604c) +DrawTrainerInfo: ld de,RedPicFront lb bc, BANK(RedPicFront), $01 predef DisplayPicCenteredOrUpperRight @@ -627,17 +627,17 @@ DrawTrainerInfo: ; 1204c (4:604c) lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber -TrainerInfo_FarCopyData: ; 12131 (4:6131) +TrainerInfo_FarCopyData: ld a,BANK(TrainerInfoTextBoxTileGraphics) jp FarCopyData -TrainerInfo_NameMoneyTimeText: ; 12136 (4:6136) +TrainerInfo_NameMoneyTimeText: db "NAME/" next "MONEY/" next "TIME/@" ; $76 is a circle tile -TrainerInfo_BadgesText: ; 12149 (4:6149) +TrainerInfo_BadgesText: db $76,"BADGES",$76,"@" ; draws a text box on the trainer info screen @@ -647,7 +647,7 @@ TrainerInfo_BadgesText: ; 12149 (4:6149) ; [wTrainerInfoTextBoxWidthPlus1] = width ; [wTrainerInfoTextBoxWidth] = width - 1 ; [wTrainerInfoTextBoxNextRowOffset] = distance from the end of a text box row to the start of the next -TrainerInfo_DrawTextBox: ; 12152 (4:6152) +TrainerInfo_DrawTextBox: ld a,$79 ; upper left corner tile ID lb de, $7a, $7b ; top edge and upper right corner tile ID's call TrainerInfo_DrawHorizontalEdge ; draw top edge @@ -666,7 +666,7 @@ TrainerInfo_DrawTextBox: ; 12152 (4:6152) ld a,$7d ; lower left corner tile ID lb de,$77, $7e ; bottom edge and lower right corner tile ID's -TrainerInfo_DrawHorizontalEdge: ; 12175 (4:6175) +TrainerInfo_DrawHorizontalEdge: ld [hli],a ; place left corner tile ld a,[wTrainerInfoTextBoxWidth] ld c,a @@ -679,7 +679,7 @@ TrainerInfo_DrawHorizontalEdge: ; 12175 (4:6175) ld [hl],a ; place right corner tile ret -TrainerInfo_NextTextBoxRow: ; 12182 (4:6182) +TrainerInfo_NextTextBoxRow: ld a,[wTrainerInfoTextBoxNextRowOffset] ; distance to the start of the next row .loop inc hl @@ -691,7 +691,7 @@ TrainerInfo_NextTextBoxRow: ; 12182 (4:6182) ; INPUT: ; hl = address of top tile in the line ; a = tile ID -TrainerInfo_DrawVerticalLine: ; 1218a (4:618a) +TrainerInfo_DrawVerticalLine: ld de,20 ld c,8 .loop @@ -701,7 +701,7 @@ TrainerInfo_DrawVerticalLine: ; 1218a (4:618a) jr nz,.loop ret -StartMenu_SaveReset: ; 12195 (4:6195) +StartMenu_SaveReset: ld a,[wd72e] bit 6,a ; is the player using the link feature? jp nz,Init @@ -709,7 +709,7 @@ StartMenu_SaveReset: ; 12195 (4:6195) call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen -StartMenu_Option: ; 121a9 (4:61a9) +StartMenu_Option: xor a ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen @@ -720,7 +720,7 @@ StartMenu_Option: ; 121a9 (4:61a9) call UpdateSprites jp RedisplayStartMenu -SwitchPartyMon: ; 121c5 (4:61c5) +SwitchPartyMon: call SwitchPartyMon_InitVarOrSwapData ; swap data ld a, [wSwappedMenuItem] call SwitchPartyMon_ClearGfx @@ -728,7 +728,7 @@ SwitchPartyMon: ; 121c5 (4:61c5) call SwitchPartyMon_ClearGfx jp RedrawPartyMenu_ -SwitchPartyMon_ClearGfx: ; 121d7 (4:61d7) +SwitchPartyMon_ClearGfx: push af coord hl, 0, 0 ld bc, SCREEN_WIDTH * 2 @@ -754,7 +754,7 @@ SwitchPartyMon_ClearGfx: ; 121d7 (4:61d7) ld a, SFX_SWAP jp PlaySound -SwitchPartyMon_InitVarOrSwapData: ; 12205 (4:6205) +SwitchPartyMon_InitVarOrSwapData: ; This is used to initialise [wMenuItemToSwap] and to actually swap the data. ld a, [wMenuItemToSwap] and a ; has [wMenuItemToSwap] been initialised yet? diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 719cacd1..4adfb543 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -1,15 +1,15 @@ -DrawHP: ; 11468 (4:5468) +DrawHP: ; Draws the HP bar in the stats screen call GetPredefRegisters ld a, $1 jr DrawHP_ -DrawHP2: ; 1146f (4:546f) +DrawHP2: ; Draws the HP bar in the party screen call GetPredefRegisters ld a, $2 -DrawHP_: ; 11474 (4:5474) +DrawHP_: ld [wHPBarType], a push hl ld a, [wLoadedMonHP] @@ -63,7 +63,7 @@ DrawHP_: ; 11474 (4:5474) ; Predef 0x37 -StatusScreen: ; 114cc (4:54cc) +StatusScreen: call LoadMonData ld a, [wMonDataLocation] cp BOX_DATA @@ -209,38 +209,38 @@ StatusScreen: ; 114cc (4:54cc) ld a, [wWhichPokemon] jp SkipFixedLengthTextEntries -OTPointers: ; 1163b (4:563b) +OTPointers: dw wPartyMonOT dw wEnemyMonOT dw wBoxMonOT dw wDayCareMonOT -NamePointers2: ; 11643 (4:5643) +NamePointers2: dw wPartyMonNicks dw wEnemyMonNicks dw wBoxMonNicks dw wDayCareMonName -Type1Text: ; 1164b (4:564b) +Type1Text: db "TYPE1/", $4e -Type2Text: ; 11652 (4:5652) +Type2Text: db "TYPE2/", $4e -IDNoText: ; 11659 (4:5659) +IDNoText: db $73, "№", "/", $4e -OTText: ; 1165d (4:565d) +OTText: db "OT/", $4e, "@" -StatusText: ; 11662 (4:5662) +StatusText: db "STATUS/@" -OKText: ; 1166a (4:566a) +OKText: db "OK@" ; Draws a line starting from hl high b and wide c -DrawLineBox: ; 1166d (4:566d) +DrawLineBox: ld de, SCREEN_WIDTH ; New line .PrintVerticalLine ld [hl], $78 ; │ @@ -257,11 +257,11 @@ DrawLineBox: ; 1166d (4:566d) ld [hl], $6f ; ← (halfarrow ending) ret -PTile: ; 11682 (4:5682) ; This is a single 1bpp "P" tile +PTile: ; This is a single 1bpp "P" tile INCBIN "gfx/p_tile.1bpp" PTileEnd: -PrintStatsBox: ; 1168a (4:568a) +PrintStatsBox: ld a, d and a ; a is 0 from the status screen jr nz, .DifferentBox @@ -294,7 +294,7 @@ PrintStatsBox: ; 1168a (4:568a) call PrintStat ld de, wLoadedMonSpecial jp PrintNumber -PrintStat: ; 116d4 (4:56d4) +PrintStat: push hl call PrintNumber pop hl @@ -302,13 +302,13 @@ PrintStat: ; 116d4 (4:56d4) add hl, de ret -StatsText: ; 116de (4:56de) +StatsText: db "ATTACK" next "DEFENSE" next "SPEED" next "SPECIAL@" -StatusScreen2: ; 116fb (4:56fb) +StatusScreen2: ld a, [hTilesetType] push af xor a @@ -349,11 +349,11 @@ StatusScreen2: ; 116fb (4:56fb) ld c, a ld a, "-" call StatusScreen_PrintPP ; Fill the rest with -- -.InitPP ; 1175e +.InitPP ld hl, wLoadedMonMoves coord de, 14, 10 ld b, 0 -.PrintPP ; 11766 +.PrintPP ld a, [hli] and a jr z, .PPDone @@ -449,7 +449,7 @@ StatusScreen2: ; 116fb (4:56fb) call GBPalWhiteOut jp ClearScreen -CalcExpToLevelUp: ; 11829 (4:5829) +CalcExpToLevelUp: ld a, [wLoadedMonLevel] cp MAX_LEVEL jr z, .atMaxLevel @@ -475,16 +475,16 @@ CalcExpToLevelUp: ; 11829 (4:5829) ld [hl], a ret -StatusScreenExpText: ; 11852 (4:5852) +StatusScreenExpText: db "EXP POINTS" next "LEVEL UP@" -StatusScreen_ClearName: ; 11866 (4:5866) +StatusScreen_ClearName: ld bc, 10 ld a, " " jp FillMemory -StatusScreen_PrintPP: ; 1186e (4:586e) +StatusScreen_PrintPP: ; print PP or -- c times, going down two rows each time ld [hli], a ld [hld], a diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm index 73304118..b1fa78be 100644 --- a/engine/menu/swap_items.asm +++ b/engine/menu/swap_items.asm @@ -1,4 +1,4 @@ -HandleItemListSwapping: ; 68c9 (1:68c9) +HandleItemListSwapping: ld a,[wListMenuID] cp a,ITEMLISTMENU jp nz,DisplayListMenuIDLoop ; only rearrange item list menus @@ -146,4 +146,4 @@ HandleItemListSwapping: ; 68c9 (1:68c9) ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped pop de pop hl - jp DisplayListMenuIDLoop
\ No newline at end of file + jp DisplayListMenuIDLoop diff --git a/engine/menu/text_ids1.asm b/engine/menu/text_ids1.asm index e9f2a4d7..e2fd76f4 100644 --- a/engine/menu/text_ids1.asm +++ b/engine/menu/text_ids1.asm @@ -1,5 +1,5 @@ ; function that performs initialization for DisplayTextID -DisplayTextIDInit: ; 6f0e (1:6f0e) +DisplayTextIDInit: xor a ld [wListMenuID],a ld a,[wAutoTextBoxDrawingControl] @@ -75,7 +75,7 @@ DisplayTextIDInit: ; 6f0e (1:6f0e) ret ; function that displays the start menu -DrawStartMenu: ; 6f80 (1:6f80) +DrawStartMenu: CheckEvent EVENT_GOT_POKEDEX ; menu with pokedex coord hl, 10, 0 @@ -133,31 +133,31 @@ DrawStartMenu: ; 6f80 (1:6f80) res 6,[hl] ; turn pauses between printing letters back on ret -StartMenuPokedexText: ; 7002 (1:7002) +StartMenuPokedexText: db "POKéDEX@" -StartMenuPokemonText: ; 700a (1:700a) +StartMenuPokemonText: db "#MON@" -StartMenuItemText: ; 700f (1:700f) +StartMenuItemText: db "ITEM@" -StartMenuSaveText: ; 7014 (1:7014) +StartMenuSaveText: db "SAVE@" -StartMenuResetText: ; 7019 (1:7019) +StartMenuResetText: db "RESET@" -StartMenuExitText: ; 701f (1:701f) +StartMenuExitText: db "EXIT@" -StartMenuOptionText: ; 7024 (1:7024) +StartMenuOptionText: db "OPTION@" -PrintStartMenuItem: ; 702b (1:702b) +PrintStartMenuItem: push hl call PlaceString pop hl ld de,SCREEN_WIDTH * 2 add hl,de - ret
\ No newline at end of file + ret diff --git a/engine/menu/text_ids2.asm b/engine/menu/text_ids2.asm index 15a43d5f..fbac3986 100644 --- a/engine/menu/text_ids2.asm +++ b/engine/menu/text_ids2.asm @@ -1,5 +1,5 @@ ; function to draw various text boxes -DisplayTextBoxID_: ; 71bf (1:71bf) +DisplayTextBoxID_: ld a,[wTextBoxID] cp a,TWO_OPTION_MENU jp z,DisplayTwoOptionMenu @@ -50,7 +50,7 @@ DisplayTextBoxID_: ; 71bf (1:71bf) ; function to search a table terminated with $ff for a byte matching c in increments of de ; sets carry flag if a match is found and clears carry flag if not -SearchTextBoxTable: ; 7221 (1:7221) +SearchTextBoxTable: dec de .loop ld a,[hli] @@ -73,7 +73,7 @@ SearchTextBoxTable: ; 7221 (1:7221) ; c = width ; d = row of upper left corner ; e = column of upper left corner -GetTextBoxIDCoords: ; 722f (1:722f) +GetTextBoxIDCoords: ld a,[hli] ; column of upper left corner ld e,a ld a,[hli] ; row of upper left corner @@ -89,7 +89,7 @@ GetTextBoxIDCoords: ; 722f (1:722f) ret ; function to load a text address and text coordinates from the TextBoxTextAndCoordTable -GetTextBoxIDText: ; 723c (1:723c) +GetTextBoxIDText: ld a,[hli] ld e,a ld a,[hli] @@ -109,7 +109,7 @@ GetTextBoxIDText: ; 723c (1:723c) ; e = column ; OUTPUT: ; hl = address of upper left corner of text box -GetAddressOfScreenCoords: ; 724a (1:724a) +GetAddressOfScreenCoords: push bc coord hl, 0, 0 ld bc,20 @@ -128,7 +128,7 @@ GetAddressOfScreenCoords: ; 724a (1:724a) ; Format: ; 00: text box ID ; 01-02: function address -TextBoxFunctionTable: ; 725c (1:725c) +TextBoxFunctionTable: dbw MONEY_BOX, DisplayMoneyBox dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu @@ -140,7 +140,7 @@ TextBoxFunctionTable: ; 725c (1:725c) ; 02: row of upper left corner ; 03: column of lower right corner ; 04: row of lower right corner -TextBoxCoordTable: ; 7266 (1:7266) +TextBoxCoordTable: db MESSAGE_BOX, 0, 12, 19, 17 db $03, 0, 0, 19, 14 db $07, 0, 0, 11, 6 @@ -159,7 +159,7 @@ TextBoxCoordTable: ; 7266 (1:7266) ; 07: column of beginning of text ; 08: row of beginning of text ; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row] -TextBoxTextAndCoordTable: ; 7285 (1:7285) +TextBoxTextAndCoordTable: db JP_MOCHIMONO_MENU_TEMPLATE db 0,0,14,17 ; text box coordinates dw JapaneseMochimonoText @@ -217,56 +217,56 @@ TextBoxTextAndCoordTable: ; 7285 (1:7285) ; note that there is no terminator -BuySellQuitText: ; 72e8 (1:72e8) +BuySellQuitText: db "BUY" next "SELL" next "QUIT@@" -UseTossText: ; 72f7 (1:72f7) +UseTossText: db "USE" next "TOSS@" -JapaneseSaveMessageText: ; 7300 (1:7300) +JapaneseSaveMessageText: db "きろく" next "メッセージ@" -JapaneseSpeedOptionsText: ; 7309 (1:7309) +JapaneseSpeedOptionsText: db "はやい" next "おそい@" -MoneyText: ; 7312 (1:7312) +MoneyText: db "MONEY@" -JapaneseMochimonoText: ; 7318 (1:7318) +JapaneseMochimonoText: db "もちもの@" -JapaneseMainMenuText: ; 731d (1:731d) +JapaneseMainMenuText: db "つづきから" next "さいしょから@" -BattleMenuText: ; 732a (1:732a) +BattleMenuText: db "FIGHT ",$E1,$E2 next "ITEM RUN@" -SafariZoneBattleMenuText: ; 733d (1:733d) +SafariZoneBattleMenuText: db "BALL× BAIT" next "THROW ROCK RUN@" -SwitchStatsCancelText: ; 735e (1:735e) +SwitchStatsCancelText: db "SWITCH" next "STATS" next "CANCEL@" -JapaneseAhText: ; 7372 (1:7372) +JapaneseAhText: db "アッ!@" -JapanesePokedexMenu: ; 7376 (1:7376) +JapanesePokedexMenu: db "データをみる" next "なきごえ" next "ぶんぷをみる" next "キャンセル@" -DisplayMoneyBox: ; 738f (1:738f) +DisplayMoneyBox: ld hl, wd730 set 6, [hl] ld a, MONEY_BOX_TEMPLATE @@ -283,10 +283,10 @@ DisplayMoneyBox: ; 738f (1:738f) res 6, [hl] ret -CurrencyString: ; 73b6 (1:73b6) +CurrencyString: db " ¥@" -DoBuySellQuitMenu: ; 73be (1:73be) +DoBuySellQuitMenu: ld a, [wd730] set 6, a ; no printing delay ld [wd730], a @@ -341,7 +341,7 @@ DoBuySellQuitMenu: ; 73be (1:73be) ; b = Y of upper left corner of text region ; c = X of upper left corner of text region ; hl = address where the text box border should be drawn -DisplayTwoOptionMenu: ; 742d (1:742d) +DisplayTwoOptionMenu: push hl ld a, [wd730] set 6, a ; no printing delay @@ -452,7 +452,7 @@ DisplayTwoOptionMenu: ; 742d (1:742d) ; they cover be fully saved/restored by the two functions below. ; The bottom and right edges of the menu may remain after the function returns. -TwoOptionMenu_SaveScreenTiles: ; 74e7 (1:74e7) +TwoOptionMenu_SaveScreenTiles: ld de, wBuffer lb bc, 5, 6 .loop @@ -470,7 +470,7 @@ TwoOptionMenu_SaveScreenTiles: ; 74e7 (1:74e7) jr nz, .loop ret -TwoOptionMenu_RestoreScreenTiles: ; 74ff (1:74ff) +TwoOptionMenu_RestoreScreenTiles: ld de, wBuffer lb bc, 5, 6 .loop @@ -494,7 +494,7 @@ TwoOptionMenu_RestoreScreenTiles: ; 74ff (1:74ff) ; 01: byte height ; 02: byte put blank line before first menu item ; 03: word text pointer -TwoOptionMenuStrings: ; 751a (1:751a) +TwoOptionMenuStrings: db 4,3,0 dw .YesNoMenu db 6,3,0 @@ -527,7 +527,7 @@ TwoOptionMenuStrings: ; 751a (1:751a) .HealCancelMenu ; 757e (1:757e) db "HEAL",$4E,"CANCEL@" -DisplayFieldMoveMonMenu: ; 758a (1:758a) +DisplayFieldMoveMonMenu: xor a ld hl, wFieldMoves ld [hli], a ; wFieldMoves @@ -646,7 +646,7 @@ DisplayFieldMoveMonMenu: ; 758a (1:758a) ld de, PokemonMenuEntries jp PlaceString -FieldMoveNames: ; 7635 (1:7635) +FieldMoveNames: db "CUT@" db "FLY@" db "@" @@ -657,12 +657,12 @@ FieldMoveNames: ; 7635 (1:7635) db "TELEPORT@" db "SOFTBOILED@" -PokemonMenuEntries: ; 766a (1:766a) +PokemonMenuEntries: db "STATS" next "SWITCH" next "CANCEL@" -GetMonFieldMoves: ; 767e (1:767e) +GetMonFieldMoves: ld a, [wWhichPokemon] ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 @@ -719,7 +719,7 @@ GetMonFieldMoves: ; 767e (1:767e) ; Name index = index of name in FieldMoveNames ; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed ; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C -FieldMoveDisplayData: ; 76cb (1:76cb) +FieldMoveDisplayData: db CUT, $01, $0C db FLY, $02, $0C db $B4, $03, $0C ; unused field move @@ -730,4 +730,4 @@ FieldMoveDisplayData: ; 76cb (1:76cb) db TELEPORT, $08, $0A db SOFTBOILED, $09, $08 db $ff ; list terminator -
\ No newline at end of file + diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 74a6aadb..d864141d 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -1,4 +1,4 @@ -VendingMachineMenu: ; 74726 (1d:4726) +VendingMachineMenu: ld hl, VendingMachineText1 call PrintText ld a, MONEY_BOX @@ -79,38 +79,38 @@ VendingMachineMenu: ; 74726 (1d:4726) ld hl, VendingMachineText7 jp PrintText -VendingMachineText1: ; 747de (1d:47de) +VendingMachineText1: TX_FAR _VendingMachineText1 db "@" -DrinkText: ; 747e3 (1d:47e3) +DrinkText: db "FRESH WATER" next "SODA POP" next "LEMONADE" next "CANCEL@" -DrinkPriceText: ; 74808 (1d:4808) +DrinkPriceText: db "¥200" next "¥300" next "¥350",$4E,"@" -VendingMachineText4: ; 74818 (1d:4818) +VendingMachineText4: TX_FAR _VendingMachineText4 db "@" -VendingMachineText5: ; 7481d (1d:481d) +VendingMachineText5: TX_FAR _VendingMachineText5 db "@" -VendingMachineText6: ; 74822 (1d:4822) +VendingMachineText6: TX_FAR _VendingMachineText6 db "@" -VendingMachineText7: ; 74827 (1d:4827) +VendingMachineText7: TX_FAR _VendingMachineText7 db "@" -LoadVendingMachineItem: ; 7482c (1d:482c) +LoadVendingMachineItem: ld hl, VendingPrices ld a, [wCurrentMenuItem] add a @@ -128,7 +128,7 @@ LoadVendingMachineItem: ; 7482c (1d:482c) ld [hVendingMachinePrice + 2], a ret -VendingPrices: ; 74845 (1d:4845) +VendingPrices: db FRESH_WATER money 200 db SODA_POP diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index b4091d9c..6f17f876 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -1,4 +1,4 @@ -AnimatePartyMon_ForceSpeed1: ; 71784 (1c:5784) +AnimatePartyMon_ForceSpeed1: xor a ld [wCurrentMenuItem], a ld b, a @@ -9,7 +9,7 @@ AnimatePartyMon_ForceSpeed1: ; 71784 (1c:5784) ; 0: green ; 1: yellow ; 2: red -AnimatePartyMon: ; 7178c (1c:578c) +AnimatePartyMon: ld hl, wPartyMenuHPBarColors ld a, [wCurrentMenuItem] ld c, a @@ -17,7 +17,7 @@ AnimatePartyMon: ; 7178c (1c:578c) add hl, bc ld a, [hl] -GetAnimationSpeed: ; 71797 (1c:5797) +GetAnimationSpeed: ld c, a ld hl, PartyMonSpeeds add hl, bc @@ -85,15 +85,15 @@ GetAnimationSpeed: ; 71797 (1c:5797) ; The members of the PartyMonSpeeds array specify the number of V-blanks ; that each frame lasts for green HP, yellow HP, and red HP in order. ; On the naming screen, the yellow HP speed is always used. -PartyMonSpeeds: ; 717f6 (1c:57f6) +PartyMonSpeeds: db 5, 16, 32 -LoadMonPartySpriteGfx: ; 717f9 (1c:57f9) +LoadMonPartySpriteGfx: ; Load mon party sprite tile patterns into VRAM during V-blank. ld hl, MonPartySpritePointers ld a, $1e -LoadAnimSpriteGfx: ; 717fe (1c:57fe) +LoadAnimSpriteGfx: ; Load animated sprite tile patterns into VRAM during V-blank. hl is the address ; of an array of structures that contain arguments for CopyVideoData and a is ; the number of structures in the array. @@ -125,7 +125,7 @@ LoadAnimSpriteGfx: ; 717fe (1c:57fe) jr nz, .loop ret -LoadMonPartySpriteGfxWithLCDDisabled: ; 7181e (1c:581e) +LoadMonPartySpriteGfxWithLCDDisabled: ; Load mon party sprite tile patterns into VRAM immediately by disabling the ; LCD. call DisableLCD @@ -162,7 +162,7 @@ LoadMonPartySpriteGfxWithLCDDisabled: ; 7181e (1c:581e) jr nz, .loop jp EnableLCD -MonPartySpritePointers: ; 7184d (1c:584d) +MonPartySpritePointers: dw SlowbroSprite + $c0 db $40 / $10 ; 40 bytes db BANK(SlowbroSprite) @@ -313,7 +313,7 @@ MonPartySpritePointers: ; 7184d (1c:584d) db BANK(MonPartySprites) dw vSprites + $780 -WriteMonPartySpriteOAMByPartyIndex: ; 71901 (1c:5901) +WriteMonPartySpriteOAMByPartyIndex: ; Write OAM blocks for the party mon in [hPartyMonIndex]. push hl push de @@ -344,7 +344,7 @@ WriteMonPartySpriteOAMByPartyIndex: ; 71901 (1c:5901) pop hl ret -WriteMonPartySpriteOAMBySpecies: ; 7192f (1c:592f) +WriteMonPartySpriteOAMBySpecies: ; Write OAM blocks for the party sprite of the species in ; [wMonPartySpriteSpecies]. xor a @@ -354,7 +354,7 @@ WriteMonPartySpriteOAMBySpecies: ; 7192f (1c:592f) ld [wOAMBaseTile], a jr WriteMonPartySpriteOAM -UnusedPartyMonSpriteFunction: ; 7193d (1c:593d) +UnusedPartyMonSpriteFunction: ; This function is unused and doesn't appear to do anything useful. It looks ; like it may have been intended to load the tile patterns and OAM data for ; the mon party sprite associated with the species in [wcf91]. @@ -372,7 +372,7 @@ UnusedPartyMonSpriteFunction: ; 7193d (1c:593d) ld [wMonPartySpriteSpecies], a jr WriteMonPartySpriteOAMBySpecies -.LoadTilePatterns ; 71959 (1c:5959) +.LoadTilePatterns push hl add a ld c, a @@ -392,7 +392,7 @@ UnusedPartyMonSpriteFunction: ; 7193d (1c:593d) pop hl jp CopyVideoData -WriteMonPartySpriteOAM: ; 71970 (1c:5970) +WriteMonPartySpriteOAM: ; Write the OAM blocks for the first animation frame into the OAM buffer and ; make a copy at wMonPartySpritesSavedOAM. push af @@ -418,7 +418,7 @@ WriteMonPartySpriteOAM: ; 71970 (1c:5970) ld bc, $60 jp CopyData -GetPartyMonSpriteID: ; 71996 (1c:5996) +GetPartyMonSpriteID: ld [wd11e], a predef IndexToPokedex ld a, [wd11e] @@ -441,5 +441,5 @@ GetPartyMonSpriteID: ; 71996 (1c:5996) INCLUDE "data/mon_party_sprites.asm" -MonPartySprites: ; 71a06 (1c:5a06) +MonPartySprites: INCBIN "gfx/mon_ow_sprites.2bpp" diff --git a/engine/move_mon.asm b/engine/move_mon.asm index a14ed9ca..3471875e 100644 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1,4 +1,4 @@ -_MoveMon: ; f3a4 (3:73a4) +_MoveMon: ld a, [wMoveMonType] and a jr z, .checkPartyMonSlots @@ -169,4 +169,4 @@ _MoveMon: ; f3a4 (3:73a4) call CalcStats .asm_f4ea and a - ret
\ No newline at end of file + ret diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index 6ff427c6..2bc26de2 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -1,4 +1,4 @@ -_Multiply: ; f660e (3d:660e) +_Multiply: ld a, $8 ld b, a xor a @@ -60,7 +60,7 @@ _Multiply: ; f660e (3d:660e) ld [H_PRODUCT], a ; $ff95 ret -_Divide: ; f6672 (3d:6672) +_Divide: xor a ld [H_DIVIDEBUFFER], a ; ff9a ld [H_DIVIDEBUFFER+1], a ; ff9b diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 2726c651..38fe66f9 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -1,4 +1,4 @@ -SetDefaultNames: ; 5e27 (1:5e27) +SetDefaultNames: ld a, [wLetterPrintingDelayFlags] push af ld a, [wOptions] @@ -40,7 +40,7 @@ SetDefaultNames: ; 5e27 (1:5e27) call CopyData ; rip optimizations ret -OakSpeech: ; 5e85 (1:5e85) +OakSpeech: call StopAllMusic ; stop music ld a, BANK(Music_Routes2) ld c,a @@ -158,25 +158,25 @@ OakSpeech: ; 5e85 (1:5e85) call ClearScreen ; rip more tail-end optimizations ret -OakSpeechText1: ; 5fb9 (1:5fb9) +OakSpeechText1: TX_FAR _OakSpeechText1 db "@" -OakSpeechText2: ; 5fbe (1:5fbe) +OakSpeechText2: TX_FAR _OakSpeechText2A db $14 ; play NIDORINA cry from TextCommandSounds TX_FAR _OakSpeechText2B db "@" -IntroducePlayerText: ; 5fc8 (1:5fc8) +IntroducePlayerText: TX_FAR _IntroducePlayerText db "@" -IntroduceRivalText: ; 5fcd (1:5fcd) +IntroduceRivalText: TX_FAR _IntroduceRivalText db "@" -OakSpeechText3: ; 5fd2 (1:5fd2) +OakSpeechText3: TX_FAR _OakSpeechText3 db "@" -FadeInIntroPic: ; 5fd7 (1:5fd7) +FadeInIntroPic: ld hl,IntroFadePalettes ld b,6 .next @@ -189,7 +189,7 @@ FadeInIntroPic: ; 5fd7 (1:5fd7) jr nz,.next ret -IntroFadePalettes: ; 5feb (1:5feb) +IntroFadePalettes: db %01010100 db %10101000 db %11111100 @@ -197,7 +197,7 @@ IntroFadePalettes: ; 5feb (1:5feb) db %11110100 db %11100100 -MovePicLeft: ; 5ff1 (1:5ff1) +MovePicLeft: ld a,119 ld [rWX],a call DelayFrame @@ -214,9 +214,9 @@ MovePicLeft: ; 5ff1 (1:5ff1) ld [rWX],a jr .next -DisplayPicCenteredOrUpperRight: ; 600d (1:600d) +DisplayPicCenteredOrUpperRight: call GetPredefRegisters -IntroDisplayPicCenteredOrUpperRight: ; 6010 (1:6010) +IntroDisplayPicCenteredOrUpperRight: ; b = bank ; de = address of compressed pic ; c: 0 = centred, non-zero = upper-right @@ -241,4 +241,4 @@ IntroDisplayPicCenteredOrUpperRight: ; 6010 (1:6010) .next xor a ld [hStartTileID],a - predef_jump CopyUncompressedPicToTilemap
\ No newline at end of file + predef_jump CopyUncompressedPicToTilemap diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 5eeb5ea9..80f1bafc 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -1,4 +1,4 @@ -ChoosePlayerName: ; 66db (1:66db) +ChoosePlayerName: call OakSpeechSlidePicRight ld de, DefaultNamesPlayer call DisplayIntroNameTextBox @@ -27,11 +27,11 @@ ChoosePlayerName: ; 66db (1:66db) ld hl, YourNameIsText jp PrintText -YourNameIsText: ; 671d (1:671d) +YourNameIsText: TX_FAR _YourNameIsText db "@" -ChooseRivalName: ; 6722 (1:6722) +ChooseRivalName: call OakSpeechSlidePicRight ld de, DefaultNamesRival call DisplayIntroNameTextBox @@ -60,11 +60,11 @@ ChooseRivalName: ; 6722 (1:6722) ld hl, HisNameIsText jp PrintText -HisNameIsText: ; 6765 (1:6765) +HisNameIsText: TX_FAR _HisNameIsText db "@" -OakSpeechSlidePicLeft: ; 676a (1:676a) +OakSpeechSlidePicLeft: push de coord hl, 0, 0 lb bc, 12, 11 @@ -81,12 +81,12 @@ OakSpeechSlidePicLeft: ; 676a (1:676a) ld a, $ff jr OakSpeechSlidePicCommon -OakSpeechSlidePicRight: ; 6790 (1:6790) +OakSpeechSlidePicRight: coord hl, 5, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 xor a -OakSpeechSlidePicCommon: ; 6797 (1:6797) +OakSpeechSlidePicCommon: push hl push de push bc @@ -160,7 +160,7 @@ OakSpeechSlidePicCommon: ; 6797 (1:6797) pop hl ret -DisplayIntroNameTextBox: ; 67ec (1:67ec) +DisplayIntroNameTextBox: push de coord hl, 0, 0 lb bc, 10, 9 @@ -184,24 +184,24 @@ DisplayIntroNameTextBox: ; 67ec (1:67ec) ld [wMaxMenuItem], a jp HandleMenuInput -.namestring ; 6822 (1:6822) +.namestring db "NAME@" -DefaultNamesPlayer: ; 6827 (1:6827) +DefaultNamesPlayer: db "NEW NAME" next "YELLOW" next "ASH" next "JACK" db "@" -DefaultNamesRival: ; 6840 (1:6840) +DefaultNamesRival: db "NEW NAME" next "BLUE" next "GARY" next "JOHN" db "@" -GetDefaultName: ; 6858 (1:6858) +GetDefaultName: ; a = name index ; hl = name list ld b, a @@ -225,17 +225,17 @@ GetDefaultName: ; 6858 (1:6858) ld bc, $14 jp CopyData -DefaultNamesPlayerList: ; 687d (1:687d) +DefaultNamesPlayerList: db "NEW NAME@" db "YELLOW@" db "ASH@" db "JACK@" -DefaultNamesRivalList: ; 688d (1:688d) +DefaultNamesRivalList: db "NEW NAME@" db "BLUE@" db "GARY@" db "JOHN@" -TextTerminator_6b20: ; 68a5 (1:68a5) +TextTerminator_6b20: db "@" diff --git a/engine/overworld/advance_player_sprite.asm b/engine/overworld/advance_player_sprite.asm index 758dd558..6b4a0cbb 100644 --- a/engine/overworld/advance_player_sprite.asm +++ b/engine/overworld/advance_player_sprite.asm @@ -1,4 +1,4 @@ -_AdvancePlayerSprite:: ; f010c (3c:410c) +_AdvancePlayerSprite:: ld a,[wSpriteStateData1 + 3] ; delta Y ld b,a ld a,[wSpriteStateData1 + 5] ; delta X @@ -192,7 +192,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ld [hSCX],a ; update background scroll X ret -MoveTileBlockMapPointerEast:: ; f0248 (3c:4248) +MoveTileBlockMapPointerEast:: ld a,[de] add $1 ld [de],a @@ -203,7 +203,7 @@ MoveTileBlockMapPointerEast:: ; f0248 (3c:4248) ld [de],a ret -MoveTileBlockMapPointerWest:: ; f0252 (3c:4252) +MoveTileBlockMapPointerWest:: ld a,[de] sub $1 ld [de],a @@ -214,7 +214,7 @@ MoveTileBlockMapPointerWest:: ; f0252 (3c:4252) ld [de],a ret -MoveTileBlockMapPointerSouth:: ; f025c (3c:425c) +MoveTileBlockMapPointerSouth:: add $6 ld b,a ld a,[de] @@ -227,7 +227,7 @@ MoveTileBlockMapPointerSouth:: ; f025c (3c:425c) ld [de],a ret -MoveTileBlockMapPointerNorth:: ; f0268 (3c:4268) +MoveTileBlockMapPointerNorth:: add $6 ld b,a ld a,[de] @@ -238,4 +238,4 @@ MoveTileBlockMapPointerNorth:: ; f0268 (3c:4268) ld a,[de] dec a ld [de],a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/boulders.asm b/engine/overworld/boulders.asm index edfda2d3..669b7b83 100644 --- a/engine/overworld/boulders.asm +++ b/engine/overworld/boulders.asm @@ -1,4 +1,4 @@ -CheckForCollisionWhenPushingBoulder: ; c356 (3:4356) +CheckForCollisionWhenPushingBoulder: call GetTileTwoStepsInFrontOfPlayer call IsTilePassable jr c, .done @@ -16,7 +16,7 @@ CheckForCollisionWhenPushingBoulder: ; c356 (3:4356) ret ; sets a to $ff if there is a collision and $00 if there is no collision -CheckForBoulderCollisionWithSprites: ; c378 (3:4378) +CheckForBoulderCollisionWithSprites: ld a, [wBoulderSpriteIndex] dec a swap a @@ -91,4 +91,4 @@ CheckForBoulderCollisionWithSprites: ; c378 (3:4378) ret .success xor a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index bc1a553a..e3ce8e8d 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,4 +1,4 @@ -CableClubNPC: ; 7035 (1:7035) +CableClubNPC: ld hl, CableClubNPCWelcomeText call PrintText call CheckPikachuFollowingPlayer @@ -118,7 +118,7 @@ CableClubNPC: ; 7035 (1:7035) ret ; seems to be similar of Serial_SyncAndExchangeNybble -Serial_SyncAndExchangeNybbleDouble: ; 7131 (1:7131) +Serial_SyncAndExchangeNybbleDouble: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a .loop @@ -166,35 +166,35 @@ Serial_SyncAndExchangeNybbleDouble: ; 7131 (1:7131) ld [wUnknownSerialCounter + 1], a ret -CableClubNPCAreaReservedFor2FriendsLinkedByCableText: ; 7188 (1:7188) +CableClubNPCAreaReservedFor2FriendsLinkedByCableText: TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText db "@" -CableClubNPCWelcomeText: ; 718d (1:718d) +CableClubNPCWelcomeText: TX_FAR _CableClubNPCWelcomeText db "@" -CableClubNPCPleaseApplyHereHaveToSaveText: ; 7192 (1:7192) +CableClubNPCPleaseApplyHereHaveToSaveText: TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText db "@" -CableClubNPCPleaseWaitText: ; 7197 (1:7197) +CableClubNPCPleaseWaitText: TX_FAR _CableClubNPCPleaseWaitText db $a, "@" -CableClubNPCLinkClosedBecauseOfInactivityText: ; 719d (1:719d) +CableClubNPCLinkClosedBecauseOfInactivityText: TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText db "@" -CableClubNPCPleaseComeAgainText: ; 71a2 (1:71a2) +CableClubNPCPleaseComeAgainText: TX_FAR _CableClubNPCPleaseComeAgainText db "@" -CableClubNPCMakingPreparationsText: ; 71a7 (1:71a7) +CableClubNPCMakingPreparationsText: TX_FAR _CableClubNPCMakingPreparationsText db "@" -CloseLinkConnection: ; 71ac (1:71ac) +CloseLinkConnection: call Delay3 ld a, CONNECTION_NOT_ESTABLISHED ld [hSerialConnectionStatus], a diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 3560c8e8..e1fc9160 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -1,4 +1,4 @@ -PrintCardKeyText: ; 525d8 (14:65d8) +PrintCardKeyText: ld hl, SilphCoMapList ld a, [wCurMap] ld b, a @@ -59,7 +59,7 @@ PrintCardKeyText: ; 525d8 (14:65d8) ld [hSpriteIndexOrTextID], a jp PrintPredefTextID -SilphCoMapList: ; 52645 (14:6645) +SilphCoMapList: db SILPH_CO_2F db SILPH_CO_3F db SILPH_CO_4F @@ -72,19 +72,19 @@ SilphCoMapList: ; 52645 (14:6645) db SILPH_CO_11F db $FF -CardKeySuccessText: ; 52650 (14:6650) +CardKeySuccessText: TX_FAR _CardKeySuccessText1 TX_SFX_ITEM TX_FAR _CardKeySuccessText2 db "@" -CardKeyFailText: ; 5265a (14:665a) +CardKeyFailText: TX_FAR _CardKeyFailText db "@" ; d = Y ; e = X -GetCoordsInFrontOfPlayer: ; 5265f (14:665f) +GetCoordsInFrontOfPlayer: ld a, [wYCoord] ld d, a ld a, [wXCoord] diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm index 5dd91c4c..5fad4fc5 100644 --- a/engine/overworld/check_player_state.asm +++ b/engine/overworld/check_player_state.asm @@ -1,5 +1,5 @@ ; only used for setting bit 2 of wd736 upon entering a new map -IsPlayerStandingOnWarp: ; c0a6 (3:40a6) +IsPlayerStandingOnWarp: ld a, [wNumberOfWarps] and a ret z @@ -31,7 +31,7 @@ IsPlayerStandingOnWarp: ; c0a6 (3:40a6) jr nz, .loop ret -CheckForceBikeOrSurf: ; c0d2 (3:40d2) +CheckForceBikeOrSurf: ld hl, wd732 bit 5, [hl] ret nz @@ -86,7 +86,7 @@ CheckForceBikeOrSurf: ; c0d2 (3:40d2) INCLUDE "data/force_bike_surf.asm" -IsPlayerFacingEdgeOfMap: ; c148 (3:4148) +IsPlayerFacingEdgeOfMap: push hl push de push bc @@ -152,7 +152,7 @@ IsPlayerFacingEdgeOfMap: ; c148 (3:4148) scf ret -IsWarpTileInFrontOfPlayer: ; c197 (3:4197) +IsWarpTileInFrontOfPlayer: push hl push de push bc @@ -178,7 +178,7 @@ IsWarpTileInFrontOfPlayer: ; c197 (3:4197) pop hl ret -.warpTileListPointers: ; c1c0 (3:41c0) +.warpTileListPointers: dw .facingDownWarpTiles dw .facingUpWarpTiles dw .facingLeftWarpTiles @@ -206,7 +206,7 @@ IsWarpTileInFrontOfPlayer: ; c197 (3:4197) and a jr .done -IsPlayerStandingOnDoorTileOrWarpTile: ; c1e6 (3:41e6) +IsPlayerStandingOnDoorTileOrWarpTile: push hl push de push bc @@ -233,4 +233,4 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c1e6 (3:41e6) pop hl ret -INCLUDE "data/warp_tile_ids.asm"
\ No newline at end of file +INCLUDE "data/warp_tile_ids.asm" diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index f7c5e326..13313746 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -1,4 +1,4 @@ -GiveFossilToCinnabarLab: ; 61006 (18:5006) +GiveFossilToCinnabarLab: ld hl, wd730 set 6, [hl] xor a @@ -72,23 +72,23 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) call PrintText ret -LabFossil_610ae: ; 610ae (18:50ae) +LabFossil_610ae: TX_FAR _Lab4Text_610ae db "@" -LabFossil_610b3: ; 610b3 (18:50b3) +LabFossil_610b3: TX_FAR _Lab4Text_610b3 db "@" -LabFossil_610b8: ; 610b8 (18:50b8) +LabFossil_610b8: TX_FAR _Lab4Text_610b8 db "@" -LabFossil_610bd: ; 610bd (18:50bd) +LabFossil_610bd: TX_FAR _Lab4Text_610bd db "@" -PrintFossilsInBag: ; 610c2 (18:50c2) +PrintFossilsInBag: ; Prints each fossil in the player's bag on a separate line in the menu. ld hl, wFilteredBagItems xor a @@ -112,7 +112,7 @@ PrintFossilsInBag: ; 610c2 (18:50c2) jr .loop ; loads the names of the fossil item and the resulting mon -LoadFossilItemAndMonName: ; 610eb (18:50eb) +LoadFossilItemAndMonName: ld a, [wFossilMon] ld [wd11e], a call GetMonName diff --git a/engine/overworld/clear_loadmapdata_vars.asm b/engine/overworld/clear_loadmapdata_vars.asm index 2e7cd165..c5dc21fa 100644 --- a/engine/overworld/clear_loadmapdata_vars.asm +++ b/engine/overworld/clear_loadmapdata_vars.asm @@ -1,4 +1,4 @@ -ClearVariablesAfterLoadingMapData: ; c07c (3:407c) +ClearVariablesAfterLoadingMapData: ld a, $90 ld [hWY], a ld [rWY], a @@ -14,7 +14,7 @@ ClearVariablesAfterLoadingMapData: ; c07c (3:407c) ld hl, wCardKeyDoorY ld [hli], a ld [hl], a - ld hl, wWhichTrade - ld bc, $1e + ld hl, wUnusedCD3D + ld bc, wStandingOnWarpPadOrHole - wUnusedCD3D call FillMemory - ret
\ No newline at end of file + ret diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 488bc4de..462e3e8e 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,4 +1,4 @@ -UsedCut: ; edd1 (3:6dd1) +UsedCut: xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value ld a, [wCurMapTileset] @@ -67,11 +67,11 @@ UsedCut: ; edd1 (3:6dd1) call UpdateSprites jp RedrawMapView -UsedCutText: ; ee6f (3:6e6f) +UsedCutText: TX_FAR _UsedCutText db "@" -InitCutAnimOAM: ; ee74 (3:6e74) +InitCutAnimOAM: xor a ld [wWhichAnimationOffsets], a ld a, %11100100 @@ -112,22 +112,22 @@ InitCutAnimOAM: ; ee74 (3:6e74) jr nz, .loop ret -LoadCutGrassAnimationTilePattern: ; eecc (3:6ecc) +LoadCutGrassAnimationTilePattern: ld de, AnimationTileset2 + $60 ; tile depicting a leaf lb bc, BANK(AnimationTileset2), $01 jp CopyVideoData -WriteCutOrBoulderDustAnimationOAMBlock: ; eed5 (3:6ed5) +WriteCutOrBoulderDustAnimationOAMBlock: call GetCutOrBoulderDustAnimationOffsets ld a, $9 ld de, CutOrBoulderDustAnimationTilesAndAttributes jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: ; eee0 (3:6ee0) +CutOrBoulderDustAnimationTilesAndAttributes: db $FC,$14,$FD,$14 db $FE,$14,$FF,$14 -GetCutOrBoulderDustAnimationOffsets: ; eee8 (3:6ee8) +GetCutOrBoulderDustAnimationOffsets: ld hl, wSpriteStateData1 + 4 ld a, [hli] ; player's sprite screen Y position ld b, a @@ -158,14 +158,14 @@ GetCutOrBoulderDustAnimationOffsets: ; eee8 (3:6ee8) ld c, a ret -CutAnimationOffsets: ; ef0f (3:6f0f) +CutAnimationOffsets: ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn db 8, 36 ; player is facing down db 8, 4 ; player is facing up db -8, 20 ; player is facing left db 24, 20 ; player is facing right -BoulderDustAnimationOffsets: ; ef17 (3:6f17) +BoulderDustAnimationOffsets: ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn ; These offsets represent 2 blocks away from the player db 8, 52 ; player is facing down @@ -173,7 +173,7 @@ BoulderDustAnimationOffsets: ; ef17 (3:6f17) db -24, 20 ; player is facing left db 40, 20 ; player is facing right -ReplaceTreeTileBlock: ; ef1f (3:6f1f) +ReplaceTreeTileBlock: ; Determine the address of the tile block that contains the tile in front of the ; player (i.e. where the tree is) and replace it with the corresponding tile ; block that doesn't have the tree. @@ -249,7 +249,7 @@ ReplaceTreeTileBlock: ; ef1f (3:6f1f) ld [hl], a ret -CutTreeBlockSwaps: ; ef80 (3:6f80) +CutTreeBlockSwaps: ; first byte = tileset block containing the cut tree ; second byte = corresponding tileset block after the cut animation happens db $32, $6D diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 9bb4ee2c..37490f95 100755 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm @@ -1,4 +1,4 @@ -AnimCut: ; 7a037 (1e:6037) +AnimCut: ld a, [wCutTile] cp $52 jr z, .grass @@ -44,7 +44,7 @@ AnimCut: ; 7a037 (1e:6037) jr nz, .cutGrassLoop ret -AnimCutGrass_UpdateOAMEntries: ; 7a091 (1e:6091) +AnimCutGrass_UpdateOAMEntries: push bc ld hl, wOAMBuffer + $91 ld a, 1 @@ -76,7 +76,7 @@ AnimCutGrass_UpdateOAMEntries: ; 7a091 (1e:6091) jr nz, AnimCutGrass_UpdateOAMEntries ret -AnimCutGrass_SwapOAMEntries: ; 7a0d7 (1e:60d7) +AnimCutGrass_SwapOAMEntries: ld hl, wOAMBuffer + $90 ld de, wBuffer ld bc, $8 diff --git a/engine/overworld/daycare_exp.asm b/engine/overworld/daycare_exp.asm index a7c7bd91..dbe4023a 100644 --- a/engine/overworld/daycare_exp.asm +++ b/engine/overworld/daycare_exp.asm @@ -1,4 +1,4 @@ -IncrementDayCareMonExp: ; c684 (3:4684) +IncrementDayCareMonExp: ld a, [wDayCareInUse] and a ret z @@ -15,4 +15,4 @@ IncrementDayCareMonExp: ; c684 (3:4684) ret c ld a, $50 ld [hl], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 3f7b5f0f..8bde8600 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -1,5 +1,5 @@ ; returns whether the player is standing on a door tile in carry -IsPlayerStandingOnDoorTile: ; 1a785 (6:6785) +IsPlayerStandingOnDoorTile: push de ld hl, DoorTileIDPointers ld a, [wCurMapTileset] @@ -25,7 +25,7 @@ IsPlayerStandingOnDoorTile: ; 1a785 (6:6785) and a ret -DoorTileIDPointers: ; 1a7a8 (6:67a8) +DoorTileIDPointers: dbw OVERWORLD, OverworldDoorTileIDs dbw FOREST, ForestDoorTileIDs dbw MART, MartDoorTileIDs @@ -42,38 +42,38 @@ DoorTileIDPointers: ; 1a7a8 (6:67a8) dbw INTERIOR, InteriorDoorTileIDs db $ff -OverworldDoorTileIDs: ; 1a7d3 (6:67d3) +OverworldDoorTileIDs: db $1B,$58,$00 -ForestDoorTileIDs: ; 1a7d6 (6:67d6) +ForestDoorTileIDs: db $3a,$00 -MartDoorTileIDs: ; 1a7d8 (6:67d8) +MartDoorTileIDs: db $5e,$00 -HouseDoorTileIDs: ; 1a7da (6:67da) +HouseDoorTileIDs: db $54,$00 -TilesetMuseumDoorTileIDs: ; 1a7dc (6:67dc) +TilesetMuseumDoorTileIDs: db $3b,$00 -ShipDoorTileIDs: ; 1a7de (6:67de) +ShipDoorTileIDs: db $1e,$00 -LobbyDoorTileIDs: ; 1a7e0 (6:67e0) +LobbyDoorTileIDs: db $1c,$38,$1a,$00 -MansionDoorTileIDs: ; 1a7e4 (6:67e4) +MansionDoorTileIDs: db $1a,$1c,$53,$00 -LabDoorTileIDs: ; 1a7e8 (6:67e8) +LabDoorTileIDs: db $34,$00 -FacilityDoorTileIDs: ; 1a7ea (6:67ea) +FacilityDoorTileIDs: db $43,$58,$1b,$00 -PlateauDoorTileIDs: ; 1a7ee (6:67ee) +PlateauDoorTileIDs: db $3b,$1b,$00 -InteriorDoorTileIDs: ; 1a7f1 (6:67f1) +InteriorDoorTileIDs: db $04,$15,$00 diff --git a/engine/overworld/dungeon_warps.asm b/engine/overworld/dungeon_warps.asm index b234c3a1..f47dfb01 100644 --- a/engine/overworld/dungeon_warps.asm +++ b/engine/overworld/dungeon_warps.asm @@ -1,4 +1,4 @@ -IsPlayerOnDungeonWarp: ; 46bf3 (11:6bf3) +IsPlayerOnDungeonWarp: xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -12,4 +12,4 @@ IsPlayerOnDungeonWarp: ; 46bf3 (11:6bf3) set 4, [hl] ld hl, wd732 set 4, [hl] - ret
\ No newline at end of file + ret diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index b355102f..cd7bf5ba 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -1,4 +1,4 @@ -ShakeElevator: ; 75f07 (1d:5f07) +ShakeElevator: ld de, -$20 call ShakeElevatorRedrawRow ld de, SCREEN_HEIGHT * $20 @@ -37,7 +37,7 @@ ShakeElevator: ; 75f07 (1d:5f07) call UpdateSprites jp PlayDefaultMusic -ShakeElevatorRedrawRow: ; 75f52 (1d:5f52) +ShakeElevatorRedrawRow: ; This function is used to redraw certain portions of the screen, but it does ; not appear to ever result in any visible effect, so this function seems to ; be pointless. diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index f002deed..3b02fd55 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -1,9 +1,9 @@ -EmotionBubble: ; 4116f (10:516f) +EmotionBubble: ld a, [wWhichEmotionBubble] and $f swap a ld c, a - ld b, $0 + ld b, 0 ld hl, EmotionBubbles add hl, bc ; each emotion bubble is 16 bytes, so calculate the offset directly instead of with a pointer table add hl, bc @@ -64,11 +64,11 @@ EmotionBubble: ; 4116f (10:516f) call DelayFrame call UpdateSprites ret - ; jp UpdateSprites -EmotionBubblesOAM: ; 411dd (5:51dd) + +EmotionBubblesOAM: db $F8,$00,$F9,$00 db $FA,$00,$FB,$00 -EmotionBubbles: ; 411e5 (10:51e5) +EmotionBubbles: INCBIN "gfx/emotion_bubbles.2bpp" diff --git a/engine/overworld/get_coords_tile_in_front_of_player.asm b/engine/overworld/get_coords_tile_in_front_of_player.asm index 1003570b..e8bbc660 100644 --- a/engine/overworld/get_coords_tile_in_front_of_player.asm +++ b/engine/overworld/get_coords_tile_in_front_of_player.asm @@ -1,7 +1,7 @@ -GetTileAndCoordsInFrontOfPlayer: ; c2d4 (3:42d1) +GetTileAndCoordsInFrontOfPlayer: call GetPredefRegisters -_GetTileAndCoordsInFrontOfPlayer: ; c2d4 (3:42d4) +_GetTileAndCoordsInFrontOfPlayer: ld a, [wYCoord] ld d, a ld a, [wXCoord] @@ -38,7 +38,7 @@ _GetTileAndCoordsInFrontOfPlayer: ; c2d4 (3:42d4) ld [wTileInFrontOfPlayer], a ret -GetTileTwoStepsInFrontOfPlayer: ; c309 (3:4309) +GetTileTwoStepsInFrontOfPlayer: xor a ld [$ffdb], a ld hl, wYCoord @@ -84,4 +84,4 @@ GetTileTwoStepsInFrontOfPlayer: ; c309 (3:4309) ld c, a ld [wTileInFrontOfBoulderAndBoulderCollisionResult], a ld [wTileInFrontOfPlayer], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index daaf33b2..ed733d7d 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,5 +1,5 @@ -AnimateHealingMachine: ; 7048b (1c:448b) - ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 +AnimateHealingMachine: + ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles call CopyVideoData @@ -11,23 +11,23 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld a, [rOBP1] push af ld a, $e0 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP1 ld hl, wOAMBuffer + $84 - ld de, PokeCenterOAMData ; $44d7 + ld de, PokeCenterOAMData call CopyHealingMachineOAM ld a, 4 ld [wAudioFadeOutControl], a call StopAllMusic .waitLoop ld a, [wAudioFadeOutControl] - and a - jr nz, .waitLoop - ld a, [wPartyCount] ; wPartyCount + and a ; is fade-out finished? + jr nz, .waitLoop ; if not, check again + ld a, [wPartyCount] ld b, a .partyLoop call CopyHealingMachineOAM - ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3 + ld a, SFX_HEALING_MACHINE call PlaySound ld c, 30 call DelayFrames @@ -38,32 +38,32 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld [wAudioSavedROMBank], a jr nz, .next call StopAllMusic - ld a, $2 ; BANK(Music_PkmnHealed) + ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a .next - ld a, $e8 ; MUSIC_PKMN_HEALED + ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlaySound ld d, $28 call FlashSprite8Times .waitLoop2 ld a, [wChannelSoundIDs] - cp $e8 ; MUSIC_PKMN_HEALED - jr z, .waitLoop2 + cp MUSIC_PKMN_HEALED ; is the healed music still playing? + jr z, .waitLoop2 ; if so, check gain ld c, 32 call DelayFrames pop af - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP1 pop hl pop af ld [hl], a jp UpdateSprites -PokeCenterFlashingMonitorAndHealBall: ; 7050b (1c:450b) +PokeCenterFlashingMonitorAndHealBall: INCBIN "gfx/pokecenter_ball.2bpp" -PokeCenterOAMData: ; 7042b (1c:442b) +PokeCenterOAMData: db $24,$34,$7C,$14 ; heal machine monitor db $2B,$30,$7D,$14 ; pokeballs 1-6 db $2B,$38,$7D,$34 @@ -73,7 +73,7 @@ PokeCenterOAMData: ; 7042b (1c:442b) db $35,$38,$7D,$34 ; d = value to xor with palette -FlashSprite8Times: ; 70547 (1c:4547) +FlashSprite8Times: ld b, 8 .loop ld a, [rOBP1] @@ -86,7 +86,7 @@ FlashSprite8Times: ; 70547 (1c:4547) jr nz, .loop ret -CopyHealingMachineOAM: ; 7055a (1c:455a) +CopyHealingMachineOAM: ; copy one OAM entry and advance the pointers ld a, [de] inc de diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 43a56658..15082847 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -1,4 +1,4 @@ -HiddenItems: ; 75f74 (1d:5f74) +HiddenItems: ld hl, HiddenItemCoords call FindHiddenItemOrCoinsIndex ld [wHiddenItemOrCoinsIndex], a @@ -25,7 +25,7 @@ HiddenItems: ; 75f74 (1d:5f74) INCLUDE "data/hidden_item_coords.asm" -FoundHiddenItemText: ; 76050 (1d:6050) +FoundHiddenItemText: TX_FAR _FoundHiddenItemText TX_ASM ld a, [wHiddenObjectFunctionArgument] ; item ID @@ -50,11 +50,11 @@ FoundHiddenItemText: ; 76050 (1d:6050) call PrintText jp TextScriptEnd -HiddenItemBagFullText: ; 76089 (1d:6089) +HiddenItemBagFullText: TX_FAR _HiddenItemBagFullText db "@" -HiddenCoins: ; 7608e (1d:608e) +HiddenCoins: ld b, COIN_CASE predef GetQuantityOfItemInBag ld a, b @@ -131,17 +131,17 @@ HiddenCoins: ; 7608e (1d:608e) INCLUDE "data/hidden_coins.asm" -FoundHiddenCoinsText: ; 76143 (1d:6143) +FoundHiddenCoinsText: TX_FAR _FoundHiddenCoinsText db $10,"@" -DroppedHiddenCoinsText: ; 76149 (1d:6149) +DroppedHiddenCoinsText: TX_FAR _FoundHiddenCoins2Text db $10 TX_FAR _DroppedHiddenCoinsText db "@" -FindHiddenItemOrCoinsIndex: ; 76153 (1d:6153) +FindHiddenItemOrCoinsIndex: ld a, [wHiddenObjectY] ld d, a ld a, [wHiddenObjectX] diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index 6e515b5a..9a81dcfc 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -1,5 +1,5 @@ ; if a hidden object was found, stores $00 in [hDidntFindAnyHiddenObject], else stores $ff -CheckForHiddenObject: ; f25f8 (3c:65f8) +CheckForHiddenObject: ld hl, hItemAlreadyFound xor a ld [hli], a @@ -60,7 +60,7 @@ CheckForHiddenObject: ; f25f8 (3c:65f8) ; checks if the coordinates in front of the player's sprite match Y in b and X in c ; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match -CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) +CheckIfCoordsInFrontOfPlayerMatch: ld a, [wPlayerFacingDirection] ; player's sprite facing direction cp SPRITE_FACING_UP jr z, .facingUp diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm index 19823c53..44690db0 100644 --- a/engine/overworld/is_player_just_outside_map.asm +++ b/engine/overworld/is_player_just_outside_map.asm @@ -1,5 +1,5 @@ ; returns whether the player is one tile outside the map in Z -IsPlayerJustOutsideMap: ; e876c (3a:476c) +IsPlayerJustOutsideMap: ld a, [wYCoord] ld b, a ld a, [wCurMapHeight] diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index e421a946..63eecef9 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -1,4 +1,4 @@ -PickUpItem: ; 4d55 (1:4d55) +PickUpItem: call EnableAutoTextBoxDrawing ld a, [hSpriteIndexOrTextID] @@ -44,11 +44,11 @@ PickUpItem: ; 4d55 (1:4d55) call PrintText ret -FoundItemText: ; 4d9a (1:4d9a) +FoundItemText: TX_FAR _FoundItemText db $0B db "@" -NoMoreRoomForItemText: ; 4da0 (1:4da0) +NoMoreRoomForItemText: TX_FAR _NoMoreRoomForItemText db "@" diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index 5d95cb18..e7874637 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -1,4 +1,4 @@ -HandleLedges: ; 1a7f4 (6:67f4) +HandleLedges: ld a, [wd736] bit 6, a ; already jumping down ledge ret nz @@ -55,7 +55,7 @@ HandleLedges: ; 1a7f4 (6:67f4) ret ; (player direction) (tile player standing on) (ledge tile) (input required) -LedgeTiles: ; 1a851 (6:6851) +LedgeTiles: db SPRITE_FACING_DOWN, $2C,$37,D_DOWN db SPRITE_FACING_DOWN, $39,$36,D_DOWN db SPRITE_FACING_DOWN, $39,$37,D_DOWN @@ -66,7 +66,7 @@ LedgeTiles: ; 1a851 (6:6851) db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT db $FF -LoadHoppingShadowOAM: ; 1a872 (6:6872) +LoadHoppingShadowOAM: ld hl, vChars1 + $7f0 ld de, LedgeHoppingShadow lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8 @@ -80,11 +80,11 @@ LoadHoppingShadowOAM: ; 1a872 (6:6872) ld [wOAMBuffer + 39 * 4], a ret -LedgeHoppingShadow: ; 1a893 (6:6893) +LedgeHoppingShadow: INCBIN "gfx/ledge_hopping_shadow.1bpp" LedgeHoppingShadowEnd: -LedgeHoppingShadowOAM: ; 1a89b (6:689b) +LedgeHoppingShadowOAM: db $58,$48,$FF,$00 db $58,$50,$FF,$20 -LedgeHoppingShadowOAMEnd: ; 1a8a3 (6:68a3) +LedgeHoppingShadowOAMEnd: diff --git a/engine/overworld/load_tileset_header.asm b/engine/overworld/load_tileset_header.asm index aeab3e24..05061651 100644 --- a/engine/overworld/load_tileset_header.asm +++ b/engine/overworld/load_tileset_header.asm @@ -1,4 +1,4 @@ -LoadTilesetHeader: ; c4f4 (3:44f4) +LoadTilesetHeader: call GetPredefRegisters push hl ld d, 0 @@ -48,4 +48,4 @@ LoadTilesetHeader: ; c4f4 (3:44f4) INCLUDE "data/dungeon_tilesets.asm" -INCLUDE "data/tileset_headers.asm"
\ No newline at end of file +INCLUDE "data/tileset_headers.asm" diff --git a/engine/overworld/load_wild_data.asm b/engine/overworld/load_wild_data.asm index 71e3fe2a..6444ab7e 100644 --- a/engine/overworld/load_wild_data.asm +++ b/engine/overworld/load_wild_data.asm @@ -1,4 +1,4 @@ -LoadWildData: ; cb62 (3:4b62) +LoadWildData: ld hl,WildDataPointers ld a,[wCurMap] @@ -30,4 +30,4 @@ LoadWildData: ; cb62 (3:4b62) ld bc,$0014 jp CopyData -INCLUDE "data/wild_mons.asm"
\ No newline at end of file +INCLUDE "data/wild_mons.asm" diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm index 722fc14e..f0a718bd 100644 --- a/engine/overworld/map_sprite_functions1.asm +++ b/engine/overworld/map_sprite_functions1.asm @@ -1,4 +1,4 @@ -_UpdateSprites: ; 4bb7 (1:4bb7) +_UpdateSprites: ld h, wSpriteStateData1 / $100 inc h ld a, $e ; (wSpriteStateData2 + $0e) & $ff @@ -31,7 +31,7 @@ _UpdateSprites: ; 4bb7 (1:4bb7) jp z, SpawnPikachu ld a, [hl] -UpdateNonPlayerSprite: ; 4be3 (1:4be3) +UpdateNonPlayerSprite: dec a swap a ld [$ff93], a ; $10 * sprite# @@ -53,7 +53,7 @@ UpdateNonPlayerSprite: ; 4be3 (1:4be3) ; 9 values when the sprite is aligned with the grid: $fc, $0c, $1c, $2c, ..., $7c. ; The reason that 4 is added below to the coordinate is to make it align with a ; multiple of $10 to make comparisons easier. -DetectCollisionBetweenSprites: ; 4bf7 (1:4bf7) +DetectCollisionBetweenSprites: ; nop ld h, wSpriteStateData1 / $100 @@ -336,7 +336,7 @@ DetectCollisionBetweenSprites: ; 4bf7 (1:4bf7) ; c = 0 if delta X/Y is 0 ; c = 7 if delta X/Y is 1 ; c = 9 if delta X/Y is -1 -Func_4d0a: ; 4d0a (1:4d0a) +Func_4d0a: ld a, [$ff91] ld b, a ld a, [$ff90] @@ -356,7 +356,7 @@ Func_4d0a: ; 4d0a (1:4d0a) inc l ret -SetSpriteCollisionValues: ; 4d22 (1:4d22) +SetSpriteCollisionValues: and a ld b, 0 ld c, 0 @@ -371,7 +371,7 @@ SetSpriteCollisionValues: ; 4d22 (1:4d22) .done ret -SpriteCollisionBitTable: ; 4d35 (1:4d35) +SpriteCollisionBitTable: db %00000000,%00000001 db %00000000,%00000010 db %00000000,%00000100 diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 10f0362e..32d3d47b 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -8,7 +8,7 @@ ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* ; denote fields of the sprite slots interated over in the inner loop. -_InitMapSprites: ; 1401b (5:401b) +_InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) ; if the map is an inside map (i.e. mapID >= $25) @@ -19,7 +19,7 @@ _InitMapSprites: ; 1401b (5:401b) ; Loads sprite set for outside maps (cities and routes) and sets VRAM slots. ; sets carry if the map is a city or route, unsets carry if not -InitOutsideMapSprites: ; 14029 (5:4029) +InitOutsideMapSprites: ld a, [wCurMap] cp a, REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? ret nc ; if not, return @@ -50,7 +50,7 @@ InitOutsideMapSprites: ; 14029 (5:4029) scf ret -LoadSpriteSetFromMapHeader: ; 14061 (5:4061) +LoadSpriteSetFromMapHeader: ; This loop stores the correct VRAM tile pattern slots according the sprite ; data from the map's header. Since the VRAM tile pattern slots are filled in ; the order of the sprite set, in order to find the VRAM tile pattern slot @@ -93,7 +93,7 @@ LoadSpriteSetFromMapHeader: ; 14061 (5:4061) jr nz, .storeVRAMSlotsLoop ret -CheckIfPictureIDAlreadyLoaded: ; 1409b (5:409b) +CheckIfPictureIDAlreadyLoaded: ; Check if the current picture ID has already had its tile patterns loaded. ; This done by looping through the previous sprite slots and seeing if any of ; their picture ID's match that of the current sprite slot. @@ -118,7 +118,7 @@ CheckIfPictureIDAlreadyLoaded: ; 1409b (5:409b) scf ret -CheckForFourTileSprite: ; 140ac (5:40ac) +CheckForFourTileSprite: ; Checks for a sprite added in yellow ; Returns no carry if the sprite is Pikachu, as its sprite is handled separately ; Else, returns carry if the sprite uses 4 tiles @@ -135,7 +135,7 @@ CheckForFourTileSprite: ; 140ac (5:40ac) scf ret -LoadMapSpriteTilePatterns: ; 140b7 (5:40b7) +LoadMapSpriteTilePatterns: ld a, 0 .loop ld [hVRAMSlot], a @@ -154,7 +154,7 @@ LoadMapSpriteTilePatterns: ; 140b7 (5:40b7) jr nz, .loop ret -ReloadWalkingTilePatterns: ; 140d2 (5:40d2) +ReloadWalkingTilePatterns: xor a .loop ld [hVRAMSlot], a @@ -168,7 +168,7 @@ ReloadWalkingTilePatterns: ; 140d2 (5:40d2) jr nz, .loop ret -LoadStillTilePattern: ; 140e4 (5:40e4) +LoadStillTilePattern: ld a, [wFontLoaded] bit 0, a ; reloading upper half of tile patterns after displaying text? ret nz ; if so, skip loading data into the lower half @@ -178,7 +178,7 @@ LoadStillTilePattern: ; 140e4 (5:40e4) call CopyVideoDataAlternate ; new yellow function ret -LoadWalkingTilePattern: ; 140f5 (5:40f5) +LoadWalkingTilePattern: call ReadSpriteSheetData ret nc ld hl, $c0 @@ -190,7 +190,7 @@ LoadWalkingTilePattern: ; 140f5 (5:40f5) call CopyVideoDataAlternate ret -GetSpriteVRAMAddress: ; 14018 (5:4108) +GetSpriteVRAMAddress: push bc ld a, [hVRAMSlot] ld c, a @@ -204,7 +204,7 @@ GetSpriteVRAMAddress: ; 14018 (5:4108) pop bc ret -SpriteVRAMAddresses: ; 14118 (5:4118) +SpriteVRAMAddresses: ; Equivalent to multiplying $C0 (number of bytes in 12 tiles) times the VRAM ; slot and adding the result to $8000 (the VRAM base address). dw vChars0 + $0c0 @@ -219,7 +219,7 @@ SpriteVRAMAddresses: ; 14118 (5:4118) dw vChars0 + $780 ; 4-tile sprites dw vChars0 + $7c0 ; 4-tile sprites -ReadSpriteSheetData: ; 1412e (5:412e) +ReadSpriteSheetData: ld a, [hVRAMSlot] ld e, a ld d, 0 @@ -249,7 +249,7 @@ ReadSpriteSheetData: ; 1412e (5:412e) scf ret -Func_14150: ; 14150 (5:4150) +Func_14150: ld a, $1 ld [wPlayerSpriteImageBaseOffset], a ; vram slot for player ld a, $2 @@ -275,7 +275,7 @@ Func_14150: ; 14150 (5:4150) jr nz, .loop ret -Func_14179: ; 14179 (5:4179) +Func_14179: push de push bc ld c, a ; c = picture ID @@ -298,7 +298,7 @@ Func_14179: ; 14179 (5:4179) pop de ret -GetSplitMapSpriteSetID: ; 14193 (5:4193) +GetSplitMapSpriteSetID: ld e, a ld d, 0 ld hl, MapSpriteSets @@ -328,7 +328,6 @@ GetSplitMapSpriteSetID: ; 14193 (5:4193) .northSouthDivide ld a, [wYCoord] jr .compareCoord - .eastWestDivide ld a, [wXCoord] .compareCoord diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index 1cc15be5..dd601451 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -1,4 +1,4 @@ -MarkTownVisitedAndLoadMissableObjects: ; ef93 (3:6f93) +MarkTownVisitedAndLoadMissableObjects: ld a, [wCurMap] cp ROUTE_1 jr nc, .notInTown @@ -17,7 +17,7 @@ MarkTownVisitedAndLoadMissableObjects: ; ef93 (3:6f93) ld h, [hl] ; fall through -; LoadMissableObjects: ; efb2 (3:6fb2) +; LoadMissableObjects: ; seems to not exist in yellow (predef replaced with something near TryPushingBoulder) ld l, a push hl @@ -64,7 +64,7 @@ MarkTownVisitedAndLoadMissableObjects: ; ef93 (3:6f93) ld [de], a ; write sentinel ret -InitializeMissableObjectsFlags: ; eff1 (3:6ff1) +InitializeMissableObjectsFlags: ld hl, wMissableObjectFlags ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags xor a @@ -95,7 +95,7 @@ InitializeMissableObjectsFlags: ; eff1 (3:6ff1) jr .missableObjectsLoop ; tests if current sprite is a missable object that is hidden/has been removed -IsObjectHidden: ; f022 (3:7022) +IsObjectHidden: ld a, [H_CURRENTSPRITEOFFSET] swap a ld b, a @@ -122,7 +122,7 @@ IsObjectHidden: ; f022 (3:7022) ; adds missable object (items, leg. pokemon, etc.) to the map ; [wMissableObjectIndex]: index of the missable object to be added (global index) -ShowObject: ; f044 (3:7044) +ShowObject: ShowObject2: ld hl, wMissableObjectFlags ld a, [wMissableObjectIndex] @@ -133,7 +133,7 @@ ShowObject2: ; removes missable object (items, leg. pokemon, etc.) from the map ; [wMissableObjectIndex]: index of the missable object to be removed (global index) -HideObject: ; f053 (3:7053) +HideObject: ld hl, wMissableObjectFlags ld a, [wMissableObjectIndex] ld c, a @@ -141,7 +141,7 @@ HideObject: ; f053 (3:7053) call MissableObjectFlagAction ; set "removed" flag jp UpdateSprites -MissableObjectFlagAction: ; f062 (3:7062) +MissableObjectFlagAction: ; identical to FlagAction push hl diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index d69e2fbc..ad4515ff 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,4 +1,4 @@ -UpdatePlayerSprite: ; 4da5 (1:4da5) +UpdatePlayerSprite: ld a, [wSpriteStateData2] and a jr z, .checkIfTextBoxInFrontOfSprite @@ -86,7 +86,7 @@ UpdatePlayerSprite: ; 4da5 (1:4da5) ld [wSpriteStateData2 + $07], a ret -Func_4e32: ; 4e32 (1:4e32) +Func_4e32: ld a, [wSpriteStateData1 + 8] ld b, a ld a, [wPlayerFacingDirection] @@ -94,7 +94,7 @@ Func_4e32: ; 4e32 (1:4e32) ld [wSpriteStateData1 + 2], a ret -UpdateNPCSprite: ; 4e3e (1:4e3e) +UpdateNPCSprite: ld a, [H_CURRENTSPRITEOFFSET] swap a dec a @@ -242,7 +242,7 @@ UpdateNPCSprite: ; 4e3e (1:4e3e) jr TryWalking ; changes facing direction by zeroing the movement delta and calling TryWalking -ChangeFacingDirection: ; 4f43 (1:4f43) +ChangeFacingDirection: ld de, $0 ; fall through @@ -252,7 +252,7 @@ ChangeFacingDirection: ; 4f43 (1:4f43) ; e: X movement delta (-1, 0 or 1) ; hl: pointer to tile the sprite would walk onto ; set carry on failure, clears carry on success -TryWalking: ; 4f46 (1:4f46) +TryWalking: push hl call Func_5337 pop hl @@ -271,7 +271,7 @@ TryWalking: ; 4f46 (1:4f46) jp UpdateSpriteImage ; update the walking animation parameters for a sprite that is currently walking -UpdateSpriteInWalkingAnimation: ; 4f61 (1:4f61) +UpdateSpriteInWalkingAnimation: call Func_5274 .noNextAnimationFrame ld a, [H_CURRENTSPRITEOFFSET] @@ -330,7 +330,7 @@ UpdateSpriteInWalkingAnimation: ; 4f61 (1:4f61) ret ; update delay value (c2x8) for sprites in the delayed state (c1x1) -UpdateSpriteMovementDelay: ; 4fa9 (1:4fa9) +UpdateSpriteMovementDelay: ld h, $c2 ld a, [H_CURRENTSPRITEOFFSET] add $6 @@ -351,7 +351,7 @@ UpdateSpriteMovementDelay: ; 4fa9 (1:4fa9) inc a ld l, a ld [hl], $1 ; c1x1 = 1 (mark as ready to move) -notYetMoving: ; 4fc5 (1:4fc5) +notYetMoving: ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $8 @@ -359,7 +359,7 @@ notYetMoving: ; 4fc5 (1:4fc5) ld [hl], $0 ; c1x8 = 0 (walk animation frame) jp UpdateSpriteImage -MakeNPCFacePlayer: ; 507f (1:507f) +MakeNPCFacePlayer: ; Make an NPC face the player if the player has spoken to him or her. ; Check if the behaviour of the NPC facing the player when spoken to is @@ -392,7 +392,7 @@ MakeNPCFacePlayer: ; 507f (1:507f) ld [hl], c ; c1x9: set facing direction jr notYetMoving -InitializeSpriteStatus: ; 4fff (1:4fff) +InitializeSpriteStatus: ld [hl], $1 ; $c1x1: set movement status to ready inc l ld [hl], $ff ; $c1x2: set sprite image to $ff (invisible/off screen) @@ -407,7 +407,7 @@ InitializeSpriteStatus: ; 4fff (1:4fff) ret ; calculates the spprite's scrren position form its map position and the player position -InitializeSpriteScreenPosition: ; 5012 (1:5012) +InitializeSpriteScreenPosition: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 @@ -430,7 +430,7 @@ InitializeSpriteScreenPosition: ; 5012 (1:5012) ld [hl], a ; c1x6 (screen X position) ret -Func_5033: ; 5033 (1:5033) +Func_5033: jr nc, .asm_503c cpl inc a @@ -443,7 +443,7 @@ Func_5033: ; 5033 (1:5033) ret ; tests if sprite is off screen or otherwise unable to do anything -CheckSpriteAvailability: ; 503f (1:503f) +CheckSpriteAvailability: predef IsObjectHidden ld a, [$ffe5] and a @@ -524,7 +524,7 @@ CheckSpriteAvailability: ; 503f (1:503f) .done ret -UpdateSpriteImage: ; 50ba (1:50ba) +UpdateSpriteImage: ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] add $8 @@ -549,7 +549,7 @@ UpdateSpriteImage: ; 50ba (1:50ba) ; d: Y movement delta (-1, 0 or 1) ; e: X movement delta (-1, 0 or 1) ; set carry on failure, clears carry on success -CanWalkOntoTile: ; 50d1 (1:50d1) +CanWalkOntoTile: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $6 @@ -658,7 +658,7 @@ CanWalkOntoTile: ; 50d1 (1:50d1) ; calculates the tile pointer pointing to the tile the current sprite stancs on ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer -GetTileSpriteStandsOn: ; 516a (1:516a) +GetTileSpriteStandsOn: ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 @@ -687,7 +687,7 @@ GetTileSpriteStandsOn: ; 516a (1:516a) ret ; loads [de+a] into a -LoadDEPlusA: ; 5192 (1:5192) +LoadDEPlusA: add e ld e, a jr nc, .noCarry @@ -696,7 +696,7 @@ LoadDEPlusA: ; 5192 (1:5192) ld a, [de] ret -DoScriptedNPCMovement: ; 5199 (1:5199) +DoScriptedNPCMovement: ; This is an alternative method of scripting an NPC's movement and is only used ; a few times in the game. It is used when the NPC and player must walk together ; in sync, such as when the player is following the NPC somewhere. An NPC can't @@ -767,23 +767,23 @@ DoScriptedNPCMovement: ; 5199 (1:5199) inc [hl] ret -InitScriptedNPCMovement: ; 5209 (1:5209) +InitScriptedNPCMovement: xor a ld [wNPCMovementDirections2Index], a ld a, 8 ld [wScriptedNPCWalkCounter], a jp AnimScriptedNPCMovement -GetSpriteScreenYPointer: ; 5215 (1:5215) +GetSpriteScreenYPointer: ld a, $4 ld b, a jr GetSpriteScreenXYPointerCommon -GetSpriteScreenXPointer: ; 521a (1:521a) +GetSpriteScreenXPointer: ld a, $6 ld b, a -GetSpriteScreenXYPointerCommon: ; 521d (1:521d) +GetSpriteScreenXYPointerCommon: ld hl, wSpriteStateData1 ld a, [H_CURRENTSPRITEOFFSET] add l @@ -791,7 +791,7 @@ GetSpriteScreenXYPointerCommon: ; 521d (1:521d) ld l, a ret -AnimScriptedNPCMovement: ; 5226 (1:5226) +AnimScriptedNPCMovement: ld hl, wSpriteStateData2 ld a, [H_CURRENTSPRITEOFFSET] add $e @@ -830,7 +830,7 @@ AnimScriptedNPCMovement: ; 5226 (1:5226) ld [hl], a ret -AdvanceScriptedNPCAnimFrameCounter: ; 5264 (1:5264) +AdvanceScriptedNPCAnimFrameCounter: call Func_5274 ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] @@ -841,7 +841,7 @@ AdvanceScriptedNPCAnimFrameCounter: ; 5264 (1:5264) ld [hSpriteAnimFrameCounter], a ret -Func_5274: ; 5274 (1:5274) +Func_5274: ld a, [H_CURRENTSPRITEOFFSET] add $7 ld l, a @@ -858,7 +858,7 @@ Func_5274: ; 5274 (1:5274) ld [hl], a ; advance to next animation frame every 4 ticks (16 ticks total for one step) ret -Func_5288: ; 5288 (1:5288) +Func_5288: ; nice lookup table ; a is supposedly [wNPCMovementDirections + $fe] cp $5 @@ -957,27 +957,27 @@ Func_5288: ; 5288 (1:5288) scf ret -Func_531f: ; 531f (1:531f) +Func_531f: lb de, 1, 0 ld c, SPRITE_FACING_DOWN ret -Func_5325: ; 5325 (1:5325) +Func_5325: lb de, -1, 0 ld c, SPRITE_FACING_UP ret -Func_532b: ; 532b (1:532b) +Func_532b: lb de, 0, 1 ld c, SPRITE_FACING_RIGHT ret -Func_5331: ; 5331 (1:5331) +Func_5331: lb de, 0, -1 ld c, SPRITE_FACING_LEFT ret -Func_5337: ; 5337 (1:5337) +Func_5337: ld a, [H_CURRENTSPRITEOFFSET] add $9 ld l, a @@ -992,7 +992,7 @@ Func_5337: ; 5337 (1:5337) ld [hl], e ; c1x5 (update X movement delta) ret -Func_5349: ; 5349 (1:5349) +Func_5349: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 @@ -1005,7 +1005,7 @@ Func_5349: ; 5349 (1:5349) ld [hl], a ; update X position ret -Func_5357: ; 5357 (1:5357) +Func_5357: call Func_5274 ld a, [H_CURRENTSPRITEOFFSET] add $3 @@ -1062,4 +1062,4 @@ Func_5357: ; 5357 (1:5357) inc l ld c, [hl] ld [hl], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 07abd44f..333779fa 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -PlayerStepOutFromDoor: ; 1a4ea (6:64ea) +PlayerStepOutFromDoor: ld hl, wd730 res 1, [hl] call IsPlayerStandingOnDoorTile @@ -27,7 +27,7 @@ PlayerStepOutFromDoor: ; 1a4ea (6:64ea) res 7, [hl] ret -_EndNPCMovementScript: ; 1a527 (6:6527) +_EndNPCMovementScript: ld hl, wd730 res 7, [hl] ld hl, wd72e @@ -44,14 +44,14 @@ _EndNPCMovementScript: ; 1a527 (6:6527) ld [wSimulatedJoypadStatesEnd], a ret -PalletMovementScriptPointerTable: ; 1a54c (6:654c) +PalletMovementScriptPointerTable: dw PalletMovementScript_OakMoveLeft dw PalletMovementScript_PlayerMoveLeft dw PalletMovementScript_WaitAndWalkToLab dw PalletMovementScript_WalkToLab dw PalletMovementScript_Done -PalletMovementScript_OakMoveLeft: ; 1a556 (6:6556) +PalletMovementScript_OakMoveLeft: ld a, [wXCoord] sub $a ld [wNumStepsToTake], a @@ -89,7 +89,7 @@ PalletMovementScript_OakMoveLeft: ; 1a556 (6:6556) ld [wJoyIgnore], a ret -PalletMovementScript_PlayerMoveLeft: ; 1a597 (6:6597) +PalletMovementScript_PlayerMoveLeft: ld a, [wd730] bit 0, a ; is an NPC being moved by a script? ret nz ; return if Oak is still moving @@ -102,12 +102,12 @@ PalletMovementScript_PlayerMoveLeft: ; 1a597 (6:6597) ld [wNPCMovementScriptFunctionNum], a ret -PalletMovementScript_WaitAndWalkToLab: ; 1a5b3 (6:65b3) +PalletMovementScript_WaitAndWalkToLab: ld a, [wSimulatedJoypadStatesIndex] and a ; is the player done moving left yet? ret nz -PalletMovementScript_WalkToLab: ; 1a5b8 (6:65b8) +PalletMovementScript_WalkToLab: xor a ld [wOverrideSimulatedJoypadStatesMask], a ld a, [wSpriteIndex] @@ -132,7 +132,7 @@ PalletMovementScript_WalkToLab: ; 1a5b8 (6:65b8) ret -RLEList_ProfOakWalkToLab: ; 1a5ee (6:65ee) +RLEList_ProfOakWalkToLab: db NPC_MOVEMENT_DOWN, $06 ; differs from red db NPC_MOVEMENT_LEFT, $01 db NPC_MOVEMENT_DOWN, $05 @@ -141,7 +141,7 @@ RLEList_ProfOakWalkToLab: ; 1a5ee (6:65ee) db $E0, $01 ; stand still db $FF -RLEList_PlayerWalkToLab: ; 1a5fb (6:65fb) +RLEList_PlayerWalkToLab: db D_UP, $02 db D_RIGHT, $03 db D_DOWN, $05 @@ -149,7 +149,7 @@ RLEList_PlayerWalkToLab: ; 1a5fb (6:65fb) db D_DOWN, $07 ; differs from red db $FF -PalletMovementScript_Done: ; 1a606 (6:6606) +PalletMovementScript_Done: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -162,11 +162,11 @@ PalletMovementScript_Done: ; 1a606 (6:6606) res 7, [hl] jp EndNPCMovementScript -PewterMuseumGuyMovementScriptPointerTable: ; 1a622 (6:6622) +PewterMuseumGuyMovementScriptPointerTable: dw PewterMovementScript_WalkToMuseum dw PewterMovementScript_Done -PewterMovementScript_WalkToMuseum: ; 1a626 (6:6626) +PewterMovementScript_WalkToMuseum: ld a, BANK(Music_MuseumGuy) ld c, a ld a, MUSIC_MUSEUM_GUY @@ -192,21 +192,21 @@ PewterMovementScript_WalkToMuseum: ; 1a626 (6:6626) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterMuseumPlayer: ; 1a661 (6:6661) +RLEList_PewterMuseumPlayer: db 0, $01 db D_UP, $03 db D_LEFT, $0D db D_UP, $06 db $FF -RLEList_PewterMuseumGuy: ; 1a66a (6:666a) +RLEList_PewterMuseumGuy: db NPC_MOVEMENT_UP, $06 db NPC_MOVEMENT_LEFT, $0D db NPC_MOVEMENT_UP, $03 db NPC_MOVEMENT_LEFT, $01 db $FF -PewterMovementScript_Done: ; 1a673 (6:6673) +PewterMovementScript_Done: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -216,11 +216,11 @@ PewterMovementScript_Done: ; 1a673 (6:6673) res 7, [hl] jp EndNPCMovementScript -PewterGymGuyMovementScriptPointerTable: ; 1a685 (6:6685) +PewterGymGuyMovementScriptPointerTable: dw PewterMovementScript_WalkToGym dw PewterMovementScript_Done -PewterMovementScript_WalkToGym: ; 1a689 (6:6689) +PewterMovementScript_WalkToGym: ld a, BANK(Music_MuseumGuy) ld c, a ld a, MUSIC_MUSEUM_GUY @@ -249,7 +249,7 @@ PewterMovementScript_WalkToGym: ; 1a689 (6:6689) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterGymPlayer: ; 1a6cb (6:66cb) +RLEList_PewterGymPlayer: db 0, $01 db D_RIGHT, $02 db D_DOWN, $05 @@ -258,7 +258,7 @@ RLEList_PewterGymPlayer: ; 1a6cb (6:66cb) db D_LEFT, $0F db $FF -RLEList_PewterGymGuy: ; 1a6cd8 (6:66d8) +RLEList_PewterGymGuy: db NPC_MOVEMENT_DOWN, $02 db NPC_MOVEMENT_LEFT, $0F db NPC_MOVEMENT_UP, $05 diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm index c5e11aa0..06ee9319 100755 --- a/engine/overworld/npc_movement_2.asm +++ b/engine/overworld/npc_movement_2.asm @@ -1,4 +1,4 @@ -FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) +FreezeEnemyTrainerSprite: ld a, [wCurMap] cp POKEMONTOWER_7 ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them @@ -17,7 +17,7 @@ FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) ld [H_SPRITEINDEX], a jp SetSpriteMovementBytesToFF -RivalIDs: ; eaa20 (3a:6a20) +RivalIDs: db OPP_SONY1 db OPP_SONY2 db OPP_SONY3 diff --git a/engine/overworld/npc_pathfinding.asm b/engine/overworld/npc_pathfinding.asm index ed7db530..f3d23b7c 100644 --- a/engine/overworld/npc_pathfinding.asm +++ b/engine/overworld/npc_pathfinding.asm @@ -1,4 +1,4 @@ -FindPathToPlayer: ; f74a (3:774a) +FindPathToPlayer: xor a ld hl, hFindPathNumSteps ld [hli], a ; hFindPathNumSteps @@ -74,7 +74,7 @@ FindPathToPlayer: ; f74a (3:774a) ld [hl], $ff ret -CalcPositionOfPlayerRelativeToNPC: ; f7b9 (3:77b9) +CalcPositionOfPlayerRelativeToNPC: xor a ld [hNPCPlayerRelativePosFlags], a ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels @@ -151,7 +151,7 @@ CalcPositionOfPlayerRelativeToNPC: ; f7b9 (3:77b9) ld [hNPCPlayerRelativePosFlags], a ret -ConvertNPCMovementDirectionsToJoypadMasks: ; f830 (3:7830) +ConvertNPCMovementDirectionsToJoypadMasks: ld a, [hNPCMovementDirections2Index] ld [wNPCMovementDirections2Index], a dec a @@ -172,7 +172,7 @@ ConvertNPCMovementDirectionsToJoypadMasks: ; f830 (3:7830) jr nz, .loop ret -ConvertNPCMovementDirectionToJoypadMask: ; f84f (3:784f) +ConvertNPCMovementDirectionToJoypadMask: push hl ld b, a ld hl, NPCMovementDirectionsToJoypadMasksTable @@ -190,7 +190,7 @@ ConvertNPCMovementDirectionToJoypadMask: ; f84f (3:784f) pop hl ret -NPCMovementDirectionsToJoypadMasksTable: ; f862 (3:7862) +NPCMovementDirectionsToJoypadMasksTable: db NPC_MOVEMENT_UP, D_UP db NPC_MOVEMENT_DOWN, D_DOWN db NPC_MOVEMENT_LEFT, D_LEFT @@ -198,4 +198,4 @@ NPCMovementDirectionsToJoypadMasksTable: ; f862 (3:7862) db $ff ; unreferenced - ret
\ No newline at end of file + ret diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index d412d8ec..54ba6b7a 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -1,4 +1,4 @@ -OaksAideScript: ; 58ecc (16:4ecc) +OaksAideScript: ld hl, OaksAideHiText call PrintText call YesNoChoice @@ -45,27 +45,27 @@ OaksAideScript: ; 58ecc (16:4ecc) ld [hOaksAideResult], a ret -OaksAideHiText: ; 58f28 (16:4f28) +OaksAideHiText: TX_FAR _OaksAideHiText db "@" -OaksAideUhOhText: ; 58f2d (16:4f2d) +OaksAideUhOhText: TX_FAR _OaksAideUhOhText db "@" -OaksAideComeBackText: ; 58f32 (16:4f32) +OaksAideComeBackText: TX_FAR _OaksAideComeBackText db "@" -OaksAideHereYouGoText: ; 58f37 (16:4f37) +OaksAideHereYouGoText: TX_FAR _OaksAideHereYouGoText db "@" -OaksAideGotItemText: ; 58f3c (16:4f3c) +OaksAideGotItemText: TX_FAR _OaksAideGotItemText db $0b db "@" -OaksAideNoRoomText: ; 58f41 (16:4f41) +OaksAideNoRoomText: TX_FAR _OaksAideNoRoomText db "@" diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm index ede025cd..5a831327 100644 --- a/engine/overworld/oam.asm +++ b/engine/overworld/oam.asm @@ -1,4 +1,4 @@ -PrepareOAMData: ; 499b (1:499b) +PrepareOAMData: ; Determine OAM data for currently visible ; sprites and write it to wOAMBuffer. ; Yellow code has been changed to use registers more efficiently @@ -8,7 +8,7 @@ PrepareOAMData: ; 499b (1:499b) dec a jr z, .updateEnabled - cp $ff + cp -1 ret nz ld [wUpdateSpritesEnabled], a jp HideSprites @@ -164,7 +164,7 @@ PrepareOAMData: ; 499b (1:499b) jr nz, .clearLoop ret -GetSpriteScreenXY: ; 4a5f (1:4a5f) +GetSpriteScreenXY: inc e inc e ld a, [de] ; c1x4 @@ -186,7 +186,7 @@ GetSpriteScreenXY: ; 4a5f (1:4a5f) ld [de], a ; c1xb (x) ret -Func_4a7b: ; 4a7b (1:4a7b) +Func_4a7b: push bc ld a, [wd5cd] ; temp copy of c1x2 swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) @@ -212,7 +212,7 @@ Func_4a7b: ; 4a7b (1:4a7b) INCLUDE "engine/oam_dma.asm" -_IsTilePassable:: ; 4aaa (1:4aaa) +_IsTilePassable:: ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] @@ -229,4 +229,4 @@ _IsTilePassable:: ; 4aaa (1:4aaa) scf ret -INCLUDE "data/collision.asm" ; probably
\ No newline at end of file +INCLUDE "data/collision.asm" ; probably diff --git a/engine/overworld/pewter_guys.asm b/engine/overworld/pewter_guys.asm index ff3c6152..532fa4bf 100755 --- a/engine/overworld/pewter_guys.asm +++ b/engine/overworld/pewter_guys.asm @@ -1,4 +1,4 @@ -PewterGuys: ; 1a6e5 (6:66e5) +PewterGuys: ld hl, wSimulatedJoypadStatesEnd ld a, [wSimulatedJoypadStatesIndex] dec a ; this decrement causes it to overwrite the last byte before $FF in the list @@ -48,14 +48,14 @@ PewterGuys: ; 1a6e5 (6:66e5) inc hl jr .findMatchingCoordsLoop -PointerTable_37ce6: ; 1a72a (6:672a) +PointerTable_37ce6: dw PewterMuseumGuyCoords dw PewterGymGuyCoords ; these are the four coordinates of the spaces below, above, to the left and ; to the right of the museum guy, and pointers to different movements for ; the player to make to get positioned before the main movement. -PewterMuseumGuyCoords: ; 1a72e (6:672e) +PewterMuseumGuyCoords: db 18, 27 dw .down db 16, 27 @@ -78,7 +78,7 @@ PewterMuseumGuyCoords: ; 1a72e (6:672e) ; different movements for the player to make to get positioned before the ; main movement ; $00 is a pause -PewterGymGuyCoords: ; 1a74a (6:674a) +PewterGymGuyCoords: db 16, 34 dw .one db 17, 35 diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index bea43308..d4ecec53 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -1,4 +1,4 @@ -EnterMapAnim: ; 70567 (1c:4567) +EnterMapAnim: call InitFacingDirectionList ld a, $ec ld [wSpriteStateData1 + 4], a ; player's sprite Y screen position @@ -9,7 +9,7 @@ EnterMapAnim: ; 70567 (1c:4567) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, $a0 ; (SFX_02_4c - SFX_Headers_02) / 3 + ld a, SFX_TELEPORT_ENTER_1 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70567 (1c:4567) ;res 4, [hl] jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, $a3 ; (SFX_02_4f - SFX_Headers_02) / 3 + ld a, SFX_TELEPORT_ENTER_2 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -51,7 +51,7 @@ EnterMapAnim: ; 70567 (1c:4567) .flyAnimation pop hl call LoadBirdSpriteGraphics - ld a, $a4 ; SFX_BIRD_FLY + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -66,7 +66,7 @@ EnterMapAnim: ; 70567 (1c:4567) ld [wPikachuSpawnState], a jr .restoreDefaultMusic -FlyAnimationEnterScreenCoords: ; 705ed (1c:45ed) +FlyAnimationEnterScreenCoords: ; y, x pairs ; This is the sequence of screen coordinates used by the overworld ; Fly animation when the player is entering a map. @@ -83,7 +83,7 @@ FlyAnimationEnterScreenCoords: ; 705ed (1c:45ed) db $3C, $48 db $3C, $40 -PlayerSpinWhileMovingDown: ; 70605 (1c:4605) +PlayerSpinWhileMovingDown: ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, $10 ld [hli], a ; wPlayerSpinWhileMovingUpOrDownAnimDeltaY @@ -94,7 +94,7 @@ PlayerSpinWhileMovingDown: ; 70605 (1c:4605) jp PlayerSpinWhileMovingUpOrDown -_LeaveMapAnim: ; 70615 (1c:4615) +_LeaveMapAnim: call Func_1510 call InitFacingDirectionList call IsPlayerStandingOnWarpPadOrHole @@ -104,7 +104,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, $9f ; (SFX_02_4b - SFX_Headers_02) / 3 + ld a, SFX_TELEPORT_EXIT_1 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -138,7 +138,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], $a1 ; SFX_TELEPORT_EXIT_2 + ld [hl], SFX_TELEPORT_EXIT_2 ; wPlayerSpinInPlaceAnimSoundID ld hl, wFacingDirectionList call PlayerSpinInPlace jr .spinWhileMovingUp @@ -151,7 +151,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, $a4 ; SFX_FLY + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -172,7 +172,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) call GBFadeOutToWhite jp RestoreFacingDirectionAndYScreenPos -FlyAnimationScreenCoords1: ; 706ad (1c:46ad) +FlyAnimationScreenCoords1: ; y, x pairs ; This is the sequence of screen coordinates used by the first part ; of the Fly overworld animation. @@ -189,7 +189,7 @@ FlyAnimationScreenCoords1: ; 706ad (1c:46ad) db $2A, $98 db $27, $A0 -FlyAnimationScreenCoords2: ; 706c5 (1c:46c5) +FlyAnimationScreenCoords2: ; y, x pairs ; This is the sequence of screen coordinates used by the second part ; of the Fly overworld animation. @@ -206,7 +206,7 @@ FlyAnimationScreenCoords2: ; 706c5 (1c:46c5) db $F0, $00 -LeaveMapThroughHoleAnim: ; 706db (1c:46db) +LeaveMapThroughHoleAnim: ld a, $ff ld [wUpdateSpritesEnabled], a ; disable UpdateSprites ; shift upper half of player's sprite down 8 pixels and hide lower half @@ -228,7 +228,7 @@ LeaveMapThroughHoleAnim: ; 706db (1c:46db) ld [wUpdateSpritesEnabled], a ; enable UpdateSprites jp RestoreFacingDirectionAndYScreenPos -DoFlyAnimation: ; 7070c (1c:470c) +DoFlyAnimation: ld a, [wFlyAnimBirdSpriteImageIndex] xor $1 ; make the bird flap its wings ld [wFlyAnimBirdSpriteImageIndex], a @@ -252,19 +252,19 @@ DoFlyAnimation: ; 7070c (1c:470c) jr nz, DoFlyAnimation ret -LoadBirdSpriteGraphics: ; 70735 (1c:4735) - ld de, BirdSprite ; $4d80 +LoadBirdSpriteGraphics: + ld de, BirdSprite ld b, BANK(BirdSprite) ld c, $c ld hl, vNPCSprites call CopyVideoData - ld de, BirdSprite + $c0 ; $4e40 ; moving amination sprite + ld de, BirdSprite + $c0 ; moving animation sprite ld b, BANK(BirdSprite) ld c, $0c ld hl, vNPCSprites2 jp CopyVideoData -InitFacingDirectionList: ; 7074f (1c:474f) +InitFacingDirectionList: ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction (image index is locked to standing images) ld [wSavedPlayerFacingDirection], a ld a, [wSpriteStateData1 + 4] ; player's sprite Y screen position @@ -283,12 +283,12 @@ InitFacingDirectionList: ; 7074f (1c:474f) dec hl ret -PlayerSpinningFacingOrder: ; 70773 (1c:4773) +PlayerSpinningFacingOrder: ; The order of the direction the player's sprite is facing when teleporting ; away. Creates a spinning effect. db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT -SpinPlayerSprite: ; 70777 (1c:4777) +SpinPlayerSprite: ; copy the current value from the list into the sprite data and rotate the list ld a, [hl] ld [wSpriteStateData1 + 2], a ; player's sprite facing direction (image index is locked to standing images) @@ -302,7 +302,7 @@ SpinPlayerSprite: ; 70777 (1c:4777) pop hl ret -PlayerSpinInPlace: ; 70790 (1c:4790) +PlayerSpinInPlace: call SpinPlayerSprite ld a, [wPlayerSpinInPlaceAnimFrameDelay] ld c, a @@ -323,7 +323,7 @@ PlayerSpinInPlace: ; 70790 (1c:4790) call DelayFrames jr PlayerSpinInPlace -PlayerSpinWhileMovingUpOrDown: ; 707b5 (1c:47b5) +PlayerSpinWhileMovingUpOrDown: call SpinPlayerSprite ld a, [wPlayerSpinWhileMovingUpOrDownAnimDeltaY] ld c, a @@ -339,7 +339,7 @@ PlayerSpinWhileMovingUpOrDown: ; 707b5 (1c:47b5) call DelayFrames jr PlayerSpinWhileMovingUpOrDown -RestoreFacingDirectionAndYScreenPos: ; 707d2 (1c:47d2) +RestoreFacingDirectionAndYScreenPos: ld a, [wSavedPlayerScreenY] ld [wSpriteStateData1 + 4], a ld a, [wSavedPlayerFacingDirection] @@ -347,14 +347,14 @@ RestoreFacingDirectionAndYScreenPos: ; 707d2 (1c:47d2) ret ; if SGB, 2 frames, else 3 frames -GetPlayerTeleportAnimFrameDelay: ; 707df (1c:47df) +GetPlayerTeleportAnimFrameDelay: ld a, [wOnSGB] xor $1 inc a inc a ret -IsPlayerStandingOnWarpPadOrHole: ; 707e7 (1c:47e7) +IsPlayerStandingOnWarpPadOrHole: ld b, 0 ld hl, .warpPadAndHoleData ld a, [wCurMapTileset] @@ -381,20 +381,20 @@ IsPlayerStandingOnWarpPadOrHole: ; 707e7 (1c:47e7) ret ; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole] -.warpPadAndHoleData: ; 70809 (1c:4809) +.warpPadAndHoleData: db FACILITY, $20, 1 ; warp pad db FACILITY, $11, 2 ; hole db CAVERN, $22, 2 ; hole db INTERIOR, $55, 1 ; warp pad db $FF -FishingAnim: ; 70816 (1c:4816) +FishingAnim: ld c, 10 call DelayFrames ld hl, wd736 - set 6, [hl] + set 6, [hl] ; reserve the last 4 OAM entries ld hl, vNPCSprites - ld de, RedSprite ; $4180 + ld de, RedSprite ld b, BANK(RedSprite) ld c, $c call CopyVideoData @@ -422,7 +422,6 @@ FishingAnim: ; 70816 (1c:4816) ; there was a bite ; shake the player's sprite vertically - ld b, 10 .loop ld hl, wSpriteStateData1 + 4 ; player's sprite Y screen position @@ -435,17 +434,19 @@ FishingAnim: ; 70816 (1c:4816) ; If the player is facing up, hide the fishing rod so it doesn't overlap with ; the exclamation bubble that will be shown next. - ld a, [wSpriteStateData1 + 2] + ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction cp SPRITE_FACING_UP jr nz, .skipHidingFishingRod ld a, $a0 ld [wOAMBuffer + $9c], a + .skipHidingFishingRod ld hl, wEmotionBubbleSpriteIndex xor a ld [hli], a ; player's sprite ld [hl], a ; EXCLAMATION_BUBBLE predef EmotionBubble + ; If the player is facing up, unhide the fishing rod. ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction cp SPRITE_FACING_UP @@ -463,25 +464,25 @@ FishingAnim: ; 70816 (1c:4816) call LoadFontTilePatterns ret -.ShakePlayerSprite ; 708a3 (1c:48a3) +.ShakePlayerSprite ld a, [hl] xor $1 ld [hl], a ret -NoNibbleText: ; 708a8 (1c:48a8) +NoNibbleText: TX_FAR _NoNibbleText db "@" -NothingHereText: ; 708ad (1c:48ad) +NothingHereText: TX_FAR _NothingHereText db "@" -ItsABiteText: ; 708b2 (1c:48b2) +ItsABiteText: TX_FAR _ItsABiteText db "@" -FishingRodOAM: ; 708b7 (1c:48b7) +FishingRodOAM: ; specifies how the fishing rod should be drawn on the screen ; first byte = screen y coordinate ; second byte = screen x coordinate @@ -492,7 +493,7 @@ FishingRodOAM: ; 708b7 (1c:48b7) db $50, $40, $FE, $00 ; player facing left db $50, $58, $FE, $20 ; player facing right ($20 means "horizontally flip the tile") -RedFishingTiles: ; 708c7 (1c:48c7) +RedFishingTiles: dw RedFishingTilesFront db 2, BANK(RedFishingTilesFront) dw vNPCSprites + $20 @@ -509,7 +510,7 @@ RedFishingTiles: ; 708c7 (1c:48c7) db 3, BANK(RedFishingRodTiles) dw vNPCSprites2 + $7d0 -_HandleMidJump: ; 708df (1c:48df) +_HandleMidJump: ld a, [wPlayerJumpingYScreenCoordsIndex] ld c, a inc a @@ -541,6 +542,6 @@ _HandleMidJump: ; 708df (1c:48df) ld [wJoyIgnore], a ret -PlayerJumpingYScreenCoords: ; 7091b (1c:491b) +PlayerJumpingYScreenCoords: ; Sequence of y screen coordinates for player's sprite when jumping over a ledge. db $38, $36, $34, $32, $31, $30, $30, $30, $31, $32, $33, $34, $36, $38, $3C, $3C diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 65dfcd87..1801d9e9 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -1,4 +1,4 @@ -DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) +DisplayPokemonCenterDialogue_: ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .regularCenter @@ -32,7 +32,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call LoadCurrentMapView call Delay3 call UpdateSprites - callab Func_fd252 ; todo + callab PikachuWalksToNurseJoy ; todo .notHealingPlayerPikachu ld hl, NeedYourPokemonText call PrintText @@ -40,7 +40,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call DelayFrames call CheckPikachuFollowingPlayer jr nz, .playerPikachuNotOnScreen - call Func_152d + call DisablePikachuOverworldSpriteDrawing callab IsStarterPikachuInOurParty call c, Func_6eaa .playerPikachuNotOnScreen @@ -64,7 +64,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call c, Func_6eaa ld a, $5 ld [wPikachuSpawnState], a - call Func_1525 + call EnablePikachuOverworldSpriteDrawing .doNotReturnPikachu lb bc, 1, 0 call Func_6ebb @@ -97,7 +97,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call UpdateSprites ret -Func_6eaa: ; 6eaa (1:6eaa) +Func_6eaa: ld a, $1 ld [H_SPRITEINDEX], a ld a, $4 @@ -107,7 +107,7 @@ Func_6eaa: ; 6eaa (1:6eaa) call DelayFrames ret -Func_6ebb: ; 6ebb (1:6ebb) +Func_6ebb: ld a, b ld [H_SPRITEINDEX], a ld a, c @@ -122,28 +122,28 @@ Func_6ebb: ; 6ebb (1:6ebb) call SpriteFunc_34a1 ret -PokemonCenterWelcomeText: ; 6de0 (1:6de0) +PokemonCenterWelcomeText: TX_FAR _PokemonCenterWelcomeText db "@" -ShallWeHealYourPokemonText: ; 6de5 (1:6de5) +ShallWeHealYourPokemonText: db $a TX_FAR _ShallWeHealYourPokemonText db "@" -NeedYourPokemonText: ; 6deb (1:6deb) +NeedYourPokemonText: TX_FAR _NeedYourPokemonText db "@" -PokemonFightingFitText: ; 6ee0 (1:6ee0) +PokemonFightingFitText: TX_FAR _PokemonFightingFitText db "@" -PokemonCenterFarewellText: ; 6ee5 (1:6ee5) +PokemonCenterFarewellText: db $a TX_FAR _PokemonCenterFarewellText db "@" -LooksContentText: ; 6eeb (1:6eeb) +LooksContentText: TX_FAR _LooksContentText - db "@"
\ No newline at end of file + db "@" diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index ca3f8991..823939b1 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -1,4 +1,4 @@ -DisplayPokemartDialogue_: ; 69a5 (1:69a5) +DisplayPokemartDialogue_: ld a,[wListScrollOffset] ld [wSavedListScrollOffset],a call UpdateSprites @@ -227,46 +227,46 @@ DisplayPokemartDialogue_: ; 69a5 (1:69a5) ld [wListScrollOffset],a ret -PokemartBuyingGreetingText: ; 6b91 (1:6b91) +PokemartBuyingGreetingText: TX_FAR _PokemartBuyingGreetingText db "@" -PokemartTellBuyPriceText: ; 6b96 (1:6b96) +PokemartTellBuyPriceText: TX_FAR _PokemartTellBuyPriceText db "@" -PokemartBoughtItemText: ; 6b9b (1:6b9b) +PokemartBoughtItemText: TX_FAR _PokemartBoughtItemText db "@" -PokemartNotEnoughMoneyText: ; 6ba0 (1:6ba0) +PokemartNotEnoughMoneyText: TX_FAR _PokemartNotEnoughMoneyText db "@" -PokemartItemBagFullText: ; 6ba5 (1:6ba5) +PokemartItemBagFullText: TX_FAR _PokemartItemBagFullText db "@" -PokemonSellingGreetingText: ; 6baa (1:6baa) +PokemonSellingGreetingText: TX_FAR _PokemonSellingGreetingText db "@" -PokemartTellSellPriceText: ; 6baf (1:6baf) +PokemartTellSellPriceText: TX_FAR _PokemartTellSellPriceText db "@" -PokemartItemBagEmptyText: ; 6bb4 (1:6bb4) +PokemartItemBagEmptyText: TX_FAR _PokemartItemBagEmptyText db "@" -PokemartUnsellableItemText: ; 6bb9 (1:6bb9) +PokemartUnsellableItemText: TX_FAR _PokemartUnsellableItemText db "@" -PokemartThankYouText: ; 6bbe (1:6bbe) +PokemartThankYouText: TX_FAR _PokemartThankYouText db "@" -PokemartAnythingElseText: ; 6bc3 (1:6bc3) +PokemartAnythingElseText: TX_FAR _PokemartAnythingElseText db "@" diff --git a/engine/overworld/print_safari_steps.asm b/engine/overworld/print_safari_steps.asm index 3f2ada03..01dd34e0 100644 --- a/engine/overworld/print_safari_steps.asm +++ b/engine/overworld/print_safari_steps.asm @@ -1,4 +1,4 @@ -PrintSafariZoneSteps: ; c27b (3:427b) +PrintSafariZoneSteps: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c @@ -29,8 +29,8 @@ PrintSafariZoneSteps: ; c27b (3:427b) lb bc, 1, 2 jp PrintNumber -SafariSteps: ; c2c4 (3:42c4) +SafariSteps: db "/500@" -SafariBallText: ; c5c9 (3:42c9) - db "BALL×× @"
\ No newline at end of file +SafariBallText: + db "BALL×× @" diff --git a/engine/overworld/replace_tile_block.asm b/engine/overworld/replace_tile_block.asm index 32c652ea..8577b9e7 100644 --- a/engine/overworld/replace_tile_block.asm +++ b/engine/overworld/replace_tile_block.asm @@ -2,7 +2,7 @@ ; and redraws the map view if necessary ; b = Y ; c = X -ReplaceTileBlock: ; ed1b (3:6d1b) +ReplaceTileBlock: call GetPredefRegisters ld hl, wOverworldMap ld a, [wCurMapWidth] @@ -46,7 +46,7 @@ ReplaceTileBlock: ; ed1b (3:6d1b) call CompareHLWithBC ret c ; return if the replaced tile block is above the map view in memory -RedrawMapView: ; ed59 (3:6d59) +RedrawMapView: ld a, [wIsInBattle] inc a ret z @@ -117,10 +117,10 @@ RedrawMapView: ; ed59 (3:6d59) ld [H_AUTOBGTRANSFERENABLED], a ret -CompareHLWithBC: ; edcb (3:6dcb) +CompareHLWithBC: ld a, h sub b ret nz ld a, l sub c - ret
\ No newline at end of file + ret diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm index 83d73d02..3b26b6f8 100755 --- a/engine/overworld/saffron_guards.asm +++ b/engine/overworld/saffron_guards.asm @@ -1,4 +1,4 @@ -RemoveGuardDrink: ; 5a53a (16:653a) +RemoveGuardDrink: ld hl, GuardDrinksList .drinkLoop ld a, [hli] @@ -12,5 +12,5 @@ RemoveGuardDrink: ; 5a53a (16:653a) jr z, .drinkLoop jpba RemoveItemByID -GuardDrinksList: ; 5a552 (16:6552) +GuardDrinksList: db FRESH_WATER, SODA_POP, LEMONADE, $00 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm index 5faef173..9bfe82bd 100644 --- a/engine/overworld/set_blackout_map.asm +++ b/engine/overworld/set_blackout_map.asm @@ -1,4 +1,4 @@ -SetLastBlackoutMap: ; 6ef0 (1:6ef0) +SetLastBlackoutMap: ; Set the map to return to when ; blacking out or using Teleport or Dig. ; Safari rest houses don't count. @@ -22,8 +22,8 @@ SetLastBlackoutMap: ; 6ef0 (1:6ef0) pop hl ret -SafariZoneRestHouses: ; 6f0a (1:6f0a) +SafariZoneRestHouses: db SAFARI_ZONE_REST_HOUSE_2 db SAFARI_ZONE_REST_HOUSE_3 db SAFARI_ZONE_REST_HOUSE_4 - db -1
\ No newline at end of file + db -1 diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm index 8c1b4159..4814e668 100644 --- a/engine/overworld/special_warps.asm +++ b/engine/overworld/special_warps.asm @@ -1,4 +1,4 @@ -SpecialWarpIn: ; 6042 (1:6042) +SpecialWarpIn: call LoadSpecialWarpData predef LoadTilesetHeader ld hl,wd732 @@ -29,7 +29,7 @@ SpecialWarpIn: ; 6042 (1:6042) ret ; gets the map ID, tile block map view pointer, tileset, and coordinates -LoadSpecialWarpData: ; 6073 (1:6073) +LoadSpecialWarpData: ld a, [wd72d] cp TRADE_CENTER jr nz, .notTradeCenter @@ -144,4 +144,4 @@ LoadSpecialWarpData: ; 6073 (1:6073) ld [wXOffsetSinceLastSpecialWarp], a ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps ld [wDestinationWarpID], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index d0d957be..347dc459 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -1,4 +1,4 @@ -AnimateBoulderDust: ; 7a0fb (1e:60fb) +AnimateBoulderDust: ld a, $1 ld [wWhichAnimationOffsets], a ; select the boulder dust offsets ld a, [wUpdateSpritesEnabled] @@ -31,7 +31,7 @@ AnimateBoulderDust: ; 7a0fb (1e:60fb) ld [wUpdateSpritesEnabled], a jp LoadPlayerSpriteGraphics -GetMoveBoulderDustFunctionPointer: ; 7913f (1e:613f) +GetMoveBoulderDustFunctionPointer: ld a, [wPlayerFacingDirection] ; player's sprite facing direction ld hl, MoveBoulderDustFunctionPointerTable ld c, a @@ -53,7 +53,7 @@ GetMoveBoulderDustFunctionPointer: ; 7913f (1e:613f) pop hl ret -MoveBoulderDustFunctionPointerTable: ; 7a15d (1e:615d) +MoveBoulderDustFunctionPointerTable: ; facing down db $FF,$00 dw AdjustOAMBlockYPos @@ -70,7 +70,7 @@ MoveBoulderDustFunctionPointerTable: ; 7a15d (1e:615d) db $FF,$01 dw AdjustOAMBlockXPos -LoadSmokeTileFourTimes: ; 7916d (1e:616d) +LoadSmokeTileFourTimes: ld hl, vChars1 + $7c0 ld c, $4 .loop @@ -85,11 +85,11 @@ LoadSmokeTileFourTimes: ; 7916d (1e:616d) jr nz, .loop ret -LoadSmokeTile: ; 7a181 (1e:6181) +LoadSmokeTile: ld de, SSAnneSmokePuffTile lb bc, BANK(SSAnneSmokePuffTile), (SSAnneSmokePuffTileEnd - SSAnneSmokePuffTile) / $10 jp CopyVideoData -SSAnneSmokePuffTile: ; 7a18a (1e:618a) +SSAnneSmokePuffTile: INCBIN "gfx/ss_anne_smoke_puff.2bpp" SSAnneSmokePuffTileEnd: diff --git a/engine/overworld/step_functions.asm b/engine/overworld/step_functions.asm index bc1a74aa..84b09291 100644 --- a/engine/overworld/step_functions.asm +++ b/engine/overworld/step_functions.asm @@ -1,4 +1,4 @@ -ApplyOutOfBattlePoisonDamage: ; c3de (3:43de) +ApplyOutOfBattlePoisonDamage: ld a, [wd730] add a jp c, .noBlackOut ; no black out if joypad states are being simulated @@ -124,7 +124,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de) ld [wOutOfBattleBlackout], a ret -Func_c4c7: ; c4c7 (3:44c7) +Func_c4c7: ld a, [wStepCounter] and a jr nz, .asm_c4de @@ -148,4 +148,4 @@ Func_c4c7: ; c4c7 (3:44c7) .asm_c4ef xor a ld [wd49c], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 9dee81bd..655c6b2a 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -1,4 +1,4 @@ -_GetSpritePosition1: ; 56745 (15:6745) +_GetSpritePosition1: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -17,7 +17,7 @@ _GetSpritePosition1: ; 56745 (15:6745) ld [$ffee], a ret -_GetSpritePosition2: ; 56765 (15:6765) +_GetSpritePosition2: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -36,7 +36,7 @@ _GetSpritePosition2: ; 56765 (15:6765) ld [wSavedSpriteMapX], a ret -_SetSpritePosition1: ; 56789 (15:6789) +_SetSpritePosition1: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -55,9 +55,9 @@ _SetSpritePosition1: ; 56789 (15:6789) ld [hl], a ret -_SetSpritePosition2: ; 567a9 (15:67a9) +_SetSpritePosition2: ld hl, wSpriteStateData1 - ld de, $4 + ld de, 4 ld a, [wSpriteIndex] ld [H_SPRITEINDEX], a call GetSpriteDataPointer @@ -74,7 +74,7 @@ _SetSpritePosition2: ; 567a9 (15:67a9) ld [hl], a ; c2x5 (map X pos) ret -TrainerWalkUpToPlayer: ; 567cd (15:67cd) +TrainerWalkUpToPlayer: ld a, [wSpriteIndex] swap a ld [wTrainerSpriteOffset], a @@ -149,7 +149,7 @@ TrainerWalkUpToPlayer: ; 567cd (15:67cd) ; input: de = offset within sprite entry ; output: hl = pointer to sprite data -GetSpriteDataPointer: ; 5684f (15:684f) +GetSpriteDataPointer: push de add hl, de ld a, [H_SPRITEINDEX] @@ -161,7 +161,7 @@ GetSpriteDataPointer: ; 5684f (15:684f) ret ; tests if this trainer is in the right position to engage the player and do so if she is. -TrainerEngage: ; 5685b (15:685b) +TrainerEngage: push hl push de ld a, [wTrainerSpriteOffset] @@ -232,7 +232,7 @@ TrainerEngage: ; 5685b (15:685b) ret ; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX -ReadTrainerScreenPosition: ; 568da (15:68da) +ReadTrainerScreenPosition: ld a, [wTrainerSpriteOffset] add $4 ld d, $0 @@ -254,7 +254,7 @@ ReadTrainerScreenPosition: ; 568da (15:68da) ; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite ; note that this does not necessarily mean the sprite is seeing the player, he could be behind it's back ; a: distance player to sprite -CheckSpriteCanSeePlayer: ; 569af (15:69af) +CheckSpriteCanSeePlayer: ld b, a ld a, [wTrainerEngageDistance] ; how far the trainer can see cp b @@ -262,13 +262,13 @@ CheckSpriteCanSeePlayer: ; 569af (15:69af) jr .notInLine ; player too far away .checkIfLinedUp ld a, [wTrainerFacingDirection] ; sprite facing direction - cp SPRITE_FACING_DOWN ; down + cp SPRITE_FACING_DOWN jr z, .checkXCoord - cp SPRITE_FACING_UP ; up + cp SPRITE_FACING_UP jr z, .checkXCoord - cp SPRITE_FACING_LEFT ; left + cp SPRITE_FACING_LEFT jr z, .checkYCoord - cp SPRITE_FACING_RIGHT ; right + cp SPRITE_FACING_RIGHT jr z, .checkYCoord jr .notInLine .checkXCoord @@ -290,7 +290,7 @@ CheckSpriteCanSeePlayer: ; 569af (15:69af) ret ; tests if the player is in front of the sprite (rather than behind it) -CheckPlayerIsInFrontOfSprite: ; 5692f (15:692f) +CheckPlayerIsInFrontOfSprite: ld a, [wCurMap] cp POWER_PLANT jp z, .engage ; bypass this for power plant to get voltorb fake items to work diff --git a/engine/overworld/try_pushing_boulder.asm b/engine/overworld/try_pushing_boulder.asm index b7e04092..a00790b9 100644 --- a/engine/overworld/try_pushing_boulder.asm +++ b/engine/overworld/try_pushing_boulder.asm @@ -1,8 +1,8 @@ -TryPushingBoulder: ; f0a1 (3:70a1) +TryPushingBoulder: ld a, [wd728] bit 0, a ; using Strength? ret z -Func_f0a7: ; f0a7 (3:70a7) +Func_f0a7: ; where LoadMissableObjects predef points to now ld a, [wFlags_0xcd60] bit 1, a ; has boulder dust animation from previous push played yet? @@ -72,19 +72,19 @@ Func_f0a7: ; f0a7 (3:70a7) set 1, [hl] ret -PushBoulderUpMovementData: ; f129 (3:7129) +PushBoulderUpMovementData: db NPC_MOVEMENT_UP,$FF -PushBoulderDownMovementData: ; f12b (3:712b) +PushBoulderDownMovementData: db NPC_MOVEMENT_DOWN,$FF -PushBoulderLeftMovementData: ; f12d (3:712d) +PushBoulderLeftMovementData: db NPC_MOVEMENT_LEFT,$FF -PushBoulderRightMovementData: ; f12f (3:712f) +PushBoulderRightMovementData: db NPC_MOVEMENT_RIGHT,$FF -DoBoulderDustAnimation: ; f131 (3:7131) +DoBoulderDustAnimation: ld a, [wd730] bit 0, a ret nz @@ -100,8 +100,8 @@ DoBoulderDustAnimation: ; f131 (3:7131) ld a, SFX_CUT jp PlaySound -ResetBoulderPushFlags: ; f159 (3:7159) +ResetBoulderPushFlags: ld hl, wFlags_0xcd60 res 1, [hl] res 6, [hl] - ret
\ No newline at end of file + ret diff --git a/engine/palettes.asm b/engine/palettes.asm index 636e5e97..c6c234ae 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -1,4 +1,4 @@ -_RunPaletteCommand: ; 71ddf (1c:5ddf) +_RunPaletteCommand: call GetPredefRegisters ld a, b cp $ff @@ -19,13 +19,13 @@ _RunPaletteCommand: ; 71ddf (1c:5ddf) push de jp [hl] -SetPal_Black: ; 71ed3 (1c:5ed3) +SetPal_Black: ld hl, PalPacket_Black ld de, BlkPacket_Battle ret ; uses PalPacket_Empty to build a packet based on mon IDs and health color -SetPal_Battle: ; 71eda (1c:5eda) +SetPal_Battle: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -66,13 +66,13 @@ SetPal_Battle: ; 71eda (1c:5eda) ld [wDefaultPaletteCommand], a ret -SetPal_TownMap: ; 71f26 (1c:5f26) +SetPal_TownMap: ld hl, PalPacket_TownMap ld de, BlkPacket_WholeScreen ret ; uses PalPacket_Empty to build a packet based the mon ID -SetPal_StatusScreen: ; 71f2d (1c:5f2d) +SetPal_StatusScreen: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -95,12 +95,12 @@ SetPal_StatusScreen: ; 71f2d (1c:5f2d) ld de, BlkPacket_StatusScreen ret -SetPal_PartyMenu: ; 71f59 (1c:5f59) +SetPal_PartyMenu: ld hl, PalPacket_PartyMenu ld de, wPartyMenuBlkPacket ret -SetPal_Pokedex: ; 71f60 (1c:5f60) +SetPal_Pokedex: ld hl, PalPacket_Pokedex ld de, wPalPacket ld bc, $10 @@ -113,28 +113,28 @@ SetPal_Pokedex: ; 71f60 (1c:5f60) ld de, BlkPacket_Pokedex ret -SetPal_Slots: ; 71f7d (1c:5f7d) +SetPal_Slots: ld hl, PalPacket_Slots ld de, BlkPacket_Slots ret -SetPal_Titlescreen: ; 71f84 (1c:5f84) +SetPal_Titlescreen: ld hl, PalPacket_Titlescreen ld de, BlkPacket_Titlescreen ret ; used mostly for menus and the Oak intro -SetPal_Generic: ; 71f8b (1c:5f8b) +SetPal_Generic: ld hl, PalPacket_Generic ld de, BlkPacket_WholeScreen ret -SetPal_NidorinoIntro: ; 71f92 (1c:5f92) +SetPal_NidorinoIntro: ld hl, PalPacket_NidorinoIntro ld de, BlkPacket_NidorinoIntro ret -SetPal_GameFreakIntro: ; 71f99 (1c:5f99) +SetPal_GameFreakIntro: ld hl, PalPacket_GameFreakIntro ld de, BlkPacket_GameFreakIntro ld a, SET_PAL_GENERIC @@ -142,7 +142,7 @@ SetPal_GameFreakIntro: ; 71f99 (1c:5f99) ret ; uses PalPacket_Empty to build a packet based on the current map -SetPal_Overworld: ; 71fa5 (1c:5fa5) +SetPal_Overworld: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -181,26 +181,22 @@ SetPal_Overworld: ; 71fa5 (1c:5fa5) ld a, SET_PAL_OVERWORLD ld [wDefaultPaletteCommand], a ret - .PokemonTowerOrAgatha ld a, PAL_GREYMON - 1 jr .town - .caveOrBruno ld a, PAL_CAVE - 1 jr .town - .Lorelei xor a jr .town - .trade_center_colosseum ld a, PAL_GREYMON - 1 jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame -SetPal_PokemonWholeScreen: ; 72001 (1c:6001) +SetPal_PokemonWholeScreen: push bc ld hl, PalPacket_Empty ld de, wPalPacket @@ -219,7 +215,7 @@ SetPal_PokemonWholeScreen: ; 72001 (1c:6001) ld de, BlkPacket_WholeScreen ret -SetPal_TrainerCard: ; 72025 (1c:6025) +SetPal_TrainerCard: ld hl, BlkPacket_TrainerCard ld de, wTrainerCardBlkPacket ld bc, $40 @@ -259,17 +255,17 @@ SetPal_TrainerCard: ; 72025 (1c:6025) ld de, wTrainerCardBlkPacket ret -SendUnknownPalPacket_7205d:: ; 7205d (1c:605d) +SendUnknownPalPacket_7205d:: ld hl, UnknownPalPacket_72811 ld de, BlkPacket_WholeScreen ret -SendUnknownPalPacket_72064:: ; 72064 (1c:6064) +SendUnknownPalPacket_72064:: ld hl, UnknownPalPacket_72821 ld de, UnknownPacket_72751 ret -SetPalFunctions: ; 7206b (1c:606b) +SetPalFunctions: dw SetPal_Black dw SetPal_Battle dw SetPal_TownMap @@ -289,7 +285,7 @@ SetPalFunctions: ; 7206b (1c:606b) ; The length of the blk data of each badge on the Trainer Card. ; The Rainbow Badge has 3 entries because of its many colors. -BadgeBlkDataLengths: ; 7208b (1c:608b) +BadgeBlkDataLengths: db 6 ; Boulder Badge db 6 ; Cascade Badge db 6 ; Thunder Badge @@ -299,9 +295,9 @@ BadgeBlkDataLengths: ; 7208b (1c:608b) db 6 ; Volcano Badge db 6 ; Earth Badge -DeterminePaletteID: ; 72093 (1c:6093) +DeterminePaletteID: ld a, [hl] -DeterminePaletteIDOutOfBattle: ; 72094 (1c:6094) +DeterminePaletteIDOutOfBattle: ld [wd11e], a and a ; is the mon index 0? jr z, .skipDexNumConversion @@ -317,7 +313,7 @@ DeterminePaletteIDOutOfBattle: ; 72094 (1c:6094) ld a, [hl] ret -YellowIntroPaletteAction:: ; 720ad (1c:60ad) +YellowIntroPaletteAction:: ld a, e and a jr nz, .asm_720bd @@ -347,7 +343,7 @@ YellowIntroPaletteAction:: ; 720ad (1c:60ad) call TransferCurBGPData ret -LoadOverworldPikachuFrontpicPalettes:: ; 720e3 (1c:60e3) +LoadOverworldPikachuFrontpicPalettes:: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -395,7 +391,7 @@ LoadOverworldPikachuFrontpicPalettes:: ; 720e3 (1c:60e3) .okay_2 ret -GetPal_Pikachu:: ; 7213b (1c:613b) +GetPal_Pikachu:: ; similar to SetPal_Overworld ld a, [wCurMapTileset] cp CEMETERY @@ -443,13 +439,13 @@ GetPal_Pikachu:: ; 7213b (1c:613b) ld a, PAL_GREYMON - 1 jr .town -InitPartyMenuBlkPacket: ; 7217f (1c:617f) +InitPartyMenuBlkPacket: ld hl, BlkPacket_PartyMenu ld de, wPartyMenuBlkPacket ld bc, $30 jp CopyData -UpdatePartyMenuBlkPacket: ; 7218b (1c:618b) +UpdatePartyMenuBlkPacket: ; Update the blk packet with the palette of the HP bar that is ; specified in [wWhichPartyMenuHPBar]. ld hl, wPartyMenuHPBarColors @@ -477,7 +473,7 @@ UpdatePartyMenuBlkPacket: ; 7218b (1c:618b) ld [hl], e ret -SendSGBPacket: ; 721b4 (1c:61b4) +SendSGBPacket: ld a, 1 ld [hDisableJoypadPolling], a ; don't poll joypad while sending packet call _SendSGBPacket @@ -485,7 +481,7 @@ SendSGBPacket: ; 721b4 (1c:61b4) ld [hDisableJoypadPolling], a ret -_SendSGBPacket: ; 71feb (1c:5feb) +_SendSGBPacket: ;check number of packets ld a, [hl] and a, $07 @@ -535,9 +531,8 @@ _SendSGBPacket: ; 71feb (1c:5feb) ; set P14=HIGH, P15=HIGH ld a, $30 ld [rJOYP], a - call Wait7000 ; wait for about 70000 cycles -; call Wait7000 + call Wait7000 ; restore (previously pushed) number of packets pop bc dec b @@ -546,7 +541,7 @@ _SendSGBPacket: ; 71feb (1c:5feb) ; else send 16 more bytes jr .loop2 -LoadSGB: ; 721f8 (1c:61f8) +LoadSGB: xor a ld [wOnSGB], a call CheckSGB @@ -583,7 +578,7 @@ LoadSGB: ; 721f8 (1c:61f8) ld hl, MaskEnCancelPacket jp SendSGBPacket -PrepareSuperNintendoVRAMTransfer: ; 72247 (1c:6247) +PrepareSuperNintendoVRAMTransfer: ld hl, .packetPointers ld c, 9 .loop @@ -612,7 +607,8 @@ PrepareSuperNintendoVRAMTransfer: ; 72247 (1c:6247) dw DataSnd_72901 dw DataSnd_72911 -CheckSGB: ; 7226d (1c:626d) +CheckSGB: +; Returns whether the game is running on an SGB in carry. ld hl, MltReq2Packet call SendSGBPacket call Wait7000 @@ -659,12 +655,12 @@ CheckSGB: ; 7226d (1c:626d) scf ret -SendMltReq1Packet: ; 722ce (1c:62ce) +SendMltReq1Packet: ld hl, MltReq1Packet call SendSGBPacket jp Wait7000 -CopyGfxToSuperNintendoVRAM: ; 722d7 (1c:62d7) +CopyGfxToSuperNintendoVRAM: di push de call DisableLCD @@ -705,7 +701,7 @@ CopyGfxToSuperNintendoVRAM: ; 722d7 (1c:62d7) ei ret -Wait7000: ; 7231c (1c:631c) +Wait7000: ; Each loop takes 9 cycles so this routine actually waits 63000 cycles. ld de, 7000 .loop @@ -718,7 +714,7 @@ Wait7000: ; 7231c (1c:631c) jr nz, .loop ret -SendSGBPackets: ; 72328 (1c:6328) +SendSGBPackets: ld a, [hGBC] and a jr z, .notGBC @@ -737,7 +733,7 @@ SendSGBPackets: ; 72328 (1c:6328) pop hl jp SendSGBPacket -InitGBCPalettes: ; 72346 (1c:6346) +InitGBCPalettes: ld a, [hl] and $f8 cp $20 @@ -785,7 +781,7 @@ index = index + 1 ret -GetGBCBasePalAddress:: ; 723fe (1c:63fe) +GetGBCBasePalAddress:: ; Input: a = palette ID ; Output: de = palette address push hl @@ -804,7 +800,7 @@ GetGBCBasePalAddress:: ; 723fe (1c:63fe) pop hl ret -DMGPalToGBCPal:: ; 7240f (1c:640f) +DMGPalToGBCPal:: ; Populate wGBCPal with colors from a base palette, selected using one of the ; DMG palette registers. ; Input: @@ -845,7 +841,7 @@ color_index = color_index + 1 ENDR ret -.GetColorAddress: ; 7246a (1c:646a) +.GetColorAddress: add a ld l, a xor a @@ -853,7 +849,7 @@ color_index = color_index + 1 add hl, de ret -TransferCurBGPData:: ; 72470 (1c:6470) +TransferCurBGPData:: push de add a add a @@ -878,7 +874,7 @@ TransferCurBGPData:: ; 72470 (1c:6470) pop de ret -BufferBGPPal:: ; 724a2 (1c:64a2) +BufferBGPPal:: ; Copy wGBCPal to palette a in wBGPPalsBuffer. push de add a @@ -900,7 +896,7 @@ BufferBGPPal:: ; 724a2 (1c:64a2) pop de ret -TransferBGPPals:: ; 724ba (1c:64ba) +TransferBGPPals:: ; Transfer the buffered BG palettes. ld a, [rLCDC] and rLCDC_ENABLE_MASK @@ -915,7 +911,7 @@ TransferBGPPals:: ; 724ba (1c:64ba) ei ret -.DoTransfer: ; 724cc (1c:64cc) +.DoTransfer: xor a or $80 ; auto-increment ld [rBGPI], a @@ -929,7 +925,7 @@ TransferBGPPals:: ; 724ba (1c:64ba) jr nz, .loop ret -TransferCurOBPData: ; 724df (1c:64df) +TransferCurOBPData: push de add a add a @@ -954,7 +950,7 @@ TransferCurOBPData: ; 724df (1c:64df) pop de ret -TransferPalColorLCDEnabled: ; 72511 (1c:6511) +TransferPalColorLCDEnabled: ; Transfer a palette color while the LCD is enabled. ; In case we're already in H-blank or V-blank, wait for it to end. This is a @@ -970,7 +966,7 @@ TransferPalColorLCDEnabled: ; 72511 (1c:6511) jr nz, .notInBlankingPeriod ; fall through -TransferPalColorLCDDisabled: ; 7251b (1c:651b) +TransferPalColorLCDDisabled: ; Transfer a palette color while the LCD is disabled. ld a, [hli] ld [de], a @@ -978,13 +974,13 @@ TransferPalColorLCDDisabled: ; 7251b (1c:651b) ld [de], a ret -_UpdateGBCPal_BGP_CheckDMG:: ; 72520 (1c:6520) +_UpdateGBCPal_BGP_CheckDMG:: ld a, [hGBC] and a ret z ; fall through -_UpdateGBCPal_BGP:: ; 72524 (1c:6524) +_UpdateGBCPal_BGP:: index = 0 REPT NUM_ACTIVE_PALS @@ -1003,7 +999,7 @@ index = index + 1 call TransferBGPPals ret -_UpdateGBCPal_OBP:: ; 7256c (1c:656c) +_UpdateGBCPal_OBP:: index = 0 REPT NUM_ACTIVE_PALS @@ -1033,7 +1029,7 @@ index = index + 1 ret -TranslatePalPacketToBGMapAttributes:: ; 725be (1c:65be) +TranslatePalPacketToBGMapAttributes:: ; translate the SGB pal packets into something usable for the GBC push hl pop de @@ -1064,7 +1060,7 @@ TranslatePalPacketToBGMapAttributes:: ; 725be (1c:65be) callba LoadBGMapAttributes ret -PalPacketPointers:: ; 725e2 (1c:65e2) +PalPacketPointers:: db (palPacketPointersEnd - palPacketPointers) / 2 palPacketPointers dw BlkPacket_WholeScreen @@ -1081,7 +1077,7 @@ palPacketPointers dw UnknownPacket_72751 palPacketPointersEnd -CopySGBBorderTiles: ; 725fb (1c:65fb) +CopySGBBorderTiles: ; SGB tile data is stored in a 4BPP planar format. ; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while ; the second 16 bytes contain bit planes 3 and 4. @@ -1117,4 +1113,4 @@ INCLUDE "data/mon_palettes.asm" INCLUDE "data/super_palettes.asm" -INCLUDE "data/sgb_border.asm"
\ No newline at end of file +INCLUDE "data/sgb_border.asm" diff --git a/engine/pikachu_emotions.asm b/engine/pikachu_emotions.asm index 9040e612..8702bc3f 100755 --- a/engine/pikachu_emotions.asm +++ b/engine/pikachu_emotions.asm @@ -1,4 +1,4 @@ -IsPlayerTalkingToPikachu:: ; fcf0c (3f:4f0c) +IsPlayerTalkingToPikachu: ld a, [wd436] and a ret z @@ -11,7 +11,7 @@ IsPlayerTalkingToPikachu:: ; fcf0c (3f:4f0c) ld [wd436], a ret -InitializePikachuTextID: ; fcf20 (3f:4f20) +InitializePikachuTextID: ld a, $d4 ; display ld [hSpriteIndexOrTextID], a xor a @@ -23,9 +23,9 @@ InitializePikachuTextID: ; fcf20 (3f:4f20) ld [wAutoTextBoxDrawingControl], a ret -DoStarterPikachuEmotions: ; fcf35 (3f:4f35) +DoStarterPikachuEmotions: ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld e, [hl] @@ -37,7 +37,7 @@ DoStarterPikachuEmotions: ; fcf35 (3f:4f35) cp $ff jr z, .done ld c, a - ld b, $0 + ld b, 0 ld hl, StarterPikachuEmotionsJumptable add hl, bc add hl, bc @@ -46,10 +46,11 @@ DoStarterPikachuEmotions: ; fcf35 (3f:4f35) ld l, a call JumpToAddress jr .loop + .done ret -StarterPikachuEmotionsJumptable: ; fcf54 (3f:4f54) +StarterPikachuEmotionsJumptable: dw StarterPikachuEmotionCommand_nop ; 0 dw StarterPikachuEmotionCommand_text ; 1 dw StarterPikachuEmotionCommand_pcm ; 2 @@ -62,11 +63,11 @@ StarterPikachuEmotionsJumptable: ; fcf54 (3f:4f54) dw StarterPikachuEmotionCommand_9 ; 9 dw StarterPikachuEmotionCommand_nop3 ; a -StarterPikachuEmotionCommand_nop: ; fcf6a (3f:4f6a) -StarterPikachuEmotionCommand_nop3: ; fcf6a (3f:4f6a) +StarterPikachuEmotionCommand_nop: +StarterPikachuEmotionCommand_nop3: ret -StarterPikachuEmotionCommand_text: ; fcf6b (3f:4f6b) +StarterPikachuEmotionCommand_text: ld a, [de] ld l, a inc de @@ -78,7 +79,7 @@ StarterPikachuEmotionCommand_text: ; fcf6b (3f:4f6b) pop de ret -StarterPikachuEmotionCommand_pcm: ; fcf77 (3f:4f77) +StarterPikachuEmotionCommand_pcm: ld a, [de] inc de push de @@ -88,13 +89,13 @@ StarterPikachuEmotionCommand_pcm: ; fcf77 (3f:4f77) pop de ret -PlayPikachuSoundClip_: ; fcf81 (3f:4f81) +PlayPikachuSoundClip_: cp $ff ret z callab PlayPikachuSoundClip ret -StarterPikachuEmotionCommand_emote: ; fcf8d (3f:4f8d) +StarterPikachuEmotionCommand_emote: ld a, [wUpdateSpritesEnabled] push af ld a, $ff @@ -108,14 +109,14 @@ StarterPikachuEmotionCommand_emote: ; fcf8d (3f:4f8d) ld [wUpdateSpritesEnabled], a ret -ShowPikachuEmoteBubble: ; fcfa2 (3f:4fa2) +ShowPikachuEmoteBubble: ld [wWhichEmotionBubble], a - ld a, $f + ld a, $f ; Pikachu ld [wEmotionBubbleSpriteIndex], a predef EmotionBubble ret -StarterPikachuEmotionCommand_movement: ; fcfb0 (3f:4fb0) +StarterPikachuEmotionCommand_movement: ld a, [de] inc de ld l, a @@ -128,7 +129,7 @@ StarterPikachuEmotionCommand_movement: ; fcfb0 (3f:4fb0) pop de ret -StarterPikachuEmotionCommand_delay: ; fcfbe (3f:4fbe) +StarterPikachuEmotionCommand_delay: ld a, [de] inc de push de @@ -137,13 +138,13 @@ StarterPikachuEmotionCommand_delay: ; fcfbe (3f:4fbe) pop de ret -StarterPikachuEmotionCommand_subcmd: ; fcfc7 (3f:4fc7) +StarterPikachuEmotionCommand_subcmd: ld a, [de] inc de push de ld e, a - ld d, $0 - ld hl, Jumptable_fcfda + ld d, 0 + ld hl, .Subcommands add hl, de add hl, de ld a, [hli] @@ -153,7 +154,7 @@ StarterPikachuEmotionCommand_subcmd: ; fcfc7 (3f:4fc7) pop de ret -Jumptable_fcfda: +.Subcommands: dw LoadPikachuSpriteIntoVRAM dw LoadFontTilePatterns dw Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3 @@ -162,94 +163,98 @@ Jumptable_fcfda: dw PikachuFanClubCheck dw PikachuBillsHouseCheck -StarterPikachuEmotionCommand_nop2: ; fcfe8 (3f:4fe8) +StarterPikachuEmotionCommand_nop2: ret -StarterPikachuEmotionCommand_9: ; fcfe9 (3f:4fe9) +StarterPikachuEmotionCommand_9: push de call StarterPikachuEmotionCommand_turnawayfromplayer call UpdateSprites pop de ret -StarterPikachuEmotionCommand_turnawayfromplayer: ; fcff2 (3f:4ff2) +StarterPikachuEmotionCommand_turnawayfromplayer: ld a, [wPlayerFacingDirection] xor $4 ld [wPikachuFacingDirection], a ret -DeletedFunction_fcffb: ; fcffb (3f:4ffb) +DeletedFunction_fcffb: ; Inexplicably empty. rept 5 nop endr ret -Func_fd001:: ; fd001 (3f:5001) +PlaySpecificPikachuEmotion: ld a, e jr load_expression -Func_fd004:: ; fd004 (3f:5004) +TalkToPikachu: call MapSpecificPikachuExpression jr c, load_expression call GetPikaPicAnimationScriptIndex call DeletedFunction_fcffb -load_expression: ; fd00f (3f:500f) +load_expression: ld [wExpressionNumber], a ld hl, PikachuEmotionTable call DoStarterPikachuEmotions ret -PikachuEmotionTable: ; fd019 (3f:4019) - dw PikachuEmotion0_fd115 - dw PikachuEmotion1_fd141 - dw PikachuEmotion2_fd116 - dw PikachuEmotion3_fd160 - dw PikachuEmotion4_fd136 - dw PikachuEmotion5_fd14d - dw PikachuEmotion6_fd153 - dw PikachuEmotion7_fd128 - dw PikachuEmotion8_fd147 - dw PikachuEmotion9_fd166 - dw PikachuEmotion10_fd11e - dw PikachuEmotion11_fd173 - dw PikachuEmotion12_fd17a - dw PikachuEmotion13_fd180 - dw PikachuEmotion14_fd189 - dw PikachuEmotion15_fd191 - dw PikachuEmotion16_fd197 - dw PikachuEmotion17_fd19d - dw PikachuEmotion18_fd1a3 - dw PikachuEmotion19_fd1a9 - dw PikachuEmotion20_fd1b1 - dw PikachuEmotion21_fd1b9 ; used a fishing rod - dw PikachuEmotion22_fd1c1 - dw PikachuEmotion23_fd1c7 - dw PikachuEmotion24_fd1cf - dw PikachuEmotion25_fd1d7 - dw PikachuEmotion26_fd1df ; wake up pikachu in pewter pokemon center - dw PikachuEmotion27_fd1eb - dw PikachuEmotion28_fd1f1 - dw PikachuEmotion29_fd1f7 - dw PikachuEmotion30_fd1fc - dw PikachuEmotion31_fd20a - dw PikachuEmotion32_fd213 - dw PikachuEmotion33_fd05d +PikachuEmotionTable: +pikaemotion_def: MACRO +\1_id: dw \1 + endm + + pikaemotion_def PikachuEmotion0 + pikaemotion_def PikachuEmotion1 + pikaemotion_def PikachuEmotion2 + pikaemotion_def PikachuEmotion3 + pikaemotion_def PikachuEmotion4 + pikaemotion_def PikachuEmotion5 + pikaemotion_def PikachuEmotion6 + pikaemotion_def PikachuEmotion7 + pikaemotion_def PikachuEmotion8 + pikaemotion_def PikachuEmotion9 + pikaemotion_def PikachuEmotion10 + pikaemotion_def PikachuEmotion11 + pikaemotion_def PikachuEmotion12 + pikaemotion_def PikachuEmotion13 + pikaemotion_def PikachuEmotion14 + pikaemotion_def PikachuEmotion15 + pikaemotion_def PikachuEmotion16 + pikaemotion_def PikachuEmotion17 + pikaemotion_def PikachuEmotion18 + pikaemotion_def PikachuEmotion19 + pikaemotion_def PikachuEmotion20 + pikaemotion_def PikachuEmotion21 ; used a fishing rod + pikaemotion_def PikachuEmotion22 + pikaemotion_def PikachuEmotion23 + pikaemotion_def PikachuEmotion24 + pikaemotion_def PikachuEmotion25 + pikaemotion_def PikachuEmotion26 ; wake up pikachu in pewter pokemon center + pikaemotion_def PikachuEmotion27 + pikaemotion_def PikachuEmotion28 + pikaemotion_def PikachuEmotion29 + pikaemotion_def PikachuEmotion30 + pikaemotion_def PikachuEmotion31 + pikaemotion_def PikachuEmotion32 + pikaemotion_def PikachuEmotion33 -PikachuEmotion33_fd05d: ; fd05d (3f:505d) +PikachuEmotion33: db $ff -MapSpecificPikachuExpression: ; fd05e (3f:505e) +MapSpecificPikachuExpression: ld a, [wCurMap] cp POKEMON_FAN_CLUB jr nz, .notFanClub ld hl, wd492 bit 7, [hl] - ld a, $1d - jr z, .set_carry + ldpikaemotion a, PikachuEmotion29 + jr z, .play_emotion call CheckPikachuFollowingPlayer - ld a, $1e - jr nz, .set_carry + ldpikaemotion a, PikachuEmotion30 + jr nz, .play_emotion jr .check_pikachu_status .notFanClub @@ -257,60 +262,64 @@ MapSpecificPikachuExpression: ; fd05e (3f:505e) cp PEWTER_POKECENTER jr nz, .notPewterPokecenter call CheckPikachuFollowingPlayer - ld a, $1a - jr nz, .set_carry + ldpikaemotion a, PikachuEmotion26 + jr nz, .play_emotion jr .check_pikachu_status .notPewterPokecenter callab Func_f24ae ld a, e cp $ff - jr nz, .set_carry + jr nz, .play_emotion jr .check_pikachu_status ; useless .check_pikachu_status call IsPlayerPikachuAsleepInParty - ld a, $b - jr c, .set_carry + ldpikaemotion a, PikachuEmotion11 + jr c, .play_emotion callab CheckPikachuFaintedOrStatused ; same bank - ld a, $1c - jr c, .set_carry + ldpikaemotion a, PikachuEmotion28 + jr c, .play_emotion ld a, [wCurMap] cp POKEMONTOWER_1 jr c, .notInLavenderTower cp POKEMONTOWER_7 + 1 - ld a, $16 - jr c, .set_carry + ldpikaemotion a, PikachuEmotion22 + jr c, .play_emotion .notInLavenderTower ld a, [wd49c] and a - jr z, .no_carry + jr z, .mood_based_emotion dec a ld c, a ld b, $0 - ld hl, Pointer_fd0cb + ld hl, .Emotions add hl, bc ld a, [hl] - jr .set_carry + jr .play_emotion -.no_carry +.mood_based_emotion and a ret -.set_carry +.play_emotion scf ret -Pointer_fd0cb: - db $12, $15, $17, $18, $19 +.Emotions: + dpikaemotion PikachuEmotion18 + dpikaemotion PikachuEmotion21 + dpikaemotion PikachuEmotion23 + dpikaemotion PikachuEmotion24 + dpikaemotion PikachuEmotion25 -IsPlayerPikachuAsleepInParty:: ; fd0d0 (3f:50d0) +IsPlayerPikachuAsleepInParty: xor a ld [wWhichPokemon], a .loop ld a, [wWhichPokemon] ld c, a - ld b, $0 + ld b, 0 ld hl, wPartySpecies add hl, bc ld a, [hl] @@ -328,6 +337,7 @@ IsPlayerPikachuAsleepInParty:: ; fd0d0 (3f:50d0) and SLP jr z, .done jr .curMonSleepingPikachu + .curMonNotStarterPikachu ld a, [wWhichPokemon] cp PARTY_LENGTH - 1 @@ -335,75 +345,77 @@ IsPlayerPikachuAsleepInParty:: ; fd0d0 (3f:50d0) inc a ld [wWhichPokemon], a jr .loop + .curMonSleepingPikachu scf ret + .done and a ret INCLUDE "data/pikachu_emotions.asm" -Func_fd252: ; fd252 (3f:5252) +PikachuWalksToNurseJoy: ld a, $40 ld [h_0xFFFC], a call LoadPikachuSpriteIntoVRAM - call Func_fd266 + call .GetMovementData and a - jr z, .asm_fd262 + jr z, .skip call ApplyPikachuMovementData -.asm_fd262 +.skip xor a ld [h_0xFFFC], a ret -Func_fd266: - ld a, [wSpriteStateData2 + 15 * 16 + 4] +.GetMovementData: + ld a, [wPikachuMapY] ld e, a - ld a, [wSpriteStateData2 + 15 * 16 + 5] + ld a, [wPikachuMapX] ld d, a ld a, [wYCoord] add 4 cp e - jr z, .asm_fd280 - jr nc, .asm_fd27e - ld hl, Data_fd294 + jr z, .pikachu_at_same_y_as_player + jr nc, .pikachu_above_player + ld hl, .PikaMovementData1 ld a, 1 ret -.asm_fd27e +.pikachu_above_player xor a ret -.asm_fd280 +.pikachu_at_same_y_as_player ld a, [wXCoord] add 4 cp d - jr c, .asm_fd28e - ld hl, Data_fd299 + jr c, .pikachu_to_right_of_player + ld hl, .PikaMovementData2 ld a, 2 ret -.asm_fd28e - ld hl, Data_fd29d +.pikachu_to_right_of_player + ld hl, .PikaMovementData3 ld a, 3 ret -Data_fd294: - db $00 - db $36 - db $2b - db $34 - db $3f +.PikaMovementData1: + db $00 ; init + db $36 ; look up + db $2b ; walk up left + db $34 ; hop up right + db $3f ; ret -Data_fd299: - db $00 - db $36 - db $34 - db $3f +.PikaMovementData2: + db $00 ; init + db $36 ; look up + db $34 ; hop up right + db $3f ; ret -Data_fd29d: - db $00 - db $36 - db $33 - db $3f +.PikaMovementData3: + db $00 ; init + db $36 ; look up + db $33 ; hop up left + db $3f ; ret diff --git a/engine/pikachu_follow.asm b/engine/pikachu_follow.asm index a715b0a3..b5791919 100755 --- a/engine/pikachu_follow.asm +++ b/engine/pikachu_follow.asm @@ -1,4 +1,4 @@ -Func_fc4dd:: ; fc4dd (3f:44dd) +ShouldPikachuSpawn:: ; possibly to test if pika should be out? ld a, [wPikachuOverworldStateFlags] bit 5, a @@ -18,7 +18,7 @@ Func_fc4dd:: ; fc4dd (3f:44dd) and a ret -Func_fc4fa:: ; fc4fa (3f:44fa) +SchedulePikachuSpawnForAfterText:: ld hl, wPikachuOverworldStateFlags bit 4, [hl] res 4, [hl] @@ -39,7 +39,7 @@ Func_fc4fa:: ; fc4fa (3f:44fa) ld [wPikachuFacingDirection], a ret -ClearPikachuSpriteStateData:: ; fc523 (3f:4523) +ClearPikachuSpriteStateData:: ld hl, wPikachuPictureID call .clear ld hl, wPikachuSpriteStateData2 @@ -49,14 +49,14 @@ ClearPikachuSpriteStateData:: ; fc523 (3f:4523) call FillMemory ret -Func_fc534:: ; fc534 (3f:4534) +CalculatePikachuSpawnCoordsAndFacing:: call CalculatePikachuPlacementCoords call CalculatePikachuFacingDirection xor a ld [wPikachuSpawnState], a ret -CalculatePikachuPlacementCoords:: ; fc53f (3f:453f) +CalculatePikachuPlacementCoords:: ld bc, wPikachuPictureID ld a, [wYCoord] add $4 @@ -145,7 +145,7 @@ CalculatePikachuPlacementCoords:: ; fc53f (3f:453f) pop hl ret -CalculatePikachuFacingDirection:: ; fc5bc (3f:45bc) +CalculatePikachuFacingDirection:: ld a, $49 ld [wPikachuPictureID], a ld a, $ff @@ -182,7 +182,7 @@ CalculatePikachuFacingDirection:: ; fc5bc (3f:45bc) ld [wPikachuFacingDirection], a ret -CalculatePikachuSpawnState1:: ; fc5fa (3f:45fa) +CalculatePikachuSpawnState1:: ld a, [wCurMap] cp OAKS_LAB jr z, .oaks_lab @@ -234,7 +234,7 @@ CalculatePikachuSpawnState1:: ; fc5fa (3f:45fa) ld [wPikachuSpawnState], a ret -Pointer_fc64b:: ; fc64b (3f:464b) +Pointer_fc64b:: db VICTORY_ROAD_2 db ROUTE_7_GATE db ROUTE_8_GATE @@ -244,7 +244,7 @@ Pointer_fc64b:: ; fc64b (3f:464b) db ROUTE_11_GATE_1F db $ff -Pointer_fc653:: ; fc653 (3f:4653) +Pointer_fc653:: db VIRIDIAN_FOREST_EXIT db CERULEAN_HOUSE_2 db TRASHED_HOUSE @@ -254,7 +254,7 @@ Pointer_fc653:: ; fc653 (3f:4653) db FUCHSIA_HOUSE_3 db $ff -CalculatePikachuSpawnState2:: ; fc65b (3f:465b) +CalculatePikachuSpawnState2:: ld a, [wCurMap] cp VIRIDIAN_FOREST_EXIT jr z, .viridian_forest_exit @@ -288,7 +288,7 @@ CalculatePikachuSpawnState2:: ; fc65b (3f:465b) ld [wPikachuSpawnState], a ret -Pointer_fc68e:: ; fc68e (3f:468e) +Pointer_fc68e:: db VIRIDIAN_FOREST db SAFARI_ZONE_REST_HOUSE_1 db SAFARI_ZONE_REST_HOUSE_2 @@ -302,7 +302,7 @@ Pointer_fc68e:: ; fc68e (3f:468e) db CINNABAR_LAB_4 db $ff -CalculatePikachuSpawnState3:: ; fc69a (3f:469a) +CalculatePikachuSpawnState3:: ld a, [wCurMap] cp ROUTE_22_GATE jr z, .asm_fc6a7 @@ -334,23 +334,23 @@ CalculatePikachuSpawnState3:: ; fc69a (3f:469a) ld [wPikachuSpawnState], a ret -SetPikachuOverworldStateFlag2:: ; fc6c5 (3f:46c5) +SetPikachuOverworldStateFlag2:: push hl ld hl, wPikachuOverworldStateFlags set 2, [hl] pop hl ret -ResetPikachuOverworldStateFlag2:: ; fc6cd (3f:46cd) +ResetPikachuOverworldStateFlag2:: push hl ld hl, wPikachuOverworldStateFlags res 2, [hl] pop hl ret -SpawnPikachu_:: ; fc6d5 (3f:46d5) +SpawnPikachu_:: call ResetPikachuOverworldStateFlag2 - call Func_fc727 + call TrySpawnPikachu ret nc push bc @@ -358,16 +358,16 @@ SpawnPikachu_:: ; fc6d5 (3f:46d5) pop bc ret c - ld bc, wPikachuPictureID - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld bc, wPikachuSpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc bit 7, [hl] - jp nz, asm_fc745 + jp nz, Func_fc745 ld a, [wFontLoaded] bit 0, a - jp nz, asm_fc76a + jp nz, Func_fc76a call CheckPikachuFollowingPlayer - jp nz, asm_fc76a + jp nz, Func_fc76a ld a, [hl] and $7f cp $a @@ -384,7 +384,7 @@ SpawnPikachu_:: ; fc6d5 (3f:46d5) ld l, a jp hl -PointerTable_fc710: ; fc710 (3f:4710) +PointerTable_fc710: dw Func_fc793 dw Func_fc7aa dw Func_fc803 @@ -395,20 +395,20 @@ PointerTable_fc710: ; fc710 (3f:4710) dw asm_fc904 dw asm_fc937 dw asm_fc969 - dw Func_fc726 + dw .nop -Func_fc726: ; fc726 (3f:4726) +.nop: ret -Func_fc727: ; fc727 (3f:4727) - call Func_fc4dd +TrySpawnPikachu: + call ShouldPikachuSpawn jr nc, .dont_spawn ld a, [wPikachuMovementStatus] and a jr nz, .already_spawned push bc push hl - call Func_fc534 + call CalculatePikachuSpawnCoordsAndFacing pop hl pop bc .already_spawned @@ -423,64 +423,65 @@ Func_fc727: ; fc727 (3f:4727) xor a ret -asm_fc745: ; fc745 (3f:4745) - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 +Func_fc745: + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc res 7, [hl] - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], a call CheckPikachuFollowingPlayer - jr nz, .asm_fc75f + jr nz, .okay + ; Have Pikachu face in the opposite direction of you ld a, [wPlayerFacingDirection] xor $4 - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld [hl], a -.asm_fc75f +.okay xor a - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld [hli], a ld [hl], a call UpdatePikachuWalkingSprite ret -asm_fc76a: ; fc76a (3f:476a) +Func_fc76a: xor a - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld [hli], a ld [hl], a call UpdatePikachuWalkingSprite call Func_fc82e - jr c, .asm_fc783 + jr c, .skip push bc callab InitializeSpriteScreenPosition pop bc -.asm_fc783 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 +.skip + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $1 - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $0 call RefreshPikachuFollow ret -Func_fc793: ; fc793 (3f:4793) +Func_fc793: call RefreshPikachuFollow push bc callab InitializeSpriteScreenPosition pop bc - ld hl, wSprite01SpriteImageIdx - wSprite01SpriteStateData1 + ld hl, wPikachuSpriteImageIdx - wPikachuSpriteStateData1 add hl, bc ld [hl], $ff dec hl ld [hl], $1 ret -Func_fc7aa: ; fc7aa (3f:47aa) +Func_fc7aa: call Func_fcc92 jp c, Func_fc803 dec a @@ -494,12 +495,12 @@ Func_fc7aa: ; fc7aa (3f:47aa) ld e, l ld a, [de] inc de - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld [hl], a ld a, [de] inc de - ld hl, wSprite01XStepVector - wSprite01SpriteStateData1 + ld hl, wPikachuXStepVector - wPikachuSpriteStateData1 add hl, bc ld [hl], a dec hl @@ -508,7 +509,7 @@ Func_fc7aa: ; fc7aa (3f:47aa) ld [hl], a inc de ld a, [de] - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], a cp $4 @@ -517,7 +518,7 @@ Func_fc7aa: ; fc7aa (3f:47aa) jp c, FastPikachuFollow jp NormalPikachuFollow -Pointer_fc7e3: ; fc7e3 (3f:47e3) +Pointer_fc7e3: db 0, 0 db 1, 3 db 4, 0 @@ -535,10 +536,10 @@ Pointer_fc7e3: ; fc7e3 (3f:47e3) db 12, 1 db 0, 4 -Func_fc803: ; fc803 (3f:4803) +Func_fc803: call Func_fcae2 ret c - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] jr nz, .asm_fc823 @@ -550,35 +551,35 @@ Func_fc803: ; fc803 (3f:4803) ld [hl], $20 call Random and $c - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld [hl], a .asm_fc823 xor a - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld [hli], a ld [hl], a call UpdatePikachuWalkingSprite ret -Func_fc82e: ; fc82e (3f:482e) +Func_fc82e: ld a, [wWalkCounter] and a ret z scf ret -Func_fc835: ; fc835 (3f:4835) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +Func_fc835: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $10 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $1 ret -Func_fc842: ; fc842 (3f:4842) +Func_fc842: ld hl, $0 push af call Random @@ -595,30 +596,30 @@ Func_fc842: ; fc842 (3f:4842) pop af jp hl -PointerTable_fc85a: ; fc85a (3f:485a) +PointerTable_fc85a: dw Func_fc862 dw Func_fc8f8 dw Func_fc92b dw Func_fc95d -Func_fc862: ; fc862 (3f:4862) +Func_fc862: dec a add a add a and $c - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld [hl], a - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $6 xor a ld [wd432], a ld [wd433], a - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $11 -asm_fc87f: ; fc87f (3f:487f) +asm_fc87f: ld a, [wd432] ld e, a ld a, [wd433] @@ -626,7 +627,7 @@ asm_fc87f: ; fc87f (3f:487f) call Func_fc82e jr c, Func_fc8c7 call SetPikachuOverworldStateFlag2 - ld hl, wSprite01YPixels - wSprite01SpriteStateData1 + ld hl, wPikachuYPixels - wPikachuSpriteStateData1 add hl, bc ld a, [hl] sub e @@ -636,7 +637,7 @@ asm_fc87f: ; fc87f (3f:487f) ld a, [hl] sub d ld d, a - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld a, [hl] dec a @@ -654,20 +655,20 @@ asm_fc87f: ; fc87f (3f:487f) ld [wd433], a add d ld d, a - ld hl, wSprite01YPixels - wSprite01SpriteStateData1 + ld hl, wPikachuYPixels - wPikachuSpriteStateData1 add hl, bc ld [hl], e inc hl inc hl ld [hl], d - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz jp Func_fc835 -Func_fc8c7: ; fc8c7 (3f:48c7) - ld hl, wSprite01YPixels - wSprite01SpriteStateData1 +Func_fc8c7: + ld hl, wPikachuYPixels - wPikachuSpriteStateData1 add hl, bc ld a, [hl] sub e @@ -679,7 +680,7 @@ Func_fc8c7: ; fc8c7 (3f:48c7) ld [hl], a jp Func_fc835 -Pointer_fc8d6: ; fc8d6 (3f:48d6) +Pointer_fc8d6: db 0, 0 db -2, 1 db -4, 2 @@ -698,18 +699,18 @@ Pointer_fc8d6: ; fc8d6 (3f:48d6) db -2, -1 db 0, 0 -Func_fc8f8: ; fc8f8 (3f:48f8) - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 +Func_fc8f8: + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $7 - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $30 -asm_fc904: ; fc904 (3f:4904) +asm_fc904: call Func_fc82e jp c, Func_fc835 call SetPikachuOverworldStateFlag2 - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld a, [hl] inc a @@ -724,24 +725,24 @@ asm_fc904: ; fc904 (3f:4904) ld [hl], a .asm_fc91f call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz jp Func_fc835 -Func_fc92b: ; fc92b (3f:492b) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +Func_fc92b: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $20 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $8 -asm_fc937: ; fc937 (3f:4937) +asm_fc937: call Func_fc82e jp c, Func_fc835 call SetPikachuOverworldStateFlag2 - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld a, [hl] inc a @@ -755,48 +756,48 @@ asm_fc937: ; fc937 (3f:4937) ld [hl], a .asm_fc951 call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz jp Func_fc835 -Func_fc95d: ; fc95d (3f:495d) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +Func_fc95d: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $20 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $9 -asm_fc969: ; fc969 (3f:4969) +asm_fc969: call Func_fc82e jp c, Func_fc835 call SetPikachuOverworldStateFlag2 - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld a, [hl] inc a cp $8 ld [hl], a - jr nz, .asm_fc988 + jr nz, .skip xor a ld [hl], a - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld a, [hl] - call Func_fc994 + call .TurnClockwise ld [hl], a -.asm_fc988 +.skip call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz jp Func_fc835 -Func_fc994: ; fc994 (3f:4994) +.TurnClockwise: push hl - ld hl, Pointer_fc9ac + ld hl, .Facings ld d, a .loop ld a, [hli] @@ -806,101 +807,101 @@ Func_fc994: ; fc994 (3f:4994) pop hl ret -Func_fc9a0: ; fc9a0 (3f:49a0) +.TurnCounterclockwise: push hl - ld hl, Pointer_fc9ac_End + ld hl, .Facings_End ld d, a -.loop +.loop_ ld a, [hld] cp d - jr nz, .loop + jr nz, .loop_ ld a, [hl] pop hl ret -Pointer_fc9ac: ; fc9ac (3f:49ac) +.Facings: db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT -Pointer_fc9ac_End: +.Facings_End: -NormalPikachuFollow: ; fc9b4 (3f:49b4) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +NormalPikachuFollow: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $8 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $3 call AddPikachuStepVector -asm_fc9c3: ; fc9c3 (3f:49c3) +asm_fc9c3: call TryDoubleAddPikachuStepVectorToScreenPixelCoords call GetPikachuWalkingAnimationSpeed call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz call ResetPikachuStepVector call ComputePikachuFacingDirection - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $1 ret -FastPikachuFollow: ; fc9df (3f:49df) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +FastPikachuFollow: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $4 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $5 call AddPikachuStepVector -asm_fc9ee: ; fc9ee (3f:49ee) +asm_fc9ee: call DoubleAddPikachuStepVectorToScreenPixelCoords call GetPikachuWalkingAnimationSpeed call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz call ResetPikachuStepVector call ComputePikachuFacingDirection - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $1 ret -Func_fca0a: ; fca0a (3f:4a0a) - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 +Func_fca0a: + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc ld [hl], $8 - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $4 call AddPikachuStepVector call AddPikachuStepVector -asm_fca1c: ; fca1c (3f:4a1c) +asm_fca1c: call DoubleAddPikachuStepVectorToScreenPixelCoords call GetPikachuWalkingAnimationSpeed call UpdatePikachuWalkingSprite - ld hl, wSprite01WalkAnimationCounter - wSprite01SpriteStateData1 + ld hl, wPikachuWalkAnimationCounter - wPikachuSpriteStateData1 add hl, bc dec [hl] ret nz call ResetPikachuStepVector call ComputePikachuFacingDirection - ld hl, wSprite01MovementStatus - wSprite01SpriteStateData1 + ld hl, wPikachuMovementStatus - wPikachuSpriteStateData1 add hl, bc ld [hl], $1 ret -AddPikachuStepVector: ; fca38 (3f:4a38) - ld hl, wSprite01YStepVector - wSprite01SpriteStateData1 +AddPikachuStepVector: + ld hl, wPikachuYStepVector - wPikachuSpriteStateData1 add hl, bc ld e, [hl] inc hl inc hl ld d, [hl] - ld hl, wSprite01MapY - wSprite01SpriteStateData1 + ld hl, wPikachuMapY - wPikachuSpriteStateData1 add hl, bc ld a, [hl] add e @@ -910,15 +911,15 @@ AddPikachuStepVector: ; fca38 (3f:4a38) ld [hl], a ret -TryDoubleAddPikachuStepVectorToScreenPixelCoords: ; fca4b (3f:4a4b) +TryDoubleAddPikachuStepVectorToScreenPixelCoords: ld a, [wWalkBikeSurfState] cp $1 ; biking jr nz, AddPikachuStepVectorToScreenPixelCoords ld a, [wd736] bit 6, a jr nz, AddPikachuStepVectorToScreenPixelCoords -DoubleAddPikachuStepVectorToScreenPixelCoords: ; fca59 (3f:4a59) - ld hl, wSprite01YStepVector - wSprite01SpriteStateData1 +DoubleAddPikachuStepVectorToScreenPixelCoords: + ld hl, wPikachuYStepVector - wPikachuSpriteStateData1 add hl, bc ld a, [hli] add a @@ -932,8 +933,8 @@ DoubleAddPikachuStepVectorToScreenPixelCoords: ; fca59 (3f:4a59) ld [hl], a ret -AddPikachuStepVectorToScreenPixelCoords: ; fca68 (3f:4a68) - ld hl, wSprite01YStepVector - wSprite01SpriteStateData1 +AddPikachuStepVectorToScreenPixelCoords: + ld hl, wPikachuYStepVector - wPikachuSpriteStateData1 add hl, bc ld a, [hli] add a @@ -945,8 +946,8 @@ AddPikachuStepVectorToScreenPixelCoords: ; fca68 (3f:4a68) ld [hli], a ret -ResetPikachuStepVector: ; fca75 (3f:4a75) - ld hl, wSprite01YStepVector - wSprite01SpriteStateData1 +ResetPikachuStepVector: + ld hl, wPikachuYStepVector - wPikachuSpriteStateData1 add hl, bc xor a ld [hli], a @@ -954,13 +955,13 @@ ResetPikachuStepVector: ; fca75 (3f:4a75) ld [hl], a ret -GetPikachuWalkingAnimationSpeed: ; fca7e (3f:4a7e) +GetPikachuWalkingAnimationSpeed: call ComparePikachuHappinessTo80 ld d, $2 jr nc, .happy ld d, $5 .happy - ld hl, wSprite01IntraAnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuIntraAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld a, [hl] inc a @@ -976,11 +977,11 @@ GetPikachuWalkingAnimationSpeed: ; fca7e (3f:4a7e) ld [hl], a ret -UpdatePikachuWalkingSprite: ; fca99 (3f:4a99) +UpdatePikachuWalkingSprite: ld a, [wPikachuOverworldStateFlags] bit 3, a jr nz, .uninitialized - ld hl, wSprite01SpriteImageBaseOffset - wSprite01SpriteStateData1 + ld hl, wPikachuSpriteImageBaseOffset - wPikachuSpriteStateData1 add hl, bc ld a, [hl] dec a @@ -989,7 +990,7 @@ UpdatePikachuWalkingSprite: ; fca99 (3f:4a99) ld a, [wd736] bit 7, a jr nz, .copy_player - ld hl, wSprite01FacingDirection - wSprite01SpriteStateData1 + ld hl, wPikachuFacingDirection - wPikachuSpriteStateData1 add hl, bc ld a, [hl] or d @@ -1002,19 +1003,19 @@ UpdatePikachuWalkingSprite: ; fca99 (3f:4a99) jr .load_sprite_index .normal_get_sprite_index - ld hl, wSprite01AnimFrameCounter - wSprite01SpriteStateData1 + ld hl, wPikachuAnimFrameCounter - wPikachuSpriteStateData1 add hl, bc ld a, d or [hl] ld d, a .load_sprite_index - ld hl, wSprite01SpriteImageIdx - wSprite01SpriteStateData1 + ld hl, wPikachuSpriteImageIdx - wPikachuSpriteStateData1 add hl, bc ld [hl], d ret .uninitialized - ld hl, wSprite01SpriteImageIdx - wSprite01SpriteStateData1 + ld hl, wPikachuSpriteImageIdx - wPikachuSpriteStateData1 add hl, bc ld [hl], $ff ret @@ -1026,8 +1027,8 @@ UpdatePikachuWalkingSprite: ; fca99 (3f:4a99) ld [wPikachuSpriteImageIdx], a ret -Func_fcae2: ; fcae2 (3f:4ae2) - ld hl, wSprite01MapY - wSprite01SpriteStateData1 +Func_fcae2: + ld hl, wPikachuMapY - wPikachuSpriteStateData1 add hl, bc ld a, [wYCoord] add $4 @@ -1038,7 +1039,7 @@ Func_fcae2: ; fcae2 (3f:4ae2) add $4 cp [hl] jr nz, .on_screen - ld hl, wSprite01SpriteImageIdx - wSprite01SpriteStateData1 + ld hl, wPikachuSpriteImageIdx - wPikachuSpriteStateData1 add hl, bc ld [hl], $ff scf @@ -1048,7 +1049,7 @@ Func_fcae2: ; fcae2 (3f:4ae2) and a ret -IsPikachuRightNextToPlayer: ; fcb01 (3f:4b01) +IsPikachuRightNextToPlayer: push bc push de push hl @@ -1106,12 +1107,12 @@ IsPikachuRightNextToPlayer: ; fcb01 (3f:4b01) xor a ret -GetPikachuFacingDirectionAndReturnToE: ; fcb4d (3f:4b4d) +GetPikachuFacingDirectionAndReturnToE: call GetPikachuFacingDirection ld e, a ret -GetPikachuFacingDirection: ; fcb52 (3f:4b52) +GetPikachuFacingDirection: ld bc, wPikachuPictureID ld a, [wXCoord] add $4 @@ -1150,7 +1151,7 @@ GetPikachuFacingDirection: ; fcb52 (3f:4b52) ld a, $ff ; standing ret -ClearPikachuFollowCommandBuffer: ; fcb84 (3f:4b84) +ClearPikachuFollowCommandBuffer: push bc ld hl, wPikachuFollowCommandBufferSize ld [hl], $ff @@ -1161,7 +1162,7 @@ ClearPikachuFollowCommandBuffer: ; fcb84 (3f:4b84) pop bc ret -AppendPikachuFollowCommandToBuffer: ; fcb94 (3f:4b94) +AppendPikachuFollowCommandToBuffer: ld hl, wPikachuFollowCommandBufferSize inc [hl] ld e, [hl] @@ -1171,14 +1172,14 @@ AppendPikachuFollowCommandToBuffer: ; fcb94 (3f:4b94) ld [hl], a ret -RefreshPikachuFollow: ; fcba1 (3f:4ba1) +RefreshPikachuFollow: call ClearPikachuFollowCommandBuffer call ComputePikachuFollowCommand ret c call AppendPikachuFollowCommandToBuffer ret -ComputePikachuFollowCommand: ; fcbac (3f:4bac) +ComputePikachuFollowCommand: ld bc, wPikachuPictureID ld hl, wPlayerMapY - wPlayerSpriteStateData1 add hl, bc @@ -1245,7 +1246,7 @@ ComputePikachuFollowCommand: ; fcbac (3f:4bac) scf ret -CheckAbsoluteValueLessThan2: ; fcc01 (3f:4c01) +CheckAbsoluteValueLessThan2: jr nc, .positive cpl inc a @@ -1253,7 +1254,7 @@ CheckAbsoluteValueLessThan2: ; fcc01 (3f:4c01) cp $2 ret -Func_fcc08:: ; fcc08 (3f:4c08) +Func_fcc08:: call Func_fcc23 ret nc ld a, [wd736] @@ -1270,7 +1271,7 @@ Func_fcc08:: ; fcc08 (3f:4c08) call AppendPikachuFollowCommandToBuffer ret -Func_fcc23: ; fcc23 (3f:4c28) +Func_fcc23: ld a, [wPikachuOverworldStateFlags] bit 5, a jr nz, .asm_fcc40 @@ -1290,7 +1291,7 @@ Func_fcc23: ; fcc23 (3f:4c28) and a ret -Func_fcc42: ; fcc42 (3f:4c42) +Func_fcc42: xor a ld a, [wPlayerDirection] bit 3, a @@ -1320,7 +1321,7 @@ Func_fcc42: ; fcc42 (3f:4c42) ld a, $4 ret -Func_fcc64: ; fcc64 (3f:4c64) +Func_fcc64: ld hl, wPikachuOverworldStateFlags bit 6, [hl] jr z, .asm_fcc6e @@ -1358,7 +1359,7 @@ Func_fcc64: ; fcc64 (3f:4c64) ld a, $8 ret -Func_fcc92: ; fcc92 (3f:4c92) +Func_fcc92: ld hl, wPikachuFollowCommandBufferSize ld a, [hl] cp $ff @@ -1385,7 +1386,7 @@ Func_fcc92: ; fcc92 (3f:4c92) scf ret -ComputePikachuFacingDirection:: ; fccb2 (3f:4cb2) +ComputePikachuFacingDirection:: call GetPikachuFollowCommandIfBufferSizeNonzero and a jr z, .check_y @@ -1425,7 +1426,7 @@ ComputePikachuFacingDirection:: ; fccb2 (3f:4cb2) ld [wPikachuFacingDirection], a ret -GetPikachuFollowCommand: ; fccee (3f:4cee) +GetPikachuFollowCommand: ld hl, wPikachuFollowCommandBufferSize ld a, [hl] cp $ff @@ -1441,7 +1442,7 @@ GetPikachuFollowCommand: ; fccee (3f:4cee) xor a ret -GetPikachuFollowCommandIfBufferSizeNonzero: ; fcd01 (3f:4d01) +GetPikachuFollowCommandIfBufferSizeNonzero: ld hl, wPikachuFollowCommandBufferSize ld a, [hl] cp $ff @@ -1459,7 +1460,7 @@ GetPikachuFollowCommandIfBufferSizeNonzero: ; fcd01 (3f:4d01) xor a ret -AreThereAtLeastTwoStepsInPikachuFollowCommandBuffer: ; fcd17 (3f:4d17) +AreThereAtLeastTwoStepsInPikachuFollowCommandBuffer: ld a, [wPikachuFollowCommandBufferSize] cp $ff ret z @@ -1472,7 +1473,7 @@ AreThereAtLeastTwoStepsInPikachuFollowCommandBuffer: ; fcd17 (3f:4d17) scf ret -WillPikachuSpawnOnTheScreen: ; fcd25 (3f:4d25) +WillPikachuSpawnOnTheScreen: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] ; If we're here, this can only be $f0 add wPikachuMapY - wPikachuSpriteStateData2 @@ -1538,7 +1539,7 @@ WillPikachuSpawnOnTheScreen: ; fcd25 (3f:4d25) .return ret -.GetNPCCurrentTile: ; fcd83 (3f:4d83) +.GetNPCCurrentTile: ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add wPikachuYPixels - wPikachuSpriteStateData1 @@ -1565,7 +1566,7 @@ WillPikachuSpawnOnTheScreen: ; fcd25 (3f:4d25) add hl, de ret -ComparePikachuHappinessTo80: ; fcdad (3f:4dad) +ComparePikachuHappinessTo80: ; preserves a and bc push bc push af diff --git a/engine/pikachu_movement.asm b/engine/pikachu_movement.asm index fbb71ffd..8eb09b3b 100755 --- a/engine/pikachu_movement.asm +++ b/engine/pikachu_movement.asm @@ -1,11 +1,11 @@ -ApplyPikachuMovementData_:: ; fd2a1 (3f:52a1) +ApplyPikachuMovementData_:: ld a, b ld [wPikachuMovementScriptBank], a ld a, l ld [wPikachuMovementScriptAddress], a ld a, h ld [wPikachuMovementScriptAddress + 1], a - call PikachuSwapSpriteStateData + call .SwapSpriteStateData .loop call LoadPikachuMovementCommandData jr nc, .done @@ -13,11 +13,11 @@ ApplyPikachuMovementData_:: ; fd2a1 (3f:52a1) jr .loop .done - call PikachuSwapSpriteStateData + call .SwapSpriteStateData call DelayFrame ret -PikachuSwapSpriteStateData: +.SwapSpriteStateData: ld a, [wUpdateSpritesEnabled] push af ld a, $ff @@ -26,15 +26,15 @@ PikachuSwapSpriteStateData: push de push bc - ld hl, wSpriteStateData1 + ld hl, wPlayerSpriteStateData1 ld de, wPikachuSpriteStateData1 ld c, $10 - call SwapBytes3f + call .SwapBytes - ld hl, wSpriteStateData2 + ld hl, wPlayerSpriteStateData2 ld de, wPikachuSpriteStateData2 ld c, $10 - call SwapBytes3f + call .SwapBytes pop bc pop de @@ -43,8 +43,7 @@ PikachuSwapSpriteStateData: ld [wUpdateSpritesEnabled], a ret -SwapBytes3f: -.loop +.SwapBytes: ld b, [hl] ld a, [de] ld [hli], a @@ -52,7 +51,7 @@ SwapBytes3f: ld [de], a inc de dec c - jr nz, .loop + jr nz, .SwapBytes ret LoadPikachuMovementCommandData: @@ -61,52 +60,52 @@ LoadPikachuMovementCommandData: ret z ld c, a ld b, 0 - ld hl, Data_fd3b0 + ld hl, PikachuMovementDatabase add hl, bc add hl, bc add hl, bc add hl, bc ld a, [hli] - ld [wPikaPicAnimPointer + 1], a + ld [wCurPikaMovementFunc1], a ld a, [hli] cp $80 jr nz, .no_param call GetPikachuMovementScriptByte .no_param - ld [wPikaPicAnimPointer], a + ld [wCurPikaMovementParam1], a ld a, [hli] - ld [wPikaPicAnimCurGraphicID], a + ld [wCurPikaMovementFunc2], a ld a, [hli] cp $80 jr nz, .no_param2 call GetPikachuMovementScriptByte .no_param2 - ld [wPikaPicAnimPointerSetupFinished], a + ld [wCurPikaMovementParam2], a xor a - ld [wPikaPicAnimTimer], a + ld [wd451], a scf ret ExecutePikachuMovementCommand: xor a - ld [wd44d], a - ld [wd457], a - ld [wd458], a + ld [wPikachuMovementFlags], a + ld [wPikachuStepTimer], a + ld [wPikachuStepSubtimer], a ld a, [wPlayerGrassPriority] push af .loop - ld bc, wSpriteStateData1 - ld a, [wPikaPicAnimPointer + 1] - ld hl, Jumptable_fd4ac + ld bc, wPlayerSpriteStateData1 ; Currently holds Pikachu's sprite state data + ld a, [wCurPikaMovementFunc1] + ld hl, PikaMovementFunc1Jumptable call .JumpTable - ld a, [wPikaPicAnimCurGraphicID] - ld hl, Jumptable_fd65c + ld a, [wCurPikaMovementFunc2] + ld hl, PikaMovementFunc2Jumptable call .JumpTable - call Func_fd36e - call Func_fd39d + call GetCoordsForPikachuShadow + call AnimatePikachuShadow call DelayFrame call DelayFrame - ld hl, wd44d + ld hl, wPikachuMovementFlags bit 7, [hl] jr z, .loop pop af @@ -124,62 +123,65 @@ ExecutePikachuMovementCommand: ld l, a jp [hl] -Func_fd36e: - ld hl, 2 +GetCoordsForPikachuShadow: + ld hl, wPlayerSpriteImageIdx - wPlayerSpriteStateData1 add hl, bc - ld a, [wPikaPicAnimTimer + 1] + ld a, [wCurPikaMovementSpriteImageIdx] ld [hl], a ld a, [wPikaSpriteY] ld d, a - ld a, [wd456] + ld a, [wPikachuMovementYOffset] add d - ld hl, 4 + ld hl, wPlayerYPixels - wPlayerSpriteStateData1 add hl, bc ld [hl], a - ld a, [wPikaPicAnimDelay] + ld a, [wPikaSpriteX] ld d, a - ld a, [wPikaPicTextboxStartY] + ld a, [wPikachuMovementXOffset] add d - ld hl, 6 + ld hl, wPlayerXPixels - wPlayerSpriteStateData1 add hl, bc ld [hl], a - ld hl, wd44d + ld hl, wPikachuMovementFlags bit 6, [hl] ret z - ld hl, wPlayerGrassPriority - wSpriteStateData1 + ld hl, wPlayerGrassPriority - wPlayerSpriteStateData1 add hl, bc ld [hl], 0 ret -Func_fd39d: - ld hl, wd44d +AnimatePikachuShadow: + ld hl, wPikachuMovementFlags bit 6, [hl] res 6, [hl] ld hl, wd736 res 6, [hl] ret z set 6, [hl] - call Func_fd7f3 + call LoadPikachuShadowOAMData ret -Data_fd3b0: - db $01, $00, $00, $00 ; $00 - db $03, $80, $01, $00 ; $01 - db $04, $80, $01, $00 ; $02 - db $05, $80, $01, $00 ; $03 - db $06, $80, $01, $00 ; $04 - db $07, $80, $01, $00 ; $05 - db $08, $80, $01, $00 ; $06 - db $09, $80, $01, $00 ; $07 - db $0a, $80, $01, $00 ; $08 - db $03, $80, $06, $00 ; $09 - db $04, $80, $06, $00 ; $0a - db $05, $80, $06, $00 ; $0b - db $06, $80, $06, $00 ; $0c - db $07, $80, $06, $00 ; $0d - db $08, $80, $06, $00 ; $0e - db $09, $80, $06, $00 ; $0f - db $0a, $80, $06, $00 ; $10 +PikachuMovementDatabase: + db $01, 1 - 1, $00, 1 - 1 ; $00 start + + db $03, $80, $01, 1 - 1 ; $01 + db $04, $80, $01, 1 - 1 ; $02 + db $05, $80, $01, 1 - 1 ; $03 + db $06, $80, $01, 1 - 1 ; $04 + db $07, $80, $01, 1 - 1 ; $05 + db $08, $80, $01, 1 - 1 ; $06 + db $09, $80, $01, 1 - 1 ; $07 + db $0a, $80, $01, 1 - 1 ; $08 + + db $03, $80, $06, 1 - 1 ; $09 + db $04, $80, $06, 1 - 1 ; $0a + db $05, $80, $06, 1 - 1 ; $0b + db $06, $80, $06, 1 - 1 ; $0c + db $07, $80, $06, 1 - 1 ; $0d + db $08, $80, $06, 1 - 1 ; $0e + db $09, $80, $06, 1 - 1 ; $0f + db $0a, $80, $06, 1 - 1 ; $10 + db $03, $80, $03, $80 ; $11 db $04, $80, $03, $80 ; $12 db $05, $80, $03, $80 ; $13 @@ -188,290 +190,296 @@ Data_fd3b0: db $08, $80, $03, $80 ; $16 db $09, $80, $03, $80 ; $17 db $0a, $80, $03, $80 ; $18 + db $03, $80, $07, $80 ; $19 db $04, $80, $07, $80 ; $1a db $05, $80, $07, $80 ; $1b db $06, $80, $07, $80 ; $1c - db $0b, $27, $02, $00 ; $1d step down - db $0c, $27, $02, $00 ; $1e step up - db $0d, $27, $02, $00 ; $1f step left - db $0e, $27, $02, $00 ; $20 step right - db $0f, $27, $02, $00 ; $21 - db $10, $27, $02, $00 ; $22 - db $11, $27, $02, $00 ; $23 - db $12, $27, $02, $00 ; $24 - db $0b, $0f, $02, $00 ; $25 - db $0c, $0f, $02, $00 ; $26 - db $0d, $0f, $02, $00 ; $27 - db $0e, $0f, $02, $00 ; $28 - db $0f, $0f, $02, $00 ; $29 - db $10, $0f, $02, $00 ; $2a - db $11, $0f, $02, $00 ; $2b - db $12, $0f, $02, $00 ; $2c - db $0b, $0f, $08, $17 ; $2d - db $0c, $0f, $08, $17 ; $2e - db $0d, $0f, $08, $17 ; $2f - db $0e, $0f, $08, $17 ; $30 - db $0f, $0f, $08, $17 ; $31 - db $10, $0f, $08, $17 ; $32 - db $11, $0f, $08, $17 ; $33 - db $12, $0f, $08, $17 ; $34 - db $13, $0f, $06, $00 ; $35 look down - db $14, $0f, $06, $00 ; $36 look up - db $15, $0f, $06, $00 ; $37 look left - db $16, $0f, $06, $00 ; $38 look right - db $02, $80, $04, $00 ; $39 - db $02, $80, $05, $00 ; $3a + + db $0b, (1 << 5) | 8 - 1, $02, 1 - 1 ; $1d step down + db $0c, (1 << 5) | 8 - 1, $02, 1 - 1 ; $1e step up + db $0d, (1 << 5) | 8 - 1, $02, 1 - 1 ; $1f step left + db $0e, (1 << 5) | 8 - 1, $02, 1 - 1 ; $20 step right + db $0f, (1 << 5) | 8 - 1, $02, 1 - 1 ; $21 step down left + db $10, (1 << 5) | 8 - 1, $02, 1 - 1 ; $22 step down right + db $11, (1 << 5) | 8 - 1, $02, 1 - 1 ; $23 step up left + db $12, (1 << 5) | 8 - 1, $02, 1 - 1 ; $24 step up right + + db $0b, 16 - 1, $02, 1 - 1 ; $25 slide down + db $0c, 16 - 1, $02, 1 - 1 ; $26 slide up + db $0d, 16 - 1, $02, 1 - 1 ; $27 slide left + db $0e, 16 - 1, $02, 1 - 1 ; $28 slide right + db $0f, 16 - 1, $02, 1 - 1 ; $29 slide down left + db $10, 16 - 1, $02, 1 - 1 ; $2a slide down right + db $11, 16 - 1, $02, 1 - 1 ; $2b slide up left + db $12, 16 - 1, $02, 1 - 1 ; $2c slide up right + + db $0b, 16 - 1, $08, (1 << 4) | 8 - 1 ; $2d hop down + db $0c, 16 - 1, $08, (1 << 4) | 8 - 1 ; $2e hop up + db $0d, 16 - 1, $08, (1 << 4) | 8 - 1 ; $2f hop left + db $0e, 16 - 1, $08, (1 << 4) | 8 - 1 ; $30 hop right + db $0f, 16 - 1, $08, (1 << 4) | 8 - 1 ; $31 hop down left + db $10, 16 - 1, $08, (1 << 4) | 8 - 1 ; $32 hop down right + db $11, 16 - 1, $08, (1 << 4) | 8 - 1 ; $33 hop up left + db $12, 16 - 1, $08, (1 << 4) | 8 - 1 ; $34 hop up right + + db $13, 16 - 1, $06, 1 - 1 ; $35 look down + db $14, 16 - 1, $06, 1 - 1 ; $36 look up + db $15, 16 - 1, $06, 1 - 1 ; $37 look left + db $16, 16 - 1, $06, 1 - 1 ; $38 look right + + db $02, $80, $04, 1 - 1 ; $39 + db $02, $80, $05, 1 - 1 ; $3a db $02, $80, $03, $80 ; $3b db $02, $80, $07, $80 ; $3c db $02, $80, $09, $80 ; $3d - db $02, $80, $06, $00 ; $3e - -Jumptable_fd4ac: - dw Func_fd4e5 - dw Func_fd4e9 - dw Func_fd504 - dw Func_fd50c - dw Func_fd511 - dw Func_fd518 - dw Func_fd52c - dw Func_fd540 - dw Func_fd553 - dw Func_fd566 - dw Func_fd579 - dw Func_fd5b1 - dw Func_fd5b5 - dw Func_fd5b9 - dw Func_fd5bd - dw Func_fd5c1 - dw Func_fd5c5 - dw Func_fd5c9 - dw Func_fd5cd - dw Func_fd5ea - dw Func_fd5ee - dw Func_fd5f2 - dw Func_fd5f6 - dw Func_fd4e5 - -Func_fd4dc: - ld a, [wd44d] + db $02, $80, $06, 1 - 1 ; $3e + +PikaMovementFunc1Jumptable: + dw PikaMovementFunc1_EndCommand_ ; 00 + dw PikaMovementFunc1_LoadPikachuCurrentPosition ; 01 + dw PikaMovementFunc1_DelayFrames ; 02 + dw PikaMovementFunc1_WalkInCurrentFacingDirection ; 03 + dw PikaMovementFunc1_WalkInOppositeFacingDirection ; 04 + dw PikaMovementFunc1_StepTurningCounterclockwise ; 05 + dw PikaMovementFunc1_StepTurningClockwise ; 06 + dw PikaMovementFunc1_StepForwardLeft ; 07 + dw PikaMovementFunc1_StepForwardRight ; 08 + dw PikaMovementFunc1_StepBackwardLeft ; 09 + dw PikaMovementFunc1_StepBackwardRight ; 0a + dw PikaMovementFunc1_MoveDown ; 0b + dw PikaMovementFunc1_MoveUp ; 0c + dw PikaMovementFunc1_MoveLeft ; 0d + dw PikaMovementFunc1_MoveRight ; 0e + dw PikaMovementFunc1_MoveDownLeft ; 0f + dw PikaMovementFunc1_MoveDownRight ; 10 + dw PikaMovementFunc1_MoveUpLeft ; 11 + dw PikaMovementFunc1_MoveUpRight ; 12 + dw PikaMovementFunc1_LookDown ; 13 + dw PikaMovementFunc1_LookUp ; 14 + dw PikaMovementFunc1_LookLeft ; 15 + dw PikaMovementFunc1_LookRight ; 16 + dw PikaMovementFunc1_EndCommand_ ; 17 + +PikaMovementFunc1_EndCommand: + ld a, [wPikachuMovementFlags] set 7, a - ld [wd44d], a + ld [wPikachuMovementFlags], a ret -Func_fd4e5: - call Func_fd4dc +PikaMovementFunc1_EndCommand_: + call PikaMovementFunc1_EndCommand ret -Func_fd4e9: - ld hl, 4 +PikaMovementFunc1_LoadPikachuCurrentPosition: + ld hl, wPlayerYPixels - wPlayerSpriteStateData1 add hl, bc ld a, [hl] ld [wPikaSpriteY], a - ld hl, 6 + ld hl, wPlayerXPixels - wPlayerSpriteStateData1 add hl, bc ld a, [hl] - ld [wPikaPicAnimDelay], a + ld [wPikaSpriteX], a xor a - ld [wd456], a - ld [wPikaPicTextboxStartY], a - call Func_fd4dc + ld [wPikachuMovementYOffset], a + ld [wPikachuMovementXOffset], a + call PikaMovementFunc1_EndCommand ret -Func_fd504: - call Func_fd775 +PikaMovementFunc1_DelayFrames: + call CheckPikachuStepTimer1 ret nz - call Func_fd4dc + call PikaMovementFunc1_EndCommand ret -Func_fd50c: - call GetObjectFacing - jr asm_fd58c +PikaMovementFunc1_WalkInCurrentFacingDirection: + call GetPikachuFacing + jr PikaMovementFunc1_ApplyStepVector -Func_fd511: - call GetObjectFacing +PikaMovementFunc1_WalkInOppositeFacingDirection: + call GetPikachuFacing xor %100 - jr asm_fd58c - -Func_fd518: - call GetObjectFacing - ld hl, Data_fd523 - call Func_fd5a0 - jr asm_fd58c - -Data_fd523: - db SPRITE_FACING_DOWN, SPRITE_FACING_RIGHT - db SPRITE_FACING_UP, SPRITE_FACING_LEFT - db SPRITE_FACING_LEFT, SPRITE_FACING_DOWN - db SPRITE_FACING_RIGHT, SPRITE_FACING_UP + jr PikaMovementFunc1_ApplyStepVector + +PikaMovementFunc1_StepTurningCounterclockwise: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_RIGHT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_LEFT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_DOWN << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_UP << 2 db $ff -Func_fd52c: - call GetObjectFacing - ld hl, Data_fd537 - call Func_fd5a0 - jr asm_fd58c - -Data_fd537: - db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT - db SPRITE_FACING_UP, SPRITE_FACING_RIGHT - db SPRITE_FACING_LEFT, SPRITE_FACING_UP - db SPRITE_FACING_RIGHT, SPRITE_FACING_DOWN +PikaMovementFunc1_StepTurningClockwise: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_LEFT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_RIGHT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_UP << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_DOWN << 2 db $ff -Func_fd540: - call GetObjectFacing - ld hl, Data_fd54b - call Func_fd5a0 - jr asm_fd58c - -Data_fd54b: - db SPRITE_FACING_DOWN, SPRITE_FACING_UP | $10 - db SPRITE_FACING_UP, SPRITE_FACING_LEFT | $10 - db SPRITE_FACING_LEFT, SPRITE_FACING_DOWN | $10 - db SPRITE_FACING_RIGHT, SPRITE_FACING_RIGHT | $10 - -Func_fd553: - call GetObjectFacing - ld hl, Data_fd55e - call Func_fd5a0 - jr asm_fd58c - -Data_fd55e: - db SPRITE_FACING_DOWN, SPRITE_FACING_DOWN | $10 - db SPRITE_FACING_UP, SPRITE_FACING_RIGHT | $10 - db SPRITE_FACING_LEFT, SPRITE_FACING_LEFT | $10 - db SPRITE_FACING_RIGHT, SPRITE_FACING_UP | $10 - -Func_fd566: - call GetObjectFacing - ld hl, Data_fd571 - call Func_fd5a0 - jr asm_fd58c - -Data_fd571: - db SPRITE_FACING_DOWN, SPRITE_FACING_RIGHT | $10 - db SPRITE_FACING_UP, SPRITE_FACING_DOWN | $10 - db SPRITE_FACING_LEFT, SPRITE_FACING_UP | $10 - db SPRITE_FACING_RIGHT, SPRITE_FACING_LEFT | $10 - -Func_fd579: - call GetObjectFacing - ld hl, Data_fd584 - call Func_fd5a0 - jr asm_fd58c - -Data_fd584: - db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT | $10 - db SPRITE_FACING_UP, SPRITE_FACING_UP | $10 - db SPRITE_FACING_LEFT, SPRITE_FACING_RIGHT | $10 - db SPRITE_FACING_RIGHT, SPRITE_FACING_DOWN | $10 - -asm_fd58c +PikaMovementFunc1_StepForwardLeft: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_DOWN_RIGHT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_UP_LEFT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_DOWN_LEFT << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_UP_RIGHT << 2 + +PikaMovementFunc1_StepForwardRight: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_DOWN_LEFT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_UP_RIGHT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_UP_LEFT << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_DOWN_RIGHT << 2 + +PikaMovementFunc1_StepBackwardLeft: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_UP_RIGHT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_DOWN_LEFT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_DOWN_RIGHT << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_UP_LEFT << 2 + +PikaMovementFunc1_StepBackwardRight: + call GetPikachuFacing + ld hl, .Data + call PikaMovementFunc1_GetNextFacing + jr PikaMovementFunc1_ApplyStepVector + +.Data: + db SPRITE_FACING_DOWN, PIKASTEPDIR_UP_LEFT << 2 + db SPRITE_FACING_UP, PIKASTEPDIR_DOWN_RIGHT << 2 + db SPRITE_FACING_LEFT, PIKASTEPDIR_UP_RIGHT << 2 + db SPRITE_FACING_RIGHT, PIKASTEPDIR_DOWN_LEFT << 2 + +PikaMovementFunc1_ApplyStepVector: rrca rrca and $7 ld e, a - call Func_fd784 + call GetPikachuStepVectorMagnitude ld d, a call UpdatePikachuPosition - call Func_fd775 + call CheckPikachuStepTimer1 ret nz - call Func_fd4dc + call PikaMovementFunc1_EndCommand ret -Func_fd5a0: +PikaMovementFunc1_GetNextFacing: push de ld d, a -.asm_fd5a2 +.loop ld a, [hli] cp d - jr z, .asm_fd5ad + jr z, .found inc hl cp $ff - jr nz, .asm_fd5a2 + jr nz, .loop pop de ret -.asm_fd5ad +.found ld a, [hl] pop de scf ret -Func_fd5b1: - ld a, SPRITE_FACING_DOWN >> 2 - jr asm_fd5d1 +PikaMovementFunc1_MoveDown: + ld a, PIKASTEPDIR_DOWN + jr PikaMovementFunc1_ApplyFacingAndMove -Func_fd5b5: - ld a, SPRITE_FACING_UP >> 2 - jr asm_fd5d1 +PikaMovementFunc1_MoveUp: + ld a, PIKASTEPDIR_UP + jr PikaMovementFunc1_ApplyFacingAndMove -Func_fd5b9: - ld a, SPRITE_FACING_LEFT >> 2 - jr asm_fd5d1 +PikaMovementFunc1_MoveLeft: + ld a, PIKASTEPDIR_LEFT + jr PikaMovementFunc1_ApplyFacingAndMove -Func_fd5bd: - ld a, SPRITE_FACING_RIGHT >> 2 - jr asm_fd5d1 +PikaMovementFunc1_MoveRight: + ld a, PIKASTEPDIR_RIGHT + jr PikaMovementFunc1_ApplyFacingAndMove -Func_fd5c1: - ld e, 4 - jr asm_fd5d5 +PikaMovementFunc1_MoveDownLeft: + ld e, PIKASTEPDIR_DOWN_LEFT + jr PikaMovementFunc1_MoveDiagonally -Func_fd5c5: - ld e, 5 - jr asm_fd5d5 +PikaMovementFunc1_MoveDownRight: + ld e, PIKASTEPDIR_DOWN_RIGHT + jr PikaMovementFunc1_MoveDiagonally -Func_fd5c9: - ld e, 6 - jr asm_fd5d5 +PikaMovementFunc1_MoveUpLeft: + ld e, PIKASTEPDIR_UP_LEFT + jr PikaMovementFunc1_MoveDiagonally -Func_fd5cd: - ld e, 7 - jr asm_fd5d5 +PikaMovementFunc1_MoveUpRight: + ld e, PIKASTEPDIR_UP_RIGHT + jr PikaMovementFunc1_MoveDiagonally -asm_fd5d1 +PikaMovementFunc1_ApplyFacingAndMove: ld e, a - call SetObjectFacing -asm_fd5d5 - call Func_fd784 + call SetPikachuFacing +PikaMovementFunc1_MoveDiagonally: + call GetPikachuStepVectorMagnitude ld d, a push de call UpdatePikachuPosition pop de - call Func_fd775 + call CheckPikachuStepTimer1 ret nz ld a, e - call Func_fd7cb - call Func_fd4dc + call ApplyPikachuStepVector + call PikaMovementFunc1_EndCommand ret -Func_fd5ea: - ld a, SPRITE_FACING_DOWN >> 2 - jr asm_fd5fa +PikaMovementFunc1_LookDown: + ld a, PIKASTEPDIR_DOWN + jr PikaMovementFunc1_ApplyFacing -Func_fd5ee: - ld a, SPRITE_FACING_UP >> 2 - jr asm_fd5fa +PikaMovementFunc1_LookUp: + ld a, PIKASTEPDIR_UP + jr PikaMovementFunc1_ApplyFacing -Func_fd5f2: - ld a, SPRITE_FACING_LEFT >> 2 - jr asm_fd5fa +PikaMovementFunc1_LookLeft: + ld a, PIKASTEPDIR_LEFT + jr PikaMovementFunc1_ApplyFacing -Func_fd5f6: - ld a, SPRITE_FACING_RIGHT >> 2 - jr asm_fd5fa +PikaMovementFunc1_LookRight: + ld a, PIKASTEPDIR_RIGHT + jr PikaMovementFunc1_ApplyFacing -asm_fd5fa - call SetObjectFacing - call Func_fd4dc +PikaMovementFunc1_ApplyFacing: + call SetPikachuFacing + call PikaMovementFunc1_EndCommand ret UpdatePikachuPosition: push de ld d, 0 - ld hl, Jumptable_fd60f + ld hl, .Jumptable add hl, de add hl, de ld a, [hli] @@ -481,217 +489,217 @@ UpdatePikachuPosition: ld a, d jp [hl] -Jumptable_fd60f: - dw MovePikachuSpriteDown - dw MovePikachuSpriteUp - dw MovePikachuSpriteLeft - dw MovePikachuSpriteRight - dw MovePikachuSpriteDownLeft - dw MovePikachuSpriteDownRight - dw MovePikachuSpriteUpLeft - dw MovePikachuSpriteUpRight - -MovePikachuSpriteDown: +.Jumptable: + dw .Down + dw .Up + dw .Left + dw .Right + dw .DownLeft + dw .DownRight + dw .UpLeft + dw .UpRight + +.Down: ld d, 0 ld e, a - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteUp: +.Up: ld d, 0 cpl inc a ld e, a - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteLeft: +.Left: cpl inc a ld d, a ld e, 0 - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteRight: +.Right: ld d, a ld e, 0 - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteDownLeft: +.DownLeft: ld e, a cpl inc a ld d, a - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteDownRight: +.DownRight: ld e, a ld d, a - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteUpLeft: +.UpLeft: cpl inc a ld e, a ld d, a - jr asm_fd64d + jr .ApplyVector -MovePikachuSpriteUpRight: +.UpRight: ld d, a cpl inc a ld e, a - jr asm_fd64d + jr .ApplyVector -asm_fd64d - ld a, [wPikaPicAnimDelay] +.ApplyVector: + ld a, [wPikaSpriteX] add d - ld [wPikaPicAnimDelay], a + ld [wPikaSpriteX], a ld a, [wPikaSpriteY] add e ld [wPikaSpriteY], a ret -Jumptable_fd65c: - dw Func_fd678 - dw Func_fd6a3 - dw Func_fd698 - dw Func_fd6f4 - dw Func_fd6ff - dw Func_fd718 - dw Func_fd68c - dw Func_fd6c6 - dw Func_fd6c0 - dw Func_fd6e2 - dw Func_fd68b - -Func_fd672: - ld hl, wd44d +PikaMovementFunc2Jumptable: + dw PikaMovementFunc2_ResetFrameCounterAndFaceCurrent ; 0 + dw PikaMovementFunc2_UpdateSpriteImageIdxWithPreviousImageIdxDirection ; 1 + dw PikaMovementFunc2_UpdateSpriteImageIdxWithFacing ; 2 + dw PikaMovementFunc2_TurnParameter ; 3 + dw PikaMovementFunc2_TurnClockwise ; 4 + dw PikaMovementFunc2_TurnCounterClockwise ; 5 + dw PikaMovementFunc2_CopySpriteImageIdxDirectionToSpriteImageIdx ; 6 + dw PikaMovementFunc2_UpdateJumpWithPreviousImageIdxDirection ; 7 + dw PikaMovementFunc2_UpdateJumpWithFacing ; 8 + dw PikaMovementFunc2_CopyFacingToJump ; 9 + dw PikaMovementFunc2_nop ; 10 + +PikaMovement_SetSpawnShadow: + ld hl, wPikachuMovementFlags set 6, [hl] ret -Func_fd678: - ld hl, 7 +PikaMovementFunc2_ResetFrameCounterAndFaceCurrent: + ld hl, wPlayerIntraAnimFrameCounter - wPlayerSpriteStateData1 add hl, bc xor a ld [hli], a ld [hl], a - call Func_fd74a + call PikaMovementFunc2_GetImageBaseOffset ld d, a - call GetObjectFacing + call GetPikachuFacing or d - ld [wPikaPicAnimTimer + 1], a + ld [wCurPikaMovementSpriteImageIdx], a ret -Func_fd68b: +PikaMovementFunc2_nop: ret -Func_fd68c: - call Func_fd74a +PikaMovementFunc2_CopySpriteImageIdxDirectionToSpriteImageIdx: + call PikaMovementFunc2_GetImageBaseOffset ld d, a - call Func_fd755 + call PikaMovementFunc2_GetSpriteImageIdxDirection or d - ld [wPikaPicAnimTimer + 1], a + ld [wCurPikaMovementSpriteImageIdx], a ret -Func_fd698: - call Func_fd74a +PikaMovementFunc2_UpdateSpriteImageIdxWithFacing: + call PikaMovementFunc2_GetImageBaseOffset ld d, a - call GetObjectFacing + call GetPikachuFacing or d ld d, a - jr asm_fd6ac + jr PikaMovementFunc2_UpdateSpriteImageIdx -Func_fd6a3: - call Func_fd74a +PikaMovementFunc2_UpdateSpriteImageIdxWithPreviousImageIdxDirection: + call PikaMovementFunc2_GetImageBaseOffset ld d, a - call Func_fd755 + call PikaMovementFunc2_GetSpriteImageIdxDirection or d ld d, a -asm_fd6ac - ld hl, 8 +PikaMovementFunc2_UpdateSpriteImageIdx: + ld hl, wPlayerAnimFrameCounter - wPlayerSpriteStateData1 add hl, bc - call Func_fd78e - jr nz, .asm_fd6b6 + call CheckPikachuStepTimer2 ; does not preserve hl + jr nz, .skip inc [hl] -.asm_fd6b6 +.skip ld a, [hl] rrca rrca and 3 or d - ld [wPikaPicAnimTimer + 1], a + ld [wCurPikaMovementSpriteImageIdx], a ret -Func_fd6c0: - call GetObjectFacing +PikaMovementFunc2_UpdateJumpWithFacing: + call GetPikachuFacing ld d, a - jr asm_fd6ca + jr PikaMovementFunc2_UpdateJump -Func_fd6c6: - call Func_fd755 +PikaMovementFunc2_UpdateJumpWithPreviousImageIdxDirection: + call PikaMovementFunc2_GetSpriteImageIdxDirection ld d, a -asm_fd6ca - call Func_fd74a +PikaMovementFunc2_UpdateJump: + call PikaMovementFunc2_GetImageBaseOffset or d ld d, a - call Func_fd736 + call PikaMovementFunc2_Timer or d - ld [wPikaPicAnimTimer + 1], a - call Func_fd79d - ld [wd456], a + ld [wCurPikaMovementSpriteImageIdx], a + call PikaMovementFunc_Sine + ld [wPikachuMovementYOffset], a and a ret z - call Func_fd672 + call PikaMovement_SetSpawnShadow ret -Func_fd6e2: - call GetObjectFacing +PikaMovementFunc2_CopyFacingToJump: + call GetPikachuFacing ld d, a - call Func_fd74a + call PikaMovementFunc2_GetImageBaseOffset or d - ld [wPikaPicAnimTimer + 1], a - call Func_fd79d - ld [wd456], a + ld [wCurPikaMovementSpriteImageIdx], a + call PikaMovementFunc_Sine + ld [wPikachuMovementYOffset], a ret -Func_fd6f4: - ld a, [wPikaPicAnimPointerSetupFinished] +PikaMovementFunc2_TurnParameter: + ld a, [wCurPikaMovementParam2] and $40 cp $40 - jr z, Func_fd6ff - jr Func_fd718 + jr z, PikaMovementFunc2_TurnClockwise + jr PikaMovementFunc2_TurnCounterClockwise -Func_fd6ff: - call Func_fd755 +PikaMovementFunc2_TurnClockwise: + call PikaMovementFunc2_GetSpriteImageIdxDirection ld d, a - call Func_fd78e - jr nz, .asm_fd710 + call CheckPikachuStepTimer2 + jr nz, .skip ld hl, Data_fd731 -.asm_fd70b +.loop ld a, [hli] cp d - jr nz, .asm_fd70b + jr nz, .loop ld d, [hl] -.asm_fd710 - call Func_fd74a +.skip + call PikaMovementFunc2_GetImageBaseOffset or d - ld [wPikaPicAnimTimer + 1], a + ld [wCurPikaMovementSpriteImageIdx], a ret -Func_fd718: - call Func_fd755 +PikaMovementFunc2_TurnCounterClockwise: + call PikaMovementFunc2_GetSpriteImageIdxDirection ld d, a - call Func_fd78e - jr nz, .asm_fd529 + call CheckPikachuStepTimer2 + jr nz, .skip ld hl, Data_fd731End -.asm_fd524 +.loop ld a, [hld] cp d - jr nz, .asm_fd524 + jr nz, .loop ld d, [hl] -.asm_fd529 - call Func_fd74a +.skip + call PikaMovementFunc2_GetImageBaseOffset or d - ld [wPikaPicAnimTimer + 1], a + ld [wCurPikaMovementSpriteImageIdx], a ret Data_fd731: @@ -702,27 +710,27 @@ Data_fd731: db SPRITE_FACING_DOWN Data_fd731End: -Func_fd736: +PikaMovementFunc2_Timer: push hl - ld hl, 7 + ld hl, wPlayerIntraAnimFrameCounter - wPlayerSpriteStateData1 add hl, bc ld a, [hl] inc a and $3 ld [hli], a - jr nz, .asm_fd747 + jr nz, .load_pop ld a, [hl] inc a and $3 ld [hl], a -.asm_fd747 +.load_pop ld a, [hl] pop hl ret -Func_fd74a: +PikaMovementFunc2_GetImageBaseOffset: push hl - ld hl, wSpriteStateData2 - wSpriteStateData1 + 14 + ld hl, wPlayerSpriteImageBaseOffset - wPlayerSpriteStateData1 add hl, bc ld a, [hl] dec a @@ -730,27 +738,27 @@ Func_fd74a: pop hl ret -Func_fd755: +PikaMovementFunc2_GetSpriteImageIdxDirection: push hl - ld hl, 2 + ld hl, wPlayerSpriteImageIdx - wPlayerSpriteStateData1 add hl, bc ld a, [hl] and $c pop hl ret -GetObjectFacing: +GetPikachuFacing: push hl - ld hl, 9 + ld hl, wPlayerFacingDirection - wPlayerSpriteStateData1 add hl, bc ld a, [hl] and $c pop hl ret -SetObjectFacing: +SetPikachuFacing: push hl - ld hl, 9 + ld hl, wPlayerFacingDirection - wPlayerSpriteStateData1 add hl, bc add a add a @@ -759,10 +767,10 @@ SetObjectFacing: pop hl ret -Func_fd775: - ld hl, wd457 +CheckPikachuStepTimer1: + ld hl, wPikachuStepTimer inc [hl] - ld a, [wPikaPicAnimPointer] + ld a, [wCurPikaMovementParam1] and $1f inc a cp [hl] @@ -770,18 +778,19 @@ Func_fd775: ld [hl], 0 ret -Func_fd784: - ld a, [wPikaPicAnimPointer] +GetPikachuStepVectorMagnitude: + ; *XX***** + ld a, [wCurPikaMovementParam1] swap a rrca and $3 inc a ret -Func_fd78e: - ld hl, wd458 +CheckPikachuStepTimer2: + ld hl, wPikachuStepSubtimer inc [hl] - ld a, [wPikaPicAnimPointerSetupFinished] + ld a, [wCurPikaMovementParam2] and $f inc a cp [hl] @@ -789,11 +798,11 @@ Func_fd78e: ld [hl], 0 ret -Func_fd79d: - call Func_fd7b2 - ld a, [wd458] +PikaMovementFunc_Sine: + call .GetArgument + ld a, [wPikachuStepSubtimer] add e - ld [wd458], a + ld [wPikachuStepSubtimer], a add $20 ld e, a push hl @@ -803,37 +812,37 @@ Func_fd79d: pop hl ret -Func_fd7b2: - ld a, [wPikaPicAnimPointerSetupFinished] +.GetArgument: + ld a, [wCurPikaMovementParam2] and $f inc a ld d, a - ld a, [wPikaPicAnimPointerSetupFinished] + ld a, [wCurPikaMovementParam2] swap a and $7 ld e, a ld a, 1 - jr z, .asm_fd7c9 -.asm_fd7c5 + jr z, .okay +.loop add a dec e - jr nz, .asm_fd7c5 -.asm_fd7c9 + jr nz, .loop +.okay ld e, a ret -Func_fd7cb: +ApplyPikachuStepVector: push bc ld c, a ld b, 0 - ld hl, Data_fd7e3 + ld hl, .StepVectors add hl, bc add hl, bc ld d, [hl] inc hl ld e, [hl] pop bc - ld hl, wSpriteStateData2 - wSpriteStateData1 + 4 + ld hl, wPlayerMapY - wPlayerSpriteStateData1 add hl, bc ld a, [hl] add e @@ -843,7 +852,7 @@ Func_fd7cb: ld [hl], a ret -Data_fd7e3: +.StepVectors: db 0, 1 db 0, -1 db -1, 0 @@ -853,7 +862,7 @@ Data_fd7e3: db -1, -1 db 1, -1 -Func_fd7f3: +LoadPikachuShadowOAMData: push bc push de push hl @@ -861,22 +870,22 @@ Func_fd7f3: ld bc, wOAMBuffer + 4 * 36 ld a, [wPikaSpriteY] ld e, a - ld a, [wPikaPicAnimDelay] + ld a, [wPikaSpriteX] ld d, a - ld hl, Data_fd80b - call Func_fd814 + ld hl, .OAMData + call .LoadOAMData pop hl pop de pop bc ret -Data_fd80b: - db $02 +.OAMData: + db 2 db $0c, $00, $ff, 0 db $0c, $08, $ff, 1 << OAM_X_FLIP -Func_fd814: +.LoadOAMData: ld a, e add $10 ld e, a @@ -884,7 +893,7 @@ Func_fd814: add $8 ld d, a ld a, [hli] -.asm_fd81d +.loop push af ld a, [hli] add e @@ -902,7 +911,7 @@ Func_fd814: inc bc pop af dec a - jr nz, .asm_fd81d + jr nz, .loop ret LoadPikachuShadowIntoVRAM: @@ -924,7 +933,7 @@ LoadPikachuBallIconIntoVRAM: Func_fd851: ld hl, vNPCSprites + $c * $10 ld a, 3 -.asm_fd856 +.loop push af push hl ld de, GFX_fd86b @@ -935,13 +944,13 @@ Func_fd851: add hl, de pop af dec a - jr nz, .asm_fd856 + jr nz, .loop ret GFX_fd86b: INCBIN "gfx/unknown_fd86b.2bpp" -LoadPikachuSpriteIntoVRAM: ; fd8ab (3f:58ab) +LoadPikachuSpriteIntoVRAM: ld de, PikachuSprite lb bc, BANK(PikachuSprite), (SandshrewSprite - PikachuSprite) / 32 ld hl, vNPCSprites + $c * $10 @@ -961,7 +970,7 @@ LoadPikachuSpriteIntoVRAM: ; fd8ab (3f:58ab) call LoadPikachuBallIconIntoVRAM ret -PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4) +PikachuPewterPokecenterCheck: ld a, [wCurMap] cp PEWTER_POKECENTER ret nz @@ -969,7 +978,7 @@ PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4) call StarterPikachuEmotionCommand_turnawayfromplayer ret -PikachuFanClubCheck: ; fd8e1 (3f:58e1) +PikachuFanClubCheck: ld a, [wCurMap] cp POKEMON_FAN_CLUB ret nz @@ -977,14 +986,14 @@ PikachuFanClubCheck: ; fd8e1 (3f:58e1) call StarterPikachuEmotionCommand_turnawayfromplayer ret -PikachuBillsHouseCheck: ; fd8ee (3f:58ee) +PikachuBillsHouseCheck: ld a, [wCurMap] cp BILLS_HOUSE ret nz call EnablePikachuFollowingPlayer ret -Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: ; fd8f8 (3f:58f8) +Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: call LoadCurrentMapView call UpdateSprites call Delay3 diff --git a/engine/pikachu_pcm.asm b/engine/pikachu_pcm.asm index e0238468..043f702c 100755 --- a/engine/pikachu_pcm.asm +++ b/engine/pikachu_pcm.asm @@ -1,4 +1,4 @@ -PlayPikachuSoundClip:: ; f0000 (3c:4000) +PlayPikachuSoundClip:: ld a, e ld e, a ld d, $0 @@ -85,7 +85,7 @@ PlayPikachuSoundClip:: ; f0000 (3c:4000) ei ret -PikachuCriesPointerTable: ; f008e (3c:408e) +PikachuCriesPointerTable: ; format: ; db bank ; dw pointer to cry diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm index a49e9bc2..c04382c1 100755 --- a/engine/pikachu_pic_animation.asm +++ b/engine/pikachu_pic_animation.asm @@ -1,26 +1,26 @@ -GetPikaPicAnimationScriptIndex: ; fd978 (3f:5978) +GetPikaPicAnimationScriptIndex: ld hl, PikachuMoodLookupTable ld a, [wPikachuMood] ld d, a -.asm_fd97f +.get_mood_param ld a, [hli] inc hl cp d - jr c, .asm_fd97f + jr c, .get_mood_param dec hl ld e, [hl] ld hl, PikaPicAnimationScriptPointerLookupTable ld a, [wPikachuHappiness] ld d, a ld bc, 6 -.asm_fd990 +.get_happiness_param ld a, [hl] cp d - jr nc, .asm_fd997 + jr nc, .got_animation add hl, bc - jr .asm_fd990 + jr .get_happiness_param -.asm_fd997 +.got_animation ld d, 0 add hl, de ld a, [hl] @@ -29,44 +29,85 @@ GetPikaPicAnimationScriptIndex: ; fd978 (3f:5978) PikachuMoodLookupTable: ; First byte: mood threshold ; Second byte: column index in PikaPicAnimationScriptPointerLookupTable - db $28, 1 - db $7f, 2 - db $80, 3 - db $d2, 4 - db $ff, 5 + db 40, 1 + db 127, 2 + db 128, 3 + db 210, 4 + db 255, 5 PikaPicAnimationScriptPointerLookupTable: ; First byte: happiness threshold ; Remaining bytes: loaded based on Pikachu's mood - db $32, $0e, $0e, $06, $0d, $0d - db $64, $09, $09, $05, $0c, $0c - db $82, $03, $03, $01, $08, $08 - db $a0, $03, $03, $04, $0f, $0f - db $c8, $11, $11, $07, $02, $02 - db $fa, $11, $11, $10, $0a, $0a - db $ff, $11, $11, $13, $14, $14 - -StarterPikachuEmotionCommand_pikapic: ; fd9d0 (3f:59d0) + db 50 + dpikapic PikaPicAnimScript14 + dpikapic PikaPicAnimScript14 + dpikapic PikaPicAnimScript6 + dpikapic PikaPicAnimScript13 + dpikapic PikaPicAnimScript13 + + db 100 + dpikapic PikaPicAnimScript9 + dpikapic PikaPicAnimScript9 + dpikapic PikaPicAnimScript5 + dpikapic PikaPicAnimScript12 + dpikapic PikaPicAnimScript12 + + db 130 + dpikapic PikaPicAnimScript3 + dpikapic PikaPicAnimScript3 + dpikapic PikaPicAnimScript1 + dpikapic PikaPicAnimScript8 + dpikapic PikaPicAnimScript8 + + db 160 + dpikapic PikaPicAnimScript3 + dpikapic PikaPicAnimScript3 + dpikapic PikaPicAnimScript4 + dpikapic PikaPicAnimScript15 + dpikapic PikaPicAnimScript15 + + db 200 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript7 + dpikapic PikaPicAnimScript2 + dpikapic PikaPicAnimScript2 + + db 250 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript16 + dpikapic PikaPicAnimScript10 + dpikapic PikaPicAnimScript10 + + db 255 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript17 + dpikapic PikaPicAnimScript19 + dpikapic PikaPicAnimScript20 + dpikapic PikaPicAnimScript20 + +StarterPikachuEmotionCommand_pikapic: ld a, [H_AUTOBGTRANSFERENABLED] push af xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, [de] - ld [wExpressionNumber2], a + ld [wPikaPicAnimNumber], a inc de push de - call Func_fd9e4 + call .RunPikapic pop de pop af ld [H_AUTOBGTRANSFERENABLED], a ret -Func_fd9e4: +.RunPikapic: call PlacePikapicTextBoxBorder callab LoadOverworldPikachuFrontpicPalettes call ResetPikaPicAnimBuffer call LoadCurrentPikaPicAnimScriptPointer - call Func_fda9a + call ExecutePikaPicAnimScript call PlacePikapicTextBoxBorder call RunDefaultPaletteCommand ret @@ -86,10 +127,10 @@ ResetPikaPicAnimBuffer: ld [wPikaPicAnimTimer], a ld a, h ld [wPikaPicAnimTimer + 1], a - ld a, $07 - ld [wPikaSpriteY], a - ld a, $06 - ld [wPikaPicTextboxStartY], a + ld a, $7 + ld [wPikaPicPikaDrawStartX], a + ld a, $6 + ld [wPikaPicPikaDrawStartY], a ret PlacePikapicTextBoxBorder: @@ -100,20 +141,20 @@ PlacePikapicTextBoxBorder: call TextBoxBorder call Delay3 call UpdateSprites - ld a, $01 + ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 ret LoadCurrentPikaPicAnimScriptPointer: - ld a, [wExpressionNumber2] + ld a, [wPikaPicAnimNumber] cp $1d jr c, .valid - ld a, 0 + ld a, $0 .valid ld e, a ld d, 0 - ld hl, Pointers_fda5e + ld hl, PikaPicAnimPointers add hl, de add hl, de ld a, [hli] @@ -122,48 +163,51 @@ LoadCurrentPikaPicAnimScriptPointer: call UpdatePikaPicAnimPointer ret -Pointers_fda5e: - dw Data_fe28a ; 00 - dw Data_fe28a ; 01 - dw Data_fe2a4 ; 02 - dw Data_fe2be ; 03 - dw Data_fe2d8 ; 04 - dw Data_fe2f2 ; 05 - dw Data_fe30c ; 06 - dw Data_fe326 ; 07 - dw Data_fe340 ; 08 - dw Data_fe35a ; 09 - dw Data_fe374 ; 0a - dw Data_fe390 ; 0b - dw Data_fe3aa ; 0c - dw Data_fe3c4 ; 0d - dw Data_fe3de ; 0e - dw Data_fe3f8 ; 0f - dw Data_fe412 ; 10 - dw Data_fe42c ; 11 - dw Data_fe446 ; 12 - dw Data_fe460 ; 13 - dw Data_fe47a ; 14 - dw Data_fe494 ; 15 - dw Data_fe4b4 ; 16 - dw Data_fe4ce ; 17 - dw Data_fe4e8 ; 18 - dw Data_fe502 ; 19 - dw Data_fe520 ; 1a - dw Data_fe53e ; 1b - dw Data_fe558 ; 1c - dw Data_fe28a ; 1d - - -Func_fda9a: +PikaPicAnimPointers: +pikapic_def: macro +\1_id: dw \1 +endm + + pikapic_def PikaPicAnimScript0 ; 00 + pikapic_def PikaPicAnimScript1 ; 01 + pikapic_def PikaPicAnimScript2 ; 02 + pikapic_def PikaPicAnimScript3 ; 03 + pikapic_def PikaPicAnimScript4 ; 04 + pikapic_def PikaPicAnimScript5 ; 05 + pikapic_def PikaPicAnimScript6 ; 06 + pikapic_def PikaPicAnimScript7 ; 07 + pikapic_def PikaPicAnimScript8 ; 08 + pikapic_def PikaPicAnimScript9 ; 09 + pikapic_def PikaPicAnimScript10 ; 0a + pikapic_def PikaPicAnimScript11 ; 0b + pikapic_def PikaPicAnimScript12 ; 0c + pikapic_def PikaPicAnimScript13 ; 0d + pikapic_def PikaPicAnimScript14 ; 0e + pikapic_def PikaPicAnimScript15 ; 0f + pikapic_def PikaPicAnimScript16 ; 10 + pikapic_def PikaPicAnimScript17 ; 11 + pikapic_def PikaPicAnimScript18 ; 12 + pikapic_def PikaPicAnimScript19 ; 13 + pikapic_def PikaPicAnimScript20 ; 14 + pikapic_def PikaPicAnimScript21 ; 15 + pikapic_def PikaPicAnimScript22 ; 16 + pikapic_def PikaPicAnimScript23 ; 17 + pikapic_def PikaPicAnimScript24 ; 18 + pikapic_def PikaPicAnimScript25 ; 19 + pikapic_def PikaPicAnimScript26 ; 1a + pikapic_def PikaPicAnimScript27 ; 1b + pikapic_def PikaPicAnimScript28 ; 1c + pikapic_def PikaPicAnimScript29 ; 1d + +ExecutePikaPicAnimScript: .loop xor a ld [H_AUTOBGTRANSFERENABLED], a - call RunPikaPicAnimScript - call Func_fdad5 - call Func_fdad6 - call Func_fdad5 - ld a, $01 + call RunPikaPicAnimSetupScript + call DummyFunction_fdad5 + call AnimateCurrentPikaPicAnimFrame + call DummyFunction_fdad5 + ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call PikaPicAnimTimerAndJoypad and a @@ -194,57 +238,57 @@ CheckPikaPicAnimTimer: ret .timer_expired - ld a, $01 + ld a, $1 ret -Func_fdad5: +DummyFunction_fdad5: ret -Func_fdad6: +AnimateCurrentPikaPicAnimFrame: ld bc, wPikaPicAnimObjectDataBuffer ld a, 4 -.asm_fdadb +.loop push af push bc - ld hl, 0 + ld hl, 0 ; struct index add hl, bc ld a, [hli] and a - jr z, .asm_fdb26 + jr z, .skip ld a, [hli] - ld [wCurPikaPicAnimObject], a + ld [wCurPikaPicAnimObjectScriptIdx], a ld a, [hli] - ld [wCurPikaPicAnimObject + 1], a + ld [wCurPikaPicAnimObjectFrameIdx], a ld a, [hli] - ld [wCurPikaPicAnimObject + 2], a + ld [wCurPikaPicAnimObjectFrameTimer], a ld a, [hli] - ld [wd456], a + ld [wCurPikaPicAnimObjectVTileOffset], a ld a, [hli] - ld [wd457], a + ld [wCurPikaPicAnimObjectXOffset], a ld a, [hli] - ld [wd458], a + ld [wCurPikaPicAnimObjectYOffset], a ld a, [hli] - ld [wCurPikaPicAnimObject + 3], a + ld [wCurPikaPicAnimObject + 6], a push bc - call Func_fdb7e + call LoadPikaPicAnimObjectData pop bc - ld hl, 1 + ld hl, 1 ; script index add hl, bc - ld a, [wCurPikaPicAnimObject] + ld a, [wCurPikaPicAnimObjectScriptIdx] ld [hli], a - ld a, [wCurPikaPicAnimObject + 1] + ld a, [wCurPikaPicAnimObjectFrameIdx] ld [hli], a - ld a, [wCurPikaPicAnimObject + 2] + ld a, [wCurPikaPicAnimObjectFrameTimer] ld [hli], a - ld a, [wd456] + ld a, [wCurPikaPicAnimObjectVTileOffset] ld [hli], a - ld a, [wd457] + ld a, [wCurPikaPicAnimObjectXOffset] ld [hli], a - ld a, [wd458] + ld a, [wCurPikaPicAnimObjectYOffset] ld [hli], a - ld a, [wCurPikaPicAnimObject + 3] + ld a, [wCurPikaPicAnimObject + 6] ld [hl], a -.asm_fdb26 +.skip pop bc ld hl, 8 add hl, bc @@ -252,7 +296,7 @@ Func_fdad6: ld c, l pop af dec a - jr nz, .asm_fdadb + jr nz, .loop ret PikaPicAnimCommand_object: @@ -279,7 +323,7 @@ PikaPicAnimCommand_object: call GetPikaPicAnimByte ld [hl], a xor a - ld [hli], a + ld [hli], a ; overloads ld [hli], a call GetPikaPicAnimByte ld [hli], a @@ -311,323 +355,65 @@ PikaPicAnimCommand_deleteobject: ld [hl], a ret -Func_fdb7e: -.asm_fdb7e - ld a, [wCurPikaPicAnimObject] +LoadPikaPicAnimObjectData: +.loop + ld a, [wCurPikaPicAnimObjectScriptIdx] cp $23 - jr c, .asm_fdb87 - ld a, $04 -.asm_fdb87 + jr c, .valid + ld a, $4 +.valid ld e, a - ld d, $00 - ld hl, Pointers_fdbc9 + ld d, 0 + ld hl, PikaPicAnimBGFramesPointers add hl, de add hl, de ld a, [hli] ld h, [hl] ld l, a - ld a, [wCurPikaPicAnimObject + 1] + ld a, [wCurPikaPicAnimObjectFrameIdx] ld e, a ld d, 0 add hl, de add hl, de ld a, [hli] cp $e0 - jr z, .asm_fdba1 - jr .asm_fdbaa + jr z, .end + jr .init -.asm_fdba1 +.end xor a - ld [wCurPikaPicAnimObject + 1], a - ld [wCurPikaPicAnimObject + 2], a - jr .asm_fdb7e + ld [wCurPikaPicAnimObjectFrameIdx], a + ld [wCurPikaPicAnimObjectFrameTimer], a + jr .loop -.asm_fdbaa +.init push hl - call Func_fdd62 + call LoadCurPikaPicObjectTilemap pop hl ld a, [hl] and a - jr z, .asm_fdbc8 - ld a, [wCurPikaPicAnimObject + 2] + jr z, .not_done ; lasts forever + ld a, [wCurPikaPicAnimObjectFrameTimer] inc a - ld [wCurPikaPicAnimObject + 2], a + ld [wCurPikaPicAnimObjectFrameTimer], a cp [hl] - jr nz, .asm_fdbc8 + jr nz, .not_done xor a - ld [wCurPikaPicAnimObject + 2], a - ld a, [wCurPikaPicAnimObject + 1] + ld [wCurPikaPicAnimObjectFrameTimer], a + ld a, [wCurPikaPicAnimObjectFrameIdx] inc a - ld [wCurPikaPicAnimObject + 1], a -.asm_fdbc8 + ld [wCurPikaPicAnimObjectFrameIdx], a +.not_done ret -Pointers_fdbc9: - dw Data_fdc11 - dw Data_fdc11 - dw Data_fdc29 - dw Data_fdc32 - dw Data_fdc3b - dw Data_fdc3e - dw Data_fdc41 - dw Data_fdc50 - dw Data_fdc61 - dw Data_fdc6e - dw Data_fdc77 - dw Data_fdc84 - dw Data_fdc8d - dw Data_fdc98 - dw Data_fdca5 - dw Data_fdcb2 - dw Data_fdcb7 - dw Data_fdcc2 - dw Data_fdccb - dw Data_fdcd4 - dw Data_fdcdf - dw Data_fdce8 - dw Data_fdcf1 - dw Data_fdcf6 - dw Data_fdd01 - dw Data_fdd0a - dw Data_fdd13 - dw Data_fdd1c - dw Data_fdd27 - dw Data_fdd2c - dw Data_fdd35 - dw Data_fdd40 - dw Data_fdd47 - dw Data_fdd54 - dw Data_fdd59 - dw Data_fdc3b - -Data_fdc11: - db $01, $14 - db $07, $02 - db $01, $01 - db $07, $02 - db $01, $01 - db $07, $08 - db $e0 -Data_fdc1e: - db $02, $02 - db $01, $01 - db $02, $02 - db $01, $01 - db $02, $08 - db $e0 -Data_fdc29: - db $00, $08 - db $08, $08 - db $00, $08 - db $08, $08 - db $e0 -Data_fdc32: - db $08, $08 - db $00, $08 - db $08, $08 - db $00, $08 - db $e0 -Data_fdc3b: - db $01, $00 - db $e0 -Data_fdc3e: - db $09, $00 - db $e0 -Data_fdc41: - db $00, $02 - db $0e, $04 - db $00, $08 - db $0e, $04 - db $00, $40 - db $0e, $04 - db $00, $40 - db $e0 -Data_fdc50: - db $00, $04 - db $0f, $04 - db $00, $04 - db $0f, $04 - db $00, $08 - db $0f, $04 - db $00, $08 - db $0f, $04 - db $e0 -Data_fdc61: - db $10, $01 - db $00, $01 - db $10, $01 - db $00, $40 - db $10, $01 - db $00, $40 - db $e0 -Data_fdc6e: - db $00, $08 - db $11, $08 - db $00, $14 - db $11, $08 - db $e0 -Data_fdc77: - db $00, $02 - db $12, $02 - db $00, $02 - db $12, $40 - db $00, $03 - db $12, $40 - db $e0 -Data_fdc84: - db $00, $08 - db $13, $40 - db $00, $04 - db $13, $40 - db $e0 -Data_fdc8d: - db $14, $08 - db $00, $02 - db $14, $08 - db $00, $02 - db $14, $08 - db $e0 -Data_fdc98: - db $15, $04 - db $00, $08 - db $15, $04 - db $00, $40 - db $15, $04 - db $00, $40 - db $e0 -Data_fdca5: - db $00, $02 - db $16, $02 - db $00, $02 - db $16, $02 - db $00, $14 - db $16, $02 - db $e0 -Data_fdcb2: - db $00, $08 - db $17, $08 - db $e0 -Data_fdcb7: - db $00, $08 - db $17, $03 - db $18, $05 - db $17, $03 - db $00, $05 - db $e0 -Data_fdcc2: - db $00, $14 - db $19, $08 - db $00, $14 - db $19, $08 - db $e0 -Data_fdccb: - db $00, $0d - db $1a, $0c - db $00, $64 - db $1a, $08 - db $e0 -Data_fdcd4: - db $00, $05 - db $1b, $05 - db $00, $05 - db $1b, $05 - db $00, $64 - db $e0 -Data_fdcdf: - db $00, $02 - db $1c, $02 - db $00, $02 - db $1c, $02 - db $e0 -Data_fdce8: - db $00, $05 - db $1d, $05 - db $00, $05 - db $1d, $05 - db $e0 -Data_fdcf1: - db $1e, $08 - db $00, $64 - db $e0 -Data_fdcf6: - db $00, $0a - db $1f, $03 - db $00, $03 - db $1f, $03 - db $00, $64 - db $e0 -Data_fdd01: - db $00, $03 - db $20, $64 - db $00, $08 - db $20, $08 - db $e0 -Data_fdd0a: - db $21, $06 - db $00, $06 - db $21, $06 - db $00, $06 - db $e0 -Data_fdd13: - db $00, $08 - db $22, $0c - db $00, $08 - db $22, $0c - db $e0 -Data_fdd1c: - db $00, $08 - db $09, $02 - db $0a, $01 - db $0b, $01 - db $0c, $64 - db $e0 -Data_fdd27: - db $00, $08 - db $24, $64 - db $e0 -Data_fdd2c: - db $00, $10 - db $25, $10 - db $00, $10 - db $25, $10 - db $e0 -Data_fdd35: - db $00, $06 - db $26, $06 - db $00, $06 - db $26, $06 - db $00, $64 - db $e0 -Data_fdd40: - db $00, $06 - db $09, $06 - db $0a, $64 - db $e0 -Data_fdd47: - db $00, $14 - db $09, $08 - db $00, $14 - db $09, $08 - db $0a, $08 - db $0b, $64 - db $e0 -Data_fdd54: - db $00, $04 - db $09, $64 - db $e0 -Data_fdd59: - db $00, $0c - db $09, $0c - db $00, $0c - db $09, $64 - db $e0 - -Func_fdd62: +INCLUDE "data/pikachu_pic_objects.asm" + +LoadCurPikaPicObjectTilemap: and a ret z ld e, a ld d, 0 - ld hl, Pointers_fddb8 + ld hl, PikaPicTilemapPointers add hl, de add hl, de ld e, [hl] @@ -641,45 +427,45 @@ Func_fdd62: inc de push de push bc - call Func_fdd98 + call .GetStartCoords pop bc pop de -.asm_fdd7c +.row push bc push hl - ld a, [wd456] + ld a, [wCurPikaPicAnimObjectVTileOffset] ; tile id offset ld c, a -.asm_fdd82 +.col ld a, [de] inc de cp $ff - jr z, .asm_fdd8a + jr z, .skip add c ld [hl], a -.asm_fdd8a +.skip inc hl dec b - jr nz, .asm_fdd82 + jr nz, .col pop hl ld bc, SCREEN_WIDTH add hl, bc pop bc dec c - jr nz, .asm_fdd7c + jr nz, .row ret -Func_fdd98: +.GetStartCoords: push bc - ld a, [wd458] + ld a, [wCurPikaPicAnimObjectYOffset] ; Y offset ld b, a - ld a, [wPikaPicTextboxStartY] + ld a, [wPikaPicPikaDrawStartY] add b coord hl, 0, 0 ld bc, SCREEN_WIDTH call AddNTimes - ld a, [wd457] + ld a, [wCurPikaPicAnimObjectXOffset] ; X offset ld c, a - ld a, [wPikaSpriteY] + ld a, [wPikaPicPikaDrawStartX] add c ld c, a ld b, 0 @@ -687,234 +473,7 @@ Func_fdd98: pop bc ret -Pointers_fddb8: - dw Data_fde0e - dw Data_fde0f - dw Data_fde2a - dw Data_fde60 - dw Data_fde63 - dw Data_fde67 - dw Data_fde6b - dw Data_fde45 - dw Data_fde6b - dw Data_fdfaa - dw Data_fdfc5 - dw Data_fdfe0 - dw Data_fdffb - dw Data_fe016 - dw Data_fde81 - dw Data_fde9c - dw Data_fdeb7 - dw Data_fded2 - dw Data_fdeed - dw Data_fdf08 - dw Data_fdf23 - dw Data_fdf3e - dw Data_fdf59 - dw Data_fdf74 - dw Data_fdf8f - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfaa - dw Data_fdfc5 - dw Data_fdfe0 - dw Data_fde0f - -Data_fde0e: - db $ff ; unused - -Data_fde0f: ; fde0f - db 5, 5 - db $00, $05, $0a, $0f, $14 - db $01, $06, $0b, $10, $15 - db $02, $07, $0c, $11, $16 - db $03, $08, $0d, $12, $17 - db $04, $09, $0e, $13, $18 - -Data_fde2a: ; fde2a - db 5, 5 - db $19, $1e, $23, $28, $2d - db $1a, $1f, $24, $29, $2e - db $1b, $20, $25, $2a, $2f - db $1c, $21, $26, $2b, $30 - db $1d, $22, $27, $2c, $31 - -Data_fde45: ; fde45 - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $ff, $20, $25, $ff, $ff - db $ff, $21, $26, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - -Data_fde60: ; fde60 - db 1, 1 - db $00 - -Data_fde63: ; fde63 - db 2, 1 - db $00 - db $01 - -Data_fde67: ; fde67 - db 1, 2 - db $00, $01 - -Data_fde6b: ; fde6b - db 2, 2 - db $00, $01 - db $02, $03 - -Data_fde71: ; fde71 - db 3, 2 - db $00, $01 - db $02, $03 - db $04, $05 - -Data_fde79: ; fde79 - db 2, 3 - db $00, $01, $02 - db $03, $04, $05 - -Data_fde81: ; fde81 - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $02, $03, $04 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - -Data_fde9c: ; fde9c - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - -Data_fdeb7: ; fdeb7 - db 5, 5 - db $00, $01, $ff, $ff, $ff - db $02, $03, $ff, $ff, $ff - db $04, $05, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - -Data_fded2: ; fded2 - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - db $0a, $0b, $0c, $0d, $0e - db $0f, $10, $11, $12, $13 - -Data_fdeed: ; fdeed - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $00, $01 - db $ff, $ff, $ff, $02, $03 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - -Data_fdf08: ; fdf08 - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $ff, $ff, $ff - db $02, $03, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - -Data_fdf23: ; fdf23 - db 5, 5 - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - db $0a, $0b, $0c, $0d, $0e - db $0f, $10, $11, $12, $13 - db $14, $15, $16, $17, $18 - -Data_fdf3e: ; fdf3e - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - db $ff, $ff, $ff, $ff, $ff - -Data_fdf59: ; fdf59 - db 5, 5 - db $ff, $ff, $ff, $ff, $ff - db $ff, $ff, $ff, $ff, $ff - db $00, $01, $ff, $ff, $ff - db $02, $03, $ff, $ff, $ff - db $04, $05, $ff, $ff, $ff - -Data_fdf74: ; fdf74 - db 5, 5 - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - db $0a, $0b, $0c, $0d, $0e - db $0f, $10, $11, $12, $13 - db $14, $15, $16, $17, $18 - -Data_fdf8f: ; fdf8f - db 5, 5 - db $19, $1a, $1b, $1c, $1d - db $1e, $1f, $20, $21, $22 - db $23, $24, $25, $26, $27 - db $28, $29, $2a, $2b, $2c - db $2d, $2e, $2f, $30, $31 - -Data_fdfaa: ; fdfaa - db 5, 5 - db $00, $01, $02, $03, $04 - db $05, $06, $07, $08, $09 - db $0a, $0b, $0c, $0d, $0e - db $0f, $10, $11, $12, $13 - db $14, $15, $16, $17, $18 - -Data_fdfc5: ; fdfc5 - db 5, 5 - db $19, $1a, $1b, $1c, $1d - db $1e, $1f, $20, $21, $22 - db $23, $24, $25, $26, $27 - db $28, $29, $2a, $2b, $2c - db $2d, $2e, $2f, $30, $31 - -Data_fdfe0: ; fdfe0 - db 5, 5 - db $32, $33, $34, $35, $36 - db $37, $38, $39, $3a, $3b - db $3c, $3d, $3e, $3f, $40 - db $41, $42, $43, $44, $45 - db $46, $47, $48, $49, $4a - -Data_fdffb: ; fdffb - db 5, 5 - db $4b, $4c, $4d, $4e, $4f - db $50, $51, $52, $53, $54 - db $55, $56, $57, $58, $59 - db $5a, $5b, $5c, $5d, $5e - db $5f, $60, $61, $62, $63 - -Data_fe016: ; fe016 - db 5, 5 - db $64, $65, $66, $67, $68 - db $69, $6a, $6b, $6c, $6d - db $6e, $6f, $70, $71, $72 - db $73, $74, $75, $76, $77 - db $78, $79, $7a, $7b, $7c +INCLUDE "data/pikachu_pic_tilemaps.asm" LoadPikaPicAnimGFXHeader: push hl @@ -936,8 +495,8 @@ LoadPikaPicAnimGFXHeader: pop hl ret -RunPikaPicAnimScript: - call Func_fe066 +RunPikaPicAnimSetupScript: + call .CheckAndAdvanceTimer ret c xor a ld [wPikaPicAnimPointerSetupFinished], a @@ -945,7 +504,7 @@ RunPikaPicAnimScript: call GetPikaPicAnimByte ld e, a ld d, 0 - ld hl, Jumptable_fe071 + ld hl, .Jumptable add hl, de add hl, de ld a, [hli] @@ -957,7 +516,7 @@ RunPikaPicAnimScript: jr z, .loop ret -Func_fe066: +.CheckAndAdvanceTimer: ld a, [wPikaPicAnimDelay] and a ret z @@ -966,7 +525,7 @@ Func_fe066: scf ret -Jumptable_fe071: +.Jumptable: dw PikaPicAnimCommand_nop ; 00, 0 params dw PikaPicAnimCommand_writebyte ; 01, 1 param dw PikaPicAnimCommand_loadgfx ; 02, 1 param @@ -980,7 +539,7 @@ Jumptable_fe071: dw PikaPicAnimCommand_setduration ; 0a, 1 dw param dw PikaPicAnimCommand_cry ; 0b, 1 param dw PikaPicAnimCommand_thunderbolt ; 0c, 0 params - dw PikaPicAnimCommand_waitbgmap ; 0d, 0 params (ret) + dw PikaPicAnimCommand_run ; 0d, 0 params (ret) dw PikaPicAnimCommand_ret ; 0e, 0 params (ret) PikaPicAnimCommand_nop: @@ -991,9 +550,9 @@ PikaPicAnimCommand_ret: ld [wPikaPicAnimTimer], a xor a ld [wPikaPicAnimTimer + 1], a - jr PikaPicAnimCommand_waitbgmap + jr PikaPicAnimCommand_run -Func_fe09b: +; XXX ret PikaPicAnimCommand_setduration: @@ -1003,7 +562,7 @@ PikaPicAnimCommand_setduration: ld [wPikaPicAnimTimer + 1], a ret -PikaPicAnimCommand_waitbgmap: +PikaPicAnimCommand_run: ld a, $ff ld [wPikaPicAnimPointerSetupFinished], a ret @@ -1068,11 +627,11 @@ PikaPicAnimCommand_loadgfx: cp a, $ff jr z, .compressed call RequestPikaPicAnimGFX - jr .asm_fe109 + jr .done .compressed call DecompressRequestPikaPicAnimGFX -.asm_fe109 +.done pop af ld [hTilesetType], a pop af @@ -1144,6 +703,11 @@ GetPikaPicVRAMAddressForNewGFX: ret CheckIfThereIsRoomForPikaPicAnimGFX: +; d: idx +; e: size +; FATAL: If the graphic has already been loaded, or if there are +; already 8 graphics objects loaded, the game will execute arbitrary +; code. push bc push hl ld hl, wPikaPicUsedGFX @@ -1176,9 +740,9 @@ CheckIfThereIsRoomForPikaPicAnimGFX: add e ld [wPikaPicUsedGFXCount], a cp $80 - jr z, .asm_fe1a7 + jr z, .okay jr nc, .failed -.asm_fe1a7 +.okay ld a, [hl] and a jr .pop_ret @@ -1228,12 +792,12 @@ PikaPicAnimCommand_thunderbolt: call DelayFrame ld a, [wAudioROMBank] push af - ld a, BANK(SFX_Battle_2F) + ld a, BANK(SFX_Thunderbolt) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a - call PikaPicAnimLoadThunderboltAudio + call .LoadAudio call PlaySound - call PikaPicAnimThunderboltFlashScreen + call .FlashScreen call WaitForSoundToFinish pop af ld [wAudioROMBank], a @@ -1242,7 +806,7 @@ PikaPicAnimCommand_thunderbolt: ld [wMuteAudioAndPauseMusic], a ret -PikaPicAnimLoadThunderboltAudio: +.LoadAudio: ld hl, MoveSoundTable ld e, THUNDERBOLT ld d, 0 @@ -1263,8 +827,8 @@ PikaPicAnimLoadThunderboltAudio: ld a, b ret -PikaPicAnimThunderboltFlashScreen: - ld hl, Data_fe242 +.FlashScreen: + ld hl, PikaPicAnimThunderboltPals .loop ld a, [hli] cp $ff @@ -1273,11 +837,11 @@ PikaPicAnimThunderboltFlashScreen: ld b, [hl] inc hl push hl - call GetDMGBGPalForPikaThunderbolt + call .UpdatePal pop hl jr .loop -GetDMGBGPalForPikaThunderbolt: +.UpdatePal: ld a, b ld [rBGP], a call UpdateGBCPal_BGP diff --git a/engine/pikachu_status.asm b/engine/pikachu_status.asm index 17330645..c73d3b3f 100755 --- a/engine/pikachu_status.asm +++ b/engine/pikachu_status.asm @@ -1,4 +1,4 @@ -IsStarterPikachuInOurParty:: ; fcdb8 (3f:4db8) +IsStarterPikachuInOurParty:: ld hl, wPartySpecies ld de, wPartyMon1OTID ld bc, wPartyMonOT @@ -64,18 +64,18 @@ IsStarterPikachuInOurParty:: ; fcdb8 (3f:4db8) and a ret -IsThisPartymonStarterPikachu_Box:: ; fce0d (3f:4e0d) +IsThisPartymonStarterPikachu_Box:: ld hl, wBoxMon1 ld bc, wBoxMon2 - wBoxMon1 ld de, wBoxMonOT jr asm_fce21 -IsThisPartymonStarterPikachu_Party:: ; fce18 (3f:4e18) +IsThisPartymonStarterPikachu_Party:: IsThisPartymonStarterPikachu:: ld hl, wPartyMon1 ld bc, wPartyMon2 - wPartyMon1 ld de, wPartyMonOT -asm_fce21: ; fce21 (3f:4e21) +asm_fce21: ld a, [wWhichPokemon] call AddNTimes ld a, [hl] @@ -113,7 +113,7 @@ asm_fce21: ; fce21 (3f:4e21) scf ret -UpdatePikachuMoodAfterBattle:: ; fce5a (3f:4e5a) +UpdatePikachuMoodAfterBattle:: ; because d is always $82 at this function, it serves to ; ensure Pikachu's mood is at least 130 after battle push de @@ -136,7 +136,7 @@ UpdatePikachuMoodAfterBattle:: ; fce5a (3f:4e5a) ld [wPikachuMood], a ret -CheckPikachuFaintedOrStatused:: ; fce73 (3f:4e73) +CheckPikachuFaintedOrStatused:: ; function to test if Pikachu is alive? xor a ld [wWhichPokemon], a @@ -178,7 +178,7 @@ CheckPikachuFaintedOrStatused:: ; fce73 (3f:4e73) and a ret -IsSurfingPikachuInThePlayersParty:: ; fceab (3f:4eab) +IsSurfingPikachuInThePlayersParty:: ld hl, wPartySpecies ld de, wPartyMon1Moves ld bc, wPartyMonOT diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index 195c89fb..97bbfc24 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -1,4 +1,4 @@ -DisplayDexRating: ; 44169 (11:4169) +DisplayDexRating: ld hl, wPokedexSeen ld b, wPokedexSeenEnd - wPokedexSeen call CountSetBits @@ -51,11 +51,11 @@ DisplayDexRating: ; 44169 (11:4169) ld [de], a ret -DexCompletionText: ; 441cc (11:41cc) +DexCompletionText: TX_FAR _DexCompletionText db "@" -DexRatingsTable: ; 441d1 (11:41d1) +DexRatingsTable: db 10 dw DexRatingText_Own0To9 db 20 @@ -89,66 +89,66 @@ DexRatingsTable: ; 441d1 (11:41d1) db 152 dw DexRatingText_Own150To151 -DexRatingText_Own0To9: ; 44201 (11:4201) +DexRatingText_Own0To9: TX_FAR _DexRatingText_Own0To9 db "@" -DexRatingText_Own10To19: ; 44206 (11:4206) +DexRatingText_Own10To19: TX_FAR _DexRatingText_Own10To19 db "@" -DexRatingText_Own20To29: ; 4420b (11:420b) +DexRatingText_Own20To29: TX_FAR _DexRatingText_Own20To29 db "@" -DexRatingText_Own30To39: ; 44210 (11:4210) +DexRatingText_Own30To39: TX_FAR _DexRatingText_Own30To39 db "@" -DexRatingText_Own40To49: ; 44215 (11:4215) +DexRatingText_Own40To49: TX_FAR _DexRatingText_Own40To49 db "@" -DexRatingText_Own50To59: ; 4421a (11:421a) +DexRatingText_Own50To59: TX_FAR _DexRatingText_Own50To59 db "@" -DexRatingText_Own60To69: ; 4421f (11:421f) +DexRatingText_Own60To69: TX_FAR _DexRatingText_Own60To69 db "@" -DexRatingText_Own70To79: ; 44224 (11:4224) +DexRatingText_Own70To79: TX_FAR _DexRatingText_Own70To79 db "@" -DexRatingText_Own80To89: ; 44229 (11:4229) +DexRatingText_Own80To89: TX_FAR _DexRatingText_Own80To89 db "@" -DexRatingText_Own90To99: ; 4422e (11:422e) +DexRatingText_Own90To99: TX_FAR _DexRatingText_Own90To99 db "@" -DexRatingText_Own100To109: ; 44233 (11:4233) +DexRatingText_Own100To109: TX_FAR _DexRatingText_Own100To109 db "@" -DexRatingText_Own110To119: ; 44238 (11:4238) +DexRatingText_Own110To119: TX_FAR _DexRatingText_Own110To119 db "@" -DexRatingText_Own120To129: ; 4423d (11:423d) +DexRatingText_Own120To129: TX_FAR _DexRatingText_Own120To129 db "@" -DexRatingText_Own130To139: ; 44242 (11:4242) +DexRatingText_Own130To139: TX_FAR _DexRatingText_Own130To139 db "@" -DexRatingText_Own140To149: ; 44247 (11:4247) +DexRatingText_Own140To149: TX_FAR _DexRatingText_Own140To149 db "@" -DexRatingText_Own150To151: ; 4424c (11:424c) +DexRatingText_Own150To151: TX_FAR _DexRatingText_Own150To151 db "@" diff --git a/engine/predefs.asm b/engine/predefs.asm index 9a97fe95..e752a7ef 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -1,4 +1,4 @@ -GetPredefPointer: ; f67ed (3d:67ed) +GetPredefPointer: ; Store the contents of the register ; pairs (hl, de, bc) at wPredefRegisters. ; Then put the bank and address of predef @@ -49,7 +49,7 @@ GetPredefPointer: ; f67ed (3d:67ed) ret -PredefPointers:: ; f681d (3d:681d) +PredefPointers:: ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. const_def @@ -61,7 +61,7 @@ PredefPointers:: ; f681d (3d:681d) add_predef CopyDownscaledMonTiles add_predef Func_f0a7 add_predef HealParty - add_predef MoveAnimation ; 08 play move animation (1e:4d97) + add_predef MoveAnimation add_predef DivideBCDPredef add_predef DivideBCDPredef2 add_predef AddBCDPredef @@ -116,7 +116,7 @@ PredefPointers:: ; f681d (3d:681d) add_predef InternalClockTradeAnim add_predef TrainerEngage add_predef IndexToPokedex - add_predef DisplayPicCenteredOrUpperRight ; 3B display pic? (01:600d) + add_predef DisplayPicCenteredOrUpperRight add_predef UsedCut add_predef ShowPokedexData add_predef WriteMonMoves @@ -127,21 +127,21 @@ PredefPointers:: ; f681d (3d:681d) add_predef CanLearnTM add_predef TMToMove add_predef _RunPaletteCommand - add_predef StarterDex ; 46 (17:40d4) + add_predef StarterDex add_predef _AddPartyMon add_predef UpdateHPBar2 add_predef DrawEnemyHUDAndHPBar add_predef LoadTownMap_Nest add_predef PrintMonType - add_predef EmotionBubble ; 4C player exclamation (10:516f) - add_predef EmptyFunc3 ; return immediately (01:5b63) + add_predef EmotionBubble + add_predef EmptyFunc3 ; return immediately add_predef AskName add_predef PewterGuys add_predef SaveSAVtoSRAM2 add_predef LoadSAV2 add_predef LoadSAV add_predef SaveSAVtoSRAM1 - add_predef DoInGameTradeDialogue ; 54 initiate trade (1c:5b86) + add_predef DoInGameTradeDialogue add_predef HallOfFamePC add_predef DisplayDexRating @@ -149,14 +149,13 @@ PredefPointers:: ; f681d (3d:681d) predef_const EnterMapAnim dbw $1E, _LeaveMapAnim ; wrong bank dbw $1E, EnterMapAnim ; wrong bank - add_predef GetTileTwoStepsInFrontOfPlayer add_predef CheckForCollisionWhenPushingBoulder add_predef PrintStrengthTxt add_predef PickUpItem add_predef PrintMoveType add_predef LoadMovePPs - add_predef DrawHP ; 5F (04:5468) + add_predef DrawHP add_predef DrawHP2 add_predef DisplayElevatorFloorMenu add_predef OaksAideScript diff --git a/engine/predefs17.asm b/engine/predefs17.asm index a674b45a..21289c6a 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -1,6 +1,6 @@ ; this function temporarily makes the starters (and Ivysaur) seen ; so that the full Pokedex information gets displayed in Oak's lab -StarterDex: ; 5c0dc (17:40dc) +StarterDex: ld a, %01001011 ; set starter flags ld [wPokedexOwned], a predef ShowPokedexData diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm index 49818543..e9235f13 100755 --- a/engine/predefs17_2.asm +++ b/engine/predefs17_2.asm @@ -1,5 +1,5 @@ ; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e -SetPartyMonTypes: ; 5db93 (17:5b93) +SetPartyMonTypes: call GetPredefRegisters ld bc, wPartyMon1Type - wPartyMon1 ; $5 add hl, bc diff --git a/engine/predefs7.asm b/engine/predefs7.asm index 1bf4c018..bfa0ab57 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -1,4 +1,4 @@ -DisplayElevatorFloorMenu: ; 1c264 (7:4264) +DisplayElevatorFloorMenu: ld hl, wd730 ld a, [hl] push af @@ -49,6 +49,6 @@ DisplayElevatorFloorMenu: ; 1c264 (7:4264) ld [hli], a ; destination map ID ret -WhichFloorText: ; 1c2bd (7:42bd) +WhichFloorText: TX_FAR _WhichFloorText db "@" diff --git a/engine/predefsA.asm b/engine/predefsA.asm index 1cfb60f6..b8384150 100644 --- a/engine/predefsA.asm +++ b/engine/predefsA.asm @@ -1,5 +1,5 @@ ; inverts the BGP for 4 (6 on CGB due to lag) frames -InvertBGPal_4Frames: ; 2bd4c (a:7d4c) +InvertBGPal_4Frames: call GetPredefRegisters ; leftover of red/blue, has no use here ld a, [rBGP] xor $ff @@ -13,7 +13,7 @@ InvertBGPal_4Frames: ; 2bd4c (a:7d4c) call UpdateGBCPal_BGP ret -PredefShakeScreenVertically: ; 2bd67 (a:7d67) +PredefShakeScreenVertically: ; Moves the window down and then back in a sequence of progressively smaller ; numbers of pixels, starting at b. call GetPredefRegisters @@ -39,7 +39,7 @@ PredefShakeScreenVertically: ; 2bd67 (a:7d67) ld c, 3 jp DelayFrames -PredefShakeScreenHorizontally: ; 2bd8d (a:7d8d) +PredefShakeScreenHorizontally: ; Moves the window right and then back in a sequence of progressively smaller ; numbers of pixels, starting at b. call GetPredefRegisters diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm index f4220748..bd2180a1 100644 --- a/engine/print_waiting_text.asm +++ b/engine/print_waiting_text.asm @@ -1,4 +1,4 @@ -PrintWaitingText: ; 4b89 (1:4b89) +PrintWaitingText: coord hl, 3, 10 lb bc, 1, 11 ld a, [wIsInBattle] @@ -15,5 +15,5 @@ PrintWaitingText: ; 4b89 (1:4b89) ld c, 50 jp DelayFrames -WaitingText: ; 4bab (1:4bab) - db "Waiting...!@"
\ No newline at end of file +WaitingText: + db "Waiting...!@" diff --git a/engine/printer.asm b/engine/printer.asm index d4cc8192..46eb2c59 100644 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -11,7 +11,7 @@ INCLUDE "engine/printer/serial.asm" -PrintPokedexEntry: ; e8b74 (3a:4b74) +PrintPokedexEntry: ld a, [wUpdateSpritesEnabled] push af xor a @@ -238,7 +238,7 @@ Func_e8d11: scf ret -PrintPCBox:: ; e8d35 (3a:4e79) +PrintPCBox:: ld a, [wBoxDataStart] and a jp z, Func_e8df4 @@ -359,7 +359,7 @@ PrintFanClubPortrait: ; e8e24 xor a ld [hCanceledPrinting], a call Printer_PlayPrinterMusic - call Func_ea3ea + call Printer_GetMonStats ld a, [rIE] push af xor a @@ -397,7 +397,7 @@ PrintFanClubPortrait: ; e8e24 call Printer_PlayMapMusic ret -Func_e8e79: ; e8e79 (3a:4e79) +PrinterDebug: push af push bc push de @@ -415,13 +415,13 @@ Func_e8e79: ; e8e79 (3a:4e79) ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Printer_CopyTileMapToPrinterTileBuffer - call Func_ea573 + call PrinterDebug_LoadGFX .loop ld a, [wPrinterSendState] bit 7, a jr nz, .quit - call Func_ea5d1 - call Func_ea5b7 + call PrinterDebug_DoFunction + call PrinterDebug_ConvertStatusFlagsToTiles call DelayFrame jr .loop @@ -443,7 +443,7 @@ Func_e8e79: ; e8e79 (3a:4e79) pop af ret -Printer_CheckPressingB: ; e8eca (3a:4eca) +Printer_CheckPressingB: ld a, [hJoyHeld] and B_BUTTON jr nz, .quit @@ -476,21 +476,21 @@ Printer_CheckPressingB: ; e8eca (3a:4eca) scf ret -Printer_CopyTileMapToPrinterTileBuffer: ; e8efc (3a:4efc) +Printer_CopyTileMapToPrinterTileBuffer: coord hl, 0, 0 coord de, 0, 0, wPrinterTileBuffer ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call CopyData ret -Printer_CopyTileMapFromPrinterTileBuffer: ; e8f09 (3a:4f09) +Printer_CopyTileMapFromPrinterTileBuffer: coord hl, 0, 0, wPrinterTileBuffer coord de, 0, 0 ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call CopyData ret -Printer_ResetJoypadHRAM: ; e8f16 (3a:4f16) +Printer_ResetJoypadHRAM: xor a ld [hJoyLast], a ld [hJoyReleased], a @@ -500,7 +500,7 @@ Printer_ResetJoypadHRAM: ; e8f16 (3a:4f16) ld [hJoy6], a ret -Printer_PlayPrinterMusic: ; e8f24 (3a:4f24) +Printer_PlayPrinterMusic: call Printer_FadeOutMusicAndWait ld a, [wAudioROMBank] ld [wAudioSavedROMBank], a @@ -511,12 +511,12 @@ Printer_PlayPrinterMusic: ; e8f24 (3a:4f24) call PlaySound ret -Printer_PlayMapMusic: ; e8f3b (3a:4f3b) +Printer_PlayMapMusic: call Printer_FadeOutMusicAndWait call PlayDefaultMusic ret -Printer_FadeOutMusicAndWait: ; e8f42 (3a:4f42) +Printer_FadeOutMusicAndWait: ld a, $4 ld [wAudioFadeOutControl], a call StopAllMusic @@ -526,7 +526,7 @@ Printer_FadeOutMusicAndWait: ; e8f42 (3a:4f42) jr nz, .wait_music_stop ret -GBPrinter_CheckForErrors: ; e8f51 (3a:4f51) +GBPrinter_CheckForErrors: ld a, [wPrinterHandshake] cp $81 jr z, .check_other_errors diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index 54d31a15..b5d71596 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -1,4 +1,4 @@ -StartTransmission_Send9Rows: ; e8783 (3a:4783) +StartTransmission_Send9Rows: ld a, 9 Printer_StartTransmission: push af @@ -19,7 +19,7 @@ Printer_StartTransmission: ret ; e87a8 -PrinterTransmissionJumptable: ; e87a8 (3a:47a8) +PrinterTransmissionJumptable: ld a, [wPrinterSendState] ld e, a ld d, 0 @@ -105,9 +105,9 @@ Printer_StartTransmittingTilemap: ld hl, PrinterDataPacket3 call CopyPrinterDataHeader call Printer_Convert2RowsTo2bpp - ld a, (wPrinterSendDataSourceEnd - wPrinterSendDataSource) % $100 + ld a, (wPrinterSendDataSource1End - wPrinterSendDataSource1) % $100 ld [wPrinterDataSize], a - ld a, (wPrinterSendDataSourceEnd - wPrinterSendDataSource) / $100 + ld a, (wPrinterSendDataSource1End - wPrinterSendDataSource1) / $100 ld [wPrinterDataSize + 1], a call ComputePrinterChecksum call Printer_Next @@ -305,8 +305,8 @@ ResetPrinterData: xor a ld [wPrinterDataSize], a ld [wPrinterDataSize + 1], a - ld hl, wPrinterSendDataSource - ld bc, wPrinterSendDataSourceEnd - wPrinterSendDataSource + ld hl, wPrinterSendDataSource1 + ld bc, wPrinterSendDataSource1End - wPrinterSendDataSource1 call Printer_FillMemory ret @@ -319,7 +319,7 @@ ComputePrinterChecksum: ld c, a ld a, [wPrinterDataSize + 1] ld b, a - ld de, wPrinterSendDataSource + ld de, wPrinterSendDataSource1 call .AddToChecksum ld a, l ld [wPrinterChecksum], a @@ -344,13 +344,13 @@ ComputePrinterChecksum: Printer_StageHeaderForSend: ld a, $1 - ld [wPrinterSendDataSource], a + ld [wPrinterSendDataSource1], a ld a, [wcae2] - ld [wPrinterSendDataSource + 1], a + ld [wPrinterSendDataSource1 + 1], a ld a, %11100100 - ld [wPrinterSendDataSource + 2], a + ld [wPrinterSendDataSource1 + 2], a ld a, [wPrinterSettingsTempCopy] - ld [wPrinterSendDataSource + 3], a + ld [wPrinterSendDataSource1 + 3], a ret Printer_Convert2RowsTo2bpp: @@ -370,7 +370,7 @@ Printer_Convert2RowsTo2bpp: .got_row ld e, l ld d, h - ld hl, wPrinterSendDataSource + ld hl, wPrinterSendDataSource1 ld c, 2 * SCREEN_WIDTH .loop ld a, [de] @@ -406,7 +406,7 @@ Printer_Convert2RowsTo2bpp: jr nz, .loop ret -Printer_FillMemory: ; e8a2e (3a:4a2e) +Printer_FillMemory: push de ld e, a .loop @@ -439,7 +439,7 @@ PrinterDataPacket6: ; unused db 15, 0, $00, 0 dw 15 -PrinterSerial_: ; e8a5e (3a:4a5e) +PrinterSerial_: ld a, [wPrinterOpcode] ld e, a ld d, 0 @@ -542,7 +542,7 @@ PrinterSerial_: ; e8a5e (3a:4a5e) ld e, a ld a, [wPrinterSendByteOffset + 1] ld d, a - ld hl, wPrinterSendDataSource + ld hl, wPrinterSendDataSource1 add hl, de inc de ld a, e diff --git a/engine/random.asm b/engine/random.asm index ddf042df..2fc83f6f 100755 --- a/engine/random.asm +++ b/engine/random.asm @@ -1,4 +1,4 @@ -Random_:: ; f67dc (3d:67dc) +Random_:: ; Generate a random 16-bit value. ld a, [rDIV] ld b, a diff --git a/engine/remove_pokemon.asm b/engine/remove_pokemon.asm index a04f060c..f29a428d 100644 --- a/engine/remove_pokemon.asm +++ b/engine/remove_pokemon.asm @@ -1,4 +1,4 @@ -_RemovePokemon: ; 7a0f (1:7a0f) +_RemovePokemon: ld hl, wPartyCount ld a, [wRemoveMonFromBox] and a @@ -92,4 +92,4 @@ _RemovePokemon: ; 7a0f (1:7a0f) jr z, .copyUntilPartyMonNicksEnd ld bc, wBoxMonNicksEnd .copyUntilPartyMonNicksEnd - jp CopyDataUntil
\ No newline at end of file + jp CopyDataUntil diff --git a/engine/save.asm b/engine/save.asm index b684c1be..bb2193a2 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,4 +1,4 @@ -LoadSAV: ; 73959 (1c:7959) +LoadSAV: ;(if carry -> write ;"the file data is destroyed") call ClearScreen @@ -27,11 +27,11 @@ LoadSAV: ; 73959 (1c:7959) ld [wSaveFileStatus], a ret -FileDataDestroyedText: ; 7398f (1c:798f) +FileDataDestroyedText: TX_FAR _FileDataDestroyedText db "@" -LoadSAV0: ; 73994 (1c:7994) +LoadSAV0: call EnableSRAMAndLatchClockData ld a, $1 ld [MBC1SRamBank], a @@ -76,7 +76,7 @@ LoadSAV0: ; 73994 (1c:7994) and a jp SAVGoodChecksum -LoadSAV1: ; 739fc (1c:79fc) +LoadSAV1: call EnableSRAMAndLatchClockData ld a, $1 ld [MBC1SRamBank], a @@ -94,7 +94,7 @@ LoadSAV1: ; 739fc (1c:79fc) and a jp SAVGoodChecksum -LoadSAV2: ; 73a24 (1c:7a24) +LoadSAV2: call EnableSRAMAndLatchClockData ld a, $1 ld [MBC1SRamBank], a @@ -116,20 +116,20 @@ LoadSAV2: ; 73a24 (1c:7a24) and a jp SAVGoodChecksum -SAVBadCheckSum: ; 73a59 (1c:7a59) +SAVBadCheckSum: scf -SAVGoodChecksum: ; 736f8 (1c:76f8) +SAVGoodChecksum: call DisableSRAMAndPrepareClockData ret -LoadSAVIgnoreBadCheckSum: ; 73a5e (1c:7a5e) +LoadSAVIgnoreBadCheckSum: ; unused function that loads save data and ignores bad checksums call LoadSAV0 call LoadSAV1 jp LoadSAV2 -SaveSAV: ; 73a67 (1c:7a67) +SaveSAV: callba PrintSaveScreenText ld c,10 call DelayFrames @@ -165,7 +165,7 @@ SaveSAV: ; 73a67 (1c:7a67) call DelayFrames ret -SaveSAVConfirm: ; 73abc (1c:7abc) +SaveSAVConfirm: call PrintText coord hl, 0, 7 lb bc, 8, 1 @@ -175,23 +175,23 @@ SaveSAVConfirm: ; 73abc (1c:7abc) ld a,[wCurrentMenuItem] ret -WouldYouLikeToSaveText: ; 73ad1 (1c:7ad1) +WouldYouLikeToSaveText: TX_FAR _WouldYouLikeToSaveText db "@" -SavingText: ; 73ad6 (1c:7ad6) +SavingText: TX_FAR _SavingText db "@" -GameSavedText: ; 73adb (1c:7adb) +GameSavedText: TX_FAR _GameSavedText db "@" -OlderFileWillBeErasedText: ; 73ae0 (1c:7ae0) +OlderFileWillBeErasedText: TX_FAR _OlderFileWillBeErasedText db "@" -SaveSAVtoSRAM0: ; 73ae5 (1c:7ae5) +SaveSAVtoSRAM0: call EnableSRAMAndLatchClockData ld a, $1 ld [MBC1SRamBank], a @@ -220,7 +220,7 @@ SaveSAVtoSRAM0: ; 73ae5 (1c:7ae5) call DisableSRAMAndPrepareClockData ret -SaveSAVtoSRAM1: ; 73b32 (1c:7b32) +SaveSAVtoSRAM1: ; stored pokémon call EnableSRAMAndLatchClockData ld a, $1 @@ -236,7 +236,7 @@ SaveSAVtoSRAM1: ; 73b32 (1c:7b32) call DisableSRAMAndPrepareClockData ret -SaveSAVtoSRAM2: ; 73b56 (1c:7b56) +SaveSAVtoSRAM2: call EnableSRAMAndLatchClockData ld a, $1 ld [MBC1SRamBank], a @@ -261,15 +261,15 @@ SaveSAVtoSRAM2: ; 73b56 (1c:7b56) ld [sMainDataCheckSum], a call DisableSRAMAndPrepareClockData ret -;;; -SaveSAVtoSRAM: ; 73b91 (1c:7b91) + +SaveSAVtoSRAM: ld a, $2 ld [wSaveFileStatus], a call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 jp SaveSAVtoSRAM2 -SAVCheckSum: ; 73b9f (1c:7b9f) +SAVCheckSum: ;Check Sum (result[1 byte] is complemented) ld d, 0 .loop @@ -284,7 +284,7 @@ SAVCheckSum: ; 73b9f (1c:7b9f) cpl ret -CalcIndividualBoxCheckSums: ; 73bac (1c:7bac) +CalcIndividualBoxCheckSums: ld hl, sBox1 ; sBox7 ld de, sBank2IndividualBoxChecksums ; sBank3IndividualBoxChecksums ld b, NUM_BOXES / 2 @@ -301,7 +301,7 @@ CalcIndividualBoxCheckSums: ; 73bac (1c:7bac) jr nz, .loop ret -GetBoxSRAMLocation: ; 73bc4 (1c:7bc4) +GetBoxSRAMLocation: ; in: a = box num ; out: b = box SRAM bank, hl = pointer to start of box ld hl, BoxSRAMPointerTable @@ -322,7 +322,7 @@ GetBoxSRAMLocation: ; 73bc4 (1c:7bc4) ld l, a ret -BoxSRAMPointerTable: ; 73bde (1c:7bde) +BoxSRAMPointerTable: dw sBox1 ; sBox7 dw sBox2 ; sBox8 dw sBox3 ; sBox9 @@ -330,7 +330,7 @@ BoxSRAMPointerTable: ; 73bde (1c:7bde) dw sBox5 ; sBox11 dw sBox6 ; sBox12 -ChangeBox:: ; 73bed (1c:7bed) +ChangeBox:: ld hl, WhenYouChangeBoxText call PrintText call YesNoChoice @@ -376,11 +376,11 @@ ChangeBox:: ; 73bed (1c:7bed) call SetMapTextPointer ret -WhenYouChangeBoxText: ; 73c52 (1c:7c52) +WhenYouChangeBoxText: TX_FAR _WhenYouChangeBoxText db "@" -CopyBoxToOrFromSRAM: ; 73c57 (1c:7c57) +CopyBoxToOrFromSRAM: ; copy an entire box from hl to de with b as the SRAM bank push hl call EnableSRAMAndLatchClockData @@ -404,7 +404,7 @@ CopyBoxToOrFromSRAM: ; 73c57 (1c:7c57) call DisableSRAMAndPrepareClockData ret -DisplayChangeBoxMenu: ; 73c7d (1c:7c7d) +DisplayChangeBoxMenu: xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, A_BUTTON | B_BUTTON @@ -473,11 +473,11 @@ DisplayChangeBoxMenu: ; 73c7d (1c:7c7d) ld [H_AUTOBGTRANSFERENABLED], a ret -ChooseABoxText: ; 73d10 (1c:7d10) +ChooseABoxText: TX_FAR _ChooseABoxText db "@" -BoxNames: ; 73d15 (1c:7d15) +BoxNames: db "BOX 1" next "BOX 2" next "BOX 3" @@ -491,10 +491,10 @@ BoxNames: ; 73d15 (1c:7d15) next "BOX11" next "BOX12@" -BoxNoText: ; 73d5d (1c:7d5d) +BoxNoText: db "BOX No.@" -EmptyAllSRAMBoxes: ; 73d65 (1c:7d65) +EmptyAllSRAMBoxes: ; marks all boxes in SRAM as empty (initialisation for the first time the ; player changes the box) call EnableSRAMAndLatchClockData @@ -507,7 +507,7 @@ EmptyAllSRAMBoxes: ; 73d65 (1c:7d65) call DisableSRAMAndPrepareClockData ret -EmptySRAMBoxesInBank: ; 73d7c (1c:7d7c) +EmptySRAMBoxesInBank: ; marks every box in the current SRAM bank as empty ld hl, sBox1 ; sBox7 call EmptySRAMBox @@ -528,14 +528,14 @@ EmptySRAMBoxesInBank: ; 73d7c (1c:7d7c) call CalcIndividualBoxCheckSums ret -EmptySRAMBox: ; 73db0 (1c:7db0) +EmptySRAMBox: xor a ld [hli], a dec a ld [hl], a ret -GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) +GetMonCountsForAllBoxes: ld hl, wBoxMonCounts push hl call EnableSRAMAndLatchClockData @@ -559,7 +559,7 @@ GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) ret -GetMonCountsForBoxesInBank: ; 73dde (1c:7dde) +GetMonCountsForBoxesInBank: ld a, [sBox1] ; sBox7 ld [hli], a ld a, [sBox2] ; sBox8 @@ -574,7 +574,7 @@ GetMonCountsForBoxesInBank: ; 73dde (1c:7dde) ld [hli], a ret -SAVCheckRandomID: ; 73df7 (1c:7df7) +SAVCheckRandomID: ;checks if Sav file is the same by checking player's name 1st letter ($a598) ; and the two random numbers generated at game beginning ;(which are stored at wPlayerID)s @@ -606,7 +606,7 @@ SAVCheckRandomID: ; 73df7 (1c:7df7) ld [MBC1SRamEnable],a ret -SaveHallOfFameTeams: ; 73e2e (1c:7e2e) +SaveHallOfFameTeams: ld a, [wNumHoFTeams] dec a cp HOF_TEAM_CAPACITY @@ -632,7 +632,7 @@ SaveHallOfFameTeams: ; 73e2e (1c:7e2e) ld bc, HOF_TEAM jr HallOfFame_Copy -LoadHallOfFameTeams: ; 73e60 (1c:7e60) +LoadHallOfFameTeams: ld hl, sHallOfFame ld bc, HOF_TEAM ld a, [wHoFTeamIndex] @@ -641,7 +641,7 @@ LoadHallOfFameTeams: ; 73e60 (1c:7e60) ld bc, HOF_TEAM ; fallthrough -HallOfFame_Copy: ; 73e72 (1c:7e72) +HallOfFame_Copy: call EnableSRAMAndLatchClockData xor a ld [MBC1SRamBank], a @@ -649,7 +649,7 @@ HallOfFame_Copy: ; 73e72 (1c:7e72) call DisableSRAMAndPrepareClockData ret -ClearSAV: ; 73e80 (1c:7e80) +ClearSAV: call EnableSRAMAndLatchClockData ld a, $4 .loop @@ -661,22 +661,22 @@ ClearSAV: ; 73e80 (1c:7e80) call DisableSRAMAndPrepareClockData ret -PadSRAM_FF: ; 73e91 (1c:7e91) +PadSRAM_FF: ld [MBC1SRamBank], a ld hl, $a000 ld bc, $2000 ld a, $ff jp FillMemory -EnableSRAMAndLatchClockData: ; 73e9f (1c:7e9f) +EnableSRAMAndLatchClockData: ld a, $1 ld [MBC1SRamBankingMode], a ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ret -DisableSRAMAndPrepareClockData: ; 73eaa (1c:7eaa) +DisableSRAMAndPrepareClockData: ld a, SRAM_DISABLE ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - ret
\ No newline at end of file + ret diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 35f3a133..769a3f37 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1,4 +1,4 @@ -PromptUserToPlaySlots: ; 37530 (d:7530) +PromptUserToPlaySlots: call SaveScreenTilesToBuffer2 ld a, BANK(DisplayTextIDInit) ld [wAutoTextBoxDrawingControl], a @@ -54,11 +54,11 @@ PromptUserToPlaySlots: ; 37530 (d:7530) push af jp CloseTextDisplay -PlaySlotMachineText: ; 375b8 (d:75b8) +PlaySlotMachineText: TX_FAR _PlaySlotMachineText db "@" -MainSlotMachineLoop: ; 375bd (d:75bd) +MainSlotMachineLoop: call SlotMachine_PrintCreditCoins xor a ld hl, wPayoutCoins @@ -147,32 +147,32 @@ MainSlotMachineLoop: ; 375bd (d:75bd) call SlotMachine_PutOutLitBalls jp MainSlotMachineLoop -CoinMultiplierSlotMachineText: ; 37685 (d:7685) +CoinMultiplierSlotMachineText: db "×3" next "×2" next "×1@" -OutOfCoinsSlotMachineText: ; 3768e (d:768e) +OutOfCoinsSlotMachineText: TX_FAR _OutOfCoinsSlotMachineText db "@" -BetHowManySlotMachineText: ; 37693 (d:7693) +BetHowManySlotMachineText: TX_FAR _BetHowManySlotMachineText db "@" -StartSlotMachineText: ; 37698 (d:7698) +StartSlotMachineText: TX_FAR _StartSlotMachineText db "@" -NotEnoughCoinsSlotMachineText: ; 3769d (d:769d) +NotEnoughCoinsSlotMachineText: TX_FAR _NotEnoughCoinsSlotMachineText db "@" -OneMoreGoSlotMachineText: ; 376a2 (d:76a2) +OneMoreGoSlotMachineText: TX_FAR _OneMoreGoSlotMachineText db "@" -SlotMachine_SetFlags: ; 376a7 (d:76a7) +SlotMachine_SetFlags: ld hl, wSlotMachineFlags bit 7, [hl] ret nz @@ -202,7 +202,7 @@ SlotMachine_SetFlags: ; 376a7 (d:76a7) set 7, [hl] ret -SlotMachine_SpinWheels: ; 376d4 (d:76d4) +SlotMachine_SpinWheels: ld c, 20 .loop1 push bc @@ -234,7 +234,7 @@ SlotMachine_SpinWheels: ; 376d4 (d:76d4) ; visible. The 3 functions below ensure this by checking if the wheel offset ; is even before stopping the wheel. -SlotMachine_StopOrAnimWheel1: ; 37706 (d:7706) +SlotMachine_StopOrAnimWheel1: ld a, [wStoppingWhichSlotMachineWheel] cp 1 jr c, .animWheel @@ -252,7 +252,7 @@ SlotMachine_StopOrAnimWheel1: ; 37706 (d:7706) .animWheel jp SlotMachine_AnimWheel1 -SlotMachine_StopOrAnimWheel2: ; 37722 (d:7722) +SlotMachine_StopOrAnimWheel2: ld a, [wStoppingWhichSlotMachineWheel] cp 2 jr c, .animWheel @@ -270,7 +270,7 @@ SlotMachine_StopOrAnimWheel2: ; 37722 (d:7722) .animWheel jp SlotMachine_AnimWheel2 -SlotMachine_StopOrAnimWheel3: ; 3773e (d:773e) +SlotMachine_StopOrAnimWheel3: ld a, [wStoppingWhichSlotMachineWheel] cp 3 jr c, .animWheel @@ -286,7 +286,7 @@ SlotMachine_StopOrAnimWheel3: ; 3773e (d:773e) and a ret -SlotMachine_StopWheel1Early: ; 37753 (d:7753) +SlotMachine_StopWheel1Early: call SlotMachine_GetWheel1Tiles ld hl, wSlotMachineWheel1BottomTile ld a, [wSlotMachineFlags] @@ -315,7 +315,7 @@ SlotMachine_StopWheel1Early: ; 37753 (d:7753) ld [hl], 0 ret -SlotMachine_StopWheel2Early: ; 37779 (d:7779) +SlotMachine_StopWheel2Early: call SlotMachine_GetWheel2Tiles ld a, [wSlotMachineFlags] and $80 @@ -338,7 +338,7 @@ SlotMachine_StopWheel2Early: ; 37779 (d:7779) ld [wSlotMachineWheel2SlipCounter], a ret -SlotMachine_FindWheel1Wheel2Matches: ; 37795 (d:7795) +SlotMachine_FindWheel1Wheel2Matches: ; return whether wheel 1 and wheel 2's current positions allow a match (given ; that wheel 3 stops in a good position) in Z ld hl, wSlotMachineWheel1BottomTile @@ -364,7 +364,7 @@ SlotMachine_FindWheel1Wheel2Matches: ; 37795 (d:7795) dec de ret -SlotMachine_CheckForMatches: ; 377af (d:77af) +SlotMachine_CheckForMatches: call SlotMachine_GetWheel3Tiles ld a, [wSlotMachineBet] cp 2 @@ -478,7 +478,7 @@ SlotMachine_CheckForMatches: ; 377af (d:77af) call UpdateGBCPal_OBP0 jp .done -SymbolLinedUpSlotMachineText: ; 37892 (d:7892) +SymbolLinedUpSlotMachineText: TX_ASM push bc call SlotMachine_PrintWinningSymbol @@ -490,11 +490,11 @@ SymbolLinedUpSlotMachineText: ; 37892 (d:7892) inc bc ret -LinedUpText: ; 378a0 (d:78a0) +LinedUpText: TX_FAR _LinedUpText db "@" -SlotRewardPointers: ; 378a5 (d:78a5) +SlotRewardPointers: dw SlotReward300Func dw SlotReward300Text dw SlotReward100Func @@ -508,24 +508,24 @@ SlotRewardPointers: ; 378a5 (d:78a5) dw SlotReward15Func dw SlotReward15Text -SlotReward300Text: ; 378bd (d:78bd) +SlotReward300Text: db "300@" -SlotReward100Text: ; 378c1 (d:78c1) +SlotReward100Text: db "100@" -SlotReward8Text: ; 378c5 (d:78c5) +SlotReward8Text: db "8@" -SlotReward15Text: ; 378c7 (d:78c7) +SlotReward15Text: db "15@" -NotThisTimeText: ; 378ca (d:78ca) +NotThisTimeText: TX_FAR _NotThisTimeText db "@" ; compares the slot machine tiles at bc, de, and hl -SlotMachine_CheckForMatch: ; 378cf (d:78cf) +SlotMachine_CheckForMatch: ld a, [de] cp [hl] ret nz @@ -533,24 +533,24 @@ SlotMachine_CheckForMatch: ; 378cf (d:78cf) cp [hl] ret -SlotMachine_GetWheel3Tiles: ; 378d5 (d:78d5) +SlotMachine_GetWheel3Tiles: ld de, wSlotMachineWheel3BottomTile ld hl, SlotMachineWheel3 ld a, [wSlotMachineWheel3Offset] call SlotMachine_GetWheelTiles -SlotMachine_GetWheel2Tiles: ; 378e1 (d:78e1) +SlotMachine_GetWheel2Tiles: ld de, wSlotMachineWheel2BottomTile ld hl, SlotMachineWheel2 ld a, [wSlotMachineWheel2Offset] call SlotMachine_GetWheelTiles -SlotMachine_GetWheel1Tiles: ; 378ed (d:78ed) +SlotMachine_GetWheel1Tiles: ld de, wSlotMachineWheel1BottomTile ld hl, SlotMachineWheel1 ld a, [wSlotMachineWheel1Offset] -SlotMachine_GetWheelTiles: ; 378f6 (d:78f6) +SlotMachine_GetWheelTiles: ld c, a ld b, 0 add hl, bc @@ -564,7 +564,7 @@ SlotMachine_GetWheelTiles: ; 378f6 (d:78f6) jr nz, .loop ret -SlotReward8Func: ; 37904 (d:7904) +SlotReward8Func: ld hl, wSlotMachineAllowMatchesCounter ld a, [hl] and a @@ -575,7 +575,7 @@ SlotReward8Func: ; 37904 (d:7904) ld de, 8 ret -SlotReward15Func: ; 37912 (d:7912) +SlotReward15Func: ld hl, wSlotMachineAllowMatchesCounter ld a, [hl] and a @@ -586,7 +586,7 @@ SlotReward15Func: ; 37912 (d:7912) ld de, 15 ret -SlotReward100Func: ; 37920 (d:7920) +SlotReward100Func: ld a, SFX_GET_KEY_ITEM call PlaySound xor a @@ -595,7 +595,7 @@ SlotReward100Func: ; 37920 (d:7920) ld de, 100 ret -SlotReward300Func: ; 3792f (d:792f) +SlotReward300Func: ld hl, YeahText call PrintText ld a, SFX_GET_ITEM_2 @@ -611,11 +611,11 @@ SlotReward300Func: ; 3792f (d:792f) ld de, 300 ret -YeahText: ; 3794f (d:794f) +YeahText: TX_FAR _YeahText db $0a, "@" -SlotMachine_PrintWinningSymbol: ; 37955 (d:7955) +SlotMachine_PrintWinningSymbol: ; prints winning symbol and down arrow in text box coord hl, 2, 14 ld a, [wSlotMachineWinningSymbol] @@ -633,7 +633,7 @@ SlotMachine_PrintWinningSymbol: ; 37955 (d:7955) ld [hl], $ee ; down arrow ret -SlotMachine_SubtractBetFromPlayerCoins: ; 3796e (d:796e) +SlotMachine_SubtractBetFromPlayerCoins: ld hl, wTempCoins2 + 1 ld a, [wSlotMachineBet] ld [hld], a @@ -643,19 +643,19 @@ SlotMachine_SubtractBetFromPlayerCoins: ; 3796e (d:796e) ld c, $2 predef SubBCDPredef -SlotMachine_PrintCreditCoins: ; 37981 (d:7981) +SlotMachine_PrintCreditCoins: coord hl, 5, 1 ld de, wPlayerCoins ld c, $2 jp PrintBCDNumber -SlotMachine_PrintPayoutCoins: ; 3798c (d:798c) +SlotMachine_PrintPayoutCoins: coord hl, 11, 1 ld de, wPayoutCoins lb bc, LEADING_ZEROES | 2, 4 ; 2 bytes, 4 digits jp PrintNumber -SlotMachine_PayCoinsToPlayer: ; 37998 (d:7998) +SlotMachine_PayCoinsToPlayer: ld a, $1 ld [wMuteAudioAndPauseMusic], a call WaitForSoundToFinish @@ -713,12 +713,12 @@ SlotMachine_PayCoinsToPlayer: ; 37998 (d:7998) call DelayFrames jr .loop -SlotMachine_PutOutLitBalls: ; 379fe (d:79fe) +SlotMachine_PutOutLitBalls: ld a, $23 ld [wNewSlotMachineBallTile], a jr SlotMachine_UpdateThreeCoinBallTiles -SlotMachine_LightBalls: ; 37a05 (d:7a05) +SlotMachine_LightBalls: ld a, $14 ld [wNewSlotMachineBallTile], a ld a, [wSlotMachineBet] @@ -727,22 +727,22 @@ SlotMachine_LightBalls: ; 37a05 (d:7a05) dec a jr z, SlotMachine_UpdateTwoCoinBallTiles -SlotMachine_UpdateThreeCoinBallTiles: ; 37a13 (d:7a13) +SlotMachine_UpdateThreeCoinBallTiles: coord hl, 3, 2 call SlotMachine_UpdateBallTiles coord hl, 3, 10 call SlotMachine_UpdateBallTiles -SlotMachine_UpdateTwoCoinBallTiles: ; 37a1f (d:7a1f) +SlotMachine_UpdateTwoCoinBallTiles: coord hl, 3, 4 call SlotMachine_UpdateBallTiles coord hl, 3, 8 call SlotMachine_UpdateBallTiles -SlotMachine_UpdateOneCoinBallTiles: ; 37a2b (d:7a2b) +SlotMachine_UpdateOneCoinBallTiles: coord hl, 3, 6 -SlotMachine_UpdateBallTiles: ; 37a2e (d:7a2e) +SlotMachine_UpdateBallTiles: ld a, [wNewSlotMachineBallTile] ld [hl], a ld bc, 13 @@ -757,7 +757,7 @@ SlotMachine_UpdateBallTiles: ; 37a2e (d:7a2e) ld [hl], a ret -SlotMachine_AnimWheel1: ; 37a43 (d:7a43) +SlotMachine_AnimWheel1: ld bc, SlotMachineWheel1 ld de, wSlotMachineWheel1Offset ld hl, wOAMBuffer @@ -765,7 +765,7 @@ SlotMachine_AnimWheel1: ; 37a43 (d:7a43) ld [wBaseCoordX], a jr SlotMachine_AnimWheel -SlotMachine_AnimWheel2: ; 37a53 (d:7a53) +SlotMachine_AnimWheel2: ld bc, SlotMachineWheel2 ld de, wSlotMachineWheel2Offset ld hl, wOAMBuffer + $30 @@ -773,14 +773,14 @@ SlotMachine_AnimWheel2: ; 37a53 (d:7a53) ld [wBaseCoordX], a jr SlotMachine_AnimWheel -SlotMachine_AnimWheel3: ; 37a63 (d:7a63) +SlotMachine_AnimWheel3: ld bc, SlotMachineWheel3 ld de, wSlotMachineWheel3Offset ld hl, wOAMBuffer + $60 ld a, $70 ld [wBaseCoordX], a -SlotMachine_AnimWheel: ; 37a71 (d:7a71) +SlotMachine_AnimWheel: ld a, $58 ld [wBaseCoordY], a push de @@ -825,7 +825,7 @@ SlotMachine_AnimWheel: ; 37a71 (d:7a71) ld [de], a ret -SlotMachine_HandleInputWhileWheelsSpin: ; 37ab2 (d:7ab2) +SlotMachine_HandleInputWhileWheelsSpin: call DelayFrame call JoypadLowSensitivity ld a, [hJoy5] @@ -849,7 +849,7 @@ SlotMachine_HandleInputWhileWheelsSpin: ; 37ab2 (d:7ab2) ret nz jr .loop -LoadSlotMachineTiles: ; 37ad8 (d:7ad8) +LoadSlotMachineTiles: call DisableLCD ld hl, SlotMachineTiles2 ld de, vChars0 @@ -880,11 +880,11 @@ LoadSlotMachineTiles: ; 37ad8 (d:7ad8) call SlotMachine_AnimWheel2 jp SlotMachine_AnimWheel3 -SlotMachineMap: ; 37b25 (d:7b25) +SlotMachineMap: INCBIN "gfx/tilemaps/slotmachine.map" SlotMachineMapEnd: INCLUDE "data/slot_machine_wheels.asm" -SlotMachineTiles1: ; 37c81 (d:7c81) +SlotMachineTiles1: INCBIN "gfx/slotmachine1.2bpp" diff --git a/engine/status_ailments.asm b/engine/status_ailments.asm index b233defa..787533c4 100755 --- a/engine/status_ailments.asm +++ b/engine/status_ailments.asm @@ -1,4 +1,4 @@ -PrintStatusAilment: ; 58e8b (16:4e8b) +PrintStatusAilment: ld a, [de] bit PSN, a jr nz, .psn diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm index 45df93a7..a6a6ec2e 100644 --- a/engine/subtract_paid_money.asm +++ b/engine/subtract_paid_money.asm @@ -1,6 +1,6 @@ ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney_: ; 68a6 (1:68a6) +SubtractAmountPaidFromMoney_: ld de, wPlayerMoney ld hl, hMoney ; total price of items ld c, 3 ; length of money in bytes @@ -14,4 +14,4 @@ SubtractAmountPaidFromMoney_: ; 68a6 (1:68a6) ld [wTextBoxID], a call DisplayTextBoxID ; redraw money text box and a - ret
\ No newline at end of file + ret diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm index f70e8119..48aaca53 100755 --- a/engine/surfing_minigame.asm +++ b/engine/surfing_minigame.asm @@ -23,8 +23,8 @@ SurfingPikachuMinigame: push af ld a, $98 ld [H_AUTOBGTRANSFERDEST + 1], a - call Func_f8fb3 - call Func_f807a + call SurfingPikachuMinigameIntro + call SurfingPikachuLoop xor a ld [rBGP], a ld [rOBP0], a @@ -59,42 +59,42 @@ SurfingPikachuMinigame: ld [hTilesetType], a ret -Func_f807a: - call Func_f8116 +SurfingPikachuLoop: + call SurfingPikachuMinigame_LoadGFXAndLayout call DelayFrame ld b, $e call RunPaletteCommand .loop - ld a, [wc5d1] + ld a, [wSurfingMinigameRoutineNumber] bit 7, a ret nz - call Func_f923f - call Func_f80ac + call SurfingPikachu_GetJoypad_3FrameBuffer + call SurfingPikachu_CheckPressedSelect ret nz - call Func_f8282 + call RunSurfingMinigameRoutine ld a, $3c ld [wCurrentAnimatedObjectOAMBufferOffset], a call RunObjectAnimations call Func_f8848 - call Func_f80a8 - call Func_f80c4 + call .DelayFrame + call SurfingMinigame_UpdateMusicTempo jr .loop -Func_f80a8: +.DelayFrame: call DelayFrame ret -Func_f80ac: +SurfingPikachu_CheckPressedSelect: ld hl, wd492 bit 1, [hl] ret z ld a, [hJoyPressed] - and $4 + and SELECT ret Func_f80b7: ld a, [hJoyPressed] - and $8 + and START ret z ld hl, wc5e2 ld a, [hl] @@ -102,10 +102,12 @@ Func_f80b7: ld [hl], a ret -Func_f80c4: +SurfingMinigame_UpdateMusicTempo: ld a, [wc634] and a ret z + + ; check that all channels are on their last frame of note delay ld hl, wChannelNoteDelayCounters ld a, $1 cp [hl] @@ -116,6 +118,8 @@ Func_f80c4: inc hl cp [hl] ret nz + + ; de = ([wc5e3] & 0x3f) * 2 ld a, [wc5e3] ld e, a ld a, [wc5e3 + 1] @@ -125,7 +129,7 @@ Func_f80c4: rl d ld e, d ld d, $0 - ld hl, Unkn_f80f5 + ld hl, .Tempos add hl, de add hl, de ld a, [hli] @@ -134,14 +138,14 @@ Func_f80c4: ld [wMusicTempo], a ret -Unkn_f80f5: - dw $75 - dw $6d - dw $65 - dw $5d - dw $55 +.Tempos: + dw 117 + dw 109 + dw 101 + dw 93 + dw 85 -Func_f80ff: +SurfingMinigame_ResetMusicTempo: ld hl, wChannelNoteDelayCounters ld a, $1 cp [hl] @@ -152,86 +156,95 @@ Func_f80ff: inc hl cp [hl] ret nz - ld a, $75 + ld a, 117 ld [wMusicTempo + 1], a xor a ld [wMusicTempo], a ret -Func_f8116: - call Func_f9279 +SurfingPikachuMinigame_LoadGFXAndLayout: + call SurfingPikachu_ClearTileMap call ClearSprites call DisableLCD - ld hl, wSerialEnemyMonsPatchList - ld bc, $67 + ld hl, wSurfingMinigameData + ld bc, wSurfingMinigameDataEnd - wSurfingMinigameData xor a call FillMemory - ld hl, wc700 - ld bc, $200 + ld hl, wLYOverrides + ld bc, wLYOverridesBufferEnd - wLYOverrides xor a call FillMemory xor a ld [H_AUTOBGTRANSFERENABLED], a call ClearObjectAnimationBuffers - ld hl, SurfingPikachu1Graphics + ld hl, SurfingPikachu1Graphics1 ld de, $9000 ld bc, $500 - ld a, BANK(SurfingPikachu1Graphics) + ld a, BANK(SurfingPikachu1Graphics1) call FarCopyData - ld hl, SurfingPikachu1Graphics + $410 + ld hl, SurfingPikachu1Graphics2 ld de, $8000 ld bc, $1000 - ld a, BANK(SurfingPikachu1Graphics) + ld a, BANK(SurfingPikachu1Graphics2) call FarCopyData - ld a, Unkn_f93d3 % $100 + ld a, SurfingPikachuSpawnStateDataPointer % $100 ld [wAnimatedObjectSpawnStateDataPointer], a - ld a, Unkn_f93d3 / $100 + ld a, SurfingPikachuSpawnStateDataPointer / $100 ld [wAnimatedObjectSpawnStateDataPointer + 1], a - ld a, Jumptable_f93fa % $100 + + ld a, SurfingPikachuObjectJumptable % $100 ld [wAnimatedObjectJumptablePointer], a - ld a, Jumptable_f93fa / $100 + ld a, SurfingPikachuObjectJumptable / $100 ld [wAnimatedObjectJumptablePointer + 1], a - ld a, Unkn_f9507 % $100 + + ld a, SurfingPikachuOAMData % $100 ld [wAnimatedObjectOAMDataPointer], a - ld a, Unkn_f9507 / $100 + ld a, SurfingPikachuOAMData / $100 ld [wAnimatedObjectOAMDataPointer + 1], a - ld a, Unkn_f9405 % $100 + + ld a, SurfingPikachuFrames % $100 ld [wAnimatedObjectFramesDataPointer], a - ld a, Unkn_f9405 / $100 + ld a, SurfingPikachuFrames / $100 ld [wAnimatedObjectFramesDataPointer + 1], a + ld hl, vBGMap0 ld bc, $800 ld a, $0 call FillMemory + ld hl, $98c0 ld bc, $180 ld a, $b call FillMemory + ld a, $1 lb de, $74, $58 call SpawnAnimatedObject + ld a, $74 - ld [wc5ea], a - call Func_f9223 + ld [wSurfingMinigamePikachuObjectHeight], a + + call SurfingMinigame_InitScanlineOverrides + xor a ld [hSCX], a ld [hSCY], a ld a, $7e ld [hWY], a - ld a, $42 + ld a, rSCY - $ff00 ld [hLCDCPointer], a ld a, $40 ld [wc5e3], a xor a ld [wc5e3 + 1], a xor a - ld [wc5d6], a + ld [wSurfingMinigamePikachuHP], a ld a, $60 - ld [wc5d7], a - ld hl, wc61a + ld [wSurfingMinigamePikachuHP + 1], a + ld hl, wSurfingMinigameWaveHeight ld bc, $14 ld a, $74 call FillMemory @@ -239,7 +252,7 @@ Func_f8116: call Func_f8256 ld a, $e3 ld [rLCDC], a - call Func_f81e9 + call SurfingPikachuMinigame_SetBGPals ld a, $e4 ld [rOBP0], a ld a, $e0 @@ -248,16 +261,16 @@ Func_f8116: call UpdateGBCPal_OBP1 ret -Func_f81e9: +SurfingPikachuMinigame_SetBGPals: ld a, [wOnSGB] and a - jr nz, .asm_f81f7 + jr nz, .sgb ld a, $d0 ld [rBGP], a call UpdateGBCPal_BGP ret -.asm_f81f7 +.sgb ld a, $e4 ld [rBGP], a call UpdateGBCPal_BGP @@ -361,11 +374,11 @@ Unkn_f8279: db $19 db $19 -Func_f8282: - ld a, [wc5d1] +RunSurfingMinigameRoutine: + ld a, [wSurfingMinigameRoutineNumber] ld e, a ld d, $0 - ld hl, Jumptable_f8291 + ld hl, .Jumptable add hl, de add hl, de ld a, [hli] @@ -373,79 +386,77 @@ Func_f8282: ld l, a jp [hl] -Jumptable_f8291: - dw Func_f82ab - dw Func_f82bd - dw Func_f8324 - dw Func_f835c - dw Func_f838c - dw Func_f8399 - dw Func_f83aa - dw Func_f83bb - dw Func_f83cc - dw Func_f83e3 - dw Func_f8406 - dw Func_f840f - dw Func_f841d - -Func_f82ab: +.Jumptable: + dw SurfingMinigameRoutine_SpawnPikachu ; 0 + dw SurfingMinigame_RunGame ; 1 + dw Func_f8324 ; 2 + dw Func_f835c ; 3 + dw SurfingMinigame_DrawResultsScreenAndWait ; 4 + dw SurfingMinigame_WriteHPLeftAndWait ; 5 + dw SurfingMinigame_WriteRadnessAndWait ; 6 + dw SurfingMinigame_WriteTotalAndWait ; 7 + dw SurfingMinigame_AddRemainingHPToTotalAndWait ; 8 + dw SurfingMinigame_AddRadnessToTotalAndWait ; 9 + dw SurfingMinigame_WaitLast ; a + dw SurfingMinigame_ExitOnPressA ; b + dw SurfingMinigame_GameOver ; c + +SurfingMinigameRoutine_SpawnPikachu: ld a, $2 lb de, $48, $e0 call SpawnAnimatedObject - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber inc [hl] ld a, $1 ld [wc634], a ret -Func_f82bd: +SurfingMinigame_RunGame: ld a, [wc5e5] cp $18 jr nc, .asm_f82e8 - ld hl, wc5d6 + ld hl, wSurfingMinigamePikachuHP ld a, [hli] or [hl] and a - jr z, .asm_f82f6 + jr z, .dead call Random ld [wc5d5], a - call Func_f9210 + call SurfingMinigame_UpdateLYOverrides call Func_f88ae call Func_f886b call Func_f8cb0 call Func_f844c - call Func_f88e4 + call SurfingMinigame_Deduct1HP call Func_f88fd ret .asm_f82e8 - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber inc [hl] xor a ld [wc634], a - ld a, $c0 - ld [wc632], a + ld a, 192 + ld [wSurfingMinigameRoutineDelay], a ret -.asm_f82f6 +.dead ld a, $1 -Func_f82f8: ld [wc630], a ld a, $c - ld [wc5d1], a -Func_f8300: + ld [wSurfingMinigameRoutineNumber], a ld a, $80 ld [wc631], a ld a, $b lb de, $88, $58 call SpawnAnimatedObject - ld hl, $7 + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], $80 - ld hl, $b + ld hl, ANIM_OBJ_FIELD_B add hl, bc ld [hl], $80 - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], $30 xor a @@ -453,38 +464,38 @@ Func_f8300: ret Func_f8324: - call Func_f8440 - jr c, .asm_f833d + call SurfingMinigame_RunDelayTimer + jr c, .done_delay xor a ld [wc5d5], a - call Func_f9210 + call SurfingMinigame_UpdateLYOverrides call Func_f88ae call Func_f886b call Func_f8c97 - call Func_f80ff + call SurfingMinigame_ResetMusicTempo ret -.asm_f833d - ld hl, wc5d1 +.done_delay + ld hl, wSurfingMinigameRoutineNumber inc [hl] ld a, $90 ld [hSCX], a ld a, $72 - ld [wc5d3], a + ld [wSurfingMinigameWaveFunctionNumber], a ld a, $4 ld [wc5d2], a xor a ld [hLCDCPointer], a - ld [wc617], a - ld [wc618], a - ld [wc619], a + ld [wSurfingMinigameSCX], a + ld [wSurfingMinigameSCX + 1], a + ld [wSurfingMinigameSCX + 2], a ret Func_f835c: ld a, [hSCX] and a jr z, .asm_f837b - call Func_f9210 + call SurfingMinigame_UpdateLYOverrides call Func_f88ae call Func_f886b ld a, [hSCX] @@ -494,7 +505,7 @@ Func_f835c: dec a ld [hSCX], a ld a, $e0 - ld [wc62e], a + ld [wSurfingMinigameXOffset], a call Func_f8cc7 ret @@ -502,139 +513,137 @@ Func_f835c: xor a ld [wc5e3], a ld [wc5e3 + 1], a - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber inc [hl] ld a, $5 ld [wc5d2], a ret -Func_f838c: - call Func_f891e - ld a, $20 - ld [wc632], a - ld hl, wc5d1 +SurfingMinigame_DrawResultsScreenAndWait: + call SurfingMinigame_DrawResultsScreen + ld a, 32 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f8399: - call Func_f8440 +SurfingMinigame_WriteHPLeftAndWait: + call SurfingMinigame_RunDelayTimer ret nc - call Func_f8a92 - ld a, $40 - ld [wc632], a - ld hl, wc5d1 + call SurfingMinigame_WriteHPLeft + ld a, 64 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f83aa: - call Func_f8440 +SurfingMinigame_WriteRadnessAndWait: + call SurfingMinigame_RunDelayTimer ret nc - call Func_f8ae4 - ld a, $40 - ld [wc632], a - ld hl, wc5d1 + call SurfingMinigame_WriteRadness + ld a, 64 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f83bb: - call Func_f8440 +SurfingMinigame_WriteTotalAndWait: + call SurfingMinigame_RunDelayTimer ret nc - call Func_f8b7a - ld a, $40 - ld [wc632], a - ld hl, wc5d1 + call SurfingMinigame_WriteTotal + ld a, 64 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f83cc: - call Func_f8440 +SurfingMinigame_AddRemainingHPToTotalAndWait: + call SurfingMinigame_RunDelayTimer ret nc - call Func_f8aa9 + call SurfingMinigame_AddRemainingHPToTotal push af - call Func_f8b5d + call SurfingMinigame_BCDPrintTotalScore pop af ret nc - ld a, $40 - ld [wc632], a - ld hl, wc5d1 + ld a, 64 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f83e3: - call Func_f8440 +SurfingMinigame_AddRadnessToTotalAndWait: + call SurfingMinigame_RunDelayTimer ret nc - call Func_f8afb + call SurfingMinigame_AddRadnessToTotal push af - call Func_f8b5d + call SurfingMinigame_BCDPrintTotalScore pop af ret nc - ld a, $80 - ld [wc632], a - ld hl, wc5d1 + ld a, 128 + ld [wSurfingMinigameRoutineDelay], a + ld hl, wSurfingMinigameRoutineNumber inc [hl] - call Func_f8b92 + call DidPlayerGetAHighScore ret nc - call Func_f8a7c -Func_f83ff: + call SurfingMinigame_PrintTextHiScore ld a, $6 ld [wc5d2], a ret -Func_f8406: - call Func_f8440 -Func_f8408: +SurfingMinigame_WaitLast: + call SurfingMinigame_RunDelayTimer ret nc - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber inc [hl] ret -Func_f840f: - call Func_f9210 +SurfingMinigame_ExitOnPressA: + call SurfingMinigame_UpdateLYOverrides ld a, [hJoyPressed] - and $1 + and A_BUTTON ret z - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber set 7, [hl] ret -Func_f841d: - call Func_f9210 +SurfingMinigame_GameOver: + call SurfingMinigame_UpdateLYOverrides call Func_f88ae call Func_f886b call Func_f8cb0 - call Func_f80ff + call SurfingMinigame_ResetMusicTempo ld hl, wc631 ld a, [hl] and a - jr z, .asm_f8435 + jr z, .wait_press_a dec [hl] ret -.asm_f8435 +.wait_press_a ld a, [hJoyPressed] - and $1 + and A_BUTTON ret z - ld hl, wc5d1 + ld hl, wSurfingMinigameRoutineNumber set 7, [hl] ret -Func_f8440: - ld hl, wc632 +SurfingMinigame_RunDelayTimer: + ld hl, wSurfingMinigameRoutineDelay ld a, [hl] and a - jr z, .asm_f844a + jr z, .set_carry dec [hl] and a ret -.asm_f844a +.set_carry scf ret Func_f844c: - ld a, [wc5e6] + ld a, [wc5e5 + 1] ld h, a - ld a, [wc5e7] + ld a, [wc5e5 + 2] ld l, a ld a, [wc5e3] ld e, a @@ -642,9 +651,9 @@ Func_f844c: ld d, a add hl, de ld a, h - ld [wc5e6], a + ld [wc5e5 + 1], a ld a, l - ld [wc5e7], a + ld [wc5e5 + 2], a ret nc ld hl, wc5e5 inc [hl] @@ -653,7 +662,7 @@ Func_f844c: dec [hl] ret -Func_f8470 +SurfingMinigameAnimatedObjectFn_Pikachu ld a, [wc5d2] ld e, a ld d, $0 @@ -667,7 +676,7 @@ Func_f8470 Jumptable_f847f: dw Func_f848d - dw Func_f84e2 + dw SurfingMinigame_ScoreCurrentWave dw Func_f8516 dw Func_f8545 dw Func_f8561 @@ -679,32 +688,32 @@ Func_f848d: and a jr nz, .asm_f84d2 call Func_f87b5 - ld a, [wc5ea] - ld hl, $5 + ld a, [wSurfingMinigamePikachuObjectHeight] + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], a call Func_f871e - jr c, .asm_f84aa + jr c, .splash call Func_f8742 call Func_f86b8 ret -.asm_f84aa +.splash call Func_f8742 - ld a, $1 + ld a, $1 ; on a wave ld [wc5d2], a xor a - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], a - ld hl, $d + ld hl, ANIM_OBJ_FIELD_D add hl, bc ld [hl], a - ld hl, $e + ld hl, ANIM_OBJ_FIELD_E add hl, bc ld [hl], a - ld [wc5d9], a - ld [wc62f], a + ld [wSurfingMinigameRadnessMeter], a + ld [wSurfingMinigameTrickFlags], a xor a ld [wChannelSoundIDs + CH7], a ld a, SFX_UNKNOWN_801B3_4 @@ -720,21 +729,21 @@ Func_f848d: call Func_f8742 ret -Func_f84e2: - call Func_f8598 - call Func_f928c +SurfingMinigame_ScoreCurrentWave: + call SurfingMinigame_DPadAction + call SurfingMinigame_UpdatePikachuHeight ret nc - call Func_f8606 - jr c, .asm_f84fd - call Func_f8bed - ld hl, $c + call SurfingMinigame_TileInteraction + jr c, .splash + call SurfingMinigame_CalculateAndAddRadnessFromStunt + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], $0 ld a, $2 ld [wc5d2], a ret -.asm_f84fd +.splash ld a, $3 ld [wc5d2], a ld a, $60 @@ -748,7 +757,7 @@ Func_f84e2: ret Func_f8516: - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld a, [hl] cp $20 @@ -758,19 +767,19 @@ Func_f8516: inc [hl] inc [hl] ld d, $4 - call Func_f9362 - ld hl, $7 + call SurfingPikachu_Sine + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], a call Func_f87b5 - ld a, [wc5ea] - ld hl, $5 + ld a, [wSurfingMinigamePikachuObjectHeight] + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], a ret .asm_f8539 - ld hl, $7 + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], $0 ld a, $0 @@ -783,8 +792,8 @@ Func_f8545: and a jr z, .asm_f8556 dec [hl] - ld a, [wc5ea] - ld hl, $5 + ld a, [wSurfingMinigamePikachuObjectHeight] + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], a ret @@ -797,8 +806,8 @@ Func_f8545: ret Func_f8561: - ld a, [wc5ea] - ld hl, $5 + ld a, [wSurfingMinigamePikachuObjectHeight] + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], a call Func_f8742 @@ -807,13 +816,13 @@ Func_f8561: Func_f856d: ld a, $f call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], $0 ret Func_f8579: - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld a, [hl] inc [hl] @@ -822,183 +831,184 @@ Func_f8579: cp $20 jr c, .asm_f8591 ld d, $10 - call Func_f9362 - ld hl, $7 + call SurfingPikachu_Sine + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], a ret .asm_f8591 - ld hl, $7 + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], $0 ret -Func_f8598: +SurfingMinigame_DPadAction: ld de, hJoy5 ld a, [de] - and $20 - jr nz, .asm_f85a6 + and D_LEFT + jr nz, .d_left ld a, [de] - and $10 - jr nz, .asm_f85cc + and D_RIGHT + jr nz, .d_right ret -.asm_f85a6 - ld hl, $e +.d_left + ld hl, ANIM_OBJ_FIELD_E add hl, bc ld [hl], $0 - ld hl, $d + ld hl, ANIM_OBJ_FIELD_D add hl, bc ld a, [hl] inc [hl] cp $b - jr c, .asm_f85be - call Func_f85f2 - ld hl, wc62f + jr c, .d_left_skip + call .StartTrick + ld hl, wSurfingMinigameTrickFlags set 0, [hl] -.asm_f85be - ld hl, $1 +.d_left_skip + ld hl, ANIM_OBJ_FRAME_SET add hl, bc ld a, [hl] cp $e - jr nc, .asm_f85c9 + jr nc, .d_left_reset inc [hl] ret -.asm_f85c9 +.d_left_reset ld [hl], $1 ret -.asm_f85cc - ld hl, $d +.d_right + ld hl, ANIM_OBJ_FIELD_D add hl, bc ld [hl], $0 - ld hl, $e + ld hl, ANIM_OBJ_FIELD_E add hl, bc ld a, [hl] inc [hl] cp $d - jr c, .asm_f85e4 - call Func_f85f2 - ld hl, wc62f + jr c, .d_right_skip + call .StartTrick + ld hl, wSurfingMinigameTrickFlags set 1, [hl] -.asm_f85e4 - ld hl, $1 +.d_right_skip + ld hl, ANIM_OBJ_FRAME_SET add hl, bc ld a, [hl] cp $1 - jr z, .asm_f85ef + jr z, .d_right_reset dec [hl] ret -.asm_f85ef +.d_right_reset ld [hl], $e ret -Func_f85f2: - call Func_f8bdf +.StartTrick: + call SurfingMinigame_IncreaseRadnessMeter xor a - ld hl, $d + ld hl, ANIM_OBJ_FIELD_D add hl, bc ld [hl], a - ld hl, $e + ld hl, ANIM_OBJ_FIELD_E add hl, bc ld [hl], a ld a, SFX_UNKNOWN_801B6_4 call PlaySound ret -Func_f8606: - ld hl, $1 +SurfingMinigame_TileInteraction: + ld hl, ANIM_OBJ_FRAME_SET add hl, bc - ld a, [wc5ef] + ld a, [wSurfingMinigameBGMapReadBuffer] cp $6 - jr z, .asm_f863d + jr z, .tile_06 cp $14 - jr z, .asm_f867b + jr z, .tile_14 cp $12 - jr z, .asm_f867b + jr z, .tile_12 cp $7 - jr z, .asm_f865c + jr z, .tile_07 ld a, [hl] cp $1 - jp z, .asm_f86ad + jp z, .action_0 cp $2 - jr z, .asm_f869a + jr z, .action_1 cp $3 - jr z, .asm_f869f + jr z, .action_2 cp $4 - jr z, .asm_f86a2 + jr z, .action_3 cp $5 - jr z, .asm_f869f + jr z, .action_2 cp $6 - jr z, .asm_f869a + jr z, .action_1 cp $7 - jr z, .asm_f86ad - jr .asm_f86ad + jr z, .action_0 + jr .action_0 -.asm_f863d +.tile_06 ld a, [hl] cp $1 - jr z, .asm_f86ad + jr z, .action_0 cp $2 - jr z, .asm_f86ad + jr z, .action_0 cp $3 - jr z, .asm_f86ad + jr z, .action_0 cp $4 - jr z, .asm_f869a + jr z, .action_1 cp $5 - jr z, .asm_f869f + jr z, .action_2 cp $6 - jr z, .asm_f86a2 + jr z, .action_3 cp $7 - jr z, .asm_f869f - jr .asm_f86ad + jr z, .action_2 + jr .action_0 -.asm_f865c +.tile_07 ld a, [hl] cp $1 - jr z, .asm_f869f + jr z, .action_2 cp $2 - jr z, .asm_f86a2 + jr z, .action_3 cp $3 - jr z, .asm_f869f + jr z, .action_2 cp $4 - jr z, .asm_f869a + jr z, .action_1 cp $5 - jr z, .asm_f86ad + jr z, .action_0 cp $6 - jr z, .asm_f86ad + jr z, .action_0 cp $7 - jr z, .asm_f86ad - jr .asm_f86ad + jr z, .action_0 + jr .action_0 -.asm_f867b +.tile_12 +.tile_14 ld a, [hl] cp $1 - jr z, .asm_f86ad + jr z, .action_0 cp $2 - jr z, .asm_f869a + jr z, .action_1 cp $3 - jr z, .asm_f869f + jr z, .action_2 cp $4 - jr z, .asm_f86a2 + jr z, .action_3 cp $5 - jr z, .asm_f86a2 + jr z, .action_3 cp $6 - jr z, .asm_f869f + jr z, .action_2 cp $7 - jr z, .asm_f869a - jr .asm_f86ad + jr z, .action_1 + jr .action_0 -.asm_f869a - call Func_f86f7 - jr .asm_f86a2 +.action_1 + call Subtract128Fromwc5e3 + jr .action_3 -.asm_f869f - call Func_f86d0 -.asm_f86a2 +.action_2 + call Subtract64Fromwc5e3 +.action_3 xor a ld [wChannelSoundIDs + CH7], a ld a, SFX_UNKNOWN_801BF_4 @@ -1006,7 +1016,7 @@ Func_f8606: and a ret -.asm_f86ad +.action_0 ld a, $40 ld [wc5e3], a xor a @@ -1029,23 +1039,23 @@ Func_f86b8: ld [wc5e3], a ret -Func_f86d0: +Subtract64Fromwc5e3: ld a, [wc5e3 + 1] and a - jr nz, .asm_f86e2 + jr nz, .go ld a, [wc5e3] cp $40 - jr nc, .asm_f86e2 + jr nc, .go xor a ld [wc5e3], a ret -.asm_f86e2 +.go ld a, [wc5e3 + 1] ld h, a ld a, [wc5e3] ld l, a - ld de, $ffc0 + ld de, -$40 add hl, de ld a, h ld [wc5e3 + 1], a @@ -1053,23 +1063,23 @@ Func_f86d0: ld [wc5e3], a ret -Func_f86f7: +Subtract128Fromwc5e3: ld a, [wc5e3 + 1] and a - jr nz, .asm_f8709 + jr nz, .go ld a, [wc5e3] cp $80 - jr nc, .asm_f8709 + jr nc, .go xor a ld [wc5e3], a ret -.asm_f8709 +.go ld a, [wc5e3 + 1] ld h, a ld a, [wc5e3] ld l, a - ld de, $ff80 + ld de, -$80 add hl, de ld a, h ld [wc5e3 + 1], a @@ -1084,7 +1094,7 @@ Func_f871e: jr c, .asm_f8740 cp $5 jr nc, .asm_f8740 - ld a, [wc5ef] + ld a, [wSurfingMinigameBGMapReadBuffer] cp $14 jr nz, .asm_f8740 call Func_f87a8 @@ -1106,7 +1116,7 @@ Func_f8742: ret c cp $5 ret nc - ld a, [wc5ef] + ld a, [wSurfingMinigameBGMapReadBuffer] cp $6 jr z, .asm_f8766 cp $14 @@ -1115,7 +1125,7 @@ Func_f8742: jr z, .asm_f876a call Func_f8778 ld a, $4 - ld hl, $1 + ld hl, ANIM_OBJ_FRAME_SET add hl, bc ld [hl], a ret @@ -1131,7 +1141,7 @@ Func_f8742: ld a, [wc5de] dec a add e - ld hl, $1 + ld hl, ANIM_OBJ_FRAME_SET add hl, bc ld [hl], a ret @@ -1187,9 +1197,9 @@ Func_f87b5: inc [hl] and $3 ret nz - call Func_f87ce + call .GetYCoord ld d, a - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld e, [hl] ld a, $a @@ -1198,27 +1208,27 @@ Func_f87b5: pop bc ret -Func_f87ce: +.GetYCoord: ld a, [hSCX] and $8 - jr nz, .asm_f87d9 - ld hl, wc622 - jr .asm_f87dc - -.asm_f87d9 - ld hl, wc623 -.asm_f87dc - ld a, [wc5f0] + jr nz, .get_height_plus_9 + ld hl, wSurfingMinigameWaveHeight + 8 + jr .got_hl + +.get_height_plus_9 + ld hl, wSurfingMinigameWaveHeight + 9 +.got_hl + ld a, [wSurfingMinigameBGMapReadBuffer + 1] cp $6 - jr z, .asm_f87ed + jr z, .six_or_twenty cp $14 - jr z, .asm_f87ed + jr z, .six_or_twenty cp $7 - jr z, .asm_f87f5 + jr z, .seven ld a, [hl] ret -.asm_f87ed +.six_or_twenty ld a, [hSCX] and $7 ld e, a @@ -1226,14 +1236,14 @@ Func_f87ce: sub e ret -.asm_f87f5 +.seven ld a, [hSCX] and $7 add [hl] ret Func_f87fb: - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld a, [hl] cp $58 @@ -1242,12 +1252,12 @@ Func_f87fb: ld [hl], a ret -Func_f8807: +Func_f8807: ; unreferenced call MaskCurrentAnimatedObjectStruct ret -Func_f880b: - ld hl, $b +SurfingMinigameAnimatedObjectFn_FlippingPika: + ld hl, ANIM_OBJ_FIELD_B add hl, bc ld a, [hl] and a @@ -1255,39 +1265,39 @@ Func_f880b: dec [hl] dec [hl] ld d, a - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld a, [hl] inc [hl] - call Func_f9362 + call SurfingPikachu_Sine cp $80 - jr nc, .asm_f8825 + jr nc, .positive xor $ff inc a -.asm_f8825 - ld hl, $7 +.positive + ld hl, ANIM_OBJ_Y_OFFSET add hl, bc ld [hl], a ret -Func_f882b: - ld hl, $b +SurfingMinigameAnimatedObjectFn_IntroAnimationPikachu: + ld hl, ANIM_OBJ_FIELD_B add hl, bc ld a, [hl] inc [hl] and $1 ret z - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld a, [hl] cp $c0 - jr z, .asm_f883f + jr z, .done inc [hl] ret -.asm_f883f +.done ld a, $1 - ld [wc633], a + ld [wSurfingMinigameIntroAnimationFinished], a call MaskCurrentAnimatedObjectStruct ret @@ -1305,7 +1315,7 @@ Func_f8848: ld d, h ld hl, wOAMBuffer + 5 * 4 + 1 ld e, $9 -.asm_f8861 +.loop ld a, [hl] add d ld [hli], a @@ -1313,11 +1323,11 @@ Func_f8848: inc hl inc hl dec e - jr nz, .asm_f8861 + jr nz, .loop ret Func_f886b: - ld a, [wc5ef] + ld a, [wSurfingMinigameBGMapReadBuffer] ; ??? ld a, [hSCX] add $48 ld e, a @@ -1327,15 +1337,15 @@ Func_f886b: ld d, $0 ld hl, vBGMap0 add hl, de - ld a, [wc5ea] + ld a, [wSurfingMinigamePikachuObjectHeight] srl a srl a srl a ld c, a -.asm_f8889 +.loop ld a, c and a - jr z, .asm_f889a + jr z, .copy dec c ld de, $20 add hl, de @@ -1343,10 +1353,10 @@ Func_f886b: and $3 or $98 ld h, a - jr .asm_f8889 + jr .loop -.asm_f889a - ld de, wc5ef +.copy + ld de, wSurfingMinigameBGMapReadBuffer ld a, e ld [H_VBCOPYDEST], a ld a, d @@ -1355,7 +1365,7 @@ Func_f886b: ld [H_VBCOPYSRC], a ld a, h ld [H_VBCOPYSRC + 1], a - ld a, $1 + ld a, 16 / $10 ld [H_VBCOPYSIZE], a ret @@ -1363,13 +1373,13 @@ Func_f88ae: ld a, [hSCX] and $8 jr nz, .asm_f88b9 - ld hl, wc621 + ld hl, wSurfingMinigameWaveHeight + 7 jr .asm_f88bc .asm_f88b9 - ld hl, wc622 + ld hl, wSurfingMinigameWaveHeight + 8 .asm_f88bc - ld a, [wc5ef] + ld a, [wSurfingMinigameBGMapReadBuffer] cp $6 jr z, .asm_f88d0 cp $14 @@ -1377,7 +1387,7 @@ Func_f88ae: cp $7 jr z, .asm_f88db ld a, [hl] - ld [wc5ea], a + ld [wSurfingMinigamePikachuObjectHeight], a ret .asm_f88d0 @@ -1386,46 +1396,46 @@ Func_f88ae: ld e, a ld a, [hl] sub e - ld [wc5ea], a + ld [wSurfingMinigamePikachuObjectHeight], a ret .asm_f88db ld a, [hSCX] and $7 add [hl] - ld [wc5ea], a + ld [wSurfingMinigamePikachuObjectHeight], a ret -Func_f88e4: - ld hl, wc5d6 +SurfingMinigame_Deduct1HP: + ld hl, wSurfingMinigamePikachuHP ld e, $99 - call Func_f88f0 + call .BCD_Deduct ret nc inc hl ld e, $99 -Func_f88f0: +.BCD_Deduct: ld a, [hl] and a - jr z, .asm_f88fa + jr z, .roll_over sub $1 daa ld [hl], a and a ret -.asm_f88fa +.roll_over ld [hl], e scf ret Func_f88fd: - ld de, wc5d7 + ld de, wSurfingMinigamePikachuHP + 1 ld hl, wOAMBuffer + 0 * 4 + 2 ld a, [de] - call Func_f890b + call .PlaceBCDNumber ld hl, wOAMBuffer + 2 * 4 + 2 ld a, [de] -Func_f890b: +.PlaceBCDNumber: ld c, a swap a and $f @@ -1441,164 +1451,161 @@ Func_f890b: dec de ret -Func_f891e: +SurfingMinigame_DrawResultsScreen: ld hl, wTileMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call FillMemory - ld hl, Tilemap_f8946 + ld hl, .BeachTilemap coord de, 0, 6 - ld bc, Tilemap_f8946End - Tilemap_f8946 + ld bc, .BeachTilemapEnd - .BeachTilemap call CopyData - call Func_f8a0e + call .PlaceTextbox ld hl, wOAMBuffer + 5 * 4 + 1 - ld bc, $24 + ld bc, 9 * 4 xor a call FillMemory ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ret -Tilemap_f8946: +.BeachTilemap: INCBIN "gfx/unknown_f8946.map" -Tilemap_f8946End: +.BeachTilemapEnd: -Func_f8a0e: +.PlaceTextbox: coord hl, 1, 1 lb de, $3b, $3c ld a, $40 - call Func_f8a72 + call .place_row coord hl, 1, 2 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 3 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 4 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 5 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 6 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 7 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 8 lb de, $3f, $3f ld a, $ff - call Func_f8a72 + call .place_row coord hl, 1, 9 lb de, $3d, $3e ld a, $40 - call Func_f8a72 + call .place_row ret -Func_f8a72: +.place_row: ld [hl], d inc hl ld c, $10 -.asm_f8a76 +.loop ld [hli], a dec c - jr nz, .asm_f8a76 + jr nz, .loop ld [hl], e ret -Func_f8a7c: - ld hl, Tilemap_f8a89 +SurfingMinigame_PrintTextHiScore: + ld hl, .Hi_Score coord de, 6, 8 ld bc, $9 call CopyData ret -Tilemap_f8a89: - db $20,$2e,$2f,$30,$31,$2c,$32,$23,$33 +.Hi_Score: + db $20,$2e,$2f,$30,$31,$2c,$32,$23,$33 ; Hi-Score!! -Func_f8a92: - ld hl, Tilemap_f8aa2 +SurfingMinigame_WriteHPLeft: + ld hl, .HP_Left coord de, 2, 2 ld bc, $7 call CopyData - call Func_f8aca + call SurfingMinigame_BCDPrintHPLeft ret -Tilemap_f8aa2: - db $20,$21,$ff,$22,$23,$24,$25 +.HP_Left: + db $20,$21,$ff,$22,$23,$24,$25 ; HP Left -Func_f8aa9: - ld c, $63 -.asm_f8aab +SurfingMinigame_AddRemainingHPToTotal: + ld c, 99 +.loop push bc - ld hl, wc5d6 + ld hl, wSurfingMinigamePikachuHP ld a, [hli] or [hl] and a - jr z, .asm_f8ac7 - call Func_f88e4 + jr z, .dead + call SurfingMinigame_Deduct1HP ld e, $1 -.asm_f8ab9 - call Func_f8b42 + call SurfingMinigame_AddPointsToTotal pop bc dec c - jr nz, .asm_f8aab -.asm_f8abf + jr nz, .loop ld a, SFX_UNKNOWN_801B0_4 call PlaySound -.asm_f8ac5 and a ret -.asm_f8ac7 +.dead pop bc scf ret -Func_f8aca: +SurfingMinigame_BCDPrintHPLeft: coord hl, 10, 2 - ld de, wc5d7 + ld de, wSurfingMinigamePikachuHP + 1 ld a, [de] - call Func_f9350 + call SurfingPikachu_PlaceBCDNumber inc hl ld a, [de] - call Func_f9350 + call SurfingPikachu_PlaceBCDNumber inc hl inc hl - ld [hl], $21 + ld [hl], $21 ; P inc hl - ld [hl], $25 + ld [hl], $25 ; t inc hl - ld [hl], $26 + ld [hl], $26 ; s ret -Func_f8ae4: - ld hl, Tilemap_f8af4 +SurfingMinigame_WriteRadness: + ld hl, .Radness coord de, 2, 4 ld bc, $7 call CopyData - call Func_f8b25 + call SurfingMinigame_BCDPrintRadness ret -Tilemap_f8af4: - db $27,$28,$29,$2a,$23,$26,$26 +.Radness: + db $27,$28,$29,$2a,$23,$26,$26 ; Radness -Func_f8afb: - ld c, $63 -.asm_f8afd +SurfingMinigame_AddRadnessToTotal: + ld c, 99 +.loop push bc - ld hl, wc5da + ld hl, wSurfingMinigameRadnessScore ld a, [hli] ld e, a or [hl] - jr z, .asm_f8b22 + jr z, .done ld d, [hl] ld a, e sub $1 @@ -1610,102 +1617,101 @@ Func_f8afb: ld [hld], a ld [hl], e ld e, $1 - call Func_f8b42 + call SurfingMinigame_AddPointsToTotal pop bc dec c - jr nz, .asm_f8afd + jr nz, .loop ld a, SFX_UNKNOWN_801B0_4 call PlaySound -.asm_f8b20 and a ret -.asm_f8b22 +.done pop bc scf ret -Func_f8b25: - ld a, [wc5db] +SurfingMinigame_BCDPrintRadness: + ld a, [wSurfingMinigameRadnessScore + 1] coord hl, 10, 4 - call Func_f9350 - ld a, [wc5da] + call SurfingPikachu_PlaceBCDNumber + ld a, [wSurfingMinigameRadnessScore] coord hl, 12, 4 - call Func_f9350 + call SurfingPikachu_PlaceBCDNumber inc hl inc hl - ld [hl], $21 + ld [hl], $21 ; P inc hl - ld [hl], $25 + ld [hl], $25 ; t inc hl - ld [hl], $26 + ld [hl], $26 ; s ret -Func_f8b42: - ld a, [wc5dc] +SurfingMinigame_AddPointsToTotal: + ld a, [wSurfingMinigameTotalScore] add e daa - ld [wc5dc], a - ld a, [wc5dd] + ld [wSurfingMinigameTotalScore], a + ld a, [wSurfingMinigameTotalScore + 1] adc $0 daa - ld [wc5dd], a + ld [wSurfingMinigameTotalScore + 1], a ret nc ld a, $99 - ld [wc5dc], a - ld [wc5dd], a + ld [wSurfingMinigameTotalScore], a + ld [wSurfingMinigameTotalScore + 1], a ret -Func_f8b5d: - ld a, [wc5dd] +SurfingMinigame_BCDPrintTotalScore: + ld a, [wSurfingMinigameTotalScore + 1] coord hl, 10, 6 - call Func_f9350 - ld a, [wc5dc] + call SurfingPikachu_PlaceBCDNumber + ld a, [wSurfingMinigameTotalScore] coord hl, 12, 6 - call Func_f9350 + call SurfingPikachu_PlaceBCDNumber inc hl inc hl - ld [hl], $21 + ld [hl], $21 ; P inc hl - ld [hl], $25 + ld [hl], $25 ; t inc hl - ld [hl], $26 + ld [hl], $26 ; s ret -Func_f8b7a: - ld hl, Tilemap_f8b8d +SurfingMinigame_WriteTotal: + ld hl, .Total coord de, 2, 6 ld bc, $5 call CopyData - call Func_f8b25 - call Func_f8b5d + call SurfingMinigame_BCDPrintRadness + call SurfingMinigame_BCDPrintTotalScore ret -Tilemap_f8b8d: - db $2b,$2c,$25,$28,$2d +.Total: + db $2b,$2c,$25,$28,$2d ; Total -Func_f8b92: +DidPlayerGetAHighScore: ld hl, wSurfingMinigameHiScore + 1 - ld a, [wc5dd] + ld a, [wSurfingMinigameTotalScore + 1] cp [hl] - jr c, .asm_f8ba6 - jr nz, .asm_f8bb0 + jr c, .not_high_score + jr nz, .high_score dec hl - ld a, [wc5dc] + ld a, [wSurfingMinigameTotalScore] cp [hl] - jr c, .asm_f8ba6 - jr nz, .asm_f8bb0 -.asm_f8ba6 + jr c, .not_high_score + jr nz, .high_score +.not_high_score call WaitForSoundToFinish ldpikacry e, PikachuCry28 call SurfingMinigame_PlayPikaCryIfSurfingPikaInParty and a ret -.asm_f8bb0 - ld a, [wc5dc] +.high_score + ld a, [wSurfingMinigameTotalScore] ld [wSurfingMinigameHiScore], a - ld a, [wc5dd] + ld a, [wSurfingMinigameTotalScore + 1] ld [wSurfingMinigameHiScore + 1], a call WaitForSoundToFinish ldpikacry e, PikachuCry34 @@ -1715,7 +1721,7 @@ Func_f8b92: scf ret -SurfingMinigame_PlayPikaCryIfSurfingPikaInParty: ; f8bcb (3e:4bcb) +SurfingMinigame_PlayPikaCryIfSurfingPikaInParty: push de callab IsSurfingPikachuInThePlayersParty pop de @@ -1723,73 +1729,81 @@ SurfingMinigame_PlayPikaCryIfSurfingPikaInParty: ; f8bcb (3e:4bcb) callab PlayPikachuSoundClip ret -Func_f8bdf: - ld a, [wc5d9] +SurfingMinigame_IncreaseRadnessMeter: + ld a, [wSurfingMinigameRadnessMeter] inc a cp $4 - jr c, .asm_f8be9 + jr c, .cap ld a, $3 -.asm_f8be9 - ld [wc5d9], a - ret - -Func_f8bed: - ld a, [wc5d9] +.cap + ld [wSurfingMinigameRadnessMeter], a + ret + +SurfingMinigame_CalculateAndAddRadnessFromStunt: + ; Compute the amount of radness points from the + ; current trick based on the number of + ; consecutive flips + ; Single flip: +0050 + ; 2 of the same flip: +0150 + ; 3 or more of the same flip: +0350 + ; 2 different flips: +0180 + ; 3 or more different flips: +0500 + ld a, [wSurfingMinigameRadnessMeter] and a ret z - ld a, [wc62f] + ld a, [wSurfingMinigameTrickFlags] and $3 - cp $3 - jr z, .asm_f8c2b - ld a, [wc5d9] + cp $3 ; did a combination of front and back flips + jr z, .mixed_chain + ld a, [wSurfingMinigameRadnessMeter] ld d, a ld e, $1 ld a, $0 -.asm_f8c03 +.get_amount_of_radness add e sla e dec d - jr nz, .asm_f8c03 -.asm_f8c09 + jr nz, .get_amount_of_radness +.add_radness_50_at_a_time push af ld e, $50 - call Func_f8c7c + call SurfingMinigame_AddRadness pop af dec a - jr nz, .asm_f8c09 - ld hl, $5 + jr nz, .add_radness_50_at_a_time + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld a, [hl] sub $10 ld d, a - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld e, [hl] - ld a, [wc5d9] + ld a, [wSurfingMinigameRadnessMeter] add $3 push bc call SpawnAnimatedObject pop bc ret -.asm_f8c2b - ld a, [wc5d9] +.mixed_chain + ld a, [wSurfingMinigameRadnessMeter] cp $3 - jr c, .asm_f8c53 - ld a, $a -.asm_f8c34 + jr c, .add_180_radness_points + ld a, 10 +.add_500_radness_50_at_a_time push af ld e, $50 - call Func_f8c7c + call SurfingMinigame_AddRadness pop af dec a - jr nz, .asm_f8c34 - ld hl, $5 + jr nz, .add_500_radness_50_at_a_time + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld a, [hl] sub $10 ld d, a - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld e, [hl] ld a, $9 @@ -1798,21 +1812,21 @@ Func_f8bed: pop bc ret -.asm_f8c53 +.add_180_radness_points ld e, $50 - call Func_f8c7c + call SurfingMinigame_AddRadness ld e, $50 - call Func_f8c7c + call SurfingMinigame_AddRadness ld e, $50 - call Func_f8c7c + call SurfingMinigame_AddRadness ld e, $30 - call Func_f8c7c - ld hl, $5 + call SurfingMinigame_AddRadness + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld a, [hl] sub $10 ld d, a - ld hl, $4 + ld hl, ANIM_OBJ_X_COORD add hl, bc ld e, [hl] ld a, $8 @@ -1821,89 +1835,91 @@ Func_f8bed: pop bc ret -Func_f8c7c: - ld a, [wc5da] +SurfingMinigame_AddRadness: + ld a, [wSurfingMinigameRadnessScore] add e daa - ld [wc5da], a - ld a, [wc5db] + ld [wSurfingMinigameRadnessScore], a + ld a, [wSurfingMinigameRadnessScore + 1] adc $0 daa - ld [wc5db], a + ld [wSurfingMinigameRadnessScore + 1], a ret nc ld a, $99 - ld [wc5da], a - ld [wc5db], a + ld [wSurfingMinigameRadnessScore], a + ld [wSurfingMinigameRadnessScore + 1], a ret Func_f8c97: ld a, $a0 - ld [wc62e], a + ld [wSurfingMinigameXOffset], a ld a, [hSCX] ld h, a - ld a, [wc617] + ld a, [wSurfingMinigameSCX] ld l, a ld de, $900 add hl, de ld a, l - ld [wc617], a + ld [wSurfingMinigameSCX], a ld a, h ld [hSCX], a jr Func_f8cc7 Func_f8cb0: ld a, $a0 - ld [wc62e], a + ld [wSurfingMinigameXOffset], a ld a, [hSCX] ld h, a - ld a, [wc617] + ld a, [wSurfingMinigameSCX] ld l, a ld de, $180 add hl, de ld a, l - ld [wc617], a + ld [wSurfingMinigameSCX], a ld a, h ld [hSCX], a Func_f8cc7: - ld hl, wc618 + ld hl, wSurfingMinigameSCX + 1 ld a, [hSCX] cp [hl] ret z ld [hl], a and $f0 - ld hl, wc619 + ld hl, wSurfingMinigameSCX + 2 cp [hl] ret z ld [hl], a - call Func_f8d44 + call SurfingMinigame_GetWaveDataPointers + ; b and c contain the height of the next wave to appear + ; on screen, in number of pixels from the top of the screen ld a, b - ld [wc5e8], a + ld [wSurfingMinigameWaveHeightBuffer], a ld a, c - ld [wc5e9], a + ld [wSurfingMinigameWaveHeightBuffer + 1], a push de - ld hl, wc61a - ld de, wc61c - ld c, $12 -.asm_f8ceb + ld hl, wSurfingMinigameWaveHeight + ld de, wSurfingMinigameWaveHeight + 2 + ld c, SCREEN_WIDTH - 2 +.copy_loop ld a, [de] inc de ld [hli], a dec c - jr nz, .asm_f8ceb - ld a, [wc5e8] + jr nz, .copy_loop + ld a, [wSurfingMinigameWaveHeightBuffer] ld [hli], a - ld a, [wc5e9] + ld a, [wSurfingMinigameWaveHeightBuffer + 1] ld [hl], a pop de ld hl, wRedrawRowOrColumnSrcTiles ld c, $8 -.asm_f8cff +.loop ld a, [de] - call Func_f8d28 + call .CopyRedrawSrcTiles inc de dec c - jr nz, .asm_f8cff - ld a, [wc62e] + jr nz, .loop + ld a, [wSurfingMinigameXOffset] ld e, a ld a, [hSCX] add e @@ -1923,7 +1939,7 @@ Func_f8cc7: ld [hRedrawRowOrColumnMode], a ret -Func_f8d28: +.CopyRedrawSrcTiles: push de push hl ld l, a @@ -1950,8 +1966,8 @@ Func_f8d28: pop de ret -Func_f8d44: - ld a, [wc5d3] +SurfingMinigame_GetWaveDataPointers: + ld a, [wSurfingMinigameWaveFunctionNumber] ld e, a ld d, $0 ld hl, Jumptable_f8d53 @@ -1963,145 +1979,155 @@ Func_f8d44: jp [hl] Jumptable_f8d53: - dw Func_f8e4b - dw Func_f8f28 - dw Func_f8f31 - dw Func_f8f3a - dw Func_f8f43 - dw Func_f8e7d - dw Func_f8f4c - dw Func_f8f55 - dw Func_f8f5e - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8ec5 - dw Func_f8ece - dw Func_f8ed7 - dw Func_f8ee0 - dw Func_f8ee9 - dw Func_f8ef2 - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8efb - dw Func_f8f04 - dw Func_f8f0d - dw Func_f8f16 - dw Func_f8f1f - dw Func_f8efb - dw Func_f8f04 - dw Func_f8f0d - dw Func_f8f16 - dw Func_f8f1f - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8f28 - dw Func_f8f31 - dw Func_f8f3a - dw Func_f8f43 - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8f4c - dw Func_f8f55 - dw Func_f8f5e - dw Func_f8f4c - dw Func_f8f55 - dw Func_f8f5e - dw Func_f8f4c - dw Func_f8f55 - dw Func_f8f5e - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8f67 - dw Func_f8f70 - dw Func_f8efb - dw Func_f8f04 - dw Func_f8f0d - dw Func_f8f16 - dw Func_f8f1f - dw Func_f8f67 - dw Func_f8f70 - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8ec5 - dw Func_f8ece - dw Func_f8ed7 - dw Func_f8ee0 - dw Func_f8ee9 - dw Func_f8ef2 - dw Func_f8e7d - dw Func_f8f67 - dw Func_f8f70 - dw Func_f8f67 - dw Func_f8f70 - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8efb - dw Func_f8f04 - dw Func_f8f0d - dw Func_f8f16 - dw Func_f8f1f - dw Func_f8f28 - dw Func_f8f31 - dw Func_f8f3a - dw Func_f8f43 - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8e7d - dw Func_f8f94 - dw Func_f8e86 - dw Func_f8e8f - dw Func_f8e98 - dw Func_f8ea1 - dw Func_f8eaa - dw Func_f8eb3 - dw Func_f8ebc - dw Func_f8f9d - dw Func_f8e7d - dw Func_f8f79 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f82 - dw Func_f8f8b - -Func_f8e4b: + dw SurfingMinigameWaveFunction_NoWave ; 00 + + dw Func_f8f28 ; 01 + dw Func_f8f31 ; 02 + dw Func_f8f3a ; 03 + dw Func_f8f43 ; 04 + dw Func_f8e7d ; 05 + dw Func_f8f4c ; 06 + dw Func_f8f55 ; 07 + dw Func_f8f5e ; 08 + dw Func_f8e7d ; 09 + dw Func_f8e7d ; 0a + dw Func_f8e7d ; 0b + dw Func_f8e7d ; 0c + dw Func_f8f94 ; 0d + + dw Func_f8ec5 ; 0e + dw Func_f8ece ; 0f + dw Func_f8ed7 ; 10 + dw Func_f8ee0 ; 11 + dw Func_f8ee9 ; 12 + dw Func_f8ef2 ; 13 + dw Func_f8e7d ; 14 + dw Func_f8e7d ; 15 + dw Func_f8e7d ; 16 + dw Func_f8e7d ; 17 + dw Func_f8e7d ; 18 + dw Func_f8f94 ; 19 + + dw Func_f8efb ; 1a + dw Func_f8f04 ; 1b + dw Func_f8f0d ; 1c + dw Func_f8f16 ; 1d + dw Func_f8f1f ; 1e + dw Func_f8efb ; 1f + dw Func_f8f04 ; 20 + dw Func_f8f0d ; 21 + dw Func_f8f16 ; 22 + dw Func_f8f1f ; 23 + dw Func_f8e7d ; 24 + dw Func_f8e7d ; 25 + dw Func_f8e7d ; 26 + dw Func_f8e7d ; 27 + dw Func_f8f94 ; 28 + + dw Func_f8f28 ; 29 + dw Func_f8f31 ; 2a + dw Func_f8f3a ; 2b + dw Func_f8f43 ; 2c + dw Func_f8e7d ; 2d + dw Func_f8e7d ; 2e + dw Func_f8e7d ; 2f + dw Func_f8e7d ; 30 + dw Func_f8f94 ; 31 + + dw Func_f8f4c ; 32 + dw Func_f8f55 ; 33 + dw Func_f8f5e ; 34 + dw Func_f8f4c ; 35 + dw Func_f8f55 ; 36 + dw Func_f8f5e ; 37 + dw Func_f8f4c ; 38 + dw Func_f8f55 ; 39 + dw Func_f8f5e ; 3a + dw Func_f8e7d ; 3b + dw Func_f8e7d ; 3c + dw Func_f8e7d ; 3d + dw Func_f8e7d ; 3e + dw Func_f8f94 ; 3f + + dw Func_f8f67 ; 40 + dw Func_f8f70 ; 41 + dw Func_f8efb ; 42 + dw Func_f8f04 ; 43 + dw Func_f8f0d ; 44 + dw Func_f8f16 ; 45 + dw Func_f8f1f ; 46 + dw Func_f8f67 ; 47 + dw Func_f8f70 ; 48 + dw Func_f8e7d ; 49 + dw Func_f8e7d ; 4a + dw Func_f8e7d ; 4b + dw Func_f8f94 ; 4c + + dw Func_f8ec5 ; 4d + dw Func_f8ece ; 4e + dw Func_f8ed7 ; 4f + dw Func_f8ee0 ; 50 + dw Func_f8ee9 ; 51 + dw Func_f8ef2 ; 52 + dw Func_f8e7d ; 53 + dw Func_f8f67 ; 54 + dw Func_f8f70 ; 55 + dw Func_f8f67 ; 56 + dw Func_f8f70 ; 57 + dw Func_f8e7d ; 58 + dw Func_f8e7d ; 59 + dw Func_f8e7d ; 5a + dw Func_f8f94 ; 5b + + dw Func_f8efb ; 5c + dw Func_f8f04 ; 5d + dw Func_f8f0d ; 5e + dw Func_f8f16 ; 5f + dw Func_f8f1f ; 60 + dw Func_f8f28 ; 61 + dw Func_f8f31 ; 62 + dw Func_f8f3a ; 63 + dw Func_f8f43 ; 64 + dw Func_f8e7d ; 65 + dw Func_f8e7d ; 66 + dw Func_f8e7d ; 67 + dw Func_f8e7d ; 68 + dw Func_f8f94 ; 69 + + dw Func_f8e86 ; 6a + dw Func_f8e8f ; 6b + dw Func_f8e98 ; 6c + dw Func_f8ea1 ; 6d + dw Func_f8eaa ; 6e + dw Func_f8eb3 ; 6f + dw Func_f8ebc ; 70 + dw Func_f8f9d ; 71 + + dw Func_f8e7d ; 72 + dw Func_f8f79 ; 73 + dw Func_f8f82 ; 74 + dw Func_f8f82 ; 75 + dw Func_f8f82 ; 76 + dw Func_f8f82 ; 77 + dw Func_f8f82 ; 78 + dw Func_f8f82 ; 79 + dw Func_f8f82 ; 7a + dw Func_f8f8b ; 7b + +SurfingMinigameWaveFunction_NoWave: ld a, [wc5e5] cp $16 - jr c, .asm_f8e5a - jr z, .asm_f8e56 - jr nc, .asm_f8e6e -.asm_f8e56 + jr c, .check_param + jr z, .big_kahuna + jr nc, .got_wave +.big_kahuna ld a, $6a - jr .asm_f8e6b + jr .got_next_fn -.asm_f8e5a +.check_param ld a, [wc5d5] and a - jr z, .asm_f8e6e + jr z, .got_wave dec a and $7 ld e, a @@ -2109,9 +2135,9 @@ Func_f8e4b: ld hl, Unkn_f8e75 add hl, de ld a, [hl] -.asm_f8e6b - ld [wc5d3], a -.asm_f8e6e +.got_next_fn + ld [wSurfingMinigameWaveFunctionNumber], a +.got_wave lb bc, $74, $74 ld de, Unkn_f973d ret @@ -2122,215 +2148,215 @@ Unkn_f8e75: Func_f8e7d: lb bc, $74, $74 ld de, Unkn_f973d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8e86: lb bc, $74, $6c ld de, Unkn_f9745 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8e8f: lb bc, $64, $5c ld de, Unkn_f974d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8e98: lb bc, $54, $4c ld de, Unkn_f9755 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ea1: lb bc, $44, $44 ld de, Unkn_f975d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8eaa: lb bc, $44, $4c ld de, Unkn_f9765 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8eb3: lb bc, $54, $5c ld de, Unkn_f976d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ebc: lb bc, $64, $6c ld de, Unkn_f9775 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ec5: lb bc, $74, $6c ld de, Unkn_f977d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ece: lb bc, $64, $5c ld de, Unkn_f9785 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ed7: lb bc, $54, $4c ld de, Unkn_f978d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ee0: lb bc, $4c, $4c ld de, Unkn_f9795 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ee9: lb bc, $54, $5c ld de, Unkn_f979d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8ef2: lb bc, $64, $6c ld de, Unkn_f97a5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8efb: lb bc, $74, $6c ld de, Unkn_f97ad - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f04: lb bc, $64, $5c ld de, Unkn_f97b5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f0d: lb bc, $54, $54 ld de, Unkn_f97bd - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f16: lb bc, $54, $5c ld de, Unkn_f97c5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f1f: lb bc, $64, $6c ld de, Unkn_f97cd - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f28: lb bc, $74, $6c ld de, Unkn_f97d5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f31: lb bc, $64, $5c ld de, Unkn_f97dd - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f3a: lb bc, $5c, $5c ld de, Unkn_f97e5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f43: lb bc, $64, $6c ld de, Unkn_f97ed - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f4c: lb bc, $74, $6c ld de, Unkn_f97f5 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f55: lb bc, $64, $64 ld de, Unkn_f97fd - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f5e: lb bc, $64, $6c ld de, Unkn_f9805 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f67: lb bc, $74, $6c ld de, Unkn_f980d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f70: lb bc, $6c, $6c ld de, Unkn_f9815 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f79: lb bc, $74, $74 ld de, Unkn_f981d - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f82: lb bc, $74, $74 ld de, Unkn_f9825 - jp Func_f8fa9 + jp SurfingMinigameWaveFunction_GoToNextWaveFunction Func_f8f8b: lb bc, $74, $74 ld de, Unkn_f9825 - jp Func_f8fae + jp SurfingMinigameWaveFunction_ResetWaveFunction Func_f8f94: lb bc, $74, $74 ld de, Unkn_f973d - jp Func_f8fae + jp SurfingMinigameWaveFunction_ResetWaveFunction Func_f8f9d: lb bc, $74, $74 ld de, Unkn_f973d ret -Func_f8fa4: +Func_f8fa4: ; unused inc a - ld [wc5d3], a + ld [wSurfingMinigameWaveFunctionNumber], a ret -Func_f8fa9: - ld hl, wc5d3 +SurfingMinigameWaveFunction_GoToNextWaveFunction: + ld hl, wSurfingMinigameWaveFunctionNumber inc [hl] ret -Func_f8fae: +SurfingMinigameWaveFunction_ResetWaveFunction: xor a - ld [wc5d3], a + ld [wSurfingMinigameWaveFunctionNumber], a ret -Func_f8fb3: - call Func_f9279 +SurfingPikachuMinigameIntro: + call SurfingPikachu_ClearTileMap call ClearSprites call DisableLCD xor a ld [H_AUTOBGTRANSFERENABLED], a call ClearObjectAnimationBuffers - ld hl, $6324 + ld hl, SurfingPikachu1Graphics3 ld de, $8800 ld bc, $900 - ld a, $20 + ld a, BANK(SurfingPikachu1Graphics3) call FarCopyData - ld a, Unkn_f93d3 % $100 + ld a, SurfingPikachuSpawnStateDataPointer % $100 ld [wAnimatedObjectSpawnStateDataPointer], a - ld a, Unkn_f93d3 / $100 + ld a, SurfingPikachuSpawnStateDataPointer / $100 ld [wAnimatedObjectSpawnStateDataPointer + 1], a - ld a, Jumptable_f93fa % $100 + ld a, SurfingPikachuObjectJumptable % $100 ld [wAnimatedObjectJumptablePointer], a - ld a, Jumptable_f93fa / $100 + ld a, SurfingPikachuObjectJumptable / $100 ld [wAnimatedObjectJumptablePointer + 1], a - ld a, Unkn_f9507 % $100 + ld a, SurfingPikachuOAMData % $100 ld [wAnimatedObjectOAMDataPointer], a - ld a, Unkn_f9507 / $100 + ld a, SurfingPikachuOAMData / $100 ld [wAnimatedObjectOAMDataPointer + 1], a - ld a, Unkn_f9405 % $100 + ld a, SurfingPikachuFrames % $100 ld [wAnimatedObjectFramesDataPointer], a - ld a, Unkn_f9405 / $100 + ld a, SurfingPikachuFrames / $100 ld [wAnimatedObjectFramesDataPointer + 1], a ld a, $c lb de, $74, $58 call SpawnAnimatedObject - call Func_f9053 + call DrawSurfingPikachuMinigameIntroBackground xor a ld [hSCX], a ld [hSCY], a @@ -2345,7 +2371,7 @@ Func_f8fb3: call DelayFrame call DelayFrame call DelayFrame - call Func_f81e9 + call SurfingPikachuMinigame_SetBGPals ld a, $e4 ld [rOBP0], a ld a, $e0 @@ -2357,9 +2383,9 @@ Func_f8fb3: ld c, BANK(Music_SurfingPikachu) call PlayMusic xor a - ld [wc633], a + ld [wSurfingMinigameIntroAnimationFinished], a .loop - ld a, [wc633] + ld a, [wSurfingMinigameIntroAnimationFinished] and a ret nz ld a, $0 @@ -2368,7 +2394,7 @@ Func_f8fb3: call DelayFrame jr .loop -Func_f9053: +DrawSurfingPikachuMinigameIntroBackground: ld hl, wTileMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $ff @@ -2434,32 +2460,32 @@ Tilemap_f91ac: INCBIN "gfx/unknown_f91ac.map" Tilemap_f91bb: INCBIN "gfx/unknown_f91bb.map" Tilemap_f91c8: INCBIN "gfx/unknown_f91c8.map" -Func_f9210: - ld hl, wc710 - ld de, wc710 + 1 +SurfingMinigame_UpdateLYOverrides: + ld hl, wLYOverrides + $10 + ld de, wLYOverrides + $11 ld c, $80 ld a, [hl] push af -.asm_f921a +.loop ld a, [de] inc de ld [hli], a dec c - jr nz, .asm_f921a + jr nz, .loop pop af ld [hl], a ret -Func_f9223: - ld hl, wc700 - ld bc, $100 +SurfingMinigame_InitScanlineOverrides: + ld hl, wLYOverrides + ld bc, wLYOverridesEnd - wLYOverrides ld de, $0 -.asm_f922c +.loop ld a, e and $1f ld e, a push hl - ld hl, Unkn_f96c5 + ld hl, SurfingMinigame_LYOverridesInitialSineWave add hl, de ld a, [hl] pop hl @@ -2468,21 +2494,21 @@ Func_f9223: dec bc ld a, c or b - jr nz, .asm_f922c + jr nz, .loop ret -Func_f923f: +SurfingPikachu_GetJoypad_3FrameBuffer: call Joypad ld a, [H_FRAMECOUNTER] and a - jr nz, .asm_f9250 + jr nz, .delayed ld a, [hJoyHeld] ld [hJoy5], a ld a, $2 ld [H_FRAMECOUNTER], a ret -.asm_f9250 +.delayed xor a ld [hJoy5], a ret @@ -2508,7 +2534,7 @@ SurfingPikachuMinigame_NormalPals: call UpdateGBCPal_OBP1 ret -Func_f9279: +SurfingPikachu_ClearTileMap: ld hl, wTileMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a @@ -2521,30 +2547,32 @@ Func_f9284: ld [wc5ee], a ret -Func_f928c: +SurfingMinigame_UpdatePikachuHeight: ld a, [wc5ed] and a - jr nz, .asm_f92e4 + jr nz, .positive ld a, [wc5ec] ld d, a ld a, [wc5ee] or d - jr z, .asm_f92dd + jr z, .done ld a, [wc5ee] ld e, a - ld hl, $ff80 + ld hl, -$80 add hl, de ld a, l ld [wc5ee], a ld a, h ld [wc5ec], a + + ; -(4 * a ** 2) ld e, a ld d, $0 - call Func_f9340 + call SurfingMinigame_NTimesDE ld e, l ld d, h ld a, $4 - call Func_f9340 + call SurfingMinigame_NTimesDE ld a, l xor $ff inc a @@ -2552,43 +2580,46 @@ Func_f928c: ld a, h xor $ff ld h, a + push hl - ld hl, $5 + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld d, [hl] - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld e, [hl] pop hl + add hl, de ld e, l ld d, h - ld hl, $5 + + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], d - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], e and a ret -.asm_f92dd +.done ld a, $1 ld [wc5ed], a and a ret -.asm_f92e4 - ld a, [wc5ea] +.positive + ld a, [wSurfingMinigamePikachuObjectHeight] ld e, a - ld hl, $5 + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld a, [hl] cp $90 - jr nc, .asm_f92f4 + jr nc, .okay cp e - jr nc, .asm_f9330 -.asm_f92f4 + jr nc, .reset +.okay ld a, [wc5ec] ld d, a ld a, [wc5ee] @@ -2599,58 +2630,63 @@ Func_f928c: ld [wc5ee], a ld a, h ld [wc5ec], a + + ; 4 * a ** 2 ld e, a ld d, $0 - call Func_f9340 + call SurfingMinigame_NTimesDE ld e, l ld d, h ld a, $4 - call Func_f9340 + call SurfingMinigame_NTimesDE + push hl - ld hl, $5 + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld d, [hl] - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld e, [hl] pop hl + add hl, de ld e, l ld d, h - ld hl, $5 + + ld hl, ANIM_OBJ_Y_COORD add hl, bc ld [hl], d - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], e and a ret -.asm_f9330 - ld hl, $5 +.reset + ld hl, ANIM_OBJ_Y_COORD add hl, bc - ld a, [wc5ea] + ld a, [wSurfingMinigamePikachuObjectHeight] ld [hl], a - ld hl, $c + ld hl, ANIM_OBJ_FIELD_C add hl, bc ld [hl], $0 scf ret -Func_f9340: +SurfingMinigame_NTimesDE: ld hl, $0 -.asm_f9343 +.loop srl a - jr nc, .asm_f9348 + jr nc, .no_add add hl, de -.asm_f9348 +.no_add sla e rl d and a - jr nz, .asm_f9343 + jr nz, .loop ret -Func_f9350: +SurfingPikachu_PlaceBCDNumber: ld c, a swap a and $f @@ -2663,77 +2699,77 @@ Func_f9350: dec de ret -Func_f9360: ; cosine +SurfingPikachu_Cosine: ; cosine add $10 -Func_f9362: ; sine +SurfingPikachu_Sine: ; sine and $3f cp $20 - jr nc, .asm_f936d - call Func_f9377 + jr nc, .positive + call .GetSine ld a, h ret -.asm_f936d +.positive and $1f - call Func_f9377 + call .GetSine ld a, h xor $ff inc a ret -Func_f9377: +.GetSine: ld e, a ld a, d ld d, $0 - ld hl, Unkn_f9393 + ld hl, .SineWave add hl, de add hl, de ld e, [hl] inc hl ld d, [hl] ld hl, $0 -.asm_f9386 +.loop srl a - jr nc, .asm_f938b + jr nc, .no_add add hl, de -.asm_f938b +.no_add sla e rl d and a - jr nz, .asm_f9386 + jr nz, .loop ret -Unkn_f9393: +.SineWave: sine_wave $100 -Unkn_f93d3: - db $00, $00, $00 - db $04, $01, $00 - db $11, $02, $00 - db $12, $02, $00 - db $15, $00, $00 - db $16, $00, $00 - db $17, $00, $00 - db $18, $00, $00 - db $19, $00, $00 - db $1a, $00, $00 - db $14, $00, $00 - db $13, $03, $00 - db $1b, $04, $00 - -Jumptable_f93fa: - dw Func_f9404 - dw Func_f8470 - dw Func_f87fb - dw Func_f880b - dw Func_f882b - -Func_f9404: +SurfingPikachuSpawnStateDataPointer: + db $00, $00, $00 ; 0 + db $04, $01, $00 ; 1 + db $11, $02, $00 ; 2 + db $12, $02, $00 ; 3 + db $15, $00, $00 ; 4 + db $16, $00, $00 ; 5 + db $17, $00, $00 ; 6 + db $18, $00, $00 ; 7 + db $19, $00, $00 ; 8 + db $1a, $00, $00 ; 9 + db $14, $00, $00 ; a + db $13, $03, $00 ; b + db $1b, $04, $00 ; c + +SurfingPikachuObjectJumptable: + dw SurfingMinigameAnimatedObjectFn_nop ; 0 + dw SurfingMinigameAnimatedObjectFn_Pikachu ; 1 + dw Func_f87fb ; 2 + dw SurfingMinigameAnimatedObjectFn_FlippingPika ; 3 + dw SurfingMinigameAnimatedObjectFn_IntroAnimationPikachu ; 4 + +SurfingMinigameAnimatedObjectFn_nop: ret INCLUDE "data/animated_objects_3e_1.asm" -Unkn_f96c5: +SurfingMinigame_LYOverridesInitialSineWave: ; a sine wave with amplitude 2 db 0, 0, 0, 1, 1, 1, 1, 2 db 2, 2, 1, 1, 1, 1, 0, 0 @@ -2741,28 +2777,28 @@ Unkn_f96c5: db -2, -2, -1, -1, -1, -1, 0, 0 Unkn_f96e5: - db $00, $00, $00, $00 - db $0b, $0b, $0b, $0b - db $0b, $02, $02, $06 - db $03, $0b, $07, $03 - db $06, $06, $06, $06 - db $07, $07, $07, $07 - db $06, $04, $04, $08 - db $05, $07, $08, $05 - db $0b, $0b, $11, $12 - db $0b, $0b, $13, $03 - db $14, $12, $04, $08 - db $13, $07, $08, $05 - db $06, $14, $06, $14 - db $13, $07, $13, $07 - db $08, $08, $08, $08 - db $14, $12, $14, $12 - db $0b, $11, $02, $14 - db $06, $14, $06, $14 - db $0c, $0c, $0d, $0d - db $0d, $0d, $0d, $0d - db $0e, $0f, $10, $0b - db $12, $13, $12, $13 + db $00, $00, $00, $00 ; 00 + db $0b, $0b, $0b, $0b ; 01 + db $0b, $02, $02, $06 ; 02 + db $03, $0b, $07, $03 ; 03 + db $06, $06, $06, $06 ; 04 + db $07, $07, $07, $07 ; 05 + db $06, $04, $04, $08 ; 06 + db $05, $07, $08, $05 ; 07 + db $0b, $0b, $11, $12 ; 08 + db $0b, $0b, $13, $03 ; 09 + db $14, $12, $04, $08 ; 0a + db $13, $07, $08, $05 ; 0b + db $06, $14, $06, $14 ; 0c + db $13, $07, $13, $07 ; 0d + db $08, $08, $08, $08 ; 0e + db $14, $12, $14, $12 ; 0f + db $0b, $11, $02, $14 ; 10 + db $06, $14, $06, $14 ; 11 + db $0c, $0c, $0d, $0d ; 12 + db $0d, $0d, $0d, $0d ; 13 + db $0e, $0f, $10, $0b ; 14 + db $12, $13, $12, $13 ; 15 Unkn_f973d: db $00, $00, $00, $01, $01, $01, $01, $01 diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index c6068813..2cfcc445 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -1,4 +1,4 @@ -SetDefaultNamesBeforeTitlescreen: ; 414b (1:414b) +SetDefaultNamesBeforeTitlescreen: ld hl, NintenText ld de, wPlayerName call CopyFixedLengthText @@ -16,7 +16,7 @@ SetDefaultNamesBeforeTitlescreen: ; 414b (1:414b) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a -DisplayTitleScreen: ; 4171 (1:4171) +DisplayTitleScreen: call GBPalWhiteOut ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -31,7 +31,7 @@ DisplayTitleScreen: ; 4171 (1:4171) call DisableLCD call LoadFontTilePatterns ; todo: fix hl pointers - ld hl, NintendoCopyrightLogoGraphics ; 4:4c48 + ld hl, NintendoCopyrightLogoGraphics ld de, vTitleLogo + $600 ld bc, $50 ld a, BANK(NintendoCopyrightLogoGraphics) @@ -91,7 +91,7 @@ DisplayTitleScreen: ; 4171 (1:4171) call .ScrollTitleScreenPokemonLogo jr .bouncePokemonLogoLoop -.TitleScreenPokemonLogoYScrolls ; 4228 (1:4228) +.TitleScreenPokemonLogoYScrolls: ; Controls the bouncing effect of the Pokemon logo on the title screen db -4,16 ; y scroll amount, number of times to scroll db 3,4 @@ -102,7 +102,7 @@ DisplayTitleScreen: ; 4171 (1:4171) db -1,2 db 0 ; terminate list with 0 -.ScrollTitleScreenPokemonLogo ; 4237 (1:4237) +.ScrollTitleScreenPokemonLogo: ; Scrolls the Pokemon logo on the title screen to create the bouncing effect ; Scrolls d pixels e times call DelayFrame @@ -194,7 +194,7 @@ DisplayTitleScreen: ; 4171 (1:4171) .asm_42f0 ; 42f0 (1:42f0) ; unreferenced - callab Func_e8e79 + callab PrinterDebug jp .loop .asm_42fb ; 42fb (1:42fb) @@ -226,17 +226,17 @@ DisplayTitleScreen: ; 4171 (1:4171) jpba DoClearSaveDialogue -TitleScreenCopyTileMapToVRAM: ; 4332 (1:4332) +TitleScreenCopyTileMapToVRAM: ld [H_AUTOBGTRANSFERDEST + 1], a jp Delay3 -LoadCopyrightAndTextBoxTiles: ; 4337 (1:4337) +LoadCopyrightAndTextBoxTiles: xor a ld [hWY], a call ClearScreen call LoadTextBoxTilePatterns -LoadCopyrightTiles: ; 4340 (1:4340) +LoadCopyrightTiles: ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 + $600 lb bc, BANK(NintendoCopyrightLogoGraphics), (TextBoxGraphics + $10 - NintendoCopyrightLogoGraphics) / $10 ; bug: overflows into text box graphics and copies the "A" tile @@ -245,17 +245,17 @@ LoadCopyrightTiles: ; 4340 (1:4340) ld de, CopyrightTextString jp PlaceString -CopyrightTextString: ; 4355 (1:4355) +CopyrightTextString: db $60,$61,$62,$63,$61,$62,$7c,$7f,$65,$66,$67,$68,$69,$6a ; ©1995-1999 Nintendo next $60,$61,$62,$63,$61,$62,$7c,$7f,$6b,$6c,$6d,$6e,$6f,$70,$71,$72 ; ©1995-1999 Creatures inc. next $60,$61,$62,$63,$61,$62,$7c,$7f,$73,$74,$75,$76,$77,$78,$79,$7a,$7b ; ©1995-1999 GAME FREAK inc. db "@" -TitleScreen_PlayPikachuPCM: ; 4387 (1:4387) +TitleScreen_PlayPikachuPCM: callab PlayPikachuSoundClip ret -DoTitleScreenFunction: ; 4390 (1:4390) +DoTitleScreenFunction: call .CheckTimer ld a, [wTitleScreenScene] ld e, a @@ -269,7 +269,7 @@ DoTitleScreenFunction: ; 4390 (1:4390) jp [hl] -.Jumptable: ; 43a2 (1:43a2) +.Jumptable: dw .Nop dw .BlinkHalf dw .BlinkWait @@ -283,23 +283,23 @@ DoTitleScreenFunction: ; 4390 (1:4390) dw .BlinkOpen dw .GoBackToStart -.GoBackToStart: ; 43ba (1:43ba) +.GoBackToStart: xor a ld [wTitleScreenScene], a .Nop ret -.BlinkOpen: ; 43bf (1:43bf) +.BlinkOpen: ld e, 0 jr .LoadBlinkFrame -.BlinkHalf: ; 43c3 (1:43c3) +.BlinkHalf: ld e, 4 jr .LoadBlinkFrame -.BlinkClosed: ; 43c7 (1:43c7) +.BlinkClosed: ld e, 8 -.LoadBlinkFrame: ; 43c9 (1:43c9) +.LoadBlinkFrame: ld hl, wOAMBuffer + 2 ld c, 8 .loop @@ -312,12 +312,12 @@ DoTitleScreenFunction: ; 4390 (1:4390) inc hl dec c jr nz, .loop -.BlinkWait: ; 43d9 (1:43d9) +.BlinkWait: ld hl, wTitleScreenScene inc [hl] ret -.CheckTimer: ; 43de (1:43de) +.CheckTimer: ld hl, wTitleScreenTimer ld a, [hl] inc [hl] @@ -333,14 +333,14 @@ DoTitleScreenFunction: ; 4390 (1:4390) ret ; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) -CopyFixedLengthText: ; 43f3 (1:43f3) +CopyFixedLengthText: ld bc, NAME_LENGTH jp CopyData NintenText: db "NINTEN@" SonyText: db "SONY@" -IncrementResetCounter: ; 4405 (1:4405) +IncrementResetCounter: ld hl, wTitleScreenScene + 2 ld e, [hl] inc hl @@ -359,7 +359,7 @@ IncrementResetCounter: ; 4405 (1:4405) scf ret -FillSpriteBuffer0WithAA: ; 4418 (1:4418) +FillSpriteBuffer0WithAA: xor a call SwitchSRAMBankAndLatchClockData ld hl, sSpriteBuffer0 diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index cf4506bc..8b4bc4de 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -1,24 +1,24 @@ ; Leftover of Red/Blue. Seemingly unused -TitleScroll_WaitBall: ; 3749e (d:749e) +TitleScroll_WaitBall: ; Wait around for the TitleBall animation to play out. ; hi: speed ; lo: duration db $05, $05, 0 -TitleScroll_In: ; 374a1 (d:74a1) +TitleScroll_In: ; Scroll a TitleMon in from the right. ; hi: speed ; lo: duration db $a2, $94, $84, $63, $52, $31, $11, 0 -TitleScroll_Out: ; 374a9 (d:74a9) +TitleScroll_Out: ; Scroll a TitleMon out to the left. ; hi: speed ; lo: duration db $12, $22, $32, $42, $52, $62, $83, $93, 0 -TitleScroll: ; 374b2 (d:74b2) +TitleScroll: ld a, d ld bc, TitleScroll_In @@ -33,7 +33,7 @@ TitleScroll: ; 374b2 (d:74b2) ld e, 0 ; don't animate titleball .ok -_TitleScroll: ; 374c4 (d:74c4) +_TitleScroll: ld a, [bc] and a ret z @@ -69,7 +69,7 @@ _TitleScroll: ; 374c4 (d:74c4) pop bc jr _TitleScroll -.ScrollBetween ; 374ec (d:74ec) +.ScrollBetween: .wait ld a, [rLY] ; rLY cp l @@ -84,12 +84,12 @@ _TitleScroll: ; 374c4 (d:74c4) jr z, .wait2 ret -TitleBallYTable: ; 374fa (d:74fa) +TitleBallYTable: ; OBJ y-positions for the Poke Ball held by Red in the title screen. ; This is really two 0-terminated lists. Initiated with an index of 1. db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0 -TitleScreenAnimateBallIfStarterOut: ; 37506 (d:7506) +TitleScreenAnimateBallIfStarterOut: ; Animate the TitleBall if a starter just got scrolled out. ld a, [wTitleScreenScene] cp STARTER1 @@ -104,7 +104,7 @@ TitleScreenAnimateBallIfStarterOut: ; 37506 (d:7506) ld d, 0 jp _TitleScroll -GetTitleBallY: ; 3751e (d:751e) +GetTitleBallY: ; Get position e from TitleBallYTable push de push hl diff --git a/engine/town_map.asm b/engine/town_map.asm index 47812db0..cf09be7c 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -1,4 +1,4 @@ -DisplayTownMap: ; 70eb7 (1c:4eb7) +DisplayTownMap: call LoadTownMap ld hl, wUpdateSpritesEnabled ld a, [hl] @@ -27,7 +27,7 @@ DisplayTownMap: ; 70eb7 (1c:4eb7) pop af jr .enterLoop -.townMapLoop ; 70ef4 (1c:4ef4) +.townMapLoop coord hl, 0, 0 lb bc, 1, 20 call ClearScreenArea @@ -37,7 +37,7 @@ DisplayTownMap: ; 70eb7 (1c:4eb7) ld b, 0 add hl, bc ld a, [hl] -.enterLoop ; 70f08 (1c:4f08) +.enterLoop ld de, wTownMapCoords call LoadTownMapEntry ld a, [de] @@ -69,7 +69,7 @@ DisplayTownMap: ; 70eb7 (1c:4eb7) ld b, a and A_BUTTON | B_BUTTON | D_UP | D_DOWN jr z, .inputLoop - ld a, $8c + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -84,7 +84,6 @@ DisplayTownMap: ; 70eb7 (1c:4eb7) pop af ld [hl], a ret - .pressedUp ld a, [wWhichTownMapLocation] inc a @@ -113,11 +112,11 @@ DisplayTownMap: ; 70eb7 (1c:4eb7) INCLUDE "data/town_map_order.asm" -TownMapCursor: ; 70fc4 (1c:4fc4) +TownMapCursor: INCBIN "gfx/town_map_cursor.1bpp" TownMapCursorEnd: -LoadTownMap_Nest: ; 70fe4 (1c:4fe4) +LoadTownMap_Nest: call LoadTownMap ld hl, wUpdateSpritesEnabled ld a, [hl] @@ -139,17 +138,17 @@ LoadTownMap_Nest: ; 70fe4 (1c:4fe4) ld [hl], a ret -MonsNestText: ; 7100d (1c:500d) +MonsNestText: db "'s NEST@" -LoadTownMap_Fly: ; 71014 (1c:5014) +LoadTownMap_Fly: call ClearSprites call LoadTownMap ld a, $1 ld [hJoy7], a call LoadPlayerSpriteGraphics call LoadFontTilePatterns - ld de, BirdSprite ; $4d80 + ld de, BirdSprite ld b, BANK(BirdSprite) ld c, $c ld hl, vSprites + $40 @@ -205,7 +204,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014) jr z, .inputLoop bit 0, b jr nz, .pressedA - ld a, $8c ; SFX_TINK + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -213,7 +212,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014) jr nz, .pressedDown jr .pressedB .pressedA - ld a, $8e ; SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound ld a, [hl] ld [wDestinationMap], a @@ -255,10 +254,10 @@ LoadTownMap_Fly: ; 71014 (1c:5014) ld hl, wFlyLocationsList + 11 jr .pressedDown -ToText: ; 710f8 (1c:50f8) +ToText: db "To@" -BuildFlyLocationsList: ; 710fb (1c:50fb) +BuildFlyLocationsList: ld hl, wFlyLocationsList - 1 ld [hl], $ff inc hl @@ -282,11 +281,11 @@ BuildFlyLocationsList: ; 710fb (1c:50fb) ld [hl], $ff ret -TownMapUpArrow: ; 7111e (1c:511e) +TownMapUpArrow: INCBIN "gfx/up_arrow.1bpp" TownMapUpArrowEnd: -LoadTownMap: ; 71126 (1c:5126) +LoadTownMap: call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites @@ -299,7 +298,7 @@ LoadTownMap: ; 71126 (1c:5126) ld bc, WorldMapTileGraphicsEnd - WorldMapTileGraphics ld a, BANK(WorldMapTileGraphics) call FarCopyData - ld hl, MonNestIcon ; $574b + ld hl, MonNestIcon ld de, vSprites + $40 ld bc, MonNestIconEnd - MonNestIcon ld a, BANK(MonNestIcon) @@ -335,11 +334,11 @@ LoadTownMap: ; 71126 (1c:5126) ld [wTownMapSpriteBlinkingEnabled], a ret -CompressedMap: ; 7118a (1c:518a) +CompressedMap: ; you can decompress this file with the redrle program in the extras/ dir INCBIN "gfx/town_map.rle" -ExitTownMap: ; 71235 (1c:5235) +ExitTownMap: ; clear town map graphics data and load usual graphics data xor a ld [wTownMapSpriteBlinkingEnabled], a @@ -351,7 +350,7 @@ ExitTownMap: ; 71235 (1c:5235) call UpdateSprites jp RunDefaultPaletteCommand -DrawPlayerOrBirdSprite: ; 7124e (1c:524e) +DrawPlayerOrBirdSprite: ; a = map number ; b = OAM base tile push af @@ -366,18 +365,18 @@ DrawPlayerOrBirdSprite: ; 7124e (1c:524e) call WritePlayerOrBirdSpriteOAM pop hl ld de, wcd6d -.asm_71266 +.loop ld a, [hli] ld [de], a inc de cp "@" - jr nz, .asm_71266 + jr nz, .loop ld hl, wOAMBuffer ld de, wTileMapBackup ld bc, $a0 jp CopyData -DisplayWildLocations: ; 71279 (1c:5279) +DisplayWildLocations: callba FindWildLocationsOfMon call ZeroOutDuplicatesInList ld hl, wOAMBuffer @@ -424,10 +423,10 @@ DisplayWildLocations: ; 71279 (1c:5279) ld bc, $a0 jp CopyData -AreaUnknownText: ; 712d3 (1c:52d3) +AreaUnknownText: db " AREA UNKNOWN@" -TownMapCoordsToOAMCoords: ; 712e1 (1c:52e1) +TownMapCoordsToOAMCoords: ; in: lower nybble of a = x, upper nybble of a = y ; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24 push af @@ -445,14 +444,14 @@ TownMapCoordsToOAMCoords: ; 712e1 (1c:52e1) ld [hli], a ret -WritePlayerOrBirdSpriteOAM: ; 712f6 (1c:52f6) +WritePlayerOrBirdSpriteOAM: ld a, [wOAMBaseTile] and a ld hl, wOAMBuffer + $90 ; for player sprite jr z, WriteTownMapSpriteOAM ld hl, wOAMBuffer + $80 ; for bird sprite -WriteTownMapSpriteOAM: ; 71302 (1c:5302) +WriteTownMapSpriteOAM: push hl ; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c @@ -464,8 +463,8 @@ WriteTownMapSpriteOAM: ; 71302 (1c:5302) ld c, l pop hl -WriteAsymmetricMonPartySpriteOAM: ; 7130a (1c:530a) -; Writes 4 OAM blocks for a helix mon party sprite, since is does not have +WriteAsymmetricMonPartySpriteOAM: +; Writes 4 OAM blocks for a helix mon party sprite, since it does not have ; a vertical line of symmetry. lb de, 2, 2 .loop @@ -483,21 +482,21 @@ WriteAsymmetricMonPartySpriteOAM: ; 7130a (1c:530a) xor a ld [hli], a inc d - ld a, $8 + ld a, 8 add c ld c, a dec e jr nz, .innerLoop pop bc pop de - ld a, $8 + ld a, 8 add b ld b, a dec d jr nz, .loop ret -WriteSymmetricMonPartySpriteOAM: ; 7132f (1c:532f) +WriteSymmetricMonPartySpriteOAM: ; Writes 4 OAM blocks for a mon party sprite other than a helix. All the ; sprites other than the helix one have a vertical line of symmetry which allows ; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are @@ -539,7 +538,7 @@ WriteSymmetricMonPartySpriteOAM: ; 7132f (1c:532f) jr nz, .loop ret -ZeroOutDuplicatesInList: ; 71362 (1c:5362) +ZeroOutDuplicatesInList: ; replace duplicate bytes in the list of wild pokemon locations with 0 ld de, wBuffer .loop @@ -562,7 +561,7 @@ ZeroOutDuplicatesInList: ; 71362 (1c:5362) inc hl jr .zeroDuplicatesLoop -LoadTownMapEntry: ; 7137a (1c:537a) +LoadTownMapEntry: ; in: a = map number ; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name cp REDS_HOUSE_1F @@ -592,20 +591,15 @@ LoadTownMapEntry: ; 7137a (1c:537a) ld l, a ret -; ExternalMapEntries: ; 7139c (1c:539c) - ; dr $7139c,$7140b -; InternalMapEntries: ; 7140b (1c:540b) - ; dr $7140b,$7174b - INCLUDE "data/town_map_entries.asm" -INCLUDE "text/map_names.asm" ; TODO: relabel addresses +INCLUDE "text/map_names.asm" -MonNestIcon: ; 7174b (1c:574b) +MonNestIcon: INCBIN "gfx/mon_nest_icon.1bpp" MonNestIconEnd: -TownMapSpriteBlinkingAnimation: ; 71753 (1c:5753) +TownMapSpriteBlinkingAnimation: ld a, [wAnimCounter] inc a cp 25 diff --git a/engine/trade.asm b/engine/trade.asm index fd5eb1d1..2476ca78 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -1,4 +1,4 @@ -InternalClockTradeAnim: ; 413e5 (10:53e5) +InternalClockTradeAnim: ; Do the trading animation with the player's gameboy on the left. ; In-game trades and internally clocked link cable trades use this. ld a, [wTradedPlayerMonSpecies] @@ -8,7 +8,7 @@ InternalClockTradeAnim: ; 413e5 (10:53e5) ld de, InternalClockTradeFuncSequence jr TradeAnimCommon -ExternalClockTradeAnim: ; 413f6 (10:53f6) +ExternalClockTradeAnim: ; Do the trading animation with the player's gameboy on the right. ; Externally clocked link cable trades use this. ld a, [wTradedEnemyMonSpecies] @@ -17,7 +17,7 @@ ExternalClockTradeAnim: ; 413f6 (10:53f6) ld [wRightGBMonSpecies], a ld de, ExternalClockTradeFuncSequence -TradeAnimCommon: ; 41405 (10:5405) +TradeAnimCommon: ld a, [wOptions] push af and %110000 ; preserve speaker options @@ -70,7 +70,7 @@ tradefunc: MACRO ; They are from opposite perspectives. The external clock one makes use of ; Trade_SwapNames to swap the player and enemy names for some functions. -InternalClockTradeFuncSequence: ; 4143d (10:543d) +InternalClockTradeFuncSequence: tradefunc LoadTradingGFXAndMonNames tradefunc Trade_ShowPlayerMon tradefunc Trade_DrawOpenEndOfLinkCable @@ -89,7 +89,7 @@ InternalClockTradeFuncSequence: ; 4143d (10:543d) tradefunc Trade_Cleanup db $FF -ExternalClockTradeFuncSequence: ; 4144e (10:544e) +ExternalClockTradeFuncSequence: tradefunc LoadTradingGFXAndMonNames tradefunc Trade_ShowClearedWindow tradefunc PrintTradeWillTradeText @@ -113,7 +113,7 @@ ExternalClockTradeFuncSequence: ; 4144e (10:544e) tradefunc Trade_Cleanup db $FF -TradeFuncPointerTable: ; 41464 (10:5464) +TradeFuncPointerTable: addtradefunc LoadTradingGFXAndMonNames addtradefunc Trade_ShowPlayerMon addtradefunc Trade_DrawOpenEndOfLinkCable @@ -132,11 +132,11 @@ TradeFuncPointerTable: ; 41464 (10:5464) addtradefunc Trade_SlideTextBoxOffScreen addtradefunc Trade_SwapNames -Trade_Delay100: ; 41486 (10:5486) +Trade_Delay100: ld c, 100 jp DelayFrames -Trade_CopyTileMapToVRAM: ; 4148b (10:548b) +Trade_CopyTileMapToVRAM: ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 @@ -144,17 +144,17 @@ Trade_CopyTileMapToVRAM: ; 4148b (10:548b) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_Delay80: ; 41496 (10:5496) +Trade_Delay80: ld c, 80 jp DelayFrames -Trade_ClearTileMap: ; 4149b (10:549b) +Trade_ClearTileMap: coord hl, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " jp FillMemory -LoadTradingGFXAndMonNames: ; 414a6 (10:54a6) +LoadTradingGFXAndMonNames: call Trade_ClearTileMap call DisableLCD ld hl, TradingAnimationGraphics @@ -198,13 +198,13 @@ LoadTradingGFXAndMonNames: ; 414a6 (10:54a6) ld [wd11e], a jp GetMonName -Trade_LoadMonPartySpriteGfx: ; 41513 (10:5513) +Trade_LoadMonPartySpriteGfx: ld a, %11010000 ld [rOBP1], a call UpdateGBCPal_OBP1 jpba LoadMonPartySpriteGfx -Trade_SwapNames: ; 41522 (10:5522) +Trade_SwapNames: ld hl, wPlayerName ld de, wBuffer ld bc, NAME_LENGTH @@ -218,14 +218,14 @@ Trade_SwapNames: ; 41522 (10:5522) ld bc, NAME_LENGTH jp CopyData -Trade_Cleanup: ; 41546 (10:5546) +Trade_Cleanup: xor a call LoadGBPal ld hl, wd730 res 6, [hl] ; turn off instant text printing ret -Trade_ShowPlayerMon: ; 41550 (10:5550) +Trade_ShowPlayerMon: ld a, %10101011 ld [rLCDC], a ld a, $50 @@ -253,7 +253,7 @@ Trade_ShowPlayerMon: ; 41550 (10:5550) ld [hSCX], a dec a dec a - and a ; useless since flags are updated with dec a + and a jr nz, .slideScreenLoop call Trade_Delay80 ld a, TRADE_BALL_POOF_ANIM @@ -266,7 +266,7 @@ Trade_ShowPlayerMon: ; 41550 (10:5550) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_DrawOpenEndOfLinkCable: ; 415a2 (10:55a2) +Trade_DrawOpenEndOfLinkCable: call Trade_ClearTileMap ld b, vBGMap0 / $100 call CopyScreenTileBufferToVRAM @@ -298,7 +298,7 @@ Trade_DrawOpenEndOfLinkCable: ; 415a2 (10:55a2) jr nz, .loop ret -Trade_AnimateBallEnteringLinkCable: ; 415dc (10:55dc) +Trade_AnimateBallEnteringLinkCable: ld a, TRADE_BALL_SHAKE_ANIM call Trade_ShowAnimation ld c, 10 @@ -348,11 +348,11 @@ Trade_AnimateBallEnteringLinkCable: ; 415dc (10:55dc) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_BallInsideLinkCableOAM: ; 4163b (10:563b) +Trade_BallInsideLinkCableOAM: db $7E,$00,$7E,$20 db $7E,$40,$7E,$60 -Trade_ShowEnemyMon: ; 41643 (10:5643) +Trade_ShowEnemyMon: ld a, TRADE_BALL_TILT_ANIM call Trade_ShowAnimation call Trade_ShowClearedWindow @@ -377,7 +377,7 @@ Trade_ShowEnemyMon: ; 41643 (10:5643) call ClearScreenArea jp PrintTradeTakeCareText -Trade_AnimLeftToRight: ; 41682 (10:5682) +Trade_AnimLeftToRight: ; Animates the mon moving from the left GB to the right one. call Trade_InitGameboyTransferGfx ld a, $1 @@ -412,7 +412,7 @@ Trade_AnimLeftToRight: ; 41682 (10:5682) call Trade_AnimMonMoveVertical jp ClearSprites -Trade_AnimRightToLeft: ; 416d5 (10:56d5) +Trade_AnimRightToLeft: ; Animates the mon moving from the right GB to the left one. call Trade_InitGameboyTransferGfx xor a @@ -444,7 +444,7 @@ Trade_AnimRightToLeft: ; 416d5 (10:56d5) ld [H_AUTOBGTRANSFERENABLED], a jp ClearSprites -Trade_InitGameboyTransferGfx: ; 41720 (10:5720) +Trade_InitGameboyTransferGfx: ; Initialises the graphics for showing a mon moving between gameboys. ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -463,7 +463,7 @@ Trade_InitGameboyTransferGfx: ; 41720 (10:5720) ld [hWY], a ret -Trade_DrawLeftGameboy: ; 41741 (10:5741) +Trade_DrawLeftGameboy: call Trade_ClearTileMap ; draw link cable @@ -492,7 +492,7 @@ Trade_DrawLeftGameboy: ; 41741 (10:5741) jp DelayFrame -Trade_DrawRightGameboy: ; 4176f (10:576f) +Trade_DrawRightGameboy: call Trade_ClearTileMap ; draw horizontal segment of link cable @@ -538,7 +538,7 @@ Trade_DrawRightGameboy: ; 4176f (10:576f) jp DelayFrame -Trade_DrawCableAcrossScreen: ; 417b1 (10:57b1) +Trade_DrawCableAcrossScreen: ; Draws the link cable across the screen. call Trade_ClearTileMap coord hl, 0, 4 @@ -550,7 +550,7 @@ Trade_DrawCableAcrossScreen: ; 417b1 (10:57b1) jr nz, .loop ret -Trade_CopyCableTilesOffScreen: ; 417c0 (10:57c0) +Trade_CopyCableTilesOffScreen: ; This is used to copy the link cable tiles off screen so that the cable ; continues when the screen is scrolled. push hl @@ -566,7 +566,7 @@ Trade_CopyCableTilesOffScreen: ; 417c0 (10:57c0) ld c, 10 jp DelayFrames -Trade_AnimMonMoveHorizontal: ; 417d7 (10:57d7) +Trade_AnimMonMoveHorizontal: ; Animates the mon going through the link cable horizontally over a distance of ; b 16-pixel units. ld a, [wTradedMonMovingRight] @@ -593,7 +593,7 @@ Trade_AnimMonMoveHorizontal: ; 417d7 (10:57d7) jr nz, Trade_AnimMonMoveHorizontal ret -Trade_AnimCircledMon: ; 417fa (10:57fa) +Trade_AnimCircledMon: ; Cycles between the two animation frames of the mon party sprite, cycles ; between a circle and an oval around the mon sprite, and makes the cable flash. push de @@ -618,11 +618,11 @@ Trade_AnimCircledMon: ; 417fa (10:57fa) pop de ret -Trade_WriteCircledMonOAM: ; 4181a (10:581a) +Trade_WriteCircledMonOAM: callba WriteMonPartySpriteOAMBySpecies call Trade_WriteCircleOAM -Trade_AddOffsetsToOAMCoords: ; 41825 (10:5825) +Trade_AddOffsetsToOAMCoords: ld hl, wOAMBuffer ld c, $14 ; SCREEN_WIDTH? .loop @@ -638,7 +638,7 @@ Trade_AddOffsetsToOAMCoords: ; 41825 (10:5825) jr nz, .loop ret -Trade_AnimMonMoveVertical: ; 4183a (10:583a) +Trade_AnimMonMoveVertical: ; Animates the mon going through the link cable vertically as well as ; horizontally for a bit. The last bit of horizontal movement (when moving ; right) or the first bit of horizontal movement (when moving left) are done @@ -674,7 +674,7 @@ Trade_AnimMonMoveVertical: ; 4183a (10:583a) jr nz, .loop ret -Trade_WriteCircleOAM: ; 4186d (10:586d) +Trade_WriteCircleOAM: ; Writes the OAM blocks for the circle around the traded mon as it passes ; the link cable. ld hl, Trade_CircleOAMPointers @@ -701,7 +701,7 @@ Trade_WriteCircleOAM: ; 4186d (10:586d) jr nz, .loop ret -Trade_CircleOAMPointers: ; 41889 (10:5889) +Trade_CircleOAMPointers: dw Trade_CircleOAM0 db $08,$08 dw Trade_CircleOAM1 @@ -711,24 +711,24 @@ Trade_CircleOAMPointers: ; 41889 (10:5889) dw Trade_CircleOAM3 db $18,$18 -Trade_CircleOAM0: ; 41899 (10:5899) +Trade_CircleOAM0: db $38,$10,$39,$10 db $3A,$10,$3B,$10 -Trade_CircleOAM1: ; 418a1 (10:58a1) +Trade_CircleOAM1: db $39,$30,$38,$30 db $3B,$30,$3A,$30 -Trade_CircleOAM2: ; 418a9 (10:58a9) +Trade_CircleOAM2: db $3A,$50,$3B,$50 db $38,$50,$39,$50 -Trade_CircleOAM3: ; 418b1 (10:58b1) +Trade_CircleOAM3: db $3B,$70,$3A,$70 db $39,$70,$38,$70 ; a = species -Trade_LoadMonSprite: ; 418b9 (10:58b9) +Trade_LoadMonSprite: ld [wcf91], a ld [wd0b5], a ld [wWholeScreenPaletteMonSpecies], a @@ -744,7 +744,7 @@ Trade_LoadMonSprite: ; 418b9 (10:58b9) ld c, 10 jp DelayFrames -Trade_ShowClearedWindow: ; 418dd (10:58dd) +Trade_ShowClearedWindow: ; clears the window and covers the BG entirely with the window ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -759,7 +759,7 @@ Trade_ShowClearedWindow: ; 418dd (10:58dd) ld [hSCX], a ret -Trade_SlideTextBoxOffScreen: ; 418f4 (10:58f4) +Trade_SlideTextBoxOffScreen: ; Slides the window right until it's off screen. The window usually just has ; a text box at the bottom when this is called. However, when this is called ; after Trade_ShowEnemyMon in the external clock sequence, there is a mon pic @@ -781,18 +781,18 @@ Trade_SlideTextBoxOffScreen: ; 418f4 (10:58f4) ld [rWX], a ret -PrintTradeWentToText: ; 41913 (10:5913) +PrintTradeWentToText: ld hl, TradeWentToText call PrintText ld c, 200 call DelayFrames jp Trade_SlideTextBoxOffScreen -TradeWentToText: ; 41921 (10:5921) +TradeWentToText: TX_FAR _TradeWentToText db "@" -PrintTradeForSendsText: ; 41926 (10:5926) +PrintTradeForSendsText: ld hl, TradeForText call PrintText call Trade_Delay80 @@ -800,15 +800,15 @@ PrintTradeForSendsText: ; 41926 (10:5926) call PrintText jp Trade_Delay80 -TradeForText: ; 41938 (10:5938) +TradeForText: TX_FAR _TradeForText db "@" -TradeSendsText: ; 4193d (10:593d) +TradeSendsText: TX_FAR _TradeSendsText db "@" -PrintTradeFarewellText: ; 41942 (10:5942) +PrintTradeFarewellText: ld hl, TradeWavesFarewellText call PrintText call Trade_Delay80 @@ -817,24 +817,24 @@ PrintTradeFarewellText: ; 41942 (10:5942) call Trade_Delay80 jp Trade_SlideTextBoxOffScreen -TradeWavesFarewellText: ; 41957 (10:5957) +TradeWavesFarewellText: TX_FAR _TradeWavesFarewellText db "@" -TradeTransferredText: ; 4195c (10:595c) +TradeTransferredText: TX_FAR _TradeTransferredText db "@" -PrintTradeTakeCareText: ; 41961 (10:5961) +PrintTradeTakeCareText: ld hl, TradeTakeCareText call PrintText jp Trade_Delay80 -TradeTakeCareText: ; 4196a (10:596a) +TradeTakeCareText: TX_FAR _TradeTakeCareText db "@" -PrintTradeWillTradeText: ; 4196f (10:596f) +PrintTradeWillTradeText: ld hl, TradeWillTradeText call PrintText call Trade_Delay80 @@ -842,15 +842,15 @@ PrintTradeWillTradeText: ; 4196f (10:596f) call PrintText jp Trade_Delay80 -TradeWillTradeText: ; 41981 (10:5981) +TradeWillTradeText: TX_FAR _TradeWillTradeText db "@" -TradeforText: ; 41986 (10:5986) +TradeforText: TX_FAR _TradeforText db "@" -Trade_ShowAnimation: ; 4198b (10:598b) +Trade_ShowAnimation: ld [wAnimationID], a xor a ld [wAnimationType], a diff --git a/engine/trade2.asm b/engine/trade2.asm index a4996403..c47da36a 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,4 +1,4 @@ -Trade_PrintPlayerMonInfoText: ; 41be6 (10:5be6) +Trade_PrintPlayerMonInfoText: coord hl, 5, 0 ld de,Trade_MonInfoText call PlaceString @@ -20,7 +20,7 @@ Trade_PrintPlayerMonInfoText: ; 41be6 (10:5be6) lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber -Trade_PrintEnemyMonInfoText: ; 41c24 (10:5c24) +Trade_PrintEnemyMonInfoText: coord hl, 5, 10 ld de,Trade_MonInfoText call PlaceString @@ -42,7 +42,7 @@ Trade_PrintEnemyMonInfoText: ; 41c24 (10:5c24) lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber -Trade_MonInfoText: ; 41c62 (10:5c62) +Trade_MonInfoText: db "──",$74,$F2 db $4e ; next next "OT/" diff --git a/engine/unknown_ea3ea.asm b/engine/unknown_ea3ea.asm index 9962649d..ca5d8bff 100755 --- a/engine/unknown_ea3ea.asm +++ b/engine/unknown_ea3ea.asm @@ -1,4 +1,4 @@ -Func_ea3ea: ; ea3ea (3a:63ea) +Printer_GetMonStats: call GBPalWhiteOutWithDelay3 call ClearScreen call LoadHpBarAndStatusTilePatterns @@ -140,7 +140,7 @@ Func_ea3ea: ; ea3ea (3a:63ea) call LoadFlippedFrontSpriteByMonIndex ret -.GetNamePointer: ; ea511 (3a:6511) +.GetNamePointer: ld bc, NAME_LENGTH ld a, [wWhichPokemon] call AddNTimes @@ -148,7 +148,7 @@ Func_ea3ea: ; ea3ea (3a:63ea) ld d, h ret -.PlaceMoveName: ; ea51d (3a:651d) +.PlaceMoveName: and a jr z, .no_move ld [wPokeBallAnimData], a @@ -177,18 +177,18 @@ Func_ea3ea: ; ea3ea (3a:63ea) next "SPECIAL@" ; ea554 -.Blank: ; ea554 (3a:6554) +.Blank: db "--------------@" -GFX_ea563: ; ea563 (3a:6563) +GFX_ea563: INCBIN "gfx/stats_screen_hp.1bpp" -GFX_ea563End: ; ea56b (3a:656b) +GFX_ea563End: GFX_ea56b: INCBIN "gfx/stats_screen_lv.1bpp" -GFX_ea56bEnd: ; ea573 (3a:6573) +GFX_ea56bEnd: -Func_ea573: ; ea573 (3a:6573) +PrinterDebug_LoadGFX: ld hl, vChars1 + $7e0 ld de, GFX_ea597 lb bc, BANK(GFX_ea597), (GFX_ea597End - GFX_ea597) / 16 @@ -211,34 +211,34 @@ Func_ea573: ; ea573 (3a:6573) jr nz, .loop ret -GFX_ea597: ; ea597 (3a:6597) +GFX_ea597: INCBIN "gfx/zero_one_ea597.2bpp" GFX_ea597End: -Func_ea5b7: ; ea5b7 (3a:65b7) +PrinterDebug_ConvertStatusFlagsToTiles: ld hl, wOAMBuffer + 32 * 4 + 2 ld de, 4 ld a, [wPrinterStatusFlags] ld c, 8 -.asm_ea5c2 +.loop sla a - jr c, .asm_ea5ca + jr c, .place_1 ld [hl], $fe - jr .asm_ea5cc + jr .okay -.asm_ea5ca +.place_1 ld [hl], $ff -.asm_ea5cc +.okay add hl, de dec c - jr nz, .asm_ea5c2 + jr nz, .loop ret -Func_ea5d1: ; ea5d1 (3a:65d1) +PrinterDebug_DoFunction: ld a, [wPrinterSendState] ld e, a ld d, 0 - ld hl, Jumptable_ea5e0 + ld hl, .Jumptable add hl, de add hl, de ld a, [hli] @@ -246,7 +246,7 @@ Func_ea5d1: ; ea5d1 (3a:65d1) ld l, a jp [hl] -Jumptable_ea5e0: +.Jumptable: dw Func_ea623 dw Func_ea6d2 dw Func_ea6af @@ -267,34 +267,33 @@ Jumptable_ea5e0: dw Func_ea72f dw Func_ea732 - -Func_ea606: ; ea606 (3a:6606) +Func_ea606: ld hl, wPrinterSendState inc [hl] ret -Func_ea60b: ; ea60b (3a:660b) +Func_ea60b: ld hl, wPrinterSendState dec [hl] ret -Func_ea610: ; ea610 (3a:6610) +Func_ea610: xor a ld [wPrinterStatusFlags], a ld hl, wPrinterSendState set 7, [hl] ret -Func_ea61a: ; ea61a (3a:661a) +Func_ea61a: call Func_ea606 ret -Func_ea61e: ; ea61e (3a:661e) +Func_ea61e: xor a ld [wPrinterSendState], a ret -Func_ea623: ; ea623 (3a:6623) +Func_ea623: call Func_ea784 ld hl, Data_ea9de call Func_ea76b @@ -309,7 +308,7 @@ Func_ea623: ; ea623 (3a:6623) ld [wPrinterStatusIndicator], a ret -Func_ea645: ; ea645 (3a:6645) +Func_ea645: call Func_ea784 ld hl, wPrinterRowIndex ld a, [hl] @@ -317,7 +316,7 @@ Func_ea645: ; ea645 (3a:6645) jr z, Func_ea671 ld hl, Data_ea9ea call Func_ea76b - call Func_ea7e9 + call PrinterDebug_PrepOAMForPrinting ld a, $80 ld [wPrinterDataSize], a ld a, $2 @@ -329,7 +328,7 @@ Func_ea645: ; ea645 (3a:6645) ld [wPrinterStatusIndicator], a ret -Func_ea671: ; ea671 (3a:6671) +Func_ea671: ld a, $6 ld [wPrinterSendState], a ld hl, Data_ea9f0 @@ -341,7 +340,7 @@ Func_ea671: ; ea671 (3a:6671) call Func_ea74c ret -Func_ea68a: ; ea68a (3a:668a) +Func_ea68a: call Func_ea784 ld hl, Data_ea9e4 call Func_ea76b @@ -357,7 +356,7 @@ Func_ea68a: ; ea68a (3a:668a) ld [wPrinterStatusIndicator], a ret -Func_ea6af: ; ea6af (3a:66af) +Func_ea6af: ld hl, wPrinterSerialFrameDelay inc [hl] ld a, [hl] @@ -368,7 +367,7 @@ Func_ea6af: ; ea6af (3a:66af) call Func_ea606 ret -Func_ea6bd: ; ea6bd (3a:66bd) +Func_ea6bd: ld hl, wPrinterSerialFrameDelay inc [hl] ld a, [hl] @@ -382,7 +381,7 @@ Func_ea6bd: ; ea6bd (3a:66bd) call Func_ea60b ret -Func_ea6d2: ; ea6d2 (3a:66d2) +Func_ea6d2: call Func_ea742 ret c ld a, [wPrinterHandshake] @@ -408,7 +407,7 @@ Func_ea6d2: ; ea6d2 (3a:66d2) ld [wPrinterSendState], a ret -Func_ea701: ; ea701 (3a:6701) +Func_ea701: call Func_ea742 ret c ld a, [wPrinterStatusFlags] @@ -429,7 +428,7 @@ Func_ea701: ; ea701 (3a:6701) ld [wPrinterSendState], a ret -Func_ea721: ; ea721 (3a:6721) +Func_ea721: call Func_ea742 ret c ld a, [wPrinterStatusFlags] @@ -438,9 +437,9 @@ Func_ea721: ; ea721 (3a:6721) call Func_ea606 ret -Func_ea72f: ; ea72f (3a:672f) +Func_ea72f: call Func_ea606 -Func_ea732: ; ea732 (3a:6732) +Func_ea732: ld a, [wPrinterOpcode] and a ret nz @@ -451,7 +450,7 @@ Func_ea732: ; ea732 (3a:6732) ld [wPrinterSendState], a ret -Func_ea742: ; ea742 (3a:6742) +Func_ea742: ld a, [wPrinterOpcode] and a jr nz, .asm_ea74a @@ -462,7 +461,7 @@ Func_ea742: ; ea742 (3a:6742) scf ret -Func_ea74c: ; ea74c (3a:674c) +Func_ea74c: .asm_ea74c ld a, [wPrinterOpcode] and a @@ -480,7 +479,7 @@ Func_ea74c: ; ea74c (3a:674c) ld [rSC], a ret -Func_ea76b: ; ea76b (3a:676b) +Func_ea76b: ld a, [hli] ld [wPrinterDataHeader], a ld a, [hli] @@ -495,7 +494,7 @@ Func_ea76b: ; ea76b (3a:676b) ld [wPrinterDataHeader + 5], a ret -Func_ea784: ; ea784 (3a:6784) +Func_ea784: xor a ld hl, wPrinterDataHeader ld [hli], a @@ -508,12 +507,12 @@ Func_ea784: ; ea784 (3a:6784) xor a ld [wPrinterDataSize], a ld [wPrinterDataSize + 1], a - ld hl, wPrinterSendDataSource + ld hl, wPrinterSendDataSource1 ld bc, $280 call FillMemory ret -Func_ea7a2: ; ea7a2 (3a:67a2) +Func_ea7a2: ld hl, $0 ld bc, $4 ld de, wPrinterDataHeader @@ -522,7 +521,7 @@ Func_ea7a2: ; ea7a2 (3a:67a2) ld c, a ld a, [wPrinterDataSize + 1] ld b, a - ld de, wPrinterSendDataSource + ld de, wPrinterSendDataSource1 call Func_ea7c5 ld a, l ld [wPrinterDataHeader + 4], a @@ -530,7 +529,7 @@ Func_ea7a2: ; ea7a2 (3a:67a2) ld [wPrinterDataHeader + 5], a ret -Func_ea7c5: ; ea7c5 (3a:67c5) +Func_ea7c5: .asm_ea7c5 ld a, [de] inc de @@ -545,9 +544,9 @@ Func_ea7c5: ; ea7c5 (3a:67c5) jr nz, .asm_ea7c5 ret -Func_ea7d2: ; ea7d2 (3a:67d2) +Func_ea7d2: ld a, $1 - ld [wPrinterSendDataSource], a + ld [wPrinterSendDataSource1], a ld a, [wcae2] ld [wPrinterStatusReceived], a ld a, $e4 @@ -556,7 +555,7 @@ Func_ea7d2: ; ea7d2 (3a:67d2) ld [wc6f3], a ret -Func_ea7e9: ; ea7e9 (3a:67e9) +PrinterDebug_PrepOAMForPrinting: ld a, [wPrinterRowIndex] ld b, a ld a, [wPrinterQueueLength] @@ -573,7 +572,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) .start_working ld e, l ld d, h - ld hl, wPrinterSendDataSource + ld hl, wPrinterSendDataSource1 ld c, $28 .prep_loop ld a, [de] @@ -598,7 +597,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) or $80 .got_vram_address ld d, a - lb bc, BANK(Func_ea7e9), $1 + lb bc, BANK(PrinterDebug_PrepOAMForPrinting), $1 call CopyVideoData pop hl ld de, $10 @@ -610,7 +609,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) call .UnnecessaryCall ret -.UnnecessaryCall: ; ea834 (3a:6834) +.UnnecessaryCall: ld hl, wcbdc ld bc, $20 xor a @@ -637,7 +636,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) jr nz, .master_loop ret -.AreWePrintingThisSegment: ; ea860 (3a:6860) +.AreWePrintingThisSegment: ld a, [wPrinterRowIndex] ld b, a ld a, [wPrinterQueueLength] @@ -671,7 +670,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) and a ret -.GetVRAMAddress: ; ea886 (3a:6886) +.GetVRAMAddress: push hl inc hl inc hl @@ -690,7 +689,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) pop hl ret -.GetOAMFlags: ; ea8a1 (3a:68a1) +.GetOAMFlags: push hl inc hl inc hl @@ -700,7 +699,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) pop hl ret -.DoBitOperation: ; ea8ab (3a:68ab) +.DoBitOperation: and $60 swap a ld e, a @@ -712,29 +711,29 @@ Func_ea7e9: ; ea7e9 (3a:67e9) ld l, a jp [hl] -.Jumptable: ; ea8ba (3a:68ba) +.Jumptable: dw .nop - dw .one - dw .two + dw .xflip + dw .yflip dw .both -.nop: ; ea8c2 (3a:68c2) +.nop: ret -.one: ; ea8c3 (3a:68c3) - call .Invert +.xflip: + call .XFlip ret -.two: ; ea8c7 (3a:68c7) - call .Swap +.yflip: + call .YFlip ret -.both: ; ea8cb (3a:68cb) - call .Invert - call .Swap +.both: + call .XFlip + call .YFlip ret -.Invert: ; ea8d2 (3a:68d2) +.XFlip: ld hl, wcbdc ld c, 16 .byte_loop @@ -751,7 +750,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) jr nz, .byte_loop ret -.Swap: ; ea8e8 (3a:68e8) +.YFlip: ld hl, wcbdc ld de, wcbea ld c, $4 @@ -774,7 +773,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) jr nz, .swap_loop ret -.ApplyObjectPalettes: ; ea902 (3a:6902) +.ApplyObjectPalettes: push hl ld hl, wcbdc ld de, wcbec @@ -814,12 +813,12 @@ Func_ea7e9: ; ea7e9 (3a:67e9) pop hl ret -.ExpandPalettesToBC: ; ea936 (3a:6936) +.ExpandPalettesToBC: call .GetPaletteFunction call .ApplyPaletteFunction ret -.GetPaletteFunction: ; ea93d (3a:693d) +.GetPaletteFunction: ld e, a ld d, 0 ld hl, .PalJumptable @@ -830,38 +829,38 @@ Func_ea7e9: ; ea7e9 (3a:67e9) ld l, a jp [hl] -.PalJumptable: ; ea949 (3a:6949) +.PalJumptable: dw .Pal0 dw .Pal1 dw .Pal2 dw .Pal3 -.Pal0: ; ea951 (3a:6951) +.Pal0: ld a, [rOBP0] and $3 ret -.Pal2: ; ea956 (3a:6956) +.Pal2: ld a, [rOBP0] and $c srl a srl a ret -.Pal1: ; ea95f (3a:695f) +.Pal1: ld a, [rOBP0] and $30 swap a ret -.Pal3: ; ea966 (3a:6966) +.Pal3: ld a, [rOBP0] and $c0 rlca rlca ret -.ApplyPaletteFunction: ; ea96d (3a:696d) +.ApplyPaletteFunction: ld e, a ld d, 0 ld hl, .PalFunJumptable @@ -872,47 +871,47 @@ Func_ea7e9: ; ea7e9 (3a:67e9) ld l, a jp [hl] -.PalFunJumptable: ; ea979 (3a:6979) +.PalFunJumptable: dw .zero_zero - dw .one_zero - dw .zero_one - dw .one_one + dw .xflip_zero + dw .zero_xflip + dw .xflip_xflip -.zero_zero: ; ea981 (3a:6981) +.zero_zero: sla b sla c ret -.one_zero: ; ea986 (3a:6986) +.xflip_zero: scf rl b sla c ret -.zero_one: ; ea98c (3a:698c) +.zero_xflip: sla b scf rl c ret -.one_one: ; ea992 (3a:6992) +.xflip_xflip: scf rl b scf rl c ret -.PlaceObject: ; ea999 (3a:6999) +.PlaceObject: push hl ld a, [hli] ld c, [hl] and $8 - jr nz, .use_wc830 - ld hl, wPrinterSendDataSource + jr nz, .use_source_2 + ld hl, wPrinterSendDataSource1 jr .got_data_source -.use_wc830 - ld hl, wc830 +.use_source_2 + ld hl, wPrinterSendDataSource2 .got_data_source ld b, $0 ld a, c @@ -945,7 +944,7 @@ Func_ea7e9: ; ea7e9 (3a:67e9) pop hl ret -.GetBitMask: ; ea9d0 (3a:69d0) +.GetBitMask: push hl push de ld de, -$10 diff --git a/engine/vermilion_gym_trash_cans.asm b/engine/vermilion_gym_trash_cans.asm new file mode 100755 index 00000000..49dee50c --- /dev/null +++ b/engine/vermilion_gym_trash_cans.asm @@ -0,0 +1,108 @@ +TrashCanRandom: + ld d, 0 + ld hl, .Jumptable + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call JumpToAddress + ld e, a + ld d, 0 + ret + +.Jumptable: + dw .zero + dw .one + dw .two + dw .three + dw .four + +.zero +.one + ld a, 0 + ret + +.two + call Random + and $1 + ret + +.three ; should return to a, instead returns to b + call Random + swap a + cp 1 * $ff / 3 + ld b, 0 + ret c + cp 2 * $ff / 3 + ld b, 1 + ret c + ld b, 2 + ret + +.four + call Random + and $3 + ret + +Yellow_SampleSecondTrashCan: + ld hl, GymTrashCans3c + ld a, [wGymTrashCanIndex] + ld c, a + ld b, 0 + ld a, 9 + call AddNTimes + call AddNTimes ; ???? + ld a, [hli] + ld [hGymTrashCanRandNumMask], a + ld e, a + push hl + call TrashCanRandom + pop hl + add hl, de + add hl, de + ld a, [hli] + ld [wSecondLockTrashCanIndex], a + ld a, [hl] + ld [wSecondLockTrashCanIndex + 1], a + ret + +GymTrashCans3c: +; First byte: number of trashcan entries +; Following four byte pairs: indices for the second trash can. +; BUG: Rows that have 3 trashcan entries are sampled incorrectly. +; The sampling occurs by taking a random number and seeing which +; third of the range 0-255 the number falls in. However, it returns +; that value to the wrong register, so the result is never used. +; Instead of using an offset in [0,1,2], the offset is instead +; in the full range 0-255. This results in truly random behavior. + db 4 + db 1,3, 3,1, 1,-1, 3,-1 + db 3 + db 0,2, 2,4, 4,0, -1,-1 + db 4 + db 1,5, 5,1, 1,-1, 5,-1 + db 3 + db 0,4, 4,6, 6,0, -1,-1 + db 4 + db 1,3, 3,1, 5,5, 7,7 + db 3 + db 2,4, 4,8, 8,2, -1,-1 + db 3 + db 3,7, 7,9, 9,3, -1,-1 + db 4 + db 4,8, 6,10, 8,4, 10,6 + db 3 + db 5,7, 7,11, 11,5, -1,-1 + db 3 + db 6,10, 10,12, 12,6, -1,-1 + db 4 + db 7,9, 9,7, 11,13, 13,11 + db 3 + db 8,10, 10,14, 14,8, -1,-1 + db 4 + db 9,13, 13,9, 9,-1, 13,-1 + db 3 + db 10,12, 12,14, 14,10, -1,-1 + db 4 + db 11,13, 13,11, 11,-1, 13,-1 diff --git a/engine/yellow_intro.asm b/engine/yellow_intro.asm index 5aad4d33..3adb72b5 100755 --- a/engine/yellow_intro.asm +++ b/engine/yellow_intro.asm @@ -323,7 +323,7 @@ YellowIntroScene6: call YellowIntro_BlankPalsDelay2AndDisableLCD ld c, $5 call UpdateMusicCTimes - ld a, $42 + ld a, rSCY - $ff00 ld [hLCDCPointer], a call YellowIntro_Copy8BitSineWave ld hl, vBGMap0 @@ -359,8 +359,8 @@ YellowIntroScene7: ld hl, hSCX inc [hl] inc [hl] - ld hl, wYellowIntroSurfingPikaSineWaveBuffer - ld de, wYellowIntroSurfingPikaSineWaveBuffer + 1 + ld hl, wLYOverridesBuffer + ld de, wLYOverridesBuffer + 1 ld a, [hl] push af ld c, $ff @@ -775,8 +775,8 @@ Func_f9e9a: ret YellowIntro_Copy8BitSineWave: - ; Copy this sine wave into wYellowIntroSurfingPikaSineWaveBuffer 8 times (end just before wc900) - ld de, wYellowIntroSurfingPikaSineWaveBuffer + ; Copy this sine wave into wLYOverridesBuffer 8 times (end just before wc900) + ld de, wLYOverridesBuffer ld a, $8 .loop push af @@ -797,13 +797,13 @@ YellowIntro_Copy8BitSineWave: .SineWaveEnd: Request7TileTransferFromC810ToC710: - ld a, wc810 % $100 + ld a, $10 ld [H_VBCOPYSRC], a - ld a, wc810 / $100 + ld a, wLYOverridesBuffer / $100 ld [H_VBCOPYSRC + 1], a - ld a, wc710 % $100 + ld a, $10 ld [H_VBCOPYDEST], a - ld a, wc710 / $100 + ld a, wLYOverrides / $100 ld [H_VBCOPYDEST + 1], a ld a, $7 ld [H_VBCOPYSIZE], a diff --git a/gfx/surfing_pikachu_1a.png b/gfx/surfing_pikachu_1a.png Binary files differnew file mode 100644 index 00000000..0bc11684 --- /dev/null +++ b/gfx/surfing_pikachu_1a.png diff --git a/gfx/surfing_pikachu_1b.png b/gfx/surfing_pikachu_1b.png Binary files differnew file mode 100644 index 00000000..a64eb4c7 --- /dev/null +++ b/gfx/surfing_pikachu_1b.png diff --git a/gfx/surfing_pikachu_1c.t5.png b/gfx/surfing_pikachu_1c.t5.png Binary files differnew file mode 100644 index 00000000..eeedb243 --- /dev/null +++ b/gfx/surfing_pikachu_1c.t5.png @@ -32,7 +32,7 @@ SECTION "joypad", ROM0 [$60] SECTION "Home", ROM0 -DisableLCD:: ; 0061 (0:0061) +DisableLCD:: xor a ld [rIF], a ld a, [rIE] @@ -52,13 +52,13 @@ DisableLCD:: ; 0061 (0:0061) ld [rIE], a ret -EnableLCD:: ; 007b (0:007b) +EnableLCD:: ld a, [rLCDC] set rLCDC_ENABLE, a ld [rLCDC], a ret -ClearSprites:: ; 0082 (0:0082) +ClearSprites:: xor a ld hl, wOAMBuffer ld b, 40 * 4 @@ -68,7 +68,7 @@ ClearSprites:: ; 0082 (0:0082) jr nz, .loop ret -HideSprites:: ; 008d (0:008d) +HideSprites:: ld a, 160 ld hl, wOAMBuffer ld de, 4 @@ -87,7 +87,7 @@ INCLUDE "home/copy.asm" SECTION "Entry", ROM0 [$100] nop - jp Start ; 01ab + jp Start SECTION "Header", ROM0 [$104] @@ -101,7 +101,7 @@ SECTION "Header", ROM0 [$104] SECTION "Main", ROM0 -PlayPikachuPCM:: ; 0150 (0:0150) +PlayPikachuPCM:: ld a, [H_LOADEDROMBANK] push af ld a, b @@ -132,7 +132,7 @@ PlayPikachuPCM:: ; 0150 (0:0150) call BankswitchCommon ret -LoadNextSoundClipSample:: ; 0199 (0:0199) +LoadNextSoundClipSample:: ld a, d and $80 srl a @@ -141,33 +141,33 @@ LoadNextSoundClipSample:: ; 0199 (0:0199) sla d ret -PlaySoundClipSample:: ; 01a5 (0:01a5) +PlaySoundClipSample:: ld a, $3 .loop dec a jr nz, .loop ret -Start:: ; 01ab (0:01ab) +Start:: cp GBC jr z, .gbc xor a jr .ok .gbc - ld a, $1 + ld a, 1 .ok ld [hGBC], a jp Init -Joypad:: ; 01b9 (0:01b9) +Joypad:: homecall_jump _Joypad -ReadJoypad:: ; 01c8 (0:01c8) +ReadJoypad:: homecall_jump ReadJoypad_ INCLUDE "home/overworld.asm" -CheckForUserInterruption:: ; 10ba (0:10ba) +CheckForUserInterruption:: ; Return carry if Up + Select + B, Start or A are pressed in c frames. ; Used only in the intro and title screen. call DelayFrame @@ -197,7 +197,7 @@ CheckForUserInterruption:: ; 10ba (0:10ba) ; function to load position data for destination warp when switching maps ; INPUT: ; a = ID of destination warp within destination map -LoadDestinationWarpPosition:: ; 10d5 (0:10d5) +LoadDestinationWarpPosition:: ld b, a ld a, [H_LOADEDROMBANK] push af @@ -219,7 +219,7 @@ LoadDestinationWarpPosition:: ; 10d5 (0:10d5) ret -DrawHPBar:: ; 10f8 (0:10f8) +DrawHPBar:: ; Draw an HP bar d tiles long, and fill it to e pixels. ; If c is nonzero, show at least a sliver regardless. ; The right end of the bar changes with [wHPBarType]. @@ -300,11 +300,11 @@ DrawHPBar:: ; 10f8 (0:10f8) ; OUTPUT: ; [wcf91] = pokemon ID ; wLoadedMon = base address of pokemon data -; W_MONHDEXNUM = base address of base stats -LoadMonData:: ; 1132 (0:1132) +; wMonHeader = base address of base stats +LoadMonData:: jpab LoadMonData_ -OverwritewMoves:: ; 113a (0:113a) +OverwritewMoves:: ; Write c to [wMoves + b]. Unused. ld hl, wMoves ld e, b @@ -314,11 +314,11 @@ OverwritewMoves:: ; 113a (0:113a) ld [hl], a ret -LoadFlippedFrontSpriteByMonIndex:: ; 1144 (0:1144) +LoadFlippedFrontSpriteByMonIndex:: ld a, 1 ld [wSpriteFlipped], a -LoadFrontSpriteByMonIndex:: ; 1149 (0:1149) +LoadFrontSpriteByMonIndex:: push hl ld a, [wd11e] push af @@ -354,7 +354,7 @@ LoadFrontSpriteByMonIndex:: ; 1149 (0:1149) pop af jp BankswitchCommon -PlayCry:: ; 118b (0:118b) +PlayCry:: ; Play monster a's cry. push bc ld b, a @@ -371,7 +371,7 @@ PlayCry:: ; 118b (0:118b) pop bc ret -GetCryData:: ; 11a5 (0:11a5) +GetCryData:: ; Load cry data for monster a. dec a ld c, a @@ -401,7 +401,7 @@ GetCryData:: ; 11a5 (0:11a5) add c ret -DisplayPartyMenu:: ; 11c8 (0:11c8) +DisplayPartyMenu:: ld a, [hTilesetType] push af xor a @@ -412,7 +412,7 @@ DisplayPartyMenu:: ; 11c8 (0:11c8) call DrawPartyMenu jp HandlePartyMenuInput -GoBackToPartyMenu:: ; 11dd (0:11dd) +GoBackToPartyMenu:: ld a, [hTilesetType] push af xor a @@ -421,7 +421,7 @@ GoBackToPartyMenu:: ; 11dd (0:11dd) call RedrawPartyMenu jp HandlePartyMenuInput -PartyMenuInit:: ; 11ec (0:11ec) +PartyMenuInit:: ld a, 1 ; hardcoded bank call BankswitchHome call LoadHpBarAndStatusTilePatterns @@ -460,7 +460,7 @@ PartyMenuInit:: ; 11ec (0:11ec) ld [hl], a ; old menu item ID ret -HandlePartyMenuInput:: ; 1226 (0:1226) +HandlePartyMenuInput:: ld a, 1 ld [wMenuWrappingEnabled], a ld a, $40 @@ -523,7 +523,7 @@ HandlePartyMenuInput:: ; 1226 (0:1226) bit 1, b ; was the B button pressed? jr z, .handleSwap ; if not, handle swapping the pokemon .cancelSwap ; if the B button was pressed - callba ErasePartyMenuCursors ; 4:5e98 + callba ErasePartyMenuCursors xor a ld [wMenuItemToSwap], a ld [wPartyMenuTypeOrMessageID], a @@ -532,21 +532,21 @@ HandlePartyMenuInput:: ; 1226 (0:1226) .handleSwap ld a, [wCurrentMenuItem] ld [wWhichPokemon], a - callba SwitchPartyMon ; 4:61c5 + callba SwitchPartyMon jp HandlePartyMenuInput -PartyMenuText_12cc:: ; 12cc (0:12cc) +PartyMenuText_12cc:: TX_FAR _SleepingPikachuText1 ; 28:411b db "@" -DrawPartyMenu:: ; 12d1 (0:12d1) - ld hl, DrawPartyMenu_ ; 4:5875 +DrawPartyMenu:: + ld hl, DrawPartyMenu_ jr DrawPartyMenuCommon -RedrawPartyMenu:: ; 12d6 (0:12d6) - ld hl, RedrawPartyMenu_ ; 4:5886 +RedrawPartyMenu:: + ld hl, RedrawPartyMenu_ -DrawPartyMenuCommon:: ; 12d9 (0:12d9) +DrawPartyMenuCommon:: ld b, BANK(RedrawPartyMenu_) jp Bankswitch @@ -554,7 +554,7 @@ DrawPartyMenuCommon:: ; 12d9 (0:12d9) ; INPUT: ; de = address of status condition ; hl = destination address -PrintStatusCondition:: ; 12de (0:12de) +PrintStatusCondition:: push de dec de dec de ; de = address of current HP @@ -574,14 +574,14 @@ PrintStatusCondition:: ; 12de (0:12de) and a ret -PrintStatusConditionNotFainted: ; 12f3 (0:12f3) +PrintStatusConditionNotFainted: homecall_jump_sf PrintStatusAilment ; function to print pokemon level, leaving off the ":L" if the level is at least 100 ; INPUT: ; hl = destination address ; [wLoadedMonLevel] = level -PrintLevel:: ; 1303 (0:1303) +PrintLevel:: ld a, $6e ; ":L" tile ID ld [hli], a ld c, 2 ; number of digits @@ -597,19 +597,19 @@ PrintLevel:: ; 1303 (0:1303) ; INPUT: ; hl = destination address ; [wLoadedMonLevel] = level -PrintLevelFull:: ; 1313 (0:1313) +PrintLevelFull:: ld a, $6e ; ":L" tile ID ld [hli], a ld c, 3 ; number of digits ld a, [wLoadedMonLevel] ; level -PrintLevelCommon:: ; 131b (0:131b) +PrintLevelCommon:: ld [wd11e], a ld de, wd11e ld b, LEFT_ALIGN | 1 ; 1 byte jp PrintNumber -GetwMoves:: ; 1326 (0:1326) +GetwMoves:: ; Unused. Returns the move at index a from wMoves in a ld hl, wMoves ld c, a @@ -621,7 +621,7 @@ GetwMoves:: ; 1326 (0:1326) ; copies the base stat data of a pokemon to wMonHeader ; INPUT: ; [wd0b5] = pokemon ID -GetMonHeader:: ; 132f (0:132f) +GetMonHeader:: ld a, [H_LOADEDROMBANK] push af switchbank BaseStats @@ -648,11 +648,11 @@ GetMonHeader:: ; 132f (0:132f) predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] dec a - ld bc, 28 + ld bc, MonBaseStatsEnd - MonBaseStats ld hl, BaseStats call AddNTimes ld de, wMonHeader - ld bc, 28 + ld bc, MonBaseStatsEnd - MonBaseStats call CopyData jr .done .specialID @@ -675,12 +675,12 @@ GetMonHeader:: ; 132f (0:132f) ret ; copy party pokemon's name to wcd6d -GetPartyMonName2:: ; 1394 (0:1394) +GetPartyMonName2:: ld a, [wWhichPokemon] ; index within party ld hl, wPartyMonNicks ; this is called more often -GetPartyMonName:: ; 139a (0:139a) +GetPartyMonName:: push hl push bc call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times @@ -706,7 +706,7 @@ GetPartyMonName:: ; 139a (0:139a) ; bits 0-4: length of BCD number in bytes ; Note that bits 5 and 7 are modified during execution. The above reflects ; their meaning at the beginning of the functions's execution. -PrintBCDNumber:: ; 13ad (0:13ad) +PrintBCDNumber:: ld b, c ; save flags in b res 7, c res 6, c @@ -744,7 +744,7 @@ PrintBCDNumber:: ; 13ad (0:13ad) .done ret -PrintBCDDigit:: ; 13e4 (0:13e4) +PrintBCDDigit:: and $f and a jr z, .zeroDigit @@ -774,7 +774,7 @@ PrintBCDDigit:: ; 13e4 (0:13e4) ; uncompresses the front or back sprite of the specified mon ; assumes the corresponding mon header is already loaded ; hl contains offset to sprite pointer ($b for front or $d for back) -UncompressMonSprite:: ; 1407 (0:1407) +UncompressMonSprite:: ld bc, wMonHeader add hl, bc ld a, [hli] @@ -816,10 +816,10 @@ UncompressMonSprite:: ; 1407 (0:1407) jr c, .GotBank ld a, BANK(VictreebelPicFront) .GotBank - jp UncompressSpriteData ; 23f8 + jp UncompressSpriteData ; de: destination location -LoadMonFrontSprite:: ; 143e (0:143e) +LoadMonFrontSprite:: push de ld hl, wMonHFrontSprite - wMonHeader call UncompressMonSprite @@ -833,7 +833,7 @@ LoadMonFrontSprite:: ; 143e (0:143e) ; calculates alignment parameters to place both sprite chunks in the center of the 7*7 tile sprite buffers ; de: destination location ; a, c: sprite dimensions (in tiles of 8x8 each) -LoadUncompressedSpriteData:: ; 1672 (0:1672) +LoadUncompressedSpriteData:: push de and $f ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width @@ -879,11 +879,11 @@ LoadUncompressedSpriteData:: ; 1672 (0:1672) call AlignSpriteDataCentered ; copy and align buffer 2 to 1 (containing the LSB of the 2bpp sprite) call PrepareRTCDataAndDisableSRAM pop de - jp InterlaceMergeSpriteBuffers ; 14c7 + jp InterlaceMergeSpriteBuffers ; copies and aligns the sprite data properly inside the sprite buffer ; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area -AlignSpriteDataCentered:: ; 149f (0:149f) +AlignSpriteDataCentered:: ld a, [H_SPRITEOFFSET] ld b, $0 ld c, a @@ -909,7 +909,7 @@ AlignSpriteDataCentered:: ; 149f (0:149f) ret ; fills the sprite buffer (pointed to in hl) with zeros -ZeroSpriteBuffer:: ; 14bc (0:14bc) +ZeroSpriteBuffer:: ld bc, SPRITEBUFFERSIZE .nextByteLoop xor a @@ -923,7 +923,7 @@ ZeroSpriteBuffer:: ; 14bc (0:14bc) ; combines the (7*7 tiles, 1bpp) sprite chunks in buffer 0 and 1 into a 2bpp sprite located in buffer 1 through 2 ; in the resulting sprite, the rows of the two source sprites are interlaced ; de: output address -InterlaceMergeSpriteBuffers:: ; 14c7 (0:14c7) +InterlaceMergeSpriteBuffers:: ld a, $0 call SwitchSRAMBankAndLatchClockData push de @@ -975,7 +975,7 @@ INCLUDE "home/pikachu.asm" INCLUDE "home/lcdc.asm" -IsTilePassable:: ; 15c3 (0:15c3) +IsTilePassable:: ; sets carry if tile is passable, resets carry otherwise homecall_sf _IsTilePassable ; 1:4aaa ret @@ -992,7 +992,7 @@ INCLUDE "home/timer.asm" INCLUDE "home/audio.asm" -UpdateSprites:: ; 231c (0:231c) +UpdateSprites:: ld a, [wUpdateSpritesEnabled] dec a ret nz @@ -1010,33 +1010,33 @@ UpdateSprites:: ; 231c (0:231c) INCLUDE "data/mart_inventories.asm" -TextScriptEndingChar:: ; 23d1 (0:23d1) +TextScriptEndingChar:: db "@" -TextScriptEnd:: ; 23d2 (0:23d2) +TextScriptEnd:: ld hl, TextScriptEndingChar ret -ExclamationText:: ; 23d6 (0:23d6) +ExclamationText:: TX_FAR _ExclamationText db "@" -GroundRoseText:: ; 23db (0:23db) +GroundRoseText:: TX_FAR _GroundRoseText db "@" -BoulderText:: ; 23e0 (0:23e0) +BoulderText:: TX_FAR _BoulderText db "@" -MartSignText:: ; 23e5 (0:23e5) +MartSignText:: TX_FAR _MartSignText db "@" -PokeCenterSignText:: ; 23ea (0:23ea) +PokeCenterSignText:: TX_FAR _PokeCenterSignText db "@" -PickUpItemText:: ; 23ef (0:23ef) +PickUpItemText:: TX_ASM predef PickUpItem jp TextScriptEnd @@ -1045,7 +1045,7 @@ PickUpItemText:: ; 23ef (0:23ef) INCLUDE "home/pic.asm" -ResetPlayerSpriteData:: ; 279c (0:279c) +ResetPlayerSpriteData:: ld hl, wSpriteStateData1 call ResetPlayerSpriteData_ClearSpriteData ld hl, wSpriteStateData2 @@ -1061,24 +1061,23 @@ ResetPlayerSpriteData:: ; 279c (0:279c) ret ; overwrites sprite data with zeroes -ResetPlayerSpriteData_ClearSpriteData:: ; 27ba (0:27ba) +ResetPlayerSpriteData_ClearSpriteData:: ld bc, $10 xor a - call FillMemory ; XXX why replaced with call + ret? + call FillMemory ret - ;jp FillMemory -FadeOutAudio:: ; 27c2 (0:27c2) +FadeOutAudio:: ld a, [wAudioFadeOutControl] - and a - jr nz, .asm_27d3 + and a ; currently fading out audio? + jr nz, .fadingOut ld a, [wd72c] bit 1, a ret nz ld a, $77 ld [rNR50], a ret -.asm_27d3 +.fadingOut ld a, [wAudioFadeOutCounter] and a jr z, .counterReachedZero @@ -1089,8 +1088,8 @@ FadeOutAudio:: ; 27c2 (0:27c2) ld a, [wAudioFadeOutCounterReloadValue] ld [wAudioFadeOutCounter], a ld a, [rNR50] - and a - jr z, .asm_27fa + and a ; has the volume reached 0? + jr z, .fadeOutComplete ld b, a and $f dec a @@ -1103,7 +1102,7 @@ FadeOutAudio:: ; 27c2 (0:27c2) or c ld [rNR50], a ret -.asm_27fa +.fadeOutComplete ld a, [wAudioFadeOutControl] ld b, a xor a @@ -1115,13 +1114,13 @@ FadeOutAudio:: ; 27c2 (0:27c2) ld [wNewSoundID], a jp PlaySound -UnknownText_2812:: ; 2812 (0:2812) +UnknownText_2812:: TX_FAR _PokemonText ; 2c:749a db "@" ; this function is used to display sign messages, sprite dialog, etc. ; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID -DisplayTextID:: ; 2817 (0:2817) +DisplayTextID:: ld a, [H_LOADEDROMBANK] push af callba DisplayTextIDInit ; initialization @@ -1143,8 +1142,8 @@ DisplayTextID:: ; 2817 (0:2817) ld [wSpriteIndex], a and a jp z, DisplayStartMenu - cp TEXT_PIKACHU_ANIM ; new yellow asm - jp z, DisplayUnknownText_29c6 + cp TEXT_PIKACHU_ANIM + jp z, DisplayPikachuEmotion cp TEXT_SAFARI_GAME_OVER jp z, DisplaySafariGameOverText cp TEXT_MON_FAINTED @@ -1204,7 +1203,7 @@ DisplayTextID:: ; 2817 (0:2817) callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine - cp $f7 ; slot machine + cp $f7 ; prize menu jp z, FuncTX_GameCornerPrizeMenu cp $f6 ; cable connection NPC in Pokemon Center jr nz, .notSpecialCase @@ -1216,20 +1215,20 @@ DisplayTextID:: ; 2817 (0:2817) and a jr nz, HoldTextDisplayOpen -AfterDisplayingTextID:: ; 28c6 (0:28c6) +AfterDisplayingTextID:: ld a, [wEnteringCableClub] and a jr nz, HoldTextDisplayOpen call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text ; loop to hold the dialogue box open as long as the player keeps holding down the A button -HoldTextDisplayOpen:: ; 28cf (0:28cf) +HoldTextDisplayOpen:: call Joypad ld a, [hJoyHeld] bit 0, a ; is the A button being pressed? jr nz, HoldTextDisplayOpen -CloseTextDisplay:: ; 28d8 (0:28d8) +CloseTextDisplay:: ld a, [wCurMap] call SwitchToMapRomBank ld a, $90 @@ -1261,7 +1260,7 @@ CloseTextDisplay:: ; 28d8 (0:28d8) call BankswitchCommon jp UpdateSprites -DisplayPokemartDialogue:: ; 2915 (0:2915) +DisplayPokemartDialogue:: push hl ld hl, PokemartGreetingText call PrintText @@ -1269,15 +1268,15 @@ DisplayPokemartDialogue:: ; 2915 (0:2915) inc hl call LoadItemList ld a, PRICEDITEMLISTMENU - ld [wListMenuID], a ; selects between subtypes of menus + ld [wListMenuID], a homecall DisplayPokemartDialogue_ jp AfterDisplayingTextID -PokemartGreetingText:: ; 2938 (0:2938) +PokemartGreetingText:: TX_FAR _PokemartGreetingText db "@" -LoadItemList:: ; 293d (0:293d) +LoadItemList:: ld a, 1 ld [wUpdateSpritesEnabled], a ld a, h @@ -1293,7 +1292,7 @@ LoadItemList:: ; 293d (0:293d) jr nz, .loop ret -DisplayPokemonCenterDialogue:: ; 2955 (0:2955) +DisplayPokemonCenterDialogue:: ; zeroing these doesn't appear to serve any purpose xor a ld [$ff8b], a @@ -1304,20 +1303,20 @@ DisplayPokemonCenterDialogue:: ; 2955 (0:2955) homecall DisplayPokemonCenterDialogue_ jp AfterDisplayingTextID -DisplaySafariGameOverText:: ; 296f (0:296f) +DisplaySafariGameOverText:: callab PrintSafariGameOverText jp AfterDisplayingTextID -DisplayPokemonFaintedText:: ; 297a (0:297a) +DisplayPokemonFaintedText:: ld hl, PokemonFaintedText call PrintText jp AfterDisplayingTextID -PokemonFaintedText:: ; 2983 (0:2983) +PokemonFaintedText:: TX_FAR _PokemonFaintedText db "@" -DisplayPlayerBlackedOutText:: ; 2988 (0:2988) +DisplayPlayerBlackedOutText:: ld hl, PlayerBlackedOutText call PrintText ld a, [wd732] @@ -1335,21 +1334,21 @@ DisplayPlayerBlackedOutText:: ; 2988 (0:2988) .didnotblackoutinsafari jp HoldTextDisplayOpen -PlayerBlackedOutText:: ; 29b3 (0:29b3) +PlayerBlackedOutText:: TX_FAR _PlayerBlackedOutText db "@" -DisplayRepelWoreOffText:: ; 29b8 (0:29b8) +DisplayRepelWoreOffText:: ld hl, RepelWoreOffText call PrintText jp AfterDisplayingTextID -RepelWoreOffText:: ; 29c1 (0:29c1) +RepelWoreOffText:: TX_FAR _RepelWoreOffText db "@" -DisplayUnknownText_29c6:: ; 29c6 (0:29c6) - callab Func_fd004 ; 3f:5004 +DisplayPikachuEmotion:: + callab TalkToPikachu ; 3f:5004 jp CloseTextDisplay INCLUDE "engine/menu/start_menu.asm" @@ -1360,7 +1359,7 @@ INCLUDE "engine/menu/start_menu.asm" ; b = length of string of bytes ; OUTPUT: ; [wNumSetBits] = number of set bits -CountSetBits:: ; 2a81 (0:2a81) +CountSetBits:: ld c, 0 .loop ld a, [hli] @@ -1381,11 +1380,11 @@ CountSetBits:: ; 2a81 (0:2a81) ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney:: ; 2a98 (0:2a98) +SubtractAmountPaidFromMoney:: jpba SubtractAmountPaidFromMoney_ ; adds the amount the player sold to their money -AddAmountSoldToMoney:: ; 2aa0 (0:2aa0) +AddAmountSoldToMoney:: ld de, wPlayerMoney + 2 ld hl, $ffa1 ; total price of items ld c, 3 ; length of money in bytes @@ -1393,16 +1392,16 @@ AddAmountSoldToMoney:: ; 2aa0 (0:2aa0) ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID ; redraw money text box - ld a, $b2 ; SFX_PURCHASE - call PlaySoundWaitForCurrent ; play sound - jp WaitForSoundToFinish ; wait until sound is done playing + ld a, SFX_PURCHASE + call PlaySoundWaitForCurrent + jp WaitForSoundToFinish ; function to remove an item (in varying quantities) from the player's bag or PC box ; INPUT: ; HL = address of inventory (either wNumBagItems or wNumBoxItems) ; [wWhichPokemon] = index (within the inventory) of the item to remove ; [wItemQuantity] = quantity to remove -RemoveItemFromInventory:: ; 2abd (0:2abd) +RemoveItemFromInventory:: homecall RemoveItemFromInventory_ ret @@ -1412,7 +1411,7 @@ RemoveItemFromInventory:: ; 2abd (0:2abd) ; [wcf91] = item ID ; [wItemQuantity] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful -AddItemToInventory:: ; 2acd (0:2acd) +AddItemToInventory:: push bc homecall_sf AddItemToInventory_ pop bc @@ -1421,7 +1420,7 @@ AddItemToInventory:: ; 2acd (0:2acd) ; INPUT: ; [wListMenuID] = list menu ID ; [wListPointer] = address of the list (2 bytes) -DisplayListMenuID:: ; 2ae0 (0:2ae0) +DisplayListMenuID:: xor a ld [H_AUTOBGTRANSFERENABLED], a ; disable auto-transfer ld a, 1 @@ -1432,7 +1431,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0) ld a, $01 ; hardcoded bank jr .bankswitch .specialBattleType ; Old Man battle - ld a, $f ; BANK(DisplayBattleMenu) + ld a, BANK(DisplayBattleMenu) .bankswitch call BankswitchHome ld hl, wd730 @@ -1475,7 +1474,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0) ld c, 10 call DelayFrames -DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) +DisplayListMenuIDLoop:: xor a ld [H_AUTOBGTRANSFERENABLED], a ; disable transfer call PrintListMenuEntries @@ -1612,7 +1611,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) dec [hl] jp DisplayListMenuIDLoop -DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) +DisplayChooseQuantityMenu:: ; text box dimensions/coordinates for just quantity coord hl, 15, 9 lb bc, 1, 3 ; height and width @@ -1729,13 +1728,13 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) ld a, $ff ret -InitialQuantityText:: ; 2d28 (0:2d28) +InitialQuantityText:: db "×01@" -SpacesBetweenQuantityAndPriceText:: ; 2d2c (0:2d2c) +SpacesBetweenQuantityAndPriceText:: db " @" -ExitListMenu:: ; 2d33 (0:2d33) +ExitListMenu:: ld a, [wCurrentMenuItem] ld [wChosenMenuItem], a ld a, CANCELLED_MENU @@ -1751,7 +1750,7 @@ ExitListMenu:: ; 2d33 (0:2d33) scf ret -PrintListMenuEntries:: ; 2d52 (0:2d52) +PrintListMenuEntries:: coord hl, 5, 3 lb bc, 9, 14 call ClearScreenArea @@ -1793,7 +1792,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld a, [wListMenuID] and a jr z, .pokemonPCMenu - cp $01 + cp MOVESLISTMENU jr z, .movesMenu .itemMenu call GetItemName @@ -1939,19 +1938,19 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld de, ListMenuCancelText jp PlaceString -ListMenuCancelText:: ; 2e8c (0:2e8c) +ListMenuCancelText:: db "CANCEL@" -GetMonName:: ; 2e93 (0:2e93) +GetMonName:: push hl ld a, [H_LOADEDROMBANK] push af - ld a, BANK(MonsterNames) ; 3a + ld a, BANK(MonsterNames) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ld a, [wd11e] dec a - ld hl, MonsterNames ; 4000 + ld hl, MonsterNames ld c, 10 ld b, 0 call AddNTimes @@ -1968,7 +1967,7 @@ GetMonName:: ; 2e93 (0:2e93) pop hl ret -GetItemName:: ; 2ec4 (0:2ec4) +GetItemName:: ; given an item ID at [wd11e], store the name of the item into a string ; starting at wcd6d push hl @@ -1993,7 +1992,7 @@ GetItemName:: ; 2ec4 (0:2ec4) pop hl ret -GetMachineName:: ; 2ee8 (0:2ee8) +GetMachineName:: ; copies the name of the TM/HM in [wd11e] to wcd6d push hl push de @@ -2045,14 +2044,14 @@ GetMachineName:: ; 2ee8 (0:2ee8) pop hl ret -TechnicalPrefix:: ; 2f31 (0:2f31) +TechnicalPrefix:: db "TM" -HiddenPrefix:: ; 2f33 (0:2f33) +HiddenPrefix:: db "HM" ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID -IsItemHM:: ; 2f35 (0:2f35) +IsItemHM:: cp HM_01 jr c, .notHM cp TM_01 @@ -2063,16 +2062,16 @@ IsItemHM:: ; 2f35 (0:2f35) ; sets carry if move is an HM, clears carry if move is not an HM ; Input: a = move ID -IsMoveHM:: ; 2f3e (0:2f3e) +IsMoveHM:: ld hl, HMMoves ld de, 1 jp IsInArray -HMMoves:: ; 2f47 (0:2f47) +HMMoves:: db CUT, FLY, SURF, STRENGTH, FLASH db $ff ; terminator -GetMoveName:: ; 2f4d (0:2f4d) +GetMoveName:: push hl ld a, MOVE_NAME ld [wNameListType], a @@ -2086,7 +2085,7 @@ GetMoveName:: ; 2f4d (0:2f4d) ret ; reloads text box tile patterns, current map view, and tileset tile patterns -ReloadMapData:: ; 2f66 (0:2f66) +ReloadMapData:: ld a, [H_LOADEDROMBANK] push af ld a, [wCurMap] @@ -2101,7 +2100,7 @@ ReloadMapData:: ; 2f66 (0:2f66) ret ; reloads tileset tile patterns -ReloadTilesetTilePatterns:: ; 2f83 (0:2f83) +ReloadTilesetTilePatterns:: ld a, [H_LOADEDROMBANK] push af ld a, [wCurMap] @@ -2114,16 +2113,16 @@ ReloadTilesetTilePatterns:: ; 2f83 (0:2f83) ret ; shows the town map and lets the player choose a destination to fly to -ChooseFlyDestination:: ; 2f9a (0:2f9a) +ChooseFlyDestination:: ld hl, wd72e res 4, [hl] jpba LoadTownMap_Fly -PrinterSerial:: ; 2fa7 (0:2fa7) +PrinterSerial:: homecall PrinterSerial_ ret -SerialFunction:: ; 2fb7 (0:2fb7) +SerialFunction:: ld a, [wPrinterConnectionOpen] bit 0, a ret z @@ -2148,7 +2147,7 @@ SerialFunction:: ; 2fb7 (0:2fb7) ret ; causes the text box to close without waiting for a button press after displaying text -DisableWaitingAfterTextDisplay:: ; 2fde (0:2fde) +DisableWaitingAfterTextDisplay:: ld a, $01 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret @@ -2162,7 +2161,7 @@ DisableWaitingAfterTextDisplay:: ; 2fde (0:2fde) ; 00: unsucessful ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) -UseItem:: ; 2fe4 (0:2fe4) +UseItem:: jpba UseItem_ ; confirms the item toss and then tosses the item @@ -2173,7 +2172,7 @@ UseItem:: ; 2fe4 (0:2fe4) ; [wItemQuantity] = quantity to toss ; OUTPUT: ; clears carry flag if the item is tossed, sets carry flag if not -TossItem:: ; 2fec (0:2fec) +TossItem:: ld a, [H_LOADEDROMBANK] push af ld a, BANK(TossItem_) @@ -2193,7 +2192,7 @@ TossItem:: ; 2fec (0:2fec) ; [wIsKeyItem] = result ; 00: item is not key item ; 01: item is key item -IsKeyItem:: ; 3000 (0:3000) +IsKeyItem:: push hl push de push bc @@ -2206,11 +2205,12 @@ IsKeyItem:: ; 3000 (0:3000) ; function to draw various text boxes ; INPUT: ; [wTextBoxID] = text box ID -DisplayTextBoxID:: ; 3010 (0:3010) +; b, c = y, x cursor position (TWO_OPTION_MENU only) +DisplayTextBoxID:: homecall_sf DisplayTextBoxID_ ret -UpdateGBCPal_BGP:: ; 3021 (0:3021) +UpdateGBCPal_BGP:: push af ld a, [hGBC] and a @@ -2232,7 +2232,7 @@ UpdateGBCPal_BGP:: ; 3021 (0:3021) pop af ret -UpdateGBCPal_OBP0:: ; 3040 (0:3040) +UpdateGBCPal_OBP0:: push af ld a, [hGBC] and a @@ -2257,7 +2257,7 @@ UpdateGBCPal_OBP0:: ; 3040 (0:3040) pop af ret -UpdateGBCPal_OBP1:: ; 3061 (0:3061) +UpdateGBCPal_OBP1:: push af ld a, [hGBC] and a @@ -2282,7 +2282,7 @@ UpdateGBCPal_OBP1:: ; 3061 (0:3061) pop af ret -Func_3082:: ; 3082 (0:3082) +Func_3082:: ld a, [H_LOADEDROMBANK] push af call FadeOutAudio @@ -2294,7 +2294,7 @@ Func_3082:: ; 3082 (0:3082) ; not zero if an NPC movement script is running, the player character is ; automatically stepping down from a door, or joypad states are being simulated -IsPlayerCharacterBeingControlledByGame:: ; 309d (0:309d) +IsPlayerCharacterBeingControlledByGame:: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -2305,7 +2305,7 @@ IsPlayerCharacterBeingControlledByGame:: ; 309d (0:309d) and $80 ret -RunNPCMovementScript:: ; 30ae (0:30ae) +RunNPCMovementScript:: ld hl, wd736 bit 0, [hl] res 0, [hl] @@ -2339,14 +2339,14 @@ RunNPCMovementScript:: ; 30ae (0:30ae) .playerStepOutFromDoor jpba PlayerStepOutFromDoor -EndNPCMovementScript:: ; 30ea (0:30ea) +EndNPCMovementScript:: jpba _EndNPCMovementScript -EmptyFunc2:: ; 30f2 (0:30f2) +EmptyFunc2:: ret ; stores hl in [wTrainerHeaderPtr] -StoreTrainerHeaderPointer:: ; 30f3 (0:30f3) +StoreTrainerHeaderPointer:: ld a, h ld [wTrainerHeaderPtr], a ld a, l @@ -2355,7 +2355,7 @@ StoreTrainerHeaderPointer:: ; 30f3 (0:30f3) ; executes the current map script from the function pointer array provided in hl. ; a: map script index to execute (unless overridden by [wd733] bit 4) -ExecuteCurMapScriptInTable:: ; 30fc (0:30fc) +ExecuteCurMapScriptInTable:: push af push de call StoreTrainerHeaderPointer @@ -2374,7 +2374,7 @@ ExecuteCurMapScriptInTable:: ; 30fc (0:30fc) ld a, [wCurMapScript] ret -LoadGymLeaderAndCityName:: ; 311b (0:311b) +LoadGymLeaderAndCityName:: push de ld de, wGymCityName ld bc, $11 @@ -2391,7 +2391,7 @@ LoadGymLeaderAndCityName:: ; 311b (0:311b) ; 4 -> before battle text (into hl) ; 6 -> after battle text (into hl) ; 8 -> end battle text (into hl) -ReadTrainerHeaderInfo:: ; 312f (0:312f) +ReadTrainerHeaderInfo:: push de push af ld d, $0 @@ -2430,10 +2430,10 @@ ReadTrainerHeaderInfo:: ; 312f (0:312f) pop de ret -TrainerFlagAction:: ; 3163 (0:3163) +TrainerFlagAction:: predef_jump FlagActionPredef -TalkToTrainer:: ; 3168 (0:3168) +TalkToTrainer:: call StoreTrainerHeaderPointer xor a call ReadTrainerHeaderInfo ; read flag's bit @@ -2472,7 +2472,7 @@ TalkToTrainer:: ; 3168 (0:3168) jp StartTrainerBattle ; checks if any trainers are seeing the player and wanting to fight -CheckFightingMapTrainers:: ; 31b5 (0:31b5) +CheckFightingMapTrainers:: call CheckForEngagingTrainers ld a, [wSpriteIndex] cp $ff @@ -2498,7 +2498,7 @@ CheckFightingMapTrainers:: ; 31b5 (0:31b5) ret ; display the before battle text after the enemy trainer has walked up to the player's sprite -DisplayEnemyTrainerTextAndStartBattle:: ; 31e8 (0:31e8) +DisplayEnemyTrainerTextAndStartBattle:: ld a, [wd730] and $1 ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite @@ -2508,7 +2508,7 @@ DisplayEnemyTrainerTextAndStartBattle:: ; 31e8 (0:31e8) call DisplayTextID ; fall through -StartTrainerBattle:: ; 31f9 (0:31f9) +StartTrainerBattle:: xor a ld [wJoyIgnore], a call InitBattleEnemyParameters @@ -2521,7 +2521,7 @@ StartTrainerBattle:: ; 31f9 (0:31f9) inc [hl] ; increment map script index (next script function is usually EndTrainerBattle) ret -EndTrainerBattle:: ; 3211 (0:3211) +EndTrainerBattle:: ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] @@ -2555,7 +2555,7 @@ EndTrainerBattle:: ; 3211 (0:3211) res 4, [hl] ret nz -ResetButtonPressedAndMapScript:: ; 325d (0:325d) +ResetButtonPressedAndMapScript:: xor a ld [wJoyIgnore], a ld [hJoyHeld], a @@ -2565,11 +2565,11 @@ ResetButtonPressedAndMapScript:: ; 325d (0:325d) ret ; calls TrainerWalkUpToPlayer -TrainerWalkUpToPlayer_Bank0:: ; 326b (0:326b) +TrainerWalkUpToPlayer_Bank0:: jpba TrainerWalkUpToPlayer ; sets opponent type and mon set/lvl based on the engaging trainer data -InitBattleEnemyParameters:: ; 3273 (0:3273) +InitBattleEnemyParameters:: ld a, [wEngagedTrainerClass] ld [wCurOpponent], a ld [wEnemyMonOrTrainerClass], a @@ -2582,25 +2582,25 @@ InitBattleEnemyParameters:: ; 3273 (0:3273) ld [wCurEnemyLVL], a ret -GetSpritePosition1:: ; 328b (0:328b) +GetSpritePosition1:: ld hl, _GetSpritePosition1 jr SpritePositionBankswitch -GetSpritePosition2:: ; 3290 (0:3290) +GetSpritePosition2:: ld hl, _GetSpritePosition2 jr SpritePositionBankswitch -SetSpritePosition1:: ; 3295 (0:3295) +SetSpritePosition1:: ld hl, _SetSpritePosition1 jr SpritePositionBankswitch -SetSpritePosition2:: ; 329a (0:329a) +SetSpritePosition2:: ld hl, _SetSpritePosition2 -SpritePositionBankswitch:: ; 329d (0:329d) +SpritePositionBankswitch:: ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) jp Bankswitch ; indirect jump to one of the four functions -CheckForEngagingTrainers:: ; 32a2 (0:32a2) +CheckForEngagingTrainers:: xor a call ReadTrainerHeaderInfo ; read trainer flag's bit (unused) ld d, h ; store trainer header address in de @@ -2648,7 +2648,7 @@ CheckForEngagingTrainers:: ; 32a2 (0:32a2) ; hl = text if the player wins ; de = text if the player loses -SaveEndBattleTextPointers:: ; 32f0 (0:32f0) +SaveEndBattleTextPointers:: ld a, [H_LOADEDROMBANK] ld [wEndBattleTextRomBank], a ld a, h @@ -2663,7 +2663,7 @@ SaveEndBattleTextPointers:: ; 32f0 (0:32f0) ; loads data of some trainer on the current map and plays pre-battle music ; [wSpriteIndex]: sprite ID of trainer who is engaged -EngageMapTrainer:: ; 3306 (0:3306) +EngageMapTrainer:: ld hl, wMapSpriteExtraData ld d, $0 ld a, [wSpriteIndex] @@ -2677,7 +2677,7 @@ EngageMapTrainer:: ; 3306 (0:3306) ld [wEnemyMonAttackMod], a jp PlayTrainerMusic -PrintEndBattleText:: ; 331d (0:331d) +PrintEndBattleText:: push hl ld hl, wd72d bit 7, [hl] @@ -2700,7 +2700,7 @@ PrintEndBattleText:: ; 331d (0:331d) callba FreezeEnemyTrainerSprite jp WaitForSoundToFinish -GetSavedEndBattleTextPointer:: ; 3353 (0:3353) +GetSavedEndBattleTextPointer:: ld a, [wBattleResult] and a ; won battle @@ -2717,14 +2717,14 @@ GetSavedEndBattleTextPointer:: ; 3353 (0:3353) ld l, a ret -TrainerEndBattleText:: ; 336b (0:336b) +TrainerEndBattleText:: TX_FAR _TrainerNameText TX_ASM call GetSavedEndBattleTextPointer call TextCommandProcessor jp TextScriptEnd -PlayTrainerMusic:: ; 3379 (0:3379) +PlayTrainerMusic:: ld a, [wEngagedTrainerClass] cp OPP_SONY1 ret z @@ -2774,7 +2774,7 @@ INCLUDE "data/trainer_types.asm" ; and if so, decodes the RLE movement data ; b = player Y ; c = player X -DecodeArrowMovementRLE:: ; 3442 (0:3442) +DecodeArrowMovementRLE:: ld a, [hli] cp $ff ret z ; no match in the list @@ -2798,33 +2798,33 @@ DecodeArrowMovementRLE:: ; 3442 (0:3442) inc hl jr DecodeArrowMovementRLE -FuncTX_ItemStoragePC:: ; 33ef (0:33ef) +FuncTX_ItemStoragePC:: call SaveScreenTilesToBuffer2 ld b, BANK(PlayerPC) ld hl, PlayerPC jr bankswitchAndContinue -FuncTX_BillsPC:: ; 33f9 (0:33f9) +FuncTX_BillsPC:: call SaveScreenTilesToBuffer2 ld b, BANK(BillsPC_) ld hl, BillsPC_ jr bankswitchAndContinue -FuncTX_GameCornerPrizeMenu:: ; 3403 (0:3403) +FuncTX_GameCornerPrizeMenu:: ; XXX find a better name for this function ; special_F7 ld b, BANK(CeladonPrizeMenu) ld hl, CeladonPrizeMenu -bankswitchAndContinue:: ; 3408 (0:3408) +bankswitchAndContinue:: call Bankswitch jp HoldTextDisplayOpen ; continue to main text-engine function -FuncTX_PokemonCenterPC:: ; 340e (0:340e) +FuncTX_PokemonCenterPC:: ld b, BANK(ActivatePC) ld hl, ActivatePC jr bankswitchAndContinue -StartSimulatingJoypadStates:: ; 3415 (0:3415) +StartSimulatingJoypadStates:: xor a ld [wOverrideSimulatedJoypadStatesMask], a ld [wSpriteStateData2 + $06], a ; player's sprite movement byte 1 @@ -2832,7 +2832,7 @@ StartSimulatingJoypadStates:: ; 3415 (0:3415) set 7, [hl] ret -IsItemInBag:: ; 3422 (0:3422) +IsItemInBag:: ; given an item_id in b ; set zero flag if item isn't in player's bag ; else reset zero flag @@ -2842,7 +2842,7 @@ IsItemInBag:: ; 3422 (0:3422) and a ret -IsSurfingPikachuInParty:: ; 342a (0:342a) +IsSurfingPikachuInParty:: ; set bit 6 of wd472 if true ; also calls Func_3467, which is a bankswitch to IsStarterPikachuInOurParty ld a, [wd472] @@ -2884,7 +2884,7 @@ IsSurfingPikachuInParty:: ; 342a (0:342a) call Func_3467 ret -Func_3467:: ; 3467 (0:3467) +Func_3467:: push hl push bc callab IsStarterPikachuInOurParty @@ -2896,16 +2896,16 @@ Func_3467:: ; 3467 (0:3467) ld [wd472], a ret -DisplayPokedex:: ; 347d (0:347d) +DisplayPokedex:: ld [wd11e], a jpba _DisplayPokedex -SetSpriteFacingDirectionAndDelay:: ; 3488 (0:3488) +SetSpriteFacingDirectionAndDelay:: call SetSpriteFacingDirection ld c, 6 jp DelayFrames -SetSpriteFacingDirection:: ; 3490 (0:3490) +SetSpriteFacingDirection:: ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 @@ -2913,13 +2913,13 @@ SetSpriteFacingDirection:: ; 3490 (0:3490) ld [hl], a ret -SetSpriteImageIndexAfterSettingFacingDirection:: ; 349b (0:349b) +SetSpriteImageIndexAfterSettingFacingDirection:: ld de, -7 add hl, de ld [hl], a ret -SpriteFunc_34a1:: ; 34a1 (0:34a1) +SpriteFunc_34a1:: ld a, [H_SPRITEINDEX] swap a add $e @@ -2945,14 +2945,14 @@ SpriteFunc_34a1:: ; 34a1 (0:34a1) ; OUTPUT: ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not -ArePlayerCoordsInArray:: ; 34bc (0:34bc) +ArePlayerCoordsInArray:: ld a, [wYCoord] ld b, a ld a, [wXCoord] ld c, a ; fallthrough -CheckCoords:: ; 34c4 (0:34c4) +CheckCoords:: xor a ld [wCoordIndex], a .loop @@ -2986,7 +2986,7 @@ CheckCoords:: ; 34c4 (0:34c4) ; OUTPUT: ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not -CheckBoulderCoords:: ; 34e1 (0:34e1) +CheckBoulderCoords:: push hl ld hl, wSpriteStateData2 + $04 ld a, [H_SPRITEINDEX] @@ -3003,14 +3003,14 @@ CheckBoulderCoords:: ; 34e1 (0:34e1) pop hl jp CheckCoords -GetPointerWithinSpriteStateData1:: ; 34f9 (0:34f9) +GetPointerWithinSpriteStateData1:: ld h, $c1 jr _GetPointerWithinSpriteStateData -GetPointerWithinSpriteStateData2:: ; 34fd (0:34fd) +GetPointerWithinSpriteStateData2:: ld h, $c2 -_GetPointerWithinSpriteStateData: ; 34ff (0:34ff) +_GetPointerWithinSpriteStateData: ld a, [H_SPRITEDATAOFFSET] ld b, a ld a, [H_SPRITEINDEX] @@ -3024,7 +3024,7 @@ _GetPointerWithinSpriteStateData: ; 34ff (0:34ff) ; the final $ff will be replicated in the output list and a contains the number of bytes written ; de: input list ; hl: output list -DecodeRLEList:: ; 3509 (0:3509) +DecodeRLEList:: xor a ld [wRLEByteCount], a ; count written bytes here .listLoop @@ -3051,7 +3051,7 @@ DecodeRLEList:: ; 3509 (0:3509) ret ; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2] -SetSpriteMovementBytesToFE:: ; 3530 (0:3530) +SetSpriteMovementBytesToFE:: push hl call GetSpriteMovementByte1Pointer ld [hl], $fe @@ -3062,7 +3062,7 @@ SetSpriteMovementBytesToFE:: ; 3530 (0:3530) ret ; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF -SetSpriteMovementBytesToFF:: ; 353f (0:353f) +SetSpriteMovementBytesToFF:: push hl call GetSpriteMovementByte1Pointer ld [hl], $FF @@ -3072,7 +3072,7 @@ SetSpriteMovementBytesToFF:: ; 353f (0:353f) ret ; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte1Pointer:: ; 354b (0:354b) +GetSpriteMovementByte1Pointer:: ld h, $C2 ld a, [H_SPRITEINDEX] swap a @@ -3081,7 +3081,7 @@ GetSpriteMovementByte1Pointer:: ; 354b (0:354b) ret ; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte2Pointer:: ; 3555 (0:3555) +GetSpriteMovementByte2Pointer:: push de ld hl, wMapSpriteData ld a, [H_SPRITEINDEX] @@ -3093,7 +3093,7 @@ GetSpriteMovementByte2Pointer:: ; 3555 (0:3555) pop de ret -GetTrainerInformation:: ; 3563 (0:3563) +GetTrainerInformation:: call GetTrainerName ld a, [wLinkState] and a @@ -3127,7 +3127,7 @@ GetTrainerInformation:: ; 3563 (0:3563) ld [hl], d ret -IsFightingJessieJames:: ; 359e (0:359e) +IsFightingJessieJames:: ld a, [wTrainerClass] cp ROCKET ret nz @@ -3145,10 +3145,10 @@ IsFightingJessieJames:: ; 359e (0:359e) ld [hl], d ret -GetTrainerName:: ; 35bb (0:35bb) +GetTrainerName:: jpba GetTrainerName_ -HasEnoughMoney:: ; 35c3 (0:35c3) +HasEnoughMoney:: ; Check if the player has at least as much ; money as the 3-byte BCD value at hMoney. ld de, wPlayerMoney @@ -3156,7 +3156,7 @@ HasEnoughMoney:: ; 35c3 (0:35c3) ld c, 3 jp StringCmp -HasEnoughCoins:: ; 35ce (0:35ce) +HasEnoughCoins:: ; Check if the player has at least as many ; coins as the 2-byte BCD value at hCoins. ld de, wPlayerCoins @@ -3165,7 +3165,7 @@ HasEnoughCoins:: ; 35ce (0:35ce) jp StringCmp -BankswitchHome:: ; 35d9 (0:35d9) +BankswitchHome:: ; switches to bank # in a ; Only use this when in the home bank! ld [wBankswitchHomeTemp], a @@ -3175,7 +3175,7 @@ BankswitchHome:: ; 35d9 (0:35d9) call BankswitchCommon ret -BankswitchBack:: ; 35e8 (0:35e8) +BankswitchBack:: ; returns from BankswitchHome ld a, [wBankswitchHomeSavedROMBank] call BankswitchCommon @@ -3183,25 +3183,25 @@ BankswitchBack:: ; 35e8 (0:35e8) ; displays yes/no choice ; yes -> set carry -YesNoChoice:: ; 35ef (0:35ef) +YesNoChoice:: call SaveScreenTilesToBuffer1 call InitYesNoTextBoxParameters jr DisplayYesNoChoice -Func_35f7:: ; 35f7 (0:35f7) +Func_35f7:: ld a, TWO_OPTION_MENU ld [wTextBoxID], a call InitYesNoTextBoxParameters jp DisplayTextBoxID -InitYesNoTextBoxParameters:: ; 3602 (0:3602) +InitYesNoTextBoxParameters:: xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 14, 7 ld bc, $80f ret -YesNoChoicePokeCenter:: ; 360d (0:360d) +YesNoChoicePokeCenter:: call SaveScreenTilesToBuffer1 ld a, HEAL_CANCEL_MENU ld [wTwoOptionMenuID], a @@ -3209,20 +3209,21 @@ YesNoChoicePokeCenter:: ; 360d (0:360d) lb bc, 8, 12 jr DisplayYesNoChoice -Func_361d:: ; 361d (0:361d) +WideYesNoChoice:: ; unused call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 12, 7 lb bc, 8, 13 -DisplayYesNoChoice:: ; 362b (0:362b) + +DisplayYesNoChoice:: ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID jp LoadScreenTilesFromBuffer1 ; calculates the difference |a-b|, setting carry flag if a<b -CalcDifference:: ; 3636 (0:3636) +CalcDifference:: sub b ret nc cpl @@ -3230,11 +3231,11 @@ CalcDifference:: ; 3636 (0:3636) scf ret -MoveSprite:: ; 363d (0:363d) +MoveSprite:: ; move the sprite [H_SPRITEINDEX] with the movement pointed to by de ; actually only copies the movement data to wNPCMovementDirections for later call SetSpriteMovementBytesToFF -MoveSprite_:: ; 3640 (0:3640) +MoveSprite_:: push hl push bc call GetSpriteMovementByte1Pointer @@ -3267,7 +3268,7 @@ MoveSprite_:: ; 3640 (0:3640) ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] -DivideBytes:: ; 366e (0:366e) +DivideBytes:: push hl ld hl, hQuotient2 xor a @@ -3288,7 +3289,7 @@ DivideBytes:: ; 366e (0:366e) ret -LoadFontTilePatterns:: ; 3683 (0:3683) +LoadFontTilePatterns:: ld a, [rLCDC] bit 7, a ; is the LCD enabled? jr nz, .on @@ -3304,7 +3305,7 @@ LoadFontTilePatterns:: ; 3683 (0:3683) lb bc, BANK(FontGraphics), (FontGraphicsEnd - FontGraphics) / $8 jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank -LoadTextBoxTilePatterns:: ; 36a3 (0:36a3) +LoadTextBoxTilePatterns:: ld a, [rLCDC] bit 7, a ; is the LCD enabled? jr nz, .on @@ -3320,7 +3321,7 @@ LoadTextBoxTilePatterns:: ; 36a3 (0:36a3) lb bc, BANK(TextBoxGraphics), (TextBoxGraphicsEnd - TextBoxGraphics) / $10 jp CopyVideoData ; if LCD is on, transfer during V-blank -LoadHpBarAndStatusTilePatterns:: ; 36c3 (0:36c3) +LoadHpBarAndStatusTilePatterns:: ld a, [rLCDC] bit 7, a ; is the LCD enabled? jr nz, .on @@ -3336,7 +3337,7 @@ LoadHpBarAndStatusTilePatterns:: ; 36c3 (0:36c3) lb bc, BANK(HpBarAndStatusGraphics), (HpBarAndStatusGraphicsEnd - HpBarAndStatusGraphics) / $10 jp CopyVideoData ; if LCD is on, transfer during V-blank -UncompressSpriteFromDE:: ; 36e3 (0:36e3) +UncompressSpriteFromDE:: ; Decompress pic at a:de. ld hl, wSpriteInputPtr ld [hl], e @@ -3344,20 +3345,20 @@ UncompressSpriteFromDE:: ; 36e3 (0:36e3) ld [hl], d jp UncompressSpriteData -SaveScreenTilesToBuffer2:: ; 36ec (0:36ec) +SaveScreenTilesToBuffer2:: coord hl, 0, 0 ld de, wTileMapBackup2 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT jp CopyData -LoadScreenTilesFromBuffer2:: ; 36f8 (0:36f8) +LoadScreenTilesFromBuffer2:: call LoadScreenTilesFromBuffer2DisableBGTransfer - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret ; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled -LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3700 (0:3700) +LoadScreenTilesFromBuffer2DisableBGTransfer:: xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup2 @@ -3365,38 +3366,38 @@ LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3700 (0:3700) ld bc, SCREEN_WIDTH * SCREEN_HEIGHT jp CopyData -SaveScreenTilesToBuffer1:: ; 370f (0:370f) +SaveScreenTilesToBuffer1:: coord hl, 0, 0 ld de, wTileMapBackup ld bc, SCREEN_WIDTH * SCREEN_HEIGHT jp CopyData -LoadScreenTilesFromBuffer1:: ; 371b (0:371b) +LoadScreenTilesFromBuffer1:: xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup coord de, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret -DelayFrames:: ; 372f (0:372f) +DelayFrames:: ; wait c frames call DelayFrame dec c jr nz, DelayFrames ret -PlaySoundWaitForCurrent:: ; 3736 (0:3736) +PlaySoundWaitForCurrent:: push af call WaitForSoundToFinish pop af jp PlaySound ; Wait for sound to finish playing -WaitForSoundToFinish:: ; 373e (0:373e) +WaitForSoundToFinish:: ld a, [wLowHealthAlarm] and $80 ret nz @@ -3415,7 +3416,7 @@ WaitForSoundToFinish:: ; 373e (0:373e) pop hl ret -NamePointers:: ; 3754 (0:3754) +NamePointers:: dw MonsterNames dw MoveNames dw UnusedNames @@ -3424,7 +3425,7 @@ NamePointers:: ; 3754 (0:3754) dw wEnemyMonOT ; enemy's OT names list dw TrainerNames -GetName:: ; 3762 (0:3762) +GetName:: ; arguments: ; [wd0b5] = which name ; [wNameListType] = which list @@ -3507,7 +3508,7 @@ GetName:: ; 3762 (0:3762) call BankswitchCommon ret -GetItemPrice:: ; 37d2 (0:37d2) +GetItemPrice:: ; Stores item's price as BCD at hItemPrice (3 bytes) ; Input: [wcf91] = item id ld a, [H_LOADEDROMBANK] @@ -3515,9 +3516,9 @@ GetItemPrice:: ; 37d2 (0:37d2) ld a, [wListMenuID] cp MOVESLISTMENU ld a, BANK(ItemPrices) - jr nz, .asm_37e0 + jr nz, .ok ld a, $f ; hardcoded Bank -.asm_37e0 +.ok call BankswitchCommon ld hl, wItemPrices ld a, [hli] @@ -3527,10 +3528,10 @@ GetItemPrice:: ; 37d2 (0:37d2) cp HM_01 jr nc, .getTMPrice ld bc, $3 -.asm_37f3 +.loop add hl, bc dec a - jr nz, .asm_37f3 + jr nz, .loop dec hl ld a, [hld] ld [hItemPrice + 2], a @@ -3538,22 +3539,22 @@ GetItemPrice:: ; 37d2 (0:37d2) ld [hItemPrice + 1], a ld a, [hl] ld [hItemPrice], a - jr .asm_380b + jr .done .getTMPrice callbs GetMachinePrice -.asm_380b +.done ld de, hItemPrice pop af call BankswitchCommon ret ; copies a string from [de] to [wcf4b] -CopyStringToCF4B:: ; 3813 (0:3813) +CopyStringToCF4B:: ld hl, wcf4b ; fall through ; copies a string from [de] to [hl] -CopyString:: ; 3816 (0:3816) +CopyString:: ld a, [de] inc de ld [hli], a @@ -3576,7 +3577,7 @@ CopyString:: ; 3816 (0:3816) ; report only one button press. ; 3. Same as 2, but report no buttons as pressed if A or B is held down. ; ([hJoy7] == 1, [hJoy6] == 0) -JoypadLowSensitivity:: ; 381e (0:381e) +JoypadLowSensitivity:: call Joypad ld a, [hJoy7] ; flag and a ; get all currently pressed buttons or only newly pressed buttons? @@ -3615,7 +3616,7 @@ JoypadLowSensitivity:: ; 381e (0:381e) ld [H_FRAMECOUNTER], a ret -WaitForTextScrollButtonPress:: ; 3852 (0:3852) +WaitForTextScrollButtonPress:: ld a, [H_DOWNARROWBLINKCNT1] push af ld a, [H_DOWNARROWBLINKCNT2] @@ -3631,7 +3632,7 @@ WaitForTextScrollButtonPress:: ; 3852 (0:3852) jr z, .skipAnimation push de push bc - callab TownMapSpriteBlinkingAnimation ; 1c:5753 + callab TownMapSpriteBlinkingAnimation pop bc pop de .skipAnimation @@ -3650,13 +3651,13 @@ WaitForTextScrollButtonPress:: ; 3852 (0:3852) ret ; (unless in link battle) waits for A or B being pressed and outputs the scrolling sound effect -ManualTextScroll:: ; 388e (0:388e) +ManualTextScroll:: ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .inLinkBattle call WaitForTextScrollButtonPress call WaitForSoundToFinish - ld a, $90 ; SFX_PRESS_AB + ld a, SFX_PRESS_AB jp PlaySound .inLinkBattle ld c, 65 @@ -3669,10 +3670,10 @@ ManualTextScroll:: ; 388e (0:388e) ; FF99 = multiplier ; OUTPUT ; FF95-FF98 = product -Multiply:: ; 38a5 (0:38a5) +Multiply:: push hl push bc - callab _Multiply ; 3d:660e + callab _Multiply pop bc pop hl ret @@ -3686,7 +3687,7 @@ Multiply:: ; 38a5 (0:38a5) ; OUTPUT ; FF95-FF98 = quotient ; FF99 = remainder -Divide:: ; 38b2 (0:38b2) +Divide:: push hl push de push bc @@ -3699,7 +3700,7 @@ Divide:: ; 38b2 (0:38b2) ; This function is used to wait a short period after printing a letter to the ; screen unless the player presses the A/B button or the delay is turned off ; through the [wd730] or [wLetterPrintingDelayFlags] flags. -PrintLetterDelay:: ; 38c8 (0:38c8) +PrintLetterDelay:: ld a, [wd730] bit 6, a ret nz @@ -3745,7 +3746,7 @@ PrintLetterDelay:: ; 38c8 (0:38c8) ; Copies [hl, bc) to [de, bc - hl). ; In other words, the source data is from hl up to but not including bc, ; and the destination is de. -CopyDataUntil:: ; 3908 (0:3908) +CopyDataUntil:: ld a, [hli] ld [de], a inc de @@ -3761,10 +3762,10 @@ CopyDataUntil:: ; 3908 (0:3908) ; wWhichPokemon determines the pokemon. ; [wRemoveMonFromBox] == 0 specifies the party. ; [wRemoveMonFromBox] != 0 specifies the current box. -RemovePokemon:: ; 3914 (0:3914) +RemovePokemon:: jpab _RemovePokemon -AddPartyMon:: ; 391c (0:391c) +AddPartyMon:: push hl push de push bc @@ -3775,7 +3776,7 @@ AddPartyMon:: ; 391c (0:391c) ret ; calculates all 5 stats of current mon and writes them to [de] -CalcStats:: ; 392b (0:392b) +CalcStats:: ld c, $0 .statsLoop inc c @@ -3795,7 +3796,7 @@ CalcStats:: ; 392b (0:392b) ; c: stat to calc (HP=1, Atk=2, Def=3, Spd=4, Spc=5) ; b: consider stat exp? ; hl: base ptr to stat exp values ([hl + 2*c - 1] and [hl + 2*c]) -CalcStat:: ; 393f (0:393f) +CalcStat:: push hl push de push bc @@ -3974,17 +3975,17 @@ CalcStat:: ; 393f (0:393f) pop hl ret -AddEnemyMonToPlayerParty:: ; 3a48 (0:3a48) +AddEnemyMonToPlayerParty:: homecall_sf _AddEnemyMonToPlayerParty ret -MoveMon:: ; 3a59 (0:3a59) +MoveMon:: homecall_sf _MoveMon ret ; skips a text entries, each of size NAME_LENGTH (like trainer name, OT name, rival name, ...) ; hl: base pointer, will be incremented by NAME_LENGTH * a -SkipFixedLengthTextEntries:: ; 3a6a (0:3a6a) +SkipFixedLengthTextEntries:: and a ret z ld bc, NAME_LENGTH @@ -3994,7 +3995,7 @@ SkipFixedLengthTextEntries:: ; 3a6a (0:3a6a) jr nz, .skipLoop ret -AddNTimes:: ; 3a74 (0:3a74) +AddNTimes:: ; add bc to hl a times and a ret z @@ -4006,7 +4007,7 @@ AddNTimes:: ; 3a74 (0:3a74) ; Compare strings, c bytes in length, at de and hl. ; Often used to compare big endian numbers in battle calculations. -StringCmp:: ; 3a7b (0:3a7b) +StringCmp:: ld a, [de] cp [hl] ret nz @@ -4021,7 +4022,7 @@ StringCmp:: ; 3a7b (0:3a7b) ; b = Y coordinate of upper left corner of sprite ; c = X coordinate of upper left corner of sprite ; de = base address of 4 tile number and attribute pairs -WriteOAMBlock:: ; 3a84 (0:3a84) +WriteOAMBlock:: ld h, wOAMBuffer / $100 swap a ; multiply by 16 ld l, a @@ -4040,7 +4041,7 @@ WriteOAMBlock:: ; 3a84 (0:3a84) add c ld c, a ; lower right -.writeOneEntry ; 3aa0 (0:3aa0) +.writeOneEntry ld [hl], b ; Y coordinate inc hl ld [hl], c ; X coordinate @@ -4053,11 +4054,11 @@ WriteOAMBlock:: ; 3a84 (0:3a84) ld [hli], a ret -HandleMenuInput:: ; 3aab (0:3aab) +HandleMenuInput:: xor a ld [wPartyMenuAnimMonEnabled], a -HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) +HandleMenuInputPokemonSelection:: ld a, [H_DOWNARROWBLINKCNT1] push af ld a, [H_DOWNARROWBLINKCNT2] @@ -4076,7 +4077,7 @@ HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) ld a, [wPartyMenuAnimMonEnabled] and a ; is it a pokemon selection menu? jr z, .getJoypadState - callba AnimatePartyMon ; shake mini sprite of selected pokemon (1c:578c) + callba AnimatePartyMon ; shake mini sprite of selected pokemon .getJoypadState pop hl call JoypadLowSensitivity @@ -4156,8 +4157,8 @@ HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) bit 5, [hl] pop hl jr nz, .skipPlayingSound - ld a, $90 ; SFX_PRESS_AB - call PlaySound ; play sound + ld a, SFX_PRESS_AB + call PlaySound .skipPlayingSound pop af ld [H_DOWNARROWBLINKCNT2], a @@ -4173,7 +4174,7 @@ HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) jr z, .checkOtherKeys jr .checkIfAButtonOrBButtonPressed -PlaceMenuCursor:: ; 3b6d (0:3b6d) +PlaceMenuCursor:: ld a, [wTopMenuItemY] and a ; is the y coordinate 0? jr z, .adjustForXCoord @@ -4248,7 +4249,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) ; manipulated. In the case of submenus, this is used to show the location of ; the menu cursor in the parent menu. In the case of swapping items in list, ; this is used to mark the item that was first chosen to be swapped. -PlaceUnfilledArrowMenuCursor:: ; 3bd9 (0:3bd9) +PlaceUnfilledArrowMenuCursor:: ld b, a ld a, [wMenuCursorLocation] ld l, a @@ -4259,7 +4260,7 @@ PlaceUnfilledArrowMenuCursor:: ; 3bd9 (0:3bd9) ret ; Replaces the menu cursor with a blank space. -EraseMenuCursor:: ; 3be6 (0:3be6) +EraseMenuCursor:: ld a, [wMenuCursorLocation] ld l, a ld a, [wMenuCursorLocation + 1] @@ -4275,7 +4276,7 @@ EraseMenuCursor:: ; 3be6 (0:3be6) ; initliazed with a down arrow, this function does nothing. ; That allows this to be called without worrying about if a down arrow should ; be blinking. -HandleDownArrowBlinkTiming:: ; 3bf1 (0:3bf1) +HandleDownArrowBlinkTiming:: ld a, [hl] ld b, a ld a, $ee ; down arrow @@ -4320,20 +4321,20 @@ HandleDownArrowBlinkTiming:: ; 3bf1 (0:3bf1) ; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait ; for a button press after displaying text (unless [wEnteringCableClub] is set). -EnableAutoTextBoxDrawing:: ; 3c29 (0:3c29) +EnableAutoTextBoxDrawing:: xor a jr AutoTextBoxDrawingCommon -DisableAutoTextBoxDrawing:: ; 3c2c (0:3c2c) +DisableAutoTextBoxDrawing:: ld a, $01 -AutoTextBoxDrawingCommon:: ; 3c2e (0:3c2d) +AutoTextBoxDrawingCommon:: ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ; make DisplayTextID wait for button press ret -PrintText:: ; 3c36 (0:3c36) +PrintText:: ; Print text hl at (1, 14). push hl ld a, MESSAGE_BOX @@ -4342,11 +4343,11 @@ PrintText:: ; 3c36 (0:3c36) call UpdateSprites call Delay3 pop hl -PrintText_NoCreatingTextBox:: ; 3c46 (0:3c46) +PrintText_NoCreatingTextBox:: coord bc, 1, 14 jp TextCommandProcessor -FarPrintText:: ; 3c4c (0:3c4c) +FarPrintText:: ; print text b:hl at (1, 14) ld a, [H_LOADEDROMBANK] push af @@ -4357,7 +4358,7 @@ FarPrintText:: ; 3c4c (0:3c4c) call BankswitchCommon ret -PrintNumber:: ; 3c5b (0:3c5b) +PrintNumber:: ; Print the c-digit, b-byte value at de. ; Allows 2 to 7 digits. For 1-digit numbers, add ; the value to char "0" instead of calling PrintNumber. @@ -4479,7 +4480,7 @@ endm pop bc ret -.PrintDigit: ; 3d21 (0:3d21) +.PrintDigit: ; Divide by the current decimal place. ; Print the quotient, and keep the modulus. ld c, 0 @@ -4554,13 +4555,13 @@ endm ld [H_PASTLEADINGZEROES], a ret -.PrintLeadingZero: ; 3d7f (0:3d7f) +.PrintLeadingZero: bit BIT_LEADING_ZEROES, d ret z ld [hl], "0" ret -.NextDigit: ; 3d85 (0:3d85) +.NextDigit: ; Increment unless the number is left-aligned, ; leading zeroes are not printed, and no digits ; have been printed yet. @@ -4576,7 +4577,7 @@ endm ret -JumpTable:: ; 3d93 (0:3d93) +JumpTable:: ; Call function a in jumptable hl. ; de is not preserved. push hl @@ -4599,13 +4600,13 @@ JumpTable:: ; 3d93 (0:3d93) ret -IsInArray:: ; 3da7 (0:3da7) +IsInArray:: ; Search an array at hl for the value in a. ; Entry size is de bytes. ; Return count b and carry if found. ld b, 0 -IsInRestOfArray:: ; 3da9 (0:3da9) +IsInRestOfArray:: ld c, a .loop ld a, [hl] @@ -4625,10 +4626,10 @@ IsInRestOfArray:: ; 3da9 (0:3da9) scf ret -InitMapSprites:: ; 3dba (0:3dba) +InitMapSprites:: jpab _InitMapSprites -RestoreScreenTilesAndReloadTilePatterns:: ; 3dc2 (0:3dc2) +RestoreScreenTilesAndReloadTilePatterns:: call ClearSprites ld a, $1 ld [wUpdateSpritesEnabled], a @@ -4639,16 +4640,16 @@ RestoreScreenTilesAndReloadTilePatterns:: ; 3dc2 (0:3dc2) jr Delay3 -GBPalWhiteOutWithDelay3:: ; 3dd8 (0:3dd8) +GBPalWhiteOutWithDelay3:: call GBPalWhiteOut -Delay3:: ; 3ddb (0:3ddb) +Delay3:: ; The bg map is updated each frame in thirds. ; Wait three frames to let the bg map fully update. ld c, 3 jp DelayFrames -GBPalNormal:: ; 3de0 (0:3de0) +GBPalNormal:: ; Reset BGP and OBP0. ld a, %11100100 ; 3210 ld [rBGP], a @@ -4659,7 +4660,7 @@ GBPalNormal:: ; 3de0 (0:3de0) call UpdateGBCPal_OBP1 ret -GBPalWhiteOut:: ; 3df2 (0:3df2) +GBPalWhiteOut:: ; White out all palettes. xor a ld [rBGP], a @@ -4671,15 +4672,15 @@ GBPalWhiteOut:: ; 3df2 (0:3df2) ret -RunDefaultPaletteCommand:: ; 3e03 (0:3e03) +RunDefaultPaletteCommand:: ld b, $ff -RunPaletteCommand:: ; 3e05 (0:3e05) +RunPaletteCommand:: ld a, [wOnSGB] and a ret z predef_jump _RunPaletteCommand -GetHealthBarColor:: ; 3e0f (0:3e0f) +GetHealthBarColor:: ; Return at hl the palette of ; an HP bar e pixels long. ld a, e @@ -4696,7 +4697,7 @@ GetHealthBarColor:: ; 3e0f (0:3e0f) ; Copy the current map's sprites' tile patterns to VRAM again after they have ; been overwritten by other tile patterns. -ReloadMapSpriteTilePatterns:: ; 3e1e (0:3e1e) +ReloadMapSpriteTilePatterns:: ld hl, wFontLoaded ld a, [hl] push af @@ -4715,7 +4716,7 @@ ReloadMapSpriteTilePatterns:: ; 3e1e (0:3e1e) jp UpdateSprites -GiveItem:: ; 3e3f (0:3e3f) +GiveItem:: ; Give player quantity c of item b, ; and copy the item's name to wcf4b. ; Return carry on success. @@ -4732,7 +4733,7 @@ GiveItem:: ; 3e3f (0:3e3f) scf ret -GivePokemon:: ; 3e59 (0:3e59) +GivePokemon:: ; Give the player monster b at level c. ld a, b ld [wcf91], a @@ -4740,9 +4741,9 @@ GivePokemon:: ; 3e59 (0:3e59) ld [wCurEnemyLVL], a xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a - jpba _GivePokemon ; 3d:66fa + jpba _GivePokemon -Random:: ; 3e6d (0:3e6d) +Random:: ; Return a random number in a. ; For battles, use BattleRandom. push hl @@ -4755,12 +4756,12 @@ Random:: ; 3e6d (0:3e6d) pop hl ret -BankswitchCommon:: ; 3e7e (0:3e7e) +BankswitchCommon:: ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ret -Bankswitch:: ; 3e84 (0:3e84) +Bankswitch:: ; self-contained bankswitch, use this when not in the home bank ; switches to the bank in b ld a, [H_LOADEDROMBANK] @@ -4774,10 +4775,10 @@ Bankswitch:: ; 3e84 (0:3e84) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ret -JumpToAddress:: ; 3e98 (0:3e98) +JumpToAddress:: jp [hl] -SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99) +SwitchSRAMBankAndLatchClockData:: push af ld a, $1 ld [MBC1SRamBankingMode], a @@ -4787,7 +4788,7 @@ SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99) ld [MBC1SRamBank], a ret -PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) +PrepareRTCDataAndDisableSRAM:: push af ld a, $0 ld [MBC1SRamBankingMode], a @@ -4797,12 +4798,12 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) INCLUDE "home/predef.asm" -UpdateCinnabarGymGateTileBlocks:: ; 3ef0 (0:3ef0) +UpdateCinnabarGymGateTileBlocks:: callba UpdateCinnabarGymGateTileBlocks_ ret ; again? ;jp Bankswitch -CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3ef9 (0:3ef9) +CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ld a, [H_LOADEDROMBANK] push af ld a, [hJoyHeld] @@ -4834,15 +4835,15 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3ef9 (0:3ef9) call BankswitchCommon ret -PrintPredefTextID:: ; 3f3a (0:3f3a) - ld [hSpriteIndexOrTextID], a ; $ff8c +PrintPredefTextID:: + ld [hSpriteIndexOrTextID], a ld hl, TextPredefs call SetMapTextPointer ld hl, wTextPredefFlag set 0, [hl] call DisplayTextID -RestoreMapTextPointer:: ; 3f4a (0:3f4a) +RestoreMapTextPointer:: ld hl, wMapTextPtr ld a, [$ffec] ld [hli], a @@ -4850,7 +4851,7 @@ RestoreMapTextPointer:: ; 3f4a (0:3f4a) ld [hl], a ret -SetMapTextPointer:: ; 3f54 (0:3f54) +SetMapTextPointer:: ld a, [wMapTextPtr] ld [$ffec], a ld a, [wMapTextPtr + 1] @@ -4861,7 +4862,7 @@ SetMapTextPointer:: ; 3f54 (0:3f54) ld [wMapTextPtr + 1], a ret -TextPredefs:: ; 3f67 (0:3f67) +TextPredefs:: const_value = 1 add_tx_pre CardKeySuccessText ; 01 @@ -4934,5 +4935,3 @@ const_value = 1 add_tx_pre BookOrSculptureText ; 42 add_tx_pre ElevatorText ; 43 add_tx_pre PokemonStuffText ; 44 - - ; dr $3f67, $4000 diff --git a/home/audio.asm b/home/audio.asm index f71aa3d0..cb6f0988 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,4 +1,4 @@ -PlayDefaultMusic:: ; 216b (0:216b) +PlayDefaultMusic:: call WaitForSoundToFinish xor a ld c, a @@ -6,7 +6,7 @@ PlayDefaultMusic:: ; 216b (0:216b) ld [wLastMusicSoundID], a jr PlayDefaultMusicCommon -PlayDefaultMusicFadeOutCurrent:: ; 2176 (0:2176) +PlayDefaultMusicFadeOutCurrent:: ; Fade out the current music and then play the default music. ld c, 10 ld d, 0 @@ -17,7 +17,8 @@ PlayDefaultMusicFadeOutCurrent:: ; 2176 (0:2176) ld [wLastMusicSoundID], a ld c, 8 ld d, c -PlayDefaultMusicCommon:: ; 2118 (0:2118) + +PlayDefaultMusicCommon:: ld a, [wWalkBikeSurfState] and a jr z, .walking @@ -35,7 +36,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) ld b, a ld a, d and a ; should current music be faded out first? - ld a, $1f ; BANK(Music_BikeRiding) + ld a, BANK(Music_BikeRiding) jr nz, .next2 ; Only change the audio ROM bank if the current music isn't going to be faded @@ -67,7 +68,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) ld [wNewSoundID], a jp PlaySound -CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) +CheckForNoBikingMusicMap:: ; probably used to not change music upon getting on bike ld a, [wCurMap] cp ROUTE_23 @@ -86,20 +87,20 @@ CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) scf ret -UpdateMusic6Times:: ; 21e3 (0:21e3) - ld c, $6 +UpdateMusic6Times:: + ld c, 6 UpdateMusicCTimes:: .loop push bc push hl - callba Audio1_UpdateMusic ; 2:509d + callba Audio1_UpdateMusic pop hl pop bc dec c jr nz, .loop ret -CompareMapMusicBankWithCurrentBank:: ; 21f5 (0:21f5) +CompareMapMusicBankWithCurrentBank:: ; Compares the map music's audio ROM bank with the current audio ROM bank ; and updates the audio ROM bank variables. ; Returns whether the banks are different in carry. @@ -126,7 +127,7 @@ CompareMapMusicBankWithCurrentBank:: ; 21f5 (0:21f5) scf ret -PlayMusic:: ; 2211 (0:2211) +PlayMusic:: ld b, a ld [wNewSoundID], a xor a @@ -137,7 +138,7 @@ PlayMusic:: ; 2211 (0:2211) ld a, b jr PlaySound -Func_2223:: ; 2223 (0:2223) +Func_2223:: xor a ld [wChannelSoundIDs + CH4], a ld [wChannelSoundIDs + CH5], a @@ -146,11 +147,11 @@ Func_2223:: ; 2223 (0:2223) ld [rNR10], a ret -StopAllMusic:: ; 2233 (0:2233) +StopAllMusic:: ld a, $FF ld [wNewSoundID], a ; plays music specified by a. If value is $ff, music is stopped -PlaySound:: ; 2238 (0:2238) +PlaySound:: push hl push de push bc @@ -165,16 +166,17 @@ PlaySound:: ; 2238 (0:2238) ld [wChannelSoundIDs + CH7], a .next ld a, [wAudioFadeOutControl] - and a + and a ; has a fade-out length been specified? jr z, .noFadeOut ld a, [wNewSoundID] - and a - jr z, .done + and a ; is the new sound ID 0? + jr z, .done ; if so, do nothing xor a ld [wNewSoundID], a ld a, [wLastMusicSoundID] - cp $ff - jr nz, .fadeOut + cp $ff ; has the music been stopped? + jr nz, .fadeOut ; if not, fade out the current music +; If it has been stopped, start playing the new music immediately. xor a ld [wAudioFadeOutControl], a .noFadeOut @@ -197,7 +199,7 @@ PlaySound:: ; 2238 (0:2238) pop hl ret -GetNextMusicByte:: ; 2288 (0:2288) +GetNextMusicByte:: ld a, [H_LOADEDROMBANK] push af ld a, [wAudioROMBank] @@ -223,7 +225,7 @@ GetNextMusicByte:: ; 2288 (0:2288) ld a, e ret -InitMusicVariables:: ; 22aa (0:22aa) +InitMusicVariables:: push hl push de push bc @@ -233,7 +235,7 @@ InitMusicVariables:: ; 22aa (0:22aa) pop hl ret -InitSFXVariables:: ; 22c0 (0:22c0) +InitSFXVariables:: push hl push de push bc @@ -243,7 +245,7 @@ InitSFXVariables:: ; 22c0 (0:22c0) pop hl ret -StopAllAudio:: ; 22d6 (0:22d6) +StopAllAudio:: push hl push de push bc @@ -253,7 +255,7 @@ StopAllAudio:: ; 22d6 (0:22d6) pop hl ret -DetermineAudioFunction:: ; 22ec (0:22ec) +DetermineAudioFunction:: ld a, [H_LOADEDROMBANK] push af ld a, [wAudioROMBank] diff --git a/home/copy.asm b/home/copy.asm index d073f54c..4f1d5017 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,4 +1,4 @@ -FarCopyData:: ; 009d (0:009d) +FarCopyData:: ; Copy bc bytes from a:hl to de. ld [wFarCopyDataSavedROMBank], a ld a, [H_LOADEDROMBANK] @@ -10,7 +10,7 @@ FarCopyData:: ; 009d (0:009d) call BankswitchCommon ret -CopyData:: ; 00b1 (0:00b1) +CopyData:: ; Copy bc bytes from hl to de. ld a,b and a @@ -33,7 +33,7 @@ CopyData:: ; 00b1 (0:00b1) jr nz, .copybytes ret -CopyVideoDataAlternate:: ; 00c8 (0:00c8) +CopyVideoDataAlternate:: ld a, [rLCDC] bit 7,a ; LCD enabled? jp nz, CopyVideoData ; if yes, then copy video data @@ -53,7 +53,7 @@ CopyVideoDataAlternate:: ; 00c8 (0:00c8) pop af jp FarCopyData -CopyVideoDataDoubleAlternate:: ; 00e3 (0:00e3) +CopyVideoDataDoubleAlternate:: ld a, [rLCDC] bit 7,a ; LCD enabled? jp nz, CopyVideoDataDouble ; if yes, then copy video data diff --git a/home/copy2.asm b/home/copy2.asm index 07eeb6b2..ad47c4a0 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,4 +1,4 @@ -FarCopyDataDouble:: ; 15d4 (0:15d4) +FarCopyDataDouble:: ; Expand bc bytes of 1bpp image data ; from a:de to 2bpp data at hl. ld [wFarCopyDataSavedROMBank],a @@ -33,7 +33,7 @@ FarCopyDataDouble:: ; 15d4 (0:15d4) call BankswitchCommon ret -CopyVideoData:: ; 15fe (0:15fe) +CopyVideoData:: ; Wait for the next VBlank, then copy c 2bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -82,7 +82,7 @@ CopyVideoData:: ; 15fe (0:15fe) ld c, a jr .loop -CopyVideoDataDouble:: ; 1636 (0:1636) +CopyVideoDataDouble:: ; Wait for the next VBlank, then copy c 1bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -129,7 +129,7 @@ CopyVideoDataDouble:: ; 1636 (0:1636) ld c, a jr .loop -FillMemory:: ; 166e (0:166e) +FillMemory:: push af ld a,b and a @@ -149,7 +149,7 @@ FillMemory:: ; 166e (0:166e) jr nz, .loop ret -GetFarByte:: ; 1681 (0:1681) +GetFarByte:: ; get a byte from a:hl ; and return it in a push bc @@ -165,7 +165,7 @@ GetFarByte:: ; 1681 (0:1681) pop bc ret -ClearScreenArea:: ; 1692 (0:1692) +ClearScreenArea:: ; Clear tilemap area cxb at hl. ld a, " " ; blank tile ld de, 20 ; screen width @@ -183,7 +183,7 @@ ClearScreenArea:: ; 1692 (0:1692) jr nz, .y ret -CopyScreenTileBufferToVRAM:: ; 16a4 (0:16a4) +CopyScreenTileBufferToVRAM:: ; Copy wTileMap to the BG Map starting at b * $100. ; This is done in thirds of 6 rows, so it takes 3 frames. @@ -218,7 +218,7 @@ CopyScreenTileBufferToVRAM:: ; 16a4 (0:16a4) ld [H_VBCOPYBGSRC], a ret -ClearScreen:: ; 16dd (0:16dd) +ClearScreen:: ; Clear wTileMap, then wait ; for the bg map to update. ld bc, 20 * 18 diff --git a/home/fade.asm b/home/fade.asm index 7ac2e1c2..1259f92b 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,6 +1,6 @@ ; These routines manage gradual fading ; (e.g., entering a doorway) -LoadGBPal:: ; 1e6f (0:1e6f) +LoadGBPal:: ld a, [wMapPalOffset] ; tells if wCurMap is dark (requires HM5_FLASH?) ld b, a ld hl, FadePal4 @@ -21,16 +21,16 @@ LoadGBPal:: ; 1e6f (0:1e6f) call UpdateGBCPal_OBP1 ret -GBFadeInFromBlack:: ; 1e8f (0:1e8f) +GBFadeInFromBlack:: ld hl, FadePal1 ld b, 4 jr GBFadeIncCommon -GBFadeOutToWhite:: ; 1e96 (0:1e96) +GBFadeOutToWhite:: ld hl, FadePal6 ld b, 3 -GBFadeIncCommon: ; 1e9b (0:1e9b) +GBFadeIncCommon: ld a, [hli] ld [rBGP], a ld a, [hli] @@ -46,7 +46,7 @@ GBFadeIncCommon: ; 1e9b (0:1e9b) jr nz, GBFadeIncCommon ret -GBFadeOutToBlack:: ; 1eb6 (0:1eb6) +GBFadeOutToBlack:: ld hl, FadePal4 + 2 ld b, 4 jr GBFadeDecCommon diff --git a/home/init.asm b/home/init.asm index 67d52dd2..da354aa6 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,11 +1,11 @@ -SoftReset:: ; 1d08 (0:1d08) +SoftReset:: call StopAllSounds call GBPalWhiteOut ld c, 32 call DelayFrames ; fallthrough -Init:: ; 1d10 (0:1d10) +Init:: ; Program init. rLCDC_DEFAULT EQU %11100011 @@ -51,7 +51,7 @@ rLCDC_DEFAULT EQU %11100011 or c jr nz, .loop - call ClearVram ; 1dc6 + call ClearVram ld hl, $ff80 ld bc, $fffe - $ff80 @@ -99,7 +99,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, $1f ; BANK(SFX_1f_67) + ld a, BANK(SFX_Shooting_Star) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, $9c @@ -120,7 +120,7 @@ rLCDC_DEFAULT EQU %11100011 jp SetDefaultNamesBeforeTitlescreen -ClearVram: ; 1dc6 (0:1dc6) +ClearVram: ld hl, $8000 ld bc, $2000 xor a diff --git a/home/lcdc.asm b/home/lcdc.asm index 7057f755..6172dd0d 100644 --- a/home/lcdc.asm +++ b/home/lcdc.asm @@ -1,19 +1,20 @@ -LCDC:: ; 15ac (0:15ac) +LCDC:: push af - ld a,[hLCDCPointer] ; doubles as enabling byte + ld a, [hLCDCPointer] ; doubles as enabling byte and a - jr z,.noLCDCInterrupt + jr z, .noLCDCInterrupt push hl - ld a,[rLY] - ld l,a - ld h,$c7 - ld h,[hl] ; h != not part of pointer - ld a,[hLCDCPointer] - ld l,a - ld a,h - ld h,$ff - ld [hl],a + ; [C700 + [rLY]] --> [FF00 + [hLCDCPointer]] + ld a, [rLY] + ld l, a + ld h, wLYOverrides / $100 + ld h, [hl] ; h != not part of pointer + ld a, [hLCDCPointer] + ld l, a + ld a, h + ld h, $ff + ld [hl], a pop hl .noLCDCInterrupt pop af - reti
\ No newline at end of file + reti diff --git a/home/overworld.asm b/home/overworld.asm index e80b829c..d76fca98 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,9 +1,9 @@ -EnterMap:: ; 01d7 (0:01d7) +EnterMap:: ; Load a new map. ld a, $ff ld [wJoyIgnore], a call LoadMapData - callba ClearVariablesAfterLoadingMapData ; 3:407c + callba ClearVariablesAfterLoadingMapData ld hl, wd72c bit 0, [hl] ; has the player already made 3 steps since the last battle? jr z, .skipGivingThreeStepsOfNoRandomBattles @@ -40,9 +40,9 @@ EnterMap:: ; 01d7 (0:01d7) xor a ld [wJoyIgnore], a -OverworldLoop:: ; 0242 (0:0242) +OverworldLoop:: call DelayFrame -OverworldLoopLessDelay:: ; 0245 (0:0245) +OverworldLoopLessDelay:: call DelayFrame call IsSurfingPikachuInParty call LoadGBPal @@ -51,7 +51,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) and a jp nz, .moveAhead ; if the player sprite has not yet completed the walking animation call JoypadOverworld ; get joypad state (which is possibly simulated) - callba SafariZoneCheck ; 7:6321 + callba SafariZoneCheck ld a, [wSafariZoneGameOver] and a jp nz, WarpFound2 @@ -70,7 +70,6 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) jr z, .notSimulating ld a, [hJoyHeld] jr .checkIfStartIsPressed - .notSimulating ld a, [hJoyPressed] .checkIfStartIsPressed @@ -80,7 +79,6 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) xor a ld [hSpriteIndexOrTextID], a ; start menu text ID jp .displayDialogue - .startButtonNotPressed bit 0, a ; A button jp z, .checkIfDownButtonIsPressed @@ -118,15 +116,6 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) xor a ld [wLinkTimeoutCounter], a jp EnterMap - -; predef LoadSAV -; ld a, [wCurMap] -; ld [wDestinationMap], a -; call SpecialWarpIn -; ld a, [wCurMap] -; call SwitchToMapRomBank ; switch to the ROM bank of the current map -; ld hl, wCurMapTileset -; set 7, [hl] .checkForOpponent ld a, [wCurOpponent] and a @@ -134,12 +123,12 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) jp OverworldLoop .noDirectionButtonsPressed - call UpdateSprites ; 231c + call UpdateSprites ld hl, wFlags_0xcd60 res 2, [hl] xor a ld [wd435], a - ld a, $1 + ld a, 1 ld [wCheckFor180DegreeTurn], a ld a, [wPlayerMovingDirection] ; the direction that was pressed last time and a @@ -179,9 +168,10 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) .checkIfRightButtonIsPressed bit 4, a ; right button jr z, .noDirectionButtonsPressed - ld a, $1 - ld [wSpriteStateData1 + 5], a - ld a, $1 + ld a, 1 + ld [wSpriteStateData1 + 5], a ; delta X + ld a, 1 + .handleDirectionButtonPress ld [wPlayerDirection], a ; new direction ld a, [wd730] @@ -234,6 +224,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) .surfing call CollisionCheckOnWater jp c, OverworldLoop + .noCollision ld a, $08 ld [wWalkCounter], a @@ -242,7 +233,8 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) .moveAhead call IsSpinning - call UpdateSprites ; move sprites + call UpdateSprites + .moveAhead2 ld hl, wFlags_0xcd60 res 2, [hl] @@ -303,7 +295,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) call DelayFrames jp EnterMap -StepCountCheck:: ; 0457 (0:0457) +StepCountCheck:: ld a, [wd730] bit 7, a jr nz, .doneStepCounting ; if button presses are being simulated, don't count steps @@ -321,7 +313,7 @@ StepCountCheck:: ; 0457 (0:0457) .doneStepCounting ret -AllPokemonFainted:: ; 0475 (0:0475) +AllPokemonFainted:: ld a, $ff ld [wIsInBattle], a call RunMapScript @@ -329,7 +321,7 @@ AllPokemonFainted:: ; 0475 (0:0475) ; function to determine if there will be a battle and execute it (either a trainer battle or wild battle) ; sets carry if a battle occurred and unsets carry if not -NewBattle:: ; 0480 (0:0480) +NewBattle:: ld a, [wd72d] bit 4, a jr nz, .noBattle @@ -338,12 +330,13 @@ NewBattle:: ; 0480 (0:0480) ld a, [wd72e] bit 4, a jr nz, .noBattle - jpba InitBattle ; 3d:5ff2 + jpba InitBattle .noBattle and a ret -DoBikeSpeedup:: ; 049d (0:049d) +; function to make bikes twice as fast as walking +DoBikeSpeedup:: ld a, [wWalkBikeSurfState] dec a ; riding a bike? ret nz @@ -354,7 +347,7 @@ DoBikeSpeedup:: ; 049d (0:049d) and a ret nz ld a, [wCurMap] - cp ROUTE_17 ; cycling road + cp ROUTE_17 ; Cycling Road jr nz, .goFaster ld a, [hJoyHeld] and D_UP | D_LEFT | D_RIGHT @@ -364,7 +357,7 @@ DoBikeSpeedup:: ; 049d (0:049d) ret ; check if the player has stepped onto a warp after having not collided -CheckWarpsNoCollision:: ; 04bd (0:04bd) +CheckWarpsNoCollision:: ld a, [wNumberOfWarps] and a jp z, CheckMapConnections @@ -376,7 +369,7 @@ CheckWarpsNoCollision:: ; 04bd (0:04bd) ld a, [wXCoord] ld e, a ld hl, wWarpEntries -CheckWarpsNoCollisionLoop:: ; 04d5 (0:04d5) +CheckWarpsNoCollisionLoop:: ld a, [hli] ; check if the warp's Y position matches cp d jr nz, CheckWarpsNoCollisionRetry1 @@ -412,19 +405,19 @@ CheckWarpsNoCollisionLoop:: ; 04d5 (0:04d5) jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr WarpFound1 -CheckWarpsNoCollisionRetry1:: ; 050f (0:050f) +CheckWarpsNoCollisionRetry1:: inc hl -CheckWarpsNoCollisionRetry2:: ; 0510 (0:0510) +CheckWarpsNoCollisionRetry2:: inc hl inc hl -ContinueCheckWarpsNoCollisionLoop:: ; 0512 (0:0512) +ContinueCheckWarpsNoCollisionLoop:: inc b ; increment warp number dec c ; decrement number of warps jp nz, CheckWarpsNoCollisionLoop jp CheckMapConnections ; check if the player has stepped onto a warp after having collided -CheckWarpsCollision:: ; 051a (0:051a) +CheckWarpsCollision:: ld a, [wNumberOfWarps] ld c, a ld hl, wWarpEntries @@ -444,7 +437,6 @@ CheckWarpsCollision:: ; 051a (0:051a) ld a, [hl] ld [hWarpDestinationMap], a jr WarpFound2 - .retry1 inc hl .retry2 @@ -454,13 +446,13 @@ CheckWarpsCollision:: ; 051a (0:051a) jr nz, .loop jp OverworldLoop -WarpFound1:: ; 0543 (0:0543) +WarpFound1:: ld a, [hli] ld [wDestinationWarpID], a ld a, [hli] ld [hWarpDestinationMap], a -WarpFound2:: ; 054a (0:054a) +WarpFound2:: ld a, [wNumberOfWarps] sub c ld [wWarpedFromWhichWarp], a ; save ID of used warp @@ -502,18 +494,17 @@ WarpFound2:: ; 054a (0:054a) ld hl, wd732 set 3, [hl] jr .skipMapChangeSound - .notWarpPad call PlayMapChangeSound .skipMapChangeSound ld hl, wd736 res 0, [hl] res 1, [hl] - callab CalculatePikachuSpawnState2 ; 3f:465b + callab CalculatePikachuSpawnState2 jr .done .goBackOutside - callab CalculatePikachuSpawnState3 ; 3f:469a + callab CalculatePikachuSpawnState3 ld a, [wLastMap] ld [wCurMap], a call PlayMapChangeSound @@ -526,7 +517,7 @@ WarpFound2:: ; 054a (0:054a) jp EnterMap ; if no matching warp was found -CheckMapConnections:: ; 05db (0:05db) +CheckMapConnections:: .checkWestMap ld a, [wXCoord] cp $ff @@ -653,14 +644,13 @@ CheckMapConnections:: ; 05db (0:05db) ld [wCurrentTileBlockMapViewPointer], a ; pointer to upper left corner of current tile block map section ld a, h ld [wCurrentTileBlockMapViewPointer + 1], a -.loadNewMap ; 06ce (0:06ce) -; load the connected map that was entered +.loadNewMap ; load the connected map that was entered ld hl, wPikachuOverworldStateFlags set 4, [hl] ld a, $2 ld [wPikachuSpawnState], a - call LoadMapHeader ; 0dab (0:0dab) - call PlayDefaultMusicFadeOutCurrent ; music + call LoadMapHeader + call PlayDefaultMusicFadeOutCurrent ld b, SET_PAL_OVERWORLD call RunPaletteCommand ; Since the sprite set shouldn't change, this will just update VRAM slots at @@ -673,20 +663,19 @@ CheckMapConnections:: ; 05db (0:05db) jp OverworldLoop ; function to play a sound when changing maps -PlayMapChangeSound:: ; 06ef (0:06ef) +PlayMapChangeSound:: ld a, [wCurMapTileset] cp FACILITY jr z, .didNotGoThroughDoor cp CEMETERY jr z, .didNotGoThroughDoor aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on - cp UNDERGROUND ; door tile in tileset 0 + cp $0b ; door tile in tileset 0 jr nz, .didNotGoThroughDoor - ld a, $ad ; SFX_GO_INSIDE + ld a, SFX_GO_INSIDE jr .playSound - .didNotGoThroughDoor - ld a, $b5 ; SFX_GO_OUTSIDE + ld a, SFX_GO_OUTSIDE .playSound call PlaySound ld a, [wMapPalOffset] @@ -694,7 +683,7 @@ PlayMapChangeSound:: ; 06ef (0:06ef) ret nz jp GBFadeOutToBlack -CheckIfInOutsideMap:: ; 0712 (0:0712) +CheckIfInOutsideMap:: ; If the player is in an outside map (a town or route), set the z flag ld a, [wCurMapTileset] and a ; most towns/routes have tileset 0 (OVERWORLD) @@ -708,7 +697,7 @@ CheckIfInOutsideMap:: ; 0712 (0:0712) ; "function 1" passes when the player is at the edge of the map and is facing towards the outside of the map ; "function 2" passes when the the tile in front of the player is among a certain set ; sets carry if the check passes, otherwise clears carry -ExtraWarpCheck:: ; 071a (0:071a) +ExtraWarpCheck:: ld a, [wCurMap] cp SS_ANNE_3 jr z, .useFunction1 @@ -732,21 +721,20 @@ ExtraWarpCheck:: ; 071a (0:071a) .useFunction1 ld hl, IsPlayerFacingEdgeOfMap jr .doBankswitch - .useFunction2 ld hl, IsWarpTileInFrontOfPlayer .doBankswitch ld b, BANK(IsWarpTileInFrontOfPlayer) jp Bankswitch -MapEntryAfterBattle:: ; 0750 (0:0750) +MapEntryAfterBattle:: callba IsPlayerStandingOnWarp ; for enabling warp testing after collisions ld a, [wMapPalOffset] and a jp z, GBFadeInFromWhite jp LoadGBPal -HandleBlackOut:: ; 0762 (0:0762) +HandleBlackOut:: ; For when all the player's pokemon faint. ; Does not print the "blacked out" message. @@ -761,7 +749,7 @@ HandleBlackOut:: ; 0762 (0:0762) call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap -StopMusic:: ; 0788 (0:0788) +StopMusic:: ld [wAudioFadeOutControl], a call StopAllMusic .wait @@ -770,7 +758,7 @@ StopMusic:: ; 0788 (0:0788) jr nz, .wait jp StopAllSounds -HandleFlyWarpOrDungeonWarp:: ; 0794 (0:0794) +HandleFlyWarpOrDungeonWarp:: call UpdateSprites call Delay3 xor a @@ -785,10 +773,10 @@ HandleFlyWarpOrDungeonWarp:: ; 0794 (0:0794) callbs SpecialWarpIn jp SpecialEnterMap -LeaveMapAnim:: ; 07bc (0:07bc) +LeaveMapAnim:: jpba _LeaveMapAnim -Func_07c4:: ; 07c4 (0:07c4) +Func_07c4:: ld a, [wWalkBikeSurfState] and a ret z @@ -800,7 +788,7 @@ Func_07c4:: ; 07c4 (0:07c4) call PlayDefaultMusic ret -LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7) +LoadPlayerSpriteGraphics:: ; Load sprite graphics based on whether the player is standing, biking, or surfing. ; 0: standing @@ -838,7 +826,7 @@ LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7) jp z, LoadSurfingPlayerSpriteGraphics2 jp LoadWalkingPlayerSpriteGraphics -IsBikeRidingAllowed:: ; 0805 (0:0805) +IsBikeRidingAllowed:: ; The bike can be used on Route 23 and Indigo Plateau, ; or maps with tilesets in BikeRidingTilesets. ; Return carry if biking is allowed. @@ -868,10 +856,10 @@ IsBikeRidingAllowed:: ; 0805 (0:0805) INCLUDE "data/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM -LoadTilesetTilePatternData:: ; 0828 (0:0828) - ld a, [wTilesetGFXPtr] +LoadTilesetTilePatternData:: + ld a, [wTilesetGfxPtr] ld l, a - ld a, [wTilesetGFXPtr + 1] + ld a, [wTilesetGfxPtr + 1] ld h, a ld de, vTileset ld bc, $600 @@ -880,7 +868,7 @@ LoadTilesetTilePatternData:: ; 0828 (0:0828) ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8 ; it can also load partial tile maps of connected maps into a border of length 3 around the current map -LoadTileBlockMap:: ; 083c (0:083c) +LoadTileBlockMap:: ; fill C6E8-CBFB with the background tile ld hl, wOverworldMap ld bc, $0514 @@ -1002,7 +990,7 @@ LoadTileBlockMap:: ; 083c (0:083c) .done ret -LoadNorthSouthConnectionsTileMap:: ; 0919 (0:0919) +LoadNorthSouthConnectionsTileMap:: ld c, MAP_BORDER .loop push de @@ -1034,7 +1022,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0919 (0:0919) jr nz, .loop ret -LoadEastWestConnectionsTileMap:: ; 093d (0:093d) +LoadEastWestConnectionsTileMap:: push hl push de ld c, MAP_BORDER @@ -1065,7 +1053,7 @@ LoadEastWestConnectionsTileMap:: ; 093d (0:093d) ; function to check if there is a sign or sprite in front of the player ; if so, carry is set. otherwise, carry is cleared -IsSpriteOrSignInFrontOfPlayer:: ; 095e (0:095e) +IsSpriteOrSignInFrontOfPlayer:: xor a ld [hSpriteIndexOrTextID], a ld a, [wNumSigns] @@ -1078,7 +1066,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 095e (0:095e) .extendRangeOverCounter ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c - ld hl, wTileSetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) + ld hl, wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) ld b, 3 ld d, $20 ; talking range in pixels (long range) .counterTilesLoop @@ -1089,9 +1077,9 @@ IsSpriteOrSignInFrontOfPlayer:: ; 095e (0:095e) jr nz, .counterTilesLoop ; sets carry flag if a sprite is in front of the player, resets if not -IsSpriteInFrontOfPlayer:: ; 0983 (0:0983) +IsSpriteInFrontOfPlayer:: ld d, $10 ; talking range in pixels (normal range) -IsSpriteInFrontOfPlayer2:: ; 0985 (0:0985) +IsSpriteInFrontOfPlayer2:: lb bc, $3c, $40 ; Y and X position of player sprite ld a, [wPlayerFacingDirection] ; direction the player is facing .checkIfPlayerFacingUp @@ -1182,7 +1170,7 @@ IsSpriteInFrontOfPlayer2:: ; 0985 (0:0985) scf ret -SignLoop:: ; 09f2 (0:09f2) +SignLoop:: ; search if a player is facing a sign ld hl, wSignCoords ; start of sign coordinates ld a, [wNumSigns] ; number of signs in the map @@ -1223,7 +1211,7 @@ SignLoop:: ; 09f2 (0:09f2) ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) ; sets the carry flag if there is a collision, and unsets it if there isn't a collision -CollisionCheckOnLand:: ; 0a1c (0:0a1c) +CollisionCheckOnLand:: ld a, [wd736] bit 6, a ; is the player jumping? jr nz, .noCollision @@ -1267,21 +1255,20 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) jr nc, .noCollision .collision ld a, [wChannelSoundIDs + CH4] - cp $b4 ; SFX_COLLISION ; check if collision sound is already playing + cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry - ld a, $b4 ; SFX_COLLISION + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf ret - .noCollision and a ret ; function that checks if the tile in front of the player is passable ; clears carry if it is, sets carry if not -CheckTilePassable:: ; 0a79 (0:0a79) +CheckTilePassable:: predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player ld a, [wTileInFrontOfPlayer] ; tile in front of player ld c, a @@ -1292,13 +1279,12 @@ CheckTilePassable:: ; 0a79 (0:0a79) ; and check for collisions that only occur between certain pairs of tiles ; Input: hl - address of directional collision data ; sets carry if there is a collision and unsets carry if not -CheckForJumpingAndTilePairCollisions:: ; 0a86 (0:0a86) +CheckForJumpingAndTilePairCollisions:: push hl predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player push de push bc - callba HandleLedges ; 6:67f4 - ; check if the player is trying to jump a ledge + callba HandleLedges ; check if the player is trying to jump a ledge pop bc pop de pop hl @@ -1308,11 +1294,11 @@ CheckForJumpingAndTilePairCollisions:: ; 0a86 (0:0a86) ret nz ; if not jumping -CheckForTilePairCollisions2:: ; 0aa0 (0:0aa0) +CheckForTilePairCollisions2:: aCoord 8, 9 ; tile the player is on ld [wTilePlayerStandingOn], a -CheckForTilePairCollisions:: ; 0aa6 (0:0aa6) +CheckForTilePairCollisions:: ld a, [wTileInFrontOfPlayer] ld c, a .tilePairCollisionLoop @@ -1327,7 +1313,6 @@ CheckForTilePairCollisions:: ; 0aa6 (0:0aa6) .retry inc hl jr .tilePairCollisionLoop - .tilesetMatches ld a, [wTilePlayerStandingOn] ; tile the player is on ld b, a @@ -1339,14 +1324,12 @@ CheckForTilePairCollisions:: ; 0aa6 (0:0aa6) cp b jr z, .currentTileMatchesSecondInPair jr .retry - .currentTileMatchesFirstInPair inc hl ld a, [hl] cp c jr z, .foundMatch jr .tilePairCollisionLoop - .currentTileMatchesSecondInPair dec hl ld a, [hli] @@ -1356,7 +1339,6 @@ CheckForTilePairCollisions:: ; 0aa6 (0:0aa6) .foundMatch scf ret - .noMatch and a ret @@ -1366,7 +1348,7 @@ CheckForTilePairCollisions:: ; 0aa6 (0:0aa6) ; these entries indicate that the player may not cross between tile 1 and tile 2 ; it's mainly used to simulate differences in elevation -TilePairCollisionsLand:: ; 0ada (0:0ada) +TilePairCollisionsLand:: db CAVERN, $20, $05 db CAVERN, $41, $05 db FOREST, $30, $2E @@ -1380,14 +1362,14 @@ TilePairCollisionsLand:: ; 0ada (0:0ada) db FOREST, $5F, $2E db $FF -TilePairCollisionsWater:: ; 0afc (0:0afc) +TilePairCollisionsWater:: db FOREST, $14, $2E db FOREST, $48, $2E db CAVERN, $14, $05 db $FF ; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character -LoadCurrentMapView:: ; 0b06 (0:0b06) +LoadCurrentMapView:: ld a, [H_LOADEDROMBANK] push af ld a, [wTilesetBank] ; tile data ROM bank @@ -1475,12 +1457,12 @@ LoadCurrentMapView:: ; 0b06 (0:0b06) call BankswitchCommon ; restore previous ROM bank ret -AdvancePlayerSprite:: ; 0b7f (0:0b7f) +AdvancePlayerSprite:: ld a, [wUpdateSpritesEnabled] push af ld a, $FF ld [wUpdateSpritesEnabled], a - ld hl, _AdvancePlayerSprite ; 3c:410c + ld hl, _AdvancePlayerSprite ld b, BANK(_AdvancePlayerSprite) call Bankswitch pop af @@ -1490,7 +1472,7 @@ AdvancePlayerSprite:: ; 0b7f (0:0b7f) ; the following 6 functions are used to tell the V-blank handler to redraw ; the portion of the map that was newly exposed due to the player's movement -ScheduleNorthRowRedraw:: ; 0b95 (0:0b95) +ScheduleNorthRowRedraw:: coord hl, 0, 0 call CopyToRedrawRowOrColumnSrcTiles ld a, [wMapViewVRAMPointer] @@ -1501,7 +1483,7 @@ ScheduleNorthRowRedraw:: ; 0b95 (0:0b95) ld [hRedrawRowOrColumnMode], a ret -CopyToRedrawRowOrColumnSrcTiles:: ; 0baa (0:0baa) +CopyToRedrawRowOrColumnSrcTiles:: ld de, wRedrawRowOrColumnSrcTiles ld c, 2 * SCREEN_WIDTH .loop @@ -1512,7 +1494,7 @@ CopyToRedrawRowOrColumnSrcTiles:: ; 0baa (0:0baa) jr nz, .loop ret -ScheduleSouthRowRedraw:: ; 0bb6 (0:0bb6) +ScheduleSouthRowRedraw:: coord hl, 0, 16 call CopyToRedrawRowOrColumnSrcTiles ld a, [wMapViewVRAMPointer] @@ -1531,7 +1513,7 @@ ScheduleSouthRowRedraw:: ; 0bb6 (0:0bb6) ld [hRedrawRowOrColumnMode], a ret -ScheduleEastColumnRedraw:: ; 0bd6 (0:0bd7) +ScheduleEastColumnRedraw:: coord hl, 18, 0 call ScheduleColumnRedrawHelper ld a, [wMapViewVRAMPointer] @@ -1549,7 +1531,7 @@ ScheduleEastColumnRedraw:: ; 0bd6 (0:0bd7) ld [hRedrawRowOrColumnMode], a ret -ScheduleColumnRedrawHelper:: ; 0bf6 (0:0bf6) +ScheduleColumnRedrawHelper:: ld de, wRedrawRowOrColumnSrcTiles ld c, SCREEN_HEIGHT .loop @@ -1569,7 +1551,7 @@ ScheduleColumnRedrawHelper:: ; 0bf6 (0:0bf6) jr nz, .loop ret -ScheduleWestColumnRedraw:: ; 0c0c (0:0c0c) +ScheduleWestColumnRedraw:: coord hl, 0, 0 call ScheduleColumnRedrawHelper ld a, [wMapViewVRAMPointer] @@ -1582,11 +1564,11 @@ ScheduleWestColumnRedraw:: ; 0c0c (0:0c0c) ; function to write the tiles that make up a tile block to memory ; Input: c = tile block ID, hl = destination address -DrawTileBlock:: ; 0c21 (0:0c21) +DrawTileBlock:: push hl - ld a, [wTileSetBlocksPtr] ; pointer to tiles + ld a, [wTilesetBlocksPtr] ; pointer to tiles ld l, a - ld a, [wTileSetBlocksPtr + 1] + ld a, [wTilesetBlocksPtr + 1] ld h, a ld a, c swap a @@ -1623,7 +1605,7 @@ DrawTileBlock:: ; 0c21 (0:0c21) ret ; function to update joypad state and simulate button presses -JoypadOverworld:: ; 0c51 (0:0c51) +JoypadOverworld:: xor a ld [wSpriteStateData1 + 3], a ld [wSpriteStateData1 + 5], a @@ -1633,7 +1615,7 @@ JoypadOverworld:: ; 0c51 (0:0c51) call AreInputsSimulated ret -ForceBikeDown:: ; 0c65 (0:0c65) +ForceBikeDown:: ld a, [wFlags_D733] bit 3, a ; check if a trainer wants a challenge ret nz @@ -1647,7 +1629,7 @@ ForceBikeDown:: ; 0c65 (0:0c65) ld [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press ret -AreInputsSimulated:: ; 0c7b (0:0c7b) +AreInputsSimulated:: ld a, [wd730] bit 7, a ret z @@ -1682,7 +1664,7 @@ AreInputsSimulated:: ; 0c7b (0:0c7b) res 7, [hl] ret -GetSimulatedInput:: ; 0cb3 (0:0cb3) +GetSimulatedInput:: ld hl, wSimulatedJoypadStatesIndex dec [hl] ld a, [hl] @@ -1705,14 +1687,8 @@ GetSimulatedInput:: ; 0cb3 (0:0cb3) ; function to check the tile ahead to determine if the character should get on land or keep surfing ; sets carry if there is a collision and clears carry otherwise -; It seems that this function has a bug in it, but due to luck, it doesn't -; show up. After detecting a sprite collision, it jumps to the code that -; checks if the next tile is passable instead of just directly jumping to the -; "collision detected" code. However, it doesn't store the next tile in c, -; so the old value of c is used. 2429 is always called before this function, -; and 2429 always sets c to 0xF0. There is no 0xF0 background tile, so it -; is considered impassable and it is detected as a collision. -CollisionCheckOnWater:: ; 0cca (0:0cca) +; This function had a bug in Red/Blue, but it was fixed in Yellow. +CollisionCheckOnWater:: ld a, [wd730] bit 7, a jp nz, .noCollision ; return and clear carry if button presses are being simulated @@ -1720,12 +1696,12 @@ CollisionCheckOnWater:: ; 0cca (0:0cca) ld d, a ld a, [wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) and d ; check if a sprite is in the direction the player is trying to go - jr nz, .collision ; bug? + jr nz, .collision ld hl, TilePairCollisionsWater call CheckForJumpingAndTilePairCollisions jr c, .collision predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player (puts it in c and [wTileInFrontOfPlayer]) - callab IsNextTileShoreOrWater ; 3:6808 + callab IsNextTileShoreOrWater jr c, .noCollision ld a, [wTileInFrontOfPlayer] ; tile in front of player ld c, a @@ -1733,9 +1709,9 @@ CollisionCheckOnWater:: ; 0cca (0:0cca) jr nc, .stopSurfing .collision ld a, [wChannelSoundIDs + CH4] - cp $b4 ; SFX_COLLISION + cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry - ld a, $b4 ; SFX_COLLISION + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1763,7 +1739,7 @@ CollisionCheckOnWater:: ; 0cca (0:0cca) ret ; function to run the current map's script -RunMapScript:: ; 0d2c (0:0d2c) +RunMapScript:: push hl push de push bc @@ -1789,7 +1765,7 @@ RunMapScript:: ; 0d2c (0:0d2c) .return ret -LoadWalkingPlayerSpriteGraphics:: ; 0d5e (0:0d5e) +LoadWalkingPlayerSpriteGraphics:: ; new sprite copy stuff xor a ld [wd473], a @@ -1797,7 +1773,7 @@ LoadWalkingPlayerSpriteGraphics:: ; 0d5e (0:0d5e) ld de, RedSprite ; $4180 jr LoadPlayerSpriteGraphicsCommon -LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69) +LoadSurfingPlayerSpriteGraphics2:: ld a, [wd473] and a jr z, .asm_0d75 @@ -1814,15 +1790,15 @@ LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69) ld de, SurfingPikachuSprite ; 3f:6def jr LoadPlayerSpriteGraphicsCommon -LoadSurfingPlayerSpriteGraphics:: ; 0d83 (0:0d83) - ld b, BANK(RedSprite) ; not sure, but probably same bank (5) +LoadSurfingPlayerSpriteGraphics:: + ld b, BANK(SeelSprite) ld de, SeelSprite jr LoadPlayerSpriteGraphicsCommon -LoadBikePlayerSpriteGraphics:: ; 0d8a (0:0d8a) +LoadBikePlayerSpriteGraphics:: ld b, BANK(RedCyclingSprite) ld de, RedCyclingSprite -LoadPlayerSpriteGraphicsCommon:: ; 0d8f (0:0d8f) +LoadPlayerSpriteGraphicsCommon:: ld hl, vNPCSprites push de push hl @@ -1843,12 +1819,12 @@ LoadPlayerSpriteGraphicsCommon:: ; 0d8f (0:0d8f) jp CopyVideoData ; function to load data from the map header -LoadMapHeader:: ; 0dab (0:0dab) +LoadMapHeader:: callba MarkTownVisitedAndLoadMissableObjects jr asm_0dbd Func_0db5:: ; XXX - callba Func_f0a55 ; 3c:4a55 + callba LoadUnusedBluesHouseMissableObjectData ; 3c:4a55 asm_0dbd ld a, [wCurMapTileset] ld [wUnusedD119], a @@ -1945,9 +1921,9 @@ asm_0dbd predef LoadTilesetHeader ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? - jr nz, .asm_0e73 - callab Func_fc4fa ; 3f:44fa -.asm_0e73 + jr nz, .skip_pika_spawn + callab SchedulePikachuSpawnForAfterText ; 3f:44fa +.skip_pika_spawn callab LoadWildData ; 3:4b62 pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) ld a, [wCurMapHeight] ; map height in 4x4 tile blocks @@ -1975,7 +1951,7 @@ asm_0dbd ; function to copy map connection data from ROM to WRAM ; Input: hl = source, de = destination -CopyMapConnectionHeader:: ; 0eaa (0:0eaa) +CopyMapConnectionHeader:: ld c, $0b .loop ld a, [hli] @@ -1985,7 +1961,7 @@ CopyMapConnectionHeader:: ; 0eaa (0:0eaa) jr nz, .loop ret -CopySignData:: ; 0eb3 (0:0eb3) +CopySignData:: ld de, wSignCoords ; start of sign coords ld bc, wSignTextIDs ; start of sign text ids ld a, [wNumSigns] ; number of signs @@ -2006,7 +1982,7 @@ CopySignData:: ; 0eb3 (0:0eb3) ret ; function to load map data -LoadMapData:: ; 1241 (0:1241) +LoadMapData:: ld a, [H_LOADEDROMBANK] push af call DisableLCD @@ -2035,13 +2011,13 @@ LoadMapData:: ; 1241 (0:1241) call BankswitchCommon ret -LoadScreenRelatedData:: ; 0f0c (0:0f0c) +LoadScreenRelatedData:: call LoadTileBlockMap call LoadTilesetTilePatternData call LoadCurrentMapView ret -ReloadMapAfterSurfingMinigame:: ; 0f16 (0:0f16) +ReloadMapAfterSurfingMinigame:: ld a, [H_LOADEDROMBANK] push af call DisableLCD @@ -2058,7 +2034,7 @@ ReloadMapAfterSurfingMinigame:: ; 0f16 (0:0f16) call BankswitchCommon jr asm_0f4d -ReloadMapAfterPrinter:: ; 0f3d (0:0f3d) +ReloadMapAfterPrinter:: ld a, [H_LOADEDROMBANK] push af ld a, [wCurMap] @@ -2066,11 +2042,11 @@ ReloadMapAfterPrinter:: ; 0f3d (0:0f3d) call LoadTileBlockMap pop af call BankswitchCommon -asm_0f4d: ; 0f4d (0:0f4d) - jpab Func_f02da +asm_0f4d: + jpab SetMapSpecificScriptFlagsOnMapReload ret ; useless? -ResetMapVariables:: ; 0f56 (0:0f56) +ResetMapVariables:: ld a, $98 ld [wMapViewVRAMPointer + 1], a xor a @@ -2083,10 +2059,10 @@ ResetMapVariables:: ; 0f56 (0:0f56) ld [wWalkBikeSurfStateCopy], a ret -CopyMapViewToVRAM:: ; 0f70 (0:0f70) +CopyMapViewToVRAM:: ; copy current map view to VRAM ld de, vBGMap0 -CopyMapViewToVRAM2: ; 0f73 (0:0f73) +CopyMapViewToVRAM2: ld hl, wTileMap ld b, 18 .vramCopyLoop @@ -2109,7 +2085,7 @@ CopyMapViewToVRAM2: ; 0f73 (0:0f73) ; function to switch to the ROM bank that a map is stored in ; Input: a = map number -SwitchToMapRomBank:: ; 0f8b (0:0f8b) +SwitchToMapRomBank:: push hl push bc ld c, a @@ -2127,7 +2103,7 @@ SwitchToMapRomBank:: ; 0f8b (0:0f8b) pop hl ret -GetMapHeaderPointer:: ; 0fa7 (0:0fa7) +GetMapHeaderPointer:: ld a, [H_LOADEDROMBANK] push af switchbank MapHeaderPointers ; 3f:41f2 @@ -2145,21 +2121,21 @@ GetMapHeaderPointer:: ; 0fa7 (0:0fa7) pop af jp BankswitchCommon -IgnoreInputForHalfSecond: ; 0fc3 (0:0fc3) +IgnoreInputForHalfSecond: ld a, 30 ld [wIgnoreInputCounter], a ld hl, wd730 ld a, [hl] - or $26 + or %00100110 ld [hl], a ; set ignore input bit ret -ResetUsingStrengthOutOfBattleBit: ; 0fd0 (0:0fd0) +ResetUsingStrengthOutOfBattleBit: ld hl, wd728 res 0, [hl] ret -ForceBikeOrSurf:: ; 0fd6 (0:0fd6) +ForceBikeOrSurf:: ld b, BANK(RedSprite) ld hl, LoadPlayerSpriteGraphics call Bankswitch @@ -2167,23 +2143,23 @@ ForceBikeOrSurf:: ; 0fd6 (0:0fd6) ; Handle the player jumping down ; a ledge in the overworld. -HandleMidJump:: ; 0fe1 (0:0fe1) +HandleMidJump:: ld a, [wd736] bit 6, a ; jumping down a ledge? ret z callba _HandleMidJump ret -IsSpinning:: ; 0ff0 (0:0ff0) +IsSpinning:: ld a, [wd736] bit 7, a ret z ; no spinning jpba LoadSpinnerArrowTiles ; spin while moving -Func_0ffe:: ; 0ffe (0:0ffe) +Func_0ffe:: jpab IsPlayerTalkingToPikachu -InitSprites:: ; 1006 (0:1006) +InitSprites:: ld a, [hli] ld [wNumSprites], a ; save the number of sprites push hl @@ -2237,7 +2213,7 @@ InitSprites:: ; 1006 (0:1006) jr nz, .loadSpriteLoop ret -ZeroSpriteStateData:: ; 1050 (0:1050) +ZeroSpriteStateData:: ; zero C110-C1EF and C210-C2EF ; C1F0-C1FF and C2F0-C2FF is used for Pikachu ld hl, wSpriteStateData1 + $10 @@ -2252,7 +2228,7 @@ ZeroSpriteStateData:: ; 1050 (0:1050) jr nz, .loop ret -DisableRegularSprites:: ; 1060 (0:1060) +DisableRegularSprites:: ; initialize all C100-C1FF sprite entries to disabled (other than player's and pikachu) ld hl, wSpriteStateData1 + 1 * $10 + 2 ld de, $10 @@ -2264,7 +2240,7 @@ DisableRegularSprites:: ; 1060 (0:1060) jr nz, .loop ret -LoadSprite:: ; 106f (0:106f) +LoadSprite:: push hl ld b, $0 ld hl, wMapSpriteData diff --git a/home/pic.asm b/home/pic.asm index 37abaecd..353d0f58 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -1,6 +1,6 @@ ; bankswitches and runs _UncompressSpriteData ; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr -UncompressSpriteData:: ; 23f8 (0:23f8) +UncompressSpriteData:: ld b, a ld a, [H_LOADEDROMBANK] push af @@ -15,7 +15,7 @@ UncompressSpriteData:: ; 23f8 (0:23f8) ret ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop -_UncompressSpriteData:: ; 2410 (0:2410) +_UncompressSpriteData:: ld hl, sSpriteBuffer1 ld c, (2*SPRITEBUFFERSIZE) % $100 ld b, (2*SPRITEBUFFERSIZE) / $100 @@ -52,7 +52,7 @@ _UncompressSpriteData:: ; 2410 (0:2410) ; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 ; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack -UncompressSpriteDataLoop:: ; 244c (0:244c) +UncompressSpriteDataLoop:: ld hl, sSpriteBuffer1 ld a, [wSpriteLoadFlags] bit 0, a @@ -142,7 +142,7 @@ UncompressSpriteDataLoop:: ; 244c (0:244c) ; moves output pointer to next position ; also cancels the calling function if the all output is done (by removing the return pointer from stack) ; and calls postprocessing functions according to the unpack mode -MoveToNextBufferPosition:: ; 24ce (0:24ce) +MoveToNextBufferPosition:: ld a, [wSpriteHeight] ld b, a ld a, [wSpriteCurPosY] @@ -203,7 +203,7 @@ MoveToNextBufferPosition:: ; 24ce (0:24ce) jp UnpackSprite ; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr) -WriteSpriteBitsToBuffer:: ; 253f (0:253f) +WriteSpriteBitsToBuffer:: ld e, a ld a, [wSpriteOutputBitOffset] and a @@ -231,7 +231,7 @@ WriteSpriteBitsToBuffer:: ; 253f (0:253f) ret ; reads next bit from input stream and returns it in a -ReadNextInputBit:: ; 2566 (0:2566) +ReadNextInputBit:: ld a, [wSpriteInputBitCounter] dec a jr nz, .curByteHasMoreBitsToRead @@ -247,7 +247,7 @@ ReadNextInputBit:: ; 2566 (0:2566) ret ; reads next byte from input stream and returns it in a -ReadNextInputByte:: ; 2581 (0:2581) +ReadNextInputByte:: ld a, [wSpriteInputPtr] ld l, a ld a, [wSpriteInputPtr+1] @@ -262,7 +262,7 @@ ReadNextInputByte:: ; 2581 (0:2581) ret ; the nth item is 2^n - 1 -LengthEncodingOffsetList:: ; 2595 (0:2595) +LengthEncodingOffsetList:: dw %0000000000000001 dw %0000000000000011 dw %0000000000000111 @@ -281,7 +281,7 @@ LengthEncodingOffsetList:: ; 2595 (0:2595) dw %1111111111111111 ; unpacks the sprite data depending on the unpack mode -UnpackSprite:: ; 25b5 (0:25b5) +UnpackSprite:: ld a, [wSpriteUnpackMode] cp $2 jp z, UnpackSpriteMode2 @@ -294,7 +294,7 @@ UnpackSprite:: ; 25b5 (0:25b5) ; decodes differential encoded sprite data ; input bit value 0 preserves the current bit value and input bit value 1 toggles it (starting from initial value 0). -SpriteDifferentialDecode:: ; 25ca (0:25ca) +SpriteDifferentialDecode:: xor a ld [wSpriteCurPosX], a ld [wSpriteCurPosY], a @@ -379,7 +379,7 @@ SpriteDifferentialDecode:: ; 25ca (0:25ca) ret ; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1) -DifferentialDecodeNybble:: ; 2663 (0:2663) +DifferentialDecodeNybble:: srl a ; c=a%2, a/=2 ld c, $0 jr nc, .evenNumber @@ -421,7 +421,7 @@ DifferentialDecodeNybble:: ; 2663 (0:2663) ld e, a ; update last decoded data ret -DecodeNybble0Table:: ; 269d (0:269d) +DecodeNybble0Table:: dn $0, $1 dn $3, $2 dn $7, $6 @@ -430,7 +430,7 @@ DecodeNybble0Table:: ; 269d (0:269d) dn $c, $d dn $8, $9 dn $b, $a -DecodeNybble1Table:: ; 26a5 (0:26a5) +DecodeNybble1Table:: dn $f, $e dn $c, $d dn $8, $9 @@ -439,7 +439,7 @@ DecodeNybble1Table:: ; 26a5 (0:26a5) dn $3, $2 dn $7, $6 dn $4, $5 -DecodeNybble0TableFlipped:: ; 26ad (0:26ad) +DecodeNybble0TableFlipped:: dn $0, $8 dn $c, $4 dn $e, $6 @@ -448,7 +448,7 @@ DecodeNybble0TableFlipped:: ; 26ad (0:26ad) dn $3, $b dn $1, $9 dn $d, $5 -DecodeNybble1TableFlipped:: ; 26b5 (0:26b5) +DecodeNybble1TableFlipped:: dn $f, $7 dn $3, $b dn $1, $9 @@ -459,7 +459,7 @@ DecodeNybble1TableFlipped:: ; 26b5 (0:26b5) dn $2, $a ; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand. -XorSpriteChunks:: ; 26bd (0:26bd) +XorSpriteChunks:: xor a ld [wSpriteCurPosX], a ld [wSpriteCurPosY], a @@ -524,19 +524,19 @@ XorSpriteChunks:: ; 26bd (0:26bd) ret ; reverses the bits in the nybble given in register a -ReverseNybble:: ; 272d (0:272d) +ReverseNybble:: ld de, NybbleReverseTable add e ld e, a - jr nc, .asm_2735 + jr nc, .noCarry inc d -.asm_2735 +.noCarry ld a, [de] ret ; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags -ResetSpriteBufferPointers:: ; 2737 (0:2737) - ld a, [wSpriteLoadFlags] ; wd0a8 +ResetSpriteBufferPointers:: + ld a, [wSpriteLoadFlags] bit 0, a jr nz, .buffer2Selected ld de, sSpriteBuffer1 @@ -557,11 +557,11 @@ ResetSpriteBufferPointers:: ; 2737 (0:2737) ret ; maps each nybble to its reverse -NybbleReverseTable:: ; 275d (0:275d) +NybbleReverseTable:: db $0, $8, $4, $c, $2, $a, $6 ,$e, $1, $9, $5, $d, $3, $b, $7 ,$f ; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. -UnpackSpriteMode2:: ; 276d (0:276d) +UnpackSpriteMode2:: call ResetSpriteBufferPointers ld a, [wSpriteFlipped] push af @@ -578,7 +578,7 @@ UnpackSpriteMode2:: ; 276d (0:276d) jp XorSpriteChunks ; stores hl into the output pointers -StoreSpriteOutputPointer:: ; 278d (0:278d) +StoreSpriteOutputPointer:: ld a, l ld [wSpriteOutputPtr], a ld [wSpriteOutputPtrCached], a diff --git a/home/pikachu.asm b/home/pikachu.asm index e79fdb1b..d16e95db 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -1,4 +1,4 @@ -Func_1510:: ; 1510 (0:1510) +Func_1510:: push hl ld hl, wPikachuOverworldStateFlags set 7, [hl] @@ -7,21 +7,21 @@ Func_1510:: ; 1510 (0:1510) pop hl ret -Func_151d:: ; 151d (0:151d) +Func_151d:: push hl ld hl, wPikachuOverworldStateFlags res 7, [hl] pop hl ret -Func_1525:: ; 1525 (0:1525) +EnablePikachuOverworldSpriteDrawing:: push hl ld hl, wPikachuOverworldStateFlags res 3, [hl] pop hl ret -Func_152d:: ; 152d (0:152d) +DisablePikachuOverworldSpriteDrawing:: push hl ld hl, wPikachuOverworldStateFlags set 3, [hl] @@ -30,28 +30,28 @@ Func_152d:: ; 152d (0:152d) pop hl ret -DisablePikachuFollowingPlayer:: ; 153a (0:153a) +DisablePikachuFollowingPlayer:: push hl ld hl, wPikachuOverworldStateFlags set 1, [hl] pop hl ret -EnablePikachuFollowingPlayer:: ; 1542 (0:1542) +EnablePikachuFollowingPlayer:: push hl ld hl, wPikachuOverworldStateFlags res 1, [hl] pop hl ret -CheckPikachuFollowingPlayer:: ; 154a (0:154a) +CheckPikachuFollowingPlayer:: push hl ld hl, wPikachuOverworldStateFlags bit 1, [hl] pop hl ret -SpawnPikachu:: ; 1552 (0:1552) +SpawnPikachu:: ld a, [hl] dec a swap a @@ -59,7 +59,7 @@ SpawnPikachu:: ; 1552 (0:1552) homecall SpawnPikachu_ ; 3f:46d5 ret -Pikachu_IsInArray:: ; 1568 (0:1568) +Pikachu_IsInArray:: ld b, $0 ld c, a .loop @@ -80,7 +80,7 @@ Pikachu_IsInArray:: ; 1568 (0:1568) and a ret -GetPikachuMovementScriptByte:: ; 157c (0:157c) +GetPikachuMovementScriptByte:: push hl push bc ld a, [H_LOADEDROMBANK] @@ -104,7 +104,7 @@ GetPikachuMovementScriptByte:: ; 157c (0:157c) pop hl ret -ApplyPikachuMovementData:: ; 159b (0:159b) +ApplyPikachuMovementData:: ld a, [H_LOADEDROMBANK] ld b, a push af diff --git a/home/play_time.asm b/home/play_time.asm index 8044d15c..47b2a690 100644 --- a/home/play_time.asm +++ b/home/play_time.asm @@ -1,4 +1,4 @@ -TrackPlayTime: ; 1ef5 (0:1ef5) +TrackPlayTime: call CountDownIgnoreInputBitReset ld hl, wd47a bit 0, [hl] @@ -46,7 +46,7 @@ TrackPlayTime: ; 1ef5 (0:1ef5) ld [wPlayTimeMaxed], a ret -CountDownIgnoreInputBitReset: ; 1f54 (0:1f54) +CountDownIgnoreInputBitReset: ld a, [wIgnoreInputCounter] and a jr nz, .asm_1f5e diff --git a/home/predef.asm b/home/predef.asm index 5d879ddc..c55760d7 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -1,4 +1,4 @@ -Predef:: ; 3eb4 (0:3eb4) +Predef:: ; Call predefined function a. ; To preserve other registers, have the ; destination call GetPredefRegisters. @@ -30,7 +30,7 @@ Predef:: ; 3eb4 (0:3eb4) call BankswitchCommon ret -GetPredefRegisters:: ; 3ed7 (0:3ed7) +GetPredefRegisters:: ; Restore the contents of register pairs ; when GetPredefPointer was called. ld a, [wPredefRegisters + 0] diff --git a/home/serial.asm b/home/serial.asm index c8c7cbe9..5fe7fb81 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -1,4 +1,4 @@ -Serial:: ; 1f78 (0:1f78) +Serial:: push af push bc push de @@ -55,7 +55,7 @@ Serial:: ; 1f78 (0:1f78) ; hl = send data ; de = receive data ; bc = length of data -Serial_ExchangeBytes:: ; 216f (0:216f) +Serial_ExchangeBytes:: ld a, 1 ld [hSerialIgnoringInitialData], a .loop @@ -89,84 +89,84 @@ Serial_ExchangeBytes:: ; 216f (0:216f) jr nz, .loop ret -Serial_ExchangeByte:: ; 1ff6 (0:1ff6) +Serial_ExchangeByte:: xor a ld [hSerialReceivedNewData], a ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK - jr nz, .asm_2003 + jr nz, .loop ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a -.asm_2003 +.loop ld a, [hSerialReceivedNewData] and a - jr nz, .asm_204d + jr nz, .ok ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK - jr nz, .asm_2028 + jr nz, .doNotIncrementUnknownCounter call IsUnknownCounterZero - jr z, .asm_2028 + jr z, .doNotIncrementUnknownCounter call WaitLoop_15Iterations push hl ld hl, wUnknownSerialCounter + 1 inc [hl] - jr nz, .asm_201f + jr nz, .noCarry dec hl inc [hl] -.asm_201f +.noCarry pop hl call IsUnknownCounterZero - jr nz, .asm_2003 + jr nz, .loop jp SetUnknownCounterToFFFF -.asm_2028 +.doNotIncrementUnknownCounter ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) - jr nz, .asm_2003 + jr nz, .loop ld a, [wUnknownSerialCounter2] dec a ld [wUnknownSerialCounter2], a - jr nz, .asm_2003 + jr nz, .loop ld a, [wUnknownSerialCounter2 + 1] dec a ld [wUnknownSerialCounter2 + 1], a - jr nz, .asm_2003 + jr nz, .loop ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK - jr z, .asm_204d + jr z, .ok ld a, 255 .waitLoop dec a jr nz, .waitLoop -.asm_204d +.ok xor a ld [hSerialReceivedNewData], a ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) sub (1 << SERIAL) - jr nz, .asm_2060 + jr nz, .skipReloadingUnknownCounter2 ld [wUnknownSerialCounter2], a ld a, $50 ld [wUnknownSerialCounter2 + 1], a -.asm_2060 +.skipReloadingUnknownCounter2 ld a, [hSerialReceiveData] cp SERIAL_NO_DATA_BYTE ret nz call IsUnknownCounterZero - jr z, .asm_207b + jr z, .done push hl ld hl, wUnknownSerialCounter + 1 ld a, [hl] dec a ld [hld], a inc a - jr nz, .asm_2075 + jr nz, .noBorrow dec [hl] -.asm_2075 +.noBorrow pop hl call IsUnknownCounterZero jr z, SetUnknownCounterToFFFF -.asm_207b +.done ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) @@ -177,14 +177,14 @@ Serial_ExchangeByte:: ; 1ff6 (0:1ff6) call DelayFrame jp Serial_ExchangeByte -WaitLoop_15Iterations:: ; 208d (0:208d) +WaitLoop_15Iterations:: ld a, 15 .waitLoop dec a jr nz, .waitLoop ret -IsUnknownCounterZero:: ; 2093 (0:2093) +IsUnknownCounterZero:: push hl ld hl, wUnknownSerialCounter ld a, [hli] @@ -193,7 +193,7 @@ IsUnknownCounterZero:: ; 2093 (0:2093) ret ; a is always 0 when this is called -SetUnknownCounterToFFFF:: ; 209b (0:209b) +SetUnknownCounterToFFFF:: dec a ld [wUnknownSerialCounter], a ld [wUnknownSerialCounter + 1], a @@ -201,7 +201,7 @@ SetUnknownCounterToFFFF:: ; 209b (0:209b) ; This is used to exchange the button press and selected menu item on the link menu. ; The data is sent thrice and read twice to increase reliability. -Serial_ExchangeLinkMenuSelection:: ; 2247 (0:2247) +Serial_ExchangeLinkMenuSelection:: ld hl, wLinkMenuSelectionSendBuffer ld de, wLinkMenuSelectionReceiveBuffer ld c, 2 ; number of bytes to save @@ -226,13 +226,13 @@ Serial_ExchangeLinkMenuSelection:: ; 2247 (0:2247) jr nz, .loop ret -Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 20ca (0:20ca) +Serial_PrintWaitingTextAndSyncAndExchangeNybble:: call SaveScreenTilesToBuffer1 - callab PrintWaitingText ; 1:4b89 + callab PrintWaitingText call Serial_SyncAndExchangeNybble jp LoadScreenTilesFromBuffer1 -Serial_SyncAndExchangeNybble:: ; 20db (0:20db) +Serial_SyncAndExchangeNybble:: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a .loop1 @@ -272,7 +272,7 @@ Serial_SyncAndExchangeNybble:: ; 20db (0:20db) ld [wSerialSyncAndExchangeNybbleReceiveData], a ret -Serial_ExchangeNybble:: ; 211f (0:211f) +Serial_ExchangeNybble:: call .doExchange ld a, [wSerialExchangeNybbleSendData] add $60 @@ -295,7 +295,7 @@ Serial_ExchangeNybble:: ; 211f (0:211f) ld [wSerialExchangeNybbleReceiveData], a ret -Serial_SendZeroByte:: ; 2149 (0:2149) +Serial_SendZeroByte:: xor a ld [hSerialSendData], a ld a, [hSerialConnectionStatus] @@ -305,7 +305,7 @@ Serial_SendZeroByte:: ; 2149 (0:2149) ld [rSC], a ret -Serial_TryEstablishingExternallyClockedConnection:: ; 22fa (0:22fa) +Serial_TryEstablishingExternallyClockedConnection:: ld a, ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK ld [rSB], a xor a @@ -314,10 +314,10 @@ Serial_TryEstablishingExternallyClockedConnection:: ; 22fa (0:22fa) ld [rSC], a ret -PrinterSerial__:: ; 2162 (0:2162) +PrinterSerial__:: call PrinterSerial pop hl pop de pop bc pop af - reti
\ No newline at end of file + reti diff --git a/home/text.asm b/home/text.asm index eadaf0b3..b3f96315 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,4 +1,4 @@ -TextBoxBorder:: ; 16f0 (0:16f0) +TextBoxBorder:: ; Draw a cxb text box at hl. ; top row @@ -37,7 +37,7 @@ TextBoxBorder:: ; 16f0 (0:16f0) ld [hl], "┘" ret -NPlaceChar:: ; 171d (0:171d) +NPlaceChar:: ; Place char a c times. ld d, c .loop @@ -46,9 +46,9 @@ NPlaceChar:: ; 171d (0:171d) jr nz, .loop ret -PlaceString:: ; 1723 (0:1723) +PlaceString:: push hl -PlaceNextChar:: ; 1724 (0:1724) +PlaceNextChar:: ld a, [de] cp "@" @@ -58,22 +58,22 @@ PlaceNextChar:: ; 1724 (0:1724) pop hl ret -Char4ETest:: ; 172d (0:172d) - cp $4E - jr nz, .next - ld bc, $0028 +Char4ETest:: + cp $4E ; next + jr nz, .char4FTest + ld bc, 2 * SCREEN_WIDTH ld a, [hFlags_0xFFFA] bit 2, a - jr z, .next2 + jr z, .ok ld bc, SCREEN_WIDTH -.next2 +.ok pop hl add hl, bc push hl - jp PlaceNextChar_inc ; 17b6 + jp PlaceNextChar_inc -.next - cp $4F +.char4FTest + cp $4F ; line jr nz, .next3 pop hl coord hl, 1, 16 @@ -81,53 +81,43 @@ Char4ETest:: ; 172d (0:172d) jp PlaceNextChar_inc .next3 ; Check against a dictionary +dict: macro +if \1 == 0 and a - jp z, Char00 - cp $4C - jp z, Char4C - cp $4B - jp z, Char4B - cp $51 - jp z, Char51 - cp $49 - jp z, Char49 - cp $52 - jp z, Char52 - cp $53 - jp z, Char53 - cp $54 - jp z, Char54 - cp $5B - jp z, Char5B - cp $5E - jp z, Char5E - cp $5C - jp z, Char5C - cp $5D - jp z, Char5D - cp $55 - jp z, Char55 - cp $56 - jp z, Char56 - cp $57 - jp z, Char57 - cp $58 - jp z, Char58 - cp $4A - jp z, Char4A - cp $5F - jp z, Char5F - cp $59 - jp z, Char59 - cp $5A - jp z, Char5A +else + cp \1 +endc + jp z, \2 +endm + + dict $00, Char00 ; error + dict $4C, Char4C ; autocont + dict $4B, Char4B ; cont_ + dict $51, Char51 ; para + dict $49, Char49 ; page + dict $52, Char52 ; player + dict $53, Char53 ; rival + dict $54, Char54 ; POKé + dict $5B, Char5B ; PC + dict $5E, Char5E ; ROCKET + dict $5C, Char5C ; TM + dict $5D, Char5D ; TRAINER + dict $55, Char55 ; cont + dict $56, Char56 ; 6 dots + dict $57, Char57 ; done + dict $58, Char58 ; prompt + dict $4A, Char4A ; PKMN + dict $5F, Char5F ; dex + dict $59, Char59 ; TARGET + dict $5A, Char5A ; USER + ld [hli], a call PrintLetterDelay -PlaceNextChar_inc:: ; 17b6 (0:17b6) +PlaceNextChar_inc:: inc de jp PlaceNextChar -Char00:: ; 17ba (0:17ba) +Char00:: ld b, h ld c, l pop hl @@ -135,56 +125,56 @@ Char00:: ; 17ba (0:17ba) dec de ret -Char00Text:: ; 17c2 (0:17c2) ; “%d ERROR.” - TX_FAR _Char00Text ; a0c66 (28:4c66) +Char00Text:: ; “%d ERROR.” + TX_FAR _Char00Text db "@" -Char52:: ; 17c7 (0:17c7) ; player’s name +Char52:: ; player’s name push de ld de, wPlayerName jr FinishDTE -Char53:: ; 17cd (0:17cd) ; rival’s name +Char53:: ; rival’s name push de ld de, wRivalName jr FinishDTE -Char5D:: ; 17d3 (0:17d3) ; TRAINER +Char5D:: ; TRAINER push de ld de, Char5DText jr FinishDTE -Char5C:: ; 17d9 (0:17d9) ; TM +Char5C:: ; TM push de ld de, Char5CText jr FinishDTE -Char5B:: ; 17df (0:17df) ; PC +Char5B:: ; PC push de ld de, Char5BText jr FinishDTE -Char5E:: ; 17e5 (0:17e5) ; ROCKET +Char5E:: ; ROCKET push de ld de, Char5EText jr FinishDTE -Char54:: ; 17eb (0:17eb) ; POKé +Char54:: ; POKé push de ld de, Char54Text jr FinishDTE -Char56:: ; 17f1 (0:17f1) ; …… +Char56:: ; …… push de ld de, Char56Text jr FinishDTE -Char4A:: ; 17f7 (0:17f7) ; PKMN +Char4A:: ; PKMN push de ld de, Char4AText jr FinishDTE -Char59:: ; 17fb (0:17fb) +Char59:: ; depending on whose turn it is, print ; enemy active monster’s name, prefixed with “Enemy ” ; or @@ -194,13 +184,13 @@ Char59:: ; 17fb (0:17fb) xor 1 jr MonsterNameCharsCommon -Char5A:: ; 1803 (0:1803) +Char5A:: ; depending on whose turn it is, print ; player active monster’s name ; or ; enemy active monster’s name, prefixed with “Enemy ” ld a, [H_WHOSETURN] -MonsterNameCharsCommon:: ; 1a37 (0:1a37) +MonsterNameCharsCommon:: push de and a jr nz, .Enemy @@ -215,7 +205,7 @@ MonsterNameCharsCommon:: ; 1a37 (0:1a37) ld l, c ld de, wEnemyMonNick ; enemy active monster name -FinishDTE:: ; 1819 (0:1819) +FinishDTE:: call PlaceString ld h, b ld l, c @@ -223,67 +213,67 @@ FinishDTE:: ; 1819 (0:1819) inc de jp PlaceNextChar -Char5CText:: ; 1823 (0:1823) +Char5CText:: db "TM@" -Char5DText:: ; 1826 (0:1826) +Char5DText:: db "TRAINER@" -Char5BText:: ; 182e (0:182e) +Char5BText:: db "PC@" -Char5EText:: ; 1831 (0:1830) +Char5EText:: db "ROCKET@" -Char54Text:: ; 1838 (0:1838) +Char54Text:: db "POKé@" -Char56Text:: ; 183d (0:183d) +Char56Text:: db "……@" -Char5AText:: ; 1840 (0:1840) +Char5AText:: db "Enemy @" -Char4AText:: ; 1847 (0:1847) +Char4AText:: db $E1, $E2, "@" ; PKMN -Char55:: ; 184a (0:184a) +Char55:: push de ld b, h ld c, l ld hl, Char55Text - call TextCommandProcessor ; 1919 + call TextCommandProcessor ld h, b ld l, c pop de inc de jp PlaceNextChar -Char55Text:: ; 185a (0:185a) +Char55Text:: ; equivalent to Char4B - TX_FAR _Char55Text ; a0c73 (28:4c73) + TX_FAR _Char55Text db "@" -Char5F:: ; 185f (0:185f) +Char5F:: ; ends a Pokédex entry ld [hl], "." pop hl ret -Char58:: ; 1863 (0:1863) +Char58:: ; prompt ld a, [wLinkState] cp LINK_STATE_BATTLING - jp z, Next1870 + jp z, .ok ld a, $EE Coorda 18, 16 -Next1870:: ; 1870 (0:1870) - call ProtectedDelay3 ; 1913 - call ManualTextScroll ; 388e - ld a, " " ; space +.ok + call ProtectedDelay3 + call ManualTextScroll + ld a, " " Coorda 18, 16 -Char57:: ; 1aad (0:1aad) +Char57:: ; done pop hl ld de, Char58Text dec de ret -Char58Text:: ; 1881 (0:1881) +Char58Text:: db "@" -Char51:: ; 1882 (0:1882) +Char51:: ; para push de ld a, $EE Coorda 18, 16 @@ -298,7 +288,7 @@ Char51:: ; 1882 (0:1882) coord hl, 1, 14 jp PlaceNextChar_inc -Char49:: ; 18a3 (0:18a3) +Char49:: ld a, [hFlags_0xFFFA] bit 3, a jr z, .Char49 @@ -322,7 +312,7 @@ Char49:: ; 18a3 (0:18a3) push hl jp PlaceNextChar_inc -Char4B:: ; 18d1 (0:18d1) +Char4B:: ld a, $EE Coorda 18, 16 call ProtectedDelay3 @@ -332,15 +322,15 @@ Char4B:: ; 18d1 (0:18d1) ld a, " " Coorda 18, 16 ;fall through -Char4C:: ; 18e3 (0:18e3) +Char4C:: push de - call Next18F1 ; 18f1 - call Next18F1 + call ScrollTextUpOneLine + call ScrollTextUpOneLine coord hl, 1, 16 pop de jp PlaceNextChar_inc -Next18F1:: ; 18f1 (0:18f1) +ScrollTextUpOneLine:: coord hl, 0, 14 coord de, 0, 13 ld b, 60 @@ -367,13 +357,13 @@ Next18F1:: ; 18f1 (0:18f1) ret -ProtectedDelay3:: ; 1913 (0:1913) +ProtectedDelay3:: push bc call Delay3 pop bc ret -TextCommandProcessor:: ; 1919 (0:1919) +TextCommandProcessor:: ld a, [wLetterPrintingDelayFlags] push af set 1, a @@ -386,7 +376,7 @@ TextCommandProcessor:: ; 1919 (0:1919) ld a, b ld [wTextDestinationTileAddrBuffer + 1], a -NextTextCommand:: ; 192e (0:192e) +NextTextCommand:: ld a, [hli] cp a, "@" ; terminator jr nz, .doTextCommand @@ -403,21 +393,21 @@ NextTextCommand:: ; 192e (0:192e) ld hl, TextCommandJumpTable push bc add a - ld b, $00 + ld b, 0 ld c, a add hl, bc pop bc ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; draw box ; 04AAAABBCC ; AAAA = address of upper left corner ; BB = height ; CC = width -TextCommand04:: ; 1951 (0:1951) +TextCommand04:: pop hl ld a, [hli] ld e, a @@ -436,7 +426,7 @@ TextCommand04:: ; 1951 (0:1951) ; place string inline ; 00{string} -TextCommand00:: ; 1963 (0:1963) +TextCommand00:: pop hl ld d, h ld e, l @@ -451,7 +441,7 @@ TextCommand00:: ; 1963 (0:1963) ; place string from RAM ; 01AAAA ; AAAA = address of string -TextCommand01:: ; 1970 (0:1970) +TextCommand01:: pop hl ld a, [hli] ld e, a @@ -470,7 +460,7 @@ TextCommand01:: ; 1970 (0:1970) ; BB ; bits 0-4 = length in bytes ; bits 5-7 = unknown flags -TextCommand02:: ; 197e (0:197e) +TextCommand02:: pop hl ld a, [hli] ld e, a @@ -490,7 +480,7 @@ TextCommand02:: ; 197e (0:197e) ; repoint destination address ; 03AAAA ; AAAA = new destination address -TextCommand03:: ; 1990 (0:1990) +TextCommand03:: pop hl ld a, [hli] ld [wTextDestinationTileAddrBuffer], a @@ -503,7 +493,7 @@ TextCommand03:: ; 1990 (0:1990) ; repoint destination to second line of dialogue text box ; 05 ; (no arguments) -TextCommand05:: ; 199e (0:199e) +TextCommand05:: pop hl coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand @@ -511,7 +501,7 @@ TextCommand05:: ; 199e (0:199e) ; blink arrow and wait for A or B to be pressed ; 06 ; (no arguments) -TextCommand06:: ; 19a5 (0:19a5) +TextCommand06:: ld a, [wLinkState] cp a, LINK_STATE_BATTLING jp z, TextCommand0D @@ -528,22 +518,22 @@ TextCommand06:: ; 19a5 (0:19a5) ; scroll text up one line ; 07 ; (no arguments) -TextCommand07:: ; 19c0 (0:19c0) +TextCommand07:: ld a, " " Coorda 18, 16 ; place blank space in lower right corner of dialogue text box - call Next18F1 ; scroll up text - call Next18F1 + call ScrollTextUpOneLine + call ScrollTextUpOneLine pop hl coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand ; execute asm inline ; 08{code} -TextCommand08:: ; 19d2 (0:19d2) +TextCommand08:: pop hl ld de, NextTextCommand push de ; return address - jp [hl] + jp hl ; print decimal number (converted from binary number) ; 09AAAABB @@ -551,7 +541,7 @@ TextCommand08:: ; 19d2 (0:19d2) ; BB ; bits 0-3 = how many digits to display ; bits 4-7 = how long the number is in bytes -TextCommand09:: ; 19d8 (0:19d8) +TextCommand09:: pop hl ld a, [hli] ld e, a @@ -578,7 +568,7 @@ TextCommand09:: ; 19d8 (0:19d8) ; wait half a second if the user doesn't hold A or B ; 0A ; (no arguments) -TextCommand0A:: ; 19f6 (0:19f6) +TextCommand0A:: push bc call Joypad ld a, [hJoyHeld] @@ -594,7 +584,7 @@ TextCommand0A:: ; 19f6 (0:19f6) ; plays sounds ; this actually handles various command ID's, not just 0B ; (no arguments) -TextCommand0B:: ; 1a0a (0:1a0a) +TextCommand0B:: pop hl push bc dec hl @@ -631,7 +621,7 @@ TextCommand0B:: ; 1a0a (0:1a0a) jp NextTextCommand ; format: text command ID, sound ID or cry ID -TextCommandSounds:: ; 1a3d (0:1a3d) +TextCommandSounds:: db $0B, SFX_GET_ITEM_1 db $12, SFX_TURN_OFF_PC db $0E, SFX_POKEDEX_RATING @@ -639,14 +629,14 @@ TextCommandSounds:: ; 1a3d (0:1a3d) db $10, SFX_GET_ITEM_2 db $11, SFX_GET_KEY_ITEM db $13, SFX_TRADE_MACHINE - db $14, PIKACHU ; used in OakSpeech + db $14, PIKACHU ; used in OakSpeech db $15, PIDGEOT ; used in SaffronCityText12 db $16, DEWGONG ; unused? ; draw ellipses ; 0CAA ; AA = number of ellipses to draw -TextCommand0C:: ; 1a51 (0:1a51) +TextCommand0C:: pop hl ld a, [hli] ld d, a @@ -675,7 +665,7 @@ TextCommand0C:: ; 1a51 (0:1a51) ; wait for A or B to be pressed ; 0D ; (no arguments) -TextCommand0D:: ; 1a73 (0:1a73) +TextCommand0D:: push bc call ManualTextScroll ; wait for A or B to be pressed pop bc @@ -686,7 +676,7 @@ TextCommand0D:: ; 1a73 (0:1a73) ; 17AAAABB ; AAAA = address of text commands ; BB = bank -TextCommand17:: ; 1a7c (0:1a7c) +TextCommand17:: pop hl ld a, [H_LOADEDROMBANK] push af @@ -707,7 +697,7 @@ TextCommand17:: ; 1a7c (0:1a7c) ld [MBC1RomBank], a jp NextTextCommand -TextCommandJumpTable:: ; 1a9a (0:1a9a) +TextCommandJumpTable:: dw TextCommand00 dw TextCommand01 dw TextCommand02 diff --git a/home/timer.asm b/home/timer.asm index 8578df1a..05e307bd 100644 --- a/home/timer.asm +++ b/home/timer.asm @@ -1,3 +1,3 @@ ; timer interrupt is apparently not invoked anyway -Timer:: ; 2306 (0:2306) +Timer:: reti diff --git a/home/vblank.asm b/home/vblank.asm index 24159a4c..764e5277 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -1,4 +1,4 @@ -VBlank:: ; 1de5 (0:1de5) +VBlank:: push af push bc @@ -55,8 +55,8 @@ VBlank:: ; 1de5 (0:1de5) jr z, .skipDec dec a ld [H_FRAMECOUNTER], a -.skipDec +.skipDec call FadeOutAudio callbs Music_DoLowHealthAlarm @@ -78,7 +78,7 @@ VBlank:: ; 1de5 (0:1de5) reti -DelayFrame:: ; 1e64 (0:1e64) +DelayFrame:: ; Wait for the next vblank interrupt. ; As a bonus, this saves battery. diff --git a/home/vcopy.asm b/home/vcopy.asm index 464faf51..2974dfec 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -1,7 +1,7 @@ ; this function seems to be used only once ; it store the address of a row and column of the VRAM background map in hl ; INPUT: h - row, l - column, b - high byte of background tile map address in VRAM -GetRowColAddressBgMap:: ; 1cdd (0:1cdd) +GetRowColAddressBgMap:: xor a srl h rr a @@ -18,7 +18,7 @@ GetRowColAddressBgMap:: ; 1cdd (0:1cdd) ; clears a VRAM background map with blank space tiles ; INPUT: h - high byte of background tile map address in VRAM -ClearBgMap:: ; 1cf0 (0:1cf0) +ClearBgMap:: ld a," " jr .next ld a,l @@ -39,7 +39,7 @@ ClearBgMap:: ; 1cf0 (0:1cf0) ; row or column is more efficient than redrawing the entire screen. ; However, this function is also called repeatedly to redraw the whole screen ; when necessary. It is also used in trade animation and elevator code. -RedrawRowOrColumn:: ; 1ada (0:1ada) +RedrawRowOrColumn:: ld a,[hRedrawRowOrColumnMode] and a ret z @@ -119,7 +119,7 @@ RedrawRowOrColumn:: ; 1ada (0:1ada) ; on when talking to sprites, battling, using menus, etc. This is because ; the above function, RedrawRowOrColumn, is used when walking to ; improve efficiency. -AutoBgMapTransfer:: ; 1b30 (0:1b30) +AutoBgMapTransfer:: ld a,[H_AUTOBGTRANSFERENABLED] and a ret z @@ -163,7 +163,7 @@ AutoBgMapTransfer:: ; 1b30 (0:1b30) ld [H_AUTOBGTRANSFERPORTION],a ; store next portion ld b,6 -TransferBgRows:: ; 1d9e (0:1d9e) +TransferBgRows:: ; unrolled loop and using pop for speed rept 20 / 2 - 1 @@ -197,7 +197,7 @@ TransferBgRows:: ; 1d9e (0:1d9e) ; Copies [H_VBCOPYBGNUMROWS] rows from H_VBCOPYBGSRC to H_VBCOPYBGDEST. ; If H_VBCOPYBGSRC is XX00, the transfer is disabled. -VBlankCopyBgMap:: ; 1bb5 (0:1bb5) +VBlankCopyBgMap:: ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte and a ret z @@ -218,7 +218,7 @@ VBlankCopyBgMap:: ; 1bb5 (0:1bb5) jr TransferBgRows -VBlankCopyDouble:: ; 1bd1 (0:1bd1) +VBlankCopyDouble:: ; Copy [H_VBCOPYDOUBLESIZE] 1bpp tiles ; from H_VBCOPYDOUBLESRC to H_VBCOPYDOUBLEDEST. @@ -286,7 +286,7 @@ VBlankCopyDouble:: ; 1bd1 (0:1bd1) ret -VBlankCopy:: ; 1c21 (0:1c21) +VBlankCopy:: ; Copy [H_VBCOPYSIZE] 2bpp tiles (or 16 * [H_VBCOPYSIZE] tile map entries) ; from H_VBCOPYSRC to H_VBCOPYDEST. @@ -345,7 +345,7 @@ VBlankCopy:: ; 1c21 (0:1c21) ret -UpdateMovingBgTiles:: ; 1c75 (0:1c75) +UpdateMovingBgTiles:: ; Animate water and flower ; tiles in the overworld. @@ -308,6 +308,8 @@ TX_RAM: MACRO ENDM TX_BCD: MACRO +; \1: RAM address to read from +; \2: number of bytes + print flags db $2 dw \1 db \2 @@ -352,8 +354,6 @@ TX_PRIZE_VENDOR EQUS "db $f7" TX_POKECENTER_PC EQUS "db $f9" TX_PLAYERS_PC EQUS "db $fc" TX_BILLS_PC EQUS "db $fd" -TX_POKEMART_CLERK EQUS "db $fe" -TX_POKECENTER_NURSE EQUS "db $ff" TX_MART: MACRO db $FE, _NARG @@ -364,6 +364,8 @@ TX_MART: MACRO db $FF ENDM +TX_POKECENTER_NURSE EQUS "db $ff" + ; Predef macro. predef_const: MACRO const \1PredefID @@ -848,108 +850,19 @@ enum_set: macro __enum__ = \1 endm -pikacry_def: MACRO -\1_id:: dba \1 -endm - -dpikacry: MACRO - db (\1_id - PikachuCriesPointerTable) / 3 - endm - -ldpikacry: MACRO - ld \1, (\2_id - PikachuCriesPointerTable) / 3 - ENDM - -pikacry: MACRO - ldpikacry a, \1 - endm - - - enum_start - enum pikapic_nop_command -pikapic_nop: macro - db pikapic_nop_command - endm - - enum pikapic_writebyte_command -pikapic_writebyte: macro - db pikapic_writebyte_command, \1 - endm - - enum pikapic_loadgfx_command -pikapic_loadgfx: macro - db pikapic_loadgfx_command, (\1_id - PikaPicAnimGFXHeaders) / 4 - endm - - enum pikapic_object_command -pikapic_object: macro - db pikapic_object_command - dw \1 - db \2, \3, \4 - endm - - enum pikapic_nop4_command -pikapic_nop4: macro - db pikapic_nop4_command - endm - - enum pikapic_nop5_command -pikapic_nop5: macro - db pikapic_nop5_command - endm - - enum pikapic_waitbgmapeleteobject_command -pikapic_waitbgmapeleteobject: macro - db pikapic_waitbgmapeleteobject_command, \1 - endm - - enum pikapic_nop7_command -pikapic_nop7: macro - db pikapic_nop7_command - endm - - enum pikapic_nop8_command -pikapic_nop8: macro - db pikapic_nop8_command - endm - - enum pikapic_jump_command -pikapic_jump: macro ; 9 - dbw pikapic_jump_command, \1 - endm - - enum pikapic_setduration_command -pikapic_setduration: macro ; a - dbw pikapic_setduration_command, \1 - endm - - enum pikapic_cry_command -pikapic_cry: macro ; b - db pikapic_cry_command -IF _NARG == 0 - db $ff -else - dpikacry \1 - endc - endm - - enum pikapic_thunderbolt_command -pikapic_thunderbolt: macro ; c - db pikapic_thunderbolt_command - endm - - enum pikapic_waitbgmap_command -pikapic_waitbgmap: macro ; d - db pikapic_waitbgmap_command - endm - - enum pikapic_ret_command -pikapic_ret: macro ; e - db pikapic_ret_command - endm - -pikapic_looptofinish: macro -.loop\@ - pikapic_waitbgmap - pikapic_jump .loop\@ - endm +ANIM_OBJ_INDEX EQUS "AnimatedObject0Index - AnimatedObject0" +ANIM_OBJ_FRAME_SET EQUS "AnimatedObject0FramesetID - AnimatedObject0" +ANIM_OBJ_CALLBACK EQUS "AnimatedObject0AnimSeqID - AnimatedObject0" +ANIM_OBJ_TILE EQUS "AnimatedObject0TileID - AnimatedObject0" +ANIM_OBJ_X_COORD EQUS "AnimatedObject0XCoord - AnimatedObject0" +ANIM_OBJ_Y_COORD EQUS "AnimatedObject0YCoord - AnimatedObject0" +ANIM_OBJ_X_OFFSET EQUS "AnimatedObject0XOffset - AnimatedObject0" +ANIM_OBJ_Y_OFFSET EQUS "AnimatedObject0YOffset - AnimatedObject0" +ANIM_OBJ_DURATION EQUS "AnimatedObject0Duration - AnimatedObject0" +ANIM_OBJ_DURATION_OFFSET EQUS "AnimatedObject0DurationOffset - AnimatedObject0" +ANIM_OBJ_FRAME_IDX EQUS "AnimatedObject0FrameIndex - AnimatedObject0" +ANIM_OBJ_FIELD_B EQU $b +ANIM_OBJ_FIELD_C EQU $c +ANIM_OBJ_FIELD_D EQU $d +ANIM_OBJ_FIELD_E EQU $e +ANIM_OBJ_FIELD_F EQU $f @@ -693,7 +693,7 @@ FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic" INCLUDE "engine/battle/display_effectiveness.asm" INCLUDE "engine/items/tmhm.asm" -Func_2fd6a: ; 2fd6a (b:7d6a) +Func_2fd6a: callab IsThisPartymonStarterPikachu_Party ret nc ld a, $3 diff --git a/scripts/celadongamecorner2.asm b/scripts/celadongamecorner2.asm new file mode 100755 index 00000000..f8d25905 --- /dev/null +++ b/scripts/celadongamecorner2.asm @@ -0,0 +1,12 @@ +Func_f1f23: + ld hl, PikachuMovementData_f1f2c + ld b, SPRITE_FACING_DOWN + call TryApplyPikachuMovementData + ret + +PikachuMovementData_f1f2c: + db $00 + db $20 + db $1e + db $35 + db $3f diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 6df2bcd6..187f8579 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -221,8 +221,8 @@ DayCareMText1: ld [wPikachuSpawnState], a ; GameFreak... TriHard - ld hl, Func_fc4fa - ld b, BANK(Func_fc4fa) + ld hl, SchedulePikachuSpawnForAfterText + ld b, BANK(SchedulePikachuSpawnForAfterText) ld hl, Bankswitch ldpikacry e, PikachuCry35 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 5a6b9456..55b58b39 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -473,8 +473,8 @@ OaksLabScript17: ld [wPlayerFacingDirection], a ld a, $2 ld [wPikachuSpawnState], a - callba Func_fc4fa - call Func_1525 + callba SchedulePikachuSpawnForAfterText + call EnablePikachuOverworldSpriteDrawing ld a, $1a ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -1044,7 +1044,7 @@ OaksLabText18: call AddPartyMon ld a, 163 ld [wPartyMon1CatchRate], a - call Func_152d + call DisablePikachuOverworldSpriteDrawing SetEvent EVENT_GOT_STARTER ld hl, wd72e set 3, [hl] diff --git a/scripts/pokemontower2_2.asm b/scripts/pokemontower2_2.asm new file mode 100755 index 00000000..42659da3 --- /dev/null +++ b/scripts/pokemontower2_2.asm @@ -0,0 +1,12 @@ +Func_f1e22: + ld hl, PikachuMovementData_f1e2b + ld b, SPRITE_FACING_RIGHT + call TryApplyPikachuMovementData + ret + +PikachuMovementData_f1e2b: + db $00 + db $1d + db $1f + db $38 + db $3f diff --git a/scripts/silphco11_2.asm b/scripts/silphco11_2.asm index 419efe24..bf575de5 100755 --- a/scripts/silphco11_2.asm +++ b/scripts/silphco11_2.asm @@ -73,4 +73,4 @@ MissableObjects_f25ce db HS_SILPH_CO_11F_JAMES db HS_SILPH_CO_11F_2 db HS_SILPH_CO_11F_JESSIE - db $ff
\ No newline at end of file + db $ff diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index eb726831..90ffc34c 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -29,14 +29,15 @@ Gym3LeaderName: VermilionGymScript_5ca6d: CheckEvent EVENT_2ND_LOCK_OPENED - jr nz, .asm_5ca78 + jr nz, .opened_second_lock ld a, $24 - jr .asm_5ca7f -.asm_5ca78 + jr .load_door_tile + +.opened_second_lock ld a, SFX_GO_INSIDE call PlaySound ld a, $5 -.asm_5ca7f +.load_door_tile ld [wNewTileBlockID], a lb bc, 2, 2 predef_jump ReplaceTileBlock @@ -73,12 +74,13 @@ VermilionGymScript_5caaa: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM24 - jr .asm_5cad3 + jr .set_gym_flags + .BagFull ld a, $8 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5cad3 +.set_gym_flags ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags @@ -132,17 +134,19 @@ VermilionGymTrainerHeader2: VermilionGymText1: TX_ASM CheckEvent EVENT_BEAT_LT_SURGE - jr z, .asm_5cb39 + jr z, .engage_surge CheckEventReuseA EVENT_GOT_TM24 - jr nz, .asm_5cb31 + jr nz, .after_win_text call z, VermilionGymScript_5caaa call DisableWaitingAfterTextDisplay - jr .asm_5cb6a -.asm_5cb31 + jr .text_script_end + +.after_win_text ld hl, VermilionGymText_5cb72 call PrintText - jr .asm_5cb6a -.asm_5cb39 + jr .text_script_end + +.engage_surge ld hl, VermilionGymText_5cb6d call PrintText ld hl, wd72d @@ -162,7 +166,7 @@ VermilionGymText1: ld a, $3 ld [wVermilionGymCurScript], a ld [wCurMapScript], a -.asm_5cb6a +.text_script_end jp TextScriptEnd VermilionGymText_5cb6d: @@ -179,7 +183,7 @@ VermilionGymText6: VermilionGymText7: TX_FAR _ReceivedTM24Text - db $11 + TX_SFX_KEY_ITEM TX_FAR _TM24ExplanationText db "@" @@ -249,14 +253,15 @@ VermilionGymText5: TX_ASM ld a, [wBeatGymFlags] bit 2, a - jr nz, .asm_5cbeb + jr nz, .beat_surge ld hl, VermilionGymText_5cbf4 call PrintText - jr .asm_5cbf1 -.asm_5cbeb + jr .text_script_end + +.beat_surge ld hl, VermilionGymText_5cbf9 call PrintText -.asm_5cbf1 +.text_script_end jp TextScriptEnd VermilionGymText_5cbf4: diff --git a/text/credits_text.asm b/text/credits_text.asm index 54b52c97..0010b93a 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -1,4 +1,4 @@ -CreditsTextPointers: ; 742c3 (1d:42c3) +CreditsTextPointers: dw CreditsText_Version dw CreditsText_Tajiri dw CreditsText_Oota diff --git a/text/item_names.asm b/text/item_names.asm index 6a401597..e436d74d 100755 --- a/text/item_names.asm +++ b/text/item_names.asm @@ -1,4 +1,4 @@ -ItemNames: ; 45b7 (1:45b7) +ItemNames: db "MASTER BALL@" db "ULTRA BALL@" db "GREAT BALL@" diff --git a/text/map_names.asm b/text/map_names.asm index 0338cba3..c2642942 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -1,107 +1,107 @@ -MapNames: ; 71473 (1c:5473) -PalletTownName: ; 71473 (1c:5473) +MapNames: +PalletTownName: db "PALLET TOWN@" -ViridianCityName: ; 7147f (1c:547f) +ViridianCityName: db "VIRIDIAN CITY@" -PewterCityName: ; 7148d (1c:548d) +PewterCityName: db "PEWTER CITY@" -CeruleanCityName: ; 71499 (1c:5499) +CeruleanCityName: db "CERULEAN CITY@" -LavenderTownName: ; 714a7 (1c:54a7) +LavenderTownName: db "LAVENDER TOWN@" -VermilionCityName: ; 714b5 (1c:54b5) +VermilionCityName: db "VERMILION CITY@" -CeladonCityName: ; 714c4 (1c:54c4) +CeladonCityName: db "CELADON CITY@" -FuchsiaCityName: ; 714d1 (1c:54d1) +FuchsiaCityName: db "FUCHSIA CITY@" -CinnabarIslandName: ; 714de (1c:54de) +CinnabarIslandName: db "CINNABAR ISLAND@" -IndigoPlateauName: ; 714ee (1c:54ee) +IndigoPlateauName: db "INDIGO PLATEAU@" -SaffronCityName: ; 714fd (1c:54fd) +SaffronCityName: db "SAFFRON CITY@" -Route1Name: ; 7150a (1c:550a) +Route1Name: db "ROUTE 1@" -Route2Name: ; 71512 (1c:5512) +Route2Name: db "ROUTE 2@" -Route3Name: ; 7151a (1c:551a) +Route3Name: db "ROUTE 3@" -Route4Name: ; 71522 (1c:5522) +Route4Name: db "ROUTE 4@" -Route5Name: ; 7152a (1c:552a) +Route5Name: db "ROUTE 5@" -Route6Name: ; 71532 (1c:5532) +Route6Name: db "ROUTE 6@" -Route7Name: ; 7153a (1c:553a) +Route7Name: db "ROUTE 7@" -Route8Name: ; 71542 (1c:5542) +Route8Name: db "ROUTE 8@" -Route9Name: ; 7154a (1c:554a) +Route9Name: db "ROUTE 9@" -Route10Name: ; 71552 (1c:5552) +Route10Name: db "ROUTE 10@" -Route11Name: ; 7155b (1c:555b) +Route11Name: db "ROUTE 11@" -Route12Name: ; 71564 (1c:5564) +Route12Name: db "ROUTE 12@" -Route13Name: ; 7156d (1c:556d) +Route13Name: db "ROUTE 13@" -Route14Name: ; 71576 (1c:5576) +Route14Name: db "ROUTE 14@" -Route15Name: ; 7157f (1c:557f) +Route15Name: db "ROUTE 15@" -Route16Name: ; 71588 (1c:5588) +Route16Name: db "ROUTE 16@" -Route17Name: ; 71591 (1c:5591) +Route17Name: db "ROUTE 17@" -Route18Name: ; 7159a (1c:559a) +Route18Name: db "ROUTE 18@" -Route19Name: ; 715a3 (1c:55a3) +Route19Name: db "SEA ROUTE 19@" -Route20Name: ; 715b0 (1c:55b0) +Route20Name: db "SEA ROUTE 20@" -Route21Name: ; 715bd (1c:55bd) +Route21Name: db "SEA ROUTE 21@" -Route22Name: ; 715ca (1c:55ca) +Route22Name: db "ROUTE 22@" -Route23Name: ; 715d3 (1c:55d3) +Route23Name: db "ROUTE 23@" -Route24Name: ; 715dc (1c:55dc) +Route24Name: db "ROUTE 24@" -Route25Name: ; 715e5 (1c:55e5) +Route25Name: db "ROUTE 25@" -ViridianForestName: ; 715ee (1c:55ee) +ViridianForestName: db "VIRIDIAN FOREST@" -MountMoonName: ; 715fe (1c:55fe) +MountMoonName: db "MT.MOON@" -RockTunnelName: ; 71606 (1c:5606) +RockTunnelName: db "ROCK TUNNEL@" -SeaCottageName: ; 71612 (1c:5612) +SeaCottageName: db "SEA COTTAGE@" -SSAnneName: ; 7161e (1c:561e) +SSAnneName: db "S.S.ANNE@" -PokemonLeagueName: ; 71627 (1c:5627) +PokemonLeagueName: db "#MON LEAGUE@" -UndergroundPathName: ; 71633 (1c:5633) +UndergroundPathName: db "UNDERGROUND PATH@" -PokemonTowerName: ; 71644 (1c:5644) +PokemonTowerName: db "#MON TOWER@" -SeafoamIslandsName: ; 7164f (1c:564f) +SeafoamIslandsName: db "SEAFOAM ISLANDS@" -VictoryRoadName: ; 7165f (1c:565f) +VictoryRoadName: db "VICTORY ROAD@" -DiglettsCaveName: ; 7166c (1c:566c) +DiglettsCaveName: db "DIGLETT's CAVE@" -RocketHQName: ; 7167a (1c:567a) +RocketHQName: db "ROCKET HQ@" -SilphCoName: ; 71684 (1c:5684) +SilphCoName: db "SILPH CO.@" -PokemonMansionName: ; 7168e (1c:568e) +PokemonMansionName: db "<pkmn> MANSION@" -SafariZoneName: ; 71698 (1c:5698) +SafariZoneName: db "SAFARI ZONE@" -CeruleanCaveName: ; 716a4 (1c:56a4) +CeruleanCaveName: db "CERULEAN CAVE@" -PowerPlantName: ; 716b2 (1c:56b2) +PowerPlantName: db "POWER PLANT@" diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 4006a3bb..7de4a826 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -80,7 +80,7 @@ _TM18PreReceiveText:: prompt _ReceivedTM18Text:: - text $52, " received" + text "<PLAYER> received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/daycare.asm b/text/maps/daycare.asm index dbca93d6..8375ead0 100644 --- a/text/maps/daycare.asm +++ b/text/maps/daycare.asm @@ -89,4 +89,4 @@ _DayCareHeresYourMonText:: _DayCareNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" - done
\ No newline at end of file + done diff --git a/text/maps/fuchsia_gym.asm b/text/maps/fuchsia_gym.asm index f2bb8c9c..6beebc69 100644 --- a/text/maps/fuchsia_gym.asm +++ b/text/maps/fuchsia_gym.asm @@ -211,4 +211,4 @@ _FuchsiaGymText_75653:: text "It's amazing how" line "ninja can terrify" cont "even now!" - done
\ No newline at end of file + done diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 9c7bd677..22cc0dcd 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you, ", $52, "!" + line "you, <PLAYER>!" para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm index db032c78..fdbb55b4 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -30,6 +30,7 @@ _LoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" + para "You only got a" line "taste of #MON" cont "LEAGUE power!" @@ -38,4 +39,4 @@ _LoreleiAfterBattleText:: _LoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" - done
\ No newline at end of file + done diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index e93450da..633075bb 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -10,7 +10,7 @@ _MomWakeUpText:: done _MomHealText1:: - text "MOM: ",$52,", if" + text "MOM: <PLAYER>, if" line "you drive your" cont "#MON too hard," cont "they'll dislike" diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 52d1a4c7..342d5015 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -78,7 +78,7 @@ _Route22RivalBeforeBattleText2:: cont "That's cool!" para "Then I'll whip" - line "you, ", $52, ", as" + line "you, <PLAYER>, as" cont "a warmup for" cont "#MON LEAGUE!" diff --git a/text/maps/school.asm b/text/maps/school.asm index 2bd526f9..3c5f6379 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -17,4 +17,4 @@ _SchoolText2:: para "Be sure to read" line "the blackboard" cont "carefully!" - done
\ No newline at end of file + done diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 6be83c5d..2fb84f17 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,7 @@ _SilphCo11Text2:: done _SilphCo11Text3:: - text "Ah, ", $52, "!" + text "Ah, <PLAYER>!" line "So we meet again!" para "The PRESIDENT and" diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 1a66e8b1..4e0dc3ca 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -17,16 +17,19 @@ _UGPathRoute7EntranceUnusedText_5d778:: _UGPathRoute7EntranceUnusedText_5d77d:: text "You're here to" line "shop in CELADON?" + para "Just step outside" line "and head west!" done + _UGPathRoute7EntranceUnusedText_5d782:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" cont "to LAVENDER." + para "If you're heading" line "to CERULEAN, go" cont "to the building" cont "across the road." - done
\ No newline at end of file + done diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 034de399..5d998e82 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,2 +1,3 @@ _VermilionDockText1:: - db $0, $57 + text "" + done diff --git a/text/monster_names.asm b/text/monster_names.asm index 3262ec02..a62b1bd9 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,4 +1,4 @@ -MonsterNames: ; e8000 (3a:4000) +MonsterNames: db "RHYDON@@@@" db "KANGASKHAN" db "NIDORAN♂@@" diff --git a/text/move_names.asm b/text/move_names.asm index a9265f51..cbb1a322 100644 --- a/text/move_names.asm +++ b/text/move_names.asm @@ -1,4 +1,4 @@ -MoveNames:: ; b0000 (2c:4000) +MoveNames:: db "POUND@" db "KARATE CHOP@" db "DOUBLESLAP@" diff --git a/text/trainer_names.asm b/text/trainer_names.asm index 087d79ef..7736738b 100755 --- a/text/trainer_names.asm +++ b/text/trainer_names.asm @@ -1,4 +1,4 @@ -TrainerNames: ; 3997e (e:597e) +TrainerNames: db "YOUNGSTER@" db "BUG CATCHER@" db "LASS@" diff --git a/text/type_names.asm b/text/type_names.asm index 5658b683..d94675b8 100755 --- a/text/type_names.asm +++ b/text/type_names.asm @@ -1,4 +1,4 @@ -TypeNames: ; 27d63 (9:7d63) +TypeNames: dw .Normal dw .Fighting diff --git a/text/unused_names.asm b/text/unused_names.asm index 27752b63..dd4c9a12 100644 --- a/text/unused_names.asm +++ b/text/unused_names.asm @@ -1,4 +1,4 @@ -UnusedNames: ; 491e (1:491e) +UnusedNames: db "かみなりバッヂ@" db "かいがらバッヂ@" db "おじぞうバッヂ@" @@ -17,4 +17,4 @@ UnusedNames: ; 491e (1:491e) db "キャプテン@" db "プチマスター@" db "マスター@" - db "エクセレント" ; note the lack of a terminator
\ No newline at end of file + db "エクセレント" ; note the lack of a terminator @@ -231,16 +231,16 @@ wSpriteStateData1:: ; c100 ; C1xF spritestatedata1: MACRO w\1SpriteStateData1:: -w\1PictureID:: db -w\1MovementStatus:: db -w\1SpriteImageIdx:: db -w\1YStepVector:: db -w\1YPixels:: db -w\1XStepVector:: db -w\1XPixels:: db -w\1IntraAnimFrameCounter:: db -w\1AnimFrameCounter:: db -w\1FacingDirection:: db +w\1PictureID:: db ; 0 +w\1MovementStatus:: db ; 1 +w\1SpriteImageIdx:: db ; 2 +w\1YStepVector:: db ; 3 +w\1YPixels:: db ; 4 +w\1XStepVector:: db ; 5 +w\1XPixels:: db ; 6 +w\1IntraAnimFrameCounter:: db ; 7 +w\1AnimFrameCounter:: db ; 8 +w\1FacingDirection:: db ; 9 ds 6 w\1SpriteStateData1End:: endm @@ -288,17 +288,17 @@ wSpriteStateData2:: ; c200 ; C2xF spritestatedata2: MACRO w\1SpriteStateData2:: -w\1WalkAnimationCounter:: db - ds 1 -w\1YDisplacement:: db -w\1XDisplacement:: db -w\1MapY:: db -w\1MapX:: db -w\1MovementByte1:: db -w\1GrassPriority:: db -w\1MovementDelay:: db +w\1WalkAnimationCounter:: db ; 0 + ds 1 +w\1YDisplacement:: db ; 2 +w\1XDisplacement:: db ; 3 +w\1MapY:: db ; 4 +w\1MapX:: db ; 5 +w\1MovementByte1:: db ; 6 +w\1GrassPriority:: db ; 7 +w\1MovementDelay:: db ; 8 ds 5 -w\1SpriteImageBaseOffset:: db +w\1SpriteImageBaseOffset:: db ; e ds 1 w\1SpriteStateData2End:: endm @@ -350,7 +350,34 @@ wAnimatedObjectsData:: wAnimatedObjectStartTileOffsets:: ds 10 * 2 wAnimatedObjectDataStructs:: ; c51c - ds 10 * $10 +animated_object: macro +\1:: +\1Index:: db ; 0 +\1FramesetID:: db ; 1 +\1AnimSeqID:: db ; 2 +\1TileID:: db ; 3 +\1XCoord:: db ; 4 +\1YCoord:: db ; 5 +\1XOffset:: db ; 6 +\1YOffset:: db ; 7 +\1Duration:: db ; 8 +\1DurationOffset:: db ; 9 +\1FrameIndex:: db ; a + ds 5 +\1End:: + endm + + animated_object AnimatedObject0 + animated_object AnimatedObject1 + animated_object AnimatedObject2 + animated_object AnimatedObject3 + animated_object AnimatedObject4 + animated_object AnimatedObject5 + animated_object AnimatedObject6 + animated_object AnimatedObject7 + animated_object AnimatedObject8 + animated_object AnimatedObject9 + wNumLoadedAnimatedObjects:: ; c5bc ds 1 wCurrentAnimatedObjectOAMBufferOffset:: ; c5bd @@ -383,29 +410,29 @@ wAnimatedObjectsDataEnd:: wSerialEnemyMonsPatchList:: ; c5d0 ; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer + +; Surfing Minigame +wSurfingMinigameData:: ; c5d0 ds 1 -wc5d1:: ; c5d1 +wSurfingMinigameRoutineNumber:: ; c5d1 ds 1 wc5d2:: ; c5d2 ds 1 -wc5d3:: ; c5d3 +wSurfingMinigameWaveFunctionNumber:: ; c5d3 ds 2 wc5d5:: ; c5d5 ds 1 -wc5d6:: ; c5d6 - ds 1 -wc5d7:: ; c5d7 - ds 2 -wc5d9:: ; c5d9 - ds 1 -wc5da:: ; c5da +wSurfingMinigamePikachuHP:: ; c5d6 + ds 2 ; little-endian BCD +wc5d8:: ; c5d8 unused? ds 1 -wc5db:: ; c5db - ds 1 -wc5dc:: ; c5dc - ds 1 -wc5dd:: ; c5dd +wSurfingMinigameRadnessMeter:: ; c5d9 +; number of consecutive tricks ds 1 +wSurfingMinigameRadnessScore:: ; c5da + ds 2 ; little-endian BCD +wSurfingMinigameTotalScore:: ; c5dc + ds 2 ; little-endian BCD wc5de:: ; c5de ds 1 wc5df:: ; c5df @@ -417,18 +444,12 @@ wc5e1:: ; c5e1 wc5e2:: ; c5e2 ds 1 wc5e3:: ; c5e3 - ds 2 + ds 2 ; little-endian wc5e5:: ; c5e5 - ds 1 -wc5e6:: ; c5e6 - ds 1 -wc5e7:: ; c5e7 - ds 1 -wc5e8:: ; c5e8 - ds 1 -wc5e9:: ; c5e9 - ds 1 -wc5ea:: ; c5ea + ds 3 ; big-endian +wSurfingMinigameWaveHeightBuffer:: ; c5e8 + ds 2 +wSurfingMinigamePikachuObjectHeight:: ; c5ea ds 1 wc5eb:: ; c5eb ds 1 @@ -438,37 +459,25 @@ wc5ed:: ; c5ed ds 1 wc5ee:: ; c5ee ds 1 -wc5ef:: ; c5ef - ds 1 -wc5f0:: ; c5f0 - ds 39 -wc617:: ; c617 - ds 1 -wc618:: ; c618 - ds 1 -wc619:: ; c619 - ds 1 -wc61a:: ; c61a - ds 2 -wc61c:: ; c61c - ds 5 -wc621:: ; c621 - ds 1 -wc622:: ; c622 - ds 1 -wc623:: ; c623 - ds 11 -wc62e:: ; c62e +wSurfingMinigameBGMapReadBuffer:: ; c5ef + ds 16 + + ds 24 +wSurfingMinigameSCX:: ; c617 + ds 3 +wSurfingMinigameWaveHeight:: ; c61a + ds SCREEN_WIDTH +wSurfingMinigameXOffset:: ; c62e ds 1 -wc62f:: ; c62f +wSurfingMinigameTrickFlags:: ; c62f ds 1 wc630:: ; c630 ds 1 wc631:: ; c631 ds 1 -wc632:: ; c632 +wSurfingMinigameRoutineDelay:: ; c632 ds 1 -wc633:: ; c633 +wSurfingMinigameIntroAnimationFinished:: ; c633 ds 1 wYellowIntroCurrentScene:: ; c634 @@ -478,13 +487,10 @@ wYellowIntroSceneTimer:: ; c635 wc635:: ; c635 ds 1 wYellowIntroAnimatedObjectStructPointer:: ; c636 - ds 2 - -; c638 - ds 96 + ds 1 +wSurfingMinigameDataEnd:: ; c637 -; c698 - ds 80 + ds 177 wTempPic:: ; c6e8 wPrinterData:: ; c6e8 @@ -508,9 +514,6 @@ wc6ed:: ; c6ed wPrinterChecksum:: ; c6ee dw -wPrinterSendDataSource:: ; c6f0 -; a 40-tile buffer -; ds $280 wPrinterSerialReceived:: ; c6f0 ds 1 wPrinterStatusReceived:: ; c6f1 @@ -524,21 +527,20 @@ wc6f2:: ; c6f2 ds 1 wc6f3:: ; c6f3 ds 13 -wc700:: ; c700 - ds $10 -wc710:: ; c710 - ds $f0 -wYellowIntroSurfingPikaSineWaveBuffer:: ; c800 - ; ds $100 - ds $10 -wc810:: ; c810 - ds $20 -wc830:: ; c830 - ds $d0 - -; c900 - ds $70 -wPrinterSendDataSourceEnd:: ; c970 +wLYOverrides:: ; c700 + ds $100 +wLYOverridesEnd:: +wLYOverridesBuffer:: ; c800 + ds $100 +wLYOverridesBufferEnd:: ; c900 + ds wPrinterSerialReceived - @ + +wPrinterSendDataSource1:: ; c6f0 +; two 20-tile buffers + ds $140 +wPrinterSendDataSource2:: + ds $140 +wPrinterSendDataSource1End:: ; c970 wPrinterHandshake:: ; c970 ds 1 @@ -835,13 +837,14 @@ wSwitchPartyMonTempBuffer:: ; cc97 wPikaPicAnimObjectDataBuffer:: ; cc98 ; 4 structs each of length 8 -; 0: index -; 1: object id (dw) -; 3: ? -; 4: ? -; 5: ? -; 6: ? -; 7: ? +; 0: buffer index +; 1: script index +; 2: frame index +; 3: frame timer +; 4: vtile offset +; 5: x offset +; 6: y offset +; 7: unused ds 9 @@ -1620,7 +1623,7 @@ wTextPredefFlag:: ; cf11 wPredefParentBank:: ; cf12 ds 1 -wSpriteIndex:: ds 1 +wSpriteIndex:: ds 1 ; cf13 wCurSpriteMovement2:: ; cf14 ; movement byte 2 of current sprite @@ -2836,32 +2839,53 @@ wPikachuFollowCommandBuffer:: ds 16 ; d437 wExpressionNumber:: ; d447 ds 1 -wExpressionNumber2:: ; d448 +wPikaPicAnimNumber:: ; d448 ds 1 wPikachuMovementScriptBank:: ds 1 ; d449 wPikachuMovementScriptAddress:: dw ; d44a -wd44d:: ds 1 ; d44c +wPikachuMovementFlags:: ; d44c +; bit 6 - spawn shadow +; bit 7 - signal end of command + ds 1 + +wCurPikaMovementData:: ; d44d +wCurPikaMovementParam1:: ds 1 ; d44d +wCurPikaMovementFunc1:: ds 1 ; d44e +wCurPikaMovementParam2:: ds 1 ; d44f +wCurPikaMovementFunc2:: ds 1 ; d450 +wd451:: ds 1 ; d451 +wCurPikaMovementSpriteImageIdx:: ds 1 ; d452 +wPikaSpriteX:: ds 1 ; d453 +wPikaSpriteY:: ds 1 ; d454 +wPikachuMovementXOffset:: ds 1 ; d455 +wPikachuMovementYOffset:: ds 1 ; d456 +wPikachuStepTimer:: ds 1 ; d457 +wPikachuStepSubtimer:: ds 1 ; d458 + ds 5 +wCurPikaMovementDataEnd:: ; d45e + ds wCurPikaMovementData - @ + -wCurPikaMovementData:: ; wPikaPicAnimPointer:: dw ; d44d wPikaPicAnimPointerSetupFinished:: ds 1 ; d44f -wPikaPicAnimCurGraphicID:: ds 1 +wPikaPicAnimCurGraphicID:: ds 1 ; d450 wPikaPicAnimTimer:: ds 2 ; d451 -wPikaPicAnimDelay:: -wPikaSpriteX:: ds 1 -wPikaPicTextboxStartX:: -wPikaSpriteY:: ds 1 ; d454 -wPikaPicTextboxStartY:: ds 1 ; d455 -wd456:: ds 1 ; d456 -wd457:: ds 1 ; d457 -wd458:: ds 1 ; d458 -wCurPikaPicAnimObject:: ; d459 -wCurPikaPicAnimObjectIndex:: ds 1 ; d459 -wCurPikaPicAnimObjectGraphicID:: dw ; d45a - ds 2 -wCurPikaMovementDataEnd:: ; d45e - ds 17 +wPikaPicAnimDelay:: ds 1 ; d453 +wPikaPicPikaDrawStartX:: ds 1 ; d454 +wPikaPicPikaDrawStartY:: ds 1 ; d455 + +wCurPikaPicAnimObject:: ; d456 +wCurPikaPicAnimObjectVTileOffset:: db ; d456 +wCurPikaPicAnimObjectXOffset:: db ; d457 +wCurPikaPicAnimObjectYOffset:: db ; d458 +wCurPikaPicAnimObjectScriptIdx:: db ; d459 +wCurPikaPicAnimObjectFrameIdx:: db ; d45a +wCurPikaPicAnimObjectFrameTimer:: db ; d45b + ds 1 +wCurPikaPicAnimObjectEnd:: ; d45d + + ds 18 wPikachuHappiness:: ds 1 ; d46f wPikachuMood:: ds 1 ; d470 @@ -2957,18 +2981,18 @@ wPlayerDirection:: ; d529 wTilesetBank:: ; d52a ds 1 -wTileSetBlocksPtr:: ; d52b +wTilesetBlocksPtr:: ; d52b ; maps blocks (4x4 tiles) to tiles ds 2 -wTilesetGFXPtr:: ; d52d +wTilesetGfxPtr:: ; d52d ds 2 wTilesetCollisionPtr:: ; d52f ; list of all walkable tiles ds 2 -wTileSetTalkingOverTiles:: ; d531 +wTilesetTalkingOverTiles:: ; d531 ds 3 wGrassTile:: ; d534 |
