summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-27 03:33:13 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-27 03:35:35 -0400
commit70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch)
tree202f65e4131709331ae62cbe5eace4d6f8b6aa58 /gfx
parent75cf425d30db6a036743cf85c483c1b537063605 (diff)
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'gfx')
-rwxr-xr-xgfx/overworld/heal_machine.pal4
-rw-r--r--gfx/pics_gold.asm2
-rw-r--r--gfx/sgb/gold_border.2bpp (renamed from gfx/sgb_border/gold.2bpp)bin928 -> 928 bytes
-rwxr-xr-xgfx/sgb/gold_border.pal (renamed from gfx/sgb_border/gold.pal)0
-rw-r--r--gfx/sgb/gold_border.png (renamed from gfx/sgb_border/gold.png)bin926 -> 926 bytes
-rw-r--r--gfx/sgb/gold_border.sgb.tilemap (renamed from gfx/sgb_border/gold.map)0
-rw-r--r--gfx/sgb/silver_border.2bpp (renamed from gfx/sgb_border/silver.2bpp)bin928 -> 928 bytes
-rwxr-xr-xgfx/sgb/silver_border.pal (renamed from gfx/sgb_border/silver.pal)0
-rw-r--r--gfx/sgb/silver_border.png (renamed from gfx/sgb_border/silver.png)bin926 -> 926 bytes
-rw-r--r--gfx/sgb/silver_border.sgb.tilemap (renamed from gfx/sgb_border/silver.map)0
10 files changed, 3 insertions, 3 deletions
diff --git a/gfx/overworld/heal_machine.pal b/gfx/overworld/heal_machine.pal
index 9a32250d..28a76de4 100755
--- a/gfx/overworld/heal_machine.pal
+++ b/gfx/overworld/heal_machine.pal
@@ -1,4 +1,4 @@
RGB 31, 31, 31
- RGB 21, 21, 21
- RGB 10, 10, 10
+ RGB 31, 19, 10
+ RGB 31, 07, 01
RGB 00, 00, 00
diff --git a/gfx/pics_gold.asm b/gfx/pics_gold.asm
index 2fe86495..e3d5f583 100644
--- a/gfx/pics_gold.asm
+++ b/gfx/pics_gold.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
; PokemonPicPointers and UnownPicPointers are assumed to start at the same
-; address, but in different banks. This is enforced in pokegold.link.
+; address, but in different banks. This is enforced in layout.link.
SECTION "Pic Pointers", ROMX
diff --git a/gfx/sgb_border/gold.2bpp b/gfx/sgb/gold_border.2bpp
index aad569e8..aad569e8 100644
--- a/gfx/sgb_border/gold.2bpp
+++ b/gfx/sgb/gold_border.2bpp
Binary files differ
diff --git a/gfx/sgb_border/gold.pal b/gfx/sgb/gold_border.pal
index 047c676e..047c676e 100755
--- a/gfx/sgb_border/gold.pal
+++ b/gfx/sgb/gold_border.pal
diff --git a/gfx/sgb_border/gold.png b/gfx/sgb/gold_border.png
index ab03c950..ab03c950 100644
--- a/gfx/sgb_border/gold.png
+++ b/gfx/sgb/gold_border.png
Binary files differ
diff --git a/gfx/sgb_border/gold.map b/gfx/sgb/gold_border.sgb.tilemap
index 3a3edb57..3a3edb57 100644
--- a/gfx/sgb_border/gold.map
+++ b/gfx/sgb/gold_border.sgb.tilemap
diff --git a/gfx/sgb_border/silver.2bpp b/gfx/sgb/silver_border.2bpp
index aad569e8..aad569e8 100644
--- a/gfx/sgb_border/silver.2bpp
+++ b/gfx/sgb/silver_border.2bpp
Binary files differ
diff --git a/gfx/sgb_border/silver.pal b/gfx/sgb/silver_border.pal
index cafa90ad..cafa90ad 100755
--- a/gfx/sgb_border/silver.pal
+++ b/gfx/sgb/silver_border.pal
diff --git a/gfx/sgb_border/silver.png b/gfx/sgb/silver_border.png
index a9d63b6e..a9d63b6e 100644
--- a/gfx/sgb_border/silver.png
+++ b/gfx/sgb/silver_border.png
Binary files differ
diff --git a/gfx/sgb_border/silver.map b/gfx/sgb/silver_border.sgb.tilemap
index 30f04252..30f04252 100644
--- a/gfx/sgb_border/silver.map
+++ b/gfx/sgb/silver_border.sgb.tilemap