diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/gfx/cgb_layouts.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/gfx/cgb_layouts.asm')
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index ffd4d4c48..71311f2f7 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -1,7 +1,7 @@ ; Replaces the functionality of sgb.asm to work with CGB hardware. CheckCGB: - ld a, [hCGB] + ldh a, [hCGB] and a ret @@ -190,7 +190,7 @@ _CGB_PokegearPals: call FarCopyWRAM call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_StatsScreenHPPals: @@ -244,7 +244,7 @@ _CGB_StatsScreenHPPals: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret StatsScreenPagePals: @@ -283,7 +283,7 @@ _CGB_Pokedex: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret .PokedexQuestionMarkPalette: @@ -318,7 +318,7 @@ _CGB_BillsPC: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret .Function9009: @@ -340,7 +340,7 @@ _CGB_BillsPC: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret .BillsPCOrangePalette: @@ -363,7 +363,7 @@ _CGB_PokedexUnownMode: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_SlotMachine: @@ -416,7 +416,7 @@ _CGB_SlotMachine: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB06: @@ -434,7 +434,7 @@ _CGB06: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_GSIntro: @@ -574,7 +574,7 @@ _CGB_Evolution: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_GSTitleScreen: @@ -592,7 +592,7 @@ _CGB_GSTitleScreen: ld [wSGBPredef], a call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB0d: @@ -609,17 +609,17 @@ _CGB_UnownPuzzle: ld a, PREDEFPAL_UNOWN_PUZZLE call GetPredefPal call LoadHLPaletteIntoDE - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wOBPals1) - ld [rSVBK], a + ldh [rSVBK], a ld hl, wOBPals1 ld a, LOW(palred 31 + palgreen 0 + palblue 0) ld [hli], a ld a, HIGH(palred 31 + palgreen 0 + palblue 0) ld [hl], a pop af - ld [rSVBK], a + ldh [rSVBK], a call WipeAttrMap call ApplyAttrMap ret @@ -726,7 +726,7 @@ _CGB_TrainerCard: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_MoveList: @@ -750,7 +750,7 @@ _CGB_MoveList: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_BetaPikachuMinigame: @@ -760,7 +760,7 @@ _CGB_BetaPikachuMinigame: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_PokedexSearchOption: @@ -772,7 +772,7 @@ _CGB_PokedexSearchOption: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_PackPals: @@ -820,7 +820,7 @@ _CGB_PackPals: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret .ChrisPackPals: @@ -878,7 +878,7 @@ _CGB13: call ApplyAttrMap call ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret _CGB_GamefreakLogo: |