diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-04 17:46:36 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-06 12:41:07 -0400 |
| commit | 3144b54bd1dcc47ea339fcd2bd215ec96fc38c4a (patch) | |
| tree | 01af6a137f2d6f51df3205e2ddce2e95ea594b74 /engine/gfx | |
| parent | 95e48ef992a6c89a147543ba0eed8fe671cadcac (diff) | |
Enable rgbds warnings and remove CFLAGS=-O2 (default is now -O3)
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/color.asm | 6 | ||||
| -rw-r--r-- | engine/gfx/load_pics.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 7f2fc8fa1..aa29d413b 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -241,21 +241,21 @@ LoadTrainerClassPaletteAsNthBGPal: ld a, [wTrainerClass] call GetTrainerPalettePointer ld a, e - jr got_palette_pointer_8bd7 + jr LoadNthMiddleBGPal LoadMonPaletteAsNthBGPal: ld a, [wCurPartySpecies] call _GetMonPalettePointer ld a, e bit 7, a - jr z, got_palette_pointer_8bd7 + jr z, LoadNthMiddleBGPal and $7f inc hl inc hl inc hl inc hl -got_palette_pointer_8bd7 +LoadNthMiddleBGPal: push hl ld hl, wBGPals1 ld de, 1 palettes diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index bf8e69778..6367bffe6 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -247,7 +247,7 @@ FixPicBank: ; This is a thing for some reason. PICS_FIX EQU $36 -GLOBAL PICS_FIX +EXPORT PICS_FIX push hl push bc |