diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 2d5a53aa0..fde4d2969 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -1077,7 +1077,7 @@ GetMinimizePic: ; cc6e7 (33:46e7) call CopyMinimizePic ld hl, vTiles2 tile $00 ld de, sScratch - lb bc, BANK(GetMinimizePic), $31 + lb bc, BANK(GetMinimizePic), 7 * 7 ret .player @@ -1085,7 +1085,7 @@ GetMinimizePic: ; cc6e7 (33:46e7) call CopyMinimizePic ld hl, vTiles2 tile $31 ld de, sScratch - lb bc, BANK(GetMinimizePic), $24 + lb bc, BANK(GetMinimizePic), 6 * 6 ret CopyMinimizePic: ; cc719 (33:4719) diff --git a/engine/credits.asm b/engine/credits.asm index 0df0d9f7b..a805ea565 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -34,17 +34,17 @@ Credits:: ; 109847 ld de, CreditsBorderGFX ld hl, vTiles2 tile $20 - lb bc, BANK(CreditsBorderGFX), $09 + lb bc, BANK(CreditsBorderGFX), 9 call Request2bpp ld de, CopyrightGFX ld hl, vTiles2 tile $60 - lb bc, BANK(CopyrightGFX), $1d + lb bc, BANK(CopyrightGFX), 29 call Request2bpp ld de, TheEndGFX ld hl, vTiles2 tile $40 - lb bc, BANK(TheEndGFX), $10 + lb bc, BANK(TheEndGFX), 16 call Request2bpp ld a, $ff diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 7ce19004a..dd1ea506c 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -52,7 +52,7 @@ Copyright_GFPresents: ; e4579 .GetGFLogoGFX: ; e45e8 ld de, GameFreakLogo ld hl, vTiles2 - lb bc, BANK(GameFreakLogo), $1c + lb bc, BANK(GameFreakLogo), 28 call Get1bpp ld a, [rSVBK] diff --git a/engine/debug.asm b/engine/debug.asm index d95676db8..c36652148 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -1061,9 +1061,9 @@ TilesetColorTest: call WaitBGMap2 xor a ld [hBGMapMode], a - ld de, DebugColorTestGFX + $10 + ld de, DebugColorTestGFX + 1 tiles ld hl, vTiles2 tile $6a - lb bc, BANK(DebugColorTestGFX), $16 + lb bc, BANK(DebugColorTestGFX), 22 call Request2bpp ld de, DebugColorTestGFX ld hl, vTiles1 diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index e61bdec8f..58509f383 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -1,3 +1,5 @@ +SPECIALCELEBIEVENT_CELEBI EQU $84 + Special_CelebiShrineEvent: ; 4989a call DelayFrame ld a, [VramState] @@ -10,7 +12,7 @@ Special_CelebiShrineEvent: ; 4989a call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc - ld [hl], $84 + ld [hl], SPECIALCELEBIEVENT_CELEBI ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc ld [hl], SPRITE_ANIM_SEQ_CELEBI @@ -76,8 +78,8 @@ LoadCelebiGFX: ; 49912 lb bc, BANK(SpecialCelebiLeafGFX), 4 call Request2bpp ld de, SpecialCelebiGFX - ld hl, vTiles0 tile $84 - lb bc, BANK(SpecialCelebiGFX), $10 + ld hl, vTiles0 tile SPECIALCELEBIEVENT_CELEBI + lb bc, BANK(SpecialCelebiGFX), 4 * 4 call Request2bpp xor a ld [wJumptableIndex], a @@ -306,22 +308,22 @@ GetCelebiSpriteTile: ; 49bae .Frame1: - ld a, $84 + ld a, SPECIALCELEBIEVENT_CELEBI jr .load_tile .Frame2: - ld a, $88 + ld a, SPECIALCELEBIEVENT_CELEBI + 4 jr .load_tile .Frame3: - ld a, $8c + ld a, SPECIALCELEBIEVENT_CELEBI + 8 jr .load_tile .Frame4: - ld a, $90 + ld a, SPECIALCELEBIEVENT_CELEBI + 12 .load_tile ld hl, SPRITEANIMSTRUCT_TILE_ID diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 31e19778c..b92ddc22e 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1376,7 +1376,7 @@ Copyright: ; 63e2 call LoadFontsExtra ld de, CopyrightGFX ld hl, vTiles2 tile $60 - lb bc, BANK(CopyrightGFX), $1d + lb bc, BANK(CopyrightGFX), 29 call Request2bpp hlcoord 2, 7 ld de, CopyrightString diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 9d915dc9e..98a64c775 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -182,7 +182,7 @@ NamingScreen: ; 116c1 .Box: ; 117f5 (4:57f5) ld de, PokeBallSpriteGFX ld hl, vTiles0 tile $00 - lb bc, BANK(PokeBallSpriteGFX), $4 + lb bc, BANK(PokeBallSpriteGFX), 4 call Request2bpp xor a ld hl, wSpriteAnimDict diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 69a51c792..243b85613 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -829,7 +829,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df) .decompress ld hl, PokedexLZ ld de, vTiles2 tile $31 - lb bc, BANK(PokedexLZ), $3a + lb bc, BANK(PokedexLZ), 58 call DecompressRequest2bpp .done diff --git a/engine/pokedex_3.asm b/engine/pokedex_3.asm index 482f55799..dc52f83d3 100644 --- a/engine/pokedex_3.asm +++ b/engine/pokedex_3.asm @@ -7,7 +7,7 @@ LoadSGBPokedexGFX: ; 1ddf1c LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26) ld hl, SGBPokedexGFX_LZ ld de, vTiles2 tile $31 - lb bc, BANK(SGBPokedexGFX_LZ), $3a + lb bc, BANK(SGBPokedexGFX_LZ), 58 call DecompressRequest2bpp ret diff --git a/engine/pokegear.asm b/engine/pokegear.asm index ee993749e..29946a47d 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -116,7 +116,7 @@ Pokegear_LoadGFX: ; 90c4e ld a, BANK(TownMapGFX) call FarDecompress ld hl, PokegearGFX - ld de, vTiles2 + $30 tiles + ld de, vTiles2 tile $30 ld a, BANK(PokegearGFX) call FarDecompress ld hl, PokegearSpritesGFX @@ -2944,7 +2944,7 @@ TownMapPlayerIcon: ; 91fa6 LoadTownMapGFX: ; 91ff2 ld hl, TownMapGFX ld de, vTiles2 - lb bc, BANK(TownMapGFX), $30 + lb bc, BANK(TownMapGFX), 48 call DecompressRequest2bpp ret diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm index b6711ac61..e63d95cd7 100755 --- a/engine/trade_animation.asm +++ b/engine/trade_animation.asm @@ -1512,15 +1512,15 @@ LoadTradeBallAndCableGFX: ; 2982b call DelayFrame ld de, TradeBallGFX ld hl, vTiles0 tile $62 - lb bc, BANK(TradeBallGFX), $6 + lb bc, BANK(TradeBallGFX), 6 call Request2bpp ld de, TradePoofGFX ld hl, vTiles0 tile $68 - lb bc, BANK(TradePoofGFX), $c + lb bc, BANK(TradePoofGFX), 12 call Request2bpp ld de, TradeCableGFX ld hl, vTiles0 tile $74 - lb bc, BANK(TradeCableGFX), $4 + lb bc, BANK(TradeCableGFX), 4 call Request2bpp xor a ld hl, wSpriteAnimDict @@ -1536,7 +1536,7 @@ LoadTradeBubbleGFX: ; 2985a callfar LoadMenuMonIcon ld de, TradeBubbleGFX ld hl, vTiles0 tile $72 - lb bc, BANK(TradeBubbleGFX), $4 + lb bc, BANK(TradeBubbleGFX), 4 call Request2bpp xor a ld hl, wSpriteAnimDict diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 82c6bd199..5f48d2e5d 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -147,11 +147,11 @@ TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4) call WaitBGMap ld de, LeaderGFX ld hl, vTiles2 tile $29 - lb bc, BANK(LeaderGFX), $56 + lb bc, BANK(LeaderGFX), 86 call Request2bpp ld de, BadgeGFX ld hl, vTiles0 tile $00 - lb bc, BANK(BadgeGFX), $2c + lb bc, BANK(BadgeGFX), 44 call Request2bpp call TrainerCard_Page2_3_InitObjectsAndStrings call TrainerCard_IncrementJumptable @@ -196,11 +196,11 @@ TrainerCard_Page3_LoadGFX: ; 2524c (9:524c) call WaitBGMap ld de, LeaderGFX2 ld hl, vTiles2 tile $29 - lb bc, BANK(LeaderGFX2), $56 + lb bc, BANK(LeaderGFX2), 86 call Request2bpp ld de, BadgeGFX2 ld hl, vTiles0 tile $00 - lb bc, BANK(BadgeGFX2), $2c + lb bc, BANK(BadgeGFX2), 44 call Request2bpp call TrainerCard_Page2_3_InitObjectsAndStrings call TrainerCard_IncrementJumptable diff --git a/gfx/font.asm b/gfx/font.asm index e376e8afd..fd95c9434 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -231,7 +231,7 @@ StatsScreen_LoadFont: ; fb53e LoadStatsScreenPageTilesGFX: ; fb571 ld de, StatsScreenPageTilesGFX ld hl, vTiles2 tile $31 - lb bc, BANK(StatsScreenPageTilesGFX), $11 + lb bc, BANK(StatsScreenPageTilesGFX), 17 call Get2bpp_2 ret ; fb57e diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index bbfce6533..0aa331680 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -181,12 +181,12 @@ Function1080b7: ; 1080b7 ld de, TradeBallGFX ld hl, vTiles0 - lb bc, BANK(TradeBallGFX), $06 + lb bc, BANK(TradeBallGFX), 6 call Request2bpp ld de, TradePoofGFX ld hl, vTiles0 tile $06 - lb bc, BANK(TradePoofGFX), $0c + lb bc, BANK(TradePoofGFX), 12 call Request2bpp xor a @@ -616,11 +616,11 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c call DelayFrame ld de, TradeBallGFX ld hl, vTiles0 - lb bc, BANK(TradeBallGFX), $06 + lb bc, BANK(TradeBallGFX), 6 call Request2bpp ld de, TradePoofGFX ld hl, vTiles0 tile $06 - lb bc, BANK(TradePoofGFX), $0c + lb bc, BANK(TradePoofGFX), 12 call Request2bpp ld a, [wPlayerTrademonDVs] ld [TempMonDVs], a @@ -690,11 +690,11 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 call DelayFrame ld de, TradeBallGFX ld hl, vTiles0 - lb bc, BANK(TradeBallGFX), $06 + lb bc, BANK(TradeBallGFX), 6 call Request2bpp ld de, TradePoofGFX ld hl, vTiles0 tile $06 - lb bc, BANK(TradePoofGFX), $0c + lb bc, BANK(TradePoofGFX), 12 call Request2bpp xor a ld [hSCX], a @@ -759,11 +759,11 @@ MobileTradeAnim_GetOddEgg: ; 108589 call DelayFrame ld de, TradeBallGFX ld hl, vTiles0 - lb bc, BANK(TradeBallGFX), $06 + lb bc, BANK(TradeBallGFX), 6 call Request2bpp ld de, TradePoofGFX ld hl, vTiles0 tile $06 - lb bc, BANK(TradePoofGFX), $0c + lb bc, BANK(TradePoofGFX), 12 call Request2bpp xor a ld [hSCX], a diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 6a598c39b..d77a8836f 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -1,7 +1,7 @@ Function115d99: ; 115d99 ld de, GFX_11601a ld hl, vTiles0 tile $60 - lb bc, BANK(GFX_11601a), $14 + lb bc, BANK(GFX_11601a), 20 call Get2bpp xor a ld [wc305], a diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index f16391871..2c75ec851 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -172,7 +172,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 call DisableLCD ld hl, vTiles2 ld de, .Tiles - lb bc, BANK(.Tiles), $68 + lb bc, BANK(.Tiles), 104 call Get2bpp call .LoadPals call .LoadTileMap @@ -710,7 +710,7 @@ Function16cc02: ; 16cc02 Function16cc18: ; 16cc18 ld hl, vTiles1 ld de, GFX_16cca3 - lb bc, BANK(GFX_16cca3), $2e + lb bc, BANK(GFX_16cca3), 46 call Get2bpp ret ; 16cc25 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 251c56adc..69922aca2 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -296,7 +296,7 @@ Function170d02: ; 170d02 ld [rVBK], a ld de, GFX_171848 ld hl, vTiles1 tile $41 - lb bc, BANK(GFX_171848), $18 + lb bc, BANK(GFX_171848), 24 call Get2bpp xor a ld [rVBK], a