diff options
44 files changed, 289 insertions, 309 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 51522634..4faf06cf 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -169,7 +169,7 @@ Audio1_PlayNextNote: call Audio1_endchannel ret -Audio1_endchannel: ; 0x91e6 +Audio1_endchannel: call Audio1_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? @@ -259,7 +259,7 @@ Audio1_endchannel: ; 0x91e6 ld [hl], b ret -Audio1_callchannel: ; 0x9274 +Audio1_callchannel: cp $fd ; is this command a callchannel? jp nz, Audio1_loopchannel ; no call Audio1_GetNextMusicByte @@ -296,7 +296,7 @@ Audio1_callchannel: ; 0x9274 set BIT_CHANNEL_CALL, [hl] ; set the call flag jp Audio1_endchannel -Audio1_loopchannel: ; 0x92a9 +Audio1_loopchannel: cp $fe ; is this command a loopchannel? jp nz, Audio1_notetype ; no call Audio1_GetNextMusicByte @@ -334,7 +334,7 @@ Audio1_loopchannel: ; 0x92a9 ld [hl], b jp Audio1_endchannel -Audio1_notetype: ; 0x92e4 +Audio1_notetype: and $f0 cp $d0 ; is this command a notetype? jp nz, Audio1_toggleperfectpitch ; no @@ -378,7 +378,7 @@ Audio1_notetype: ; 0x92e4 .noiseChannel jp Audio1_endchannel -Audio1_toggleperfectpitch: ; 0x9323 +Audio1_toggleperfectpitch: ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio1_vibrato ; no @@ -390,7 +390,7 @@ Audio1_toggleperfectpitch: ; 0x9323 ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio1_endchannel -Audio1_vibrato: ; 0x9335 +Audio1_vibrato: cp $ea ; is this command a vibrato? jr nz, Audio1_pitchbend ; no call Audio1_GetNextMusicByte @@ -438,7 +438,7 @@ Audio1_vibrato: ; 0x9335 jp Audio1_endchannel -Audio1_pitchbend: ; 0x936d +Audio1_pitchbend: cp $eb ; is this command a pitchbend? jr nz, Audio1_duty ; no call Audio1_GetNextMusicByte @@ -469,7 +469,7 @@ Audio1_pitchbend: ; 0x936d ld d, a jp Audio1_notelength -Audio1_duty: ; 0x93a5 +Audio1_duty: cp $ec ; is this command a duty? jr nz, Audio1_tempo ; no call Audio1_GetNextMusicByte @@ -482,7 +482,7 @@ Audio1_duty: ; 0x93a5 ld [hl], a ; store duty jp Audio1_endchannel -Audio1_tempo: ; 0x93ba +Audio1_tempo: cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no ld a, c @@ -511,7 +511,7 @@ Audio1_tempo: ; 0x93ba .musicChannelDone jp Audio1_endchannel -Audio1_stereopanning: ; 0x93fa +Audio1_stereopanning: cp $ee ; is this command a stereopanning? jr nz, Audio1_unknownmusic0xef ; no call Audio1_GetNextMusicByte @@ -519,7 +519,7 @@ Audio1_stereopanning: ; 0x93fa jp Audio1_endchannel ; this appears to never be used -Audio1_unknownmusic0xef: ; 0x9407 +Audio1_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? jr nz, Audio1_dutycycle ; no call Audio1_GetNextMusicByte @@ -537,7 +537,7 @@ Audio1_unknownmusic0xef: ; 0x9407 .skip jp Audio1_endchannel -Audio1_dutycycle: ; 0x9426 +Audio1_dutycycle: cp $fc ; is this command a dutycycle? jr nz, Audio1_volume ; no call Audio1_GetNextMusicByte @@ -554,14 +554,14 @@ Audio1_dutycycle: ; 0x9426 set BIT_ROTATE_DUTY, [hl] jp Audio1_endchannel -Audio1_volume: ; 0x9444 +Audio1_volume: cp $f0 ; is this command a volume? jr nz, Audio1_executemusic ; no call Audio1_GetNextMusicByte ld [rNR50], a ; store volume jp Audio1_endchannel -Audio1_executemusic: ; 0x9450 +Audio1_executemusic: cp $f8 ; is this command an executemusic? jr nz, Audio1_octave ; no ld b, $0 @@ -570,7 +570,7 @@ Audio1_executemusic: ; 0x9450 set BIT_EXECUTE_MUSIC, [hl] jp Audio1_endchannel -Audio1_octave: ; 0x945f +Audio1_octave: and $f0 cp $e0 ; is this command an octave? jr nz, Audio1_unknownsfx0x20 ; no @@ -582,7 +582,7 @@ Audio1_octave: ; 0x945f ld [hl], a ; store low nibble as octave jp Audio1_endchannel -Audio1_unknownsfx0x20: ; 0x9472 +Audio1_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio1_unknownsfx0x10 ld a, c @@ -686,7 +686,7 @@ asm_94fd pop bc pop de -Audio1_notelength: ; 0x950a +Audio1_notelength: ld a, d push af and $f @@ -744,7 +744,7 @@ Audio1_notelength: ; 0x950a pop hl ret -Audio1_notepitch: ; 0x9568 +Audio1_notepitch: pop af and $f0 cp $c0 ; compare to rest @@ -876,7 +876,7 @@ Audio1_EnableChannelOutput: ld [rNR51], a ret -Audio1_ApplyDutyAndSoundLength: ; 0x9629 +Audio1_ApplyDutyAndSoundLength: ld b, 0 ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc @@ -901,7 +901,7 @@ Audio1_ApplyDutyAndSoundLength: ; 0x9629 ld [hl], d ret -Audio1_ApplyWavePatternAndFrequency: ; 0x964b +Audio1_ApplyWavePatternAndFrequency: ld a, c cp CH2 jr z, .channel3 @@ -1071,7 +1071,7 @@ Audio1_96c3: scf ret -Audio1_ApplyPitchBend: ; 0x96f9 +Audio1_ApplyPitchBend: ld hl, wChannelFlags1 add hl, bc bit BIT_PITCH_BEND_DECREASING, [hl] @@ -1175,7 +1175,7 @@ Audio1_ApplyPitchBend: ; 0x96f9 res BIT_PITCH_BEND_DECREASING, [hl] ret -Audio1_InitPitchBendVars: ; 0x978f +Audio1_InitPitchBendVars: ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d @@ -1274,7 +1274,7 @@ Audio1_InitPitchBendVars: ; 0x978f ld [hl], a ; store remainder - dividend ret -Audio1_ApplyDutyCycle: ; 0x980d +Audio1_ApplyDutyCycle: ld b, 0 ld hl, wChannelDutyCycles add hl, bc @@ -1292,11 +1292,11 @@ Audio1_ApplyDutyCycle: ; 0x980d ld [hl], a ret -Audio1_GetNextMusicByte: ; 0x9825 +Audio1_GetNextMusicByte: call GetNextMusicByte ret -Audio1_GetRegisterPointer: ; 0x9838 +Audio1_GetRegisterPointer: ; hl = address of hardware sound register b for software channel c ld a, c ld hl, Audio1_HWChannelBaseAddresses @@ -1311,7 +1311,7 @@ Audio1_GetRegisterPointer: ; 0x9838 ld h, $ff ret -Audio1_MultiplyAdd: ; 0x9847 +Audio1_MultiplyAdd: ; hl = l + (a * de) ld h, 0 .loop @@ -1327,7 +1327,7 @@ Audio1_MultiplyAdd: ; 0x9847 .done ret -Audio1_CalculateFrequency: ; 0x9858 +Audio1_CalculateFrequency: ; return the frequency for note a, octave b in de ld h, 0 ld l, a diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 8c128c0e..7df3f8bf 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -32,5 +32,3 @@ Music_DefeatedGymLeader:: dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 dbw CH1, Music_DefeatedGymLeader_Ch2 dbw CH2, Music_DefeatedGymLeader_Ch3 - -; 202fd diff --git a/audio/sfx/snare1_4.asm b/audio/sfx/snare1_4.asm index 4ba3b8c5..edeb78ec 100755 --- a/audio/sfx/snare1_4.asm +++ b/audio/sfx/snare1_4.asm @@ -1,4 +1,4 @@ -SFX_Snare1_4_Ch7: ; 841ec +SFX_Snare1_4_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_4.asm b/audio/sfx/snare2_4.asm index dc1a26a9..43807c44 100755 --- a/audio/sfx/snare2_4.asm +++ b/audio/sfx/snare2_4.asm @@ -1,4 +1,4 @@ -SFX_Snare2_4_Ch7: ; 841f0 +SFX_Snare2_4_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/data/facing.asm b/data/facing.asm index 3e965132..944a31c8 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -118,7 +118,7 @@ SpriteFacingRightAndWalking: db $08,$08,$8a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$8b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteSpecialCase ; 40ec (1:40ec) +SpriteSpecialCase db $09 ; Sprite OAM Parameters db -$4,-$4,$00,$00 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 7ba90bd3..190c03e9 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -539,9 +539,7 @@ CinnabarLab4HiddenObjects: hidden_object 4, 2, SPRITE_FACING_UP, OpenPokemonCenterPC db $ff -CinnabarPokecenterHiddenObjects: ; 6cc3 +CinnabarPokecenterHiddenObjects: hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC db $ff - -; 6cd0 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 72822a40..d4f9190e 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -342,7 +342,7 @@ MapHS2D: db VIRIDIAN_GYM, $0B, Show MapHS34: db MUSEUM_1F, $05, Show -MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house +MapHS3F: ; bulbasaur adoption house db CERULEAN_HOUSE_1, $02, Show MapHSE4: db UNKNOWN_DUNGEON_1, $01, Show diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index 847883d1..71b4b7df 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -1,4 +1,4 @@ -BeachHouseObjects: ; 0xf23a4 +BeachHouseObjects: db $a ; border block db 2 ; warps diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index 065db93e..8c4d0bc0 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -151,4 +151,3 @@ MonsterPalettes: db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW -; 1c:69b9 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index b2cb6e9b..a29de819 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -175,13 +175,13 @@ MaskEnCancelPacket: ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. -DataSnd_728a1: DATA_SND $85d, $0, 11 ; 728a1 (1c:68a1) +DataSnd_728a1: DATA_SND $85d, $0, 11 db $8C ; cpx #$8c (2) db $D0, $F4 ; bne -$0c db $60 ; rts ds 7 -DataSnd_728b1: DATA_SND $852, $0, 11 ; 728b1 (1c:68b1) +DataSnd_728b1: DATA_SND $852, $0, 11 db $A9, $E7 ; lda #$e7 db $9F, $01, $C0, $7E ; sta $7ec001, x db $E8 ; inx @@ -209,7 +209,7 @@ DataSnd_728d1: DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) db $CA ; dex db $C9 ; cmp #$c4 (1) -DataSnd_728e1: DATA_SND $831, $0, 11 ; 728e1 (1c:68e1) +DataSnd_728e1: DATA_SND $831, $0, 11 dbw $0C, $CAA5 ; tsb $caa5 db $C9, $7E ; cmp #$7e db $D0, $06 ; bne +$06 @@ -217,7 +217,7 @@ DataSnd_728e1: DATA_SND $831, $0, 11 ; 728e1 (1c:68e1) db $CB ; wai db $C9, $7E ; cmp #$7e -DataSnd_728f1: DATA_SND $826, $0, 11 ; 728f1 (1c:68f1) +DataSnd_728f1: DATA_SND $826, $0, 11 db $39 ; bne +$39 (2) dbw $CD, $C48 ; cmp $c48 db $D0, $34 ; bne +$34 @@ -225,7 +225,7 @@ DataSnd_728f1: DATA_SND $826, $0, 11 ; 728f1 (1c:68f1) db $C9, $C9 ; cmp #$c9 db $80, $D0 ; bra -$30 -DataSnd_72901: DATA_SND $81b, $0, 11 ; 72901 (1c:6901) +DataSnd_72901: DATA_SND $81b, $0, 11 db $EA ; nop db $EA ; nop db $EA ; nop @@ -236,7 +236,7 @@ DataSnd_72901: DATA_SND $81b, $0, 11 ; 72901 (1c:6901) dbw $CD,$C4F ; cmp $c4f db $D0 ; bne +$39 (1) -DataSnd_72911: DATA_SND $810, $0, 11 ; 72911 (1c:6911) +DataSnd_72911: DATA_SND $810, $0, 11 dbw $4C, $820 ; jmp $820 db $EA ; nop db $EA ; nop diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 4a811116..9c1c0fd2 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -318,6 +318,6 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" -TheEndGfx: ; 7473e (1d:473e) (7473f on blue) +TheEndGfx: INCBIN "gfx/theend.interleave.2bpp" TheEndGfxEnd: diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 7ae059e7..a9bfea8d 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -74,7 +74,7 @@ SetMapSpecificScriptFlagsOnMapReload: set 5, [hl] ret -.MapList ; f02fa (3c:42fa) +.MapList db SILPH_CO_2F db SILPH_CO_3F db SILPH_CO_4F @@ -149,7 +149,7 @@ LoadUnusedBluesHouseMissableObjectData: db $ff .End: -TryApplyPikachuMovementData: ; f0a82 +TryApplyPikachuMovementData: ld a, [wd472] bit 7, a ret z diff --git a/engine/bank3d.asm b/engine/bank3d.asm index 6efff351..b37bdd00 100644 --- a/engine/bank3d.asm +++ b/engine/bank3d.asm @@ -298,7 +298,6 @@ TitleScreenPikachuTilemap: db $00, $b9, $ba, $8a, $8a, $8a, $8a, $8a, $8a, $bb, $bc, $00 db $00, $00, $bd, $8a, $8a, $8a, $8a, $8a, $8a, $be, $bf, $00 -; f46f9 (3d:46f9) PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" PokemonLogoGraphicsEnd: YellowLogoGraphics: INCBIN "gfx/yellow_titlescreen.2bpp" @@ -445,7 +444,7 @@ PrintStrengthTxt: jp PrintText Text_f5b17: - TX_FAR _UsedStrengthText ; 2d:417e + TX_FAR _UsedStrengthText TX_ASM ld a, [wcf91] call PlayCry @@ -453,7 +452,7 @@ Text_f5b17: jp TextScriptEnd Text_f5b28: - TX_FAR _CanMoveBouldersText ; 2d:4193 + TX_FAR _CanMoveBouldersText db "@" IsSurfingAllowed: @@ -488,11 +487,11 @@ CoordsData_f5b64: db $ff CurrentTooFastText: - TX_FAR _CurrentTooFastText ; 2d:41ab + TX_FAR _CurrentTooFastText db "@" CyclingIsFunText: - TX_FAR _CyclingIsFunText ; 2d:41ca + TX_FAR _CyclingIsFunText db "@" AddItemToInventory_: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index bfbaa180..8c095daf 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -282,7 +282,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index 3719841f..740fc71a 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -28,7 +28,7 @@ asm_f601d: ld a, [hl] push af res 1, [hl] - call InitBattleVariables ; 3d:6236 + call InitBattleVariables ld a, [wEnemyMonSpecies2] sub $c8 jp c, InitWildBattle @@ -36,7 +36,7 @@ asm_f601d: call GetTrainerInformation callab ReadTrainer callab DoBattleTransitionAndInitBattleVariables - call _LoadTrainerPic ; 3d:615a + call _LoadTrainerPic xor a ld [wEnemyMonSpecies2], a ld [$ffe1], a @@ -151,9 +151,9 @@ InitBattle_Common: _LoadTrainerPic: ; wd033-wd034 contain pointer to pic - ld a, [wTrainerPicPointer] ; wd033 + ld a, [wTrainerPicPointer] ld e, a - ld a, [wTrainerPicPointer + 1] ; wd034 + ld a, [wTrainerPicPointer + 1] ld d, a ; de contains pointer to trainer pic ld a, [wLinkState] and a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c061b291..fbbe144b 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4834,7 +4834,6 @@ UnusedHighCriticalMoves: db CRABHAMMER db SLASH db $FF -; 3e023 ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are, not coincidentally, @@ -7362,7 +7361,7 @@ FreezeBurnParalyzeEffect: call PlayBattleAnimation ld hl, FrozenText jp PrintText -.opponentAttacker ; 3f382 (f:7382) +.opponentAttacker ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent and a jp nz, CheckDefrost diff --git a/engine/diploma_3a.asm b/engine/diploma_3a.asm index 3b633a1b..f4504ad7 100755 --- a/engine/diploma_3a.asm +++ b/engine/diploma_3a.asm @@ -49,7 +49,6 @@ _DisplayDiploma: call GBPalNormal ret -; e9a73 String_e9a73: db $10, "Diploma", $10, "@" diff --git a/engine/draw_badges.asm b/engine/draw_badges.asm index 412197b2..9e6262a0 100644 --- a/engine/draw_badges.asm +++ b/engine/draw_badges.asm @@ -52,7 +52,7 @@ DrawBadges: ; call .DrawBadgeRow ; ret -.DrawBadgeRow ; e8c9 (3:68c9) +.DrawBadgeRow ; Draw 4 badges. ld c, 4 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 833313a6..f0749a06 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -156,7 +156,7 @@ HoFDisplayAndRecordMonInfo: call HoFDisplayMonInfo ld a, [wHoFPartyMonIndex] ld [wWhichPokemon], a - callab IsThisPartymonStarterPikachu_Party ; 3f:4e18 + callab IsThisPartymonStarterPikachu_Party jr nc, .asm_70336 ld e, $22 callab PlayPikachuSoundClip diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index afbcadee..8269bbed 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -423,7 +423,6 @@ GymTrashCans: db 2, 9, 13, -1, -1 ; 12 db 3, 10, 12, 14, -1 ; 13 db 2, 11, 13, -1, -1 ; 14 -; 5dec8 VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm index 458f653b..3782e93e 100644 --- a/engine/menu/link_menu.asm +++ b/engine/menu/link_menu.asm @@ -569,67 +569,67 @@ Text_f579c:: next "CANCEL@" Colosseum3MonsText:: - TX_FAR _Colosseum3MonsText ; a0a2b + TX_FAR _Colosseum3MonsText db "@" ColosseumMewText:: - TX_FAR _ColosseumMewText ; a0a46 + TX_FAR _ColosseumMewText db "@" ColosseumDifferentMonsText:: - TX_FAR _ColosseumDifferentMonsText ; a0a5f + TX_FAR _ColosseumDifferentMonsText db "@" ColosseumMaxL55Text:: - TX_FAR _ColosseumMaxL55Text ; a0a81 + TX_FAR _ColosseumMaxL55Text db "@" ColosseumMinL50Text:: - TX_FAR _ColosseumMinL50Text ; a0a9a + TX_FAR _ColosseumMinL50Text db "@" ColosseumTotalL155Text:: - TX_FAR _ColosseumTotalL155Text ; a0aba + TX_FAR _ColosseumTotalL155Text db "@" ColosseumMaxL30Text:: - TX_FAR _ColosseumMaxL30Text ; a0ad9 + TX_FAR _ColosseumMaxL30Text db "@" ColosseumMinL25Text:: - TX_FAR _ColosseumMinL25Text ; a0af2 + TX_FAR _ColosseumMinL25Text db "@" ColosseumTotalL80Text:: - TX_FAR _ColosseumTotalL80Text ; a0b12 + TX_FAR _ColosseumTotalL80Text db "@" ColosseumMaxL20Text:: - TX_FAR _ColosseumMaxL20Text ; a0b30 + TX_FAR _ColosseumMaxL20Text db "@" ColosseumMinL15Text:: - TX_FAR _ColosseumMinL15Text ; a0b49 + TX_FAR _ColosseumMinL15Text db "@" ColosseumTotalL50Text:: - TX_FAR _ColosseumTotalL50Text ; a0b69 + TX_FAR _ColosseumTotalL50Text db "@" ColosseumHeightText:: - TX_FAR _ColosseumHeightText ; a0b87 + TX_FAR _ColosseumHeightText db "@" ColosseumWeightText:: - TX_FAR _ColosseumWeightText ; a0b9f + TX_FAR _ColosseumWeightText db "@" ColosseumEvolvedText:: - TX_FAR _ColosseumEvolvedText ; a0bbb + TX_FAR _ColosseumEvolvedText db "@" ColosseumIneligibleText:: - TX_FAR _ColosseumIneligibleText ; a0bd4 + TX_FAR _ColosseumIneligibleText db "@" LinkMenu: @@ -897,7 +897,7 @@ ColosseumCanceledText: db "@" ColosseumVersionText: - TX_FAR _ColosseumVersionText ; 28:4c47 + TX_FAR _ColosseumVersionText db "@" TextTerminator_f5a16: diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index cf837a54..5ff9cc7d 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -263,7 +263,7 @@ SaveScreenInfoText: next "TIME@" DisplayOptionMenu: - callab DisplayOptionMenu_ ; 10:5c70 + callab DisplayOptionMenu_ ret CheckForPlayerNameInSRAM: diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 94469960..f3ba8207 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -152,7 +152,7 @@ StartMenu_Pokemon: .asm_5d4c call Func_1510 jp .goBackToMap -.cut ; 11d52 (4:5d52) +.cut bit 1,a ; does the player have the Cascade Badge? jp z,.newBadgeRequired predef UsedCut diff --git a/engine/menu/text_ids2.asm b/engine/menu/text_ids2.asm index fbac3986..e23ae707 100644 --- a/engine/menu/text_ids2.asm +++ b/engine/menu/text_ids2.asm @@ -512,19 +512,19 @@ TwoOptionMenuStrings: db 4,3,0 dw .NoYesMenu -.NoYesMenu ; 7542 (1:7542) +.NoYesMenu db "NO",$4E,"YES@" -.YesNoMenu ; 7549 (1:7549) +.YesNoMenu db "YES",$4E,"NO@" -.NorthWestMenu ; 7550 (1:7550) +.NorthWestMenu db "NORTH",$4E,"WEST@" -.SouthEastMenu ; 755b (1:755b) +.SouthEastMenu db "SOUTH",$4E,"EAST@" -.NorthEastMenu ; 7566 (1:7566) +.NorthEastMenu db "NORTH",$4E,"EAST@" -.TradeCancelMenu ; 7571 (1:7571) +.TradeCancelMenu db "TRADE",$4E,"CANCEL@" -.HealCancelMenu ; 757e (1:757e) +.HealCancelMenu db "HEAL",$4E,"CANCEL@" DisplayFieldMoveMonMenu: diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index 2bc26de2..d664c9d4 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -2,15 +2,15 @@ _Multiply: ld a, $8 ld b, a xor a - ld [H_PRODUCT], a ; $ff95 - ld [H_MULTIPLYBUFFER], a ; $ff9b - ld [H_MULTIPLYBUFFER+1], a ; $ff9c - ld [H_MULTIPLYBUFFER+2], a ; $ff9d - ld [H_MULTIPLYBUFFER+3], a ; $ff9e + ld [H_PRODUCT], a + ld [H_MULTIPLYBUFFER], a + ld [H_MULTIPLYBUFFER+1], a + ld [H_MULTIPLYBUFFER+2], a + ld [H_MULTIPLYBUFFER+3], a .multiplyLoop - ld a, [H_MULTIPLIER] ; $ff99 + ld a, [H_MULTIPLIER] srl a - ld [H_MULTIPLIER], a ; $ff99 + ld [H_MULTIPLIER], a jr nc, .smallMultiplier ; less than $80 ; code to possibly multiply the multiplicand by 2 and divide the multiplier by 2? ld a, [H_MULTIPLYBUFFER+3] @@ -23,14 +23,14 @@ _Multiply: ld a, [H_MULTIPLICAND+1] adc c ld [H_MULTIPLYBUFFER+2], a - ld a, [H_MULTIPLYBUFFER+1] ; $ff9c + ld a, [H_MULTIPLYBUFFER+1] ld c, a - ld a, [H_MULTIPLICAND] ; $ff96 + ld a, [H_MULTIPLICAND] adc c - ld [H_MULTIPLYBUFFER+1], a ; $ff9c + ld [H_MULTIPLYBUFFER+1], a ld a, [H_MULTIPLYBUFFER] ld c, a - ld a, [H_PRODUCT] ; $ff95 + ld a, [H_PRODUCT] adc c ld [H_MULTIPLYBUFFER], a .smallMultiplier @@ -42,47 +42,47 @@ _Multiply: ld a, [H_MULTIPLICAND+1] rl a ld [H_MULTIPLICAND+1], a - ld a, [H_MULTIPLICAND] ; $ff96 + ld a, [H_MULTIPLICAND] rl a - ld [H_MULTIPLICAND], a ; $ff96 - ld a, [H_PRODUCT] ; $ff95 + ld [H_MULTIPLICAND], a + ld a, [H_PRODUCT] rl a - ld [H_PRODUCT], a ; $ff95 + ld [H_PRODUCT], a jr .multiplyLoop .done ld a, [H_MULTIPLYBUFFER+3] ld [H_PRODUCT+3], a ld a, [H_MULTIPLYBUFFER+2] ld [H_PRODUCT+2], a - ld a, [H_MULTIPLYBUFFER+1] ; $ff9c - ld [H_PRODUCT+1], a ; $ff96 + ld a, [H_MULTIPLYBUFFER+1] + ld [H_PRODUCT+1], a ld a, [H_MULTIPLYBUFFER] - ld [H_PRODUCT], a ; $ff95 + ld [H_PRODUCT], a ret _Divide: xor a - ld [H_DIVIDEBUFFER], a ; ff9a - ld [H_DIVIDEBUFFER+1], a ; ff9b - ld [H_DIVIDEBUFFER+2], a ; ff9c - ld [H_DIVIDEBUFFER+3], a ; ff9d - ld [H_DIVIDEBUFFER+4], a ; ff9e + ld [H_DIVIDEBUFFER], a + ld [H_DIVIDEBUFFER+1], a + ld [H_DIVIDEBUFFER+2], a + ld [H_DIVIDEBUFFER+3], a + ld [H_DIVIDEBUFFER+4], a ld a, $9 ld e, a .asm_f6680 ld a, [H_DIVIDEBUFFER] ld c, a - ld a, [H_DIVIDEND+1] ; $ff96 + ld a, [H_DIVIDEND+1] sub c ld d, a - ld a, [H_DIVISOR] ; $ff99 + ld a, [H_DIVISOR] ld c, a - ld a, [H_DIVIDEND] ; $ff95 + ld a, [H_DIVIDEND] sbc c jr c, .asm_f669b - ld [H_DIVIDEND], a ; $ff95 + ld [H_DIVIDEND], a ld a, d - ld [H_DIVIDEND+1], a ; $ff96 + ld [H_DIVIDEND+1], a ld a, [H_DIVIDEBUFFER+4] inc a ld [H_DIVIDEBUFFER+4], a @@ -97,9 +97,9 @@ _Divide: ld a, [H_DIVIDEBUFFER+3] rl a ld [H_DIVIDEBUFFER+3], a - ld a, [H_DIVIDEBUFFER+2] ; $ff9c + ld a, [H_DIVIDEBUFFER+2] rl a - ld [H_DIVIDEBUFFER+2], a ; $ff9c + ld [H_DIVIDEBUFFER+2], a ld a, [H_DIVIDEBUFFER+1] rl a ld [H_DIVIDEBUFFER+1], a @@ -108,13 +108,13 @@ _Divide: ld a, $8 ld e, a ld a, [H_DIVIDEBUFFER] - ld [H_DIVISOR], a ; $ff99 + ld [H_DIVISOR], a xor a ld [H_DIVIDEBUFFER], a - ld a, [H_DIVIDEND+1] ; $ff96 - ld [H_DIVIDEND], a ; $ff95 + ld a, [H_DIVIDEND+1] + ld [H_DIVIDEND], a ld a, [H_DIVIDEND+2] - ld [H_DIVIDEND+1], a ; $ff96 + ld [H_DIVIDEND+1], a ld a, [H_DIVIDEND+3] ld [H_DIVIDEND+2], a .asm_f66d1 @@ -123,22 +123,22 @@ _Divide: jr nz, .asm_f66d7 dec b .asm_f66d7 - ld a, [H_DIVISOR] ; $ff99 + ld a, [H_DIVISOR] srl a - ld [H_DIVISOR], a ; $ff99 + ld [H_DIVISOR], a ld a, [H_DIVIDEBUFFER] rr a ld [H_DIVIDEBUFFER], a jr .asm_f6680 .done - ld a, [H_DIVIDEND+1] ; $ff96 - ld [H_REMAINDER], a ; $ff99 + ld a, [H_DIVIDEND+1] + ld [H_REMAINDER], a ld a, [H_DIVIDEBUFFER+4] ld [H_QUOTIENT+3], a ld a, [H_DIVIDEBUFFER+3] ld [H_QUOTIENT+2], a - ld a, [H_DIVIDEBUFFER+2] ; $ff9c - ld [H_QUOTIENT+1], a ; $ff96 + ld a, [H_DIVIDEBUFFER+2] + ld [H_QUOTIENT+1], a ld a, [H_DIVIDEBUFFER+1] - ld [H_QUOTIENT], a ; $ff95 + ld [H_QUOTIENT], a ret diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm index 5fad4fc5..b1951de0 100644 --- a/engine/overworld/check_player_state.asm +++ b/engine/overworld/check_player_state.asm @@ -210,7 +210,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: push hl push de push bc - callba IsPlayerStandingOnDoorTile ; 6:6785 + callba IsPlayerStandingOnDoorTile jr c, .done ld a, [wCurMapTileset] add a diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm index f0a718bd..2ad923fb 100644 --- a/engine/overworld/map_sprite_functions1.asm +++ b/engine/overworld/map_sprite_functions1.asm @@ -23,7 +23,7 @@ _UpdateSprites: cp $e ; test for overflow (back at $0e) jr nz, .spriteLoop ret -.updateCurrentSprite ; 4bd7 (1:4bd7) +.updateCurrentSprite ld a, [H_CURRENTSPRITEOFFSET] and a jp z, UpdatePlayerSprite diff --git a/engine/palettes.asm b/engine/palettes.asm index c6c234ae..a9d8908c 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -595,7 +595,7 @@ PrepareSuperNintendoVRAMTransfer: jr nz, .loop ret -.packetPointers ; 7225b (1c:625b) +.packetPointers ; Only the first packet is needed. dw MaskEnFreezePacket dw DataSnd_728a1 diff --git a/engine/pikachu_follow.asm b/engine/pikachu_follow.asm index b5791919..c0b20d9d 100755 --- a/engine/pikachu_follow.asm +++ b/engine/pikachu_follow.asm @@ -2,7 +2,7 @@ ShouldPikachuSpawn:: ; possibly to test if pika should be out? ld a, [wPikachuOverworldStateFlags] bit 5, a - jr nz, .hide ; 3f:44f8 + jr nz, .hide ld a, [wPikachuOverworldStateFlags] bit 7, a jr nz, .hide diff --git a/engine/pikachu_pcm.asm b/engine/pikachu_pcm.asm index 043f702c..bb2c089c 100755 --- a/engine/pikachu_pcm.asm +++ b/engine/pikachu_pcm.asm @@ -91,64 +91,64 @@ PikachuCriesPointerTable: ; dw pointer to cry ; bank 21 - pikacry_def PikachuCry1 ; 21:4000 - pikacry_def PikachuCry2 ; 21:491a - pikacry_def PikachuCry3 ; 21:4fdc - pikacry_def PikachuCry4 ; 21:59ee + pikacry_def PikachuCry1 + pikacry_def PikachuCry2 + pikacry_def PikachuCry3 + pikacry_def PikachuCry4 ; bank 22 - pikacry_def PikachuCry5 ; 22:4000 - pikacry_def PikachuCry6 ; 22:5042 - pikacry_def PikachuCry7 ; 22:6254 + pikacry_def PikachuCry5 + pikacry_def PikachuCry6 + pikacry_def PikachuCry7 ; bank 23 - pikacry_def PikachuCry8 ; 23:4000 - pikacry_def PikachuCry9 ; 23:50ca - pikacry_def PikachuCry10 ; 23:5e0c + pikacry_def PikachuCry8 + pikacry_def PikachuCry9 + pikacry_def PikachuCry10 ; bank 24 - pikacry_def PikachuCry11 ; 24:4000 - pikacry_def PikachuCry12 ; 24:4722 - pikacry_def PikachuCry13 ; 24:54a4 + pikacry_def PikachuCry11 + pikacry_def PikachuCry12 + pikacry_def PikachuCry13 ; bank 25 - pikacry_def PikachuCry14 ; 25:4000 - pikacry_def PikachuCry15 ; 25:589a + pikacry_def PikachuCry14 + pikacry_def PikachuCry15 ; banks 31-34, in no particular order - pikacry_def PikachuCry16 ; 31:4000 - pikacry_def PikachuCry17 ; 34:4000 - pikacry_def PikachuCry18 ; 31:549a - pikacry_def PikachuCry19 ; 33:4000 - pikacry_def PikachuCry20 ; 32:4000 - pikacry_def PikachuCry21 ; 32:6002 - pikacry_def PikachuCry22 ; 31:63a4 - pikacry_def PikachuCry23 ; 34:4862 - pikacry_def PikachuCry24 ; 33:5632 - pikacry_def PikachuCry25 ; 34:573c - pikacry_def PikachuCry26 ; 33:725c + pikacry_def PikachuCry16 + pikacry_def PikachuCry17 + pikacry_def PikachuCry18 + pikacry_def PikachuCry19 + pikacry_def PikachuCry20 + pikacry_def PikachuCry21 + pikacry_def PikachuCry22 + pikacry_def PikachuCry23 + pikacry_def PikachuCry24 + pikacry_def PikachuCry25 + pikacry_def PikachuCry26 ; bank 35 - pikacry_def PikachuCry27 ; 35:4000 - pikacry_def PikachuCry28 ; 35:4b5a - pikacry_def PikachuCry29 ; 35:5da4 - pikacry_def PikachuCry30 ; 35:69ce - pikacry_def PikachuCry31 ; 35:6e80 + pikacry_def PikachuCry27 + pikacry_def PikachuCry28 + pikacry_def PikachuCry29 + pikacry_def PikachuCry30 + pikacry_def PikachuCry31 ; bank 36 - pikacry_def PikachuCry32 ; 36:4000 - pikacry_def PikachuCry33 ; 36:458a - pikacry_def PikachuCry34 ; 36:523c + pikacry_def PikachuCry32 + pikacry_def PikachuCry33 + pikacry_def PikachuCry34 ; bank 37 - pikacry_def PikachuCry35 ; 37:4000 - pikacry_def PikachuCry36 ; 37:522a + pikacry_def PikachuCry35 + pikacry_def PikachuCry36 ; banks 36-38 - pikacry_def PikachuCry37 ; 38:4000 - pikacry_def PikachuCry38 ; 38:4dfa - pikacry_def PikachuCry39 ; 37:6e0c - pikacry_def PikachuCry40 ; 38:5a64 - pikacry_def PikachuCry41 ; 36:6746 - pikacry_def PikachuCry42 ; 38:6976 + pikacry_def PikachuCry37 + pikacry_def PikachuCry38 + pikacry_def PikachuCry39 + pikacry_def PikachuCry40 + pikacry_def PikachuCry41 + pikacry_def PikachuCry42 diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm index c04382c1..0da8e499 100755 --- a/engine/pikachu_pic_animation.asm +++ b/engine/pikachu_pic_animation.asm @@ -640,7 +640,7 @@ PikaPicAnimCommand_loadgfx: ld [wUpdateSpritesEnabled], a ret -RequestPikaPicAnimGFX: ; fe114 +RequestPikaPicAnimGFX: push de ld a, [wPikaPicAnimCurGraphicID] ld d, a @@ -654,7 +654,7 @@ RequestPikaPicAnimGFX: ; fe114 .failed ret -DecompressRequestPikaPicAnimGFX: ; fe128 +DecompressRequestPikaPicAnimGFX: push de ld a, [wPikaPicAnimCurGraphicID] ld d, a diff --git a/engine/predefsA.asm b/engine/predefsA.asm index b8384150..eb28b646 100644 --- a/engine/predefsA.asm +++ b/engine/predefsA.asm @@ -31,7 +31,7 @@ PredefShakeScreenVertically: ld [wDisableVBlankWYUpdate], a ret -.MutateWY ; 2bd81 (a:7d81) +.MutateWY ld a, [$ff96] xor b ld [$ff96], a @@ -59,7 +59,7 @@ PredefShakeScreenHorizontally: ld [rWX], a ret -.MutateWX ; 2bda7 (a:4da7) +.MutateWX ld a, [$ff97] xor b ld [$ff97], a diff --git a/engine/printer.asm b/engine/printer.asm index 46eb2c59..5be5286c 100644 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -323,12 +323,12 @@ PrintPCBox:: ld [wUpdateSpritesEnabled], a ret -Func_e8df4: ; e8df4 +Func_e8df4: ld hl, String_e8e1f call PrintText ret -Func_e8dfb: ; e8dfb +Func_e8dfb: call Printer_ResetJoypadHRAM .asm_e8dfe call JoypadLowSensitivity @@ -351,11 +351,11 @@ Func_e8dfb: ; e8dfb scf ret -String_e8e1f: ; e8e1f +String_e8e1f: TX_FAR _NoPokemonText db "@" -PrintFanClubPortrait: ; e8e24 +PrintFanClubPortrait: xor a ld [hCanceledPrinting], a call Printer_PlayPrinterMusic diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index b5d71596..b424876e 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -18,7 +18,6 @@ Printer_StartTransmission: ld [wPrinterQueueLength], a ret -; e87a8 PrinterTransmissionJumptable: ld a, [wPrinterSendState] ld e, a diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 2cfcc445..9e369d81 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -36,12 +36,12 @@ DisplayTitleScreen: ld bc, $50 ld a, BANK(NintendoCopyrightLogoGraphics) call FarCopyData - ld hl, NineTile ; 4:4e08 + ld hl, NineTile ld de, vTitleLogo + $6e0 ld bc, $10 ld a, BANK(NineTile) call FarCopyData - ld hl, GamefreakLogoGraphics ; 4:4d78 + ld hl, GamefreakLogoGraphics ld de, vTitleLogo + 101 * $10 ld bc, 9 * $10 ld a, BANK(GamefreakLogoGraphics) @@ -114,7 +114,7 @@ DisplayTitleScreen: ret ; place tiles for title screen copyright -.WriteCopyrightTiles ; 4241 (1:4241) +.WriteCopyrightTiles coord hl, 2, 17 ld de, .tileScreenCopyrightTiles .titleScreenCopyrightTilesLoop @@ -125,10 +125,10 @@ DisplayTitleScreen: ld [hli], a jr .titleScreenCopyrightTilesLoop -.tileScreenCopyrightTiles ; 424f (1:424f) +.tileScreenCopyrightTiles db $e0,$e1,$e2,$e3,$e1,$e2,$ee,$e5,$e6,$e7,$e8,$e9,$ea,$eb,$ec,$ed,$ff ; ©1995-1999 GAME FREAK inc. -.finishedBouncingPokemonLogo ; 4260 (1:4260) +.finishedBouncingPokemonLogo call LoadScreenTilesFromBuffer1 ld c, 36 call DelayFrames @@ -192,12 +192,12 @@ DisplayTitleScreen: jp z, .doClearSaveDialogue jp MainMenu -.asm_42f0 ; 42f0 (1:42f0) +.asm_42f0 ; unreferenced callab PrinterDebug jp .loop -.asm_42fb ; 42fb (1:42fb) +.asm_42fb ; unreferenced ld a, [wTitleScreenScene + 4] inc a @@ -213,7 +213,7 @@ DisplayTitleScreen: ld [wTitleScreenScene + 3], a jp .titleScreenLoop -.doTitlescreenReset ; 431b (1:431b) +.doTitlescreenReset ld [wAudioFadeOutControl], a call StopAllMusic .audioFadeLoop @@ -222,7 +222,7 @@ DisplayTitleScreen: jr nz, .audioFadeLoop jp Init -.doClearSaveDialogue ; 432a (1:432a) +.doClearSaveDialogue jpba DoClearSaveDialogue diff --git a/engine/unknown_ea3ea.asm b/engine/unknown_ea3ea.asm index ca5d8bff..01391f17 100755 --- a/engine/unknown_ea3ea.asm +++ b/engine/unknown_ea3ea.asm @@ -160,22 +160,18 @@ Printer_GetMonStats: .place_string call PlaceString ret -; ea52f .OT: db "OT/@" -; ea533 .IDNo: db $73, "№/@" -; ea537 .Stats: db "ATTACK" next "DEFENSE" next "SPEED" next "SPECIAL@" -; ea554 .Blank: db "--------------@" @@ -957,21 +953,21 @@ PrinterDebug_PrepOAMForPrinting: pop hl ret -Data_ea9de: ; ea9de +Data_ea9de: db 1, 0, $00, 0 dw 1 -Data_ea9e4: ; ea9e4 +Data_ea9e4: db 2, 0, $04, 0 dw 0 -Data_ea9ea: ; ea9ea +Data_ea9ea: db 4, 0, $80, 2 dw 0 -Data_ea9f0: ; ea9f0 +Data_ea9f0: db 4, 0, $00, 0 dw 4 -Data_ea9f6: ; ea9f6 +Data_ea9f6: db 8, 0, $00, 0 dw 8 -Data_ea9fc: ; ea9fc +Data_ea9fc: db 15, 0, $00, 0 dw 15 @@ -475,7 +475,7 @@ HandlePartyMenuInput:: jr nz, .asm_1258 ld a, [wCurrentMenuItem] ld [wWhichPokemon], a - callab IsThisPartymonStarterPikachu_Party ; 3f:4e18 + callab IsThisPartymonStarterPikachu_Party jr nc, .asm_1258 call CheckPikachuFollowingPlayer jr nz, .asm_128f @@ -536,7 +536,7 @@ HandlePartyMenuInput:: jp HandlePartyMenuInput PartyMenuText_12cc:: - TX_FAR _SleepingPikachuText1 ; 28:411b + TX_FAR _SleepingPikachuText1 db "@" DrawPartyMenu:: @@ -977,7 +977,7 @@ INCLUDE "home/lcdc.asm" IsTilePassable:: ; sets carry if tile is passable, resets carry otherwise - homecall_sf _IsTilePassable ; 1:4aaa + homecall_sf _IsTilePassable ret INCLUDE "home/copy2.asm" @@ -1001,7 +1001,7 @@ UpdateSprites:: switchbank _UpdateSprites ld a, $ff ld [wUpdateSpritesEnabled], a - call _UpdateSprites ; 1:4bb7 + call _UpdateSprites ld a, $1 ld [wUpdateSpritesEnabled], a pop af @@ -1115,7 +1115,7 @@ FadeOutAudio:: jp PlaySound UnknownText_2812:: - TX_FAR _PokemonText ; 2c:749a + TX_FAR _PokemonText db "@" ; this function is used to display sign messages, sprite dialog, etc. @@ -1348,7 +1348,7 @@ RepelWoreOffText:: db "@" DisplayPikachuEmotion:: - callab TalkToPikachu ; 3f:5004 + callab TalkToPikachu jp CloseTextDisplay INCLUDE "engine/menu/start_menu.asm" diff --git a/home/audio.asm b/home/audio.asm index cb6f0988..3cd2ffd0 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -229,7 +229,7 @@ InitMusicVariables:: push hl push de push bc - homecall Audio2_InitMusicVariables ; 8:59f8 + homecall Audio2_InitMusicVariables pop bc pop de pop hl @@ -239,7 +239,7 @@ InitSFXVariables:: push hl push de push bc - homecall Audio2_InitSFXVariables ; 8:5ab7 + homecall Audio2_InitSFXVariables pop bc pop de pop hl diff --git a/home/copy.asm b/home/copy.asm index 4f1d5017..d2228405 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -25,7 +25,7 @@ CopyData:: jr nz,.loop ret -.copybytes ; 00c1 +.copybytes ld a, [hli] ld [de], a inc de diff --git a/home/overworld.asm b/home/overworld.asm index d76fca98..382f90f9 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -473,7 +473,7 @@ WarpFound2:: ld [wMapPalOffset], a call GBFadeOutToBlack .notRockTunnel - callab CalculatePikachuSpawnState1 ; 3f:45fa + callab CalculatePikachuSpawnState1 call PlayMapChangeSound jr .done @@ -744,7 +744,7 @@ HandleBlackOut:: ld hl, wd72e res 5, [hl] switchbank SpecialWarpIn ; also Bank(SpecialEnterMap) - callab ResetStatusAndHalveMoneyOnBlackout ; 3c:4274 + callab ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap @@ -1770,7 +1770,7 @@ LoadWalkingPlayerSpriteGraphics:: xor a ld [wd473], a ld b, BANK(RedSprite) - ld de, RedSprite ; $4180 + ld de, RedSprite jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics2:: @@ -1787,7 +1787,7 @@ LoadSurfingPlayerSpriteGraphics2:: jr z, LoadSurfingPlayerSpriteGraphics .asm_0d7c ld b, BANK(SurfingPikachuSprite) - ld de, SurfingPikachuSprite ; 3f:6def + ld de, SurfingPikachuSprite jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics:: @@ -1824,7 +1824,7 @@ LoadMapHeader:: jr asm_0dbd Func_0db5:: ; XXX - callba LoadUnusedBluesHouseMissableObjectData ; 3c:4a55 + callba LoadUnusedBluesHouseMissableObjectData asm_0dbd ld a, [wCurMapTileset] ld [wUnusedD119], a @@ -1911,7 +1911,7 @@ asm_0dbd ld [wNumSigns], a and a ; are there any signs? jr z, .loadSpriteData ; if not, skip this - call CopySignData ; 0eb3 (0:0eb3) + call CopySignData .loadSpriteData ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? @@ -1922,9 +1922,9 @@ asm_0dbd ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? jr nz, .skip_pika_spawn - callab SchedulePikachuSpawnForAfterText ; 3f:44fa + callab SchedulePikachuSpawnForAfterText .skip_pika_spawn - callab LoadWildData ; 3:4b62 + callab LoadWildData 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 add a ; double it @@ -1938,7 +1938,7 @@ asm_0dbd ld a, [H_LOADEDROMBANK] push af switchbank MapSongBanks - ld hl, MapSongBanks ; 3f:4000 + ld hl, MapSongBanks add hl, bc add hl, bc ld a, [hli] @@ -2106,7 +2106,7 @@ SwitchToMapRomBank:: GetMapHeaderPointer:: ld a, [H_LOADEDROMBANK] push af - switchbank MapHeaderPointers ; 3f:41f2 + switchbank MapHeaderPointers push de ld a, [wCurMap] ld e, a @@ -2296,4 +2296,4 @@ LoadSprite:: xor a ld [hl], a ; zero byte 1, since it is not used pop hl - ret ; end of home/overworld.asm = 10b9 (0:10b9) + ret @@ -253,7 +253,7 @@ PewterCityBlocks: INCBIN "maps/pewtercity.blk" INCLUDE "data/mapHeaders/ceruleancity.asm" INCLUDE "data/mapObjects/ceruleancity.asm" -CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 +CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" INCLUDE "data/mapHeaders/vermilioncity.asm" INCLUDE "data/mapObjects/vermilioncity.asm" @@ -314,7 +314,7 @@ CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk" INCLUDE "data/mapHeaders/route1.asm" INCLUDE "data/mapObjects/route1.asm" -Route1Blocks: INCBIN "maps/route1.blk" ; 1c0fc +Route1Blocks: INCBIN "maps/route1.blk" UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk" OaksLabBlocks: INCBIN "maps/oakslab.blk" @@ -430,22 +430,22 @@ INCLUDE "data/mapObjects/route2house.asm" INCLUDE "data/mapHeaders/route5gate.asm" INCLUDE "scripts/route5gate.asm" INCLUDE "data/mapObjects/route5gate.asm" -Route5GateBlocks: INCBIN "maps/route5gate.blk" ; 1d92f +Route5GateBlocks: INCBIN "maps/route5gate.blk" INCLUDE "data/mapHeaders/route6gate.asm" INCLUDE "scripts/route6gate.asm" INCLUDE "data/mapObjects/route6gate.asm" -Route6GateBlocks: INCBIN "maps/route6gate.blk" ; 1d9f2 +Route6GateBlocks: INCBIN "maps/route6gate.blk" INCLUDE "data/mapHeaders/route7gate.asm" INCLUDE "scripts/route7gate.asm" INCLUDE "data/mapObjects/route7gate.asm" -Route7GateBlocks: INCBIN "maps/route7gate.blk" ; 1dab9 +Route7GateBlocks: INCBIN "maps/route7gate.blk" INCLUDE "data/mapHeaders/route8gate.asm" INCLUDE "scripts/route8gate.asm" INCLUDE "data/mapObjects/route8gate.asm" -Route8GateBlocks: INCBIN "maps/route8gate.blk" ; 1dab9 +Route8GateBlocks: INCBIN "maps/route8gate.blk" INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" INCLUDE "scripts/undergroundpathentranceroute8.asm" @@ -1015,7 +1015,7 @@ SECTION "bank12",ROMX,BANK[$12] INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" -Route7Blocks: INCBIN "maps/route7.blk" ; 48051 +Route7Blocks: INCBIN "maps/route7.blk" MtMoonPokecenterBlocks: RockTunnelPokecenterBlocks: CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" @@ -1236,15 +1236,11 @@ AgathaPic: INCBIN "pic/trainer/agatha.pic" LancePic: INCBIN "pic/trainer/lance.pic" JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" -; 4fe79 (13:7e79) - INCLUDE "data/mapHeaders/tradecenter.asm" INCLUDE "scripts/tradecenter.asm" INCLUDE "data/mapObjects/tradecenter.asm" TradeCenterBlocks: INCBIN "maps/tradecenter.blk" -; 4fee6 (13:7ee6) - INCLUDE "data/mapHeaders/colosseum.asm" INCLUDE "scripts/colosseum.asm" INCLUDE "data/mapObjects/colosseum.asm" @@ -1266,21 +1262,21 @@ Route23Blocks: INCBIN "maps/route23.blk" INCLUDE "data/mapHeaders/route24.asm" INCLUDE "data/mapObjects/route24.asm" -Route24Blocks: INCBIN "maps/route24.blk" ; 506ed (14:46ed) +Route24Blocks: INCBIN "maps/route24.blk" INCLUDE "data/mapHeaders/route25.asm" INCLUDE "data/mapObjects/route25.asm" -Route25Blocks: INCBIN "maps/route25.blk" ; 50816 (14:4816) +Route25Blocks: INCBIN "maps/route25.blk" ; indigoplateau INCLUDE "data/mapHeaders/indigoplateau.asm" INCLUDE "scripts/indigoplateau.asm" INCLUDE "data/mapObjects/indigoplateau.asm" -IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk" ; 50950 (14:4950) +IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk" INCLUDE "data/mapHeaders/saffroncity.asm" INCLUDE "data/mapObjects/saffroncity.asm" -SaffronCityBlocks: INCBIN "maps/saffroncity.blk" ; 50a98 (14:4a98) +SaffronCityBlocks: INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" INCLUDE "scripts/route20.asm" INCLUDE "scripts/route22.asm" @@ -1329,23 +1325,23 @@ SECTION "bank15",ROMX,BANK[$15] INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" -Route2Blocks: INCBIN "maps/route2.blk" ; 54086 +Route2Blocks: INCBIN "maps/route2.blk" INCLUDE "data/mapHeaders/route3.asm" INCLUDE "data/mapObjects/route3.asm" -Route3Blocks: INCBIN "maps/route3.blk" ; 5425d +Route3Blocks: INCBIN "maps/route3.blk" INCLUDE "data/mapHeaders/route4.asm" INCLUDE "data/mapObjects/route4.asm" -Route4Blocks: INCBIN "maps/route4.blk" ; 543f4 +Route4Blocks: INCBIN "maps/route4.blk" INCLUDE "data/mapHeaders/route5.asm" INCLUDE "data/mapObjects/route5.asm" -Route5Blocks: INCBIN "maps/route5.blk" ; 545da +Route5Blocks: INCBIN "maps/route5.blk" INCLUDE "data/mapHeaders/route9.asm" INCLUDE "data/mapObjects/route9.asm" -Route9Blocks: INCBIN "maps/route9.blk" ; 54706 +Route9Blocks: INCBIN "maps/route9.blk" INCLUDE "data/mapHeaders/route13.asm" INCLUDE "data/mapObjects/route13.asm" @@ -1365,7 +1361,7 @@ Route19Blocks: INCBIN "maps/route19.blk" INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" -Route21Blocks: INCBIN "maps/route21.blk" ; 5507d +Route21Blocks: INCBIN "maps/route21.blk" DayCareMBlocks: VermilionHouse2Blocks: @@ -1420,11 +1416,11 @@ SECTION "bank16",ROMX,BANK[$16] INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" -Route6Blocks: INCBIN "maps/route6.blk" ; 58079 +Route6Blocks: INCBIN "maps/route6.blk" INCLUDE "data/mapHeaders/route8.asm" INCLUDE "data/mapObjects/route8.asm" -Route8Blocks: INCBIN "maps/route8.blk" ; 581c6 +Route8Blocks: INCBIN "maps/route8.blk" INCLUDE "data/mapHeaders/route10.asm" INCLUDE "data/mapObjects/route10.asm" @@ -1432,7 +1428,7 @@ Route10Blocks: INCBIN "maps/route10.blk" INCLUDE "data/mapHeaders/route11.asm" INCLUDE "data/mapObjects/route11.asm" -Route11Blocks: INCBIN "maps/route11.blk" ; 5855f +Route11Blocks: INCBIN "maps/route11.blk" INCLUDE "data/mapHeaders/route12.asm" INCLUDE "data/mapObjects/route12.asm" @@ -1444,7 +1440,7 @@ Route15Blocks: INCBIN "maps/route15.blk" INCLUDE "data/mapHeaders/route16.asm" INCLUDE "data/mapObjects/route16.asm" -Route16Blocks: INCBIN "maps/route16.blk" ; 58b84 +Route16Blocks: INCBIN "maps/route16.blk" INCLUDE "data/mapHeaders/route18.asm" INCLUDE "data/mapObjects/route18.asm" @@ -2002,119 +1998,119 @@ INCBIN "engine/bank30.bin" SECTION "bank39",ROMX,BANK[$39] -Pic_e4000: ; e4000 +Pic_e4000: INCBIN "gfx/pikachu/unknown_e4000.pic" -GFX_e40cc: ; e40cc +GFX_e40cc: INCBIN "gfx/pikachu/unknown_e40cc.2bpp" -Pic_e411c: ; e411c +Pic_e411c: INCBIN "gfx/pikachu/unknown_e411c.pic" -GFX_e41d2: ; e41d2 +GFX_e41d2: INCBIN "gfx/pikachu/unknown_e41d2.2bpp" -Pic_e4272: ; e4272 +Pic_e4272: INCBIN "gfx/pikachu/unknown_e4272.pic" -GFX_e4323: ; e4323 +GFX_e4323: INCBIN "gfx/pikachu/unknown_e4323.2bpp" -Pic_e4383: ; e4383 +Pic_e4383: INCBIN "gfx/pikachu/unknown_e4383.pic" -GFX_e444b: ; e444b +GFX_e444b: INCBIN "gfx/pikachu/unknown_e444b.2bpp" -Pic_e458b: ; e458b +Pic_e458b: INCBIN "gfx/pikachu/unknown_e458b.pic" -GFX_e463b: ; e463b +GFX_e463b: INCBIN "gfx/pikachu/unknown_e463b.2bpp" -Pic_e467b: ; e467b +Pic_e467b: INCBIN "gfx/pikachu/unknown_e467b.pic" -GFX_e472e: ; e472e +GFX_e472e: INCBIN "gfx/pikachu/unknown_e472e.2bpp" -Pic_e476e: ; e476e +Pic_e476e: INCBIN "gfx/pikachu/unknown_e476e.pic" -GFX_e4841: ; e4841 +GFX_e4841: INCBIN "gfx/pikachu/unknown_e4841.2bpp" -Pic_e49d1: ; e49d1 +Pic_e49d1: INCBIN "gfx/pikachu/unknown_e49d1.pic" -GFX_e4a99: ; e4a99 +GFX_e4a99: INCBIN "gfx/pikachu/unknown_e4a99.2bpp" -Pic_e4b39: ; e4b39 +Pic_e4b39: INCBIN "gfx/pikachu/unknown_e4b39.pic" -GFX_e4bde: ; e4bde +GFX_e4bde: INCBIN "gfx/pikachu/unknown_e4bde.2bpp" -Pic_e4c3e: ; e4c3e +Pic_e4c3e: INCBIN "gfx/pikachu/unknown_e4c3e.pic" -GFX_e4ce0: ; e4ce0 +GFX_e4ce0: INCBIN "gfx/pikachu/unknown_e4ce0.2bpp" -GFX_e4e70: ; e4e70 +GFX_e4e70: INCBIN "gfx/pikachu/unknown_e4e70.2bpp" -Pic_e5000: ; e5000 +Pic_e5000: INCBIN "gfx/pikachu/unknown_e5000.pic" -GFX_e50af: ; e50af +GFX_e50af: INCBIN "gfx/pikachu/unknown_e50af.2bpp" -Pic_e523f: ; e523f +Pic_e523f: INCBIN "gfx/pikachu/unknown_e523f.pic" -GFX_e52fe: ; e52fe +GFX_e52fe: INCBIN "gfx/pikachu/unknown_e52fe.2bpp" -Pic_e548e: ; e548e +Pic_e548e: INCBIN "gfx/pikachu/unknown_e548e.pic" -GFX_e5541: ; e5541 +GFX_e5541: INCBIN "gfx/pikachu/unknown_e5541.2bpp" -Pic_e56d1: ; e56d1 +Pic_e56d1: INCBIN "gfx/pikachu/unknown_e56d1.pic" -GFX_e5794: ; e5794 +GFX_e5794: INCBIN "gfx/pikachu/unknown_e5794.2bpp" -Pic_e5924: ; e5924 +Pic_e5924: INCBIN "gfx/pikachu/unknown_e5924.pic" -GFX_e59ed: ; e59ed +GFX_e59ed: INCBIN "gfx/pikachu/unknown_e59ed.2bpp" -Pic_e5b7d: ; e5b7d +Pic_e5b7d: INCBIN "gfx/pikachu/unknown_e5b7d.pic" -GFX_e5c4d: ; e5c4d +GFX_e5c4d: INCBIN "gfx/pikachu/unknown_e5c4d.2bpp" -Pic_e5ddd: ; e5ddd +Pic_e5ddd: INCBIN "gfx/pikachu/unknown_e5ddd.pic" -GFX_e5e90: ; e5e90 +GFX_e5e90: INCBIN "gfx/pikachu/unknown_e5e90.2bpp" -GFX_e6020: ; e6020 +GFX_e6020: INCBIN "gfx/pikachu/unknown_e6020.2bpp" -GFX_e61b0: ; e61b0 +GFX_e61b0: INCBIN "gfx/pikachu/unknown_e61b0.2bpp" -Pic_e6340: ; e6340 +Pic_e6340: INCBIN "gfx/pikachu/unknown_e6340.pic" -GFX_e63f7: ; e63f7 +GFX_e63f7: INCBIN "gfx/pikachu/unknown_e63f7.2bpp" -Pic_e6587: ; e6587 +Pic_e6587: INCBIN "gfx/pikachu/unknown_e6587.pic" -GFX_e6646: ; e6646 +GFX_e6646: INCBIN "gfx/pikachu/unknown_e6646.2bpp" -Pic_e67d6: ; e67d6 +Pic_e67d6: INCBIN "gfx/pikachu/unknown_e67d6.pic" -GFX_e682f: ; e682f +GFX_e682f: INCBIN "gfx/pikachu/unknown_e682f.2bpp" -GFX_e69bf: ; e69bf +GFX_e69bf: INCBIN "gfx/pikachu/unknown_e69bf.2bpp" -GFX_e6b4f: ; e6b4f +GFX_e6b4f: INCBIN "gfx/pikachu/unknown_e6b4f.2bpp" -GFX_e6cdf: ; e6cdf +GFX_e6cdf: INCBIN "gfx/pikachu/unknown_e6cdf.2bpp" -GFX_e6e6f: ; e6e6f +GFX_e6e6f: INCBIN "gfx/pikachu/unknown_e6e6f.2bpp" -GFX_e6fff: ; e6fff +GFX_e6fff: INCBIN "gfx/pikachu/unknown_e6fff.2bpp" -GFX_e718f: ; e718f +GFX_e718f: INCBIN "gfx/pikachu/unknown_e718f.2bpp" -GFX_e731f: ; e731f +GFX_e731f: INCBIN "gfx/pikachu/unknown_e731f.2bpp" -GFX_e74af: ; e74af +GFX_e74af: INCBIN "gfx/pikachu/unknown_e74af.2bpp" -GFX_e763f: ; e763f +GFX_e763f: INCBIN "gfx/pikachu/unknown_e763f.2bpp" -Pic_e77cf: ; e77cf +Pic_e77cf: INCBIN "gfx/pikachu/unknown_e77cf.pic" -GFX_e7863: ; e7863 +GFX_e7863: INCBIN "gfx/pikachu/unknown_e7863.2bpp" -GFX_e79f3: ; e79f3 +GFX_e79f3: INCBIN "gfx/pikachu/unknown_e79f3.2bpp" -GFX_e7b83: ; e7b83 +GFX_e7b83: INCBIN "gfx/pikachu/unknown_e7b83.2bpp" -GFX_e7d13: ; e7d13 +GFX_e7d13: INCBIN "gfx/pikachu/unknown_e7d13.2bpp" diff --git a/scripts/route18.asm b/scripts/route18.asm index 7b654e7c..b89e2613 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -110,4 +110,3 @@ Route18Text4: Route18Text5: TX_FAR _Route18Text5 db "@" -; 59b64 diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index cd5a818d..1ef7dbaf 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -249,7 +249,6 @@ SilphCo11Script_6229c: ld a, $5 call SilphCo11Script_62189 ret -; 622f4 SilphCo11MovementData_622f5: db $5 diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 0cfd1fe8..46c01fc8 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -1,4 +1,4 @@ -_ViridianCityText_19219:: ; 2d:4478 +_ViridianCityText_19219:: text "First, you need" line "to weaken the" cont "target #MON." |