From f52f76aeb6f74fd8363500d7601bf01c80a1f18b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 26 Oct 2019 19:19:03 -0400 Subject: [PATCH 1/5] Dump pokeball data, split data/data.s --- baserom.ips | Bin 596864 -> 596184 bytes data/pokeball.s | 116 +++++++++++++++++++++++++++++++++++++++ data/{data.s => trade.s} | 17 +----- ld_script.txt | 3 +- 4 files changed, 120 insertions(+), 16 deletions(-) create mode 100644 data/pokeball.s rename data/{data.s => trade.s} (90%) diff --git a/baserom.ips b/baserom.ips index 4180506762dc8820b5bb097c75ed6680c0c9aa8f..08094ef3cccd05f4c2420a029011ff1a7e9b1fe0 100644 GIT binary patch delta 50 xcmZqJu5x3eO2Zb$qsA;8BAYzg3(XjTm3`y(G zFuC6MU4!Qzpykb_m$YOzdH36Sv-38&b>HgtxNeV(&xU2*kACWVjN$o0U7nqw&+ zn>K<2u!-Oh>>)S;I|z=!7J?J05uAcU1ZUvn+);CoO4K9;l1YmtQJIXKYE|#7Y66#e z-^6hfdrJHcmki=u27MLm4@4vdVUK?_nNbV?Bb*=w|%x4Rq zA@l(`kjpM#f;~uv67cJ_jNdlX`W|~)-)CRz2OMnpR&hbd;YOqIBaXCw%(2!_IMMnk jr#k-%@0jTtc-Ohsf1EZ9XbUPqWypjo(Dr!RP`lrMENR_L diff --git a/data/pokeball.s b/data/pokeball.s new file mode 100644 index 000000000..db8dbfef5 --- /dev/null +++ b/data/pokeball.s @@ -0,0 +1,116 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_826056C:: @ 826056C + obj_tiles gFile_graphics_interface_ball_Poke_sheet, 0x180, 55000 + obj_tiles gFile_graphics_interface_ball_Great_sheet, 0x180, 55001 + obj_tiles gFile_graphics_interface_ball_Safari_sheet, 0x180, 55002 + obj_tiles gFile_graphics_interface_ball_Ultra_sheet, 0x180, 55003 + obj_tiles gFile_graphics_interface_ball_Master_sheet, 0x180, 55004 + obj_tiles gFile_graphics_interface_ball_Net_sheet, 0x180, 55005 + obj_tiles gFile_graphics_interface_ball_Dive_sheet, 0x180, 55006 + obj_tiles gFile_graphics_interface_ball_Nest_sheet, 0x180, 55007 + obj_tiles gFile_graphics_interface_ball_Repeat_sheet, 0x180, 55008 + obj_tiles gFile_graphics_interface_ball_Timer_sheet, 0x180, 55009 + obj_tiles gFile_graphics_interface_ball_Luxury_sheet, 0x180, 55010 + obj_tiles gFile_graphics_interface_ball_Premier_sheet, 0x180, 55011 + +gUnknown_82605CC:: @ 82605CC + obj_pal gFile_graphics_interface_ball_Poke_palette, 55000 + obj_pal gFile_graphics_interface_ball_Great_palette, 55001 + obj_pal gFile_graphics_interface_ball_Safari_palette, 55002 + obj_pal gFile_graphics_interface_ball_Ultra_palette, 55003 + obj_pal gFile_graphics_interface_ball_Master_palette, 55004 + obj_pal gFile_graphics_interface_ball_Net_palette, 55005 + obj_pal gFile_graphics_interface_ball_Dive_palette, 55006 + obj_pal gFile_graphics_interface_ball_Nest_palette, 55007 + obj_pal gFile_graphics_interface_ball_Repeat_palette, 55008 + obj_pal gFile_graphics_interface_ball_Timer_palette, 55009 + obj_pal gFile_graphics_interface_ball_Luxury_palette, 55010 + obj_pal gFile_graphics_interface_ball_Premier_palette, 55011 + +gOamData_826062C:: @ 826062C + .4byte 0x40000300, 0x00000800 + +gSpriteAnim_8260634:: @ 8260634 + obj_image_anim_frame 0x0, 0x5 + obj_image_anim_jump 0 + +gSpriteAnim_826063C:: @ 826063C + obj_image_anim_frame 0x4, 0x1 + obj_image_anim_jump 0 + +gSpriteAnim_8260644:: @ 8260644 + obj_image_anim_frame 0x8, 0x5 + obj_image_anim_jump 0 + +gSpriteAnim_826064C:: @ 826064C + obj_image_anim_frame 0xc, 0x1 + obj_image_anim_jump 0 + +gSpriteAnim_8260654:: @ 8260654 + obj_image_anim_frame 0x0, 0x1 + obj_image_anim_end + +gSpriteAnim_826065C:: @ 826065C + obj_image_anim_frame 0x4, 0x5 + obj_image_anim_frame 0x8, 0x5 + obj_image_anim_end + +gSpriteAnim_8260668:: @ 8260668 + obj_image_anim_frame 0x4, 0x5 + obj_image_anim_frame 0x0, 0x5 + obj_image_anim_end + +gSpriteAnimTable_8260674:: + .4byte gSpriteAnim_8260654 + .4byte gSpriteAnim_826065C + .4byte gSpriteAnim_8260668 + .4byte gSpriteAnim_8260634 + .4byte gSpriteAnim_8260644 + .4byte gSpriteAnim_826063C + .4byte gSpriteAnim_826064C + +gSpriteAffineAnims_8260690:: + obj_rot_scal_anim_frame 0x0, 0x0, 0x0, 0x1 + obj_rot_scal_anim_jump 0 + +gSpriteAffineAnims_82606A0:: + obj_rot_scal_anim_frame 0x0, 0x0, 0xfd, 0x1 + obj_rot_scal_anim_jump 0 + +gSpriteAffineAnims_82606B0:: + obj_rot_scal_anim_frame 0x0, 0x0, 0x3, 0x1 + obj_rot_scal_anim_jump 0 + +gSpriteAffineAnims_82606C0:: + obj_rot_scal_anim_frame 0x100, 0x100, 0x0, 0x0 + obj_rot_scal_anim_end + +gSpriteAffineAnims_82606D0:: + obj_rot_scal_anim_frame 0x0, 0x0, 0x19, 0x1 + obj_rot_scal_anim_jump 0 + +gSpriteAffineAnimTable_82606E0:: + .4byte gSpriteAffineAnims_8260690 + .4byte gSpriteAffineAnims_82606A0 + .4byte gSpriteAffineAnims_82606B0 + .4byte gSpriteAffineAnims_82606C0 + .4byte gSpriteAffineAnims_82606D0 + +gUnknown_82606F4:: @ 82606F4 + spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55003, 55003, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55004, 55004, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55005, 55005, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55006, 55006, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55007, 55007, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55008, 55008, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55009, 55009, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55010, 55010, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow + spr_template 55011, 55011, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow diff --git a/data/data.s b/data/trade.s similarity index 90% rename from data/data.s rename to data/trade.s index b19173bc6..3ddeb1b1b 100644 --- a/data/data.s +++ b/data/trade.s @@ -1,24 +1,11 @@ -#include "constants/region_map.h" -#include "constants/trainer_classes.h" -#include "constants/songs.h" -#include "constants/flags.h" -#include "constants/region_map.h" -#include "constants/maps.h" -#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata .align 2, 0 -gUnknown_826056C:: @ 826056C - .incbin "baserom.gba", 0x26056C, 0x60 - -gUnknown_82605CC:: @ 82605CC - .incbin "baserom.gba", 0x2605CC, 0x128 - -gUnknown_82606F4:: @ 82606F4 - .incbin "baserom.gba", 0x2606F4, 0x140 +gUnknown_8260814:: @ 8260814 + .incbin "baserom.gba", 0x260814, 0x20 gUnknown_8260834:: @ 8260834 .incbin "baserom.gba", 0x260834, 0x1FE diff --git a/ld_script.txt b/ld_script.txt index ab9a7c4e6..2b2dff40e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -398,7 +398,8 @@ SECTIONS { src/daycare.o(.rodata); src/battle_gfx_sfx_util.o(.rodata); data/battle_interface.o(.rodata); - data/data.o(.rodata); + data/pokeball.o(.rodata); + data/trade.o(.rodata); data/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); From 527024d14b0f793c65b8964b7e91b493f4f736a6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 26 Oct 2019 20:08:14 -0400 Subject: [PATCH 2/5] Disassemble trade data, 1 --- asm/trade.s | 64 ++++++------ baserom.ips | Bin 596184 -> 590459 bytes data/graphics.s | 13 ++- data/trade.s | 208 +++++++++++++++++++++++++++++++++---- data/trade/unk_8260834.bin | Bin 0 -> 510 bytes data/trade/unk_8260A32.bin | Bin 0 -> 510 bytes data/trade/unk_8260C30.bin | 1 + data/trade/unk_8261430.bin | 1 + data/trade/unk_8261CE0.pal | 19 ++++ 9 files changed, 250 insertions(+), 56 deletions(-) create mode 100644 data/trade/unk_8260834.bin create mode 100644 data/trade/unk_8260A32.bin create mode 100644 data/trade/unk_8260C30.bin create mode 100644 data/trade/unk_8261430.bin create mode 100644 data/trade/unk_8261CE0.pal diff --git a/asm/trade.s b/asm/trade.s index 5467aec2f..8a1d1075a 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -489,7 +489,7 @@ _0804CA10: cmp r6, r0 bge _0804CAA8 mov r8, r2 - ldr r7, _0804CB38 @ =gUnknown_8261E40 + ldr r7, _0804CB38 @ =gTradeMonSpriteCoords _0804CA4A: movs r0, 0x64 adds r4, r6, 0 @@ -543,7 +543,7 @@ _0804CAA8: ldrb r0, [r0] cmp r6, r0 bge _0804CB20 - ldr r0, _0804CB38 @ =gUnknown_8261E40 + ldr r0, _0804CB38 @ =gTradeMonSpriteCoords mov r8, r1 adds r7, r0, 0 adds r7, 0xC @@ -604,7 +604,7 @@ _0804CB20: _0804CB2C: .4byte gUnknown_2031DA8 _0804CB30: .4byte gPlayerPartyCount _0804CB34: .4byte gEnemyPartyCount -_0804CB38: .4byte gUnknown_8261E40 +_0804CB38: .4byte gTradeMonSpriteCoords _0804CB3C: .4byte gPlayerParty _0804CB40: .4byte 0xfff40000 _0804CB44: .4byte SpriteCB_MonIcon @@ -727,7 +727,7 @@ _0804CC3E: adds r0, r1 movs r6, 0 add r5, sp, 0x10 - ldr r3, _0804CD00 @ =gUnknown_8261E8A + ldr r3, _0804CD00 @ =gTradeUnknownSpriteCoords mov r8, r3 asrs r0, 1 ldrb r7, [r3, 0x4] @@ -774,7 +774,7 @@ _0804CC62: adds r0, r1 movs r6, 0 add r5, sp, 0x10 - ldr r7, _0804CD00 @ =gUnknown_8261E8A + ldr r7, _0804CD00 @ =gTradeUnknownSpriteCoords mov r8, r7 asrs r0, 1 mov r1, r8 @@ -809,7 +809,7 @@ _0804CCC6: b _0804CEC2 .align 2, 0 _0804CCFC: .4byte gSaveBlock2Ptr -_0804CD00: .4byte gUnknown_8261E8A +_0804CD00: .4byte gTradeUnknownSpriteCoords _0804CD04: .4byte gUnknown_8261CC8 _0804CD08: .4byte gLinkPlayers + 8 _0804CD0C: .4byte gMain @@ -874,7 +874,7 @@ _0804CD5C: cmp r6, 0x5 ble _0804CD5C ldr r0, _0804CDD0 @ =gUnknown_8261CB0 - ldr r2, _0804CDD4 @ =gUnknown_8261E40 + ldr r2, _0804CDD4 @ =gTradeMonSpriteCoords ldrb r1, [r2] lsls r1, 19 movs r3, 0x80 @@ -906,7 +906,7 @@ _0804CD5C: .align 2, 0 _0804CDCC: .4byte gUnknown_8261CC8 _0804CDD0: .4byte gUnknown_8261CB0 -_0804CDD4: .4byte gUnknown_8261E40 +_0804CDD4: .4byte gTradeMonSpriteCoords _0804CDD8: .4byte gUnknown_2031DA8 _0804CDDC: .4byte gMain _0804CDE0: @@ -1178,7 +1178,7 @@ _0804D00C: cmp r6, r0 bge _0804D0A8 mov r8, r4 - ldr r7, _0804D138 @ =gUnknown_8261E40 + ldr r7, _0804D138 @ =gTradeMonSpriteCoords _0804D048: movs r0, 0x64 adds r4, r6, 0 @@ -1233,7 +1233,7 @@ _0804D0A8: ldrb r0, [r0] cmp r6, r0 bge _0804D120 - ldr r0, _0804D138 @ =gUnknown_8261E40 + ldr r0, _0804D138 @ =gTradeMonSpriteCoords mov r8, r1 adds r7, r0, 0 adds r7, 0xC @@ -1294,7 +1294,7 @@ _0804D120: _0804D12C: .4byte gUnknown_2031DA8 _0804D130: .4byte gPlayerPartyCount _0804D134: .4byte gEnemyPartyCount -_0804D138: .4byte gUnknown_8261E40 +_0804D138: .4byte gTradeMonSpriteCoords _0804D13C: .4byte gPlayerParty _0804D140: .4byte 0xfff40000 _0804D144: .4byte SpriteCB_MonIcon @@ -1424,7 +1424,7 @@ _0804D24C: adds r0, r1 movs r6, 0 add r5, sp, 0xC - ldr r3, _0804D310 @ =gUnknown_8261E8A + ldr r3, _0804D310 @ =gTradeUnknownSpriteCoords mov r8, r3 asrs r0, 1 ldrb r7, [r3, 0x4] @@ -1471,7 +1471,7 @@ _0804D270: adds r0, r1 movs r6, 0 add r5, sp, 0xC - ldr r7, _0804D310 @ =gUnknown_8261E8A + ldr r7, _0804D310 @ =gTradeUnknownSpriteCoords mov r8, r7 asrs r0, 1 mov r1, r8 @@ -1506,7 +1506,7 @@ _0804D2D4: b _0804D4B4 .align 2, 0 _0804D30C: .4byte gSaveBlock2Ptr -_0804D310: .4byte gUnknown_8261E8A +_0804D310: .4byte gTradeUnknownSpriteCoords _0804D314: .4byte gUnknown_8261CC8 _0804D318: .4byte gLinkPlayers + 8 _0804D31C: .4byte gMain @@ -1590,7 +1590,7 @@ _0804D3C0: adds r1, 0x35 strb r0, [r1] ldr r0, _0804D404 @ =gUnknown_8261CB0 - ldr r3, _0804D408 @ =gUnknown_8261E40 + ldr r3, _0804D408 @ =gTradeMonSpriteCoords ldr r4, _0804D40C @ =gUnknown_2031DA8 ldr r1, [r4] adds r1, 0x35 @@ -1621,7 +1621,7 @@ _0804D3C0: b _0804D4D2 .align 2, 0 _0804D404: .4byte gUnknown_8261CB0 -_0804D408: .4byte gUnknown_8261E40 +_0804D408: .4byte gTradeMonSpriteCoords _0804D40C: .4byte gUnknown_2031DA8 _0804D410: .4byte gMain _0804D414: @@ -3214,7 +3214,7 @@ _0804E0CC: adds r1, r0 lsls r1, 2 adds r1, r5 - ldr r2, _0804E130 @ =gUnknown_8261E40 + ldr r2, _0804E130 @ =gTradeMonSpriteCoords lsls r3, r6, 1 adds r0, r3, r2 ldrb r0, [r0] @@ -3245,7 +3245,7 @@ _0804E120: .align 2, 0 _0804E128: .4byte gUnknown_2031DA8 _0804E12C: .4byte gSprites -_0804E130: .4byte gUnknown_8261E40 +_0804E130: .4byte gTradeMonSpriteCoords thumb_func_end TradeMenuMoveCursor thumb_func_start sub_804E134 @@ -4622,7 +4622,7 @@ _0804EBA2: adds r2, r0 lsls r2, 2 add r2, r8 - ldr r5, _0804ECA8 @ =gUnknown_8261E40 + ldr r5, _0804ECA8 @ =gTradeMonSpriteCoords lsls r6, 2 adds r0, r6, r5 ldrb r0, [r0] @@ -4697,7 +4697,7 @@ _0804EC98: .align 2, 0 _0804ECA0: .4byte gSprites _0804ECA4: .4byte gUnknown_2031DA8 -_0804ECA8: .4byte gUnknown_8261E40 +_0804ECA8: .4byte gTradeMonSpriteCoords _0804ECAC: .4byte SpriteCB_MonIcon _0804ECB0: .4byte gUnknown_8260A32 _0804ECB4: @@ -4762,7 +4762,7 @@ _0804ECEC: adds r2, r0 lsls r2, 2 adds r2, r6 - ldr r5, _0804EE14 @ =gUnknown_8261E40 + ldr r5, _0804EE14 @ =gTradeMonSpriteCoords lsls r3, 2 adds r0, r3, r5 ldrb r0, [r0] @@ -4865,7 +4865,7 @@ _0804ECEC: _0804EE08: .4byte gUnknown_8260834 _0804EE0C: .4byte gSprites _0804EE10: .4byte gUnknown_2031DA8 -_0804EE14: .4byte gUnknown_8261E40 +_0804EE14: .4byte gTradeMonSpriteCoords _0804EE18: .4byte gUnknown_8261F18 _0804EE1C: ldr r0, _0804EE64 @ =gUnknown_8262055 @@ -5507,7 +5507,7 @@ sub_804F2E8: @ 804F2E8 add r0, r12 lsls r2, r0, 1 mov r10, r2 - ldr r1, _0804F3B0 @ =gUnknown_8261E40 + ldr r1, _0804F3B0 @ =gTradeMonSpriteCoords movs r2, 0 mov r8, r2 lsls r0, 2 @@ -5585,7 +5585,7 @@ _0804F39A: .align 2, 0 _0804F3A8: .4byte gUnknown_2031DA8 _0804F3AC: .4byte gSprites -_0804F3B0: .4byte gUnknown_8261E40 +_0804F3B0: .4byte gTradeMonSpriteCoords thumb_func_end sub_804F2E8 thumb_func_start sub_804F3B4 @@ -8917,7 +8917,7 @@ _08050EB4: lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _08050EFC @ =gUnknown_826CF8C + ldr r0, _08050EFC @ =gIngameTrades adds r4, r0 ldr r0, _08050F00 @ =gStringVar1 adds r1, r4, 0 @@ -8945,7 +8945,7 @@ _08050EF0: bx r0 .align 2, 0 _08050EF8: .4byte gSpecialVar_0x8004 -_08050EFC: .4byte gUnknown_826CF8C +_08050EFC: .4byte gIngameTrades _08050F00: .4byte gStringVar1 _08050F04: .4byte gStringVar3 _08050F08: .4byte gSpecialVar_0x8005 @@ -13787,7 +13787,7 @@ GetInGameTradeSpeciesInfo: @ 8053A9C lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _08053AD4 @ =gUnknown_826CF8C + ldr r0, _08053AD4 @ =gIngameTrades adds r4, r0 ldr r0, _08053AD8 @ =gStringVar1 ldrh r1, [r4, 0x38] @@ -13807,7 +13807,7 @@ GetInGameTradeSpeciesInfo: @ 8053A9C bx r1 .align 2, 0 _08053AD0: .4byte gSpecialVar_0x8004 -_08053AD4: .4byte gUnknown_826CF8C +_08053AD4: .4byte gIngameTrades _08053AD8: .4byte gStringVar1 _08053ADC: .4byte gSpeciesNames _08053AE0: .4byte gStringVar2 @@ -13822,7 +13822,7 @@ sub_8053AE4: @ 8053AE4 lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _08053B30 @ =gUnknown_826CF8C + ldr r0, _08053B30 @ =gIngameTrades adds r4, r0 ldr r0, _08053B34 @ =gSpecialVar_0x8005 ldrh r1, [r0] @@ -13849,7 +13849,7 @@ sub_8053AE4: @ 8053AE4 bx r0 .align 2, 0 _08053B2C: .4byte gSpecialVar_0x8004 -_08053B30: .4byte gUnknown_826CF8C +_08053B30: .4byte gIngameTrades _08053B34: .4byte gSpecialVar_0x8005 _08053B38: .4byte gPlayerParty _08053B3C: .4byte gStringVar1 @@ -13868,7 +13868,7 @@ sub_8053B48: @ 8053B48 lsls r2, r1, 4 subs r2, r1 lsls r2, 2 - ldr r1, _08053CA4 @ =gUnknown_826CF8C + ldr r1, _08053CA4 @ =gIngameTrades adds r5, r2, r1 movs r1, 0x64 muls r0, r1 @@ -14010,7 +14010,7 @@ sub_8053B48: @ 8053B48 bl SetMonData b _08053CC0 .align 2, 0 -_08053CA4: .4byte gUnknown_826CF8C +_08053CA4: .4byte gIngameTrades _08053CA8: .4byte gPlayerParty _08053CAC: .4byte gEnemyParty _08053CB0: .4byte gUnknown_2031CCC diff --git a/baserom.ips b/baserom.ips index 08094ef3cccd05f4c2420a029011ff1a7e9b1fe0..ef2891c5edfbe4f0d8a53294e195d76f90532332 100644 GIT binary patch delta 83 zcmcbyQRR1wO2Zb$jO?Tua>;pYGY$Qd>O delta 5234 zcmc&&OHUL*5U!rbZqMxOZb#51fk=Z3k%Yq_A|fjwdeoaHCPovI;$Wgj zZ{tt!s-h;Iyr~yFuqGZn;E~_J#<6;4#31p(Oq=aWRrS=P`|HPaC%yfk{P|gVb&b6n zGM?A`4?|4)FE;pL|C1628@%k_Z}1NPPJ=#o1X^H&gq}UrOLogr-U=MsLlsYx7yn<= ze`vYa>xpTn(&I_bzt!OVZ2%6qyD0CkZ}7g~&f(A5{MQ;*#h5rL#>FXdT1<#Dq9)FY zNpVh0iSuGwTp*gJ+7wwP$x{nyf}+PMYfMy$QsraX22$qJ_*0G`UA`KBD*>Q}HB2)A z)Uk%EExdQca$aqfEv&8Bmhw7Ws(2@YQ4?&4*>OEr~3wgf4k423aelNkbWC# zdWQ)DpqH9RSG)RojrhygEe?E;jeOkV0}jQyB8*`3Og2!%b@BHt{{;RpLj) zkBJA_fODMm46$mq*>!~H?*e}hqiq$kJ^95BFwoZxnHaByz6Gu)_qC3iTDnTc}>Pz~vNAQuWAPC8PeLe$_X187dX`qeOK#RHmUa9EBf3 z0l6?foH7WV5Y?kB+fo@h2UT#mTo85RsupN+l*~D5l!_ttMlsChHgmblio7W7k}cel zD~hFJ>40r{mhE_sUGNI+R;ShObUN*Y&H^*J$vEdM&-218nSz(N$d~dXS!d0uI8Pma udx(_}1x?191~g40cp1D3g5X>5CV+?KVMc5ao5U8eO`IXlzAg{*`ucZAF6;aN diff --git a/data/graphics.s b/data/graphics.s index 2adc0f0b3..93c5b6614 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16215,10 +16215,19 @@ gUnknown_8E9CBBC:: @ 8E9CBBC .incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN gUnknown_8E9CEDC:: @ 8E9CEDC - .incbin "baserom.gba", 0xE9CEDC, 0x80 @UNKNOWN + .incbin "baserom.gba", 0xE9CEDC, 0x60 @UNKNOWN + +gUnknown_8E9CF3C:: + .incbin "baserom.gba", 0xE9CF3C, 0x20 @UNKNOWN gUnknown_8E9CF5C:: @ 8E9CF5C - .incbin "baserom.gba", 0xE9CF5C, 0x1AA0 @UNKNOWN + .incbin "baserom.gba", 0xE9CF5C, 0x1280 @UNKNOWN + +gUnknown_8E9E1DC:: + .incbin "baserom.gba", 0xE9E1DC, 0x800 @UNKNOWN + +gUnknown_8E9E9DC:: + .incbin "baserom.gba", 0xE9E9DC, 0x20 @UNKNOWN gUnknown_8E9E9FC:: @ 8E9E9FC .incbin "baserom.gba", 0xE9E9FC, 0x800 @UNKNOWN diff --git a/data/trade.s b/data/trade.s index 3ddeb1b1b..06ee748ce 100644 --- a/data/trade.s +++ b/data/trade.s @@ -8,62 +8,226 @@ gUnknown_8260814:: @ 8260814 .incbin "baserom.gba", 0x260814, 0x20 gUnknown_8260834:: @ 8260834 - .incbin "baserom.gba", 0x260834, 0x1FE + .incbin "data/trade/unk_8260834.bin" gUnknown_8260A32:: @ 8260A32 - .incbin "baserom.gba", 0x260A32, 0x1FE + .incbin "data/trade/unk_8260A32.bin" gUnknown_8260C30:: @ 8260C30 - .incbin "baserom.gba", 0x260C30, 0x800 + .incbin "data/trade/unk_8260C30.bin" gUnknown_8261430:: @ 8261430 - .incbin "baserom.gba", 0x261430, 0x828 + .incbin "data/trade/unk_8261430.bin" + +gOamdata_8261C30:: + .incbin "baserom.gba", 0x261C30, 0x8 + +gOamData_8261C38:: + .4byte 0xc0004000, 0x00000400 + +gSpriteAnim_8261C40:: + obj_image_anim_frame 0x00, 5 + obj_image_anim_end + +gSpriteAnim_8261C48:: + obj_image_anim_frame 0x20, 5 + obj_image_anim_end + +gSpriteAnimTable_8261C50:: + .4byte gSpriteAnim_8261C40 + .4byte gSpriteAnim_8261C48 gUnknown_8261C58:: @ 8261C58 - .incbin "baserom.gba", 0x261C58, 0x8 + obj_tiles gUnknown_8E9E1DC, 0x0800, 300 gUnknown_8261C60:: @ 8261C60 - .incbin "baserom.gba", 0x261C60, 0x50 + obj_pal gUnknown_8E9CF3C, 2345 + +gSpriteAnim_8261C68:: + obj_image_anim_frame 0x00, 5 + obj_image_anim_end + +gSpriteAnim_8261C70:: + obj_image_anim_frame 0x08, 5 + obj_image_anim_end + +gSpriteAnim_8261C78:: + obj_image_anim_frame 0x10, 5 + obj_image_anim_end + +gSpriteAnim_8261C80:: + obj_image_anim_frame 0x18, 5 + obj_image_anim_end + +gSpriteAnim_8261C88:: + obj_image_anim_frame 0x20, 5 + obj_image_anim_end + +gSpriteAnim_8261C90:: + obj_image_anim_frame 0x28, 5 + obj_image_anim_end + +gSpriteAnimTable_8261C98:: + .4byte gSpriteAnim_8261C68 + .4byte gSpriteAnim_8261C70 + .4byte gSpriteAnim_8261C78 + .4byte gSpriteAnim_8261C80 + .4byte gSpriteAnim_8261C88 + .4byte gSpriteAnim_8261C90 gUnknown_8261CB0:: @ 8261CB0 - .incbin "baserom.gba", 0x261CB0, 0x18 + spr_template 300, 2345, gOamData_8261C38, gSpriteAnimTable_8261C50, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_8261CC8:: @ 8261CC8 - .incbin "baserom.gba", 0x261CC8, 0x38 + spr_template 200, 4925, gOamdata_8261C30, gSpriteAnimTable_8261C98, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_8261CE0:: + .incbin "data/trade/unk_8261CE0.gbapal" gUnknown_8261D00:: @ 8261D00 - .incbin "baserom.gba", 0x261D00, 0x8 + obj_pal gUnknown_8261CE0, 4925 gUnknown_8261D08:: @ 8261D08 - .incbin "baserom.gba", 0x261D08, 0x138 + .byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00 + .byte 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00 + .byte 0x07, 0x06, 0x01, 0x00, 0x00, 0x00 + .byte 0x01, 0x06, 0x07, 0x00, 0x00, 0x00 -gUnknown_8261E40:: @ 8261E40 - .incbin "baserom.gba", 0x261E40, 0x1A + .byte 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00 + .byte 0x03, 0x05, 0x0c, 0x0c, 0x00, 0x00 + .byte 0x00, 0x07, 0x06, 0x01, 0x00, 0x00 + .byte 0x06, 0x07, 0x00, 0x01, 0x00, 0x00 + + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x09, 0x08, 0x07, 0x06, 0x00, 0x00 + .byte 0x03, 0x01, 0x00, 0x00, 0x00, 0x00 + + .byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 + .byte 0x05, 0x01, 0x01, 0x01, 0x00, 0x00 + .byte 0x02, 0x09, 0x08, 0x07, 0x00, 0x00 + .byte 0x08, 0x09, 0x06, 0x06, 0x00, 0x00 + + .byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06 + .byte 0x05, 0x03, 0x01, 0x00, 0x00, 0x00 + + .byte 0x03, 0x03, 0x03, 0x03, 0x00, 0x00 + .byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 + .byte 0x04, 0x04, 0x04, 0x04, 0x00, 0x00 + .byte 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00 + + .byte 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00 + .byte 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x07, 0x00, 0x01, 0x00, 0x00, 0x00 + + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x02, 0x01, 0x00, 0x00, 0x00 + .byte 0x09, 0x07, 0x00, 0x00, 0x00, 0x00 + + .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 + + .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 + .byte 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00 + + .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x04, 0x02, 0x00, 0x00, 0x00, 0x00 + + .byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00 + .byte 0x07, 0x06, 0x00, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00 + +gTradeMonSpriteCoords:: @ 8261E40 + .byte 0x01, 0x05 + .byte 0x08, 0x05 + .byte 0x01, 0x0a + .byte 0x08, 0x0a + .byte 0x01, 0x0f + .byte 0x08, 0x0f + .byte 0x10, 0x05 + .byte 0x17, 0x05 + .byte 0x10, 0x0a + .byte 0x17, 0x0a + .byte 0x10, 0x0f + .byte 0x17, 0x0f + .byte 0x17, 0x12 gUnknown_8261E5A:: @ 8261E5A - .incbin "baserom.gba", 0x261E5A, 0x18 + .byte 0x05, 0x04 + .byte 0x0c, 0x04 + .byte 0x05, 0x09 + .byte 0x0c, 0x09 + .byte 0x05, 0x0e + .byte 0x0c, 0x0e + .byte 0x14, 0x04 + .byte 0x1b, 0x04 + .byte 0x14, 0x09 + .byte 0x1b, 0x09 + .byte 0x14, 0x0e + .byte 0x1b, 0x0e gUnknown_8261E72:: @ 8261E72 - .incbin "baserom.gba", 0x261E72, 0x18 + .byte 0x01, 0x03 + .byte 0x08, 0x03 + .byte 0x01, 0x08 + .byte 0x08, 0x08 + .byte 0x01, 0x0d + .byte 0x08, 0x0d + .byte 0x10, 0x03 + .byte 0x17, 0x03 + .byte 0x10, 0x08 + .byte 0x17, 0x08 + .byte 0x10, 0x0d + .byte 0x17, 0x0d -gUnknown_8261E8A:: @ 8261E8A - .incbin "baserom.gba", 0x261E8A, 0x2C +gTradeUnknownSpriteCoords:: @ 8261E8A + .byte 0x3c, 0x09, 0xb4, 0x09 + .byte 0x30, 0x09, 0xa8, 0x09 + +gUnknown_8261E92:: + .incbin "baserom.gba", 0x261E92, 0x24 gUnknown_8261EB6:: @ 8261EB6 - .incbin "baserom.gba", 0x261EB6, 0xB + .string "$" + +gUnknown_8261EB7:: + .string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}$" gText_MaleSymbol4:: @ 8261EC1 - .incbin "baserom.gba", 0x261EC1, 0x2 + .string "♂$" gText_FemaleSymbol4:: @ 8261EC3 - .incbin "baserom.gba", 0x261EC3, 0x2 + .string "♀$" gText_GenderlessSymbol:: @ 8261EC5 - .incbin "baserom.gba", 0x261EC5, 0x2 + .string "$" + +gUnknown_8261EC6:: + .string "$" gUnknown_8261EC7:: @ 8261EC7 - .incbin "baserom.gba", 0x261EC7, 0x5 + .string "\n$" +gUnknown_8261EC9:: + .string "/$" + + .align 2 gUnknown_8261ECC:: @ 8261ECC .incbin "baserom.gba", 0x261ECC, 0x18 @@ -179,7 +343,7 @@ gUnknown_826CF60:: @ 826CF60 gUnknown_826CF88:: @ 826CF88 .incbin "baserom.gba", 0x26CF88, 0x4 -gUnknown_826CF8C:: @ 826CF8C +gIngameTrades:: @ 826CF8C .incbin "baserom.gba", 0x26CF8C, 0x21C gUnknown_826D1A8:: @ 826D1A8 diff --git a/data/trade/unk_8260834.bin b/data/trade/unk_8260834.bin new file mode 100644 index 0000000000000000000000000000000000000000..123abf716f473d747bf466e067a1273eff68cd3c GIT binary patch literal 510 zcmZQz00B-0E)>WM7G+>yVqgYB9tLg{$Ojf>Vqsxm1wwWP4iv}+7G;6Tf>dBaTFWXh kC}Kb*pgSP;8Za1QKm(qkEUUz$hyfMgKEe!thzJV{02>As;Q#;t literal 0 HcmV?d00001 diff --git a/data/trade/unk_8260A32.bin b/data/trade/unk_8260A32.bin new file mode 100644 index 0000000000000000000000000000000000000000..69304c5cb4c030ee29b16716bf443524c53edd9e GIT binary patch literal 510 zcmZQz00B-0E)>WM7G+>yVqgYB9tLg{$Ojf>Vqsxm1wwWP4iv}+7G;6Tf>dC_QCZ|L I8Mx2@0JRMTa{vGU literal 0 HcmV?d00001 diff --git a/data/trade/unk_8260C30.bin b/data/trade/unk_8260C30.bin new file mode 100644 index 000000000..22f8f3b71 --- /dev/null +++ b/data/trade/unk_8260C30.bin @@ -0,0 +1 @@ +@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@ \ No newline at end of file diff --git a/data/trade/unk_8261430.bin b/data/trade/unk_8261430.bin new file mode 100644 index 000000000..e4168474a --- /dev/null +++ b/data/trade/unk_8261430.bin @@ -0,0 +1 @@ +P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P \ No newline at end of file diff --git a/data/trade/unk_8261CE0.pal b/data/trade/unk_8261CE0.pal new file mode 100644 index 000000000..40426b71f --- /dev/null +++ b/data/trade/unk_8261CE0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 74 +255 0 0 +0 255 0 +0 0 255 +255 255 0 +0 255 255 +255 0 255 +213 213 205 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +115 115 115 +255 255 255 From 6e221e478ae694be2b112062e16ef5f75f5abe23 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 27 Oct 2019 17:14:28 -0400 Subject: [PATCH 3/5] Disassemble trade data --- asm/trade.s | 4 +- data/ingame_trades.inc | 174 +++++++++ data/strings.s | 13 + data/trade.s | 736 ++++++++++++++++++++++++++++++++++--- data/trade/unk_826207C.png | Bin 0 -> 477 bytes data/trade/unk_826407C.bin | Bin 0 -> 2048 bytes data/trade/unk_826499C.pal | 19 + data/trade/unk_8264A1C.png | Bin 0 -> 208 bytes data/trade/unk_8264C1C.png | Bin 0 -> 203 bytes data/trade/unk_8264E1C.png | Bin 0 -> 205 bytes data/trade/unk_826501C.png | Bin 0 -> 183 bytes data/trade/unk_826601C.bin | Bin 0 -> 4096 bytes data/trade/unk_826701C.png | Bin 0 -> 1833 bytes data/trade/unk_826985C.bin | Bin 0 -> 256 bytes data/trade/unk_826995C.bin | Bin 0 -> 256 bytes data/trade/unk_8269A5C.bin | Bin 0 -> 4096 bytes data/trade/unk_826AA5C.bin | Bin 0 -> 4096 bytes data/trade/unk_826BB5C.pal | 19 + data/trade/unk_826BD5C.pal | 19 + data/trade/unk_826BF5C.pal | 19 + data/trade/unk_826C60C.bin | Bin 0 -> 2048 bytes src/daycare.c | 4 +- 22 files changed, 953 insertions(+), 54 deletions(-) create mode 100644 data/ingame_trades.inc create mode 100644 data/trade/unk_826207C.png create mode 100644 data/trade/unk_826407C.bin create mode 100644 data/trade/unk_826499C.pal create mode 100644 data/trade/unk_8264A1C.png create mode 100644 data/trade/unk_8264C1C.png create mode 100644 data/trade/unk_8264E1C.png create mode 100644 data/trade/unk_826501C.png create mode 100644 data/trade/unk_826601C.bin create mode 100644 data/trade/unk_826701C.png create mode 100644 data/trade/unk_826985C.bin create mode 100644 data/trade/unk_826995C.bin create mode 100644 data/trade/unk_8269A5C.bin create mode 100644 data/trade/unk_826AA5C.bin create mode 100644 data/trade/unk_826BB5C.pal create mode 100644 data/trade/unk_826BD5C.pal create mode 100644 data/trade/unk_826BF5C.pal create mode 100644 data/trade/unk_826C60C.bin diff --git a/asm/trade.s b/asm/trade.s index 8a1d1075a..6e5f333ae 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -8800,7 +8800,7 @@ _08050D98: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - ldr r1, _08050DD8 @ =gUnknown_08331F60 + ldr r1, _08050DD8 @ =gUnknown_826601C ldr r2, _08050DDC @ =0x06009000 ldr r0, _08050DD0 @ =0x040000d4 str r1, [r0] @@ -8821,7 +8821,7 @@ _08050DC8: .4byte gTradeGba_Gfx _08050DCC: .4byte 0x06004000 _08050DD0: .4byte 0x040000d4 _08050DD4: .4byte 0x80000800 -_08050DD8: .4byte gUnknown_08331F60 +_08050DD8: .4byte gUnknown_826601C _08050DDC: .4byte 0x06009000 thumb_func_end sub_8050968 diff --git a/data/ingame_trades.inc b/data/ingame_trades.inc new file mode 100644 index 000000000..c3447d79b --- /dev/null +++ b/data/ingame_trades.inc @@ -0,0 +1,174 @@ +gIngameTrades:: @ 826CF8C + .string "MIMIEN$", 11 + .align 1 + .2byte SPECIES_MR_MIME @ species + .byte 20, 15, 17, 24, 23, 22 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 1985 @ OT ID + .byte 5, 5, 5, 30, 5 @ contest stats + .align 2 + .4byte 0x00009cae @ personality + .2byte ITEM_NONE @ held item + .byte 255 @ mail index + .string "REYLEY$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_ABRA @ species requested + .align 2 + + .string "ZYNX$", 11 + .align 1 + .2byte SPECIES_JYNX @ species + .byte 18, 17, 18, 22, 25, 21 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 36728 @ OT ID + .byte 5, 30, 5, 5, 5 @ contest stats + .align 2 + .4byte 0x498a2e1d @ personality + .2byte ITEM_FAB_MAIL @ held item + .byte 0 @ mail index + .string "DONTAE$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_POLIWHIRL @ species requested + .align 2 + + .string "MS. NIDO$", 11 + .align 1 + .2byte SPECIES_NIDORAN_F @ species + .byte 22, 18, 25, 19, 15, 22 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 63184 @ OT ID + .byte 5, 5, 5, 5, 30 @ contest stats + .align 2 + .4byte 0x4c970b89 @ personality + .2byte ITEM_TINY_MUSHROOM @ held item + .byte 255 @ mail index + .string "SAIGE$", 11 + .byte FEMALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_NIDORAN_M @ species requested + .align 2 + + .string "CH'DING$", 11 + .align 1 + .2byte SPECIES_FARFETCHD @ species + .byte 20, 25, 21, 24, 15, 20 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 8810 @ OT ID + .byte 30, 5, 5, 5, 5 @ contest stats + .align 2 + .4byte 0x151943d7 @ personality + .2byte ITEM_STICK @ held item + .byte 255 @ mail index + .string "ELYSSA$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_SPEAROW @ species requested + .align 2 + + .string "NINA$", 11 + .align 1 + .2byte SPECIES_NIDORINA @ species + .byte 22, 25, 18, 19, 22, 15 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 13637 @ OT ID + .byte 5, 5, 30, 5, 5 @ contest stats + .align 2 + .4byte 0x00eeca15 @ personality + .2byte ITEM_NONE @ held item + .byte 255 @ mail index + .string "TURNER$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_NIDORINO @ species requested + .align 2 + + .string "MARC$", 11 + .align 1 + .2byte SPECIES_LICKITUNG @ species + .byte 24, 19, 21, 15, 23, 21 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 1239 @ OT ID + .byte 5, 5, 5, 5, 30 @ contest stats + .align 2 + .4byte 0x451308ab @ personality + .2byte ITEM_NONE @ held item + .byte 255 @ mail index + .string "HADEN$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_GOLDUCK @ species requested + .align 2 + + .string "ESPHERE$", 11 + .align 1 + .2byte SPECIES_ELECTRODE @ species + .byte 19, 16, 18, 25, 25, 19 @ IVs + .byte TRUE @ has second ability + .align 2 + .4byte 50298 @ OT ID + .byte 30, 5, 5, 5, 5 @ contest stats + .align 2 + .4byte 0x06341016 @ personality + .2byte ITEM_NONE @ held item + .byte 255 @ mail index + .string "CLIFTON$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_RAICHU @ species requested + .align 2 + + .string "TANGENY$", 11 + .align 1 + .2byte SPECIES_TANGELA @ species + .byte 22, 17, 25, 16, 23, 20 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 60042 @ OT ID + .byte 5, 5, 30, 5, 5 @ contest stats + .align 2 + .4byte 0x5c77ecfa @ personality + .2byte ITEM_STARDUST @ held item + .byte 255 @ mail index + .string "NORMA$", 11 + .byte FEMALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_VENONAT @ species requested + .align 2 + + .string "SEELOR$", 11 + .align 1 + .2byte SPECIES_SEEL @ species + .byte 24, 15, 22, 16, 23, 22 @ IVs + .byte FALSE @ has second ability + .align 2 + .4byte 9853 @ OT ID + .byte 5, 5, 5, 5, 30 @ contest stats + .align 2 + .4byte 0x482cac89 @ personality + .2byte ITEM_NONE @ held item + .byte 255 @ mail index + .string "GARETT$", 11 + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_PONYTA @ species requested + .align 2 + +gUnknown_826D1A8:: @ 826D1A8 + .2byte EC_WORD_THAT_S + .2byte EC_WORD_A + .2byte EC_WORD_HEALTHY + .2byte EC_POKEMON2(JYNX) + .2byte EC_WORD_EXCL + .2byte EC_WORD_BE + .2byte EC_WORD_KIND + .2byte EC_WORD_TO + .2byte EC_WORD_IT + .2byte 0 diff --git a/data/strings.s b/data/strings.s index 16666410c..5305352b7 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4359,33 +4359,46 @@ gUnknown_841E09F:: @ 841E09F gUnknown_841E0A5:: @ 841E0A5 .string "Is this trade okay?$" +gUnknown_841E0B9:: .string "CANCEL$" +gUnknown_841E0C0:: .string "Choose a POKéMON.$" +gUnknown_841E0D2:: .string "SUMMARY$" +gUnknown_841E0DA:: .string "TRADE$" +gUnknown_841E0E0:: .string "Cancel trade?$" +gUnknown_841E0EE:: .string "Press the B Button to exit.$" +gUnknown_841E10A:: .string "SUMMARY$" +gUnknown_841E112:: .string "TRADE$" +gUnknown_841E118:: .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\n" .string "Please wait.$" +gUnknown_841E145:: .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled.$" +gUnknown_841E16B:: .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\n" .string "for battle.$" +gUnknown_841E199:: .string "{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\n" .string "to finish…$" +gUnknown_841E1C5:: .string "Your friend wants\n" .string "to trade POKéMON.$" diff --git a/data/trade.s b/data/trade.s index 06ee748ce..2e06ee69e 100644 --- a/data/trade.s +++ b/data/trade.s @@ -1,11 +1,23 @@ +#include "constants/items.h" +#include "constants/species.h" +#include "constants/easy_chat.h" +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata .align 2, 0 + @ unknown gUnknown_8260814:: @ 8260814 - .incbin "baserom.gba", 0x260814, 0x20 + .4byte 0x00000f24 @ sizeof(struct SaveBlock2) + .4byte 0x00003d68 @ sizeof(struct SaveBlock1) + .4byte 0x0000001c @ sizeof(struct MapData) + .4byte 0x00000530 @ unk + .4byte 0x00000034 @ unk + .4byte 0x00000024 @ sizeof(struct MailStruct) + .4byte 0x00000064 @ sizeof(struct Pokemon) + .4byte 0x00000528 gUnknown_8260834:: @ 8260834 .incbin "data/trade/unk_8260834.bin" @@ -20,7 +32,7 @@ gUnknown_8261430:: @ 8261430 .incbin "data/trade/unk_8261430.bin" gOamdata_8261C30:: - .incbin "baserom.gba", 0x261C30, 0x8 + .4byte 0x80004000, 0x00000400 gOamData_8261C38:: .4byte 0xc0004000, 0x00000400 @@ -189,6 +201,7 @@ gUnknown_8261E72:: @ 8261E72 .byte 0x08, 0x08 .byte 0x01, 0x0d .byte 0x08, 0x0d + .byte 0x10, 0x03 .byte 0x17, 0x03 .byte 0x10, 0x08 @@ -201,7 +214,15 @@ gTradeUnknownSpriteCoords:: @ 8261E8A .byte 0x30, 0x09, 0xa8, 0x09 gUnknown_8261E92:: - .incbin "baserom.gba", 0x261E92, 0x24 + .byte 0x00, 0x0e, 0x0f, 0x1d + .byte 0x03, 0x05, 0x03, 0x07 + .byte 0x12, 0x05, 0x12, 0x07 + .byte 0x08, 0x07, 0x16, 0x0c + .byte 0x08, 0x07, 0x16, 0x0c + .byte 0x06, 0x07, 0x18, 0x0c + .byte 0x06, 0x07, 0x18, 0x0c + .byte 0x08, 0x07, 0x16, 0x0c + .byte 0x07, 0x07, 0x17, 0x0c gUnknown_8261EB6:: @ 8261EB6 .string "$" @@ -229,137 +250,752 @@ gUnknown_8261EC9:: .align 2 gUnknown_8261ECC:: @ 8261ECC - .incbin "baserom.gba", 0x261ECC, 0x18 + .4byte gUnknown_841E0B9 + .4byte gUnknown_841E0C0 + .4byte gUnknown_841E0D2 + .4byte gUnknown_841E0DA + .4byte gUnknown_841E0E0 + .4byte gUnknown_841E0EE gUnknown_8261EE4:: @ 8261EE4 - .incbin "baserom.gba", 0x261EE4, 0x10 + .4byte gUnknown_841E10A, sub_804F440 + .4byte gUnknown_841E112, sub_804F464 gUnknown_8261EF4:: @ 8261EF4 - .incbin "baserom.gba", 0x261EF4, 0x24 + .4byte gUnknown_841E118 + .4byte gUnknown_841E145 + .4byte gUnknown_841E16B + .4byte gUnknown_8417094 + .4byte gUnknown_841E199 + .4byte gUnknown_841E1C5 + .4byte gUnknown_84170BC + .4byte gUnknown_84170E0 + .4byte gUnknown_84170FC gUnknown_8261F18:: @ 8261F18 - .incbin "baserom.gba", 0x261F18, 0x4 + .byte 0, 1, 2 + .align 2 gUnknown_8261F1C:: @ 8261F1C - .incbin "baserom.gba", 0x261F1C, 0x10 + .4byte 0x000001f8 + @ { + @ .bg = 0, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x00001051 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 5, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x00002062 + @ { + @ .bg = 2, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 6, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x00003073 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 7, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } gUnknown_8261F2C:: @ 8261F2C - .incbin "baserom.gba", 0x261F2C, 0x98 + .byte 0, 4, 7, 22, 4, 15 + .2byte 0x001e + @ { + @ .bg = 0, + @ .tilemapLeft = 4, + @ .tilemapTop = 7, + @ .width = 22, + @ .height = 4, + @ .paletteNum = 15, + @ .baseBlock = 0x001e + @ } + .byte 0, 17, 15, 12, 4, 15 + .2byte 0x0076 + @ { + @ .bg = 0, + @ .tilemapLeft = 17, + @ .tilemapTop = 15, + @ .width = 12, + @ .height = 4, + @ .paletteNum = 15, + @ .baseBlock = 0x0076 + @ } + .byte 0, 0, 5, 8, 2, 13 + .2byte 0x00a6 + @ { + @ .bg = 0, + @ .tilemapLeft = 0, + @ .tilemapTop = 5, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00a6 + @ } + .byte 0, 7, 5, 8, 2, 13 + .2byte 0x00b6 + @ { + @ .bg = 0, + @ .tilemapLeft = 7, + @ .tilemapTop = 5, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00b6 + @ } + .byte 0, 0, 10, 8, 2, 13 + .2byte 0x00c6 + @ { + @ .bg = 0, + @ .tilemapLeft = 0, + @ .tilemapTop = 10, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00c6 + @ } + .byte 0, 7, 10, 8, 2, 13 + .2byte 0x00d6 + @ { + @ .bg = 0, + @ .tilemapLeft = 7, + @ .tilemapTop = 10, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00d6 + @ } + .byte 0, 0, 15, 8, 2, 13 + .2byte 0x00e6 + @ { + @ .bg = 0, + @ .tilemapLeft = 0, + @ .tilemapTop = 15, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00e6 + @ } + .byte 0, 7, 15, 8, 2, 13 + .2byte 0x00f6 + @ { + @ .bg = 0, + @ .tilemapLeft = 7, + @ .tilemapTop = 15, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x00f6 + @ } + .byte 0, 15, 5, 8, 2, 13 + .2byte 0x0106 + @ { + @ .bg = 0, + @ .tilemapLeft = 15, + @ .tilemapTop = 5, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0106 + @ } + .byte 0, 22, 5, 8, 2, 13 + .2byte 0x0116 + @ { + @ .bg = 0, + @ .tilemapLeft = 22, + @ .tilemapTop = 5, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0116 + @ } + .byte 0, 15, 10, 8, 2, 13 + .2byte 0x0126 + @ { + @ .bg = 0, + @ .tilemapLeft = 15, + @ .tilemapTop = 10, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0126 + @ } + .byte 0, 22, 10, 8, 2, 13 + .2byte 0x0136 + @ { + @ .bg = 0, + @ .tilemapLeft = 22, + @ .tilemapTop = 10, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0136 + @ } + .byte 0, 15, 15, 8, 2, 13 + .2byte 0x0146 + @ { + @ .bg = 0, + @ .tilemapLeft = 15, + @ .tilemapTop = 15, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0146 + @ } + .byte 0, 22, 15, 8, 2, 13 + .2byte 0x0156 + @ { + @ .bg = 0, + @ .tilemapLeft = 22, + @ .tilemapTop = 15, + @ .width = 8, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0156 + @ } + .byte 0, 2, 5, 14, 2, 13 + .2byte 0x0166 + @ { + @ .bg = 0, + @ .tilemapLeft = 2, + @ .tilemapTop = 5, + @ .width = 14, + @ .height = 2, + @ .paletteNum = 13, + @ .baseBlock = 0x0166 + @ } + .byte 0, 3, 8, 11, 8, 15 + .2byte 0x0182 + @ { + @ .bg = 0, + @ .tilemapLeft = 3, + @ .tilemapTop = 8, + @ .width = 11, + @ .height = 8, + @ .paletteNum = 15, + @ .baseBlock = 0x0182 + @ } + .byte 0, 17, 5, 14, 2, 15 + .2byte 0x01da + @ { + @ .bg = 0, + @ .tilemapLeft = 17, + @ .tilemapTop = 5, + @ .width = 14, + @ .height = 2, + @ .paletteNum = 15, + @ .baseBlock = 0x01da + @ } + .byte 0, 18, 8, 11, 8, 15 + .2byte 0x01f6 + @ { + @ .bg = 0, + @ .tilemapLeft = 18, + @ .tilemapTop = 8, + @ .width = 11, + @ .height = 8, + @ .paletteNum = 15, + @ .baseBlock = 0x01f6 + @ } + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + @ { + @ .bg = 255, + @ .tilemapLeft = 0, + @ .tilemapTop = 0, + @ .width = 0, + @ .height = 0, + @ .paletteNum = 0, + @ .baseBlock = 0x0000 + @ } gUnknown_8261FC4:: @ 8261FC4 - .incbin "baserom.gba", 0x261FC4, 0x70 + .byte 0, 21, 13, 6, 4, 15 + .2byte 0x024e + @ { + @ .bg = 0, + @ .tilemapLeft = 21, + @ .tilemapTop = 13, + @ .width = 6, + @ .height = 4, + @ .paletteNum = 15, + @ .baseBlock = 0x024e + @ } + + .string "かいめの そうしん$", 13 + .string "かいめの じゅしん$", 13 + .string "ポケモンアイコンセット$", 13 + .string "OBJテキストセット$", 13 + .string "セルセット$", 13 + .string "OBJテキストADD$", 13 + .string "システムメッセージADD$", 13 + .string "はいけいセット$", 13 gUnknown_8262034:: @ 8262034 - .incbin "baserom.gba", 0x262034, 0x21 + .string "ヌケニン$" + .string "こうかんせいりつ $" + .string "だめだたらしいよ $" gUnknown_8262055:: @ 8262055 - .incbin "baserom.gba", 0x262055, 0x2027 + .byte 0x04, 0x03 + .byte 0x13, 0x03 + + .align 2 +gUnknown_826205C:: + .incbin "data/trade/unk_826207C.gbapal" + +gUnknown_826207C:: + .incbin "data/trade/unk_826207C.4bpp" + + .incbin "baserom.gba", 0x26267C, 0x1A00 gUnknown_826407C:: @ 826407C - .incbin "baserom.gba", 0x26407C, 0x1FA0 + .incbin "data/trade/unk_826407C.bin" -gUnknown_08331F60:: @ 826601C - .incbin "baserom.gba", 0x26601C, 0x1000 + .incbin "baserom.gba", 0x26487C, 0x120 + +gUnknown_826499C:: + .incbin "data/trade/unk_8264E1C.gbapal" + + .incbin "baserom.gba", 0x2649BC, 0x40 + +gUnknown_82649FC:: + .incbin "data/trade/unk_8264A1C.gbapal" + +gUnknown_8264A1C:: + .incbin "data/trade/unk_8264A1C.4bpp" + +gUnknown_8264C1C:: + .incbin "data/trade/unk_8264C1C.4bpp" + +gUnknown_8264E1C:: + .incbin "data/trade/unk_8264E1C.4bpp" + + .incbin "baserom.gba", 0x264F1C, 0x100 + +gUnknown_826501C:: + .incbin "data/trade/unk_826501C.4bpp" + +gUnknown_826601C:: @ 826601C + .incbin "data/trade/unk_826601C.bin" gUnknown_826701C:: @ 826701C - .incbin "baserom.gba", 0x26701C, 0x2840 + .incbin "data/trade/unk_826701C.8bpp" gUnknown_826985C:: @ 826985C - .incbin "baserom.gba", 0x26985C, 0x100 + .incbin "data/trade/unk_826985C.bin" gUnknown_826995C:: @ 826995C - .incbin "baserom.gba", 0x26995C, 0x100 + .incbin "data/trade/unk_826995C.bin" gUnknown_8269A5C:: @ 8269A5C - .incbin "baserom.gba", 0x269A5C, 0x1000 + .incbin "data/trade/unk_8269A5C.bin" gUnknown_826AA5C:: @ 826AA5C - .incbin "baserom.gba", 0x26AA5C, 0x1000 + .incbin "data/trade/unk_826AA5C.bin" .align 2 gUnknown_3379A0Bin:: @ 826BA5C .incbin "graphics/trade/unknown_3379A0.bin.lz" gUnknown_826BB5C:: @ 826BB5C - .incbin "baserom.gba", 0x26BB5C, 0x200 + .incbin "data/trade/unk_826BB5C.gbapal" + + .incbin "baserom.gba", 0x26BB7C, 0x1E0 gUnknown_826BD5C:: @ 826BD5C - .incbin "baserom.gba", 0x26BD5C, 0x200 + .incbin "data/trade/unk_826BD5C.gbapal" + + .incbin "baserom.gba", 0x26BD7C, 0x1E0 gUnknown_826BF5C:: @ 826BF5C - .incbin "baserom.gba", 0x26BF5C, 0x20 + .incbin "data/trade/unk_826BF5C.gbapal" gWirelessSignal4bpp:: @ 826BF7C .incbin "graphics/trade/wireless_signal.4bpp.lz" gUnknown_826C60C:: @ 826C60C - .incbin "baserom.gba", 0x26C60C, 0x7C8 + .incbin "data/trade/unk_826C60C.bin.lz" + +gOamData_826CD00:: + .4byte 0x40000100, 0x00000000 + +gAnimCmd_826CD08:: + obj_image_anim_frame 0x00, 3 + obj_image_anim_frame 0x04, 3 + obj_image_anim_frame 0x08, 3 + obj_image_anim_frame 0x0c, 3 + obj_image_anim_frame 0x10, 3 + obj_image_anim_frame 0x14, 3 + obj_image_anim_frame 0x18, 3 + obj_image_anim_frame 0x1c, 3 + obj_image_anim_frame 0x20, 3 + obj_image_anim_frame 0x24, 3 + obj_image_anim_frame 0x28, 3 + obj_image_anim_frame 0x2c, 3 + obj_image_anim_loop 1 + obj_image_anim_frame 0x00, 3 + obj_image_anim_end + +gAnimCmd_826CD44:: + obj_image_anim_frame 0x00, 3 + obj_image_anim_frame 0x04, 3 + obj_image_anim_frame 0x08, 3 + obj_image_anim_frame 0x0c, 3 + obj_image_anim_frame 0x10, 3 + obj_image_anim_frame 0x14, 3 + obj_image_anim_frame 0x18, 3 + obj_image_anim_frame 0x1c, 3 + obj_image_anim_frame 0x20, 3 + obj_image_anim_frame 0x24, 3 + obj_image_anim_frame 0x28, 3 + obj_image_anim_frame 0x2c, 3 + obj_image_anim_loop 2 + obj_image_anim_frame 0x00, 3 + obj_image_anim_end + +gSpriteAnimTable_826CD80:: + .4byte gAnimCmd_826CD08 + .4byte gAnimCmd_826CD44 + +gAffineAnimCmd_826CD88:: + obj_rot_scal_anim_frame 0x0000, 0x0000, 0x00, 0x01 + obj_rot_scal_anim_end + +gAffineAnimCmd_826CD98:: + obj_rot_scal_anim_frame 0xfff8, 0x0000, 0x00, 0x14 + obj_rot_scal_anim_end + +gAffineAnimCmd_826CDA8:: + obj_rot_scal_anim_frame 0x0060, 0x0100, 0x00, 0x00 + obj_rot_scal_anim_frame 0x0000, 0x0000, 0x00, 0x05 + obj_rot_scal_anim_frame 0x0008, 0x0000, 0x00, 0x14 + obj_rot_scal_anim_end + +gSpriteAffineAnimTable_826CDC8:: + .4byte gAffineAnimCmd_826CD88 + .4byte gAffineAnimCmd_826CD98 + .4byte gAffineAnimCmd_826CDA8 gUnknown_826CDD4:: @ 826CDD4 - .incbin "baserom.gba", 0x26CDD4, 0x8 + obj_tiles gUnknown_826207C, 0x0600, 5557 gUnknown_826CDDC:: @ 826CDDC - .incbin "baserom.gba", 0x26CDDC, 0x8 + obj_pal gUnknown_826205C, 5558 gUnknown_826CDE4:: @ 826CDE4 - .incbin "baserom.gba", 0x26CDE4, 0x48 + spr_template 5557, 5558, gOamData_826CD00, gSpriteAnimTable_826CD80, NULL, gSpriteAffineAnimTable_826CDC8, sub_80538BC + +gOamData_826CDFC:: + .4byte 0x80000500, 0x00000400 + +gAnimCmd_826CE04:: + obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_end + +gSpriteAnimTable_826CE0C:: + .4byte gAnimCmd_826CE04 + +gAffineAnimCmd_826CE10:: + obj_rot_scal_anim_frame -10, -10, 0, 5 + obj_rot_scal_anim_frame 10, 10, 0, 5 + obj_rot_scal_anim_jump 0 + +gSpriteAffineAnimTable_826CE28:: + .4byte gAffineAnimCmd_826CE10 gUnknown_826CE2C:: @ 826CE2C - .incbin "baserom.gba", 0x26CE2C, 0x8 + obj_tiles gUnknown_8264A1C, 0x0200, 5550 gUnknown_826CE34:: @ 826CE34 - .incbin "baserom.gba", 0x26CE34, 0x8 + obj_pal gUnknown_82649FC, 5551 gUnknown_826CE3C:: @ 826CE3C - .incbin "baserom.gba", 0x26CE3C, 0x8 + obj_pal gUnknown_826499C, 5555 gUnknown_826CE44:: @ 826CE44 - .incbin "baserom.gba", 0x26CE44, 0x38 + spr_template 5550, 5551, gOamData_826CDFC, gSpriteAnimTable_826CE0C, NULL, gSpriteAffineAnimTable_826CE28, sub_804FD24 + +gOamData_826CE5C:: + .4byte 0x80008000, 0x00000400 + +gAnimCmd_826CE64:: + obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_end + +gAnimCmd_826CE6C:: + obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_end + +gSpriteAnimTable_826CE74:: + .4byte gAnimCmd_826CE64 + .4byte gAnimCmd_826CE6C gUnknown_826CE7C:: @ 826CE7C - .incbin "baserom.gba", 0x26CE7C, 0x8 + obj_tiles gUnknown_8264C1C, 0x0300, 5552 gUnknown_826CE84:: @ 826CE84 - .incbin "baserom.gba", 0x26CE84, 0x2C + spr_template 5552, 5551, gOamData_826CE5C, gSpriteAnimTable_826CE74, NULL, gDummySpriteAffineAnimTable, sub_804FD78 + +gOamData_826CE9C:: + .4byte 0x80008000, 0x00000400 + +gAnimCmd_826CEA4:: + obj_image_anim_frame 0, 10 + obj_image_anim_end + +gSpriteAnimTable_826CEAC:: + .4byte gAnimCmd_826CEA4 gUnknown_826CEB0:: @ 826CEB0 - .incbin "baserom.gba", 0x26CEB0, 0x8 + obj_tiles gUnknown_8264E1C, 0x0100, 5554 gUnknown_826CEB8:: @ 826CEB8 - .incbin "baserom.gba", 0x26CEB8, 0x70 + spr_template 5554, 5555, gOamData_826CE9C, gSpriteAnimTable_826CEAC, NULL, gDummySpriteAffineAnimTable, sub_804FDB8 + +gOamData_826CED0:: + .4byte 0xc0004000, 0x00000400 + +gAnimCmd_826CED8:: + obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x60, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_loop 8 + obj_image_anim_end + +gAnimCmd_826CEFC:: + obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x60, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x40, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x20, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 0x00, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_loop 2 + obj_image_anim_end + +gSpriteAnimTable_826CF20:: + .4byte gAnimCmd_826CED8 + +gSpriteAnimTable_826CF24:: + .4byte gAnimCmd_826CEFC gUnknown_826CF28:: @ 826CF28 - .incbin "baserom.gba", 0x26CF28, 0x8 + obj_tiles gUnknown_826501C, 0x1000, 5556 gUnknown_826CF30:: @ 826CF30 - .incbin "baserom.gba", 0x26CF30, 0x18 + spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF20, NULL, gDummySpriteAffineAnimTable, sub_804FE00 gUnknown_826CF48:: @ 826CF48 - .incbin "baserom.gba", 0x26CF48, 0x18 + spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF24, NULL, gDummySpriteAffineAnimTable, sub_804FE00 gUnknown_826CF60:: @ 826CF60 - .incbin "baserom.gba", 0x26CF60, 0x28 + .2byte RGB(18, 24, 31) + .2byte RGB(18, 24, 31) + .2byte RGB(18, 24, 31) + .2byte RGB(31, 31, 31) + .2byte RGB(31, 31, 31) + .2byte RGB(31, 31, 31) + .2byte RGB(18, 24, 31) + .2byte RGB(18, 24, 31) + .2byte RGB(18, 24, 31) + .2byte RGB(31, 31, 31) + .2byte RGB(31, 31, 31) + .2byte RGB(31, 31, 31) + +gAffineAnimCmd_826CF78:: + obj_rot_scal_anim_frame 0xFF00, 0x0100, 0x00, 0x00 + obj_rot_scal_anim_jump 0 gUnknown_826CF88:: @ 826CF88 - .incbin "baserom.gba", 0x26CF88, 0x4 + .4byte gAffineAnimCmd_826CF78 -gIngameTrades:: @ 826CF8C - .incbin "baserom.gba", 0x26CF8C, 0x21C - -gUnknown_826D1A8:: @ 826D1A8 - .incbin "baserom.gba", 0x26D1A8, 0x14 + .include "data/ingame_trades.inc" gUnknown_826D1BC:: @ 826D1BC - .incbin "baserom.gba", 0x26D1BC, 0x10 + .byte 0, 2, 15, 26, 4, 0 + .2byte 0x0040 + @ { + @ .bg = 0, + @ .tilemapLeft = 2, + @ .tilemapTop = 15, + @ .width = 26, + @ .height = 4, + @ .paletteNum = 0, + @ .baseBlock = 0x0040 + @ } + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + @ { + @ .bg = 255, + @ .tilemapLeft = 0, + @ .tilemapTop = 0, + @ .width = 0, + @ .height = 0, + @ .paletteNum = 0, + @ .baseBlock = 0x0000 + @ } gUnknown_826D1CC:: @ 826D1CC - .incbin "baserom.gba", 0x26D1CC, 0x8 + .byte 0, 21, 9, 6, 4, 15 + .2byte 0x00bc + @ { + @ .bg = 0, + @ .tilemapLeft = 21, + @ .tilemapTop = 9, + @ .width = 6, + @ .height = 4, + @ .paletteNum = 15, + @ .baseBlock = 0x00bc + @ } gUnknown_826D1D4:: @ 826D1D4 - .incbin "baserom.gba", 0x26D1D4, 0x10 + .4byte 0x000001fc + @ { + @ .bg = 0, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x00002051 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 5, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x00002326 + @ { + @ .bg = 2, + @ .charBaseIndex = 1, + @ .mapBaseIndex = 18, + @ .screenSize = 1, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x00003063 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 6, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } gUnknown_826D1E4:: @ 826D1E4 - .incbin "baserom.gba", 0x26D1E4, 0x6C + .byte 0x00 + .byte 0x00 + .byte 0x01 + .byte 0x00 + .byte 0x01 + .byte 0x00 + .byte 0x01 + .byte 0x01 + .byte 0x01 + .byte 0x01 + .byte 0x02 + .byte 0x02 + .byte 0x02 + .byte 0x02 + .byte 0x03 + .byte 0x03 + .byte 0x03 + .byte 0x03 + .byte 0x04 + .byte 0x04 + .byte 0x04 + .byte 0x04 + .byte 0xfc + .byte 0xfc + .byte 0xfc + .byte 0xfd + .byte 0xfd + .byte 0xfd + .byte 0xfd + .byte 0xfe + .byte 0xfe + .byte 0xfe + .byte 0xfe + .byte 0xff + .byte 0xff + .byte 0xff + .byte 0xff + .byte 0x00 + .byte 0xff + .byte 0x00 + .byte 0xff + .byte 0x00 + .byte 0x00 + .byte 0x00 + + .incbin "baserom.gba", 0x26D210, 0x40 gUnknown_826D250:: @ 826D250 - .incbin "baserom.gba", 0x26D250, 0x44 + .byte 0x00, 0x01 + .byte 0x01, 0x01 + .byte 0x02, 0x01 + .byte 0x03, 0x01 + .byte 0x04, 0x01 + .byte 0x05, 0x02 + .byte 0x06, 0x02 + .byte 0x07, 0x02 + .byte 0x08, 0x02 + .byte 0x09, 0x02 + .byte 0x0a, 0x03 + .byte 0x0b, 0x03 + .byte 0x0c, 0x03 + .byte 0x0d, 0x04 + .byte 0x0e, 0x05 + .byte 0x0f, 0x02 + .byte 0x00, 0x01 + .byte 0x01, 0x01 + .byte 0x02, 0x01 + .byte 0x03, 0x01 + .byte 0x04, 0x01 + .byte 0x05, 0x02 + .byte 0x06, 0x02 + .byte 0x07, 0x02 + .byte 0x08, 0x02 + .byte 0x09, 0x02 + .byte 0x0a, 0x03 + .byte 0x0b, 0x03 + .byte 0x0c, 0x03 + .byte 0x0d, 0x04 + .byte 0x0e, 0x05 + .byte 0x10, 0x01 + .byte 0x10, 0xff + + .align 2, 0 diff --git a/data/trade/unk_826207C.png b/data/trade/unk_826207C.png new file mode 100644 index 0000000000000000000000000000000000000000..01e26de43a1339a93577ba401e665669c5913a56 GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC#g&9cxfBdf&NErn9gt-3y|G$}mVGRSrRZY$R zbE<*dDO096Iyy>7NC4TGAggAYH&8EQNswPKgTu2MX+U(CtU4X@2Y2SmhyD$23nHPVPS>%}U(&QL};EN4&n;)+_YQ+~?qIYk9QhmSVwF_d2 zzK)eGZL6O#C{{l!n3JAiF+*mOI(Mz$s&g-5mj2G3YrC@ae1*Uf<6pi1ejNI7Ph+la zm4@8iuI20IfAXlF>RM1f_xSmb*DgDOxN$GR% zRY=t~%08R;dV)>xyZ)_VHkupS^#rRuJeJ#X-u$eUyg07pZ~eS4lUdX^s4OvRo|fCZIUhGK?{2%>xASjO|0_JX9lNYtcDCrYf4(_Y`xx@rp1w3@XnF+?L99qmZLt$j4`WG?UoeBivm0qZj-RKCV~EDY(&PT1fe!FMJ7!A6m8Zo}Hf4+?iqe_<%tyBfxbH~(7|3~NP%})<8`^e-a8(H2qyT2G{EQ6=3pUXO@geCwc Cb5(=@ literal 0 HcmV?d00001 diff --git a/data/trade/unk_826501C.png b/data/trade/unk_826501C.png new file mode 100644 index 0000000000000000000000000000000000000000..a900dea3b474e2ab673a8a51ceef539d6b89987a GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3zopr0CuiJp8x;= literal 0 HcmV?d00001 diff --git a/data/trade/unk_826601C.bin b/data/trade/unk_826601C.bin new file mode 100644 index 0000000000000000000000000000000000000000..8846e2d7d702adda5f8f0f6bb79dd6341bbe25b4 GIT binary patch literal 4096 zcmeIyxedTD2nA4&^b3k#Fr4q&_qr5SlBo?vSrDXAzj*CK05~|7dH=&Ze2QcXxFAU^*sY46Eh1ds}{|gG-^

l70H|`=vdi^I-$%L!Z4?Cje2Dl75(>X# z|Aha!pa9u~OoP3W+a5S-Zu=vECir&8D+3MC2J8Xd14lrQZmB2`LBFl;*@fI-iXgi^ zQ#3D)kWnQ<291|J1kfJ@6Lz=5ab(F4hOCQe!ooeANAB*gffiiTKY$Z%gg%5n4ri(^ zwD1g08k&5!V^h^+ih1?Y9h3#K0ShY{~3+6pq~{9Ksd7t{r9E-d~?Ll;*(oS$GTJ4m>B zw1&*|c7L?pfAkCI1*Z>9_#h6|HBHAOXMX8Hhw<_zj?-Y#Y}^nP$dGW{j6iGV)eg0p z`+vL}q6naZPzmC}P;DK?rWkU{lVF@z@AW4q8GN|^P!u4`*oD7g{9~h7CKSlMIWNzGD}6o-YWWa||2obLS_PI6`kmG_Tx*tBHY2RYM)p~r|0Vn!L6^|`T^l2ySC5uE zIK6*Gf5!Hg?sChkMp3Bbq+02E7Nqvp&vQfDlz{kL>w|7Kn%F~LqGk9Z9hAIG);dyM zpuN@A^F(h6r1y?wkPt!$lFEItx=^Yg}ip{6ubS@SI-N|N4`}*Dv9* zpi7|lhcZz>zv@bo}Q%)P7q;m)X3081I%a8^9*MMl`}A(4{zEC=(-@U zJC+qAppVW^a!S$=WcmKkIBrji&7EaGpx*)JmNsy1x9oDQu~fEs{*#x(XZQy|PXLlX z=H4y_Xv{13-^E3v&Hqq=27Z$F_el7a|NJ!tT>{9+pO+`SHgLN8KC=#Q z*RujNIE;kro#%o!^7-{%f@}oz+4=dQkfnbbhXs$h&*3=#+_Om!(x>!e)trofE|2XG zNM;BkY1O!-M-a3QN}(CalzDQ^`GREHjWKR4QzMA>i$))$JyW~x{4joofBcG>ms{Bl z8@c=FDV!LI5TjP43iZSNi4kH%r6SaqIe2e>#-nkt_=D$XwdnzR-&l3)rNQw<6K*ua zMq7ge9JL+b2nRhJU30vrkqsM;f@+e66SDl$w_G7T$J8@1!v+lVmgb;!w!+PbFp2N9) zWXOH31v~4TVXDHO-mc=XFpaHz5PUFV}2IzkQa8d z2|^q0KSr4E9^%YHvu;2wk0W^_lR)N1YZ-*y+^BX5wrisrxLa}N_s;X$XdR9IgM6gz z?7pt;dKGd5*bC5ha1v95d7ae@PMEE*qn?p>nJYjqQujbFh@PMqkUG<^6QN$f5)Uh+ za+9~bXMpSRR^5HgGdHrhr*Mq4I#N2&>nxNG?5jZOa8dzE5A#(`s`M47qlDh+38`2L zEPDuqj5x(1Gp5?;PX`Dc{p};u^8X`*-yu^`B~#h4DAciNBd|0fwNcYdtuI#FO06*q zkQ+04r0x84v%7Aq4Z(>+)}a2PQM_d4bUQmJ{^8gAa5}cMv;Yx;lU2L9pWi$fj^8al ztd=k-JARPufUw(D{L{qf#=Rwkuvl?35LyBx1j6{Z;u90~<%0g}PtlEE!e3PQs(kFf XV3)0Z!&kAp00000NkvXXu0mjfbeM)s literal 0 HcmV?d00001 diff --git a/data/trade/unk_826985C.bin b/data/trade/unk_826985C.bin new file mode 100644 index 0000000000000000000000000000000000000000..19bab962b945523bb6ecca2d5178c7a8a3b15357 GIT binary patch literal 256 zcmZQzfB-&zD1%CTIeAp`^z>2rcJ?qnBNHqPshPQjrIodfEdzstqm#3XtDC!rrnF9SnB yU{G*KXjpheWK?uaECWMAVp4KSYFc_mW>$7iE(1eBVNr2OX<2ziWmR=eEdv0p104YX literal 0 HcmV?d00001 diff --git a/data/trade/unk_826995C.bin b/data/trade/unk_826995C.bin new file mode 100644 index 0000000000000000000000000000000000000000..53a511321009e872ee7b2cd8ac4fff3d92ab2ca9 GIT binary patch literal 256 zcmZQzpaE!TY-(<4MHoC`;-tw_rXu)l?H!$6-B3Ow6Eh1d8#@Ol7dHp61A~L3le3Gfo4bdn zm$#2E14BSyP;f|SSa?KaRCG)%14BY$QgTXaT6#uiR(4J<14BV!QE^FWS$RceRdr1* F0{~T`B??EoFo9}-3 z!r9LRho1cU2@qK8LrBd6?7+Cj%%*FA=gcL^4)UV9d{K3_1sgaNU;+4J@8Pe zGUX~%2K7~{J@QzMT2It@s$PRe&ol+~&04f-^V|#VI&|vNtw*nyLH#SQz0s%NfI&ls zjTkj%+(b}6Y09)2v*x@t@0|sUmMmKd>Q}8vANe`_+kXO|&lv=NasLkWb1?Oj z_MEZ)%pdVyt~n(BZuc4Z-T5u{68vR15PSMh>Zjg?y%}ZCKFYj%>GuxT_Qm&l_|JTS zLk=r+#8E|#Ij-0VB}&tO$`#6#t5B)RY1L|+QLD~b=bTT(bI~OY8Z~LwqE(xAmtAo+ z5r5qcH+AaL?Uvi_xa*!C_dQ6$M~^)AM4x_7Ju_g?kYOW6JAYHnKAtl+4W1frAblGRw@KWk)1YA~U;bWrvK2tSBV@yC-*q9xt!& zFV_#(`*WVx_X;5JufxE<&tGg1ozNLw&=p|_V^?-zXLe%n@0||58@i(hdZHJ4qYuIn z&OYqTUhK&p?9OigZ~Wo=q96KW00v?ZA`povL@|;P9K?Yf!2ayVz8wqgK8R=x#t_6H z7DEw-VHl1P7{TEj#yAdTEMqu?gBktjm;CTSjKnC6Mm)w~EXH9xCSW2GkidzY!0{Z% zu^hvAj^-$i{JrqQC${QINCGe!Q!o|8G)zY_k~y8zNKWMxP9~VdNv(y%UtbaO!VJvB zEEuzqf;pIrd6x zd_fDo;v2s4D_i)5&HT(y{KzIY@&n(qf$#XX&Fh^S^j;s-s3v{XCw*44zNkfC^-bUW z)h+(wW`Fi4e{_=@{lV|u;CFuOfCH$}BR$p=Jyorq>AC9kLN8UXS9+~CdgIrA<$AyL z3)lI%pSjjg{lt&`$TcB@x~1E?qr1ANYTefZJ=8-#@O@YNp6~jOZ~K;S z`i84~-Pe3ILV`nVHY^xheAH6o!X@= z?baS;Yp?bxNBfnl1Ip7u9dw=#IM@4~<9*)iZ13@IXL*-*IvDZ+t<^fM*9L9WCT&)R zGPOlpwN2Z#Lp!|P+q~6Voaqd2_9k!i2Cw%zul=rD??0earD>5CYl)U>nU*VEE3{Ip zv|4Ml#;d)`E4{+$UhZXH>Lp(6MNV^SyAMd3p_!T`YqnA}M{_k#^R++=wa^PZ-}5}z zbDZMYwr6>!XIO1IG(Vt#5;aPblq6`frf90DX_~HNC40K3nV#w?o@_YDlRV0aKXtng zYGi9+wBj{JV>M3WH9-@Vpaf6!1dsPPkM$VGdvvQF*>-ck?f-p)prSQcLlmP}4ON_m zX}Cscgok^W<2=-{j`0u=cJ%MMeg5}CKz-Fu{WU-XHAoSPRFt9|=?D+Y<+MrQYhJaD}^%d%Kr=x`(^FTSwhtep@4`PU@^K>Z&k>xvRUlvpfB{ R^{-Cr|NrOt_2%E7@E`BJ Date: Sun, 27 Oct 2019 17:36:46 -0400 Subject: [PATCH 4/5] These pals actually span the whole 0x200 bytes maybe --- data/trade.s | 4 - data/trade/unk_826BB5C.pal | 242 ++++++++++++++++++++++++++++++++++++- data/trade/unk_826BD5C.pal | 242 ++++++++++++++++++++++++++++++++++++- 3 files changed, 482 insertions(+), 6 deletions(-) diff --git a/data/trade.s b/data/trade.s index 2e06ee69e..50cbeb488 100644 --- a/data/trade.s +++ b/data/trade.s @@ -621,13 +621,9 @@ gUnknown_3379A0Bin:: @ 826BA5C gUnknown_826BB5C:: @ 826BB5C .incbin "data/trade/unk_826BB5C.gbapal" - .incbin "baserom.gba", 0x26BB7C, 0x1E0 - gUnknown_826BD5C:: @ 826BD5C .incbin "data/trade/unk_826BD5C.gbapal" - .incbin "baserom.gba", 0x26BD7C, 0x1E0 - gUnknown_826BF5C:: @ 826BF5C .incbin "data/trade/unk_826BF5C.gbapal" diff --git a/data/trade/unk_826BB5C.pal b/data/trade/unk_826BB5C.pal index 46166e406..a5da8a543 100644 --- a/data/trade/unk_826BB5C.pal +++ b/data/trade/unk_826BB5C.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -16 +256 0 0 0 255 255 255 0 0 0 @@ -17,3 +17,243 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 +0 0 0 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +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 +172 172 172 +255 255 255 +0 0 0 +255 255 255 +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 +172 172 172 diff --git a/data/trade/unk_826BD5C.pal b/data/trade/unk_826BD5C.pal index db9073cbe..218390aa2 100644 --- a/data/trade/unk_826BD5C.pal +++ b/data/trade/unk_826BD5C.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -16 +256 0 0 0 0 0 0 0 0 0 @@ -17,3 +17,243 @@ JASC-PAL 0 0 0 0 0 0 255 255 255 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 255 255 +172 172 172 +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 +172 172 172 +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 255 255 From b0a6be811fdd39813358daa7f45fe09d37a26f0e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 27 Oct 2019 17:37:19 -0400 Subject: [PATCH 5/5] Bump baserom.ips --- baserom.ips | Bin 590459 -> 553618 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/baserom.ips b/baserom.ips index ef2891c5edfbe4f0d8a53294e195d76f90532332..02b5aab21e03906645e2d6c5f3b505ef4d5bb057 100644 GIT binary patch delta 129 zcmey}qB7~JV#5~3qsGi?HB!?rS~F&Bx3*!NDaoqlQNyUP{YosO0wb%M=N<-!={p{B z$W1qjXH;TV^Ou=!xPnD}`iCgS+pKDr1c0)S?lU@YnHpqtGB7YQv2cKll5X#QzzD=l XK+FupEI`Z(#B4y!zPe9Ww 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