From ee4ec65fc17a802425b606eeef59e92a9a6c9b81 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:30:17 -0500 Subject: map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ --- engine/battle/battle_transition.asm | 2 +- engine/color.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index af7bb688f..383674652 100644 --- 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 diff --git a/engine/color.asm b/engine/color.asm index 8bd79fd3b..58a2c0df8 100644 --- 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" -- cgit v1.2.3