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

2018-01-10 02:30:17 -05:00 · 2018-01-10 02:30:17 -05:00 · ee4ec65fc1
parent 8334c3c998
commit ee4ec65fc1
3 changed files with 2 additions and 2 deletions
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@ -589,7 +589,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	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 @@ TilesetBGPalette:
 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"
--- a/gfx/overworld/map_objects.pal
+++ b/gfx/overworld/map_objects.pal