summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-12 17:45:03 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-13 00:56:53 -0400
commitf235b94a4cf9566f950962248ef7dbdacca08d41 (patch)
tree90df0cfb2619ccb8346b8e9d41089c1c1cae9f74 /engine/gfx
parentff78a288fde1c6b96bb6641319abec367d5cb582 (diff)
Many minor cleanups.
Diffstat (limited to 'engine/gfx')
-rwxr-xr-xengine/gfx/cgb_layouts.asm2
-rwxr-xr-xengine/gfx/color.asm2
-rw-r--r--engine/gfx/load_pics.asm1
-rwxr-xr-xengine/gfx/sgb_layouts.asm4
4 files changed, 4 insertions, 5 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 34cb2350..a9a2038a 100755
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -59,7 +59,7 @@ LoadSGBLayoutCGB:
dw _CGB_PlayerOrMonFrontpicPals
dw _CGB_TradeTube
dw _CGB_TrainerOrMonFrontpicPals
- dw Function9a94
+ dw _CGB_MysteryGift
dw _CGB1e
dw _CGB_Pokedex_5_5
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 2bc553f2..b60acac8 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -409,7 +409,7 @@ INCLUDE "gfx/mail/mail.pal"
INCLUDE "engine/gfx/cgb_layouts.asm"
-Function9a94:
+_CGB_MysteryGift:
ld hl, .Palette
ld de, wBGPals1
ld bc, 1 palettes
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index a4d88111..c9ee98b7 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -146,7 +146,6 @@ GetMonBackpic:
jr nz, .ok
ld a, [wUnownLetter]
ld d, BANK(UnownPicPointers)
-
.ok
dec a
ld bc, 6
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index f50835fa..db4e929f 100755
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -53,7 +53,7 @@ LoadSGBLayout:
dw .SGB_TrainerOrMonFrontpicPals
dw .SGB_MysteryGift
dw .SGB1e
- dw .SGB1f
+ dw .SGB_Pokedex_5_5
.SGB_BattleGrayscale:
ld hl, PalPacket_BattleGrayscale
@@ -224,7 +224,7 @@ LoadSGBLayout:
ld de, BlkPacket_Pokedex_PC
ret
-.SGB1f:
+.SGB_Pokedex_5_5:
call .SGB_Pokedex
ld de, BlkPacket_9f65
ret