diff options
Diffstat (limited to 'engine')
27 files changed, 60 insertions, 60 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index d9319b699..2c8ff64dd 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -679,7 +679,7 @@ BattleAnimCmd_5GFX: push bc push hl ld l, a - ld h, $0 + ld h, 0 rept 4 add hl, hl endr diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 782ace2e5..d86757b95 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1990,7 +1990,7 @@ BattleBGEffect_FadeMonsToBlackRepeating: swap a sla a ld e, a - ld d, $0 + ld d, 0 push bc call BGEffect_CheckBattleTurn jr nz, .player @@ -2614,7 +2614,7 @@ BattleBGEffect_GetFirstDMGPal: inc [hl] BattleBGEffect_GetNextDMGPal: ld l, a - ld h, $0 + ld h, 0 add hl, de ld a, [hl] cp -1 @@ -2823,7 +2823,7 @@ DeformWater: ld a, [wBattleSineWaveTempProgress] add e ld e, a - ld d, $0 + ld d, 0 ret BattleBGEffect_WavyScreenFX: diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 5a04a5b65..af24bf6c0 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -778,7 +778,7 @@ BattleAnimFunction_FireBlast: call DeinitBattleAnimation ret -.one +.one ; Flame that moves upward ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc @@ -2145,13 +2145,13 @@ BattleAnimFunction_Egg: call BattleAnim_IncAnonJumptableIndex ; jumps to three ret -.egg_bomb_done +.egg_bomb_done ; Increases jumptable index twice to four call BattleAnim_IncAnonJumptableIndex inc [hl] ret -.three +.three ; Waits in place ld hl, BATTLEANIMSTRUCT_VAR2 add hl, bc @@ -3387,7 +3387,7 @@ BattleAnimFunction_SkyAttack: call DeinitBattleAnimation ret -.SkyAttack_CyclePalette: +.SkyAttack_CyclePalette: ; Cycles wOBP0 pallete ld hl, BATTLEANIMSTRUCT_VAR2 add hl, bc @@ -3396,7 +3396,7 @@ BattleAnimFunction_SkyAttack: inc [hl] srl a ld e, a - ld d, $0 + ld d, 0 ldh a, [hSGB] and a jr nz, .sgb diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index ab8dd3ca0..c99bc5d8c 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -176,7 +176,7 @@ Kurt_GetQuantityOfApricorn: ld hl, wNumItems ld a, [wCurItem] ld c, a - ld b, $0 + ld b, 0 .loop inc hl ld a, [hli] @@ -344,7 +344,7 @@ Kurt_GetAddressOfApricornQuantity: ld hl, wNumItems inc hl ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc inc hl @@ -358,7 +358,7 @@ Kurt_GetRidOfItem: ld hl, wNumItems ld a, [wCurItemQuantity] ld c, a - ld b, $0 + ld b, 0 inc hl add hl, bc add hl, bc diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index d674eebb1..ec39619f3 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -147,7 +147,7 @@ PlaceMapNameCenterAlign: ld a, SCREEN_WIDTH sub c srl a - ld b, $0 + ld b, 0 ld c, a hlcoord 0, 2 add hl, bc diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index b797f58ce..2b4c0f0b2 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -339,7 +339,7 @@ CardFlip_ShuffleDeck: cp CARDFLIP_DECK_SIZE jr nc, .loop ld l, a - ld h, $0 + ld h, 0 add hl, de ld a, [hl] and a diff --git a/engine/games/memory_game.asm b/engine/games/memory_game.asm index 10a0b24ed..8be4e51c4 100644 --- a/engine/games/memory_game.asm +++ b/engine/games/memory_game.asm @@ -216,7 +216,7 @@ endr pop af push hl ld e, a - ld d, $0 + ld d, 0 ld hl, wMemoryGameCards add hl, de ld a, [hl] @@ -259,7 +259,7 @@ MemoryGame_CheckMatch: ld a, [wMemoryGameCard1Location] ld e, a - ld d, $0 + ld d, 0 ld hl, wMemoryGameCards add hl, de ld [hl], -1 diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 8962f4424..117a5d459 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -551,7 +551,7 @@ Slots_GetCurrentReelState: dec a and $f ld e, a - ld d, $0 + ld d, 0 ld hl, REEL_TILEMAP_ADDR add hl, bc ld a, [hli] diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index c5db774b8..daf987380 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -97,7 +97,7 @@ InitUnownPuzzlePiecePositions: and $f ld hl, .PuzzlePieceInitialPositions ld e, a - ld d, $0 + ld d, 0 add hl, de ld e, [hl] ld hl, wPuzzlePieces @@ -449,7 +449,7 @@ UnownPuzzle_CheckCurrentTileOccupancy: ld hl, wPuzzlePieces ld a, [wUnownPuzzleCursorPosition] ld e, a - ld d, $0 + ld d, 0 add hl, de ld a, [hl] ret diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index ee4e2caeb..95f53b160 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -86,7 +86,7 @@ _CGB_BattleColors: call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY ld a, [wEnemyHPPal] ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl ld bc, HPBarPals @@ -94,7 +94,7 @@ _CGB_BattleColors: call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY_HP ld a, [wPlayerHPPal] ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl ld bc, HPBarPals @@ -196,7 +196,7 @@ _CGB_StatsScreenHPPals: ld de, wBGPals1 ld a, [wCurHPPal] ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl ld bc, HPBarPals @@ -832,7 +832,7 @@ _CGB_Pokepic: .found_top ld a, [wMenuBorderLeftCoord] ld e, a - ld d, $0 + ld d, 0 add hl, de ld a, [wMenuBorderTopCoord] ld b, a diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index a0de280af..7e7f075a0 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -111,7 +111,7 @@ SGB_ApplyPartyMenuHPPals: ld hl, wHPPals ld a, [wSGBPals] ld e, a - ld d, $0 + ld d, 0 add hl, de ld e, l ld d, h @@ -461,7 +461,7 @@ CopyPalettes: GetPredefPal: ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl add hl, hl @@ -630,7 +630,7 @@ CGB_ApplyPartyMenuHPPals: ld hl, wHPPals ld a, [wSGBPals] ld e, a - ld d, $0 + ld d, 0 add hl, de ld e, l ld d, h @@ -762,7 +762,7 @@ CGBCopyTwoPredefObjectPals: ; unreferenced _GetMonPalettePointer: ld l, a - ld h, $0 + ld h, 0 add hl, hl add hl, hl add hl, hl diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 90bb06620..36faf9b7c 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -413,7 +413,7 @@ PokeAnim_End: PokeAnim_GetDuration: ; a * (1 + [wPokeAnimSpeed] / 16) ld c, a - ld b, $0 + ld b, 0 ld hl, 0 ld a, [wPokeAnimSpeed] call AddNTimes @@ -466,7 +466,7 @@ PokeAnim_GetPointer: push hl ld a, [wPokeAnimFrame] ld e, a - ld d, $0 + ld d, 0 ld hl, wPokeAnimPointerAddr ld a, [hli] ld h, [hl] @@ -488,7 +488,7 @@ PokeAnim_GetBitmaskIndex: ld a, [wPokeAnimCommand] dec a ld c, a - ld b, $0 + ld b, 0 ld hl, wPokeAnimFramesAddr ld a, [hli] ld h, [hl] diff --git a/engine/items/items.asm b/engine/items/items.asm index 42381b411..cfdd4a4c5 100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -240,7 +240,7 @@ RemoveItemFromPocket: cp c jr nc, .ok ; memory ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc ld a, [wCurItem] diff --git a/engine/link/link.asm b/engine/link/link.asm index d9fb40d01..ddda92dbe 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -343,7 +343,7 @@ Gen2ToGen2LinkComms: jr z, .start_copying_mail ld hl, wcc4a dec a - ld b, $0 + ld b, 0 ld c, a add hl, bc ld [hl], SERIAL_NO_DATA_BYTE diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index d23b4d1e3..6a8d6fd4e 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -425,7 +425,7 @@ ScrollingMenu_CallFunctions1and2: and a jr z, .done ld e, a - ld d, $0 + ld d, 0 add hl, de ld d, h ld e, l @@ -491,7 +491,7 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ld a, [wMenuScrollPosition] add e ld e, a - ld d, $0 + ld d, 0 ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 6e2ea8529..f93c10c8e 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -1232,7 +1232,7 @@ CrystalIntro_UnownFade: add a add a ld e, a - ld d, $0 + ld d, 0 ld hl, wBGPals2 add hl, de inc hl @@ -1248,7 +1248,7 @@ CrystalIntro_UnownFade: .okay ld c, a - ld b, $0 + ld b, 0 ldh a, [rSVBK] push af ld a, BANK(wBGPals2) @@ -1397,7 +1397,7 @@ Intro_FadeUnownWordPals: add a add a ld e, a - ld d, $0 + ld d, 0 ld hl, wBGPals2 add hl, de rept 4 @@ -1406,7 +1406,7 @@ endr ld a, [wIntroSceneTimer] add a ld c, a - ld b, $0 + ld b, 0 ldh a, [rSVBK] push af @@ -1530,7 +1530,7 @@ Intro_RustleGrass: and $c srl a ld e, a - ld d, $0 + ld d, 0 ld hl, .RustlingGrassPointers add hl, de ld a, [hli] diff --git a/engine/movie/title.asm b/engine/movie/title.asm index ad06343c9..91ac1f8c2 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -229,7 +229,7 @@ SuicuneFrameIterator: sla a swap a ld e, a - ld d, $0 + ld d, 0 ld hl, .Frames add hl, de ld d, [hl] diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index d9878269b..a8b95d3b2 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -951,7 +951,7 @@ ApplyObjectFacing: Script_variablesprite: call GetScriptByte ld e, a - ld d, $0 + ld d, 0 ld hl, wVariableSprites add hl, de call GetScriptByte diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 08ef07280..27acc48f1 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -223,7 +223,7 @@ GetAvailableCallers: .different_map ld a, [wNumAvailableCallers] ld c, a - ld b, $0 + ld b, 0 inc a ld [wNumAvailableCallers], a ld hl, wAvailableCallers diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 10cd6ef8d..341730829 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1482,7 +1482,7 @@ Pokedex_PrintListing: ; Load de with wPokedexOrder + [wDexListingScrollOffset] ld a, [wDexListingScrollOffset] ld e, a - ld d, $0 + ld d, 0 ld hl, wPokedexOrder add hl, de ld e, l @@ -1581,7 +1581,7 @@ Pokedex_GetSelectedMon: ld hl, wDexListingScrollOffset add [hl] ld e, a - ld d, $0 + ld d, 0 ld hl, wPokedexOrder add hl, de ld a, [hl] diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index ad06ad059..ba742723e 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -2709,7 +2709,7 @@ TownMapMon: ld a, [wCurPartyMon] ld hl, wPartySpecies ld e, a - ld d, $0 + ld d, 0 add hl, de ld a, [hl] ld [wTempIconSpecies], a diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 2c5145b9f..cdb513242 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1114,7 +1114,7 @@ BillsPC_LoadMonStats: ld hl, wBillsPC_ScrollPosition add [hl] ld e, a - ld d, $0 + ld d, 0 ld hl, wBillsPCPokemonList + 1 ; box number add hl, de add hl, de @@ -1443,7 +1443,7 @@ BillsPC_GetSelectedPokemonSpecies: ld hl, wBillsPC_ScrollPosition add [hl] ld e, a - ld d, $0 + ld d, 0 ld hl, wBillsPCPokemonList add hl, de add hl, de @@ -2105,7 +2105,7 @@ MovePKMNWitoutMail_InsertMon: CopySpeciesToTemp: ld a, [wCurPartyMon] ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] ld [wCurPartySpecies], a @@ -2179,7 +2179,7 @@ BillsPC_ApplyPalettes: BillsPC_Jumptable: ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld a, [hli] diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 135a26e46..70aa2f52e 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -1052,7 +1052,7 @@ MoveScreenLoop: ld a, [wMenuCursorY] dec a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld d, h ld e, l @@ -1060,7 +1060,7 @@ MoveScreenLoop: ld a, [wMoveSwapBuffer] dec a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [de] ld b, [hl] @@ -1097,7 +1097,7 @@ SetUpMoveScreenBG: farcall ClearSpriteAnims2 ld a, [wCurPartyMon] ld e, a - ld d, $0 + ld d, 0 ld hl, wPartySpecies add hl, de ld a, [hl] @@ -1168,7 +1168,7 @@ PrepareToPlaceMoveData: ld a, [wMenuCursorY] dec a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] ld [wCurSpecies], a diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index e318a0430..9cb2fa159 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -135,7 +135,7 @@ PlacePartyHPBar: ld hl, wHPPals ld a, [wSGBPals] ld c, a - ld b, $0 + ld b, 0 add hl, bc call SetHPPal ld b, SCGB_PARTY_MENU_HP_BARS @@ -682,7 +682,7 @@ PartyMenuSelect: dec a ld [wCurPartyMon], a ld c, a - ld b, $0 + ld b, 0 ld hl, wPartySpecies add hl, bc ld a, [hl] @@ -715,7 +715,7 @@ PrintPartyMenuText: and $f ; drop high nibble ld hl, PartyMenuStrings ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld a, [hli] diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 512332fcc..1ec3cf698 100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm @@ -46,13 +46,13 @@ _SwitchPartyMons: ld bc, wPartySpecies ld a, [wSwitchMonTo] ld l, a - ld h, $0 + ld h, 0 add hl, bc ld d, h ld e, l ld a, [wSwitchMonFrom] ld l, a - ld h, $0 + ld h, 0 add hl, bc ld a, [hl] push af diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index e8e93bf2d..761053621 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -852,7 +852,7 @@ Printer_GetMonGender: Printer_GetBoxMonSpecies: push hl ld e, a - ld d, $0 + ld d, 0 ld a, [wAddrOfBoxToPrint] ld l, a ld a, [wAddrOfBoxToPrint + 1] diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 49c9a122e..585778403 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -185,7 +185,7 @@ ClockResetPassword: .getcurrentdigit ld a, [wStringBuffer2 + 5] ld e, a - ld d, $0 + ld d, 0 ld hl, wStringBuffer2 add hl, de ret |