From eeb45036e2083f22d5d20ea3b06b26d56f560f53 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jun 2020 22:16:01 -0400 Subject: Individual images for party menu icon graphics --- engine/mon_party_sprites.asm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'engine') diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 994f5086..47da94dd 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -57,11 +57,11 @@ GetAnimationSpeed: call AddNTimes ld c, $40 ; amount to increase the tile id by ld a, [hl] - cp $4 ; tile ID for SPRITE_BALL_M + cp $4 ; tile ID for ICON_BALL jr z, .editCoords - cp $8 ; tile ID for SPRITE_HELIX + cp $8 ; tile ID for ICON_HELIX jr nz, .editTileIDS -; SPRITE_BALL_M and SPRITE_HELIX only shake up and down +; ICON_BALL and ICON_HELIX only shake up and down .editCoords dec hl dec hl ; dec hl to the OAM y coord @@ -243,7 +243,7 @@ WriteMonPartySpriteOAM: add $10 ld b, a pop af - cp SPRITE_HELIX << 2 + cp ICON_HELIX << 2 jr z, .helix call WriteSymmetricMonPartySpriteOAM jr .makeCopy @@ -280,5 +280,16 @@ GetPartyMonSpriteID: INCLUDE "data/mon_party_sprites.asm" -MonPartySprites: - INCBIN "gfx/trade/mon_ow_sprites.2bpp" +INC_FRAME_1 EQUS "0, $20" +INC_FRAME_2 EQUS "$20, $20" + +BugIconFrame1: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_1 +PlantIconFrame1: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_1 +BugIconFrame2: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_2 +PlantIconFrame2: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_2 +SnakeIconFrame1: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_1 +QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1 +SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2 +QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2 + +TradeBubbleIconGFX: INCBIN "gfx/icons/trade_bubble.2bpp" -- cgit v1.3.1-sl0p From 6b19b301f481e404a34ec3d90f35b23fba74b716 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jun 2020 22:44:05 -0400 Subject: Move trade bubble from gfx/icons to gfx/trade --- engine/mon_party_sprites.asm | 2 +- gfx/icons/trade_bubble.png | Bin 143 -> 0 bytes gfx/trade/bubble.png | Bin 0 -> 143 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 gfx/icons/trade_bubble.png create mode 100644 gfx/trade/bubble.png (limited to 'engine') diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 47da94dd..d2913715 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -292,4 +292,4 @@ QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1 SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2 QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2 -TradeBubbleIconGFX: INCBIN "gfx/icons/trade_bubble.2bpp" +TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp" diff --git a/gfx/icons/trade_bubble.png b/gfx/icons/trade_bubble.png deleted file mode 100644 index 93611a60..00000000 Binary files a/gfx/icons/trade_bubble.png and /dev/null differ diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png new file mode 100644 index 00000000..93611a60 Binary files /dev/null and b/gfx/trade/bubble.png differ -- cgit v1.3.1-sl0p