diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 02:30:17 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 02:30:17 -0500 |
| commit | ee4ec65fc17a802425b606eeef59e92a9a6c9b81 (patch) | |
| tree | d86deb43e2100d46062cb2cbfffcbaf009bdc648 | |
| parent | 8334c3c998d36fab79ff0e1ce5a262ed5f9f1e51 (diff) | |
map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rw-r--r-- | gfx/overworld/map_objects.pal (renamed from gfx/sprites/map_objects.pal) | 0 |
3 files changed, 2 insertions, 2 deletions
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" diff --git a/gfx/sprites/map_objects.pal b/gfx/overworld/map_objects.pal index b0f33479a..b0f33479a 100644 --- a/gfx/sprites/map_objects.pal +++ b/gfx/overworld/map_objects.pal |