shithub: pokecrystal

Download patch

ref: ee4ec65fc17a802425b606eeef59e92a9a6c9b81
parent: 8334c3c998d36fab79ff0e1ce5a262ed5f9f1e51
author: Remy Oukaour <[email protected]>
date: Tue Jan 9 21:30:17 EST 2018 

map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/


--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -589,7 +589,7 @@
 	dec b
 	jr nz, .loop
 
-	call .loadpokeballgfx ; ld a, [OtherTrainerClass] \ ld de, PokeBallTransition \ ret
+	call .loadpokeballgfx
 	hlcoord 2, 1
 
 	ld b, SCREEN_WIDTH - 4
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1341,7 +1341,7 @@
 INCLUDE "gfx/tilesets/bg_tiles.pal"
 
 MapObjectPals::
-INCLUDE "gfx/sprites/map_objects.pal"
+INCLUDE "gfx/overworld/map_objects.pal"
 
 RoofPals:
 INCLUDE "gfx/tilesets/roofs.pal"
--- /dev/null
+++ b/gfx/overworld/map_objects.pal
@@ -1,0 +1,39 @@
+; morn
+	RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red
+	RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue
+	RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green
+	RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown
+	RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink
+	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
+	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
+	RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock
+
+; day
+	RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red
+	RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue
+	RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green
+	RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown
+	RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink
+	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
+	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
+	RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock
+
+; nite
+	RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red
+	RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue
+	RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green
+	RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown
+	RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink
+	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
+	RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree
+	RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock
+
+; dark
+	RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red
+	RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue
+	RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green
+	RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown
+	RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink
+	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree
+	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock
--- a/gfx/sprites/map_objects.pal
+++ /dev/null
@@ -1,39 +1,0 @@
-; morn
-	RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red
-	RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue
-	RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green
-	RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown
-	RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink
-	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
-	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
-	RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock
-
-; day
-	RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red
-	RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue
-	RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green
-	RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown
-	RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink
-	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
-	RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree
-	RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock
-
-; nite
-	RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red
-	RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue
-	RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green
-	RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown
-	RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink
-	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
-	RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree
-	RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock
-
-; dark
-	RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red
-	RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue
-	RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green
-	RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown
-	RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink
-	RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
-	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree
-	RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock