diff options
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/color.asm | 10 | ||||
| -rw-r--r-- | engine/gfx/dma_transfer.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/load_font.asm | 48 | ||||
| -rw-r--r-- | engine/gfx/mon_icons.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 4 |
5 files changed, 34 insertions, 34 deletions
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 35ad66f7f..0064edfc3 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -277,13 +277,13 @@ Unreferenced_Function8bec: ldh a, [hCGB] and a jr nz, .cgb - ld hl, wPlayerLightScreenCount + ld hl, wBetaPokerSGBPals jp PushSGBPals .cgb - ld a, [wEnemyLightScreenCount] ; col + ld a, [wBetaPokerSGBCol] ld c, a - ld a, [wEnemyReflectCount] ; row + ld a, [wBetaPokerSGBRow] hlcoord 0, 0, wAttrmap ld de, SCREEN_WIDTH .loop @@ -294,10 +294,10 @@ Unreferenced_Function8bec: jr .loop .done - ld b, $0 + ld b, 0 add hl, bc lb bc, 6, 4 - ld a, [wEnemySafeguardCount] ; value + ld a, [wBetaPokerSGBAttr] and $3 call FillBoxCGB call CopyTilemapAtOnce diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index a3cdb6dd3..f30c5eb45 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -450,7 +450,7 @@ PadMapForHDMATransfer: ldh [hMapObjectIndexBuffer], a ret -_Get2bpp:: +HDMATransfer2bpp:: ; 2bpp when [rLCDC] & $80 ; switch to WRAM bank 6 ldh a, [rSVBK] @@ -494,7 +494,7 @@ _Get2bpp:: ldh [rSVBK], a ret -_Get1bpp:: +HDMATransfer1bpp:: ; 1bpp when [rLCDC] & $80 .loop ld a, c diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index db24dced1..bd5e29d52 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -8,13 +8,13 @@ Unreferenced_fb434: Unreferenced_Functionfb435: ld a, [Unreferenced_fb434] and a - jp nz, Get1bpp_2 + jp nz, Get1bppViaHDMA jp Get1bpp Unreferenced_Functionfb43f: ld a, [Unreferenced_fb434] and a - jp nz, Get2bpp_2 + jp nz, Get2bppViaHDMA jp Get2bpp ; End unreferenced block @@ -29,34 +29,34 @@ _LoadStandardFont:: ld de, Font ld hl, vTiles1 lb bc, BANK(Font), 32 ; "A" to "]" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 32 * LEN_1BPP_TILE ld hl, vTiles1 tile $20 lb bc, BANK(Font), 32 ; "a" to $bf - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 64 * LEN_1BPP_TILE ld hl, vTiles1 tile $40 lb bc, BANK(Font), 32 ; "Ä" to "←" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 96 * LEN_1BPP_TILE ld hl, vTiles1 tile $60 lb bc, BANK(Font), 32 ; "'" to "9" - call Get1bpp_2 + call Get1bppViaHDMA ret _LoadFontsExtra1:: ld de, FontsExtra_SolidBlackGFX ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ld de, PokegearPhoneIconGFX ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 - call Get2bpp_2 + call Get2bppViaHDMA ld de, FontExtra + 3 tiles ; "<BOLD_D>" ld hl, vTiles2 tile "<BOLD_D>" lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ" - call Get2bpp_2 + call Get2bppViaHDMA jr LoadFrame _LoadFontsExtra2:: @@ -64,14 +64,14 @@ _LoadFontsExtra2:: ld hl, vTiles2 tile "▲" ; $61 ld b, BANK(FontsExtra2_UpArrowGFX) ld c, 1 - call Get2bpp_2 + call Get2bppViaHDMA ret _LoadFontsBattleExtra:: ld de, FontBattleExtra ld hl, vTiles2 tile $60 lb bc, BANK(FontBattleExtra), 25 - call Get2bpp_2 + call Get2bppViaHDMA jr LoadFrame LoadFrame: @@ -84,41 +84,41 @@ LoadFrame: ld e, l ld hl, vTiles2 tile "┌" ; $79 lb bc, BANK(Frames), 6 ; "┌" to "┘" - call Get1bpp_2 + call Get1bppViaHDMA ld hl, vTiles2 tile " " ; $7f ld de, TextboxSpaceGFX lb bc, BANK(TextboxSpaceGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ret LoadBattleFontsHPBar: ld de, FontBattleExtra ld hl, vTiles2 tile $60 lb bc, BANK(FontBattleExtra), 12 - call Get2bpp_2 + call Get2bppViaHDMA ld hl, vTiles2 tile $70 ld de, FontBattleExtra + 16 tiles ; "<DO>" lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『" - call Get2bpp_2 + call Get2bppViaHDMA call LoadFrame LoadHPBar: ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX ld hl, vTiles2 tile $73 lb bc, BANK(HPExpBarBorderGFX), 6 - call Get1bpp_2 + call Get1bppViaHDMA ld de, ExpBarGFX ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 - call Get2bpp_2 + call Get2bppViaHDMA ld de, MobilePhoneTilesGFX + 7 tiles ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 - call Get2bpp_2 + call Get2bppViaHDMA ret StatsScreen_LoadFont: @@ -126,22 +126,22 @@ StatsScreen_LoadFont: ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX ld hl, vTiles2 tile $78 lb bc, BANK(HPExpBarBorderGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE ld hl, vTiles2 tile $76 lb bc, BANK(HPExpBarBorderGFX), 2 - call Get1bpp_2 + call Get1bppViaHDMA ld de, ExpBarGFX ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 8 - call Get2bpp_2 + call Get2bppViaHDMA LoadStatsScreenPageTilesGFX: ld de, StatsScreenPageTilesGFX ld hl, vTiles2 tile $31 lb bc, BANK(StatsScreenPageTilesGFX), 17 - call Get2bpp_2 + call Get2bppViaHDMA ret diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index ac25712d1..68e9b1b84 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -347,7 +347,7 @@ GetGFXUnlessMobile: ld a, [wLinkMode] cp LINK_MOBILE jp nz, Request2bpp - jp Get2bpp_2 + jp Get2bppViaHDMA FreezeMonIcons: ld hl, wSpriteAnimationStructs diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index a0727c939..f4a523df8 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -333,7 +333,7 @@ endr .SGB_BetaPoker: ld hl, BlkPacket_9a86 - ld de, wPlayerLightScreenCount ; ??? + ld de, wBetaPokerSGBPals ld bc, PALPACKET_LENGTH call CopyBytes ld hl, PalPacket_BetaPoker @@ -547,7 +547,7 @@ endr ret .route - ld a, PREDEFPAL_00 + ld a, PREDEFPAL_ROUTES ret .cave |