From b9b3bd089bab4b54a7aaa03e7403f83ba04fe85e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 29 Jul 2016 14:50:25 -0700 Subject: trade graphics --- asm/rom_8040EB4.s | 2 +- data/data2.s | 199 ++++++++++++++-------------- data/graphics.s | 4 +- data/ingame_trades.s | 4 +- graphics/battle_anims/sprites/particles.png | Bin 0 -> 277 bytes graphics/interface/ball_open.pal | 19 --- graphics/interface/gba.pal | 19 --- graphics/interface/gba.png | Bin 1039 -> 0 bytes graphics/interface/gba2.pal | 99 -------------- graphics/interface/gba2.png | Bin 1207 -> 0 bytes graphics/interface/rolling_ball.png | Bin 464 -> 0 bytes graphics/interface/trade_cableend.pal | 19 --- graphics/interface/trade_cableend.png | Bin 194 -> 0 bytes graphics/interface/trade_gbascreen.png | Bin 170 -> 0 bytes graphics/interface/trade_glow.png | Bin 195 -> 0 bytes graphics/interface/trade_glow2.png | Bin 190 -> 0 bytes graphics/interface/trade_misc.pal | 19 --- graphics/interface/trade_shadow.pal | 19 --- graphics/interface/trade_shadow.png | Bin 231 -> 0 bytes graphics/trade/ball.pal | 19 +++ graphics/trade/ball.png | Bin 0 -> 464 bytes graphics/trade/cable_closeup_map.bin | Bin 0 -> 2048 bytes graphics/trade/cable_end.pal | 19 +++ graphics/trade/cable_end.png | Bin 0 -> 194 bytes graphics/trade/gba.pal | 19 +++ graphics/trade/gba.png | Bin 0 -> 1039 bytes graphics/trade/gba_affine.png | Bin 0 -> 1687 bytes graphics/trade/gba_affine_map.bin | Bin 0 -> 256 bytes graphics/trade/gba_map.bin | Bin 0 -> 4096 bytes graphics/trade/gba_screen.png | Bin 0 -> 170 bytes graphics/trade/glow.pal | 19 +++ graphics/trade/glow1.png | Bin 0 -> 195 bytes graphics/trade/glow2.png | Bin 0 -> 190 bytes graphics/trade/misc.pal | 19 +++ graphics/trade/pokeball_symbol.png | Bin 0 -> 1569 bytes graphics/trade/pokeball_symbol_map.bin | Bin 0 -> 256 bytes graphics/trade/shadow.pal | 19 +++ graphics/trade/shadow.png | Bin 0 -> 231 bytes graphics/trade/shadow_map.bin | Bin 0 -> 4096 bytes graphics/trade/unknown.pal | 19 +++ graphics/unknown/unknown_20DD98.png | Bin 1086 -> 0 bytes ld_script.txt | 1 + misc.mk | 3 +- 43 files changed, 243 insertions(+), 297 deletions(-) create mode 100644 graphics/battle_anims/sprites/particles.png delete mode 100755 graphics/interface/ball_open.pal delete mode 100755 graphics/interface/gba.pal delete mode 100755 graphics/interface/gba.png delete mode 100755 graphics/interface/gba2.pal delete mode 100755 graphics/interface/gba2.png delete mode 100755 graphics/interface/rolling_ball.png delete mode 100755 graphics/interface/trade_cableend.pal delete mode 100755 graphics/interface/trade_cableend.png delete mode 100755 graphics/interface/trade_gbascreen.png delete mode 100755 graphics/interface/trade_glow.png delete mode 100755 graphics/interface/trade_glow2.png delete mode 100755 graphics/interface/trade_misc.pal delete mode 100755 graphics/interface/trade_shadow.pal delete mode 100755 graphics/interface/trade_shadow.png create mode 100644 graphics/trade/ball.pal create mode 100644 graphics/trade/ball.png create mode 100644 graphics/trade/cable_closeup_map.bin create mode 100644 graphics/trade/cable_end.pal create mode 100755 graphics/trade/cable_end.png create mode 100755 graphics/trade/gba.pal create mode 100755 graphics/trade/gba.png create mode 100644 graphics/trade/gba_affine.png create mode 100644 graphics/trade/gba_affine_map.bin create mode 100644 graphics/trade/gba_map.bin create mode 100755 graphics/trade/gba_screen.png create mode 100644 graphics/trade/glow.pal create mode 100755 graphics/trade/glow1.png create mode 100755 graphics/trade/glow2.png create mode 100755 graphics/trade/misc.pal create mode 100644 graphics/trade/pokeball_symbol.png create mode 100644 graphics/trade/pokeball_symbol_map.bin create mode 100755 graphics/trade/shadow.pal create mode 100755 graphics/trade/shadow.png create mode 100644 graphics/trade/shadow_map.bin create mode 100644 graphics/trade/unknown.pal delete mode 100755 graphics/unknown/unknown_20DD98.png diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 5021c71aa..fa118ef7d 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -23724,7 +23724,7 @@ _0804CC68: .align 2, 0 _0804CCD8: .4byte 0x03004828 _0804CCDC: .4byte 0x02020004 -_0804CCE0: .4byte gUnknown_08215AC0 +_0804CCE0: .4byte gSpriteAffineAnimTable_8215AC0 _0804CCE4: ldr r0, [r5] adds r0, 0xB8 diff --git a/data/data2.s b/data/data2.s index 225900137..8c3a7fae4 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2113,49 +2113,16 @@ gSpriteAffineAnimTable_820AAA0:: @ 820AAA0 .align 2 gSpriteTemplate_820AAB4:: @ 820AAB4 spr_template 55000, 55000, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AACC:: @ 820AACC spr_template 55001, 55001, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AAE4:: @ 820AAE4 spr_template 55002, 55002, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AAFC:: @ 820AAFC spr_template 55003, 55003, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB14:: @ 820AB14 spr_template 55004, 55004, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB2C:: @ 820AB2C spr_template 55005, 55005, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB44:: @ 820AB44 spr_template 55006, 55006, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB5C:: @ 820AB5C spr_template 55007, 55007, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB74:: @ 820AB74 spr_template 55008, 55008, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820AB8C:: @ 820AB8C spr_template 55009, 55009, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820ABA4:: @ 820ABA4 spr_template 55010, 55010, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 - - .align 2 -gSpriteTemplate_820ABBC:: @ 820ABBC spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4 .align 2 @@ -2351,7 +2318,6 @@ gUnknown_0820C341:: @ 820C341 .4byte gTileBuffer @ Unused debug strings? -@ Not labeling these yet .string "かいめの そうしん$", 13 .string "かいめの じゅしん$", 13 .string "ポケモンアイコンセット$", 13 @@ -2370,52 +2336,85 @@ gUnknown_0820C3B0:: @ 820C3B0 .string "だめだたらしいよ $" @ it's no good (trade failed maybe?) gUnknown_0820C3D1:: @ 820C3D1 - .incbin "baserom.gba", 0x0020c3d1, 0x7 - .incbin "graphics/interface/ball_open.gbapal" - .incbin "graphics/interface/rolling_ball.4bpp" + .byte 4, 3 + .byte 19, 3 + + .align 2 +gTradeBallPalette:: @ 820C3D8 + .incbin "graphics/trade/ball.gbapal" + .align 2 +gTradeBallTiles:: @ 820C3F8 + .incbin "graphics/trade/ball.4bpp" + + .align 2 gUnknown_0820C9F8:: @ 820C9F8 - .incbin "baserom.gba", 0x0020c9f8, 0x20 - .incbin "graphics/interface/gba.gbapal" - .incbin "graphics/interface/trade_shadow.gbapal" - .incbin "baserom.gba", 0x0020ca58, 0x20 @ blank - .incbin "graphics/interface/trade_misc.gbapal" + .incbin "graphics/trade/unknown.gbapal" + .incbin "graphics/trade/gba.gbapal" + .incbin "graphics/trade/shadow.gbapal" + .space 32 + .incbin "graphics/trade/misc.gbapal" + .align 2 gUnknown_0820CA98:: @ 820CA98 - .incbin "graphics/interface/gba.4bpp" - .incbin "graphics/interface/trade_shadow.4bpp" + .incbin "graphics/trade/gba.4bpp" + .incbin "graphics/trade/shadow.4bpp" + .align 2 gUnknown_0820DD98:: @ 820DD98 - .incbin "graphics/unknown/unknown_20DD98.8bpp" @ unused? + .incbin "graphics/trade/pokeball_symbol.8bpp" + .align 2 gUnknown_0820F798:: @ 820F798 - .incbin "baserom.gba", 0x0020f798, 0x1000 + .incbin "graphics/trade/shadow_map.bin" + .align 2 gUnknown_08210798:: @ 8210798 - .incbin "baserom.gba", 0x00210798, 0x1000 @ debug? + .incbin "graphics/trade/gba_map.bin" + .align 2 gUnknown_08211798:: @ 8211798 - .incbin "baserom.gba", 0x00211798, 0x800 + .incbin "graphics/trade/cable_closeup_map.bin" + .align 2 gUnknown_08211F98:: @ 8211F98 - .incbin "baserom.gba", 0x00211f98, 0x20 @ bunch of palettes? - .incbin "baserom.gba", 0x00211fb8, 0x20 - .incbin "baserom.gba", 0x00211fd8, 0x20 - .incbin "baserom.gba", 0x00211FF8, 0x20 - .incbin "baserom.gba", 0x00212018, 0x20 - .incbin "baserom.gba", 0x00212038, 0x20 - .incbin "baserom.gba", 0x00212058, 0x20 - .incbin "graphics/interface/gba2.gbapal" - .incbin "graphics/interface/trade_glow.4bpp" - .incbin "graphics/interface/trade_glow2.4bpp" - .incbin "graphics/interface/trade_cableend.4bpp" - .incbin "graphics/interface/trade_gbascreen.4bpp" + .incbin "graphics/trade/pokeball_symbol_map.bin" + + .incbin "baserom.gba", 0x00212098, 0x20 + + .align 2 +gTradeCableEndPalette:: @ 82120B8 + .incbin "graphics/trade/cable_end.gbapal" + + .incbin "baserom.gba", 0x002120D8, 0x40 + + .align 2 +gTradeGlowPalette:: @ 8212118 + .incbin "graphics/trade/glow.gbapal" + + .align 2 +gTradeGlow1Tiles:: @ 8212138 + .incbin "graphics/trade/glow1.4bpp" + .align 2 +gTradeGlow2Tiles:: @ 8212338 + .incbin "graphics/trade/glow2.4bpp" + + .align 2 +gTradeCableEndTiles:: @ 8212538 + .incbin "graphics/trade/cable_end.4bpp" + + .align 2 +gTradeGBAScreenTiles:: @ 8212738 + .incbin "graphics/trade/gba_screen.4bpp" + + .align 2 gUnknown_08213738:: @ 8213738 - .incbin "graphics/interface/gba2.8bpp" + .incbin "graphics/trade/gba_affine.8bpp" + .align 2 gUnknown_08215778:: @ 8215778 - .incbin "baserom.gba", 0x00215778, 0x100 + .incbin "graphics/trade/gba_affine_map.bin" .align 2 gOamData_8215878:: @ 8215878 @@ -2489,11 +2488,11 @@ gSpriteAffineAnimTable_8215940:: @ 8215940 .align 2 gUnknown_0821594C:: @ 821594C - obj_tiles 0x0820c3f8, 1536, 0x15b5 + obj_tiles gTradeBallTiles, 0x600, 5557 .align 2 gUnknown_08215954:: @ 8215954 - obj_pal 0x0820c3d8, 0x15b6 + obj_pal gTradeBallPalette, 5558 .align 2 gSpriteTemplate_821595C:: @ 821595C @@ -2526,15 +2525,15 @@ gSpriteAffineAnimTable_82159A0:: @ 82159A0 .align 2 gUnknown_082159A4:: @ 82159A4 - obj_tiles 0x08212138, 512, 0x15ae + obj_tiles gTradeGlow1Tiles, 0x200, 5550 .align 2 gUnknown_082159AC:: @ 82159AC - obj_pal 0x08212118, 0x15af + obj_pal gTradeGlowPalette, 5551 .align 2 gUnknown_082159B4:: @ 82159B4 - obj_pal 0x082120b8, 0x15b3 + obj_pal gTradeCableEndPalette, 5555 .align 2 gSpriteTemplate_82159BC:: @ 82159BC @@ -2563,7 +2562,7 @@ gSpriteAnimTable_82159EC:: @ 82159EC .align 2 gUnknown_082159F4:: @ 82159F4 - obj_tiles 0x08212338, 768, 0x15b0 + obj_tiles gTradeGlow2Tiles, 0x300, 5552 .align 2 gSpriteTemplate_82159FC:: @ 82159FC @@ -2586,7 +2585,7 @@ gSpriteAnimTable_8215A24:: @ 8215A24 .align 2 gUnknown_08215A28:: @ 8215A28 - obj_tiles 0x08212538, 256, 0x15b2 + obj_tiles gTradeCableEndTiles, 0x100, 5554 .align 2 gSpriteTemplate_8215A30:: @ 8215A30 @@ -2616,7 +2615,7 @@ gSpriteAnimTable_8215A74:: @ 8215A74 .align 2 gUnknown_08215A78:: @ 8215A78 - obj_tiles 0x08212738, 4096, 0x15b4 + obj_tiles gTradeGBAScreenTiles, 0x1000, 5556 .align 2 gSpriteTemplate_8215A80:: @ 8215A80 @@ -2624,11 +2623,15 @@ gSpriteTemplate_8215A80:: @ 8215A80 gUnknown_08215A98:: @ 8215A98 .incbin "baserom.gba", 0x00215a98, 0x18 -Unknown_08215AB0: - .incbin "baserom.gba", 0x00215ab0, 0x10 -gUnknown_08215AC0:: @ 8215AC0 - .4byte Unknown_08215AB0 + .align 2 +gSpriteAffineAnim_8215AB0:: @ 8215AB0 + obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 + obj_rot_scal_anim_jump 0 + + .align 2 +gSpriteAffineAnimTable_8215AC0:: @ 8215AC0 + .4byte gSpriteAffineAnim_8215AB0 @ 8215AC4 .include "data/ingame_trades.s" @@ -24956,33 +24959,33 @@ gUnknown_0840B23C:: @ 840B23C .align 2 gUnknown_0840B258:: @ 840B258 - obj_tiles 0x08d1a7f4, 256, 0xd6ec - obj_tiles 0x08d1a7f4, 256, 0xd6ed - obj_tiles 0x08d1a7f4, 256, 0xd6ee - obj_tiles 0x08d1a7f4, 256, 0xd6ef - obj_tiles 0x08d1a7f4, 256, 0xd6f0 - obj_tiles 0x08d1a7f4, 256, 0xd6f1 - obj_tiles 0x08d1a7f4, 256, 0xd6f2 - obj_tiles 0x08d1a7f4, 256, 0xd6f3 - obj_tiles 0x08d1a7f4, 256, 0xd6f4 - obj_tiles 0x08d1a7f4, 256, 0xd6f5 - obj_tiles 0x08d1a7f4, 256, 0xd6f6 - obj_tiles 0x08d1a7f4, 256, 0xd6f7 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55020 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55021 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55022 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55023 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55024 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55025 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55026 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55027 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55028 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55029 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55030 + obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55031 .align 2 gUnknown_0840B2B8:: @ 840B2B8 - obj_pal 0x08d1a8c8, 55020 - obj_pal 0x08d1a8c8, 55021 - obj_pal 0x08d1a8c8, 55022 - obj_pal 0x08d1a8c8, 55023 - obj_pal 0x08d1a8c8, 55024 - obj_pal 0x08d1a8c8, 55025 - obj_pal 0x08d1a8c8, 55026 - obj_pal 0x08d1a8c8, 55027 - obj_pal 0x08d1a8c8, 55028 - obj_pal 0x08d1a8c8, 55029 - obj_pal 0x08d1a8c8, 55030 - obj_pal 0x08d1a8c8, 55031 + obj_pal gBattleAnimSpritePalette_136, 55020 + obj_pal gBattleAnimSpritePalette_136, 55021 + obj_pal gBattleAnimSpritePalette_136, 55022 + obj_pal gBattleAnimSpritePalette_136, 55023 + obj_pal gBattleAnimSpritePalette_136, 55024 + obj_pal gBattleAnimSpritePalette_136, 55025 + obj_pal gBattleAnimSpritePalette_136, 55026 + obj_pal gBattleAnimSpritePalette_136, 55027 + obj_pal gBattleAnimSpritePalette_136, 55028 + obj_pal gBattleAnimSpritePalette_136, 55029 + obj_pal gBattleAnimSpritePalette_136, 55030 + obj_pal gBattleAnimSpritePalette_136, 55031 .align 2 gSpriteAnim_840B318:: @ 840B318 diff --git a/data/graphics.s b/data/graphics.s index 3c964b603..c506bc844 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1072,7 +1072,9 @@ gBattleAnimSpriteSheet_135:: @ 8D1A704 gBattleAnimSpritePalette_135:: @ 8D1A7DC .incbin "graphics/battle_anims/sprites/135.gbapal.lz" - .incbin "baserom.gba", 0xd1a7f4, 0xb0 + .align 2 +gBattleAnimSpriteSheet_Particles:: @ 8D1A7F4 + .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" .align 2 gBattleAnimSpriteSheet_136:: @ 8D1A8A4 diff --git a/data/ingame_trades.s b/data/ingame_trades.s index 1eb5a59c4..f5258e26c 100644 --- a/data/ingame_trades.s +++ b/data/ingame_trades.s @@ -83,7 +83,7 @@ gIngameTrades:: @ 8215AC4 .align 1 gIngameTradeMail:: @ 8215B78 - @ 0 +@ 0 ec_pokemon1 PIKACHU ec_word THANK_YOU ec_word EXCL @@ -95,7 +95,7 @@ gIngameTradeMail:: @ 8215B78 ec_word EXCL .2byte 0 - @ 1 +@ 1 ec_word I ec_word WANT ec_word TO diff --git a/graphics/battle_anims/sprites/particles.png b/graphics/battle_anims/sprites/particles.png new file mode 100644 index 000000000..7edcd54ed Binary files /dev/null and b/graphics/battle_anims/sprites/particles.png differ diff --git a/graphics/interface/ball_open.pal b/graphics/interface/ball_open.pal deleted file mode 100755 index 0e6b2fb5c..000000000 --- a/graphics/interface/ball_open.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -131 0 0 -172 0 0 -213 41 41 -255 156 123 -255 255 255 -148 148 148 -65 65 65 -24 24 24 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/interface/gba.pal b/graphics/interface/gba.pal deleted file mode 100755 index 64a442293..000000000 --- a/graphics/interface/gba.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 diff --git a/graphics/interface/gba.png b/graphics/interface/gba.png deleted file mode 100755 index 61ce32b4f..000000000 Binary files a/graphics/interface/gba.png and /dev/null differ diff --git a/graphics/interface/gba2.pal b/graphics/interface/gba2.pal deleted file mode 100755 index 0017b212e..000000000 --- a/graphics/interface/gba2.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -0 0 0 -230 82 189 -246 213 16 -90 197 16 -90 197 16 -90 197 189 -0 90 197 -0 0 0 -0 0 0 -0 0 0 -16 222 197 -32 156 82 -82 74 205 -49 222 205 -0 0 0 -0 0 0 -0 0 0 -255 57 8 -255 90 8 -255 131 8 -255 172 8 -255 213 8 -255 255 8 -255 255 131 -255 255 255 -255 255 0 -65 0 0 -115 16 0 -172 32 0 -230 57 8 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -0 16 172 -32 32 106 -16 16 90 -0 0 74 -255 255 189 -230 230 164 -205 205 148 -189 180 115 -139 139 90 -74 74 57 -32 32 32 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 156 123 -164 123 197 -41 255 115 -0 139 255 -255 255 74 -255 255 255 -106 106 106 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 diff --git a/graphics/interface/gba2.png b/graphics/interface/gba2.png deleted file mode 100755 index aa4432951..000000000 Binary files a/graphics/interface/gba2.png and /dev/null differ diff --git a/graphics/interface/rolling_ball.png b/graphics/interface/rolling_ball.png deleted file mode 100755 index 97cc86a6f..000000000 Binary files a/graphics/interface/rolling_ball.png and /dev/null differ diff --git a/graphics/interface/trade_cableend.pal b/graphics/interface/trade_cableend.pal deleted file mode 100755 index 64a442293..000000000 --- a/graphics/interface/trade_cableend.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 diff --git a/graphics/interface/trade_cableend.png b/graphics/interface/trade_cableend.png deleted file mode 100755 index 1d7828a00..000000000 Binary files a/graphics/interface/trade_cableend.png and /dev/null differ diff --git a/graphics/interface/trade_gbascreen.png b/graphics/interface/trade_gbascreen.png deleted file mode 100755 index 4220e5e0d..000000000 Binary files a/graphics/interface/trade_gbascreen.png and /dev/null differ diff --git a/graphics/interface/trade_glow.png b/graphics/interface/trade_glow.png deleted file mode 100755 index e223d97ce..000000000 Binary files a/graphics/interface/trade_glow.png and /dev/null differ diff --git a/graphics/interface/trade_glow2.png b/graphics/interface/trade_glow2.png deleted file mode 100755 index e7729bc84..000000000 Binary files a/graphics/interface/trade_glow2.png and /dev/null differ diff --git a/graphics/interface/trade_misc.pal b/graphics/interface/trade_misc.pal deleted file mode 100755 index 32fafddfc..000000000 --- a/graphics/interface/trade_misc.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 156 123 -164 123 197 -41 255 115 -0 139 255 -255 255 74 -255 255 255 -106 106 106 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 -255 156 123 diff --git a/graphics/interface/trade_shadow.pal b/graphics/interface/trade_shadow.pal deleted file mode 100755 index a4bec6478..000000000 --- a/graphics/interface/trade_shadow.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -0 16 172 -32 32 106 -16 16 90 -0 0 74 -255 255 189 -230 230 164 -205 205 148 -189 180 115 -139 139 90 -74 74 57 -32 32 32 diff --git a/graphics/interface/trade_shadow.png b/graphics/interface/trade_shadow.png deleted file mode 100755 index 109979f90..000000000 Binary files a/graphics/interface/trade_shadow.png and /dev/null differ diff --git a/graphics/trade/ball.pal b/graphics/trade/ball.pal new file mode 100644 index 000000000..0e6b2fb5c --- /dev/null +++ b/graphics/trade/ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +131 0 0 +172 0 0 +213 41 41 +255 156 123 +255 255 255 +148 148 148 +65 65 65 +24 24 24 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/trade/ball.png b/graphics/trade/ball.png new file mode 100644 index 000000000..97cc86a6f Binary files /dev/null and b/graphics/trade/ball.png differ diff --git a/graphics/trade/cable_closeup_map.bin b/graphics/trade/cable_closeup_map.bin new file mode 100644 index 000000000..aad25ed83 Binary files /dev/null and b/graphics/trade/cable_closeup_map.bin differ diff --git a/graphics/trade/cable_end.pal b/graphics/trade/cable_end.pal new file mode 100644 index 000000000..64a442293 --- /dev/null +++ b/graphics/trade/cable_end.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 diff --git a/graphics/trade/cable_end.png b/graphics/trade/cable_end.png new file mode 100755 index 000000000..1d7828a00 Binary files /dev/null and b/graphics/trade/cable_end.png differ diff --git a/graphics/trade/gba.pal b/graphics/trade/gba.pal new file mode 100755 index 000000000..64a442293 --- /dev/null +++ b/graphics/trade/gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 diff --git a/graphics/trade/gba.png b/graphics/trade/gba.png new file mode 100755 index 000000000..61ce32b4f Binary files /dev/null and b/graphics/trade/gba.png differ diff --git a/graphics/trade/gba_affine.png b/graphics/trade/gba_affine.png new file mode 100644 index 000000000..04282fd39 Binary files /dev/null and b/graphics/trade/gba_affine.png differ diff --git a/graphics/trade/gba_affine_map.bin b/graphics/trade/gba_affine_map.bin new file mode 100644 index 000000000..8e4a590ee Binary files /dev/null and b/graphics/trade/gba_affine_map.bin differ diff --git a/graphics/trade/gba_map.bin b/graphics/trade/gba_map.bin new file mode 100644 index 000000000..50ca18549 Binary files /dev/null and b/graphics/trade/gba_map.bin differ diff --git a/graphics/trade/gba_screen.png b/graphics/trade/gba_screen.png new file mode 100755 index 000000000..4220e5e0d Binary files /dev/null and b/graphics/trade/gba_screen.png differ diff --git a/graphics/trade/glow.pal b/graphics/trade/glow.pal new file mode 100644 index 000000000..32fafddfc --- /dev/null +++ b/graphics/trade/glow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 156 123 +164 123 197 +41 255 115 +0 139 255 +255 255 74 +255 255 255 +106 106 106 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 diff --git a/graphics/trade/glow1.png b/graphics/trade/glow1.png new file mode 100755 index 000000000..e223d97ce Binary files /dev/null and b/graphics/trade/glow1.png differ diff --git a/graphics/trade/glow2.png b/graphics/trade/glow2.png new file mode 100755 index 000000000..e7729bc84 Binary files /dev/null and b/graphics/trade/glow2.png differ diff --git a/graphics/trade/misc.pal b/graphics/trade/misc.pal new file mode 100755 index 000000000..32fafddfc --- /dev/null +++ b/graphics/trade/misc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 156 123 +164 123 197 +41 255 115 +0 139 255 +255 255 74 +255 255 255 +106 106 106 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 diff --git a/graphics/trade/pokeball_symbol.png b/graphics/trade/pokeball_symbol.png new file mode 100644 index 000000000..3b4a30f4f Binary files /dev/null and b/graphics/trade/pokeball_symbol.png differ diff --git a/graphics/trade/pokeball_symbol_map.bin b/graphics/trade/pokeball_symbol_map.bin new file mode 100644 index 000000000..8355c2f5c Binary files /dev/null and b/graphics/trade/pokeball_symbol_map.bin differ diff --git a/graphics/trade/shadow.pal b/graphics/trade/shadow.pal new file mode 100755 index 000000000..a4bec6478 --- /dev/null +++ b/graphics/trade/shadow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +0 16 172 +32 32 106 +16 16 90 +0 0 74 +255 255 189 +230 230 164 +205 205 148 +189 180 115 +139 139 90 +74 74 57 +32 32 32 diff --git a/graphics/trade/shadow.png b/graphics/trade/shadow.png new file mode 100755 index 000000000..109979f90 Binary files /dev/null and b/graphics/trade/shadow.png differ diff --git a/graphics/trade/shadow_map.bin b/graphics/trade/shadow_map.bin new file mode 100644 index 000000000..8846e2d7d Binary files /dev/null and b/graphics/trade/shadow_map.bin differ diff --git a/graphics/trade/unknown.pal b/graphics/trade/unknown.pal new file mode 100644 index 000000000..72cf8b7c9 --- /dev/null +++ b/graphics/trade/unknown.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 57 8 +255 90 8 +255 131 8 +255 172 8 +255 213 8 +255 255 8 +255 255 131 +255 255 255 +255 255 0 +65 0 0 +115 16 0 +172 32 0 +230 57 8 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_20DD98.png b/graphics/unknown/unknown_20DD98.png deleted file mode 100755 index d6ce4d01b..000000000 Binary files a/graphics/unknown/unknown_20DD98.png and /dev/null differ diff --git a/ld_script.txt b/ld_script.txt index 567a9768e..313f02207 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -11,6 +11,7 @@ SECTIONS { { src/main.o(ewram_data); src/sprite.o(ewram_data); + . = ALIGN(4); src/text.o(ewram_data); src/string_util.o(ewram_data); . += 0x2E8; /* big gap */ diff --git a/misc.mk b/misc.mk index 6d46c6879..a0d6734e1 100755 --- a/misc.mk +++ b/misc.mk @@ -1,4 +1,5 @@ MENUGFXDIR := graphics/interface +TRADEGFXDIR := graphics/trade INTROGFXDIR := graphics/intro PSSGFXDIR := graphics/pokemon_storage MISCGFXDIR := graphics/misc @@ -141,7 +142,7 @@ $(ROULGFXDIR)/poke_icons2.4bpp: $(ROULGFXDIR)/wynaut.4bpp $(ROULGFXDIR)/azurill. $(INTROGFXDIR)/intro3_misc.4bpp: $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp @cat $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp >$@ -$(MENUGFXDIR)/gba2.8bpp: $(MENUGFXDIR)/gba2.png +$(TRADEGFXDIR)/gba_affine.8bpp: $(TRADEGFXDIR)/gba_affine.png $(GFX) $< $@ -num_tiles 129 $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp -- cgit v1.2.3